April 2019 - Wine-Commits - list.winehq.org

Akihiro Sagawa : user32/tests: Add more margin tests in CJK font case.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 491b06112366736bdb5c750f2c976b1ef1e048f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=491b06112366736bdb5c750f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Apr 20 15:10:17 2019 +0900 user32/tests: Add more margin tests in CJK font case. In WM_SETFONT with a combination of CJK font and non-CJK charset, Unicode version control uses ABC width for margins, while ANSI version one uses EC_USEFONTINFO width for margins. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 82b2cf8..d24573c 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1549,6 +1549,14 @@ static void test_margins_usefontinfo(UINT charset) DeleteObject(hfont); } +static BOOL is_cjk_font(HDC dc) +{ + const DWORD FS_DBCS_MASK = FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB; + FONTSIGNATURE fs; + return (GetTextCharsetInfo(dc, &fs, 0) != DEFAULT_CHARSET && + (fs.fsCsb[0] & FS_DBCS_MASK)); +} + static INT get_cjk_fontinfo_margin(INT width, INT side_bearing) { INT margin; @@ -1587,7 +1595,7 @@ static void test_margins_default(const char* facename, UINT charset) HDC hdc; TEXTMETRICW tm; SIZE size; - BOOL cjk_charset; + BOOL cjk_charset, cjk_font; LOGFONTA lf; HFONT hfont; RECT rect; @@ -1631,7 +1639,9 @@ static void test_margins_default(const char* facename, UINT charset) return; } cjk_charset = is_cjk_charset(hdc); - if (cjk_charset && pGetCharWidthInfo && pGetCharWidthInfo(hdc, &info)) { + cjk_font = is_cjk_font(hdc); + if ((cjk_charset || cjk_font) && + pGetCharWidthInfo && pGetCharWidthInfo(hdc, &info)) { short left, right; left = get_cjk_fontinfo_margin(size.cx, info.lsb); @@ -1654,10 +1664,12 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + todo_wine_if(cjk_font && (charset == GREEK_CHARSET || charset == ANSI_CHARSET)) ok(margins == font_expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(font_expect), LOWORD(font_expect), HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + todo_wine_if(cjk_font && (charset == GREEK_CHARSET || charset == ANSI_CHARSET)) ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); @@ -1677,16 +1689,21 @@ static void test_margins_default(const char* facename, UINT charset) hfont = SelectObject(hdc, hfont); ReleaseDC(hwnd, hdc); } + else + /* we expect EC_USEFONTINFO size */ + font_expect = expect; margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); ok(margins == 0, "got %x\n", margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + todo_wine_if(cjk_font && (charset == GREEK_CHARSET || charset == ANSI_CHARSET)) ok(margins == font_expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(font_expect), LOWORD(font_expect), HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + todo_wine_if(cjk_font && (charset == GREEK_CHARSET || charset == ANSI_CHARSET)) ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); @@ -1791,18 +1808,24 @@ static void test_margins(void) test_margins_default("Tahoma", HANGUL_CHARSET); test_margins_default("Tahoma", CHINESEBIG5_CHARSET); - if (is_font_installed("MS PGothic")) + if (is_font_installed("MS PGothic")) { test_margins_default("MS PGothic", SHIFTJIS_CHARSET); + test_margins_default("MS PGothic", GREEK_CHARSET); + } else skip("MS PGothic is not available, skipping some margin tests\n"); - if (is_font_installed("Ume P Gothic")) + if (is_font_installed("Ume P Gothic")) { test_margins_default("Ume P Gothic", SHIFTJIS_CHARSET); + test_margins_default("Ume P Gothic", GREEK_CHARSET); + } else skip("Ume P Gothic is not available, skipping some margin tests\n"); - if (is_font_installed("SimSun")) + if (is_font_installed("SimSun")) { test_margins_default("SimSun", GB2312_CHARSET); + test_margins_default("SimSun", ANSI_CHARSET); + } else skip("SimSun is not available, skipping some margin tests\n"); }

1 0

Zebediah Figura : regedit: Use an I-beam cursor in the hex edit dialog.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: a41c73d43e39839b2ec38c7801c763bedd4e3d65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a41c73d43e39839b2ec38c78… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 19 23:16:53 2019 -0500 regedit: Use an I-beam cursor in the hex edit dialog. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/hexedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index 951779b..7322a86 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -643,7 +643,7 @@ void HexEdit_Register(void) wndClass.lpfnWndProc = HexEdit_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(HEXEDIT_INFO *); - wndClass.hCursor = NULL; + wndClass.hCursor = LoadCursorW(0, (const WCHAR *)IDC_IBEAM); wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndClass.lpszClassName = szHexEditClass;

1 0

Zebediah Figura : devenum: Fix device and friendly name for video capture devices.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 7c743a492de46347f37815988a7958081507b95a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c743a492de46347f3781598… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 20 13:19:34 2019 -0500 devenum: Fix device and friendly name for video capture devices. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 65c1ccd..3f986f7 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -775,9 +775,9 @@ static void register_vfw_codecs(void) static void register_avicap_devices(void) { static const WCHAR vfwindexW[] = {'V','F','W','I','n','d','e','x',0}; - WCHAR friendlyname[] = {'v','i','d','e','o','0',0}; + WCHAR name[] = {'v','i','d','e','o','0',0}; + WCHAR friendlyname[32], version[32]; IPropertyBag *prop_bag = NULL; - WCHAR name[32], version[32]; REGFILTERPINS2 rgpins = {0}; REGPINTYPES rgtypes; REGFILTER2 rgf; @@ -791,10 +791,11 @@ static void register_avicap_devices(void) for (i = 0; i < 10; ++i) { - if (!capGetDriverDescriptionW(i, name, ARRAY_SIZE(name), version, ARRAY_SIZE(version))) + if (!capGetDriverDescriptionW(i, friendlyname, ARRAY_SIZE(friendlyname), + version, ARRAY_SIZE(version))) break; - friendlyname[5] = '0' + i; + name[5] = '0' + i; hr = register_codec(&CLSID_VideoInputDeviceCategory, name, &CLSID_VfwCapture, friendlyname, &prop_bag);

1 0

Zebediah Figura : qcap: Use the v4l2 device_caps field if supported.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: a16a190f6382071ce264a06ce1bb7295b2448da2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a16a190f6382071ce264a06c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 20 12:06:56 2019 -0500 qcap: Use the v4l2 device_caps field if supported. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 32c2c02..dcc5925 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -577,6 +577,9 @@ Capture * qcap_driver_init( IPin *pOut, USHORT card ) goto error; } + if (caps.capabilities & V4L2_CAP_DEVICE_CAPS) + caps.capabilities = caps.device_caps; + if (!(caps.capabilities & V4L2_CAP_VIDEO_CAPTURE)) { WARN("Device does not support single-planar video capture.\n");

1 0

Akihiro Sagawa : user32: Fix edit control margins in CJK font case.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 1b91c113ae4e96b9a80d8261d5292c75b5cfdbe1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b91c113ae4e96b9a80d8261… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Apr 20 15:10:19 2019 +0900 user32: Fix edit control margins in CJK font case. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 37 +++++++++++++++++++++++++------------ dlls/user32/tests/edit.c | 4 ---- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 52c15aa..24af8ef 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2851,6 +2851,14 @@ static BOOL is_cjk_charset(HDC dc) } } +static BOOL is_cjk_font(HDC dc) +{ + const DWORD FS_DBCS_MASK = FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB; + FONTSIGNATURE fs; + return (GetTextCharsetInfo(dc, &fs, 0) != DEFAULT_CHARSET && + (fs.fsCsb[0] & FS_DBCS_MASK)); +} + static int get_cjk_fontinfo_margin(int width, int side_bearing) { int margin; @@ -2898,7 +2906,8 @@ static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, if (tm.tmPitchAndFamily & ( TMPF_VECTOR | TMPF_TRUETYPE )) { struct char_width_info width_info; - if (is_cjk_charset(dc) && GetCharWidthInfo(dc, &width_info)) + if ((is_cjk_charset(dc) || is_cjk_font(dc)) && + GetCharWidthInfo(dc, &width_info)) { default_left_margin = get_cjk_fontinfo_margin(width, width_info.min_lsb); default_right_margin = get_cjk_fontinfo_margin(width, width_info.min_rsb); @@ -3803,21 +3812,29 @@ static void EDIT_WM_SetFocus(EDITSTATE *es) EDIT_NOTIFY_PARENT(es, EN_SETFOCUS); } -static DWORD get_cjk_font_margins(HDC hdc, BOOL unicode) +static DWORD get_font_margins(HDC hdc, TEXTMETRICW *tm, BOOL unicode) { ABC abc[256]; SHORT left, right; UINT i; - left = right = 0; + if (!(tm->tmPitchAndFamily & (TMPF_VECTOR | TMPF_TRUETYPE))) + return MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO); + if (unicode) { + if (!is_cjk_charset(hdc) && !is_cjk_font(hdc)) + return MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO); if (!GetCharABCWidthsW(hdc, 0, 255, abc)) return 0; } - else { + else if (is_cjk_charset(hdc)) { if (!GetCharABCWidthsA(hdc, 0, 255, abc)) return 0; } + else + return MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO); + + left = right = 0; for (i = 0; i < ARRAY_SIZE(abc); i++) { if (-abc[i].abcA > right) right = -abc[i].abcA; if (-abc[i].abcC > left ) left = -abc[i].abcC; @@ -3840,7 +3857,7 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) HDC dc; HFONT old_font = 0; RECT clientRect; - DWORD cjk_margins = MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO); + DWORD margins; es->font = font; EDIT_InvalidateUniscribeData(es); @@ -3850,8 +3867,7 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) GetTextMetricsW(dc, &tm); es->line_height = tm.tmHeight; es->char_width = tm.tmAveCharWidth; - if ((tm.tmPitchAndFamily & (TMPF_VECTOR | TMPF_TRUETYPE)) && is_cjk_charset(dc)) - cjk_margins = get_cjk_font_margins(dc, es->is_unicode); + margins = get_font_margins(dc, &tm, es->is_unicode); if (font) SelectObject(dc, old_font); ReleaseDC(es->hwndSelf, dc); @@ -3859,12 +3875,9 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) /* Reset the format rect and the margins */ GetClientRect(es->hwndSelf, &clientRect); EDIT_SetRectNP(es, &clientRect); - if (cjk_margins == MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)) - EDIT_EM_SetMargins(es, EC_LEFTMARGIN | EC_RIGHTMARGIN, - EC_USEFONTINFO, EC_USEFONTINFO, FALSE); - else if (cjk_margins) + if (margins) EDIT_EM_SetMargins(es, EC_LEFTMARGIN | EC_RIGHTMARGIN, - LOWORD(cjk_margins), HIWORD(cjk_margins), FALSE); + LOWORD(margins), HIWORD(margins), FALSE); if (es->style & ES_MULTILINE) EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index d24573c..d0374c0 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1664,12 +1664,10 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk_font && (charset == GREEK_CHARSET || charset == ANSI_CHARSET)) ok(margins == font_expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(font_expect), LOWORD(font_expect), HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk_font && (charset == GREEK_CHARSET || charset == ANSI_CHARSET)) ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); @@ -1698,12 +1696,10 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk_font && (charset == GREEK_CHARSET || charset == ANSI_CHARSET)) ok(margins == font_expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(font_expect), LOWORD(font_expect), HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk_font && (charset == GREEK_CHARSET || charset == ANSI_CHARSET)) ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd);

1 0

Henri Verbeet : wined3d: Don't bother allocating "free_occlusion_queries" in context_create().
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 0097e16e861d43a380590aa85aa01d88b4e04ac4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0097e16e861d43a380590aa8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 19 21:22:48 2019 +0430 wined3d: Don't bother allocating "free_occlusion_queries" in context_create(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 476d969..ab5d9c3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1902,12 +1902,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; list_init(&context->timestamp_queries); - context->free_occlusion_query_size = 4; - if (!(context->free_occlusion_queries = heap_calloc(context->free_occlusion_query_size, - sizeof(*context->free_occlusion_queries)))) - goto out; list_init(&context->occlusion_queries); - list_init(&context->fences); list_init(&context->so_statistics_queries); list_init(&context->pipeline_statistics_queries); @@ -1987,7 +1982,6 @@ out: wined3d_release_dc(swapchain->win_handle, context->hdc); device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); - heap_free(context->free_occlusion_queries); heap_free(context->free_timestamp_queries); heap_free(context); return NULL;

1 0

Henri Verbeet : wined3d: Assign "adapter_ops" in wined3d_adapter_init().
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 0146975b825a0fb332ce5d61262252315ba57183 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0146975b825a0fb332ce5d61… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 19 21:22:46 2019 +0430 wined3d: Assign "adapter_ops" in wined3d_adapter_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 3 +-- dlls/wined3d/adapter_vk.c | 3 +-- dlls/wined3d/directx.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index d841420..0f554e7 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4570,7 +4570,7 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, TRACE("adapter_gl %p, ordinal %u, wined3d_creation_flags %#x.\n", adapter_gl, ordinal, wined3d_creation_flags); - if (!wined3d_adapter_init(&adapter_gl->a, ordinal)) + if (!wined3d_adapter_init(&adapter_gl->a, ordinal, &wined3d_adapter_gl_ops)) return FALSE; /* Dynamically load all GL core functions */ @@ -4660,7 +4660,6 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); wined3d_adapter_init_ffp_attrib_ops(&adapter_gl->a); - adapter_gl->a.adapter_ops = &wined3d_adapter_gl_ops; return TRUE; } diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 4c01fb8..464f791 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -648,7 +648,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, TRACE("adapter_vk %p, ordinal %u, wined3d_creation_flags %#x.\n", adapter_vk, ordinal, wined3d_creation_flags); - if (!wined3d_adapter_init(adapter, ordinal)) + if (!wined3d_adapter_init(adapter, ordinal, &wined3d_adapter_vk_ops)) return FALSE; if (!wined3d_init_vulkan(vk_info)) @@ -687,7 +687,6 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, adapter->vertex_pipe = &none_vertex_pipe; adapter->fragment_pipe = &none_fragment_pipe; adapter->shader_backend = &none_shader_backend; - adapter->adapter_ops = &wined3d_adapter_vk_ops; adapter->d3d_info.wined3d_creation_flags = wined3d_creation_flags; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3c89fad..cacd9ac 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2284,7 +2284,7 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); - if (!wined3d_adapter_init(adapter, ordinal)) + if (!wined3d_adapter_init(adapter, ordinal, &wined3d_adapter_no3d_ops)) { heap_free(adapter); return NULL; @@ -2299,7 +2299,6 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, adapter->vertex_pipe = &none_vertex_pipe; adapter->fragment_pipe = &none_fragment_pipe; adapter->shader_backend = &none_shader_backend; - adapter->adapter_ops = &wined3d_adapter_no3d_ops; wined3d_adapter_no3d_init_d3d_info(adapter, wined3d_creation_flags); @@ -2308,7 +2307,8 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, return adapter; } -BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal) +BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, + const struct wined3d_adapter_ops *adapter_ops) { DISPLAY_DEVICEW display_device; @@ -2331,6 +2331,7 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal) memset(&adapter->device_uuid, 0, sizeof(adapter->device_uuid)); adapter->formats = NULL; + adapter->adapter_ops = adapter_ops; return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 15876e4..cf46f80 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2730,7 +2730,8 @@ struct wined3d_adapter const struct wined3d_adapter_ops *adapter_ops; }; -BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal) DECLSPEC_HIDDEN; +BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, + const struct wined3d_adapter_ops *adapter_ops) DECLSPEC_HIDDEN; void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; struct wined3d_adapter_gl

1 0

Henri Verbeet : wined3d: Don't bother allocating "free_timestamp_queries" in context_create().
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 9d7d68747b06a03893df99c4beea36b762508603 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d7d68747b06a03893df99c4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 19 21:22:49 2019 +0430 wined3d: Don't bother allocating "free_timestamp_queries" in context_create(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ab5d9c3..f4179d7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1896,12 +1896,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (!(context = heap_alloc_zero(sizeof(*context)))) return NULL; - context->free_timestamp_query_size = 4; - if (!(context->free_timestamp_queries = heap_calloc(context->free_timestamp_query_size, - sizeof(*context->free_timestamp_queries)))) - goto out; list_init(&context->timestamp_queries); - list_init(&context->occlusion_queries); list_init(&context->fences); list_init(&context->so_statistics_queries); @@ -1982,7 +1977,6 @@ out: wined3d_release_dc(swapchain->win_handle, context->hdc); device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); - heap_free(context->free_timestamp_queries); heap_free(context); return NULL; }

1 0

Henri Verbeet : wined3d: Don't bother allocating "free_fences" in context_create().
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 349136aba00c208946c3151e2e6ec1de52b97ac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=349136aba00c208946c3151e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 19 21:22:47 2019 +0430 wined3d: Don't bother allocating "free_fences" in context_create(). We use "free_fences" with wined3d_array_reserve(), which handles NULL fine. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 425721a..476d969 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1908,13 +1908,8 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; list_init(&context->occlusion_queries); - context->free_fence_size = 4; - if (!(context->free_fences = heap_calloc(context->free_fence_size, sizeof(*context->free_fences)))) - goto out; list_init(&context->fences); - list_init(&context->so_statistics_queries); - list_init(&context->pipeline_statistics_queries); list_init(&context->fbo_list); @@ -1992,7 +1987,6 @@ out: wined3d_release_dc(swapchain->win_handle, context->hdc); device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); - heap_free(context->free_fences); heap_free(context->free_occlusion_queries); heap_free(context->free_timestamp_queries); heap_free(context);

1 0

Henri Verbeet : wined3d: Pass a wined3d_adapter_gl structure to wined3d_adapter_gl_init().
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 24b0a027ab32a359d2d5a5d5968501bd845e47a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24b0a027ab32a359d2d5a5d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 19 21:22:45 2019 +0430 wined3d: Pass a wined3d_adapter_gl structure to wined3d_adapter_gl_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 36c29c9..d841420 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4554,7 +4554,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_check_format, }; -static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, +static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, unsigned int ordinal, unsigned int wined3d_creation_flags) { static const DWORD supported_gl_versions[] = @@ -4563,19 +4563,16 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, MAKEDWORD_VERSION(3, 2), MAKEDWORD_VERSION(1, 0), }; - struct wined3d_gl_info *gl_info = &adapter->gl_info; + struct wined3d_gl_info *gl_info = &adapter_gl->a.gl_info; struct wined3d_caps_gl_ctx caps_gl_ctx = {0}; - struct wined3d_adapter_gl *adapter_gl; unsigned int i; - TRACE("adapter %p, ordinal %u, wined3d_creation_flags %#x.\n", - adapter, ordinal, wined3d_creation_flags); + TRACE("adapter_gl %p, ordinal %u, wined3d_creation_flags %#x.\n", + adapter_gl, ordinal, wined3d_creation_flags); - if (!wined3d_adapter_init(adapter, ordinal)) + if (!wined3d_adapter_init(&adapter_gl->a, ordinal)) return FALSE; - adapter_gl = wined3d_adapter_gl(adapter); - /* Dynamically load all GL core functions */ #ifdef USE_WIN32_OPENGL { @@ -4601,9 +4598,9 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, glEnableWINE = gl_info->gl_ops.gl.p_glEnable; glDisableWINE = gl_info->gl_ops.gl.p_glDisable; - if (!wined3d_caps_gl_ctx_create(adapter, &caps_gl_ctx)) + if (!wined3d_caps_gl_ctx_create(&adapter_gl->a, &caps_gl_ctx)) { - ERR("Failed to get a GL context for adapter %p.\n", adapter); + ERR("Failed to get a GL context for adapter %p.\n", adapter_gl); return FALSE; } @@ -4630,9 +4627,9 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, supported_gl_versions[i] >> 16, supported_gl_versions[i] & 0xffff); } - if (!wined3d_adapter_init_gl_caps(adapter, &caps_gl_ctx, wined3d_creation_flags)) + if (!wined3d_adapter_init_gl_caps(&adapter_gl->a, &caps_gl_ctx, wined3d_creation_flags)) { - ERR("Failed to initialize GL caps for adapter %p.\n", adapter); + ERR("Failed to initialize GL caps for adapter %p.\n", adapter_gl); wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); return FALSE; } @@ -4652,7 +4649,7 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, return FALSE; } - if (!wined3d_adapter_gl_init_format_info(adapter, &caps_gl_ctx)) + if (!wined3d_adapter_gl_init_format_info(&adapter_gl->a, &caps_gl_ctx)) { ERR("Failed to initialize GL format info.\n"); wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); @@ -4662,8 +4659,8 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); - wined3d_adapter_init_ffp_attrib_ops(adapter); - adapter->adapter_ops = &wined3d_adapter_gl_ops; + wined3d_adapter_init_ffp_attrib_ops(&adapter_gl->a); + adapter_gl->a.adapter_ops = &wined3d_adapter_gl_ops; return TRUE; } @@ -4675,7 +4672,7 @@ struct wined3d_adapter *wined3d_adapter_gl_create(unsigned int ordinal, unsigned if (!(adapter = heap_alloc_zero(sizeof(*adapter)))) return NULL; - if (!wined3d_adapter_gl_init(&adapter->a, ordinal, wined3d_creation_flags)) + if (!wined3d_adapter_gl_init(adapter, ordinal, wined3d_creation_flags)) { heap_free(adapter); return NULL;

1 0

Jacek Caban : mshtml: Pass style value as nsAString to set_nsstyle_property.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 6b74a99da28024cd9a412681a5c8d956358613ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b74a99da28024cd9a412681… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 19 16:36:44 2019 +0200 mshtml: Pass style value as nsAString to set_nsstyle_property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 003ef8f..c205d67 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -913,17 +913,15 @@ static LPWSTR fix_url_value(LPCWSTR val) return ret; } -static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, const WCHAR *value) +static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, const nsAString *value) { - nsAString str_name, str_value, str_empty; + nsAString str_name, str_empty; nsresult nsres; nsAString_InitDepend(&str_name, style_tbl[sid].name); - nsAString_InitDepend(&str_value, value); nsAString_InitDepend(&str_empty, emptyW); - nsres = nsIDOMCSSStyleDeclaration_SetProperty(nsstyle, &str_name, &str_value, &str_empty); + nsres = nsIDOMCSSStyleDeclaration_SetProperty(nsstyle, &str_name, value, &str_empty); nsAString_Finish(&str_name); - nsAString_Finish(&str_value); nsAString_Finish(&str_empty); if(NS_FAILED(nsres)) WARN("SetProperty failed: %08x\n", nsres); @@ -969,6 +967,7 @@ static HRESULT var_to_styleval(CSSStyle *style, const VARIANT *v, const style_tb static inline HRESULT set_style_property(CSSStyle *style, styleid_t sid, const WCHAR *value) { + nsAString value_str; WCHAR *val = NULL; HRESULT hres; @@ -983,7 +982,9 @@ static inline HRESULT set_style_property(CSSStyle *style, styleid_t sid, const W } if(!*iter) { WARN("invalid value %s\n", debugstr_w(value)); - set_nsstyle_property(style->nsstyle, sid, emptyW); + nsAString_InitDepend(&value_str, emptyW); + set_nsstyle_property(style->nsstyle, sid, &value_str); + nsAString_Finish(&value_str); return E_INVALIDARG; } } @@ -994,7 +995,9 @@ static inline HRESULT set_style_property(CSSStyle *style, styleid_t sid, const W val = fix_url_value(value); } - hres = set_nsstyle_property(style->nsstyle, sid, val ? val : value); + nsAString_InitDepend(&value_str, val ? val : value); + hres = set_nsstyle_property(style->nsstyle, sid, &value_str); + nsAString_Finish(&value_str); heap_free(val); return hres; } @@ -10291,13 +10294,16 @@ HRESULT get_elem_style(HTMLElement *elem, styleid_t styleid, BSTR *ret) HRESULT set_elem_style(HTMLElement *elem, styleid_t styleid, const WCHAR *val) { nsIDOMCSSStyleDeclaration *style; + nsAString value_str; HRESULT hres; hres = get_style_from_elem(elem, &style); if(FAILED(hres)) return hres; - hres = set_nsstyle_property(style, styleid, val); + nsAString_InitDepend(&value_str, val); + hres = set_nsstyle_property(style, styleid, &value_str); + nsAString_Finish(&value_str); nsIDOMCSSStyleDeclaration_Release(style); return hres; }

1 0

Andreas Maier : jscript_test: Simple test for Enumerator().
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 6ab3ed7ce43144c9ac8d308e35f3366d34250cf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ab3ed7ce43144c9ac8d308e… Author: Andreas Maier <staubim(a)quantentunnel.de> Date: Thu Apr 18 21:08:41 2019 +0200 jscript_test: Simple test for Enumerator(). Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/api.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 38b2e66..78c0958 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -58,6 +58,8 @@ testNoEnumerables("Function"); testNoEnumerables("Function.prototype"); testNoEnumerables("testNoEnumerates"); testNoEnumerables("VBArray"); +testNoEnumerables("new Enumerator([])"); +testNoEnumerables("Enumerator([])"); ok(Object.propertyIsEnumerable("prototype") === false, "Object.prototype is enumerable"); ok(Math.propertyIsEnumerable("E") === false, "Math.E is enumerable"); @@ -341,6 +343,8 @@ ok(tmp === "[object Object]", "toString.call(this) = " + tmp); ok(tmp === "[object Object]", "toString.call(arguments) = " + tmp); tmp = Object.prototype.toString.call(new VBArray(createArray())); ok(tmp === "[object Object]", "toString.call(new VBArray()) = " + tmp); +(tmp = new Enumerator([])).f = Object.prototype.toString; +ok(tmp.f() === "[object Object]", "tmp.f() = " + tmp.f()); function TSTestConstr() {} TSTestConstr.prototype = { toString: function() { return "test"; } };

1 0

Andreas Maier : jscript: Stub Enumerator object.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 6630bc4096870d1586e6d431b93dd74eb7ce017d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6630bc4096870d1586e6d431… Author: Andreas Maier <staubim(a)quantentunnel.de> Date: Thu Apr 18 21:08:40 2019 +0200 jscript: Stub Enumerator object. Enumerator is an MS extension. It's needed to succeed VyChat219.msi installation. Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> 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/enumerator.c | 190 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/global.c | 17 +++-- dlls/jscript/jscript.h | 3 + 4 files changed, 203 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 34ed193..1cc58a5 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ decode.c \ dispex.c \ engine.c \ + enumerator.c \ error.c \ function.c \ global.c \ diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c new file mode 100644 index 0000000..aa7737a --- /dev/null +++ b/dlls/jscript/enumerator.c @@ -0,0 +1,190 @@ +/* + * Copyright 2019 Andreas Maier + * + * 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 <assert.h> + +#include "jscript.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +typedef struct { + jsdisp_t dispex; +} EnumeratorInstance; + +static const WCHAR atEndW[] = {'a','t','E','n','d',0}; +static const WCHAR itemW[] = {'i','t','e','m',0}; +static const WCHAR moveFirstW[] = {'m','o','v','e','F','i','r','s','t',0}; +static const WCHAR moveNextW[] = {'m','o','v','e','N','e','x','t',0}; + +static void Enumerator_destructor(jsdisp_t *dispex) +{ + TRACE("Enumerator_destructor\n"); + + heap_free(dispex); +} + +HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + TRACE("Enumerator_atEnd\n"); + + return E_NOTIMPL; +} + +HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + TRACE("Enumerator_item\n"); + + return E_NOTIMPL; +} + +HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + TRACE("Enumerator_moveFirst\n"); + + return E_NOTIMPL; +} + +HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + TRACE("Enumerator_moveNext\n"); + + return E_NOTIMPL; +} + +static const builtin_prop_t Enumerator_props[] = { + {atEndW, Enumerator_atEnd, PROPF_METHOD}, + {itemW, Enumerator_item, PROPF_METHOD}, + {moveFirstW, Enumerator_moveFirst, PROPF_METHOD}, + {moveNextW, Enumerator_moveNext, PROPF_METHOD}, +}; + +static const builtin_info_t Enumerator_info = { + JSCLASS_OBJECT, + {NULL, NULL, 0}, + ARRAY_SIZE(Enumerator_props), + Enumerator_props, + NULL, + NULL +}; + +static const builtin_info_t EnumeratorInst_info = { + JSCLASS_OBJECT, + {NULL, NULL, 0, NULL}, + 0, + NULL, + Enumerator_destructor, + NULL +}; + +static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + jsdisp_t *obj; + HRESULT hres; + + TRACE("EnumeratorConstr_value\n"); + + switch(flags) { + case DISPATCH_CONSTRUCT: { + if (argc != 1) + return throw_syntax_error(ctx, JS_E_MISSING_ARG, NULL); + + hres = create_enumerator(ctx, &argv[0], &obj); + if(FAILED(hres)) + return hres; + + *r = jsval_obj(obj); + break; + } + default: + FIXME("unimplemented flags: %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; +} + +static HRESULT alloc_enumerator(script_ctx_t *ctx, jsdisp_t *object_prototype, EnumeratorInstance **ret) +{ + EnumeratorInstance *enumerator; + HRESULT hres; + + enumerator = heap_alloc_zero(sizeof(EnumeratorInstance)); + if(!enumerator) + return E_OUTOFMEMORY; + + if(object_prototype) + hres = init_dispex(&enumerator->dispex, ctx, &Enumerator_info, object_prototype); + else + hres = init_dispex_from_constr(&enumerator->dispex, ctx, &EnumeratorInst_info, + ctx->enumerator_constr); + + if(FAILED(hres)) { + heap_free(enumerator); + return hres; + } + + *ret = enumerator; + return S_OK; +} + +static const builtin_info_t EnumeratorConstr_info = { + JSCLASS_FUNCTION, + DEFAULT_FUNCTION_VALUE, + 0, + NULL, + NULL, + NULL +}; + +HRESULT create_enumerator_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp_t **ret) +{ + EnumeratorInstance *enumerator; + HRESULT hres; + static const WCHAR EnumeratorW[] = {'E','n','u','m','e','r','a','t','o','r',0}; + + hres = alloc_enumerator(ctx, object_prototype, &enumerator); + if(FAILED(hres)) + return hres; + + hres = create_builtin_constructor(ctx, EnumeratorConstr_value, + EnumeratorW, &EnumeratorConstr_info, + PROPF_CONSTR|7, &enumerator->dispex, ret); + jsdisp_release(&enumerator->dispex); + + return hres; +} + +HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **ret) +{ + EnumeratorInstance *enumerator; + HRESULT hres; + + hres = alloc_enumerator(ctx, NULL, &enumerator); + if(FAILED(hres)) + return hres; + + *ret = &enumerator->dispex; + return S_OK; +} diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 33de641..92b146c 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -113,13 +113,6 @@ static WCHAR int_to_char(int i) return 'A'+i-10; } -static HRESULT JSGlobal_Enumerator(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -942,7 +935,6 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W static const builtin_prop_t JSGlobal_props[] = { {CollectGarbageW, JSGlobal_CollectGarbage, PROPF_METHOD}, - {EnumeratorW, JSGlobal_Enumerator, PROPF_METHOD|7}, {_GetObjectW, JSGlobal_GetObject, PROPF_METHOD|2}, {ScriptEngineW, JSGlobal_ScriptEngine, PROPF_METHOD}, {ScriptEngineBuildVersionW, JSGlobal_ScriptEngineBuildVersion, PROPF_METHOD}, @@ -1019,6 +1011,15 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; + hres = create_enumerator_constr(ctx, object_prototype, &ctx->enumerator_constr); + if(FAILED(hres)) + return hres; + + hres = jsdisp_define_data_property(ctx->global, EnumeratorW, PROPF_WRITABLE, + jsval_obj(ctx->enumerator_constr)); + if(FAILED(hres)) + return hres; + hres = init_error_constr(ctx, object_prototype); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 2af5b59..baebcc4 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -326,6 +326,7 @@ 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; +HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **ret) DECLSPEC_HIDDEN; typedef enum { NO_HINT, @@ -436,6 +437,7 @@ struct _script_ctx_t { jsdisp_t *array_constr; jsdisp_t *bool_constr; jsdisp_t *date_constr; + jsdisp_t *enumerator_constr; jsdisp_t *error_constr; jsdisp_t *eval_error_constr; jsdisp_t *range_error_constr; @@ -468,6 +470,7 @@ HRESULT create_array_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_bool_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_date_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT init_error_constr(script_ctx_t*,jsdisp_t*) DECLSPEC_HIDDEN; +HRESULT create_enumerator_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_number_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_object_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_regexp_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN;

1 0

Akihiro Sagawa : user32/tests: Use calculated WM_SETFONT margins in the CJK case.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: c8c29eebc7e28e0357e6e26d396a0e7b37df7877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8c29eebc7e28e0357e6e26d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 18 23:51:01 2019 +0900 user32/tests: Use calculated WM_SETFONT margins in the CJK case. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 52 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index a3a8192..4c83d50 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1559,6 +1559,28 @@ static INT get_cjk_fontinfo_margin(INT width, INT side_bearing) return margin; } +static DWORD get_cjk_font_margins(HDC hdc, BOOL unicode) +{ + ABC abc[256]; + SHORT left, right; + UINT i; + + left = right = 0; + if (unicode) { + if (!GetCharABCWidthsW(hdc, 0, 255, abc)) + return 0; + } + else { + if (!GetCharABCWidthsA(hdc, 0, 255, abc)) + return 0; + } + for (i = 0; i < ARRAY_SIZE(abc); i++) { + if (-abc[i].abcA > right) right = -abc[i].abcA; + if (-abc[i].abcC > left) left = -abc[i].abcC; + } + return MAKELONG(left, right); +} + static void test_margins_default(const char* facename, UINT charset) { HWND hwnd; @@ -1569,7 +1591,7 @@ static void test_margins_default(const char* facename, UINT charset) LOGFONTA lf; HFONT hfont; RECT rect; - INT margins, expect; + INT margins, expect, font_expect; const UINT small_margins = MAKELONG(1, 5); const WCHAR EditW[] = {'E','d','i','t',0}, strW[] = {'W',0}; struct char_width_info { @@ -1615,9 +1637,14 @@ static void test_margins_default(const char* facename, UINT charset) left = get_cjk_fontinfo_margin(size.cx, info.lsb); right = get_cjk_fontinfo_margin(size.cx, info.rsb); expect = MAKELONG(left, right); + + font_expect = get_cjk_font_margins(hdc, TRUE); + if (!font_expect) + /* In this case, margins aren't updated */ + font_expect = small_margins; } else - expect = MAKELONG(size.cx / 2, size.cx / 2); + font_expect = expect = MAKELONG(size.cx / 2, size.cx / 2); hfont = SelectObject(hdc, hfont); ReleaseDC(hwnd, hdc); @@ -1627,12 +1654,11 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk_charset) - ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); + todo_wine_if(cjk_charset) + ok(margins == font_expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(font_expect), LOWORD(font_expect), HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); @@ -1642,17 +1668,27 @@ static void test_margins_default(const char* facename, UINT charset) GetClientRect(hwnd, &rect); ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + if (cjk_charset) { + hdc = GetDC(hwnd); + hfont = SelectObject(hdc, hfont); + font_expect = get_cjk_font_margins(hdc, FALSE); + if (!font_expect) + /* In this case, margins aren't updated */ + font_expect = small_margins; + hfont = SelectObject(hdc, hfont); + ReleaseDC(hwnd, hdc); + } + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); ok(margins == 0, "got %x\n", margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk_charset) - ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); + todo_wine_if(cjk_charset) + ok(margins == font_expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(font_expect), LOWORD(font_expect), HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd);

1 0

Akihiro Sagawa : user32/tests: Remove win9x workarounds in margin tests.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 6b2c2d39bb40b68555af46b53d09a1d80a2fa288 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b2c2d39bb40b68555af46b5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 18 23:50:59 2019 +0900 user32/tests: Remove win9x workarounds in margin tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index a296bc8..a3a8192 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1808,39 +1808,39 @@ static void test_margins_font_change(void) SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0,0)); SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 0 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ + ok(LOWORD(margins) == 0, "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 0 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ + ok(HIWORD(margins) == 0, "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,0)); SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 0 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ + ok(HIWORD(margins) == 0, "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,1)); SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 1 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ + ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO,EC_USEFONTINFO)); margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 1 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ + ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1 || broken(LOWORD(margins) != 1 && LOWORD(margins) != LOWORD(font_margins)), /* win95 */ + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 1 || broken(HIWORD(margins) != 1 && HIWORD(margins) != HIWORD(font_margins)), /* win95 */ + ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); /* Above a certain size threshold then the margin is updated */ @@ -1864,7 +1864,7 @@ static void test_margins_font_change(void) ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) != LOWORD(font_margins) || broken(LOWORD(margins) == LOWORD(font_margins)), /* win98 */ + ok(LOWORD(margins) != LOWORD(font_margins), "got %d\n", LOWORD(margins)); ok(HIWORD(margins) != HIWORD(font_margins), "got %d\n", HIWORD(margins));

1 0

Akihiro Sagawa : user32/tests: Use GREEK_CHARSET in margin tests to avoid Associated Charset feature.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: a4560e01358894cdfdc81ccab2a2874056b4269d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4560e01358894cdfdc81cca… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 18 23:50:57 2019 +0900 user32/tests: Use GREEK_CHARSET in margin tests to avoid Associated Charset feature. Due to Associated Charset feature, we currently use Chinese typeface in the test in zh_CN locale. For consistency with another locale, we should avoid the fature in tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index e8ea774..a296bc8 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1793,7 +1793,7 @@ static void test_margins_font_change(void) memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Arial"); lf.lfHeight = 16; - lf.lfCharSet = DEFAULT_CHARSET; + lf.lfCharSet = GREEK_CHARSET; /* to avoid associated charset feature */ hfont = CreateFontIndirectA(&lf); lf.lfHeight = 30; hfont2 = CreateFontIndirectA(&lf);

1 0

Nikolay Sivov : ntdll: Add NtSuspendProcess()/NtResumeProcess() implementation.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 19bf03ed4b48b398236c8a998394089c93b50891 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19bf03ed4b48b398236c8a99… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 18 10:41:48 2019 +0300 ntdll: Add NtSuspendProcess()/NtResumeProcess() implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 24 +++++-- dlls/ntdll/tests/exception.c | 151 ++++++++++++++++++++++++++++++++++++++++- include/wine/server_protocol.h | 32 ++++++++- server/process.c | 38 +++++++++++ server/protocol.def | 12 ++++ server/request.h | 8 +++ server/thread.c | 4 +- server/thread.h | 2 + server/trace.c | 16 +++++ 9 files changed, 278 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=19bf03ed4b48b398236c…

1 0

Akihiro Sagawa : user32: Implement WM_SETFONT margins in the CJK case.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: f3dc99c8b1091789034dea9d91ec95869b14212b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3dc99c8b1091789034dea9d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 18 23:51:02 2019 +0900 user32: Implement WM_SETFONT margins in the CJK case. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46685 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 32 ++++++++++++++++++++++++++++++-- dlls/user32/tests/edit.c | 2 -- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 7eb2214..52c15aa 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3803,6 +3803,27 @@ static void EDIT_WM_SetFocus(EDITSTATE *es) EDIT_NOTIFY_PARENT(es, EN_SETFOCUS); } +static DWORD get_cjk_font_margins(HDC hdc, BOOL unicode) +{ + ABC abc[256]; + SHORT left, right; + UINT i; + + left = right = 0; + if (unicode) { + if (!GetCharABCWidthsW(hdc, 0, 255, abc)) + return 0; + } + else { + if (!GetCharABCWidthsA(hdc, 0, 255, abc)) + return 0; + } + for (i = 0; i < ARRAY_SIZE(abc); i++) { + if (-abc[i].abcA > right) right = -abc[i].abcA; + if (-abc[i].abcC > left ) left = -abc[i].abcC; + } + return MAKELONG(left, right); +} /********************************************************************* * @@ -3819,6 +3840,7 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) HDC dc; HFONT old_font = 0; RECT clientRect; + DWORD cjk_margins = MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO); es->font = font; EDIT_InvalidateUniscribeData(es); @@ -3828,6 +3850,8 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) GetTextMetricsW(dc, &tm); es->line_height = tm.tmHeight; es->char_width = tm.tmAveCharWidth; + if ((tm.tmPitchAndFamily & (TMPF_VECTOR | TMPF_TRUETYPE)) && is_cjk_charset(dc)) + cjk_margins = get_cjk_font_margins(dc, es->is_unicode); if (font) SelectObject(dc, old_font); ReleaseDC(es->hwndSelf, dc); @@ -3835,8 +3859,12 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) /* Reset the format rect and the margins */ GetClientRect(es->hwndSelf, &clientRect); EDIT_SetRectNP(es, &clientRect); - EDIT_EM_SetMargins(es, EC_LEFTMARGIN | EC_RIGHTMARGIN, - EC_USEFONTINFO, EC_USEFONTINFO, FALSE); + if (cjk_margins == MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)) + EDIT_EM_SetMargins(es, EC_LEFTMARGIN | EC_RIGHTMARGIN, + EC_USEFONTINFO, EC_USEFONTINFO, FALSE); + else if (cjk_margins) + EDIT_EM_SetMargins(es, EC_LEFTMARGIN | EC_RIGHTMARGIN, + LOWORD(cjk_margins), HIWORD(cjk_margins), FALSE); if (es->style & ES_MULTILINE) EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 4c83d50..82b2cf8 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1654,7 +1654,6 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk_charset) ok(margins == font_expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(font_expect), LOWORD(font_expect), HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); @@ -1684,7 +1683,6 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk_charset) ok(margins == font_expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(font_expect), LOWORD(font_expect), HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO));

1 0

Jacek Caban : mshtml: Use nsAString in fix_px_value.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 983774e3fa2ee64db3db72746eb4c32930211e06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=983774e3fa2ee64db3db7274… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 19 16:36:55 2019 +0200 mshtml: Use nsAString in fix_px_value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 22 +++++++++++++--------- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 5 +++++ 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index c205d67..aa065dd 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -858,9 +858,12 @@ static const style_tbl_entry_t *lookup_style_tbl(const WCHAR *name) return NULL; } -static LPWSTR fix_px_value(LPCWSTR val) +static void fix_px_value(nsAString *nsstr) { - LPCWSTR ptr = val; + const WCHAR *val, *ptr; + + nsAString_GetData(nsstr, &val); + ptr = val; while(*ptr) { while(*ptr && isspaceW(*ptr)) @@ -884,14 +887,14 @@ static LPWSTR fix_px_value(LPCWSTR val) TRACE("fixed %s -> %s\n", debugstr_w(val), debugstr_w(ret)); - return ret; + nsAString_SetData(nsstr, ret); + heap_free(ret); + break; } while(*ptr && !isspaceW(*ptr)) ptr++; } - - return NULL; } static LPWSTR fix_url_value(LPCWSTR val) @@ -968,11 +971,12 @@ static HRESULT var_to_styleval(CSSStyle *style, const VARIANT *v, const style_tb static inline HRESULT set_style_property(CSSStyle *style, styleid_t sid, const WCHAR *value) { nsAString value_str; + unsigned flags = 0; WCHAR *val = NULL; HRESULT hres; if(value && *value && dispex_compat_mode(&style->dispex) < COMPAT_MODE_IE9) { - unsigned flags = style_tbl[sid].flags; + flags = style_tbl[sid].flags; if(style_tbl[sid].allowed_values) { const WCHAR **iter; @@ -989,13 +993,13 @@ static inline HRESULT set_style_property(CSSStyle *style, styleid_t sid, const W } } - if(flags & ATTR_FIX_PX) - val = fix_px_value(value); - else if(flags & ATTR_FIX_URL) + if(flags & ATTR_FIX_URL) val = fix_url_value(value); } nsAString_InitDepend(&value_str, val ? val : value); + if(flags & ATTR_FIX_PX) + fix_px_value(&value_str); hres = set_nsstyle_property(style->nsstyle, sid, &value_str); nsAString_Finish(&value_str); heap_free(val); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index fadea6b..a44eaf5 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -968,6 +968,7 @@ void nsACString_Finish(nsACString*) DECLSPEC_HIDDEN; BOOL nsAString_Init(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; void nsAString_InitDepend(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; +void nsAString_SetData(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; UINT32 nsAString_GetData(const nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; void nsAString_Finish(nsAString*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 6aa2812..bcfc437 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -843,6 +843,11 @@ UINT32 nsAString_GetData(const nsAString *str, const PRUnichar **data) return NS_StringGetData(str, data, NULL); } +void nsAString_SetData(nsAString *str, const PRUnichar *data) +{ + NS_StringSetData(str, data, PR_UINT32_MAX); +} + void nsAString_Finish(nsAString *str) { NS_StringContainerFinish(str);

1 0

Józef Kucia : wined3d: Use vkGetDeviceProcAddr() to load Vulkan device functions.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 52aa9d682654df8bac41f938d7d702d00fa7475a URL: https://source.winehq.org/git/wine.git/?a=commit;h=52aa9d682654df8bac41f938… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 19 12:50:13 2019 +0200 wined3d: Use vkGetDeviceProcAddr() to load Vulkan device functions. In order to bypass Vulkan loader trampoline. 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> --- dlls/wined3d/adapter_vk.c | 17 +++++++++++++++-- dlls/wined3d/wined3d_vk.h | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 813a027..e573c66 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -30,6 +30,8 @@ struct wined3d_device_vk VkDevice vk_device; VkQueue vk_queue; + + struct wined3d_vk_info vk_info; }; static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device *device) @@ -220,6 +222,18 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi device_vk->vk_device = vk_device; VK_CALL(vkGetDeviceQueue(vk_device, queue_family_index, 0, &device_vk->vk_queue)); + device_vk->vk_info = *vk_info; +#define LOAD_DEVICE_PFN(name) \ + if (!(device_vk->vk_info.vk_ops.name = (void *)VK_CALL(vkGetDeviceProcAddr(vk_device, #name)))) \ + { \ + WARN("Could not get device proc addr for '" #name "'.\n"); \ + hr = E_FAIL; \ + goto fail; \ + } +#define VK_DEVICE_PFN LOAD_DEVICE_PFN + VK_DEVICE_FUNCS() +#undef VK_DEVICE_PFN + if (FAILED(hr = wined3d_device_init(&device_vk->d, wined3d, adapter->ordinal, device_type, focus_window, flags, surface_alignment, levels, level_count, device_parent))) { @@ -237,9 +251,8 @@ fail: static void adapter_vk_destroy_device(struct wined3d_device *device) { - struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk(device->adapter); struct wined3d_device_vk *device_vk = wined3d_device_vk(device); - const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + const struct wined3d_vk_info *vk_info = &device_vk->vk_info; wined3d_device_cleanup(&device_vk->d); VK_CALL(vkDestroyDevice(device_vk->vk_device, NULL)); diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 10c706a..13e07ab 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -183,9 +183,9 @@ struct vulkan_ops struct wined3d_vk_info { - VkInstance instance; struct vulkan_ops vk_ops; + VkInstance instance; unsigned int api_version; #ifdef USE_WIN32_VULKAN

1 0

Derek Lesho : ntoskrnl.exe: Implement process object constructor.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: e5bbb5e6ca152782e4c43dcb8368fbae87db2322 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5bbb5e6ca152782e4c43dcb… Author: Derek Lesho <dereklesho52(a)gmail.com> Date: Fri Apr 19 18:24:39 2019 +0200 ntoskrnl.exe: Implement process object constructor. Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 +++++++++++++- dlls/ntoskrnl.exe/ntoskrnl_private.h | 4 ++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2c0b51d..d31082b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2451,11 +2451,23 @@ NTSTATUS WINAPI FsRtlRegisterUncProvider(PHANDLE MupHandle, PUNICODE_STRING Redi } +static void *create_process_object( HANDLE handle ) +{ + PEPROCESS process; + + if (!(process = alloc_kernel_object( PsProcessType, handle, sizeof(*process), 0 ))) return NULL; + + process->header.Type = 3; + process->header.WaitListHead.Blink = INVALID_HANDLE_VALUE; /* mark as kernel object */ + return process; +} + static const WCHAR process_type_name[] = {'P','r','o','c','e','s','s',0}; static struct _OBJECT_TYPE process_type = { - process_type_name + process_type_name, + create_process_object }; POBJECT_TYPE PsProcessType = &process_type; diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index f5a7628..5f30961 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -28,6 +28,10 @@ struct _OBJECT_TYPE void (*release)(void*); /* called when the last reference is released */ }; +struct _EPROCESS { + DISPATCHER_HEADER header; +}; + struct _KTHREAD { DISPATCHER_HEADER header;

1 0

Jacek Caban : mshtml: Use variant_to_nsstr in IHTMLDOMNode3:: put_textContent.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: d538e86a60c8c8776dc2989309200d7c3abcb8ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=d538e86a60c8c8776dc29893… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 19 16:37:23 2019 +0200 mshtml: Use variant_to_nsstr in IHTMLDOMNode3::put_textContent. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 7 +------ dlls/mshtml/tests/elements.js | 5 +++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 36cfc80..32f6efd 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1245,12 +1245,7 @@ static HRESULT WINAPI HTMLDOMNode3_put_textContent(IHTMLDOMNode3 *iface, VARIANT TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - if(V_VT(&v) != VT_BSTR) { - FIXME("unsupported argument %s\n", debugstr_variant(&v)); - return E_NOTIMPL; - } - - nsAString_Init(&nsstr, V_BSTR(&v)); + variant_to_nsstr(&v, FALSE, &nsstr); nsres = nsIDOMNode_SetTextContent(This->nsnode, &nsstr); nsAString_Finish(&nsstr); if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 4c647d6..4f0c802 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -77,6 +77,11 @@ function test_textContent() { ok(div.textContent === "", "div.textContent = " + div.textContent); ok(div.childNodes.length === 0, "div.childNodes.length = " + div.childNodes.length); + div.textContent = null; + ok(div.textContent === "", "div.textContent = " + div.textContent); + div.textContent = 11; + ok(div.textContent === "11", "div.textContent = " + div.textContent); + ok(document.textContent === null, "document.textContent = " + document.textContent); next_test();

1 0

Derek Lesho : ntoskrnl.exe: Implement PsLookupProcessByProcessId.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: ae6ae91d1abf87847f2d9218512f29c94a101a76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae6ae91d1abf87847f2d9218… Author: Derek Lesho <dereklesho52(a)gmail.com> Date: Fri Apr 19 18:24:54 2019 +0200 ntoskrnl.exe: Implement PsLookupProcessByProcessId. Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 30 +++++++++++++++++++----------- include/ddk/ntifs.h | 1 + 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d31082b..7f3ca05 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2482,6 +2482,25 @@ PEPROCESS WINAPI IoGetCurrentProcess(void) return NULL; } +/*********************************************************************** + * PsLookupProcessByProcessId (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsLookupProcessByProcessId( HANDLE processid, PEPROCESS *process ) +{ + NTSTATUS status; + HANDLE handle; + + TRACE( "(%p %p)\n", processid, process ); + + if (!(handle = OpenProcess( PROCESS_ALL_ACCESS, FALSE, HandleToUlong(processid) ))) + return STATUS_INVALID_PARAMETER; + + status = ObReferenceObjectByHandle( handle, PROCESS_ALL_ACCESS, PsProcessType, KernelMode, (void**)process, NULL ); + + NtClose( handle ); + return status; +} + static void *create_thread_object( HANDLE handle ) { @@ -3255,17 +3274,6 @@ NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) } /***************************************************** - * PsLookupProcessByProcessId (NTOSKRNL.EXE.@) - */ -NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE processid, PEPROCESS *process) -{ - static int once; - if (!once++) FIXME("(%p %p) stub\n", processid, process); - return STATUS_NOT_IMPLEMENTED; -} - - -/***************************************************** * IoSetThreadHardErrorMode (NTOSKRNL.EXE.@) */ BOOLEAN WINAPI IoSetThreadHardErrorMode(BOOLEAN EnableHardErrors) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 9b57ae7..ec4d1d5 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -131,6 +131,7 @@ typedef struct _FS_FILTER_CALLBACKS BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); +NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE,PEPROCESS*); NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE,PETHREAD*); void WINAPI PsRevertToSelf(void);

1 0

Jacek Caban : mshtml: Return nsAString from var_to_styleval.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: f0497aac0b506951229340c5d256d56b07fe4ea5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0497aac0b506951229340c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 19 16:37:05 2019 +0200 mshtml: Return nsAString from var_to_styleval. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 57 ++++++++++++++++++++++++++--------------------- dlls/mshtml/tests/style.c | 18 ++++++++++++++- 2 files changed, 49 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index aa065dd..2d045db 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -931,41 +931,45 @@ static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_ return map_nsresult(nsres); } -static HRESULT var_to_styleval(CSSStyle *style, const VARIANT *v, const style_tbl_entry_t *entry, WCHAR *buf, const WCHAR **ret) +static HRESULT var_to_styleval(CSSStyle *style, VARIANT *v, const style_tbl_entry_t *entry, nsAString *nsstr) { + unsigned flags = entry && dispex_compat_mode(&style->dispex) < COMPAT_MODE_IE9 + ? entry->flags : 0; + switch(V_VT(v)) { case VT_NULL: - *ret = emptyW; + nsAString_InitDepend(nsstr, NULL); return S_OK; case VT_BSTR: - *ret = V_BSTR(v); - return S_OK; + nsAString_InitDepend(nsstr, V_BSTR(v)); + break; case VT_BSTR|VT_BYREF: - *ret = *V_BSTRREF(v); - return S_OK; + nsAString_InitDepend(nsstr, *V_BSTRREF(v)); + break; case VT_I4: { - unsigned flags = entry && dispex_compat_mode(&style->dispex) < COMPAT_MODE_IE9 ? entry->flags : 0; static const WCHAR formatW[] = {'%','d',0}; static const WCHAR hex_formatW[] = {'#','%','0','6','x',0}; + WCHAR buf[14]; if(flags & ATTR_HEX_INT) wsprintfW(buf, hex_formatW, V_I4(v)); - else if(flags & ATTR_FIX_PX) - wsprintfW(buf, px_formatW, V_I4(v)); else wsprintfW(buf, formatW, V_I4(v)); - *ret = buf; - return S_OK; + nsAString_Init(nsstr, buf); + break; } default: FIXME("not implemented for %s\n", debugstr_variant(v)); return E_NOTIMPL; } + if(flags & ATTR_FIX_PX) + fix_px_value(nsstr); + return S_OK; } static inline HRESULT set_style_property(CSSStyle *style, styleid_t sid, const WCHAR *value) @@ -1008,15 +1012,16 @@ static inline HRESULT set_style_property(CSSStyle *style, styleid_t sid, const W static HRESULT set_style_property_var(CSSStyle *style, styleid_t sid, VARIANT *value) { - const WCHAR *val; - WCHAR buf[14]; + nsAString val; HRESULT hres; - hres = var_to_styleval(style, value, &style_tbl[sid], buf, &val); + hres = var_to_styleval(style, value, &style_tbl[sid], &val); if(FAILED(hres)) return hres; - return set_style_property(style, sid, val); + hres = set_nsstyle_property(style->nsstyle, sid, &val); + nsAString_Finish(&val); + return hres; } static HRESULT get_nsstyle_attr_nsval(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, nsAString *value) @@ -5038,21 +5043,20 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_setProperty(IHTMLCSSStyleDeclarati CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); nsAString priority_str, name_str, value_str; const style_tbl_entry_t *style_entry; - const WCHAR *val; - WCHAR buf[14]; nsresult nsres; HRESULT hres; TRACE("(%p)->(%s %s %s)\n", This, debugstr_w(name), debugstr_variant(value), debugstr_variant(priority)); style_entry = lookup_style_tbl(name); - hres = var_to_styleval(This, value, style_entry, buf, &val); + hres = var_to_styleval(This, value, style_entry, &value_str); if(FAILED(hres)) return hres; if(priority) { if(V_VT(priority) != VT_BSTR) { WARN("invalid priority type %s\n", debugstr_variant(priority)); + nsAString_Finish(&value_str); return S_OK; } nsAString_InitDepend(&priority_str, V_BSTR(priority)); @@ -5061,7 +5065,6 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_setProperty(IHTMLCSSStyleDeclarati } nsAString_InitDepend(&name_str, style_entry ? style_entry->name : name); - nsAString_InitDepend(&value_str, val); nsres = nsIDOMCSSStyleDeclaration_SetProperty(This->nsstyle, &name_str, &value_str, &priority_str); nsAString_Finish(&name_str); nsAString_Finish(&value_str); @@ -5263,18 +5266,19 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_backgroundPosition(IHTMLCSSSty static HRESULT WINAPI HTMLCSSStyleDeclaration_put_backgroundPositionX(IHTMLCSSStyleDeclaration *iface, VARIANT v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - WCHAR buf[14], *pos_val; - nsAString pos_str; + nsAString pos_str, val_str; const WCHAR *val; + WCHAR *pos_val; DWORD val_len; HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - hres = var_to_styleval(This, &v, &style_tbl[STYLEID_BACKGROUND_POSITION_X], buf, &val); + hres = var_to_styleval(This, &v, &style_tbl[STYLEID_BACKGROUND_POSITION_X], &val_str); if(FAILED(hres)) return hres; + nsAString_GetData(&val_str, &val); val_len = val ? strlenW(val) : 0; nsAString_Init(&pos_str, NULL); @@ -5305,6 +5309,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_put_backgroundPositionX(IHTMLCSSSt } } nsAString_Finish(&pos_str); + nsAString_Finish(&val_str); if(FAILED(hres)) return hres; @@ -5356,18 +5361,19 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_backgroundPositionX(IHTMLCSSSt static HRESULT WINAPI HTMLCSSStyleDeclaration_put_backgroundPositionY(IHTMLCSSStyleDeclaration *iface, VARIANT v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - WCHAR buf[14], *pos_val; - nsAString pos_str; + nsAString pos_str, val_str; const WCHAR *val; + WCHAR *pos_val; DWORD val_len; HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - hres = var_to_styleval(This, &v, &style_tbl[STYLEID_BACKGROUND_POSITION], buf, &val); + hres = var_to_styleval(This, &v, &style_tbl[STYLEID_BACKGROUND_POSITION], &val_str); if(FAILED(hres)) return hres; + nsAString_GetData(&val_str, &val); val_len = val ? strlenW(val) : 0; nsAString_Init(&pos_str, NULL); @@ -5401,6 +5407,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_put_backgroundPositionY(IHTMLCSSSt } } nsAString_Finish(&pos_str); + nsAString_Finish(&val_str); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 788b784..a7b4506 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -918,6 +918,22 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); else ok(!V_BSTR(&v), "mariginRight = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("5"); + hres = IHTMLStyle_put_marginRight(style, v); + ok(hres == S_OK, "put_marginRight failed: %08x\n", hres); + + V_VT(&v) = VT_NULL; + hres = IHTMLStyle_get_marginRight(style, &v); + ok(hres == S_OK, "get_marginRight failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(marginRight) = %d\n", V_VT(&v)); + if(compat_mode < COMPAT_IE9) + ok(!strcmp_wa(V_BSTR(&v), "5px"), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + else + ok(!V_BSTR(&v), "mariginRight = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); if(css_style) { V_VT(&v) = VT_NULL; @@ -925,7 +941,7 @@ static void test_body_style(IHTMLStyle *style) ok(hres == S_OK, "get_marginRight failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginRight) = %d\n", V_VT(&v)); if(compat_mode < COMPAT_IE9) - ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginRight) = %s\n", + ok(!strcmp_wa(V_BSTR(&v), "5px"), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); else ok(!V_BSTR(&v), "mariginRight = %s\n", wine_dbgstr_w(V_BSTR(&v)));

1 0

Derek Lesho : ntoskrnl.exe: Implement PsLookupThreadByThreadId.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 7498c15b0d3276c539b5854ffbb93642076b3782 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7498c15b0d3276c539b5854f… Author: Derek Lesho <dereklesho52(a)gmail.com> Date: Fri Apr 19 18:24:14 2019 +0200 ntoskrnl.exe: Implement PsLookupThreadByThreadId. Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 16 ++++++++++++++++ include/ddk/ntifs.h | 1 + 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3789abd..2c0b51d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2522,6 +2522,26 @@ PRKTHREAD WINAPI KeGetCurrentThread(void) return thread; } +/***************************************************** + * PsLookupThreadByThreadId (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsLookupThreadByThreadId( HANDLE threadid, PETHREAD *thread ) +{ + NTSTATUS status; + HANDLE handle; + + TRACE( "(%p %p)\n", threadid, thread ); + + if (!(handle = OpenThread( THREAD_QUERY_INFORMATION, FALSE, HandleToUlong(threadid) ))) + return STATUS_INVALID_PARAMETER; + + status = ObReferenceObjectByHandle( handle, THREAD_ALL_ACCESS, PsThreadType, KernelMode, (void**)thread, NULL ); + + NtClose( handle ); + return status; +} + + /*********************************************************************** * KeInsertQueue (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 141c8aa..f965ff5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -914,7 +914,7 @@ @ stub PsJobType @ stdcall PsLookupProcessByProcessId(ptr ptr) @ stub PsLookupProcessThreadByCid -@ stub PsLookupThreadByThreadId +@ stdcall PsLookupThreadByThreadId(ptr ptr) @ extern PsProcessType @ stub PsReferenceImpersonationToken @ stub PsReferencePrimaryToken diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index c3839da..d7083f7 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -29,6 +29,7 @@ #include "winternl.h" #include "winioctl.h" #include "ddk/ntddk.h" +#include "ddk/ntifs.h" #include "ddk/wdm.h" #include "driver.h" @@ -1167,6 +1168,20 @@ static void test_resource(void) ok(status == STATUS_SUCCESS, "got status %#x\n", status); } +static void test_lookup_thread(void) +{ + NTSTATUS status; + PETHREAD thread = NULL; + + status = PsLookupThreadByThreadId(PsGetCurrentThreadId(), &thread); + ok(!status, "PsLookupThreadByThreadId failed: %#x\n", status); + ok((PKTHREAD)thread == KeGetCurrentThread(), "thread != KeGetCurrentThread\n"); + if (thread) ObDereferenceObject(thread); + + status = PsLookupThreadByThreadId(NULL, &thread); + ok(status == STATUS_INVALID_PARAMETER, "PsLookupThreadByThreadId returned %#x\n", status); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -1210,6 +1225,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_lookaside_list(); test_ob_reference(test_input->path); test_resource(); + test_lookup_thread(); /* print process report */ if (winetest_debug) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index abe357f..9b57ae7 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -131,6 +131,7 @@ typedef struct _FS_FILTER_CALLBACKS BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); +NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE,PETHREAD*); void WINAPI PsRevertToSelf(void); #endif

1 0