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

Eric Pouech : services: Correctly store the service's PID upon startup.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: 7cdf3389dd0a45737159064af08ae64b66696ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cdf3389dd0a45737159064af… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Aug 29 14:23:36 2009 +0200 services: Correctly store the service's PID upon startup. --- programs/services/services.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 091c693..24230e4 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -577,7 +577,6 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * } service_entry->status.dwCurrentState = SERVICE_START_PENDING; - service_entry->status.dwProcessId = pi.dwProcessId; service_unlock(service_entry); @@ -587,11 +586,11 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * { service_lock_exclusive(service_entry); service_entry->status.dwCurrentState = SERVICE_STOPPED; - service_entry->status.dwProcessId = 0; service_unlock(service_entry); return GetLastError(); } + service_entry->status.dwProcessId = pi.dwProcessId; *process = pi.hProcess; CloseHandle( pi.hThread );

1 0

Eric Pouech : winmm: Correctly check for the installed default ioProcs.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: 0ba570141dd036898b33fdfa6116b5670b732214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ba570141dd036898b33fdfa6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Aug 29 14:23:24 2009 +0200 winmm: Correctly check for the installed default ioProcs. --- dlls/winmm/mmio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index a750bf2..2ad5833 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -314,7 +314,7 @@ LPMMIOPROC MMIO_InstallIOProc(FOURCC fccIOProc, LPMMIOPROC pIOProc, } /* remove it, but only if it isn't builtin */ if ((*ppListNode) >= defaultProcs && - (*ppListNode) < defaultProcs + sizeof(defaultProcs)) { + (*ppListNode) < defaultProcs + sizeof(defaultProcs) / sizeof(defaultProcs[0])) { WARN("Tried to remove built-in mmio proc. Skipping\n"); } else { /* Okay, nuke it */

1 0

Alexandre Julliard : comctl32/tests: Fix status test failures on older Windows versions.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: 5a0deb25e124d37ab550ed451ee0a71becbbbd6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a0deb25e124d37ab550ed451… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 29 14:15:58 2009 +0200 comctl32/tests: Fix status test failures on older Windows versions. --- dlls/comctl32/tests/status.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 28df50f..c721c96 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -483,11 +483,11 @@ static void test_gettext(void) /* A size of 1 only stores the NULL terminator */ buf[0] = 0xa; r = SendMessage(hwndStatus, WM_GETTEXT, 1, (LPARAM)buf); - expect(0, r); - ok(!buf[0], "expected empty buffer\n"); + ok( r == 0 || broken(r == 4), "Expected 0 got %d\n", r ); + if (!r) ok(!buf[0], "expected empty buffer\n"); /* A size of 2 returns a length 1 */ r = SendMessage(hwndStatus, WM_GETTEXT, 2, (LPARAM)buf); - expect(1, r); + ok( r == 1 || broken(r == 4), "Expected 1 got %d\n", r ); r = SendMessage(hwndStatus, WM_GETTEXT, sizeof(buf), (LPARAM)buf); expect(4, r); ok(!strcmp(buf, "Text"), "expected Text, got %s\n", buf);

1 0

Alexandre Julliard : comctl32/tests: Fix some toolbar test failures on older Windows versions.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: a561c5d49ff42f8f3bd716306e6200104f62f9fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a561c5d49ff42f8f3bd716306… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 29 14:15:52 2009 +0200 comctl32/tests: Fix some toolbar test failures on older Windows versions. --- dlls/comctl32/tests/toolbar.c | 59 +++++++++++++++++++++++++++-------------- 1 files changed, 39 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 9827b14..86e9027 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -83,7 +83,6 @@ static LRESULT MyWnd_Notify(LPARAM lParam) nmdisp = (NMTBDISPINFOA *)lParam; compare(nmdisp->dwMask, g_dwExpectedDispInfoMask, "%x"); - compare(nmdisp->iImage, -1, "%d"); ok(nmdisp->pszText == NULL, "pszText is not NULL\n"); break; } @@ -1002,10 +1001,17 @@ static void test_sizes(void) tbinfo.cx = 672; tbinfo.cbSize = sizeof(TBBUTTONINFO); tbinfo.dwMask = TBIF_SIZE | TBIF_BYINDEX; - ok(SendMessageA(hToolbar, TB_SETBUTTONINFO, 0, (LPARAM)&tbinfo) != 0, "TB_SETBUTTONINFO failed\n"); - ok(SendMessageA(hToolbar, TB_SETBUTTONINFO, 1, (LPARAM)&tbinfo) != 0, "TB_SETBUTTONINFO failed\n"); - SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0); - check_sizes(); + if (SendMessageA(hToolbar, TB_SETBUTTONINFO, 0, (LPARAM)&tbinfo)) + { + ok(SendMessageA(hToolbar, TB_SETBUTTONINFO, 1, (LPARAM)&tbinfo) != 0, "TB_SETBUTTONINFO failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0); + check_sizes(); + } + else /* TBIF_BYINDEX probably not supported, confirm that this was the reason for the failure */ + { + tbinfo.dwMask = TBIF_SIZE; + ok(SendMessageA(hToolbar, TB_SETBUTTONINFO, 33, (LPARAM)&tbinfo) != 0, "TB_SETBUTTONINFO failed\n"); + } DestroyWindow(hToolbar); } @@ -1061,16 +1067,19 @@ static void test_recalc(void) CHAR test[] = "Test"; const int EX_STYLES_COUNT = 5; int i; + BOOL recalc; /* Like TB_ADDBUTTONS tested in test_sized, inserting a button without text * results in a relayout, while adding one with text forces a recalc */ prepare_recalc_test(&hToolbar); SendMessage(hToolbar, TB_INSERTBUTTON, 1, (LPARAM)&buttons3[0]); - ok(!did_recalc(hToolbar), "Unexpected recalc - adding button without text\n"); + recalc = did_recalc(hToolbar); + ok(!recalc, "Unexpected recalc - adding button without text\n"); prepare_recalc_test(&hToolbar); SendMessage(hToolbar, TB_INSERTBUTTON, 1, (LPARAM)&buttons3[3]); - ok(did_recalc(hToolbar), "Expected a recalc - adding button with text\n"); + recalc = did_recalc(hToolbar); + ok(recalc, "Expected a recalc - adding button with text\n"); /* TB_SETBUTTONINFO, even when adding a text, results only in a relayout */ prepare_recalc_test(&hToolbar); @@ -1078,7 +1087,8 @@ static void test_recalc(void) bi.dwMask = TBIF_TEXT; bi.pszText = test; SendMessage(hToolbar, TB_SETBUTTONINFO, 1, (LPARAM)&bi); - ok(!did_recalc(hToolbar), "Unexpected recalc - setting a button text\n"); + recalc = did_recalc(hToolbar); + ok(!recalc, "Unexpected recalc - setting a button text\n"); /* most extended styled doesn't force a recalc (testing all the bits gives * the same results, but prints some ERRs while testing) */ @@ -1089,22 +1099,31 @@ static void test_recalc(void) prepare_recalc_test(&hToolbar); expect(0, (int)SendMessage(hToolbar, TB_GETEXTENDEDSTYLE, 0, 0)); SendMessage(hToolbar, TB_SETEXTENDEDSTYLE, 0, (1 << i)); - ok(!did_recalc(hToolbar), "Unexpected recalc - setting bit %d\n", i); + recalc = did_recalc(hToolbar); + ok(!recalc, "Unexpected recalc - setting bit %d\n", i); SendMessage(hToolbar, TB_SETEXTENDEDSTYLE, 0, 0); - ok(!did_recalc(hToolbar), "Unexpected recalc - clearing bit %d\n", i); + recalc = did_recalc(hToolbar); + ok(!recalc, "Unexpected recalc - clearing bit %d\n", i); expect(0, (int)SendMessage(hToolbar, TB_GETEXTENDEDSTYLE, 0, 0)); } /* TBSTYLE_EX_MIXEDBUTTONS does a recalc on change */ prepare_recalc_test(&hToolbar); SendMessage(hToolbar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS); - ok(did_recalc(hToolbar), "Expected a recalc - setting TBSTYLE_EX_MIXEDBUTTONS\n"); - restore_recalc_state(hToolbar); - SendMessage(hToolbar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS); - ok(!did_recalc(hToolbar), "Unexpected recalc - setting TBSTYLE_EX_MIXEDBUTTONS again\n"); - restore_recalc_state(hToolbar); - SendMessage(hToolbar, TB_SETEXTENDEDSTYLE, 0, 0); - ok(did_recalc(hToolbar), "Expected a recalc - clearing TBSTYLE_EX_MIXEDBUTTONS\n"); + recalc = did_recalc(hToolbar); + if (recalc) + { + ok(recalc, "Expected a recalc - setting TBSTYLE_EX_MIXEDBUTTONS\n"); + restore_recalc_state(hToolbar); + SendMessage(hToolbar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS); + recalc = did_recalc(hToolbar); + ok(!recalc, "Unexpected recalc - setting TBSTYLE_EX_MIXEDBUTTONS again\n"); + restore_recalc_state(hToolbar); + SendMessage(hToolbar, TB_SETEXTENDEDSTYLE, 0, 0); + recalc = did_recalc(hToolbar); + ok(recalc, "Expected a recalc - clearing TBSTYLE_EX_MIXEDBUTTONS\n"); + } + else win_skip( "No recalc on TBSTYLE_EX_MIXEDBUTTONS\n" ); /* undocumented exstyle 0x2 seems to changes the top margin, what * interferes with these tests */ @@ -1124,8 +1143,8 @@ static void test_getbuttoninfo(void) int ret; tbi.cbSize = i; - tbi.dwMask = TBIF_BYINDEX | TBIF_COMMAND; - ret = (int)SendMessage(hToolbar, TB_GETBUTTONINFO, 0, (LPARAM)&tbi); + tbi.dwMask = TBIF_COMMAND; + ret = (int)SendMessage(hToolbar, TB_GETBUTTONINFO, 1, (LPARAM)&tbi); if (i == sizeof(TBBUTTONINFO)) { compare(ret, 0, "%d"); } else { @@ -1196,7 +1215,7 @@ static void test_dispinfo(void) rebuild_toolbar(&hToolbar); SendMessageA(hToolbar, TB_LOADIMAGES, IDB_HIST_SMALL_COLOR, (LPARAM)HINST_COMMCTRL); SendMessageA(hToolbar, TB_ADDBUTTONS, 2, (LPARAM)buttons_disp); - g_dwExpectedDispInfoMask = 1; + g_dwExpectedDispInfoMask = TBNF_IMAGE; /* Some TBN_GETDISPINFO tests will be done in MyWnd_Notify function. * We will receive TBN_GETDISPINFOW even if the control is ANSI */ compare((BOOL)SendMessageA(hToolbar, CCM_GETUNICODEFORMAT, 0, 0), 0, "%d");

1 0

Vincent Povirk : gdiplus: Reimplement GdipCreateBitmapFromHICON based on RGBA bitmaps.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: cb3ee716a2b3e2bafd102c82574df5baaf469a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb3ee716a2b3e2bafd102c825… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 24 17:05:24 2009 -0500 gdiplus: Reimplement GdipCreateBitmapFromHICON based on RGBA bitmaps. --- dlls/gdiplus/image.c | 170 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 146 insertions(+), 24 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 164ab29..730d981 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -625,48 +625,170 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT width, INT height, GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) { - HICON icon_copy; + GpStatus stat; ICONINFO iinfo; - PICTDESC desc; + BITMAP bm; + int ret; + UINT width, height; + GpRect rect; + BitmapData lockeddata; + HDC screendc; + BOOL has_alpha; + int x, y; + BYTE *bits; + BITMAPINFOHEADER bih; + DWORD *src; + BYTE *dst_row; + DWORD *dst; TRACE("%p, %p\n", hicon, bitmap); if(!bitmap || !GetIconInfo(hicon, &iinfo)) + { + DeleteObject(iinfo.hbmColor); + DeleteObject(iinfo.hbmMask); return InvalidParameter; + } - *bitmap = GdipAlloc(sizeof(GpBitmap)); - if(!*bitmap) return OutOfMemory; + /* get the size of the icon */ + ret = GetObjectA(iinfo.hbmColor ? iinfo.hbmColor : iinfo.hbmMask, sizeof(bm), &bm); + if (ret == 0) { + DeleteObject(iinfo.hbmColor); + DeleteObject(iinfo.hbmMask); + return GenericError; + } - icon_copy = CreateIconIndirect(&iinfo); + width = bm.bmWidth; - if(!icon_copy){ - GdipFree(*bitmap); - return InvalidParameter; + if (iinfo.hbmColor) + height = abs(bm.bmHeight); + else /* combined bitmap + mask */ + height = abs(bm.bmHeight) / 2; + + bits = HeapAlloc(GetProcessHeap(), 0, 4*width*height); + if (!bits) { + DeleteObject(iinfo.hbmColor); + DeleteObject(iinfo.hbmMask); + return OutOfMemory; } - desc.cbSizeofstruct = sizeof(PICTDESC); - desc.picType = PICTYPE_ICON; - desc.u.icon.hicon = icon_copy; + stat = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat32bppARGB, NULL, bitmap); + if (stat != Ok) { + DeleteObject(iinfo.hbmColor); + DeleteObject(iinfo.hbmMask); + HeapFree(GetProcessHeap(), 0, bits); + return stat; + } - if(OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, - (LPVOID*) &((*bitmap)->image.picture)) != S_OK){ - DestroyIcon(icon_copy); - GdipFree(*bitmap); - return GenericError; + rect.X = 0; + rect.Y = 0; + rect.Width = width; + rect.Height = height; + + stat = GdipBitmapLockBits(*bitmap, &rect, ImageLockModeWrite, PixelFormat32bppARGB, &lockeddata); + if (stat != Ok) { + DeleteObject(iinfo.hbmColor); + DeleteObject(iinfo.hbmMask); + HeapFree(GetProcessHeap(), 0, bits); + GdipDisposeImage((GpImage*)*bitmap); + return stat; } - (*bitmap)->format = PixelFormat32bppARGB; - (*bitmap)->image.type = ImageTypeBitmap; - (*bitmap)->image.flags = ImageFlagsNone; - (*bitmap)->width = ipicture_pixel_width((*bitmap)->image.picture); - (*bitmap)->height = ipicture_pixel_height((*bitmap)->image.picture); - (*bitmap)->hbitmap = NULL; - (*bitmap)->hdc = NULL; - (*bitmap)->bits = NULL; + bih.biSize = sizeof(bih); + bih.biWidth = width; + bih.biHeight = -height; + bih.biPlanes = 1; + bih.biBitCount = 32; + bih.biCompression = BI_RGB; + bih.biSizeImage = 0; + bih.biXPelsPerMeter = 0; + bih.biYPelsPerMeter = 0; + bih.biClrUsed = 0; + bih.biClrImportant = 0; + + screendc = GetDC(0); + if (iinfo.hbmColor) + { + GetDIBits(screendc, iinfo.hbmColor, 0, height, bits, (BITMAPINFO*)&bih, DIB_RGB_COLORS); + + if (bm.bmBitsPixel == 32) + { + has_alpha = FALSE; + + /* If any pixel has a non-zero alpha, ignore hbmMask */ + src = (DWORD*)bits; + for (x=0; x<width && !has_alpha; x++) + for (y=0; y<height && !has_alpha; y++) + if ((*src++ & 0xff000000) != 0) + has_alpha = TRUE; + } + else has_alpha = FALSE; + } + else + { + GetDIBits(screendc, iinfo.hbmMask, 0, height, bits, (BITMAPINFO*)&bih, DIB_RGB_COLORS); + has_alpha = FALSE; + } + + /* copy the image data to the Bitmap */ + src = (DWORD*)bits; + dst_row = lockeddata.Scan0; + for (y=0; y<height; y++) + { + memcpy(dst_row, src, width*4); + src += width; + dst_row += lockeddata.Stride; + } + + if (!has_alpha) + { + if (iinfo.hbmMask) + { + /* read alpha data from the mask */ + if (iinfo.hbmColor) + GetDIBits(screendc, iinfo.hbmMask, 0, height, bits, (BITMAPINFO*)&bih, DIB_RGB_COLORS); + else + GetDIBits(screendc, iinfo.hbmMask, height, height, bits, (BITMAPINFO*)&bih, DIB_RGB_COLORS); + + src = (DWORD*)bits; + dst_row = lockeddata.Scan0; + for (y=0; y<height; y++) + { + dst = (DWORD*)dst_row; + for (x=0; x<height; x++) + { + DWORD src_value = *src++; + if (src_value) + *dst++ = 0; + else + *dst++ |= 0xff000000; + } + dst_row += lockeddata.Stride; + } + } + else + { + /* set constant alpha of 255 */ + dst_row = bits; + for (y=0; y<height; y++) + { + dst = (DWORD*)dst_row; + for (x=0; x<height; x++) + *dst++ |= 0xff000000; + dst_row += lockeddata.Stride; + } + } + } + + ReleaseDC(0, screendc); DeleteObject(iinfo.hbmColor); DeleteObject(iinfo.hbmMask); + GdipBitmapUnlockBits(*bitmap, &lockeddata); + + HeapFree(GetProcessHeap(), 0, bits); + return Ok; }

1 0

Vincent Povirk : gdiplus: Use AlphaBlend for 32-bit images with alpha channels.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: 895c6d8e1ea81ae10f927463692c01bffd58fda5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=895c6d8e1ea81ae10f9274636… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 28 17:21:10 2009 -0500 gdiplus: Use AlphaBlend for 32-bit images with alpha channels. --- dlls/gdiplus/gdiplus.c | 19 +++++++++++ dlls/gdiplus/gdiplus_private.h | 3 ++ dlls/gdiplus/graphics.c | 71 +++++++++++++++++++++++++++++++++------ 3 files changed, 82 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 06019a2..ec956f3 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -399,6 +399,25 @@ BOOL lengthen_path(GpPath *path, INT len) return TRUE; } +void convert_32bppARGB_to_32bppPARGB(UINT width, UINT height, + BYTE *dst_bits, INT dst_stride, const BYTE *src_bits, INT src_stride) +{ + UINT x, y; + for (y=0; y<height; y++) + { + const BYTE *src=src_bits+y*src_stride; + BYTE *dst=dst_bits+y*dst_stride; + for (x=0; x<width; x++) + { + BYTE alpha=src[3]; + *dst++ = *src++ * alpha / 255; + *dst++ = *src++ * alpha / 255; + *dst++ = *src++ * alpha / 255; + *dst++ = *src++; + } + } +} + /* recursive deletion of GpRegion nodes */ inline void delete_element(region_element* element) { diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 5e615e1..e87176e 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -80,6 +80,9 @@ static inline REAL deg2rad(REAL degrees) extern const char *debugstr_rectf(CONST RectF* rc); +extern void convert_32bppARGB_to_32bppPARGB(UINT width, UINT height, + BYTE *dst_bits, INT dst_stride, const BYTE *src_bits, INT src_stride); + struct GpPen{ UINT style; GpUnit unit; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a455d45..1df3eee 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1877,8 +1877,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image { HDC hdc; GpBitmap* bitmap = (GpBitmap*)image; - int bm_is_selected; - HBITMAP old_hbm=NULL; + int temp_hdc=0, temp_bitmap=0; + HBITMAP hbitmap, old_hbm=NULL; if (srcUnit == UnitInch) dx = dy = 96.0; /* FIXME: use the image resolution */ @@ -1887,24 +1887,73 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image else return NotImplemented; - hdc = bitmap->hdc; - bm_is_selected = (hdc != 0); - - if (!bm_is_selected) + if (bitmap->format == PixelFormat32bppARGB) { + BITMAPINFOHEADER bih; + BYTE *temp_bits; + + /* we need a bitmap with premultiplied alpha */ hdc = CreateCompatibleDC(0); - old_hbm = SelectObject(hdc, bitmap->hbitmap); + temp_hdc = 1; + temp_bitmap = 1; + + bih.biSize = sizeof(BITMAPINFOHEADER); + bih.biWidth = bitmap->width; + bih.biHeight = -bitmap->height; + bih.biPlanes = 1; + bih.biBitCount = 32; + bih.biCompression = BI_RGB; + bih.biSizeImage = 0; + bih.biXPelsPerMeter = 0; + bih.biYPelsPerMeter = 0; + bih.biClrUsed = 0; + bih.biClrImportant = 0; + + hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, + (void**)&temp_bits, NULL, 0); + + convert_32bppARGB_to_32bppPARGB(bitmap->width, bitmap->height, + temp_bits, bitmap->width*4, bitmap->bits, bitmap->stride); + } + else + { + hbitmap = bitmap->hbitmap; + hdc = bitmap->hdc; + temp_hdc = (hdc == 0); + } + + if (temp_hdc) + { + if (!hdc) hdc = CreateCompatibleDC(0); + old_hbm = SelectObject(hdc, hbitmap); } - /* FIXME: maybe alpha blend depending on the format */ - StretchBlt(graphics->hdc, pti[0].x, pti[0].y, pti[1].x-pti[0].x, pti[2].y-pti[0].y, - hdc, srcx*dx, srcy*dy, srcwidth*dx, srcheight*dy, SRCCOPY); + if (bitmap->format == PixelFormat32bppARGB || bitmap->format == PixelFormat32bppPARGB) + { + BLENDFUNCTION bf; + + bf.BlendOp = AC_SRC_OVER; + bf.BlendFlags = 0; + bf.SourceConstantAlpha = 255; + bf.AlphaFormat = AC_SRC_ALPHA; + + GdiAlphaBlend(graphics->hdc, pti[0].x, pti[0].y, pti[1].x-pti[0].x, pti[2].y-pti[0].y, + hdc, srcx*dx, srcy*dy, srcwidth*dx, srcheight*dy, bf); + } + else + { + StretchBlt(graphics->hdc, pti[0].x, pti[0].y, pti[1].x-pti[0].x, pti[2].y-pti[0].y, + hdc, srcx*dx, srcy*dy, srcwidth*dx, srcheight*dy, SRCCOPY); + } - if (!bm_is_selected) + if (temp_hdc) { SelectObject(hdc, old_hbm); DeleteDC(hdc); } + + if (temp_bitmap) + DeleteObject(hbitmap); } else {

1 0

Vincent Povirk : gdiplus: Return the real image bits from LockBits when possible.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: 7fdc0208e869f315bc6ceec36553a171c3a061a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fdc0208e869f315bc6ceec36… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 28 16:53:57 2009 -0500 gdiplus: Return the real image bits from LockBits when possible. --- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/image.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 7197463..5e615e1 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -224,6 +224,8 @@ struct GpBitmap{ BYTE *bitmapbits; /* pointer to the buffer we passed in BitmapLockBits */ HBITMAP hbitmap; HDC hdc; + BYTE *bits; /* actual image bits if this is a DIB */ + INT stride; /* stride of bits if this is a DIB */ }; struct GpCachedBitmap{ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index cf56b90..164ab29 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -167,6 +167,23 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, if(bitmap->lockmode) return WrongState; + if (bitmap->bits && bitmap->format == format) + { + /* no conversion is necessary; just use the bits directly */ + lockeddata->Width = act_rect.Width; + lockeddata->Height = act_rect.Height; + lockeddata->PixelFormat = format; + lockeddata->Reserved = flags; + lockeddata->Stride = bitmap->stride; + lockeddata->Scan0 = bitmap->bits + (bitspp / 8) * act_rect.X + + bitmap->stride * act_rect.Y; + + bitmap->lockmode = flags; + bitmap->numlocks++; + + return Ok; + } + hbm = bitmap->hbitmap; hdc = bitmap->hdc; bm_is_selected = (hdc != 0); @@ -263,6 +280,13 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, return Ok; } + if (!bitmap->bitmapbits) + { + /* we passed a direct reference; no need to do anything */ + bitmap->lockmode = 0; + return Ok; + } + hbm = bitmap->hbitmap; hdc = bitmap->hdc; bm_is_selected = (hdc != 0); @@ -638,6 +662,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) (*bitmap)->height = ipicture_pixel_height((*bitmap)->image.picture); (*bitmap)->hbitmap = NULL; (*bitmap)->hdc = NULL; + (*bitmap)->bits = NULL; DeleteObject(iinfo.hbmColor); DeleteObject(iinfo.hbmMask); @@ -697,6 +722,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, if (!hbitmap) return GenericError; /* copy bits to the dib if necessary */ + /* FIXME: should reference the bits instead of copying them */ if (scan0) for (i=0; i<height; i++) memcpy(bits+i*dib_stride, scan0+i*stride, row_size); @@ -716,6 +742,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->image.picture = NULL; (*bitmap)->hbitmap = hbitmap; (*bitmap)->hdc = NULL; + (*bitmap)->bits = bits; + (*bitmap)->stride = dib_stride; return Ok; } @@ -1293,6 +1321,7 @@ static GpStatus decode_image_olepicture_bitmap(IStream* stream, REFCLSID clsid, (*((GpBitmap**) image))->hbitmap = hbm; (*((GpBitmap**) image))->hdc = hdc; + (*((GpBitmap**) image))->bits = NULL; bmch = (BITMAPCOREHEADER*) (&pbmi->bmiHeader); bmch->bcSize = sizeof(BITMAPCOREHEADER);

1 0

Vincent Povirk : gdiplus: Create DIBs instead of IPictures in CreateBitmapFromScan0.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: 436b3be6513645e5b3605c4417a1d7bc973a9a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=436b3be6513645e5b3605c441… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 28 16:21:27 2009 -0500 gdiplus: Create DIBs instead of IPictures in CreateBitmapFromScan0. --- dlls/gdiplus/graphics.c | 93 +++++++++++++++------ dlls/gdiplus/image.c | 208 ++++++++++++++++++++++++++--------------------- 2 files changed, 181 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=436b3be6513645e5b3605…

1 0

Vincent Povirk : gdiplus: Don' t use IPicture to manage the HDC associated with a GpBitmap.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: d87adf2a60723ee5dacdd59a0d2849c4534306bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d87adf2a60723ee5dacdd59a0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 28 15:05:38 2009 -0500 gdiplus: Don't use IPicture to manage the HDC associated with a GpBitmap. --- dlls/gdiplus/brush.c | 2 +- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/image.c | 23 ++++++++++++----------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index f719ff8..370de61 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -672,7 +672,7 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, hbm = ((GpBitmap*)image)->hbitmap; if(!hbm) return GenericError; - IPicture_get_CurDC(image->picture, &hdc); + hdc = ((GpBitmap*)image)->hdc; bm_is_selected = (hdc != 0); pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 5765eac..7197463 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -223,6 +223,7 @@ struct GpBitmap{ INT numlocks; BYTE *bitmapbits; /* pointer to the buffer we passed in BitmapLockBits */ HBITMAP hbitmap; + HDC hdc; }; struct GpCachedBitmap{ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index e201973..9d91755 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -168,7 +168,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, return WrongState; hbm = bitmap->hbitmap; - IPicture_get_CurDC(bitmap->image.picture, &hdc); + hdc = bitmap->hdc; bm_is_selected = (hdc != 0); pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); @@ -264,7 +264,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, } hbm = bitmap->hbitmap; - IPicture_get_CurDC(bitmap->image.picture, &hdc); + hdc = bitmap->hdc; bm_is_selected = (hdc != 0); pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); @@ -588,6 +588,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) (*bitmap)->width = ipicture_pixel_width((*bitmap)->image.picture); (*bitmap)->height = ipicture_pixel_height((*bitmap)->image.picture); (*bitmap)->hbitmap = NULL; + (*bitmap)->hdc = NULL; DeleteObject(iinfo.hbmColor); DeleteObject(iinfo.hbmMask); @@ -689,6 +690,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->height = height; (*bitmap)->format = format; IPicture_get_Handle((*bitmap)->image.picture, (OLE_HANDLE*)&(*bitmap)->hbitmap); + IPicture_get_CurDC((*bitmap)->image.picture, &(*bitmap)->hdc); return Ok; } @@ -786,18 +788,17 @@ GpStatus WINGDIPAPI GdipEmfToWmfBits(HENHMETAFILE hemf, UINT cbData16, GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) { - HDC hdc; - TRACE("%p\n", image); if(!image) return InvalidParameter; - IPicture_get_CurDC(image->picture, &hdc); - DeleteDC(hdc); IPicture_Release(image->picture); if (image->type == ImageTypeBitmap) + { GdipFree(((GpBitmap*)image)->bitmapbits); + DeleteDC(((GpBitmap*)image)->hdc); + } GdipFree(image); return Ok; @@ -889,11 +890,12 @@ GpStatus WINGDIPAPI GdipGetImageGraphicsContext(GpImage *image, return NotImplemented; } - IPicture_get_CurDC(image->picture, &hdc); + hdc = ((GpBitmap*)image)->hdc; if(!hdc){ hdc = CreateCompatibleDC(0); - IPicture_SelectPicture(image->picture, hdc, NULL, NULL); + SelectObject(hdc, ((GpBitmap*)image)->hbitmap); + ((GpBitmap*)image)->hdc = hdc; } return GdipCreateFromHDC(hdc, graphics); @@ -1264,6 +1266,7 @@ static GpStatus decode_image_olepicture_bitmap(IStream* stream, REFCLSID clsid, IPicture_get_CurDC(pic, &hdc); (*((GpBitmap**) image))->hbitmap = hbm; + (*((GpBitmap**) image))->hdc = hdc; bmch = (BITMAPCOREHEADER*) (&pbmi->bmiHeader); bmch->bcSize = sizeof(BITMAPCOREHEADER); @@ -1583,9 +1586,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, hbmp = ((GpBitmap*)image)->hbitmap; if (!hbmp) return GenericError; - hr = IPicture_get_CurDC(image->picture, &hdc); - if (FAILED(hr)) - return GenericError; + hdc = ((GpBitmap*)image)->hdc; bm_is_selected = (hdc != 0); if (!bm_is_selected) { hdc = CreateCompatibleDC(0);

1 0

Vincent Povirk : gdiplus: Add and use an HBITMAP field in GpBitmap objects.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: e48524ceb6f4a584b8b1f37eeaf0fc73e563bfca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48524ceb6f4a584b8b1f37ee… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 28 14:49:35 2009 -0500 gdiplus: Add and use an HBITMAP field in GpBitmap objects. --- dlls/gdiplus/brush.c | 2 +- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/image.c | 13 ++++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index be4298e..f719ff8 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -670,7 +670,7 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, n_y + n_height > ((GpBitmap*)image)->height) return InvalidParameter; - IPicture_get_Handle(image->picture, (OLE_HANDLE*)&hbm); + hbm = ((GpBitmap*)image)->hbitmap; if(!hbm) return GenericError; IPicture_get_CurDC(image->picture, &hdc); bm_is_selected = (hdc != 0); diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index e36f921..5765eac 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -222,6 +222,7 @@ struct GpBitmap{ ImageLockMode lockmode; INT numlocks; BYTE *bitmapbits; /* pointer to the buffer we passed in BitmapLockBits */ + HBITMAP hbitmap; }; struct GpCachedBitmap{ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9c4f56c..e201973 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -167,7 +167,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, if(bitmap->lockmode) return WrongState; - IPicture_get_Handle(bitmap->image.picture, (OLE_HANDLE*)&hbm); + hbm = bitmap->hbitmap; IPicture_get_CurDC(bitmap->image.picture, &hdc); bm_is_selected = (hdc != 0); @@ -263,7 +263,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, return Ok; } - IPicture_get_Handle(bitmap->image.picture, (OLE_HANDLE*)&hbm); + hbm = bitmap->hbitmap; IPicture_get_CurDC(bitmap->image.picture, &hdc); bm_is_selected = (hdc != 0); @@ -587,6 +587,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) (*bitmap)->image.flags = ImageFlagsNone; (*bitmap)->width = ipicture_pixel_width((*bitmap)->image.picture); (*bitmap)->height = ipicture_pixel_height((*bitmap)->image.picture); + (*bitmap)->hbitmap = NULL; DeleteObject(iinfo.hbmColor); DeleteObject(iinfo.hbmMask); @@ -687,6 +688,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->width = width; (*bitmap)->height = height; (*bitmap)->format = format; + IPicture_get_Handle((*bitmap)->image.picture, (OLE_HANDLE*)&(*bitmap)->hbitmap); return Ok; } @@ -1261,6 +1263,8 @@ static GpStatus decode_image_olepicture_bitmap(IStream* stream, REFCLSID clsid, IPicture_get_Handle(pic, (OLE_HANDLE*)&hbm); IPicture_get_CurDC(pic, &hdc); + (*((GpBitmap**) image))->hbitmap = hbm; + bmch = (BITMAPCOREHEADER*) (&pbmi->bmiHeader); bmch->bcSize = sizeof(BITMAPCOREHEADER); @@ -1576,9 +1580,8 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, if (encode_image == NULL) return UnknownImageFormat; - /* extract underlying hbitmap representation from the IPicture */ - hr = IPicture_get_Handle(image->picture, (OLE_HANDLE*)&hbmp); - if (FAILED(hr) || !hbmp) + hbmp = ((GpBitmap*)image)->hbitmap; + if (!hbmp) return GenericError; hr = IPicture_get_CurDC(image->picture, &hdc); if (FAILED(hr))

1 0