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
e5cade0f
Commit
e5cade0f
authored
Mar 02, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Remove DLL_WINE_PREATTACH support.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
24b44771
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
15 deletions
+0
-15
loader.c
dlls/ntdll/loader.c
+0
-12
winnt.h
include/winnt.h
+0
-3
No files found.
dlls/ntdll/loader.c
View file @
e5cade0f
...
...
@@ -105,8 +105,6 @@ static const char * const reason_names[] =
"PROCESS_ATTACH"
,
"THREAD_ATTACH"
,
"THREAD_DETACH"
,
NULL
,
NULL
,
NULL
,
NULL
,
"WINE_PREATTACH"
};
struct
file_id
...
...
@@ -1261,8 +1259,6 @@ static void call_tls_callbacks( HMODULE module, UINT reason )
const
PIMAGE_TLS_CALLBACK
*
callback
;
ULONG
dirsize
;
if
(
reason
==
DLL_WINE_PREATTACH
)
return
;
dir
=
RtlImageDirectoryEntryToData
(
module
,
TRUE
,
IMAGE_DIRECTORY_ENTRY_TLS
,
&
dirsize
);
if
(
!
dir
||
!
dir
->
AddressOfCallBacks
)
return
;
...
...
@@ -2687,14 +2683,6 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC
case
LO_BUILTIN_NATIVE
:
case
LO_DEFAULT
:
nts
=
load_builtin_dll
(
load_path
,
&
nt_name
,
flags
,
pwm
,
loadorder
==
LO_DEFAULT
);
if
(
nts
==
STATUS_SUCCESS
&&
loadorder
==
LO_DEFAULT
&&
(
MODULE_InitDLL
(
*
pwm
,
DLL_WINE_PREATTACH
,
NULL
)
!=
STATUS_SUCCESS
))
{
/* stub-only dll, try native */
TRACE
(
"%s pre-attach returned FALSE, preferring native
\n
"
,
debugstr_us
(
&
nt_name
)
);
LdrUnloadDll
(
(
*
pwm
)
->
ldr
.
DllBase
);
nts
=
STATUS_IMAGE_ALREADY_LOADED
;
}
if
(
nts
==
STATUS_DLL_NOT_FOUND
||
nts
==
STATUS_IMAGE_ALREADY_LOADED
)
nts
=
load_native_dll
(
load_path
,
&
nt_name
,
mapping
,
&
image_info
,
&
id
,
flags
,
pwm
);
break
;
...
...
include/winnt.h
View file @
e5cade0f
...
...
@@ -676,9 +676,6 @@ typedef DWORD FLONG;
#define DLL_PROCESS_ATTACH 1
/* attach process (load library) */
#define DLL_THREAD_ATTACH 2
/* attach new thread */
#define DLL_THREAD_DETACH 3
/* detach thread */
#ifdef __WINESRC__
#define DLL_WINE_PREATTACH 8
/* called before process attach for Wine builtins */
#endif
/* u.x.wProcessorArchitecture (NT) */
#define PROCESSOR_ARCHITECTURE_INTEL 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