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