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

Merge branch 'master' of https://github.com/project64/project64

This commit is contained in:
zilmar 2015-12-02 07:37:50 +11:00
parent f50f634daf 902426737e
commit d9b0759de4
5 changed files with 62 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Project64/User Interface/Gui Class.cpp
View File

@ -450,7 +450,7 @@ void CMainGui::Caption(LPCWSTR Caption)
void CMainGui::Create(const char * WindowTitle) void CMainGui::Create(const char * WindowTitle)
{ {
stdstr_f VersionDisplay("Project64 %s", VER_FILE_VERSION_STR); stdstr_f VersionDisplay("Project64 %s", VER_FILE_VERSION_STR);
m_hMainWindow = CreateWindowExW(WS_EX_ACCEPTFILES, VersionDisplay.ToUTF16().c_str(), stdstr(WindowTitle).ToUTF16().c_str(), WS_OVERLAPPED | WS_CLIPCHILDREN | m_hMainWindow = CreateWindowExW(WS_EX_ACCEPTFILES, VersionDisplay.ToUTF16().c_str(), stdstr(WindowTitle).ToUTF16().c_str(), WS_OVERLAPPED | WS_CLIPCHILDREN |
WS_CLIPSIBLINGS | WS_SYSMENU | WS_MINIMIZEBOX, 5, 5, 640, 480, WS_CLIPSIBLINGS | WS_SYSMENU | WS_MINIMIZEBOX, 5, 5, 640, 480,
NULL, NULL, GetModuleHandle(NULL), this); NULL, NULL, GetModuleHandle(NULL), this);
m_Created = m_hMainWindow != NULL; m_Created = m_hMainWindow != NULL;
@ -972,12 +972,12 @@ LRESULT CALLBACK CMainGui::MainGui_Proc(HWND hWnd, DWORD uMsg, DWORD wParam, DWO
if (_this == NULL) { break; } if (_this == NULL) { break; }
switch (LOWORD(wParam)) { switch (LOWORD(wParam)) {
case ID_POPUPMENU_PLAYGAME: g_BaseSystem->RunFileImage(stdstr().FromUTF16(_this->CurrentedSelectedRom()).c_str()); break; case ID_POPUPMENU_PLAYGAME: g_BaseSystem->RunFileImage(_this->CurrentedSelectedRom()); break;
case ID_POPUPMENU_ROMDIRECTORY: _this->SelectRomDir(); break; case ID_POPUPMENU_ROMDIRECTORY: _this->SelectRomDir(); break;
case ID_POPUPMENU_REFRESHROMLIST: _this->RefreshRomBrowser(); break; case ID_POPUPMENU_REFRESHROMLIST: _this->RefreshRomBrowser(); break;
case ID_POPUPMENU_ROMINFORMATION: case ID_POPUPMENU_ROMINFORMATION:
{ {
RomInformation Info(stdstr().FromUTF16(_this->CurrentedSelectedRom()).c_str()); RomInformation Info(_this->CurrentedSelectedRom());
Info.DisplayInformation(hWnd); Info.DisplayInformation(hWnd);
} }
break; break;
@ -985,7 +985,7 @@ LRESULT CALLBACK CMainGui::MainGui_Proc(HWND hWnd, DWORD uMsg, DWORD wParam, DWO
case ID_POPUPMENU_EDITCHEATS: case ID_POPUPMENU_EDITCHEATS:
{ {
CN64Rom Rom; CN64Rom Rom;
Rom.LoadN64Image(stdstr().FromUTF16(_this->CurrentedSelectedRom()).c_str(), true); Rom.LoadN64Image(_this->CurrentedSelectedRom(), true);
Rom.SaveRomSettingID(true); Rom.SaveRomSettingID(true);
if (LOWORD(wParam) == ID_POPUPMENU_EDITSETTINGS) if (LOWORD(wParam) == ID_POPUPMENU_EDITSETTINGS)
@ -1039,7 +1039,7 @@ LRESULT CALLBACK CMainGui::MainGui_Proc(HWND hWnd, DWORD uMsg, DWORD wParam, DWO
if (g_Plugins->Gfx() && g_Plugins->Gfx()->OnRomBrowserMenuItem != NULL) if (g_Plugins->Gfx() && g_Plugins->Gfx()->OnRomBrowserMenuItem != NULL)
{ {
CN64Rom Rom; CN64Rom Rom;
if (!Rom.LoadN64Image(stdstr().FromUTF16(_this->CurrentedSelectedRom()).c_str(), true)) if (!Rom.LoadN64Image(_this->CurrentedSelectedRom(), true))
{ {
break; break;
} }

54
Source/Project64/User Interface/Rom Browser Class.cpp
View File

@ -277,17 +277,17 @@ int32_t CRomBrowser::CalcSortPosition(uint32_t lParam)
return End + 1; return End + 1;
} }
void CRomBrowser::AddRomToList(const wchar_t * RomLocation, const wchar_t * lpLastRom) void CRomBrowser::AddRomToList(const char * RomLocation, const char * lpLastRom)
{ {
ROM_INFO RomInfo; ROM_INFO RomInfo;
memset(&RomInfo, 0, sizeof(ROM_INFO)); memset(&RomInfo, 0, sizeof(ROM_INFO));
wcsncpy(RomInfo.szFullFileName, RomLocation, (sizeof(RomInfo.szFullFileName) / sizeof(RomInfo.szFullFileName[0])) - 1); strncpy(RomInfo.szFullFileName, RomLocation, (sizeof(RomInfo.szFullFileName) / sizeof(RomInfo.szFullFileName[0])) - 1);
if (!FillRomInfo(&RomInfo)) { return; } if (!FillRomInfo(&RomInfo)) { return; }
AddRomInfoToList(RomInfo, lpLastRom); AddRomInfoToList(RomInfo, lpLastRom);
} }
void CRomBrowser::AddRomInfoToList(ROM_INFO &RomInfo, const wchar_t * lpLastRom) void CRomBrowser::AddRomInfoToList(ROM_INFO &RomInfo, const char * lpLastRom)
{ {
int32_t ListPos = m_RomInfo.size(); int32_t ListPos = m_RomInfo.size();
m_RomInfo.push_back(RomInfo); m_RomInfo.push_back(RomInfo);
@ -305,7 +305,7 @@ void CRomBrowser::AddRomInfoToList(ROM_INFO &RomInfo, const wchar_t * lpLastRom)
//if (iItem == -1) { return; } //if (iItem == -1) { return; }
//if the last rom then highlight the item //if the last rom then highlight the item
if (iItem < 0 && _wcsicmp(RomInfo.szFullFileName, lpLastRom) == 0) if (iItem < 0 && _stricmp(RomInfo.szFullFileName, lpLastRom) == 0)
{ {
ListView_SetItemState(m_hRomList, index, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED); ListView_SetItemState(m_hRomList, index, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);
} }
@ -451,14 +451,14 @@ bool CRomBrowser::FillRomInfo(ROM_INFO * pRomInfo)
} }
else else
{ {
if (wcsstr(pRomInfo->szFullFileName, L"?") != NULL) if (strstr(pRomInfo->szFullFileName, "?") != NULL)
{ {
wcscpy(pRomInfo->FileName, wcsstr(pRomInfo->szFullFileName, L"?") + 1); strcpy(pRomInfo->FileName, strstr(pRomInfo->szFullFileName, "?") + 1);
} }
else else
{ {
wchar_t drive[_MAX_DRIVE], dir[_MAX_DIR], ext[_MAX_EXT]; char drive[_MAX_DRIVE], dir[_MAX_DIR], ext[_MAX_EXT];
_wsplitpath(pRomInfo->szFullFileName, drive, dir, pRomInfo->FileName, ext); _splitpath(pRomInfo->szFullFileName, drive, dir, pRomInfo->FileName, ext);
} }
if (m_Fields[RB_InternalName].Pos() >= 0) if (m_Fields[RB_InternalName].Pos() >= 0)
{ {
@ -576,8 +576,7 @@ void CRomBrowser::FillRomList(strlist & FileList, const CPath & BaseDirectory, c
CPath SearchPath(BaseDirectory, "*.*"); CPath SearchPath(BaseDirectory, "*.*");
SearchPath.AppendDirectory(Directory.c_str()); SearchPath.AppendDirectory(Directory.c_str());
//TODO: Fix exception on Windows XP (Visual Studio 2010+) WriteTraceF(TraceDebug, __FUNCTION__ ": 1 %s", (const char *)SearchPath);
//WriteTraceF(TraceDebug,__FUNCTION__ ": 1 %s",(LPCSTR)SearchPath);
if (!SearchPath.FindFirst(CPath::_A_ALLFILES)) if (!SearchPath.FindFirst(CPath::_A_ALLFILES))
{ {
return; return;
@ -589,8 +588,7 @@ void CRomBrowser::FillRomList(strlist & FileList, const CPath & BaseDirectory, c
int8_t new_list_entry = 0; int8_t new_list_entry = 0;
const uint8_t exts = sizeof(ROM_extensions) / sizeof(ROM_extensions[0]); const uint8_t exts = sizeof(ROM_extensions) / sizeof(ROM_extensions[0]);
//TODO: Fix exception on Windows XP (Visual Studio 2010+) WriteTraceF(TraceDebug, __FUNCTION__ ": 2 %s m_StopRefresh = %d", (const char *)SearchPath, m_StopRefresh);
//WriteTraceF(TraceDebug,__FUNCTION__ ": 2 %s m_StopRefresh = %d",(LPCSTR)SearchPath,m_StopRefresh);
if (m_StopRefresh) { break; } if (m_StopRefresh) { break; }
if (SearchPath.IsDirectory()) if (SearchPath.IsDirectory())
@ -618,7 +616,7 @@ void CRomBrowser::FillRomList(strlist & FileList, const CPath & BaseDirectory, c
} }
if (new_list_entry) if (new_list_entry)
{ {
AddRomToList(stdstr((std::string &)SearchPath).ToUTF16().c_str(), stdstr(lpLastRom).ToUTF16().c_str()); AddRomToList(SearchPath, lpLastRom);
continue; continue;
} }
@ -667,9 +665,9 @@ void CRomBrowser::FillRomList(strlist & FileList, const CPath & BaseDirectory, c
stdstr_f zipFileName("%s?%s", (LPCSTR)SearchPath, FileName.c_str()); stdstr_f zipFileName("%s?%s", (LPCSTR)SearchPath, FileName.c_str());
ZipFile.SetNotificationCallback((C7zip::LP7ZNOTIFICATION)NotificationCB, this); ZipFile.SetNotificationCallback((C7zip::LP7ZNOTIFICATION)NotificationCB, this);
wcsncpy(RomInfo.szFullFileName, zipFileName.ToUTF16().c_str(), sizeof(RomInfo.szFullFileName) - 1); strncpy(RomInfo.szFullFileName, zipFileName.c_str(), sizeof(RomInfo.szFullFileName) - 1);
RomInfo.szFullFileName[sizeof(RomInfo.szFullFileName) - 1] = 0; RomInfo.szFullFileName[sizeof(RomInfo.szFullFileName) - 1] = 0;
wcscpy(RomInfo.FileName, wcsstr(RomInfo.szFullFileName, L"?") + 1); strcpy(RomInfo.FileName, strstr(RomInfo.szFullFileName, "?") + 1);
RomInfo.FileFormat = Format_7zip; RomInfo.FileFormat = Format_7zip;
WriteTrace(TraceDebug, __FUNCTION__ ": 8"); WriteTrace(TraceDebug, __FUNCTION__ ": 8");
@ -753,7 +751,7 @@ void CRomBrowser::FillRomList(strlist & FileList, const CPath & BaseDirectory, c
RomInfo.SelColorBrush = (uint32_t)CreateSolidBrush(RomInfo.SelColor); RomInfo.SelColorBrush = (uint32_t)CreateSolidBrush(RomInfo.SelColor);
} }
WriteTrace(TraceDebug, __FUNCTION__ ": 17"); WriteTrace(TraceDebug, __FUNCTION__ ": 17");
AddRomInfoToList(RomInfo, stdstr(lpLastRom).ToUTF16().c_str()); AddRomInfoToList(RomInfo, lpLastRom);
} }
} }
catch (...) catch (...)
@ -799,7 +797,7 @@ void CRomBrowser::HighLightLastRom(void)
//Get the string to the last rom //Get the string to the last rom
stdstr LastRom = g_Settings->LoadStringIndex(File_RecentGameFileIndex, 0); stdstr LastRom = g_Settings->LoadStringIndex(File_RecentGameFileIndex, 0);
std::wstring lpLastRom = LastRom.ToUTF16(); LPCSTR lpLastRom = LastRom.c_str();
LVITEMW lvItem; LVITEMW lvItem;
lvItem.mask = LVIF_PARAM; lvItem.mask = LVIF_PARAM;
@ -824,7 +822,7 @@ void CRomBrowser::HighLightLastRom(void)
} }
//if the last rom then highlight the item //if the last rom then highlight the item
if (_wcsicmp(pRomInfo->szFullFileName, lpLastRom.c_str()) == 0) if (_stricmp(pRomInfo->szFullFileName, lpLastRom) == 0)
{ {
ListView_SetItemState(m_hRomList, index, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED); ListView_SetItemState(m_hRomList, index, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);
ListView_EnsureVisible(m_hRomList, index, FALSE); ListView_EnsureVisible(m_hRomList, index, FALSE);
@ -833,17 +831,17 @@ void CRomBrowser::HighLightLastRom(void)
} }
} }
bool CRomBrowser::LoadDataFromRomFile(const wchar_t * FileName, uint8_t * Data, int32_t DataLen, int32_t * RomSize, FILE_FORMAT & FileFormat) bool CRomBrowser::LoadDataFromRomFile(const char * FileName, uint8_t * Data, int32_t DataLen, int32_t * RomSize, FILE_FORMAT & FileFormat)
{ {
uint8_t Test[4]; uint8_t Test[4];
if (_wcsnicmp(&FileName[wcslen(FileName) - 4], L".ZIP", 4) == 0) if (_strnicmp(&FileName[strlen(FileName) - 4], ".ZIP", 4) == 0)
{ {
int32_t len, port = 0, FoundRom; int32_t len, port = 0, FoundRom;
unz_file_info info; unz_file_info info;
char zname[132]; char zname[132];
unzFile file; unzFile file;
file = unzOpen(stdstr().FromUTF16(FileName).c_str()); file = unzOpen(FileName);
if (file == NULL) { return false; } if (file == NULL) { return false; }
port = unzGoToFirstFile(file); port = unzGoToFirstFile(file);
@ -896,7 +894,7 @@ bool CRomBrowser::LoadDataFromRomFile(const wchar_t * FileName, uint8_t * Data,
} }
else else
{ {
HANDLE hFile = CreateFileW(FileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, NULL); HANDLE hFile = CreateFile(FileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, NULL);
if (hFile == INVALID_HANDLE_VALUE) { return false; } if (hFile == INVALID_HANDLE_VALUE) { return false; }
SetFilePointer(hFile, 0, 0, FILE_BEGIN); SetFilePointer(hFile, 0, 0, FILE_BEGIN);
@ -1213,7 +1211,7 @@ bool CRomBrowser::RomListDrawItem(int32_t idCtrl, uint32_t lParam)
//Draw //Draw
ListView_GetItemRect(m_hRomList, ditem->itemID, &rcItem, LVIR_LABEL); ListView_GetItemRect(m_hRomList, ditem->itemID, &rcItem, LVIR_LABEL);
lvItem.iSubItem = 0; lvItem.iSubItem = 0;
lvItem.cchTextMax = sizeof(String); lvItem.cchTextMax = sizeof(String) / sizeof(String[0]);
lvItem.pszText = String; lvItem.pszText = String;
SendMessageW(m_hRomList, LVM_GETITEMTEXTW, (WPARAM)ditem->itemID, (LPARAM)&lvItem); SendMessageW(m_hRomList, LVM_GETITEMTEXTW, (WPARAM)ditem->itemID, (LPARAM)&lvItem);
@ -1235,7 +1233,7 @@ bool CRomBrowser::RomListDrawItem(int32_t idCtrl, uint32_t lParam)
rcItem.right += lvc.cx; rcItem.right += lvc.cx;
lvItem.iSubItem = nColumn; lvItem.iSubItem = nColumn;
lvItem.cchTextMax = sizeof(String); lvItem.cchTextMax = sizeof(String) / sizeof(String[0]);
lvItem.pszText = String; lvItem.pszText = String;
SendMessageW(m_hRomList, LVM_GETITEMTEXTW, ditem->itemID, (LPARAM)&lvItem); SendMessageW(m_hRomList, LVM_GETITEMTEXTW, ditem->itemID, (LPARAM)&lvItem);
memcpy(&rcDraw, &rcItem, sizeof(RECT)); memcpy(&rcDraw, &rcItem, sizeof(RECT));
@ -1324,7 +1322,7 @@ int32_t CALLBACK CRomBrowser::RomList_CompareItems(uint32_t lParam1, uint32_t lP
switch (SortFieldInfo->Key) switch (SortFieldInfo->Key)
{ {
case RB_FileName: result = (int32_t)lstrcmpiW(pRomInfo1->FileName, pRomInfo2->FileName); break; case RB_FileName: result = (int32_t)lstrcmpi(pRomInfo1->FileName, pRomInfo2->FileName); break;
case RB_InternalName: result = (int32_t)lstrcmpiW(pRomInfo1->InternalName, pRomInfo2->InternalName); break; case RB_InternalName: result = (int32_t)lstrcmpiW(pRomInfo1->InternalName, pRomInfo2->InternalName); break;
case RB_GoodName: result = (int32_t)lstrcmpiW(pRomInfo1->GoodName, pRomInfo2->GoodName); break; case RB_GoodName: result = (int32_t)lstrcmpiW(pRomInfo1->GoodName, pRomInfo2->GoodName); break;
case RB_Status: result = (int32_t)lstrcmpiW(pRomInfo1->Status, pRomInfo2->Status); break; case RB_Status: result = (int32_t)lstrcmpiW(pRomInfo1->Status, pRomInfo2->Status); break;
@ -1367,7 +1365,7 @@ void CRomBrowser::RomList_GetDispInfo(uint32_t pnmh)
switch (m_FieldType[lpdi->item.iSubItem]) switch (m_FieldType[lpdi->item.iSubItem])
{ {
case RB_FileName: wcsncpy(lpdi->item.pszText, pRomInfo->FileName, lpdi->item.cchTextMax / sizeof(wchar_t)); break; case RB_FileName: wcsncpy(lpdi->item.pszText, stdstr(pRomInfo->FileName).ToUTF16().c_str(), lpdi->item.cchTextMax); break;
case RB_InternalName: wcsncpy(lpdi->item.pszText, pRomInfo->InternalName, lpdi->item.cchTextMax / sizeof(wchar_t)); break; case RB_InternalName: wcsncpy(lpdi->item.pszText, pRomInfo->InternalName, lpdi->item.cchTextMax / sizeof(wchar_t)); break;
case RB_GoodName: wcsncpy(lpdi->item.pszText, pRomInfo->GoodName, lpdi->item.cchTextMax / sizeof(wchar_t)); break; case RB_GoodName: wcsncpy(lpdi->item.pszText, pRomInfo->GoodName, lpdi->item.cchTextMax / sizeof(wchar_t)); break;
case RB_CoreNotes: wcsncpy(lpdi->item.pszText, pRomInfo->CoreNotes, lpdi->item.cchTextMax / sizeof(wchar_t)); break; case RB_CoreNotes: wcsncpy(lpdi->item.pszText, pRomInfo->CoreNotes, lpdi->item.cchTextMax / sizeof(wchar_t)); break;
@ -1455,13 +1453,13 @@ void CRomBrowser::RomList_OpenRom(uint32_t /*pnmh*/)
if (!pRomInfo) { return; } if (!pRomInfo) { return; }
m_StopRefresh = true; m_StopRefresh = true;
CN64System::RunFileImage(stdstr().FromUTF16(pRomInfo->szFullFileName).c_str()); CN64System::RunFileImage(pRomInfo->szFullFileName);
} }
void CRomBrowser::RomList_PopupMenu(uint32_t /*pnmh*/) void CRomBrowser::RomList_PopupMenu(uint32_t /*pnmh*/)
{ {
LONG iItem = ListView_GetNextItem(m_hRomList, -1, LVNI_SELECTED); LONG iItem = ListView_GetNextItem(m_hRomList, -1, LVNI_SELECTED);
m_SelectedRom = L""; m_SelectedRom = "";
if (iItem != -1) if (iItem != -1)
{ {
LV_ITEM lvItem; LV_ITEM lvItem;

14
Source/Project64/User Interface/Rom Browser.h
View File

@ -107,10 +107,10 @@ class CRomBrowser
struct ROM_INFO struct ROM_INFO
{ {
wchar_t szFullFileName[300]; char szFullFileName[300];
FILE_FORMAT FileFormat; FILE_FORMAT FileFormat;
wchar_t Status[60]; wchar_t Status[60];
wchar_t FileName[200]; char FileName[200];
wchar_t InternalName[22]; wchar_t InternalName[22];
wchar_t GoodName[200]; wchar_t GoodName[200];
wchar_t CartID[3]; wchar_t CartID[3];
@ -142,7 +142,7 @@ class CRomBrowser
ROMBROWSER_FIELDS_LIST m_Fields; ROMBROWSER_FIELDS_LIST m_Fields;
FIELD_TYPE_LIST m_FieldType; FIELD_TYPE_LIST m_FieldType;
ROMINFO_LIST m_RomInfo; ROMINFO_LIST m_RomInfo;
std::wstring m_SelectedRom; std::string m_SelectedRom;
bool m_Visible; bool m_Visible;
bool m_ShowingRomBrowser; bool m_ShowingRomBrowser;
HANDLE m_RefreshThread; HANDLE m_RefreshThread;
@ -154,8 +154,8 @@ class CRomBrowser
bool m_AllowSelectionLastRom; bool m_AllowSelectionLastRom;
void AddFileNameToList(strlist & FileList, const stdstr & Directory, CPath & File); void AddFileNameToList(strlist & FileList, const stdstr & Directory, CPath & File);
void AddRomToList(const wchar_t * RomLocation, const wchar_t * lpLastRom); void AddRomToList(const char * RomLocation, const char * lpLastRom);
void AddRomInfoToList(ROM_INFO &RomInfo, const wchar_t * lpLastRom); void AddRomInfoToList(ROM_INFO &RomInfo, const char * lpLastRom);
void AllocateBrushs(void); void AllocateBrushs(void);
static void ByteSwapRomData(uint8_t * Data, int DataLen); static void ByteSwapRomData(uint8_t * Data, int DataLen);
int CalcSortPosition(uint32_t lParam); int CalcSortPosition(uint32_t lParam);
@ -166,7 +166,7 @@ class CRomBrowser
void FillRomList(strlist & FileList, const CPath & BaseDirectory, const stdstr & Directory, const char * lpLastRom); void FillRomList(strlist & FileList, const CPath & BaseDirectory, const stdstr & Directory, const char * lpLastRom);
void FixRomListWindow(void); void FixRomListWindow(void);
static int32_t GetCicChipID(uint8_t * RomData); static int32_t GetCicChipID(uint8_t * RomData);
bool LoadDataFromRomFile(const wchar_t * FileName, uint8_t * Data, int32_t DataLen, int32_t * RomSize, FILE_FORMAT & FileFormat); bool LoadDataFromRomFile(const char * FileName, uint8_t * Data, int32_t DataLen, int32_t * RomSize, FILE_FORMAT & FileFormat);
void LoadRomList(void); void LoadRomList(void);
void MenuSetText(HMENU hMenu, int32_t MenuPos, const wchar_t * Title, char * ShortCut); void MenuSetText(HMENU hMenu, int32_t MenuPos, const wchar_t * Title, char * ShortCut);
void SaveRomList(strlist & FileList); void SaveRomList(strlist & FileList);
@ -212,7 +212,7 @@ public:
void SelectRomDir(void); void SelectRomDir(void);
void ShowRomList(void); void ShowRomList(void);
bool ShowingRomBrowser(void) { return m_ShowingRomBrowser; } bool ShowingRomBrowser(void) { return m_ShowingRomBrowser; }
const wchar_t * CurrentedSelectedRom(void) { return m_SelectedRom.c_str(); } const char * CurrentedSelectedRom(void) { return m_SelectedRom.c_str(); }
static void GetFieldInfo(ROMBROWSER_FIELDS_LIST & Fields, bool UseDefault = false); static void GetFieldInfo(ROMBROWSER_FIELDS_LIST & Fields, bool UseDefault = false);
}; };

2
Source/Project64/User Interface/UI Resources.rc
View File

@ -187,7 +187,7 @@ BEGIN
LTEXT "CIC Chip:",IDC_CIC_CHIP,11,167,64,9 LTEXT "CIC Chip:",IDC_CIC_CHIP,11,167,64,9
EDITTEXT IDC_INFO_CIC,77,164,153,13,ES_AUTOHSCROLL | ES_READONLY,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE EDITTEXT IDC_INFO_CIC,77,164,153,13,ES_AUTOHSCROLL | ES_READONLY,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
LTEXT "Location:",IDC_LOCATION,11,45,64,10 LTEXT "Location:",IDC_LOCATION,11,45,64,10
EDITTEXT IDC_INFO_LOCATION,77,45,153,13,ES_AUTOHSCROLL | ES_READONLY EDITTEXT IDC_INFO_LOCATION,77,45,153,13,ES_AUTOHSCROLL | ES_READONLY,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
LTEXT "MD5:",IDC_ROM_MD5,11,60,64,9 LTEXT "MD5:",IDC_ROM_MD5,11,60,64,9
EDITTEXT IDC_INFO_MD5,77,59,153,13,ES_AUTOHSCROLL | ES_READONLY,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE EDITTEXT IDC_INFO_MD5,77,59,153,13,ES_AUTOHSCROLL | ES_READONLY,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
END END

27
Source/RSP/Recompiler Analysis.c
View File

@ -648,14 +648,17 @@ BOOL WriteToVectorDest2 (DWORD DestReg, int PC, BOOL RecursiveCall) {
case RSP_LSC2_RV: case RSP_LSC2_RV:
break; break;
case RSP_LSC2_HV:
case RSP_LSC2_QV: case RSP_LSC2_QV:
case RSP_LSC2_BV: case RSP_LSC2_BV:
case RSP_LSC2_LV: case RSP_LSC2_LV:
case RSP_LSC2_UV:
case RSP_LSC2_PV:
case RSP_LSC2_TV: case RSP_LSC2_TV:
break; break;
case RSP_LSC2_PV:
case RSP_LSC2_UV:
case RSP_LSC2_HV:
if (DestReg == RspOp.rt) { return FALSE; }
break;
default: default:
CompilerWarning("Unkown opcode in WriteToVectorDest\n%s",RSPOpcodeName(RspOp.Hex,PC)); CompilerWarning("Unkown opcode in WriteToVectorDest\n%s",RSPOpcodeName(RspOp.Hex,PC));
@ -675,9 +678,25 @@ BOOL WriteToVectorDest2 (DWORD DestReg, int PC, BOOL RecursiveCall) {
case RSP_LSC2_HV: case RSP_LSC2_HV:
case RSP_LSC2_FV: case RSP_LSC2_FV:
case RSP_LSC2_WV: case RSP_LSC2_WV:
case RSP_LSC2_TV:
if (DestReg == RspOp.rt) { return TRUE; } if (DestReg == RspOp.rt) { return TRUE; }
break; break;
case RSP_LSC2_TV:
if (8 <= 32 - RspOp.rt) {
if (DestReg >= RspOp.rt && DestReg <= RspOp.rt + 7) {
return TRUE;
}
} else {
int length = 32 - RspOp.rt, count, del = RspOp.del >> 1, vect = RspOp.rt;
for (count = 0; count < length; count++) {
if (DestReg == vect + del) {
return TRUE;
}
del = (del + 1) & 7;
}
}
break;
default: default:
CompilerWarning("Unkown opcode in WriteToVectorDest\n%s",RSPOpcodeName(RspOp.Hex,PC)); CompilerWarning("Unkown opcode in WriteToVectorDest\n%s",RSPOpcodeName(RspOp.Hex,PC));
return TRUE; return TRUE;