# HG changeset patch # User Frank Benoit # Date 1201452235 -3600 # Node ID f5482da87ed8f0e00de6507b6d4a3ff8fb3706cb # Parent 5f2e72114476e223d8a95ba0e7eeedc4b05ead4f Image, ImageData diff -r 5f2e72114476 -r f5482da87ed8 dwt/dwthelper/System.d --- a/dwt/dwthelper/System.d Sat Jan 26 19:05:32 2008 +0100 +++ b/dwt/dwthelper/System.d Sun Jan 27 17:43:55 2008 +0100 @@ -1,4 +1,4 @@ -/** +/** * Authors: Frank Benoit */ module dwt.dwthelper.System; @@ -9,7 +9,7 @@ debug{ static void validCheck(uint SrcLen, uint DestLen, uint copyLen){ if(SrcLen < copyLen || DestLen < copyLen|| SrcLen < 0 || DestLen < 0){ - Util.trace("Error : SimpleType.arraycopy(), out of bounds."); + //Util.trace("Error : SimpleType.arraycopy(), out of bounds."); assert(0); } } diff -r 5f2e72114476 -r f5482da87ed8 dwt/dwthelper/utils.d --- a/dwt/dwthelper/utils.d Sat Jan 26 19:05:32 2008 +0100 +++ b/dwt/dwthelper/utils.d Sun Jan 27 17:43:55 2008 +0100 @@ -89,7 +89,7 @@ } public void getChars( char[] src, int srcBegin, int srcEnd, char[] dst, int dstBegin){ - dst[ dstBegin .. dstBegin + srcEnd - srcBegin ] = str[ srcBegin .. srcEnd ]; + dst[ dstBegin .. dstBegin + srcEnd - srcBegin ] = src[ srcBegin .. srcEnd ]; } public bool endsWith( char[] src, char[] pattern ){ diff -r 5f2e72114476 -r f5482da87ed8 dwt/graphics/Color.d --- a/dwt/graphics/Color.d Sat Jan 26 19:05:32 2008 +0100 +++ b/dwt/graphics/Color.d Sun Jan 27 17:43:55 2008 +0100 @@ -7,6 +7,8 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Port to the D programming language: + * Frank Benoit *******************************************************************************/ module dwt.graphics.Color; diff -r 5f2e72114476 -r f5482da87ed8 dwt/graphics/Device.d --- a/dwt/graphics/Device.d Sat Jan 26 19:05:32 2008 +0100 +++ b/dwt/graphics/Device.d Sun Jan 27 17:43:55 2008 +0100 @@ -7,6 +7,8 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Port to the D programming language: + * Frank Benoit *******************************************************************************/ module dwt.graphics.Device; diff -r 5f2e72114476 -r f5482da87ed8 dwt/graphics/Font.d --- a/dwt/graphics/Font.d Sat Jan 26 19:05:32 2008 +0100 +++ b/dwt/graphics/Font.d Sun Jan 27 17:43:55 2008 +0100 @@ -1,4 +1,4 @@ -/******************************************************************************* +/******************************************************************************* * Copyright (c) 2000, 2006 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -7,6 +7,8 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Port to the D programming language: + * Frank Benoit *******************************************************************************/ module dwt.graphics.Font; @@ -18,10 +20,10 @@ import dwt.graphics.Resource; import dwt.graphics.FontData; -import dwt.graphics.Device; +import dwt.graphics.Device; import tango.text.convert.Format; -//import tango.stdc.stringz; +//import tango.stdc.stringz; /** * Instances of this class manage operating system resources that @@ -29,7 +31,7 @@ * by providing a device and either name, size and style information * or a FontData object which encapsulates this data. *

- * Application code must explicitly invoke the Font.dispose() + * Application code must explicitly invoke the Font.dispose() * method to release the operating system resources managed by each instance * when those instances are no longer required. *

@@ -38,7 +40,7 @@ */ public final class Font : Resource { - + /** * the handle to the OS font resource * (Warning: This field is platform dependent) @@ -50,23 +52,23 @@ *

*/ public HFONT handle; - + /** * Prevents uninitialized instances from being created outside the package. */ this() { } -/** +/** * Constructs a new font given a device and font data * which describes the desired font's appearance. *

- * You must dispose the font when it is no longer required. + * You must dispose the font when it is no longer required. *

* * @param device the device to create the font on * @param fd the FontData that describes the desired font (must not be null) - * + * * @exception IllegalArgumentException

ERROR_NULL_ARGUMENT - if device is null and there is no current device
ERROR_NULL_ARGUMENT - if the fd argument is null

- * You must dispose the font when it is no longer required. + * You must dispose the font when it is no longer required. *

ERROR_NULL_ARGUMENT - if device is null and there is no current device
ERROR_NULL_ARGUMENT - if the fds argument is null

ERROR_NO_HANDLES - if a font could not be created from the given font data

- * You must dispose the font when it is no longer required. + * You must dispose the font when it is no longer required. *

ERROR_NULL_ARGUMENT - if device is null and there is no current device
ERROR_NULL_ARGUMENT - if the name argument is null

FontData

Font

may

Font

may

true

equals

* IMPORTANT: This method is not part of the public diff -r 5f2e72114476 -r f5482da87ed8 dwt/graphics/FontData.d --- a/dwt/graphics/FontData.d Sat Jan 26 19:05:32 2008 +0100 +++ b/dwt/graphics/FontData.d Sun Jan 27 17:43:55 2008 +0100 @@ -1,4 +1,4 @@ -/******************************************************************************* +/******************************************************************************* * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -7,6 +7,8 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Port to the D programming language: + * Frank Benoit *******************************************************************************/ module dwt.graphics.FontData; @@ -52,7 +54,7 @@ */ public final class FontData { - + /** * A Win32 LOGFONT struct * (Warning: This field is platform dependent) @@ -64,7 +66,7 @@ *

LOGFONT

* Note that the representation varies between platforms, - * and a FontData can only be created from a string that was + * and a FontData can only be created from a string that was * generated on the same platform. *

String

DWT

FontData

true

equals

ERROR_INVALID_ARGUMENT - if the height is negative

String

* On platforms that do not support font foundries, only the face name - * (for example, "courier") is used in setName() and + * (for example, "courier") is used in setName() and * getName(). *

DWT

FontData(String)

* IMPORTANT: This method is not part of the public diff -r 5f2e72114476 -r f5482da87ed8 dwt/graphics/FontMetrics.d --- a/dwt/graphics/FontMetrics.d Sat Jan 26 19:05:32 2008 +0100 +++ b/dwt/graphics/FontMetrics.d Sun Jan 27 17:43:55 2008 +0100 @@ -1,4 +1,4 @@ -/******************************************************************************* +/******************************************************************************* * Copyright (c) 2000, 2005 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -7,6 +7,8 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Port to the D programming language: + * Frank Benoit *******************************************************************************/ module dwt.graphics.FontMetrics; @@ -22,9 +24,9 @@ * * @see GC#getFontMetrics */ - + public final class FontMetrics { - + /** * On Windows, handle is a Win32 TEXTMETRIC struct * On Photon, handle is a Photon FontQueryInfo struct @@ -37,7 +39,7 @@ *

ascent

height

true

equals

* IMPORTANT: This method is not part of the public diff -r 5f2e72114476 -r f5482da87ed8 dwt/graphics/GC.d --- a/dwt/graphics/GC.d Sat Jan 26 19:05:32 2008 +0100 +++ b/dwt/graphics/GC.d Sun Jan 27 17:43:55 2008 +0100 @@ -7,11 +7,25 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Port to the D programming language: + * Frank Benoit *******************************************************************************/ module dwt.graphics.GC; +import dwt.graphics.GCData; +import dwt.graphics.Image; +import dwt.internal.win32.WINTYPES; + //PORTING_TYPE class GC{ + void dispose(); + bool isDisposed(); + void flush (); + GCData data; + HDC handle; +public void drawImage(Image image, int x, int y) ; +public void drawImage(Image image, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight) ; +void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, bool simple) ; } /++ diff -r 5f2e72114476 -r f5482da87ed8 dwt/graphics/GCData.d --- a/dwt/graphics/GCData.d Sat Jan 26 19:05:32 2008 +0100 +++ b/dwt/graphics/GCData.d Sun Jan 27 17:43:55 2008 +0100 @@ -1,4 +1,4 @@ -/******************************************************************************* +/******************************************************************************* * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -12,12 +12,20 @@ *******************************************************************************/ module dwt.graphics.GCData; - + import dwt.DWT; import dwt.internal.win32.WINTYPES; +import dwt.graphics.Image; +import dwt.graphics.Device; //PORTING_TYPE class GCData { + HBITMAP hNullBitmap; + int style; + int layout; + Device device; + Image image; + HFONT hFont; } /+++ /** diff -r 5f2e72114476 -r f5482da87ed8 dwt/graphics/Image.d --- a/dwt/graphics/Image.d Sat Jan 26 19:05:32 2008 +0100 +++ b/dwt/graphics/Image.d Sun Jan 27 17:43:55 2008 +0100 @@ -7,6 +7,8 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Port to the D programming language: + * Frank Benoit *******************************************************************************/ module dwt.graphics.Image; @@ -785,8 +787,7 @@ byte[] bmi; if (isDirect) bmi = new byte[BITMAPINFOHEADER.sizeof + (useBitfields ? 12 : 0)]; else bmi = new byte[BITMAPINFOHEADER.sizeof + rgbs.length * 4]; - bmi[ 0 .. BITMAPINFOHEADER.sizeof ] = (cast(byte*)&bmiHeader)[ 0 .. BITMAPINFOHEADER.sizeof ]; - //OS.MoveMemory(bmi, bmiHeader, BITMAPINFOHEADER.sizeof); + *cast(BITMAPINFOHEADER*)bmi.ptr = bmiHeader; /* Set the rgb colors into the bitmap info */ int offset = BITMAPINFOHEADER.sizeof; @@ -978,7 +979,8 @@ OS.GetObject(hBitmap, BITMAP.sizeof, &bm); int imgWidth = bm.bmWidth; int imgHeight = hBitmap is iconInfo.hbmMask ? bm.bmHeight / 2 : bm.bmHeight; - int img = 0, pixels = 0; + Gdip.Bitmap* img; + byte* pixels; if (imgWidth > imgHeight) { auto hDC = device.internal_new_GC(null); auto srcHdc = OS.CreateCompatibleDC(hDC); @@ -992,8 +994,7 @@ OS.BitBlt(memHdc, 0, 0, imgWidth, imgHeight, srcHdc, 0, hBitmap is iconInfo.hbmMask ? imgHeight : 0, OS.SRCCOPY); OS.SelectObject(memHdc, oldMemBitmap); OS.DeleteObject(memHdc); - byte[] srcData = new byte[dibBM.bmWidthBytes * dibBM.bmHeight]; - OS.MoveMemory(srcData, dibBM.bmBits, srcData.length); + byte[] srcData = (cast(byte*)dibBM.bmBits)[ 0 .. dibBM.bmWidthBytes * dibBM.bmHeight].dup; OS.DeleteObject(memDib); OS.SelectObject(srcHdc, iconInfo.hbmMask); for (int y = 0, dp = 0; y < imgHeight; ++y) { @@ -1009,17 +1010,17 @@ OS.SelectObject(srcHdc, oldSrcBitmap); OS.DeleteObject(srcHdc); device.internal_dispose_GC(hDC, null); - int hHeap = OS.GetProcessHeap(); - pixels = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, srcData.length); - if (pixels is 0) DWT.error(DWT.ERROR_NO_HANDLES); - OS.MoveMemory(pixels, srcData, srcData.length); + auto hHeap = OS.GetProcessHeap(); + pixels = cast(byte*) OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, srcData.length); + if (pixels is null) DWT.error(DWT.ERROR_NO_HANDLES); + pixels[ 0 .. srcData.length ] = srcData[]; img = Gdip.Bitmap_new(imgWidth, imgHeight, dibBM.bmWidthBytes, Gdip.PixelFormat32bppARGB, pixels); } else { img = Gdip.Bitmap_new(handle); } - if (iconInfo.hbmColor !is 0) OS.DeleteObject(iconInfo.hbmColor); - if (iconInfo.hbmMask !is 0) OS.DeleteObject(iconInfo.hbmMask); - return [img, pixels]; + if (iconInfo.hbmColor !is null) OS.DeleteObject(iconInfo.hbmColor); + if (iconInfo.hbmMask !is null) OS.DeleteObject(iconInfo.hbmMask); + return [ cast(int)img, cast(int) pixels ]; } default: DWT.error(DWT.ERROR_INVALID_IMAGE); } @@ -1090,31 +1091,31 @@ auto hDC = device.internal_new_GC(null); /* Compute the background color */ - BITMAP bm = new BITMAP(); - OS.GetObject(handle, BITMAP.sizeof, bm); + BITMAP bm; + OS.GetObject(handle, BITMAP.sizeof, &bm); auto hdcMem = OS.CreateCompatibleDC(hDC); auto hOldObject = OS.SelectObject(hdcMem, handle); int red = 0, green = 0, blue = 0; if (bm.bmBitsPixel <= 8) { if (OS.IsWinCE) { - byte[] pBits = new byte[1]; - OS.MoveMemory(pBits, bm.bmBits, 1); + byte* pBits = cast(byte*)bm.bmBits; + //OS.MoveMemory(pBits, bm.bmBits, 1); byte oldValue = pBits[0]; int mask = (0xFF << (8 - bm.bmBitsPixel)) & 0x00FF; pBits[0] = cast(byte)((transparentPixel << (8 - bm.bmBitsPixel)) | (pBits[0] & ~mask)); - OS.MoveMemory(bm.bmBits, pBits, 1); + //OS.MoveMemory(bm.bmBits, bm.bmBits, 1); int color = OS.GetPixel(hdcMem, 0, 0); pBits[0] = oldValue; - OS.MoveMemory(bm.bmBits, pBits, 1); + //OS.MoveMemory(bm.bmBits, bm.bmBits, 1); blue = (color & 0xFF0000) >> 16; green = (color & 0xFF00) >> 8; red = color & 0xFF; } else { - byte[] color = new byte[4]; - OS.GetDIBColorTable(hdcMem, transparentPixel, 1, color); - blue = color[0] & 0xFF; - green = color[1] & 0xFF; - red = color[2] & 0xFF; + RGBQUAD color; + OS.GetDIBColorTable(hdcMem, transparentPixel, 1, &color); + blue = color.rgbBlue; + green = color.rgbGreen; + red = color.rgbRed; } } else { switch (bm.bmBitsPixel) { @@ -1164,22 +1165,22 @@ } switch (type) { case DWT.BITMAP: - BITMAP bm = new BITMAP(); - OS.GetObject(handle, BITMAP.sizeof, bm); + BITMAP bm; + OS.GetObject(handle, BITMAP.sizeof, &bm); return new Rectangle(0, 0, width = bm.bmWidth, height = bm.bmHeight); case DWT.ICON: if (OS.IsWinCE) { return new Rectangle(0, 0, width = data.width, height = data.height); } else { - ICONINFO info = new ICONINFO(); - OS.GetIconInfo(handle, info); - int hBitmap = info.hbmColor; - if (hBitmap is 0) hBitmap = info.hbmMask; - bm = new BITMAP(); - OS.GetObject(hBitmap, BITMAP.sizeof, bm); + ICONINFO info; + OS.GetIconInfo(handle, &info); + auto hBitmap = info.hbmColor; + if (hBitmap is null) hBitmap = info.hbmMask; + BITMAP bm; + OS.GetObject(hBitmap, BITMAP.sizeof, &bm); if (hBitmap is info.hbmMask) bm.bmHeight /= 2; - if (info.hbmColor !is 0) OS.DeleteObject(info.hbmColor); - if (info.hbmMask !is 0) OS.DeleteObject(info.hbmMask); + if (info.hbmColor !is null) OS.DeleteObject(info.hbmColor); + if (info.hbmMask !is null) OS.DeleteObject(info.hbmMask); return new Rectangle(0, 0, width = bm.bmWidth, height = bm.bmHeight); } default: @@ -1209,14 +1210,13 @@ switch (type) { case DWT.ICON: { if (OS.IsWinCE) return data; - ICONINFO info = new ICONINFO(); + ICONINFO info; if (OS.IsWinCE) DWT.error(DWT.ERROR_NOT_IMPLEMENTED); - OS.GetIconInfo(handle, info); + OS.GetIconInfo(handle, &info); /* Get the basic BITMAP information */ - int hBitmap = info.hbmColor; - if (hBitmap is 0) hBitmap = info.hbmMask; - bm = new BITMAP(); - OS.GetObject(hBitmap, BITMAP.sizeof, bm); + auto hBitmap = info.hbmColor; + if (hBitmap is null) hBitmap = info.hbmMask; + OS.GetObject(hBitmap, BITMAP.sizeof, &bm); depth = bm.bmPlanes * bm.bmBitsPixel; width = bm.bmWidth; if (hBitmap is info.hbmMask) bm.bmHeight /= 2; @@ -1224,7 +1224,7 @@ int numColors = 0; if (depth <= 8) numColors = 1 << depth; /* Create the BITMAPINFO */ - BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER(); + BITMAPINFOHEADER bmiHeader; bmiHeader.biSize = BITMAPINFOHEADER.sizeof; bmiHeader.biWidth = width; bmiHeader.biHeight = -height; @@ -1232,7 +1232,7 @@ bmiHeader.biBitCount = cast(short)depth; bmiHeader.biCompression = OS.BI_RGB; byte[] bmi = new byte[BITMAPINFOHEADER.sizeof + numColors * 4]; - OS.MoveMemory(bmi, bmiHeader, BITMAPINFOHEADER.sizeof); + *cast(BITMAPINFOHEADER*)bmi.ptr = bmiHeader; /* Get the HDC for the device */ auto hDC = device.internal_new_GC(null); @@ -1241,10 +1241,10 @@ auto hBitmapDC = OS.CreateCompatibleDC(hDC); auto hOldBitmap = OS.SelectObject(hBitmapDC, hBitmap); /* Select the palette if necessary */ - int oldPalette = 0; + HPALETTE oldPalette; if (depth <= 8) { - int hPalette = device.hPalette; - if (hPalette !is 0) { + auto hPalette = device.hPalette; + if (hPalette !is null) { oldPalette = OS.SelectPalette(hBitmapDC, hPalette, false); OS.RealizePalette(hBitmapDC); } @@ -1253,17 +1253,16 @@ int imageSize; /* Call with null lpBits to get the image size */ if (OS.IsWinCE) DWT.error(DWT.ERROR_NOT_IMPLEMENTED); - OS.GetDIBits(hBitmapDC, hBitmap, 0, height, 0, bmi, OS.DIB_RGB_COLORS); - OS.MoveMemory(bmiHeader, bmi, BITMAPINFOHEADER.sizeof); + OS.GetDIBits(hBitmapDC, hBitmap, 0, height, null, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS); + bmiHeader = *cast(BITMAPINFOHEADER*)bmi.ptr; imageSize = bmiHeader.biSizeImage; - byte[] data = new byte[imageSize]; /* Get the bitmap data */ - int hHeap = OS.GetProcessHeap(); - int lpvBits = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, imageSize); - if (lpvBits is 0) DWT.error(DWT.ERROR_NO_HANDLES); + auto hHeap = OS.GetProcessHeap(); + auto lpvBits = cast(byte*) OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, imageSize); + if (lpvBits is null) DWT.error(DWT.ERROR_NO_HANDLES); if (OS.IsWinCE) DWT.error(DWT.ERROR_NOT_IMPLEMENTED); - OS.GetDIBits(hBitmapDC, hBitmap, 0, height, lpvBits, bmi, OS.DIB_RGB_COLORS); - OS.MoveMemory(data, lpvBits, imageSize); + OS.GetDIBits(hBitmapDC, hBitmap, 0, height, lpvBits, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS); + byte[] data = lpvBits[ 0 .. imageSize].dup; /*PORTING_OPTIMIZE?*/ /* Calculate the palette */ PaletteData palette = null; if (depth <= 8) { @@ -1286,16 +1285,15 @@ /* Do the mask */ byte [] maskData = null; - if (info.hbmColor is 0) { + if (info.hbmColor is null) { /* Do the bottom half of the mask */ - maskData = new byte[imageSize]; if (OS.IsWinCE) DWT.error(DWT.ERROR_NOT_IMPLEMENTED); - OS.GetDIBits(hBitmapDC, hBitmap, height, height, lpvBits, bmi, OS.DIB_RGB_COLORS); - OS.MoveMemory(maskData, lpvBits, imageSize); + OS.GetDIBits(hBitmapDC, hBitmap, height, height, lpvBits, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS); + maskData = lpvBits[ 0 .. imageSize].dup; } else { /* Do the entire mask */ /* Create the BITMAPINFO */ - bmiHeader = new BITMAPINFOHEADER(); + bmiHeader = BITMAPINFOHEADER.init; bmiHeader.biSize = BITMAPINFOHEADER.sizeof; bmiHeader.biWidth = width; bmiHeader.biHeight = -height; @@ -1303,7 +1301,7 @@ bmiHeader.biBitCount = 1; bmiHeader.biCompression = OS.BI_RGB; bmi = new byte[BITMAPINFOHEADER.sizeof + 8]; - OS.MoveMemory(bmi, bmiHeader, BITMAPINFOHEADER.sizeof); + *cast(BITMAPINFOHEADER*)bmi.ptr = bmiHeader; /* First color black, second color white */ int offset = BITMAPINFOHEADER.sizeof; @@ -1312,15 +1310,15 @@ OS.SelectObject(hBitmapDC, info.hbmMask); /* Call with null lpBits to get the image size */ if (OS.IsWinCE) DWT.error(DWT.ERROR_NOT_IMPLEMENTED); - OS.GetDIBits(hBitmapDC, info.hbmMask, 0, height, 0, bmi, OS.DIB_RGB_COLORS); - OS.MoveMemory(bmiHeader, bmi, BITMAPINFOHEADER.sizeof); + OS.GetDIBits(hBitmapDC, info.hbmMask, 0, height, null, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS); + bmiHeader = *cast(BITMAPINFOHEADER*)bmi.ptr; imageSize = bmiHeader.biSizeImage; maskData = new byte[imageSize]; - int lpvMaskBits = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, imageSize); - if (lpvMaskBits is 0) DWT.error(DWT.ERROR_NO_HANDLES); + auto lpvMaskBits = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, imageSize); + if (lpvMaskBits is null) DWT.error(DWT.ERROR_NO_HANDLES); if (OS.IsWinCE) DWT.error(DWT.ERROR_NOT_IMPLEMENTED); - OS.GetDIBits(hBitmapDC, info.hbmMask, 0, height, lpvMaskBits, bmi, OS.DIB_RGB_COLORS); - OS.MoveMemory(maskData, lpvMaskBits, imageSize); + OS.GetDIBits(hBitmapDC, info.hbmMask, 0, height, lpvMaskBits, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS); + maskData[] = (cast(byte*)lpvMaskBits)[ 0 .. imageSize ]; OS.HeapFree(hHeap, 0, lpvMaskBits); /* Loop to invert the mask */ for (int i = 0; i < maskData.length; i++) { @@ -1338,7 +1336,7 @@ /* Clean up */ OS.HeapFree(hHeap, 0, lpvBits); OS.SelectObject(hBitmapDC, hOldBitmap); - if (oldPalette !is 0) { + if (oldPalette !is null) { OS.SelectPalette(hBitmapDC, oldPalette, false); OS.RealizePalette(hBitmapDC); } @@ -1347,8 +1345,8 @@ /* Release the HDC for the device */ device.internal_dispose_GC(hDC, null); - if (info.hbmColor !is 0) OS.DeleteObject(info.hbmColor); - if (info.hbmMask !is 0) OS.DeleteObject(info.hbmMask); + if (info.hbmColor !is null) OS.DeleteObject(info.hbmColor); + if (info.hbmMask !is null) OS.DeleteObject(info.hbmMask); /* Construct and return the ImageData */ ImageData imageData = new ImageData(width, height, depth, palette, 4, data); imageData.maskData = maskData; @@ -1357,13 +1355,13 @@ } case DWT.BITMAP: { /* Get the basic BITMAP information */ - bm = new BITMAP(); - OS.GetObject(handle, BITMAP.sizeof, bm); + bm = BITMAP.init; + OS.GetObject(handle, BITMAP.sizeof, &bm); depth = bm.bmPlanes * bm.bmBitsPixel; width = bm.bmWidth; height = bm.bmHeight; /* Find out whether this is a DIB or a DDB. */ - bool isDib = (bm.bmBits !is 0); + bool isDib = (bm.bmBits !is null); /* Get the HDC for the device */ auto hDC = device.internal_new_GC(null); @@ -1372,7 +1370,7 @@ * workaround is to create a temporary DIB from the DDB and use * the bmBits field of DIBSECTION to retrieve the image data. */ - int handle = this.handle; + auto handle = this.handle; if (OS.IsWinCE) { if (!isDib) { bool mustRestore = false; @@ -1380,9 +1378,9 @@ memGC.flush (); mustRestore = true; GCData data = memGC.data; - if (data.hNullBitmap !is 0) { + if (data.hNullBitmap !is null) { OS.SelectObject(memGC.handle, data.hNullBitmap); - data.hNullBitmap = 0; + data.hNullBitmap = null; } } handle = createDIBFromDDB(hDC, this.handle, width, height); @@ -1393,10 +1391,9 @@ isDib = true; } } - DIBSECTION dib = null; + DIBSECTION dib; if (isDib) { - dib = new DIBSECTION(); - OS.GetObject(handle, DIBSECTION.sizeof, dib); + OS.GetObject(handle, DIBSECTION.sizeof, &dib); } /* Calculate number of colors */ int numColors = 0; @@ -1409,9 +1406,8 @@ } /* Create the BITMAPINFO */ byte[] bmi = null; - BITMAPINFOHEADER bmiHeader = null; + BITMAPINFOHEADER bmiHeader; if (!isDib) { - bmiHeader = new BITMAPINFOHEADER(); bmiHeader.biSize = BITMAPINFOHEADER.sizeof; bmiHeader.biWidth = width; bmiHeader.biHeight = -height; @@ -1419,17 +1415,17 @@ bmiHeader.biBitCount = cast(short)depth; bmiHeader.biCompression = OS.BI_RGB; bmi = new byte[BITMAPINFOHEADER.sizeof + numColors * 4]; - OS.MoveMemory(bmi, bmiHeader, BITMAPINFOHEADER.sizeof); + *cast(BITMAPINFOHEADER*)bmi.ptr = bmiHeader; } /* Create the DC and select the bitmap */ auto hBitmapDC = OS.CreateCompatibleDC(hDC); auto hOldBitmap = OS.SelectObject(hBitmapDC, handle); /* Select the palette if necessary */ - int oldPalette = 0; + HPALETTE oldPalette; if (!isDib && depth <= 8) { - int hPalette = device.hPalette; - if (hPalette !is 0) { + auto hPalette = device.hPalette; + if (hPalette !is null) { oldPalette = OS.SelectPalette(hBitmapDC, hPalette, false); OS.RealizePalette(hBitmapDC); } @@ -1441,8 +1437,8 @@ } else { /* Call with null lpBits to get the image size */ if (OS.IsWinCE) DWT.error(DWT.ERROR_NOT_IMPLEMENTED); - OS.GetDIBits(hBitmapDC, handle, 0, height, 0, bmi, OS.DIB_RGB_COLORS); - OS.MoveMemory(bmiHeader, bmi, BITMAPINFOHEADER.sizeof); + OS.GetDIBits(hBitmapDC, handle, 0, height, null, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS); + bmiHeader = *cast(BITMAPINFOHEADER*)bmi.ptr; imageSize = bmiHeader.biSizeImage; } byte[] data = new byte[imageSize]; @@ -1450,17 +1446,17 @@ if (isDib) { if (OS.IsWinCE && this.handle !is handle) { /* get image data from the temporary DIB */ - OS.MoveMemory(data, dib.bmBits, imageSize); + data[] = (cast(byte*)dib.bmBits)[ 0 .. imageSize ]; } else { - OS.MoveMemory(data, bm.bmBits, imageSize); + data[] = (cast(byte*)bm.bmBits)[ 0 .. imageSize ]; } } else { - int hHeap = OS.GetProcessHeap(); - int lpvBits = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, imageSize); - if (lpvBits is 0) DWT.error(DWT.ERROR_NO_HANDLES); + auto hHeap = OS.GetProcessHeap(); + auto lpvBits = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, imageSize); + if (lpvBits is null) DWT.error(DWT.ERROR_NO_HANDLES); if (OS.IsWinCE) DWT.error(DWT.ERROR_NOT_IMPLEMENTED); - OS.GetDIBits(hBitmapDC, handle, 0, height, lpvBits, bmi, OS.DIB_RGB_COLORS); - OS.MoveMemory(data, lpvBits, imageSize); + OS.GetDIBits(hBitmapDC, handle, 0, height, lpvBits, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS); + data[] = (cast(byte*)lpvBits)[ 0 .. imageSize ]; OS.HeapFree(hHeap, 0, lpvBits); } /* Calculate the palette */ @@ -1476,13 +1472,12 @@ * RGB value. */ int red = 0, green = 0, blue = 0; - byte[] pBits = new byte[1]; - OS.MoveMemory(pBits, bm.bmBits, 1); + byte* pBits = cast(byte*)bm.bmBits; byte oldValue = pBits[0]; int mask = (0xFF << (8 - bm.bmBitsPixel)) & 0x00FF; for (int i = 0; i < numColors; i++) { pBits[0] = cast(byte)((i << (8 - bm.bmBitsPixel)) | (pBits[0] & ~mask)); - OS.MoveMemory(bm.bmBits, pBits, 1); + //OS.MoveMemory(bm.bmBits, pBits, 1); int color = OS.GetPixel(hBitmapDC, 0, 0); blue = (color & 0xFF0000) >> 16; green = (color & 0xFF00) >> 8; @@ -1490,10 +1485,10 @@ rgbs[i] = new RGB(red, green, blue); } pBits[0] = oldValue; - OS.MoveMemory(bm.bmBits, pBits, 1); + //OS.MoveMemory(bm.bmBits, pBits, 1); } else { byte[] colors = new byte[numColors * 4]; - OS.GetDIBColorTable(hBitmapDC, 0, numColors, colors); + OS.GetDIBColorTable(hBitmapDC, 0, numColors, cast(RGBQUAD*)colors.ptr); int colorIndex = 0; for (int i = 0; i < rgbs.length; i++) { rgbs[i] = new RGB(colors[colorIndex + 2] & 0xFF, colors[colorIndex + 1] & 0xFF, colors[colorIndex] & 0xFF); @@ -1519,7 +1514,7 @@ } /* Clean up */ OS.SelectObject(hBitmapDC, hOldBitmap); - if (oldPalette !is 0) { + if (oldPalette !is null) { OS.SelectPalette(hBitmapDC, oldPalette, false); OS.RealizePalette(hBitmapDC); } @@ -1598,7 +1593,7 @@ } static HGDIOBJ createDIB(int width, int height, int depth) { - BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER(); + BITMAPINFOHEADER bmiHeader; bmiHeader.biSize = BITMAPINFOHEADER.sizeof; bmiHeader.biWidth = width; bmiHeader.biHeight = -height; @@ -1607,7 +1602,7 @@ if (OS.IsWinCE) bmiHeader.biCompression = OS.BI_BITFIELDS; else bmiHeader.biCompression = OS.BI_RGB; byte[] bmi = new byte[BITMAPINFOHEADER.sizeof + (OS.IsWinCE ? 12 : 0)]; - OS.MoveMemory(bmi, bmiHeader, BITMAPINFOHEADER.sizeof); + *cast(BITMAPINFOHEADER*)bmi.ptr = bmiHeader; /* Set the rgb colors into the bitmap info */ if (OS.IsWinCE) { int redMask = 0xFF00; @@ -1629,8 +1624,8 @@ bmi[offset + 11] = cast(byte)((blueMask & 0xFF) >> 0); } - int[] pBits = new int[1]; - return OS.CreateDIBSection(0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); + int pBits; + return OS.CreateDIBSection(null, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS, &pBits, null, 0); } /** @@ -1646,8 +1641,8 @@ */ static void GetIconInfo(Image image, ICONINFO* info) { int[] result = init(image.device, null, image.data); - info.hbmColor = result[0]; - info.hbmMask = result[1]; + info.hbmColor = cast(HBITMAP)result[0]; + info.hbmMask = cast(HBITMAP)result[1]; } static int[] init(Device device, Image image, ImageData i) { @@ -1744,7 +1739,7 @@ /* Construct bitmap info header by hand */ RGB[] rgbs = i.palette.getRGBs(); bool useBitfields = OS.IsWinCE && (i.depth is 16 || i.depth is 32); - BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER(); + BITMAPINFOHEADER bmiHeader; bmiHeader.biSize = BITMAPINFOHEADER.sizeof; bmiHeader.biWidth = i.width; bmiHeader.biHeight = -i.height; @@ -1758,7 +1753,7 @@ bmi = new byte[BITMAPINFOHEADER.sizeof + (useBitfields ? 12 : 0)]; else bmi = new byte[BITMAPINFOHEADER.sizeof + rgbs.length * 4]; - OS.MoveMemory(bmi, bmiHeader, BITMAPINFOHEADER.sizeof); + *cast(BITMAPINFOHEADER*)bmi.ptr = bmiHeader; /* Set the rgb colors into the bitmap info */ int offset = BITMAPINFOHEADER.sizeof; if (i.palette.isDirect) { @@ -1808,15 +1803,15 @@ offset += 4; } } - int[] pBits = new int[1]; - int hDib = OS.CreateDIBSection(0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); - if (hDib is 0) DWT.error(DWT.ERROR_NO_HANDLES); + int pBits; + auto hDib = OS.CreateDIBSection(null, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS, &pBits, null, 0); + if (hDib is null) DWT.error(DWT.ERROR_NO_HANDLES); /* In case of a scanline pad other than 4, do the work to convert it */ byte[] data = i.data; if (i.scanlinePad !is 4 && (i.bytesPerLine % 4 !is 0)) { data = ImageData.convertPad(data, i.width, i.height, i.depth, i.scanlinePad, 4); } - OS.MoveMemory(pBits[0], data, data.length); + //OS.MoveMemory(pBits[0], data, data.length); int[] result = null; if (i.getTransparencyType() is DWT.TRANSPARENCY_MASK) { @@ -1826,8 +1821,8 @@ /* Create the color bitmap */ auto hdcSrc = OS.CreateCompatibleDC(hDC); OS.SelectObject(hdcSrc, hDib); - int hBitmap = OS.CreateCompatibleBitmap(hDC, i.width, i.height); - if (hBitmap is 0) DWT.error(DWT.ERROR_NO_HANDLES); + auto hBitmap = OS.CreateCompatibleBitmap(hDC, i.width, i.height); + if (hBitmap is null) DWT.error(DWT.ERROR_NO_HANDLES); auto hdcDest = OS.CreateCompatibleDC(hDC); OS.SelectObject(hdcDest, hBitmap); OS.BitBlt(hdcDest, 0, 0, i.width, i.height, hdcSrc, 0, 0, OS.SRCCOPY); @@ -1837,8 +1832,8 @@ /* Create the mask. Windows requires icon masks to have a scanline pad of 2. */ byte[] maskData = ImageData.convertPad(i.maskData, i.width, i.height, 1, i.maskPad, 2); - int hMask = OS.CreateBitmap(i.width, i.height, 1, 1, maskData); - if (hMask is 0) DWT.error(DWT.ERROR_NO_HANDLES); + auto hMask = OS.CreateBitmap(i.width, i.height, 1, 1, maskData.ptr); + if (hMask is null) DWT.error(DWT.ERROR_NO_HANDLES); OS.SelectObject(hdcSrc, hMask); OS.PatBlt(hdcSrc, 0, 0, i.width, i.height, OS.DSTINVERT); OS.DeleteDC(hdcSrc); @@ -1846,15 +1841,15 @@ OS.DeleteObject(hDib); if (image is null) { - result = [hBitmap, hMask]; + result = [ cast(int) hBitmap, cast(int) hMask]; } else { /* Create the icon */ - ICONINFO info = new ICONINFO(); + ICONINFO info; info.fIcon = true; info.hbmColor = hBitmap; info.hbmMask = hMask; - int hIcon = OS.CreateIconIndirect(info); - if (hIcon is 0) DWT.error(DWT.ERROR_NO_HANDLES); + auto hIcon = OS.CreateIconIndirect(&info); + if (hIcon is null) DWT.error(DWT.ERROR_NO_HANDLES); OS.DeleteObject(hBitmap); OS.DeleteObject(hMask); image.handle = hIcon; @@ -1863,7 +1858,7 @@ } } else { if (image is null) { - result = [hDib]; + result = [ cast(int) hDib]; } else { image.handle = hDib; image.type = DWT.BITMAP; @@ -1912,7 +1907,7 @@ imageData = new ImageData(source.width, source.height, source.depth, new PaletteData(rgbs)); } else { while (blackIndex < rgbs.length) { - if (rgbs[blackIndex].equals(black)) break; + if (rgbs[blackIndex] ==/*eq*/ black) break; blackIndex++; } if (blackIndex is rgbs.length) { @@ -1986,7 +1981,7 @@ auto hDC = device.internal_new_GC(null); auto imageDC = OS.CreateCompatibleDC(hDC); device.internal_dispose_GC(hDC, null); - if (imageDC is 0) DWT.error(DWT.ERROR_NO_HANDLES); + if (imageDC is null) DWT.error(DWT.ERROR_NO_HANDLES); if (data !is null) { /* Set the GCData fields */ @@ -2082,20 +2077,20 @@ auto hDC = device.internal_new_GC(null); /* Change the background color in the image */ - BITMAP bm = new BITMAP(); - OS.GetObject(handle, BITMAP.sizeof, bm); + BITMAP bm; + OS.GetObject(handle, BITMAP.sizeof, &bm); auto hdcMem = OS.CreateCompatibleDC(hDC); OS.SelectObject(hdcMem, handle); int maxColors = 1 << bm.bmBitsPixel; byte[] colors = new byte[maxColors * 4]; if (OS.IsWinCE) DWT.error(DWT.ERROR_NOT_IMPLEMENTED); - int numColors = OS.GetDIBColorTable(hdcMem, 0, maxColors, colors); + int numColors = OS.GetDIBColorTable(hdcMem, 0, maxColors, cast(RGBQUAD*)colors.ptr); int offset = transparentPixel * 4; colors[offset] = cast(byte)color.getBlue(); colors[offset + 1] = cast(byte)color.getGreen(); colors[offset + 2] = cast(byte)color.getRed(); if (OS.IsWinCE) DWT.error(DWT.ERROR_NOT_IMPLEMENTED); - OS.SetDIBColorTable(hdcMem, 0, numColors, colors); + OS.SetDIBColorTable(hdcMem, 0, numColors, cast(RGBQUAD*)colors.ptr); OS.DeleteDC(hdcMem); /* Release the HDC for the device */ diff -r 5f2e72114476 -r f5482da87ed8 dwt/graphics/ImageData.d --- a/dwt/graphics/ImageData.d Sat Jan 26 19:05:32 2008 +0100 +++ b/dwt/graphics/ImageData.d Sun Jan 27 17:43:55 2008 +0100 @@ -23,6 +23,7 @@ import dwt.internal.CloneableCompatibility; public import dwt.dwthelper.InputStream; +import dwt.dwthelper.System; /** diff -r 5f2e72114476 -r f5482da87ed8 dwt/graphics/Region.d --- a/dwt/graphics/Region.d Sat Jan 26 19:05:32 2008 +0100 +++ b/dwt/graphics/Region.d Sun Jan 27 17:43:55 2008 +0100 @@ -7,6 +7,8 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Port to the D programming language: + * Frank Benoit *******************************************************************************/ module dwt.graphics.Region; diff -r 5f2e72114476 -r f5482da87ed8 dwt/graphics/Transform.d --- a/dwt/graphics/Transform.d Sat Jan 26 19:05:32 2008 +0100 +++ b/dwt/graphics/Transform.d Sun Jan 27 17:43:55 2008 +0100 @@ -7,6 +7,8 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Port to the D programming language: + * Frank Benoit *******************************************************************************/ module dwt.graphics.Transform; @@ -47,7 +49,7 @@ * platforms and should never be accessed from application code. *

*******************************************************************************/ module dwt.internal.win32.OS;