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
56dff0d4
Commit
56dff0d4
authored
22 years ago
by
Jukka Heinonen
Committed by
Alexandre Julliard
22 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Remove some Win32s specific code.
parent
1a6afad1
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/krnl386.exe.spec
+2
-2
2 additions, 2 deletions
dlls/kernel/krnl386.exe.spec
include/selectors.h
+0
-5
0 additions, 5 deletions
include/selectors.h
memory/selector.c
+2
-32
2 additions, 32 deletions
memory/selector.c
msdos/vxd.c
+2
-0
2 additions, 0 deletions
msdos/vxd.c
with
6 additions
and
39 deletions
dlls/kernel/krnl386.exe.spec
+
2
−
2
View file @
56dff0d4
...
...
@@ -186,8 +186,8 @@
183 equate __0000H 0
184 pascal GlobalDOSAlloc(long) GlobalDOSAlloc16
185 pascal16 GlobalDOSFree(word) GlobalDOSFree16
186 pascal GetSelectorBase(word)
WIN16_
GetSelectorBase
187 pascal16 SetSelectorBase(word long)
WIN16_
SetSelectorBase
186 pascal GetSelectorBase(word) GetSelectorBase
187 pascal16 SetSelectorBase(word long) SetSelectorBase
188 pascal GetSelectorLimit(word) GetSelectorLimit16
189 pascal16 SetSelectorLimit(word long) SetSelectorLimit16
190 equate __E000H 0
...
...
This diff is collapsed.
Click to expand it.
include/selectors.h
+
0
−
5
View file @
56dff0d4
...
...
@@ -28,11 +28,6 @@ extern WORD SELECTOR_AllocBlock( const void *base, DWORD size, unsigned char fla
extern
WORD
SELECTOR_ReallocBlock
(
WORD
sel
,
const
void
*
base
,
DWORD
size
);
extern
void
SELECTOR_FreeBlock
(
WORD
sel
);
extern
UINT
W32S_offset
;
#define W32S_APP2WINE(addr) ((addr)? (DWORD)(addr) + W32S_offset : 0)
#define W32S_WINE2APP(addr) ((addr)? (DWORD)(addr) - W32S_offset : 0)
#define FIRST_LDT_ENTRY_TO_ALLOC 17
#define IS_SELECTOR_FREE(sel) (!(wine_ldt_copy.flags[LOWORD(sel) >> 3] & WINE_LDT_FLAGS_ALLOCATED))
...
...
This diff is collapsed.
Click to expand it.
memory/selector.c
+
2
−
32
View file @
56dff0d4
...
...
@@ -315,22 +315,7 @@ void WINAPI LongPtrAdd16( DWORD ptr, DWORD add )
/***********************************************************************
* GetSelectorBase (KERNEL.186)
*/
DWORD
WINAPI
WIN16_GetSelectorBase
(
WORD
sel
)
{
/*
* Note: For Win32s processes, the whole linear address space is
* shifted by 0x10000 relative to the OS linear address space.
* See the comment in msdos/vxd.c.
*/
DWORD
base
=
GetSelectorBase
(
sel
);
return
W32S_WINE2APP
(
base
);
}
/***********************************************************************
* GetSelectorBase
* GetSelectorBase (KERNEL.186)
*/
DWORD
WINAPI
GetSelectorBase
(
WORD
sel
)
{
...
...
@@ -344,22 +329,7 @@ DWORD WINAPI GetSelectorBase( WORD sel )
/***********************************************************************
* SetSelectorBase (KERNEL.187)
*/
DWORD
WINAPI
WIN16_SetSelectorBase
(
WORD
sel
,
DWORD
base
)
{
/*
* Note: For Win32s processes, the whole linear address space is
* shifted by 0x10000 relative to the OS linear address space.
* See the comment in msdos/vxd.c.
*/
SetSelectorBase
(
sel
,
W32S_APP2WINE
(
base
)
);
return
sel
;
}
/***********************************************************************
* SetSelectorBase
* SetSelectorBase (KERNEL.187)
*/
WORD
WINAPI
SetSelectorBase
(
WORD
sel
,
DWORD
base
)
{
...
...
This diff is collapsed.
Click to expand it.
msdos/vxd.c
+
2
−
0
View file @
56dff0d4
...
...
@@ -45,6 +45,8 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
vxd
);
#define W32S_APP2WINE(addr) ((addr)? (DWORD)(addr) + W32S_offset : 0)
#define W32S_WINE2APP(addr) ((addr)? (DWORD)(addr) - W32S_offset : 0)
#define VXD_BARF(context,name) \
DPRINTF( "vxd %s: unknown/not implemented parameters:\n" \
...
...
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