October 2010 - Wine-Commits

Juan Lang : iphlpapi: Set DNS servers in GetAdaptersAddresses when GAA_FLAG_SKIP_DNS_SERVER isn' t specified.
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

Module: wine Branch: master Commit: 873034c72d46d079bcabd4648599a9aa3561e66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=873034c72d46d079bcabd4648… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 11 09:05:06 2010 -0700 iphlpapi: Set DNS servers in GetAdaptersAddresses when GAA_FLAG_SKIP_DNS_SERVER isn't specified. --- dlls/iphlpapi/iphlpapi_main.c | 67 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 52d1c58..ae2dd76 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -924,11 +924,55 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, DWORD index, return ERROR_SUCCESS; } +static ULONG get_dns_server_addresses(PIP_ADAPTER_DNS_SERVER_ADDRESS address, ULONG *len) +{ + DWORD size; + + initialise_resolver(); + /* FIXME: no support for IPv6 DNS server addresses. Doing so requires + * sizeof SOCKADDR_STORAGE instead, and using _res._u._ext.nsaddrs when + * available. + */ + size = _res.nscount * (sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS) + sizeof(SOCKADDR)); + if (!address || *len < size) + { + *len = size; + return ERROR_BUFFER_OVERFLOW; + } + *len = size; + if (_res.nscount > 0) + { + PIP_ADAPTER_DNS_SERVER_ADDRESS addr; + int i; + + for (i = 0, addr = address; i < _res.nscount && addr; + i++, addr = addr->Next) + { + SOCKADDR_IN *sin; + + addr->Address.iSockaddrLength = sizeof(SOCKADDR); + addr->Address.lpSockaddr = + (LPSOCKADDR)((PBYTE)addr + sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS)); + sin = (SOCKADDR_IN *)addr->Address.lpSockaddr; + sin->sin_family = WS_AF_INET; + sin->sin_port = _res.nsaddr_list[i].sin_port; + memcpy(&sin->sin_addr, &_res.nsaddr_list[i].sin_addr, sizeof(sin->sin_addr)); + if (i == _res.nscount - 1) + addr->Next = NULL; + else + addr->Next = + (PIP_ADAPTER_DNS_SERVER_ADDRESS)((PBYTE)addr + + sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS) + sizeof(SOCKADDR)); + } + } + 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; + ULONG i, size, dns_server_size, total_size, ret = ERROR_NO_DATA; TRACE("(%d, %08x, %p, %p, %p)\n", family, flags, reserved, aa, buflen); @@ -951,9 +995,20 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, } total_size += size; } + if (!(flags & GAA_FLAG_SKIP_DNS_SERVER)) + { + /* Since DNS servers aren't really per adapter, get enough space for a + * single copy of them. + */ + get_dns_server_addresses(NULL, &dns_server_size); + total_size += dns_server_size; + } if (aa && *buflen >= total_size) { ULONG bytes_left = size = total_size; + PIP_ADAPTER_ADDRESSES first_aa = aa; + PIP_ADAPTER_DNS_SERVER_ADDRESS firstDns; + for (i = 0; i < table->numIndexes; i++) { if ((ret = adapterAddressesFromIndex(family, flags, table->indexes[i], aa, &size))) @@ -968,6 +1023,16 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, size = bytes_left -= size; } } + if (!(flags & GAA_FLAG_SKIP_DNS_SERVER)) + { + firstDns = (PIP_ADAPTER_DNS_SERVER_ADDRESS)((BYTE *)aa + total_size - dns_server_size); + get_dns_server_addresses(firstDns, &dns_server_size); + for (aa = first_aa; aa; aa = aa->Next) + { + if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK && aa->OperStatus == IfOperStatusUp) + aa->FirstDnsServerAddress = firstDns; + } + } ret = ERROR_SUCCESS; } if (*buflen < total_size) ret = ERROR_BUFFER_OVERFLOW;

1 0

Juan Lang : iphlpapi: Use a helper function to get the DNS server list.
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

Module: wine Branch: master Commit: 189cd59079eafc5b373a38cb24b39dec0c8048cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=189cd59079eafc5b373a38cb2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 11 09:12:45 2010 -0700 iphlpapi: Use a helper function to get the DNS server list. --- dlls/iphlpapi/iphlpapi_main.c | 68 +++++++++++++++++++++++++++++------------ 1 files changed, 48 insertions(+), 20 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index ae2dd76..2869ce3 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1539,6 +1539,46 @@ DWORD WINAPI GetIpNetTable(PMIB_IPNETTABLE pIpNetTable, PULONG pdwSize, BOOL bOr return ret; } +/* Gets the DNS server list into the list beginning at list. Assumes that + * a single server address may be placed at list if *len is at least + * sizeof(IP_ADDR_STRING) long. Otherwise, list->Next is set to firstDynamic, + * and assumes that all remaining DNS servers are contiguously located + * beginning at firstDynamic. On input, *len is assumed to be the total number + * of bytes available for all DNS servers, and is ignored if list is NULL. + * On return, *len is set to the total number of bytes required for all DNS + * servers. + * Returns ERROR_BUFFER_OVERFLOW if *len is insufficient, + * ERROR_SUCCESS otherwise. + */ +static DWORD get_dns_server_list(PIP_ADDR_STRING list, + PIP_ADDR_STRING firstDynamic, DWORD *len) +{ + DWORD size; + + initialise_resolver(); + size = _res.nscount * sizeof(IP_ADDR_STRING); + if (!list || *len < size) { + *len = size; + return ERROR_BUFFER_OVERFLOW; + } + *len = size; + if (_res.nscount > 0) { + PIP_ADDR_STRING ptr; + int i; + + for (i = 0, ptr = list; i < _res.nscount && ptr; i++, ptr = ptr->Next) { + toIPAddressString(_res.nsaddr_list[i].sin_addr.s_addr, + ptr->IpAddress.String); + if (i == _res.nscount - 1) + ptr->Next = NULL; + else if (i == 0) + ptr->Next = firstDynamic; + else + ptr->Next = (PIP_ADDR_STRING)((PBYTE)ptr + sizeof(IP_ADDR_STRING)); + } + } + return ERROR_SUCCESS; +} /****************************************************************** * GetNetworkParams (IPHLPAPI.@) @@ -1560,7 +1600,7 @@ DWORD WINAPI GetIpNetTable(PMIB_IPNETTABLE pIpNetTable, PULONG pdwSize, BOOL bOr */ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen) { - DWORD ret, size; + DWORD ret, size, serverListSize; LONG regReturn; HKEY hKey; @@ -1568,9 +1608,8 @@ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen) if (!pOutBufLen) return ERROR_INVALID_PARAMETER; - initialise_resolver(); - size = sizeof(FIXED_INFO) + (_res.nscount > 0 ? (_res.nscount - 1) * - sizeof(IP_ADDR_STRING) : 0); + get_dns_server_list(NULL, NULL, &serverListSize); + size = sizeof(FIXED_INFO) + serverListSize - sizeof(IP_ADDR_STRING); if (!pFixedInfo || *pOutBufLen < size) { *pOutBufLen = size; return ERROR_BUFFER_OVERFLOW; @@ -1581,22 +1620,11 @@ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen) GetComputerNameExA(ComputerNameDnsHostname, pFixedInfo->HostName, &size); size = sizeof(pFixedInfo->DomainName); GetComputerNameExA(ComputerNameDnsDomain, pFixedInfo->DomainName, &size); - if (_res.nscount > 0) { - PIP_ADDR_STRING ptr; - int i; - - for (i = 0, ptr = &pFixedInfo->DnsServerList; i < _res.nscount && ptr; - i++, ptr = ptr->Next) { - toIPAddressString(_res.nsaddr_list[i].sin_addr.s_addr, - ptr->IpAddress.String); - if (i == _res.nscount - 1) - ptr->Next = NULL; - else if (i == 0) - ptr->Next = (PIP_ADDR_STRING)((LPBYTE)pFixedInfo + sizeof(FIXED_INFO)); - else - ptr->Next = (PIP_ADDR_STRING)((PBYTE)ptr + sizeof(IP_ADDR_STRING)); - } - } + get_dns_server_list(&pFixedInfo->DnsServerList, + (PIP_ADDR_STRING)((BYTE *)pFixedInfo + sizeof(FIXED_INFO)), + &serverListSize); + /* Assume the first DNS server in the list is the "current" DNS server: */ + pFixedInfo->CurrentDnsServer = &pFixedInfo->DnsServerList; pFixedInfo->NodeType = HYBRID_NODETYPE; regReturn = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Services\\VxD\\MSTCP", 0, KEY_READ, &hKey);

1 0

Juan Lang : iphlpapi: Set DNS servers in the IP_PER_ADAPTER_INFO returned for non-loopback addresses .
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

Module: wine Branch: master Commit: 112f878975659c2d3700efd377c5bbc00beb66d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=112f878975659c2d3700efd37… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 23 14:56:34 2010 -0700 iphlpapi: Set DNS servers in the IP_PER_ADAPTER_INFO returned for non-loopback addresses. --- dlls/iphlpapi/ifenum.c | 15 +++++++++++++++ dlls/iphlpapi/ifenum.h | 1 + dlls/iphlpapi/iphlpapi_main.c | 20 +++++++++++++++----- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 4628b21..c998b93 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -158,6 +158,21 @@ DWORD getInterfaceIndexByName(const char *name, PDWORD index) return ret; } +BOOL isIfIndexLoopback(ULONG idx) +{ + BOOL ret = FALSE; + char name[IFNAMSIZ]; + int fd; + + getInterfaceNameByIndex(idx, name); + fd = socket(PF_INET, SOCK_DGRAM, 0); + if (fd != -1) { + ret = isLoopbackInterface(fd, name); + close(fd); + } + return ret; +} + DWORD getNumNonLoopbackInterfaces(void) { DWORD numInterfaces; diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h index 79e484b..be5c9c1 100644 --- a/dlls/iphlpapi/ifenum.h +++ b/dlls/iphlpapi/ifenum.h @@ -46,6 +46,7 @@ DWORD getNumInterfaces(void); DWORD getNumNonLoopbackInterfaces(void); +BOOL isIfIndexLoopback(ULONG idx); /* A table of interface indexes, see get*InterfaceTable(). */ typedef struct _InterfaceIndexTable { diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 2869ce3..5cefd4a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1688,18 +1688,21 @@ DWORD WINAPI GetNumberOfInterfaces(PDWORD pdwNumIf) * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h - * - * FIXME - * Stub, returns empty IP_PER_ADAPTER_INFO in every case. */ DWORD WINAPI GetPerAdapterInfo(ULONG IfIndex, PIP_PER_ADAPTER_INFO pPerAdapterInfo, PULONG pOutBufLen) { - ULONG bytesNeeded = sizeof(IP_PER_ADAPTER_INFO); + ULONG bytesNeeded = sizeof(IP_PER_ADAPTER_INFO), serverListSize = 0; + DWORD ret = NO_ERROR; TRACE("(IfIndex %d, pPerAdapterInfo %p, pOutBufLen %p)\n", IfIndex, pPerAdapterInfo, pOutBufLen); if (!pOutBufLen) return ERROR_INVALID_PARAMETER; + if (!isIfIndexLoopback(IfIndex)) { + get_dns_server_list(NULL, NULL, &serverListSize); + if (serverListSize > sizeof(IP_ADDR_STRING)) + bytesNeeded += serverListSize - sizeof(IP_ADDR_STRING); + } if (!pPerAdapterInfo || *pOutBufLen < bytesNeeded) { *pOutBufLen = bytesNeeded; @@ -1707,7 +1710,14 @@ DWORD WINAPI GetPerAdapterInfo(ULONG IfIndex, PIP_PER_ADAPTER_INFO pPerAdapterIn } memset(pPerAdapterInfo, 0, bytesNeeded); - return NO_ERROR; + if (!isIfIndexLoopback(IfIndex)) { + ret = get_dns_server_list(&pPerAdapterInfo->DnsServerList, + (PIP_ADDR_STRING)((PBYTE)pPerAdapterInfo + sizeof(IP_PER_ADAPTER_INFO)), + &serverListSize); + /* Assume the first DNS server in the list is the "current" DNS server: */ + pPerAdapterInfo->CurrentDnsServer = &pPerAdapterInfo->DnsServerList; + } + return ret; }

1 0

Aurimas Fišeras : taskkill: Update Lithuanian translation.
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

Module: wine Branch: master Commit: d099af8c013714290e43d607151fb2a1e7a96605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d099af8c013714290e43d6071… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Oct 11 22:22:48 2010 +0300 taskkill: Update Lithuanian translation. --- programs/taskkill/Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/Lt.rc b/programs/taskkill/Lt.rc index 16b8bf5..e2d6884 100644 --- a/programs/taskkill/Lt.rc +++ b/programs/taskkill/Lt.rc @@ -41,4 +41,5 @@ STRINGTABLE STRING_SEARCH_FAILED, "Klaida: nepavyko rasti proceso „%s“.\n" STRING_ENUM_FAILED, "Klaida: nepavyko gauti procesų sąrašo.\n" STRING_TERMINATE_FAILED, "Klaida: nepavyko nutraukti proceso „%s“.\n" + STRING_SELF_TERMINATION, "Klaida: savo proceso priverstinis nutraukimas negalimas.\n" }

1 0

Juan Lang : ipconfig: Specify GAA_FLAG_INCLUDE_ALL_GATEWAYS when calling GetAdaptersAddresses.
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

Module: wine Branch: master Commit: 8d3318a8ff38e43e9ecfb3aff02dcd6ef29dc29f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d3318a8ff38e43e9ecfb3aff… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 11 08:54:47 2010 -0700 ipconfig: Specify GAA_FLAG_INCLUDE_ALL_GATEWAYS when calling GetAdaptersAddresses. --- programs/ipconfig/ipconfig.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index e76b549..b6eb5f0 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -153,13 +153,15 @@ static void print_basic_information(void) IP_ADAPTER_ADDRESSES *adapters; ULONG out = 0; - if (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW) + if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, + NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW) { adapters = HeapAlloc(GetProcessHeap(), 0, out); if (!adapters) exit(1); - if (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, adapters, &out) == ERROR_SUCCESS) + if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, + NULL, adapters, &out) == ERROR_SUCCESS) { IP_ADAPTER_ADDRESSES *p; @@ -303,13 +305,15 @@ static void print_full_information(void) HeapFree(GetProcessHeap(), 0, info); } - if (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW) + if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, + NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW) { adapters = HeapAlloc(GetProcessHeap(), 0, out); if (!adapters) exit(1); - if (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, adapters, &out) == ERROR_SUCCESS) + if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, + NULL, adapters, &out) == ERROR_SUCCESS) { IP_ADAPTER_ADDRESSES *p;

1 0

André Hentschel : taskkill: Update German translation.
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

Module: wine Branch: master Commit: 009f45240714bd6aa6ea71d544debc51be13a37f URL: http://source.winehq.org/git/wine.git/?a=commit;h=009f45240714bd6aa6ea71d54… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 11 20:48:59 2010 +0200 taskkill: Update German translation. --- programs/taskkill/De.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/De.rc b/programs/taskkill/De.rc index 597cc36..ede9538 100644 --- a/programs/taskkill/De.rc +++ b/programs/taskkill/De.rc @@ -40,4 +40,5 @@ STRINGTABLE STRING_SEARCH_FAILED, "Fehler: Konnte Prozess \"%s\" nicht finden.\n" STRING_ENUM_FAILED, "Fehler: Konnte die Prozessliste nicht Enumerieren.\n" STRING_TERMINATE_FAILED, "Fehler: Konnte Prozess \"%s\" nicht beenden.\n" + STRING_SELF_TERMINATION, "Fehler: Eigenen Prozess beenden ist nicht gestattet.\n" }

1 0

Aric Stewart : strmbase: Move mediaSeeking to strmbase SourceSeeking.
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

Module: wine Branch: master Commit: 602d44a12c14e6ec24ce4821dfb77ebb4ad152b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=602d44a12c14e6ec24ce4821d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 11 10:15:35 2010 -0500 strmbase: Move mediaSeeking to strmbase SourceSeeking. --- dlls/quartz/avisplit.c | 23 ++-- dlls/quartz/control.c | 282 ------------------------------------ dlls/quartz/control_private.h | 38 ----- dlls/quartz/mpegsplit.c | 19 ++- dlls/quartz/parser.c | 60 ++++---- dlls/quartz/parser.h | 4 +- dlls/quartz/videorenderer.c | 1 - dlls/quartz/waveparser.c | 19 ++- dlls/strmbase/Makefile.in | 1 + dlls/strmbase/seeking.c | 315 +++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 40 +++++ 11 files changed, 425 insertions(+), 377 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=602d44a12c14e6ec24ce4…

1 0

Alexandre Julliard : user32: Make sure AdjustWindowRect and WM_NCCALCSIZE yield the same result for WS_EX_DLGMODALFRAME windows .
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

Module: wine Branch: master Commit: 299f2b354eeb8909535cb966e22b46d3d7c0463f URL: http://source.winehq.org/git/wine.git/?a=commit;h=299f2b354eeb8909535cb966e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 12 11:28:51 2010 +0200 user32: Make sure AdjustWindowRect and WM_NCCALCSIZE yield the same result for WS_EX_DLGMODALFRAME windows. --- dlls/user32/nonclient.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 64c1186..d2bcdcb 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -86,7 +86,6 @@ static void NC_AdjustRectOuter (LPRECT rect, DWORD style, BOOL menu, DWORD exStyle) { int adjust; - if(style & WS_ICONIC) return; if ((exStyle & (WS_EX_STATICEDGE|WS_EX_DLGMODALFRAME)) == WS_EX_STATICEDGE) @@ -99,7 +98,7 @@ NC_AdjustRectOuter (LPRECT rect, DWORD style, BOOL menu, DWORD exStyle) if ((exStyle & WS_EX_DLGMODALFRAME) || (style & (WS_THICKFRAME|WS_DLGFRAME))) adjust = 2; /* outer */ } - if (style & WS_THICKFRAME) + if ((style & WS_THICKFRAME) && !(exStyle & WS_EX_DLGMODALFRAME)) adjust += ( GetSystemMetrics (SM_CXFRAME) - GetSystemMetrics (SM_CXDLGFRAME)); /* The resize border */ if ((style & (WS_BORDER|WS_DLGFRAME)) || @@ -140,8 +139,6 @@ NC_AdjustRectOuter (LPRECT rect, DWORD style, BOOL menu, DWORD exStyle) static void NC_AdjustRectInner (LPRECT rect, DWORD style, DWORD exStyle) { - if(style & WS_ICONIC) return; - if (exStyle & WS_EX_CLIENTEDGE) InflateRect(rect, GetSystemMetrics(SM_CXEDGE), GetSystemMetrics(SM_CYEDGE)); @@ -390,11 +387,8 @@ BOOL WINAPI AdjustWindowRect( LPRECT rect, DWORD style, BOOL menu ) */ BOOL WINAPI AdjustWindowRectEx( LPRECT rect, DWORD style, BOOL menu, DWORD exStyle ) { - /* Correct the window style */ - style &= (WS_DLGFRAME | WS_BORDER | WS_THICKFRAME | WS_CHILD); - exStyle &= (WS_EX_DLGMODALFRAME | WS_EX_CLIENTEDGE | - WS_EX_STATICEDGE | WS_EX_TOOLWINDOW); - if (exStyle & WS_EX_DLGMODALFRAME) style &= ~WS_THICKFRAME; + if (style & WS_ICONIC) return TRUE; + style &= ~(WS_HSCROLL | WS_VSCROLL); TRACE("(%s) %08x %d %08x\n", wine_dbgstr_rect(rect), style, menu, exStyle ); @@ -424,7 +418,7 @@ LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect ) if (cls_style & CS_VREDRAW) result |= WVR_VREDRAW; if (cls_style & CS_HREDRAW) result |= WVR_HREDRAW; - if (!IsIconic(hwnd)) + if (!(style & WS_ICONIC)) { NC_AdjustRectOuter( &tmpRect, style, FALSE, exStyle );

1 0

Andrew Eikum : cryptnet/tests: Use UrlCanonicalize to create a URL.
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

Module: wine Branch: master Commit: 35f8d7397b538948dab447953207420bc5029d5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f8d7397b538948dab447953… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 11 11:17:26 2010 -0500 cryptnet/tests: Use UrlCanonicalize to create a URL. --- dlls/cryptnet/tests/Makefile.in | 2 +- dlls/cryptnet/tests/cryptnet.c | 17 +++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/cryptnet/tests/Makefile.in b/dlls/cryptnet/tests/Makefile.in index 7fe1e32..2cef5b6 100644 --- a/dlls/cryptnet/tests/Makefile.in +++ b/dlls/cryptnet/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = cryptnet.dll -IMPORTS = cryptnet crypt32 +IMPORTS = cryptnet crypt32 shlwapi C_SRCS = \ cryptnet.c diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index b8da671..aab3724 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -24,6 +24,7 @@ #include <winbase.h> #include <winerror.h> #include <wincrypt.h> +#include <shlwapi.h> #include "wine/test.h" static const BYTE bigCert[] = { @@ -316,13 +317,14 @@ static void make_tmp_file(LPSTR path) static void test_retrieveObjectByUrl(void) { BOOL ret; - char tmpfile[MAX_PATH * 2], *ptr, url[MAX_PATH + 8]; + char tmpfile[MAX_PATH * 2], url[MAX_PATH + 8]; CRYPT_BLOB_ARRAY *pBlobArray; PCCERT_CONTEXT cert; PCCRL_CONTEXT crl; HCERTSTORE store; CRYPT_RETRIEVE_AUX_INFO aux = { 0 }; FILETIME ft = { 0 }; + DWORD urllen; SetLastError(0xdeadbeef); ret = CryptRetrieveObjectByUrlA(NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL); @@ -332,17 +334,8 @@ static void test_retrieveObjectByUrl(void) GetLastError(), GetLastError()); make_tmp_file(tmpfile); - ptr = strchr(tmpfile, ':'); - if (ptr) - ptr += 2; /* skip colon and first slash */ - else - ptr = tmpfile; - snprintf(url, sizeof(url), "file:///%s", ptr); - do { - ptr = strchr(url, '\\'); - if (ptr) - *ptr = '/'; - } while (ptr); + urllen = sizeof(url); + UrlCanonicalizeA(tmpfile, url, &urllen, URL_WININET_COMPATIBILITY); pBlobArray = (CRYPT_BLOB_ARRAY *)0xdeadbeef; ret = CryptRetrieveObjectByUrlA(url, NULL, 0, 0, (void **)&pBlobArray,

1 0

David Adam : ddraw/test: Add more combination tests for SetCooperativeLevels.
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

Module: wine Branch: master Commit: a8740a46678fd1b044eae22396eea01f93f39af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8740a46678fd1b044eae2239… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Mon Oct 11 11:50:35 2010 +0200 ddraw/test: Add more combination tests for SetCooperativeLevels. --- dlls/ddraw/tests/ddrawmodes.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 8235d86..709ea5d 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -558,7 +558,36 @@ static void testcooperativelevels_normal(void) surfacedesc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; /* Do some tests with DDSCL_NORMAL mode */ - + /* Fullscreen mode + normal mode + exclusive mode */ + rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE | DDSCL_NORMAL); + todo_wine ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE | DDSCL_NORMAL) returned: %x\n",rc); + /* Try creating a double buffered primary in fullscreen + exclusive + normal mode */ + rc = IDirectDraw_CreateSurface(lpDD, &surfacedesc, &surface, NULL); + if (rc == DDERR_UNSUPPORTEDMODE) + skip("Unsupported mode\n"); + else + { + todo_wine ok(rc == DD_OK, "IDirectDraw_CreateSurface returned %08x\n", rc); + todo_wine ok(surface!=NULL, "Returned NULL surface pointer \n"); + } + if(surface && surface != (IDirectDrawSurface *)0xdeadbeef) IDirectDrawSurface_Release(surface); + /* Exclusive mode + normal mode */ + rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_EXCLUSIVE | DDSCL_NORMAL); + ok(rc==DDERR_INVALIDPARAMS,"SetCooperativeLevel(DDSCL_EXCLUSIVE | DDSCL_NORMAL) returned: %x\n",rc); + /* Fullscreen mode + normal mode */ + rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_FULLSCREEN | DDSCL_NORMAL); + todo_wine ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_FULLSCREEN | DDSCL_NORMAL) returned: %x\n",rc); + /* Try creating a double buffered primary in fullscreen + normal mode */ + rc = IDirectDraw_CreateSurface(lpDD, &surfacedesc, &surface, NULL); + if (rc == DDERR_UNSUPPORTEDMODE) + skip("Unsupported mode\n"); + else + { + ok(rc == DDERR_NOEXCLUSIVEMODE, "IDirectDraw_CreateSurface returned %08x\n", rc); + ok(surface == NULL, "Returned surface pointer is %p\n", surface); + } + if(surface && surface != (IDirectDrawSurface *)0xdeadbeef) IDirectDrawSurface_Release(surface); + /* Normal mode */ rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_NORMAL); ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_NORMAL) returned: %x\n",rc);

1 0