May 2006 - Wine-Commits - list.winehq.org

Hans Leidekker : dnsapi: Implement DnsRecord{CopyEx, ListFree, SetCopyEx}.
by Alexandre Julliard May 7, 2006

May 7, 2006

Module: wine Branch: refs/heads/master Commit: 686bcd29c1e0acaae8c3f8c31043df099bafd071 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=686bcd29c1e0acaae8c3f8c… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon May 1 16:29:14 2006 +0200 dnsapi: Implement DnsRecord{CopyEx,ListFree,SetCopyEx}. --- dlls/dnsapi/dnsapi.h | 97 +++++++++++++++ dlls/dnsapi/dnsapi.spec | 6 - dlls/dnsapi/record.c | 305 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 405 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=686bcd29c1e0acaae8c…

1 0

Hans Leidekker : dnsapi: Add tests for DnsRecordCompare.
by Alexandre Julliard May 7, 2006

May 7, 2006

Module: wine Branch: refs/heads/master Commit: 12ae5d4e4bf76bb417cbc2ad5a0ebafcb78fbcb5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=12ae5d4e4bf76bb417cbc2a… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon May 1 16:29:05 2006 +0200 dnsapi: Add tests for DnsRecordCompare. --- dlls/dnsapi/tests/.gitignore | 1 dlls/dnsapi/tests/Makefile.in | 3 + dlls/dnsapi/tests/record.c | 91 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 1 deletions(-) create mode 100644 dlls/dnsapi/tests/record.c diff --git a/dlls/dnsapi/tests/.gitignore b/dlls/dnsapi/tests/.gitignore index df9e5c3..3c27a53 100644 --- a/dlls/dnsapi/tests/.gitignore +++ b/dlls/dnsapi/tests/.gitignore @@ -1,3 +1,4 @@ Makefile name.ok +record.ok testlist.c diff --git a/dlls/dnsapi/tests/Makefile.in b/dlls/dnsapi/tests/Makefile.in index f4e8b9a..0057a9c 100644 --- a/dlls/dnsapi/tests/Makefile.in +++ b/dlls/dnsapi/tests/Makefile.in @@ -6,7 +6,8 @@ TESTDLL = dnsapi.dll IMPORTS = dnsapi kernel32 CTESTS = \ - name.c + name.c \ + record.c @MAKE_TEST_RULES@ diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c new file mode 100644 index 0000000..307ecaa --- /dev/null +++ b/dlls/dnsapi/tests/record.c @@ -0,0 +1,91 @@ +/* + * Tests for record handling functions + * + * Copyright 2006 Hans Leidekker + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "windns.h" + +#include "wine/test.h" + +static HMODULE dnsapi; + +static BOOL (WINAPI *pDnsRecordCompare)(PDNS_RECORD,PDNS_RECORD); + +#define GETFUNCPTR(func) p##func = (void *)GetProcAddress( dnsapi, #func ); \ + if (!p##func) return FALSE; + +static BOOL init_function_ptrs( void ) +{ + GETFUNCPTR( DnsRecordCompare ) + return TRUE; +} + +static void test_DnsRecordCompare( void ) +{ + char name1[] = "localhost"; + char name2[] = "LOCALHOST"; + static DNS_RECORDA r1, r2; + + r1.pName = name1; + r1.wType = DNS_TYPE_A; + r1.wDataLength = sizeof(DNS_A_DATA); + r1.Data.A.IpAddress = 0xffffffff; + + r2.pName = name1; + r2.wType = DNS_TYPE_A; + r2.wDataLength = sizeof(DNS_A_DATA); + r2.Data.A.IpAddress = 0xffffffff; + + ok( pDnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r1 ) == TRUE, "failed unexpectedly\n" ); + + r2.pName = name2; + ok( pDnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == TRUE, "failed unexpectedly\n" ); + + r2.Flags.S.CharSet = DnsCharSetUnicode; + ok( pDnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == FALSE, "succeeded unexpectedly\n" ); + + r2.Flags.S.CharSet = DnsCharSetAnsi; + ok( pDnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == FALSE, "succeeded unexpectedly\n" ); + + r1.Flags.S.CharSet = DnsCharSetAnsi; + ok( pDnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == TRUE, "failed unexpectedly\n" ); + + r2.Data.A.IpAddress = 0; + ok( pDnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == FALSE, "succeeded unexpectedly\n" ); +} + +START_TEST(record) +{ + dnsapi = LoadLibraryA( "dnsapi.dll" ); + if (!dnsapi) return; + + if (!init_function_ptrs()) + { + FreeLibrary( dnsapi ); + return; + } + + test_DnsRecordCompare(); + + FreeLibrary( dnsapi ); +}

1 0

Hans Leidekker : dnsapi: Implement DnsRecordCompare.
by Alexandre Julliard May 7, 2006

May 7, 2006

Module: wine Branch: refs/heads/master Commit: c6c1e05dc5eebd63041807784a46e921ef5377be URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c6c1e05dc5eebd630418077… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon May 1 16:28:56 2006 +0200 dnsapi: Implement DnsRecordCompare. --- dlls/dnsapi/Makefile.in | 3 dlls/dnsapi/dnsapi.spec | 2 dlls/dnsapi/record.c | 364 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 367 insertions(+), 2 deletions(-) create mode 100644 dlls/dnsapi/record.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c6c1e05dc5eebd63041…

1 0

Robert Shearman : rpcrt4: Use getaddrinfo to get the sockaddr.
by Alexandre Julliard May 7, 2006

May 7, 2006

Module: wine Branch: refs/heads/master Commit: cce073a7774ce3bce339077135c9364a2b3ad966 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cce073a7774ce3bce339077… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 1 10:37:32 2006 +0100 rpcrt4: Use getaddrinfo to get the sockaddr. Use getaddrinfo to get the sockaddr to use for connecting to a remote server as Connection->NetworkAddr may be a hostname as well. Use a loop to support both IP and IPv6. --- dlls/rpcrt4/rpc_transport.c | 68 ++++++++++++++++++++++++++++++++----------- 1 files changed, 51 insertions(+), 17 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 563a0df..86b4303 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -44,6 +44,9 @@ #endif #ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> #endif +#ifdef HAVE_NETDB_H +#include <netdb.h> +#endif #include "windef.h" #include "winbase.h" @@ -263,8 +266,11 @@ static RpcConnection *rpcrt4_conn_tcp_al static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection) { RpcConnection_tcp *tcpc = (RpcConnection_tcp *) Connection; - struct sockaddr_in sa; int sock; + int ret; + struct addrinfo *ai; + struct addrinfo *ai_cur; + struct addrinfo hints; TRACE("(%s, %s)\n", Connection->NetworkAddr, Connection->Endpoint); @@ -277,29 +283,57 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_op if (tcpc->sock != -1) return RPC_S_OK; - sa.sin_family = AF_INET; - inet_pton(AF_INET, Connection->NetworkAddr, &sa.sin_addr); - sa.sin_port = htons(atoi(Connection->Endpoint)); - - sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); - if (sock < 0) + hints.ai_flags = 0; + hints.ai_family = PF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + hints.ai_protocol = IPPROTO_TCP; + hints.ai_addrlen = 0; + hints.ai_addr = NULL; + hints.ai_canonname = NULL; + hints.ai_next = NULL; + + ret = getaddrinfo(Connection->NetworkAddr, Connection->Endpoint, &hints, &ai); + if (ret < 0) { - ERR("socket() failed\n"); - goto error; + ERR("getaddrinfo failed with %d\n", ret); + return RPC_S_SERVER_UNAVAILABLE; } - if (0>connect(sock, (struct sockaddr*) &sa, sizeof (sa))) + for (ai_cur = ai; ai_cur; ai_cur = ai->ai_next) { - ERR("connect() failed\n"); - goto error; - } + if (TRACE_ON(rpc)) + { + char host[256]; + char service[256]; + getnameinfo(ai_cur->ai_addr, ai_cur->ai_addrlen, + host, sizeof(host), service, sizeof(service), + NI_NUMERICHOST | NI_NUMERICSERV); + TRACE("trying %s:%s\n", host, service); + } + + sock = socket(ai_cur->ai_family, ai_cur->ai_socktype, ai_cur->ai_protocol); + if (sock < 0) + { + WARN("socket() failed\n"); + continue; + } - tcpc->sock = sock; + if (0>connect(sock, ai_cur->ai_addr, ai_cur->ai_addrlen)) + { + WARN("connect() failed\n"); + close(sock); + continue; + } - return RPC_S_OK; + tcpc->sock = sock; + + freeaddrinfo(ai); + TRACE("connected\n"); + return RPC_S_OK; + } -error: - close(sock); + freeaddrinfo(ai); + ERR("couldn't connect to %s:%s\n", Connection->NetworkAddr, Connection->Endpoint); return RPC_S_SERVER_UNAVAILABLE; }

1 0

Robert Shearman : ole32: Remove the fixme printed if CoGetClassObject fails in CoCreateInstance.
by Alexandre Julliard May 7, 2006

May 7, 2006

Module: wine Branch: refs/heads/master Commit: 6814b33aa33af42aca8c4629d1b4818d7b0e2ca2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6814b33aa33af42aca8c462… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 1 10:39:31 2006 +0100 ole32: Remove the fixme printed if CoGetClassObject fails in CoCreateInstance. Remove the fixme printed if CoGetClassObject fails in CoCreateInstance, because we already print an error in all cases and the error more accurately pin-points the source of the problem. --- dlls/ole32/compobj.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a82ed4a..35b120f 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1878,11 +1878,8 @@ HRESULT WINAPI CoCreateInstance( &IID_IClassFactory, (LPVOID)&lpclf); - if (FAILED(hres)) { - FIXME("no classfactory created for CLSID %s, hres is 0x%08lx\n", - debugstr_guid(rclsid),hres); + if (FAILED(hres)) return hres; - } /* * Create the object and don't forget to release the factory

1 0

Robert Shearman : rpcrt4: Implement NdrConformantVaryingArrayFree.
by Alexandre Julliard May 7, 2006

May 7, 2006

Module: wine Branch: refs/heads/master Commit: 772eb9bdf91c9573478281bda6c6b4e76bfa3dc4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=772eb9bdf91c9573478281b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 1 10:38:02 2006 +0100 rpcrt4: Implement NdrConformantVaryingArrayFree. --- dlls/rpcrt4/ndr_marshall.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 1448334..871bb57 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2088,7 +2088,19 @@ void WINAPI NdrConformantVaryingArrayFre unsigned char* pMemory, PFORMAT_STRING pFormat ) { - FIXME( "stub\n" ); + TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); + + if (pFormat[0] != RPC_FC_CVARRAY) + { + ERR("invalid format type %x\n", pFormat[0]); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return; + } + + pFormat = ComputeConformance(pStubMsg, pMemory, pFormat+4, 0); + pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, 0); + + EmbeddedPointerFree(pStubMsg, pMemory, pFormat); }

1 0

Robert Shearman : rpcrt4: Dereference the pointer if necessary only after doing the
by Alexandre Julliard May 7, 2006

May 7, 2006

Module: wine Branch: refs/heads/master Commit: b43e799486eb4f1af575b326c309f003152d4e43 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b43e799486eb4f1af575b32… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 1 10:37:11 2006 +0100 rpcrt4: Dereference the pointer if necessary only after doing the pointer checks and writing the pointer ID to the wire. --- dlls/rpcrt4/ndr_marshall.c | 39 ++++++++++++++++++++++----------------- 1 files changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index bb8156b..1448334 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -709,10 +709,6 @@ void WINAPI PointerMarshall(PMIDL_STUB_M pFormat += 2; if (attr & RPC_FC_P_SIMPLEPOINTER) desc = pFormat; else desc = pFormat + *(const SHORT*)pFormat; - if (attr & RPC_FC_P_DEREF) { - Pointer = *(unsigned char**)Pointer; - TRACE("deref => %p\n", Pointer); - } switch (type) { case RPC_FC_RP: /* ref pointer (always non-null) */ @@ -736,6 +732,10 @@ #endif TRACE("calling marshaller for type 0x%x\n", (int)*desc); if (Pointer) { + if (attr & RPC_FC_P_DEREF) { + Pointer = *(unsigned char**)Pointer; + TRACE("deref => %p\n", Pointer); + } m = NdrMarshaller[*desc & NDR_TABLE_MASK]; if (m) m(pStubMsg, Pointer, desc); else FIXME("no marshaller for data type=%02x\n", *desc); @@ -763,10 +763,6 @@ void WINAPI PointerUnmarshall(PMIDL_STUB pFormat += 2; if (attr & RPC_FC_P_SIMPLEPOINTER) desc = pFormat; else desc = pFormat + *(const SHORT*)pFormat; - if (attr & RPC_FC_P_DEREF) { - pPointer = *(unsigned char***)pPointer; - TRACE("deref => %p\n", pPointer); - } switch (type) { case RPC_FC_RP: /* ref pointer (always non-null) */ @@ -789,6 +785,12 @@ void WINAPI PointerUnmarshall(PMIDL_STUB } if (pointer_id) { + if (attr & RPC_FC_P_DEREF) { + if (!*pPointer || fMustAlloc) + *pPointer = NdrAllocate(pStubMsg, sizeof(void *)); + pPointer = *(unsigned char***)pPointer; + TRACE("deref => %p\n", pPointer); + } m = NdrUnmarshaller[*desc & NDR_TABLE_MASK]; if (m) m(pStubMsg, pPointer, desc, fMustAlloc); else FIXME("no unmarshaller for data type=%02x\n", *desc); @@ -813,10 +815,6 @@ void WINAPI PointerBufferSize(PMIDL_STUB pFormat += 2; if (attr & RPC_FC_P_SIMPLEPOINTER) desc = pFormat; else desc = pFormat + *(const SHORT*)pFormat; - if (attr & RPC_FC_P_DEREF) { - Pointer = *(unsigned char**)Pointer; - TRACE("deref => %p\n", Pointer); - } switch (type) { case RPC_FC_RP: /* ref pointer (always non-null) */ @@ -834,6 +832,11 @@ void WINAPI PointerBufferSize(PMIDL_STUB RpcRaiseException(RPC_X_BAD_STUB_DATA); } + if (attr & RPC_FC_P_DEREF) { + Pointer = *(unsigned char**)Pointer; + TRACE("deref => %p\n", Pointer); + } + m = NdrBufferSizer[*desc & NDR_TABLE_MASK]; if (m) m(pStubMsg, Pointer, desc); else FIXME("no buffersizer for data type=%02x\n", *desc); @@ -855,9 +858,6 @@ unsigned long WINAPI PointerMemorySize(P pFormat += 2; if (attr & RPC_FC_P_SIMPLEPOINTER) desc = pFormat; else desc = pFormat + *(const SHORT*)pFormat; - if (attr & RPC_FC_P_DEREF) { - TRACE("deref\n"); - } switch (type) { case RPC_FC_RP: /* ref pointer (always non-null) */ @@ -867,6 +867,10 @@ unsigned long WINAPI PointerMemorySize(P RpcRaiseException(RPC_X_BAD_STUB_DATA); } + if (attr & RPC_FC_P_DEREF) { + TRACE("deref\n"); + } + m = NdrMemorySizer[*desc & NDR_TABLE_MASK]; if (m) m(pStubMsg, desc); else FIXME("no memorysizer for data type=%02x\n", *desc); @@ -891,13 +895,14 @@ void WINAPI PointerFree(PMIDL_STUB_MESSA pFormat += 2; if (attr & RPC_FC_P_SIMPLEPOINTER) desc = pFormat; else desc = pFormat + *(const SHORT*)pFormat; + + if (!Pointer) return; + if (attr & RPC_FC_P_DEREF) { Pointer = *(unsigned char**)Pointer; TRACE("deref => %p\n", Pointer); } - if (!Pointer) return; - m = NdrFreer[*desc & NDR_TABLE_MASK]; if (m) m(pStubMsg, Pointer, desc);

1 0

Robert Shearman : rpcrt4: Add a stub for RpcBindingSetOption.
by Alexandre Julliard May 7, 2006

May 7, 2006

Module: wine Branch: refs/heads/master Commit: a4f5296ec6fb5ba06beb7143401a2418195bfd48 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a4f5296ec6fb5ba06beb714… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 1 10:38:18 2006 +0100 rpcrt4: Add a stub for RpcBindingSetOption. --- dlls/rpcrt4/rpc_binding.c | 9 +++++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 71ebaa6..58e5eef 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1040,3 +1040,12 @@ RpcBindingSetAuthInfoW( RPC_BINDING_HAND AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvr); return RPC_S_OK; } + +/*********************************************************************** + * RpcBindingSetOption (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcBindingSetOption(RPC_BINDING_HANDLE BindingHandle, ULONG Option, ULONG OptionValue) +{ + FIXME("(%p, %ld, %ld): stub\n", BindingHandle, Option, OptionValue); + return RPC_S_OK; +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index ea84ba0..8034f22 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -390,7 +390,7 @@ # 9x version of I_RpcBindingSetAsync has @ stdcall RpcBindingSetAuthInfoExW(ptr wstr long long ptr long ptr) @ stdcall RpcBindingSetAuthInfoW(ptr wstr long long ptr long) @ stdcall RpcBindingSetObject(ptr ptr) -@ stub RpcBindingSetOption +@ stdcall RpcBindingSetOption(ptr long long) @ stdcall RpcBindingToStringBindingA(ptr ptr) @ stdcall RpcBindingToStringBindingW(ptr ptr) @ stdcall RpcBindingVectorFree(ptr)

1 0

Robert Shearman : rpcrt4: Improve the traces in the pointer functions.
by Alexandre Julliard May 7, 2006

May 7, 2006

Module: wine Branch: refs/heads/master Commit: 9519004b1aeb397dceec053ec59bd650e8b7df86 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9519004b1aeb397dceec053… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 1 10:36:52 2006 +0100 rpcrt4: Improve the traces in the pointer functions. --- dlls/rpcrt4/ndr_marshall.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 66a4caa..bb8156b 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -809,7 +809,7 @@ void WINAPI PointerBufferSize(PMIDL_STUB NDR_BUFFERSIZE m; TRACE("(%p,%p,%p)\n", pStubMsg, Pointer, pFormat); - TRACE("type=%d, attr=%d\n", type, attr); + TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr); pFormat += 2; if (attr & RPC_FC_P_SIMPLEPOINTER) desc = pFormat; else desc = pFormat + *(const SHORT*)pFormat; @@ -851,7 +851,7 @@ unsigned long WINAPI PointerMemorySize(P NDR_MEMORYSIZE m; FIXME("(%p,%p,%p): stub\n", pStubMsg, Buffer, pFormat); - TRACE("type=%d, attr=", type); dump_pointer_attr(attr); + TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr); pFormat += 2; if (attr & RPC_FC_P_SIMPLEPOINTER) desc = pFormat; else desc = pFormat + *(const SHORT*)pFormat; @@ -886,7 +886,7 @@ void WINAPI PointerFree(PMIDL_STUB_MESSA NDR_FREE m; TRACE("(%p,%p,%p)\n", pStubMsg, Pointer, pFormat); - TRACE("type=%d, attr=", type); dump_pointer_attr(attr); + TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr); if (attr & RPC_FC_P_DONTFREE) return; pFormat += 2; if (attr & RPC_FC_P_SIMPLEPOINTER) desc = pFormat;

1 0

Vitaly Lipatov : mlang: Partially implemented ConvertStringEx.
by Alexandre Julliard May 7, 2006

May 7, 2006

Module: wine Branch: refs/heads/master Commit: c0901b899bd0c574916191626ba8736e58a35e7f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c0901b899bd0c5749161916… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Fri Apr 28 14:35:36 2006 +0400 mlang: Partially implemented ConvertStringEx. --- dlls/mlang/mlang.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 21076f4..61b2890 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2113,6 +2113,9 @@ static HRESULT WINAPI fnIMultiLanguage2_ return E_NOTIMPL; } +/* + * TODO: handle dwFlag and lpFallBack +*/ static HRESULT WINAPI fnIMultiLanguage2_ConvertStringToUnicodeEx( IMultiLanguage2* iface, DWORD* pdwMode, @@ -2125,9 +2128,28 @@ static HRESULT WINAPI fnIMultiLanguage2_ WCHAR* lpFallBack) { FIXME("\n"); - return E_NOTIMPL; + return ConvertINetMultiByteToUnicode(pdwMode, dwEncoding, + pSrcStr, (LPINT)pcSrcSize, pDstStr, (LPINT)pcDstSize); } +/***************************************************************************** + * MultiLanguage2::ConvertStringToUnicodeEx + * + * Translates the multibyte string from the specified code page to Unicode. + * + * PARAMS + * see ConvertStringToUnicode + * dwFlag + * lpFallBack if dwFlag contains MLCONVCHARF_USEDEFCHAR, lpFallBack string used + * instead unconvertible characters. + * + * RETURNS + * S_OK Success. + * S_FALSE The conversion is not supported. + * E_FAIL Some error has occurred. + * + * TODO: handle dwFlag and lpFallBack +*/ static HRESULT WINAPI fnIMultiLanguage2_ConvertStringFromUnicodeEx( IMultiLanguage2* This, DWORD* pdwMode, @@ -2140,7 +2162,8 @@ static HRESULT WINAPI fnIMultiLanguage2_ WCHAR* lpFallBack) { FIXME("\n"); - return E_NOTIMPL; + return ConvertINetUnicodeToMultiByte(pdwMode, dwEncoding, + pSrcStr, (LPINT)pcSrcSize, pDstStr, (LPINT)pcDstSize); } static HRESULT WINAPI fnIMultiLanguage2_DetectCodepageInIStream(

1 0