wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Vincent Povirk : gdiplus: Add a test for GdipSetImageAttributesColorMatrix.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 70bdc43c20a01d01920c1e397c2e9a26829f76bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=70bdc43c20a01d01920c1e397… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 17:38:40 2009 -0600 gdiplus: Add a test for GdipSetImageAttributesColorMatrix. --- dlls/gdiplus/tests/image.c | 104 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 104 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 522e5de..14a4b1b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1092,6 +1092,109 @@ static void test_palette(void) GdipDisposeImage((GpImage*)bitmap); } +static void test_colormatrix(void) +{ + GpStatus stat; + ColorMatrix colormatrix, graymatrix; + GpImageAttributes *imageattr; + const ColorMatrix identity = {{ + {1.0,0.0,0.0,0.0,0.0}, + {0.0,1.0,0.0,0.0,0.0}, + {0.0,0.0,1.0,0.0,0.0}, + {0.0,0.0,0.0,1.0,0.0}, + {0.0,0.0,0.0,0.0,1.0}}}; + const ColorMatrix double_red = {{ + {2.0,0.0,0.0,0.0,0.0}, + {0.0,1.0,0.0,0.0,0.0}, + {0.0,0.0,1.0,0.0,0.0}, + {0.0,0.0,0.0,1.0,0.0}, + {0.0,0.0,0.0,0.0,1.0}}}; + GpBitmap *bitmap1, *bitmap2; + GpGraphics *graphics; + ARGB color; + + colormatrix = identity; + graymatrix = identity; + + stat = GdipSetImageAttributesColorMatrix(NULL, ColorAdjustTypeDefault, + TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsDefault); + expect(InvalidParameter, stat); + + stat = GdipCreateImageAttributes(&imageattr); + expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, NULL, ColorMatrixFlagsDefault); + todo_wine expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, NULL, NULL, ColorMatrixFlagsDefault); + expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsDefault); + todo_wine expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, NULL, ColorMatrixFlagsSkipGrays); + todo_wine expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, NULL, ColorMatrixFlagsAltGray); + expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsAltGray); + todo_wine expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, &graymatrix, 3); + todo_wine expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeCount, + TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsDefault); + todo_wine expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeAny, + TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsDefault); + todo_wine expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + FALSE, NULL, NULL, ColorMatrixFlagsDefault); + todo_wine expect(Ok, stat); + + /* Drawing a bitmap transforms the colors */ + colormatrix = double_red; + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, NULL, ColorMatrixFlagsDefault); + todo_wine expect(Ok, stat); + + stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppRGB, NULL, &bitmap1); + expect(Ok, stat); + + stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppRGB, NULL, &bitmap2); + expect(Ok, stat); + + stat = GdipBitmapSetPixel(bitmap1, 0, 0, 0xff40ffff); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap2, &graphics); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage*)bitmap1, 0,0,1,1, 0,0,1,1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + todo_wine expect(0xff80ffff, color); + + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap1); + GdipDisposeImage((GpImage*)bitmap2); + GdipDisposeImageAttributes(imageattr); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1120,6 +1223,7 @@ START_TEST(image) test_createhbitmap(); test_getsetpixel(); test_palette(); + test_colormatrix(); GdiplusShutdown(gdiplusToken); }

1 0

Vincent Povirk : gdiplus: Allocate a new ImageAttributes object in GdipCloneImageAttributes.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 149c44eb4c4d390d1d84625137dd06dfd7a5b1ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=149c44eb4c4d390d1d8462513… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:18:49 2009 -0600 gdiplus: Allocate a new ImageAttributes object in GdipCloneImageAttributes. --- dlls/gdiplus/imageattributes.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 8f49c67..a52c297 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -30,14 +30,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes *imageattr, GpImageAttributes **cloneImageattr) { + GpStatus stat; + TRACE("(%p, %p)\n", imageattr, cloneImageattr); if(!imageattr || !cloneImageattr) return InvalidParameter; - **cloneImageattr = *imageattr; + stat = GdipCreateImageAttributes(cloneImageattr); - return Ok; + if (stat == Ok) + **cloneImageattr = *imageattr; + + return stat; } GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes **imageattr)

1 0

Vincent Povirk : gdiplus: Add trace for values of new graphics and image objects.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: f8ca372459b2700dac452f3a3b06a7d6a14a5962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ca372459b2700dac452f3a3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:09:45 2009 -0600 gdiplus: Add trace for values of new graphics and image objects. --- dlls/gdiplus/graphics.c | 4 ++++ dlls/gdiplus/image.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b1092b7..5ab544d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1162,6 +1162,8 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra list_init(&(*graphics)->containers); (*graphics)->contid = 0; + TRACE("<-- %p\n", *graphics); + return Ok; } @@ -1271,6 +1273,8 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, if(delete) DeleteMetaFile(hwmf); + TRACE("<-- %p\n", *metafile); + return Ok; err: diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 3dbe4da..9858f33 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1282,6 +1282,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, } } + TRACE("<-- %p\n", *bitmap); + return Ok; } @@ -1976,6 +1978,8 @@ static GpStatus decode_image_olepicture_metafile(IStream* stream, REFCLSID clsid (*image)->palette_size = 0; (*image)->palette_entries = NULL; + TRACE("<-- %p\n", *image); + return Ok; }

1 0

Vincent Povirk : gdiplus: Add traces for values of newly-created font objects.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 2d8fb9ade3a766290cb8e797af69a272e5976554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d8fb9ade3a766290cb8e797a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:04:56 2009 -0600 gdiplus: Add traces for values of newly-created font objects. --- dlls/gdiplus/font.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 89498bc..fda5428 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -158,6 +158,8 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, (*font)->height = tmw->ntmSizeEM; (*font)->line_spacing = tmw->tmAscent + tmw->tmDescent + tmw->tmExternalLeading; + TRACE("<-- %p\n", *font); + return Ok; } @@ -205,6 +207,8 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, SelectObject(hdc, oldfont); DeleteObject(hfont); + TRACE("<-- %p\n", *font); + return Ok; } @@ -583,6 +587,8 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, *FontFamily = ffamily; + TRACE("<-- %p\n", ffamily); + return Ok; } @@ -611,6 +617,8 @@ GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily* FontFamily, GpFontFamily** (*clonedFontFamily)->tmw = FontFamily->tmw; lstrcpyW((*clonedFontFamily)->FamilyName, FontFamily->FamilyName); + TRACE("<-- %p\n", *clonedFontFamily); + return Ok; } @@ -845,6 +853,9 @@ GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection** fontCollecti (*fontCollection)->FontFamilies = NULL; (*fontCollection)->count = 0; (*fontCollection)->allocated = 0; + + TRACE("<-- %p\n", *fontCollection); + return Ok; }

1 0

Vincent Povirk : gdiplus: Add traces for values of newly-created linecaps.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: d5fffdd0c41b7b2364be849e3cb6e5b312752b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5fffdd0c41b7b2364be849e3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:00:39 2009 -0600 gdiplus: Add traces for values of newly-created linecaps. --- dlls/gdiplus/customlinecap.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 5658e69..e8ad968 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -57,6 +57,8 @@ GpStatus WINGDIPAPI GdipCloneCustomLineCap(GpCustomLineCap* from, * sizeof(PointF)); memcpy((*to)->pathdata.Types, from->pathdata.Types, from->pathdata.Count); + TRACE("<-- %p\n", *to); + return Ok; } @@ -105,6 +107,8 @@ GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath* fillPath, GpPath* strokePath (*customCap)->join = LineJoinMiter; (*customCap)->scale = 1.0; + TRACE("<-- %p\n", *customCap); + return Ok; }

1 0

Vincent Povirk : gdiplus: Add traces for values of newly-created brushes.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: f1417780033a008ad8ce72dbac931ed4c723bc0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1417780033a008ad8ce72dba… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 14:58:28 2009 -0600 gdiplus: Add traces for values of newly-created brushes. --- dlls/gdiplus/brush.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 3bce1d3..49e9e0e 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -174,6 +174,7 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) return NotImplemented; } + TRACE("<-- %p\n", *clone); return Ok; } @@ -290,6 +291,7 @@ GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, AR (*brush)->forecol = forecol; (*brush)->backcol = backcol; (*brush)->hatchstyle = hatchstyle; + TRACE("<-- %p\n", *brush); } else { @@ -370,6 +372,8 @@ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF* startpoint, (*line)->pblendpos = NULL; (*line)->pblendcount = 0; + TRACE("<-- %p\n", *line); + return Ok; } @@ -544,6 +548,8 @@ GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points, (*grad)->focus.X = 0.0; (*grad)->focus.Y = 0.0; + TRACE("<-- %p\n", *grad); + return Ok; } @@ -634,6 +640,8 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, (*grad)->focus.X = 0.0; (*grad)->focus.Y = 0.0; + TRACE("<-- %p\n", *grad); + return Ok; } @@ -660,6 +668,8 @@ GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB color, GpSolidFill **sf) (*sf)->color = color; (*sf)->bmp = ARGB2BMP(color); + TRACE("<-- %p\n", *sf); + return Ok; } @@ -854,6 +864,8 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, GdipFree(dibits); GdipFree(buff); + TRACE("<-- %p\n", *texture); + return Ok; }

1 0

Frédéric Delanoy : mapi32: Add French translation .
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 5dbbe5a7f1ac1c250d0f084f28a517fb60fce2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dbbe5a7f1ac1c250d0f084f2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Dec 18 23:23:49 2009 +0100 mapi32: Add French translation. --- dlls/mapi32/Fr.rc | 33 +++++++++++++++++++++++++++++++++ dlls/mapi32/Makefile.in | 1 + 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Fr.rc b/dlls/mapi32/Fr.rc new file mode 100644 index 0000000..ab14e4a --- /dev/null +++ b/dlls/mapi32/Fr.rc @@ -0,0 +1,33 @@ +/* +* MAPI32 French resources +* +* Copyright 2009 Frédéric Delanoy +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +* +*/ + +#include "res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "L'envoi de courriel a échoué car aucun client mail MAPI n'est installé." + IDS_SEND_MAIL, "Envoyer un courriel" +} diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 8a9233b..eecd69c 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -16,6 +16,7 @@ C_SRCS = \ RC_SRCS = \ De.rc \ En.rc \ + Fr.rc \ Lt.rc \ version.rc

1 0

Juan Lang : crypt32: Don' t get confused matching URLs with a colon in the userinfo portion (e.g. user:password@domain).
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 4e18ac601f9ea1adebc1c2d36af6d75054e0ca6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e18ac601f9ea1adebc1c2d36… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Dec 18 10:34:25 2009 -0800 crypt32: Don't get confused matching URLs with a colon in the userinfo portion (e.g. user:password@domain). --- dlls/crypt32/chain.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 28a2206..b2160f3 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -686,8 +686,12 @@ static BOOL url_matches(LPCWSTR constraint, LPCWSTR name, authority_end = strchrW(name, '?'); if (!authority_end) authority_end = name + strlenW(name); - /* Remove any port number from the authority */ - for (colon = authority_end; colon >= name && *colon != ':'; colon--) + /* Remove any port number from the authority. The userinfo portion + * of an authority may contain a colon, so stop if a userinfo portion + * is found (indicated by '@'). + */ + for (colon = authority_end; colon >= name && *colon != ':' && + *colon != '@'; colon--) ; if (*colon == ':') authority_end = colon;

1 0

Henri Verbeet : wined3d: NULL vertex declarations are captured, but not applied.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 79a20453958b4e7521970b3eb0f4eac17151d87e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79a20453958b4e7521970b3eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 18 16:21:37 2009 +0100 wined3d: NULL vertex declarations are captured, but not applied. --- dlls/d3d9/tests/stateblock.c | 170 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/stateblock.c | 6 +- 2 files changed, 172 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79a20453958b4e7521970…

1 0

Alexandre Julliard : user32: Fix the string style check for comboboxes.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 8e1bd0c8931efe617586aef5a412d8e4e107685b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e1bd0c8931efe617586aef5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 11:29:14 2009 +0100 user32: Fix the string style check for comboboxes. --- dlls/user32/msg16.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index 5304a9d..b1cc938 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -2039,9 +2039,13 @@ static LRESULT combo_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, wParam = (INT)(INT16)wParam; /* fall through */ case CB_ADDSTRING16: - if (GetWindowLongW( hwnd, GWL_STYLE ) & CBS_HASSTRINGS) lParam = (LPARAM)MapSL(lParam); + { + DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); + if ((style & CBS_HASSTRINGS) || !(style & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE))) + lParam = (LPARAM)MapSL(lParam); msg -= msg16_offset; break; + } case CB_SETITEMHEIGHT16: case CB_GETITEMHEIGHT16: case CB_SETCURSEL16:

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 December 2009