Implement kernel32.VerSetConditionMask
Dominik Strasser
Dominik.Strasser at t-online.de
Mon Dec 30 02:44:43 CST 2002
This patch "implements" kernel32.VerSetConditionMask by forwarding to
ntdll.VerSetConditionMask.
Changelog: Implement kernel32.VerSetConditionMask by forwarding to
ntdll.VerSetConditionMask
Regards
Dominik
-------------- next part --------------
Index: dlls/kernel/kernel32.spec
===================================================================
RCS file: /home/wine/wine/dlls/kernel/kernel32.spec,v
retrieving revision 1.87
diff -u -3 -p -r1.87 kernel32.spec
--- dlls/kernel/kernel32.spec 19 Dec 2002 04:12:42 -0000 1.87
+++ dlls/kernel/kernel32.spec 30 Dec 2002 08:38:21 -0000
@@ -835,7 +835,7 @@
@ stub ValidateLocale
@ stdcall VerLanguageNameA(long str long) VerLanguageNameA
@ stdcall VerLanguageNameW(long wstr long) VerLanguageNameW
-@ stub VerSetConditionMask
+@ forward VerSetConditionMask kernel32.VerSetConditionMask
@ stdcall VirtualAlloc(ptr long long long) VirtualAlloc
@ stdcall VirtualFree(ptr long long) VirtualFree
@ stdcall VirtualLock(ptr long) VirtualLock
Index: dlls/ntdll/nt.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/nt.c,v
retrieving revision 1.48
diff -u -3 -p -r1.48 nt.c
--- dlls/ntdll/nt.c 10 Dec 2002 20:04:40 -0000 1.48
+++ dlls/ntdll/nt.c 30 Dec 2002 08:38:21 -0000
@@ -719,33 +719,3 @@ NTSTATUS WINAPI NtAllocateLocallyUniqueI
return STATUS_SUCCESS;
}
-/******************************************************************************
- * VerSetConditionMask (NTDLL.@)
- */
-ULONGLONG WINAPI VerSetConditionMask( ULONGLONG dwlConditionMask, DWORD dwTypeBitMask,
- BYTE dwConditionMask)
-{
- if(dwTypeBitMask == 0)
- return dwlConditionMask;
- dwConditionMask &= 0x07;
- if(dwConditionMask == 0)
- return dwlConditionMask;
-
- if(dwTypeBitMask & VER_PRODUCT_TYPE)
- dwlConditionMask |= dwConditionMask << 7*3;
- else if (dwTypeBitMask & VER_SUITENAME)
- dwlConditionMask |= dwConditionMask << 6*3;
- else if (dwTypeBitMask & VER_SERVICEPACKMAJOR)
- dwlConditionMask |= dwConditionMask << 5*3;
- else if (dwTypeBitMask & VER_SERVICEPACKMINOR)
- dwlConditionMask |= dwConditionMask << 4*3;
- else if (dwTypeBitMask & VER_PLATFORMID)
- dwlConditionMask |= dwConditionMask << 3*3;
- else if (dwTypeBitMask & VER_BUILDNUMBER)
- dwlConditionMask |= dwConditionMask << 2*3;
- else if (dwTypeBitMask & VER_MAJORVERSION)
- dwlConditionMask |= dwConditionMask << 1*3;
- else if (dwTypeBitMask & VER_MINORVERSION)
- dwlConditionMask |= dwConditionMask << 0*3;
- return dwlConditionMask;
-}
Index: misc/version.c
===================================================================
RCS file: /home/wine/wine/misc/version.c,v
retrieving revision 1.61
diff -u -3 -p -r1.61 version.c
--- misc/version.c 13 Sep 2002 17:47:44 -0000 1.61
+++ misc/version.c 30 Dec 2002 08:38:22 -0000
@@ -697,6 +697,38 @@ BOOL WINAPI VerifyVersionInfoA( LPOSVERS
/******************************************************************************
+ * VerSetConditionMask (NTDLL.@)
+ * VerSetConditionMask (KERNEL32.@)
+ */
+ULONGLONG WINAPI VerSetConditionMask( ULONGLONG dwlConditionMask, DWORD dwTypeBitMask,
+ BYTE dwConditionMask)
+{
+ if(dwTypeBitMask == 0)
+ return dwlConditionMask;
+ dwConditionMask &= 0x07;
+ if(dwConditionMask == 0)
+ return dwlConditionMask;
+
+ if(dwTypeBitMask & VER_PRODUCT_TYPE)
+ dwlConditionMask |= dwConditionMask << 7*3;
+ else if (dwTypeBitMask & VER_SUITENAME)
+ dwlConditionMask |= dwConditionMask << 6*3;
+ else if (dwTypeBitMask & VER_SERVICEPACKMAJOR)
+ dwlConditionMask |= dwConditionMask << 5*3;
+ else if (dwTypeBitMask & VER_SERVICEPACKMINOR)
+ dwlConditionMask |= dwConditionMask << 4*3;
+ else if (dwTypeBitMask & VER_PLATFORMID)
+ dwlConditionMask |= dwConditionMask << 3*3;
+ else if (dwTypeBitMask & VER_BUILDNUMBER)
+ dwlConditionMask |= dwConditionMask << 2*3;
+ else if (dwTypeBitMask & VER_MAJORVERSION)
+ dwlConditionMask |= dwConditionMask << 1*3;
+ else if (dwTypeBitMask & VER_MINORVERSION)
+ dwlConditionMask |= dwConditionMask << 0*3;
+ return dwlConditionMask;
+}
+
+/******************************************************************************
* VerifyVersionInfoW (KERNEL32.@)
*/
BOOL WINAPI VerifyVersionInfoW( LPOSVERSIONINFOEXW lpVersionInfo, DWORD dwTypeMask,
More information about the wine-patches
mailing list