wine-commits August 2012

wine-commits@winehq.org

2 participants
541 discussions

Alexandre Julliard : winex11: Don' t select for mouse events on the client window.
by Alexandre Julliard 30 Aug '12

30 Aug '12

Module: wine Branch: master Commit: 2967599286726e130f4560c852267222a837378b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2967599286726e130f4560c85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 30 12:57:45 2012 +0200 winex11: Don't select for mouse events on the client window. --- dlls/winex11.drv/mouse.c | 2 +- dlls/winex11.drv/window.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 14b12f2..4faeb27 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1470,7 +1470,7 @@ void X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) TRACE( "hwnd %p/%lx pos %d,%d detail %d\n", hwnd, event->window, event->x, event->y, event->detail ); - if (event->detail == NotifyVirtual || event->detail == NotifyNonlinearVirtual) return; + if (event->detail == NotifyVirtual) return; if (event->window == x11drv_thread_data()->grab_window) return; /* simulate a mouse motion event */ diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 1404c88..7e886dd 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -332,8 +332,7 @@ static Window create_client_window( Display *display, struct x11drv_win_data *da attr.bit_gravity = NorthWestGravity; attr.win_gravity = NorthWestGravity; attr.backing_store = NotUseful; - attr.event_mask = (ExposureMask | PointerMotionMask | - ButtonPressMask | ButtonReleaseMask | EnterWindowMask); + attr.event_mask = ExposureMask; mask = CWEventMask | CWBitGravity | CWWinGravity | CWBackingStore; if ((cx = data->client_rect.right - data->client_rect.left) <= 0) cx = 1; @@ -2286,7 +2285,7 @@ void CDECL X11DRV_SetCapture( HWND hwnd, UINT flags ) if (hwnd) { - Window grab_win = X11DRV_get_client_window( GetAncestor( hwnd, GA_ROOT ) ); + Window grab_win = X11DRV_get_whole_window( GetAncestor( hwnd, GA_ROOT ) ); if (!grab_win) return; XFlush( gdi_display );

1 0

Alexandre Julliard : winex11: Never attempt to create the window data from a different thread.
by Alexandre Julliard 30 Aug '12

30 Aug '12

Module: wine Branch: master Commit: e280527f6b8e610a004061cdaaef18e09a446af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e280527f6b8e610a004061cda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 30 12:11:43 2012 +0200 winex11: Never attempt to create the window data from a different thread. --- dlls/winex11.drv/window.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5840e85..1404c88 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1149,8 +1149,7 @@ static Window get_owner_whole_window( HWND owner, BOOL force_managed ) if (!(data = X11DRV_get_win_data( owner ))) { - if (GetWindowThreadProcessId( owner, NULL ) != GetCurrentThreadId() || - !(data = X11DRV_create_win_data( owner ))) + if (!(data = X11DRV_create_win_data( owner ))) return (Window)GetPropA( owner, whole_window_prop ); } else if (!data->managed && force_managed) /* make it managed */ @@ -2001,6 +2000,8 @@ struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd ) /* don't create win data for HWND_MESSAGE windows */ if (parent != GetDesktopWindow() && !GetAncestor( parent, GA_PARENT )) return NULL; + if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) return NULL; + display = thread_init_display(); if (!(data = alloc_win_data( display, hwnd ))) return NULL;

1 0

Francois Gouget : testbot/lib: Merge Patches::NewSubmission() and Patches:: NewPatch().
by Alexandre Julliard 30 Aug '12

30 Aug '12

Module: tools Branch: master Commit: 4f19013f91e0a3dcc0c4cb9bc84c54a100e74ea7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4f19013f91e0a3dcc0c4cb9b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 30 16:28:58 2012 +0200 testbot/lib: Merge Patches::NewSubmission() and Patches::NewPatch(). --- testbot/bin/Engine.pl | 4 +- testbot/lib/WineTestBot/Patches.pm | 88 +---------------------------------- 2 files changed, 5 insertions(+), 87 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 488c8eb..422e810 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -297,7 +297,7 @@ sub HandleNewWinePatchesSubmission my $Parser = new MIME::Parser; $Parser->output_dir($WorkDir); my $Entity = $Parser->parse_open($FullMessageFileName); - CreatePatches()->NewSubmission($Entity); + CreatePatches()->NewPatch($Entity); # Clean up system("rm -rf $WorkDir"); @@ -401,7 +401,7 @@ sub HandlePatchRetrieved my $Parser = new MIME::Parser; $Parser->output_dir($WorkDir); my $Entity = $Parser->parse_open($FullFileName); - my $ErrMessage = CreatePatches()->NewPatch($PatchId, $Entity); + my $ErrMessage = CreatePatches()->NewPatch($Entity, $PatchId); # Clean up system("rm -rf $WorkDir"); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 5689399..bce6161 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -1,6 +1,7 @@ # Patch collection and items # # Copyright 2010 Ge van Geldorp +# Copyright 2012 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -363,96 +364,13 @@ sub IsTestPatch return !1; } -sub NewSubmission -{ - my $self = shift; - my $MsgEntity = $_[0]; - - my $Patch = $self->Add(); - $Patch->FromSubmission($MsgEntity); - - my @PatchBodies; - foreach my $Part ($MsgEntity->parts_DFS) - { - if (defined($Part->bodyhandle)) - { - if ($Part->effective_type ne "text/html" && - $self->IsPatch($Part->bodyhandle)) - { - $PatchBodies[scalar(@PatchBodies)] = $Part->bodyhandle; - } - else - { - $Part->bodyhandle->purge(); - } - } - } - - my $ErrMessage; - if (scalar(@PatchBodies) == 1) - { - $Patch->AffectsTests($self->IsTestPatch($PatchBodies[0])); - my $Subject = $Patch->Subject; - $Subject =~ s/32\/64//; - $Subject =~ s/64\/32//; - if ($Subject =~ m/\d+\/\d+/) - { - $Patch->Disposition("Checking series"); - my $ErrKey; - my $ErrProperty; - ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); - link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); - if (! defined($ErrMessage)) - { - $ErrMessage = WineTestBot::PendingPatchSets::CreatePendingPatchSets()->NewSubmission($Patch); - } - } - else - { - $Patch->Disposition("Checking patch"); - my $ErrKey; - my $ErrProperty; - ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); - link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); - if (! defined($ErrMessage)) - { - $ErrMessage = $Patch->Submit($PatchBodies[0]->path, !1); - } - } - } - elsif (scalar(@PatchBodies) == 0) - { - $Patch->Disposition("No patch found"); - } - else - { - $Patch->Disposition("Message contains multiple patches"); - } - - foreach my $PatchBody (@PatchBodies) - { - $PatchBody->purge(); - } - - if (! defined($ErrMessage)) - { - my ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); - if (defined($ErrMessage)) - { - return $ErrMessage; - } - } - - return undef; -} - sub NewPatch { my $self = shift; - my ($PatchId, $MsgEntity) = @_; + my ($MsgEntity, $PatchId) = @_; my $Patch = $self->Add(); - $Patch->Id($PatchId); + $Patch->Id($PatchId) if (defined $PatchId); $Patch->FromSubmission($MsgEntity); my @PatchBodies;

1 0

Francois Gouget : testbot/lib: Fix some inconsistencies with the database schema.
by Alexandre Julliard 30 Aug '12

30 Aug '12

Module: tools Branch: master Commit: 4eedd3a8b0e4771243633c1db3ed8fbfddb29b81 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4eedd3a8b0e4771243633c1d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 30 16:28:41 2012 +0200 testbot/lib: Fix some inconsistencies with the database schema. --- testbot/lib/WineTestBot/Jobs.pm | 2 +- testbot/lib/WineTestBot/Roles.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/lib/WineTestBot/Users.pm | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 98d3510..ccb3817 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -302,7 +302,7 @@ BEGIN CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 9), CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 50), CreateBasicPropertyDescriptor("Submitted", "Submitted", !1, !1, "DT", 19), - CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 50), + CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, !1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), CreateDetailrefPropertyDescriptor("Steps", "Steps", !1, !1, \&CreateSteps), ); diff --git a/testbot/lib/WineTestBot/Roles.pm b/testbot/lib/WineTestBot/Roles.pm index 4dd232f..8327ff9 100644 --- a/testbot/lib/WineTestBot/Roles.pm +++ b/testbot/lib/WineTestBot/Roles.pm @@ -54,7 +54,7 @@ require Exporter; BEGIN { @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Name", "Role name", 1, 1, "A", 40), + CreateBasicPropertyDescriptor("Name", "Role name", 1, 1, "A", 20), CreateBasicPropertyDescriptor("IsDefaultRole", "Should new users get this role by default", !1, 1, "B", 1), ); } diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index fed093b..b9782ad 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -122,7 +122,7 @@ BEGIN CreateBasicPropertyDescriptor("ChildPid", "Process id of child process", !1, !1, "N", 5), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), - CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 5), + CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 6), ); } diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index bb41f31..f50029f 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -320,8 +320,8 @@ BEGIN CreateBasicPropertyDescriptor("Name", "Username", 1, 1, "A", 40), CreateBasicPropertyDescriptor("EMail", "EMail", !1, 1, "A", 40), CreateBasicPropertyDescriptor("Active", "Active", !1, 1, "B", 1), - CreateBasicPropertyDescriptor("Password", "Password", !1, !1, "A", 49), - CreateBasicPropertyDescriptor("RealName", "Real name", !1, 1, "A", 40), + CreateBasicPropertyDescriptor("Password", "Password", !1, 1, "A", 49), + CreateBasicPropertyDescriptor("RealName", "Real name", !1, !1, "A", 40), CreateBasicPropertyDescriptor("ResetCode", "Password reset code", !1, !1, "A", 32), CreateDetailrefPropertyDescriptor("Roles", "Roles", !1, !1, \&CreateUserRoles), );

1 0

Francois Gouget : testbot/lib: Simplify the @ PropertyDescriptors array initializations.
by Alexandre Julliard 30 Aug '12

30 Aug '12

Module: tools Branch: master Commit: 2099972e8c4f3e20af362752b6e47e05e2436aff URL: http://source.winehq.org/git/tools.git/?a=commit;h=2099972e8c4f3e20af362752… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 30 16:27:55 2012 +0200 testbot/lib: Simplify the @PropertyDescriptors array initializations. --- testbot/lib/WineTestBot/Branches.pm | 8 ++-- testbot/lib/WineTestBot/CGI/Sessions.pm | 11 +++--- testbot/lib/WineTestBot/Jobs.pm | 35 ++++++++------------- testbot/lib/WineTestBot/Patches.pm | 23 +++++-------- testbot/lib/WineTestBot/PendingPatchSets.pm | 11 +++--- testbot/lib/WineTestBot/PendingPatches.pm | 8 ++-- testbot/lib/WineTestBot/Roles.pm | 8 ++-- testbot/lib/WineTestBot/Steps.pm | 29 ++++++----------- testbot/lib/WineTestBot/StepsTasks.pm | 45 +++++++++----------------- testbot/lib/WineTestBot/Tasks.pm | 29 ++++++----------- testbot/lib/WineTestBot/UserRoles.pm | 5 ++- testbot/lib/WineTestBot/Users.pm | 24 +++++--------- testbot/lib/WineTestBot/VMs.pm | 32 +++++++------------ testbot/web/Feedback.pl | 9 +++-- testbot/web/ForgotPassword.pl | 5 ++- testbot/web/Login.pl | 9 +++-- testbot/web/ResetPassword.pl | 11 +++--- testbot/web/Submit.pl | 18 ++++++----- 18 files changed, 135 insertions(+), 185 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=2099972e8c4f3e20af36…

1 0

André Hentschel : usbd.sys: Add partial USBD_ValidateConfigurationDescriptor implementation.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: wine Branch: master Commit: c540c98d55d2354cd3a6c37a480c0180b9327826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c540c98d55d2354cd3a6c37a4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 28 23:27:40 2012 +0200 usbd.sys: Add partial USBD_ValidateConfigurationDescriptor implementation. --- dlls/usbd.sys/usbd.c | 20 ++++++++++++++++++++ dlls/usbd.sys/usbd.sys.spec | 2 ++ include/ddk/usbdlib.h | 1 + 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c index 80fd02e..daf49cf 100644 --- a/dlls/usbd.sys/usbd.c +++ b/dlls/usbd.sys/usbd.c @@ -218,6 +218,26 @@ PUSB_COMMON_DESCRIPTOR WINAPI USBD_ParseDescriptors( return NULL; } +USBD_STATUS WINAPI USBD_ValidateConfigurationDescriptor( + PUSB_CONFIGURATION_DESCRIPTOR descr, + ULONG length, + USHORT level, + PUCHAR *offset, + ULONG tag ) +{ + FIXME( "(%p, %u, %u, %p, %u) partial stub!", descr, length, level, offset, tag ); + + if (offset) *offset = 0; + + if (!descr || + length < sizeof(USB_CONFIGURATION_DESCRIPTOR) || + descr->bLength < sizeof(USB_CONFIGURATION_DESCRIPTOR) || + descr->wTotalLength < descr->bNumInterfaces * sizeof(USB_CONFIGURATION_DESCRIPTOR) + ) return USBD_STATUS_ERROR; + + return USBD_STATUS_SUCCESS; +} + ULONG WINAPI USBD_GetInterfaceLength( PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor, PUCHAR BufferEnd ) diff --git a/dlls/usbd.sys/usbd.sys.spec b/dlls/usbd.sys/usbd.sys.spec index 1cb507e..15cf352 100644 --- a/dlls/usbd.sys/usbd.sys.spec +++ b/dlls/usbd.sys/usbd.sys.spec @@ -16,6 +16,7 @@ @ stub USBD_GetDeviceInformation @ stdcall USBD_GetInterfaceLength(ptr ptr) @ stub USBD_GetPdoRegistryParameter +@ stub USBD_GetRegistryKeyValue @ stub USBD_GetSuspendPowerState @ stdcall USBD_GetUSBDIVersion(ptr) @ stub USBD_InitializeDevice @@ -30,4 +31,5 @@ @ stub USBD_RemoveDevice @ stub USBD_RestoreDevice @ stub USBD_SetSuspendPowerState +@ stdcall USBD_ValidateConfigurationDescriptor(ptr long long ptr long) @ stub USBD_WaitDeviceMutex diff --git a/include/ddk/usbdlib.h b/include/ddk/usbdlib.h index 0003816..86080ce 100644 --- a/include/ddk/usbdlib.h +++ b/include/ddk/usbdlib.h @@ -31,5 +31,6 @@ ULONG WINAPI USBD_GetInterfaceLength(PUSB_INTERFACE_DESCRIPTOR,PUCHAR); VOID WINAPI USBD_GetUSBDIVersion(PUSBD_VERSION_INFORMATION); PUSB_COMMON_DESCRIPTOR WINAPI USBD_ParseDescriptors(PVOID,ULONG,PVOID,LONG); PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptorEx(PUSB_CONFIGURATION_DESCRIPTOR,PVOID,LONG,LONG,LONG,LONG,LONG); +USBD_STATUS WINAPI USBD_ValidateConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR,ULONG,USHORT,PUCHAR*,ULONG); #endif

1 0

Dmitry Timoshkov : gdiplus: Make GdipMeasureCharacterRanges/ GdipMeasureString/GdipDrawString add extra space around the text.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: wine Branch: master Commit: 89ab0e4b12a09c119748f16139eacbbe4560e738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ab0e4b12a09c119748f1613… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 28 14:55:13 2012 +0900 gdiplus: Make GdipMeasureCharacterRanges/GdipMeasureString/GdipDrawString add extra space around the text. --- dlls/gdiplus/graphics.c | 50 ++++++++++++++++++++++++++++++++++------ dlls/gdiplus/tests/graphics.c | 26 ++++++++++++++++----- 2 files changed, 62 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a0c130e..383965a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4932,6 +4932,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, HDC hdc, temp_hdc=NULL; GpPointF pt[3]; RectF scaled_rect; + REAL margin_x; TRACE("(%p %s %d %p %s %p %d %p)\n", graphics, debugstr_w(string), length, font, debugstr_rectf(layoutRect), stringFormat, regionCount, regions); @@ -4965,10 +4966,18 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, args.rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); - scaled_rect.X = layoutRect->X * args.rel_width; + /* FIXME: GenericTypographic format prevents extra margins */ + margin_x = units_scale(font->unit, graphics->unit, graphics->xres) * font->emSize / 6.0; + + scaled_rect.X = (layoutRect->X + margin_x) * args.rel_width; scaled_rect.Y = layoutRect->Y * args.rel_height; scaled_rect.Width = layoutRect->Width * args.rel_width; scaled_rect.Height = layoutRect->Height * args.rel_height; + if (scaled_rect.Width >= 0.5) + { + scaled_rect.Width -= margin_x * 2.0 * args.rel_width; + if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ + } get_font_hfont(graphics, font, &gdifont); oldfont = SelectObject(hdc, gdifont); @@ -5042,6 +5051,8 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, HDC temp_hdc=NULL, hdc; GpPointF pt[3]; RectF scaled_rect; + REAL margin_x; + INT lines, glyphs; TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics, debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, @@ -5076,29 +5087,44 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, args.rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); - get_font_hfont(graphics, font, &gdifont); - oldfont = SelectObject(hdc, gdifont); + /* FIXME: GenericTypographic format prevents extra margins */ + margin_x = units_scale(font->unit, graphics->unit, graphics->xres) * font->emSize / 6.0; - scaled_rect.X = rect->X * args.rel_width; + scaled_rect.X = (rect->X + margin_x) * args.rel_width; scaled_rect.Y = rect->Y * args.rel_height; scaled_rect.Width = rect->Width * args.rel_width; scaled_rect.Height = rect->Height * args.rel_height; + if (scaled_rect.Width >= 0.5) + { + scaled_rect.Width -= margin_x * 2.0 * args.rel_width; + if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ + } if (scaled_rect.Width >= INT_MAX || scaled_rect.Width < 0.5) scaled_rect.Width = (REAL)(1 << 23); if (scaled_rect.Height >= INT_MAX || scaled_rect.Height < 0.5) scaled_rect.Height = (REAL)(1 << 23); + get_font_hfont(graphics, font, &gdifont); + oldfont = SelectObject(hdc, gdifont); + bounds->X = rect->X; bounds->Y = rect->Y; bounds->Width = 0.0; bounds->Height = 0.0; args.bounds = bounds; - args.codepointsfitted = codepointsfitted; - args.linesfilled = linesfilled; + args.codepointsfitted = &glyphs; + args.linesfilled = &lines; + lines = glyphs = 0; gdip_format_string(hdc, string, length, font, &scaled_rect, format, measure_string_callback, &args); + if (linesfilled) *linesfilled = lines; + if (codepointsfitted) *codepointsfitted = glyphs; + + if (lines) + bounds->Width += margin_x * 2.0; + SelectObject(hdc, oldfont); DeleteObject(gdifont); @@ -5169,7 +5195,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string HFONT gdifont; GpPointF pt[3], rectcpy[4]; POINT corners[4]; - REAL rel_width, rel_height; + REAL rel_width, rel_height, margin_x; INT save_state; REAL offsety = 0.0; struct draw_string_args args; @@ -5232,10 +5258,18 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string rectcpy[3].Y = rectcpy[2].Y = rect->Y + rect->Height; transform_and_round_points(graphics, corners, rectcpy, 4); - scaled_rect.X = 0.0; + /* FIXME: GenericTypographic format prevents extra margins */ + margin_x = units_scale(font->unit, graphics->unit, graphics->xres) * font->emSize / 6.0; + + scaled_rect.X = margin_x * rel_width; scaled_rect.Y = 0.0; scaled_rect.Width = rel_width * rect->Width; scaled_rect.Height = rel_height * rect->Height; + if (scaled_rect.Width >= 0.5) + { + scaled_rect.Width -= margin_x * 2.0 * rel_width; + if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ + } if (scaled_rect.Width >= INT_MAX || scaled_rect.Width < 0.5) scaled_rect.Width = (REAL)(1 << 23); if (scaled_rect.Height >= INT_MAX || scaled_rect.Height < 0.5) scaled_rect.Height = (REAL)(1 << 23); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index db2542b..13b89be 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3531,7 +3531,7 @@ static void test_GdipMeasureString(void) expectf(0.0, bounds.X); expectf(0.0, bounds.Y); expectf_(height, bounds.Height, height / 100.0); - expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.05); + expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); expect(1, lines); @@ -3547,7 +3547,7 @@ static void test_GdipMeasureString(void) expectf(50.0, bounds.X); expectf(50.0, bounds.Y); expectf_(height, bounds.Height, height / 100.0); - expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.05); + expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); expect(1, lines); @@ -3614,7 +3614,7 @@ static void test_GdipMeasureString(void) expectf(0.0, bounds.X); expectf(0.0, bounds.Y); expectf_(height, bounds.Height, height / 85.0); - expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.05); + expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); expect(1, lines); @@ -3630,7 +3630,7 @@ static void test_GdipMeasureString(void) expectf(50.0, bounds.X); expectf(50.0, bounds.Y); expectf_(height, bounds.Height, height / 85.0); - expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.05); + expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); expect(1, lines); @@ -3806,6 +3806,7 @@ static void test_font_height_scaling(void) /* margin = [bounds.width of 1] - [bounds.width of 2] / 2*/ margin = bounds_1.Width - bounds_2.Width / 2.0; /*trace("margin %f\n", margin);*/ + ok(margin > 0.0, "wrong margin %f\n", margin); status = GdipGetFontHeight(font, graphics, &height); expect(Ok, status); @@ -3819,10 +3820,24 @@ static void test_font_height_scaling(void) status = GdipGetRegionBounds(region, graphics, &rect); expect(Ok, status); /*trace("region: %f,%f,%f,%f\n", rect.X, rect.Y, rect.Width, rect.Height);*/ + /* FIXME: Wine uses integer gdi32 regions and rounding breaks things */ + if (margin < 1.0) + todo_wine ok(rect.X > 0.0, "wrong rect.X %f\n", rect.X); + else + ok(rect.X > 0.0, "wrong rect.X %f\n", rect.X); expectf(0.0, rect.Y); /* before Win7 GdipMeasureCharacterRanges behaviour is completely broken */ - match = fabs(margin - rect.X) <= margin / 25.0; + /* FIXME: Wine uses integer gdi32 regions and rounding breaks things */ + if (margin < 1.0) + { + match = fabs(margin - rect.X) < 0.25; + ok(match || broken(!match) /* before win7 */, "Expected %f, got %f\n", margin, rect.X); + } + else + { + match = fabs(margin - rect.X) <= 0.5; ok(match || broken(!match) /* before win7 */, "Expected %f, got %f\n", margin, rect.X); + } if (!match) { win_skip("GdipMeasureCharacterRanges ignores units before Win7\n"); @@ -4017,7 +4032,6 @@ static void test_measured_extra_space(void) /* margin = [bounds.width of 1] - [bounds.width of 2] / 2*/ margin = units_to_pixels(bounds_1.Width - bounds_2.Width / 2.0, gfx_unit, dpi); /*trace("margin %f pixels\n", margin);*/ -todo_wine expectf_(font_size / 6.0, margin, font_size / 100.0); }

1 0

Piotr Caban : comctl32: Remove property sheet page that can' t be initialized.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: wine Branch: master Commit: 21898b2fbab550119423a87597914d012ca97df1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21898b2fbab550119423a8759… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 29 18:29:47 2012 +0200 comctl32: Remove property sheet page that can't be initialized. --- dlls/comctl32/propsheet.c | 16 ++++++++++++++-- dlls/comctl32/tests/propsheet.c | 29 ++++++++++++++++++++++++++++- dlls/comctl32/tests/resources.h | 1 + dlls/comctl32/tests/rsrc.rc | 7 +++++++ 4 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 3c0f3d3..b2ceee8 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -171,6 +171,7 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, const PropSheetInfo* psInfo); static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg, const PropSheetInfo* psInfo); static BOOL PROPSHEET_DoCommand(HWND hwnd, WORD wID); +static BOOL PROPSHEET_RemovePage(HWND hwndDlg, int index, HPROPSHEETPAGE hpage); static INT_PTR CALLBACK PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -1474,6 +1475,9 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, /* Free a no more needed copy */ Free(pTemplateCopy); + if(!hwndPage) + return FALSE; + psInfo->proppage[index].hwndPage = hwndPage; /* Subclass exterior wizard pages */ @@ -2025,7 +2029,14 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, psn.lParam = 0; if (!psInfo->proppage[index].hwndPage) { - PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppshpage); + if(!PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppshpage)) { + PROPSHEET_RemovePage(hwndDlg, index, NULL); + if(index >= psInfo->nPages) + index--; + if(index < 0) + return FALSE; + continue; + } } /* Resize the property sheet page to the fit in the Tab control @@ -2273,7 +2284,8 @@ static BOOL PROPSHEET_AddPage(HWND hwndDlg, if (ppsp->dwFlags & PSP_PREMATURE) { /* Create the page but don't show it */ - PROPSHEET_CreatePage(hwndDlg, psInfo->nPages, psInfo, ppsp); + if(!PROPSHEET_CreatePage(hwndDlg, psInfo->nPages, psInfo, ppsp)) + return FALSE; } /* diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 92fb1dd..992b60f 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -750,7 +750,7 @@ static void test_messages(void) static void test_PSM_ADDPAGE(void) { - HPROPSHEETPAGE hpsp[3]; + HPROPSHEETPAGE hpsp[5]; PROPSHEETPAGEA psp; PROPSHEETHEADERA psh; HWND hdlg, tab; @@ -771,6 +771,12 @@ static void test_PSM_ADDPAGE(void) hpsp[1] = CreatePropertySheetPageA(&psp); hpsp[2] = CreatePropertySheetPageA(&psp); + U(psp).pszTemplate = MAKEINTRESOURCE(IDD_PROP_PAGE_ERROR); + hpsp[3] = CreatePropertySheetPageA(&psp); + + psp.dwFlags = PSP_PREMATURE; + hpsp[4] = CreatePropertySheetPageA(&psp); + memset(&psh, 0, sizeof(psh)); psh.dwSize = PROPSHEETHEADERA_V1_SIZE; psh.dwFlags = PSH_MODELESS; @@ -807,6 +813,27 @@ if (0) r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); ok(r == 3, "got %d\n", r); + /* add property sheet page that can't be created */ + ret = SendMessageA(hdlg, PSM_ADDPAGE, 0, (LPARAM)hpsp[3]); + ok(ret == TRUE, "got %d\n", ret); + + r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); + ok(r == 4, "got %d\n", r); + + /* select page that can't be created */ + ret = SendMessageA(hdlg, PSM_SETCURSEL, 3, 0); + ok(ret == TRUE, "got %d\n", ret); + + r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); + ok(r == 3, "got %d\n", r); + + /* test PSP_PREMATURE flag with incorrect property sheet page */ + ret = SendMessageA(hdlg, PSM_ADDPAGE, 0, (LPARAM)hpsp[4]); + ok(ret == FALSE, "got %d\n", ret); + + r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); + ok(r == 3, "got %d\n", r); + DestroyWindow(hdlg); } diff --git a/dlls/comctl32/tests/resources.h b/dlls/comctl32/tests/resources.h index e5217f1..3a89cd7 100644 --- a/dlls/comctl32/tests/resources.h +++ b/dlls/comctl32/tests/resources.h @@ -38,6 +38,7 @@ #define IDD_PROP_PAGE_WITH_CUSTOM_DEFAULT_BUTTON 34 #define IDD_PROP_PAGE_MESSAGE_TEST 35 +#define IDD_PROP_PAGE_ERROR 36 #define IDC_PS_EDIT1 1000 #define IDC_PS_EDIT2 1001 diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index 34b8362..4f7a225 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -71,6 +71,13 @@ BEGIN LTEXT "Some Text",-1,115,1,195,24 END +IDD_PROP_PAGE_ERROR DIALOG 0, 0, 100, 100 +STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +CLASS "Non-existing class" +FONT 8, "MS Shell Dlg" +{ +} + STRINGTABLE { IDS_TBADD1 "abc"

1 0

Jonas Wielicki : wined3d: Fix crash in wined3d_device_reset with gdi backend for directdraw.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: wine Branch: master Commit: a64b7918c8171ce208e82ecc2fa909ebc3626037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64b7918c8171ce208e82ecc2… Author: Jonas Wielicki <wine-patches(a)sotecware.net> Date: Wed Aug 29 15:09:59 2012 +0200 wined3d: Fix crash in wined3d_device_reset with gdi backend for directdraw. --- dlls/wined3d/device.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9744265..0826957 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5161,13 +5161,16 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } stateblock_unbind_resources(device->stateBlock); - if (swapchain->back_buffers && swapchain->back_buffers[0]) - wined3d_device_set_render_target(device, 0, swapchain->back_buffers[0], FALSE); - else - wined3d_device_set_render_target(device, 0, swapchain->front_buffer, FALSE); - for (i = 1; i < device->adapter->gl_info.limits.buffers; ++i) + if (device->fb.render_targets) { - wined3d_device_set_render_target(device, i, NULL, FALSE); + if (swapchain->back_buffers && swapchain->back_buffers[0]) + wined3d_device_set_render_target(device, 0, swapchain->back_buffers[0], FALSE); + else + wined3d_device_set_render_target(device, 0, swapchain->front_buffer, FALSE); + for (i = 1; i < device->adapter->gl_info.limits.buffers; ++i) + { + wined3d_device_set_render_target(device, i, NULL, FALSE); + } } wined3d_device_set_depth_stencil(device, NULL);

1 0

Alexandre Julliard : user32: Invalidate the DCEs while still holding the window lock in SetWindowPos.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: wine Branch: master Commit: 85fed5b1949473df5ec9f14648bf134e30b2af94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85fed5b1949473df5ec9f1464… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 29 18:13:57 2012 +0200 user32: Invalidate the DCEs while still holding the window lock in SetWindowPos. --- dlls/user32/painting.c | 19 ++++++++----------- dlls/user32/user_private.h | 3 ++- dlls/user32/winpos.c | 16 +++++++--------- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 98dfc54..64f4318 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -399,40 +399,38 @@ static void make_dc_dirty( struct dce *dce ) * rectangle. In addition, pWnd->parent DCEs may need to be updated if * DCX_CLIPCHILDREN flag is set. */ -void invalidate_dce( HWND hwnd, const RECT *extra_rect ) +void invalidate_dce( WND *win, const RECT *extra_rect ) { RECT window_rect; struct dce *dce; - HWND hwndScope = GetAncestor( hwnd, GA_PARENT ); - if (!hwndScope) return; + if (!win->parent) return; - GetWindowRect( hwnd, &window_rect ); + GetWindowRect( win->obj.handle, &window_rect ); - TRACE("%p scope hwnd = %p %s (%s)\n", - hwnd, hwndScope, wine_dbgstr_rect(&window_rect), wine_dbgstr_rect(extra_rect) ); + TRACE("%p parent %p %s (%s)\n", + win->obj.handle, win->parent, wine_dbgstr_rect(&window_rect), wine_dbgstr_rect(extra_rect) ); /* walk all DCEs and fixup non-empty entries */ - USER_Lock(); LIST_FOR_EACH_ENTRY( dce, &dce_list, struct dce, entry ) { TRACE( "%p: hwnd %p dcx %08x %s %s\n", dce, dce->hwnd, dce->flags, (dce->flags & DCX_CACHE) ? "Cache" : "Owned", dce->count ? "InUse" : "" ); if (!dce->hwnd) continue; - if ((dce->hwnd == hwndScope) && !(dce->flags & DCX_CLIPCHILDREN)) + if ((dce->hwnd == win->parent) && !(dce->flags & DCX_CLIPCHILDREN)) continue; /* child window positions don't bother us */ /* if DCE window is a child of hwnd, it has to be invalidated */ - if (dce->hwnd == hwnd || IsChild( hwnd, dce->hwnd )) + if (dce->hwnd == win->obj.handle || IsChild( win->obj.handle, dce->hwnd )) { make_dc_dirty( dce ); continue; } /* otherwise check if the window rectangle intersects this DCE window */ - if (hwndScope == dce->hwnd || IsChild( hwndScope, dce->hwnd )) + if (win->parent == dce->hwnd || IsChild( win->parent, dce->hwnd )) { RECT dce_rect, tmp; GetWindowRect( dce->hwnd, &dce_rect ); @@ -441,7 +439,6 @@ void invalidate_dce( HWND hwnd, const RECT *extra_rect ) make_dc_dirty( dce ); } } - USER_Unlock(); } /*********************************************************************** diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 1a63bad..2bd8ad8 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -205,12 +205,13 @@ extern HMODULE user32_module DECLSPEC_HIDDEN; extern HBRUSH SYSCOLOR_55AABrush DECLSPEC_HIDDEN; struct dce; +struct tagWND; extern BOOL CLIPBOARD_ReleaseOwner(void) DECLSPEC_HIDDEN; extern BOOL FOCUS_MouseActivate( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN; extern void free_dce( struct dce *dce, HWND hwnd ) DECLSPEC_HIDDEN; -extern void invalidate_dce( HWND hwnd, const RECT *rect ) DECLSPEC_HIDDEN; +extern void invalidate_dce( struct tagWND *win, const RECT *rect ) DECLSPEC_HIDDEN; extern void erase_now( HWND hwnd, UINT rdw_flags ) DECLSPEC_HIDDEN; extern void *get_hook_proc( void *proc, const WCHAR *module ) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 0ff4762..23b0b7f 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1997,17 +1997,15 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, } } SERVER_END_REQ; - WIN_ReleasePtr( win ); - if (ret) - { - if (((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || - (swp_flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW | SWP_STATECHANGED | SWP_FRAMECHANGED))) - invalidate_dce( hwnd, &old_window_rect ); + if (ret && (((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || + (swp_flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW | SWP_STATECHANGED | SWP_FRAMECHANGED)))) + invalidate_dce( win, &old_window_rect ); - USER_Driver->pWindowPosChanged( hwnd, insert_after, swp_flags, window_rect, - client_rect, &visible_rect, valid_rects ); - } + WIN_ReleasePtr( win ); + + if (ret) USER_Driver->pWindowPosChanged( hwnd, insert_after, swp_flags, window_rect, + client_rect, &visible_rect, valid_rects ); return ret; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2012