December 2018 - Wine-Devel - list.winehq.org

[PATCH 11/11] mfplat: Implement IMFattributes::{SetUnknown,GetUnknown}.
by Jactry Zeng Dec. 28, 2018

Dec. 28, 2018

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 20 ++++++++--- dlls/mfplat/tests/mfplat.c | 74 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7a6d8d5475..c1f0188a0f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -731,10 +731,18 @@ static HRESULT WINAPI mfattributes_GetAllocatedBlob(IMFAttributes *iface, REFGUI static HRESULT WINAPI mfattributes_GetUnknown(IMFAttributes *iface, REFGUID key, REFIID riid, void **ppv) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hres; - FIXME("%p, %s, %s, %p\n", This, debugstr_guid(key), debugstr_guid(riid), ppv); + TRACE("(%p, %s, %s, %p)\n", This, debugstr_guid(key), debugstr_guid(riid), ppv); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = MF_ATTRIBUTE_IUNKNOWN; + hres = mfattributes_getitem(This, key, &attrval, TRUE); + if(SUCCEEDED(hres)) + hres = IUnknown_QueryInterface(attrval.punkVal, riid, ppv); + PropVariantClear(&attrval); + return hres; } static HRESULT mfattribute_setitem(mfattributes *object, REFGUID key, REFPROPVARIANT value) @@ -901,10 +909,14 @@ static HRESULT WINAPI mfattributes_SetBlob(IMFAttributes *iface, REFGUID key, co static HRESULT WINAPI mfattributes_SetUnknown(IMFAttributes *iface, REFGUID key, IUnknown *unknown) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - FIXME("%p, %s, %p\n", This, debugstr_guid(key), unknown); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), unknown); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = VT_UNKNOWN; + attrval.punkVal = unknown; + return mfattribute_setitem(This, key, &attrval); } static HRESULT WINAPI mfattributes_LockStore(IMFAttributes *iface) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 975b40a5f3..c7f8fe6e51 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -53,6 +53,7 @@ DEFINE_GUID(MFT_CATEGORY_OTHER, 0x90175d57,0xb7ea,0x4901,0xae,0xb3,0x93,0x3a,0x8 DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); +DEFINE_GUID(DUMMY_GUID3, 0x12345678,0x1234,0x1234,0x23,0x23,0x23,0x23,0x23,0x23,0x23,0x23); static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; @@ -419,6 +420,50 @@ static void _check_count(IMFAttributes* obj, ULONG expected, int line) ok_(__FILE__,line)(count == expected, "got %d, expected %d.\n", count, expected); } +struct unk_impl +{ + IUnknown IUnknown_iface; + LONG ref; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_QueryInterface()\n"); + *ppv = &This->IUnknown_iface; + IUnknown_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_AddRef()\n"); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_Release()\n"); + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + static void test_MFCreateAttributes(void) { IMFAttributes *attributes; @@ -429,6 +474,9 @@ static void test_MFCreateAttributes(void) const static WCHAR stringW[] = {'W','i','n','e',0}; WCHAR bufferW[256] = {0}; WCHAR *allacted_string = NULL; + IUnknown *unk_value = NULL, *unk = NULL; + struct unk_impl unk_obj = {{&unk_vtbl}, 1}; + struct unk_impl unk_obj2 = {{&unk_vtbl}, 22}; hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -507,6 +555,32 @@ static void test_MFCreateAttributes(void) ok(hr == E_INVALIDARG, "IMFAttributes_SetString should fail: 0x%08x.\n", hr); CHECK_COUNT(attributes, 3); + hr = IMFAttributes_SetUnknown(attributes, &DUMMY_GUID2, &unk_obj.IUnknown_iface); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: 0x%08x\n", hr); + CHECK_COUNT(attributes, 4); + ok(unk_obj.ref == 2, "got wrong refcount: %d.\n", unk_obj.ref); + hr = IMFAttributes_GetUnknown(attributes, &DUMMY_GUID2, &IID_IUnknown, (void **)&unk_value); + ok(hr == S_OK, "IMFAttributes_GetUnknown failed: 0x%08x\n", hr); + ok(unk_obj.ref == 3, "got wrong refcount: %d.\n", unk_obj.ref); + + hr = IMFAttributes_SetUnknown(attributes, &DUMMY_GUID2, &unk_obj2.IUnknown_iface); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: 0x%08x\n", hr); + CHECK_COUNT(attributes, 4); + ok(unk_obj.ref == 2, "got wrong refcount: %d.\n", unk_obj.ref); + ok(unk_obj2.ref == 23, "got wrong refcount: %d.\n", unk_obj.ref); + unk_value = NULL; + hr = IMFAttributes_GetUnknown(attributes, &DUMMY_GUID2, &IID_IUnknown, (void **)&unk_value); + ok(hr == S_OK, "IMFAttributes_GetUnknown failed: 0x%08x\n", hr); + ok(unk_obj.ref == 2, "got wrong refcount: %d.\n", unk_obj.ref); + ok(unk_obj2.ref == 24, "got wrong refcount: %d.\n", unk_obj2.ref); + + hr = IMFAttributes_SetUnknown(attributes, &DUMMY_GUID3, unk); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: 0x%08x\n", hr); + CHECK_COUNT(attributes, 5); + unk_value = NULL; + hr = IMFAttributes_GetUnknown(attributes, &DUMMY_GUID3, &IID_IUnknown, (void **)&unk_value); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_GetUnknown failed: 0x%08x\n", hr); + IMFAttributes_Release(attributes); } -- 2.19.2

1 0

[PATCH 08/11] mfplat: Implement IMFattributes::{SetDouble, GetDouble}.
by Jactry Zeng Dec. 28, 2018

Dec. 28, 2018

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 19 +++++++++++++++---- dlls/mfplat/tests/mfplat.c | 10 ++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index bc3b385b14..0b86843c2f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -622,10 +622,17 @@ static HRESULT WINAPI mfattributes_GetUINT64(IMFAttributes *iface, REFGUID key, static HRESULT WINAPI mfattributes_GetDouble(IMFAttributes *iface, REFGUID key, double *value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hres; - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = MF_ATTRIBUTE_DOUBLE; + hres = mfattributes_getitem(This, key, &attrval, TRUE); + if(SUCCEEDED(hres)) + hres = PropVariantToDouble(&attrval, value); + return hres; } static HRESULT WINAPI mfattributes_GetGUID(IMFAttributes *iface, REFGUID key, GUID *value) @@ -817,10 +824,14 @@ static HRESULT WINAPI mfattributes_SetUINT64(IMFAttributes *iface, REFGUID key, static HRESULT WINAPI mfattributes_SetDouble(IMFAttributes *iface, REFGUID key, double value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - FIXME("%p, %s, %f\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %f)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = MF_ATTRIBUTE_DOUBLE; + attrval.dblVal = value; + return mfattribute_setitem(This, key, &attrval); } static HRESULT WINAPI mfattributes_SetGUID(IMFAttributes *iface, REFGUID key, REFGUID value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 01cb1a3377..2e463d36ae 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -424,6 +424,7 @@ static void test_MFCreateAttributes(void) HRESULT hr; UINT32 uint32_value; UINT64 uint64_value; + double double_value; hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -456,6 +457,15 @@ static void test_MFCreateAttributes(void) ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_GetUINT32 should fail: 0x%08x.\n", hr); ok(uint32_value == 0xdeadbeef, "got wrong value: %d, expected: 0xdeadbeef.\n", uint32_value); + hr = IMFAttributes_SetDouble(attributes, &GUID_NULL, 22.0); + ok(hr == S_OK, "IMFAttributes_SetDouble failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 2); + + double_value = 0xdeadbeef; + hr = IMFAttributes_GetDouble(attributes, &GUID_NULL, &double_value); + ok(hr == S_OK, "IMFAttributes_GetDouble failed: 0x%08x.\n", hr); + ok(double_value == 22.0, "got wrong value: %f, expected: 22.0.\n", double_value); + IMFAttributes_Release(attributes); } -- 2.19.2

1 0

[PATCH 09/11] propsys: Partially implement PropVariantToString().
by Jactry Zeng Dec. 28, 2018

Dec. 28, 2018

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 38 ++++++++++++++++ dlls/propsys/tests/propsys.c | 87 ++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 127 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 0edf4621b3..22ea3251f8 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,43 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret) return hr; } +HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch) +{ + HRESULT hr = S_OK; + + TRACE("(%p, %p, %d): semi-stub\n", propvarIn, ret, cch); + + ret[0] = '\0'; + + if(!cch) + return E_INVALIDARG; + + switch(propvarIn->vt) + { + case VT_NULL: + case VT_EMPTY: + break; + case VT_BSTR: + case VT_LPWSTR: + if(lstrlenW(propvarIn->u.pwszVal) > cch) + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + else + lstrcpyW(ret, propvarIn->u.pwszVal); + break; + case VT_LPSTR: + if(strlen(propvarIn->u.pszVal) > cch) + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + else + MultiByteToWideChar(CP_ACP, 0, propvarIn->u.pszVal, -1, ret, cch); + break; + default: + FIXME("Unsupported conversion (%d)\n", propvarIn->vt); + hr = E_FAIL; + break; + } + 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 a9c0a7730b..6d64afa355 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); @@ -1304,6 +1305,91 @@ static void test_PropVariantToDouble(void) ok(value == 8.0, "Unexpected value: %f.\n", value); } +static void test_PropVariantToString(void) +{ + PROPVARIANT propvar; + static CHAR string[] = {'T','e','s','t',0}; + 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)); + PropVariantClear(&propvar); + + 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(!strcmp_wa(bufferW, string), "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, 1); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "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_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); + PropVariantClear(&propvar); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -1320,4 +1406,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.19.2

1 0

[PATCH 06/11] mfplat: Implement IMFattributes::GetCount().
by Jactry Zeng Dec. 28, 2018

Dec. 28, 2018

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 10 +++++++--- dlls/mfplat/tests/mfplat.c | 23 +++++++++++++---------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1d8b110a09..bc3b385b14 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -881,12 +881,16 @@ static HRESULT WINAPI mfattributes_GetCount(IMFAttributes *iface, UINT32 *items) { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %p\n", This, items); + TRACE("(%p, %p)\n", This, items); + EnterCriticalSection(&This->lock); + if(items) - *items = 0; + *items = list_count(&This->attributes); + + LeaveCriticalSection(&This->lock); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI mfattributes_GetItemByIndex(IMFAttributes *iface, UINT32 index, GUID *key, PROPVARIANT *value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7ae87c2fc1..01cb1a3377 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -408,28 +408,30 @@ static void test_MFCreateMediaEvent(void) IMFMediaEvent_Release(mediaevent); } +#define CHECK_COUNT(obj,expected) _check_count(obj, expected, __LINE__) +static void _check_count(IMFAttributes* obj, ULONG expected, int line) +{ + UINT32 count = 9999; + HRESULT hr; + hr = IMFAttributes_GetCount(obj, &count); + ok_(__FILE__,line)(hr == S_OK, "IMFAttributes_GetCount failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(count == expected, "got %d, expected %d.\n", count, expected); +} + static void test_MFCreateAttributes(void) { IMFAttributes *attributes; HRESULT hr; - UINT32 count; UINT32 uint32_value; UINT64 uint64_value; hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); - - count = 88; - hr = IMFAttributes_GetCount(attributes, &count); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count == 0, "got %d\n", count); + CHECK_COUNT(attributes, 0); hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 123); ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: 0x%08x.\n", hr); - - hr = IMFAttributes_GetCount(attributes, &count); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(count == 1, "got %d\n", count); + CHECK_COUNT(attributes, 1); uint32_value = 0xdeadbeef; hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint32_value); @@ -443,6 +445,7 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 65536); ok(hr == S_OK, "IMFAttributes_SetUINT64 failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 1); hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint64_value); ok(hr == S_OK, "IMFAttributes_GetUINT64 failed: 0x%08x.\n", hr); -- 2.19.2

1 0

[PATCH 03/11] propsys/tests: Add tests of IPropertyStore interface.
by Jactry Zeng Dec. 28, 2018

Dec. 28, 2018

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/tests/propstore.c | 60 ++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index a24d3e762b..e87787e947 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -34,6 +34,7 @@ #include "initguid.h" DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4); +DEFINE_GUID(DUMMY_GUID1, 0x12345678, 0x1234,0x1234, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19); #define EXPECT_REF(obj,ref) _expect_ref((IUnknown *)obj, ref, __LINE__) static void _expect_ref(IUnknown *obj, ULONG ref, int line) @@ -299,6 +300,64 @@ static void test_PSCreateMemoryPropertyStore(void) IPropertyStoreCache_Release(propstorecache); } +static void test_propertystore(void) +{ + IPropertyStore *propstore; + HRESULT hr; + PROPVARIANT propvar, ret_propvar; + PROPERTYKEY propkey; + DWORD count = 0; + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore != NULL, "got %p.\n", propstore); + + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(!count, "got wrong property count: %d, expected 0.\n", count); + + PropVariantInit(&propvar); + propvar.vt = VT_I4; + U(propvar).lVal = 123; + propkey.fmtid = DUMMY_GUID1; + propkey.pid = PID_FIRST_USABLE; + hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); + ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); + hr = IPropertyStore_Commit(propstore); + ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(count == 1, "got wrong property count: %d, expected 1.\n", count); + PropVariantInit(&ret_propvar); + ret_propvar.vt = VT_I4; + hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); + ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); + ok(ret_propvar.vt == VT_I4, "got wrong property type: %x.\n", ret_propvar.vt); + ok(U(ret_propvar).lVal == 123, "got wrong value: %d, expected 123.\n", U(ret_propvar).lVal); + PropVariantClear(&propvar); + PropVariantClear(&ret_propvar); + + PropVariantInit(&propvar); + propkey.fmtid = DUMMY_GUID1; + propkey.pid = PID_FIRST_USABLE; + hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); + ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); + hr = IPropertyStore_Commit(propstore); + ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(count == 1, "got wrong property count: %d, expected 1.\n", count); + PropVariantInit(&ret_propvar); + hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); + ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); + ok(ret_propvar.vt == VT_EMPTY, "got wrong property type: %x.\n", ret_propvar.vt); + ok(!U(ret_propvar).lVal, "got wrong value: %d, expected 0.\n", U(ret_propvar).lVal); + PropVariantClear(&propvar); + PropVariantClear(&ret_propvar); + + IPropertyStore_Release(propstore); +} + START_TEST(propstore) { CoInitialize(NULL); @@ -306,6 +365,7 @@ START_TEST(propstore) test_inmemorystore(); test_persistserialized(); test_PSCreateMemoryPropertyStore(); + test_propertystore(); CoUninitialize(); } -- 2.19.2

1 0

[PATCH 02/11] propsys: Implement PSCreateMemoryPropertyStore().
by Jactry Zeng Dec. 28, 2018

Dec. 28, 2018

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 7 +++++ dlls/propsys/tests/propstore.c | 51 ++++++++++++++++++++++++++++++++++ include/propsys.idl | 1 + 4 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index bbc71654a8..19c5a24c92 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -65,7 +65,7 @@ @ stub PSCoerceToCanonicalValue @ stub PSCreateAdapterFromPropertyStore @ stub PSCreateDelayedMultiplexPropertyStore -@ stub PSCreateMemoryPropertyStore +@ stdcall PSCreateMemoryPropertyStore(ptr ptr) @ stub PSCreateMultiplexPropertyStore @ stub PSCreatePropertyChangeArray @ stub PSCreatePropertyStoreFromObject diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 1dbaee433f..65d157d0cc 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -509,3 +509,10 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) return S_OK; } + +HRESULT WINAPI PSCreateMemoryPropertyStore(REFIID riid, void **ppv) +{ + TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + + return PropertyStore_CreateInstance(NULL, riid, ppv); +} diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index 3fe8613a8b..a24d3e762b 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -35,6 +35,15 @@ DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4); +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown *)obj, ref, __LINE__) +static void _expect_ref(IUnknown *obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + static void test_inmemorystore(void) { IPropertyStoreCache *propcache; @@ -249,12 +258,54 @@ static void test_persistserialized(void) IPersistSerializedPropStorage_Release(serialized); } +static void test_PSCreateMemoryPropertyStore(void) +{ + IPropertyStore *propstore, *propstore1; + IPersistSerializedPropStorage *serialized; + IPropertyStoreCache *propstorecache; + HRESULT hr; + + /* PSCreateMemoryPropertyStore(&IID_IPropertyStore, NULL); crashes */ + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore != NULL, "got %p.\n", propstore); + EXPECT_REF(propstore, 1); + + hr = PSCreateMemoryPropertyStore(&IID_IPersistSerializedPropStorage, (void **)&serialized); + todo_wine ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + todo_wine ok(serialized != NULL, "got %p.\n", serialized); + EXPECT_REF(propstore, 1); + /* EXPECT_REF(serialized, 1); */ + /* IPersistSerializedPropStorage_Release(serialized); */ + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStoreCache, (void **)&propstorecache); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstorecache != NULL, "got %p.\n", propstore); + ok(propstorecache != (IPropertyStoreCache *)propstore, "pointer are equal: %p, %p.\n", propstorecache, propstore); + EXPECT_REF(propstore, 1); + EXPECT_REF(propstorecache, 1); + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore1); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore1 != NULL, "got %p.\n", propstore); + ok(propstore1 != propstore, "pointer are equal: %p, %p.\n", propstore1, propstore); + EXPECT_REF(propstore, 1); + EXPECT_REF(propstore1, 1); + EXPECT_REF(propstorecache, 1); + + IPropertyStore_Release(propstore1); + IPropertyStore_Release(propstore); + IPropertyStoreCache_Release(propstorecache); +} + START_TEST(propstore) { CoInitialize(NULL); test_inmemorystore(); test_persistserialized(); + test_PSCreateMemoryPropertyStore(); CoUninitialize(); } diff --git a/include/propsys.idl b/include/propsys.idl index 04d3fbf8a1..bdd67fa6a5 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -799,6 +799,7 @@ cpp_quote("#define PKEY_PIDSTR_MAX 10") cpp_quote("#define GUIDSTRING_MAX 39") cpp_quote("#define PKEYSTR_MAX (GUIDSTRING_MAX + 1 + PKEY_PIDSTR_MAX)") +cpp_quote("HRESULT WINAPI PSCreateMemoryPropertyStore(REFIID,void **);") cpp_quote("HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY,LPWSTR,UINT);") cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);") -- 2.19.2

1 0

[PATCH 01/11] ole32/tests: Test PropVariantCopy() with VT_UNKNOWN.
by Jactry Zeng Dec. 28, 2018

Dec. 28, 2018

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/ole32/tests/propvariant.c | 58 ++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 97c4eec4ca..8c9f79e8d6 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include "windows.h" #include "wtypes.h" #include "ddeml.h" @@ -298,10 +300,55 @@ static void test_validtypes(void) } } +struct unk_impl +{ + IUnknown IUnknown_iface; + LONG ref; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_QueryInterface()\n"); + *ppv = &This->IUnknown_iface; + IUnknown_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_AddRef()\n"); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_Release()\n"); + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + static void test_copy(void) { static char szTestString[] = "Test String"; static WCHAR wszTestString[] = {'T','e','s','t',' ','S','t','r','i','n','g',0}; + struct unk_impl unk_obj = {{&unk_vtbl}, 1}; PROPVARIANT propvarSrc; PROPVARIANT propvarDst; HRESULT hr; @@ -334,6 +381,17 @@ static void test_copy(void) hr = PropVariantClear(&propvarDst); ok(hr == S_OK, "PropVariantClear(...VT_LPSTR...) failed\n"); memset(&propvarSrc, 0, sizeof(propvarSrc)); + + propvarSrc.vt = VT_UNKNOWN; + U(propvarSrc).punkVal = &unk_obj.IUnknown_iface; + hr = PropVariantCopy(&propvarDst, &propvarSrc); + ok(hr == S_OK, "PropVariantCopy(...VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(U(propvarDst).punkVal == &unk_obj.IUnknown_iface, "Got wrong IUnknown pointer\n"); + ok(unk_obj.ref == 2, "got wrong refcount: %d.\n", unk_obj.ref); + hr = PropVariantClear(&propvarDst); + ok(hr == S_OK, "PropVariantClear(...VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(unk_obj.ref == 1, "got wrong refcount: %d.\n", unk_obj.ref); + memset(&propvarSrc, 0, sizeof(propvarSrc)); } struct _PMemoryAllocator_vtable { -- 2.19.2

1 0

[PATCH v2] include/winuser: Add PtInRect as inline version of common RECT helpers
by Gabriel Ivăncescu Dec. 28, 2018

Dec. 28, 2018

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This one is used in a lot of code so it makes sense to be just like the others. include/winuser.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/winuser.h b/include/winuser.h index 693965a..5e51afd 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4049,7 +4049,6 @@ WINUSERAPI UINT WINAPI PrivateExtractIconExA(LPCSTR,int,HICON*,HICON*,UIN WINUSERAPI UINT WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); -WINUSERAPI BOOL WINAPI PtInRect(const RECT*,POINT); WINUSERAPI HWND WINAPI RealChildWindowFromPoint(HWND,POINT); WINUSERAPI UINT WINAPI RealGetWindowClassA(HWND,LPSTR,UINT); WINUSERAPI UINT WINAPI RealGetWindowClassW(HWND,LPWSTR,UINT); @@ -4278,6 +4277,7 @@ WINUSERAPI BOOL WINAPI EqualRect(const RECT*,const RECT*); WINUSERAPI BOOL WINAPI InflateRect(LPRECT,INT,INT); WINUSERAPI BOOL WINAPI IsRectEmpty(const RECT*); WINUSERAPI BOOL WINAPI OffsetRect(LPRECT,INT,INT); +WINUSERAPI BOOL WINAPI PtInRect(const RECT*,POINT); WINUSERAPI BOOL WINAPI SetRect(LPRECT,INT,INT,INT,INT); WINUSERAPI BOOL WINAPI SetRectEmpty(LPRECT); @@ -4318,6 +4318,13 @@ static inline BOOL WINAPI OffsetRect(LPRECT rect, INT x, INT y) return TRUE; } +static inline BOOL WINAPI PtInRect(const RECT *rect, POINT pt) +{ + if (!rect) return FALSE; + return ((pt.x >= rect->left) && (pt.x < rect->right) && + (pt.y >= rect->top) && (pt.y < rect->bottom)); +} + static inline BOOL WINAPI SetRect(LPRECT rect, INT left, INT top, INT right, INT bottom) { if (!rect) return FALSE; -- 2.19.1

1 0

[PATCH] kernel32: CreateDirectory shouldn't return ERROR_ACCESS_DENIED for the root of the drive. (Resend)
by Dmitry Timoshkov Dec. 28, 2018

Dec. 28, 2018

According to the testbot results CreateDirectory("C:\\", NULL) fails with ERROR_ACCESS_DENIED for not administrators. However with UAC enabled and not and administrator account I get ERROR_ALREADY_EXISTS in that case with Windows 7 64-bit running on real hardware. Moreover, Wine doesn't really perform any access checks in that case and blindly assumes that returning STATUS_ACCESS_DENIED is correct behaviour for the drive's root: dlls/ntdll/directory.c,lookup_unix_name(). This patch fixes an application that can't find its data files because after it receives ERROR_ACCESS_DENIED it stops further directory traversing. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/directory.c | 43 +++++++++++++++++++++++++++++++++ dlls/ntdll/directory.c | 3 +-- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c index 512dc6d22a..de78c61681 100644 --- a/dlls/kernel32/tests/directory.c +++ b/dlls/kernel32/tests/directory.c @@ -541,10 +541,53 @@ static void test_SetCurrentDirectoryA(void) ok( GetLastError() == ERROR_PATH_NOT_FOUND, "wrong error %d\n", GetLastError() ); } +static void test_CreateDirectory_root(void) +{ + static const WCHAR drive_c_root[] = { 'C',':','\\',0 }; + static const WCHAR drive_c[] = { 'C',':',0 }; + char curdir[MAX_PATH]; + BOOL ret; + + GetCurrentDirectoryA(sizeof(curdir), curdir); + + ret = SetCurrentDirectoryA("C:\\"); + ok(ret, "SetCurrentDirectory error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryA("C:\\", NULL); + ok(!ret, "CreateDirectory should fail\n"); + if (GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip("not an administrator\n"); + SetCurrentDirectoryA(curdir); + return; + } + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryA("C:", NULL); + ok(!ret, "CreateDirectory should fail\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryW(drive_c_root, NULL); + ok(!ret, "CreateDirectory should fail\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryW(drive_c, NULL); + ok(!ret, "CreateDirectory should fail\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetCurrentDirectoryA(curdir); +} + START_TEST(directory) { init(); + test_CreateDirectory_root(); + test_GetWindowsDirectoryA(); test_GetWindowsDirectoryW(); diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index c48b9e97ea..2719958f67 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2650,9 +2650,8 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer { if (!stat( unix_name, &st )) { - /* creation fails with STATUS_ACCESS_DENIED for the root of the drive */ if (disposition == FILE_CREATE) - return name_len ? STATUS_OBJECT_NAME_COLLISION : STATUS_ACCESS_DENIED; + return STATUS_OBJECT_NAME_COLLISION; return STATUS_SUCCESS; } } -- 2.19.2

1 0

[PATCH 1/3] d3d9: Fix Reset() with system memory buffers.
by Józef Kucia Dec. 27, 2018

Dec. 27, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Fixes a regression introduced by commit b18a53a5b44b651cde8e05200c75eacf54f49926. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46362 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/device.c | 15 +++++++++++++++ dlls/d3d9/tests/device.c | 16 ++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 17f6565cbb1f..c1418e99118b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -875,6 +875,8 @@ static UINT WINAPI d3d9_device_GetNumberOfSwapChains(IDirect3DDevice9Ex *iface) static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) { + struct d3d9_vertexbuffer *vertex_buffer; + struct d3d9_indexbuffer *index_buffer; struct wined3d_resource_desc desc; IDirect3DBaseTexture9 *texture; struct d3d9_surface *surface; @@ -886,6 +888,19 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) if (desc.resource_type != WINED3D_RTYPE_TEXTURE_2D) { + if (desc.bind_flags & WINED3D_BIND_VERTEX_BUFFER) + { + vertex_buffer = wined3d_resource_get_parent(resource); + if (vertex_buffer && vertex_buffer->draw_buffer) + return D3D_OK; + } + if (desc.bind_flags & WINED3D_BIND_INDEX_BUFFER) + { + index_buffer = wined3d_resource_get_parent(resource); + if (index_buffer && index_buffer->draw_buffer) + return D3D_OK; + } + WARN("Resource %p in pool D3DPOOL_DEFAULT blocks the Reset call.\n", resource); return D3DERR_INVALIDCALL; } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 6edf2b35b30d..bc8d7088d36e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1827,6 +1827,8 @@ static void test_reset(void) IDirect3DDevice9 *device2 = NULL; IDirect3DSwapChain9 *swapchain; struct device_desc device_desc; + IDirect3DVertexBuffer9 *vb; + IDirect3DIndexBuffer9 *ib; DEVMODEW devmode; IDirect3D9 *d3d; D3DCAPS9 caps; @@ -2198,6 +2200,20 @@ static void test_reset(void) ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); IDirect3DSurface9_Release(surface); + hr = IDirect3DDevice9_CreateVertexBuffer(device1, 16, 0, + D3DFVF_XYZ, D3DPOOL_SYSTEMMEM, &vb, NULL); + ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_Reset(device1, &d3dpp); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + IDirect3DVertexBuffer9_Release(vb); + + hr = IDirect3DDevice9_CreateIndexBuffer(device1, 16, 0, + D3DFMT_INDEX16, D3DPOOL_SYSTEMMEM, &ib, NULL); + ok(hr == D3D_OK, "Failed to create index buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_Reset(device1, &d3dpp); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + IDirect3DIndexBuffer9_Release(ib); + /* The depth stencil should get reset to the auto depth stencil when present. */ hr = IDirect3DDevice9_SetDepthStencilSurface(device1, NULL); ok(hr == D3D_OK, "SetDepthStencilSurface failed with 0x%08x\n", hr); -- 2.20.1

3 8

[PATCH] comctl32/listview: Implement GetSelectedColumn
by Isira Seneviratne Dec. 27, 2018

Dec. 27, 2018

2 1

[PATCH] po: Update Sinhala translation.
by Isira Seneviratne Dec. 26, 2018

Dec. 26, 2018

1 0

[PATCH 1/2] urlmon/tests: Add test for opening cache file with DELETE access.
by Zebediah Figura Dec. 26, 2018

Dec. 26, 2018

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/urlmon/tests/url.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 893632fd2e..ada78c930b 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -182,6 +182,7 @@ static HRESULT abort_hres; static BOOL have_IHttpNegotiate2, use_bscex, is_async_prot; static BOOL test_redirect, use_cache_file, callback_read, no_callback, test_abort; static WCHAR cache_file_name[MAX_PATH]; +static WCHAR http_cache_file[MAX_PATH]; static BOOL only_check_prot_args = FALSE; static BOOL invalid_cn_accepted = FALSE; static BOOL abort_start = FALSE; @@ -1927,6 +1928,14 @@ static HRESULT WINAPI statusclb_OnStopBinding(IBindStatusCallbackEx *iface, HRES ok( WaitForSingleObject(complete_event2, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); } + if(test_protocol == HTTP_TEST && !emulate_protocol && http_cache_file[0]) { + HANDLE file = CreateFileW(http_cache_file, DELETE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file == INVALID_HANDLE_VALUE, "expected INVALID_HANDLE_VALUE, got %p\n", file); + ok(GetLastError() == ERROR_SHARING_VIOLATION, "expected ERROR_SHARING_VIOLATION, got %u\n", GetLastError()); + http_cache_file[0] = 0; + } + return S_OK; } @@ -2083,6 +2092,8 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW else if(emulate_protocol) ok(!lstrcmpW(pstgmed->u.lpszFileName, cache_fileW), "unexpected file name %s\n", wine_dbgstr_w(pstgmed->u.lpszFileName)); + else if(test_protocol == HTTP_TEST) + lstrcpyW(http_cache_file, pstgmed->u.lpszFileName); else ok(pstgmed->u.lpszFileName != NULL, "lpszFileName == NULL\n"); } -- 2.14.1

2 2

[PATCH] include/winuser: Add CopyRect and PtInRect as inline versions of common RECT helpers
by Gabriel Ivăncescu Dec. 26, 2018

Dec. 26, 2018

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- There shouldn't be a reason they aren't there like the rest, since they're very simple functions. include/winuser.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 693965a..c9e90c2 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3549,7 +3549,6 @@ WINUSERAPI INT WINAPI CopyAcceleratorTableW(HACCEL,LPACCEL,INT); #define CopyCursor(cur) ((HCURSOR)CopyIcon((HICON)(cur))) WINUSERAPI HICON WINAPI CopyIcon(HICON); WINUSERAPI HANDLE WINAPI CopyImage(HANDLE,UINT,INT,INT,UINT); -WINUSERAPI BOOL WINAPI CopyRect(RECT*,const RECT*); WINUSERAPI INT WINAPI CountClipboardFormats(void); WINUSERAPI HACCEL WINAPI CreateAcceleratorTableA(LPACCEL,INT); WINUSERAPI HACCEL WINAPI CreateAcceleratorTableW(LPACCEL,INT); @@ -4049,7 +4048,6 @@ WINUSERAPI UINT WINAPI PrivateExtractIconExA(LPCSTR,int,HICON*,HICON*,UIN WINUSERAPI UINT WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); -WINUSERAPI BOOL WINAPI PtInRect(const RECT*,POINT); WINUSERAPI HWND WINAPI RealChildWindowFromPoint(HWND,POINT); WINUSERAPI UINT WINAPI RealGetWindowClassA(HWND,LPSTR,UINT); WINUSERAPI UINT WINAPI RealGetWindowClassW(HWND,LPWSTR,UINT); @@ -4274,10 +4272,12 @@ WINUSERAPI INT WINAPI wvsprintfW(LPWSTR,LPCWSTR,__ms_va_list); #if !defined(__WINESRC__) || defined(WINE_NO_INLINE_RECT) +WINUSERAPI BOOL WINAPI CopyRect(RECT*,const RECT*); WINUSERAPI BOOL WINAPI EqualRect(const RECT*,const RECT*); WINUSERAPI BOOL WINAPI InflateRect(LPRECT,INT,INT); WINUSERAPI BOOL WINAPI IsRectEmpty(const RECT*); WINUSERAPI BOOL WINAPI OffsetRect(LPRECT,INT,INT); +WINUSERAPI BOOL WINAPI PtInRect(const RECT*,POINT); WINUSERAPI BOOL WINAPI SetRect(LPRECT,INT,INT,INT,INT); WINUSERAPI BOOL WINAPI SetRectEmpty(LPRECT); @@ -4285,6 +4285,13 @@ WINUSERAPI BOOL WINAPI SetRectEmpty(LPRECT); /* Inline versions of common RECT helpers */ +static inline BOOL WINAPI CopyRect(RECT *dest, const RECT *src) +{ + if (!dest || !src) return FALSE; + *dest = *src; + return TRUE; +} + static inline BOOL WINAPI EqualRect(const RECT *rect1, const RECT *rect2) { if (!rect1 || !rect2) return FALSE; @@ -4318,6 +4325,13 @@ static inline BOOL WINAPI OffsetRect(LPRECT rect, INT x, INT y) return TRUE; } +static inline BOOL WINAPI PtInRect(const RECT *rect, POINT pt) +{ + if (!rect) return FALSE; + return ((pt.x >= rect->left) && (pt.x < rect->right) && + (pt.y >= rect->top) && (pt.y < rect->bottom)); +} + static inline BOOL WINAPI SetRect(LPRECT rect, INT left, INT top, INT right, INT bottom) { if (!rect) return FALSE; -- 2.19.1

2 2

[PATCH] comctl32/listview: Implement GetSelectedColumn
by Isira Seneviratne Dec. 26, 2018

Dec. 26, 2018

2 1

[PATCH] po: Remove double spaces from English (United States) translation.
by Isira Seneviratne Dec. 24, 2018

Dec. 24, 2018

3 2

[PATCH] po: Remove double spaces from English (United States) translation.
by Isira Seneviratne Dec. 24, 2018

Dec. 24, 2018

2 1

[PATCH] po: Update Simplified Chinese translation.
by Jactry Zeng Dec. 24, 2018

Dec. 24, 2018

From: Mingcong Bai <jeffbai(a)aosc.io> Signed-off-by: Mingcong Bai <jeffbai(a)aosc.io> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- po/zh_CN.po | 420 +++++++++++++++++++++++++--------------------------- 1 file changed, 200 insertions(+), 220 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 6d731d3a7a..34af3ca7a2 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-11-21 10:10-0600\n" -"Last-Translator: Mingcong Bai <jeffbai(a)aosc.xyz>\n" +"PO-Revision-Date: 2018-12-21 11:21-0600\n" +"Last-Translator: Mingcong Bai <jeffbai(a)aosc.io>\n" "Language-Team: Chinese (PRC)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.9\n" +"X-Generator: Poedit 2.1.1\n" "Plural-Forms: nplurals=1; plural=0;\n" #: appwiz.rc:58 @@ -8980,811 +8980,791 @@ msgstr "选择来源" #: tzres.rc:82 msgid "China Standard Time" -msgstr "" +msgstr "中国标准时间" #: tzres.rc:83 msgid "China Daylight Time" -msgstr "" +msgstr "中国夏令时" #: tzres.rc:160 msgid "North Asia Standard Time" -msgstr "" +msgstr "北亚标准时间" #: tzres.rc:161 msgid "North Asia Daylight Time" -msgstr "" +msgstr "北亚夏令时" #: tzres.rc:104 msgid "Georgian Standard Time" -msgstr "" +msgstr "格鲁吉亚标准时间" #: tzres.rc:105 msgid "Georgian Daylight Time" -msgstr "" +msgstr "格鲁吉亚夏令时" #: tzres.rc:152 msgid "Nepal Standard Time" -msgstr "" +msgstr "尼泊尔标准时间" #: tzres.rc:153 msgid "Nepal Daylight Time" -msgstr "" +msgstr "尼泊尔夏令时" #: tzres.rc:60 msgid "Cape Verde Standard Time" -msgstr "" +msgstr "佛得角标准时间" #: tzres.rc:61 msgid "Cape Verde Daylight Time" -msgstr "" +msgstr "佛得角夏令时" #: tzres.rc:74 -#, fuzzy -#| msgid "Central European" msgid "Central European Standard Time" -msgstr "中欧语言" +msgstr "中欧标准时间" #: tzres.rc:75 -#, fuzzy -#| msgid "Central European" msgid "Central European Daylight Time" -msgstr "中欧语言" +msgstr "中欧夏令时" #: tzres.rc:140 msgid "Morocco Standard Time" -msgstr "" +msgstr "摩洛哥标准时间" #: tzres.rc:141 msgid "Morocco Daylight Time" -msgstr "" +msgstr "摩洛哥夏令时" #: tzres.rc:72 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Standard Time" -msgstr "中欧语言" +msgstr "中欧标准时间" #: tzres.rc:73 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Daylight Time" -msgstr "中欧语言" +msgstr "中欧夏令时" #: tzres.rc:118 msgid "Iran Standard Time" -msgstr "" +msgstr "伊朗标准时间" #: tzres.rc:119 msgid "Iran Daylight Time" -msgstr "" +msgstr "伊朗夏令时" #: tzres.rc:150 msgid "Namibia Standard Time" -msgstr "" +msgstr "纳米比亚标准时间" #: tzres.rc:151 msgid "Namibia Daylight Time" -msgstr "" +msgstr "纳米比亚夏令时" #: tzres.rc:200 msgid "Tonga Standard Time" -msgstr "" +msgstr "汤加标准时间" #: tzres.rc:201 msgid "Tonga Daylight Time" -msgstr "" +msgstr "汤加夏令时" #: tzres.rc:144 msgid "Mountain Standard Time (Mexico)" -msgstr "" +msgstr "山地标准时间（墨西哥）" #: tzres.rc:145 msgid "Mountain Daylight Time (Mexico)" -msgstr "" +msgstr "山地夏令时（墨西哥）" #: tzres.rc:106 -#, fuzzy -#| msgid "&Standard bar" msgid "GMT Standard Time" -msgstr "标准栏(&S)" +msgstr "格林尼治标准时间" #: tzres.rc:107 msgid "GMT Daylight Time" -msgstr "" +msgstr "格林尼治夏令时" #: tzres.rc:68 msgid "Central Asia Standard Time" -msgstr "" +msgstr "中亚标准时间" #: tzres.rc:69 msgid "Central Asia Daylight Time" -msgstr "" +msgstr "中亚夏令时" #: tzres.rc:38 msgid "Arabic Standard Time" -msgstr "" +msgstr "阿拉伯标准时间" #: tzres.rc:39 msgid "Arabic Daylight Time" -msgstr "" +msgstr "阿拉伯夏令时" #: tzres.rc:132 msgid "Magadan Standard Time" -msgstr "" +msgstr "马加丹标准时间" #: tzres.rc:133 msgid "Magadan Daylight Time" -msgstr "" +msgstr "马加丹夏令时" #: tzres.rc:156 msgid "Newfoundland Standard Time" -msgstr "" +msgstr "纽芬兰标准时间" #: tzres.rc:157 msgid "Newfoundland Daylight Time" -msgstr "" +msgstr "纽芬兰夏令时" #: tzres.rc:224 msgid "West Pacific Standard Time" -msgstr "" +msgstr "西太平洋标准时间" #: tzres.rc:225 msgid "West Pacific Daylight Time" -msgstr "" +msgstr "西太平洋夏令时" #: tzres.rc:164 msgid "Pacific Standard Time" -msgstr "" +msgstr "太平洋标准时间" #: tzres.rc:165 msgid "Pacific Daylight Time" -msgstr "" +msgstr "太平洋夏令时" #: tzres.rc:48 msgid "Azerbaijan Standard Time" -msgstr "" +msgstr "阿塞拜疆标准时间" #: tzres.rc:49 msgid "Azerbaijan Daylight Time" -msgstr "" +msgstr "阿塞拜疆夏令时" #: tzres.rc:182 msgid "Samoa Standard Time" -msgstr "" +msgstr "萨摩亚标准时间" #: tzres.rc:183 msgid "Samoa Daylight Time" -msgstr "" +msgstr "萨摩亚夏令时" #: tzres.rc:124 msgid "Kaliningrad Standard Time" -msgstr "" +msgstr "加里宁格勒标准时间" #: tzres.rc:125 msgid "Kaliningrad Daylight Time" -msgstr "" +msgstr "加里宁格勒夏令时" #: tzres.rc:166 msgid "Pacific Standard Time (Mexico)" -msgstr "" +msgstr "太平洋标准时间（墨西哥）" #: tzres.rc:167 msgid "Pacific Daylight Time (Mexico)" -msgstr "" +msgstr "太平洋夏令时（墨西哥）" #: tzres.rc:136 msgid "Middle East Standard Time" -msgstr "" +msgstr "中东标准时间" #: tzres.rc:137 msgid "Middle East Daylight Time" -msgstr "" +msgstr "中东夏令时" #: tzres.rc:198 msgid "Tokyo Standard Time" -msgstr "" +msgstr "东京标准时间" #: tzres.rc:199 msgid "Tokyo Daylight Time" -msgstr "" +msgstr "东京夏令时" #: tzres.rc:130 msgid "Line Islands Standard Time" -msgstr "" +msgstr "莱恩群岛标准时间" #: tzres.rc:131 msgid "Line Islands Daylight Time" -msgstr "" +msgstr "莱恩群岛夏令时" #: tzres.rc:122 msgid "Jordan Standard Time" -msgstr "" +msgstr "约旦标准时间" #: tzres.rc:123 msgid "Jordan Daylight Time" -msgstr "" +msgstr "约旦夏令时" #: tzres.rc:78 msgid "Central Standard Time" -msgstr "" +msgstr "中部标准时间" #: tzres.rc:79 msgid "Central Daylight Time" -msgstr "" +msgstr "中部夏令时" #: tzres.rc:50 msgid "Azores Standard Time" -msgstr "" +msgstr "亚速尔群岛标准时间" #: tzres.rc:51 msgid "Azores Daylight Time" -msgstr "" +msgstr "亚速尔群岛夏令时" #: tzres.rc:158 msgid "North Asia East Standard Time" -msgstr "" +msgstr "北亚东部标准时间" #: tzres.rc:159 msgid "North Asia East Daylight Time" -msgstr "" +msgstr "北亚东部夏令时" #: tzres.rc:40 msgid "Argentina Standard Time" -msgstr "" +msgstr "阿根廷标准时间" #: tzres.rc:41 msgid "Argentina Daylight Time" -msgstr "" +msgstr "阿根廷夏令时" #: tzres.rc:146 msgid "Myanmar Standard Time" -msgstr "" +msgstr "缅甸标准时间" #: tzres.rc:147 msgid "Myanmar Daylight Time" -msgstr "" +msgstr "缅甸夏令时" #: tzres.rc:210 tzres.rc:211 msgid "Coordinated Universal Time" -msgstr "" +msgstr "协调世界时" #: tzres.rc:116 msgid "India Standard Time" -msgstr "" +msgstr "印度标准时间" #: tzres.rc:117 msgid "India Daylight Time" -msgstr "" +msgstr "印度夏令时" #: tzres.rc:112 -#, fuzzy -#| msgid "&Standard bar" msgid "GTB Standard Time" -msgstr "标准栏(&S)" +msgstr "GTB 标准时间" #: tzres.rc:113 msgid "GTB Daylight Time" -msgstr "" +msgstr "GTB 夏令时" #: tzres.rc:202 msgid "Turkey Standard Time" -msgstr "" +msgstr "土耳其标准时间" #: tzres.rc:203 msgid "Turkey Daylight Time" -msgstr "" +msgstr "土耳其夏令时" #: tzres.rc:100 msgid "Fiji Standard Time" -msgstr "" +msgstr "斐济标准时间" #: tzres.rc:101 msgid "Fiji Daylight Time" -msgstr "" +msgstr "斐济夏令时" #: tzres.rc:58 msgid "Canada Central Standard Time" -msgstr "" +msgstr "加拿大中部标准时间" #: tzres.rc:59 msgid "Canada Central Daylight Time" -msgstr "" +msgstr "加拿大中部夏令时" #: tzres.rc:194 msgid "Taipei Standard Time" -msgstr "" +msgstr "台北标准时间" #: tzres.rc:195 msgid "Taipei Daylight Time" -msgstr "" +msgstr "台北夏令时" #: tzres.rc:220 msgid "W. Europe Standard Time" -msgstr "" +msgstr "西欧标准时间" #: tzres.rc:221 msgid "W. Europe Daylight Time" -msgstr "" +msgstr "西欧夏令时" #: tzres.rc:138 msgid "Montevideo Standard Time" -msgstr "" +msgstr "蒙得维的亚标准时间" #: tzres.rc:139 msgid "Montevideo Daylight Time" -msgstr "" +msgstr "蒙得维的亚夏令时" #: tzres.rc:168 msgid "Pakistan Standard Time" -msgstr "" +msgstr "巴基斯坦标准时间" #: tzres.rc:169 msgid "Pakistan Daylight Time" -msgstr "" +msgstr "巴基斯坦夏令时" #: tzres.rc:62 msgid "Caucasus Standard Time" -msgstr "" +msgstr "高加索标准时间" #: tzres.rc:63 msgid "Caucasus Daylight Time" -msgstr "" +msgstr "高加索夏令时" #: tzres.rc:46 msgid "AUS Eastern Standard Time" -msgstr "" +msgstr "澳大利亚东部标准时间" #: tzres.rc:47 msgid "AUS Eastern Daylight Time" -msgstr "" +msgstr "澳大利亚东部夏令时" #: tzres.rc:148 msgid "N. Central Asia Standard Time" -msgstr "" +msgstr "中北亚标准时间" #: tzres.rc:149 msgid "N. Central Asia Daylight Time" -msgstr "" +msgstr "中北亚夏令时" #: tzres.rc:94 msgid "Eastern Standard Time" -msgstr "" +msgstr "东部标准时间" #: tzres.rc:95 msgid "Eastern Daylight Time" -msgstr "" +msgstr "东部夏令时" #: tzres.rc:80 msgid "Central Standard Time (Mexico)" -msgstr "" +msgstr "中部标准时间（墨西哥）" #: tzres.rc:81 msgid "Central Daylight Time (Mexico)" -msgstr "" +msgstr "中部夏令时（墨西哥）" #: tzres.rc:42 msgid "Atlantic Standard Time" -msgstr "" +msgstr "大西洋标准时间" #: tzres.rc:43 msgid "Atlantic Daylight Time" -msgstr "" +msgstr "大西洋夏令时" #: tzres.rc:142 msgid "Mountain Standard Time" -msgstr "" +msgstr "山地标准时间" #: tzres.rc:143 msgid "Mountain Daylight Time" -msgstr "" +msgstr "山地夏令时" #: tzres.rc:206 msgid "US Eastern Standard Time" -msgstr "" +msgstr "美国东部标准时间" #: tzres.rc:207 msgid "US Eastern Daylight Time" -msgstr "" +msgstr "美国东部夏令时" #: tzres.rc:196 msgid "Tasmania Standard Time" -msgstr "" +msgstr "塔斯马尼亚标准时间" #: tzres.rc:197 msgid "Tasmania Daylight Time" -msgstr "" +msgstr "塔斯马尼亚夏令时" #: tzres.rc:66 msgid "Central America Standard Time" -msgstr "" +msgstr "中美洲标准时间" #: tzres.rc:67 msgid "Central America Daylight Time" -msgstr "" +msgstr "中美洲夏令时" #: tzres.rc:208 msgid "US Mountain Standard Time" -msgstr "" +msgstr "美国山地标准时间" #: tzres.rc:209 msgid "US Mountain Daylight Time" -msgstr "" +msgstr "美国山地夏令时" #: tzres.rc:188 msgid "South Africa Standard Time" -msgstr "" +msgstr "南非标准时间" #: tzres.rc:189 msgid "South Africa Daylight Time" -msgstr "" +msgstr "南非夏令时" #: tzres.rc:64 msgid "Cen. Australia Standard Time" -msgstr "" +msgstr "澳大利亚中部标准时间" #: tzres.rc:65 msgid "Cen. Australia Daylight Time" -msgstr "" +msgstr "澳大利亚中部夏令时" #: tzres.rc:190 msgid "Sri Lanka Standard Time" -msgstr "" +msgstr "斯里兰卡标准时间" #: tzres.rc:191 msgid "Sri Lanka Daylight Time" -msgstr "" +msgstr "斯里兰卡夏令时" #: tzres.rc:30 msgid "Afghanistan Standard Time" -msgstr "" +msgstr "阿富汗标准时间" #: tzres.rc:31 msgid "Afghanistan Daylight Time" -msgstr "" +msgstr "阿富汗夏令时" #: tzres.rc:226 msgid "Yakutsk Standard Time" -msgstr "" +msgstr "雅库次克标准时间" #: tzres.rc:227 msgid "Yakutsk Daylight Time" -msgstr "" +msgstr "雅库次克夏令时" #: tzres.rc:176 msgid "SA Eastern Standard Time" -msgstr "" +msgstr "南美东部标准时间" #: tzres.rc:177 msgid "SA Eastern Daylight Time" -msgstr "" +msgstr "南美东部夏令时" #: tzres.rc:34 msgid "Arab Standard Time" -msgstr "" +msgstr "阿拉伯标准时间" #: tzres.rc:35 msgid "Arab Daylight Time" -msgstr "" +msgstr "阿拉伯夏令时" #: tzres.rc:36 msgid "Arabian Standard Time" -msgstr "" +msgstr "阿拉伯标准时间" #: tzres.rc:37 msgid "Arabian Daylight Time" -msgstr "" +msgstr "阿拉伯夏令时" #: tzres.rc:174 msgid "Russian Standard Time" -msgstr "" +msgstr "俄罗斯标准时间" #: tzres.rc:175 msgid "Russian Daylight Time" -msgstr "" +msgstr "俄罗斯夏令时" #: tzres.rc:172 msgid "Romance Standard Time" -msgstr "" +msgstr "罗曼标准时间" #: tzres.rc:173 msgid "Romance Daylight Time" -msgstr "" +msgstr "罗曼夏令时" #: tzres.rc:98 msgid "Ekaterinburg Standard Time" -msgstr "" +msgstr "叶卡捷琳堡标准时间" #: tzres.rc:99 msgid "Ekaterinburg Daylight Time" -msgstr "" +msgstr "叶卡捷琳堡夏令时" #: tzres.rc:192 msgid "Syria Standard Time" -msgstr "" +msgstr "叙利亚标准时间" #: tzres.rc:193 msgid "Syria Daylight Time" -msgstr "" +msgstr "叙利亚夏令时" #: tzres.rc:44 msgid "AUS Central Standard Time" -msgstr "" +msgstr "澳大利亚中部标准时间" #: tzres.rc:45 msgid "AUS Central Daylight Time" -msgstr "" +msgstr "澳大利亚中部夏令时" #: tzres.rc:110 msgid "Greenwich Standard Time" -msgstr "" +msgstr "格林威治标准时间" #: tzres.rc:111 msgid "Greenwich Daylight Time" -msgstr "" +msgstr "格林威治夏令时" #: tzres.rc:204 msgid "Ulaanbaatar Standard Time" -msgstr "" +msgstr "乌兰巴托标准时间" #: tzres.rc:205 msgid "Ulaanbaatar Daylight Time" -msgstr "" +msgstr "乌兰巴托夏令时" #: tzres.rc:120 msgid "Israel Standard Time" -msgstr "" +msgstr "以色列标准时间" #: tzres.rc:121 msgid "Israel Daylight Time" -msgstr "" +msgstr "以色列夏令时" #: tzres.rc:54 msgid "Bangladesh Standard Time" -msgstr "" +msgstr "孟加拉标准时间" #: tzres.rc:55 msgid "Bangladesh Daylight Time" -msgstr "" +msgstr "孟加拉夏令时" #: tzres.rc:178 msgid "SA Pacific Standard Time" -msgstr "" +msgstr "南美太平洋标准时间" #: tzres.rc:179 msgid "SA Pacific Daylight Time" -msgstr "" +msgstr "南美太平洋夏令时" #: tzres.rc:222 msgid "West Asia Standard Time" -msgstr "" +msgstr "西亚标准时间" #: tzres.rc:223 msgid "West Asia Daylight Time" -msgstr "" +msgstr "西亚夏令时" #: tzres.rc:32 msgid "Alaskan Standard Time" -msgstr "" +msgstr "阿拉斯加标准时间" #: tzres.rc:33 msgid "Alaskan Daylight Time" -msgstr "" +msgstr "阿拉斯加夏令时" #: tzres.rc:170 msgid "Paraguay Standard Time" -msgstr "" +msgstr "巴拉圭标准时间" #: tzres.rc:171 msgid "Paraguay Daylight Time" -msgstr "" +msgstr "巴拉圭夏令时" #: tzres.rc:84 -#, fuzzy -#| msgid "Date and time" msgid "Dateline Standard Time" -msgstr "日期和时间" +msgstr "日期变更线标准时间" #: tzres.rc:85 msgid "Dateline Daylight Time" -msgstr "" +msgstr "日期变更线夏令时" #: tzres.rc:128 msgid "Libya Standard Time" -msgstr "" +msgstr "利比亚标准时间" #: tzres.rc:129 msgid "Libya Daylight Time" -msgstr "" +msgstr "利比亚夏令时" #: tzres.rc:52 msgid "Bahia Standard Time" -msgstr "" +msgstr "巴伊亚标准时间" #: tzres.rc:53 msgid "Bahia Daylight Time" -msgstr "" +msgstr "巴伊亚夏令时" #: tzres.rc:212 msgid "Venezuela Standard Time" -msgstr "" +msgstr "委内瑞拉标准时间" #: tzres.rc:213 msgid "Venezuela Daylight Time" -msgstr "" +msgstr "委内瑞拉夏令时" #: tzres.rc:114 msgid "Hawaiian Standard Time" -msgstr "" +msgstr "夏威夷标准时间" #: tzres.rc:115 msgid "Hawaiian Daylight Time" -msgstr "" +msgstr "夏威夷夏令时" #: tzres.rc:184 msgid "SE Asia Standard Time" -msgstr "" +msgstr "东南亚标准时间" #: tzres.rc:185 msgid "SE Asia Daylight Time" -msgstr "" +msgstr "东南亚夏令时" #: tzres.rc:154 msgid "New Zealand Standard Time" -msgstr "" +msgstr "新西兰标准时间" #: tzres.rc:155 msgid "New Zealand Daylight Time" -msgstr "" +msgstr "新西兰夏令时" #: tzres.rc:70 msgid "Central Brazilian Standard Time" -msgstr "" +msgstr "巴西中部标准时间" #: tzres.rc:71 msgid "Central Brazilian Daylight Time" -msgstr "" +msgstr "巴西中部夏令时" #: tzres.rc:56 msgid "Belarus Standard Time" -msgstr "" +msgstr "白罗斯标准时间" #: tzres.rc:57 msgid "Belarus Daylight Time" -msgstr "" +msgstr "白罗斯夏令时" #: tzres.rc:180 msgid "SA Western Standard Time" -msgstr "" +msgstr "南美西部标准时间" #: tzres.rc:181 msgid "SA Western Daylight Time" -msgstr "" +msgstr "南美西部夏令时" #: tzres.rc:108 msgid "Greenland Standard Time" -msgstr "" +msgstr "格陵兰标准时间" #: tzres.rc:109 msgid "Greenland Daylight Time" -msgstr "" +msgstr "格陵兰夏令时" #: tzres.rc:92 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Standard Time" -msgstr "日期和时间" +msgstr "复活节岛标准时间" #: tzres.rc:93 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Daylight Time" -msgstr "日期和时间" +msgstr "复活节岛夏令时" #: tzres.rc:96 msgid "Egypt Standard Time" -msgstr "" +msgstr "埃及标准时间" #: tzres.rc:97 msgid "Egypt Daylight Time" -msgstr "" +msgstr "埃及夏令时" #: tzres.rc:134 msgid "Mauritius Standard Time" -msgstr "" +msgstr "毛里求斯标准时间" #: tzres.rc:135 msgid "Mauritius Daylight Time" -msgstr "" +msgstr "毛里求斯夏令时" #: tzres.rc:214 msgid "Vladivostok Standard Time" -msgstr "" +msgstr "符拉迪沃斯托克标准时间" #: tzres.rc:215 msgid "Vladivostok Daylight Time" -msgstr "" +msgstr "符拉迪沃斯托克夏令时" #: tzres.rc:186 msgid "Singapore Standard Time" -msgstr "" +msgstr "新加坡标准时间" #: tzres.rc:187 msgid "Singapore Daylight Time" -msgstr "" +msgstr "新加坡夏令时" #: tzres.rc:126 msgid "Korea Standard Time" -msgstr "" +msgstr "韩国标准时间" #: tzres.rc:127 msgid "Korea Daylight Time" -msgstr "" +msgstr "韩国夏令时" #: tzres.rc:86 msgid "E. Africa Standard Time" -msgstr "" +msgstr "东非标准时间" #: tzres.rc:87 msgid "E. Africa Daylight Time" -msgstr "" +msgstr "东非夏令时" #: tzres.rc:102 -#, fuzzy -#| msgid "&Standard bar" msgid "FLE Standard Time" -msgstr "标准栏(&S)" +msgstr "FLE 标准时间" #: tzres.rc:103 msgid "FLE Daylight Time" -msgstr "" +msgstr "FLE 夏令时" #: tzres.rc:90 msgid "E. South America Standard Time" -msgstr "" +msgstr "东南美洲标准时间" #: tzres.rc:91 msgid "E. South America Daylight Time" -msgstr "" +msgstr "东南美洲夏令时" #: tzres.rc:76 msgid "Central Pacific Standard Time" -msgstr "" +msgstr "中太平洋标准时间" #: tzres.rc:77 msgid "Central Pacific Daylight Time" -msgstr "" +msgstr "中太平洋夏令时" #: tzres.rc:218 msgid "W. Central Africa Standard Time" -msgstr "" +msgstr "西中非标准时间" #: tzres.rc:219 msgid "W. Central Africa Daylight Time" -msgstr "" +msgstr "西中非夏令时" #: tzres.rc:162 msgid "Pacific SA Standard Time" -msgstr "" +msgstr "太平洋南美标准时间" #: tzres.rc:163 msgid "Pacific SA Daylight Time" -msgstr "" +msgstr "太平洋南美夏令时" #: tzres.rc:88 msgid "E. Australia Standard Time" -msgstr "" +msgstr "澳大利亚东部标准时间" #: tzres.rc:89 msgid "E. Australia Daylight Time" -msgstr "" +msgstr "澳大利亚东部夏令时" #: tzres.rc:216 msgid "W. Australia Standard Time" -msgstr "" +msgstr "澳大利亚西部标准时间" #: tzres.rc:217 msgid "W. Australia Daylight Time" -msgstr "" +msgstr "澳大利亚西部夏令时" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" -- 2.19.2

1 0

[PATCH] po: Add Sinhala translation.
by Isira Seneviratne Dec. 24, 2018

Dec. 24, 2018

1 0

[PATCH] shell32/autocomplete: Always expand if the enumerator was reset
by Gabriel Ivăncescu Dec. 24, 2018

Dec. 24, 2018

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Fixes a small and rare issue. This reuses the existing code for minimal changes. A simple test has been included in the patch because it was small enough. dlls/shell32/autocomplete.c | 8 +++++++- dlls/shell32/tests/autocomplete.c | 19 +++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 6c013a8..2cf5588 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -435,12 +435,18 @@ static BOOL aclist_expand(IAutoCompleteImpl *ac, WCHAR *txt) { /* call IACList::Expand only when needed, if the new txt and old_txt require different expansions */ - WCHAR c, *p, *last_delim, *old_txt = ac->txtbackup; + static const WCHAR empty[] = { 0 }; + + const WCHAR *old_txt = ac->txtbackup; + WCHAR c, *p, *last_delim; size_t i = 0; /* '/' is allowed as a delim for unix paths */ static const WCHAR delims[] = { '\\', '/', 0 }; + /* always expand if the enumerator was reset */ + if (!ac->enum_strs) old_txt = empty; + /* skip the shared prefix */ while ((c = tolowerW(txt[i])) == tolowerW(old_txt[i])) { diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 0da164b..b06d652 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -494,7 +494,7 @@ static void check_dropdown_(const char *file, UINT line, IAutoCompleteDropDown * } } -static void test_aclist_expand(HWND hwnd_edit, void *enumerator) +static void test_aclist_expand(HWND hwnd_edit, void *enumerator, IAutoCompleteDropDown *acdropdown) { struct string_enumerator *obj = (struct string_enumerator*)enumerator; static WCHAR str1[] = {'t','e','s','t',0}; @@ -502,6 +502,7 @@ static void test_aclist_expand(HWND hwnd_edit, void *enumerator) static WCHAR str2[] = {'t','e','s','t','\\','f','o','o','\\','b','a','r','\\','b','a',0}; static WCHAR str2a[] = {'t','e','s','t','\\','f','o','o','\\','b','a','r','\\',0}; static WCHAR str2b[] = {'t','e','s','t','\\','f','o','o','\\','b','a','r','\\','b','a','z','_','b','b','q','\\',0}; + HRESULT hr; obj->num_resets = 0; ok(obj->num_expand == 0, "Expected 0 expansions, got %u\n", obj->num_expand); @@ -546,6 +547,20 @@ static void test_aclist_expand(HWND hwnd_edit, void *enumerator) dispatch_messages(); ok(obj->num_expand == 4, "Expected 4 expansions, got %u\n", obj->num_expand); ok(obj->num_resets == 5, "Expected 5 resets, got %u\n", obj->num_resets); + SendMessageW(hwnd_edit, WM_SETTEXT, 0, (LPARAM)str1a); + SendMessageW(hwnd_edit, EM_SETSEL, ARRAY_SIZE(str1a) - 1, ARRAY_SIZE(str1a) - 1); + SendMessageW(hwnd_edit, WM_CHAR, 'f', 1); + dispatch_messages(); + ok(obj->num_expand == 5, "Expected 5 expansions, got %u\n", obj->num_expand); + ok(lstrcmpW(obj->last_expand, str1a) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str1a), wine_dbgstr_w(obj->last_expand)); + ok(obj->num_resets == 6, "Expected 6 resets, got %u\n", obj->num_resets); + hr = IAutoCompleteDropDown_ResetEnumerator(acdropdown); + ok(hr == S_OK, "IAutoCompleteDropDown_ResetEnumerator failed: %x\n", hr); + SendMessageW(hwnd_edit, WM_CHAR, 'o', 1); + dispatch_messages(); + ok(obj->num_expand == 6, "Expected 6 expansions, got %u\n", obj->num_expand); + ok(lstrcmpW(obj->last_expand, str1a) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str1a), wine_dbgstr_w(obj->last_expand)); + ok(obj->num_resets == 7, "Expected 7 resets, got %u\n", obj->num_resets); } static void test_prefix_filtering(HWND hwnd_edit) @@ -775,7 +790,7 @@ static void test_custom_source(void) SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); ok(lstrcmpW(str_aut, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str_aut), wine_dbgstr_w(buffer)); - test_aclist_expand(hwnd_edit, enumerator); + test_aclist_expand(hwnd_edit, enumerator, acdropdown); obj->num_resets = 0; hr = IAutoCompleteDropDown_ResetEnumerator(acdropdown); -- 2.19.1

1 0

[PATCH] shell32/autocomplete: Don't autoappend on Paste if ACO_AUTOAPPEND is off
by Gabriel Ivăncescu Dec. 24, 2018

Dec. 24, 2018

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Fixes a minor issue. dlls/shell32/autocomplete.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 6c013a8..679ec29 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -761,7 +761,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, return ret; case WM_PASTE: ret = CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); - autocomplete_text(This, hwnd, autoappend_flag_yes); + autocomplete_text(This, hwnd, (This->options & ACO_AUTOAPPEND) + ? autoappend_flag_yes : autoappend_flag_no); return ret; case WM_MOUSEWHEEL: if ((This->options & ACO_AUTOSUGGEST) && IsWindowVisible(This->hwndListBox)) -- 2.19.1

1 0

[PATCH] po: Add Sinhala translation.
by Isira Seneviratne Dec. 24, 2018

Dec. 24, 2018

2 1

[PATCH] po: Add Sinhala translation.
by Isira Seneviratne Dec. 24, 2018

Dec. 24, 2018

2 1

Re: [PATCH 3/3] po: Add Sinhala translation.
by Marvin Dec. 23, 2018

Dec. 23, 2018

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=45915 Your paranoid android. === debian9 (build log) === Makefile:231: recipe for target 'appwiz.res' failed Makefile:8648: recipe for target 'dlls/appwiz.cpl' failed Makefile:528: recipe for target 'avifil32.res' failed Makefile:8648: recipe for target 'dlls/avifil32' failed Makefile:372: recipe for target 'browseui.res' failed Makefile:8648: recipe for target 'dlls/browseui' failed Task: The win32 build failed === debian9 (build log) === Makefile:230: recipe for target 'appwiz.res' failed Makefile:8371: recipe for target 'dlls/appwiz.cpl' failed Makefile:367: recipe for target 'browseui.res' failed Makefile:8371: recipe for target 'dlls/browseui' failed Makefile:519: recipe for target 'avifil32.res' failed Makefile:8371: recipe for target 'dlls/avifil32' failed Task: The wow64 build failed

1 0

[PATCH 2/3] po: Add Sinhala translation.
by Isira Seneviratne Dec. 23, 2018

Dec. 23, 2018

2 1