Release 950918
Sun Sep 17 16:47:49 1995 Alexandre Julliard <julliard@sunsite.unc.edu>
* [configure.in] [*/Makefile.in] [Make.rules.in]
Cleaned up makefiles, added configuration option for Winelib,
grouped common make rules in Make.rules.in.
* [Configure]
Renamed to 'Configure.old'; please use 'configure' instead.
* [controls/menu.c]
Fixed DestroyMenu() to avoid deleting the same menu twice.
More fixes to WM_MENUSELECT, and added WM_INITMENU.
* [if1632/relay.c]
Fixed wrong register values displayed by RELAY_DebugCall32().
* [memory/local.c]
Fixed LocalLock() and LocalUnlock() to increment/decrement the
lock count for moveable blocks.
* [misc/commdlg.c] [misc/shell.c] [rc/winerc.c]
Modified the generated C file so that the resource information
(size, etc.) is also exported.
Modified common dialogs to use the new informations.
* [misc/main.c] [ANNOUNCE]
Update the list of contributors. Please let me know if I forgot
someone.
* [rc/sysres.rc] [rc/sysres_En.rc]
Moved English resources to sysres_En.rc.
Changed ids from numeric to symbolic for dialogs.
* [windows/dialog.c]
Modified template parsing to be able to pass segmented pointers to
CreateWindow().
* [windows/win.c]
CreateWindow() now takes segmented pointers for class and window
names.
Maxmimize or minimize the window upon creation if the WS_MAXIMIZE
or WS_MINIMIZE bits are set.
Thu Sep 14 17:19:57 1995 Paul Wilhelm <paul@paul.accessone.com>
* [controls/scroll.c]
Fixed scroll-bar bugs for non-client windows.
Thu Sep 14 14:04:14 MET DST 1995 Jochen Hoenicke <Jochen.Hoenicke@arbi.Informatik.Uni-Oldenburg.de>
* [include/cursor.h] [windows/cursor.c]
Cursor is not mirrored any more and the hotspot is set right.
Wed Sep 13 14:22:31 1995 Marcus Meissner <msmeissn@faui01.informatik.uni-erlangen.de>
* [ole.h]
Misc small fixes.
Mon Sep 4 00:01:23 1995 Jon Tombs <jon@gte.esi.us.es>
* [rc/sysres_Es.rc]
First attempt at Spanish [Es] language support.
Sun Sep 3 13:22:33 1995 Martin von Loewis <loewis@informatik.hu-berlin.de>
* [include/alias.h][windows/alias.c][include/relay32.h]
New files
* [controls/widgets.c]
WIDGETS_Init: register alias window procedures
* [if1632/callback.c]
CallWndProc: Call alias functions if necessary
* [if1632/gdi32.spec]
GetStockObject, TextOutA: new relays
* [misc/user32.c][if1632/user32.spec][misc/Makefile.in][misc/Imakefile]
user32.c: new file
BeginPaint,CreateWindowExA,DefWindowProcA,DispatchMessage,EndPaint,
GetMessageA,RegisterClassA,ShowWindow,UpdateWindow: new relays
* [if1632/winprocs32.spec][loader/pe_image.c][loader/module.c]
PE_Win32CallToStart: new function
MODULE_CreateInstance: removed static attribute
LoadModule: Try loading PE image on error 21
PE_LoadModule: new function
PE_LoadImage: initialize pe_data with 0
* [include/dlls.h][include/peexe.h]
moved pe_data and w_files to peexe.h
* [misc/shell.c]
ShellAbout: Register AboutWndProc aliases
* [miscemu/int21.c]
handle 0x440A and 0xDC
* [miscemu/int2f.c]
handle 0x84
* [objects/dib.c]
CreateDIBitmap: complain if BITMAPINFOHEADER is of wrong size
* [tools/build.c]
include windows.h and relay32.h into generated Win32 relays,
don't declare the implementation as int (*)();
limit in WIN32_builtin was off by one
* [windows/caret.c]
CARET_Initialize: new function, call on strategic places
* [windows/messagebox.c]
MessageBox: register message box proc aliases
* [if1632/advapi32.spec][if1632/comdlg32.spec]
New files
* [if1632/Makefile.in][if1632/Imakefile][if1632/relay32.c]
added new spec files
RELAY32_GetBuiltinDLL: perform lookup case insensitive
RELAY32_GetEntryPoint: start name search at 0
* [if1632/user.spec][if1632/kernel.spec][if1632/gdi.spec]
Added stubs for new Win95 API
Sat Sep 2 1995 Martin Roy
* [misc/commdlg.c]
In WM_INITDIALOG, current filter must reflect lpofn->nFilterIndex.
When process IDOK button in FILEDLG_WMCommand(),
lpofn->nFilterIndex should be updated to current selection.
Thu Aug 31 15:00:00 1995 Ram'on Garc'ia <ramon@ie3.clubs.etsit.upm.es>
* [loader/module.c] [loader/ne_image.c]
Added support of self-loading modules.
diff --git a/controls/Makefile.in b/controls/Makefile.in
index 02cbb3b..3b018a4 100644
--- a/controls/Makefile.in
+++ b/controls/Makefile.in
@@ -1,39 +1,20 @@
-CC = @CC@
-CFLAGS = @CFLAGS@
-XINCL = @x_includes@
TOPSRC = @top_srcdir@
-DIVINCL = -I$(TOPSRC)/include
-LD = @LD@
-LDCOMBINEFLAGS = @LDCOMBINEFLAGS@
MODULE = controls
-SRCS = button.c combo.c desktop.c edit.c listbox.c menu.c scroll.c \
- static.c widgets.c
-
-OBJS = $(SRCS:.c=.o)
-
-.c.o:
- $(CC) -c $(CFLAGS) $(XINCL) $(DIVINCL) -o $*.o $<
+C_SRCS = \
+ button.c \
+ combo.c \
+ desktop.c \
+ edit.c \
+ listbox.c \
+ menu.c \
+ scroll.c \
+ static.c \
+ widgets.c
all: $(MODULE).o
-$(MODULE).o: $(OBJS)
- $(LD) $(LDCOMBINEFLAGS) $(OBJS) -o $(MODULE).o
-
-depend:
- sed '/\#\#\# Dependencies/q' < Makefile > tmp_make
- $(CC) $(DIVINCL) $(XINCL) -MM *.c >> tmp_make
- mv tmp_make Makefile
-
-clean:
- rm -f *.o \#*\# *~ *.bak tmp_make
-
-distclean: clean
- rm -f Makefile
-
-countryclean:
-
-dummy:
+@MAKE_RULES@
### Dependencies:
diff --git a/controls/combo.c b/controls/combo.c
index 1600a23..77374cd 100644
--- a/controls/combo.c
+++ b/controls/combo.c
@@ -14,13 +14,14 @@
#include "windows.h"
#include "sysmetrics.h"
#include "combo.h"
+#include "stackframe.h"
#include "user.h"
#include "win.h"
-#include "stddebug.h"
-#include "debug.h"
#include "graphics.h"
#include "listbox.h"
#include "dos_fs.h"
+#include "stddebug.h"
+#include "debug.h"
/*
* Note: Combos are probably implemented in a different way by Windows.
@@ -127,7 +128,7 @@
dprintf_combo(stddeb,"CBS_SIMPLE\n");
SetRectEmpty(&lphc->RectButton);
lphc->LBoxTop = lphl->StdItemHeight;
- lphc->hWndEdit = CreateWindow(editName, "",
+ lphc->hWndEdit = CreateWindow(MAKE_SEGPTR(editName), (SEGPTR)0,
WS_CHILD | WS_CLIPCHILDREN | WS_VISIBLE | SS_LEFT,
0, 0, rect.right, lphl->StdItemHeight,
hwnd, 1, GetWindowWord(hwnd,GWW_HINSTANCE), 0L);
@@ -141,7 +142,7 @@
SetWindowPos(hwnd, 0, 0, 0, rect.right - rect.left + 2*SYSMETRICS_CXBORDER,
lphl->StdItemHeight + 2*SYSMETRICS_CYBORDER,
SWP_NOMOVE | SWP_NOZORDER);
- lphc->hWndEdit = CreateWindow(editName, "",
+ lphc->hWndEdit = CreateWindow(MAKE_SEGPTR(editName), (SEGPTR)0,
WS_CHILD | WS_CLIPCHILDREN | WS_VISIBLE | SS_LEFT,
0, 0, lphc->RectButton.left, lphl->StdItemHeight,
hwnd, 1, GetWindowWord(hwnd,GWW_HINSTANCE), 0L);
@@ -161,7 +162,7 @@
/* FIXME: WinSight says these should be CHILD windows with the TOPMOST flag
* set. Wine doesn't support TOPMOST, and simply setting the WS_CHILD
* flag doesn't work. */
- lphc->hWndLBox = CreateWindow(className, "",
+ lphc->hWndLBox = CreateWindow(MAKE_SEGPTR(className), (SEGPTR)0,
WS_POPUP | WS_BORDER | WS_VSCROLL,
lboxrect.left, lboxrect.top,
lboxrect.right - lboxrect.left,
diff --git a/controls/menu.c b/controls/menu.c
index 598de3a..250f424 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -29,6 +29,7 @@
/* #define DEBUG_MENUSHORTCUT */
#include "debug.h"
+#include "../rc/sysres.h"
/* Dimension of the menu bitmaps */
static WORD check_bitmap_width = 0, check_bitmap_height = 0;
@@ -673,7 +674,7 @@
{
WND *wndPtr = WIN_FindWndPtr( hwndOwner );
if (!wndPtr) return FALSE;
- menu->hWnd = CreateWindow( (LPSTR)POPUPMENU_CLASS_ATOM, "",
+ menu->hWnd = CreateWindow( POPUPMENU_CLASS_ATOM, (SEGPTR)0,
WS_POPUP | WS_BORDER, x, y,
menu->Width + 2*SYSMETRICS_CXBORDER,
menu->Height + 2*SYSMETRICS_CYBORDER,
@@ -732,18 +733,25 @@
if (lppop->FocusedItem != NO_SELECTED_ITEM)
{
if (lppop->FocusedItem == SYSMENU_SELECTED)
+ {
NC_DrawSysButton( lppop->hWnd, hdc, TRUE );
+ SendMessage( hwndOwner, WM_MENUSELECT,
+ GetSystemMenu( lppop->hWnd, FALSE ),
+ MAKELONG( lppop->wFlags | MF_MOUSESELECT, hmenu ) );
+ }
else
{
items[lppop->FocusedItem].item_flags |= MF_HILITE;
MENU_DrawMenuItem( lppop->hWnd, hdc, &items[lppop->FocusedItem], lppop->Height,
!(lppop->wFlags & MF_POPUP) );
- dprintf_menu(stddeb,"Sending WM_MENUSELECT %04x %04x\n", items[lppop->FocusedItem].item_id,items[lppop->FocusedItem].item_flags);
SendMessage( hwndOwner, WM_MENUSELECT,
items[lppop->FocusedItem].item_id,
MAKELONG( items[lppop->FocusedItem].item_flags | MF_MOUSESELECT, hmenu));
}
}
+ else SendMessage( hwndOwner, WM_MENUSELECT, hmenu,
+ MAKELONG( lppop->wFlags | MF_MOUSESELECT, hmenu ) );
+
ReleaseDC( lppop->hWnd, hdc );
}
@@ -1399,6 +1407,7 @@
{
WND *wndPtr = WIN_FindWndPtr( hwnd );
SendMessage( hwnd, WM_ENTERMENULOOP, 0, 0 );
+ SendMessage( hwnd, WM_INITMENU, wndPtr->wIDmenu, 0 );
MENU_TrackMenu( (HMENU)wndPtr->wIDmenu, TPM_LEFTALIGN | TPM_LEFTBUTTON,
pt.x, pt.y, hwnd, NULL );
SendMessage( hwnd, WM_EXITMENULOOP, 0, 0 );
@@ -1415,6 +1424,7 @@
WND *wndPtr = WIN_FindWndPtr( hwnd );
if (!wndPtr->wIDmenu) return;
SendMessage( hwnd, WM_ENTERMENULOOP, 0, 0 );
+ SendMessage( hwnd, WM_INITMENU, wndPtr->wIDmenu, 0 );
/* Select first selectable item */
MENU_SelectItem( hwnd, wndPtr->wIDmenu, NO_SELECTED_ITEM );
MENU_SelectNextItem( hwnd, (HMENU)wndPtr->wIDmenu );
@@ -1425,7 +1435,7 @@
/**********************************************************************
- * TrackPopupMenu [USER.416]
+ * TrackPopupMenu (USER.416)
*/
BOOL TrackPopupMenu( HMENU hMenu, WORD wFlags, short x, short y,
short nReserved, HWND hWnd, LPRECT lpRect )
@@ -1932,28 +1942,29 @@
*/
BOOL DestroyMenu(HMENU hMenu)
{
- LPPOPUPMENU lppop;
- dprintf_menu(stddeb,"DestroyMenu (%04X) !\n", hMenu);
- if (hMenu == 0) return FALSE;
- lppop = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hMenu);
- if (lppop == NULL) return FALSE;
- if ((lppop->wFlags & MF_POPUP) && lppop->hWnd)
- DestroyWindow( lppop->hWnd );
+ LPPOPUPMENU lppop;
+ dprintf_menu(stddeb,"DestroyMenu (%04X) !\n", hMenu);
+ if (hMenu == 0) return FALSE;
+ lppop = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hMenu);
+ if (!lppop || (lppop->wMagic != MENU_MAGIC)) return FALSE;
+ lppop->wMagic = 0; /* Mark it as destroyed */
+ if ((lppop->wFlags & MF_POPUP) && lppop->hWnd)
+ DestroyWindow( lppop->hWnd );
- if (lppop->hItems)
- {
- int i;
- MENUITEM *item = (MENUITEM *) USER_HEAP_LIN_ADDR( lppop->hItems );
- for (i = lppop->nItems; i > 0; i--, item++)
- {
- if (item->item_flags & MF_POPUP)
- DestroyMenu( item->item_id );
- }
- USER_HEAP_FREE( lppop->hItems );
- }
- USER_HEAP_FREE( hMenu );
- dprintf_menu(stddeb,"DestroyMenu (%04X) // End !\n", hMenu);
- return TRUE;
+ if (lppop->hItems)
+ {
+ int i;
+ MENUITEM *item = (MENUITEM *) USER_HEAP_LIN_ADDR( lppop->hItems );
+ for (i = lppop->nItems; i > 0; i--, item++)
+ {
+ if (item->item_flags & MF_POPUP)
+ DestroyMenu( item->item_id );
+ }
+ USER_HEAP_FREE( lppop->hItems );
+ }
+ USER_HEAP_FREE( hMenu );
+ dprintf_menu(stddeb,"DestroyMenu (%04X) // End !\n", hMenu);
+ return TRUE;
}
/**********************************************************************
@@ -2137,10 +2148,10 @@
{
HMENU hMenu;
LPPOPUPMENU menu;
- extern unsigned char sysres_MENU_SYSMENU[];
- hMenu=LoadMenuIndirect(sysres_MENU_SYSMENU);
- if(!hMenu){
+ hMenu = LoadMenuIndirect( sysres_MENU_SYSMENU.bytes );
+ if(!hMenu)
+ {
dprintf_menu(stddeb,"No SYSMENU\n");
return 0;
}
diff --git a/controls/scroll.c b/controls/scroll.c
index 11b8e20..230b7b4 100644
--- a/controls/scroll.c
+++ b/controls/scroll.c
@@ -593,12 +593,14 @@
(hittest == trackHitTest), FALSE );
if (hittest == trackHitTest)
{
- SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
- SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
- (FARPROC)0 );
if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER))
+ {
+ SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
+ SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
+ (FARPROC)0 );
SendMessage( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
SB_LINEUP, MAKELONG( 0, hwndCtl ));
+ }
}
else KillSystemTimer( hwnd, SCROLL_TIMER );
break;
@@ -609,12 +611,14 @@
(hittest == trackHitTest), FALSE );
if (hittest == trackHitTest)
{
- SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
- SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
- (FARPROC)0 );
if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER))
+ {
+ SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
+ SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
+ (FARPROC)0 );
SendMessage( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
SB_PAGEUP, MAKELONG( 0, hwndCtl ));
+ }
}
else KillSystemTimer( hwnd, SCROLL_TIMER );
break;
@@ -653,12 +657,14 @@
FALSE, (hittest == trackHitTest) );
if (hittest == trackHitTest)
{
- SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
- SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
- (FARPROC)0 );
if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER))
+ {
+ SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
+ SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
+ (FARPROC)0 );
SendMessage( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
SB_PAGEDOWN, MAKELONG( 0, hwndCtl ));
+ }
}
else KillSystemTimer( hwnd, SCROLL_TIMER );
break;
@@ -668,12 +674,14 @@
FALSE, (hittest == trackHitTest) );
if (hittest == trackHitTest)
{
- SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
- SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
- (FARPROC)0 );
if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER))
+ {
+ SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
+ SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
+ (FARPROC)0 );
SendMessage( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
SB_LINEDOWN, MAKELONG( 0, hwndCtl ));
+ }
}
else KillSystemTimer( hwnd, SCROLL_TIMER );
break;
diff --git a/controls/widgets.c b/controls/widgets.c
index cd04b2b..34d678a 100644
--- a/controls/widgets.c
+++ b/controls/widgets.c
@@ -14,6 +14,8 @@
#include "user.h"
#include "selectors.h"
#include "stackframe.h"
+#include "alias.h"
+#include "relay32.h"
static WNDCLASS WIDGETS_BuiltinClasses[] =
{
@@ -58,11 +60,20 @@
for (i = 0; i < NB_BUILTIN_CLASSES; i++, class++)
{
+ DWORD WineProc,Win16Proc,Win32Proc;
+ /* currently, there is no way to get the 'real' pointer at run time */
+ WineProc=0;
+ Win16Proc = GetWndProcEntry16( (char *)class->lpfnWndProc );
+ Win32Proc = (DWORD)RELAY32_GetEntryPoint(
+ "WINPROCS32",(char *)class->lpfnWndProc, 0);
+ /* Register the alias so we don't pass Win16 pointers to Win32 apps */
+ ALIAS_RegisterAlias(WineProc,Win16Proc,Win32Proc);
+
strcpy( name, (char *)class->lpszClassName );
class->lpszClassName = MAKE_SEGPTR(name);
- class->hCursor = LoadCursor( 0, IDC_ARROW );
+ class->hCursor = LoadCursor( 0, IDC_ARROW );
class->lpfnWndProc = GetWndProcEntry16( (char *)class->lpfnWndProc );
- if (!RegisterClass( class )) return FALSE;
+ if (!RegisterClass( class )) return FALSE;
}
return TRUE;
}
