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

Piotr Caban : msvcp100: Update spec file.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 4bdaa20a73e86e6170453e28d7a2527154c09a0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bdaa20a73e86e6170453e28d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 16 10:36:28 2012 +0200 msvcp100: Update spec file. --- dlls/msvcp100/msvcp100.spec | 4392 +++++++++++++++++++++--------------------- 1 files changed, 2196 insertions(+), 2196 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4bdaa20a73e86e6170453…

1 0

Piotr Caban : msvcp100: Fixed 64-bit variables alignment.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 5e7452ade9dccebcc53a0b2f2c481a3b70755339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e7452ade9dccebcc53a0b2f2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 16 10:47:23 2012 +0200 msvcp100: Fixed 64-bit variables alignment. --- dlls/msvcp100/ios.c | 64 ++++++++++++++++++++++++------------------------ dlls/msvcp100/msvcp.h | 6 +++- 2 files changed, 36 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e7452ade9dccebcc53a0…

1 0

Dmitry Timoshkov : gdiplus: Destination points passed to GdipDrawImagePointsRect should be in device units .
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 7f1cb3bca20a94ce0161e6a9c44e9c831611ef8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1cb3bca20a94ce0161e6a9c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 15 12:09:24 2012 +0900 gdiplus: Destination points passed to GdipDrawImagePointsRect should be in device units. --- dlls/gdiplus/graphics.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 77f2f8d..4606074 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2969,14 +2969,19 @@ GpStatus WINGDIPAPI GdipDrawImagePointRect(GpGraphics *graphics, GpImage *image, GpUnit srcUnit) { GpPointF points[3]; + REAL scale_x, scale_y, width, height; + TRACE("(%p, %p, %f, %f, %f, %f, %f, %f, %d)\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); + scale_x = units_scale(srcUnit, graphics->unit, graphics->xres); + scale_y = units_scale(srcUnit, graphics->unit, graphics->yres); + width = srcwidth * scale_x; + height = srcheight * scale_y; + points[0].X = points[2].X = x; points[0].Y = points[1].Y = y; - - /* FIXME: convert image coordinates to Graphics coordinates? */ - points[1].X = x + srcwidth; - points[2].Y = y + srcheight; + points[1].X = x + width; + points[2].Y = y + height; return GdipDrawImagePointsRect(graphics, image, points, 3, srcx, srcy, srcwidth, srcheight, srcUnit, NULL, NULL, NULL);

1 0

Dmitry Timoshkov : gdiplus: When there is no target rectangle specified DrawImage should scale image to device dpi .
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 938d42c1480fbc7c80a4db187a29148a7742e219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=938d42c1480fbc7c80a4db187… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 15 12:10:08 2012 +0900 gdiplus: When there is no target rectangle specified DrawImage should scale image to device dpi. --- dlls/gdiplus/graphics.c | 2 ++ dlls/gdiplus/tests/image.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4606074..dfa37eb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2974,7 +2974,9 @@ GpStatus WINGDIPAPI GdipDrawImagePointRect(GpGraphics *graphics, GpImage *image, TRACE("(%p, %p, %f, %f, %f, %f, %f, %f, %d)\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); scale_x = units_scale(srcUnit, graphics->unit, graphics->xres); + scale_x *= graphics->xres / image->xres; scale_y = units_scale(srcUnit, graphics->unit, graphics->yres); + scale_y *= graphics->yres / image->yres; width = srcwidth * scale_x; height = srcheight * scale_y; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 24cb434..9e90cca 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3642,7 +3642,6 @@ static void test_DrawImage(void) expect(Ok, status); match = memcmp(white_2x2, black_2x2, sizeof(black_2x2)) == 0; -todo_wine ok(match, "data should match\n"); if (!match) { @@ -3695,7 +3694,6 @@ static void test_GdipDrawImagePointRect(void) expect(Ok, status); match = memcmp(white_2x2, black_2x2, sizeof(black_2x2)) == 0; -todo_wine ok(match, "data should match\n"); if (!match) {

1 0

Dmitry Timoshkov : gdiplus: Properly convert source coordinates to device units in GdipDrawImagePointsRect .
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: e7b5e6984338b741c33dca240b016a7edc9bc27a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7b5e6984338b741c33dca240… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 15 12:10:45 2012 +0900 gdiplus: Properly convert source coordinates to device units in GdipDrawImagePointsRect. --- dlls/gdiplus/graphics.c | 43 +++++++++++++++---------------------------- 1 files changed, 15 insertions(+), 28 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index dfa37eb..85234c8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3040,7 +3040,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image { GpPointF ptf[4]; POINT pti[4]; - REAL dx, dy; GpStatus stat; TRACE("(%p, %p, %p, %d, %f, %f, %f, %f, %d, %p, %p, %p)\n", graphics, image, points, @@ -3063,6 +3062,15 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image return Ok; transform_and_round_points(graphics, pti, ptf, 4); + TRACE("%s %s %s %s\n", wine_dbgstr_point(&pti[0]), wine_dbgstr_point(&pti[1]), + wine_dbgstr_point(&pti[2]), wine_dbgstr_point(&pti[3])); + + srcx = units_to_pixels(srcx, srcUnit, image->xres); + srcy = units_to_pixels(srcy, srcUnit, image->yres); + srcwidth = units_to_pixels(srcwidth, srcUnit, image->xres); + srcheight = units_to_pixels(srcheight, srcUnit, image->yres); + TRACE("src pixels: %f,%f %fx%f\n", srcx, srcy, srcwidth, srcheight); + if (image->picture) { if (!graphics->hdc) @@ -3070,23 +3078,10 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image FIXME("graphics object has no HDC\n"); } - /* FIXME: partially implemented (only works for rectangular parallelograms) */ - if(srcUnit == UnitInch) - dx = dy = (REAL) INCH_HIMETRIC; - else if(srcUnit == UnitPixel){ - dx = ((REAL) INCH_HIMETRIC) / - ((REAL) GetDeviceCaps(graphics->hdc, LOGPIXELSX)); - dy = ((REAL) INCH_HIMETRIC) / - ((REAL) GetDeviceCaps(graphics->hdc, LOGPIXELSY)); - } - else - return NotImplemented; - if(IPicture_Render(image->picture, graphics->hdc, pti[0].x, pti[0].y, pti[1].x - pti[0].x, pti[2].y - pti[0].y, - srcx * dx, srcy * dy, - srcwidth * dx, srcheight * dy, - NULL) != S_OK){ + srcx, srcy, srcwidth, srcheight, NULL) != S_OK) + { if(callback) callback(callbackData); return GenericError; @@ -3097,18 +3092,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image GpBitmap* bitmap = (GpBitmap*)image; int use_software=0; - if (srcUnit == UnitInch) - dx = dy = 96.0; /* FIXME: use the image resolution */ - else if (srcUnit == UnitPixel) - dx = dy = 1.0; - else - return NotImplemented; - - srcx = srcx * dx; - srcy = srcy * dy; - srcwidth = srcwidth * dx; - srcheight = srcheight * dy; - if (imageAttributes || (graphics->image && graphics->image->type == ImageTypeBitmap) || !((GpBitmap*)image)->hbitmap || @@ -3145,6 +3128,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (dst_area.bottom < pti[i].y) dst_area.bottom = pti[i].y; } + TRACE("dst_area: %s\n", wine_dbgstr_rect(&dst_area)); + m11 = (ptf[1].X - ptf[0].X) / srcwidth; m21 = (ptf[2].X - ptf[0].X) / srcheight; mdx = ptf[0].X - m11 * srcx - m21 * srcy; @@ -3174,6 +3159,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image get_bitmap_sample_size(interpolation, imageAttributes->wrap, bitmap, srcx, srcy, srcwidth, srcheight, &src_area); + TRACE("src_area: %d x %d\n", src_area.Width, src_area.Height); + src_data = GdipAlloc(sizeof(ARGB) * src_area.Width * src_area.Height); if (!src_data) {

1 0

Dmitry Timoshkov : gdiplus: Dump the matrix passed to GdipSetWorldTransform .
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 7c8e8fc5e2ea09b26a3e1956779ff3d12b008e33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8e8fc5e2ea09b26a3e19567… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 15 12:11:38 2012 +0900 gdiplus: Dump the matrix passed to GdipSetWorldTransform. --- dlls/gdiplus/graphics.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 85234c8..2b7a87b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5587,6 +5587,10 @@ GpStatus WINGDIPAPI GdipSetWorldTransform(GpGraphics *graphics, GpMatrix *matrix if(graphics->busy) return ObjectBusy; + TRACE("%f,%f,%f,%f,%f,%f\n", + matrix->matrix[0], matrix->matrix[1], matrix->matrix[2], + matrix->matrix[3], matrix->matrix[4], matrix->matrix[5]); + GdipDeleteMatrix(graphics->worldtrans); return GdipCloneMatrix(matrix, &graphics->worldtrans); }

1 0

Dmitry Timoshkov : gdiplus: Make GdipSetPropertyItem return Ok.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: e3d27c42d94e39f49c817066cd3af7097f4a12b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3d27c42d94e39f49c817066c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 15 12:12:28 2012 +0900 gdiplus: Make GdipSetPropertyItem return Ok. --- dlls/gdiplus/image.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 64ce8b6..1ee5cbc 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3459,7 +3459,7 @@ GpStatus WINGDIPAPI GdipSetPropertyItem(GpImage *image, GDIPCONST PropertyItem* if(!(calls++)) FIXME("not implemented\n"); - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage *image, GDIPCONST WCHAR* filename,

1 0

Francois Gouget : kernel32: Fix the spelling of 'combo box' and 'top-level' in some error messages.
by Alexandre Julliard 16 Aug '12

16 Aug '12

1 0

Gustavo Henrique Milaré : po: Fix Brazilian Portuguese translation.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 5ec657600e14b7176c7a4220011a58b715cb9b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec657600e14b7176c7a42200… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Aug 16 00:02:59 2012 -0300 po: Fix Brazilian Portuguese translation. --- po/pt_BR.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 8644ac6..622dd8a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-07-23 22:30-0300\n" +"PO-Revision-Date: 2012-08-16 00:01-0300\n" "Last-Translator: Gustavo Henrique Milaré <gugamilare(a)gmail.com>\n" "Language-Team: none\n" "Language: Portuguese (Brazil)\n" @@ -12643,23 +12643,23 @@ msgstr "Diagnósticos de driver" #: winecfg.rc:258 msgid "Defaults" -msgstr "Padrões" +msgstr "Dispositivos Padrões" #: winecfg.rc:259 msgid "Output device:" -msgstr "Dispositivo de saída:" +msgstr "Saída:" #: winecfg.rc:260 msgid "Voice output device:" -msgstr "Dispositivo de saída de voz:" +msgstr "Saída de voz:" #: winecfg.rc:261 msgid "Input device:" -msgstr "Dispositivo de entrada:" +msgstr "Entrada:" #: winecfg.rc:262 msgid "Voice input device:" -msgstr "Dispositivo de entrada de voz:" +msgstr "Entrada de voz:" #: winecfg.rc:267 msgid "&Test Sound"

1 0

Michael Stefaniuc : taskmgr: Drop a superfluous TRUE: FALSE conditional expression.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 4cebe9e27e37efbf16c885fa428aeb96e21ca7cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cebe9e27e37efbf16c885fa4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:54:31 2012 +0200 taskmgr: Drop a superfluous TRUE:FALSE conditional expression. --- programs/taskmgr/applpage.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index d0a812a..c7debec 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -244,7 +244,7 @@ static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) { HICON hIcon; WCHAR wszText[256]; - BOOL bLargeIcon; + BOOL bLargeIcon = TaskManagerSettings.View_LargeIcons; BOOL bHung = FALSE; typedef int (__stdcall *IsHungAppWindowProc)(HWND); IsHungAppWindowProc IsHungAppWindow; @@ -254,8 +254,6 @@ static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) if (hWnd == hMainWnd) return TRUE; - bLargeIcon = TaskManagerSettings.View_LargeIcons ? TRUE : FALSE; - /* Check and see if this is a top-level app window */ if (!GetWindowTextW(hWnd, wszText, sizeof(wszText)/sizeof(WCHAR)) || !IsWindowVisible(hWnd) ||

1 0