wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 8943fcbca4963ac6740a5c6e13d5fc9b7748cad2.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2023-10-11 19:13:43 +11:00
parent f8231c23e7
commit 5d9b555b72
3 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
patches/include-winsock/0001-include-Always-define-hton-ntoh-macros.patch
View File

@ -1,34 +0,0 @@
From a3867ccbd2fc783982263556d4b9ca525e1ef389 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 28 Sep 2017 07:02:55 +0200
Subject: include: Always define hton/ntoh macros.
---
include/winsock.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/include/winsock.h b/include/winsock.h
index 8b8db83c15b..86ce4ffcf05 100644
--- a/include/winsock.h
+++ b/include/winsock.h
@@ -510,8 +510,6 @@ int WINAPI __WSAFDIsSet(SOCKET,WS(fd_set)*);
#endif /* WS_DEFINE_SELECT */
/* we have to define hton/ntoh as macros to avoid conflicts with Unix headers */
-#ifndef USE_WS_PREFIX
-
#undef htonl
#undef htons
#undef ntohl
@@ -549,8 +547,6 @@ static inline ULONG __wine_ulong_swap(ULONG l)
#endif /* WORDS_BIGENDIAN */
-#endif /* USE_WS_PREFIX */
-
/*
* Internet address (old style... should be updated)
*/
--
2.14.1

8
patches/windows.networking.connectivity-new-dll/0003-windows.networking.connectivity-Add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From 36aab37cc208afc5684443e5771bd6aae99cc59f Mon Sep 17 00:00:00 2001
From bf1b4002be8459dca099a5ed9092ef1f2a3fa7a1 Mon Sep 17 00:00:00 2001
From: Esdras Tarsis <esdrastarsis@gmail.com>
Date: Wed, 2 Sep 2020 23:41:19 -0300
Subject: [PATCH] windows.networking.connectivity: Add stub dll.
@ -16,17 +16,17 @@ Signed-off-by: Esdras Tarsis <esdrastarsis@gmail.com>
create mode 100644 dlls/windows.networking.connectivity/windows.networking.connectivity_main.c
diff --git a/configure.ac b/configure.ac
index d1b63e32cc8..590859a0149 100644
index 9c6e949e60a..f3090dc6905 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3183,6 +3183,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media/tests)
@@ -3195,6 +3195,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media/tests)
WINE_CONFIG_MAKEFILE(dlls/windows.networking.hostname)
WINE_CONFIG_MAKEFILE(dlls/windows.networking.hostname/tests)
WINE_CONFIG_MAKEFILE(dlls/windows.networking)
+WINE_CONFIG_MAKEFILE(dlls/windows.networking.connectivity)
WINE_CONFIG_MAKEFILE(dlls/windows.perception.stub)
WINE_CONFIG_MAKEFILE(dlls/windows.perception.stub/tests)
WINE_CONFIG_MAKEFILE(dlls/windows.storage.applicationdata)
WINE_CONFIG_MAKEFILE(dlls/windows.security.credentials.ui.userconsentverifier)
diff --git a/dlls/windows.networking.connectivity/Makefile.in b/dlls/windows.networking.connectivity/Makefile.in
new file mode 100644
index 00000000000..6fc24a72feb

2
staging/upstream-commit
View File

@ -1 +1 @@
eb06f991725d21e1ce4e3353a377e8708ae8471f
8943fcbca4963ac6740a5c6e13d5fc9b7748cad2