Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
80380eaa
Commit
80380eaa
authored
Feb 21, 2005
by
Mike Hearn
Committed by
Alexandre Julliard
Feb 21, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow loading of builtin typelibs.
parent
7462a8f5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
4 deletions
+9
-4
typelib.c
dlls/oleaut32/typelib.c
+9
-4
No files found.
dlls/oleaut32/typelib.c
View file @
80380eaa
...
...
@@ -315,6 +315,9 @@ HRESULT WINAPI LoadTypeLibEx(
TRACE
(
"(%s,%d,%p)
\n
"
,
debugstr_w
(
szFile
),
regkind
,
pptLib
);
/* by default try and load using LoadLibrary (for builtin stdole32.tlb) */
memcpy
(
szPath
,
szFile
,
(
strlenW
(
szFile
)
+
1
)
*
sizeof
(
WCHAR
));
*
pptLib
=
NULL
;
if
(
!
SearchPathW
(
NULL
,
szFile
,
NULL
,
sizeof
(
szPath
)
/
sizeof
(
WCHAR
),
szPath
,
NULL
))
{
...
...
@@ -331,9 +334,6 @@ HRESULT WINAPI LoadTypeLibEx(
return
TYPE_E_CANTLOADLIBRARY
;
if
(
GetFileAttributesW
(
szFileCopy
)
&
FILE_ATTRIBUTE_DIRECTORY
)
return
TYPE_E_CANTLOADLIBRARY
;
}
else
{
TRACE
(
"Wanted to load %s as typelib, but file was not found.
\n
"
,
debugstr_w
(
szFile
));
return
TYPE_E_CANTLOADLIBRARY
;
}
}
...
...
@@ -2209,8 +2209,13 @@ int TLB_ReadTypeLib(LPCWSTR pszFileName, INT index, ITypeLib2 **ppTypeLib)
}
CloseHandle
(
hFile
);
}
else
{
TRACE
(
"not found, trying to load %s as library
\n
"
,
debugstr_w
(
pszFileName
));
}
if
(
(
WORD
)
dwSignature
==
IMAGE_DOS_SIGNATURE
)
/* if the file is a DLL or not found, try loading it with LoadLibrary */
if
(((
WORD
)
dwSignature
==
IMAGE_DOS_SIGNATURE
)
||
(
dwSignature
==
0
))
{
/* find the typelibrary resource*/
HINSTANCE
hinstDLL
=
LoadLibraryExW
(
pszFileName
,
0
,
DONT_RESOLVE_DLL_REFERENCES
|
...
...
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