wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against a952453888fb5df3c70edf357820bc924b4f3e7f.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-01-21 12:00:14 +11:00
parent 76f8eb15f1
commit 2f619b2a53
8 changed files with 53 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/windows.globalization-dll/0001-windows.globalization-Add-stub-dll.patch
View File

@@ -1,7 +1,7 @@
From 22add75334045f50a22d3c14f4a7d9c3ed708742 Mon Sep 17 00:00:00 2001
From 06487c40a8cc1cb928992d8873ed6e778d9e15b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 28 Aug 2020 15:59:50 +0200
Subject: [PATCH 1/5] windows.globalization: Add stub dll.
Subject: [PATCH] windows.globalization: Add stub dll.
---
configure.ac | 1 +
@@ -18,10 +18,10 @@ Subject: [PATCH 1/5] windows.globalization: Add stub dll.
create mode 100644 include/windows.globalization.idl
diff --git a/configure.ac b/configure.ac
index 3e717d5191f..187bd614387 100644
index bdcfe84f87d..4654e994e29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3823,6 +3823,7 @@ WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16)
@@ -3851,6 +3851,7 @@ WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/winaspi.dll16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/windebug.dll16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input.dll)
@@ -197,17 +197,17 @@ index 00000000000..840ce08c0c5
+ return S_OK;
+}
diff --git a/include/Makefile.in b/include/Makefile.in
index e26eafb7f6a..74eeff2d830 100644
index 2f68c258f1b..69837a1ca97 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -738,6 +738,7 @@ SOURCES = \
@@ -756,6 +756,7 @@ SOURCES = \
windows.foundation.idl \
windows.gaming.input.idl \
windows.gaming.input.forcefeedback.idl \
+ windows.globalization.idl \
windows.h \
windows.media.speechsynthesis.idl \
windows.system.idl \
windows.h \
diff --git a/include/windows.globalization.idl b/include/windows.globalization.idl
new file mode 100644
index 00000000000..c3f80999af5
@@ -242,10 +242,10 @@ index 00000000000..c3f80999af5
+namespace Windows {
+}
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index ab18ab97e4c..0c20b5b1098 100644
index 9e02369f341..06bb1e68c24 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -716,6 +716,7 @@ HKLM,%MciExtStr%,"wvx",,"MPEGVideo"
@@ -720,6 +720,7 @@ HKLM,%MciExtStr%,"wvx",,"MPEGVideo"
HKLM,Software\Microsoft\WindowsRuntime\ActivatableClassId\Windows.Gaming.Input.Gamepad,"DllPath",2,"Windows.Gaming.Input.dll"
HKLM,Software\Microsoft\WindowsRuntime\ActivatableClassId\Windows.Gaming.Input.RawGameController,"DllPath",2,"Windows.Gaming.Input.dll"
HKLM,Software\Microsoft\WindowsRuntime\ActivatableClassId\Windows.Media.SpeechSynthesis.SpeechSynthesizer,"DllPath",2,"Windows.Media.Speech.dll"
@@ -254,5 +254,5 @@ index ab18ab97e4c..0c20b5b1098 100644
HKLM,Software\Clients\Mail,,2,"Native Mail Client"
HKLM,Software\Clients\Mail\Native Mail Client,,2,"Native Mail Client"
--
2.28.0
2.29.2

20
patches/windows.globalization-dll/0002-windows.globalization-Implement-IGlobalizationPrefer.patch
View File

@@ -1,7 +1,7 @@
From a5fb434c28607cd124e463eed2b4ef6c4e856983 Mon Sep 17 00:00:00 2001
From 7892b025109656123c7253739c9c1b0f0f0b507c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 13 Oct 2020 18:11:35 +0200
Subject: [PATCH 2/5] windows.globalization: Implement
Subject: [PATCH] windows.globalization: Implement
IGlobalizationPreferencesStatics stubs.
---
@@ -197,17 +197,17 @@ index 840ce08c0c5..97afc941219 100644
};
diff --git a/include/Makefile.in b/include/Makefile.in
index 74eeff2d830..258813f7f15 100644
index 69837a1ca97..d6ae2988493 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -739,6 +739,7 @@ SOURCES = \
windows.gaming.input.idl \
windows.gaming.input.forcefeedback.idl \
windows.globalization.idl \
+ windows.system.userprofile.idl \
@@ -760,6 +760,7 @@ SOURCES = \
windows.h \
windows.media.speechsynthesis.idl \
windows.system.idl \
windows.h \
+ windows.system.userprofile.idl \
windowscontracts.idl \
windowsx.h \
wine/debug.h \
diff --git a/include/windows.globalization.idl b/include/windows.globalization.idl
index c3f80999af5..ac76455b847 100644
--- a/include/windows.globalization.idl
@@ -303,5 +303,5 @@ index 00000000000..e2676f9dd89
+ }
+}
--
2.28.0
2.29.2