March 2017 - Wine-Devel - list.winehq.org

Re: [PATCH] oledb32/tests: Add convert to DBTYPE_NUMERIC tests
by Huw Davies March 24, 2017

March 24, 2017

On Fri, Mar 24, 2017 at 01:11:17AM +0000, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/oledb32/tests/convert.c | 147 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 147 insertions(+) > > diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c > index b8b3c6f..4e49058 100644 > --- a/dlls/oledb32/tests/convert.c > +++ b/dlls/oledb32/tests/convert.c > @@ -3264,6 +3264,152 @@ static void test_converttoiunknown(void) > ok(dst_len == 44, "got %ld\n", dst_len); > } > > +#define test_numberic_val(dst, array) _test_numberic_val(__LINE__, dst, array); > +static inline void _test_numberic_val(unsigned line, DB_NUMERIC *dst, BYTE *array) > +{ > + int same = !memcmp(dst->val, array, sizeof(dst->val)); > + ok_(__FILE__,line) (same, "Invalid byte array\n"); > + if(!same) > + { > + int i; > + for(i=0; i < sizeof(dst->val); i++) > + ok_(__FILE__,line) (dst->val[i] == array[i], " byte %d got 0x%02x\n", i, dst->val[i]); > + } > +} > + > +static inline void set_numberic_array(BYTE *dst, > + BYTE x0, BYTE x1, BYTE x2, BYTE x3, BYTE x4, BYTE x5, BYTE x6, > + BYTE x7, BYTE x8, BYTE x9, BYTE x10, BYTE x11, BYTE x12, BYTE x13, > + BYTE x14, BYTE x15) > +{ > + dst[0] = x0; dst[1] = x1; dst[2] = x2; dst[3] = x3; > + dst[4] = x4; dst[5] = x5; dst[6] = x6; dst[7] = x7; > + dst[8] = x8; dst[9] = x9; dst[10] = x10; dst[11] = x11; > + dst[12] = x12; dst[13] = x13; dst[14] = x14; dst[15] = x15; > +} > + > +static void test_converttonumeric(void) > +{ > + HRESULT hr; > + DBSTATUS dst_status; > + DBLENGTH dst_len; > + DB_NUMERIC dst; > + BYTE src[20]; > + static WCHAR strW[] = {'1','2','3','.','4','5',0}; > + static WCHAR largeW[] = {'1','2','3','4','5','6','7','8','9','0',0}; > + BSTR bstr; > + FLOAT fvalue = 543.21f; > + VARIANT_BOOL boolean = VARIANT_TRUE; > + LARGE_INTEGER i8; > + BYTE array[16]; > + > + *(INT *)src = 4098; > + dst_len = 0x1234; > + dst.scale = 30; > + memset(dst.val, 0xfe, sizeof(dst.val)); > + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_NUMERIC, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 10, 0, 0); > + todo_wine ok(hr == S_OK, "got %08x\n", hr); > + todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); > + todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); > + todo_wine ok(dst.precision == 10, "returned %d\n", dst.precision); > + todo_wine ok(dst.scale == 0, "returned %d\n", dst.scale); > + todo_wine ok(dst.sign == 1, "returned %d\n", dst.sign); > + set_numberic_array(array, 0x02, 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); > + todo_wine test_numberic_val(&dst, array); All this seems overly complicated. How about something like: DB_NUMERIC val1 = {10, 0, 1, {0x02, 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }}; /* 4098 */ .... hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_NUMERIC, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 10, 0, 0); todo_wine ok(hr == S_OK, "got %08x\n", hr); todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); todo_wine ok(!memcmp(&dst, &val1, sizeof(dst), "mismatch\n"); It doesn't print out the retrieved value on failure, and you could add this if you want. However, once the conversion is actually implemented, you won't need that anyway. You should probably add a test for converting a variant of type VT_NULL too. Huw.

1 0

Star Trek Online changed their routine for d3dcompiler_47.dll
by cyfer3＠googlemail.com March 23, 2017

March 23, 2017

Hi dev's! I'd like to report something that might have been working in wine-staging 2.3 but doesn't work in wine-staging current (2.4) but that's not necessarily a wine (mis)understanding as it looks, but I'd rather like to point out, the workaround that has been posted here <https://www.codeweavers.com/compatibility/crossover/forum/star-trek-online?…> doesn't seem to work anymore and with wine-devel 2.4 it is at least possible to see any characters on the login screen, but it crashes right after picking any. This issue might be connected with Cryptic has abandoned dx9 support entirely and I'm very grateful that it worked until today and hopefully will work again in future. Thank you for your work and heart to the project! I hope you will reply to this mail but it's ok if you don't. Regards.

3 3

Re: [v2 3/3] d3dx9/tests: Add more tests for preshader relative addressing.
by Matteo Bruni March 23, 2017

March 23, 2017

2017-03-23 16:25 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > +static void test_effect_preshader_relative_addressing(IDirect3DDevice9 *device) > +{ > + static const struct > + { > + D3DXVECTOR4 opvect2; > + D3DXVECTOR4 g_ivect; > + unsigned int result[4]; > + } > + test_out_of_bounds_index[] = Better as out_of_bounds_index_tests[] or similar. > + static const struct > + { > + unsigned int zw[2]; > + } > + test_index_range[] = This one would be clearer as expected_light_specular[] or something like that. > + fvect.x = 1001.f; fvect.y = 1002.f; fvect.z = 1003.f; fvect.w = 1004.f; For consistency, please write out the 0 after the decimal separator. > + for (j = 0; j < 4; ++j) > + { > + ok(compare_float(v[j], ((const float *)test_out_of_bounds_index[i].result)[j], 0), > + "Test %u, component %u, expected %#x (%g), got %#x (%g).\n", > + i, j, test_out_of_bounds_index[i].result[j], > + ((const float *)test_out_of_bounds_index[i].result)[j], > + ((const unsigned int *)v)[j], v[j]); You could factor out a variable for the const float * (expected_float?) and use it twice here. > + for (j = 0; j < 2; ++j) > + { > + ok(compare_float(v[j + 2], ((const float *)test_index_range[(unsigned int)i & 7].zw)[j], 0), > + "Test %u, component %u, expected %#x (%g), got %#x (%g).\n", > + i, j, test_index_range[(unsigned int)i & 7].zw[j], > + ((const float *)test_index_range[(unsigned int)i & 7].zw)[j], > + ((const unsigned int *)v)[j + 2], v[j + 2]); Same here. In addition you could set v to &light.Specular.b before this part of the test and avoid those "+ 2".

1 0

Re: [PATCH 1/5] winex11: Use GLX_OML_sync_control to synchronise buffer swaps with X11DRV_FLUSH_GL_DRAWABLE requests.
by Ken Thomases March 23, 2017

March 23, 2017

On Mar 23, 2017, at 4:49 PM, Henri Verbeet <hverbeet(a)codeweavers.com> wrote: > > @@ -3330,17 +3343,26 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) > gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top ); > break; > } > - pglXSwapBuffers(gdi_display, gl->drawable); > + if (pglXSwapBuffersMscOML) > + target_sbc = pglXSwapBuffersMscOML( gdi_display, gl->drawable, 0, 0, 0 ); > + else > + pglXSwapBuffers( gdi_display, gl->drawable ); > break; > case DC_GL_CHILD_WIN: > if (ctx) sync_context( ctx ); > escape.gl_drawable = gl->window; > /* fall through */ > default: > - pglXSwapBuffers(gdi_display, gl->drawable); > + if (pglXSwapBuffersMscOML) > + target_sbc = pglXSwapBuffersMscOML( gdi_display, gl->drawable, 0, 0, 0 ); > + else > + pglXSwapBuffers( gdi_display, gl->drawable ); > break; > } > > + if (escape.gl_drawable && pglXWaitForSbcOML) > + pglXWaitForSbcOML( gdi_display, gl->drawable, target_sbc, &ust, &msc, &sbc ); > + > release_gl_drawable( gl ); > > if (escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); According to the spec <https://www.khronos.org/registry/OpenGL/extensions/OML/GLX_OML_sync_control…>, glXSwapBuffersMscOML() does not perform an implicit glFlush() as glXSwapBuffers() does. Also, there's no indication that glXWaitForSbcOML() performs one either, although it sort of seems like it should. Is that a problem? -Ken

2 1

Re: [PATCH 4/5] include: Add comments to blocks of render states added with each D3D version.
by Henri Verbeet March 23, 2017

March 23, 2017

On 22 March 2017 at 23:17, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > include/wine/wined3d.h | 5 +++++ > 1 file changed, 5 insertions(+) > Are you using these? I'm not necessarily opposed, but in principle wined3d has no concept of Direct3D versions. There's also the consideration that in principle render states will eventually go away in favour of DIrect3D 10 style state object.

2 1

Re: [PATCH v5 1/2] d3d10core/tests: Add a geometry shader test.
by Henri Verbeet March 23, 2017

March 23, 2017

On 22 March 2017 at 23:53, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > v2: Update for the changed get_texture_readback() and the new > create_buffer() helpers. > v3: Strip debug info from the GS. > v4: Drop some unnecessary state setup. > v5: Get rid of an unused variable. > > This now passes on r600g. It looks like it was indirectly fixed by Mesa > commit 0d383a79a8f13bb00ed5e5d84f41071b43c7e92d "glsl/lower_output_reads: > fix geometry shader output handling with conditional emit" which is in > Mesa 17.0+. > And 13.0.2+, for what it's worth.

1 0

Re: [PATCH 4/7] msvcrt: Add Context::Id tests
by Marvin March 23, 2017

March 23, 2017

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=29651 Your paranoid android. === wxppro (32 bit msvcr100) === msvcr100.c:874: Test failed: Context::Id() = 0 msvcr100.c:863: Test failed: Context::Id() = 8 === w2003std (32 bit msvcr100) === msvcr100.c:874: Test failed: Context::Id() = 0 msvcr100.c:863: Test failed: Context::Id() = 15 === wvistau64 (32 bit msvcr100) === msvcr100.c:874: Test failed: Context::Id() = 0 msvcr100.c:863: Test failed: Context::Id() = 2 === w2008s64 (32 bit msvcr100) === msvcr100.c:874: Test failed: Context::Id() = 0 msvcr100.c:863: Test failed: Context::Id() = 21 === w8 (32 bit msvcr100) === msvcr100.c:874: Test failed: Context::Id() = 0 msvcr100.c:863: Test failed: Context::Id() = 2 === w864 (32 bit msvcr100) === msvcr100.c:874: Test failed: Context::Id() = 0 msvcr100.c:863: Test failed: Context::Id() = 7 === wvistau64 (64 bit msvcr100) === msvcr100.c:874: Test failed: Context::Id() = 0 msvcr100.c:863: Test failed: Context::Id() = 12 === w2008s64 (64 bit msvcr100) === msvcr100.c:874: Test failed: Context::Id() = 0 msvcr100.c:863: Test failed: Context::Id() = 11 === w864 (64 bit msvcr100) === msvcr100.c:874: Test failed: Context::Id() = 0 msvcr100.c:863: Test failed: Context::Id() = 12

1 0

Re: [PATCH] mshtml/tests: Free ready state BSTR (Valgrind)
by Nikolay Sivov March 23, 2017

March 23, 2017

On 23.03.2017 6:07, Daniel Lehman wrote: > 1 loop of xmlview tests: > ==2633== 32 bytes in 1 blocks are definitely lost in loss record 624 of 2,647 > ==2633== at 0x7BC516E5: RtlAllocateHeap (heap.c:254) > ==2633== by 0x5123CAA: IMalloc_fnAlloc (ifs.c:187) > ==2633== by 0x512416C: IMalloc_Alloc (objidl.h:1508) > ==2633== by 0x512416C: CoTaskMemAlloc (???:0) > ==2633== by 0x4DC843E: alloc_bstr (oleaut.c:177) > ==2633== by 0x4DC89C8: SysAllocStringLen (oleaut.c:355) > ==2633== by 0x4DC8AC6: SysAllocString (oleaut.c:247) > ==2633== by 0x77B4DE8: get_readystate_string (htmlelem.c:248) > ==2633== by 0x779A522: HTMLDocument_get_readyState (htmldoc.c:641) > ==2633== by 0x4C6B064: HTMLEvents_Invoke (mshtml.h:56005) > ==2633== by 0x77BC74A: call_event_handlers (oaidl.h:887) > ==2633== by 0x77BCC70: fire_event_obj.isra.6 (htmlevent.c:1134) > ==2633== by 0x783CE76: notif_readystate (persist.c:451) > ==2633== by 0x7823B30: handle_load (nsevents.c:253) > ==2633== by 0x6B18A8A8: ??? > > 3 loops of xmlview tests: > ==23851== 96 bytes in 3 blocks are definitely lost in loss record 1,767 of 2,701 > ==23851== at 0x7BC516D5: RtlAllocateHeap (heap.c:254) > ==23851== by 0x5123CAA: IMalloc_fnAlloc (ifs.c:187) > ==23851== by 0x512416C: IMalloc_Alloc (objidl.h:1508) > ==23851== by 0x512416C: CoTaskMemAlloc (???:0) > ==23851== by 0x4DC843E: alloc_bstr (oleaut.c:177) > ==23851== by 0x4DC89C8: SysAllocStringLen (oleaut.c:355) > ==23851== by 0x4DC8AC6: SysAllocString (oleaut.c:247) > ==23851== by 0x7683DE8: get_readystate_string (htmlelem.c:248) > ==23851== by 0x7669522: HTMLDocument_get_readyState (htmldoc.c:641) > ==23851== by 0x4C6B314: HTMLEvents_Invoke (mshtml.h:56005) > ==23851== by 0x768B74A: call_event_handlers (oaidl.h:887) > ==23851== by 0x768BC70: fire_event_obj.isra.6 (htmlevent.c:1134) > ==23851== by 0x770BE76: notif_readystate (persist.c:451) > ==23851== by 0x76F2B30: handle_load (nsevents.c:253) > ==23851== by 0x6B18A8A8: ??? > > Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> > --- > dlls/msxml3/tests/xmlview.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/dlls/msxml3/tests/xmlview.c b/dlls/msxml3/tests/xmlview.c > index 3c1d8d9..dc8ab7d 100644 > --- a/dlls/msxml3/tests/xmlview.c > +++ b/dlls/msxml3/tests/xmlview.c > @@ -130,6 +130,7 @@ static HRESULT WINAPI HTMLEvents_Invoke(IDispatch *iface, DISPID dispIdMember, R > ok(hr == S_OK, "got 0x%08x\n", hr); > if(!memcmp(state, completeW, sizeof(completeW))) > loaded = TRUE; > + SysFreeString(state); > } > > return S_OK; > This obviously looks correct, please resend with subject changed to msxml3/tests.

1 0

Re: Nikolay Sivov : comctl32/taskdialog: Initial implementation of a minimal task dialog.
by Fabian Maurer March 23, 2017

March 23, 2017

> Author: Nikolay Sivov <nsivov(a)codeweavers.com> > Date: Tue Mar 21 17:31:20 2017 +0300 > > comctl32/taskdialog: Initial implementation of a minimal task dialog. > > Based on patches by Fabian Maurer. Thanks for taking the time to rework it, really appreciate it! However, there's a few questions I'd like to ask. > static const WCHAR nulW; Shouldn't this be set 0? > if (radio_button) *radio_button = taskconfig->nDefaultButton; This probably should have been changed, it was already wrong in the old implementation. > /* write control entries */ > LIST_FOR_EACH_ENTRY_SAFE(control, control2, &desc.controls, struct taskdialog_control, entry) > { > ALIGN_POINTER(ptr, 3); > > template_write_data(&ptr, control->template, control->template_size); > > /* list item won't be needed later */ > list_remove(&control->entry); > Free(control->template); > Free(control); > } Wouldn't it be shorter to also use "taskdialog_clear_controls" here? Just curious on why you chose to write it again. Also, wouldn't it make sense to keep the template generating code separated from the taskdialog specific bits? I intentionally split it, so we could use those function in another place, if needed. In my opinion, that also makes the code easier readable. Finally, are you adding the rest from my latest patch-set too, or should I adapt the missing parts? Regards, Fabian Maurer

2 1

Re: [PATCH 2/5] usp10: Avoid LPPOINT.
by Aric Stewart March 22, 2017

March 22, 2017

Hi, I think I would personally almost prefer if all 4 of these where one patch. A few of them are only 1-2 changes and this one does both avoid LPPOINT and avoid LPCVOID, some of them rename variables as well. All changes I am happy to sign-off on. -aric On 3/21/17 4:59 PM, Henri Verbeet wrote: > Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> > --- > dlls/usp10/opentype.c | 41 +++++++++++++++++++++++------------------ > 1 file changed, 23 insertions(+), 18 deletions(-) > > diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c > index 701e1a0..0579aed 100644 > --- a/dlls/usp10/opentype.c > +++ b/dlls/usp10/opentype.c > @@ -1529,7 +1529,7 @@ static INT GPOS_get_device_table_value(const OT_DeviceTable *DeviceTable, WORD p > return 0; > } > > -static VOID GPOS_get_anchor_values(LPCVOID table, LPPOINT pt, WORD ppem) > +static void GPOS_get_anchor_values(const void *table, POINT *pt, WORD ppem) > { > const GPOS_AnchorFormat1* anchor1 = (const GPOS_AnchorFormat1*)table; > > @@ -1607,7 +1607,8 @@ static INT GPOS_get_value_record(WORD ValueFormat, const WORD data[], GPOS_Value > return offset; > } > > -static VOID GPOS_get_value_record_offsets(const BYTE* head, GPOS_ValueRecord *ValueRecord, WORD ValueFormat, INT ppem, LPPOINT ptPlacement, LPPOINT ptAdvance) > +static void GPOS_get_value_record_offsets(const BYTE *head, GPOS_ValueRecord *ValueRecord, > + WORD ValueFormat, unsigned int ppem, POINT *ptPlacement, POINT *ptAdvance) > { > if (ValueFormat & 0x0001) ptPlacement->x += (short)ValueRecord->XPlacement; > if (ValueFormat & 0x0002) ptPlacement->y += (short)ValueRecord->YPlacement; > @@ -1639,8 +1640,9 @@ static const BYTE *GPOS_get_subtable(const OT_LookupTable *look, int index) > return (const BYTE *)look + offset; > } > > -static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, > - INT glyph_count, INT ppem, LPPOINT ptAdjust, LPPOINT ptAdvance) > +static void GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, > + const WORD *glyphs, unsigned int glyph_index, unsigned int glyph_count, unsigned int ppem, > + POINT *adjust, POINT *advance) > { > int j; > > @@ -1658,7 +1660,7 @@ static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const SCRIPT > GPOS_ValueRecord ValueRecord = {0,0,0,0,0,0,0,0}; > WORD ValueFormat = GET_BE_WORD(spf1->ValueFormat); > GPOS_get_value_record(ValueFormat, spf1->Value, &ValueRecord); > - GPOS_get_value_record_offsets((const BYTE*)spf1, &ValueRecord, ValueFormat, ppem, ptAdjust, ptAdvance); > + GPOS_get_value_record_offsets((const BYTE *)spf1, &ValueRecord, ValueFormat, ppem, adjust, advance); > TRACE("Glyph Adjusted by %i,%i\n",ValueRecord.XPlacement,ValueRecord.YPlacement); > } > } > @@ -1680,7 +1682,7 @@ static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const SCRIPT > offset = size * index; > GPOS_get_value_record(ValueFormat, &spf2->Value[offset], &ValueRecord); > } > - GPOS_get_value_record_offsets((const BYTE*)spf2, &ValueRecord, ValueFormat, ppem, ptAdjust, ptAdvance); > + GPOS_get_value_record_offsets((const BYTE *)spf2, &ValueRecord, ValueFormat, ppem, adjust, advance); > TRACE("Glyph Adjusted by %i,%i\n",ValueRecord.XPlacement,ValueRecord.YPlacement); > } > } > @@ -1713,13 +1715,14 @@ static void apply_pair_value( const void *pos_table, WORD val_fmt1, WORD val_fmt > } > } > > -static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, > - INT glyph_count, INT ppem, LPPOINT ptAdjust, LPPOINT ptAdvance) > +static int GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, > + const WORD *glyphs, unsigned int glyph_index, unsigned int glyph_count, unsigned int ppem, > + POINT *adjust, POINT *advance) > { > int j; > int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; > > - if (glyph_index + write_dir < 0 || glyph_index + write_dir >= glyph_count) > + if (glyph_index + write_dir >= glyph_count) > return 1; > > TRACE("Pair Adjustment Positioning Subtable\n"); > @@ -1754,7 +1757,8 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_AN > { > int next = 1; > TRACE("Format 1: Found Pair %x,%x\n",glyphs[glyph_index],glyphs[glyph_index+write_dir]); > - apply_pair_value( ppf1, ValueFormat1, ValueFormat2, pair_val_rec->Value1, ppem, ptAdjust, ptAdvance ); > + apply_pair_value(ppf1, ValueFormat1, ValueFormat2, > + pair_val_rec->Value1, ppem, adjust, advance); > if (ValueFormat2) next++; > return next; > } > @@ -1787,7 +1791,7 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_AN > > TRACE( "Format 2: Found Pair %x,%x\n", glyphs[glyph_index], glyphs[glyph_index + write_dir] ); > > - apply_pair_value( ppf2, ValueFormat1, ValueFormat2, pair_val, ppem, ptAdjust, ptAdvance ); > + apply_pair_value(ppf2, ValueFormat1, ValueFormat2, pair_val, ppem, adjust, advance); > if (ValueFormat2) next++; > return next; > } > @@ -1799,13 +1803,14 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_AN > return 1; > } > > -static VOID GPOS_apply_CursiveAttachment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, > - INT glyph_count, INT ppem, LPPOINT pt) > +static void GPOS_apply_CursiveAttachment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, > + const WORD *glyphs, unsigned int glyph_index, unsigned int glyph_count, unsigned int ppem, POINT *pt) > { > int j; > int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; > > - if (glyph_index + write_dir < 0 || glyph_index + write_dir >= glyph_count) return; > + if (glyph_index + write_dir >= glyph_count) > + return; > > TRACE("Cursive Attachment Positioning Subtable\n"); > > @@ -1925,8 +1930,8 @@ static int GPOS_apply_MarkToBase(const ScriptCache *script_cache, const OT_Looku > return rc; > } > > -static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, > - INT glyph_count, INT ppem, LPPOINT pt) > +static void GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, > + const WORD *glyphs, unsigned int glyph_index, unsigned int glyph_count, unsigned int ppem, POINT *pt) > { > int j; > int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; > @@ -2015,8 +2020,8 @@ static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_A > } > } > > -static BOOL GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, > - INT glyph_count, INT ppem, LPPOINT pt) > +static BOOL GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, > + const WORD *glyphs, unsigned int glyph_index, unsigned int glyph_count, unsigned int ppem, POINT *pt) > { > int j; > BOOL rc = FALSE; >

2 2

Re: [PATCH 1/5] d3d11: Downgrade unknown DWORD FIXMEs() to TRACE() messages.
by Henri Verbeet March 22, 2017

March 22, 2017

On 22 March 2017 at 09:40, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -727,11 +727,11 @@ void skip_dword_unknown(const char **ptr, unsigned int count) > unsigned int i; > DWORD d; > > - FIXME("Skipping %u unknown DWORDs:\n", count); > + TRACE("Skipping %u unknown DWORDs:\n", count); > for (i = 0; i < count; ++i) > { > read_dword(ptr, &d); > - FIXME("\t0x%08x\n", d); > + TRACE("\t0x%08x\n", d); > } > } > I think WARN would be appropriate.

1 0

Re: [PATCH 1/3] odbccp32: Implement SQLInstallTranslator
by Hans Leidekker March 22, 2017

March 22, 2017

On Wed, 2017-03-22 at 00:14 +0000, Alistair Leslie-Hughes wrote: > + reg_ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBCINST.INI\\WINE ODBC Translator", 0, KEY_READ, &hkey); > + ok(reg_ret == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); > + if (reg_ret == ERROR_SUCCESS) > + { > + DWORD type, size = MAX_PATH; > + char driverpath[MAX_PATH]; > + > + strcpy(driverpath, syspath); > + strcat(driverpath, "\\sample.dll"); > + > + reg_ret = RegGetValueA(hkey, NULL, "Translator", RRF_RT_REG_SZ, &type, &path, &size); > + ok(reg_ret == ERROR_SUCCESS, "RegGetValueA failed\n"); > + ok(!strcmp(path, driverpath), "invalid path %s\n", path); RegGetValueA is not available on XP. A warning dialog is shown but it's never closed, which can cause failures in tests that follow: https://testbot.winehq.org/JobDetails.pl?Key=29622&scrshot_101=1#k101 I've submitted a patch that avoids RegGetValueA. Please do something similar in these patches.

1 0

Re: [PATCH v2] msvcp100: Add stub for Concurrency::is_current_task_group_canceling
by Piotr Caban March 22, 2017

March 22, 2017

Hi, Is any application working thanks to this patch (not crashing on next unimplemented function)? Thanks, Piotr

2 3

Outreachy Internships
by Iwona Kotlarska March 21, 2017

March 21, 2017

Hi everyone, I'm new to contributing to Wine and I would like to apply to Outreachy Internship. I'm generally comfortable with C, but I don't understand Wine's code yet. I tried to download and build Wine on my computer, I followed this: https://wiki.winehq.org/Developer_FAQ#How_do_I_download_and_build_the_very_… and make fails (linking actually) with undefined reference to yywrap in function yylex in file programs/winhlp32/macro.lex.yy.c line 1032. I'm using gcc 5.4.0. Could anyone help me solve this compilation issue? And suggest some small bugs to work on after succesfully compiling wine? Thanks in advance for help! Iwona Kotlarska

4 3

Re: cmd: Adjust CMD_LIST to a tree-like structure and implement command chains
by Marvin March 21, 2017

March 21, 2017

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=29617 Your paranoid android. === wxppro (32 bit) === Found no trace of a test summary line or of a crash === w2003std (32 bit) === Found no trace of a test summary line or of a crash === wvistau64 (32 bit) === Found no trace of a test summary line or of a crash === w2008s64 (32 bit) === Found no trace of a test summary line or of a crash === w7u (32 bit) === Found no trace of a test summary line or of a crash === w7pro64 (32 bit) === Found no trace of a test summary line or of a crash === w8 (32 bit) === Found no trace of a test summary line or of a crash === w864 (32 bit) === Found no trace of a test summary line or of a crash === w1064 (32 bit) === Found no trace of a test summary line or of a crash === wvistau64 (64 bit) === Found no trace of a test summary line or of a crash === w2008s64 (64 bit) === Found no trace of a test summary line or of a crash === w7pro64 (64 bit) === Found no trace of a test summary line or of a crash === w864 (64 bit) === Found no trace of a test summary line or of a crash === w1064 (64 bit) === Found no trace of a test summary line or of a crash

1 0

Re: [PATCH 3/4] xmllite: Set empty value for end element nodes.
by Nikolay Sivov March 21, 2017

March 21, 2017

On 21.03.2017 18:19, Jacek Caban wrote: > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > dlls/xmllite/reader.c | 1 + > 1 file changed, 1 insertion(+) > Could you make this another node type case in GetValue? Like for XmlNodeType_XmlDeclaration. The goal is to make sure empty static string is returned unconditionally for certain node types, as opposed to heap-allocated empty string.

2 1

Re: [PATCH v2 resend] user32: Don't call IsChild with NULL window in EnableWindow
by Marvin March 21, 2017

March 21, 2017

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=29610 Your paranoid android. === w7u (32 bit win) === win.c:999: Test failed: wrong dwWindowStatus: 0000 != 0001 active 00A90148 fg 000F0138 in hook HCBT_MINMAX

1 0

Re: [6/7] [resend] version: Add support for FILE_VER_GET_LOCALISED flag.
by Alexandre Julliard March 21, 2017

March 21, 2017

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > @@ -356,7 +356,10 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) > TRACE("No resid entry found\n" ); > goto done; > } > - resPtr = find_entry_language( resPtr, resDir ); > + if ( flags & FILE_VER_GET_LOCALISED ) > + resPtr = find_entry_language( resPtr, resDir ); > + else > + resPtr = find_entry_default( resPtr, resDir ); This won't do what you want, it will return the first available resource which may not be English. > @@ -642,12 +645,12 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD h > SetLastError(ERROR_BAD_PATHNAME); > return 0; > } > - if (flags) > - FIXME("flags 0x%x ignored\n", flags); > + if (flags & ~FILE_VER_GET_LOCALISED) > + FIXME("flags 0x%x ignored\n", flags & ~FILE_VER_GET_LOCALISED); > > if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR) > { > - magic = find_version_resource( lzfd, &len, &offset ); > + magic = find_version_resource( lzfd, &len, &offset, flags ); > LZClose( lzfd ); > } You'd also need to change the FindResourceW call a few lines below. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: wined3d: A grammar fix in a comment.
by Henri Verbeet March 21, 2017

March 21, 2017

On 12 March 2017 at 20:47, Francois Gouget <fgouget(a)free.fr> wrote: > @@ -3645,8 +3645,8 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) > gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS, &gl_max); > gl_info->limits.compute_samplers = gl_max; > TRACE("Max compute samplers: %u.\n", gl_info->limits.compute_samplers); > - /* A majority of OpenGL implementations allow to statically partition > - * the set of texture bindings into six separate sets. */ > + /* A majority of OpenGL implementations allow applications to statically > + * partition the set of texture bindings into six separate sets. */ I think that changes the meaning somewhat.

2 2

32-bit dlls in 64-bit process
by Viktor Semykin March 20, 2017

March 20, 2017

Hello. I'm trying to run Adobe Photoshop Lightroom using Wine. One of the showstoppers was the fact that 64-bit process of Lightroom is loading 32-bit DLLs containing various resources. While Windows allows it [1 <https://support.microsoft.com/en-us/help/282423/list-of-limitations-in-64-b…>] wine does not. I made this simple change to Wine code just to make it work for my local usecase: > --- a/server/mapping.c > +++ b/server/mapping.c > @@ -414,8 +414,6 @@ static unsigned int get_image_params( struct > mapping *mapping, file_pos_t file_s > if (nt.opt.hdr32.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) > return STATUS_INVALID_IMAGE_FORMAT; > break; > case CPU_x86_64: > - if (nt.FileHeader.Machine != IMAGE_FILE_MACHINE_AMD64) return > STATUS_INVALID_IMAGE_FORMAT; > - if (nt.opt.hdr64.Magic != IMAGE_NT_OPTIONAL_HDR64_MAGIC) > return STATUS_INVALID_IMAGE_FORMAT; > break; > case CPU_POWERPC: > if (nt.FileHeader.Machine != IMAGE_FILE_MACHINE_POWERPC) > return STATUS_INVALID_IMAGE_FORMAT; From what I can tell this change looks neigher neat nor correct. My question is, what is /the/ correct way to allow loading 32-bit dll into 64-bit process just for loading its resources. Thank you. [1] https://support.microsoft.com/en-us/help/282423/list-of-limitations-in-64-b… -- best, Viktor.

1 0

Re: Fabian Maurer : comctl32/taskdialog: Move TaskDialogIndirect and its tests into own source files.
by Fabian Maurer March 20, 2017

March 20, 2017

Is there a reason you changed that copyright notice from "Copyright 2017 Fabian Maurer for the Wine project" to "Copyright 2017 Fabian Maurer" only in one place? If you wanted that "for the Wine project" part removed, I don't mind that, but I figured you'd do it at both places then. Regards, Fabian Maurer

3 4

Re: [PATCH 1/3] uiautomationcore: Add UiaLookupId stub.
by Jacek Caban March 20, 2017

March 20, 2017

Hi Andrey, On 19.03.2017 00:13, Andrey Gusev wrote: > Fixes bug 42665 > > Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> > --- > dlls/uiautomationcore/uia_main.c | 10 ++++++++++ > dlls/uiautomationcore/uiautomationcore.spec | 2 +- > include/uiautomationcoreapi.h | 10 ++++++++++ > 3 files changed, 21 insertions(+), 1 deletion(-) > > diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c > index 994d8e6..a16d3d1 100644 > --- a/dlls/uiautomationcore/uia_main.c > +++ b/dlls/uiautomationcore/uia_main.c > @@ -17,6 +17,7 @@ > */ > > #include "uiautomationcore.h" > +#include "uiautomationcoreapi.h" Please just use uiautomation.h instead of both includes. Thanks, Jacek

1 0

Re: [PATCH 2/3] uiautomationcore: Add UiaGetReservedMixedAttributeValue stub.
by Alistair Leslie-Hughes March 20, 2017

March 20, 2017

Hi Andrey, > +HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value) > +{ > + FIXME("(%p) stub!\n", value); > + return S_OK; > +} Your returning success but not assigning anything to the out parameter "value". If you have to return S_OK, maybe *value = NULL might be good enough. Same goes for patch 3. Best Regards Alistair Leslie-Hughes

1 0

Re: [PATCH] ntdll: Implement ProcessVmCounters for Linux.
by Alex Henrie March 20, 2017

March 20, 2017

So, I think Alexandre has been ignoring this patch because it only reports correct information for the current process, even though the Mac implementation has the same problem. I can think of a few ways to fix that: 1. Do nothing if the handle passed to NtQueryInformationProcess is the handle of another process. 2. Add a wineserver call such as get_process_unix_pid to get the process's Unix PID from its handle. Modify the Mac code to use task_for_pid and the Linux code to use /proc/%u/status. 3. Add a wineserver call such as get_process_vm_counters to get all the information that ProcessVmCounters needs without exposing the Unix PID. Move the Mac code into the wineserver and add the Linux code there too. Of those options, I think #3 makes the most sense. Ken, do you think it will cause any problems on Mac? -Alex

2 2

Re: [PATCH v4] msvcrt: Add stub for Concurrency::Alloc
by Gijs Vermeulen March 18, 2017

March 18, 2017

Hi, What is the difference between this version and my v3? Thank you in advance. Sincerely, Gijs Op 18 mrt. 2017 12:27 p.m. schreef "Piotr Caban" <piotr(a)codeweavers.com>: > From: Gijs Vermeulen <gijsvrm(a)gmail.com> > > Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > dlls/concrt140/concrt140.spec | 4 ++-- > dlls/msvcr100/msvcr100.spec | 4 ++-- > dlls/msvcr110/msvcr110.spec | 4 ++-- > dlls/msvcr120/msvcr120.spec | 4 ++-- > dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- > dlls/msvcrt/heap.c | 9 +++++++++ > 6 files changed, 19 insertions(+), 10 deletions(-) > > > > > >

2 2