diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win/tkWinPixmap.c | 57 |
2 files changed, 57 insertions, 5 deletions
@@ -1,3 +1,8 @@ +2009-04-30 Donal K. Fellows <dkf@users.sf.net> + + * win/tkWinPixmap.c (Tk_GetPixmap): [Bug 2080533]: Added patch that + allows Tk to keep working even when the graphics card is stressed. + 2009-04-28 Jeff Hobbs <jeffh@ActiveState.com> * unix/tcl.m4, unix/configure (SC_CONFIG_CFLAGS): harden the check diff --git a/win/tkWinPixmap.c b/win/tkWinPixmap.c index 369c25c..6e3331e 100644 --- a/win/tkWinPixmap.c +++ b/win/tkWinPixmap.c @@ -9,11 +9,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinPixmap.c,v 1.7 2007/01/11 15:35:41 dkf Exp $ + * RCS: @(#) $Id: tkWinPixmap.c,v 1.7.4.1 2009/04/30 13:48:00 dkf Exp $ */ #include "tkWinInt.h" - /* *---------------------------------------------------------------------- @@ -48,7 +47,7 @@ Tk_GetPixmap( newTwdPtr = (TkWinDrawable*) ckalloc(sizeof(TkWinDrawable)); newTwdPtr->type = TWD_BITMAP; newTwdPtr->bitmap.depth = depth; - twdPtr = (TkWinDrawable *)d; + twdPtr = (TkWinDrawable *) d; if (twdPtr->type != TWD_BITMAP) { if (twdPtr->window.winPtr == NULL) { newTwdPtr->bitmap.colormap = DefaultColormap(display, @@ -68,12 +67,60 @@ Tk_GetPixmap( newTwdPtr->bitmap.handle = CreateBitmap(width, height, (DWORD) planes, (DWORD) depth, NULL); + /* + * CreateBitmap tries to use memory on the graphics card. If it fails, + * call CreateDIBSection which uses real memory; slower, but at least + * still works. [Bug 2080533] + */ + + if (newTwdPtr->bitmap.handle == NULL) { + static int repeatError = 0; + unsigned char *bits = NULL; + BITMAPINFO bitmapInfo; + HDC dc; + + memset(&bitmapInfo, 0, sizeof(bitmapInfo)); + bitmapInfo.bmiHeader.biSize = sizeof(bitmapInfo.bmiHeader); + bitmapInfo.bmiHeader.biWidth = width; + bitmapInfo.bmiHeader.biHeight = height; + bitmapInfo.bmiHeader.biPlanes = planes; + bitmapInfo.bmiHeader.biBitCount = depth; + bitmapInfo.bmiHeader.biCompression = BI_RGB; + bitmapInfo.bmiHeader.biSizeImage = 0; + dc = GetDC(NULL); + newTwdPtr->bitmap.handle = CreateDIBSection(dc, &bitmapInfo, + DIB_RGB_COLORS, (void **) &bits, 0, 0); + ReleaseDC(NULL, dc); + + /* + * Oh no! Things are still going wrong. Pop up a warning message here + * (because things will probably crash soon) which will encourage + * people to report this as a bug... + */ + + if (newTwdPtr->bitmap.handle == NULL && !repeatError) { + LPVOID lpMsgBuf; + + repeatError = 1; + if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, GetLastError(), + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR) &lpMsgBuf, 0, NULL)) { + MessageBox(NULL, (LPCTSTR) lpMsgBuf, + "Tk_GetPixmap: Error from CreateDIBSection", + MB_OK | MB_ICONINFORMATION); + LocalFree(lpMsgBuf); + } + } + } + if (newTwdPtr->bitmap.handle == NULL) { ckfree((char *) newTwdPtr); return None; } - return (Pixmap)newTwdPtr; + return (Pixmap) newTwdPtr; } /* @@ -102,7 +149,7 @@ Tk_FreePixmap( display->request++; if (twdPtr != NULL) { DeleteObject(twdPtr->bitmap.handle); - ckfree((char *)twdPtr); + ckfree((char *) twdPtr); } } |