July 2018 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : user32: Support SPI_S/ GETAUDIODESCRIPTION in SystemParametersInfo.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 80205232d3ece73d4cc6c7589cea893583aae0b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80205232d3ece73d4cc6c758… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 6 01:16:57 2018 +0000 user32: Support SPI_S/GETAUDIODESCRIPTION in SystemParametersInfo. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 32 +++++++++++++++++++++++++++++++- include/winuser.h | 9 +++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 13bd425..95387cd 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -70,6 +70,7 @@ enum parameter_key SHOWSOUNDS_KEY, KEYBOARDPREF_KEY, SCREENREADER_KEY, + AUDIODESC_KEY, NB_PARAM_KEYS }; @@ -94,6 +95,9 @@ static const WCHAR KEYBOARDPREF_REGKEY[] = {'C','o','n','t','r','o','l',' ','P', static const WCHAR SCREENREADER_REGKEY[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', 'A','c','c','e','s','s','i','b','i','l','i','t','y','\\', 'B','l','i','n','d',' ','A','c','c','e','s','s',0}; +static const WCHAR AUDIODESC_REGKEY[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', + 'A','c','c','e','s','s','i','b','i','l','i','t','y','\\', + 'A','u','d','i','o','D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR *parameter_key_names[NB_PARAM_KEYS] = { @@ -107,6 +111,7 @@ static const WCHAR *parameter_key_names[NB_PARAM_KEYS] = SHOWSOUNDS_REGKEY, KEYBOARDPREF_REGKEY, SCREENREADER_REGKEY, + AUDIODESC_REGKEY, }; /* parameter key values; the first char is actually an enum parameter_key to specify the key */ @@ -217,6 +222,8 @@ static const WCHAR COLOR_GRADIENTACTIVECAPTION_VALNAME[] = {COLORS_KEY,'G','r',' static const WCHAR COLOR_GRADIENTINACTIVECAPTION_VALNAME[] = {COLORS_KEY,'G','r','a','d','i','e','n','t','I','n','a','c','t','i','v','e','T','i','t','l','e',0}; static const WCHAR COLOR_MENUHILIGHT_VALNAME[] = {COLORS_KEY,'M','e','n','u','H','i','l','i','g','h','t',0}; static const WCHAR COLOR_MENUBAR_VALNAME[] = {COLORS_KEY,'M','e','n','u','B','a','r',0}; +static const WCHAR AUDIODESC_LOCALE_VALNAME[] = {AUDIODESC_KEY,'L','o','c','a','l','e',0}; +static const WCHAR AUDIODESC_ON_VALNAME[] = {AUDIODESC_KEY,'O','n',0}; /* FIXME - real value */ static const WCHAR SCREENSAVERRUNNING_VALNAME[]= {DESKTOP_KEY,'W','I','N','E','_','S','c','r','e','e','n','S','a','v','e','r','R','u','n','n','i','n','g',0}; @@ -1240,6 +1247,7 @@ static BOOL_ENTRY( SCREENSAVERRUNNING, FALSE ); static BOOL_ENTRY( SHOWSOUNDS, FALSE ); static BOOL_ENTRY( SNAPTODEFBUTTON, FALSE ); static BOOL_ENTRY_MIRROR( ICONTITLEWRAP, TRUE ); +static BOOL_ENTRY( AUDIODESC_ON, FALSE); static YESNO_ENTRY( BEEP, TRUE ); @@ -1269,6 +1277,7 @@ static DWORD_ENTRY( FOREGROUNDFLASHCOUNT, 3 ); static DWORD_ENTRY( FOREGROUNDLOCKTIMEOUT, 0 ); static DWORD_ENTRY( LOGPIXELS, 0 ); static DWORD_ENTRY( MOUSECLICKLOCKTIME, 1200 ); +static DWORD_ENTRY( AUDIODESC_LOCALE, 0 ); static PATH_ENTRY( DESKPATTERN ); static PATH_ENTRY( DESKWALLPAPER ); @@ -1399,6 +1408,8 @@ static union sysparam_all_entry * const default_entries[] = (union sysparam_all_entry *)&entry_USERPREFERENCESMASK, (union sysparam_all_entry *)&entry_WHEELSCROLLCHARS, (union sysparam_all_entry *)&entry_WHEELSCROLLLINES, + (union sysparam_all_entry *)&entry_AUDIODESC_LOCALE, + (union sysparam_all_entry *)&entry_AUDIODESC_ON, }; /*********************************************************************** @@ -2334,7 +2345,26 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_SETFONTSMOOTHINGORIENTATION: ret = set_entry( &entry_FONTSMOOTHINGORIENTATION, uiParam, pvParam, fWinIni ); break; - + case SPI_GETAUDIODESCRIPTION: + { + AUDIODESCRIPTION *audio = pvParam; + if (audio && audio->cbSize == sizeof(AUDIODESCRIPTION) && uiParam == sizeof(AUDIODESCRIPTION) ) + { + ret = get_entry( &entry_AUDIODESC_ON, 0, &audio->Enabled ) && + get_entry( &entry_AUDIODESC_LOCALE, 0, &audio->Locale ); + } + break; + } + case SPI_SETAUDIODESCRIPTION: + { + AUDIODESCRIPTION *audio = pvParam; + if (audio && audio->cbSize == sizeof(AUDIODESCRIPTION) && uiParam == sizeof(AUDIODESCRIPTION) ) + { + ret = set_entry( &entry_AUDIODESC_ON, 0, &audio->Enabled, fWinIni) && + set_entry( &entry_AUDIODESC_LOCALE, 0, &audio->Locale, fWinIni ); + } + break; + } default: FIXME( "Unknown action: %u\n", uiAction ); SetLastError( ERROR_INVALID_SPI_VALUE ); diff --git a/include/winuser.h b/include/winuser.h index 24ca055..a653ef4 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2362,6 +2362,8 @@ typedef struct tagDROPSTRUCT #define SPI_SETMOUSESPEED 113 #define SPI_GETSCREENSAVERRUNNING 114 #define SPI_GETDESKWALLPAPER 115 +#define SPI_GETAUDIODESCRIPTION 116 +#define SPI_SETAUDIODESCRIPTION 117 #define SPI_GETACTIVEWINDOWTRACKING 0x1000 #define SPI_SETACTIVEWINDOWTRACKING 0x1001 @@ -3387,6 +3389,13 @@ enum tagPOINTER_INPUT_TYPE }; typedef DWORD POINTER_INPUT_TYPE; +typedef struct tagAUDIODESCRIPTION +{ + UINT cbSize; + BOOL Enabled; + LCID Locale; +} AUDIODESCRIPTION, *LPAUDIODESCRIPTION; + #if defined(_WINGDI_) && !defined(NOGDI) WINUSERAPI LONG WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD); WINUSERAPI LONG WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD);

1 0

Alexandre Julliard : user32: Update RedrawWindow behavior with explicit desktop window handle.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: b73a50a35e2cb5630bac89eafa5487529282a0ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=b73a50a35e2cb5630bac89ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 6 13:20:56 2018 +0200 user32: Update RedrawWindow behavior with explicit desktop window handle. Newer Windows versions behave differently. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 4 +-- dlls/user32/sysparams.c | 3 +- dlls/user32/tests/msg.c | 86 ++++++++++++++++++++++++++++++++++++++++++------- server/window.c | 19 ++++++++--- 4 files changed, 92 insertions(+), 20 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 79db230..9178b61 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1227,8 +1227,6 @@ BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ) static const RECT empty; BOOL ret; - if (!hwnd) hwnd = GetDesktopWindow(); - if (TRACE_ON(win)) { if (hrgn) @@ -1272,6 +1270,8 @@ BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ) HeapFree( GetProcessHeap(), 0, data ); } + if (!hwnd) hwnd = GetDesktopWindow(); + if (flags & RDW_UPDATENOW) update_now( hwnd, flags ); else if (flags & RDW_ERASENOW) erase_now( hwnd, flags ); diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index fc55b06..13bd425 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2938,8 +2938,7 @@ BOOL WINAPI SetSysColors( INT count, const INT *colors, const COLORREF *values ) /* Repaint affected portions of all visible windows */ - RedrawWindow( GetDesktopWindow(), NULL, 0, - RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); + RedrawWindow( 0, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); return TRUE; } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 80c699f..55d8994 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7229,7 +7229,8 @@ void dump_region(HRGN hrgn) HeapFree( GetProcessHeap(), 0, data ); } -static void check_update_rgn( HWND hwnd, HRGN hrgn ) +#define check_update_rgn( hwnd, hrgn ) check_update_rgn_( __LINE__, hwnd, hrgn ) +static void check_update_rgn_( int line, HWND hwnd, HRGN hrgn ) { INT ret; RECT r1, r2; @@ -7240,13 +7241,13 @@ static void check_update_rgn( HWND hwnd, HRGN hrgn ) ok( ret != ERROR, "GetUpdateRgn failed\n" ); if (ret == NULLREGION) { - ok( !hrgn, "Update region shouldn't be empty\n" ); + ok_(__FILE__,line)( !hrgn, "Update region shouldn't be empty\n" ); } else { if (CombineRgn( tmp, hrgn, update, RGN_XOR ) != NULLREGION) { - ok( 0, "Regions are different\n" ); + ok_(__FILE__,line)( 0, "Regions are different\n" ); if (winetest_debug > 0) { printf( "Update region: " ); @@ -7258,8 +7259,8 @@ static void check_update_rgn( HWND hwnd, HRGN hrgn ) } GetRgnBox( update, &r1 ); GetUpdateRect( hwnd, &r2, FALSE ); - ok( EqualRect( &r1, &r2 ), "Rectangles are different: %s / %s\n", wine_dbgstr_rect( &r1 ), - wine_dbgstr_rect( &r2 )); + ok_(__FILE__,line)( EqualRect( &r1, &r2 ), "Rectangles are different: %s / %s\n", + wine_dbgstr_rect( &r1 ), wine_dbgstr_rect( &r2 )); DeleteObject( tmp ); DeleteObject( update ); @@ -7455,9 +7456,76 @@ static void test_paint_messages(void) /* MSDN: if hwnd parameter is NULL, InvalidateRect invalidates and redraws * all windows and sends WM_ERASEBKGND and WM_NCPAINT. */ - trace("testing InvalidateRect(0, NULL, FALSE)\n"); SetRectEmpty( &rect ); - ok(InvalidateRect(0, &rect, FALSE), "InvalidateRect(0, &rc, FALSE) should fail\n"); + ok(InvalidateRect(0, &rect, FALSE), "InvalidateRect(0, &rc, FALSE) failed\n"); + check_update_rgn( hwnd, hrgn ); + ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); + flush_events(); + ok_sequence( WmPaint, "Paint", FALSE ); + RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + check_update_rgn( hwnd, 0 ); + + SetRectEmpty( &rect ); + ok(RedrawWindow(0, &rect, 0, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + check_update_rgn( hwnd, 0 ); + + SetRectEmpty( &rect ); + ok(RedrawWindow(0, &rect, 0, RDW_ALLCHILDREN | RDW_VALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + check_update_rgn( hwnd, 0 ); + + GetWindowRect( hwnd, &rect ); + ok(RedrawWindow(0, &rect, 0, RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + check_update_rgn( hwnd, 0 ); + + flush_events(); + ok(RedrawWindow(0, &rect, 0, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + check_update_rgn( hwnd, hrgn ); + ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); + flush_events(); + ok_sequence( WmPaint, "Paint", FALSE ); + RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + check_update_rgn( hwnd, 0 ); + + ok(RedrawWindow(GetDesktopWindow(), &rect, 0, + RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + ret = GetUpdateRgn( hwnd, hrgn2, FALSE ); + ok( ret == NULLREGION || broken(ret == SIMPLEREGION), /* <= win7 */ + "region should be null (%d)\n", ret ); + if (ret == SIMPLEREGION) ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); + RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + flush_events(); + + ok(RedrawWindow(GetDesktopWindow(), NULL, 0, + RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + ret = GetUpdateRgn( hwnd, hrgn2, FALSE ); + ok( ret == NULLREGION || broken(ret == SIMPLEREGION), /* <= win7 */ + "region should be null (%d)\n", ret ); + if (ret == SIMPLEREGION) ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); + RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + flush_events(); + + SetRectRgn( hrgn2, rect.left, rect.top, rect.right, rect.bottom ); + ok(RedrawWindow(0, NULL, hrgn2, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + check_update_rgn( hwnd, hrgn ); + ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); + flush_events(); + ok_sequence( WmPaint, "Paint", FALSE ); + RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + check_update_rgn( hwnd, 0 ); + + ok(RedrawWindow(0, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + check_update_rgn( hwnd, 0 ); + + ok(RedrawWindow(0, NULL, 0, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); check_update_rgn( hwnd, hrgn ); ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); flush_events(); @@ -7468,7 +7536,6 @@ static void test_paint_messages(void) /* MSDN: if hwnd parameter is NULL, ValidateRect invalidates and redraws * all windows and sends WM_ERASEBKGND and WM_NCPAINT. */ - trace("testing ValidateRect(0, NULL)\n"); SetRectEmpty( &rect ); if (ValidateRect(0, &rect) && /* not supported on Win9x */ GetUpdateRect(hwnd, NULL, FALSE)) /* or >= Win 8 */ @@ -7481,7 +7548,6 @@ static void test_paint_messages(void) check_update_rgn( hwnd, 0 ); } - trace("testing InvalidateRgn(0, NULL, FALSE)\n"); SetLastError(0xdeadbeef); ok(!InvalidateRgn(0, NULL, FALSE), "InvalidateRgn(0, NULL, FALSE) should fail\n"); ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || GetLastError() == 0xdeadbeef, @@ -7490,7 +7556,6 @@ static void test_paint_messages(void) flush_events(); ok_sequence( WmEmptySeq, "WmEmptySeq", FALSE ); - trace("testing ValidateRgn(0, NULL)\n"); SetLastError(0xdeadbeef); ok(!ValidateRgn(0, NULL), "ValidateRgn(0, NULL) should fail\n"); ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || @@ -7500,7 +7565,6 @@ static void test_paint_messages(void) flush_events(); ok_sequence( WmEmptySeq, "WmEmptySeq", FALSE ); - trace("testing UpdateWindow(NULL)\n"); SetLastError(0xdeadbeef); ok(!UpdateWindow(NULL), "UpdateWindow(NULL) should fail\n"); ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || diff --git a/server/window.c b/server/window.c index 322001d..532edd8 100644 --- a/server/window.c +++ b/server/window.c @@ -2634,13 +2634,23 @@ DECL_HANDLER(update_window_zorder) /* mark parts of a window as needing a redraw */ DECL_HANDLER(redraw_window) { + unsigned int flags = req->flags; struct region *region = NULL; - struct window *win = get_window( req->window ); + struct window *win; + + if (!req->window) + { + if (!(win = get_desktop_window( current ))) return; + } + else + { + if (!(win = get_window( req->window ))) return; + if (is_desktop_window( win )) flags &= ~RDW_ALLCHILDREN; + } - if (!win) return; if (!is_visible( win )) return; /* nothing to do */ - if (req->flags & (RDW_VALIDATE|RDW_INVALIDATE)) + if (flags & (RDW_VALIDATE|RDW_INVALIDATE)) { if (get_req_data_size()) /* no data means whole rectangle */ { @@ -2650,8 +2660,7 @@ DECL_HANDLER(redraw_window) } } - redraw_window( win, region, (req->flags & RDW_INVALIDATE) && (req->flags & RDW_FRAME), - req->flags ); + redraw_window( win, region, (flags & RDW_INVALIDATE) && (flags & RDW_FRAME), flags ); if (region) free_region( region ); }

1 0

Zebediah Figura : quartz: Use CBaseFilter::FindPin().
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: d88218324bade6d39eb6e0529e8b995258bdfed1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d88218324bade6d39eb6e052… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 00:34:41 2018 +0200 quartz: Use CBaseFilter::FindPin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- dlls/quartz/avisplit.c | 2 +- dlls/quartz/filesource.c | 23 +---------------------- dlls/quartz/mpegsplit.c | 2 +- dlls/quartz/parser.c | 10 ---------- dlls/quartz/parser.h | 1 - dlls/quartz/waveparser.c | 2 +- 8 files changed, 6 insertions(+), 38 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 3c1c7cf..77256b7 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -413,7 +413,7 @@ static const IBaseFilterVtbl ACMWrapper_Vtbl = BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - TransformFilterImpl_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index c9ca760..f8e4a9c 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -431,7 +431,7 @@ static const IBaseFilterVtbl AVIDec_Vtbl = BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - TransformFilterImpl_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index f3ecced..564ccd3 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1421,7 +1421,7 @@ static const IBaseFilterVtbl AVISplitterImpl_Vtbl = Parser_SetSyncSource, Parser_GetSyncSource, Parser_EnumPins, - Parser_FindPin, + BaseFilterImpl_FindPin, Parser_QueryFilterInfo, Parser_JoinFilterGraph, Parser_QueryVendorInfo diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 0413eb4..bcce0e1 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -547,27 +547,6 @@ static HRESULT WINAPI AsyncReader_Run(IBaseFilter * iface, REFERENCE_TIME tStart return S_OK; } -/** IBaseFilter methods **/ - -static HRESULT WINAPI AsyncReader_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) -{ - AsyncReader *This = impl_from_IBaseFilter(iface); - TRACE("%p->(%s, %p)\n", This, debugstr_w(Id), ppPin); - - if (!Id || !ppPin) - return E_POINTER; - - if (strcmpW(Id, wszOutputPinName)) - { - *ppPin = NULL; - return VFW_E_NOT_FOUND; - } - - *ppPin = This->pOutputPin; - IPin_AddRef(*ppPin); - return S_OK; -} - static const IBaseFilterVtbl AsyncReader_Vtbl = { AsyncReader_QueryInterface, @@ -581,7 +560,7 @@ static const IBaseFilterVtbl AsyncReader_Vtbl = BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - AsyncReader_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 41221d4..5869f16 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -804,7 +804,7 @@ static const IBaseFilterVtbl MPEGSplitter_Vtbl = Parser_SetSyncSource, Parser_GetSyncSource, Parser_EnumPins, - Parser_FindPin, + BaseFilterImpl_FindPin, Parser_QueryFilterInfo, Parser_JoinFilterGraph, Parser_QueryVendorInfo diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index f15f364..034bca0 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -402,16 +402,6 @@ HRESULT WINAPI Parser_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) return BaseFilterImpl_EnumPins(iface,ppEnum); } -HRESULT WINAPI Parser_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) -{ - ParserImpl *This = impl_from_IBaseFilter(iface); - FIXME("(%p)->(%s,%p)\n", This, debugstr_w(Id), ppPin); - - /* FIXME: critical section */ - - return E_NOTIMPL; -} - HRESULT WINAPI Parser_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo) { return BaseFilterImpl_QueryFilterInfo(iface, pInfo); diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index 996415a..840e475 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -70,7 +70,6 @@ extern HRESULT WINAPI Parser_GetState(IBaseFilter * iface, DWORD dwMilliSecsTime extern HRESULT WINAPI Parser_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock); extern HRESULT WINAPI Parser_GetSyncSource(IBaseFilter * iface, IReferenceClock **ppClock); extern HRESULT WINAPI Parser_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum); -extern HRESULT WINAPI Parser_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin); extern HRESULT WINAPI Parser_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo); extern HRESULT WINAPI Parser_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName); extern HRESULT WINAPI Parser_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo); diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index f6bea2c..0a84fcb 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -410,7 +410,7 @@ static const IBaseFilterVtbl WAVEParser_Vtbl = Parser_SetSyncSource, Parser_GetSyncSource, Parser_EnumPins, - Parser_FindPin, + BaseFilterImpl_FindPin, Parser_QueryFilterInfo, Parser_JoinFilterGraph, Parser_QueryVendorInfo

1 0

Alex Henrie : gdi32: Add DECLSPEC_HOTPATCH to GetDIBits.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 478a3d64ef7630f16e6c618375a76ad665c7cf63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=478a3d64ef7630f16e6c6183… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 5 08:39:25 2018 +0200 gdi32: Add DECLSPEC_HOTPATCH to GetDIBits. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index c7dcdb1..1312bf0 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1208,7 +1208,7 @@ BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) * Success: Number of scan lines copied from bitmap * Failure: 0 */ -INT WINAPI GetDIBits( +INT WINAPI DECLSPEC_HOTPATCH GetDIBits( HDC hdc, /* [in] Handle to device context */ HBITMAP hbitmap, /* [in] Handle to bitmap */ UINT startscan, /* [in] First scan line to set in dest bitmap */

1 0

Michael Stefaniuc : dssenh/test: Replace a macro with ARRAY_SIZE.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 4a900755f2136a384ba0c619022dcceadcd8a52a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a900755f2136a384ba0c619… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:19 2018 +0200 dssenh/test: Replace a macro with ARRAY_SIZE. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index ccb7dcd..b62f592 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -341,8 +341,6 @@ static void test_keylength_array(HCRYPTPROV hProv,const struct keylength_test *t } } -#define TESTLEN(x) (sizeof(x) / sizeof((x)[0])) - static void test_keylength(void) { HCRYPTPROV hProv = 0; @@ -359,7 +357,7 @@ static void test_keylength(void) ok(result, "Expected no errors.\n"); /* perform keylength tests */ - test_keylength_array(hProv, baseDSS_keylength, TESTLEN(baseDSS_keylength)); + test_keylength_array(hProv, baseDSS_keylength, ARRAY_SIZE(baseDSS_keylength)); result = CryptReleaseContext(hProv, 0); ok(result, "Expected release of CSP provider.\n"); @@ -370,7 +368,7 @@ static void test_keylength(void) ok(result, "Expected no errors.\n"); /* perform keylength tests */ - test_keylength_array(hProv, dssDH_keylength, TESTLEN(dssDH_keylength)); + test_keylength_array(hProv, dssDH_keylength, ARRAY_SIZE(dssDH_keylength)); result = CryptReleaseContext(hProv, 0); ok(result, "Expected release of CSP provider.\n"); @@ -387,7 +385,7 @@ static void test_keylength(void) ok(result, "Expected no errors.\n"); /* perform keylength tests */ - test_keylength_array(hProv, dssENH_keylength, TESTLEN(dssENH_keylength)); + test_keylength_array(hProv, dssENH_keylength, ARRAY_SIZE(dssENH_keylength)); result = CryptReleaseContext(hProv, 0); ok(result, "Expected release of CSP provider.\n"); @@ -398,7 +396,7 @@ static void test_keylength(void) ok(result, "Expected no errors.\n"); /* perform keylength tests */ - test_keylength_array(hProv, dssENH_keylength, TESTLEN(dssENH_keylength)); + test_keylength_array(hProv, dssENH_keylength, ARRAY_SIZE(dssENH_keylength)); result = CryptReleaseContext(hProv, 0); ok(result, "Expected release of CSP provider.\n"); @@ -982,7 +980,7 @@ static void test_verify_signature(void) } ok(result, "Failed to acquire CSP.\n"); - test_signhash_array(hProv, dssSign_data, TESTLEN(dssSign_data)); + test_signhash_array(hProv, dssSign_data, ARRAY_SIZE(dssSign_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -991,7 +989,7 @@ static void test_verify_signature(void) result = CryptAcquireContextA(&hProv, NULL, MS_DEF_DSS_DH_PROV_A, PROV_DSS_DH, 0); ok(result, "Failed to acquire CSP.\n"); - test_signhash_array(hProv, dssSign_data, TESTLEN(dssSign_data)); + test_signhash_array(hProv, dssSign_data, ARRAY_SIZE(dssSign_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1007,7 +1005,7 @@ static void test_verify_signature(void) } ok(result, "Failed to acquire CSP.\n"); - test_signhash_array(hProv, dssSign_data, TESTLEN(dssSign_data)); + test_signhash_array(hProv, dssSign_data, ARRAY_SIZE(dssSign_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1016,7 +1014,7 @@ static void test_verify_signature(void) result = CryptAcquireContextA(&hProv, NULL, MS_DEF_DH_SCHANNEL_PROV_A, PROV_DH_SCHANNEL, 0); ok(result, "Failed to acquire CSP.\n"); - test_signhash_array(hProv, dssSign_data, TESTLEN(dssSign_data)); + test_signhash_array(hProv, dssSign_data, ARRAY_SIZE(dssSign_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1376,7 +1374,7 @@ static void test_key_exchange(void) } ok(result, "Failed to acquire CSP.\n"); - test_keyExchange_baseDSS(hProv, baseDSSkey_data, TESTLEN(baseDSSkey_data)); + test_keyExchange_baseDSS(hProv, baseDSSkey_data, ARRAY_SIZE(baseDSSkey_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1386,7 +1384,7 @@ static void test_key_exchange(void) CRYPT_VERIFYCONTEXT); ok(result, "Failed to acquire CSP.\n"); - test_keyExchange_dssDH(hProv, dssDHkey_data, TESTLEN(dssDHkey_data)); + test_keyExchange_dssDH(hProv, dssDHkey_data, ARRAY_SIZE(dssDHkey_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1401,7 +1399,7 @@ static void test_key_exchange(void) } ok(result, "Failed to acquire CSP.\n"); - test_keyExchange_dssDH(hProv, dssDHkey_data, TESTLEN(dssDHkey_data)); + test_keyExchange_dssDH(hProv, dssDHkey_data, ARRAY_SIZE(dssDHkey_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1411,7 +1409,7 @@ static void test_key_exchange(void) CRYPT_VERIFYCONTEXT); ok(result, "Failed to acquire CSP.\n"); - test_keyExchange_dssDH(hProv, dssDHkey_data, TESTLEN(dssDHkey_data)); + test_keyExchange_dssDH(hProv, dssDHkey_data, ARRAY_SIZE(dssDHkey_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1421,9 +1419,9 @@ START_TEST(dssenh) { test_acquire_context(); test_keylength(); - test_hash(hash_data, TESTLEN(hash_data)); - test_data_encryption(encrypt_data, TESTLEN(encrypt_data)); - test_cipher_modes(ciphermode_data, TESTLEN(ciphermode_data)); + test_hash(hash_data, ARRAY_SIZE(hash_data)); + test_data_encryption(encrypt_data, ARRAY_SIZE(encrypt_data)); + test_cipher_modes(ciphermode_data, ARRAY_SIZE(ciphermode_data)); test_verify_signature(); test_key_exchange(); }

1 0

Michael Stefaniuc : winhttp: Use the more common ARRAY_SIZE spelling.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: ebc7959e171b4242e1fd9eaa36cc6173976625f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebc7959e171b4242e1fd9eaa… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:14 2018 +0200 winhttp: Use the more common ARRAY_SIZE spelling. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 56ec910..5e5b229 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -851,8 +851,6 @@ BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, LPCWSTR name, } -#define ARRAYSIZE(array) (sizeof(array) / sizeof((array)[0])) - static const WCHAR basicW[] = {'B','a','s','i','c',0}; static const WCHAR ntlmW[] = {'N','T','L','M',0}; static const WCHAR passportW[] = {'P','a','s','s','p','o','r','t',0}; @@ -867,11 +865,11 @@ static const struct } auth_schemes[] = { - { basicW, ARRAYSIZE(basicW) - 1, WINHTTP_AUTH_SCHEME_BASIC }, - { ntlmW, ARRAYSIZE(ntlmW) - 1, WINHTTP_AUTH_SCHEME_NTLM }, - { passportW, ARRAYSIZE(passportW) - 1, WINHTTP_AUTH_SCHEME_PASSPORT }, - { digestW, ARRAYSIZE(digestW) - 1, WINHTTP_AUTH_SCHEME_DIGEST }, - { negotiateW, ARRAYSIZE(negotiateW) - 1, WINHTTP_AUTH_SCHEME_NEGOTIATE } + { basicW, ARRAY_SIZE(basicW) - 1, WINHTTP_AUTH_SCHEME_BASIC }, + { ntlmW, ARRAY_SIZE(ntlmW) - 1, WINHTTP_AUTH_SCHEME_NTLM }, + { passportW, ARRAY_SIZE(passportW) - 1, WINHTTP_AUTH_SCHEME_PASSPORT }, + { digestW, ARRAY_SIZE(digestW) - 1, WINHTTP_AUTH_SCHEME_DIGEST }, + { negotiateW, ARRAY_SIZE(negotiateW) - 1, WINHTTP_AUTH_SCHEME_NEGOTIATE } }; static const unsigned int num_auth_schemes = sizeof(auth_schemes)/sizeof(auth_schemes[0]);

1 0

Michael Stefaniuc : iphlpapi: Avoid ARRAY_SIZE-like macros.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 3aa189ec63ac0f6c385c1c46f61eebb9ed1b7ef5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa189ec63ac0f6c385c1c46… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:17 2018 +0200 iphlpapi: Avoid ARRAY_SIZE-like macros. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 863edd3..8f6720e 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -349,14 +349,12 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) #elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_IFLIST) { int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_IFLIST, if_nametoindex(name)}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) - size_t needed; char *buf = NULL, *end; struct if_msghdr *ifm; struct if_data ifdata; - if(sysctl(mib, MIB_LEN, NULL, &needed, NULL, 0) == -1) + if(sysctl(mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0) == -1) { ERR ("failed to get size of iflist\n"); goto done; @@ -367,7 +365,7 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) ret = ERROR_OUTOFMEMORY; goto done; } - if(sysctl(mib, MIB_LEN, buf, &needed, NULL, 0) == -1) + if(sysctl(mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0) == -1) { ERR ("failed to get iflist\n"); goto done; @@ -514,12 +512,11 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) #elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) && (defined(HAVE_STRUCT_ICMPSTAT_ICPS_INHIST) || defined(HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST)) { int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) struct icmpstat icmp_stat; size_t needed = sizeof(icmp_stat); int i; - if(sysctl(mib, MIB_LEN, &icmp_stat, &needed, NULL, 0) != -1) + if(sysctl(mib, ARRAY_SIZE(mib), &icmp_stat, &needed, NULL, 0) != -1) { #ifdef HAVE_STRUCT_ICMPSTAT_ICPS_INHIST /*in stats */ @@ -922,7 +919,6 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) #elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && (defined(HAVE_STRUCT_IPSTAT_IPS_TOTAL) || defined(HAVE_STRUCT_IP_STATS_IPS_TOTAL)) { int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) int ip_ttl, ip_forwarding; #if defined(HAVE_STRUCT_IPSTAT_IPS_TOTAL) struct ipstat ip_stat; @@ -932,7 +928,7 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) size_t needed; needed = sizeof(ip_stat); - if(sysctl(mib, MIB_LEN, &ip_stat, &needed, NULL, 0) == -1) + if(sysctl(mib, ARRAY_SIZE(mib), &ip_stat, &needed, NULL, 0) == -1) { ERR ("failed to get ipstat\n"); return ERROR_NOT_SUPPORTED; @@ -1103,7 +1099,6 @@ DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS stats, DWORD family) #define TCPTV_REXMTMAX 128 #endif int mib[] = {CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_STATS}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) #define hz 1000 #if defined(HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT) struct tcpstat tcp_stat; @@ -1112,7 +1107,7 @@ DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS stats, DWORD family) #endif size_t needed = sizeof(tcp_stat); - if(sysctl(mib, MIB_LEN, &tcp_stat, &needed, NULL, 0) != -1) + if(sysctl(mib, ARRAY_SIZE(mib), &tcp_stat, &needed, NULL, 0) != -1) { stats->u.RtoAlgorithm = MIB_TCP_RTO_VANJ; stats->dwRtoMin = TCPTV_MIN; @@ -1286,12 +1281,11 @@ DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS stats, DWORD family) #elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && defined(HAVE_STRUCT_UDPSTAT_UDPS_IPACKETS) { int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) struct udpstat udp_stat; MIB_UDPTABLE *udp_table; size_t needed = sizeof(udp_stat); - if(sysctl(mib, MIB_LEN, &udp_stat, &needed, NULL, 0) != -1) + if(sysctl(mib, ARRAY_SIZE(mib), &udp_stat, &needed, NULL, 0) != -1) { stats->dwInDatagrams = udp_stat.udps_ipackets; stats->dwOutDatagrams = udp_stat.udps_opackets; @@ -1742,14 +1736,13 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO #elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) { int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) size_t needed; char *buf = NULL, *lim, *next; struct rt_msghdr *rtm; struct sockaddr_inarp *sinarp; struct sockaddr_dl *sdl; - if (sysctl (mib, MIB_LEN, NULL, &needed, NULL, 0) == -1) + if (sysctl (mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0) == -1) { ERR ("failed to get arp table\n"); ret = ERROR_NOT_SUPPORTED; @@ -1763,7 +1756,7 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO goto done; } - if (sysctl (mib, MIB_LEN, buf, &needed, NULL, 0) == -1) + if (sysctl (mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0) == -1) { ret = ERROR_NOT_SUPPORTED; goto done;

1 0

Michael Stefaniuc : user32: Use the more common ARRAY_SIZE spelling.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 2d8edab66d331f6ad1b2aed8560e5d4d9efa4573 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d8edab66d331f6ad1b2aed8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:13 2018 +0200 user32: Use the more common ARRAY_SIZE spelling. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/spy.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 749fc22..ddd90e6 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -39,7 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(message); #define SPY_MAX_MSGNUM WM_USER #define SPY_INDENT_UNIT 4 /* 4 spaces */ -#define ARRAYSIZE(a) ((sizeof(a) / sizeof((a)[0]))) #define DEBUG_SPY 0 @@ -1778,14 +1777,15 @@ static const USER_MSG richedit_array[] = { #undef USM static const CONTROL_CLASS cc_array[] = { - {WC_COMBOBOXEXW, comboex_array, ARRAYSIZE(comboex_array) }, - {WC_PROPSHEETW, propsht_array, ARRAYSIZE(propsht_array) }, - {REBARCLASSNAMEW, rebar_array, ARRAYSIZE(rebar_array) }, - {TOOLBARCLASSNAMEW, toolbar_array, ARRAYSIZE(toolbar_array) }, - {TOOLTIPS_CLASSW, tooltips_array, ARRAYSIZE(tooltips_array) }, - {UPDOWN_CLASSW, updown_array, ARRAYSIZE(updown_array) }, - {RICHEDIT_CLASS20W, richedit_array, ARRAYSIZE(richedit_array) }, - {0, 0, 0} }; + {WC_COMBOBOXEXW, comboex_array, ARRAY_SIZE(comboex_array)}, + {WC_PROPSHEETW, propsht_array, ARRAY_SIZE(propsht_array)}, + {REBARCLASSNAMEW, rebar_array, ARRAY_SIZE(rebar_array)}, + {TOOLBARCLASSNAMEW, toolbar_array, ARRAY_SIZE(toolbar_array)}, + {TOOLTIPS_CLASSW, tooltips_array, ARRAY_SIZE(tooltips_array)}, + {UPDOWN_CLASSW, updown_array, ARRAY_SIZE(updown_array)}, + {RICHEDIT_CLASS20W, richedit_array, ARRAY_SIZE(richedit_array)}, + {0, 0, 0} +}; /************************************************************************/ @@ -2278,7 +2278,7 @@ const char *SPY_GetVKeyName(WPARAM wParam) */ static const SPY_NOTIFY *SPY_Bsearch_Notify( UINT code) { - int low = 0, high = ARRAYSIZE(spnfy_array) - 1; + int low = 0, high = ARRAY_SIZE(spnfy_array) - 1; while (low <= high) {

1 0

Michael Stefaniuc : wininet: Use the more common ARRAY_SIZE spelling.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: d870d4105d3c4024bd0e09c8e1ac9042d57268c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d870d4105d3c4024bd0e09c8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:15 2018 +0200 wininet: Use the more common ARRAY_SIZE spelling. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b91dbdf..c699c5b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -145,8 +145,6 @@ static const WCHAR emptyW[] = {0}; #define COLLECT_TIME 60000 -#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) - struct HttpAuthInfo { LPWSTR scheme; @@ -810,12 +808,12 @@ static inline BOOL is_basic_auth_value( LPCWSTR pszAuthValue, LPWSTR *pszRealm ) static const WCHAR szBasic[] = {'B','a','s','i','c'}; /* Note: not nul-terminated */ static const WCHAR szRealm[] = {'r','e','a','l','m'}; /* Note: not nul-terminated */ BOOL is_basic; - is_basic = !strncmpiW(pszAuthValue, szBasic, ARRAYSIZE(szBasic)) && - ((pszAuthValue[ARRAYSIZE(szBasic)] == ' ') || !pszAuthValue[ARRAYSIZE(szBasic)]); + is_basic = !strncmpiW(pszAuthValue, szBasic, ARRAY_SIZE(szBasic)) && + ((pszAuthValue[ARRAY_SIZE(szBasic)] == ' ') || !pszAuthValue[ARRAY_SIZE(szBasic)]); if (is_basic && pszRealm) { LPCWSTR token; - LPCWSTR ptr = &pszAuthValue[ARRAYSIZE(szBasic)]; + LPCWSTR ptr = &pszAuthValue[ARRAY_SIZE(szBasic)]; LPCWSTR realm; ptr++; *pszRealm=NULL; @@ -825,8 +823,8 @@ static inline BOOL is_basic_auth_value( LPCWSTR pszAuthValue, LPWSTR *pszRealm ) realm = ptr; while (*realm == ' ') realm++; - if(!strncmpiW(realm, szRealm, ARRAYSIZE(szRealm)) && - (realm[ARRAYSIZE(szRealm)] == ' ' || realm[ARRAYSIZE(szRealm)] == '=')) + if(!strncmpiW(realm, szRealm, ARRAY_SIZE(szRealm)) && + (realm[ARRAY_SIZE(szRealm)] == ' ' || realm[ARRAY_SIZE(szRealm)] == '=')) { token++; while (*token == ' ') @@ -1566,9 +1564,9 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin ) { signed char in[4]; - if (base64[0] >= ARRAYSIZE(HTTP_Base64Dec) || + if (base64[0] >= ARRAY_SIZE(HTTP_Base64Dec) || ((in[0] = HTTP_Base64Dec[base64[0]]) == -1) || - base64[1] >= ARRAYSIZE(HTTP_Base64Dec) || + base64[1] >= ARRAY_SIZE(HTTP_Base64Dec) || ((in[1] = HTTP_Base64Dec[base64[1]]) == -1)) { WARN("invalid base64: %s\n", debugstr_w(base64)); @@ -1580,7 +1578,7 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin ) if ((base64[2] == '=') && (base64[3] == '=')) break; - if (base64[2] > ARRAYSIZE(HTTP_Base64Dec) || + if (base64[2] > ARRAY_SIZE(HTTP_Base64Dec) || ((in[2] = HTTP_Base64Dec[base64[2]]) == -1)) { WARN("invalid base64: %s\n", debugstr_w(&base64[2])); @@ -1592,7 +1590,7 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin ) if (base64[3] == '=') break; - if (base64[3] > ARRAYSIZE(HTTP_Base64Dec) || + if (base64[3] > ARRAY_SIZE(HTTP_Base64Dec) || ((in[3] = HTTP_Base64Dec[base64[3]]) == -1)) { WARN("invalid base64: %s\n", debugstr_w(&base64[3]));

1 0

Zebediah Figura : qcap: Use CBaseFilter::FindPin().
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: ec290906a08b69ff23e119966b30b7b0d2b9f16d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec290906a08b69ff23e11996… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 00:34:43 2018 +0200 qcap: Use CBaseFilter::FindPin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 9 +-------- dlls/qcap/avico.c | 9 +-------- dlls/qcap/smartteefilter.c | 22 +--------------------- dlls/qcap/vfwcapture.c | 9 +-------- 4 files changed, 4 insertions(+), 45 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 1187d4a..3674bbb 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -152,13 +152,6 @@ static HRESULT WINAPI AudioRecord_Run(IBaseFilter *iface, REFERENCE_TIME tStart) return E_NOTIMPL; } -static HRESULT WINAPI AudioRecord_FindPin(IBaseFilter *iface, LPCWSTR Id, IPin **ppPin) -{ - AudioRecord *This = impl_from_IBaseFilter(iface); - FIXME("(%p)->(%s, %p): stub\n", This, debugstr_w(Id), ppPin); - return E_NOTIMPL; -} - static const IBaseFilterVtbl AudioRecordVtbl = { AudioRecord_QueryInterface, AudioRecord_AddRef, @@ -171,7 +164,7 @@ static const IBaseFilterVtbl AudioRecordVtbl = { BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - AudioRecord_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 32f3b56..d5a44b2 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -211,13 +211,6 @@ static HRESULT WINAPI AVICompressor_Run(IBaseFilter *iface, REFERENCE_TIME tStar return S_OK; } -static HRESULT WINAPI AVICompressor_FindPin(IBaseFilter *iface, LPCWSTR Id, IPin **ppPin) -{ - AVICompressor *This = impl_from_IBaseFilter(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(Id), ppPin); - return VFW_E_NOT_FOUND; -} - static HRESULT WINAPI AVICompressor_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *pInfo) { AVICompressor *This = impl_from_IBaseFilter(iface); @@ -244,7 +237,7 @@ static const IBaseFilterVtbl AVICompressorVtbl = { BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - AVICompressor_FindPin, + BaseFilterImpl_FindPin, AVICompressor_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, AVICompressor_QueryVendorInfo diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 220f5eb..f052e2d 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -180,26 +180,6 @@ static HRESULT WINAPI SmartTeeFilter_Run(IBaseFilter *iface, REFERENCE_TIME tSta return hr; } -static HRESULT WINAPI SmartTeeFilter_FindPin(IBaseFilter *iface, LPCWSTR Id, IPin **ppPin) -{ - SmartTeeFilter *This = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%s, %p)\n", This, debugstr_w(Id), ppPin); - if (lstrcmpW(Id, This->input->pin.pinInfo.achName) == 0) { - *ppPin = &This->input->pin.IPin_iface; - IPin_AddRef(*ppPin); - return S_OK; - } else if (lstrcmpW(Id, This->capture->pin.pinInfo.achName) == 0) { - *ppPin = &This->capture->pin.IPin_iface; - IPin_AddRef(*ppPin); - return S_OK; - } else if (lstrcmpW(Id, This->preview->pin.pinInfo.achName) == 0) { - *ppPin = &This->preview->pin.IPin_iface; - IPin_AddRef(*ppPin); - return S_OK; - } - return VFW_E_NOT_FOUND; -} - static const IBaseFilterVtbl SmartTeeFilterVtbl = { SmartTeeFilter_QueryInterface, SmartTeeFilter_AddRef, @@ -212,7 +192,7 @@ static const IBaseFilterVtbl SmartTeeFilterVtbl = { BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - SmartTeeFilter_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index fd35b26..ca804fe 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -298,13 +298,6 @@ static HRESULT WINAPI VfwCapture_Run(IBaseFilter * iface, REFERENCE_TIME tStart) return qcap_driver_run(This->driver_info, &This->filter.state); } -/** IBaseFilter methods **/ -static HRESULT WINAPI VfwCapture_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) -{ - FIXME("(%s, %p) - stub\n", debugstr_w(Id), ppPin); - return E_NOTIMPL; -} - static const IBaseFilterVtbl VfwCapture_Vtbl = { VfwCapture_QueryInterface, @@ -318,7 +311,7 @@ static const IBaseFilterVtbl VfwCapture_Vtbl = BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - VfwCapture_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo

1 0