June 2014 - Wine-Devel - list.winehq.org

Re: windowscodecs: Fix interlaced PNG writing.
by Sebastian Lackner June 20, 2014

June 20, 2014

Am 20.06.2014 22:15, schrieb Vincent Povirk: > + row_pointers = HeapAlloc(GetProcessHeap(), 0, This->height * sizeof(png_byte*)); > + if (!row_pointers) > + { > + LeaveCriticalSection(&This->lock); > + return E_OUTOFMEMORY; > + } There should be a corresponding HeapFree( ... ) to release row_pointers again.

1 0

Re: [3/4] server: Process OutputDebugString events like regular exceptions.
by Alexandre Julliard June 20, 2014

June 20, 2014

Sebastian Lackner <sebastian(a)fds-team.de> writes: > As recently mentioned in one of my other patches, Windows internally > processes debug string events the same way as regular exceptions. This > patch removes the output_debug_string wineserver call, and instead uses > always an exception to send debug strings to the debugger. The > wineserver function queue_exception_event is then responsible to > translate exceptions into the corresponding debug events. Make sure to > run ./tools/make_requests after applying this patch. This could probably be done on the client side when retrieving the event, to avoid adding special cases in the server code. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [4/4] ntdll/tests: Add more tests for debug string events.
by Marvin June 20, 2014

June 20, 2014

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=7619 Your paranoid android. === w2000pro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00950000/00950001 exception: unhandled exception 80000004 at 00950000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7C5C20B0/00950001 === wxppro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00A30000/00A30001 exception: unhandled exception 80000004 at 00A30000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7C80DF3C/00A30001 === wvistau64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003C0000/003C0001 exception: unhandled exception 80000004 at 003C0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7751ED97/003C0001 === w2008s64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002D0000/002D0001 exception: unhandled exception 80000004 at 002D0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77E5ED97/002D0001 === w7u (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003C0000/003C0001 exception: unhandled exception 80000004 at 003C0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77CDE34F/003C0001 === w8 (32 bit exception) === exception.c:1127: Test failed: Got exception offset 0x1b, expected 0x19 exception.c:1136: Test failed: Got exception offset 0x19, expected 0x17 exception.c:484: Test failed: 42: Wrong exception address 003E0000/003E0001 exception: unhandled exception 80000004 at 003E0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77174D17/003E0001

1 0

Re: [2/4] ntdll/tests: Run crashing i386 exception tests as the last step.
by Marvin June 19, 2014

June 19, 2014

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=7618 Your paranoid android. === w2000pro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00950000/00950001 exception: unhandled exception 80000004 at 00950000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7C5C20B0/00950001 === wxppro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00A30000/00A30001 exception: unhandled exception 80000004 at 00A30000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7C80DF3C/00A30001 === wvistau64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002C0000/002C0001 exception: unhandled exception 80000004 at 002C0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7751ED97/002C0001 === w2008s64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003D0000/003D0001 exception: unhandled exception 80000004 at 003D0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77E5ED97/003D0001 === w7u (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00280000/00280001 exception: unhandled exception 80000004 at 00280000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77CDE34F/00280001 === w8 (32 bit exception) === exception.c:1102: Test failed: Got exception offset 0x1b, expected 0x19 exception.c:1111: Test failed: Got exception offset 0x19, expected 0x17 exception.c:484: Test failed: 42: Wrong exception address 004F0000/004F0001 exception: unhandled exception 80000004 at 004F0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77174D17/004F0001

1 0

Re: [1/4] ntdll/tests: Use an EXCEPTION_REGISTRATION_RECORD array to prevent compiler from reordering variables.
by Marvin June 19, 2014

June 19, 2014

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=7617 Your paranoid android. === w2000pro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00950000/00950001 exception: unhandled exception 80000004 at 00950000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7C5C20B0/00950001 === wxppro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00A30000/00A30001 exception: unhandled exception 80000004 at 00A30000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7C80DF3C/00A30001 === wvistau64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002C0000/002C0001 exception: unhandled exception 80000004 at 002C0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7751ED97/002C0001 === w2008s64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002C0000/002C0001 exception: unhandled exception 80000004 at 002C0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77E5ED97/002C0001 === w7u (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002F0000/002F0001 exception: unhandled exception 80000004 at 002F0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77CDE34F/002F0001 === w8 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003F0000/003F0001 exception: unhandled exception 80000004 at 003F0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77174D17/003F0001

1 0

Re: Revert "windowscodecs: Fix leak in test_QueryCapability."
by Marvin June 19, 2014

June 19, 2014

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=7603 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: ntdll: Add exception tests for RtlUnwind on i386.
by Marvin June 19, 2014

June 19, 2014

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=7598 Your paranoid android. === w2000pro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00950000/00950001 exception: unhandled exception 80000004 at 00950000 exception.c:484: Test failed: 42: Wrong exception address 7C5C20B0/00950001 === wxppro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00A30000/00A30001 exception: unhandled exception 80000004 at 00A30000 exception.c:484: Test failed: 42: Wrong exception address 7C80DF3C/00A30001 === wvistau64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002D0000/002D0001 exception: unhandled exception 80000004 at 002D0000 exception.c:484: Test failed: 42: Wrong exception address 7751ED97/002D0001 === w2008s64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002D0000/002D0001 exception: unhandled exception 80000004 at 002D0000 exception.c:484: Test failed: 42: Wrong exception address 77E5ED97/002D0001 === w7u (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003C0000/003C0001 exception: unhandled exception 80000004 at 003C0000 exception.c:484: Test failed: 42: Wrong exception address 77CDE34F/003C0001 === w8 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00310000/00310001 exception: unhandled exception 80000004 at 00310000 exception.c:484: Test failed: 42: Wrong exception address 77174D17/00310001

1 0

Re: windowscodecs: Fix leak in test_QueryCapability.
by Marvin June 18, 2014

June 18, 2014

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=7580 Your paranoid android. === wvistau64 (32 bit tiffformat) === tiffformat.c:245: Test failed: CreateDecoderFromStream error 0x88982f8b tiffformat: unhandled exception c0000005 at 0EEE3AA7 === w2008s64 (32 bit tiffformat) === tiffformat.c:245: Test failed: CreateDecoderFromStream error 0x88982f8b tiffformat: unhandled exception c0000005 at 0EEE3AA7 === w7u (32 bit tiffformat) === tiffformat.c:245: Test failed: CreateDecoderFromStream error 0x88982f8b tiffformat: unhandled exception c0000005 at 0EEE3AA7 === w8 (32 bit tiffformat) === tiffformat: unhandled exception c0000005 at 0042395C === wvistau64 (64 bit tiffformat) === No test summary line found === w2008s64 (64 bit tiffformat) === No test summary line found

1 0

Re: [PATCH 1/4] packager: Implement IOleObject::SetClientSite
by Marvin June 18, 2014

June 18, 2014

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=7573 Your paranoid android. === build (build) === Patch failed to apply

1 0

WineHQ Downtime
by Jeremy Newman June 18, 2014

June 18, 2014

WineHQ will be going offline starting at 10:00 CDT tomorrow (Wednesday 2014-06-18) and will be down for up to an hour. We are moving the site and all services (other than the Wiki) to new hardware. This includes: WineHQ.org, Forums, AppDB, Bugzilla, Git, FTP, Mailing lists, and WineTestBot Web Even after the things come back online, some services may need some tweaking. We will be on the issues as fast as we can. -N

4 4

Re: oleaut32: Fix TLB dependencies lookup (retry 3)
by Marvin June 18, 2014

June 18, 2014

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=7567 Your paranoid android. === w2000pro (32 bit typelib) === typelib.c:5491: Test failed: got: 80029c4a

1 0

Re: [2/3] msvcrt: Clear _cnt on buffer flush.
by Piotr Caban June 18, 2014

June 18, 2014

On 06/18/14 02:03, Grazvydas Ignotas wrote: > @@ -3662,6 +3662,7 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) > if(file->_cnt <= 0) > res = msvcrt_flush_buffer(file); > if(!res) { > + file->_cnt=file->_bufsiz; > *file->_ptr++ = c; > file->_cnt--; > } file->_cnt value should only be set if msvcrt_flush_buffer was called. Cheers, Piotr

1 0

Re: [4/5] msvcrt: Move write flag setting code for reuse.
by Piotr Caban June 17, 2014

June 17, 2014

On 06/14/14 01:23, Grazvydas Ignotas wrote: > --- > dlls/msvcrt/file.c | 27 +++++++++++++++------------ > 1 file changed, 15 insertions(+), 12 deletions(-) > > diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c > index 7523bbb..d6fb9ef 100644 > --- a/dlls/msvcrt/file.c > +++ b/dlls/msvcrt/file.c > @@ -3641,6 +3641,17 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f > return buf_start; > } > > +static inline int msvcrt_set_write_direction(MSVCRT_FILE* file) > +{ > + if(!(file->_flag & MSVCRT__IOWRT)) { > + if(file->_flag & MSVCRT__IORW) > + file->_flag |= MSVCRT__IOWRT; > + else > + return MSVCRT_EOF; > + } > + return 0; > +} I don't see a good reason for making this code reusable. The code is used to inform how the buffer is used (if it's used for writing or reading). This means that it doesn't make sense to set it if buffer is not used. The only valid use of it I can see in wine sources is _flsbuf. I've wrote a test that shows that _IOWRT flag is not set if _bufsiz==0 or in the case you're implementing. You can see it's code and result on windows here: https://testbot.winehq.org/JobDetails.pl?Key=7552

2 1

Re: [PATCH 2/2] packager: Add loading support for Ole10Native storage objects
by Vincent Povirk June 17, 2014

June 17, 2014

+ hr = IStorage_OpenStream(pStg, ole10nativeW, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stream); You should probably use STGM_READ here.

1 0

Re: [PATCH 1/5] d2d1: Implement d2d_d3d_render_target_CreateSolidColorBrush().
by Jacek Caban June 17, 2014

June 17, 2014

Hi Henri, On 06/16/14 13:13, Henri Verbeet wrote: > diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h > index 5609db6..9e91728 100644 > --- a/dlls/d2d1/d2d1_private.h > +++ b/dlls/d2d1/d2d1_private.h > @@ -33,4 +33,13 @@ struct d2d_d3d_render_target > void d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, > IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) DECLSPEC_HIDDEN; > > +struct d2d_brush > +{ > + ID2D1Brush ID2D1Brush_iface; Given how you use this object, this should be ID2D1SolidColorBrush. I guess you want to somehow reuse this struct for other brush types, but there should be better ways for this. Then: +void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, + const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc) +{ + FIXME("Ignoring brush properties.\n"); + + brush->ID2D1Brush_iface.lpVtbl = (ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl; + brush->refcount = 1; +} This cast should not be needed. > + LONG refcount; > +}; > + > +void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, > + const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc) DECLSPEC_HIDDEN; > + > #endif /* __WINE_D2D1_PRIVATE_H */ > diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c > index be9c1b6..e8c56a0 100644 > --- a/dlls/d2d1/render_target.c > +++ b/dlls/d2d1/render_target.c > @@ -117,9 +117,19 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapBrush(ID2D1Re > static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSolidColorBrush(ID2D1RenderTarget *iface, > const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc, ID2D1SolidColorBrush **brush) > { > - FIXME("iface %p, color %p, desc %p, brush %p stub!\n", iface, color, desc, brush); > + struct d2d_brush *object; > > - return E_NOTIMPL; > + TRACE("iface %p, color %p, desc %p, brush %p.\n", iface, color, desc, brush); > + > + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) > + return E_OUTOFMEMORY; > + > + d2d_solid_color_brush_init(object, iface, color, desc); > + > + TRACE("Created brush %p.\n", object); > + *brush = (ID2D1SolidColorBrush *)&object->ID2D1Brush_iface; Same here, the cast should not be needed. Also allocating memory in brush.c seems more logical to me (although that's a matter of taste). Cheers, Jacek

2 7

Re: [PATCH 1/4] vbscript: Implemented TypeName(try 2)
by Jacek Caban June 17, 2014

June 17, 2014

On 06/17/14 07:58, Shuai Meng wrote: > iff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c > index 5160374..5357df8 100644 > --- a/dlls/vbscript/global.c > +++ b/dlls/vbscript/global.c > @@ -1502,8 +1502,57 @@ static HRESULT Global_DatePart(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, > > static HRESULT Global_TypeName(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + static const WCHAR ByteW[] = {'B', 'y', 't', 'e', 0}; > + static const WCHAR IntegerW[] = {'I', 'n', 't', 'e', 'g', 'e', 'r', 0}; > + static const WCHAR LongW[] = {'L', 'o', 'n', 'g', 0}; > + static const WCHAR SingleW[] = {'S', 'i', 'n', 'g', 'l', 'e', 0}; > + static const WCHAR DoubleW[] = {'D', 'o', 'u', 'b', 'l', 'e', 0}; > + static const WCHAR CurrencyW[] = {'C', 'u', 'r', 'r', 'e', 'n', 'c', 'y', 0}; > + static const WCHAR DecimalW[] = {'D', 'e', 'c', 'i', 'm', 'a', 'l', 0}; > + static const WCHAR DateW[] = {'D', 'a', 't', 'e', 0}; > + static const WCHAR StringW[] = {'S', 't', 'r', 'i', 'n', 'g', 0}; > + static const WCHAR BooleanW[] = {'B', 'o', 'o', 'l', 'e', 'a', 'n', 0}; > + static const WCHAR EmptyW[] = {'E', 'm', 'p', 't', 'y', 0}; > + static const WCHAR NullW[] = {'N', 'u', 'l', 'l', 0}; > + /*static const WCHAR ObjectW[] = {'O', 'b', 'j', 'e', 'c', 't', 0}; Please don't leave such commented things in the patch. You could remove it, but ideally this should have tests and implementation. > + static const WCHAR NothingW[] = {'N', 'o', 't', 'h', 'i', 'n', 'g', 0};*/ > + > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + if(res) { This if() is not needed. return_string will take care of NULL res. > + switch(V_VT(arg)) { > + case VT_UI1: Please don't add 8 space indention. I personally prefer no additional indentions for cases, but in any case, if you do indention, use 4 spaces as the rest of file. > + return return_string(res, ByteW); > + case VT_I2: > + return return_string(res, IntegerW); > + case VT_I4: > + return return_string(res, LongW); > + case VT_R4: > + return return_string(res, SingleW); > + case VT_R8: > + return return_string(res, DoubleW); > + case VT_CY: > + return return_string(res, CurrencyW); > + case VT_DECIMAL: > + return return_string(res, DecimalW); > + case VT_DATE: > + return return_string(res, DateW); > + case VT_BSTR: > + return return_string(res, StringW); > + case VT_BOOL: > + return return_string(res, BooleanW); > + case VT_EMPTY: > + return return_string(res, EmptyW); > + case VT_NULL: > + return return_string(res, NullW); > + default: > + FIXME("arg %s not supported\n", debugstr_variant(arg)); > + return E_NOTIMPL; > + } > + } > + return S_OK; > } > > static HRESULT Global_Array(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs > index 2cf9bb7..32f4dc3 100644 > --- a/dlls/vbscript/tests/api.vbs > +++ b/dlls/vbscript/tests/api.vbs > @@ -845,4 +845,25 @@ MyObject.myval = 0 > Call ok(CSng(MyObject) = 0, "CSng(MyObject) = " & CSng(MyObject)) > Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) > > +Call ok(TypeName(CByte(255)) = "Byte", "TypeName(CByte(255)) = " & TypeName(CByte(255))) > +Call ok(getVT(TypeName(CByte(255))) = "VT_BSTR", "getVT(TypeName(CByte(255))) = " & getVT(TypeName(CByte(255)))) > +Call ok(TypeName(255) = "Integer", "TypeName(255) = " & TypeName(255)) > +Call ok(getVT(TypeName(255)) = "VT_BSTR", "getVT(TypeName(255)) = " & getVT(TypeName(255))) > +Call ok(TypeName(32768) = "Long", "TypeName(32768) = " & TypeName(32768)) > +Call ok(getVT(TypeName(32768)) = "VT_BSTR", "getVT(TypeName(32768)) = " & getVT(TypeName(32768))) > +Call ok(TypeName(CSng(0.5)) = "Single", "TypeName(CSng(0.5)) = " & TypeName(CSng(0.5))) > +Call ok(getVT(TypeName(CSng(0.5))) = "VT_BSTR", "getVT(TypeName(CSng(0.5))) = " & getVT(TypeName(CSng(0.5)))) > +Call ok(TypeName(-0.5) = "Double", "TypeName(-0.5) = " & TypeName(-0.5)) > +Call ok(getVT(TypeName(-0.5)) = "VT_BSTR", "getVT(TypeName(-0.5)) = " & getVT(TypeName(-0.5))) > +Call ok(TypeName(CCur(0.5)) = "Currency", "TypeName(CCur(0.5)) = " & TypeName(CCur(0.5))) > +Call ok(getVT(TypeName(CCur(0.5))) = "VT_BSTR", "getVT(TypeName(CCur(0.5))) = " & getVT(TypeName(CCur(0.5)))) > +Call ok(TypeName(CStr(0.5)) = "String", "TypeName(CStr(0.5)) = " & TypeName(CStr(0.5))) > +Call ok(getVT(TypeName(CStr(0.5))) = "VT_BSTR", "getVT(TypeName(CStr(0.5))) = " & getVT(TypeName(CStr(0.5)))) > +Call ok(TypeName(CBool(0.5)) = "Boolean", "TypeName(CBool(0.5)) = " & TypeName(CBool(0.5))) > +Call ok(getVT(TypeName(CBool(0.5))) = "VT_BSTR", "getVT(TypeName(CBool(0.5))) = " & getVT(TypeName(CBool(0.5)))) Using True or False directly instead of CBool() would be cleaner. Jacek

1 0

Re: [PATCH 4/4] vbscript: Implemented Abs(try 2)
by Marvin June 17, 2014

June 17, 2014

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=7551 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 3/4] vbscript: Implemented Sgn(try 2)
by Marvin June 17, 2014

June 17, 2014

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=7550 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/4] vbscript: Implemented VarType(try 2)
by Marvin June 17, 2014

June 17, 2014

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=7549 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/4] vbscript: Implemented TypeName(try 2)
by Marvin June 17, 2014

June 17, 2014

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=7548 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 4/4] vbscript: Implemented Abs
by Marvin June 16, 2014

June 16, 2014

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=7547 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/4] vbscript: Implemented Sgn
by Marvin June 16, 2014

June 16, 2014

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=7546 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/4] vbscript: Implemented VarType
by Marvin June 16, 2014

June 16, 2014

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=7545 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 1/4] vbscript: Implemented TypeName
by Marvin June 16, 2014

June 16, 2014

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=7544 Your paranoid android. === build (build) === Patch failed to apply

1 0

Fix for PlgBlt, the XFORM matrix was calculated incorrectly
by Alexander Almaleh June 16, 2014

June 16, 2014

I had tried to submit a patch for that 5 years ago<http://www.winehq.org/pipermail/wine-devel/2009-December/080391.html>, but couldn't figure out how to make a patch/test it, and eventually gave up and forgot about it. But recently I remembered about it, and now I want to try again. So, this time I've prepared a test that can prove that the previous implementation does not calculate the XFORM matrix correctly, and that my patch will fix it. The test is a VC6 project, you can find it at https://drive.google.com/file/d/0B9PGUhmmnsm1S2VvZzc3WmhBY3c/edit?usp=shari…. The test is a demo of PlgBlt that I found on CodeProject<http://www.codeproject.com/Articles/17712/The-GDI-magic-Rendering-reflectio…>. You can compare how it works on XP and on Wine. For testing, I directly inserted the original Wine implementation of PlgBlt, as well as my patched version, into the VC6 project, and tested on that. This is because there seems to be an additional problem with MaskBlt, which I'll try tackling next. I have screenshots of what the demo looks using Windows's PlgBlt<http://imgur.com/q8qKGd7>, and Wine's PlgBlt <http://imgur.com/smYEV6z>. To test it, simply look at this function in the VC6 project: BOOL MyPlgBlt( HDC hdcDest, const POINT *lpPoint, HDC hdcSrc, INT nXSrc, INT nYSrc, INT nWidth, INT nHeight, HBITMAP hbmMask, INT xMask, INT yMask) { // return MyPlgBltWinePatched(hdcDest, lpPoint, hdcSrc, nXSrc, nYSrc, nWidth, nHeight, hbmMask, xMask, yMask); return MyPlgBltWineUnpatched(hdcDest, lpPoint, hdcSrc, nXSrc, nYSrc, nWidth, nHeight, hbmMask, xMask, yMask); // return PlgBlt(hdcDest, lpPoint, hdcSrc, nXSrc, nYSrc, nWidth, nHeight, hbmMask, xMask, yMask); } Uncomment the function you want to test. If you need something else (like binaries), just write. And this is the patch itself. I've tried to keep the changes minimal, with respect to white-space, etc. I've removed a "return FALSE", because I don't calculate a determinant explicitly. commit c9ca2cab58fa0cba3d6b24cfb2af507fd1c07227 Author: Alexander Almaleh <sashoalm(a)gmail.com> Date: Tue May 20 18:33:55 2014 +0300 Fix for the calculation of the XFORM matrix in PlgBlt. diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 4750d1b..1de25b9 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -992,22 +992,32 @@ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, HDC hdcSrc, INT nXSrc, INT nYSrc, INT nWidth, INT nHeight, HBITMAP hbmMask, INT xMask, INT yMask) { + /* we need to use floating-point precision when calculating the + * XFORM matrix to avoid loss of precision due to rounding */ + typedef struct tagPOINTLF + { + double x, y; + } POINTLF; + int oldgMode; /* parallelogram coords */ - POINT plg[3]; + POINTLF plg[3]; /* rect coords */ - POINT rect[3]; + POINTLF rect[3]; XFORM xf; XFORM SrcXf; XFORM oldDestXf; - double det; + int ii; /* save actual mode, set GM_ADVANCED */ oldgMode = SetGraphicsMode(hdcDest,GM_ADVANCED); if (oldgMode == 0) return FALSE; - memcpy(plg,lpPoint,sizeof(POINT)*3); + for (ii = 0; ii < 3; ii++) { + plg[ii].x = lpPoint[ii].x; + plg[ii].y = lpPoint[ii].y; + } rect[0].x = nXSrc; rect[0].y = nYSrc; rect[1].x = nXSrc + nWidth; @@ -1015,33 +1025,39 @@ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, rect[2].x = nXSrc; rect[2].y = nYSrc + nHeight; /* calc XFORM matrix to transform hdcDest -> hdcSrc (parallelogram to rectangle) */ - /* determinant */ - det = rect[1].x*(rect[2].y - rect[0].y) - rect[2].x*(rect[1].y - rect[0].y) - rect[0].x*(rect[2].y - rect[1].y); - - if (fabs(det) < 1e-5) - { - SetGraphicsMode(hdcDest,oldgMode); - return FALSE; - } TRACE("hdcSrc=%p %d,%d,%dx%d -> hdcDest=%p %d,%d,%d,%d,%d,%d\n", hdcSrc, nXSrc, nYSrc, nWidth, nHeight, hdcDest, plg[0].x, plg[0].y, plg[1].x, plg[1].y, plg[2].x, plg[2].y); /* X components */ - xf.eM11 = (plg[1].x*(rect[2].y - rect[0].y) - plg[2].x*(rect[1].y - rect[0].y) - plg[0].x*(rect[2].y - rect[1].y)) / det; - xf.eM21 = (rect[1].x*(plg[2].x - plg[0].x) - rect[2].x*(plg[1].x - plg[0].x) - rect[0].x*(plg[2].x - plg[1].x)) / det; - xf.eDx = (rect[0].x*(rect[1].y*plg[2].x - rect[2].y*plg[1].x) - - rect[1].x*(rect[0].y*plg[2].x - rect[2].y*plg[0].x) + - rect[2].x*(rect[0].y*plg[1].x - rect[1].y*plg[0].x) - ) / det; + xf.eM11 = -(rect[1].y*plg[2].x+rect[0].y*(plg[1].x-plg[2].x) + -rect[2].y*plg[1].x+plg[0].x*(rect[2].y-rect[1].y)) + /(rect[0].y*(rect[2].x-rect[1].x)-rect[1].y*rect[2].x+ + rect[2].y*rect[1].x+(rect[1].y-rect[2].y)*rect[0].x); + xf.eM21 = (plg[0].x*(rect[2].x-rect[1].x)-plg[1].x*rect[2].x + +plg[2].x*rect[1].x+(plg[1].x-plg[2].x)*rect[0].x) + /(rect[0].y*(rect[2].x-rect[1].x)-rect[1].y*rect[2].x + +rect[2].y*rect[1].x+(rect[1].y-rect[2].y)*rect[0].x); + xf.eDx = -(rect[0].y*(plg[2].x*rect[1].x-plg[1].x*rect[2].x) + +plg[0].x*(rect[1].y*rect[2].x-rect[2].y*rect[1].x) + +(rect[2].y*plg[1].x-rect[1].y*plg[2].x)*rect[0].x) + /(rect[0].y*(rect[2].x-rect[1].x)-rect[1].y*rect[2].x+rect[2].y + *rect[1].x+(rect[1].y-rect[2].y)*rect[0].x); /* Y components */ - xf.eM12 = (plg[1].y*(rect[2].y - rect[0].y) - plg[2].y*(rect[1].y - rect[0].y) - plg[0].y*(rect[2].y - rect[1].y)) / det; - xf.eM22 = (plg[1].x*(rect[2].y - rect[0].y) - plg[2].x*(rect[1].y - rect[0].y) - plg[0].x*(rect[2].y - rect[1].y)) / det; - xf.eDy = (rect[0].x*(rect[1].y*plg[2].y - rect[2].y*plg[1].y) - - rect[1].x*(rect[0].y*plg[2].y - rect[2].y*plg[0].y) + - rect[2].x*(rect[0].y*plg[1].y - rect[1].y*plg[0].y) - ) / det; + xf.eM12 = -(rect[1].y*(plg[2].y-plg[0].y)+rect[0].y*(plg[1].y + -plg[2].y)+rect[2].y*(plg[0].y-plg[1].y))/(rect[0].y*(rect[2].x + -rect[1].x)-rect[1].y*rect[2].x+rect[2].y*rect[1].x+(rect[1].y + -rect[2].y)*rect[0].x); + xf.eM22 = ((plg[0].y-plg[1].y)*rect[2].x+(plg[2].y-plg[0].y)*rect[1].x + +(plg[1].y-plg[2].y)*rect[0].x) /(rect[0].y*(rect[2].x-rect[1].x) + -rect[1].y*rect[2].x+rect[2].y*rect[1].x+(rect[1].y-rect[2].y) + *rect[0].x); + xf.eDy = (rect[0].y*(plg[1].y*rect[2].x-plg[2].y*rect[1].x) + -rect[1].y*plg[0].y*rect[2].x+rect[2].y*plg[0].y*rect[1].x + +(rect[1].y*plg[2].y-rect[2].y*plg[1].y)*rect[0].x)/(rect[0].y + *(rect[2].x-rect[1].x)-rect[1].y*rect[2].x+rect[2].y*rect[1].x + +(rect[1].y-rect[2].y)*rect[0].x); GetWorldTransform(hdcSrc,&SrcXf); CombineTransform(&xf,&xf,&SrcXf);

4 10