Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
95aa1c38
Commit
95aa1c38
authored
Jan 04, 2000
by
Eric Pouech
Committed by
Alexandre Julliard
Jan 04, 2000
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved the 16 bit driver functions callout into the dir.
parent
ba2a9a06
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
12 deletions
+27
-12
.cvsignore
windows/.cvsignore
+1
-0
Makefile.in
windows/Makefile.in
+2
-1
driver.c
windows/driver.c
+24
-11
No files found.
windows/.cvsignore
View file @
95aa1c38
Makefile
Makefile
driver.glue.c
hook.glue.c
hook.glue.c
windows/Makefile.in
View file @
95aa1c38
...
@@ -39,7 +39,8 @@ C_SRCS = \
...
@@ -39,7 +39,8 @@ C_SRCS = \
winpos.c
\
winpos.c
\
winproc.c
winproc.c
GLUE
=
hook.c
GLUE
=
hook.c
\
driver.c
all
:
$(MODULE).o
all
:
$(MODULE).o
...
...
windows/driver.c
View file @
95aa1c38
...
@@ -10,11 +10,10 @@
...
@@ -10,11 +10,10 @@
#include <string.h>
#include <string.h>
#include "heap.h"
#include "heap.h"
#include "
callback
.h"
#include "
winuser
.h"
#include "driver.h"
#include "driver.h"
#include "ldt.h"
#include "ldt.h"
#include "module.h"
#include "module.h"
#include "mmsystem.h"
#include "mmddk.h"
#include "mmddk.h"
#include "debugtools.h"
#include "debugtools.h"
...
@@ -23,11 +22,17 @@ DEFAULT_DEBUG_CHANNEL(driver)
...
@@ -23,11 +22,17 @@ DEFAULT_DEBUG_CHANNEL(driver)
static
LPWINE_DRIVER
lpDrvItemList
=
NULL
;
static
LPWINE_DRIVER
lpDrvItemList
=
NULL
;
/* TODO list :
/* TODO list :
* - LoadModule count and clean up is not handled correctly (it's not a problem as
* - LoadModule count and clean up is not handled correctly (it's not a
* long as FreeLibrary is not working correctly)
* problem as long as FreeLibrary is not working correctly)
* - msacm has some FIXME related to new code here...
* - shoudln't the allocations be done on a per process basis ?
* - get rid of external function "int DRIVER_GetType(HDRVR hDrvr)"
* - split 16/32 bit functions between DLLs as windows do (16 bit in USER, 32 bit in WINMM)
*/
*/
/* ### start build ### */
extern
LONG
CALLBACK
DRIVER_CallTo16_long_lwwll
(
FARPROC16
,
LONG
,
WORD
,
WORD
,
LONG
,
LONG
);
/* ### stop build ### */
/**************************************************************************
/**************************************************************************
* LoadStartupDrivers [internal]
* LoadStartupDrivers [internal]
*/
*/
...
@@ -115,7 +120,7 @@ static LPWINE_DRIVER DRIVER_FindFromHDrvr(HDRVR hDrvr)
...
@@ -115,7 +120,7 @@ static LPWINE_DRIVER DRIVER_FindFromHDrvr(HDRVR hDrvr)
/**************************************************************************
/**************************************************************************
* DRIVER_GetType [internal]
* DRIVER_GetType [internal]
*
*
* From a hDrvr (being 16 or 32 bits), returns
the WINE internal structure
.
* From a hDrvr (being 16 or 32 bits), returns
TRUE the flags for the driver
.
*/
*/
int
DRIVER_GetType
(
HDRVR
hDrvr
)
int
DRIVER_GetType
(
HDRVR
hDrvr
)
{
{
...
@@ -474,8 +479,8 @@ LRESULT WINAPI SendDriverMessage16(HDRVR16 hDriver, UINT16 msg, LPARAM lParam1,
...
@@ -474,8 +479,8 @@ LRESULT WINAPI SendDriverMessage16(HDRVR16 hDriver, UINT16 msg, LPARAM lParam1,
case
WINE_DI_TYPE_16
:
case
WINE_DI_TYPE_16
:
TRACE
(
"Before CallDriverProc proc=%p driverID=%08lx hDrv=%u wMsg=%04x p1=%08lx p2=%08lx
\n
"
,
TRACE
(
"Before CallDriverProc proc=%p driverID=%08lx hDrv=%u wMsg=%04x p1=%08lx p2=%08lx
\n
"
,
lpDrv
->
d
.
d16
.
lpDrvProc
,
lpDrv
->
dwDriverID
,
hDriver
,
msg
,
lParam1
,
lParam2
);
lpDrv
->
d
.
d16
.
lpDrvProc
,
lpDrv
->
dwDriverID
,
hDriver
,
msg
,
lParam1
,
lParam2
);
retval
=
Callbacks
->
CallDriverProc
(
lpDrv
->
d
.
d16
.
lpDrvProc
,
lpDrv
->
dwDriverID
,
hDriver
,
retval
=
DRIVER_CallTo16_long_lwwll
((
FARPROC16
)
lpDrv
->
d
.
d16
.
lpDrvProc
,
lpDrv
->
dwDriverID
,
msg
,
lParam1
,
lParam2
);
hDriver
,
msg
,
lParam1
,
lParam2
);
break
;
break
;
case
WINE_DI_TYPE_32
:
case
WINE_DI_TYPE_32
:
mapRet
=
DRIVER_MapMsg16To32
(
msg
,
&
lParam1
,
&
lParam2
);
mapRet
=
DRIVER_MapMsg16To32
(
msg
,
&
lParam1
,
&
lParam2
);
...
@@ -523,8 +528,8 @@ LRESULT WINAPI SendDriverMessage(HDRVR hDriver, UINT msg, LPARAM lParam1,
...
@@ -523,8 +528,8 @@ LRESULT WINAPI SendDriverMessage(HDRVR hDriver, UINT msg, LPARAM lParam1,
if
(
mapRet
>=
0
)
{
if
(
mapRet
>=
0
)
{
TRACE
(
"Before CallDriverProc proc=%p driverID=%08lx hDrv=%u wMsg=%04x p1=%08lx p2=%08lx
\n
"
,
TRACE
(
"Before CallDriverProc proc=%p driverID=%08lx hDrv=%u wMsg=%04x p1=%08lx p2=%08lx
\n
"
,
lpDrv
->
d
.
d16
.
lpDrvProc
,
lpDrv
->
dwDriverID
,
lpDrv
->
hDriver16
,
msg
,
lParam1
,
lParam2
);
lpDrv
->
d
.
d16
.
lpDrvProc
,
lpDrv
->
dwDriverID
,
lpDrv
->
hDriver16
,
msg
,
lParam1
,
lParam2
);
retval
=
Callbacks
->
CallDriverProc
(
lpDrv
->
d
.
d16
.
lpDrvProc
,
lpDrv
->
dwDriverID
,
lpDrv
->
hDriver16
,
retval
=
DRIVER_CallTo16_long_lwwll
((
FARPROC16
)
lpDrv
->
d
.
d16
.
lpDrvProc
,
lpDrv
->
dwDriverID
,
msg
,
lParam1
,
lParam2
);
lpDrv
->
hDriver16
,
msg
,
lParam1
,
lParam2
);
if
(
mapRet
>=
1
)
{
if
(
mapRet
>=
1
)
{
DRIVER_UnMapMsg32To16
(
msg
,
lParam1
,
lParam2
);
DRIVER_UnMapMsg32To16
(
msg
,
lParam1
,
lParam2
);
}
}
...
@@ -802,6 +807,10 @@ HDRVR16 WINAPI OpenDriver16(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lP
...
@@ -802,6 +807,10 @@ HDRVR16 WINAPI OpenDriver16(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lP
drvName
,
sizeof
(
drvName
),
"SYSTEM.INI"
)
>
0
)
{
drvName
,
sizeof
(
drvName
),
"SYSTEM.INI"
)
>
0
)
{
hDriver
=
DRIVER_TryOpenDriver16
(
drvName
,
lParam
,
FALSE
);
hDriver
=
DRIVER_TryOpenDriver16
(
drvName
,
lParam
,
FALSE
);
}
}
if
(
!
hDriver
)
ERR
(
"Failed to open driver %s from section %s
\n
"
,
lpDriverName
,
lpSectionName
);
else
TRACE
(
"=> %08x
\n
"
,
hDriver
);
return
hDriver
;
return
hDriver
;
}
}
...
@@ -847,7 +856,10 @@ HDRVR WINAPI OpenDriverA(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lPara
...
@@ -847,7 +856,10 @@ HDRVR WINAPI OpenDriverA(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lPara
}
}
}
}
}
}
TRACE
(
"retval='%08x'
\n
"
,
hDriver
);
if
(
!
hDriver
)
ERR
(
"Failed to open driver %s from section %s
\n
"
,
lpDriverName
,
lpSectionName
);
else
TRACE
(
"=> %08x
\n
"
,
hDriver
);
return
hDriver
;
return
hDriver
;
}
}
...
@@ -910,6 +922,7 @@ HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr)
...
@@ -910,6 +922,7 @@ HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr)
DWORD
WINAPI
GetDriverFlags
(
HDRVR
hDrvr
)
DWORD
WINAPI
GetDriverFlags
(
HDRVR
hDrvr
)
{
{
FIXME
(
"(%04x); stub!
\n
"
,
hDrvr
);
FIXME
(
"(%04x); stub!
\n
"
,
hDrvr
);
/* should I merge it with DRIVER_GetType() ? */
return
0
;
return
0
;
}
}
...
...
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