August 2013 - Wine-devel - list.winehq.org

Re: oleaut32: Add ICreateTypeInfo2::SetVarName implementation
by Nikolay Sivov 30 Aug '13

30 Aug '13

On 8/30/2013 16:28, Piotr Caban wrote: > --- > dlls/oleaut32/tests/typelib.c | 13 +++++++++++-- > dlls/oleaut32/typelib.c | 13 +++++++++++-- > 2 files changed, 22 insertions(+), 4 deletions(-) > > > > ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); > - FIXME("%p %u %s - stub\n", This, index, wine_dbgstr_w(name)); > - return E_NOTIMPL; > + > + FIXME("%p %u %s\n", This, index, wine_dbgstr_w(name)); > + It probably should be TRACE.

1 0

Re: ntdll: Store full line status register in the internal structure, not just the TIOCSER_TEMT bit. Take 2.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > Printing complete lsr value in the log may help with diagnosing > test failures on Alexandre's machine. I don't see how, since TIOCSER_TEMT is the only defined bit. Do you actually have a driver that returns other status? -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: kernel32/tests: Add a FlushFileBuffers test for a COM port. Resend.
by Marvin 30 Aug '13

30 Aug '13

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://newtestbot.winehq.org/JobDetails.pl?Key=1932 Your paranoid android. === wxppro (32 bit comm) === comm.c:849: Test failed: WaitCommEvent failed with a timeout comm.c:861: Test failed: WaitCommEvent error 997 comm.c:863: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:867: WaitCommEvent for EV_TXEMPTY took 1000 ms (timeout 1000) comm.c:869: Test failed: WaitCommEvent used 1000 ms for waiting

1 0

Re: d3d9: Partial implementation of IDirect3DSwapChain9Ex
by Stefan Dösinger 30 Aug '13

30 Aug '13

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Am 2013-08-30 10:19, schrieb Michael Müller: > This patch implements the IDirect3DSwapChain9Ex interface as an > extension of IDirect3DSwapChain9 and thus fixes bug 34252 - > "Silverlight accelerated graphics cause a D3D critical section > lockup" since Silverlight does no longer try to create a Direct3D > context in an endless loop. The functions > d3d9_swapchain_GetLastPresentCount and > d3d9_swapchain_GetPresentStatistics are just stubs so far. Good work on finding out what causes that bug! > - if (IsEqualGUID(riid, &IID_IDirect3DSwapChain9) + if > (IsEqualGUID(riid, &IID_IDirect3DSwapChain9) || IsEqualGUID(riid, > &IID_IDirect3DSwapChain9Ex) || IsEqualGUID(riid, &IID_IUnknown)) For IDirect3D9Ex and IDirect3DDevice9Ex, the Ex versions are only available if IDirect3D9 was created with the extended method. I suspect swapchains are the same. Please write some tests for this. > + TRACE("iface %p, pLastPresentCount %p.\n", iface, pLastPresentCount); > + WARN("not implemented.\n"); If a function is not implemented we write a FIXME, e.g. FIXME("iface %p, pLastPresentCount %p, stub!\n", iface, pLastPresentCount); If this causes too much spam on the console, you can use a static variable to print it just once. > + if (SUCCEEDED(hr)) + { + if(pMode){ Please use a code style that is consistent with the rest of the file. Tbh the existing files aren't as consistent as we'd like. The general rule is a space between if and (, and { in newlines. 4 spaces intendation. If there's a one-line statement in an if, put that statement in a new line and don't write curly brackets. My personal opinion, and the style I use, is to use brackets for both branches of an if-else if one of those branches has more than one line. > - * IDirect3DSwapChain9 interface + * IDirect3DSwapChain9(Ex) > interface */ #define INTERFACE IDirect3DSwapChain9 > DECLARE_INTERFACE_(IDirect3DSwapChain9,IUnknown) You have to create a new interface declaration named IDirect3DSwapChain9Ex with all the methods and the invocation macros. The header change should go in a separate patch. The d3d9 code should be changed to always use IDirect3D9Swapchain9Ex, like it does for device and direct3d. Thanks for your work! Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJSIFimAAoJEN0/YqbEcdMwbW0P/jC/gsziWzCtxBH1gDETnX6+ j0csX5cORWKCaq/wsPbT9ZDVV/OYFYlWRB0QZiJIUWAp4PzdGXCxQN8srdybT1hp PG3HTDzv4Kmq57fYSXEoLnZNO/pgfr4JiGmhcwQSyheJ1+lcb5Z/GE09goHwcLce CJVrIQu9f05TQb+r0BJCxIyGAIuq8to7xdIJ1tPR2MmKwYzS0XWkB1yN8QIGy/Qm z4aH7JGsOJ37t/90D4eHVBX6EtiI6pRHHiaO3hFrgYiu7wf/CeiE3E9QWnwycG1h DdPWjreQx+6/JQfg71eXDW81WYgdRl7TfMfBOc8UFh7Byj9b4llR0E+NFSkQ81NL XAQkB/PthmEpJIH1tSo91aNrZkfN/jw7D1gA4kUHFEtr5n1yuUXQQvKLYEOMWrV0 lV1plnzzLEZa50c0Y3/zCgQFCbzgo47ohO/4msMHOU33n255oJg/Bd6CLoA1oPFq hxQkkv0bW5VL6Jn0WVAC1FPjfmRF6zD6h9n8KKPWU2rz/tmkoEhoJ0Nd2a483N86 6EvOTpecczmNBlICFvyUOVAisHnVdwk+cPI+6hoqHBq0C7fGXi7R41pDOvf4o1yH wZyMH4e+kiG+7qaeGRwsTEDW1V77VAbPXJkNZPU2Wvb/gVzLU1TVQ87Bz5T83tpv tFvZjJrjOYO4qL4Afm14 =zjgo -----END PGP SIGNATURE-----

1 0

Re: d3d9: Partial implementation of IDirect3DSwapChain9Ex
by Nikolay Sivov 30 Aug '13

30 Aug '13

On 8/30/2013 12:19, Michael Müller wrote: > This patch implements the IDirect3DSwapChain9Ex interface as an > extension of IDirect3DSwapChain9 and thus fixes bug 34252 - "Silverlight > accelerated graphics cause a D3D critical section lockup" since > Silverlight does no longer try to create a Direct3D context in an > endless loop. The functions d3d9_swapchain_GetLastPresentCount and > d3d9_swapchain_GetPresentStatistics are just stubs so far. > > > --- > dlls/d3d9/swapchain.c | 71 > ++++++++++++++++++++++++++++++++++++++++++++++++- > include/d3d9.h | 14 +++++++++- > include/d3d9types.h | 8 ++++++ > 3 files changed, 91 insertions(+), 2 deletions(-) > > @@ -34,7 +34,7 @@ static HRESULT WINAPI d3d9_swapchain_QueryInterface(IDirect3DSwapChain9 *iface, > { > TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); > > - if (IsEqualGUID(riid, &IID_IDirect3DSwapChain9) > + if (IsEqualGUID(riid, &IID_IDirect3DSwapChain9) || IsEqualGUID(riid, &IID_IDirect3DSwapChain9Ex) > || IsEqualGUID(riid, &IID_IUnknown)) > { > IDirect3DSwapChain9_AddRef(iface); > @@ -221,12 +221,76 @@ static HRESULT WINAPI d3d9_swapchain_GetPresentParameters(IDirect3DSwapChain9 *i > return D3D_OK; > } I don't know if d3d9 is special in this regard, but this is a wrong way to implement derived interface. You need you make everything IDirect3DSwapChain9Ex, for example this one: > /***************************************************************************** > - * IDirect3DSwapChain9 interface > + * IDirect3DSwapChain9(Ex) interface > */ > #define INTERFACE IDirect3DSwapChain9 > DECLARE_INTERFACE_(IDirect3DSwapChain9,IUnknown) > @@ -405,6 +405,10 @@ DECLARE_INTERFACE_(IDirect3DSwapChain9,IUnknown) > STDMETHOD(GetDisplayMode)(THIS_ D3DDISPLAYMODE* pMode) PURE; > STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9** ppDevice) PURE; > STDMETHOD(GetPresentParameters)(THIS_ D3DPRESENT_PARAMETERS* pPresentationParameters) PURE; > + /*** IDirect3DSwapChain9Ex methods ***/ > + STDMETHOD(GetLastPresentCount)(THIS_ UINT* pLastPresentCount) PURE; > + STDMETHOD(GetPresentStats)(THIS_ D3DPRESENTSTATS* pPresentationStatistics) PURE; > + STDMETHOD(GetDisplayModeEx)(THIS_ D3DDISPLAYMODEEX* pMode,D3DDISPLAYROTATION* pRotation) PURE; > }; > #undef INTERFACE is no longer just IDirect3DSwapChain9. This will fix vtbl type too.

1 0

Re: [2/2] ntdll: Store full line status register in the internal structure, not just the TIOCSER_TEMT bit.
by Dmitry Timoshkov 30 Aug '13

30 Aug '13

Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > Printing complete lsr value in the log may help with diagnosing > test failures on Alexandre's machine. This patch is marked as 'Build failure' in the tracker, but I've checked it once again and compiles just fine here. What kind of build failure is that? -- Dmitry.

2 1

RFC: Mark dylib/mach-o on Mac OS X
by André Hentschel 29 Aug '13

29 Aug '13

Hi, at [1] i noticed that dylibs are printed as PEs. This intents to fix that, but i have no Mac, could someone please review/test? [1] http://test.winehq.org/data/8ef3a142263e6db11f1514f77b3de84c8b08d7a0/mac_fg… diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 6bea436..41fa7e6 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); const WCHAR S_ElfW[] = {'<','e','l','f','>','\0'}; +const WCHAR S_MachoW[] = {'<','m','a','c','h','o','>','\0'}; const WCHAR S_WineLoaderW[] = {'<','w','i','n','e','-','l','o','a','d','e','r','>','\0'}; static const WCHAR S_DotSoW[] = {'.','s','o','\0'}; static const WCHAR S_DotDylibW[] = {'.','d','y','l','i','b','\0'}; @@ -94,6 +95,9 @@ static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) if (len > 3 && !strcmpiW(&out[len - 3], S_DotSoW) && (l = match_ext(out, len - 3))) strcpyW(&out[len - l - 3], S_ElfW); + else if (len > 6 && !strcmpiW(&out[len - 6], S_DotDylibW) && + (l = match_ext(out, len - 6))) + strcpyW(&out[len - l - 6], S_MachoW); } while ((*out = tolowerW(*out))) out++; } diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index c0b86ba..c2c7c08 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -244,6 +244,11 @@ void info_win32_module(DWORD64 base) } } } + else if (strstr(im.mi[i].ModuleName, "<macho>")) + { + dbg_printf("MACH-O\t"); + module_print_info(&im.mi[i], FALSE); + } else { /* check module is not embedded in another module */ @@ -253,8 +258,11 @@ void info_win32_module(DWORD64 base) break; } if (j < im.num_used) continue; - if (strstr(im.mi[i].ModuleName, ".so") || strchr(im.mi[i].ModuleName, '<')) + if (strstr(im.mi[i].ModuleName, ".so") || strstr(im.mi[i].ModuleName, "<elf>") || + strstr(im.mi[i].ModuleName, "<wine-loader>")) dbg_printf("ELF\t"); + else if (strstr(im.mi[i].ModuleName, ".dylib") || strstr(im.mi[i].ModuleName, "<macho>")) + dbg_printf("MACH-O\t"); else dbg_printf("PE\t"); module_print_info(&im.mi[i], FALSE);

4 9

Re: patch:kernel32
by Charles Davis 29 Aug '13

29 Aug '13

On Aug 29, 2013, at 8:15 AM, matyapiro31 wrote: > > <0001-kernel32-change-for-loop-to-optimize.patch><0002-kernel32-change-for-loop-to-optimize.patch> One patch per email, please. Also, the subject should be more descriptive. The first one doesn't look much better than the second one (which was already rejected). sizeof(array)/sizeof(array[0]) is a constant expression; any optimizing compiler worth its salt will optimize that for you. (And I would know, because I work on LLVM and Clang.) The first part of that patch (against dlls/kernel32/console.c) might be a bit more promising, though, since it hoists a computation that isn't constant at compile time but is constant for the duration of the loop; but again, any good optimizing compiler would be smart enough to do that, too. Oh, and you forgot to actually declare the variables that hold the hoisted values. Those assignments don't count, because: a) You never gave them a type. That's an error in any C compiler (C89, C99, etc.) I'm not even sure a K&R compiler would take that. b) Wine is written in C89 (with some GNU extensions scattered throughout, but generally we try to write portable code around here); that means (among other things) all variable declarations must come before other statements. Did you even try to compile Wine with these patches? Chip

1 0

Re: [PATCH 2/2] ddraw/tests: Test WM_ACTIVATEAPP messages generated by SetCooperativeLevel
by Henri Verbeet 29 Aug '13

29 Aug '13

On 29 August 2013 11:14, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > +BOOL activateapp_received; > +IDirectDraw *activateapp_ddraw; > +HWND activateapp_window; > +DWORD activateapp_coop_level; > + I think those should be static, and you'll probably want to put them in a structure.

1 0

my patch was wrong at dlls/kernel32/computernames.c
by matyapiro31 29 Aug '13

29 Aug '13

From if ( isalnumW ( wc ) ) return wc; for ( i = 0; i < 17; i++ ) To if ( isalnumW ( wc ) ) return wc; for ( i = 0; i < 16; i++ ) and the original version was wrong,too. It counts the NULL of the end.

2 1