[PATCH v9 3/5] combase: Implement HSTRING_UserSize.

[Vibhav Pant]

From: Vibhav Pant

---
 dlls/combase/tests/string.c | 12 ++++++------
 dlls/combase/usrmarshal.c   | 32 +++++++++++++++++++++++++++++---
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c
index aa68639e966..de99cd35ea8 100644
--- a/dlls/combase/tests/string.c
+++ b/dlls/combase/tests/string.c
@@ -631,7 +631,7 @@ static void test_marshal(void)
     init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_INPROC);
     size = HSTRING_UserSize(&umcb.Flags, 0, &str);
     exp_size = sizeof(struct hstring_wire);
-    todo_wine ok(size == exp_size, "got size %lu != %lu\n", size, exp_size);
+    ok(size == exp_size, "got size %lu != %lu\n", size, exp_size);
     init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_INPROC);
     next = HSTRING_UserMarshal(&umcb.Flags, buffer, &str);
     if (size == exp_size)
@@ -650,7 +650,7 @@ static void test_marshal(void)
     init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_INPROC);
     size = HSTRING_UserSize(&umcb.Flags, 1, &str);
     exp_size = ALIGNED_LENGTH(1 + sizeof(struct hstring_wire), 7);
-    todo_wine ok(size == exp_size, "got size %lu != %lu\n", size, exp_size);
+    ok(size == exp_size, "got size %lu != %lu\n", size, exp_size);
     memset(buffer, 0, 80);
     init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_INPROC);
     next = HSTRING_UserMarshal(&umcb.Flags, &buffer[1], &str);
@@ -669,7 +669,7 @@ static void test_marshal(void)
     init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_INPROC);
     size = HSTRING_UserSize(&umcb.Flags, 0, &str_empty);
     exp_size = sizeof(struct hstring_wire);
-    todo_wine ok(size == exp_size, "got size %lu != %lu\n", size, exp_size);
+    ok(size == exp_size, "got size %lu != %lu\n", size, exp_size);
     memset(buffer, 0xff, 80);
     init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_INPROC);
     next = HSTRING_UserMarshal(&umcb.Flags, buffer, &str_empty);
@@ -689,7 +689,7 @@ static void test_marshal(void)
     init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL);
     size = HSTRING_UserSize(&umcb.Flags, 0, &str);
     exp_size = offsetof(struct hstring_wire, buf.data[str_len]);
-    todo_wine ok(size == exp_size, "got size %lu != %lu\n", size, exp_size);
+    ok(size == exp_size, "got size %lu != %lu\n", size, exp_size);
     memset(buffer, 0, 80);
     init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL);
     next = HSTRING_UserMarshal(&umcb.Flags, buffer, &str);
@@ -714,7 +714,7 @@ static void test_marshal(void)
     init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL);
     size = HSTRING_UserSize(&umcb.Flags, 1, &str);
     exp_size = ALIGNED_LENGTH(1, 7) + offsetof(struct hstring_wire, buf.data[str_len]);
-    todo_wine ok(size == exp_size, "got size %lu != %lu\n", size, exp_size);
+    ok(size == exp_size, "got size %lu != %lu\n", size, exp_size);
     memset(buffer, 0, 80);
     init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL);
     next = HSTRING_UserMarshal(&umcb.Flags, &buffer[1], &str);
@@ -738,7 +738,7 @@ static void test_marshal(void)
     init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL);
     size = HSTRING_UserSize(&umcb.Flags, 0, &str_empty);
     exp_size = offsetof(struct hstring_wire, buf.data[0]);
-    todo_wine ok(size == exp_size, "got size %lu != %lu\n", size, exp_size);
+    ok(size == exp_size, "got size %lu != %lu\n", size, exp_size);
     memset(buffer, 0xff, 80);
     init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL);
     next = HSTRING_UserMarshal(&umcb.Flags, buffer, &str_empty);
diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c
index b3321d8baa8..0d7743c614e 100644
--- a/dlls/combase/usrmarshal.c
+++ b/dlls/combase/usrmarshal.c
@@ -22,6 +22,7 @@
 #define COBJMACROS
 #include "ole2.h"

+#include "winstring.h"
 #include "inspectable.h"
 #include "wine/debug.h"

@@ -1027,13 +1028,38 @@ void WINAPI WdtpInterfacePointer_UserFree(IUnknown *punk)
     if (punk) IUnknown_Release(punk);
 }

+#pragma pack(push, 1)
+struct hstring_wire
+{
+    ULONG context;
+    union {
+        struct {
+            ULONG size;
+            WCHAR data[];
+        } buf;
+        struct {
+#ifdef _WIN64
+            ULONG pad;
+#endif
+            HSTRING str;
+        };
+    };
+};
+#pragma pack(pop)
+
 /******************************************************************************
  *           HSTRING_UserSize (combase.@)
  */
-ULONG __RPC_USER HSTRING_UserSize(ULONG *flags, ULONG start, HSTRING *str)
+ULONG __RPC_USER HSTRING_UserSize(ULONG *flags, ULONG size, HSTRING *str)
 {
-    FIXME("%p, %lu, %p: stub\n", flags, start, str);
-    return start;
+    TRACE("%s, %lu, %s.\n", debugstr_user_flags(flags), size, debugstr_hstring(*str));
+
+    ALIGN_LENGTH(size, 7);
+    if (LOWORD(*flags) == MSHCTX_INPROC)
+        size += sizeof(struct hstring_wire);
+    else
+        size += offsetof(struct hstring_wire, buf.data[WindowsGetStringLen(*str)]);
+    return size;
 }

/******************************************************************************