wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Jacek Caban : jscript: Added JSON object stub implementation.
by Alexandre Julliard 28 Jan '16

28 Jan '16

Module: wine Branch: master Commit: 4e1e2ee451d5559dd12b81a9ff94580573d0c05f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e1e2ee451d5559dd12b81a9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 27 20:43:26 2016 +0100 jscript: Added JSON object stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/Makefile.in | 1 + dlls/jscript/global.c | 14 +++++++++ dlls/jscript/jscript.h | 4 ++- dlls/jscript/json.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/object.c | 2 +- dlls/jscript/tests/api.js | 8 +++++ 6 files changed, 101 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 67ec4c8..34ed193 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ global.c \ jscript.c \ jscript_main.c \ + json.c \ jsregexp.c \ jsstr.c \ jsutils.c \ diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 1889dc8..03a26302 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -67,6 +67,7 @@ static const WCHAR ScriptEngineBuildVersionW[] = {'S','c','r','i','p','t','E','n','g','i','n','e','B','u','i','l','d','V','e','r','s','i','o','n',0}; static const WCHAR CollectGarbageW[] = {'C','o','l','l','e','c','t','G','a','r','b','a','g','e',0}; static const WCHAR MathW[] = {'M','a','t','h',0}; +static const WCHAR JSONW[] = {'J','S','O','N',0}; static const WCHAR encodeURIW[] = {'e','n','c','o','d','e','U','R','I',0}; static const WCHAR decodeURIW[] = {'d','e','c','o','d','e','U','R','I',0}; static const WCHAR encodeURIComponentW[] = {'e','n','c','o','d','e','U','R','I','C','o','m','p','o','n','e','n','t',0}; @@ -1107,6 +1108,19 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; + if(ctx->version >= 2) { + jsdisp_t *json; + + hres = create_json(ctx, &json); + if(FAILED(hres)) + return hres; + + hres = jsdisp_propput_dontenum(ctx->global, JSONW, jsval_obj(json)); + jsdisp_release(json); + if(FAILED(hres)) + return hres; + } + hres = create_activex_constr(ctx, &constr); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index c0c546a..98cd5b8 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -117,7 +117,8 @@ typedef enum { JSCLASS_REGEXP, JSCLASS_STRING, JSCLASS_ARGUMENTS, - JSCLASS_VBARRAY + JSCLASS_VBARRAY, + JSCLASS_JSON } jsclass_t; jsdisp_t *iface_to_jsdisp(IUnknown*) DECLSPEC_HIDDEN; @@ -317,6 +318,7 @@ HRESULT create_string(script_ctx_t*,jsstr_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_bool(script_ctx_t*,BOOL,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_number(script_ctx_t*,double,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_vbarray(script_ctx_t*,SAFEARRAY*,jsdisp_t**) DECLSPEC_HIDDEN; +HRESULT create_json(script_ctx_t*,jsdisp_t**) DECLSPEC_HIDDEN; typedef enum { NO_HINT, diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c new file mode 100644 index 0000000..6e33a88 --- /dev/null +++ b/dlls/jscript/json.c @@ -0,0 +1,74 @@ +/* + * Copyright 2016 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <math.h> + +#include "jscript.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +static const WCHAR parseW[] = {'p','a','r','s','e',0}; +static const WCHAR stringifyW[] = {'s','t','r','i','n','g','i','f','y',0}; + +static HRESULT JSON_parse(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT JSON_stringify(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const builtin_prop_t JSON_props[] = { + {parseW, JSON_parse, PROPF_METHOD|2}, + {stringifyW, JSON_stringify, PROPF_METHOD|3} +}; + +static const builtin_info_t JSON_info = { + JSCLASS_JSON, + {NULL, NULL, 0}, + sizeof(JSON_props)/sizeof(*JSON_props), + JSON_props, + NULL, + NULL +}; + +HRESULT create_json(script_ctx_t *ctx, jsdisp_t **ret) +{ + jsdisp_t *json; + HRESULT hres; + + json = heap_alloc_zero(sizeof(*json)); + if(!json) + return E_OUTOFMEMORY; + + hres = init_dispex_from_constr(json, ctx, &JSON_info, ctx->object_constr); + if(FAILED(hres)) { + heap_free(json); + return hres; + } + + *ret = json; + return S_OK; +} diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index ffb7ff8..71bed7b 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -54,7 +54,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u static const WCHAR stringW[] = {'S','t','r','i','n','g',0}; /* Keep in sync with jsclass_t enum */ static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, errorW, - functionW, NULL, mathW, numberW, objectW, regexpW, stringW, objectW, objectW}; + functionW, NULL, mathW, numberW, objectW, regexpW, stringW, objectW, objectW, objectW}; TRACE("\n"); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 78145c6..82d2670 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2717,6 +2717,14 @@ testFunctions(VBArray.prototype, [ ["lbound", 0], ["toArray", 0], ["ubound", 0] +]); + +if(invokeVersion < 2) + ok(typeof(JSON) === "undefined", "JSON is not undefined"); +else + testFunctions(JSON, [ + ["parse", 2], + ["stringify", 3] ]); ok(ActiveXObject.length == 1, "ActiveXObject.length = " + ActiveXObject.length);

1 0

Jacek Caban : jscript: Added new is_finite helper.
by Alexandre Julliard 28 Jan '16

28 Jan '16

Module: wine Branch: master Commit: e00708e3aa058dceda858e874ec096a46814a16b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e00708e3aa058dceda858e874… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 27 20:43:11 2016 +0100 jscript: Added new is_finite helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/global.c | 3 +-- dlls/jscript/jscript.h | 1 + dlls/jscript/jsutils.c | 7 ++++++- dlls/jscript/number.c | 11 ++++------- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index dbfb95b..1889dc8 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -264,8 +264,7 @@ static HRESULT JSGlobal_isFinite(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, if(FAILED(hres)) return hres; - if(!isinf(n) && !isnan(n)) - ret = TRUE; + ret = is_finite(n); } if(r) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 32a1be0..c0c546a 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -339,6 +339,7 @@ HRESULT variant_change_type(script_ctx_t*,VARIANT*,VARIANT*,VARTYPE) DECLSPEC_HI HRESULT decode_source(WCHAR*) DECLSPEC_HIDDEN; HRESULT double_to_string(double,jsstr_t**) DECLSPEC_HIDDEN; +BOOL is_finite(double) DECLSPEC_HIDDEN; typedef struct named_item_t { IDispatch *disp; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 85f573f..59dbc65 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -53,6 +53,11 @@ const char *debugstr_jsval(const jsval_t v) return NULL; } +BOOL is_finite(double n) +{ + return !isnan(n) && !isinf(n); +} + #define MIN_BLOCK_SIZE 128 #define ARENA_FREE_FILLER 0xaa @@ -641,7 +646,7 @@ HRESULT to_int32(script_ctx_t *ctx, jsval_t v, INT *ret) if(FAILED(hres)) return hres; - *ret = isnan(n) || isinf(n) ? 0 : n; + *ret = is_finite(n) ? n : 0; return S_OK; } diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 0a648d0..9b5d9a2 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <math.h> #include <assert.h> @@ -257,7 +254,7 @@ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u val = number->value; - if(radix==10 || isnan(val) || isinf(val)) { + if(radix==10 || !is_finite(val)) { hres = to_string(ctx, jsval_number(val), &str); if(FAILED(hres)) return hres; @@ -383,7 +380,7 @@ static HRESULT Number_toFixed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un } val = number->value; - if(isinf(val) || isnan(val)) { + if(!is_finite(val)) { hres = to_string(ctx, jsval_number(val), &str); if(FAILED(hres)) return hres; @@ -424,7 +421,7 @@ static HRESULT Number_toExponential(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla } val = number->value; - if(isinf(val) || isnan(val)) { + if(!is_finite(val)) { hres = to_string(ctx, jsval_number(val), &str); if(FAILED(hres)) return hres; @@ -465,7 +462,7 @@ static HRESULT Number_toPrecision(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags } val = number->value; - if(isinf(val) || isnan(val) || !prec) { + if(!is_finite(val) || !prec) { hres = to_string(ctx, jsval_number(val), &str); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Make parse_decimal a more generic helper.
by Alexandre Julliard 28 Jan '16

28 Jan '16

Module: wine Branch: master Commit: b1197a15eca8e7a5b483e53068f3896c0af08b76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1197a15eca8e7a5b483e5306… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 27 20:42:52 2016 +0100 jscript: Make parse_decimal a more generic helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/lex.c | 84 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 37 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 57ab033..dd788f0 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -406,14 +406,14 @@ literal_t *new_boolean_literal(parser_ctx_t *ctx, BOOL bval) return ret; } -static BOOL parse_double_literal(parser_ctx_t *ctx, LONG int_part, double *ret) +static HRESULT parse_decimal(const WCHAR **iter, const WCHAR *end, double *ret) { - LONGLONG d, hlp; + const WCHAR *ptr = *iter; + LONGLONG d = 0, hlp; int exp = 0; - d = int_part; - while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { - hlp = d*10 + *(ctx->ptr++) - '0'; + while(ptr < end && isdigitW(*ptr)) { + hlp = d*10 + *(ptr++) - '0'; if(d>MAXLONGLONG/10 || hlp<0) { exp++; break; @@ -421,51 +421,48 @@ static BOOL parse_double_literal(parser_ctx_t *ctx, LONG int_part, double *ret) else d = hlp; } - while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + while(ptr < end && isdigitW(*ptr)) { exp++; - ctx->ptr++; + ptr++; } - if(*ctx->ptr == '.') { - ctx->ptr++; + if(*ptr == '.') { + ptr++; - while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { - hlp = d*10 + *(ctx->ptr++) - '0'; + while(ptr < end && isdigitW(*ptr)) { + hlp = d*10 + *(ptr++) - '0'; if(d>MAXLONGLONG/10 || hlp<0) break; d = hlp; exp--; } - while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) - ctx->ptr++; + while(ptr < end && isdigitW(*ptr)) + ptr++; } - if(ctx->ptr < ctx->end && (*ctx->ptr == 'e' || *ctx->ptr == 'E')) { + if(ptr < end && (*ptr == 'e' || *ptr == 'E')) { int sign = 1, e = 0; - ctx->ptr++; - if(ctx->ptr < ctx->end) { - if(*ctx->ptr == '+') { - ctx->ptr++; - }else if(*ctx->ptr == '-') { + if(++ptr < end) { + if(*ptr == '+') { + ptr++; + }else if(*ptr == '-') { sign = -1; - ctx->ptr++; - }else if(!isdigitW(*ctx->ptr)) { + ptr++; + }else if(!isdigitW(*ptr)) { WARN("Expected exponent part\n"); - lex_error(ctx, E_FAIL); - return FALSE; + return E_FAIL; } } - if(ctx->ptr == ctx->end) { + if(ptr == end) { WARN("unexpected end of file\n"); - lex_error(ctx, E_FAIL); - return FALSE; + return E_FAIL; } - while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { - if(e > INT_MAX/10 || (e = e*10 + *ctx->ptr++ - '0')<0) + while(ptr < end && isdigitW(*ptr)) { + if(e > INT_MAX/10 || (e = e*10 + *ptr++ - '0')<0) e = INT_MAX; } e *= sign; @@ -475,22 +472,25 @@ static BOOL parse_double_literal(parser_ctx_t *ctx, LONG int_part, double *ret) else exp += e; } - if(is_identifier_char(*ctx->ptr)) { + if(is_identifier_char(*ptr)) { WARN("wrong char after zero\n"); - lex_error(ctx, JS_E_MISSING_SEMICOLON); - return FALSE; + return JS_E_MISSING_SEMICOLON; } *ret = exp>=0 ? d*pow(10, exp) : d/pow(10, -exp); - return TRUE; + *iter = ptr; + return S_OK; } static BOOL parse_numeric_literal(parser_ctx_t *ctx, double *ret) { - LONG l, d; + HRESULT hres; + + if(*ctx->ptr == '0') { + LONG d, l = 0; + + ctx->ptr++; - l = *ctx->ptr++ - '0'; - if(!l) { if(*ctx->ptr == 'x' || *ctx->ptr == 'X') { if(++ctx->ptr == ctx->end) { ERR("unexpected end of file\n"); @@ -546,7 +546,13 @@ static BOOL parse_numeric_literal(parser_ctx_t *ctx, double *ret) } } - return parse_double_literal(ctx, l, ret); + hres = parse_decimal(&ctx->ptr, ctx->end, ret); + if(FAILED(hres)) { + lex_error(ctx, hres); + return FALSE; + } + + return TRUE; } static int next_token(parser_ctx_t *ctx, void *lval) @@ -599,8 +605,12 @@ static int next_token(parser_ctx_t *ctx, void *lval) case '.': if(++ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { double n; - if(!parse_double_literal(ctx, 0, &n)) + HRESULT hres; + hres = parse_decimal(&ctx->ptr, ctx->end, &n); + if(FAILED(hres)) { + lex_error(ctx, hres); return -1; + } *(literal_t**)lval = new_double_literal(ctx, n); return tNumericLiteral; }

1 0

Hugh McMaster : wineconsole: Improve a user dialog resource string.
by Alexandre Julliard 27 Jan '16

27 Jan '16

1 0

Hugh McMaster : kernel32/tests: Add tests for the TRUE pathway of GetCurrentConsoleFont.
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: c6e10496b3106a5b4203243f473b400a77e51d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6e10496b3106a5b4203243f4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jan 27 14:55:17 2016 +1100 kernel32/tests: Add tests for the TRUE pathway of GetCurrentConsoleFont. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 43a4b75..4dca17d 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2606,6 +2606,14 @@ static void test_GetCurrentConsoleFont(HANDLE std_output) memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); SetLastError(0xdeadbeef); + ret = GetCurrentConsoleFont(NULL, TRUE, &cfi); + ok(!ret, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(!cfi.dwFontSize.X, "got %d, expected 0\n", cfi.dwFontSize.X); + ok(!cfi.dwFontSize.Y, "got %d, expected 0\n", cfi.dwFontSize.Y); + + memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); + SetLastError(0xdeadbeef); ret = GetCurrentConsoleFont(GetStdHandle(STD_INPUT_HANDLE), FALSE, &cfi); ok(!ret, "got %d, expected 0\n", ret); ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); @@ -2614,6 +2622,14 @@ static void test_GetCurrentConsoleFont(HANDLE std_output) memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); SetLastError(0xdeadbeef); + ret = GetCurrentConsoleFont(GetStdHandle(STD_INPUT_HANDLE), TRUE, &cfi); + ok(!ret, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(!cfi.dwFontSize.X, "got %d, expected 0\n", cfi.dwFontSize.X); + ok(!cfi.dwFontSize.Y, "got %d, expected 0\n", cfi.dwFontSize.Y); + + memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); + SetLastError(0xdeadbeef); ret = GetCurrentConsoleFont(std_output, FALSE, &cfi); ok(ret, "got %d, expected non-zero\n", ret); ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); @@ -2625,6 +2641,16 @@ static void test_GetCurrentConsoleFont(HANDLE std_output) "got %d, expected %d\n", cfi.dwFontSize.X, width); ok(cfi.dwFontSize.Y == height || cfi.dwFontSize.Y == c.Y /* Vista and higher */, "got %d, expected %d\n", cfi.dwFontSize.Y, height); + + memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); + SetLastError(0xdeadbeef); + ret = GetCurrentConsoleFont(std_output, TRUE, &cfi); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(cfi.dwFontSize.X == csbi.dwMaximumWindowSize.X, + "got %d, expected %d\n", cfi.dwFontSize.X, csbi.dwMaximumWindowSize.X); + ok(cfi.dwFontSize.Y == csbi.dwMaximumWindowSize.Y, + "got %d, expected %d\n", cfi.dwFontSize.Y, csbi.dwMaximumWindowSize.Y); } static void test_GetConsoleFontSize(HANDLE std_output)

1 0

Hugh McMaster : kernel32: Implement the TRUE pathway of GetCurrentConsoleFont.
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: 2c5756347bc4e9abcb656a7d1e001f60415b78b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5756347bc4e9abcb656a7d1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jan 27 14:55:16 2016 +1100 kernel32: Implement the TRUE pathway of GetCurrentConsoleFont. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 4767fb2..b86cd8e 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3267,20 +3267,21 @@ BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, LPCONSOLE_FON memset(fontinfo, 0, sizeof(CONSOLE_FONT_INFO)); - if (maxwindow) - { - FIXME(": (%p, %d, %p) stub!\n", hConsole, maxwindow, fontinfo); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; - } - SERVER_START_REQ(get_console_output_info) { req->handle = console_handle_unmap(hConsole); if ((ret = !wine_server_call_err(req))) { - fontinfo->dwFontSize.X = reply->win_right - reply->win_left + 1; - fontinfo->dwFontSize.Y = reply->win_bottom - reply->win_top + 1; + if (maxwindow) + { + fontinfo->dwFontSize.X = min(reply->width, reply->max_width); + fontinfo->dwFontSize.Y = min(reply->height, reply->max_height); + } + else + { + fontinfo->dwFontSize.X = reply->win_right - reply->win_left + 1; + fontinfo->dwFontSize.Y = reply->win_bottom - reply->win_top + 1; + } } } SERVER_END_REQ;

1 0

Nikolay Sivov : dwrite: Line height/baseline includes lineGap as well.
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: 2c6799dfe21b07886aa07492d2343f5767ec823b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6799dfe21b07886aa07492d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 27 15:57:48 2016 +0300 dwrite: Line height/baseline includes lineGap as well. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 4 +- dlls/dwrite/tests/layout.c | 101 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 94 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 77426e9..9fd4baf 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -892,8 +892,8 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) else IDWriteFontFace_GetMetrics(run->run.fontFace, &fontmetrics); - r->baseline = SCALE_FONT_METRIC(fontmetrics.ascent, run->run.fontEmSize, &fontmetrics); - r->height = SCALE_FONT_METRIC(fontmetrics.ascent + fontmetrics.descent, run->run.fontEmSize, &fontmetrics); + r->baseline = SCALE_FONT_METRIC(fontmetrics.ascent + fontmetrics.lineGap, run->run.fontEmSize, &fontmetrics); + r->height = SCALE_FONT_METRIC(fontmetrics.ascent + fontmetrics.descent + fontmetrics.lineGap, run->run.fontEmSize, &fontmetrics); layout_set_cluster_metrics(layout, r, &cluster); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 7d83c1a..b623414 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -3157,18 +3157,34 @@ static IDWriteFontFace *get_fontface_from_format(IDWriteTextFormat *format) return fontface; } +static void get_enus_string(IDWriteLocalizedStrings *strings, WCHAR *buff, UINT32 size) +{ + UINT32 index; + BOOL exists = FALSE; + HRESULT hr; + + hr = IDWriteLocalizedStrings_FindLocaleName(strings, enusW, &index, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists, "got %d\n", exists); + + hr = IDWriteLocalizedStrings_GetString(strings, index, buff, size); + ok(hr == S_OK, "got 0x%08x\n", hr); +} + static void test_GetLineMetrics(void) { static const WCHAR str3W[] = {'a','\r','b','\n','c','\n','\r','d','\r','\n',0}; static const WCHAR strW[] = {'a','b','c','d',' ',0}; static const WCHAR str2W[] = {'a','b','\r','c','d',0}; + IDWriteFontCollection *syscollection; DWRITE_FONT_METRICS fontmetrics; DWRITE_LINE_METRICS metrics[6]; + UINT32 count, i, familycount; IDWriteTextFormat *format; IDWriteTextLayout *layout; IDWriteFontFace *fontface; IDWriteFactory *factory; - UINT32 count; + WCHAR nameW[256]; HRESULT hr; factory = create_factory(); @@ -3194,16 +3210,83 @@ static void test_GetLineMetrics(void) ok(metrics[0].newlineLength == 0, "got %u\n", metrics[0].newlineLength); ok(metrics[0].isTrimmed == FALSE, "got %d\n", metrics[0].isTrimmed); - /* Tahoma doesn't provide BASE table, so baseline is calculated from font metrics */ + IDWriteTextLayout_Release(layout); + + /* Test line height and baseline calculation */ + hr = IDWriteFactory_GetSystemFontCollection(factory, &syscollection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + familycount = IDWriteFontCollection_GetFontFamilyCount(syscollection); + + for (i = 0; i < familycount; i++) { + static const WCHAR mvboliW[] = {'M','V',' ','B','o','l','i',0}; + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + IDWriteFont *font; + + format = NULL; + layout = NULL; + + hr = IDWriteFontCollection_GetFontFamily(syscollection, i, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STRETCH_NORMAL, + DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "got 0x%08x\n", hr); + + get_enus_string(names, nameW, sizeof(nameW)/sizeof(nameW[0])); + + IDWriteLocalizedStrings_Release(names); + IDWriteFont_Release(font); + + /* This will effectively skip on Vista/2008 only, newer systems work just fine with this font. */ + if (!lstrcmpW(nameW, mvboliW)) { + skip("Skipping line metrics test for %s, gives inconsistent results\n", wine_dbgstr_w(nameW)); + goto cleanup; + } + + IDWriteFontFace_GetMetrics(fontface, &fontmetrics); + hr = IDWriteFactory_CreateTextFormat(factory, nameW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, fontmetrics.designUnitsPerEm, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 5, format, 30000.0f, 100.0f, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(metrics, 0, sizeof(metrics)); + count = 0; + hr = IDWriteTextLayout_GetLineMetrics(layout, metrics, 2, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 1, "got %u\n", count); + + ok(metrics[0].baseline == fontmetrics.ascent + fontmetrics.lineGap, "%s: got %.2f, expected %d, " + "linegap %d\n", wine_dbgstr_w(nameW), metrics[0].baseline, fontmetrics.ascent + fontmetrics.lineGap, + fontmetrics.lineGap); + ok(metrics[0].height == fontmetrics.ascent + fontmetrics.descent + fontmetrics.lineGap, + "%s: got %.2f, expected %d, linegap %d\n", wine_dbgstr_w(nameW), metrics[0].height, + fontmetrics.ascent + fontmetrics.descent + fontmetrics.lineGap, fontmetrics.lineGap); + + cleanup: + if (layout) + IDWriteTextLayout_Release(layout); + if (format) + IDWriteTextFormat_Release(format); + IDWriteFontFace_Release(fontface); + IDWriteFontFamily_Release(family); + } + IDWriteFontCollection_Release(syscollection); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 2048.0f, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + fontface = get_fontface_from_format(format); ok(fontface != NULL, "got %p\n", fontface); - IDWriteFontFace_GetMetrics(fontface, &fontmetrics); - - ok(metrics[0].baseline == fontmetrics.ascent, "got %.2f, expected %d\n", metrics[0].baseline, - fontmetrics.ascent); - ok(metrics[0].height == fontmetrics.ascent + fontmetrics.descent, "got %.2f, expected %d\n", - metrics[0].height, fontmetrics.ascent + fontmetrics.descent); - IDWriteTextLayout_Release(layout); /* force 2 lines */ hr = IDWriteFactory_CreateTextLayout(factory, str2W, 5, format, 10000.0, 1000.0, &layout);

1 0

Nikolay Sivov : dwrite: Fix invalid cluster metrics array index access.
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: 3254a6b2d632050564d7a568963b6f110d68be63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3254a6b2d632050564d7a5689… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 27 15:57:47 2016 +0300 dwrite: Fix invalid cluster metrics array index access. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 0300166..77426e9 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3264,7 +3264,7 @@ static HRESULT WINAPI dwritetextlayout_DetermineMinWidth(IDWriteTextLayout2 *ifa /* Ignore trailing whitespace clusters, in case of single space range will be reduced to empty range, or [start,start+1). */ - while ((end - 1) >= start && This->clustermetrics[end-1].isWhitespace) + while (end > start && This->clustermetrics[end-1].isWhitespace) end--; /* check if cluster range exceeds last minimal width */

1 0

Huw Davies : include: Add IDropSourceNotify.
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: 8f6fde50e809d2b8d905e8bd12d481e4702e22d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6fde50e809d2b8d905e8bd1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 27 13:31:47 2016 +0000 include: Add IDropSourceNotify. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/oleidl.idl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/oleidl.idl b/include/oleidl.idl index 74962ff..9a9d466 100644 --- a/include/oleidl.idl +++ b/include/oleidl.idl @@ -956,3 +956,18 @@ interface IDropTarget : IUnknown [in] POINTL pt, [in, out] DWORD *pdwEffect); } + +/***************************************************************************** + * IDropSourceNotify interface + */ +[ + object, + uuid(0000012b-0000-0000-c000-000000000046), + pointer_default(unique), + local +] +interface IDropSourceNotify : IUnknown +{ + HRESULT DragTargetEnter( [in] HWND hwnd ); + HRESULT DragTargetLeave( void ); +}

1 0

Alistair Leslie-Hughes : olepro32: Add typelib resource.
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: 25aa26e81537f904f0c2c3df7bbedc3d70128616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25aa26e81537f904f0c2c3df7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 27 20:15:21 2016 +1100 olepro32: Add typelib resource. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/olepro32/Makefile.in | 2 + dlls/olepro32/olepro.idl | 270 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 274 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25aa26e81537f904f0c2c…

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2016