wine-devel July 2014

wine-devel@winehq.org

49 participants
158 discussions

Re: [PATCH 1/6] ddraw: Add validation to SetPriority / GetPriority.
by Henri Verbeet 15 Jul '14

15 Jul '14

On 15 July 2014 16:47, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > -static HRESULT WINAPI ddraw_surface7_SetPriority(IDirectDrawSurface7 *iface, DWORD Priority) > +static HRESULT WINAPI ddraw_surface7_SetPriority(IDirectDrawSurface7 *iface, DWORD priority) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); > + DWORD managed = DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE; > HRESULT hr; > > - TRACE("iface %p, priority %u.\n", iface, Priority); > + TRACE("iface %p, priority %u.\n", iface, priority); > > wined3d_mutex_lock(); > - hr = wined3d_surface_set_priority(surface->wined3d_surface, Priority); > + /* No need to check for offscreen plain surfaces or mipmap sublevels. SetPriority > + * calls on such surfaces segfault on Windows. */ > + if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed)) > + { > + WARN("Called on non-managed texture returning DDERR_INVALIDPARAMS.\n"); > + hr = DDERR_INVALIDPARAMS; > + } > + else > + hr = wined3d_surface_set_priority(surface->wined3d_surface, priority); > wined3d_mutex_unlock(); > > return hr; > } The existing code already had this of course, but note that wined3d_surface_set_priority() returns the previous priority.

1 0

Re: Re: [2/2] ddraw: add dsurface dimension tests, try 11
by Patrick Rudolph 15 Jul '14

15 Jul '14

Hi Henri, thanks for reviewing. >> + /* 6: Test maximum surface height */ >> + {DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT, >> DDSCAPS_OFFSCREENPLAIN, 1, 0x10000, DDERR_INVALIDPARAMS}, >> + /* 7: Test maximum surface width */ >> + {DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT, >> DDSCAPS_OFFSCREENPLAIN, 0x10000, 1, DDERR_INVALIDPARAMS}, > It would perhaps also be useful to verify that e.g. a 1 by 0xffff > surface actually is allowed. I've not included the tests for DirectDraw surfaces with dimension 1 by 0xffff and 0xffff by 1 as they fail on wine. The surfaces are provided by Opengl textures and the maximum texture size is less than 0xffff. However on Windows these tests pass, if the graphic cards pitch is great enough. Stefan pointed out that on old cards this test might fail. Should I add a separate test for this including a wine_todo ? I guess this won't be fixed any time soon... Regards, Patrick

3 2

Re: [8/8] msi: Avoid Wow6432Node usage in registry table handling.
by Marvin 15 Jul '14

15 Jul '14

1 0

Re: [7/8] msi/tests: Add more registry tests.
by Marvin 15 Jul '14

15 Jul '14

1 0

Re: [PATCH 5/5] d3d8/tests: Get rid of struct nvertex.
by Marvin 15 Jul '14

15 Jul '14

2 1

Re: mshtml: Fixed typos in HTMLTable_QI.
by Alexandre Julliard 15 Jul '14

15 Jul '14

Jacek Caban <jacek(a)codeweavers.com> writes: > --- > dlls/mshtml/htmltable.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) It doesn't work: ../../../tools/runtest -q -P wine -T ../../.. -M mshtml.dll -p mshtml_test.exe.so dom && touch dom.ok wine: Unhandled page fault on read access to 0x00000004 at address 0x558bae66 (thread 0069), starting debugger... Unhandled exception: page fault on read access to 0x00000004 in 32-bit code (0x558bae66). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:558bae66 ESP:0032f7d0 EBP:0032f808 EFLAGS:00210202( R- -- I - - - ) EAX:028c05c4 EBX:55977e38 ECX:0bcebd00 EDX:00000000 ESI:0032f8cc EDI:686b0350 Stack dump: 0x0032f7d0: 028c05c4 686b0350 00000010 55923438 0x0032f7e0: 028c0558 0032f8cc 00000010 028c0558 0x0032f7f0: 028c0574 683e2b20 558bae0b 686c8a40 0x0032f800: 686b0350 0032f8cc 0032f828 5589c3b5 0x0032f810: 028c0558 686b0350 0032f8cc 686c8a40 0x0032f820: 686b0360 00000000 0032f848 5587658d Backtrace: =>0 0x558bae66 HTMLTable_QI+0x66(iface=0x28c0558, riid=0x686b0350, ppv=0x32f8cc) [/home/julliard/wine/wine/dlls/mshtml/htmltable.c:924] in mshtml (0x0032f808) 1 0x5589c3b5 HTMLDOMNode_QueryInterface+0x24(iface=0x28c0568, riid=0x686b0350, ppv=0x32f8cc) [/home/julliard/wine/wine/dlls/mshtml/htmlnode.c:474] in mshtml (0x0032f828) 2 0x5587658d HTMLElement_QueryInterface+0x2c(iface=<couldn't compute location>, riid=<couldn't compute location>, ppv=<couldn't compute location>) [/home/julliard/wine/wine/dlls/mshtml/../../include/mshtml.h:15891] in mshtml (0x0032f848) 3 0x55854e3c DispatchEx_QueryInterface+0x2b(iface=<couldn't compute location>, riid=<couldn't compute location>, ppv=<couldn't compute location>) [/home/julliard/wine/wine/dlls/mshtml/dispex.c:1316] in mshtml (0x0032f878) 4 0x6863f0e5 _test_ifaces+0x54(line=<is not available>, iface=<is not available>, iids=0x686c85e0) [/home/julliard/wine/wine/dlls/mshtml/tests/dom.c:552] in mshtml_test (0x0032f8e8) 5 0x6863f604 _test_elem_type+0x43(line=0x198f, unk=0x28c0558, type=ET_TABLE) [/home/julliard/wine/wine/dlls/mshtml/tests/dom.c:1034] in mshtml_test (0x0032f918) 6 0x68641178 _test_elem_collection+0x4f7(line=0x198f, unk=<is not available>, elem_types=0x686a76a0, exlen=0x1e) [/home/julliard/wine/wine/dlls/mshtml/tests/dom.c:2153] in mshtml_test (0x0032fa98) 7 0x68650746 test_elems+0x95(doc=0x28b2b38) [/home/julliard/wine/wine/dlls/mshtml/tests/dom.c:6543] in mshtml_test (0x0032fc88) 8 0x686470e7 run_domtest+0x2f6(str=<is not available>, test=<is not available>) [/home/julliard/wine/wine/dlls/mshtml/tests/dom.c:8099] in mshtml_test (0x0032fd08) 9 0x686556e6 func_dom+0x115() [/home/julliard/wine/wine/dlls/mshtml/tests/dom.c:8126] in mshtml_test (0x0032fd48) 10 0x6862d96f main+0x37e(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/dlls/mshtml/tests/../../../include/wine/test.h:584] in mshtml_test (0x0032fe18) 11 0x686a0850 __wine_spec_exe_entry+0x7f(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in mshtml_test (0x0032fe58) 12 0x7b85f65c call_process_entry+0xb() in kernel32 (0x0032fe78) 13 0x7b8606a3 start_process+0x62(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/kernel32/process.c:1097] in kernel32 (0x0032feb8) 14 0x7bc7fac0 call_thread_func_wrapper+0xb() in ntdll (0x0032fed8) 15 0x7bc82a6d call_thread_func+0x7c(entry=0x7b860640, arg=0x7ffdf000, frame=0x32ffc8) [/home/julliard/wine/wine/dlls/ntdll/signal_i386.c:2630] in ntdll (0x0032ffa8) 16 0x7bc7fa9e call_thread_entry_point+0x11() in ntdll (0x0032ffc8) 17 0x7bc53f0e start_process+0x1d(kernel_start=0x7b860640) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2856] in ntdll (0x0032ffe8) 18 0x680316dd wine_call_on_stack+0x1c() in libwine.so.1 (0x00000000) 19 0x6803179b wine_switch_to_stack+0x2a(func=0x7bc53ef0, arg=0x7b860640, stack=0x330000) [/home/julliard/wine/wine/libs/wine/port.c:59] in libwine.so.1 (0xff808918) 20 0x7bc59a09 LdrInitializeThunk+0x238(kernel_start=<couldn't compute location>, unknown2=<couldn't compute location>, unknown3=<couldn't compute location>, unknown4=<couldn't compute location>) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2910] in ntdll (0xff808958) 21 0x7b866ea3 __wine_kernel_init+0xa02() [/home/julliard/wine/wine/dlls/kernel32/process.c:1269] in kernel32 (0xff809858) 22 0x7bc5a903 __wine_process_init+0x192() [/home/julliard/wine/wine/dlls/ntdll/loader.c:3119] in ntdll (0xff8098e8) 23 0x6802ede8 wine_init+0x2c7(argc=0x3, argv=0xff809e24, error="", error_size=0x400) [/home/julliard/wine/wine/libs/wine/loader.c:952] in libwine.so.1 (0xff809948) 24 0x7bf00d6c main+0x7b(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/loader/main.c:237] in <wine-loader> (0xff809d88) 25 0x682518c5 __libc_start_main+0xf4() in libc.so.6 (0x00000000) 0x558bae66 HTMLTable_QI+0x66 [/home/julliard/wine/wine/dlls/mshtml/htmltable.c:924] in mshtml: call *0x4(%edx) 924 IUnknown_AddRef((IUnknown*)*ppv); -- Alexandre Julliard julliard(a)winehq.org

3 2

Re: [PATCH 1/2] vbscript: Implemented Abs(try 8)
by Piotr Caban 15 Jul '14

15 Jul '14

On 07/15/14 04:55, Shuai Meng wrote: > static HRESULT Global_Abs(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + HRESULT hres; > + VARIANT dst; > + > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + hres = VarAbs(arg, &dst); > + if FAILED(hres) > + return hres; Please use parenthesis around if condition; > + if(!res) > + return DISP_E_BADVARTYPE; You have already written a test that shows this is incorrect (Call Abs(-4)). You also need to call VariantClear if dst is not used. > + return VariantCopy(res, &dst); Please change it to: *res = dst; return S_OK;

1 0

Re: [PATCH 2/5] ddraw/tests: Get rid of struct sVertexT.
by Marvin 15 Jul '14

15 Jul '14

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7990 Your paranoid android. === w8 (32 bit visual) === visual.c:1659: Test failed: Got color 00000000, expected 000000ff or near visual.c:1665: Test failed: Got color 00000000, expected 000000ff or near visual.c:1671: Test failed: Got color 00000000, expected 00000080 or near visual.c:1677: Test failed: Got color 00000000, expected 00000080 or near visual.c:2635: Test failed: unexpected colortable on offscreen surface

1 0

Re: [PATCH] rpcrt4: fixed memory leak on error exit (Coverity)
by Dmitry Timoshkov 15 Jul '14

15 Jul '14

Marcus Meissner <marcus(a)jet.franken.de> wrote: > --- a/dlls/rpcrt4/rpc_transport.c > +++ b/dlls/rpcrt4/rpc_transport.c > @@ -941,6 +941,7 @@ static size_t rpcrt4_ip_tcp_get_top_of_tower(unsigned char *tower_data, > } > else > { > + freeaddrinfo(ai); > ERR("unexpected protocol family %d\n", ai->ai_family); > return 0; > } This will introduce use after free (by ERR() statement). -- Dmitry.

1 0

Re: [PATCH 1/5] ddraw/tests: Get rid of struct sVertex.
by Marvin 15 Jul '14

15 Jul '14

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
16
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel July 2014