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

apply warning fixes from r1447 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4514 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2009-11-08 02:28:06 +00:00
parent 1c4c31f37a
commit 1b7303ea0a
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Plugins/Plugin_DSP_LLE/Src/DSPSymbols.cpp
View File

@ -178,7 +178,7 @@ bool ReadAnnotatedAssembly(const char *filename)
// Scan for function starts // Scan for function starts
if (!memcmp(line, "void", 4)) { if (!memcmp(line, "void", 4)) {
char temp[256]; char temp[256];
for (int i = 6; i < len; i++) { for (size_t i = 6; i < len; i++) {
if (line[i] == '(') { if (line[i] == '(') {
// Yep, got one. // Yep, got one.
memcpy(temp, line + 5, i - 5); memcpy(temp, line + 5, i - 5);
@ -197,7 +197,7 @@ bool ReadAnnotatedAssembly(const char *filename)
} }
// Scan for braces // Scan for braces
for (int i = 0; i < (int)len; i++) { for (size_t i = 0; i < len; i++) {
if (line[i] == '{') if (line[i] == '{')
brace_count++; brace_count++;
if (line[i] == '}') if (line[i] == '}')

2
Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
View File

@ -123,7 +123,7 @@ bool Renderer::Init()
sscanf(g_Config.cFSResolution, "%dx%d", &w_temp, &h_temp); sscanf(g_Config.cFSResolution, "%dx%d", &w_temp, &h_temp);
for (fullScreenRes = 0; fullScreenRes < D3D::GetAdapter(g_ActiveConfig.iAdapter).resolutions.size(); fullScreenRes++) for (fullScreenRes = 0; fullScreenRes < (int)D3D::GetAdapter(g_ActiveConfig.iAdapter).resolutions.size(); fullScreenRes++)
{ {
if ((D3D::GetAdapter(g_ActiveConfig.iAdapter).resolutions[fullScreenRes].xres == w_temp) && if ((D3D::GetAdapter(g_ActiveConfig.iAdapter).resolutions[fullScreenRes].xres == w_temp) &&
(D3D::GetAdapter(g_ActiveConfig.iAdapter).resolutions[fullScreenRes].yres == h_temp)) (D3D::GetAdapter(g_ActiveConfig.iAdapter).resolutions[fullScreenRes].yres == h_temp))

3
Source/Plugins/Plugin_VideoDX9/Src/resource.h
View File

@ -1534,11 +1534,8 @@
#define SC_CONTEXTHELP 0xF180 #define SC_CONTEXTHELP 0xF180
#define LVS_TYPESTYLEMASK 0xfc00 #define LVS_TYPESTYLEMASK 0xfc00
#define SPVERSION_MASK 0x0000FF00 #define SPVERSION_MASK 0x0000FF00
#define HTERROR -2
#define IDC_STATIC -1 #define IDC_STATIC -1
#define UNICODE_NOCHAR 0xFFFF #define UNICODE_NOCHAR 0xFFFF
#define PWR_FAIL -1
#define HTTRANSPARENT -1
// Next default values for new objects // Next default values for new objects
// //

2
Source/Plugins/Plugin_VideoOGL/Src/DLCache.cpp
View File

@ -406,7 +406,7 @@ bool CompileAndRunDisplayList(u32 address, int size, CachedDisplayList *dl)
emitter.MOV(64, R(RAX), Imm64(pre_draw_video_data)); emitter.MOV(64, R(RAX), Imm64(pre_draw_video_data));
emitter.MOV(64, M(&g_pVideoData), R(RAX)); emitter.MOV(64, M(&g_pVideoData), R(RAX));
#else #else
emitter.MOV(32, R(EAX), Imm32(pre_draw_video_data)); emitter.MOV(32, R(EAX), Imm32((u32)pre_draw_video_data));
emitter.MOV(32, M(&g_pVideoData), R(EAX)); emitter.MOV(32, M(&g_pVideoData), R(EAX));
#endif #endif
emitter.ABI_CallFunctionCCC( emitter.ABI_CallFunctionCCC(