January 2015 - Wine-Commits

Michael Stefaniuc : mciwave: Remove an unused assigment (PVS-Studio).
by Alexandre Julliard Jan. 16, 2015

Jan. 16, 2015

Module: wine Branch: master Commit: aa808571e6c5d0c83b7444e6eb078b504ddc25bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa808571e6c5d0c83b7444e6e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 16 12:19:52 2015 +0100 mciwave: Remove an unused assigment (PVS-Studio). --- dlls/mciwave/mciwave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index c7992fb..fd4d6f6 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -1118,7 +1118,7 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt TRACE("Recording (normalized) from byte=%u for %u bytes\n", wmw->dwPosition, end - wmw->dwPosition); - dwRet = waveInStart(wmw->hWave); + waveInStart(wmw->hWave); if (hEvent) SetEvent(hEvent);

1 0

Bruno Jesus : iphlpapi: Set 0.0.0.0 as the IP and mask of disconnected interfaces.
by Alexandre Julliard Jan. 16, 2015

Jan. 16, 2015

Module: wine Branch: master Commit: 317fd11e85157e0b9eaca1d001914706072d3f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=317fd11e85157e0b9eaca1d00… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 15 10:13:34 2015 -0200 iphlpapi: Set 0.0.0.0 as the IP and mask of disconnected interfaces. --- dlls/iphlpapi/iphlpapi_main.c | 6 ++++++ dlls/iphlpapi/tests/iphlpapi.c | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 59f3593..d2f36fe 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -604,6 +604,12 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) } } } + /* If no IP was found it probably means that the interface is not + * configured. In this case we have to return a zeroed IP and mask. */ + if (firstIPAddr) { + strcpy(ptr->IpAddressList.IpAddress.String, "0.0.0.0"); + strcpy(ptr->IpAddressList.IpMask.String, "0.0.0.0"); + } /* Find first router through this interface, which we'll assume * is the default gateway for this adapter */ for (i = 0; i < routeTable->dwNumEntries; i++) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index b2d81c0..14bbc5d 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1118,12 +1118,20 @@ static void testGetAdaptersInfo(void) if (apiReturn == ERROR_NO_DATA) ; /* no adapter's, that's okay */ else if (apiReturn == ERROR_BUFFER_OVERFLOW) { - PIP_ADAPTER_INFO buf = HeapAlloc(GetProcessHeap(), 0, len); + PIP_ADAPTER_INFO ptr, buf = HeapAlloc(GetProcessHeap(), 0, len); apiReturn = pGetAdaptersInfo(buf, &len); ok(apiReturn == NO_ERROR, "GetAdaptersInfo(buf, &dwSize) returned %d, expected NO_ERROR\n", apiReturn); + ptr = buf; + while (ptr) { + ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP must be present\n"); + ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); + trace("Adapter '%s', IP %s, Mask %s\n", ptr->AdapterName, + ptr->IpAddressList.IpAddress.String, ptr->IpAddressList.IpMask.String); + ptr = ptr->Next; + } HeapFree(GetProcessHeap(), 0, buf); } }

1 0

Michael Stefaniuc : mstask/tests: Remove an unused assignment (PVS-Studio) .
by Alexandre Julliard Jan. 16, 2015

Jan. 16, 2015

Module: wine Branch: master Commit: 7c60a31c192e4e5874d3b312d2607108553e6b88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c60a31c192e4e5874d3b312d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 16 12:14:16 2015 +0100 mstask/tests: Remove an unused assignment (PVS-Studio). --- dlls/mstask/tests/task_trigger.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index 0b64211..0a68a19 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -282,7 +282,6 @@ static void test_SetTrigger_GetTrigger(void) normal_trigger_state.wStartHour = 24; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); - normal_trigger_state.wStartHour = 3; normal_trigger_state.wStartHour = 60; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres);

1 0

Huw Davies : user32/tests: Add tests for setting and getting the background brush.
by Alexandre Julliard Jan. 16, 2015

Jan. 16, 2015

Module: wine Branch: master Commit: 14f7fd4e23a714849bcf269d0e7d01bf62f4c060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f7fd4e23a714849bcf269d0… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 16 11:10:38 2015 +0000 user32/tests: Add tests for setting and getting the background brush. --- dlls/user32/tests/menu.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 575d786..62c3229 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2976,6 +2976,7 @@ static void test_menu_setmenuinfo(void) MENUITEMINFOA mii = { sizeof(MENUITEMINFOA) }; BOOL ret; DWORD gle; + HBRUSH brush; if (!pGetMenuInfo || !pSetMenuInfo) { @@ -3091,6 +3092,31 @@ static void test_menu_setmenuinfo(void) ok( ret, "GetMenuInfo() should have succeeded\n"); ok( gle == 0xdeadbeef, "GetMenuInfo() error got %u\n", gle); ok( !(mi.dwStyle & MNS_NOCHECK), "menustyle was not expected to have the MNS_NOCHECK flag\n"); + + /* test background brush */ + mi.cbSize = sizeof(mi); + mi.fMask = MIM_BACKGROUND; + ret = pGetMenuInfo( hmenu, &mi ); + ok( ret, "GetMenuInfo() should have succeeded\n" ); + ok( mi.hbrBack == NULL, "got %p\n", mi.hbrBack ); + + brush = CreateSolidBrush( RGB(0xff, 0, 0) ); + mi.hbrBack = brush; + ret = pSetMenuInfo( hmenu, &mi ); + ok( ret, "SetMenuInfo() should have succeeded\n" ); + mi.hbrBack = NULL; + ret = pGetMenuInfo( hmenu, &mi ); + ok( ret, "GetMenuInfo() should have succeeded\n" ); + ok( mi.hbrBack == brush, "got %p original %p\n", mi.hbrBack, brush ); + + mi.hbrBack = NULL; + ret = pSetMenuInfo( hmenu, &mi ); + ok( ret, "SetMenuInfo() should have succeeded\n" ); + ret = pGetMenuInfo( hmenu, &mi ); + ok( ret, "GetMenuInfo() should have succeeded\n" ); + ok( mi.hbrBack == NULL, "got %p\n", mi.hbrBack ); + DeleteObject( brush ); + /* clean up */ DestroyMenu( hsubmenu); DestroyMenu( hmenu);

1 0

Huw Davies : user32: Actually use the menu's background brush.
by Alexandre Julliard Jan. 16, 2015

Jan. 16, 2015

Module: wine Branch: master Commit: 9650f21b2db51ba85e578ebfefb84e4444c75145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9650f21b2db51ba85e578ebfe… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 16 11:10:39 2015 +0000 user32: Actually use the menu's background brush. --- dlls/user32/menu.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index f0eb66b..847540b 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1737,15 +1737,17 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, */ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) { - HBRUSH hPrevBrush = 0; + HBRUSH hPrevBrush = 0, brush = GetSysColorBrush( COLOR_MENU ); RECT rect; + POPUPMENU *menu = MENU_GetMenu( hmenu ); TRACE("wnd=%p dc=%p menu=%p\n", hwnd, hdc, hmenu); GetClientRect( hwnd, &rect ); - if((hPrevBrush = SelectObject( hdc, GetSysColorBrush(COLOR_MENU) )) - && (SelectObject( hdc, get_menu_font(FALSE)))) + if (menu && menu->hbrBack) brush = menu->hbrBack; + if ((hPrevBrush = SelectObject( hdc, brush )) + && SelectObject( hdc, get_menu_font(FALSE) )) { HPEN hPrevPen; @@ -1754,7 +1756,6 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) hPrevPen = SelectObject( hdc, GetStockObject( NULL_PEN ) ); if( hPrevPen ) { - POPUPMENU *menu; BOOL flat_menu = FALSE; SystemParametersInfoW (SPI_GETFLATMENU, 0, &flat_menu, 0); @@ -1763,7 +1764,7 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) else DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT); - if( (menu = MENU_GetMenu( hmenu ))) + if (menu) { TRACE("hmenu %p Style %08x\n", hmenu, menu->dwStyle); /* draw menu items */

1 0

Qian Hong : kernel32: Make SetUnhandledExceptionFilter hotpatchable.
by Alexandre Julliard Jan. 16, 2015

Jan. 16, 2015

Module: wine Branch: master Commit: caa0829d564310a126ad52a58865dc53f48e77e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caa0829d564310a126ad52a58… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jan 16 01:50:18 2015 +0800 kernel32: Make SetUnhandledExceptionFilter hotpatchable. --- dlls/kernel32/except.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index 77ec91d..bd50e88 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -461,7 +461,7 @@ LONG WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS epointers) /*********************************************************************** * SetUnhandledExceptionFilter (KERNEL32.@) */ -LPTOP_LEVEL_EXCEPTION_FILTER WINAPI SetUnhandledExceptionFilter( +LPTOP_LEVEL_EXCEPTION_FILTER WINAPI DECLSPEC_HOTPATCH SetUnhandledExceptionFilter( LPTOP_LEVEL_EXCEPTION_FILTER filter ) { LPTOP_LEVEL_EXCEPTION_FILTER old = top_filter;

1 0

Qian Hong : ntdll: Make RtlAddVectoredExceptionHandler hotpatchable.
by Alexandre Julliard Jan. 16, 2015

Jan. 16, 2015

Module: wine Branch: master Commit: cffd86f195383770fccfaaa9ff5766e73fd3f0c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cffd86f195383770fccfaaa9f… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jan 16 02:07:39 2015 +0800 ntdll: Make RtlAddVectoredExceptionHandler hotpatchable. --- dlls/ntdll/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 5b4abb6..daca45a 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -286,7 +286,7 @@ ULONG WINAPI RtlRemoveVectoredContinueHandler( PVOID handler ) /******************************************************************* * RtlAddVectoredExceptionHandler (NTDLL.@) */ -PVOID WINAPI RtlAddVectoredExceptionHandler( ULONG first, PVECTORED_EXCEPTION_HANDLER func ) +PVOID WINAPI DECLSPEC_HOTPATCH RtlAddVectoredExceptionHandler( ULONG first, PVECTORED_EXCEPTION_HANDLER func ) { return add_vectored_handler( &vectored_exception_handlers, first, func ); }

1 0

Michael Stefaniuc : gdiplus/tests: Actually test a GdipCreateFromHDC call (PVS-Studio).
by Alexandre Julliard Jan. 16, 2015

Jan. 16, 2015

Module: wine Branch: master Commit: 0c91032f3a232e0cb2ae53fd68729fe1ec6aaad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c91032f3a232e0cb2ae53fd6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 16 12:13:03 2015 +0100 gdiplus/tests: Actually test a GdipCreateFromHDC call (PVS-Studio). --- dlls/gdiplus/tests/graphics.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index c9cc463..8ce372b 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3769,6 +3769,7 @@ static void test_font_height_scaling(void) hdc = CreateCompatibleDC(0); status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); status = GdipGetDpiY(graphics, &dpi); expect(Ok, status);

1 0

Qian Hong : ole32: Make CoUninitialize and OleUninitialize hotpatchable.
by Alexandre Julliard Jan. 16, 2015

Jan. 16, 2015

Module: wine Branch: master Commit: a940718a4d77a2c9e1b2f14044d5ff3cd7fdfbcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a940718a4d77a2c9e1b2f1404… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jan 16 02:07:50 2015 +0800 ole32: Make CoUninitialize and OleUninitialize hotpatchable. --- dlls/ole32/compobj.c | 2 +- dlls/ole32/ole2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index da466c4..82cc77d 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1948,7 +1948,7 @@ HRESULT WINAPI CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit) * SEE ALSO * CoInitializeEx */ -void WINAPI CoUninitialize(void) +void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) { struct oletls * info = COM_CurrentInfo(); LONG lCOMRefCnt; diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index f6c6c10..b9cc1f0 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -231,7 +231,7 @@ HRESULT WINAPI OleInitialize(LPVOID reserved) /****************************************************************************** * OleUninitialize [OLE32.@] */ -void WINAPI OleUninitialize(void) +void WINAPI DECLSPEC_HOTPATCH OleUninitialize(void) { TRACE("()\n");

1 0

André Hentschel : Acutally add German translation for WWN 382
by Jeremy Newman Jan. 16, 2015

Jan. 16, 2015

Module: website Branch: master Commit: 8d679a57e4e162063a6fc39f746f6b395bfadc1f URL: http://source.winehq.org/git/website.git/?a=commit;h=8d679a57e4e162063a6fc3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 16 19:08:08 2015 +0100 Acutally add German translation for WWN 382 --- news/de/2014121901.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/news/de/2014121901.xml b/news/de/2014121901.xml index ad09b97..3be6b7b 100644 --- a/news/de/2014121901.xml +++ b/news/de/2014121901.xml @@ -1,11 +1,11 @@ <news> - <date>December 19, 2014</date> - <title>World Wine News Issue 382</title> + <date>19. Dezember 2014</date> + <title>World Wine News Ausgabe 382</title> <body> -<a href="{$root}/wwn/382">WWN Issue 382</a> was released today. +<a href="{$root}/wwn/382">WWN Ausgabe 382</a> wurde heute veröffentlicht. <ul> <li><a href="{$root}/wwn/382#Donation requests">Donation requests</a></li> -<li><a href="{$root}/wwn/382#Weekly AppDB/Bugzilla Status Changes">Weekly AppDB/Bugzilla Status Changes</a></li> +<li><a href="{$root}/wwn/382#Weekly AppDB/Bugzilla Status Changes">Wöchentliche AppDB/Bugzilla Statusänderungen</a></li> </ul> </body> </news>

1 0