system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 18:54:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged display.dll into USER.

Browse source
This commit is contained in:
Alexandre Julliard 2000-06-03 04:20:19 +00:00
parent 0dc0d4461b
commit 2d8cf500c3
17 changed files with 32 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.in
View file

@ -30,7 +30,6 @@ LIBSUBDIRS = \
console \
dlls/advapi32 \
dlls/crtdll \
dlls/display \
dlls/kernel \
dlls/mouse \
dlls/ntdll \
@ -98,7 +97,6 @@ LIBOBJS = \
console/console.o \
dlls/advapi32/advapi32.o \
dlls/crtdll/crtdll.o \
dlls/display/display.o \
dlls/mouse/mouse.o \
dlls/ntdll/ntdll.o \
files/files.o \

2
configure vendored
View file

@ -6200,7 +6200,6 @@ dlls/crtdll/Makefile
dlls/dciman32/Makefile
dlls/ddraw/Makefile
dlls/dinput/Makefile
dlls/display/Makefile
dlls/dplayx/Makefile
dlls/dsound/Makefile
dlls/gdi/Makefile
@ -6435,7 +6434,6 @@ dlls/crtdll/Makefile
dlls/dciman32/Makefile
dlls/ddraw/Makefile
dlls/dinput/Makefile
dlls/display/Makefile
dlls/dplayx/Makefile
dlls/dsound/Makefile
dlls/gdi/Makefile

1
configure.in
View file

@ -994,7 +994,6 @@ dlls/crtdll/Makefile
dlls/dciman32/Makefile
dlls/ddraw/Makefile
dlls/dinput/Makefile
dlls/display/Makefile
dlls/dplayx/Makefile
dlls/dsound/Makefile
dlls/gdi/Makefile

3
dlls/Makefile.in
View file

@ -78,6 +78,7 @@ EXTRADLLNAMES = \
compobj \
ddeml \
dispdib \
display \
dplay \
gdi \
kernel \
@ -302,7 +303,7 @@ libttydrv.@LIBEXT@: ttydrv/libttydrv.@LIBEXT@
liburlmon.@LIBEXT@: urlmon/liburlmon.@LIBEXT@
$(RM) $@ && $(LN_S) urlmon/liburlmon.@LIBEXT@ $@
libuser32.@LIBEXT@ libuser.@LIBEXT@ libkeyboard.@LIBEXT@ libddeml.@LIBEXT@: user/libuser32.@LIBEXT@
libuser32.@LIBEXT@ libuser.@LIBEXT@ libkeyboard.@LIBEXT@ libddeml.@LIBEXT@ libdisplay.@LIBEXT@: user/libuser32.@LIBEXT@
$(RM) $@ && $(LN_S) user/libuser32.@LIBEXT@ $@
libversion.@LIBEXT@ libver.@LIBEXT@: version/libversion.@LIBEXT@

7
dlls/dinput/dinput_main.c
View file

@ -41,7 +41,6 @@
#include "wine/obj_base.h"
#include "debugtools.h"
#include "dinput.h"
#include "display.h"
#include "input.h"
#include "user.h"
#include "message.h"
@ -1432,7 +1431,7 @@ static HRESULT WINAPI SysMouseAImpl_Acquire(LPDIRECTINPUTDEVICE2A iface)
point.x = This->win_centerX;
point.y = This->win_centerY;
MapWindowPoints(This->win, HWND_DESKTOP, &point, 1);
DISPLAY_MoveCursor(point.x, point.y);
USER_Driver->pMoveCursor( point.x, point.y );
This->need_warp = WARP_STARTED;
}
@ -1494,7 +1493,7 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceState(
point.x = This->win_centerX;
point.y = This->win_centerY;
MapWindowPoints(This->win, HWND_DESKTOP, &point, 1);
DISPLAY_MoveCursor(point.x, point.y);
USER_Driver->pMoveCursor( point.x, point.y );
This->need_warp = WARP_STARTED;
}
@ -1561,7 +1560,7 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceData(LPDIRECTINPUTDEVICE2A iface,
point.y = This->win_centerY;
MapWindowPoints(This->win, HWND_DESKTOP, &point, 1);
DISPLAY_MoveCursor(point.x, point.y);
USER_Driver->pMoveCursor( point.x, point.y );
This->need_warp = WARP_STARTED;
}

4
dlls/display/.cvsignore
View file

@ -1,4 +0,0 @@
Makefile
disp.s
*.spec.c
*.spec.glue.s

21
dlls/display/Makefile.in
View file

@ -1,21 +0,0 @@
DEFS = @DLLFLAGS@ -D__WINE__
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = display
WRCEXTRA = -s -w16 -pdisplay
SPEC_SRCS = display.spec
C_SRCS = \
display_main.c
RC_SRCS = \
disp.rc
all: $(MODULE).o
@MAKE_RULES@
### Dependencies:

1
dlls/user/.cvsignore
View file

@ -1,5 +1,6 @@
*.spec.c
*.spec.glue.s
Makefile
disp.s
libuser32.so.1.0
thunk.glue.c

14
dlls/user/Makefile.in
View file

@ -4,15 +4,25 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = user32
SOVERSION = 1.0
ALTNAMES = user keyboard ddeml
WRCEXTRA = -s -w16 -pdisplay
ALTNAMES = user keyboard ddeml display
SPEC_SRCS = user32.spec user.spec keyboard.spec ddeml.spec
SPEC_SRCS = \
user32.spec \
user.spec \
keyboard.spec \
ddeml.spec \
display.spec
C_SRCS = \
ddeml.c \
display.c \
user_main.c \
thunk.c
RC_SRCS = \
disp.rc
GLUE = thunk.c
@MAKE_DLL_RULES@

0
dlls/display/disp.rc → dlls/user/disp.rc
View file

9
dlls/display/display_main.c → dlls/user/display.c
View file

@ -6,7 +6,6 @@
*/
#include "debugtools.h"
#include "display.h"
#include "mouse.h"
#include "windef.h"
#include "user.h"
@ -14,6 +13,14 @@
DEFAULT_DEBUG_CHANNEL(cursor);
#include "pshpack1.h"
typedef struct tagCURSORINFO
{
WORD wXMickeys;
WORD wYMickeys;
} CURSORINFO, *PCURSORINFO, *LPCURSORINFO;
#include "poppack.h"
/***********************************************************************
* DISPLAY_Inquire (DISPLAY.101)
*/

0
dlls/display/display.spec → dlls/user/display.spec
View file

3
dlls/user/user_main.c
View file

@ -9,7 +9,6 @@
#include "dce.h"
#include "dialog.h"
#include "display.h"
#include "global.h"
#include "input.h"
#include "keyboard.h"
@ -85,7 +84,7 @@ BOOL WINAPI USER_Init(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
MOUSE_Enable( mouse_event );
/* Start processing X events */
UserRepaintDisable16( FALSE );
USER_Driver->pUserRepaintDisable( FALSE );
return TRUE;
}

29
include/display.h
View file

@ -1,29 +0,0 @@
/*
* DISPLAY driver interface
*
* Copyright 1998 Ulrich Weigand
*/
#ifndef __WINE_DISPLAY_H
#define __WINE_DISPLAY_H
#include "windef.h"
struct tagCURSORICONINFO;
#include "pshpack1.h"
typedef struct tagCURSORINFO
{
WORD wXMickeys;
WORD wYMickeys;
} CURSORINFO, *PCURSORINFO, *LPCURSORINFO;
#include "poppack.h"
WORD WINAPI DISPLAY_Inquire(LPCURSORINFO lpCursorInfo);
VOID WINAPI DISPLAY_SetCursor( struct tagCURSORICONINFO *lpCursor );
VOID WINAPI DISPLAY_MoveCursor( WORD wAbsX, WORD wAbsY );
VOID WINAPI DISPLAY_CheckCursor( void );
VOID WINAPI UserRepaintDisable16( BOOL16 bDisable );
#endif /* __WINE_DISPLAY_H */

25
loader/main.c
View file

@ -11,46 +11,21 @@
#include <string.h>
#include <errno.h>
#include "windef.h"
#include "wingdi.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "bitmap.h"
#include "comm.h"
#include "neexe.h"
#include "main.h"
#include "menu.h"
#include "message.h"
#include "dialog.h"
#include "drive.h"
#include "queue.h"
#include "sysmetrics.h"
#include "file.h"
#include "heap.h"
#include "keyboard.h"
#include "mouse.h"
#include "input.h"
#include "display.h"
#include "miscemu.h"
#include "options.h"
#include "process.h"
#include "spy.h"
#include "tweak.h"
#include "user.h"
#include "cursoricon.h"
#include "global.h"
#include "dce.h"
#include "shell.h"
#include "win.h"
#include "winproc.h"
#include "syslevel.h"
#include "services.h"
#include "winsock.h"
#include "selectors.h"
#include "thread.h"
#include "task.h"
#include "debugtools.h"
#include "win16drv.h"
#include "callback.h"
#include "server.h"
#include "loadorder.h"

9
windows/cursoricon.c
View file

@ -48,7 +48,6 @@
#include "task.h"
#include "user.h"
#include "input.h"
#include "display.h"
#include "message.h"
#include "winerror.h"
@ -1391,7 +1390,7 @@ HCURSOR WINAPI SetCursor(
/* Change the cursor shape only if it is visible */
if (CURSOR_ShowCount >= 0)
{
DISPLAY_SetCursor( (CURSORICONINFO*)GlobalLock16( hActiveCursor ) );
USER_Driver->pSetCursor( (CURSORICONINFO*)GlobalLock16( hActiveCursor ) );
GlobalUnlock16( hActiveCursor );
}
return hOldCursor;
@ -1412,7 +1411,7 @@ void WINAPI SetCursorPos16( INT16 x, INT16 y )
*/
BOOL WINAPI SetCursorPos( INT x, INT y )
{
DISPLAY_MoveCursor( x, y );
USER_Driver->pMoveCursor( x, y );
return TRUE;
}
@ -1438,14 +1437,14 @@ INT WINAPI ShowCursor( BOOL bShow )
{
if (++CURSOR_ShowCount == 0) /* Show it */
{
DISPLAY_SetCursor((CURSORICONINFO*)GlobalLock16( hActiveCursor ));
USER_Driver->pSetCursor( (CURSORICONINFO*)GlobalLock16( hActiveCursor ) );
GlobalUnlock16( hActiveCursor );
}
}
else
{
if (--CURSOR_ShowCount == -1) /* Hide it */
DISPLAY_SetCursor( NULL );
USER_Driver->pSetCursor( NULL );
}
return CURSOR_ShowCount;
}

3
windows/x11drv/wnd.c
View file

@ -19,7 +19,6 @@
#include "bitmap.h"
#include "color.h"
#include "debugtools.h"
#include "display.h"
#include "dce.h"
#include "options.h"
#include "message.h"
@ -31,7 +30,7 @@
#include "wingdi.h"
#include "wine/winuser16.h"
DEFAULT_DEBUG_CHANNEL(win)
DEFAULT_DEBUG_CHANNEL(win);
/* Some useful macros */
#define HAS_DLGFRAME(style,exStyle) \