Paul Vriens : winetest: Add product information to the output for Vista and higher.
Alexandre Julliard
julliard at winehq.org
Fri Nov 20 10:48:03 CST 2009
Module: wine
Branch: master
Commit: c34ca48b3e0b3837473c5cf9306fcf823095748a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c34ca48b3e0b3837473c5cf9306fcf823095748a
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Fri Nov 20 10:48:17 2009 +0100
winetest: Add product information to the output for Vista and higher.
---
programs/winetest/main.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/programs/winetest/main.c b/programs/winetest/main.c
index ee092e5..21dbaef 100644
--- a/programs/winetest/main.c
+++ b/programs/winetest/main.c
@@ -209,6 +209,7 @@ static void print_version (void)
const char *(CDECL *wine_get_build_id)(void);
void (CDECL *wine_get_host_version)( const char **sysname, const char **release );
BOOL (WINAPI *pIsWow64Process)(HANDLE hProcess, PBOOL Wow64Process);
+ BOOL (WINAPI *pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *);
ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
if (!(ext = GetVersionEx ((OSVERSIONINFO *) &ver)))
@@ -247,6 +248,15 @@ static void print_version (void)
" wSuiteMask=%d\n wProductType=%d\n wReserved=%d\n",
ver.wServicePackMajor, ver.wServicePackMinor, ver.wSuiteMask,
ver.wProductType, ver.wReserved);
+
+ pGetProductInfo = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"),"GetProductInfo");
+ if (pGetProductInfo && !running_under_wine())
+ {
+ DWORD prodtype = 0;
+
+ pGetProductInfo(ver.dwMajorVersion, ver.dwMinorVersion, ver.wServicePackMajor, ver.wServicePackMinor, &prodtype);
+ xprintf(" dwProductInfo=%u\n", prodtype);
+ }
}
static inline int is_dot_dir(const char* x)
More information about the wine-cvs
mailing list