September 2018 - Wine-Commits

Gabriel Ivăncescu : shell32/autocomplete: Don' t autocomplete at all on most control characters.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: ce254b5f6d90ea23b57cf865f526b27d83f36115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce254b5f6d90ea23b57cf865… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Sat Sep 22 17:53:42 2018 +0300 shell32/autocomplete: Don't autocomplete at all on most control characters. Most control characters sent via some CTRL+key combination should not autocomplete at all. ^C is one example, where just copying some text should not show the auto-suggestion box (if not visible). ^V is another example, where it is already handled in WM_PASTE, so it has to be a no-op here, else auto-append from WM_PASTE would complete the text and then the ^V autocompletion would remove every other suggestion in the listbox. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index ef835b9..048a47f 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -359,6 +359,10 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, return ACEditSubclassProc_KeyDown(This, hwnd, uMsg, wParam, lParam); case WM_CHAR: case WM_UNICHAR: + /* Don't autocomplete at all on most control characters */ + if (iscntrlW(wParam) && !(wParam >= '\b' && wParam <= '\r')) + break; + ret = CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); autocomplete_text(This, hwnd, (This->options & ACO_AUTOAPPEND) && wParam >= ' ' ? autoappend_flag_yes : autoappend_flag_no);

1 0

Nikolay Sivov : d2d1/tests: Test that device is reused for compatible targets.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 7c4f85ed0645cbdfdf597ec2c0b48855c547fa1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c4f85ed0645cbdfdf597ec2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 24 07:58:30 2018 +0300 d2d1/tests: Test that device is reused for compatible targets. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 9e6ce06..65ab5c2 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6772,14 +6772,26 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B /* Pixel format is not defined until target is set, for DC target it's specified on creation. */ if (target || dc_rt) { + ID2D1Device *device = NULL, *device2 = NULL; ID2D1DeviceContext *context2; + ID2D1DeviceContext_GetDevice(context, &device); + hr = ID2D1RenderTarget_CreateCompatibleRenderTarget(rt, NULL, NULL, NULL, D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, (ID2D1BitmapRenderTarget **)&compatible_rt); ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create compatible render target, hr %#x.\n", hr); hr = ID2D1RenderTarget_QueryInterface(compatible_rt, &IID_ID2D1DeviceContext, (void **)&context2); ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get device context, hr %#x.\n", hr); + + ID2D1DeviceContext_GetDevice(context2, &device2); + ok_(__FILE__, line)(device == device2, "Unexpected device.\n"); + + if (device) + ID2D1Device_Release(device); + if (device2) + ID2D1Device_Release(device2); + ID2D1DeviceContext_Release(context2); hr = ID2D1RenderTarget_CreateBitmap(compatible_rt, size, bitmap_data, sizeof(*bitmap_data), &bitmap_desc, &bitmap);

1 0

Józef Kucia : dxgi: Introduce wined3d_feature_level_from_d3d() helper function.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 298c6a26a89c30ea00518685e90776b285eafb99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=298c6a26a89c30ea00518685… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 24 01:09:28 2018 +0200 dxgi: Introduce wined3d_feature_level_from_d3d() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/utils.c | 75 ++++++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index aed62a4..e857a1f 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -621,27 +621,36 @@ HRESULT dxgi_set_private_data_interface(struct wined3d_private_store *store, return hr; } -D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter, - const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) +static enum wined3d_feature_level wined3d_feature_level_from_d3d(D3D_FEATURE_LEVEL feature_level) { - static const struct + switch (feature_level) { - D3D_FEATURE_LEVEL d3d; - enum wined3d_feature_level wined3d; + case D3D_FEATURE_LEVEL_11_1: + return WINED3D_FEATURE_LEVEL_11; + case D3D_FEATURE_LEVEL_11_0: + return WINED3D_FEATURE_LEVEL_11; + case D3D_FEATURE_LEVEL_10_1: + return WINED3D_FEATURE_LEVEL_10; + case D3D_FEATURE_LEVEL_10_0: + return WINED3D_FEATURE_LEVEL_10; + case D3D_FEATURE_LEVEL_9_3: + return WINED3D_FEATURE_LEVEL_9_SM3; + case D3D_FEATURE_LEVEL_9_2: + return WINED3D_FEATURE_LEVEL_9_SM2; + case D3D_FEATURE_LEVEL_9_1: + return WINED3D_FEATURE_LEVEL_9_SM2; + default: + FIXME("Unhandled feature level %#x.\n", feature_level); + return 0; } - wined3d_feature_levels[] = - { - {D3D_FEATURE_LEVEL_11_1, WINED3D_FEATURE_LEVEL_11}, - {D3D_FEATURE_LEVEL_11_0, WINED3D_FEATURE_LEVEL_11}, - {D3D_FEATURE_LEVEL_10_1, WINED3D_FEATURE_LEVEL_10}, - {D3D_FEATURE_LEVEL_10_0, WINED3D_FEATURE_LEVEL_10}, - {D3D_FEATURE_LEVEL_9_3, WINED3D_FEATURE_LEVEL_9_SM3}, - {D3D_FEATURE_LEVEL_9_2, WINED3D_FEATURE_LEVEL_9_SM2}, - {D3D_FEATURE_LEVEL_9_1, WINED3D_FEATURE_LEVEL_9_SM2}, - }; - D3D_FEATURE_LEVEL selected_feature_level = 0; +} + +D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter, + const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) +{ + enum wined3d_feature_level wined3d_feature_level; struct wined3d_caps caps; - unsigned int i, j; + unsigned int i; HRESULT hr; wined3d_mutex_lock(); @@ -653,31 +662,19 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, for (i = 0; i < level_count; ++i) { - for (j = 0; j < ARRAY_SIZE(wined3d_feature_levels); ++j) + wined3d_feature_level = wined3d_feature_level_from_d3d(feature_levels[i]); + if (wined3d_feature_level && caps.max_feature_level >= wined3d_feature_level) { - if (feature_levels[i] == wined3d_feature_levels[j].d3d) - { - if (caps.max_feature_level >= wined3d_feature_levels[j].wined3d) - { - selected_feature_level = feature_levels[i]; - TRACE("Choosing supported feature level %s.\n", - debug_feature_level(selected_feature_level)); - } - break; - } + TRACE("Choosing supported feature level %s.\n", + debug_feature_level(feature_levels[i])); + return feature_levels[i]; } - if (selected_feature_level) - break; - if (j == ARRAY_SIZE(wined3d_feature_levels)) - FIXME("Unexpected feature level %#x.\n", feature_levels[i]); - else - TRACE("Feature level %s not supported, trying next fallback if available.\n", - debug_feature_level(feature_levels[i])); + TRACE("Feature level %s not supported, trying next fallback if available.\n", + debug_feature_level(feature_levels[i])); } - if (!selected_feature_level) - FIXME_(winediag)("None of the requested D3D feature levels is supported on this GPU " - "with the current shader backend.\n"); - return selected_feature_level; + FIXME_(winediag)("None of the requested D3D feature levels is supported on this GPU " + "with the current shader backend.\n"); + return 0; }

1 0

Nikolay Sivov : d2d1: Fix compatible target initialization.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: dc67508338be4c7486d823f56dcb33a07be2dff8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc67508338be4c7486d823f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 24 07:58:29 2018 +0300 d2d1: Fix compatible target initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap_render_target.c | 8 ++++- dlls/d2d1/device.c | 4 +-- dlls/d2d1/tests/d2d1.c | 67 ++++++++++++++++++++++++++++++++++++++-- 3 files changed, 73 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/bitmap_render_target.c b/dlls/d2d1/bitmap_render_target.c index 57f5b23..6cea509 100644 --- a/dlls/d2d1/bitmap_render_target.c +++ b/dlls/d2d1/bitmap_render_target.c @@ -722,6 +722,11 @@ static const struct ID2D1BitmapRenderTargetVtbl d2d_bitmap_render_target_vtbl = d2d_bitmap_render_target_GetBitmap }; +static const struct d2d_device_context_ops d2d_bitmap_render_target_ops = +{ + NULL, +}; + HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_target, const struct d2d_device_context *parent_target, const D2D1_SIZE_F *size, const D2D1_SIZE_U *pixel_size, const D2D1_PIXEL_FORMAT *pixel_format, @@ -805,7 +810,8 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta } if (FAILED(hr = d2d_d3d_create_render_target(parent_target->factory, dxgi_surface, - (IUnknown *)&render_target->ID2D1BitmapRenderTarget_iface, NULL, + (IUnknown *)&render_target->ID2D1BitmapRenderTarget_iface, + parent_target->ops ? &d2d_bitmap_render_target_ops : NULL, &dxgi_rt_desc, (void **)&render_target->dxgi_inner))) { WARN("Failed to create DXGI surface render target, hr %#x.\n", hr); diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index d20377b..f1d0dad 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1515,7 +1515,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_Flush(ID2D1DeviceContext *if FIXME("iface %p, tag1 %p, tag2 %p stub!\n", iface, tag1, tag2); - if (context->ops) + if (context->ops && context->ops->device_context_present) context->ops->device_context_present(context->outer_unknown); return E_NOTIMPL; @@ -1693,7 +1693,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_EndDraw(ID2D1DeviceContext * if (tag2) *tag2 = context->error.tag2; - if (context->ops) + if (context->ops && context->ops->device_context_present) { if (FAILED(hr = context->ops->device_context_present(context->outer_unknown))) context->error.code = hr; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 4136b69..9e6ce06 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6705,8 +6705,10 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B ID2D1RenderTarget *compatible_rt; IWICImagingFactory *wic_factory; ID2D1DeviceContext *context; + ID2D1DCRenderTarget *dc_rt; IWICBitmap *wic_bitmap; ID2D1Bitmap *bitmap; + ID2D1Image *target; D2D1_SIZE_U size; HRESULT hr; @@ -6749,13 +6751,37 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B CoUninitialize(); - if (FAILED(ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&context))) + /* Compatible target follows its parent. */ + hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&context); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get device context, hr %#x.\n", hr); + + dc_rt = NULL; + ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DCRenderTarget, (void **)&dc_rt); + + bitmap = NULL; + target = NULL; + ID2D1DeviceContext_GetTarget(context, &target); + if (target && FAILED(ID2D1Image_QueryInterface(target, &IID_ID2D1Bitmap, (void **)&bitmap))) + { + ID2D1Image_Release(target); + target = NULL; + } + if (bitmap) + ID2D1Bitmap_Release(bitmap); + + /* Pixel format is not defined until target is set, for DC target it's specified on creation. */ + if (target || dc_rt) { - /* Compatible target follows its parent. */ + ID2D1DeviceContext *context2; + hr = ID2D1RenderTarget_CreateCompatibleRenderTarget(rt, NULL, NULL, NULL, D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, (ID2D1BitmapRenderTarget **)&compatible_rt); ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create compatible render target, hr %#x.\n", hr); + hr = ID2D1RenderTarget_QueryInterface(compatible_rt, &IID_ID2D1DeviceContext, (void **)&context2); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get device context, hr %#x.\n", hr); + ID2D1DeviceContext_Release(context2); + hr = ID2D1RenderTarget_CreateBitmap(compatible_rt, size, bitmap_data, sizeof(*bitmap_data), &bitmap_desc, &bitmap); ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); @@ -6765,7 +6791,18 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B ID2D1Bitmap_Release(bitmap); } else - ID2D1DeviceContext_Release(context); + { + hr = ID2D1RenderTarget_CreateCompatibleRenderTarget(rt, NULL, NULL, NULL, + D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, (ID2D1BitmapRenderTarget **)&compatible_rt); + todo_wine + ok_(__FILE__, line)(hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT, " --- Unexpected hr %#x.\n", hr); + } + + ID2D1DeviceContext_Release(context); + if (target) + ID2D1Image_Release(target); + if (dc_rt) + ID2D1DCRenderTarget_Release(dc_rt); } static void test_bitmap_surface(void) @@ -6782,6 +6819,7 @@ static void test_bitmap_surface(void) IDXGISurface *surface; ID2D1Bitmap1 *bitmap; ID2D1Device *device; + ID2D1Image *target; HWND window; HRESULT hr; @@ -6809,7 +6847,23 @@ static void test_bitmap_surface(void) rt = create_render_target(surface); ok(!!rt, "Failed to create render target.\n"); + hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context); + ok(SUCCEEDED(hr), "Failed to get device context, hr %#x.\n", hr); + + bitmap = NULL; + ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); +todo_wine + ok(!!bitmap, "Unexpected target.\n"); + +if (bitmap) +{ + check_bitmap_surface((ID2D1Bitmap *)bitmap, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW); + ID2D1Bitmap1_Release(bitmap); +} check_rt_bitmap_surface(rt, TRUE, D2D1_BITMAP_OPTIONS_NONE); + + ID2D1DeviceContext_Release(device_context); + ID2D1RenderTarget_Release(rt); /* Bitmap created from DXGI surface. */ @@ -6836,7 +6890,14 @@ if (SUCCEEDED(hr)) check_bitmap_surface((ID2D1Bitmap *)bitmap, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW); check_rt_bitmap_surface((ID2D1RenderTarget *)device_context, TRUE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1DeviceContext_SetTarget(device_context, (ID2D1Image *)bitmap); + ID2D1DeviceContext_GetTarget(device_context, &target); + ok(target == (ID2D1Image *)bitmap, "Unexpected target.\n"); + + check_rt_bitmap_surface((ID2D1RenderTarget *)device_context, TRUE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1DeviceContext_Release(device_context); + ID2D1Bitmap1_Release(bitmap); } ID2D1Device_Release(device); IDXGIDevice_Release(dxgi_device);

1 0

Józef Kucia : dxgi: Get rid of set_feature_level() from dxgi_device_layer.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 23ad7f6a8b499a2cef99679600aba944c1a3956a URL: https://source.winehq.org/git/wine.git/?a=commit;h=23ad7f6a8b499a2cef996796… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 24 01:09:33 2018 +0200 dxgi: Get rid of set_feature_level() from dxgi_device_layer. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_main.c | 18 +----------------- dlls/d3d11/d3d11_private.h | 2 -- dlls/d3d11/device.c | 2 ++ dlls/dxgi/device.c | 12 ------------ dlls/dxgi/dxgi_private.h | 2 -- dlls/dxgi/utils.c | 3 --- 6 files changed, 3 insertions(+), 36 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 6d98116..9c89820 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -95,27 +95,11 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba return S_OK; } -static void WINAPI layer_set_feature_level(enum dxgi_device_layer_id id, void *device, - D3D_FEATURE_LEVEL feature_level) -{ - struct d3d_device *d3d_device = device; - - TRACE("id %#x, device %p, feature_level %#x.\n", id, device, feature_level); - - if (id != DXGI_DEVICE_LAYER_D3D10_DEVICE) - { - WARN("Unknown layer id %#x.\n", id); - return; - } - - d3d_device->feature_level = feature_level; -} - HRESULT WINAPI D3D11CoreRegisterLayers(void) { static const struct dxgi_device_layer layers[] = { - {DXGI_DEVICE_LAYER_D3D10_DEVICE, layer_init, layer_get_size, layer_create, layer_set_feature_level}, + {DXGI_DEVICE_LAYER_D3D10_DEVICE, layer_init, layer_get_size, layer_create}, }; DXGID3D10RegisterLayers(layers, ARRAY_SIZE(layers)); diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 6ec4131..3049193 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -588,8 +588,6 @@ struct dxgi_device_layer UINT (WINAPI *get_size)(enum dxgi_device_layer_id id, struct layer_get_size_args *args, DWORD unknown0); HRESULT (WINAPI *create)(enum dxgi_device_layer_id id, void **layer_base, DWORD unknown0, void *device_object, REFIID riid, void **device_layer); - void (WINAPI *set_feature_level)(enum dxgi_device_layer_id id, void *device, - D3D_FEATURE_LEVEL feature_level); }; HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, IDXGIAdapter *adapter, diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e6ba31c..1edd41f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -6004,6 +6004,8 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par wined3d_device_incref(wined3d_device); device->wined3d_device = wined3d_device; + device->feature_level = wined3d_device_get_feature_level(wined3d_device); + set_default_depth_stencil_state(wined3d_device); } diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index deb07ca..51773e9 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -411,7 +411,6 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l IWineDXGIDeviceParent *dxgi_device_parent; struct dxgi_adapter *dxgi_adapter; struct dxgi_factory *dxgi_factory; - D3D_FEATURE_LEVEL feature_level; void *layer_base; HRESULT hr; @@ -455,15 +454,6 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l wined3d_device_parent = IWineDXGIDeviceParent_get_wined3d_device_parent(dxgi_device_parent); IWineDXGIDeviceParent_Release(dxgi_device_parent); - if (!(feature_level = dxgi_check_feature_level_support(dxgi_factory, dxgi_adapter, - feature_levels, level_count))) - { - IUnknown_Release(device->child_layer); - wined3d_private_store_cleanup(&device->private_store); - wined3d_mutex_unlock(); - return E_FAIL; - } - if (FAILED(hr = wined3d_device_create(dxgi_factory->wined3d, dxgi_adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, NULL, 0, 4, (const enum wined3d_feature_level *)feature_levels, level_count, @@ -476,8 +466,6 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l return hr; } - layer->set_feature_level(layer->id, device->child_layer, feature_level); - memset(&swapchain_desc, 0, sizeof(swapchain_desc)); swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; swapchain_desc.device_window = dxgi_factory_get_device_window(dxgi_factory); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 3a59196..8c3e41a 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -75,8 +75,6 @@ struct dxgi_device_layer UINT (WINAPI *get_size)(enum dxgi_device_layer_id id, struct layer_get_size_args *args, DWORD unknown0); HRESULT (WINAPI *create)(enum dxgi_device_layer_id id, void **layer_base, DWORD unknown0, void *device_object, REFIID riid, void **device_layer); - void (WINAPI *set_feature_level)(enum dxgi_device_layer_id id, void *device, - D3D_FEATURE_LEVEL feature_level); }; /* TRACE helper functions */ diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 009d351..ad8e2a2 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -23,7 +23,6 @@ #include "dxgi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxgi); -WINE_DECLARE_DEBUG_CHANNEL(winediag); #define WINE_DXGI_TO_STR(x) case x: return #x @@ -674,7 +673,5 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, debug_feature_level(feature_levels[i])); } - FIXME_(winediag)("None of the requested D3D feature levels is supported on this GPU " - "with the current shader backend.\n"); return 0; }

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_feature_level().
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 29533a6cbaf197c9da75967bd855d6f5f29b859d URL: https://source.winehq.org/git/wine.git/?a=commit;h=29533a6cbaf197c9da75967b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 24 01:09:32 2018 +0200 wined3d: Introduce wined3d_device_get_feature_level(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 38c37d4..922de36 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5026,6 +5026,13 @@ struct wined3d * CDECL wined3d_device_get_wined3d(const struct wined3d_device *d return device->wined3d; } +enum wined3d_feature_level CDECL wined3d_device_get_feature_level(const struct wined3d_device *device) +{ + TRACE("device %p.\n", device); + + return device->feature_level; +} + void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a401e04..7944387 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -72,6 +72,7 @@ @ cdecl wined3d_device_get_domain_shader(ptr) @ cdecl wined3d_device_get_ds_resource_view(ptr long) @ cdecl wined3d_device_get_ds_sampler(ptr long) +@ cdecl wined3d_device_get_feature_level(ptr) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_geometry_shader(ptr) @ cdecl wined3d_device_get_gs_resource_view(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6b81b3a..ef89caf 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2295,6 +2295,7 @@ struct wined3d_shader * __cdecl wined3d_device_get_domain_shader(const struct wi struct wined3d_shader_resource_view * __cdecl wined3d_device_get_ds_resource_view(const struct wined3d_device *device, unsigned int idx); struct wined3d_sampler * __cdecl wined3d_device_get_ds_sampler(const struct wined3d_device *device, unsigned int idx); +enum wined3d_feature_level __cdecl wined3d_device_get_feature_level(const struct wined3d_device *device); void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device);

1 0

Józef Kucia : wined3d: Pass feature levels to wined3d_device_create().
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 7b2ff904042ee95214b6c5b4a80e51d7f6b24c2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b2ff904042ee95214b6c5b4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 24 01:09:31 2018 +0200 wined3d: Pass feature levels to wined3d_device_create(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 14 +++++++++++--- dlls/d3d9/device.c | 14 +++++++++++++- dlls/ddraw/ddraw.c | 10 +++++++++- dlls/dxgi/device.c | 7 ++++--- dlls/dxgi/dxgi_private.h | 1 + dlls/wined3d/device.c | 31 +++++++++++++++++++++++++++++-- dlls/wined3d/directx.c | 20 +++++++++++--------- dlls/wined3d/utils.c | 22 ++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 6 +++++- include/wine/wined3d.h | 3 ++- 11 files changed, 108 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b2ff904042ee95214b6…

1 0

Józef Kucia : wined3d: Make feature level enum compatible with Direct3D enum.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 0fbac19e604eb132d3136eb8d5210ac226b6c556 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fbac19e604eb132d3136eb8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 24 01:09:29 2018 +0200 wined3d: Make feature level enum compatible with Direct3D enum. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 89 ++++++++++++++++++++++++++++++-------------------- include/wine/wined3d.h | 18 +++++----- 2 files changed, 62 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 02ca3f6..a8986b0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -617,49 +617,52 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, enum wined3d_pci_device wined3d_gpu_from_feature_level(enum wined3d_pci_vendor *vendor, enum wined3d_feature_level feature_level) { - unsigned int i; - - static const enum wined3d_pci_device card_fallback_nvidia[] = - { - CARD_NVIDIA_RIVA_128, /* D3D5 */ - CARD_NVIDIA_RIVA_TNT, /* D3D6 */ - CARD_NVIDIA_GEFORCE, /* D3D7 */ - CARD_NVIDIA_GEFORCE3, /* D3D8 */ - CARD_NVIDIA_GEFORCEFX_5800, /* D3D9_SM2 */ - CARD_NVIDIA_GEFORCE_6800, /* D3D9_SM3 */ - CARD_NVIDIA_GEFORCE_8800GTX, /* D3D10 */ - CARD_NVIDIA_GEFORCE_GTX470, /* D3D11 */ + static const struct wined3d_fallback_card + { + enum wined3d_feature_level feature_level; + enum wined3d_pci_device device_id; + } + card_fallback_nvidia[] = + { + {WINED3D_FEATURE_LEVEL_5, CARD_NVIDIA_RIVA_128}, + {WINED3D_FEATURE_LEVEL_6, CARD_NVIDIA_RIVA_TNT}, + {WINED3D_FEATURE_LEVEL_7, CARD_NVIDIA_GEFORCE}, + {WINED3D_FEATURE_LEVEL_8, CARD_NVIDIA_GEFORCE3}, + {WINED3D_FEATURE_LEVEL_9_SM2, CARD_NVIDIA_GEFORCEFX_5800}, + {WINED3D_FEATURE_LEVEL_9_SM3, CARD_NVIDIA_GEFORCE_6800}, + {WINED3D_FEATURE_LEVEL_10, CARD_NVIDIA_GEFORCE_8800GTX}, + {WINED3D_FEATURE_LEVEL_11, CARD_NVIDIA_GEFORCE_GTX470}, + {WINED3D_FEATURE_LEVEL_NONE}, }, card_fallback_amd[] = { - CARD_AMD_RAGE_128PRO, /* D3D5 */ - CARD_AMD_RAGE_128PRO, /* D3D6 */ - CARD_AMD_RADEON_7200, /* D3D7 */ - CARD_AMD_RADEON_8500, /* D3D8 */ - CARD_AMD_RADEON_9500, /* D3D9_SM2 */ - CARD_AMD_RADEON_X1600, /* D3D9_SM3 */ - CARD_AMD_RADEON_HD2900, /* D3D10 */ - CARD_AMD_RADEON_HD5600, /* D3D11 */ + {WINED3D_FEATURE_LEVEL_5, CARD_AMD_RAGE_128PRO}, + {WINED3D_FEATURE_LEVEL_6, CARD_AMD_RAGE_128PRO}, + {WINED3D_FEATURE_LEVEL_7, CARD_AMD_RADEON_7200}, + {WINED3D_FEATURE_LEVEL_8, CARD_AMD_RADEON_8500}, + {WINED3D_FEATURE_LEVEL_9_SM2, CARD_AMD_RADEON_9500}, + {WINED3D_FEATURE_LEVEL_9_SM3, CARD_AMD_RADEON_X1600}, + {WINED3D_FEATURE_LEVEL_10, CARD_AMD_RADEON_HD2900}, + {WINED3D_FEATURE_LEVEL_11, CARD_AMD_RADEON_HD5600}, + {WINED3D_FEATURE_LEVEL_NONE}, }, card_fallback_intel[] = { - CARD_INTEL_845G, /* D3D5 */ - CARD_INTEL_845G, /* D3D6 */ - CARD_INTEL_845G, /* D3D7 */ - CARD_INTEL_915G, /* D3D8 */ - CARD_INTEL_915G, /* D3D9_SM2 */ - CARD_INTEL_945G, /* D3D9_SM3 */ - CARD_INTEL_G45, /* D3D10 */ - CARD_INTEL_IVBD, /* D3D11 */ + {WINED3D_FEATURE_LEVEL_5, CARD_INTEL_845G}, + {WINED3D_FEATURE_LEVEL_6, CARD_INTEL_845G}, + {WINED3D_FEATURE_LEVEL_7, CARD_INTEL_845G}, + {WINED3D_FEATURE_LEVEL_8, CARD_INTEL_915G}, + {WINED3D_FEATURE_LEVEL_9_SM2, CARD_INTEL_915G}, + {WINED3D_FEATURE_LEVEL_9_SM3, CARD_INTEL_945G}, + {WINED3D_FEATURE_LEVEL_10, CARD_INTEL_G45}, + {WINED3D_FEATURE_LEVEL_11, CARD_INTEL_IVBD}, + {WINED3D_FEATURE_LEVEL_NONE}, }; - C_ASSERT(ARRAY_SIZE(card_fallback_nvidia) == WINED3D_FEATURE_LEVEL_COUNT); - C_ASSERT(ARRAY_SIZE(card_fallback_amd) == WINED3D_FEATURE_LEVEL_COUNT); - C_ASSERT(ARRAY_SIZE(card_fallback_intel) == WINED3D_FEATURE_LEVEL_COUNT); static const struct { enum wined3d_pci_vendor vendor; - const enum wined3d_pci_device *device; + const struct wined3d_fallback_card *cards; } fallbacks[] = { @@ -669,15 +672,29 @@ enum wined3d_pci_device wined3d_gpu_from_feature_level(enum wined3d_pci_vendor * {HW_VENDOR_INTEL, card_fallback_intel}, }; + const struct wined3d_fallback_card *cards; + enum wined3d_pci_device device_id; + unsigned int i; + + cards = NULL; for (i = 0; i < ARRAY_SIZE(fallbacks); ++i) { if (*vendor == fallbacks[i].vendor) - return fallbacks[i].device[feature_level]; + cards = fallbacks[i].cards; + } + if (!cards) + { + *vendor = HW_VENDOR_NVIDIA; + cards = card_fallback_nvidia; } - *vendor = HW_VENDOR_NVIDIA; - - return card_fallback_nvidia[feature_level]; + device_id = cards->device_id; + for (i = 0; cards[i].feature_level; ++i) + { + if (feature_level >= cards[i].feature_level) + device_id = cards[i].device_id; + } + return device_id; } UINT CDECL wined3d_get_adapter_count(const struct wined3d *wined3d) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ac7e3dd..3c01f75 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -90,15 +90,15 @@ enum wined3d_device_type enum wined3d_feature_level { - WINED3D_FEATURE_LEVEL_5, - WINED3D_FEATURE_LEVEL_6, - WINED3D_FEATURE_LEVEL_7, - WINED3D_FEATURE_LEVEL_8, - WINED3D_FEATURE_LEVEL_9_SM2, - WINED3D_FEATURE_LEVEL_9_SM3, - WINED3D_FEATURE_LEVEL_10, - WINED3D_FEATURE_LEVEL_11, - WINED3D_FEATURE_LEVEL_COUNT + WINED3D_FEATURE_LEVEL_NONE = 0x0000, + WINED3D_FEATURE_LEVEL_5 = 0x5000, + WINED3D_FEATURE_LEVEL_6 = 0x6000, + WINED3D_FEATURE_LEVEL_7 = 0x7000, + WINED3D_FEATURE_LEVEL_8 = 0x8000, + WINED3D_FEATURE_LEVEL_9_SM2 = 0x9200, + WINED3D_FEATURE_LEVEL_9_SM3 = 0x9300, + WINED3D_FEATURE_LEVEL_10 = 0xa000, + WINED3D_FEATURE_LEVEL_11 = 0xb000, }; enum wined3d_degree_type

1 0

Gabriel Ivăncescu : shell32/autocomplete: Pass hwnd for consistency with the other calls.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 38306f8f56a9a8b8a9cd8db31a965ee8f0de4c4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=38306f8f56a9a8b8a9cd8db3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Sat Sep 22 17:53:45 2018 +0300 shell32/autocomplete: Pass hwnd for consistency with the other calls. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 1751401..2153968 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -409,7 +409,7 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, sel = SendMessageW(hwnd, LB_GETCURSEL, 0, 0); if (sel < 0) break; - len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, 0); + len = SendMessageW(hwnd, LB_GETTEXTLEN, sel, 0); if (!(msg = heap_alloc((len + 1) * sizeof(WCHAR)))) break; len = SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg);

1 0

Gabriel Ivăncescu : shell32/autocomplete: Send some messages directly to the edit control's procedure.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 087c24dfdc4496ed983f44eb19934e482cf7413a URL: https://source.winehq.org/git/wine.git/?a=commit;h=087c24dfdc4496ed983f44eb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Sat Sep 22 17:53:43 2018 +0300 shell32/autocomplete: Send some messages directly to the edit control's procedure. Send some of the messages directly to the edit control's window procedure to match Windows behavior and to be able to process WM_SETTEXT. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 048a47f..2f63d88 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -100,6 +100,14 @@ static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDr return CONTAINING_RECORD(iface, IAutoCompleteImpl, IAutoCompleteDropDown_iface); } +static void set_text_and_selection(IAutoCompleteImpl *ac, HWND hwnd, WCHAR *text, WPARAM start, LPARAM end) +{ + /* Send it directly to the edit control to match Windows behavior */ + WNDPROC proc = ac->wpOrigEditProc; + if (CallWindowProcW(proc, hwnd, WM_SETTEXT, 0, (LPARAM)text)) + CallWindowProcW(proc, hwnd, EM_SETSEL, start, end); +} + static size_t format_quick_complete(WCHAR *dst, const WCHAR *qc, const WCHAR *str, size_t str_len) { /* Replace the first %s directly without using snprintf, to avoid @@ -142,8 +150,7 @@ static void autoappend_str(IAutoCompleteImpl *ac, WCHAR *text, UINT len, WCHAR * } else tmp = str; - SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)tmp); - SendMessageW(hwnd, EM_SETSEL, len, size - 1); + set_text_and_selection(ac, hwnd, tmp, len, size - 1); if (tmp != str) heap_free(tmp); } @@ -256,8 +263,7 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT if ((buf = heap_alloc(sz * sizeof(WCHAR)))) { len = format_quick_complete(buf, ac->quickComplete, text, len); - SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)buf); - SendMessageW(hwnd, EM_SETSEL, 0, len); + set_text_and_selection(ac, hwnd, buf, 0, len); heap_free(buf); } @@ -309,16 +315,13 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT if (!(msg = heap_alloc((len + 1) * sizeof(WCHAR)))) return 0; len = SendMessageW(ac->hwndListBox, LB_GETTEXT, sel, (LPARAM)msg); - SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)msg); - SendMessageW(hwnd, EM_SETSEL, len, len); + set_text_and_selection(ac, hwnd, msg, len, len); heap_free(msg); } else { - UINT len; - SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)ac->txtbackup); - len = strlenW(ac->txtbackup); - SendMessageW(hwnd, EM_SETSEL, len, len); + UINT len = strlenW(ac->txtbackup); + set_text_and_selection(ac, hwnd, ac->txtbackup, len, len); } return 0; } @@ -409,8 +412,7 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, if (!(msg = heap_alloc((len + 1) * sizeof(WCHAR)))) break; len = SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); - SendMessageW(This->hwndEdit, WM_SETTEXT, 0, (LPARAM)msg); - SendMessageW(This->hwndEdit, EM_SETSEL, 0, len); + set_text_and_selection(This, This->hwndEdit, msg, 0, len); ShowWindow(hwnd, SW_HIDE); heap_free(msg); break;

1 0