June 2006 - Wine-commits - list.winehq.org

Andrew Talbot : crypt32/tests: Write-strings warning fix.
by Alexandre Julliard 01 Jun '06

01 Jun '06

Module: wine Branch: refs/heads/master Commit: 9a1e6aae55b1d06779a9aeb745ed0971fecf558e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9a1e6aae55b1d06779a9aeb… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed May 31 20:18:13 2006 +0100 crypt32/tests: Write-strings warning fix. --- dlls/crypt32/tests/cert.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 776d117..56276e8 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -754,6 +754,9 @@ static void testComparePublicKeyInfo(voi { BOOL ret; CERT_PUBLIC_KEY_INFO info1 = { { 0 } }, info2 = { { 0 } }; + static CHAR oid_rsa_rsa[] = szOID_RSA_RSA; + static CHAR oid_rsa_sha1rsa[] = szOID_RSA_SHA1RSA; + static CHAR oid_x957_dsa[] = szOID_X957_DSA; static const BYTE bits1[] = { 1, 0 }; static const BYTE bits2[] = { 0 }; static const BYTE bits3[] = { 1 }; @@ -765,11 +768,11 @@ static void testComparePublicKeyInfo(voi ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08lx\n", GetLastError()); /* Different OIDs appear to compare */ - info1.Algorithm.pszObjId = szOID_RSA_RSA; - info2.Algorithm.pszObjId = szOID_RSA_SHA1RSA; + info1.Algorithm.pszObjId = oid_rsa_rsa; + info2.Algorithm.pszObjId = oid_rsa_sha1rsa; ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08lx\n", GetLastError()); - info2.Algorithm.pszObjId = szOID_X957_DSA; + info2.Algorithm.pszObjId = oid_x957_dsa; ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08lx\n", GetLastError()); info1.PublicKey.cbData = sizeof(bits1);

1 0

Mikołaj Zalewski : comctl32: header: Update the rects in HEADER_Refresh if needed.
by Alexandre Julliard 01 Jun '06

01 Jun '06

Module: wine Branch: refs/heads/master Commit: baea6498ddcf618cccac9a962450fe56f99c0f59 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=baea6498ddcf618cccac9a9… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed May 31 16:38:21 2006 +0200 comctl32: header: Update the rects in HEADER_Refresh if needed. --- dlls/comctl32/header.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index b00adc2..493df6f 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -539,6 +539,9 @@ HEADER_Refresh (HWND hwnd, HDC hdc) INT x; HTHEME theme = GetWindowTheme (hwnd); + if (!infoPtr->bRectsValid) + HEADER_SetItemBounds(hwnd); + /* get rect for the bar, adjusted for the border */ GetClientRect (hwnd, &rect);

1 0

Hans Leidekker : dnsapi: Fall back to a netbios query when a dns query fails.
by Alexandre Julliard 01 Jun '06

01 Jun '06

Module: wine Branch: refs/heads/master Commit: 02ca30e8f9af333db53148cce2ba1ba9aae228d4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=02ca30e8f9af333db53148c… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed May 31 15:46:58 2006 +0200 dnsapi: Fall back to a netbios query when a dns query fails. --- dlls/dnsapi/Makefile.in | 2 + dlls/dnsapi/query.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletions(-) diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in index 2575b86..cad167e 100644 --- a/dlls/dnsapi/Makefile.in +++ b/dlls/dnsapi/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dnsapi.dll IMPORTLIB = libdnsapi.$(IMPLIBEXT) -IMPORTS = kernel32 +IMPORTS = netapi32 kernel32 EXTRALIBS = $(LIBUNICODE) @RESOLVLIBS@ C_SRCS = \ diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 3af529e..f7f9271 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -44,6 +44,7 @@ #include "winbase.h" #include "winerror.h" #include "winnls.h" #include "windns.h" +#include "nb30.h" #include "dnsapi.h" @@ -472,6 +473,76 @@ static DNS_STATUS dns_copy_record( ns_ms return ERROR_SUCCESS; } +#define DEFAULT_TTL 1200 + +static DNS_STATUS dns_do_query_netbios( PCSTR name, DNS_RECORDA **recp ) +{ + NCB ncb; + UCHAR ret; + DNS_RRSET rrset; + FIND_NAME_BUFFER *buffer; + FIND_NAME_HEADER *header; + DNS_RECORDA *record = NULL; + unsigned int i, len; + + len = strlen( name ); + if (len >= NCBNAMSZ) return DNS_ERROR_RCODE_NAME_ERROR; + + DNS_RRSET_INIT( rrset ); + + memset( &ncb, 0, sizeof(ncb) ); + ncb.ncb_command = NCBFINDNAME; + + memset( ncb.ncb_callname, ' ', sizeof(ncb.ncb_callname) ); + memcpy( ncb.ncb_callname, name, len ); + ncb.ncb_callname[NCBNAMSZ] = '\0'; + + ret = Netbios( &ncb ); + if (ret != NRC_GOODRET) return ERROR_INVALID_NAME; + + header = (FIND_NAME_HEADER *)ncb.ncb_buffer; + buffer = (FIND_NAME_BUFFER *)((char *)header + sizeof(FIND_NAME_HEADER)); + + for (i = 0; i < header->node_count; i++) + { + record = dns_zero_alloc( sizeof(DNS_RECORDA) ); + if (!record) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto exit; + } + else + { + record->pName = dns_strdup_u( name ); + if (!record->pName) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto exit; + } + + record->wType = DNS_TYPE_A; + record->Flags.S.Section = DnsSectionAnswer; + record->Flags.S.CharSet = DnsCharSetUtf8; + record->dwTtl = DEFAULT_TTL; + + /* FIXME: network byte order? */ + record->Data.A.IpAddress = *(DWORD *)((char *)buffer[i].destination_addr + 2); + + DNS_RRSET_ADD( rrset, (DNS_RECORD *)record ); + } + } + +exit: + DNS_RRSET_TERMINATE( rrset ); + + if (ret != ERROR_SUCCESS) + DnsRecordListFree( (DNS_RECORD *)record, DnsFreeRecordList ); + else + *recp = (DNS_RECORDA *)rrset.pFirstRR; + + return ret; +} + /* The resolver lock must be held and res_init() must have been * called before calling these three functions. */ @@ -636,6 +707,13 @@ #ifdef HAVE_RESOLV ret = dns_do_query( name, type, options, result ); + if (ret == DNS_ERROR_RCODE_NAME_ERROR && type == DNS_TYPE_A && + !(options & DNS_QUERY_NO_NETBT)) + { + TRACE( "dns lookup failed, trying netbios query\n" ); + ret = dns_do_query_netbios( name, result ); + } + UNLOCK_RESOLVER(); #endif

1 0

Andrew Ziem : wsock32: Added GetService{A,W} stubs.
by Alexandre Julliard 01 Jun '06

01 Jun '06

Module: wine Branch: refs/heads/master Commit: 0b6dbde473f26b3995c641012a78bf4cd8cf22ab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0b6dbde473f26b3995c6410… Author: Andrew Ziem <ahziem1(a)mailbolt.com> Date: Sat May 27 15:37:49 2006 -0600 wsock32: Added GetService{A,W} stubs. --- dlls/wsock32/service.c | 59 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wsock32/wsock32.spec | 4 ++- include/nspapi.h | 7 +++++ 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/wsock32/service.c b/dlls/wsock32/service.c index d11cc39..45b151c 100644 --- a/dlls/wsock32/service.c +++ b/dlls/wsock32/service.c @@ -159,3 +159,62 @@ INT WINAPI SetServiceW(DWORD dwNameSpace SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SOCKET_ERROR; /* error value */ } + +/****************************************************************************** + * GetServiceA [WSOCK32.1119] + * + * Get information about a network service. + * + * PARAMETERS + * dwNameSpace [I] Name space or set of name spaces within which the function + * will operate. + * lpGuid [I] Pointer to GUID of network service type. + * lpServiceName [I] NUL-terminated ASCII string that uniquely represents the name + * of the service. + * dwProperties [I] Flags specifying which information to return in lpBuffer. + * lpBuffer [O] Pointer to buffer where the function returns an array + * of NS_SERVICE_INFO. + * lpdwBufferSize [I/O] Size of lpBuffer. A greater number on output + * indicates an error. + * lpServiceAsyncInfo [O] Reserved. Set to NULL. + * + * RETURNS + * Success: 0. + * Failure: SOCKET_ERROR. GetLastError() returns ERROR_INSUFFICIENT_BUFFER + * or ERROR_SERVICE_NOT_FOUND. + * + * NOTES + * Obsolete Microsoft-specific extension to Winsock 1.1, + * Protocol-independent name resolution provides equivalent functionality in Winsock 2. + * + * BUGS + * Unimplemented. + */ +INT WINAPI GetServiceA(DWORD dwNameSpace, LPGUID lpGuid, LPSTR lpServiceName, + DWORD dwProperties, LPVOID lpBuffer, LPDWORD lpdwBufferSize, + LPSERVICE_ASYNC_INFO lpServiceAsyncInfo) +{ + FIXME("(%lu, %p, %s, %lu, %p, %p, %p): stub\n", dwNameSpace, + lpGuid, lpServiceName, dwProperties, lpBuffer, lpdwBufferSize, lpServiceAsyncInfo); + + /* some programs may be able to compensate if they know what happened */ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SOCKET_ERROR; +} + +/****************************************************************************** + * GetServiceW [WSOCK32.1120] + * + * See GetServiceA. + */ +INT WINAPI GetServiceW(DWORD dwNameSpace, LPGUID lpGuid, LPSTR lpServiceName, + DWORD dwProperties, LPVOID lpBuffer, LPDWORD lpdwBufferSize, + LPSERVICE_ASYNC_INFO lpServiceAsyncInfo) +{ + FIXME("(%lu, %p, %s, %lu, %p, %p, %p): stub\n", dwNameSpace, + lpGuid, lpServiceName, dwProperties, lpBuffer, lpdwBufferSize, lpServiceAsyncInfo); + + /* some programs may be able to compensate if they know what happened */ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SOCKET_ERROR; +} diff --git a/dlls/wsock32/wsock32.spec b/dlls/wsock32/wsock32.spec index 5f9b1c7..8e78796 100644 --- a/dlls/wsock32/wsock32.spec +++ b/dlls/wsock32/wsock32.spec @@ -70,8 +70,8 @@ #1115 stub GetNameByTypeA #1116 stub GetNameByTypeW 1117 stdcall SetServiceA(long long long ptr ptr ptr) 1118 stdcall SetServiceW(long long long ptr ptr ptr) -#1119 stub GetServiceA -#1120 stub GetServiceW +1119 stdcall GetServiceA(long ptr ptr long ptr ptr ptr) +1120 stdcall GetServiceW(long ptr ptr long ptr ptr ptr) #1130 stub NPLoadNameSpaces #1140 stub TransmitFile #1141 stub AcceptEx diff --git a/include/nspapi.h b/include/nspapi.h index 56f729d..a62f4d9 100644 --- a/include/nspapi.h +++ b/include/nspapi.h @@ -190,6 +190,13 @@ INT WINAPI SetServiceA(DWORD dwNameSpace INT WINAPI SetServiceW(DWORD dwNameSpace, DWORD dwOperation, DWORD dwFlags, LPSERVICE_INFOW lpServiceInfo, LPSERVICE_ASYNC_INFO lpServiceAsyncInfo, LPDWORD lpdwStatusFlags); #define SetService WINELIB_NAME_AW(SetService) +INT WINAPI GetServiceA(DWORD dwNameSpace, LPGUID lpGuid, LPSTR lpServiceName, + DWORD dwProperties, LPVOID lpBuffer, LPDWORD lpdwBufferSize, + LPSERVICE_ASYNC_INFO lpServiceAsyncInfo); +INT WINAPI GetServiceW(DWORD dwNameSpace, LPGUID lpGuid, LPSTR lpServiceName, + DWORD dwProperties, LPVOID lpBuffer, LPDWORD lpdwBufferSize, + LPSERVICE_ASYNC_INFO lpServiceAsyncInfo); +#define GetService WINELIB_NAME_AW(GetService) #ifdef __cplusplus } /* extern "C" */

1 0