From ef4e0ac26959677f6d3e2e1ba471f5a349d9e009 Mon Sep 17 00:00:00 2001 From: zeromus Date: Wed, 27 Oct 2010 04:59:56 +0000 Subject: [PATCH] merge 3825-3862 from trunk --- desmume/src/windows/memView.cpp | 12 +++++++++++- desmume/src/windows/ramwatch.cpp | 21 ++++++++++++++++----- desmume/src/windows/resource.h | 14 ++++++-------- desmume/src/windows/resources.rc | Bin 946748 -> 949576 bytes 4 files changed, 33 insertions(+), 14 deletions(-) diff --git a/desmume/src/windows/memView.cpp b/desmume/src/windows/memView.cpp index d24af5d84..d40772647 100644 --- a/desmume/src/windows/memView.cpp +++ b/desmume/src/windows/memView.cpp @@ -390,6 +390,8 @@ LRESULT MemView_ViewBoxPaint(CMemView* wnd, HWND hCtl, WPARAM wParam, LPARAM lPa { case 0: { + SetDlgItemText(wnd->hWnd,IDC_2012,""); + curx += (fontsize.cx * 2); for(i = 0; i < 16; i++) { @@ -422,6 +424,8 @@ LRESULT MemView_ViewBoxPaint(CMemView* wnd, HWND hCtl, WPARAM wParam, LPARAM lPa case 1: { + SetDlgItemText(wnd->hWnd,IDC_2012,""); + curx += (fontsize.cx * 6); for(i = 0; i < 16; i += 2) { @@ -456,6 +460,12 @@ LRESULT MemView_ViewBoxPaint(CMemView* wnd, HWND hCtl, WPARAM wParam, LPARAM lPa case 2: { + u8 smallbuf[4]; + MMU_DumpMemBlock(wnd->cpu, wnd->selAddress, 4, smallbuf); + char textbuf[32]; + sprintf(textbuf,"%f",((s32)T1ReadLong(smallbuf,0))/4096.0f); + SetDlgItemText(wnd->hWnd,IDC_2012,textbuf); + curx += (fontsize.cx * 8); for(i = 0; i < 16; i += 4) { @@ -604,7 +614,6 @@ LRESULT CALLBACK MemView_ViewBoxProc(HWND hCtl, UINT uMsg, WPARAM wParam, LPARAM col = ((x - (fontsize.cx * 8)) / (fontsize.cx * (8+1)) * 4); wnd->sel = TRUE; - } break; } @@ -612,6 +621,7 @@ LRESULT CALLBACK MemView_ViewBoxProc(HWND hCtl, UINT uMsg, WPARAM wParam, LPARAM wnd->selAddress = (wnd->address + (line << 4) + col); wnd->selPart = 0; wnd->selNewVal = 0x00000000; + } SelectObject(hdc, font); diff --git a/desmume/src/windows/ramwatch.cpp b/desmume/src/windows/ramwatch.cpp index c185e894c..17a96f290 100644 --- a/desmume/src/windows/ramwatch.cpp +++ b/desmume/src/windows/ramwatch.cpp @@ -683,6 +683,9 @@ LRESULT CALLBACK EditWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara case 'h': SendDlgItemMessage(hDlg, IDC_HEX, BM_SETCHECK, BST_CHECKED, 0); break; + case 'f': + SendDlgItemMessage(hDlg, IDC_2012, BM_SETCHECK, BST_CHECKED, 0); + break; default: t = 0; break; @@ -703,6 +706,9 @@ LRESULT CALLBACK EditWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara case IDC_HEX: t='h'; return true; + case IDC_2012: + t='f'; + return true; case IDC_1_BYTE: s = 'b'; return true; @@ -967,13 +973,18 @@ LRESULT CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam int t = rswatches[iNum].Type; int size = rswatches[iNum].Size; const char* formatString = ((t=='s') ? "%d" : (t=='u') ? "%u" : (size=='d' ? "%08X" : size=='w' ? "%04X" : "%02X")); - switch (size) + if(t=='f') { - case 'b': - default: sprintf(num, formatString, t=='s' ? (char)(i&0xff) : (unsigned char)(i&0xff)); break; - case 'w': sprintf(num, formatString, t=='s' ? (short)(i&0xffff) : (unsigned short)(i&0xffff)); break; - case 'd': sprintf(num, formatString, t=='s' ? (long)(i&0xffffffff) : (unsigned long)(i&0xffffffff)); break; + sprintf(num,"%f",i/4096.0f); } + else + switch (size) + { + case 'b': + default: sprintf(num, formatString, t=='s' ? (char)(i&0xff) : (unsigned char)(i&0xff)); break; + case 'w': sprintf(num, formatString, t=='s' ? (short)(i&0xffff) : (unsigned short)(i&0xffff)); break; + case 'd': sprintf(num, formatString, t=='s' ? (long)(i&0xffffffff) : (unsigned long)(i&0xffffffff)); break; + } Item->item.pszText = num; } return true; diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h index b64ad3f23..a16a307f0 100644 --- a/desmume/src/windows/resource.h +++ b/desmume/src/windows/resource.h @@ -248,6 +248,7 @@ #define IDC_2_BYTES 958 #define IDC_4_BYTES 959 #define IDC_WATCHLIST 960 +#define IDC_HEX2 960 #define IDC_C_WATCH_EDIT 961 #define IDC_C_WATCH_REMOVE 962 #define IDC_C_WATCH 963 @@ -386,6 +387,7 @@ #define IDC_RFILE 1038 #define IDC_EXPORT 1038 #define IDC_RFOLDER 1039 +#define IDC_2012 1039 #define IDC_BBROWSE2 1040 #define IDC_PATHDESMUME 1041 #define IDC_BRESTART 1042 @@ -770,8 +772,8 @@ #define ID_LABEL_HK51 4515 #define ID_LABEL_HK52 4516 #define ID_LABEL_HK53 4517 -#define ID_LABEL_HK54 4519 #define ID_LABEL_HK13b 4518 +#define ID_LABEL_HK54 4519 #define IDD_MICROPHONE 5000 #define IDM_MICROPHONESETTINGS 5001 #define IDC_MICSAMPLEBROWSE 5003 @@ -781,12 +783,8 @@ #define IDC_USENOISE 5010 #define IDC_CPU 6000 #define IDC_IOREG 6001 - -//ZELDA SHADOW HACK -#define ID_LABEL_ZELDA_SHADOW_DEPTH_HACK 9000 -#define IDC_ZELDA_SHADOW_DEPTH_HACK 9001 - - +#define ID_LABEL_ZELDA_SHADOW_DEPTH_HACK 9000 +#define IDC_ZELDA_SHADOW_DEPTH_HACK 9001 #define IDD_CHEAT_ADD_XX_CODE 10005 #define IDD_GBASLOT_GUITARGRIP 10009 #define IDD_GBASLOT_PIANO 10010 @@ -954,7 +952,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 123 #define _APS_NEXT_COMMAND_VALUE 40085 -#define _APS_NEXT_CONTROL_VALUE 1039 +#define _APS_NEXT_CONTROL_VALUE 1040 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc index 10993303ed1a7920a184233538fffc323d7cbb01..7c3b7370a3337a2a7c0ec0c5a92f7a5e19780292 100644 GIT binary patch delta 1608 zcmb_cT}%{L6u$F6v$IPETP0z^uu~(1Y}cLrVRy-5xBk%B#AIBJPzyqTESff3+8~f1 zl=g*$(#_(6SXnY_(*@T#;wWN18*wXmuzD(x) z+;h(T&Ue3S_an1^M$!idIRp9NWscjAP0@$7itU-wPw%o!4Sf77vk}q<#NFVSVx&xC zvd{7sf5|sz0>g({DTv(2Kwj9lO{#;jE=E@j6j}2z$L!_Un{)+GJvxTE(Gm1Esz4@s zpIQmjLH~Woi#+ta59##G9<&SXL@jx*0pl9i0ND~&bc9fdMr-ol2#i;9ZJ7^8%q56Q zl8n9Ab>-hOc&52r3DaaBEgFWs$NAk(D`<6aBY(a^K18h$^21V=b3wu(y>~LU1)JYQ z2hMde+mV*z2ccf-t_YT(?oy?p&Nfwe)cv>G~{8<>E+k>qB%8}m3-CNn;m$q9av z1O6S33nF^=M_e=ce3Y*hmlu%0P6o#dZ<}zX+zWLNGqXMDey^fh;$OM_Iwz zPXsTVssoL;R|#}cdD97FM`*wPIeQVLVv+|sR4%m%R*#5S7;?ndpK;94cOi@0AGt1rXq zEvEX}s6IfcP7)6J@fT0=IYS;^kXM|L9#&f+I;w7l$KT6gxbidGM27CM6Dm3Vqda{k zzZ>JWAA7|(S?o~a7BBO9@ES>WD<`Qq5Lb_K^FLwuy;pf_ohG=RQ(p2HSPojqY@d?6 zS`dJOHj)Uco>%?{5TOsgl7aRQ-zP4~JO#HZ6f% zV~-_A5t#hM=7jb`;;VwCM0va5@02QI3z^{UjW-Jb1?7o!ivjJDx)s_(Hgllqj-52! Nah&aX3YvGT{sA%(uJ`}| delta 684 zcmb`^Pe_w-9LMoJzvuUR_B`98EU+g9g$ZFL9j4KE7GYzDAs*rZhls}LR0=UxSZYx{ z4BUp*m_6l}W)xl|i0WwrzacV&E`i~no6Lm^B%;%fVHcnM33uq&^>_Kae(&#>1K;Yt z&m5ZNe9*Zk4uUSyXs-QHkpNw!qq)J<3;|)0hI8JzFyXznv+yy=br@^&0eg?F*XF4` z9EY{LQY)0t@B_KvbL~4^cuSQ;WRk4E(ZF1u_OpA6e0|7Ef5rn|q`US~o>6=SHqX zuFDwO74xqfFNiz$q?S6o|Dp7>4p(DRq!F$=g8#l^07G#pwOplxMbFNklaxfP&w;T% s=U5Oe?#liD6e-*+53g6364nx?3Qa$zD?JXtpJ6IQ4c3C%Q1kDuLnM;>PXGV_