March 2010 - Wine-devel - list.winehq.org

Re: [2/2] dxdiagn: Successfully copy to destination variants with an invalid type in IDxDiagContainer::GetProp.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Andrew Nguyen <arethusa26(a)gmail.com> writes: > @@ -221,9 +221,17 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWS > > p = This->properties; > while (NULL != p) { > - if (0 == lstrcmpW(p->vName, pwszPropName)) { > - VariantCopy(pvarProp, &p->v); > - return S_OK; > + if (0 == lstrcmpW(p->vName, pwszPropName)) { > + HRESULT hr = VariantClear(pvarProp); > + if (hr == DISP_E_ARRAYISLOCKED) > + { > + while (SafeArrayUnlock(V_ARRAY(pvarProp)) == S_OK); > + VariantClear(pvarProp); This looks suspicious. Do you have evidence that the array should be forcibly unlocked and destroyed? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 02/48] Added new icon build rule
by Alexandre Julliard 23 Mar '10

23 Mar '10

Joel Holdsworth <joel(a)airwebreathe.org.uk> writes: > @@ -188,6 +188,11 @@ filter: dummy > .man.in.man: > LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $< >$@ || ($(RM) $@ && false) > > +# Rules for icons > + > +ifdef SVG_SRCS > + > +# Depreciated icon build rule > .svg.ico: > $(RSVG) -w 16 -h 16 -f png $< $*-16.png > $(RSVG) -w 32 -h 32 -f png $< $*-32.png > @@ -195,6 +200,17 @@ filter: dummy > $(ICOTOOL) -c -o $@ $*-16.png $*-32.png $*-48.png > $(RM) $*-16.png $*-32.png $*-48.png > > +else > + > +resources/%-32.png: resources/%.svg > + $(RSVG) -f png $< $@ > + > +resources/%.ico : resources/%-*-4.png resources/%-*-8.png \ > + resources/%-16-32.png resources/%-32-32.png resources/%-48-32.png > + $(ICOTOOL) -c -o $@ $^ > + > +endif That's GNU make specific, you can't do that. Also please don't send such a huge patch series. The first step should be to get just one icon committed with the proper infrastructure. Then you can consider sending more of them, preferably one dll at a time. -- Alexandre Julliard julliard(a)winehq.org

3 10

re: dlls/msxml3: Using strlenW instead of SysStringLen to check node name length
by Dan Kegel 23 Mar '10

23 Mar '10

Hi Eric, welcome to Wine! http://msdn.microsoft.com/en-us/library/ms221240.aspx says the only time those two functions disagree on valid bstr's is if there are embedded nul chars, in which case SysStringLength probably returns a larger value. Are you quite, quite sure that your bstrs are valid? (In general, the best way to answer questions like that is to add a test case to your patch, and make sure it passes on Windows as well as Wine before submitting to wine-patches.) - Dan

3 3

Re: 1/2 wined3d: add helper function for retrieving front buffer coordinates
by Henri Verbeet 23 Mar '10

23 Mar '10

On 23 March 2010 14:14, Roderick Colenbrander <thunderbird2k(a)gmail.com> wrote: > + IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *) This->container; That cast isn't safe unless you already know the surface is on a swapchain.

1 0

Re: [PATCH] user32: end scrollbar tracking if the mouse capture is lost
by Dmitry Timoshkov 23 Mar '10

23 Mar '10

Sébastien Ramage <sebastien.ramage(a)gmail.com> wrote: > - } while (msg.message != WM_LBUTTONUP); > + } while (msg.message != WM_LBUTTONUP&& GetCapture() == hwnd); Please fix the spacing above. > + SendMessage( hScroll, WM_LBUTTONDOWN, 0, 0x10001); 0 for lParam would work just fine. A magic value needs either explanation or MAKELPARAM(1, 1) if you really need coordinates. -- Dmitry.

1 0

Re: [PATCH] user32: end scrollbar tracking if the mouse capture is lost
by Paul Vriens 23 Mar '10

23 Mar '10

On 03/23/2010 02:08 PM, Sébastien Ramage wrote: > Fixes bug #16595 > --- > dlls/user32/scroll.c | 5 +---- > dlls/user32/tests/scroll.c | 17 ++++++++++++++++- > 2 files changed, 17 insertions(+), 5 deletions(-) Hi Sébastien Can comment too much on the patch but this patch doesn't apply cleanly to current Git. Please make sure that all patches are based on top of current. > > diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c > index 93f85f2..91adb74 100644 > --- a/dlls/user32/scroll.c > +++ b/dlls/user32/scroll.c > @@ -1105,11 +1105,8 @@ void SCROLL_TrackScrollBar( HWND hwnd, INT > scrollbar, POINT pt ) > DispatchMessageW(&msg ); > } > if (!IsWindow( hwnd )) > - { > ReleaseCapture(); > - break; > - } > - } while (msg.message != WM_LBUTTONUP); > + } while (msg.message != WM_LBUTTONUP&& GetCapture() == hwnd); > } While you're at it please add a space before the '&&'. -- Cheers, Paul.

1 0

Re: [8/10] shell32: Implement some IShellFolderView methods over IFolderView
by Paul Vriens 23 Mar '10

23 Mar '10

On 03/22/2010 01:01 PM, Nikolay Sivov wrote: > Implement some IShellFolderView methods over IFolderView > Hi Nikolay, + /* ::MoveIcons */ + hr = IShellFolderView_MoveIcons(folderview, NULL); + ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr); + This one makes Win98 and win95 (both with shell32.dll version 4.72.x) crash. The same is true for the one from patch "Add IShellFolderView::SetRedraw implementation": + /* ::SetRedraw without list created */ + hr = IShellFolderView_SetRedraw(folderview, TRUE); + ok(hr == S_OK, "got (0x%08x)\n", hr); + (Changing TRUE to FALSE doesn't make this test crash!). There is nothing in those tests yet that indicates version 5.0 (if that's what makes these tests succeed) or higher. It's easy enough to skip on Win9x but that also means no tests or WinMe or don't we care in this case? -- Cheers, Paul.

2 4

Re: 1/4 wined3d: pass surface to blit_shader->set_shader
by Alexandre Julliard 23 Mar '10

23 Mar '10

Roderick Colenbrander <thunderbird2k(a)gmail.com> writes: > In a future patch I will move 8-bit palette handling to the shader and > for that I need to retrieve the palette from the surface. This patch > prepares for that and it simplifies the interface to the shader. It doesn't work here: ../../../tools/runtest -q -P wine -M d3d9.dll -T ../../.. -p d3d9_test.exe.so visual.c && touch visual.ok visual.c:7725: Tests skipped: Card has unconditional pow2 support, skipping conditional NP2 tests visual.c:9843: Test failed: Input 0x00000000: Got color 0x00000000 for pixel 1/1, expected 0x00008700, format D3DFMT_UYVY visual.c:9847: Test failed: Input 0x00000000: Got color 0x00000000 for pixel 2/1, expected 0x00008700, format D3DFMT_UYVY visual.c:9843: Test failed: Input 0xff000000: Got color 0x00000000 for pixel 1/1, expected 0x00008700, format D3DFMT_UYVY visual.c:9847: Test failed: Input 0xff000000: Got color 0x00000000 for pixel 2/1, expected 0x004bff1c, format D3DFMT_UYVY visual.c:9843: Test failed: Input 0x00ff0000: Got color 0x00000000 for pixel 1/1, expected 0x00b30000, format D3DFMT_UYVY visual.c:9847: Test failed: Input 0x00ff0000: Got color 0x00ffffff for pixel 2/1, expected 0x00b30000, format D3DFMT_UYVY visual.c:9843: Test failed: Input 0x0000ff00: Got color 0x00000000 for pixel 1/1, expected 0x004bff1c, format D3DFMT_UYVY etc. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: 4/4 wined3d: move color keyed blitting in its own function [try 2]
by Henri Verbeet 23 Mar '10

23 Mar '10

On 23 March 2010 12:08, Roderick Colenbrander <thunderbird2k(a)gmail.com> wrote: > This version takes into account the 'This -> Dest' change as suggested by Henri. > But not the more general point.

1 0

Re: [shell32/tests] Fix a crash on shell32 < 5.0
by Paul Vriens 23 Mar '10

23 Mar '10

On 03/23/2010 11:29 AM, Paul Vriens wrote: > Hi, > > This fixes a crash. We only run this test now when SHGetFolderLocation > (introduces in 5.0) is available. There is not much else we can go on to > deduce whether we are 4.x or lower without skipping also on WinMe and > others. > > Changelog > Fix a crash on shell32 < 5.0 > Forgot to mention, this applies on top of Nikolay's patches. -- Cheers, Paul.

1 0