Plus a bonus whitespace fix patch.
From: Michael Stefaniuc mstefani@winehq.org
--- dlls/gdiplus/tests/customlinecap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index 4ff090ddce0..6aecf1c7dc4 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -395,13 +395,13 @@ static void test_strokecap(void) stat = GdipCreateCustomLineCap(NULL, path, LineCapFlat, 0.0, &cap); ok(stat == Ok, "Failed to create cap, %d\n", stat);
- stat = GdipSetCustomLineCapStrokeCaps((GpCustomLineCap*)cap, LineCapSquare, LineCapFlat); + stat = GdipSetCustomLineCapStrokeCaps(cap, LineCapSquare, LineCapFlat); ok(stat == Ok, "Unexpected return code, %d\n", stat);
- stat = GdipSetCustomLineCapStrokeCaps((GpCustomLineCap*)cap, LineCapSquareAnchor, LineCapFlat); + stat = GdipSetCustomLineCapStrokeCaps(cap, LineCapSquareAnchor, LineCapFlat); ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat);
- stat = GdipSetCustomLineCapStrokeCaps((GpCustomLineCap*)cap, LineCapFlat, LineCapSquareAnchor); + stat = GdipSetCustomLineCapStrokeCaps(cap, LineCapFlat, LineCapSquareAnchor); ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); GdipDeleteCustomLineCap(cap); GdipDeletePath(path);
From: Michael Stefaniuc mstefani@winehq.org
--- dlls/windows.gaming.input/async.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/windows.gaming.input/async.c b/dlls/windows.gaming.input/async.c index c41abe96cd1..a30004f2d24 100644 --- a/dlls/windows.gaming.input/async.c +++ b/dlls/windows.gaming.input/async.c @@ -442,7 +442,7 @@ static HRESULT WINAPI async_bool_put_Completed( IAsyncOperation_boolean *iface, IWineAsyncOperationCompletedHandler *handler = (IWineAsyncOperationCompletedHandler *)bool_handler; struct async_bool *impl = impl_from_IAsyncOperation_boolean( iface ); TRACE( "iface %p, handler %p.\n", iface, handler ); - return IWineAsyncInfoImpl_put_Completed( impl->IWineAsyncInfoImpl_inner, (IWineAsyncOperationCompletedHandler *)handler ); + return IWineAsyncInfoImpl_put_Completed( impl->IWineAsyncInfoImpl_inner, handler ); }
static HRESULT WINAPI async_bool_get_Completed( IAsyncOperation_boolean *iface, IAsyncOperationCompletedHandler_boolean **bool_handler ) @@ -450,7 +450,7 @@ static HRESULT WINAPI async_bool_get_Completed( IAsyncOperation_boolean *iface, IWineAsyncOperationCompletedHandler **handler = (IWineAsyncOperationCompletedHandler **)bool_handler; struct async_bool *impl = impl_from_IAsyncOperation_boolean( iface ); TRACE( "iface %p, handler %p.\n", iface, handler ); - return IWineAsyncInfoImpl_get_Completed( impl->IWineAsyncInfoImpl_inner, (IWineAsyncOperationCompletedHandler **)handler ); + return IWineAsyncInfoImpl_get_Completed( impl->IWineAsyncInfoImpl_inner, handler ); }
static HRESULT WINAPI async_bool_GetResults( IAsyncOperation_boolean *iface, BOOLEAN *results )
From: Michael Stefaniuc mstefani@winehq.org
--- dlls/wow64win/user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 59c3251fe92..73854225b7f 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -4357,6 +4357,6 @@ NTSTATUS WINAPI wow64_NtUserDisplayConfigGetDeviceInfo( UINT *args )
NTSTATUS WINAPI wow64___wine_send_input( UINT *args ) { - ERR( "not supported\n "); + ERR( "not supported\n" ); return 0; }
This merge request was approved by Rémi Bernon.