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