wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 949166 - Actually compile the Windows 7 detection code in cubeb's test to disable part of a test. r=kinetik

Browse Source
This commit is contained in:
Paul Adenot 2014-04-14 12:07:54 +02:00
parent b822efd0cb
commit 7b3e3eea9e
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
media/libcubeb/tests/test_sanity.cpp
View File

@ -15,7 +15,7 @@
#include <math.h>
#include "common.h"
#if defined ( WIN32 )
#if (defined(_WIN32) || defined(__WIN32__))
#define __func__ __FUNCTION__
#endif
@ -488,15 +488,23 @@ test_drain(void)
int is_windows_7()
{
#ifdef __WIN32__
#include <windows.h>
DWORD version = GetVersion();
DWORD major = (DWORD) (LOBYTE(LOWORD(version)));
DWORD minor = (DWORD) (HIBYTE(LOWORD(version)));
#if (defined(_WIN32) || defined(__WIN32__))
OSVERSIONINFOEX osvi;
DWORDLONG condition_mask = 0;
return (major == 6) && (minor == 1);
ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
// NT 6.1 is Windows 7
osvi.dwMajorVersion = 6;
osvi.dwMinorVersion = 1;
VER_SET_CONDITION(condition_mask, VER_MAJORVERSION, VER_EQUAL);
VER_SET_CONDITION(condition_mask, VER_MINORVERSION, VER_EQUAL);
return VerifyVersionInfo(&osvi, VER_MAJORVERSION | VER_MINORVERSION, condition_mask);
#else
return-0;
return 0;
#endif
}