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

Józef Kucia : wined3d: Validate all layers locations for render target views.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 6920164824fbb640ba659dc067d7009ebd3eeb58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6920164824fbb640ba659dc06… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 18 11:24:13 2017 +0200 wined3d: Validate all layers locations for render target views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/view.c | 18 ++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 15b3791..0b5b5e6 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -543,7 +543,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(dsv); DWORD location = context->render_offscreen ? ds->container->resource.draw_binding : WINED3D_LOCATION_DRAWABLE; - wined3d_texture_validate_location(ds->container, dsv->sub_resource_idx, location); + wined3d_rendertarget_view_validate_location(dsv, location); wined3d_texture_invalidate_location(ds->container, dsv->sub_resource_idx, ~location); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e1e1956..4e1ea6d 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -436,6 +436,24 @@ void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *v wined3d_texture_load_location(texture, sub_resource_idx, context, location); } +void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, DWORD location) +{ + struct wined3d_resource *resource = view->resource; + unsigned int i, sub_resource_idx; + struct wined3d_texture *texture; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Not implemented for resources %s.\n", debug_d3dresourcetype(resource->type)); + return; + } + + texture = texture_from_resource(resource); + sub_resource_idx = view->sub_resource_idx; + for (i = 0; i < view->layer_count; ++i, sub_resource_idx += texture->level_count) + wined3d_texture_validate_location(texture, sub_resource_idx, location); +} + static void wined3d_render_target_view_cs_init(void *object) { struct wined3d_rendertarget_view *view = object; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ff5b242..c49e010 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3462,6 +3462,8 @@ void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *v struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view *view, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; +void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, + DWORD location) DECLSPEC_HIDDEN; struct wined3d_shader_resource_view {

1 0

Henri Verbeet : usp10: Validate positioning record sequence indices in GPOS_apply_ChainContextPos ().
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 34a9400a89c4d1b8a46979432f3864e8065919fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a9400a89c4d1b8a46979432… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 17 20:26:56 2017 +0200 usp10: Validate positioning record sequence indices in GPOS_apply_ChainContextPos(). The issue is somewhat theoretical, since in reasonbale fonts the indices should always be valid, and in fact are fairly likely to be 0. On the other hand, web fonts exist. 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 | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index a3346ef..f0417f1 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2301,12 +2301,20 @@ static unsigned int GPOS_apply_ChainContextPos(const ScriptCache *script_cache, for (k = 0; k < positioning_count; ++k) { - WORD lookup_index = GET_BE_WORD(positioning->PosLookupRecord[k].LookupListIndex); - WORD sequence_index = GET_BE_WORD(positioning->PosLookupRecord[k].SequenceIndex) * write_dir; + unsigned int lookup_index = GET_BE_WORD(positioning->PosLookupRecord[k].LookupListIndex); + unsigned int sequence_index = GET_BE_WORD(positioning->PosLookupRecord[k].SequenceIndex); + unsigned int g = glyph_index + write_dir * sequence_index; + + if (g >= glyph_count) + { + WARN("Skipping invalid sequence index %u (glyph index %u, write dir %d).\n", + sequence_index, glyph_index, write_dir); + continue; + } TRACE("Position: %u -> %u %u.\n", k, sequence_index, lookup_index); GPOS_apply_lookup(script_cache, otm, logfont, analysis, advance, lookup, lookup_index, - glyphs, glyph_index + sequence_index, glyph_count, goffset); + glyphs, g, glyph_count, goffset); } return input_count + lookahead_count; }

1 0

Huw Davies : oleaut32: Use VariantInit() rather than open coding it.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: f506ffc6d6fbf577cfaec32ee781d7fc932995d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f506ffc6d6fbf577cfaec32ee… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 18 12:07:03 2017 +0100 oleaut32: Use VariantInit() rather than open coding it. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/vartype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index ebb6183..2151fc9 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -129,7 +129,7 @@ static HRESULT VARIANT_FromDisp(IDispatch* pdispIn, LCID lcid, void* pOut, if (SUCCEEDED(hRet)) { /* Convert the property to the requested type */ - V_VT(&dstVar) = VT_EMPTY; + VariantInit(&dstVar); hRet = VariantChangeTypeEx(&dstVar, &srcVar, lcid, dwFlags, vt); VariantClear(&srcVar);

1 0

Nikolay Sivov : dwrite/tests: Test to show that canWrapLineAfter is not fixed up by disabled wrapping.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 47455651923e6bf3c6f0773265946ee1942afa05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47455651923e6bf3c6f077326… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 15:15:25 2017 +0300 dwrite/tests: Test to show that canWrapLineAfter is not fixed up by disabled wrapping. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 8a32303..f48fc42 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1858,6 +1858,7 @@ static void test_GetClusterMetrics(void) static const WCHAR str2W[] = {0x202a,0x202c,'a',0}; static const WCHAR strW[] = {'a','b','c','d',0}; static const WCHAR str4W[] = {'a',' ',0}; + static const WCHAR str6W[] = {'a',' ','b',0}; DWRITE_INLINE_OBJECT_METRICS inline_metrics; DWRITE_CLUSTER_METRICS metrics[22]; DWRITE_TEXT_METRICS text_metrics; @@ -2254,6 +2255,25 @@ todo_wine IDWriteTextLayout_Release(layout); + /* NO_WRAP, check cluster wrapping attribute. */ + hr = IDWriteTextFormat_SetWordWrapping(format, DWRITE_WORD_WRAPPING_NO_WRAP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, str6W, lstrlenW(str6W), format, 1000.0f, 200.0f, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 3, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 3, "got %u\n", count); + + ok(metrics[0].canWrapLineAfter == 0, "got %d\n", metrics[0].canWrapLineAfter); + ok(metrics[1].canWrapLineAfter == 1, "got %d\n", metrics[1].canWrapLineAfter); + ok(metrics[2].canWrapLineAfter == 1, "got %d\n", metrics[2].canWrapLineAfter); + + IDWriteTextLayout_Release(layout); + IDWriteInlineObject_Release(trimm); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory);

1 0

Huw Davies : shell32: Use the imagelist to determine the icon size.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 734dc8f200dfdec1a7bd746200fba72e870b5f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=734dc8f200dfdec1a7bd74620… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 19 13:13:40 2017 +0100 shell32: Use the imagelist to determine the icon size. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/iconcache.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 7beb479..737f4d5 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -298,6 +298,17 @@ static INT SIC_IconAppend (LPCWSTR sSourceFile, INT dwSourceIndex, HICON hSmallI LeaveCriticalSection(&SHELL32_SicCS); return ret; } + +static BOOL get_imagelist_icon_size(int list, SIZE *size) +{ + HIMAGELIST image_list; + + if (list < SHIL_LARGE || list > SHIL_SMALL) return FALSE; + image_list = (list == SHIL_LARGE) ? ShellBigIconList : ShellSmallIconList; + + return ImageList_GetIconSize( image_list, &size->cx, &size->cy ); +} + /**************************************************************************** * SIC_LoadIcon [internal] * @@ -311,11 +322,12 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) HICON hiconLargeShortcut; HICON hiconSmallShortcut; int ret; + SIZE size; - PrivateExtractIconsW( sSourceFile, dwSourceIndex, GetSystemMetrics(SM_CXICON), - GetSystemMetrics(SM_CYICON), &hiconLarge, 0, 1, 0 ); - PrivateExtractIconsW( sSourceFile, dwSourceIndex, GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), &hiconSmall, 0, 1, 0 ); + get_imagelist_icon_size( SHIL_LARGE, &size ); + PrivateExtractIconsW( sSourceFile, dwSourceIndex, size.cx, size.cy, &hiconLarge, 0, 1, 0 ); + get_imagelist_icon_size( SHIL_SMALL, &size ); + PrivateExtractIconsW( sSourceFile, dwSourceIndex, size.cx, size.cy, &hiconSmall, 0, 1, 0 ); if ( !hiconLarge || !hiconSmall) {

1 0

Michael Stefaniuc : comctl32/tests: Check the correct last error code.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: c7c8d24bf9ae0be03f73d1a9ff8225bfd17d6394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7c8d24bf9ae0be03f73d1a9f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Apr 19 01:24:15 2017 +0200 comctl32/tests: Check the correct last error code. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/animate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/animate.c b/dlls/comctl32/tests/animate.c index c64dbfa..fab345b 100644 --- a/dlls/comctl32/tests/animate.c +++ b/dlls/comctl32/tests/animate.c @@ -160,8 +160,9 @@ static void test_play(void) SetLastError(0xdeadbeef); res = SendMessageA(hAnimateWnd, ACM_PLAY, (WPARAM) -1, MAKELONG(0, -1)); + err = GetLastError(); ok(res == 0, "Play should have failed\n"); - ok(err == ERROR_RESOURCE_NAME_NOT_FOUND, "Expected 1814, got %u\n", err); + ok(err == 0xdeadbeef, "Expected 0xdeadbeef, got %u\n", err); destroy_animate(); create_animate(0, 0);

1 0

Michael Stefaniuc : amstream/tests: Use SetRectEmpty() instead of memset() .
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 0e0cc67c5aa69140a672bfc4942a1b91f4a683d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e0cc67c5aa69140a672bfc49… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 17 21:42:00 2017 +0200 amstream/tests: Use SetRectEmpty() instead of memset(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a7999be..c08f989 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -572,7 +572,7 @@ static void test_IDirectDrawStreamSample(void) EXPECT_REF(surface, 2); surface2 = NULL; - memset(&rect, 0, sizeof(rect)); + SetRectEmpty(&rect); hr = IDirectDrawStreamSample_GetSurface(pddsample, &surface2, &rect); ok(hr == S_OK, "got 0x%08x\n", hr); ok(surface == surface2, "got %p\n", surface2);

1 0

Michael Stefaniuc : avifil32: Use SetRectEmpty() instead of memset().
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 78c49a4d32d056313c1e1a8486a2956bebaec647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78c49a4d32d056313c1e1a848… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 17 21:42:03 2017 +0200 avifil32: Use SetRectEmpty() instead of memset(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/wavfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index 32a6788..d2d203b 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -314,7 +314,7 @@ static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile *iface, IAVIStream **avis This->sInfo.dwStart = 0; This->sInfo.dwInitialFrames = 0; This->sInfo.dwFormatChangeCount = 0; - memset(&This->sInfo.rcFrame, 0, sizeof(This->sInfo.rcFrame)); + SetRectEmpty(&This->sInfo.rcFrame); This->fInfo.dwStreams = 1; This->fInfo.dwScale = This->sInfo.dwScale;

1 0

Piotr Caban : msvcr120: Add wctype implementation.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 42ccd8d9ecb386bb9da311c1faa5c14a12d26de3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42ccd8d9ecb386bb9da311c1f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 14 18:21:21 2017 +0200 msvcr120: Add wctype implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 32 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/ctype.c | 30 ++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 6 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index 0f30b05..1daaadc 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -173,6 +173,6 @@ @ cdecl wcstok(wstr wstr) ucrtbase.wcstok @ cdecl wcstok_s(ptr wstr ptr) ucrtbase.wcstok_s @ cdecl wcsxfrm(ptr wstr long) ucrtbase.wcsxfrm -@ stub wctype +@ cdecl wctype(str) ucrtbase.wctype @ cdecl wmemcpy_s(ptr long ptr long) ucrtbase.wmemcpy_s @ cdecl wmemmove_s(ptr long ptr long) ucrtbase.wmemmove_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d73a603..96afa6f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2487,7 +2487,7 @@ @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s @ stub wctrans -@ stub wctype +@ cdecl wctype(str) @ cdecl wmemcpy_s(ptr long ptr long) @ cdecl wmemmove_s(ptr long ptr long) @ varargs wprintf(wstr) MSVCRT_wprintf diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 13f3672..de0ccc4 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -182,6 +182,7 @@ static int (CDECL *p_fegetenv)(fenv_t*); static int (CDECL *p__clearfp)(void); static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); static void (__cdecl *p_free_locale)(_locale_t); +static unsigned short (__cdecl *p_wctype)(const char*); /* make sure we use the correct errno */ #undef errno @@ -236,6 +237,7 @@ static BOOL init(void) p_errno = (void*)GetProcAddress(module, "_errno"); p_wcreate_locale = (void*)GetProcAddress(module, "_wcreate_locale"); p_free_locale = (void*)GetProcAddress(module, "_free_locale"); + SET(p_wctype, "wctype"); SET(p_fegetenv, "fegetenv"); SET(p__clearfp, "_clearfp"); if(sizeof(void*) == 8) { /* 64-bit initialization */ @@ -880,6 +882,35 @@ static void test__Condition_variable(void) CloseHandle(thread_initialized); } +static void test_wctype(void) +{ + static const struct { + const char *name; + unsigned short mask; + } properties[] = { + { "alnum", 0x107 }, + { "alpha", 0x103 }, + { "cntrl", 0x020 }, + { "digit", 0x004 }, + { "graph", 0x117 }, + { "lower", 0x002 }, + { "print", 0x157 }, + { "punct", 0x010 }, + { "space", 0x008 }, + { "upper", 0x001 }, + { "xdigit", 0x080 }, + { "ALNUM", 0x000 }, + { "Alnum", 0x000 }, + { "", 0x000 } + }; + int i, ret; + + for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) { + ret = p_wctype(properties[i].name); + ok(properties[i].mask == ret, "%d - Expected %x, got %x\n", i, properties[i].mask, ret); + } +} + START_TEST(msvcr120) { if (!init()) return; @@ -896,4 +927,5 @@ START_TEST(msvcr120) test_fegetenv(); test__wcreate_locale(); test__Condition_variable(); + test_wctype(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 942d212..c12dcbc 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -2149,7 +2149,7 @@ @ cdecl wctomb(ptr long) msvcr120.wctomb @ cdecl wctomb_s(ptr ptr long long) msvcr120.wctomb_s @ stub wctrans -@ stub wctype +@ cdecl wctype(str) msvcr120.wctype @ cdecl wmemcpy_s(ptr long ptr long) msvcr120.wmemcpy_s @ cdecl wmemmove_s(ptr long ptr long) msvcr120.wmemmove_s @ varargs wprintf(wstr) msvcr120.wprintf diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index eb9891a..e076d89 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -468,3 +468,33 @@ int CDECL MSVCRT__tolower(int c) { return c + 0x20; /* sic */ } + +/********************************************************************* + * wctype (MSVCR120.@) + */ +unsigned short __cdecl wctype(const char *property) +{ + static const struct { + const char *name; + unsigned short mask; + } properties[] = { + { "alnum", MSVCRT__DIGIT|MSVCRT__ALPHA }, + { "alpha", MSVCRT__ALPHA }, + { "cntrl", MSVCRT__CONTROL }, + { "digit", MSVCRT__DIGIT }, + { "graph", MSVCRT__DIGIT|MSVCRT__PUNCT|MSVCRT__ALPHA }, + { "lower", MSVCRT__LOWER }, + { "print", MSVCRT__DIGIT|MSVCRT__PUNCT|MSVCRT__BLANK|MSVCRT__ALPHA }, + { "punct", MSVCRT__PUNCT }, + { "space", MSVCRT__SPACE }, + { "upper", MSVCRT__UPPER }, + { "xdigit", MSVCRT__HEX } + }; + unsigned int i; + + for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) + if(!strcmp(property, properties[i].name)) + return properties[i].mask; + + return 0; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 79ba494..dbc418c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2594,6 +2594,6 @@ @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s @ stub wctrans -@ stub wctype +@ cdecl wctype(str) @ cdecl wmemcpy_s(ptr long ptr long) @ cdecl wmemmove_s(ptr long ptr long)

1 0

Jacek Caban : mshtml.idl: Added HTMLHeadElement coclass declaration.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: fd7f3b34057b48ba114a6d31060aa7c0cdba3242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7f3b34057b48ba114a6d310… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 14 14:36:36 2017 +0200 mshtml.idl: Added HTMLHeadElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlhead.c | 4 ++-- include/mshtml.idl | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 1a37fe3..e391396 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -374,11 +374,11 @@ HRESULT HTMLHtmlElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, return S_OK; } -typedef struct { +struct HTMLHeadElement { HTMLElement element; IHTMLHeadElement IHTMLHeadElement_iface; -} HTMLHeadElement; +}; static inline HTMLHeadElement *impl_from_IHTMLHeadElement(IHTMLHeadElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index 660ed53..e3bf2e7 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -11691,6 +11691,23 @@ methods: } /***************************************************************************** + * HTMLHeadElement coclass + */ +[ + noncreatable, + uuid(3050f493-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLHeadElement +{ + [default] dispinterface DispHTMLHeadElement; + [source, default] dispinterface HTMLElementEvents; + [source] dispinterface HTMLElementEvents2; + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLHeadElement; + interface IHTMLHeadElement2; +} + +/***************************************************************************** * DispHTMLTitleElement interface */ [

1 0