January 2023 - Wine-commits

Rémi Bernon : include: Add Windows.Foundation.Collections.IObservableMap<K, V> definition.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 1aadd3fc6da0b975c58dc13efb9215e3efce9aa3 URL: https://gitlab.winehq.org/wine/wine/-/commit/1aadd3fc6da0b975c58dc13efb9215… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 include: Add Windows.Foundation.Collections.IObservableMap<K, V> definition. --- include/windows.foundation.collections.idl | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 8156a833a96..36fb9bf4161 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -23,7 +23,7 @@ import "inspectable.idl"; import "asyncinfo.idl"; import "windowscontracts.idl"; -/* import "eventtoken.idl"; */ +import "eventtoken.idl"; import "ivectorchangedeventargs.idl"; namespace Windows { @@ -165,6 +165,18 @@ cpp_quote("#endif") HRESULT Clear(); } + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(65df2bf5-bf39-41b5-aebc-5a9d865e472b) + ] + interface IObservableMap<K, V> : IInspectable + requires Windows.Foundation.Collections.IMap<K, V> + { + [eventadd] HRESULT MapChanged([in] Windows.Foundation.Collections.MapChangedEventHandler<K, V> *handler, + [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT MapChanged([in] EventRegistrationToken token); + } + [ contract(Windows.Foundation.FoundationContract, 1.0), uuid(bbe1fa4c-b0e3-4583-baef-1f1b2e483e56)

1 0

Rémi Bernon : include: Add Windows.Foundation.Collections.IPropertySet definition.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 5050ae668dc291b04f25bd15cd04c5e09a3bcb16 URL: https://gitlab.winehq.org/wine/wine/-/commit/5050ae668dc291b04f25bd15cd04c5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 include: Add Windows.Foundation.Collections.IPropertySet definition. --- include/windows.foundation.idl | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index cdc603f8e84..96bdd1167e6 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -27,6 +27,32 @@ import "eventtoken.idl"; /* import "ivectorchangedeventargs.idl"; */ import "windows.foundation.collections.idl"; +namespace Windows.Foundation.Collections { + interface IPropertySet; + + declare { + interface Windows.Foundation.Collections.IKeyValuePair<HSTRING, IInspectable *>; + interface Windows.Foundation.Collections.IIterable<Windows.Foundation.Collections.IKeyValuePair<HSTRING, IInspectable *> *>; + interface Windows.Foundation.Collections.IIterator<Windows.Foundation.Collections.IKeyValuePair<HSTRING, IInspectable *> *>; + interface Windows.Foundation.Collections.IMapChangedEventArgs<HSTRING>; + interface Windows.Foundation.Collections.MapChangedEventHandler<HSTRING, IInspectable *>; + interface Windows.Foundation.Collections.IMap<HSTRING, IInspectable *>; + interface Windows.Foundation.Collections.IMapView<HSTRING, IInspectable *>; + interface Windows.Foundation.Collections.IObservableMap<HSTRING, IInspectable *>; + } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(8a43ed9f-f4e6-4421-acf9-1dab2986820c) + ] + interface IPropertySet : IInspectable + requires Windows.Foundation.Collections.IObservableMap<HSTRING, IInspectable *>, + Windows.Foundation.Collections.IMap<HSTRING, IInspectable *>, + Windows.Foundation.Collections.IIterable<Windows.Foundation.Collections.IKeyValuePair<HSTRING, IInspectable *> *> + { + } +} + namespace Windows.Foundation { typedef enum PropertyType PropertyType; typedef struct Point Point;

1 0

Rémi Bernon : include: Add Windows.Foundation.Collections.IObservableVector<T> definition.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: fe11aa6ad155c35bef1fa129163dc1ffd6a6faab URL: https://gitlab.winehq.org/wine/wine/-/commit/fe11aa6ad155c35bef1fa129163dc1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 include: Add Windows.Foundation.Collections.IObservableVector<T> definition. --- include/windows.foundation.collections.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 36fb9bf4161..4b72c63882c 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -177,6 +177,15 @@ cpp_quote("#endif") [eventremove] HRESULT MapChanged([in] EventRegistrationToken token); } + interface IObservableVector<T>; + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(0c051752-9fbf-4c70-aa0c-0e4c82d9a761) + ] + delegate HRESULT VectorChangedEventHandler<T>([in] Windows.Foundation.Collections.IObservableVector<T> *sender, + [in] Windows.Foundation.Collections.IVectorChangedEventArgs *args); + [ contract(Windows.Foundation.FoundationContract, 1.0), uuid(bbe1fa4c-b0e3-4583-baef-1f1b2e483e56) @@ -210,6 +219,18 @@ cpp_quote("#endif") HRESULT GetMany([in] UINT32 start_index, [in] UINT32 items_size, [out] T *items, [out, retval] UINT32 *value); HRESULT ReplaceAll([in] UINT32 count, [in] T *items); } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(5917eb53-50b4-4a0d-b309-65862b3f1dbc) + ] + interface IObservableVector<T> : IInspectable + requires Windows.Foundation.Collections.IVector<T> + { + [eventadd] HRESULT VectorChanged([in] Windows.Foundation.Collections.VectorChangedEventHandler<T> *handler, + [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT VectorChanged([in] EventRegistrationToken token); + } } #endif }

1 0

Rémi Bernon : include: Add Windows.Foundation.IAsyncActionWithProgress<TProgress> definition.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: f0f83180c674153ff79b597009fd54a3b0bd8155 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0f83180c674153ff79b597009fd54… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 include: Add Windows.Foundation.IAsyncActionWithProgress<TProgress> definition. --- include/windows.foundation.collections.idl | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 4b72c63882c..0f10f4dbc00 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -68,6 +68,34 @@ cpp_quote("#endif") HRESULT GetResults([out, retval] TResult *results); } + interface IAsyncActionWithProgress<TProgress>; + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(6d844858-0cff-4590-ae89-95a5a5c8b4b8) + ] + delegate HRESULT AsyncActionProgressHandler<TProgress>([in] Windows.Foundation.IAsyncActionWithProgress<TProgress> *info, + [in] TProgress progress); + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(9c029f91-cc84-44fd-ac26-0a6c4e555281) + ] + delegate HRESULT AsyncActionWithProgressCompletedHandler<TProgress>([in] Windows.Foundation.IAsyncActionWithProgress<TProgress> *info, + [in] AsyncStatus status); + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(1f6db258-e803-48a1-9546-eb7353398884) + ] + interface IAsyncActionWithProgress<TProgress> : IInspectable + { + [propput] HRESULT Progress([in] Windows.Foundation.AsyncActionProgressHandler<TProgress> *handler); + [propget] HRESULT Progress([out, retval] Windows.Foundation.AsyncActionProgressHandler<TProgress> **handler); + [propput] HRESULT Completed([in] Windows.Foundation.AsyncActionWithProgressCompletedHandler<TProgress> *handler); + [propget] HRESULT Completed([out, retval] Windows.Foundation.AsyncActionWithProgressCompletedHandler<TProgress> **handler); + HRESULT GetResults(); + } + [ contract(Windows.Foundation.FoundationContract, 1.0), uuid(9de1c534-6ae1-11e0-84e1-18a905bcc53f)

1 0

Rémi Bernon : include: Add Windows.Foundation.IAsyncOperationWithProgress<TResult, TProgress> definition.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: c5c9108d8c67e55720c121ffd7e6ae09b8aad80a URL: https://gitlab.winehq.org/wine/wine/-/commit/c5c9108d8c67e55720c121ffd7e6ae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 include: Add Windows.Foundation.IAsyncOperationWithProgress<TResult, TProgress> definition. --- include/windows.foundation.collections.idl | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 0f10f4dbc00..680d7803cc8 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -96,6 +96,34 @@ cpp_quote("#endif") HRESULT GetResults(); } + interface IAsyncOperationWithProgress<TResult, TProgress>; + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(55690902-0aab-421a-8778-f8ce5026d758) + ] + delegate HRESULT AsyncOperationProgressHandler<TResult, TProgress>([in] Windows.Foundation.IAsyncOperationWithProgress<TResult, TProgress> *info, + [in] TProgress progress); + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(e85df41d-6aa7-46e3-a8e2-f009d840c627) + ] + delegate HRESULT AsyncOperationWithProgressCompletedHandler<TResult, TProgress>([in] Windows.Foundation.IAsyncOperationWithProgress<TResult, TProgress> *info, + [in] AsyncStatus status); + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(b5d036d7-e297-498f-ba60-0289e76e23dd) + ] + interface IAsyncOperationWithProgress<TResult, TProgress> : IInspectable + { + [propput] HRESULT Progress([in] Windows.Foundation.AsyncOperationProgressHandler<TResult, TProgress> *handler); + [propget] HRESULT Progress([out, retval] Windows.Foundation.AsyncOperationProgressHandler<TResult, TProgress> **handler); + [propput] HRESULT Completed([in] Windows.Foundation.AsyncOperationWithProgressCompletedHandler<TResult, TProgress> *handler); + [propget] HRESULT Completed([out, retval] Windows.Foundation.AsyncOperationWithProgressCompletedHandler<TResult, TProgress> **handler); + HRESULT GetResults([out, retval] TResult *results); + } + [ contract(Windows.Foundation.FoundationContract, 1.0), uuid(9de1c534-6ae1-11e0-84e1-18a905bcc53f)

1 0

Jinoh Kang : ws2_32/test: Fix sockaddr buffer overflow in test_reuseaddr.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 876742bf2bf23765cd8a845a20b297cdf7803c67 URL: https://gitlab.winehq.org/wine/wine/-/commit/876742bf2bf23765cd8a845a20b297… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Jan 26 02:20:34 2023 +0900 ws2_32/test: Fix sockaddr buffer overflow in test_reuseaddr. Today, test_reuseaddr() triggers a buffer overflow when accept()-ing an IPv6 client due to the supplied peer name buffer (`struct sockaddr`) being too small to hold an AF_INET6 address (`struct sockaddr_in6`). Fix this by changing the type of `saddr` from `struct sockaddr` to `struct sockaddr_storage`. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54376 --- dlls/ws2_32/tests/sock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6f2bcb73a06..1336889b9fd 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2153,7 +2153,7 @@ static void test_reuseaddr(void) }; unsigned int rc, reuse, value; - struct sockaddr saddr; + struct sockaddr_storage saddr; SOCKET s1, s2, s3, s4; unsigned int i, j; int size; @@ -2245,7 +2245,7 @@ static void test_reuseaddr(void) /* The connection is delivered to the first socket. */ size = tests[i].addrlen; - s4 = accept(s1, &saddr, &size); + s4 = accept(s1, (struct sockaddr *)&saddr, &size); ok(s4 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError()); closesocket(s1); @@ -2279,7 +2279,7 @@ static void test_reuseaddr(void) ok(!rc, "got error %d.\n", WSAGetLastError()); size = tests[i].addrlen; - s4 = accept(s2, &saddr, &size); + s4 = accept(s2, (struct sockaddr *)&saddr, &size); todo_wine ok(s4 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError()); closesocket(s1); @@ -2313,7 +2313,7 @@ static void test_reuseaddr(void) rc = connect(s3, tests[i].addr_loopback, tests[i].addrlen); ok(!rc, "got error %d.\n", WSAGetLastError()); size = tests[i].addrlen; - s4 = accept(s1, &saddr, &size); + s4 = accept(s1, (struct sockaddr *)&saddr, &size); ok(s4 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError());

1 0

Rémi Bernon : dinput: Remove outdated and superfluous comments.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 1b3fab9bd4995c40b471748d006611d6eee4fc47 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b3fab9bd4995c40b471748d006611… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 21 21:42:10 2023 +0100 dinput: Remove outdated and superfluous comments. --- dlls/dinput/device.c | 42 ------------------------------------------ dlls/dinput/device_private.h | 3 --- dlls/dinput/dinput_main.c | 39 --------------------------------------- dlls/dinput/dinput_private.h | 1 - dlls/dinput/mouse.c | 6 ++---- 5 files changed, 2 insertions(+), 89 deletions(-)

1 0

Rémi Bernon : dinput: Add traces to the ANSI wrappers.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 21fa1be53b7309db85eb5993736da3e687fd4552 URL: https://gitlab.winehq.org/wine/wine/-/commit/21fa1be53b7309db85eb5993736da3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 21 21:46:22 2023 +0100 dinput: Add traces to the ANSI wrappers. --- dlls/dinput/ansi.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+)

1 0

Rémi Bernon : dinput: Remove unnecessary initialization helpers.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 070e1f5ea8ae6d306bdcf73870950c856978e24a URL: https://gitlab.winehq.org/wine/wine/-/commit/070e1f5ea8ae6d306bdcf73870950c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 21 22:09:51 2023 +0100 dinput: Remove unnecessary initialization helpers. --- dlls/dinput/dinput_main.c | 63 ++++++++++++++++++-------------------------- dlls/dinput/dinput_private.h | 1 - 2 files changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 9130c0480b7..b4c78036877 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -86,9 +86,6 @@ static struct list acquired_rawmouse_list = LIST_INIT( acquired_rawmouse_list ); static struct list acquired_keyboard_list = LIST_INIT( acquired_keyboard_list ); static struct list acquired_device_list = LIST_INIT( acquired_device_list ); -static HRESULT initialize_directinput_instance( struct dinput *impl, DWORD version ); -static void uninitialize_directinput_instance( struct dinput *impl ); - void dinput_hooks_acquire_device( IDirectInputDevice8W *iface ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); @@ -140,6 +137,8 @@ static HRESULT dinput_create( IUnknown **out ) impl->IDirectInputJoyConfig8_iface.lpVtbl = &joy_config_vtbl; impl->ref = 1; + list_init( &impl->device_players ); + #if DIRECTINPUT_VERSION == 0x0700 *out = (IUnknown *)&impl->IDirectInput7W_iface; #else @@ -299,7 +298,11 @@ static ULONG WINAPI dinput7_Release( IDirectInput7W *iface ) if (ref == 0) { - uninitialize_directinput_instance( impl ); + struct DevicePlayer *device_player, *device_player2; + + LIST_FOR_EACH_ENTRY_SAFE( device_player, device_player2, &impl->device_players, struct DevicePlayer, entry ) + free( device_player ); + free( impl ); } @@ -395,34 +398,6 @@ static void unregister_di_em_win_class(void) WARN( "Unable to unregister message window class\n" ); } -static HRESULT initialize_directinput_instance( struct dinput *impl, DWORD version ) -{ - if (!impl->initialized) - { - impl->dwVersion = version; - impl->evsequence = 1; - - list_init( &impl->device_players ); - - impl->initialized = TRUE; - } - - return DI_OK; -} - -static void uninitialize_directinput_instance( struct dinput *impl ) -{ - if (impl->initialized) - { - struct DevicePlayer *device_player, *device_player2; - - LIST_FOR_EACH_ENTRY_SAFE ( device_player, device_player2, &impl->device_players, struct DevicePlayer, entry ) - free( device_player ); - - impl->initialized = FALSE; - } -} - enum directinput_versions { DIRECTINPUT_VERSION_300 = 0x0300, @@ -452,7 +427,13 @@ static HRESULT WINAPI dinput7_Initialize( IDirectInput7W *iface, HINSTANCE hinst version != DIRECTINPUT_VERSION_700 && version != DIRECTINPUT_VERSION) return DIERR_BETADIRECTINPUTVERSION; - return initialize_directinput_instance( impl, version ); + if (!impl->dwVersion) + { + impl->dwVersion = version; + impl->evsequence = 1; + } + + return DI_OK; } static HRESULT WINAPI dinput7_GetDeviceStatus( IDirectInput7W *iface, const GUID *guid ) @@ -464,7 +445,7 @@ static HRESULT WINAPI dinput7_GetDeviceStatus( IDirectInput7W *iface, const GUID TRACE( "iface %p, guid %s.\n", iface, debugstr_guid( guid ) ); if (!guid) return E_POINTER; - if (!impl->initialized) return DIERR_NOTINITIALIZED; + if (!impl->dwVersion) return DIERR_NOTINITIALIZED; hr = IDirectInput_CreateDevice( iface, guid, &device, NULL ); if (hr != DI_OK) return DI_NOTATTACHED; @@ -485,7 +466,7 @@ static HRESULT WINAPI dinput7_RunControlPanel( IDirectInput7W *iface, HWND owner if (owner && !IsWindow( owner )) return E_HANDLE; if (flags) return DIERR_INVALIDPARAM; - if (!impl->initialized) return DIERR_NOTINITIALIZED; + if (!impl->dwVersion) return DIERR_NOTINITIALIZED; if (!CreateProcessW( NULL, control_exe, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) return HRESULT_FROM_WIN32(GetLastError()); @@ -514,7 +495,7 @@ static HRESULT WINAPI dinput7_CreateDeviceEx( IDirectInput7W *iface, const GUID *out = NULL; if (!guid) return E_POINTER; - if (!impl->initialized) return DIERR_NOTINITIALIZED; + if (!impl->dwVersion) return DIERR_NOTINITIALIZED; if (IsEqualGUID( &GUID_SysKeyboard, guid )) hr = keyboard_create_device( impl, guid, &device ); else if (IsEqualGUID( &GUID_SysMouse, guid )) hr = mouse_create_device( impl, guid, &device ); @@ -593,7 +574,7 @@ static HRESULT WINAPI dinput8_EnumDevices( IDirectInput8W *iface, DWORD type, LP DIEDFL_INCLUDEPHANTOMS | DIEDFL_INCLUDEHIDDEN)) return DIERR_INVALIDPARAM; - if (!impl->initialized) return DIERR_NOTINITIALIZED; + if (!impl->dwVersion) return DIERR_NOTINITIALIZED; if (type <= DI8DEVCLASS_GAMECTRL) device_class = type; else device_type = type; @@ -652,7 +633,13 @@ static HRESULT WINAPI dinput8_Initialize( IDirectInput8W *iface, HINSTANCE hinst else if (version > DIRECTINPUT_VERSION) return DIERR_OLDDIRECTINPUTVERSION; - return initialize_directinput_instance( impl, version ); + if (!impl->dwVersion) + { + impl->dwVersion = version; + impl->evsequence = 1; + } + + return DI_OK; } static HRESULT WINAPI dinput8_FindDevice( IDirectInput8W *iface, const GUID *guid, const WCHAR *name, GUID *instance_guid ) diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index e48357e9ffc..79a5baabb6e 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -38,7 +38,6 @@ struct dinput IDirectInputJoyConfig8 IDirectInputJoyConfig8_iface; LONG ref; - BOOL initialized; DWORD dwVersion; /* direct input version number */ DWORD evsequence; /* unique sequence number for events */ struct list device_players; /* device instance guid to player name */

1 0

Rémi Bernon : dinput: Move dinput class implementation to dinput.c.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 1b7750e4489c33520f68f3d0f6a401c7425de80c URL: https://gitlab.winehq.org/wine/wine/-/commit/1b7750e4489c33520f68f3d0f6a401… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 21 22:14:58 2023 +0100 dinput: Move dinput class implementation to dinput.c. --- dlls/dinput/Makefile.in | 1 + dlls/dinput/dinput.c | 966 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/dinput/dinput_main.c | 938 -------------------------------------------- dlls/dinput8/Makefile.in | 1 + 4 files changed, 968 insertions(+), 938 deletions(-)

1 0