Robert Shearman : ntdll:
Reduce duplicated code in RtlVerifyVersionInfo by calling a function
for comparing the values .
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jul 17 08:14:49 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 644e079d57394ea0667150efb6fb886048f9feaf
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=644e079d57394ea0667150efb6fb886048f9feaf
Author: Robert Shearman <rob at codeweavers.com>
Date: Mon Jul 17 12:08:50 2006 +0100
ntdll: Reduce duplicated code in RtlVerifyVersionInfo by calling a function for comparing the values.
---
dlls/ntdll/version.c | 198 +++++++++++++++-----------------------------------
1 files changed, 59 insertions(+), 139 deletions(-)
diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c
index fe738b2..ee828b6 100644
--- a/dlls/ntdll/version.c
+++ b/dlls/ntdll/version.c
@@ -562,6 +562,30 @@ BOOLEAN WINAPI RtlGetNtProductType( LPDW
}
+static inline NTSTATUS version_compare_values(ULONG left, ULONG right, UCHAR condition)
+{
+ switch (condition) {
+ case VER_EQUAL:
+ if (left != right) return STATUS_REVISION_MISMATCH;
+ break;
+ case VER_GREATER:
+ if (left <= right) return STATUS_REVISION_MISMATCH;
+ break;
+ case VER_GREATER_EQUAL:
+ if (left < right) return STATUS_REVISION_MISMATCH;
+ break;
+ case VER_LESS:
+ if (left >= right) return STATUS_REVISION_MISMATCH;
+ break;
+ case VER_LESS_EQUAL:
+ if (left > right) return STATUS_REVISION_MISMATCH;
+ break;
+ default:
+ return STATUS_INVALID_PARAMETER;
+ }
+ return STATUS_SUCCESS;
+}
+
/******************************************************************************
* RtlVerifyVersionInfo (NTDLL.@)
*/
@@ -587,25 +611,11 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( co
if(!(dwTypeMask && dwlConditionMask)) return STATUS_INVALID_PARAMETER;
if(dwTypeMask & VER_PRODUCT_TYPE)
- switch(dwlConditionMask >> 7*3 & 0x07) {
- case VER_EQUAL:
- if(ver.wProductType != info->wProductType) return STATUS_REVISION_MISMATCH;
- break;
- case VER_GREATER:
- if(ver.wProductType <= info->wProductType) return STATUS_REVISION_MISMATCH;
- break;
- case VER_GREATER_EQUAL:
- if(ver.wProductType < info->wProductType) return STATUS_REVISION_MISMATCH;
- break;
- case VER_LESS:
- if(ver.wProductType >= info->wProductType) return STATUS_REVISION_MISMATCH;
- break;
- case VER_LESS_EQUAL:
- if(ver.wProductType > info->wProductType) return STATUS_REVISION_MISMATCH;
- break;
- default:
- return STATUS_INVALID_PARAMETER;
- }
+ {
+ status = version_compare_values(ver.wProductType, info->wProductType, dwlConditionMask >> 7*3 & 0x07);
+ if (status != STATUS_SUCCESS)
+ return status;
+ }
if(dwTypeMask & VER_SUITENAME)
switch(dwlConditionMask >> 6*3 & 0x07)
{
@@ -621,131 +631,41 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( co
return STATUS_INVALID_PARAMETER;
}
if(dwTypeMask & VER_PLATFORMID)
- switch(dwlConditionMask >> 3*3 & 0x07)
- {
- case VER_EQUAL:
- if(ver.dwPlatformId != info->dwPlatformId) return STATUS_REVISION_MISMATCH;
- break;
- case VER_GREATER:
- if(ver.dwPlatformId <= info->dwPlatformId) return STATUS_REVISION_MISMATCH;
- break;
- case VER_GREATER_EQUAL:
- if(ver.dwPlatformId < info->dwPlatformId) return STATUS_REVISION_MISMATCH;
- break;
- case VER_LESS:
- if(ver.dwPlatformId >= info->dwPlatformId) return STATUS_REVISION_MISMATCH;
- break;
- case VER_LESS_EQUAL:
- if(ver.dwPlatformId > info->dwPlatformId) return STATUS_REVISION_MISMATCH;
- break;
- default:
- return STATUS_INVALID_PARAMETER;
- }
+ {
+ status = version_compare_values(ver.dwPlatformId, info->dwPlatformId, dwlConditionMask >> 3*3 & 0x07);
+ if (status != STATUS_SUCCESS)
+ return status;
+ }
if(dwTypeMask & VER_BUILDNUMBER)
- switch(dwlConditionMask >> 2*3 & 0x07)
- {
- case VER_EQUAL:
- if(ver.dwBuildNumber != info->dwBuildNumber) return STATUS_REVISION_MISMATCH;
- break;
- case VER_GREATER:
- if(ver.dwBuildNumber <= info->dwBuildNumber) return STATUS_REVISION_MISMATCH;
- break;
- case VER_GREATER_EQUAL:
- if(ver.dwBuildNumber < info->dwBuildNumber) return STATUS_REVISION_MISMATCH;
- break;
- case VER_LESS:
- if(ver.dwBuildNumber >= info->dwBuildNumber) return STATUS_REVISION_MISMATCH;
- break;
- case VER_LESS_EQUAL:
- if(ver.dwBuildNumber > info->dwBuildNumber) return STATUS_REVISION_MISMATCH;
- break;
- default:
- return STATUS_INVALID_PARAMETER;
- }
+ {
+ status = version_compare_values(ver.dwBuildNumber, info->dwBuildNumber, dwlConditionMask >> 2*3 & 0x07);
+ if (status != STATUS_SUCCESS)
+ return status;
+ }
if(dwTypeMask & VER_MAJORVERSION)
- switch(dwlConditionMask >> 1*3 & 0x07)
- {
- case VER_EQUAL:
- if(ver.dwMajorVersion != info->dwMajorVersion) return STATUS_REVISION_MISMATCH;
- break;
- case VER_GREATER:
- if(ver.dwMajorVersion <= info->dwMajorVersion) return STATUS_REVISION_MISMATCH;
- break;
- case VER_GREATER_EQUAL:
- if(ver.dwMajorVersion < info->dwMajorVersion) return STATUS_REVISION_MISMATCH;
- break;
- case VER_LESS:
- if(ver.dwMajorVersion >= info->dwMajorVersion) return STATUS_REVISION_MISMATCH;
- break;
- case VER_LESS_EQUAL:
- if(ver.dwMajorVersion > info->dwMajorVersion) return STATUS_REVISION_MISMATCH;
- break;
- default:
- return STATUS_INVALID_PARAMETER;
- }
+ {
+ status = version_compare_values(ver.dwMajorVersion, info->dwMajorVersion, dwlConditionMask >> 1*3 & 0x07);
+ if (status != STATUS_SUCCESS)
+ return status;
+ }
if(dwTypeMask & VER_MINORVERSION)
- switch(dwlConditionMask >> 0*3 & 0x07)
- {
- case VER_EQUAL:
- if(ver.dwMinorVersion != info->dwMinorVersion) return STATUS_REVISION_MISMATCH;
- break;
- case VER_GREATER:
- if(ver.dwMinorVersion <= info->dwMinorVersion) return STATUS_REVISION_MISMATCH;
- break;
- case VER_GREATER_EQUAL:
- if(ver.dwMinorVersion < info->dwMinorVersion) return STATUS_REVISION_MISMATCH;
- break;
- case VER_LESS:
- if(ver.dwMinorVersion >= info->dwMinorVersion) return STATUS_REVISION_MISMATCH;
- break;
- case VER_LESS_EQUAL:
- if(ver.dwMinorVersion > info->dwMinorVersion) return STATUS_REVISION_MISMATCH;
- break;
- default:
- return STATUS_INVALID_PARAMETER;
- }
+ {
+ status = version_compare_values(ver.dwMinorVersion, info->dwMinorVersion, dwlConditionMask >> 0*3 & 0x07);
+ if (status != STATUS_SUCCESS)
+ return status;
+ }
if(dwTypeMask & VER_SERVICEPACKMAJOR)
- switch(dwlConditionMask >> 5*3 & 0x07)
- {
- case VER_EQUAL:
- if(ver.wServicePackMajor != info->wServicePackMajor) return STATUS_REVISION_MISMATCH;
- break;
- case VER_GREATER:
- if(ver.wServicePackMajor <= info->wServicePackMajor) return STATUS_REVISION_MISMATCH;
- break;
- case VER_GREATER_EQUAL:
- if(ver.wServicePackMajor < info->wServicePackMajor) return STATUS_REVISION_MISMATCH;
- break;
- case VER_LESS:
- if(ver.wServicePackMajor >= info->wServicePackMajor) return STATUS_REVISION_MISMATCH;
- break;
- case VER_LESS_EQUAL:
- if(ver.wServicePackMajor > info->wServicePackMajor) return STATUS_REVISION_MISMATCH;
- break;
- default:
- return STATUS_INVALID_PARAMETER;
- }
+ {
+ status = version_compare_values(ver.wServicePackMajor, info->wServicePackMajor, dwlConditionMask >> 5*3 & 0x07);
+ if (status != STATUS_SUCCESS)
+ return status;
+ }
if(dwTypeMask & VER_SERVICEPACKMINOR)
- switch(dwlConditionMask >> 4*3 & 0x07)
- {
- case VER_EQUAL:
- if(ver.wServicePackMinor != info->wServicePackMinor) return STATUS_REVISION_MISMATCH;
- break;
- case VER_GREATER:
- if(ver.wServicePackMinor <= info->wServicePackMinor) return STATUS_REVISION_MISMATCH;
- break;
- case VER_GREATER_EQUAL:
- if(ver.wServicePackMinor < info->wServicePackMinor) return STATUS_REVISION_MISMATCH;
- break;
- case VER_LESS:
- if(ver.wServicePackMinor >= info->wServicePackMinor) return STATUS_REVISION_MISMATCH;
- break;
- case VER_LESS_EQUAL:
- if(ver.wServicePackMinor > info->wServicePackMinor) return STATUS_REVISION_MISMATCH;
- break;
- default:
- return STATUS_INVALID_PARAMETER;
- }
+ {
+ status = version_compare_values(ver.wServicePackMinor, info->wServicePackMinor, dwlConditionMask >> 4*3 & 0x07);
+ if (status != STATUS_SUCCESS)
+ return status;
+ }
return STATUS_SUCCESS;
}
More information about the wine-cvs
mailing list