November 2014 - Wine-Commits

Nikolay Sivov : dwrite: Don't cache fontface instance in font data.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: 1e0b9341392e8c2035f137723fdfbe874d2c93ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0b9341392e8c2035f137723… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 5 12:48:45 2014 +0300 dwrite: Don't cache fontface instance in font data. --- dlls/dwrite/font.c | 65 ++++++++++++++++++++++++++++++++---------------- dlls/dwrite/tests/font.c | 1 - 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 95fbdc6..7dea8e5 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -46,8 +46,6 @@ struct dwrite_font_data { IDWriteFontFile *file; UINT32 face_index; - IDWriteFontFace2 *face; - WCHAR *facename; }; @@ -210,8 +208,6 @@ static void release_font_data(struct dwrite_font_data *data) IDWriteFontFile_Release(data->file); if (data->factory) IDWriteFactory_Release(data->factory); - if (data->face) - IDWriteFontFace2_Release(data->face); heap_free(data->facename); heap_free(data); } @@ -707,24 +703,20 @@ HRESULT convert_fontface_to_logfont(IDWriteFontFace *face, LOGFONTW *logfont) static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 **fontface) { - HRESULT hr = S_OK; + struct dwrite_font_data *data = font->data; + IDWriteFontFace *face; + HRESULT hr; *fontface = NULL; - if (!font->data->face) { - struct dwrite_font_data *data = font->data; - IDWriteFontFace *face; - - hr = IDWriteFactory_CreateFontFace(data->factory, data->face_type, 1, &data->file, - data->face_index, font->simulations, &face); - if (FAILED(hr)) - return hr; + hr = IDWriteFactory_CreateFontFace(data->factory, data->face_type, 1, &data->file, + data->face_index, font->simulations, &face); + if (FAILED(hr)) + return hr; - hr = IDWriteFontFace_QueryInterface(face, &IID_IDWriteFontFace2, (void**)&font->data->face); - IDWriteFontFace_Release(face); - } + hr = IDWriteFontFace_QueryInterface(face, &IID_IDWriteFontFace2, (void**)fontface); + IDWriteFontFace_Release(face); - *fontface = font->data->face; return hr; } @@ -1315,6 +1307,29 @@ static HRESULT WINAPI dwritefontcollection_FindFamilyName(IDWriteFontCollection return collection_find_family(This, name, index, exists); } +static BOOL is_same_fontfile(IDWriteFontFile *left, IDWriteFontFile *right) +{ + UINT32 left_key_size, right_key_size; + const void *left_key, *right_key; + HRESULT hr; + + if (left == right) + return TRUE; + + hr = IDWriteFontFile_GetReferenceKey(left, &left_key, &left_key_size); + if (FAILED(hr)) + return FALSE; + + hr = IDWriteFontFile_GetReferenceKey(right, &right_key, &right_key_size); + if (FAILED(hr)) + return FALSE; + + if (left_key_size != right_key_size) + return FALSE; + + return !memcmp(left_key, right_key, left_key_size); +} + static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollection *iface, IDWriteFontFace *face, IDWriteFont **font) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); @@ -1322,7 +1337,8 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec struct dwrite_font_data *found_font = NULL; DWRITE_FONT_SIMULATIONS simulations; IDWriteFontFamily *family; - UINT32 i, j; + UINT32 i, j, face_index; + IDWriteFontFile *file; HRESULT hr; TRACE("(%p)->(%p %p)\n", This, face, font); @@ -1332,11 +1348,19 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec if (!face) return E_INVALIDARG; + i = 1; + hr = IDWriteFontFace_GetFiles(face, &i, &file); + if (FAILED(hr)) + return hr; + face_index = IDWriteFontFace_GetIndex(face); + for (i = 0; i < This->family_count; i++) { struct dwrite_fontfamily_data *family_data = This->family_data[i]; for (j = 0; j < family_data->font_count; j++) { - if ((IDWriteFontFace*)family_data->fonts[j]->face == face) { - found_font = family_data->fonts[j]; + struct dwrite_font_data *font_data = family_data->fonts[j]; + + if (face_index == font_data->face_index && is_same_fontfile(file, font_data->file)) { + found_font = font_data; found_family = family_data; break; } @@ -1459,7 +1483,6 @@ static HRESULT init_font_data(IDWriteFactory *factory, IDWriteFontFile *file, UI data->factory = factory; data->file = file; - data->face = NULL; data->face_index = face_index; data->face_type = face_type; IDWriteFontFile_AddRef(file); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 950377c..e51b702 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2039,7 +2039,6 @@ static void test_GetSimulations(void) hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); simulations = IDWriteFontFace_GetSimulations(fontface); -todo_wine ok(simulations == DWRITE_FONT_SIMULATIONS_NONE, "got %d\n", simulations); IDWriteFontFace_Release(fontface); IDWriteFont_Release(font);

1 0

Iván Matellanes : msvcrt: Added _putc_nolock implementation.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: 755a54b2a7d72d731e444bbb3955ab68fdd4c665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=755a54b2a7d72d731e444bbb3… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Nov 5 22:55:57 2014 +0100 msvcrt: Added _putc_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 1 + dlls/msvcr110/msvcr110.spec | 1 + dlls/msvcr120/msvcr120.spec | 1 + dlls/msvcr80/msvcr80.spec | 1 + dlls/msvcr90/msvcr90.spec | 1 + include/msvcrt/stdio.h | 1 + 6 files changed, 6 insertions(+) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0fbe506..0e1ec19 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1232,6 +1232,7 @@ @ stub _printf_p_l @ stub _printf_s_l @ cdecl _purecall() +@ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) @ stub _putch_nolock @ cdecl _putenv(str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 368ca37..609e7ba 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1590,6 +1590,7 @@ @ stub _printf_p_l @ stub _printf_s_l @ cdecl _purecall() +@ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) @ stub _putch_nolock @ cdecl _putenv(str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 2b647b8..1afacf5 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1598,6 +1598,7 @@ @ stub _printf_p_l @ stub _printf_s_l @ cdecl _purecall() +@ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) @ stub _putch_nolock @ cdecl _putenv(str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0137ac4..960a23c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -907,6 +907,7 @@ @ stub _printf_p_l @ stub _printf_s_l @ cdecl _purecall() +@ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) @ stub _putch_nolock @ cdecl _putenv(str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c028cba..8b74dea 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -882,6 +882,7 @@ @ stub _printf_p_l @ stub _printf_s_l @ cdecl _purecall() +@ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) @ stub _putch_nolock @ cdecl _putenv(str) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 8b23def..d7316b5 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -138,6 +138,7 @@ int __cdecl _fseeki64_nolock(FILE*,__int64,int); __msvcrt_long __cdecl _ftell_nolock(FILE*); __int64 __cdecl _ftelli64_nolock(FILE*); int __cdecl _getc_nolock(FILE*); +int __cdecl _putc_nolock(int,FILE*); int __cdecl _ungetc_nolock(int,FILE*); void __cdecl clearerr(FILE*);

1 0

Iván Matellanes : msvcrt: Added _getc_nolock implementation.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: caedfc89541194bcf860bc6269aa5b8a71d40355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caedfc89541194bcf860bc626… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Nov 5 22:55:44 2014 +0100 msvcrt: Added _getc_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 1 + dlls/msvcr90/msvcr90.spec | 2 +- include/msvcrt/stdio.h | 1 + 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 45a04cf..931d826 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -888,7 +888,7 @@ @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected @ cdecl _get_wpgmptr(ptr) -@ stub _getc_nolock +@ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() @ stub _getch_nolock @ cdecl _getche() diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 5fc4ee5..3939ccf 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1236,7 +1236,7 @@ @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected @ cdecl _get_wpgmptr(ptr) -@ stub _getc_nolock +@ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() @ stub _getch_nolock @ cdecl _getche() diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c3edd61..2ee3800 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1234,7 +1234,7 @@ @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected @ cdecl _get_wpgmptr(ptr) -@ stub _getc_nolock +@ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() @ stub _getch_nolock @ cdecl _getche() diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9877784..36421f3 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -562,6 +562,7 @@ @ stub _get_winminor @ stub _get_winver @ cdecl _get_wpgmptr(ptr) +@ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() @ stub _getch_nolock @ cdecl _getche() diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 4df9203..e9790be 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -539,7 +539,7 @@ @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected @ cdecl _get_wpgmptr(ptr) -@ stub _getc_nolock +@ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() @ stub _getch_nolock @ cdecl _getche() diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 7512efc..9a2f338 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -137,6 +137,7 @@ int __cdecl _fseek_nolock(FILE*,__msvcrt_long,int); int __cdecl _fseeki64_nolock(FILE*,__int64,int); __msvcrt_long __cdecl _ftell_nolock(FILE*); __int64 __cdecl _ftelli64_nolock(FILE*); +int __cdecl _getc_nolock(FILE*); int __cdecl _ungetc_nolock(int,FILE*); void __cdecl clearerr(FILE*);

1 0

Henri Verbeet : d2d1: Implement d2d_solid_color_brush_SetOpacity().
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: 743d80fea590c61ac2c6fb89c305ce6a6694813c URL: http://source.winehq.org/git/wine.git/?a=commit;h=743d80fea590c61ac2c6fb89c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 6 08:20:17 2014 +0100 d2d1: Implement d2d_solid_color_brush_SetOpacity(). --- dlls/d2d1/brush.c | 7 ++++++- dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/render_target.c | 11 +++++++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index eacbebb..8837cee 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -149,6 +149,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_ta { brush->ID2D1Brush_iface.lpVtbl = vtbl; brush->refcount = 1; + brush->opacity = desc ? desc->opacity : 1.0f; brush->type = type; } @@ -210,7 +211,11 @@ static void STDMETHODCALLTYPE d2d_solid_color_brush_GetFactory(ID2D1SolidColorBr static void STDMETHODCALLTYPE d2d_solid_color_brush_SetOpacity(ID2D1SolidColorBrush *iface, float opacity) { - FIXME("iface %p, opacity %.8e stub!\n", iface, opacity); + struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); + + TRACE("iface %p, opacity %.8e.\n", iface, opacity); + + brush->opacity = opacity; } static void STDMETHODCALLTYPE d2d_solid_color_brush_SetTransform(ID2D1SolidColorBrush *iface, diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 0a99633..8504e68 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -107,6 +107,8 @@ struct d2d_brush ID2D1Brush ID2D1Brush_iface; LONG refcount; + float opacity; + enum d2d_brush_type type; union { diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 1dd5122..0f5907f 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -501,6 +501,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar D3D10_SUBRESOURCE_DATA buffer_data; D3D10_BUFFER_DESC buffer_desc; ID3D10Buffer *vs_cb, *ps_cb; + D2D1_COLOR_F color; float tmp_x, tmp_y; HRESULT hr; struct @@ -558,8 +559,14 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar return; } - buffer_desc.ByteWidth = sizeof(brush_impl->u.solid.color); - buffer_data.pSysMem = &brush_impl->u.solid.color; + color = brush_impl->u.solid.color; + color.r *= brush_impl->opacity; + color.g *= brush_impl->opacity; + color.b *= brush_impl->opacity; + color.a *= brush_impl->opacity; + + buffer_desc.ByteWidth = sizeof(color); + buffer_data.pSysMem = &color; if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &ps_cb))) {

1 0

Henri Verbeet : d2d1: Implement d2d_solid_color_brush_GetColor().
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: fd8b3ae57298bff9dcb1c7db36a67d4d3818400f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8b3ae57298bff9dcb1c7db3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 6 08:20:16 2014 +0100 d2d1: Implement d2d_solid_color_brush_GetColor(). --- dlls/d2d1/brush.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 04b273a..eacbebb 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -252,11 +252,11 @@ static void STDMETHODCALLTYPE d2d_solid_color_brush_SetColor(ID2D1SolidColorBrus static D2D1_COLOR_F * STDMETHODCALLTYPE d2d_solid_color_brush_GetColor(ID2D1SolidColorBrush *iface, D2D1_COLOR_F *color) { - static const D2D1_COLOR_F black = {0.0f, 0.0f, 0.0f, 1.0f}; + struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); - FIXME("iface %p, color %p stub!\n", iface, color); + TRACE("iface %p, color %p.\n", iface, color); - *color = black; + *color = brush->u.solid.color; return color; }

1 0

Henri Verbeet : d2d1: Add an initial d2d_d3d_render_target_FillRectangle() implementation.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: 7a72eb2dcd6ad8b0b6c1f8374ec5b0e4dda68cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a72eb2dcd6ad8b0b6c1f8374… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 6 08:20:14 2014 +0100 d2d1: Add an initial d2d_d3d_render_target_FillRectangle() implementation. --- dlls/d2d1/brush.c | 19 ++- dlls/d2d1/d2d1_private.h | 30 +++- dlls/d2d1/render_target.c | 348 ++++++++++++++++++++++++++++++---------------- 3 files changed, 269 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a72eb2dcd6ad8b0b6c1f…

1 0

Iván Matellanes : msvcrt: Added _putwc_nolock implementation.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: 0ad3537d689df71fb0b7f1858b3597b4e2f4eb13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ad3537d689df71fb0b7f1858… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Nov 5 22:56:11 2014 +0100 msvcrt: Added _putwc_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 1 + dlls/msvcr110/msvcr110.spec | 1 + dlls/msvcr120/msvcr120.spec | 1 + dlls/msvcr80/msvcr80.spec | 1 + dlls/msvcr90/msvcr90.spec | 1 + include/msvcrt/stdio.h | 1 + 6 files changed, 6 insertions(+) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0e1ec19..cb45506 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1238,6 +1238,7 @@ @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw +@ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _putwch(long) MSVCRT__putwch @ stub _putwch_nolock @ cdecl _putws(wstr) MSVCRT__putws diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 609e7ba..d41699d 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1596,6 +1596,7 @@ @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw +@ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _putwch(long) MSVCRT__putwch @ stub _putwch_nolock @ cdecl _putws(wstr) MSVCRT__putws diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1afacf5..fbf688e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1604,6 +1604,7 @@ @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw +@ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _putwch(long) MSVCRT__putwch @ stub _putwch_nolock @ cdecl _putws(wstr) MSVCRT__putws diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 960a23c..efb4539 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -913,6 +913,7 @@ @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw +@ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _putwch(long) MSVCRT__putwch @ stub _putwch_nolock @ cdecl _putws(wstr) MSVCRT__putws diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8b74dea..fa62366 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -888,6 +888,7 @@ @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw +@ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _putwch(long) MSVCRT__putwch @ stub _putwch_nolock @ cdecl _putws(wstr) MSVCRT__putws diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index d7316b5..eda89e6 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -206,6 +206,7 @@ wint_t __cdecl _fputwc_nolock(wint_t,FILE*); wint_t __cdecl _fputwchar(wint_t); wint_t __cdecl _getwc_nolock(FILE*); wchar_t* __cdecl _getws(wchar_t*); +wint_t __cdecl _putwc_nolock(wint_t,FILE*); int __cdecl _putws(const wchar_t*); int __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...); int __cdecl _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...);

1 0

Iván Matellanes : msvcrt: Added _getwc_nolock implementation.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: fb4248315f31d54460fbf6f3e31cec65325f2af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb4248315f31d54460fbf6f3e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Nov 5 22:55:50 2014 +0100 msvcrt: Added _getwc_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 1 + dlls/msvcr110/msvcr110.spec | 1 + dlls/msvcr120/msvcr120.spec | 1 + dlls/msvcr80/msvcr80.spec | 1 + dlls/msvcr90/msvcr90.spec | 1 + include/msvcrt/stdio.h | 1 + 6 files changed, 6 insertions(+) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 931d826..0fbe506 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -906,6 +906,7 @@ @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw +@ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ stub _getwch @ stub _getwch_nolock @ stub _getwche diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 3939ccf..368ca37 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1253,6 +1253,7 @@ @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw +@ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ stub _getwch @ stub _getwch_nolock @ stub _getwche diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 2ee3800..2b647b8 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1251,6 +1251,7 @@ @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw +@ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ stub _getwch @ stub _getwch_nolock @ stub _getwche diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 36421f3..0137ac4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -580,6 +580,7 @@ @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw +@ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ stub _getwch @ stub _getwch_nolock @ stub _getwche diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e9790be..c028cba 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -557,6 +557,7 @@ @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw +@ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ stub _getwch @ stub _getwch_nolock @ stub _getwche diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 9a2f338..8b23def 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -203,6 +203,7 @@ wint_t __cdecl _fgetwc_nolock(FILE*); wint_t __cdecl _fgetwchar(void); wint_t __cdecl _fputwc_nolock(wint_t,FILE*); wint_t __cdecl _fputwchar(wint_t); +wint_t __cdecl _getwc_nolock(FILE*); wchar_t* __cdecl _getws(wchar_t*); int __cdecl _putws(const wchar_t*); int __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...);

1 0

Sebastian Lackner : usp10: Silence repeated GSUB_apply_ChainContext[ Subst|Pos] FIXMEs.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: ebd1b86bbb0b4fa8f36ada68dbf61eeb828a05ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd1b86bbb0b4fa8f36ada68d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 18 00:38:15 2014 +0200 usp10: Silence repeated GSUB_apply_ChainContext[Subst|Pos] FIXMEs. --- dlls/usp10/opentype.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index dd9c8c4..e7f2dfd 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -937,12 +937,16 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo ccsf1 = (const GSUB_ChainContextSubstFormat1*)((const BYTE*)look+offset); if (GET_BE_WORD(ccsf1->SubstFormat) == 1) { - FIXME(" TODO: subtype 1 (Simple context glyph substitution)\n"); + static int once; + if (!once++) + FIXME(" TODO: subtype 1 (Simple context glyph substitution)\n"); continue; } else if (GET_BE_WORD(ccsf1->SubstFormat) == 2) { - FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Substitution)\n"); + static int once; + if (!once++) + FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Substitution)\n"); continue; } else if (GET_BE_WORD(ccsf1->SubstFormat) == 3) @@ -1648,12 +1652,16 @@ static INT GPOS_apply_ChainContextPos(ScriptCache *psc, LPOUTLINETEXTMETRICW lpo if (GET_BE_WORD(ccpf3->PosFormat) == 1) { - FIXME(" TODO: subtype 1 (Simple Chaining Context Glyph Positioning)\n"); + static int once; + if (!once++) + FIXME(" TODO: subtype 1 (Simple Chaining Context Glyph Positioning)\n"); continue; } else if (GET_BE_WORD(ccpf3->PosFormat) == 2) { - FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Positioning)\n"); + static int once; + if (!once++) + FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Positioning)\n"); continue; } else if (GET_BE_WORD(ccpf3->PosFormat) == 3)

1 0

Chen Yuan : mshtml: Add IHTMLStyle5::maxHeight property implementation.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Module: wine Branch: master Commit: 9c7b91336a5f0c98776b8594673667645ce89e42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c7b91336a5f0c98776b85946… Author: Chen Yuan <huddsinyuan2014(a)gmail.com> Date: Wed Nov 5 01:36:10 2014 +0800 mshtml: Add IHTMLStyle5::maxHeight property implementation. --- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlstyle3.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 755507c..d9898a9 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -144,6 +144,8 @@ static const WCHAR attrMarginRight[] = {'m','a','r','g','i','n','-','r','i','g','h','t',0}; static const WCHAR attrMarginTop[] = {'m','a','r','g','i','n','-','t','o','p',0}; +static const WCHAR attrMaxHeight[] = + {'m','a','x','-','h','e','i','g','h','t',0}; static const WCHAR attrMaxWidth[] = {'m','a','x','-','w','i','d','t','h',0}; static const WCHAR attrMinHeight[] = @@ -266,6 +268,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrMarginLeft, DISPID_IHTMLSTYLE_MARGINLEFT}, {attrMarginRight, DISPID_IHTMLSTYLE_MARGINRIGHT}, {attrMarginTop, DISPID_IHTMLSTYLE_MARGINTOP}, + {attrMaxHeight, DISPID_IHTMLSTYLE5_MAXHEIGHT}, {attrMaxWidth, DISPID_IHTMLSTYLE5_MAXWIDTH}, {attrMinHeight, DISPID_IHTMLSTYLE4_MINHEIGHT}, {attrMinWidth, DISPID_IHTMLSTYLE5_MINWIDTH}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index d2834ac..de6f37e 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -87,6 +87,7 @@ typedef enum { STYLEID_MARGIN_LEFT, STYLEID_MARGIN_RIGHT, STYLEID_MARGIN_TOP, + STYLEID_MAX_HEIGHT, STYLEID_MAX_WIDTH, STYLEID_MIN_HEIGHT, STYLEID_MIN_WIDTH, diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index 658f879..6532bf4 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -530,15 +530,19 @@ static HRESULT WINAPI HTMLStyle5_get_msInterpolationMode(IHTMLStyle5 *iface, BST static HRESULT WINAPI HTMLStyle5_put_maxHeight(IHTMLStyle5 *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle5(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_MAX_HEIGHT, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle5_get_maxHeight(IHTMLStyle5 *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle5(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, debugstr_variant(p)); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_MAX_HEIGHT, p, 0); } static HRESULT WINAPI HTMLStyle5_put_minWidth(IHTMLStyle5 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 1c230f4..ec66a71 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -580,6 +580,50 @@ static void test_style5(IHTMLStyle5 *style5) hres = IHTMLStyle5_put_maxWidth(style5,vdefault); ok(hres == S_OK, "put_maxWidth failed: %08x\n", hres); VariantClear(&vdefault); + + /* maxHeight */ + hres = IHTMLStyle5_get_maxHeight(style5, &vdefault); + ok(hres == S_OK, "get maxHeight failed: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("200px"); + hres = IHTMLStyle5_put_maxHeight(style5, v); + ok(hres == S_OK, "put maxHeight failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle5_get_maxHeight(style5, &v); + ok(hres == S_OK, "get maxHeight failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "200px"), "expect 200px got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("70%"); + hres = IHTMLStyle5_put_maxHeight(style5, v); + ok(hres == S_OK, "put maxHeight failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle5_get_maxHeight(style5, &v); + ok(hres == S_OK, "get_maxHeight failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "70%"), "expect 70%% got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("100"); + hres = IHTMLStyle5_put_maxHeight(style5, v); + ok(hres == S_OK, "put maxHeight failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle5_get_maxHeight(style5, &v); + ok(hres == S_OK, "get_maxHeight failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "100px"), "expect 100 got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle5_put_maxHeight(style5, vdefault); + ok(hres == S_OK, "put maxHeight failed:%08x\n", hres); + VariantClear(&vdefault); } static void test_style6(IHTMLStyle6 *style)

1 0