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
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
Fotios Valasiadis
wine
Commits
f0b47e26
Commit
f0b47e26
authored
20 years ago
by
Kevin Koltzau
Committed by
Alexandre Julliard
20 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Implemented CoInternetCombineUrl and CoInternetCompareUrl.
parent
9f1aea2f
Loading
Loading
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
dlls/urlmon/urlmon.spec
+2
-2
2 additions, 2 deletions
dlls/urlmon/urlmon.spec
dlls/urlmon/urlmon_main.c
+21
-0
21 additions, 0 deletions
dlls/urlmon/urlmon_main.c
include/urlmon.h
+5
-0
5 additions, 0 deletions
include/urlmon.h
include/urlmon.idl
+7
-0
7 additions, 0 deletions
include/urlmon.idl
with
35 additions
and
2 deletions
dlls/urlmon/urlmon.spec
+
2
−
2
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
...
...
This diff is collapsed.
Click to expand it.
dlls/urlmon/urlmon_main.c
+
21
−
0
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
;
}
This diff is collapsed.
Click to expand it.
include/urlmon.h
+
5
−
0
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
}
...
...
This diff is collapsed.
Click to expand it.
include/urlmon.idl
+
7
−
0
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"
)
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