January 2015 - Wine-Commits

Piotr Caban : msvcrt: Drop read buffer in _flsbuf.
by Alexandre Julliard Jan. 21, 2015

Jan. 21, 2015

Module: wine Branch: master Commit: ba0d1586ff53221e449f2ed885a059232dd4bea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba0d1586ff53221e449f2ed88… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 21 16:20:48 2015 +0100 msvcrt: Drop read buffer in _flsbuf. --- dlls/msvcrt/file.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index ff1f5d6..8c59239 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3781,12 +3781,24 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) if(!(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { msvcrt_alloc_buffer(file); } + if(!(file->_flag & MSVCRT__IOWRT)) { - if(file->_flag & MSVCRT__IORW) - file->_flag |= MSVCRT__IOWRT; - else + if(!(file->_flag & MSVCRT__IORW)) { + file->_flag |= MSVCRT__IOERR; + return MSVCRT_EOF; + } + file->_flag |= MSVCRT__IOWRT; + } + if(file->_flag & MSVCRT__IOREAD) { + if(!(file->_flag & MSVCRT__IOEOF)) { + file->_flag |= MSVCRT__IOERR; return MSVCRT_EOF; + } + file->_cnt = 0; + file->_ptr = file->_base; + file->_flag &= ~(MSVCRT__IOREAD | MSVCRT__IOEOF); } + if(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) { int res = 0;

1 0

Nikolay Sivov : dwrite/tests: Basic test for GetTypographicFeatures().
by Alexandre Julliard Jan. 21, 2015

Jan. 21, 2015

Module: wine Branch: master Commit: 0258e5319bd13f83e56000985fdb08d3c5511cfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0258e5319bd13f83e56000985… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 21 15:09:32 2015 +0300 dwrite/tests: Basic test for GetTypographicFeatures(). --- dlls/dwrite/tests/analyzer.c | 118 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 233f072..acb5b18 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -265,6 +265,14 @@ static HRESULT WINAPI analysissink_SetScriptAnalysis(IDWriteTextAnalysisSink *if return S_OK; } +static DWRITE_SCRIPT_ANALYSIS g_sa; +static HRESULT WINAPI analysissink_SetScriptAnalysis2(IDWriteTextAnalysisSink *iface, + UINT32 position, UINT32 length, DWRITE_SCRIPT_ANALYSIS const* sa) +{ + g_sa = *sa; + return S_OK; +} + #define BREAKPOINT_COUNT 20 static DWRITE_LINE_BREAKPOINT g_actual_bp[BREAKPOINT_COUNT]; @@ -310,7 +318,18 @@ static IDWriteTextAnalysisSinkVtbl analysissinkvtbl = { analysissink_SetNumberSubstitution }; +static IDWriteTextAnalysisSinkVtbl analysissinkvtbl2 = { + analysissink_QueryInterface, + analysissink_AddRef, + analysissink_Release, + analysissink_SetScriptAnalysis2, + analysissink_SetLineBreakpoints, + analysissink_SetBidiLevel, + analysissink_SetNumberSubstitution +}; + static IDWriteTextAnalysisSink analysissink = { &analysissinkvtbl }; +static IDWriteTextAnalysisSink analysissink2 = { &analysissinkvtbl2 }; static HRESULT WINAPI analysissource_QueryInterface(IDWriteTextAnalysisSource *iface, REFIID riid, void **obj) @@ -836,6 +855,22 @@ static void init_expected_sa(struct call_sequence **seq, const struct sa_test *t add_call(seq, 0, &end_of_sequence); } +static void get_script_analysis(const WCHAR *str, DWRITE_SCRIPT_ANALYSIS *sa) +{ + IDWriteTextAnalyzer *analyzer; + HRESULT hr; + + g_source = str; + + hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextAnalyzer_AnalyzeScript(analyzer, &analysissource, 0, lstrlenW(g_source), &analysissink2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + *sa = g_sa; +} + static void test_AnalyzeScript(void) { const struct sa_test *ptr = sa_tests; @@ -1174,6 +1209,88 @@ if (0) { IDWriteFontFace_Release(fontface); } +static BOOL has_feature(const DWRITE_FONT_FEATURE_TAG *tags, UINT32 count, DWRITE_FONT_FEATURE_TAG feature) +{ + UINT32 i; + + for (i = 0; i < count; i++) + if (tags[i] == feature) return TRUE; + return FALSE; +} + +static void test_GetTypographicFeatures(void) +{ + static const WCHAR localeW[] = {'c','a','d','a','b','r','a',0}; + static const WCHAR arabicW[] = {0x064a,0x064f,0x0633,0}; + static const WCHAR abcW[] = {'a','b','c',0}; + DWRITE_FONT_FEATURE_TAG tags[20]; + IDWriteTextAnalyzer2 *analyzer2; + IDWriteTextAnalyzer *analyzer; + IDWriteFontFace *fontface; + DWRITE_SCRIPT_ANALYSIS sa; + UINT32 count; + HRESULT hr; + BOOL ret; + + hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextAnalyzer_QueryInterface(analyzer, &IID_IDWriteTextAnalyzer2, (void**)&analyzer2); + IDWriteTextAnalyzer_Release(analyzer); + if (hr != S_OK) { + win_skip("GetTypographicFeatures() is not supported.\n"); + return; + } + + fontface = create_fontface(); + + get_script_analysis(abcW, &sa); + count = 0; + hr = IDWriteTextAnalyzer2_GetTypographicFeatures(analyzer2, fontface, sa, NULL, 0, &count, NULL); +todo_wine { + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); + ok(count > 0, "got %u\n", count); +} + /* invalid locale name is ignored */ + get_script_analysis(abcW, &sa); + count = 0; + hr = IDWriteTextAnalyzer2_GetTypographicFeatures(analyzer2, fontface, sa, localeW, 0, &count, NULL); +todo_wine { + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); + ok(count > 0, "got %u\n", count); +} + /* both GSUB and GPOS features are reported */ + get_script_analysis(arabicW, &sa); + memset(tags, 0, sizeof(tags)); + count = 0; + hr = IDWriteTextAnalyzer2_GetTypographicFeatures(analyzer2, fontface, sa, NULL, sizeof(tags)/sizeof(tags[0]), &count, tags); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count > 0, "got %u\n", count); + ret = has_feature(tags, count, DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_ALTERNATES); + ok(ret, "expected 'calt' feature\n"); + ret = has_feature(tags, count, DWRITE_FONT_FEATURE_TAG_MARK_TO_MARK_POSITIONING); + ok(ret, "expected 'mkmk' feature\n"); +} + get_script_analysis(abcW, &sa); + memset(tags, 0, sizeof(tags)); + count = 0; + hr = IDWriteTextAnalyzer2_GetTypographicFeatures(analyzer2, fontface, sa, NULL, sizeof(tags)/sizeof(tags[0]), &count, tags); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count > 0, "got %u\n", count); + ret = has_feature(tags, count, DWRITE_FONT_FEATURE_TAG_GLYPH_COMPOSITION_DECOMPOSITION); + ok(ret, "expected 'ccmp' feature\n"); + ret = has_feature(tags, count, DWRITE_FONT_FEATURE_TAG_MARK_TO_MARK_POSITIONING); + ok(ret, "expected 'mkmk' feature\n"); +} + ret = has_feature(tags, count, DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_ALTERNATES); + ok(!ret, "unexpected 'calt' feature\n"); + + IDWriteFontFace_Release(fontface); + IDWriteTextAnalyzer2_Release(analyzer2); +} + START_TEST(analyzer) { HRESULT hr; @@ -1195,6 +1312,7 @@ START_TEST(analyzer) test_GetTextComplexity(); test_GetGlyphs(); test_numbersubstitution(); + test_GetTypographicFeatures(); IDWriteFactory_Release(factory); }

1 0

Hans Leidekker : ntdll: Fix calculation of process and thread affinity masks on systems with a large number of processors.
by Alexandre Julliard Jan. 21, 2015

Jan. 21, 2015

Module: wine Branch: master Commit: faf70e2fbddc5299afd21d8298a81f257127c230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faf70e2fbddc5299afd21d829… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 21 13:24:14 2015 +0100 ntdll: Fix calculation of process and thread affinity masks on systems with a large number of processors. --- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/process.c | 17 ++++++++++++++--- dlls/ntdll/thread.c | 6 +++--- dlls/ntdll/virtual.c | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index b7ea6dc..92e5baf 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -46,6 +46,7 @@ struct drive_info }; extern NTSTATUS close_handle( HANDLE ) DECLSPEC_HIDDEN; +extern ULONG_PTR get_system_affinity_mask(void) DECLSPEC_HIDDEN; /* exceptions */ extern void wait_suspend( CONTEXT *context ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 3defb6e..3ac8d52 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -98,6 +98,13 @@ static UINT process_error_mode; ret = STATUS_INVALID_INFO_CLASS; \ break +ULONG_PTR get_system_affinity_mask(void) +{ + ULONG num_cpus = NtCurrentTeb()->Peb->NumberOfProcessors; + if (num_cpus >= sizeof(ULONG_PTR) * 8) return ~(ULONG_PTR)0; + return ((ULONG_PTR)1 << num_cpus) - 1; +} + /****************************************************************************** * NtQueryInformationProcess [NTDLL.@] * ZwQueryInformationProcess [NTDLL.@] @@ -145,7 +152,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( case ProcessBasicInformation: { PROCESS_BASIC_INFORMATION pbi; - const ULONG_PTR affinity_mask = ((ULONG_PTR)1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1; + const ULONG_PTR affinity_mask = get_system_affinity_mask(); if (ProcessInformationLength >= sizeof(PROCESS_BASIC_INFORMATION)) { @@ -389,7 +396,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( len = sizeof(ULONG_PTR); if (ProcessInformationLength == len) { - const ULONG_PTR system_mask = ((ULONG_PTR)1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1; + const ULONG_PTR system_mask = get_system_affinity_mask(); SERVER_START_REQ(get_process_info) { @@ -487,8 +494,11 @@ NTSTATUS WINAPI NtSetInformationProcess( process_error_mode = *(UINT *)ProcessInformation; break; case ProcessAffinityMask: + { + const ULONG_PTR system_mask = get_system_affinity_mask(); + if (ProcessInformationLength != sizeof(DWORD_PTR)) return STATUS_INVALID_PARAMETER; - if (*(PDWORD_PTR)ProcessInformation & ~(((DWORD_PTR)1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1)) + if (*(PDWORD_PTR)ProcessInformation & ~system_mask) return STATUS_INVALID_PARAMETER; if (!*(PDWORD_PTR)ProcessInformation) return STATUS_INVALID_PARAMETER; @@ -501,6 +511,7 @@ NTSTATUS WINAPI NtSetInformationProcess( } SERVER_END_REQ; break; + } case ProcessPriorityClass: if (ProcessInformationLength != sizeof(PROCESS_PRIORITY_CLASS)) return STATUS_INVALID_PARAMETER; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index c8461b0..7dd13f2 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -900,7 +900,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadBasicInformation: { THREAD_BASIC_INFORMATION info; - const ULONG_PTR affinity_mask = ((ULONG_PTR)1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1; + const ULONG_PTR affinity_mask = get_system_affinity_mask(); SERVER_START_REQ( get_thread_info ) { @@ -927,7 +927,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, return status; case ThreadAffinityMask: { - const ULONG_PTR affinity_mask = ((ULONG_PTR)1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1; + const ULONG_PTR affinity_mask = get_system_affinity_mask(); ULONG_PTR affinity = 0; SERVER_START_REQ( get_thread_info ) @@ -1170,7 +1170,7 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, return status; case ThreadAffinityMask: { - const ULONG_PTR affinity_mask = ((ULONG_PTR)1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1; + const ULONG_PTR affinity_mask = get_system_affinity_mask(); ULONG_PTR req_aff; if (length != sizeof(ULONG_PTR)) return STATUS_INVALID_PARAMETER; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 4c4c05d..9f82204 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1409,7 +1409,7 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) info->AllocationGranularity = get_mask(0) + 1; info->LowestUserAddress = (void *)0x10000; info->HighestUserAddress = (char *)user_space_limit - 1; - info->ActiveProcessorsAffinityMask = (1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1; + info->ActiveProcessorsAffinityMask = get_system_affinity_mask(); info->NumberOfProcessors = NtCurrentTeb()->Peb->NumberOfProcessors; }

1 0

Jacek Caban : winegecko.php: Added Wine Gecko 2.36-beta1 release.
by Alexandre Julliard Jan. 21, 2015

Jan. 21, 2015

Module: tools Branch: master Commit: 72c348695b85eab57eb35eaaea5eadacb2b5195b URL: http://source.winehq.org/git/tools.git/?a=commit;h=72c348695b85eab57eb35eaa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 21 15:55:20 2015 +0100 winegecko.php: Added Wine Gecko 2.36-beta1 release. --- winegecko.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/winegecko.php b/winegecko.php index eaa1f22..b2135a6 100644 --- a/winegecko.php +++ b/winegecko.php @@ -84,7 +84,9 @@ $aFileSizes = array( '2.34-beta2-x86'=>28270080, '2.34-beta2-x86_64'=>29807616, '2.34-x86'=>28269568, - '2.34-x86_64'=>29802496 + '2.34-x86_64'=>29802496, + '2.36-beta1-x86'=>29698560, + '2.36-beta1-x86_64'=>31211008 ); // Exact size of the file:

1 0

Francois Gouget : dsound: Make some DirectSoundDevice_*() functions static.
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: 57582b37b3e74dab410cc6c70a2aaa8fa905ea2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=57582b37b3e74dab410cc6c70… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 20 03:28:05 2015 +0100 dsound: Make some DirectSoundDevice_*() functions static. --- dlls/dsound/dsound.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 2a41967..7e53f91 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -199,7 +199,7 @@ static ULONG DirectSoundDevice_AddRef(DirectSoundDevice * device) return ref; } -ULONG DirectSoundDevice_Release(DirectSoundDevice * device) +static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) { HRESULT hr; ULONG ref = InterlockedDecrement(&(device->ref)); @@ -271,7 +271,7 @@ BOOL DSOUND_check_supported(IAudioClient *client, DWORD rate, return hr == S_OK; } -HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcGUID) +static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcGUID) { HRESULT hr = DS_OK; GUID devGUID; @@ -398,7 +398,7 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG return hr; } -HRESULT DirectSoundDevice_CreateSoundBuffer( +static HRESULT DirectSoundDevice_CreateSoundBuffer( DirectSoundDevice * device, LPCDSBUFFERDESC dsbd, LPLPDIRECTSOUNDBUFFER ppdsb, @@ -539,7 +539,7 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( return hres; } -HRESULT DirectSoundDevice_DuplicateSoundBuffer( +static HRESULT DirectSoundDevice_DuplicateSoundBuffer( DirectSoundDevice * device, LPDIRECTSOUNDBUFFER psb, LPLPDIRECTSOUNDBUFFER ppdsb)

1 0

Francois Gouget : dsound: Reorder the interfaces to remove the need for forward declarations.
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: dfaef5306f2e96dc3cddf530e5f63f01a048c47e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfaef5306f2e96dc3cddf530e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 20 03:28:02 2015 +0100 dsound: Reorder the interfaces to remove the need for forward declarations. --- dlls/dsound/dsound.c | 1675 +++++++++++++++++++++--------------------- dlls/dsound/dsound_private.h | 14 - 2 files changed, 838 insertions(+), 851 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfaef5306f2e96dc3cddf…

1 0

Francois Gouget : dsound: Make DSOUND_FindSpeakerConfig() static.
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: 82c298ee6ed0199e15be26e8c7c31d8ef9137d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c298ee6ed0199e15be26e8c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 20 03:25:49 2015 +0100 dsound: Make DSOUND_FindSpeakerConfig() static. --- dlls/dsound/dsound_private.h | 1 - dlls/dsound/primary.c | 98 ++++++++++++++++++++++---------------------- 2 files changed, 49 insertions(+), 50 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 52b2847..af2034a 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -219,7 +219,6 @@ HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LP LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) DECLSPEC_HIDDEN; HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) DECLSPEC_HIDDEN; HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) DECLSPEC_HIDDEN; -DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels) DECLSPEC_HIDDEN; HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, const DSBUFFERDESC *dsbd) DECLSPEC_HIDDEN; void primarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 7d05efd..52d00f9 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -79,6 +79,55 @@ static DWORD speaker_config_to_channel_mask(DWORD speaker_config) return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; } +static DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels) +{ + IPropertyStore *store; + HRESULT hr; + PROPVARIANT pv; + ULONG phys_speakers; + + const DWORD def = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); + + hr = IMMDevice_OpenPropertyStore(mmdevice, STGM_READ, &store); + if (FAILED(hr)) { + WARN("IMMDevice_OpenPropertyStore failed: %08x\n", hr); + return def; + } + + hr = IPropertyStore_GetValue(store, &PKEY_AudioEndpoint_PhysicalSpeakers, &pv); + + if (FAILED(hr)) { + WARN("IPropertyStore_GetValue failed: %08x\n", hr); + IPropertyStore_Release(store); + return def; + } + + if (pv.vt != VT_UI4) { + WARN("PKEY_AudioEndpoint_PhysicalSpeakers is not a ULONG: 0x%x\n", pv.vt); + PropVariantClear(&pv); + IPropertyStore_Release(store); + return def; + } + + phys_speakers = pv.u.ulVal; + + PropVariantClear(&pv); + IPropertyStore_Release(store); + + if ((channels >= 6 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_5POINT1) == KSAUDIO_SPEAKER_5POINT1) + return DSSPEAKER_5POINT1_BACK; + else if ((channels >= 6 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_5POINT1_SURROUND) == KSAUDIO_SPEAKER_5POINT1_SURROUND) + return DSSPEAKER_5POINT1_SURROUND; + else if ((channels >= 4 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_QUAD) == KSAUDIO_SPEAKER_QUAD) + return DSSPEAKER_QUAD; + else if ((channels >= 2 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_STEREO) == KSAUDIO_SPEAKER_STEREO) + return DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); + else if ((phys_speakers & KSAUDIO_SPEAKER_MONO) == KSAUDIO_SPEAKER_MONO) + return DSSPEAKER_MONO; + + return def; +} + static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client, BOOL forcewave, WAVEFORMATEX **wfx) { @@ -166,55 +215,6 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client return S_OK; } -DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels) -{ - IPropertyStore *store; - HRESULT hr; - PROPVARIANT pv; - ULONG phys_speakers; - - const DWORD def = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); - - hr = IMMDevice_OpenPropertyStore(mmdevice, STGM_READ, &store); - if (FAILED(hr)) { - WARN("IMMDevice_OpenPropertyStore failed: %08x\n", hr); - return def; - } - - hr = IPropertyStore_GetValue(store, &PKEY_AudioEndpoint_PhysicalSpeakers, &pv); - - if (FAILED(hr)) { - WARN("IPropertyStore_GetValue failed: %08x\n", hr); - IPropertyStore_Release(store); - return def; - } - - if (pv.vt != VT_UI4) { - WARN("PKEY_AudioEndpoint_PhysicalSpeakers is not a ULONG: 0x%x\n", pv.vt); - PropVariantClear(&pv); - IPropertyStore_Release(store); - return def; - } - - phys_speakers = pv.u.ulVal; - - PropVariantClear(&pv); - IPropertyStore_Release(store); - - if ((channels >= 6 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_5POINT1) == KSAUDIO_SPEAKER_5POINT1) - return DSSPEAKER_5POINT1_BACK; - else if ((channels >= 6 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_5POINT1_SURROUND) == KSAUDIO_SPEAKER_5POINT1_SURROUND) - return DSSPEAKER_5POINT1_SURROUND; - else if ((channels >= 4 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_QUAD) == KSAUDIO_SPEAKER_QUAD) - return DSSPEAKER_QUAD; - else if ((channels >= 2 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_STEREO) == KSAUDIO_SPEAKER_STEREO) - return DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); - else if ((phys_speakers & KSAUDIO_SPEAKER_MONO) == KSAUDIO_SPEAKER_MONO) - return DSSPEAKER_MONO; - - return def; -} - HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) { UINT prebuf_frames;

1 0

Bruno Jesus : ws2_32: getaddrinfo must SetLastError on success or failure.
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: 038399fcdd2f5601cdc59113d810409e08374b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=038399fcdd2f5601cdc59113d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jan 19 21:23:36 2015 -0200 ws2_32: getaddrinfo must SetLastError on success or failure. --- dlls/ws2_32/socket.c | 7 ++++++- dlls/ws2_32/tests/sock.c | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0bc9d16..faf2ec1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5628,7 +5628,11 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr const char *node; *res = NULL; - if (!nodename && !servname) return WSAHOST_NOT_FOUND; + if (!nodename && !servname) + { + SetLastError(WSAHOST_NOT_FOUND); + return WSAHOST_NOT_FOUND; + } if (!nodename) node = NULL; @@ -5749,6 +5753,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr } else result = convert_eai_u2w(result); + SetLastError(result); return result; outofmem: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 78ae609..7288b5c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5880,14 +5880,18 @@ static void test_GetAddrInfoW(void) memset(&hint, 0, sizeof(ADDRINFOW)); result = (ADDRINFOW *)0xdeadbeef; + WSASetLastError(0xdeadbeef); ret = pGetAddrInfoW(NULL, NULL, NULL, &result); ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); ok(result == NULL, "got %p\n", result); result = NULL; + WSASetLastError(0xdeadbeef); ret = pGetAddrInfoW(empty, NULL, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); ok(result != NULL, "GetAddrInfoW failed\n"); + ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); pFreeAddrInfoW(result); result = NULL; @@ -5906,6 +5910,7 @@ static void test_GetAddrInfoW(void) result = NULL; ret = pGetAddrInfoW(empty, zero, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); ok(result != NULL, "GetAddrInfoW failed\n"); result2 = NULL; @@ -5942,11 +5947,14 @@ static void test_GetAddrInfoW(void) pFreeAddrInfoW(result); result = NULL; + SetLastError(0xdeadbeef); ret = pGetAddrInfoW(localhost, port, &hint, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); pFreeAddrInfoW(result); result = (ADDRINFOW *)0xdeadbeef; + WSASetLastError(0xdeadbeef); ret = pGetAddrInfoW(NULL, NULL, NULL, &result); if(ret == 0) { @@ -5954,9 +5962,11 @@ static void test_GetAddrInfoW(void) return; } ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); ok(result == NULL, "got %p\n", result); result = (ADDRINFOW *)0xdeadbeef; + WSASetLastError(0xdeadbeef); ret = pGetAddrInfoW(nxdomain, NULL, NULL, &result); if(ret == 0) { @@ -5964,6 +5974,7 @@ static void test_GetAddrInfoW(void) return; } ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); ok(result == NULL, "got %p\n", result); for (i = 0;i < (sizeof(hinttests) / sizeof(hinttests[0]));i++) @@ -6031,14 +6042,18 @@ static void test_getaddrinfo(void) memset(&hint, 0, sizeof(ADDRINFOA)); result = (ADDRINFOA *)0xdeadbeef; + WSASetLastError(0xdeadbeef); ret = pgetaddrinfo(NULL, NULL, NULL, &result); ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); ok(result == NULL, "got %p\n", result); result = NULL; + WSASetLastError(0xdeadbeef); ret = pgetaddrinfo("", NULL, NULL, &result); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); ok(result != NULL, "getaddrinfo failed\n"); + ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); pfreeaddrinfo(result); result = NULL; @@ -6055,8 +6070,10 @@ static void test_getaddrinfo(void) pfreeaddrinfo(result2); result = NULL; + WSASetLastError(0xdeadbeef); ret = pgetaddrinfo("", "0", NULL, &result); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); ok(result != NULL, "getaddrinfo failed\n"); result2 = NULL; @@ -6093,11 +6110,14 @@ static void test_getaddrinfo(void) pfreeaddrinfo(result); result = NULL; + WSASetLastError(0xdeadbeef); ret = pgetaddrinfo("localhost", "80", &hint, &result); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); pfreeaddrinfo(result); result = (ADDRINFOA *)0xdeadbeef; + WSASetLastError(0xdeadbeef); ret = pgetaddrinfo("nxdomain.codeweavers.com", NULL, NULL, &result); if(ret == 0) { @@ -6105,6 +6125,7 @@ static void test_getaddrinfo(void) return; } ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); ok(result == NULL, "got %p\n", result); for (i = 0;i < (sizeof(hinttests) / sizeof(hinttests[0]));i++)

1 0

Nikolay Sivov : dwrite/tests: Additional test for Draw().
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: aef50786fb5df36002cf06426ed53fb29208916f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef50786fb5df36002cf06426… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 14 08:13:12 2015 +0300 dwrite/tests: Additional test for Draw(). --- dlls/dwrite/tests/layout.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 1a1cfd9..760c34f 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -785,7 +785,17 @@ static const struct drawcall_entry draw_seq[] = { { DRAW_LAST_KIND } }; -static void test_draw_sequence(void) +static const struct drawcall_entry draw_seq2[] = { + { DRAW_GLYPHRUN }, + { DRAW_GLYPHRUN }, + { DRAW_GLYPHRUN }, + { DRAW_GLYPHRUN }, + { DRAW_GLYPHRUN }, + { DRAW_GLYPHRUN }, + { DRAW_LAST_KIND } +}; + +static void test_Draw(void) { static const WCHAR strW[] = {'s','t','r','i','n','g',0}; static const WCHAR ruW[] = {'r','u',0}; @@ -831,9 +841,20 @@ static void test_draw_sequence(void) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok_sequence(sequences, RENDERER_ID, draw_seq, "draw test", TRUE); + IDWriteTextLayout_Release(layout); + + /* with reduced width DrawGlyphRun() is called for every line */ + hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, format, 5.0, 100.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0, 0.0); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, RENDERER_ID, draw_seq2, "draw test 2", TRUE); - IDWriteTextFormat_Release(format); IDWriteTextLayout_Release(layout); + + IDWriteTextFormat_Release(format); } static void test_typography(void) @@ -1010,7 +1031,7 @@ START_TEST(layout) test_CreateEllipsisTrimmingSign(); test_fontweight(); test_SetInlineObject(); - test_draw_sequence(); + test_Draw(); test_typography(); test_GetClusterMetrics(); test_SetLocaleName();

1 0

Aric Stewart : gdi32: Do not install fonts with a family name that is too long.
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: ecbda5686dfc0bae156fd3cb489369f79ba8fff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecbda5686dfc0bae156fd3cb4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 19 08:11:51 2015 -0600 gdi32: Do not install fonts with a family name that is too long. --- dlls/gdi32/freetype.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 62e19a5..5122fb5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2024,6 +2024,14 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags ); family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); + if (strlenW(family->FamilyName) >= LF_FACESIZE) + { + ERR("Ignoring %s because name is too long\n", debugstr_w(family->FamilyName)); + release_face( face ); + release_family( family ); + return; + } + if (insert_face_in_family_list( face, family )) { if (flags & ADDFONT_ADD_TO_CACHE)

1 0