winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
November 2022
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
1171 discussions
Start a n
N
ew thread
Nikolay Sivov : vbscript: Make redim fail on fixed-size arrays.
by Alexandre Julliard
30 Nov '22
30 Nov '22
Module: wine Branch: master Commit: 7ca1eff8e13b7f3f8a50be25856301543051fb44 URL:
https://gitlab.winehq.org/wine/wine/-/commit/7ca1eff8e13b7f3f8a50be25856301…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 23 08:35:01 2022 +0300 vbscript: Make redim fail on fixed-size arrays. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=53964
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/interp.c | 23 ++++++++++++--------- dlls/vbscript/tests/lang.vbs | 48 ++++++++++++++++++++++++++++++++++++++------ dlls/vbscript/tests/run.c | 33 ++++++++++++++++++++++++++++-- 3 files changed, 87 insertions(+), 17 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 2d33982839e..b3be3bea6cf 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1246,6 +1246,7 @@ static HRESULT interp_dim(exec_ctx_t *ctx) *array_ref = SafeArrayCreate(VT_VARIANT, array_desc->dim_cnt, array_desc->bounds); if(!*array_ref) return E_OUTOFMEMORY; + (*array_ref)->fFeatures |= (FADF_FIXEDSIZE | FADF_STATIC); } V_VT(v) = VT_ARRAY|VT_BYREF|VT_VARIANT; @@ -1302,6 +1303,18 @@ static HRESULT interp_redim(exec_ctx_t *ctx) return E_FAIL; } + v = ref.u.v; + + if(V_VT(v) == (VT_VARIANT|VT_BYREF)) { + v = V_VARIANTREF(v); + } + + if(V_ISARRAY(v)) { + SAFEARRAY *sa = V_ISBYREF(v) ? *V_ARRAYREF(v) : V_ARRAY(v); + if(sa->fFeatures & FADF_FIXEDSIZE) + return MAKE_VBSERROR(VBSE_ARRAY_LOCKED); + } + hres = array_bounds_from_stack(ctx, dim_cnt, &bounds); if(FAILED(hres)) return hres; @@ -1311,14 +1324,6 @@ static HRESULT interp_redim(exec_ctx_t *ctx) if(!array) return E_OUTOFMEMORY; - /* FIXME: We should check if we're not modifying an existing static array here */ - - v = ref.u.v; - - if(V_VT(v) == (VT_VARIANT|VT_BYREF)) { - v = V_VARIANTREF(v); - } - VariantClear(v); V_VT(v) = VT_ARRAY|VT_VARIANT; V_ARRAY(v) = array; @@ -1361,7 +1366,7 @@ static HRESULT interp_redim_preserve(exec_ctx_t *ctx) return E_FAIL; } - array = V_ARRAY(v); + array = V_ISBYREF(v) ? *V_ARRAYREF(v) : V_ARRAY(v); hres = array_bounds_from_stack(ctx, dim_cnt, &bounds); if(FAILED(hres)) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index ddfaf20a19d..d27277508c0 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1531,12 +1531,48 @@ e = err.number on error goto 0 ok e = 9, "e = " & e ' VBSE_OUT_OF_BOUNDS, can only change rightmost dimension -dim staticarray(4) -on error resume next -redim staticarray(3) -e = err.number -on error goto 0 -todo_wine_ok e = 10, "e = " & e +sub TestReDimFixed + on error resume next + + dim staticarray(4) + err.clear + redim staticarray(3) + call ok(err.number = 10, "err.number = " & err.number) + call ok(isArrayFixed(staticarray), "Expected fixed size array") + + err.clear + redim staticarray("abc") + call ok(err.number = 10, "err.number = " & err.number) + + dim staticarray2(4) + err.clear + redim preserve staticarray2(5) + call ok(err.number = 10, "err.number = " & err.number) + call ok(isArrayFixed(staticarray2), "Expected fixed size array") + + err.clear + redim preserve staticarray2("abc") + ' Win10+ builds return INVALID_CALL (5) + call ok(err.number = 5 or err.number = 13, "err.number = " & err.number) +end sub +Call TestRedimFixed + +sub TestRedimInputArg + on error resume next + + dim x + + x = Array(1) + err.clear + redim x("abc") + call ok(err.number = 13, "err.number = " & err.number) + + err.clear + redim preserve x("abc") + ' Win10+ builds return INVALID_CALL (5) + call ok(err.number = 5 or err.number = 13, "err.number = " & err.number) +end sub +Call TestRedimInputArg sub TestReDimList dim x, y diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 31ac03ab8d7..022d714dea5 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -146,6 +146,7 @@ DEFINE_EXPECT(OnLeaveScript); #define DISPID_GLOBAL_PROPARGSET 1025 #define DISPID_GLOBAL_UNKOBJ 1026 #define DISPID_GLOBAL_THROWEXCEPTION 1027 +#define DISPID_GLOBAL_ISARRAYFIXED 1028 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -568,7 +569,6 @@ static void test_safearray(SAFEARRAY *safearray, unsigned indims) if(!exdims) exdims = 1; ok(safearray->cDims == exdims, "safearray->cDims = %d, expected %d\n", safearray->cDims, exdims); - todo_wine ok(safearray->fFeatures == (FADF_VARIANT|FADF_HAVEVARTYPE|FADF_FIXEDSIZE|FADF_STATIC), "safearray->fFeatures = %x\n", safearray->fFeatures); ok(safearray->cbElements == sizeof(VARIANT), "safearray->cbElements = %lx\n", safearray->cbElements); @@ -1163,7 +1163,8 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { L"testOptionalArg", DISPID_GLOBAL_TESTOPTIONALARG }, { L"testErrorObject", DISPID_GLOBAL_TESTERROROBJECT }, { L"throwWithDesc", DISPID_GLOBAL_THROWWITHDESC }, - { L"unkObj", DISPID_GLOBAL_UNKOBJ } + { L"unkObj", DISPID_GLOBAL_UNKOBJ }, + { L"isArrayFixed", DISPID_GLOBAL_ISARRAYFIXED }, }; test_grfdex(grfdex, fdexNameCaseInsensitive); @@ -1737,6 +1738,34 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_VT(pvarRes) = VT_UNKNOWN; V_UNKNOWN(pvarRes) = &unkObj; return S_OK; + + case DISPID_GLOBAL_ISARRAYFIXED: + { + BOOL is_fixed = FALSE; + VARIANT *v; + + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == (VT_VARIANT|VT_BYREF), "Unexpected argument type %d.\n", V_VT(pdp->rgvarg)); + v = V_VARIANTREF(pdp->rgvarg); + ok(V_VT(v) == (VT_VARIANT|VT_ARRAY|VT_BYREF), "Unexpected argument type %d.\n", V_VT(v)); + if (V_ISARRAY(v)) + { + SAFEARRAY *sa = V_ISBYREF(v) ? *V_ARRAYREF(v) : V_ARRAY(v); + is_fixed = (sa->fFeatures & (FADF_FIXEDSIZE | FADF_STATIC)) == (FADF_FIXEDSIZE | FADF_STATIC); + } + + V_VT(pvarRes) = VT_BOOL; + V_BOOL(pvarRes) = is_fixed ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; + } } ok(0, "unexpected call %ld\n", id);
1
0
0
0
Nikolay Sivov : d3dcompiler: Implement D3DDisassemble() using vkd3d-shader.
by Alexandre Julliard
30 Nov '22
30 Nov '22
Module: wine Branch: master Commit: 7bf58c895c3145187bbc6dcbe4e0e14d11457a39 URL:
https://gitlab.winehq.org/wine/wine/-/commit/7bf58c895c3145187bbc6dcbe4e0e1…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 27 09:20:14 2022 +0300 d3dcompiler: Implement D3DDisassemble() using vkd3d-shader. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=46649
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dcompiler_43/compiler.c | 74 +++++++++++++++++++++++++++++++++++++++-- dlls/d3dcompiler_43/tests/asm.c | 6 ++-- 2 files changed, 73 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 174fbc98280..8fb38cf592c 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -596,11 +596,79 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename return preprocess_shader(data, size, filename, defines, include, shader, error_messages); } -HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T size, UINT flags, const char *comments, ID3DBlob **disassembly) +HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T size, UINT flags, const char *comments, + ID3DBlob **disassembly) { - FIXME("data %p, size %Iu, flags %#x, comments %p, disassembly %p stub!\n", + struct vkd3d_shader_compile_info compile_info; + enum vkd3d_shader_source_type source_type; + struct vkd3d_shader_code asm_code; + const char *ptr = data; + char *messages; + HRESULT hr; + int ret; + + TRACE("data %p, size %Iu, flags %#x, comments %p, disassembly %p.\n", data, size, flags, comments, disassembly); - return E_NOTIMPL; + + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + if (comments) + FIXME("Ignoring comments %s.\n", debugstr_a(comments)); + +#if D3D_COMPILER_VERSION >= 46 + if (!size) + return E_INVALIDARG; +#endif + + if (size >= 4 && read_u32(&ptr) == TAG_DXBC) + source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + else + source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE; + + compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; + compile_info.next = NULL; + compile_info.source.code = data; + compile_info.source.size = size; + compile_info.source_type = source_type; + compile_info.target_type = VKD3D_SHADER_TARGET_D3D_ASM; + compile_info.options = NULL; + compile_info.option_count = 0; + compile_info.log_level = VKD3D_SHADER_LOG_INFO; + compile_info.source_name = NULL; + + ret = vkd3d_shader_compile(&compile_info, &asm_code, &messages); + + if (ret) + ERR("Failed to disassemble shader, vkd3d result %d.\n", ret); + + if (messages) + { + if (*messages && ERR_ON(d3dcompiler)) + { + const char *ptr = messages; + const char *line; + + ERR("Shader log:\n"); + while ((line = get_line(&ptr))) + { + ERR(" %.*s", (int)(ptr - line), line); + } + ERR("\n"); + } + + vkd3d_shader_free_messages(messages); + } + + if (ret) + return hresult_from_vkd3d_result(ret); + + if (SUCCEEDED(hr = D3DCreateBlob(asm_code.size, disassembly))) + memcpy(ID3D10Blob_GetBufferPointer(*disassembly), asm_code.code, asm_code.size); + + vkd3d_shader_free_shader_code(&asm_code); + + return hr; } HRESULT WINAPI D3DCompileFromFile(const WCHAR *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index df686b9378c..6c22eae66c8 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1749,7 +1749,6 @@ static void test_disassemble_shader(void) HRESULT hr; hr = D3DDisassemble(vs_2_0, 0, 0, NULL, &blob); - todo_wine #if D3D_COMPILER_VERSION >= 46 ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); #else @@ -1757,9 +1756,8 @@ static void test_disassemble_shader(void) #endif hr = D3DDisassemble(vs_2_0, sizeof(vs_2_0), 0, NULL, &blob); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - ID3D10Blob_Release(blob); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ID3D10Blob_Release(blob); } START_TEST(asm)
1
0
0
0
Zhiyi Zhang : winex11.drv: Release window data before calling sync_window_cursor().
by Alexandre Julliard
30 Nov '22
30 Nov '22
Module: wine Branch: master Commit: e5c6f915bbd7290641ea43fb41429317bc7e7a80 URL:
https://gitlab.winehq.org/wine/wine/-/commit/e5c6f915bbd7290641ea43fb414293…
Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Nov 30 12:28:10 2022 +0800 winex11.drv: Release window data before calling sync_window_cursor(). This prevents a deadlock between the window data lock and the ntdll loader lock because sync_window_cursor() eventually may grab the ntdll loader lock. So if another thread already grabbed the ntdll loader lock and wants to enter the same window data critical section, it will deadlock. Fix Youropa (SteamID: 640120) OpenGL launch option launching to a black screen. --- dlls/winex11.drv/mouse.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index ebc8be643af..d1ade2eda68 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -644,6 +644,7 @@ static void map_event_coords( HWND hwnd, Window window, Window event_root, int x static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPUT *input ) { struct x11drv_win_data *data; + Window win = 0; input->type = INPUT_MOUSE; @@ -665,13 +666,14 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU } if (!(data = get_win_data( hwnd ))) return; + win = data->whole_window; + release_win_data( data ); if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || input->u.mi.time - last_cursor_change > 100) { - sync_window_cursor( data->whole_window ); + sync_window_cursor( win ); last_cursor_change = input->u.mi.time; } - release_win_data( data ); if (hwnd != NtUserGetDesktopWindow()) {
1
0
0
0
Rémi Bernon : joy.cpl: Remove unnecessary JoystickData structure.
by Alexandre Julliard
30 Nov '22
30 Nov '22
Module: wine Branch: master Commit: 140456a05834999ee2fd612e2aef8d52386ea562 URL:
https://gitlab.winehq.org/wine/wine/-/commit/140456a05834999ee2fd612e2aef8d…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 29 21:41:21 2022 +0100 joy.cpl: Remove unnecessary JoystickData structure. --- dlls/joy.cpl/main.c | 57 ++++++++++++++--------------------------------------- 1 file changed, 15 insertions(+), 42 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 8e8d167068e..28334ec6f99 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -44,11 +44,6 @@ struct device IDirectInputDevice8W *device; }; -struct JoystickData -{ - IDirectInput8W *di; -}; - static HMODULE hcpl; static CRITICAL_SECTION joy_cs; @@ -81,12 +76,12 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) static BOOL CALLBACK enum_devices( const DIDEVICEINSTANCEW *instance, void *context ) { DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)}; - struct JoystickData *data = context; + IDirectInput8W *dinput = context; struct device *entry; if (!(entry = calloc( 1, sizeof(*entry) ))) return DIENUM_STOP; - IDirectInput8_CreateDevice( data->di, &instance->guidInstance, &entry->device, NULL ); + IDirectInput8_CreateDevice( dinput, &instance->guidInstance, &entry->device, NULL ); IDirectInputDevice8_SetDataFormat( entry->device, &c_dfDIJoystick ); IDirectInputDevice8_GetCapabilities( entry->device, &caps ); @@ -170,8 +165,9 @@ static void enable_joystick(WCHAR *joy_name, BOOL enable) if (appkey) RegCloseKey(appkey); } -static void refresh_joystick_list(HWND hwnd, struct JoystickData *data) +static void refresh_joystick_list( HWND hwnd ) { + IDirectInput8W *dinput; struct device *entry; HKEY hkey, appkey; DWORD values = 0; @@ -180,7 +176,9 @@ static void refresh_joystick_list(HWND hwnd, struct JoystickData *data) clear_devices(); - IDirectInput8_EnumDevices( data->di, DI8DEVCLASS_GAMECTRL, enum_devices, data, DIEDFL_ATTACHEDONLY ); + DirectInput8Create( GetModuleHandleW( NULL ), DIRECTINPUT_VERSION, &IID_IDirectInput8W, (void **)&dinput, NULL ); + IDirectInput8_EnumDevices( dinput, DI8DEVCLASS_GAMECTRL, enum_devices, dinput, DIEDFL_ATTACHEDONLY ); + IDirectInput8_Release( dinput ); SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_RESETCONTENT, 0, 0); SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_RESETCONTENT, 0, 0); @@ -247,7 +245,6 @@ static void override_joystick(WCHAR *joy_name, BOOL override) static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { WCHAR instance_name[MAX_PATH] = {0}; - static struct JoystickData *data; int sel; TRACE("(%p, 0x%08x/%d, 0x%Ix)\n", hwnd, msg, msg, lparam); @@ -255,9 +252,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM { case WM_INITDIALOG: { - data = (struct JoystickData*) ((PROPSHEETPAGEW*)lparam)->lParam; - - refresh_joystick_list(hwnd, data); + refresh_joystick_list( hwnd ); EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), FALSE); EnableWindow(GetDlgItem(hwnd, IDC_BUTTONDISABLE), FALSE); @@ -281,7 +276,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM if (instance_name[0]) { enable_joystick(instance_name, FALSE); - refresh_joystick_list(hwnd, data); + refresh_joystick_list( hwnd ); } } break; @@ -294,7 +289,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM if (instance_name[0]) { enable_joystick(instance_name, TRUE); - refresh_joystick_list(hwnd, data); + refresh_joystick_list( hwnd ); } } break; @@ -305,7 +300,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM { SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_GETTEXT, sel, (LPARAM)instance_name); override_joystick(instance_name, FALSE); - refresh_joystick_list(hwnd, data); + refresh_joystick_list( hwnd ); } } break; @@ -316,7 +311,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM { SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_GETTEXT, sel, (LPARAM)instance_name); override_joystick(instance_name, TRUE); - refresh_joystick_list(hwnd, data); + refresh_joystick_list( hwnd ); } } break; @@ -375,7 +370,7 @@ static int CALLBACK propsheet_callback(HWND hwnd, UINT msg, LPARAM lparam) return 0; } -static void display_cpl_sheets( HWND parent, struct JoystickData *data ) +static void display_cpl_sheets( HWND parent ) { INITCOMMONCONTROLSEX init = { @@ -389,14 +384,12 @@ static void display_cpl_sheets( HWND parent, struct JoystickData *data ) .hInstance = hcpl, .pszTemplate = MAKEINTRESOURCEW( IDD_LIST ), .pfnDlgProc = list_dlgproc, - .lParam = (INT_PTR)data, }, { .dwSize = sizeof(PROPSHEETPAGEW), .hInstance = hcpl, .pszTemplate = MAKEINTRESOURCEW( IDD_TEST_DI ), .pfnDlgProc = test_di_dialog_proc, - .lParam = (INT_PTR)data, }, { .dwSize = sizeof(PROPSHEETPAGEW), @@ -499,30 +492,14 @@ static void unregister_window_class(void) */ LONG CALLBACK CPlApplet(HWND hwnd, UINT command, LPARAM lParam1, LPARAM lParam2) { - static struct JoystickData data; TRACE("(%p, %u, 0x%Ix, 0x%Ix)\n", hwnd, command, lParam1, lParam2); switch (command) { case CPL_INIT: - { - HRESULT hr; - register_window_class(); - - /* Initialize dinput */ - hr = DirectInput8Create(GetModuleHandleW(NULL), DIRECTINPUT_VERSION, &IID_IDirectInput8W, (void**)&data.di, NULL); - - if (FAILED(hr)) - { - ERR("Failed to initialize DirectInput: 0x%08lx\n", hr); - return FALSE; - } - - IDirectInput8_EnumDevices( data.di, DI8DEVCLASS_GAMECTRL, enum_devices, &data, DIEDFL_ATTACHEDONLY ); - return TRUE; - } + case CPL_GETCOUNT: return 1; @@ -538,15 +515,11 @@ LONG CALLBACK CPlApplet(HWND hwnd, UINT command, LPARAM lParam1, LPARAM lParam2) } case CPL_DBLCLK: - display_cpl_sheets(hwnd, &data); + display_cpl_sheets( hwnd ); break; case CPL_STOP: clear_devices(); - - /* And destroy dinput too */ - IDirectInput8_Release(data.di); - unregister_window_class(); break; }
1
0
0
0
Rémi Bernon : joy.cpl: Move dinput test tab logic to dinput.c.
by Alexandre Julliard
30 Nov '22
30 Nov '22
Module: wine Branch: master Commit: 9d80a0ee790adbbd4bcc9997bbb23aa86e0a1c06 URL:
https://gitlab.winehq.org/wine/wine/-/commit/9d80a0ee790adbbd4bcc9997bbb23a…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 29 21:20:41 2022 +0100 joy.cpl: Move dinput test tab logic to dinput.c. --- dlls/joy.cpl/dinput.c | 514 +++++++++++++++++++++++++++++++++++++++++++-- dlls/joy.cpl/joy_private.h | 2 +- dlls/joy.cpl/main.c | 496 +------------------------------------------ 3 files changed, 494 insertions(+), 518 deletions(-)
1
0
0
0
Rémi Bernon : joy.cpl: Draw dinput axes state with gdi32.
by Alexandre Julliard
30 Nov '22
30 Nov '22
Module: wine Branch: master Commit: e67b94398355da9e4549c8f6e406a98cba82d440 URL:
https://gitlab.winehq.org/wine/wine/-/commit/e67b94398355da9e4549c8f6e406a9…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Nov 27 23:35:23 2022 +0100 joy.cpl: Draw dinput axes state with gdi32. --- dlls/joy.cpl/dinput.c | 196 +++++++++++++++++++++++++++++++++++++++++++++ dlls/joy.cpl/joy.rc | 6 +- dlls/joy.cpl/joy_private.h | 2 + dlls/joy.cpl/main.c | 137 +++++++++++-------------------- dlls/joy.cpl/resource.h | 10 +-- po/ar.po | 36 +++++---- po/ast.po | 36 +++++---- po/bg.po | 36 +++++---- po/ca.po | 36 +++++---- po/cs.po | 36 +++++---- po/da.po | 36 +++++---- po/de.po | 36 +++++---- po/el.po | 36 +++++---- po/en.po | 36 +++++---- po/en_US.po | 36 +++++---- po/eo.po | 36 +++++---- po/es.po | 36 +++++---- po/fa.po | 36 +++++---- po/fi.po | 36 +++++---- po/fr.po | 36 +++++---- po/he.po | 36 +++++---- po/hi.po | 36 +++++---- po/hr.po | 36 +++++---- po/hu.po | 36 +++++---- po/it.po | 36 +++++---- po/ja.po | 36 +++++---- po/ko.po | 36 +++++---- po/lt.po | 36 +++++---- po/ml.po | 36 +++++---- po/nb_NO.po | 36 +++++---- po/nl.po | 36 +++++---- po/or.po | 36 +++++---- po/pa.po | 36 +++++---- po/pl.po | 36 +++++---- po/pt_BR.po | 36 +++++---- po/pt_PT.po | 36 +++++---- po/rm.po | 36 +++++---- po/ro.po | 36 +++++---- po/ru.po | 36 +++++---- po/si.po | 36 +++++---- po/sk.po | 36 +++++---- po/sl.po | 36 +++++---- po/sr_RS(a)cyrillic.po | 36 +++++---- po/sr_RS(a)latin.po | 36 +++++---- po/sv.po | 36 +++++---- po/ta.po | 36 +++++---- po/te.po | 36 +++++---- po/th.po | 36 +++++---- po/tr.po | 36 +++++---- po/uk.po | 36 +++++---- po/wa.po | 36 +++++---- po/wine.pot | 36 +++++---- po/zh_CN.po | 36 +++++---- po/zh_TW.po | 36 +++++---- 54 files changed, 1327 insertions(+), 788 deletions(-)
1
0
0
0
Rémi Bernon : joy.cpl: Draw dinput button state with gdi32.
by Alexandre Julliard
30 Nov '22
30 Nov '22
Module: wine Branch: master Commit: 792babb282c9194f8d1a5e5597989090a318e978 URL:
https://gitlab.winehq.org/wine/wine/-/commit/792babb282c9194f8d1a5e55979890…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Nov 27 22:03:06 2022 +0100 joy.cpl: Draw dinput button state with gdi32. --- dlls/joy.cpl/Makefile.in | 1 + dlls/joy.cpl/dinput.c | 145 +++++++++++++++++++++++++++++++++++++++++++++ dlls/joy.cpl/joy.rc | 2 +- dlls/joy.cpl/joy_private.h | 5 ++ dlls/joy.cpl/main.c | 108 +++++++++++++++------------------ dlls/joy.cpl/resource.h | 3 +- po/ar.po | 2 +- po/ast.po | 2 +- po/bg.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en.po | 2 +- po/en_US.po | 2 +- po/eo.po | 2 +- po/es.po | 2 +- po/fa.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/he.po | 2 +- po/hi.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ko.po | 2 +- po/lt.po | 2 +- po/ml.po | 2 +- po/nb_NO.po | 2 +- po/nl.po | 2 +- po/or.po | 2 +- po/pa.po | 2 +- po/pl.po | 2 +- po/pt_BR.po | 2 +- po/pt_PT.po | 2 +- po/rm.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/si.po | 2 +- po/sk.po | 2 +- po/sl.po | 2 +- po/sr_RS(a)cyrillic.po | 2 +- po/sr_RS(a)latin.po | 2 +- po/sv.po | 2 +- po/ta.po | 2 +- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/wa.po | 2 +- po/wine.pot | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 55 files changed, 251 insertions(+), 111 deletions(-)
1
0
0
0
Rémi Bernon : joy.cpl: Add a checkbox to test xinput rumble.
by Alexandre Julliard
30 Nov '22
30 Nov '22
Module: wine Branch: master Commit: a05df2e847d2d3e528e98527106d4557f57d7df6 URL:
https://gitlab.winehq.org/wine/wine/-/commit/a05df2e847d2d3e528e98527106d45…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Nov 27 17:59:55 2022 +0100 joy.cpl: Add a checkbox to test xinput rumble. --- dlls/joy.cpl/joy.rc | 5 +++++ dlls/joy.cpl/resource.h | 4 ++++ dlls/joy.cpl/xinput.c | 43 +++++++++++++++++++++++++++++++++++++++++++ po/ar.po | 5 +++++ po/ast.po | 5 +++++ po/bg.po | 5 +++++ po/ca.po | 5 +++++ po/cs.po | 5 +++++ po/da.po | 5 +++++ po/de.po | 5 +++++ po/el.po | 5 +++++ po/en.po | 5 +++++ po/en_US.po | 5 +++++ po/eo.po | 5 +++++ po/es.po | 5 +++++ po/fa.po | 5 +++++ po/fi.po | 5 +++++ po/fr.po | 5 +++++ po/he.po | 5 +++++ po/hi.po | 5 +++++ po/hr.po | 5 +++++ po/hu.po | 5 +++++ po/it.po | 5 +++++ po/ja.po | 5 +++++ po/ko.po | 5 +++++ po/lt.po | 5 +++++ po/ml.po | 5 +++++ po/nb_NO.po | 5 +++++ po/nl.po | 5 +++++ po/or.po | 5 +++++ po/pa.po | 5 +++++ po/pl.po | 5 +++++ po/pt_BR.po | 5 +++++ po/pt_PT.po | 5 +++++ po/rm.po | 5 +++++ po/ro.po | 5 +++++ po/ru.po | 5 +++++ po/si.po | 5 +++++ po/sk.po | 5 +++++ po/sl.po | 5 +++++ po/sr_RS(a)cyrillic.po | 5 +++++ po/sr_RS(a)latin.po | 5 +++++ po/sv.po | 5 +++++ po/ta.po | 5 +++++ po/te.po | 5 +++++ po/th.po | 5 +++++ po/tr.po | 5 +++++ po/uk.po | 5 +++++ po/wa.po | 5 +++++ po/wine.pot | 5 +++++ po/zh_CN.po | 5 +++++ po/zh_TW.po | 5 +++++ 52 files changed, 297 insertions(+)
1
0
0
0
Rémi Bernon : joy.cpl: Draw xinput controller state with gdi32.
by Alexandre Julliard
30 Nov '22
30 Nov '22
Module: wine Branch: master Commit: 3bc30c372378f27864d35e7681de59ce046ef81f URL:
https://gitlab.winehq.org/wine/wine/-/commit/3bc30c372378f27864d35e7681de59…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Nov 27 15:31:11 2022 +0100 joy.cpl: Draw xinput controller state with gdi32. --- dlls/joy.cpl/Makefile.in | 2 +- dlls/joy.cpl/joy_private.h | 1 + dlls/joy.cpl/main.c | 19 ++++ dlls/joy.cpl/xinput.c | 238 ++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 258 insertions(+), 2 deletions(-)
1
0
0
0
Rémi Bernon : joy.cpl: Add a new xinput controller test tab.
by Alexandre Julliard
30 Nov '22
30 Nov '22
Module: wine Branch: master Commit: 3f4a7990893d0ae68e8555177ad7bf06874c7d3e URL:
https://gitlab.winehq.org/wine/wine/-/commit/3f4a7990893d0ae68e8555177ad7bf…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Nov 27 13:13:06 2022 +0100 joy.cpl: Add a new xinput controller test tab. --- dlls/joy.cpl/Makefile.in | 5 +- dlls/joy.cpl/joy.rc | 28 ++++++++ dlls/joy.cpl/joy_private.h | 33 +++++++++ dlls/joy.cpl/main.c | 8 ++- dlls/joy.cpl/resource.h | 10 +++ dlls/joy.cpl/xinput.c | 166 +++++++++++++++++++++++++++++++++++++++++++++ po/ar.po | 52 ++++++++++++++ po/ast.po | 52 ++++++++++++++ po/bg.po | 52 ++++++++++++++ po/ca.po | 52 ++++++++++++++ po/cs.po | 52 ++++++++++++++ po/da.po | 52 ++++++++++++++ po/de.po | 52 ++++++++++++++ po/el.po | 44 ++++++++++++ po/en.po | 52 ++++++++++++++ po/en_US.po | 52 ++++++++++++++ po/eo.po | 52 ++++++++++++++ po/es.po | 52 ++++++++++++++ po/fa.po | 44 ++++++++++++ po/fi.po | 52 ++++++++++++++ po/fr.po | 52 ++++++++++++++ po/he.po | 52 ++++++++++++++ po/hi.po | 44 ++++++++++++ po/hr.po | 52 ++++++++++++++ po/hu.po | 52 ++++++++++++++ po/it.po | 52 ++++++++++++++ po/ja.po | 52 ++++++++++++++ po/ko.po | 52 ++++++++++++++ po/lt.po | 52 ++++++++++++++ po/ml.po | 44 ++++++++++++ po/nb_NO.po | 52 ++++++++++++++ po/nl.po | 52 ++++++++++++++ po/or.po | 44 ++++++++++++ po/pa.po | 44 ++++++++++++ po/pl.po | 52 ++++++++++++++ po/pt_BR.po | 52 ++++++++++++++ po/pt_PT.po | 52 ++++++++++++++ po/rm.po | 44 ++++++++++++ po/ro.po | 52 ++++++++++++++ po/ru.po | 52 ++++++++++++++ po/si.po | 52 ++++++++++++++ po/sk.po | 44 ++++++++++++ po/sl.po | 52 ++++++++++++++ po/sr_RS(a)cyrillic.po | 52 ++++++++++++++ po/sr_RS(a)latin.po | 52 ++++++++++++++ po/sv.po | 52 ++++++++++++++ po/ta.po | 44 ++++++++++++ po/te.po | 44 ++++++++++++ po/th.po | 44 ++++++++++++ po/tr.po | 52 ++++++++++++++ po/uk.po | 52 ++++++++++++++ po/wa.po | 44 ++++++++++++ po/wine.pot | 44 ++++++++++++ po/zh_CN.po | 52 ++++++++++++++ po/zh_TW.po | 52 ++++++++++++++ 55 files changed, 2691 insertions(+), 3 deletions(-)
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
...
118
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
Results per page:
10
25
50
100
200