Commit Graph

160 Commits

Author SHA1 Message Date
Mike McCormack d9598c383c comctl32: Remove some more Nx1 assumptions. 2006-10-31 11:46:54 +01:00
Mike McCormack b0499bf71b comctl32: Move code assuming Nx1 into ImageList_CreateImage. 2006-10-27 12:01:13 +02:00
Mike McCormack 11f4fb2dd5 comctl32: Create a point from index function and use it. 2006-10-25 12:14:36 +02:00
Michael Ploujnikov 1c16d83379 comctl32: Win64 printf format warning fixes. 2006-10-14 20:17:06 +02:00
Mikołaj Zalewski 89f537dd57 comctl32: imagelist: SetImageCount can be used to decrease image count (with testcase). 2006-09-21 17:41:05 +02:00
Oleg Krylov 496d634735 comctl32: Fix ImageList_Replace function to correctly apply image mask. 2006-08-18 11:34:21 +02:00
Jonathan Ernst 360a3f9142 Update the address of the Free Software Foundation. 2006-05-23 14:11:13 +02:00
Mike Hearn 1740fe0fe6 comctl32: Add OOM codepath in imagelist control. 2006-04-07 20:04:19 +02:00
Markus Amsler 996e594240 Reformat "see" section, to match c2man requirements. 2005-11-14 11:20:10 +00:00
Frank Richter 9e57091ffa Fix warnings in 64bit. 2005-08-30 10:07:17 +00:00
Robert Shearman ec167634f9 Handle CopyImage and other functions failing by not adding the icon
and notifying the caller.
2005-07-14 10:15:59 +00:00
Francois Gouget f5c9da6860 Assorted spelling fixes. 2005-05-06 15:44:31 +00:00
Dimitrie O. Paun 8df71a6cfa Use {Alloc,ReAlloc,Free}() instead of Heap{Alloc,ReAlloc,Free}(). 2005-03-25 20:49:00 +00:00
Huw Davies b675c1a92e The depth of the colour bitmap needs to match that of the screen. 2005-03-24 15:07:40 +00:00
Michael Stefaniuc 443f9273b1 - ImageList_LoadImage{A,W} were basicaly a cut'n'paste of each
other. Removed the A variant and did a A->W translation.
- ImageList_LoadImageW: get the bitmap size from the image itself and
  not from the mask (ImageList_LoadImageA did that).
2005-02-24 12:46:57 +00:00
Mike McCormack 07aa50bc48 Fix image list mask and blending. 2005-01-10 14:29:20 +00:00
James Hawkins 88aeb475c0 Fixed a few memory leaks. 2004-11-30 17:33:27 +00:00
Robert Shearman 684197178a Implement ImageList_SetColorTable. 2004-10-18 19:36:13 +00:00
Jon Griffiths ce0fbb5b28 ImageList_Merge should not fail if indices are bad.
Add tests for this case, a visible test mode and fix DrawIndirect test
under some native comctl32.dll's.
2004-10-07 17:34:56 +00:00
Francois Gouget 486d020c1b Don't define COBJMACROS in objbase.h.
Update the Wine sources accordingly.
2004-10-07 03:06:48 +00:00
Michael Stefaniuc fd306fb5d1 - native ImageList_Remove dosn't spit out an error message when
deleting an index out of range so don't do that either
- add 2 ImageList_Remove tests
2004-09-28 19:17:43 +00:00
Michael Stefaniuc 4cfe5286f9 - Fix hotspot handling
- Remove unused flag from the InternalDrag struct.
2004-08-22 01:59:29 +00:00
Jon Griffiths fb50426533 Make pattern brush data const. 2004-08-13 19:44:49 +00:00
Filip Navara 2d63dae1d9 Set the palette for image list DIBs that has 8 or less bits per
pixel.
2004-06-28 23:52:51 +00:00
Robert Shearman 57cc6f58ba Update common control function documentation. 2004-02-27 04:40:08 +00:00
Maxime Bellengé 820aa3762f Fix a regression in ImageList_Create when creating a dibsection. 2004-02-24 00:58:59 +00:00
Ulrich Czekalla 5a864b2f70 Use dibsections for the images. 2004-02-20 19:57:09 +00:00
Vincent Béron 7b11e537b0 Get rid of a W->A cross call in ImageList_LoadImageW. 2004-01-16 02:01:46 +00:00
Huw Davies 50c9ff030f Fix some weird logic in ImageList_Write. 2003-11-12 22:41:44 +00:00
Huw Davies 3ce815e7f3 Fix a fixme. 2003-11-04 04:22:07 +00:00
Dimitrie O. Paun 7de279a73a Rename COMCTL32_{Alloc,ReAlloc,Free} to {Alloc,ReAlloc,Free}. 2003-09-22 21:32:33 +00:00
Alexandre Julliard f5cb3dde17 Moved undocumented functions out of the exported commctrl.h. 2003-09-17 20:15:21 +00:00
Alexandre Julliard e37c6e18d0 Fixed header dependencies to be fully compatible with the Windows
headers (with help from Dimitrie O. Paun).
2003-09-05 23:08:26 +00:00
Mike Hearn b79fc16577 Avoid division by zero when the imagelist is created with a width of
zero (ie no images).
2003-08-29 22:10:25 +00:00
Filip Navara 1ccaaa1a82 Fixed prototypes of CreateStatusWindowA/W, ImageList_Copy,
ImageList_EndDrag, ImageList_SetImageCount.
2003-08-22 23:51:15 +00:00
Vitaliy Margolen e43edbd557 Rearrange members of HIMAGELIST to match Windows.
Reuse image and mask DCs.
2003-05-13 03:36:27 +00:00
Vitaliy Margolen 1420acef09 Fix ImageList_Read - the root cause of ugly toolbar icons. 2003-04-02 23:18:17 +00:00
Mike Hearn 22813d4634 Fix a typo. 2003-03-17 04:43:05 +00:00
Tony Lambregts e295d3996e Janitorial. Get rid of W->A call. 2003-03-06 22:43:43 +00:00
Alexandre Julliard b4a4c05aed Removed a few more #ifdef __WINE__. 2003-01-04 00:19:17 +00:00
Duane Clark 521aa7412d Validate imagelists with christmas magic. 2003-01-02 17:51:13 +00:00
Ove Kaaven 1f5315c80f Make sure that no files except unknwn.h include wine/obj_base.h
directly.
2002-12-05 20:33:07 +00:00
Dimitrie O. Paun 0fe326c499 Use DeleteDC instead of DeleteObject to free HDCs (spotted by Dietrich
Teickner <Dietrich_Teickner@t-online.de>).
Clear the imagelist structure on deletion, as some stupid apps free
imagelists multiple times.
2002-11-18 19:45:22 +00:00
Rolf Kalbermatter 91befd6902 Fix some NULL dereferencing. 2002-11-11 22:19:42 +00:00
Michael Stefaniuc 353529b2c8 - fix the "int format, HANDLE arg" type of warnings for comctl32
- compile the comctl32 dll with -DSTRICT
2002-10-23 22:19:10 +00:00
Michael Stefaniuc f3d1893f80 Add needed casts for a "no warnings" compile of comctl32. 2002-10-23 20:19:22 +00:00
Dimitrie O. Paun da9bac4d9e Add comment on what is known about the current state of the controls
relative to comctl32.dll version 6.0.
2002-10-16 18:57:14 +00:00
Dimitrie O. Paun 0bc4b56595 Do not merge image with garbage background. Based on a patch by Carlos
<clozano@andago.com>.
2002-10-15 02:15:09 +00:00
Dimitrie O. Paun 326021bd98 Small cleanups, updated documentation. 2002-09-24 18:26:42 +00:00
Dimitrie O. Paun 318817f723 - Rewrite the drawing code. It now is much smaller, easier to follow,
and faster. Moreover, it now supports the dwRop operation, and it is
  in good shape to support the missing features.
- Draw the dragged image semi-transparently (will work when we support
  alpha blending).
2002-09-12 00:51:09 +00:00
Dimitrie O. Paun d969605b87 - Complete support for rgb{Fg,Bk} in DrawIndirect.
- Rename VOID to void.
- Documentation cleanup.
- Fix ILD_TRANSPARENT handling.
2002-09-06 18:32:46 +00:00
Dimitrie O. Paun 4d1e49dc67 - Fix ImageList_GetIcon to use ImageList_* functions for
completeness.
- Tiny code cleanups.
- Documentation updates.
2002-09-04 23:31:48 +00:00
Dimitrie O. Paun 7ad3d12a52 - implement support for xBitmap and yBitmap in ImageList_DrawIndirect
- small code, docs, and messages cleanups
2002-09-04 18:44:46 +00:00
Mike McCormack 5a6a71f39e ImageList_SetImageCount should set nCurImage (the number of
images in the list) to the value specified, and expect that
ImageList_ReplaceImage is called to set the new images.
2002-08-16 01:35:43 +00:00
Patrik Stridvall 4325554aef Fixed some issues found by winapi_check. 2002-08-09 01:07:29 +00:00
Michael Stefaniuc 15fc23693f ImageList_Remove returns TRUE when removing all images of an empty
ImageList.
2002-07-22 20:38:41 +00:00
Vincent Béron 9a62491660 Removed trailing whitespace. 2002-05-31 23:06:46 +00:00
Sander van Leeuwen 9851f7a902 Match behaviour of ImageList_LoadImageA wrt cx parameter (when set to
zero).
2002-05-30 20:38:13 +00:00
Patrik Stridvall fc2be7edcc Fixed some issues found by winapi_check. 2002-04-29 18:48:56 +00:00
Alexandre Julliard 0799c1a780 Added LGPL standard comment, and copyright notices where necessary.
Global replacement of debugtools.h by wine/debug.h.
2002-03-09 23:29:33 +00:00
Dave Hawkes 770a5bfa2d Partially repair hotspot handling. 2002-02-26 00:33:51 +00:00
Charles Loep 02cbb360e8 Implemented ImageList_Write. 2002-01-29 17:12:20 +00:00
Huw D M Davies 1a65a7b88a Stubs for ImageList_[S|G]etFlags. 2002-01-15 20:28:05 +00:00
Michael Stefaniuc 00bd7998fb Fixed memory leak.
Removed redundant ImageList_DragShowNolock(FALSE) call.
2001-12-31 22:21:24 +00:00
Michael Stefaniuc 3bc5ffd3c6 Fixed/implemented the ImageList_*Drag* functions. 2001-12-19 18:47:14 +00:00
Michael Stefaniuc caf81dc0a6 Implemented ImageList_GetDragImage.
Fixed ImageList_SetDragCursorImage and ImageList_Merge.
No need for StretchBlt in ImageList_BeginDrag.
Added some traces.
2001-11-30 23:15:00 +00:00
Patrik Stridvall 3566973c78 Use the min/max in windef.h instead. 2001-09-10 23:09:04 +00:00
Patrik Stridvall 01d5e5b071 Documentation fixes. 2001-07-02 19:59:40 +00:00
Patrik Stridvall 6076729649 Documentation ordinal fixes. 2001-06-19 03:34:07 +00:00
Andreas Mohr 641405a550 Fixed off by one error in ImageList_DrawIndirect().
Fixed some missing NULL HIMAGELIST check (fixes Microsoft Works
startup).
2001-04-20 18:29:17 +00:00
James Juran f4d5fefb0a Add <string.h> to files that needed it. 2001-01-26 20:43:40 +00:00
Brian Teague 161bc83164 Add a stub for the CAPS1 capability in GetDeviceCaps.
Define the CAPS1 bit flags in wingdi.h
Make various calls to GetDeviceCaps in DLLS use #defined values.
2000-11-29 20:02:46 +00:00
Jason Mawdsley e7b84a9b54 Fixed some flickering that was occurring in the image list control
when it repainted.
2000-10-22 23:43:56 +00:00
Andreas Mohr 1563abe8ec - stupid spelling fixes
- some more loadorder array work
2000-10-13 20:26:52 +00:00
Alexandre Julliard 74af67ef42 Removed shell.h. Cleaned up the nested includes mess in wine/obj_*.h. 2000-09-26 00:00:55 +00:00
Andreas Mohr d31c1f6647 Replaced cCurImage by cMaxImage. 2000-08-26 20:28:17 +00:00
Alexandre Julliard 70c9e095ef Removed all non-standard common control headers from the include
directory.
2000-08-09 00:41:17 +00:00
Gerard Patel 19cef6ca10 Allow the size of bitmaps to be changed after toolbar buttons have
been added.
2000-07-08 12:48:37 +00:00
Aric Stewart 031793e7f9 Remove the background from the new image when it is being replaced
with a ReplaceImage.
2000-05-11 21:39:45 +00:00
Patrik Stridvall 2d6457c11a Added/fixed some documentation reported by winapi_check. 2000-03-28 20:22:59 +00:00
Serge Ivanov a39cbbc0eb In function IMAGELIST_InternalDrawMask we have to mask out overlay mask in
fStyle. Otherwise comparison fStyle == ILD_NORMAL will not work, which leads
to improper display of overlay images.
2000-02-25 20:47:26 +00:00
Marcus Meissner bd26e4d2cf Height calculation was 1 off in ImageList_Read. 2000-02-07 16:00:33 +00:00
Marcus Meissner 9c978ab18e Overlay indices are signed shorts (-1 means no overlay)
(ImageList_SetOverlayIndex) should accept -1 as overlayindex.
(ImageList_Read) We can read a NxM bitmap from the stream and have
to convert it into a 1x(M*N) bitmap, set cCurImage,cMaxImage. Added
documentation.
(others) removed some potential operator precendence problems.
2000-01-30 22:21:22 +00:00
Marcus Meissner d40170d20c Implemented ImageList_Read (not 100% correct in regarding to setting
the bitmap).
Filled out unknown members of ILHEAD.
Started reordering IMAGELIST to make it Windows binary compatible.
2000-01-29 21:00:25 +00:00
Eric Kohl 69a93593b0 - first 'dummy' implementation of ImageList_Read 1999-11-23 23:40:01 +00:00
Stephane Lussier 251147741c Allow creation of empty imagelist. 1999-09-22 15:15:57 +00:00
Stephane Lussier 274925980d In ImageList_Draw when drawing the bitmap with the transparent flag
set, background color/foreground color should be set to white/black,
when doing bitblt operation with the bitmap mask.
1999-09-19 14:14:24 +00:00
Pierre Mageau 4ac8db783d Changed CopyImage to accept desiredX, desiredY and LR_COPYFROMRESOURCE.
CURSORICON_FindBestIcon changed to find the correct icon.
ImageList_ReplaceIcon now calls CopyImage internally.
Assign a value for the hIconSm CLASS member (using CopyImage).
1999-09-04 11:16:48 +00:00
Pierre Mageau 6231a174c6 Fixed various problem with ImageList_Draw. 1999-07-24 10:20:06 +00:00
Luc Tourangeau 296def268a GetIcon bug fix. 1999-07-18 13:25:31 +00:00
Francois Boisvert 0e6f0618f5 Modified ImageList_LoadImageA to check the case where cx is set to zero. 1999-06-22 19:02:07 +00:00
Alexandre Julliard a099a555c3 Converted to the new debug interface, using script written by Patrik
Stridvall.
1999-06-12 15:45:58 +00:00
Patrik Stridvall 9e61c1cc9b Changed xxx(VOID) to xxx(void). 1999-06-12 08:27:49 +00:00
Luc Tourangeau 103a2ea356 ImageList_GetIcon bug fix. 1999-06-12 06:40:00 +00:00
Patrik Stridvall b4b9fae671 New debug scheme with explicit debug channels declaration. 1999-04-19 14:56:29 +00:00
Francis Beaudet 64307f3cea Fixed small ==, != mixup. 1999-04-01 10:11:23 +00:00
Pascal Lessard 60935ec3e9 Change the AddBitmap function. Implement flat toolbar. Change
CreateToolbarEx. Implement partially the hot buttons for toolbar.
1999-03-25 16:42:27 +00:00
Sylvain St.Germain 02300aeaa5 Fixed some graphical problems of the treeview and added support LMB
click on +/- sign to open and close.
Fixed a bug in imagelist where the last image could not be displayed.
1999-03-16 10:38:44 +00:00
Alexandre Julliard a396029270 Large-scale renaming of all Win32 functions and types to use the
standard Windows names.
1999-02-26 11:11:13 +00:00
Marcus Meissner 317af320cf Optimized include/*.h: (recursively) include all headers needed by
this .h file, but only those. Necessary fixes to a lot of .c files,
started optimizing "windows.h" away from some of them. Moved
GetCurrentTask prototype to wine/winbase16.h.
1999-02-17 13:51:06 +00:00