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
Alexey Alyaev
wine
Commits
e3b353e2
Commit
e3b353e2
authored
24 years ago
by
Ove Kåven
Committed by
Alexandre Julliard
24 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Removed hModule parameter from MZ_AllocDPMITask(), and renamed
MZ_KillModule() to MZ_KillTask().
parent
d1d09051
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
include/dosexe.h
+2
-2
2 additions, 2 deletions
include/dosexe.h
loader/dos/module.c
+6
-15
6 additions, 15 deletions
loader/dos/module.c
msdos/dpmi.c
+1
-1
1 addition, 1 deletion
msdos/dpmi.c
with
9 additions
and
18 deletions
include/dosexe.h
+
2
−
2
View file @
e3b353e2
...
...
@@ -55,8 +55,8 @@ typedef struct _DOSEVENT {
#define MZ_SUPPORTED
extern
BOOL
MZ_InitTask
(
LPDOSTASK
lpDosTask
);
extern
void
MZ_Kill
Module
(
LPDOSTASK
lpDosTask
);
extern
LPDOSTASK
MZ_AllocDPMITask
(
HMODULE16
hModule
);
extern
void
MZ_Kill
Task
(
LPDOSTASK
lpDosTask
);
extern
LPDOSTASK
MZ_AllocDPMITask
(
void
);
#endif
/* linux-i386 */
...
...
This diff is collapsed.
Click to expand it.
loader/dos/module.c
+
6
−
15
View file @
e3b353e2
...
...
@@ -182,7 +182,7 @@ static WORD MZ_InitEnvironment( LPDOSTASK lpDosTask, LPCSTR env, LPCSTR name )
return
seg
;
}
static
BOOL
MZ_InitMemory
(
LPDOSTASK
lpDosTask
,
NE_MODULE
*
pModule
)
static
BOOL
MZ_InitMemory
(
LPDOSTASK
lpDosTask
)
{
int
x
;
...
...
@@ -210,7 +210,6 @@ static BOOL MZ_InitMemory( LPDOSTASK lpDosTask, NE_MODULE *pModule )
return
FALSE
;
}
TRACE
(
"DOS VM86 image mapped at %08lx
\n
"
,(
DWORD
)
lpDosTask
->
img
);
pModule
->
dos_image
=
lpDosTask
->
img
;
/* initialize the memory */
TRACE
(
"Initializing DOS memory structures
\n
"
);
...
...
@@ -253,7 +252,7 @@ static BOOL MZ_LoadImage( HANDLE hFile, LPCSTR filename, LPCSTR cmdline,
max_size
=
image_size
+
((
DWORD
)
mz_header
.
e_maxalloc
<<
4
)
+
(
PSP_SIZE
<<
4
);
}
MZ_InitMemory
(
lpDosTask
,
pModule
);
MZ_InitMemory
(
lpDosTask
);
/* allocate environment block */
env_seg
=
MZ_InitEnvironment
(
lpDosTask
,
env
,
filename
);
...
...
@@ -308,22 +307,14 @@ static BOOL MZ_LoadImage( HANDLE hFile, LPCSTR filename, LPCSTR cmdline,
return
TRUE
;
}
LPDOSTASK
MZ_AllocDPMITask
(
HMODULE16
hModule
)
LPDOSTASK
MZ_AllocDPMITask
(
void
)
{
LPDOSTASK
lpDosTask
=
calloc
(
1
,
sizeof
(
DOSTASK
));
NE_MODULE
*
pModule
;
if
(
lpDosTask
)
{
lpDosTask
->
hModule
=
hModule
;
pModule
=
(
NE_MODULE
*
)
GlobalLock16
(
hModule
);
pModule
->
lpDosTask
=
lpDosTask
;
lpDosTask
->
img
=
NULL
;
lpDosTask
->
mm_name
[
0
]
=
0
;
lpDosTask
->
mm_fd
=-
1
;
MZ_InitMemory
(
lpDosTask
,
pModule
);
GlobalUnlock16
(
hModule
);
MZ_InitMemory
(
lpDosTask
);
}
return
lpDosTask
;
}
...
...
@@ -497,7 +488,7 @@ BOOL MZ_CreateProcess( HANDLE hFile, LPCSTR filename, LPCSTR cmdline, LPCSTR env
if (alloc) {
pModule->dos_image = lpDosTask->img;
if (!MZ_InitTask( lpDosTask )) {
MZ_Kill
Module
( lpDosTask );
MZ_Kill
Task
( lpDosTask );
/* FIXME: cleanup hModule */
SetLastError(ERROR_GEN_FAILURE);
return FALSE;
...
...
@@ -511,7 +502,7 @@ BOOL MZ_CreateProcess( HANDLE hFile, LPCSTR filename, LPCSTR cmdline, LPCSTR env
}
#endif
void
MZ_Kill
Module
(
LPDOSTASK
lpDosTask
)
void
MZ_Kill
Task
(
LPDOSTASK
lpDosTask
)
{
DOSEVENT
*
event
,
*
p_event
;
DOSSYSTEM
*
sys
,
*
p_sys
;
...
...
This diff is collapsed.
Click to expand it.
msdos/dpmi.c
+
1
−
1
View file @
e3b353e2
...
...
@@ -357,7 +357,7 @@ callrmproc_again:
#ifdef MZ_SUPPORTED
FIXME
(
"DPMI real-mode call using DOS VM task system, not fully tested!
\n
"
);
TRACE
(
"creating VM86 task
\n
"
);
if
(
!
MZ_InitTask
(
MZ_AllocDPMITask
(
pModule
->
self
)
))
{
if
(
!
MZ_InitTask
(
MZ_AllocDPMITask
()
))
{
ERR
(
"could not setup VM86 task
\n
"
);
return
1
;
}
...
...
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