Release 980726
Sat Jul 25 19:45:45 1998 Juergen Schmied <juergen.schmied@metronet.de>
* [include/shlobj.h][misc/shell.c][misc/shellord.c][ole/folders.c]
[shell32.spec]
Added SHFILEOPSTRUCT32[A|W] and constants, prototypes.
Implemented SHGetSpecialFolderLocation, SHGetPathFromIDList32[A].
Many IShellFolder, pidl, shell -related changes.
SHChangeNotifyRegister, SHChangeNotifyDeregister,
SHShellFolderView_Message, SHMapPIDLToSystemImageListIndex,
SHAddToRecentDocs32, SHFileOperation, SHChangeNotify,
SHCreateShellFolderViewEx stubs.
Sat Jul 25 17:16:25 1998 Huw D M Davies <daviesh@abacus.physics.ox.ac.uk>
* [files/profile.c]
Fix return value of PROFILE_GetSection().
Fri Jul 24 22:45:19 1998 Ove Kaaven <ovek@isflak.arcticnet.no>
* [controls/edit.c]
Killed the modified flag on WM_SETTEXT. Eudora should no longer
bother asking whether you want to save an unchanged message.
Fri Jul 24 21:21:35 1998 Andreas Mohr <100.30936@germany.net>
* [controls/menu.c]
Fixed bug in GetMenuState32.
Doesn't fix Free Agent 32 :((
* [documentation/debugging]
Hints added.
* [files/dos_fs.c] [include/msdos.h] [msdos/int21.c]
Enhanced DOS device support.
* [if1632/Makefile.in] [if1632/builtin.c] [if1632/rasapi16.spec]
[relay32/Makefile.in] [relay32/builtin32.c] [relay32/rasapi32.spec]
Added RASAPI16/32.DLL.
* [misc/aspi.c] [relay32/wnaspi32.spec]
Implemented GetASPI32SupportInfo.
* [multimedia/mmsystem.c]
Implemented mmTaskCreate.
Fri Jul 24 20:55:31 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [controls/toolbar.c]
Fixed some bugs and added new features.
* [controls/tooltips.c][include/tooltips.h]
Added more messages and started display code.
* [misc/shell.c][misc/shellord.c][relay32/shell.spec]
Fixed StrToOleStrN (SHELL32_79) and added OleStrToStrN (SHELL32_78).
Added some new stubs.
* [objects/cursoricon.c][misc/imagelist.c][include/windows.h]
Fixed GetIconInfo and removed the GetIconInfo hack from the
image list code.
* [controls/pager.c][include/pager.h][controls/treeview.c]
[include/treeview.h]
Added some messages.
* [misc/tweak.c][winows/nonclient.c][documentation/win95look]
Removed unused tweak variables.
* [documentation/common_controls]
Updated.
Fri Jul 24 18:36:32 1998 James Moody <013263m@dragon.acadiau.ca>
* [objects/font.c]
Fixed a bug in GetTextFace.
Fri Jul 24 17:09:33 1998 Marcus Meissner <marcus@jet.franken.de>
* [misc/commdlg.c]
Fixed stacksmashing bug due to invalid specified function
pointers.
* [files/dos_fs.c]
Small change in case handling... be able to create files with
uppercase in them (like Program Files/).
* [graphics/ddraw.c]
XF86DGA support made threadsafe, added more Xlib dependent stuff
(create Window using CreateWindow(), draw into it). xlib support
is not satisfying.
* [scheduler/critsection.c]
Don't recurse on HeapLock with semaphore id 0.
* [win32/user32.c][windows/message.c][windows/event.c]
Moved win32 *Message functions where they belong.
Removed some potential races between XPending and XNextEvent by
a bit more locking.
Fri Jul 24 13:58:19 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [loader/pe_image.c] [loader/ne/segment.c]
Use bogus pointer value instead of NULL for unresolved externals.
* [memory/selector.c]
Clear saved_fs on selector free.
* [msdos/cdrom.c] [configure.in]
Added check for linux/ucdrom.h.
* [scheduler/client.c] [server/socket.c]
Fix for missing struct cmsghdr.
Attempt to support msg_accrights fd passing (completely untested).
* [windows/event.c]
Do not grab the pointer in SetCapture (Win32 behavior).
Tue Jul 21 22:28:13 1998 James Juran <jrj120@psu.edu>
* [Make.rules.in]
Changed $(MKDIR) macro to use -p option (make parent directories
if they don't already exist. This fixes an error in 'make install'
if /usr/local/include doesn't already exist.
Tue Jul 21 13:37:04 Rein Klazes <rklazes@casema.net>
* [include/heap.h]
Replaced macro SEGPTR_GET by inline function to avoid *lots*
of wrong use of this macro.
* [relay32/comdlg32.spec]
Corrected GetSaveFileNameW entry.
* [relay32/advapi32.spec] [win32/advapi.c]
[relay32/ole32.spec] [ ole/moniker.c]
Added stubs for SetFileSecurity[AW] and CreateFileMoniker32
* [graphics/x11drv/graphics.c]
Finished implementation of bezier drawing code.
Tue Jul 21 11:00:51 1998 Claus Fischer <cfischer@td2cad.intel.com>
* [files/drive.c]
Remove label trailing blanks in GetVolumeInformation32A.
* [documentation/cdrom-labels]
Added documentation on how to find out a CD-ROM label.
Sun Jul 19 23:16:41 1998 Pascal Cuoq <pcuoq@ens-lyon.fr>
* [include/windows.h]
Added some DM_* and DISP_CHANGE_* flags.
* [relay32/user32.spec] [windows/user.c]
Added stub for ChangeDisplaySettingA.
* [ole/ole2nls.c]
is_punctuation: reuse information from another table.
Sun Jul 19 22:04:46 1998 Douglas Ridgway <ridgway@winehq.com>
* [Make.rules.in]
Updated automatic documentation rules.
* [graphics/path.c] [misc/aspi.c] [misc/ntdll.c] [misc/winsock_dns.c]
[ole/ole2dsp.c] [relay32/user32.spec]
Comment format futzing to keep c2man happy.
* [documentation/README.documentation]
Updated description of automatic documentation.
Wed Jul 15 19:10:09 1998 Andrew M. Bishop <amb@gedanken.demon.co.uk>
* [files/profile.c]
Cache the 10 most recently used .ini files.
Tue May 20 19:20:23 1997 Pablo Saratxaga <srtxg@chanae.alphanet.ch>
* [misc/commdlg.c]
Makes PrintDlg32A() return TRUE even if it is an empty
stub, so most programs are happy and run anyway instead of
aborting at startup.
* [graphics/x11drv/xfont.c]
Increased the maximum font families as (X11) font aliases
eated up a lot of families causing wine to stop reading fonts.
diff --git a/misc/imagelist.c b/misc/imagelist.c
index 0514c0f..4c3125d 100644
--- a/misc/imagelist.c
+++ b/misc/imagelist.c
@@ -30,9 +30,7 @@
* an empty structure. It's just to keep compatibility.
*/
#define __WINE_IMAGELIST_C
-
-/* This must be defined until "GetIconInfo" is not fully implemented. */
-#define __GET_ICON_INFO_HACK__
+
#include "windows.h"
#include "compobj.h"
@@ -41,10 +39,6 @@
#include "commctrl.h"
#include "debug.h"
-#ifdef __GET_ICON_INFO_HACK__
-#include "bitmap.h"
-#endif
-
#define _MAX(a,b) (((a)>(b))?(a):(b))
#define _MIN(a,b) (((a)>(b))?(b):(a))
@@ -112,7 +106,7 @@
if (himl->hbmMask) {
hbmNewBitmap =
- CreateBitmap32 (nNewWidth, himl->cy, 1, himl->uBitsPixel, NULL);
+ CreateBitmap32 (nNewWidth, himl->cy, 1, 1, NULL);
if (hbmNewBitmap == 0)
ERR (imagelist, "creating new mask bitmap!");
@@ -438,7 +432,7 @@
hbmTempImage = CreateBitmap32 (himlSrc->cx, himlSrc->cy, 1,
himlSrc->uBitsPixel, NULL);
hbmTempMask = CreateBitmap32 (himlSrc->cx, himlSrc->cy, 1,
- himlSrc->uBitsPixel, NULL);
+ 1, NULL);
/* copy (and stretch) destination to temporary bitmaps.(save) */
/* image */
@@ -546,6 +540,8 @@
{0x5555, 0xAAAA, 0x5555, 0xAAAA, 0x5555, 0xAAAA, 0x5555, 0xAAAA,
0x5555, 0xAAAA, 0x5555, 0xAAAA, 0x5555, 0xAAAA, 0x5555, 0xAAAA};
+ TRACE (imagelist, "(%d %d 0x%x %d %d)\n", cx, cy, flags, cInitial, cGrow);
+
himl = (HIMAGELIST)LocalAlloc32 (LMEM_FIXED | LMEM_ZEROINIT,
sizeof(struct _IMAGELIST));
if (!himl)
@@ -579,7 +575,7 @@
if (himl->flags & ILC_MASK) {
himl->hbmMask = CreateBitmap32 (himl->cx * himl->cMaxImage, himl->cy,
- 1, himl->uBitsPixel, NULL);
+ 1, 1, NULL);
if (himl->hbmMask == 0) {
ERR(imagelist, "Error creating mask bitmap!\n");
if (himl->hbmImage)
@@ -1242,7 +1238,7 @@
ii.xHotspot = 0;
ii.yHotspot = 0;
ii.hbmMask = CreateBitmap32 (nWidth, nHeight, 1, 1, NULL);
- ii.hbmColor = CreateBitmap32 (nWidth, nHeight, 1, 1, NULL);
+ ii.hbmColor = CreateBitmap32 (nWidth, nHeight, 1, himl->uBitsPixel, NULL);
hdc = CreateCompatibleDC32(0);
@@ -1431,36 +1427,16 @@
ImageList_AddMasked (himl, (HBITMAP32)handle, clrMask);
}
else if ((uType == IMAGE_ICON) || (uType == IMAGE_CURSOR)) {
-#ifdef __GET_ICON_INFO_HACK__
- HBITMAP32 hbmImage;
- HBITMAP32 hbmMask;
- CURSORICONINFO *ptr;
-
- if (!(ptr = (CURSORICONINFO *)GlobalLock16(handle))) return (NULL);
- hbmMask = CreateBitmap32 (ptr->nWidth, ptr->nHeight, 1, 1,
- (char *)(ptr + 1));
- hbmImage = CreateBitmap32 (ptr->nWidth, ptr->nHeight, ptr->bPlanes,
- ptr->bBitsPerPixel,
- (char *)(ptr + 1) + ptr->nHeight *
- BITMAP_WIDTH_BYTES(ptr->nWidth, 1));
- GlobalUnlock16 (handle);
- himl = ImageList_Create (ptr->nWidth, ptr->nHeight,
- ILC_MASK | ILC_COLOR, 1, cGrow);
- ImageList_Add (himl, hbmImage, hbmMask);
- DeleteObject32 (hbmImage);
- DeleteObject32 (hbmMask);
-#else
- ICONINFO32 ii;
+ ICONINFO ii;
BITMAP32 bmp;
- GetIconInfo (hIcon, &ii);
- GetObject32A (ii->hbmColor, sizeof(BITMAP32), (LPVOID)&bmp);
+ GetIconInfo (handle, &ii);
+ GetObject32A (ii.hbmColor, sizeof(BITMAP32), (LPVOID)&bmp);
himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight,
ILC_MASK | ILC_COLOR, 1, cGrow);
- ImageList_Add (himl, ii->hbmColor, ii->hbmMask);
- DeleteObject32 (ii->hbmColor);
- DeleteObject32 (ii->hbmMask);
-#endif
+ ImageList_Add (himl, ii.hbmColor, ii.hbmMask);
+ DeleteObject32 (ii.hbmColor);
+ DeleteObject32 (ii.hbmMask);
}
DeleteObject32 (handle);
@@ -1515,36 +1491,16 @@
ImageList_AddMasked (himl, (HBITMAP32)handle, clrMask);
}
else if ((uType == IMAGE_ICON) || (uType == IMAGE_CURSOR)) {
-#ifdef __GET_ICON_INFO_HACK__
- HBITMAP32 hbmImage;
- HBITMAP32 hbmMask;
- CURSORICONINFO *ptr;
-
- if (!(ptr = (CURSORICONINFO *)GlobalLock16(handle))) return (NULL);
- hbmMask = CreateBitmap32 (ptr->nWidth, ptr->nHeight, 1, 1,
- (char *)(ptr + 1));
- hbmImage = CreateBitmap32 (ptr->nWidth, ptr->nHeight, ptr->bPlanes,
- ptr->bBitsPerPixel,
- (char *)(ptr + 1) + ptr->nHeight *
- BITMAP_WIDTH_BYTES(ptr->nWidth, 1));
- himl = ImageList_Create (ptr->nWidth, ptr->nHeight,
- ILC_MASK | ILC_COLOR, 1, cGrow);
- ImageList_Add (himl, hbmImage, hbmMask);
- DeleteObject32 (hbmImage);
- DeleteObject32 (hbmMask);
- GlobalUnlock16 (handle);
-#else
- ICONINFO32 ii;
+ ICONINFO ii;
BITMAP32 bmp;
- GetIconInfo (hIcon, &ii);
- GetObject32A (ii->hbmMask, sizeof(BITMAP32), (LPVOID)&bmp);
+ GetIconInfo (handle, &ii);
+ GetObject32A (ii.hbmMask, sizeof(BITMAP32), (LPVOID)&bmp);
himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight,
ILC_MASK | ILC_COLOR, 1, cGrow);
- ImageList_Add (himl, ii->hbmColor, ii->hbmMask);
- DeleteObject32 (ii->hbmColor);
- DeleteObject32 (ii->hbmMask);
-#endif
+ ImageList_Add (himl, ii.hbmColor, ii.hbmMask);
+ DeleteObject32 (ii.hbmColor);
+ DeleteObject32 (ii.hbmMask);
}
DeleteObject32 (handle);
@@ -1747,7 +1703,7 @@
DeleteObject32 (himl->hbmMask);
himl->hbmMask =
CreateBitmap32 (himl->cMaxImage * himl->cx, himl->cy,
- 1, himl->uBitsPixel, NULL);
+ 1, 1, NULL);
}
}
else {
@@ -1766,7 +1722,7 @@
CreateBitmap32 (cxNew, himl->cy, 1, himl->uBitsPixel, NULL);
if (himl->hbmMask)
- hbmNewMask = CreateBitmap32 (cxNew, himl->cy, 1, himl->uBitsPixel, NULL);
+ hbmNewMask = CreateBitmap32 (cxNew, himl->cy, 1, 1, NULL);
else
hbmNewMask = 0; /* Just to keep compiler happy! */
@@ -1907,36 +1863,21 @@
{
HDC32 hdcImageList, hdcImage;
INT32 nIndex;
-#ifdef __GET_ICON_INFO_HACK__
- HBITMAP32 hbmImage;
- HBITMAP32 hbmMask;
- CURSORICONINFO *ptr;
-#else
- ICONINFO32 ii;
+ HBITMAP32 hbmOldSrc, hbmOldDst;
+ ICONINFO ii;
BITMAP32 bmp;
-#endif
- TRACE (imagelist, "(0x%x 0x%x 0x%x)\n", himl, i, hIcon);
+ TRACE (imagelist, "(0x%lx 0x%x 0x%x)\n", (DWORD)himl, i, hIcon);
if (himl == NULL) return (-1);
if ((i >= himl->cCurImage) || (i < -1)) return (-1);
-#ifdef __GET_ICON_INFO_HACK__
- if (!(ptr = (CURSORICONINFO *)GlobalLock16(hIcon))) return (-1);
- hbmMask = CreateBitmap32 (ptr->nWidth, ptr->nHeight, 1, 1,
- (char *)(ptr + 1));
- if (!(hbmMask))
- ERR (imagelist, " no mask!\n");
- hbmImage = CreateBitmap32 (ptr->nWidth, ptr->nHeight, ptr->bPlanes,
- ptr->bBitsPerPixel,
- (char *)(ptr + 1) + ptr->nHeight *
- BITMAP_WIDTH_BYTES(ptr->nWidth, 1));
- if (!(hbmMask))
- ERR (imagelist, " no image!\n");
-#else
GetIconInfo (hIcon, &ii);
- GetObject32A (ii->hbmMask, sizeof(BITMAP32), (LPVOID)&bmp);
-#endif
+ if (ii.hbmMask == 0)
+ ERR (imagelist, "no mask!\n");
+ if (ii.hbmColor == 0)
+ ERR (imagelist, "no color!\n");
+ GetObject32A (ii.hbmMask, sizeof(BITMAP32), (LPVOID)&bmp);
if (i == -1) {
if (himl->cCurImage + 1 >= himl->cMaxImage)
@@ -1949,42 +1890,42 @@
nIndex = i;
hdcImageList = CreateCompatibleDC32 (0);
- hdcImage = CreateCompatibleDC32 (0);
+ TRACE (imagelist, "hdcImageList=0x%x!\n", hdcImageList);
+ if (hdcImageList == 0)
+ ERR (imagelist, "invalid hdcImageList!\n");
-#ifdef __GET_ICON_INFO_HACK__
- SelectObject32 (hdcImageList, himl->hbmImage);
- SelectObject32 (hdcImage, hbmImage);
- StretchBlt32 (hdcImageList, nIndex * himl->cx, 0, himl->cx, himl->cy,
- hdcImage, 0, 0, ptr->nWidth, ptr->nHeight, SRCCOPY);
-#else
- SelectObject32 (hdcImage, ii->hbmColor);
+ hdcImage = CreateCompatibleDC32 (0);
+ TRACE (imagelist, "hdcImage=0x%x!\n", hdcImage);
+ if (hdcImage == 0)
+ ERR (imagelist, "invalid hdcImage!\n");
+
+ hbmOldDst = SelectObject32 (hdcImageList, himl->hbmImage);
+ SetTextColor32( hdcImageList, RGB(0,0,0));
+ SetBkColor32( hdcImageList, RGB(255,255,255));
+ hbmOldSrc = SelectObject32 (hdcImage, ii.hbmColor);
StretchBlt32 (hdcImageList, nIndex * himl->cx, 0, himl->cx, himl->cy,
hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY);
-#endif
if (himl->hbmMask) {
-#ifdef __GET_ICON_INFO_HACK__
SelectObject32 (hdcImageList, himl->hbmMask);
- SelectObject32 (hdcImage, hbmMask);
- StretchBlt32 (hdcImageList, nIndex * himl->cx, 0, himl->cx, himl->cy,
- hdcImage, 0, 0, ptr->nWidth, ptr->nHeight, SRCCOPY);
-#else
- SelectObject32 (hdcImage, ii->hbmMask);
+ SelectObject32 (hdcImage, ii.hbmMask);
StretchBlt32 (hdcImageList, nIndex * himl->cx, 0, himl->cx, himl->cy,
hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY);
-#endif
}
- DeleteDC32 (hdcImageList);
- DeleteDC32 (hdcImage);
-#ifdef __GET_ICON_INFO_HACK__
- DeleteObject32 (hbmImage);
- DeleteObject32 (hbmMask);
- GlobalUnlock16 (hIcon);
-#else
- DeleteObject32 (ii->hbmColor);
- DeleteObject32 (ii->hbmMask);
-#endif
+ SelectObject32 (hdcImage, hbmOldSrc);
+ SelectObject32 (hdcImageList, hbmOldDst);
+
+ if (hdcImageList)
+ DeleteDC32 (hdcImageList);
+ if (hdcImage)
+ DeleteDC32 (hdcImage);
+
+// FIXME (imagelist, "deleting hbmColor!\n");
+ DeleteObject32 (ii.hbmColor);
+// FIXME (imagelist, "deleted hbmColor!\n");
+ DeleteObject32 (ii.hbmMask);
+
return (nIndex);
}
@@ -2084,7 +2025,7 @@
BOOL32 WINAPI
ImageList_SetFilter (HIMAGELIST himl, INT32 i, DWORD dwFilter)
{
- FIXME (imagelist, "(%p 0x%08x 0x%08x):empty stub!\n",
+ FIXME (imagelist, "(%p 0x%x 0x%lx):empty stub!\n",
himl, i, dwFilter);
return FALSE;
@@ -2132,7 +2073,7 @@
DeleteObject32 (himl->hbmMask);
himl->hbmMask =
CreateBitmap32 (himl->cMaxImage * himl->cx, himl->cy,
- 1, himl->uBitsPixel, NULL);
+ 1, 1, NULL);
}
return (TRUE);
@@ -2189,7 +2130,7 @@
if (himl->hbmMask)
{
hbmNewBitmap = CreateBitmap32 (nNewCount * himl->cx, himl->cy,
- 1, himl->uBitsPixel, NULL);
+ 1, 1, NULL);
if (hbmNewBitmap != 0)
{
SelectObject32 (hdcImageList, himl->hbmMask);
