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
781faa1b
Commit
781faa1b
authored
Mar 23, 2009
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 24, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
urlmon: Fixed handling NULL URLName in GetDisplatName implementation.
parent
a5b2075e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
url.c
dlls/urlmon/tests/url.c
+5
-1
umon.c
dlls/urlmon/umon.c
+3
-0
No files found.
dlls/urlmon/tests/url.c
View file @
781faa1b
...
...
@@ -2574,6 +2574,7 @@ static void test_BindToStorage_fail(void)
static
void
test_StdURLMoniker
(
void
)
{
IMoniker
*
mon
,
*
async_mon
;
LPOLESTR
display_name
;
HRESULT
hres
;
hres
=
CoCreateInstance
(
&
IID_IInternet
,
NULL
,
CLSCTX_INPROC_SERVER
|
CLSCTX_INPROC_HANDLER
,
...
...
@@ -2587,6 +2588,9 @@ static void test_StdURLMoniker(void)
ok
(
mon
==
async_mon
,
"mon != async_mon
\n
"
);
IMoniker_Release
(
async_mon
);
hres
=
IMoniker_GetDisplayName
(
mon
,
NULL
,
NULL
,
&
display_name
);
ok
(
hres
==
E_OUTOFMEMORY
,
"GetDisplayName failed: %08x, expected E_OUTOFMEMORY
\n
"
,
hres
);
IMoniker_Release
(
mon
);
}
...
...
@@ -2641,7 +2645,7 @@ START_TEST(url)
CoInitialize
(
NULL
);
trace
(
"test StdURLMoniker..."
);
trace
(
"test StdURLMoniker...
\n
"
);
test_StdURLMoniker
();
trace
(
"synchronous http test...
\n
"
);
...
...
dlls/urlmon/umon.c
View file @
781faa1b
...
...
@@ -377,6 +377,9 @@ static HRESULT WINAPI URLMoniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc,
if
(
!
ppszDisplayName
)
return
E_INVALIDARG
;
if
(
!
This
->
URLName
)
return
E_OUTOFMEMORY
;
/* FIXME: If this is a partial URL, try and get a URL moniker from SZ_URLCONTEXT in the bind context,
then look at pmkToLeft to try and complete the URL
*/
...
...
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