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

win32: checkin some chinese junk

This commit is contained in:
zeromus 2009-12-24 17:40:06 +00:00
parent 437d19fd24
commit 094a1870c2
5 changed files with 102 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
desmume/src/windows/AboutBox.cpp
View File

@ -85,14 +85,22 @@ BOOL CALLBACK AboutBox_Proc (HWND dialog, UINT message,WPARAM wparam,LPARAM lpar
{
case WM_INITDIALOG:
{
char buf[2048];
memset(buf, 0, sizeof(buf));
std::string version = (std::string)"version " + EMU_DESMUME_VERSION_STRING() + EMU_DESMUME_COMPILER_DETAIL();
SetDlgItemText(dialog, IDC_TXT_VERSION, version.c_str());
// Support Unicode text display
wchar_t wstr[256];
wchar_t wstr1[256];
wchar_t wstr2[256];
memset(buf, 0, sizeof(buf));
wsprintf(buf, "compiled: %s %s", __DATE__,__TIME__);
SetDlgItemText(dialog, IDC_TXT_COMPILED, buf);
GetDlgItemTextW(dialog, IDC_TXT_VERSION, wstr,256);
MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, EMU_DESMUME_VERSION_STRING(), -1, wstr1, 255);
MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, EMU_DESMUME_COMPILER_DETAIL(), -1, wstr2, 255);
wcscat(wstr, wcscat(wstr1, wstr2));
SetDlgItemTextW(dialog, IDC_TXT_VERSION, wstr);
GetDlgItemTextW(dialog, IDC_TXT_COMPILED, wstr,256);
MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, __DATE__, -1, wstr1, 255);
MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, __TIME__, -1, wstr2, 255);
wcscat(wstr, wcscat(wcscat(wstr1, L" "), wstr2));
SetDlgItemTextW(dialog, IDC_TXT_COMPILED, wstr);
for (int i = 0; i < SIZE_SCROLL_BUFFER; i++)
strcpy((char *)scroll_buffer[i], "\n");

9
desmume/src/windows/hotkey.cpp
View File

@ -385,6 +385,14 @@ void HK_ToggleRasterizer(int, bool justPressed) {
//=====================================DEFINITIONS======================================
//======================================================================================
//returns the specified resource string ID as a std::wstring
std::wstring STRW(UINT id)
{
wchar_t* wstr;
LoadStringW(NULL,id,(LPWSTR)&wstr,0);
return wstr;
}
void InitCustomKeys (SCustomKeys *keys)
{
UINT i = 0;
@ -407,6 +415,7 @@ void InitCustomKeys (SCustomKeys *keys)
keys->OpenROM.handleKeyDown = HK_OpenROM;
keys->OpenROM.code = "OpenROM";
keys->OpenROM.name = L"Open ROM";
//keys->OpenROM.name = STRW(ID_LOCALIZED_STRING);
keys->OpenROM.page = HOTKEY_PAGE_MAIN;
keys->OpenROM.key = 'O';
keys->OpenROM.modifiers = CUSTKEY_CTRL_MASK;

137
desmume/src/windows/inputdx.cpp
View File

@ -58,29 +58,32 @@
#include "directx/dinput.h"
// Gamepad Dialog Strings
#define INPUTCONFIG_TITLE "Input Configuration"
// Support Unicode display
//#define INPUTCONFIG_TITLE "Input Configuration"
#define INPUTCONFIG_JPTOGGLE "Enabled"
//#define INPUTCONFIG_DIAGTOGGLE "Toggle Diagonals"
//#define INPUTCONFIG_OK "&OK"
//#define INPUTCONFIG_CANCEL "&Cancel"
#define INPUTCONFIG_JPCOMBO "Joypad #%d"
#define INPUTCONFIG_LABEL_UP "Up"
#define INPUTCONFIG_LABEL_DOWN "Down"
#define INPUTCONFIG_LABEL_LEFT "Left"
#define INPUTCONFIG_LABEL_RIGHT "Right"
#define INPUTCONFIG_LABEL_A "A"
#define INPUTCONFIG_LABEL_B "B"
#define INPUTCONFIG_LABEL_X "X"
#define INPUTCONFIG_LABEL_Y "Y"
#define INPUTCONFIG_LABEL_L "L"
#define INPUTCONFIG_LABEL_R "R"
#define INPUTCONFIG_LABEL_START "Start"
#define INPUTCONFIG_LABEL_SELECT "Select"
#define INPUTCONFIG_LABEL_UPLEFT "Up Left"
#define INPUTCONFIG_LABEL_UPRIGHT "Up Right"
#define INPUTCONFIG_LABEL_DOWNRIGHT "Dn Right"
#define INPUTCONFIG_LABEL_DOWNLEFT "Dn Left"
#define INPUTCONFIG_LABEL_BLUE "Blue means the button is already mapped.\nPink means it conflicts with a custom hotkey.\nRed means it's reserved by Windows.\nButtons can be disabled using Escape.\nGrayed buttons arent supported yet (sorry!)"
// Support Unicode display
#define INPUTCONFIG_LABEL_UP IDC_LABEL_UP
#define INPUTCONFIG_LABEL_DOWN IDC_LABEL_DOWN
#define INPUTCONFIG_LABEL_LEFT IDC_LABEL_LEFT
#define INPUTCONFIG_LABEL_RIGHT IDC_LABEL_RIGHT
#define INPUTCONFIG_LABEL_A IDC_LABEL_A
#define INPUTCONFIG_LABEL_B IDC_LABEL_B
#define INPUTCONFIG_LABEL_X IDC_LABEL_X
#define INPUTCONFIG_LABEL_Y IDC_LABEL_Y
#define INPUTCONFIG_LABEL_L IDC_LABEL_L
#define INPUTCONFIG_LABEL_R IDC_LABEL_R
#define INPUTCONFIG_LABEL_START IDC_LABEL_START
#define INPUTCONFIG_LABEL_SELECT IDC_LABEL_SELECT
#define INPUTCONFIG_LABEL_UPLEFT IDC_LABEL_UPLEFT
#define INPUTCONFIG_LABEL_UPRIGHT IDC_LABEL_UPRIGHT
#define INPUTCONFIG_LABEL_DOWNRIGHT IDC_LABEL_DOWNRIGHT
#define INPUTCONFIG_LABEL_DOWNLEFT IDC_LABEL_DOWNLEFT
#define INPUTCONFIG_LABEL_BLUE IDC_LABEL_BLUE //"Blue means the button is already mapped.\nPink means it conflicts with a custom hotkey.\nRed means it's reserved by Windows.\nButtons can be disabled using Escape.\nGrayed buttons arent supported yet (sorry!)"
#define INPUTCONFIG_LABEL_UNUSED ""
#define INPUTCONFIG_LABEL_CLEAR_TOGGLES_AND_TURBO "Clear All"
#define INPUTCONFIG_LABEL_MAKE_TURBO "TempTurbo"
@ -93,7 +96,8 @@
#define HOTKEYS_CONTROL_MOD "Ctrl + "
#define HOTKEYS_SHIFT_MOD "Shift + "
#define HOTKEYS_ALT_MOD "Alt + "
#define HOTKEYS_LABEL_BLUE "Blue means the hotkey is already mapped.\nPink means it conflicts with a game button.\nRed means it's reserved by Windows.\nA hotkey can be disabled using Escape."
// Support Unicode display
#define HOTKEYS_LABEL_BLUE IDC_LABEL_BLUE1 //"Blue means the hotkey is already mapped.\nPink means it conflicts with a game button.\nRed means it's reserved by Windows.\nA hotkey can be disabled using Escape."
#define HOTKEYS_HKCOMBO "Page %d"
// gaming buttons and axes
@ -193,8 +197,9 @@
#define GAMEDEVICE_VK_F10 "F10"
#define GAMEDEVICE_VK_F11 "F11"
#define GAMEDEVICE_VK_F12 "F12"
#define BUTTON_OK "&OK"
#define BUTTON_CANCEL "&Cancel"
// Support Unicode display
#define BUTTON_OK L"&OK"
#define BUTTON_CANCEL L"&Cancel"
static TCHAR szClassName[] = _T("InputCustom");
static TCHAR szHotkeysClassName[] = _T("InputCustomHot");
@ -1872,30 +1877,31 @@ void EnableDisableKeyFields (int index, HWND hDlg)
bool enableUnTurboable;
if(index < 5)
{
SetDlgItemText(hDlg,IDC_LABEL_RIGHT,INPUTCONFIG_LABEL_RIGHT);
SetDlgItemText(hDlg,IDC_LABEL_UPLEFT,INPUTCONFIG_LABEL_UPLEFT);
SetDlgItemText(hDlg,IDC_LABEL_UPRIGHT,INPUTCONFIG_LABEL_UPRIGHT);
SetDlgItemText(hDlg,IDC_LABEL_DOWNRIGHT,INPUTCONFIG_LABEL_DOWNRIGHT);
SetDlgItemText(hDlg,IDC_LABEL_UP,INPUTCONFIG_LABEL_UP);
SetDlgItemText(hDlg,IDC_LABEL_LEFT,INPUTCONFIG_LABEL_LEFT);
SetDlgItemText(hDlg,IDC_LABEL_DOWN,INPUTCONFIG_LABEL_DOWN);
SetDlgItemText(hDlg,IDC_LABEL_DOWNLEFT,INPUTCONFIG_LABEL_DOWNLEFT);
// Support Unicode display
SetDlgItemTextW(hDlg,IDC_LABEL_RIGHT,(LPWSTR)INPUTCONFIG_LABEL_RIGHT);
SetDlgItemTextW(hDlg,IDC_LABEL_UPLEFT,(LPWSTR)INPUTCONFIG_LABEL_UPLEFT);
SetDlgItemTextW(hDlg,IDC_LABEL_UPRIGHT,(LPWSTR)INPUTCONFIG_LABEL_UPRIGHT);
SetDlgItemTextW(hDlg,IDC_LABEL_DOWNRIGHT,(LPWSTR)INPUTCONFIG_LABEL_DOWNRIGHT);
SetDlgItemTextW(hDlg,IDC_LABEL_UP,(LPWSTR)INPUTCONFIG_LABEL_UP);
SetDlgItemTextW(hDlg,IDC_LABEL_LEFT,(LPWSTR)INPUTCONFIG_LABEL_LEFT);
SetDlgItemTextW(hDlg,IDC_LABEL_DOWN,(LPWSTR)INPUTCONFIG_LABEL_DOWN);
SetDlgItemTextW(hDlg,IDC_LABEL_DOWNLEFT,(LPWSTR)INPUTCONFIG_LABEL_DOWNLEFT);
enableUnTurboable = true;
}
else
{
SetDlgItemText(hDlg,IDC_LABEL_UP,INPUTCONFIG_LABEL_MAKE_TURBO);
SetDlgItemText(hDlg,IDC_LABEL_LEFT,INPUTCONFIG_LABEL_MAKE_HELD);
SetDlgItemText(hDlg,IDC_LABEL_DOWN,INPUTCONFIG_LABEL_MAKE_TURBO_HELD);
SetDlgItemText(hDlg,IDC_LABEL_RIGHT,INPUTCONFIG_LABEL_CLEAR_TOGGLES_AND_TURBO);
SetDlgItemText(hDlg,IDC_LABEL_UPLEFT,INPUTCONFIG_LABEL_UNUSED);
SetDlgItemText(hDlg,IDC_LABEL_UPRIGHT,INPUTCONFIG_LABEL_UNUSED);
SetDlgItemText(hDlg,IDC_LABEL_DOWNLEFT,INPUTCONFIG_LABEL_UNUSED);
SetDlgItemText(hDlg,IDC_LABEL_DOWNRIGHT,INPUTCONFIG_LABEL_UNUSED);
SetDlgItemText(hDlg,IDC_UPLEFT,INPUTCONFIG_LABEL_UNUSED);
SetDlgItemText(hDlg,IDC_UPRIGHT,INPUTCONFIG_LABEL_UNUSED);
SetDlgItemText(hDlg,IDC_DWNLEFT,INPUTCONFIG_LABEL_UNUSED);
SetDlgItemText(hDlg,IDC_DWNRIGHT,INPUTCONFIG_LABEL_UNUSED);
SetDlgItemTextW(hDlg,IDC_LABEL_UP,(LPWSTR)INPUTCONFIG_LABEL_MAKE_TURBO);
SetDlgItemTextW(hDlg,IDC_LABEL_LEFT,(LPWSTR)INPUTCONFIG_LABEL_MAKE_HELD);
SetDlgItemTextW(hDlg,IDC_LABEL_DOWN,(LPWSTR)INPUTCONFIG_LABEL_MAKE_TURBO_HELD);
SetDlgItemTextW(hDlg,IDC_LABEL_RIGHT,(LPWSTR)INPUTCONFIG_LABEL_CLEAR_TOGGLES_AND_TURBO);
SetDlgItemTextW(hDlg,IDC_LABEL_UPLEFT,(LPWSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemTextW(hDlg,IDC_LABEL_UPRIGHT,(LPWSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemTextW(hDlg,IDC_LABEL_DOWNLEFT,(LPWSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemTextW(hDlg,IDC_LABEL_DOWNRIGHT,(LPWSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemTextW(hDlg,IDC_UPLEFT,(LPWSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemTextW(hDlg,IDC_UPRIGHT,(LPWSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemTextW(hDlg,IDC_DWNLEFT,(LPWSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemTextW(hDlg,IDC_DWNRIGHT,(LPWSTR)INPUTCONFIG_LABEL_UNUSED);
enableUnTurboable = false;
}
@ -1921,28 +1927,31 @@ INT_PTR CALLBACK DlgInputConfig(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lPara
switch(msg)
{
case WM_INITDIALOG:
// Support Unicode display
SetDlgItemTextW(hDlg,IDOK,BUTTON_OK);
SetDlgItemTextW(hDlg,IDCANCEL,BUTTON_CANCEL);
// Support Unicode display
//SetWindowText(hDlg,INPUTCONFIG_TITLE);
//if(DirectX.Clipped) S9xReRefresh();
SetWindowText(hDlg,INPUTCONFIG_TITLE);
//SetDlgItemText(hDlg,IDC_JPTOGGLE,INPUTCONFIG_JPTOGGLE);
SetDlgItemText(hDlg,IDOK,BUTTON_OK);
SetDlgItemText(hDlg,IDCANCEL,BUTTON_CANCEL);
/// SetDlgItemText(hDlg,IDC_DIAGTOGGLE,INPUTCONFIG_DIAGTOGGLE);
SetDlgItemText(hDlg,IDC_LABEL_UP,INPUTCONFIG_LABEL_UP);
SetDlgItemText(hDlg,IDC_LABEL_DOWN,INPUTCONFIG_LABEL_DOWN);
SetDlgItemText(hDlg,IDC_LABEL_LEFT,INPUTCONFIG_LABEL_LEFT);
SetDlgItemText(hDlg,IDC_LABEL_A,INPUTCONFIG_LABEL_A);
SetDlgItemText(hDlg,IDC_LABEL_B,INPUTCONFIG_LABEL_B);
SetDlgItemText(hDlg,IDC_LABEL_X,INPUTCONFIG_LABEL_X);
SetDlgItemText(hDlg,IDC_LABEL_Y,INPUTCONFIG_LABEL_Y);
SetDlgItemText(hDlg,IDC_LABEL_L,INPUTCONFIG_LABEL_L);
SetDlgItemText(hDlg,IDC_LABEL_R,INPUTCONFIG_LABEL_R);
SetDlgItemText(hDlg,IDC_LABEL_START,INPUTCONFIG_LABEL_START);
SetDlgItemText(hDlg,IDC_LABEL_SELECT,INPUTCONFIG_LABEL_SELECT);
SetDlgItemText(hDlg,IDC_LABEL_UPRIGHT,INPUTCONFIG_LABEL_UPRIGHT);
SetDlgItemText(hDlg,IDC_LABEL_UPLEFT,INPUTCONFIG_LABEL_UPLEFT);
SetDlgItemText(hDlg,IDC_LABEL_DOWNRIGHT,INPUTCONFIG_LABEL_DOWNRIGHT);
SetDlgItemText(hDlg,IDC_LABEL_DOWNLEFT,INPUTCONFIG_LABEL_DOWNLEFT);
SetDlgItemText(hDlg,IDC_LABEL_BLUE,INPUTCONFIG_LABEL_BLUE);
// Support Unicode display
SetDlgItemTextW(hDlg,IDC_LABEL_UP,(LPWSTR)INPUTCONFIG_LABEL_UP);
SetDlgItemTextW(hDlg,IDC_LABEL_DOWN,(LPWSTR)INPUTCONFIG_LABEL_DOWN);
SetDlgItemTextW(hDlg,IDC_LABEL_LEFT,(LPWSTR)INPUTCONFIG_LABEL_LEFT);
SetDlgItemTextW(hDlg,IDC_LABEL_A,(LPWSTR)INPUTCONFIG_LABEL_A);
SetDlgItemTextW(hDlg,IDC_LABEL_B,(LPWSTR)INPUTCONFIG_LABEL_B);
SetDlgItemTextW(hDlg,IDC_LABEL_X,(LPWSTR)INPUTCONFIG_LABEL_X);
SetDlgItemTextW(hDlg,IDC_LABEL_Y,(LPWSTR)INPUTCONFIG_LABEL_Y);
SetDlgItemTextW(hDlg,IDC_LABEL_L,(LPWSTR)INPUTCONFIG_LABEL_L);
SetDlgItemTextW(hDlg,IDC_LABEL_R,(LPWSTR)INPUTCONFIG_LABEL_R);
SetDlgItemTextW(hDlg,IDC_LABEL_START,(LPWSTR)INPUTCONFIG_LABEL_START);
SetDlgItemTextW(hDlg,IDC_LABEL_SELECT,(LPWSTR)INPUTCONFIG_LABEL_SELECT);
SetDlgItemTextW(hDlg,IDC_LABEL_UPRIGHT,(LPWSTR)INPUTCONFIG_LABEL_UPRIGHT);
SetDlgItemTextW(hDlg,IDC_LABEL_UPLEFT,(LPWSTR)INPUTCONFIG_LABEL_UPLEFT);
SetDlgItemTextW(hDlg,IDC_LABEL_DOWNRIGHT,(LPWSTR)INPUTCONFIG_LABEL_DOWNRIGHT);
SetDlgItemTextW(hDlg,IDC_LABEL_DOWNLEFT,(LPWSTR)INPUTCONFIG_LABEL_DOWNLEFT);
SetDlgItemTextW(hDlg,IDC_LABEL_BLUE,(LPWSTR)INPUTCONFIG_LABEL_BLUE);
for(i=5;i<10;i++)
Joypad[i].Left_Up = Joypad[i].Right_Up = Joypad[i].Left_Down = Joypad[i].Right_Down = 0;
@ -2609,7 +2618,10 @@ switch(msg)
return true;
case WM_INITDIALOG:
//if(DirectX.Clipped) S9xReRefresh();
SetWindowText(hDlg,HOTKEYS_TITLE);
// Support Unicode display
wchar_t menuItemString[256];
LoadStringW(hAppInst, ID_HOTKEYS_TITLE, menuItemString, 256);
SetWindowTextW(hDlg, menuItemString);
// insert hotkey page list items
for(i = 0 ; i < NUM_HOTKEY_PAGE ; i++)
@ -2626,7 +2638,8 @@ switch(msg)
GetAsyncKeyState(i);
}
SetDlgItemText(hDlg,IDC_LABEL_BLUE,HOTKEYS_LABEL_BLUE);
// Support Unicode display
SetDlgItemTextW(hDlg,IDC_LABEL_BLUE,(LPWSTR)HOTKEYS_LABEL_BLUE);
set_hotkeyinfo(hDlg);

5
desmume/src/windows/resource.h
View File

@ -101,7 +101,6 @@
#define IDM_IMPORTBACKUPMEMORY 201
#define IDC_LANGENGLISH 210
#define IDC_LANGFRENCH 211
#define IDC_LANGDANISH 212
#define IDC_LANG_CHINESE_SIMPLIFIED 213
#define IDC_LANGITALIAN 214
#define IDC_LANGJAPANESE 215
@ -716,6 +715,7 @@
#define ID_CONFIG_DISPLAYMETHOD 40070
#define ID_DISPLAYMETHOD_DIRECTDRAWHW 40071
#define ID_DISPLAYMETHOD_DIRECTDRAWSW 40072
#define ID_HOTKEYS_TITLE 40073
#define IDC_LABEL_UP 50000
#define IDC_LABEL_RIGHT 50001
#define IDC_LABEL_LEFT 50002
@ -755,6 +755,7 @@
#define IDC_LABEL_BLUE 50036
#define IDC_LID 50037
#define IDD_INPUTCONFIG 50038
#define IDC_LABEL_BLUE1 50039
#define IDC_LUASCRIPT_RESERVE_START 58000
#define IDC_LUASCRIPT_RESERVE_END 58099
#define IDD_LUARECENT_RESERVE_START 58100
@ -812,7 +813,7 @@
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 121
#define _APS_NEXT_COMMAND_VALUE 40073
#define _APS_NEXT_COMMAND_VALUE 40074
#define _APS_NEXT_CONTROL_VALUE 1022
#define _APS_NEXT_SYMED_VALUE 101
#endif

BIN
desmume/src/windows/resources.rc
View File

Binary file not shown.