wine-commits July 2018

wine-commits@winehq.org

2 participants
405 discussions

Alistair Leslie-Hughes : user32: Support SPI_S/ GETAUDIODESCRIPTION in SystemParametersInfo.
by Alexandre Julliard 06 Jul '18

06 Jul '18

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 06 Jul '18

06 Jul '18

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

Alexandre Julliard : user32/tests: Remove a duplicate todo test.
by Alexandre Julliard 06 Jul '18

06 Jul '18

Module: wine Branch: master Commit: 9d3adf687bcb4e0cdf403bdf3712c368e9805ffe URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d3adf687bcb4e0cdf403bdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 6 10:10:34 2018 +0200 user32/tests: Remove a duplicate todo test. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 45 +-------------------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index cb918fa..80c699f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -774,37 +774,6 @@ static const struct message WmCreateInvisibleMaxPopupSeq[] = { { 0 } }; /* ShowWindow(SW_SHOWMAXIMIZED) for a resized not visible popup window */ -static const struct message WmShowMaxPopupResizedSeq_todo[] = { - { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, - { WM_GETMINMAXINFO, sent }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED }, - { WM_NCCALCSIZE, sent|wparam, TRUE }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, - { HCBT_ACTIVATE, hook }, - { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, - { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, - { WM_NCPAINT, sent|wparam|optional, 1 }, - { WM_ERASEBKGND, sent|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, - { WM_ACTIVATEAPP, sent|wparam, 1 }, - { WM_NCACTIVATE, sent }, - { WM_ACTIVATE, sent|wparam, 1 }, - { HCBT_SETFOCUS, hook }, - { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, - { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, - { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, - { WM_GETTEXT, sent|optional }, - { WM_NCPAINT, sent|wparam|optional, 1 }, - { WM_ERASEBKGND, sent|optional }, - { WM_WINDOWPOSCHANGED, sent }, - /* WinNT4.0 sends WM_MOVE */ - { WM_MOVE, sent|defwinproc|optional }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, - { 0 } -}; static const struct message WmShowMaxPopupResizedSeq[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, { WM_GETMINMAXINFO, sent }, @@ -827,7 +796,7 @@ static const struct message WmShowMaxPopupResizedSeq[] = { { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { WM_GETTEXT, sent|optional }, - { WM_NCPAINT, sent|optional }, /* We'll check WM_NCPAINT behaviour in another test */ + { WM_NCPAINT, sent|wparam|optional, 1 }, { WM_ERASEBKGND, sent|optional }, { WM_WINDOWPOSCHANGED, sent }, /* WinNT4.0 sends WM_MOVE */ @@ -4752,18 +4721,6 @@ static void test_showwindow(void) DestroyWindow(hwnd); flush_sequence(); - /* Test again, this time the NC_PAINT message */ - hwnd = CreateWindowExA(0, "TestWindowClass", "Test popup", WS_POPUP | WS_MAXIMIZE, - 100, 100, 200, 200, 0, 0, 0, NULL); - ok (hwnd != 0, "Failed to create popup window\n"); - SetWindowPos(hwnd, 0, 10, 10, 200, 200, SWP_NOZORDER | SWP_NOACTIVATE); - flush_sequence(); - ShowWindow(hwnd, SW_SHOWMAXIMIZED); - ok_sequence(WmShowMaxPopupResizedSeq_todo, - "ShowWindow(SW_SHOWMAXIMIZED):invisible maximized and resized popup TODO", FALSE); - DestroyWindow(hwnd); - flush_sequence(); - /* Test 2: * 1. Create invisible maximized popup window. * 2. Show it maximized.

1 0

Alexandre Julliard : comctl32/taskdialog: Fix pointer cast warnings.
by Alexandre Julliard 06 Jul '18

06 Jul '18

Module: wine Branch: master Commit: 35289f81a469d0280f40d91475473df9bdd6f8fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=35289f81a469d0280f40d914… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 6 20:51:07 2018 +0200 comctl32/taskdialog: Fix pointer cast warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 42d50a9..ee3b273 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -488,7 +488,7 @@ static void taskdialog_add_radio_buttons(struct taskdialog_info *dialog_info) textW = taskdialog_gettext(dialog_info, TRUE, taskconfig->pRadioButtons[i].pszButtonText); dialog_info->radio_buttons[i] = CreateWindowW(WC_BUTTONW, textW, i == 0 ? style | WS_GROUP : style, 0, 0, 0, 0, dialog_info->hwnd, - (HMENU)taskconfig->pRadioButtons[i].nButtonID, 0, NULL); + ULongToHandle(taskconfig->pRadioButtons[i].nButtonID), 0, NULL); SendMessageW(dialog_info->radio_buttons[i], WM_SETFONT, (WPARAM)dialog_info->font, 0); Free(textW); } @@ -514,7 +514,7 @@ static void taskdialog_add_command_links(struct taskdialog_info *dialog_info) style = is_default ? default_style | BS_DEFCOMMANDLINK : default_style | BS_COMMANDLINK; textW = taskdialog_gettext(dialog_info, TRUE, taskconfig->pButtons[i].pszButtonText); dialog_info->command_links[i] = CreateWindowW(WC_BUTTONW, textW, style, 0, 0, 0, 0, dialog_info->hwnd, - (HMENU)taskconfig->pButtons[i].nButtonID, 0, NULL); + ULongToHandle(taskconfig->pButtons[i].nButtonID), 0, NULL); SendMessageW(dialog_info->command_links[i], WM_SETFONT, (WPARAM)dialog_info->font, 0); Free(textW);

1 0

Alex Henrie : gdi32: Add DECLSPEC_HOTPATCH to GetDIBits.
by Alexandre Julliard 06 Jul '18

06 Jul '18

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

Zebediah Figura : amstream: Use CBaseFilter::FindPin().
by Alexandre Julliard 06 Jul '18

06 Jul '18

Module: wine Branch: master Commit: fbbde62103c58eb6b41b89de44036dc5d6055d71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbbde62103c58eb6b41b89de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 00:34:44 2018 +0200 amstream: Use CBaseFilter::FindPin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastreamfilter.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 5abcb2f..8636718 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -159,9 +159,8 @@ static HRESULT WINAPI MediaStreamFilterImpl_EnumPins(IMediaStreamFilter *iface, static HRESULT WINAPI MediaStreamFilterImpl_FindPin(IMediaStreamFilter *iface, LPCWSTR id, IPin **pin) { - FIXME("(%p)->(%s,%p): Stub!\n", iface, debugstr_w(id), pin); - - return E_NOTIMPL; + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + return BaseFilterImpl_FindPin(&This->filter.IBaseFilter_iface, id, pin); } static HRESULT WINAPI MediaStreamFilterImpl_QueryFilterInfo(IMediaStreamFilter *iface, FILTER_INFO *info)

1 0

Zebediah Figura : qcap: Use CBaseFilter::FindPin().
by Alexandre Julliard 06 Jul '18

06 Jul '18

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

Zebediah Figura : strmbase: Use CBaseFilter::FindPin().
by Alexandre Julliard 06 Jul '18

06 Jul '18

Module: wine Branch: master Commit: d69a26b21b4bd0c1b95cd19f4885bb0cec821404 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d69a26b21b4bd0c1b95cd19f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 00:34:42 2018 +0200 strmbase: Use CBaseFilter::FindPin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 9 --------- include/wine/strmbase.h | 1 - 2 files changed, 10 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 139c581..4d7069d 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -427,15 +427,6 @@ HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *iface, IBaseFilter *s /** IBaseFilter implementation **/ -HRESULT WINAPI TransformFilterImpl_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) -{ - TransformFilter *This = impl_from_IBaseFilter(iface); - - TRACE("(%p/%p)->(%s,%p)\n", This, iface, debugstr_w(Id), ppPin); - - return E_NOTIMPL; -} - static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) { BaseInputPin* This = impl_BaseInputPin_from_IPin(iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index b07dfa2..83a9084 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -260,7 +260,6 @@ ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface); HRESULT WINAPI TransformFilterImpl_Stop(IBaseFilter * iface); HRESULT WINAPI TransformFilterImpl_Pause(IBaseFilter * iface); HRESULT WINAPI TransformFilterImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart); -HRESULT WINAPI TransformFilterImpl_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin); HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *iface, IBaseFilter *sender, Quality qm); HRESULT TransformFilter_Construct( const IBaseFilterVtbl *filterVtbl, LONG filter_size, const CLSID* pClsid, const TransformFilterFuncTable* pFuncsTable, IBaseFilter ** ppTransformFilter);

1 0

Zebediah Figura : quartz: Use CBaseFilter::FindPin().
by Alexandre Julliard 06 Jul '18

06 Jul '18

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

Zebediah Figura : strmbase: Avoid leaking pFilter in CBaseFilter::FindPin( ).
by Alexandre Julliard 06 Jul '18

06 Jul '18

Module: wine Branch: master Commit: bf8637e42b07597e36baca8dc4baebd7aabd9960 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf8637e42b07597e36baca8d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 20:02:39 2018 +0200 strmbase: Avoid leaking pFilter in CBaseFilter::FindPin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/filter.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 7d33f80..9b14cf0 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -160,6 +160,7 @@ HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin IPin_Release(pin); return hr; } + if (info.pFilter) IBaseFilter_Release(info.pFilter); if (!strcmpW(id, info.achName)) {

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
41
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 July 2018