January 2019 - Wine-Devel - list.winehq.org

[PATCH v3 2/8] propsys: Implement PSCreateMemoryPropertyStore().
by Jactry Zeng Jan. 6, 2019

Jan. 6, 2019

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.20.1

1 0

[PATCH v3 1/8] ole32/tests: Test PropVariantCopy() with VT_UNKNOWN.
by Jactry Zeng Jan. 6, 2019

Jan. 6, 2019

Superseded patch 156309 to 156314. ChangLog: v3: - Fix tests failures on Windows. 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.20.1

1 0

[PATCH] gdiplus/tests: Add some missing return value checks (Coverity).
by Nikolay Sivov Jan. 6, 2019

Jan. 6, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/tests/font.c | 3 ++- dlls/gdiplus/tests/graphics.c | 36 +++++++++++++++++++++++------------ dlls/gdiplus/tests/image.c | 2 +- dlls/gdiplus/tests/region.c | 9 ++++++--- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 0a3a3bef79..03e7a04e08 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -159,7 +159,8 @@ static void test_createfont(void) expect(Ok, stat); GdipGetFontSize (font, &size); ok (size == 24, "Expected 24, got %f (with unit: %d)\n", size, i); - GdipGetFontUnit (font, &unit); + stat = GdipGetFontUnit (font, &unit); + ok (stat == Ok, "Failed to get font unit, %d.\n", stat); expect (i, unit); GdipDeleteFont(font); } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index b0e3d8232b..f2ff589ab5 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -347,7 +347,8 @@ static void test_save_restore(void) log_state(state_a, &state_log); /* A state created by BeginContainer cannot be restored with RestoreGraphics. */ - GdipCreateFromHDC(hdc, &graphics1); + stat = GdipCreateFromHDC(hdc, &graphics1); + expect(Ok, stat); GdipSetInterpolationMode(graphics1, InterpolationModeBilinear); stat = GdipBeginContainer2(graphics1, &state_a); expect(Ok, stat); @@ -703,7 +704,8 @@ static void test_BeginContainer2(void) GdipGetTextContrast(graphics, &contrast); ok(defContrast == contrast, "Expected Text Contrast to be restored to %d, got %d\n", defContrast, contrast); - GdipGetTextRenderingHint(graphics, &texthint); + status = GdipGetTextRenderingHint(graphics, &texthint); + expect(Ok, status); ok(defTexthint == texthint, "Expected Text Hint to be restored to %d, got %d\n", defTexthint, texthint); /* test world transform */ @@ -722,7 +724,8 @@ static void test_BeginContainer2(void) status = GdipCreateMatrix2(10, 20, 30, 40, 50, 60, &transform); expect(Ok, status); - GdipSetWorldTransform(graphics, transform); + status = GdipSetWorldTransform(graphics, transform); + expect(Ok, status); GdipDeleteMatrix(transform); transform = NULL; @@ -731,7 +734,8 @@ static void test_BeginContainer2(void) status = GdipCreateMatrix(&transform); expect(Ok, status); - GdipGetWorldTransform(graphics, transform); + status = GdipGetWorldTransform(graphics, transform); + expect(Ok, status); status = GdipGetMatrixElements(transform, elems); expect(Ok, status); ok(fabs(defTrans[0] - elems[0]) < 0.0001 && @@ -753,12 +757,14 @@ static void test_BeginContainer2(void) status = GdipBeginContainer2(graphics, &cont1); expect(Ok, status); - GdipSetClipRect(graphics, defClip[0], defClip[1], defClip[2], defClip[3], CombineModeReplace); + status = GdipSetClipRect(graphics, defClip[0], defClip[1], defClip[2], defClip[3], CombineModeReplace); + expect(Ok, status); status = GdipBeginContainer2(graphics, &cont2); expect(Ok, status); - GdipSetClipRect(graphics, 2, 4, 6, 8, CombineModeReplace); + status = GdipSetClipRect(graphics, 2, 4, 6, 8, CombineModeReplace); + expect(Ok, status); status = GdipEndContainer(graphics, cont2); expect(Ok, status); @@ -6572,12 +6578,18 @@ static void test_GdipFillRectanglesOnBitmapTextureBrush(void) GdipDeleteBrush((GpBrush*)brush); GdipDeleteGraphics(graphics); - GdipBitmapGetPixel(dst_img.bitmap, 0, 0, &color[0]); - GdipBitmapGetPixel(dst_img.bitmap, 0, 1, &color[1]); - GdipBitmapGetPixel(dst_img.bitmap, 1, 0, &color[2]); - GdipBitmapGetPixel(dst_img.bitmap, width/2, 0, &color[3]); - GdipBitmapGetPixel(dst_img.bitmap, width/2, height/2, &color[4]); - GdipBitmapGetPixel(dst_img.bitmap, 0, height/2, &color[5]); + status = GdipBitmapGetPixel(dst_img.bitmap, 0, 0, &color[0]); + expect(Ok, status); + status = GdipBitmapGetPixel(dst_img.bitmap, 0, 1, &color[1]); + expect(Ok, status); + status = GdipBitmapGetPixel(dst_img.bitmap, 1, 0, &color[2]); + expect(Ok, status); + status = GdipBitmapGetPixel(dst_img.bitmap, width/2, 0, &color[3]); + expect(Ok, status); + status = GdipBitmapGetPixel(dst_img.bitmap, width/2, height/2, &color[4]); + expect(Ok, status); + status = GdipBitmapGetPixel(dst_img.bitmap, 0, height/2, &color[5]); + expect(Ok, status); ok(is_blue_color(color[0]) && is_blue_color(color[1]) && is_blue_color(color[2]) && color[3] == 0 && color[4] == 0 && color[5] == 0, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b31f32e1fa..72a984a2ea 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2717,7 +2717,7 @@ static void test_multiframegif(void) expect(Ok, stat); color = 0xdeadbeef; - GdipBitmapGetPixel(bmp, 0, 0, &color); + stat = GdipBitmapGetPixel(bmp, 0, 0, &color); expect(Ok, stat); expect(0xff000000, color); diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index c2cbff01f6..d69f09db60 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -814,7 +814,8 @@ static void test_isinfinite(void) status = GdipCreateFromHDC(hdc, &graphics); expect(Ok, status); - GdipCreateRegion(&region); + status = GdipCreateRegion(&region); + expect(Ok, status); GdipCreateMatrix2(3.0, 0.0, 0.0, 1.0, 20.0, 30.0, &m); @@ -860,7 +861,8 @@ static void test_isempty(void) status = GdipCreateFromHDC(hdc, &graphics); expect(Ok, status); - GdipCreateRegion(&region); + status = GdipCreateRegion(&region); + expect(Ok, status); /* NULL arguments */ status = GdipIsEmptyRegion(NULL, NULL, NULL); @@ -1779,7 +1781,8 @@ static void test_getbounds(void) ok(rectf.Height == 100.0, "Expected height = 0.0, got %.2f\n", rectf.Height); /* the world and page transforms are ignored */ - GdipScaleWorldTransform(graphics, 2.0, 2.0, MatrixOrderPrepend); + status = GdipScaleWorldTransform(graphics, 2.0, 2.0, MatrixOrderPrepend); + ok(status == Ok, "status %08x\n", status); GdipSetPageUnit(graphics, UnitInch); GdipSetPageScale(graphics, 2.0); status = GdipGetRegionBounds(region, graphics, &rectf); -- 2.20.1

1 0

[PATCH] user32: Fix a memory leak.
by Zhiyi Zhang Jan. 6, 2019

Jan. 6, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/rawinput.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index cf3028a4ec..088e50da4e 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -172,6 +172,7 @@ static void find_hid_devices(void) done: LeaveCriticalSection(&hid_devices_cs); + SetupDiDestroyDeviceInfoList(set); heap_free(detail); } -- 2.19.2

2 1

[PATCH] user32: Check invalid handle in GetRawInputData.
by Zhiyi Zhang Jan. 6, 2019

Jan. 6, 2019

Fix https://github.com/ValveSoftware/Proton/issues/2040. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/rawinput.c | 3 +++ dlls/user32/tests/input.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index cf3028a4ec..4bfccdfb84 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -281,6 +281,9 @@ UINT WINAPI GetRawInputData(HRAWINPUT rawinput, UINT command, void *data, UINT * TRACE("rawinput %p, command %#x, data %p, data_size %p, header_size %u.\n", rawinput, command, data, data_size, header_size); + if (!ri) + return ~0U; + if (header_size != sizeof(RAWINPUTHEADER)) { WARN("Invalid structure size %u.\n", header_size); diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 14fd5f8f77..ffdd4b7137 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1530,6 +1530,16 @@ static void test_GetRawInputDeviceList(void) ok(odevcount == oret, "expected %d, got %d\n", oret, odevcount); } +static void test_GetRawInputData(void) +{ + UINT size; + UINT ret; + + /* Null raw input handle */ + ret = GetRawInputData(NULL, RID_INPUT, NULL, &size, sizeof(RAWINPUTHEADER)); + ok(ret == ~0U, "Expect ret %u, got %u\n", ~0U, ret); +} + static void test_key_map(void) { HKL kl = GetKeyboardLayout(0); @@ -2697,6 +2707,7 @@ START_TEST(input) test_attach_input(); test_GetKeyState(); test_OemKeyScan(); + test_GetRawInputData(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx(); -- 2.19.2

2 1

[PATCH] wtsapi32/tests: Add WTSQueryUserToken parameter test.
by Gijs Vermeulen Jan. 6, 2019

Jan. 6, 2019

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/wtsapi32/tests/wtsapi.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) This is for the staging patchset wtsapi32-WTSQueryUserToken. diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 341d9e605f..c24bd491a7 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -105,8 +105,20 @@ static void test_WTSQuerySessionInformationW(void) WTSFreeMemory(buf); } +static void test_WTSQueryUserToken(void) +{ + BOOL ret; + + SetLastError(0xdeadbeef); + ret = WTSQueryUserToken(WTS_CURRENT_SESSION, NULL); + ok(!ret, "expected WTSQueryUserToken to fail\n"); + todo_wine + ok(GetLastError()==ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); +} + START_TEST (wtsapi) { test_WTSEnumerateProcessesW(); test_WTSQuerySessionInformationW(); + test_WTSQueryUserToken(); } -- 2.20.1

1 0

[PATCH] po: Update Sinhala translation
by Isira Seneviratne Jan. 5, 2019

Jan. 5, 2019

1 0

[PATCH] po/pt_BR: Translation of newly added messages
by Roberto Pungartnik Jan. 5, 2019

Jan. 5, 2019

1 0

[PATCH v2] kernel32: properly handle FindFirstFileEx flags
by Dorian Wouters Jan. 4, 2019

Jan. 4, 2019

- Implement FIND_FIRST_EX_CASE_SENSITIVE behaviour - Silently ignore FIND_FIRST_EX_LARGE_FETCH as it is of no consequence - Warn on use of unimplemented FIND_FIRST_EX_ON_DISK_ENTRIES_ONLY * #define its flag constant in winbase.h - Fail with ERROR_INVALID_PARAMETER on unknown flags Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36946 Signed-off-by: Dorian Wouters <dorian(a)elementw.net> --- Change test requirements related to FIND_FIRST_EX_CASE_SENSITIVE dlls/kernel32/file.c | 16 ++++++++++++++-- dlls/kernel32/tests/file.c | 10 +++++++++- include/winbase.h | 5 +++-- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 3214d724cb..7ca534f59c 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1964,9 +1964,16 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, TRACE("%s %d %p %d %p %x\n", debugstr_w(filename), level, data, search_op, filter, flags); - if (flags != 0) + if (flags & ~(FIND_FIRST_EX_CASE_SENSITIVE | FIND_FIRST_EX_LARGE_FETCH | + FIND_FIRST_EX_ON_DISK_ENTRIES_ONLY)) { FIXME("flags not implemented 0x%08x\n", flags ); + SetLastError( ERROR_INVALID_PARAMETER ); + return INVALID_HANDLE_VALUE; + } + if (flags & FIND_FIRST_EX_ON_DISK_ENTRIES_ONLY) + { + FIXME("FIND_FIRST_EX_ON_DISK_ENTRIES_ONLY not implemented"); } if (search_op != FindExSearchNameMatch && search_op != FindExSearchLimitToDirectories) { @@ -2043,7 +2050,12 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, attr.Length = sizeof(attr); attr.RootDirectory = 0; - attr.Attributes = OBJ_CASE_INSENSITIVE; + /* + * FIND_FIRST_EX_CASE_SENSITIVE should only work if HKLM\SYSTEM\CurrentControlSet\ + * Control\Session Manager\kernel\obcaseinsensitive is set to 0. Assume the application + * actually supports case sensitive lookups since it asked for it explicitly. + */ + attr.Attributes = (flags & FIND_FIRST_EX_CASE_SENSITIVE) ? 0 : OBJ_CASE_INSENSITIVE; attr.ObjectName = &nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index d1b76bb711..eae62fd646 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2739,7 +2739,7 @@ static void test_FindFirstFileExA(FINDEX_INFO_LEVELS level, FINDEX_SEARCH_OPS se _lclose(_lcreat("test-dir\\file2", 0)); CreateDirectoryA("test-dir\\dir1", NULL); SetLastError(0xdeadbeef); - handle = pFindFirstFileExA("test-dir\\*", level, &search_results, search_ops, NULL, flags); + handle = pFindFirstFileExA("Test-dir\\*", level, &search_results, search_ops, NULL, flags); if (handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("FindFirstFileExA is not implemented\n"); @@ -2759,6 +2759,14 @@ static void test_FindFirstFileExA(FINDEX_INFO_LEVELS level, FINDEX_SEARCH_OPS se #define CHECK_NAME(fn) (strcmp((fn), "file1") == 0 || strcmp((fn), "file2") == 0 || strcmp((fn), "dir1") == 0) #define CHECK_LEVEL(fn) (level != FindExInfoBasic || !(fn)[0]) + if ((flags & FIND_FIRST_EX_CASE_SENSITIVE) && handle == INVALID_HANDLE_VALUE) + { + ok(GetLastError() == ERROR_PATH_NOT_FOUND, + "Case-sensitive FindFirstFile failed with non-PATH_NOT_FOUND (err=%u)\n", GetLastError()); + SetLastError(0xdeadbeef); + handle = pFindFirstFileExA("test-dir\\*", level, &search_results, search_ops, NULL, flags); + } + ok(handle != INVALID_HANDLE_VALUE, "FindFirstFile failed (err=%u)\n", GetLastError()); ok(strcmp(search_results.cFileName, ".") == 0, "First entry should be '.', is %s\n", search_results.cFileName); ok(CHECK_LEVEL(search_results.cAlternateFileName), "FindFirstFile unexpectedly returned an alternate filename\n"); diff --git a/include/winbase.h b/include/winbase.h index 20c73af319..3f5553ef24 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -292,8 +292,9 @@ typedef enum _FINDEX_INFO_LEVELS FindExInfoMaxInfoLevel } FINDEX_INFO_LEVELS; -#define FIND_FIRST_EX_CASE_SENSITIVE 1 -#define FIND_FIRST_EX_LARGE_FETCH 2 +#define FIND_FIRST_EX_CASE_SENSITIVE 1 +#define FIND_FIRST_EX_LARGE_FETCH 2 +#define FIND_FIRST_EX_ON_DISK_ENTRIES_ONLY 4 typedef enum _FINDEX_SEARCH_OPS { -- 2.19.2

1 0

[PATCH] wined3d: Recognise virgl.
by Henri Verbeet Jan. 4, 2019

Jan. 4, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 14 ++++++++++++++ dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 24 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2a3514a1bef..af0db3eec21 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1192,6 +1192,7 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in || strstr(gl_vendor_string, "DRI R300 Project") || strstr(gl_vendor_string, "Tungsten Graphics, Inc") || strstr(gl_vendor_string, "VMware, Inc.") + || strstr(gl_vendor_string, "Red Hat") || strstr(gl_vendor_string, "Intel") || strstr(gl_renderer, "Mesa") || strstr(gl_renderer, "Gallium") @@ -1232,6 +1233,10 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s || strstr(gl_vendor_string, "Intel Inc.")) return HW_VENDOR_INTEL; + if (strstr(gl_vendor_string, "Red Hat") + || strstr(gl_renderer, "virgl")) + return HW_VENDOR_REDHAT; + if (strstr(gl_renderer, "SVGA3D")) return HW_VENDOR_VMWARE; @@ -1790,6 +1795,10 @@ cards_nvidia_mesa[] = {"nv04", CARD_NVIDIA_RIVA_TNT}, {"nv03", CARD_NVIDIA_RIVA_128}, }, +cards_redhat[] = +{ + {"virgl", CARD_REDHAT_VIRGL}, +}, cards_vmware[] = { {"SVGA3D", CARD_VMWARE_SVGA3D}, @@ -1814,6 +1823,10 @@ nvidia_gl_vendor_table[] = {GL_VENDOR_MESA, "Mesa Nouveau driver", cards_nvidia_mesa, ARRAY_SIZE(cards_nvidia_mesa)}, {GL_VENDOR_NVIDIA, "NVIDIA binary driver", cards_nvidia_binary, ARRAY_SIZE(cards_nvidia_binary)}, }, +redhat_gl_vendor_table[] = +{ + {GL_VENDOR_MESA, "Red Hat driver", cards_redhat, ARRAY_SIZE(cards_redhat)}, +}, vmware_gl_vendor_table[] = { {GL_VENDOR_MESA, "VMware driver", cards_vmware, ARRAY_SIZE(cards_vmware)}, @@ -1860,6 +1873,7 @@ card_vendor_table[] = { {HW_VENDOR_AMD, "AMD", amd_gl_vendor_table, ARRAY_SIZE(amd_gl_vendor_table)}, {HW_VENDOR_NVIDIA, "NVIDIA", nvidia_gl_vendor_table, ARRAY_SIZE(nvidia_gl_vendor_table)}, + {HW_VENDOR_REDHAT, "Red Hat",redhat_gl_vendor_table, ARRAY_SIZE(redhat_gl_vendor_table)}, {HW_VENDOR_VMWARE, "VMware", vmware_gl_vendor_table, ARRAY_SIZE(vmware_gl_vendor_table)}, {HW_VENDOR_INTEL, "Intel", intel_gl_vendor_table, ARRAY_SIZE(intel_gl_vendor_table)}, }; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 544c76ed5c1..75622be80c4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -187,6 +187,9 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT6X, "nvd3dum.dll", 18, 13, 783}, {DRIVER_NVIDIA_GEFORCE8, DRIVER_MODEL_NT6X, "nvd3dum.dll", 18, 13, 4052}, + /* Red Hat */ + {DRIVER_REDHAT_VIRGL, DRIVER_MODEL_GENERIC, "virgl.dll", 0, 0, 0}, + /* VMware */ {DRIVER_VMWARE, DRIVER_MODEL_NT5X, "vm3dum.dll", 14, 1, 1134}, @@ -376,6 +379,9 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, + /* Red Hat */ + {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, + /* VMware */ {HW_VENDOR_VMWARE, CARD_VMWARE_SVGA3D, "VMware SVGA 3D (Microsoft Corporation - WDDM)", DRIVER_VMWARE, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6e39db4fa86..0df3f2ab2a5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2252,6 +2252,7 @@ enum wined3d_pci_vendor HW_VENDOR_AMD = 0x1002, HW_VENDOR_NVIDIA = 0x10de, HW_VENDOR_VMWARE = 0x15ad, + HW_VENDOR_REDHAT = 0x1af4, HW_VENDOR_INTEL = 0x8086, }; @@ -2435,6 +2436,8 @@ enum wined3d_pci_device CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_NVIDIA_TITANV = 0x1d81, + CARD_REDHAT_VIRGL = 0x1010, + CARD_VMWARE_SVGA3D = 0x0405, CARD_INTEL_830M = 0x3577, @@ -2623,6 +2626,7 @@ enum wined3d_display_driver DRIVER_NVIDIA_GEFORCEFX, DRIVER_NVIDIA_GEFORCE6, DRIVER_NVIDIA_GEFORCE8, + DRIVER_REDHAT_VIRGL, DRIVER_VMWARE, DRIVER_WINE, DRIVER_UNKNOWN, -- 2.11.0

1 0