September 2009 - Wine-Commits

Hans Leidekker : msi: Don' t append the cabinet file name in find_published_source.
by Alexandre Julliard Sept. 16, 2009

Sept. 16, 2009

Module: wine Branch: master Commit: 86e08ea4e459fae2534e9d8cb6743a30e0c27b88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86e08ea4e459fae2534e9d8cb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 15 09:29:19 2009 +0200 msi: Don't append the cabinet file name in find_published_source. --- dlls/msi/media.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 15564cd..a0baa8c 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -597,7 +597,6 @@ static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) { /* FIXME: what about SourceDir */ lstrcpyW(mi->source, source); - lstrcatW(mi->source, mi->cabinet); return ERROR_SUCCESS; } }

1 0

Hans Leidekker : msi: GetDriveType and GetVolumeInformation require a path terminated by a slash .
by Alexandre Julliard Sept. 16, 2009

Sept. 16, 2009

Module: wine Branch: master Commit: 60d0cf41b36d2f7caa67830829d4f139218343d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60d0cf41b36d2f7caa6783082… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 15 09:28:41 2009 +0200 msi: GetDriveType and GetVolumeInformation require a path terminated by a slash. --- dlls/msi/media.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 7c9dc15..15564cd 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -49,11 +49,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); #define _O_TEXT 0x4000 #define _O_BINARY 0x8000 -static BOOL source_matches_volume(MSIMEDIAINFO *mi, LPWSTR source_root) +static BOOL source_matches_volume(MSIMEDIAINFO *mi, LPCWSTR source_root) { WCHAR volume_name[MAX_PATH + 1]; + WCHAR root[MAX_PATH + 1]; - if (!GetVolumeInformationW(source_root, volume_name, MAX_PATH + 1, + strcpyW(root, source_root); + PathStripToRootW(root); + PathAddBackslashW(root); + + if (!GetVolumeInformationW(root, volume_name, MAX_PATH + 1, NULL, NULL, NULL, NULL, 0)) { ERR("Failed to get volume information\n"); @@ -80,7 +85,6 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) error = generate_error_string(package, 1302, 1, mi->disk_prompt); error_dialog = msi_dup_property(package, error_prop); source_dir = msi_dup_property(package, cszSourceDir); - PathStripToRootW(source_dir); while (r == ERROR_SUCCESS && !source_matches_volume(mi, source_dir)) @@ -463,6 +467,17 @@ void msi_free_media_info(MSIMEDIAINFO *mi) msi_free(mi); } +static UINT get_drive_type(const WCHAR *path) +{ + WCHAR root[MAX_PATH + 1]; + + strcpyW(root, path); + PathStripToRootW(root); + PathAddBackslashW(root); + + return GetDriveTypeW(root); +} + static UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) { MSIRECORD *row; @@ -502,9 +517,7 @@ static UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO source_dir = msi_dup_property(package, cszSourceDir); lstrcpyW(mi->source, source_dir); - - PathStripToRootW(source_dir); - mi->type = GetDriveTypeW(source_dir); + mi->type = get_drive_type(source_dir); if (file->IsCompressed && mi->cabinet) {

1 0

Hans Leidekker : msi: Downgrade two ERRs to WARNs.
by Alexandre Julliard Sept. 16, 2009

Sept. 16, 2009

Module: wine Branch: master Commit: fc15d6d5ad2ea8e4d792ea0349ca06f76bff57f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc15d6d5ad2ea8e4d792ea034… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 15 09:28:06 2009 +0200 msi: Downgrade two ERRs to WARNs. --- dlls/msi/table.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index b963a20..86cd4be 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2777,7 +2777,7 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, r = TABLE_insert_row( &tv->view, rec, -1, FALSE ); if (r != ERROR_SUCCESS) - ERR("insert row failed\n"); + WARN("insert row failed\n"); if ( number != MSI_NULL_INTEGER && !lstrcmpW(name, szColumns) ) msi_update_table_columns( db, table ); @@ -2788,7 +2788,7 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, r = msi_table_find_row( tv, rec, &row ); if (r != ERROR_SUCCESS) - ERR("no matching row to transform\n"); + WARN("no matching row to transform\n"); else if ( mask ) { TRACE("modifying row [%d]:\n", row);

1 0

Hans Leidekker : msi: Improve a trace.
by Alexandre Julliard Sept. 16, 2009

Sept. 16, 2009

Module: wine Branch: master Commit: 90d283f0ebc1e295c4d5f7fe4ca04f729f59d923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d283f0ebc1e295c4d5f7fe4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 15 09:27:40 2009 +0200 msi: Improve a trace. --- dlls/msi/custom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 3476f0d..cbbcde5 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -679,7 +679,7 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) hModule = LoadLibraryW( dll ); if (!hModule) { - ERR("failed to load dll %s\n", debugstr_w( dll ) ); + ERR("failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); return r; }

1 0

Vincent Povirk : gdiplus: Use the preset blend when drawing linear gradients.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: d2e999d2e8139cfe01fffd45af0e019569cd8e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e999d2e8139cfe01fffd45a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 14 16:48:03 2009 -0500 gdiplus: Use the preset blend when drawing linear gradients. --- dlls/gdiplus/graphics.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6753262..df107e4 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -220,7 +220,27 @@ static ARGB blend_line_gradient(GpLineGradient* brush, REAL position) blendfac = (left_blendfac * (right_blendpos - position) + right_blendfac * (position - left_blendpos)) / range; } - return blend_colors(brush->startcolor, brush->endcolor, blendfac); + + if (brush->pblendcount == 0) + return blend_colors(brush->startcolor, brush->endcolor, blendfac); + else + { + int i=1; + ARGB left_blendcolor, right_blendcolor; + REAL left_blendpos, right_blendpos; + + /* locate the blend colors surrounding this position */ + while (blendfac > brush->pblendpos[i]) + i++; + + /* interpolate between the blend colors */ + left_blendpos = brush->pblendpos[i-1]; + left_blendcolor = brush->pblendcolor[i-1]; + right_blendpos = brush->pblendpos[i]; + right_blendcolor = brush->pblendcolor[i]; + blendfac = (blendfac - left_blendpos) / (right_blendpos - left_blendpos); + return blend_colors(left_blendcolor, right_blendcolor, blendfac); + } } static void brush_fill_path(GpGraphics *graphics, GpBrush* brush)

1 0

Vincent Povirk : gdiplus: Add tests for linear gradient preset blends.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: ad6adc750e9a248cef088db5ffa17e54bbd887f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad6adc750e9a248cef088db5f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 14 16:08:25 2009 -0500 gdiplus: Add tests for linear gradient preset blends. --- dlls/gdiplus/tests/brush.c | 85 ++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 4 ++ 2 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index e0515f4..cf94611 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -395,8 +395,11 @@ static void test_lineblend(void) int i; const REAL factors[5] = {0.0f, 0.1f, 0.5f, 0.9f, 1.0f}; const REAL positions[5] = {0.0f, 0.2f, 0.5f, 0.8f, 1.0f}; + const REAL two_positions[2] = {0.0f, 1.0f}; + const ARGB colors[5] = {0xff0000ff, 0xff00ff00, 0xff00ffff, 0xffff0000, 0xffffffff}; REAL res_factors[6] = {0.3f, 0.0f, 0.0f, 0.0f, 0.0f}; REAL res_positions[6] = {0.3f, 0.0f, 0.0f, 0.0f, 0.0f}; + ARGB res_colors[6] = {0xdeadbeef, 0, 0, 0, 0}; pt1.X = pt1.Y = 1.0; pt2.X = pt2.Y = 100.0; @@ -489,6 +492,88 @@ static void test_lineblend(void) status = GdipGetLineBlend(brush, res_factors, res_positions, 1); expect(Ok, status); + status = GdipGetLinePresetBlendCount(NULL, &count); + expect(InvalidParameter, status); + + status = GdipGetLinePresetBlendCount(brush, NULL); + expect(InvalidParameter, status); + + status = GdipGetLinePresetBlendCount(brush, &count); + expect(Ok, status); + expect(0, count); + + status = GdipGetLinePresetBlend(NULL, res_colors, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetLinePresetBlend(brush, NULL, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetLinePresetBlend(brush, res_colors, NULL, 1); + expect(InvalidParameter, status); + + status = GdipGetLinePresetBlend(brush, res_colors, res_positions, 0); + expect(InvalidParameter, status); + + status = GdipGetLinePresetBlend(brush, res_colors, res_positions, -1); + expect(InvalidParameter, status); + + status = GdipGetLinePresetBlend(brush, res_colors, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetLinePresetBlend(brush, res_colors, res_positions, 2); + expect(GenericError, status); + + status = GdipSetLinePresetBlend(NULL, colors, positions, 5); + expect(InvalidParameter, status); + + status = GdipSetLinePresetBlend(brush, NULL, positions, 5); + expect(InvalidParameter, status); + + status = GdipSetLinePresetBlend(brush, colors, NULL, 5); + expect(InvalidParameter, status); + + status = GdipSetLinePresetBlend(brush, colors, positions, 0); + expect(InvalidParameter, status); + + status = GdipSetLinePresetBlend(brush, colors, positions, -1); + expect(InvalidParameter, status); + + status = GdipSetLinePresetBlend(brush, colors, positions, 1); + expect(InvalidParameter, status); + + /* leave off the 0.0 position */ + status = GdipSetLinePresetBlend(brush, &colors[1], &positions[1], 4); + expect(InvalidParameter, status); + + /* leave off the 1.0 position */ + status = GdipSetLinePresetBlend(brush, colors, positions, 4); + expect(InvalidParameter, status); + + status = GdipSetLinePresetBlend(brush, colors, positions, 5); + expect(Ok, status); + + status = GdipGetLinePresetBlendCount(brush, &count); + expect(Ok, status); + expect(5, count); + + status = GdipGetLinePresetBlend(brush, res_colors, res_positions, 4); + expect(InsufficientBuffer, status); + + status = GdipGetLinePresetBlend(brush, res_colors, res_positions, 5); + expect(Ok, status); + + for (i=0; i<5; i++) + { + expect(colors[i], res_colors[i]); + expectf(positions[i], res_positions[i]); + } + + status = GdipGetLinePresetBlend(brush, res_colors, res_positions, 6); + expect(Ok, status); + + status = GdipSetLinePresetBlend(brush, colors, two_positions, 2); + expect(Ok, status); + status = GdipDeleteBrush((GpBrush*)brush); expect(Ok, status); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index c06d951..11756c8 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -412,6 +412,10 @@ GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient*,GDIPCONST REAL*, GDIPCONST REAL*,INT); GpStatus WINGDIPAPI GdipGetLineBlend(GpLineGradient*,REAL*,REAL*,INT); GpStatus WINGDIPAPI GdipGetLineBlendCount(GpLineGradient*,INT*); +GpStatus WINGDIPAPI GdipSetLinePresetBlend(GpLineGradient*,GDIPCONST ARGB*, + GDIPCONST REAL*,INT); +GpStatus WINGDIPAPI GdipGetLinePresetBlend(GpLineGradient*,ARGB*,REAL*,INT); +GpStatus WINGDIPAPI GdipGetLinePresetBlendCount(GpLineGradient*,INT*); GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient*,ARGB,ARGB); GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient*,BOOL); GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient*,REAL,REAL);

1 0

Vincent Povirk : gdiplus: Store preset blends in linear gradient brushes.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: 8bdabe3a1840755187ed7fad4146603fcb63ba2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bdabe3a1840755187ed7fad4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 14 16:21:50 2009 -0500 gdiplus: Store preset blends in linear gradient brushes. --- dlls/gdiplus/brush.c | 80 +++++++++++++++++++++++++++++++++------- dlls/gdiplus/gdiplus_private.h | 3 + 2 files changed, 69 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 8b18684..1425ab7 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -116,7 +116,7 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) } case BrushTypeLinearGradient:{ GpLineGradient *dest, *src; - INT count; + INT count, pcount; dest = GdipAlloc(sizeof(GpLineGradient)); if(!dest) return OutOfMemory; @@ -130,11 +130,20 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) count = dest->blendcount; dest->blendfac = GdipAlloc(count * sizeof(REAL)); dest->blendpos = GdipAlloc(count * sizeof(REAL)); + pcount = dest->pblendcount; + if (pcount) + { + dest->pblendcolor = GdipAlloc(pcount * sizeof(ARGB)); + dest->pblendpos = GdipAlloc(pcount * sizeof(REAL)); + } - if (!dest->blendfac || !dest->blendpos) + if (!dest->blendfac || !dest->blendpos || + (pcount && (!dest->pblendcolor || !dest->pblendpos))) { GdipFree(dest->blendfac); GdipFree(dest->blendpos); + GdipFree(dest->pblendcolor); + GdipFree(dest->pblendpos); DeleteObject(dest->brush.gdibrush); GdipFree(dest); return OutOfMemory; @@ -143,6 +152,12 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) memcpy(dest->blendfac, src->blendfac, count * sizeof(REAL)); memcpy(dest->blendpos, src->blendpos, count * sizeof(REAL)); + if (pcount) + { + memcpy(dest->pblendcolor, src->pblendcolor, pcount * sizeof(ARGB)); + memcpy(dest->pblendpos, src->pblendpos, pcount * sizeof(REAL)); + } + *clone = &dest->brush; break; } @@ -289,6 +304,10 @@ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF* startpoint, (*line)->blendfac[0] = 1.0f; (*line)->blendpos[0] = 1.0f; + (*line)->pblendcolor = NULL; + (*line)->pblendpos = NULL; + (*line)->pblendcount = 0; + return Ok; } @@ -866,6 +885,8 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) case BrushTypeLinearGradient: GdipFree(((GpLineGradient*)brush)->blendfac); GdipFree(((GpLineGradient*)brush)->blendpos); + GdipFree(((GpLineGradient*)brush)->pblendcolor); + GdipFree(((GpLineGradient*)brush)->pblendpos); break; case BrushTypeTextureFill: GdipDeleteMatrix(((GpTexture*)brush)->transform); @@ -1574,34 +1595,65 @@ GpStatus WINGDIPAPI GdipSetLineLinearBlend(GpLineGradient *brush, REAL focus, GpStatus WINGDIPAPI GdipSetLinePresetBlend(GpLineGradient *brush, GDIPCONST ARGB *blend, GDIPCONST REAL* positions, INT count) { - static int calls; + ARGB *new_color; + REAL *new_pos; + TRACE("(%p,%p,%p,%i)\n", brush, blend, positions, count); - if(!(calls++)) - FIXME("not implemented\n"); + if (!brush || !blend || !positions || count < 2 || + positions[0] != 0.0f || positions[count-1] != 1.0f) + { + return InvalidParameter; + } - return NotImplemented; + new_color = GdipAlloc(count * sizeof(ARGB)); + new_pos = GdipAlloc(count * sizeof(REAL)); + if (!new_color || !new_pos) + { + GdipFree(new_color); + GdipFree(new_pos); + return OutOfMemory; + } + + memcpy(new_color, blend, sizeof(ARGB) * count); + memcpy(new_pos, positions, sizeof(REAL) * count); + + GdipFree(brush->pblendcolor); + GdipFree(brush->pblendpos); + + brush->pblendcolor = new_color; + brush->pblendpos = new_pos; + brush->pblendcount = count; + + return Ok; } GpStatus WINGDIPAPI GdipGetLinePresetBlend(GpLineGradient *brush, ARGB *blend, REAL* positions, INT count) { - static int calls; + if (!brush || !blend || !positions || count < 2) + return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + if (brush->pblendcount == 0) + return GenericError; - return NotImplemented; + if (count < brush->pblendcount) + return InsufficientBuffer; + + memcpy(blend, brush->pblendcolor, sizeof(ARGB) * brush->pblendcount); + memcpy(positions, brush->pblendpos, sizeof(REAL) * brush->pblendcount); + + return Ok; } GpStatus WINGDIPAPI GdipGetLinePresetBlendCount(GpLineGradient *brush, INT *count) { - static int calls; + if (!brush || !count) + return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + *count = brush->pblendcount; - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipResetLineTransform(GpLineGradient *brush) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index c95f3ff..02c03dc 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -166,6 +166,9 @@ struct GpLineGradient{ REAL* blendfac; /* blend factors */ REAL* blendpos; /* blend positions */ INT blendcount; + ARGB* pblendcolor; /* preset blend colors */ + REAL* pblendpos; /* preset blend positions */ + INT pblendcount; }; struct GpTexture{

1 0

Vincent Povirk : gdiplus: Stub GdipGetLinePresetBlend[Count].
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: 52e91927fd05c33c95c5c9a1352274368dd57eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e91927fd05c33c95c5c9a13… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 14 15:42:21 2009 -0500 gdiplus: Stub GdipGetLinePresetBlend[Count]. --- dlls/gdiplus/brush.c | 22 ++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 506eb93..8b18684 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1582,6 +1582,28 @@ GpStatus WINGDIPAPI GdipSetLinePresetBlend(GpLineGradient *brush, return NotImplemented; } +GpStatus WINGDIPAPI GdipGetLinePresetBlend(GpLineGradient *brush, + ARGB *blend, REAL* positions, INT count) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipGetLinePresetBlendCount(GpLineGradient *brush, + INT *count) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipResetLineTransform(GpLineGradient *brush) { static int calls; diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 72f0c59..aa64a3c 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -304,8 +304,8 @@ @ stdcall GdipGetLineBlendCount(ptr ptr) @ stdcall GdipGetLineColors(ptr ptr) @ stdcall GdipGetLineGammaCorrection(ptr ptr) -@ stub GdipGetLinePresetBlend -@ stub GdipGetLinePresetBlendCount +@ stdcall GdipGetLinePresetBlend(ptr ptr ptr long) +@ stdcall GdipGetLinePresetBlendCount(ptr ptr) @ stdcall GdipGetLineRect(ptr ptr) @ stdcall GdipGetLineRectI(ptr ptr) @ stdcall GdipGetLineSpacing(ptr long ptr)

1 0

Vincent Povirk : gdiplus: Implement GdipGetImageRawFormat.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: 0595fc5e031d71d8dac19ab83b09bb971f785e89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0595fc5e031d71d8dac19ab83… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 14 11:23:45 2009 -0500 gdiplus: Implement GdipGetImageRawFormat. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 1 + dlls/gdiplus/image.c | 28 ++++++++++++++-------------- dlls/gdiplus/tests/image.c | 16 ++++++++-------- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index e87176e..c95f3ff 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -208,6 +208,7 @@ struct GpAdustableArrowCap{ struct GpImage{ IPicture* picture; ImageType type; + GUID format; UINT flags; }; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8e58fda..6753262 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1235,6 +1235,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, (*metafile)->image.type = ImageTypeMetafile; + memcpy(&(*metafile)->image.format, &ImageFormatWMF, sizeof(GUID)); (*metafile)->bounds.X = ((REAL) placeable->BoundingBox.Left) / ((REAL) placeable->Inch); (*metafile)->bounds.Y = ((REAL) placeable->BoundingBox.Right) / ((REAL) placeable->Inch); (*metafile)->bounds.Width = ((REAL) (placeable->BoundingBox.Right diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 28982a1..f71bf9a 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -413,6 +413,9 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) GdipDisposeImage(*cloneImage); *cloneImage = NULL; } + + memcpy(&(*cloneImage)->format, &image->format, sizeof(GUID)); + return stat; } else @@ -858,6 +861,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, } (*bitmap)->image.type = ImageTypeBitmap; + memcpy(&(*bitmap)->image.format, &ImageFormatMemoryBMP, sizeof(GUID)); (*bitmap)->image.flags = ImageFlagsNone; (*bitmap)->width = width; (*bitmap)->height = height; @@ -1144,23 +1148,11 @@ GpStatus WINGDIPAPI GdipGetImagePixelFormat(GpImage *image, PixelFormat *format) GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage *image, GUID *format) { - static int calls; - if(!image || !format) return InvalidParameter; - if(!(calls++)) - FIXME("stub\n"); + memcpy(format, &image->format, sizeof(GUID)); - /* FIXME: should be detected from embedded picture or stored separately */ - switch (image->type) - { - case ImageTypeBitmap: *format = ImageFormatBMP; break; - case ImageTypeMetafile: *format = ImageFormatEMF; break; - default: - WARN("unknown type %u\n", image->type); - *format = ImageFormatUndefined; - } return Ok; } @@ -1647,7 +1639,15 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) if (FAILED(hr)) return hresult_to_status(hr); /* call on the image decoder to do the real work */ - return codec->decode_func(stream, &codec->info.Clsid, image); + stat = codec->decode_func(stream, &codec->info.Clsid, image); + + /* take note of the original data format */ + if (stat == Ok) + { + memcpy(&(*image)->format, &codec->info.FormatID, sizeof(GUID)); + } + + return stat; } /* FIXME: no ICM */ diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index e624e53..5378cb8 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -486,7 +486,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); expect(Ok, stat); /* raw format */ - expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)gpbm, __LINE__, TRUE); + expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)gpbm, __LINE__, FALSE); expect(Ok, GdipGetImageDimension((GpImage*) gpbm, &width, &height)); expectf(WIDTH2, width); @@ -564,12 +564,12 @@ static void test_GdipCloneImage(void) /* Create an image, clone it, delete the original, make sure the copy works */ stat = GdipCreateBitmapFromScan0(WIDTH, HEIGHT, 0, PixelFormat24bppRGB, NULL, &bm); expect(Ok, stat); - expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bm, __LINE__, TRUE); + expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bm, __LINE__, FALSE); image_src = ((GpImage*)bm); stat = GdipCloneImage(image_src, &image_dest); expect(Ok, stat); - expect_rawformat(&ImageFormatMemoryBMP, image_dest, __LINE__, TRUE); + expect_rawformat(&ImageFormatMemoryBMP, image_dest, __LINE__, FALSE); stat = GdipDisposeImage((GpImage*)bm); expect(Ok, stat); @@ -646,7 +646,7 @@ static void test_fromhicon(void) stat = GdipGetImagePixelFormat((GpImage*)bitmap, &format); expect(PixelFormat32bppARGB, format); /* raw format */ - expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bitmap, __LINE__, TRUE); + expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bitmap, __LINE__, FALSE); GdipDisposeImage((GpImage*)bitmap); } DestroyIcon(hIcon); @@ -682,7 +682,7 @@ static void test_fromhicon(void) stat = GdipGetImagePixelFormat((GpImage*)bitmap, &format); expect(PixelFormat32bppARGB, format); /* raw format */ - expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bitmap, __LINE__, TRUE); + expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bitmap, __LINE__, FALSE); GdipDisposeImage((GpImage*)bitmap); } DestroyIcon(hIcon); @@ -735,10 +735,10 @@ static const unsigned char jpgimage[285] = { }; static void test_getrawformat(void) { - test_bufferrawformat((void*)pngimage, sizeof(pngimage), &ImageFormatPNG, __LINE__, TRUE); - test_bufferrawformat((void*)gifimage, sizeof(gifimage), &ImageFormatGIF, __LINE__, TRUE); + test_bufferrawformat((void*)pngimage, sizeof(pngimage), &ImageFormatPNG, __LINE__, FALSE); + test_bufferrawformat((void*)gifimage, sizeof(gifimage), &ImageFormatGIF, __LINE__, FALSE); test_bufferrawformat((void*)bmpimage, sizeof(bmpimage), &ImageFormatBMP, __LINE__, FALSE); - test_bufferrawformat((void*)jpgimage, sizeof(jpgimage), &ImageFormatJPEG, __LINE__, TRUE); + test_bufferrawformat((void*)jpgimage, sizeof(jpgimage), &ImageFormatJPEG, __LINE__, FALSE); } static void test_createhbitmap(void)

1 0

Ge van Geldorp : kernel32/tests: Fix actctx tests on Vista+.
by Alexandre Julliard Sept. 15, 2009

Sept. 15, 2009

Module: wine Branch: master Commit: 160d7dfb91d97a81a313661d8c84c7dd49513b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=160d7dfb91d97a81a313661d8… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Sep 14 16:43:36 2009 +0200 kernel32/tests: Fix actctx tests on Vista+. --- dlls/kernel32/tests/actctx.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index d8f48de..8a8d03e 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -246,7 +246,8 @@ static BOOL create_wide_manifest(const char *filename, const char *manifest, BOO typedef struct { ULONG format_version; - ULONG assembly_cnt; + ULONG assembly_cnt_min; + ULONG assembly_cnt_max; ULONG root_manifest_type; LPWSTR root_manifest_path; ULONG root_config_type; @@ -255,23 +256,24 @@ typedef struct { } detailed_info_t; static const detailed_info_t detailed_info0 = { - 0, 0, 0, NULL, 0, 0, NULL + 0, 0, 0, 0, NULL, 0, 0, NULL }; static const detailed_info_t detailed_info1 = { - 1, 1, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, manifest_path, + 1, 1, 1, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, manifest_path, ACTIVATION_CONTEXT_PATH_TYPE_NONE, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, work_dir, }; static const detailed_info_t detailed_info1_child = { - 1, 1, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, app_manifest_path, + 1, 1, 1, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, app_manifest_path, ACTIVATION_CONTEXT_PATH_TYPE_NONE, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, app_dir, }; +/* On Vista+, there's an extra assembly for Microsoft.Windows.Common-Controls.Resources */ static const detailed_info_t detailed_info2 = { - 1, 2, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, manifest_path, + 1, 2, 3, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, manifest_path, ACTIVATION_CONTEXT_PATH_TYPE_NONE, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, work_dir, }; @@ -310,9 +312,10 @@ static void test_detailed_info(HANDLE handle, const detailed_info_t *exinfo) ok(detailed_info->ulFormatVersion == exinfo->format_version, "detailed_info->ulFormatVersion=%u, expected %u\n", detailed_info->ulFormatVersion, exinfo->format_version); - ok(detailed_info->ulAssemblyCount == exinfo->assembly_cnt, - "detailed_info->ulAssemblyCount=%u, expected %u\n", detailed_info->ulAssemblyCount, - exinfo->assembly_cnt); + ok(exinfo->assembly_cnt_min <= detailed_info->ulAssemblyCount && + detailed_info->ulAssemblyCount <= exinfo->assembly_cnt_max, + "detailed_info->ulAssemblyCount=%u, expected between %u and %u\n", detailed_info->ulAssemblyCount, + exinfo->assembly_cnt_min, exinfo->assembly_cnt_max); ok(detailed_info->ulRootManifestPathType == exinfo->root_manifest_type, "detailed_info->ulRootManifestPathType=%u, expected %u\n", detailed_info->ulRootManifestPathType, exinfo->root_manifest_type); @@ -1139,6 +1142,8 @@ static void run_child_process(void) char **argv; PROCESS_INFORMATION pi; STARTUPINFO si = { 0 }; + HANDLE file; + FILETIME now; GetModuleFileNameA(NULL, path, MAX_PATH); strcat(path, ".manifest"); @@ -1149,6 +1154,15 @@ static void run_child_process(void) si.cb = sizeof(si); winetest_get_mainargs( &argv ); + /* Vista+ seems to cache presence of .manifest files. Change last modified + date to defeat the cache */ + file = CreateFileA(argv[0], FILE_WRITE_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + if (file != INVALID_HANDLE_VALUE) { + GetSystemTimeAsFileTime(&now); + SetFileTime(file, NULL, NULL, &now); + CloseHandle(file); + } sprintf(cmdline, "\"%s\" %s manifest1", argv[0], argv[1]); ok(CreateProcess(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi) != 0, "Could not create process: %u\n", GetLastError());

1 0