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

André Hentschel : winemaker: Put the defines in DEFINES instead of CEXTRA.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: e1e9dc398f58c57abb9ae581b9dd9d6b9aa57ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1e9dc398f58c57abb9ae581b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 13 16:43:37 2009 +0200 winemaker: Put the defines in DEFINES instead of CEXTRA. --- tools/winemaker | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 060e207..b2e58cc 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -535,6 +535,7 @@ sub source_scan_project_file($$$) # some more settings my $path=dirname($filename); my $prj_target_cflags; + my $prj_target_defines; my $prj_target_ldflags; my $prj_target_libs; my $prj_name; @@ -662,7 +663,7 @@ sub source_scan_project_file($$$) # Use Multithreaded Run-Time Library } elsif (/^D\s*\"(.*)\"/) { # Preprocessor Definitions - $prj_target_cflags.="-D".$1." "; + $prj_target_defines.="-D".$1." "; } elsif (/^I\s*\"(.*)\"/) { # Additional Include Directories $sfilet=$1; @@ -841,6 +842,7 @@ sub source_scan_project_file($$$) push @{@$project_settings[$T_LIBRARIES]},$prj_target_libs; push @{@$project_settings[$T_CEXTRA]},$prj_target_cflags; push @{@$project_settings[$T_CXXEXTRA]},$prj_target_cflags; + push @{@$project_settings[$T_DEFINES]},$prj_target_defines; push @{@$project_settings[$T_LDFLAGS]},$prj_target_ldflags; } elsif ($filename =~ /.vcproj$/i) { # Import XML::LibXML, you need the libxml package (deb: libxml-libxml-perl, rpm: perl-libxml-perl) @@ -923,7 +925,7 @@ sub source_scan_project_file($$$) if ($vc_compiler_tool->getName eq "PreprocessorDefinitions") { $configt=$vc_compiler_tool->getValue; $configt=~s/;/ -D/g; - $prj_target_cflags.="-D".$configt." "; + $prj_target_defines.="-D".$configt." "; } if ($vc_compiler_tool->getName eq "AdditionalIncludeDirectories") { $configt=$vc_compiler_tool->getValue; @@ -948,6 +950,7 @@ sub source_scan_project_file($$$) push @{@$project_settings[$T_LIBRARIES]},$prj_target_libs; push @{@$project_settings[$T_CEXTRA]},$prj_target_cflags; push @{@$project_settings[$T_CXXEXTRA]},$prj_target_cflags; + push @{@$project_settings[$T_DEFINES]},$prj_target_defines; } my $target_count;

1 0

Andrew Eikum : gdiplus/tests: Add tests for GdipGetVisibleClipBounds.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: 60fc01a0c4e17275f5435198a63fb9695f1902a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60fc01a0c4e17275f5435198a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 12 15:37:42 2009 -0500 gdiplus/tests: Add tests for GdipGetVisibleClipBounds. --- dlls/gdiplus/tests/graphics.c | 244 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 244 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index fbd9a48..54d9b32 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1660,6 +1660,249 @@ static void test_GdipDrawString(void) ReleaseDC(0, hdc); } +static void test_GdipGetVisibleClipBounds_screen(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + HDC hdc = GetDC(0); + GpRectF rectf, exp, clipr; + GpRect recti; + + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + /* no clipping rect */ + exp.X = 0; + exp.Y = 0; + exp.Width = GetDeviceCaps(hdc, HORZRES); + exp.Height = GetDeviceCaps(hdc, VERTRES); + + status = GdipGetVisibleClipBounds(graphics, &rectf); + expect(Ok, status); + ok(rectf.X == exp.X && + rectf.Y == exp.Y && + rectf.Width == exp.Width && + rectf.Height == exp.Height, + "Expected clip bounds (%0.f, %0.f, %0.f, %0.f) to be the size of " + "the screen (%0.f, %0.f, %0.f, %0.f)\n", + rectf.X, rectf.Y, rectf.Width, rectf.Height, + exp.X, exp.Y, exp.Width, exp.Height); + + /* clipping rect entirely within window */ + exp.X = clipr.X = 10; + exp.Y = clipr.Y = 12; + exp.Width = clipr.Width = 14; + exp.Height = clipr.Height = 16; + + status = GdipSetClipRect(graphics, clipr.X, clipr.Y, clipr.Width, clipr.Height, CombineModeReplace); + expect(Ok, status); + + status = GdipGetVisibleClipBounds(graphics, &rectf); + expect(Ok, status); + ok(rectf.X == exp.X && + rectf.Y == exp.Y && + rectf.Width == exp.Width && + rectf.Height == exp.Height, + "Expected clip bounds (%0.f, %0.f, %0.f, %0.f) to be the size of " + "the clipping rect (%0.f, %0.f, %0.f, %0.f)\n", + rectf.X, rectf.Y, rectf.Width, rectf.Height, + exp.X, exp.Y, exp.Width, exp.Height); + + /* clipping rect partially outside of screen */ + clipr.X = -10; + clipr.Y = -12; + clipr.Width = 20; + clipr.Height = 24; + + status = GdipSetClipRect(graphics, clipr.X, clipr.Y, clipr.Width, clipr.Height, CombineModeReplace); + expect(Ok, status); + + exp.X = 0; + exp.Y = 0; + exp.Width = 10; + exp.Height = 12; + + status = GdipGetVisibleClipBounds(graphics, &rectf); + expect(Ok, status); + ok(rectf.X == exp.X && + rectf.Y == exp.Y && + rectf.Width == exp.Width && + rectf.Height == exp.Height, + "Expected clip bounds (%0.f, %0.f, %0.f, %0.f) to be the size of " + "the visible clipping rect (%0.f, %0.f, %0.f, %0.f)\n", + rectf.X, rectf.Y, rectf.Width, rectf.Height, + exp.X, exp.Y, exp.Width, exp.Height); + + status = GdipGetVisibleClipBoundsI(graphics, &recti); + expect(Ok, status); + ok(recti.X == exp.X && + recti.Y == exp.Y && + recti.Width == exp.Width && + recti.Height == exp.Height, + "Expected clip bounds (%d, %d, %d, %d) to be the size of " + "the visible clipping rect (%0.f, %0.f, %0.f, %0.f)\n", + recti.X, recti.Y, recti.Width, recti.Height, + exp.X, exp.Y, exp.Width, exp.Height); + + GdipDeleteGraphics(graphics); + ReleaseDC(0, hdc); +} + +static void test_GdipGetVisibleClipBounds_window(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpRectF rectf, window, exp, clipr; + GpRect recti; + HWND hwnd; + WNDCLASSA class; + HDC hdc; + PAINTSTRUCT ps; + HINSTANCE hInstance = GetModuleHandle(NULL); + RECT wnd_rect; + + window.X = 0; + window.Y = 0; + window.Width = 200; + window.Height = 300; + + class.lpszClassName = "ClipBoundsTestClass"; + class.style = CS_HREDRAW | CS_VREDRAW; + class.lpfnWndProc = DefWindowProcA; + class.hInstance = hInstance; + class.hIcon = LoadIcon(0, IDI_APPLICATION); + class.hCursor = LoadCursor(NULL, IDC_ARROW); + class.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + class.lpszMenuName = 0; + class.cbClsExtra = 0; + class.cbWndExtra = 0; + RegisterClass(&class); + + hwnd = CreateWindow(class.lpszClassName, "ClipboundsTest", + WS_OVERLAPPEDWINDOW, window.X, window.Y, window.Width, window.Height, + NULL, NULL, hInstance, NULL); + + ok(hwnd != NULL, "Expected window to be created\n"); + + /* get client area size */ + ok(GetClientRect(hwnd, &wnd_rect), "GetClientRect should have succeeded"); + window.X = wnd_rect.left; + window.Y = wnd_rect.top; + window.Width = wnd_rect.right - wnd_rect.left; + window.Height = wnd_rect.bottom - wnd_rect.top; + + hdc = BeginPaint(hwnd, &ps); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + status = GdipGetVisibleClipBounds(graphics, &rectf); + expect(Ok, status); + ok(rectf.X == window.X && + rectf.Y == window.Y && + rectf.Width == window.Width && + rectf.Height == window.Height, + "Expected clip bounds (%0.f, %0.f, %0.f, %0.f) to be the size of " + "the window (%0.f, %0.f, %0.f, %0.f)\n", + rectf.X, rectf.Y, rectf.Width, rectf.Height, + window.X, window.Y, window.Width, window.Height); + + /* clipping rect entirely within window */ + exp.X = clipr.X = 20; + exp.Y = clipr.Y = 8; + exp.Width = clipr.Width = 30; + exp.Height = clipr.Height = 20; + + status = GdipSetClipRect(graphics, clipr.X, clipr.Y, clipr.Width, clipr.Height, CombineModeReplace); + expect(Ok, status); + + status = GdipGetVisibleClipBounds(graphics, &rectf); + expect(Ok, status); + ok(rectf.X == exp.X && + rectf.Y == exp.Y && + rectf.Width == exp.Width && + rectf.Height == exp.Height, + "Expected clip bounds (%0.f, %0.f, %0.f, %0.f) to be the size of " + "the clipping rect (%0.f, %0.f, %0.f, %0.f)\n", + rectf.X, rectf.Y, rectf.Width, rectf.Height, + exp.X, exp.Y, exp.Width, exp.Height); + + /* clipping rect partially outside of window */ + clipr.X = window.Width - 10; + clipr.Y = window.Height - 15; + clipr.Width = 20; + clipr.Height = 30; + + status = GdipSetClipRect(graphics, clipr.X, clipr.Y, clipr.Width, clipr.Height, CombineModeReplace); + expect(Ok, status); + + exp.X = window.Width - 10; + exp.Y = window.Height - 15; + exp.Width = 10; + exp.Height = 15; + + status = GdipGetVisibleClipBounds(graphics, &rectf); + expect(Ok, status); + ok(rectf.X == exp.X && + rectf.Y == exp.Y && + rectf.Width == exp.Width && + rectf.Height == exp.Height, + "Expected clip bounds (%0.f, %0.f, %0.f, %0.f) to be the size of " + "the visible clipping rect (%0.f, %0.f, %0.f, %0.f)\n", + rectf.X, rectf.Y, rectf.Width, rectf.Height, + exp.X, exp.Y, exp.Width, exp.Height); + + status = GdipGetVisibleClipBoundsI(graphics, &recti); + expect(Ok, status); + ok(recti.X == exp.X && + recti.Y == exp.Y && + recti.Width == exp.Width && + recti.Height == exp.Height, + "Expected clip bounds (%d, %d, %d, %d) to be the size of " + "the visible clipping rect (%0.f, %0.f, %0.f, %0.f)\n", + recti.X, recti.Y, recti.Width, recti.Height, + exp.X, exp.Y, exp.Width, exp.Height); + + GdipDeleteGraphics(graphics); + EndPaint(hwnd, &ps); + DestroyWindow(hwnd); +} + +static void test_GdipGetVisibleClipBounds(void) +{ + GpGraphics* graphics = NULL; + GpRectF rectf; + GpRect rect; + HDC hdc = GetDC(0); + GpStatus status; + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + /* test null parameters */ + status = GdipGetVisibleClipBounds(graphics, NULL); + expect(InvalidParameter, status); + + status = GdipGetVisibleClipBounds(NULL, &rectf); + expect(InvalidParameter, status); + + status = GdipGetVisibleClipBoundsI(graphics, NULL); + expect(InvalidParameter, status); + + status = GdipGetVisibleClipBoundsI(NULL, &rect); + expect(InvalidParameter, status); + + GdipDeleteGraphics(graphics); + ReleaseDC(0, hdc); + + test_GdipGetVisibleClipBounds_screen(); + test_GdipGetVisibleClipBounds_window(); +} START_TEST(graphics) { @@ -1687,6 +1930,7 @@ START_TEST(graphics) test_GdipDrawLineI(); test_GdipDrawLinesI(); test_GdipDrawString(); + test_GdipGetVisibleClipBounds(); test_Get_Release_DC(); test_BeginContainer2(); test_transformpoints();

1 0

Andrew Eikum : gdiplus: Implement GdipGetVisibleClipBounds.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: ef0ee6e556891f019fb655579d0c97a76a38d43c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef0ee6e556891f019fb655579… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 12 15:37:09 2009 -0500 gdiplus: Implement GdipGetVisibleClipBounds. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 67 +++++++++++++++++++++++++++++++++++++++------ include/gdiplusflat.h | 2 + 3 files changed, 61 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8863c37..51c6d06 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -400,7 +400,7 @@ @ stub GdipGetTextureImage @ stdcall GdipGetTextureTransform(ptr ptr) @ stdcall GdipGetTextureWrapMode(ptr ptr) -@ stub GdipGetVisibleClipBounds +@ stdcall GdipGetVisibleClipBounds(ptr ptr) @ stdcall GdipGetVisibleClipBoundsI(ptr ptr) @ stdcall GdipGetWorldTransform(ptr ptr) @ stdcall GdipGraphicsClear(ptr long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8f73ee9..0a8aa45 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3124,6 +3124,64 @@ GpStatus WINGDIPAPI GdipGetTextRenderingHint(GpGraphics *graphics, return Ok; } +GpStatus WINGDIPAPI GdipGetVisibleClipBounds(GpGraphics *graphics, GpRectF *rect) +{ + GpRegion *clip_rgn; + GpStatus stat; + GpRectF wnd_rect; + + TRACE("(%p, %p)\n", graphics, rect); + + if(!graphics || !rect) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + /* get window bounds */ + if((stat = get_graphics_bounds(graphics, &wnd_rect)) != Ok) + return stat; + + /* intersect window and graphics clipping regions */ + if((stat = GdipCreateRegion(&clip_rgn)) != Ok) + return stat; + + if((stat = GdipCombineRegionRect(clip_rgn, &wnd_rect, CombineModeIntersect)) != Ok) + goto cleanup; + + if((stat = GdipCombineRegionRegion(clip_rgn, graphics->clip, CombineModeIntersect)) != Ok) + goto cleanup; + + /* get bounds of the region */ + stat = GdipGetRegionBounds(clip_rgn, graphics, rect); + +cleanup: + GdipDeleteRegion(clip_rgn); + + return stat; +} + +GpStatus WINGDIPAPI GdipGetVisibleClipBoundsI(GpGraphics *graphics, GpRect *rect) +{ + GpRectF rectf; + GpStatus stat; + + TRACE("(%p, %p)\n", graphics, rect); + + if(!graphics || !rect) + return InvalidParameter; + + if((stat = GdipGetVisibleClipBounds(graphics, &rectf)) == Ok) + { + rect->X = roundr(rectf.X); + rect->Y = roundr(rectf.Y); + rect->Width = roundr(rectf.Width); + rect->Height = roundr(rectf.Height); + } + + return stat; +} + GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics *graphics, GpMatrix *matrix) { TRACE("(%p, %p)\n", graphics, matrix); @@ -4086,15 +4144,6 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT } /***************************************************************************** - * GdipGetVisibleClipBoundsI [GDIPLUS.@] - */ -GpStatus WINGDIPAPI GdipGetVisibleClipBoundsI(GpGraphics *graphics, GpRect *rect) -{ - FIXME("(%p %p): stub\n", graphics, rect); - return NotImplemented; -} - -/***************************************************************************** * GdipDrawDriverString [GDIPLUS.@] */ GpStatus WINGDIPAPI GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT16 *text, INT length, diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 71101ce..704be0a 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -227,6 +227,8 @@ GpStatus WINGDIPAPI GdipGetTextContrast(GpGraphics*,UINT*); GpStatus WINGDIPAPI GdipGetTextRenderingHint(GpGraphics*,TextRenderingHint*); GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*); GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics*,ARGB); +GpStatus WINGDIPAPI GdipGetVisibleClipBounds(GpGraphics*,GpRectF*); +GpStatus WINGDIPAPI GdipGetVisibleClipBoundsI(GpGraphics*,GpRect*); GpStatus WINGDIPAPI GdipIsClipEmpty(GpGraphics*, BOOL*); GpStatus WINGDIPAPI GdipIsVisiblePoint(GpGraphics*,REAL,REAL,BOOL*); GpStatus WINGDIPAPI GdipIsVisiblePointI(GpGraphics*,INT,INT,BOOL*);

1 0

Andrew Eikum : gdiplus: Create utility function get_graphics_bounds.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: fdf48f1d4dd15784f86dd5b15c4be7c60d2eec1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf48f1d4dd15784f86dd5b15… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 12 15:36:54 2009 -0500 gdiplus: Create utility function get_graphics_bounds. --- dlls/gdiplus/graphics.c | 41 +++++++++++++++++++++++++++++------------ 1 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 10799c7..8f73ee9 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1040,6 +1040,28 @@ static GpStatus restore_container(GpGraphics* graphics, return Ok; } +static GpStatus get_graphics_bounds(GpGraphics* graphics, GpRectF* rect) +{ + RECT wnd_rect; + + if(graphics->hwnd) { + if(!GetClientRect(graphics->hwnd, &wnd_rect)) + return GenericError; + + rect->X = wnd_rect.left; + rect->Y = wnd_rect.top; + rect->Width = wnd_rect.right - wnd_rect.left; + rect->Height = wnd_rect.bottom - wnd_rect.top; + }else{ + rect->X = 0; + rect->Y = 0; + rect->Width = GetDeviceCaps(graphics->hdc, HORZRES); + rect->Height = GetDeviceCaps(graphics->hdc, VERTRES); + } + + return Ok; +} + GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) { TRACE("(%p, %p)\n", hdc, graphics); @@ -3120,7 +3142,7 @@ GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics *graphics, ARGB color) { GpSolidFill *brush; GpStatus stat; - RECT rect; + GpRectF wnd_rect; TRACE("(%p, %x)\n", graphics, color); @@ -3133,18 +3155,13 @@ GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics *graphics, ARGB color) if((stat = GdipCreateSolidFill(color, &brush)) != Ok) return stat; - if(graphics->hwnd){ - if(!GetWindowRect(graphics->hwnd, &rect)){ - GdipDeleteBrush((GpBrush*)brush); - return GenericError; - } - - GdipFillRectangle(graphics, (GpBrush*)brush, 0.0, 0.0, (REAL)(rect.right - rect.left), - (REAL)(rect.bottom - rect.top)); + if((stat = get_graphics_bounds(graphics, &wnd_rect)) != Ok){ + GdipDeleteBrush((GpBrush*)brush); + return stat; } - else - GdipFillRectangle(graphics, (GpBrush*)brush, 0.0, 0.0, (REAL)GetDeviceCaps(graphics->hdc, HORZRES), - (REAL)GetDeviceCaps(graphics->hdc, VERTRES)); + + GdipFillRectangle(graphics, (GpBrush*)brush, wnd_rect.X, wnd_rect.Y, + wnd_rect.Width, wnd_rect.Height); GdipDeleteBrush((GpBrush*)brush);

1 0

André Hentschel : cmdlgtst: Update German translation.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: e2779dc477fcd16602ae1eb5d18b351ba07c54ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2779dc477fcd16602ae1eb5d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 12 19:19:55 2009 +0200 cmdlgtst: Update German translation. --- programs/cmdlgtst/De.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmdlgtst/De.rc b/programs/cmdlgtst/De.rc index 5583c6b..daa0a00 100644 --- a/programs/cmdlgtst/De.rc +++ b/programs/cmdlgtst/De.rc @@ -246,7 +246,7 @@ FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 72, 96, 50, 14 LTEXT "Common Dialog Test Jig Exerciser, Version 1.20", -1, 13, 36, 168, 12 - LTEXT "(c) 1999-2000, Eric Williams. Rights are as granted under the WINE license. Don't hoard code... share it!", -1, 18, 60, 157, 24 + LTEXT "(c) 1999-2000, Eric Williams. Die Rechte befinden sich im Rahmen der WINE Lizenz. Bunker deinen Code nicht... teile ihn!", -1, 18, 60, 157, 24 ICON "AboutIcon", -1, 84, 12, 18, 20 } @@ -262,7 +262,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Farbdialog ändert die Hintergrundfarbe.", -1, 12, 120, 168, 12 LTEXT "Schriftdialog ändert alle Schriften und die Schriftfarbe, wenn CF_EFFECTS ausgewählt ist.", -1, 12, 144, 168, 24 LTEXT "Die linke, obere Ecke weist auf den vollständen Verzeichnisnamen und die Bezeichnung des letzten erfolgreichen Öffnens oder Sicherns hin.", -1, 12, 180, 168, 24 - LTEXT "(c) 1999-2000, Eric Williams. Rights are as granted under the WINE license. Don't hoard code... share it!", -1, 12, 228, 168, 36 + LTEXT "(c) 1999-2000, Eric Williams. Die Rechte befinden sich im Rahmen der WINE Lizenz. Bunker deinen Code nicht... teile ihn!", -1, 12, 228, 168, 36 ICON "AboutIcon", -1, 86, 12, 18, 20 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 216, 168, 2 }

1 0

André Hentschel : taskmgr: Update German translation.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: ffafad5f66439f6a43e59e9b15326b1e905691b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffafad5f66439f6a43e59e9b1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 12 19:20:33 2009 +0200 taskmgr: Update German translation. --- programs/taskmgr/De.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/De.rc b/programs/taskmgr/De.rc index 0c2f5ee..2123a4a 100644 --- a/programs/taskmgr/De.rc +++ b/programs/taskmgr/De.rc @@ -419,7 +419,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_APP_TITLE "Task-Manager" IDC_TASKMGR "Task-Manager" - IDS_RUNDLG_CAPTION "Create New Task" + IDS_RUNDLG_CAPTION "Neuer Task" END STRINGTABLE DISCARDABLE @@ -480,7 +480,7 @@ BEGIN IDS_VIEW_LARGE "&Große Symbole" IDS_VIEW_SMALL "&Kleine Symbole" IDS_VIEW_DETAILS "&Details" - IDS_WINDOWS "&Windows" + IDS_WINDOWS "&Fenster" IDS_VIEW_SELECTCOLUMNS "&Spalten auswählen..." IDS_OPTIONS_SHOW16BITTASKS "&16-bit-Tasks anzeigen" IDS_VIEW_CPUHISTORY "&CPU Verlauf"

1 0

André Hentschel : oleview: Update German translation.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: 3fb413acdc4c5867d0a72ffa521142e037520a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fb413acdc4c5867d0a72ffa5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 12 19:20:10 2009 +0200 oleview: Update German translation. --- programs/oleview/De.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/oleview/De.rc b/programs/oleview/De.rc index afb0b7c..d8bc355 100644 --- a/programs/oleview/De.rc +++ b/programs/oleview/De.rc @@ -100,7 +100,7 @@ STRINGTABLE IDS_ABOUTVER "Version 1.0" IDS_TYPELIBTITLE "ITypeLib-Betrachter" IDS_OPEN "Öffnen" - IDS_OPEN_TYPELIB_FILTER "TypeLib Files (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0All Files (*.*)\0*.*\0\0" + IDS_OPEN_TYPELIB_FILTER "TypeLib Dateien (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0Alle Dateien (*.*)\0*.*\0\0" IDM_BIND, "An Datei via Datei-Moniker binden" IDM_TYPELIB, "TypeLib-Datei öffnen und Inhalt betrachten" @@ -137,7 +137,7 @@ STRINGTABLE IDS_TL_VER, "Ver." IDS_TREE_I, "Schnittstellen" - IDS_TAB_REG, "Registry" + IDS_TAB_REG, "Registrierung" IDS_TAB_IMPL, "Implementierung" IDS_TAB_ACTIV, "Aktivierung" @@ -145,7 +145,7 @@ STRINGTABLE IDS_ERROR_UNKN, "Unbekannter Fehler" IDS_TRUE, "Wahr" IDS_FALSE, "Falsch" - IDS_BYTES, "bytes" + IDS_BYTES, "Bytes" IDS_ERROR_LOADTYPELIB, "LoadTypeLib( %s ) fehlgeschlagen ($%x)" IDS_INHERITINTERFACES, "Ererbte Schnittstellen"

1 0

André Hentschel : msvfw32: Update German translation.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: 64a60d8a179da7df707f7cf74a2368dd076f2887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a60d8a179da7df707f7cf74… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 12 19:19:43 2009 +0200 msvfw32: Update German translation. --- dlls/msvfw32/msvfw32_De.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvfw32/msvfw32_De.rc b/dlls/msvfw32/msvfw32_De.rc index 051b7df..b697eb1 100644 --- a/dlls/msvfw32/msvfw32_De.rc +++ b/dlls/msvfw32/msvfw32_De.rc @@ -34,16 +34,16 @@ FONT 8, "MS Shell Dlg" LTEXT "&Komprimierer:",-1,9,6,105,8 COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "Kon&figurieren...",882,129,36,49,14 + PUSHBUTTON "Kon&figurieren",882,129,36,49,14 PUSHBUTTON "&Über...",883,129,52,49,14 SCROLLBAR 884,9,44,111,9,WS_TABSTOP LTEXT "Komprimierungsqualität:",886,9,34,80,8 - CONTROL "&Key Frame aller",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + CONTROL "&Key Frame alle",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 EDITTEXT 888,78,60,22,12 - LTEXT "frames",889,103,62,26,10 + LTEXT "Frames",889,103,62,26,10 CONTROL "&Datenrate",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 EDITTEXT 895,78,76,22,12

1 0

André Hentschel : comdlg32: Update German translation.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: 0b9ba054f6c8a2d96c898e7325087f56a6224644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b9ba054f6c8a2d96c898e732… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 12 19:19:32 2009 +0200 comdlg32: Update German translation. --- dlls/comdlg32/cdlg_De.rc | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comdlg32/cdlg_De.rc b/dlls/comdlg32/cdlg_De.rc index 6bc8ed9..787a85e 100644 --- a/dlls/comdlg32/cdlg_De.rc +++ b/dlls/comdlg32/cdlg_De.rc @@ -113,7 +113,7 @@ FONT 8, "MS Shell Dlg" RADIOBUTTON "&Querformat", rad4, 50, 115, 40, 12 ICON "LANDSCAP", 1097, 10, 95, 32, 32 ICON "PORTRAIT", 1098, 10, 95, 32, 32 - GROUPBOX "Paper", 1074, 120, 85, 180, 50, BS_GROUPBOX + GROUPBOX "Papier", 1074, 120, 85, 180, 50, BS_GROUPBOX LTEXT "&Größe", 1089, 130, 95, 30, 9 LTEXT "P&apierquelle", 1090, 130, 110, 30, 9 COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP @@ -277,7 +277,7 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Hilfe", pshHelp,222,145,50,14 } -PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 186 +PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 295, 186 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK CAPTION "Drucken" @@ -287,24 +287,24 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Abbrechen", IDCANCEL, 232,164, 48,14, WS_GROUP PUSHBUTTON "&Hilfe", pshHelp, 50, 161, 48,14, WS_GROUP - GROUPBOX "Drucker", grp4, 8, 4, 272,84, WS_GROUP - CONTROL "In Da&tei drucken", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 + GROUPBOX "Drucker", grp4, 8, 4, 279,84, WS_GROUP + CONTROL "In Da&tei drucken", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,66,12 PUSHBUTTON "&Eigenschaften", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Name:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Status:", stc8, 16, 36, 36,10, SS_NOPREFIX - LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "[keiner]", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Typ:", stc7, 16, 48, 36,10, SS_NOPREFIX - LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "[keiner]", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Ort:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "[keiner]", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Kommentar:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "Dummy Remark", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "[keiner]", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Kopien", grp2, 160, 92, 120,64, WS_GROUP + GROUPBOX "Kopien", grp2, 160, 92, 127,64, WS_GROUP LTEXT "Anzahl &Kopien:",stc5,168,108,68,8 ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE - CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12 + CONTROL "S&ortieren", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,42,12 EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "Druck Bereich", grp1, 8,92, 144,64, WS_GROUP @@ -434,7 +434,7 @@ Bitte geben sie einen Wert zwischen %d und %d an." PD32_PRINTER_STATUS_WARMING_UP "Aufwärmend; " PD32_PRINTER_STATUS_TONER_LOW "Tonerstand niedrig; " PD32_PRINTER_STATUS_NO_TONER "Kein Toner mehr; " - PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " + PD32_PRINTER_STATUS_PAGE_PUNT "Seitenausgabe; " PD32_PRINTER_STATUS_USER_INTERVENTION "Durch Benutzer unterbrochen; " PD32_PRINTER_STATUS_OUT_OF_MEMORY "Kein Speicher mehr; " PD32_PRINTER_STATUS_DOOR_OPEN "Druckergehäuse ist offen; "

1 0

Austin Lund : user32/tests: Added tests for infinite WM_PAINT loop.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: 65758cde7f8a131f7bdc1699b5df9d4bc5fd179c URL: http://source.winehq.org/git/wine.git/?a=commit;h=65758cde7f8a131f7bdc1699b… Author: Austin Lund <austin.lund(a)gmail.com> Date: Fri Jul 10 09:10:07 2009 +1000 user32/tests: Added tests for infinite WM_PAINT loop. --- dlls/user32/tests/win.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d45eba3..6ec120a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4859,6 +4859,78 @@ static void test_Expose(void) DestroyWindow(mw); } +static LRESULT CALLBACK TestNCRedraw_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + static UINT ncredrawflags; + PAINTSTRUCT ps; + RECT rect; + BOOL updateRectValue; + + switch(msg) + { + case WM_CREATE: + ncredrawflags = *(UINT *) (((CREATESTRUCT *)lParam)->lpCreateParams); + return 0; + case WM_NCPAINT: + updateRectValue = GetUpdateRect(hwnd, &rect, FALSE); + RedrawWindow(hwnd, NULL, NULL, ncredrawflags); + break; + case WM_PAINT: + BeginPaint(hwnd, &ps); + EndPaint(hwnd, &ps); + return 0; + } + return DefWindowProc(hwnd, msg, wParam, lParam); +} + +static void run_NCRedrawLoop(UINT flags) +{ + HWND hwnd; + MSG msg; + + UINT loopcount = 0; + + hwnd = CreateWindowA("TestNCRedrawClass", "MainWindow", + WS_OVERLAPPEDWINDOW, 0, 0, 200, 100, + NULL, NULL, 0, &flags); + ShowWindow(hwnd, SW_SHOW); + UpdateWindow(hwnd); + while(PeekMessage(&msg, hwnd, 0, 0, PM_REMOVE) != 0) + { + if (msg.message == WM_PAINT) loopcount++; + if (loopcount >= 100) break; + TranslateMessage(&msg); + DispatchMessage(&msg); + MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT); + } + if (flags == (RDW_INVALIDATE | RDW_FRAME)) + todo_wine ok(loopcount < 100, "Detected infinite WM_PAINT loop (%x).\n", flags); + else + ok(loopcount < 100, "Detected infinite WM_PAINT loop (%x).\n", flags); + DestroyWindow(hwnd); +} + +static void test_NCRedraw(void) +{ + WNDCLASSA wndclass; + + wndclass.lpszClassName = "TestNCRedrawClass"; + wndclass.style = CS_HREDRAW | CS_VREDRAW; + wndclass.lpfnWndProc = TestNCRedraw_WndProc; + wndclass.cbClsExtra = 0; + wndclass.cbWndExtra = 0; + wndclass.hInstance = 0; + wndclass.hIcon = LoadIcon(NULL, IDI_APPLICATION); + wndclass.hCursor = LoadCursor(NULL, IDC_ARROW); + wndclass.hbrBackground = GetStockObject(WHITE_BRUSH); + wndclass.lpszMenuName = NULL; + + RegisterClassA(&wndclass); + + run_NCRedrawLoop(RDW_INVALIDATE | RDW_FRAME); + run_NCRedrawLoop(RDW_INVALIDATE); +} + static void test_GetWindowModuleFileName(void) { HWND hwnd; @@ -5647,6 +5719,7 @@ START_TEST(win) test_SetMenu(hwndMain); test_SetFocus(hwndMain); test_SetActiveWindow(hwndMain); + test_NCRedraw(); test_children_zorder(hwndMain); test_popup_zorder(hwndMain2, hwndMain);

1 0