Rebase against 975d0632a19efd41338cb73a97f1b0bdbe7bc0cc.

This commit is contained in:
Alistair Leslie-Hughes
2021-09-21 09:08:59 +10:00
parent 2771ab8cee
commit a1db1dfc16
31 changed files with 313 additions and 327 deletions

View File

@@ -1,4 +1,4 @@
From 0f6f113f1c561e0f5652a4b79e15770f5528f558 Mon Sep 17 00:00:00 2001
From 18053994fa047259217523879c13ee0c44c681d5 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
@@ -10,17 +10,17 @@ Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
2 files changed, 223 insertions(+), 4 deletions(-)
diff --git a/programs/systeminfo/Makefile.in b/programs/systeminfo/Makefile.in
index 053c52e585..1c6ad71cc7 100644
index 6ddd309b2ef..a3c65f0a6c6 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
EXTRADLLFLAGS = -mconsole -municode
diff --git a/programs/systeminfo/main.c b/programs/systeminfo/main.c
index b633134a39..c913aab3d9 100644
index b633134a393..c913aab3d91 100644
--- a/programs/systeminfo/main.c
+++ b/programs/systeminfo/main.c
@@ -1,5 +1,7 @@
@@ -271,5 +271,5 @@ index b633134a39..c913aab3d9 100644
return 0;
}
--
2.27.0
2.33.0