diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-08-09 09:04:04 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-08-09 09:04:04 +0000 |
| commit | 70d1ec4e0111c02c71b417136aae37a43983ba10 (patch) | |
| tree | 7fd643ecc809a519b0f07e62392be21f47d74714 /win32 | |
| parent | f17e942cc9e95674fbfe63c98d0af793b9aeb9b2 (diff) | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@24786 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/glue/stdint.h | 2 | ||||
| -rw-r--r-- | win32/glue/sys/mman.h | 21 | ||||
| -rw-r--r-- | win32/gui/AboutDlg.c | 8 | ||||
| -rw-r--r-- | win32/gui/CheatDlg.c | 438 | ||||
| -rw-r--r-- | win32/gui/ConfigurePlugins.c | 24 | ||||
| -rw-r--r-- | win32/gui/Win32.h | 5 | ||||
| -rw-r--r-- | win32/gui/WndMain.c | 57 | ||||
| -rwxr-xr-x | win32/gui/cdrom02.ico | bin | 2238 -> 9662 bytes | |||
| -rw-r--r-- | win32/gui/plugin.c | 6 | ||||
| -rw-r--r-- | win32/pcsx.dev | 12 | ||||
| -rw-r--r-- | win32/pcsx.dsp | 8 | ||||
| -rw-r--r-- | win32/pcsx.rc | 172 | ||||
| -rw-r--r-- | win32/resource.h | 48 |
13 files changed, 688 insertions, 113 deletions
diff --git a/win32/glue/stdint.h b/win32/glue/stdint.h index 92a16663..1a1eace1 100644 --- a/win32/glue/stdint.h +++ b/win32/glue/stdint.h @@ -4,6 +4,8 @@ // Use, redistribution and modification of this code is unrestricted
// as long as this notice is preserved.
//
+// This code is provided with ABSOLUTELY NO WARRANTY.
+//
#ifndef __STDINT_H
#define __STDINT_H
diff --git a/win32/glue/sys/mman.h b/win32/glue/sys/mman.h index 0309f982..a803408a 100644 --- a/win32/glue/sys/mman.h +++ b/win32/glue/sys/mman.h @@ -4,28 +4,17 @@ // Use, redistribution and modification of this code is unrestricted
// as long as this notice is preserved.
//
+// This code is provided with ABSOLUTELY NO WARRANTY.
+//
#ifndef MMAN_H
#define MMAN_H
-#define PROT_WRITE 0
-#define PROT_READ 0
-#define PROT_EXEC 0
-#define MAP_PRIVATE 0
-#define MAP_ANONYMOUS 0
-
#include <stdlib.h>
-static inline void *mmap(void *start, size_t length, int prot, int flags,
- int fd, off_t offset)
-{
- return (unsigned char *)malloc(length);
-}
+#define mmap(start, length, prot, flags, fd, offset) \
+ ((unsigned char *)malloc(length))
-static inline int munmap(void *start, size_t length)
-{
- free(start);
- return 0;
-}
+#define munmap(start, length) do { free(start); } while (0)
#endif
diff --git a/win32/gui/AboutDlg.c b/win32/gui/AboutDlg.c index fe112a12..bcf0bde0 100644 --- a/win32/gui/AboutDlg.c +++ b/win32/gui/AboutDlg.c @@ -20,7 +20,7 @@ #include <windowsx.h>
#include "resource.h"
#include "AboutDlg.h"
-#include "PsxCommon.h"
+#include "psxcommon.h"
char *LabelAuthors = { N_(
"PCSX - A PlayStation Emulator\n\n"
@@ -35,13 +35,13 @@ char *LabelGreets = { N_( "PCSX-df Authors:\n"
"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
"Marcus Comstedt, Stefan Sikora\n\n"
- "PCSX Reloaded By:\n"
+ "PCSX-Reloaded By:\n"
"Wei Mingzhi\n\n"
"http://www.codeplex.com/pcsxr")
};
LRESULT WINAPI AboutDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) {
- switch(uMsg) {
+ switch (uMsg) {
case WM_INITDIALOG:
SetWindowText(hDlg, _("About"));
@@ -53,7 +53,7 @@ LRESULT WINAPI AboutDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) return TRUE;
case WM_COMMAND:
- switch(wParam) {
+ switch (wParam) {
case IDOK:
EndDialog(hDlg, TRUE);
return TRUE;
diff --git a/win32/gui/CheatDlg.c b/win32/gui/CheatDlg.c new file mode 100644 index 00000000..0642e407 --- /dev/null +++ b/win32/gui/CheatDlg.c @@ -0,0 +1,438 @@ +/* Cheat Support for PCSX-Reloaded
+ *
+ * Copyright (C) 2009, Wei Mingzhi <whistler_wmz@users.sf.net>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ */
+
+#include <windows.h>
+#include <windowsx.h>
+#include <commctrl.h>
+#include <stdio.h>
+#include "psxcommon.h"
+#include "psxmem.h"
+#include "cheat.h"
+#include "resource.h"
+#include "Win32.h"
+
+static void UpdateCheatDlg(HWND hW) {
+ HWND List;
+ LV_ITEM item;
+ int i;
+
+ List = GetDlgItem(hW, IDC_CODELIST);
+
+ ListView_DeleteAllItems(List);
+
+ for (i = 0; i < NumCheats; i++) {
+ memset(&item, 0, sizeof(item));
+
+ item.mask = LVIF_TEXT;
+ item.iItem = i;
+ item.pszText = Cheats[i].Descr;
+ item.iSubItem = 0;
+
+ SendMessage(List, LVM_INSERTITEM, 0, (LPARAM)&item);
+
+ item.pszText = (Cheats[i].Enabled ? _("Yes") : _("No"));
+ item.iSubItem = 1;
+
+ SendMessage(List, LVM_SETITEM, 0, (LPARAM)&item);
+ }
+}
+
+static int iEditItem = -1;
+
+static LRESULT WINAPI CheatEditDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+ char szDescr[256], szCode[1024];
+ int i;
+
+ switch (uMsg) {
+ case WM_INITDIALOG:
+ SetWindowText(hW, _("Edit Cheat"));
+ Static_SetText(GetDlgItem(hW, IDC_LABEL_DESCR), _("Description:"));
+ Static_SetText(GetDlgItem(hW, IDC_LABEL_CODE), _("Cheat Code:"));
+ Button_SetText(GetDlgItem(hW, IDOK), _("OK"));
+ Button_SetText(GetDlgItem(hW, IDCANCEL), _("Cancel"));
+
+ assert(iEditItem != -1 && iEditItem < NumCheats);
+
+ Edit_SetText(GetDlgItem(hW, IDC_DESCR), Cheats[iEditItem].Descr);
+
+ szCode[0] = '\0';
+ for (i = Cheats[iEditItem].First; i < Cheats[iEditItem].First + Cheats[iEditItem].n; i++) {
+ sprintf(szDescr, "%.8X %.4X\r\n", CheatCodes[i].Addr, CheatCodes[i].Val);
+ strcat(szCode, szDescr);
+ }
+ Edit_SetText(GetDlgItem(hW, IDC_CODE), szCode);
+ break;
+
+ case WM_COMMAND:
+ switch (wParam) {
+ case IDOK: + Edit_GetText(GetDlgItem(hW, IDC_DESCR), szDescr, 256); + Edit_GetText(GetDlgItem(hW, IDC_CODE), szCode, 1024); + + if (EditCheat(iEditItem, szDescr, szCode) != 0) { + SysMessage(_("Error"), _("Invalid cheat code!")); + } + else { + EndDialog(hW, TRUE);
+ return TRUE;
+ }
+ break;
+
+ case IDCANCEL:
+ EndDialog(hW, TRUE);
+ return TRUE;
+ }
+ break;
+
+ case WM_CLOSE:
+ EndDialog(hW, TRUE);
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static LRESULT WINAPI CheatAddDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+ char szDescr[256], szCode[1024];
+
+ switch (uMsg) {
+ case WM_INITDIALOG:
+ SetWindowText(hW, _("Add New Cheat"));
+ Static_SetText(GetDlgItem(hW, IDC_LABEL_DESCR), _("Description:"));
+ Static_SetText(GetDlgItem(hW, IDC_LABEL_CODE), _("Cheat Code:"));
+ Button_SetText(GetDlgItem(hW, IDOK), _("OK"));
+ Button_SetText(GetDlgItem(hW, IDCANCEL), _("Cancel"));
+ break;
+
+ case WM_COMMAND:
+ switch (wParam) {
+ case IDOK: + Edit_GetText(GetDlgItem(hW, IDC_DESCR), szDescr, 256); + Edit_GetText(GetDlgItem(hW, IDC_CODE), szCode, 1024); + + if (AddCheat(szDescr, szCode) != 0) { + SysMessage(_("Error"), _("Invalid cheat code!")); + } + else { + EndDialog(hW, TRUE);
+ return TRUE;
+ }
+ break;
+
+ case IDCANCEL:
+ EndDialog(hW, TRUE);
+ return TRUE;
+ }
+ break;
+
+ case WM_CLOSE:
+ EndDialog(hW, TRUE);
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+LRESULT WINAPI CheatDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+ HWND List;
+ LV_COLUMN col;
+ LV_ITEM item;
+ int i;
+ OPENFILENAME ofn;
+ char szFileName[256];
+ char szFileTitle[256];
+ char szFilter[256];
+
+ switch (uMsg) {
+ case WM_INITDIALOG:
+ SetWindowText(hW, _("Edit Cheat Codes"));
+
+ Button_SetText(GetDlgItem(hW, IDC_ADDCODE), _("&Add Code"));
+ Button_SetText(GetDlgItem(hW, IDC_EDITCODE), _("&Edit Code"));
+ Button_SetText(GetDlgItem(hW, IDC_REMOVECODE), _("&Remove Code"));
+ Button_SetText(GetDlgItem(hW, IDC_TOGGLECODE), _("&Enable/Disable"));
+ Button_SetText(GetDlgItem(hW, IDC_LOADCODE), _("&Load..."));
+ Button_SetText(GetDlgItem(hW, IDC_SAVECODE), _("&Save As..."));
+ Button_SetText(GetDlgItem(hW, IDCANCEL), _("&Close"));
+
+ List = GetDlgItem(hW, IDC_CODELIST);
+
+ SendMessage(List, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT);
+
+ memset(&col, 0, sizeof(col));
+
+ col.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
+ col.fmt = LVCFMT_LEFT;
+
+ col.pszText = _("Description");
+ col.cx = 400;
+
+ SendMessage(List, LVM_INSERTCOLUMN, 0, (LPARAM)&col);
+
+ col.pszText = _("Enabled");
+ col.cx = 55;
+
+ SendMessage(List, LVM_INSERTCOLUMN, 1, (LPARAM)&col);
+
+ UpdateCheatDlg(hW);
+ break;
+
+ case WM_COMMAND:
+ switch (wParam) {
+ case IDCANCEL:
+ EndDialog(hW, TRUE);
+ return TRUE;
+
+ case IDC_ADDCODE:
+ i = NumCheats;
+ DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CHEATEDIT), hW, CheatAddDlgProc);
+
+ if (NumCheats > i) {
+ // new cheat added
+ List = GetDlgItem(hW, IDC_CODELIST);
+ memset(&item, 0, sizeof(item));
+
+ item.mask = LVIF_TEXT;
+ item.iItem = i;
+ item.pszText = Cheats[i].Descr;
+ item.iSubItem = 0;
+
+ SendMessage(List, LVM_INSERTITEM, 0, (LPARAM)&item);
+
+ item.pszText = (Cheats[i].Enabled ? _("Yes") : _("No"));
+ item.iSubItem = 1;
+
+ SendMessage(List, LVM_SETITEM, 0, (LPARAM)&item);
+ }
+ break;
+
+ case IDC_EDITCODE:
+ List = GetDlgItem(hW, IDC_CODELIST);
+ iEditItem = ListView_GetSelectionMark(List);
+
+ if (iEditItem != -1) {
+ DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CHEATEDIT), hW, CheatEditDlgProc);
+
+ memset(&item, 0, sizeof(item));
+
+ item.mask = LVIF_TEXT;
+ item.iItem = iEditItem;
+ item.pszText = Cheats[iEditItem].Descr;
+ item.iSubItem = 0;
+
+ SendMessage(List, LVM_SETITEM, 0, (LPARAM)&item);
+ }
+ break;
+
+ case IDC_REMOVECODE:
+ List = GetDlgItem(hW, IDC_CODELIST);
+ i = ListView_GetSelectionMark(List);
+
+ if (i != -1) {
+ RemoveCheat(i);
+ ListView_DeleteItem(List, i);
+ ListView_SetSelectionMark(List, -1);
+ }
+ break;
+
+ case IDC_TOGGLECODE:
+ List = GetDlgItem(hW, IDC_CODELIST);
+ i = ListView_GetSelectionMark(List);
+
+ if (i != -1) {
+ Cheats[i].Enabled ^= 1;
+
+ memset(&item, 0, sizeof(item));
+
+ item.mask = LVIF_TEXT;
+ item.iItem = i;
+ item.pszText = (Cheats[i].Enabled ? _("Yes") : _("No"));
+ item.iSubItem = 1;
+
+ SendMessage(List, LVM_SETITEM, 0, (LPARAM)&item);
+ }
+ break;
+
+ case IDC_LOADCODE:
+ memset(&szFileName, 0, sizeof(szFileName));
+ memset(&szFileTitle, 0, sizeof(szFileTitle));
+ memset(&szFilter, 0, sizeof(szFilter));
+
+ strcpy(szFilter, _("PCSX Cheat Code Files"));
+ strcatz(szFilter, "*.*");
+
+ ofn.lStructSize = sizeof(OPENFILENAME);
+ ofn.hwndOwner = hW;
+ ofn.lpstrFilter = szFilter;
+ ofn.lpstrCustomFilter = NULL;
+ ofn.nMaxCustFilter = 0;
+ ofn.nFilterIndex = 1;
+ ofn.lpstrFile = szFileName;
+ ofn.nMaxFile = 256;
+ ofn.lpstrInitialDir = ".\\Cheats";
+ ofn.lpstrFileTitle = szFileTitle;
+ ofn.nMaxFileTitle = 256;
+ ofn.lpstrTitle = NULL;
+ ofn.lpstrDefExt = "CHT";
+ ofn.Flags = OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
+
+ if (GetOpenFileName((LPOPENFILENAME)&ofn)) {
+ LoadCheats(szFileName);
+ UpdateCheatDlg(hW);
+ }
+ break;
+
+ case IDC_SAVECODE:
+ memset(&szFileName, 0, sizeof(szFileName));
+ memset(&szFileTitle, 0, sizeof(szFileTitle));
+ memset(&szFilter, 0, sizeof(szFilter));
+
+ strcpy(szFilter, _("PCSX Cheat Code Files"));
+ strcatz(szFilter, "*.*");
+
+ ofn.lStructSize = sizeof(OPENFILENAME);
+ ofn.hwndOwner = hW;
+ ofn.lpstrFilter = szFilter;
+ ofn.lpstrCustomFilter = NULL;
+ ofn.nMaxCustFilter = 0;
+ ofn.nFilterIndex = 1;
+ ofn.lpstrFile = szFileName;
+ ofn.nMaxFile = 256;
+ ofn.lpstrInitialDir = ".\\Cheats";
+ ofn.lpstrFileTitle = szFileTitle;
+ ofn.nMaxFileTitle = 256;
+ ofn.lpstrTitle = NULL;
+ ofn.lpstrDefExt = "CHT";
+ ofn.Flags = OFN_HIDEREADONLY | OFN_NOCHANGEDIR | OFN_OVERWRITEPROMPT;
+
+ if (GetOpenFileName((LPOPENFILENAME)&ofn)) {
+ SaveCheats(szFileName);
+ }
+ break;
+ }
+ break;
+
+ case WM_NOTIFY:
+ switch (LOWORD(wParam)) {
+ case IDC_CODELIST:
+ List = GetDlgItem(hW, IDC_CODELIST);
+ i = ListView_GetSelectionMark(List);
+
+ if (i != -1) {
+ Button_Enable(GetDlgItem(hW, IDC_EDITCODE), TRUE);
+ Button_Enable(GetDlgItem(hW, IDC_REMOVECODE), TRUE);
+ Button_Enable(GetDlgItem(hW, IDC_TOGGLECODE), TRUE);
+ }
+ else {
+ Button_Enable(GetDlgItem(hW, IDC_EDITCODE), FALSE);
+ Button_Enable(GetDlgItem(hW, IDC_REMOVECODE), FALSE);
+ Button_Enable(GetDlgItem(hW, IDC_TOGGLECODE), FALSE);
+ }
+
+ Button_Enable(GetDlgItem(hW, IDC_SAVECODE), (NumCheats > 0));
+ break;
+ }
+ break;
+
+ case WM_CLOSE:
+ EndDialog(hW, TRUE);
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#define SEARCH_EQUALVAL 0
+#define SEARCH_NOTEQUALVAL 1
+#define SEARCH_RANGE 2
+#define SEARCH_INCBY 3
+#define SEARCH_DECBY 4
+#define SEARCH_INC 5
+#define SEARCH_DEC 6
+#define SEARCH_DIFFERENT 7
+#define SEARCH_NOCHANGE 8
+
+#define SEARCHTYPE_8BIT 0
+#define SEARCHTYPE_16BIT 1
+#define SEARCHTYPE_32BIT 2
+
+#define SEARCHBASE_DEC 0
+#define SEARCHBASE_HEX 1
+
+static char current_search = SEARCH_EQUALVAL;
+static char current_searchtype = SEARCHTYPE_8BIT;
+static char current_searchbase = SEARCHBASE_DEC;
+static uint32_t current_valuefrom = 0;
+static uint32_t current_valueto = 0;
+
+static void UpdateCheatSearchDlg(HWND hW) {
+}
+
+LRESULT WINAPI CheatSearchDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+ switch (uMsg) {
+ case WM_INITDIALOG:
+ SetWindowText(hW, _("Cheat Search"));
+
+ Static_SetText(GetDlgItem(hW, IDC_LABEL_SEARCHFOR), _("Search For:"));
+ Static_SetText(GetDlgItem(hW, IDC_LABEL_DATATYPE), _("Data Type:"));
+ Static_SetText(GetDlgItem(hW, IDC_LABEL_VALUE), _("Value:"));
+ Static_SetText(GetDlgItem(hW, IDC_LABEL_DATABASE), _("Data Base:"));
+ Static_SetText(GetDlgItem(hW, IDC_LABEL_TO), _("To:"));
+ Button_SetText(GetDlgItem(hW, IDC_FREEZE), _("&Freeze"));
+ Button_SetText(GetDlgItem(hW, IDC_MODIFY), _("&Modify"));
+ Button_SetText(GetDlgItem(hW, IDC_COPY), _("&Copy"));
+ Button_SetText(GetDlgItem(hW, IDC_SEARCH), _("&Search"));
+ Button_SetText(GetDlgItem(hW, IDC_NEWSEARCH), _("&New Search"));
+ Button_SetText(GetDlgItem(hW, IDCANCEL), _("C&lose"));
+
+ UpdateCheatSearchDlg(hW);
+ break;
+
+ case WM_COMMAND:
+ switch (wParam) {
+ case IDCANCEL:
+ EndDialog(hW, TRUE);
+ return TRUE;
+
+ case IDC_FREEZE:
+ break;
+
+ case IDC_MODIFY:
+ break;
+
+ case IDC_COPY:
+ break;
+
+ case IDC_SEARCH:
+ break;
+
+ case IDC_NEWSEARCH:
+ break;
+ }
+ break;
+
+ case WM_CLOSE:
+ EndDialog(hW, TRUE);
+ return TRUE;
+ }
+
+ return FALSE;
+}
diff --git a/win32/gui/ConfigurePlugins.c b/win32/gui/ConfigurePlugins.c index 333cecab..3e6eaeb0 100644 --- a/win32/gui/ConfigurePlugins.c +++ b/win32/gui/ConfigurePlugins.c @@ -19,7 +19,7 @@ #include <windows.h>
#include <windowsx.h>
#include <stdio.h>
-#include "PsxCommon.h"
+#include "psxcommon.h"
#include "plugin.h"
#include "plugins.h"
#include "resource.h"
@@ -271,17 +271,16 @@ char *GetSelDLL(HWND hW,int id) { }
void OnOK(HWND hW) {
- char * gpuDLL=GetSelDLL(hW,IDC_LISTGPU);
- char * spuDLL=GetSelDLL(hW,IDC_LISTSPU);
- char * cdrDLL=GetSelDLL(hW,IDC_LISTCDR);
- char * pad1DLL=GetSelDLL(hW,IDC_LISTPAD1);
- char * pad2DLL=GetSelDLL(hW,IDC_LISTPAD2);
- char * biosFILE=GetSelDLL(hW,IDC_LISTBIOS);
-
- if ((gpuDLL==NULL) || (spuDLL ==NULL) ||
- (cdrDLL ==NULL) || (pad1DLL==NULL) ||
- (pad2DLL==NULL) ||(biosFILE==NULL)) {
- MessageBox(hW,"Configuration not OK!","Error",MB_OK|MB_ICONERROR);
+ char *gpuDLL=GetSelDLL(hW,IDC_LISTGPU);
+ char *spuDLL=GetSelDLL(hW,IDC_LISTSPU);
+ char *cdrDLL=GetSelDLL(hW,IDC_LISTCDR);
+ char *pad1DLL=GetSelDLL(hW,IDC_LISTPAD1);
+ char *pad2DLL=GetSelDLL(hW,IDC_LISTPAD2);
+ char *biosFILE=GetSelDLL(hW,IDC_LISTBIOS);
+
+ if (gpuDLL == NULL || spuDLL == NULL || cdrDLL == NULL || pad1DLL == NULL ||
+ pad2DLL == NULL || biosFILE == NULL) {
+ MessageBox(hW, _("Configuration not OK!"), _("Error"), MB_OK | MB_ICONERROR);
return;
}
@@ -626,4 +625,3 @@ BOOL CALLBACK ConfigureNetPlayDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM return FALSE;
}
-
diff --git a/win32/gui/Win32.h b/win32/gui/Win32.h index 419fe553..805d6de4 100644 --- a/win32/gui/Win32.h +++ b/win32/gui/Win32.h @@ -36,11 +36,16 @@ extern char cfgfile[256]; extern int Running;
extern char PcsxDir[256];
+void strcatz(char *dst, char *src);
+
LRESULT WINAPI MainWndProc(HWND, UINT, WPARAM, LPARAM);
BOOL CALLBACK ConfigureMcdsDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK ConfigureNetPlayDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
+LRESULT WINAPI CheatDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
+LRESULT WINAPI CheatSearchDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
void ConfigurePlugins(HWND hWnd);
int Open_File_Proc(char *file);
diff --git a/win32/gui/WndMain.c b/win32/gui/WndMain.c index 1ba3e8ce..272b1254 100644 --- a/win32/gui/WndMain.c +++ b/win32/gui/WndMain.c @@ -27,12 +27,13 @@ #include "resource.h"
#include "AboutDlg.h"
-#include "PsxCommon.h"
+#include "psxcommon.h"
#include "plugin.h"
-#include "Debug.h"
+#include "debug.h"
#include "Win32.h"
-#include "Sio.h"
+#include "sio.h"
#include "misc.h"
+#include "cheat.h"
#ifdef __MINGW32__
#ifndef LVM_GETSELECTIONMARK
@@ -222,6 +223,7 @@ void States_Load(int num) { GPU_displayText(Text);
Running = 1;
+ CheatSearchBackupMemory();
psxCpu->Execute();
}
@@ -243,6 +245,7 @@ void States_Save(int num) { GPU_displayText(Text);
Running = 1;
+ CheatSearchBackupMemory();
psxCpu->Execute();
}
@@ -314,7 +317,7 @@ void OnStates_SaveOther() { ofn.lStructSize = sizeof(OPENFILENAME);
ofn.hwndOwner = gApp.hWnd;
ofn.lpstrFilter = szFilter;
- ofn.lpstrCustomFilter = NULL;
+ ofn.lpstrCustomFilter = NULL;
ofn.nMaxCustFilter = 0;
ofn.nFilterIndex = 1;
ofn.lpstrFile = szFileName;
@@ -324,7 +327,7 @@ void OnStates_SaveOther() { ofn.nMaxFileTitle = MAXFILENAME;
ofn.lpstrTitle = NULL;
ofn.lpstrDefExt = NULL;
- ofn.Flags = OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
+ ofn.Flags = OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
if (GetOpenFileName ((LPOPENFILENAME)&ofn)) {
char Text[256];
@@ -484,6 +487,7 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { OpenPlugins(hWnd);
ShowCursor(FALSE);
Running = 1;
+ CheatSearchBackupMemory();
psxCpu->Execute();
return TRUE;
@@ -510,6 +514,7 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { ShowCursor(FALSE);
Running = 1;
cdOpenCase = time(NULL) + 2;
+ CheatSearchBackupMemory();
psxCpu->Execute();
return TRUE;
@@ -546,6 +551,14 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { ConfigurePlugins(hWnd);
return TRUE;
+ case ID_CONFIGURATION_CHEATLIST:
+ DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CHEATLIST), hWnd, (DLGPROC)CheatDlgProc);
+ break;
+
+ case ID_CONFIGURATION_CHEATSEARCH:
+ DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CHEATSEARCH), hWnd, (DLGPROC)CheatSearchDlgProc);
+ break;
+
case ID_HELP_ABOUT:
DialogBox(gApp.hInstance, MAKEINTRESOURCE(ABOUT_DIALOG), hWnd, (DLGPROC)AboutDlgProc);
return TRUE;
@@ -567,7 +580,7 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { case WM_KEYDOWN:
PADhandleKey(wParam);
return TRUE;
-
+
case WM_DESTROY:
if (!AccBreak) {
if (Running) ClosePlugins();
@@ -576,7 +589,7 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { exit(0);
}
else AccBreak = 0;
-
+
DeleteObject(hBm);
DeleteDC(hdcmem);
return TRUE;
@@ -606,7 +619,7 @@ void CreateListView(int idc) { col.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
col.fmt = LVCFMT_LEFT;
-
+
col.pszText = _("Title");
col.cx = 170;
col.iSubItem = 0;
@@ -1417,9 +1430,9 @@ void CreateMainMenu() { ADDSEPARATOR(0);
ADDSUBMENUS(0, 1, _("&States"));
ADDSEPARATOR(0);
- ADDMENUITEM(0, _("Run &EXE"), ID_FILE_RUN_EXE);
+ ADDMENUITEM(0, _("Run &EXE..."), ID_FILE_RUN_EXE);
ADDMENUITEM(0, _("Run &BIOS"), ID_FILE_RUNBIOS);
- ADDMENUITEM(0, _("Run &ISO"), ID_FILE_RUN_ISO);
+ ADDMENUITEM(0, _("Run &ISO..."), ID_FILE_RUN_ISO);
ADDMENUITEM(0, _("Run &CD"), ID_FILE_RUN_CD);
ADDSUBMENUS(1, 3, _("&Save"));
ADDSUBMENUS(1, 2, _("&Load"));
@@ -1437,23 +1450,26 @@ void CreateMainMenu() { ADDMENUITEM(3, _("Slot &1"), ID_FILE_STATES_SAVE_SLOT1);
ADDSUBMENU(0, _("&Emulator"));
- ADDMENUITEM(0, _("S&witch ISO"), ID_EMULATOR_SWITCH_ISO);
+ ADDMENUITEM(0, _("S&witch ISO..."), ID_EMULATOR_SWITCH_ISO);
ADDSEPARATOR(0);
ADDMENUITEM(0, _("Re&set"), ID_EMULATOR_RESET);
ADDMENUITEM(0, _("&Run"), ID_EMULATOR_RUN);
ADDSUBMENU(0, _("&Configuration"));
- ADDMENUITEM(0, _("&Memory cards"), ID_CONFIGURATION_MEMORYCARDMANAGER);
- ADDMENUITEM(0, _("C&PU"), ID_CONFIGURATION_CPU);
+ ADDMENUITEM(0, _("Cheat &Search..."), ID_CONFIGURATION_CHEATSEARCH);
+ ADDMENUITEM(0, _("Ch&eat Code..."), ID_CONFIGURATION_CHEATLIST);
+ ADDSEPARATOR(0);
+ ADDMENUITEM(0, _("&Memory cards..."), ID_CONFIGURATION_MEMORYCARDMANAGER);
+ ADDMENUITEM(0, _("C&PU..."), ID_CONFIGURATION_CPU);
ADDSEPARATOR(0);
- ADDMENUITEM(0, _("&NetPlay"), ID_CONFIGURATION_NETPLAY);
+ ADDMENUITEM(0, _("&NetPlay..."), ID_CONFIGURATION_NETPLAY);
ADDSEPARATOR(0);
- ADDMENUITEM(0, _("&Controllers"), ID_CONFIGURATION_CONTROLLERS);
- ADDMENUITEM(0, _("CD-&ROM"), ID_CONFIGURATION_CDROM);
- ADDMENUITEM(0, _("&Sound"), ID_CONFIGURATION_SOUND);
- ADDMENUITEM(0, _("&Graphics"), ID_CONFIGURATION_GRAPHICS);
+ ADDMENUITEM(0, _("&Controllers..."), ID_CONFIGURATION_CONTROLLERS);
+ ADDMENUITEM(0, _("CD-&ROM..."), ID_CONFIGURATION_CDROM);
+ ADDMENUITEM(0, _("&Sound..."), ID_CONFIGURATION_SOUND);
+ ADDMENUITEM(0, _("&Graphics..."), ID_CONFIGURATION_GRAPHICS);
ADDSEPARATOR(0);
- ADDMENUITEM(0, _("&Plugins && Bios"), ID_CONFIGURATION);
+ ADDMENUITEM(0, _("&Plugins && Bios..."), ID_CONFIGURATION);
ADDSUBMENU(0, _("&Language"));
@@ -1508,6 +1524,7 @@ void CreateMainMenu() { EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT4, MF_BYCOMMAND | MF_GRAYED);
EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT5, MF_BYCOMMAND | MF_GRAYED);
EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_OTHER, MF_BYCOMMAND | MF_GRAYED);
+ EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_CHEATSEARCH, MF_BYCOMMAND | MF_GRAYED);
}
}
@@ -1645,7 +1662,7 @@ void SysPrintf(char *fmt, ...) { WriteConsole(hConsole, msg, (DWORD)strlen(msg), &tmp, 0);
#ifdef EMU_LOG
#ifndef LOG_STDOUT
- fprintf(emuLog, "%s", msg);
+ if (emuLog != NULL) fprintf(emuLog, "%s", msg);
#endif
#endif
}
diff --git a/win32/gui/cdrom02.ico b/win32/gui/cdrom02.ico Binary files differindex 6d19bf81..98daa5b8 100755 --- a/win32/gui/cdrom02.ico +++ b/win32/gui/cdrom02.ico diff --git a/win32/gui/plugin.c b/win32/gui/plugin.c index 9e84f74c..8ae075ad 100644 --- a/win32/gui/plugin.c +++ b/win32/gui/plugin.c @@ -25,11 +25,11 @@ #include <time.h>
#include <stdio.h>
-#include "R3000A.h"
+#include "r3000a.h"
#include "Win32.h"
#include "NoPic.h"
-#include "Misc.h"
-#include "Sio.h"
+#include "misc.h"
+#include "sio.h"
int ShowPic = 0;
diff --git a/win32/pcsx.dev b/win32/pcsx.dev index 99427072..f038aa72 100644 --- a/win32/pcsx.dev +++ b/win32/pcsx.dev @@ -9,7 +9,7 @@ CppCompiler=-D__GNUWIN32__ -march=pentiumpro -D_M_IX86=600 -W -finline-functions Includes=.;./zlib;../libpcsxcore;./glue;./gui;./intl
Linker=-lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lcomctl32_@@_
Libs=
-UnitCount=105
+UnitCount=106
Folders=glue,glue/sys,gui,intl,libpcsxcore,libpcsxcore/ix86,zlib
ObjFiles=
PrivateResource=pcsx_private.rc
@@ -1097,3 +1097,13 @@ Priority=1000 OverrideBuildCmd=0
BuildCmd=$(CC) -c cheat.c -o cheat.o $(CFLAGS)
+[Unit106]
+FileName=gui\CheatDlg.c
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
diff --git a/win32/pcsx.dsp b/win32/pcsx.dsp index 994f08f5..dc5b883d 100644 --- a/win32/pcsx.dsp +++ b/win32/pcsx.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /Zp16 /W3 /GX /O2 /Op /Ob2 /I "../" /I "./zlib" /I "../libpcsxcore" /I "./glue" /I "./" /I "./gui" /I "./intl" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "__WIN32__" /D "_MSC_VER_" /D PCSX_VERSION=\"1.5\" /D "__i386__" /D "ENABLE_NLS" /D PACKAGE=\"pcsx\" /D inline=__forceinline /FD /Zm200 /c
+# ADD CPP /nologo /G6 /Zp16 /W3 /GX /O2 /Op /Ob2 /I "../" /I "./zlib" /I "../libpcsxcore" /I "./glue" /I "./" /I "./gui" /I "./intl" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "__WIN32__" /D "_MSC_VER_" /D PCSX_VERSION=\"1.5\" /D "__i386__" /D "ENABLE_NLS" /D PACKAGE=\"pcsx\" /D inline=__forceinline /FR /FD /Zm200 /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x408 /d "NDEBUG"
@@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D PCSX_VERSION=\"1.3\" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /GX /ZI /Od /I "../" /I "./zlib" /I "../libpcsxcore" /I "./glue" /I "./" /I "./gui" /I "./intl" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "__WIN32__" /D "__i386__" /D PCSX_VERSION=\"1.5\" /D "ENABLE_NLS" /D PACKAGE=\"pcsx\" /D inline= /FD /GZ /Zm200 /c
+# ADD CPP /nologo /W3 /GX /ZI /Od /I "../" /I "./zlib" /I "../libpcsxcore" /I "./glue" /I "./" /I "./gui" /I "./intl" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "__WIN32__" /D "__i386__" /D PCSX_VERSION=\"1.5\" /D "ENABLE_NLS" /D PACKAGE=\"pcsx\" /D inline= /FR /FD /GZ /Zm200 /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x408 /d "_DEBUG"
@@ -296,6 +296,10 @@ SOURCE=.\gui\cdrom02.ico # End Source File
# Begin Source File
+SOURCE=.\gui\CheatDlg.c
+# End Source File
+# Begin Source File
+
SOURCE=.\gui\ConfigurePlugins.c
# End Source File
# Begin Source File
diff --git a/win32/pcsx.rc b/win32/pcsx.rc index 84aaa1e5..7e2d6638 100644 --- a/win32/pcsx.rc +++ b/win32/pcsx.rc @@ -1,4 +1,4 @@ -//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
@@ -21,7 +21,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED #pragma code_page(936)
#endif //_WIN32
-#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
@@ -44,18 +43,14 @@ BEGIN BEGIN
BLOCK "080404b0"
BEGIN
- VALUE "Comments", "\0"
- VALUE "CompanyName", " \0"
- VALUE "FileDescription", "pcsx\0"
- VALUE "FileVersion", "1, 0, 0, 1\0"
- VALUE "InternalName", "pcsx\0"
- VALUE "LegalCopyright", "Copyright (c) 2009\0"
- VALUE "LegalTrademarks", "\0"
- VALUE "OriginalFilename", "pcsx.exe\0"
- VALUE "PrivateBuild", "\0"
- VALUE "ProductName", " pcsx\0"
- VALUE "ProductVersion", "1, 0, 0, 1\0"
- VALUE "SpecialBuild", "\0"
+ VALUE "CompanyName", " "
+ VALUE "FileDescription", "pcsx"
+ VALUE "FileVersion", "1, 0, 0, 1"
+ VALUE "InternalName", "pcsx"
+ VALUE "LegalCopyright", "Copyright (c) 2009"
+ VALUE "OriginalFilename", "pcsx.exe"
+ VALUE "ProductName", " pcsx"
+ VALUE "ProductVersion", "1, 0, 0, 1"
END
END
BLOCK "VarFileInfo"
@@ -64,8 +59,6 @@ BEGIN END
END
-#endif // !_MAC
-
#endif // Chinese (P.R.C.) resources
/////////////////////////////////////////////////////////////////////////////
@@ -84,8 +77,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Dialog
//
-IDD_MCDCONF DIALOG DISCARDABLE 0, 0, 407, 197
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_MCDCONF DIALOG 0, 0, 407, 197
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
CAPTION "Memcard Manager"
FONT 8, "MS Sans Serif"
BEGIN
@@ -113,9 +107,10 @@ BEGIN END
ABOUT_DIALOG DIALOGEX 0, 0, 332, 209
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
CAPTION "About"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,134,187,50,14
CTEXT "PCSX EMU\nVersion x.x",IDC_PCSX_ABOUT_TEXT,22,10,112,15,
@@ -129,41 +124,42 @@ BEGIN GROUPBOX "",IDC_STATIC,43,100,234,79
END
-IDD_CPUCONF DIALOG DISCARDABLE 0, 0, 232, 175
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_CPUCONF DIALOG 0, 0, 232, 175
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
CAPTION "Cpu Config"
FONT 8, "MS Sans Serif"
BEGIN
DEFPUSHBUTTON "OK",IDOK,50,155,50,14
PUSHBUTTON "Cancel",IDCANCEL,120,155,50,14
CONTROL "Disable Xa Decoding",IDC_XA,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,10,15,83,10
+ WS_TABSTOP,10,15,91,10
CONTROL "Sio Irq Always Enabled",IDC_SIO,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,10,30,88,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,10,30,92,10
CONTROL "Black && White Movies",IDC_MDEC,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,10,60,85,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,10,60,200,10
CONTROL "Autodetect",IDC_PSXAUTO,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,10,126,51,10
+ WS_TABSTOP,10,126,83,10
GROUPBOX "Misc Options",IDC_MISCOPT,5,5,220,100
COMBOBOX IDC_PSXTYPES,105,126,53,50,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
GROUPBOX "Select Psx System Type",IDC_SELPSX,5,110,220,35
CONTROL "Disable Cd Audio",IDC_CDDA,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,105,15,70,10
+ WS_TABSTOP,105,15,113,10
CONTROL "Enable Console Output",IDC_PSXOUT,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,105,30,89,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,105,30,113,10
CONTROL "Enable Interpreter Cpu",IDC_CPU,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,105,45,87,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,105,45,113,10
CONTROL "Spu Irq Always Enabled",IDC_SPUIRQ,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,10,45,91,10
CONTROL "Parasite Eve 2, Vandal Hearts 1/2 Fix",IDC_RCNTFIX,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,75,135,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,75,205,10
CONTROL "InuYasha Sengoku Battle Fix",IDC_VSYNCWA,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,10,90,107,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,10,90,205,10
END
-IDD_NETPLAY DIALOG DISCARDABLE 0, 0, 165, 95
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_NETPLAY DIALOG 0, 0, 165, 95
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "NetPlay Configuration"
FONT 8, "MS Sans Serif"
BEGIN
@@ -179,8 +175,8 @@ BEGIN IDC_NETPLAYNOTE,10,50,145,19
END
-IDD_CONNECT DIALOG DISCARDABLE 0, 0, 112, 31
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_CONNECT DIALOG 0, 0, 112, 31
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Connecting..."
FONT 8, "MS Sans Serif"
BEGIN
@@ -188,10 +184,11 @@ BEGIN 104,8
END
-IDD_CONFIG DIALOG DISCARDABLE 0, 0, 322, 161
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_CONFIG DIALOGEX 0, 0, 322, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
CAPTION "Configuration"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
COMBOBOX IDC_LISTGPU,10,10,145,74,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
@@ -234,6 +231,73 @@ BEGIN PUSHBUTTON "Set Plugins Directory",IDC_PLUGINSDIR,10,140,75,14
END
+IDD_CHEATLIST DIALOGEX 0, 0, 392, 201
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Edit Cheat Codes"
+FONT 8, "MS Sans Serif", 0, 0, 0x0
+BEGIN
+ PUSHBUTTON "&Close",IDCANCEL,324,180,61,14
+ CONTROL "List2",IDC_CODELIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT |
+ LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,312,187
+ PUSHBUTTON "&Enable/Disable",IDC_TOGGLECODE,324,7,61,14
+ PUSHBUTTON "&Add Code",IDC_ADDCODE,324,32,61,14
+ PUSHBUTTON "&Edit Code",IDC_EDITCODE,324,50,61,14
+ PUSHBUTTON "&Remove Code",IDC_REMOVECODE,324,68,61,14
+ PUSHBUTTON "&Load...",IDC_LOADCODE,324,96,61,14
+ PUSHBUTTON "&Save As...",IDC_SAVECODE,324,114,61,14
+END
+
+IDD_CHEATSEARCH DIALOGEX 0, 0, 280, 214
+STYLE DS_SETFONT | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION
+CAPTION "Cheat Search"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ LTEXT "Search For:",IDC_LABEL_SEARCHFOR,7,9,51,8,0,
+ WS_EX_TRANSPARENT
+ COMBOBOX IDC_SEARCHFOR,60,7,80,224,CBS_DROPDOWNLIST | WS_VSCROLL |
+ WS_TABSTOP
+ LTEXT "Data Type:",IDC_LABEL_DATATYPE,7,26,51,8,0,
+ WS_EX_TRANSPARENT
+ COMBOBOX IDC_DATATYPE,60,24,80,224,CBS_DROPDOWNLIST | WS_VSCROLL |
+ WS_TABSTOP
+ LTEXT "Data Base:",IDC_LABEL_DATABASE,147,26,44,8,0,
+ WS_EX_TRANSPARENT
+ COMBOBOX 107,194,24,81,224,CBS_DROPDOWNLIST | WS_VSCROLL |
+ WS_TABSTOP
+ LTEXT "Value:",IDC_LABEL_VALUE,7,43,50,8,0,WS_EX_TRANSPARENT
+ EDITTEXT IDC_VALUEFROM,60,41,80,12,ES_AUTOHSCROLL
+ RTEXT "To",IDC_LABEL_TO,144,43,45,8,0,WS_EX_TRANSPARENT
+ EDITTEXT IDC_VALUETO,194,41,80,12,ES_AUTOHSCROLL
+ LTEXT "Addresses Found : 0",IDC_LABEL_RESULTSFOUND,7,180,263,8,
+ 0,WS_EX_TRANSPARENT
+ LISTBOX IDC_RESLIST,6,62,199,112,LBS_NOINTEGRALHEIGHT |
+ WS_VSCROLL | WS_TABSTOP
+ PUSHBUTTON "&Freeze",IDC_FREEZE,213,63,62,17,WS_DISABLED
+ PUSHBUTTON "&Modify",IDC_MODIFY,213,86,62,17,WS_DISABLED
+ PUSHBUTTON "&Copy",IDC_COPY,213,109,62,17,WS_DISABLED
+ DEFPUSHBUTTON "&Search",IDC_SEARCH,8,194,86,14
+ PUSHBUTTON "&New Search",IDC_NEWSEARCH,98,194,86,14
+ PUSHBUTTON "C&lose",IDCANCEL,188,194,86,14
+ EDITTEXT 10000,0,1000,10,10,ES_AUTOHSCROLL | NOT WS_BORDER | NOT
+ WS_TABSTOP
+END
+
+IDD_CHEATEDIT DIALOGEX 0, 0, 261, 175
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Edit Cheat Code"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,139,154,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,197,154,50,14
+ LTEXT "Description:",IDC_LABEL_DESCR,16,15,39,8
+ LTEXT "Cheat Code:",IDC_LABEL_CODE,15,49,42,8
+ EDITTEXT IDC_DESCR,15,25,232,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_CODE,15,60,231,84,ES_MULTILINE | ES_UPPERCASE |
+ ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN
+END
+
/////////////////////////////////////////////////////////////////////////////
//
@@ -241,7 +305,7 @@ END //
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO MOVEABLE PURE
+GUIDELINES DESIGNINFO
BEGIN
IDD_MCDCONF, DIALOG
BEGIN
@@ -285,6 +349,22 @@ BEGIN BEGIN
BOTTOMMARGIN, 147
END
+
+ IDD_CHEATLIST, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 385
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 194
+ END
+
+ IDD_CHEATEDIT, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 254
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 168
+ END
END
#endif // APSTUDIO_INVOKED
@@ -296,22 +376,22 @@ END // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_APP_ICON ICON DISCARDABLE "gui\\cdrom02.ico"
+IDI_APP_ICON ICON "gui\\cdrom02.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
//
-SPLASH_LOGO BITMAP MOVEABLE PURE "gui\\about.bmp"
-MAIN_LOGO BITMAP MOVEABLE PURE "gui\\pcsx.bmp"
+SPLASH_LOGO BITMAP "gui\\about.bmp"
+MAIN_LOGO BITMAP "gui\\pcsx.bmp"
/////////////////////////////////////////////////////////////////////////////
//
// RT_MANIFEST
//
-24 RT_MANIFEST MOVEABLE PURE "gui\\pcsx.exe.manifest"
+24 RT_MANIFEST "gui\\pcsx.exe.manifest"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
@@ -331,18 +411,18 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT // TEXTINCLUDE
//
-1 TEXTINCLUDE MOVEABLE PURE
+1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE MOVEABLE PURE
+2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE MOVEABLE PURE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
diff --git a/win32/resource.h b/win32/resource.h index 7d4e191e..5a1ce57d 100644 --- a/win32/resource.h +++ b/win32/resource.h @@ -1,25 +1,41 @@ //{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
+// Microsoft Visual C++ generated include file.
// Used by pcsx.rc
//
#define IDS_TITLE 1
+#define IDC_SEARCHFOR 100
#define IDR_MENU1 101
#define IDI_APP_ICON 102
#define IDD_MCDCONF 102
#define DEBUG_DIALOG 103
+#define IDC_VALUEFROM 103
#define ABOUT_DIALOG 104
+#define IDC_LABEL_TO 104
#define IDD_CPUCONF 105
+#define IDC_VALUETO 105
+#define IDC_DATATYPE 106
#define IDD_NETPLAY 108
+#define IDC_LABEL_RESULTSFOUND 108
#define IDD_CONNECT 109
+#define IDC_RESLIST 109
+#define IDD_CHEATLIST 110
+#define IDC_SEARCH 110
+#define IDC_NEWSEARCH 111
+#define IDD_CHEATSEARCH 112
#define SPLASH_LOGO 113
-#define MAIN_LOGO 118
+#define IDC_MODIFY 113
#define IDD_GPREGS 114
+#define IDC_FREEZE 114
+#define IDD_CHEATEDIT 114
#define IDD_CP0REGS 115
+#define IDC_COPY 115
#define IDD_COP2D 116
#define IDD_COP2C 117
+#define MAIN_LOGO 118
#define IDD_CONFIG 120
#define IDD_MEMVIEW 136
#define IDC_EDIT2 1001
+#define IDC_CODE 1001
#define IDC_MCD2 1004
#define IDC_ASMCHECK1 1005
#define IDC_MCD1 1005
@@ -39,6 +55,7 @@ #define IDC_QKEYS 1012
#define IDC_EDIT1 1013
#define IDC_CDDA 1013
+#define IDC_DESCR 1013
#define IDC_CLOSE 1014
#define IDC_PCSX_ABOUT_TEXT 1014
#define IDC_PSXOUT 1014
@@ -108,11 +125,19 @@ #define IDC_FRAMEMCD1 1041
#define IDC_FRAMEMCD2 1042
#define IDC_CP031 1044
+#define IDC_CODELIST 1044
+#define IDC_REMOVECODE 1045
+#define IDC_EDITCODE 1046
#define IDC_GPR0 1047
+#define IDC_TOGGLECODE 1047
#define IDC_GPR1 1048
+#define IDC_SAVECODE 1048
#define IDC_GPR2 1049
+#define IDC_LOADCODE 1049
#define IDC_GPR3 1050
+#define IDC_LABEL_DESCR 1050
#define IDC_GPR4 1051
+#define IDC_LABEL_CODE 1051
#define IDC_GPR5 1052
#define IDC_LISTGPU 1052
#define IDC_GPR6 1053
@@ -257,16 +282,20 @@ #define IDC_BUTTON1 1254
#define IDC_BIOSDIR 1254
#define IDC_FORMAT1 1254
+#define IDC_ADDCODE 1254
#define IDC_PLUGINSDIR 1255
#define IDC_FORMAT2 1255
+#define IDC_LABEL_DATATYPE 1260
+#define IDC_LABEL_SEARCHFOR 1261
+#define IDC_LABEL_VALUE 1262
+#define IDC_LABEL_DATABASE 1263
#define ID_FILE_EXIT 40001
+#define ID_HELP_ABOUT 40002
#define ID_FILE_RUN_CD 40003
#define ID_FILE_RUN_EXE 40004
-#define ID_FILE_RUN_ISO 40007
#define ID_EMULATOR_PAUSE 40005
#define ID_EMULATOR_RESET 40006
-#define ID_EMULATOR_SWITCH_ISO 40044
-#define ID_HELP_ABOUT 40002
+#define ID_FILE_RUN_ISO 40007
#define ID_DEBUG_ENABLE_DEBUGGER 40008
#define ID_CONFIGURATION_GRAPHICS 40009
#define ID_CONFIGURATION_SOUND 40010
@@ -292,15 +321,18 @@ #define ID_FILE_STATES_SAVE_SLOT5 40041
#define ID_FILE_STATES_SAVE_OTHER 40042
#define ID_CONFIGURATION_NETPLAY 40043
+#define ID_EMULATOR_SWITCH_ISO 40044
+#define ID_CONFIGURATION_CHEATLIST 40045
+#define ID_CONFIGURATION_CHEATSEARCH 40046
#define ID_LANGS 50000
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 110
-#define _APS_NEXT_COMMAND_VALUE 40045
-#define _APS_NEXT_CONTROL_VALUE 1043
+#define _APS_NEXT_RESOURCE_VALUE 114
+#define _APS_NEXT_COMMAND_VALUE 40047
+#define _APS_NEXT_CONTROL_VALUE 1052
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
|