October 2019 - Wine-commits

Jacek Caban : vbscript: Introduce get_builtin_id.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 4c3e2f2b4fd3a9120c3fcfde66cfddca5b9f70a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c3e2f2b4fd3a9120c3fcfde… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 22:46:33 2019 +0200 vbscript: Introduce get_builtin_id. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 5 +++++ dlls/vbscript/interp.c | 2 +- dlls/vbscript/vbscript.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index f0bdfc4efa..61caf3e31b 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -39,6 +39,11 @@ const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = static const WCHAR emptyW[] = {0}; static const WCHAR vbscriptW[] = {'V','B','S','c','r','i','p','t',0}; +HRESULT get_builtin_id(BuiltinDisp *disp, const WCHAR *name, DISPID *id) +{ + return ITypeInfo_GetIDsOfNames(disp->desc->typeinfo, (WCHAR**)&name, 1, id); +} + static IInternetHostSecurityManager *get_sec_mgr(script_ctx_t *ctx) { IInternetHostSecurityManager *secmgr; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 8649164764..4d2df0bf79 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -181,7 +181,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; } - hres = vbdisp_get_id(ctx->script->global_obj, name, invoke_type, TRUE, &id); + hres = get_builtin_id(ctx->script->global_obj, name, &id); if(SUCCEEDED(hres)) { ref->type = REF_DISP; ref->u.d.disp = (IDispatch*)&ctx->script->global_obj->IDispatchEx_iface; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 41e3b7983f..a0e2f99e16 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -364,6 +364,7 @@ IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDE void clear_ei(EXCEPINFO*) DECLSPEC_HIDDEN; HRESULT report_script_error(script_ctx_t*) DECLSPEC_HIDDEN; void detach_global_objects(script_ctx_t*) DECLSPEC_HIDDEN; +HRESULT get_builtin_id(BuiltinDisp*,const WCHAR*,DISPID*) DECLSPEC_HIDDEN; typedef struct { UINT16 len;

1 0

Jacek Caban : vbscript: Use separated IDispatch implementation for objects exposing builtin functions.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: d061ba0e35461fa81fe838cf84782cdb663a0f05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d061ba0e35461fa81fe838cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 22:46:45 2019 +0200 vbscript: Use separated IDispatch implementation for objects exposing builtin functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 302 +++++++++++++++++++++++++++++++++++++++++------ dlls/vbscript/interp.c | 4 +- dlls/vbscript/vbdisp.c | 103 +--------------- dlls/vbscript/vbscript.h | 33 ++---- 4 files changed, 279 insertions(+), 163 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d061ba0e35461fa81fe8…

1 0

Jacek Caban : vbscript: Don't use ITypeInfo for builtin function dispids.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 4a30e699e80e0dab2788d63b39a51896b35e7877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a30e699e80e0dab2788d63b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 22:46:52 2019 +0200 vbscript: Don't use ITypeInfo for builtin function dispids. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 439 +++++++++++++++++++++++++------------------------ 1 file changed, 220 insertions(+), 219 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a30e699e80e0dab2788…

1 0

Jacek Caban : vbscript: Get rid of no longer needed ITypeInfo in BuiltinDisp.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 1a1292833e9deec0462c1d68701a499d621a9cf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a1292833e9deec0462c1d68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 22:46:59 2019 +0200 vbscript: Get rid of no longer needed ITypeInfo in BuiltinDisp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 17 +++--------- dlls/vbscript/vbscript.h | 13 --------- dlls/vbscript/vbscript_main.c | 61 ------------------------------------------- 3 files changed, 3 insertions(+), 88 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 45787f52af..50f54f38a6 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -268,8 +268,7 @@ static const IDispatchVtbl BuiltinDispVtbl = { Builtin_Invoke }; -static HRESULT create_builtin_dispatch(script_ctx_t *ctx, const builtin_prop_t *members, size_t member_cnt, - ITypeInfo *typeinfo, BuiltinDisp **ret) +static HRESULT create_builtin_dispatch(script_ctx_t *ctx, const builtin_prop_t *members, size_t member_cnt, BuiltinDisp **ret) { BuiltinDisp *disp; @@ -281,7 +280,6 @@ static HRESULT create_builtin_dispatch(script_ctx_t *ctx, const builtin_prop_t * disp->members = members; disp->member_cnt = member_cnt; disp->ctx = ctx; - disp->typeinfo = typeinfo; *ret = disp; return S_OK; @@ -2858,14 +2856,9 @@ void detach_global_objects(script_ctx_t *ctx) HRESULT init_global(script_ctx_t *ctx) { - ITypeInfo *typeinfo; HRESULT hres; - hres = get_typeinfo(GlobalObj_tid, &typeinfo); - if(FAILED(hres)) - return hres; - - hres = create_builtin_dispatch(ctx, global_props, ARRAY_SIZE(global_props), typeinfo, &ctx->global_obj); + hres = create_builtin_dispatch(ctx, global_props, ARRAY_SIZE(global_props), &ctx->global_obj); if(FAILED(hres)) return hres; @@ -2873,9 +2866,5 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = get_typeinfo(ErrObj_tid, &typeinfo); - if(FAILED(hres)) - return hres; - - return create_builtin_dispatch(ctx, err_props, ARRAY_SIZE(err_props), typeinfo, &ctx->err_obj); + return create_builtin_dispatch(ctx, err_props, ARRAY_SIZE(err_props), &ctx->err_obj); } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index c17084d4ea..71f42aaff9 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -141,7 +141,6 @@ typedef struct { size_t member_cnt; const builtin_prop_t *members; script_ctx_t *ctx; - ITypeInfo *typeinfo; } BuiltinDisp; HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**) DECLSPEC_HIDDEN; @@ -358,18 +357,6 @@ HRESULT report_script_error(script_ctx_t*) DECLSPEC_HIDDEN; void detach_global_objects(script_ctx_t*) DECLSPEC_HIDDEN; HRESULT get_builtin_id(BuiltinDisp*,const WCHAR*,DISPID*) DECLSPEC_HIDDEN; -#define TID_LIST \ - XDIID(ErrObj) \ - XDIID(GlobalObj) - -typedef enum { -#define XDIID(iface) iface ## _tid, -TID_LIST -#undef XDIID - LAST_tid -} tid_t; - -HRESULT get_typeinfo(tid_t,ITypeInfo**) DECLSPEC_HIDDEN; void release_regexp_typelib(void) DECLSPEC_HIDDEN; static inline BOOL is_int32(double d) diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 3a8019a30d..6e6f386755 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -35,66 +35,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static HINSTANCE vbscript_hinstance; -static ITypeLib *typelib; -static ITypeInfo *typeinfos[LAST_tid]; - -static REFIID tid_ids[] = { -#define XDIID(iface) &DIID_ ## iface, -TID_LIST -#undef XDIID -}; - -HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) -{ - HRESULT hres; - - if (!typelib) { - ITypeLib *tl; - - static const WCHAR vbscript_dll1W[] = {'v','b','s','c','r','i','p','t','.','d','l','l','\\','1',0}; - - hres = LoadTypeLib(vbscript_dll1W, &tl); - if(FAILED(hres)) { - ERR("LoadRegTypeLib failed: %08x\n", hres); - return hres; - } - - if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) - ITypeLib_Release(tl); - } - - if(!typeinfos[tid]) { - ITypeInfo *ti; - - hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); - if(FAILED(hres)) { - ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); - return hres; - } - - if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) - ITypeInfo_Release(ti); - } - - *typeinfo = typeinfos[tid]; - return S_OK; -} - -static void release_typelib(void) -{ - unsigned i; - - if(!typelib) - return; - - for(i = 0; i < ARRAY_SIZE(typeinfos); i++) { - if(typeinfos[i]) - ITypeInfo_Release(typeinfos[i]); - } - - ITypeLib_Release(typelib); -} - BSTR get_vbscript_string(int id) { WCHAR buf[512]; @@ -316,7 +256,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) break; case DLL_PROCESS_DETACH: if (lpv) break; - release_typelib(); release_regexp_typelib(); }

1 0

Jacek Caban : vbscript/tests: Added Err object IDispatch tests.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 0fe003435e90dc32dd405a62af8fbcc20afc925d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fe003435e90dc32dd405a62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 22:47:07 2019 +0200 vbscript/tests: Added Err object IDispatch tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/api.vbs | 5 +++ dlls/vbscript/tests/run.c | 86 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 90 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 12e9f475f5..49dd4959f7 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1607,6 +1607,11 @@ sub testErrRaise() call ok(err.description = "", "err.description = " & err.description) call ok(err.helpfile = "", "err.helpfile = " & err.helpfile) call ok(err.helpcontext = 0, "err.helpcontext = " & err.helpcontext) + + dim e + e = err + call ok(getVT(e) = "VT_I4*", "getVT(e) = " & getVT(e)) + call ok(e = 0, "e = " & e) end sub call testErrRaise() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index f323a1ec85..2d34a8c80f 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -105,6 +105,7 @@ DEFINE_EXPECT(global_propargput_i); DEFINE_EXPECT(global_propargput1_d); DEFINE_EXPECT(global_propargput1_i); DEFINE_EXPECT(global_testoptionalarg_i); +DEFINE_EXPECT(global_testerrorobject_i); DEFINE_EXPECT(collectionobj_newenum_i); DEFINE_EXPECT(Next); DEFINE_EXPECT(GetWindow); @@ -136,7 +137,8 @@ DEFINE_EXPECT(OnLeaveScript); #define DISPID_GLOBAL_SETOBJ 1019 #define DISPID_GLOBAL_TODO_WINE_OK 1020 #define DISPID_GLOBAL_WEEKSTARTDAY 1021 -#define DISPID_GLOBAL_GLOBALCALLBACK 1022 +#define DISPID_GLOBAL_GLOBALCALLBACK 1022 +#define DISPID_GLOBAL_TESTERROROBJECT 1023 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -1197,6 +1199,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_TESTOPTIONALARG; return S_OK; } + if(!strcmp_wa(bstrName, "testErrorObject")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_TESTERROROBJECT; + return S_OK; + } if(strict_dispid_check && strcmp_wa(bstrName, "x")) ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -1620,6 +1627,70 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, SET_EXPECT(OnLeaveScript); return S_OK; } + case DISPID_GLOBAL_TESTERROROBJECT: { + ITypeInfo *typeinfo; + IDispatchEx *dispex; + DISPPARAMS dp; + VARIANT v, r; + EXCEPINFO ei; + IDispatch *disp; + WCHAR *names[1]; + UINT count, i; + DISPID id; + HRESULT hres; + + static WCHAR props[][32] = { L"clear", L"description", L"helpcontext", L"helpFILE", L"number", L"raise", L"source" }; + + CHECK_EXPECT(global_testerrorobject_i); + + ok(wFlags == INVOKE_FUNC, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); + disp = V_DISPATCH(pdp->rgvarg); + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + ok(hres == E_NOINTERFACE, "Could not get IDispatchEx iface: %08x\n", hres); + + hres = IDispatch_GetTypeInfoCount(disp, &count); + ok(hres == S_OK, "GetTypeInfoCount returned: %08x\n", hres); + ok(count == 0, "count = %u\n", count); + + hres = IDispatch_GetTypeInfo(disp, 0, 0, &typeinfo); + ok(hres == DISP_E_BADINDEX, "GetTypeInfo returned: %08x\n", hres); + + for(i = 0; i < ARRAY_SIZE(props); i++) { + names[0] = props[i]; + hres = IDispatch_GetIDsOfNames(disp, &IID_NULL, names, 1, 0, &id); + ok(hres == S_OK, "GetIDsOfNames failed: %08x\n", hres); + ok(id == i + 1, "%s id = %u\n", wine_dbgstr_w(props[i]), id); + } + + memset(&dp, 0, sizeof(dp)); + memset(&ei, 0, sizeof(ei)); + V_VT(&v) = VT_ERROR; + hres = IDispatch_Invoke(disp, 5, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, &ei, NULL); + ok(hres == S_OK, "Invoke failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 1, "V_I4(v) = %d\n", V_I4(&v)); + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, &ei, NULL); + ok(hres == S_OK, "Invoke failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 1, "V_I4(v) = %d\n", V_I4(&v)); + + dp.rgvarg = &v; + V_VT(&v) = VT_I4; + V_I4(&v) = 6; + V_VT(&r) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 6, DISPATCH_METHOD|DISPATCH_PROPERTYGET, &dp, &r, &ei, NULL); + ok(hres == S_OK, "Invoke failed: %08x\n", hres); + return S_OK; + } } ok(0, "unexpected call %d\n", id); @@ -2279,6 +2350,19 @@ static void test_callbacks(void) CHECK_CALLED(OnLeaveScript); CHECK_CALLED(OnScriptError); + SET_EXPECT(OnEnterScript); + SET_EXPECT(global_testerrorobject_i); + SET_EXPECT(OnLeaveScript); + hres = IActiveScriptParse_ParseScriptText(parser, + L"on error resume next\n" + L"err.raise 1\n" + L"testErrorObject err\n", + NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(global_testerrorobject_i); + CHECK_CALLED(OnLeaveScript); + IDispatchEx_Release(dispex); IActiveScriptParse_Release(parser);

1 0

Zebediah Figura : gdi32: Implement GetCharWidthFloat().
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 068093f1aad8b94f6bf1c9bea75ff9f637bcdbea URL: https://source.winehq.org/git/wine.git/?a=commit;h=068093f1aad8b94f6bf1c9be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 09:17:03 2019 -0500 gdi32: Implement GetCharWidthFloat(). Needed by Cygwin's mintty.exe. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 57 +++++++++++++++++++++++++++++++++++++++++-------- dlls/gdi32/tests/font.c | 46 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b06ff6d354..d451f30c3e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -36,6 +36,7 @@ #include "winreg.h" #include "gdi_private.h" #include "wine/exception.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -3471,23 +3472,61 @@ done: /************************************************************************* * GetCharWidthFloatA [GDI32.@] */ -BOOL WINAPI GetCharWidthFloatA(HDC hdc, UINT iFirstChar, - UINT iLastChar, PFLOAT pxBuffer) +BOOL WINAPI GetCharWidthFloatA( HDC hdc, UINT first, UINT last, float *buffer ) { - FIXME("%p, %u, %u, %p: stub!\n", hdc, iFirstChar, iLastChar, pxBuffer); - return FALSE; + WCHAR *wstr; + int i, wlen; + char *str; + + if (!(str = FONT_GetCharsByRangeA( hdc, first, last, &i ))) + return FALSE; + wstr = FONT_mbtowc( hdc, str, i, &wlen, NULL ); + heap_free(str); + + for (i = 0; i < wlen; ++i) + { + if (!GetCharWidthFloatW( hdc, wstr[i], wstr[i], &buffer[i] )) + { + heap_free(wstr); + return FALSE; + } + } + heap_free(wstr); + return TRUE; } /************************************************************************* * GetCharWidthFloatW [GDI32.@] */ -BOOL WINAPI GetCharWidthFloatW(HDC hdc, UINT iFirstChar, - UINT iLastChar, PFLOAT pxBuffer) +BOOL WINAPI GetCharWidthFloatW( HDC hdc, UINT first, UINT last, float *buffer ) { - FIXME("%p, %u, %u, %p: stub!\n", hdc, iFirstChar, iLastChar, pxBuffer); - return FALSE; -} + DC *dc = get_dc_ptr( hdc ); + int *ibuffer; + PHYSDEV dev; + BOOL ret; + UINT i; + + TRACE("dc %p, first %#x, last %#x, buffer %p\n", dc, first, last, buffer); + + if (!dc) return FALSE; + if (!(ibuffer = heap_alloc( (last - first + 1) * sizeof(int) ))) + { + release_dc_ptr( dc ); + return FALSE; + } + + dev = GET_DC_PHYSDEV( dc, pGetCharWidth ); + if ((ret = dev->funcs->pGetCharWidth( dev, first, last, ibuffer ))) + { + float scale = fabs( dc->xformVport2World.eM11 ) / 16.0f; + for (i = first; i <= last; ++i) + buffer[i - first] = ibuffer[i - first] * scale; + } + + heap_free(ibuffer); + return ret; +} /*********************************************************************** * * diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index b57effd349..ccae09edc1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -7189,6 +7189,51 @@ static void test_GetCharWidthInfo(void) ReleaseDC(NULL, hdc); } +static int CALLBACK get_char_width_proc(const LOGFONTA *lf, + const TEXTMETRICA *tm, DWORD type, LPARAM ctx) +{ + HFONT font = CreateFontIndirectA(lf); + HDC dc = GetDC(NULL); + const char c = 'm'; + ABCFLOAT abcf; + int i, i32; + BOOL ret; + float f; + ABC abc; + + SelectObject(dc, font); + + ret = GetCharWidthFloatA(dc, c, c, &f); + ok(ret, "%s: GetCharWidthFloat() failed\n", lf->lfFaceName); + ret = GetCharWidth32A(dc, c, c, &i32); + ok(ret, "%s: GetCharWidth32A() failed\n", lf->lfFaceName); + ret = GetCharWidthA(dc, c, c, &i); + ok(ret, "%s: GetCharWidthA() failed\n", lf->lfFaceName); + ok(i == i32, "%s: mismatched widths %d/%d\n", lf->lfFaceName, i, i32); + ok((float)i / 16.0f == f, "%s: mismatched widths %d/%.8e\n", lf->lfFaceName, i, f); + + ret = GetCharABCWidthsFloatA(dc, c, c, &abcf); + ok(ret, "%s: GetCharABCWidths() failed\n", lf->lfFaceName); + if (GetCharABCWidthsA(dc, c, c, &abc)) + ok((float)abc.abcB == abcf.abcfB, "%s: mismatched widths %d/%.8e\n", + lf->lfFaceName, abc.abcB, abcf.abcfB); + + ReleaseDC(NULL, dc); + DeleteObject(font); + return 1; +} + +static void test_char_width(void) +{ + HDC dc = GetDC(NULL); + LOGFONTA lf = {0}; + + lf.lfCharSet = DEFAULT_CHARSET; + EnumFontFamiliesExA(dc, &lf, get_char_width_proc, 0, 0); + + ReleaseDC(NULL, dc); +} + START_TEST(font) { static const char *test_names[] = @@ -7271,6 +7316,7 @@ START_TEST(font) test_bitmap_font_glyph_index(); test_GetCharWidthI(); test_long_names(); + test_char_width(); /* These tests should be last test until RemoveFontResource * is properly implemented.

1 0

Paul Gofman : gdi32: Collapse relative paths inside true type fonts file names in registry.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 81484b24f4c0832f88b7067017b338cbf01180a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81484b24f4c0832f88b70670… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Oct 16 14:49:24 2019 +0300 gdi32: Collapse relative paths inside true type fonts file names in registry. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e3cff25b76..f0e5514649 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3107,6 +3107,33 @@ static void load_system_fonts(void) } } +static WCHAR *get_full_path_name(const WCHAR *name) +{ + WCHAR *full_path; + DWORD len; + + if (!(len = GetFullPathNameW(name, 0, NULL, NULL))) + { + ERR("GetFullPathNameW() failed, name %s.\n", debugstr_w(name)); + return NULL; + } + + if (!(full_path = HeapAlloc(GetProcessHeap(), 0, len * sizeof(*full_path)))) + { + ERR("Could not get memory.\n"); + return NULL; + } + + if (GetFullPathNameW(name, len, full_path, NULL) != len - 1) + { + ERR("Unexpected GetFullPathNameW() result, name %s.\n", debugstr_w(name)); + HeapFree(GetProcessHeap(), 0, full_path); + return NULL; + } + + return full_path; +} + /************************************************************* * * This adds registry entries for any externally loaded fonts @@ -3121,7 +3148,7 @@ static void update_reg_entries(void) DWORD len; Family *family; Face *face; - WCHAR *file, *path; + WCHAR *file, *path, *full_path; static const WCHAR TrueType[] = {' ','(','T','r','u','e','T','y','p','e',')','\0'}; if(RegCreateKeyExW(HKEY_LOCAL_MACHINE, winnt_font_reg_key, @@ -3168,11 +3195,22 @@ static void update_reg_entries(void) HeapFree( GetProcessHeap(), 0, buffer ); if (path) + { + if ((full_path = get_full_path_name(path))) + { + HeapFree(GetProcessHeap(), 0, path); + path = full_path; + } file = path; + } else if ((file = strrchrW(face->file, '/'))) + { file++; + } else + { file = face->file; + } len = strlenW(file) + 1; RegSetValueExW(winnt_key, valueW, 0, REG_SZ, (BYTE*)file, len * sizeof(WCHAR));

1 0

Zebediah Figura : strmbase: Get rid of the "pfnGetClassWindowStyles" callback.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: b0b2c7d69980eb35c1f69eada273e9f2278aa985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0b2c7d69980eb35c1f69ead… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 16 19:36:47 2019 -0500 strmbase: Get rid of the "pfnGetClassWindowStyles" callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 18 ++++-------------- dlls/quartz/vmr9.c | 12 ------------ dlls/strmbase/window.c | 22 ++++++---------------- include/wine/strmbase.h | 6 ------ 4 files changed, 10 insertions(+), 48 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 87491d8851..a16a422e2d 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -53,6 +53,8 @@ typedef struct VideoRendererImpl LONG VideoWidth; LONG VideoHeight; LONG FullScreenMode; + + DWORD saved_style; } VideoRendererImpl; static inline VideoRendererImpl *impl_from_BaseWindow(BaseWindow *iface) @@ -392,17 +394,6 @@ static void video_renderer_start_stream(BaseRenderer *iface) } } -static LPWSTR WINAPI VideoRenderer_GetClassWindowStyles(BaseWindow *This, DWORD *pClassStyles, DWORD *pWindowStyles, DWORD *pWindowStylesEx) -{ - static const WCHAR classnameW[] = { 'W','i','n','e',' ','A','c','t','i','v','e','M','o','v','i','e',' ','C','l','a','s','s',0 }; - - *pClassStyles = 0; - *pWindowStyles = WS_SIZEBOX; - *pWindowStylesEx = 0; - - return (LPWSTR)classnameW; -} - static RECT WINAPI VideoRenderer_GetDefaultRect(BaseWindow *iface) { VideoRendererImpl *This = impl_from_BaseWindow(iface); @@ -441,7 +432,6 @@ static const BaseRendererFuncTable BaseFuncTable = }; static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { - VideoRenderer_GetClassWindowStyles, VideoRenderer_GetDefaultRect, VideoRenderer_OnSize }; @@ -674,7 +664,7 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, FullScreenMode); if (FullScreenMode) { - This->baseControlWindow.baseWindow.WindowStyles = GetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE); + This->saved_style = GetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE); ShowWindow(This->baseControlWindow.baseWindow.hWnd, SW_HIDE); SetParent(This->baseControlWindow.baseWindow.hWnd, 0); SetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE, WS_POPUP); @@ -684,7 +674,7 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, } else { ShowWindow(This->baseControlWindow.baseWindow.hWnd, SW_HIDE); SetParent(This->baseControlWindow.baseWindow.hWnd, This->baseControlWindow.hwndOwner); - SetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE, This->baseControlWindow.baseWindow.WindowStyles); + SetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE, This->saved_style); GetClientRect(This->baseControlWindow.baseWindow.hWnd, &This->DestRect); SetWindowPos(This->baseControlWindow.baseWindow.hWnd,0,This->DestRect.left,This->DestRect.top,This->DestRect.right,This->DestRect.bottom,SWP_NOZORDER|SWP_SHOWWINDOW); This->WindowPos = This->DestRect; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index d3fdfb13a3..536703fbff 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -568,17 +568,6 @@ static const BaseRendererFuncTable BaseFuncTable = .renderer_pin_query_interface = vmr_pin_query_interface, }; -static LPWSTR WINAPI VMR9_GetClassWindowStyles(BaseWindow *This, DWORD *pClassStyles, DWORD *pWindowStyles, DWORD *pWindowStylesEx) -{ - static WCHAR classnameW[] = { 'I','V','M','R','9',' ','C','l','a','s','s', 0 }; - - *pClassStyles = 0; - *pWindowStyles = WS_SIZEBOX; - *pWindowStylesEx = 0; - - return classnameW; -} - static RECT WINAPI VMR9_GetDefaultRect(BaseWindow *This) { struct quartz_vmr* pVMR9 = impl_from_BaseWindow(This); @@ -604,7 +593,6 @@ static BOOL WINAPI VMR9_OnSize(BaseWindow *This, LONG Width, LONG Height) } static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { - VMR9_GetClassWindowStyles, VMR9_GetDefaultRect, VMR9_OnSize, }; diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index fbf0edc78c..142336bc19 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -110,33 +110,24 @@ HRESULT WINAPI BaseWindow_Destroy(BaseWindow *This) HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) { - WNDCLASSW winclass; + static const WCHAR class_nameW[] = {'w','i','n','e','_','s','t','r','m','b','a','s','e','_','w','i','n','d','o','w',0}; static const WCHAR windownameW[] = { 'A','c','t','i','v','e','M','o','v','i','e',' ','W','i','n','d','o','w',0 }; + WNDCLASSW winclass = {0}; - This->pClassName = This->pFuncsTable->pfnGetClassWindowStyles(This, &This->ClassStyles, &This->WindowStyles, &This->WindowStylesEx); - - winclass.style = This->ClassStyles; winclass.lpfnWndProc = WndProcW; - winclass.cbClsExtra = 0; winclass.cbWndExtra = sizeof(BaseWindow*); winclass.hInstance = This->hInstance; - winclass.hIcon = NULL; - winclass.hCursor = NULL; winclass.hbrBackground = GetStockObject(BLACK_BRUSH); - winclass.lpszMenuName = NULL; - winclass.lpszClassName = This->pClassName; + winclass.lpszClassName = class_nameW; if (!RegisterClassW(&winclass) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) { ERR("Unable to register window class: %u\n", GetLastError()); return E_FAIL; } - This->hWnd = CreateWindowExW(This->WindowStylesEx, - This->pClassName, windownameW, - This->WindowStyles, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, NULL, NULL, This->hInstance, - NULL); + This->hWnd = CreateWindowExW(0, class_nameW, windownameW, WS_SIZEBOX, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + NULL, NULL, This->hInstance, NULL); if (!This->hWnd) { @@ -305,7 +296,6 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG W SetWindowLongW(This->baseWindow.hWnd, GWL_STYLE, WindowStyle); SetWindowPos(This->baseWindow.hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED); - This->baseWindow.WindowStyles = WindowStyle; return S_OK; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 34a558ab8e..11397170ed 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -360,23 +360,17 @@ typedef struct tagBaseWindow LONG Width; LONG Height; HINSTANCE hInstance; - LPWSTR pClassName; - DWORD ClassStyles; - DWORD WindowStyles; - DWORD WindowStylesEx; HDC hDC; const struct BaseWindowFuncTable* pFuncsTable; } BaseWindow; -typedef LPWSTR (WINAPI *BaseWindow_GetClassWindowStyles)(BaseWindow *This, DWORD *pClassStyles, DWORD *pWindowStyles, DWORD *pWindowStylesEx); typedef RECT (WINAPI *BaseWindow_GetDefaultRect)(BaseWindow *This); typedef BOOL (WINAPI *BaseWindow_OnSize)(BaseWindow *This, LONG Height, LONG Width); typedef struct BaseWindowFuncTable { /* Required */ - BaseWindow_GetClassWindowStyles pfnGetClassWindowStyles; BaseWindow_GetDefaultRect pfnGetDefaultRect; /* Optional, WinProc Related */ BaseWindow_OnSize pfnOnSize;

1 0

Zebediah Figura : strmbase: Get rid of BaseWindowImpl_OnSize().
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: a17f2ecb69d35b66608b9eb96b40ade1001ac7df URL: https://source.winehq.org/git/wine.git/?a=commit;h=a17f2ecb69d35b66608b9eb9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 16 19:36:48 2019 -0500 strmbase: Get rid of BaseWindowImpl_OnSize(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 3 ++- dlls/quartz/vmr9.c | 3 ++- dlls/strmbase/window.c | 12 +++--------- include/wine/strmbase.h | 1 - 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index a16a422e2d..11a1183355 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -415,7 +415,8 @@ static BOOL WINAPI VideoRenderer_OnSize(BaseWindow *iface, LONG Width, LONG Heig This->DestRect.top, This->DestRect.right - This->DestRect.left, This->DestRect.bottom - This->DestRect.top); - return BaseWindowImpl_OnSize(iface, Width, Height); + + return TRUE; } static const BaseRendererFuncTable BaseFuncTable = diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 536703fbff..59a5152cf5 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -589,7 +589,8 @@ static BOOL WINAPI VMR9_OnSize(BaseWindow *This, LONG Width, LONG Height) pVMR9->target_rect.top, pVMR9->target_rect.right - pVMR9->target_rect.left, pVMR9->target_rect.bottom - pVMR9->target_rect.top); - return BaseWindowImpl_OnSize(This, Width, Height); + + return TRUE; } static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 142336bc19..82bb814827 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -74,20 +74,14 @@ static LRESULT CALLBACK WndProcW(HWND hwnd, UINT message, WPARAM wparam, LPARAM case WM_SIZE: if (This->pFuncsTable->pfnOnSize) return This->pFuncsTable->pfnOnSize(This, LOWORD(lparam), HIWORD(lparam)); - else - return BaseWindowImpl_OnSize(This, LOWORD(lparam), HIWORD(lparam)); + + This->Width = LOWORD(lparam); + This->Height = HIWORD(lparam); } return DefWindowProcW(hwnd, message, wparam, lparam); } -BOOL WINAPI BaseWindowImpl_OnSize(BaseWindow *This, LONG Width, LONG Height) -{ - This->Width = Width; - This->Height = Height; - return TRUE; -} - HRESULT WINAPI BaseWindow_Init(BaseWindow *pBaseWindow, const BaseWindowFuncTable* pFuncsTable) { if (!pFuncsTable) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 11397170ed..13544f414b 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -381,7 +381,6 @@ HRESULT WINAPI BaseWindow_Destroy(BaseWindow *pBaseWindow); HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This); HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This); -BOOL WINAPI BaseWindowImpl_OnSize(BaseWindow *This, LONG Height, LONG Width); enum strmbase_type_id {

1 0

Zebediah Figura : strmbase: Get rid of the unused "hInstance" field of the BaseWindow structure.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: f3a766bfe4465c373ae0ecb0e6b0eccb0ec9918e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3a766bfe4465c373ae0ecb0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 16 19:36:49 2019 -0500 strmbase: Get rid of the unused "hInstance" field of the BaseWindow structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/window.c | 3 +-- include/wine/strmbase.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 82bb814827..c99a529fa2 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -110,7 +110,6 @@ HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) winclass.lpfnWndProc = WndProcW; winclass.cbWndExtra = sizeof(BaseWindow*); - winclass.hInstance = This->hInstance; winclass.hbrBackground = GetStockObject(BLACK_BRUSH); winclass.lpszClassName = class_nameW; if (!RegisterClassW(&winclass) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) @@ -121,7 +120,7 @@ HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) This->hWnd = CreateWindowExW(0, class_nameW, windownameW, WS_SIZEBOX, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, This->hInstance, NULL); + NULL, NULL, NULL, NULL); if (!This->hWnd) { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 13544f414b..cc06e70447 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -359,7 +359,6 @@ typedef struct tagBaseWindow HWND hWnd; LONG Width; LONG Height; - HINSTANCE hInstance; HDC hDC; const struct BaseWindowFuncTable* pFuncsTable;

1 0