September 2019 - Wine-commits

Zhiyi Zhang : user32: Don't report mirrored slave monitors in EnumDisplayMonitors.
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: ca39b1c22dfa2dd79cde700163c6b04c1caf8146 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca39b1c22dfa2dd79cde7001… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Sep 12 21:39:24 2019 +0800 user32: Don't report mirrored slave monitors in EnumDisplayMonitors. Mirrored slave monitors don't get enumerated by EnumDisplayMonitors. For example, if two monitors are in mirrored mode, only one of them is reported by EnumDisplayMonitors. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 09cebc2f62..b407b51811 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3750,7 +3750,8 @@ static BOOL update_monitor_cache(void) HANDLE mutex = NULL; DWORD state_flags; BOOL ret = FALSE; - DWORD i = 0; + BOOL mirrored_slave; + DWORD i = 0, j; DWORD type; /* Update monitor cache from SetupAPI if it's outdated */ @@ -3794,6 +3795,20 @@ static BOOL update_monitor_cache(void) if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, (BYTE *)&monitors[monitor_count].rcMonitor, sizeof(RECT), NULL, 0 )) goto fail; + + /* Mirrored slave monitors also don't get enumerated */ + mirrored_slave = FALSE; + for (j = 0; j < monitor_count; j++) + { + if (EqualRect(&monitors[j].rcMonitor, &monitors[monitor_count].rcMonitor)) + { + mirrored_slave = TRUE; + break; + } + } + if (mirrored_slave) + continue; + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type, (BYTE *)&monitors[monitor_count].rcWork, sizeof(RECT), NULL, 0 )) goto fail;

1 0

Zebediah Figura : configure: Also try /usr/lib32/pkgconfig/ for the 32-bit PKG_CONFIG_PATH.
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: a6e237802159052e3add2e339fbd512069b45d82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6e237802159052e3add2e33… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Sep 13 22:41:32 2019 -0500 configure: Also try /usr/lib32/pkgconfig/ for the 32-bit PKG_CONFIG_PATH. As 20d41d9e2, but some distributions (e.g. Manjaro, and probably Arch in general) use this path instead. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 163f545f6c..40f783349e 100755 --- a/configure +++ b/configure @@ -5606,7 +5606,7 @@ $as_echo "$wine_cv_cc_m32" >&6; } notice_platform="32-bit " TARGETFLAGS="-m32" - PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig} + PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} with_unwind=${with_unwind:-no} diff --git a/configure.ac b/configure.ac index ad7ed007e6..250b3c2d5c 100644 --- a/configure.ac +++ b/configure.ac @@ -159,7 +159,7 @@ case $host in host_cpu="i386" notice_platform="32-bit " AC_SUBST(TARGETFLAGS,"-m32") - PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig} + PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} with_unwind=${with_unwind:-no}

1 0

Francois Gouget : ieframe/tests: Fix the name of an unused function parameter.
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: 755154905785bfce718cb04257d665e51c71097c URL: https://source.winehq.org/git/wine.git/?a=commit;h=755154905785bfce718cb042… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 16 15:58:36 2019 +0200 ieframe/tests: Fix the name of an unused function parameter. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 2bf4e382e3..db47fdf616 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -556,7 +556,7 @@ static ULONG WINAPI OleContainer_Release(IOleContainer *iface) } static HRESULT WINAPI OleContainer_ParseDisplayName(IOleContainer *iface, IBindCtx *pbc, - LPOLESTR pszDiaplayName, ULONG *pchEaten, IMoniker **ppmkOut) + LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) { ok(0, "unexpected call\n"); return E_NOTIMPL;

1 0

Francois Gouget : ieframe/tests: Fix the spelling of an ok() message.
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: 5007b2c78cb82b24bce1ccafbbab852deca24a6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5007b2c78cb82b24bce1ccaf… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 16 15:58:46 2019 +0200 ieframe/tests: Fix the spelling of an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/ie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index cb901d7763..b27323cc2e 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -215,7 +215,7 @@ static void test_window(IWebBrowser2 *wb) HRESULT hres; hres = IWebBrowser2_get_HWND(wb, &handle); - ok(hres == S_OK, "get_HWND faile: %08x\n", hres); + ok(hres == S_OK, "get_HWND failed: %08x\n", hres); ok(handle, "handle == 0\n"); hwnd = (HWND)handle;

1 0

Jacek Caban : jscript: Use wide-char literals in lexer.
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: 78beca78875eccb7fc4d15ba52092d618e2d8dcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=78beca78875eccb7fc4d15ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 16 15:53:34 2019 +0200 jscript: Use wide-char literals in lexer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/lex.c | 137 ++++++++++++++++++----------------------------------- 1 file changed, 46 insertions(+), 91 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 4d77f8a20f..4f0ea45362 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -32,76 +32,42 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -static const WCHAR breakW[] = {'b','r','e','a','k',0}; -static const WCHAR caseW[] = {'c','a','s','e',0}; -static const WCHAR catchW[] = {'c','a','t','c','h',0}; -static const WCHAR continueW[] = {'c','o','n','t','i','n','u','e',0}; -static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; -static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; -static const WCHAR doW[] = {'d','o',0}; -static const WCHAR elseW[] = {'e','l','s','e',0}; -static const WCHAR falseW[] = {'f','a','l','s','e',0}; -static const WCHAR finallyW[] = {'f','i','n','a','l','l','y',0}; -static const WCHAR forW[] = {'f','o','r',0}; -static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0}; -static const WCHAR getW[] = {'g','e','t',0}; -static const WCHAR ifW[] = {'i','f',0}; -static const WCHAR inW[] = {'i','n',0}; -static const WCHAR instanceofW[] = {'i','n','s','t','a','n','c','e','o','f',0}; -static const WCHAR newW[] = {'n','e','w',0}; -static const WCHAR nullW[] = {'n','u','l','l',0}; -static const WCHAR returnW[] = {'r','e','t','u','r','n',0}; -static const WCHAR setW[] = {'s','e','t',0}; -static const WCHAR switchW[] = {'s','w','i','t','c','h',0}; -static const WCHAR thisW[] = {'t','h','i','s',0}; -static const WCHAR throwW[] = {'t','h','r','o','w',0}; -static const WCHAR trueW[] = {'t','r','u','e',0}; -static const WCHAR tryW[] = {'t','r','y',0}; -static const WCHAR typeofW[] = {'t','y','p','e','o','f',0}; -static const WCHAR varW[] = {'v','a','r',0}; -static const WCHAR voidW[] = {'v','o','i','d',0}; -static const WCHAR whileW[] = {'w','h','i','l','e',0}; -static const WCHAR withW[] = {'w','i','t','h',0}; - -static const WCHAR elifW[] = {'e','l','i','f',0}; -static const WCHAR endW[] = {'e','n','d',0}; - static const struct { const WCHAR *word; int token; BOOL no_nl; unsigned min_version; } keywords[] = { - {breakW, kBREAK, TRUE}, - {caseW, kCASE}, - {catchW, kCATCH}, - {continueW, kCONTINUE, TRUE}, - {defaultW, kDEFAULT}, - {deleteW, kDELETE}, - {doW, kDO}, - {elseW, kELSE}, - {falseW, kFALSE}, - {finallyW, kFINALLY}, - {forW, kFOR}, - {functionW, kFUNCTION}, - {getW, kGET, FALSE, SCRIPTLANGUAGEVERSION_ES5}, - {ifW, kIF}, - {inW, kIN}, - {instanceofW, kINSTANCEOF}, - {newW, kNEW}, - {nullW, kNULL}, - {returnW, kRETURN, TRUE}, - {setW, kSET, FALSE, SCRIPTLANGUAGEVERSION_ES5}, - {switchW, kSWITCH}, - {thisW, kTHIS}, - {throwW, kTHROW}, - {trueW, kTRUE}, - {tryW, kTRY}, - {typeofW, kTYPEOF}, - {varW, kVAR}, - {voidW, kVOID}, - {whileW, kWHILE}, - {withW, kWITH} + {L"break", kBREAK, TRUE}, + {L"case", kCASE}, + {L"catch", kCATCH}, + {L"continue", kCONTINUE, TRUE}, + {L"default", kDEFAULT}, + {L"delete", kDELETE}, + {L"do", kDO}, + {L"else", kELSE}, + {L"false", kFALSE}, + {L"finally", kFINALLY}, + {L"for", kFOR}, + {L"function", kFUNCTION}, + {L"get", kGET, FALSE, SCRIPTLANGUAGEVERSION_ES5}, + {L"if", kIF}, + {L"in", kIN}, + {L"instanceof", kINSTANCEOF}, + {L"new", kNEW}, + {L"null", kNULL}, + {L"return", kRETURN, TRUE}, + {L"set", kSET, FALSE, SCRIPTLANGUAGEVERSION_ES5}, + {L"switch", kSWITCH}, + {L"this", kTHIS}, + {L"throw", kTHROW}, + {L"true", kTRUE}, + {L"try", kTRY}, + {L"typeof", kTYPEOF}, + {L"var", kVAR}, + {L"void", kVOID}, + {L"while", kWHILE}, + {L"with", kWITH} }; static int lex_error(parser_ctx_t *ctx, HRESULT hres) @@ -895,14 +861,6 @@ static BOOL init_cc(parser_ctx_t *ctx) { cc_ctx_t *cc; - static const WCHAR _win32W[] = {'_','w','i','n','3','2',0}; - static const WCHAR _win64W[] = {'_','w','i','n','6','4',0}; - static const WCHAR _x86W[] = {'_','x','8','6',0}; - static const WCHAR _amd64W[] = {'_','a','m','d','6','4',0}; - static const WCHAR _jscriptW[] = {'_','j','s','c','r','i','p','t',0}; - static const WCHAR _jscript_buildW[] = {'_','j','s','c','r','i','p','t','_','b','u','i','l','d',0}; - static const WCHAR _jscript_versionW[] = {'_','j','s','c','r','i','p','t','_','v','e','r','s','i','o','n',0}; - if(ctx->script->cc) return TRUE; @@ -914,11 +872,11 @@ static BOOL init_cc(parser_ctx_t *ctx) cc->vars = NULL; - if(!new_cc_var(cc, _jscriptW, -1, ccval_bool(TRUE)) - || !new_cc_var(cc, sizeof(void*) == 8 ? _win64W : _win32W, -1, ccval_bool(TRUE)) - || !new_cc_var(cc, sizeof(void*) == 8 ? _amd64W : _x86W, -1, ccval_bool(TRUE)) - || !new_cc_var(cc, _jscript_versionW, -1, ccval_num(JSCRIPT_MAJOR_VERSION + (DOUBLE)JSCRIPT_MINOR_VERSION/10.0)) - || !new_cc_var(cc, _jscript_buildW, -1, ccval_num(JSCRIPT_BUILD_VERSION))) { + if(!new_cc_var(cc, L"_jscript", -1, ccval_bool(TRUE)) + || !new_cc_var(cc, sizeof(void*) == 8 ? L"_win64" : L"_win32", -1, ccval_bool(TRUE)) + || !new_cc_var(cc, sizeof(void*) == 8 ? L"_amd64" : L"_x86", -1, ccval_bool(TRUE)) + || !new_cc_var(cc, L"_jscript_version", -1, ccval_num(JSCRIPT_MAJOR_VERSION + (DOUBLE)JSCRIPT_MINOR_VERSION/10.0)) + || !new_cc_var(cc, L"_jscript_build", -1, ccval_num(JSCRIPT_BUILD_VERSION))) { release_cc(cc); lex_error(ctx, E_OUTOFMEMORY); return FALSE; @@ -974,12 +932,12 @@ int try_parse_ccval(parser_ctx_t *ctx, ccval_t *r) return 1; } - if(!check_keyword(ctx, trueW, NULL)) { + if(!check_keyword(ctx, L"true", NULL)) { *r = ccval_bool(TRUE); return 1; } - if(!check_keyword(ctx, falseW, NULL)) { + if(!check_keyword(ctx, L"false", NULL)) { *r = ccval_bool(FALSE); return 1; } @@ -1000,13 +958,13 @@ static int skip_code(parser_ctx_t *ctx, BOOL exec_else) } ctx->ptr = ptr+1; - if(!check_keyword(ctx, endW, NULL)) { + if(!check_keyword(ctx, L"end", NULL)) { if(--if_depth) continue; return 0; } - if(exec_else && !check_keyword(ctx, elifW, NULL)) { + if(exec_else && !check_keyword(ctx, L"elif", NULL)) { if(if_depth > 1) continue; @@ -1024,7 +982,7 @@ static int skip_code(parser_ctx_t *ctx, BOOL exec_else) return 0; } - if(exec_else && !check_keyword(ctx, elseW, NULL)) { + if(exec_else && !check_keyword(ctx, L"else", NULL)) { if(if_depth > 1) continue; @@ -1033,7 +991,7 @@ static int skip_code(parser_ctx_t *ctx, BOOL exec_else) return 0; } - if(!check_keyword(ctx, ifW, NULL)) { + if(!check_keyword(ctx, L"if", NULL)) { if_depth++; continue; } @@ -1047,15 +1005,12 @@ static int cc_token(parser_ctx_t *ctx, void *lval) unsigned id_len = 0; cc_var_t *var; - static const WCHAR cc_onW[] = {'c','c','_','o','n',0}; - static const WCHAR setW[] = {'s','e','t',0}; - ctx->ptr++; - if(!check_keyword(ctx, cc_onW, NULL)) + if(!check_keyword(ctx, L"cc_on", NULL)) return init_cc(ctx) ? 0 : -1; - if(!check_keyword(ctx, setW, NULL)) { + if(!check_keyword(ctx, L"set", NULL)) { const WCHAR *ident; unsigned ident_len; cc_var_t *var; @@ -1089,7 +1044,7 @@ static int cc_token(parser_ctx_t *ctx, void *lval) return 0; } - if(!check_keyword(ctx, ifW, NULL)) { + if(!check_keyword(ctx, L"if", NULL)) { if(!init_cc(ctx)) return -1; @@ -1108,14 +1063,14 @@ static int cc_token(parser_ctx_t *ctx, void *lval) return skip_code(ctx, TRUE); } - if(!check_keyword(ctx, elifW, NULL) || !check_keyword(ctx, elseW, NULL)) { + if(!check_keyword(ctx, L"elif", NULL) || !check_keyword(ctx, L"else", NULL)) { if(!ctx->cc_if_depth) return lex_error(ctx, JS_E_SYNTAX); return skip_code(ctx, FALSE); } - if(!check_keyword(ctx, endW, NULL)) { + if(!check_keyword(ctx, L"end", NULL)) { if(!ctx->cc_if_depth) return lex_error(ctx, JS_E_SYNTAX);

1 0

Ken Thomases : ntdll: Fix the Mac build with SDKs older than 10.14.
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: bed429133624a905170555a4ae526f4d72cc94dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=bed429133624a905170555a4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Sep 16 13:42:06 2019 -0500 ntdll: Fix the Mac build with SDKs older than 10.14. Also, fix some warnings with the 10.14 SDK. Thanks to Gijs Vermeulen for reporting the issue. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index e76e5be6aa..81ebe8c7e7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -55,6 +55,9 @@ # define UNW_LOCAL_ONLY # include <libunwind.h> #endif +#ifdef __APPLE__ +# include <mach/mach.h> +#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -3209,10 +3212,10 @@ static void *mac_thread_gsbase(void) static int gsbase_offset = -1; void *ret; - kern_return_t kr = thread_info(mach_thread_self(), THREAD_IDENTIFIER_INFO, (thread_identifier_info_t) &tiinfo, &info_count); + kern_return_t kr = thread_info(mach_thread_self(), THREAD_IDENTIFIER_INFO, (thread_info_t) &tiinfo, &info_count); if (kr == KERN_SUCCESS) { - TRACE("pthread_self() %p thread ID %lx gsbase %lx\n", pthread_self(), tiinfo.thread_id, tiinfo.thread_handle); + TRACE("pthread_self() %p thread ID %llx gsbase %llx\n", pthread_self(), tiinfo.thread_id, tiinfo.thread_handle); return (void*)tiinfo.thread_handle; }

1 0

Francois Gouget : glu32: Fix the spelling of some comments.
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: bcd111dd5f91931d56077fb15398dfcd491a280d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcd111dd5f91931d56077fb1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 16 15:59:06 2019 +0200 glu32: Fix the spelling of some comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/sweep.c | 4 ++-- dlls/glu32/tess.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/glu32/sweep.c b/dlls/glu32/sweep.c index a909e2be33..0bfc9335cb 100644 --- a/dlls/glu32/sweep.c +++ b/dlls/glu32/sweep.c @@ -542,7 +542,7 @@ static void CallCombine( GLUtesselator *tess, GLUvertex *isect, static void SpliceMergeVertices( GLUtesselator *tess, GLUhalfEdge *e1, GLUhalfEdge *e2 ) /* - * Two vertices with idential coordinates are combined into one. + * Two vertices with identical coordinates are combined into one. * e1->Org is kept, while e2->Org is discarded. */ { @@ -1045,7 +1045,7 @@ static void ConnectRightVertex( GLUtesselator *tess, ActiveRegion *regUp, static void ConnectLeftDegenerate( GLUtesselator *tess, ActiveRegion *regUp, GLUvertex *vEvent ) /* - * The event vertex lies exacty on an already-processed edge or vertex. + * The event vertex lies exactly on an already-processed edge or vertex. * Adding the new vertex involves splicing it into the already-processed * part of the mesh. */ diff --git a/dlls/glu32/tess.c b/dlls/glu32/tess.c index a1bca2e158..6e72d1e3ef 100644 --- a/dlls/glu32/tess.c +++ b/dlls/glu32/tess.c @@ -192,7 +192,7 @@ static void CheckOrientation( GLUtesselator *tess ) /* The "feature merging" is not intended to be complete. There are * special cases where edges are nearly parallel to the sweep line * which are not implemented. The algorithm should still behave - * robustly (ie. produce a reasonable tesselation) in the presence + * robustly (ie. produce a reasonable tessellation) in the presence * of such edges, however it may miss features which could have been * merged. We could minimize this effect by choosing the sweep line * direction to be something unusual (ie. not parallel to one of the

1 0

Francois Gouget : gdiplus: Fix a function name in a FIXME() message.
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: 0bbc9b830e9a94492f90438e9a534a554b2e9d36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bbc9b830e9a94492f90438e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 16 15:59:34 2019 +0200 gdiplus: Fix a function name in a FIXME() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index a292483c14..d1a95d678d 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2407,7 +2407,7 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d if (pendata->PenDataFlags & PenDataCompoundLine) { EmfPlusCompoundLineData *compoundline = (EmfPlusCompoundLineData *)((BYTE *)pendata + offset); - FIXME("PenDataCompundLine is not supported.\n"); + FIXME("PenDataCompoundLine is not supported.\n"); offset += FIELD_OFFSET(EmfPlusCompoundLineData, data) + compoundline->CompoundLineDataSize * sizeof(float); }

1 0

Francois Gouget : gdi32: Fix the spelling of some comments.
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: f9b04a72a99435088e0920121461a4327f9dc328 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9b04a72a99435088e092012… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 16 15:59:50 2019 +0200 gdi32: Fix the spelling of some comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bidi.c | 2 +- dlls/gdi32/tests/font.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 67ef2d385c..1b2dca774c 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -68,7 +68,7 @@ extern const unsigned short bidi_direction_table[] DECLSPEC_HIDDEN; Note: The list of bidirectional character types here is not grouped the - same way as the table 3-7, since the numberic values for the types + same way as the table 3-7, since the numeric values for the types are chosen to keep the state and action tables compact. ------------------------------------------------------------------------*/ enum directions diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 245fb4d4c2..b57effd349 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4801,7 +4801,7 @@ static void test_GetGlyphOutline(void) old_hfont = SelectObject(hdc, hfont); - /* expected to ignore superfluous bytes (sigle-byte character) */ + /* expected to ignore superfluous bytes (single-byte character) */ ret = GetGlyphOutlineA(hdc, 0x8041, GGO_BITMAP, &gm, 0, NULL, &mat); ret2 = GetGlyphOutlineA(hdc, 0x41, GGO_BITMAP, &gm2, 0, NULL, &mat); ok(ret == ret2 && memcmp(&gm, &gm2, sizeof gm) == 0, "%d %d\n", ret, ret2);

1 0

Francois Gouget : winmm: Avoid a couple of unneeded lstrlenW() calls.
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: 6a4347be371bea544e0d4a81f4cfacd29af18d6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a4347be371bea544e0d4a81… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 16 16:01:04 2019 +0200 winmm: Avoid a couple of unneeded lstrlenW() calls. Note that since str is a buffer it cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/playsound.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 2731e7b935..be3f9d4c80 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -87,11 +87,11 @@ static HMMIO get_mmioFromProfile(UINT uFlags, LPCWSTR lpszName) TRACE("searching in SystemSound list for %s\n", debugstr_w(lpszName)); GetProfileStringW(wszSounds, lpszName, wszNull, str, ARRAY_SIZE(str)); - if (lstrlenW(str) == 0) + if (!*str) { if (uFlags & SND_NODEFAULT) goto next; GetProfileStringW(wszSounds, wszDefault, wszNull, str, ARRAY_SIZE(str)); - if (lstrlenW(str) == 0) goto next; + if (!*str) goto next; } for (ptr = str; *ptr && *ptr != ','; ptr++); if (*ptr) *ptr = 0;

1 0