February 2019 - Wine-devel - list.winehq.org

Re: widl: Set name return value (passed by reference) in the alias case alias case in get_user_type.
by Alexandre Julliard 22 Nov '20

22 Nov '20

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > So, I admit I don't really know this code, but looking at it (triggered > by a warning issued by GCC development versions), I noticed that this > variable passed by reference is not initialized here. It's initialized when we return a type, and it doesn't need to be initialized on NULL return. The code is correct, but you could probably set the variable to NULL in the caller to silence the warning. -- Alexandre Julliard julliard(a)winehq.org

2 1

Error handling in RpcBindingVectorFree (dlls/rpcrt4/rpc_binding.c)
by Gerald Pfeifer 22 Nov '20

22 Nov '20

Looking at RPC_STATUS WINAPI RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector ) { RPC_STATUS status; ULONG c; TRACE("(%p)\n", BindingVector); for (c=0; c<(*BindingVector)->Count; c++) { status = RpcBindingFree(&(*BindingVector)->BindingH[c]); } HeapFree(GetProcessHeap(), 0, *BindingVector); *BindingVector = NULL; return RPC_S_OK; } we currently always ignore the outcome of RpcBindingFree and return RPC_S_OK. However, there is one case where RpcBindingFree returns something different (which is if *Binding is null when RPC_S_INVALID_BINDING is returned). What is the proper way of handling this? Just keeping the code as is and removing the unused status variable? Breaking the loop once RpcBindingFree returns something different from RPC_S_OK? Continuing and returning the first / the last status different from RPC_S_OK? Gerald

1 1

Re: WineConf 2019: call for volunteers
by ulrich.czekalla＠utoronto.ca 14 Mar '19

14 Mar '19

I?d like to volunteer to host WineConf 2019 in Toronto, Canada. Toronto is the largest city in Canada and sits on the coast of Lake Ontario (14th largest lake in the world). We have plenty of bars and yes, lots of good beer. :-) What else do you need? I?ve looked into venues and the most economical room rates are the weekend of Oct 12-13. That?s around $189 CAD + Tax. For about 20% more we can hold it in mid or late August. While the weather in August is much nicer, October should still be pleasant. (~10-15 C) Thanks, -Ulrich On 2019-02-27, 8:18 AM, "wine-devel on behalf of Alexandre Julliard" <wine-devel-bounces(a)winehq.org on behalf of julliard(a)winehq.org> wrote: Folks, It's time to start thinking about this year's Wine conference! Until now, selecting the next WineConf was a more or less ad-hoc process, but we had some discussions on the wineconf list a while ago, and it was suggested that the Wine Committee should play a more active role in the decision, especially since the chosen location impacts the financial decisions. Ideally we'd define a formal set of requirements, and issue a Call for Proposals, but it was felt that this would take too much time and thus would be more appropriate for 2020. So I thought that for this year we'd do a simple call for volunteers, and have the Wine Committee work with the volunteers to select the best proposal. So, would anybody like to volunteer to host WineConf 2019? -- Alexandre Julliard julliard(a)winehq.org

3 2

[PATCH v3 4/4] propsys: Partially implement PropVariantToBuffer().
by Jactry Zeng 07 Mar '19

07 Mar '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 26 +++++++++ dlls/propsys/tests/propsys.c | 106 +++++++++++++++++++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 134 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index d9347e27ae..8416b6dc74 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -111,7 +111,7 @@ @ stub PropVariantToBooleanVector @ stub PropVariantToBooleanVectorAlloc @ stub PropVariantToBooleanWithDefault -@ stub PropVariantToBuffer +@ stdcall PropVariantToBuffer(ptr ptr long) @ stdcall PropVariantToDouble(ptr ptr) @ stub PropVariantToDoubleVector @ stub PropVariantToDoubleVectorAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 988cf81971..c56a737ede 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -306,6 +306,32 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret) return hr; } +HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb) +{ + HRESULT hr = S_OK; + + TRACE("(%p, %p, %d)\n", propvarIn, ret, cb); + + switch(propvarIn->vt) + { + case VT_VECTOR|VT_UI1: + if(cb > propvarIn->u.caub.cElems) + return E_FAIL; + memcpy(ret, propvarIn->u.caub.pElems, cb); + break; + case VT_ARRAY|VT_UI1: + FIXME("Unsupported type: VT_ARRAY|VT_UI1\n"); + hr = E_NOTIMPL; + break; + default: + WARN("Unexpected type: %x\n", propvarIn->vt); + hr = E_INVALIDARG; + } + + return hr; +} + + HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch) { HRESULT hr; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 059b622544..c47729ea97 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -1407,6 +1407,111 @@ static void test_PropVariantToString(void) SysFreeString(propvar.u.bstrVal); } +static void test_PropVariantToBuffer(void) +{ + PROPVARIANT propvar; + HRESULT hr; + UINT8 data[] = {1,2,3,4,5,6,7,8,9,10}; + INT8 data_int8[] = {1,2,3,4,5,6,7,8,9,10}; + SAFEARRAY *sa; + SAFEARRAYBOUND sabound; + void *pdata; + UINT8 buffer[256]; + + hr = InitPropVariantFromBuffer(data, 10, &propvar); + ok(hr == S_OK, "InitVariantFromBuffer failed 0x%08x.\n", hr); + hr = PropVariantToBuffer(&propvar, NULL, 0); /* crash when cb isn't zero */ + ok(hr == S_OK, "PropVariantToBuffer failed: 0x%08x.\n", hr); + PropVariantClear(&propvar); + + hr = InitPropVariantFromBuffer(data, 10, &propvar); + ok(hr == S_OK, "InitVariantFromBuffer failed 0x%08x.\n", hr); + hr = PropVariantToBuffer(&propvar, buffer, 10); + ok(hr == S_OK, "PropVariantToBuffer failed: 0x%08x.\n", hr); + ok(!memcmp(buffer, data, 10) && !buffer[10], "got wrong buffer.\n"); + memset(buffer, 0, sizeof(buffer)); + PropVariantClear(&propvar); + + hr = InitPropVariantFromBuffer(data, 10, &propvar); + ok(hr == S_OK, "InitVariantFromBuffer failed 0x%08x.\n", hr); + buffer[0] = 99; + hr = PropVariantToBuffer(&propvar, buffer, 11); + ok(hr == E_FAIL, "PropVariantToBuffer returned: 0x%08x.\n", hr); + ok(buffer[0] == 99, "got wrong buffer.\n"); + memset(buffer, 0, sizeof(buffer)); + PropVariantClear(&propvar); + + hr = InitPropVariantFromBuffer(data, 10, &propvar); + ok(hr == S_OK, "InitVariantFromBuffer failed 0x%08x.\n", hr); + hr = PropVariantToBuffer(&propvar, buffer, 9); + ok(hr == S_OK, "PropVariantToBuffer failed: 0x%08x.\n", hr); + ok(!memcmp(buffer, data, 9) && !buffer[9], "got wrong buffer.\n"); + memset(buffer, 0, sizeof(buffer)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_ARRAY|VT_UI1; + sabound.lLbound = 0; + sabound.cElements = sizeof(data); + sa = NULL; + sa = SafeArrayCreate(VT_UI1, 1, &sabound); + ok(sa != NULL, "SafeArrayCreate failed.\n"); + hr = SafeArrayAccessData(sa, &pdata); + ok(hr == S_OK, "SafeArrayAccessData failed: 0x%08x.\n", hr); + memcpy(pdata, data, sizeof(data)); + U(propvar).parray = sa; + buffer[0] = 99; + hr = PropVariantToBuffer(&propvar, buffer, 11); + todo_wine ok(hr == E_FAIL, "PropVariantToBuffer returned: 0x%08x.\n", hr); + ok(buffer[0] == 99, "got wrong buffer.\n"); + memset(buffer, 0, sizeof(buffer)); + SafeArrayDestroy(sa); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_ARRAY|VT_UI1; + sabound.lLbound = 0; + sabound.cElements = sizeof(data); + sa = NULL; + sa = SafeArrayCreate(VT_UI1, 1, &sabound); + ok(sa != NULL, "SafeArrayCreate failed.\n"); + hr = SafeArrayAccessData(sa, &pdata); + ok(hr == S_OK, "SafeArrayAccessData failed: 0x%08x.\n", hr); + memcpy(pdata, data, sizeof(data)); + U(propvar).parray = sa; + hr = PropVariantToBuffer(&propvar, buffer, sizeof(data)); + todo_wine ok(hr == S_OK, "PropVariantToBuffer failed: 0x%08x.\n", hr); + todo_wine ok(!memcmp(buffer, data, 10) && !buffer[10], "got wrong buffer.\n"); + memset(buffer, 0, sizeof(buffer)); + SafeArrayDestroy(sa); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_VECTOR|VT_I1; + U(propvar).caub.pElems = CoTaskMemAlloc(sizeof(data_int8)); + U(propvar).caub.cElems = sizeof(data_int8); + memcpy(U(propvar).caub.pElems, data_int8, sizeof(data_int8)); + hr = PropVariantToBuffer(&propvar, buffer, sizeof(data_int8)); + ok(hr == E_INVALIDARG, "PropVariantToBuffer failed: 0x%08x.\n", hr); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_ARRAY|VT_I1; + sabound.lLbound = 0; + sabound.cElements = sizeof(data_int8); + sa = NULL; + sa = SafeArrayCreate(VT_I1, 1, &sabound); + ok(sa != NULL, "SafeArrayCreate failed.\n"); + hr = SafeArrayAccessData(sa, &pdata); + ok(hr == S_OK, "SafeArrayAccessData failed: 0x%08x.\n", hr); + memcpy(pdata, data_int8, sizeof(data_int8)); + U(propvar).parray = sa; + hr = PropVariantToBuffer(&propvar, buffer, sizeof(data_int8)); + ok(hr == E_INVALIDARG, "PropVariantToBuffer failed: 0x%08x.\n", hr); + SafeArrayDestroy(sa); + PropVariantClear(&propvar); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -1424,4 +1529,5 @@ START_TEST(propsys) test_InitPropVariantFromCLSID(); test_PropVariantToDouble(); test_PropVariantToString(); + test_PropVariantToBuffer(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index 4fb12d87eb..a4eedefdb6 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -79,6 +79,7 @@ HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); +HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); -- 2.20.1

2 1

[PATCH v3 3/4] propsys: Add VT_CLSID support for PropVariantToGUID().
by Jactry Zeng 07 Mar '19

07 Mar '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/propvar.c | 3 +++ dlls/propsys/tests/propsys.c | 19 +++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index ef490be978..988cf81971 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -739,6 +739,9 @@ HRESULT WINAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid) return PROPVAR_WCHARToGUID(ppropvar->u.bstrVal, SysStringLen(ppropvar->u.bstrVal), guid); case VT_LPWSTR: return PROPVAR_WCHARToGUID(ppropvar->u.pwszVal, strlenW(ppropvar->u.pwszVal), guid); + case VT_CLSID: + memcpy(guid, ppropvar->u.puuid, sizeof(*ppropvar->u.puuid)); + return S_OK; default: FIXME("unsupported vt: %d\n", ppropvar->vt); diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 299675db2e..059b622544 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -568,7 +568,7 @@ static void test_PropVariantToGUID(void) hres = PropVariantToGUID(&propvar, &guid); ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); - ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + ok(IsEqualGUID(&IID_NULL, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); PropVariantClear(&propvar); hres = InitPropVariantFromGUIDAsString(&dummy_guid, &propvar); @@ -576,7 +576,7 @@ static void test_PropVariantToGUID(void) hres = PropVariantToGUID(&propvar, &guid); ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); - ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + ok(IsEqualGUID(&dummy_guid, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); ok(propvar.vt == VT_LPWSTR, "incorrect PROPVARIANT type: %d\n", propvar.vt); propvar.u.pwszVal[1] = 'd'; @@ -584,7 +584,7 @@ static void test_PropVariantToGUID(void) propvar.u.pwszVal[3] = 'a'; hres = PropVariantToGUID(&propvar, &guid); ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); - ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + ok(IsEqualGUID(&dummy_guid, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); propvar.u.pwszVal[1] = 'z'; hres = PropVariantToGUID(&propvar, &guid); @@ -597,7 +597,7 @@ static void test_PropVariantToGUID(void) hres = VariantToGUID(&var, &guid); ok(hres == S_OK, "VariantToGUID failed %x\n", hres); - ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + ok(IsEqualGUID(&IID_NULL, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); VariantClear(&var); hres = InitVariantFromGUIDAsString(&dummy_guid, &var); @@ -605,7 +605,7 @@ static void test_PropVariantToGUID(void) hres = VariantToGUID(&var, &guid); ok(hres == S_OK, "VariantToGUID failed %x\n", hres); - ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + ok(IsEqualGUID(&dummy_guid, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); ok(V_VT(&var) == VT_BSTR, "incorrect VARIANT type: %d\n", V_VT(&var)); V_BSTR(&var)[1] = 'z'; @@ -618,7 +618,14 @@ static void test_PropVariantToGUID(void) V_VT(&var) = VT_EMPTY; hres = PropVariantToGUID(&propvar, &guid); ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); - ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + ok(IsEqualGUID(&dummy_guid, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + PropVariantClear(&propvar); + + memset(&guid, 0, sizeof(guid)); + InitPropVariantFromCLSID(&dummy_guid, &propvar); + hres = PropVariantToGUID(&propvar, &guid); + ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); + ok(IsEqualGUID(&dummy_guid, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); PropVariantClear(&propvar); } -- 2.20.1

2 1

[PATCH v3 2/4] propsys: Implement PropVariantToString().
by Jactry Zeng 07 Mar '19

07 Mar '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 25 ++++++++++ dlls/propsys/tests/propsys.c | 91 ++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 118 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 9193f3664d..d9347e27ae 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -133,7 +133,7 @@ @ stub PropVariantToInt64VectorAlloc @ stub PropVariantToInt64WithDefault @ stub PropVariantToStrRet -@ stub PropVariantToString +@ stdcall PropVariantToString(ptr ptr long) @ stdcall PropVariantToStringAlloc(ptr ptr) @ stub PropVariantToStringVector @ stub PropVariantToStringVectorAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 396afbf050..ef490be978 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -34,6 +34,7 @@ #include "winuser.h" #include "shlobj.h" #include "propvarutil.h" +#include "strsafe.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -305,6 +306,30 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret) return hr; } +HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch) +{ + HRESULT hr; + WCHAR *stringW = NULL; + + TRACE("(%p, %p, %d)\n", propvarIn, ret, cch); + + ret[0] = '\0'; + + if(!cch) + return E_INVALIDARG; + + hr = PropVariantToStringAlloc(propvarIn, &stringW); + if(SUCCEEDED(hr)) + { + if(lstrlenW(stringW) >= cch) + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + lstrcpynW(ret, stringW, cch); + CoTaskMemFree(stringW); + } + + return hr; +} + HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) { WCHAR *res = NULL; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 926dc3de71..299675db2e 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -32,6 +32,7 @@ #include "initguid.h" #include "propsys.h" #include "propvarutil.h" +#include "strsafe.h" #include "wine/test.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -1310,6 +1311,95 @@ static void test_PropVariantToDouble(void) ok(value == 8.0, "Unexpected value: %f.\n", value); } +static void test_PropVariantToString(void) +{ + PROPVARIANT propvar; + static CHAR string[] = "Wine"; + static WCHAR stringW[] = {'W','i','n','e',0}; + WCHAR bufferW[256] = {0}; + HRESULT hr; + + PropVariantInit(&propvar); + propvar.vt = VT_EMPTY; + U(propvar).pwszVal = stringW; + bufferW[0] = 65; + hr = PropVariantToString(&propvar, bufferW, 0); + ok(hr == E_INVALIDARG, "PropVariantToString should fail: 0x%08x.\n", hr); + ok(!bufferW[0], "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_EMPTY; + U(propvar).pwszVal = stringW; + bufferW[0] = 65; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!bufferW[0], "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_NULL; + U(propvar).pwszVal = stringW; + bufferW[0] = 65; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!bufferW[0], "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_I4; + U(propvar).lVal = 22; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + todo_wine ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + todo_wine ok(!strcmp_wa(bufferW, "22"), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_LPWSTR; + U(propvar).pwszVal = stringW; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!lstrcmpW(bufferW, stringW), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + + PropVariantInit(&propvar); + propvar.vt = VT_LPSTR; + U(propvar).pszVal = string; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!lstrcmpW(bufferW, stringW), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + + PropVariantInit(&propvar); + propvar.vt = VT_LPWSTR; + U(propvar).pwszVal = stringW; + hr = PropVariantToString(&propvar, bufferW, 4); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "PropVariantToString returned: 0x%08x.\n", hr); + ok(!memcmp(bufferW, stringW, 4), "got wrong string.\n"); + memset(bufferW, 0, sizeof(bufferW)); + + PropVariantInit(&propvar); + propvar.vt = VT_LPSTR; + U(propvar).pszVal = string; + hr = PropVariantToString(&propvar, bufferW, 4); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "PropVariantToString returned: 0x%08x.\n", hr); + ok(!memcmp(bufferW, stringW, 4), "got wrong string.\n"); + memset(bufferW, 0, sizeof(bufferW)); + + PropVariantInit(&propvar); + propvar.vt = VT_BSTR; + propvar.u.bstrVal = SysAllocString(stringW); + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!lstrcmpW(bufferW, stringW), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + SysFreeString(propvar.u.bstrVal); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -1326,4 +1416,5 @@ START_TEST(propsys) test_PropVariantToStringWithDefault(); test_InitPropVariantFromCLSID(); test_PropVariantToDouble(); + test_PropVariantToString(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index 80f081cbc3..4fb12d87eb 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -79,6 +79,7 @@ HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); +HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); -- 2.20.1

2 1

[PATCH v3 1/4] propsys: Add VT_EMPTY support for PropVariantToStringAlloc().
by Jactry Zeng 07 Mar '19

07 Mar '19

Superseded patch 158584 to 158587. ChangeLog: v3: - Rewrite implementation of PropVariantToBuffer().(4/4) - Add more tests for PropVariantToBuffer().(4/4) v2: - Fix test failures on Windows 64 bit.(1/3) - Use PropVariantToStringAlloc() for implementing PropVariantToString().(1/3) - Use IsEqualGUID() for checking GUID instread of memcmp().(2/3) - Add more tests for PropVariantToBuffer().(3/3) Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/propvar.c | 1 + dlls/propsys/tests/propsys.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 0edf4621b3..396afbf050 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -314,6 +314,7 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) switch(propvarIn->vt) { + case VT_EMPTY: case VT_NULL: res = CoTaskMemAlloc(1*sizeof(WCHAR)); res[0] = '\0'; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index a9c0a7730b..926dc3de71 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -641,6 +641,12 @@ static void test_PropVariantToStringAlloc(void) ok(!lstrcmpW(str, topicW), "got %s\n", wine_dbgstr_w(str)); CoTaskMemFree(str); PropVariantClear(&prop); + + prop.vt = VT_EMPTY; + hres = PropVariantToStringAlloc(&prop, &str); + ok(hres == S_OK, "returned %x\n", hres); + ok(!lstrcmpW(str, emptyW), "got %s\n", wine_dbgstr_w(str)); + CoTaskMemFree(str); } static void test_PropVariantCompare(void) -- 2.20.1

2 1

[PATCH v3 1/5] kernel32/tests: Test ReadFileScatter() completion status with FILE_SKIP_COMPLETION_PORT_ON_SUCCESS.
by Paul Gofman 04 Mar '19

04 Mar '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v3: - remove non working file flags reset. dlls/kernel32/tests/file.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 18cd18d154..dd84557238 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -61,6 +61,7 @@ static BOOL (WINAPI *pSetFileInformationByHandle)(HANDLE, FILE_INFO_BY_HANDLE_CL static BOOL (WINAPI *pGetQueuedCompletionStatusEx)(HANDLE, OVERLAPPED_ENTRY*, ULONG, ULONG*, DWORD, BOOL); static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); static void (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); +static BOOL (WINAPI *pSetFileCompletionNotificationModes)(HANDLE, UCHAR); static char filename[MAX_PATH]; static const char sillytext[] = @@ -109,6 +110,7 @@ static void InitFunctionPointers(void) pGetFinalPathNameByHandleW = (void *) GetProcAddress(hkernel32, "GetFinalPathNameByHandleW"); pSetFileInformationByHandle = (void *) GetProcAddress(hkernel32, "SetFileInformationByHandle"); pGetQueuedCompletionStatusEx = (void *) GetProcAddress(hkernel32, "GetQueuedCompletionStatusEx"); + pSetFileCompletionNotificationModes = (void *)GetProcAddress(hkernel32, "SetFileCompletionNotificationModes"); } static void test__hread( void ) @@ -4565,6 +4567,28 @@ static void test_WriteFileGather(void) ok( memcmp( rbuf1 + si.dwPageSize / 2, rbuf2, si.dwPageSize - si.dwPageSize / 2 ) == 0, "invalid data was read into buffer\n" ); + if (pSetFileCompletionNotificationModes) + { + br = pSetFileCompletionNotificationModes(hfile, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); + ok(br, "SetFileCompletionNotificationModes failed, error %u.\n", GetLastError()); + + br = ReadFileScatter(hfile, fse, si.dwPageSize, NULL, &ovl); + ok(br == FALSE, "ReadFileScatter should be asynchronous.\n"); + ok(GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed, error %u.\n", GetLastError()); + + br = GetQueuedCompletionStatus(hiocp2, &size, &key, &povl, 1000); + todo_wine ok(br, "GetQueuedCompletionStatus failed, err %u.\n", GetLastError()); + todo_wine ok(povl == &ovl, "Wrong ovl %p.\n", povl); + + br = GetOverlappedResult(hfile, &ovl, &tx, TRUE); + ok(br, "GetOverlappedResult failed, err %u.\n", GetLastError()); + ok(tx == si.dwPageSize, "Got unexpected size %u.\n", tx); + + ResetEvent(evt); + } + else + win_skip("SetFileCompletionNotificationModes not available.\n"); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); -- 2.20.1

2 14

[PATCH] dsound: Remove useless casts to self
by Michael Stefaniuc 04 Mar '19

04 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/primary.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 9f41a2b47f..852ec51b7f 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -576,7 +576,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetVolume(IDirectSoundBuffer8 *iface, LO for (i = 0; i < DS_MAX_CHANNELS; i++) { if (device->pwfx->nChannels > i){ - fvol = (float)((DWORD)(device->volpan.dwTotalAmpFactor[i] & 0xFFFF) / (float)0xFFFF); + fvol = (float)((device->volpan.dwTotalAmpFactor[i] & 0xFFFF) / (float)0xFFFF); hr = IAudioStreamVolume_SetChannelVolume(device->volume, i, fvol); if (FAILED(hr)){ LeaveCriticalSection(&device->mixlock); @@ -932,7 +932,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetPan(IDirectSoundBuffer8 *iface, LONG for (i = 0; i < DS_MAX_CHANNELS; i++) { if (device->pwfx->nChannels > i) { - fvol = (float)((DWORD)(device->volpan.dwTotalAmpFactor[i] & 0xFFFF) / (float)0xFFFF); + fvol = (float)((device->volpan.dwTotalAmpFactor[i] & 0xFFFF) / (float)0xFFFF); hr = IAudioStreamVolume_SetChannelVolume(device->volume, i, fvol); if (FAILED(hr)){ LeaveCriticalSection(&device->mixlock); -- 2.20.1

3 6

[PATCH] winmm: Remove useless casts to self
by Michael Stefaniuc 04 Mar '19

04 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winmm/waveform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 959773cae4..afdf9d392f 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -3124,9 +3124,9 @@ UINT WINAPI waveOutSetVolume(HWAVEOUT hWaveOut, DWORD in) return MMSYSERR_ERROR; } - vols[0] = (float)((DWORD)(in & 0xFFFF) / (float)0xFFFF); + vols[0] = (float)((in & 0xFFFF) / (float)0xFFFF); if(channels > 1) - vols[1] = (float)((DWORD)(in >> 16) / (float)0xFFFF); + vols[1] = (float)((in >> 16) / (float)0xFFFF); hr = IAudioStreamVolume_SetAllVolumes(device->volume, channels, vols); if(FAILED(hr)){ -- 2.20.1

2 1