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

Francois Gouget : testbot/Engine: Fix a minor typo in a comment.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 30e3a6d665925d7794f14d39c16d2506412e9ff0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=30e3a6d665925d7794f14d39… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:51:27 2014 +0200 testbot/Engine: Fix a minor typo in a comment. --- testbot/bin/Engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 6e2ff1c..ccaadc1 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -590,7 +590,7 @@ through the cracks, possibly because of an Engine restart. Specifically it updates the status of all the current Jobs, Steps and Tasks, then schedules Tasks to be run, checks the staging directory for wine-patches emails dropped by WinePatchesMLSubmit.pl, for notifications of -changes on Wine's Patches web site dropped by WinePatchesWebNotify.pl, and +changes on Wine's Patches web site dropped by WinePatchesWebSubmit.pl, and checks whether any pending patchsets are now complete and thus can be scheduled. =back

1 0

Francois Gouget : testbot/testagentd: Use $(CC) rather than hardcoding gcc as the compiler.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: e9f20ff64423cad602bf04f9c9e42af4f0512e97 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e9f20ff64423cad602bf04f9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:55:58 2014 +0200 testbot/testagentd: Use $(CC) rather than hardcoding gcc as the compiler. $(CC) is standard and does not require the autoconf machinery. --- testbot/src/testagentd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index 5a7b735..4f16f9c 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -9,11 +9,11 @@ windows: TestAgentd.exe $(builddir)/testagentd: testagentd.o platform_unix.o - gcc -o $@ $^ + $(CC) -o $@ $^ strip $@ .c.o: - gcc -Wall -g -c -o $@ $< + $(CC) -Wall -g -c -o $@ $< TestAgentd.exe: testagentd.obj platform_windows.obj

1 0

Francois Gouget : testbot/TestAgent: Make sure we don't overflow alarm()' s 32-bit limit.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 4f9cf46a80f18139f326d611f3575075d4d22d85 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4f9cf46a80f18139f326d611… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:55:45 2014 +0200 testbot/TestAgent: Make sure we don't overflow alarm()'s 32-bit limit. --- testbot/lib/WineTestBot/TestAgent.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 3c84d49..1acb0cd 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -174,7 +174,8 @@ sub _SetAlarm($) { my $Timeout = $self->{deadline} - time(); die "timeout" if ($Timeout <= 0); - alarm($Timeout); + # alarm() has a 32-bit limit, even on 64-bit systems + alarm($Timeout <= 0xffffffff ? $Timeout : 0xffffffff); } }

1 0

Francois Gouget : testbot/CheckWinetestUpdate: Let the Engine handle moving staging files to the jobs directory.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: eeed0b5f0f4af7d985e9e72135f6f75ffe1c1d82 URL: http://source.winehq.org/git/tools.git/?a=commit;h=eeed0b5f0f4af7d985e9e721… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:51:04 2014 +0200 testbot/CheckWinetestUpdate: Let the Engine handle moving staging files to the jobs directory. Otherwise there is a race condition between CheckWinetestUpdate and the Engine. --- testbot/bin/CheckForWinetestUpdate.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 98165a3..fc24fb6 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -110,8 +110,6 @@ sub AddJob LogMsg "Failed to save job: $ErrMessage\n"; exit 1; } - - $NewStep->HandleStaging($NewJob->Id); } }

1 0

Francois Gouget : testbot: Better document the use of the staging directory.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 7d4c644fccff381619dbc49a48ae644daf7b81b4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7d4c644fccff381619dbc49a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:48:45 2014 +0200 testbot: Better document the use of the staging directory. Also remove an unused variable in CheckForWinetestUpdate. --- testbot/bin/CheckForWinetestUpdate.pl | 13 +++++++++---- testbot/web/Submit.pl | 6 ++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 5d30913..98165a3 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -175,7 +175,11 @@ umask 002; mkdir "$DataDir/latest"; mkdir "$DataDir/staging"; -my $LatestFileName = "$DataDir/latest/winetest${BitsSuffix}-latest.exe"; +# Store the new WineTest executable in the staging directory: +# - So we can compare it to the reference one in the latest directory to +# check that it is truly new. +# - Because we don't know the relevant Job and Step IDs yet and thus cannot +# put it in the jobs directory tree. my $FileNameRandomPart = GenerateRandomString(32); while (-e "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe") { @@ -186,7 +190,7 @@ my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuff my $UA = LWP::UserAgent->new(); $UA->agent("WineTestBot"); my $Request = HTTP::Request->new(GET => $WinetestUrl); -my $NowDate = gmtime; +my $LatestFileName = "$DataDir/latest/winetest${BitsSuffix}-latest.exe"; if (-r $LatestFileName) { my $Since = gmtime((stat $LatestFileName)[9]); @@ -230,14 +234,15 @@ if ($Bits == 32) { AddReconfigJob(); AddJob(1, $FileNameRandomPart, $Bits); - + + # Create another copy for the non-base VMs Job. $FileNameRandomPart = GenerateRandomString(32); while (-e "$DataDir/staging/${FileNameRandomPart}_winetest-latest.exe") { $FileNameRandomPart = GenerateRandomString(32); } $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest-latest.exe"; - if (! copy($LatestFileName, $StagingFileName)) + if (!copy($LatestFileName, $StagingFileName)) { LogMsg "Can't copy $LatestFileName to $StagingFileName: $!\n"; } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 3bcfad9..d381150 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -792,8 +792,10 @@ sub OnSubmit return !1; } - # Make sure the file has a unique name even when not picked up directly - # by the engine + # Store the file in the staging directory until the relevant Job and Step + # IDs are known and it can be moved to the jobs directory tree. But rename + # it so it does not get overwritten if the user submits another one before + # the Engine gets around to doing so. my $FileNameRandomPart = GenerateRandomString(32); while (-e ("$DataDir/staging/${FileNameRandomPart}_" . $self->GetParam("FileName")))

1 0

Francois Gouget : testbot/Engine: Remove the JobSubmit() notification. It' s redundant with RescheduleJobs().
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: f70cf6ceb4a29d8d041d2e07ca0af04789b8e741 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f70cf6ceb4a29d8d041d2e07… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:48:11 2014 +0200 testbot/Engine: Remove the JobSubmit() notification. It's redundant with RescheduleJobs(). It does not need to call Step::HandleStaging() since the Job scheduler does that already. So then it's identical to the RescheduleJobs() notification. --- testbot/bin/Engine.pl | 34 ------------------------------ testbot/lib/WineTestBot/Engine/Notify.pm | 19 +---------------- testbot/web/Submit.pl | 8 ++++--- 3 files changed, 6 insertions(+), 55 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index f8b7e1e..6e2ff1c 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -257,39 +257,6 @@ sub HandlePing return "1pong\n"; } -sub HandleJobSubmit -{ - my $JobKey = $_[0]; - - my $Job = CreateJobs()->GetItem($JobKey); - if (! $Job) - { - LogMsg "JobSubmit for nonexistent job $JobKey\n"; - return "0Job $JobKey not found"; - } - # We've already determined that JobKey is valid, untaint it - $JobKey =~ m/^(.*)$/; - $JobKey = $1; - - my $ErrMessage; - foreach my $Step (@{$Job->Steps->GetItems()}) - { - $ErrMessage = $Step->HandleStaging($JobKey); - if (defined($ErrMessage)) - { - LogMsg "Staging problem: $ErrMessage\n"; - } - } - - $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleJobSubmit: $ErrMessage\n"; - } - - return "1OK"; -} - sub HandleJobStatusChange { my ($JobKey, $OldStatus, $NewStatus) = @_; @@ -579,7 +546,6 @@ my %Handlers=( "jobcancel" => \&HandleJobCancel, "jobrestart" => \&HandleJobRestart, "jobstatuschange" => \&HandleJobStatusChange, - "jobsubmit" => \&HandleJobSubmit, "ping" => \&HandlePing, "shutdown" => \&HandleShutdown, "reschedulejobs" => \&HandleRescheduleJobs, diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index a241c81..d0d4890 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -33,7 +33,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine); require Exporter; @ISA = qw(Exporter); -(a)EXPORT = qw(&Shutdown &PingEngine &JobSubmit &JobStatusChange &JobCancel +(a)EXPORT = qw(&Shutdown &PingEngine &JobStatusChange &JobCancel &JobRestart &RescheduleJobs &VMStatusChange &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); @EXPORT_OK = qw($RunningInEngine); @@ -99,23 +99,6 @@ sub PingEngine return 1 <= length($Reply) && substr($Reply, 0, 1) eq "1"; } -sub JobSubmit -{ - my $JobKey = $_[0]; - - my $Reply = SendCmdReceiveReply("jobsubmit $JobKey\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 JobStatusChange { my ($JobKey, $OldStatus, $NewStatus) = @_; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 0d9d0b4..3bcfad9 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -917,14 +917,16 @@ sub OnSubmit $Jobs = undef; # Notify engine - if (defined(JobSubmit($JobKey))) + my $ErrMessage = RescheduleJobs(); + if (defined $ErrMessage) { + LogMsg "$ErrMessage\n"; $self->{Page} = 4; - $self->{JobKey} = $NewJob->GetKey(); + $self->{JobKey} = $JobKey; return !1; } - $self->Redirect("/JobDetails.pl?Key=" . $NewJob->Id); + $self->Redirect("/JobDetails.pl?Key=$JobKey"); exit; }

1 0

Shuai Meng : vbscript: Implemented CByte.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: db42703d5ff9eb31130896c9d7d7713b8fe09d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=db42703d5ff9eb31130896c9d… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Wed May 14 23:05:02 2014 +0800 vbscript: Implemented CByte. --- dlls/vbscript/global.c | 21 +++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 44 +++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/run.c | 2 ++ 3 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9aeba34..484158f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -424,8 +424,25 @@ static HRESULT Global_CBool(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR static HRESULT Global_CByte(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, VARIANT_LOCALBOOL, VT_UI1); + if(FAILED(hres)) + return hres; + + if(!res) { + VariantClear(&v); + return DISP_E_BADVARTYPE; + } + + *res = v; + return S_OK; } static HRESULT Global_CDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 12124b7..8197d6d 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -533,4 +533,48 @@ MyObject.myval = 0 Call ok(CBool(MyObject) = False, "CBool(MyObject) = " & CBool(MyObject)) Call ok(getVT(CBool(MyObject)) = "VT_BOOL", "getVT(CBool(MyObject)) = " & getVT(CBool(MyObject))) +Sub testCByteError(strings, error_num1,error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CByte(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CByte(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CByte(Empty) = 0, "CByte(Empty) = " & CByte(Empty)) +Call ok(getVT(CByte(Empty)) = "VT_UI1", "getVT(CByte(Empty)) = " & getVT(CByte(Empty))) +Call ok(CByte(255) = 255, "CByte(255) = " & CByte(255)) +Call ok(getVT(CByte(255)) = "VT_UI1", "getVT(CByte(255)) = " & getVT(CByte(255))) +Call ok(CByte(255.49) = 255, "CByte(255.49) = " & CByte(255.49)) +Call ok(getVT(CByte(255.49)) = "VT_UI1", "getVT(CByte(255.49)) = " & getVT(CByte(255.49))) +Call testCByteError(1, 0, 458) +Call testCByteError("", 13, 13) +Call testCByteError("-1", 6, 6) +Call testCByteError("258", 6, 6) +Call testCByteError("TRUE", 13, 13) +Call testCByteError("FALSE", 13, 13) +Call testCByteError("#TRue#", 13, 13) +Call testCByteError("#fAlSE#", 13, 13) +If isEnglishLang Then + Call ok(CByte("-0.5") = 0, "CByte(""-0.5"") = " & CByte("-0.5")) + Call ok(getVT(CByte("-0.5")) = "VT_UI1", "getVT(CByte(""-0.5"")) = " & getVT(CByte("-0.5"))) +End If +Call ok(CByte(True) = 255, "CByte(True) = " & CByte(True)) +Call ok(getVT(CByte(True)) = "VT_UI1", "getVT(CByte(True)) = " & getVT(CByte(True))) +Call ok(CByte(False) = 0, "CByte(False) = " & CByte(False)) +Call ok(getVT(CByte(False)) = "VT_UI1", "getVT(CByte(False)) = " & getVT(CByte(False))) +Call ok(CByte(MyObject) = 0, "CByte(MyObject) = " & CByte(MyObject)) +Call ok(getVT(CByte(MyObject)) = "VT_UI1", "getVT(CByte(MyObject)) = " & getVT(CByte(MyObject))) +MyObject.myval = 1 +Call ok(CByte(MyObject) = 1, "CByte(MyObject) = " & CByte(MyObject)) +Call ok(getVT(CByte(MyObject)) = "VT_UI1", "getVT(CByte(MyObject)) = " & getVT(CByte(MyObject))) +MyObject.myval = 0 +Call ok(CByte(MyObject) = 0, "CByte(MyObject) = " & CByte(MyObject)) +Call ok(getVT(CByte(MyObject)) = "VT_UI1", "getVT(CByte(MyObject)) = " & getVT(CByte(MyObject))) + Call reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 53ead45..9620398 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -181,6 +181,8 @@ static const char *vt2a(VARIANT *v) return "VT_ARRAY|VT_VARIANT"; case VT_ARRAY|VT_BYREF|VT_VARIANT: return "VT_ARRAY|VT_BYREF|VT_VARIANT"; + case VT_UI1: + return "VT_UI1"; default: ok(0, "unknown vt %d\n", V_VT(v)); return NULL;

1 0

Jacek Caban : wmvcore: Added IWMReader interface stub implementation.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: c0247ab291f11c92bba43e51633bb8adee52e290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0247ab291f11c92bba43e516… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 14 18:43:09 2014 +0200 wmvcore: Added IWMReader interface stub implementation. --- dlls/wmvcore/wmvcore_main.c | 161 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 158 insertions(+), 3 deletions(-) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 5903bf8..3382542 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -72,12 +72,167 @@ HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor) return E_NOTIMPL; } -HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **reader) +typedef struct { + IWMReader IWMReader_iface; + LONG ref; +} WMReader; + +static inline WMReader *impl_from_IWMReader(IWMReader *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReader_iface); +} + +static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReader(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IWMReader_iface; + }else if(IsEqualGUID(riid, &IID_IWMReader)) { + TRACE("(%p)->(IID_IWMReader %p)\n", This, ppv); + *ppv = &This->IWMReader_iface; + }else { + *ppv = NULL; + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WMReader_AddRef(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI WMReader_Release(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, IWMReaderCallback *callback, void *context) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(url), callback, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Close(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputCount(IWMReader *iface, DWORD *outputs) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%p)\n", This, outputs); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps **output) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %p)\n", This, output_num, output); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_SetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps *output) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %p)\n", This, output_num, output); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputFormatCount(IWMReader *iface, DWORD output_num, DWORD *formats) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %p)\n", This, output_num, formats); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output_num, DWORD format_num, IWMOutputMediaProps **props) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %u %p)\n", This, output_num, format_num, props); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Start(IWMReader *iface, QWORD start, QWORD duration, float rate, void *context) { - FIXME("(%p, %x, %p): stub\n", reserved, rights, reader); + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%s %s %f %p)\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration), rate, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Stop(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Pause(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Resume(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IWMReaderVtbl WMReaderVtbl = { + WMReader_QueryInterface, + WMReader_AddRef, + WMReader_Release, + WMReader_Open, + WMReader_Close, + WMReader_GetOutputCount, + WMReader_GetOutputProps, + WMReader_SetOutputProps, + WMReader_GetOutputFormatCount, + WMReader_GetOutputFormat, + WMReader_Start, + WMReader_Stop, + WMReader_Pause, + WMReader_Resume +}; + +HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) +{ + WMReader *reader; + + TRACE("(%p, %x, %p)\n", reserved, rights, ret_reader); + + reader = heap_alloc(sizeof(*reader)); + if(!reader) + return E_OUTOFMEMORY; - *reader = NULL; + reader->IWMReader_iface.lpVtbl = &WMReaderVtbl; + reader->ref = 1; + *ret_reader = &reader->IWMReader_iface; return E_NOTIMPL; }

1 0

Jacek Caban : oleaut32: Added debugstr_variant helper for better debug traces.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: ed41fc1d9b0aabd581dd7f1e0eb9e1939b96b26f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed41fc1d9b0aabd581dd7f1e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 14 16:55:57 2014 +0200 oleaut32: Added debugstr_variant helper for better debug traces. --- dlls/oleaut32/varformat.c | 36 +++++++++++++++--------------------- dlls/oleaut32/variant.c | 33 +++++++++++++++++++++++++++++++++ dlls/oleaut32/variant.h | 2 ++ 3 files changed, 50 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index e72a170..0e1c370 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1201,9 +1201,8 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, const BYTE* pToken = NULL; HRESULT hRes = S_OK; - TRACE("(%p->(%s%s),%s,%p,0x%08x,%p,0x%08x)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, - lcid); + TRACE("(%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vString) = VT_EMPTY; V_VT(&vBool) = VT_BOOL; @@ -1612,9 +1611,8 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, const BYTE* pToken = NULL; HRESULT hRes; - TRACE("(%p->(%s%s),%s,%p,0x%08x,%p,0x%08x)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, - lcid); + TRACE("(%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), + debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vDate) = VT_EMPTY; @@ -1954,9 +1952,8 @@ static HRESULT VARIANT_FormatString(LPVARIANT pVarIn, LPOLESTR lpszFormat, BOOL bUpper = FALSE; HRESULT hRes = S_OK; - TRACE("(%p->(%s%s),%s,%p,0x%08x,%p,0x%08x)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, - lcid); + TRACE("%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vStr) = VT_EMPTY; @@ -2168,9 +2165,8 @@ HRESULT WINAPI VarFormat(LPVARIANT pVarIn, LPOLESTR lpszFormat, BYTE buff[256]; HRESULT hres; - TRACE("(%p->(%s%s),%s,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), nFirstDay, nFirstWeek, - dwFlags, pbstrOut); + TRACE("(%s,%s,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + nFirstDay, nFirstWeek, dwFlags, pbstrOut); if (!pbstrOut) return E_INVALIDARG; @@ -2219,8 +2215,7 @@ HRESULT WINAPI VarFormatDateTime(LPVARIANT pVarIn, INT nFormat, ULONG dwFlags, B static WCHAR szEmpty[] = { '\0' }; const BYTE* lpFmt = NULL; - TRACE("(%p->(%s%s),%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nFormat, dwFlags, pbstrOut); + TRACE("%s,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nFormat, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nFormat < 0 || nFormat > 4) return E_INVALIDARG; @@ -2272,8 +2267,8 @@ HRESULT WINAPI VarFormatNumber(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT HRESULT hRet; VARIANT vStr; - TRACE("(%p->(%s%s),%d,%d,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nDigits, nLeading, nParens, nGrouping, dwFlags, pbstrOut); + TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) return E_INVALIDARG; @@ -2383,9 +2378,8 @@ HRESULT WINAPI VarFormatPercent(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT HRESULT hRet; VARIANT vDbl; - TRACE("(%p->(%s%s),%d,%d,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nDigits, nLeading, nParens, nGrouping, - dwFlags, pbstrOut); + TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) return E_INVALIDARG; @@ -2457,8 +2451,8 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, HRESULT hRet; VARIANT vStr; - TRACE("(%p->(%s%s),%d,%d,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nDigits, nLeading, nParens, nGrouping, dwFlags, pbstrOut); + TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) return E_INVALIDARG; diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index c3bd225..7221787 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -78,6 +78,39 @@ const char * const wine_vflags[16] = "|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_HARDTYPE", }; +const char *debugstr_variant(const VARIANT *v) +{ + if(!v) + return "(null)"; + + switch(V_VT(v)) { + case VT_EMPTY: + return wine_dbg_sprintf("%p {VT_EMPTY}", v); + case VT_NULL: + return wine_dbg_sprintf("%p {VT_NULL}", v); + case VT_I1: + return wine_dbg_sprintf("%p {VT_I1: %d}", v, V_I1(v)); + case VT_I2: + return wine_dbg_sprintf("%p {VT_I2: %d}", v, V_I2(v)); + case VT_I4: + return wine_dbg_sprintf("%p {VT_I4: %d}", v, V_I4(v)); + case VT_R8: + return wine_dbg_sprintf("%p {VT_R8: %lf}", v, V_R8(v)); + case VT_BSTR: + return wine_dbg_sprintf("%p {VT_BSTR: %s}", v, debugstr_w(V_BSTR(v))); + case VT_DISPATCH: + return wine_dbg_sprintf("%p {VT_DISPATCH: %p}", v, V_DISPATCH(v)); + case VT_ERROR: + return wine_dbg_sprintf("%p {VT_ERROR: %08x}", v, V_ERROR(v)); + case VT_BOOL: + return wine_dbg_sprintf("%p {VT_BOOL: %x}", v, V_BOOL(v)); + case VT_UINT: + return wine_dbg_sprintf("%p {VT_UINT: %u}", v, V_UINT(v)); + default: + return wine_dbg_sprintf("%p {vt %s%s}", v, debugstr_VT(v), debugstr_VF(v)); + } +} + /* Convert a variant from one type to another */ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, VARIANTARG* ps, VARTYPE vt) diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index d521b20..e13e56a 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -57,6 +57,8 @@ extern const char * const wine_vflags[] DECLSPEC_HIDDEN; #define debugstr_vf(v) (wine_vflags[((v)&VT_EXTRA_TYPE)>>12]) #define debugstr_VF(v) (!(v) ? "(null)" : debugstr_vf(V_EXTRA_TYPE(v))) +const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; + /* Size constraints */ #define I1_MAX 0x7f #define I1_MIN ((-I1_MAX)-1)

1 0

Piotr Caban : oleacc: Add GetStateText implementation.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 5f51dda7eeab4d905ecf86ac447b76346ab0df0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f51dda7eeab4d905ecf86ac4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 14 16:06:51 2014 +0200 oleacc: Add GetStateText implementation. --- dlls/oleacc/main.c | 64 +++++++++- dlls/oleacc/oleacc.rc | 34 ++++++ dlls/oleacc/oleacc.spec | 4 +- dlls/oleacc/resource.h | 50 ++++++++ dlls/oleacc/tests/main.c | 71 +++++++++++ po/ar.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/bg.po | 274 ++++++++++++++++++++++++++++++++---------- po/ca.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/cs.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/da.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/de.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/el.po | 269 ++++++++++++++++++++++++++++++++---------- po/en.po | 258 ++++++++++++++++++++++++++++++---------- po/en_US.po | 258 ++++++++++++++++++++++++++++++---------- po/eo.po | 282 ++++++++++++++++++++++++++++++++++---------- po/es.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/fa.po | 263 +++++++++++++++++++++++++++++++---------- po/fi.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/fr.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/he.po | 285 ++++++++++++++++++++++++++++++++++---------- po/hi.po | 258 ++++++++++++++++++++++++++++++---------- po/hr.po | 292 +++++++++++++++++++++++++++++++++++---------- po/hu.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/it.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/ja.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/ko.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/lt.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/ml.po | 258 ++++++++++++++++++++++++++++++---------- po/nb_NO.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/nl.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/or.po | 258 ++++++++++++++++++++++++++++++---------- po/pa.po | 258 ++++++++++++++++++++++++++++++---------- po/pl.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/pt_BR.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/pt_PT.po | 292 +++++++++++++++++++++++++++++++++++---------- po/rm.po | 261 ++++++++++++++++++++++++++++++---------- po/ro.po | 292 +++++++++++++++++++++++++++++++++++---------- po/ru.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/sk.po | 280 +++++++++++++++++++++++++++++++++---------- po/sl.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/sr_RS(a)cyrillic.po | 284 ++++++++++++++++++++++++++++++++++---------- po/sr_RS(a)latin.po | 288 +++++++++++++++++++++++++++++++++++---------- po/sv.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/te.po | 258 ++++++++++++++++++++++++++++++---------- po/th.po | 270 ++++++++++++++++++++++++++++++++---------- po/tr.po | 292 +++++++++++++++++++++++++++++++++++---------- po/uk.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/wa.po | 263 +++++++++++++++++++++++++++++++---------- po/wine.pot | 258 ++++++++++++++++++++++++++++++---------- po/zh_CN.po | 286 ++++++++++++++++++++++++++++++++++---------- po/zh_TW.po | 294 ++++++++++++++++++++++++++++++++++++---------- 51 files changed, 10235 insertions(+), 2993 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f51dda7eeab4d905ecf8…

1 0

Piotr Caban : include: Add STATE_SYSTEM_* definition to oleacc.idl.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: b6284cfc63872a34cb5cfe4f4494f1a8187fb367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6284cfc63872a34cb5cfe4f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 14 16:06:40 2014 +0200 include: Add STATE_SYSTEM_* definition to oleacc.idl. --- include/oleacc.idl | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/include/oleacc.idl b/include/oleacc.idl index e9cf138..daf7dec 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -18,6 +18,7 @@ import "oaidl.idl"; +cpp_quote("#define NAVDIR_MIN 0") cpp_quote("#define NAVDIR_UP 1") cpp_quote("#define NAVDIR_DOWN 2") cpp_quote("#define NAVDIR_LEFT 3") @@ -26,6 +27,7 @@ cpp_quote("#define NAVDIR_NEXT 5") cpp_quote("#define NAVDIR_PREVIOUS 6") cpp_quote("#define NAVDIR_FIRSTCHILD 7") cpp_quote("#define NAVDIR_LASTCHILD 8") +cpp_quote("#define NAVDIR_MAX 9") cpp_quote("#define ROLE_SYSTEM_TITLEBAR 1") cpp_quote("#define ROLE_SYSTEM_MENUBAR 2") @@ -100,6 +102,45 @@ cpp_quote("#define SELFLAG_ADDSELECTION 0x08") cpp_quote("#define SELFLAG_REMOVESELECTION 0x10") cpp_quote("#define SELFLAG_VALID 0x1f") +cpp_quote("#ifndef STATE_SYSTEM_UNAVAILABLE") +cpp_quote("#define STATE_SYSTEM_NORMAL 0x00000000") +cpp_quote("#define STATE_SYSTEM_UNAVAILABLE 0x00000001") +cpp_quote("#define STATE_SYSTEM_SELECTED 0x00000002") +cpp_quote("#define STATE_SYSTEM_FOCUSED 0x00000004") +cpp_quote("#define STATE_SYSTEM_PRESSED 0x00000008") +cpp_quote("#define STATE_SYSTEM_CHECKED 0x00000010") +cpp_quote("#define STATE_SYSTEM_MIXED 0x00000020") +cpp_quote("#define STATE_SYSTEM_INDETERMINATE STATE_SYSTEM_MIXED") +cpp_quote("#define STATE_SYSTEM_READONLY 0x00000040") +cpp_quote("#define STATE_SYSTEM_HOTTRACKED 0x00000080") +cpp_quote("#define STATE_SYSTEM_DEFAULT 0x00000100") +cpp_quote("#define STATE_SYSTEM_EXPANDED 0x00000200") +cpp_quote("#define STATE_SYSTEM_COLLAPSED 0x00000400") +cpp_quote("#define STATE_SYSTEM_BUSY 0x00000800") +cpp_quote("#define STATE_SYSTEM_FLOATING 0x00001000") +cpp_quote("#define STATE_SYSTEM_MARQUEED 0x00002000") +cpp_quote("#define STATE_SYSTEM_ANIMATED 0x00004000") +cpp_quote("#define STATE_SYSTEM_INVISIBLE 0x00008000") +cpp_quote("#define STATE_SYSTEM_OFFSCREEN 0x00010000") +cpp_quote("#define STATE_SYSTEM_SIZEABLE 0x00020000") +cpp_quote("#define STATE_SYSTEM_MOVEABLE 0x00040000") +cpp_quote("#define STATE_SYSTEM_SELFVOICING 0x00080000") +cpp_quote("#define STATE_SYSTEM_FOCUSABLE 0x00100000") +cpp_quote("#define STATE_SYSTEM_SELECTABLE 0x00200000") +cpp_quote("#define STATE_SYSTEM_LINKED 0x00400000") +cpp_quote("#define STATE_SYSTEM_TRAVERSED 0x00800000") +cpp_quote("#define STATE_SYSTEM_MULTISELECTABLE 0x01000000") +cpp_quote("#define STATE_SYSTEM_EXTSELECTABLE 0x02000000") +cpp_quote("#define STATE_SYSTEM_ALERT_LOW 0x04000000") +cpp_quote("#define STATE_SYSTEM_ALERT_MEDIUM 0x08000000") +cpp_quote("#define STATE_SYSTEM_ALERT_HIGH 0x10000000") +cpp_quote("#define STATE_SYSTEM_PROTECTED 0x20000000") +cpp_quote("#define STATE_SYSTEM_VALID 0x7FFFFFFF") +cpp_quote("#endif") +cpp_quote("#ifndef STATE_SYSTEM_HASPOPUP") +cpp_quote("#define STATE_SYSTEM_HASPOPUP 0x40000000") +cpp_quote("#endif") + typedef GUID MSAAPROPID; typedef enum AnnoScope

1 0

Stefan Dösinger : wined3d: Always provide P8 GL texture information.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 7b049245f532d355ea0541c9a970d3459144aaf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b049245f532d355ea0541c9a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:51 2014 +0200 wined3d: Always provide P8 GL texture information. --- dlls/wined3d/surface.c | 23 ++--------------------- dlls/wined3d/utils.c | 2 +- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e0ba375..8e4b88b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1457,12 +1457,6 @@ static void surface_download_data(struct wined3d_surface *surface, const struct int src_pitch = 0; int dst_pitch = 0; - if (format->id == WINED3DFMT_P8_UINT) - { - gl_format = GL_ALPHA; - gl_type = GL_UNSIGNED_BYTE; - } - if (surface->flags & SFLAG_NONPOW2) { unsigned char alignment = surface->resource.device->surface_alignment; @@ -3211,8 +3205,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc const struct wined3d_gl_info *gl_info; struct wined3d_context *context; BYTE *mem; - GLint fmt; - GLint type; BYTE *row, *top, *bottom; int i; BOOL srcIsUpsideDown; @@ -3246,18 +3238,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc srcIsUpsideDown = FALSE; } - switch (surface->resource.format->id) - { - case WINED3DFMT_P8_UINT: - fmt = GL_ALPHA; - type = GL_UNSIGNED_BYTE; - break; - - default: - fmt = surface->resource.format->glFormat; - type = surface->resource.format->glType; - } - if (data.buffer_object) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, data.buffer_object)); @@ -3270,7 +3250,8 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc gl_info->gl_ops.gl.p_glReadPixels(0, 0, surface->resource.width, surface->resource.height, - fmt, type, data.addr); + surface->resource.format->glFormat, + surface->resource.format->glType, data.addr); checkGLcall("glReadPixels"); /* Reset previous pixel store pack state */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 044eed0..c077567 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -743,7 +743,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = {WINED3DFMT_P8_UINT, GL_RGBA, GL_RGBA, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, 0, - ARB_FRAGMENT_PROGRAM, NULL}, + 0, NULL}, /* Standard ARGB formats */ {WINED3DFMT_B8G8R8_UNORM, GL_RGB8, GL_RGB8, 0, GL_BGR, GL_UNSIGNED_BYTE, 0,

1 0

Henri Verbeet : d2d1: Add the ID2D1Brush interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: eb4d5c7a254fe5e1e688e874c7b142e9d8d1331f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4d5c7a254fe5e1e688e874c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 07:56:26 2014 +0200 d2d1: Add the ID2D1Brush interface. --- include/d2d1.idl | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 367905c..ef05f00 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -543,5 +543,24 @@ interface ID2D1Bitmap : ID2D1Image ); } +[ + local, + object, + uuid(2cd906a8-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1Brush : ID2D1Resource +{ + void SetOpacity( + [in] float opacity + ); + void SetTransform( + [in] const D2D1_MATRIX_3X2_F *transform + ); + float GetOpacity(); + void GetTransform( + [out] D2D1_MATRIX_3X2_F *transform + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1Bitmap interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 2156e68a4ce47a2d1347d4c1efc40a0a6669e5ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=2156e68a4ce47a2d1347d4c1e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 13:02:38 2014 +0200 d2d1: Add the ID2D1Bitmap interface. --- include/d2d1.idl | 36 ++++++++++++++++++++++++++++++++++++ include/d2dbasetypes.h | 20 ++++++++++++++++++++ include/dcommon.h | 17 +++++++++++++++++ 3 files changed, 73 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 55a8f4d..367905c 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -17,9 +17,11 @@ */ import "unknwn.idl"; +import "dcommon.h"; import "d2dbasetypes.h"; interface ID2D1Factory; +interface ID2D1RenderTarget; interface IDWriteRenderingParams; typedef D2D_POINT_2F D2D1_POINT_2F; @@ -27,6 +29,9 @@ typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F; typedef D2D_RECT_F D2D1_RECT_F; typedef D2D_SIZE_F D2D1_SIZE_F; 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 enum D2D1_DEBUG_LEVEL { @@ -507,5 +512,36 @@ interface ID2D1Image : ID2D1Resource { } +[ + local, + object, + uuid(a2296057-ea42-4099-983b-539fb6505426) +] +interface ID2D1Bitmap : ID2D1Image +{ + D2D1_SIZE_F GetSize(); + D2D1_SIZE_U GetPixelSize(); + D2D1_PIXEL_FORMAT GetPixelFormat(); + void GetDpi( + [out] float *dpi_x, + [out] float *dpi_y + ); + HRESULT CopyFromBitmap( + [in] const D2D1_POINT_2U *dst_point, + [in] ID2D1Bitmap *bitmap, + [in] const D2D1_RECT_U *src_rect + ); + HRESULT CopyFromRenderTarget( + [in] const D2D1_POINT_2U *dst_point, + [in] ID2D1RenderTarget *render_target, + [in] const D2D1_RECT_U *src_rect + ); + HRESULT CopyFromMemory( + [in] const D2D1_RECT_U *dst_rect, + [in] const void *src_data, + [in] UINT32 pitch + ); +} + [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 4ddb994..61158ac 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -45,3 +45,23 @@ typedef struct D2D_SIZE_F float width; float height; } D2D_SIZE_F; + +typedef struct D2D_SIZE_U +{ + UINT32 width; + UINT32 height; +} D2D_SIZE_U; + +typedef struct D2D_POINT_2U +{ + UINT32 x; + UINT32 y; +} D2D_POINT_2U; + +typedef struct D2D_RECT_U +{ + UINT32 left; + UINT32 top; + UINT32 right; + UINT32 bottom; +} D2D_RECT_U; diff --git a/include/dcommon.h b/include/dcommon.h index 50daefb..56445a3 100644 --- a/include/dcommon.h +++ b/include/dcommon.h @@ -19,6 +19,8 @@ #ifndef __WINE_DCOMMON_H #define __WINE_DCOMMON_H +#include "dxgiformat.h" + typedef enum DWRITE_MEASURING_MODE { DWRITE_MEASURING_MODE_NATURAL, @@ -26,4 +28,19 @@ typedef enum DWRITE_MEASURING_MODE DWRITE_MEASURING_MODE_GDI_NATURAL } DWRITE_MEASURING_MODE; +typedef enum D2D1_ALPHA_MODE +{ + D2D1_ALPHA_MODE_UNKNOWN = 0, + D2D1_ALPHA_MODE_PREMULTIPLIED = 1, + D2D1_ALPHA_MODE_STRAIGHT = 2, + D2D1_ALPHA_MODE_IGNORE = 3, + D2D1_ALPHA_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_ALPHA_MODE; + +typedef struct D2D1_PIXEL_FORMAT +{ + DXGI_FORMAT format; + D2D1_ALPHA_MODE alphaMode; +} D2D1_PIXEL_FORMAT; + #endif /* __WINE_DCOMMON_H */

1 0

Henri Verbeet : d2d1: Add the ID2D1Image interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 61a909069d29070685f6f59ff9f6ebda7593dcec URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a909069d29070685f6f59ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 07:56:24 2014 +0200 d2d1: Add the ID2D1Image interface. --- include/d2d1.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 6fcadee..55a8f4d 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -498,5 +498,14 @@ interface ID2D1DrawingStateBlock : ID2D1Resource ); } +[ + local, + object, + uuid(65019f75-8da2-497c-b32c-dfa34e48ede6) +] +interface ID2D1Image : ID2D1Resource +{ +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1PathGeometry interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: a4b15c1bb5a07fc8ae9f610b4188f92f0321683c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b15c1bb5a07fc8ae9f610b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 07:56:22 2014 +0200 d2d1: Add the ID2D1PathGeometry interface. --- include/d2d1.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index bfed202..c6b9288 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -429,5 +429,26 @@ interface ID2D1GeometrySink : ID2D1SimplifiedGeometrySink ); } +[ + local, + object, + uuid(2cd906a5-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1PathGeometry : ID2D1Geometry +{ + HRESULT Open( + [out] ID2D1GeometrySink **sink + ); + HRESULT Stream( + [in] ID2D1GeometrySink *sink + ); + HRESULT GetSegmentCount( + [out] UINT32 *count + ); + HRESULT GetFigureCount( + [out] UINT32 *count + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Piotr Caban : user32: Fix LoadStringA behavior on 1-character long buffer.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: c2df317c4b7be489d63fd559d7fb6676578a0bb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2df317c4b7be489d63fd559d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 14 16:06:27 2014 +0200 user32: Fix LoadStringA behavior on 1-character long buffer. --- dlls/user32/resource.c | 3 ++- dlls/user32/tests/resource.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 1917d51..83442d8 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -310,7 +310,8 @@ INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, LPSTR buffer, INT while (id--) p += *p + 1; - RtlUnicodeToMultiByteN( buffer, buflen - 1, &retval, p + 1, *p * sizeof(WCHAR) ); + if (buflen != 1) + RtlUnicodeToMultiByteN( buffer, buflen - 1, &retval, p + 1, *p * sizeof(WCHAR) ); } buffer[retval] = 0; TRACE("returning %s\n", debugstr_a(buffer)); diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 9cb7380..2388adb 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -126,6 +126,13 @@ static void test_LoadStringA (void) ok( ret == -1 || broken(ret == 0), "LoadStringA did not return -1 when called with buflen = 0, got %d, err %d\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + buf[0] = 'a'; + ret = LoadStringA(hInst, 1, buf, 1); + ok( !ret, "LoadString returned %d\n", ret); + ok( buf[0] == 0, "buf[0] = %c (%x)\n", buf[0], buf[0]); + ok( GetLastError() == 0xdeadbeef, "GetLastError() = %d\n", GetLastError()); } static void test_accel1(void)

1 0

Stefan Dösinger : wined3d: Don' t update the color table on palette changes.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 544816797adc4de21713abe4c9e208692d88eaa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=544816797adc4de21713abe4c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:53 2014 +0200 wined3d: Don't update the color table on palette changes. --- dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- dlls/wined3d/surface.c | 15 +++------------ 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ef07b97..c8f7d65 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5126,7 +5126,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); @@ -5139,7 +5139,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 64aa519..23795d3 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6194,7 +6194,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); @@ -6207,7 +6207,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b760dfb..3d0bfe5 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7096,7 +7096,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); @@ -7109,7 +7109,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 8c5f6ac..97a6a19 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6818,7 +6818,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); @@ -6831,7 +6831,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8e4b88b..dea27ab 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -787,12 +787,6 @@ static void surface_realize_palette(struct wined3d_surface *surface) } } - if (surface->flags & SFLAG_DIBSECTION) - { - TRACE("Updating the DC's palette.\n"); - SetDIBColorTable(surface->hDC, 0, 256, palette->colors); - } - /* Propagate the changes to the drawable when we have a palette. */ if (surface->resource.usage & WINED3DUSAGE_RENDERTARGET) surface_load_location(surface, surface->draw_binding); @@ -1379,17 +1373,14 @@ static void gdi_surface_realize_palette(struct wined3d_surface *surface) if (!palette) return; - if (surface->flags & SFLAG_DIBSECTION) - { - TRACE("Updating the DC's palette.\n"); - SetDIBColorTable(surface->hDC, 0, 256, palette->colors); - } - /* Update the image because of the palette change. Some games like e.g. * Red Alert call SetEntries a lot to implement fading. */ /* Tell the swapchain to update the screen. */ if (surface->swapchain && surface == surface->swapchain->front_buffer) + { + SetDIBColorTable(surface->hDC, 0, 256, palette->colors); x11_copy_to_screen(surface->swapchain, NULL); + } } static void gdi_surface_unmap(struct wined3d_surface *surface)

1 0

Stefan Dösinger : wined3d: Remove WINED3D_CT_PALETTED_CK.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: bfb5be0f4b93aa36044847d8d930ec6224d5fc99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfb5be0f4b93aa36044847d8d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:50 2014 +0200 wined3d: Remove WINED3D_CT_PALETTED_CK. There's no difference between WINED3D_CT_PALETTED_CK and WINED3D_CT_PALETTED with the palette index in the alpha channel. --- dlls/wined3d/arb_program_shader.c | 3 +-- dlls/wined3d/surface.c | 10 +++------- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 653298a..195c3ae 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7282,9 +7282,8 @@ static void upload_palette(const struct wined3d_surface *surface, struct wined3d struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = context->gl_info; struct arbfp_blit_priv *priv = device->blit_priv; - BOOL colorkey = !!(surface->container->color_key_flags & WINEDDSD_CKSRCBLT); - d3dfmt_p8_init_palette(surface, table, colorkey); + d3dfmt_p8_init_palette(surface, table); if (!priv->palette_texture) gl_info->gl_ops.gl.p_glGenTextures(1, &priv->palette_texture); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0e71de0..e0ba375 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1725,10 +1725,7 @@ static HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_ format->glInternal = GL_RGBA; format->glType = GL_UNSIGNED_BYTE; format->conv_byte_count = 4; - if (colorkey_active) - *conversion_type = WINED3D_CT_PALETTED_CK; - else - *conversion_type = WINED3D_CT_PALETTED; + *conversion_type = WINED3D_CT_PALETTED; } break; @@ -3426,7 +3423,7 @@ static BOOL color_in_range(const struct wined3d_color_key *color_key, DWORD colo && color <= color_key->color_space_high_value; } -void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) +void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4]) { const struct wined3d_palette *pal = surface->palette; unsigned int i; @@ -3475,12 +3472,11 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI } case WINED3D_CT_PALETTED: - case WINED3D_CT_PALETTED_CK: { BYTE table[256][4]; unsigned int x, y; - d3dfmt_p8_init_palette(surface, table, (conversion_type == WINED3D_CT_PALETTED_CK)); + d3dfmt_p8_init_palette(surface, table); for (y = 0; y < height; y++) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f7b5c57..9233148 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2341,7 +2341,6 @@ enum wined3d_conversion_type { WINED3D_CT_NONE, WINED3D_CT_PALETTED, - WINED3D_CT_PALETTED_CK, WINED3D_CT_CK_565, WINED3D_CT_CK_5551, WINED3D_CT_CK_RGB24, @@ -2349,7 +2348,7 @@ enum wined3d_conversion_type WINED3D_CT_CK_ARGB32, }; -void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) DECLSPEC_HIDDEN; +void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4]) DECLSPEC_HIDDEN; struct wined3d_sampler {

1 0

Stefan Dösinger : wined3d: Use GL_ALPHA8 for WINED3DFMT_P8_UINT surfaces.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 3cd83f4d56b94d6041acc4312073fbdb8f250a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd83f4d56b94d6041acc4312… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:52 2014 +0200 wined3d: Use GL_ALPHA8 for WINED3DFMT_P8_UINT surfaces. --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c077567..6a27920 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -740,7 +740,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = | WINED3DFMT_FLAG_VTF, ARB_TEXTURE_FLOAT, NULL}, /* Palettized formats */ - {WINED3DFMT_P8_UINT, GL_RGBA, GL_RGBA, 0, + {WINED3DFMT_P8_UINT, GL_ALPHA8, GL_ALPHA8, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, 0, 0, NULL},

1 0

Stefan Dösinger : wined3d: Always store the palette index in the alpha component.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: c1cca63e5ddcf7e6235889ed95aec844495e5de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1cca63e5ddcf7e6235889ed9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:49 2014 +0200 wined3d: Always store the palette index in the alpha component. --- dlls/wined3d/surface.c | 184 ++++++++-------------------------------- dlls/wined3d/utils.c | 35 +------- dlls/wined3d/wined3d_private.h | 5 -- 3 files changed, 37 insertions(+), 187 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1cca63e5ddcf7e623588…

1 0

Henri Verbeet : d2d1: Add the ID2D1DrawingStateBlock interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: d20be31395d39850da29651b90be83980ab575d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d20be31395d39850da29651b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 13:02:37 2014 +0200 d2d1: Add the ID2D1DrawingStateBlock interface. --- include/d2d1.idl | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/include/d2d1.idl b/include/d2d1.idl index c6b9288..6fcadee 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -19,10 +19,14 @@ import "unknwn.idl"; import "d2dbasetypes.h"; +interface ID2D1Factory; +interface IDWriteRenderingParams; + typedef D2D_POINT_2F D2D1_POINT_2F; typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F; typedef D2D_RECT_F D2D1_RECT_F; typedef D2D_SIZE_F D2D1_SIZE_F; +typedef UINT64 D2D1_TAG; typedef enum D2D1_DEBUG_LEVEL { @@ -138,6 +142,22 @@ typedef enum D2D1_ARC_SIZE D2D1_ARC_SIZE_FORCE_DWORD = 0xffffffff, } D2D1_ARC_SIZE; +typedef enum D2D1_ANTIALIAS_MODE +{ + D2D1_ANTIALIAS_MODE_PER_PRIMITIVE = 0, + D2D1_ANTIALIAS_MODE_ALIASED = 1, + D2D1_ANTIALIAS_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_ANTIALIAS_MODE; + +typedef enum D2D1_TEXT_ANTIALIAS_MODE +{ + D2D1_TEXT_ANTIALIAS_MODE_DEFAULT = 0, + D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE = 1, + D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE = 2, + D2D1_TEXT_ANTIALIAS_MODE_ALIASED = 3, + D2D1_TEXT_ANTIALIAS_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_TEXT_ANTIALIAS_MODE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -186,7 +206,14 @@ typedef struct D2D1_ARC_SEGMENT D2D1_ARC_SIZE arcSize; } D2D1_ARC_SEGMENT; -interface ID2D1Factory; +typedef struct D2D1_DRAWING_STATE_DESCRIPTION +{ + D2D1_ANTIALIAS_MODE antialiasMode; + D2D1_TEXT_ANTIALIAS_MODE textAntialiasMode; + D2D1_TAG tag1; + D2D1_TAG tag2; + D2D1_MATRIX_3X2_F transform; +} D2D1_DRAWING_STATE_DESCRIPTION; [ local, @@ -450,5 +477,26 @@ interface ID2D1PathGeometry : ID2D1Geometry ); } +[ + local, + object, + uuid(28506e39-ebf6-46a1-bb47-fd85565ab957) +] +interface ID2D1DrawingStateBlock : ID2D1Resource +{ + void GetDescription( + [out] D2D1_DRAWING_STATE_DESCRIPTION *desc + ); + void SetDescription( + [in] const D2D1_DRAWING_STATE_DESCRIPTION *desc + ); + void SetTextRenderingParams( + [in] IDWriteRenderingParams *text_rendering_params + ); + void GetTextRenderingParams( + [out] IDWriteRenderingParams **text_rendering_params + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Austin English : user32: Add a stub for RegisterTouchWindow.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 6458aca761f56dffcdf117e81450720c26a0c53f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6458aca761f56dffcdf117e81… Author: Austin English <austinenglish(a)gmail.com> Date: Tue May 13 13:25:02 2014 -0500 user32: Add a stub for RegisterTouchWindow. --- dlls/user32/user32.spec | 1 + dlls/user32/win.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 0b5754e..1425dac 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -573,6 +573,7 @@ @ stdcall RegisterShellHookWindow (long) @ stdcall RegisterSystemThread(long long) @ stdcall RegisterTasklist (long) +@ stdcall RegisterTouchWindow(long long) # @ stub RegisterUserApiHook @ stdcall RegisterWindowMessageA(str) @ stdcall RegisterWindowMessageW(wstr) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 9e30321..c9660be 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3887,3 +3887,13 @@ LONG_PTR WINAPI SetWindowLongPtrA( HWND hwnd, INT offset, LONG_PTR newval ) { return WIN_SetWindowLong( hwnd, offset, sizeof(LONG_PTR), newval, FALSE ); } + +/***************************************************************************** + * RegisterTouchWindow (USER32.@) + */ +BOOL WINAPI RegisterTouchWindow(HWND hwnd, ULONG flags) +{ + FIXME("(%p %08x): stub\n", hwnd, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Huw Davies : msxml3/tests: Fix test on win 8.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 305db0f65bc3a2e227bb8cd1972fde3d60b3c2b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=305db0f65bc3a2e227bb8cd19… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 14 08:02:25 2014 +0100 msxml3/tests: Fix test on win 8. --- dlls/msxml3/tests/schema.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 484be86..f5d6fcd 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1519,10 +1519,10 @@ static void test_get(void) if (!cache) return; hr = IXMLDOMSchemaCollection2_get(cache, NULL, NULL); - EXPECT_HR(hr, E_NOTIMPL); + ok(hr == E_NOTIMPL || hr == E_POINTER /* win8 */, "got %08x\n", hr); hr = IXMLDOMSchemaCollection2_get(cache, _bstr_("uri"), &node); - ok(hr == E_NOTIMPL || hr == E_POINTER /* win8 */, "got %08x\n", hr); + EXPECT_HR(hr, E_NOTIMPL); IXMLDOMSchemaCollection2_Release(cache);

1 0

Nikolay Sivov : xmllite/writer: Implement GetProperty().
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: d2737dde801b55a1feb4d7d489082d3ced33f2fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2737dde801b55a1feb4d7d48… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 14 11:52:13 2014 +0400 xmllite/writer: Implement GetProperty(). --- dlls/xmllite/reader.c | 6 ++--- dlls/xmllite/tests/writer.c | 23 +++++++++++++++++++ dlls/xmllite/writer.c | 52 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 75 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 6e3f9cd..deb2d2e 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -123,7 +123,7 @@ static const char *debugstr_nodetype(XmlNodeType nodetype) return type_names[nodetype]; } -static const char *debugstr_prop(XmlReaderProperty prop) +static const char *debugstr_reader_prop(XmlReaderProperty prop) { static const char * const prop_names[] = { @@ -2537,7 +2537,7 @@ static HRESULT WINAPI xmlreader_GetProperty(IXmlReader* iface, UINT property, LO { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_prop(property), value); + TRACE("(%p)->(%s %p)\n", This, debugstr_reader_prop(property), value); if (!value) return E_INVALIDARG; @@ -2561,7 +2561,7 @@ static HRESULT WINAPI xmlreader_SetProperty(IXmlReader* iface, UINT property, LO { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)->(%s %lu)\n", This, debugstr_prop(property), value); + TRACE("(%p)->(%s %lu)\n", This, debugstr_reader_prop(property), value); switch (property) { diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index b5935c1..738844f 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -71,6 +71,7 @@ static void test_writer_create(void) { HRESULT hr; IXmlWriter *writer; + LONG_PTR value; /* crashes native */ if (0) @@ -81,6 +82,28 @@ static void test_writer_create(void) hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* check default properties values */ + value = 0; + hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_ByteOrderMark, &value); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(value == TRUE, "got %ld\n", value); + + value = TRUE; + hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_Indent, &value); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(value == FALSE, "got %ld\n", value); + + value = TRUE; + hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, &value); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(value == FALSE, "got %ld\n", value); + + value = XmlConformanceLevel_Auto; + hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_ConformanceLevel, &value); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(value == XmlConformanceLevel_Document, "got %ld\n", value); + IXmlWriter_Release(writer); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index a58164b..2432602 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -52,6 +52,10 @@ typedef struct _xmlwriter LONG ref; IMalloc *imalloc; xmlwriteroutput *output; + BOOL indent; + BOOL bom; + BOOL omitxmldecl; + XmlConformanceLevel conformance; } xmlwriter; static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) @@ -64,6 +68,23 @@ static inline xmlwriteroutput *impl_from_IXmlWriterOutput(IXmlWriterOutput *ifac return CONTAINING_RECORD(iface, xmlwriteroutput, IXmlWriterOutput_iface); } +static const char *debugstr_writer_prop(XmlWriterProperty prop) +{ + static const char * const prop_names[] = + { + "MultiLanguage", + "Indent", + "ByteOrderMark", + "OmitXmlDeclaration", + "ConformanceLevel" + }; + + if (prop > _XmlWriterProperty_Last) + return wine_dbg_sprintf("unknown property=%d", prop); + + return prop_names[prop]; +} + /* writer output memory allocation functions */ static inline void *writeroutput_alloc(xmlwriteroutput *output, size_t len) { @@ -191,13 +212,34 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) return writeroutput_query_for_stream(This->output); } -static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT nProperty, LONG_PTR *ppValue) +static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT property, LONG_PTR *value) { xmlwriter *This = impl_from_IXmlWriter(iface); - FIXME("%p %u %p\n", This, nProperty, ppValue); + TRACE("(%p)->(%s %p)\n", This, debugstr_writer_prop(property), value); - return E_NOTIMPL; + if (!value) return E_INVALIDARG; + + switch (property) + { + case XmlWriterProperty_Indent: + *value = This->indent; + break; + case XmlWriterProperty_ByteOrderMark: + *value = This->bom; + break; + case XmlWriterProperty_OmitXmlDeclaration: + *value = This->omitxmldecl; + break; + case XmlWriterProperty_ConformanceLevel: + *value = This->conformance; + break; + default: + FIXME("Unimplemented property (%u)\n", property); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT nProperty, LONG_PTR pValue) @@ -567,6 +609,10 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); writer->output = NULL; + writer->indent = FALSE; + writer->bom = TRUE; + writer->omitxmldecl = FALSE; + writer->conformance = XmlConformanceLevel_Document; *obj = &writer->IXmlWriter_iface;

1 0

Francois Gouget : testbot/WinePatchesWebSubmit: Improve robustness, particularly when the Engine is not running.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 82049e35353b4da6d074977cf1b05003c22283dd URL: http://source.winehq.org/git/tools.git/?a=commit;h=82049e35353b4da6d074977c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 16:43:47 2014 +0200 testbot/WinePatchesWebSubmit: Improve robustness, particularly when the Engine is not running. Now the Engine will automatically pick up patches from the patches website as part of its periodic 'SafetyNet' check. However WinePatchesWebSubmit can still be used to avoid the potential 10 minutes delay. Also, running WinePatchesWebSubmit when the Engine is stopped no longer has the side effect of leaking files in the staging directory. --- testbot/bin/Engine.pl | 86 +++++++++++++++++++----------- testbot/bin/WinePatchesWebSubmit.pl | 53 +++--------------- testbot/lib/WineTestBot/Engine/Notify.pm | 4 +- 3 files changed, 63 insertions(+), 80 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 2bb563a..72e165c 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -497,48 +497,73 @@ sub HandleWinePatchMLSubmission sub HandleWinePatchWebSubmission { - # Validate file name - if ($_[0] !~ m/([0-9a-fA-F]{32}_patch_\d+)/) + my $LatestWebPatchId = 0; + my $Patches = CreatePatches(); + foreach my $Patch (@{$Patches->GetItems()}) { - return "0Invalid file name"; + my $WebPatchId = $Patch->WebPatchId; + if (defined $WebPatchId and $LatestWebPatchId < $WebPatchId) + { + $LatestWebPatchId = $WebPatchId; + } } - my $FullFileName = "$DataDir/staging/$1"; - if ($_[1] !~ m/^(\d+)$/) + + # Rescan the directory for robustness in case the patches site has already + # expired $LatestWebPatchId+1 (for instance if the WineTestBot has not been + # run for a while). + my (@ErrMessages, @WebPatchIds); + if (opendir(my $dh, "$DataDir/webpatches")) { - return "0Invalid patch id"; + foreach my $Entry (readdir($dh)) + { + next if ($Entry !~ /^(\d+)$/); + my $WebPatchId = $1; + next if ($WebPatchId <= $LatestWebPatchId); + + my $Patches = CreatePatches($Patches); + $Patches->AddFilter("WebPatchId", [$WebPatchId]); + if (@{$Patches->GetKeys()}) + { + push @ErrMessages, "$WebPatchId already exists and yet the latest patch is $LatestWebPatchId"; + next; + } + push @WebPatchIds, $WebPatchId; + } + close($dh); } - my $WebPatchId = $1; - my $Patches = CreatePatches(); - $Patches->AddFilter("WebPatchId", [$WebPatchId]); - if (@{$Patches->GetKeys()}) + else { - LogMsg "Patch $WebPatchId already exists\n"; - return "1OK"; + return "0Unable to open '$DataDir/webpatches': $!"; } - # Create a working dir - my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - while (-e $WorkDir) + # Add the patches in increasing WebPatchId order so that next time + # $LatestWebPatchId still makes sense in case something goes wrong now + foreach my $WebPatchId (sort { $a <=> $b } @WebPatchIds) { - $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - } - mkdir $WorkDir; + # Create a working dir + my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; + while (-e $WorkDir) + { + $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; + } + mkdir $WorkDir; - # Process the patch - my $Parser = new MIME::Parser; - $Parser->output_dir($WorkDir); - my $Entity = $Parser->parse_open($FullFileName); - my $ErrMessage = CreatePatches()->NewPatch($Entity, $WebPatchId); + # Process the patch + my $Parser = new MIME::Parser; + $Parser->output_dir($WorkDir); + my $Entity = $Parser->parse_open("$DataDir/webpatches/$WebPatchId"); + my $ErrMessage = $Patches->NewPatch($Entity, $WebPatchId); + push @ErrMessages, $ErrMessage if (defined $ErrMessage); - # Clean up - if (!rmtree($WorkDir)) - { - # Not a fatal error but log it to help diagnosis - LogMsg "Unable to delete '$WorkDir': $!\n"; + # Clean up + if (!rmtree($WorkDir)) + { + # Not a fatal error but log it to help diagnosis + LogMsg "Unable to delete '$WorkDir': $!\n"; + } } - unlink($FullFileName); - return defined($ErrMessage) ? "0" . $ErrMessage : "1OK"; + return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; } sub HandleGetScreenshot @@ -629,6 +654,7 @@ sub SafetyNet { CheckJobs(); ScheduleJobs(); + HandleWinePatchWebSubmission(); my $Set = WineTestBot::PendingPatchSets::CreatePendingPatchSets(); my $ErrMessage = $Set->CheckForCompleteSet(); diff --git a/testbot/bin/WinePatchesWebSubmit.pl b/testbot/bin/WinePatchesWebSubmit.pl index d5b032a..15a5fd5 100755 --- a/testbot/bin/WinePatchesWebSubmit.pl +++ b/testbot/bin/WinePatchesWebSubmit.pl @@ -37,56 +37,15 @@ sub BEGIN } } -use File::Copy; -use WineTestBot::Config; use WineTestBot::Log; -use WineTestBot::Utils; -use WineTestBot::Patches; use WineTestBot::Engine::Notify; -my ($MaxCount) = @ARGV; -if (defined $MaxCount) +# Just tell the Engine to rescan the webpatches directory +my $ErrMessage = WinePatchWebSubmission(); +if (defined $ErrMessage) { - $MaxCount =~ m/^(\d+)$/; - $MaxCount = $1; + LogMsg "$ErrMessage\n"; + exit(1); } -my $LastWebPatchId = 0; -foreach my $Patch (@{CreatePatches()->GetItems()}) -{ - my $WebPatchId = $Patch->WebPatchId; - if (defined $WebPatchId and $LastWebPatchId < $WebPatchId) - { - $LastWebPatchId = $WebPatchId; - } -} - -while (1) -{ - $LastWebPatchId++; - my $NewPatch = "$DataDir/webpatches/$LastWebPatchId"; - last if (!-f $NewPatch); - - my $FileNameRandomPart = GenerateRandomString(32); - while (-e "$DataDir/staging/${FileNameRandomPart}_patch_$LastWebPatchId") - { - $FileNameRandomPart = GenerateRandomString(32); - } - my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_patch_$LastWebPatchId"; - - if (!copy($NewPatch, $StagingFileName)) - { - LogMsg "Unable to copy '$NewPatch' to '$StagingFileName': $!\n"; - exit 1; - } - - WinePatchWebSubmission("${FileNameRandomPart}_patch_$LastWebPatchId", $LastWebPatchId); - LogMsg "Added wine-patches patch $LastWebPatchId\n"; - if (defined $MaxCount) - { - $MaxCount--; - last if ($MaxCount == 0); - } -} - -exit; +exit(0); diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 09191ee..1f93db4 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -233,9 +233,7 @@ sub WinePatchMLSubmission sub WinePatchWebSubmission { - my ($FileName, $WebPatchId) = @_; - - my $Reply = SendCmdReceiveReply("winepatchwebsubmission $FileName $WebPatchId\n"); + my $Reply = SendCmdReceiveReply("winepatchwebsubmission\n"); if (length($Reply) < 1) { return "Unrecognized reply received from engine";

1 0

Francois Gouget : testbot/VMs: Catch the Libvirt exceptions in IsPoweredOn ().
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: f82c4e5293766e926c8b1bde2e353d58ab13d902 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f82c4e5293766e926c8b1bde… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 16:36:17 2014 +0200 testbot/VMs: Catch the Libvirt exceptions in IsPoweredOn(). --- testbot/lib/WineTestBot/VMs.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 1cf1a42..0aa06eb 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -352,7 +352,10 @@ sub IsPoweredOn($) my ($ErrMessage, $Domain) = $self->_GetDomain(); return undef if (defined $ErrMessage); - return $Domain->is_active(); + my $IsActive; + eval { $IsActive = $Domain->is_active() }; + return undef if ($@); + return $IsActive; } sub PowerOn

1 0

Francois Gouget : testbot/log2revtimes: Add a script to extract the VM revert times from the WineTestBot log and prepare them for analysis.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 8928cfed8b86c32d627ab8b0ace514d15b7469f3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8928cfed8b86c32d627ab8b0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 12 19:31:27 2014 +0200 testbot/log2revtimes: Add a script to extract the VM revert times from the WineTestBot log and prepare them for analysis. --- testbot/scripts/log2revtimes | 324 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 324 insertions(+) diff --git a/testbot/scripts/log2revtimes b/testbot/scripts/log2revtimes new file mode 100755 index 0000000..2eac048 --- /dev/null +++ b/testbot/scripts/log2revtimes @@ -0,0 +1,324 @@ +#!/usr/bin/perl +# +# Parses the WineTestBot Engine's log to extract the VM revert times. +# +# Copyright 2013-2014 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use warnings; +use strict; + +use DateTime::Format::Strptime; + + +my $name0 = $0; +$name0 =~ s+^.*/++; + +sub error(@) +{ + print STDERR "$name0:error: ", @_; +} + + +# +# Command line parsing +# + +my $Usage; + +sub check_opt_val($$) +{ + my ($option, $val) = @_; + + if (defined $val) + { + error("$option can only be specified once\n"); + $Usage = 2; # but continue processing this option + } + if (!@ARGV) + { + error("missing value for $option\n"); + $Usage = 2; + return undef; + } + return shift @ARGV; +} + +sub CheckAndConvertDate($) +{ + my ($DateStr) = @_; + return undef if (!defined $DateStr); + + my $DateParser = DateTime::Format::Strptime->new( + pattern => '%Y/%m/%d', + time_zone => 'local', + ); + my $DT = $DateParser->parse_datetime($DateStr); + if (!defined $DT) + { + error("'$DateStr' is not a valid timestamp\n"); + $Usage = 2; + return undef; + } + return $DT->epoch; +} + +my ($OptLogFile, $OptMixed, $OptStart, $OptStop, $OptMaxLines); + +while (@ARGV) +{ + my $arg = shift @ARGV; + if ($arg eq "--help") + { + $Usage = 0; + } + elsif ($arg eq "--mixed") + { + $OptMixed = 1; + } + elsif ($arg eq "--start") + { + $OptStart = check_opt_val($arg, $OptStart); + } + elsif ($arg eq "--stop") + { + $OptStop = check_opt_val($arg, $OptStop); + } + elsif ($arg eq "--max-lines") + { + $OptMaxLines = check_opt_val($arg, $OptMaxLines); + } + elsif (!defined $OptLogFile) + { + $OptLogFile = $arg; + } + else + { + error("unexpected argument '$arg'\n"); + $Usage = 2; + } +} + +if (!defined $Usage) +{ + if (!defined $OptLogFile) + { + error("you must specify the log file to analyze\n"); + $Usage = 2; + } + $OptStart = CheckAndConvertDate($OptStart); + $OptStop = CheckAndConvertDate($OptStop); + if (defined $OptStart and defined $OptStop and $OptStop <= $OptStart) + { + error("the start date must be earlier than the stop date\n"); + $Usage = 2; + } + if (defined $OptMaxLines) + { + my $oldwarn = $SIG{__WARN__}; + $SIG{__WARN__} = sub { die $_[0] }; + my $bad = eval { $OptMaxLines < 1 }; + if (defined $oldwarn) + { + $SIG{__WARN__} = $oldwarn; + } + else + { + delete $SIG{__WARN__}; + } + if ($bad or $@) + { + error("the maximum line count is invalid\n"); + $Usage = 2; + } + } +} +if (defined $Usage) +{ + if ($Usage) + { + error("try '$name0 --help' for more information\n"); + exit $Usage; + } + print "Usage: $name0 [--help] LOGFILE\n"; + print "\n"; + print "Analyzes a WineTestBot log file and generates a report on stdout containing the revert times per VM. The report is tab-separated and is suitable for import into a spreadsheet.\n"; + print "\n"; + print "Where:\n"; + print " LOGFILE Is the log file to analyze.\n"; + print " --mixed Report the revert times of all the VMs together instead of\n"; + print " having a set of columns for each VM.\n"; + print " --start DATE Only report about revert starting on or after the specified\n"; + print " date (in yyyy/mm/dd format).\n"; + print " --stop DATE Only report about revert ending on or before the specified\n"; + print " date (in yyyy/mm/dd format).\n"; + print " --max-lines COUNT The maximum number of lines to return.\n"; + print " --help Shows this usage message.\n"; + exit 0; +} + + +# +# Log parsing +# + +my ($Lines, %VMReverts, %VMLines); + +sub AddRevert($$$$) +{ + my ($Date, $Duration, $VM, $Snapshot) = @_; + + if ($OptMixed) + { + print "$Date\t$Duration\t\"$VM\"\t\"$Snapshot\"\n"; + $Lines++; + return 0 if (defined $OptMaxLines and $Lines > $OptMaxLines); + } + else + { + # Skip reverts that have errors + return 1 if ($Duration < 0); + $VMReverts{$VM} ||= []; + push @{$VMReverts{$VM}}, [$Date, $Duration, $Snapshot]; + $VMLines{$VM}++; + return 0 if (defined $OptMaxLines and $VMLines{$VM} > $OptMaxLines); + } + return 1; +} + +if (open(my $fh, "<", $OptLogFile)) +{ + print "Timestamp\tDuration\tVM\tSnapshot\n" if ($OptMixed); + + my $DateParser = DateTime::Format::Strptime->new( + pattern => '%a %b %d %H:%M:%S %Y', + time_zone => 'local', + ); + + my (%Epochs, %Dates, %Snapshots); + my $Skip = defined $OptStart ? 1 : defined $OptStop ? 0 : undef; + foreach my $Line (<$fh>) + { + next if ($Line !~ s/^(.*?) RevertVM(?:\[[0-9]*\])?: (Reverting|Letting) ([a-zA-Z0-9-]+)//); + my ($DateStr, $Action, $VM) = ($1, $2, $3); + my $DT = $DateParser->parse_datetime($DateStr); + my $Epoch = $DT->epoch; + + if ($Skip) + { + if (defined $OptStart and $OptStart <= $Epoch) + { + $Skip = 0; + } + else + { + next; + } + } + elsif (defined $Skip and defined $OptStop and $Epoch > $OptStop) + { + last; + } + + if ($Action eq "Reverting") + { + if (defined $Epochs{$VM}) + { + # This revert never completed! + my $Snapshot = $Snapshots{$VM} || "Unknown"; + last if (!AddRevert($Dates{$VM}, -2, $VM, $Snapshot)); + } + + $Epochs{$VM} = $Epoch; + $Dates{$VM} = $DT->ymd("/") . " " . $DT->hms(); + $Snapshots{$VM} = $1 if ($Line =~ /to ([a-zA-Z0-9-]+)$/); + } + else + { + my $Snapshot = $Snapshots{$VM} || "Unknown"; + if (!defined $Epochs{$VM}) + { + # We don't have a start date for this revert! + last if (!AddRevert($Dates{$VM}, -1, $VM, "Unknown")); + } + else + { + my $Duration = $Epoch - $Epochs{$VM}; + last if (!AddRevert($Dates{$VM}, $Duration, $VM, $Snapshot)); + } + + delete $Epochs{$VM}; + delete $Dates{$VM}; + delete $Snapshots{$VM}; + } + } + close($fh); +} +else +{ + error("unable to open '$OptLogFile' for reading: $!\n"); + exit 1; +} + + +# +# Report output +# + +if (!$OptMixed) +{ + my $First=1; + foreach my $VM (sort keys %VMReverts) + { + print "\t" if (!$First); + $First = undef; + print "$VM\t\t"; + } + print "\n"; + + $First=1; + my $LineCount = 0; + foreach my $VM (sort keys %VMReverts) + { + print "\t" if (!$First); + $First = undef; + print "Date\tDuration\tSnapshot"; + $LineCount = $VMLines{$VM} if ($LineCount < $VMLines{$VM}); + } + print "\n"; + + for (my $i = 0; $i < $LineCount; $i++) + { + $First=1; + foreach my $VM (sort keys %VMReverts) + { + print "\t" if (!$First); + $First = undef; + + my $Revert = $VMReverts{$VM}->[$i]; + if ($Revert) + { + my ($Date, $Duration, $Snapshot) = @$Revert; + print "$Date\t$Duration\t$Snapshot"; + } + else + { + print "\t\t"; + } + } + print "\n"; + } +}

1 0

Francois Gouget : testbot/web: Fix handling of tasks error messages.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 02d6cb133c3d87be0ded493a8eaf96c81d48960c URL: http://source.winehq.org/git/tools.git/?a=commit;h=02d6cb133c3d87be0ded493a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 16:35:37 2014 +0200 testbot/web: Fix handling of tasks error messages. The <pre><code> tag nesting was broken for the error messages, resulting in unreadable multi-line error messages and an inability to view the later tasks reports. --- testbot/web/JobDetails.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index b1a3186..04ec3c5 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -402,10 +402,10 @@ sub GenerateBody { print "</code></pre>\n"; } + print "<br><pre><code>"; $PrintedDll = $CurrentDll; } - print "<br>\n"; - print "<pre><code>", $self->escapeHTML($Line), "\n"; + print $self->escapeHTML($Line), "\n"; } close ERRFILE; }

1 0

Francois Gouget : testbot/WinePatchesMLSubmit: Better handle errors and times when the Engine is not running.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 2cdc80043ed19e500164d4255a2551bb24089203 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2cdc80043ed19e500164d425… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 02:41:26 2014 +0200 testbot/WinePatchesMLSubmit: Better handle errors and times when the Engine is not running. WinePatchesMLSubmit must return a non-zero exit code in case it could not deliver the message so the caller gets a chance to handle the situation gracefully. Have the Engine scan the staging directory for pending patches from the mailing list and automatically handle them, in particular on startup. This makes it possible for WinePatchesMLSubmit to deliver the patches even if the Engine is not running which is more robust. This also fixes a potential source of staging files leak. --- testbot/bin/Engine.pl | 77 ++++++++++++++++-------------- testbot/bin/WinePatchesMLSubmit.pl | 24 +++++++--- testbot/lib/WineTestBot/Engine/Notify.pm | 4 +- 3 files changed, 61 insertions(+), 44 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index ea04461..2bb563a 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -446,36 +446,53 @@ sub HandleFoundWinetestUpdate sub HandleWinePatchMLSubmission { - # Validate file name - if ($_[0] !~ m/([0-9a-fA-F]{32}_wine-patches)/) + my $dh; + if (!opendir($dh, "$DataDir/staging")) { - return "0Invalid file name"; + return "0Unable to open '$DataDir/staging': $!"; } - my $FullMessageFileName = "$DataDir/staging/$1"; - # Create a working dir - my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - while (-e $WorkDir) + # Read the directory ahead as we'll be adding / removing entries + my @Entries = readdir($dh); + closedir($dh); + + my @ErrMessages; + foreach my $Entry (@Entries) { - $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - } - mkdir $WorkDir; + # Validate file name + next if ($Entry !~ m/^([0-9a-fA-F]{32}_wine-patches)$/); + my $FullMessageFileName = "$DataDir/staging/$1"; - # Process the patch - my $Parser = new MIME::Parser; - $Parser->output_dir($WorkDir); - my $Entity = $Parser->parse_open($FullMessageFileName); - CreatePatches()->NewPatch($Entity); + # Create a work directory + my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; + while (-e $WorkDir) + { + $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; + } + mkdir $WorkDir; - # Clean up - if (!rmtree($WorkDir)) - { - # Not a fatal error but log it to help diagnosis - LogMsg "Unable to delete '$WorkDir': $!\n"; + # Process the patch + my $Parser = new MIME::Parser; + $Parser->output_dir($WorkDir); + my $Entity = $Parser->parse_open($FullMessageFileName); + my $ErrMessage = CreatePatches()->NewPatch($Entity); + push @ErrMessages, $ErrMessage if (defined $ErrMessage); + + # Clean up + if (!rmtree($WorkDir)) + { + # Not a fatal error but log it to help diagnosis + LogMsg "Unable to delete '$WorkDir': $!\n"; + } + if (!unlink($FullMessageFileName)) + { + # This is more serious because it could cause a patch to be added + # again and again. But there is not much we can do. + LogMsg "Unable to delete '$FullMessageFileName': $!\n"; + } } - unlink($FullMessageFileName); - return "1OK"; + return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; } sub HandleWinePatchWebSubmission @@ -613,19 +630,6 @@ sub SafetyNet CheckJobs(); ScheduleJobs(); - if (opendir STAGING, "$DataDir/staging") - { - my @DirEntries = readdir STAGING; - closedir STAGING; - foreach my $DirEntry (@DirEntries) - { - if ($DirEntry =~ m/[0-9a-fA-F]{32}_wine-patches/) - { - HandleWinePatchMLSubmission($DirEntry); - } - } - } - my $Set = WineTestBot::PendingPatchSets::CreatePendingPatchSets(); my $ErrMessage = $Set->CheckForCompleteSet(); if (defined($ErrMessage)) @@ -737,6 +741,9 @@ sub main Cleanup(); + # Check for patches that arrived while the server was off. + HandleWinePatchMLSubmission(); + my $SockName = "$DataDir/socket/engine"; my $uaddr = sockaddr_un($SockName); my $proto = getprotobyname('tcp'); diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index ffc65cb..e904bbc 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -41,16 +41,28 @@ use File::Copy; use WineTestBot::Config; use WineTestBot::Utils; use WineTestBot::Engine::Notify; +use WineTestBot::Log; # Store the message in the staging dir -my $FileNameRandomPart = GenerateRandomString(32); -while (-e ("$DataDir/staging/${FileNameRandomPart}_wine-patches")) +my $FileName = GenerateRandomString(32) . "_wine-patches"; +while (-e ("$DataDir/staging/$FileName")) { - $FileNameRandomPart = GenerateRandomString(32); + $FileName = GenerateRandomString(32); } -copy(\*STDIN, "$DataDir/staging/${FileNameRandomPart}_wine-patches"); +if (!copy(\*STDIN, "$DataDir/staging/$FileName")) +{ + LogMsg "Unable to copy the email to '$FileName': $!\n"; + exit 1; +} + -# Let the engine handle it -WinePatchMLSubmission("${FileNameRandomPart}_wine-patches"); +# Notify the Engine of the new message +my $ErrMessage = WinePatchMLSubmission(); +if (defined $ErrMessage) +{ + # The Engine will pick up the email later so return success anyway. + # But still log the issue so it can be checked out. + LogMsg "$ErrMessage\n" +} exit 0; diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index f376337..09191ee 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -218,9 +218,7 @@ sub FoundWinetestUpdate sub WinePatchMLSubmission { - my $FileName = $_[0]; - - my $Reply = SendCmdReceiveReply("winepatchmlsubmission $FileName\n"); + my $Reply = SendCmdReceiveReply("winepatchmlsubmission\n"); if (length($Reply) < 1) { return "Unrecognized reply received from engine";

1 0

Francois Gouget : testbot/Engine: Rename the TaskComplete() notification to RescheduleJobs().
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 8e09345b413f4bc7acd64d3dcc3691b20934ab6a URL: http://source.winehq.org/git/tools.git/?a=commit;h=8e09345b413f4bc7acd64d3d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 02:34:31 2014 +0200 testbot/Engine: Rename the TaskComplete() notification to RescheduleJobs(). It did not actually use the Task ID and only calls ScheduleJobs() so the new name is more accurate. --- testbot/bin/Engine.pl | 6 +++--- testbot/bin/WineRunBuild.pl | 4 ++-- testbot/bin/WineRunReconfig.pl | 4 ++-- testbot/bin/WineRunTask.pl | 4 ++-- testbot/lib/WineTestBot/Engine/Notify.pm | 8 +++----- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index f0570d7..ea04461 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -390,12 +390,12 @@ sub HandleJobRestart return "1OK"; } -sub HandleTaskComplete +sub HandleRescheduleJobs { my $ErrMessage = ScheduleJobs(); if (defined($ErrMessage)) { - LogMsg "Scheduling problem in HandleTaskComplete: $ErrMessage\n"; + LogMsg "Scheduling problem in HandleRescheduleJobs: $ErrMessage\n"; } return "1OK"; @@ -560,7 +560,7 @@ my %Handlers=( "jobsubmit" => \&HandleJobSubmit, "ping" => \&HandlePing, "shutdown" => \&HandleShutdown, - "taskcomplete" => \&HandleTaskComplete, + "reschedulejobs" => \&HandleRescheduleJobs, "vmstatuschange" => \&HandleVMStatusChange, "winepatchmlsubmission" => \&HandleWinePatchMLSubmission, "winepatchwebsubmission" => \&HandleWinePatchWebSubmission, diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index e8561c9..b07454b 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -76,7 +76,7 @@ sub FatalError($$$$) $VM->Save(); } - TaskComplete($JobKey, $StepKey, $TaskKey); + RescheduleJobs(); exit 1; } @@ -333,7 +333,7 @@ $Task = undef; $Step = undef; $Job = undef; -TaskComplete($JobId, $StepNo, $TaskNo); +RescheduleJobs(); LogMsg "Task $JobId/$StepNo/$TaskNo completed\n"; exit 0; diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 562b9d1..555f4e4 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -76,7 +76,7 @@ sub FatalError($$$$) $VM->Save(); } - TaskComplete($JobKey, $StepKey, $TaskKey); + RescheduleJobs(); exit 1; } @@ -291,7 +291,7 @@ $Task = undef; $Step = undef; $Job = undef; -TaskComplete($JobId, $StepNo, $TaskNo); +RescheduleJobs(); LogMsg "Task $JobId/$StepNo/$TaskNo completed\n"; exit 0; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index efeac8d..2413a76 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -84,7 +84,7 @@ sub FatalError($$$$$) $VM->Status('dirty'); $VM->Save(); - TaskComplete($JobKey, $StepKey, $TaskKey); + RescheduleJobs(); exit 1; } @@ -383,7 +383,7 @@ $Task = undef; $Step = undef; $Job = undef; -TaskComplete($JobId, $StepNo, $TaskNo); +RescheduleJobs(); LogMsg "Task $JobId/$StepNo/$TaskNo (" . $VM->Name . ") completed\n"; exit 0; diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 1a1ab6d..f376337 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 &TaskComplete &VMStatusChange &FoundWinetestUpdate + &JobRestart &RescheduleJobs &VMStatusChange &FoundWinetestUpdate &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); @EXPORT_OK = qw($RunningInEngine); @@ -167,11 +167,9 @@ sub JobRestart return substr($Reply, 1); } -sub TaskComplete +sub RescheduleJobs { - my ($JobKey, $StepKey, $TaskKey) = @_; - - my $Reply = SendCmdReceiveReply("taskcomplete $JobKey $StepKey $TaskKey\n"); + my $Reply = SendCmdReceiveReply("reschedulejobs\n"); if (length($Reply) < 1) { return "Unrecognized reply received from engine";

1 0

Francois Gouget : testbot/web: Always use a random prefix for the staging filename.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 3471277f654cb79ac2dc0c4393c37a4a3fab47d8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=3471277f654cb79ac2dc0c43… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 14 19:34:06 2014 +0200 testbot/web: Always use a random prefix for the staging filename. Starting with the session id means we'll have to try again to find a new unique filename. --- testbot/web/Submit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index f73ae6a..0d9d0b4 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -794,7 +794,7 @@ sub OnSubmit # Make sure the file has a unique name even when not picked up directly # by the engine - my $FileNameRandomPart = $self->GetCurrentSession()->Id; + my $FileNameRandomPart = GenerateRandomString(32); while (-e ("$DataDir/staging/${FileNameRandomPart}_" . $self->GetParam("FileName"))) {

1 0

Jacek Caban : ntdll: Use MAP_PRIVATE for copy on write mappings.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 5ceb22714e965692acf2b0ec9af0dabc5dfc8b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ceb22714e965692acf2b0ec9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 13 12:02:48 2014 +0200 ntdll: Use MAP_PRIVATE for copy on write mappings. --- dlls/kernel32/tests/virtual.c | 17 +++++++++++------ dlls/ntdll/virtual.c | 3 ++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 174d422..0955d30 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2489,7 +2489,7 @@ static void test_shared_memory(BOOL is_child) CloseHandle(mapping); } -static void test_shared_memory_ro(BOOL is_child) +static void test_shared_memory_ro(BOOL is_child, DWORD child_access) { HANDLE mapping; LONG *p; @@ -2501,7 +2501,7 @@ static void test_shared_memory_ro(BOOL is_child) ok(GetLastError() == ERROR_ALREADY_EXISTS, "expected ERROR_ALREADY_EXISTS, got %d\n", GetLastError()); SetLastError(0xdeadbef); - p = MapViewOfFile(mapping, FILE_MAP_READ | (is_child ? FILE_MAP_WRITE : 0), 0, 0, 4096); + p = MapViewOfFile(mapping, is_child ? child_access : FILE_MAP_READ, 0, 0, 4096); ok(p != NULL, "MapViewOfFile error %d\n", GetLastError()); if (is_child) @@ -2517,14 +2517,17 @@ static void test_shared_memory_ro(BOOL is_child) DWORD ret; winetest_get_mainargs(&argv); - sprintf(cmdline, "\"%s\" virtual sharedmemro", argv[0]); + sprintf(cmdline, "\"%s\" virtual sharedmemro %x", argv[0], child_access); ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); winetest_wait_child_process(pi.hProcess); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); - ok(*p == 0xdeadbeef, "*p = %x, expected 0xdeadbeef\n", *p); + if(child_access & FILE_MAP_WRITE) + ok(*p == 0xdeadbeef, "*p = %x, expected 0xdeadbeef\n", *p); + else + ok(!*p, "*p = %x, expected 0\n", *p); } UnmapViewOfFile(p); @@ -2551,7 +2554,7 @@ START_TEST(virtual) } if (!strcmp(argv[2], "sharedmemro")) { - test_shared_memory_ro(TRUE); + test_shared_memory_ro(TRUE, strtol(argv[3], NULL, 16)); return; } while (1) @@ -2580,7 +2583,9 @@ START_TEST(virtual) pNtUnmapViewOfSection = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtUnmapViewOfSection"); test_shared_memory(FALSE); - test_shared_memory_ro(FALSE); + test_shared_memory_ro(FALSE, FILE_MAP_READ|FILE_MAP_WRITE); + test_shared_memory_ro(FALSE, FILE_MAP_COPY); + test_shared_memory_ro(FALSE, FILE_MAP_COPY|FILE_MAP_WRITE); test_mapping(); test_CreateFileMapping_protection(); test_VirtualAlloc_protection(); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d9acac6..70dea5a 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2627,7 +2627,8 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p TRACE("handle=%p size=%lx offset=%x%08x\n", handle, size, offset.u.HighPart, offset.u.LowPart ); - res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, MAP_SHARED, !dup_mapping ); + res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, + (vprot & VPROT_WRITECOPY) ? MAP_PRIVATE : MAP_SHARED, !dup_mapping ); if (res == STATUS_SUCCESS) { *addr_ptr = view->base;

1 0

Alexandre Julliard : ntdll: Determine the mapping type automatically from the WRITECOPY flag.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 2cef8dbcc29739278037e6409e0a00a4fa8dc0d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cef8dbcc29739278037e6409… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 13 12:28:58 2014 +0200 ntdll: Determine the mapping type automatically from the WRITECOPY flag. --- dlls/ntdll/virtual.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 70dea5a..4819d2d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -854,10 +854,11 @@ done: * The csVirtual section must be held by caller. */ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start, size_t size, - off_t offset, unsigned int vprot, int flags, BOOL removable ) + off_t offset, unsigned int vprot, BOOL removable ) { void *ptr; int prot = VIRTUAL_GetUnixProt( vprot | VPROT_COMMITTED /* make sure it is accessible */ ); + unsigned int flags = MAP_FIXED | ((vprot & VPROT_WRITECOPY) ? MAP_PRIVATE : MAP_SHARED); assert( start < view->size ); assert( start + size <= view->size ); @@ -872,7 +873,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start /* only try mmap if media is not removable (or if we require write access) */ if (!removable || (flags & MAP_SHARED)) { - if (mmap( (char *)view->base + start, size, prot, flags | MAP_FIXED, fd, offset ) != (void *)-1) + if (mmap( (char *)view->base + start, size, prot, flags, fd, offset ) != (void *)-1) goto done; if ((errno == EPERM) && (prot & PROT_EXEC)) @@ -1094,7 +1095,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz if (!st.st_size) goto error; header_size = min( header_size, st.st_size ); if (map_file_into_view( view, fd, 0, header_size, 0, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) goto error; + !dup_mapping ) != STATUS_SUCCESS) goto error; dos = (IMAGE_DOS_HEADER *)ptr; nt = (IMAGE_NT_HEADERS *)(ptr + dos->e_lfanew); header_end = ptr + ROUND_SIZE( 0, header_size ); @@ -1118,8 +1119,8 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz /* unaligned sections, this happens for native subsystem binaries */ /* in that case Windows simply maps in the whole file */ - if (map_file_into_view( view, fd, 0, total_size, 0, VPROT_COMMITTED | VPROT_READ, - MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) goto error; + if (map_file_into_view( view, fd, 0, total_size, 0, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, + !dup_mapping ) != STATUS_SUCCESS) goto error; /* check that all sections are loaded at the right offset */ if (nt->OptionalHeader.FileAlignment != nt->OptionalHeader.SectionAlignment) goto error; @@ -1172,8 +1173,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz sec->PointerToRawData, (int)pos, file_size, map_size, sec->Characteristics ); if (map_file_into_view( view, shared_fd, sec->VirtualAddress, map_size, pos, - VPROT_COMMITTED | VPROT_READ | VPROT_WRITE, - MAP_SHARED, FALSE ) != STATUS_SUCCESS) + VPROT_COMMITTED | VPROT_READ | VPROT_WRITE, FALSE ) != STATUS_SUCCESS) { ERR_(module)( "Could not map shared section %.8s\n", sec->Name ); goto error; @@ -1189,8 +1189,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz if (end > base) map_file_into_view( view, shared_fd, base, end - base, pos + (base - sec->VirtualAddress), - VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - MAP_PRIVATE, FALSE ); + VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, FALSE ); } pos += map_size; continue; @@ -1212,7 +1211,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz end < file_start || map_file_into_view( view, fd, sec->VirtualAddress, file_size, file_start, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) + !dup_mapping ) != STATUS_SUCCESS) { ERR_(module)( "Could not map section %.8s, file probably truncated\n", sec->Name ); goto error; @@ -2627,8 +2626,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p TRACE("handle=%p size=%lx offset=%x%08x\n", handle, size, offset.u.HighPart, offset.u.LowPart ); - res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, - (vprot & VPROT_WRITECOPY) ? MAP_PRIVATE : MAP_SHARED, !dup_mapping ); + res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, !dup_mapping ); if (res == STATUS_SUCCESS) { *addr_ptr = view->base;

1 0

Alex Henrie : gdi32/tests: Add MS Shell Dlg tests.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 0fb88f8d01fd69e3d026fba069a66aa05413d48a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb88f8d01fd69e3d026fba06… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 11 22:05:12 2014 -0600 gdi32/tests: Add MS Shell Dlg tests. --- dlls/gdi32/tests/font.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 255771a..0e75088 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4681,6 +4681,7 @@ static void test_EnumFonts(void) int ret; LOGFONTA lf; HDC hdc; + struct enum_fullname_data efnd; if (!is_truetype_font_installed("Arial")) { @@ -4741,6 +4742,28 @@ static void test_EnumFonts(void) ret = EnumFontFamiliesA(hdc, NULL, enum_all_fonts_proc, (LPARAM)&lf); ok(ret, "font Arial Italic Bold should not be enumerated\n"); + /* MS Shell Dlg and MS Shell Dlg 2 must exist */ + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + + memset(&efnd, 0, sizeof(efnd)); + strcpy(lf.lfFaceName, "MS Shell Dlg"); + ret = EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0); + ok(ret, "font MS Shell Dlg is not enumerated\n"); + ret = strcmp((char*)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg"); + todo_wine ok(!ret, "expected MS Shell Dlg got %s\n", efnd.elf[0].elfLogFont.lfFaceName); + ret = strcmp((char*)efnd.elf[0].elfFullName, "MS Shell Dlg"); + ok(ret, "did not expect MS Shell Dlg\n"); + + memset(&efnd, 0, sizeof(efnd)); + strcpy(lf.lfFaceName, "MS Shell Dlg 2"); + ret = EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0); + ok(ret, "font MS Shell Dlg 2 is not enumerated\n"); + ret = strcmp((char*)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg 2"); + todo_wine ok(!ret, "expected MS Shell Dlg 2 got %s\n", efnd.elf[0].elfLogFont.lfFaceName); + ret = strcmp((char*)efnd.elf[0].elfFullName, "MS Shell Dlg 2"); + ok(ret, "did not expect MS Shell Dlg 2\n"); + DeleteDC(hdc); }

1 0

Jacek Caban : mshtml: Use debugstr_mshtml_guid in a few more places.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 6ebe1c60e243ac2b70ec19cceebb7d1a6a8f2cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ebe1c60e243ac2b70ec19cce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 13 18:56:30 2014 +0200 mshtml: Use debugstr_mshtml_guid in a few more places. --- dlls/mshtml/htmlstorage.c | 2 +- dlls/mshtml/htmlstylesheet.c | 42 +++++++++++++++++------------------------- dlls/mshtml/htmlwindow.c | 33 +++++++++------------------------ dlls/mshtml/main.c | 12 ++++++++++++ 4 files changed, 39 insertions(+), 50 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 3e169ba..60a2a3a 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -56,7 +56,7 @@ static HRESULT WINAPI HTMLStorage_QueryInterface(IHTMLStorage *iface, REFIID rii return *ppv ? S_OK : E_NOINTERFACE; }else { *ppv = NULL; - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); return E_NOINTERFACE; } diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 4258f79..8f48a07 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -68,17 +68,17 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_QueryInterface(IHTMLStyleShe { HTMLStyleSheetRulesCollection *This = impl_from_IHTMLStyleSheetRulesCollection(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetRulesCollection_iface; }else if(IsEqualGUID(&IID_IHTMLStyleSheetRulesCollection, riid)) { - TRACE("(%p)->(IID_IHTMLStyleSheetRulesCollection %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetRulesCollection_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { *ppv = NULL; - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + FIXME("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); return E_NOINTERFACE; } @@ -222,28 +222,24 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_QueryInterface(IHTMLStyleSheetsC { HTMLStyleSheetsCollection *This = impl_from_IHTMLStyleSheetsCollection(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetsCollection_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetsCollection_iface; }else if(IsEqualGUID(&IID_IHTMLStyleSheetsCollection, riid)) { - TRACE("(%p)->(IID_IHTMLStyleSheetsCollection %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetsCollection_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("unsupported %s\n", debugstr_mshtml_guid(riid)); + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("unsupported %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI HTMLStyleSheetsCollection_AddRef(IHTMLStyleSheetsCollection *iface) @@ -415,28 +411,24 @@ static HRESULT WINAPI HTMLStyleSheet_QueryInterface(IHTMLStyleSheet *iface, REFI { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheet_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheet_iface; }else if(IsEqualGUID(&IID_IHTMLStyleSheet, riid)) { - TRACE("(%p)->(IID_IHTMLStyleSheet %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheet_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("unsupported %s\n", debugstr_mshtml_guid(riid)); + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("unsupported %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI HTMLStyleSheet_AddRef(IHTMLStyleSheet *iface) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index a57dfba..1333608 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -141,59 +141,45 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLWindow2_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLWindow2_iface; }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { - TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); *ppv = &This->IDispatchEx_iface; }else if(IsEqualGUID(&IID_IHTMLFramesCollection2, riid)) { - TRACE("(%p)->(IID_IHTMLFramesCollection2 %p)\n", This, ppv); *ppv = &This->IHTMLWindow2_iface; }else if(IsEqualGUID(&IID_IHTMLWindow2, riid)) { - TRACE("(%p)->(IID_IHTMLWindow2 %p)\n", This, ppv); *ppv = &This->IHTMLWindow2_iface; }else if(IsEqualGUID(&IID_IHTMLWindow3, riid)) { - TRACE("(%p)->(IID_IHTMLWindow3 %p)\n", This, ppv); *ppv = &This->IHTMLWindow3_iface; }else if(IsEqualGUID(&IID_IHTMLWindow4, riid)) { - TRACE("(%p)->(IID_IHTMLWindow4 %p)\n", This, ppv); *ppv = &This->IHTMLWindow4_iface; }else if(IsEqualGUID(&IID_IHTMLWindow5, riid)) { - TRACE("(%p)->(IID_IHTMLWindow5 %p)\n", This, ppv); *ppv = &This->IHTMLWindow5_iface; }else if(IsEqualGUID(&IID_IHTMLWindow6, riid)) { - TRACE("(%p)->(IID_IHTMLWindow6 %p)\n", This, ppv); *ppv = &This->IHTMLWindow6_iface; }else if(IsEqualGUID(&IID_IHTMLPrivateWindow, riid)) { - TRACE("(%p)->(IID_IHTMLPrivateWindow %p)\n", This, ppv); *ppv = &This->IHTMLPrivateWindow_iface; }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { - TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); *ppv = &This->IServiceProvider_iface; }else if(IsEqualGUID(&IID_ITravelLogClient, riid)) { - TRACE("(%p)->(IID_ITravelLogClient %p)\n", This, ppv); *ppv = &This->ITravelLogClient_iface; }else if(IsEqualGUID(&IID_IObjectIdentity, riid)) { - TRACE("(%p)->(IID_IObjectIdentity %p)\n", This, ppv); *ppv = &This->IObjectIdentity_iface; }else if(dispex_query_interface(&This->inner_window->dispex, riid, ppv)) { assert(!*ppv); return E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI HTMLWindow2_AddRef(IHTMLWindow2 *iface) @@ -2407,8 +2393,7 @@ static HRESULT WINAPI WindowDispEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid UINT i; HRESULT hres; - WARN("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); + WARN("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); for(i=0; i < cNames; i++) { /* We shouldn't use script's IDispatchEx here, so we shouldn't use GetDispID */ @@ -2686,7 +2671,7 @@ static HRESULT WINAPI HTMLWindowSP_QueryService(IServiceProvider *iface, REFGUID return IHTMLWindow2_QueryInterface(&This->IHTMLWindow2_iface, riid, ppv); } - TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + TRACE("(%p)->(%s %s %p)\n", This, debugstr_mshtml_guid(guidService), debugstr_mshtml_guid(riid), ppv); if(!This->outer_window->doc_obj) return E_NOINTERFACE; diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 5e9d7cb..c34a6d8 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -573,9 +573,11 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IHTMLElementCollection); X(IID_IHTMLEventObj); X(IID_IHTMLFiltersCollection); + X(IID_IHTMLFramesCollection2); X(IID_IHTMLImageElementFactory); X(IID_IHTMLLocation); X(IID_IHTMLOptionElementFactory); + X(IID_IHTMLPrivateWindow); X(IID_IHTMLRect); X(IID_IHTMLScreen); X(IID_IHTMLStorage); @@ -585,9 +587,18 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IHTMLStyle4); X(IID_IHTMLStyle5); X(IID_IHTMLStyle6); + X(IID_IHTMLStyleSheet); + X(IID_IHTMLStyleSheetRulesCollection); + X(IID_IHTMLStyleSheetsCollection); + X(IID_IHTMLWindow2); + X(IID_IHTMLWindow3); + X(IID_IHTMLWindow4); + X(IID_IHTMLWindow5); + X(IID_IHTMLWindow6); X(IID_IHtmlLoadOptions); X(IID_IInternetHostSecurityManager); X(IID_IMonikerProp); + X(IID_IObjectIdentity); X(IID_IObjectSafety); X(IID_IObjectWithSite); X(IID_IOleContainer); @@ -613,6 +624,7 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IServiceProvider); X(IID_ISupportErrorInfo); X(IID_ITargetContainer); + X(IID_ITravelLogClient); X(IID_IUnknown); X(IID_IViewObject); X(IID_IViewObject2);

1 0

Nikolay Sivov : xmllite/writer: Implement SetOutput() for writer.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 9080329e4e05eea155c08008618810fb88dd75e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9080329e4e05eea155c080086… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 13 18:25:37 2014 +0400 xmllite/writer: Implement SetOutput() for writer. --- dlls/xmllite/reader.c | 2 +- dlls/xmllite/writer.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 6e51d5e..6e3f9cd 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -642,7 +642,7 @@ static void readerinput_release_stream(xmlreaderinput *readerinput) /* Queries already stored interface for IStream/ISequentialStream. Interface supplied on creation will be overwritten */ -static HRESULT readerinput_query_for_stream(xmlreaderinput *readerinput) +static inline HRESULT readerinput_query_for_stream(xmlreaderinput *readerinput) { HRESULT hr; diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 5266049..a58164b 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -39,15 +39,19 @@ typedef struct IXmlWriterOutput IXmlWriterOutput_iface; LONG ref; IUnknown *output; + ISequentialStream *stream; IMalloc *imalloc; xml_encoding encoding; } xmlwriteroutput; +static const struct IUnknownVtbl xmlwriteroutputvtbl; + typedef struct _xmlwriter { IXmlWriter IXmlWriter_iface; LONG ref; IMalloc *imalloc; + xmlwriteroutput *output; } xmlwriter; static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) @@ -82,6 +86,26 @@ static inline void writer_free(xmlwriter *writer, void *mem) m_free(writer->imalloc, mem); } +static void writeroutput_release_stream(xmlwriteroutput *writeroutput) +{ + if (writeroutput->stream) { + ISequentialStream_Release(writeroutput->stream); + writeroutput->stream = NULL; + } +} + +static inline HRESULT writeroutput_query_for_stream(xmlwriteroutput *writeroutput) +{ + HRESULT hr; + + writeroutput_release_stream(writeroutput); + hr = IUnknown_QueryInterface(writeroutput->output, &IID_IStream, (void**)&writeroutput->stream); + if (hr != S_OK) + hr = IUnknown_QueryInterface(writeroutput->output, &IID_ISequentialStream, (void**)&writeroutput->stream); + + return hr; +} + static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) { xmlwriter *This = impl_from_IXmlWriter(iface); @@ -116,6 +140,7 @@ static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) ref = InterlockedDecrement(&This->ref); if (ref == 0) { IMalloc *imalloc = This->imalloc; + if (This->output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); writer_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -124,13 +149,46 @@ static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) } /*** IXmlWriter methods ***/ -static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *pOutput) +static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) { xmlwriter *This = impl_from_IXmlWriter(iface); + IXmlWriterOutput *writeroutput; + HRESULT hr; - FIXME("%p %p\n", This, pOutput); + TRACE("(%p)->(%p)\n", This, output); - return E_NOTIMPL; + if (This->output) { + writeroutput_release_stream(This->output); + IUnknown_Release(&This->output->IXmlWriterOutput_iface); + This->output = NULL; + } + + /* just reset current output */ + if (!output) + return S_OK; + + /* now try IXmlWriterOutput, ISequentialStream, IStream */ + hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&writeroutput); + if (hr == S_OK) { + if (writeroutput->lpVtbl == &xmlwriteroutputvtbl) + This->output = impl_from_IXmlWriterOutput(writeroutput); + else { + ERR("got external IXmlWriterOutput implementation: %p, vtbl=%p\n", + writeroutput, writeroutput->lpVtbl); + IUnknown_Release(writeroutput); + return E_FAIL; + + } + } + + if (hr != S_OK || !writeroutput) { + /* create IXmlWriterOutput basing on supplied interface */ + hr = CreateXmlWriterOutputWithEncodingName(output, This->imalloc, NULL, &writeroutput); + if (hr != S_OK) return hr; + This->output = impl_from_IXmlWriterOutput(writeroutput); + } + + return writeroutput_query_for_stream(This->output); } static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT nProperty, LONG_PTR *ppValue) @@ -471,6 +529,7 @@ static ULONG WINAPI xmlwriteroutput_Release(IXmlWriterOutput *iface) { IMalloc *imalloc = This->imalloc; if (This->output) IUnknown_Release(This->output); + if (This->stream) ISequentialStream_Release(This->stream); writeroutput_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -507,6 +566,7 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer->ref = 1; writer->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); + writer->output = NULL; *obj = &writer->IXmlWriter_iface; @@ -537,6 +597,7 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, writeroutput->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); writeroutput->encoding = parse_encoding_name(encoding, -1); + writeroutput->stream = NULL; IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&writeroutput->output);

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8LobbiedApplication Initialize.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: d9ae2b828e6783cc02273bf9018e2ebba93778df URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ae2b828e6783cc02273bf90… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 14 14:53:40 2014 +1100 dpnet: Implement IDirectPlay8LobbiedApplication Initialize. --- dlls/dpnet/dpnet_private.h | 9 +++++++-- dlls/dpnet/lobbiedapp.c | 16 +++++++++++++--- dlls/dpnet/tests/client.c | 28 ++++++++++++++++++++++++++-- dlls/dpnet/tests/peer.c | 32 ++++++++++++++++++++++++++++++-- 4 files changed, 76 insertions(+), 9 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index af81474..8fd04d6 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -78,8 +78,13 @@ struct IDirectPlay8AddressImpl */ struct IDirectPlay8LobbiedApplicationImpl { - IDirectPlay8LobbiedApplication IDirectPlay8LobbiedApplication_iface; - LONG ref; + IDirectPlay8LobbiedApplication IDirectPlay8LobbiedApplication_iface; + LONG ref; + + PFNDPNMESSAGEHANDLER msghandler; + DWORD flags; + void *usercontext; + DPNHANDLE *connection; }; /***************************************************************************** diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c index b430776..507a895 100644 --- a/dlls/dpnet/lobbiedapp.c +++ b/dlls/dpnet/lobbiedapp.c @@ -89,9 +89,19 @@ static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_Initialize(IDirectPlay8 void * const pvUserContext, const PFNDPNMESSAGEHANDLER pfn, DPNHANDLE * const pdpnhConnection, const DWORD dwFlags) { - IDirectPlay8LobbiedApplicationImpl *This = impl_from_IDirectPlay8LobbiedApplication(iface); - FIXME("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8LobbiedApplicationImpl *This = impl_from_IDirectPlay8LobbiedApplication(iface); + + TRACE("(%p)->(%p %p %p %x)\n", This, pvUserContext, pfn, pdpnhConnection, dwFlags); + + if(!pfn) + return DPNERR_INVALIDPOINTER; + + This->msghandler = pfn; + This->flags = dwFlags; + This->usercontext = pvUserContext; + This->connection = pdpnhConnection; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_RegisterProgram(IDirectPlay8LobbiedApplication *iface, diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index bf0d26f..92bed55 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -21,10 +21,12 @@ #include <stdio.h> #include <dplay8.h> +#include <dplobby8.h> #include "wine/test.h" static IDirectPlay8Client* client = NULL; +static IDirectPlay8LobbiedApplication* lobbied = NULL; static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, PVOID buffer) @@ -33,10 +35,17 @@ static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, return S_OK; } +static HRESULT WINAPI DirectPlayLobbyMessageHandler(PVOID context, DWORD message_id, PVOID buffer) +{ + trace("DirectPlayLobbyMessageHandler: 0x%08x\n", message_id); + return S_OK; +} + static BOOL test_init_dp(void) { HRESULT hr; DPN_SP_CAPS caps; + DPNHANDLE lobbyConnection; hr = CoInitialize(0); ok(hr == S_OK, "CoInitialize failed with %x\n", hr); @@ -56,6 +65,14 @@ static BOOL test_init_dp(void) hr = IDirectPlay8Client_Initialize(client, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Client_Initialize failed with %x\n", hr); + hr = CoCreateInstance(&CLSID_DirectPlay8LobbiedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectPlay8LobbiedApplication, (void **)&lobbied); + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + + hr = IDirectPlay8LobbiedApplication_Initialize(lobbied, NULL, DirectPlayLobbyMessageHandler, + &lobbyConnection, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Initialize failed with %x\n", hr); + return client != NULL; } @@ -195,8 +212,15 @@ static void test_cleanup_dp(void) hr = IDirectPlay8Client_Close(client, 0); ok(hr == S_OK, "IDirectPlay8Client_Close failed with %x\n", hr); - hr = IDirectPlay8Client_Release(client); - ok(hr == S_OK, "IDirectPlay8Client_Release failed with %x\n", hr); + if(lobbied) + { + hr = IDirectPlay8LobbiedApplication_Close(lobbied, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Close failed with %x\n", hr); + + IDirectPlay8LobbiedApplication_Release(lobbied); + } + + IDirectPlay8Client_Release(client); CoUninitialize(); } diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index 670b843..1fec1f2 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -20,10 +20,12 @@ #include <stdio.h> #include <dplay8.h> +#include <dplobby8.h> #include "wine/test.h" static IDirectPlay8Peer* peer = NULL; +static IDirectPlay8LobbiedApplication* lobbied = NULL; static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, PVOID buffer) { @@ -31,10 +33,17 @@ static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, return S_OK; } +static HRESULT WINAPI DirectPlayLobbyMessageHandler(PVOID context, DWORD message_id, PVOID buffer) +{ + trace("DirectPlayLobbyMessageHandler: 0x%08x\n", message_id); + return S_OK; +} + static void test_init_dp(void) { HRESULT hr; DPN_SP_CAPS caps; + DPNHANDLE lobbyConnection; hr = CoInitialize(0); ok(hr == S_OK, "CoInitialize failed with %x\n", hr); @@ -53,6 +62,18 @@ static void test_init_dp(void) hr = IDirectPlay8Peer_Initialize(peer, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Peer_Initialize failed with %x\n", hr); + + hr = CoCreateInstance(&CLSID_DirectPlay8LobbiedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectPlay8LobbiedApplication, (void **)&lobbied); + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + + hr = IDirectPlay8LobbiedApplication_Initialize(lobbied, NULL, NULL, + &lobbyConnection, 0); + ok(hr == DPNERR_INVALIDPOINTER, "Failed with %x\n", hr); + + hr = IDirectPlay8LobbiedApplication_Initialize(lobbied, NULL, DirectPlayLobbyMessageHandler, + &lobbyConnection, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Initialize failed with %x\n", hr); } static void test_enum_service_providers(void) @@ -198,8 +219,15 @@ static void test_cleanup_dp(void) hr = IDirectPlay8Peer_Close(peer, 0); ok(hr == S_OK, "IDirectPlay8Peer_Close failed with %x\n", hr); - hr = IDirectPlay8Peer_Release(peer); - ok(hr == S_OK, "IDirectPlay8Peer_Release failed with %x\n", hr); + if(lobbied) + { + hr = IDirectPlay8LobbiedApplication_Close(lobbied, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Close failed with %x\n", hr); + + IDirectPlay8LobbiedApplication_Release(lobbied); + } + + IDirectPlay8Peer_Release(peer); CoUninitialize(); }

1 0

Nikolay Sivov : msxml3: Support 'any attribute' selection [@*] in XSLPattern predicates.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 239d8077db6e9ebf9f2b3eda31e1733e30d40143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=239d8077db6e9ebf9f2b3eda3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 13 00:20:21 2014 +0400 msxml3: Support 'any attribute' selection [@*] in XSLPattern predicates. --- dlls/msxml3/tests/domdoc.c | 27 ++++++++++++++++++++------- dlls/msxml3/xslpattern.y | 5 +++++ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 19b2951..b028996 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -494,7 +494,7 @@ static const char szExampleXML[] = " </description>\n" " </elem>\n" "\n" -" <elem>\n" +" <elem a='a'>\n" " <a>A2 field</a>\n" " <b>B2 field</b>\n" " <c type=\"old\">C2 field</c>\n" @@ -1074,14 +1074,16 @@ static char *list_to_string(IXMLDOMNodeList *list) static char buf[4096]; char *pos = buf; LONG len = 0; + HRESULT hr; int i; if (list == NULL) { - lstrcpyA(buf, "(null)"); + strcpy(buf, "(null)"); return buf; } - ole_check(IXMLDOMNodeList_get_length(list, &len)); + hr = IXMLDOMNodeList_get_length(list, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); for (i = 0; i < len; i++) { IXMLDOMNode *node; @@ -4449,12 +4451,13 @@ static const xpath_test_t xpath_test[] = { { "child::node()", "E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1" }, { "child::text()", "" }, { "child::*/..", "E2.D1" }, - { "child::*//@*/..", "E2.E5.E1.E2.D1 E3.E2.E2.D1" }, + { "child::*//@*/..", "E2.E5.E1.E2.D1 E2.E2.D1 E3.E2.E2.D1" }, { "self::node()", "E2.D1" }, { "ancestor::node()", "D1" }, { "elem[c][last()]/a", "E1.E2.E2.D1"}, { "ancestor-or-self::node()[1]", "E2.D1" }, { "((//a)[1])[last()]", "E1.E1.E2.D1" }, + { "//elem[@*]", "E2.E2.D1" }, { NULL } }; @@ -4517,7 +4520,7 @@ static void test_XPath(void) str = list_to_string(list); - ok(strcmp(str, xptest->list)==0, "query=%s, invalid node list: %s, expected %s\n", + ok(!strcmp(str, xptest->list), "query=%s, invalid node list: \"%s\", expected \"%s\"\n", xptest->query, str, xptest->list); if (list) @@ -6838,6 +6841,7 @@ static void test_default_properties(void) typedef struct { const char *query; const char *list; + BOOL todo; } xslpattern_test_t; static const xslpattern_test_t xslpattern_test[] = { @@ -6900,6 +6904,7 @@ static const xslpattern_test_t xslpattern_test[] = { { "root/elem[index()>0 $and$ $not$ end()]", "E2.E2.D1 E3.E2.D1" }, { "root/elem[index()>0 && $not$ end()]", "E2.E2.D1 E3.E2.D1" }, { "root/elem[d]", "E1.E2.D1 E2.E2.D1 E4.E2.D1" }, + { "root/elem[@*]", "E2.E2.D1 E3.E2.D1", TRUE }, { NULL } }; @@ -6977,8 +6982,16 @@ static void test_XSLPattern(void) len = 0; hr = IXMLDOMNodeList_get_length(list, &len); ok(len != 0, "query=%s, empty list\n", ptr->query); - if (len) - expect_list_and_release(list, ptr->list); + if (len) { + if (ptr->todo) { + char *str = list_to_string(list); + todo_wine + ok(!strcmp(str, ptr->list), "Invalid node list: %s, expected %s\n", str, ptr->list); + IXMLDOMNodeList_Release(list); + } + else + expect_list_and_release(list, ptr->list); + } ptr++; } diff --git a/dlls/msxml3/xslpattern.y b/dlls/msxml3/xslpattern.y index 4e3b699..9adb318 100644 --- a/dlls/msxml3/xslpattern.y +++ b/dlls/msxml3/xslpattern.y @@ -186,6 +186,11 @@ static void xslpattern_error(parser_param* param, void const* scanner, char cons $$=xmlStrcat($$,$2); xmlFree($2); } + | '@' '*' + { + TRACE("Got All attributes pattern: \"@*\"\n"); + $$=xmlStrdup(U("@*")); + } ; /* [2.3] Node Tests */

1 0

Henri Verbeet : d2d1: Add the ID2D1GeometrySink interface.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 29237d832bd5fd8b28282b5f951833d82089d564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29237d832bd5fd8b28282b5f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 13 09:41:13 2014 +0200 d2d1: Add the ID2D1GeometrySink interface. --- include/d2d1.idl | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ include/d2dbasetypes.h | 6 ++++++ 2 files changed, 61 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 27a617c..bfed202 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -22,6 +22,7 @@ import "d2dbasetypes.h"; typedef D2D_POINT_2F D2D1_POINT_2F; typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F; typedef D2D_RECT_F D2D1_RECT_F; +typedef D2D_SIZE_F D2D1_SIZE_F; typedef enum D2D1_DEBUG_LEVEL { @@ -123,6 +124,20 @@ typedef enum D2D1_COMBINE_MODE D2D1_COMBINE_MODE_FORCE_DWORD = 0xffffffff, } D2D1_COMBINE_MODE; +typedef enum D2D1_SWEEP_DIRECTION +{ + D2D1_SWEEP_DIRECTION_COUNTER_CLOCKWISE = 0, + D2D1_SWEEP_DIRECTION_CLOCKWISE = 1, + D2D1_SWEEP_DIRECTION_FORCE_DWORD = 0xffffffff, +} D2D1_SWEEP_DIRECTION; + +typedef enum D2D1_ARC_SIZE +{ + D2D1_ARC_SIZE_SMALL = 0, + D2D1_ARC_SIZE_LARGE = 1, + D2D1_ARC_SIZE_FORCE_DWORD = 0xffffffff, +} D2D1_ARC_SIZE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -156,6 +171,21 @@ typedef struct D2D1_ELLIPSE float radiusY; } D2D1_ELLIPSE; +typedef struct D2D1_QUADRATIC_BEZIER_SEGMENT +{ + D2D1_POINT_2F point1; + D2D1_POINT_2F point2; +} D2D1_QUADRATIC_BEZIER_SEGMENT; + +typedef struct D2D1_ARC_SEGMENT +{ + D2D1_POINT_2F point; + D2D1_SIZE_F size; + float rotationAngle; + D2D1_SWEEP_DIRECTION sweepDirection; + D2D1_ARC_SIZE arcSize; +} D2D1_ARC_SEGMENT; + interface ID2D1Factory; [ @@ -374,5 +404,30 @@ interface ID2D1TransformedGeometry : ID2D1Geometry ); } +[ + local, + object, + uuid(2cd9069f-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1GeometrySink : ID2D1SimplifiedGeometrySink +{ + void AddLine( + [in] D2D1_POINT_2F point + ); + void AddBezier( + [in] const D2D1_BEZIER_SEGMENT *bezier + ); + void AddQuadraticBezier( + [in] const D2D1_QUADRATIC_BEZIER_SEGMENT *bezier + ); + void AddQuadraticBeziers( + [in, size_is(bezier_count)] const D2D1_QUADRATIC_BEZIER_SEGMENT *beziers, + [in] UINT32 bezier_count + ); + void AddArc( + [in] const D2D1_ARC_SEGMENT *arc + ); +} + [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 385e0b3..4ddb994 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -39,3 +39,9 @@ typedef struct D2D_RECT_F float right; float bottom; } D2D_RECT_F; + +typedef struct D2D_SIZE_F +{ + float width; + float height; +} D2D_SIZE_F;

1 0