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

Piotr Caban : msvcrt: Add ExternalContextBase::GetId implementation.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: a0a9b8fe74eb058ea36e5076d0c9d0ceb21293d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0a9b8fe74eb058ea36e5076d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 11:41:11 2017 +0100 msvcrt: Add ExternalContextBase::GetId implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 257637e..470d141 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +static int context_id = -1; + #ifdef __i386__ #define DEFINE_VTBL_WRAPPER(off) \ @@ -64,6 +66,7 @@ typedef struct { typedef struct { Context context; + unsigned int id; } ExternalContextBase; extern const vtable_ptr MSVCRT_ExternalContextBase_vtable; static void ExternalContextBase_ctor(ExternalContextBase*); @@ -168,8 +171,8 @@ unsigned int __cdecl Context_VirtualProcessorId(void) DEFINE_THISCALL_WRAPPER(ExternalContextBase_GetId, 4) unsigned int __thiscall ExternalContextBase_GetId(const ExternalContextBase *this) { - FIXME("(%p)->() stub\n", this); - return -1; + TRACE("(%p)->()\n", this); + return this->id; } DEFINE_THISCALL_WRAPPER(ExternalContextBase_GetVirtualProcessorId, 4) @@ -225,7 +228,9 @@ Context* __thiscall ExternalContextBase_vector_dtor(ExternalContextBase *this, u static void ExternalContextBase_ctor(ExternalContextBase *this) { + TRACE("(%p)->()\n", this); this->context.vtable = &MSVCRT_ExternalContextBase_vtable; + this->id = InterlockedIncrement(&context_id); } extern const vtable_ptr MSVCRT_type_info_vtable;

1 0

Piotr Caban : msvcrt: Add scheduler_resource_allocation_error class implementation.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: b281c47144577a4cf28cf5c49c38dbbfc654cb12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b281c47144577a4cf28cf5c49… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 11:41:21 2017 +0100 msvcrt: Add scheduler_resource_allocation_error class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 12 +++--- dlls/msvcr100/msvcr100.spec | 12 +++--- dlls/msvcr110/msvcr110.spec | 18 ++++----- dlls/msvcr120/msvcr120.spec | 18 ++++----- dlls/msvcr120_app/msvcr120_app.spec | 18 ++++----- dlls/msvcrt/cpp.c | 80 +++++++++++++++++++++++++++++++++++++ dlls/msvcrt/cxx.h | 2 + 7 files changed, 121 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b281c47144577a4cf28cf…

1 0

Piotr Caban : msvcrt/tests: Add Context::Id tests.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: ccdd3673e7a6d5369620670fe5be49e099ea8941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccdd3673e7a6d5369620670fe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 11:41:17 2017 +0100 msvcrt/tests: Add Context::Id tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/tests/msvcr100.c | 53 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index ac167fc..295e287 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -142,6 +142,10 @@ typedef struct { char pad[64]; } event; +typedef struct { + void *vtable; +} Context; + static int* (__cdecl *p_errno)(void); static int (__cdecl *p_wmemcpy_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); static int (__cdecl *p_wmemmove_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); @@ -189,6 +193,9 @@ static void (__thiscall *p_event_set)(event*); static size_t (__thiscall *p_event_wait)(event*, unsigned int); static int (__cdecl *p_event_wait_for_multiple)(event**, size_t, MSVCRT_bool, unsigned int); +static Context* (__cdecl *p_Context_CurrentContext)(void); +unsigned int (__cdecl *p_Context_Id)(void); + /* make sure we use the correct errno */ #undef errno #define errno (*p_errno()) @@ -221,6 +228,8 @@ static BOOL init(void) SET(p__aligned_msize, "_aligned_msize"); SET(p_atoi, "atoi"); + SET(p_Context_Id, "?Id(a)Context@Concurrency@@SAIXZ"); + if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(pSpinWait_ctor_yield, "??0?$_SpinWait@$00(a)details@Concurrency@@QEAA(a)P6AXXZ@Z"); SET(pSpinWait_dtor, "??_F?$_SpinWait@$00(a)details@Concurrency@@QEAAXXZ"); @@ -255,6 +264,8 @@ static BOOL init(void) SET(p_event_set, "?set(a)event@Concurrency@@QEAAXXZ"); SET(p_event_wait, "?wait(a)event@Concurrency@@QEAA_KI(a)Z"); SET(p_event_wait_for_multiple, "?wait_for_multiple(a)event@Concurrency@@SA_KPEAPEAV12(a)_K_NI@Z"); + + SET(p_Context_CurrentContext, "?CurrentContext(a)Context@Concurrency@@SAPEAV12(a)XZ"); } else { SET(pSpinWait_ctor_yield, "??0?$_SpinWait@$00(a)details@Concurrency@@QAE(a)P6AXXZ@Z"); SET(pSpinWait_dtor, "??_F?$_SpinWait@$00(a)details@Concurrency@@QAEXXZ"); @@ -289,6 +300,8 @@ static BOOL init(void) SET(p_event_set, "?set(a)event@Concurrency@@QAEXXZ"); SET(p_event_wait, "?wait(a)event@Concurrency@@QAEII(a)Z"); SET(p_event_wait_for_multiple, "?wait_for_multiple(a)event@Concurrency@@SAIPAPAV12(a)I_NI@Z"); + + SET(p_Context_CurrentContext, "?CurrentContext(a)Context@Concurrency@@SAPAV12(a)XZ"); } init_thiscall_thunk(); @@ -836,11 +849,51 @@ static void test_event(void) call_func1(p_event_dtor, &evt); } +static DWORD WINAPI external_context_thread(void *arg) +{ + unsigned int id; + Context *ctx; + + id = p_Context_Id(); + ok(id == -1, "Context::Id() = %u\n", id); + + ctx = p_Context_CurrentContext(); + ok(ctx != NULL, "Context::CurrentContext() = NULL\n"); + id = p_Context_Id(); + ok(id == 1, "Context::Id() = %u\n", id); + return 0; +} + +static void test_ExternalContextBase(void) +{ + unsigned int id; + Context *ctx; + HANDLE thread; + + id = p_Context_Id(); + ok(id == -1, "Context::Id() = %u\n", id); + + ctx = p_Context_CurrentContext(); + ok(ctx != NULL, "Context::CurrentContext() = NULL\n"); + id = p_Context_Id(); + ok(id == 0, "Context::Id() = %u\n", id); + + ctx = p_Context_CurrentContext(); + ok(ctx != NULL, "Context::CurrentContext() = NULL\n"); + id = p_Context_Id(); + ok(id == 0, "Context::Id() = %u\n", id); + + thread = CreateThread(NULL, 0, external_context_thread, NULL, 0, NULL); + ok(thread != NULL, "CreateThread failed: %d\n", GetLastError()); + WaitForSingleObject(thread, INFINITE); +} + START_TEST(msvcr100) { if (!init()) return; + test_ExternalContextBase(); test_wmemcpy_s(); test_wmemmove_s(); test_fread_s();

1 0

Matteo Bruni : wined3d: Get rid of the point sprite coordinate origin warning.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 398cc3aebe7dc7f774c00c85bf21e4601ac55e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=398cc3aebe7dc7f774c00c85b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 22 23:17:53 2017 +0100 wined3d: Get rid of the point sprite coordinate origin warning. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 4cb19e1..05a6380 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -490,15 +490,6 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s wined3d_texture_invalidate_location(ds->container, dsv->sub_resource_idx, ~location); } - if ((!gl_info->supported[WINED3D_GL_VERSION_2_0] - || !gl_info->supported[NV_POINT_SPRITE]) - && context->render_offscreen - && state->render_states[WINED3D_RS_POINTSPRITEENABLE] - && state->gl_primitive_type == GL_POINTS) - { - FIXME("Point sprite coordinate origin switching not supported.\n"); - } - stream_info = &context->stream_info; if (context->instance_count) instance_count = context->instance_count;

1 0

Henri Verbeet : usp10: Avoid LPCWSTR.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: cdd47c3dc3e5797edce0fe8b186bd6f4660baddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdd47c3dc3e5797edce0fe8b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 22 23:11:40 2017 +0100 usp10: Avoid LPCWSTR. And cleanup some style issues along the way. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 38 +++++++++++++++++++------------------- dlls/usp10/indic.c | 39 +++++++++++++++++++++++---------------- dlls/usp10/usp10.c | 2 +- dlls/usp10/usp10_internal.h | 11 ++++++----- 4 files changed, 49 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdd47c3dc3e5797edce0f…

1 0

Józef Kucia : wined3d: Generate geometry shader outputs when NULL pixel shader is used.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 1a1b3fd3bcd5b2b9cc8ad182204025af21dccba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a1b3fd3bcd5b2b9cc8ad1822… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 23 12:15:47 2017 +0100 wined3d: Generate geometry shader outputs when NULL pixel shader is used. In preparation for stream output. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3385d83..004d490 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7063,7 +7063,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); if (!gl_info->supported[ARB_CLIP_CONTROL]) shader_addline(buffer, "uniform vec4 pos_fixup;\n"); - shader_glsl_generate_sm4_rasterizer_input_setup(priv, shader, args->ps_input_count, gl_info); + shader_glsl_generate_sm4_rasterizer_input_setup(priv, shader, args->output_count, gl_info); shader_addline(buffer, "void main()\n{\n"); if (FAILED(shader_generate_main(shader, buffer, reg_maps, &priv_ctx))) return 0; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 011aee4..2c9976d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3407,8 +3407,8 @@ static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3 void find_gs_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, struct gs_compile_args *args) { - args->ps_input_count = state->shader[WINED3D_SHADER_TYPE_PIXEL] - ? state->shader[WINED3D_SHADER_TYPE_PIXEL]->limits->packed_input : 0; + args->output_count = state->shader[WINED3D_SHADER_TYPE_PIXEL] + ? state->shader[WINED3D_SHADER_TYPE_PIXEL]->limits->packed_input : shader->limits->packed_output; } void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 21c5f1b..b58da36 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1312,7 +1312,7 @@ struct vs_compile_args struct gs_compile_args { - unsigned int ps_input_count; + unsigned int output_count; }; struct wined3d_context;

1 0

Józef Kucia : wined3d: Handle stream output buffer bind flag.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 3d459c6152f2364ef28e2e7b505f20270c880b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d459c6152f2364ef28e2e7b5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 23 12:15:46 2017 +0100 wined3d: Handle stream output buffer bind flag. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c584147..3c6bc61 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1360,6 +1360,9 @@ static GLenum buffer_type_hint_from_bind_flags(const struct wined3d_gl_info *gl_ if (bind_flags & WINED3D_BIND_CONSTANT_BUFFER) return GL_UNIFORM_BUFFER; + if (bind_flags & WINED3D_BIND_STREAM_OUTPUT) + return GL_TRANSFORM_FEEDBACK_BUFFER; + if (bind_flags & ~(WINED3D_BIND_VERTEX_BUFFER | WINED3D_BIND_INDEX_BUFFER)) FIXME("Unhandled bind flags %#x.\n", bind_flags);

1 0

Henri Verbeet : usp10: Avoid LPBYTE.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: af617aaccacd4beebc6ec6da7a871969a6bf8160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af617aaccacd4beebc6ec6da7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 22 23:11:39 2017 +0100 usp10: Avoid LPBYTE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a1be308..0e7001f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1875,7 +1875,7 @@ static void find_fallback_font(enum usp10_script scriptid, WCHAR *FaceName) DWORD type; sprintfW(value, szFmt, scriptInformation[scriptid].scriptTag); - if (RegQueryValueExW(hkey, value, 0, &type, (LPBYTE)FaceName, &count)) + if (RegQueryValueExW(hkey, value, 0, &type, (BYTE *)FaceName, &count)) lstrcpyW(FaceName,scriptInformation[scriptid].fallbackFont); RegCloseKey(hkey); }

1 0

Henri Verbeet : usp10: Avoid LPWORD.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 34c2f745183b703b5e8cd3c364a4079c20f6591f URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c2f745183b703b5e8cd3c36… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 22 23:11:38 2017 +0100 usp10: Avoid LPWORD. And cleanup a style issue along the way. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 0579aed..e3c7a56 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -669,22 +669,22 @@ static int compare_group(const void *a, const void* b) return 0; } -DWORD OpenType_CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWORD pgi, DWORD flags) +DWORD OpenType_CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, WORD *glyph_index, DWORD flags) { /* BMP: use gdi32 for ease */ if (utf32c < 0x10000) { WCHAR ch = utf32c; - return GetGlyphIndicesW(hdc,&ch, 1, pgi, flags); + return GetGlyphIndicesW(hdc, &ch, 1, glyph_index, flags); } if (!psc->CMAP_format12_Table) psc->CMAP_format12_Table = load_CMAP_format12_table(hdc, psc); if (flags & GGI_MARK_NONEXISTING_GLYPHS) - *pgi = 0xffff; + *glyph_index = 0xffffu; else - *pgi = 0; + *glyph_index = 0u; if (psc->CMAP_format12_Table) { @@ -699,7 +699,7 @@ DWORD OpenType_CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWOR if (group) { DWORD offset = utf32c - GET_BE_DWORD(group->startCharCode); - *pgi = GET_BE_DWORD(group->startGlyphID) + offset; + *glyph_index = GET_BE_DWORD(group->startGlyphID) + offset; return 0; } }

1 0

Henri Verbeet : usp10: Avoid LPPOINT.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: ab8ec605b8ce126e41765180ca64603afd853cd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8ec605b8ce126e41765180c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 22 23:11:37 2017 +0100 usp10: Avoid LPPOINT. And cleanup some style issues along the way. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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;

1 0