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

[PATCH] server: Fix console create function
by XueFeng Chang 23 Feb '10

23 Feb '10

Check create_event return value. --- server/console.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/console.c b/server/console.c index a79dc67..3758a71 100644 --- a/server/console.c +++ b/server/console.c @@ -294,7 +294,7 @@ static struct object *create_console_input( struct thread* renderer ) console_input->win = 0; console_input->event = create_event( NULL, NULL, 0, 1, 0, NULL ); - if (!console_input->history || !console_input->evt) + if (!console_input->history || !console_input->evt || !console_input->event) { release_object( console_input ); return NULL; -- 1.6.0.4

1 0

Trouble compiling Wine tests with Cygwin
by Alex Villacís Lasso 22 Feb '10

22 Feb '10

I have a VB6 application that requires oledb32 to convert from DBTYPE_VARIANT to DBTYPE_BYTES, and fails with builtin oledb32 since conversions to DBTYPE_BYTES are unimplemented. I set up a VirtualBox VM with Windows XP and the latest Cygwin in order to add a oledb32 test to show me what should be done for these conversions to DBTYPE_BYTES. However, I have trouble when running "make test" on dlls/oledb32/tests. I get the following: ../../../tools/winegcc/winegcc -B../../../tools/winebuild --sysroot=../../.. convert.o marshal.o convert_i.o testlist.o -o oledb32_test.exe ../../../libs/port/libwine_port.a -loleaut32 -lole32 -luser32 -lgdi32 -ladvapi32 -lkernel32 oledb32_test.BkIKxE.s: Assembler messages: oledb32_test.BkIKxE.s:5: Error: junk at end of line, first unrecognized character is `"' oledb32_test.BkIKxE.s:14: Error: unknown pseudo-op: `.hidden' oledb32_test.BkIKxE.s:69: Error: unknown pseudo-op: `.hidden' oledb32_test.BkIKxE.s:74: Error: junk at end of line, first unrecognized character is `"' oledb32_test.BkIKxE.s:76: Error: junk at end of line, first unrecognized character is `-' winebuild: /usr/bin/as.exe failed with status 256 winegcc: ../../../tools/winebuild/winebuild.exe failed make: *** [oledb32_test.exe] Error 2 This is the version of as that comes with the latest cygwin: GNU assembler (GNU Binutils) 2.19.51.20090704 Copyright 2008 Free Software Foundation, Inc. This program is free software; you may redistribute it under the terms of the GNU General Public License version 3 or later. This program has absolutely no warranty. This assembler was configured for a target of `i686-cygwin'. I have searched in www.winehq.org but could not find anything relevant on my problem. I have also tried to save the assembler file by using -Wb,--save-temps but I cannot make it work.

2 2

Re: includes: Fix IsEqualPropertyKey definitions
by Alexandre Julliard 22 Feb '10

22 Feb '10

Maarten Lankhorst <m.b.lankhorst(a)gmail.com> writes: > @@ -48,7 +48,11 @@ > #endif > > #ifndef IsEqualPropertyKey > +#ifdef __cplusplus > #define IsEqualPropertyKey(a,b) (((a).pid == (b).pid) && IsEqualIID((a).fmtid,(b).fmtid)) > +#else > +#define IsEqualPropertyKey(a,b) (((a)->pid == (b)->pid) && IsEqualIID(&(a)->fmtid,&(b)->fmtid)) > +#endif This doesn't match the PSDK. Where does this come from? -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: [PATCH 3/5] d3dx9_36: Implement stubbed ID3DXConstantTable interface
by Henri Verbeet 22 Feb '10

22 Feb '10

On 21 February 2010 22:30, Christian Costa <titan.costa(a)wanadoo.fr> wrote: > + if (IsEqualGUID(riid, &IID_IUnknown) || > + IsEqualGUID(riid, &IID_ID3DXConstantTable)) ID3DXConstantTable extends ID3DXBuffer. > + ERR("Interface %s not found\n", debugstr_guid(riid)); Not implementing a random interface an application asks for is hardly an internal error. You could argue for making it a FIXME, but I think WARN is most appropriate.

1 0

Re: [PATCH] shell32: Allow copy operation to overwrite an existing write protected file + tests
by Alexandre Julliard 22 Feb '10

22 Feb '10

Christian Costa <titan.costa(a)wanadoo.fr> writes: > @@ -627,6 +627,14 @@ static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists) > > TRACE("(%s %s %s)\n", debugstr_w(src), debugstr_w(dest), bFailIfExists ? "failIfExists" : ""); > > + if (PathFileExistsW(dest)) > + { > + /* Destination file may already exist with read only attribute */ > + DWORD attribs = GetFileAttributesW(dest); > + if (IsAttrib(attribs, FILE_ATTRIBUTE_READONLY)) > + SetFileAttributesW(dest, attribs &= ~ FILE_ATTRIBUTE_READONLY); > + } > + The PathFileExistsW call is redundant. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: include[1/2]: add a strcmpW-equivalent function usable in tests.
by Dmitry Timoshkov 22 Feb '10

22 Feb '10

Mikołaj Zalewski <mikolaj(a)zalewski.pl> wrote: > +/* strcmpW is avaiable for tests compiled under Wine, but not in standalone > + * builds under Windows, so we reimplement it under a different name. */ > +static inline int winetest_strcmpW( const WCHAR *str1, const WCHAR *str2 ) > +{ > + while (*str1 && (*str1 == *str2)) { str1++; str2++; } > + return *str1 - *str2; > +} 'inline' should not be used in Wine tests, and existing 'inline's should be removed since that's not a valid modifier for MSVC, and we can't include config.h in tests. -- Dmitry.

2 1

Re: [PATCH 02/10] oleaut32: Improved ICreateTypeInfo2_fnAddFuncDesc implementation
by Paul Vriens 22 Feb '10

22 Feb '10

On 02/22/2010 01:57 AM, Piotr Caban wrote: > + TRACE("(%p,%d,%p)\n", iface, index, pFuncDesc); > + TRACE("{%d,%p,%p,%d,%d,%d,%d,%d,%d,%d,{%d},%d}\n", pFuncDesc->memid, > + pFuncDesc->lprgscode, pFuncDesc->lprgelemdescParam, pFuncDesc->funckind, > + pFuncDesc->invkind, pFuncDesc->callconv, pFuncDesc->cParams, > + pFuncDesc->cParamsOpt, pFuncDesc->oVft, pFuncDesc->cScodes, > + pFuncDesc->elemdescFunc.tdesc.vt, pFuncDesc->wFuncFlags); > + > + if(!pFuncDesc || (pFuncDesc->memid>0x7fffffff&& pFuncDesc->memid!=MEMBERID_NIL)) > + return E_INVALIDARG; Hi Piotr, Your checking pFuncDesc for NULL after using it's members in the TRACE(). At least Coverity will throw up an error on that. -- Cheers, Paul.

1 0

IShellBrowser/ICommDlgBrowser Theme draw problem
by Kenneth Robinette 22 Feb '10

22 Feb '10

I am testing a SSH file transfer program which makes use of the Microsoft IShellBrowser and ICommDlgBrowser interfaces for the "local" file system view. The interface listview header (detail view) does not get painted correctly when a theme is enabled under Wine. If a theme is not selected, the problem does not happen. This can be seen using an example program available for general public download at: http://www.codeproject.com/KB/shell/explorer.aspx?df=100&forumid=2239&exp=0… I traced the problem through the comctl32 listview.c module: LISTVIEW_NCPaint() which then calls DrawThemeBackground (theme, dc, 0, 0, &r, 0); located in the uxtheme.dll draw.c module. If I replace the uxtheme.dll with the native version, the problem goes away. In reviewing the DrawThemeBackground() fuction, it calls: DrawThemeBackgoundEx() which then calls: UXTHEME_DrawBorderBackground() when the bgtype is BT_BORDERFILL The UXTHEME_DrawBorderBackgound() calls two internal functions: UXTHEME_DrawBorderRectangle() and UXTHEME_DrawBackgroundFill() The problem seems related to UXTHEME_DrawBackgroundFill(). If I comment this call out, everything appears to work correctly. It would appear that the UXTHEME_DrawBackgroundFill() is being called incorrectly. Suggestions?

2 1

Re: makefiles: Add some msvcrt imports needed under Cygwin
by Austin English 22 Feb '10

22 Feb '10

On Sat, Feb 20, 2010 at 11:20 AM, <cerebro.alexiel(a)gmail.com> wrote: > diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in > index dce8259..1a36216 100644 > --- a/programs/xcopy/Makefile.in > +++ b/programs/xcopy/Makefile.in > @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ > VPATH = @srcdir@ > MODULE = xcopy.exe > APPMODE = -mconsole -municode -mno-cygwin > -IMPORTS = shell32 user32 kernel32 > +IMPORTS = shell32 user32 kernel32 msvcrt > EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt > MODCFLAGS = @BUILTINFLAG@ This patch won't apply cleanly on top of the first, you've still got -mno-cygwin in there. -- -Austin

3 3

Re: [PATCH 2/2] wined3d: Fix calculation of pitch for ATI2N format
by Stefan Dösinger 22 Feb '10

22 Feb '10

On the big picture I am not sure if the test conclusively shows what is going on. If your test's offset of 2160 bytes is correct something odd is going on. Please add a test explicitly testing the pitch returned in D3DLOCKED_RECT.Pitch. > + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, MAKEFOURCC('A','T','I','2'), D3DPOOL_SCRATCH, &surface, 0); > + ok(SUCCEEDED(hr), "CreateOffscreenPlainSurface failed (%08x)\n", hr); I am not sure if ATI2N surfaces are available everywhere. Please call CheckDeviceFormat to see if it is supported before trying to create a surface, and if it is not available call skip() and skip the test. + todo_wine ok(offset == 2160, "Got offset %u, expected offset 2160 for format ATI2N\n", offset); I may be a bit dizzy from playing games for 2 days, but I don't understand how you get to an offset of 2160 with the normal surface calculation. According to our table in utils.c ATI2N has 1 byte per pixel, so the offset would be * 1(bpp) * (128(width) * 60(yoffset) + 60(xoffset)) = 7740 bytes. Following the formula given in the GL_EXT_texture_compression_latc spec I'd get 16[blocksize in bytes] * (128[width]/4 * 60[y] / 4 + 60[x] / 4) = 7920 >From patch 2: > @@ -330,7 +330,7 @@ DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPitch(IWineD3DSurface *iface) { > DWORD ret; > TRACE("(%p)\n", This); > - if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) > + if ((format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) && (format_desc->format != WINED3DFMT_ATI2N)) IwineD3DBaseSurfaceImpl_LockRect assumes that the pitch gives the number of bytes to the next line of blocks rather than the next line in the surface, so LockRect will need some changes as well. Hardcoding ATI2N is ugly, a new flag for this behavior would be better(or something entirely different depending on what more detailed tests on windows reveal)

2 2