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
dff207d3
Commit
dff207d3
authored
Jan 31, 2005
by
Vincent Béron
Committed by
Alexandre Julliard
Jan 31, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove message telling users to copy native stdole32.tlb over as we
now provide it. Better trace in LoadTypeLib. Change debug messages type to reflect we provide stdole32.tlb.
parent
b8cb0e12
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
22 deletions
+3
-22
olefont.c
dlls/oleaut32/olefont.c
+1
-1
typelib.c
dlls/oleaut32/typelib.c
+2
-21
No files found.
dlls/oleaut32/olefont.c
View file @
dff207d3
...
@@ -1214,7 +1214,7 @@ static HRESULT WINAPI OLEFontImpl_GetTypeInfo(
...
@@ -1214,7 +1214,7 @@ static HRESULT WINAPI OLEFontImpl_GetTypeInfo(
return
E_FAIL
;
return
E_FAIL
;
hres
=
LoadTypeLib
(
stdole32tlb
,
&
tl
);
hres
=
LoadTypeLib
(
stdole32tlb
,
&
tl
);
if
(
FAILED
(
hres
))
{
if
(
FAILED
(
hres
))
{
FIXME
(
"Could not load the stdole32.tlb?
\n
"
);
ERR
(
"Could not load the stdole32.tlb?
\n
"
);
return
hres
;
return
hres
;
}
}
hres
=
ITypeLib_GetTypeInfoOfGuid
(
tl
,
&
IID_IDispatch
,
ppTInfo
);
hres
=
ITypeLib_GetTypeInfoOfGuid
(
tl
,
&
IID_IDispatch
,
ppTInfo
);
...
...
dlls/oleaut32/typelib.c
View file @
dff207d3
...
@@ -291,7 +291,7 @@ HRESULT WINAPI LoadTypeLib(
...
@@ -291,7 +291,7 @@ HRESULT WINAPI LoadTypeLib(
const
OLECHAR
*
szFile
,
/* [in] Name of file to load from */
const
OLECHAR
*
szFile
,
/* [in] Name of file to load from */
ITypeLib
*
*
pptLib
)
/* [out] Pointer to pointer to loaded type library */
ITypeLib
*
*
pptLib
)
/* [out] Pointer to pointer to loaded type library */
{
{
TRACE
(
"
\n
"
);
TRACE
(
"
(%s,%p)
\n
"
,
debugstr_w
(
szFile
),
pptLib
);
return
LoadTypeLibEx
(
szFile
,
REGKIND_DEFAULT
,
pptLib
);
return
LoadTypeLibEx
(
szFile
,
REGKIND_DEFAULT
,
pptLib
);
}
}
...
@@ -332,26 +332,7 @@ HRESULT WINAPI LoadTypeLibEx(
...
@@ -332,26 +332,7 @@ HRESULT WINAPI LoadTypeLibEx(
if
(
GetFileAttributesW
(
szFileCopy
)
&
FILE_ATTRIBUTE_DIRECTORY
)
if
(
GetFileAttributesW
(
szFileCopy
)
&
FILE_ATTRIBUTE_DIRECTORY
)
return
TYPE_E_CANTLOADLIBRARY
;
return
TYPE_E_CANTLOADLIBRARY
;
}
else
{
}
else
{
WCHAR
tstpath
[
260
];
TRACE
(
"Wanted to load %s as typelib, but file was not found.
\n
"
,
debugstr_w
(
szFile
));
static
const
WCHAR
stdole32tlb
[]
=
{
's'
,
't'
,
'd'
,
'o'
,
'l'
,
'e'
,
'3'
,
'2'
,
'.'
,
't'
,
'l'
,
'b'
,
0
};
int
i
;
lstrcpyW
(
tstpath
,
szFile
);
CharLowerW
(
tstpath
);
for
(
i
=
0
;
i
<
strlenW
(
tstpath
);
i
++
)
{
if
(
tstpath
[
i
]
==
's'
)
{
if
(
!
strcmpW
(
tstpath
+
i
,
stdole32tlb
))
{
MESSAGE
(
"
\n
"
);
MESSAGE
(
"**************************************************************************
\n
"
);
MESSAGE
(
"You must copy a 'stdole32.tlb' file to your Windows
\\
System directory!
\n
"
);
MESSAGE
(
"You can get one from a Windows installation, or look for the DCOM95 package
\n
"
);
MESSAGE
(
"on the Microsoft Download Pages.
\n
"
);
MESSAGE
(
"**************************************************************************
\n
"
);
break
;
}
}
}
FIXME
(
"Wanted to load %s as typelib, but file was not found.
\n
"
,
debugstr_w
(
szFile
));
return
TYPE_E_CANTLOADLIBRARY
;
return
TYPE_E_CANTLOADLIBRARY
;
}
}
}
}
...
...
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