aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLittleboy2011-06-28 23:40:31 -0400
committerLittleboy2011-06-28 23:40:31 -0400
commitc32a3ea0d30336771bab460ecccb58c4614e6294 (patch)
treec4c95580c9ee2154154bf4d762fa117b67666ee2
parent04933a1937ef0de703a932e1392578aea4d38d64 (diff)
downloadscummvm-rg350-c32a3ea0d30336771bab460ecccb58c4614e6294.tar.gz
scummvm-rg350-c32a3ea0d30336771bab460ecccb58c4614e6294.tar.bz2
scummvm-rg350-c32a3ea0d30336771bab460ecccb58c4614e6294.zip
BACKENDS: Fix warnings in Win32TaskbarManager
-rw-r--r--backends/taskbar/win32/win32-taskbar.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/backends/taskbar/win32/win32-taskbar.cpp b/backends/taskbar/win32/win32-taskbar.cpp
index d6be566263..18d99d6eca 100644
--- a/backends/taskbar/win32/win32-taskbar.cpp
+++ b/backends/taskbar/win32/win32-taskbar.cpp
@@ -234,18 +234,18 @@ Common::String Win32TaskbarManager::getIconPath(Common::String target) {
// VerSetConditionMask and VerifyVersionInfo didn't appear until Windows 2000,
// so we need to check for them at runtime
-LONGLONG VerSetConditionMaskFunc(ULONGLONG conditionMask, DWORD typeMask, BYTE condition) {
- typedef BOOL (WINAPI *VerSetConditionMaskFunction)(ULONGLONG ConditionMask, DWORD TypeMask, BYTE Condition);
+LONGLONG VerSetConditionMaskFunc(ULONGLONG dwlConditionMask, DWORD dwTypeMask, BYTE dwConditionMask) {
+ typedef BOOL (WINAPI *VerSetConditionMaskFunction)(ULONGLONG conditionMask, DWORD typeMask, BYTE conditionOperator);
VerSetConditionMaskFunction verSetConditionMask = (VerSetConditionMaskFunction)GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "VerSetConditionMask");
if (verSetConditionMask == NULL)
return 0;
- return verSetConditionMask(conditionMask, typeMask, condition);
+ return verSetConditionMask(dwlConditionMask, dwTypeMask, dwConditionMask);
}
BOOL VerifyVersionInfoFunc(LPOSVERSIONINFOEXA lpVersionInformation, DWORD dwTypeMask, DWORDLONG dwlConditionMask) {
- typedef BOOL (WINAPI *VerifyVersionInfoFunction)(LPOSVERSIONINFOEXA lpVersionInformation, DWORD dwTypeMask, DWORDLONG dwlConditionMask);
+ typedef BOOL (WINAPI *VerifyVersionInfoFunction)(LPOSVERSIONINFOEXA versionInformation, DWORD typeMask, DWORDLONG conditionMask);
VerifyVersionInfoFunction verifyVersionInfo = (VerifyVersionInfoFunction)GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "VerifyVersionInfoA");
if (verifyVersionInfo == NULL)