From f13fabcc73f8fd0d95fd94694854decb30e2e442 Mon Sep 17 00:00:00 2001 From: zeromus Date: Sun, 19 Dec 2010 01:32:40 +0000 Subject: [PATCH] add big endian toggle to memview --- desmume/src/windows/memView.cpp | 17 +++++++++++++++++ desmume/src/windows/resource.h | 7 ++++--- desmume/src/windows/resources.rc | Bin 956980 -> 957398 bytes 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/desmume/src/windows/memView.cpp b/desmume/src/windows/memView.cpp index d40772647..3d1712aa4 100644 --- a/desmume/src/windows/memView.cpp +++ b/desmume/src/windows/memView.cpp @@ -29,6 +29,7 @@ #include #include #include "memView.h" +#include "winutil.h" using namespace std; @@ -430,6 +431,13 @@ LRESULT MemView_ViewBoxPaint(CMemView* wnd, HWND hCtl, WPARAM wParam, LPARAM lPa for(i = 0; i < 16; i += 2) { u16 val = T1ReadWord(memory, ((line << 4) + i)); + if(IsDlgCheckboxChecked(wnd->hWnd,IDC_BIG_ENDIAN)) + { + char swp[2]; + swp[0] = (val>>8)&0xFF; + swp[1] = val&0xFF; + val = *(u16*)swp; + } if(wnd->sel && (wnd->selAddress == (addr + i))) { SetBkColor(mem_hdc, GetSysColor(COLOR_HIGHLIGHT)); @@ -470,6 +478,15 @@ LRESULT MemView_ViewBoxPaint(CMemView* wnd, HWND hCtl, WPARAM wParam, LPARAM lPa for(i = 0; i < 16; i += 4) { u32 val = T1ReadLong(memory, ((line << 4) + i)); + if(IsDlgCheckboxChecked(wnd->hWnd,IDC_BIG_ENDIAN)) + { + char swp[4]; + swp[0] = (val>>24)&0xFF; + swp[1] = (val>>16)&0xFF; + swp[2] = (val>>8)&0xFF; + swp[3] = val&0xFF; + val = *(u32*)swp; + } if(wnd->sel && (wnd->selAddress == (addr + i))) { SetBkColor(mem_hdc, GetSysColor(COLOR_HIGHLIGHT)); diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h index 15e7d2530..b3cf60a73 100644 --- a/desmume/src/windows/resource.h +++ b/desmume/src/windows/resource.h @@ -434,6 +434,7 @@ #define IDC_CAP0_ACTIVE 1078 #define IDC_CHECK10 1079 #define IDC_CAP0_RUNNING 1079 +#define IDC_BIG_ENDIAN 1079 #define IDC_CHECK6 1080 #define IDC_CAP1_SRC 1080 #define IDC_CAP1_ONESHOT 1081 @@ -452,7 +453,7 @@ #define IDC_EDIT1 1102 #define IDC_EDIT2 1103 #define IDC_EDIT3 1104 -#define IDC_WINDOW5X 1105 +#define IDC_WINDOW5X 1105 #define IDC_EDIT_AUTHOR 1180 #define IDD_MATRIX_VIEWER 1200 #define IDM_MATRIX_VIEWER 1200 @@ -691,6 +692,8 @@ #define MENU_PRINCIPAL 2012 #define RAMWATCH_MENU 2013 #define RECENTROMS 2014 +#define IDD_FONTSETTINGS 2464 +#define IDC_FONTCOMBO 2465 #define IDC_GI_FATOFS 4464 #define IDC_INTERPOLATECOLOR 4464 #define IDC_GI_FATSIZE 4465 @@ -953,8 +956,6 @@ #define IDM_RENDER_LQ2X 60082 #define IDM_RENDER_LQ2XS 60083 #define IDC_SAVETYPE 64000 -#define IDD_FONTSETTINGS 68000 -#define IDC_FONTCOMBO 68001 // Next default values for new objects // diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc index 6b7af390e4517336ff3c898b19701b4b7c08c798..76d2bed3de954dee88dc5503b13d2190ea5a6f89 100644 GIT binary patch delta 3371 zcmds(ZA?>F7=Z6Ry{A3&w%4vUKoAQ$wxMBI5uF$$d{kwNF;$2fT_(GqqbZQAe;Eqt5VSr@d|O-NrN;|F|^G zeb4)G?vFlw@*X}s>ld8m?J~gX4q9F3kt}exmMZcJVTtgnut1n5WWXOCbV6OFG-Lep z!WyAWSS`FQtQC@lDg2{v%j=|9H*cr7or>SAhh;O_WT@UvrI+90y^*<|IQ7qe`mAxH;S$};&wyRDV7M;lc<8bmXl9XVe2N627yx6gLgk8nX|Pz@H)d~ z-6SY5m4eg9UW4Y3VDQ8IqgUr+XV$T4PpsSgtLsdUvFnp1m)D=AaBmsu{ z$!pQv`EcYXvDn!vGYUJlDk-5Pdi=yELd$LD1m7Xq4GF)qWH@)3tkuo*UuV~-dQSGz z46yAnN@xqP_bH?e6FXiwPD?~+y-Dn{M@SbI@o#~U4l6q77E^&xC=>~k;8rai`!Cj@ zB|sGTIzX}?P22$7xI$~8Jk?NxUAM{kBHS_8@MBF~MeLK(SM*$_;Npm82vdbu_%oCL z0}f2GBw_hahHY`sINh{PecjMigC|!{=9mzrd}Lbaf*Ek@Pq7GXK5-v?RzPiADLFcH z$Ynd}K{0xM6HAln2n(H&bKI;Vj5&*_BToZ!+c{E!)yG&3!SV*`wT77q;u)dP0o(Ub zBkbBwEl|}=Rq8?nBPUoAqa&GM-%CH%r~^)FBKGg4xssN|!f$D(dPa`od99RzIY(%x zs0R?w9;a(WsA{LJqpJ=Ik5bno$lJJ#9KqCMG}%DYImjWZcaD19@`vAq+?sLSz@c3L zxi)J&_zf{j(Xr9!uYXz!1+LIC^xn1bf1|C>#D9cKG#N+YOnb*8r}^|kJ;UMn8M5n5 z3+D8hE>%V;RWLuF)rZmKc0HD>m7rmjG9Lr=@@WR%b&6B1bk)i>kP4U`-A7oHs@S%6 zR$&d6osiqdoapUk=rfvF3Z(@u@~!(4qZxU1bsu&a*6PeX7_6J(`^q^yZfYZ1*iG z82G?kEMjAp=~@za(qtnJW?3&xf3|VVTC5}P_58%Z+4Y}EeZd$ zYsDs|MdMms7|J#)bHlqTUu|Q7FARxoUntyNq18FGzgBPID3yMtG^vfj9az<{6a5WJ GvEeTp_7LX) delta 3734 zcmeH}e`pj(6vubxcJAhO_oitYHC|&pB@L+!5~KtPF`iLkYEK(uENX*|wh6Yx5UrFp zSiB}S6`>N1-YZ4qNb3(!L$G=;jd(_}5-ZiKh^SZ_iwzoso{oOMp48Hs8b$Q5K1 zR;(uj)2y@l<0Qvzl~+!a2!U8FS0FR2RYPz!FN5B%we04)vPsx_miQQudL9Vvl$|i~ zBI$xD4Lkr-FOgh0-oWQU^b*+tr5pJaY`RRGRCdFvZZZ~{P%C^~7xc0!Sbc~Fu=bGl zz6`#btPrMNCK*Ow0K$hg9=XM$)OaTc<8iiyLfvhWJRDq{e?qI2q3;e!9=AYxPg*H> zt`?tFVpU4-O4*W6Dv?U1nI_?|DNZcJ;mRi(Zw@IbMv-O0jskYRFf!ZG)d)pC*IH;= z=-CCapzOrCKO-T$w!nh`ehfSaC`EYts=S9L>>feC82>Z$%aGXhXmeBVyEyI&O`hZzSVjud8Dq2fv%8Wt&)1fm)K7`s9Eg5UJ(u^dF_U>@Ne8j>rD7T!0*M<-PEs`P-FLA+M<|1g8(`WV{J67pa5JYPv`eB=nmy$0--el2#-w93 zqcb$y5rED+`cmxv)Y-pvn9=VW&^u%dj&=Po4rir$HV_c?M2veq`4gIhOH!bzz@*iC$eu{A>-r)?GLs>)j}<|1KV!IjCi4#$4~UU+0^*fi!B92p zpKeL);x;YS4Fxqk-P$Kd*suwcjuor8PZj{tbez<|a&+il$J4O;WB#klh#@*wonhf5 zLvC>h{zCE$36>a@3QavshwTkK!%`o=#`gT1(c>dff0N}sb@c3_b}F-k85&^wEM4{t zu$&=*K`h^q3E^q_J&678a)x@`saW&}t8x#@4PwRm7AXIMGw3aF^G2sT;#AL-4(Shs z{&qm{lyDeti#r9^E>ZnUM|5P9hn|VtHGd`wjifyx3QS+Dwda}qN49FM)-Xb$jAGTC zH7K&yj_3X