October 2018 - Wine-Commits

Byeongsik Jeon : gdi32: Move the 'if' branch out of the loop.
by Alexandre Julliard Oct. 10, 2018

Oct. 10, 2018

Module: wine Branch: master Commit: fe6d35f3cb8ee47b4b57663367e3d06ebcd4ee7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe6d35f3cb8ee47b4b576633… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Tue Oct 9 21:13:27 2018 +0900 gdi32: Move the 'if' branch out of the loop. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1d4cf53..5b1a23b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7323,7 +7323,9 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, BYTE *src; INT x, src_pitch, src_width, src_height, rgb_interval, hmul, vmul; INT x_shift, y_shift; - BOOL rgb; + const INT *sub_order; + const INT rgb_order[3] = { 0, 1, 2 }; + const INT bgr_order[3] = { 2, 1, 0 }; FT_Render_Mode render_mode = (format == WINE_GGO_HRGB_BITMAP || format == WINE_GGO_HBGR_BITMAP)? FT_RENDER_MODE_LCD: FT_RENDER_MODE_LCD_V; @@ -7358,7 +7360,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, memset(buf, 0, buflen); dst = buf; - rgb = (format == WINE_GGO_HRGB_BITMAP || format == WINE_GGO_VRGB_BITMAP); if ( needsTransform ) pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki); @@ -7414,22 +7415,16 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, width = min( width, src_width / hmul ); height = min( height, src_height / vmul ); + sub_order = (format == WINE_GGO_HRGB_BITMAP || format == WINE_GGO_VRGB_BITMAP)? + rgb_order : bgr_order; + while ( height-- ) { for ( x = 0; x < width; x++ ) { - if ( rgb ) - { - dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 0] << 16) | - ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | - ((unsigned int)src[hmul * x + rgb_interval * 2] << 0); - } - else - { - dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 2] << 16) | - ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | - ((unsigned int)src[hmul * x + rgb_interval * 0] << 0); - } + dst[x] = ((unsigned int)src[hmul * x + rgb_interval * sub_order[0]] << 16) | + ((unsigned int)src[hmul * x + rgb_interval * sub_order[1]] << 8) | + ((unsigned int)src[hmul * x + rgb_interval * sub_order[2]]); } src += src_pitch * vmul; dst += pitch / sizeof(*dst);

1 0

Alexandre Julliard : wineconsole: Set a proper default for the font weight.
by Alexandre Julliard Oct. 10, 2018

Oct. 10, 2018

Module: wine Branch: master Commit: 66bbfada5f8552a93e8754cb3c53b67ed114506b URL: https://source.winehq.org/git/wine.git/?a=commit;h=66bbfada5f8552a93e8754cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 20:43:42 2018 +0200 wineconsole: Set a proper default for the font weight. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index 92c53a7..9e7a7b6 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -219,7 +219,7 @@ void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg) memset(cfg->face_name, 0, sizeof(cfg->face_name)); cfg->cell_height = 12; cfg->cell_width = 8; - cfg->font_weight = 0; + cfg->font_weight = FW_NORMAL; cfg->history_size = 50; cfg->history_nodup = 0; cfg->insert_mode = 1;

1 0

Zebediah Figura : widl: Correctly generate headers for nested arrays and pointers.
by Alexandre Julliard Oct. 9, 2018

Oct. 9, 2018

Module: wine Branch: master Commit: 6f971037331fb7455ae562d58af21e708f5b0725 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f971037331fb7455ae562d5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 5 16:57:51 2018 -0500 widl: Correctly generate headers for nested arrays and pointers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index e0c6d38..7681a3f 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -285,6 +285,15 @@ int needs_space_after(type_t *t) (!is_ptr(t) && (!is_array(t) || !type_array_is_decl_as_ptr(t) || t->name))); } +static void write_pointer_left(FILE *h, type_t *ref) +{ + if (needs_space_after(ref)) + fprintf(h, " "); + if (!type_is_alias(ref) && is_array(ref) && !type_array_is_decl_as_ptr(ref)) + fprintf(h, "("); + fprintf(h, "*"); +} + void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly) { const char *name; @@ -341,10 +350,12 @@ void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly) else fprintf(h, "union %s", t->name ? t->name : ""); break; case TYPE_POINTER: + { write_type_left(h, type_pointer_get_ref(t), name_type, declonly); - fprintf(h, "%s*", needs_space_after(type_pointer_get_ref(t)) ? " " : ""); + write_pointer_left(h, type_pointer_get_ref(t)); if (is_attr(t->attrs, ATTR_CONST)) fprintf(h, "const "); break; + } case TYPE_ARRAY: if (t->name && type_array_is_decl_as_ptr(t)) fprintf(h, "%s", t->name); @@ -352,7 +363,7 @@ void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly) { write_type_left(h, type_array_get_element(t), name_type, declonly); if (type_array_is_decl_as_ptr(t)) - fprintf(h, "%s*", needs_space_after(type_array_get_element(t)) ? " " : ""); + write_pointer_left(h, type_array_get_element(t)); } break; case TYPE_BASIC: @@ -419,23 +430,36 @@ void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly) void write_type_right(FILE *h, type_t *t, int is_field) { if (!h) return; + if (type_is_alias(t)) return; switch (type_get_type(t)) { case TYPE_ARRAY: - if (!type_array_is_decl_as_ptr(t)) + { + type_t *elem = type_array_get_element(t); + if (type_array_is_decl_as_ptr(t)) + { + if (!type_is_alias(elem) && is_array(elem) && !type_array_is_decl_as_ptr(elem)) + fprintf(h, ")"); + } + else { if (is_conformant_array(t)) - { fprintf(h, "[%s]", is_field ? "1" : ""); - t = type_array_get_element(t); - } - for ( ; - type_get_type(t) == TYPE_ARRAY && !type_array_is_decl_as_ptr(t); - t = type_array_get_element(t)) + else fprintf(h, "[%u]", type_array_get_dim(t)); } + write_type_right(h, elem, FALSE); break; + } + case TYPE_POINTER: + { + type_t *ref = type_pointer_get_ref(t); + if (!type_is_alias(ref) && is_array(ref) && !type_array_is_decl_as_ptr(ref)) + fprintf(h, ")"); + write_type_right(h, ref, FALSE); + break; + } case TYPE_BITFIELD: fprintf(h, " : %u", type_bitfield_get_bits(t)->cval); break; @@ -450,7 +474,6 @@ void write_type_right(FILE *h, type_t *t, int is_field) case TYPE_COCLASS: case TYPE_FUNCTION: case TYPE_INTERFACE: - case TYPE_POINTER: break; } }

1 0

Hans Leidekker : wbemprox: Don't return an error from IWbemClassObject:: BeginMethodEnumeration if the object has an iterator.
by Alexandre Julliard Oct. 9, 2018

Oct. 9, 2018

Module: wine Branch: master Commit: a9c6ff232733a8378508f2fe2d63c8d49bac04aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9c6ff232733a8378508f2fe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 9 15:25:02 2018 +0200 wbemprox: Don't return an error from IWbemClassObject::BeginMethodEnumeration if the object has an iterator. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/class.c | 5 ----- dlls/wbemprox/tests/query.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 92c110f..3f299ea 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -907,11 +907,6 @@ static HRESULT WINAPI class_object_BeginMethodEnumeration( if (lEnumFlags) FIXME("flags 0x%08x not supported\n", lEnumFlags); - if (co->iter) - { - WARN("not allowed on instance\n"); - return WBEM_E_ILLEGAL_OPERATION; - } co->index_method = 0; return S_OK; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 26e2dfa..b2f5d68 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -722,8 +722,8 @@ static void test_StdRegProv( IWbemServices *services ) 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; static const WCHAR regtestW[] = {'S','o','f','t','w','a','r','e','\\','S','t','d','R','e','g','P','r','o','v','T','e','s','t',0}; - BSTR class = SysAllocString( stdregprovW ), method; - IWbemClassObject *reg, *sig_in, *in, *out; + BSTR class = SysAllocString( stdregprovW ), method, name; + IWbemClassObject *reg, *sig_in, *sig_out, *in, *out; VARIANT defkey, subkey, retval, names, types, value, valuename; CIMTYPE type; HRESULT hr; @@ -735,6 +735,29 @@ static void test_StdRegProv( IWbemServices *services ) win_skip( "StdRegProv not available\n" ); return; } + + hr = IWbemClassObject_BeginMethodEnumeration( reg, 0 ); + ok( hr == S_OK, "got %08x\n", hr ); + + while (IWbemClassObject_NextMethod( reg, 0, &name, &sig_in, &sig_out ) == S_OK) + { + SysFreeString( name ); + IWbemClassObject_Release( sig_in ); + IWbemClassObject_Release( sig_out ); + } + + hr = IWbemClassObject_EndMethodEnumeration( reg ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWbemClassObject_BeginEnumeration( reg, 0 ); + ok( hr == S_OK, "got %08x\n", hr ); + + while (IWbemClassObject_Next( reg, 0, &name, NULL, NULL, NULL ) == S_OK) + SysFreeString( name ); + + hr = IWbemClassObject_EndEnumeration( reg ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IWbemClassObject_GetMethod( reg, createkeyW, 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get CreateKey method %08x\n", hr ); @@ -1168,6 +1191,12 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); + hr = IWbemClassObject_BeginEnumeration( obj, 0 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWbemClassObject_EndEnumeration( obj ); + ok( hr == S_OK, "got %08x\n", hr ); + type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, buildnumberW, 0, &val, &type, NULL );

1 0

Nikolay Sivov : wincodecs/icoformat: Improve input data validation on decoder initialization.
by Alexandre Julliard Oct. 9, 2018

Oct. 9, 2018

Module: wine Branch: master Commit: e72983b5124eba463f76bc5c5de1dae2485ef42e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e72983b5124eba463f76bc5c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 9 09:41:49 2018 +0300 wincodecs/icoformat: Improve input data validation on decoder initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/icoformat.c | 34 +++++- dlls/windowscodecs/tests/icoformat.c | 207 ++++++++++++++++++++++++----------- 2 files changed, 173 insertions(+), 68 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 5e38ee0..dc08fd5 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -511,6 +511,9 @@ static HRESULT WINAPI IcoDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p LARGE_INTEGER seek; HRESULT hr; ULONG bytesread; + STATSTG statstg; + unsigned int i; + TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); EnterCriticalSection(&This->lock); @@ -527,14 +530,41 @@ static HRESULT WINAPI IcoDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p hr = IStream_Read(pIStream, &This->header, sizeof(ICONHEADER), &bytesread); if (FAILED(hr)) goto end; - if (bytesread != sizeof(ICONHEADER) || - This->header.idReserved != 0 || + + if (bytesread != sizeof(ICONHEADER)) + { + hr = WINCODEC_ERR_STREAMREAD; + goto end; + } + + if (This->header.idReserved != 0 || This->header.idType != 1) { hr = E_FAIL; goto end; } + hr = IStream_Stat(pIStream, &statstg, STATFLAG_NONAME); + if (FAILED(hr)) + { + WARN("Stat() failed, hr %#x.\n", hr); + goto end; + } + + for (i = 0; i < This->header.idCount; i++) + { + ICONDIRENTRY direntry; + + hr = IStream_Read(pIStream, &direntry, sizeof(direntry), &bytesread); + if (FAILED(hr)) goto end; + + if (bytesread != sizeof(direntry) || (direntry.dwDIBSize + direntry.dwDIBOffset > statstg.cbSize.QuadPart)) + { + hr = WINCODEC_ERR_BADIMAGE; + goto end; + } + } + This->initialized = TRUE; This->stream = pIStream; IStream_AddRef(pIStream); diff --git a/dlls/windowscodecs/tests/icoformat.c b/dlls/windowscodecs/tests/icoformat.c index c53739d..38db51c 100644 --- a/dlls/windowscodecs/tests/icoformat.c +++ b/dlls/windowscodecs/tests/icoformat.c @@ -26,72 +26,114 @@ #include "wincodec.h" #include "wine/test.h" -static unsigned char testico_bad_icondirentry_size[] = { - /* ICONDIR */ - 0, 0, /* reserved */ - 1, 0, /* type */ - 1, 0, /* count */ +#include "pshpack1.h" + +struct ICONHEADER +{ + WORD idReserved; + WORD idType; + WORD idCount; +}; + +struct ICONDIRENTRY +{ + BYTE bWidth; + BYTE bHeight; + BYTE bColorCount; + BYTE bReserved; + WORD wPlanes; + WORD wBitCount; + DWORD dwDIBSize; + DWORD dwDIBOffset; +}; + +struct test_ico +{ + struct ICONHEADER header; + struct ICONDIRENTRY direntry; + BITMAPINFOHEADER bmi; + unsigned char data[512]; +}; + +static const struct test_ico ico_1 = +{ + /* ICONHEADER */ + { + 0, /* reserved */ + 1, /* type */ + 1, /* count */ + }, /* ICONDIRENTRY */ - 2, /* width */ - 2, /* height */ - 2, /* colorCount */ - 0, /* reserved */ - 1,0, /* planes */ - 8,0, /* bitCount */ - (40+2*4+16*16+16*4) & 0xFF,((40+2*4+16*16+16*4) >> 8) & 0xFF,0,0, /* bytesInRes */ - 22,0,0,0, /* imageOffset */ + { + 16, /* width */ + 16, /* height */ + 2, /* color count */ + 0, /* reserved */ + 1, /* planes */ + 8, /* bitcount*/ + 40 + 2*4 + 16 * 16 + 16 * 4, /* data size */ + 22 /* data offset */ + }, /* BITMAPINFOHEADER */ - 40,0,0,0, /* header size */ - 16,0,0,0, /* width */ - 2*16,0,0,0, /* height (XOR+AND rows) */ - 1,0, /* planes */ - 8,0, /* bit count */ - 0,0,0,0, /* compression */ - 0,0,0,0, /* sizeImage */ - 0,0,0,0, /* x pels per meter */ - 0,0,0,0, /* y pels per meter */ - 2,0,0,0, /* clrUsed */ - 0,0,0,0, /* clrImportant */ - /* palette */ - 0,0,0,0, - 0xFF,0xFF,0xFF,0, - /* XOR mask */ - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, - 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, - 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, - 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, - 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, - 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, - 0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0, - 0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0, - 0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0, - 0,0,0,0,1,0,1,0,1,0,1,0,0,0,0,0, - 0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - /* AND mask */ - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0 + { + sizeof(BITMAPINFOHEADER), /* header size */ + 16, /* width */ + 2*16, /* height (XOR+AND rows) */ + 1, /* planes */ + 8, /* bit count */ + 0, /* compression */ + 0, /* sizeImage */ + 0, /* x pels per meter */ + 0, /* y pels per meter */ + 2, /* clrUsed */ + 0, /* clrImportant */ + }, + { + /* palette */ + 0,0,0,0, + 0xFF,0xFF,0xFF,0, + /* XOR mask */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, + 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, + 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, + 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, + 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, + 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, + 0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0, + 0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0, + 0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0, + 0,0,0,0,1,0,1,0,1,0,1,0,0,0,0,0, + 0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + /* AND mask */ + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0 + } }; -static void test_bad_icondirentry_size(void) +#include "poppack.h" + +#define test_ico_data(a, b, c) test_ico_data_(a, b, c, 0, __LINE__) +#define test_ico_data_todo(a, b, c) test_ico_data_(a, b, c, 1, __LINE__) +static void test_ico_data_(void *data, DWORD data_size, HRESULT init_hr, int todo, unsigned int line) { IWICBitmapDecoder *decoder; IWICImagingFactory *factory; @@ -108,8 +150,7 @@ static void test_bad_icondirentry_size(void) ok(hr == S_OK, "CreateStream failed, hr=%x\n", hr); if (SUCCEEDED(hr)) { - hr = IWICStream_InitializeFromMemory(icostream, testico_bad_icondirentry_size, - sizeof(testico_bad_icondirentry_size)); + hr = IWICStream_InitializeFromMemory(icostream, data, data_size); ok(hr == S_OK, "InitializeFromMemory failed, hr=%x\n", hr); if (SUCCEEDED(hr)) @@ -123,7 +164,8 @@ static void test_bad_icondirentry_size(void) { hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)icostream, WICDecodeMetadataCacheOnDemand); - ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + todo_wine_if(todo) + ok_(__FILE__, line)(hr == init_hr, "Initialize failed, hr=%x\n", hr); if (SUCCEEDED(hr)) { @@ -163,11 +205,44 @@ static void test_bad_icondirentry_size(void) IWICImagingFactory_Release(factory); } +static void test_decoder(void) +{ + struct test_ico ico; + + /* Icon size specified in ICONDIRENTRY does not match bitmap header. */ + ico = ico_1; + ico.direntry.bWidth = 2; + ico.direntry.bHeight = 2; + test_ico_data(&ico, sizeof(ico), S_OK); + + /* Invalid DIRENTRY data size/offset. */ + ico = ico_1; + ico.direntry.dwDIBOffset = sizeof(ico); + test_ico_data(&ico, sizeof(ico), WINCODEC_ERR_BADIMAGE); + + ico = ico_1; + ico.direntry.dwDIBSize = sizeof(ico); + test_ico_data(&ico, sizeof(ico), WINCODEC_ERR_BADIMAGE); + + /* Header fields validation. */ + ico = ico_1; + ico.header.idReserved = 1; + test_ico_data_todo(&ico, sizeof(ico), S_OK); + ico.header.idReserved = 0; + ico.header.idType = 100; + test_ico_data_todo(&ico, sizeof(ico), S_OK); + + /* Premature end of data. */ + ico = ico_1; + test_ico_data(&ico, sizeof(ico.header) - 1, WINCODEC_ERR_STREAMREAD); + test_ico_data(&ico, sizeof(ico.header) + sizeof(ico.direntry) - 1, WINCODEC_ERR_BADIMAGE); +} + START_TEST(icoformat) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - test_bad_icondirentry_size(); + test_decoder(); CoUninitialize(); }

1 0

Alexandre Julliard : ntdll: Implement RtlSetUnhandledExceptionFilter().
by Alexandre Julliard Oct. 9, 2018

Oct. 9, 2018

Module: wine Branch: master Commit: 03e05c1f578a4d4214593c68430082f0c7d6be2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=03e05c1f578a4d4214593c68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 14:49:54 2018 +0200 ntdll: Implement RtlSetUnhandledExceptionFilter(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 1 + dlls/ntdll/exception.c | 11 +++++++++++ dlls/ntdll/loader.c | 3 --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/ntdll_misc.h | 2 -- dlls/ntdll/thread.c | 1 - include/winternl.h | 3 +++ 7 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 5951501..fc065f1 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1364,6 +1364,7 @@ void CDECL __wine_kernel_init(void) setbuf(stderr,NULL); kernel32_handle = GetModuleHandleW(kernel32W); IsWow64Process( GetCurrentProcess(), &is_wow64 ); + RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter ); LOCALE_Init(); diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index c1ab96a..59177b7 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -59,6 +59,8 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug = }; static RTL_CRITICAL_SECTION vectored_handlers_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static PRTL_EXCEPTION_FILTER unhandled_exception_filter; + static VECTORED_HANDLER *add_vectored_handler( struct list *handler_list, ULONG first, PVECTORED_EXCEPTION_HANDLER func ) @@ -307,6 +309,15 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) /******************************************************************* + * RtlSetUnhandledExceptionFilter (NTDLL.@) + */ +void WINAPI RtlSetUnhandledExceptionFilter( PRTL_EXCEPTION_FILTER filter ) +{ + unhandled_exception_filter = filter; +} + + +/******************************************************************* * call_unhandled_exception_filter */ LONG WINAPI call_unhandled_exception_filter( PEXCEPTION_POINTERS eptr ) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a66a708..31168c0 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3520,9 +3520,6 @@ void __wine_process_init(void) MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); exit(1); } - RtlInitAnsiString( &func_name, "UnhandledExceptionFilter" ); - LdrGetProcedureAddress( wm->ldr.BaseAddress, &func_name, 0, (void **)&unhandled_exception_filter ); - RtlInitAnsiString( &func_name, "__wine_kernel_init" ); if ((status = LdrGetProcedureAddress( wm->ldr.BaseAddress, &func_name, 0, (void **)&init_func )) != STATUS_SUCCESS) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d1797b3..247f05f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -904,6 +904,7 @@ # @ stub RtlSetThreadPoolStartFunc @ stdcall RtlSetTimeZoneInformation(ptr) # @ stub RtlSetTimer +@ stdcall RtlSetUnhandledExceptionFilter(ptr) @ stub RtlSetUnicodeCallouts @ stub RtlSetUserFlagsHeap @ stub RtlSetUserValueHeap diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 96d9467..f4de3cf 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -116,8 +116,6 @@ extern void RELAY_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; extern void SNOOP_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; extern const WCHAR system_dir[] DECLSPEC_HIDDEN; -typedef LONG (WINAPI *PUNHANDLED_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); -extern PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter DECLSPEC_HIDDEN; extern void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void*) DECLSPEC_HIDDEN; /* redefine these to make sure we don't reference kernel symbols */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 3019a74..9b23fbf 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -55,7 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(thread); struct _KUSER_SHARED_DATA *user_shared_data = NULL; static const WCHAR default_windirW[] = {'C',':','\\','w','i','n','d','o','w','s',0}; -PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter = NULL; void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void*) = NULL; /* info passed to a starting thread */ diff --git a/include/winternl.h b/include/winternl.h index 77c95ec..1cec3cf 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2279,6 +2279,8 @@ typedef struct _SYSTEM_MODULE_INFORMATION #define THREAD_CREATE_FLAGS_ACCESS_CHECK_IN_TARGET 0x00000020 #define THREAD_CREATE_FLAGS_INITIAL_THREAD 0x00000080 +typedef LONG (CALLBACK *PRTL_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); + /*********************************************************************** * Function declarations */ @@ -2813,6 +2815,7 @@ NTSYSAPI void WINAPI RtlSetLastWin32ErrorAndNtStatusFromNtStatus(NTSTATUS); NTSYSAPI NTSTATUS WINAPI RtlSetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOLEAN,PACL,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlSetThreadErrorMode(DWORD,LPDWORD); NTSYSAPI NTSTATUS WINAPI RtlSetTimeZoneInformation(const RTL_TIME_ZONE_INFORMATION*); +NTSYSAPI void WINAPI RtlSetUnhandledExceptionFilter(PRTL_EXCEPTION_FILTER); NTSYSAPI SIZE_T WINAPI RtlSizeHeap(HANDLE,ULONG,const void*); NTSYSAPI NTSTATUS WINAPI RtlSleepConditionVariableCS(RTL_CONDITION_VARIABLE*,RTL_CRITICAL_SECTION*,const LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI RtlSleepConditionVariableSRW(RTL_CONDITION_VARIABLE*,RTL_SRWLOCK*,const LARGE_INTEGER*,ULONG);

1 0

Sebastian Lackner : opengl32: Add wrappers for glDebugMessageCallback to handle calling convention differences.
by Alexandre Julliard Oct. 9, 2018

Oct. 9, 2018

Module: wine Branch: master Commit: e07230ed4e8302efce99ce1924389c229d90adfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e07230ed4e8302efce99ce19… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 5 04:20:30 2018 +0000 opengl32: Add wrappers for glDebugMessageCallback to handle calling convention differences. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38402 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 3 +++ dlls/opengl32/opengl_ext.c | 24 +++---------------- dlls/opengl32/tests/opengl.c | 44 ++++++++++++++++++++++++++++++++++ dlls/opengl32/wgl.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+), 21 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index f2c93ef..f91796e 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -416,6 +416,9 @@ sub needs_wrapper($$) my %funcs = ( "glDebugEntry" => 1, + "glDebugMessageCallback" => 1, + "glDebugMessageCallbackAMD" => 1, + "glDebugMessageCallbackARB" => 1, "glGetIntegerv" => 1, "glGetString" => 1, "glGetStringi" => 1, diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c index 0f4c130..c27af43 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c @@ -2327,27 +2327,6 @@ static void WINAPI glCurrentPaletteMatrixARB( GLint index ) funcs->ext.p_glCurrentPaletteMatrixARB( index ); } -static void WINAPI glDebugMessageCallback( GLDEBUGPROC callback, const void *userParam ) -{ - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - TRACE( "(%p, %p)\n", callback, userParam ); - funcs->ext.p_glDebugMessageCallback( callback, userParam ); -} - -static void WINAPI glDebugMessageCallbackAMD( GLDEBUGPROCAMD callback, void *userParam ) -{ - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - TRACE( "(%p, %p)\n", callback, userParam ); - funcs->ext.p_glDebugMessageCallbackAMD( callback, userParam ); -} - -static void WINAPI glDebugMessageCallbackARB( GLDEBUGPROCARB callback, const void *userParam ) -{ - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - TRACE( "(%p, %p)\n", callback, userParam ); - funcs->ext.p_glDebugMessageCallbackARB( callback, userParam ); -} - static void WINAPI glDebugMessageControl( GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; @@ -18686,6 +18665,9 @@ static BOOL WINAPI wglSwapIntervalEXT( int interval ) return funcs->ext.p_wglSwapIntervalEXT( interval ); } +extern void WINAPI glDebugMessageCallback( GLDEBUGPROC callback, const void *userParam ) DECLSPEC_HIDDEN; +extern void WINAPI glDebugMessageCallbackAMD( GLDEBUGPROCAMD callback, void *userParam ) DECLSPEC_HIDDEN; +extern void WINAPI glDebugMessageCallbackARB( GLDEBUGPROCARB callback, const void *userParam ) DECLSPEC_HIDDEN; extern const GLubyte * WINAPI glGetStringi( GLenum name, GLuint index ) DECLSPEC_HIDDEN; extern BOOL WINAPI wglBindTexImageARB( HPBUFFERARB hPbuffer, int iBuffer ) DECLSPEC_HIDDEN; extern HGLRC WINAPI wglCreateContextAttribsARB( HDC hDC, HGLRC hShareContext, const int *attribList ) DECLSPEC_HIDDEN; diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 8105201..65a5914 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -48,6 +48,11 @@ static HDC (WINAPI *pwglGetPbufferDCARB)(HPBUFFERARB); static BOOL (WINAPI *pwglSwapIntervalEXT)(int interval); static int (WINAPI *pwglGetSwapIntervalEXT)(void); +/* GL_ARB_debug_output */ +static void (WINAPI *pglDebugMessageCallbackARB)(void *, void *); +static void (WINAPI *pglDebugMessageControlARB)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean); +static void (WINAPI *pglDebugMessageInsertARB)(GLenum, GLenum, GLuint, GLenum, GLsizei, const char *); + static const char* wgl_extensions = NULL; static void init_functions(void) @@ -80,6 +85,11 @@ static void init_functions(void) GET_PROC(wglSwapIntervalEXT) GET_PROC(wglGetSwapIntervalEXT) + /* GL_ARB_debug_output */ + GET_PROC(glDebugMessageCallbackARB) + GET_PROC(glDebugMessageControlARB) + GET_PROC(glDebugMessageInsertARB) + #undef GET_PROC } @@ -305,6 +315,39 @@ static void test_choosepixelformat(void) pfd.cAuxBuffers = 0; } +static void WINAPI gl_debug_message_callback(GLenum source, GLenum type, GLuint id, GLenum severity, + GLsizei length, const GLchar *message, const void *userParam) +{ + DWORD *count = (DWORD *)userParam; + (*count)++; +} + +static void test_debug_message_callback(void) +{ + static const char testmsg[] = "Hello World"; + DWORD count; + + if (!pglDebugMessageCallbackARB) + { + skip("glDebugMessageCallbackARB not supported\n"); + return; + } + + glEnable(GL_DEBUG_OUTPUT); + glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS); + + pglDebugMessageCallbackARB(gl_debug_message_callback, &count); + pglDebugMessageControlARB(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL, GL_TRUE); + + count = 0; + pglDebugMessageInsertARB(GL_DEBUG_SOURCE_APPLICATION, GL_DEBUG_TYPE_OTHER, 0x42424242, + GL_DEBUG_SEVERITY_LOW, sizeof(testmsg), testmsg); + ok(count == 1, "expected count == 1, got %u\n", count); + + glDisable(GL_DEBUG_OUTPUT_SYNCHRONOUS); + glDisable(GL_DEBUG_OUTPUT); +} + static void test_setpixelformat(HDC winhdc) { int res = 0; @@ -1786,6 +1829,7 @@ START_TEST(opengl) } test_choosepixelformat(); + test_debug_message_callback(); test_setpixelformat(hdc); test_destroy(hdc); test_sharelists(hdc); diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 04ace8e..9241005 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -58,6 +58,9 @@ struct opengl_context DWORD tid; /* thread that the context is current in */ HDC draw_dc; /* current drawing DC */ HDC read_dc; /* current reading DC */ + void (CALLBACK *debug_callback)(GLenum, GLenum, GLuint, GLenum, + GLsizei, const GLchar *, const void *); /* debug callback */ + const void *debug_user; /* debug user parameter */ GLubyte *extensions; /* extension string */ GLuint *disabled_exts; /* indices of disabled extensions */ struct wgl_context *drv_ctx; /* driver context */ @@ -1746,6 +1749,60 @@ const GLubyte * WINAPI glGetString( GLenum name ) return ret; } +/* wrapper for glDebugMessageCallback* functions */ +static void gl_debug_message_callback( GLenum source, GLenum type, GLuint id, GLenum severity, + GLsizei length, const GLchar *message,const void *userParam ) +{ + struct wgl_handle *ptr = (struct wgl_handle *)userParam; + if (!ptr->u.context->debug_callback) return; + ptr->u.context->debug_callback( source, type, id, severity, length, message, ptr->u.context->debug_user ); +} + +/*********************************************************************** + * glDebugMessageCallback + */ +void WINAPI glDebugMessageCallback( GLDEBUGPROC callback, const void *userParam ) +{ + struct wgl_handle *ptr = get_current_context_ptr(); + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + + TRACE( "(%p, %p)\n", callback, userParam ); + + ptr->u.context->debug_callback = callback; + ptr->u.context->debug_user = userParam; + funcs->ext.p_glDebugMessageCallback( gl_debug_message_callback, ptr ); +} + +/*********************************************************************** + * glDebugMessageCallbackAMD + */ +void WINAPI glDebugMessageCallbackAMD( GLDEBUGPROCAMD callback, void *userParam ) +{ + struct wgl_handle *ptr = get_current_context_ptr(); + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + + TRACE( "(%p, %p)\n", callback, userParam ); + + ptr->u.context->debug_callback = callback; + ptr->u.context->debug_user = userParam; + funcs->ext.p_glDebugMessageCallbackAMD( gl_debug_message_callback, ptr ); +} + +/*********************************************************************** + * glDebugMessageCallbackARB + */ +void WINAPI glDebugMessageCallbackARB( GLDEBUGPROCARB callback, const void *userParam ) +{ + struct wgl_handle *ptr = get_current_context_ptr(); + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + + TRACE( "(%p, %p)\n", callback, userParam ); + + ptr->u.context->debug_callback = callback; + ptr->u.context->debug_user = userParam; + funcs->ext.p_glDebugMessageCallbackARB( gl_debug_message_callback, ptr ); +} + /*********************************************************************** * OpenGL initialisation routine */

1 0

Alexandre Julliard : ntdll: Add a wrapper to call the unhandled exception filter.
by Alexandre Julliard Oct. 9, 2018

Oct. 9, 2018

Module: wine Branch: master Commit: da60ea1c337d47b76b50fb7e0cb9ddef788ae5e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da60ea1c337d47b76b50fb7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 14:42:30 2018 +0200 ntdll: Add a wrapper to call the unhandled exception filter. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 10 ++++++++++ dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_i386.c | 2 +- dlls/ntdll/signal_powerpc.c | 4 ++-- dlls/ntdll/signal_x86_64.c | 2 +- 7 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index f853810..c1ab96a 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -306,6 +306,16 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) } +/******************************************************************* + * call_unhandled_exception_filter + */ +LONG WINAPI call_unhandled_exception_filter( PEXCEPTION_POINTERS eptr ) +{ + if (!unhandled_exception_filter) return EXCEPTION_CONTINUE_SEARCH; + return unhandled_exception_filter( eptr ); +} + + /************************************************************* * __wine_spec_unimplemented_stub * diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 85ba707..96d9467 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -57,6 +57,7 @@ extern NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) DECLSPEC extern NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) DECLSPEC_HIDDEN; extern NTSTATUS set_thread_context( HANDLE handle, const context_t *context, BOOL *self ) DECLSPEC_HIDDEN; extern NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int flags, BOOL *self ) DECLSPEC_HIDDEN; +extern LONG WINAPI call_unhandled_exception_filter( PEXCEPTION_POINTERS eptr ) DECLSPEC_HIDDEN; /* debug helpers */ extern LPCSTR debugstr_us( const UNICODE_STRING *str ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 1986389..da0c8fb 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1227,7 +1227,7 @@ static void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); RtlExitUserThread( entry( arg )); } - __EXCEPT(unhandled_exception_filter) + __EXCEPT(call_unhandled_exception_filter) { NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 5a44914..91a7e3b 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -998,7 +998,7 @@ static void WINAPI call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void * TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); RtlExitUserThread( entry( arg )); } - __EXCEPT(unhandled_exception_filter) + __EXCEPT(call_unhandled_exception_filter) { NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); } diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 384615f..0719c64 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2653,7 +2653,7 @@ void DECLSPEC_HIDDEN call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg ) TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); RtlExitUserThread( call_thread_func_wrapper( entry, arg )); } - __EXCEPT(unhandled_exception_filter) + __EXCEPT(call_unhandled_exception_filter) { NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); } diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index f5231e7..1c96d62 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -648,7 +648,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) /* hack: call unhandled exception filter directly */ ptrs.ExceptionRecord = rec; ptrs.ContextRecord = context; - unhandled_exception_filter( &ptrs ); + call_unhandled_exception_filter( &ptrs ); return STATUS_UNHANDLED_EXCEPTION; } @@ -1160,7 +1160,7 @@ static void WINAPI call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void * TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); RtlExitUserThread( entry( arg )); } - __EXCEPT(unhandled_exception_filter) + __EXCEPT(call_unhandled_exception_filter) { NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 4fb80bb..7228adb 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4370,7 +4370,7 @@ static void WINAPI call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg ) TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); RtlExitUserThread( entry( arg )); } - __EXCEPT(unhandled_exception_filter) + __EXCEPT(call_unhandled_exception_filter) { NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); }

1 0

Byeongsik Jeon : gdi32: Improves the subpixel rendering availability for FreeType 2.8.1+.
by Alexandre Julliard Oct. 9, 2018

Oct. 9, 2018

Module: wine Branch: master Commit: 66e446c5ec5c7f4f072358712151d75305dfbd49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66e446c5ec5c7f4f07235871… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Tue Oct 9 14:11:07 2018 +0900 gdi32: Improves the subpixel rendering availability for FreeType 2.8.1+. FreeType 2.8.1+ implemented its own subpixel rendering. So FT_Err_Uniplemented_Feature check is not the reliable way. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 36a3431..2dd2dcd 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -993,18 +993,22 @@ static BOOL is_hinting_enabled(void) static BOOL is_subpixel_rendering_enabled( void ) { -#ifdef FT_LCD_FILTER_H static int enabled = -1; if (enabled == -1) { - enabled = (pFT_Library_SetLcdFilter && - pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature); + /* FreeType >= 2.8.1 offers LCD-optimezed rendering without lcd filters. */ + if (FT_SimpleVersion >= ((2 << 16) | (8 << 8) | (1 << 0))) + enabled = TRUE; +#ifdef FT_LCD_FILTER_H + else if (pFT_Library_SetLcdFilter && + pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature) + enabled = TRUE; +#endif + else enabled = FALSE; + TRACE("subpixel rendering is %senabled\n", enabled ? "" : "NOT "); } return enabled; -#else - return FALSE; -#endif } @@ -7274,7 +7278,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, case WINE_GGO_HBGR_BITMAP: case WINE_GGO_VRGB_BITMAP: case WINE_GGO_VBGR_BITMAP: -#ifdef FT_LCD_FILTER_H { switch (ft_face->glyph->format) { @@ -7360,8 +7363,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if ( needsTransform ) pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki); +#ifdef FT_LCD_FILTER_H if ( pFT_Library_SetLcdFilter ) pFT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT ); +#endif pFT_Render_Glyph (ft_face->glyph, render_mode); src = ft_face->glyph->bitmap.buffer; @@ -7442,9 +7447,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, break; } -#else - return GDI_ERROR; -#endif case GGO_NATIVE: {

1 0

Zebediah Figura : rpcrt4/tests: Add some tests for nesting arrays and pointers.
by Alexandre Julliard Oct. 9, 2018

Oct. 9, 2018

Module: wine Branch: master Commit: 935eed8e980a62557b19b3313e32106752b4e4f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=935eed8e980a62557b19b331… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 5 16:57:52 2018 -0500 rpcrt4/tests: Add some tests for nesting arrays and pointers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 14 ++++++++++++++ dlls/rpcrt4/tests/server.idl | 3 +++ 2 files changed, 17 insertions(+) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index b35b71b..1494904 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -861,6 +861,16 @@ void __cdecl s_ip_test(ipu_t *a) ok(hr == S_OK, "got %#x\n", hr); } +int __cdecl s_sum_ptr_array(int *a[2]) +{ + return *a[0] + *a[1]; +} + +int __cdecl s_sum_array_ptr(int (*a)[2]) +{ + return (*a)[0] + (*a)[1]; +} + static void make_cmdline(char buffer[MAX_PATH], const char *test) { @@ -1388,6 +1398,7 @@ array_tests(void) pints_t api[5]; numbers_struct_t *ns; refpint_t rpi[5]; + int i0 = 1, i1 = 2, *ptr_array[2] = {&i0, &i1}, array[2] = {3, 4}; if (!old_windows_version) { @@ -1518,6 +1529,9 @@ array_tests(void) pi[4] = -4; rpi[4] = &pi[4]; ok(sum_complex_array(5, rpi) == 1, "RPC sum_complex_array\n"); HeapFree(GetProcessHeap(), 0, pi); + + ok(sum_ptr_array(ptr_array) == 3, "RPC sum_ptr_array\n"); + ok(sum_array_ptr(&array) == 7, "RPC sum_array_ptr\n"); } void __cdecl s_authinfo_test(unsigned int protseq, int secure) diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 6aa7382..7d89445 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -393,4 +393,7 @@ cpp_quote("#endif") } ipu_t; void ip_test([in] ipu_t *a); + + int sum_ptr_array([in] int *a[2]); + int sum_array_ptr([in] int (*a)[2]); }

1 0