March 2019 - Wine-commits - list.winehq.org

Zebediah Figura : quartz/tests: Add some tests for querying pin information.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: b79a7ffdfdb4cc8de4777bb3693ea17b7e34dd0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b79a7ffdfdb4cc8de4777bb3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 28 19:00:29 2019 -0600 quartz/tests: Add some tests for querying pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegsplit.c | 72 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index eb81479..0745f01 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -323,6 +323,77 @@ static void test_find_pin(void) ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +static void test_pin_info(void) +{ + const WCHAR *filename = load_resource(mp3file); + IBaseFilter *filter = create_mpeg_splitter(); + ULONG ref, expect_ref; + IFilterGraph2 *graph; + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + IPin *pin; + BOOL ret; + + graph = connect_input(filter, filename); + + hr = IBaseFilter_FindPin(filter, inputW, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + expect_ref = get_refcount(filter); + ref = get_refcount(pin); + ok(ref == expect_ref, "Got unexpected refcount %d.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, inputW), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + todo_wine ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, inputW), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, audioW, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, audioW), "Got name %s.\n", wine_dbgstr_w(info.achName)); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, audioW), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + IPin_Release(pin); + + IFilterGraph2_Release(graph); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + START_TEST(mpegsplit) { CoInitialize(NULL); @@ -330,6 +401,7 @@ START_TEST(mpegsplit) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/tests: Add some tests for pin interfaces.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: e65b9c2e4bb898988def909bf9c365d5dba44e3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e65b9c2e4bb898988def909b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 28 19:00:30 2019 -0600 quartz/tests: Add some tests for pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegsplit.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 0745f01..9a63636 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -117,7 +117,10 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_interfaces(void) { + const WCHAR *filename = load_resource(mp3file); IBaseFilter *filter = create_mpeg_splitter(); + IFilterGraph2 *graph = connect_input(filter, filename); + IPin *pin; check_interface(filter, &IID_IAMStreamSelect, TRUE); check_interface(filter, &IID_IBaseFilter, TRUE); @@ -138,7 +141,35 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + IBaseFilter_FindPin(filter, inputW, &pin); + + todo_wine check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, audioW, &pin); + + check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAsyncReader, FALSE); + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); + IFilterGraph2_Release(graph); + DeleteFileW(filename); } static void test_enum_pins(void)

1 0

Józef Kucia : winevulkan: Use VkBase{In, Out}Structure instead of custom structure.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 1eaa59765fe1c40ad2f6989c6353473e8ea66d37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1eaa59765fe1c40ad2f6989c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 1 08:43:13 2019 +0100 winevulkan: Use VkBase{In, Out}Structure instead of custom structure. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 1c72103..3893f1c 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -34,17 +34,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); */ #define WINE_VULKAN_ICD_VERSION 4 -/* All Vulkan structures use this structure for the first elements. */ -struct wine_vk_structure_header -{ - VkStructureType sType; - void *pNext; -}; - #define wine_vk_find_struct(s, t) wine_vk_find_struct_((void *)s, VK_STRUCTURE_TYPE_##t) static void *wine_vk_find_struct_(void *s, VkStructureType t) { - struct wine_vk_structure_header *header; + VkBaseOutStructure *header; for (header = s; header; header = header->pNext) { @@ -250,7 +243,7 @@ static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src */ if (src->pNext) { - const struct wine_vk_structure_header *header; + const VkBaseInStructure *header; dst->pNext = NULL; for (header = src->pNext; header; header = header->pNext) @@ -369,7 +362,7 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo */ if (src->pNext) { - const struct wine_vk_structure_header *header; + const VkBaseInStructure *header; for (header = src->pNext; header; header = header->pNext) { @@ -997,8 +990,8 @@ void WINAPI wine_vkGetDeviceQueue(VkDevice device, uint32_t family_index, void WINAPI wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *info, VkQueue *queue) { - const struct wine_vk_structure_header *chain; struct VkQueue_T *matching_queue; + const VkBaseInStructure *chain; TRACE("%p, %p, %p\n", device, info, queue); @@ -1111,7 +1104,7 @@ VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t count, { ERR("Unable to allocate memory for comman buffers!\n"); res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto err; + goto done; } for (j = 0; j < num_command_buffers; j++) @@ -1123,7 +1116,7 @@ VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t count, res = queue->device->funcs.p_vkQueueSubmit(queue->queue, count, submits_host, fence); -err: +done: for (i = 0; i < count; i++) { heap_free((void *)submits_host[i].pCommandBuffers);

1 0

Zhiyi Zhang : ntoskrnl.exe: Implement ExUuidCreate().
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 948d39c52905c6927d67b5eefaeb4a8fab537db1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=948d39c52905c6927d67b5ee… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 27 11:08:42 2019 +0800 ntoskrnl.exe: Implement ExUuidCreate(). This is mostly a copy of UuidCreate() in rpcrt4 with NTSTATUS return code. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 33 +++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 2 ++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7578ebc..52e0228 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -41,6 +41,7 @@ #include "dbt.h" #include "winreg.h" #include "setupapi.h" +#include "ntsecapi.h" #include "ddk/csq.h" #include "ddk/ntddk.h" #include "ddk/ntifs.h" @@ -4128,3 +4129,35 @@ static struct _OBJECT_TYPE token_type = }; POBJECT_TYPE SeTokenObjectType = &token_type; + +/************************************************************************* + * ExUuidCreate (NTOSKRNL.@) + * + * Creates a 128bit UUID. + * + * RETURNS + * + * STATUS_SUCCESS if successful. + * RPC_NT_UUID_LOCAL_ONLY if UUID is only locally unique. + * + * NOTES + * + * Follows RFC 4122, section 4.4 (Algorithms for Creating a UUID from + * Truly Random or Pseudo-Random Numbers) + */ +NTSTATUS WINAPI ExUuidCreate(UUID *uuid) +{ + RtlGenRandom(uuid, sizeof(*uuid)); + /* Clear the version bits and set the version (4) */ + uuid->Data3 &= 0x0fff; + uuid->Data3 |= (4 << 12); + /* Set the topmost bits of Data4 (clock_seq_hi_and_reserved) as + * specified in RFC 4122, section 4.4. + */ + uuid->Data4[0] &= 0x3f; + uuid->Data4[0] |= 0x80; + + TRACE("%s\n", debugstr_guid(uuid)); + + return STATUS_SUCCESS; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 975f6c0..438f720 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -185,7 +185,7 @@ @ stub ExSystemExceptionFilter @ stdcall ExSystemTimeToLocalTime(ptr ptr) RtlSystemTimeToLocalTime @ stub ExUnregisterCallback -@ stub ExUuidCreate +@ stdcall ExUuidCreate(ptr) @ stub ExVerifySuite @ stub ExWindowStationObjectType @ stub Exi386InterlockedDecrementLong diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 452e510..fb8cacc 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -202,7 +202,9 @@ typedef NTSTATUS (WINAPI *PIO_QUERY_DEVICE_ROUTINE)(PVOID,PUNICODE_STRING,INTERF PKEY_VALUE_FULL_INFORMATION*,CONFIGURATION_TYPE,ULONG,PKEY_VALUE_FULL_INFORMATION*); typedef void (NTAPI EXPAND_STACK_CALLOUT)(void*); typedef EXPAND_STACK_CALLOUT *PEXPAND_STACK_CALLOUT; +typedef GUID UUID; +NTSTATUS WINAPI ExUuidCreate(UUID*); NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_TYPE,PULONG, PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID);

1 0

Jactry Zeng : mfplat: Add MFCreateMFByteStreamOnStreamEx() stub.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: e09bc9a0b1c66e4912ca9abbe1bde276a7d3b104 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e09bc9a0b1c66e4912ca9abb… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Feb 27 23:10:51 2019 +0800 mfplat: Add MFCreateMFByteStreamOnStreamEx() stub. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 10 ++++++++++ dlls/mfplat/mfplat.spec | 1 + include/mfidl.idl | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a8963ca..0bf7cbf 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -4165,3 +4165,13 @@ void WINAPI MFHeapFree(void *p) TRACE("%p\n", p); HeapFree(GetProcessHeap(), 0, p); } + +/*********************************************************************** + * MFCreateMFByteStreamOnStreamEx (mfplat.@) + */ +HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFByteStream **bytestream) +{ + FIXME("(%p, %p): stub\n", stream, bytestream); + + return E_NOTIMPL; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c43746e..c6234b0 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -46,6 +46,7 @@ @ stdcall MFCreateFile(long long long wstr ptr) @ stub MFCreateLegacyMediaBufferOnMFMediaBuffer @ stdcall MFCreateMFByteStreamOnStream(ptr ptr) +@ stdcall MFCreateMFByteStreamOnStreamEx(ptr ptr) @ stub MFCreateMFVideoFormatFromMFMediaType @ stub MFCreateMediaBufferWrapper @ stdcall MFCreateMediaEvent(long ptr long ptr ptr) diff --git a/include/mfidl.idl b/include/mfidl.idl index c8f011b..01e86ef 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -318,6 +318,7 @@ interface IMFSequencerSource : IUnknown cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) +cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFByteStream **bytestream);") cpp_quote("HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource **seq_source);" ) cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMediaTypes,")

1 0

Vijay Kiran Kamuju : include: Add missing WMT_RIGHTS enum definition.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 647ddb48214919c77964ef7a0e11efbf0ca19829 URL: https://source.winehq.org/git/wine.git/?a=commit;h=647ddb48214919c77964ef7a… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Feb 27 21:48:34 2019 +0100 include: Add missing WMT_RIGHTS enum definition. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/drmexternals.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/drmexternals.idl b/include/drmexternals.idl index 88826ad..b890394 100644 --- a/include/drmexternals.idl +++ b/include/drmexternals.idl @@ -1,5 +1,6 @@ /* * Copyright 2017 Alistair Leslie-Hughes + * Copyright 2019 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,3 +18,16 @@ */ import "wmdrmsdk.idl"; + +typedef enum WMT_RIGHTS { + WMT_RIGHT_PLAYBACK = 0x00000001, + WMT_RIGHT_COPY_TO_NON_SDMI_DEVICE = 0x00000002, + WMT_RIGHT_COPY_TO_CD = 0x00000008, + WMT_RIGHT_COPY_TO_SDMI_DEVICE = 0x00000010, + WMT_RIGHT_ONE_TIME = 0x00000020, + WMT_RIGHT_SAVE_STREAM_PROTECTED = 0x00000040, + WMT_RIGHT_COPY = 0x00000080, + WMT_RIGHT_COLLABORATIVE_PLAY = 0x00000100, + WMT_RIGHT_SDMI_TRIGGER = 0x00010000, + WMT_RIGHT_SDMI_NOMORECOPIES = 0x00020000 +} WMT_RIGHTS;

1 0

Michael Stefaniuc : dwrite: Remove useless casts to self.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 6f5436f9f4b0bbb664d9ac3b78a634ccb33230bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f5436f9f4b0bbb664d9ac3b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 28 00:50:27 2019 +0100 dwrite: Remove useless casts to self. 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/dwrite/font.c | 2 +- dlls/dwrite/layout.c | 4 ++-- dlls/dwrite/opentype.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 948c1df..3742366 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2420,7 +2420,7 @@ static HRESULT create_fontfamily(struct dwrite_fontcollection *collection, UINT3 BOOL is_system_collection(IDWriteFontCollection *collection) { void *obj; - return IDWriteFontCollection_QueryInterface(collection, &IID_issystemcollection, (void**)&obj) == S_OK; + return IDWriteFontCollection_QueryInterface(collection, &IID_issystemcollection, &obj) == S_OK; } static HRESULT WINAPI dwritesystemfontcollection_QueryInterface(IDWriteFontCollection1 *iface, REFIID riid, void **obj) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index de79fd4..4cd5ce4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2520,7 +2520,7 @@ static BOOL set_layout_range_attrval(struct layout_range_header *h, enum layout_ changed = set_layout_range_iface_attr((IUnknown**)&dest->object, (IUnknown*)value->u.object); break; case LAYOUT_RANGE_ATTR_EFFECT: - changed = set_layout_range_iface_attr((IUnknown**)&dest_iface->iface, (IUnknown*)value->u.effect); + changed = set_layout_range_iface_attr(&dest_iface->iface, value->u.effect); break; case LAYOUT_RANGE_ATTR_UNDERLINE: changed = dest_bool->value != value->u.underline; @@ -2560,7 +2560,7 @@ static BOOL set_layout_range_attrval(struct layout_range_header *h, enum layout_ dest_spacing->min_advance = value->u.spacing.min_advance; break; case LAYOUT_RANGE_ATTR_TYPOGRAPHY: - changed = set_layout_range_iface_attr((IUnknown**)&dest_iface->iface, (IUnknown*)value->u.typography); + changed = set_layout_range_iface_attr(&dest_iface->iface, (IUnknown*)value->u.typography); break; default: ; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b13f424..4772236 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -538,7 +538,7 @@ struct ot_lookup_table WORD subtable[1]; }; -#define GLYPH_NOT_COVERED ((unsigned int)~0u) +#define GLYPH_NOT_COVERED (~0u) struct ot_coverage_format1 {

1 0

Michael Stefaniuc : msxml3: Remove redundant not-NULL check (coccinellery) .
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: b3a464a83559fc06cd7e15a0001bc278509efede URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3a464a83559fc06cd7e15a0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 21 20:35:34 2019 +0100 msxml3: Remove redundant not-NULL check (coccinellery). 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/selection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index b7c560a..31be4d8 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -831,7 +831,7 @@ HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out) TRACE("found %d matches\n", xmlXPathNodeSetGetLength(This->result->nodesetval)); cleanup: - if (This && FAILED(hr)) + if (FAILED(hr)) IXMLDOMSelection_Release( &This->IXMLDOMSelection_iface ); xmlXPathFreeContext(ctxt); return hr;

1 0

Michael Stefaniuc : riched20/tests: Avoid using the comma operator.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 350123e18313f3c0f8bfcd8aaf5c41d67b5f6056 URL: https://source.winehq.org/git/wine.git/?a=commit;h=350123e18313f3c0f8bfcd8a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 28 00:50:30 2019 +0100 riched20/tests: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 2 +- dlls/riched20/tests/richole.c | 62 +++++++++++++++++++++---------------------- dlls/riched32/tests/editor.c | 2 +- 3 files changed, 33 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=350123e18313f3c0f8bf…

1 0

Gabriel Ivăncescu : user32/listbox: Use a helper to set item data by index.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: a01b90d382254ee64ebf12ef11a67b4a31961961 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a01b90d382254ee64ebf12ef… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 28 15:10:27 2019 +0200 user32/listbox: Use a helper to set item data by index. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 826ce01..9bf9f90 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -156,6 +156,11 @@ static ULONG_PTR get_item_data( const LB_DESCR *descr, UINT index ) return (descr->style & LBS_NODATA) ? 0 : descr->items[index].data; } +static void set_item_data( LB_DESCR *descr, UINT index, ULONG_PTR data ) +{ + if (!(descr->style & LBS_NODATA)) descr->items[index].data = data; +} + static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) { return HAS_STRINGS(descr) ? descr->items[index].str : NULL; @@ -2743,7 +2748,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - if (!(descr->style & LBS_NODATA)) descr->items[wParam].data = lParam; + set_item_data(descr, wParam, lParam); /* undocumented: returns TRUE, not LB_OKAY (0) */ return TRUE;

1 0