October 2014 - Wine-Commits

Francois Gouget : dwrite: Avoid redefining the DWRITE_GLYPH_RUN typedef.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

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

André Hentschel : server: Update CPU type dumping.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: 8b07523c561e17feb8f5ced1173950e960609d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b07523c561e17feb8f5ced11… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 13 01:32:26 2014 +0200 server: Update CPU type dumping. --- server/trace.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/trace.c b/server/trace.c index cb8da0c..8458f22 100644 --- a/server/trace.c +++ b/server/trace.c @@ -127,6 +127,8 @@ static void dump_cpu_type( const char *prefix, const cpu_type_t *code ) CASE(x86); CASE(x86_64); CASE(POWERPC); + CASE(ARM); + CASE(ARM64); default: fprintf( stderr, "%s%u", prefix, *code ); break; #undef CASE }

1 0

Jacek Caban : mshtml: Use proper codepage in nsIIOService::NewURI.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: 0d023f1968eb325f5ef58d1cc589d67cc39c1671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d023f1968eb325f5ef58d1cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 11 17:35:19 2014 +0200 mshtml: Use proper codepage in nsIIOService::NewURI. --- dlls/mshtml/main.c | 32 ++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsio.c | 19 ++++++++++++++++--- 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index ce9222f..e5cf325 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -35,6 +35,7 @@ #include "optary.h" #include "rpcproxy.h" #include "shlguid.h" +#include "mlang.h" #include "wine/debug.h" @@ -50,6 +51,35 @@ DWORD mshtml_tls = TLS_OUT_OF_INDEXES; static HINSTANCE shdoclc = NULL; static HDC display_dc; static WCHAR *status_strings[IDS_STATUS_LAST-IDS_STATUS_FIRST+1]; +static IMultiLanguage2 *mlang; + +UINT cp_from_charset_string(BSTR charset) +{ + MIMECSETINFO info; + HRESULT hres; + + if(!mlang) { + IMultiLanguage2 *new_mlang; + + hres = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, + &IID_IMultiLanguage2, (void**)&new_mlang); + if(FAILED(hres)) { + ERR("Could not create CMultiLanguage instance\n"); + return CP_UTF8; + } + + if(InterlockedCompareExchangePointer((void**)&mlang, new_mlang, NULL)) + IMultiLanguage2_Release(new_mlang); + } + + hres = IMultiLanguage2_GetCharsetInfo(mlang, charset, &info); + if(FAILED(hres)) { + FIXME("GetCharsetInfo failed: %08x\n", hres); + return CP_UTF8; + } + + return info.uiInternetEncoding; +} static void thread_detach(void) { @@ -83,6 +113,8 @@ static void process_detach(void) TlsFree(mshtml_tls); if(display_dc) DeleteObject(display_dc); + if(mlang) + IMultiLanguage2_Release(mlang); free_strings(); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 31c08ad..b69fd26 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1195,6 +1195,7 @@ static inline void windowref_release(windowref_t *ref) heap_free(ref); } +UINT cp_from_charset_string(BSTR) DECLSPEC_HIDDEN; HDC get_display_dc(void) DECLSPEC_HIDDEN; HINSTANCE get_shdoclc(void) DECLSPEC_HIDDEN; void set_statustext(HTMLDocumentObj*,INT,LPCWSTR) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b5c766c..78ad0a6 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3317,6 +3317,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * WCHAR new_spec[INTERNET_MAX_URL_LENGTH]; HTMLOuterWindow *window = NULL; const char *spec = NULL; + UINT cp = CP_UTF8; IUri *urlmon_uri; nsresult nsres; HRESULT hres; @@ -3343,10 +3344,22 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * } } - if(aOriginCharset && strcasecmp(aOriginCharset, "utf-8")) - FIXME("Unsupported charset %s\n", debugstr_a(aOriginCharset)); + if(aOriginCharset && *aOriginCharset && strncasecmp(aOriginCharset, "utf", 3)) { + BSTR charset; + int len; - MultiByteToWideChar(CP_UTF8, 0, spec, -1, new_spec, sizeof(new_spec)/sizeof(WCHAR)); + len = MultiByteToWideChar(CP_UTF8, 0, aOriginCharset, -1, NULL, 0); + charset = SysAllocStringLen(NULL, len-1); + if(!charset) + return NS_ERROR_OUT_OF_MEMORY; + MultiByteToWideChar(CP_UTF8, 0, aOriginCharset, -1, charset, len); + + cp = cp_from_charset_string(charset); + + SysFreeString(charset); + } + + MultiByteToWideChar(cp, 0, spec, -1, new_spec, sizeof(new_spec)/sizeof(WCHAR)); if(base_wine_uri) { hres = combine_url(base_wine_uri->uri, new_spec, &urlmon_uri);

1 0

André Hentschel : winedump: Improved dumping of exception info on ARM.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: 9006dcb059e40452b4a35c4c553b8425c941f998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9006dcb059e40452b4a35c4c5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 13 01:34:11 2014 +0200 winedump: Improved dumping of exception info on ARM. --- tools/winedump/pe.c | 454 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 429 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9006dcb059e40452b4a35…

1 0

Jacek Caban : jscript: Don' t use builtin property for exposing ActiveXObject constructor.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: 0eec97e29bed40ea0770e06714eecf11eff43282 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eec97e29bed40ea0770e0671… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 13 12:36:30 2014 +0200 jscript: Don't use builtin property for exposing ActiveXObject constructor. --- dlls/jscript/global.c | 24 ++++++++++-------------- dlls/jscript/jscript.h | 1 - dlls/jscript/tests/lang.js | 3 +++ 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 4d1350f..5ae6019 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -249,14 +249,6 @@ static HRESULT JSGlobal_RegExp(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u return constructor_call(ctx->regexp_constr, flags, argc, argv, r); } -static HRESULT JSGlobal_ActiveXObject(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->activex_constr, flags, argc, argv, r); -} - static HRESULT JSGlobal_VBArray(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -1087,7 +1079,6 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W } static const builtin_prop_t JSGlobal_props[] = { - {ActiveXObjectW, JSGlobal_ActiveXObject, PROPF_CONSTR|1}, {ArrayW, JSGlobal_Array, PROPF_CONSTR|1}, {BooleanW, JSGlobal_Boolean, PROPF_CONSTR|1}, {CollectGarbageW, JSGlobal_CollectGarbage, PROPF_METHOD}, @@ -1146,10 +1137,6 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = create_activex_constr(ctx, &ctx->activex_constr); - if(FAILED(hres)) - return hres; - hres = create_array_constr(ctx, object_prototype, &ctx->array_constr); if(FAILED(hres)) return hres; @@ -1187,7 +1174,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) HRESULT init_global(script_ctx_t *ctx) { - jsdisp_t *math, *object_prototype; + jsdisp_t *math, *object_prototype, *constr; HRESULT hres; if(ctx->global) @@ -1215,6 +1202,15 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; + hres = create_activex_constr(ctx, &constr); + if(FAILED(hres)) + return hres; + + hres = jsdisp_propput_dontenum(ctx->global, ActiveXObjectW, jsval_obj(constr)); + jsdisp_release(constr); + if(FAILED(hres)) + return hres; + hres = jsdisp_propput_dontenum(ctx->global, undefinedW, jsval_undefined()); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 0273b00..1e306b6 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -395,7 +395,6 @@ struct _script_ctx_t { jsdisp_t *global; jsdisp_t *function_constr; - jsdisp_t *activex_constr; jsdisp_t *array_constr; jsdisp_t *bool_constr; jsdisp_t *date_constr; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index ccbdb51..a55bf75 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1450,6 +1450,9 @@ function returnTest() { ok(returnTest() === undefined, "returnTest = " + returnTest()); +ActiveXObject = 1; +ok(ActiveXObject === 1, "ActiveXObject = " + ActiveXObject); + /* Keep this test in the end of file */ undefined = 6; ok(undefined === 6, "undefined = " + undefined);

1 0

Qian Hong : mshtml: Add DIID_DispHTMLFormElement support for HTMLFormElement_QI.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: ef63bacf2d1deadd95127aec993defbebd7499eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef63bacf2d1deadd95127aec9… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat Oct 11 09:18:36 2014 +0800 mshtml: Add DIID_DispHTMLFormElement support for HTMLFormElement_QI. --- dlls/mshtml/htmlform.c | 3 +++ dlls/mshtml/tests/dom.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index b85cf4d..e901dbe 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -582,6 +582,9 @@ static HRESULT HTMLFormElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IHTMLFormElement, riid)) { TRACE("(%p)->(IID_IHTMLFormElement %p)\n", This, ppv); *ppv = &This->IHTMLFormElement_iface; + }else if(IsEqualGUID(&DIID_DispHTMLFormElement, riid)) { + TRACE("(%p)->(DIID_DispHTMLFormElement %p)\n", This, ppv); + *ppv = &This->IHTMLFormElement_iface; } if(*ppv) { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 304a575..e1e18dc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -381,6 +381,7 @@ static const IID * const form_iids[] = { ELEM_IFACES, &IID_IHTMLFormElement, &IID_IConnectionPointContainer, + &DIID_DispHTMLFormElement, NULL };

1 0

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

Oct. 13, 2014

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 Oct. 10, 2014

Oct. 10, 2014

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 Oct. 9, 2014

Oct. 9, 2014

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

Jacek Caban : mshtml: Added IHTMLScriptElement:: get_readyState implementation.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 37869b7a08913e19864dc00026cdba0ce28929cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=37869b7a08913e19864dc0002… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 16:09:07 2014 +0200 mshtml: Added IHTMLScriptElement::get_readyState implementation. --- dlls/mshtml/htmlscript.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 1a61398..61e1ee3 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -281,8 +281,10 @@ static HRESULT WINAPI HTMLScriptElement_get_defer(IHTMLScriptElement *iface, VAR static HRESULT WINAPI HTMLScriptElement_get_readyState(IHTMLScriptElement *iface, BSTR *p) { HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_readystate_string(This->readystate, p); } static HRESULT WINAPI HTMLScriptElement_put_onerror(IHTMLScriptElement *iface, VARIANT v)

1 0