From 4b3c4492ea2954c55ae650132e9c0ccd6d4b82ca Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Wed, 3 Sep 2008 00:12:32 +0000 Subject: [PATCH] Replaced "WORD" by "u16", except where it is part of the Windows API. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@434 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/PluginSpecs/PluginSpecs.h | 5 ++--- Source/Plugins/Plugin_VideoDX9/Src/BPStructs.cpp | 4 ++-- Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Source/PluginSpecs/PluginSpecs.h b/Source/PluginSpecs/PluginSpecs.h index 7894792b01..527579cb11 100644 --- a/Source/PluginSpecs/PluginSpecs.h +++ b/Source/PluginSpecs/PluginSpecs.h @@ -37,7 +37,6 @@ #endif #define BOOL unsigned int -#define WORD unsigned short #define HWND void* #define HINSTANCE void* #define INT int @@ -63,8 +62,8 @@ extern "C" { typedef struct { - WORD Version; // Set to 0x0100 - WORD Type; // Set to PLUGIN_TYPE_DVD + u16 Version; // Set to 0x0100 + u16 Type; // Set to PLUGIN_TYPE_DVD char Name[100]; // Name of the DLL } PLUGIN_INFO; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/BPStructs.cpp b/Source/Plugins/Plugin_VideoDX9/Src/BPStructs.cpp index 594413c2b5..7eb4263fcc 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/BPStructs.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/BPStructs.cpp @@ -604,12 +604,12 @@ void LoadBPReg(u32 value0) break; case BPMEM_PE_TOKEN_ID: - g_VideoInitialize.pSetPEToken(static_cast(value0 & 0xFFFF), FALSE); + g_VideoInitialize.pSetPEToken(static_cast(value0 & 0xFFFF), FALSE); DebugLog("SetPEToken 0x%04x", (value0 & 0xFFFF)); break; case BPMEM_PE_TOKEN_INT_ID: - g_VideoInitialize.pSetPEToken(static_cast(value0 & 0xFFFF), TRUE); + g_VideoInitialize.pSetPEToken(static_cast(value0 & 0xFFFF), TRUE); DebugLog("SetPEToken + INT 0x%04x", (value0 & 0xFFFF)); break; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp b/Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp index 8d806140aa..3ddf6a4241 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp @@ -584,12 +584,12 @@ void LoadBPReg(u32 value0) break; case BPMEM_PE_TOKEN_ID: - g_VideoInitialize.pSetPEToken(static_cast(value0 & 0xFFFF), FALSE); + g_VideoInitialize.pSetPEToken(static_cast(value0 & 0xFFFF), FALSE); DebugLog("SetPEToken 0x%04x", (value0 & 0xFFFF)); break; case BPMEM_PE_TOKEN_INT_ID: - g_VideoInitialize.pSetPEToken(static_cast(value0 & 0xFFFF), TRUE); + g_VideoInitialize.pSetPEToken(static_cast(value0 & 0xFFFF), TRUE); DebugLog("SetPEToken + INT 0x%04x", (value0 & 0xFFFF)); break;