wine-devel February 2018

wine-devel@winehq.org

74 participants
746 discussions

[PATCH 4/5] dxgi: Translate swap effects in dxgi_factory_CreateSwapChainForHwnd().
by Henri Verbeet 15 Feb '18

15 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxgi/factory.c | 13 ++++++++++--- dlls/wined3d/swapchain.c | 3 ++- include/wine/wined3d.h | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 00ca122..7fc3279 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -275,12 +275,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa switch (swapchain_desc->SwapEffect) { case DXGI_SWAP_EFFECT_DISCARD: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; + min_buffer_count = 1; + break; + case DXGI_SWAP_EFFECT_SEQUENTIAL: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_SEQUENTIAL; min_buffer_count = 1; break; case DXGI_SWAP_EFFECT_FLIP_DISCARD: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_DISCARD; + min_buffer_count = 2; + break; + case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL; min_buffer_count = 2; break; @@ -303,8 +313,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH) FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); - if (swapchain_desc->SwapEffect) - FIXME("Ignoring swap effect %#x.\n", swapchain_desc->SwapEffect); if (swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); if (fullscreen_desc && fullscreen_desc->ScanlineOrdering) @@ -319,7 +327,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa wined3d_desc.backbuffer_usage = wined3d_usage_from_dxgi_usage(swapchain_desc->BufferUsage); wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, &wined3d_desc.multisample_quality, &swapchain_desc->SampleDesc); - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; wined3d_desc.device_window = window; wined3d_desc.windowed = fullscreen_desc ? fullscreen_desc->Windowed : TRUE; wined3d_desc.enable_auto_depth_stencil = FALSE; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2729df2..0d76b67 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -505,7 +505,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, * The FLIP swap effect is not implemented yet. We could mark WINED3D_LOCATION_DRAWABLE * up to date and hope WGL flipped front and back buffers and read this data into * the FBO. Don't bother about this for now. */ - if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_DISCARD) + if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_DISCARD + || swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP_DISCARD) wined3d_texture_validate_location(swapchain->back_buffers[swapchain->desc.backbuffer_count - 1], 0, WINED3D_LOCATION_DISCARDED); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 22bb2d8..1e3c08b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -507,6 +507,7 @@ enum wined3d_swap_effect { WINED3D_SWAP_EFFECT_DISCARD, WINED3D_SWAP_EFFECT_SEQUENTIAL, + WINED3D_SWAP_EFFECT_FLIP_DISCARD, WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL, WINED3D_SWAP_EFFECT_COPY, WINED3D_SWAP_EFFECT_COPY_VSYNC, -- 2.1.4

1 0

[PATCH 3/5] d3d9: Explicitly translate swap effects.
by Henri Verbeet 15 Feb '18

15 Feb '18

Note that previously D3DSWAPEFFECT_OVERLAY would get mapped to WINED3D_SWAP_EFFECT_COPY_VSYNC. That didn't matter so much because neither is currently implemented. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- include/wine/wined3d.h | 10 ++++++---- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4c1006c..ff95bef 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -186,6 +186,26 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +static D3DSWAPEFFECT d3dswapeffect_from_wined3dswapeffect(enum wined3d_swap_effect effect) +{ + switch (effect) + { + case WINED3D_SWAP_EFFECT_DISCARD: + return D3DSWAPEFFECT_DISCARD; + case WINED3D_SWAP_EFFECT_SEQUENTIAL: + return D3DSWAPEFFECT_FLIP; + case WINED3D_SWAP_EFFECT_COPY: + return D3DSWAPEFFECT_COPY; + case WINED3D_SWAP_EFFECT_OVERLAY: + return D3DSWAPEFFECT_OVERLAY; + case WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL: + return D3DSWAPEFFECT_FLIPEX; + default: + FIXME("Unhandled swap effect %#x.\n", effect); + return D3DSWAPEFFECT_FLIP; + } +} + void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, const struct wined3d_swapchain_desc *swapchain_desc) { @@ -195,7 +215,7 @@ void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *prese present_parameters->BackBufferCount = swapchain_desc->backbuffer_count; present_parameters->MultiSampleType = swapchain_desc->multisample_type; present_parameters->MultiSampleQuality = swapchain_desc->multisample_quality; - present_parameters->SwapEffect = swapchain_desc->swap_effect; + present_parameters->SwapEffect = d3dswapeffect_from_wined3dswapeffect(swapchain_desc->swap_effect); present_parameters->hDeviceWindow = swapchain_desc->device_window; present_parameters->Windowed = swapchain_desc->windowed; present_parameters->EnableAutoDepthStencil = swapchain_desc->enable_auto_depth_stencil; @@ -206,6 +226,26 @@ void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *prese present_parameters->PresentationInterval = swapchain_desc->swap_interval; } +static enum wined3d_swap_effect wined3dswapeffect_from_d3dswapeffect(D3DSWAPEFFECT effect) +{ + switch (effect) + { + case D3DSWAPEFFECT_DISCARD: + return WINED3D_SWAP_EFFECT_DISCARD; + case D3DSWAPEFFECT_FLIP: + return WINED3D_SWAP_EFFECT_SEQUENTIAL; + case D3DSWAPEFFECT_COPY: + return WINED3D_SWAP_EFFECT_COPY; + case D3DSWAPEFFECT_OVERLAY: + return WINED3D_SWAP_EFFECT_OVERLAY; + case D3DSWAPEFFECT_FLIPEX: + return WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL; + default: + FIXME("Unhandled swap effect %#x.\n", effect); + return WINED3D_SWAP_EFFECT_SEQUENTIAL; + } +} + static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, const D3DPRESENT_PARAMETERS *present_parameters, BOOL extended) { @@ -232,7 +272,7 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch swapchain_desc->backbuffer_usage = WINED3DUSAGE_RENDERTARGET; swapchain_desc->multisample_type = present_parameters->MultiSampleType; swapchain_desc->multisample_quality = present_parameters->MultiSampleQuality; - swapchain_desc->swap_effect = present_parameters->SwapEffect; + swapchain_desc->swap_effect = wined3dswapeffect_from_d3dswapeffect(present_parameters->SwapEffect); swapchain_desc->device_window = present_parameters->hDeviceWindow; swapchain_desc->windowed = present_parameters->Windowed; swapchain_desc->enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cca4476..22bb2d8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -505,10 +505,12 @@ enum wined3d_patch_edge_style enum wined3d_swap_effect { - WINED3D_SWAP_EFFECT_DISCARD = 1, - WINED3D_SWAP_EFFECT_SEQUENTIAL = 2, - WINED3D_SWAP_EFFECT_COPY = 3, - WINED3D_SWAP_EFFECT_COPY_VSYNC = 4, + WINED3D_SWAP_EFFECT_DISCARD, + WINED3D_SWAP_EFFECT_SEQUENTIAL, + WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL, + WINED3D_SWAP_EFFECT_COPY, + WINED3D_SWAP_EFFECT_COPY_VSYNC, + WINED3D_SWAP_EFFECT_OVERLAY, }; enum wined3d_sampler_state -- 2.1.4

1 0

[PATCH 2/5] d3d8: Explicitly translate swap effects.
by Henri Verbeet 15 Feb '18

15 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/device.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 615f8c7..a6363d2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -167,6 +167,24 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +static D3DSWAPEFFECT d3dswapeffect_from_wined3dswapeffect(enum wined3d_swap_effect effect) +{ + switch (effect) + { + case WINED3D_SWAP_EFFECT_DISCARD: + return D3DSWAPEFFECT_DISCARD; + case WINED3D_SWAP_EFFECT_SEQUENTIAL: + return D3DSWAPEFFECT_FLIP; + case WINED3D_SWAP_EFFECT_COPY: + return D3DSWAPEFFECT_COPY; + case WINED3D_SWAP_EFFECT_COPY_VSYNC: + return D3DSWAPEFFECT_COPY_VSYNC; + default: + FIXME("Unhandled swap effect %#x.\n", effect); + return D3DSWAPEFFECT_FLIP; + } +} + static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, const struct wined3d_swapchain_desc *swapchain_desc) { @@ -175,7 +193,7 @@ static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(swapchain_desc->backbuffer_format); present_parameters->BackBufferCount = swapchain_desc->backbuffer_count; present_parameters->MultiSampleType = swapchain_desc->multisample_type; - present_parameters->SwapEffect = swapchain_desc->swap_effect; + present_parameters->SwapEffect = d3dswapeffect_from_wined3dswapeffect(swapchain_desc->swap_effect); present_parameters->hDeviceWindow = swapchain_desc->device_window; present_parameters->Windowed = swapchain_desc->windowed; present_parameters->EnableAutoDepthStencil = swapchain_desc->enable_auto_depth_stencil; @@ -186,6 +204,24 @@ static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS present_parameters->FullScreen_PresentationInterval = swapchain_desc->swap_interval; } +static enum wined3d_swap_effect wined3dswapeffect_from_d3dswapeffect(D3DSWAPEFFECT effect) +{ + switch (effect) + { + case D3DSWAPEFFECT_DISCARD: + return WINED3D_SWAP_EFFECT_DISCARD; + case D3DSWAPEFFECT_FLIP: + return WINED3D_SWAP_EFFECT_SEQUENTIAL; + case D3DSWAPEFFECT_COPY: + return WINED3D_SWAP_EFFECT_COPY; + case D3DSWAPEFFECT_COPY_VSYNC: + return WINED3D_SWAP_EFFECT_COPY_VSYNC; + default: + FIXME("Unhandled swap effect %#x.\n", effect); + return WINED3D_SWAP_EFFECT_SEQUENTIAL; + } +} + static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, const D3DPRESENT_PARAMETERS *present_parameters) { @@ -210,7 +246,7 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch swapchain_desc->backbuffer_usage = WINED3DUSAGE_RENDERTARGET; swapchain_desc->multisample_type = present_parameters->MultiSampleType; swapchain_desc->multisample_quality = 0; /* d3d9 only */ - swapchain_desc->swap_effect = present_parameters->SwapEffect; + swapchain_desc->swap_effect = wined3dswapeffect_from_d3dswapeffect(present_parameters->SwapEffect); swapchain_desc->device_window = present_parameters->hDeviceWindow; swapchain_desc->windowed = present_parameters->Windowed; swapchain_desc->enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil; -- 2.1.4

1 0

[PATCH 1/5] wined3d: Print a fixme for unimplemented swap effects during swapchain (re)creation.
by Henri Verbeet 15 Feb '18

15 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 5 +++++ dlls/wined3d/swapchain.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e412272..89083fc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4797,6 +4797,11 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (swapchain_desc->backbuffer_usage != WINED3DUSAGE_RENDERTARGET) FIXME("Got unexpected backbuffer usage %#x.\n", swapchain_desc->backbuffer_usage); + if (swapchain_desc->swap_effect != WINED3D_SWAP_EFFECT_DISCARD + && swapchain_desc->swap_effect != WINED3D_SWAP_EFFECT_SEQUENTIAL + && swapchain_desc->swap_effect != WINED3D_SWAP_EFFECT_COPY) + FIXME("Unimplemented swap effect %#x.\n", swapchain_desc->swap_effect); + /* No special treatment of these parameters. Just store them */ swapchain->desc.swap_effect = swapchain_desc->swap_effect; swapchain->desc.enable_auto_depth_stencil = swapchain_desc->enable_auto_depth_stencil; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c20a692..2729df2 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -777,6 +777,11 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 "Please configure the application to use double buffering (1 back buffer) if possible.\n"); } + if (desc->swap_effect != WINED3D_SWAP_EFFECT_DISCARD + && desc->swap_effect != WINED3D_SWAP_EFFECT_SEQUENTIAL + && desc->swap_effect != WINED3D_SWAP_EFFECT_COPY) + FIXME("Unimplemented swap effect %#x.\n", desc->swap_effect); + if (device->wined3d->flags & WINED3D_NO3D) swapchain->swapchain_ops = &swapchain_gdi_ops; else -- 2.1.4

1 0

[PATCH] imm32: Add stub for ImmDisableLegacyIME.
by Alistair Leslie-Hughes 14 Feb '18

14 Feb '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/imm32/imm.c | 9 +++++++++ dlls/imm32/imm32.spec | 1 + include/imm.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 3f8ad18..377a277 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -3145,3 +3145,12 @@ BOOL WINAPI ImmGetHotKey(DWORD hotkey, UINT *modifiers, UINT *key, HKL hkl) FIXME("%x, %p, %p, %p: stub\n", hotkey, modifiers, key, hkl); return FALSE; } + +/*********************************************************************** + * IMMDisableLegacyIME(IMM32.@) + */ +BOOL WINAPI ImmDisableLegacyIME(void) +{ + FIXME("stub\n"); + return TRUE; +} diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 2be5d92..4197bb8 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -11,6 +11,7 @@ @ stdcall ImmDestroySoftKeyboard(long) @ stdcall ImmDisableIME(long) @ stdcall ImmDisableIme(long) ImmDisableIME +@ stdcall ImmDisableLegacyIME() @ stdcall ImmDisableTextFrameService(long) @ stdcall ImmEnumInputContext(long ptr long) @ stdcall ImmEnumRegisterWordA(long ptr str long str ptr) diff --git a/include/imm.h b/include/imm.h index aa2fa1d..500aea9 100644 --- a/include/imm.h +++ b/include/imm.h @@ -493,6 +493,7 @@ BOOL WINAPI ImmConfigureIMEW(HKL, HWND, DWORD, LPVOID); HIMC WINAPI ImmCreateContext(void); BOOL WINAPI ImmDestroyContext(HIMC hIMC); BOOL WINAPI ImmDisableIME(DWORD idThread); +BOOL WINAPI ImmDisableLegacyIME(void); BOOL WINAPI ImmEnumInputContext(DWORD, IMCENUMPROC, LPARAM); UINT WINAPI ImmEnumRegisterWordA(HKL, REGISTERWORDENUMPROCA, LPCSTR, DWORD, LPCSTR, LPVOID); UINT WINAPI ImmEnumRegisterWordW(HKL, REGISTERWORDENUMPROCW, LPCWSTR, DWORD, LPCWSTR, LPVOID); -- 1.9.1

5 5

[PATCH v3 5/5] XInput: Implement XInputEnable
by Aric Stewart 14 Feb '18

14 Feb '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/xinput1_3/hid.c | 59 ++++++++++++++++++++++++++++++++--------- dlls/xinput1_3/xinput_main.c | 12 ++++++++- dlls/xinput1_3/xinput_private.h | 1 + 3 files changed, 58 insertions(+), 14 deletions(-)

1 0

[PATCH v3 4/5] XInput: Implement XInputSetState
by Aric Stewart 14 Feb '18

14 Feb '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/xinput1_3/hid.c | 42 +++++++++++++++++++++++++++++++++++++++++ dlls/xinput1_3/xinput_main.c | 6 ++++-- dlls/xinput1_3/xinput_private.h | 1 + include/xinput.h | 6 ++++++ 4 files changed, 53 insertions(+), 2 deletions(-)

1 0

[PATCH v3 3/5] XInput: Update state of HID device
by Aric Stewart 14 Feb '18

14 Feb '18

v2: Correct state_ex to state Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/xinput1_3/hid.c | 94 ++++++++++++++++++++++++++++++++++++++--- dlls/xinput1_3/xinput_main.c | 14 +++--- dlls/xinput1_3/xinput_private.h | 1 + 3 files changed, 96 insertions(+), 13 deletions(-)

1 0

[PATCH v3 2/5] XInput: Detect and setup HID gamepads
by Aric Stewart 14 Feb '18

14 Feb '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/xinput1_1/Makefile.in | 2 + dlls/xinput1_2/Makefile.in | 2 + dlls/xinput1_3/Makefile.in | 2 + dlls/xinput1_3/hid.c | 331 ++++++++++++++++++++++++++++++++++++++++ dlls/xinput1_3/xinput_main.c | 26 ++-- dlls/xinput1_3/xinput_private.h | 30 ++++ dlls/xinput1_4/Makefile.in | 2 + dlls/xinput9_1_0/Makefile.in | 2 + 8 files changed, 386 insertions(+), 11 deletions(-) create mode 100644 dlls/xinput1_3/hid.c create mode 100644 dlls/xinput1_3/xinput_private.h

1 0

[PATCH v3 1/5] winebus.sys: Be more specific as to what we offer as IG_ enumerated devices
by Aric Stewart 14 Feb '18

14 Feb '18

v3: Fix capitalization on global constants Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_iohid.c | 48 +++++++++++++++++++++++++-- dlls/winebus.sys/bus_udev.c | 79 +++++++++++++++++++++++++++++++++----------- dlls/winebus.sys/main.c | 29 ++++++++++++++++ 4 files changed, 135 insertions(+), 22 deletions(-)

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel February 2018