wine-commits February 2019

wine-commits@winehq.org

1 participants
672 discussions

Ethan Lee : xaudio2: Fix uninitialized variable access (Valgrind).
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: ac8be6a1a24d49e1e32806b05dcf4591de5c691e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac8be6a1a24d49e1e32806b0… Author: Ethan Lee <elee(a)codeweavers.com> Date: Tue Feb 26 18:25:38 2019 -0500 xaudio2: Fix uninitialized variable access (Valgrind). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46724 Signed-off-by: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/compat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index 318f668..bc33cb9 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -923,7 +923,7 @@ static HRESULT WINAPI XA20SUB_SetOutputVoices(IXAudio20SubmixVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); - XAUDIO2_VOICE_SENDS sends, *psends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; TRACE("%p, %p\n", This, pSendList); @@ -1483,7 +1483,7 @@ static HRESULT WINAPI XA20M_SetOutputVoices(IXAudio20MasteringVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); - XAUDIO2_VOICE_SENDS sends, *psends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; TRACE("%p, %p\n", This, pSendList); @@ -2115,7 +2115,7 @@ static HRESULT WINAPI XA20_CreateSubmixVoice(IXAudio20 *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio20(iface); - XAUDIO2_VOICE_SENDS sends, *psends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; if(pSendList){ @@ -2350,7 +2350,7 @@ static HRESULT WINAPI XA22_CreateSubmixVoice(IXAudio22 *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio22(iface); - XAUDIO2_VOICE_SENDS sends, *psends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; if(pSendList){

1 0

Gabriel Ivăncescu : comctl32/listbox: Implement LBS_NODATA for multi-selection listboxes.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 44e6fff0107dbdd51344f7533326c3ae41b503cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=44e6fff0107dbdd51344f753… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 28 10:50:50 2019 +0000 comctl32/listbox: Implement LBS_NODATA for multi-selection listboxes. Use a byte array to store selection state of items, since we don't need any other data for LBS_NODATA multi-selection listboxes. This improves memory usage dramatically for large lists, and performance boosts are nice too. 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/comctl32/listbox.c | 72 ++++++++++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 04540ad..bd9cffd 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * TODO: - * - LBS_NODATA for multi-selection listboxes */ #include <string.h> @@ -71,7 +69,11 @@ typedef struct UINT style; /* Window style */ INT width; /* Window width */ INT height; /* Window height */ - LB_ITEMDATA *items; /* Array of items */ + union + { + LB_ITEMDATA *items; /* Array of items */ + BYTE *nodata_items; /* For multi-selection LBS_NODATA */ + } u; INT nb_items; /* Number of items */ UINT items_size; /* Total number of allocated items in the array */ INT top_item; /* Top visible item */ @@ -127,9 +129,19 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +/* + For listboxes without LBS_NODATA, an array of LB_ITEMDATA is allocated + to store the states of each item into descr->u.items. + + For single-selection LBS_NODATA listboxes, no storage is allocated, + and thus descr->u.nodata_items will always be NULL. + + For multi-selection LBS_NODATA listboxes, one byte per item is stored + for the item's selection state into descr->u.nodata_items. +*/ static size_t get_sizeof_item( const LB_DESCR *descr ) { - return sizeof(LB_ITEMDATA); + return (descr->style & LBS_NODATA) ? sizeof(BYTE) : sizeof(LB_ITEMDATA); } static BOOL resize_storage(LB_DESCR *descr, UINT items_size) @@ -142,20 +154,20 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) items_size = (items_size + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); if ((descr->style & (LBS_NODATA | LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) != LBS_NODATA) { - items = heap_realloc(descr->items, items_size * get_sizeof_item(descr)); + items = heap_realloc(descr->u.items, items_size * get_sizeof_item(descr)); if (!items) { SEND_NOTIFICATION(descr, LBN_ERRSPACE); return FALSE; } - descr->items = items; + descr->u.items = items; } descr->items_size = items_size; } - if ((descr->style & LBS_NODATA) && descr->items && items_size > descr->nb_items) + if ((descr->style & LBS_NODATA) && descr->u.nodata_items && items_size > descr->nb_items) { - memset(&descr->items[descr->nb_items], 0, + memset(descr->u.nodata_items + descr->nb_items, 0, (items_size - descr->nb_items) * get_sizeof_item(descr)); } return TRUE; @@ -163,69 +175,75 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) static ULONG_PTR get_item_data( const LB_DESCR *descr, UINT index ) { - return (descr->style & LBS_NODATA) ? 0 : descr->items[index].data; + return (descr->style & LBS_NODATA) ? 0 : descr->u.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; + if (!(descr->style & LBS_NODATA)) descr->u.items[index].data = data; } static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) { - return HAS_STRINGS(descr) ? descr->items[index].str : NULL; + return HAS_STRINGS(descr) ? descr->u.items[index].str : NULL; } static void set_item_string( const LB_DESCR *descr, UINT index, WCHAR *string ) { - if (!(descr->style & LBS_NODATA)) descr->items[index].str = string; + if (!(descr->style & LBS_NODATA)) descr->u.items[index].str = string; } static UINT get_item_height( const LB_DESCR *descr, UINT index ) { - return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; + return (descr->style & LBS_NODATA) ? 0 : descr->u.items[index].height; } static void set_item_height( LB_DESCR *descr, UINT index, UINT height ) { - if (!(descr->style & LBS_NODATA)) descr->items[index].height = height; + if (!(descr->style & LBS_NODATA)) descr->u.items[index].height = height; } static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { if (!(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL))) return index == descr->selected_item; - return descr->items[index].selected; + if (descr->style & LBS_NODATA) + return descr->u.nodata_items[index]; + else + return descr->u.items[index].selected; } static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) { if (descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) - descr->items[index].selected = state; + { + if (descr->style & LBS_NODATA) + descr->u.nodata_items[index] = state; + else + descr->u.items[index].selected = state; + } } static void insert_item_data(LB_DESCR *descr, UINT index) { size_t size = get_sizeof_item(descr); - LB_ITEMDATA *item; + BYTE *p = descr->u.nodata_items + index * size; - if (!descr->items) return; + if (!descr->u.items) return; - item = descr->items + index; if (index < descr->nb_items) - memmove(item + 1, item, (descr->nb_items - index) * size); + memmove(p + size, p, (descr->nb_items - index) * size); } static void remove_item_data(LB_DESCR *descr, UINT index) { size_t size = get_sizeof_item(descr); - LB_ITEMDATA *item; + BYTE *p = descr->u.nodata_items + index * size; - if (!descr->items) return; + if (!descr->u.items) return; - item = descr->items + index; if (index < descr->nb_items) - memmove(item, item + 1, (descr->nb_items - index) * size); + memmove(p, p + size, (descr->nb_items - index) * size); } /*********************************************************************** @@ -1782,14 +1800,14 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) if (!(descr->style & LBS_NODATA)) for (i = descr->nb_items - 1; i >= 0; i--) LISTBOX_DeleteItem(descr, i); - HeapFree( GetProcessHeap(), 0, descr->items ); + HeapFree( GetProcessHeap(), 0, descr->u.items ); descr->nb_items = 0; descr->top_item = 0; descr->selected_item = -1; descr->focus_item = 0; descr->anchor_item = -1; descr->items_size = 0; - descr->items = NULL; + descr->u.items = NULL; } @@ -2536,7 +2554,7 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) descr->style = GetWindowLongW( descr->self, GWL_STYLE ); descr->width = rect.right - rect.left; descr->height = rect.bottom - rect.top; - descr->items = NULL; + descr->u.items = NULL; descr->items_size = 0; descr->nb_items = 0; descr->top_item = 0;

1 0

Gabriel Ivăncescu : comctl32/listbox: Use a helper to get the size of an item.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: a853301e7ab34af57e6d0b6489b0ba4145d09190 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a853301e7ab34af57e6d0b64… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 28 10:50:49 2019 +0000 comctl32/listbox: Use a helper to get the size of an item. 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/comctl32/listbox.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 0025017..04540ad 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -127,6 +127,11 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +static size_t get_sizeof_item( const LB_DESCR *descr ) +{ + return sizeof(LB_ITEMDATA); +} + static BOOL resize_storage(LB_DESCR *descr, UINT items_size) { LB_ITEMDATA *items; @@ -137,7 +142,7 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) items_size = (items_size + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); if ((descr->style & (LBS_NODATA | LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) != LBS_NODATA) { - items = heap_realloc(descr->items, items_size * sizeof(LB_ITEMDATA)); + items = heap_realloc(descr->items, items_size * get_sizeof_item(descr)); if (!items) { SEND_NOTIFICATION(descr, LBN_ERRSPACE); @@ -151,7 +156,7 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) if ((descr->style & LBS_NODATA) && descr->items && items_size > descr->nb_items) { memset(&descr->items[descr->nb_items], 0, - (items_size - descr->nb_items) * sizeof(LB_ITEMDATA)); + (items_size - descr->nb_items) * get_sizeof_item(descr)); } return TRUE; } @@ -201,24 +206,26 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) static void insert_item_data(LB_DESCR *descr, UINT index) { + size_t size = get_sizeof_item(descr); LB_ITEMDATA *item; if (!descr->items) return; item = descr->items + index; if (index < descr->nb_items) - memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); + memmove(item + 1, item, (descr->nb_items - index) * size); } static void remove_item_data(LB_DESCR *descr, UINT index) { + size_t size = get_sizeof_item(descr); LB_ITEMDATA *item; if (!descr->items) return; item = descr->items + index; if (index < descr->nb_items) - memmove(item, item + 1, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); + memmove(item, item + 1, (descr->nb_items - index) * size); } /***********************************************************************

1 0

Huw Davies : comctl32/ listbox.c Use helper functions for item initialization.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: b60108e0225881187d28685079795a23cccac0c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b60108e0225881187d286850… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 28 10:50:48 2019 +0000 comctl32/listbox.c Use helper functions for item initialization. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index f2d0615..0025017 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -171,6 +171,11 @@ static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) return HAS_STRINGS(descr) ? descr->items[index].str : NULL; } +static void set_item_string( const LB_DESCR *descr, UINT index, WCHAR *string ) +{ + if (!(descr->style & LBS_NODATA)) descr->items[index].str = string; +} + static UINT get_item_height( const LB_DESCR *descr, UINT index ) { return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; @@ -194,7 +199,7 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) descr->items[index].selected = state; } -static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR data) +static void insert_item_data(LB_DESCR *descr, UINT index) { LB_ITEMDATA *item; @@ -203,11 +208,6 @@ static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR item = descr->items + index; if (index < descr->nb_items) memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); - - item->str = str; - item->data = HAS_STRINGS(descr) ? 0 : data; - item->height = 0; - item->selected = FALSE; } static void remove_item_data(LB_DESCR *descr, UINT index) @@ -1599,8 +1599,12 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; if (!resize_storage(descr, descr->nb_items + 1)) return LB_ERR; - insert_item_data(descr, index, str, data); + insert_item_data(descr, index); descr->nb_items++; + set_item_string(descr, index, str); + set_item_data(descr, index, HAS_STRINGS(descr) ? 0 : data); + set_item_height(descr, index, 0); + set_item_selected_state(descr, index, FALSE); /* Get item height */

1 0

Louis Lenders : ole32: Add CoDisableCallCancellation stub.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 3f508e6edb640ed219e99b8ec4c8d9a5b4b8fe99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f508e6edb640ed219e99b8e… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Feb 28 09:05:38 2019 +0000 ole32: Add CoDisableCallCancellation stub. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec | 2 +- .../api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 10 ++++++++++ dlls/ole32/ole32.spec | 1 + 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec index aea0fef..bc85dda 100644 --- a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec @@ -11,7 +11,7 @@ @ stub CoCreateInstanceFromApp @ stub CoDecodeProxy @ stub CoDecrementMTAUsage -@ stub CoDisableCallCancellation +@ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation diff --git a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec index 3cfdeda..9a8f1da 100644 --- a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec +++ b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec @@ -11,7 +11,7 @@ @ stub CoCreateInstanceFromApp @ stub CoDecodeProxy @ stub CoDecrementMTAUsage -@ stub CoDisableCallCancellation +@ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 76bd665..93575d5 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -82,7 +82,7 @@ @ stub CoDeactivateObject @ stub CoDecodeProxy @ stub CoDecrementMTAUsage -@ stub CoDisableCallCancellation +@ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 385a8df..fc93a2a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -5198,6 +5198,16 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) } /*********************************************************************** + * CoDisableCallCancellation [OLE32.@] + */ +HRESULT WINAPI CoDisableCallCancellation(void *reserved) +{ + FIXME("(%p): stub\n", reserved); + + return E_NOTIMPL; +} + +/*********************************************************************** * CoEnableCallCancellation [OLE32.@] */ HRESULT WINAPI CoEnableCallCancellation(void *reserved) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index b2db3fd..5e0e703 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -14,6 +14,7 @@ @ stdcall CoCreateGuid(ptr) @ stdcall CoCreateInstance(ptr ptr long ptr ptr) @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) +@ stdcall CoDisableCallCancellation(ptr) @ stdcall CoDisconnectObject(ptr long) @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime @ stdcall CoEnableCallCancellation(ptr)

1 0

Louis Lenders : ole32: Add CoEnableCallCancellation stub.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 8ab8030029ee5640b34d38a2d31bd1d4bf4ca21d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ab8030029ee5640b34d38a2… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Feb 28 09:05:37 2019 +0000 ole32: Add CoEnableCallCancellation stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46732 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec | 2 +- .../api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 10 ++++++++++ dlls/ole32/ole32.spec | 1 + include/objbase.h | 2 ++ 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec index 954d6da..aea0fef 100644 --- a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec @@ -14,7 +14,7 @@ @ stub CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject -@ stub CoEnableCallCancellation +@ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation @ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx @ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType diff --git a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec index a124d34..3cfdeda 100644 --- a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec +++ b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec @@ -14,7 +14,7 @@ @ stub CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject -@ stub CoEnableCallCancellation +@ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation @ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx @ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index cffb33f..76bd665 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -85,7 +85,7 @@ @ stub CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject -@ stub CoEnableCallCancellation +@ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation @ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx @ stdcall CoGetActivationState(int128 long ptr) ole32.CoGetActivationState diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a28ff79..385a8df 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -5198,6 +5198,16 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) } /*********************************************************************** + * CoEnableCallCancellation [OLE32.@] + */ +HRESULT WINAPI CoEnableCallCancellation(void *reserved) +{ + FIXME("(%p): stub\n", reserved); + + return E_NOTIMPL; +} + +/*********************************************************************** * CoRegisterSurrogate [OLE32.@] */ HRESULT WINAPI CoRegisterSurrogate(ISurrogate *surrogate) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index d5a71b3..b2db3fd 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -16,6 +16,7 @@ @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) @ stdcall CoDisconnectObject(ptr long) @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime +@ stdcall CoEnableCallCancellation(ptr) @ stdcall CoFileTimeNow(ptr) @ stdcall CoFileTimeToDosDateTime(ptr ptr ptr) kernel32.FileTimeToDosDateTime @ stdcall CoFreeAllLibraries() diff --git a/include/objbase.h b/include/objbase.h index 875f0e1..8af7a80 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -350,6 +350,8 @@ HRESULT WINAPI CoUnmarshalHresult(LPSTREAM pstm, HRESULT* phresult); HRESULT WINAPI CoUnmarshalInterface(LPSTREAM pStm, REFIID riid, LPVOID* ppv); HRESULT WINAPI CoLockObjectExternal(LPUNKNOWN pUnk, BOOL fLock, BOOL fLastUnlockReleases); BOOL WINAPI CoIsHandlerConnected(LPUNKNOWN pUnk); +HRESULT WINAPI CoDisableCallCancellation(void *reserved); +HRESULT WINAPI CoEnableCallCancellation(void *reserved); /* security */ HRESULT WINAPI CoInitializeSecurity(PSECURITY_DESCRIPTOR pSecDesc, LONG cAuthSvc, SOLE_AUTHENTICATION_SERVICE* asAuthSvc, void* pReserved1, DWORD dwAuthnLevel, DWORD dwImpLevel, void* pReserved2, DWORD dwCapabilities, void* pReserved3);

1 0

Alistair Leslie-Hughes : include: Add more DB_E_* defines.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: ca266d2e37cfe8cd750fedd19f6a7f5c60951c15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca266d2e37cfe8cd750fedd1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 28 08:16:02 2019 +0000 include: Add more DB_E_* defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/oledberr.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/oledberr.h b/include/oledberr.h index 8af38ef..61093ea 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -21,6 +21,14 @@ #ifndef __WINE_OLEDBERR_H #define __WINE_OLEDBERR_H +#define DB_E_BADACCESSORHANDLE 0x80040e00 +#define DB_E_ROWLIMITEXCEEDED 0x80040e01 +#define DB_E_READONLYACCESSOR 0x80040e02 +#define DB_E_SCHEMAVIOLATION 0x80040e03 +#define DB_E_BADROWHANDLE 0x80040e04 +#define DB_E_OBJECTOPEN 0x80040e05 +#define DB_E_BADCHAPTER 0x80040e06 +#define DB_E_CANTCONVERTVALUE 0x80040e07 #define DB_E_BADBINDINFO 0x80040e08 #define DB_E_ERRORSINCOMMAND 0x80040e14

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 6d797df937919b17ffd6b84330ead8a34128ea49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d797df937919b17ffd6b843… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Feb 28 10:12:53 2019 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index b34e78e..1ddac18 100644 --- a/po/fi.po +++ b/po/fi.po @@ -16284,10 +16284,8 @@ msgid "Text documents (*.txt)" msgstr "Tekstitiedostot (*.txt)" #: wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" -msgstr "Unicode-tekstitiedosto (*.txt)" +msgstr "Unicode-tekstitiedostot (*.txt)" #: wordpad.rc:150 msgid "Rich text format (*.rtf)"

1 0

Zebediah Figura : quartz/tests: Add a test mp3 file.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 194f765ba58ee094dab3bc86654aa2b91fe75c5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=194f765ba58ee094dab3bc86… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 28 00:13:01 2019 -0600 quartz/tests: Add a test mp3 file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 64 ++++++++++++++++++++++++---------------- dlls/quartz/tests/rsrc.rc | 6 ++++ dlls/quartz/tests/test.mp3 | Bin 0 -> 2349 bytes 3 files changed, 45 insertions(+), 25 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 897ba3a..88d964c 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -41,6 +41,7 @@ typedef struct TestFilterImpl static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; static const WCHAR mpegfile[] = {'t','e','s','t','.','m','p','g',0}; +static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; static WCHAR *load_resource(const WCHAR *name) { @@ -530,57 +531,63 @@ todo_wine IMediaFilter_Release(filter); } -static void rungraph(IFilterGraph2 *graph) +static void rungraph(IFilterGraph2 *graph, BOOL video) { - test_basic_video(graph); + if (video) + test_basic_video(graph); test_media_seeking(graph); test_state_change(graph); test_media_event(graph); } -static HRESULT test_graph_builder_connect_file(WCHAR *filename) +static HRESULT test_graph_builder_connect_file(WCHAR *filename, BOOL audio, BOOL video) { static const WCHAR outputW[] = {'O','u','t','p','u','t',0}; - static const WCHAR inW[] = {'I','n',0}; - IBaseFilter *source_filter, *video_filter; + IBaseFilter *source_filter, *renderer; IPin *pin_in, *pin_out; IFilterGraph2 *graph; - IVideoWindow *window; + IEnumPins *enumpins; HRESULT hr; + if (video) + hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&renderer); + else + hr = CoCreateInstance(&CLSID_AudioRender, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&renderer); + if (hr == VFW_E_NO_AUDIO_HARDWARE) + return VFW_E_CANNOT_CONNECT; + ok(hr == S_OK, "Got hr %#x.\n", hr); + graph = create_graph(); - hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, &IID_IVideoWindow, (void **)&window); - ok(hr == S_OK, "Failed to create VideoRenderer: %#x\n", hr); + IBaseFilter_EnumPins(renderer, &enumpins); + IEnumPins_Next(enumpins, 1, &pin_in, NULL); + IEnumPins_Release(enumpins); hr = IFilterGraph2_AddSourceFilter(graph, filename, NULL, &source_filter); ok(hr == S_OK, "AddSourceFilter failed: %#x\n", hr); - hr = IVideoWindow_QueryInterface(window, &IID_IBaseFilter, (void **)&video_filter); - ok(hr == S_OK, "QueryInterface(IBaseFilter) failed: %#x\n", hr); - hr = IFilterGraph2_AddFilter(graph, video_filter, NULL); + hr = IFilterGraph2_AddFilter(graph, renderer, NULL); ok(hr == S_OK, "AddFilter failed: %#x\n", hr); hr = IBaseFilter_FindPin(source_filter, outputW, &pin_out); ok(hr == S_OK, "FindPin failed: %#x\n", hr); - hr = IBaseFilter_FindPin(video_filter, inW, &pin_in); - ok(hr == S_OK, "FindPin failed: %#x\n", hr); hr = IFilterGraph2_Connect(graph, pin_out, pin_in); if (SUCCEEDED(hr)) - rungraph(graph); + rungraph(graph, video); IPin_Release(pin_in); IPin_Release(pin_out); IBaseFilter_Release(source_filter); - IBaseFilter_Release(video_filter); - IVideoWindow_Release(window); + IBaseFilter_Release(renderer); IFilterGraph2_Release(graph); return hr; } -static void test_render_run(const WCHAR *file) +static void test_render_run(const WCHAR *file, BOOL audio, BOOL video) { IFilterGraph2 *graph; HANDLE h; @@ -608,19 +615,25 @@ static void test_render_run(const WCHAR *file) refs = IFilterGraph2_Release(graph); ok(!refs, "Graph has %u references\n", refs); - hr = test_graph_builder_connect_file(filename); + hr = test_graph_builder_connect_file(filename, audio, video); ok(hr == VFW_E_CANNOT_CONNECT, "got %#x\n", hr); } else { - ok(hr == S_OK || hr == VFW_S_AUDIO_NOT_RENDERED, "RenderFile failed: %x\n", hr); - rungraph(graph); + if (audio) + ok(hr == S_OK || hr == VFW_S_AUDIO_NOT_RENDERED, "Got hr %#x.\n", hr); + else + ok(hr == S_OK, "Got hr %#x.\n", hr); + rungraph(graph, video); refs = IFilterGraph2_Release(graph); ok(!refs, "Graph has %u references\n", refs); - hr = test_graph_builder_connect_file(filename); - ok(hr == S_OK || hr == VFW_S_PARTIAL_RENDER, "got %#x\n", hr); + hr = test_graph_builder_connect_file(filename, audio, video); + if (audio && video) + todo_wine ok(hr == VFW_S_PARTIAL_RENDER, "Got hr %#x.\n", hr); + else + ok(hr == S_OK, "Got hr %#x.\n", hr); } /* check reference leaks */ @@ -737,7 +750,7 @@ todo_wine ok(SUCCEEDED(hr), "RenderFile failed: %x\n", hr); if (SUCCEEDED(hr)) - rungraph(graph); + rungraph(graph, TRUE); return 0; } @@ -3199,8 +3212,9 @@ START_TEST(filtergraph) CoInitializeEx(NULL, COINIT_MULTITHREADED); test_interfaces(); - test_render_run(avifile); - test_render_run(mpegfile); + test_render_run(avifile, FALSE, TRUE); + test_render_run(mpegfile, TRUE, TRUE); + test_render_run(mp3file, TRUE, FALSE); test_enum_filters(); test_graph_builder_render(); test_graph_builder_connect(); diff --git a/dlls/quartz/tests/rsrc.rc b/dlls/quartz/tests/rsrc.rc index 9bea5be..282cb1f 100644 --- a/dlls/quartz/tests/rsrc.rc +++ b/dlls/quartz/tests/rsrc.rc @@ -20,8 +20,14 @@ #include "windef.h" +/* ffmpeg -f lavfi -i smptebars -t 1 -r 1 -f avi -vcodec rawvideo -pix_fmt yuv420p -vf scale=32x24 test.avi */ /* @makedep: test.avi */ test.avi RCDATA "test.avi" +/* ffmpeg -f lavfi -i smptebars -f lavfi -i "sine=frequency=1000" -t 0.04 -r 25 -f mpeg -vcodec mpeg1video -vf scale=32x24 -acodec mp2 test.mpg */ /* @makedep: test.mpg */ test.mpg RCDATA "test.mpg" + +/* ffmpeg -f lavfi -i "sine=frequency=500" -t 0.5 -ar 48000 -b:a 32k -f mp3 -acodec mp3 test.mp3 */ +/* @makedep: test.mp3 */ +test.mp3 RCDATA "test.mp3" diff --git a/dlls/quartz/tests/test.mp3 b/dlls/quartz/tests/test.mp3 new file mode 100644 index 0000000..78d8dd2 Binary files /dev/null and b/dlls/quartz/tests/test.mp3 differ

1 0

Zebediah Figura : quartz/tests: Clean up test_query_interface().
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 42263f9ae4b08b6685c26a1e03abe9feea011350 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42263f9ae4b08b6685c26a1e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 28 00:13:00 2019 -0600 quartz/tests: Clean up test_query_interface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegsplit.c | 70 +++++++++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 23 deletions(-) diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 591e527..caadfbe 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1,5 +1,5 @@ /* - * Unit tests for the MPEG-1 stream splitter functions + * MPEG-1 splitter filter unit tests * * Copyright 2015 Anton Baskanov * @@ -19,40 +19,64 @@ */ #define COBJMACROS - -#include "wine/test.h" #include "dshow.h" +#include "wine/test.h" -static IUnknown *create_mpeg_splitter(void) +static IBaseFilter *create_mpeg_splitter(void) { - IUnknown *mpeg_splitter = NULL; - HRESULT result = CoCreateInstance(&CLSID_MPEG1Splitter, NULL, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void **)&mpeg_splitter); - ok(S_OK == result, "got 0x%08x\n", result); - return mpeg_splitter; + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_MPEG1Splitter, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; } -static void test_query_interface(void) +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { - IUnknown *mpeg_splitter = create_mpeg_splitter(); - - IAMStreamSelect *stream_select = NULL; - HRESULT result = IUnknown_QueryInterface( - mpeg_splitter, &IID_IAMStreamSelect, (void **)&stream_select); - ok(S_OK == result, "got 0x%08x\n", result); - if (S_OK == result) - { - IAMStreamSelect_Release(stream_select); - } - - IUnknown_Release(mpeg_splitter); + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_mpeg_splitter(); + + check_interface(filter, &IID_IAMStreamSelect, TRUE); + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IKsPropertySet, FALSE); + check_interface(filter, &IID_IMediaPosition, FALSE); + check_interface(filter, &IID_IMediaSeeking, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IQualityControl, FALSE); + check_interface(filter, &IID_IQualProp, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + + IBaseFilter_Release(filter); } START_TEST(mpegsplit) { CoInitialize(NULL); - test_query_interface(); + test_interfaces(); CoUninitialize(); }

1 0

← Newer
1
2
3
4
5
6
7
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2019