Zebediah Figura : qcap/avico: Initialize variant type to VT_BSTR in AVICompressorPropertyBag_Load().
Alexandre Julliard
julliard at winehq.org
Tue Apr 9 16:31:03 CDT 2019
Module: wine
Branch: master
Commit: 9e6e2ee8d9305cd86dfb402cf5b06da2043f6f02
URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e6e2ee8d9305cd86dfb402cf5b06da2043f6f02
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Mon Apr 8 18:02:35 2019 -0500
qcap/avico: Initialize variant type to VT_BSTR in AVICompressorPropertyBag_Load().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/qcap/avico.c | 2 +-
dlls/qcap/tests/avico.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c
index d5020a0..3351b36 100644
--- a/dlls/qcap/avico.c
+++ b/dlls/qcap/avico.c
@@ -323,7 +323,7 @@ static HRESULT WINAPI AVICompressorPropertyBag_Load(IPersistPropertyBag *iface,
TRACE("(%p)->(%p %p)\n", This, pPropBag, pErrorLog);
- V_VT(&v) = VT_EMPTY;
+ V_VT(&v) = VT_BSTR;
hres = IPropertyBag_Read(pPropBag, fcc_handlerW, &v, NULL);
if(FAILED(hres)) {
WARN("Could not read FccHandler: %08x\n", hres);
diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c
index 0ee2e1b..9ef66b9 100644
--- a/dlls/qcap/tests/avico.c
+++ b/dlls/qcap/tests/avico.c
@@ -355,7 +355,7 @@ static unsigned int ppb_got_read;
static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, const WCHAR *name, VARIANT *var, IErrorLog *log)
{
ok(!lstrcmpW(name, fcchandlerW), "Got unexpected name %s.\n", wine_dbgstr_w(name));
- todo_wine ok(V_VT(var) == VT_BSTR, "Got unexpected type %u.\n", V_VT(var));
+ ok(V_VT(var) == VT_BSTR, "Got unexpected type %u.\n", V_VT(var));
ok(!log, "Got unexpected error log %p.\n", log);
V_BSTR(var) = SysAllocString(ppb_handler);
ppb_got_read++;
@@ -403,7 +403,7 @@ static void test_property_bag(IMoniker *mon)
ppb_got_read = 0;
hr = IPersistPropertyBag_Load(ppb, &property_bag, NULL);
- todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
ok(ppb_got_read == 1, "Got %u calls to Read().\n", ppb_got_read);
ref = IPersistPropertyBag_Release(ppb);
More information about the wine-cvs
mailing list