wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: cf4eecbf4f7326f7fe14b10c544f07211217cd74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf4eecbf4f7326f7fe14b10c… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sat Feb 5 10:30:22 2022 +0100 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/po/nl.po b/po/nl.po index 51a3e0f88e8..f174bf9c3e8 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-12-22 10:00+0100\n" +"PO-Revision-Date: 2022-02-05 10:30+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -6972,54 +6972,40 @@ msgid "This network connection does not exist.\n" msgstr "Deze netwerkverbinding bestaat niet.\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "Ongeldig op interruptietijd.\n" +msgstr "Oproep onderbroken.\n" #: dlls/kernel32/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "Ongeldige handle.\n" +msgstr "Ongeldige bestandsingang.\n" #: dlls/kernel32/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "Ongeldig netwerkadres.\n" +msgstr "Ongeldig pointeradres.\n" #: dlls/kernel32/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "Ongeldige naam.\n" +msgstr "Ongeldig argument.\n" #: dlls/kernel32/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "Verbinding opnieuw ingesteld door gelijkwaardige computer.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "Punt niet gevonden.\n" +msgstr "Host niet gevonden.\n" #: dlls/kernel32/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "Kenmerk is niet gevonden.\n" +msgstr "Niet-gemachtigde host niet gevonden.\n" #: dlls/kernel32/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "Onherstelbare fout opgetreden.\n" +msgstr "Onherstelbare fout.\n" #: dlls/kernel32/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "Geldige naam, geen gegevensrecord.\n" #: dlls/kernel32/winerror.mc:3817 msgid "Not implemented.\n"

1 0

Rémi Bernon : dinput: Cleanup IDirectInput8W names and traces.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 73ba9d34597dadafefbabf20bba43cdfd07a4965 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73ba9d34597dadafefbabf20… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 7 09:23:29 2022 +0100 dinput: Cleanup IDirectInput8W names and traces. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 157 ++++++++++++++++++++++------------------------ 1 file changed, 76 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73ba9d34597dadafefba…

1 0

Rémi Bernon : dinput: Cleanup IDirectInput7W names and traces.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: d33103bf0577dc7a76791bafd23b150e44a1a832 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d33103bf0577dc7a76791baf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 7 09:23:28 2022 +0100 dinput: Cleanup IDirectInput7W names and traces. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 184 ++++++++++++++++++++++------------------------ 1 file changed, 86 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d33103bf0577dc7a7679…

1 0

Rémi Bernon : dinput: Cleanup IDirectInputJoyConfig8 names and traces.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 44f7ccfcd19be8fea74ba4099796a1a676ed3d5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=44f7ccfcd19be8fea74ba409… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 7 09:23:27 2022 +0100 dinput: Cleanup IDirectInputJoyConfig8 names and traces. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 137 +++++++++++++++++++++++----------------------- 1 file changed, 70 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=44f7ccfcd19be8fea74b…

1 0

Rémi Bernon : dinput: Cleanup DllGetClassObject and IClassFactory implementation.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: ac7ff2611d418ea40bfa6cbf4c92bd793b2e4349 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac7ff2611d418ea40bfa6cbf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 7 09:23:26 2022 +0100 dinput: Cleanup DllGetClassObject and IClassFactory implementation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 121 +++++++++++++++++++++++---------------------- dlls/dinput/tests/dinput.c | 1 - 2 files changed, 63 insertions(+), 59 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index dbb727c3c43..2172eb32ee9 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1089,90 +1089,95 @@ static const IDirectInputJoyConfig8Vtbl JoyConfig8vt = JoyConfig8Impl_OpenAppStatusKey }; -/******************************************************************************* - * DirectInput ClassFactory - */ -typedef struct +struct class_factory { - /* IUnknown fields */ IClassFactory IClassFactory_iface; - LONG ref; -} IClassFactoryImpl; +}; -static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +static inline struct class_factory *impl_from_IClassFactory( IClassFactory *iface ) { - return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); + return CONTAINING_RECORD( iface, struct class_factory, IClassFactory_iface ); } -static HRESULT WINAPI DICF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); +static HRESULT WINAPI class_factory_QueryInterface( IClassFactory *iface, REFIID iid, void **out ) +{ + struct class_factory *impl = impl_from_IClassFactory(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj); - return E_NOINTERFACE; + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IClassFactory)) + *out = &impl->IClassFactory_iface; + else + { + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } -static ULONG WINAPI DICF_AddRef(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - return InterlockedIncrement(&(This->ref)); +static ULONG WINAPI class_factory_AddRef( IClassFactory *iface ) +{ + return 2; } -static ULONG WINAPI DICF_Release(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - /* static class, won't be freed */ - return InterlockedDecrement(&(This->ref)); +static ULONG WINAPI class_factory_Release( IClassFactory *iface ) +{ + return 1; } -static HRESULT WINAPI DICF_CreateInstance( - LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj -) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); +static HRESULT WINAPI class_factory_CreateInstance( IClassFactory *iface, IUnknown *outer, REFIID iid, void **out ) +{ + IUnknown *unknown; + HRESULT hr; - TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); - if ( IsEqualGUID( &IID_IUnknown, riid ) || - IsEqualGUID( &IID_IDirectInputA, riid ) || - IsEqualGUID( &IID_IDirectInputW, riid ) || - IsEqualGUID( &IID_IDirectInput2A, riid ) || - IsEqualGUID( &IID_IDirectInput2W, riid ) || - IsEqualGUID( &IID_IDirectInput7A, riid ) || - IsEqualGUID( &IID_IDirectInput7W, riid ) || - IsEqualGUID( &IID_IDirectInput8A, riid ) || - IsEqualGUID( &IID_IDirectInput8W, riid ) ) - { - return create_directinput_instance(riid, ppobj, NULL); - } + TRACE( "iface %p, outer %p, iid %s, out %p.\n", iface, outer, debugstr_guid( iid ), out ); + + if (outer) return CLASS_E_NOAGGREGATION; - FIXME("(%p,%p,%s,%p) Interface not found!\n",This,pOuter,debugstr_guid(riid),ppobj); - return E_NOINTERFACE; + if (FAILED(hr = create_directinput_instance( &IID_IUnknown, (void **)&unknown, NULL ))) return hr; + hr = IUnknown_QueryInterface( unknown, iid, out ); + IUnknown_Release( unknown ); + + return hr; } -static HRESULT WINAPI DICF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - FIXME("(%p)->(%d),stub!\n",This,dolock); - return S_OK; +static HRESULT WINAPI class_factory_LockServer( IClassFactory *iface, BOOL lock ) +{ + FIXME( "iface %p, lock %d stub!\n", iface, lock ); + return S_OK; } -static const IClassFactoryVtbl DICF_Vtbl = { - DICF_QueryInterface, - DICF_AddRef, - DICF_Release, - DICF_CreateInstance, - DICF_LockServer +static const IClassFactoryVtbl class_factory_vtbl = +{ + class_factory_QueryInterface, + class_factory_AddRef, + class_factory_Release, + class_factory_CreateInstance, + class_factory_LockServer, }; -static IClassFactoryImpl DINPUT_CF = {{&DICF_Vtbl}, 1 }; + +static struct class_factory class_factory = {{&class_factory_vtbl}}; /*********************************************************************** * DllGetClassObject (DINPUT.@) */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **out ) { - TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - if ( IsEqualCLSID( &IID_IClassFactory, riid ) ) { - *ppv = &DINPUT_CF; - IClassFactory_AddRef((IClassFactory*)*ppv); - return S_OK; - } + TRACE( "clsid %s, iid %s, out %p.\n", debugstr_guid( clsid ), debugstr_guid( iid ), out ); + +#if DIRECTINPUT_VERSION == 0x0700 + if (IsEqualCLSID( &CLSID_DirectInput, clsid )) + return IClassFactory_QueryInterface( &class_factory.IClassFactory_iface, iid, out ); +#else + if (IsEqualCLSID( &CLSID_DirectInput8, clsid )) + return IClassFactory_QueryInterface( &class_factory.IClassFactory_iface, iid, out ); +#endif - FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + WARN( "%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid( clsid ) ); return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index a2c7f5dbd8d..0b3ce276e52 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -167,7 +167,6 @@ static void test_CoCreateInstance( DWORD version ) &IID_IDirectInputA, (void **)&unknown ); else hr = CoCreateInstance( &CLSID_DirectInput8, &outer, CLSCTX_INPROC_SERVER, &IID_IDirectInput8A, (void **)&unknown ); - todo_wine ok( hr == CLASS_E_NOAGGREGATION, "CoCreateInstance returned %#x\n", hr ); if (SUCCEEDED( hr )) IUnknown_Release( unknown );

1 0

Rémi Bernon : dinput/tests: Add some CoCreateInstance and aggregation tests.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 22663565428264c32aeb00243b28baa2bbfe85de URL: https://source.winehq.org/git/wine.git/?a=commit;h=22663565428264c32aeb0024… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 7 09:23:25 2022 +0100 dinput/tests: Add some CoCreateInstance and aggregation tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/dinput.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 795a9ed39c6..a2c7f5dbd8d 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -76,6 +76,41 @@ static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *con return DIENUM_STOP; } +static HRESULT WINAPI outer_QueryInterface( IUnknown *iface, REFIID iid, void **obj ) +{ + ok( 0, "unexpected call %s\n", debugstr_guid( iid ) ); + + if (IsEqualGUID( iid, &IID_IUnknown )) + { + *obj = (IUnknown *)iface; + return S_OK; + } + + ok( 0, "unexpected call %s\n", debugstr_guid( iid ) ); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef( IUnknown *iface ) +{ + ok( 0, "unexpected call\n" ); + return 2; +} + +static ULONG WINAPI outer_Release( IUnknown *iface ) +{ + ok( 0, "unexpected call\n" ); + return 1; +} + +static IUnknownVtbl outer_vtbl = +{ + outer_QueryInterface, + outer_AddRef, + outer_Release, +}; + +static IUnknown outer = {&outer_vtbl}; + static void test_CoCreateInstance( DWORD version ) { static const struct @@ -113,6 +148,7 @@ static void test_CoCreateInstance( DWORD version ) IDirectInputDeviceA *device; IDirectInputA *dinput; + IUnknown *unknown; HRESULT hr; LONG ref; int i; @@ -127,6 +163,14 @@ static void test_CoCreateInstance( DWORD version ) return; } + if (version < 0x800) hr = CoCreateInstance( &CLSID_DirectInput, &outer, CLSCTX_INPROC_SERVER, + &IID_IDirectInputA, (void **)&unknown ); + else hr = CoCreateInstance( &CLSID_DirectInput8, &outer, CLSCTX_INPROC_SERVER, + &IID_IDirectInput8A, (void **)&unknown ); + todo_wine + ok( hr == CLASS_E_NOAGGREGATION, "CoCreateInstance returned %#x\n", hr ); + if (SUCCEEDED( hr )) IUnknown_Release( unknown ); + for (i = 0; i < ARRAY_SIZE(create_device_tests); i++) { winetest_push_context( "%u", i ); @@ -204,6 +248,14 @@ static void test_DirectInputCreate( DWORD version ) HRESULT hr; int i; + unknown = (void *)0xdeadbeef; + hr = DirectInputCreateW( hInstance, version, (IDirectInputW **)&unknown, &outer ); + todo_wine_if(version == 0x800) + ok( hr == DI_OK, "DirectInputCreateW returned %#x\n", hr ); + todo_wine_if(version <= 0x700) + ok( unknown == NULL, "got IUnknown %p\n", unknown ); + if (unknown) IUnknown_Release( unknown ); + for (i = 0; i < ARRAY_SIZE(create_tests); i++) { winetest_push_context( "%u", i ); @@ -271,6 +323,14 @@ static void test_DirectInputCreateEx( DWORD version ) return; } + unknown = (void *)0xdeadbeef; + hr = pDirectInputCreateEx( hInstance, version, &IID_IDirectInputW, (void **)&unknown, &outer ); + todo_wine_if(version == 0x800) + ok( hr == DI_OK, "DirectInputCreateW returned %#x\n", hr ); + todo_wine_if(version <= 0x700) + ok( unknown == NULL, "got IUnknown %p\n", unknown ); + if (unknown) IUnknown_Release( unknown ); + for (i = 0; i < ARRAY_SIZE(create_tests); i++) { winetest_push_context( "%u", i ); @@ -356,6 +416,13 @@ static void test_DirectInput8Create( DWORD version ) HRESULT hr; int i; + unknown = (void *)0xdeadbeef; + hr = DirectInput8Create( hInstance, version, &IID_IDirectInput8W, (void **)&unknown, &outer ); + ok( hr == DI_OK, "DirectInputCreateW returned %#x\n", hr ); + todo_wine + ok( unknown == NULL, "got IUnknown %p\n", unknown ); + if (unknown) IUnknown_Release( unknown ); + for (i = 0; i < ARRAY_SIZE(create_tests); i++) { winetest_push_context( "%u", i );

1 0

Rémi Bernon : dinput/tests: Merge dinput8.c tests with dinput.c.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 0c3686f5497561051b2c38b8e9e9648103af92ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c3686f5497561051b2c38b8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 7 09:23:24 2022 +0100 dinput/tests: Merge dinput8.c tests with dinput.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/Makefile.in | 1 - dlls/dinput/tests/dinput.c | 1096 +++++++++++++++++++++++++++-------------- dlls/dinput/tests/dinput8.c | 728 --------------------------- 3 files changed, 723 insertions(+), 1102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c3686f5497561051b2c…

1 0

Zhiyi Zhang : comctl32/treeview: Use DFCS_MONO style for item check boxes.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: e82d96ed5edaae67060ae9ac993dd29dca166ee0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e82d96ed5edaae67060ae9ac… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 7 16:10:04 2022 +0800 comctl32/treeview: Use DFCS_MONO style for item check boxes. Keep it consistent with Windows. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index e9e2cb37d47..d00bba8e625 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3034,13 +3034,11 @@ TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) rc.left = width; rc.right = rc.left + width; - DrawFrameControl(hdc, &rc, DFC_BUTTON, - DFCS_BUTTONCHECK|DFCS_FLAT); + DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_MONO); rc.left = width * 2; rc.right = rc.left + width; - DrawFrameControl(hdc, &rc, DFC_BUTTON, - DFCS_BUTTONCHECK|DFCS_FLAT|DFCS_CHECKED); + DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_MONO | DFCS_CHECKED); SelectObject(hdc, hbmOld); nIndex = ImageList_AddMasked(infoPtr->himlState, hbm,

1 0

Zhiyi Zhang : comctl32/treeview: Support HiDPI for unthemed item check boxes.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 35ed21d27aa23fb318a00a769b945f48193f23a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35ed21d27aa23fb318a00a76… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 7 16:09:45 2022 +0800 comctl32/treeview: Support HiDPI for unthemed item check boxes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 608ce489e33..e9e2cb37d47 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3011,30 +3011,34 @@ static BOOL TREEVIEW_InitThemedCheckboxes(TREEVIEW_INFO *info) static void TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) { + int nIndex, width, height; RECT rc; HBITMAP hbm, hbmOld; HDC hdc, hdcScreen; - int nIndex; if (TREEVIEW_InitThemedCheckboxes(infoPtr)) return; - infoPtr->himlState = ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0); + width = 12 * GetDpiForWindow(infoPtr->hwnd) / 96 + 1; + height = width; + infoPtr->himlState = ImageList_Create(width, height, ILC_COLOR | ILC_MASK, 3, 0); hdcScreen = GetDC(0); hdc = CreateCompatibleDC(hdcScreen); - hbm = CreateCompatibleBitmap(hdcScreen, 48, 16); + hbm = CreateCompatibleBitmap(hdcScreen, width * 3, height); hbmOld = SelectObject(hdc, hbm); - SetRect(&rc, 0, 0, 48, 16); + SetRect(&rc, 0, 0, width * 3, height); FillRect(hdc, &rc, (HBRUSH)(COLOR_WINDOW+1)); - SetRect(&rc, 18, 2, 30, 14); + rc.left = width; + rc.right = rc.left + width; DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK|DFCS_FLAT); - SetRect(&rc, 34, 2, 46, 14); + rc.left = width * 2; + rc.right = rc.left + width; DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK|DFCS_FLAT|DFCS_CHECKED); @@ -3047,8 +3051,8 @@ TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) DeleteDC(hdc); ReleaseDC(0, hdcScreen); - infoPtr->stateImageWidth = 16; - infoPtr->stateImageHeight = 16; + infoPtr->stateImageWidth = width; + infoPtr->stateImageHeight = height; } static void

1 0

Eric Pouech : xcopy: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 7dc8e9edc27d74f1820946231bb50a0ec9204a13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dc8e9edc27d74f182094623… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:56 2022 +0100 xcopy: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/xcopy/Makefile.in | 1 - programs/xcopy/xcopy.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in index f51370405da..b22ff7814ec 100644 --- a/programs/xcopy/Makefile.in +++ b/programs/xcopy/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = xcopy.exe IMPORTS = shell32 user32 diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 809f24433a3..0f46a6c42ab 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -79,7 +79,7 @@ static WCHAR *XCOPY_LoadMessage(UINT id) { static WCHAR msg[MAXSTRING]; if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { - WINE_FIXME("LoadString failed with %d\n", GetLastError()); + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); lstrcpyW(msg, L"Failed!"); } return msg; @@ -121,7 +121,7 @@ static int WINAPIV XCOPY_wprintf(const WCHAR *format, ...) { MAX_WRITECONSOLE_SIZE/sizeof(*output_bufW), &parms); va_end(parms); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); return 0; } @@ -178,7 +178,7 @@ static void XCOPY_FailMessage(DWORD err) { NULL, err, 0, (LPWSTR) &lpMsgBuf, 0, NULL); if (!status) { - WINE_FIXME("FIXME: Cannot display message for error %d, status %d\n", + WINE_FIXME("FIXME: Cannot display message for error %ld, status %ld\n", err, GetLastError()); } else { XCOPY_wprintf(L"%1\n", lpMsgBuf); @@ -397,7 +397,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, /* See if allowed to copy it */ srcAttribs = GetFileAttributesW(copyFrom); - WINE_TRACE("Source attribs: %d\n", srcAttribs); + WINE_TRACE("Source attribs: %ld\n", srcAttribs); if ((srcAttribs & FILE_ATTRIBUTE_HIDDEN) || (srcAttribs & FILE_ATTRIBUTE_SYSTEM)) { @@ -414,7 +414,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, /* See if file exists */ destAttribs = GetFileAttributesW(copyTo); - WINE_TRACE("Dest attribs: %d\n", srcAttribs); + WINE_TRACE("Dest attribs: %ld\n", srcAttribs); /* Check date ranges if a destination file already exists */ if (!skipFile && (flags & OPT_DATERANGE) && @@ -901,7 +901,7 @@ static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, * Validate the source, expanding to full path ensuring it exists */ if (GetFullPathNameW(suppliedsource, MAX_PATH, actualsource, NULL) == 0) { - WINE_FIXME("Unexpected failure expanding source path (%d)\n", GetLastError()); + WINE_FIXME("Unexpected failure expanding source path (%ld)\n", GetLastError()); return RC_INITERROR; } @@ -995,7 +995,7 @@ static int XCOPY_ProcessDestParm(WCHAR *supplieddestination, WCHAR *stem, WCHAR * Validate the source, expanding to full path ensuring it exists */ if (GetFullPathNameW(supplieddestination, MAX_PATH, actualdestination, NULL) == 0) { - WINE_FIXME("Unexpected failure expanding source path (%d)\n", GetLastError()); + WINE_FIXME("Unexpected failure expanding source path (%ld)\n", GetLastError()); return RC_INITERROR; }

1 0

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-commits February 2022