Release 970914
Thu Sep 11 18:24:56 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [objects/dc.c]
In DC_SetupGCForPatBlt, replace R2_NOT by GXxor with (black xor white).
Tue Sep 9 23:04:02 1997 U. Bonnes <bon@elektron.ikp.physik.th-darmstadt.de>
* [memory/virtual.c]
Do not write debugging info unconditionally to stderr.
* [files/profile.c]
Call PROFILE_GetSection in PROFILE_GetString for key_name "" too.
* [misc/crtdll.c]
Many new functions.
* [include/windows.h] [windows/winpos.c]
ClientToScreen16 doesn't have a return value.
Sun Sep 7 10:06:39 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [misc/main.c] [AUTHORS]
Update the list of contributors. Please let me know if I forgot
someone.
* [if1632/*.spec] [if1632/builtin.c] [tools/build.c]
Ordinal base for Win32 DLLs is now computed automatically from the
lowest ordinal found.
* [include/wintypes.h]
WINAPI is now defined as attribute((stdcall)). This will require
gcc to compile.
* [if1632/thunk.c]
Removed Win32 thunks (no longer needed with stdcall).
* [if1632/crtdll.spec] [misc/crtdll.c]
Make sure we only reference cdecl functions in the spec file.
* [objects/dc.c]
Use CapNotLast drawing style for 1-pixel wide lines.
* [tools/build.c]
Added 'double' argument type.
Added 'varargs' function type for Win32.
Made CallTo16_xxx functions stdcall.
Fri Sep 5 14:50:49 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [tools/build.c] [windows/win.c] [windows/event.c] [windows/message.c]
More fixes to get message exchange closer to the original.
* [misc/spy.c]
Message logs now contain window names.
* [loader/resource.c] [loader/ne_resource.c] [loader/task.c]
[objects/cursoricon.c] [windows/user.c]
Added some obscure features to fix memory leaks.
Fri Sep 5 00:46:28 1997 Jan Willamowius <jan@janhh.shnet.org>
* [if1632/kernel32.spec] [win32/newfns.c]
Added stub for UTRegister() and UTUnRegister().
Thu Sep 4 12:03:12 1997 Frans van Dorsselaer <dorssel@rulhmpc49.LeidenUniv.nl>
* [controls/edit.c]
Allow ASCII codes > 127 in WM_CHAR.
Mon Sep 1 17:23:24 1997 Dimitrie O. Paun <dimi@mail.cs.toronto.edu>
* [controls/widgets.c]
In InitCommonControls, remember the name of the class
because lpszClassName was made to point to a local array
Added the ProgressBar to the list of implemented controls.
Call InitCommonControls from WIDGETS_Init to register all
implemented Common Controls.
* [include/commctrl.h]
Added misc decl for the Progress Bar.
* [controls/progress.c] [include/progress.h]
First attempt at implementiong the Progress Bar class.
* [objects/brush.h]
Implementation for GetSysColorBrush[16|32]
* [controls/status.c]
Use DrawEdge to draw the borders and fill the background
* [controls/uitools.c]
Added DrawDiagEdge32 and DrawRectEdge32
* [graphics/painting.c]
Implement DrawEdge[16|32]
Started DrawFrameControl32
Mon Sep 1 10:07:09 1997 Lawson Whitney <lawson_whitney@juno.com>
* [misc/comm.c] [include/windows.h]
SetCommEventMask returns a SEGPTR.
Sun Aug 31 23:28:32 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_image.c][loader/module.c][include/pe_image.h]
[include/module.h]
Cleaned up the whole Win32 library mess (a bit).
* [debugger/stabs.c]
If 'wine' has no absolute path and isn't found, check $PATH too.
* [misc/ole2nls.c]
Some fixes.
* [misc/ver.c]
Added support for PE style version resources.
* [memory/string.c]
Check for NULL pointers to _lstr* functions, just as Windows95 does.
* [multimedia/time.c]
Made list of timers a simple linked list.
* [loader/resource.c]
Netscape 3 seems to pass NEGATIVE resource Ids (in an
unsigned int, yes). Don't know why, fixed it anyway.
* [objects/bitmap.c]
LoadImageW added.
* [include/win.h][windows/win.c]
Change wIDmenu from UINT16 to UINT32 and changed the
SetWindow(Long|Word) accordingly.
Thu Aug 28 19:30:08 1997 Morten Welinder <terra@diku.dk>
* [include/windows.h]
Add a few more colors defined for Win95.
Add a few more brush styles.
* [windows/syscolor.c]
Add error checks for SYSCOLOR_SetColor, SYSCOLOR_Init,
GetSysColor16, GetSysColor32. Add support for above colors.
Sun Aug 24 16:22:57 1997 Andrew Taylor <andrew@riscan.com>
* [multimedia/mmsystem.c]
Changed mmioDescend to use mmio functions for file I/O, neccessary
for memory files.
diff --git a/objects/bitmap.c b/objects/bitmap.c
index 6fe7a98..18df983 100644
--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@@ -49,6 +49,80 @@
descr->image, 0, 0, 0, 0, descr->width, descr->height );
}
+/***********************************************************************
+ * BITMAP_GetBitsPadding
+ *
+ * Return number of bytes to pad a scanline of 16-bit aligned Windows DDB data.
+ */
+INT32 BITMAP_GetBitsPadding( int bmWidth, int bpp )
+{
+ INT32 pad;
+
+ switch (bpp)
+ {
+ case 1:
+ if (!(bmWidth & 15)) pad = 0;
+ else pad = ((16 - (bmWidth & 15)) + 7) / 8;
+ break;
+
+ case 8:
+ pad = (2 - (bmWidth & 1)) & 1;
+ break;
+
+ case 24:
+ pad = (bmWidth*3) & 1;
+ break;
+
+ case 32:
+ case 16:
+ case 15:
+ pad = 0; /* we have 16bit alignment already */
+ break;
+
+ case 4:
+ if (!(bmWidth & 3)) pad = 0;
+ else pad = ((4 - (bmWidth & 3)) + 1) / 2;
+ break;
+
+ default:
+ fprintf(stderr,"GetBitsPadding: unknown depth %d, please report.\n", bpp );
+ return -1;
+ }
+ return pad;
+}
+
+/***********************************************************************
+ * BITMAP_GetBitsWidth
+ *
+ * Return number of bytes taken by a scanline of 16-bit aligned Windows DDB data.
+ */
+INT32 BITMAP_GetBitsWidth( int bmWidth, int bpp )
+{
+ switch(bpp)
+ {
+ case 1:
+ return 2 * ((bmWidth+15) >> 4);
+
+ case 24:
+ bmWidth *= 3; /* fall through */
+ case 8:
+ return bmWidth + (bmWidth & 1);
+
+ case 32:
+ return bmWidth * 4;
+
+ case 16:
+ case 15:
+ return bmWidth * 2;
+
+ case 4:
+ return 2 * ((bmWidth+3) >> 2);
+
+ default:
+ fprintf(stderr,"GetBitsPadding: unknown depth %d, please report.\n", bpp );
+ }
+ return -1;
+}
/***********************************************************************
* CreateBitmap16 (GDI.48)
@@ -200,46 +274,19 @@
/* Only get entire lines */
height = count / bmp->bitmap.bmWidthBytes;
if (height > bmp->bitmap.bmHeight) height = bmp->bitmap.bmHeight;
+
dprintf_bitmap(stddeb, "GetBitmapBits: %dx%d %d colors %p fetched height: %ld\n",
bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
1 << bmp->bitmap.bmBitsPixel, buffer, height );
- if (!height)
+
+ pad = BITMAP_GetBitsPadding( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel );
+
+ if (!height || (pad == -1))
{
GDI_HEAP_UNLOCK( hbitmap );
return 0;
}
- switch (bmp->bitmap.bmBitsPixel) {
- case 1:
- if (!(bmp->bitmap.bmWidth & 15))
- pad = 0;
- else
- pad = ((16 - (bmp->bitmap.bmWidth & 15)) + 7) / 8;
- break;
- case 4:
- if (!(bmp->bitmap.bmWidth & 3))
- pad = 0;
- else
- pad = ((4 - (bmp->bitmap.bmWidth & 3)) + 1) / 2;
- break;
- case 8:
- pad = (2 - (bmp->bitmap.bmWidth & 1)) & 1;
- break;
- case 15:
- case 16:
- pad = 0; /* we have 16bit alignment already */
- break;
- case 24:
- pad = (bmp->bitmap.bmWidth*3) & 1;
- break;
- default:
- fprintf(stderr,"GetBitMapBits32: unknown depth %d, please report.\n",
- bmp->bitmap.bmBitsPixel
- );
- GDI_HEAP_UNLOCK( hbitmap );
- return 0;
- }
-
/* Hack: change the bitmap height temporarily to avoid */
/* getting unnecessary bitmap rows. */
old_height = bmp->bitmap.bmHeight;
@@ -354,41 +401,15 @@
/* Only set entire lines */
height = count / bmp->bitmap.bmWidthBytes;
if (height > bmp->bitmap.bmHeight) height = bmp->bitmap.bmHeight;
- if (!height)
+
+ pad = BITMAP_GetBitsPadding( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel );
+
+ if (!height || (pad == -1))
{
GDI_HEAP_UNLOCK( hbitmap );
return 0;
}
- switch (bmp->bitmap.bmBitsPixel) {
- case 1:
- if (!(bmp->bitmap.bmWidth & 15))
- pad = 0;
- else
- pad = ((16 - (bmp->bitmap.bmWidth & 15)) + 7) / 8;
- break;
- case 4:
- if (!(bmp->bitmap.bmWidth & 3))
- pad = 0;
- else
- pad = ((4 - (bmp->bitmap.bmWidth & 3)) + 1) / 2;
- break;
- case 8:
- pad = (2 - (bmp->bitmap.bmWidth & 1)) & 1;
- break;
- case 15:
- case 16:
- pad = 0; /* we have 16bit alignment already */
- break;
- case 24:
- pad = (bmp->bitmap.bmWidth*3) & 1;
- break;
- default:
- fprintf(stderr,"SetBitMapBits32: unknown depth %d, please report.\n",
- bmp->bitmap.bmBitsPixel
- );
- return 0;
- }
sbuf = (LPBYTE)buffer;
widthbytes = DIB_GetXImageWidthBytes(bmp->bitmap.bmWidth,bmp->bitmap.bmBitsPixel);
@@ -497,6 +518,29 @@
return 0;
}
+HANDLE32 WINAPI LoadImage32W( HINSTANCE32 hinst, LPCWSTR name, UINT32 type,
+ INT32 desiredx, INT32 desiredy, UINT32 loadflags)
+{
+ if (HIWORD(name)) {
+ dprintf_resource(stddeb,"LoadImage32W(0x%04x,%p,%d,%d,%d,0x%08x)\n",
+ hinst,name,type,desiredx,desiredy,loadflags
+ );
+ } else {
+ dprintf_resource(stddeb,"LoadImage32W(0x%04x,%p,%d,%d,%d,0x%08x)\n",
+ hinst,name,type,desiredx,desiredy,loadflags
+ );
+ }
+ switch (type) {
+ case IMAGE_BITMAP:
+ return LoadBitmap32W(hinst,name);
+ case IMAGE_ICON:
+ return LoadIcon32W(hinst,name);
+ case IMAGE_CURSOR:
+ return LoadCursor32W(hinst,name);
+ }
+ return 0;
+}
+
/**********************************************************************
* CopyImage32 (USER32.60)
*
