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 23ffd0a7986421958c23cffce138afa389209920.

Browse Source
This commit is contained in:
Zebediah Figura
2021-03-15 18:28:35 -05:00
parent 7ec998e17a
commit 1f89c15143
13 changed files with 32 additions and 659 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,4 +1,4 @@
From 5f5660930fa0579352bdf3bbcf85b80bfbaf0b33 Mon Sep 17 00:00:00 2001
From 7d845fec580f156ed26a0a200ddd1611e54c1ee4 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] windows.globalization: Add stub dll.
@@ -18,17 +18,17 @@ Subject: [PATCH] windows.globalization: Add stub dll.
create mode 100644 include/windows.globalization.idl
diff --git a/configure.ac b/configure.ac
index 405d1a6ecc4..e291201a541 100644
index 558d2e906a2..036b5c2691d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3797,6 +3797,7 @@ WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16)
@@ -3802,6 +3802,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)
+WINE_CONFIG_MAKEFILE(dlls/windows.globalization.dll)
WINE_CONFIG_MAKEFILE(dlls/windows.media.speech.dll)
WINE_CONFIG_MAKEFILE(dlls/windows.media.speech)
WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests)
WINE_CONFIG_MAKEFILE(dlls/windowscodecs)
WINE_CONFIG_MAKEFILE(dlls/windowscodecs/tests)
diff --git a/dlls/windows.globalization.dll/Makefile.in b/dlls/windows.globalization.dll/Makefile.in
new file mode 100644
index 00000000000..25dc1cac3e6
@@ -197,10 +197,10 @@ index 00000000000..840ce08c0c5
+ return S_OK;
+}
diff --git a/include/Makefile.in b/include/Makefile.in
index 90e9b660633..95013040926 100644
index 22ed5f3a2d5..a868eadce4b 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -751,6 +751,7 @@ SOURCES = \
@@ -752,6 +752,7 @@ SOURCES = \
windows.foundation.idl \
windows.gaming.input.idl \
windows.gaming.input.forcefeedback.idl \
@@ -242,13 +242,13 @@ index 00000000000..c3f80999af5
+namespace Windows {
+}
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 71c6cac0366..ba7b1ee08c9 100644
index c10cb37a172..12d6d3ecb6e 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -716,6 +716,7 @@ HKLM,%MciExtStr%,"wvx",,"MPEGVideo"
@@ -713,6 +713,7 @@ HKLM,%MciExtStr%,"wvx",,"MPEGVideo"
[Misc]
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"
+HKLM,Software\Microsoft\WindowsRuntime\ActivatableClassId\Windows.System.UserProfile.GlobalizationPreferences,"DllPath",2,"Windows.Globalization.dll"
HKLM,Software\Borland\Database Engine\Settings\SYSTEM\INIT,SHAREDMEMLOCATION,,9000
HKLM,Software\Clients\Mail,,2,"Native Mail Client"