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
f0b47e26
Commit
f0b47e26
authored
May 05, 2004
by
Kevin Koltzau
Committed by
Alexandre Julliard
May 05, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implemented CoInternetCombineUrl and CoInternetCompareUrl.
parent
9f1aea2f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
2 deletions
+35
-2
urlmon.spec
dlls/urlmon/urlmon.spec
+2
-2
urlmon_main.c
dlls/urlmon/urlmon_main.c
+21
-0
urlmon.h
include/urlmon.h
+5
-0
urlmon.idl
include/urlmon.idl
+7
-0
No files found.
dlls/urlmon/urlmon.spec
View file @
f0b47e26
...
...
@@ -5,8 +5,8 @@
@ stub BindAsyncMoniker
@ stub CoGetClassObjectFromURL
@ stub CoInstall
@ st
ub CoInternetCombineUrl
@ st
ub CoInternetCompareUrl
@ st
dcall CoInternetCombineUrl(wstr wstr long wstr long ptr long)
@ st
dcall CoInternetCompareUrl(wstr wstr long)
@ stub CoInternetCreateSecurityManager
@ stub CoInternetCreateZoneManager
@ stub CoInternetGetProtocolFlags
...
...
dlls/urlmon/urlmon_main.c
View file @
f0b47e26
...
...
@@ -24,6 +24,8 @@
#include "winbase.h"
#include "winerror.h"
#include "wtypes.h"
#define NO_SHLWAPI_REG
#include "shlwapi.h"
#include "wine/debug.h"
...
...
@@ -121,3 +123,22 @@ HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPCSTR pcszUAOut, DWORD *cb
return
S_OK
;
}
HRESULT
WINAPI
CoInternetCombineUrl
(
LPCWSTR
pwzBaseUrl
,
LPCWSTR
pwzRelativeUrl
,
DWORD
dwCombineFlags
,
LPWSTR
pwzResult
,
DWORD
cchResult
,
DWORD
*
pcchResult
,
DWORD
dwReserved
)
{
HRESULT
hres
;
DWORD
size
=
cchResult
;
TRACE
(
"(%s,%s,0x%08lx,%p,%ld,%p,%ld)
\n
"
,
debugstr_w
(
pwzBaseUrl
),
debugstr_w
(
pwzRelativeUrl
),
dwCombineFlags
,
pwzResult
,
cchResult
,
pcchResult
,
dwReserved
);
hres
=
UrlCombineW
(
pwzBaseUrl
,
pwzRelativeUrl
,
pwzResult
,
&
size
,
dwCombineFlags
);
if
(
pcchResult
)
*
pcchResult
=
size
;
return
hres
;
}
HRESULT
WINAPI
CoInternetCompareUrl
(
LPCWSTR
pwzUrl1
,
LPCWSTR
pwzUrl2
,
DWORD
dwCompareFlags
)
{
TRACE
(
"(%s,%s,%08lx)
\n
"
,
debugstr_w
(
pwzUrl1
),
debugstr_w
(
pwzUrl2
),
dwCompareFlags
);
return
UrlCompareW
(
pwzUrl1
,
pwzUrl2
,
dwCompareFlags
)
==
0
?
S_OK
:
S_FALSE
;
}
include/urlmon.h
View file @
f0b47e26
...
...
@@ -1392,6 +1392,11 @@ HRESULT WINAPI CoInternetGetSession(DWORD,/*IInternetSession*/void**,DWORD);
HRESULT
WINAPI
MkParseDisplayNameEx
(
IBindCtx
*
,
LPCWSTR
,
ULONG
*
,
IMoniker
**
);
HRESULT
WINAPI
IsAsyncMoniker
(
IMoniker
*
pmk
);
HRESULT
WINAPI
CreateAsyncBindCtx
(
DWORD
,
IBindStatusCallback
*
,
IEnumFORMATETC
*
,
IBindCtx
**
);
HRESULT
WINAPI
CoInternetCombineUrl
(
LPCWSTR
,
LPCWSTR
,
DWORD
,
LPWSTR
,
DWORD
,
DWORD
*
,
DWORD
);
HRESULT
WINAPI
CoInternetCompareUrl
(
LPCWSTR
,
LPCWSTR
,
DWORD
);
#define OInetCombineUrl CoInternetCombineUrl
#define OInetCompareUrl CoInternetCompareUrl
#define OInetGetSession CoInternetGetSession
#define MKSYS_URLMONIKER 6
#ifdef __cplusplus
}
...
...
include/urlmon.idl
View file @
f0b47e26
...
...
@@ -544,4 +544,11 @@ cpp_quote("HRESULT WINAPI CoInternetGetSession(DWORD,/*IInternetSession*/void**,
cpp_quote
(
"HRESULT WINAPI MkParseDisplayNameEx(IBindCtx*,LPCWSTR,ULONG*,IMoniker**);"
)
cpp_quote
(
"HRESULT WINAPI IsAsyncMoniker(IMoniker* pmk);"
)
cpp_quote
(
"HRESULT WINAPI CreateAsyncBindCtx(DWORD, IBindStatusCallback*, IEnumFORMATETC*, IBindCtx**);"
)
cpp_quote
(
"HRESULT WINAPI CoInternetCombineUrl(LPCWSTR,LPCWSTR,DWORD,LPWSTR,DWORD,DWORD*,DWORD);"
)
cpp_quote
(
"HRESULT WINAPI CoInternetCompareUrl(LPCWSTR,LPCWSTR,DWORD);"
)
;
cpp_quote
(
"#define OInetCombineUrl CoInternetCombineUrl"
)
cpp_quote
(
"#define OInetCompareUrl CoInternetCompareUrl"
)
cpp_quote
(
"#define OInetGetSession CoInternetGetSession"
)
cpp_quote
(
"#define MKSYS_URLMONIKER 6"
)
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