Release 961215
Sun Dec 15 16:18:15 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [graphics/x11drv/bitblt.c]
Fixed BITBLT_StretchImage for partially covered or inverted
bitmaps.
* [objects/dib.c]
Fixed the upside-down bitmap problem.
Sat Dec 14 02:49:57 1996 Thomas Sandford <t.d.g.sandford@prds-grn.demon.co.uk>
* [if1632/user32.spec]
IsMenu and RemoveMenu added (use existing Win16 functions).
* [include/windows.h]
Corrections to BITMAPINFOHEADER structure.
* [loader/module.c] [if1632/kernel32.spec]
New function GetModuleFileName32A (heavily based on original
Win16 version).
* [loader/pe_image.c]
Hack to allow files with short PE header to be loaded (e.g.
COMDLG32.DLL from Win32s).
* [misc/winsock_async.c]
#if out EIDRM case (not present in FreeBSD).
* [tools/build.c]
Remove trailing comments from .s files generated by build
as these break assembly when not run through pre-processor.
* [windows/graphics.c] [if1632/gdi32.spec]
New function Polyline32 - based on original Polyline. Needs
metafile support adding still.
Fri Dec 13 13:04:06 1996 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [win32/findfile.c] [if1632/kernel.spec]
FindFirstFile32A(): Use dos current directory for drive prefixes.
FindNextFile32A(): Fill in file attribute information.
Implement FindFirstFile16, FindNextFile16, FindClose16.
* [files/drive.c]
GetCurrentDirectory32A - Fix problem with null 3rd character in
string.
Tue Dec 10 14:49:07 1996 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [windows/painting.c][windows/message.c]
Don't use linked lists to call SendMessage(), for it might destroy
the current listentry.
* [misc/registry.c]
Fixed temporary file saving (rename doesn't work across
partitions).
* [files/*.c]
GetFullPathName*,GetDriveType32A fixed, CreateDirectoryEx*,
GetVolumeInformation32W fixed.
* [win32/process.c][if1632/kernel.spec][if1632/kernel32.spec]
LoadLibrary* updated to new naming std., *32W added.
* [win32/console.c] [include/wincon.h]
Additions for NT commandline executables.
* [if1632/advapi32.spec][if1632/kernel32.spec][win32/init.c]
GetUserName32W added, GetComputerName32W added,
GetStartupInfo32W added, GetSystemInfo updated to NT standard.
* [windows/msgbox.c][misc/shell.c][windows/graphics.c]
MessageBox32W, ShellAbout32W, CommandLineToArgvW, Polygon32 added.
* [misc/crtdll.c][include/crtdll.h][if1632/crtdll.spec][misc/ntdll.c]
[if1632/ntdll.spec]
Lot of new unicode functions added (needed for NT).
* [loader/pe_image.c]
NtCurrentTeb added.
Tue Dec 10 22:39:33 1996 Albrecht Kleine <kleine@ak.sax.de>
* [windows/keyboard.c]
Rewrote function TranslateAccelerator().
Mon Dec 9 14:52:13 1996 Slaven Rezic <eserte@cs.tu-berlin.de>
* [windows/defwnd.c]
DEFWND_SetText(): Set icon name.
Sun Dec 8 23:30:00 1996 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [loader/signal.c] [misc/winsock.c] [misc/winsock_async.c]
[if1632/winsock.spec]
IPC resource cleanup, bugfixes.
* [windows/dialog.c] [windows/defdlg.c]
More DefDlgProc() fixes.
Sun Dec 8 14:01:42 1996 Vadim Strizhevsky <striv@ms.com>
* [misc/clipboard.c] [objects/font.c] [win32/init.c]
[win32/newfns.c] [windows/graphics.c]
Added a few WIN32 functions which needed to run some win32
accessories. Clock should now work almost as well as 16 bit version.
Add: RegisterClipboardFormat32W GetTextExtentExPoint32*
GetModuleHandleW, DisableThreadLibraryCalls (empty stub),
Polygon32
Fix: Polygon16 possible memory leak on error return.
diff --git a/windows/dce.c b/windows/dce.c
index 1f03832..98bbe81 100644
--- a/windows/dce.c
+++ b/windows/dce.c
@@ -39,7 +39,7 @@
{
DCE * dce;
if (!(dce = HeapAlloc( SystemHeap, 0, sizeof(DCE) ))) return NULL;
- if (!(dce->hDC = CreateDC( "DISPLAY", NULL, NULL, NULL )))
+ if (!(dce->hDC = CreateDC16( "DISPLAY", NULL, NULL, NULL )))
{
HeapFree( SystemHeap, 0, dce );
return 0;
diff --git a/windows/defdlg.c b/windows/defdlg.c
index 99e2a1f..2c6e1e9 100644
--- a/windows/defdlg.c
+++ b/windows/defdlg.c
@@ -118,9 +118,6 @@
switch(msg)
{
- case WM_INITDIALOG:
- return 0;
-
case WM_ERASEBKGND:
FillWindow( hwnd, hwnd, (HDC16)wParam, (HBRUSH16)CTLCOLOR_DLG );
return 1;
@@ -152,6 +149,7 @@
/* Delete window procedure */
WINPROC_FreeProc( dlgInfo->dlgProc );
dlgInfo->dlgProc = (HWINDOWPROC)0;
+ dlgInfo->fEnd = TRUE; /* just in case */
/* Window clean-up */
return DefWindowProc32A( hwnd, msg, wParam, lParam );
@@ -194,6 +192,9 @@
}
return 0;
+ case WM_GETFONT:
+ return dlgInfo->hUserFont;
+
case WM_CLOSE:
EndDialog( hwnd, TRUE );
DestroyWindow( hwnd );
@@ -202,6 +203,21 @@
return 0;
}
+/***********************************************************************
+ * DEFDLG_Signoff
+ */
+static LRESULT DEFDLG_Signoff(DIALOGINFO* dlgInfo, UINT32 msg, BOOL16 fResult)
+{
+ /* see SDK 3.1 */
+
+ if ((msg >= WM_CTLCOLORMSGBOX && msg <= WM_CTLCOLORSTATIC) ||
+ msg == WM_CTLCOLOR || msg == WM_COMPAREITEM ||
+ msg == WM_VKEYTOITEM || msg == WM_CHARTOITEM ||
+ msg == WM_QUERYDRAGICON || msg == WM_INITDIALOG)
+ return fResult;
+
+ return dlgInfo->msgResult;
+}
/***********************************************************************
* DefDlgProc16 (USER.308)
@@ -214,38 +230,43 @@
if (!wndPtr) return 0;
dlgInfo = (DIALOGINFO *)&wndPtr->wExtra;
-
dlgInfo->msgResult = 0;
- if (dlgInfo->dlgProc)
- {
- /* Call dialog procedure */
+
+ if (dlgInfo->dlgProc) /* Call dialog procedure */
result = (BOOL16)CallWindowProc16( (WNDPROC16)dlgInfo->dlgProc,
hwnd, msg, wParam, lParam );
- /* Check if window was destroyed by dialog procedure */
+ /* Check if window was destroyed by dialog procedure */
- if (!IsWindow( hwnd )) return result;
- else if( result ) return dlgInfo->msgResult;
- }
-
- switch(msg)
+ if( !result && IsWindow(hwnd))
{
- case WM_INITDIALOG:
- case WM_ERASEBKGND:
- case WM_NCDESTROY:
- case WM_SHOWWINDOW:
- case WM_ACTIVATE:
- case WM_SETFOCUS:
- case DM_SETDEFID:
- case DM_GETDEFID:
- case WM_NEXTDLGCTL:
- case WM_CLOSE:
- return DEFDLG_Proc( (HWND32)hwnd, msg, (WPARAM32)wParam,
- lParam, dlgInfo );
+ /* callback didn't process this message */
- default:
- return DefWindowProc16( hwnd, msg, wParam, lParam );
- }
+ switch(msg)
+ {
+ case WM_ERASEBKGND:
+ case WM_SHOWWINDOW:
+ case WM_ACTIVATE:
+ case WM_SETFOCUS:
+ case DM_SETDEFID:
+ case DM_GETDEFID:
+ case WM_NEXTDLGCTL:
+ case WM_GETFONT:
+ case WM_CLOSE:
+ case WM_NCDESTROY:
+ return DEFDLG_Proc( (HWND32)hwnd, msg,
+ (WPARAM32)wParam, lParam, dlgInfo );
+ case WM_INITDIALOG:
+ case WM_VKEYTOITEM:
+ case WM_COMPAREITEM:
+ case WM_CHARTOITEM:
+ break;
+
+ default:
+ return DefWindowProc16( hwnd, msg, wParam, lParam );
+ }
+ }
+ return DEFDLG_Signoff(dlgInfo, msg, result);
}
@@ -260,37 +281,43 @@
if (!wndPtr) return 0;
dlgInfo = (DIALOGINFO *)&wndPtr->wExtra;
-
dlgInfo->msgResult = 0;
- if (dlgInfo->dlgProc)
- {
- /* Call dialog procedure */
- result = (BOOL16)CallWindowProc32A( (WNDPROC32)dlgInfo->dlgProc,
+
+ if (dlgInfo->dlgProc) /* Call dialog procedure */
+ result = (BOOL16)CallWindowProc32A( (WNDPROC32)dlgInfo->dlgProc,
hwnd, msg, wParam, lParam );
- /* Check if window was destroyed by dialog procedure */
+ /* Check if window was destroyed by dialog procedure */
- if (!IsWindow( hwnd )) return result;
- else if( result ) return dlgInfo->msgResult;
- }
-
- switch(msg)
+ if( !result && IsWindow(hwnd))
{
- case WM_INITDIALOG:
- case WM_ERASEBKGND:
- case WM_NCDESTROY:
- case WM_SHOWWINDOW:
- case WM_ACTIVATE:
- case WM_SETFOCUS:
- case DM_SETDEFID:
- case DM_GETDEFID:
- case WM_NEXTDLGCTL:
- case WM_CLOSE:
- return DEFDLG_Proc( hwnd, msg, wParam, lParam, dlgInfo );
+ /* callback didn't process this message */
- default:
- return DefWindowProc32A( hwnd, msg, wParam, lParam );
+ switch(msg)
+ {
+ case WM_ERASEBKGND:
+ case WM_SHOWWINDOW:
+ case WM_ACTIVATE:
+ case WM_SETFOCUS:
+ case DM_SETDEFID:
+ case DM_GETDEFID:
+ case WM_NEXTDLGCTL:
+ case WM_GETFONT:
+ case WM_CLOSE:
+ case WM_NCDESTROY:
+ return DEFDLG_Proc( (HWND32)hwnd, msg,
+ (WPARAM32)wParam, lParam, dlgInfo );
+ case WM_INITDIALOG:
+ case WM_VKEYTOITEM:
+ case WM_COMPAREITEM:
+ case WM_CHARTOITEM:
+ break;
+
+ default:
+ return DefWindowProc32A( hwnd, msg, wParam, lParam );
+ }
}
+ return DEFDLG_Signoff(dlgInfo, msg, result);
}
@@ -305,35 +332,41 @@
if (!wndPtr) return 0;
dlgInfo = (DIALOGINFO *)&wndPtr->wExtra;
-
dlgInfo->msgResult = 0;
- if (dlgInfo->dlgProc)
- {
- /* Call dialog procedure */
- result = (BOOL16)CallWindowProc32W( (WNDPROC32)dlgInfo->dlgProc,
+
+ if (dlgInfo->dlgProc) /* Call dialog procedure */
+ result = (BOOL16)CallWindowProc32W( (WNDPROC32)dlgInfo->dlgProc,
hwnd, msg, wParam, lParam );
- /* Check if window was destroyed by dialog procedure */
+ /* Check if window was destroyed by dialog procedure */
- if (!IsWindow( hwnd )) return result;
- else if( result ) return dlgInfo->msgResult;
- }
-
- switch(msg)
+ if( !result && IsWindow(hwnd))
{
- case WM_INITDIALOG:
- case WM_ERASEBKGND:
- case WM_NCDESTROY:
- case WM_SHOWWINDOW:
- case WM_ACTIVATE:
- case WM_SETFOCUS:
- case DM_SETDEFID:
- case DM_GETDEFID:
- case WM_NEXTDLGCTL:
- case WM_CLOSE:
- return DEFDLG_Proc( hwnd, msg, wParam, lParam, dlgInfo );
+ /* callback didn't process this message */
- default:
- return DefWindowProc32W( hwnd, msg, wParam, lParam );
+ switch(msg)
+ {
+ case WM_ERASEBKGND:
+ case WM_SHOWWINDOW:
+ case WM_ACTIVATE:
+ case WM_SETFOCUS:
+ case DM_SETDEFID:
+ case DM_GETDEFID:
+ case WM_NEXTDLGCTL:
+ case WM_GETFONT:
+ case WM_CLOSE:
+ case WM_NCDESTROY:
+ return DEFDLG_Proc( (HWND32)hwnd, msg,
+ (WPARAM32)wParam, lParam, dlgInfo );
+ case WM_INITDIALOG:
+ case WM_VKEYTOITEM:
+ case WM_COMPAREITEM:
+ case WM_CHARTOITEM:
+ break;
+
+ default:
+ return DefWindowProc32W( hwnd, msg, wParam, lParam );
+ }
}
+ return DEFDLG_Signoff(dlgInfo, msg, result);
}
diff --git a/windows/defwnd.c b/windows/defwnd.c
index b201881..8b0da40 100644
--- a/windows/defwnd.c
+++ b/windows/defwnd.c
@@ -63,7 +63,11 @@
if (!text) text = "";
if (wndPtr->text) HeapFree( SystemHeap, 0, wndPtr->text );
wndPtr->text = HEAP_strdupA( SystemHeap, 0, text );
- if (wndPtr->window) XStoreName( display, wndPtr->window, wndPtr->text );
+ if (wndPtr->window)
+ {
+ XStoreName( display, wndPtr->window, wndPtr->text );
+ XSetIconName( display, wndPtr->window, wndPtr->text );
+ }
}
diff --git a/windows/dialog.c b/windows/dialog.c
index e1b0946..864495f 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -71,7 +71,7 @@
/* Calculate the dialog base units */
- if (!(hdc = CreateDC( "DISPLAY", NULL, NULL, NULL ))) return FALSE;
+ if (!(hdc = CreateDC16( "DISPLAY", NULL, NULL, NULL ))) return FALSE;
GetTextMetrics16( hdc, &tm );
DeleteDC( hdc );
xBaseUnit = tm.tmAveCharWidth;
@@ -79,7 +79,8 @@
/* Dialog units are based on a proportional system font */
/* so we adjust them a bit for a fixed font. */
- if (tm.tmPitchAndFamily & TMPF_FIXED_PITCH) xBaseUnit = xBaseUnit * 5 / 4;
+ if (!(tm.tmPitchAndFamily & TMPF_FIXED_PITCH))
+ xBaseUnit = xBaseUnit * 5 / 4;
dprintf_dialog( stddeb, "DIALOG_Init: base units = %d,%d\n",
xBaseUnit, yBaseUnit );
@@ -511,7 +512,7 @@
ReleaseDC32( 0, hdc );
xUnit = tm.tmAveCharWidth;
yUnit = tm.tmHeight;
- if (tm.tmPitchAndFamily & TMPF_FIXED_PITCH)
+ if (!(tm.tmPitchAndFamily & TMPF_FIXED_PITCH))
xBaseUnit = xBaseUnit * 5 / 4; /* See DIALOG_Init() */
}
}
diff --git a/windows/graphics.c b/windows/graphics.c
index 5003f17..9aedf97 100644
--- a/windows/graphics.c
+++ b/windows/graphics.c
@@ -969,13 +969,43 @@
/**********************************************************************
+ * Polyline32 (GDI32.276)
+ */
+BOOL32 Polyline32( HDC32 hdc, const LPPOINT32 pt, INT32 count )
+{
+ register int i;
+ DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
+ if (!dc)
+ {
+ dc = (DC *)GDI_GetObjPtr(hdc, METAFILE_DC_MAGIC);
+ if (!dc) return FALSE;
+ fprintf( stderr, "Polyline32: Metafile Polyline not yet supported for Win32\n");
+/* win 16 code was:
+ MF_MetaPoly(dc, META_POLYLINE, pt, count);
+ return TRUE;
+*/
+ return FALSE;
+ }
+
+ if (DC_SetupGCForPen( dc ))
+ for (i = 0; i < count-1; i ++)
+ XDrawLine (display, dc->u.x.drawable, dc->u.x.gc,
+ dc->w.DCOrgX + XLPTODP(dc, pt [i].x),
+ dc->w.DCOrgY + YLPTODP(dc, pt [i].y),
+ dc->w.DCOrgX + XLPTODP(dc, pt [i+1].x),
+ dc->w.DCOrgY + YLPTODP(dc, pt [i+1].y));
+ return TRUE;
+}
+
+
+/**********************************************************************
* Polygon16 (GDI.36)
*/
BOOL16 Polygon16( HDC16 hdc, LPPOINT16 pt, INT16 count )
{
register int i;
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
- XPoint *points = (XPoint *) xmalloc (sizeof (XPoint) * (count+1));
+ XPoint *points;
if (!dc)
{
@@ -985,6 +1015,50 @@
return TRUE;
}
+ points = (XPoint *) xmalloc (sizeof (XPoint) * (count+1));
+ for (i = 0; i < count; i++)
+ {
+ points[i].x = dc->w.DCOrgX + XLPTODP( dc, pt[i].x );
+ points[i].y = dc->w.DCOrgY + YLPTODP( dc, pt[i].y );
+ }
+ points[count] = points[0];
+
+ if (DC_SetupGCForBrush( dc ))
+ XFillPolygon( display, dc->u.x.drawable, dc->u.x.gc,
+ points, count+1, Complex, CoordModeOrigin);
+
+ if (DC_SetupGCForPen ( dc ))
+ XDrawLines( display, dc->u.x.drawable, dc->u.x.gc,
+ points, count+1, CoordModeOrigin );
+
+ free( points );
+ return TRUE;
+}
+
+
+/**********************************************************************
+ * Polygon32 (GDI32.275)
+ *
+ * This a copy of Polygon16 so that conversion of array of
+ * LPPOINT32 to LPPOINT16 is not necessary
+ *
+ */
+BOOL32 Polygon32( HDC32 hdc, LPPOINT32 pt, INT32 count )
+{
+ register int i;
+ DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
+ XPoint *points;
+
+ if (!dc)
+ {
+ dc = (DC *)GDI_GetObjPtr(hdc, METAFILE_DC_MAGIC);
+ if (!dc) return FALSE;
+ /* FIXME: MF_MetaPoly expects LPPOINT16 not 32 */
+ /* MF_MetaPoly(dc, META_POLYGON, pt, count); */
+ return TRUE;
+ }
+
+ points = (XPoint *) xmalloc (sizeof (XPoint) * (count+1));
for (i = 0; i < count; i++)
{
points[i].x = dc->w.DCOrgX + XLPTODP( dc, pt[i].x );
diff --git a/windows/keyboard.c b/windows/keyboard.c
index 10e3ed0..0342cb9 100644
--- a/windows/keyboard.c
+++ b/windows/keyboard.c
@@ -2,11 +2,14 @@
* Keyboard related functions
*
* Copyright 1993 Bob Amstadt
+ * Copyright 1996 Albrecht Kleine
*/
+
#include <stdio.h>
#include <string.h>
#include "win.h"
#include "windows.h"
+#include "accel.h"
#include "debug.h"
extern BOOL MouseButtonsStates[3];
@@ -115,3 +118,147 @@
dprintf_key(stddeb, "GetAsyncKeyState(%x) -> %x\n", nKey, retval);
return retval;
}
+
+
+/**********************************************************************
+ * TranslateAccelerator [USER.178]
+ *
+ * FIXME: should send some WM_INITMENU or/and WM_INITMENUPOPUP -messages
+ */
+INT16 TranslateAccelerator(HWND hWnd, HACCEL16 hAccel, LPMSG16 msg)
+{
+ ACCELHEADER *lpAccelTbl;
+ int i;
+ BOOL sendmsg;
+
+ if (hAccel == 0 || msg == NULL) return 0;
+ if (msg->message != WM_KEYDOWN &&
+ msg->message != WM_KEYUP &&
+ msg->message != WM_SYSKEYDOWN &&
+ msg->message != WM_SYSKEYUP &&
+ msg->message != WM_CHAR) return 0;
+
+ dprintf_accel(stddeb, "TranslateAccelerators hAccel=%04x, hWnd=%04x,\
+msg->hwnd=%04x, msg->message=%04x\n", hAccel,hWnd,msg->hwnd,msg->message);
+
+ lpAccelTbl = (LPACCELHEADER)GlobalLock16(hAccel);
+ for (sendmsg= i = 0; i < lpAccelTbl->wCount; i++)
+ {
+ if(msg->wParam == lpAccelTbl->tbl[i].wEvent)
+ {
+ if (msg->message == WM_CHAR)
+ {
+ if ( !(lpAccelTbl->tbl[i].type & ALT_ACCEL) &&
+ !(lpAccelTbl->tbl[i].type & VIRTKEY_ACCEL) )
+ {
+ dprintf_accel(stddeb,"found accel for WM_CHAR: ('%c')",msg->wParam&0xff);
+ sendmsg=TRUE;
+ }
+ }
+ else
+ {
+ if(lpAccelTbl->tbl[i].type & VIRTKEY_ACCEL)
+ {
+ INT mask = 0;
+ dprintf_accel(stddeb,"found accel for virt_key %04x (scan %04x)",
+ msg->wParam,0xff & HIWORD(msg->lParam));
+ if(GetKeyState(VK_SHIFT) & 0x8000) mask |= SHIFT_ACCEL;
+ if(GetKeyState(VK_CONTROL) & 0x8000) mask |= CONTROL_ACCEL;
+ if(GetKeyState(VK_MENU) & 0x8000) mask |= ALT_ACCEL;
+ if(mask == (lpAccelTbl->tbl[i].type &
+ (SHIFT_ACCEL | CONTROL_ACCEL | ALT_ACCEL)))
+ sendmsg=TRUE;
+ else
+ dprintf_accel(stddeb,", but incorrect SHIFT/CTRL/ALT-state\n");
+ }
+ else
+ {
+ if (!(msg->lParam & 0x01000000)) /* no special_key */
+ {
+ if ((lpAccelTbl->tbl[i].type & ALT_ACCEL) && (msg->lParam & 0x20000000))
+ { /* ^^ ALT pressed */
+ dprintf_accel(stddeb,"found accel for Alt-%c", msg->wParam&0xff);
+ sendmsg=TRUE;
+ }
+ }
+ }
+ }
+
+ if (sendmsg) /* found an accelerator, but send a message... ? */
+ {
+ INT16 iSysStat,iStat,mesg=0;
+ HMENU16 hSysMenu,hMenu;
+
+ if (msg->message == WM_KEYUP || msg->message == WM_SYSKEYUP)
+ mesg=1;
+ else
+ if (GetCapture16())
+ mesg=2;
+ else
+ if (!IsWindowEnabled(hWnd))
+ mesg=3;
+ else
+ {
+ hMenu=GetMenu(hWnd);
+ hSysMenu=GetSystemMenu(hWnd,FALSE);
+ if (hSysMenu)
+ iSysStat=GetMenuState(hSysMenu,lpAccelTbl->tbl[i].wIDval,MF_BYCOMMAND);
+ else
+ iSysStat=-1;
+ if (hMenu)
+ iStat=GetMenuState(hMenu,lpAccelTbl->tbl[i].wIDval,MF_BYCOMMAND);
+ else
+ iStat=-1;
+ if (iSysStat!=-1)
+ {
+ if (iSysStat & (MF_DISABLED|MF_GRAYED))
+ mesg=4;
+ else
+ mesg=WM_SYSCOMMAND;
+ }
+ else
+ {
+ if (iStat!=-1)
+ {
+ if (IsIconic(hWnd))
+ mesg=5;
+ else
+ {
+ if (iStat & (MF_DISABLED|MF_GRAYED))
+ mesg=6;
+ else
+ mesg=WM_COMMAND;
+ }
+ }
+ else
+ mesg=WM_COMMAND;
+ }
+ }
+ if ( mesg==WM_COMMAND || mesg==WM_SYSCOMMAND )
+ {
+ dprintf_accel(stddeb,", sending %s, wParam=%0x\n",
+ mesg==WM_COMMAND ? "WM_COMMAND" : "WM_SYSCOMMAND",
+ lpAccelTbl->tbl[i].wIDval);
+ SendMessage16(hWnd, mesg, lpAccelTbl->tbl[i].wIDval,0x00010000L);
+ }
+ else
+ {
+ /* some reasons for NOT sending the WM_{SYS}COMMAND message:
+ * #0: unknown (please report!)
+ * #1: for WM_KEYUP,WM_SYKEYUP
+ * #2: mouse is captured
+ * #3: window is disabled
+ * #4: it's a disabled system menu option
+ * #5: it's a menu option, but window is iconic
+ * #6: it's a menu option, but disabled
+ */
+ dprintf_accel(stddeb,", but won't send WM_{SYS}COMMAND, reason is #%d\n",mesg);
+ }
+ GlobalUnlock16(hAccel);
+ return 1;
+ }
+ }
+ }
+ GlobalUnlock16(hAccel);
+ return 0;
+}
diff --git a/windows/message.c b/windows/message.c
index 05f8ad5..07e4722 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -524,8 +524,10 @@
dprintf_sendmsg(stddeb,"%*ssm: smResult = %08x\n", prevSMRL, "", (unsigned)queue->smResult );
- queue->smResult->lResult = queue->SendMessageReturn;
- queue->smResult->bPending = FALSE;
+ if (queue->smResult) { /* FIXME, smResult should always be set */
+ queue->smResult->lResult = queue->SendMessageReturn;
+ queue->smResult->bPending = FALSE;
+ }
queue->wakeBits &= ~QS_SMRESULT;
if( queue->smResult != &qCtrl )
@@ -637,7 +639,7 @@
msg->message = WM_QUIT;
msg->wParam = msgQueue->wExitCode;
msg->lParam = 0;
- if( !peek ) msgQueue->wPostQMsg = 0;
+ if (flags & PM_REMOVE) msgQueue->wPostQMsg = 0;
break;
}
@@ -902,6 +904,7 @@
LRESULT SendMessage16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam)
{
WND * wndPtr;
+ WND **list, **ppWnd;
LRESULT ret;
#ifdef CONFIG_IPC
@@ -912,8 +915,11 @@
if (hwnd == HWND_BROADCAST16)
{
dprintf_msg(stddeb,"SendMessage // HWND_BROADCAST !\n");
- for (wndPtr = WIN_GetDesktop()->child; wndPtr; wndPtr = wndPtr->next)
+ list = WIN_BuildWinArray( WIN_GetDesktop() );
+ for (ppWnd = list; *ppWnd; ppWnd++)
{
+ wndPtr = *ppWnd;
+ if (!IsWindow(wndPtr->hwndSelf)) continue;
if (wndPtr->dwStyle & WS_POPUP || wndPtr->dwStyle & WS_CAPTION)
{
dprintf_msg(stddeb,"BROADCAST Message to hWnd=%04x m=%04X w=%04lX l=%08lX !\n",
@@ -921,6 +927,7 @@
SendMessage16( wndPtr->hwndSelf, msg, wParam, lParam );
}
}
+ HeapFree( SystemHeap, 0, list );
dprintf_msg(stddeb,"SendMessage // End of HWND_BROADCAST !\n");
return TRUE;
}
@@ -975,16 +982,20 @@
LRESULT SendMessage32A(HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam)
{
WND * wndPtr;
+ WND **list, **ppWnd;
LRESULT ret;
if (hwnd == HWND_BROADCAST32)
{
- for (wndPtr = WIN_GetDesktop()->child; wndPtr; wndPtr = wndPtr->next)
+ list = WIN_BuildWinArray( WIN_GetDesktop() );
+ for (ppWnd = list; *ppWnd; ppWnd++)
{
- /* FIXME: should use something like EnumWindows here */
+ wndPtr = *ppWnd;
+ if (!IsWindow(wndPtr->hwndSelf)) continue;
if (wndPtr->dwStyle & WS_POPUP || wndPtr->dwStyle & WS_CAPTION)
SendMessage32A( wndPtr->hwndSelf, msg, wParam, lParam );
}
+ HeapFree( SystemHeap, 0, list );
return TRUE;
}
@@ -1031,16 +1042,20 @@
LRESULT SendMessage32W(HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam)
{
WND * wndPtr;
+ WND **list, **ppWnd;
LRESULT ret;
if (hwnd == HWND_BROADCAST32)
{
- for (wndPtr = WIN_GetDesktop()->child; wndPtr; wndPtr = wndPtr->next)
+ list = WIN_BuildWinArray( WIN_GetDesktop() );
+ for (ppWnd = list; *ppWnd; ppWnd++)
{
- /* FIXME: should use something like EnumWindows here */
+ wndPtr = *ppWnd;
+ if (!IsWindow(wndPtr->hwndSelf)) continue;
if (wndPtr->dwStyle & WS_POPUP || wndPtr->dwStyle & WS_CAPTION)
SendMessage32W( wndPtr->hwndSelf, msg, wParam, lParam );
}
+ HeapFree( SystemHeap, 0, list );
return TRUE;
}
diff --git a/windows/msgbox.c b/windows/msgbox.c
index 8795b8e..6cfb59f 100644
--- a/windows/msgbox.c
+++ b/windows/msgbox.c
@@ -5,12 +5,15 @@
*
*/
+#include <stdio.h>
+#include <malloc.h>
#include "windows.h"
#include "dlgs.h"
#include "module.h"
#include "win.h"
#include "resource.h"
#include "task.h"
+#include "string32.h"
typedef struct {
LPCSTR title;
@@ -171,10 +174,17 @@
}
/**************************************************************************
- * MessageBox [USER.1]
+ * MessageBox16 (USER.1)
*/
+INT16 MessageBox16( HWND16 hwnd, LPCSTR text, LPCSTR title, UINT16 type )
+{
+ return MessageBox32A( hwnd, text, title, type );
+}
-int MessageBox(HWND hWnd, LPCSTR text, LPCSTR title, WORD type)
+/**************************************************************************
+ * MessageBox32A (USER32.390)
+ */
+INT32 MessageBox32A( HWND32 hWnd, LPCSTR text, LPCSTR title, UINT32 type )
{
HANDLE16 handle;
MSGBOX mbox;
@@ -195,11 +205,37 @@
}
/**************************************************************************
+ * MessageBox32W (USER32.395)
+ */
+INT32 MessageBox32W( HWND32 hWnd, LPCWSTR text, LPCWSTR title, UINT32 type )
+{
+ HANDLE16 handle;
+ MSGBOX mbox;
+ int ret;
+
+ mbox.title = title?STRING32_DupUniToAnsi(title):NULL;
+ mbox.text = text?STRING32_DupUniToAnsi(text):NULL;
+ mbox.type = type;
+
+ fprintf(stderr,"MessageBox(%s,%s)\n",mbox.text,mbox.title);
+ handle = SYSRES_LoadResource( SYSRES_DIALOG_MSGBOX );
+ if (!handle) return 0;
+ ret = DialogBoxIndirectParam16( WIN_GetWindowInstance(hWnd),
+ handle, hWnd,
+ MODULE_GetWndProcEntry16("SystemMessageBoxProc"),
+ (LONG)&mbox );
+ SYSRES_FreeResource( handle );
+ if (title) free(mbox.title);
+ if (text) free(mbox.text);
+ return ret;
+}
+
+/**************************************************************************
* FatalAppExit [USER.137]
*/
void FatalAppExit(UINT fuAction, LPCSTR str)
{
- MessageBox(0, str, NULL, MB_SYSTEMMODAL | MB_OK);
+ MessageBox16(0, str, NULL, MB_SYSTEMMODAL | MB_OK);
TASK_KillCurrentTask(0);
}
diff --git a/windows/painting.c b/windows/painting.c
index 43af442..e3dfda3 100644
--- a/windows/painting.c
+++ b/windows/painting.c
@@ -11,6 +11,7 @@
#include "queue.h"
#include "gdi.h"
#include "dce.h"
+#include "heap.h"
#include "stddebug.h"
/* #define DEBUG_WIN */
#include "debug.h"
@@ -251,6 +252,7 @@
HRGN32 hrgn;
RECT32 rectClient;
WND* wndPtr;
+ WND **list, **ppWnd;
if (!hwnd) hwnd = GetDesktopWindow32();
if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return FALSE;
@@ -399,16 +401,20 @@
{
if (!(hrgn = CreateRectRgn32( 0, 0, 0, 0 ))) return TRUE;
if( !hrgnUpdate )
- {
+ {
control |= (RDW_C_DELETEHRGN | RDW_C_USEHRGN);
if( !(hrgnUpdate = CreateRectRgnIndirect32( rectUpdate )) )
{
DeleteObject32( hrgn );
return TRUE;
}
- }
- for (wndPtr = wndPtr->child; wndPtr; wndPtr = wndPtr->next)
- if( wndPtr->dwStyle & WS_VISIBLE )
+ }
+ list = WIN_BuildWinArray( wndPtr );
+ for (ppWnd = list; *ppWnd; ppWnd++)
+ {
+ wndPtr = *ppWnd;
+ if (!IsWindow(wndPtr->hwndSelf)) continue;
+ if (wndPtr->dwStyle & WS_VISIBLE)
{
SetRectRgn( hrgn, wndPtr->rectWindow.left,
wndPtr->rectWindow.top,
@@ -421,11 +427,22 @@
PAINT_RedrawWindow( wndPtr->hwndSelf, NULL, hrgn, flags,
RDW_C_USEHRGN );
}
+ }
+ HeapFree( SystemHeap, 0, list );
DeleteObject32( hrgn );
if (control & RDW_C_DELETEHRGN) DeleteObject32( hrgnUpdate );
}
- else for (wndPtr = wndPtr->child; wndPtr; wndPtr = wndPtr->next)
- PAINT_RedrawWindow( wndPtr->hwndSelf, NULL, 0, flags, 0 );
+ else
+ {
+ list = WIN_BuildWinArray( wndPtr );
+ for (ppWnd = list; *ppWnd; ppWnd++)
+ {
+ wndPtr = *ppWnd;
+ if (IsWindow( wndPtr->hwndSelf ))
+ PAINT_RedrawWindow( wndPtr->hwndSelf, NULL, 0, flags, 0 );
+ }
+ HeapFree( SystemHeap, 0, list );
+ }
}
return TRUE;
diff --git a/windows/win.c b/windows/win.c
index 56cfa04..05f52b8 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -1607,15 +1607,31 @@
/*******************************************************************
- * GetWindowTextLength (USER.38)
+ * GetWindowTextLength16 (USER.38)
*/
-int GetWindowTextLength(HWND hwnd)
+INT16 GetWindowTextLength16( HWND16 hwnd )
{
- return (int)SendMessage16(hwnd, WM_GETTEXTLENGTH, 0, 0 );
+ return (INT16)SendMessage16( hwnd, WM_GETTEXTLENGTH, 0, 0 );
}
/*******************************************************************
+ * GetWindowTextLength32A (USER32.309)
+ */
+INT32 GetWindowTextLength32A( HWND32 hwnd )
+{
+ return SendMessage32A( hwnd, WM_GETTEXTLENGTH, 0, 0 );
+}
+
+/*******************************************************************
+ * GetWindowTextLength32W (USER32.309)
+ */
+INT32 GetWindowTextLength32W( HWND32 hwnd )
+{
+ return SendMessage32W( hwnd, WM_GETTEXTLENGTH, 0, 0 );
+}
+
+/*******************************************************************
* IsWindow (USER.47) (USER32.347)
*/
BOOL16 IsWindow( HWND32 hwnd )
