wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Paul Gofman : d3dx9/tests: Extend test for relative addressing in preshaders.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: b096f03ca63caed6747c8e7cf624cd38ec7625fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b096f03ca63caed6747c8e7cf… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 3 19:51:23 2017 +0200 d3dx9/tests: Extend test for relative addressing in preshaders. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 1244 ++++++++++++++++++++++-------------------- 1 file changed, 664 insertions(+), 580 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b096f03ca63caed6747c8…

1 0

Paul Gofman : d3dx9: Support relative addressing in preshaders.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 42cbd578f76b0ec0612d4dca1c9f3e3fd4e7a91e URL: http://source.winehq.org/git/wine.git/?a=commit;h=42cbd578f76b0ec0612d4dca1… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 3 19:51:22 2017 +0200 d3dx9: Support relative addressing in preshaders. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 164 ++++++++++++++++++++++++++++++++++--------- dlls/d3dx9_36/tests/effect.c | 38 +++++----- 2 files changed, 151 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42cbd578f76b0ec0612d4…

1 0

Austin English : joy.cpl: Sync spec file to Windows 10.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 83bc9c85e4a8eca4fcfcee62c9a899ef6c6c4e81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83bc9c85e4a8eca4fcfcee62c… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 28 15:42:06 2017 -0500 joy.cpl: Sync spec file to Windows 10. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/joy.cpl.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/joy.cpl/joy.cpl.spec b/dlls/joy.cpl/joy.cpl.spec index df77a30..3a7f493 100644 --- a/dlls/joy.cpl/joy.cpl.spec +++ b/dlls/joy.cpl/joy.cpl.spec @@ -1 +1,2 @@ @ stdcall CPlApplet(long long long long) +# @ stub ShowJoyCPL

1 0

Matteo Bruni : d3dx9: Dump preshader immediates table.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: b1cea9b1003d8129a6a357432d17f1e9b633f373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1cea9b1003d8129a6a357432… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Apr 3 17:26:16 2017 +0200 d3dx9: Dump preshader immediates table. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 9aedc99..b3481f8 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -599,7 +599,7 @@ static void dump_ins(struct d3dx_regstore *rs, const struct d3dx_pres_ins *ins) { unsigned int i; - TRACE(" %s ", pres_op_info[ins->op].mnem); + TRACE("%s ", pres_op_info[ins->op].mnem); dump_arg(rs, &ins->output, pres_op_info[ins->op].func_all_comps ? 1 : ins->component_count); for (i = 0; i < pres_op_info[ins->op].input_count; ++i) { @@ -611,11 +611,24 @@ static void dump_ins(struct d3dx_regstore *rs, const struct d3dx_pres_ins *ins) static void dump_preshader(struct d3dx_preshader *pres) { - unsigned int i; + unsigned int i, immediate_count = pres->regs.table_sizes[PRES_REGTAB_IMMED]; + const double *immediates = pres->regs.tables[PRES_REGTAB_IMMED]; + if (immediate_count) + TRACE("// Immediates:\n"); + for (i = 0; i < immediate_count; ++i) + { + if (!(i % 4)) + TRACE("// "); + TRACE("%.8e", immediates[i]); + if (i % 4 == 3) + TRACE("\n"); + else + TRACE(", "); + } TRACE("// Preshader registers:\n"); dump_registers(&pres->inputs); - TRACE(" preshader\n"); + TRACE("preshader\n"); for (i = 0; i < pres->ins_count; ++i) dump_ins(&pres->regs, &pres->ins[i]); }

1 0

Piotr Caban : msvcrt: Add _CurrentScheduler class implementation.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 858bdcb392ff6a833fe55a00229e251a195d3743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=858bdcb392ff6a833fe55a002… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 3 15:06:25 2017 +0200 msvcrt: Add _CurrentScheduler class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 10 +++++----- dlls/msvcr110/msvcr110.spec | 10 +++++----- dlls/msvcr120/msvcr120.spec | 10 +++++----- dlls/msvcr120_app/msvcr120_app.spec | 10 +++++----- dlls/msvcrt/scheduler.c | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 53 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=858bdcb392ff6a833fe55…

1 0

Piotr Caban : msvcrt: Add _Scheduler class implementation.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: daccc568af284cc4265f969080ab92d96355e159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daccc568af284cc4265f96908… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 3 15:06:14 2017 +0200 msvcrt: Add _Scheduler class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 20 +++++++-------- dlls/msvcr110/msvcr110.spec | 30 +++++++++++----------- dlls/msvcr120/msvcr120.spec | 30 +++++++++++----------- dlls/msvcr120_app/msvcr120_app.spec | 30 +++++++++++----------- dlls/msvcrt/scheduler.c | 50 +++++++++++++++++++++++++++++++++++++ 5 files changed, 105 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=daccc568af284cc4265f9…

1 0

Piotr Caban : msvcrt: Forward remaining CurrentScheduler functions to current scheduler object.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: d3020a606ab7716b50455b657cb1dea10f3de172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3020a606ab7716b50455b657… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 3 15:06:01 2017 +0200 msvcrt: Forward remaining CurrentScheduler functions to current scheduler object. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cxx.h | 7 +++++ dlls/msvcrt/scheduler.c | 69 +++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 62 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index 476f66a..50bf7ca 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -267,9 +267,16 @@ typedef struct extern void *vtbl_wrapper_0; extern void *vtbl_wrapper_4; extern void *vtbl_wrapper_8; +extern void *vtbl_wrapper_12; extern void *vtbl_wrapper_16; extern void *vtbl_wrapper_20; +extern void *vtbl_wrapper_24; extern void *vtbl_wrapper_28; +extern void *vtbl_wrapper_32; +extern void *vtbl_wrapper_36; +extern void *vtbl_wrapper_40; +extern void *vtbl_wrapper_44; +extern void *vtbl_wrapper_48; #else diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index b405f39..619c89e 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -49,9 +49,16 @@ static int scheduler_id = -1; DEFINE_VTBL_WRAPPER(0); DEFINE_VTBL_WRAPPER(4); DEFINE_VTBL_WRAPPER(8); +DEFINE_VTBL_WRAPPER(12); DEFINE_VTBL_WRAPPER(16); DEFINE_VTBL_WRAPPER(20); +DEFINE_VTBL_WRAPPER(24); DEFINE_VTBL_WRAPPER(28); +DEFINE_VTBL_WRAPPER(32); +DEFINE_VTBL_WRAPPER(36); +DEFINE_VTBL_WRAPPER(40); +DEFINE_VTBL_WRAPPER(44); +DEFINE_VTBL_WRAPPER(48); #endif @@ -117,9 +124,27 @@ typedef struct Scheduler { } Scheduler; #define call_Scheduler_Id(this) CALL_VTBL_FUNC(this, 4, unsigned int, (const Scheduler*), (this)) #define call_Scheduler_GetNumberOfVirtualProcessors(this) CALL_VTBL_FUNC(this, 8, unsigned int, (const Scheduler*), (this)) +#define call_Scheduler_GetPolicy(this,policy) CALL_VTBL_FUNC(this, 12, \ + SchedulerPolicy*, (Scheduler*,SchedulerPolicy*), (this,policy)) #define call_Scheduler_Reference(this) CALL_VTBL_FUNC(this, 16, unsigned int, (Scheduler*), (this)) #define call_Scheduler_Release(this) CALL_VTBL_FUNC(this, 20, unsigned int, (Scheduler*), (this)) +#define call_Scheduler_RegisterShutdownEvent(this,event) CALL_VTBL_FUNC(this, 24, void, (Scheduler*,HANDLE), (this,event)) #define call_Scheduler_Attach(this) CALL_VTBL_FUNC(this, 28, void, (Scheduler*), (this)) +#if _MSVCR_VER > 100 +#define call_Scheduler_CreateScheduleGroup_loc(this,placement) CALL_VTBL_FUNC(this, 32, \ + /*ScheduleGroup*/void*, (Scheduler*,/*location*/void*), (this,placement)) +#define call_Scheduler_CreateScheduleGroup(this) CALL_VTBL_FUNC(this, 36, /*ScheduleGroup*/void*, (Scheduler*), (this)) +#define call_Scheduler_ScheduleTask_loc(this,proc,data,placement) CALL_VTBL_FUNC(this, 40, \ + void, (Scheduler*,void (__cdecl*)(void*),void*,/*location*/void*), (this,proc,data,placement)) +#define call_Scheduler_ScheduleTask(this,proc,data) CALL_VTBL_FUNC(this, 44, \ + void, (Scheduler*,void (__cdecl*)(void*),void*), (this,proc,data)) +#define call_Scheduler_IsAvailableLocation(this,placement) CALL_VTBL_FUNC(this, 48, \ + MSVCRT_bool, (Scheduler*,const /*location*/void*), (this,placement)) +#else +#define call_Scheduler_CreateScheduleGroup(this) CALL_VTBL_FUNC(this, 32, /*ScheduleGroup*/void*, (Scheduler*), (this)) +#define call_Scheduler_ScheduleTask(this,proc,data) CALL_VTBL_FUNC(this, 36, \ + void, (Scheduler*,void (__cdecl*)(void*),void*), (this,proc,data)) +#endif typedef struct { Scheduler scheduler; @@ -882,27 +907,31 @@ Scheduler* __cdecl CurrentScheduler_Get(void) return get_current_scheduler(); } +#if _MSVCR_VER > 100 /* ?CreateScheduleGroup@CurrentScheduler@Concurrency@@SAPAVScheduleGroup@2@AAVlocation@2@@Z */ /* ?CreateScheduleGroup@CurrentScheduler@Concurrency@@SAPEAVScheduleGroup@2@AEAVlocation@2@@Z */ /*ScheduleGroup*/void* __cdecl CurrentScheduler_CreateScheduleGroup_loc(/*location*/void *placement) { - FIXME("(%p) stub\n", placement); - return NULL; + TRACE("(%p)\n", placement); + return call_Scheduler_CreateScheduleGroup_loc(get_current_scheduler(), placement); } +#endif /* ?CreateScheduleGroup@CurrentScheduler@Concurrency@@SAPAVScheduleGroup@2@XZ */ /* ?CreateScheduleGroup@CurrentScheduler@Concurrency@@SAPEAVScheduleGroup@2@XZ */ /*ScheduleGroup*/void* __cdecl CurrentScheduler_CreateScheduleGroup(void) { - FIXME("() stub\n"); - return NULL; + TRACE("()\n"); + return call_Scheduler_CreateScheduleGroup(get_current_scheduler()); } /* ?GetNumberOfVirtualProcessors@CurrentScheduler@Concurrency@@SAIXZ */ unsigned int __cdecl CurrentScheduler_GetNumberOfVirtualProcessors(void) { Scheduler *scheduler = try_get_current_scheduler(); + TRACE("()\n"); + if(!scheduler) return -1; return call_Scheduler_GetNumberOfVirtualProcessors(scheduler); @@ -911,50 +940,62 @@ unsigned int __cdecl CurrentScheduler_GetNumberOfVirtualProcessors(void) /* ?GetPolicy@CurrentScheduler@Concurrency@@SA?AVSchedulerPolicy@2@XZ */ SchedulerPolicy* __cdecl CurrentScheduler_GetPolicy(SchedulerPolicy *policy) { - FIXME("(%p) stub\n", policy); - return NULL; + TRACE("(%p)\n", policy); + return call_Scheduler_GetPolicy(get_current_scheduler(), policy); } /* ?Id@CurrentScheduler@Concurrency@@SAIXZ */ unsigned int __cdecl CurrentScheduler_Id(void) { - Context *context = try_get_current_context(); + Scheduler *scheduler = try_get_current_scheduler(); TRACE("()\n"); - if(!context) + if(!scheduler) return -1; - return call_Scheduler_Id(CurrentScheduler_Get()); + return call_Scheduler_Id(scheduler); } +#if _MSVCR_VER > 100 /* ?IsAvailableLocation@CurrentScheduler@Concurrency@@SA_NABVlocation@2@@Z */ /* ?IsAvailableLocation@CurrentScheduler@Concurrency@@SA_NAEBVlocation@2@@Z */ MSVCRT_bool __cdecl CurrentScheduler_IsAvailableLocation(const /*location*/void *placement) { - FIXME("(%p) stub\n", placement); - return 0; + Scheduler *scheduler = try_get_current_scheduler(); + + TRACE("(%p)\n", placement); + + if(!scheduler) + return FALSE; + return call_Scheduler_IsAvailableLocation(scheduler, placement); } +#endif /* ?RegisterShutdownEvent@CurrentScheduler@Concurrency@@SAXPAX@Z */ /* ?RegisterShutdownEvent@CurrentScheduler@Concurrency@@SAXPEAX@Z */ void __cdecl CurrentScheduler_RegisterShutdownEvent(HANDLE event) { - FIXME("(%p) stub\n", event); + TRACE("(%p)\n", event); + call_Scheduler_RegisterShutdownEvent(get_current_scheduler(), event); } +#if _MSVCR_VER > 100 /* ?ScheduleTask@CurrentScheduler@Concurrency@@SAXP6AXPAX@Z0AAVlocation@2@@Z */ /* ?ScheduleTask@CurrentScheduler@Concurrency@@SAXP6AXPEAX@Z0AEAVlocation@2@@Z */ void __cdecl CurrentScheduler_ScheduleTask_loc(void (__cdecl *proc)(void*), void *data, /*location*/void *placement) { - FIXME("(%p %p %p) stub\n", proc, data, placement); + TRACE("(%p %p %p)\n", proc, data, placement); + call_Scheduler_ScheduleTask_loc(get_current_scheduler(), proc, data, placement); } +#endif /* ?ScheduleTask@CurrentScheduler@Concurrency@@SAXP6AXPAX@Z0@Z */ /* ?ScheduleTask@CurrentScheduler@Concurrency@@SAXP6AXPEAX@Z0@Z */ void __cdecl CurrentScheduler_ScheduleTask(void (__cdecl *proc)(void*), void *data) { - FIXME("(%p %p) stub\n", proc, data); + TRACE("(%p %p)\n", proc, data); + call_Scheduler_ScheduleTask(get_current_scheduler(), proc, data); } extern const vtable_ptr MSVCRT_type_info_vtable;

1 0

Piotr Caban : msvcrt: Improve CurrentScheduler::Get implementation.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 6ad1e9a95414534694f66a7fd751e91ab9c18a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad1e9a95414534694f66a7fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 3 15:05:49 2017 +0200 msvcrt: Improve CurrentScheduler::Get implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index ff5cf6f..b405f39 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -196,6 +196,17 @@ static Scheduler* try_get_current_scheduler(void) return context->scheduler.scheduler; } +static Scheduler* get_current_scheduler(void) +{ + ExternalContextBase *context = (ExternalContextBase*)get_current_context(); + + if (context->context.vtable != &MSVCRT_ExternalContextBase_vtable) { + ERR("unknown context set\n"); + return NULL; + } + return context->scheduler.scheduler; +} + /* ?CurrentContext@Context@Concurrency@@SAPAV12@XZ */ /* ?CurrentContext@Context@Concurrency@@SAPEAV12@XZ */ Context* __cdecl Context_CurrentContext(void) @@ -867,22 +878,8 @@ static void create_default_scheduler(void) /* ?Get@CurrentScheduler@Concurrency@@SAPEAVScheduler@2@XZ */ Scheduler* __cdecl CurrentScheduler_Get(void) { - ExternalContextBase *context = (ExternalContextBase*)get_current_context(); - TRACE("()\n"); - - if(context->context.vtable != &MSVCRT_ExternalContextBase_vtable) { - ERR("unknown context set\n"); - return NULL; - } - - if(context->scheduler.scheduler) - return context->scheduler.scheduler; - - create_default_scheduler(); - context->scheduler.scheduler = &default_scheduler->scheduler; - call_Scheduler_Reference(&default_scheduler->scheduler); - return &default_scheduler->scheduler; + return get_current_scheduler(); } /* ?CreateScheduleGroup@CurrentScheduler@Concurrency@@SAPAVScheduleGroup@2@AAVlocation@2@@Z */

1 0

Piotr Caban : msvcrt: Add CurrentScheduler:: GetNumberOfVirtualProcessors implementation.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 2d4be5cb35616552eb96cbf42996642c78626c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4be5cb35616552eb96cbf42… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 3 15:05:42 2017 +0200 msvcrt: Add CurrentScheduler::GetNumberOfVirtualProcessors implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index b5dc2f8..ff5cf6f 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -116,6 +116,7 @@ typedef struct Scheduler { const vtable_ptr *vtable; } Scheduler; #define call_Scheduler_Id(this) CALL_VTBL_FUNC(this, 4, unsigned int, (const Scheduler*), (this)) +#define call_Scheduler_GetNumberOfVirtualProcessors(this) CALL_VTBL_FUNC(this, 8, unsigned int, (const Scheduler*), (this)) #define call_Scheduler_Reference(this) CALL_VTBL_FUNC(this, 16, unsigned int, (Scheduler*), (this)) #define call_Scheduler_Release(this) CALL_VTBL_FUNC(this, 20, unsigned int, (Scheduler*), (this)) #define call_Scheduler_Attach(this) CALL_VTBL_FUNC(this, 28, void, (Scheduler*), (this)) @@ -181,6 +182,20 @@ static Context* get_current_context(void) return ret; } +static Scheduler* try_get_current_scheduler(void) +{ + ExternalContextBase *context = (ExternalContextBase*)try_get_current_context(); + + if (!context) + return NULL; + + if (context->context.vtable != &MSVCRT_ExternalContextBase_vtable) { + ERR("unknown context set\n"); + return NULL; + } + return context->scheduler.scheduler; +} + /* ?CurrentContext@Context@Concurrency@@SAPAV12@XZ */ /* ?CurrentContext@Context@Concurrency@@SAPEAV12@XZ */ Context* __cdecl Context_CurrentContext(void) @@ -240,7 +255,7 @@ unsigned int __cdecl Context_ScheduleGroupId(void) unsigned int __cdecl Context_VirtualProcessorId(void) { Context *ctx = try_get_current_context(); - FIXME("()\n"); + TRACE("()\n"); return ctx ? call_Context_GetVirtualProcessorId(ctx) : -1; } @@ -889,8 +904,11 @@ Scheduler* __cdecl CurrentScheduler_Get(void) /* ?GetNumberOfVirtualProcessors@CurrentScheduler@Concurrency@@SAIXZ */ unsigned int __cdecl CurrentScheduler_GetNumberOfVirtualProcessors(void) { - FIXME("() stub\n"); - return 0; + Scheduler *scheduler = try_get_current_scheduler(); + TRACE("()\n"); + if(!scheduler) + return -1; + return call_Scheduler_GetNumberOfVirtualProcessors(scheduler); } /* ?GetPolicy@CurrentScheduler@Concurrency@@SA?AVSchedulerPolicy@2@XZ */

1 0

Nikolay Sivov : usp10: Handle invalid arguments in ScriptIsComplex().
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 04e5466e12d0ae8088e83ef7a9b9d28d92e6a203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e5466e12d0ae8088e83ef7a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 1 18:16:10 2017 +0300 usp10: Handle invalid arguments in ScriptIsComplex(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> 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/tests/usp10.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 3 +++ 2 files changed, 67 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 1b2ba6f..d302714 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3911,6 +3911,68 @@ static void test_ScriptGetLogicalWidths(void) } } +static void test_ScriptIsComplex(void) +{ + static const WCHAR testW[] = {0x202a,'1',0x202c,0}; + static const WCHAR test2W[] = {'1',0}; + static const struct complex_test + { + const WCHAR *text; + DWORD flags; + HRESULT hr; + BOOL todo; + } complex_tests[] = + { + { test2W, SIC_ASCIIDIGIT, S_OK }, + { test2W, SIC_COMPLEX, S_FALSE }, + { test2W, SIC_COMPLEX | SIC_ASCIIDIGIT, S_OK }, + { testW, SIC_NEUTRAL | SIC_COMPLEX, S_OK }, + { testW, SIC_NEUTRAL, S_FALSE, TRUE }, + { testW, SIC_COMPLEX, S_OK }, + { testW, 0, S_FALSE }, + }; + unsigned int i; + HRESULT hr; + + hr = ScriptIsComplex(NULL, 0, 0); + ok(hr == E_INVALIDARG || broken(hr == S_FALSE) /* winxp/vista */, "got 0x%08x\n", hr); + + if (hr == E_INVALIDARG) + { + hr = ScriptIsComplex(NULL, 1, 0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + } + + hr = ScriptIsComplex(test2W, -1, SIC_ASCIIDIGIT); + ok(hr == E_INVALIDARG || broken(hr == S_FALSE) /* winxp/vista */, "got 0x%08x\n", hr); + + hr = ScriptIsComplex(test2W, 0, SIC_ASCIIDIGIT); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + for (i = 0; i < sizeof(complex_tests)/sizeof(complex_tests[0]); i++) + { + hr = ScriptIsComplex(complex_tests[i].text, lstrlenW(complex_tests[i].text), complex_tests[i].flags); + todo_wine_if(complex_tests[i].todo) + ok(hr == complex_tests[i].hr, "%u: got %#x, expected %#x, flags %#x\n", i, hr, complex_tests[i].hr, + complex_tests[i].flags); + } + + hr = ScriptIsComplex(test2W, 1, ~0u); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ScriptIsComplex(testW, 3, 0); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + hr = ScriptIsComplex(testW, 3, SIC_NEUTRAL | SIC_COMPLEX); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ScriptIsComplex(testW, 3, SIC_COMPLEX); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ScriptIsComplex(test2W, 1, SIC_COMPLEX); + ok(hr == S_FALSE, "got 0x%08x\n", hr); +} + START_TEST(usp10) { HWND hwnd; @@ -3966,6 +4028,8 @@ START_TEST(usp10) test_ScriptGetFontFunctions(hdc); test_ScriptGetLogicalWidths(); + test_ScriptIsComplex(); + ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 2df27be..c1d9c1c 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3019,6 +3019,9 @@ HRESULT WINAPI ScriptIsComplex(const WCHAR *chars, int len, DWORD flag) TRACE("(%s,%d,0x%x)\n", debugstr_wn(chars, len), len, flag); + if (!chars || len < 0) + return E_INVALIDARG; + for (i = 0; i < len; i+=consumed) { if (i >= len)

1 0

← Newer
1
...
68
69
70
71
72
73
74
75
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2017