September 2013 - Wine-commits

Huw Davies : iphlpapi: Add interface enumeration for Android.
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: 21dc848378318519d28a535517fe0997e63f3fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21dc848378318519d28a53551… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 19 15:39:21 2013 +0100 iphlpapi: Add interface enumeration for Android. --- configure | 3 +- configure.ac | 3 +- dlls/iphlpapi/ifenum.c | 200 +++++++++++++++++++++++++++++++++++++++++++++++- include/config.h.in | 6 ++ 4 files changed, 209 insertions(+), 3 deletions(-) diff --git a/configure b/configure index e6f6971..a2f8e22 100755 --- a/configure +++ b/configure @@ -6235,7 +6235,7 @@ fi done -for ac_header in linux/ipx.h linux/irda.h +for ac_header in linux/ipx.h linux/irda.h linux/rtnetlink.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <sys/types.h> @@ -13405,6 +13405,7 @@ for ac_func in \ getpwuid \ gettimeofday \ getuid \ + if_nameindex \ kqueue \ lstat \ memmove \ diff --git a/configure.ac b/configure.ac index e03928c..b687119 100644 --- a/configure.ac +++ b/configure.ac @@ -606,7 +606,7 @@ AC_CHECK_HEADERS([netinet/tcp_timer.h netinet/udp_var.h netinet/icmp_var.h netin #include <netinet/tcp_timer.h> #endif]) -AC_CHECK_HEADERS([linux/ipx.h linux/irda.h],,, +AC_CHECK_HEADERS([linux/ipx.h linux/irda.h linux/rtnetlink.h],,, [#include <sys/types.h> #ifdef HAVE_ASM_TYPES_H # include <asm/types.h> @@ -2032,6 +2032,7 @@ AC_CHECK_FUNCS(\ getpwuid \ gettimeofday \ getuid \ + if_nameindex \ kqueue \ lstat \ memmove \ diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 6ad08a8..03c1b1a 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -79,6 +79,10 @@ #include <ifaddrs.h> #endif +#ifdef HAVE_LINUX_RTNETLINK_H +#include <linux/rtnetlink.h> +#endif + #include "ifenum.h" #include "ws2ipdef.h" @@ -161,7 +165,7 @@ BOOL isIfIndexLoopback(ULONG idx) return ret; } - +#ifdef HAVE_IF_NAMEINDEX DWORD get_interface_indices( BOOL skip_loopback, InterfaceIndexTable **table ) { DWORD count = 0, i; @@ -199,6 +203,200 @@ end: return count; } +#elif defined(HAVE_LINUX_RTNETLINK_H) +static int open_netlink( int *pid ) +{ + int fd = socket( AF_NETLINK, SOCK_RAW, NETLINK_ROUTE ); + struct sockaddr_nl addr; + socklen_t len; + + if (fd < 0) return fd; + + memset( &addr, 0, sizeof(addr) ); + addr.nl_family = AF_NETLINK; + + if (bind( fd, (struct sockaddr *)&addr, sizeof(addr) ) < 0) + goto fail; + + len = sizeof(addr); + if (getsockname( fd, (struct sockaddr *)&addr, &len ) < 0) + goto fail; + + *pid = addr.nl_pid; + return fd; +fail: + close( fd ); + return -1; +} + +static int send_netlink_req( int fd, int pid, int type, int *seq_no ) +{ + static LONG seq; + struct request + { + struct nlmsghdr hdr; + struct rtgenmsg gen; + } req; + struct sockaddr_nl addr; + + req.hdr.nlmsg_len = sizeof(req); + req.hdr.nlmsg_type = type; + req.hdr.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST; + req.hdr.nlmsg_pid = pid; + req.hdr.nlmsg_seq = InterlockedIncrement( &seq ); + req.gen.rtgen_family = AF_UNSPEC; + + memset( &addr, 0, sizeof(addr) ); + addr.nl_family = AF_NETLINK; + if (sendto( fd, &req, sizeof(req), 0, (struct sockaddr *)&addr, sizeof(addr) ) != sizeof(req)) + return -1; + *seq_no = req.hdr.nlmsg_seq; + return 0; +} + +struct netlink_reply +{ + struct netlink_reply *next; + int size; + struct nlmsghdr *hdr; +}; + +static void free_netlink_reply( struct netlink_reply *data ) +{ + struct netlink_reply *ptr; + while( data ) + { + ptr = data->next; + HeapFree( GetProcessHeap(), 0, data ); + data = ptr; + } +} + +static int recv_netlink_reply( int fd, int pid, int seq, struct netlink_reply **data ) +{ + int bufsize = getpagesize(); + int left, read, done = 0; + socklen_t sa_len; + struct sockaddr_nl addr; + struct netlink_reply *cur, *last = NULL; + struct nlmsghdr *hdr; + char *buf; + + *data = NULL; + buf = HeapAlloc( GetProcessHeap(), 0, bufsize ); + if (!buf) return -1; + + do + { + left = read = recvfrom( fd, buf, bufsize, 0, (struct sockaddr *)&addr, &sa_len ); + if (read < 0) goto fail; + if (addr.nl_pid != 0) continue; /* not from kernel */ + + for (hdr = (struct nlmsghdr *)buf; NLMSG_OK(hdr, left); hdr = NLMSG_NEXT(hdr, left)) + { + if (hdr->nlmsg_pid != pid || hdr->nlmsg_seq != seq) continue; + if (hdr->nlmsg_type == NLMSG_DONE) + { + done = 1; + break; + } + } + + cur = HeapAlloc( GetProcessHeap(), 0, sizeof(*cur) + read ); + if (!cur) goto fail; + cur->next = NULL; + cur->size = read; + cur->hdr = (struct nlmsghdr *)(cur + 1); + memcpy( cur->hdr, buf, read ); + if (last) last->next = cur; + else *data = cur; + last = cur; + } while (!done); + + HeapFree( GetProcessHeap(), 0, buf ); + return 0; + +fail: + free_netlink_reply( *data ); + HeapFree( GetProcessHeap(), 0, buf ); + return -1; +} + + +static DWORD get_indices_from_reply( struct netlink_reply *reply, int pid, int seq, + BOOL skip_loopback, InterfaceIndexTable *table ) +{ + struct nlmsghdr *hdr; + struct netlink_reply *r; + int count = 0; + + for (r = reply; r; r = r->next) + { + int size = r->size; + for (hdr = r->hdr; NLMSG_OK(hdr, size); hdr = NLMSG_NEXT(hdr, size)) + { + if (hdr->nlmsg_pid != pid || hdr->nlmsg_seq != seq) continue; + if (hdr->nlmsg_type == NLMSG_DONE) break; + + if (hdr->nlmsg_type == RTM_NEWLINK) + { + struct ifinfomsg *info = NLMSG_DATA(hdr); + + if (skip_loopback && (info->ifi_flags & IFF_LOOPBACK)) continue; + if (table) table->indexes[count] = info->ifi_index; + count++; + } + } + } + return count; +} + +DWORD get_interface_indices( BOOL skip_loopback, InterfaceIndexTable **table ) +{ + int fd, pid, seq; + struct netlink_reply *reply = NULL; + DWORD count = 0; + + if (table) *table = NULL; + fd = open_netlink( &pid ); + if (fd < 0) return 0; + + if (send_netlink_req( fd, pid, RTM_GETLINK, &seq ) < 0) + goto end; + + if (recv_netlink_reply( fd, pid, seq, &reply ) < 0) + goto end; + + count = get_indices_from_reply( reply, pid, seq, skip_loopback, NULL ); + + if (table) + { + InterfaceIndexTable *ret = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(InterfaceIndexTable, indexes[count]) ); + if (!ret) + { + count = 0; + goto end; + } + + ret->numIndexes = count; + get_indices_from_reply( reply, pid, seq, skip_loopback, ret ); + *table = ret; + } + +end: + free_netlink_reply( reply ); + close( fd ); + return count; +} + +#else +DWORD get_interface_indices( BOOL skip_loopback, InterfaceIndexTable **table ) +{ + if (table) *table = NULL; + return 0; +} +#endif + static DWORD getInterfaceBCastAddrByName(const char *name) { DWORD ret = INADDR_ANY; diff --git a/include/config.h.in b/include/config.h.in index 62bee90..1f0bfea 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -258,6 +258,9 @@ /* Define to 1 if you have the <ifaddrs.h> header file. */ #undef HAVE_IFADDRS_H +/* Define to 1 if you have the `if_nameindex' function. */ +#undef HAVE_IF_NAMEINDEX + /* Define to 1 if you have the <inet/mib2.h> header file. */ #undef HAVE_INET_MIB2_H @@ -432,6 +435,9 @@ /* Define to 1 if you have the <linux/param.h> header file. */ #undef HAVE_LINUX_PARAM_H +/* Define to 1 if you have the <linux/rtnetlink.h> header file. */ +#undef HAVE_LINUX_RTNETLINK_H + /* Define to 1 if you have the <linux/serial.h> header file. */ #undef HAVE_LINUX_SERIAL_H

1 0

Huw Davies : iphlpapi: Use socklen_t where appropriate.
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: f9447f92ef9706fd9b6028c09c555b74c62d92f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9447f92ef9706fd9b6028c09… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 19 15:39:22 2013 +0100 iphlpapi: Use socklen_t where appropriate. --- dlls/iphlpapi/icmp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 6d26bb4..7d84811 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -223,7 +223,7 @@ DWORD WINAPI IcmpSendEcho( struct pollfd fdr; DWORD send_time,recv_time; struct sockaddr_in addr; - unsigned int addrlen; + socklen_t addrlen; unsigned short id,seq,cksum; int res; @@ -266,7 +266,7 @@ DWORD WINAPI IcmpSendEcho( if (RequestOptions!=NULL) { int val; if (icp->default_opts.OptionsSize==IP_OPTS_UNKNOWN) { - unsigned int len; + socklen_t len; /* Before we mess with the options, get the default values */ len=sizeof(val); getsockopt(icp->sid,IPPROTO_IP,IP_TTL,(char *)&val,&len);

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::SetFuncDocString.
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: 7f47beb7d84922d813b6eae19eb34a14f9b8a14e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f47beb7d84922d813b6eae19… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Sep 19 11:10:05 2013 -0500 oleaut32: Implement ICreateTypeInfo::SetFuncDocString. --- dlls/oleaut32/tests/typelib.c | 50 +++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib.c | 15 ++++++++++- 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index e1ede75..f560dd8 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4325,9 +4325,10 @@ static void test_SetFuncAndParamNames(void) DeleteFileA(filenameA); } -static void test_SetVarDocString(void) +static void test_SetDocString(void) { static OLECHAR nameW[] = {'n','a','m','e',0}; + static OLECHAR name2W[] = {'n','a','m','e','2',0}; static OLECHAR doc1W[] = {'d','o','c','1',0}; static OLECHAR doc2W[] = {'d','o','c','2',0}; static OLECHAR var_nameW[] = {'v','a','r','n','a','m','e',0}; @@ -4339,6 +4340,7 @@ static void test_SetVarDocString(void) ITypeInfo *ti; BSTR namestr, docstr; VARDESC desc, *pdesc; + FUNCDESC funcdesc, *pfuncdesc; HRESULT hr; VARIANT v; @@ -4393,6 +4395,29 @@ static void test_SetVarDocString(void) ICreateTypeInfo_Release(cti); + hr = ICreateTypeLib2_CreateTypeInfo(ctl, name2W, TKIND_INTERFACE, &cti); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncDocString(cti, 0, doc1W); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncDocString(cti, 0, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + memset(&funcdesc, 0, sizeof(funcdesc)); + funcdesc.memid = MEMBERID_NIL; + funcdesc.funckind = FUNC_PUREVIRTUAL; + funcdesc.invkind = INVOKE_FUNC; + funcdesc.callconv = CC_STDCALL; + + hr = ICreateTypeInfo_AddFuncDesc(cti, 0, &funcdesc); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncDocString(cti, 0, doc1W); + ok(hr == S_OK, "got %08x\n", hr); + + ICreateTypeInfo_Release(cti); + hr = ICreateTypeLib2_SaveAllChanges(ctl); ok(hr == S_OK, "got: %08x\n", hr); @@ -4422,6 +4447,27 @@ static void test_SetVarDocString(void) ITypeInfo_ReleaseVarDesc(ti, pdesc); ITypeInfo_Release(ti); + + hr = ITypeLib_GetTypeInfo(tl, 1, &ti); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeInfo_GetFuncDesc(ti, 0, &pfuncdesc); + ok(hr == S_OK, "got %08x\n", hr); + ok(pfuncdesc->memid == 0x60000000, "got wrong memid: %x\n", pfuncdesc->memid); + ok(pfuncdesc->funckind == FUNC_PUREVIRTUAL, "got wrong funckind: %x\n", pfuncdesc->funckind); + ok(pfuncdesc->invkind == INVOKE_FUNC, "got wrong invkind: %x\n", pfuncdesc->invkind); + ok(pfuncdesc->callconv == CC_STDCALL, "got wrong callconv: %x\n", pfuncdesc->callconv); + + hr = ITypeInfo_GetDocumentation(ti, pfuncdesc->memid, &namestr, &docstr, NULL, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(namestr == NULL, "got wrong name: %s\n", wine_dbgstr_w(namestr)); + ok(memcmp(docstr, doc1W, sizeof(doc1W)) == 0, "got wrong docstring: %s\n", wine_dbgstr_w(docstr)); + + SysFreeString(docstr); + + ITypeInfo_ReleaseFuncDesc(ti, pfuncdesc); + ITypeInfo_Release(ti); + ITypeLib_Release(tl); DeleteFileA(filenameA); @@ -5001,7 +5047,7 @@ START_TEST(typelib) test_inheritance(); test_SetVarHelpContext(); test_SetFuncAndParamNames(); - test_SetVarDocString(); + test_SetDocString(); test_FindName(); if ((filename = create_test_typelib(2))) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index afcdc5c..2877f1a 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -10722,8 +10722,19 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncDocString(ICreateTypeInfo2 *ifac UINT index, LPOLESTR docString) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %s - stub\n", This, index, wine_dbgstr_w(docString)); - return E_NOTIMPL; + TLBFuncDesc *func_desc = &This->funcdescs[index]; + + TRACE("%p %u %s\n", This, index, wine_dbgstr_w(docString)); + + if(!docString) + return E_INVALIDARG; + + if(index >= This->cFuncs) + return TYPE_E_ELEMENTNOTFOUND; + + func_desc->HelpString = TLB_append_str(&This->pTypeLib->string_list, docString); + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetVarDocString(ICreateTypeInfo2 *iface,

1 0

Piotr Caban : msvcp60: Don' t call _Eos on allocation error or 0-length string in basic_string::reserve .
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: bd610a66c4da5954e60a4c9f9a3fe38b135e73ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd610a66c4da5954e60a4c9f9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 19 11:58:55 2013 +0200 msvcp60: Don't call _Eos on allocation error or 0-length string in basic_string::reserve. --- dlls/msvcp60/string.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 6fe2780..1f64621 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -1714,8 +1714,8 @@ void __thiscall basic_string_char_reserve(basic_string_char *this, MSVCP_size_t if(len > size) return; - basic_string_char__Grow(this, size, FALSE); - basic_string_char__Eos(this, len); + if(basic_string_char__Grow(this, size, FALSE)) + basic_string_char__Eos(this, len); } /* ?empty@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE_NXZ */ @@ -3429,8 +3429,8 @@ void __thiscall basic_string_wchar_reserve(basic_string_wchar *this, MSVCP_size_ if(len > size) return; - basic_string_wchar__Grow(this, size, FALSE); - basic_string_wchar__Eos(this, len); + if(basic_string_wchar__Grow(this, size, FALSE)) + basic_string_wchar__Eos(this, len); } /* ?empty@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBE_NXZ */

1 0

Bruno Jesus : ws2_32/tests: Mark WinNT result as broken.
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: 5dcf368e1bdf0b5bbfe6303a99e91d7827e9bdb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dcf368e1bdf0b5bbfe6303a9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 19 09:17:05 2013 -0300 ws2_32/tests: Mark WinNT result as broken. --- dlls/ws2_32/tests/protocol.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 1b9a429..9c6d80d 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -100,7 +100,8 @@ static void test_WSAEnumProtocolsA(void) ret = WSAEnumProtocolsA( ptest, NULL, &len ); ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly\n"); error = WSAGetLastError(); - ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); + ok( error == WSAENOBUFS || broken(error == WSAEFAULT) /* NT4 */, + "Expected 10055, received %d\n", error); buffer = HeapAlloc( GetProcessHeap(), 0, len ); @@ -166,7 +167,8 @@ static void test_WSAEnumProtocolsW(void) ret = WSAEnumProtocolsW( ptest, NULL, &len ); ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly\n"); error = WSAGetLastError(); - ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); + ok( error == WSAENOBUFS || broken(error == WSAEFAULT) /* NT4 */, + "Expected 10055, received %d\n", error); buffer = HeapAlloc( GetProcessHeap(), 0, len );

1 0

Stefan Dösinger : d3d8/tests: Test invalid volume lock boxes.
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: 8aa65c79e77d758595465681aa86d29f67180fea URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aa65c79e77d758595465681a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 19 11:02:57 2013 +0200 d3d8/tests: Test invalid volume lock boxes. --- dlls/d3d8/tests/device.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 121 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c16ee63..7932a7f 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -5733,6 +5733,126 @@ static void test_volume_blocks(void) DestroyWindow(window); } +static void test_lockbox_invalid(void) +{ + static const struct + { + D3DBOX box; + HRESULT result; + } + test_data[] = + { + {{0, 0, 2, 2, 0, 1}, D3D_OK}, /* Valid */ + {{0, 0, 4, 4, 0, 1}, D3D_OK}, /* Valid */ + {{0, 0, 0, 4, 0, 1}, D3DERR_INVALIDCALL}, /* 0 height */ + {{0, 0, 4, 0, 0, 1}, D3DERR_INVALIDCALL}, /* 0 width */ + {{0, 0, 4, 4, 1, 1}, D3DERR_INVALIDCALL}, /* 0 depth */ + {{4, 0, 0, 4, 0, 1}, D3DERR_INVALIDCALL}, /* left > right */ + {{0, 4, 4, 0, 0, 1}, D3DERR_INVALIDCALL}, /* top > bottom */ + {{0, 0, 4, 4, 1, 0}, D3DERR_INVALIDCALL}, /* back > front */ + {{0, 0, 8, 4, 0, 1}, D3DERR_INVALIDCALL}, /* right > surface */ + {{0, 0, 4, 8, 0, 1}, D3DERR_INVALIDCALL}, /* bottom > surface */ + {{0, 0, 4, 4, 0, 3}, D3DERR_INVALIDCALL}, /* back > surface */ + {{8, 0, 16, 4, 0, 1}, D3DERR_INVALIDCALL}, /* left > surface */ + {{0, 8, 4, 16, 0, 1}, D3DERR_INVALIDCALL}, /* top > surface */ + {{0, 0, 4, 4, 2, 4}, D3DERR_INVALIDCALL}, /* top > surface */ + }; + static const D3DBOX test_boxt_2 = {2, 2, 4, 4, 0, 1}; + IDirect3DVolumeTexture8 *texture = NULL; + D3DLOCKED_BOX locked_box; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + unsigned int i; + ULONG refcount; + HWND window; + BYTE *base; + HRESULT hr; + + if (!(d3d = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create D3D object, skipping tests.\n"); + return; + } + + window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVolumeTexture(device, 4, 4, 2, 1, 0, + D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &texture); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + hr = IDirect3DVolumeTexture8_LockBox(texture, 0, &locked_box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + base = locked_box.pBits; + hr = IDirect3DVolumeTexture8_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + + for (i = 0; i < (sizeof(test_data) / sizeof(*test_data)); ++i) + { + unsigned int offset, expected_offset; + const D3DBOX *box = &test_data[i].box; + + locked_box.pBits = (BYTE *)0xdeadbeef; + locked_box.RowPitch = 0xdeadbeef; + locked_box.SlicePitch = 0xdeadbeef; + + hr = IDirect3DVolumeTexture8_LockBox(texture, 0, &locked_box, box, 0); + /* Unlike surfaces, volumes properly check the box even in Windows XP */ + ok(hr == test_data[i].result, + "Got unexpected hr %#x with box [%u, %u, %u]->[%u, %u, %u], expected %#x.\n", + hr, box->Left, box->Top, box->Front, box->Right, box->Bottom, box->Back, + test_data[i].result); + if (FAILED(hr)) + continue; + + offset = (BYTE *)locked_box.pBits - base; + expected_offset = box->Front * locked_box.SlicePitch + box->Top * locked_box.RowPitch + box->Left * 4; + ok(offset == expected_offset, + "Got unexpected offset %u (expected %u) for rect [%u, %u, %u]->[%u, %u, %u].\n", + offset, expected_offset, box->Left, box->Top, box->Front, box->Right, box->Bottom, box->Back); + + hr = IDirect3DVolumeTexture8_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + } + + /* locked_box = NULL throws an exception on Windows */ + hr = IDirect3DVolumeTexture8_LockBox(texture, 0, &locked_box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + hr = IDirect3DVolumeTexture8_LockBox(texture, 0, &locked_box, NULL, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVolumeTexture8_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + hr = IDirect3DVolumeTexture8_UnlockBox(texture, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVolumeTexture8_LockBox(texture, 0, &locked_box, &test_data[0].box, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x for rect [%u, %u, %u]->[%u, %u, %u].\n", + hr, test_data[0].box.Left, test_data[0].box.Top, test_data[0].box.Front, + test_data[0].box.Right, test_data[0].box.Bottom, test_data[0].box.Back); + hr = IDirect3DVolumeTexture8_LockBox(texture, 0, &locked_box, &test_data[0].box, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x for rect [%u, %u, %u]->[%u, %u, %u].\n", + hr, test_data[0].box.Left, test_data[0].box.Top, test_data[0].box.Front, + test_data[0].box.Right, test_data[0].box.Bottom, test_data[0].box.Back); + hr = IDirect3DVolumeTexture8_LockBox(texture, 0, &locked_box, &test_boxt_2, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x for rect [%u, %u, %u]->[%u, %u, %u].\n", + hr, test_boxt_2.Left, test_boxt_2.Top, test_boxt_2.Front, + test_boxt_2.Right, test_boxt_2.Bottom, test_boxt_2.Back); + hr = IDirect3DVolumeTexture8_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + + IDirect3DVolumeTexture8_Release(texture); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -5814,6 +5934,7 @@ START_TEST(device) test_update_volumetexture(); test_create_rt_ds_fail(); test_volume_blocks(); + test_lockbox_invalid(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Stefan Dösinger : wined3d: Pass a correct access flag to glMapBufferARB.
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: d15042837a8a8c44d81d6bdc2449606a63aabfa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15042837a8a8c44d81d6bdc2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 19 11:02:55 2013 +0200 wined3d: Pass a correct access flag to glMapBufferARB. --- dlls/wined3d/resource.c | 9 +++++++++ dlls/wined3d/volume.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index a24db3c..6a0a29b 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -419,3 +419,12 @@ GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) return ret; } + +GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) +{ + if (d3d_flags & WINED3D_MAP_READONLY) + return GL_READ_ONLY_ARB; + if (d3d_flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + return GL_WRITE_ONLY_ARB; + return GL_READ_WRITE_ARB; +} diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 9251a55..ea481a1 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -642,7 +642,8 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, } else { - base_memory = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + GLenum access = wined3d_resource_gl_legacy_map_flags(flags); + base_memory = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, access)); } GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f85bfec..a590b31 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2025,6 +2025,7 @@ void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HI DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; +GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; /* Tests show that the start address of resources is 32 byte aligned */ #define RESOURCE_ALIGNMENT 16

1 0

Stefan Dösinger : d3d8/tests: Add tests for block-based volume formats.
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: 9efed3d379c2a954ae36c5b6a771f2b56158c1f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9efed3d379c2a954ae36c5b6a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 19 11:02:56 2013 +0200 d3d8/tests: Add tests for block-based volume formats. --- dlls/d3d8/tests/device.c | 361 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 361 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9efed3d379c2a954ae36c…

1 0

Joško Nikolić : po: Update Croatian translation.
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: e5f61e6eaf479c086e935c7c4e44a7e33f689519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f61e6eaf479c086e935c7c4… Author: Joško Nikolić <josko.nikolic(a)fer.hr> Date: Thu Sep 19 04:32:44 2013 +0000 po: Update Croatian translation. --- po/hr.po | 506 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 259 insertions(+), 247 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5f61e6eaf479c086e935…

1 0

Ken Thomases : winemac: Use NSMouseInRect() instead of NSPointInRect() to compensate for Cocoa's off-by-one coordinate system.
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: 018d629b3cc6bf1d8424a73bbb00279223bfb323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=018d629b3cc6bf1d8424a73bb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 18 13:53:21 2013 -0500 winemac: Use NSMouseInRect() instead of NSPointInRect() to compensate for Cocoa's off-by-one coordinate system. This matches what Cocoa does when determining how to handle an event so that, for example, our test if a click is in the window grow box corresponds to whether Cocoa will run an internal mouse-tracking loop to resize the window when we pass it the event. This fixes a problem where both Cocoa and user32 would try to run a resize loop and the cursor would get "stuck" resizing the window after the button was released. --- dlls/winemac.drv/cocoa_app.m | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 615a9ab..afe0608 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1550,7 +1550,7 @@ int macdrv_err_on; // Test if the click was in the window's content area. NSPoint nspoint = [self flippedMouseLocation:NSPointFromCGPoint(pt)]; NSRect contentRect = [window contentRectForFrameRect:[window frame]]; - process = NSPointInRect(nspoint, contentRect); + process = NSMouseInRect(nspoint, contentRect, NO); if (process && [window styleMask] & NSResizableWindowMask) { // Ignore clicks in the grow box (resize widget). @@ -1573,7 +1573,7 @@ int macdrv_err_on; NSMinY(contentRect), bounds.size.width, bounds.size.height); - process = !NSPointInRect(nspoint, growBox); + process = !NSMouseInRect(nspoint, growBox, NO); } } } @@ -1643,7 +1643,7 @@ int macdrv_err_on; // Only process the event if it was in the window's content area. NSPoint nspoint = [self flippedMouseLocation:NSPointFromCGPoint(pt)]; NSRect contentRect = [window contentRectForFrameRect:[window frame]]; - process = NSPointInRect(nspoint, contentRect); + process = NSMouseInRect(nspoint, contentRect, NO); } if (process)

1 0