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

Jeff Smith : d3drm: Correct parameter count of several interface defines.
by Alexandre Julliard July 31, 2019

July 31, 2019

Module: wine Branch: master Commit: b5b1f11f171bd962cab5ce0f6a4588c76193b60e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5b1f11f171bd962cab5ce0f… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Jul 8 14:40:23 2019 -0500 d3drm: Correct parameter count of several interface defines. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3drm.h | 16 ++++++++-------- include/d3drmobj.h | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/d3drm.h b/include/d3drm.h index 126695c..c10b9ed 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -322,7 +322,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) #define IDirect3DRM2_EnumerateObjects(p,a,b) (p)->EnumerateObjects(a,b) #define IDirect3DRM2_Load(p,a,b,c,d,e,f,g,h,i,j) (p)->Load(a,b,c,d,e,f,g,h,i,j) #define IDirect3DRM2_Tick(p,a) (p)->Tick(a) -#define IDirect3DRM2_CreateProgressiveMesh(p,a) (p)->CreateProgressiveMesh(p,a) +#define IDirect3DRM2_CreateProgressiveMesh(p,a) (p)->CreateProgressiveMesh(a) #endif /***************************************************************************** @@ -434,7 +434,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) #define IDirect3DRM3_CreateProgressiveMesh(p,a) (p)->lpVtbl->CreateProgressiveMesh(p,a) #define IDirect3DRM3_RegisterClient(p,a,b) (p)->lpVtbl->RegisterClient(p,a,b) #define IDirect3DRM3_UnregisterClient(p,a) (p)->lpVtbl->UnregisterClient(p,a) -#define IDirect3DRM3_CreateClippedVisual(p,ab) (p)->lpVtbl->CreateClippedVisual(p,a,b) +#define IDirect3DRM3_CreateClippedVisual(p,a,b) (p)->lpVtbl->CreateClippedVisual(p,a,b) #define IDirect3DRM3_SetOptions(p,a) (p)->lpVtbl->SetOptions(p,a) #define IDirect3DRM3_GetOptions(p,a) (p)->lpVtbl->GetOptions(p,a) #else @@ -475,12 +475,12 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) #define IDirect3DRM3_EnumerateObjects(p,a,b) (p)->EnumerateObjects(a,b) #define IDirect3DRM3_Load(p,a,b,c,d,e,f,g,h,i,j) (p)->Load(a,b,c,d,e,f,g,h,i,j) #define IDirect3DRM3_Tick(p,a) (p)->Tick(a) -#define IDirect3DRM3_CreateProgressiveMesh(p,a) (p)->CreateProgressiveMesh(p,a) -#define IDirect3DRM3_RegisterClient(p,a,b) (p)->RegisterClient(p,a,b) -#define IDirect3DRM3_UnregisterClient(p,a) (p)->UnregisterClient(p,a) -#define IDirect3DRM3_CreateClippedVisual(p,ab) (p)->CreateClippedVisual(p,a,b) -#define IDirect3DRM3_SetOptions(p,a) (p)->SetOptions(p,a) -#define IDirect3DRM3_GetOptions(p,a) (p)->GetOptions(p,a) +#define IDirect3DRM3_CreateProgressiveMesh(p,a) (p)->CreateProgressiveMesh(a) +#define IDirect3DRM3_RegisterClient(p,a,b) (p)->RegisterClient(a,b) +#define IDirect3DRM3_UnregisterClient(p,a) (p)->UnregisterClient(a) +#define IDirect3DRM3_CreateClippedVisual(p,a,b) (p)->CreateClippedVisual(a,b) +#define IDirect3DRM3_SetOptions(p,a) (p)->SetOptions(a) +#define IDirect3DRM3_GetOptions(p,a) (p)->GetOptions(a) #endif #define D3DRM_OK DD_OK diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 5ff33fe..7e48d98 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -3616,9 +3616,9 @@ DECLARE_INTERFACE_(IDirect3DRMWrap, IDirect3DRMObject) #define IDirect3DRMWrap_GetName(p,a,b) (p)->GetName(a,b) #define IDirect3DRMWrap_GetClassName(p,a,b) (p)->GetClassName(a,b) /*** IDirect3DRMWrap methods ***/ -#define IDirect3DRMWrap_Init(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) (p)->Init(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) -#define IDirect3DRMWrap_Apply(p,a) (p)->Apply(p,a) -#define IDirect3DRMWrap_ApplyRelative(p,a,b) (p)->ApplyRelative(p,a,b) +#define IDirect3DRMWrap_Init(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) (p)->Init(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) +#define IDirect3DRMWrap_Apply(p,a) (p)->Apply(a) +#define IDirect3DRMWrap_ApplyRelative(p,a,b) (p)->ApplyRelative(a,b) #endif /*****************************************************************************

1 0

Alistair Leslie-Hughes : include: Add recovery defines.
by Alexandre Julliard July 31, 2019

July 31, 2019

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

1 0

Alistair Leslie-Hughes : include: Add UI_E_* defines.
by Alexandre Julliard July 31, 2019

July 31, 2019

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

1 0

Alistair Leslie-Hughes : include: Add define SS_PORT.
by Alexandre Julliard July 31, 2019

July 31, 2019

Module: wine Branch: master Commit: 67aecface56b2f7514e76f982d7c737879cd8ade URL: https://source.winehq.org/git/wine.git/?a=commit;h=67aecface56b2f7514e76f98… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 29 23:07:40 2019 +0000 include: Add define SS_PORT. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2ipdef.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 52c80c5..4cae361 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -280,6 +280,8 @@ typedef struct WS(in_pktinfo) { #define WS_IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } #endif /* USE_WS_PREFIX */ +#define SS_PORT(ssp) (((PSOCKADDR_IN)(ssp))->sin_port) + #ifdef __cplusplus extern "C" { #endif

1 0

Jacek Caban : winegcc: Always mark executables as nx compat.
by Alexandre Julliard July 31, 2019

July 31, 2019

Module: wine Branch: master Commit: aae296bfd799f2ae79ed31a07a99dbba7e8a55e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aae296bfd799f2ae79ed31a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 30 18:29:26 2019 +0200 winegcc: Always mark executables as nx compat. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e8341a0..3d1817a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -450,6 +450,8 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) } } + strarray_add( flags, "-Wl,--nxcompat" ); + if (opts->image_base) strarray_add( flags, strmake("-Wl,--image-base,%s", opts->image_base )); if (opts->large_address_aware && opts->target_cpu == CPU_x86)

1 0

Zebediah Figura : services: Fix the arguments to is_root_pnp_service().
by Alexandre Julliard July 31, 2019

July 31, 2019

Module: wine Branch: master Commit: 57038f8ca3945ae3c1e2c1d7b4186376481c6f5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=57038f8ca3945ae3c1e2c1d7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 18 18:29:38 2019 -0500 services: Fix the arguments to is_root_pnp_service(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index 67cd4fa..ec2a8eb 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -424,7 +424,7 @@ static BOOL schedule_delayed_autostart(struct service_entry **services, unsigned return TRUE; } -static BOOL is_root_pnp_service(const struct service_entry *service, HDEVINFO set) +static BOOL is_root_pnp_service(HDEVINFO set, const struct service_entry *service) { SP_DEVINFO_DATA device = {sizeof(device)}; WCHAR name[MAX_SERVICE_NAME];

1 0

Zhiyi Zhang : winex11.drv: Add DriverDateData registry property to display adapters.
by Alexandre Julliard July 31, 2019

July 31, 2019

Module: wine Branch: master Commit: 7d70d459842d7fd09352314b8bfea7216f87a89e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d70d459842d7fd09352314b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 16 17:37:14 2019 +0800 winex11.drv: Add DriverDateData registry property to display adapters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35345. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 7ddaf1c..435c0b8 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -45,6 +45,7 @@ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); +static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e','D','a','t','a',0}; static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; static const WCHAR pciW[] = {'P','C','I',0}; @@ -126,6 +127,7 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g INT written; DWORD size; BOOL ret = FALSE; + FILETIME filetime; sprintfW(instanceW, gpu_instance_fmtW, gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index); if (!SetupDiOpenDeviceInfoW(devinfo, instanceW, NULL, 0, &device_data)) @@ -155,6 +157,11 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)gpu->name, (strlenW(gpu->name) + 1) * sizeof(WCHAR))) goto done; + /* Write DriverDateData value, using current time as driver date, needed by Evoland */ + GetSystemTimeAsFileTime(&filetime); + if (RegSetValueExW(hkey, driver_date_dataW, 0, REG_BINARY, (BYTE *)&filetime, sizeof(filetime))) + goto done; + RegCloseKey(hkey); /* Retrieve driver value for adapters */

1 0

Zebediah Figura : mscoree: Fake success from StrongNameSignatureVerificationEx().
by Alexandre Julliard July 31, 2019

July 31, 2019

Module: wine Branch: master Commit: 074dd6959f2cc1f00531132537fa3412388c27bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=074dd6959f2cc1f005311325… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 11 14:23:46 2019 -0500 mscoree: Fake success from StrongNameSignatureVerificationEx(). Game Maker Studio 2 Desktop needs this to launch. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/mscoree_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 6afeafe..af0321a 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -558,7 +558,8 @@ BOOLEAN WINAPI StrongNameSignatureVerification(LPCWSTR filename, DWORD inFlags, BOOLEAN WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOLEAN forceVerification, BOOLEAN *pVerified) { FIXME("(%s, %u, %p): stub\n", debugstr_w(filename), forceVerification, pVerified); - return FALSE; + *pVerified = TRUE; + return TRUE; } HRESULT WINAPI CreateDebuggingInterfaceFromVersion(int nDebugVersion, LPCWSTR version, IUnknown **ppv)

1 0

Zebediah Figura : mscoree: Fix the signature for StrongNameSignatureVerification[Ex]().
by Alexandre Julliard July 31, 2019

July 31, 2019

Module: wine Branch: master Commit: 0ddeba7002a21a351fe630be42e6632e0484bfa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ddeba7002a21a351fe630be… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 11 14:23:45 2019 -0500 mscoree: Fix the signature for StrongNameSignatureVerification[Ex](). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/mscoree_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 15bbc23..6afeafe 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -30,6 +30,7 @@ #include "ole2.h" #include "ocidl.h" #include "shellapi.h" +#include "strongname.h" #include "initguid.h" #include "msxml2.h" @@ -548,13 +549,13 @@ STDAPI ClrCreateManagedInstance(LPCWSTR pTypeName, REFIID riid, void **ppObject) return ret; } -BOOL WINAPI StrongNameSignatureVerification(LPCWSTR filename, DWORD inFlags, DWORD* pOutFlags) +BOOLEAN WINAPI StrongNameSignatureVerification(LPCWSTR filename, DWORD inFlags, DWORD *pOutFlags) { FIXME("(%s, 0x%X, %p): stub\n", debugstr_w(filename), inFlags, pOutFlags); return FALSE; } -BOOL WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOL forceVerification, BOOL* pVerified) +BOOLEAN WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOLEAN forceVerification, BOOLEAN *pVerified) { FIXME("(%s, %u, %p): stub\n", debugstr_w(filename), forceVerification, pVerified); return FALSE;

1 0

Henri Verbeet : wined3d: Move the "desc" field from struct wined3d_swapchain to struct wined3d_swapchain_state.
by Alexandre Julliard July 31, 2019

July 31, 2019

Module: wine Branch: master Commit: bed677e34316595c6ade72c6871c396a455c26a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bed677e34316595c6ade72c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 29 16:18:55 2019 +0430 wined3d: Move the "desc" field from struct wined3d_swapchain to struct wined3d_swapchain_state. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +- dlls/wined3d/device.c | 67 ++++++++++--------- dlls/wined3d/surface.c | 6 +- dlls/wined3d/swapchain.c | 147 +++++++++++++++++++++-------------------- dlls/wined3d/view.c | 10 +-- dlls/wined3d/wined3d_private.h | 3 +- 6 files changed, 123 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bed677e34316595c6ade…

1 0