wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 908c837b17ac1c285ef32e98f53df730c3770295.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2020-11-04 09:47:25 +11:00
parent 6ad4bdecd2
commit 786cac8be4
11 changed files with 7 additions and 462 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
patches/mfplat-streaming-support/0001-mfmediaengine-Provide-the-partial-topology-to-the-me.patch
View File

@ -1,39 +0,0 @@
From d62c72b607a0afed782df3b1c0bdba6eec5a538e Mon Sep 17 00:00:00 2001
From: Derek Lesho <dlesho@codeweavers.com>
Date: Fri, 16 Oct 2020 16:53:29 -0500
Subject: [PATCH] mfmediaengine: Provide the partial topology to the media
session.
Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
---
dlls/mfmediaengine/main.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
index d93e2b2f38c..d1261e3cd73 100644
--- a/dlls/mfmediaengine/main.c
+++ b/dlls/mfmediaengine/main.c
@@ -418,7 +418,10 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi
{
sd_video = sd;
IMFStreamDescriptor_AddRef(sd_video);
+ /* TODO: reintroduce this once we set up video stream nodes */
+#if 0
IMFPresentationDescriptor_SelectStream(pd, i);
+#endif
}
IMFMediaTypeHandler_Release(type_handler);
@@ -480,6 +483,9 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi
if (audio_src)
IMFTopologyNode_Release(audio_src);
}
+
+ if (SUCCEEDED(hr))
+ hr = IMFMediaSession_SetTopology(engine->session, MFSESSION_SETTOPOLOGY_IMMEDIATE, topology);
}
if (topology)
--
2.28.0

33
patches/mfplat-streaming-support/0002-mfmediaengine-Issue-MF_MEDIA_ENGINE_EVENT_CANPLAY-up.patch
View File

@ -1,33 +0,0 @@
From afcfca53cc7f15bf0f49463d46b865ba254b70d2 Mon Sep 17 00:00:00 2001
From: Derek Lesho <dlesho@codeweavers.com>
Date: Fri, 16 Oct 2020 16:54:57 -0500
Subject: [PATCH] mfmediaengine: Issue MF_MEDIA_ENGINE_EVENT_CANPLAY upon
MF_TOPOSTATUS_READY.
Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
---
dlls/mfmediaengine/main.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
index d1261e3cd73..bc89b2f702a 100644
--- a/dlls/mfmediaengine/main.c
+++ b/dlls/mfmediaengine/main.c
@@ -295,6 +295,14 @@ static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface
IMFMediaEngineNotify_EventNotify(engine->callback, event_type == MEBufferingStarted ?
MF_MEDIA_ENGINE_EVENT_BUFFERINGSTARTED : MF_MEDIA_ENGINE_EVENT_BUFFERINGENDED, 0, 0);
break;
+ case MESessionTopologyStatus:
+ {
+ UINT32 topo_status = 0;
+ IMFMediaEvent_GetUINT32(event, &MF_EVENT_TOPOLOGY_STATUS, &topo_status);
+ if (topo_status == MF_TOPOSTATUS_READY)
+ IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_CANPLAY, 0, 0);
+ break;
+ }
}
failed:
--
2.28.0

29
patches/mfplat-streaming-support/0003-mfmediaengine-Issue-MF_MEDIA_ENGINE_EVENT_PLAYING-up.patch
View File

@ -1,29 +0,0 @@
From 63f092c3ef53718cdeaf1564ac3793cc65891109 Mon Sep 17 00:00:00 2001
From: Derek Lesho <dlesho@codeweavers.com>
Date: Fri, 16 Oct 2020 16:57:21 -0500
Subject: [PATCH] mfmediaengine: Issue MF_MEDIA_ENGINE_EVENT_PLAYING upon
MESessionStarted.
Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
---
dlls/mfmediaengine/main.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
index bc89b2f702a..ed57aec7eb1 100644
--- a/dlls/mfmediaengine/main.c
+++ b/dlls/mfmediaengine/main.c
@@ -303,6 +303,10 @@ static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface
IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_CANPLAY, 0, 0);
break;
}
+ case MESessionStarted:
+
+ IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAYING, 0, 0);
+ break;
}
failed:
--
2.28.0

29
patches/mfplat-streaming-support/0004-mfmediaengine-Issue-MF_MEDIA_ENGINE_EVENT_ENDED-upon.patch
View File

@ -1,29 +0,0 @@
From d2b277c0588a44e56fa260de34d61f1ca0d16a9d Mon Sep 17 00:00:00 2001
From: Derek Lesho <dlesho@codeweavers.com>
Date: Fri, 16 Oct 2020 16:58:20 -0500
Subject: [PATCH] mfmediaengine: Issue MF_MEDIA_ENGINE_EVENT_ENDED upon
MESessionEnded.
Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
---
dlls/mfmediaengine/main.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
index ed57aec7eb1..fe9aa81121f 100644
--- a/dlls/mfmediaengine/main.c
+++ b/dlls/mfmediaengine/main.c
@@ -307,6 +307,10 @@ static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface
IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAYING, 0, 0);
break;
+ case MESessionEnded:
+
+ IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_ENDED, 0, 0);
+ break;
}
failed:
--
2.28.0

13
patches/mfplat-streaming-support/0055-mfmediaengine-Implement-GetNativeVideoSize.patch
View File

@ -1,4 +1,4 @@
From 33d71bfb289c8f2273ab2bafbf60e95098e7705f Mon Sep 17 00:00:00 2001
From f2c8482489046a0623ef3d011ac7373209eef09a Mon Sep 17 00:00:00 2001
From: Derek Lesho <dlesho@codeweavers.com>
Date: Fri, 16 Oct 2020 16:59:32 -0500
Subject: [PATCH] mfmediaengine: Implement GetNativeVideoSize.
@ -9,10 +9,10 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
index fe9aa81121f..44e298bf5ef 100644
index e126a925b67..974e11296e9 100644
--- a/dlls/mfmediaengine/main.c
+++ b/dlls/mfmediaengine/main.c
@@ -84,6 +84,7 @@ struct media_engine
@@ -91,6 +91,7 @@ struct media_engine
double default_playback_rate;
double volume;
double duration;
@ -20,7 +20,7 @@ index fe9aa81121f..44e298bf5ef 100644
MF_MEDIA_ENGINE_ERR error_code;
HRESULT extended_code;
MF_MEDIA_ENGINE_READY ready_state;
@@ -432,12 +433,26 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi
@@ -496,9 +497,23 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi
}
else if (IsEqualGUID(&major, &MFMediaType_Video) && !sd_video && !(engine->flags & MF_MEDIA_ENGINE_AUDIOONLY))
{
@ -29,10 +29,7 @@ index fe9aa81121f..44e298bf5ef 100644
+
sd_video = sd;
IMFStreamDescriptor_AddRef(sd_video);
/* TODO: reintroduce this once we set up video stream nodes */
#if 0
IMFPresentationDescriptor_SelectStream(pd, i);
#endif
+
+ engine->vid_width = 0;
+ engine->vid_height = 0;
@ -47,7 +44,7 @@ index fe9aa81121f..44e298bf5ef 100644
}
IMFMediaTypeHandler_Release(type_handler);
@@ -1136,9 +1151,20 @@ static BOOL WINAPI media_engine_HasAudio(IMFMediaEngine *iface)
@@ -1230,9 +1245,20 @@ static BOOL WINAPI media_engine_HasAudio(IMFMediaEngine *iface)
static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngine *iface, DWORD *cx, DWORD *cy)
{

116
patches/netutils-dll/0001-netutils-New-DLL.patch
View File

@ -1,116 +0,0 @@
From 0cfece3e266a2f33385827d97cbee0f9c44e12c3 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 26 Aug 2020 18:06:57 +1000
Subject: [PATCH] netutils: New DLL
---
configure.ac | 1 +
dlls/netutils/Makefile.in | 5 +++++
dlls/netutils/main.c | 41 +++++++++++++++++++++++++++++++++++++
dlls/netutils/netutils.spec | 22 ++++++++++++++++++++
4 files changed, 69 insertions(+)
create mode 100644 dlls/netutils/Makefile.in
create mode 100644 dlls/netutils/main.c
create mode 100644 dlls/netutils/netutils.spec
diff --git a/configure.ac b/configure.ac
index 2dc829893dd..2bb56f29e30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3651,6 +3651,7 @@ WINE_CONFIG_MAKEFILE(dlls/netcfgx/tests)
WINE_CONFIG_MAKEFILE(dlls/netio.sys)
WINE_CONFIG_MAKEFILE(dlls/netprofm)
WINE_CONFIG_MAKEFILE(dlls/netprofm/tests)
+WINE_CONFIG_MAKEFILE(dlls/netutils)
WINE_CONFIG_MAKEFILE(dlls/newdev)
WINE_CONFIG_MAKEFILE(dlls/ninput)
WINE_CONFIG_MAKEFILE(dlls/ninput/tests)
diff --git a/dlls/netutils/Makefile.in b/dlls/netutils/Makefile.in
new file mode 100644
index 00000000000..21589e07b8b
--- /dev/null
+++ b/dlls/netutils/Makefile.in
@@ -0,0 +1,5 @@
+MODULE = netutils.dll
+
+EXTRADLLFLAGS = -mno-cygwin
+
+C_SRCS = main.c
diff --git a/dlls/netutils/main.c b/dlls/netutils/main.c
new file mode 100644
index 00000000000..503e0ef7bfb
--- /dev/null
+++ b/dlls/netutils/main.c
@@ -0,0 +1,41 @@
+/*
+ *
+ * Copyright (C) 2020 Alistair Leslie-Hughes
+ *
+ * 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
+ */
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(netutils);
+
+BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
+{
+ TRACE("(%p, %u, %p)\n", instance, reason, reserved);
+
+ switch (reason)
+ {
+ case DLL_WINE_PREATTACH:
+ return FALSE; /* prefer native version */
+ case DLL_PROCESS_ATTACH:
+ DisableThreadLibraryCalls(instance);
+ break;
+ }
+
+ return TRUE;
+}
diff --git a/dlls/netutils/netutils.spec b/dlls/netutils/netutils.spec
new file mode 100644
index 00000000000..ff022af2c57
--- /dev/null
+++ b/dlls/netutils/netutils.spec
@@ -0,0 +1,22 @@
+@ stub NetApiBufferAllocate
+@ stub NetApiBufferFree
+@ stub NetApiBufferReallocate
+@ stub NetApiBufferSize
+@ stub NetRemoteComputerSupports
+@ stub NetapipBufferAllocate
+@ stub NetpIsComputerNameValid
+@ stub NetpIsDomainNameValid
+@ stub NetpIsGroupNameValid
+@ stub NetpIsRemote
+@ stub NetpIsRemoteNameValid
+@ stub NetpIsShareNameValid
+@ stub NetpIsUncComputerNameValid
+@ stub NetpIsUserNameValid
+@ stub NetpwListCanonicalize
+@ stub NetpwListTraverse
+@ stub NetpwNameCanonicalize
+@ stub NetpwNameCompare
+@ stub NetpwNameValidate
+@ stub NetpwPathCanonicalize
+@ stub NetpwPathCompare
+@ stub NetpwPathType
--
2.28.0

1
patches/netutils-dll/definition
View File

@ -1 +0,0 @@
Fixes: [49739] Add netutils dll

38
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "dfa4c07941322dbcad54507cd0acf271a6c719ab"
echo "908c837b17ac1c285ef32e98f53df730c3770295"
}
# Show version information
@ -155,7 +155,6 @@ patch_enable_all ()
enable_msi_msi_vcl_get_cost="$1"
enable_msvcrt_Math_Precision="$1"
enable_msxml3_FreeThreadedXMLHTTP60="$1"
enable_netutils_dll="$1"
enable_ntdll_APC_Performance="$1"
enable_ntdll_Activation_Context="$1"
enable_ntdll_ApiSetMap="$1"
@ -237,7 +236,6 @@ patch_enable_all ()
enable_shlwapi_SHAddDataBlock="$1"
enable_shlwapi_UrlCanonicalize="$1"
enable_shlwapi_UrlCombine="$1"
enable_srvcli_dll="$1"
enable_stdole32_idl_Typelib="$1"
enable_stdole32_tlb_SLTG_Typelib="$1"
enable_tasklist_basics="$1"
@ -552,9 +550,6 @@ patch_enable ()
msxml3-FreeThreadedXMLHTTP60)
enable_msxml3_FreeThreadedXMLHTTP60="$2"
;;
netutils-dll)
enable_netutils_dll="$2"
;;
ntdll-APC_Performance)
enable_ntdll_APC_Performance="$2"
;;
@ -798,9 +793,6 @@ patch_enable ()
shlwapi-UrlCombine)
enable_shlwapi_UrlCombine="$2"
;;
srvcli-dll)
enable_srvcli_dll="$2"
;;
stdole32.idl-Typelib)
enable_stdole32_idl_Typelib="$2"
;;
@ -2837,10 +2829,6 @@ fi
# | include/mfidl.idl, tools/make_makefiles, tools/makedep.c
# |
if test "$enable_mfplat_streaming_support" -eq 1; then
patch_apply mfplat-streaming-support/0001-mfmediaengine-Provide-the-partial-topology-to-the-me.patch
patch_apply mfplat-streaming-support/0002-mfmediaengine-Issue-MF_MEDIA_ENGINE_EVENT_CANPLAY-up.patch
patch_apply mfplat-streaming-support/0003-mfmediaengine-Issue-MF_MEDIA_ENGINE_EVENT_PLAYING-up.patch
patch_apply mfplat-streaming-support/0004-mfmediaengine-Issue-MF_MEDIA_ENGINE_EVENT_ENDED-upon.patch
patch_apply mfplat-streaming-support/0005-mf-Unconditionally-deliver-NULL-EOS-samples.patch
patch_apply mfplat-streaming-support/0011-winegstreamer-Insert-parser-into-pipeline-to-rectify.patch
patch_apply mfplat-streaming-support/0012-winegstreamer-Translate-H.264-caps-to-attributes.patch
@ -2999,18 +2987,6 @@ if test "$enable_msxml3_FreeThreadedXMLHTTP60" -eq 1; then
patch_apply msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch
fi
# Patchset netutils-dll
# |
# | This patchset fixes the following Wine bugs:
# | * [#49739] Add netutils dll
# |
# | Modified files:
# | * configure.ac, dlls/netutils/Makefile.in, dlls/netutils/main.c, dlls/netutils/netutils.spec
# |
if test "$enable_netutils_dll" -eq 1; then
patch_apply netutils-dll/0001-netutils-New-DLL.patch
fi
# Patchset ntdll-APC_Performance
# |
# | Modified files:
@ -3935,18 +3911,6 @@ if test "$enable_shlwapi_UrlCombine" -eq 1; then
patch_apply shlwapi-UrlCombine/0002-shlwapi-UrlCombineW-workaround-for-relative-paths.patch
fi
# Patchset srvcli-dll
# |
# | This patchset fixes the following Wine bugs:
# | * [#49739] Add srvcli dll
# |
# | Modified files:
# | * configure.ac, dlls/srvcli/Makefile.in, dlls/srvcli/main.c, dlls/srvcli/srvcli.spec, tools/make_specfiles
# |
if test "$enable_srvcli_dll" -eq 1; then
patch_apply srvcli-dll/0001-srvcli-New-DLL.patch
fi
# Patchset stdole32.idl-Typelib
# |
# | Modified files:

168
patches/srvcli-dll/0001-srvcli-New-DLL.patch
View File

@ -1,168 +0,0 @@
From 5b036c3ee7ad83867acca8ddda118f368e7d4760 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 26 Aug 2020 18:14:51 +1000
Subject: [PATCH] srvcli: New DLL
---
configure.ac | 1 +
dlls/srvcli/Makefile.in | 5 ++++
dlls/srvcli/main.c | 41 +++++++++++++++++++++++++++
dlls/srvcli/srvcli.spec | 61 +++++++++++++++++++++++++++++++++++++++++
tools/make_specfiles | 1 +
5 files changed, 109 insertions(+)
create mode 100644 dlls/srvcli/Makefile.in
create mode 100644 dlls/srvcli/main.c
create mode 100644 dlls/srvcli/srvcli.spec
diff --git a/configure.ac b/configure.ac
index 2bb56f29e30..248481ee21d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3809,6 +3809,7 @@ WINE_CONFIG_MAKEFILE(dlls/sound.drv16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/spoolss)
WINE_CONFIG_MAKEFILE(dlls/spoolss/tests)
WINE_CONFIG_MAKEFILE(dlls/srclient)
+WINE_CONFIG_MAKEFILE(dlls/srvcli)
WINE_CONFIG_MAKEFILE(dlls/sspicli)
WINE_CONFIG_MAKEFILE(dlls/stdole2.tlb)
WINE_CONFIG_MAKEFILE(dlls/stdole32.tlb)
diff --git a/dlls/srvcli/Makefile.in b/dlls/srvcli/Makefile.in
new file mode 100644
index 00000000000..716cc1b3867
--- /dev/null
+++ b/dlls/srvcli/Makefile.in
@@ -0,0 +1,5 @@
+MODULE = srvcli.dll
+
+EXTRADLLFLAGS = -mno-cygwin
+
+C_SRCS = main.c
diff --git a/dlls/srvcli/main.c b/dlls/srvcli/main.c
new file mode 100644
index 00000000000..0df8e00d0fa
--- /dev/null
+++ b/dlls/srvcli/main.c
@@ -0,0 +1,41 @@
+/*
+ *
+ * Copyright (C) 2020 Alistair Leslie-Hughes
+ *
+ * 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
+ */
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(srvcli);
+
+BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
+{
+ TRACE("(%p, %u, %p)\n", instance, reason, reserved);
+
+ switch (reason)
+ {
+ case DLL_WINE_PREATTACH:
+ return FALSE; /* prefer native version */
+ case DLL_PROCESS_ATTACH:
+ DisableThreadLibraryCalls(instance);
+ break;
+ }
+
+ return TRUE;
+}
diff --git a/dlls/srvcli/srvcli.spec b/dlls/srvcli/srvcli.spec
new file mode 100644
index 00000000000..821724a7d4d
--- /dev/null
+++ b/dlls/srvcli/srvcli.spec
@@ -0,0 +1,61 @@
+@ stub I_NetDfsGetVersion
+@ stub I_NetServerSetServiceBits
+@ stub I_NetServerSetServiceBitsEx
+@ stub LocalAliasGet
+@ stub LocalFileClose
+@ stub LocalFileEnum
+@ stub LocalFileEnumEx
+@ stub LocalFileGetInfo
+@ stub LocalFileGetInfoEx
+@ stub LocalServerCertificateMappingAdd
+@ stub LocalServerCertificateMappingEnum
+@ stub LocalServerCertificateMappingGet
+@ stub LocalServerCertificateMappingRemove
+@ stub LocalSessionDel
+@ stub LocalSessionEnum
+@ stub LocalSessionEnumEx
+@ stub LocalSessionGetInfo
+@ stub LocalSessionGetInfoEx
+@ stub LocalShareAdd
+@ stub LocalShareDelEx
+@ stub LocalShareEnum
+@ stub LocalShareEnumEx
+@ stub LocalShareGetInfo
+@ stub LocalShareGetInfoEx
+@ stub LocalShareSetInfo
+@ stub NetConnectionEnum
+@ stub NetFileClose
+@ stdcall NetFileEnum(wstr wstr wstr long ptr long ptr ptr ptr) netapi32.NetFileEnum
+@ stub NetFileGetInfo
+@ stub NetRemoteTOD
+@ stub NetServerAliasAdd
+@ stub NetServerAliasDel
+@ stub NetServerAliasEnum
+@ stub NetServerComputerNameAdd
+@ stub NetServerComputerNameDel
+@ stdcall NetServerDiskEnum(wstr long ptr long ptr ptr ptr) netapi32.NetServerDiskEnum
+@ stdcall NetServerGetInfo(wstr long ptr) netapi32.NetServerGetInfo
+@ stub NetServerSetInfo
+@ stub NetServerStatisticsGet
+@ stub NetServerTransportAdd
+@ stub NetServerTransportAddEx
+@ stub NetServerTransportDel
+@ stub NetServerTransportEnum
+@ stub NetSessionDel
+@ stdcall NetSessionEnum(wstr wstr wstr long ptr long ptr ptr ptr) netapi32.NetSessionEnum
+@ stub NetSessionGetInfo
+@ stdcall NetShareAdd(wstr long ptr ptr) netapi32.NetShareAdd
+@ stub NetShareCheck
+@ stdcall NetShareDel(wstr wstr long) netapi32.NetShareDel
+@ stub NetShareDelEx
+@ stub NetShareDelSticky
+@ stdcall NetShareEnum(wstr long ptr long ptr ptr ptr) netapi32.NetShareEnum
+@ stub NetShareEnumSticky
+@ stdcall NetShareGetInfo(wstr wstr long ptr) netapi32.NetShareGetInfo
+@ stub NetShareSetInfo
+@ stub NetpsNameCanonicalize
+@ stub NetpsNameCompare
+@ stub NetpsNameValidate
+@ stub NetpsPathCanonicalize
+@ stub NetpsPathCompare
+@ stub NetpsPathType
diff --git a/tools/make_specfiles b/tools/make_specfiles
index a1dd71ed332..f8245d1adba 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -177,6 +177,7 @@ my @dll_groups =
[
"netapi32",
"ext-ms-win-domainjoin-netjoin-l1-1-0",
+ "srvcli",
],
[
"ntdll",
--
2.28.0

1
patches/srvcli-dll/definition
View File

@ -1 +0,0 @@
Fixes: [49739] Add srvcli dll

2
staging/upstream-commit
View File

@ -1 +1 @@
dfa4c07941322dbcad54507cd0acf271a6c719ab
908c837b17ac1c285ef32e98f53df730c3770295