[PATCH 0/4] MR5310: wshom/network: Implement ComputerName() property.

[PATCH 1/4] wshom/network: Use TRACE() for implemented method.

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 dlls/wshom.ocx/network.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wshom.ocx/network.c b/dlls/wshom.ocx/network.c
index 42ed61ffe01..fd022f14045 100644
--- a/dlls/wshom.ocx/network.c
+++ b/dlls/wshom.ocx/network.c
@@ -258,7 +258,7 @@ static IWshNetwork2 WshNetwork2 = { &WshNetwork2Vtbl };

HRESULT WINAPI WshNetworkFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv)
 {
-    FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv);
+    TRACE("%p, %s, %p.\n", outer, debugstr_guid(riid), ppv);

return IWshNetwork2_QueryInterface(&WshNetwork2, riid, ppv);
 }

[PATCH 2/4] wshom/network: Implement GetTypeInfo().

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 dlls/wshom.ocx/network.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/wshom.ocx/network.c b/dlls/wshom.ocx/network.c
index fd022f14045..86c68ff8830 100644
--- a/dlls/wshom.ocx/network.c
+++ b/dlls/wshom.ocx/network.c
@@ -69,8 +69,9 @@ static HRESULT WINAPI WshNetwork2_GetTypeInfoCount(IWshNetwork2 *iface, UINT *pc

static HRESULT WINAPI WshNetwork2_GetTypeInfo(IWshNetwork2 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo)
 {
-    FIXME("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
-    return E_NOTIMPL;
+    TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
+
+    return get_typeinfo(IWshNetwork2_tid, ppTInfo);
 }

static HRESULT WINAPI WshNetwork2_GetIDsOfNames(IWshNetwork2 *iface, REFIID riid, LPOLESTR *rgszNames,

[PATCH 3/4] wshom/network: Implement ComputerName() property.

[Nikolay Sivov]

From: Nikolay Sivov

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56434
Signed-off-by: Nikolay Sivov 
---
 dlls/wshom.ocx/network.c     | 27 ++++++++++++++++++++++++---
 dlls/wshom.ocx/tests/wshom.c | 28 +++++++++++++++++++++++-----
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/dlls/wshom.ocx/network.c b/dlls/wshom.ocx/network.c
index 86c68ff8830..ef7f5e52808 100644
--- a/dlls/wshom.ocx/network.c
+++ b/dlls/wshom.ocx/network.c
@@ -124,7 +124,7 @@ static HRESULT WINAPI WshNetwork2_get_UserName(IWshNetwork2 *iface, BSTR *user_n
     BOOL ret;
     DWORD len = 0;

-    TRACE("%p\n", user_name);
+    TRACE("%p, %p.\n", iface, user_name);

GetUserNameW(NULL, &len);
     *user_name = SysAllocStringLen(NULL, len-1);
@@ -151,9 +151,30 @@ static HRESULT WINAPI WshNetwork2_get_UserProfile(IWshNetwork2 *iface, BSTR *use

static HRESULT WINAPI WshNetwork2_get_ComputerName(IWshNetwork2 *iface, BSTR *name)
 {
-    FIXME("%p stub\n", name);
+    HRESULT hr = S_OK;
+    DWORD len = 0;
+    BOOL ret;

-    return E_NOTIMPL;
+    TRACE("%p, %p.\n", iface, name);
+
+    if (!name)
+        return E_POINTER;
+
+    GetComputerNameW(NULL, &len);
+    *name = SysAllocStringLen(NULL, len - 1);
+    if (!*name)
+        return E_OUTOFMEMORY;
+
+    ret = GetComputerNameW(*name, &len);
+    if (!ret)
+    {
+        hr = HRESULT_FROM_WIN32(GetLastError());
+        SysFreeString(*name);
+        *name = NULL;
+        return hr;
+    }
+
+    return S_OK;
 }

static HRESULT WINAPI WshNetwork2_get_Organization(IWshNetwork2 *iface, BSTR *name)
diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c
index 5212dd83b5c..c753ce6d768 100644
--- a/dlls/wshom.ocx/tests/wshom.c
+++ b/dlls/wshom.ocx/tests/wshom.c
@@ -693,7 +693,7 @@ static void test_wshnetwork(void)
 {
     IDispatch *disp;
     IWshNetwork2 *nw2;
-    BSTR str,username;
+    BSTR str, name;
     HRESULT hr;
     DWORD len = 0;
     BOOL ret;
@@ -717,13 +717,31 @@ static void test_wshnetwork(void)
     CHECK_BSTR_LENGTH(str);
     GetUserNameW(NULL, &len);
     ok(len > 0, "Unexpected len %ld.\n", len);
-    username = SysAllocStringLen(NULL, len-1);
-    ret = GetUserNameW(username, &len);
+    name = SysAllocStringLen(NULL, len-1);
+    ret = GetUserNameW(name, &len);
     ok(ret == TRUE, "GetUserNameW returned %d.\n", ret);
-    ok(!wcscmp(str,username), "user names do not match %s %s.\n", debugstr_w(str), debugstr_w(username));
-    SysFreeString(username);
+    ok(!wcscmp(str, name), "User names do not match %s, %s.\n", debugstr_w(str), debugstr_w(name));
+    SysFreeString(name);
+    SysFreeString(str);
+
+    hr = IWshNetwork2_get_ComputerName(nw2, NULL);
+    ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
+
+    str = NULL;
+    hr = IWshNetwork2_get_ComputerName(nw2, &str);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(str && str[0] != 0, "Got empty string.\n");
+    CHECK_BSTR_LENGTH(str);
+    GetComputerNameW(NULL, &len);
+    ok(len > 0, "Unexpected length %ld.\n", len);
+    name = SysAllocStringLen(NULL, len - 1);
+    ret = GetComputerNameW(name, &len);
+    ok(ret, "GetComputerName() failed %ld.\n", GetLastError());
+    ok(!wcscmp(str, name), "Computer names do not match %s, %s.\n", debugstr_w(str), debugstr_w(name));
+    SysFreeString(name);
     SysFreeString(str);

+    IWshNetwork2_Release(nw2);
     IDispatch_Release(disp);
 }

[PATCH 4/4] wshom/network: Check pointer argument in get_UserName().

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 dlls/wshom.ocx/network.c     | 3 +++
 dlls/wshom.ocx/tests/wshom.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/dlls/wshom.ocx/network.c b/dlls/wshom.ocx/network.c
index ef7f5e52808..f2a88c2117f 100644
--- a/dlls/wshom.ocx/network.c
+++ b/dlls/wshom.ocx/network.c
@@ -126,6 +126,9 @@ static HRESULT WINAPI WshNetwork2_get_UserName(IWshNetwork2 *iface, BSTR *user_n

TRACE("%p, %p.\n", iface, user_name);

+    if (!user_name)
+        return E_POINTER;
+
     GetUserNameW(NULL, &len);
     *user_name = SysAllocStringLen(NULL, len-1);
     if (!*user_name)
diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c
index c753ce6d768..a11dec2f78d 100644
--- a/dlls/wshom.ocx/tests/wshom.c
+++ b/dlls/wshom.ocx/tests/wshom.c
@@ -710,6 +710,9 @@ static void test_wshnetwork(void)
     hr = IDispatch_QueryInterface(disp, &IID_IWshNetwork2, (void**)&nw2);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

+    hr = IWshNetwork2_get_UserName(nw2, NULL);
+    ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
+
     str = NULL;
     hr = IWshNetwork2_get_UserName(nw2, &str);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

[PATCH 4/4] wshom/network: Check pointer argument in get_UserName().

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=144066

Your paranoid android.

=== w7u_2qxl (32 bit report) ===

wshom.ocx:
02c4:wshom: unhandled exception c0000005 at 779748A4

=== w7u_adm (32 bit report) ===

wshom.ocx:
0880:wshom: unhandled exception c0000005 at 779348A4

=== w7u_el (32 bit report) ===

wshom.ocx:
0f44:wshom: unhandled exception c0000005 at 773748A4

=== w8 (32 bit report) ===

wshom.ocx:
0bb4:wshom: unhandled exception c0000005 at 77A80164

=== w8adm (32 bit report) ===

wshom.ocx:
098c:wshom: unhandled exception c0000005 at 77BD0164

=== w864 (32 bit report) ===

wshom.ocx:
0bb0:wshom: unhandled exception c0000005 at 76ED7A1C

=== w1064v1507 (32 bit report) ===

wshom.ocx:
0c88:wshom: unhandled exception c0000005 at 77D3E8CC

=== w1064v1809 (32 bit report) ===

wshom.ocx:
1e14:wshom: unhandled exception c0000005 at 77AE667C

=== w1064_tsign (32 bit report) ===

wshom.ocx:
1fb8:wshom: unhandled exception c0000005 at 77448B1C

=== w864 (64 bit report) ===

wshom.ocx:
0b30:wshom: unhandled exception c0000005 at 00007FFA4ADE3E6B

=== w1064v1507 (64 bit report) ===

wshom.ocx:
0f3c:wshom: unhandled exception c0000005 at 00007FFADDF77EAB

=== w1064v1809 (64 bit report) ===

wshom.ocx:
1d34:wshom: unhandled exception c0000005 at 00007FFFC5E9626B

=== w1064_2qxl (64 bit report) ===

wshom.ocx:
1e08:wshom: unhandled exception c0000005 at 00007FFFFD7B3EEF

=== w1064_adm (64 bit report) ===

wshom.ocx:
1e30:wshom: unhandled exception c0000005 at 00007FFA56BB3EEF

=== w1064_tsign (64 bit report) ===

wshom.ocx:
1ec4:wshom: unhandled exception c0000005 at 00007FF8A2513EEF

=== debian11b (64 bit WoW report) ===

d3dx10_34:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011A45D0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011A47A0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D19A0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011A47A0.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011C3380.

d3dx10_35:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011D5860.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011B5EE0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011B60B0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011BBC10.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011B60B0.

d3dx10_36:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011E3530.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011E3140.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011E3140.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011B5D90.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D4950.

d3dx10_37:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239D40.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 0000000001239F10.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 0000000001239F10.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 0000000001239F10.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011A4AD0.

d3dx10_38:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011BC970.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011D5C60.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D1820.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011A4870.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011A4A40.

d3dx10_39:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001230C10.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 0000000001230C10.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 0000000001239DF0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 0000000001195B10.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 0000000001230C10.

d3dx10_40:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011BB840.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011BB560.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011B6010.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011BB560.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011A49E0.

d3dx10_41:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011E39E0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011E39E0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011E39E0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011C3540.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011B5EE0.

d3dx10_42:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239720.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011B6060.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011E2DE0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011B6060.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D53B0.

d3dx10_43:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011D56F0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011D3B20.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D56C0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011D3B20.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D3B20.

user32:
input.c:3864: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 00000000034800DC, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032