diff --git a/patches/loader-KeyboardLayouts/0001-loader-Add-Keyboard-Layouts-registry-enteries.patch b/patches/loader-KeyboardLayouts/0001-loader-Add-Keyboard-Layouts-registry-enteries.patch index 79e2595b..679edf0a 100644 --- a/patches/loader-KeyboardLayouts/0001-loader-Add-Keyboard-Layouts-registry-enteries.patch +++ b/patches/loader-KeyboardLayouts/0001-loader-Add-Keyboard-Layouts-registry-enteries.patch @@ -1,4 +1,4 @@ -From d1d83243555801226876f651b6f3304d3e595ae4 Mon Sep 17 00:00:00 2001 +From fd12e8e89a6f42ce0737006d9951c644b2e4ec54 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Mon, 1 Jul 2019 09:58:55 +1000 Subject: [PATCH] loader: Add Keyboard Layouts registry enteries. @@ -9,7 +9,7 @@ Signed-off-by: Alistair Leslie-Hughes 1 file changed, 209 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index d5f943861a8..b07843ff237 100644 +index 000ba36bf36..9a86c6241b1 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -63,6 +63,7 @@ AddReg=\ @@ -36,15 +36,15 @@ index d5f943861a8..b07843ff237 100644 MCI,\ Misc,\ OLE,\ -@@ -156,6 +159,7 @@ AddReg=\ +@@ -157,6 +160,7 @@ AddReg=\ CurrentVersionWow64.ntx86,\ Debugger,\ DirectX,\ + KeyboardLayouts,\ MCI,\ Misc,\ - Tapi,\ -@@ -628,6 +632,211 @@ HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\ftp\UserChoic + VCRuntime.ntamd64,\ +@@ -677,6 +681,211 @@ HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\ftp\UserChoic HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice,"ProgId",,"http" HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\https\UserChoice,"ProgId",,"https" @@ -257,5 +257,5 @@ index d5f943861a8..b07843ff237 100644 HKLM,"Software\Microsoft\OLE","EnableDCOM",,"Y" HKLM,"Software\Microsoft\OLE","EnableRemoteConnect",,"N" -- -2.39.2 +2.50.1 diff --git a/patches/ws2_32-af_unix/0004-server-Introduce-error-when-attempting-to-create-a-S.patch b/patches/ws2_32-af_unix/0004-server-Introduce-error-when-attempting-to-create-a-S.patch index c2fd994c..e883b808 100644 --- a/patches/ws2_32-af_unix/0004-server-Introduce-error-when-attempting-to-create-a-S.patch +++ b/patches/ws2_32-af_unix/0004-server-Introduce-error-when-attempting-to-create-a-S.patch @@ -1,4 +1,4 @@ -From 29a79759aa334517dee63d5e6acfeb10777f6215 Mon Sep 17 00:00:00 2001 +From 2af205aeae28b030fa267f1c3e4f6c5384a6fde8 Mon Sep 17 00:00:00 2001 From: Ally Sommers Date: Tue, 16 May 2023 02:20:55 -0700 Subject: [PATCH] server: Introduce error when attempting to create a @@ -9,10 +9,10 @@ Subject: [PATCH] server: Introduce error when attempting to create a 1 file changed, 6 insertions(+) diff --git a/server/sock.c b/server/sock.c -index 8262898c436..67b84346ab4 100644 +index 2b8316cfcfa..f56fcae3876 100644 --- a/server/sock.c +++ b/server/sock.c -@@ -1897,6 +1897,12 @@ static int init_socket( struct sock *sock, int family, int type, int protocol ) +@@ -1956,6 +1956,12 @@ static int init_socket( struct sock *sock, int family, int type, int protocol ) return -1; } @@ -23,8 +23,8 @@ index 8262898c436..67b84346ab4 100644 + } + sockfd = socket( unix_family, unix_type, unix_protocol ); - #ifdef linux + if (sockfd == -1 && errno == EPERM && unix_type == SOCK_RAW -- -2.47.2 +2.50.1 diff --git a/staging/upstream-commit b/staging/upstream-commit index c1004f1e..c4621ef8 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -75b9e1722d11d75c3d7745b39a03b73e9f9003ba +2e4974af42a96dfcd426be5e40faecd9853401d1