October 2020 - Wine-Commits

Alexandre Julliard : gdi32: Move the GSUB table support out of freetype.c.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 8631506270ab116c6aecabe8a3159ba7d23edd67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8631506270ab116c6aecabe8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 11:10:30 2020 +0100 gdi32: Move the GSUB table support out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 336 +++++++++++++++++++++++++++++++++++++++- dlls/gdi32/freetype.c | 388 ++--------------------------------------------- dlls/gdi32/gdi_private.h | 5 + 3 files changed, 353 insertions(+), 376 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8631506270ab116c6aec…

1 0

Georg Lehmann : winevulkan: Don't use comments for object types.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 44500d3cfc288fb5afb14061cae58cc9c32de867 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44500d3cfc288fb5afb14061… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Oct 27 22:02:46 2020 +0100 winevulkan: Don't use comments for object types. We shouldn't do that according to the Vulkan xml maintainer. https://github.com/KhronosGroup/Vulkan-Docs/pull/1379 Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 7e5bd030867..771efe8f5bb 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2739,21 +2739,16 @@ class VkRegistry(object): def _match_object_types(self): """ Matches each handle with the correct object type. """ - for handle in self.handles: - if not handle.is_required() or handle.is_alias(): - continue - for value in self.enums["VkObjectType"].values: - if value.comment == handle.name: - handle.object_type = value.name - break - else: - LOGGER.warning("No object type found for {}".format(handle.name)) + # Use upper case comparison for simplicity. + object_types = {} + for value in self.enums["VkObjectType"].values: + object_name = "VK" + value.name[len("VK_OBJECT_TYPE"):].replace("_", "") + object_types[object_name] = value.name for handle in self.handles: - if not handle.is_required() or not handle.is_alias(): + if not handle.is_required(): continue - # Use the object type of the alias - handle.object_type = handle.alias.object_type + handle.object_type = object_types.get(handle.name.upper()) if not handle.object_type: LOGGER.warning("No object type found for {}".format(handle.name))

1 0

Daniel Lehman : wine.inf: Fix SA Eastern Standard Time Zone info.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 0bc752f30d79ac40b7c2588c72257ed06499cd24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bc752f30d79ac40b7c2588c… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Oct 28 21:44:44 2020 -0700 wine.inf: Fix SA Eastern Standard Time Zone info. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index fba071fe0d8..72b10d354e0 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3491,7 +3491,7 @@ HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"Dlt",,"SA Eastern D HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"MUI_Dlt",,"@tzres.dll,-40657" HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"MUI_Std",,"@tzres.dll,-40656" HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"Std",,"SA Eastern Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"Display",,"America/Bogota" HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"Dlt",,"SA Pacific Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"MUI_Dlt",,"@tzres.dll,-49425"

1 0

Alexandre Julliard : gdi32: Move the glyph index mapping for GetGlyphOutline() out of freetype.c.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 044315c0b3890676d9fd751d8191b0b7381e0b97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=044315c0b3890676d9fd751d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 14:47:18 2020 +0100 gdi32: Move the glyph index mapping for GetGlyphOutline() out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 155 +++++++++++++++++++++--- dlls/gdi32/freetype.c | 306 +++++++++-------------------------------------- dlls/gdi32/gdi_private.h | 10 +- 3 files changed, 198 insertions(+), 273 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=044315c0b3890676d9fd…

1 0

Georg Lehmann : winevulkan: Remove comment from VkEnumValue.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 4a213cae61ddb16123f94dc1b8c79e45969c4c5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a213cae61ddb16123f94dc1… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Oct 27 22:02:47 2020 +0100 winevulkan: Remove comment from VkEnumValue. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 771efe8f5bb..edd56526d58 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -380,21 +380,20 @@ class VkEnum(object): # Value is either a value or a bitpos, only one can exist. value = v.attrib.get("value") alias_name = v.attrib.get("alias") - comment = v.attrib.get("comment") if alias_name: alias = next(x for x in values if x.name == alias_name) - values.append(VkEnumValue(v.attrib.get("name"), value=alias.value, hex=alias.hex, comment=comment)) + values.append(VkEnumValue(v.attrib.get("name"), value=alias.value, hex=alias.hex)) elif value: # Some values are in hex form. We want to preserve the hex representation # at least when we convert back to a string. Internally we want to use int. if "0x" in value: - values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0), hex=True, comment=comment)) + values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0), hex=True)) else: - values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0), comment=comment)) + values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0))) else: # bitmask value = 1 << int(v.attrib.get("bitpos")) - values.append(VkEnumValue(v.attrib.get("name"), value=value, hex=True, comment=comment)) + values.append(VkEnumValue(v.attrib.get("name"), value=value, hex=True)) # vulkan.h contains a *_MAX_ENUM value set to 32-bit at the time of writing, # which is to prepare for extensions as they can add values and hence affect @@ -445,12 +444,11 @@ class VkEnum(object): class VkEnumValue(object): - def __init__(self, name, value=None, hex=False, alias=None, comment=None): + def __init__(self, name, value=None, hex=False, alias=None): self.name = name self.value = value self.hex = hex self.alias = alias - self.comment = comment def __repr__(self): if self.is_alias(): @@ -2845,12 +2843,10 @@ class VkRegistry(object): if only_aliased and not aliased: return - comment = enum_elem.attrib.get("comment") - if "bitpos" in enum_elem.keys(): # We need to add an extra value to an existing enum type. # E.g. VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG to VkFormatFeatureFlagBits. - enum.add(VkEnumValue(enum_elem.attrib["name"], value=(1 << int(enum_elem.attrib["bitpos"])), hex=True, comment=comment)) + enum.add(VkEnumValue(enum_elem.attrib["name"], value=(1 << int(enum_elem.attrib["bitpos"])), hex=True)) elif "offset" in enum_elem.keys(): # Extensions promoted to Core, have the extension number as part @@ -2867,12 +2863,12 @@ class VkRegistry(object): if direction is not None: value = -value - enum.add(VkEnumValue(enum_elem.attrib["name"], value=value, comment=comment)) + enum.add(VkEnumValue(enum_elem.attrib["name"], value=value)) elif "value" in enum_elem.keys(): - enum.add(VkEnumValue(enum_elem.attrib["name"], value=int(enum_elem.attrib["value"]), comment=comment)) + enum.add(VkEnumValue(enum_elem.attrib["name"], value=int(enum_elem.attrib["value"]))) elif "alias" in enum_elem.keys(): - enum.add(VkEnumValue(enum_elem.attrib["name"], alias=enum_elem.attrib["alias"], comment=comment)) + enum.add(VkEnumValue(enum_elem.attrib["name"], alias=enum_elem.attrib["alias"])) elif "value" in enum_elem.keys(): # Constants are not aliased, no need to add them here, they'll get added later on.

1 0

Derek Lesho : winegstreamer: Implement IMFMediaSource::CreatePresentationDescriptor.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: e2893c34524ae45f69f7bc183fa409a4049b9533 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2893c34524ae45f69f7bc18… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Oct 27 11:12:05 2020 -0500 winegstreamer: Implement IMFMediaSource::CreatePresentationDescriptor. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 1 - dlls/mfplat/tests/mfplat.c | 10 +++++----- dlls/mfreadwrite/tests/mfplat.c | 15 ++++++++++----- dlls/winegstreamer/media_source.c | 28 ++++++++++++++++++++++++++-- 4 files changed, 41 insertions(+), 13 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8c49a483f74..d304a62f08a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1452,7 +1452,6 @@ todo_wine return; hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd); -todo_wine ok(hr == S_OK, "Failed to create descriptor, hr %#x.\n", hr); if (FAILED(hr)) return; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 906454851a8..8c6cbf74661 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -574,10 +574,7 @@ static void test_source_resolver(void) ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, &descriptor); -todo_wine ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); - if (FAILED(hr)) - goto skip_source_tests; ok(descriptor != NULL, "got %p\n", descriptor); hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(descriptor, 0, &selected, &sd); @@ -597,6 +594,7 @@ todo_wine ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr); hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &guid); ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr); +todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid)); IMFMediaType_Release(media_type); @@ -605,7 +603,10 @@ todo_wine var.vt = VT_EMPTY; hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); +todo_wine ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + if (FAILED(hr)) + goto skip_source_tests; get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var); ok(var.vt == VT_UNKNOWN, "Unexpected value type %u from MENewStream event.\n", var.vt); @@ -668,11 +669,10 @@ todo_wine get_event((IMFMediaEventGenerator *)mediasource, MEEndOfPresentation, NULL); +skip_source_tests: IMFMediaTypeHandler_Release(handler); IMFPresentationDescriptor_Release(descriptor); -skip_source_tests: - hr = IMFMediaSource_Shutdown(mediasource); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 84581f9be9a..cfe68cb6736 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -627,14 +627,13 @@ static void test_source_reader(void) stream = get_resource_stream("test.wav"); hr = MFCreateSourceReaderFromByteStream(stream, NULL, &reader); -todo_wine - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); - if (FAILED(hr)) { + skip("MFCreateSourceReaderFromByteStream() failed, is G-Streamer missing?\n"); IMFByteStream_Release(stream); return; } + ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); /* Access underlying media source object. */ hr = IMFSourceReader_GetServiceForStream(reader, MF_SOURCE_READER_MEDIASOURCE, &GUID_NULL, &IID_IMFMediaSource, @@ -723,7 +722,10 @@ todo_wine hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); +todo_wine ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + if (hr != S_OK) + goto skip_read_sample; ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); IMFSample_Release(sample); @@ -784,6 +786,8 @@ todo_wine ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); ok(!sample, "Unexpected sample object.\n"); +skip_read_sample: + /* Flush. */ hr = IMFSourceReader_Flush(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); @@ -814,10 +818,11 @@ todo_wine IMFSourceReaderCallback_Release(&callback->IMFSourceReaderCallback_iface); hr = MFCreateSourceReaderFromByteStream(stream, attributes, &reader); +todo_wine ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); IMFAttributes_Release(attributes); - - IMFSourceReader_Release(reader); + if (hr == S_OK) + IMFSourceReader_Release(reader); IMFByteStream_Release(stream); } diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index d6c7837e544..9b2c2174318 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -67,6 +67,7 @@ struct media_source IMFByteStream *byte_stream; struct media_stream **streams; ULONG stream_count; + IMFPresentationDescriptor *pres_desc; GstBus *bus; GstElement *container; GstElement *decodebin; @@ -673,12 +674,12 @@ static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource * { struct media_source *source = impl_from_IMFMediaSource(iface); - FIXME("(%p)->(%p): stub\n", source, descriptor); + TRACE("(%p)->(%p)\n", source, descriptor); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; - return E_NOTIMPL; + return IMFPresentationDescriptor_Clone(source->pres_desc, descriptor); } static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationDescriptor *descriptor, @@ -741,6 +742,8 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) if (source->their_sink) gst_object_unref(GST_OBJECT(source->their_sink)); + if (source->pres_desc) + IMFPresentationDescriptor_Release(source->pres_desc); if (source->event_queue) IMFMediaEventQueue_Shutdown(source->event_queue); if (source->byte_stream) @@ -841,6 +844,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ GST_STATIC_PAD_TEMPLATE("mf_src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); struct media_source *object = heap_alloc_zero(sizeof(*object)); + IMFStreamDescriptor **descriptors = NULL; unsigned int i; HRESULT hr; int ret; @@ -928,6 +932,25 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ gst_sample_unref(preroll); } + /* init presentation descriptor */ + + descriptors = heap_alloc(object->stream_count * sizeof(IMFStreamDescriptor*)); + for (i = 0; i < object->stream_count; i++) + { + IMFMediaStream_GetStreamDescriptor(&object->streams[i]->IMFMediaStream_iface, &descriptors[i]); + } + + if (FAILED(hr = MFCreatePresentationDescriptor(object->stream_count, descriptors, &object->pres_desc))) + goto fail; + + for (i = 0; i < object->stream_count; i++) + { + IMFPresentationDescriptor_SelectStream(object->pres_desc, i); + IMFStreamDescriptor_Release(descriptors[i]); + } + heap_free(descriptors); + descriptors = NULL; + object->state = SOURCE_STOPPED; *out_media_source = object; @@ -936,6 +959,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ fail: WARN("Failed to construct MFMediaSource, hr %#x.\n", hr); + heap_free(descriptors); IMFMediaSource_Release(&object->IMFMediaSource_iface); return hr; }

1 0

Michael Stefaniuc : msxml3/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 21ca8e16485c41d21544065c211eaffd10252ec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21ca8e16485c41d21544065c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 27 00:06:36 2020 +0100 msxml3/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 13 +++---------- dlls/msxml3/tests/saxreader.c | 14 +++++++------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c19dd6c430e..02e31b4aafb 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -733,11 +733,7 @@ static void _expect_parse_error(IXMLDOMDocument *doc, HRESULT hr_exp, BOOL hr_to IXMLDOMParseError_Release(error); } -static const WCHAR szComplete1[] = { - '<','?','x','m','l',' ', - 'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n', - '<','o','p','e','n','>','<','/','o','p','e','n','>','\n',0 -}; +static const WCHAR szComplete1[] = L"<?xml version='1.0'?>\n<open></open>\n"; static const char complete4A[] = "<?xml version=\'1.0\'?>\n" "<lc dl=\'str1\'>\n" @@ -1148,10 +1144,7 @@ static const char attributes_map[] = { static const WCHAR nonexistent_fileW[] = L"c:\\Nonexistent.xml"; -static const WCHAR szElementXML4[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>', - '&','a','m','p',';','x',' ',0x2103,'<','/','E','l','e','T','e','s','t','>',0 }; - -static const WCHAR szStrangeChars[] = {'&','x',' ',0x2103, 0}; +static const WCHAR szStrangeChars[] = L"&x \x2103"; #define expect_bstr_eq_and_free(bstr, expect) { \ BSTR bstrExp = alloc_str_from_narrow(expect); \ @@ -5872,7 +5865,7 @@ static void test_xmlTypes(void) hr = IXMLDOMElement_get_xml(pElement, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szElementXML4 ), "incorrect element xml\n"); + ok( !lstrcmpW( str, L"<EleTest Attr=\"\">&x \x2103</EleTest>" ), "incorrect element xml\n"); SysFreeString(str); hr = IXMLDOMElement_get_text(pElement, &str); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 47d158ab3ea..ab814c5f764 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1518,9 +1518,9 @@ static HRESULT WINAPI isaxattributes_getQName( const WCHAR **QName, int *QNameLength) { - static const WCHAR attrqnamesW[][15] = {{'a',':','a','t','t','r','1','j','u','n','k',0}, - {'a','t','t','r','2','j','u','n','k',0}, - {'a','t','t','r','3',0}}; + static const WCHAR attrqnamesW[][15] = {L"a:attr1junk", + L"attr2junk", + L"attr3"}; static const int attrqnamelen[] = {7, 5, 5}; ok(index >= 0 && index <= 2, "invalid index received %d\n", index); @@ -1609,9 +1609,9 @@ static HRESULT WINAPI isaxattributes_getTypeFromQName( static HRESULT WINAPI isaxattributes_getValue(ISAXAttributes* iface, int index, const WCHAR **value, int *nValue) { - static const WCHAR attrvaluesW[][10] = {{'a','1','j','u','n','k',0}, - {'a','2','j','u','n','k',0}, - {'<','&','"','>','\'',0}}; + static const WCHAR attrvaluesW[][10] = {L"a1junk", + L"a2junk", + L"<&\">'"}; static const int attrvalueslen[] = {2, 2, 5}; ok(index >= 0 && index <= 2, "invalid index received %d\n", index); @@ -3960,7 +3960,7 @@ static const struct writer_characters_t writer_characters[] = { static void test_mxwriter_characters(void) { - static const WCHAR embedded_nullbytes[] = {'a',0,'b',0,0,0,'c',0}; + static const WCHAR embedded_nullbytes[] = L"a\0b\0\0\0c"; const struct writer_characters_t *table = writer_characters; IVBSAXContentHandler *vb_content; ISAXContentHandler *content;

1 0

Hans Leidekker : msi: Use wide character string literals in classes.c.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: e7dd9b3f3694b276d50ccfb5515e7e0f70b1c555 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7dd9b3f3694b276d50ccfb5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:50 2020 +0100 msi: Use wide character string literals in classes.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/classes.c | 266 ++++++++++++++++++++--------------------------------- 1 file changed, 100 insertions(+), 166 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7dd9b3f3694b276d50c…

1 0

Hans Leidekker : msi: Use wide character string literals in registry.c.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 2672646eaeb1877e0d746e8554529396ec8d9eb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2672646eaeb1877e0d746e85… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:49 2020 +0100 msi: Use wide character string literals in registry.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/registry.c | 349 ++++++++++++++++------------------------------------ 1 file changed, 104 insertions(+), 245 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2672646eaeb1877e0d74…

1 0

Hans Leidekker : msi: Use wide character string literals in package.c.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 731bb72c3d00b089ee23297efdfe0496733e96a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=731bb72c3d00b089ee23297e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:48 2020 +0100 msi: Use wide character string literals in package.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 526 ++++++++++++++++++----------------------------------- 1 file changed, 179 insertions(+), 347 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=731bb72c3d00b089ee23…

1 0

Hans Leidekker : msi: Use wide character string literals in msi.c.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 8255da2249816b77b709d1e6c888760c5e59a8f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8255da2249816b77b709d1e6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:47 2020 +0100 msi: Use wide character string literals in msi.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 182 ++++++++++++++++++++------------------------------------- 1 file changed, 64 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8255da2249816b77b709…

1 0

Alexandre Julliard : gdi32: Move part of the GetCharWidthInfo() implementation out of freetype.c.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 72272d0088d15e53ebafea53cdec9f908ac61c89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72272d0088d15e53ebafea53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 28 10:14:01 2020 +0100 gdi32: Move part of the GetCharWidthInfo() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 8 +++++++- dlls/gdi32/freetype.c | 22 ++++++++-------------- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b74632c882b..bb1c07c6f9e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1053,13 +1053,19 @@ static BOOL CDECL font_GetCharWidth( PHYSDEV dev, UINT first, UINT last, INT *bu static BOOL CDECL font_GetCharWidthInfo( PHYSDEV dev, void *ptr ) { struct font_physdev *physdev = get_font_dev( dev ); + struct char_width_info *info = ptr; if (!physdev->font) { dev = GET_NEXT_PHYSDEV( dev, pGetCharWidthInfo ); return dev->funcs->pGetCharWidthInfo( dev, ptr ); } - return font_funcs->pGetCharWidthInfo( physdev->font, ptr ); + + info->unk = 0; + if (!physdev->font->scalable || !font_funcs->get_char_width_info( physdev->font, info )) + info->lsb = info->rsb = 0; + + return TRUE; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1d076e77cf8..82a7e6f01b7 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6654,29 +6654,23 @@ done: } /************************************************************* - * freetype_GetCharWidthInfo + * freetype_get_char_width_info */ -static BOOL CDECL freetype_GetCharWidthInfo( struct gdi_font *gdi_font, struct char_width_info *info ) +static BOOL CDECL freetype_get_char_width_info( struct gdi_font *font, struct char_width_info *info ) { - GdiFont *font = get_font_ptr(gdi_font); + FT_Face face = get_font_ptr(font)->ft_face; TT_HoriHeader *pHori; TRACE("%p, %p\n", font, info); - if (gdi_font->scalable && - (pHori = pFT_Get_Sfnt_Table(font->ft_face, ft_sfnt_hhea))) + if ((pHori = pFT_Get_Sfnt_Table(face, ft_sfnt_hhea))) { - FT_Fixed em_scale; - em_scale = MulDiv(gdi_font->ppem, 1 << 16, font->ft_face->units_per_EM); + FT_Fixed em_scale = MulDiv(font->ppem, 1 << 16, face->units_per_EM); info->lsb = (SHORT)pFT_MulFix(pHori->min_Left_Side_Bearing, em_scale); info->rsb = (SHORT)pFT_MulFix(pHori->min_Right_Side_Bearing, em_scale); + return TRUE; } - else - info->lsb = info->rsb = 0; - - info->unk = 0; - - return TRUE; + return FALSE; } @@ -6973,7 +6967,6 @@ static const struct font_backend_funcs font_funcs = { freetype_EnumFonts, freetype_FontIsLinked, - freetype_GetCharWidthInfo, freetype_SelectFont, freetype_add_font, freetype_add_mem_font, @@ -6984,6 +6977,7 @@ static const struct font_backend_funcs font_funcs = freetype_get_default_glyph, freetype_get_glyph_outline, freetype_get_unicode_ranges, + freetype_get_char_width_info, freetype_set_outline_text_metrics, freetype_set_bitmap_text_metrics, freetype_get_kerning_pairs, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e180121ae40..7d2f5e0240e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -366,7 +366,6 @@ struct font_backend_funcs { BOOL (CDECL *pEnumFonts)( LOGFONTW *lf, FONTENUMPROCW proc, LPARAM lparam ); BOOL (CDECL *pFontIsLinked)( struct gdi_font *font ); - BOOL (CDECL *pGetCharWidthInfo)( struct gdi_font *font, struct char_width_info *info ); struct gdi_font * (CDECL *pSelectFont)( DC *dc, HFONT hfont, UINT *aa_flags, UINT default_aa_flags ); INT (CDECL *add_font)( const WCHAR *file, DWORD flags ); @@ -381,6 +380,7 @@ struct font_backend_funcs DWORD (CDECL *get_glyph_outline)( struct gdi_font *font, UINT glyph, UINT format, GLYPHMETRICS *gm, ABC *abc, DWORD buflen, void *buf, const MAT2 *mat ); DWORD (CDECL *get_unicode_ranges)( struct gdi_font *font, GLYPHSET *gs ); + BOOL (CDECL *get_char_width_info)( struct gdi_font *font, struct char_width_info *info ); BOOL (CDECL *set_outline_text_metrics)( struct gdi_font *font ); BOOL (CDECL *set_bitmap_text_metrics)( struct gdi_font *font ); DWORD (CDECL *get_kerning_pairs)( struct gdi_font *gdi_font, KERNINGPAIR **kern_pair );

1 0

Alexandre Julliard : gdi32: Move part of the GetFontUnicodeRanges() implementation out of freetype.c.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 374944994360590cea79ebd5da42bdaf9f092d90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=374944994360590cea79ebd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 28 10:13:53 2020 +0100 gdi32: Move part of the GetFontUnicodeRanges() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 12 +++++++++++- dlls/gdi32/freetype.c | 28 +++++++--------------------- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a587715d6c3..b74632c882b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1118,13 +1118,23 @@ static BOOL CDECL font_GetFontRealizationInfo( PHYSDEV dev, void *ptr ) static DWORD CDECL font_GetFontUnicodeRanges( PHYSDEV dev, GLYPHSET *glyphset ) { struct font_physdev *physdev = get_font_dev( dev ); + DWORD size, num_ranges; if (!physdev->font) { dev = GET_NEXT_PHYSDEV( dev, pGetFontUnicodeRanges ); return dev->funcs->pGetFontUnicodeRanges( dev, glyphset ); } - return font_funcs->pGetFontUnicodeRanges( physdev->font, glyphset ); + + num_ranges = font_funcs->get_unicode_ranges( physdev->font, glyphset ); + size = offsetof( GLYPHSET, ranges[num_ranges] ); + if (glyphset) + { + glyphset->cbThis = size; + glyphset->cRanges = num_ranges; + glyphset->flAccel = 0; + } + return size; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3959261e609..1d076e77cf8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6680,12 +6680,16 @@ static BOOL CDECL freetype_GetCharWidthInfo( struct gdi_font *gdi_font, struct c } -/* Retrieve a list of supported Unicode ranges for a given font. +/************************************************************* + * freetype_get_unicode_ranges + * + * Retrieve a list of supported Unicode ranges for a given font. * Can be called with NULL gs to calculate the buffer size. Returns * the number of ranges found. */ -static DWORD get_font_unicode_ranges(FT_Face face, GLYPHSET *gs) +static DWORD CDECL freetype_get_unicode_ranges( struct gdi_font *font, GLYPHSET *gs ) { + FT_Face face = get_font_ptr(font)->ft_face; DWORD num_ranges = 0; if (face->charmap->encoding == FT_ENCODING_UNICODE) @@ -6744,24 +6748,6 @@ static DWORD get_font_unicode_ranges(FT_Face face, GLYPHSET *gs) return num_ranges; } -/************************************************************* - * freetype_GetFontUnicodeRanges - */ -static DWORD CDECL freetype_GetFontUnicodeRanges( struct gdi_font *font, GLYPHSET *glyphset ) -{ - DWORD size, num_ranges; - - num_ranges = get_font_unicode_ranges(get_font_ptr(font)->ft_face, glyphset); - size = sizeof(GLYPHSET) + sizeof(WCRANGE) * (num_ranges - 1); - if (glyphset) - { - glyphset->cbThis = size; - glyphset->cRanges = num_ranges; - glyphset->flAccel = 0; - } - return size; -} - /************************************************************* * freetype_FontIsLinked */ @@ -6988,7 +6974,6 @@ static const struct font_backend_funcs font_funcs = freetype_EnumFonts, freetype_FontIsLinked, freetype_GetCharWidthInfo, - freetype_GetFontUnicodeRanges, freetype_SelectFont, freetype_add_font, freetype_add_mem_font, @@ -6998,6 +6983,7 @@ static const struct font_backend_funcs font_funcs = freetype_get_glyph_index, freetype_get_default_glyph, freetype_get_glyph_outline, + freetype_get_unicode_ranges, freetype_set_outline_text_metrics, freetype_set_bitmap_text_metrics, freetype_get_kerning_pairs, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 6b37cf598e9..e180121ae40 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -367,7 +367,6 @@ struct font_backend_funcs BOOL (CDECL *pEnumFonts)( LOGFONTW *lf, FONTENUMPROCW proc, LPARAM lparam ); BOOL (CDECL *pFontIsLinked)( struct gdi_font *font ); BOOL (CDECL *pGetCharWidthInfo)( struct gdi_font *font, struct char_width_info *info ); - DWORD (CDECL *pGetFontUnicodeRanges)( struct gdi_font *font, GLYPHSET *glyphset ); struct gdi_font * (CDECL *pSelectFont)( DC *dc, HFONT hfont, UINT *aa_flags, UINT default_aa_flags ); INT (CDECL *add_font)( const WCHAR *file, DWORD flags ); @@ -381,6 +380,7 @@ struct font_backend_funcs UINT (CDECL *get_default_glyph)( struct gdi_font *gdi_font ); DWORD (CDECL *get_glyph_outline)( struct gdi_font *font, UINT glyph, UINT format, GLYPHMETRICS *gm, ABC *abc, DWORD buflen, void *buf, const MAT2 *mat ); + DWORD (CDECL *get_unicode_ranges)( struct gdi_font *font, GLYPHSET *gs ); BOOL (CDECL *set_outline_text_metrics)( struct gdi_font *font ); BOOL (CDECL *set_bitmap_text_metrics)( struct gdi_font *font ); DWORD (CDECL *get_kerning_pairs)( struct gdi_font *gdi_font, KERNINGPAIR **kern_pair );

1 0

Michael Stefaniuc : powrprof: Use wide-char string literals.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 6594079920602a8b1f97817a6ad27364265b2a23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6594079920602a8b1f97817a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 28 00:39:10 2020 +0100 powrprof: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/powrprof/powrprof.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 5f00c7b6317..fc6f5706f87 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -45,20 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(powrprof); * implementing these functions is going to have to wait until somebody can * cobble together some sane test input. */ -static const WCHAR szPowerCfgSubKey[] = { 'S', 'o', 'f', 't', 'w', 'a', 'r', 'e', - '\\', 'M', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', '\\', 'W', 'i', - 'n', 'd', 'o', 'w', 's', '\\', 'C', 'u', 'r', 'r', 'e', 'n', 't', - 'V', 'e', 'r', 's', 'i', 'o', 'n', '\\', 'C', 'o', 'n', 't', 'r', - 'o', 'l', 's', ' ', 'F', 'o', 'l', 'd', 'e', 'r', '\\', 'P', 'o', - 'w', 'e', 'r', 'C', 'f', 'g', 0 }; -static const WCHAR szSemaphoreName[] = { 'P', 'o', 'w', 'e', 'r', 'P', 'r', 'o', - 'f', 'i', 'l', 'e', 'R', 'e', 'g', 'i', 's', 't', 'r', 'y', 'S', - 'e', 'm', 'a', 'p', 'h', 'o', 'r', 'e', 0 }; -static const WCHAR szDiskMax[] = { 'D', 'i', 's', 'k', 'S', 'p', 'i', 'n', 'd', - 'o', 'w', 'n', 'M', 'a', 'x', 0 }; -static const WCHAR szDiskMin[] = { 'D', 'i', 's', 'k', 'S', 'p', 'i', 'n', 'd', - 'o', 'w', 'n', 'M', 'i', 'n', 0 }; -static const WCHAR szLastID[] = { 'L', 'a', 's', 't', 'I', 'D', 0 }; +static const WCHAR szPowerCfgSubKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg"; static HANDLE PPRegSemaphore = NULL; NTSTATUS WINAPI CallNtPowerInformation( @@ -172,7 +159,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) return TRUE; } - r = RegQueryValueExW(hKey, szDiskMax, 0, 0, lpValue, &cbValue); + r = RegQueryValueExW(hKey, L"DiskSpindownMax", 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { TRACE("Couldn't open DiskSpinDownMax: %d\n", r); TRACE("Using default: 3600\n"); @@ -183,7 +170,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) cbValue = sizeof(lpValue); - r = RegQueryValueExW(hKey, szDiskMin, 0, 0, lpValue, &cbValue); + r = RegQueryValueExW(hKey, L"DiskSpindownMin", 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { TRACE("Couldn't open DiskSpinDownMin: %d\n", r); TRACE("Using default: 3\n"); @@ -360,14 +347,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } else { BYTE lpValue[40]; DWORD cbValue = sizeof(lpValue); - r = RegQueryValueExW(hKey, szLastID, 0, 0, lpValue, &cbValue); + r = RegQueryValueExW(hKey, L"LastID", 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { TRACE("Couldn't open registry entry HKLM\\%s\\LastID, using some sane(?) defaults\n", debugstr_w(szPowerCfgSubKey)); } RegCloseKey(hKey); } - PPRegSemaphore = CreateSemaphoreW(NULL, 1, 1, szSemaphoreName); + PPRegSemaphore = CreateSemaphoreW(NULL, 1, 1, L"PowerProfileRegistrySemaphore"); if (PPRegSemaphore == NULL) { ERR("Couldn't create Semaphore: %d\n", GetLastError()); return FALSE;

1 0

Huw Davies : riched20: Use a helper to retrieve the first run.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 5d179e4b39a0c52a23d61430fc7a567fb381b22e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d179e4b39a0c52a23d61430… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 08:43:53 2020 +0000 riched20: Use a helper to retrieve the first run. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 046a7fd5423..75bbb2c05c5 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -886,7 +886,7 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag linespace = ME_GetParaLineSpace( c, para ); ME_BeginRow( &wc ); - run = &ME_FindItemFwd( para_get_di( para ), diRun )->member.run; + run = para_first_run( para ); while (run) { run = ME_WrapHandleRun( &wc, run );

1 0

Alistair Leslie-Hughes : include: Add more DBGUID_* defines.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: da9f165acb9ba92dfd2a5c7c203c7ae9980320b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da9f165acb9ba92dfd2a5c7c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 28 20:46:20 2020 +1100 include: Add more DBGUID_* defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbs.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index 63617c88c00..19f92b3c05f 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -500,6 +500,8 @@ cpp_quote(" EXTERN_C const GUID name DECLSPEC_HIDDEN") cpp_quote("#endif") cpp_quote("DEFINE_DBGUID(DB_NULLGUID, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);") +cpp_quote("DEFINE_DBGUID(DBGUID_SQL, 0xc8b522d7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_ROWSET, 0xc8b522f6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_ROW, 0xc8b522f7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);")

1 0

Derek Lesho : winegstreamer: Replace gst_pad_get_current_caps with gst_pad_query_caps.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: f26e81cf38b2bf0305581522d3d980d3508a43ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=f26e81cf38b2bf0305581522… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Oct 27 11:12:04 2020 -0500 winegstreamer: Replace gst_pad_get_current_caps with gst_pad_query_caps. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 0991710755c..d6c7837e544 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -388,7 +388,7 @@ static const IMFMediaStreamVtbl media_stream_vtbl = the user throws at us through gstreamer's caps negotiation. */ static HRESULT media_stream_connect_to_sink(struct media_stream *stream) { - GstCaps *source_caps = gst_pad_get_current_caps(stream->their_src); + GstCaps *source_caps = gst_pad_query_caps(stream->their_src, NULL); const gchar *stream_type; if (!source_caps)

1 0

Michael Stefaniuc : sapi/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 85458d804a5def9df5f854e518998dd189bb974e URL: https://source.winehq.org/git/wine.git/?a=commit;h=85458d804a5def9df5f854e5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 28 00:39:08 2020 +0100 sapi/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tests/token.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 1ca49398ad1..47196d42dc7 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -54,7 +54,6 @@ static void test_token_category(void) ISpObjectTokenCategory *cat; IEnumSpObjectTokens *enum_tokens; HRESULT hr; - WCHAR bogus[] = {'b','o','g','u','s',0}; ULONG count; hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, @@ -64,7 +63,7 @@ static void test_token_category(void) hr = ISpObjectTokenCategory_EnumTokens( cat, NULL, NULL, &enum_tokens ); ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); - hr = ISpObjectTokenCategory_SetId( cat, bogus, FALSE ); + hr = ISpObjectTokenCategory_SetId( cat, L"bogus", FALSE ); ok( hr == SPERR_INVALID_REGISTRY_KEY, "got %08x\n", hr ); hr = ISpObjectTokenCategory_SetId( cat, SPCAT_VOICES, FALSE );

1 0

Nikolay Sivov : include: Remove confusing comment.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 03395fdf71b606b589b917eab5d4766842188b91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03395fdf71b606b589b917ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 28 22:58:01 2020 +0300 include: Remove confusing comment. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mlang.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mlang.idl b/include/mlang.idl index 5867648b04f..7c4398feafd 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -708,7 +708,7 @@ interface IMultiLanguage2 : IUnknown [in] LANGID LangId, [out] IEnumScript **ppEnumScript); - HRESULT ValidateCodePageEx( /* undocumented on MSDN */ + HRESULT ValidateCodePageEx( [in] UINT uiCodePage, [in] HWND hwnd, [in] DWORD dwfIODControl);

1 0

Hans Leidekker : msi: Use wide character string literals in dialog.c.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: d9fbe788af65c2b2696c446d765a34ae40e3226b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9fbe788af65c2b2696c446d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:46 2020 +0100 msi: Use wide character string literals in dialog.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 500 +++++++++++++++++++----------------------------------- 1 file changed, 174 insertions(+), 326 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d9fbe788af65c2b2696c…

1 0

Huw Davies : riched20: Use a helper to find the next run.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: f9a82574c906129bdc4269a4972c4ef3dafd67d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9a82574c906129bdc4269a4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 08:43:51 2020 +0000 riched20: Use a helper to find the next run. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 9e79eda274d..98ae352ab7b 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -1148,7 +1148,8 @@ static BOOL ME_StreamOutText(ME_TextEditor *editor, ME_OutStream *pStream, nChars -= nLen; cursor.nOffset = 0; - cursor.pRun = ME_FindItemFwd(cursor.pRun, diRun); + cursor.pRun = run_next_all_paras( &cursor.pRun->member.run ) ? + run_get_di( run_next_all_paras( &cursor.pRun->member.run ) ) : NULL; } heap_free(buffer);

1 0

Huw Davies : riched20: Use the paragraph from the cursor.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 6b9b7b2d0bed6c2dc022238084fb35815c3722c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b9b7b2d0bed6c2dc0222380… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 08:43:52 2020 +0000 riched20: Use the paragraph from the cursor. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/undo.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 72e3b74f4c8..d9c5d28d6dc 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -335,13 +335,11 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) case undo_set_para_fmt: { ME_Cursor tmp; - ME_DisplayItem *para; cursor_from_char_ofs( editor, undo->u.set_para_fmt.pos, &tmp ); - para = ME_FindItemBack(tmp.pRun, diParagraph); - add_undo_set_para_fmt( editor, &para->member.para ); - para->member.para.fmt = undo->u.set_para_fmt.fmt; - para->member.para.border = undo->u.set_para_fmt.border; - para_mark_rewrap( editor, &para->member.para ); + add_undo_set_para_fmt( editor, &tmp.pPara->member.para ); + tmp.pPara->member.para.fmt = undo->u.set_para_fmt.fmt; + tmp.pPara->member.para.border = undo->u.set_para_fmt.border; + para_mark_rewrap( editor, &tmp.pPara->member.para ); break; } case undo_set_char_fmt:

1 0

Michael Stefaniuc : sapi: Zero terminate some WCHAR strings.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: cc32682130b88decf506df6dceef426c51bd3c27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc32682130b88decf506df6d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 28 00:39:09 2020 +0100 sapi: Zero terminate some WCHAR strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/token.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index b4a318b4ade..04fa3a25d6a 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -372,28 +372,28 @@ static HRESULT WINAPI token_category_EnumValues( ISpObjectTokenCategory *iface, static HRESULT parse_cat_id( const WCHAR *str, HKEY *root, const WCHAR **sub_key ) { - static const WCHAR HKLM[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\'}; - static const WCHAR HKCU[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R','\\'}; struct table { const WCHAR *name; - int size; + unsigned int len; HKEY key; } table[] = { - { HKLM, sizeof(HKLM), HKEY_LOCAL_MACHINE }, - { HKCU, sizeof(HKCU), HKEY_CURRENT_USER }, +#define X(s) s, ARRAY_SIZE(s) - 1 + { X(L"HKEY_LOCAL_MACHINE\\"), HKEY_LOCAL_MACHINE }, + { X(L"HKEY_CURRENT_USER\\"), HKEY_CURRENT_USER }, { NULL } +#undef X }; struct table *ptr; int len = lstrlenW( str ); for (ptr = table; ptr->name; ptr++) { - if (len >= ptr->size / sizeof(ptr->name[0]) && !memcmp( str, ptr->name, ptr->size )) + if (len >= ptr->len && !wcsncmp( str, ptr->name, ptr->len )) { *root = ptr->key; - *sub_key = str + ptr->size / sizeof(ptr->name[0]); + *sub_key = str + ptr->len; return S_OK; } }

1 0

Huw Davies : riched20: Use a helper function to find the first row.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: b3b3624079da3efe24beb90ef88435042c79df9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3b3624079da3efe24beb90e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 08:43:50 2020 +0000 riched20: Use a helper function to find the first row. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index d3bbbc9d672..d15c47b72aa 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -846,7 +846,7 @@ static void draw_table_borders( ME_Context *c, ME_Paragraph *para ) rowY = c->pt.y + para->pt.y; if (para->fmt.dwMask & PFM_SPACEBEFORE) rowY += ME_twips2pointsY(c, para->fmt.dySpaceBefore); - nHeight = ME_FindItemFwd( para_get_di( para ), diStartRow )->member.row.nHeight; + nHeight = para_first_row( para )->nHeight; rowBottom = rowY + nHeight; /* Draw horizontal lines */

1 0

Huw Davies : riched20: Pass para ptrs to the various para selection functions.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: da5082912816a346a89cc84de42f77426135f451 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da5082912816a346a89cc84d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 08:43:49 2020 +0000 riched20: Pass para ptrs to the various para selection functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 14 +++---- dlls/riched20/editor.h | 8 ++-- dlls/riched20/editstr.h | 2 +- dlls/riched20/paint.c | 48 +++++++++++++---------- dlls/riched20/para.c | 100 ++++++++++++++++++++++++------------------------ dlls/riched20/reader.c | 2 +- 7 files changed, 90 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da5082912816a346a89c…

1 0