September 2013 - Wine-Commits

Henri Verbeet : d3d9: Avoid LPVOID.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: 674b1e922d4d3050850a6e76e6a28ad24dbb8b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=674b1e922d4d3050850a6e76e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 13 10:18:13 2013 +0200 d3d9: Avoid LPVOID. --- dlls/d3d9/d3d9_main.c | 8 +++----- dlls/d3d9/tests/d3d9ex.c | 6 ++++-- dlls/d3d9/tests/visual.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 2059b98..d8c5e23 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -93,12 +93,10 @@ void* WINAPI Direct3DShaderValidatorCreate9(void) /******************************************************************* * DllMain */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { - /* At process attach */ - TRACE("fdwReason=%d\n", fdwReason); - if (fdwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hInstDLL); + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls(inst); return TRUE; } diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 470e8a4..f4f3327 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -30,8 +30,10 @@ static HMODULE d3d9_handle = 0; -static BOOL (WINAPI *pEnumDisplaySettingsExA)(LPCSTR, DWORD, DEVMODEA *, DWORD); -static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODE, HWND, DWORD, LPVOID); +static BOOL (WINAPI *pEnumDisplaySettingsExA)(const char *device_name, + DWORD mode_idx, DEVMODEA *mode, DWORD flags); +static LONG (WINAPI *pChangeDisplaySettingsExA)(const char *device_name, + DEVMODEA *mode, HWND window, DWORD flags, void *param); static IDirect3D9 * (WINAPI *pDirect3DCreate9)(UINT SDKVersion); static HRESULT (WINAPI *pDirect3DCreate9Ex)(UINT SDKVersion, IDirect3D9Ex **d3d9ex); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f047cd7..471c0d6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7268,7 +7268,7 @@ static void shademode_test(IDirect3DDevice9 *device) DWORD color0_gouraud = 0, color1_gouraud = 0; DWORD shademode = D3DSHADE_FLAT; DWORD primtype = D3DPT_TRIANGLESTRIP; - LPVOID data = NULL; + void *data = NULL; UINT i, j; struct vertex quad_strip[] = {

1 0

Huw Davies : iphlpapi: Add support for ip6 dns addresses.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: 2f25ddfd14fbaed48bc14a1fe946f38b260e1534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f25ddfd14fbaed48bc14a1fe… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 13 12:52:54 2013 +0100 iphlpapi: Add support for ip6 dns addresses. --- configure | 14 ++++++++++++ configure.ac | 6 +++++ dlls/iphlpapi/iphlpapi_main.c | 46 +++++++++++++++++++++++++++++++--------- include/config.h.in | 3 ++ 4 files changed, 58 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 5056a20..16678d3 100755 --- a/configure +++ b/configure @@ -14792,6 +14792,20 @@ _ACEOF fi +ac_fn_c_check_member "$LINENO" "struct __res_state" "_u._ext.nscount6" "ac_cv_member_struct___res_state__u__ext_nscount6" "#ifdef HAVE_RESOLV_H +#include <resolv.h> +#endif +" +if test "x$ac_cv_member_struct___res_state__u__ext_nscount6" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6 1 +_ACEOF + + +fi + + ac_fn_c_check_member "$LINENO" "ns_msg" "_msg_ptr" "ac_cv_member_ns_msg__msg_ptr" "#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif diff --git a/configure.ac b/configure.ac index 66b4dd6..96af299 100644 --- a/configure.ac +++ b/configure.ac @@ -2344,6 +2344,12 @@ AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,, #include <netinet/in.h> #endif]) +dnl Check for _u._ext.nscount6 +AC_CHECK_MEMBERS([struct __res_state._u._ext.nscount6],,, +[#ifdef HAVE_RESOLV_H +#include <resolv.h> +#endif]) + dnl Check for ns_msg ptr member AC_CHECK_MEMBERS([ns_msg._msg_ptr],,, [#ifdef HAVE_SYS_TYPES_H diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index fe24738..5f795ec 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -933,25 +933,46 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index return ERROR_SUCCESS; } -static int get_dns_servers( SOCKADDR_STORAGE *servers, int num ) +static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) { - int i; + int i, ip6_count = 0; SOCKADDR_STORAGE *addr; initialise_resolver(); - /* AF_INET6 not yet enumerated */ +#ifdef HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6 + ip6_count = _res._u._ext.nscount6; +#endif + if (!servers || !num) { num = _res.nscount; + if (ip4_only) num -= ip6_count; return num; } for (i = 0, addr = servers; addr < (servers + num) && i < _res.nscount; i++) { - *(struct sockaddr_in *)addr = _res.nsaddr_list[i]; - memset( (char *)addr + sizeof(struct sockaddr_in), 0, - sizeof(SOCKADDR_STORAGE) - sizeof(struct sockaddr_in) ); +#ifdef HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6 + if (_res._u._ext.nsaddrs[i]) + { + SOCKADDR_IN6 *s = (SOCKADDR_IN6 *)addr; + if (ip4_only) continue; + s->sin6_family = WS_AF_INET6; + s->sin6_port = _res._u._ext.nsaddrs[i]->sin6_port; + s->sin6_flowinfo = _res._u._ext.nsaddrs[i]->sin6_flowinfo; + memcpy( &s->sin6_addr, &_res._u._ext.nsaddrs[i]->sin6_addr, sizeof(IN6_ADDR) ); + s->sin6_scope_id = _res._u._ext.nsaddrs[i]->sin6_scope_id; + memset( (char *)s + sizeof(SOCKADDR_IN6), 0, + sizeof(SOCKADDR_STORAGE) - sizeof(SOCKADDR_IN6) ); + } + else +#endif + { + *(struct sockaddr_in *)addr = _res.nsaddr_list[i]; + memset( (char *)addr + sizeof(struct sockaddr_in), 0, + sizeof(SOCKADDR_STORAGE) - sizeof(struct sockaddr_in) ); + } addr++; } return addr - servers; @@ -959,7 +980,7 @@ static int get_dns_servers( SOCKADDR_STORAGE *servers, int num ) static ULONG get_dns_server_addresses(PIP_ADAPTER_DNS_SERVER_ADDRESS address, ULONG *len) { - int num = get_dns_servers( NULL, 0 ); + int num = get_dns_servers( NULL, 0, FALSE ); DWORD size; size = num * (sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS) + sizeof(SOCKADDR_STORAGE)); @@ -975,12 +996,15 @@ static ULONG get_dns_server_addresses(PIP_ADAPTER_DNS_SERVER_ADDRESS address, UL SOCKADDR_STORAGE *sock_addrs = (SOCKADDR_STORAGE *)(address + num); int i; - get_dns_servers( sock_addrs, num ); + get_dns_servers( sock_addrs, num, FALSE ); for (i = 0; i < num; i++, addr = addr->Next) { addr->u.s.Length = sizeof(*addr); - addr->Address.iSockaddrLength = sizeof(SOCKADDR_IN); + if (sock_addrs[i].ss_family == WS_AF_INET6) + addr->Address.iSockaddrLength = sizeof(SOCKADDR_IN6); + else + addr->Address.iSockaddrLength = sizeof(SOCKADDR_IN); addr->Address.lpSockaddr = (SOCKADDR *)(sock_addrs + i); if (i == num - 1) addr->Next = NULL; @@ -1637,7 +1661,7 @@ static DWORD get_dns_server_list(PIP_ADDR_STRING list, PIP_ADDR_STRING firstDynamic, DWORD *len) { DWORD size; - int num = get_dns_servers( NULL, 0 ); + int num = get_dns_servers( NULL, 0, TRUE ); size = num * sizeof(IP_ADDR_STRING); if (!list || *len < size) { @@ -1650,7 +1674,7 @@ static DWORD get_dns_server_list(PIP_ADDR_STRING list, int i; SOCKADDR_STORAGE *addr = HeapAlloc( GetProcessHeap(), 0, num * sizeof(SOCKADDR_STORAGE) ); - get_dns_servers( addr, num ); + get_dns_servers( addr, num, TRUE ); for (i = 0, ptr = list; i < num; i++, ptr = ptr->Next) { toIPAddressString(((struct sockaddr_in *)(addr + i))->sin_addr.s_addr, diff --git a/include/config.h.in b/include/config.h.in index 44b34ce..2ab1081 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -912,6 +912,9 @@ /* Define to 1 if the system has the type `struct xinpgen'. */ #undef HAVE_STRUCT_XINPGEN +/* Define to 1 if `_u._ext.nscount6' is a member of `struct __res_state'. */ +#undef HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6 + /* Define to 1 if you have the `symlink' function. */ #undef HAVE_SYMLINK

1 0

Huw Davies : iphlpapi: Move dns server enumeration to a single function.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: 334875f38ed2b810be9f190c8c691de4c7e9b3cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=334875f38ed2b810be9f190c8… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 13 12:52:53 2013 +0100 iphlpapi: Move dns server enumeration to a single function. --- dlls/iphlpapi/iphlpapi_main.c | 76 +++++++++++++++++++++++++--------------- 1 files changed, 47 insertions(+), 29 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 670713f..fe24738 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -933,45 +933,59 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index return ERROR_SUCCESS; } +static int get_dns_servers( SOCKADDR_STORAGE *servers, int num ) +{ + int i; + SOCKADDR_STORAGE *addr; + + initialise_resolver(); + + /* AF_INET6 not yet enumerated */ + if (!servers || !num) + { + num = _res.nscount; + return num; + } + + for (i = 0, addr = servers; addr < (servers + num) && i < _res.nscount; i++) + { + *(struct sockaddr_in *)addr = _res.nsaddr_list[i]; + memset( (char *)addr + sizeof(struct sockaddr_in), 0, + sizeof(SOCKADDR_STORAGE) - sizeof(struct sockaddr_in) ); + addr++; + } + return addr - servers; +} + static ULONG get_dns_server_addresses(PIP_ADAPTER_DNS_SERVER_ADDRESS address, ULONG *len) { + int num = get_dns_servers( NULL, 0 ); 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)); + size = num * (sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS) + sizeof(SOCKADDR_STORAGE)); if (!address || *len < size) { *len = size; return ERROR_BUFFER_OVERFLOW; } *len = size; - if (_res.nscount > 0) + if (num > 0) { - PIP_ADAPTER_DNS_SERVER_ADDRESS addr; + PIP_ADAPTER_DNS_SERVER_ADDRESS addr = address; + SOCKADDR_STORAGE *sock_addrs = (SOCKADDR_STORAGE *)(address + num); int i; - for (i = 0, addr = address; i < _res.nscount && addr; - i++, addr = addr->Next) + get_dns_servers( sock_addrs, num ); + + for (i = 0; i < num; 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->u.s.Length = sizeof(*addr); + addr->Address.iSockaddrLength = sizeof(SOCKADDR_IN); + addr->Address.lpSockaddr = (SOCKADDR *)(sock_addrs + i); + if (i == num - 1) addr->Next = NULL; else - addr->Next = - (PIP_ADAPTER_DNS_SERVER_ADDRESS)((PBYTE)addr + - sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS) + sizeof(SOCKADDR)); + addr->Next = addr + 1; } } return ERROR_SUCCESS; @@ -1623,28 +1637,32 @@ static DWORD get_dns_server_list(PIP_ADDR_STRING list, PIP_ADDR_STRING firstDynamic, DWORD *len) { DWORD size; + int num = get_dns_servers( NULL, 0 ); - initialise_resolver(); - size = _res.nscount * sizeof(IP_ADDR_STRING); + size = num * sizeof(IP_ADDR_STRING); if (!list || *len < size) { *len = size; return ERROR_BUFFER_OVERFLOW; } *len = size; - if (_res.nscount > 0) { + if (num > 0) { PIP_ADDR_STRING ptr; int i; + SOCKADDR_STORAGE *addr = HeapAlloc( GetProcessHeap(), 0, num * sizeof(SOCKADDR_STORAGE) ); + + get_dns_servers( addr, num ); - for (i = 0, ptr = list; i < _res.nscount && ptr; i++, ptr = ptr->Next) { - toIPAddressString(_res.nsaddr_list[i].sin_addr.s_addr, + for (i = 0, ptr = list; i < num; i++, ptr = ptr->Next) { + toIPAddressString(((struct sockaddr_in *)(addr + i))->sin_addr.s_addr, ptr->IpAddress.String); - if (i == _res.nscount - 1) + if (i == num - 1) ptr->Next = NULL; else if (i == 0) ptr->Next = firstDynamic; else ptr->Next = (PIP_ADDR_STRING)((PBYTE)ptr + sizeof(IP_ADDR_STRING)); } + HeapFree( GetProcessHeap(), 0, addr ); } return ERROR_SUCCESS; }

1 0

Huw Davies : iphlpapi/tests: Increase buffer size to prevent overflow.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: 01d5632e5e9c730167f751bf74c72b9818799312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01d5632e5e9c730167f751bf7… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 13 12:52:52 2013 +0100 iphlpapi/tests: Increase buffer size to prevent overflow. --- dlls/iphlpapi/tests/iphlpapi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index dcbd3ab..032ac06 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -303,7 +303,7 @@ static void testGetIpForwardTable(void) trace( "IP forward table: %u entries\n", buf->dwNumEntries ); for (i = 0; i < buf->dwNumEntries; i++) { - char buffer[40]; + char buffer[100]; sprintf( buffer, "dest %s", ntoa( buf->table[i].dwForwardDest )); sprintf( buffer + strlen(buffer), " mask %s", ntoa( buf->table[i].dwForwardMask )); trace( "%u: %s gw %s if %u type %u\n", i, buffer,

1 0

Aric Stewart : user32: Use Uniscribe ScriptBreak and the resulting Unicode Line Break algorithm to break lines for DT_WORDBREAK .
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: 4247e80a797944cee3e58ceba6b2757094f10632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4247e80a797944cee3e58ceba… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 12 10:45:51 2013 -0500 user32: Use Uniscribe ScriptBreak and the resulting Unicode Line Break algorithm to break lines for DT_WORDBREAK. --- dlls/user32/text.c | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 338cba2..a32792e 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -38,6 +38,7 @@ #include "wine/unicode.h" #include "winnls.h" #include "controls.h" +#include "usp10.h" #include "user_private.h" #include "wine/debug.h" @@ -357,24 +358,40 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, { WCHAR *p; int word_fits; + SCRIPT_LOGATTR *sla; + SCRIPT_ANALYSIS sa; + int i; + assert (format & DT_WORDBREAK); assert (chars_fit < *len_str); + sla = HeapAlloc(GetProcessHeap(), 0, sizeof(SCRIPT_LOGATTR) * *len_str); + + memset(&sa, 0, sizeof(SCRIPT_ANALYSIS)); + sa.eScript = SCRIPT_UNDEFINED; + + ScriptBreak(str, *len_str, &sa, sla); + /* Work back from the last character that did fit to either a space or the * last character of a word, whichever is met first. */ p = str + chars_fit; /* The character that doesn't fit */ + i = chars_fit; word_fits = TRUE; if (!chars_fit) ; /* we pretend that it fits anyway */ - else if (*p == SPACE) /* chars_fit < *len_str so this is valid */ - p--; /* the word just fitted */ + else if (sla[i].fSoftBreak) /* chars_fit < *len_str so this is valid */ + { + /* the word just fitted */ + p--; + } else { - while (p > str && *(--p) != SPACE) - ; - word_fits = (p != str || *p == SPACE); + while (i > 0 && !sla[(--i)+1].fSoftBreak) p--; + p--; + word_fits = (i != 0 || sla[i+1].fSoftBreak ); } + /* If there was one or the first character didn't fit then */ if (word_fits) { @@ -427,6 +444,7 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, } /* Remeasure the string */ GetTextExtentExPointW (hdc, str, *len_str, 0, NULL, NULL, size); + HeapFree(GetProcessHeap(),0, sla); } /*********************************************************************

1 0

Henri Verbeet : wined3d: Just set the first render target to NULL in wined3d_device_reset().
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: 3c023a5db5538a7622d4518e8ce24d36e1c459b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c023a5db5538a7622d4518e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 13 10:18:10 2013 +0200 wined3d: Just set the first render target to NULL in wined3d_device_reset(). --- dlls/wined3d/device.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 046f5fd..561525b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4704,14 +4704,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (device->fb.render_targets) { - if (swapchain->back_buffers && swapchain->back_buffers[0]) - wined3d_device_set_render_target(device, 0, swapchain->back_buffers[0], FALSE); - else - wined3d_device_set_render_target(device, 0, swapchain->front_buffer, FALSE); - for (i = 1; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { wined3d_device_set_render_target(device, i, NULL, FALSE); } + if (swapchain->back_buffers && swapchain->back_buffers[0]) + wined3d_device_set_render_target(device, 0, swapchain->back_buffers[0], FALSE); } wined3d_device_set_depth_stencil(device, NULL);

1 0

Henri Verbeet : wined3d: Just set the first render target to NULL in wined3d_device_uninit_3d().
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: def0558b45aa5c071645fa29d004d70d372443ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=def0558b45aa5c071645fa29d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 13 10:18:09 2013 +0200 wined3d: Just set the first render target to NULL in wined3d_device_uninit_3d(). --- dlls/wined3d/device.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 656a3e9..046f5fd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1130,18 +1130,11 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) FIXME("Something's still holding the auto depth stencil buffer (%p).\n", surface); } - for (i = 1; i < gl_info->limits.buffers; ++i) + for (i = 0; i < gl_info->limits.buffers; ++i) { wined3d_device_set_render_target(device, i, NULL, FALSE); } - surface = device->fb.render_targets[0]; - TRACE("Setting rendertarget 0 to NULL\n"); - device->fb.render_targets[0] = NULL; - TRACE("Releasing the render target at %p\n", surface); - if (surface) - wined3d_surface_decref(surface); - context_release(context); for (i = 0; i < device->swapchain_count; ++i)

1 0

Dmitry Timoshkov : ntdll: NtWriteFile should fail for overlapped IO on files if offset is negative.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: 9e50cc540ac04a0ef5789c170dc62ee30f35bd4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e50cc540ac04a0ef5789c170… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 13 15:45:37 2013 +0900 ntdll: NtWriteFile should fail for overlapped IO on files if offset is negative. --- dlls/ntdll/file.c | 2 +- dlls/ntdll/tests/file.c | 14 -------------- 2 files changed, 1 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index f7f80e6..dd67b3d 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -961,7 +961,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (type == FD_TYPE_FILE) { - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && !offset) + if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && (!offset || offset->QuadPart < 0)) { status = STATUS_INVALID_PARAMETER; goto done; diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 0b2a764..120fdac 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2198,9 +2198,6 @@ todo_wine for (i = -20; i < -1; i++) { - /* FIXME: Remove once Wine is fixed */ - if (i == -2) continue; - iob.Status = -1; iob.Information = -1; offset.QuadPart = (LONGLONG)i; @@ -2212,17 +2209,6 @@ todo_wine iob.Status = -1; iob.Information = -1; - offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; - status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); -todo_wine - ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); -todo_wine - ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); -todo_wine - ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); - - iob.Status = -1; - iob.Information = -1; offset.QuadPart = 0; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); todo_wine

1 0

Nikolay Sivov : kernel32/tests: Some tests for ProgID section.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: b8a973dc526b8dc3ed9265b13cc63403b04eaa47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a973dc526b8dc3ed9265b13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 13 00:14:37 2013 +0400 kernel32/tests: Some tests for ProgID section. --- dlls/kernel32/tests/actctx.c | 117 ++++++++++++++++++++++++++++++++++++++--- dlls/ntdll/actctx.c | 13 +++-- 2 files changed, 116 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8a973dc526b8dc3ed926…

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: 15b6ff20236e4546b1c5e9c4b0f657f59ff54d61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b6ff20236e4546b1c5e9c4b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 12 23:55:46 2013 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw4.c | 8 ++++---- dlls/ddraw/tests/ddraw7.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 21a2d40..348b13c 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4063,9 +4063,9 @@ static void test_block_formats_creation(void) ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; ddsd.ddsCaps.dwCaps = types[j].caps; ddsd.ddsCaps.dwCaps2 = types[j].caps2; - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); - ddsd.ddpfPixelFormat.dwFlags = DDPF_FOURCC; - ddsd.ddpfPixelFormat.dwFourCC = formats[i].fourcc; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_FOURCC; + U4(ddsd).ddpfPixelFormat.dwFourCC = formats[i].fourcc; ddsd.dwWidth = w; ddsd.dwHeight = h; @@ -4189,7 +4189,7 @@ static void test_unsupported_formats(void) memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; - ddsd.ddpfPixelFormat = formats[i].fmt; + U4(ddsd).ddpfPixelFormat = formats[i].fmt; ddsd.dwWidth = 4; ddsd.dwHeight = 4; ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | caps[j]; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index ebfb16f..7f75cc7 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3876,9 +3876,9 @@ static void test_block_formats_creation(void) ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; ddsd.ddsCaps.dwCaps = types[j].caps; ddsd.ddsCaps.dwCaps2 = types[j].caps2; - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); - ddsd.ddpfPixelFormat.dwFlags = DDPF_FOURCC; - ddsd.ddpfPixelFormat.dwFourCC = formats[i].fourcc; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_FOURCC; + U4(ddsd).ddpfPixelFormat.dwFourCC = formats[i].fourcc; ddsd.dwWidth = w; ddsd.dwHeight = h; @@ -4002,7 +4002,7 @@ static void test_unsupported_formats(void) memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; - ddsd.ddpfPixelFormat = formats[i].fmt; + U4(ddsd).ddpfPixelFormat = formats[i].fmt; ddsd.dwWidth = 4; ddsd.dwHeight = 4; ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | caps[j];

1 0