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
e3df3ca8
Commit
e3df3ca8
authored
Apr 14, 2020
by
Zebediah Figura
Committed by
Alexandre Julliard
Apr 14, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
devenum: Don't support VT_LPWSTR in IPropertyBag methods.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
27f13b2b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
10 deletions
+4
-10
mediacatenum.c
dlls/devenum/mediacatenum.c
+2
-8
devenum.c
dlls/devenum/tests/devenum.c
+2
-2
No files found.
dlls/devenum/mediacatenum.c
View file @
e3df3ca8
...
...
@@ -170,11 +170,6 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface,
case
REG_SZ
:
switch
(
V_VT
(
pVar
))
{
case
VT_LPWSTR
:
V_BSTR
(
pVar
)
=
CoTaskMemAlloc
(
received
);
memcpy
(
V_BSTR
(
pVar
),
pData
,
received
);
res
=
S_OK
;
break
;
case
VT_EMPTY
:
V_VT
(
pVar
)
=
VT_BSTR
;
/* fall through */
...
...
@@ -261,7 +256,6 @@ static HRESULT WINAPI property_bag_Write(IPropertyBag *iface,
switch
(
V_VT
(
pVar
))
{
case
VT_BSTR
:
case
VT_LPWSTR
:
TRACE
(
"writing %s
\n
"
,
debugstr_w
(
V_BSTR
(
pVar
)));
lpData
=
V_BSTR
(
pVar
);
dwType
=
REG_SZ
;
...
...
@@ -481,13 +475,13 @@ static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *pbc,
pProp
=
pvptr
;
if
(
SUCCEEDED
(
res
))
{
V_VT
(
&
var
)
=
VT_
LPW
STR
;
V_VT
(
&
var
)
=
VT_
B
STR
;
res
=
IPropertyBag_Read
(
pProp
,
clsidW
,
&
var
,
NULL
);
}
if
(
SUCCEEDED
(
res
))
{
res
=
CLSIDFromString
(
V_BSTR
(
&
var
),
&
clsID
);
CoTaskMemFree
(
V_BSTR
(
&
var
)
);
VariantClear
(
&
var
);
}
if
(
SUCCEEDED
(
res
))
{
...
...
dlls/devenum/tests/devenum.c
View file @
e3df3ca8
...
...
@@ -359,7 +359,7 @@ static void test_directshow_filter(void)
VariantClear
(
&
var
);
V_VT
(
&
var
)
=
VT_LPWSTR
;
hr
=
IPropertyBag_Read
(
prop_bag
,
L"FriendlyName"
,
&
var
,
NULL
);
todo_wine
ok
(
hr
==
E_INVALIDARG
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
hr
==
E_INVALIDARG
,
"Got hr %#x.
\n
"
,
hr
);
V_VT
(
&
var
)
=
VT_BSTR
;
hr
=
IPropertyBag_Read
(
prop_bag
,
L"FriendlyName"
,
&
var
,
NULL
);
...
...
@@ -517,7 +517,7 @@ static void test_codec(void)
VariantClear
(
&
var
);
V_VT
(
&
var
)
=
VT_LPWSTR
;
hr
=
IPropertyBag_Read
(
prop_bag
,
L"FriendlyName"
,
&
var
,
NULL
);
todo_wine
ok
(
hr
==
E_INVALIDARG
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
hr
==
E_INVALIDARG
,
"Got hr %#x.
\n
"
,
hr
);
V_VT
(
&
var
)
=
VT_BSTR
;
hr
=
IPropertyBag_Read
(
prop_bag
,
L"FriendlyName"
,
&
var
,
NULL
);
...
...
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