diff --git a/desmume/src/frontend/windows/File_Extractor/7z_C/CpuArch.c b/desmume/src/frontend/windows/File_Extractor/7z_C/CpuArch.c index 36e7680d9..4d2652c9e 100644 --- a/desmume/src/frontend/windows/File_Extractor/7z_C/CpuArch.c +++ b/desmume/src/frontend/windows/File_Extractor/7z_C/CpuArch.c @@ -5,6 +5,10 @@ #ifdef MY_CPU_X86_OR_AMD64 +#ifdef _MSC_VER +#include +#endif + #if (defined(_MSC_VER) && !defined(MY_CPU_AMD64)) || defined(__GNUC__) #define USE_ASM #endif diff --git a/desmume/src/frontend/windows/inputdx.cpp b/desmume/src/frontend/windows/inputdx.cpp index 595a9744d..9772aa785 100644 --- a/desmume/src/frontend/windows/inputdx.cpp +++ b/desmume/src/frontend/windows/inputdx.cpp @@ -553,7 +553,7 @@ BOOL di_init() dipdw.dwData = 0; if ( !FAILED( pJoystick->SetProperty(DIPROP_AUTOCENTER, &dipdw.diph) ) ) { - DWORD rgdwAxes[1] = { DIJOFS_Y }; + DWORD rgdwAxes[1] = { (DWORD)DIJOFS_Y }; LONG rglDirection[2] = { 0 }; DICONSTANTFORCE cf = { 0 }; DIEFFECT eff; diff --git a/desmume/src/frontend/windows/oamView.cpp b/desmume/src/frontend/windows/oamView.cpp index b7d02107b..866a7fb14 100644 --- a/desmume/src/frontend/windows/oamView.cpp +++ b/desmume/src/frontend/windows/oamView.cpp @@ -217,8 +217,8 @@ LRESULT OamView_OnPaint(HWND hwnd, oamview_struct *win, WPARAM wParam, LPARAM lP win->gpu->SpriteRenderDebug(i, (u16*)(bitmap + i * 256)); } - u32 width = dimm_int[(oam->attr1>>14)][(oam->attr0>>14)][0]; - u32 height = dimm_int[(oam->attr1>>14)][(oam->attr0>>14)][1]; + int width = dimm_int[(oam->attr1>>14)][(oam->attr0>>14)][0]; + int height = dimm_int[(oam->attr1>>14)][(oam->attr0>>14)][1]; RECT rc = {180 + x, 4 + y, 180 + x + width, 4 + y + height}; SetDIBitsToDevice(hdc, 180, 4, 256, 192, 0, 0, 0, 192, bitmap, (BITMAPINFO*)&bmi, DIB_RGB_COLORS); diff --git a/desmume/src/frontend/windows/ramwatch.cpp b/desmume/src/frontend/windows/ramwatch.cpp index 58745b9d4..c98f4232e 100644 --- a/desmume/src/frontend/windows/ramwatch.cpp +++ b/desmume/src/frontend/windows/ramwatch.cpp @@ -1019,7 +1019,7 @@ LRESULT CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam Item->item.pszText = num; } return true; case 2: - Item->item.pszText = rswatches[iNum].comment ? rswatches[iNum].comment : ""; + Item->item.pszText = (char *)(rswatches[iNum].comment ? rswatches[iNum].comment : ""); return true; default: diff --git a/desmume/src/frontend/windows/soundView.cpp b/desmume/src/frontend/windows/soundView.cpp index f970e6e00..809fe35f2 100644 --- a/desmume/src/frontend/windows/soundView.cpp +++ b/desmume/src/frontend/windows/soundView.cpp @@ -371,7 +371,7 @@ INT_PTR CALLBACK LevelBarProc(HWND hBar, UINT msg, WPARAM wParam, LPARAM lParam) u8 chan = (u8)GetProp(hBar, "chan"); PAINTSTRUCT ps; HDC hdc = BeginPaint(hBar, &ps); - u32 vol = volBar[chan + chanOfs()]; + int vol = volBar[chan + chanOfs()]; if (vol > 0) { RECT rc = {0, 0, vol, ps.rcPaint.bottom};