Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
2d8cf500
Commit
2d8cf500
authored
Jun 03, 2000
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merged display.dll into USER.
parent
0dc0d446
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
32 additions
and
101 deletions
+32
-101
Makefile.in
Makefile.in
+0
-2
configure
configure
+0
-2
configure.in
configure.in
+0
-1
Makefile.in
dlls/Makefile.in
+2
-1
dinput_main.c
dlls/dinput/dinput_main.c
+3
-4
.cvsignore
dlls/display/.cvsignore
+0
-4
Makefile.in
dlls/display/Makefile.in
+0
-21
.cvsignore
dlls/user/.cvsignore
+1
-0
Makefile.in
dlls/user/Makefile.in
+12
-2
disp.rc
dlls/user/disp.rc
+0
-0
display.c
dlls/user/display.c
+8
-1
display.spec
dlls/user/display.spec
+0
-0
user_main.c
dlls/user/user_main.c
+1
-2
display.h
include/display.h
+0
-29
main.c
loader/main.c
+0
-25
cursoricon.c
windows/cursoricon.c
+4
-5
wnd.c
windows/x11drv/wnd.c
+1
-2
No files found.
Makefile.in
View file @
2d8cf500
...
...
@@ -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
\
...
...
configure
View file @
2d8cf500
...
...
@@ -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
...
...
configure.in
View file @
2d8cf500
...
...
@@ -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
...
...
dlls/Makefile.in
View file @
2d8cf500
...
...
@@ -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@
...
...
dlls/dinput/dinput_main.c
View file @
2d8cf500
...
...
@@ -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
;
}
...
...
dlls/display/.cvsignore
deleted
100644 → 0
View file @
0dc0d446
Makefile
disp.s
*.spec.c
*.spec.glue.s
dlls/display/Makefile.in
deleted
100644 → 0
View file @
0dc0d446
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:
dlls/user/.cvsignore
View file @
2d8cf500
*.spec.c
*.spec.glue.s
Makefile
disp.s
libuser32.so.1.0
thunk.glue.c
dlls/user/Makefile.in
View file @
2d8cf500
...
...
@@ -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@
...
...
dlls/
display
/disp.rc
→
dlls/
user
/disp.rc
View file @
2d8cf500
File moved
dlls/
display/display_main
.c
→
dlls/
user/display
.c
View file @
2d8cf500
...
...
@@ -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)
*/
...
...
dlls/
display
/display.spec
→
dlls/
user
/display.spec
View file @
2d8cf500
File moved
dlls/user/user_main.c
View file @
2d8cf500
...
...
@@ -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 */
U
serRepaintDisable16
(
FALSE
);
U
SER_Driver
->
pUserRepaintDisable
(
FALSE
);
return
TRUE
;
}
include/display.h
deleted
100644 → 0
View file @
0dc0d446
/*
* 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 */
loader/main.c
View file @
2d8cf500
...
...
@@ -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"
...
...
windows/cursoricon.c
View file @
2d8cf500
...
...
@@ -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
->
p
SetCursor
(
(
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
->
p
MoveCursor
(
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
->
p
SetCursor
(
NULL
);
}
return
CURSOR_ShowCount
;
}
...
...
windows/x11drv/wnd.c
View file @
2d8cf500
...
...
@@ -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) \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment