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
74214252
Commit
74214252
authored
22 years ago
by
Jukka Heinonen
Committed by
Alexandre Julliard
22 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Rename old DOS3Call as INT_Int21Handler and make new DOS3Call call
directly winedos int21 handler.
parent
c71cf7e6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
dlls/kernel/kernel32.spec
+1
-1
1 addition, 1 deletion
dlls/kernel/kernel32.spec
dlls/winedos/int21.c
+9
-4
9 additions, 4 deletions
dlls/winedos/int21.c
msdos/dpmi.c
+21
-0
21 additions, 0 deletions
msdos/dpmi.c
msdos/int21.c
+2
-12
2 additions, 12 deletions
msdos/int21.c
with
33 additions
and
17 deletions
dlls/kernel/kernel32.spec
+
1
−
1
View file @
74214252
...
...
@@ -986,7 +986,6 @@
@ stdcall AllocCStoDSAlias16(long) AllocCStoDSAlias16
@ stdcall AllocSelectorArray16(long) AllocSelectorArray16
@ stdcall ConvertDialog32To16(ptr long ptr) ConvertDialog32To16
@ stdcall DOS3Call(ptr) DOS3Call
@ stdcall ExitKernel16() ExitKernel16
@ stdcall FarGetOwner16(long) FarGetOwner16
@ stdcall FarSetOwner16(long long) FarSetOwner16
...
...
@@ -1057,6 +1056,7 @@
@ cdecl DOSMEM_GetDPMISegments() DOSMEM_GetDPMISegments
@ cdecl DOSMEM_Init(long) DOSMEM_Init
@ cdecl DRIVE_OpenDevice(long long) DRIVE_OpenDevice
@ stdcall INT_Int21Handler(ptr) INT_Int21Handler
@ cdecl LOCAL_Alloc(long long long) LOCAL_Alloc
@ cdecl LOCAL_Compact(long long long) LOCAL_Compact
@ cdecl LOCAL_CountFree(long) LOCAL_CountFree
...
...
This diff is collapsed.
Click to expand it.
dlls/winedos/int21.c
+
9
−
4
View file @
74214252
...
...
@@ -35,6 +35,11 @@
#include
"wine/unicode.h"
#include
"wine/debug.h"
/*
* FIXME: Delete this reference when all int21 code has been moved to winedos.
*/
extern
void
WINAPI
INT_Int21Handler
(
CONTEXT86
*
context
);
WINE_DEFAULT_DEBUG_CHANNEL
(
int21
);
void
WINAPI
DOSVM_Int21Handler_Ioctl
(
CONTEXT86
*
context
)
...
...
@@ -65,7 +70,7 @@ void WINAPI DOSVM_Int21Handler_Ioctl( CONTEXT86 *context )
RESET_CFLAG
(
context
);
break
;
default:
DOS3Call
(
context
);
INT_Int21Handler
(
context
);
}
}
...
...
@@ -79,7 +84,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT86 *context )
BYTE
ascii
;
if
(
DOSVM_IsWin16
())
{
DOS3Call
(
context
);
INT_Int21Handler
(
context
);
return
;
}
...
...
@@ -200,7 +205,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT86 *context )
for
(
i
=
0
;
i
<
CX_reg
(
context
);
i
++
)
DOSVM_PutChar
(
ptr
[
i
]);
}
else
DOS3Call
(
context
);
INT_Int21Handler
(
context
);
break
;
case
0x44
:
/* IOCTL */
...
...
@@ -256,6 +261,6 @@ void WINAPI DOSVM_Int21Handler( CONTEXT86 *context )
break
;
default:
DOS3Call
(
context
);
INT_Int21Handler
(
context
);
}
}
This diff is collapsed.
Click to expand it.
msdos/dpmi.c
+
21
−
0
View file @
74214252
...
...
@@ -24,6 +24,7 @@
#include
"winbase.h"
#include
"callback.h"
#include
"wine/debug.h"
#include
"wine/windef16.h"
WINE_DEFAULT_DEBUG_CHANNEL
(
int31
);
...
...
@@ -66,3 +67,23 @@ void WINAPI NetBIOSCall16( CONTEXT86 *context )
if
(
Dosvm
.
CallBuiltinHandler
||
DPMI_LoadDosSystem
())
Dosvm
.
CallBuiltinHandler
(
context
,
0x5c
);
}
/***********************************************************************
* DOS3Call (KERNEL.102)
*/
void
WINAPI
DOS3Call
(
CONTEXT86
*
context
)
{
if
(
Dosvm
.
CallBuiltinHandler
||
DPMI_LoadDosSystem
())
Dosvm
.
CallBuiltinHandler
(
context
,
0x21
);
}
/***********************************************************************
* GetSetKernelDOSProc (KERNEL.311)
*/
FARPROC16
WINAPI
GetSetKernelDOSProc16
(
FARPROC16
DosProc
)
{
FIXME
(
"(DosProc=0x%08x): stub
\n
"
,
(
UINT
)
DosProc
);
return
NULL
;
}
This diff is collapsed.
Click to expand it.
msdos/int21.c
+
2
−
12
View file @
74214252
...
...
@@ -1120,10 +1120,9 @@ static void INT21_GetExtendedError( CONTEXT86 *context )
}
/***********************************************************************
* DOS3Call (KERNEL.102)
* INT_Int21Handler (WPROCS.133)
* INT_Int21Handler
*/
void
WINAPI
DOS3Call
(
CONTEXT86
*
context
)
void
WINAPI
INT_Int21Handler
(
CONTEXT86
*
context
)
{
BOOL
bSetDOSExtendedError
=
FALSE
;
...
...
@@ -2409,12 +2408,3 @@ void WINAPI DOS3Call( CONTEXT86 *context )
(
WORD
)
context
->
SegDs
,
(
WORD
)
context
->
SegEs
,
context
->
EFlags
);
}
/***********************************************************************
* GetSetKernelDOSProc (KERNEL.311)
*/
FARPROC16
WINAPI
GetSetKernelDOSProc16
(
FARPROC16
DosProc
)
{
FIXME
(
"(DosProc=0x%08x): stub
\n
"
,
(
UINT
)
DosProc
);
return
NULL
;
}
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