January 2015 - Wine-commits

Mark Harmstone : dsound: NOP on SetSpeakerConfig.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: a48c7fe408bdf5b28fcdcaa2709718c2a02d1e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a48c7fe408bdf5b28fcdcaa27… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Wed Dec 31 18:53:06 2014 +0000 dsound: NOP on SetSpeakerConfig. --- dlls/dsound/dsound.c | 4 ++-- dlls/dsound/tests/dsound.c | 6 +++--- dlls/dsound/tests/dsound8.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 986168b..66c9d91 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -386,8 +386,8 @@ static HRESULT WINAPI IDirectSound8Impl_SetSpeakerConfig(IDirectSound8 *iface, D return DSERR_UNINITIALIZED; } - This->device->speaker_config = config; - WARN("not fully functional\n"); + /* NOP on Vista and above */ + return DS_OK; } diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index e5a9110..f93e137 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -158,10 +158,10 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized, if (rc==DS_OK) { rc=IDirectSound_GetSpeakerConfig(dso,&new_speaker_config); ok(rc==DS_OK,"IDirectSound_GetSpeakerConfig() failed: %08x\n", rc); - if (rc==DS_OK && speaker_config!=new_speaker_config) + if (rc==DS_OK && speaker_config!=new_speaker_config && ref_speaker_config!=new_speaker_config) trace("IDirectSound_GetSpeakerConfig() failed to set speaker " - "config: expected 0x%08x, got 0x%08x\n", - speaker_config,new_speaker_config); + "config: expected 0x%08x or 0x%08x, got 0x%08x\n", + speaker_config,ref_speaker_config,new_speaker_config); IDirectSound_SetSpeakerConfig(dso,ref_speaker_config); } diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 64b9f62..ad16ea7 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -171,10 +171,10 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized, if (rc==DS_OK) { rc=IDirectSound8_GetSpeakerConfig(dso,&new_speaker_config); ok(rc==DS_OK,"IDirectSound8_GetSpeakerConfig() failed: %08x\n", rc); - if (rc==DS_OK && speaker_config!=new_speaker_config) + if (rc==DS_OK && speaker_config!=new_speaker_config && ref_speaker_config!=new_speaker_config) trace("IDirectSound8_GetSpeakerConfig() failed to set speaker " - "config: expected 0x%08x, got 0x%08x\n", - speaker_config,new_speaker_config); + "config: expected 0x%08x or 0x%08x, got 0x%08x\n", + speaker_config,ref_speaker_config,new_speaker_config); IDirectSound8_SetSpeakerConfig(dso,ref_speaker_config); }

1 0

Mark Harmstone : dsound: Get speaker config from mmdevice props.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: 52345858d0a75c160e4bc2edcf32138e4a1fa492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52345858d0a75c160e4bc2edc… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Wed Dec 31 20:49:21 2014 +0000 dsound: Get speaker config from mmdevice props. Use PKEY_AudioEndpoint_PhysicalSpeakers to set the speaker config in dsound. --- dlls/dsound/primary.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 36c00da..ea4559c 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -146,6 +146,49 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client return S_OK; } +static DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice) +{ + 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 ((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; @@ -181,6 +224,8 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) return hres; } + device->speaker_config = DSOUND_FindSpeakerConfig(device->mmdevice); + hres = DSOUND_WaveFormat(device, device->client, forcewave, &wfx); if (FAILED(hres)) { IAudioClient_Release(device->client);

1 0

Mark Harmstone : winealsa: Support up to 6 channels.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: a3f33daa6ab7156b26ad1378d49e8af6666b062d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f33daa6ab7156b26ad1378d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Wed Dec 31 21:34:47 2014 +0000 winealsa: Support up to 6 channels. --- dlls/winealsa.drv/mmdevdrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index d2fb2d3..2079dcc 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1830,8 +1830,8 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, goto exit; } - if(max_channels > 2) - fmt->Format.nChannels = 2; + if(max_channels > 6) + fmt->Format.nChannels = 6; else fmt->Format.nChannels = max_channels;

1 0

Jon Doron : kernel32: Fix write_raw_resources to support 32 and 64 PE formats.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: 3c28c0a2eb07ed1cf8900537dfb26ad0fbe7b3d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c28c0a2eb07ed1cf8900537d… Author: Jon Doron <arilou(a)gmail.com> Date: Thu Jan 1 16:46:58 2015 +0200 kernel32: Fix write_raw_resources to support 32 and 64 PE formats. --- dlls/kernel32/resource.c | 73 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 51 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index ecd599f..06b93db 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -850,8 +850,10 @@ static IMAGE_SECTION_HEADER *get_section_header( void *base, DWORD mapping_size, static BOOL check_pe_exe( HANDLE file, QUEUEDUPDATES *updates ) { - const IMAGE_NT_HEADERS *nt; + const IMAGE_NT_HEADERS32 *nt; + const IMAGE_NT_HEADERS64 *nt64; const IMAGE_SECTION_HEADER *sec; + const IMAGE_DATA_DIRECTORY *dd; BOOL ret = FALSE; HANDLE mapping; DWORD mapping_size, num_sections = 0; @@ -867,13 +869,18 @@ static BOOL check_pe_exe( HANDLE file, QUEUEDUPDATES *updates ) if (!base) goto done; - nt = get_nt_header( base, mapping_size ); + nt = (IMAGE_NT_HEADERS32 *)get_nt_header( base, mapping_size ); if (!nt) goto done; + nt64 = (IMAGE_NT_HEADERS64*)nt; + dd = &nt->OptionalHeader.DataDirectory[0]; + if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + dd = &nt64->OptionalHeader.DataDirectory[0]; + TRACE("resources: %08x %08x\n", - nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress, - nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size); + dd[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress, + dd[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size); sec = get_section_header( base, mapping_size, &num_sections ); if (!sec) @@ -1393,10 +1400,12 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) DWORD section_size; BOOL ret = FALSE; IMAGE_SECTION_HEADER *sec; - IMAGE_NT_HEADERS *nt; + IMAGE_NT_HEADERS32 *nt; + IMAGE_NT_HEADERS64 *nt64; struct resource_size_info res_size; BYTE *res_base; struct mapping_info *read_map = NULL, *write_map = NULL; + DWORD PeSectionAlignment, PeFileAlignment, PeSizeOfImage; /* copy the exe to a temp file then update the temp file... */ tempdir[0] = 0; @@ -1429,19 +1438,30 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) if (!write_map) goto done; - nt = get_nt_header( write_map->base, write_map->size ); + nt = (IMAGE_NT_HEADERS32*)get_nt_header( write_map->base, write_map->size ); if (!nt) goto done; - if (nt->OptionalHeader.SectionAlignment <= 0) + nt64 = (IMAGE_NT_HEADERS64*)nt; + if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) { + PeSectionAlignment = nt64->OptionalHeader.SectionAlignment; + PeFileAlignment = nt64->OptionalHeader.FileAlignment; + PeSizeOfImage = nt64->OptionalHeader.SizeOfImage; + } else { + PeSectionAlignment = nt->OptionalHeader.SectionAlignment; + PeFileAlignment = nt->OptionalHeader.FileAlignment; + PeSizeOfImage = nt->OptionalHeader.SizeOfImage; + } + + if ((LONG)PeSectionAlignment <= 0) { - ERR("invalid section alignment %04x\n", nt->OptionalHeader.SectionAlignment); + ERR("invalid section alignment %08x\n", PeSectionAlignment); goto done; } - if (nt->OptionalHeader.FileAlignment <= 0) + if ((LONG)PeFileAlignment <= 0) { - ERR("invalid file alignment %04x\n", nt->OptionalHeader.FileAlignment); + ERR("invalid file alignment %08x\n", PeFileAlignment); goto done; } @@ -1460,12 +1480,12 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) memset( sec, 0, sizeof *sec ); memcpy( sec->Name, ".rsrc", 5 ); sec->Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ; - sec->VirtualAddress = nt->OptionalHeader.SizeOfImage; + sec->VirtualAddress = PeSizeOfImage; } if (!sec->PointerToRawData) /* empty section */ { - sec->PointerToRawData = write_map->size + (-write_map->size) % nt->OptionalHeader.FileAlignment; + sec->PointerToRawData = write_map->size + (-write_map->size) % PeFileAlignment; sec->SizeOfRawData = 0; } @@ -1475,7 +1495,7 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) /* round up the section size */ section_size = res_size.total_size; - section_size += (-section_size) % nt->OptionalHeader.FileAlignment; + section_size += (-section_size) % PeFileAlignment; TRACE("requires %08x (%08x) bytes\n", res_size.total_size, section_size ); @@ -1483,10 +1503,10 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) if (section_size != sec->SizeOfRawData) { DWORD old_size = write_map->size; - DWORD virtual_section_size = res_size.total_size + (-res_size.total_size) % nt->OptionalHeader.SectionAlignment; - int delta = section_size - (sec->SizeOfRawData + (-sec->SizeOfRawData) % nt->OptionalHeader.FileAlignment); + DWORD virtual_section_size = res_size.total_size + (-res_size.total_size) % PeSectionAlignment; + int delta = section_size - (sec->SizeOfRawData + (-sec->SizeOfRawData) % PeFileAlignment); int rva_delta = virtual_section_size - - (sec->Misc.VirtualSize + (-sec->Misc.VirtualSize) % nt->OptionalHeader.SectionAlignment); + (sec->Misc.VirtualSize + (-sec->Misc.VirtualSize) % PeSectionAlignment); BOOL rsrc_is_last = sec->PointerToRawData + sec->SizeOfRawData == old_size; /* align .rsrc size when possible */ DWORD mapping_size = rsrc_is_last ? sec->PointerToRawData + section_size : old_size + delta; @@ -1502,12 +1522,13 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) ret = resize_mapping( write_map, mapping_size ); /* get the pointers again - they might be different after remapping */ - nt = get_nt_header( write_map->base, mapping_size ); + nt = (IMAGE_NT_HEADERS32*)get_nt_header( write_map->base, mapping_size ); if (!nt) { ERR("couldn't get NT header\n"); goto done; } + nt64 = (IMAGE_NT_HEADERS64*)nt; sec = get_resource_section( write_map->base, mapping_size ); if (!sec) @@ -1538,12 +1559,13 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) { ret = resize_mapping( write_map, mapping_size ); - nt = get_nt_header( write_map->base, mapping_size ); + nt = (IMAGE_NT_HEADERS32*)get_nt_header( write_map->base, mapping_size ); if (!nt) { ERR("couldn't get NT header\n"); goto done; } + nt64 = (IMAGE_NT_HEADERS64*)nt; sec = get_resource_section( write_map->base, mapping_size ); if (!sec) @@ -1553,10 +1575,17 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) /* adjust the PE header information */ sec->SizeOfRawData = section_size; sec->Misc.VirtualSize = virtual_section_size; - nt->OptionalHeader.SizeOfImage += rva_delta; - nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress; - nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; - nt->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); + if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) { + nt64->OptionalHeader.SizeOfImage += rva_delta; + nt64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress; + nt64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; + nt64->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); + } else { + nt->OptionalHeader.SizeOfImage += rva_delta; + nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress; + nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; + nt->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); + } } res_base = (LPBYTE) write_map->base + sec->PointerToRawData;

1 0

Nikolay Sivov : dwrite: Store locale name for each text range.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: aecec3847a75cbb53df7b8f7a2225967e686a45b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aecec3847a75cbb53df7b8f7a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 1 21:50:59 2015 +0300 dwrite: Store locale name for each text range. --- dlls/dwrite/layout.c | 74 ++++++++++++++++++++++++++++++++++++++-------- dlls/dwrite/tests/layout.c | 67 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index ba35713..0ddb0b4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -67,7 +67,8 @@ enum layout_range_attr_kind { LAYOUT_RANGE_ATTR_INLINE, LAYOUT_RANGE_ATTR_UNDERLINE, LAYOUT_RANGE_ATTR_STRIKETHROUGH, - LAYOUT_RANGE_ATTR_FONTCOLL + LAYOUT_RANGE_ATTR_FONTCOLL, + LAYOUT_RANGE_ATTR_LOCALE }; struct layout_range_attr_value { @@ -82,6 +83,7 @@ struct layout_range_attr_value { BOOL underline; BOOL strikethrough; IDWriteFontCollection *collection; + const WCHAR *locale; } u; }; @@ -97,6 +99,7 @@ struct layout_range { BOOL underline; BOOL strikethrough; IDWriteFontCollection *collection; + WCHAR locale[LOCALE_NAME_MAX_LENGTH]; }; struct layout_run { @@ -402,6 +405,8 @@ static BOOL is_same_layout_attrvalue(struct layout_range const *range, enum layo return range->strikethrough == value->u.strikethrough; case LAYOUT_RANGE_ATTR_FONTCOLL: return range->collection == value->u.collection; + case LAYOUT_RANGE_ATTR_LOCALE: + return strcmpW(range->locale, value->u.locale) == 0; default: ; } @@ -447,6 +452,7 @@ static struct layout_range *alloc_layout_range(struct dwrite_textlayout *layout, range->collection = layout->format.collection; if (range->collection) IDWriteFontCollection_AddRef(range->collection); + strcpyW(range->locale, layout->format.locale); return range; } @@ -579,6 +585,11 @@ static BOOL set_layout_range_attrval(struct layout_range *dest, enum layout_rang if (dest->collection) IDWriteFontCollection_AddRef(dest->collection); break; + case LAYOUT_RANGE_ATTR_LOCALE: + changed = strcmpW(dest->locale, value->u.locale) != 0; + if (changed) + strcpyW(dest->locale, value->u.locale); + break; default: ; } @@ -1127,17 +1138,17 @@ static HRESULT WINAPI dwritetextlayout_SetDrawingEffect(IDWriteTextLayout2 *ifac return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_EFFECT, &value); } -static HRESULT WINAPI dwritetextlayout_SetInlineObject(IDWriteTextLayout2 *iface, IDWriteInlineObject *object, DWRITE_TEXT_RANGE r) +static HRESULT WINAPI dwritetextlayout_SetInlineObject(IDWriteTextLayout2 *iface, IDWriteInlineObject *object, DWRITE_TEXT_RANGE range) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); struct layout_range_attr_value attr; - TRACE("(%p)->(%p %s)\n", This, object, debugstr_range(&r)); + TRACE("(%p)->(%p %s)\n", This, object, debugstr_range(&range)); - if (!validate_text_range(This, &r)) + if (!validate_text_range(This, &range)) return S_OK; - attr.range = r; + attr.range = range; attr.u.object = object; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_INLINE, &attr); @@ -1153,8 +1164,20 @@ static HRESULT WINAPI dwritetextlayout_SetTypography(IDWriteTextLayout2 *iface, static HRESULT WINAPI dwritetextlayout_SetLocaleName(IDWriteTextLayout2 *iface, WCHAR const* locale, DWRITE_TEXT_RANGE range) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%s %s): stub\n", This, debugstr_w(locale), debugstr_range(&range)); - return E_NOTIMPL; + struct layout_range_attr_value attr; + + TRACE("(%p)->(%s %s)\n", This, debugstr_w(locale), debugstr_range(&range)); + + if (!locale || strlenW(locale) > LOCALE_NAME_MAX_LENGTH-1) + return E_INVALIDARG; + + if (!validate_text_range(This, &range)) + return S_OK; + + attr.range = range; + attr.u.locale = locale; + + return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_LOCALE, &attr); } static FLOAT WINAPI dwritetextlayout_GetMaxWidth(IDWriteTextLayout2 *iface) @@ -1349,19 +1372,44 @@ static HRESULT WINAPI dwritetextlayout_GetTypography(IDWriteTextLayout2 *iface, } static HRESULT WINAPI dwritetextlayout_layout_GetLocaleNameLength(IDWriteTextLayout2 *iface, - UINT32 position, UINT32* length, DWRITE_TEXT_RANGE *range) + UINT32 position, UINT32* length, DWRITE_TEXT_RANGE *r) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%u %p %p): stub\n", This, position, length, range); - return E_NOTIMPL; + struct layout_range *range; + + TRACE("(%p)->(%u %p %p)\n", This, position, length, r); + + range = get_layout_range_by_pos(This, position); + if (!range) { + *length = 0; + return S_OK; + } + + *length = strlenW(range->locale); + return return_range(range, r); } static HRESULT WINAPI dwritetextlayout_layout_GetLocaleName(IDWriteTextLayout2 *iface, - UINT32 position, WCHAR* name, UINT32 name_size, DWRITE_TEXT_RANGE *range) + UINT32 position, WCHAR* locale, UINT32 length, DWRITE_TEXT_RANGE *r) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%u %p %u %p): stub\n", This, position, name, name_size, range); - return E_NOTIMPL; + struct layout_range *range; + + TRACE("(%p)->(%u %p %u %p)\n", This, position, locale, length, r); + + if (length == 0) + return E_INVALIDARG; + + locale[0] = 0; + range = get_layout_range_by_pos(This, position); + if (!range) + return E_INVALIDARG; + + if (length < strlenW(range->locale) + 1) + return E_NOT_SUFFICIENT_BUFFER; + + strcpyW(locale, range->locale); + return return_range(range, r); } static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index de3e544..b90d7af 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -924,6 +924,72 @@ todo_wine { IDWriteTextFormat_Release(format); } +static void test_SetLocaleName(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + WCHAR buffW[LOCALE_NAME_MAX_LENGTH+5]; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + DWRITE_TEXT_RANGE range; + HRESULT hr; + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + range.startPosition = 0; + range.length = 1; + hr = IDWriteTextLayout_SetLocaleName(layout, enusW, range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_SetLocaleName(layout, NULL, range); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* invalid locale name is allowed */ + hr = IDWriteTextLayout_SetLocaleName(layout, strW, range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_GetLocaleName(layout, 0, NULL, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + +if (0) /* crashes on native */ + hr = IDWriteTextLayout_GetLocaleName(layout, 0, NULL, 1, NULL); + + buffW[0] = 0; + hr = IDWriteTextLayout_GetLocaleName(layout, 0, buffW, sizeof(buffW)/sizeof(WCHAR), NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, strW), "got %s\n", wine_dbgstr_w(buffW)); + + /* get with a shorter buffer */ + buffW[0] = 0xa; + hr = IDWriteTextLayout_GetLocaleName(layout, 0, buffW, 1, NULL); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); + ok(buffW[0] == 0, "got %x\n", buffW[0]); + + /* name is too long */ + lstrcpyW(buffW, strW); + while (lstrlenW(buffW) < LOCALE_NAME_MAX_LENGTH) { + lstrcatW(buffW, strW); + } + lstrcatW(buffW, strW); + + range.startPosition = 0; + range.length = 1; + hr = IDWriteTextLayout_SetLocaleName(layout, buffW, range); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + buffW[0] = 0; + hr = IDWriteTextLayout_GetLocaleName(layout, 0, buffW, sizeof(buffW)/sizeof(WCHAR), NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, strW), "got %s\n", wine_dbgstr_w(buffW)); + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); +} + START_TEST(layout) { HRESULT hr; @@ -949,6 +1015,7 @@ START_TEST(layout) test_draw_sequence(); test_typography(); test_GetClusterMetrics(); + test_SetLocaleName(); IDWriteFactory_Release(factory); }

1 0

André Hentschel : configure: Fix check for cms.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: 4110c93e419ded0572cc1a2bb8b1940a1b370ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4110c93e419ded0572cc1a2bb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 2 00:34:47 2015 +0100 configure: Fix check for cms. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b4e041d..79d6632 100755 --- a/configure +++ b/configure @@ -11854,7 +11854,7 @@ $as_echo "#define HAVE_RESOLV 1" >>confdefs.h esac fi -if test "x$with_lcms2" != "xno" +if test "x$with_cms" != "xno" then if ${LCMS2_CFLAGS:+false} :; then : if ${PKG_CONFIG+:} false; then : diff --git a/configure.ac b/configure.ac index 94b83ab..b67a7e7 100644 --- a/configure.ac +++ b/configure.ac @@ -1455,7 +1455,7 @@ then fi dnl **** Check for LittleCMS *** -if test "x$with_lcms2" != "xno" +if test "x$with_cms" != "xno" then WINE_PACKAGE_FLAGS(LCMS2,[lcms2],[-llcms2],,, [AC_CHECK_HEADERS([lcms2.h])

1 0

Stefan Leichter : ntoskrnl.exe: Add stub for KeSetSystemAffinityThread.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: f592eea591d4232ae42bce0db0953a1fa487e88d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f592eea591d4232ae42bce0db… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Jan 2 12:44:38 2015 +0100 ntoskrnl.exe: Add stub for KeSetSystemAffinityThread. --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2285ec6..c10377a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1452,6 +1452,13 @@ KPRIORITY WINAPI KeSetPriorityThread( PKTHREAD Thread, KPRIORITY Priority ) return Priority; } +/*********************************************************************** + * KeSetSystemAffinityThread (NTOSKRNL.EXE.@) + */ +VOID WINAPI KeSetSystemAffinityThread(KAFFINITY Affinity) +{ + FIXME("(%lx) stub\n", Affinity); +} /*********************************************************************** * KeWaitForSingleObject (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 228da29..b824250 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -614,7 +614,7 @@ @ stub KeSetKernelStackSwapEnable @ stdcall KeSetPriorityThread(ptr long) @ stub KeSetProfileIrql -@ stub KeSetSystemAffinityThread +@ stdcall KeSetSystemAffinityThread(long) @ stub KeSetTargetProcessorDpc @ stub KeSetTimeIncrement @ stub KeSetTimer diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 29b24e7..e4f693a 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1226,6 +1226,7 @@ LONG WINAPI KeReleaseSemaphore(PRKSEMAPHORE,KPRIORITY,LONG,BOOLEAN); LONG WINAPI KeResetEvent(PRKEVENT); LONG WINAPI KeSetEvent(PRKEVENT,KPRIORITY,BOOLEAN); KPRIORITY WINAPI KeSetPriorityThread(PKTHREAD,KPRIORITY); +void WINAPI KeSetSystemAffinityThread(KAFFINITY); PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T);

1 0

Stefan Leichter : ntoskrnl.exe: Emulate instruction mov eax,cr4.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: e729dba55d33adbb7403a03042f7637dfcddb980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e729dba55d33adbb7403a0304… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Jan 2 12:44:47 2015 +0100 ntoskrnl.exe: Emulate instruction mov eax,cr4. --- dlls/ntoskrnl.exe/instr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index fe35686..e170044 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -319,9 +319,14 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) TRACE("mov eax,cr0 at 0x%08x, EAX=0x%08x\n", context->Eip,context->Eax ); context->Eip += prefixlen+3; return ExceptionContinueExecution; + case 0xe0: + TRACE("mov eax,cr4 at 0x%08x, EAX=0x%08x\n", context->Eip,context->Eax ); + context->Eip += prefixlen+3; + return ExceptionContinueExecution; default: break; /*fallthrough to bad instruction handling */ } + ERR("Unsupported EAX -> CR register, eip+2 is %02x\n", instr[2]); break; /*fallthrough to bad instruction handling */ case 0x20: /* mov crX, eax */ switch (instr[2])

1 0

Bruno Jesus : ws2_32: Better trace __WSAFDIsSet.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: fe127ac36cdc9dafe5979f4ba5d9a83e7ecb45d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe127ac36cdc9dafe5979f4ba… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Jan 2 14:07:15 2015 -0200 ws2_32: Better trace __WSAFDIsSet. --- dlls/ws2_32/socket.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a9ab0a5..f81f842 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6359,13 +6359,17 @@ SOCKET WINAPI WSAJoinLeaf( */ int WINAPI __WSAFDIsSet(SOCKET s, WS_fd_set *set) { - int i = set->fd_count; - - TRACE("(%ld,%p(%i))\n", s, set, i); + int i = set->fd_count, ret = 0; while (i--) - if (set->fd_array[i] == s) return 1; - return 0; + if (set->fd_array[i] == s) + { + ret = 1; + break; + } + + TRACE("(socket %04lx, fd_set %p, count %i) <- %d", s, set, i, ret); + return ret; } /***********************************************************************

1 0

Bruno Jesus : iphlpapi: Add a stub for CreateSortedAddressPairs().
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: 6b4dcb3f35c4e406463e5139d105f20468a21e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b4dcb3f35c4e406463e5139d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 3 01:29:10 2015 -0200 iphlpapi: Add a stub for CreateSortedAddressPairs(). --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 22 ++++++++++++++++++++++ include/ws2ipdef.h | 6 ++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index c51b58b..fcb6d72 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -46,7 +46,7 @@ #@ stub CreatePersistentTcpPortReservation #@ stub CreatePersistentUdpPortReservation @ stdcall CreateProxyArpEntry( long long long ) -#@ stub CreateSortedAddressPairs +@ stdcall CreateSortedAddressPairs( ptr long ptr long long ptr ptr ) #@ stub CreateUnicastIpAddressEntry #@ stub DeleteAnycastIpAddressEntry @ stdcall DeleteIPAddress( long ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c06b69f..f04e12a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -280,6 +280,28 @@ DWORD WINAPI CreateProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex) /****************************************************************** + * CreateSortedAddressPairs (IPHLPAPI.@) + */ +DWORD WINAPI CreateSortedAddressPairs(const PSOCKADDR_IN6 source, DWORD sourcecount, + const PSOCKADDR_IN6 destination, DWORD destinationcount, + DWORD sortoptions, + PSOCKADDR_IN6_PAIR *sortedaddr, DWORD *sortedcount) +{ + FIXME("(source %p, sourcecount %d, destination %p, destcount %d, sortoptions %x," + " sortedaddr %p, sortedcount %p): stub\n", source, sourcecount, destination, + destinationcount, sortoptions, sortedaddr, sortedcount); + + if (source || sourcecount || !destination || !sortedaddr || !sortedcount || destinationcount > 500) + return ERROR_INVALID_PARAMETER; + + /* Returning not supported tells the client we don't have IPv6 support + * so applications can fallback to IPv4. + */ + return ERROR_NOT_SUPPORTED; +} + + +/****************************************************************** * DeleteIPAddress (IPHLPAPI.@) * * Delete an IP address added with AddIPAddress(). diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index ea8db3d..ca47caa 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -129,6 +129,12 @@ typedef struct WS(sockaddr_in6) ULONG sin6_scope_id; } SOCKADDR_IN6,*PSOCKADDR_IN6, *LPSOCKADDR_IN6; +typedef struct WS(sockaddr_in6_pair) +{ + PSOCKADDR_IN6 SourceAddress; + PSOCKADDR_IN6 DestinationAddress; +} SOCKADDR_IN6_PAIR, *PSOCKADDR_IN6_PAIR; + /* * Multicast group information */

1 0