Rebase against f4a8ad89d43646a8d109da5747dfb1a92a6d8cd1.

This commit is contained in:
Alistair Leslie-Hughes
2023-07-05 13:05:46 +10:00
parent b97718a0a9
commit 6882ba5e7b
12 changed files with 79 additions and 97 deletions

View File

@@ -55,7 +55,7 @@ new file mode 100644
index 00000000000..96ff0ea5af2
--- /dev/null
+++ b/dlls/windows.networking.connectivity/windows.networking.connectivity_main.c
@@ -0,0 +1,35 @@
@@ -0,0 +1,26 @@
+#include <stdarg.h>
+
+#define COBJMACROS
@@ -71,15 +71,6 @@ index 00000000000..96ff0ea5af2
+
+WINE_DEFAULT_DEBUG_CHANNEL(network);
+
+static const char *debugstr_hstring(HSTRING hstr)
+{
+ const WCHAR *str;
+ UINT32 len;
+ if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)";
+ str = WindowsGetStringRawBuffer(hstr, &len);
+ return wine_dbgstr_wn(str, len);
+}
+
+HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *object)
+{
+ FIXME("clsid %s, riid %s, object %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), object);

View File

@@ -1,8 +1,8 @@
From 587e8baeef029940518223d13b754b4e6c0352cd Mon Sep 17 00:00:00 2001
From 3f6ade7cf0bb0652b426ac20ef1c524f087966e4 Mon Sep 17 00:00:00 2001
From: Esdras Tarsis <esdrastarsis@gmail.com>
Date: Wed, 2 Sep 2020 23:53:28 -0300
Subject: [PATCH 4/8] windows.networking.connectivity: Implement
IActivationFactory stubs.
Subject: [PATCH] windows.networking.connectivity: Implement IActivationFactory
stubs.
v2:
Add Proper QueryInterface
@@ -12,12 +12,12 @@ Fixed Initial Reference Count value.
1 file changed, 101 insertions(+), 3 deletions(-)
diff --git a/dlls/windows.networking.connectivity/windows.networking.connectivity_main.c b/dlls/windows.networking.connectivity/windows.networking.connectivity_main.c
index 96ff0ea5af2..2463cc2c93c 100644
index b6d4561c493..219170366be 100644
--- a/dlls/windows.networking.connectivity/windows.networking.connectivity_main.c
+++ b/dlls/windows.networking.connectivity/windows.networking.connectivity_main.c
@@ -22,6 +22,102 @@ static const char *debugstr_hstring(HSTRING hstr)
return wine_dbgstr_wn(str, len);
}
@@ -13,6 +13,102 @@
WINE_DEFAULT_DEBUG_CHANNEL(network);
+struct windows_networking_connectivity
+{
@@ -118,7 +118,7 @@ index 96ff0ea5af2..2463cc2c93c 100644
HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *object)
{
FIXME("clsid %s, riid %s, object %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), object);
@@ -30,6 +126,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *object)
@@ -21,6 +117,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *object)
HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory)
{
@@ -132,5 +132,5 @@ index 96ff0ea5af2..2463cc2c93c 100644
+ return S_OK;
+}
--
2.30.2
2.40.1