December 2014 - Wine-Commits

Nikolay Sivov : msdmo: Fix RegOpenKeyExW() failure condition.
by Alexandre Julliard Dec. 29, 2014

Dec. 29, 2014

Module: wine Branch: master Commit: 6eab4981601408237b9eac0f3e49f33562df6a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eab4981601408237b9eac0f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 29 00:22:11 2014 +0300 msdmo: Fix RegOpenKeyExW() failure condition. Spotted by Mark Harmstone. --- dlls/msdmo/dmoreg.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 77ddfa6..74ab6b6 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -364,6 +364,7 @@ static HRESULT IEnumDMO_Constructor( IEnumDMOImpl* lpedmo; HRESULT hr = S_OK; UINT size; + LONG ret; *obj = NULL; @@ -406,8 +407,8 @@ static HRESULT IEnumDMO_Constructor( /* If not filtering by category enum from media objects root */ if (IsEqualGUID(guidCategory, &GUID_NULL)) { - if (!RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_READ, &lpedmo->hkey)) - hr = E_FAIL; + if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_READ, &lpedmo->hkey))) + hr = HRESULT_FROM_WIN32(ret); } else { @@ -416,8 +417,8 @@ static HRESULT IEnumDMO_Constructor( wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories, GUIDToString(szguid, guidCategory)); - if (!RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &lpedmo->hkey)) - hr = E_FAIL; + if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &lpedmo->hkey))) + hr = HRESULT_FROM_WIN32(ret); } lerr:

1 0

Nikolay Sivov : ntdll: Fix 'description' element parsing to allow empty elements.
by Alexandre Julliard Dec. 29, 2014

Dec. 29, 2014

Module: wine Branch: master Commit: c134466224d0e709ab7ffc206013f79d70fe27d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c134466224d0e709ab7ffc206… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 26 21:07:46 2014 +0300 ntdll: Fix 'description' element parsing to allow empty elements. --- dlls/kernel32/tests/actctx.c | 1 + dlls/ntdll/actctx.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 97e7dd2..e30d985 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -97,6 +97,7 @@ static const char manifest3[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assemblyIdentity version=\"1.2.3.4\" name=\"Wine.Test\" type=\"win32\"" " publicKeyToken=\"6595b6414666f1df\" />" +"<description />" "<file name=\"testlib.dll\">" "<windowClass>wndClass</windowClass>" " <comClass description=\"Test com class\"" diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 8fb6624..ba6378e 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1834,11 +1834,16 @@ static BOOL parse_binding_redirect_elem(xmlbuf_t* xmlbuf) static BOOL parse_description_elem(xmlbuf_t* xmlbuf) { - xmlstr_t elem, content; - BOOL end = FALSE, ret = TRUE; + xmlstr_t elem, content, attr_name, attr_value; + BOOL end = FALSE, ret = TRUE, error = FALSE; - if (!parse_expect_no_attr(xmlbuf, &end) || end || - !parse_text_content(xmlbuf, &content)) + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), debugstr_xmlstr(&attr_value)); + + if (error) return FALSE; + if (end) return TRUE; + + if (!parse_text_content(xmlbuf, &content)) return FALSE; TRACE("Got description %s\n", debugstr_xmlstr(&content));

1 0

Nikolay Sivov : dwrite: Store nominal breakpoint data in layout.
by Alexandre Julliard Dec. 29, 2014

Dec. 29, 2014

Module: wine Branch: master Commit: 83aafaaae80789868c46b090126a93bd59c59545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83aafaaae80789868c46b0901… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 25 14:03:19 2014 +0300 dwrite: Store nominal breakpoint data in layout. --- dlls/dwrite/layout.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 5b23a0c..1ede48c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -120,6 +120,8 @@ struct dwrite_textlayout { struct list ranges; struct list runs; BOOL recompute; + + DWRITE_LINE_BREAKPOINT *breakpoints; }; struct dwrite_textformat { @@ -276,6 +278,24 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) } } + /* nominal breakpoints are evaluated only once, because string never changes */ + if (!layout->breakpoints) { + IDWriteTextAnalyzer *analyzer; + HRESULT hr; + + layout->breakpoints = heap_alloc(sizeof(DWRITE_LINE_BREAKPOINT)*layout->len); + if (!layout->breakpoints) + return E_OUTOFMEMORY; + + hr = get_textanalyzer(&analyzer); + if (FAILED(hr)) + return hr; + + hr = IDWriteTextAnalyzer_AnalyzeLineBreakpoints(analyzer, &layout->IDWriteTextAnalysisSource_iface, + 0, layout->len, &layout->IDWriteTextAnalysisSink_iface); + IDWriteTextAnalyzer_Release(analyzer); + } + layout->recompute = FALSE; return hr; } @@ -675,6 +695,7 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout2 *iface) free_layout_ranges_list(This); free_layout_runs(This); release_format_data(&This->format); + heap_free(This->breakpoints); heap_free(This->str); heap_free(This); } @@ -1575,7 +1596,13 @@ static HRESULT WINAPI dwritetextlayout_sink_SetScriptAnalysis(IDWriteTextAnalysi static HRESULT WINAPI dwritetextlayout_sink_SetLineBreakpoints(IDWriteTextAnalysisSink *iface, UINT32 position, UINT32 length, DWRITE_LINE_BREAKPOINT const* breakpoints) { - return E_NOTIMPL; + struct dwrite_textlayout *layout = impl_from_IDWriteTextAnalysisSink(iface); + + if (position + length > layout->len) + return E_FAIL; + + memcpy(&layout->breakpoints[position], breakpoints, length*sizeof(DWRITE_LINE_BREAKPOINT)); + return S_OK; } static HRESULT WINAPI dwritetextlayout_sink_SetBidiLevel(IDWriteTextAnalysisSink *iface, UINT32 position, @@ -1806,6 +1833,7 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *forma This->maxwidth = maxwidth; This->maxheight = maxheight; This->recompute = TRUE; + This->breakpoints = NULL; layout_format_from_textformat(This, format); list_init(&This->runs);

1 0

Piotr Caban : msvcp70: Fix ios_base definition.
by Alexandre Julliard Dec. 29, 2014

Dec. 29, 2014

Module: wine Branch: master Commit: be6e7727d22f19ed6d005369d3b1699583c12674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be6e7727d22f19ed6d005369d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 25 16:50:27 2014 +0100 msvcp70: Fix ios_base definition. --- dlls/msvcp90/msvcp90.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index d7c0a31..5e7b427 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -352,7 +352,7 @@ typedef struct _ios_base { const vtable_ptr *vtable; #if _MSVCP_VER >= 100 MSVCP_size_t DECLSPEC_ALIGN(8) stdstr; -#else +#elif _MSVCP_VER >= 71 MSVCP_size_t stdstr; #endif IOSB_iostate state; @@ -363,6 +363,9 @@ typedef struct _ios_base { IOS_BASE_iosarray *arr; IOS_BASE_fnarray *calls; locale *loc; +#if _MSVCP_VER == 70 + MSVCP_size_t stdstr; +#endif } ios_base; /* class basic_streambuf<char> */

1 0

Mark Harmstone : dsound: Remove unused struct entries.
by Alexandre Julliard Dec. 29, 2014

Dec. 29, 2014

Module: wine Branch: master Commit: b7a2f0879c6982eff9e8923b3c3bdd437205bb36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a2f0879c6982eff9e8923b3… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Dec 27 21:31:00 2014 +0000 dsound: Remove unused struct entries. --- dlls/dsound/dsound_private.h | 3 --- dlls/dsound/mixer.c | 8 -------- 2 files changed, 11 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index a8f5f42..493df91 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -53,10 +53,7 @@ typedef struct _DSVOLUMEPAN DWORD dwTotalLeftAmpFactor; DWORD dwTotalRightAmpFactor; LONG lVolume; - DWORD dwVolAmpFactor; LONG lPan; - DWORD dwPanLeftAmpFactor; - DWORD dwPanRightAmpFactor; } DSVOLUMEPAN,*PDSVOLUMEPAN; /***************************************************************************** diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 0fae20e..5e24382 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -51,8 +51,6 @@ void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan) TRACE("Vol=%d Pan=%d\n", volpan->lVolume, volpan->lPan); /* the AmpFactors are expressed in 16.16 fixed point */ - volpan->dwVolAmpFactor = (ULONG) (pow(2.0, volpan->lVolume / 600.0) * 0xffff); - /* FIXME: dwPan{Left|Right}AmpFactor */ /* FIXME: use calculated vol and pan ampfactors */ temp = (double) (volpan->lVolume - (volpan->lPan > 0 ? volpan->lPan : 0)); @@ -78,15 +76,9 @@ void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) else right=600 * log(((double)volpan->dwTotalRightAmpFactor) / 0xffff) / log(2); if (left<right) - { volpan->lVolume=right; - volpan->dwVolAmpFactor=volpan->dwTotalRightAmpFactor; - } else - { volpan->lVolume=left; - volpan->dwVolAmpFactor=volpan->dwTotalLeftAmpFactor; - } if (volpan->lVolume < -10000) volpan->lVolume=-10000; volpan->lPan=right-left;

1 0

Nikolay Sivov : msdmo: Registry API functions don't return HRESULT codes.
by Alexandre Julliard Dec. 29, 2014

Dec. 29, 2014

Module: wine Branch: master Commit: 5c91d011bbdff0cac6535c866ef5498b1ddc42c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c91d011bbdff0cac6535c866… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 29 00:13:56 2014 +0300 msdmo: Registry API functions don't return HRESULT codes. --- dlls/msdmo/dmoreg.c | 83 +++++++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 37 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index e8f67c5..77ddfa6 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -129,10 +129,11 @@ static BOOL IsMediaTypeEqual(const DMO_PARTIAL_MEDIATYPE* mt1, const DMO_PARTIAL static HRESULT write_types(HKEY hkey, LPCWSTR name, const DMO_PARTIAL_MEDIATYPE* types, DWORD count) { - HRESULT hres = S_OK; + LONG ret; + if (MSDMO_MAJOR_VERSION > 5) { - hres = RegSetValueExW(hkey, name, 0, REG_BINARY, (const BYTE*) types, + ret = RegSetValueExW(hkey, name, 0, REG_BINARY, (const BYTE*) types, count* sizeof(DMO_PARTIAL_MEDIATYPE)); } else @@ -141,15 +142,18 @@ static HRESULT write_types(HKEY hkey, LPCWSTR name, const DMO_PARTIAL_MEDIATYPE* DWORD index = 0; WCHAR szGuidKey[64]; - hres = RegCreateKeyExW(hkey, name, 0, NULL, REG_OPTION_NON_VOLATILE, + ret = RegCreateKeyExW(hkey, name, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &skey1, NULL); + if (ret) + return HRESULT_FROM_WIN32(ret); + while (index < count) { GUIDToString(szGuidKey,&types[index].type); - hres = RegCreateKeyExW(skey1, szGuidKey, 0, NULL, + ret = RegCreateKeyExW(skey1, szGuidKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &skey2, NULL); GUIDToString(szGuidKey,&types[index].subtype); - hres = RegCreateKeyExW(skey2, szGuidKey, 0, NULL, + ret = RegCreateKeyExW(skey2, szGuidKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &skey3, NULL); RegCloseKey(skey3); RegCloseKey(skey2); @@ -158,7 +162,7 @@ static HRESULT write_types(HKEY hkey, LPCWSTR name, const DMO_PARTIAL_MEDIATYPE* RegCloseKey(skey1); } - return hres; + return HRESULT_FROM_WIN32(ret); } /*************************************************************** @@ -256,29 +260,29 @@ lend: */ HRESULT WINAPI DMOUnregister(REFCLSID clsidDMO, REFGUID guidCategory) { - HRESULT hres; WCHAR szguid[64]; HKEY hrkey = 0; HKEY hckey = 0; + LONG ret; GUIDToString(szguid, clsidDMO); TRACE("%s %p\n", debugstr_w(szguid), guidCategory); - hres = RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_WRITE, &hrkey); - if (ERROR_SUCCESS != hres) + ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_WRITE, &hrkey); + if (ERROR_SUCCESS != ret) goto lend; - hres = RegDeleteKeyW(hrkey, szguid); - if (ERROR_SUCCESS != hres) + ret = RegDeleteKeyW(hrkey, szguid); + if (ERROR_SUCCESS != ret) goto lend; - hres = RegOpenKeyExW(hrkey, szDMOCategories, 0, KEY_WRITE, &hckey); - if (ERROR_SUCCESS != hres) + ret = RegOpenKeyExW(hrkey, szDMOCategories, 0, KEY_WRITE, &hckey); + if (ERROR_SUCCESS != ret) goto lend; - hres = RegDeleteKeyW(hckey, szguid); - if (ERROR_SUCCESS != hres) + ret = RegDeleteKeyW(hckey, szguid); + if (ERROR_SUCCESS != ret) goto lend; lend: @@ -287,7 +291,7 @@ lend: if (hrkey) RegCloseKey(hrkey); - return hres; + return HRESULT_FROM_WIN32(ret); } @@ -299,27 +303,24 @@ lend: HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR szName[]) { WCHAR szguid[64]; - HRESULT hres; HKEY hrkey = 0; HKEY hkey = 0; static const INT max_name_len = 80; DWORD count; + LONG ret; TRACE("%s\n", debugstr_guid(clsidDMO)); - hres = RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, - 0, KEY_READ, &hrkey); - if (ERROR_SUCCESS != hres) + ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_READ, &hrkey); + if (ERROR_SUCCESS != ret) goto lend; - hres = RegOpenKeyExW(hrkey, GUIDToString(szguid, clsidDMO), - 0, KEY_READ, &hkey); - if (ERROR_SUCCESS != hres) + ret = RegOpenKeyExW(hrkey, GUIDToString(szguid, clsidDMO), 0, KEY_READ, &hkey); + if (ERROR_SUCCESS != ret) goto lend; count = max_name_len * sizeof(WCHAR); - hres = RegQueryValueExW(hkey, NULL, NULL, NULL, - (LPBYTE) szName, &count); + ret = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE) szName, &count); TRACE(" szName=%s\n", debugstr_w(szName)); lend: @@ -328,10 +329,9 @@ lend: if (hkey) RegCloseKey(hkey); - return hres; + return HRESULT_FROM_WIN32(ret); } - /************************************************************************** * IEnumDMOImpl_Destructor */ @@ -506,6 +506,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( DWORD len; UINT count = 0; HRESULT hres = S_OK; + LONG ret; IEnumDMOImpl *This = impl_from_IEnumDMO(iface); @@ -519,17 +520,20 @@ static HRESULT WINAPI IEnumDMO_fnNext( This->index++; len = MAX_PATH; - hres = RegEnumKeyExW(This->hkey, This->index, szNextKey, &len, NULL, NULL, NULL, &ft); - if (hres != ERROR_SUCCESS) + ret = RegEnumKeyExW(This->hkey, This->index, szNextKey, &len, NULL, NULL, NULL, &ft); + if (ret != ERROR_SUCCESS) + { + hres = HRESULT_FROM_WIN32(ret); break; + } TRACE("found %s\n", debugstr_w(szNextKey)); if (!(This->dwFlags & DMO_ENUMF_INCLUDE_KEYED)) { wsprintfW(szKey, szCat3Fmt, szDMORootKey, szNextKey, szDMOKeyed); - hres = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &hkey); - if (ERROR_SUCCESS == hres) + ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &hkey); + if (ERROR_SUCCESS == ret) { RegCloseKey(hkey); /* Skip Keyed entries */ @@ -538,7 +542,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( } wsprintfW(szKey, szCat2Fmt, szDMORootKey, szNextKey); - hres = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &hkey); + ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &hkey); if (This->pInTypes) { @@ -550,7 +554,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( sizeof(szValue)/sizeof(DMO_PARTIAL_MEDIATYPE), (DMO_PARTIAL_MEDIATYPE*)szValue); - if (ERROR_SUCCESS != hres) + if (FAILED(hres)) { RegCloseKey(hkey); continue; @@ -587,7 +591,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( sizeof(szValue)/sizeof(DMO_PARTIAL_MEDIATYPE), (DMO_PARTIAL_MEDIATYPE*)szValue); - if (ERROR_SUCCESS != hres) + if (FAILED(hres)) { RegCloseKey(hkey); continue; @@ -617,8 +621,8 @@ static HRESULT WINAPI IEnumDMO_fnNext( /* Media object wasn't filtered so add it to return list */ Names[count] = NULL; len = MAX_PATH * sizeof(WCHAR); - hres = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE) szValue, &len); - if (ERROR_SUCCESS == hres) + ret = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE)szValue, &len); + if (ERROR_SUCCESS == ret) { Names[count] = HeapAlloc(GetProcessHeap(), 0, (strlenW(szValue) + 1) * sizeof(WCHAR)); if (Names[count]) @@ -718,11 +722,16 @@ static const IEnumDMOVtbl edmovt = HRESULT read_types(HKEY root, LPCWSTR key, ULONG *supplied, ULONG requested, DMO_PARTIAL_MEDIATYPE* types ) { HRESULT ret = S_OK; + if (MSDMO_MAJOR_VERSION > 5) { DWORD len; + LONG rc; + len = requested * sizeof(DMO_PARTIAL_MEDIATYPE); - ret = RegQueryValueExW(root, key, NULL, NULL, (LPBYTE) types, &len); + rc = RegQueryValueExW(root, key, NULL, NULL, (LPBYTE) types, &len); + ret = HRESULT_FROM_WIN32(rc); + *supplied = len / sizeof(DMO_PARTIAL_MEDIATYPE); } else

1 0

Alex Henrie : dpvoice: Decrement reference count in Release functions.
by Alexandre Julliard Dec. 29, 2014

Dec. 29, 2014

Module: wine Branch: master Commit: 8479229ae80bb74270ca7400e37d0efe8f3857e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8479229ae80bb74270ca7400e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Dec 27 23:35:16 2014 -0700 dpvoice: Decrement reference count in Release functions. --- dlls/dpvoice/client.c | 4 ++-- dlls/dpvoice/server.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dpvoice/client.c b/dlls/dpvoice/client.c index 0fab0c5..29b5336 100644 --- a/dlls/dpvoice/client.c +++ b/dlls/dpvoice/client.c @@ -83,7 +83,7 @@ static ULONG WINAPI dpvclient_AddRef(IDirectPlayVoiceClient *iface) static ULONG WINAPI dpvclient_Release(IDirectPlayVoiceClient *iface) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - ULONG ref = InterlockedIncrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%u\n", This, ref); @@ -270,7 +270,7 @@ static ULONG WINAPI dpvtest_AddRef(IDirectPlayVoiceTest *iface) static ULONG WINAPI dpvtest_Release(IDirectPlayVoiceTest *iface) { IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); - ULONG ref = InterlockedIncrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%u\n", This, ref); diff --git a/dlls/dpvoice/server.c b/dlls/dpvoice/server.c index eb2c9ed..e9291e2 100644 --- a/dlls/dpvoice/server.c +++ b/dlls/dpvoice/server.c @@ -68,10 +68,11 @@ static ULONG WINAPI dpvserver_AddRef(IDirectPlayVoiceServer *iface) return ref; } + static ULONG WINAPI dpvserver_Release(IDirectPlayVoiceServer *iface) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - ULONG ref = InterlockedIncrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%u\n", This, ref);

1 0

Nikolay Sivov : dwrite: Update breakpoints in case of inline objects.
by Alexandre Julliard Dec. 29, 2014

Dec. 29, 2014

Module: wine Branch: master Commit: cb4e88196372a9361517919e912a687e23a56eaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb4e88196372a9361517919e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 26 00:01:28 2014 +0300 dwrite: Update breakpoints in case of inline objects. --- dlls/dwrite/layout.c | 109 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 90 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 1ede48c..8717f63 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -121,7 +121,8 @@ struct dwrite_textlayout { struct list runs; BOOL recompute; - DWRITE_LINE_BREAKPOINT *breakpoints; + DWRITE_LINE_BREAKPOINT *nominal_breakpoints; + DWRITE_LINE_BREAKPOINT *actual_breakpoints; }; struct dwrite_textformat { @@ -226,6 +227,70 @@ static void free_layout_runs(struct dwrite_textlayout *layout) } } +/* should only be called for ranges with inline objects */ +static inline DWRITE_BREAK_CONDITION override_break_condition(DWRITE_BREAK_CONDITION existingbreak, DWRITE_BREAK_CONDITION newbreak) +{ + switch (existingbreak) { + case DWRITE_BREAK_CONDITION_NEUTRAL: + return newbreak; + case DWRITE_BREAK_CONDITION_CAN_BREAK: + return newbreak == DWRITE_BREAK_CONDITION_NEUTRAL ? existingbreak : newbreak; + /* let's keep stronger conditions as is */ + case DWRITE_BREAK_CONDITION_MAY_NOT_BREAK: + case DWRITE_BREAK_CONDITION_MUST_BREAK: + break; + default: + ERR("unknown break condition %d\n", existingbreak); + } + + return existingbreak; +} + +static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, const struct layout_range *cur) +{ + DWRITE_BREAK_CONDITION before, after; + HRESULT hr; + UINT32 i; + + hr = IDWriteInlineObject_GetBreakConditions(cur->object, &before, &after); + if (FAILED(hr)) + return hr; + + if (!layout->actual_breakpoints) { + layout->actual_breakpoints = heap_alloc(sizeof(DWRITE_LINE_BREAKPOINT)*layout->len); + if (!layout->actual_breakpoints) + return E_OUTOFMEMORY; + } + memcpy(layout->actual_breakpoints, layout->nominal_breakpoints, sizeof(DWRITE_LINE_BREAKPOINT)*layout->len); + + for (i = cur->range.startPosition; i < cur->range.length + cur->range.startPosition; i++) { + UINT32 j = i + cur->range.startPosition; + if (i == 0) { + if (j) + layout->actual_breakpoints[j].breakConditionBefore = layout->actual_breakpoints[j-1].breakConditionAfter = + override_break_condition(layout->actual_breakpoints[j-1].breakConditionAfter, before); + else + layout->actual_breakpoints[j].breakConditionBefore = before; + + layout->actual_breakpoints[j].breakConditionAfter = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; + } + + layout->actual_breakpoints[j].isWhitespace = 0; + layout->actual_breakpoints[j].isSoftHyphen = 0; + + if (i == cur->range.length - 1) { + layout->actual_breakpoints[j].breakConditionBefore = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; + if (j < layout->len - 1) + layout->actual_breakpoints[j].breakConditionAfter = layout->actual_breakpoints[j+1].breakConditionAfter = + override_break_condition(layout->actual_breakpoints[j+1].breakConditionAfter, before); + else + layout->actual_breakpoints[j].breakConditionAfter = before; + } + } + + return S_OK; +} + static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) { IDWriteTextAnalyzer *analyzer; @@ -240,8 +305,12 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) LIST_FOR_EACH_ENTRY(cur, &layout->ranges, struct layout_range, entry) { /* inline objects override actual text in a range */ - if (cur->object) + if (cur->object) { + hr = layout_update_breakpoints_range(layout, cur); + if (FAILED(hr)) + return hr; continue; + } /* initial splitting by script */ hr = IDWriteTextAnalyzer_AnalyzeScript(analyzer, &layout->IDWriteTextAnalysisSource_iface, @@ -267,24 +336,13 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) if (!layout->recompute) return S_OK; - hr = layout_compute_runs(layout); - - if (TRACE_ON(dwrite)) { - struct layout_run *cur; - - LIST_FOR_EACH_ENTRY(cur, &layout->runs, struct layout_run, entry) { - TRACE("run [%u,%u], len %u, bidilevel %u\n", cur->descr.textPosition, cur->descr.textPosition+cur->descr.stringLength-1, - cur->descr.stringLength, cur->run.bidiLevel); - } - } - /* nominal breakpoints are evaluated only once, because string never changes */ - if (!layout->breakpoints) { + if (!layout->nominal_breakpoints) { IDWriteTextAnalyzer *analyzer; HRESULT hr; - layout->breakpoints = heap_alloc(sizeof(DWRITE_LINE_BREAKPOINT)*layout->len); - if (!layout->breakpoints) + layout->nominal_breakpoints = heap_alloc(sizeof(DWRITE_LINE_BREAKPOINT)*layout->len); + if (!layout->nominal_breakpoints) return E_OUTOFMEMORY; hr = get_textanalyzer(&analyzer); @@ -296,6 +354,17 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) IDWriteTextAnalyzer_Release(analyzer); } + hr = layout_compute_runs(layout); + + if (TRACE_ON(dwrite)) { + struct layout_run *cur; + + LIST_FOR_EACH_ENTRY(cur, &layout->runs, struct layout_run, entry) { + TRACE("run [%u,%u], len %u, bidilevel %u\n", cur->descr.textPosition, cur->descr.textPosition+cur->descr.stringLength-1, + cur->descr.stringLength, cur->run.bidiLevel); + } + } + layout->recompute = FALSE; return hr; } @@ -695,7 +764,8 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout2 *iface) free_layout_ranges_list(This); free_layout_runs(This); release_format_data(&This->format); - heap_free(This->breakpoints); + heap_free(This->nominal_breakpoints); + heap_free(This->actual_breakpoints); heap_free(This->str); heap_free(This); } @@ -1601,7 +1671,7 @@ static HRESULT WINAPI dwritetextlayout_sink_SetLineBreakpoints(IDWriteTextAnalys if (position + length > layout->len) return E_FAIL; - memcpy(&layout->breakpoints[position], breakpoints, length*sizeof(DWRITE_LINE_BREAKPOINT)); + memcpy(&layout->nominal_breakpoints[position], breakpoints, length*sizeof(DWRITE_LINE_BREAKPOINT)); return S_OK; } @@ -1833,7 +1903,8 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *forma This->maxwidth = maxwidth; This->maxheight = maxheight; This->recompute = TRUE; - This->breakpoints = NULL; + This->nominal_breakpoints = NULL; + This->actual_breakpoints = NULL; layout_format_from_textformat(This, format); list_init(&This->runs);

1 0

Nikolay Sivov : dwrite: Split runs according to BiDi levels.
by Alexandre Julliard Dec. 29, 2014

Dec. 29, 2014

Module: wine Branch: master Commit: ac4c85ea87b97f7a498514a8b658238daa25c7c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac4c85ea87b97f7a498514a8b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 25 13:34:35 2014 +0300 dwrite: Split runs according to BiDi levels. --- dlls/dwrite/layout.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 583f2eb..5b23a0c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "wingdi.h" #include "dwrite_private.h" +#include "scripts.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite); @@ -101,6 +102,7 @@ struct layout_range { struct layout_run { struct list entry; DWRITE_GLYPH_RUN_DESCRIPTION descr; + DWRITE_GLYPH_RUN run; DWRITE_SCRIPT_ANALYSIS sa; }; @@ -198,6 +200,18 @@ static struct layout_run *alloc_layout_run(void) ret->descr.clusterMap = NULL; ret->descr.textPosition = 0; + ret->run.fontFace = NULL; + ret->run.fontEmSize = 0.0; + ret->run.glyphCount = 0; + ret->run.glyphIndices = NULL; + ret->run.glyphAdvances = NULL; + ret->run.glyphOffsets = NULL; + ret->run.isSideways = FALSE; + ret->run.bidiLevel = 0; + + ret->sa.script = Script_Unknown; + ret->sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT; + return ret; } @@ -227,10 +241,17 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) if (cur->object) continue; + /* initial splitting by script */ hr = IDWriteTextAnalyzer_AnalyzeScript(analyzer, &layout->IDWriteTextAnalysisSource_iface, cur->range.startPosition, cur->range.length, &layout->IDWriteTextAnalysisSink_iface); if (FAILED(hr)) break; + + /* this splits it further */ + hr = IDWriteTextAnalyzer_AnalyzeBidi(analyzer, &layout->IDWriteTextAnalysisSource_iface, + cur->range.startPosition, cur->range.length, &layout->IDWriteTextAnalysisSink_iface); + if (FAILED(hr)) + break; } IDWriteTextAnalyzer_Release(analyzer); @@ -245,6 +266,16 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) return S_OK; hr = layout_compute_runs(layout); + + if (TRACE_ON(dwrite)) { + struct layout_run *cur; + + LIST_FOR_EACH_ENTRY(cur, &layout->runs, struct layout_run, entry) { + TRACE("run [%u,%u], len %u, bidilevel %u\n", cur->descr.textPosition, cur->descr.textPosition+cur->descr.stringLength-1, + cur->descr.stringLength, cur->run.bidiLevel); + } + } + layout->recompute = FALSE; return hr; } @@ -1550,7 +1581,61 @@ static HRESULT WINAPI dwritetextlayout_sink_SetLineBreakpoints(IDWriteTextAnalys static HRESULT WINAPI dwritetextlayout_sink_SetBidiLevel(IDWriteTextAnalysisSink *iface, UINT32 position, UINT32 length, UINT8 explicitLevel, UINT8 resolvedLevel) { - return E_NOTIMPL; + struct dwrite_textlayout *layout = impl_from_IDWriteTextAnalysisSink(iface); + struct layout_run *cur; + + LIST_FOR_EACH_ENTRY(cur, &layout->runs, struct layout_run, entry) { + struct layout_run *run, *run2; + + /* FIXME: levels are reported in a natural forward direction, so start loop from a run we ended on */ + if (position < cur->descr.textPosition || position > cur->descr.textPosition + cur->descr.stringLength) + continue; + + /* full hit - just set run level */ + if (cur->descr.textPosition == position && cur->descr.stringLength == length) { + cur->run.bidiLevel = resolvedLevel; + break; + } + + /* current run is fully covered, move to next one */ + if (cur->descr.textPosition == position && cur->descr.stringLength < length) { + cur->run.bidiLevel = resolvedLevel; + position += cur->descr.stringLength; + length -= cur->descr.stringLength; + continue; + } + + /* now starting point is in a run, so it splits it */ + run = alloc_layout_run(); + if (!run) + return E_OUTOFMEMORY; + + *run = *cur; + run->descr.textPosition = position; + run->descr.stringLength = cur->descr.stringLength - position + cur->descr.textPosition; + run->run.bidiLevel = resolvedLevel; + cur->descr.stringLength -= position - cur->descr.textPosition; + + list_add_after(&cur->entry, &run->entry); + + if (position + length == run->descr.textPosition + run->descr.stringLength) + break; + + /* split second time */ + run2 = alloc_layout_run(); + if (!run2) + return E_OUTOFMEMORY; + + *run2 = *cur; + run2->descr.textPosition = run->descr.textPosition + run->descr.stringLength; + run2->descr.stringLength = cur->descr.textPosition + cur->descr.stringLength - position - length; + run->descr.stringLength -= run2->descr.stringLength; + + list_add_after(&run->entry, &run2->entry); + break; + } + + return S_OK; } static HRESULT WINAPI dwritetextlayout_sink_SetNumberSubstitution(IDWriteTextAnalysisSink *iface,

1 0

Piotr Caban : msvcp70: Fix basic_filebuf definition.
by Alexandre Julliard Dec. 29, 2014

Dec. 29, 2014

Module: wine Branch: master Commit: 799c771587348ff02790513bdd7bba6bc865891e URL: http://source.winehq.org/git/wine.git/?a=commit;h=799c771587348ff02790513bd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 25 16:50:22 2014 +0100 msvcp70: Fix basic_filebuf definition. --- dlls/msvcp90/ios.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 80aebec..7308729 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -74,6 +74,9 @@ typedef struct { MSVCP_bool wrotesome; int state; MSVCP_bool close; +#if _MSVCP_VER == 70 + locale loc; +#endif FILE *file; } basic_filebuf_char; @@ -90,6 +93,9 @@ typedef struct { MSVCP_bool wrotesome; int state; MSVCP_bool close; +#if _MSVCP_VER == 70 + locale loc; +#endif FILE *file; } basic_filebuf_wchar;

1 0