Alexandre Julliard : winehid.sys: Move winehid.inf into the module resources.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6aa7704cf66e677a5b1a15bfc2335c8fc29db916
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=6aa7704cf66e677a5b1a15bfc...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Nov 11 11:04:25 2020 +0100

winehid.sys: Move winehid.inf into the module resources.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/winehid.sys/Makefile.in                         |  2 ++
 .../winehid.inf.in => dlls/winehid.sys/winehid.inf   |  0
 dlls/winehid.sys/winehid.rc                          | 20 ++++++++++++++++++++
 loader/Makefile.in                                   |  1 -
 loader/wine.inf.in                                   |  2 +-
 5 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/dlls/winehid.sys/Makefile.in b/dlls/winehid.sys/Makefile.in
index b2363e75659..f9c7fdbbe38 100644
--- a/dlls/winehid.sys/Makefile.in
+++ b/dlls/winehid.sys/Makefile.in
@@ -4,3 +4,5 @@ EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native
 
 C_SRCS = \
 	main.c
+
+RC_SRCS = winehid.rc
diff --git a/loader/winehid.inf.in b/dlls/winehid.sys/winehid.inf
similarity index 100%
rename from loader/winehid.inf.in
rename to dlls/winehid.sys/winehid.inf
diff --git a/dlls/winehid.sys/winehid.rc b/dlls/winehid.sys/winehid.rc
new file mode 100644
index 00000000000..a80fad837aa
--- /dev/null
+++ b/dlls/winehid.sys/winehid.rc
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2020 Alexandre Julliard
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* @makedep: winehid.inf */
+1 WINE_DATA_FILE winehid.inf
diff --git a/loader/Makefile.in b/loader/Makefile.in
index 83aefa00861..99d4a8349e8 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -9,7 +9,6 @@ SOURCES = \
 	wine.man.in \
 	wine.pl.UTF-8.man.in \
 	wine_info.plist.in \
-	winehid.inf.in \
 	wineusb.inf.in
 
 PROGRAMS = $(WINELOADER_PROGRAMS)
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index e593117c83d..c273a2f2821 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -4060,7 +4060,7 @@ HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame"
 
 [InfFiles]
 winebus.inf,"@winebus.sys,-1"
-winehid.inf
+winehid.inf,"@winehid.sys,-1"
 wineusb.inf
 
 [NlsFiles]