May 2019 - Wine-commits - list.winehq.org

Zebediah Figura : msvcr120: Add nexttoward implementation.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 449e0c5c0a8bb6d76ec880d4d5708dcacbc72390 URL: https://source.winehq.org/git/wine.git/?a=commit;h=449e0c5c0a8bb6d76ec880d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Feb 23 14:46:46 2019 -0600 msvcr120: Add nexttoward implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45631 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 28e74af742f984d58d293e6bc6e4d09b5c3fa844) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 + configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +- dlls/msvcr120/msvcr120.spec | 6 +- dlls/msvcr120/tests/msvcr120.c | 89 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 6 +- dlls/msvcrt/math.c | 38 +++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +- include/config.h.in | 6 ++ 9 files changed, 149 insertions(+), 12 deletions(-) diff --git a/configure b/configure index b3a360e..2220d16 100755 --- a/configure +++ b/configure @@ -18624,6 +18624,8 @@ for ac_func in \ lroundf \ nearbyint \ nearbyintf \ + nexttoward \ + nexttowardf \ powl \ remainder \ remainderf \ diff --git a/configure.ac b/configure.ac index 119c4ce..fe7ad4e 100644 --- a/configure.ac +++ b/configure.ac @@ -2762,6 +2762,8 @@ AC_CHECK_FUNCS(\ lroundf \ nearbyint \ nearbyintf \ + nexttoward \ + nexttowardf \ powl \ remainder \ remainderf \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 0d645e5..f5e4fb1 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -297,9 +297,9 @@ @ cdecl nextafter(double double) ucrtbase.nextafter @ cdecl nextafterf(float float) ucrtbase.nextafterf @ cdecl nextafterl(double double) ucrtbase.nextafterl -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) ucrtbase.nexttoward +@ cdecl nexttowardf(float double) ucrtbase.nexttowardf +@ cdecl nexttowardl(double double) ucrtbase.nexttowardl @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 4e25c68..478248d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2302,9 +2302,9 @@ @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) MSVCRT_nexttoward +@ cdecl nexttowardf(float double) MSVCRT_nexttowardf +@ cdecl nexttowardl(double double) MSVCRT_nexttoward @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 79b667e..3077a18 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -127,6 +127,16 @@ static inline float __port_nan(void) } #define NAN __port_nan() +static inline int isnormal(double d) +{ + return _fpclass(d) & (_FPCLASS_PN | _FPCLASS_NN); +} + +static inline int isinf(double d) +{ + return _fpclass(d) & (_FPCLASS_PINF | _FPCLASS_NINF); +} + struct MSVCRT_lconv { char* decimal_point; @@ -192,6 +202,9 @@ static unsigned short (__cdecl *p_wctype)(const char*); static int (__cdecl *p_vsscanf)(const char*, const char *, __ms_va_list valist); static _Dcomplex* (__cdecl *p__Cbuild)(_Dcomplex*, double, double); static double (__cdecl *p_creal)(_Dcomplex); +static double (__cdecl *p_nexttoward)(double, double); +static float (__cdecl *p_nexttowardf)(float, double); +static double (__cdecl *p_nexttowardl)(double, double); /* make sure we use the correct errno */ #undef errno @@ -252,6 +265,9 @@ static BOOL init(void) SET(p_vsscanf, "vsscanf"); SET(p__Cbuild, "_Cbuild"); SET(p_creal, "creal"); + SET(p_nexttoward, "nexttoward"); + SET(p_nexttowardf, "nexttowardf"); + SET(p_nexttowardl, "nexttowardl"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); @@ -964,6 +980,78 @@ static void test__Cbuild(void) ok(d == 3.0, "creal returned %lf\n", d); } +static void test_nexttoward(void) +{ + errno_t e; + double d; + float f; + int i; + + struct + { + double source; + double dir; + float f; + double d; + } + tests[] = + { + {0.0, 0.0, 0.0f, 0.0}, + {0.0, 1.0, 1.0e-45f, 5.0e-324}, + {0.0, -1.0, -1.0e-45f, -5.0e-324}, + {2.2250738585072009e-308, 0.0, 0.0f, 2.2250738585072004e-308}, + {2.2250738585072009e-308, 2.2250738585072010e-308, 1.0e-45f, 2.2250738585072009e-308}, + {2.2250738585072009e-308, 1.0, 1.0e-45f, 2.2250738585072014e-308}, + {2.2250738585072014e-308, 0.0, 0.0f, 2.2250738585072009e-308}, + {2.2250738585072014e-308, 2.2250738585072014e-308, 1.0e-45f, 2.2250738585072014e-308}, + {2.2250738585072014e-308, 1.0, 1.0e-45f, 2.2250738585072019e-308}, + {1.0, 2.0, 1.00000012f, 1.0000000000000002}, + {1.0, 0.0, 0.99999994f, 0.9999999999999999}, + {1.0, 1.0, 1.0f, 1.0}, + {0.0, INFINITY, 1.0e-45f, 5.0e-324}, + {FLT_MAX, INFINITY, INFINITY, 3.402823466385289e+038}, + {DBL_MAX, INFINITY, INFINITY, INFINITY}, + {INFINITY, INFINITY, INFINITY, INFINITY}, + {INFINITY, 0, FLT_MAX, DBL_MAX}, + }; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + f = p_nexttowardf(tests[i].source, tests[i].dir); + ok(f == tests[i].f, "Test %d: expected %0.8ef, got %0.8ef.\n", i, tests[i].f, f); + + errno = -1; + d = p_nexttoward(tests[i].source, tests[i].dir); + e = errno; + ok(d == tests[i].d, "Test %d: expected %0.16e, got %0.16e.\n", i, tests[i].d, d); + if (!isnormal(d) && !isinf(tests[i].source)) + ok(e == ERANGE, "Test %d: expected ERANGE, got %d.\n", i, e); + else + ok(e == -1, "Test %d: expected no error, got %d.\n", i, e); + + d = p_nexttowardl(tests[i].source, tests[i].dir); + ok(d == tests[i].d, "Test %d: expected %0.16e, got %0.16e.\n", i, tests[i].d, d); + } + + errno = -1; + d = p_nexttoward(NAN, 0); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected no error, got %d.\n", e); + + errno = -1; + d = p_nexttoward(NAN, NAN); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected no error, got %d.\n", e); + + errno = -1; + d = p_nexttoward(0, NAN); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected no error, got %d.\n", e); +} + START_TEST(msvcr120) { if (!init()) return; @@ -983,4 +1071,5 @@ START_TEST(msvcr120) test_wctype(); test_vsscanf(); test__Cbuild(); + test_nexttoward(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c1f6e0b..706799c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1965,9 +1965,9 @@ @ cdecl nextafter(double double) msvcr120.nextafter @ cdecl nextafterf(float float) msvcr120.nextafterf @ cdecl nextafterl(double double) msvcr120.nextafterl -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) msvcr120.nexttoward +@ cdecl nexttowardf(float double) msvcr120.nexttowardf +@ cdecl nexttowardl(double double) msvcr120.nexttowardl @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d4785d3..dc12cb1 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1529,6 +1529,44 @@ float CDECL MSVCRT_nearbyintf(float num) #endif } +/********************************************************************* + * nexttoward (MSVCR120.@) + */ +double CDECL MSVCRT_nexttoward(double num, double next) +{ +#ifdef HAVE_NEXTTOWARD + double ret = nexttoward(num, next); + if (!(MSVCRT__fpclass(ret) & (MSVCRT__FPCLASS_PN | MSVCRT__FPCLASS_NN + | MSVCRT__FPCLASS_SNAN | MSVCRT__FPCLASS_QNAN)) && !isinf(num)) + { + *MSVCRT__errno() = MSVCRT_ERANGE; + } + return ret; +#else + FIXME("not implemented\n"); + return 0; +#endif +} + +/********************************************************************* + * nexttowardf (MSVCR120.@) + */ +float CDECL MSVCRT_nexttowardf(float num, double next) +{ +#ifdef HAVE_NEXTTOWARDF + float ret = nexttowardf(num, next); + if (!(MSVCRT__fpclass(ret) & (MSVCRT__FPCLASS_PN | MSVCRT__FPCLASS_NN + | MSVCRT__FPCLASS_SNAN | MSVCRT__FPCLASS_QNAN)) && !isinf(num)) + { + *MSVCRT__errno() = MSVCRT_ERANGE; + } + return ret; +#else + FIXME("not implemented\n"); + return 0; +#endif +} + #endif /* _MSVCR_VER>=120 */ /********************************************************************* diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2d1d8da..6b87bd1 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2438,9 +2438,9 @@ @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) MSVCRT_nexttoward +@ cdecl nexttowardf(float double) MSVCRT_nexttowardf +@ cdecl nexttowardl(double double) MSVCRT_nexttoward @ stub norm @ stub normf @ stub norml diff --git a/include/config.h.in b/include/config.h.in index c5a3cb4..af8783a 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -693,6 +693,12 @@ /* Define to 1 if you have the <net/route.h> header file. */ #undef HAVE_NET_ROUTE_H +/* Define to 1 if you have the `nexttoward' function. */ +#undef HAVE_NEXTTOWARD + +/* Define to 1 if you have the `nexttowardf' function. */ +#undef HAVE_NEXTTOWARDF + /* Define to 1 if `_msg_ptr' is a member of `ns_msg'. */ #undef HAVE_NS_MSG__MSG_PTR

1 0

Alistair Leslie-Hughes : oleaut32: Correctly get the Currency separator in VarFormatCurrency.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 31b05fdc7229ba8c95b370e55336cb4380f4dab0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31b05fdc7229ba8c95b370e5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 24 07:00:32 2019 +0000 oleaut32: Correctly get the Currency separator in VarFormatCurrency. LOCALE_SCURRENCY allows for 13 chracters including the NULL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46442 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 29cf8ee8ab54f35def5b4c5ed7d155b730bf901e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/varformat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 470ea4e..d6ce4a9 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -2443,7 +2443,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, if (SUCCEEDED(hRet)) { - WCHAR buff[256], decimal[8], thousands[8], currency[8]; + WCHAR buff[256], decimal[8], thousands[8], currency[13]; CURRENCYFMTW numfmt; if (nDigits < 0) @@ -2484,7 +2484,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, numfmt.lpThousandSep = thousands; GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, thousands, ARRAY_SIZE(thousands)); numfmt.lpCurrencySymbol = currency; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, currency, ARRAY_SIZE(currency)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, currency, ARRAY_SIZE(currency)); /* use NLS as per VarFormatNumber() */ if (GetCurrencyFormatW(LOCALE_USER_DEFAULT, 0, V_BSTR(&vStr), &numfmt, buff, ARRAY_SIZE(buff)))

1 0

Józef Kucia : wined3d: Add GPU information for Intel HD Graphics 620.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: a6c2eadfc8881da91c810dd3eb4f166fc19a8cb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6c2eadfc8881da91c810dd3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 27 16:39:42 2019 +0100 wined3d: Add GPU information for Intel HD Graphics 620. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 88aaee78fe96084f2d1ff5c224b04d10c459088e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 827d4f6..aaafd31 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -456,6 +456,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IP580_2, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_1, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD620, "Intel(R) HD Graphics 620", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ea60662..d54581b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2510,6 +2510,7 @@ enum wined3d_pci_device CARD_INTEL_IP580_2 = 0x193b, CARD_INTEL_IPP580_1 = 0x193a, CARD_INTEL_IPP580_2 = 0x193d, + CARD_INTEL_HD620 = 0x5916, CARD_INTEL_HD630 = 0x5912, };

1 0

Nikolay Sivov : comctl32/propsheet: Avoid posting uninitialized data ( Valgrind).
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: ec10ad3dbc5b7b92720761dcf0f4e2ae57e06687 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec10ad3dbc5b7b92720761dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 25 11:37:33 2019 +0300 comctl32/propsheet: Avoid posting uninitialized data (Valgrind). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46691 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 71004a825f166f8aa11ad15ecc23d7e4b1de7103) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/propsheet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 09a4551..88dab34 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2760,7 +2760,7 @@ static void PROPSHEET_CleanUp(HWND hwndDlg) static INT do_loop(const PropSheetInfo *psInfo) { - MSG msg; + MSG msg = { 0 }; INT ret = 0; HWND hwnd = psInfo->hwnd; HWND parent = psInfo->ppshheader.hwndParent; @@ -2777,7 +2777,7 @@ static INT do_loop(const PropSheetInfo *psInfo) } } - if(ret == 0) + if(ret == 0 && msg.message) PostQuitMessage(msg.wParam); if(ret != -1)

1 0

Brendan McGrath : vbscript: Allow more keywords to be used as identifiers.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 2c3ab31c5536518493b60d5e5814799b19da61e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c3ab31c5536518493b60d5e… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Fri Feb 15 14:06:15 2019 +0100 vbscript: Allow more keywords to be used as identifiers. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d2937bfff2d59e3b5d41baa173e9c634b0a12a22) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/lex.c | 9 +++++---- dlls/vbscript/parser.y | 21 ++++++++++++--------- dlls/vbscript/tests/lang.vbs | 20 ++++++++++++++++++++ 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 571854d..fa467f0 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -156,7 +156,7 @@ static inline BOOL is_identifier_char(WCHAR c) return isalnumW(c) || c == '_'; } -static int check_keyword(parser_ctx_t *ctx, const WCHAR *word) +static int check_keyword(parser_ctx_t *ctx, const WCHAR *word, const WCHAR **lval) { const WCHAR *p1 = ctx->ptr; const WCHAR *p2 = word; @@ -174,17 +174,18 @@ static int check_keyword(parser_ctx_t *ctx, const WCHAR *word) return 1; ctx->ptr = p1; + *lval = word; return 0; } -static int check_keywords(parser_ctx_t *ctx) +static int check_keywords(parser_ctx_t *ctx, const WCHAR **lval) { int min = 0, max = ARRAY_SIZE(keywords)-1, r, i; while(min <= max) { i = (min+max)/2; - r = check_keyword(ctx, keywords[i].word); + r = check_keyword(ctx, keywords[i].word, lval); if(!r) return keywords[i].token; @@ -412,7 +413,7 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) return parse_numeric_literal(ctx, lval); if(isalphaW(c)) { - int ret = check_keywords(ctx); + int ret = check_keywords(ctx, lval); if(!ret) return parse_identifier(ctx, lval); if(ret != tREM) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 0201099..b81d791 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -71,8 +71,6 @@ static class_decl_t *add_dim_prop(parser_ctx_t*,class_decl_t*,dim_decl_t*,unsign static statement_t *link_statements(statement_t*,statement_t*); -static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; - #define STORAGE_IS_PRIVATE 1 #define STORAGE_IS_DEFAULT 2 @@ -108,17 +106,18 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; %token tTRUE tFALSE %token tNOT tAND tOR tXOR tEQV tIMP tNEQ %token tIS tLTEQ tGTEQ tMOD -%token tCALL tDIM tSUB tFUNCTION tPROPERTY tGET tLET tCONST +%token tCALL tDIM tSUB tFUNCTION tGET tLET tCONST %token tIF tELSE tELSEIF tEND tTHEN tEXIT -%token tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tSTEP tEACH tIN +%token tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tEACH tIN %token tSELECT tCASE %token tBYREF tBYVAL -%token tOPTION tEXPLICIT +%token tOPTION %token tSTOP %token tNOTHING tEMPTY tNULL -%token tCLASS tSET tNEW tPUBLIC tPRIVATE tDEFAULT tME -%token tERROR tNEXT tON tRESUME tGOTO +%token tCLASS tSET tNEW tPUBLIC tPRIVATE tME +%token tNEXT tON tRESUME tGOTO %token <string> tIdentifier tString +%token <string> tDEFAULT tERROR tEXPLICIT tPROPERTY tSTEP %token <lng> tLong tShort %token <dbl> tDouble @@ -443,10 +442,14 @@ ArgumentDecl | tBYREF Identifier EmptyBrackets_opt { $$ = new_argument_decl(ctx, $2, TRUE); } | tBYVAL Identifier EmptyBrackets_opt { $$ = new_argument_decl(ctx, $2, FALSE); } -/* 'property' may be both keyword and identifier, depending on context */ +/* these keywords may also be an identifier, depending on context */ Identifier : tIdentifier { $$ = $1; } - | tPROPERTY { $$ = propertyW; } + | tDEFAULT { $$ = $1; } + | tERROR { $$ = $1; } + | tEXPLICIT { $$ = $1; } + | tPROPERTY { $$ = $1; } + | tSTEP { $$ = $1; } /* Most statements accept both new line and ':' as separators */ StSep diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 2af77bd..15ad84a 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1345,4 +1345,24 @@ end class set x = new RegExp Call ok(x.Global = false, "x.Global = " & x.Global) +sub test_identifiers + ' test keywords that can also be a declared identifier + Dim default + default = "xx" + Call ok(default = "xx", "default = " & default & " expected ""xx""") + + Dim error + error = "xx" + Call ok(error = "xx", "error = " & error & " expected ""xx""") + + Dim explicit + explicit = "xx" + Call ok(explicit = "xx", "explicit = " & explicit & " expected ""xx""") + + Dim step + step = "xx" + Call ok(step = "xx", "step = " & step & " expected ""xx""") +end sub +call test_identifiers() + reportSuccess()

1 0

Brendan McGrath : vbscript: Allow most keywords to be used as 'dot' identifiers.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 717cfe7f63d7f57a691fd274f9ae4890d9702b7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=717cfe7f63d7f57a691fd274… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Thu Feb 28 13:27:17 2019 +1100 vbscript: Allow most keywords to be used as 'dot' identifiers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46318 Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 78078b65b27177fecbd2f45bb5c14b3a21aa1c88) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/parser.y | 86 +++++++++++++++++++++++++++++------- dlls/vbscript/tests/lang.vbs | 55 +++++++++++++++++++++++ dlls/vbscript/tests/run.c | 101 ++++++++++++++++++++++++++++++++++++++----- 3 files changed, 215 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=717cfe7f63d7f57a691f…

1 0

Nikolay Sivov : comctl32/toolbar: Send BN_CLICKED for button that was pressed, not released.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 502db409625d274ce53af1d8d68df23da5381321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=502db409625d274ce53af1d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 17 01:33:10 2019 +0300 comctl32/toolbar: Send BN_CLICKED for button that was pressed, not released. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35516 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f3775ed2ac13ade19a4603f5fba558064311f0b7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/toolbar.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index ec3b498..aa2424b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5733,7 +5733,10 @@ TOOLBAR_LButtonUp (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TOOLBAR_SendNotify(&hdr, infoPtr, TBN_TOOLBARCHANGE); } - else if (infoPtr->nButtonDown >= 0) { + else if (infoPtr->nButtonDown >= 0) + { + BOOL was_clicked = nHit == infoPtr->nButtonDown; + btnPtr = &infoPtr->buttons[infoPtr->nButtonDown]; btnPtr->fsState &= ~TBSTATE_PRESSED; @@ -5775,7 +5778,7 @@ TOOLBAR_LButtonUp (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr, TBN_ENDDRAG); - if (btnPtr->fsState & TBSTATE_ENABLED) + if (was_clicked && btnPtr->fsState & TBSTATE_ENABLED) { SendMessageW (infoPtr->hwndNotify, WM_COMMAND, MAKEWPARAM(infoPtr->buttons[nHit].idCommand, BN_CLICKED), (LPARAM)infoPtr->hwndSelf);

1 0

Nikolay Sivov : usp10: Use single path for all fonts in ScriptGetCMap().
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: d185fc2f1e818b4d6c5adf29415c6c9e3be33c2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d185fc2f1e818b4d6c5adf29… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 22 15:52:48 2019 +0300 usp10: Use single path for all fonts in ScriptGetCMap(). Testing tmPitchAndFamily bitmask does not tell if font has mappings defined. Besides that, GetGlyphIndices() handles bitmap system fonts exactly the same way alternate path did. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46678 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit df4aaff7a3832c040611e6152b6431ac853371a5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/usp10/usp10.c | 45 +++++++++++++++------------------------------ 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index abc2605..0a26996 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3544,42 +3544,27 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars hr = S_OK; - if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE)) + for (i = 0; i < cChars; i++) { - for (i = 0; i < cChars; i++) + WCHAR inChar; + if (dwFlags == SGCM_RTL) + inChar = mirror_char(pwcInChars[i]); + else + inChar = pwcInChars[i]; + if (!(pwOutGlyphs[i] = get_cache_glyph(psc, inChar))) { - WCHAR inChar; - if (dwFlags == SGCM_RTL) - inChar = mirror_char(pwcInChars[i]); - else - inChar = pwcInChars[i]; - if (!(pwOutGlyphs[i] = get_cache_glyph(psc, inChar))) + WORD glyph; + if (!hdc) return E_PENDING; + if (GetGlyphIndicesW(hdc, &inChar, 1, &glyph, GGI_MARK_NONEXISTING_GLYPHS) == GDI_ERROR) return S_FALSE; + if (glyph == 0xffff) { - WORD glyph; - if (!hdc) return E_PENDING; - if (GetGlyphIndicesW(hdc, &inChar, 1, &glyph, GGI_MARK_NONEXISTING_GLYPHS) == GDI_ERROR) return S_FALSE; - if (glyph == 0xffff) - { - hr = S_FALSE; - glyph = 0x0; - } - pwOutGlyphs[i] = set_cache_glyph(psc, inChar, glyph); + hr = S_FALSE; + glyph = 0x0; } + pwOutGlyphs[i] = set_cache_glyph(psc, inChar, glyph); } } - else - { - TRACE("no glyph translation\n"); - for (i = 0; i < cChars; i++) - { - WCHAR inChar; - if (dwFlags == SGCM_RTL) - inChar = mirror_char(pwcInChars[i]); - else - inChar = pwcInChars[i]; - pwOutGlyphs[i] = inChar; - } - } + return hr; }

1 0

Paul Gofman : wined3d: Only use the LSB of the _SAMP_SRGB_TEXTURE state value.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 8b7fad064822df2cce132ad85962c75aac94cead URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b7fad064822df2cce132ad8… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Feb 20 13:55:11 2019 +0330 wined3d: Only use the LSB of the _SAMP_SRGB_TEXTURE state value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37705 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 225fdc35586719406943286dd0e0d1aa8c25e3a1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/tests/visual.c | 173 ++++++++++++++++++++++++++++++++++++----- dlls/wined3d/context.c | 2 +- dlls/wined3d/state.c | 4 +- dlls/wined3d/wined3d_private.h | 12 +++ 4 files changed, 168 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b7fad064822df2cce13…

1 0

Paul Gofman : kernel32/tests: Add test for overlapped file read.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 984f2a75b294740939931e359ac382b250fe431a URL: https://source.winehq.org/git/wine.git/?a=commit;h=984f2a75b294740939931e35… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Feb 15 20:41:37 2019 +0300 kernel32/tests: Add test for overlapped file read. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3117370acceeb2606d0f6dde420a735fa6854a73) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/file.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index d1b76bb..f93409c 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5125,6 +5125,70 @@ static void test_post_completion(void) CloseHandle( port ); } +#define TEST_OVERLAPPED_READ_SIZE 4096 + +static void test_overlapped_read(void) +{ + DECLSPEC_ALIGN(TEST_OVERLAPPED_READ_SIZE) static unsigned char buffer[TEST_OVERLAPPED_READ_SIZE]; + static const char prefix[] = "pfx"; + char temp_path[MAX_PATH]; + char file_name[MAX_PATH]; + DWORD bytes_count; + OVERLAPPED ov; + HANDLE hfile; + DWORD err; + DWORD ret; + + ret = GetTempPathA(MAX_PATH, temp_path); + ok(ret, "Unexpect error %u.\n", GetLastError()); + ret = GetTempFileNameA(temp_path, prefix, 0, file_name); + ok(ret, "Unexpected error %u.\n", GetLastError()); + + hfile = CreateFileA(file_name, GENERIC_WRITE, 0, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_NO_BUFFERING, NULL); + ok(hfile != INVALID_HANDLE_VALUE, "Failed to create file, GetLastError() %u.\n", GetLastError()); + memset(buffer, 0x55, sizeof(buffer)); + ret = WriteFile(hfile, buffer, TEST_OVERLAPPED_READ_SIZE, &bytes_count, NULL); + ok(ret && bytes_count == TEST_OVERLAPPED_READ_SIZE, + "Unexpected WriteFile result, ret %#x, bytes_count %u, GetLastError() %u.\n", + ret, bytes_count, GetLastError()); + CloseHandle(hfile); + + hfile = CreateFileA(file_name, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING, NULL); + ok(hfile != INVALID_HANDLE_VALUE, "Failed to create file, GetLastError() %u.\n", GetLastError()); + + memset(&ov, 0, sizeof(ov)); + + bytes_count = 0xffffffff; + ret = ReadFile(hfile, buffer, TEST_OVERLAPPED_READ_SIZE, &bytes_count, &ov); + todo_wine ok(!ret && GetLastError() == ERROR_IO_PENDING, + "Unexpected ReadFile result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); + todo_wine ok(!bytes_count, "Unexpected read size %u.\n", bytes_count); + ret = GetOverlappedResult(hfile, &ov, &bytes_count, TRUE); + ok(ret, "Unexpected error %u.\n", GetLastError()); + ok(bytes_count == TEST_OVERLAPPED_READ_SIZE, "Unexpected read size %u.\n", bytes_count); + + S(U(ov)).Offset = bytes_count; + ret = ReadFile(hfile, buffer, TEST_OVERLAPPED_READ_SIZE, &bytes_count, &ov); + err = GetLastError(); + /* Win8+ return ERROR_IO_PENDING like stated in MSDN, while older ones + * return ERROR_HANDLE_EOF right away. */ + ok(!ret && (err == ERROR_HANDLE_EOF || err == ERROR_IO_PENDING), + "Unexpected ReadFile result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); + if (err == ERROR_IO_PENDING) + { + ret = GetOverlappedResult(hfile, &ov, &bytes_count, TRUE); + ok(!ret && GetLastError() == ERROR_HANDLE_EOF, "Unexpected result %#x, GetLasttError() %u.\n", + ret, GetLastError()); + } + ok(!bytes_count, "Unexpected read size %u.\n", bytes_count); + + CloseHandle(hfile); + ret = DeleteFileA(file_name); + ok(ret, "Unexpected error %u.\n", GetLastError()); +} + START_TEST(file) { char temp_path[MAX_PATH]; @@ -5194,4 +5258,5 @@ START_TEST(file) test_SetFileInformationByHandle(); test_GetFileAttributesExW(); test_post_completion(); + test_overlapped_read(); }

1 0