wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added programs-systeminfo patchset

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2020-08-07 14:33:35 +10:00
parent bf043458ba
commit 59e6a606b9
3 changed files with 295 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
patches/patchinstall.sh
View File

@ -214,6 +214,7 @@ patch_enable_all ()
enable_packager_DllMain="$1"
enable_pdh_PdhLookupPerfNameByIndex_processor="$1"
enable_programs_findstr="$1"
enable_programs_systeminfo="$1"
enable_quartz_MediaSeeking_Positions="$1"
enable_riched20_Class_Tests="$1"
enable_riched20_IText_Interface="$1"
@ -731,6 +732,9 @@ patch_enable ()
programs-findstr)
enable_programs_findstr="$2"
;;
programs-systeminfo)
enable_programs_systeminfo="$2"
;;
quartz-MediaSeeking_Positions)
enable_quartz_MediaSeeking_Positions="$2"
;;
@ -4241,6 +4245,21 @@ if test "$enable_programs_findstr" -eq 1; then
) >> "$patchlist"
fi
# Patchset programs-systeminfo
# |
# | This patchset fixes the following Wine bugs:
# | * [#42027] systeminfo: Add basic functionality.
# |
# | Modified files:
# | * programs/systeminfo/main.c
# |
if test "$enable_programs_systeminfo" -eq 1; then
patch_apply programs-systeminfo/0001-systeminfo-add-basic-functionality.patch
(
printf '%s\n' '+ { "Louis Lenders", "systeminfo: Add basic functionality.", 1 },';
) >> "$patchlist"
fi
# Patchset quartz-MediaSeeking_Positions
# |
# | Modified files:

275
patches/programs-systeminfo/0001-systeminfo-add-basic-functionality.patch Normal file
View File

@ -0,0 +1,275 @@
From 0f6f113f1c561e0f5652a4b79e15770f5528f558 Mon Sep 17 00:00:00 2001
From: Louis Lenders <xerox.xerox2000x@gmail.com>
Date: Wed, 5 Aug 2020 09:09:45 +0200
Subject: [PATCH] systeminfo: add basic functionality
Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
---
programs/systeminfo/Makefile.in | 1 +
programs/systeminfo/main.c | 226 +++++++++++++++++++++++++++++++-
2 files changed, 223 insertions(+), 4 deletions(-)
diff --git a/programs/systeminfo/Makefile.in b/programs/systeminfo/Makefile.in
index 053c52e585..1c6ad71cc7 100644
--- a/programs/systeminfo/Makefile.in
+++ b/programs/systeminfo/Makefile.in
@@ -1,4 +1,5 @@
MODULE = systeminfo.exe
+IMPORTS = ole32 oleaut32
EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
diff --git a/programs/systeminfo/main.c b/programs/systeminfo/main.c
index b633134a39..c913aab3d9 100644
--- a/programs/systeminfo/main.c
+++ b/programs/systeminfo/main.c
@@ -1,5 +1,7 @@
/*
* Copyright 2014 Austin English
+ * Copyright 2012 Hans Leidekker for CodeWeavers
+ * Copyright 2020 Louis Lenders
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -16,18 +18,234 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#define COBJMACROS
+
+#include <stdio.h>
+#include "windows.h"
+#include "ocidl.h"
+#include "initguid.h"
+#include "objidl.h"
+#include "wbemcli.h"
+
#include "wine/debug.h"
+#include "wine/heap.h"
+
+#define new_line (i == (ARRAY_SIZE(pq) - 1) || wcslen( pq[i+1].row_name ) )
WINE_DEFAULT_DEBUG_CHANNEL(systeminfo);
+typedef struct {
+ const WCHAR *row_name;
+ const WCHAR *prepend;
+ const WCHAR *class;
+ const WCHAR *prop;
+ const WCHAR *append;
+} print_query_prop;
+
+static const print_query_prop pq[] = {
+ /*row_name prepend prop append prop */
+ /*(if any) with string (if any) with string (if any) */
+ { L"OS Name", L"", L"Win32_OperatingSystem", L"Caption", L"" },
+ { L"OS Version", L"", L"Win32_OperatingSystem", L"Version", L"" },
+ { L"", L"", L"Win32_OperatingSystem", L"CSDVersion", L"" },
+ { L"", L"Build ", L"Win32_OperatingSystem", L"BuildNumber", L"" },
+ { L"Total Physical Memory", L"", L"Win32_ComputerSystem", L"TotalPhysicalMemory", L"" },
+ { L"BIOS Version", L"", L"Win32_BIOS", L"Manufacturer", L"" },
+ { L"", L", ", L"Win32_BIOS", L"ReleaseDate", L"" },
+ { L"Processor(s)", L"", L"Win32_Processor", L"Caption", L"" },
+ { L"", L"", L"Win32_Processor", L"Manufacturer", L"" },
+ { L"", L"~", L"Win32_Processor", L"MaxClockSpeed", L"Mhz"}
+};
+
+static int sysinfo_vprintfW(const WCHAR *msg, __ms_va_list va_args)
+{
+ int wlen;
+ DWORD count, ret;
+ WCHAR msg_buffer[8192];
+
+ wlen = vswprintf(msg_buffer, ARRAY_SIZE(msg_buffer), msg, va_args);
+
+ ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL);
+ if (!ret)
+ {
+ DWORD len;
+ char *msgA;
+
+ /* On Windows WriteConsoleW() fails if the output is redirected. So fall
+ * back to WriteFile(), assuming the console encoding is still the right
+ * one in that case.
+ */
+ len = WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen,
+ NULL, 0, NULL, NULL);
+ msgA = heap_alloc(len);
+ if (!msgA)
+ return 0;
+
+ WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, msgA, len,
+ NULL, NULL);
+ WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE);
+ heap_free(msgA);
+ }
+
+ return count;
+}
+
+static int WINAPIV sysinfo_printfW(const WCHAR *msg, ...)
+{
+ __ms_va_list va_args;
+ int len;
+
+ __ms_va_start(va_args, msg);
+ len = sysinfo_vprintfW(msg, va_args);
+ __ms_va_end(va_args);
+
+ return len;
+}
+
+static WCHAR *find_prop( IWbemClassObject *class, const WCHAR *prop )
+{
+ SAFEARRAY *sa;
+ WCHAR *ret = NULL;
+ LONG i, last_index = 0;
+ BSTR str;
+
+ if (IWbemClassObject_GetNames( class, NULL, WBEM_FLAG_ALWAYS, NULL, &sa ) != S_OK) return NULL;
+
+ SafeArrayGetUBound( sa, 1, &last_index );
+ for (i = 0; i <= last_index; i++)
+ {
+ SafeArrayGetElement( sa, &i, &str );
+ if (!wcsicmp( str, prop ))
+ {
+ ret = _wcsdup( str );
+ break;
+ }
+ }
+ SafeArrayDestroy( sa );
+ return ret;
+}
+
+static int query_prop( const WCHAR *class, const WCHAR *propname )
+{
+ static const WCHAR select_allW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0};
+ static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0};
+ static const WCHAR wqlW[] = {'W','Q','L',0};
+ HRESULT hr;
+ IWbemLocator *locator = NULL;
+ IWbemServices *services = NULL;
+ IEnumWbemClassObject *result = NULL;
+ LONG flags = WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY;
+ BSTR path = NULL, wql = NULL, query = NULL;
+ WCHAR *prop = NULL;
+ int len, ret = -1;
+ IWbemClassObject *obj;
+ ULONG count = 0;
+ VARIANT v;
+
+ WINE_TRACE("%s, %s\n", debugstr_w(class), debugstr_w(propname));
+
+ CoInitialize( NULL );
+ CoInitializeSecurity( NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_DEFAULT,
+ RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE, NULL );
+
+ hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator,
+ (void **)&locator );
+ if (hr != S_OK) goto done;
+
+ if (!(path = SysAllocString( cimv2W ))) goto done;
+ hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services );
+ if (hr != S_OK) goto done;
+
+ len = lstrlenW( class ) + ARRAY_SIZE(select_allW);
+ if (!(query = SysAllocStringLen( NULL, len ))) goto done;
+ lstrcpyW( query, select_allW );
+ lstrcatW( query, class );
+
+ if (!(wql = SysAllocString( wqlW ))) goto done;
+ hr = IWbemServices_ExecQuery( services, wql, query, flags, NULL, &result );
+ if (hr != S_OK) goto done;
+
+ for (;;)
+ {
+ IEnumWbemClassObject_Next( result, WBEM_INFINITE, 1, &obj, &count );
+ if (!count) break;
+
+ if (!prop && !(prop = find_prop( obj, propname )))
+ {
+ ERR("Error: Invalid query\n");
+ goto done;
+ }
+
+ if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR)
+ {
+ VariantChangeType( &v, &v, 0, VT_BSTR );
+ sysinfo_printfW( V_BSTR( &v ) );
+ VariantClear( &v );
+ }
+ IWbemClassObject_Release( obj );
+ }
+ ret = 0;
+
+done:
+ if (result) IEnumWbemClassObject_Release( result );
+ if (services) IWbemServices_Release( services );
+ if (locator) IWbemLocator_Release( locator );
+ SysFreeString( path );
+ SysFreeString( query );
+ SysFreeString( wql );
+ HeapFree( GetProcessHeap(), 0, prop );
+ CoUninitialize();
+ return ret;
+}
+
int __cdecl wmain(int argc, WCHAR *argv[])
{
int i;
+ BOOL csv = FALSE;
+
+ for (i = 1; i < argc; i++)
+ {
+ if ( !wcsicmp( argv[i], L"/fo" ) && !wcsicmp( argv[i+1], L"csv" ) )
+ csv = TRUE;
+ else
+ WINE_FIXME( "command line switch %s not supported\n", debugstr_w(argv[i]) );
+ }
- WINE_FIXME("stub:");
- for (i = 0; i < argc; i++)
- WINE_FIXME(" %s", wine_dbgstr_w(argv[i]));
- WINE_FIXME("\n");
+ if( !csv )
+ {
+ for ( i = 0; i < ARRAYSIZE(pq); i++ )
+ {
+ if( wcslen(pq[i].row_name) )
+ sysinfo_printfW( L"%-*s", 44, pq[i].row_name );
+ if ( wcslen(pq[i].prepend) )
+ sysinfo_printfW( L"%s", pq[i].prepend );
+ query_prop( pq[i].class, pq[i].prop );
+ if ( wcslen(pq[i].append) )
+ sysinfo_printfW( L"%s", pq[i].append );
+ sysinfo_printfW( new_line ? L"\r\n" : L" " );
+ }
+ }
+ else /* only option "systeminfo /fo csv" supported for now */
+ {
+ for (i = 0; i < ARRAYSIZE(pq); i++)
+ {
+ if( wcslen(pq[i].row_name) )
+ sysinfo_printfW( i ? L",\"%s\"" : L"\"%s\"", pq[i].row_name );
+ }
+ sysinfo_printfW( L"\r\n" );
+ for (i = 0; i < ARRAYSIZE(pq); i++)
+ {
+ if ( wcslen(pq[i].row_name) )
+ sysinfo_printfW( i ? L",\"" : L"\"" );
+ if ( wcslen(pq[i].prepend) )
+ sysinfo_printfW( L"%s",pq[i].prepend );
+ query_prop( pq[i].class, pq[i].prop );
+ if ( wcslen(pq[i].append) )
+ sysinfo_printfW( L"%s", pq[i].append );
+ sysinfo_printfW( new_line ? L"\"" : L" " );
+ }
+ sysinfo_printfW( L"\r\n" );
+ }
return 0;
}
--
2.27.0

1
patches/programs-systeminfo/definition Normal file
View File

@ -0,0 +1 @@
Fixes: [42027] systeminfo: Add basic functionality.