July 2019 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : include: Add MENUGETOBJECTINFO.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 0453e56e36541152b061fd4c28adef18057a9b67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0453e56e36541152b061fd4c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 29 23:07:41 2019 +0000 include: Add MENUGETOBJECTINFO. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/winuser.h b/include/winuser.h index 60bc473..abb6d5b 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3425,6 +3425,15 @@ typedef struct tagAUDIODESCRIPTION LCID Locale; } AUDIODESCRIPTION, *LPAUDIODESCRIPTION; +typedef struct tagMENUGETOBJECTINFO +{ + DWORD dwFlags; + UINT uPos; + HMENU hmenu; + void *riid; + void *pvObj; +} MENUGETOBJECTINFO, *PMENUGETOBJECTINFO; + #if defined(_WINGDI_) && !defined(NOGDI) WINUSERAPI LONG WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD); WINUSERAPI LONG WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD);

1 0

Alistair Leslie-Hughes : include: Add UI_ANIMATION_KEYFRAME_STORYBOARD_START constant.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 93511e44a6a2996f5387ae2000cc5abec3562a17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93511e44a6a2996f5387ae20… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 29 23:07:42 2019 +0000 include: Add UI_ANIMATION_KEYFRAME_STORYBOARD_START constant. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uianimation.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/uianimation.idl b/include/uianimation.idl index e8b366e..631af11 100644 --- a/include/uianimation.idl +++ b/include/uianimation.idl @@ -30,6 +30,7 @@ interface IUIAnimationTransitionLibrary; typedef DOUBLE UI_ANIMATION_SECONDS; typedef struct { int _; } *UI_ANIMATION_KEYFRAME; +const UI_ANIMATION_KEYFRAME UI_ANIMATION_KEYFRAME_STORYBOARD_START = (UI_ANIMATION_KEYFRAME)(-1); const UI_ANIMATION_SECONDS UI_ANIMATION_SECONDS_EVENTUALLY = -1.0;

1 0

Alistair Leslie-Hughes : include: Add UI_E_* defines.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 44bf75433c12b723178035d0d31708ed301a41e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44bf75433c12b723178035d0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 29 23:07:43 2019 +0000 include: Add UI_E_* defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winerror.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index 32680e0..40dd6d9 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3098,6 +3098,32 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define DWM_E_ADAPTER_NOT_FOUND _HRESULT_TYPEDEF_(0x80263005) #define DWM_S_GDI_REDIRECTION_SURFACE _HRESULT_TYPEDEF_(0x00263005) +#define UI_E_CREATE_FAILED _HRESULT_TYPEDEF_(0x802a0001) +#define UI_E_SHUTDOWN_CALLED _HRESULT_TYPEDEF_(0x802a0002) +#define UI_E_ILLEGAL_REENTRANCY _HRESULT_TYPEDEF_(0x802a0003) +#define UI_E_OBJECT_SEALED _HRESULT_TYPEDEF_(0x802a0004) +#define UI_E_VALUE_NOT_SET _HRESULT_TYPEDEF_(0x802a0005) +#define UI_E_VALUE_NOT_DETERMINED _HRESULT_TYPEDEF_(0x802a0006) +#define UI_E_INVALID_OUTPUT _HRESULT_TYPEDEF_(0x802a0007) +#define UI_E_BOOLEAN_EXPECTED _HRESULT_TYPEDEF_(0x802a0008) +#define UI_E_DIFFERENT_OWNER _HRESULT_TYPEDEF_(0x802a0009) +#define UI_E_AMBIGUOUS_MATCH _HRESULT_TYPEDEF_(0x802a000a) +#define UI_E_FP_OVERFLOW _HRESULT_TYPEDEF_(0x802a000b) +#define UI_E_WRONG_THREAD _HRESULT_TYPEDEF_(0x802a000c) +#define UI_E_STORYBOARD_ACTIVE _HRESULT_TYPEDEF_(0x802a0101) +#define UI_E_STORYBOARD_NOT_PLAYING _HRESULT_TYPEDEF_(0x802a0102) +#define UI_E_START_KEYFRAME_AFTER_END _HRESULT_TYPEDEF_(0x802a0103) +#define UI_E_END_KEYFRAME_NOT_DETERMINED _HRESULT_TYPEDEF_(0x802a0104) +#define UI_E_LOOPS_OVERLAP _HRESULT_TYPEDEF_(0x802a0105) +#define UI_E_TRANSITION_ALREADY_USED _HRESULT_TYPEDEF_(0x802a0106) +#define UI_E_TRANSITION_NOT_IN_STORYBOARD _HRESULT_TYPEDEF_(0x802a0107) +#define UI_E_TRANSITION_ECLIPSED _HRESULT_TYPEDEF_(0x802a0108) +#define UI_E_TIME_BEFORE_LAST_UPDATE _HRESULT_TYPEDEF_(0x802a0109) +#define UI_E_TIMER_CLIENT_ALREADY_CONNECTED _HRESULT_TYPEDEF_(0x802a010a) +#define UI_E_INVALID_DIMENSION _HRESULT_TYPEDEF_(0x802a010b) +#define UI_E_PRIMITIVE_OUT_OF_BOUNDS _HRESULT_TYPEDEF_(0x802a010c) +#define UI_E_WINDOW_CLOSED _HRESULT_TYPEDEF_(0x802a0201) + #define D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS _HRESULT_TYPEDEF_(0x887c0001) #define D3D11_ERROR_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0x887c0002) #define D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS _HRESULT_TYPEDEF_(0x887c0003)

1 0

Alistair Leslie-Hughes : include: Add gesture defines.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 0bce8863b4424dfd118689b95244f31442d81994 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bce8863b4424dfd118689b9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 29 23:07:44 2019 +0000 include: Add gesture defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/winuser.h b/include/winuser.h index abb6d5b..51c73d2 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -650,6 +650,30 @@ typedef struct tagGESTURECONFIG { #define GIDC_ARRIVAL 1 #define GIDC_REMOVAL 2 +#define GC_PAN 0x00000001 +#define GC_PAN_WITH_SINGLE_FINGER_VERTICALLY 0x00000002 +#define GC_PAN_WITH_SINGLE_FINGER_HORIZONTALLY 0x00000004 +#define GC_PAN_WITH_GUTTER 0x00000008 +#define GC_PAN_WITH_INERTIA 0x00000010 + +#define GC_ALLGESTURES 0x00000001 +#define GC_PRESSANDTAP 0x00000001 +#define GC_ROLLOVER GC_PRESSANDTAP +#define GC_ROTATE 0x00000001 +#define GC_TWOFINGERTAP 0x00000001 +#define GC_ZOOM 0x00000001 + +#define GESTURECONFIGMAXCOUNT 256 + +#define GID_BEGIN 1 +#define GID_END 2 +#define GID_ZOOM 3 +#define GID_PAN 4 +#define GID_ROTATE 5 +#define GID_TWOFINGERTAP 6 +#define GID_PRESSANDTAP 7 +#define GID_ROLLOVER GID_PRESSANDTAP + #if (_WIN32_WINNT >= 0x0601) #define GET_DEVICE_CHANGE_WPARAM(wParam) (LOWORD(wParam)) #elif (_WIN32_WINNT >= 0x0501)

1 0

Alistair Leslie-Hughes : include: Add recovery defines.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: d7dd469be4bd5b09f60fdf85f5eb90590b74b7a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7dd469be4bd5b09f60fdf85… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 29 23:07:47 2019 +0000 include: Add recovery defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index 3e75a4b..086a8b3 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1053,6 +1053,16 @@ typedef DWORD (CALLBACK *LPPROGRESS_ROUTINE)(LARGE_INTEGER, LARGE_INTEGER, LARGE typedef DWORD (WINAPI *APPLICATION_RECOVERY_CALLBACK)(PVOID); +#define RECOVERY_DEFAULT_PING_INTERVAL 5000 +#define RECOVERY_MAX_PING_INTERVAL (5*60*1000) + +#define RESTART_MAX_CMD_LINE 1024 + +#define RESTART_NO_CRASH 1 +#define RESTART_NO_HANG 2 +#define RESTART_NO_PATCH 4 +#define RESTART_NO_REBOOT 8 + typedef enum _COPYFILE2_MESSAGE_TYPE { COPYFILE2_CALLBACK_NONE = 0,

1 0

Zhiyi Zhang : dxgi/tests: Test output after using Alt+Enter to switch fullscreen.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: facd7cce6d517accdc6e0d74e631beb1f202c78e URL: https://source.winehq.org/git/wine.git/?a=commit;h=facd7cce6d517accdc6e0d74… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 8 22:15:59 2019 +0800 dxgi/tests: Test output after using Alt+Enter to switch fullscreen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index d8176bb..38aeba1 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5306,6 +5306,7 @@ static void test_window_association(void) LONG_PTR original_wndproc, wndproc; IDXGIFactory *factory, *factory2; IDXGISwapChain *swapchain; + IDXGIOutput *output; IDXGIAdapter *adapter; IDXGIDevice *device; HWND hwnd, hwnd2; @@ -5449,14 +5450,18 @@ static void test_window_association(void) PostMessageA(swapchain_desc.OutputWindow, WM_SYSKEYDOWN, VK_RETURN, (MapVirtualKeyA(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x20000001); flush_events(); - hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + output = NULL; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); ok(fullscreen == tests[i].expect_fullscreen || broken(tests[i].broken_d3d10 && fullscreen), "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); + todo_wine_if(fullscreen) ok(fullscreen ? !!output : !output, "Test %u: Got wrong output.\n", i); + if (output) + IDXGIOutput_Release(output); wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); - ok(wndproc == original_wndproc, "Text %u: Got unexpected wndproc %#lx, expected %#lx.\n", + ok(wndproc == original_wndproc, "Test %u: Got unexpected wndproc %#lx, expected %#lx.\n", i, wndproc, original_wndproc); } }

1 0

Zhiyi Zhang : dxgi: Fix possible null output from d3d11_swapchain_GetFullscreenState.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: e66f8e8c2deda5dfdf22adfe1a98aadcc9d9ad01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e66f8e8c2deda5dfdf22adfe… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 8 22:16:41 2019 +0800 dxgi: Fix possible null output from d3d11_swapchain_GetFullscreenState. When swapchain is created in windowed mode, and then enter fullscreen via Alt+Enter. Calling d3d11_swapchain_GetFullscreenState will return a null output because swapchain->target wasn't initialized. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 20 ++++++++++++++++---- dlls/dxgi/tests/dxgi.c | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 8dbbfab..caf0863 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -407,22 +407,34 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFullscreenState(IDXGISwapCha { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); struct wined3d_swapchain_desc swapchain_desc; + HRESULT hr; TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); - if (fullscreen) + if (fullscreen || target) { wined3d_mutex_lock(); wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); wined3d_mutex_unlock(); - *fullscreen = !swapchain_desc.windowed; } + if (fullscreen) + *fullscreen = !swapchain_desc.windowed; + if (target) { - *target = swapchain->target; - if (*target) + if (!swapchain_desc.windowed) + { + if (!swapchain->target && FAILED(hr = IDXGISwapChain1_GetContainingOutput(iface, &swapchain->target))) + return hr; + + *target = swapchain->target; IDXGIOutput_AddRef(*target); + } + else + { + *target = NULL; + } } return S_OK; diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 38aeba1..ab33caf 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5456,7 +5456,7 @@ static void test_window_association(void) ok(fullscreen == tests[i].expect_fullscreen || broken(tests[i].broken_d3d10 && fullscreen), "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); - todo_wine_if(fullscreen) ok(fullscreen ? !!output : !output, "Test %u: Got wrong output.\n", i); + ok(fullscreen ? !!output : !output, "Test %u: Got wrong output.\n", i); if (output) IDXGIOutput_Release(output);

1 0

Jeff Smith : d3drm: Check for NULL pointer in d3drm_viewport2_GetDevice().
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 76a7fe59ebc0f53073715477bed2c7dc31e03e8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=76a7fe59ebc0f53073715477… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Jul 8 10:19:43 2019 -0500 d3drm: Check for NULL pointer in d3drm_viewport2_GetDevice(). Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 4 ++++ dlls/d3drm/viewport.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 8667819..67696d5 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2153,6 +2153,8 @@ static void test_Viewport(void) hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + hr = IDirect3DRMViewport_GetDevice(viewport, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); IDirect3DRMViewport_Release(viewport); ref4 = get_refcount((IUnknown *)d3drm1); @@ -2241,6 +2243,8 @@ static void test_Viewport(void) hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + hr = IDirect3DRMViewport2_GetDevice(viewport2, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); IDirect3DRMViewport2_Release(viewport2); ref4 = get_refcount((IUnknown *)d3drm1); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 51174cd..d049f37 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -683,6 +683,9 @@ static HRESULT WINAPI d3drm_viewport2_GetDevice(IDirect3DRMViewport2 *iface, IDi TRACE("iface %p, device %p.\n", iface, device); + if (!device) + return D3DRMERR_BADVALUE; + if (!viewport->device) return D3DRMERR_BADOBJECT; @@ -698,6 +701,9 @@ static HRESULT WINAPI d3drm_viewport1_GetDevice(IDirect3DRMViewport *iface, IDir TRACE("iface %p, device %p.\n\n", iface, device); + if (!device) + return D3DRMERR_BADVALUE; + if (!viewport->device) return D3DRMERR_BADOBJECT;

1 0

Jeff Smith : d3drm: Check for NULL pointer in d3drm_viewport2_GetDirect3DViewport().
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: d2d64ced538672e278bd39d37c41cced150595dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2d64ced538672e278bd39d3… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Jul 8 10:19:44 2019 -0500 d3drm: Check for NULL pointer in d3drm_viewport2_GetDirect3DViewport(). Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 4 ++++ dlls/d3drm/viewport.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 67696d5..88f3db8 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2155,6 +2155,8 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); hr = IDirect3DRMViewport_GetDevice(viewport, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); IDirect3DRMViewport_Release(viewport); ref4 = get_refcount((IUnknown *)d3drm1); @@ -2245,6 +2247,8 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); hr = IDirect3DRMViewport2_GetDevice(viewport2, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); IDirect3DRMViewport2_Release(viewport2); ref4 = get_refcount((IUnknown *)d3drm1); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index d049f37..430c9d4 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -896,6 +896,9 @@ static HRESULT WINAPI d3drm_viewport2_GetDirect3DViewport(IDirect3DRMViewport2 * TRACE("iface %p, viewport %p.\n", iface, viewport); + if (!viewport) + return D3DRMERR_BADVALUE; + if (!viewport_object->d3d_viewport) return D3DRMERR_BADOBJECT;

1 0

Jeff Smith : d3drm: Return error if setting viewport field-of-view to zero or negative value.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 643e6379a955b875447fd8c245ab47fd8af1f216 URL: https://source.winehq.org/git/wine.git/?a=commit;h=643e6379a955b875447fd8c2… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Jul 8 10:19:45 2019 -0500 d3drm: Return error if setting viewport field-of-view to zero or negative value. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 8 ++++++++ dlls/d3drm/viewport.c | 3 +++ 2 files changed, 11 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 88f3db8..dbba859 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2157,6 +2157,10 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRMViewport_SetField(viewport, 0.0f); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRMViewport_SetField(viewport, -1.0f); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); IDirect3DRMViewport_Release(viewport); ref4 = get_refcount((IUnknown *)d3drm1); @@ -2249,6 +2253,10 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRMViewport2_SetField(viewport2, 0.0f); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRMViewport2_SetField(viewport2, -1.0f); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); IDirect3DRMViewport2_Release(viewport2); ref4 = get_refcount((IUnknown *)d3drm1); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 430c9d4..c2fa189 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -523,6 +523,9 @@ static HRESULT WINAPI d3drm_viewport2_SetField(IDirect3DRMViewport2 *iface, D3DV TRACE("iface %p, field %.8e.\n", iface, field); + if (field <= 0.0f) + return D3DRMERR_BADVALUE; + viewport->field = field; return D3DRM_OK;

1 0