April 2020 - Wine-devel - list.winehq.org

[PATCH] secur32: Add application protocol stubs for macOS.
by Hans Leidekker 10 Apr '20

10 Apr '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel_macosx.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index f86a561cf8d..d725c9d22c2 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -1194,6 +1194,18 @@ void schan_imp_free_certificate_credentials(schan_credentials *c) { } +void schan_imp_set_application_protocols(schan_imp_session session, unsigned char *buffer, unsigned int buflen) +{ + FIXME("no support for application protocols on this platform\n"); +} + +SECURITY_STATUS schan_imp_get_application_protocol(schan_imp_session session, + SecPkgContext_ApplicationProtocol *protocol) +{ + FIXME("no support for application protocols on this platform\n"); + return SEC_E_UNSUPPORTED_FUNCTION; +} + BOOL schan_imp_init(void) { TRACE("()\n"); -- 2.20.1

1 0

[PATCH 1/5] devenum: Don't bother creating the category key for codecs if there are no codecs to register.
by Zebediah Figura 10 Apr '20

10 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/createdevenum.c | 56 ------------------------------------ 1 file changed, 56 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 1ff045c2c58..c416ed1d848 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -52,7 +52,6 @@ static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a', static const WCHAR wszFilterData[] = {'F','i','l','t','e','r','D','a','t','a',0}; static ULONG WINAPI DEVENUM_ICreateDevEnum_AddRef(ICreateDevEnum * iface); -static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory); /********************************************************************** * DEVENUM_ICreateDevEnum_QueryInterface (also IUnknown) @@ -429,9 +428,6 @@ static void register_legacy_filters(void) hr = HRESULT_FROM_WIN32(lRet); } - if (SUCCEEDED(hr)) - hr = DEVENUM_CreateAMCategoryKey(&CLSID_LegacyAmFilterCategory); - if (SUCCEEDED(hr)) { for (i = 0; i < dwFilterSubkeys; i++) @@ -521,10 +517,6 @@ static BOOL CALLBACK register_dsound_devices(GUID *guid, const WCHAR *desc, cons VARIANT var; HRESULT hr; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) - return FALSE; - if (guid) { WCHAR *name = heap_alloc(sizeof(defaultW) + lstrlenW(desc) * sizeof(WCHAR)); @@ -580,9 +572,6 @@ static void register_waveout_devices(void) VARIANT var; HRESULT hr; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) return; - count = waveOutGetNumDevs(); for (i = -1; i < count; i++) @@ -629,9 +618,6 @@ static void register_wavein_devices(void) VARIANT var; HRESULT hr; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) return; - count = waveInGetNumDevs(); for (i = 0; i < count; i++) @@ -673,9 +659,6 @@ static void register_midiout_devices(void) VARIANT var; HRESULT hr; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) return; - count = midiOutGetNumDevs(); for (i = -1; i < count; i++) @@ -726,9 +709,6 @@ static void register_vfw_codecs(void) int i = 0; HIC hic; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) return; - while (ICInfo(ICTYPE_VIDEO, i++, &info)) { WCHAR name[5] = {LOBYTE(LOWORD(info.fccHandler)), HIBYTE(LOWORD(info.fccHandler)), @@ -786,10 +766,6 @@ static void register_avicap_devices(void) HRESULT hr; int i = 0; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_VideoInputDeviceCategory); - if (FAILED(hr)) - return; - for (i = 0; i < 10; ++i) { if (!capGetDriverDescriptionW(i, friendlyname, ARRAY_SIZE(friendlyname), @@ -898,35 +874,3 @@ static const ICreateDevEnumVtbl ICreateDevEnum_Vtbl = * static CreateDevEnum instance */ ICreateDevEnum DEVENUM_CreateDevEnum = { &ICreateDevEnum_Vtbl }; - -/********************************************************************** - * DEVENUM_CreateAMCategoryKey (INTERNAL) - * - * Creates a registry key for a category at HKEY_CURRENT_USER\Software\ - * Microsoft\ActiveMovie\devenum\{clsid} - */ -static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory) -{ - WCHAR wszRegKey[MAX_PATH]; - HRESULT res = S_OK; - HKEY hkeyDummy = NULL; - - lstrcpyW(wszRegKey, wszActiveMovieKey); - - if (!StringFromGUID2(clsidCategory, wszRegKey + lstrlenW(wszRegKey), ARRAY_SIZE(wszRegKey) - lstrlenW(wszRegKey))) - res = E_INVALIDARG; - - if (SUCCEEDED(res)) - { - LONG lRes = RegCreateKeyW(HKEY_CURRENT_USER, wszRegKey, &hkeyDummy); - res = HRESULT_FROM_WIN32(lRes); - } - - if (hkeyDummy) - RegCloseKey(hkeyDummy); - - if (FAILED(res)) - ERR("Failed to create key HKEY_CURRENT_USER\\%s\n", debugstr_w(wszRegKey)); - - return res; -} -- 2.26.0

2 6

[PATCH v2] gdiplus: Handle some degenerate cases with GdipCreatePath2.
by Jeff Smith 10 Apr '20

10 Apr '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- v2: - Check if points and types parameters are valid, and add some tests to exercise these. - Got rid of expectp macro. dlls/gdiplus/graphicspath.c | 24 ++++++- dlls/gdiplus/tests/graphicspath.c | 103 ++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 55545a449a..df6a32d22d 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1213,14 +1213,34 @@ GpStatus WINGDIPAPI GdipCreatePath(GpFillMode fill, GpPath **path) GpStatus WINGDIPAPI GdipCreatePath2(GDIPCONST GpPointF* points, GDIPCONST BYTE* types, INT count, GpFillMode fill, GpPath **path) { + int i; + TRACE("(%p, %p, %d, %d, %p)\n", points, types, count, fill, path); - if(!path) + if(!points || !types || !path) return InvalidParameter; + if(count <= 0) { + *path = NULL; + return OutOfMemory; + } + *path = heap_alloc_zero(sizeof(GpPath)); if(!*path) return OutOfMemory; + for(i = 1; i < count; i++) { + if((types[i] & PathPointTypePathTypeMask) == PathPointTypeBezier) { + if(i+2 < count && + (types[i+1] & PathPointTypePathTypeMask) == PathPointTypeBezier && + (types[i+2] & PathPointTypePathTypeMask) == PathPointTypeBezier) + i += 2; + else { + count = 0; + break; + } + } + } + (*path)->pathdata.Points = heap_alloc_zero(count * sizeof(PointF)); (*path)->pathdata.Types = heap_alloc_zero(count); @@ -1233,6 +1253,8 @@ GpStatus WINGDIPAPI GdipCreatePath2(GDIPCONST GpPointF* points, memcpy((*path)->pathdata.Points, points, count * sizeof(PointF)); memcpy((*path)->pathdata.Types, types, count); + if(count > 0) + (*path)->pathdata.Types[0] = PathPointTypeStart; (*path)->pathdata.Count = count; (*path)->datalen = count; diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 17e6a7cafb..1b3a9a161f 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -174,6 +174,108 @@ static void test_getpathdata(void) GdipDeletePath(path); } +static void test_createpath2(void) +{ + GpStatus status; + GpPath* path = NULL; + GpPathData data; + INT i, count, expect_count; + + PointF test_line_points[] = {{1.0,1.0}, {2.0,1.0}}; + BYTE test_line_types[] = {PathPointTypeStart, PathPointTypeLine}; + + PointF test_bez_points[] = {{1.0,1.0}, {2.0,1.0}, {3.0,1.0}, {4.0,1.0}, + {5.0,1.0}, {6.0,1.0}, {7.0,1.0}}; + BYTE test_bez_types[] = {PathPointTypeStart, PathPointTypeBezier, + PathPointTypeBezier, PathPointTypeBezier, PathPointTypeBezier, + PathPointTypeBezier, PathPointTypeBezier}; + + status = GdipCreatePath2(test_line_points, test_line_types, 2, FillModeAlternate, &path); + expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(2, count); + GdipDeletePath(path); + + status = GdipCreatePath2(test_line_points, test_line_types, 1, FillModeAlternate, &path); + expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(1, count); + GdipDeletePath(path); + + path = (void *)0xdeadbeef; + status = GdipCreatePath2(test_line_points, test_line_types, 0, FillModeAlternate, &path); + expect(OutOfMemory, status); + ok(!path, "Expected NULL, got %p\n", path); + if(path && path != (void *)0xdeadbeef) + GdipDeletePath(path); + + path = (void *)0xdeadbeef; + status = GdipCreatePath2(test_line_points, test_line_types, -1, FillModeAlternate, &path); + expect(OutOfMemory, status); + ok(!path, "Expected NULL, got %p\n", path); + if(path && path != (void *)0xdeadbeef) + GdipDeletePath(path); + + path = (void *)0xdeadbeef; + status = GdipCreatePath2(NULL, test_line_types, 2, FillModeAlternate, &path); + expect(InvalidParameter, status); + ok(path == (void *)0xdeadbeef, "Expected %p, got %p\n", (void *)0xdeadbeef, path); + if(path && path != (void *)0xdeadbeef) + GdipDeletePath(path); + + path = (void *)0xdeadbeef; + status = GdipCreatePath2(test_line_points, NULL, 2, FillModeAlternate, &path); + expect(InvalidParameter, status); + ok(path == (void *)0xdeadbeef, "Expected %p, got %p\n", (void *)0xdeadbeef, path); + if(path && path != (void *)0xdeadbeef) + GdipDeletePath(path); + + status = GdipCreatePath2(test_line_points, test_line_types, 2, FillModeAlternate, NULL); + expect(InvalidParameter, status); + + /* Zero-length line points do not get altered */ + path = NULL; + test_line_points[1].X = test_line_points[0].X; + test_line_points[1].Y = test_line_points[0].Y; + status = GdipCreatePath2(test_line_points, test_line_types, 2, FillModeAlternate, &path); + expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(2, count); + GdipDeletePath(path); + + /* The type of the first point is always converted to PathPointTypeStart */ + test_line_types[0] = PathPointTypeLine; + status = GdipCreatePath2(test_line_points, test_line_types, 1, FillModeAlternate, &path); + expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(1, count); + data.Count = count; + data.Types = GdipAlloc(sizeof(BYTE) * count); + data.Points = GdipAlloc(sizeof(PointF) * count); + status = GdipGetPathData(path, &data); + expect(Ok, status); + expect((data.Points[0].X == 1.0) && (data.Points[0].Y == 1.0), TRUE); + expect(data.Types[0], PathPointTypeStart); + GdipFree(data.Points); + GdipFree(data.Types); + GdipDeletePath(path); + + /* Bezier points must come in groups of three */ + for(i = 2; i <= 7; i++) { + expect_count = (i % 3 == 1) ? i : 0; + status = GdipCreatePath2(test_bez_points, test_bez_types, i, FillModeAlternate, &path); + expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(expect_count, count); + GdipDeletePath(path); + } +} + static path_test_t line2_path[] = { {0.0, 50.0, PathPointTypeStart, 0, 0}, /*0*/ {5.0, 45.0, PathPointTypeLine, 0, 0}, /*1*/ @@ -1663,6 +1765,7 @@ START_TEST(graphicspath) test_constructor_destructor(); test_getpathdata(); + test_createpath2(); test_line2(); test_arc(); test_worldbounds(); -- 2.23.0

2 2

[PATCH 4/4] dxgi: Implement dxgi_factory_CheckFeatureSupport().
by Henri Verbeet 10 Apr '20

10 Apr '20

From: Hans-Kristian Arntzen <post(a)arntzen-software.no> Some d3d12 games gate their use of sync interval 0 on support for DXGI_FEATURE_PRESENT_ALLOW_TEARING. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 183171; minor style changes only. Thank you Zhiyi. dlls/dxgi/factory.c | 15 +++++++++++++-- dlls/dxgi/tests/dxgi.c | 10 +++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 3f41df9e366..39c9e10f7a4 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -445,10 +445,21 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumWarpAdapter(IWineDXGIFactory * static HRESULT STDMETHODCALLTYPE dxgi_factory_CheckFeatureSupport(IWineDXGIFactory *iface, DXGI_FEATURE feature, void *feature_data, UINT data_size) { - FIXME("iface %p, feature %#x, feature_data %p, data_size %u stub!\n", + TRACE("iface %p, feature %#x, feature_data %p, data_size %u.\n", iface, feature, feature_data, data_size); - return E_NOTIMPL; + switch (feature) + { + case DXGI_FEATURE_PRESENT_ALLOW_TEARING: + if (data_size != sizeof(BOOL)) + return DXGI_ERROR_INVALID_CALL; + *(BOOL *)feature_data = TRUE; + return S_OK; + + default: + WARN("Unsupported feature %#x.\n", feature); + return DXGI_ERROR_INVALID_CALL; + } } static const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index cb6ef6c0ec6..3887982634f 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6164,7 +6164,7 @@ static void test_factory_check_feature_support(void) } hr = IDXGIFactory5_CheckFeatureSupport(factory, 0x12345678, (void *)&data, sizeof(data)); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); /* Crashes on Windows. */ if (0) @@ -6174,15 +6174,15 @@ static void test_factory_check_feature_support(void) } hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data) - 1); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data) + 1); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); data = (BOOL)0xdeadbeef; hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data)); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(data == TRUE || data == FALSE, "Got unexpected data %#x.\n", data); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data == TRUE || data == FALSE, "Got unexpected data %#x.\n", data); ref_count = IDXGIFactory5_Release(factory); ok(!ref_count, "Factory has %u references left.\n", ref_count); -- 2.20.1

1 0

[PATCH 3/4] dxgi/tests: Add a test for IDXGIFactory5 feature support queries.
by Henri Verbeet 10 Apr '20

10 Apr '20

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 183170; minor style changes only. Thank you Zhiyi. dlls/dxgi/tests/dxgi.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index b5dcd5b0dea..cb6ef6c0ec6 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6150,6 +6150,44 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } +static void test_factory_check_feature_support(void) +{ + IDXGIFactory5 *factory; + ULONG ref_count; + HRESULT hr; + BOOL data; + + if (FAILED(hr = CreateDXGIFactory(&IID_IDXGIFactory5, (void**)&factory))) + { + win_skip("IDXGIFactory5 is not available.\n"); + return; + } + + hr = IDXGIFactory5_CheckFeatureSupport(factory, 0x12345678, (void *)&data, sizeof(data)); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + /* Crashes on Windows. */ + if (0) + { + hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, NULL, sizeof(data)); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + } + + hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data) - 1); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data) + 1); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + data = (BOOL)0xdeadbeef; + hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data)); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(data == TRUE || data == FALSE, "Got unexpected data %#x.\n", data); + + ref_count = IDXGIFactory5_Release(factory); + ok(!ref_count, "Factory has %u references left.\n", ref_count); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -6242,6 +6280,7 @@ START_TEST(dxgi) queue_test(test_output_desc); queue_test(test_object_wrapping); queue_test(test_multi_adapter); + queue_test(test_factory_check_feature_support); run_queued_tests(); -- 2.20.1

1 0

[PATCH 2/4] wined3d: Use GL_APPLE_flush_render and GL_APPLE_rgb_422 to detect Apple OpenGL.
by Henri Verbeet 10 Apr '20

10 Apr '20

From: Chip Davis <cdavis(a)codeweavers.com> In addition to the existing GL_APPLE_ycbcr_422. Core contexts on Mac OS don't advertise GL_APPLE_fence or GL_APPLE_ycbcr_422... but they do have GL_APPLE_flush_render and GL_APPLE_rgb_422. So, go back to using GL_APPLE_flush_render in our OS X detection, and accept GL_APPLE_rgb_422 in addition to GL_APPLE_ycbcr_422. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 183133. dlls/wined3d/adapter_gl.c | 5 ++++- dlls/wined3d/wined3d_gl.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 77fe4ca720f..a1170fa12db 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -53,6 +53,8 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_APPLE_fence", APPLE_FENCE }, {"GL_APPLE_float_pixels", APPLE_FLOAT_PIXELS }, {"GL_APPLE_flush_buffer_range", APPLE_FLUSH_BUFFER_RANGE }, + {"GL_APPLE_flush_render", APPLE_FLUSH_RENDER }, + {"GL_APPLE_rgb_422", APPLE_RGB_422 }, {"GL_APPLE_ycbcr_422", APPLE_YCBCR_422 }, /* ARB */ @@ -1225,7 +1227,8 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in * is specific to the Mac OS X window management, and GL_APPLE_ycbcr_422 is QuickTime specific. So * the chance that other implementations support them is rather small since Win32 QuickTime uses * DirectDraw, not OpenGL. */ - if (gl_info->supported[APPLE_FENCE] && gl_info->supported[APPLE_YCBCR_422]) + if (gl_info->supported[APPLE_FLUSH_RENDER] + && (gl_info->supported[APPLE_YCBCR_422] || gl_info->supported[APPLE_RGB_422])) return GL_VENDOR_APPLE; if (strstr(gl_vendor_string, "NVIDIA")) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 6b1c99e6da8..2dbc56ab79d 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -37,6 +37,8 @@ enum wined3d_gl_extension APPLE_FENCE, APPLE_FLOAT_PIXELS, APPLE_FLUSH_BUFFER_RANGE, + APPLE_FLUSH_RENDER, + APPLE_RGB_422, APPLE_YCBCR_422, /* ARB */ ARB_BASE_INSTANCE, -- 2.20.1

1 0

[PATCH 1/4] d3d10_1: Introduce a function to convert d3d10_1 feature levels to D3D_FEATURE_LEVEL.
by Henri Verbeet 10 Apr '20

10 Apr '20

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 183082. dlls/d3d10_1/d3d10_1_main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10_1/d3d10_1_main.c b/dlls/d3d10_1/d3d10_1_main.c index 77b5cac7106..f4fb1126ef2 100644 --- a/dlls/d3d10_1/d3d10_1_main.c +++ b/dlls/d3d10_1/d3d10_1_main.c @@ -61,6 +61,11 @@ static const char *debug_d3d10_feature_level(D3D10_FEATURE_LEVEL1 feature_level) #undef WINE_D3D10_TO_STR +static D3D_FEATURE_LEVEL d3d_feature_level_from_d3d10_1(D3D10_FEATURE_LEVEL1 level) +{ + return (D3D_FEATURE_LEVEL)level; +} + static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, D3D10_FEATURE_LEVEL1 hw_level, UINT sdk_version, ID3D10Device1 **device) { @@ -159,7 +164,8 @@ static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE dri } } - hr = D3D10CoreCreateDevice(factory, adapter, flags, hw_level, (ID3D10Device **)device); + hr = D3D10CoreCreateDevice(factory, adapter, flags, + d3d_feature_level_from_d3d10_1(hw_level), (ID3D10Device **)device); IDXGIAdapter_Release(adapter); IDXGIFactory_Release(factory); if (FAILED(hr)) -- 2.20.1

1 0

[PATCH] winspool.drv: fake success in AddPrintProcessorA
by Vijay Kiran Kamuju 10 Apr '20

10 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26171 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

3 4

[PATCH v2] include: Add missing structs and defines for xact3wb.h
by Vijay Kiran Kamuju 10 Apr '20

10 Apr '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v3] qdvd: add stub dll
by Vijay Kiran Kamuju 10 Apr '20

10 Apr '20

based on patch from Austin English Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0