October 2021 - Wine-commits

Matteo Bruni : wined3d: End transform feedback on SO buffer destruction even if the D3D buffer isn't bound.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: e2abbf9c583a203c135a5a0c79cf23b228603bd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2abbf9c583a203c135a5a0c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 19 17:43:47 2021 +0200 wined3d: End transform feedback on SO buffer destruction even if the D3D buffer isn't bound. It might still be bound in GL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 16 ++++++++++------ dlls/wined3d/device.c | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d259b64bfaf..854fa71aefe 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -145,12 +145,16 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu if (!buffer_gl->b.buffer_object) return; - if (context_gl->c.transform_feedback_active && resource->bind_count - && resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) - { - /* We have to make sure that transform feedback is not active - * when deleting a potentially bound transform feedback buffer. - * This may happen when the device is being destroyed. */ + if (context_gl->c.transform_feedback_active && (resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) + && wined3d_context_is_graphics_state_dirty(&context_gl->c, STATE_STREAM_OUTPUT)) + { + /* It's illegal to (un)bind GL_TRANSFORM_FEEDBACK_BUFFER while transform + * feedback is active. Deleting a buffer implicitly unbinds it, so we + * need to end transform feedback here if this buffer was bound. + * + * This should only be possible if STATE_STREAM_OUTPUT is dirty; if we + * do a draw call before destroying this buffer then the draw call will + * already rebind the GL target. */ WARN("Deleting buffer object for buffer %p, disabling transform feedback.\n", buffer_gl); wined3d_context_gl_end_transform_feedback(context_gl); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 86945485e20..1c584b93fe0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1182,7 +1182,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_texture_decref(texture); } - wined3d_device_context_emit_reset_state(&device->cs->c, false); + wined3d_device_context_emit_reset_state(&device->cs->c, true); state_cleanup(state); wine_rb_clear(&device->samplers, device_free_sampler, NULL);

1 0

Esme Povirk : localspl: Add ARM print environments.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 0d05b01ce46fe0e3eb7fa667decac8e849735784 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d05b01ce46fe0e3eb7fa667… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Oct 18 11:31:12 2021 -0500 localspl: Add ARM print environments. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51815 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 8 +++++++- dlls/winspool.drv/info.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index c17983e3037..d7c1464ef2c 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -245,10 +245,16 @@ static const printenv_t env_x86 = {x86_envnameW, L"w32x86", 3, static const printenv_t env_x64 = {L"Windows x64", L"x64", 3, L"\\Version-3", L"\\3"}; +static const printenv_t env_arm = {L"Windows ARM", L"arm", 3, + L"\\Version-3", L"\\3"}; + +static const printenv_t env_arm64 = {L"Windows ARM64", L"arm64", 3, + L"\\Version-3", L"\\3"}; + static const printenv_t env_win40 = {L"Windows 4.0", L"win40", 0, L"\\Version-0", L"\\0"}; -static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_ia64, &env_win40}; +static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_ia64, &env_arm, &env_arm64, &env_win40}; static const DWORD di_sizeof[] = {0, sizeof(DRIVER_INFO_1W), sizeof(DRIVER_INFO_2W), diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index edfdab218c4..74617537a6b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -232,9 +232,13 @@ static const WCHAR WinNT_CV_PrinterPortsW[] = { 'S','o','f','t','w','a','r','e', static WCHAR envname_win40W[] = {'W','i','n','d','o','w','s',' ','4','.','0',0}; static const WCHAR envname_x64W[] = {'W','i','n','d','o','w','s',' ','x','6','4',0}; static WCHAR envname_x86W[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; +static const WCHAR envname_armW[] = {'W','i','n','d','o','w','s',' ','A','R','M',0}; +static const WCHAR envname_arm64W[] = {'W','i','n','d','o','w','s',' ','A','R','M','6','4',0}; static const WCHAR subdir_win40W[] = {'w','i','n','4','0',0}; static const WCHAR subdir_x64W[] = {'x','6','4',0}; static const WCHAR subdir_x86W[] = {'w','3','2','x','8','6',0}; +static const WCHAR subdir_armW[] = {'a','r','m',0}; +static const WCHAR subdir_arm64W[] = {'a','r','m','6','4',0}; static const WCHAR Version0_RegPathW[] = {'\\','V','e','r','s','i','o','n','-','0',0}; static const WCHAR Version0_SubdirW[] = {'\\','0',0}; static const WCHAR Version3_RegPathW[] = {'\\','V','e','r','s','i','o','n','-','3',0}; @@ -310,9 +314,11 @@ static const DWORD pi_sizeof[] = {0, sizeof(PRINTER_INFO_1W), sizeof(PRINTER_INF static const printenv_t env_x64 = {envname_x64W, subdir_x64W, 3, Version3_RegPathW, Version3_SubdirW}; static const printenv_t env_x86 = {envname_x86W, subdir_x86W, 3, Version3_RegPathW, Version3_SubdirW}; +static const printenv_t env_arm = {envname_armW, subdir_armW, 3, Version3_RegPathW, Version3_SubdirW}; +static const printenv_t env_arm64 = {envname_arm64W, subdir_arm64W, 3, Version3_RegPathW, Version3_SubdirW}; static const printenv_t env_win40 = {envname_win40W, subdir_win40W, 0, Version0_RegPathW, Version0_SubdirW}; -static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_win40}; +static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_arm, &env_arm64, &env_win40}; /****************************************************************** * validate the user-supplied printing-environment [internal]

1 0

Esme Povirk : localspl: Choose print environment based on architecture.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 6e14766ad517cd8387c649d9958f376fbcdc808c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e14766ad517cd8387c649d9… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Oct 18 11:31:13 2021 -0500 localspl: Choose print environment based on architecture. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51815 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 14 +++++++++++++- dlls/winspool.drv/info.c | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index d7c1464ef2c..aded4ed44c4 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -256,6 +256,18 @@ static const printenv_t env_win40 = {L"Windows 4.0", L"win40", 0, static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_ia64, &env_arm, &env_arm64, &env_win40}; +#ifdef __i386__ +#define env_arch env_x86 +#elif defined __x86_64__ +#define env_arch env_x64 +#elif defined __arm__ +#define env_arch env_arm +#elif defined __aarch64__ +#define env_arch env_arm64 +#else +#error not defined for this cpu +#endif + static const DWORD di_sizeof[] = {0, sizeof(DRIVER_INFO_1W), sizeof(DRIVER_INFO_2W), sizeof(DRIVER_INFO_3W), sizeof(DRIVER_INFO_4W), @@ -922,7 +934,7 @@ static const printenv_t * validate_envW(LPCWSTR env) } else { - result = (GetVersion() & 0x80000000) ? &env_win40 : &env_x86; + result = (GetVersion() & 0x80000000) ? &env_win40 : &env_arch; } TRACE("=> using %p: %s\n", result, debugstr_w(result ? result->envname : NULL)); diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 74617537a6b..660a5afe74d 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -320,6 +320,18 @@ static const printenv_t env_win40 = {envname_win40W, subdir_win40W, 0, Version0_ static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_arm, &env_arm64, &env_win40}; +#ifdef __i386__ +#define env_arch env_x86 +#elif defined __x86_64__ +#define env_arch env_x64 +#elif defined __arm__ +#define env_arch env_arm +#elif defined __aarch64__ +#define env_arch env_arm64 +#else +#error not defined for this cpu +#endif + /****************************************************************** * validate the user-supplied printing-environment [internal] * @@ -361,7 +373,7 @@ static const printenv_t * validate_envW(LPCWSTR env) } else { - result = (GetVersion() & 0x80000000) ? &env_win40 : &env_x86; + result = (GetVersion() & 0x80000000) ? &env_win40 : &env_arch; } TRACE("using %p: %s\n", result, debugstr_w(result ? result->envname : NULL));

1 0

Rémi Bernon : dinput: Use object instance offset to access extra value caps.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: f091aeae50a1fa79b29110965ddd31d63c6a4ed3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f091aeae50a1fa79b2911096… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 19 09:20:01 2021 +0200 dinput: Use object instance offset to access extra value caps. Value objects are always enumerated first, so offset / sizeof(LONG) can be safely used to index input_extra_caps array. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 89 +++++++++++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f091aeae50a1fa79b291…

1 0

Rémi Bernon : dinput: Factor all GetProperty implementations together.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 3ec4ae839058512e693f5a7b657c7b143f1449da URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ec4ae839058512e693f5a7b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 19 09:20:02 2021 +0200 dinput: Factor all GetProperty implementations together. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 128 +++++++++++++++++++++++++++++-------------- dlls/dinput/device_private.h | 2 + dlls/dinput/joystick_hid.c | 105 ++++++++++------------------------- dlls/dinput/keyboard.c | 58 ++++++-------------- dlls/dinput/mouse.c | 85 +++++++++------------------- dlls/dinput8/tests/device.c | 35 ------------ dlls/dinput8/tests/hid.c | 1 - 7 files changed, 160 insertions(+), 254 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3ec4ae839058512e693f…

1 0

Rémi Bernon : dinput: Implement GetProperty with DIPROP_FFGAIN stub.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 7402568a45c914cb16eca7f8d576146539e1efed URL: https://source.winehq.org/git/wine.git/?a=commit;h=7402568a45c914cb16eca7f8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 19 09:20:03 2021 +0200 dinput: Implement GetProperty with DIPROP_FFGAIN stub. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 7 +++++++ dlls/dinput8/tests/device.c | 4 ---- dlls/dinput8/tests/hid.c | 4 ---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 75ca6676bec..54645fa995e 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1280,6 +1280,13 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface } return S_FALSE; } + case (DWORD_PTR)DIPROP_FFGAIN: + { + DIPROPDWORD *value = (DIPROPDWORD *)header; + if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; + value->dwData = 10000; + return DI_OK; + } case (DWORD_PTR)DIPROP_CALIBRATION: return DIERR_INVALIDPARAM; default: diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 9f331c1b84c..4492170673e 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -1315,9 +1315,7 @@ static void test_mouse_info(void) ok( prop_dword.dwData == 0, "got %#x expected %#x\n", prop_dword.dwData, 0 ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "GetProperty DIPROP_FFGAIN returned %#x\n", hr ); - todo_wine ok( prop_dword.dwData == 10000, "got %u expected %u\n", prop_dword.dwData, 10000 ); hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIMouse2 ); @@ -1638,9 +1636,7 @@ static void test_keyboard_info(void) ok( prop_dword.dwData == 0, "got %#x expected %#x\n", prop_dword.dwData, 0 ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "GetProperty DIPROP_FFGAIN returned %#x\n", hr ); - todo_wine ok( prop_dword.dwData == 10000, "got %u expected %u\n", prop_dword.dwData, 10000 ); hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIKeyboard ); diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 8bb463b2fd7..b23d3a6bfd8 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3992,9 +3992,7 @@ static void test_simple_joystick(void) ok( prop_dword.dwData == 0, "got %#x expected %#x\n", prop_dword.dwData, 0 ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "GetProperty DIPROP_FFGAIN returned %#x\n", hr ); - todo_wine ok( prop_dword.dwData == 10000, "got %u expected %u\n", prop_dword.dwData, 10000 ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_CALIBRATION, &prop_dword.diph ); @@ -7143,9 +7141,7 @@ static void test_force_feedback_joystick( void ) prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "GetProperty DIPROP_FFGAIN returned %#x\n", hr ); - todo_wine ok( prop_dword.dwData == 10000, "got %u expected %u\n", prop_dword.dwData, 10000 ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph );

1 0

Rémi Bernon : dinput: Use the base device state in the mouse device.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 50d60884b50b1ba5d1dd939984b9cbb6a9f5f2d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50d60884b50b1ba5d1dd9399… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 19 09:20:04 2021 +0200 dinput: Use the base device state in the mouse device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/mouse.c | 116 +++++++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=50d60884b50b1ba5d1dd…

1 0

Rémi Bernon : dinput: Use the base device state in the keyboard device.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: d94ad65f98acdadb457bb3a1057c455960028b21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d94ad65f98acdadb457bb3a1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 19 09:20:05 2021 +0200 dinput: Use the base device state in the keyboard device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/keyboard.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index bb1102e38eb..a1764eb64c0 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -34,8 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); -#define WINE_DINPUT_KEYBOARD_MAX_KEYS 256 - static const IDirectInputDevice8WVtbl SysKeyboardWvt; static const struct dinput_device_vtbl keyboard_internal_vtbl; @@ -43,7 +41,6 @@ typedef struct SysKeyboardImpl SysKeyboardImpl; struct SysKeyboardImpl { struct IDirectInputDeviceImpl base; - BYTE DInputKeyState[WINE_DINPUT_KEYBOARD_MAX_KEYS]; }; static inline SysKeyboardImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) @@ -115,11 +112,10 @@ int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lpa new_diks = hook->flags & LLKHF_UP ? 0 : 0x80; /* returns now if key event already known */ - if (new_diks == This->DInputKeyState[dik_code]) - return ret; + if (new_diks == This->base.device_state[dik_code]) return ret; - This->DInputKeyState[dik_code] = new_diks; - TRACE(" setting %02X to %02X\n", dik_code, This->DInputKeyState[dik_code]); + This->base.device_state[dik_code] = new_diks; + TRACE( " setting key %02x to %02x\n", dik_code, This->base.device_state[dik_code] ); EnterCriticalSection(&This->base.crit); queue_event(iface, DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON, @@ -248,6 +244,8 @@ const struct dinput_device keyboard_device = { static HRESULT WINAPI SysKeyboardWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, DWORD len, LPVOID ptr) { SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); + DWORD i; + TRACE("(%p)->(%d,%p)\n", This, len, ptr); if (!This->base.acquired) return DIERR_NOTACQUIRED; @@ -259,15 +257,14 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W ifac EnterCriticalSection(&This->base.crit); - if (TRACE_ON(dinput)) { - int i; - for (i = 0; i < WINE_DINPUT_KEYBOARD_MAX_KEYS; i++) { - if (This->DInputKeyState[i] != 0x00) - TRACE(" - %02X: %02x\n", i, This->DInputKeyState[i]); - } + if (TRACE_ON(dinput)) + { + TRACE( "pressed keys:" ); + for (i = 0; i < len; i++) if (This->base.device_state[i]) TRACE( " %02x", i ); + TRACE( "\n" ); } - fill_DataFormat(ptr, len, This->DInputKeyState, &This->base.data_format); + fill_DataFormat( ptr, len, This->base.device_state, &This->base.data_format ); LeaveCriticalSection(&This->base.crit); return DI_OK; @@ -281,7 +278,7 @@ static HRESULT keyboard_internal_acquire( IDirectInputDevice8W *iface ) static HRESULT keyboard_internal_unacquire( IDirectInputDevice8W *iface ) { SysKeyboardImpl *This = impl_from_IDirectInputDevice8W( iface ); - memset( This->DInputKeyState, 0, sizeof(This->DInputKeyState) ); + memset( This->base.device_state, 0, sizeof(This->base.device_state) ); return DI_OK; }

1 0

Rémi Bernon : dinput: Factor all SetProperty implementations together.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 47a821400a7e0cde13e198f2ab1691d50918345d URL: https://source.winehq.org/git/wine.git/?a=commit;h=47a821400a7e0cde13e198f2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 19 09:20:06 2021 +0200 dinput: Factor all SetProperty implementations together. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 229 ++++++++++++++++++++++++++----------------- dlls/dinput/device_private.h | 2 + dlls/dinput/joystick_hid.c | 113 +++++---------------- dlls/dinput/keyboard.c | 7 ++ dlls/dinput/mouse.c | 7 ++ 5 files changed, 179 insertions(+), 179 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=47a821400a7e0cde13e1…

1 0

Zhiyi Zhang : appwiz.cpl: Pass size in bytes to RegQueryValueExW().
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 65095933fd53dfb40a26530bfeb49e65f6175b69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65095933fd53dfb40a26530b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 19 16:30:31 2021 +0800 appwiz.cpl: Pass size in bytes to RegQueryValueExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/appwiz.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 2bc108b63c6..410de81043d 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -542,7 +542,7 @@ static void SetInfoDialogText(HKEY hKey, LPCWSTR lpKeyName, LPCWSTR lpAltMessage } else { - buflen = MAX_STRING_LEN; + buflen = sizeof(buf); if ((RegQueryValueExW(hKey, lpKeyName, 0, 0, (LPBYTE) buf, &buflen) == ERROR_SUCCESS) && buf[0])

1 0