April 2009 - Wine-Commits - list.winehq.org

Hans Leidekker : iphlpapi: Add tests for GetAdaptersAddresses.
by Alexandre Julliard April 29, 2009

April 29, 2009

Module: wine Branch: master Commit: 5b428fe55efe1277251b1a09e051c0ce4f8a292c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b428fe55efe1277251b1a09e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 29 11:57:48 2009 +0200 iphlpapi: Add tests for GetAdaptersAddresses. --- dlls/iphlpapi/tests/iphlpapi.c | 69 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 2fc5e0d..f879c93 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -63,6 +63,7 @@ typedef DWORD (WINAPI *GetUdpStatisticsFunc)(PMIB_UDPSTATS); typedef DWORD (WINAPI *GetTcpTableFunc)(PMIB_TCPTABLE,PDWORD,BOOL); typedef DWORD (WINAPI *GetUdpTableFunc)(PMIB_UDPTABLE,PDWORD,BOOL); typedef DWORD (WINAPI *GetPerAdapterInfoFunc)(ULONG,PIP_PER_ADAPTER_INFO,PULONG); +typedef DWORD (WINAPI *GetAdaptersAddressesFunc)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); static GetNumberOfInterfacesFunc gGetNumberOfInterfaces = NULL; static GetIpAddrTableFunc gGetIpAddrTable = NULL; @@ -81,6 +82,7 @@ static GetUdpStatisticsFunc gGetUdpStatistics = NULL; static GetTcpTableFunc gGetTcpTable = NULL; static GetUdpTableFunc gGetUdpTable = NULL; static GetPerAdapterInfoFunc gGetPerAdapterInfo = NULL; +static GetAdaptersAddressesFunc gGetAdaptersAddresses = NULL; static void loadIPHlpApi(void) { @@ -119,6 +121,7 @@ static void loadIPHlpApi(void) gGetUdpTable = (GetUdpTableFunc)GetProcAddress( hLibrary, "GetUdpTable"); gGetPerAdapterInfo = (GetPerAdapterInfoFunc)GetProcAddress(hLibrary, "GetPerAdapterInfo"); + gGetAdaptersAddresses = (GetAdaptersAddressesFunc)GetProcAddress(hLibrary, "GetAdaptersAddresses"); } } @@ -811,6 +814,71 @@ static void testWin2KFunctions(void) testGetPerAdapterInfo(); } +static void test_GetAdaptersAddresses(void) +{ + ULONG ret, size; + IP_ADAPTER_ADDRESSES *aa; + IP_ADAPTER_UNICAST_ADDRESS *ua; + + if (!gGetAdaptersAddresses) + { + win_skip("GetAdaptersAddresses not present\n"); + return; + } + + ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", ret); + + ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &size); + ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); + if (ret != ERROR_BUFFER_OVERFLOW) return; + + aa = HeapAlloc(GetProcessHeap(), 0, size); + ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, aa, &size); + ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); + + while (!ret && winetest_debug > 1 && aa) + { + trace("Length: %u\n", aa->Length); + trace("IfIndex: %u\n", aa->IfIndex); + trace("Next: %p\n", aa->Next); + trace("AdapterName: %s\n", aa->AdapterName); + trace("FirstUnicastAddress: %p\n", aa->FirstUnicastAddress); + ua = aa->FirstUnicastAddress; + while (ua) + { + trace("\tLength: %u\n", ua->Length); + trace("\tFlags: 0x%08x\n", ua->Flags); + trace("\tNext: %p\n", ua->Next); + trace("\tAddress.lpSockaddr: %p\n", ua->Address.lpSockaddr); + trace("\tAddress.iSockaddrLength: %d\n", ua->Address.iSockaddrLength); + trace("\tPrefixOrigin: %u\n", ua->PrefixOrigin); + trace("\tSuffixOrigin: %u\n", ua->SuffixOrigin); + trace("\tDadState: %u\n", ua->DadState); + trace("\tValidLifetime: 0x%08x\n", ua->ValidLifetime); + trace("\tPreferredLifetime: 0x%08x\n", ua->PreferredLifetime); + trace("\tLeaseLifetime: 0x%08x\n", ua->LeaseLifetime); + trace("\n"); + ua = ua->Next; + } + trace("FirstAnycastAddress: %p\n", aa->FirstAnycastAddress); + trace("FirstMulticastAddress: %p\n", aa->FirstMulticastAddress); + trace("FirstDnsServerAddress: %p\n", aa->FirstDnsServerAddress); + trace("DnsSuffix: %p\n", aa->DnsSuffix); + trace("Description: %p\n", aa->Description); + trace("FriendlyName: %p\n", aa->FriendlyName); + trace("PhysicalAddress: %02x\n", aa->PhysicalAddress[0]); + trace("PhysicalAddressLength: %u\n", aa->PhysicalAddressLength); + trace("Flags: 0x%08x\n", aa->Flags); + trace("Mtu: %u\n", aa->Mtu); + trace("IfType: %u\n", aa->IfType); + trace("OperStatus: %u\n", aa->OperStatus); + trace("\n"); + aa = aa->Next; + } + HeapFree(GetProcessHeap(), 0, aa); +} + START_TEST(iphlpapi) { @@ -820,6 +888,7 @@ START_TEST(iphlpapi) testWinNT4Functions(); testWin98Functions(); testWin2KFunctions(); + test_GetAdaptersAddresses(); freeIPHlpApi(); } }

1 0

Alexandre Julliard : ws2_32: Use SIZE_T instead of size_t for inet_ntop argument.
by Alexandre Julliard April 29, 2009

April 29, 2009

Module: wine Branch: master Commit: 445567ea955f2f4096983539da4671e84ed0fbfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=445567ea955f2f4096983539d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 29 15:52:29 2009 +0200 ws2_32: Use SIZE_T instead of size_t for inet_ntop argument. --- dlls/ws2_32/socket.c | 4 ++-- include/ws2tcpip.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index dddc9af..5516260 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4695,13 +4695,13 @@ int WINAPI WSARemoveServiceClass(LPGUID info) /*********************************************************************** * inet_ntop (WS2_32.@) */ -PCSTR WINAPI WS_inet_ntop( INT family, PVOID addr, PSTR buffer, size_t len ) +PCSTR WINAPI WS_inet_ntop( INT family, PVOID addr, PSTR buffer, SIZE_T len ) { #ifdef HAVE_INET_NTOP struct WS_in6_addr *in6; struct WS_in_addr *in; - TRACE("family %d, addr (%p), buffer (%p), len %d\n", family, addr, buffer, len); + TRACE("family %d, addr (%p), buffer (%p), len %ld\n", family, addr, buffer, len); switch (family) { case WS_AF_INET: diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 6f1293f..0461a81 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -161,9 +161,9 @@ int WINAPI WS(getnameinfo)(const SOCKADDR*,WS(socklen_t),PCHAR,DWORD,PCHAR,DWOR #define GetNameInfoA WS(getnameinfo) INT WINAPI GetNameInfoW(const SOCKADDR*,WS(socklen_t),PWCHAR,DWORD,PWCHAR,DWORD,INT); #define GetNameInfo WINELIB_NAME_AW(GetNameInfo) -PCSTR WINAPI WS(inet_ntop)(INT,PVOID,PSTR,size_t); +PCSTR WINAPI WS(inet_ntop)(INT,PVOID,PSTR,SIZE_T); #define InetNtopA WS(inet_ntop) -PCWSTR WINAPI InetNtopW(INT,PVOID,PWSTR,size_t); +PCWSTR WINAPI InetNtopW(INT,PVOID,PWSTR,SIZE_T); #define InetNtop WINELIB_NAME_AW(InetNtop) int WINAPI WS(inet_pton)(INT,PCSTR,PVOID); #define InetPtonA WS(inet_pton)

1 0

Hans Leidekker : iphlpapi: Implement GetAdaptersAddresses.
by Alexandre Julliard April 29, 2009

April 29, 2009

Module: wine Branch: master Commit: f0491f61ba04d62ba1e6c7d596e14610446a1bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0491f61ba04d62ba1e6c7d59… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 29 11:41:02 2009 +0200 iphlpapi: Implement GetAdaptersAddresses. --- dlls/iphlpapi/ifenum.c | 4 +- dlls/iphlpapi/ifenum.h | 3 + dlls/iphlpapi/iphlpapi.spec | 1 + dlls/iphlpapi/iphlpapi_main.c | 173 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 179 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index f36fc99..19c3c3c 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -548,7 +548,7 @@ DWORD getInterfacePhysicalByIndex(DWORD index, PDWORD len, PBYTE addr, return ERROR_INVALID_DATA; } -static DWORD getInterfaceMtuByName(const char *name, PDWORD mtu) +DWORD getInterfaceMtuByName(const char *name, PDWORD mtu) { DWORD ret; int fd; @@ -580,7 +580,7 @@ static DWORD getInterfaceMtuByName(const char *name, PDWORD mtu) return ret; } -static DWORD getInterfaceStatusByName(const char *name, PDWORD status) +DWORD getInterfaceStatusByName(const char *name, PDWORD status) { DWORD ret; int fd; diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h index d471750..6835dca 100644 --- a/dlls/iphlpapi/ifenum.h +++ b/dlls/iphlpapi/ifenum.h @@ -112,4 +112,7 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags); */ char *toIPAddressString(unsigned int addr, char string[16]); +DWORD getInterfaceMtuByName(const char *name, PDWORD mtu); +DWORD getInterfaceStatusByName(const char *name, PDWORD status); + #endif /* ndef WINE_IFENUM_H_ */ diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 24c4e94..794ece2 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -18,6 +18,7 @@ @ stub FlushIpNetTableFromStack @ stdcall GetAdapterIndex( wstr ptr ) @ stub GetAdapterOrderMap +@ stdcall GetAdaptersAddresses( long long ptr ptr ptr ) @ stdcall GetAdaptersInfo( ptr ptr ) @ stdcall GetBestInterface( long ptr ) @ stdcall GetBestInterfaceEx( ptr ptr ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 547b666..8490c67 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -23,6 +23,12 @@ #include <stdarg.h> #include <stdlib.h> #include <sys/types.h> +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_NET_IF_H +#include <net/if.h> +#endif #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif @@ -44,11 +50,16 @@ #include "iphlpapi.h" #include "ifenum.h" #include "ipstats.h" +#include "ipifcons.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); +#ifndef IF_NAMESIZE +#define IF_NAMESIZE 16 +#endif + #ifndef INADDR_NONE #define INADDR_NONE ~0UL #endif @@ -586,6 +597,168 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) return ret; } +static DWORD typeFromMibType(DWORD mib_type) +{ + switch (mib_type) + { + case MIB_IF_TYPE_ETHERNET: return IF_TYPE_ETHERNET_CSMACD; + case MIB_IF_TYPE_TOKENRING: return IF_TYPE_ISO88025_TOKENRING; + case MIB_IF_TYPE_PPP: return IF_TYPE_PPP; + case MIB_IF_TYPE_LOOPBACK: return IF_TYPE_SOFTWARE_LOOPBACK; + default: return IF_TYPE_OTHER; + } +} + +static ULONG addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs) +{ + ULONG ret, i; + MIB_IPADDRTABLE *at; + + *num_addrs = 0; + if ((ret = getIPAddrTable(&at, GetProcessHeap(), 0))) return ret; + for (i = 0; i < at->dwNumEntries; i++) + { + if (at->table[i].dwIndex == index) (*num_addrs)++; + } + if (!(*addrs = HeapAlloc(GetProcessHeap(), 0, *num_addrs * sizeof(DWORD)))) + { + HeapFree(GetProcessHeap(), 0, at); + return ERROR_OUTOFMEMORY; + } + for (i = 0; i < at->dwNumEntries; i++) + { + if (at->table[i].dwIndex == index) (*addrs)[i] = at->table[i].dwAddr; + } + HeapFree(GetProcessHeap(), 0, at); + return ERROR_SUCCESS; +} + +static ULONG adapterAddressesFromIndex(DWORD index, IP_ADAPTER_ADDRESSES *aa, ULONG *size) +{ + ULONG ret, i, num_addrs, total_size; + DWORD *addrs; + + if ((ret = addressesFromIndex(index, &addrs, &num_addrs))) return ret; + + total_size = sizeof(IP_ADAPTER_ADDRESSES); + total_size += IF_NAMESIZE; + total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_addrs; + total_size += sizeof(struct sockaddr_in) * num_addrs; + + if (aa && *size >= total_size) + { + char name[IF_NAMESIZE], *ptr = (char *)aa + sizeof(IP_ADAPTER_ADDRESSES); + DWORD buflen, type, status; + + memset(aa, 0, sizeof(IP_ADAPTER_ADDRESSES)); + aa->Length = sizeof(IP_ADAPTER_ADDRESSES); + aa->IfIndex = index; + + getInterfaceNameByIndex(index, name); + memcpy(ptr, name, IF_NAMESIZE); + aa->AdapterName = ptr; + ptr += IF_NAMESIZE; + + if (num_addrs) + { + IP_ADAPTER_UNICAST_ADDRESS *ua; + struct sockaddr_in *sa; + + ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + for (i = 0; i < num_addrs; i++) + { + memset(ua, 0, sizeof(IP_ADAPTER_UNICAST_ADDRESS)); + ua->Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); + ua->Address.iSockaddrLength = sizeof(struct sockaddr_in); + ua->Address.lpSockaddr = (SOCKADDR *)((char *)ua + ua->Length); + + sa = (struct sockaddr_in *)ua->Address.lpSockaddr; + sa->sin_family = AF_INET; + sa->sin_addr.s_addr = addrs[i]; + sa->sin_port = 0; + + ptr += ua->Length + ua->Address.iSockaddrLength; + if (i < num_addrs - 1) + { + ua->Next = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + ua = ua->Next; + } + } + } + + buflen = MAX_INTERFACE_PHYSADDR; + getInterfacePhysicalByIndex(index, &buflen, aa->PhysicalAddress, &type); + aa->PhysicalAddressLength = buflen; + aa->IfType = typeFromMibType(type); + + getInterfaceMtuByName(name, &aa->Mtu); + + getInterfaceStatusByName(name, &status); + if (status == MIB_IF_OPER_STATUS_OPERATIONAL) aa->OperStatus = IfOperStatusUp; + else if (status == MIB_IF_OPER_STATUS_NON_OPERATIONAL) aa->OperStatus = IfOperStatusDown; + else aa->OperStatus = IfOperStatusUnknown; + } + *size = total_size; + HeapFree(GetProcessHeap(), 0, addrs); + return ERROR_SUCCESS; +} + +ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, + PIP_ADAPTER_ADDRESSES aa, PULONG buflen) +{ + InterfaceIndexTable *table; + ULONG i, size, total_size, ret = ERROR_NO_DATA; + + if (!buflen) return ERROR_INVALID_PARAMETER; + + if (family == AF_INET6 || family == AF_UNSPEC) + FIXME("no support for IPv6 addresses\n"); + + if (family != AF_INET && family != AF_UNSPEC) return ERROR_NO_DATA; + + table = getInterfaceIndexTable(); + if (!table || !table->numIndexes) + { + HeapFree(GetProcessHeap(), 0, table); + return ERROR_NO_DATA; + } + total_size = 0; + for (i = 0; i < table->numIndexes; i++) + { + size = 0; + if ((ret = adapterAddressesFromIndex(table->indexes[i], NULL, &size))) + { + HeapFree(GetProcessHeap(), 0, table); + return ret; + } + total_size += size; + } + if (aa && *buflen >= total_size) + { + ULONG bytes_left = size = total_size; + for (i = 0; i < table->numIndexes; i++) + { + if ((ret = adapterAddressesFromIndex(table->indexes[i], aa, &size))) + { + HeapFree(GetProcessHeap(), 0, table); + return ret; + } + if (i < table->numIndexes - 1) + { + aa->Next = (IP_ADAPTER_ADDRESSES *)((char *)aa + size); + aa = aa->Next; + size = bytes_left -= size; + } + } + ret = ERROR_SUCCESS; + } + if (*buflen < total_size) ret = ERROR_BUFFER_OVERFLOW; + *buflen = total_size; + + TRACE("num adapters %u\n", table->numIndexes); + HeapFree(GetProcessHeap(), 0, table); + return ret; +} /****************************************************************** * GetBestInterface (IPHLPAPI.@)

1 0

Eric Pouech : kernel32: Completely get rid of ENHANCED_KEY entry in the keymap.
by Alexandre Julliard April 29, 2009

April 29, 2009

Module: wine Branch: master Commit: 883d32dd70aa5d1f106c0c1b270f1bb17823a454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=883d32dd70aa5d1f106c0c1b2… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 28 21:21:36 2009 +0200 kernel32: Completely get rid of ENHANCED_KEY entry in the keymap. This fixes the ctrl-arrow support which has been broken by 67be35304088c916867472ff05114a11d2750881. --- dlls/kernel32/editline.c | 28 ++++++++++------------------ 1 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index bcbf927..ab70916 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -656,13 +656,6 @@ static const KeyEntry StdKeyMap[] = { 0, NULL } }; -static const KeyEntry Win32ExtraStdKeyMap[] = -{ - {/*VK_F8*/ 0x77, WCEL_FindPrevInHist }, - { 0, NULL } -}; - - static const KeyEntry EmacsKeyMapCtrl[] = { { CTRL('@'), WCEL_SetMark }, @@ -712,9 +705,8 @@ static const KeyEntry EmacsKeyMapAlt[] = { 0, NULL } }; -static const KeyEntry EmacsKeyMapExtended[] = +static const KeyEntry EmacsStdKeyMap[] = { - {/*RETURN*/ 0x0d, WCEL_Done }, {/*VK_PRIOR*/0x21, WCEL_MoveToPrevHist }, {/*VK_NEXT*/ 0x22, WCEL_MoveToNextHist }, {/*VK_END*/ 0x23, WCEL_MoveToEnd }, @@ -728,15 +720,15 @@ static const KeyEntry EmacsKeyMapExtended[] = static const KeyMap EmacsKeyMap[] = { {0, 1, StdKeyMap}, + {0, 0, EmacsStdKeyMap}, {RIGHT_ALT_PRESSED, 1, EmacsKeyMapAlt}, /* right alt */ {LEFT_ALT_PRESSED, 1, EmacsKeyMapAlt}, /* left alt */ {RIGHT_CTRL_PRESSED, 1, EmacsKeyMapCtrl}, /* right ctrl */ {LEFT_CTRL_PRESSED, 1, EmacsKeyMapCtrl}, /* left ctrl */ - {ENHANCED_KEY, 0, EmacsKeyMapExtended}, {0, 0, NULL} }; -static const KeyEntry Win32KeyMapExtended[] = +static const KeyEntry Win32StdKeyMap[] = { {/*VK_LEFT*/ 0x25, WCEL_MoveLeft }, {/*VK_RIGHT*/0x27, WCEL_MoveRight }, @@ -745,10 +737,11 @@ static const KeyEntry Win32KeyMapExtended[] = {/*VK_UP*/ 0x26, WCEL_MoveToPrevHist }, {/*VK_DOWN*/ 0x28, WCEL_MoveToNextHist }, {/*VK_DEL*/ 0x2e, WCEL_DeleteCurrChar }, + {/*VK_F8*/ 0x77, WCEL_FindPrevInHist }, { 0, NULL } }; -static const KeyEntry Win32KeyMapCtrlExtended[] = +static const KeyEntry Win32KeyMapCtrl[] = { {/*VK_LEFT*/ 0x25, WCEL_MoveToLeftWord }, {/*VK_RIGHT*/0x27, WCEL_MoveToRightWord }, @@ -758,12 +751,11 @@ static const KeyEntry Win32KeyMapCtrlExtended[] = static const KeyMap Win32KeyMap[] = { - {0, 1, StdKeyMap}, - {0, 0, Win32ExtraStdKeyMap}, - {ENHANCED_KEY, 0, Win32KeyMapExtended}, - {ENHANCED_KEY | RIGHT_CTRL_PRESSED, 0, Win32KeyMapCtrlExtended}, - {ENHANCED_KEY | LEFT_CTRL_PRESSED, 0, Win32KeyMapCtrlExtended}, - {0, 0, NULL} + {0, 1, StdKeyMap}, + {0, 0, Win32StdKeyMap}, + {RIGHT_CTRL_PRESSED, 0, Win32KeyMapCtrl}, + {LEFT_CTRL_PRESSED, 0, Win32KeyMapCtrl}, + {0, 0, NULL} }; #undef CTRL

1 0

Jeff Latimer : ws2_32/tests: IPv6 tests for WSAAddressToStringA.
by Alexandre Julliard April 29, 2009

April 29, 2009

Module: wine Branch: master Commit: 7d78bf4b1c59d4c7f92300b6efcd3399cac911e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d78bf4b1c59d4c7f92300b6e… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Mon Apr 27 20:48:36 2009 +1000 ws2_32/tests: IPv6 tests for WSAAddressToStringA. --- dlls/ws2_32/tests/sock.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 105 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e7c9868..358eabd 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1272,6 +1272,7 @@ static void test_WSASocket(void) static void test_WSAAddressToStringA(void) { + SOCKET v6 = INVALID_SOCKET; INT ret; DWORD len; int GLE; @@ -1283,6 +1284,19 @@ static void test_WSAAddressToStringA(void) CHAR expect3[] = "0.0.0.0:65535"; CHAR expect4[] = "255.255.255.255:65535"; + SOCKADDR_IN6 sockaddr6; + CHAR address6[54]; /* 32 digits + 7':' + '[' + '%" + 5 digits + ']:' + 5 digits + '\0' */ + + CHAR addr6_1[] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}; + CHAR addr6_2[] = {0x20,0xab,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}; + CHAR addr6_3[] = {0x20,0xab,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x01}; + + CHAR expect6_1[] = "::1"; + CHAR expect6_2[] = "20ab::1"; + CHAR expect6_3[] = "[20ab::2001]:33274"; + CHAR expect6_3_2[] = "[20ab::2001%4660]:33274"; + CHAR expect6_3_3[] = "20ab::2001%4660"; + len = 0; sockaddr.sin_family = AF_INET; @@ -1340,6 +1354,97 @@ static void test_WSAAddressToStringA(void) ok( !strcmp( address, expect4 ), "Expected: %s, got: %s\n", expect4, address ); ok( len == sizeof( expect4 ), "Got size %d\n", len); + + /*check to see it IPv6 is available */ + v6 = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); + if (v6 == INVALID_SOCKET) { + skip("Could not create IPv6 socket (LastError: %d; %d expected if IPv6 not available).\n", + WSAGetLastError(), WSAEAFNOSUPPORT); + goto end; + } + /* Test a short IPv6 address */ + len = sizeof(address6); + + sockaddr6.sin6_family = AF_INET6; + sockaddr6.sin6_port = 0x0000; + sockaddr6.sin6_scope_id = 0; + memcpy (sockaddr6.sin6_addr.s6_addr, addr6_1, sizeof(addr6_1)); + + ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + todo_wine + { + ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); + ok( !strcmp( address6, expect6_1 ), "Expected: %s, got: %s\n", expect6_1, address6 ); + ok( len == sizeof(expect6_1), "Got size %d\n", len); + } + + /* Test a longer IPv6 address */ + len = sizeof(address6); + + sockaddr6.sin6_family = AF_INET6; + sockaddr6.sin6_port = 0x0000; + sockaddr6.sin6_scope_id = 0; + memcpy (sockaddr6.sin6_addr.s6_addr, addr6_2, sizeof(addr6_2)); + + ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + todo_wine + { + ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); + ok( !strcmp( address6, expect6_2 ), "Expected: %s, got: %s\n", expect6_2, address6 ); + ok( len == sizeof(expect6_2), "Got size %d\n", len); + } + + /* Test IPv6 address and port number */ + len = sizeof(address6); + + sockaddr6.sin6_family = AF_INET6; + sockaddr6.sin6_port = 0xfa81; + sockaddr6.sin6_scope_id = 0; + memcpy (sockaddr6.sin6_addr.s6_addr, addr6_3, sizeof(addr6_3)); + + ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + todo_wine + { + ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); + ok( !strcmp( address6, expect6_3 ), "Expected: %s, got: %s\n", expect6_3, address6 ); + ok( len == sizeof(expect6_3), "Got size %d\n", len); + } + + /* Test IPv6 address, port number and scope_id */ + len = sizeof(address6); + + sockaddr6.sin6_family = AF_INET6; + sockaddr6.sin6_port = 0xfa81; + sockaddr6.sin6_scope_id = 0x1234; + memcpy (sockaddr6.sin6_addr.s6_addr, addr6_3, sizeof(addr6_3)); + + ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + todo_wine + { + ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); + ok( !strcmp( address6, expect6_3_2 ), "Expected: %s, got: %s\n", expect6_3_2, address6 ); + ok( len == sizeof(expect6_3_2), "Got size %d\n", len); + } + + /* Test IPv6 address and scope_id */ + len = sizeof(address6); + + sockaddr6.sin6_family = AF_INET6; + sockaddr6.sin6_port = 0x0000; + sockaddr6.sin6_scope_id = 0x1234; + memcpy (sockaddr6.sin6_addr.s6_addr, addr6_3, sizeof(addr6_3)); + + ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + todo_wine + { + ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); + ok( !strcmp( address6, expect6_3_3 ), "Expected: %s, got: %s\n", expect6_3_3, address6 ); + ok( len == sizeof(expect6_3_3), "Got size %d\n", len); + } + +end: + if (v6 != INVALID_SOCKET) + closesocket(v6); } static void test_WSAAddressToStringW(void)

1 0

Rein Klazes : winex11: GetPixel() on a monochrome bitmap should return black or white, not dark red.
by Alexandre Julliard April 29, 2009

April 29, 2009

Module: wine Branch: master Commit: 5265e0f2e5c99d0b218115b5f0cb50fb4bb7aed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5265e0f2e5c99d0b218115b5f… Author: Rein Klazes <wijn(a)online.nl> Date: Tue Apr 28 14:11:04 2009 +0200 winex11: GetPixel() on a monochrome bitmap should return black or white, not dark red. --- dlls/gdi32/tests/dc.c | 76 +++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/graphics.c | 7 +++- 2 files changed, 82 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 661246c..1efde38 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -253,10 +253,86 @@ static void test_CreateCompatibleDC(void) ok(hNewDC == NULL, "CreateCompatibleDC returned %p\n", hNewDC); } +static void test_DC_bitmap(void) +{ + HDC hdc, hdcmem; + DWORD bits[64]; + HBITMAP hbmp, oldhbmp; + COLORREF col; + int i, bitspixel; + + /* fill bitmap data with b&w pattern */ + for( i = 0; i < 64; i++) bits[i] = i & 1 ? 0 : 0xffffff; + + hdc = GetDC(0); + ok( hdc != NULL, "CreateDC rets %p\n", hdc); + bitspixel = GetDeviceCaps( hdc, BITSPIXEL); + /* create a memory dc */ + hdcmem = CreateCompatibleDC( hdc); + ok( hdcmem != NULL, "CreateCompatibleDC rets %p\n", hdcmem); + /* tests */ + /* test monochrome bitmap: should always work */ + hbmp = CreateBitmap(32, 32, 1, 1, bits); + ok( hbmp != NULL, "CreateBitmap returns %p\n", hbmp); + oldhbmp = SelectObject( hdcmem, hbmp); + ok( oldhbmp != NULL, "SelectObject returned NULL\n" ); /* a memdc always has a bitmap selected */ + col = GetPixel( hdcmem, 0, 0); + ok( col == 0xffffff, "GetPixel returned %08x, expected 00ffffff\n", col); + col = GetPixel( hdcmem, 1, 1); + ok( col == 0x000000, "GetPixel returned %08x, expected 00000000\n", col); + col = GetPixel( hdcmem, 100, 1); + ok( col == CLR_INVALID, "GetPixel returned %08x, expected ffffffff\n", col); + SelectObject( hdcmem, oldhbmp); + DeleteObject( hbmp); + + /* test with 2 bits color depth, not likely to succeed */ + hbmp = CreateBitmap(16, 16, 1, 2, bits); + ok( hbmp != NULL, "CreateBitmap returns %p\n", hbmp); + oldhbmp = SelectObject( hdcmem, hbmp); + if( bitspixel != 2) + ok( !oldhbmp, "SelectObject of a bitmap with 2 bits/pixel should return NULL\n"); + if( oldhbmp) SelectObject( hdcmem, oldhbmp); + DeleteObject( hbmp); + + /* test with 16 bits color depth, might succeed */ + hbmp = CreateBitmap(6, 6, 1, 16, bits); + ok( hbmp != NULL, "CreateBitmap returns %p\n", hbmp); + oldhbmp = SelectObject( hdcmem, hbmp); + if( bitspixel == 16) { + ok( oldhbmp != NULL, "SelectObject returned NULL\n" ); + col = GetPixel( hdcmem, 0, 0); + ok( col == 0xffffff, + "GetPixel of a bitmap with 16 bits/pixel returned %08x, expected 00ffffff\n", col); + col = GetPixel( hdcmem, 1, 1); + ok( col == 0x000000, + "GetPixel of a bitmap with 16 bits/pixel returned returned %08x, expected 00000000\n", col); + } + if( oldhbmp) SelectObject( hdcmem, oldhbmp); + DeleteObject( hbmp); + + /* test with 32 bits color depth, probably succeed */ + hbmp = CreateBitmap(4, 4, 1, 32, bits); + ok( hbmp != NULL, "CreateBitmap returns %p\n", hbmp); + oldhbmp = SelectObject( hdcmem, hbmp); + if( bitspixel == 32) { + ok( oldhbmp != NULL, "SelectObject returned NULL\n" ); + col = GetPixel( hdcmem, 0, 0); + ok( col == 0xffffff, + "GetPixel of a bitmap with 32 bits/pixel returned %08x, expected 00ffffff\n", col); + col = GetPixel( hdcmem, 1, 1); + ok( col == 0x000000, + "GetPixel of a bitmap with 32 bits/pixel returned returned %08x, expected 00000000\n", col); + } + if( oldhbmp) SelectObject( hdcmem, oldhbmp); + DeleteObject( hbmp); + ReleaseDC( 0, hdc ); +} + START_TEST(dc) { test_savedc(); test_savedc_2(); test_GdiConvertToDevmodeW(); test_CreateCompatibleDC(); + test_DC_bitmap(); } diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index a44de11..8d74c77 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1082,8 +1082,13 @@ X11DRV_GetPixel( X11DRV_PDEVICE *physDev, INT x, INT y ) /* Update the DIBSection from the pixmap */ X11DRV_UnlockDIBSection(physDev, FALSE); + if( physDev->depth > 1) + pixel = X11DRV_PALETTE_ToLogical(pixel); + else + /* monochrome bitmaps return black or white */ + if( pixel) pixel = 0xffffff; + return pixel; - return X11DRV_PALETTE_ToLogical(pixel); }

1 0

Nikolay Sivov : comctl32/listview: A couple of LVM_GETITEM tests with incomplete masks.
by Alexandre Julliard April 29, 2009

April 29, 2009

Module: wine Branch: master Commit: 9f6bd09ec0e6cd63d5d980577e1479d9795d817c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f6bd09ec0e6cd63d5d980577… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Apr 28 23:29:48 2009 +0400 comctl32/listview: A couple of LVM_GETITEM tests with incomplete masks. --- dlls/comctl32/tests/listview.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0ad3175..7be6b71 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -805,6 +805,20 @@ static void test_items(void) ok(r != 0, "ret %d\n", r); todo_wine ok(item.state == LVIS_DROPHILITED, "got state %x, expected %x\n", item.state, LVIS_DROPHILITED); + /* some notnull but meaningless masks */ + memset (&item, 0, sizeof(item)); + item.mask = LVIF_NORECOMPUTE; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(r != 0, "ret %d\n", r); + memset (&item, 0, sizeof(item)); + item.mask = LVIF_DI_SETITEM; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(r != 0, "ret %d\n", r); + DestroyWindow(hwnd); }

1 0

Jeff Latimer : ws2_32: IPv6 functionality for WSAAddressToStringA.
by Alexandre Julliard April 29, 2009

April 29, 2009

Module: wine Branch: master Commit: 2fa64f52e7cdd3065d86d1ccbc7d50bdd6701fd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fa64f52e7cdd3065d86d1ccb… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Mon Apr 27 20:49:19 2009 +1000 ws2_32: IPv6 functionality for WSAAddressToStringA. --- dlls/ws2_32/socket.c | 39 +++++++++++++++++++++++++++++---------- dlls/ws2_32/tests/sock.c | 12 +++--------- 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 01ebd7c..dddc9af 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4922,7 +4922,7 @@ INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len, LPDWORD lenstr ) { DWORD size; - CHAR buffer[22]; /* 12 digits + 3 dots + ':' + 5 digits + '\0' */ + CHAR buffer[54]; /* 32 digits + 7':' + '[' + '%" + 5 digits + ']:' + 5 digits + '\0' */ CHAR *p; TRACE( "(%p, %d, %p, %p, %p)\n", sockaddr, len, info, string, lenstr ); @@ -4931,17 +4931,36 @@ INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len, if (!string || !lenstr) return SOCKET_ERROR; /* sin_family is guaranteed to be the first u_short */ - if (((SOCKADDR_IN *)sockaddr)->sin_family != AF_INET) return SOCKET_ERROR; + switch(((SOCKADDR_IN *)sockaddr)->sin_family) + { + case WS_AF_INET: + sprintf( buffer, "%u.%u.%u.%u:%u", + (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 24 & 0xff), + (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 16 & 0xff), + (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 8 & 0xff), + (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) & 0xff), + ntohs( ((SOCKADDR_IN *)sockaddr)->sin_port ) ); + + p = strchr( buffer, ':' ); + if (!((SOCKADDR_IN *)sockaddr)->sin_port) *p = 0; + break; - sprintf( buffer, "%u.%u.%u.%u:%u", - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 24 & 0xff), - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 16 & 0xff), - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 8 & 0xff), - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) & 0xff), - ntohs( ((SOCKADDR_IN *)sockaddr)->sin_port ) ); + case WS_AF_INET6: + { + struct WS_sockaddr_in6 *sockaddr6 = (LPSOCKADDR_IN6) sockaddr; - p = strchr( buffer, ':' ); - if (!((SOCKADDR_IN *)sockaddr)->sin_port) *p = 0; + if (!WS_inet_ntop(WS_AF_INET6, &sockaddr6->sin6_addr, buffer, sizeof(buffer))) + { + WSASetLastError(WSAEINVAL); + return SOCKET_ERROR; + } + break; + } + + default: + WSASetLastError(WSAEINVAL); + return SOCKET_ERROR; + } size = strlen( buffer ) + 1; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 358eabd..54ffee7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1371,12 +1371,9 @@ static void test_WSAAddressToStringA(void) memcpy (sockaddr6.sin6_addr.s6_addr, addr6_1, sizeof(addr6_1)); ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); - todo_wine - { ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !strcmp( address6, expect6_1 ), "Expected: %s, got: %s\n", expect6_1, address6 ); ok( len == sizeof(expect6_1), "Got size %d\n", len); - } /* Test a longer IPv6 address */ len = sizeof(address6); @@ -1387,12 +1384,9 @@ static void test_WSAAddressToStringA(void) memcpy (sockaddr6.sin6_addr.s6_addr, addr6_2, sizeof(addr6_2)); ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); - todo_wine - { ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !strcmp( address6, expect6_2 ), "Expected: %s, got: %s\n", expect6_2, address6 ); ok( len == sizeof(expect6_2), "Got size %d\n", len); - } /* Test IPv6 address and port number */ len = sizeof(address6); @@ -1403,9 +1397,9 @@ static void test_WSAAddressToStringA(void) memcpy (sockaddr6.sin6_addr.s6_addr, addr6_3, sizeof(addr6_3)); ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); todo_wine { - ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !strcmp( address6, expect6_3 ), "Expected: %s, got: %s\n", expect6_3, address6 ); ok( len == sizeof(expect6_3), "Got size %d\n", len); } @@ -1419,9 +1413,9 @@ static void test_WSAAddressToStringA(void) memcpy (sockaddr6.sin6_addr.s6_addr, addr6_3, sizeof(addr6_3)); ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); todo_wine { - ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !strcmp( address6, expect6_3_2 ), "Expected: %s, got: %s\n", expect6_3_2, address6 ); ok( len == sizeof(expect6_3_2), "Got size %d\n", len); } @@ -1435,9 +1429,9 @@ static void test_WSAAddressToStringA(void) memcpy (sockaddr6.sin6_addr.s6_addr, addr6_3, sizeof(addr6_3)); ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); todo_wine { - ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !strcmp( address6, expect6_3_3 ), "Expected: %s, got: %s\n", expect6_3_3, address6 ); ok( len == sizeof(expect6_3_3), "Got size %d\n", len); }

1 0

Nikolay Sivov : comctl32/listview: Handle LVIF_NORECOMPUTE in LVM_GETITEM[A , W].
by Alexandre Julliard April 29, 2009

April 29, 2009

Module: wine Branch: master Commit: cd8b91f1bb374d07fe4dcd070b2c8da64e23db5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8b91f1bb374d07fe4dcd070… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Apr 28 22:26:38 2009 +0400 comctl32/listview: Handle LVIF_NORECOMPUTE in LVM_GETITEM[A,W]. --- dlls/comctl32/listview.c | 69 ++++++++++++++++++++++++++------------- dlls/comctl32/tests/listview.c | 6 +-- 2 files changed, 48 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2c60320..901893f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -72,7 +72,6 @@ * Flags * -- LVIF_COLUMNS * -- LVIF_GROUPID - * -- LVIF_NORECOMPUTE * * States * -- LVIS_ACTIVATING (not currently supported by comctl32.dll version 6.0) @@ -5560,6 +5559,8 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, /* apparently, we should not callback for lParam in LVS_OWNERDATA */ if ((lpLVItem->mask & ~(LVIF_STATE | LVIF_PARAM)) || infoPtr->uCallbackMask) { + UINT mask = lpLVItem->mask; + /* NOTE: copy only fields which we _know_ are initialized, some apps * depend on the uninitialized fields being 0 */ dispInfo.item.mask = lpLVItem->mask & ~LVIF_PARAM; @@ -5567,34 +5568,49 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, dispInfo.item.iSubItem = isubitem; if (lpLVItem->mask & LVIF_TEXT) { - dispInfo.item.pszText = lpLVItem->pszText; - dispInfo.item.cchTextMax = lpLVItem->cchTextMax; + if (lpLVItem->mask & LVIF_NORECOMPUTE) + /* reset mask */ + dispInfo.item.mask &= ~(LVIF_TEXT | LVIF_NORECOMPUTE); + else + { + dispInfo.item.pszText = lpLVItem->pszText; + dispInfo.item.cchTextMax = lpLVItem->cchTextMax; + } } if (lpLVItem->mask & LVIF_STATE) dispInfo.item.stateMask = lpLVItem->stateMask & infoPtr->uCallbackMask; - notify_dispinfoT(infoPtr, LVN_GETDISPINFOW, &dispInfo, isW); - dispInfo.item.stateMask = lpLVItem->stateMask; - if (lpLVItem->mask & (LVIF_GROUPID|LVIF_COLUMNS)) + /* could be zeroed on LVIF_NORECOMPUTE case */ + if (dispInfo.item.mask != 0) { - /* full size structure expected - _WIN32IE >= 0x560 */ - *lpLVItem = dispInfo.item; + notify_dispinfoT(infoPtr, LVN_GETDISPINFOW, &dispInfo, isW); + dispInfo.item.stateMask = lpLVItem->stateMask; + if (lpLVItem->mask & (LVIF_GROUPID|LVIF_COLUMNS)) + { + /* full size structure expected - _WIN32IE >= 0x560 */ + *lpLVItem = dispInfo.item; + } + else if (lpLVItem->mask & LVIF_INDENT) + { + /* indent member expected - _WIN32IE >= 0x300 */ + memcpy(lpLVItem, &dispInfo.item, offsetof( LVITEMW, iGroupId )); + } + else + { + /* minimal structure expected */ + memcpy(lpLVItem, &dispInfo.item, offsetof( LVITEMW, iIndent )); + } + lpLVItem->mask = mask; + TRACE(" getdispinfo(1):lpLVItem=%s\n", debuglvitem_t(lpLVItem, isW)); } - else if (lpLVItem->mask & LVIF_INDENT) - { - /* indent member expected - _WIN32IE >= 0x300 */ - memcpy(lpLVItem, &dispInfo.item, offsetof( LVITEMW, iGroupId )); - } - else - { - /* minimal structure expected */ - memcpy(lpLVItem, &dispInfo.item, offsetof( LVITEMW, iIndent )); - } - TRACE(" getdispinfo(1):lpLVItem=%s\n", debuglvitem_t(lpLVItem, isW)); } /* make sure lParam is zeroed out */ if (lpLVItem->mask & LVIF_PARAM) lpLVItem->lParam = 0; - + + /* callback marked pointer required here */ + if ((lpLVItem->mask & LVIF_TEXT) && (lpLVItem->mask & LVIF_NORECOMPUTE)) + lpLVItem->pszText = LPSTR_TEXTCALLBACKW; + /* we store only a little state, so if we're not asked, we're done */ if (!(lpLVItem->mask & LVIF_STATE) || isubitem) return TRUE; @@ -5651,7 +5667,8 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, } /* Apps depend on calling back for text if it is NULL or LPSTR_TEXTCALLBACKW */ - if ((lpLVItem->mask & LVIF_TEXT) && !is_textW(pItemHdr->pszText)) + if ((lpLVItem->mask & LVIF_TEXT) && !(lpLVItem->mask & LVIF_NORECOMPUTE) && + !is_textW(pItemHdr->pszText)) { dispInfo.item.mask |= LVIF_TEXT; dispInfo.item.pszText = lpLVItem->pszText; @@ -5698,7 +5715,8 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, } else if (lpLVItem->mask & LVIF_TEXT) { - if (isW) lpLVItem->pszText = pItemHdr->pszText; + /* if LVN_GETDISPINFO's disabled with LVIF_NORECOMPUTE return callback placeholder */ + if (isW || !is_textW(pItemHdr->pszText)) lpLVItem->pszText = pItemHdr->pszText; else textcpynT(lpLVItem->pszText, isW, pItemHdr->pszText, TRUE, lpLVItem->cchTextMax); } @@ -5774,7 +5792,12 @@ static BOOL LISTVIEW_GetItemExtT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVIte pszText = lpLVItem->pszText; bResult = LISTVIEW_GetItemT(infoPtr, lpLVItem, isW); if (bResult && lpLVItem->pszText != pszText) - textcpynT(pszText, isW, lpLVItem->pszText, isW, lpLVItem->cchTextMax); + { + if (lpLVItem->pszText != LPSTR_TEXTCALLBACKW) + textcpynT(pszText, isW, lpLVItem->pszText, isW, lpLVItem->cchTextMax); + else + pszText = LPSTR_TEXTCALLBACKW; + } lpLVItem->pszText = pszText; return bResult; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index cde7a25..0ad3175 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1881,10 +1881,9 @@ static void test_norecompute(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); res = SendMessageA(hwnd, LVM_GETITEM, 0, (LPARAM)&item); expect(TRUE, res); -todo_wine ok(item.pszText == LPSTR_TEXTCALLBACK, "Expected (%p), got (%p)\n", LPSTR_TEXTCALLBACK, (VOID*)item.pszText); - ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "retrieve with LVIF_NORECOMPUTE seq", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "retrieve with LVIF_NORECOMPUTE seq", FALSE); DestroyWindow(hwnd); @@ -1906,10 +1905,9 @@ todo_wine flush_sequences(sequences, NUM_MSG_SEQUENCES); res = SendMessageA(hwnd, LVM_GETITEM, 0, (LPARAM)&item); expect(TRUE, res); -todo_wine ok(item.pszText == LPSTR_TEXTCALLBACK, "Expected (%p), got (%p)\n", LPSTR_TEXTCALLBACK, (VOID*)item.pszText); - ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "retrieve with LVIF_NORECOMPUTE seq 2", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "retrieve with LVIF_NORECOMPUTE seq 2", FALSE); DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/listview: Handle CCM_[G, S]ETVERSION in listview.
by Alexandre Julliard April 29, 2009

April 29, 2009

Module: wine Branch: master Commit: bbd00da488ee05ace5928b49129ca030cdc7ec0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd00da488ee05ace5928b491… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 29 12:39:17 2009 +0400 comctl32/listview: Handle CCM_[G,S]ETVERSION in listview. --- dlls/comctl32/listview.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b6c6c2d..2c60320 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -309,6 +309,8 @@ typedef struct tagLISTVIEW_INFO INT nMeasureItemHeight; INT xTrackLine; /* The x coefficient of the track line or -1 if none */ DELAYED_ITEM_EDIT itemEdit; /* Pointer to this structure will be the timer ID */ + + DWORD iVersion; /* CCM_[G,S]ETVERSION */ } LISTVIEW_INFO; /* @@ -8133,6 +8135,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->nMeasureItemHeight = 0; infoPtr->xTrackLine = -1; /* no track line */ infoPtr->itemEdit.fEnabled = FALSE; + infoPtr->iVersion = COMCTL32_VERSION; /* get default font (icon title) */ SystemParametersInfoW(SPI_GETICONTITLELOGFONT, 0, &logFont, 0); @@ -9759,6 +9762,47 @@ static LRESULT LISTVIEW_ShowWindow(LISTVIEW_INFO *infoPtr, BOOL bShown, INT iSta /*** * DESCRIPTION: + * Processes CCM_GETVERSION messages. + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * + * RETURN: + * Current version + */ +static inline LRESULT LISTVIEW_GetVersion(LISTVIEW_INFO *infoPtr) +{ + return infoPtr->iVersion; +} + +/*** + * DESCRIPTION: + * Processes CCM_SETVERSION messages. + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * [I] iVersion : version to be set + * + * RETURN: + * -1 when requested version is greater then DLL version; + * previous version otherwise + */ +static LRESULT LISTVIEW_SetVersion(LISTVIEW_INFO *infoPtr, DWORD iVersion) +{ + INT iOldVersion = infoPtr->iVersion; + + if (iVersion > COMCTL32_VERSION) + return -1; + + infoPtr->iVersion = iVersion; + + TRACE("new version %d\n", iVersion); + + return iOldVersion; +} + +/*** + * DESCRIPTION: * Window procedure of the listview control. * */ @@ -10126,6 +10170,12 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_UPDATE: return LISTVIEW_Update(infoPtr, (INT)wParam); + case CCM_GETVERSION: + return LISTVIEW_GetVersion(infoPtr); + + case CCM_SETVERSION: + return LISTVIEW_SetVersion(infoPtr, wParam); + case WM_CHAR: return LISTVIEW_ProcessLetterKeys( infoPtr, wParam, lParam );

1 0