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
Releases
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
Johnny Cai
wine
Commits
a33f318f
Commit
a33f318f
authored
21 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
Avoid depending on MODULE_GetBinaryType in load_library_as_datafile.
parent
2d139562
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
loader/module.c
+18
-18
18 additions, 18 deletions
loader/module.c
with
18 additions
and
18 deletions
loader/module.c
+
18
−
18
View file @
a33f318f
...
...
@@ -489,6 +489,7 @@ static BOOL load_library_as_datafile( LPCWSTR name, HMODULE* hmod)
WCHAR
filenameW
[
MAX_PATH
];
HANDLE
hFile
=
INVALID_HANDLE_VALUE
;
HANDLE
mapping
;
HMODULE
module
;
*
hmod
=
0
;
...
...
@@ -499,23 +500,23 @@ static BOOL load_library_as_datafile( LPCWSTR name, HMODULE* hmod)
NULL
,
OPEN_EXISTING
,
0
,
0
);
}
if
(
hFile
==
INVALID_HANDLE_VALUE
)
return
FALSE
;
switch
(
MODULE_GetBinaryType
(
hFile
))
{
case
BINARY_PE_EXE
:
case
BINARY_PE_DLL
:
mapping
=
CreateFileMappingW
(
hFile
,
NULL
,
PAGE_READONLY
,
0
,
0
,
NULL
);
if
(
mapping
)
{
*
hmod
=
MapViewOfFile
(
mapping
,
FILE_MAP_READ
,
0
,
0
,
0
);
CloseHandle
(
mapping
);
}
break
;
default:
break
;
}
mapping
=
CreateFileMappingW
(
hFile
,
NULL
,
PAGE_READONLY
,
0
,
0
,
NULL
);
CloseHandle
(
hFile
);
if
(
!
mapping
)
return
FALSE
;
module
=
MapViewOfFile
(
mapping
,
FILE_MAP_READ
,
0
,
0
,
0
);
CloseHandle
(
mapping
);
if
(
!
module
)
return
FALSE
;
return
*
hmod
!=
0
;
/* make sure it's a valid PE file */
if
(
!
RtlImageNtHeader
(
module
))
{
UnmapViewOfFile
(
module
);
return
FALSE
;
}
*
hmod
=
(
HMODULE
)((
char
*
)
module
+
1
);
/* set low bit of handle to indicate datafile module */
return
TRUE
;
}
/******************************************************************
...
...
@@ -548,7 +549,7 @@ HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags)
if
(
load_library_as_datafile
(
wstr
.
Buffer
,
&
hModule
))
{
RtlFreeUnicodeString
(
&
wstr
);
return
(
HMODULE
)((
ULONG_PTR
)
hModule
+
1
)
;
return
hModule
;
}
flags
|=
DONT_RESOLVE_DLL_REFERENCES
;
/* Just in case */
/* Fallback to normal behaviour */
...
...
@@ -585,8 +586,7 @@ HMODULE WINAPI LoadLibraryExW(LPCWSTR libnameW, HANDLE hfile, DWORD flags)
/* The method in load_library_as_datafile allows searching for the
* 'native' libraries only
*/
if
(
load_library_as_datafile
(
libnameW
,
&
hModule
))
return
(
HMODULE
)((
ULONG_PTR
)
hModule
+
1
);
if
(
load_library_as_datafile
(
libnameW
,
&
hModule
))
return
hModule
;
flags
|=
DONT_RESOLVE_DLL_REFERENCES
;
/* Just in case */
/* Fallback to normal behaviour */
}
...
...
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