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

Henri Verbeet : wined3d: Source resources are always non-NULL in wined3d_cs_exec_blt_sub_resource( ).
by Alexandre Julliard 07 Apr '17

07 Apr '17

Module: wine Branch: master Commit: cefd06380c981ecb9da6a06a76351757aad06936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cefd06380c981ecb9da6a06a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 23:44:29 2017 +0200 wined3d: Source resources are always non-NULL in wined3d_cs_exec_blt_sub_resource(). Since fills no longer go through the blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c408eb0..78a3e1d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1744,17 +1744,14 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * } else if (op->dst_resource->type == WINED3D_RTYPE_TEXTURE_2D) { - struct wined3d_surface *dst_surface, *src_surface = NULL; + struct wined3d_surface *dst_surface, *src_surface; struct wined3d_texture *dst_texture, *src_texture; RECT dst_rect, src_rect; dst_texture = texture_from_resource(op->dst_resource); + src_texture = texture_from_resource(op->src_resource); dst_surface = dst_texture->sub_resources[op->dst_sub_resource_idx].u.surface; - if (op->src_resource) - { - src_texture = texture_from_resource(op->src_resource); - src_surface = src_texture->sub_resources[op->src_sub_resource_idx].u.surface; - } + src_surface = src_texture->sub_resources[op->src_sub_resource_idx].u.surface; SetRect(&dst_rect, op->dst_box.left, op->dst_box.top, op->dst_box.right, op->dst_box.bottom); SetRect(&src_rect, op->src_box.left, op->src_box.top, op->src_box.right, op->src_box.bottom);

1 0

Henri Verbeet : wined3d: Introduce a helper function to assign wined3d_box values.
by Alexandre Julliard 07 Apr '17

07 Apr '17

Module: wine Branch: master Commit: df6120274d1a32e275a81308575f947945e89cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6120274d1a32e275a813085… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 23:44:30 2017 +0200 wined3d: Introduce a helper function to assign wined3d_box values. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 29 +++++-------------------- dlls/d3d8/surface.c | 7 +------ dlls/d3d8/texture.c | 14 ++----------- dlls/d3d9/device.c | 9 +------- dlls/d3d9/surface.c | 9 +------- dlls/d3d9/texture.c | 14 ++----------- dlls/ddraw/surface.c | 7 +------ dlls/wined3d/device.c | 57 +++++++++++--------------------------------------- include/wine/wined3d.h | 11 ++++++++++ 9 files changed, 36 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df6120274d1a32e275a81…

1 0

Henri Verbeet : wined3d: Handle formats with conversions outside surface_upload_from_surface().
by Alexandre Julliard 07 Apr '17

07 Apr '17

Module: wine Branch: master Commit: c2c1ffe416ca9ba49ac3e355c82e9024004e5c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c1ffe416ca9ba49ac3e355c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 23:44:31 2017 +0200 wined3d: Handle formats with conversions outside surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 23 +++++++++++++++++++++-- dlls/wined3d/surface.c | 5 ----- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d8b6ef9..362276d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3599,6 +3599,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, enum wined3d_resource_type type; HRESULT hr; struct wined3d_context *context; + RECT r; TRACE("device %p, src_texture %p, dst_texture %p.\n", device, src_texture, dst_texture); @@ -3670,8 +3671,26 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, { for (j = 0; j < level_count; ++j) { - src_surface = src_texture->sub_resources[i * src_levels + j + src_skip_levels].u.surface; - dst_surface = dst_texture->sub_resources[i * dst_levels + j].u.surface; + 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); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 889a8d1..56fbaf2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -930,11 +930,6 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P return WINED3DERR_INVALIDCALL; } - /* Use wined3d_texture_blt() instead of uploading directly if we need conversion. */ - if (dst_format->convert || wined3d_format_get_color_key_conversion(dst_texture, FALSE)) - return wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &dst_rect, - src_texture, src_sub_resource_idx, src_rect, 0, NULL, WINED3D_TEXF_POINT); - context = context_acquire(dst_texture->resource.device, NULL, 0); gl_info = context->gl_info;

1 0

Henri Verbeet : wined3d: Assume identical source and destination formats in surface_upload_from_surface ().
by Alexandre Julliard 07 Apr '17

07 Apr '17

Module: wine Branch: master Commit: 26d7f991258bc5c612a7ea5d5d1ef2064442c3f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26d7f991258bc5c612a7ea5d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 23:44:32 2017 +0200 wined3d: Assume identical source and destination formats 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/device.c | 12 ++++++------ dlls/wined3d/surface.c | 13 +------------ 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 362276d..bd07053 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3551,12 +3551,6 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device, TRACE("device %p, src_texture %p, src_level %u, dst_texture %p, level_count %u.\n", device, src_texture, src_level, dst_texture, level_count); - if (src_texture->resource.format != dst_texture->resource.format) - { - WARN("Source and destination formats do not match.\n"); - return WINED3DERR_INVALIDCALL; - } - if (wined3d_texture_get_level_width(src_texture, src_level) != dst_texture->resource.width || wined3d_texture_get_level_height(src_texture, src_level) != dst_texture->resource.height || wined3d_texture_get_level_depth(src_texture, src_level) != dst_texture->resource.depth) @@ -3636,6 +3630,12 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } + if (src_texture->resource.format != dst_texture->resource.format) + { + WARN("Source and destination formats do not match.\n"); + return WINED3DERR_INVALIDCALL; + } + level_count = min(wined3d_texture_get_level_count(src_texture), wined3d_texture_get_level_count(dst_texture)); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 56fbaf2..c9d9c10 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -874,8 +874,6 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; unsigned int src_row_pitch, src_slice_pitch; - const struct wined3d_format *src_format; - const struct wined3d_format *dst_format; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; struct wined3d_bo_address data; @@ -887,15 +885,6 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P dst_surface, wine_dbgstr_point(dst_point), src_surface, wine_dbgstr_rect(src_rect)); - src_format = src_texture->resource.format; - dst_format = dst_texture->resource.format; - - if (src_format->id != dst_format->id) - { - WARN("Source and destination surfaces should have the same format.\n"); - return WINED3DERR_INVALIDCALL; - } - if (!dst_point) { p.x = 0; @@ -947,7 +936,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P src_texture->sub_resources[src_sub_resource_idx].locations); wined3d_texture_get_pitch(src_texture, src_surface->texture_level, &src_row_pitch, &src_slice_pitch); - wined3d_surface_upload_data(dst_surface, gl_info, src_format, src_rect, + wined3d_surface_upload_data(dst_surface, gl_info, src_texture->resource.format, src_rect, src_row_pitch, dst_point, FALSE, wined3d_const_bo_address(&data)); context_release(context);

1 0

Henri Verbeet : wined3d: Implement partial support for 3D texture blits.
by Alexandre Julliard 07 Apr '17

07 Apr '17

Module: wine Branch: master Commit: 986e3eebceb3d890a215eb2c641ea871f0d51820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=986e3eebceb3d890a215eb2c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 23:44:33 2017 +0200 wined3d: Implement partial support for 3D texture blits. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 78a3e1d..0866a16 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1759,6 +1759,88 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * &src_rect, op->flags, &op->fx, op->filter))) FIXME("Blit failed.\n"); } + else if (op->dst_resource->type == WINED3D_RTYPE_TEXTURE_3D) + { + struct wined3d_texture *src_texture, *dst_texture; + unsigned int level, update_w, update_h, update_d; + unsigned int row_pitch, slice_pitch; + struct wined3d_context *context; + struct wined3d_bo_address addr; + + if (op->flags) + { + FIXME("Flags %#x not implemented for %s resources.\n", + op->flags, debug_d3dresourcetype(op->dst_resource->type)); + return; + } + + if (op->src_resource->format != op->dst_resource->format) + { + FIXME("Format conversion not implemented for %s resources.\n", + debug_d3dresourcetype(op->dst_resource->type)); + return; + } + + update_w = op->dst_box.right - op->dst_box.left; + update_h = op->dst_box.bottom - op->dst_box.top; + update_d = op->dst_box.back - op->dst_box.front; + if (op->src_box.right - op->src_box.left != update_w + || op->src_box.bottom - op->src_box.top != update_h + || op->src_box.back - op->src_box.front != update_d) + { + FIXME("Stretching not implemented for %s resources.\n", + debug_d3dresourcetype(op->dst_resource->type)); + return; + } + + if (op->src_box.left || op->src_box.top || op->src_box.front) + { + FIXME("Source box %s not supported for %s resources.\n", + debug_box(&op->src_box), debug_d3dresourcetype(op->dst_resource->type)); + return; + } + + dst_texture = texture_from_resource(op->dst_resource); + src_texture = texture_from_resource(op->src_resource); + + context = context_acquire(cs->device, NULL, 0); + + if (!wined3d_texture_load_location(src_texture, op->src_sub_resource_idx, + context, src_texture->resource.map_binding)) + { + ERR("Failed to load source sub-resource into %s.\n", + wined3d_debug_location(src_texture->resource.map_binding)); + context_release(context); + return; + } + + level = op->dst_sub_resource_idx % dst_texture->level_count; + if (update_w == wined3d_texture_get_level_width(dst_texture, level) + && update_h == wined3d_texture_get_level_height(dst_texture, level) + && update_d == wined3d_texture_get_level_depth(dst_texture, level)) + { + wined3d_texture_prepare_texture(dst_texture, context, FALSE); + } + else if (!wined3d_texture_load_location(dst_texture, op->dst_sub_resource_idx, + context, WINED3D_LOCATION_TEXTURE_RGB)) + { + ERR("Failed to load destination sub-resource.\n"); + context_release(context); + return; + } + + wined3d_texture_get_memory(src_texture, op->src_sub_resource_idx, &addr, src_texture->resource.map_binding); + wined3d_texture_get_pitch(src_texture, op->src_sub_resource_idx % src_texture->level_count, + &row_pitch, &slice_pitch); + + wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); + wined3d_texture_upload_data(dst_texture, op->dst_sub_resource_idx, context, &op->dst_box, + wined3d_const_bo_address(&addr), row_pitch, slice_pitch); + wined3d_texture_validate_location(dst_texture, op->dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(dst_texture, op->dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); + + context_release(context); + } else { FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(op->dst_resource->type));

1 0

Alistair Leslie-Hughes : odbccp32: Implement SQLConfigDriver/W.
by Alexandre Julliard 07 Apr '17

07 Apr '17

Module: wine Branch: master Commit: 764ee72641fc1b1f22b9c330a669a5b661a64bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=764ee72641fc1b1f22b9c330a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 7 10:52:19 2017 +0000 odbccp32: Implement SQLConfigDriver/W. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 114 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 104 insertions(+), 10 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 773c5d2..666d8c0 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -62,6 +62,9 @@ static const WCHAR odbc_error_component_not_found[] = {'C','o','m','p','o','n',' static const WCHAR odbc_error_out_of_mem[] = {'O','u','t',' ','o','f',' ','m','e','m','o','r','y',0}; static const WCHAR odbc_error_invalid_param_sequence[] = {'I','n','v','a','l','i','d',' ','p','a','r','a','m','e','t','e','r',' ','s','e','q','u','e','n','c','e',0}; static const WCHAR odbc_error_invalid_param_string[] = {'I','n','v','a','l','i','d',' ','p','a','r','a','m','e','t','e','r',' ','s','t','r','i','n','g',0}; +static const WCHAR odbc_error_invalid_dsn[] = {'I','n','v','a','l','i','d',' ','D','S','N',0}; +static const WCHAR odbc_error_load_lib_failed[] = {'L','o','a','d',' ','L','i','b','r','a','r','y',' ','F','a','i','l','e','d',0}; +static const WCHAR odbc_error_request_failed[] = {'R','e','q','u','e','s','t',' ','F','a','i','l','e','d',0}; /* Push an error onto the error stack, taking care of ranges etc. */ static void push_error(int code, LPCWSTR msg) @@ -248,22 +251,113 @@ BOOL WINAPI SQLConfigDataSource(HWND hwndParent, WORD fRequest, return TRUE; } -BOOL WINAPI SQLConfigDriverW(HWND hwndParent, WORD fRequest, LPCWSTR lpszDriver, - LPCWSTR lpszArgs, LPWSTR lpszMsg, WORD cbMsgMax, WORD *pcbMsgOut) +static HMODULE load_config_driver(const WCHAR *driver) { + static WCHAR reg_driver[] = {'d','r','i','v','e','r',0}; + long ret; + HMODULE hmod; + WCHAR *filename = NULL; + DWORD size = 0, type; + HKEY hkey; + + if ((ret = RegOpenKeyW(HKEY_CURRENT_USER, odbcini, &hkey)) == ERROR_SUCCESS) + { + HKEY hkeydriver; + + if ((ret = RegOpenKeyW(hkey, driver, &hkeydriver)) == ERROR_SUCCESS) + { + ret = RegGetValueW(hkeydriver, NULL, reg_driver, RRF_RT_REG_SZ, &type, NULL, &size); + if(ret == ERROR_MORE_DATA) + { + filename = HeapAlloc(GetProcessHeap(), 0, size); + if(!filename) + { + RegCloseKey(hkeydriver); + RegCloseKey(hkey); + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + + return NULL; + } + ret = RegGetValueW(hkeydriver, NULL, driver, RRF_RT_REG_SZ, &type, filename, &size); + } + + RegCloseKey(hkeydriver); + } + + RegCloseKey(hkey); + } + + if(ret != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, filename); + push_error(ODBC_ERROR_INVALID_DSN, odbc_error_invalid_dsn); + return NULL; + } + + hmod = LoadLibraryW(filename); + HeapFree(GetProcessHeap(), 0, filename); + + if(!hmod) + push_error(ODBC_ERROR_LOAD_LIB_FAILED, odbc_error_load_lib_failed); + + return hmod; +} + +BOOL WINAPI SQLConfigDriverW(HWND hwnd, WORD request, LPCWSTR driver, + LPCWSTR args, LPWSTR msg, WORD msgmax, WORD *msgout) +{ + BOOL (WINAPI *pConfigDriverW)(HWND hwnd, WORD request, const WCHAR *driver, const WCHAR *args, const WCHAR *msg, WORD msgmax, WORD *msgout); + HMODULE hmod; + BOOL funcret = FALSE; + clear_errors(); - FIXME("(%p %d %s %s %p %d %p)\n", hwndParent, fRequest, debugstr_w(lpszDriver), - debugstr_w(lpszArgs), lpszMsg, cbMsgMax, pcbMsgOut); - return TRUE; + TRACE("(%p %d %s %s %p %d %p)\n", hwnd, request, debugstr_w(driver), + debugstr_w(args), msg, msgmax, msgout); + + hmod = load_config_driver(driver); + if(!hmod) + return FALSE; + + pConfigDriverW = (void*)GetProcAddress(hmod, "ConfigDriverW"); + if(pConfigDriverW) + funcret = pConfigDriverW(hwnd, request, driver, args, msg, msgmax, msgout); + + if(!funcret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + FreeLibrary(hmod); + + return funcret; } -BOOL WINAPI SQLConfigDriver(HWND hwndParent, WORD fRequest, LPCSTR lpszDriver, - LPCSTR lpszArgs, LPSTR lpszMsg, WORD cbMsgMax, WORD *pcbMsgOut) +BOOL WINAPI SQLConfigDriver(HWND hwnd, WORD request, LPCSTR driver, + LPCSTR args, LPSTR msg, WORD msgmax, WORD *msgout) { + BOOL (WINAPI *pConfigDriverA)(HWND hwnd, WORD request, const char *driver, const char *args, const char *msg, WORD msgmax, WORD *msgout); + HMODULE hmod; + WCHAR *driverW; + BOOL funcret = FALSE; + clear_errors(); - FIXME("(%p %d %s %s %p %d %p)\n", hwndParent, fRequest, debugstr_a(lpszDriver), - debugstr_a(lpszArgs), lpszMsg, cbMsgMax, pcbMsgOut); - return TRUE; + TRACE("(%p %d %s %s %p %d %p)\n", hwnd, request, debugstr_a(driver), + debugstr_a(args), msg, msgmax, msgout); + + driverW = heap_strdupAtoW(driver); + hmod = load_config_driver(driverW); + HeapFree(GetProcessHeap(), 0, driverW); + if(!hmod) + return FALSE; + + pConfigDriverA = (void*)GetProcAddress(hmod, "ConfigDriver"); + if(pConfigDriverA) + funcret = pConfigDriverA(hwnd, request, driver, args, msg, msgmax, msgout); + + if(!funcret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + FreeLibrary(hmod); + + return funcret; } BOOL WINAPI SQLCreateDataSourceW(HWND hwnd, LPCWSTR lpszDS)

1 0

Nikolay Sivov : dwrite: Initial implementation of ComputeGlyphOrigins().
by Alexandre Julliard 07 Apr '17

07 Apr '17

Module: wine Branch: master Commit: e258917a434731ed34a822d3dcb9272f3150dad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e258917a434731ed34a822d3d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 7 14:06:12 2017 +0300 dwrite: Initial implementation of ComputeGlyphOrigins(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 82 +++++++++++++++++++++++++++++++++++++++++++++--- dlls/dwrite/tests/font.c | 65 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 9b5de8a..067bc8a 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -21,6 +21,7 @@ #define COBJMACROS #include <stdarg.h> +#include <math.h> #include "windef.h" #include "winbase.h" @@ -1438,14 +1439,86 @@ static HRESULT WINAPI dwritefactory4_TranslateColorGlyphRun(IDWriteFactory4 *ifa return E_NOTIMPL; } +static HRESULT compute_glyph_origins(DWRITE_GLYPH_RUN const *run, DWRITE_MEASURING_MODE measuring_mode, + D2D1_POINT_2F baseline_origin, DWRITE_MATRIX const *transform, D2D1_POINT_2F *origins) +{ + IDWriteFontFace1 *fontface1 = NULL; + DWRITE_FONT_METRICS metrics; + FLOAT rtl_factor; + UINT32 i; + + rtl_factor = run->bidiLevel & 1 ? -1.0f : 1.0f; + + if (run->fontFace) { + IDWriteFontFace_GetMetrics(run->fontFace, &metrics); + IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace1, (void **)&fontface1); + } + + for (i = 0; i < run->glyphCount; i++) { + FLOAT advance; + + /* Use nominal advances if not provided by caller. */ + if (run->glyphAdvances) + advance = rtl_factor * run->glyphAdvances[i]; + else { + INT32 a; + + advance = 0.0f; + switch (measuring_mode) + { + case DWRITE_MEASURING_MODE_NATURAL: + if (SUCCEEDED(IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, run->glyphIndices + i, &a, + run->isSideways))) + advance = rtl_factor * get_scaled_advance_width(a, run->fontEmSize, &metrics); + break; + case DWRITE_MEASURING_MODE_GDI_CLASSIC: + case DWRITE_MEASURING_MODE_GDI_NATURAL: + if (SUCCEEDED(IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, run->fontEmSize, + 1.0f, transform, measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL, + run->isSideways, 1, run->glyphIndices + i, &a))) + advance = rtl_factor * floorf(a * run->fontEmSize / metrics.designUnitsPerEm + 0.5f); + break; + default: + ; + } + } + + origins[i] = baseline_origin; + + /* Apply offsets. */ + if (run->glyphOffsets) { + FLOAT advanceoffset = rtl_factor * run->glyphOffsets[i].advanceOffset; + FLOAT ascenderoffset = -run->glyphOffsets[i].ascenderOffset; + + if (run->isSideways) { + origins[i].x += ascenderoffset; + origins[i].y += advanceoffset; + } + else { + origins[i].x += advanceoffset; + origins[i].y += ascenderoffset; + } + } + + if (run->isSideways) + baseline_origin.y += advance; + else + baseline_origin.x += advance; + } + + if (fontface1) + IDWriteFontFace1_Release(fontface1); + return S_OK; +} + static HRESULT WINAPI dwritefactory4_ComputeGlyphOrigins_(IDWriteFactory4 *iface, DWRITE_GLYPH_RUN const *run, D2D1_POINT_2F baseline_origin, D2D1_POINT_2F *origins) { struct dwritefactory *This = impl_from_IDWriteFactory4(iface); - FIXME("(%p)->(%p %p): stub\n", This, run, origins); + TRACE("(%p)->(%p (%f,%f) %p)\n", This, run, baseline_origin.x, baseline_origin.y, origins); - return E_NOTIMPL; + return compute_glyph_origins(run, DWRITE_MEASURING_MODE_NATURAL, baseline_origin, NULL, origins); } static HRESULT WINAPI dwritefactory4_ComputeGlyphOrigins(IDWriteFactory4 *iface, DWRITE_GLYPH_RUN const *run, @@ -1454,9 +1527,10 @@ static HRESULT WINAPI dwritefactory4_ComputeGlyphOrigins(IDWriteFactory4 *iface, { struct dwritefactory *This = impl_from_IDWriteFactory4(iface); - FIXME("(%p)->(%p %d %p %p): stub\n", This, run, measuring_mode, transform, origins); + TRACE("(%p)->(%p %d (%f,%f) %p %p)\n", This, run, measuring_mode, baseline_origin.x, baseline_origin.y, + transform, origins); - return E_NOTIMPL; + return compute_glyph_origins(run, measuring_mode, baseline_origin, transform, origins); } static const struct IDWriteFactory4Vtbl dwritefactoryvtbl = { diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 2bdc024..79aebe3 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -6858,6 +6858,70 @@ static void test_HasKerningPairs(void) IDWriteFactory_Release(factory); } +static void test_ComputeGlyphOrigins(void) +{ + IDWriteFactory4 *factory4; + IDWriteFactory *factory; + DWRITE_GLYPH_RUN run; + HRESULT hr; + D2D1_POINT_2F origins[2]; + D2D1_POINT_2F baseline_origin; + UINT16 glyphs[2]; + FLOAT advances[2]; + DWRITE_MATRIX m; + + factory = create_factory(); + hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory4, (void **)&factory4); + IDWriteFactory_Release(factory); + if (FAILED(hr)) { + win_skip("ComputeGlyphOrigins() is not supported.\n"); + return; + } + + advances[0] = 10.0f; + advances[1] = 20.0f; + + run.fontFace = NULL; + run.fontEmSize = 16.0f; + run.glyphCount = 2; + run.glyphIndices = glyphs; + run.glyphAdvances = advances; + run.glyphOffsets = NULL; + run.isSideways = FALSE; + run.bidiLevel = 0; + + baseline_origin.x = 123.0f; + baseline_origin.y = 321.0f; + + memset(origins, 0, sizeof(origins)); + hr = IDWriteFactory4_ComputeGlyphOrigins_(factory4, &run, baseline_origin, origins); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(origins[0].x == 123.0f && origins[0].y == 321.0f, "origins[0] %f,%f\n", origins[0].x, origins[0].y); + ok(origins[1].x == 133.0f && origins[1].y == 321.0f, "origins[1] %f,%f\n", origins[1].x, origins[1].y); + + memset(origins, 0, sizeof(origins)); + hr = IDWriteFactory4_ComputeGlyphOrigins(factory4, &run, DWRITE_MEASURING_MODE_NATURAL, baseline_origin, + NULL, origins); + ok(origins[0].x == 123.0f && origins[0].y == 321.0f, "origins[0] %f,%f\n", origins[0].x, origins[0].y); + ok(origins[1].x == 133.0f && origins[1].y == 321.0f, "origins[1] %f,%f\n", origins[1].x, origins[1].y); + + /* transform is not applied to returned origins */ + m.m11 = 2.0f; + m.m12 = 0.0f; + m.m21 = 0.0f; + m.m22 = 1.0f; + m.dx = 0.0f; + m.dy = 0.0f; + + memset(origins, 0, sizeof(origins)); + hr = IDWriteFactory4_ComputeGlyphOrigins(factory4, &run, DWRITE_MEASURING_MODE_NATURAL, baseline_origin, + &m, origins); + ok(origins[0].x == 123.0f && origins[0].y == 321.0f, "origins[0] %f,%f\n", origins[0].x, origins[0].y); + ok(origins[1].x == 133.0f && origins[1].y == 321.0f, "origins[1] %f,%f\n", origins[1].x, origins[1].y); + + IDWriteFactory4_Release(factory4); +} + START_TEST(font) { IDWriteFactory *factory; @@ -6917,6 +6981,7 @@ START_TEST(font) test_font_properties(); test_HasVerticalGlyphVariants(); test_HasKerningPairs(); + test_ComputeGlyphOrigins(); IDWriteFactory_Release(factory); }

1 0

Józef Kucia : wined3d: Use wined3d_texture_get_texture_name() helper in more places.
by Alexandre Julliard 07 Apr '17

07 Apr '17

Module: wine Branch: master Commit: a727b74264cfe8c78b194b2bb20889e729cc664e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a727b74264cfe8c78b194b2bb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 7 14:45:11 2017 +0200 wined3d: Use wined3d_texture_get_texture_name() helper in more places. 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/context.c | 2 +- dlls/wined3d/view.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c74f7c0..7c090d4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3553,7 +3553,7 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, else if (view->resource->type != WINED3D_RTYPE_BUFFER) { struct wined3d_texture *texture = texture_from_resource(view->resource); - texture_name = wined3d_texture_get_gl_texture(texture, FALSE)->name; + texture_name = wined3d_texture_get_texture_name(texture, context, FALSE); level = view->desc.u.texture.level_idx; } else diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f37b601..7e8d192 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -153,7 +153,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target const struct wined3d_gl_info *gl_info; unsigned int layer_idx, layer_count; struct wined3d_context *context; - struct gl_texture *gl_texture; + GLuint texture_name; view->target = view_target; @@ -168,7 +168,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target } wined3d_texture_prepare_texture(texture, context, FALSE); - gl_texture = wined3d_texture_get_gl_texture(texture, FALSE); + texture_name = wined3d_texture_get_texture_name(texture, context, FALSE); layer_idx = desc->u.texture.layer_idx; layer_count = desc->u.texture.layer_count; @@ -180,7 +180,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target } gl_info->gl_ops.gl.p_glGenTextures(1, &view->name); - GL_EXTCALL(glTextureView(view->name, view->target, gl_texture->name, view_format->glInternal, + GL_EXTCALL(glTextureView(view->name, view->target, texture_name, view_format->glInternal, desc->u.texture.level_idx, desc->u.texture.level_count, layer_idx, layer_count)); checkGLcall("Create texture view");

1 0

Józef Kucia : wined3d: Simply use view size as drawable size for resources other than 2d textures.
by Alexandre Julliard 07 Apr '17

07 Apr '17

Module: wine Branch: master Commit: 84e7a04be27330547e61a16691e23e8a2be26aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=84e7a04be27330547e61a1669… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 7 14:45:12 2017 +0200 wined3d: Simply use view size as drawable size for resources other than 2d textures. 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/view.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 7e8d192..22fd7de 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -347,9 +347,8 @@ void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarg if (view->resource->type != WINED3D_RTYPE_TEXTURE_2D) { - FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(view->resource->type)); - *width = 0; - *height = 0; + *width = view->width; + *height = view->height; return; }

1 0

Józef Kucia : wined3d: Eliminate holes in wined3d_buffer structure.
by Alexandre Julliard 07 Apr '17

07 Apr '17

Module: wine Branch: master Commit: e72d21cc2eb9e32fb0222d788a9074ee3f3bc309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e72d21cc2eb9e32fb0222d788… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 7 14:45:13 2017 +0200 wined3d: Eliminate holes in wined3d_buffer structure. 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/wined3d_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 29a1d66..8ce3363 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3341,19 +3341,19 @@ struct wined3d_buffer GLenum buffer_type_hint; unsigned int bind_flags; DWORD flags; + DWORD locations; void *map_ptr; struct wined3d_map_range *maps; SIZE_T maps_size, modified_areas; - DWORD locations; struct wined3d_event_query *query; /* conversion stuff */ UINT decl_change_count, full_conversion_count; UINT draw_count; UINT stride; /* 0 if no conversion */ - UINT conversion_stride; /* 0 if no shifted conversion */ enum wined3d_buffer_conversion_type *conversion_map; /* NULL if no conversion */ + UINT conversion_stride; /* 0 if no shifted conversion */ }; static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resource *resource)

1 0