March 2011 - Wine-commits - list.winehq.org

Vincent Povirk : gdiplus: Move ImageAttributes mapping into a helper function.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: a7f95eeb7ef5d0205945fb65b66562019e5f6562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f95eeb7ef5d0205945fb65b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 3 13:30:45 2011 -0600 gdiplus: Move ImageAttributes mapping into a helper function. --- dlls/gdiplus/graphics.c | 163 +++++++++++++++++++++++++---------------------- 1 files changed, 87 insertions(+), 76 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4827bb0..09eaa01 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -331,6 +331,89 @@ static ARGB blend_line_gradient(GpLineGradient* brush, REAL position) } } +static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, + UINT width, UINT height, INT stride, ColorAdjustType type) +{ + UINT x, y, i; + + if (attributes->colorkeys[type].enabled || + attributes->colorkeys[ColorAdjustTypeDefault].enabled) + { + const struct color_key *key; + BYTE min_blue, min_green, min_red; + BYTE max_blue, max_green, max_red; + + if (attributes->colorkeys[type].enabled) + key = &attributes->colorkeys[type]; + else + key = &attributes->colorkeys[ColorAdjustTypeDefault]; + + min_blue = key->low&0xff; + min_green = (key->low>>8)&0xff; + min_red = (key->low>>16)&0xff; + + max_blue = key->high&0xff; + max_green = (key->high>>8)&0xff; + max_red = (key->high>>16)&0xff; + + for (x=0; x<width; x++) + for (y=0; y<height; y++) + { + ARGB *src_color; + BYTE blue, green, red; + src_color = (ARGB*)(data + stride * y + sizeof(ARGB) * x); + blue = *src_color&0xff; + green = (*src_color>>8)&0xff; + red = (*src_color>>16)&0xff; + if (blue >= min_blue && green >= min_green && red >= min_red && + blue <= max_blue && green <= max_green && red <= max_red) + *src_color = 0x00000000; + } + } + + if (attributes->colorremaptables[type].enabled || + attributes->colorremaptables[ColorAdjustTypeDefault].enabled) + { + const struct color_remap_table *table; + + if (attributes->colorremaptables[type].enabled) + table = &attributes->colorremaptables[type]; + else + table = &attributes->colorremaptables[ColorAdjustTypeDefault]; + + for (x=0; x<width; x++) + for (y=0; y<height; y++) + { + ARGB *src_color; + src_color = (ARGB*)(data + stride * y + sizeof(ARGB) * x); + for (i=0; i<table->mapsize; i++) + { + if (*src_color == table->colormap[i].oldColor.Argb) + { + *src_color = table->colormap[i].newColor.Argb; + break; + } + } + } + } + + if (attributes->colormatrices[type].enabled || + attributes->colormatrices[ColorAdjustTypeDefault].enabled) + { + static int fixme; + if (!fixme++) + FIXME("Color transforms not implemented\n"); + } + + if (attributes->gamma_enabled[type] || + attributes->gamma_enabled[ColorAdjustTypeDefault]) + { + static int fixme; + if (!fixme++) + FIXME("Gamma adjustment not implemented\n"); + } +} + static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) { switch (brush->bt) @@ -2313,82 +2396,10 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (imageAttributes) { - if (imageAttributes->colorkeys[ColorAdjustTypeBitmap].enabled || - imageAttributes->colorkeys[ColorAdjustTypeDefault].enabled) - { - const struct color_key *key; - BYTE min_blue, min_green, min_red; - BYTE max_blue, max_green, max_red; - - if (imageAttributes->colorkeys[ColorAdjustTypeBitmap].enabled) - key = &imageAttributes->colorkeys[ColorAdjustTypeBitmap]; - else - key = &imageAttributes->colorkeys[ColorAdjustTypeDefault]; - - min_blue = key->low&0xff; - min_green = (key->low>>8)&0xff; - min_red = (key->low>>16)&0xff; - - max_blue = key->high&0xff; - max_green = (key->high>>8)&0xff; - max_red = (key->high>>16)&0xff; - - for (x=dst_area.left; x<dst_area.right; x++) - for (y=dst_area.top; y<dst_area.bottom; y++) - { - ARGB *src_color; - BYTE blue, green, red; - src_color = (ARGB*)(data + stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); - blue = *src_color&0xff; - green = (*src_color>>8)&0xff; - red = (*src_color>>16)&0xff; - if (blue >= min_blue && green >= min_green && red >= min_red && - blue <= max_blue && green <= max_green && red <= max_red) - *src_color = 0x00000000; - } - } - - if (imageAttributes->colorremaptables[ColorAdjustTypeBitmap].enabled || - imageAttributes->colorremaptables[ColorAdjustTypeDefault].enabled) - { - const struct color_remap_table *table; - - if (imageAttributes->colorremaptables[ColorAdjustTypeBitmap].enabled) - table = &imageAttributes->colorremaptables[ColorAdjustTypeBitmap]; - else - table = &imageAttributes->colorremaptables[ColorAdjustTypeDefault]; - - for (x=dst_area.left; x<dst_area.right; x++) - for (y=dst_area.top; y<dst_area.bottom; y++) - { - ARGB *src_color; - src_color = (ARGB*)(data + stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); - for (i=0; i<table->mapsize; i++) - { - if (*src_color == table->colormap[i].oldColor.Argb) - { - *src_color = table->colormap[i].newColor.Argb; - break; - } - } - } - } - - if (imageAttributes->colormatrices[ColorAdjustTypeBitmap].enabled || - imageAttributes->colormatrices[ColorAdjustTypeDefault].enabled) - { - static int fixme; - if (!fixme++) - FIXME("Color transforms not implemented\n"); - } - - if (imageAttributes->gamma_enabled[ColorAdjustTypeBitmap] || - imageAttributes->gamma_enabled[ColorAdjustTypeDefault]) - { - static int fixme; - if (!fixme++) - FIXME("Gamma adjustment not implemented\n"); - } + apply_image_attributes(imageAttributes, data, + dst_area.right - dst_area.left, + dst_area.bottom - dst_area.top, + stride, ColorAdjustTypeBitmap); } stat = alpha_blend_pixels(graphics, dst_area.left, dst_area.top,

1 0

Vincent Povirk : gdiplus: Read drawn bitmaps in one step instead of using getpixel.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 870fdaf6cef2fa194c17b2cfb74b14cd92cd8a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=870fdaf6cef2fa194c17b2cfb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 3 14:18:47 2011 -0600 gdiplus: Read drawn bitmaps in one step instead of using getpixel. --- dlls/gdiplus/graphics.c | 200 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 163 insertions(+), 37 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 09eaa01..7b51c61 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -414,6 +414,95 @@ static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d } } +/* Given a bitmap and its source rectangle, find the smallest rectangle in the + * bitmap that contains all the pixels we may need to draw it. */ +static void get_bitmap_sample_size(InterpolationMode interpolation, WrapMode wrap, + GpBitmap* bitmap, REAL srcx, REAL srcy, REAL srcwidth, REAL srcheight, + GpRect *rect) +{ + INT left, top, right, bottom; + + switch (interpolation) + { + case InterpolationModeHighQualityBilinear: + case InterpolationModeHighQualityBicubic: + /* FIXME: Include a greater range for the prefilter? */ + case InterpolationModeBicubic: + case InterpolationModeBilinear: + left = (INT)(floorf(srcx)); + top = (INT)(floorf(srcy)); + right = (INT)(ceilf(srcx+srcwidth)); + bottom = (INT)(ceilf(srcy+srcheight)); + break; + case InterpolationModeNearestNeighbor: + default: + left = roundr(srcx); + top = roundr(srcy); + right = roundr(srcx+srcwidth); + bottom = roundr(srcy+srcheight); + break; + } + + if (wrap == WrapModeClamp) + { + if (left < 0) + left = 0; + if (top < 0) + top = 0; + if (right >= bitmap->width) + right = bitmap->width-1; + if (bottom >= bitmap->height) + bottom = bitmap->height-1; + } + else + { + /* In some cases we can make the rectangle smaller here, but the logic + * is hard to get right, and tiling suggests we're likely to use the + * entire source image. */ + if (left < 0 || right >= bitmap->width) + { + left = 0; + right = bitmap->width-1; + } + + if (top < 0 || bottom >= bitmap->height) + { + top = 0; + bottom = bitmap->height-1; + } + } + + rect->X = left; + rect->Y = top; + rect->Width = right - left + 1; + rect->Height = bottom - top + 1; +} + +static ARGB sample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT width, + UINT height, INT x, INT y, GDIPCONST GpImageAttributes *attributes) +{ + static int fixme[4]; + + switch (attributes->wrap) + { + default: + if (!fixme[attributes->wrap]++) + FIXME("not implemented for wrap mode %i\n", attributes->wrap); + case WrapModeClamp: + if (x < 0 || y < 0 || x >= width || y >= height) + return attributes->outside_color; + break; + } + + if (x < src_rect->X || y < src_rect->Y || x >= src_rect->X + src_rect->Width || y >= src_rect->Y + src_rect->Height) + { + ERR("out of range pixel requested\n"); + return 0xffcd0084; + } + + return ((DWORD*)(bits))[(x - src_rect->X) + (y - src_rect->Y) * src_rect->Width]; +} + static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) { switch (brush->bt) @@ -2309,16 +2398,25 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (use_software) { - RECT src_area, dst_area; - int i, x, y, stride; + RECT dst_area; + GpRect src_area; + int i, x, y, src_stride, dst_stride; GpMatrix *dst_to_src; REAL m11, m12, m21, m22, mdx, mdy; - LPBYTE data; + LPBYTE src_data, dst_data; + BitmapData lockeddata; + InterpolationMode interpolation = graphics->interpolation; + GpPointF dst_to_src_points[3] = {{0.0, 0.0}, {1.0, 0.0}, {0.0, 1.0}}; + REAL x_dx, x_dy, y_dx, y_dy; + static const GpImageAttributes defaultImageAttributes = {WrapModeClamp, 0, FALSE}; + + if (!imageAttributes) + imageAttributes = &defaultImageAttributes; - src_area.left = srcx*dx; - src_area.top = srcy*dy; - src_area.right = (srcx+srcwidth)*dx; - src_area.bottom = (srcy+srcheight)*dy; + srcx = srcx * dx; + srcy = srcy * dy; + srcwidth = srcwidth * dx; + srcheight = srcheight * dy; dst_area.left = dst_area.right = pti[0].x; dst_area.top = dst_area.bottom = pti[0].y; @@ -2347,65 +2445,93 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image return stat; } - data = GdipAlloc(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top)); - if (!data) + dst_data = GdipAlloc(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top)); + if (!dst_data) + { + GdipDeleteMatrix(dst_to_src); + return OutOfMemory; + } + + dst_stride = sizeof(ARGB) * (dst_area.right - dst_area.left); + + get_bitmap_sample_size(interpolation, imageAttributes->wrap, + bitmap, srcx, srcy, srcwidth, srcheight, &src_area); + + src_data = GdipAlloc(sizeof(ARGB) * src_area.Width * src_area.Height); + if (!src_data) { + GdipFree(dst_data); GdipDeleteMatrix(dst_to_src); return OutOfMemory; } + src_stride = sizeof(ARGB) * src_area.Width; + + /* Read the bits we need from the source bitmap into an ARGB buffer. */ + lockeddata.Width = src_area.Width; + lockeddata.Height = src_area.Height; + lockeddata.Stride = src_stride; + lockeddata.PixelFormat = PixelFormat32bppARGB; + lockeddata.Scan0 = src_data; - stride = sizeof(ARGB) * (dst_area.right - dst_area.left); + stat = GdipBitmapLockBits(bitmap, &src_area, ImageLockModeRead|ImageLockModeUserInputBuf, + PixelFormat32bppARGB, &lockeddata); + + if (stat == Ok) + stat = GdipBitmapUnlockBits(bitmap, &lockeddata); - if (imageAttributes && - (imageAttributes->wrap != WrapModeClamp || - imageAttributes->outside_color != 0x00000000 || - imageAttributes->clamp)) + if (stat != Ok) { - static int fixme; - if (!fixme++) - FIXME("Image wrap mode not implemented\n"); + if (src_data != dst_data) + GdipFree(src_data); + GdipFree(dst_data); + GdipDeleteMatrix(dst_to_src); + return OutOfMemory; } + /* Transform the bits as needed to the destination. */ + GdipTransformMatrixPoints(dst_to_src, dst_to_src_points, 3); + + x_dx = dst_to_src_points[1].X - dst_to_src_points[0].X; + x_dy = dst_to_src_points[1].Y - dst_to_src_points[0].Y; + y_dx = dst_to_src_points[2].X - dst_to_src_points[0].X; + y_dy = dst_to_src_points[2].Y - dst_to_src_points[0].Y; + for (x=dst_area.left; x<dst_area.right; x++) { for (y=dst_area.top; y<dst_area.bottom; y++) { GpPointF src_pointf; - int src_x, src_y; - ARGB *src_color; - - src_pointf.X = x; - src_pointf.Y = y; + INT src_x, src_y; + ARGB *dst_color; - GdipTransformMatrixPoints(dst_to_src, &src_pointf, 1); + src_pointf.X = dst_to_src_points[0].X + x * x_dx + y * y_dx; + src_pointf.Y = dst_to_src_points[0].Y + x * x_dy + y * y_dy; src_x = roundr(src_pointf.X); src_y = roundr(src_pointf.Y); - src_color = (ARGB*)(data + stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); + dst_color = (ARGB*)(dst_data + dst_stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); - if (src_x < src_area.left || src_x >= src_area.right || - src_y < src_area.top || src_y >= src_area.bottom) - *src_color = 0; + if (src_pointf.X >= srcx && src_pointf.X < srcx + srcwidth && src_pointf.Y >= srcy && src_pointf.Y < srcy+srcheight) + *dst_color = sample_bitmap_pixel(&src_area, src_data, bitmap->width, bitmap->height, src_x, src_y, imageAttributes); else - GdipBitmapGetPixel(bitmap, src_x, src_y, src_color); + *dst_color = 0; } } GdipDeleteMatrix(dst_to_src); - if (imageAttributes) - { - apply_image_attributes(imageAttributes, data, - dst_area.right - dst_area.left, - dst_area.bottom - dst_area.top, - stride, ColorAdjustTypeBitmap); - } + GdipFree(src_data); + + apply_image_attributes(imageAttributes, dst_data, + dst_area.right - dst_area.left, + dst_area.bottom - dst_area.top, + dst_stride, ColorAdjustTypeBitmap); stat = alpha_blend_pixels(graphics, dst_area.left, dst_area.top, - data, dst_area.right - dst_area.left, dst_area.bottom - dst_area.top, stride); + dst_data, dst_area.right - dst_area.left, dst_area.bottom - dst_area.top, dst_stride); - GdipFree(data); + GdipFree(dst_data); return stat; }

1 0

Vincent Povirk : gdiplus: Apply image attributes to bitmaps before resampling them.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: d891a8c16c853fb48c400f344afca246db8ed809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d891a8c16c853fb48c400f344… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 9 17:49:48 2011 -0600 gdiplus: Apply image attributes to bitmaps before resampling them. --- dlls/gdiplus/graphics.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7b51c61..7a70f36 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2488,6 +2488,10 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image return OutOfMemory; } + apply_image_attributes(imageAttributes, src_data, + src_area.Width, src_area.Height, + src_stride, ColorAdjustTypeBitmap); + /* Transform the bits as needed to the destination. */ GdipTransformMatrixPoints(dst_to_src, dst_to_src_points, 3); @@ -2523,11 +2527,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image GdipFree(src_data); - apply_image_attributes(imageAttributes, dst_data, - dst_area.right - dst_area.left, - dst_area.bottom - dst_area.top, - dst_stride, ColorAdjustTypeBitmap); - stat = alpha_blend_pixels(graphics, dst_area.left, dst_area.top, dst_data, dst_area.right - dst_area.left, dst_area.bottom - dst_area.top, dst_stride);

1 0

Vincent Povirk : gdiplus: Implement tiling wrap modes.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 5488ea14684ffc32ab3e00861f06b891db2fb285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5488ea14684ffc32ab3e00861… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 9 18:04:52 2011 -0600 gdiplus: Implement tiling wrap modes. --- dlls/gdiplus/graphics.c | 39 +++++++++++++++++++++++++++++++-------- 1 files changed, 31 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7a70f36..89cd6ca 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -481,17 +481,40 @@ static void get_bitmap_sample_size(InterpolationMode interpolation, WrapMode wra static ARGB sample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT width, UINT height, INT x, INT y, GDIPCONST GpImageAttributes *attributes) { - static int fixme[4]; - - switch (attributes->wrap) + if (attributes->wrap == WrapModeClamp) { - default: - if (!fixme[attributes->wrap]++) - FIXME("not implemented for wrap mode %i\n", attributes->wrap); - case WrapModeClamp: if (x < 0 || y < 0 || x >= width || y >= height) return attributes->outside_color; - break; + } + else + { + /* Tiling. Make sure co-ordinates are positive as it simplifies the math. */ + if (x < 0) + x = width*2 + x % (width * 2); + if (y < 0) + y = height*2 + y % (height * 2); + + if ((attributes->wrap & 1) == 1) + { + /* Flip X */ + if ((x / width) % 2 == 0) + x = x % width; + else + x = width - 1 - x % width; + } + else + x = x % width; + + if ((attributes->wrap & 2) == 2) + { + /* Flip Y */ + if ((y / height) % 2 == 0) + y = y % height; + else + y = height - 1 - y % height; + } + else + y = y % height; } if (x < src_rect->X || y < src_rect->Y || x >= src_rect->X + src_rect->Width || y >= src_rect->Y + src_rect->Height)

1 0

Nikolay Sivov : msxml3: Some get_attributes() tests.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 710b643b2ffe56f1ab754d030cbc651220919bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=710b643b2ffe56f1ab754d030… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 10 04:19:29 2011 +0300 msxml3: Some get_attributes() tests. --- dlls/msxml3/pi.c | 26 ++++++- dlls/msxml3/tests/domdoc.c | 161 ++++++++++++++++++++++++++------------------ 2 files changed, 117 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=710b643b2ffe56f1ab754…

1 0

Hans Leidekker : odbccp32: Initialize the usage count in SQLRemoveDriverManager and SQLRemoveDriver ( valgrind).
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 92405a2d988115b6ddacf07dd716275cd6052799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92405a2d988115b6ddacf07dd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 10 12:45:17 2011 +0100 odbccp32: Initialize the usage count in SQLRemoveDriverManager and SQLRemoveDriver (valgrind). --- dlls/odbccp32/odbccp32.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index ba4962d..fb4ea2c 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -845,6 +845,7 @@ BOOL WINAPI SQLRemoveDriverW(LPCWSTR lpszDriver, BOOL fRemoveDSN, { clear_errors(); FIXME("stub\n"); + if (lpdwUsageCount) *lpdwUsageCount = 1; return TRUE; } @@ -853,6 +854,7 @@ BOOL WINAPI SQLRemoveDriver(LPCSTR lpszDriver, BOOL fRemoveDSN, { clear_errors(); FIXME("stub\n"); + if (lpdwUsageCount) *lpdwUsageCount = 1; return TRUE; } @@ -860,6 +862,7 @@ BOOL WINAPI SQLRemoveDriverManager(LPDWORD pdwUsageCount) { clear_errors(); FIXME("stub\n"); + if (pdwUsageCount) *pdwUsageCount = 1; return TRUE; }

1 0

Hans Leidekker : msi: Fix a memory leak (valgrind).
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 2df374ac3528488bdbfaef113b98c7e8ca7d40d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2df374ac3528488bdbfaef113… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 10 12:45:41 2011 +0100 msi: Fix a memory leak (valgrind). --- dlls/msi/files.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 4736fce..7f71d1a 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -997,7 +997,6 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) UINT ret = ERROR_SUCCESS; component = MSI_RecordGetString(row, 2); - filename = strdupW( MSI_RecordGetString(row, 3) ); dirprop = MSI_RecordGetString(row, 4); install_mode = MSI_RecordGetInteger(row, 5); @@ -1026,7 +1025,7 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) return ERROR_OUTOFMEMORY; size = 0; - if (filename) + if ((filename = strdupW( MSI_RecordGetString(row, 3) ))) { reduce_to_longfilename( filename ); size = lstrlenW( filename );

1 0

Hans Leidekker : msimsg: New dll.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 530e947b40de0f2391944ddb1a20289bc00de722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=530e947b40de0f2391944ddb1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 10 10:59:44 2011 +0100 msimsg: New dll. --- configure | 1 + configure.ac | 1 + dlls/msimsg/Makefile.in | 5 +++++ dlls/msimsg/msimsg.rc | 23 +++++++++++++++++++++++ dlls/msimsg/msimsg.spec | 1 + 5 files changed, 31 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 51321db..0d715db 100755 --- a/configure +++ b/configure @@ -15154,6 +15154,7 @@ wine_fn_config_test dlls/mshtml/tests mshtml_test wine_fn_config_dll msi enable_msi po,implib wine_fn_config_test dlls/msi/tests msi_test wine_fn_config_dll msimg32 enable_msimg32 implib +wine_fn_config_dll msimsg enable_msimsg wine_fn_config_dll msimtf enable_msimtf wine_fn_config_dll msisip enable_msisip wine_fn_config_dll msisys.ocx enable_msisys_ocx diff --git a/configure.ac b/configure.ac index 2022e67..edbf111 100644 --- a/configure.ac +++ b/configure.ac @@ -2615,6 +2615,7 @@ WINE_CONFIG_TEST(dlls/mshtml/tests) WINE_CONFIG_DLL(msi,,[po,implib]) WINE_CONFIG_TEST(dlls/msi/tests) WINE_CONFIG_DLL(msimg32,,[implib]) +WINE_CONFIG_DLL(msimsg) WINE_CONFIG_DLL(msimtf) WINE_CONFIG_DLL(msisip) WINE_CONFIG_DLL(msisys.ocx) diff --git a/dlls/msimsg/Makefile.in b/dlls/msimsg/Makefile.in new file mode 100644 index 0000000..e4507ec --- /dev/null +++ b/dlls/msimsg/Makefile.in @@ -0,0 +1,5 @@ +MODULE = msimsg.dll + +RC_SRCS = msimsg.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/msimsg/msimsg.rc b/dlls/msimsg/msimsg.rc new file mode 100644 index 0000000..b25587f --- /dev/null +++ b/dlls/msimsg/msimsg.rc @@ -0,0 +1,23 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * 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 "windef.h" + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +1703 RCDATA { "You must simulate a Windows reboot to complete the installation of [2]. Click Yes to do this now or No if you want to restart later.\0\0" } diff --git a/dlls/msimsg/msimsg.spec b/dlls/msimsg/msimsg.spec new file mode 100644 index 0000000..1bb8bf6 --- /dev/null +++ b/dlls/msimsg/msimsg.spec @@ -0,0 +1 @@ +# empty

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the object selection functions.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: adc63287b58592436dd599561d85d763cb3692df URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc63287b58592436dd599561… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 9 21:19:09 2011 +0100 gdi32: Add null driver entry points for the object selection functions. --- dlls/gdi32/bitmap.c | 4 +++- dlls/gdi32/brush.c | 4 +++- dlls/gdi32/dc.c | 6 ++++-- dlls/gdi32/driver.c | 42 ++++++++++++++++++++++++++++++++++++------ dlls/gdi32/font.c | 4 +++- dlls/gdi32/gdiobj.c | 10 ++++------ dlls/gdi32/palette.c | 20 +++++++++++--------- dlls/gdi32/pen.c | 4 +++- 8 files changed, 67 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index a5c53a9..33e5542 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -600,6 +600,7 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) HGDIOBJ ret; BITMAPOBJ *bitmap; DC *dc; + PHYSDEV physdev; if (!(dc = get_dc_ptr( hdc ))) return 0; @@ -632,7 +633,8 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) goto done; } - if (dc->funcs->pSelectBitmap && !dc->funcs->pSelectBitmap( dc->physDev, handle )) + physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); + if (!physdev->funcs->pSelectBitmap( physdev, handle )) { GDI_ReleaseObj( handle ); ret = 0; diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 0202033..02fb3a3 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -387,13 +387,15 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) if ((brush = GDI_GetObjPtr( handle, OBJ_BRUSH ))) { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectBrush ); + if (brush->logbrush.lbStyle == BS_PATTERN) BITMAP_SetOwnerDC( (HBITMAP)brush->logbrush.lbHatch, dc ); GDI_inc_ref_count( handle ); GDI_ReleaseObj( handle ); - if (dc->funcs->pSelectBrush && !dc->funcs->pSelectBrush( dc->physDev, handle )) + if (!physdev->funcs->pSelectBrush( physdev, handle )) { GDI_dec_ref_count( handle ); } diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index f25eb8d..66cdc84 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2057,7 +2057,8 @@ COLORREF WINAPI SetDCBrushColor(HDC hdc, COLORREF crColor) { /* If DC_BRUSH is selected, update driver pen color */ HBRUSH hBrush = CreateSolidBrush( crColor ); - dc->funcs->pSelectBrush( dc->physDev, hBrush ); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectBrush ); + physdev->funcs->pSelectBrush( physdev, hBrush ); DeleteObject( hBrush ); } @@ -2122,7 +2123,8 @@ COLORREF WINAPI SetDCPenColor(HDC hdc, COLORREF crColor) /* If DC_PEN is selected, update the driver pen color */ LOGPEN logpen = { PS_SOLID, { 0, 0 }, crColor }; HPEN hPen = CreatePenIndirect( &logpen ); - dc->funcs->pSelectPen( dc->physDev, hPen ); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectPen ); + physdev->funcs->pSelectPen( physdev, hPen ); DeleteObject( hPen ); } diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index d20bf93..1863499 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -329,6 +329,11 @@ static BOOL CDECL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT return TRUE; } +static BOOL CDECL nulldrv_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) +{ + return TRUE; +} + static BOOL CDECL nulldrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { return TRUE; @@ -408,6 +413,31 @@ static BOOL CDECL nulldrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, return TRUE; } +static HBITMAP CDECL nulldrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) +{ + return bitmap; +} + +static HBRUSH CDECL nulldrv_SelectBrush( PHYSDEV dev, HBRUSH brush ) +{ + return brush; +} + +static HFONT CDECL nulldrv_SelectFont( PHYSDEV dev, HFONT font, HANDLE gdi_font ) +{ + return 0; +} + +static HPALETTE CDECL nulldrv_SelectPalette( PHYSDEV dev, HPALETTE palette, BOOL bkgnd ) +{ + return palette; +} + +static HPEN CDECL nulldrv_SelectPen( PHYSDEV dev, HPEN pen ) +{ + return pen; +} + static void CDECL nulldrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) { } @@ -506,7 +536,7 @@ const DC_FUNCTIONS null_driver = NULL, /* pCreateDIBSection */ NULL, /* pDeleteBitmap */ NULL, /* pDeleteDC */ - NULL, /* pDeleteObject */ + nulldrv_DeleteObject, /* pDeleteObject */ NULL, /* pDescribePixelFormat */ NULL, /* pDeviceCapabilities */ nulldrv_Ellipse, /* pEllipse */ @@ -566,12 +596,12 @@ const DC_FUNCTIONS null_driver = NULL, /* pSaveDC */ nulldrv_ScaleViewportExtEx, /* pScaleViewportExt */ nulldrv_ScaleWindowExtEx, /* pScaleWindowExt */ - NULL, /* pSelectBitmap */ - NULL, /* pSelectBrush */ + nulldrv_SelectBitmap, /* pSelectBitmap */ + nulldrv_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ - NULL, /* pSelectFont */ - NULL, /* pSelectPalette */ - NULL, /* pSelectPen */ + nulldrv_SelectFont, /* pSelectFont */ + nulldrv_SelectPalette, /* pSelectPalette */ + nulldrv_SelectPen, /* pSelectPen */ NULL, /* pSetArcDirection */ NULL, /* pSetBitmapBits */ NULL, /* pSetBkColor */ diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c92b6e3..43abf42 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -529,6 +529,7 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) { HGDIOBJ ret = 0; DC *dc = get_dc_ptr( hdc ); + PHYSDEV physdev; if (!dc) return 0; @@ -541,7 +542,8 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) if (GetDeviceCaps( dc->hSelf, TEXTCAPS ) & TC_VA_ABLE) dc->gdiFont = WineEngCreateFontInstance( dc, handle ); - if (dc->funcs->pSelectFont) ret = dc->funcs->pSelectFont( dc->physDev, handle, dc->gdiFont ); + physdev = GET_DC_PHYSDEV( dc, pSelectFont ); + ret = physdev->funcs->pSelectFont( physdev, handle, dc->gdiFont ); if (ret && dc->gdiFont) dc->gdiFont = 0; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 196ebc9..35b8068 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -845,12 +845,10 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) if(dc) { - if(dc->funcs->pDeleteObject) - { - GDI_ReleaseObj( obj ); /* release the GDI lock */ - dc->funcs->pDeleteObject( dc->physDev, obj ); - header = GDI_GetObjPtr( obj, 0 ); /* and grab it again */ - } + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pDeleteObject ); + GDI_ReleaseObj( obj ); /* release the GDI lock */ + physdev->funcs->pDeleteObject( physdev, obj ); + header = GDI_GetObjPtr( obj, 0 ); /* and grab it again */ release_dc_ptr( dc ); } HeapFree(GetProcessHeap(), 0, hdcs_head); diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index e941b10..e94ed7b 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -689,7 +689,7 @@ static BOOL PALETTE_DeleteObject( HGDIOBJ handle ) */ HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg) { - HPALETTE ret; + HPALETTE ret = 0; DC *dc; TRACE("%p %p\n", hdc, hpal ); @@ -699,16 +699,18 @@ HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg) WARN("invalid selected palette %p\n",hpal); return 0; } - if (!(dc = get_dc_ptr( hdc ))) return 0; - ret = dc->hPalette; - if (dc->funcs->pSelectPalette) hpal = dc->funcs->pSelectPalette( dc->physDev, hpal, FALSE ); - if (hpal) + if ((dc = get_dc_ptr( hdc ))) { - dc->hPalette = hpal; - if (!wBkg) hPrimaryPalette = hpal; + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectPalette ); + ret = dc->hPalette; + if (physdev->funcs->pSelectPalette( physdev, hpal, FALSE )) + { + dc->hPalette = hpal; + if (!wBkg) hPrimaryPalette = hpal; + } + else ret = 0; + release_dc_ptr( dc ); } - else ret = 0; - release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index a130b1f..61dd0e9 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -219,6 +219,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, */ static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) { + PHYSDEV physdev; HGDIOBJ ret = 0; DC *dc = get_dc_ptr( hdc ); @@ -234,7 +235,8 @@ static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) return 0; } - if (dc->funcs->pSelectPen && !dc->funcs->pSelectPen( dc->physDev, handle )) + physdev = GET_DC_PHYSDEV( dc, pSelectPen ); + if (!physdev->funcs->pSelectPen( physdev, handle )) { GDI_dec_ref_count( handle ); }

1 0

André Hentschel : kernel32: Add stub for GetVolumePathNamesForVolumeNameA.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 78160d4fe1e501f322d491c9e6bffdd53c0c6388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78160d4fe1e501f322d491c9e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 9 15:11:41 2011 +0100 kernel32: Add stub for GetVolumePathNamesForVolumeNameA. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/volume.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d2f3a26..d7edf1f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -676,7 +676,7 @@ @ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long) @ stdcall GetVolumePathNameA(str ptr long) @ stdcall GetVolumePathNameW(wstr ptr long) -# @ stub GetVolumePathNamesForVolumeNameA +@ stdcall GetVolumePathNamesForVolumeNameA(str ptr long ptr) @ stdcall GetVolumePathNamesForVolumeNameW(wstr ptr long ptr) @ stdcall GetWindowsDirectoryA(ptr long) @ stdcall GetWindowsDirectoryW(ptr long) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 912f215..1684967 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1621,6 +1621,16 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu } /*********************************************************************** + * GetVolumePathNamesForVolumeNameA (KERNEL32.@) + */ +BOOL WINAPI GetVolumePathNamesForVolumeNameA(LPCSTR volumename, LPSTR volumepathname, DWORD buflen, PDWORD returnlen) +{ + FIXME("(%s, %p, %d, %p), stub!\n", debugstr_a(volumename), volumepathname, buflen, returnlen); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * GetVolumePathNamesForVolumeNameW (KERNEL32.@) */ BOOL WINAPI GetVolumePathNamesForVolumeNameW(LPCWSTR volumename, LPWSTR volumepathname, DWORD buflen, PDWORD returnlen)

1 0