wine-commits December 2014

wine-commits@winehq.org

2 participants
319 discussions

Nikolay Sivov : msdmo: Use specified category in DMOUnregister().
by Alexandre Julliard 30 Dec '14

30 Dec '14

Module: wine Branch: master Commit: af6712599a0b6d9d28f4910f9be953223e93c3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6712599a0b6d9d28f4910f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 29 13:25:45 2014 +0300 msdmo: Use specified category in DMOUnregister(). --- configure | 1 + configure.ac | 1 + dlls/msdmo/dmoreg.c | 73 ++++++++++++++++++++++++++++++-------------- dlls/msdmo/tests/Makefile.in | 5 +++ dlls/msdmo/tests/msdmo.c | 60 ++++++++++++++++++++++++++++++++++++ 5 files changed, 117 insertions(+), 23 deletions(-) diff --git a/configure b/configure index 119eaa8..b4e041d 100755 --- a/configure +++ b/configure @@ -17215,6 +17215,7 @@ wine_fn_config_dll msctf enable_msctf clean wine_fn_config_test dlls/msctf/tests msctf_test wine_fn_config_dll msdaps enable_msdaps clean wine_fn_config_dll msdmo enable_msdmo implib +wine_fn_config_test dlls/msdmo/tests msdmo_test wine_fn_config_dll msftedit enable_msftedit wine_fn_config_dll msg711.acm enable_msg711_acm wine_fn_config_dll msgsm32.acm enable_msgsm32_acm diff --git a/configure.ac b/configure.ac index 9f64cd3..94b83ab 100644 --- a/configure.ac +++ b/configure.ac @@ -3039,6 +3039,7 @@ WINE_CONFIG_DLL(msctf,,[clean]) WINE_CONFIG_TEST(dlls/msctf/tests) WINE_CONFIG_DLL(msdaps,,[clean]) WINE_CONFIG_DLL(msdmo,,[implib]) +WINE_CONFIG_TEST(dlls/msdmo/tests) WINE_CONFIG_DLL(msftedit) WINE_CONFIG_DLL(msg711.acm) WINE_CONFIG_DLL(msgsm32.acm) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 74ab6b6..0abbea0 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -188,7 +188,10 @@ HRESULT WINAPI DMORegister( HKEY hckey = 0; HKEY hclskey = 0; - TRACE("%s\n", debugstr_w(szName)); + TRACE("%s %s %s\n", debugstr_w(szName), debugstr_guid(clsidDMO), debugstr_guid(guidCategory)); + + if (IsEqualGUID(guidCategory, &GUID_NULL)) + return E_INVALIDARG; hres = RegCreateKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hrkey, NULL); @@ -252,46 +255,70 @@ lend: return hres; } +static HRESULT unregister_dmo_from_category(const WCHAR *dmoW, const WCHAR *catW, HKEY categories) +{ + HKEY catkey; + LONG ret; + + ret = RegOpenKeyExW(categories, catW, 0, KEY_WRITE, &catkey); + if (!ret) + { + ret = RegDeleteKeyW(catkey, dmoW); + RegCloseKey(catkey); + } + + return !ret ? S_OK : S_FALSE; +} /*************************************************************** * DMOUnregister (MSDMO.@) * * Unregister a DirectX Media Object. */ -HRESULT WINAPI DMOUnregister(REFCLSID clsidDMO, REFGUID guidCategory) +HRESULT WINAPI DMOUnregister(REFCLSID dmo, REFGUID category) { - WCHAR szguid[64]; - HKEY hrkey = 0; - HKEY hckey = 0; + HKEY rootkey = 0, categorieskey = 0; + WCHAR dmoW[64], catW[64]; + HRESULT hr = S_FALSE; LONG ret; - GUIDToString(szguid, clsidDMO); + TRACE("%s %s\n", debugstr_guid(dmo), debugstr_guid(category)); - TRACE("%s %p\n", debugstr_w(szguid), guidCategory); + ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_WRITE, &rootkey); + if (ret) + return HRESULT_FROM_WIN32(ret); - ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_WRITE, &hrkey); - if (ERROR_SUCCESS != ret) - goto lend; + GUIDToString(dmoW, dmo); + RegDeleteKeyW(rootkey, dmoW); - ret = RegDeleteKeyW(hrkey, szguid); - if (ERROR_SUCCESS != ret) + /* open 'Categories' */ + ret = RegOpenKeyExW(rootkey, szDMOCategories, 0, KEY_WRITE|KEY_ENUMERATE_SUB_KEYS, &categorieskey); + RegCloseKey(rootkey); + if (ret) + { + hr = HRESULT_FROM_WIN32(ret); goto lend; + } - ret = RegOpenKeyExW(hrkey, szDMOCategories, 0, KEY_WRITE, &hckey); - if (ERROR_SUCCESS != ret) - goto lend; + /* remove from all categories */ + if (IsEqualGUID(category, &GUID_NULL)) + { + DWORD index = 0, len = sizeof(catW)/sizeof(WCHAR); - ret = RegDeleteKeyW(hckey, szguid); - if (ERROR_SUCCESS != ret) - goto lend; + while (!RegEnumKeyExW(categorieskey, index++, catW, &len, NULL, NULL, NULL, NULL)) + hr = unregister_dmo_from_category(dmoW, catW, categorieskey); + } + else + { + GUIDToString(catW, category); + hr = unregister_dmo_from_category(dmoW, catW, categorieskey); + } lend: - if (hckey) - RegCloseKey(hckey); - if (hrkey) - RegCloseKey(hrkey); + if (categorieskey) + RegCloseKey(categorieskey); - return HRESULT_FROM_WIN32(ret); + return hr; } diff --git a/dlls/msdmo/tests/Makefile.in b/dlls/msdmo/tests/Makefile.in new file mode 100644 index 0000000..105baba --- /dev/null +++ b/dlls/msdmo/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = msdmo.dll +IMPORTS = msdmo + +C_SRCS = \ + msdmo.c diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c new file mode 100644 index 0000000..4fc0c35 --- /dev/null +++ b/dlls/msdmo/tests/msdmo.c @@ -0,0 +1,60 @@ +/* + * MSDMO tests + * + * Copyright 2014 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "initguid.h" +#include "dmo.h" +#include "wine/test.h" + +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static const GUID GUID_unknowndmo = {0x14d99047,0x441f,0x4cd3,{0xbc,0xa8,0x3e,0x67,0x99,0xaf,0x34,0x75}}; +static const GUID GUID_unknowncategory = {0x14d99048,0x441f,0x4cd3,{0xbc,0xa8,0x3e,0x67,0x99,0xaf,0x34,0x75}}; + +static void test_DMOUnregister(void) +{ + static const WCHAR testdmoW[] = {'t','e','s','t','d','m','o',0}; + HRESULT hr; + + hr = DMOUnregister(&GUID_unknowndmo, &GUID_unknowncategory); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + hr = DMOUnregister(&GUID_unknowndmo, &GUID_NULL); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + /* can't register for all categories */ + hr = DMORegister(testdmoW, &GUID_unknowndmo, &GUID_NULL, 0, 0, NULL, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = DMORegister(testdmoW, &GUID_unknowndmo, &GUID_unknowncategory, 0, 0, NULL, 0, NULL); + if (hr != S_OK) { + win_skip("Failed to register DMO. Probably user doesn't have persmissions to do so.\n"); + return; + } + + hr = DMOUnregister(&GUID_unknowndmo, &GUID_NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = DMOUnregister(&GUID_unknowndmo, &GUID_NULL); + ok(hr == S_FALSE, "got 0x%08x\n", hr); +} + +START_TEST(msdmo) +{ + test_DMOUnregister(); +}

1 0

Nikolay Sivov : dwrite: Set string pointer in run description when splitting by bidi levels.
by Alexandre Julliard 30 Dec '14

30 Dec '14

Module: wine Branch: master Commit: 8fc7e175dcdf0f2c3db7af19f3b8d26dd1aa9c94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc7e175dcdf0f2c3db7af19f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 26 14:46:37 2014 +0300 dwrite: Set string pointer in run description when splitting by bidi levels. --- dlls/dwrite/layout.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 2025b84..ba35713 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1710,6 +1710,7 @@ static HRESULT WINAPI dwritetextlayout_sink_SetBidiLevel(IDWriteTextAnalysisSink *run = *cur; run->descr.textPosition = position; run->descr.stringLength = cur->descr.stringLength - position + cur->descr.textPosition; + run->descr.string = &layout->str[position]; run->run.bidiLevel = resolvedLevel; cur->descr.stringLength -= position - cur->descr.textPosition; @@ -1726,6 +1727,7 @@ static HRESULT WINAPI dwritetextlayout_sink_SetBidiLevel(IDWriteTextAnalysisSink *run2 = *cur; run2->descr.textPosition = run->descr.textPosition + run->descr.stringLength; run2->descr.stringLength = cur->descr.textPosition + cur->descr.stringLength - position - length; + run2->descr.string = &layout->str[run2->descr.textPosition]; run->descr.stringLength -= run2->descr.stringLength; list_add_after(&run->entry, &run2->entry);

1 0

Nikolay Sivov : dwrite: Cleanup layout instance creation, handle memory allocation failures.
by Alexandre Julliard 30 Dec '14

30 Dec '14

Module: wine Branch: master Commit: e7947359fee54a75035ff9b8c3e6d48e0d623d65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7947359fee54a75035ff9b8c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 26 14:14:20 2014 +0300 dwrite: Cleanup layout instance creation, handle memory allocation failures. --- dlls/dwrite/layout.c | 151 +++++++++++++++++++++++++++------------------------ 1 file changed, 81 insertions(+), 70 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8717f63..2025b84 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1833,92 +1833,103 @@ static const IDWriteTextAnalysisSourceVtbl dwritetextlayoutsourcevtbl = { dwritetextlayout_source_GetNumberSubstitution }; -static void layout_format_from_textformat(struct dwrite_textlayout *layout, IDWriteTextFormat *format) +static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, IDWriteTextFormat *format) { - struct dwrite_textformat *f; + UINT32 len; + HRESULT hr; - memset(&layout->format, 0, sizeof(layout->format)); + layout->format.weight = IDWriteTextFormat_GetFontWeight(format); + layout->format.style = IDWriteTextFormat_GetFontStyle(format); + layout->format.stretch = IDWriteTextFormat_GetFontStretch(format); + layout->format.fontsize= IDWriteTextFormat_GetFontSize(format); + layout->format.textalignment = IDWriteTextFormat_GetTextAlignment(format); + layout->format.paralign = IDWriteTextFormat_GetParagraphAlignment(format); + layout->format.wrapping = IDWriteTextFormat_GetWordWrapping(format); + layout->format.readingdir = IDWriteTextFormat_GetReadingDirection(format); + layout->format.flow = IDWriteTextFormat_GetFlowDirection(format); + hr = IDWriteTextFormat_GetLineSpacing(format, &layout->format.spacingmethod, + &layout->format.spacing, &layout->format.baseline); + if (FAILED(hr)) + return hr; - if ((f = unsafe_impl_from_IDWriteTextFormat1((IDWriteTextFormat1*)format))) - { - layout->format = f->format; - layout->format.locale = heap_strdupW(f->format.locale); - layout->format.family_name = heap_strdupW(f->format.family_name); - if (layout->format.trimmingsign) - IDWriteInlineObject_AddRef(layout->format.trimmingsign); - } - else - { - UINT32 locale_len, family_len; - - layout->format.weight = IDWriteTextFormat_GetFontWeight(format); - layout->format.style = IDWriteTextFormat_GetFontStyle(format); - layout->format.stretch = IDWriteTextFormat_GetFontStretch(format); - layout->format.fontsize= IDWriteTextFormat_GetFontSize(format); - layout->format.textalignment = IDWriteTextFormat_GetTextAlignment(format); - layout->format.paralign = IDWriteTextFormat_GetParagraphAlignment(format); - layout->format.wrapping = IDWriteTextFormat_GetWordWrapping(format); - layout->format.readingdir = IDWriteTextFormat_GetReadingDirection(format); - layout->format.flow = IDWriteTextFormat_GetFlowDirection(format); - IDWriteTextFormat_GetLineSpacing(format, - &layout->format.spacingmethod, - &layout->format.spacing, - &layout->format.baseline - ); - IDWriteTextFormat_GetTrimming(format, &layout->format.trimming, &layout->format.trimmingsign); - - /* locale name and length */ - locale_len = IDWriteTextFormat_GetLocaleNameLength(format); - layout->format.locale = heap_alloc((locale_len+1)*sizeof(WCHAR)); - IDWriteTextFormat_GetLocaleName(format, layout->format.locale, locale_len+1); - layout->format.locale_len = locale_len; - - /* font family name and length */ - family_len = IDWriteTextFormat_GetFontFamilyNameLength(format); - layout->format.family_name = heap_alloc((family_len+1)*sizeof(WCHAR)); - IDWriteTextFormat_GetFontFamilyName(format, layout->format.family_name, family_len+1); - layout->format.family_len = family_len; - } + hr = IDWriteTextFormat_GetTrimming(format, &layout->format.trimming, &layout->format.trimmingsign); + if (FAILED(hr)) + return hr; + + /* locale name and length */ + len = IDWriteTextFormat_GetLocaleNameLength(format); + layout->format.locale = heap_alloc((len+1)*sizeof(WCHAR)); + if (!layout->format.locale) + return E_OUTOFMEMORY; + + hr = IDWriteTextFormat_GetLocaleName(format, layout->format.locale, len+1); + if (FAILED(hr)) + return hr; + layout->format.locale_len = len; + + /* font family name and length */ + len = IDWriteTextFormat_GetFontFamilyNameLength(format); + layout->format.family_name = heap_alloc((len+1)*sizeof(WCHAR)); + if (!layout->format.family_name) + return E_OUTOFMEMORY; - IDWriteTextFormat_GetFontCollection(format, &layout->format.collection); + hr = IDWriteTextFormat_GetFontFamilyName(format, layout->format.family_name, len+1); + if (FAILED(hr)) + return hr; + layout->format.family_len = len; + + return IDWriteTextFormat_GetFontCollection(format, &layout->format.collection); } -HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, FLOAT maxwidth, FLOAT maxheight, IDWriteTextLayout **layout) +HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, FLOAT maxwidth, FLOAT maxheight, IDWriteTextLayout **ret) { - struct dwrite_textlayout *This; + struct dwrite_textlayout *layout; struct layout_range *range; DWRITE_TEXT_RANGE r = { 0, len }; + HRESULT hr; - *layout = NULL; + *ret = NULL; - This = heap_alloc(sizeof(struct dwrite_textlayout)); - if (!This) return E_OUTOFMEMORY; + layout = heap_alloc(sizeof(struct dwrite_textlayout)); + if (!layout) return E_OUTOFMEMORY; + + layout->IDWriteTextLayout2_iface.lpVtbl = &dwritetextlayoutvtbl; + layout->IDWriteTextAnalysisSink_iface.lpVtbl = &dwritetextlayoutsinkvtbl; + layout->IDWriteTextAnalysisSource_iface.lpVtbl = &dwritetextlayoutsourcevtbl; + layout->ref = 1; + layout->len = len; + layout->maxwidth = maxwidth; + layout->maxheight = maxheight; + layout->recompute = TRUE; + layout->nominal_breakpoints = NULL; + layout->actual_breakpoints = NULL; + list_init(&layout->runs); + list_init(&layout->ranges); + memset(&layout->format, 0, sizeof(layout->format)); - This->IDWriteTextLayout2_iface.lpVtbl = &dwritetextlayoutvtbl; - This->IDWriteTextAnalysisSink_iface.lpVtbl = &dwritetextlayoutsinkvtbl; - This->IDWriteTextAnalysisSource_iface.lpVtbl = &dwritetextlayoutsourcevtbl; - This->ref = 1; - This->str = heap_strdupnW(str, len); - This->len = len; - This->maxwidth = maxwidth; - This->maxheight = maxheight; - This->recompute = TRUE; - This->nominal_breakpoints = NULL; - This->actual_breakpoints = NULL; - layout_format_from_textformat(This, format); - - list_init(&This->runs); - list_init(&This->ranges); - range = alloc_layout_range(This, &r); - if (!range) { - IDWriteTextLayout2_Release(&This->IDWriteTextLayout2_iface); - return E_OUTOFMEMORY; + layout->str = heap_strdupnW(str, len); + if (len && !layout->str) { + hr = E_OUTOFMEMORY; + goto fail; } - list_add_head(&This->ranges, &range->entry); - *layout = (IDWriteTextLayout*)&This->IDWriteTextLayout2_iface; + hr = layout_format_from_textformat(layout, format); + if (FAILED(hr)) + goto fail; + + range = alloc_layout_range(layout, &r); + if (!range) { + hr = E_OUTOFMEMORY; + goto fail; + } + list_add_head(&layout->ranges, &range->entry); + *ret = (IDWriteTextLayout*)&layout->IDWriteTextLayout2_iface; return S_OK; + +fail: + IDWriteTextLayout2_Release(&layout->IDWriteTextLayout2_iface); + return hr; } static HRESULT WINAPI dwritetrimmingsign_QueryInterface(IDWriteInlineObject *iface, REFIID riid, void **obj)

1 0

Marton Balint : dsound: Convert freqAdjust and freqAcc to integers.
by Alexandre Julliard 29 Dec '14

29 Dec '14

Module: wine Branch: master Commit: 6d009b988b22212fabcc34711c40ec776fecaec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d009b988b22212fabcc34711… Author: Marton Balint <cus(a)passwd.hu> Date: Sat Dec 27 23:41:07 2014 +0100 dsound: Convert freqAdjust and freqAcc to integers. Fixes resampling errors caused by truncating floating point numbers. --- dlls/dsound/buffer.c | 6 ++++-- dlls/dsound/dsound_private.h | 4 +++- dlls/dsound/mixer.c | 37 ++++++++++++++++++------------------- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 9794b84..36ec132 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -274,7 +274,8 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency(IDirectSoundBuffer8 *i oldFreq = This->freq; This->freq = freq; if (freq != oldFreq) { - This->freqAdjust = This->freq / (float)This->device->pwfx->nSamplesPerSec; + This->freqAdjustNum = This->freq; + This->freqAdjustDen = This->device->pwfx->nSamplesPerSec; This->nAvgBytesPerSec = freq * This->pwfx->nBlockAlign; DSOUND_RecalcFormat(This); } @@ -935,7 +936,8 @@ HRESULT IDirectSoundBufferImpl_Create( dsb->sec_mixpos = 0; dsb->state = STATE_STOPPED; - dsb->freqAdjust = dsb->freq / (float)device->pwfx->nSamplesPerSec; + dsb->freqAdjustNum = dsb->freq; + dsb->freqAdjustDen = device->pwfx->nSamplesPerSec; dsb->nAvgBytesPerSec = dsb->freq * dsbd->lpwfxFormat->nBlockAlign; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 95b2279..66af81a 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -152,7 +152,9 @@ struct IDirectSoundBufferImpl /* used for frequency conversion (PerfectPitch) */ ULONG freqneeded; DWORD firstep; - float freqAcc, freqAdjust, firgain; + float firgain; + LONG64 freqAdjustNum,freqAdjustDen; + LONG64 freqAccNum; /* used for mixing */ DWORD sec_mixpos; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index bc38319..f6c2661 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -104,7 +104,8 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) TRACE("(%p)\n",dsb); pwfxe = (WAVEFORMATEXTENSIBLE *) dsb->pwfx; - dsb->freqAdjust = (float)dsb->freq / dsb->device->pwfx->nSamplesPerSec; + dsb->freqAdjustNum = dsb->freq; + dsb->freqAdjustDen = dsb->device->pwfx->nSamplesPerSec; if ((pwfxe->Format.wFormatTag == WAVE_FORMAT_IEEE_FLOAT) || ((pwfxe->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) && (IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)))) @@ -117,12 +118,12 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) * sample in the secondary buffer. firgain specifies what * to multiply the FIR output by in order to attenuate it correctly. */ - if (dsb->freqAdjust > 1.0f) { + if (dsb->freqAdjustNum / dsb->freqAdjustDen > 0) { /** * Yes, round it a bit to make sure that the * linear interpolation factor never changes. */ - dsb->firstep = ceil(fir_step / dsb->freqAdjust); + dsb->firstep = fir_step * dsb->freqAdjustDen / dsb->freqAdjustNum; } else { dsb->firstep = fir_step; } @@ -131,7 +132,7 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) /* calculate the 10ms write lead */ dsb->writelead = (dsb->freq / 100) * dsb->pwfx->nBlockAlign; - dsb->freqAcc = 0; + dsb->freqAccNum = 0; dsb->get_aux = ieee ? getbpp[4] : getbpp[dsb->pwfx->wBitsPerSample/8 - 1]; dsb->put_aux = putieee32; @@ -262,18 +263,17 @@ static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count) return count; } -static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, float *freqAcc) +static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, LONG64 *freqAccNum) { UINT i, channel; UINT istride = dsb->pwfx->nBlockAlign; UINT ostride = dsb->device->pwfx->nChannels * sizeof(float); - float freqAdjust = dsb->freqAdjust; - float freqAcc_start = *freqAcc; - float freqAcc_end = freqAcc_start + count * freqAdjust; + LONG64 freqAcc_start = *freqAccNum; + LONG64 freqAcc_end = freqAcc_start + count * dsb->freqAdjustNum; UINT dsbfirstep = dsb->firstep; UINT channels = dsb->mix_channels; - UINT max_ipos = freqAcc_start + count * freqAdjust; + UINT max_ipos = (freqAcc_start + count * dsb->freqAdjustNum) / dsb->freqAdjustDen; UINT fir_cachesize = (fir_len + dsbfirstep - 2) / dsbfirstep; UINT required_input = max_ipos + fir_cachesize; @@ -295,8 +295,8 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, float *f dsb->sec_mixpos + i * istride, channel); for(i = 0; i < count; ++i) { - float total_fir_steps = (freqAcc_start + i * freqAdjust) * dsbfirstep; - UINT int_fir_steps = total_fir_steps; + UINT int_fir_steps = (freqAcc_start + i * dsb->freqAdjustNum) * dsbfirstep / dsb->freqAdjustDen; + float total_fir_steps = (freqAcc_start + i * dsb->freqAdjustNum) * dsbfirstep / (float)dsb->freqAdjustDen; UINT ipos = int_fir_steps / dsbfirstep; UINT idx = (ipos + 1) * dsbfirstep - int_fir_steps - 1; @@ -321,8 +321,7 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, float *f } } - freqAcc_end -= (int)freqAcc_end; - *freqAcc = freqAcc_end; + *freqAccNum = freqAcc_end % dsb->freqAdjustDen; HeapFree(GetProcessHeap(), 0, fir_copy); HeapFree(GetProcessHeap(), 0, intermediate); @@ -330,14 +329,14 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, float *f return max_ipos; } -static void cp_fields(IDirectSoundBufferImpl *dsb, UINT count, float *freqAcc) +static void cp_fields(IDirectSoundBufferImpl *dsb, UINT count, LONG64 *freqAccNum) { DWORD ipos, adv; - if (dsb->freqAdjust == 1.0) - adv = cp_fields_noresample(dsb, count); /* *freqAcc is unmodified */ + if (dsb->freqAdjustNum == dsb->freqAdjustDen) + adv = cp_fields_noresample(dsb, count); /* *freqAccNum is unmodified */ else - adv = cp_fields_resample(dsb, count, freqAcc); + adv = cp_fields_resample(dsb, count, freqAccNum); ipos = dsb->sec_mixpos + adv * dsb->pwfx->nBlockAlign; if (ipos >= dsb->buflen) { @@ -393,7 +392,7 @@ static void DSOUND_MixToTemporary(IDirectSoundBufferImpl *dsb, DWORD frames) dsb->device->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, size_bytes); } - cp_fields(dsb, frames, &dsb->freqAcc); + cp_fields(dsb, frames, &dsb->freqAccNum); } static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames) @@ -505,7 +504,7 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD mi mixlen = 2 * dsb->device->fraglen; writepos += primary_done; dsb->sec_mixpos += (primary_done / dsb->device->pwfx->nBlockAlign) * - dsb->pwfx->nBlockAlign * dsb->freqAdjust; + dsb->pwfx->nBlockAlign * dsb->freqAdjustNum / dsb->freqAdjustDen; } }

1 0

Mark Harmstone : winealsa: Return PKEY_AudioEndpoint_PhysicalSpeakers device prop.
by Alexandre Julliard 29 Dec '14

29 Dec '14

Module: wine Branch: master Commit: acccdce4c45d9e8db8f21deb2e4d764ad21edb9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=acccdce4c45d9e8db8f21deb2… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Dec 27 21:34:48 2014 +0000 winealsa: Return PKEY_AudioEndpoint_PhysicalSpeakers device prop. --- dlls/mmdevapi/devenum.c | 3 ++ dlls/winealsa.drv/mmdevdrv.c | 84 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 79 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 56f770a..c140437 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -371,6 +371,9 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st MMDevice_SetPropValue(id, flow, &PKEY_AudioEndpoint_FormFactor, &pv); } + if (flow != eCapture) + set_driver_prop_value(id, flow, &PKEY_AudioEndpoint_PhysicalSpeakers); + RegCloseKey(keyprop); } RegCloseKey(key); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8f93e79..d2fb2d3 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -32,7 +32,10 @@ #include "wine/unicode.h" #include "wine/list.h" +#include "propsys.h" +#include "initguid.h" #include "ole2.h" +#include "propkey.h" #include "mmdeviceapi.h" #include "devpkey.h" #include "mmsystem.h" @@ -3912,6 +3915,44 @@ HRESULT WINAPI AUDDRV_GetAudioSessionManager(IMMDevice *device, return S_OK; } +static unsigned int alsa_probe_num_speakers(char *name) { + snd_pcm_t *handle; + snd_pcm_hw_params_t *params; + int err; + unsigned int max_channels = 0; + + if ((err = snd_pcm_open(&handle, name, SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK)) < 0) { + WARN("The device \"%s\" failed to open: %d (%s).\n", + name, err, snd_strerror(err)); + return 0; + } + + params = HeapAlloc(GetProcessHeap(), 0, snd_pcm_hw_params_sizeof()); + if (!params) { + WARN("Out of memory.\n"); + snd_pcm_close(handle); + return 0; + } + + if ((err = snd_pcm_hw_params_any(handle, params)) < 0) { + WARN("snd_pcm_hw_params_any failed for \"%s\": %d (%s).\n", + name, err, snd_strerror(err)); + goto exit; + } + + if ((err = snd_pcm_hw_params_get_channels_max(params, + &max_channels)) < 0){ + WARN("Unable to get max channels: %d (%s)\n", err, snd_strerror(err)); + goto exit; + } + +exit: + HeapFree(GetProcessHeap(), 0, params); + snd_pcm_close(handle); + + return max_channels; +} + enum AudioDeviceConnectionType { AudioDeviceConnectionType_Unknown = 0, AudioDeviceConnectionType_PCI, @@ -3920,25 +3961,27 @@ enum AudioDeviceConnectionType { HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARIANT *out) { + char name[256]; + EDataFlow flow; + static const PROPERTYKEY devicepath_key = { /* undocumented? - {b3f8fa53-0004-438e-9003-51a46e139bfc},2 */ {0xb3f8fa53, 0x0004, 0x438e, {0x90, 0x03, 0x51, 0xa4, 0x6e, 0x13, 0x9b, 0xfc}}, 2 }; TRACE("%s, (%s,%u), %p\n", wine_dbgstr_guid(guid), wine_dbgstr_guid(&prop->fmtid), prop->pid, out); + if(!get_alsa_name_by_guid(guid, name, sizeof(name), &flow)) + { + WARN("Unknown interface %s\n", debugstr_guid(guid)); + return E_NOINTERFACE; + } + if(IsEqualPropertyKey(*prop, devicepath_key)) { - char name[256], uevent[MAX_PATH]; - EDataFlow flow; + char uevent[MAX_PATH]; FILE *fuevent; int card, device; - if(!get_alsa_name_by_guid(guid, name, sizeof(name), &flow)) - { - WARN("Unknown interface %s\n", debugstr_guid(guid)); - return E_NOINTERFACE; - } - /* only implemented for identifiable devices, i.e. not "default" */ if(!sscanf(name, "plughw:%u,%u", &card, &device)) return E_NOTIMPL; @@ -4013,6 +4056,31 @@ HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARI WARN("Could not open %s for reading\n", uevent); return E_NOTIMPL; } + } else if (flow != eCapture && IsEqualPropertyKey(*prop, PKEY_AudioEndpoint_PhysicalSpeakers)) { + unsigned int num_speakers, card, device; + char hwname[255]; + + if (sscanf(name, "plughw:%u,%u", &card, &device)) + sprintf(hwname, "hw:%u,%u", card, device); /* must be hw rather than plughw to work */ + else + strcpy(hwname, name); + + num_speakers = alsa_probe_num_speakers(hwname); + if (num_speakers == 0) + return E_FAIL; + + out->vt = VT_UI4; + + if (num_speakers >= 6) + out->u.ulVal = KSAUDIO_SPEAKER_5POINT1; + else if (num_speakers >= 4) + out->u.ulVal = KSAUDIO_SPEAKER_QUAD; + else if (num_speakers >= 2) + out->u.ulVal = KSAUDIO_SPEAKER_STEREO; + else if (num_speakers == 1) + out->u.ulVal = KSAUDIO_SPEAKER_MONO; + + return S_OK; } TRACE("Unimplemented property %s,%u\n", wine_dbgstr_guid(&prop->fmtid), prop->pid);

1 0

Nikolay Sivov : ole32: Return END_OF_CHAIN for chains starting with special sector values.
by Alexandre Julliard 29 Dec '14

29 Dec '14

Module: wine Branch: master Commit: 73419dc48498ee925f80478ffebd4f18089536b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73419dc48498ee925f80478ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 29 17:44:47 2014 +0300 ole32: Return END_OF_CHAIN for chains starting with special sector values. --- dlls/ole32/storage32.c | 9 ++------- dlls/ole32/storage32.h | 1 + 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 6ebc1e7..26fc0d8 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -6995,10 +6995,8 @@ static ULONG BlockChainStream_GetHeadOfChain(BlockChainStream* This) This->ownerDirEntry, &chainEntry); - if (SUCCEEDED(hr)) - { + if (SUCCEEDED(hr) && chainEntry.startingBlock < BLOCK_FIRST_SPECIAL) return chainEntry.startingBlock; - } } return BLOCK_END_OF_CHAIN; @@ -7520,11 +7518,8 @@ static ULONG SmallBlockChainStream_GetHeadOfChain( This->ownerDirEntry, &chainEntry); - if (SUCCEEDED(hr)) - { + if (SUCCEEDED(hr) && chainEntry.startingBlock < BLOCK_FIRST_SPECIAL) return chainEntry.startingBlock; - } - } return BLOCK_END_OF_CHAIN; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 36cbc9d..9831a27 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -78,6 +78,7 @@ static const WORD MAX_BIG_BLOCK_SIZE_BITS = 0x000c; static const WORD DEF_SMALL_BLOCK_SIZE_BITS = 0x0006; static const WORD DEF_BIG_BLOCK_SIZE = 0x0200; static const WORD DEF_SMALL_BLOCK_SIZE = 0x0040; +static const ULONG BLOCK_FIRST_SPECIAL = 0xFFFFFFFB; static const ULONG BLOCK_EXTBBDEPOT = 0xFFFFFFFC; static const ULONG BLOCK_SPECIAL = 0xFFFFFFFD; static const ULONG BLOCK_END_OF_CHAIN = 0xFFFFFFFE;

1 0

Jacek Caban : mshtml: Use new range point representation in all cases.
by Alexandre Julliard 29 Dec '14

29 Dec '14

Module: wine Branch: master Commit: 00d36ac945344b90217c46639de44f60c70d8990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00d36ac945344b90217c46639… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 29 15:50:22 2014 +0100 mshtml: Use new range point representation in all cases. --- dlls/mshtml/txtrange.c | 671 ++----------------------------------------------- 1 file changed, 24 insertions(+), 647 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00d36ac945344b90217c4…

1 0

Jacek Caban : mshtml: Use new end point representation in IHTMLTxtRange:: expand("word") implementation.
by Alexandre Julliard 29 Dec '14

29 Dec '14

Module: wine Branch: master Commit: 4ef4ebaac73782b3bd1f2e8ee2f2908859e15b86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef4ebaac73782b3bd1f2e8ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 29 15:50:03 2014 +0100 mshtml: Use new end point representation in IHTMLTxtRange::expand("word") implementation. --- dlls/mshtml/txtrange.c | 133 ++++++++++++++++++++++++++++--------------------- 1 file changed, 75 insertions(+), 58 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 8a3ca9a..85d77b2 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -333,6 +333,13 @@ static void set_start_point(HTMLTxtRange *This, const rangepoint_t *start) ERR("failed: %08x\n", nsres); } +static void set_end_point(HTMLTxtRange *This, const rangepoint_t *end) +{ + nsresult nsres = nsIDOMRange_SetEnd(This->nsrange, end->node, end->off); + if(NS_FAILED(nsres)) + ERR("failed: %08x\n", nsres); +} + static BOOL is_elem_tag(nsIDOMNode *node, LPCWSTR istag) { nsIDOMElement *elem; @@ -956,6 +963,60 @@ static LONG move_by_chars(rangepoint_t *iter, LONG cnt) return ret; } +static LONG find_prev_space(rangepoint_t *iter, BOOL first_space) +{ + rangepoint_t prev; + WCHAR c; + + init_rangepoint(&prev, iter->node, iter->off); + c = move_prev_char(&prev); + if(!c || (first_space && isspaceW(c))) + return FALSE; + + do { + free_rangepoint(iter); + init_rangepoint(iter, prev.node, prev.off); + c = move_prev_char(&prev); + }while(c && !isspaceW(c)); + + free_rangepoint(&prev); + return TRUE; +} + +static BOOL find_word_end(rangepoint_t *iter, BOOL is_collapsed) +{ + rangepoint_t prev_iter; + WCHAR c; + BOOL ret = FALSE; + + if(!is_collapsed) { + init_rangepoint(&prev_iter, iter->node, iter->off); + c = move_prev_char(&prev_iter); + free_rangepoint(&prev_iter); + if(isspaceW(c)) + return FALSE; + } + + do { + init_rangepoint(&prev_iter, iter->node, iter->off); + c = move_next_char(iter); + if(c == '\n') { + free_rangepoint(iter); + *iter = prev_iter; + return ret; + } + if(!c) { + if(!ret) + ret = !rangepoint_cmp(iter, &prev_iter); + }else { + ret = TRUE; + } + free_rangepoint(&prev_iter); + }while(c && !isspaceW(c)); + + return ret; +} + static WCHAR get_pos_char(const dompos_t *pos) { switch(pos->type) { @@ -1273,7 +1334,7 @@ static LONG move_prev_chars(HTMLTxtRange *This, LONG cnt, const dompos_t *pos, B return ret; } -static LONG find_prev_space(HTMLTxtRange *This, const dompos_t *pos, BOOL first_space, dompos_t *ret) +static LONG dompos_find_prev_space(HTMLTxtRange *This, const dompos_t *pos, BOOL first_space, dompos_t *ret) { dompos_t iter, tmp; WCHAR c; @@ -1298,45 +1359,6 @@ static LONG find_prev_space(HTMLTxtRange *This, const dompos_t *pos, BOOL first_ return TRUE; } -static int find_word_end(const dompos_t *pos, dompos_t *ret) -{ - dompos_t iter, tmp; - int cnt = 1; - WCHAR c; - c = get_pos_char(pos); - if(isspaceW(c)) { - *ret = *pos; - dompos_addref(ret); - return 0; - } - - c = next_char(pos, &iter); - if(!c) { - *ret = iter; - return 0; - } - if(c == '\n') { - *ret = *pos; - dompos_addref(ret); - return 0; - } - - while(c && !isspaceW(c)) { - tmp = iter; - c = next_char(&tmp, &iter); - if(c == '\n') { - dompos_release(&iter); - iter = tmp; - }else { - cnt++; - dompos_release(&tmp); - } - } - - *ret = iter; - return cnt; -} - static LONG move_next_words(LONG cnt, const dompos_t *pos, dompos_t *new_pos) { dompos_t iter, tmp; @@ -1374,7 +1396,7 @@ static LONG move_prev_words(HTMLTxtRange *This, LONG cnt, const dompos_t *pos, d dompos_addref(&iter); while(ret < cnt) { - if(!find_prev_space(This, &iter, FALSE, &tmp)) + if(!dompos_find_prev_space(This, &iter, FALSE, &tmp)) break; dompos_release(&iter); @@ -1712,31 +1734,26 @@ static HRESULT WINAPI HTMLTxtRange_expand(IHTMLTxtRange *iface, BSTR Unit, VARIA switch(unit) { case RU_WORD: { - dompos_t end_pos, start_pos, new_start_pos, new_end_pos; - cpp_bool collapsed; + rangepoint_t end, start; + cpp_bool is_collapsed; - nsIDOMRange_GetCollapsed(This->nsrange, &collapsed); + get_start_point(This, &start); + get_end_point(This, &end); - get_cur_pos(This, TRUE, &start_pos); - get_cur_pos(This, FALSE, &end_pos); + nsIDOMRange_GetCollapsed(This->nsrange, &is_collapsed); - if(find_word_end(&end_pos, &new_end_pos) || collapsed) { - set_range_pos(This, FALSE, &new_end_pos); + if(find_word_end(&end, is_collapsed)) { + set_end_point(This, &end); *Success = VARIANT_TRUE; } - if(start_pos.type && (get_pos_char(&end_pos) || !dompos_cmp(&new_end_pos, &end_pos))) { - if(find_prev_space(This, &start_pos, TRUE, &new_start_pos)) { - set_range_pos(This, TRUE, &new_start_pos); - *Success = VARIANT_TRUE; - } - dompos_release(&new_start_pos); + if(find_prev_space(&start, TRUE)) { + set_start_point(This, &start); + *Success = VARIANT_TRUE; } - dompos_release(&new_end_pos); - dompos_release(&end_pos); - dompos_release(&start_pos); - + free_rangepoint(&end); + free_rangepoint(&start); break; }

1 0

Jacek Caban : mshtml: Reimplemented IHTMLTxtRange:: moveStart using new range point representation.
by Alexandre Julliard 29 Dec '14

29 Dec '14

Module: wine Branch: master Commit: 26dd5f5672c8c03d8df93ffd09ce71534e836c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=26dd5f5672c8c03d8df93ffd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 29 15:49:47 2014 +0100 mshtml: Reimplemented IHTMLTxtRange::moveStart using new range point representation. --- dlls/mshtml/txtrange.c | 288 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 269 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index c6fba3e..8a3ca9a 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -238,6 +238,68 @@ static BOOL rangepoint_next_node(rangepoint_t *iter) return TRUE; } +static UINT32 get_child_count(nsIDOMNode *node) +{ + nsIDOMNodeList *node_list; + UINT32 ret; + nsresult nsres; + + nsres = nsIDOMNode_GetChildNodes(node, &node_list); + assert(nsres == NS_OK); + + nsres = nsIDOMNodeList_GetLength(node_list, &ret); + nsIDOMNodeList_Release(node_list); + assert(nsres == NS_OK); + + return ret; +} + +static UINT32 get_text_length(nsIDOMNode *node) +{ + nsIDOMText *nstext; + UINT32 ret; + nsresult nsres; + + nsres = nsIDOMNode_QueryInterface(node, &IID_nsIDOMText, (void**)&nstext); + assert(nsres == NS_OK); + + nsres = nsIDOMText_GetLength(nstext, &ret); + nsIDOMText_Release(nstext); + assert(nsres == NS_OK); + + return ret; +} + +static BOOL rangepoint_prev_node(rangepoint_t *iter) +{ + nsIDOMNode *node; + UINT32 off; + nsresult nsres; + + /* Try to move to the child node. */ + if(iter->off) { + node = get_child_node(iter->node, iter->off-1); + assert(node != NULL); + + off = get_node_type(node) == TEXT_NODE ? get_text_length(node) : get_child_count(node); + free_rangepoint(iter); + init_rangepoint(iter, node, off); + nsIDOMNode_Release(node); + return TRUE; + } + + /* There are no more children in the node. Move to parent. */ + nsres = nsIDOMNode_GetParentNode(iter->node, &node); + assert(nsres == NS_OK); + if(!node) + return FALSE; + + off = get_child_index(node, iter->node); + free_rangepoint(iter); + init_rangepoint(iter, node, off); + return TRUE; +} + static void get_start_point(HTMLTxtRange *This, rangepoint_t *ret) { nsIDOMNode *node; @@ -264,6 +326,13 @@ static void get_end_point(HTMLTxtRange *This, rangepoint_t *ret) nsIDOMNode_Release(node); } +static void set_start_point(HTMLTxtRange *This, const rangepoint_t *start) +{ + nsresult nsres = nsIDOMRange_SetStart(This->nsrange, start->node, start->off); + if(NS_FAILED(nsres)) + ERR("failed: %08x\n", nsres); +} + static BOOL is_elem_tag(nsIDOMNode *node, LPCWSTR istag) { nsIDOMElement *elem; @@ -693,6 +762,200 @@ HRESULT get_node_text(HTMLDOMNode *node, BSTR *ret) return hres; } +static WCHAR move_next_char(rangepoint_t *iter) +{ + rangepoint_t last_space; + nsIDOMNode *node; + WCHAR cspace = 0; + const WCHAR *p; + + do { + switch(iter->type) { + case TEXT_NODE: { + const PRUnichar *str; + nsAString nsstr; + WCHAR c; + + get_text_node_data(iter->node, &nsstr, &str); + p = str+iter->off; + if(!*p) { + nsAString_Finish(&nsstr); + break; + } + + c = *p; + if(isspaceW(c)) { + while(isspaceW(*p)) + p++; + + if(cspace) + free_rangepoint(&last_space); + else + cspace = ' '; + + iter->off = p-str; + c = *p; + nsAString_Finish(&nsstr); + if(!c) { /* continue to skip spaces */ + init_rangepoint(&last_space, iter->node, iter->off); + break; + } + + return cspace; + }else { + nsAString_Finish(&nsstr); + } + + /* If we have a non-space char and we're skipping spaces, stop and return the last found space. */ + if(cspace) { + free_rangepoint(iter); + *iter = last_space; + return cspace; + } + + iter->off++; + return c; + } + case ELEMENT_NODE: + node = get_child_node(iter->node, iter->off); + if(!node) + break; + + if(is_elem_tag(node, brW)) { + if(cspace) { + nsIDOMNode_Release(node); + free_rangepoint(iter); + *iter = last_space; + return cspace; + } + + cspace = '\n'; + init_rangepoint(&last_space, iter->node, iter->off+1); + }else if(is_elem_tag(node, hrW)) { + nsIDOMNode_Release(node); + if(cspace) { + free_rangepoint(iter); + *iter = last_space; + return cspace; + } + + iter->off++; + return '\n'; + } + + nsIDOMNode_Release(node); + } + }while(rangepoint_next_node(iter)); + + return cspace; +} + +static WCHAR move_prev_char(rangepoint_t *iter) +{ + rangepoint_t last_space; + nsIDOMNode *node; + WCHAR cspace = 0; + const WCHAR *p; + + do { + switch(iter->type) { + case TEXT_NODE: { + const PRUnichar *str; + nsAString nsstr; + WCHAR c; + + if(!iter->off) + break; + + get_text_node_data(iter->node, &nsstr, &str); + + p = str+iter->off-1; + c = *p; + + if(isspaceW(c)) { + while(p > str && isspaceW(*(p-1))) + p--; + + if(cspace) + free_rangepoint(&last_space); + else + cspace = ' '; + + iter->off = p-str; + nsAString_Finish(&nsstr); + if(p == str) { /* continue to skip spaces */ + init_rangepoint(&last_space, iter->node, iter->off); + break; + } + + return cspace; + }else { + nsAString_Finish(&nsstr); + } + + /* If we have a non-space char and we're skipping spaces, stop and return the last found space. */ + if(cspace) { + free_rangepoint(iter); + *iter = last_space; + return cspace; + } + + iter->off--; + return c; + } + case ELEMENT_NODE: + if(!iter->off) + break; + + node = get_child_node(iter->node, iter->off-1); + if(!node) + break; + + if(is_elem_tag(node, brW)) { + if(cspace) + free_rangepoint(&last_space); + cspace = '\n'; + init_rangepoint(&last_space, iter->node, iter->off-1); + }else if(is_elem_tag(node, hrW)) { + nsIDOMNode_Release(node); + if(cspace) { + free_rangepoint(iter); + *iter = last_space; + return cspace; + } + + iter->off--; + return '\n'; + } + + nsIDOMNode_Release(node); + } + }while(rangepoint_prev_node(iter)); + + if(cspace) { + free_rangepoint(iter); + *iter = last_space; + return cspace; + } + + return 0; +} + +static LONG move_by_chars(rangepoint_t *iter, LONG cnt) +{ + LONG ret = 0; + + if(cnt >= 0) { + while(ret < cnt && move_next_char(iter)) + ret++; + }else { + while(ret > cnt && move_prev_char(iter)) + ret--; + } + + return ret; +} + static WCHAR get_pos_char(const dompos_t *pos) { switch(pos->type) { @@ -1593,33 +1856,20 @@ static HRESULT WINAPI HTMLTxtRange_moveStart(IHTMLTxtRange *iface, BSTR Unit, switch(unit) { case RU_CHAR: { - dompos_t start_pos, end_pos, new_pos; - cpp_bool collapsed; + rangepoint_t start; - get_cur_pos(This, TRUE, &start_pos); - get_cur_pos(This, FALSE, &end_pos); - nsIDOMRange_GetCollapsed(This->nsrange, &collapsed); + get_start_point(This, &start); - if(Count > 0) { - BOOL bounded; + *ActualCount = move_by_chars(&start, Count); - *ActualCount = move_next_chars(Count, &start_pos, collapsed, &end_pos, &bounded, &new_pos); - set_range_pos(This, !bounded, &new_pos); - if(bounded) - IHTMLTxtRange_collapse(&This->IHTMLTxtRange_iface, FALSE); - }else { - *ActualCount = -move_prev_chars(This, -Count, &start_pos, FALSE, NULL, NULL, &new_pos); - set_range_pos(This, TRUE, &new_pos); - } - - dompos_release(&start_pos); - dompos_release(&end_pos); - dompos_release(&new_pos); + set_start_point(This, &start); + free_rangepoint(&start); break; } default: FIXME("unimplemented unit %s\n", debugstr_w(Unit)); + return E_NOTIMPL; } return S_OK;

1 0

Jacek Caban : mshtml: Introduced new representation of range point and use that in range_to_string instead of trying to iterate by nodes.
by Alexandre Julliard 29 Dec '14

29 Dec '14

Module: wine Branch: master Commit: 3944fada4b20ed1473bdf231ddb8ab88461932c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3944fada4b20ed1473bdf231d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 29 15:49:31 2014 +0100 mshtml: Introduced new representation of range point and use that in range_to_string instead of trying to iterate by nodes. --- dlls/mshtml/txtrange.c | 220 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 173 insertions(+), 47 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 0dd3aae..c6fba3e 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -59,6 +59,12 @@ typedef struct { UINT16 type; nsIDOMNode *node; UINT32 off; +} rangepoint_t; + +typedef struct { + UINT16 type; + nsIDOMNode *node; + UINT32 off; nsAString str; const PRUnichar *p; } dompos_t; @@ -128,6 +134,136 @@ static UINT16 get_node_type(nsIDOMNode *node) return type; } +static void get_text_node_data(nsIDOMNode *node, nsAString *nsstr, const PRUnichar **str) +{ + nsIDOMText *nstext; + nsresult nsres; + + nsres = nsIDOMNode_QueryInterface(node, &IID_nsIDOMText, (void**)&nstext); + assert(nsres == NS_OK); + + nsAString_Init(nsstr, NULL); + nsres = nsIDOMText_GetData(nstext, nsstr); + nsIDOMText_Release(nstext); + if(NS_FAILED(nsres)) + ERR("GetData failed: %08x\n", nsres); + + nsAString_GetData(nsstr, str); +} + +static nsIDOMNode *get_child_node(nsIDOMNode *node, UINT32 off) +{ + nsIDOMNodeList *node_list; + nsIDOMNode *ret = NULL; + + nsIDOMNode_GetChildNodes(node, &node_list); + nsIDOMNodeList_Item(node_list, off, &ret); + nsIDOMNodeList_Release(node_list); + + return ret; +} + +/* This is very inefficient, but there is no faster way to compute index in + * child node list using public API. Gecko has internal nsINode::IndexOf + * function that we could consider exporting and use instead. */ +static int get_child_index(nsIDOMNode *parent, nsIDOMNode *child) +{ + nsIDOMNodeList *node_list; + nsIDOMNode *node; + int ret = 0; + nsresult nsres; + + nsres = nsIDOMNode_GetChildNodes(parent, &node_list); + assert(nsres == NS_OK); + + while(1) { + nsres = nsIDOMNodeList_Item(node_list, ret, &node); + assert(nsres == NS_OK && node); + if(node == child) { + nsIDOMNode_Release(node); + break; + } + nsIDOMNode_Release(node); + ret++; + } + + nsIDOMNodeList_Release(node_list); + return ret; +} + +static void init_rangepoint(rangepoint_t *rangepoint, nsIDOMNode *node, UINT32 off) +{ + nsIDOMNode_AddRef(node); + + rangepoint->type = get_node_type(node); + rangepoint->node = node; + rangepoint->off = off; +} + +static inline void free_rangepoint(rangepoint_t *rangepoint) +{ + nsIDOMNode_Release(rangepoint->node); +} + +static inline BOOL rangepoint_cmp(const rangepoint_t *point1, const rangepoint_t *point2) +{ + return point1->node == point2->node && point1->off == point2->off; +} + +static BOOL rangepoint_next_node(rangepoint_t *iter) +{ + nsIDOMNode *node; + UINT32 off; + nsresult nsres; + + /* Try to move to the child node. */ + node = get_child_node(iter->node, iter->off); + if(node) { + free_rangepoint(iter); + init_rangepoint(iter, node, 0); + nsIDOMNode_Release(node); + return TRUE; + } + + /* There are no more children in the node. Move to parent. */ + nsres = nsIDOMNode_GetParentNode(iter->node, &node); + assert(nsres == NS_OK); + if(!node) + return FALSE; + + off = get_child_index(node, iter->node)+1; + free_rangepoint(iter); + init_rangepoint(iter, node, off); + nsIDOMNode_Release(node); + return TRUE; +} + +static void get_start_point(HTMLTxtRange *This, rangepoint_t *ret) +{ + nsIDOMNode *node; + LONG off; + + nsIDOMRange_GetStartContainer(This->nsrange, &node); + nsIDOMRange_GetStartOffset(This->nsrange, &off); + + init_rangepoint(ret, node, off); + + nsIDOMNode_Release(node); +} + +static void get_end_point(HTMLTxtRange *This, rangepoint_t *ret) +{ + nsIDOMNode *node; + LONG off; + + nsIDOMRange_GetEndContainer(This->nsrange, &node); + nsIDOMRange_GetEndOffset(This->nsrange, &off); + + init_rangepoint(ret, node, off); + + nsIDOMNode_Release(node); +} + static BOOL is_elem_tag(nsIDOMNode *node, LPCWSTR istag) { nsIDOMElement *elem; @@ -236,7 +372,7 @@ static void wstrbuf_append_nodetxt(wstrbuf_t *buf, LPCWSTR str, int len) *d = 0; } -static void wstrbuf_append_node(wstrbuf_t *buf, nsIDOMNode *node) +static void wstrbuf_append_node(wstrbuf_t *buf, nsIDOMNode *node, BOOL ignore_text) { switch(get_node_type(node)) { @@ -245,6 +381,9 @@ static void wstrbuf_append_node(wstrbuf_t *buf, nsIDOMNode *node) nsAString data_str; const PRUnichar *data; + if(ignore_text) + break; + nsIDOMNode_QueryInterface(node, &IID_nsIDOMText, (void**)&nstext); nsAString_Init(&data_str, NULL); @@ -272,7 +411,7 @@ static void wstrbuf_append_node_rec(wstrbuf_t *buf, nsIDOMNode *node) { nsIDOMNode *iter, *tmp; - wstrbuf_append_node(buf, node); + wstrbuf_append_node(buf, node, FALSE); nsIDOMNode_GetFirstChild(node, &iter); while(iter) { @@ -379,18 +518,6 @@ static nsIDOMNode *prev_node(HTMLTxtRange *This, nsIDOMNode *iter) return NULL; } -static nsIDOMNode *get_child_node(nsIDOMNode *node, UINT32 off) -{ - nsIDOMNodeList *node_list; - nsIDOMNode *ret = NULL; - - nsIDOMNode_GetChildNodes(node, &node_list); - nsIDOMNodeList_Item(node_list, off, &ret); - nsIDOMNodeList_Release(node_list); - - return ret; -} - static void get_cur_pos(HTMLTxtRange *This, BOOL start, dompos_t *pos) { nsIDOMNode *node; @@ -485,8 +612,7 @@ static inline BOOL dompos_cmp(const dompos_t *pos1, const dompos_t *pos2) static void range_to_string(HTMLTxtRange *This, wstrbuf_t *buf) { - nsIDOMNode *iter, *tmp; - dompos_t start_pos, end_pos; + rangepoint_t end_pos, iter; cpp_bool collapsed; nsIDOMRange_GetCollapsed(This->nsrange, &collapsed); @@ -497,42 +623,42 @@ static void range_to_string(HTMLTxtRange *This, wstrbuf_t *buf) return; } - get_cur_pos(This, FALSE, &end_pos); - get_cur_pos(This, TRUE, &start_pos); + get_end_point(This, &end_pos); + get_start_point(This, &iter); - if(start_pos.type == TEXT_NODE) { - if(start_pos.node == end_pos.node) { - wstrbuf_append_nodetxt(buf, start_pos.p+start_pos.off, end_pos.off-start_pos.off+1); - iter = start_pos.node; - nsIDOMNode_AddRef(iter); - }else { - wstrbuf_append_nodetxt(buf, start_pos.p+start_pos.off, strlenW(start_pos.p+start_pos.off)); - iter = next_node(start_pos.node); - } - }else { - iter = start_pos.node; - nsIDOMNode_AddRef(iter); - } + do { + if(iter.type == TEXT_NODE) { + const PRUnichar *str; + nsAString nsstr; - while(iter != end_pos.node) { - wstrbuf_append_node(buf, iter); - tmp = next_node(iter); - nsIDOMNode_Release(iter); - iter = tmp; - } + get_text_node_data(iter.node, &nsstr, &str); - nsIDOMNode_AddRef(end_pos.node); + if(iter.node == end_pos.node) { + wstrbuf_append_nodetxt(buf, str+iter.off, end_pos.off-iter.off); + nsAString_Finish(&nsstr); + break; + } - if(start_pos.node != end_pos.node) { - if(end_pos.type == TEXT_NODE) - wstrbuf_append_nodetxt(buf, end_pos.p, end_pos.off+1); - else - wstrbuf_append_node(buf, end_pos.node); - } + wstrbuf_append_nodetxt(buf, str+iter.off, strlenW(str+iter.off)); + nsAString_Finish(&nsstr); + }else { + nsIDOMNode *node; + + node = get_child_node(iter.node, iter.off); + if(node) { + wstrbuf_append_node(buf, node, TRUE); + nsIDOMNode_Release(node); + } + } + + if(!rangepoint_next_node(&iter)) { + ERR("End of document?\n"); + break; + } + }while(!rangepoint_cmp(&iter, &end_pos)); - nsIDOMNode_Release(iter); - dompos_release(&start_pos); - dompos_release(&end_pos); + free_rangepoint(&iter); + free_rangepoint(&end_pos); if(buf->len) { WCHAR *p;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2014