ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved most builtin controls structures into their respective C file. 

Created new controls.h file private to user32.dll and moved remaining
builtin controls definitions there.
This commit is contained in:
Alexandre Julliard 2000-12-10 23:01:33 +00:00
parent 84f91bd3fc
commit 91222da881
41 changed files with 570 additions and 587 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Make.rules.in
View File

@ -38,7 +38,7 @@ LIBEXT = @LIBEXT@
LDSHARED = @LDSHARED@ LDSHARED = @LDSHARED@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
LN_S = @LN_S@ LN_S = @LN_S@
DIVINCL = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include DIVINCL = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL)
ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(DEFS) $(OPTIONS) $(X_CFLAGS) ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(DEFS) $(OPTIONS) $(X_CFLAGS)
LDCOMBINE = @LDCOMBINE@ LDCOMBINE = @LDCOMBINE@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@

4
controls/Makefile.in
View File

@ -4,6 +4,7 @@ TOPOBJDIR = ..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = controls MODULE = controls
EXTRAINCL = -I$(TOPSRCDIR)/dlls/user
C_SRCS = \ C_SRCS = \
button.c \ button.c \
@ -15,8 +16,7 @@ C_SRCS = \
menu.c \ menu.c \
scroll.c \ scroll.c \
static.c \ static.c \
uitools.c \ uitools.c
widgets.c
GLUE = edit.c GLUE = edit.c

46
controls/button.c
View File

@ -8,13 +8,36 @@
#include <string.h> #include <string.h>
#include <stdlib.h> /* for abs() */ #include <stdlib.h> /* for abs() */
#include "win.h" #include "win.h"
#include "button.h"
#include "winbase.h" #include "winbase.h"
#include "windef.h" #include "windef.h"
#include "wingdi.h" #include "wingdi.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "controls.h"
#include "tweak.h" #include "tweak.h"
/* Note: under MS-Windows, state is a BYTE and this structure is
* only 3 bytes long. I don't think there are programs out there
* broken enough to rely on this :-)
*/
typedef struct
{
WORD state; /* Current state */
HFONT16 hFont; /* Button font (or 0 for system font) */
HANDLE hImage; /* Handle to the image or the icon */
} BUTTONINFO;
/* Button state values */
#define BUTTON_UNCHECKED 0x00
#define BUTTON_CHECKED 0x01
#define BUTTON_3STATE 0x02
#define BUTTON_HIGHLIGHTED 0x04
#define BUTTON_HASFOCUS 0x08
#define BUTTON_NSTATES 0x0F
/* undocumented flags */
#define BUTTON_BTNPRESSED 0x40
#define BUTTON_UNKNOWN2 0x20
#define BUTTON_UNKNOWN3 0x10
static void PB_Paint( WND *wndPtr, HDC hDC, WORD action ); static void PB_Paint( WND *wndPtr, HDC hDC, WORD action );
static void CB_Paint( WND *wndPtr, HDC hDC, WORD action ); static void CB_Paint( WND *wndPtr, HDC hDC, WORD action );
static void GB_Paint( WND *wndPtr, HDC hDC, WORD action ); static void GB_Paint( WND *wndPtr, HDC hDC, WORD action );
@ -22,6 +45,8 @@ static void UB_Paint( WND *wndPtr, HDC hDC, WORD action );
static void OB_Paint( WND *wndPtr, HDC hDC, WORD action ); static void OB_Paint( WND *wndPtr, HDC hDC, WORD action );
static void BUTTON_CheckAutoRadioButton( WND *wndPtr ); static void BUTTON_CheckAutoRadioButton( WND *wndPtr );
static void BUTTON_DrawPushButton( WND *wndPtr, HDC hDC, WORD action, BOOL pushedState); static void BUTTON_DrawPushButton( WND *wndPtr, HDC hDC, WORD action, BOOL pushedState);
static LRESULT WINAPI ButtonWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
static LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
#define MAX_BTN_TYPE 12 #define MAX_BTN_TYPE 12
@ -73,6 +98,21 @@ static HBITMAP hbitmapCheckBoxes = 0;
static WORD checkBoxWidth = 0, checkBoxHeight = 0; static WORD checkBoxWidth = 0, checkBoxHeight = 0;
/*********************************************************************
* button class descriptor
*/
const struct builtin_class_descr BUTTON_builtin_class =
{
"Button", /* name */
CS_GLOBALCLASS | CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */
ButtonWndProcA, /* procA */
ButtonWndProcW, /* procW */
sizeof(BUTTONINFO), /* extra */
IDC_ARROWA, /* cursor */
0 /* brush */
};
/*********************************************************************** /***********************************************************************
* ButtonWndProc_locked * ButtonWndProc_locked
* *
@ -365,7 +405,7 @@ static inline LRESULT WINAPI ButtonWndProc_locked(WND* wndPtr, UINT uMsg,
* the passed HWND and calls the real window procedure (with a WND* * the passed HWND and calls the real window procedure (with a WND*
* pointer pointing to the locked windowstructure). * pointer pointing to the locked windowstructure).
*/ */
LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) static LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
{ {
LRESULT res; LRESULT res;
WND *wndPtr = WIN_FindWndPtr(hWnd); WND *wndPtr = WIN_FindWndPtr(hWnd);
@ -380,7 +420,7 @@ LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara
/*********************************************************************** /***********************************************************************
* ButtonWndProcA * ButtonWndProcA
*/ */
LRESULT WINAPI ButtonWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) static LRESULT WINAPI ButtonWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
{ {
LRESULT res; LRESULT res;
WND *wndPtr = WIN_FindWndPtr(hWnd); WND *wndPtr = WIN_FindWndPtr(hWnd);

26
controls/combo.c
View File

@ -17,7 +17,7 @@
#include "spy.h" #include "spy.h"
#include "user.h" #include "user.h"
#include "heap.h" #include "heap.h"
#include "combo.h" #include "controls.h"
#include "drive.h" #include "drive.h"
#include "debugtools.h" #include "debugtools.h"
#include "tweak.h" #include "tweak.h"
@ -57,6 +57,24 @@ static UINT CBitHeight, CBitWidth;
#define COMBO_EDITBUTTONSPACE() ( (TWEAK_WineLook == WIN31_LOOK) ? 8 : 0 ) #define COMBO_EDITBUTTONSPACE() ( (TWEAK_WineLook == WIN31_LOOK) ? 8 : 0 )
#define EDIT_CONTROL_PADDING() ( (TWEAK_WineLook == WIN31_LOOK) ? 0 : 1 ) #define EDIT_CONTROL_PADDING() ( (TWEAK_WineLook == WIN31_LOOK) ? 0 : 1 )
static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );
/*********************************************************************
* combo class descriptor
*/
const struct builtin_class_descr COMBO_builtin_class =
{
"ComboBox", /* name */
CS_GLOBALCLASS | CS_PARENTDC | CS_DBLCLKS, /* style */
ComboWndProcA, /* procA */
NULL, /* procW (FIXME) */
sizeof(HEADCOMBO *), /* extra */
IDC_ARROWA, /* cursor */
0 /* brush */
};
/*********************************************************************** /***********************************************************************
* COMBO_Init * COMBO_Init
* *
@ -2147,18 +2165,16 @@ static inline LRESULT WINAPI ComboWndProc_locked( WND* pWnd, UINT message,
} }
/*********************************************************************** /***********************************************************************
* ComboWndProc * ComboWndProcA
* *
* This is just a wrapper for the real ComboWndProc which locks/unlocks * This is just a wrapper for the real ComboWndProc which locks/unlocks
* window structs. * window structs.
*/ */
LRESULT WINAPI ComboWndProc( HWND hwnd, UINT message, static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam )
WPARAM wParam, LPARAM lParam )
{ {
WND* pWnd = WIN_FindWndPtr(hwnd); WND* pWnd = WIN_FindWndPtr(hwnd);
LRESULT retvalue = ComboWndProc_locked(pWnd,message,wParam,lParam); LRESULT retvalue = ComboWndProc_locked(pWnd,message,wParam,lParam);
WIN_ReleaseWndPtr(pWnd); WIN_ReleaseWndPtr(pWnd);
return retvalue; return retvalue;
} }

30
controls/desktop.c
View File

@ -8,14 +8,39 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "desktop.h"
#include "windef.h" #include "windef.h"
#include "wingdi.h" #include "wingdi.h"
#include "heap.h" #include "heap.h"
#include "user.h" #include "user.h"
#include "win.h" #include "win.h"
#include "controls.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
typedef struct
{
HBRUSH hbrushPattern;
HBITMAP hbitmapWallPaper;
SIZE bitmapSize;
BOOL fTileWallPaper;
} DESKTOP;
static LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam );
/*********************************************************************
* desktop class descriptor
*/
const struct builtin_class_descr DESKTOP_builtin_class =
{
DESKTOP_CLASS_ATOM, /* name */
CS_GLOBALCLASS, /* style */
NULL, /* procA (winproc is Unicode only) */
DesktopWndProc, /* procW */
sizeof(DESKTOP), /* extra */
IDC_ARROWA, /* cursor */
COLOR_BACKGROUND+1 /* brush */
};
/*********************************************************************** /***********************************************************************
* DESKTOP_LoadBitmap * DESKTOP_LoadBitmap
@ -183,8 +208,7 @@ static inline LRESULT WINAPI DesktopWndProc_locked( WND *wndPtr, UINT message,
* This is just a wrapper for the DesktopWndProc which does windows * This is just a wrapper for the DesktopWndProc which does windows
* locking and unlocking. * locking and unlocking.
*/ */
LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, static LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam )
WPARAM wParam, LPARAM lParam )
{ {
WND *wndPtr = WIN_FindWndPtr( hwnd ); WND *wndPtr = WIN_FindWndPtr( hwnd );
LRESULT retvalue = DesktopWndProc_locked(wndPtr,message,wParam,lParam); LRESULT retvalue = DesktopWndProc_locked(wndPtr,message,wParam,lParam);

25
controls/edit.c
View File

@ -21,7 +21,7 @@
#include "win.h" #include "win.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "combo.h" #include "controls.h"
#include "local.h" #include "local.h"
#include "selectors.h" #include "selectors.h"
#include "debugtools.h" #include "debugtools.h"
@ -253,6 +253,24 @@ static void EDIT_WM_Timer(WND *wnd, EDITSTATE *es);
static LRESULT EDIT_WM_VScroll(WND *wnd, EDITSTATE *es, INT action, INT pos); static LRESULT EDIT_WM_VScroll(WND *wnd, EDITSTATE *es, INT action, INT pos);
static void EDIT_UpdateText(WND *wnd, LPRECT rc, BOOL bErase); static void EDIT_UpdateText(WND *wnd, LPRECT rc, BOOL bErase);
LRESULT WINAPI EditWndProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );
/*********************************************************************
* edit class descriptor
*/
const struct builtin_class_descr EDIT_builtin_class =
{
"Edit", /* name */
CS_GLOBALCLASS | CS_DBLCLKS /*| CS_PARENTDC*/, /* style */
EditWndProc, /* procA */
NULL, /* procW (FIXME) */
sizeof(EDITSTATE *), /* extra */
IDC_IBEAMA, /* cursor */
0 /* brush */
};
/********************************************************************* /*********************************************************************
* *
@ -342,7 +360,7 @@ static DWORD get_app_version(void)
/********************************************************************* /*********************************************************************
* *
* EditWndProc() * EditWndProc (USER32.@)
* *
* The messages are in the order of the actual integer values * The messages are in the order of the actual integer values
* (which can be found in include/windows.h) * (which can be found in include/windows.h)
@ -353,8 +371,7 @@ static DWORD get_app_version(void)
* names). * names).
* *
*/ */
LRESULT WINAPI EditWndProc( HWND hwnd, UINT msg, LRESULT WINAPI EditWndProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam )
WPARAM wParam, LPARAM lParam )
{ {
WND *wnd = WIN_FindWndPtr(hwnd); WND *wnd = WIN_FindWndPtr(hwnd);
EDITSTATE *es = *(EDITSTATE **)((wnd)->wExtra); EDITSTATE *es = *(EDITSTATE **)((wnd)->wExtra);

40
controls/icontitle.c
View File

@ -12,24 +12,30 @@
#include "winuser.h" #include "winuser.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "controls.h"
#include "win.h" #include "win.h"
#include "heap.h" #include "heap.h"
static BOOL bMultiLineTitle; static BOOL bMultiLineTitle;
static HFONT hIconTitleFont; static HFONT hIconTitleFont;
/*********************************************************************** static LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam );
* ICONTITLE_Init
*/ /*********************************************************************
BOOL ICONTITLE_Init(void) * icon title class descriptor
{ */
LOGFONTA logFont; const struct builtin_class_descr ICONTITLE_builtin_class =
{
ICONTITLE_CLASS_ATOM, /* name */
CS_GLOBALCLASS, /* style */
NULL, /* procA (winproc is Unicode only) */
IconTitleWndProc, /* procW */
0, /* extra */
IDC_ARROWA, /* cursor */
0 /* brush */
};
SystemParametersInfoA( SPI_GETICONTITLELOGFONT, 0, &logFont, 0 );
SystemParametersInfoA( SPI_GETICONTITLEWRAP, 0, &bMultiLineTitle, 0 );
hIconTitleFont = CreateFontIndirectA( &logFont );
return (hIconTitleFont) ? TRUE : FALSE;
}
/*********************************************************************** /***********************************************************************
* ICONTITLE_Create * ICONTITLE_Create
@ -194,6 +200,16 @@ LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg,
switch( msg ) switch( msg )
{ {
case WM_CREATE:
if (!hIconTitleFont)
{
LOGFONTA logFont;
SystemParametersInfoA( SPI_GETICONTITLELOGFONT, 0, &logFont, 0 );
SystemParametersInfoA( SPI_GETICONTITLEWRAP, 0, &bMultiLineTitle, 0 );
hIconTitleFont = CreateFontIndirectA( &logFont );
}
retvalue = (hIconTitleFont) ? 0 : -1;
goto END;
case WM_NCHITTEST: case WM_NCHITTEST:
retvalue = HTCAPTION; retvalue = HTCAPTION;
goto END; goto END;
@ -243,7 +259,7 @@ LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg,
} }
} }
retvalue = DefWindowProcA( hWnd, msg, wParam, lParam ); retvalue = DefWindowProcW( hWnd, msg, wParam, lParam );
END: END:
WIN_ReleaseWndPtr(wnd); WIN_ReleaseWndPtr(wnd);
return retvalue; return retvalue;

48
controls/listbox.c
View File

@ -18,7 +18,7 @@
#include "spy.h" #include "spy.h"
#include "selectors.h" #include "selectors.h"
#include "win.h" #include "win.h"
#include "combo.h" #include "controls.h"
#include "debugtools.h" #include "debugtools.h"
#include "tweak.h" #include "tweak.h"
@ -111,6 +111,39 @@ typedef enum
static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE;
static LRESULT WINAPI ComboLBWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );
static LRESULT WINAPI ListBoxWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );
/*********************************************************************
* listbox class descriptor
*/
const struct builtin_class_descr LISTBOX_builtin_class =
{
"ListBox", /* name */
CS_GLOBALCLASS | CS_DBLCLKS /*| CS_PARENTDC*/, /* style */
ListBoxWndProcA, /* procA */
NULL, /* procW (FIXME) */
sizeof(LB_DESCR *), /* extra */
IDC_ARROWA, /* cursor */
0 /* brush */
};
/*********************************************************************
* combolbox class descriptor
*/
const struct builtin_class_descr COMBOLBOX_builtin_class =
{
"ComboLBox", /* name */
CS_GLOBALCLASS | CS_DBLCLKS | CS_SAVEBITS, /* style */
ComboLBWndProcA, /* procA */
NULL, /* procW (FIXME) */
sizeof(LB_DESCR *), /* extra */
IDC_ARROWA, /* cursor */
0 /* brush */
};
/*********************************************************************** /***********************************************************************
* LISTBOX_Dump * LISTBOX_Dump
@ -2855,13 +2888,12 @@ static inline LRESULT WINAPI ListBoxWndProc_locked( WND* wnd, UINT msg,
} }
/*********************************************************************** /***********************************************************************
* ListBoxWndProc * ListBoxWndProcA
* *
* This is just a wrapper for the real wndproc, it only does window locking * This is just a wrapper for the real wndproc, it only does window locking
* and unlocking. * and unlocking.
*/ */
LRESULT WINAPI ListBoxWndProc( HWND hwnd, UINT msg, static LRESULT WINAPI ListBoxWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam )
WPARAM wParam, LPARAM lParam )
{ {
WND* wndPtr = WIN_FindWndPtr( hwnd ); WND* wndPtr = WIN_FindWndPtr( hwnd );
LRESULT res = ListBoxWndProc_locked(wndPtr,msg,wParam,lParam); LRESULT res = ListBoxWndProc_locked(wndPtr,msg,wParam,lParam);
@ -2968,7 +3000,7 @@ static inline LRESULT WINAPI ComboLBWndProc_locked( WND* wnd, UINT msg,
/* /*
* If we are in Win3.1 look, go with the default behavior. * If we are in Win3.1 look, go with the default behavior.
*/ */
return ListBoxWndProc( hwnd, msg, wParam, lParam ); return ListBoxWndProcA( hwnd, msg, wParam, lParam );
} }
case WM_LBUTTONUP: case WM_LBUTTONUP:
if (TWEAK_WineLook > WIN31_LOOK) if (TWEAK_WineLook > WIN31_LOOK)
@ -3029,7 +3061,7 @@ static inline LRESULT WINAPI ComboLBWndProc_locked( WND* wnd, UINT msg,
case LB_SETCURSEL16: case LB_SETCURSEL16:
case LB_SETCURSEL: case LB_SETCURSEL:
lRet = ListBoxWndProc( hwnd, msg, wParam, lParam ); lRet = ListBoxWndProcA( hwnd, msg, wParam, lParam );
lRet =(lRet == LB_ERR) ? lRet : descr->selected_item; lRet =(lRet == LB_ERR) ? lRet : descr->selected_item;
return lRet; return lRet;
case WM_NCDESTROY: case WM_NCDESTROY:
@ -3038,7 +3070,7 @@ static inline LRESULT WINAPI ComboLBWndProc_locked( WND* wnd, UINT msg,
/* fall through */ /* fall through */
default: default:
return ListBoxWndProc( hwnd, msg, wParam, lParam ); return ListBoxWndProcA( hwnd, msg, wParam, lParam );
} }
} }
lRet = DefWindowProcA( hwnd, msg, wParam, lParam ); lRet = DefWindowProcA( hwnd, msg, wParam, lParam );
@ -3057,7 +3089,7 @@ static inline LRESULT WINAPI ComboLBWndProc_locked( WND* wnd, UINT msg,
* This is just a wrapper for the real wndproc, it only does window locking * This is just a wrapper for the real wndproc, it only does window locking
* and unlocking. * and unlocking.
*/ */
LRESULT WINAPI ComboLBWndProc( HWND hwnd, UINT msg, LRESULT WINAPI ComboLBWndProcA( HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam ) WPARAM wParam, LPARAM lParam )
{ {
WND *wnd = WIN_FindWndPtr( hwnd ); WND *wnd = WIN_FindWndPtr( hwnd );

61
controls/menu.c
View File

@ -26,7 +26,7 @@
#include "win.h" #include "win.h"
#include "task.h" #include "task.h"
#include "heap.h" #include "heap.h"
#include "menu.h" #include "controls.h"
#include "nonclient.h" #include "nonclient.h"
#include "user.h" #include "user.h"
#include "message.h" #include "message.h"
@ -176,6 +176,23 @@ static UINT uSubPWndLevel = 0;
/* Flag set by EndMenu() to force an exit from menu tracking */ /* Flag set by EndMenu() to force an exit from menu tracking */
static BOOL fEndMenu = FALSE; static BOOL fEndMenu = FALSE;
static LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam );
/*********************************************************************
* menu class descriptor
*/
const struct builtin_class_descr MENU_builtin_class =
{
POPUPMENU_CLASS_ATOM, /* name */
CS_GLOBALCLASS | CS_SAVEBITS, /* style */
NULL, /* procA (winproc is Unicode only) */
PopupMenuWndProc, /* procW */
sizeof(HMENU), /* extra */
IDC_ARROWA, /* cursor */
COLOR_MENU+1 /* brush */
};
/*********************************************************************** /***********************************************************************
* debug_print_menuitem * debug_print_menuitem
@ -3163,12 +3180,8 @@ BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y,
* *
* NOTE: Windows has totally different (and undocumented) popup wndproc. * NOTE: Windows has totally different (and undocumented) popup wndproc.
*/ */
LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam, static LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam )
LPARAM lParam )
{ {
WND* wndPtr = WIN_FindWndPtr(hwnd);
LRESULT retvalue;
TRACE("hwnd=0x%04x msg=0x%04x wp=0x%04x lp=0x%08lx\n", TRACE("hwnd=0x%04x msg=0x%04x wp=0x%04x lp=0x%08lx\n",
hwnd, message, wParam, lParam); hwnd, message, wParam, lParam);
@ -3176,15 +3189,13 @@ LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam,
{ {
case WM_CREATE: case WM_CREATE:
{ {
CREATESTRUCTA *cs = (CREATESTRUCTA*)lParam; CREATESTRUCTW *cs = (CREATESTRUCTW*)lParam;
SetWindowLongA( hwnd, 0, (LONG)cs->lpCreateParams ); SetWindowLongW( hwnd, 0, (LONG)cs->lpCreateParams );
retvalue = 0; return 0;
goto END;
} }
case WM_MOUSEACTIVATE: /* We don't want to be activated */ case WM_MOUSEACTIVATE: /* We don't want to be activated */
retvalue = MA_NOACTIVATE; return MA_NOACTIVATE;
goto END;
case WM_PAINT: case WM_PAINT:
{ {
@ -3193,12 +3204,10 @@ LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam,
MENU_DrawPopupMenu( hwnd, ps.hdc, MENU_DrawPopupMenu( hwnd, ps.hdc,
(HMENU)GetWindowLongA( hwnd, 0 ) ); (HMENU)GetWindowLongA( hwnd, 0 ) );
EndPaint( hwnd, &ps ); EndPaint( hwnd, &ps );
retvalue = 0; return 0;
goto END;
} }
case WM_ERASEBKGND: case WM_ERASEBKGND:
retvalue = 1; return 1;
goto END;
case WM_DESTROY: case WM_DESTROY:
@ -3224,31 +3233,23 @@ LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam,
if( wParam ) if( wParam )
{ {
if( !(*(HMENU*)wndPtr->wExtra) ) if (!GetWindowLongW( hwnd, 0 )) ERR("no menu to display\n");
ERR("no menu to display\n");
} }
else else
*(HMENU*)wndPtr->wExtra = 0; SetWindowLongW( hwnd, 0, 0 );
break; break;
case MM_SETMENUHANDLE: case MM_SETMENUHANDLE:
SetWindowLongW( hwnd, 0, wParam );
*(HMENU*)wndPtr->wExtra = (HMENU)wParam;
break; break;
case MM_GETMENUHANDLE: case MM_GETMENUHANDLE:
return GetWindowLongW( hwnd, 0 );
retvalue = *(HMENU*)wndPtr->wExtra;
goto END;
default: default:
retvalue = DefWindowProcA( hwnd, message, wParam, lParam ); return DefWindowProcW( hwnd, message, wParam, lParam );
goto END;
} }
retvalue = 0; return 0;
END:
WIN_ReleaseWndPtr(wndPtr);
return retvalue;
} }

61
controls/scroll.c
View File

@ -8,7 +8,7 @@
#include "windef.h" #include "windef.h"
#include "wingdi.h" #include "wingdi.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "scroll.h" #include "controls.h"
#include "heap.h" #include "heap.h"
#include "win.h" #include "win.h"
#include "debugtools.h" #include "debugtools.h"
@ -17,19 +17,28 @@
DEFAULT_DEBUG_CHANNEL(scroll); DEFAULT_DEBUG_CHANNEL(scroll);
typedef struct
{
INT CurVal; /* Current scroll-bar value */
INT MinVal; /* Minimum scroll-bar value */
INT MaxVal; /* Maximum scroll-bar value */
INT Page; /* Page size of scroll bar (Win32) */
UINT flags; /* EnableScrollBar flags */
} SCROLLBAR_INFO;
static HBITMAP hUpArrow = 0;
static HBITMAP hDnArrow = 0; static HBITMAP hUpArrow;
static HBITMAP hLfArrow = 0; static HBITMAP hDnArrow;
static HBITMAP hRgArrow = 0; static HBITMAP hLfArrow;
static HBITMAP hUpArrowD = 0; static HBITMAP hRgArrow;
static HBITMAP hDnArrowD = 0; static HBITMAP hUpArrowD;
static HBITMAP hLfArrowD = 0; static HBITMAP hDnArrowD;
static HBITMAP hRgArrowD = 0; static HBITMAP hLfArrowD;
static HBITMAP hUpArrowI = 0; static HBITMAP hRgArrowD;
static HBITMAP hDnArrowI = 0; static HBITMAP hUpArrowI;
static HBITMAP hLfArrowI = 0; static HBITMAP hDnArrowI;
static HBITMAP hRgArrowI = 0; static HBITMAP hLfArrowI;
static HBITMAP hRgArrowI;
#define TOP_ARROW(flags,pressed) \ #define TOP_ARROW(flags,pressed) \
(((flags)&ESB_DISABLE_UP) ? hUpArrowI : ((pressed) ? hUpArrowD:hUpArrow)) (((flags)&ESB_DISABLE_UP) ? hUpArrowI : ((pressed) ? hUpArrowD:hUpArrow))
@ -98,6 +107,22 @@ static void SCROLL_DrawInterior_9x( HWND hwnd, HDC hdc, INT nBar,
INT thumbSize, INT thumbPos, INT thumbSize, INT thumbPos,
UINT flags, BOOL vertical, UINT flags, BOOL vertical,
BOOL top_selected, BOOL bottom_selected ); BOOL top_selected, BOOL bottom_selected );
static LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
/*********************************************************************
* scrollbar class descriptor
*/
const struct builtin_class_descr SCROLL_builtin_class =
{
"ScrollBar", /* name */
CS_GLOBALCLASS | CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */
NULL, /* procA (winproc is Unicode only) */
ScrollBarWndProc, /* procW */
sizeof(SCROLLBAR_INFO), /* extra */
IDC_ARROWA, /* cursor */
0 /* brush */
};
/*********************************************************************** /***********************************************************************
@ -878,7 +903,7 @@ static void SCROLL_HandleKbdEvent( HWND hwnd, WPARAM wParam )
WIN_ReleaseWndPtr(wndPtr); WIN_ReleaseWndPtr(wndPtr);
return; return;
} }
SendMessageA( GetParent(hwnd), SendMessageW( GetParent(hwnd),
(wndPtr->dwStyle & SBS_VERT) ? WM_VSCROLL : WM_HSCROLL, (wndPtr->dwStyle & SBS_VERT) ? WM_VSCROLL : WM_HSCROLL,
msg, hwnd ); msg, hwnd );
WIN_ReleaseWndPtr(wndPtr); WIN_ReleaseWndPtr(wndPtr);
@ -1109,20 +1134,18 @@ void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
/*********************************************************************** /***********************************************************************
* ScrollBarWndProc * ScrollBarWndProc
*/ */
LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam, static LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam )
LPARAM lParam )
{ {
switch(message) switch(message)
{ {
case WM_CREATE: case WM_CREATE:
{ {
CREATESTRUCTA *lpCreat = (CREATESTRUCTA *)lParam; CREATESTRUCTW *lpCreat = (CREATESTRUCTW *)lParam;
if (lpCreat->style & SBS_SIZEBOX) if (lpCreat->style & SBS_SIZEBOX)
{ {
FIXME("Unimplemented style SBS_SIZEBOX.\n" ); FIXME("Unimplemented style SBS_SIZEBOX.\n" );
return 0; return 0;
} }
if (lpCreat->style & SBS_VERT) if (lpCreat->style & SBS_VERT)
{ {
if (lpCreat->style & SBS_LEFTALIGN) if (lpCreat->style & SBS_LEFTALIGN)
@ -1285,7 +1308,7 @@ LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam,
if (message >= WM_USER) if (message >= WM_USER)
WARN("unknown msg %04x wp=%04x lp=%08lx\n", WARN("unknown msg %04x wp=%04x lp=%08lx\n",
message, wParam, lParam ); message, wParam, lParam );
return DefWindowProcA( hwnd, message, wParam, lParam ); return DefWindowProcW( hwnd, message, wParam, lParam );
} }
return 0; return 0;
} }

29
controls/static.c
View File

@ -10,7 +10,7 @@
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "win.h" #include "win.h"
#include "cursoricon.h" #include "cursoricon.h"
#include "static.h" #include "controls.h"
#include "heap.h" #include "heap.h"
#include "debugtools.h" #include "debugtools.h"
#include "tweak.h" #include "tweak.h"
@ -23,9 +23,16 @@ static void STATIC_PaintRectfn( WND *wndPtr, HDC hdc );
static void STATIC_PaintIconfn( WND *wndPtr, HDC hdc ); static void STATIC_PaintIconfn( WND *wndPtr, HDC hdc );
static void STATIC_PaintBitmapfn( WND *wndPtr, HDC hdc ); static void STATIC_PaintBitmapfn( WND *wndPtr, HDC hdc );
static void STATIC_PaintEtchedfn( WND *wndPtr, HDC hdc ); static void STATIC_PaintEtchedfn( WND *wndPtr, HDC hdc );
static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
static COLORREF color_windowframe, color_background, color_window; static COLORREF color_windowframe, color_background, color_window;
typedef struct
{
HFONT16 hFont; /* Control font (or 0 for system font) */
WORD dummy; /* Don't know what MS-Windows puts in there */
HICON16 hIcon; /* Icon handle for SS_ICON controls */
} STATICINFO;
typedef void (*pfPaint)( WND *, HDC ); typedef void (*pfPaint)( WND *, HDC );
@ -53,6 +60,21 @@ static pfPaint staticPaintFunc[SS_TYPEMASK+1] =
}; };
/*********************************************************************
* static class descriptor
*/
const struct builtin_class_descr STATIC_builtin_class =
{
"Static", /* name */
CS_GLOBALCLASS | CS_DBLCLKS | CS_PARENTDC, /* style */
StaticWndProcA, /* procA */
NULL, /* procW (FIXME) */
sizeof(STATICINFO), /* extra */
IDC_ARROWA, /* cursor */
0 /* brush */
};
/*********************************************************************** /***********************************************************************
* STATIC_SetIcon * STATIC_SetIcon
* *
@ -135,10 +157,9 @@ static HBITMAP STATIC_LoadBitmap( WND *wndPtr, LPCSTR name )
/*********************************************************************** /***********************************************************************
* StaticWndProc * StaticWndProcA
*/ */
LRESULT WINAPI StaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
LPARAM lParam )
{ {
LRESULT lResult = 0; LRESULT lResult = 0;
WND *wndPtr = WIN_FindWndPtr(hWnd); WND *wndPtr = WIN_FindWndPtr(hWnd);

83
controls/widgets.c
View File

@ -1,83 +0,0 @@
/*
* Windows widgets (built-in window classes)
*
* Copyright 1993 Alexandre Julliard
*/
#include <assert.h>
#include <string.h>
#include "win.h"
#include "button.h"
#include "combo.h"
#include "desktop.h"
#include "gdi.h"
#include "heap.h"
#include "mdi.h"
#include "menu.h"
#include "scroll.h"
#include "static.h"
#include "wine/unicode.h"
struct builtin_class
{
LPCSTR name;
UINT style;
WNDPROC procA;
WNDPROC procW;
INT extra;
LPCSTR cursor;
HBRUSH brush;
};
/* Under NT all builtin classes have both ASCII and Unicode window
* procedures except ScrollBar, PopupMenu, Desktop, WinSwitch and
* IconTitle which are Unicode-only.
*/
static const struct builtin_class classes[] =
{
{ "Button", CS_GLOBALCLASS | CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC,
ButtonWndProcA, ButtonWndProcW, sizeof(BUTTONINFO), IDC_ARROWA, 0 },
{ "Edit", CS_GLOBALCLASS | CS_DBLCLKS /*| CS_PARENTDC*/,
EditWndProc, NULL, sizeof(void *), IDC_IBEAMA, 0 },
{ "ListBox", CS_GLOBALCLASS | CS_DBLCLKS /*| CS_PARENTDC*/,
ListBoxWndProc, NULL, sizeof(void *), IDC_ARROWA, 0 },
{ "ComboBox", CS_GLOBALCLASS | CS_PARENTDC | CS_DBLCLKS,
ComboWndProc, NULL, sizeof(void *), IDC_ARROWA, 0 },
{ "ComboLBox", CS_GLOBALCLASS | CS_DBLCLKS | CS_SAVEBITS,
ComboLBWndProc, NULL, sizeof(void *), IDC_ARROWA, 0 },
{ "Static", CS_GLOBALCLASS | CS_DBLCLKS | CS_PARENTDC,
StaticWndProc, NULL, sizeof(STATICINFO), IDC_ARROWA, 0 },
{ "ScrollBar", CS_GLOBALCLASS | CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC,
ScrollBarWndProc, NULL, sizeof(SCROLLBAR_INFO), IDC_ARROWA, 0 },
{ "MDIClient", CS_GLOBALCLASS,
MDIClientWndProc, NULL, sizeof(MDICLIENTINFO), IDC_ARROWA, STOCK_LTGRAY_BRUSH },
{ POPUPMENU_CLASS_NAME, CS_GLOBALCLASS | CS_SAVEBITS,
PopupMenuWndProc, NULL, sizeof(HMENU), IDC_ARROWA, COLOR_MENU+1 },
{ DESKTOP_CLASS_NAME, CS_GLOBALCLASS,
DesktopWndProc, NULL, sizeof(DESKTOP), IDC_ARROWA, COLOR_BACKGROUND+1 },
{ DIALOG_CLASS_NAME, CS_GLOBALCLASS | CS_SAVEBITS,
DefDlgProcA, DefDlgProcW, DLGWINDOWEXTRA, IDC_ARROWA, 0 },
{ ICONTITLE_CLASS_NAME, CS_GLOBALCLASS,
IconTitleWndProc, NULL, 0, IDC_ARROWA, 0 }
};
/***********************************************************************
* WIDGETS_Init
*
* Initialize the built-in window classes.
*/
BOOL WIDGETS_Init(void)
{
const struct builtin_class *cls = classes;
int i;
for (i = 0; i < sizeof(classes)/sizeof(classes[0]); i++, cls++)
{
if (!CLASS_RegisterBuiltinClass( cls->name, cls->style, cls->extra, cls->cursor,
cls->brush, cls->procA, cls->procW ))
return FALSE;
}
return TRUE;
}

2
dlls/ttydrv/ttydrv.h
View File

@ -143,7 +143,7 @@ extern HANDLE TTYDRV_LoadOEMResource(WORD resid, WORD type);
extern void TTYDRV_WND_Initialize(struct tagWND *wndPtr); extern void TTYDRV_WND_Initialize(struct tagWND *wndPtr);
extern void TTYDRV_WND_Finalize(struct tagWND *wndPtr); extern void TTYDRV_WND_Finalize(struct tagWND *wndPtr);
extern BOOL TTYDRV_WND_CreateDesktopWindow(struct tagWND *wndPtr, BOOL bUnicode); extern BOOL TTYDRV_WND_CreateDesktopWindow(struct tagWND *wndPtr);
extern BOOL TTYDRV_WND_CreateWindow(struct tagWND *wndPtr, struct tagCREATESTRUCTA *cs, BOOL bUnicode); extern BOOL TTYDRV_WND_CreateWindow(struct tagWND *wndPtr, struct tagCREATESTRUCTA *cs, BOOL bUnicode);
extern BOOL TTYDRV_WND_DestroyWindow(struct tagWND *pWnd); extern BOOL TTYDRV_WND_DestroyWindow(struct tagWND *pWnd);
extern struct tagWND *TTYDRV_WND_SetParent(struct tagWND *wndPtr, struct tagWND *pWndParent); extern struct tagWND *TTYDRV_WND_SetParent(struct tagWND *wndPtr, struct tagWND *pWndParent);

4
dlls/ttydrv/wnd.c
View File

@ -88,12 +88,12 @@ void TTYDRV_WND_Finalize(WND *wndPtr)
/********************************************************************** /**********************************************************************
* TTYDRV_WND_CreateDesktopWindow * TTYDRV_WND_CreateDesktopWindow
*/ */
BOOL TTYDRV_WND_CreateDesktopWindow(WND *wndPtr, BOOL bUnicode) BOOL TTYDRV_WND_CreateDesktopWindow(WND *wndPtr)
{ {
TTYDRV_WND_DATA *pWndDriverData = TTYDRV_WND_DATA *pWndDriverData =
(TTYDRV_WND_DATA *) wndPtr->pDriverData; (TTYDRV_WND_DATA *) wndPtr->pDriverData;
TRACE("(%p, %d)\n", wndPtr, bUnicode); TRACE("(%p)\n", wndPtr);
if(!pWndDriverData) { ERR("WND never initialized\n"); return FALSE; } if(!pWndDriverData) { ERR("WND never initialized\n"); return FALSE; }

146
dlls/user/controls.h Normal file
View File

@ -0,0 +1,146 @@
/*
* User controls definitions
*
* Copyright 2000 Alexandre Julliard
*/
#ifndef __WINE_CONTROLS_H
#define __WINE_CONTROLS_H
#include "winuser.h"
#include "winproc.h"
struct tagWND;
/* Built-in class names (see _Undocumented_Windows_ p.418) */
#define POPUPMENU_CLASS_ATOM MAKEINTATOM(32768) /* PopupMenu */
#define DESKTOP_CLASS_ATOM MAKEINTATOM(32769) /* Desktop */
#define DIALOG_CLASS_ATOM MAKEINTATOM(32770) /* Dialog */
#define WINSWITCH_CLASS_ATOM MAKEINTATOM(32771) /* WinSwitch */
#define ICONTITLE_CLASS_ATOM MAKEINTATOM(32772) /* IconTitle */
/* Built-in class descriptor */
struct builtin_class_descr
{
LPCSTR name; /* class name */
UINT style; /* class style */
WNDPROC procA; /* ASCII window procedure */
WNDPROC procW; /* Unicode window procedure */
INT extra; /* window extra bytes */
LPCSTR cursor; /* cursor name */
HBRUSH brush; /* brush or system color */
};
/* desktop */
extern BOOL DESKTOP_SetPattern( LPCSTR pattern );
/* icon title */
extern HWND ICONTITLE_Create( struct tagWND * );
/* MDI client */
extern HWND MDI_CreateMDIWindowA(LPCSTR,LPCSTR,DWORD,INT,INT,INT,INT,HWND,HINSTANCE,LPARAM);
extern HWND MDI_CreateMDIWindowW(LPCWSTR,LPCWSTR,DWORD,INT,INT,INT,INT,HWND,HINSTANCE,LPARAM);
/* menu controls */
extern BOOL MENU_Init(void);
extern BOOL MENU_IsMenuActive(void);
extern HMENU MENU_GetSysMenu(HWND hWndOwner, HMENU hSysPopup);
extern UINT MENU_GetMenuBarHeight( HWND hwnd, UINT menubarWidth,
INT orgX, INT orgY );
extern BOOL MENU_PatchResidentPopup( HQUEUE16, struct tagWND* );
extern void MENU_TrackMouseMenuBar( struct tagWND *wnd, INT ht, POINT pt );
extern void MENU_TrackKbdMenuBar( struct tagWND *wnd, UINT wParam, INT vkey );
extern UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect,
HWND hwnd, BOOL suppress_draw );
extern UINT MENU_FindSubMenu( HMENU *hmenu, HMENU hSubTarget );
/* scrollbar */
extern void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, BOOL arrows, BOOL interior );
extern void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt );
extern INT SCROLL_SetNCSbState( struct tagWND *wndPtr, int vMin, int vMax, int vPos,
int hMin, int hMax, int hPos );
/* combo box */
#define ID_CB_LISTBOX 1000
#define ID_CB_EDIT 1001
/* internal flags */
#define CBF_DROPPED 0x0001
#define CBF_BUTTONDOWN 0x0002
#define CBF_NOROLLUP 0x0004
#define CBF_MEASUREITEM 0x0008
#define CBF_FOCUSED 0x0010
#define CBF_CAPTURE 0x0020
#define CBF_EDIT 0x0040
#define CBF_NORESIZE 0x0080
#define CBF_NOTIFY 0x0100
#define CBF_NOREDRAW 0x0200
#define CBF_SELCHANGE 0x0400
#define CBF_NOEDITNOTIFY 0x1000
#define CBF_NOLBSELECT 0x2000 /* do not change current selection */
#define CBF_EUI 0x8000
/* combo state struct */
typedef struct
{
struct tagWND *self;
HWND owner;
UINT dwStyle;
HWND hWndEdit;
HWND hWndLBox;
UINT wState;
HFONT hFont;
RECT textRect;
RECT buttonRect;
RECT droppedRect;
INT droppedIndex;
INT fixedOwnerDrawHeight;
INT droppedWidth; /* last two are not used unless set */
INT editHeight; /* explicitly */
} HEADCOMBO,*LPHEADCOMBO;
/* Note, that CBS_DROPDOWNLIST style is actually (CBS_SIMPLE | CBS_DROPDOWN) */
#define CB_GETTYPE( lphc ) ((lphc)->dwStyle & (CBS_DROPDOWNLIST))
#define CB_DISABLED( lphc ) ((lphc)->self->dwStyle & WS_DISABLED)
#define CB_OWNERDRAWN( lphc ) ((lphc)->dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE))
#define CB_HASSTRINGS( lphc ) ((lphc)->dwStyle & CBS_HASSTRINGS)
#define CB_HWND( lphc ) ((lphc)->self->hwndSelf)
extern BOOL COMBO_FlipListbox( LPHEADCOMBO, BOOL, BOOL );
extern LRESULT COMBO_Directory( LPHEADCOMBO, UINT, LPSTR, BOOL );
/* Dialog info structure.
* This structure is stored into the window extra bytes (cbWndExtra).
* sizeof(DIALOGINFO) must be <= DLGWINDOWEXTRA (=30).
*/
#include "pshpack1.h"
typedef struct
{
INT msgResult; /* 00 Last message result */
HWINDOWPROC dlgProc; /* 04 Dialog procedure */
LONG userInfo; /* 08 User information (for DWL_USER) */
/* implementation-dependent part */
HWND16 hwndFocus; /* 0c Current control with focus */
HFONT16 hUserFont; /* 0e Dialog font */
HMENU16 hMenu; /* 10 Dialog menu */
WORD xBaseUnit; /* 12 Dialog units (depends on the font) */
WORD yBaseUnit; /* 14 */
INT idResult; /* 16 EndDialog() result / default pushbutton ID */
UINT16 flags; /* 1a EndDialog() called for this dialog */
HGLOBAL16 hDialogHeap; /* 1c */
} DIALOGINFO;
#include "poppack.h"
#define DF_END 0x0001
#define DF_OWNERENABLED 0x0002
extern BOOL DIALOG_Init(void);
#endif /* __WINE_CONTROLS_H */

4
dlls/user/resources/user32.rc
View File

@ -7,7 +7,9 @@
#include "winuser.h" #include "winuser.h"
#include "winnls.h" #include "winnls.h"
#include "dlgs.h" #include "dlgs.h"
#include "mdi.h"
#define MDI_IDC_LISTBOX 100
#define MDI_IDS_MOREWINDOWS 13
/* /*
* Everything that does not depend on language, * Everything that does not depend on language,

40
dlls/user/user_main.c
View File

@ -9,12 +9,11 @@
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "controls.h"
#include "dce.h" #include "dce.h"
#include "dialog.h"
#include "global.h" #include "global.h"
#include "input.h" #include "input.h"
#include "keyboard.h" #include "keyboard.h"
#include "menu.h"
#include "message.h" #include "message.h"
#include "queue.h" #include "queue.h"
#include "spy.h" #include "spy.h"
@ -94,6 +93,41 @@ static BOOL load_driver(void)
} }
/***********************************************************************
* controls_init
*
* Register the classes for the builtin controls
*/
static void controls_init(void)
{
extern const struct builtin_class_descr BUTTON_builtin_class;
extern const struct builtin_class_descr COMBO_builtin_class;
extern const struct builtin_class_descr COMBOLBOX_builtin_class;
extern const struct builtin_class_descr DIALOG_builtin_class;
extern const struct builtin_class_descr DESKTOP_builtin_class;
extern const struct builtin_class_descr EDIT_builtin_class;
extern const struct builtin_class_descr ICONTITLE_builtin_class;
extern const struct builtin_class_descr LISTBOX_builtin_class;
extern const struct builtin_class_descr MDICLIENT_builtin_class;
extern const struct builtin_class_descr MENU_builtin_class;
extern const struct builtin_class_descr SCROLL_builtin_class;
extern const struct builtin_class_descr STATIC_builtin_class;
CLASS_RegisterBuiltinClass( &BUTTON_builtin_class );
CLASS_RegisterBuiltinClass( &COMBO_builtin_class );
CLASS_RegisterBuiltinClass( &COMBOLBOX_builtin_class );
CLASS_RegisterBuiltinClass( &DIALOG_builtin_class );
CLASS_RegisterBuiltinClass( &DESKTOP_builtin_class );
CLASS_RegisterBuiltinClass( &EDIT_builtin_class );
CLASS_RegisterBuiltinClass( &ICONTITLE_builtin_class );
CLASS_RegisterBuiltinClass( &LISTBOX_builtin_class );
CLASS_RegisterBuiltinClass( &MDICLIENT_builtin_class );
CLASS_RegisterBuiltinClass( &MENU_builtin_class );
CLASS_RegisterBuiltinClass( &SCROLL_builtin_class );
CLASS_RegisterBuiltinClass( &STATIC_builtin_class );
}
/*********************************************************************** /***********************************************************************
* palette_init * palette_init
* *
@ -149,7 +183,7 @@ BOOL WINAPI USER_Init(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
if (!WINPROC_Init()) return FALSE; if (!WINPROC_Init()) return FALSE;
/* Initialize built-in window classes */ /* Initialize built-in window classes */
if (!WIDGETS_Init()) return FALSE; controls_init();
/* Initialize dialog manager */ /* Initialize dialog manager */
if (!DIALOG_Init()) return FALSE; if (!DIALOG_Init()) return FALSE;

41
include/button.h
View File

@ -1,41 +0,0 @@
/*
* Button-class extra info
*
* Copyright 1994 Alexandre Julliard
*/
#ifndef __WINE_BUTTON_H
#define __WINE_BUTTON_H
#include "windef.h"
#include "wingdi.h"
/* Extra info for BUTTON windows */
/* Note: under MS-Windows, state is a BYTE and this structure is */
/* only 3 bytes long. I don't think there are programs out there */
/* broken enough to rely on this :-) */
typedef struct
{
WORD state; /* Current state */
HFONT16 hFont; /* Button font (or 0 for system font) */
HANDLE hImage; /* Handle to the image or the icon */
} BUTTONINFO;
/* Button state values */
#define BUTTON_UNCHECKED 0x00
#define BUTTON_CHECKED 0x01
#define BUTTON_3STATE 0x02
#define BUTTON_HIGHLIGHTED 0x04
#define BUTTON_HASFOCUS 0x08
#define BUTTON_NSTATES 0x0F
/* undocumented flags */
#define BUTTON_BTNPRESSED 0x40
#define BUTTON_UNKNOWN2 0x20
#define BUTTON_UNKNOWN3 0x10
#define BUTTON_STATE(hwnd) ((WIN_FindWndPtr(hwnd))->wExtra[0])
extern LRESULT WINAPI ButtonWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
extern LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
#endif /* __WINE_BUTTON_H */

68
include/combo.h
View File

@ -1,68 +0,0 @@
/*
* Combo box definitions
*/
#ifndef __WINE_COMBO_H
#define __WINE_COMBO_H
#include "windef.h"
struct tagWND;
#define ID_CB_LISTBOX 1000
#define ID_CB_EDIT 1001
/* Internal flags */
#define CBF_DROPPED 0x0001
#define CBF_BUTTONDOWN 0x0002
#define CBF_NOROLLUP 0x0004
#define CBF_MEASUREITEM 0x0008
#define CBF_FOCUSED 0x0010
#define CBF_CAPTURE 0x0020
#define CBF_EDIT 0x0040
#define CBF_NORESIZE 0x0080
#define CBF_NOTIFY 0x0100
#define CBF_NOREDRAW 0x0200
#define CBF_SELCHANGE 0x0400
#define CBF_NOEDITNOTIFY 0x1000
#define CBF_NOLBSELECT 0x2000 /* do not change current selection */
#define CBF_EUI 0x8000
/* Combo state struct */
typedef struct
{
struct tagWND *self;
HWND owner;
UINT dwStyle;
HWND hWndEdit;
HWND hWndLBox;
UINT wState;
HFONT hFont;
RECT textRect;
RECT buttonRect;
RECT droppedRect;
INT droppedIndex;
INT fixedOwnerDrawHeight;
INT droppedWidth; /* last two are not used unless set */
INT editHeight; /* explicitly */
} HEADCOMBO,*LPHEADCOMBO;
/*
* Note, that CBS_DROPDOWNLIST style is actually (CBS_SIMPLE | CBS_DROPDOWN)!
*/
#define CB_GETTYPE( lphc ) ((lphc)->dwStyle & (CBS_DROPDOWNLIST))
#define CB_DISABLED( lphc ) ((lphc)->self->dwStyle & WS_DISABLED)
#define CB_OWNERDRAWN( lphc ) ((lphc)->dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE))
#define CB_HASSTRINGS( lphc ) ((lphc)->dwStyle & CBS_HASSTRINGS)
#define CB_HWND( lphc ) ((lphc)->self->hwndSelf)
LRESULT WINAPI ComboWndProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );
BOOL COMBO_FlipListbox( LPHEADCOMBO, BOOL, BOOL );
LRESULT COMBO_Directory( LPHEADCOMBO, UINT, LPSTR, BOOL );
#endif /* __WINE_COMBO_H */

24
include/desktop.h
View File

@ -1,24 +0,0 @@
/*
* Desktop window definitions.
*
* Copyright 1994 Alexandre Julliard
*/
#ifndef __WINE_DESKTOP_H
#define __WINE_DESKTOP_H
#include "windef.h"
typedef struct tagDESKTOP
{
HBRUSH hbrushPattern;
HBITMAP hbitmapWallPaper;
SIZE bitmapSize;
BOOL fTileWallPaper;
} DESKTOP;
extern BOOL DESKTOP_SetPattern( LPCSTR pattern );
extern LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message,
WPARAM wParam, LPARAM lParam );
#endif /* __WINE_DESKTOP_H */

44
include/dialog.h
View File

@ -1,44 +0,0 @@
/*
* Dialog definitions
*
* Copyright 1993 Alexandre Julliard
*/
#ifndef __WINE_DIALOG_H
#define __WINE_DIALOG_H
#include "winproc.h"
/* Dialog info structure.
* This structure is stored into the window extra bytes (cbWndExtra).
* sizeof(DIALOGINFO) must be <= DLGWINDOWEXTRA (=30).
*/
#include "pshpack1.h"
typedef struct
{
INT msgResult; /* +00 Last message result */
HWINDOWPROC dlgProc; /* +04 Dialog procedure */
LONG userInfo; /* +08 User information (for DWL_USER) */
/* implementation-dependent part */
HWND16 hwndFocus; /* Current control with focus */
HFONT16 hUserFont; /* Dialog font */
HMENU16 hMenu; /* Dialog menu */
UINT16 xBaseUnit; /* Dialog units (depends on the font) */
UINT16 yBaseUnit;
INT idResult; /* EndDialog() result / default pushbutton ID */
UINT16 flags; /* EndDialog() called for this dialog */
HGLOBAL16 hDialogHeap;
} DIALOGINFO;
#include "poppack.h"
#define DF_END 0x0001
#define DF_OWNERENABLED 0x0002
extern BOOL DIALOG_Init(void);
#endif /* __WINE_DIALOG_H */

51
include/mdi.h
View File

@ -1,51 +0,0 @@
/* MDI.H
*
* Copyright 1994, Bob Amstadt
* 1995 Alex Korobka
*
* MDI structure definitions.
*/
#ifndef __WINE_MDI_H
#define __WINE_MDI_H
#include "windef.h"
#define MDI_MAXLISTLENGTH 0x40
#define MDI_MAXTITLELENGTH 0xA1
#define MDI_NOFRAMEREPAINT 0
#define MDI_REPAINTFRAMENOW 1
#define MDI_REPAINTFRAME 2
#define WM_MDICALCCHILDSCROLL 0x10AC /* this is exactly what Windows uses */
/* "More Windows..." definitions */
#define MDI_MOREWINDOWSLIMIT 9 /* after this number of windows, a "More Windows..."
option will appear under the Windows menu */
#define MDI_IDC_LISTBOX 100
#define MDI_IDS_MOREWINDOWS 13
extern LRESULT WINAPI MDIClientWndProc( HWND hwnd, UINT message,
WPARAM wParam, LPARAM lParam );
typedef struct
{
UINT nActiveChildren;
HWND hwndChildMaximized;
HWND hwndActiveChild;
HMENU hWindowMenu;
UINT idFirstChild;
LPWSTR frameTitle;
UINT nTotalCreated;
UINT mdiFlags;
UINT sbRecalc; /* SB_xxx flags for scrollbar fixup */
HWND self;
} MDICLIENTINFO;
extern HWND MDI_CreateMDIWindowA(LPCSTR,LPCSTR,DWORD,INT,INT,
INT,INT,HWND,HINSTANCE,LPARAM);
extern HWND MDI_CreateMDIWindowW(LPCWSTR,LPCWSTR,DWORD,INT,INT,
INT,INT,HWND,HINSTANCE,LPARAM);
#endif /* __WINE_MDI_H */

27
include/menu.h
View File

@ -1,27 +0,0 @@
/*
* Menu definitions
*/
#ifndef __WINE_MENU_H
#define __WINE_MENU_H
#include "windef.h"
struct tagWND;
LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam,
LPARAM lParam );
extern BOOL MENU_Init(void);
extern BOOL MENU_IsMenuActive(void);
extern HMENU MENU_GetSysMenu(HWND hWndOwner, HMENU hSysPopup);
extern UINT MENU_GetMenuBarHeight( HWND hwnd, UINT menubarWidth,
INT orgX, INT orgY );
extern BOOL MENU_PatchResidentPopup( HQUEUE16, struct tagWND* );
extern void MENU_TrackMouseMenuBar( struct tagWND *wnd, INT ht, POINT pt );
extern void MENU_TrackKbdMenuBar( struct tagWND *wnd, UINT wParam, INT vkey );
extern UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect,
HWND hwnd, BOOL suppress_draw );
extern UINT MENU_FindSubMenu( HMENU *hmenu, HMENU hSubTarget );
#endif /* __WINE_MENU_H */

35
include/scroll.h
View File

@ -1,35 +0,0 @@
/*
* Scroll-bar class extra info
*
* Copyright 1993 Martin Ayotte
* Copyright 1994 Alexandre Julliard
*/
#ifndef __WINE_SCROLL_H
#define __WINE_SCROLL_H
#include "windef.h"
struct tagWND;
typedef struct
{
INT CurVal; /* Current scroll-bar value */
INT MinVal; /* Minimum scroll-bar value */
INT MaxVal; /* Maximum scroll-bar value */
INT Page; /* Page size of scroll bar (Win32) */
UINT flags; /* EnableScrollBar flags */
} SCROLLBAR_INFO;
extern LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT uMsg,
WPARAM wParam, LPARAM lParam );
extern void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar,
BOOL arrows, BOOL interior );
extern void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar,
UINT msg, POINT pt );
extern INT SCROLL_SetNCSbState( struct tagWND *wndPtr, int vMin, int vMax, int vPos,
int hMin, int hMax, int hPos );
#endif /* __WINE_SCROLL_H */

23
include/static.h
View File

@ -1,23 +0,0 @@
/*
* Static-class extra info
*
* Copyright 1994 Alexandre Julliard
*/
#ifndef __WINE_STATIC_H
#define __WINE_STATIC_H
#include "windef.h"
/* Extra info for STATIC windows */
typedef struct
{
HFONT16 hFont; /* Control font (or 0 for system font) */
WORD dummy; /* Don't know what MS-Windows puts in there */
HICON16 hIcon; /* Icon handle for SS_ICON controls */
} STATICINFO;
extern LRESULT WINAPI StaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam,
LPARAM lParam );
#endif /* __WINE_STATIC_H */

35
include/win.h
View File

@ -15,19 +15,6 @@
#define WND_MAGIC 0x444e4957 /* 'WIND' */ #define WND_MAGIC 0x444e4957 /* 'WIND' */
/* Built-in class names (see _Undocumented_Windows_ p.418) */
#define POPUPMENU_CLASS_NAME "#32768" /* PopupMenu */
#define DESKTOP_CLASS_NAME "#32769" /* Desktop */
#define DIALOG_CLASS_NAME "#32770" /* Dialog */
#define WINSWITCH_CLASS_NAME "#32771" /* WinSwitch */
#define ICONTITLE_CLASS_NAME "#32772" /* IconTitle */
#define POPUPMENU_CLASS_ATOM MAKEINTATOM(32768) /* PopupMenu */
#define DESKTOP_CLASS_ATOM ((ATOM)32769) /* Desktop */
#define DIALOG_CLASS_ATOM MAKEINTATOM(32770) /* Dialog */
#define WINSWITCH_CLASS_ATOM MAKEINTATOM(32771) /* WinSwitch */
#define ICONTITLE_CLASS_ATOM MAKEINTATOM(32772) /* IconTitle */
/* PAINT_RedrawWindow() control flags */ /* PAINT_RedrawWindow() control flags */
#define RDW_EX_USEHRGN 0x0001 #define RDW_EX_USEHRGN 0x0001
#define RDW_EX_DELETEHRGN 0x0002 #define RDW_EX_DELETEHRGN 0x0002
@ -102,7 +89,7 @@ typedef struct tagWND_DRIVER
{ {
void (*pInitialize)(WND *); void (*pInitialize)(WND *);
void (*pFinalize)(WND *); void (*pFinalize)(WND *);
BOOL (*pCreateDesktopWindow)(WND *, BOOL); BOOL (*pCreateDesktopWindow)(WND *);
BOOL (*pCreateWindow)(WND *, CREATESTRUCTA *, BOOL); BOOL (*pCreateWindow)(WND *, CREATESTRUCTA *, BOOL);
BOOL (*pDestroyWindow)(WND *); BOOL (*pDestroyWindow)(WND *);
WND* (*pSetParent)(WND *, WND *); WND* (*pSetParent)(WND *, WND *);
@ -201,33 +188,17 @@ extern HRGN WIN_UpdateNCRgn(WND* wnd, HRGN hRgn, UINT flags); /* windows/pai
/* Classes functions */ /* Classes functions */
struct tagCLASS; /* opaque structure */ struct tagCLASS; /* opaque structure */
extern ATOM CLASS_RegisterBuiltinClass( LPCSTR name, DWORD style, INT winExtra, LPCSTR cursor, struct builtin_class_descr;
HBRUSH brush, WNDPROC wndProcA, WNDPROC wndProcW ); extern ATOM CLASS_RegisterBuiltinClass( const struct builtin_class_descr *descr );
extern struct tagCLASS *CLASS_AddWindow( ATOM atom, HINSTANCE inst, WINDOWPROCTYPE type, extern struct tagCLASS *CLASS_AddWindow( ATOM atom, HINSTANCE inst, WINDOWPROCTYPE type,
INT *winExtra, WNDPROC *winproc, INT *winExtra, WNDPROC *winproc,
DWORD *style, struct tagDCE **dce ); DWORD *style, struct tagDCE **dce );
extern void CLASS_RemoveWindow( struct tagCLASS *cls ); extern void CLASS_RemoveWindow( struct tagCLASS *cls );
extern void CLASS_FreeModuleClasses( HMODULE16 hModule ); extern void CLASS_FreeModuleClasses( HMODULE16 hModule );
/* controls/widgets.c */
extern BOOL WIDGETS_Init( void );
/* controls/icontitle.c */
extern LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam );
extern HWND ICONTITLE_Create( WND* );
extern BOOL ICONTITLE_Init( void );
/* windows/focus.c */ /* windows/focus.c */
extern void FOCUS_SwitchFocus( struct tagMESSAGEQUEUE *pMsgQ, HWND , HWND ); extern void FOCUS_SwitchFocus( struct tagMESSAGEQUEUE *pMsgQ, HWND , HWND );
/* windows/edit.c */
extern LRESULT WINAPI EditWndProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );
/* windows/listbox.c */
extern LRESULT WINAPI ListBoxWndProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );
extern LRESULT WINAPI ComboLBWndProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );
/* generic method that returns TRUE if the window properties ask for a /* generic method that returns TRUE if the window properties ask for a
window manager type of border */ window manager type of border */
extern BOOL WIN_WindowNeedsWMBorder( DWORD style, DWORD exStyle ); extern BOOL WIN_WindowNeedsWMBorder( DWORD style, DWORD exStyle );

2
include/x11drv.h
View File

@ -417,7 +417,7 @@ extern Window X11DRV_WND_FindXWindow(struct tagWND *wndPtr);
extern void X11DRV_WND_Initialize(struct tagWND *wndPtr); extern void X11DRV_WND_Initialize(struct tagWND *wndPtr);
extern void X11DRV_WND_Finalize(struct tagWND *wndPtr); extern void X11DRV_WND_Finalize(struct tagWND *wndPtr);
extern BOOL X11DRV_WND_CreateDesktopWindow(struct tagWND *wndPtr, BOOL bUnicode); extern BOOL X11DRV_WND_CreateDesktopWindow(struct tagWND *wndPtr);
extern BOOL X11DRV_WND_CreateWindow(struct tagWND *wndPtr, struct tagCREATESTRUCTA *cs, BOOL bUnicode); extern BOOL X11DRV_WND_CreateWindow(struct tagWND *wndPtr, struct tagCREATESTRUCTA *cs, BOOL bUnicode);
extern BOOL X11DRV_WND_DestroyWindow(struct tagWND *pWnd); extern BOOL X11DRV_WND_DestroyWindow(struct tagWND *pWnd);
extern struct tagWND *X11DRV_WND_SetParent(struct tagWND *wndPtr, struct tagWND *pWndParent); extern struct tagWND *X11DRV_WND_SetParent(struct tagWND *wndPtr, struct tagWND *pWndParent);

1
windows/Makefile.in
View File

@ -4,6 +4,7 @@ TOPOBJDIR = ..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = windows MODULE = windows
EXTRAINCL = -I$(TOPSRCDIR)/dlls/user
C_SRCS = \ C_SRCS = \
caret.c \ caret.c \

16
windows/class.c
View File

@ -22,6 +22,7 @@
#include "wine/unicode.h" #include "wine/unicode.h"
#include "heap.h" #include "heap.h"
#include "win.h" #include "win.h"
#include "controls.h"
#include "dce.h" #include "dce.h"
#include "ldt.h" #include "ldt.h"
#include "toolhelp.h" #include "toolhelp.h"
@ -348,26 +349,25 @@ static CLASS *CLASS_RegisterClass( ATOM atom, HINSTANCE hInstance,
* Register a builtin control class. * Register a builtin control class.
* This allows having both ASCII and Unicode winprocs for the same class. * This allows having both ASCII and Unicode winprocs for the same class.
*/ */
ATOM CLASS_RegisterBuiltinClass( LPCSTR name, DWORD style, INT winExtra, LPCSTR cursor, ATOM CLASS_RegisterBuiltinClass( const struct builtin_class_descr *descr )
HBRUSH brush, WNDPROC wndProcA, WNDPROC wndProcW )
{ {
ATOM atom; ATOM atom;
CLASS *classPtr; CLASS *classPtr;
if (!(atom = GlobalAddAtomA( name ))) return 0; if (!(atom = GlobalAddAtomA( descr->name ))) return 0;
if (!(classPtr = CLASS_RegisterClass( atom, 0, style, 0, winExtra ))) if (!(classPtr = CLASS_RegisterClass( atom, 0, descr->style, 0, descr->extra )))
{ {
GlobalDeleteAtom( atom ); GlobalDeleteAtom( atom );
return 0; return 0;
} }
classPtr->hCursor = LoadCursorA( 0, cursor ); classPtr->hCursor = LoadCursorA( 0, descr->cursor );
classPtr->hbrBackground = brush; classPtr->hbrBackground = descr->brush;
if (wndProcA) WINPROC_SetProc( &classPtr->winprocA, (HWINDOWPROC)wndProcA, if (descr->procA) WINPROC_SetProc( &classPtr->winprocA, (HWINDOWPROC)descr->procA,
WIN_PROC_32A, WIN_PROC_CLASS ); WIN_PROC_32A, WIN_PROC_CLASS );
if (wndProcW) WINPROC_SetProc( &classPtr->winprocW, (HWINDOWPROC)wndProcW, if (descr->procW) WINPROC_SetProc( &classPtr->winprocW, (HWINDOWPROC)descr->procW,
WIN_PROC_32W, WIN_PROC_CLASS ); WIN_PROC_32W, WIN_PROC_CLASS );
return atom; return atom;
} }

2
windows/defdlg.c
View File

@ -9,7 +9,7 @@
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "dialog.h" #include "controls.h"
#include "win.h" #include "win.h"
#include "winproc.h" #include "winproc.h"

41
windows/dialog.c
View File

@ -18,8 +18,7 @@
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "dialog.h" #include "controls.h"
#include "drive.h"
#include "heap.h" #include "heap.h"
#include "win.h" #include "win.h"
#include "user.h" #include "user.h"
@ -79,6 +78,21 @@ typedef struct
static WORD xBaseUnit = 0, yBaseUnit = 0; static WORD xBaseUnit = 0, yBaseUnit = 0;
/*********************************************************************
* dialog class descriptor
*/
const struct builtin_class_descr DIALOG_builtin_class =
{
DIALOG_CLASS_ATOM, /* name */
CS_GLOBALCLASS | CS_SAVEBITS, /* style */
DefDlgProcA, /* procA */
DefDlgProcW, /* procW */
DLGWINDOWEXTRA, /* extra */
IDC_ARROWA, /* cursor */
0 /* brush */
};
/*********************************************************************** /***********************************************************************
* DIALOG_EnableOwner * DIALOG_EnableOwner
* *
@ -2216,7 +2230,6 @@ static BOOL DIALOG_DlgDirSelect( HWND hwnd, LPSTR str, INT len,
static INT DIALOG_DlgDirList( HWND hDlg, LPSTR spec, INT idLBox, static INT DIALOG_DlgDirList( HWND hDlg, LPSTR spec, INT idLBox,
INT idStatic, UINT attrib, BOOL combo ) INT idStatic, UINT attrib, BOOL combo )
{ {
int drive;
HWND hwnd; HWND hwnd;
LPSTR orig_spec = spec; LPSTR orig_spec = spec;
@ -2227,16 +2240,8 @@ static INT DIALOG_DlgDirList( HWND hDlg, LPSTR spec, INT idLBox,
TRACE("%04x '%s' %d %d %04x\n", TRACE("%04x '%s' %d %d %04x\n",
hDlg, spec ? spec : "NULL", idLBox, idStatic, attrib ); hDlg, spec ? spec : "NULL", idLBox, idStatic, attrib );
if (spec && spec[0] && (spec[1] == ':'))
{
drive = toupper( spec[0] ) - 'A';
spec += 2;
if (!DRIVE_SetCurrentDrive( drive )) return FALSE;
}
else drive = DRIVE_GetCurrentDrive();
/* If the path exists and is a directory, chdir to it */ /* If the path exists and is a directory, chdir to it */
if (!spec || !spec[0] || DRIVE_Chdir( drive, spec )) spec = "*.*"; if (!spec || !spec[0] || SetCurrentDirectoryA( spec )) spec = "*.*";
else else
{ {
char *p, *p2; char *p, *p2;
@ -2247,7 +2252,7 @@ static INT DIALOG_DlgDirList( HWND hDlg, LPSTR spec, INT idLBox,
{ {
char sep = *p; char sep = *p;
*p = 0; *p = 0;
if (!DRIVE_Chdir( drive, spec )) if (!SetCurrentDirectoryA( spec ))
{ {
*p = sep; /* Restore the original spec */ *p = sep; /* Restore the original spec */
return FALSE; return FALSE;
@ -2256,8 +2261,7 @@ static INT DIALOG_DlgDirList( HWND hDlg, LPSTR spec, INT idLBox,
} }
} }
TRACE("path=%c:\\%s mask=%s\n", TRACE( "mask=%s\n", spec );
'A' + drive, DRIVE_GetDosCwd(drive), spec );
if (idLBox && ((hwnd = GetDlgItem( hDlg, idLBox )) != 0)) if (idLBox && ((hwnd = GetDlgItem( hDlg, idLBox )) != 0))
{ {
@ -2286,11 +2290,8 @@ static INT DIALOG_DlgDirList( HWND hDlg, LPSTR spec, INT idLBox,
if (idStatic && ((hwnd = GetDlgItem( hDlg, idStatic )) != 0)) if (idStatic && ((hwnd = GetDlgItem( hDlg, idStatic )) != 0))
{ {
char temp[512]; char temp[MAX_PATH];
int drive = DRIVE_GetCurrentDrive(); GetCurrentDirectoryA( sizeof(temp), temp );
strcpy( temp, "A:\\" );
temp[0] += drive;
lstrcpynA( temp + 3, DRIVE_GetDosCwd(drive), sizeof(temp)-3 );
CharLowerA( temp ); CharLowerA( temp );
/* Can't use PostMessage() here, because the string is on the stack */ /* Can't use PostMessage() here, because the string is on the stack */
SetDlgItemTextA( hDlg, idStatic, temp ); SetDlgItemTextA( hDlg, idStatic, temp );

55
windows/mdi.c
View File

@ -77,10 +77,8 @@
#include "win.h" #include "win.h"
#include "heap.h" #include "heap.h"
#include "nonclient.h" #include "nonclient.h"
#include "mdi.h" #include "controls.h"
#include "user.h" #include "user.h"
#include "menu.h"
#include "scroll.h"
#include "struct32.h" #include "struct32.h"
#include "tweak.h" #include "tweak.h"
#include "debugtools.h" #include "debugtools.h"
@ -88,8 +86,37 @@
DEFAULT_DEBUG_CHANNEL(mdi); DEFAULT_DEBUG_CHANNEL(mdi);
#define MDI_MAXLISTLENGTH 0x40
#define MDI_MAXTITLELENGTH 0xa1
#define MDI_NOFRAMEREPAINT 0
#define MDI_REPAINTFRAMENOW 1
#define MDI_REPAINTFRAME 2
#define WM_MDICALCCHILDSCROLL 0x10ac /* this is exactly what Windows uses */
/* "More Windows..." definitions */
#define MDI_MOREWINDOWSLIMIT 9 /* after this number of windows, a "More Windows..."
option will appear under the Windows menu */
#define MDI_IDC_LISTBOX 100
#define MDI_IDS_MOREWINDOWS 13
#define MDIF_NEEDUPDATE 0x0001 #define MDIF_NEEDUPDATE 0x0001
typedef struct
{
UINT nActiveChildren;
HWND hwndChildMaximized;
HWND hwndActiveChild;
HMENU hWindowMenu;
UINT idFirstChild;
LPWSTR frameTitle;
UINT nTotalCreated;
UINT mdiFlags;
UINT sbRecalc; /* SB_xxx flags for scrollbar fixup */
HWND self;
} MDICLIENTINFO;
static HBITMAP16 hBmpClose = 0; static HBITMAP16 hBmpClose = 0;
static HBITMAP16 hBmpRestore = 0; static HBITMAP16 hBmpRestore = 0;
@ -102,6 +129,7 @@ static LONG MDI_ChildActivate( WND*, HWND );
static HWND MDI_MoreWindowsDialog(WND*); static HWND MDI_MoreWindowsDialog(WND*);
static void MDI_SwapMenuItems(WND *, UINT, UINT); static void MDI_SwapMenuItems(WND *, UINT, UINT);
static LRESULT WINAPI MDIClientWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam );
/* -------- Miscellaneous service functions ---------- /* -------- Miscellaneous service functions ----------
* *
* MDI_GetChildByID * MDI_GetChildByID
@ -124,6 +152,22 @@ static void MDI_PostUpdate(HWND hwnd, MDICLIENTINFO* ci, WORD recalc)
ci->sbRecalc = recalc; ci->sbRecalc = recalc;
} }
/*********************************************************************
* MDIClient class descriptor
*/
const struct builtin_class_descr MDICLIENT_builtin_class =
{
"MDIClient", /* name */
CS_GLOBALCLASS, /* style */
MDIClientWndProcA, /* procA */
NULL, /* procW (FIXME) */
sizeof(MDICLIENTINFO), /* extra */
IDC_ARROWA, /* cursor */
COLOR_APPWORKSPACE+1 /* brush */
};
/********************************************************************** /**********************************************************************
* MDI_MenuModifyItem * MDI_MenuModifyItem
*/ */
@ -1190,12 +1234,11 @@ static void MDI_UpdateFrameText( WND *frameWnd, HWND hClient,
/********************************************************************** /**********************************************************************
* MDIClientWndProc * MDIClientWndProcA
* *
* This function handles all MDI requests. * This function handles all MDI requests.
*/ */
LRESULT WINAPI MDIClientWndProc( HWND hwnd, UINT message, WPARAM wParam, static LRESULT WINAPI MDIClientWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam )
LPARAM lParam )
{ {
LPCREATESTRUCTA cs; LPCREATESTRUCTA cs;
MDICLIENTINFO *ci; MDICLIENTINFO *ci;

2
windows/message.c
View File

@ -26,7 +26,7 @@
#include "selectors.h" #include "selectors.h"
#include "thread.h" #include "thread.h"
#include "options.h" #include "options.h"
#include "menu.h" #include "controls.h"
#include "struct32.h" #include "struct32.h"
#include "debugtools.h" #include "debugtools.h"

4
windows/nonclient.c
View File

@ -14,12 +14,10 @@
#include "user.h" #include "user.h"
#include "heap.h" #include "heap.h"
#include "dce.h" #include "dce.h"
#include "controls.h"
#include "cursoricon.h" #include "cursoricon.h"
#include "dialog.h"
#include "menu.h"
#include "winpos.h" #include "winpos.h"
#include "hook.h" #include "hook.h"
#include "scroll.h"
#include "nonclient.h" #include "nonclient.h"
#include "queue.h" #include "queue.h"
#include "selectors.h" #include "selectors.h"

2
windows/sysparams.c
View File

@ -15,10 +15,10 @@
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "winerror.h" #include "winerror.h"
#include "controls.h"
#include "keyboard.h" #include "keyboard.h"
#include "tweak.h" #include "tweak.h"
#include "user.h" #include "user.h"
#include "desktop.h"
#include "debugtools.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(system); DEFAULT_DEBUG_CHANNEL(system);

2
windows/user.c
View File

@ -16,7 +16,7 @@
#include "queue.h" #include "queue.h"
#include "win.h" #include "win.h"
#include "clipboard.h" #include "clipboard.h"
#include "menu.h" #include "controls.h"
#include "cursoricon.h" #include "cursoricon.h"
#include "hook.h" #include "hook.h"
#include "toolhelp.h" #include "toolhelp.h"

14
windows/win.c
View File

@ -15,16 +15,15 @@
#include "heap.h" #include "heap.h"
#include "user.h" #include "user.h"
#include "dce.h" #include "dce.h"
#include "controls.h"
#include "cursoricon.h" #include "cursoricon.h"
#include "hook.h" #include "hook.h"
#include "menu.h"
#include "message.h" #include "message.h"
#include "queue.h" #include "queue.h"
#include "winpos.h" #include "winpos.h"
#include "task.h" #include "task.h"
#include "thread.h" #include "thread.h"
#include "winerror.h" #include "winerror.h"
#include "mdi.h"
#include "stackframe.h" #include "stackframe.h"
#include "debugtools.h" #include "debugtools.h"
@ -585,9 +584,8 @@ BOOL WIN_CreateDesktopWindow(void)
TRACE("Creating desktop window\n"); TRACE("Creating desktop window\n");
if (!ICONTITLE_Init() || if (!WINPOS_CreateInternalPosAtom() ||
!WINPOS_CreateInternalPosAtom() || !(class = CLASS_AddWindow( (ATOM)LOWORD(DESKTOP_CLASS_ATOM), 0, WIN_PROC_32W,
!(class = CLASS_AddWindow( DESKTOP_CLASS_ATOM, 0, WIN_PROC_32A,
&wndExtra, &winproc, &clsStyle, &dce ))) &wndExtra, &winproc, &clsStyle, &dce )))
return FALSE; return FALSE;
@ -632,11 +630,9 @@ BOOL WIN_CreateDesktopWindow(void)
pWndDesktop->cbWndExtra = wndExtra; pWndDesktop->cbWndExtra = wndExtra;
pWndDesktop->irefCount = 0; pWndDesktop->irefCount = 0;
/* FIXME: How do we know if it should be Unicode or not */ if(!pWndDesktop->pDriver->pCreateDesktopWindow(pWndDesktop)) return FALSE;
if(!pWndDesktop->pDriver->pCreateDesktopWindow(pWndDesktop, FALSE))
return FALSE;
SendMessageA( hwndDesktop, WM_NCCREATE, 0, 0 ); SendMessageW( hwndDesktop, WM_NCCREATE, 0, 0 );
pWndDesktop->flags |= WIN_NEEDS_ERASEBKGND; pWndDesktop->flags |= WIN_NEEDS_ERASEBKGND;
return TRUE; return TRUE;
} }

1
windows/winpos.c
View File

@ -11,6 +11,7 @@
#include "wingdi.h" #include "wingdi.h"
#include "winerror.h" #include "winerror.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "controls.h"
#include "heap.h" #include "heap.h"
#include "user.h" #include "user.h"
#include "region.h" #include "region.h"

2
windows/winproc.c
View File

@ -15,6 +15,7 @@
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "stackframe.h" #include "stackframe.h"
#include "builtin16.h" #include "builtin16.h"
#include "controls.h"
#include "heap.h" #include "heap.h"
#include "selectors.h" #include "selectors.h"
#include "struct32.h" #include "struct32.h"
@ -25,7 +26,6 @@
#include "commctrl.h" #include "commctrl.h"
#include "task.h" #include "task.h"
#include "thread.h" #include "thread.h"
#include "menu.h"
DECLARE_DEBUG_CHANNEL(msg); DECLARE_DEBUG_CHANNEL(msg);
DECLARE_DEBUG_CHANNEL(relay); DECLARE_DEBUG_CHANNEL(relay);

4
windows/x11drv/event.c
View File

@ -28,7 +28,6 @@
#include "clipboard.h" #include "clipboard.h"
#include "dce.h" #include "dce.h"
#include "debugtools.h" #include "debugtools.h"
#include "drive.h"
#include "heap.h" #include "heap.h"
#include "input.h" #include "input.h"
#include "keyboard.h" #include "keyboard.h"
@ -1576,9 +1575,6 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event )
{ {
p_drop = p; p_drop = p;
if((u.i = *p) != -1 ) if((u.i = *p) != -1 )
u.i = DRIVE_FindDriveRoot( (const char **)&p_drop );
if( u.i == -1 ) *p = -1; /* mark as "bad" */
else
{ {
INT len = GetShortPathNameA( p, NULL, 0 ); INT len = GetShortPathNameA( p, NULL, 0 );
if (len) aux_long += len + 1; if (len) aux_long += len + 1;

2
windows/x11drv/wnd.c
View File

@ -173,7 +173,7 @@ void X11DRV_WND_Finalize(WND *wndPtr)
/********************************************************************** /**********************************************************************
* X11DRV_WND_CreateDesktopWindow * X11DRV_WND_CreateDesktopWindow
*/ */
BOOL X11DRV_WND_CreateDesktopWindow(WND *wndPtr, BOOL bUnicode) BOOL X11DRV_WND_CreateDesktopWindow(WND *wndPtr)
{ {
if (wmProtocols == None) if (wmProtocols == None)
wmProtocols = TSXInternAtom( display, "WM_PROTOCOLS", True ); wmProtocols = TSXInternAtom( display, "WM_PROTOCOLS", True );