November 2009 - Wine-commits

Francois Gouget : rsaenh/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 6e407cccb846c9d113bd2e47a7008ecfb6796fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e407cccb846c9d113bd2e47a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Nov 14 15:55:59 2009 +0100 rsaenh/tests: Add a trailing '\n' to an ok() call. --- dlls/rsaenh/tests/rsaenh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index e59ad95..4d57b25 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2085,7 +2085,7 @@ static void test_rsa_round_trip(void) if (result) { ok(dataLen == sizeof(test_string), "unexpected size %d\n", dataLen); - ok(!memcmp(data, test_string, sizeof(test_string)), "unexpected value"); + ok(!memcmp(data, test_string, sizeof(test_string)), "unexpected value\n"); } CryptReleaseContext(prov, 0);

1 0

Francois Gouget : oledb32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 9b329b2ed2fe4a16aea8358ada719484eaf280bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b329b2ed2fe4a16aea8358ad… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Nov 14 15:56:02 2009 +0100 oledb32/tests: Add a trailing '\n' to an ok() call. --- dlls/oledb32/tests/marshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/tests/marshal.c b/dlls/oledb32/tests/marshal.c index 67fc7fd..587b8b6 100644 --- a/dlls/oledb32/tests/marshal.c +++ b/dlls/oledb32/tests/marshal.c @@ -243,7 +243,7 @@ static void test_IDBProperties(void) propset_count = 1; hr = IDBProperties_GetProperties(pProxy, 0, NULL, &propset_count, &propsets); - ok(hr == S_OK, "IDBProperties_GetProperties failed with error 0x%08x", hr); + ok(hr == S_OK, "IDBProperties_GetProperties failed with error 0x%08x\n", hr); ok(propset_count == 1, "Expected propset_count of 1 but got %d\n", propset_count); ok(propsets->rgProperties[0].dwPropertyID == TEST_PROPID, "Expected property ID of 0x%x, but got 0x%x\n", TEST_PROPID, propsets->rgProperties[0].dwPropertyID);

1 0

Rob Shearman : rpcrt4: Fix potential NULL pointer access in process_bind_packet.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: eb0d2828b243a751628dd4b5467d1dace9f32767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0d2828b243a751628dd4b54… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Nov 13 22:47:10 2009 +0000 rpcrt4: Fix potential NULL pointer access in process_bind_packet. Upon failure to allocate results in process_bind_packet, build nack packet and send right away, instead of falling into the normal path and potentially dereferencing the NULL pointer. --- dlls/rpcrt4/rpc_server.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 1bd1235..84e8854 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -203,6 +203,7 @@ static RPC_STATUS process_bind_packet(RpcConnection *conn, RpcPktBindHdr *hdr, R response = RPCRT4_BuildBindNackHeader(NDR_LOCAL_DATA_REPRESENTATION, RPC_VER_MAJOR, RPC_VER_MINOR, REJECT_LOCAL_LIMIT_EXCEEDED); + goto send; } for (i = 0, ctxt_elem = (RpcContextElement *)msg->Buffer;

1 0

Damjan Jovanovic : winemenubuilder: Escape XML special characters in menus.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 03e9fbb515585fa7d42e04e1d96c5a10a14d006c URL: http://source.winehq.org/git/wine.git/?a=commit;h=03e9fbb515585fa7d42e04e1d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Nov 14 09:10:30 2009 +0200 winemenubuilder: Escape XML special characters in menus. --- programs/winemenubuilder/winemenubuilder.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 7bcdd44..e14fe81 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -991,8 +991,12 @@ static BOOL write_menu_file(const char *unix_link, const char *filename) struct stat st; name[i] = 0; fprintf(tempfile, " <Menu>\n"); - fprintf(tempfile, " <Name>%s%s</Name>\n", count ? "" : "wine-", name); - fprintf(tempfile, " <Directory>%s%s.directory</Directory>\n", count ? "" : "wine-", name); + fprintf(tempfile, " <Name>%s", count ? "" : "wine-"); + write_xml_text(tempfile, name); + fprintf(tempfile, "</Name>\n"); + fprintf(tempfile, " <Directory>%s", count ? "" : "wine-"); + write_xml_text(tempfile, name); + fprintf(tempfile, ".directory</Directory>\n"); dir_file_name = heap_printf("%s/desktop-directories/%s%s.directory", xdg_data_dir, count ? "" : "wine-", name); if (dir_file_name) @@ -1009,7 +1013,9 @@ static BOOL write_menu_file(const char *unix_link, const char *filename) name[i] = 0; fprintf(tempfile, " <Include>\n"); - fprintf(tempfile, " <Filename>%s</Filename>\n", name); + fprintf(tempfile, " <Filename>"); + write_xml_text(tempfile, name); + fprintf(tempfile, "</Filename>\n"); fprintf(tempfile, " </Include>\n"); for (i = 0; i < count; i++) fprintf(tempfile, " </Menu>\n");

1 0

Alexandre Julliard : kernel32: Null-terminate the buffer also on error in GetPrivateProfileString16.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 935e06c5c37e12405364e2ba65af0eedf44d4f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=935e06c5c37e12405364e2ba6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 16 11:36:08 2009 +0100 kernel32: Null-terminate the buffer also on error in GetPrivateProfileString16. --- dlls/kernel32/file16.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/file16.c b/dlls/kernel32/file16.c index 30c7bdd..e4f703d 100644 --- a/dlls/kernel32/file16.c +++ b/dlls/kernel32/file16.c @@ -555,6 +555,7 @@ INT16 WINAPI GetPrivateProfileString16( LPCSTR section, LPCSTR entry, ret = GetPrivateProfileSectionA( section, data, size, filename ); if (!ret) { + if (len) *buffer = 0; HeapFree( GetProcessHeap(), 0, data ); return 0; }

1 0

Rob Shearman : advapi32: Add tests for EqualSid.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 3498a8817902842d05837422cc376670572e35ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=3498a8817902842d05837422c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 15 16:37:05 2009 +0000 advapi32: Add tests for EqualSid. --- dlls/advapi32/tests/security.c | 69 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b71d64f..df4b2e1 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1228,10 +1228,18 @@ static void test_token_attr(void) ok(ret, "OpenProcessToken failed with error %d\n", GetLastError()); /* groups */ + SetLastError(0xdeadbeef); ret = GetTokenInformation(Token, TokenGroups, NULL, 0, &Size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "GetTokenInformation(TokenGroups) %s with error %d\n", + ret ? "succeeded" : "failed", GetLastError()); Groups = HeapAlloc(GetProcessHeap(), 0, Size); + SetLastError(0xdeadbeef); ret = GetTokenInformation(Token, TokenGroups, Groups, Size, &Size); ok(ret, "GetTokenInformation(TokenGroups) failed with error %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, + "GetTokenInformation shouldn't have set last error to %d\n", + GetLastError()); trace("TokenGroups:\n"); for (i = 0; i < Groups->GroupCount; i++) { @@ -3266,6 +3274,66 @@ todo_wine { CloseHandle(process_token); } +static void test_EqualSid(void) +{ + PSID sid1, sid2; + BOOL ret; + SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY }; + SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY }; + + SetLastError(0xdeadbeef); + ret = AllocateAndInitializeSid(&SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &sid1); + ok(ret, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, + "AllocateAndInitializeSid shouldn't have set last error to %d\n", + GetLastError()); + + ret = AllocateAndInitializeSid(&SIDAuthWorld, 1, SECURITY_WORLD_RID, + 0, 0, 0, 0, 0, 0, 0, &sid2); + ok(ret, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = EqualSid(sid1, sid2); + ok(!ret, "World and domain admins sids shouldn't have been equal\n"); + todo_wine + ok(GetLastError() == ERROR_SUCCESS, + "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", + GetLastError()); + + SetLastError(0xdeadbeef); + sid2 = FreeSid(sid2); + ok(!sid2, "FreeSid should have returned NULL instead of %p\n", sid2); + ok(GetLastError() == 0xdeadbeef, + "FreeSid shouldn't have set last error to %d\n", + GetLastError()); + + ret = AllocateAndInitializeSid(&SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &sid2); + ok(ret, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = EqualSid(sid1, sid2); + ok(ret, "Same sids should have been equal\n"); + todo_wine + ok(GetLastError() == ERROR_SUCCESS, + "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", + GetLastError()); + + ((SID *)sid2)->Revision = 2; + SetLastError(0xdeadbeef); + ret = EqualSid(sid1, sid2); + ok(!ret, "EqualSid with invalid sid should have returned FALSE\n"); + todo_wine + ok(GetLastError() == ERROR_SUCCESS, + "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", + GetLastError()); + ((SID *)sid2)->Revision = SID_REVISION; + + FreeSid(sid1); + FreeSid(sid2); +} + START_TEST(security) { init(); @@ -3297,4 +3365,5 @@ START_TEST(security) test_GetSecurityInfo(); test_GetSidSubAuthority(); test_CheckTokenMembership(); + test_EqualSid(); }

1 0

Rob Shearman : advapi32: EqualSid should set last error to ERROR_SUCCESS.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 1f3a14e7676c298f5c2de648da7af01a3bb8966e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3a14e7676c298f5c2de648d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 15 16:37:35 2009 +0000 advapi32: EqualSid should set last error to ERROR_SUCCESS. --- dlls/advapi32/security.c | 4 +++- dlls/advapi32/tests/security.c | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 7dd39a4..3e79a61 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1055,7 +1055,9 @@ IsValidSid( PSID pSid ) BOOL WINAPI EqualSid( PSID pSid1, PSID pSid2 ) { - return RtlEqualSid( pSid1, pSid2 ); + BOOL ret = RtlEqualSid( pSid1, pSid2 ); + SetLastError(ERROR_SUCCESS); + return ret; } /****************************************************************************** diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index df4b2e1..2986ef5 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3296,7 +3296,6 @@ static void test_EqualSid(void) SetLastError(0xdeadbeef); ret = EqualSid(sid1, sid2); ok(!ret, "World and domain admins sids shouldn't have been equal\n"); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", GetLastError()); @@ -3315,7 +3314,6 @@ static void test_EqualSid(void) SetLastError(0xdeadbeef); ret = EqualSid(sid1, sid2); ok(ret, "Same sids should have been equal\n"); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", GetLastError()); @@ -3324,7 +3322,6 @@ static void test_EqualSid(void) SetLastError(0xdeadbeef); ret = EqualSid(sid1, sid2); ok(!ret, "EqualSid with invalid sid should have returned FALSE\n"); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", GetLastError());

1 0

Rob Shearman : oleaut32: Zero initialize the stack used on the server side of typelib marshalling.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: b5139f45b35213161284f4b4505430624de7699d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5139f45b35213161284f4b45… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 15 17:12:42 2009 +0000 oleaut32: Zero initialize the stack used on the server side of typelib marshalling. This is needed to allow for NDR marshalling rules in reusing memory on the client side. --- dlls/oleaut32/tmarshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index b3d1734..eae17e2 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -2105,7 +2105,7 @@ TMStubImpl_Invoke( nrofargs = 0; for (i=0;i<fdesc->cParams;i++) nrofargs += _argsize(&fdesc->lprgelemdescParam[i].tdesc, tinfo); - args = HeapAlloc(GetProcessHeap(),0,(nrofargs+1)*sizeof(DWORD)); + args = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,(nrofargs+1)*sizeof(DWORD)); if (!args) { hres = E_OUTOFMEMORY;

1 0

Rob Shearman : oleaut32: Fix memory leaks in LPSAFEARRAY and VT_CARRAY marshalling.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 8bd2d5395dbd11fa113f22b4d91f7a9ea9ebf3f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bd2d5395dbd11fa113f22b4d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 15 17:12:50 2009 +0000 oleaut32: Fix memory leaks in LPSAFEARRAY and VT_CARRAY marshalling. --- dlls/oleaut32/tmarshal.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index eae17e2..0e9d7eb 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -894,6 +894,8 @@ serialize_param( if (debugout && (i<arrsize-1)) TRACE_(olerelay)(","); } if (debugout) TRACE_(olerelay)("]"); + if (dealloc) + HeapFree(GetProcessHeap(), 0, *(void **)arg); return S_OK; } case VT_SAFEARRAY: { @@ -905,6 +907,11 @@ serialize_param( LPSAFEARRAY_UserMarshal(&flags, buf->base + buf->curoff, (LPSAFEARRAY *)arg); buf->curoff = size; } + if (dealloc) + { + ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); + LPSAFEARRAY_UserFree(&flags, (LPSAFEARRAY *)arg); + } return S_OK; } default:

1 0

Rob Shearman : oleaut32: Make BSTR and VARIANT marshalling for typelibs use the user marshalling functions .
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 9cffed2c75cd3b4af6ab937be5948e82e671a756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cffed2c75cd3b4af6ab937be… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 15 17:13:21 2009 +0000 oleaut32: Make BSTR and VARIANT marshalling for typelibs use the user marshalling functions. Remove now redundant cases in serialize_param and deserialize_param. --- dlls/oleaut32/tmarshal.c | 201 +++++++++------------------------------------- 1 files changed, 40 insertions(+), 161 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 0e9d7eb..9f10981 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -615,8 +615,6 @@ serialize_param( vartype = VT_SAFEARRAY; switch (vartype) { - case VT_EMPTY: /* nothing. empty variant for instance */ - return S_OK; case VT_I8: case VT_UI8: case VT_R8: @@ -652,56 +650,23 @@ serialize_param( if (writeit) hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD)); return hres; - case VT_I4|VT_BYREF: - hres = S_OK; - if (debugout) TRACE_(olerelay)("&0x%x\n",*arg); - if (writeit) - hres = xbuf_add(buf,(LPBYTE)(DWORD*)*arg,sizeof(DWORD)); - /* do not dealloc at this time */ - return hres; case VT_VARIANT: { - TYPEDESC tdesc2; - VARIANT *vt = (VARIANT*)arg; - DWORD vttype = V_VT(vt); - - if (debugout) TRACE_(olerelay)("Vt(%s%s)(",debugstr_vt(vttype),debugstr_vf(vttype)); - tdesc2.vt = vttype; - if (writeit) { - hres = xbuf_add(buf,(LPBYTE)&vttype,sizeof(vttype)); - if (hres) return hres; - } - /* need to recurse since we need to free the stuff */ - hres = serialize_param(tinfo,writeit,debugout,dealloc,&tdesc2,(DWORD*)&(V_I4(vt)),buf); - if (debugout) TRACE_(olerelay)(")"); - return hres; - } - case VT_BSTR|VT_BYREF: { - if (debugout) TRACE_(olerelay)("[byref]'%s'", *(BSTR*)*arg ? relaystr(*((BSTR*)*arg)) : "<bstr NULL>"); - if (writeit) { - /* ptr to ptr to magic widestring, basically */ - BSTR *bstr = (BSTR *) *arg; - DWORD len; - if (!*bstr) { - /* -1 means "null string" which is equivalent to empty string */ - len = -1; - hres = xbuf_add(buf, (LPBYTE)&len,sizeof(DWORD)); - if (hres) return hres; - } else { - len = *((DWORD*)*bstr-1)/sizeof(WCHAR); - hres = xbuf_add(buf,(LPBYTE)&len,sizeof(DWORD)); - if (hres) return hres; - hres = xbuf_add(buf,(LPBYTE)*bstr,len * sizeof(WCHAR)); - if (hres) return hres; - } + if (debugout) TRACE_(olerelay)("Vt(%s%s)(",debugstr_vt(V_VT((VARIANT *)arg)),debugstr_vf(V_VT((VARIANT *)arg))); + if (writeit) + { + ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); + ULONG size = VARIANT_UserSize(&flags, buf->curoff, (VARIANT *)arg); + xbuf_resize(buf, size); + VARIANT_UserMarshal(&flags, buf->base + buf->curoff, (VARIANT *)arg); + buf->curoff = size; } - - if (dealloc && arg) { - BSTR *str = *((BSTR **)arg); - SysFreeString(*str); + if (dealloc) + { + ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); + VARIANT_UserFree(&flags, (VARIANT *)arg); } return S_OK; } - case VT_BSTR: { if (debugout) { if (*arg) @@ -709,25 +674,20 @@ serialize_param( else TRACE_(olerelay)("<bstr NULL>"); } - if (writeit) { - BSTR bstr = (BSTR)*arg; - DWORD len; - if (!bstr) { - len = -1; - hres = xbuf_add(buf,(LPBYTE)&len,sizeof(DWORD)); - if (hres) return hres; - } else { - len = *((DWORD*)bstr-1)/sizeof(WCHAR); - hres = xbuf_add(buf,(LPBYTE)&len,sizeof(DWORD)); - if (hres) return hres; - hres = xbuf_add(buf,(LPBYTE)bstr,len * sizeof(WCHAR)); - if (hres) return hres; - } - } - - if (dealloc && arg) - SysFreeString((BSTR)*arg); - return S_OK; + if (writeit) + { + ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); + ULONG size = BSTR_UserSize(&flags, buf->curoff, (BSTR *)arg); + xbuf_resize(buf, size); + BSTR_UserMarshal(&flags, buf->base + buf->curoff, (BSTR *)arg); + buf->curoff = size; + } + if (dealloc) + { + ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); + BSTR_UserFree(&flags, (BSTR *)arg); + } + return S_OK; } case VT_PTR: { DWORD cookie; @@ -941,34 +901,15 @@ deserialize_param( while (1) { switch (vartype) { - case VT_EMPTY: - if (debugout) TRACE_(olerelay)("<empty>\n"); - return S_OK; - case VT_NULL: - if (debugout) TRACE_(olerelay)("<null>\n"); - return S_OK; case VT_VARIANT: { - VARIANT *vt = (VARIANT*)arg; - - if (readit) { - DWORD vttype; - TYPEDESC tdesc2; - hres = xbuf_get(buf,(LPBYTE)&vttype,sizeof(vttype)); - if (hres) { - FIXME("vt type not read?\n"); - return hres; - } - memset(&tdesc2,0,sizeof(tdesc2)); - tdesc2.vt = vttype; - V_VT(vt) = vttype; - if (debugout) TRACE_(olerelay)("Vt(%s%s)(",debugstr_vt(vttype),debugstr_vf(vttype)); - hres = deserialize_param(tinfo, readit, debugout, alloc, &tdesc2, (DWORD*)&(V_I4(vt)), buf); - TRACE_(olerelay)(")"); - return hres; - } else { - VariantInit(vt); - return S_OK; + if (readit) + { + ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); + unsigned char *buffer; + buffer = VARIANT_UserUnmarshal(&flags, buf->base + buf->curoff, (VARIANT *)arg); + buf->curoff = buffer - buf->base; } + return S_OK; } case VT_I8: case VT_UI8: @@ -1013,76 +954,14 @@ deserialize_param( } if (debugout) TRACE_(olerelay)("%02x",*arg & 0xff); return hres; - case VT_I4|VT_BYREF: - hres = S_OK; - if (alloc) - *arg = (DWORD)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DWORD)); - if (readit) { - hres = xbuf_get(buf,(LPBYTE)*arg,sizeof(DWORD)); - if (hres) ERR("Failed to read integer 4 byte\n"); - } - if (debugout) TRACE_(olerelay)("&0x%x",*(DWORD*)*arg); - return hres; - case VT_BSTR|VT_BYREF: { - BSTR **bstr = (BSTR **)arg; - WCHAR *str; - DWORD len; - - if (readit) { - hres = xbuf_get(buf,(LPBYTE)&len,sizeof(DWORD)); - if (hres) { - ERR("failed to read bstr klen\n"); - return hres; - } - if (len == -1) { - *bstr = CoTaskMemAlloc(sizeof(BSTR *)); - **bstr = NULL; - if (debugout) TRACE_(olerelay)("<bstr NULL>"); - } else { - str = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,(len+1)*sizeof(WCHAR)); - hres = xbuf_get(buf,(LPBYTE)str,len*sizeof(WCHAR)); - if (hres) { - ERR("Failed to read BSTR.\n"); - HeapFree(GetProcessHeap(),0,str); - return hres; - } - *bstr = CoTaskMemAlloc(sizeof(BSTR *)); - **bstr = SysAllocStringLen(str,len); - if (debugout) TRACE_(olerelay)("%s",relaystr(str)); - HeapFree(GetProcessHeap(),0,str); - } - } else { - *bstr = NULL; - } - return S_OK; - } case VT_BSTR: { - WCHAR *str; - DWORD len; - - if (readit) { - hres = xbuf_get(buf,(LPBYTE)&len,sizeof(DWORD)); - if (hres) { - ERR("failed to read bstr klen\n"); - return hres; - } - if (len == -1) { - *arg = 0; - if (debugout) TRACE_(olerelay)("<bstr NULL>"); - } else { - str = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,(len+1)*sizeof(WCHAR)); - hres = xbuf_get(buf,(LPBYTE)str,len*sizeof(WCHAR)); - if (hres) { - ERR("Failed to read BSTR.\n"); - HeapFree(GetProcessHeap(),0,str); - return hres; - } - *arg = (DWORD)SysAllocStringLen(str,len); - if (debugout) TRACE_(olerelay)("%s",relaystr(str)); - HeapFree(GetProcessHeap(),0,str); - } - } else { - *arg = 0; + if (readit) + { + ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); + unsigned char *buffer; + buffer = BSTR_UserUnmarshal(&flags, buf->base + buf->curoff, (BSTR *)arg); + buf->curoff = buffer - buf->base; + if (debugout) TRACE_(olerelay)("%s",relaystr(*(BSTR *)arg)); } return S_OK; }

1 0