[Scummvm-cvs-logs] scummvm master -> c32a3ea0d30336771bab460ecccb58c4614e6294

Littleboy littleboy22 at gmail.com
Wed Jun 29 05:49:06 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c32a3ea0d3 BACKENDS: Fix warnings in Win32TaskbarManager


Commit: c32a3ea0d30336771bab460ecccb58c4614e6294
    https://github.com/scummvm/scummvm/commit/c32a3ea0d30336771bab460ecccb58c4614e6294
Author: Littleboy (littleboy at users.sourceforge.net)
Date: 2011-06-28T20:40:31-07:00

Commit Message:
BACKENDS: Fix warnings in Win32TaskbarManager

Changed paths:
    backends/taskbar/win32/win32-taskbar.cpp



diff --git a/backends/taskbar/win32/win32-taskbar.cpp b/backends/taskbar/win32/win32-taskbar.cpp
index d6be566..18d99d6 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)






More information about the Scummvm-git-logs mailing list