wine-commits October 2014

wine-commits@winehq.org

2 participants
397 discussions

Jactry Zeng : mshtml/tests: Fix typo.
by Alexandre Julliard 13 Oct '14

13 Oct '14

Module: wine Branch: master Commit: d165c05f27dc8988fc906f25fe3c553a4007feb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d165c05f27dc8988fc906f25f… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sat Oct 11 11:56:29 2014 +0800 mshtml/tests: Fix typo. --- dlls/mshtml/tests/nav_test.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/nav_test.html b/dlls/mshtml/tests/nav_test.html index bc629a4..536b238 100644 --- a/dlls/mshtml/tests/nav_test.html +++ b/dlls/mshtml/tests/nav_test.html @@ -34,7 +34,7 @@ function window_navigate_test() { var iframe = document.getElementById("testframe"); iframe.onload = function() { - iframe.onlod = null; + iframe.onload = null; var href = iframe.contentWindow.location.href; ok(href === "about:blank", "Unexpected href " + href); next_test();

1 0

Jacek Caban : mshtml: Added IHTMLElement:: language property implementation.
by Alexandre Julliard 13 Oct '14

13 Oct '14

Module: wine Branch: master Commit: c6c0c6b52aa72a8c8b0ff23d76569c08e3d151a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6c0c6b52aa72a8c8b0ff23d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 18:03:11 2014 +0200 mshtml: Added IHTMLElement::language property implementation. --- dlls/mshtml/htmlelem.c | 14 ++++++++++---- dlls/mshtml/tests/dom.c | 35 +++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/jstest.html | 9 +++++++++ 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 2906581..7843ad6 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -837,18 +837,24 @@ static HRESULT WINAPI HTMLElement_get_title(IHTMLElement *iface, BSTR *p) return return_nsstr(nsres, &title_str, p); } +static const WCHAR languageW[] = {'l','a','n','g','u','a','g','e',0}; + static HRESULT WINAPI HTMLElement_put_language(IHTMLElement *iface, BSTR v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return elem_string_attr_setter(This, languageW, v); } static HRESULT WINAPI HTMLElement_get_language(IHTMLElement *iface, BSTR *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return elem_string_attr_getter(This, languageW, TRUE, p); } static HRESULT WINAPI HTMLElement_put_onselectstart(IHTMLElement *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ab81ead..304a575 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3138,6 +3138,36 @@ static void _test_elem_id(unsigned line, IUnknown *unk, const char *exid) SysFreeString(id); } +#define test_elem_language(e,i) _test_elem_language(__LINE__,e,i) +static void _test_elem_language(unsigned line, IHTMLElement *elem, const char *exlang) +{ + BSTR lang = (void*)0xdeadbeef; + HRESULT hres; + + hres = IHTMLElement_get_language(elem, &lang); + ok_(__FILE__,line) (hres == S_OK, "get_language failed: %08x\n", hres); + + if(exlang) + ok_(__FILE__,line) (!strcmp_wa(lang, exlang), "unexpected language %s\n", wine_dbgstr_w(lang)); + else + ok_(__FILE__,line) (!lang, "language=%s\n", wine_dbgstr_w(lang)); + + SysFreeString(lang); +} + +#define set_elem_language(e,i) _set_elem_language(__LINE__,e,i) +static void _set_elem_language(unsigned line, IHTMLElement *elem, const char *lang) +{ + BSTR str = a2bstr(lang); + HRESULT hres; + + hres = IHTMLElement_put_language(elem, str); + ok_(__FILE__,line) (hres == S_OK, "get_language failed: %08x\n", hres); + SysFreeString(str); + + _test_elem_language(line, elem, lang); +} + #define test_elem_put_id(u,i) _test_elem_put_id(__LINE__,u,i) static void _test_elem_put_id(unsigned line, IUnknown *unk, const char *new_id) { @@ -7135,6 +7165,8 @@ static void test_elems(IHTMLDocument2 *doc) hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLScriptElement, (void**)&script); ok(hres == S_OK, "Could not get IHTMLScriptElement interface: %08x\n", hres); + test_elem_language(elem, NULL); + if(hres == S_OK) { VARIANT_BOOL vb; @@ -7174,6 +7206,9 @@ static void test_elems(IHTMLDocument2 *doc) } IHTMLScriptElement_Release(script); + + set_elem_language(elem, "vbscript"); + set_elem_language(elem, "xxx"); } elem = get_elem_by_id(doc, "in", TRUE); diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 7861196..792e28e 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -215,6 +215,14 @@ function test_whitespace_nodes() { "t.rows[0].cells[0].childNodes.length = " + t.rows[0].cells[0].childNodes.length); } +function test_language_attribute() { + document.body.innerHTML = '<div id="did" language="test"></div>'; + var elem = document.getElementById("did"); + ok(elem.language === "test", "elem.language = " + elem.language); + elem.language = 1; + ok(elem.language === "1", "elem.language = " + elem.language); +} + var globalVar = false; function runTests() { @@ -238,6 +246,7 @@ function runTests() { test_forin(); test_customtag(); test_whitespace_nodes(); + test_language_attribute(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

Nikolay Sivov : dwrite: Update to IDWriteTextFormat1.
by Alexandre Julliard 13 Oct '14

13 Oct '14

Module: wine Branch: master Commit: 120422e93b64e84cc3b1209496da14fcc9213e3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=120422e93b64e84cc3b120949… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 10 13:57:28 2014 +0400 dwrite: Update to IDWriteTextFormat1. --- dlls/dwrite/layout.c | 205 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 135 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=120422e93b64e84cc3b12…

1 0

Nikolay Sivov : dwrite: Update to IDWriteTextLayout2.
by Alexandre Julliard 13 Oct '14

13 Oct '14

Module: wine Branch: master Commit: 45f9540d2be8d71543efc38fc993b8bbfd5b90c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45f9540d2be8d71543efc38fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 10 13:38:54 2014 +0400 dwrite: Update to IDWriteTextLayout2. --- dlls/dwrite/layout.c | 401 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 255 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45f9540d2be8d71543efc…

1 0

Francois Gouget : dwrite: Avoid redefining the DWRITE_GLYPH_RUN typedef.
by Alexandre Julliard 13 Oct '14

13 Oct '14

Module: wine Branch: master Commit: 8127fd959917d609aaaa737da0d5bd27a41af1f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8127fd959917d609aaaa737da… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 10 08:37:07 2014 +0200 dwrite: Avoid redefining the DWRITE_GLYPH_RUN typedef. --- include/d2d1.idl | 3 +++ include/dwrite.idl | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/d2d1.idl b/include/d2d1.idl index 4934acc..1623e46 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -37,7 +37,10 @@ interface IDWriteTextLayout; interface IWICBitmapSource; interface IWICBitmap; +cpp_quote("#ifndef __dwrite_h__") +/* already defined in dwrite.h but needed for WIDL */ typedef struct DWRITE_GLYPH_RUN DWRITE_GLYPH_RUN; +cpp_quote("#endif /* __dwrite_h__ */") typedef D2D_POINT_2F D2D1_POINT_2F; typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F; diff --git a/include/dwrite.idl b/include/dwrite.idl index 1888215..2ae5164 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -382,7 +382,11 @@ typedef struct DWRITE_TRIMMING UINT32 delimiterCount; } DWRITE_TRIMMING; -typedef struct DWRITE_GLYPH_RUN +cpp_quote("#ifndef __d2d1_h__") +typedef struct DWRITE_GLYPH_RUN DWRITE_GLYPH_RUN; +cpp_quote("#endif /* __d2d1_h__ */") + +struct DWRITE_GLYPH_RUN { IDWriteFontFace* fontFace; FLOAT fontEmSize; @@ -392,7 +396,7 @@ typedef struct DWRITE_GLYPH_RUN DWRITE_GLYPH_OFFSET const* glyphOffsets; BOOL isSideways; UINT32 bidiLevel; -} DWRITE_GLYPH_RUN; +}; typedef struct DWRITE_GLYPH_RUN_DESCRIPTION {

1 0

Iván Matellanes : msvcrt: Added _fwrite_nolock() implementation.
by Alexandre Julliard 13 Oct '14

13 Oct '14

Module: wine Branch: master Commit: 25d7a1bbbf794cbd8ad245636a52c5f8f94304a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d7a1bbbf794cbd8ad245636… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Oct 9 19:51:59 2014 +0200 msvcrt: Added _fwrite_nolock() implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 17 ++++++++++++++--- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 7 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 5175884..406e9e7 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -863,7 +863,7 @@ @ stub _fwprintf_p @ stub _fwprintf_p_l @ stub _fwprintf_s_l -@ stub _fwrite_nolock +@ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock @ varargs _fwscanf_l(ptr wstr ptr) MSVCRT__fwscanf_l @ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l @ cdecl _gcvt(double long str) MSVCRT__gcvt diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 8ba85fe..0c62d69 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1211,7 +1211,7 @@ @ stub _fwprintf_p @ stub _fwprintf_p_l @ stub _fwprintf_s_l -@ stub _fwrite_nolock +@ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock @ varargs _fwscanf_l(ptr wstr ptr) MSVCRT__fwscanf_l @ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l @ cdecl _gcvt(double long str) MSVCRT__gcvt diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2d1cb95..7123a06 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -530,7 +530,7 @@ @ stub _fwprintf_p @ stub _fwprintf_p_l @ stub _fwprintf_s_l -@ stub _fwrite_nolock +@ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock @ varargs _fwscanf_l(ptr wstr ptr) MSVCRT__fwscanf_l @ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l @ cdecl _gcvt(double long str) MSVCRT__gcvt diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f43f811..41ce183 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -512,7 +512,7 @@ @ stub _fwprintf_p @ stub _fwprintf_p_l @ stub _fwprintf_s_l -@ stub _fwrite_nolock +@ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock @ varargs _fwscanf_l(ptr wstr ptr) MSVCRT__fwscanf_l @ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l @ cdecl _gcvt(double long str) MSVCRT__gcvt diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 51bd7bc..9a0effd 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3707,13 +3707,25 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) */ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_size_t nmemb, MSVCRT_FILE* file) { + int ret; + + MSVCRT__lock_file(file); + ret = MSVCRT__fwrite_nolock(ptr, size, nmemb, file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* + * _fwrite_nolock (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT__fwrite_nolock(const void *ptr, MSVCRT_size_t size, MSVCRT_size_t nmemb, MSVCRT_FILE* file) +{ MSVCRT_size_t wrcnt=size * nmemb; int written = 0; if (size == 0) return 0; - MSVCRT__lock_file(file); - while(wrcnt) { if(file->_cnt < 0) { WARN("negative file->_cnt value in %p\n", file); @@ -3761,7 +3773,6 @@ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_si } } - MSVCRT__unlock_file(file); return written / size; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 9065ebe..b5cf8b7 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -926,6 +926,7 @@ MSVCRT_ulong* __cdecl MSVCRT___doserrno(void); int* __cdecl MSVCRT__errno(void); char* __cdecl MSVCRT_getenv(const char*); MSVCRT_size_t __cdecl MSVCRT__fread_nolock(void*,MSVCRT_size_t,MSVCRT_size_t,MSVCRT_FILE*); +MSVCRT_size_t __cdecl MSVCRT__fwrite_nolock(const void*,MSVCRT_size_t,MSVCRT_size_t,MSVCRT_FILE*); int __cdecl MSVCRT_fclose(MSVCRT_FILE*); int __cdecl MSVCRT__fclose_nolock(MSVCRT_FILE*); void __cdecl MSVCRT_terminate(void); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index f84a17f..0170d2e 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -128,6 +128,7 @@ int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); +size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); int __cdecl _fclose_nolock(FILE*); void __cdecl clearerr(FILE*);

1 0

Iván Matellanes : msvcrt: Added _fread_nolock() implementation.
by Alexandre Julliard 13 Oct '14

13 Oct '14

Module: wine Branch: master Commit: 206ea48f203dc6001828b99db261bf493235f683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=206ea48f203dc6001828b99db… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Oct 9 19:51:55 2014 +0200 msvcrt: Added _fread_nolock() implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 18 ++++++++++++++---- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 4 +++- 7 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2796576..5175884 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -832,7 +832,7 @@ @ cdecl _fputchar(long) MSVCRT__fputchar @ stub _fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar -@ stub _fread_nolock +@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock @ stub _fread_nolock_s @ cdecl _free_locale(ptr) MSVCRT__free_locale @ stub _freea diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index ae6c356..8ba85fe 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1180,7 +1180,7 @@ @ cdecl _fputchar(long) MSVCRT__fputchar @ stub _fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar -@ stub _fread_nolock +@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock @ stub _fread_nolock_s @ cdecl _free_locale(ptr) MSVCRT__free_locale @ stub _freea diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index fc38453..2d1cb95 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -499,7 +499,7 @@ @ cdecl _fputchar(long) MSVCRT__fputchar @ stub _fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar -@ stub _fread_nolock +@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock @ stub _fread_nolock_s @ cdecl _free_locale(ptr) MSVCRT__free_locale @ stub _freea diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 4267c2c..f43f811 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -481,7 +481,7 @@ @ cdecl _fputchar(long) MSVCRT__fputchar @ stub _fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar -@ stub _fread_nolock +@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock @ stub _fread_nolock_s @ cdecl _free_locale(ptr) MSVCRT__free_locale @ stub _freea diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c57861a..51bd7bc 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3957,6 +3957,20 @@ int CDECL MSVCRT__fputchar(int c) */ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nmemb, MSVCRT_FILE* file) { + int ret; + + MSVCRT__lock_file(file); + ret = MSVCRT__fread_nolock(ptr, size, nmemb, file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* + * _fread_nolock (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT__fread_nolock(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nmemb, MSVCRT_FILE* file) +{ MSVCRT_size_t rcnt=size * nmemb; MSVCRT_size_t read=0; MSVCRT_size_t pread=0; @@ -3964,8 +3978,6 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm if(!rcnt) return 0; - MSVCRT__lock_file(file); - /* first buffered data */ if(file->_cnt>0) { int pcnt= (rcnt>file->_cnt)? file->_cnt:rcnt; @@ -3979,7 +3991,6 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm if(file->_flag & MSVCRT__IORW) { file->_flag |= MSVCRT__IOREAD; } else { - MSVCRT__unlock_file(file); return 0; } } @@ -4028,7 +4039,6 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm if (i < 1) break; } read+=pread; - MSVCRT__unlock_file(file); return read / size; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 200e35c..9065ebe 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -925,6 +925,7 @@ void __cdecl MSVCRT_abort(void); MSVCRT_ulong* __cdecl MSVCRT___doserrno(void); int* __cdecl MSVCRT__errno(void); char* __cdecl MSVCRT_getenv(const char*); +MSVCRT_size_t __cdecl MSVCRT__fread_nolock(void*,MSVCRT_size_t,MSVCRT_size_t,MSVCRT_FILE*); int __cdecl MSVCRT_fclose(MSVCRT_FILE*); int __cdecl MSVCRT__fclose_nolock(MSVCRT_FILE*); void __cdecl MSVCRT_terminate(void); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 184dd2b..f84a17f 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -127,9 +127,11 @@ int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); +size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); +int __cdecl _fclose_nolock(FILE*); + void __cdecl clearerr(FILE*); int __cdecl fclose(FILE*); -int __cdecl _fclose_nolock(FILE*); int __cdecl feof(FILE*); int __cdecl ferror(FILE*); int __cdecl fflush(FILE*);

1 0

André Hentschel : Add WWN 377
by Jeremy Newman 10 Oct '14

10 Oct '14

Module: website Branch: master Commit: 0df841bdc75c6206734e8e8d71afd86014d85ce1 URL: http://source.winehq.org/git/website.git/?a=commit;h=0df841bdc75c6206734e8e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 10 21:53:19 2014 +0200 Add WWN 377 --- news/de/2014101001.xml | 11 ++ news/en/2014101001.xml | 11 ++ wwn/en/wn20141010_377.xml | 349 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 371 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=0df841bdc75c620673…

1 0

Matteo Bruni : gdi32/tests: Add a test for GetGlyphOutline with an insufficient buffer.
by Alexandre Julliard 09 Oct '14

09 Oct '14

Module: wine Branch: master Commit: a71f25d239ed7dd65f9fa7a3b7baa371e74f2ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71f25d239ed7dd65f9fa7a3b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 9 18:00:56 2014 +0200 gdi32/tests: Add a test for GetGlyphOutline with an insufficient buffer. --- dlls/gdi32/tests/font.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 852c858..eff1793 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4365,7 +4365,11 @@ static void test_GetGlyphOutline(void) SetLastError(0xdeadbeef); ret = GetGlyphOutlineW(hdc, ' ', GGO_NATIVE, &gm, 0, NULL, &mat); if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) + { ok(ret == 0, "GetGlyphOutlineW should return 0 buffer size for space char\n"); + ok(gm.gmBlackBoxX == 1, "Expected 1, got %u\n", gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "Expected 1, got %u\n", gm.gmBlackBoxY); + } /* requesting buffer size for space char + error */ memset(&gm, 0, sizeof(gm)); @@ -4375,8 +4379,16 @@ static void test_GetGlyphOutline(void) { ok(ret == GDI_ERROR, "GetGlyphOutlineW should return GDI_ERROR\n"); ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); + ok(gm.gmBlackBoxX == 0, "Expected 0, got %u\n", gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 0, "Expected 0, got %u\n", gm.gmBlackBoxY); } + /* test GetGlyphOutline with a buffer too small */ + SetLastError(0xdeadbeef); + ret = GetGlyphOutlineA(hdc, 'A', GGO_NATIVE, &gm, sizeof(i), &i, &mat); + if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) + ok(ret == GDI_ERROR, "GetGlyphOutlineW should return an error when the buffer size is too small.\n"); + for (i = 0; i < sizeof(fmt) / sizeof(fmt[0]); ++i) { DWORD dummy;

1 0

Matteo Bruni : gdi32: Don't overflow the buffer in GetGlyphOutline.
by Alexandre Julliard 09 Oct '14

09 Oct '14

Module: wine Branch: master Commit: 112a7f7f97168c7afe73f38351e9345bc2a7657a URL: http://source.winehq.org/git/wine.git/?a=commit;h=112a7f7f97168c7afe73f3835… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 9 18:00:55 2014 +0200 gdi32: Don't overflow the buffer in GetGlyphOutline. --- dlls/gdi32/freetype.c | 401 ++++++++++++++++++++++++++++---------------------- 1 file changed, 229 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=112a7f7f97168c7afe73f…

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2014