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

Stefan Dösinger : wined3d: Query info for each resource type from ARB_internalformat_query2.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: 9def5ff4098db8be848ef101c8dd7a85d7781fdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9def5ff4098db8be848ef101c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 24 10:33:49 2015 +0200 wined3d: Query info for each resource type from ARB_internalformat_query2. --- dlls/wined3d/utils.c | 159 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 109 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9def5ff4098db8be848ef…

1 0

Stefan Dösinger : wined3d: Move the EXT_texture3D check to init_format_texture_info.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: 072e1a3fb26336ee9f363529695dcbae84da64d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=072e1a3fb26336ee9f3635296… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 24 10:33:50 2015 +0200 wined3d: Move the EXT_texture3D check to init_format_texture_info. --- dlls/wined3d/directx.c | 9 --------- dlls/wined3d/utils.c | 9 ++++++++- dlls/wined3d/volume.c | 5 ----- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7e0d530..84c3aa2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4490,15 +4490,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad case WINED3D_RTYPE_VOLUME_TEXTURE: case WINED3D_RTYPE_VOLUME: - /* Volume is to VolumeTexture what Surface is to Texture, but its - * usage caps are not documented. Most driver seem to offer - * (nearly) the same on Volume and VolumeTexture, so do that too. */ - if (!gl_info->supported[EXT_TEXTURE3D]) - { - TRACE("[FAILED] - No volume texture support.\n"); - return WINED3DERR_NOTAVAILABLE; - } - /* The GL_EXT_texture_compression_s3tc spec requires that loading * an s3tc compressed texture results in an error. While the D3D * refrast does support s3tc volumes, at least the nvidia Windows diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index fadd0c9..1d34440 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1852,10 +1852,17 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win format->glFormat = format_texture_info[i].gl_format; format->glType = format_texture_info[i].gl_type; format->color_fixup = COLOR_FIXUP_IDENTITY; - format_set_flag(format, format_texture_info[i].flags); format->height_scale.numerator = 1; format->height_scale.denominator = 1; + format->flags[WINED3D_GL_RES_TYPE_TEX_1D] |= format_texture_info[i].flags; + format->flags[WINED3D_GL_RES_TYPE_TEX_2D] |= format_texture_info[i].flags; + if (gl_info->supported[EXT_TEXTURE3D]) + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] |= format_texture_info[i].flags; + format->flags[WINED3D_GL_RES_TYPE_TEX_CUBE] |= format_texture_info[i].flags; + format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] |= format_texture_info[i].flags; + format->flags[WINED3D_GL_RES_TYPE_BUFFER] |= format_texture_info[i].flags; + if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2]) { query_format_flag(gl_info, format, format->glInternal, GL_VERTEX_TEXTURE, diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index a231081..5241286 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -748,11 +748,6 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_texture HRESULT hr; UINT size; - if (!gl_info->supported[EXT_TEXTURE3D]) - { - WARN("Volume cannot be created - no volume texture support.\n"); - return WINED3DERR_INVALIDCALL; - } /* TODO: Write tests for other resources and move this check * to resource_init, if applicable. */ if (desc->usage & WINED3DUSAGE_DYNAMIC

1 0

Nikolay Sivov : msdmo: Store requested category GUID instead of a pointer to it.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: 0b7b8e3dc34a2bc1156e1a2c7c0d42cc989cc22e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b7b8e3dc34a2bc1156e1a2c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 09:58:50 2015 +0300 msdmo: Store requested category GUID instead of a pointer to it. --- dlls/msdmo/dmoreg.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index f9bf9b3..7a81398 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -90,7 +90,7 @@ typedef struct IEnumDMO IEnumDMO_iface; LONG ref; DWORD index; - const GUID* guidCategory; + GUID category; DWORD dwFlags; DWORD cInTypes; DMO_PARTIAL_MEDIATYPE *pInTypes; @@ -386,7 +386,7 @@ static HRESULT IEnumDMO_Constructor( lpedmo->IEnumDMO_iface.lpVtbl = &edmovt; lpedmo->ref = 1; lpedmo->index = -1; - lpedmo->guidCategory = guidCategory; + lpedmo->category = *guidCategory; lpedmo->dwFlags = dwFlags; if (cInTypes > 0) @@ -692,7 +692,7 @@ static HRESULT WINAPI IEnumDMO_fnClone(IEnumDMO *iface, IEnumDMO **ppEnum) { IEnumDMOImpl *This = impl_from_IEnumDMO(iface); TRACE("(%p)->(%p)\n", This, ppEnum); - return IEnumDMO_Constructor(This->guidCategory, This->dwFlags, This->cInTypes, This->pInTypes, + return IEnumDMO_Constructor(&This->category, This->dwFlags, This->cInTypes, This->pInTypes, This->cOutTypes, This->pOutTypes, ppEnum); } @@ -703,18 +703,35 @@ static HRESULT WINAPI IEnumDMO_fnClone(IEnumDMO *iface, IEnumDMO **ppEnum) * Enumerate DirectX Media Objects in the registry. */ HRESULT WINAPI DMOEnum( - REFGUID guidCategory, - DWORD dwFlags, + REFGUID category, + DWORD flags, DWORD cInTypes, const DMO_PARTIAL_MEDIATYPE *pInTypes, DWORD cOutTypes, const DMO_PARTIAL_MEDIATYPE *pOutTypes, IEnumDMO **ppEnum) { - TRACE("guidCategory=%p dwFlags=0x%08x cInTypes=%d cOutTypes=%d\n", - guidCategory, dwFlags, cInTypes, cOutTypes); + TRACE("%s 0x%08x %d %p %d %p %p\n", debugstr_guid(category), flags, cInTypes, pInTypes, + cOutTypes, pOutTypes, ppEnum); + + if (TRACE_ON(msdmo)) + { + DWORD i; + if (cInTypes) + { + for (i = 0; i < cInTypes; i++) + TRACE("intype %d - type %s, subtype %s\n", i, debugstr_guid(&pInTypes[i].type), + debugstr_guid(&pInTypes[i].subtype)); + } + + if (cOutTypes) { + for (i = 0; i < cOutTypes; i++) + TRACE("outtype %d - type %s, subtype %s\n", i, debugstr_guid(&pOutTypes[i].type), + debugstr_guid(&pOutTypes[i].subtype)); + } + } - return IEnumDMO_Constructor(guidCategory, dwFlags, cInTypes, + return IEnumDMO_Constructor(category, flags, cInTypes, pInTypes, cOutTypes, pOutTypes, ppEnum); }

1 0

Nikolay Sivov : msdmo: Added a helper to duplicate partial media type arrays.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: 55620f097cdbee98f4c4113c3441a50539eb63bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=55620f097cdbee98f4c4113c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 10:08:18 2015 +0300 msdmo: Added a helper to duplicate partial media type arrays. --- dlls/msdmo/dmoreg.c | 53 +++++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 7a81398..7ae01a1 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -360,6 +360,21 @@ HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR name[]) return S_FALSE; } +static HRESULT dup_partial_mediatype(const DMO_PARTIAL_MEDIATYPE *types, DWORD count, DMO_PARTIAL_MEDIATYPE **ret) +{ + *ret = NULL; + + if (count == 0) + return S_OK; + + *ret = HeapAlloc(GetProcessHeap(), 0, count*sizeof(*types)); + if (!*ret) + return E_OUTOFMEMORY; + + memcpy(*ret, types, count*sizeof(*types)); + return S_OK; +} + /************************************************************************** * IEnumDMO_Constructor */ @@ -373,8 +388,7 @@ static HRESULT IEnumDMO_Constructor( IEnumDMO **obj) { IEnumDMOImpl* lpedmo; - HRESULT hr = S_OK; - UINT size; + HRESULT hr; LONG ret; *obj = NULL; @@ -388,32 +402,16 @@ static HRESULT IEnumDMO_Constructor( lpedmo->index = -1; lpedmo->category = *guidCategory; lpedmo->dwFlags = dwFlags; + lpedmo->cInTypes = cInTypes; + lpedmo->cOutTypes = cOutTypes; - if (cInTypes > 0) - { - size = cInTypes * sizeof(DMO_PARTIAL_MEDIATYPE); - lpedmo->pInTypes = HeapAlloc(GetProcessHeap(), 0, size); - if (!lpedmo->pInTypes) - { - hr = E_OUTOFMEMORY; - goto lerr; - } - memcpy(lpedmo->pInTypes, pInTypes, size); - lpedmo->cInTypes = cInTypes; - } + hr = dup_partial_mediatype(pInTypes, cInTypes, &lpedmo->pInTypes); + if (FAILED(hr)) + goto lerr; - if (cOutTypes > 0) - { - size = cOutTypes * sizeof(DMO_PARTIAL_MEDIATYPE); - lpedmo->pOutTypes = HeapAlloc(GetProcessHeap(), 0, size); - if (!lpedmo->pOutTypes) - { - hr = E_OUTOFMEMORY; - goto lerr; - } - memcpy(lpedmo->pOutTypes, pOutTypes, size); - lpedmo->cOutTypes = cOutTypes; - } + hr = dup_partial_mediatype(pOutTypes, cOutTypes, &lpedmo->pOutTypes); + if (FAILED(hr)) + goto lerr; /* If not filtering by category enum from media objects root */ if (IsEqualGUID(guidCategory, &GUID_NULL)) @@ -426,8 +424,7 @@ static HRESULT IEnumDMO_Constructor( WCHAR szguid[64]; WCHAR szKey[MAX_PATH]; - wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories, - GUIDToString(szguid, guidCategory)); + wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories, GUIDToString(szguid, guidCategory)); if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &lpedmo->hkey))) hr = HRESULT_FROM_WIN32(ret); }

1 0

Nikolay Sivov : msdmo: Add more tracing.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: 70297c424ad717b270e7aaf5c48b32b0e22ccd95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70297c424ad717b270e7aaf5c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 11:13:10 2015 +0300 msdmo: Add more tracing. --- dlls/msdmo/dmoreg.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 7ae01a1..dea079a 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -506,7 +506,6 @@ static HRESULT WINAPI IEnumDMO_fnNext( WCHAR ** Names, DWORD * pcItemsFetched) { - FILETIME ft; HKEY hkey; WCHAR szNextKey[MAX_PATH]; WCHAR szGuidKey[64]; @@ -529,7 +528,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( This->index++; len = MAX_PATH; - ret = RegEnumKeyExW(This->hkey, This->index, szNextKey, &len, NULL, NULL, NULL, &ft); + ret = RegEnumKeyExW(This->hkey, This->index, szNextKey, &len, NULL, NULL, NULL, NULL); if (ret != ERROR_SUCCESS) { hres = HRESULT_FROM_WIN32(ret); @@ -552,6 +551,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( wsprintfW(szKey, szCat2Fmt, szDMORootKey, szNextKey); ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &hkey); + TRACE("testing %s\n", debugstr_w(szKey)); if (This->pInTypes) { @@ -571,6 +571,12 @@ static HRESULT WINAPI IEnumDMO_fnNext( pInTypes = (DMO_PARTIAL_MEDIATYPE*) szValue; + TRACE("read %d intypes for %s:\n", cInTypes, debugstr_w(szKey)); + for (i = 0; i < cInTypes; i++) { + TRACE("intype %d: type %s, subtype %s\n", i, debugstr_guid(&pInTypes[i].type), + debugstr_guid(&pInTypes[i].subtype)); + } + for (i = 0; i < This->cInTypes; i++) { for (j = 0; j < cInTypes; j++) @@ -608,6 +614,12 @@ static HRESULT WINAPI IEnumDMO_fnNext( pOutTypes = (DMO_PARTIAL_MEDIATYPE*) szValue; + TRACE("read %d outtypes for %s:\n", cOutTypes, debugstr_w(szKey)); + for (i = 0; i < cOutTypes; i++) { + TRACE("outtype %d: type %s, subtype %s\n", i, debugstr_guid(&pOutTypes[i].type), + debugstr_guid(&pOutTypes[i].subtype)); + } + for (i = 0; i < This->cOutTypes; i++) { for (j = 0; j < cOutTypes; j++)

1 0

Nikolay Sivov : dwrite: Set some more cluster properties.
by Alexandre Julliard 23 Apr '15

23 Apr '15

Module: wine Branch: master Commit: 68edc995c541666cfeb6dc900275436a718a8004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68edc995c541666cfeb6dc900… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 13:01:18 2015 +0300 dwrite: Set some more cluster properties. --- dlls/dwrite/layout.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 9999e6e..f4aa1b6 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -377,6 +377,7 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, UINT16 start_glyph, UINT16 stop_glyph, UINT32 stop_position, DWRITE_CLUSTER_METRICS *metrics) { UINT8 breakcondition; + UINT32 position; UINT16 j; metrics->width = 0.0; @@ -384,16 +385,29 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, metrics->width += run->run.glyphAdvances[j]; metrics->length = 0; + position = stop_position; if (stop_glyph == run->run.glyphCount) breakcondition = get_effective_breakpoint(layout, stop_position).breakConditionAfter; - else + else { breakcondition = get_effective_breakpoint(layout, stop_position).breakConditionBefore; + if (stop_position) position = stop_position - 1; + } metrics->canWrapLineAfter = breakcondition == DWRITE_BREAK_CONDITION_CAN_BREAK || breakcondition == DWRITE_BREAK_CONDITION_MUST_BREAK; - metrics->isWhitespace = FALSE; /* FIXME */ - metrics->isNewline = FALSE; /* FIXME */ - metrics->isSoftHyphen = FALSE; /* FIXME */ + if (metrics->length == 1) { + WORD type; + + GetStringTypeW(CT_CTYPE1, &layout->str[position], 1, &type); + metrics->isWhitespace = type == C1_SPACE; + metrics->isNewline = FALSE /* FIXME */; + metrics->isSoftHyphen = layout->str[position] == 0x00ad /* Unicode Soft Hyphen */; + } + else { + metrics->isWhitespace = FALSE; + metrics->isNewline = FALSE; + metrics->isSoftHyphen = FALSE; + } metrics->isRightToLeft = run->run.bidiLevel & 1; metrics->padding = 0; }

1 0

Nikolay Sivov : dwrite: Track a run this cluster came from.
by Alexandre Julliard 23 Apr '15

23 Apr '15

Module: wine Branch: master Commit: d7a40fd2984ed55f5c618827aa5e22fe8c02ed47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a40fd2984ed55f5c618827a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 13:02:43 2015 +0300 dwrite: Track a run this cluster came from. --- dlls/dwrite/layout.c | 55 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index f4aa1b6..22fbbd3 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -139,6 +139,11 @@ struct layout_run { } u; }; +struct layout_cluster { + const struct layout_run *run; /* link to run this cluster belongs to */ + UINT32 position; /* relative to run, first cluster has 0 position */ +}; + enum layout_recompute_mask { RECOMPUTE_NOMINAL_RUNS = 1 << 0, RECOMPUTE_MINIMAL_WIDTH = 1 << 1, @@ -164,7 +169,8 @@ struct dwrite_textlayout { DWRITE_LINE_BREAKPOINT *nominal_breakpoints; DWRITE_LINE_BREAKPOINT *actual_breakpoints; - DWRITE_CLUSTER_METRICS *clusters; + struct layout_cluster *clusters; + DWRITE_CLUSTER_METRICS *clustermetrics; UINT32 clusters_count; FLOAT minwidth; @@ -420,9 +426,11 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, codepoint initially. */ -static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const struct regular_layout_run *run, UINT32 *cluster) +static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const struct layout_run *r, UINT32 *cluster) { - DWRITE_CLUSTER_METRICS *metrics = &layout->clusters[*cluster]; + DWRITE_CLUSTER_METRICS *metrics = &layout->clustermetrics[*cluster]; + struct layout_cluster *c = &layout->clusters[*cluster]; + const struct regular_layout_run *run = &r->u.regular; UINT32 i, start = 0; for (i = 0; i < run->descr.stringLength; i++) { @@ -431,15 +439,20 @@ static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const s if (run->descr.clusterMap[start] != run->descr.clusterMap[i]) { init_cluster_metrics(layout, run, run->descr.clusterMap[start], run->descr.clusterMap[i], i, metrics); metrics->length = i - start; + c->position = start; + c->run = r; *cluster += 1; metrics++; + c++; start = i; } if (end) { init_cluster_metrics(layout, run, run->descr.clusterMap[start], run->run.glyphCount, i, metrics); metrics->length = i - start + 1; + c->position = start; + c->run = r; *cluster += 1; return; @@ -456,11 +469,18 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) HRESULT hr; free_layout_runs(layout); - heap_free(layout->clusters); + + /* Cluster data arrays are allocated once, assuming one text position per cluster. */ + if (!layout->clustermetrics) { + layout->clustermetrics = heap_alloc(layout->len*sizeof(*layout->clustermetrics)); + layout->clusters = heap_alloc(layout->len*sizeof(*layout->clusters)); + if (!layout->clustermetrics || !layout->clusters) { + heap_free(layout->clustermetrics); + heap_free(layout->clusters); + return E_OUTOFMEMORY; + } + } layout->clusters_count = 0; - layout->clusters = heap_alloc(layout->len*sizeof(DWRITE_CLUSTER_METRICS)); - if (!layout->clusters) - return E_OUTOFMEMORY; hr = get_textanalyzer(&analyzer); if (FAILED(hr)) @@ -508,7 +528,8 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) /* we need to do very little in case of inline objects */ if (r->kind == LAYOUT_RUN_INLINE) { - DWRITE_CLUSTER_METRICS *metrics = &layout->clusters[cluster]; + DWRITE_CLUSTER_METRICS *metrics = &layout->clustermetrics[cluster]; + struct layout_cluster *c = &layout->clusters[cluster]; DWRITE_INLINE_OBJECT_METRICS inlinemetrics; metrics->width = 0.0; @@ -519,6 +540,8 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) metrics->isSoftHyphen = FALSE; metrics->isRightToLeft = FALSE; metrics->padding = 0; + c->run = r; + c->position = 0; /* there's always one cluster per inline object, so 0 is valid value */ cluster++; /* TODO: is it fatal if GetMetrics() fails? */ @@ -630,7 +653,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) run->run.glyphAdvances = run->advances; run->run.glyphOffsets = run->offsets; - layout_set_cluster_metrics(layout, run, &cluster); + layout_set_cluster_metrics(layout, r, &cluster); continue; @@ -1203,6 +1226,7 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout2 *iface) release_format_data(&This->format); heap_free(This->nominal_breakpoints); heap_free(This->actual_breakpoints); + heap_free(This->clustermetrics); heap_free(This->clusters); heap_free(This->str); heap_free(This); @@ -1817,7 +1841,7 @@ static HRESULT WINAPI dwritetextlayout_GetClusterMetrics(IDWriteTextLayout2 *ifa return hr; if (metrics) - memcpy(metrics, This->clusters, sizeof(DWRITE_CLUSTER_METRICS)*min(max_count, This->clusters_count)); + memcpy(metrics, This->clustermetrics, sizeof(DWRITE_CLUSTER_METRICS)*min(max_count, This->clusters_count)); *count = This->clusters_count; return max_count >= This->clusters_count ? S_OK : E_NOT_SUFFICIENT_BUFFER; @@ -1827,11 +1851,11 @@ static HRESULT WINAPI dwritetextlayout_GetClusterMetrics(IDWriteTextLayout2 *ifa too hard to break. */ static inline BOOL is_terminal_cluster(struct dwrite_textlayout *layout, UINT32 index) { - if (layout->clusters[index].isWhitespace || layout->clusters[index].isNewline || + if (layout->clustermetrics[index].isWhitespace || layout->clustermetrics[index].isNewline || (index == layout->clusters_count - 1)) return TRUE; /* check next one */ - return (index < layout->clusters_count - 1) && layout->clusters[index+1].isWhitespace; + return (index < layout->clusters_count - 1) && layout->clustermetrics[index+1].isWhitespace; } static HRESULT WINAPI dwritetextlayout_DetermineMinWidth(IDWriteTextLayout2 *iface, FLOAT* min_width) @@ -1856,17 +1880,17 @@ static HRESULT WINAPI dwritetextlayout_DetermineMinWidth(IDWriteTextLayout2 *ifa for (i = 0; i < This->clusters_count;) { if (is_terminal_cluster(This, i)) { - width = This->clusters[i].width; + width = This->clustermetrics[i].width; i++; } else { width = 0.0; while (!is_terminal_cluster(This, i)) { - width += This->clusters[i].width; + width += This->clustermetrics[i].width; i++; } /* count last one too */ - width += This->clusters[i].width; + width += This->clustermetrics[i].width; } if (width > This->minwidth) @@ -2716,6 +2740,7 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * layout->nominal_breakpoints = NULL; layout->actual_breakpoints = NULL; layout->clusters_count = 0; + layout->clustermetrics = NULL; layout->clusters = NULL; layout->minwidth = 0.0; list_init(&layout->runs);

1 0

Nikolay Sivov : dwrite: Trace text strings up to specified length.
by Alexandre Julliard 23 Apr '15

23 Apr '15

Module: wine Branch: master Commit: a457b5e069021911972352be19761ef5e2f37c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a457b5e069021911972352be1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 13:13:51 2015 +0300 dwrite: Trace text strings up to specified length. --- dlls/dwrite/analyzer.c | 7 +++---- dlls/dwrite/main.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 85681b2..b8bd5a8 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -663,7 +663,6 @@ static HRESULT WINAPI dwritetextanalyzer_QueryInterface(IDWriteTextAnalyzer2 *if *obj = NULL; return E_NOINTERFACE; - } static ULONG WINAPI dwritetextanalyzer_AddRef(IDWriteTextAnalyzer2 *iface) @@ -1032,7 +1031,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 HRESULT hr; UINT32 i; - TRACE("(%s %p %p %u %p %p %u %p %.2f %d %d %p %s %p %p %u %p %p)\n", debugstr_w(text), + TRACE("(%s %p %p %u %p %p %u %p %.2f %d %d %p %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, is_sideways, is_rtl, analysis, debugstr_w(locale), features, feature_range_len, feature_ranges, advances, offsets); @@ -1070,7 +1069,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite DWRITE_SCRIPT_ANALYSIS const* analysis, WCHAR const* locale, DWRITE_TYPOGRAPHIC_FEATURES const** features, UINT32 const* feature_range_lengths, UINT32 feature_ranges, FLOAT* glyph_advances, DWRITE_GLYPH_OFFSET* glyph_offsets) { - FIXME("(%s %p %p %u %p %p %u %p %f %f %p %d %d %d %p %s %p %p %u %p %p): stub\n", debugstr_w(text), + FIXME("(%s %p %p %u %p %p %u %p %f %f %p %d %d %d %p %s %p %p %u %p %p): stub\n", debugstr_wn(text, text_len), clustermap, props, text_len, glyph_indices, glyph_props, glyph_count, font_face, fontEmSize, pixels_per_dip, transform, use_gdi_natural, is_sideways, is_rtl, analysis, debugstr_w(locale), features, feature_range_lengths, feature_ranges, glyph_advances, glyph_offsets); @@ -1184,7 +1183,7 @@ static HRESULT WINAPI dwritetextanalyzer1_GetJustificationOpportunities(IDWriteT const WCHAR *text, const UINT16 *clustermap, const DWRITE_SHAPING_GLYPH_PROPERTIES *prop, DWRITE_JUSTIFICATION_OPPORTUNITY *jo) { FIXME("(%p %.2f %u %u %u %s %p %p %p): stub\n", face, font_em_size, sa.script, length, glyph_count, - debugstr_w(text), clustermap, prop, jo); + debugstr_wn(text, length), clustermap, prop, jo); return E_NOTIMPL; } diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 6a4ed91..3285f2d 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1027,7 +1027,7 @@ static HRESULT WINAPI dwritefactory_CreateTextLayout(IDWriteFactory2 *iface, WCH UINT32 len, IDWriteTextFormat *format, FLOAT max_width, FLOAT max_height, IDWriteTextLayout **layout) { struct dwritefactory *This = impl_from_IDWriteFactory2(iface); - TRACE("(%p)->(%s %u %p %f %f %p)\n", This, debugstr_w(string), len, format, max_width, max_height, layout); + TRACE("(%p)->(%s:%u %p %f %f %p)\n", This, debugstr_wn(string, len), len, format, max_width, max_height, layout); if (!format) return E_INVALIDARG; return create_textlayout(string, len, format, max_width, max_height, layout);

1 0

Stefan Dösinger : wined3d: Shadow format flags in wined3d_rendertarget_view.
by Alexandre Julliard 23 Apr '15

23 Apr '15

Module: wine Branch: master Commit: 4fbaab20201b73b074abefd36b808a63571579ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fbaab20201b73b074abefd36… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 23 11:28:15 2015 +0200 wined3d: Shadow format flags in wined3d_rendertarget_view. --- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/state.c | 8 ++++---- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/view.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d5a90c0..c249c9a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2344,8 +2344,8 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && state->render_states[WINED3D_RS_SRGBWRITEENABLE]) { - const struct wined3d_format *rt_format = state->fb->render_targets[0]->format; - if (rt_format->flags & WINED3DFMT_FLAG_SRGB_WRITE) + unsigned int rt_fmt_flags = state->fb->render_targets[0]->format_flags; + if (rt_fmt_flags & WINED3DFMT_FLAG_SRGB_WRITE) { static unsigned int warned = 0; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 91f3485..b025dff 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -368,6 +368,7 @@ static GLenum gl_blend_factor(enum wined3d_blend factor, const struct wined3d_fo static void state_blend(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_format *rt_format = state->fb->render_targets[0]->format; + unsigned int rt_fmt_flags = state->fb->render_targets[0]->format_flags; const struct wined3d_gl_info *gl_info = context->gl_info; GLenum srcBlend, dstBlend; enum wined3d_blend d3d_blend; @@ -381,7 +382,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st /* Disable blending in all cases even without pixelshaders. * With blending on we could face a big performance penalty. * The d3d9 visual test confirms the behavior. */ - if (context->render_offscreen && !(rt_format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) + if (context->render_offscreen && !(rt_fmt_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) { gl_info->gl_ops.gl.p_glDisable(GL_BLEND); checkGLcall("glDisable GL_BLEND"); @@ -4899,13 +4900,12 @@ static void psorigin(struct wined3d_context *context, const struct wined3d_state void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct wined3d_format *rt_format = state->fb->render_targets[0]->format; + unsigned int rt_fmt_flags = state->fb->render_targets[0]->format_flags; const struct wined3d_gl_info *gl_info = context->gl_info; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - if (state->render_states[WINED3D_RS_SRGBWRITEENABLE] - && rt_format->flags & WINED3DFMT_FLAG_SRGB_WRITE) + if (state->render_states[WINED3D_RS_SRGBWRITEENABLE] && rt_fmt_flags & WINED3DFMT_FLAG_SRGB_WRITE) gl_info->gl_ops.gl.p_glEnable(GL_FRAMEBUFFER_SRGB); else gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1686e30..5596375 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3686,7 +3686,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d unsigned int i; DWORD ttff; DWORD cop, aop, carg0, carg1, carg2, aarg0, aarg1, aarg2; - const struct wined3d_format *rt_format = state->fb->render_targets[0]->format; + unsigned int rt_fmt_flags = state->fb->render_targets[0]->format_flags; const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_d3d_info *d3d_info = context->d3d_info; @@ -3902,7 +3902,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d } if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && state->render_states[WINED3D_RS_SRGBWRITEENABLE] - && rt_format->flags & WINED3DFMT_FLAG_SRGB_WRITE) + && rt_fmt_flags & WINED3DFMT_FLAG_SRGB_WRITE) { settings->sRGB_write = 1; } else { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 9cda64d..83cd772 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -101,6 +101,7 @@ static void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *vie view->parent_ops = parent_ops; view->format = wined3d_get_format(gl_info, desc->format_id); + view->format_flags = view->format->flags; if (resource->type == WINED3D_RTYPE_BUFFER) { view->sub_resource_idx = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 782f54f..dd2a85a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2692,6 +2692,7 @@ struct wined3d_rendertarget_view const struct wined3d_parent_ops *parent_ops; const struct wined3d_format *format; + unsigned int format_flags; unsigned int sub_resource_idx; unsigned int buffer_offset;

1 0

Stefan Leichter : wtsapi32: Add stub for WTSEnableChildSessions.
by Alexandre Julliard 23 Apr '15

23 Apr '15

Module: wine Branch: master Commit: 0c525e79c45620cce8329df7633c275564efa12f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c525e79c45620cce8329df76… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Apr 22 20:48:48 2015 +0200 wtsapi32: Add stub for WTSEnableChildSessions. --- dlls/wtsapi32/wtsapi32.c | 9 +++++++++ dlls/wtsapi32/wtsapi32.spec | 1 + include/wtsapi32.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 79d5a7f..c668604 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -62,6 +62,15 @@ BOOL WINAPI WTSDisconnectSession(HANDLE hServer, DWORD SessionId, BOOL bWait) } /************************************************************ + * WTSEnableChildSessions (WTSAPI32.@) + */ +BOOL WINAPI WTSEnableChildSessions(BOOL enable) +{ + FIXME("Stub %d\n", enable); + return TRUE; +} + +/************************************************************ * WTSEnumerateProcessesA (WTSAPI32.@) */ BOOL WINAPI WTSEnumerateProcessesA(HANDLE hServer, DWORD Reserved, DWORD Version, diff --git a/dlls/wtsapi32/wtsapi32.spec b/dlls/wtsapi32/wtsapi32.spec index d94ef88..2b01741 100644 --- a/dlls/wtsapi32/wtsapi32.spec +++ b/dlls/wtsapi32/wtsapi32.spec @@ -2,6 +2,7 @@ @ stdcall WTSConnectSessionA(long long ptr long) @ stdcall WTSConnectSessionW(long long ptr long) @ stdcall WTSDisconnectSession(long long long) +@ stdcall WTSEnableChildSessions(long) @ stdcall WTSEnumerateProcessesA(long long long ptr ptr) @ stdcall WTSEnumerateProcessesW(long long long ptr ptr) @ stdcall WTSEnumerateServersA(ptr long long ptr ptr) diff --git a/include/wtsapi32.h b/include/wtsapi32.h index d00a699..304a418 100644 --- a/include/wtsapi32.h +++ b/include/wtsapi32.h @@ -142,6 +142,7 @@ BOOL WINAPI WTSConnectSessionA(ULONG, ULONG, PSTR, BOOL); BOOL WINAPI WTSConnectSessionW(ULONG, ULONG, PWSTR, BOOL); #define WTSConnectSession WINELIB_NAME_AW(WTSConnectSession) BOOL WINAPI WTSDisconnectSession(HANDLE, DWORD, BOOL); +BOOL WINAPI WTSEnableChildSessions(BOOL); BOOL WINAPI WTSEnumerateProcessesA(HANDLE, DWORD, DWORD, PWTS_PROCESS_INFOA *, DWORD *); BOOL WINAPI WTSEnumerateProcessesW(HANDLE, DWORD, DWORD, PWTS_PROCESS_INFOW *, DWORD *); #define WTSEnumerateProcesses WINELIB_NAME_AW(WTSEnumerateProcesses)

1 0