May 2014 - Wine-Commits - list.winehq.org

Ken Thomases : winemac: Fix a memory leak if posting WM_DROPFILES fails.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 757c57634e567b816723b67a52529a0863aa6cd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=757c57634e567b816723b67a5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 14 20:15:30 2014 -0500 winemac: Fix a memory leak if posting WM_DROPFILES fails. --- dlls/winemac.drv/dragdrop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index 612a868..ad0bc8c 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -466,8 +466,8 @@ BOOL query_drag_drop(macdrv_query* query) ret = PostMessageW(hwnd, WM_DROPFILES, (WPARAM)hdrop, 0L); /* hdrop is owned by the message and freed when the recipient calls DragFinish(). */ } - else - GlobalFree(hdrop); + + if (!ret) GlobalFree(hdrop); } }

1 0

Henri Verbeet : d2d1: Add the ID2D1SolidColorBrush interface.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: a4677f8670b0bcebfeec8a6fe1baae5810acc269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4677f8670b0bcebfeec8a6fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:33 2014 +0200 d2d1: Add the ID2D1SolidColorBrush interface. --- include/d2d1.idl | 14 ++++++++++++++ include/d2dbasetypes.h | 13 +++++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 88a733f..7f7de1d 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -32,6 +32,7 @@ typedef UINT64 D2D1_TAG; typedef D2D_SIZE_U D2D1_SIZE_U; typedef D2D_POINT_2U D2D1_POINT_2U; typedef D2D_RECT_U D2D1_RECT_U; +typedef D2D_COLOR_F D2D1_COLOR_F; enum { @@ -616,5 +617,18 @@ interface ID2D1BitmapBrush : ID2D1Brush ); } +[ + local, + object, + uuid(2cd906a9-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1SolidColorBrush : ID2D1Brush +{ + void SetColor( + [in] const D2D1_COLOR_F *color + ); + D2D1_COLOR_F GetColor(); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory); diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h index 61158ac..e5acff2 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -16,6 +16,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef D3DCOLORVALUE_DEFINED +typedef struct D3DCOLORVALUE +{ + float r; + float g; + float b; + float a; +} D3DCOLORVALUE; +#define D3DCOLORVALUE_DEFINED +#endif + +typedef D3DCOLORVALUE D2D_COLOR_F; + typedef struct D2D_POINT_2F { FLOAT x;

1 0

Nikolay Sivov : msxml3: Remove no longer used helper.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 8e524667578aca111fc94bb69a4afc05a4b5df1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e524667578aca111fc94bb69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 13 13:46:48 2014 +0400 msxml3: Remove no longer used helper. --- dlls/msxml3/msxml_private.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 167e74f..a57dc60 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -205,22 +205,6 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) return ret; } -static inline LPSTR heap_strdupWtoA(LPCWSTR str) -{ - LPSTR ret = NULL; - - if(str) { - DWORD len = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); - ret = heap_alloc(len+1); - if(!ret) - return NULL; - - WideCharToMultiByte(CP_ACP, 0, str, -1, ret, len+1, NULL, NULL); - } - - return ret; -} - /* XSLProcessor parameter list */ struct xslprocessor_par {

1 0

Henri Verbeet : d2d1: Get rid of "optional" attributes.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 71a27809f153e11c719909e35900c807e8712c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a27809f153e11c719909e35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:31 2014 +0200 d2d1: Get rid of "optional" attributes. --- include/d2d1.idl | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/include/d2d1.idl b/include/d2d1.idl index ef05f00..2ea05f1 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -291,80 +291,80 @@ interface ID2D1TessellationSink : IUnknown interface ID2D1Geometry : ID2D1Resource { HRESULT GetBounds( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [out] D2D1_RECT_F *bounds ); HRESULT GetWidenedBounds( [in] float stroke_width, - [in, optional] ID2D1StrokeStyle *stroke_style, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] ID2D1StrokeStyle *stroke_style, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] D2D1_RECT_F *bounds ); HRESULT StrokeContainsPoint( [in] D2D1_POINT_2F point, [in] float stroke_width, - [in, optional] ID2D1StrokeStyle *stroke_style, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] ID2D1StrokeStyle *stroke_style, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] BOOL *contains ); HRESULT FillContainsPoint( [in] D2D1_POINT_2F point, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] BOOL *contains ); HRESULT CompareWithGeometry( [in] ID2D1Geometry *geometry, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] D2D1_GEOMETRY_RELATION *relation ); HRESULT Simplify( [in] D2D1_GEOMETRY_SIMPLIFICATION_OPTION option, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1SimplifiedGeometrySink *sink ); HRESULT Tessellate( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1TessellationSink *sink ); HRESULT CombineWithGeometry( [in] ID2D1Geometry *geometry, [in] D2D1_COMBINE_MODE combine_mode, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1SimplifiedGeometrySink *sink ); HRESULT Outline( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1SimplifiedGeometrySink *sink ); HRESULT ComputeArea( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] float *area ); HRESULT ComputeLength( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] float *length ); HRESULT ComputePointAtLength( [in] float length, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, - [out, optional] D2D1_POINT_2F *point, - [out, optional] D2D1_POINT_2F *tangent + [out] D2D1_POINT_2F *point, + [out] D2D1_POINT_2F *tangent ); HRESULT Widen( [in] float stroke_width, - [in, optional] ID2D1StrokeStyle *stroke_style, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] ID2D1StrokeStyle *stroke_style, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1SimplifiedGeometrySink *sink );

1 0

Ken Thomases : winemac: Add the ability to disable high-resolution scrolling.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 451915100a61a2e5f3e848d0c6ab7fb477b08d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451915100a61a2e5f3e848d0c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 14 20:15:35 2014 -0500 winemac: Add the ability to disable high-resolution scrolling. The Mac driver can generate scroll wheel events with values which are not integral multiples of WHEEL_DELTA. Apps should handle that by scrolling a corresponding non-integral multiple of what they'd do for a WHEEL_DELTA-valued scroll or, if they can't, then at least accumulate scroll distance until its magnitude exceeds WHEEL_DELTA and do a "chunky" scroll. However, many apps don't do that properly. They may scroll way too far/fast or even in the opposite direction. If the registry setting UsePreciseScrolling is set to "n", the Mac driver will do that accumulation and chunking itself to work around such broken app behavior. --- dlls/winemac.drv/cocoa_app.h | 3 ++ dlls/winemac.drv/cocoa_app.m | 81 ++++++++++++++++++++++++++++++--------- dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/macdrv_main.c | 4 ++ 4 files changed, 70 insertions(+), 19 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 0f8926d..fc6c1ec 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -66,6 +66,9 @@ enum { double mouseMoveDeltaX, mouseMoveDeltaY; NSUInteger unmatchedMouseDowns; + NSTimeInterval lastScrollTime; + double accumScrollX, accumScrollY; + NSMutableDictionary* originalDisplayModes; NSMutableDictionary* latentDisplayModes; BOOL displaysCapturedForFullscreen; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index e5594d1..d454513 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1725,7 +1725,7 @@ int macdrv_err_on; if (process) { macdrv_event* event; - CGFloat x, y; + double x, y; BOOL continuous = FALSE; event = macdrv_create_event(MOUSE_SCROLL, window); @@ -1768,26 +1768,69 @@ int macdrv_err_on; /* The x,y values so far are in pixels. Win32 expects to receive some fraction of WHEEL_DELTA == 120. By my estimation, that's roughly 6 times the pixel value. */ - event->mouse_scroll.x_scroll = 6 * x; - event->mouse_scroll.y_scroll = 6 * y; + x *= 6; + y *= 6; - if (!continuous) + if (use_precise_scrolling) { - /* For non-continuous "clicky" wheels, if there was any motion, make - sure there was at least WHEEL_DELTA motion. This is so, at slow - speeds where the system's acceleration curve is actually reducing the - scroll distance, the user is sure to get some action out of each click. - For example, this is important for rotating though weapons in a - first-person shooter. */ - if (0 < event->mouse_scroll.x_scroll && event->mouse_scroll.x_scroll < 120) - event->mouse_scroll.x_scroll = 120; - else if (-120 < event->mouse_scroll.x_scroll && event->mouse_scroll.x_scroll < 0) - event->mouse_scroll.x_scroll = -120; - - if (0 < event->mouse_scroll.y_scroll && event->mouse_scroll.y_scroll < 120) - event->mouse_scroll.y_scroll = 120; - else if (-120 < event->mouse_scroll.y_scroll && event->mouse_scroll.y_scroll < 0) - event->mouse_scroll.y_scroll = -120; + event->mouse_scroll.x_scroll = x; + event->mouse_scroll.y_scroll = y; + + if (!continuous) + { + /* For non-continuous "clicky" wheels, if there was any motion, make + sure there was at least WHEEL_DELTA motion. This is so, at slow + speeds where the system's acceleration curve is actually reducing the + scroll distance, the user is sure to get some action out of each click. + For example, this is important for rotating though weapons in a + first-person shooter. */ + if (0 < event->mouse_scroll.x_scroll && event->mouse_scroll.x_scroll < 120) + event->mouse_scroll.x_scroll = 120; + else if (-120 < event->mouse_scroll.x_scroll && event->mouse_scroll.x_scroll < 0) + event->mouse_scroll.x_scroll = -120; + + if (0 < event->mouse_scroll.y_scroll && event->mouse_scroll.y_scroll < 120) + event->mouse_scroll.y_scroll = 120; + else if (-120 < event->mouse_scroll.y_scroll && event->mouse_scroll.y_scroll < 0) + event->mouse_scroll.y_scroll = -120; + } + } + else + { + /* If it's been a while since the last scroll event or if the scrolling has + reversed direction, reset the accumulated scroll value. */ + if ([theEvent timestamp] - lastScrollTime > 1) + accumScrollX = accumScrollY = 0; + else + { + /* The accumulated scroll value is in the opposite direction/sign of the last + scroll. That's because it's the "debt" resulting from over-scrolling in + that direction. We accumulate by adding in the scroll amount and then, if + it has the same sign as the scroll value, we subtract any whole or partial + WHEEL_DELTAs, leaving it 0 or the opposite sign. So, the user switched + scroll direction if the accumulated debt and the new scroll value have the + same sign. */ + if ((accumScrollX < 0 && x < 0) || (accumScrollX > 0 && x > 0)) + accumScrollX = 0; + if ((accumScrollY < 0 && y < 0) || (accumScrollY > 0 && y > 0)) + accumScrollY = 0; + } + lastScrollTime = [theEvent timestamp]; + + accumScrollX += x; + accumScrollY += y; + + if (accumScrollX > 0 && x > 0) + event->mouse_scroll.x_scroll = 120 * ceil(accumScrollX / 120); + if (accumScrollX < 0 && x < 0) + event->mouse_scroll.x_scroll = 120 * -ceil(-accumScrollX / 120); + if (accumScrollY > 0 && y > 0) + event->mouse_scroll.y_scroll = 120 * ceil(accumScrollY / 120); + if (accumScrollY < 0 && y < 0) + event->mouse_scroll.y_scroll = 120 * -ceil(-accumScrollY / 120); + + accumScrollX -= event->mouse_scroll.x_scroll; + accumScrollY -= event->mouse_scroll.y_scroll; } if (event->mouse_scroll.x_scroll || event->mouse_scroll.y_scroll) diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index d3d3ffc..30b6b64 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -148,6 +148,7 @@ extern int left_option_is_alt DECLSPEC_HIDDEN; extern int right_option_is_alt DECLSPEC_HIDDEN; extern int allow_immovable_windows DECLSPEC_HIDDEN; extern int cursor_clipping_locks_windows DECLSPEC_HIDDEN; +extern int use_precise_scrolling DECLSPEC_HIDDEN; extern int macdrv_start_cocoa_app(unsigned long long tickcount) DECLSPEC_HIDDEN; extern void macdrv_window_rejected_focus(const struct macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 300b1a7..38352a8 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -56,6 +56,7 @@ BOOL allow_software_rendering = FALSE; BOOL disable_window_decorations = FALSE; int allow_immovable_windows = TRUE; int cursor_clipping_locks_windows = TRUE; +int use_precise_scrolling = TRUE; HMODULE macdrv_module = 0; @@ -179,6 +180,9 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "CursorClippingLocksWindows", buffer, sizeof(buffer))) cursor_clipping_locks_windows = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "UsePreciseScrolling", buffer, sizeof(buffer))) + use_precise_scrolling = IS_OPTION_TRUE(buffer[0]); + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); }

1 0

Francois Gouget : testbot/TestAgent: Typographic fixes for the trace_speed () units.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: cc965a0f79b613f824448427ae7f28e234a4ca92 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cc965a0f79b613f824448427… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:55:32 2014 +0200 testbot/TestAgent: Typographic fixes for the trace_speed() units. --- testbot/lib/WineTestBot/TestAgent.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index b22fb06..3c84d49 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -77,14 +77,14 @@ sub trace_speed($$) if ($Elapsed) { $Speed = $Bytes * 8 / $Elapsed / 1000; - $Speed = $Speed < 1000 ? sprintf(" (%.1fKb/s)", $Speed) : - sprintf(" (%.1fMb/s)", $Speed / 1000); + $Speed = $Speed < 1000 ? sprintf(" (%.1f kb/s)", $Speed) : + sprintf(" (%.1f Mb/s)", $Speed / 1000); } $Bytes = $Bytes < 8 * 1024 ? "$Bytes bytes" : - $Bytes < 8 * 1024 * 1024 ? sprintf("%.1fKiB", $Bytes / 1024) : - sprintf("%.1fMiB", $Bytes / 1024 / 1024); - $Elapsed = $Elapsed < 1 ? sprintf("%.1fms", $Elapsed * 1000) : - sprintf("%.1fs", $Elapsed); + $Bytes < 8 * 1024 * 1024 ? sprintf("%.1f KiB", $Bytes / 1024) : + sprintf("%.1f MiB", $Bytes / 1024 / 1024); + $Elapsed = $Elapsed < 1 ? sprintf("%.1f ms", $Elapsed * 1000) : + sprintf("%.1f s", $Elapsed); debug("Transferred $Bytes in $Elapsed$Speed\n"); } }

1 0

Francois Gouget : testbot/TestAgent: Retry the Wait RPC if the connection gets broken.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: a3bc1bebd8870d08eb2593609ef72b64ad01b24a URL: http://source.winehq.org/git/tools.git/?a=commit;h=a3bc1bebd8870d08eb259360… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:55:23 2014 +0200 testbot/TestAgent: Retry the Wait RPC if the connection gets broken. This seems necessary to work around network flakiness. --- testbot/lib/WineTestBot/TestAgent.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index fb14b38..b22fb06 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1232,8 +1232,12 @@ sub Wait($$$;$) # The process has quit last if (defined $Result); - # Retry only if the timeout occurred on the remote end - last if ($self->{err} !~ /timed out waiting/); + # The only 'error' we should be getting here is the TestAgent server + # telling us it timed out waiting for the process. However flaky network + # connections like to break while we're waiting for the reply. So retry + # if that happens and let the automatic reconnection detect real network + # issues. + last if ($self->{err} !~ /(?:timed out waiting|network read timed out)/); } } $self->SetTimeout($OldTimeout);

1 0

Francois Gouget : testbot/Engine: Remove the FoundWinetestUpdate() notification. It is redundent with RescheduleJobs().
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 8f115fe2bd150ca3b96614e881b3fbf473d2aacb URL: http://source.winehq.org/git/tools.git/?a=commit;h=8f115fe2bd150ca3b96614e8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:48:06 2014 +0200 testbot/Engine: Remove the FoundWinetestUpdate() notification. It is redundent with RescheduleJobs(). It did not use the $Bits parameter and just calls ScheduleJobs() which is what the RescheduleJobs() notification does already. --- testbot/bin/CheckForWinetestUpdate.pl | 2 +- testbot/bin/Engine.pl | 20 -------------------- testbot/lib/WineTestBot/Engine/Notify.pm | 19 +------------------ 3 files changed, 2 insertions(+), 39 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 6d33a5c..5d30913 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -251,7 +251,7 @@ else AddJob(1, $FileNameRandomPart, $Bits); } -FoundWinetestUpdate($Bits); +RescheduleJobs(); LogMsg "Submitted jobs\n"; diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 72e165c..f8b7e1e 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -425,25 +425,6 @@ sub HandleVMStatusChange return "1OK"; } -sub HandleFoundWinetestUpdate -{ - my $Bits = $_[0]; - - if ($Bits !~ /^(?:32|64)$/) - { - LogMsg "Invalid number of bits in foundwinetestupdate message\n"; - return "0Invalid number of bits"; - } - - my $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleFoundWinetestUpdate: $ErrMessage\n"; - } - - return "1OK"; -} - sub HandleWinePatchMLSubmission { my $dh; @@ -594,7 +575,6 @@ sub HandleGetScreenshot } my %Handlers=( - "foundwinetestupdate" => \&HandleFoundWinetestUpdate, "getscreenshot" => \&HandleGetScreenshot, "jobcancel" => \&HandleJobCancel, "jobrestart" => \&HandleJobRestart, diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 1f93db4..a241c81 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -34,7 +34,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine); require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&Shutdown &PingEngine &JobSubmit &JobStatusChange &JobCancel - &JobRestart &RescheduleJobs &VMStatusChange &FoundWinetestUpdate + &JobRestart &RescheduleJobs &VMStatusChange &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); @EXPORT_OK = qw($RunningInEngine); @@ -199,23 +199,6 @@ sub VMStatusChange return substr($Reply, 1); } -sub FoundWinetestUpdate -{ - my $Bits = $_[0]; - - my $Reply = SendCmdReceiveReply("foundwinetestupdate $Bits\n"); - if (length($Reply) < 1) - { - return "Unrecognized reply received from engine"; - } - if (substr($Reply, 0, 1) eq "1") - { - return undef; - } - - return substr($Reply, 1); -} - sub WinePatchMLSubmission { my $Reply = SendCmdReceiveReply("winepatchmlsubmission\n");

1 0

Francois Gouget : testbot/testagentd: Fix a small comment typo.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 6d0453c6c0159353a60bf9174a067ff07c10f51b URL: http://source.winehq.org/git/tools.git/?a=commit;h=6d0453c6c0159353a60bf917… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:56:32 2014 +0200 testbot/testagentd: Fix a small comment typo. --- testbot/src/testagentd/platform_unix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index 09330cb..75afc81 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -164,7 +164,7 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child struct timeval tv; int ready; - /* select() blocks until either the client disconnects or until, or + /* select() blocks until either the client disconnects, or * the SIGCHLD signal indicates the child has exited. The recv() call * tells us if it is the former. */

1 0

Francois Gouget : testbot/testagentd: Fix the legacy Wait RPC.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 82ca6524580cffd44a798035a478c31cb9845de6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=82ca6524580cffd44a798035… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:56:12 2014 +0200 testbot/testagentd: Fix the legacy Wait RPC. 0 means return immediately, not wait indefinitely (aka RUN_NOTIMEOUT)! --- testbot/src/testagentd/testagentd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 4bda532..3159f16 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -802,7 +802,7 @@ static void do_wait(SOCKET client) return; } - if (platform_wait(client, pid, 0, &childstatus)) + if (platform_wait(client, pid, RUN_NOTIMEOUT, &childstatus)) { send_list_size(client, 1); send_uint32(client, childstatus);

1 0