wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Vincent Povirk : windowscodecs: Use the BITMAPINFOHEADER structure to get icon bitcount.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: 6a36802f26fc2518c99de329c969fecd907e11e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a36802f26fc2518c99de329c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 6 17:07:39 2010 -0500 windowscodecs: Use the BITMAPINFOHEADER structure to get icon bitcount. --- dlls/windowscodecs/icoformat.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index e1ea7c6..180dbb3 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -189,7 +189,7 @@ static HRESULT IcoFrameDecode_ReadPixels(IcoFrameDecode *This) hr = IStream_Read(This->parent->stream, &bih, sizeof(BITMAPINFOHEADER), &bytesread); if (FAILED(hr) || bytesread != sizeof(BITMAPINFOHEADER)) goto fail; - if (This->entry.wBitCount <= 8) + if (bih.biBitCount <= 8) { /* read the palette */ colorcount = This->entry.bColorCount ? This->entry.bColorCount : 256; @@ -202,7 +202,7 @@ static HRESULT IcoFrameDecode_ReadPixels(IcoFrameDecode *This) bitsSize = bitsStride * height; /* read the XOR data */ - switch (This->entry.wBitCount) + switch (bih.biBitCount) { case 1: { @@ -440,11 +440,11 @@ static HRESULT IcoFrameDecode_ReadPixels(IcoFrameDecode *This) break; } default: - FIXME("unsupported bitcount: %u\n", This->entry.wBitCount); + FIXME("unsupported bitcount: %u\n", bih.biBitCount); goto fail; } - if (This->entry.wBitCount < 32) + if (bih.biBitCount < 32) { /* set alpha data based on the AND mask */ UINT andBytesPerRow = (width+31)/32*4;

1 0

Vincent Povirk : ole32: Fix reads past the end of streams.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: dbf123ba0dccbe39cf44483eb122f74c9da23cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbf123ba0dccbe39cf44483eb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 6 11:36:41 2010 -0500 ole32: Fix reads past the end of streams. --- dlls/ole32/storage32.c | 46 +++++++++++++++++++++++++++----- dlls/ole32/tests/storage32.c | 59 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 9ac794e..bc1fb96 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3584,6 +3584,9 @@ HRESULT StorageImpl_ReadRawDirEntry(StorageImpl *This, ULONG index, BYTE *buffer buffer, &bytesRead); + if (bytesRead != RAW_DIRENTRY_SIZE) + return STG_E_READFAULT; + return hr; } @@ -3929,6 +3932,11 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( offset.u.LowPart += cbRead; } + else + { + resRead = STG_E_READFAULT; + break; + } } while (cbTotalRead.QuadPart < size.QuadPart); HeapFree(GetProcessHeap(),0,buffer); @@ -4027,6 +4035,11 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( offset.u.LowPart += cbRead; } + else + { + resRead = STG_E_READFAULT; + break; + } }while(cbTotalRead.QuadPart < size.QuadPart); HeapFree(GetProcessHeap(), 0, buffer); @@ -5810,6 +5823,7 @@ HRESULT BlockChainStream_ReadAt(BlockChainStream* This, ULONG bytesToReadInBuffer; ULONG blockIndex; BYTE* bufferWalker; + ULARGE_INTEGER stream_size; TRACE("(%p)-> %i %p %i %p\n",This, offset.u.LowPart, buffer, size, bytesRead); @@ -5818,13 +5832,17 @@ HRESULT BlockChainStream_ReadAt(BlockChainStream* This, */ blockIndex = BlockChainStream_GetSectorOfOffset(This, blockNoInSequence); - if (blockIndex == BLOCK_END_OF_CHAIN) - return STG_E_DOCFILECORRUPT; /* We failed to find the starting block */ + *bytesRead = 0; + + stream_size = BlockChainStream_GetSize(This); + if (stream_size.QuadPart > offset.QuadPart) + size = min(stream_size.QuadPart - offset.QuadPart, size); + else + return S_OK; /* * Start reading the buffer. */ - *bytesRead = 0; bufferWalker = buffer; while ( (size > 0) && (blockIndex != BLOCK_END_OF_CHAIN) ) @@ -5862,7 +5880,7 @@ HRESULT BlockChainStream_ReadAt(BlockChainStream* This, break; } - return (size == 0) ? S_OK : STG_E_READFAULT; + return S_OK; } /****************************************************************************** @@ -6295,6 +6313,9 @@ static HRESULT SmallBlockChainStream_GetNextBlockInChain( &buffer, &bytesRead); + if (SUCCEEDED(res) && bytesRead != sizeof(DWORD)) + res = STG_E_READFAULT; + if (SUCCEEDED(res)) { StorageUtl_ReadDWord((BYTE *)&buffer, 0, nextBlockInChain); @@ -6386,7 +6407,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( /* * If we run out of space for the small block depot, enlarge it */ - if (SUCCEEDED(res)) + if (SUCCEEDED(res) && bytesRead == sizeof(DWORD)) { StorageUtl_ReadDWord((BYTE *)&buffer, 0, &nextBlockIndex); @@ -6482,12 +6503,21 @@ HRESULT SmallBlockChainStream_ReadAt( ULONG blockIndex; ULONG bytesReadFromBigBlockFile; BYTE* bufferWalker; + ULARGE_INTEGER stream_size; /* * This should never happen on a small block file. */ assert(offset.u.HighPart==0); + *bytesRead = 0; + + stream_size = SmallBlockChainStream_GetSize(This); + if (stream_size.QuadPart > offset.QuadPart) + size = min(stream_size.QuadPart - offset.QuadPart, size); + else + return S_OK; + /* * Find the first block in the stream that contains part of the buffer. */ @@ -6504,7 +6534,6 @@ HRESULT SmallBlockChainStream_ReadAt( /* * Start reading the buffer. */ - *bytesRead = 0; bufferWalker = buffer; while ( (size > 0) && (blockIndex != BLOCK_END_OF_CHAIN) ) @@ -6538,6 +6567,9 @@ HRESULT SmallBlockChainStream_ReadAt( if (FAILED(rc)) return rc; + if (!bytesReadFromBigBlockFile) + return STG_E_DOCFILECORRUPT; + /* * Step to the next big block. */ @@ -6551,7 +6583,7 @@ HRESULT SmallBlockChainStream_ReadAt( offsetInBlock = (offsetInBlock + bytesReadFromBigBlockFile) % This->parentStorage->smallBlockSize; } - return (size == 0) ? S_OK : STG_E_READFAULT; + return S_OK; } /****************************************************************************** diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 8fa1afd..9bd8f33 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -315,6 +315,55 @@ static void test_storage_stream(void) r = IStream_Commit(stm, STGC_DEFAULT ); ok(r==S_OK, "failed to commit stream\n"); + /* Read past the end of the stream. */ + pos.QuadPart = 3; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p ); + ok(r==S_OK, "failed to seek stream\n"); + ok(p.QuadPart == 3, "at wrong place\n"); + r = IStream_Read(stm, buffer, sizeof buffer, &count ); + ok(r==S_OK, "failed to read\n"); + ok(count == 3, "read bytes past end of stream\n"); + pos.QuadPart = 10; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p ); + ok(r==S_OK, "failed to seek stream\n"); + ok(p.QuadPart == 10, "at wrong place\n"); + r = IStream_Read(stm, buffer, sizeof buffer, &count ); + ok(r==S_OK, "failed to read\n"); + ok(count == 0, "read bytes past end of stream\n"); + pos.QuadPart = 10000; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p ); + ok(r==S_OK, "failed to seek stream\n"); + ok(p.QuadPart == 10000, "at wrong place\n"); + r = IStream_Read(stm, buffer, sizeof buffer, &count ); + ok(r==S_OK, "failed to read\n"); + ok(count == 0, "read bytes past end of stream\n"); + + /* Convert to a big block stream, and read past the end. */ + p.QuadPart = 5000; + r = IStream_SetSize(stm,p); + ok(r==S_OK, "failed to set pos\n"); + pos.QuadPart = 4997; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p ); + ok(r==S_OK, "failed to seek stream\n"); + ok(p.QuadPart == 4997, "at wrong place\n"); + r = IStream_Read(stm, buffer, sizeof buffer, &count ); + ok(r==S_OK, "failed to read\n"); + ok(count == 3, "read bytes past end of stream\n"); + pos.QuadPart = 5001; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p ); + ok(r==S_OK, "failed to seek stream\n"); + ok(p.QuadPart == 5001, "at wrong place\n"); + r = IStream_Read(stm, buffer, sizeof buffer, &count ); + ok(r==S_OK, "failed to read\n"); + ok(count == 0, "read bytes past end of stream\n"); + pos.QuadPart = 10000; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p ); + ok(r==S_OK, "failed to seek stream\n"); + ok(p.QuadPart == 10000, "at wrong place\n"); + r = IStream_Read(stm, buffer, sizeof buffer, &count ); + ok(r==S_OK, "failed to read\n"); + ok(count == 0, "read bytes past end of stream\n"); + /* seek round a bit, reset the stream size */ pos.QuadPart = 0; r = IStream_Seek(stm, pos, 3, &p ); @@ -329,6 +378,16 @@ static void test_storage_stream(void) r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p ); ok(r==S_OK, "failed to seek stream\n"); ok(p.QuadPart == 10, "at wrong place\n"); + r = IStream_Read(stm, buffer, sizeof buffer, &count ); + ok(r==S_OK, "failed to set pos\n"); + ok(count == 0, "read bytes from empty stream\n"); + pos.QuadPart = 10000; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p ); + ok(r==S_OK, "failed to seek stream\n"); + ok(p.QuadPart == 10000, "at wrong place\n"); + r = IStream_Read(stm, buffer, sizeof buffer, &count ); + ok(r==S_OK, "failed to set pos\n"); + ok(count == 0, "read bytes from empty stream\n"); pos.QuadPart = 0; r = IStream_Seek(stm, pos, STREAM_SEEK_END, &p ); ok(r==S_OK, "failed to seek stream\n");

1 0

Vincent Povirk : ole32: Use the cached information in BlockChainStream_GetCount.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: 4ad114cfaef87c885231021272ac548766d4393b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad114cfaef87c88523102127… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 6 11:35:56 2010 -0500 ole32: Use the cached information in BlockChainStream_GetCount. --- dlls/ole32/storage32.c | 20 +------------------- 1 files changed, 1 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8bae897..9ac794e 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5786,28 +5786,10 @@ static ULONG BlockChainStream_GetHeadOfChain(BlockChainStream* This) * * Returns the number of blocks that comprises this chain. * This is not the size of the stream as the last block may not be full! - * - * FIXME: Use the cache to get this information. */ static ULONG BlockChainStream_GetCount(BlockChainStream* This) { - ULONG blockIndex; - ULONG count = 0; - - blockIndex = BlockChainStream_GetHeadOfChain(This); - - while (blockIndex != BLOCK_END_OF_CHAIN) - { - count++; - - if(FAILED(StorageImpl_GetNextBlockInChain( - This->parentStorage, - blockIndex, - &blockIndex))) - return 0; - } - - return count; + return This->numBlocks; } /******************************************************************************

1 0

Alexandre Julliard : shell32: Fix marshalling of 1-bpp systray icons.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: 96a939eee1617039949b249b697b9e9f8fd1a160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a939eee1617039949b249b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 12:45:55 2010 +0200 shell32: Fix marshalling of 1-bpp systray icons. --- dlls/shell32/systray.c | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index 3e0b5ac..59df2f8 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -163,43 +163,54 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) BITMAP bmMask; BITMAP bmColour; LONG cbMaskBits; - LONG cbColourBits; + LONG cbColourBits = 0; char *buffer; if (!GetIconInfo(nid->hIcon, &iconinfo)) goto noicon; if (!GetObjectW(iconinfo.hbmMask, sizeof(bmMask), &bmMask) || - !GetObjectW(iconinfo.hbmColor, sizeof(bmColour), &bmColour)) + (iconinfo.hbmColor && !GetObjectW(iconinfo.hbmColor, sizeof(bmColour), &bmColour))) { DeleteObject(iconinfo.hbmMask); - DeleteObject(iconinfo.hbmColor); + if (iconinfo.hbmColor) DeleteObject(iconinfo.hbmColor); goto noicon; } cbMaskBits = (bmMask.bmPlanes * bmMask.bmWidth * bmMask.bmHeight * bmMask.bmBitsPixel + 15) / 16 * 2; - cbColourBits = (bmColour.bmPlanes * bmColour.bmWidth * bmColour.bmHeight * bmColour.bmBitsPixel + 15) / 16 * 2; + if (iconinfo.hbmColor) + cbColourBits = (bmColour.bmPlanes * bmColour.bmWidth * bmColour.bmHeight * bmColour.bmBitsPixel + 15) / 16 * 2; cds.cbData = sizeof(*data) + cbMaskBits + cbColourBits; buffer = HeapAlloc(GetProcessHeap(), 0, cds.cbData); if (!buffer) { DeleteObject(iconinfo.hbmMask); - DeleteObject(iconinfo.hbmColor); + if (iconinfo.hbmColor) DeleteObject(iconinfo.hbmColor); return FALSE; } data = (struct notify_data *)buffer; memset( data, 0, sizeof(*data) ); - data->width = bmColour.bmWidth; - data->height = bmColour.bmHeight; - data->planes = bmColour.bmPlanes; - data->bpp = bmColour.bmBitsPixel; buffer += sizeof(*data); GetBitmapBits(iconinfo.hbmMask, cbMaskBits, buffer); - buffer += cbMaskBits; - GetBitmapBits(iconinfo.hbmColor, cbColourBits, buffer); + if (!iconinfo.hbmColor) + { + data->width = bmMask.bmWidth; + data->height = bmMask.bmHeight / 2; + data->planes = 1; + data->bpp = 1; + } + else + { + data->width = bmColour.bmWidth; + data->height = bmColour.bmHeight; + data->planes = bmColour.bmPlanes; + data->bpp = bmColour.bmBitsPixel; + buffer += cbMaskBits; + GetBitmapBits(iconinfo.hbmColor, cbColourBits, buffer); + DeleteObject(iconinfo.hbmColor); + } DeleteObject(iconinfo.hbmMask); - DeleteObject(iconinfo.hbmColor); } noicon:

1 0

Alexandre Julliard : user32: Make DrawIcon simply call DrawIconEx.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: 159145cefe10d5a75a5d80c3115e6923c0b43344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=159145cefe10d5a75a5d80c31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 12:45:39 2010 +0200 user32: Make DrawIcon simply call DrawIconEx. --- dlls/user32/cursoricon.c | 83 +--------------------------------------------- 1 files changed, 1 insertions(+), 82 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index bafe4a7..856d900 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1656,88 +1656,7 @@ static void premultiply_alpha_channel( unsigned char *destBitmap, */ BOOL WINAPI DrawIcon( HDC hdc, INT x, INT y, HICON hIcon ) { - CURSORICONINFO *ptr; - HDC hMemDC; - HBITMAP hXorBits = NULL, hAndBits = NULL, hBitTemp = NULL; - COLORREF oldFg, oldBg; - unsigned char *xorBitmapBits; - unsigned int dibLength; - - TRACE("%p, (%d,%d), %p\n", hdc, x, y, hIcon); - - if (!(ptr = get_icon_ptr( hIcon ))) return FALSE; - if (!(hMemDC = CreateCompatibleDC( hdc ))) - { - release_icon_ptr( hIcon, ptr ); - return FALSE; - } - - dibLength = ptr->nHeight * get_bitmap_width_bytes( - ptr->nWidth, ptr->bBitsPerPixel); - - xorBitmapBits = (unsigned char *)(ptr + 1) + ptr->nHeight * - get_bitmap_width_bytes(ptr->nWidth, 1); - - oldFg = SetTextColor( hdc, RGB(0,0,0) ); - oldBg = SetBkColor( hdc, RGB(255,255,255) ); - - if(bitmap_has_alpha_channel(ptr->bBitsPerPixel, xorBitmapBits, dibLength)) - { - BITMAPINFOHEADER bmih; - unsigned char *dibBits; - - memset(&bmih, 0, sizeof(BITMAPINFOHEADER)); - bmih.biSize = sizeof(BITMAPINFOHEADER); - bmih.biWidth = ptr->nWidth; - bmih.biHeight = -ptr->nHeight; - bmih.biPlanes = ptr->bPlanes; - bmih.biBitCount = 32; - bmih.biCompression = BI_RGB; - - hXorBits = CreateDIBSection(hdc, (BITMAPINFO*)&bmih, DIB_RGB_COLORS, - (void*)&dibBits, NULL, 0); - - if (hXorBits && dibBits) - { - BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; - - /* Do the alpha blending render */ - premultiply_alpha_channel(dibBits, xorBitmapBits, dibLength); - hBitTemp = SelectObject( hMemDC, hXorBits ); - /* Destination width/height has to be "System Large" size */ - GdiAlphaBlend(hdc, x, y, GetSystemMetrics(SM_CXICON), - GetSystemMetrics(SM_CYICON), hMemDC, - 0, 0, ptr->nWidth, ptr->nHeight, pixelblend); - SelectObject( hMemDC, hBitTemp ); - } - } - else - { - hAndBits = CreateBitmap( ptr->nWidth, ptr->nHeight, 1, 1, ptr + 1 ); - hXorBits = CreateBitmap( ptr->nWidth, ptr->nHeight, ptr->bPlanes, - ptr->bBitsPerPixel, xorBitmapBits); - - if (hXorBits && hAndBits) - { - hBitTemp = SelectObject( hMemDC, hAndBits ); - StretchBlt( hdc, x, y, GetSystemMetrics(SM_CXICON), - GetSystemMetrics(SM_CYICON), hMemDC, 0, 0, - ptr->nWidth, ptr->nHeight, SRCAND ); - SelectObject( hMemDC, hXorBits ); - StretchBlt( hdc, x, y, GetSystemMetrics(SM_CXICON), - GetSystemMetrics(SM_CYICON), hMemDC, 0, 0, - ptr->nWidth, ptr->nHeight, SRCINVERT ); - SelectObject( hMemDC, hBitTemp ); - } - } - - DeleteDC( hMemDC ); - if (hXorBits) DeleteObject( hXorBits ); - if (hAndBits) DeleteObject( hAndBits ); - release_icon_ptr( hIcon, ptr ); - SetTextColor( hdc, oldFg ); - SetBkColor( hdc, oldBg ); - return TRUE; + return DrawIconEx( hdc, x, y, hIcon, 0, 0, 0, 0, DI_NORMAL | DI_COMPAT | DI_DEFAULTSIZE ); } /***********************************************************************

1 0

Alexandre Julliard : user32: Use the correct rop when blitting an icon in DrawIconEx.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: 4c03fd013812dcc499b83e8b34c074f36acf801b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c03fd013812dcc499b83e8b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 12:41:40 2010 +0200 user32: Use the correct rop when blitting an icon in DrawIconEx. --- dlls/user32/cursoricon.c | 8 ++++---- dlls/user32/tests/cursoricon.c | 9 +++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index f4bdcdb..bafe4a7 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2275,8 +2275,7 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, oldFg = SetTextColor( hdc, RGB(0,0,0) ); oldBg = SetBkColor( hdc, RGB(255,255,255) ); - if (((flags & DI_MASK) && !(flags & DI_IMAGE)) || - ((flags & DI_MASK) && !has_alpha)) + if ((flags & DI_MASK) && !has_alpha) { hAndBits = CreateBitmap ( ptr->nWidth, ptr->nHeight, 1, 1, ptr + 1 ); if (hAndBits) @@ -2341,13 +2340,14 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, } else { + DWORD rop = (flags & DI_MASK) ? SRCINVERT : SRCCOPY; hBitTemp = SelectObject( hMemDC, hXorBits ); if (DoOffscreen) StretchBlt (hDC_off, 0, 0, cxWidth, cyWidth, - hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, SRCPAINT); + hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, rop); else StretchBlt (hdc, x0, y0, cxWidth, cyWidth, - hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, SRCPAINT); + hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, rop); SelectObject( hMemDC, hBitTemp ); } diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 2a4100e..21e0dca 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1190,15 +1190,12 @@ static void test_DrawIconEx(void) check_DrawIconEx(hdcDst, FALSE, 0x80A0B0C0, 32, DI_MASK, 0x00FFFFFF, 0x00000000, 0x00000000, __LINE__); check_DrawIconEx(hdcDst, TRUE, 0x80A0B0C0, 32, DI_MASK, 0x00FFFFFF, 0x00FFFFFF, 0x00FFFFFF, __LINE__); - todo_wine - { - check_DrawIconEx(hdcDst, FALSE, 0x00A0B0C0, 32, DI_IMAGE, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); - check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, DI_IMAGE, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); - } + check_DrawIconEx(hdcDst, FALSE, 0x00A0B0C0, 32, DI_IMAGE, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); + check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, DI_IMAGE, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); /* Test normal drawing */ check_DrawIconEx(hdcDst, FALSE, 0x00A0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); - todo_wine check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x003F4F5F, 0x003F4F5F, __LINE__); + check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x003F4F5F, 0x003F4F5F, __LINE__); check_DrawIconEx(hdcDst, FALSE, 0xFFA0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); /* Test alpha blending */

1 0

Alexandre Julliard : user32: Fix drawing of 1-bpp icons in DrawIconEx.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: a59d79c9a6ce3b9cd1acb88617a4e33af2118b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59d79c9a6ce3b9cd1acb8861… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 12:08:29 2010 +0200 user32: Fix drawing of 1-bpp icons in DrawIconEx. --- dlls/user32/cursoricon.c | 43 +++++++++++++++++++++++++++---------------- 1 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 60ff29f..f4bdcdb 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2294,28 +2294,40 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, if (flags & DI_IMAGE) { - BITMAPINFOHEADER bmih; - unsigned char *dibBits; - - memset(&bmih, 0, sizeof(BITMAPINFOHEADER)); - bmih.biSize = sizeof(BITMAPINFOHEADER); - bmih.biWidth = ptr->nWidth; - bmih.biHeight = -ptr->nHeight; - bmih.biPlanes = ptr->bPlanes; - bmih.biBitCount = ptr->bBitsPerPixel; - bmih.biCompression = BI_RGB; - - hXorBits = CreateDIBSection(hdc, (BITMAPINFO*)&bmih, DIB_RGB_COLORS, - (void*)&dibBits, NULL, 0); + if (ptr->bPlanes * ptr->bBitsPerPixel == 1) + { + hXorBits = CreateBitmap( ptr->nWidth, ptr->nHeight, 1, 1, xorBitmapBits ); + } + else + { + unsigned char *dibBits; + BITMAPINFO *bmi = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi->bmiHeader.biWidth = ptr->nWidth; + bmi->bmiHeader.biHeight = -ptr->nHeight; + bmi->bmiHeader.biPlanes = ptr->bPlanes; + bmi->bmiHeader.biBitCount = ptr->bBitsPerPixel; + bmi->bmiHeader.biCompression = BI_RGB; + /* FIXME: color table */ + + hXorBits = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, (void*)&dibBits, NULL, 0); + if (hXorBits) + { + if(has_alpha) + premultiply_alpha_channel(dibBits, xorBitmapBits, xorLength); + else + memcpy(dibBits, xorBitmapBits, xorLength); + } + } - if (hXorBits && dibBits) + if (hXorBits) { if(has_alpha) { BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; /* Do the alpha blending render */ - premultiply_alpha_channel(dibBits, xorBitmapBits, xorLength); hBitTemp = SelectObject( hMemDC, hXorBits ); if (DoOffscreen) @@ -2329,7 +2341,6 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, } else { - memcpy(dibBits, xorBitmapBits, xorLength); hBitTemp = SelectObject( hMemDC, hXorBits ); if (DoOffscreen) StretchBlt (hDC_off, 0, 0, cxWidth, cyWidth,

1 0

Alexandre Julliard : user32: Return the icon depth instead of number of colors when loading from a . ico file.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: 2e96abd0d432ae1374a4e268e3655df9e01822ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e96abd0d432ae1374a4e268e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 11:34:17 2010 +0200 user32: Return the icon depth instead of number of colors when loading from a .ico file. --- dlls/user32/cursoricon.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 27d3040..60ff29f 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -677,13 +677,16 @@ static BOOL CURSORICON_GetFileEntry( LPVOID dir, int n, { CURSORICONFILEDIR *filedir = dir; CURSORICONFILEDIRENTRY *entry; + BITMAPINFOHEADER *info; if ( filedir->idCount <= n ) return FALSE; entry = &filedir->idEntries[n]; + /* FIXME: check against file size */ + info = (BITMAPINFOHEADER *)((char *)dir + entry->dwDIBOffset); *width = entry->bWidth; *height = entry->bHeight; - *bits = entry->bColorCount; + *bits = info->biBitCount; return TRUE; }

1 0

Alexandre Julliard : wine.inf: Copy l_intl.nls to the system32 directory.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: 5978e4f0968116d0aef0411f21d6f7773dcbbc5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5978e4f0968116d0aef0411f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 21:04:03 2010 +0200 wine.inf: Copy l_intl.nls to the system32 directory. --- tools/wine.inf.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 998ec7e..a8b3e6b 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -30,6 +30,7 @@ signature="$CHICAGO$" RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni +CopyFiles=(a)l_intl.nls AddReg=\ Classes,\ ContentIndex,\ @@ -55,6 +56,7 @@ AddReg=\ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni +CopyFiles=(a)l_intl.nls AddReg=\ Classes,\ ContentIndex,\ @@ -81,6 +83,7 @@ AddReg=\ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDlls UpdateInis=SystemIni +CopyFiles=(a)l_intl.nls AddReg=\ Classes,\ ContentIndex,\ @@ -107,6 +110,7 @@ AddReg=\ [Wow64Install] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDllsWow64 +CopyFiles=(a)l_intl.nls AddReg=\ CurrentVersion,\ Debugger,\

1 0

Alexandre Julliard : configure: Create a symlink from l_intl. nls in the build tree, and install it.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: 321d3883bf07016cc14699da0bc4de3781fb8871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=321d3883bf07016cc14699da0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 20:51:53 2010 +0200 configure: Create a symlink from l_intl.nls in the build tree, and install it. --- configure | 3 +++ configure.ac | 1 + tools/Makefile.in | 8 +++++++- 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 52410fb..a178112 100755 --- a/configure +++ b/configure @@ -14220,6 +14220,8 @@ if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf" test "$srcdir" = "." || wine_fn_config_symlink fonts/tahomabd.ttf fi +ac_config_links="$ac_config_links tools/l_intl.nls:tools/l_intl.nls" +test "$srcdir" = "." || wine_fn_config_symlink tools/l_intl.nls ac_config_links="$ac_config_links wine:tools/winewrapper" wine_fn_config_symlink wine @@ -15538,6 +15540,7 @@ do "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; "fonts/tahoma.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahoma.ttf:fonts/tahoma.ttf" ;; "fonts/tahomabd.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahomabd.ttf:fonts/tahomabd.ttf" ;; + "tools/l_intl.nls") CONFIG_LINKS="$CONFIG_LINKS tools/l_intl.nls:tools/l_intl.nls" ;; "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;; "dlls/gdi32/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/enhmfdrv" ;; "dlls/gdi32/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/mfdrv" ;; diff --git a/configure.ac b/configure.ac index 227dee5..4224e37 100644 --- a/configure.ac +++ b/configure.ac @@ -2170,6 +2170,7 @@ WINE_CONFIG_SYMLINK(fonts/marlett.ttf,,enable_fonts) WINE_CONFIG_SYMLINK(fonts/symbol.ttf,,enable_fonts) WINE_CONFIG_SYMLINK(fonts/tahoma.ttf,,enable_fonts) WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf,,enable_fonts) +WINE_CONFIG_SYMLINK(tools/l_intl.nls) WINE_CONFIG_SYMLINK(wine,tools/winewrapper) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv) diff --git a/tools/Makefile.in b/tools/Makefile.in index 39209f9..447ab62 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -70,6 +70,7 @@ wineapploader: wineapploader.in install install-lib:: wine.inf $(INSTALLDIRS) $(INSTALL_DATA) wine.inf $(DESTDIR)$(datadir)/wine/wine.inf + $(INSTALL_DATA) $(SRCDIR)/l_intl.nls $(DESTDIR)$(datadir)/wine/l_intl.nls $(INSTALL_DATA) $(SRCDIR)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop -$(UPDATE_DESKTOP_DATABASE) @@ -79,7 +80,12 @@ install install-dev:: $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) $(INSTALL_DATA) winemaker.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) uninstall:: - $(RM) $(DESTDIR)$(bindir)/winemaker $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(datadir)/wine/wine.inf $(DESTDIR)$(datadir)/applications/wine.desktop + $(RM) $(DESTDIR)$(datadir)/wine/wine.inf \ + $(DESTDIR)$(datadir)/wine/l_intl.nls \ + $(DESTDIR)$(datadir)/applications/wine.desktop \ + $(DESTDIR)$(bindir)/winemaker \ + $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) \ + $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) -$(UPDATE_DESKTOP_DATABASE) depend: makedep$(EXEEXT)

1 0

← Newer
1
...
71
72
73
74
75
76
77
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2010