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

Henri Verbeet : wined3d: Require a valid source rectangle in surface_upload_from_surface().
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 2310378042e50690adc130129a69ec6907035cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2310378042e50690adc130129… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 10 23:47:35 2017 +0200 wined3d: Require a valid source rectangle in surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dfb083d..d809282 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -859,13 +859,6 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w } } -static BOOL wined3d_surface_check_rect_dimensions(struct wined3d_surface *surface, const RECT *rect) -{ - struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; - - return SUCCEEDED(wined3d_texture_check_box_dimensions(surface->container, surface->texture_level, &box)); -} - static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) { @@ -878,25 +871,11 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, struct wined3d_context *context; struct wined3d_bo_address data; UINT update_w, update_h; - RECT r; TRACE("dst_surface %p, dst_point %s, src_surface %p, src_rect %s.\n", dst_surface, wine_dbgstr_point(dst_point), src_surface, wine_dbgstr_rect(src_rect)); - if (!src_rect) - { - SetRect(&r, 0, 0, wined3d_texture_get_level_width(src_texture, src_surface->texture_level), - wined3d_texture_get_level_height(src_texture, src_surface->texture_level)); - src_rect = &r; - } - - if (!wined3d_surface_check_rect_dimensions(src_surface, src_rect)) - { - WARN("Source rectangle not block-aligned.\n"); - return WINED3DERR_INVALIDCALL; - } - context = context_acquire(dst_texture->resource.device, NULL, 0); gl_info = context->gl_info;

1 0

Henri Verbeet : wined3d: Require a valid destination point in surface_upload_from_surface().
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: f243302ed527cb892645ceb225b347768d08e529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f243302ed527cb892645ceb22… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 10 23:47:34 2017 +0200 wined3d: Require a valid destination point in surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c0f9491..dfb083d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -878,25 +878,12 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, struct wined3d_context *context; struct wined3d_bo_address data; UINT update_w, update_h; - RECT r, dst_rect; - POINT p; + RECT r; TRACE("dst_surface %p, dst_point %s, src_surface %p, src_rect %s.\n", dst_surface, wine_dbgstr_point(dst_point), src_surface, wine_dbgstr_rect(src_rect)); - if (!dst_point) - { - p.x = 0; - p.y = 0; - dst_point = &p; - } - else if (dst_point->x < 0 || dst_point->y < 0) - { - WARN("Invalid destination point.\n"); - return WINED3DERR_INVALIDCALL; - } - if (!src_rect) { SetRect(&r, 0, 0, wined3d_texture_get_level_width(src_texture, src_surface->texture_level), @@ -910,21 +897,14 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, return WINED3DERR_INVALIDCALL; } - update_w = src_rect->right - src_rect->left; - update_h = src_rect->bottom - src_rect->top; - SetRect(&dst_rect, dst_point->x, dst_point->y, dst_point->x + update_w, dst_point->y + update_h); - if (!wined3d_surface_check_rect_dimensions(dst_surface, &dst_rect)) - { - WARN("Destination rectangle not block-aligned.\n"); - return WINED3DERR_INVALIDCALL; - } - context = context_acquire(dst_texture->resource.device, NULL, 0); gl_info = context->gl_info; /* Only load the surface for partial updates. For newly allocated texture * the texture wouldn't be the current location, and we'd upload zeroes * just to overwrite them again. */ + update_w = src_rect->right - src_rect->left; + update_h = src_rect->bottom - src_rect->top; if (update_w == wined3d_texture_get_level_width(dst_texture, dst_surface->texture_level) && update_h == wined3d_texture_get_level_height(dst_texture, dst_surface->texture_level)) wined3d_texture_prepare_texture(dst_texture, context, FALSE);

1 0

Huw Davies : user32/tests: Fix a few failures in DPI scaling mode.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: bfcf92f148dfd4f5030f86658d11773e49464787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfcf92f148dfd4f5030f86658… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 11 14:08:52 2017 +0100 user32/tests: Fix a few failures in DPI scaling mode. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 6f607d4..055060e 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -1424,7 +1424,7 @@ static void test_SPI_SETDRAGFULLWINDOWS( void ) /* 37 */ #define test_reg_font( KEY, VAL, LF) \ { LOGFONTA lfreg;\ lffromreg( KEY, VAL, &lfreg);\ - ok( (lfreg.lfHeight < 0 ? (LF).lfHeight == lfreg.lfHeight :\ + ok( (lfreg.lfHeight < 0 ? (LF).lfHeight == MulDiv( lfreg.lfHeight, dpi, real_dpi ) : \ MulDiv( -(LF).lfHeight , 72, dpi) == lfreg.lfHeight )&&\ (LF).lfWidth == lfreg.lfWidth &&\ (LF).lfWeight == lfreg.lfWeight &&\

1 0

Huw Davies : user32/tests: Correctly restore the caption sizes when run in DPI scaling mode.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 0ce293a0d8f6f75e380a665cc7a35e5290a6e8e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce293a0d8f6f75e380a665cc… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 11 14:08:51 2017 +0100 user32/tests: Correctly restore the caption sizes when run in DPI scaling mode. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 075a0c7..6f607d4 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -41,7 +41,7 @@ static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID); static BOOL strict; -static int dpi; +static int dpi, real_dpi; static BOOL iswin9x; static HDC hdc; @@ -165,6 +165,19 @@ static int last_bpp; static BOOL displaychange_ok = FALSE, displaychange_test_active = FALSE; static HANDLE displaychange_sem = 0; +static int get_real_dpi(void) +{ + HKEY key; + DWORD value = USER_DEFAULT_SCREEN_DPI, size = sizeof(value); + + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Control Panel\\Desktop", &key)) + { + RegQueryValueExA(key, "LogPixels", NULL, NULL, (BYTE *)&value, &size); + RegCloseKey(key); + } + return value; +} + static LRESULT CALLBACK SysParamsTestWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ) { @@ -1475,12 +1488,14 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ the caption font height is higher than the CaptionHeight field, the latter is adjusted accordingly. To be able to restore these setting accurately be restore the raw values. */ - Ncmorig.iCaptionWidth = metricfromreg( SPI_METRIC_REGKEY, SPI_CAPTIONWIDTH_VALNAME, dpi); + Ncmorig.iCaptionWidth = metricfromreg( SPI_METRIC_REGKEY, SPI_CAPTIONWIDTH_VALNAME, real_dpi); Ncmorig.iCaptionHeight = metricfromreg( SPI_METRIC_REGKEY, SPI_CAPTIONHEIGHT_VALNAME, dpi); Ncmorig.iSmCaptionHeight = metricfromreg( SPI_METRIC_REGKEY, SPI_SMCAPTIONHEIGHT_VALNAME, dpi); Ncmorig.iMenuHeight = metricfromreg( SPI_METRIC_REGKEY, SPI_MENUHEIGHT_VALNAME, dpi); /* test registry entries */ TEST_NONCLIENTMETRICS_REG( Ncmorig) + Ncmorig.lfCaptionFont.lfHeight = MulDiv( Ncmorig.lfCaptionFont.lfHeight, real_dpi, dpi ); + /* make small changes */ Ncmnew = Ncmstart; Ncmnew.iBorderWidth += 1; @@ -2933,6 +2948,8 @@ START_TEST(sysparams) hInstance = GetModuleHandleA( NULL ); hdc = GetDC(0); dpi = GetDeviceCaps( hdc, LOGPIXELSY); + real_dpi = get_real_dpi(); + trace("dpi %d real_dpi %d\n", dpi, real_dpi); iswin9x = GetVersion() & 0x80000000; /* This test requires interactivity, if we don't have it, give up */

1 0

Hugh McMaster : regedit: Re-implement convertHexToDWord().
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 0a71d4fa72038b505f621fe15ba0b02663ad93cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a71d4fa72038b505f621fe15… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 11 13:11:54 2017 +0000 regedit: Re-implement convertHexToDWord(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 28 ++++++++++++++++++++++------ programs/regedit/tests/regedit.c | 14 +++++++------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e0049c6..96c4564 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -146,15 +146,31 @@ static char* GetMultiByteStringN(const WCHAR* strW, int chars, DWORD* len) */ static BOOL convertHexToDWord(WCHAR* str, DWORD *dw) { - char buf[9]; - char dummy; + WCHAR *p, *end; + int count = 0; - WideCharToMultiByte(CP_ACP, 0, str, -1, buf, 9, NULL, NULL); - if (lstrlenW(str) > 8 || sscanf(buf, "%x%c", dw, &dummy) != 1) { - output_message(STRING_INVALID_HEX); - return FALSE; + while (*str == ' ' || *str == '\t') str++; + if (!*str) goto error; + + p = str; + while (isxdigitW(*p)) + { + count++; + p++; } + if (count > 8) goto error; + + end = p; + while (*p == ' ' || *p == '\t') p++; + if (*p && *p != ';') goto error; + + *end = 0; + *dw = strtoulW(str, &end, 16); return TRUE; + +error: + output_message(STRING_INVALID_HEX); + return FALSE; } /****************************************************************************** diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 515a6ed..54d20ed 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -530,7 +530,7 @@ static void test_invalid_import(void) "\"Test14a\"=dword:0x123\n" "\"Test14b\"=dword:123 456\n" "\"Test14c\"=dword:1234 5678\n\n"); - todo_wine verify_reg_nonexist(hkey, "Test14a"); + verify_reg_nonexist(hkey, "Test14a"); verify_reg_nonexist(hkey, "Test14b"); verify_reg_nonexist(hkey, "Test14c"); @@ -577,7 +577,7 @@ static void test_comments(void) todo_wine verify_reg(hkey, "Wine4", REG_SZ, "Value 2", 8, 0); verify_reg_nonexist(hkey, "Wine5"); dword = 0x2040608; - todo_wine verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -637,7 +637,7 @@ static void test_comments(void) verify_reg_nonexist(hkey, "Wine22"); verify_reg_nonexist(hkey, "Wine23"); dword = 0x00000004; - todo_wine verify_reg(hkey, "Wine24", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine24", REG_DWORD, &dword, sizeof(dword), 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -646,8 +646,8 @@ static void test_comments(void) "\"Wine25c\"=dword:1234#5678\n" "\"Wine25d\"=dword:1234 #5678\n\n"); dword = 0x1234; - todo_wine verify_reg(hkey, "Wine25a", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg(hkey, "Wine25b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine25a", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine25b", REG_DWORD, &dword, sizeof(dword), 0); verify_reg_nonexist(hkey, "Wine25c"); verify_reg_nonexist(hkey, "Wine25d"); @@ -809,8 +809,8 @@ static void test_import_with_whitespace(void) "\"Wine9a\"=dword: 00000008\n" "\"Wine9b\"=dword:\t\t00000008\n\n"); dword = 0x00000008; - todo_wine verify_reg(hkey, "Wine9a", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg(hkey, "Wine9b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine9a", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine9b", REG_DWORD, &dword, sizeof(dword), 0); lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);

1 0

Hugh McMaster : regedit/tests: Add a few more import tests.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 467def8352734a41a36104f944b600dc9e255a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=467def8352734a41a36104f94… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 11 13:11:44 2017 +0000 regedit/tests: Add a few more import tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index d15c477..515a6ed 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -510,11 +510,13 @@ static void test_invalid_import(void) "\"Test12a\"=dword:\n" "\"Test12b\"=dword:hello\n" "\"Test12c\"=dword:123456789\n" - "\"Test12d\"=dword:012345678\n\n"); + "\"Test12d\"=dword:012345678\n" + "\"Test12e\"=dword:000000001\n\n"); verify_reg_nonexist(hkey, "Test12a"); verify_reg_nonexist(hkey, "Test12b"); verify_reg_nonexist(hkey, "Test12c"); verify_reg_nonexist(hkey, "Test12d"); + verify_reg_nonexist(hkey, "Test12e"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -532,6 +534,13 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Test14b"); verify_reg_nonexist(hkey, "Test14c"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test15a\"=\"foo\"bar\"\n" + "\"Test15b\"=\"foo\"\"bar\"\n\n"); + todo_wine verify_reg_nonexist(hkey, "Test15a"); + todo_wine verify_reg_nonexist(hkey, "Test15b"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Nikolay Sivov : dwrite: Fix file object leak.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: d5d863597d2d9614b98f8623c50c5c376e253003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d863597d2d9614b98f8623c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 11 14:21:34 2017 +0300 dwrite: Fix file object leak. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d8ffa14..8bf8753 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2408,6 +2408,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec if (found_font) break; } + IDWriteFontFile_Release(file); if (!found_font) return DWRITE_E_NOFONT;

1 0

Nikolay Sivov : dwrite: Pass index directly to font and family creation helpers.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: f5b6563bec818edcbf0d2561a61ece0e234e765d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5b6563bec818edcbf0d2561a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 11 14:21:33 2017 +0300 dwrite: Pass index directly to font and family creation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index aeebb0d..d8ffa14 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1737,7 +1737,7 @@ void get_logfont_from_fontface(IDWriteFontFace *iface, LOGFONTW *lf) *lf = fontface->lf; } -static HRESULT create_font(struct dwrite_font_data *data, struct dwrite_fontfamily *family, IDWriteFont3 **font) +static HRESULT create_font(struct dwrite_fontfamily *family, UINT32 index, IDWriteFont3 **font) { struct dwrite_font *This; @@ -1751,8 +1751,8 @@ static HRESULT create_font(struct dwrite_font_data *data, struct dwrite_fontfami This->ref = 1; This->family = family; IDWriteFontFamily1_AddRef(&family->IDWriteFontFamily1_iface); - This->style = data->style; - This->data = data; + This->data = family->data->fonts[index]; + This->style = This->data->style; InterlockedIncrement(&This->data->ref); *font = &This->IDWriteFont3_iface; @@ -1835,7 +1835,7 @@ static HRESULT WINAPI dwritefontlist_GetFont(IDWriteFontList1 *iface, UINT32 ind if (index >= This->font_count) return E_INVALIDARG; - return create_font(This->fonts[index], This->family, (IDWriteFont3 **)font); + return create_font(This->family, index, (IDWriteFont3 **)font); } static DWRITE_LOCALITY WINAPI dwritefontlist1_GetFontLocality(IDWriteFontList1 *iface, UINT32 index) @@ -1861,7 +1861,7 @@ static HRESULT WINAPI dwritefontlist1_GetFont(IDWriteFontList1 *iface, UINT32 in if (index >= This->font_count) return E_FAIL; - return create_font(This->fonts[index], This->family, font); + return create_font(This->family, index, font); } static HRESULT WINAPI dwritefontlist1_GetFontFaceReference(IDWriteFontList1 *iface, UINT32 index, @@ -1974,7 +1974,7 @@ static HRESULT WINAPI dwritefontfamily_GetFont(IDWriteFontFamily1 *iface, UINT32 if (index >= This->data->font_count) return E_INVALIDARG; - return create_font(This->data->fonts[index], This, (IDWriteFont3 **)font); + return create_font(This, index, (IDWriteFont3 **)font); } static HRESULT WINAPI dwritefontfamily_GetFamilyNames(IDWriteFontFamily1 *iface, IDWriteLocalizedStrings **names) @@ -2029,8 +2029,7 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily1 * { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily1(iface); struct dwrite_font_propvec req; - struct dwrite_font_data *match; - UINT32 i; + UINT32 i, match; TRACE("(%p)->(%d %d %d %p)\n", This, weight, stretch, style, font); @@ -2040,14 +2039,14 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily1 * } init_font_prop_vec(weight, stretch, style, &req); - match = This->data->fonts[0]; + match = 0; for (i = 1; i < This->data->font_count; i++) { - if (is_better_font_match(&This->data->fonts[i]->propvec, &match->propvec, &req)) - match = This->data->fonts[i]; + if (is_better_font_match(&This->data->fonts[i]->propvec, &This->data->fonts[match]->propvec, &req)) + match = i; } - return create_font(match, This, (IDWriteFont3 **)font); + return create_font(This, match, (IDWriteFont3 **)font); } typedef BOOL (*matching_filter_func)(const struct dwrite_font_data*); @@ -2163,7 +2162,7 @@ static HRESULT WINAPI dwritefontfamily1_GetFont(IDWriteFontFamily1 *iface, UINT3 if (index >= This->data->font_count) return E_FAIL; - return create_font(This->data->fonts[index], This, font); + return create_font(This, index, font); } static HRESULT WINAPI dwritefontfamily1_GetFontFaceReference(IDWriteFontFamily1 *iface, UINT32 index, @@ -2202,8 +2201,7 @@ static const IDWriteFontFamily1Vtbl fontfamilyvtbl = { dwritefontfamily1_GetFontFaceReference }; -static HRESULT create_fontfamily(struct dwrite_fontfamily_data *data, struct dwrite_fontcollection *collection, - IDWriteFontFamily1 **family) +static HRESULT create_fontfamily(struct dwrite_fontcollection *collection, UINT32 index, IDWriteFontFamily1 **family) { struct dwrite_fontfamily *This; @@ -2216,7 +2214,7 @@ static HRESULT create_fontfamily(struct dwrite_fontfamily_data *data, struct dwr This->ref = 1; This->collection = collection; IDWriteFontCollection1_AddRef(&collection->IDWriteFontCollection1_iface); - This->data = data; + This->data = collection->family_data[index]; InterlockedIncrement(&This->data->ref); *family = &This->IDWriteFontFamily1_iface; @@ -2317,7 +2315,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection1 return E_FAIL; } - return create_fontfamily(This->family_data[index], This, (IDWriteFontFamily1 **)family); + return create_fontfamily(This, index, (IDWriteFontFamily1 **)family); } static UINT32 collection_find_family(struct dwrite_fontcollection *collection, const WCHAR *name) @@ -2375,10 +2373,9 @@ static BOOL is_same_fontfile(IDWriteFontFile *left, IDWriteFontFile *right) static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollection1 *iface, IDWriteFontFace *face, IDWriteFont **font) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection1(iface); - struct dwrite_fontfamily_data *found_family = NULL; - struct dwrite_font_data *found_font = NULL; IDWriteFontFamily1 *family; UINT32 i, j, face_index; + BOOL found_font = FALSE; IDWriteFontFile *file; HRESULT hr; @@ -2395,27 +2392,31 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec return hr; face_index = IDWriteFontFace_GetIndex(face); + found_font = FALSE; for (i = 0; i < This->family_count; i++) { struct dwrite_fontfamily_data *family_data = This->family_data[i]; + for (j = 0; j < family_data->font_count; j++) { struct dwrite_font_data *font_data = family_data->fonts[j]; if (face_index == font_data->face_index && is_same_fontfile(file, font_data->file)) { - found_font = font_data; - found_family = family_data; + found_font = TRUE; break; } } + + if (found_font) + break; } if (!found_font) return DWRITE_E_NOFONT; - hr = create_fontfamily(found_family, This, &family); + hr = create_fontfamily(This, i, &family); if (FAILED(hr)) return hr; - hr = create_font(found_font, impl_from_IDWriteFontFamily1(family), (IDWriteFont3 **)font); + hr = create_font(impl_from_IDWriteFontFamily1(family), j, (IDWriteFont3 **)font); IDWriteFontFamily1_Release(family); return hr; } @@ -2440,7 +2441,7 @@ static HRESULT WINAPI dwritefontcollection1_GetFontFamily(IDWriteFontCollection1 return E_FAIL; } - return create_fontfamily(This->family_data[index], This, family); + return create_fontfamily(This, index, family); } static const IDWriteFontCollection1Vtbl fontcollectionvtbl = {

1 0

Henri Verbeet : wined3d: Implement wined3d_device_update_texture() on top of wined3d_cs_emit_blt_sub_resource().
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 4c8b3e0d19a9c10400311419b605bf016e65bd05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8b3e0d19a9c10400311419b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 10 23:47:33 2017 +0200 wined3d: Implement wined3d_device_update_texture() on top of wined3d_cs_emit_blt_sub_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 61 ++++++++++----------------------------------------- 1 file changed, 11 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d2b30eb..a43e080 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3544,12 +3544,9 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, unsigned int src_size, dst_size, src_skip_levels = 0; unsigned int src_level_count, dst_level_count; unsigned int layer_count, level_count, i, j; - unsigned int row_pitch, slice_pitch; + unsigned int width, height, depth; enum wined3d_resource_type type; - struct wined3d_context *context; - struct wined3d_bo_address data; - HRESULT hr; - RECT r; + struct wined3d_box box; TRACE("device %p, src_texture %p, dst_texture %p.\n", device, src_texture, dst_texture); @@ -3617,59 +3614,23 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - context = context_acquire(device, NULL, 0); - - /* Make sure that the destination texture is loaded. */ - wined3d_texture_load(dst_texture, context, FALSE); - - /* Only a prepare, since we're uploading entire sub-resources. */ - wined3d_texture_prepare_texture(dst_texture, context, FALSE); - wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); - /* Update every surface level of the texture. */ for (i = 0; i < level_count; ++i) { + width = wined3d_texture_get_level_width(dst_texture, i); + height = wined3d_texture_get_level_height(dst_texture, i); + depth = wined3d_texture_get_level_depth(dst_texture, i); + wined3d_box_set(&box, 0, 0, width, height, 0, depth); + for (j = 0; j < layer_count; ++j) { - unsigned int src_sub_resource_idx = j * src_level_count + i + src_skip_levels; - unsigned int dst_sub_resource_idx = j * dst_level_count + i; - - /* Use wined3d_texture_blt() instead of uploading directly if we need conversion. */ - if (dst_texture->resource.format->convert - || wined3d_format_get_color_key_conversion(dst_texture, FALSE)) - { - SetRect(&r, 0, 0, wined3d_texture_get_level_width(dst_texture, i), - wined3d_texture_get_level_height(dst_texture, i)); - if (FAILED(hr = wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &r, - src_texture, src_sub_resource_idx, &r, 0, NULL, WINED3D_TEXF_POINT))) - { - WARN("Failed to update surface, hr %#x.\n", hr); - context_release(context); - return hr; - } - continue; - } - - if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, - context, src_texture->resource.map_binding)) - { - WARN("Failed to load source sub-resource %u into %s.\n", src_sub_resource_idx, - wined3d_debug_location(src_texture->resource.map_binding)); - context_release(context); - return WINED3DERR_INVALIDCALL; - } - - wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data, src_texture->resource.map_binding); - wined3d_texture_get_pitch(src_texture, src_skip_levels + i, &row_pitch, &slice_pitch); - - wined3d_texture_upload_data(dst_texture, dst_sub_resource_idx, context, NULL, - wined3d_const_bo_address(&data), row_pitch, slice_pitch); - wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); + wined3d_cs_emit_blt_sub_resource(device->cs, + &dst_texture->resource, j * dst_level_count + i, &box, + &src_texture->resource, j * src_level_count + i + src_skip_levels, &box, + 0, NULL, WINED3D_TEXF_POINT); } } - context_release(context); - return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Unify the 2D and 3D paths in wined3d_device_update_texture().
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: c1ebab1a4b19f71e1f421f74efc674ff2d936a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ebab1a4b19f71e1f421f74e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 10 23:47:32 2017 +0200 wined3d: Unify the 2D and 3D paths in wined3d_device_update_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 108 ++++++++++++++++------------------------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 2 - 3 files changed, 42 insertions(+), 70 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9bf3600..d2b30eb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3542,6 +3542,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture) { unsigned int src_size, dst_size, src_skip_levels = 0; + unsigned int src_level_count, dst_level_count; unsigned int layer_count, level_count, i, j; unsigned int row_pitch, slice_pitch; enum wined3d_resource_type type; @@ -3591,8 +3592,9 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - level_count = min(wined3d_texture_get_level_count(src_texture), - wined3d_texture_get_level_count(dst_texture)); + src_level_count = src_texture->level_count; + dst_level_count = dst_texture->level_count; + level_count = min(src_level_count, dst_level_count); src_size = max(src_texture->resource.width, src_texture->resource.height); dst_size = max(dst_texture->resource.width, dst_texture->resource.height); @@ -3615,88 +3617,60 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - /* Make sure that the destination texture is loaded. */ context = context_acquire(device, NULL, 0); + + /* Make sure that the destination texture is loaded. */ wined3d_texture_load(dst_texture, context, FALSE); - context_release(context); + + /* Only a prepare, since we're uploading entire sub-resources. */ + wined3d_texture_prepare_texture(dst_texture, context, FALSE); + wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); /* Update every surface level of the texture. */ - switch (type) + for (i = 0; i < level_count; ++i) { - case WINED3D_RTYPE_TEXTURE_2D: + for (j = 0; j < layer_count; ++j) { - unsigned int src_levels = src_texture->level_count; - unsigned int dst_levels = dst_texture->level_count; - struct wined3d_surface *src_surface; - struct wined3d_surface *dst_surface; + unsigned int src_sub_resource_idx = j * src_level_count + i + src_skip_levels; + unsigned int dst_sub_resource_idx = j * dst_level_count + i; - for (i = 0; i < layer_count; ++i) + /* Use wined3d_texture_blt() instead of uploading directly if we need conversion. */ + if (dst_texture->resource.format->convert + || wined3d_format_get_color_key_conversion(dst_texture, FALSE)) { - for (j = 0; j < level_count; ++j) + SetRect(&r, 0, 0, wined3d_texture_get_level_width(dst_texture, i), + wined3d_texture_get_level_height(dst_texture, i)); + if (FAILED(hr = wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &r, + src_texture, src_sub_resource_idx, &r, 0, NULL, WINED3D_TEXF_POINT))) { - unsigned int src_sub_resource_idx = i * src_levels + j + src_skip_levels; - unsigned int dst_sub_resource_idx = i * dst_levels + j; - - /* Use wined3d_texture_blt() instead of uploading directly if we need conversion. */ - if (dst_texture->resource.format->convert - || wined3d_format_get_color_key_conversion(dst_texture, FALSE)) - { - SetRect(&r, 0, 0, wined3d_texture_get_level_width(dst_texture, j), - wined3d_texture_get_level_height(dst_texture, j)); - if (FAILED(hr = wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &r, - src_texture, src_sub_resource_idx, &r, 0, NULL, WINED3D_TEXF_POINT))) - { - WARN("Failed to update surface, hr %#x.\n", hr); - return hr; - } - continue; - } - - src_surface = src_texture->sub_resources[src_sub_resource_idx].u.surface; - dst_surface = dst_texture->sub_resources[dst_sub_resource_idx].u.surface; - if (FAILED(hr = surface_upload_from_surface(dst_surface, NULL, src_surface, NULL))) - { - WARN("Failed to update surface, hr %#x.\n", hr); - return hr; - } + WARN("Failed to update surface, hr %#x.\n", hr); + context_release(context); + return hr; } + continue; } - return WINED3D_OK; - } - case WINED3D_RTYPE_TEXTURE_3D: - context = context_acquire(device, NULL, 0); - - /* Only a prepare, since we're uploading entire volumes. */ - wined3d_texture_prepare_texture(dst_texture, context, FALSE); - wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); - - for (j = 0; j < level_count; ++j) + if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, + context, src_texture->resource.map_binding)) { - if (!wined3d_texture_load_location(src_texture, src_skip_levels + j, - context, src_texture->resource.map_binding)) - { - WARN("Failed to load source sub-resource %u into %s.\n", src_skip_levels + j, - wined3d_debug_location(src_texture->resource.map_binding)); - context_release(context); - return WINED3DERR_INVALIDCALL; - } - - wined3d_texture_get_memory(src_texture, src_skip_levels + j, &data, src_texture->resource.map_binding); - wined3d_texture_get_pitch(src_texture, src_skip_levels + j, &row_pitch, &slice_pitch); - - wined3d_texture_upload_data(dst_texture, j, context, NULL, - wined3d_const_bo_address(&data), row_pitch, slice_pitch); - wined3d_texture_invalidate_location(dst_texture, j, ~WINED3D_LOCATION_TEXTURE_RGB); + WARN("Failed to load source sub-resource %u into %s.\n", src_sub_resource_idx, + wined3d_debug_location(src_texture->resource.map_binding)); + context_release(context); + return WINED3DERR_INVALIDCALL; } - context_release(context); - return WINED3D_OK; + wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data, src_texture->resource.map_binding); + wined3d_texture_get_pitch(src_texture, src_skip_levels + i, &row_pitch, &slice_pitch); - default: - FIXME("Unsupported texture type %#x.\n", type); - return WINED3DERR_INVALIDCALL; + wined3d_texture_upload_data(dst_texture, dst_sub_resource_idx, context, NULL, + wined3d_const_bo_address(&data), row_pitch, slice_pitch); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); + } } + + context_release(context); + + return WINED3D_OK; } HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c9d9c10..c0f9491 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -866,7 +866,7 @@ static BOOL wined3d_surface_check_rect_dimensions(struct wined3d_surface *surfac return SUCCEEDED(wined3d_texture_check_box_dimensions(surface->container, surface->texture_level, &box)); } -HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, +static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) { unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b40e132..9f98136 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3085,8 +3085,6 @@ BOOL surface_load_location(struct wined3d_surface *surface, void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; -HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, - struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN; void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point, BOOL srgb, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN;

1 0