Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
95aa1c38
Commit
95aa1c38
authored
25 years ago
by
Eric Pouech
Committed by
Alexandre Julliard
25 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Moved the 16 bit driver functions callout into the dir.
parent
ba2a9a06
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
windows/.cvsignore
+1
-0
1 addition, 0 deletions
windows/.cvsignore
windows/Makefile.in
+2
-1
2 additions, 1 deletion
windows/Makefile.in
windows/driver.c
+24
-11
24 additions, 11 deletions
windows/driver.c
with
27 additions
and
12 deletions
windows/.cvsignore
+
1
−
0
View file @
95aa1c38
Makefile
driver.glue.c
hook.glue.c
This diff is collapsed.
Click to expand it.
windows/Makefile.in
+
2
−
1
View file @
95aa1c38
...
...
@@ -39,7 +39,8 @@ C_SRCS = \
winpos.c
\
winproc.c
GLUE
=
hook.c
GLUE
=
hook.c
\
driver.c
all
:
$(MODULE).o
...
...
This diff is collapsed.
Click to expand it.
windows/driver.c
+
24
−
11
View file @
95aa1c38
...
...
@@ -10,11 +10,10 @@
#include
<string.h>
#include
"heap.h"
#include
"
callback
.h"
#include
"
winuser
.h"
#include
"driver.h"
#include
"ldt.h"
#include
"module.h"
#include
"mmsystem.h"
#include
"mmddk.h"
#include
"debugtools.h"
...
...
@@ -23,11 +22,17 @@ DEFAULT_DEBUG_CHANNEL(driver)
static
LPWINE_DRIVER
lpDrvItemList
=
NULL
;
/* TODO list :
* - LoadModule count and clean up is not handled correctly (it's not a problem as
* long as FreeLibrary is not working correctly)
* - msacm has some FIXME related to new code here...
* - LoadModule count and clean up is not handled correctly (it's not a
* problem as long as FreeLibrary is not working correctly)
* - 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]
*/
...
...
@@ -115,7 +120,7 @@ static LPWINE_DRIVER DRIVER_FindFromHDrvr(HDRVR hDrvr)
/**************************************************************************
* 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
)
{
...
...
@@ -474,8 +479,8 @@ LRESULT WINAPI SendDriverMessage16(HDRVR16 hDriver, UINT16 msg, LPARAM lParam1,
case
WINE_DI_TYPE_16
:
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
);
retval
=
Callbacks
->
CallDriverProc
(
lpDrv
->
d
.
d16
.
lpDrvProc
,
lpDrv
->
dwDriverID
,
hDriver
,
msg
,
lParam1
,
lParam2
);
retval
=
DRIVER_CallTo16_long_lwwll
((
FARPROC16
)
lpDrv
->
d
.
d16
.
lpDrvProc
,
lpDrv
->
dwDriverID
,
hDriver
,
msg
,
lParam1
,
lParam2
);
break
;
case
WINE_DI_TYPE_32
:
mapRet
=
DRIVER_MapMsg16To32
(
msg
,
&
lParam1
,
&
lParam2
);
...
...
@@ -523,8 +528,8 @@ LRESULT WINAPI SendDriverMessage(HDRVR hDriver, UINT msg, LPARAM lParam1,
if
(
mapRet
>=
0
)
{
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
);
retval
=
Callbacks
->
CallDriverProc
(
lpDrv
->
d
.
d16
.
lpDrvProc
,
lpDrv
->
dwDriverID
,
lpDrv
->
hDriver16
,
msg
,
lParam1
,
lParam2
);
retval
=
DRIVER_CallTo16_long_lwwll
((
FARPROC16
)
lpDrv
->
d
.
d16
.
lpDrvProc
,
lpDrv
->
dwDriverID
,
lpDrv
->
hDriver16
,
msg
,
lParam1
,
lParam2
);
if
(
mapRet
>=
1
)
{
DRIVER_UnMapMsg32To16
(
msg
,
lParam1
,
lParam2
);
}
...
...
@@ -802,6 +807,10 @@ HDRVR16 WINAPI OpenDriver16(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lP
drvName
,
sizeof
(
drvName
),
"SYSTEM.INI"
)
>
0
)
{
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
;
}
...
...
@@ -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
;
}
...
...
@@ -910,6 +922,7 @@ HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr)
DWORD
WINAPI
GetDriverFlags
(
HDRVR
hDrvr
)
{
FIXME
(
"(%04x); stub!
\n
"
,
hDrvr
);
/* should I merge it with DRIVER_GetType() ? */
return
0
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment