August 2012 - Wine-commits - list.winehq.org

Alexandre Julliard : winex11: Always paint to the whole window.
by Alexandre Julliard 30 Aug '12

30 Aug '12

Module: wine Branch: master Commit: 044f790bcb46161bc91d16c75e7260d339e0919c URL: http://source.winehq.org/git/wine.git/?a=commit;h=044f790bcb46161bc91d16c75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 30 14:40:31 2012 +0200 winex11: Always paint to the whole window. --- dlls/winex11.drv/window.c | 14 ++++++-------- server/window.c | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7e886dd..52c18cf 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2218,10 +2218,7 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, { escape.drawable = data->icon_window; } - else if (flags & DCX_WINDOW) - escape.drawable = data ? data->whole_window : X11DRV_get_whole_window( hwnd ); - else - escape.drawable = escape.gl_drawable; + else escape.drawable = data ? data->whole_window : X11DRV_get_whole_window( hwnd ); if (escape.gl_drawable) escape.gl_type = DC_GL_WINDOW; /* special case: when repainting the root window, clip out top-level windows */ @@ -2231,21 +2228,22 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, { /* find the first ancestor that has a drawable */ for (parent = hwnd; parent && parent != top; parent = GetAncestor( parent, GA_PARENT )) - if ((escape.drawable = X11DRV_get_client_window( parent ))) break; + if ((escape.drawable = X11DRV_get_whole_window( parent ))) break; if (escape.drawable) { POINT pt = { 0, 0 }; - MapWindowPoints( top, parent, &pt, 1 ); + MapWindowPoints( 0, parent, &pt, 1 ); + escape.dc_rect = *win_rect; OffsetRect( &escape.dc_rect, pt.x, pt.y ); + if (flags & DCX_CLIPCHILDREN) escape.mode = ClipByChildren; } - else escape.drawable = X11DRV_get_client_window( top ); + else escape.drawable = X11DRV_get_whole_window( top ); escape.fbconfig_id = data ? data->fbconfig_id : (XID)GetPropA( hwnd, fbconfig_id_prop ); escape.gl_drawable = data ? data->gl_drawable : (Drawable)GetPropA( hwnd, gl_drawable_prop ); escape.pixmap = data ? data->pixmap : (Pixmap)GetPropA( hwnd, pixmap_prop ); if (escape.gl_drawable) escape.gl_type = escape.pixmap ? DC_GL_PIXMAP_WIN : DC_GL_CHILD_WIN; - if (flags & DCX_CLIPCHILDREN) escape.mode = ClipByChildren; } ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); diff --git a/server/window.c b/server/window.c index cc4b07b..fefe1ac 100644 --- a/server/window.c +++ b/server/window.c @@ -2311,7 +2311,7 @@ DECL_HANDLER(get_visible_region) if (data) set_reply_data_ptr( data, reply->total_size ); } reply->top_win = top->handle; - reply->top_rect = (top == win && (req->flags & DCX_WINDOW)) ? top->visible_rect : top->client_rect; + reply->top_rect = top->visible_rect; if (!is_desktop_window(win)) {

1 0

Dmitry Timoshkov : gdiplus: Print some additional information about device and image being drawn.
by Alexandre Julliard 30 Aug '12

30 Aug '12

Module: wine Branch: master Commit: e0fd87aea19acd4d37b1fc387a85dc209a5ec3c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0fd87aea19acd4d37b1fc387… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 30 18:42:47 2012 +0900 gdiplus: Print some additional information about device and image being drawn. --- dlls/gdiplus/graphics.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 383965a..640603a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3092,6 +3092,12 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image GpBitmap* bitmap = (GpBitmap*)image; int use_software=0; + TRACE("graphics: %.2fx%.2f dpi, fmt %#x, scale %f, image: %.2fx%.2f dpi, fmt %#x, color %08x\n", + graphics->xres, graphics->yres, + graphics->image && graphics->image->type == ImageTypeBitmap ? ((GpBitmap *)graphics->image)->format : 0, + graphics->scale, image->xres, image->yres, bitmap->format, + imageAttributes ? imageAttributes->outside_color : 0); + if (imageAttributes || (graphics->image && graphics->image->type == ImageTypeBitmap) || ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X ||

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

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: 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

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

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

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

Rico Schüller : d3dx9: Optimize set_matrix().
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: wine Branch: master Commit: 396af0dac3ccdacf939d6909eb3e4f16922464f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=396af0dac3ccdacf939d6909e… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 28 22:03:43 2012 +0200 d3dx9: Optimize set_matrix(). --- dlls/d3dx9_36/effect.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 53c94bc..7463742 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -971,12 +971,11 @@ static void set_matrix(struct d3dx_parameter *param, CONST D3DXMATRIX *matrix) { UINT i, k; - for (i = 0; i < 4; ++i) + for (i = 0; i < param->rows; ++i) { - for (k = 0; k < 4; ++k) + for (k = 0; k < param->columns; ++k) { - if ((i < param->rows) && (k < param->columns)) - set_number((FLOAT *)param->data + i * param->columns + k, param->type, &matrix->u.m[i][k], D3DXPT_FLOAT); + set_number((FLOAT *)param->data + i * param->columns + k, param->type, &matrix->u.m[i][k], D3DXPT_FLOAT); } } }

1 0

Rico Schüller : d3dx9: Improve traces in set_number().
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: wine Branch: master Commit: bfec15534593cc4065a52cabd1d6f6a289dc42c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfec15534593cc4065a52cabd… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 28 22:03:55 2012 +0200 d3dx9: Improve traces in set_number(). --- dlls/d3dx9_36/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7463742..162cbf8 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -908,7 +908,7 @@ static inline BOOL get_bool(LPCVOID data) static void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) { - TRACE("Changing from type %i to type %i\n", intype, outtype); + TRACE("Changing from type %s to type %s\n", debug_d3dxparameter_type(intype), debug_d3dxparameter_type(outtype)); switch (outtype) { @@ -925,7 +925,7 @@ static void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indat break; default: - FIXME("Error converting to type %i\n", outtype); + FIXME("Unhandled type %s. This should not happen!\n", debug_d3dxparameter_type(outtype)); *(INT *)outdata = 0; break; }

1 0