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

Piotr Caban : msvcrt: Add scheduler_resource_allocation_error class implementation.
by Alexandre Julliard 23 Mar '17

23 Mar '17

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: Move bad_alloc vtable definition into __asm_dummy_vtables function.
by Alexandre Julliard 23 Mar '17

23 Mar '17

Module: wine Branch: master Commit: 27185abe633ab37d4c0c62396a9736326a8a8401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27185abe633ab37d4c0c62396… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 11:41:28 2017 +0100 msvcrt: Move bad_alloc vtable definition into __asm_dummy_vtables function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 84 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index a3037c8..2cde8b2 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -649,6 +649,34 @@ void * __thiscall MSVCRT_type_info_vector_dtor(type_info * _this, unsigned int f return _this; } +#if _MSVCR_VER >= 80 +typedef exception bad_alloc; +extern const vtable_ptr MSVCRT_bad_alloc_vtable; + +static void bad_alloc_ctor(bad_alloc *this, const char **name) +{ + MSVCRT_exception_ctor(this, name); + this->vtable = &MSVCRT_bad_alloc_vtable; +} + +/* bad_alloc class implementation */ +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_alloc_copy_ctor,8) +bad_alloc * __thiscall MSVCRT_bad_alloc_copy_ctor(bad_alloc * _this, const bad_alloc * rhs) +{ + TRACE("(%p %p)\n", _this, rhs); + MSVCRT_exception_copy_ctor(_this, rhs); + _this->vtable = &MSVCRT_bad_alloc_vtable; + return _this; +} + +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_alloc_dtor,4) +void __thiscall MSVCRT_bad_alloc_dtor(bad_alloc * _this) +{ + TRACE("(%p)\n", _this); + MSVCRT_exception_dtor(_this); +} +#endif + #if _MSVCR_VER >= 100 typedef struct { exception e; @@ -724,6 +752,9 @@ __ASM_VTABLE(exception, __ASM_VTABLE(exception_old, VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor) VTABLE_ADD_FUNC(MSVCRT_what_exception)); +__ASM_VTABLE(bad_alloc, + VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor) + VTABLE_ADD_FUNC(MSVCRT_what_exception)); #endif __ASM_VTABLE(bad_typeid, VTABLE_ADD_FUNC(MSVCRT_bad_typeid_vector_dtor) @@ -751,6 +782,7 @@ DEFINE_RTTI_DATA0( exception_old, 0, ".?AVexception@@" ) DEFINE_RTTI_DATA1( bad_typeid, 0, &exception_rtti_base_descriptor, ".?AVbad_typeid(a)std@@" ) DEFINE_RTTI_DATA1( bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast(a)std@@" ) DEFINE_RTTI_DATA2( __non_rtti_object, 0, &bad_typeid_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AV__non_rtti_object(a)std@@" ) +DEFINE_RTTI_DATA1( bad_alloc, 0, &exception_rtti_base_descriptor, ".?AVbad_alloc(a)std@@" ) #else DEFINE_RTTI_DATA0( exception, 0, ".?AVexception@@" ) DEFINE_RTTI_DATA1( bad_typeid, 0, &exception_rtti_base_descriptor, ".?AVbad_typeid@@" ) @@ -766,49 +798,11 @@ DEFINE_EXCEPTION_TYPE_INFO( exception, 0, NULL, NULL ) DEFINE_EXCEPTION_TYPE_INFO( bad_typeid, 1, &exception_cxx_type_info, NULL ) DEFINE_EXCEPTION_TYPE_INFO( bad_cast, 1, &exception_cxx_type_info, NULL ) DEFINE_EXCEPTION_TYPE_INFO( __non_rtti_object, 2, &bad_typeid_cxx_type_info, &exception_cxx_type_info ) -#if _MSVCR_VER >= 100 -DEFINE_EXCEPTION_TYPE_INFO(scheduler_resource_allocation_error, 1, &exception_cxx_type_info, NULL) -#endif - #if _MSVCR_VER >= 80 -typedef exception bad_alloc; -extern const vtable_ptr MSVCRT_bad_alloc_vtable; - -static void bad_alloc_ctor(bad_alloc *this, const char **name) -{ - MSVCRT_exception_ctor(this, name); - this->vtable = &MSVCRT_bad_alloc_vtable; -} - -/* bad_alloc class implementation */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_alloc_copy_ctor,8) -bad_alloc * __thiscall MSVCRT_bad_alloc_copy_ctor(bad_alloc * _this, const bad_alloc * rhs) -{ - TRACE("(%p %p)\n", _this, rhs); - MSVCRT_exception_copy_ctor(_this, rhs); - _this->vtable = &MSVCRT_bad_alloc_vtable; - return _this; -} - -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_alloc_dtor,4) -void __thiscall MSVCRT_bad_alloc_dtor(bad_alloc * _this) -{ - TRACE("(%p)\n", _this); - MSVCRT_exception_dtor(_this); -} - -__ASM_VTABLE(bad_alloc, - VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor) - VTABLE_ADD_FUNC(MSVCRT_what_exception)); -DEFINE_RTTI_DATA1( bad_alloc, 0, &exception_rtti_base_descriptor, ".?AVbad_alloc(a)std@@" ) DEFINE_EXCEPTION_TYPE_INFO( bad_alloc, 1, &exception_cxx_type_info, NULL ) - -void throw_bad_alloc(const char *str) -{ - bad_alloc e; - bad_alloc_ctor(&e, &str); - _CxxThrowException(&e, &bad_alloc_exception_type); -} +#endif +#if _MSVCR_VER >= 100 +DEFINE_EXCEPTION_TYPE_INFO(scheduler_resource_allocation_error, 1, &exception_cxx_type_info, NULL) #endif void msvcrt_init_exception(void *base) @@ -840,6 +834,14 @@ void msvcrt_init_exception(void *base) #endif } +#if _MSVCR_VER >= 80 +void throw_bad_alloc(const char *str) +{ + bad_alloc e; + bad_alloc_ctor(&e, &str); + _CxxThrowException(&e, &bad_alloc_exception_type); +} +#endif /****************************************************************** * ?set_terminate@@YAP6AXXZP6AXXZ(a)Z (MSVCRT.@)

1 0

Piotr Caban : msvcrt: Throw throw_scheduler_resource_allocation_error on Context tls index allocation error.
by Alexandre Julliard 23 Mar '17

23 Mar '17

Module: wine Branch: master Commit: 2458f06380bf2ac6c2d51170b96adc6854d57d23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2458f06380bf2ac6c2d51170b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 11:41:36 2017 +0100 msvcrt: Throw throw_scheduler_resource_allocation_error on Context tls index allocation error. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 9 +++++++++ dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/scheduler.c | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 2cde8b2..e86df53 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -843,6 +843,15 @@ void throw_bad_alloc(const char *str) } #endif +#if _MSVCR_VER >= 100 +void throw_scheduler_resource_allocation_error(const char *str, HRESULT hr) +{ + scheduler_resource_allocation_error e; + scheduler_resource_allocation_error_ctor_name(&e, str, hr); + _CxxThrowException(&e.e, &scheduler_resource_allocation_error_exception_type); +} +#endif + /****************************************************************** * ?set_terminate@@YAP6AXXZP6AXXZ(a)Z (MSVCRT.@) * diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 659a3dc..dd957ef 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -285,6 +285,9 @@ void msvcrt_set_errno(int) DECLSPEC_HIDDEN; #if _MSVCR_VER >= 80 void throw_bad_alloc(const char*) DECLSPEC_HIDDEN; #endif +#if _MSVCR_VER >= 100 +void throw_scheduler_resource_allocation_error(const char*, HRESULT) DECLSPEC_HIDDEN; +#endif void __cdecl _purecall(void); void __cdecl _amsg_exit(int errnum); diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 470d141..1ab7906 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -87,7 +87,8 @@ static Context* get_current_context(void) if (context_tls_index == TLS_OUT_OF_INDEXES) { int tls_index = TlsAlloc(); if (tls_index == TLS_OUT_OF_INDEXES) { - /* throw scheduler_resource_allocation_error */ + throw_scheduler_resource_allocation_error(NULL, + HRESULT_FROM_WIN32(GetLastError())); return NULL; }

1 0

Henri Verbeet : usp10: Avoid LPPOINT.
by Alexandre Julliard 23 Mar '17

23 Mar '17

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

Henri Verbeet : usp10: Avoid LPWORD.
by Alexandre Julliard 23 Mar '17

23 Mar '17

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 LPBYTE.
by Alexandre Julliard 23 Mar '17

23 Mar '17

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 LPCWSTR.
by Alexandre Julliard 23 Mar '17

23 Mar '17

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

Matteo Bruni : d3d10core/tests: Add a geometry shader test.
by Alexandre Julliard 23 Mar '17

23 Mar '17

Module: wine Branch: master Commit: 0e80009b10288062d3e429d86712ee408bc22340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e80009b10288062d3e429d86… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 22 23:53:50 2017 +0100 d3d10core/tests: Add a geometry shader test. 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/d3d10core/tests/device.c | 204 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 203 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e80009b10288062d3e42…

1 0

Matteo Bruni : d3d11/tests: Add a geometry shader test.
by Alexandre Julliard 23 Mar '17

23 Mar '17

Module: wine Branch: master Commit: aab54ccc521ebfefe068c01f8b65cdb0ba3267a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aab54ccc521ebfefe068c01f8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 22 23:53:51 2017 +0100 d3d11/tests: Add a geometry shader test. 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/d3d11/tests/d3d11.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 8523265..99f87b9 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -15819,6 +15819,193 @@ static void test_tgsm(void) release_test_context(&test_context); } +static void test_geometry_shader(void) +{ + static const struct + { + struct vec4 position; + unsigned int color; + } + vertex[] = + { + {{0.0f, 0.0f, 1.0f, 1.0f}, 0xffffff00}, + }; + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + {"SV_POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 16, D3D11_INPUT_PER_VERTEX_DATA, 0}, + }; +#if 0 +struct vs_data +{ + float4 pos : SV_POSITION; + float4 color : COLOR; +}; + +void main(in struct vs_data vs_input, out struct vs_data vs_output) +{ + vs_output.pos = vs_input.pos; + vs_output.color = vs_input.color; +} +#endif + static const DWORD vs_code[] = + { + 0x43425844, 0xd5b32785, 0x35332906, 0x4d05e031, 0xf66a58af, 0x00000001, 0x00000144, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000068, 0x00010040, + 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067, + 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, + 0x0100003e, + }; +#if 0 +struct gs_data +{ + float4 pos : SV_POSITION; + float4 color : COLOR; +}; + +[maxvertexcount(4)] +void main(point struct gs_data vin[1], inout TriangleStream<gs_data> vout) +{ + float offset = 0.2 * vin[0].pos.w; + gs_data v; + + v.color = vin[0].color; + + v.pos = float4(vin[0].pos.x - offset, vin[0].pos.y - offset, vin[0].pos.z, 1.0); + vout.Append(v); + v.pos = float4(vin[0].pos.x - offset, vin[0].pos.y + offset, vin[0].pos.z, 1.0); + vout.Append(v); + v.pos = float4(vin[0].pos.x + offset, vin[0].pos.y - offset, vin[0].pos.z, 1.0); + vout.Append(v); + v.pos = float4(vin[0].pos.x + offset, vin[0].pos.y + offset, vin[0].pos.z, 1.0); + vout.Append(v); +} +#endif + static const DWORD gs_code[] = + { + 0x43425844, 0x70616045, 0x96756e1f, 0x1caeecb8, 0x3749528c, 0x00000001, 0x0000034c, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000270, 0x00020040, + 0x0000009c, 0x05000061, 0x002010f2, 0x00000001, 0x00000000, 0x00000001, 0x0400005f, 0x002010f2, + 0x00000001, 0x00000001, 0x02000068, 0x00000001, 0x0100085d, 0x0100285c, 0x04000067, 0x001020f2, + 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x0200005e, 0x00000004, 0x0f000032, + 0x00100032, 0x00000000, 0x80201ff6, 0x00000041, 0x00000000, 0x00000000, 0x00004002, 0x3e4ccccd, + 0x3e4ccccd, 0x00000000, 0x00000000, 0x00201046, 0x00000000, 0x00000000, 0x05000036, 0x00102032, + 0x00000000, 0x00100046, 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000, + 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, + 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x01000013, 0x05000036, 0x00102012, 0x00000000, + 0x0010000a, 0x00000000, 0x0e000032, 0x00100052, 0x00000000, 0x00201ff6, 0x00000000, 0x00000000, + 0x00004002, 0x3e4ccccd, 0x00000000, 0x3e4ccccd, 0x00000000, 0x00201106, 0x00000000, 0x00000000, + 0x05000036, 0x00102022, 0x00000000, 0x0010002a, 0x00000000, 0x06000036, 0x00102042, 0x00000000, + 0x0020102a, 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, + 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x01000013, 0x05000036, + 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102022, 0x00000000, 0x0010001a, + 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000, 0x00000000, 0x05000036, + 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, + 0x00000000, 0x00000001, 0x01000013, 0x05000036, 0x00102032, 0x00000000, 0x00100086, 0x00000000, + 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000, 0x00000000, 0x05000036, 0x00102082, + 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, + 0x00000001, 0x01000013, 0x0100003e, + }; +#if 0 +struct ps_data +{ + float4 pos : SV_POSITION; + float4 color : COLOR; +}; + +float4 main(struct ps_data ps_input) : SV_Target +{ + return ps_input.color; +} +#endif + static const DWORD ps_code[] = + { + 0x43425844, 0x89803e59, 0x3f798934, 0xf99181df, 0xf5556512, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + struct d3d11_test_context test_context; + ID3D11InputLayout *input_layout; + ID3D11DeviceContext *context; + unsigned int stride, offset; + struct resource_readback rb; + ID3D11GeometryShader *gs; + ID3D11VertexShader *vs; + ID3D11PixelShader *ps; + ID3D11Device *device; + ID3D11Buffer *vb; + DWORD color; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(vertex), vertex); + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D11Device_CreateGeometryShader(device, gs_code, sizeof(gs_code), NULL, &gs); + ok(SUCCEEDED(hr), "Failed to create geometry shader, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D11DeviceContext_IASetInputLayout(context, input_layout); + ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_POINTLIST); + stride = sizeof(*vertex); + offset = 0; + ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &vb, &stride, &offset); + ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); + ID3D11DeviceContext_GSSetShader(context, gs, NULL, 0); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); + ID3D11DeviceContext_Draw(context, 1, 0); + + get_texture_readback(test_context.backbuffer, 0, &rb); + color = get_readback_color(&rb, 320, 190); + ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 255, 240); + ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 320, 240); + ok(compare_color(color, 0xffffff00, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 385, 240); + ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 320, 290); + ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); + release_resource_readback(&rb); + + ID3D11PixelShader_Release(ps); + ID3D11GeometryShader_Release(gs); + ID3D11VertexShader_Release(vs); + ID3D11Buffer_Release(vb); + ID3D11InputLayout_Release(input_layout); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -15900,4 +16087,5 @@ START_TEST(d3d11) test_uav_counters(); test_compute_shader_registers(); test_tgsm(); + test_geometry_shader(); }

1 0

Matteo Bruni : wined3d: Get rid of the point sprite coordinate origin warning.
by Alexandre Julliard 23 Mar '17

23 Mar '17

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