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
ae9e41c6
Commit
ae9e41c6
authored
Jul 06, 2006
by
Jacek Caban
Committed by
Alexandre Julliard
Jul 07, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
urlmon: Fix handling of proposed mime.
parent
b5fa0927
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
2 deletions
+27
-2
urlmon_main.c
dlls/urlmon/urlmon_main.c
+27
-2
No files found.
dlls/urlmon/urlmon_main.c
View file @
ae9e41c6
...
...
@@ -455,7 +455,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer,
if
(
!
ppwzMimeOut
||
(
!
pwzUrl
&&
!
pBuffer
))
return
E_INVALIDARG
;
if
(
pwzMimeProposed
&&
(
!
p
wzUrl
||
!
p
Buffer
||
(
pBuffer
&&
!
cbSize
)))
{
if
(
pwzMimeProposed
&&
(
!
pBuffer
||
(
pBuffer
&&
!
cbSize
)))
{
DWORD
len
;
if
(
!
pwzMimeProposed
)
...
...
@@ -470,7 +470,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer,
if
(
pBuffer
)
{
DWORD
len
;
LPCWSTR
ret
=
NULL
;
int
i
=
0
;
int
i
;
static
const
WCHAR
wszTextHtml
[]
=
{
't'
,
'e'
,
'x'
,
't'
,
'/'
,
'h'
,
't'
,
'm'
,
'l'
,
0
};
static
const
WCHAR
wszImagePjpeg
[]
=
{
'i'
,
'm'
,
'a'
,
'g'
,
'e'
,
'/'
,
'p'
,
'j'
,
'p'
,
'e'
,
'g'
,
0
};
...
...
@@ -491,12 +491,37 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer,
if
(
!
cbSize
)
return
E_FAIL
;
if
(
pwzMimeProposed
&&
strcmpW
(
pwzMimeProposed
,
wszAppOctetStream
))
{
for
(
i
=
0
;
i
<
sizeof
(
mime_filters
)
/
sizeof
(
*
mime_filters
);
i
++
)
{
if
(
!
strcmpW
(
pwzMimeProposed
,
mime_filters
[
i
].
mime
))
break
;
}
if
(
i
==
sizeof
(
mime_filters
)
/
sizeof
(
*
mime_filters
)
||
mime_filters
[
i
].
filter
(
pBuffer
,
cbSize
))
{
len
=
strlenW
(
pwzMimeProposed
)
+
1
;
*
ppwzMimeOut
=
CoTaskMemAlloc
(
len
*
sizeof
(
WCHAR
));
memcpy
(
*
ppwzMimeOut
,
pwzMimeProposed
,
len
*
sizeof
(
WCHAR
));
return
S_OK
;
}
}
i
=
0
;
while
(
!
ret
)
{
if
(
mime_filters
[
i
].
filter
(
pBuffer
,
cbSize
))
ret
=
mime_filters
[
i
].
mime
;
i
++
;
}
if
(
pwzMimeProposed
)
{
if
(
i
==
sizeof
(
mime_filters
)
/
sizeof
(
*
mime_filters
))
ret
=
pwzMimeProposed
;
/* text/html is a special case */
if
(
!
strcmpW
(
pwzMimeProposed
,
wszTextHtml
)
&&
!
strcmpW
(
ret
,
wszTextPlain
))
ret
=
wszTextHtml
;
}
len
=
strlenW
(
ret
)
+
1
;
*
ppwzMimeOut
=
CoTaskMemAlloc
(
len
*
sizeof
(
WCHAR
));
memcpy
(
*
ppwzMimeOut
,
ret
,
len
*
sizeof
(
WCHAR
));
...
...
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