September 2013 - Wine-commits

Dmitry Timoshkov : kernel32/tests: Add a file access test.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: 6a6b4c5000fb3f800291af8f62d4f83eddb7efe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6b4c5000fb3f800291af8f6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 13 18:35:01 2013 +0900 kernel32/tests: Add a file access test. --- dlls/kernel32/tests/file.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index b0de968..d7a8776 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3806,6 +3806,87 @@ static void test_SetFileValidData(void) DeleteFile(filename); } +static void test_file_access(void) +{ + static const struct + { + int access, create_error, write_error, read_error; + } td[] = + { + { GENERIC_READ | GENERIC_WRITE, 0, 0, 0 }, + { GENERIC_WRITE, 0, 0, ERROR_ACCESS_DENIED }, + { GENERIC_READ, 0, ERROR_ACCESS_DENIED, 0 }, + { FILE_READ_DATA | FILE_WRITE_DATA, 0, 0, 0 }, + { FILE_WRITE_DATA, 0, 0, ERROR_ACCESS_DENIED }, + { FILE_READ_DATA, 0, ERROR_ACCESS_DENIED, 0 }, + { 0, 0, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED }, + }; + char path[MAX_PATH], fname[MAX_PATH]; + unsigned char buf[16]; + HANDLE hfile; + DWORD i, ret, bytes; + + GetTempPath(MAX_PATH, path); + GetTempFileName(path, "foo", 0, fname); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + SetLastError(0xdeadbeef); + hfile = CreateFile(fname, td[i].access, 0, NULL, CREATE_ALWAYS, + FILE_FLAG_DELETE_ON_CLOSE, 0); + if (td[i].create_error) + { + ok(hfile == INVALID_HANDLE_VALUE, "%d: CreateFile should fail\n", i); + ok(td[i].create_error == GetLastError(), "%d: expected %d, got %d\n", i, td[i].create_error, GetLastError()); + continue; + } + else + ok(hfile != INVALID_HANDLE_VALUE, "%d: CreateFile error %d\n", i, GetLastError()); + + SetLastError(0xdeadbeef); + bytes = 0xdeadbeef; + ret = WriteFile(hfile, "\x5e\xa7", 2, &bytes, NULL); + if (td[i].write_error) + { + ok(!ret, "%d: WriteFile should fail\n", i); + ok(td[i].write_error == GetLastError(), "%d: expected %d, got %d\n", i, td[i].write_error, GetLastError()); + ok(bytes == 0, "%d: expected 0, got %u\n", i, bytes); + } + else + { + ok(ret, "%d: WriteFile error %d\n", i, GetLastError()); + ok(bytes == 2, "%d: expected 2, got %u\n", i, bytes); + } + + SetLastError(0xdeadbeef); + ret = SetFilePointer(hfile, 0, NULL, FILE_BEGIN); + ok(ret != INVALID_SET_FILE_POINTER, "SetFilePointer error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + bytes = 0xdeadbeef; + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); + if (td[i].read_error) + { + ok(!ret, "%d: ReadFile should fail\n", i); + ok(td[i].read_error == GetLastError(), "%d: expected %d, got %d\n", i, td[i].read_error, GetLastError()); + ok(bytes == 0, "%d: expected 0, got %u\n", i, bytes); + } + else + { + ok(ret, "%d: ReadFile error %d\n", i, GetLastError()); + if (td[i].write_error) + ok(bytes == 0, "%d: expected 0, got %u\n", i, bytes); + else + { + ok(bytes == 2, "%d: expected 2, got %u\n", i, bytes); + ok(buf[0] == 0x5e && buf[1] == 0xa7, "%d: expected 5ea7, got %02x%02x\n", i, buf[0], buf[1]); + } + } + + CloseHandle(hfile); + } +} + START_TEST(file) { InitFunctionPointers(); @@ -3849,4 +3930,5 @@ START_TEST(file) test_GetFileInformationByHandleEx(); test_OpenFileById(); test_SetFileValidData(); + test_file_access(); }

1 0

Huw Davies : fonts: Add some box-type glyphs to wingdings.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: 73e0efac9d3dffbea748d19b6618a1eac47ac566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73e0efac9d3dffbea748d19b6… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 13 11:20:53 2013 +0100 fonts: Add some box-type glyphs to wingdings. --- fonts/wingding.sfd | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++- fonts/wingding.ttf | Bin 6052 -> 6296 bytes 2 files changed, 85 insertions(+), 1 deletions(-) diff --git a/fonts/wingding.sfd b/fonts/wingding.sfd index 7ba549f..ed3400e 100644 --- a/fonts/wingding.sfd +++ b/fonts/wingding.sfd @@ -51,7 +51,7 @@ AntiAlias: 1 FitToEm: 1 WinInfo: 0 33 12 TeXData: 1 0 0 708670 354335 236222 1342177 -2147484 236222 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 256 26 +BeginChars: 256 30 StartChar: f020 Encoding: 0 61472 0 @@ -602,5 +602,89 @@ SplineSet 735.665 1141 735.665 1141 1497 1560 c 1,0,1 EndSplineSet EndChar + +StartChar: boxshadowdwn +Encoding: 113 952 26 +Width: 1825 +Flags: W +LayerCount: 2 +Fore +SplineSet +300 300 m 1,0,-1 + 1300 300 l 1,1,-1 + 1300 1300 l 1,2,-1 + 300 1300 l 1,3,-1 + 300 300 l 1,0,-1 +400 0 m 1,4,-1 + 200 200 l 1,5,-1 + 200 1400 l 1,6,-1 + 1400 1400 l 1,7,-1 + 1600 1200 l 1,8,-1 + 1600 0 l 1,9,-1 + 400 0 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: boxshadowup +Encoding: 114 961 27 +Width: 1825 +Flags: W +LayerCount: 2 +Fore +SplineSet +1300 100 m 1,0,-1 + 1300 1100 l 1,1,-1 + 300 1100 l 1,2,-1 + 300 100 l 1,3,-1 + 1300 100 l 1,0,-1 +1600 200 m 1,4,-1 + 1400 0 l 1,5,-1 + 200 0 l 1,6,-1 + 200 1200 l 1,7,-1 + 400 1400 l 1,8,-1 + 1600 1400 l 1,9,-1 + 1600 200 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: box3 +Encoding: 111 959 28 +Width: 1825 +Flags: W +LayerCount: 2 +Fore +SplineSet +372 200 m 1,0,-1 + 1452 200 l 1,1,-1 + 1452 1280 l 1,2,-1 + 372 1280 l 1,3,-1 + 372 200 l 1,0,-1 +172 0 m 1,4,-1 + 172 1480 l 1,5,-1 + 1652 1480 l 1,6,-1 + 1652 0 l 1,7,-1 + 172 0 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: box4 +Encoding: 112 960 29 +Width: 1825 +Flags: W +LayerCount: 2 +Fore +SplineSet +472 300 m 1,0,-1 + 1352 300 l 1,1,-1 + 1352 1180 l 1,2,-1 + 472 1180 l 1,3,-1 + 472 300 l 1,0,-1 +172 0 m 1,4,-1 + 172 1480 l 1,5,-1 + 1652 1480 l 1,6,-1 + 1652 0 l 1,7,-1 + 172 0 l 1,4,-1 +EndSplineSet +EndChar EndChars EndSplineFont diff --git a/fonts/wingding.ttf b/fonts/wingding.ttf index f5419ce..f867b97 100644 Binary files a/fonts/wingding.ttf and b/fonts/wingding.ttf differ

1 0

Huw Davies : iphlpapi/tests: Increase buffer size to prevent overflow.
by Alexandre Julliard 13 Sep '13

13 Sep '13

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

Huw Davies : iphlpapi: Move dns server enumeration to a single function.
by Alexandre Julliard 13 Sep '13

13 Sep '13

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: Add support for ip6 dns addresses.
by Alexandre Julliard 13 Sep '13

13 Sep '13

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

Francois Gouget : oleaut32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: 51e717345bd2d076a9918b8b804eb31957f1fb4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e717345bd2d076a9918b8b8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 12 23:55:23 2013 +0200 oleaut32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/oleaut32/tests/typelib.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 17a3b99..e1ede75 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4224,8 +4224,8 @@ static void test_SetVarHelpContext(void) ok(pdesc->memid == 0x40000000, "got wrong memid: %x\n", pdesc->memid); ok(pdesc->elemdescVar.tdesc.vt == VT_INT, "got wrong vardesc type: %u\n", pdesc->elemdescVar.tdesc.vt); ok(pdesc->varkind == VAR_CONST, "got wrong varkind: %u\n", pdesc->varkind); - ok(V_VT(U(pdesc)->lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(pdesc)->lpvarValue)); - ok(V_INT(U(pdesc)->lpvarValue) == 1, "got wrong value: 0x%x\n", V_INT(U(pdesc)->lpvarValue)); + ok(V_VT(U(*pdesc).lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(*pdesc).lpvarValue)); + ok(V_INT(U(*pdesc).lpvarValue) == 1, "got wrong value: 0x%x\n", V_INT(U(*pdesc).lpvarValue)); hr = ITypeInfo_GetDocumentation(ti, pdesc->memid, NULL, NULL, &ctx, NULL); ok(hr == S_OK, "got %08x\n", hr); @@ -4409,8 +4409,8 @@ static void test_SetVarDocString(void) ok(pdesc->memid == 0x40000000, "got wrong memid: %x\n", pdesc->memid); ok(pdesc->elemdescVar.tdesc.vt == VT_INT, "got wrong vardesc type: %u\n", pdesc->elemdescVar.tdesc.vt); ok(pdesc->varkind == VAR_CONST, "got wrong varkind: %u\n", pdesc->varkind); - ok(V_VT(U(pdesc)->lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(pdesc)->lpvarValue)); - ok(V_INT(U(pdesc)->lpvarValue) == 1, "got wrong value: 0x%x\n", V_INT(U(pdesc)->lpvarValue)); + ok(V_VT(U(*pdesc).lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(*pdesc).lpvarValue)); + ok(V_INT(U(*pdesc).lpvarValue) == 1, "got wrong value: 0x%x\n", V_INT(U(*pdesc).lpvarValue)); hr = ITypeInfo_GetDocumentation(ti, pdesc->memid, &namestr, &docstr, NULL, NULL); ok(hr == S_OK, "got %08x\n", hr);

1 0

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

13 Sep '13

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

Nikolay Sivov : kernel32/tests: Some tests for ProgID section.
by Alexandre Julliard 13 Sep '13

13 Sep '13

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

Nikolay Sivov : ntdll: Added compatible ProgID section.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: 84d9b2502e3d57aa89970d04dda04df507fd4c14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d9b2502e3d57aa89970d04d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 13 11:06:51 2013 +0400 ntdll: Added compatible ProgID section. --- dlls/kernel32/tests/actctx.c | 5 - dlls/ntdll/actctx.c | 248 +++++++++++++++++++++++++++++++++++++++++- dlls/ole32/tests/compobj.c | 18 +++ 3 files changed, 265 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84d9b2502e3d57aa89970…

1 0

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

13 Sep '13

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