Release 960516
Thu May 16 13:35:31 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [*/*.c]
Renamed RECT, POINT and SIZE structures to RECT16, POINT16 and
SIZE16. Implemented Win32 version of most functions that take
these types as parameters.
* [configure]
Patched autoconf to attempt to correctly detect -lnsl and
-lsocket. Please check this out.
* [controls/button.c]
Added support for Win32 BM_* messages.
* [controls/menu.c]
Avoid sending extra WM_MENUSELECT messages. This avoids crashes
with Excel.
* [memory.heap.c] [include/heap.h]
Added support for SEGPTRs in Win32 heaps. Added a few macros to
make using SEGPTRs easier. They are a bit slower than MAKE_SEGPTR,
but they work with Win32.
* [memory/atom.c]
Implemented Win32 atom functions.
* [memory/local.c]
Fixed LocalReAlloc() changes to avoid copying the whole block twice.
* [win32/memory.c]
Use /dev/zero instead of MAP_ANON for VirtualAlloc().
* [windows/class.c]
Properly implemented the Win32 class functions.
* [windows/winproc.c] (New file)
New file handling the message translation between Win16 and Win32.
Mon May 13 18:00:00 1996 Alex Korobka <alex@phm30.pharm.sunysb.edu>
* [windows/mdi.c] [windows/menu.c]
Improved WM_MDICREATE and WM_MDICASCADE handling.
* [windows/event.c] [objects/bitblt.c]
Handle GraphicsExpose event for BitBlt from screen to screen.
* [windows/event.c] [windows/win.c] [windows/nonclient.c]
Bunch of fixes for problems with -managed.
* [windows/win.c] [windows/winpos.c]
Changed conditions for WM_SIZE, WM_MOVE, and WM_GETMINMAXINFO
in CreateWindow.
* [windows/win.c] [windows/queue.c] [misc/user.c]
Do not send WM_PARENTNOTIFY when in AppExit and call WH_SHELL
on window creation/destruction.
* [objects/palette.c]
Crude RealizePalette(). At least something is visible in LviewPro.
Sun May 12 02:05:00 1996 Thomas Sandford <t.d.g.sandford@prds-grn.demon.co.uk>
* [if1632/gdi32.spec]
Added Rectangle (use win16 version).
* [if1632/kernel32.spec]
Added GetWindowsDirectoryA (use win16 GetWindowsDirectory).
* [if1632/user32.spec]
Added GetSubMenu, MoveWindow, SetScrollPos, SetScrollRange (use win16
versions).
Added SetWindowsHookExA (empty stub for now).
* [include/handle32.h]
Changed #include <malloc.h> to #include <stdlib.h> to prevent
hate message from FreeBSD compiler.
* [win32/newfns.c]
Added new function SetWindowsHookEx32A (empty stub for now).
* [win32/user32.c]
Removed redundant debugging printf statement.
Sun May 12 01:24:57 1996 Huw D. M. Davies <h.davies1@physics.oxford.ac.uk>
* [memory/local.c]
Avoid creating adjacent free blocks.
Free the block in LocalReAlloc() before allocating a new one.
Fixed LocalReAlloc() for discarded blocks.
Fri May 10 23:05:12 1996 Jukka Iivonen <iivonen@cc.helsinki.fi>
* [resources/sysres_Fi.rc]
ChooseFont and ChooseColor dialogs updated.
Fri May 10 17:19:33 1996 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [files/drive.c,if1632/kernel.spec]
GetCurrentDirectory(),SetCurrentDirectory() implemented.
* [if1632/advapi32.spec] [if1632/kernel.spec] [if1632/shell.spec]
[include/windows.h] [include/winreg.h] [loader/main.c]
[misc/main.c] [misc/shell.c] [misc/registry.c]
Registry fixes:
- loads win95 registry databases,
- save only updated keys on default,
- now adhers to the new function naming standard,
- minor cleanups.
Tue May 7 22:36:13 1996 Albrecht Kleine <kleine@ak.sax.de>
* [combo.c]
Added WM_COMMAND-handling for interaction between EDIT and COMBOLBOX
and synchronized mine with Greg Kreider's works.
* [commdlg.c]
Bugfix in ChooseFont: font size handling.
diff --git a/windows/dialog.c b/windows/dialog.c
index 33a93b4..f8913b0 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -10,6 +10,7 @@
#include <string.h>
#include "windows.h"
#include "dialog.h"
+#include "heap.h"
#include "win.h"
#include "ldt.h"
#include "stackframe.h"
@@ -252,7 +253,7 @@
HMENU hMenu = 0;
HFONT hFont = 0;
HWND hwnd, hwndCtrl;
- RECT rect;
+ RECT16 rect;
WND * wndPtr;
int i;
DLGTEMPLATE template;
@@ -306,8 +307,8 @@
rect.right = template.cx * xUnit / 4;
rect.bottom = template.cy * yUnit / 8;
if (template.style & DS_MODALFRAME) exStyle |= WS_EX_DLGMODALFRAME;
- AdjustWindowRectEx( &rect, template.style,
- hMenu ? TRUE : FALSE , exStyle );
+ AdjustWindowRectEx16( &rect, template.style,
+ hMenu ? TRUE : FALSE , exStyle );
rect.right -= rect.left;
rect.bottom -= rect.top;
@@ -318,7 +319,7 @@
rect.left += template.x * xUnit / 4;
rect.top += template.y * yUnit / 8;
if (!(template.style & DS_ABSALIGN))
- ClientToScreen( owner, (POINT *)&rect );
+ ClientToScreen16( owner, (POINT16 *)&rect );
}
hwnd = CreateWindowEx16( exStyle, template.className, template.caption,
@@ -425,7 +426,7 @@
/* If there's already a default push-button, set it back */
/* to normal and use this one instead. */
if (hwndDefButton)
- SendMessage( hwndDefButton, BM_SETSTYLE, BS_PUSHBUTTON, FALSE);
+ SendMessage(hwndDefButton, BM_SETSTYLE16, BS_PUSHBUTTON,FALSE);
hwndDefButton = hwndCtrl;
dlgInfo->msgResult = GetWindowWord( hwndCtrl, GWW_ID );
}
@@ -731,11 +732,13 @@
*/
void SetDlgItemInt( HWND hwnd, WORD id, WORD value, BOOL fSigned )
{
- char str[20];
+ char *str = (char *)SEGPTR_ALLOC( 20 * sizeof(char) );
+ if (!str) return;
if (fSigned) sprintf( str, "%d", (int)value );
else sprintf( str, "%u", value );
- SendDlgItemMessage( hwnd, id, WM_SETTEXT, 0, (LPARAM)MAKE_SEGPTR(str) );
+ SendDlgItemMessage( hwnd, id, WM_SETTEXT, 0, (LPARAM)SEGPTR_GET(str) );
+ SEGPTR_FREE(str);
}
@@ -744,11 +747,12 @@
*/
WORD GetDlgItemInt( HWND hwnd, WORD id, BOOL * translated, BOOL fSigned )
{
- char str[30];
+ char *str;
long result = 0;
if (translated) *translated = FALSE;
- if (SendDlgItemMessage( hwnd, id, WM_GETTEXT, 30, (LPARAM)MAKE_SEGPTR(str) ))
+ if (!(str = (char *)SEGPTR_ALLOC( 30 * sizeof(char) ))) return 0;
+ if (SendDlgItemMessage( hwnd, id, WM_GETTEXT, 30, (LPARAM)SEGPTR_GET(str)))
{
char * endptr;
result = strtol( str, &endptr, 10 );
@@ -766,6 +770,7 @@
}
}
}
+ SEGPTR_FREE(str);
return (WORD)result;
}
@@ -775,7 +780,7 @@
*/
BOOL CheckDlgButton( HWND hwnd, INT id, UINT check )
{
- SendDlgItemMessage( hwnd, id, BM_SETCHECK, check, 0 );
+ SendDlgItemMessage( hwnd, id, BM_SETCHECK16, check, 0 );
return TRUE;
}
@@ -785,7 +790,7 @@
*/
WORD IsDlgButtonChecked( HWND hwnd, WORD id )
{
- return (WORD)SendDlgItemMessage( hwnd, id, BM_GETCHECK, 0, 0 );
+ return (WORD)SendDlgItemMessage( hwnd, id, BM_GETCHECK16, 0, 0 );
}
@@ -805,7 +810,7 @@
lastID = firstID; /* Buttons are in reverse order */
while (pWnd)
{
- SendMessage(pWnd->hwndSelf, BM_SETCHECK, (pWnd->wIDmenu == checkID),0);
+ SendMessage(pWnd->hwndSelf,BM_SETCHECK16,(pWnd->wIDmenu == checkID),0);
if (pWnd->wIDmenu == lastID) break;
pWnd = pWnd->next;
}
@@ -823,9 +828,25 @@
/***********************************************************************
- * MapDialogRect (USER.103)
+ * MapDialogRect16 (USER.103)
*/
-void MapDialogRect( HWND hwnd, LPRECT rect )
+void MapDialogRect16( HWND16 hwnd, LPRECT16 rect )
+{
+ DIALOGINFO * dlgInfo;
+ WND * wndPtr = WIN_FindWndPtr( hwnd );
+ if (!wndPtr) return;
+ dlgInfo = (DIALOGINFO *)wndPtr->wExtra;
+ rect->left = (rect->left * dlgInfo->xBaseUnit) / 4;
+ rect->right = (rect->right * dlgInfo->xBaseUnit) / 4;
+ rect->top = (rect->top * dlgInfo->yBaseUnit) / 8;
+ rect->bottom = (rect->bottom * dlgInfo->yBaseUnit) / 8;
+}
+
+
+/***********************************************************************
+ * MapDialogRect32 (USER32.381)
+ */
+void MapDialogRect32( HWND32 hwnd, LPRECT32 rect )
{
DIALOGINFO * dlgInfo;
WND * wndPtr = WIN_FindWndPtr( hwnd );
