September 2016 - Wine-Commits

Bruno Jesus : dinput: Handle NULL effect envelope before testing its parameters.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 0d17228ff95a38d4d3e6714183fc8d6cf2dfebe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d17228ff95a38d4d3e671418… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Sep 12 16:07:56 2016 -0300 dinput: Handle NULL effect envelope before testing its parameters. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index fe3334a..9205c9c 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -585,9 +585,12 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( env->fade_length = 0; env->fade_level = 0; } - else if(peff->lpEnvelope->dwAttackTime || peff->lpEnvelope->dwAttackLevel || - peff->lpEnvelope->dwFadeTime || peff->lpEnvelope->dwFadeLevel) - WARN("Ignoring dinput envelope not supported in the linux effect\n"); + else if(peff->lpEnvelope) + { + if(peff->lpEnvelope->dwAttackTime || peff->lpEnvelope->dwAttackLevel || + peff->lpEnvelope->dwFadeTime || peff->lpEnvelope->dwFadeLevel) + WARN("Ignoring dinput envelope not supported in the linux effect\n"); + } } /* Gain and Sample Period settings are not supported by the linux

1 0

Dmitry Timoshkov : gdiplus: Implement GdipGetMetafileHeaderFromMetafile.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: 259837a19976f7cd6a59fa316b6593eda1dd60dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=259837a19976f7cd6a59fa316… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 9 13:42:44 2016 -0500 gdiplus: Implement GdipGetMetafileHeaderFromMetafile. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 20 ++++++++++++++++---- dlls/gdiplus/tests/image.c | 24 ++++++++++++------------ 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index b3b4682..d471a13 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1667,17 +1667,29 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileDestPointI(GpGraphics *graphics, GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile * metafile, MetafileHeader * header) { - static int calls; + GpStatus status; TRACE("(%p, %p)\n", metafile, header); if(!metafile || !header) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + if (metafile->hemf) + { + status = GdipGetMetafileHeaderFromEmf(metafile->hemf, header); + if (status != Ok) return status; + } + else + { + memset(header, 0, sizeof(*header)); + header->Version = 0xdbc01002; + } - memset(header, 0, sizeof(MetafileHeader)); + header->Type = metafile->metafile_type; + header->DpiX = metafile->image.xres; + header->DpiY = metafile->image.yres; + header->Width = gdip_round(metafile->bounds.Width); + header->Height = gdip_round(metafile->bounds.Height); return Ok; } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index cabd2fce..8c123b9 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1465,17 +1465,17 @@ static void test_loadwmf(void) expect(Ok, stat); if (stat == Ok) { - todo_wine expect(MetafileTypeWmfPlaceable, header.Type); + expect(MetafileTypeWmfPlaceable, header.Type); todo_wine expect(sizeof(wmfimage)-sizeof(WmfPlaceableFileHeader), header.Size); todo_wine expect(0x300, header.Version); expect(0, header.EmfPlusFlags); - todo_wine expectf(1440.0, header.DpiX); - todo_wine expectf(1440.0, header.DpiY); + expectf(1440.0, header.DpiX); + expectf(1440.0, header.DpiY); expect(0, header.X); expect(0, header.Y); - todo_wine expect(320, header.Width); - todo_wine expect(320, header.Height); - todo_wine expect(1, U(header).WmfHeader.mtType); + expect(320, header.Width); + expect(320, header.Height); + expect(1, U(header).WmfHeader.mtType); expect(0, header.EmfPlusHeaderSize); expect(0, header.LogicalDpiX); expect(0, header.LogicalDpiY); @@ -1523,17 +1523,17 @@ static void test_createfromwmf(void) expect(Ok, stat); if (stat == Ok) { - todo_wine expect(MetafileTypeWmfPlaceable, header.Type); + expect(MetafileTypeWmfPlaceable, header.Type); todo_wine expect(sizeof(wmfimage)-sizeof(WmfPlaceableFileHeader), header.Size); todo_wine expect(0x300, header.Version); expect(0, header.EmfPlusFlags); - todo_wine expectf(1440.0, header.DpiX); - todo_wine expectf(1440.0, header.DpiY); + expectf(1440.0, header.DpiX); + expectf(1440.0, header.DpiY); expect(0, header.X); expect(0, header.Y); - todo_wine expect(320, header.Width); - todo_wine expect(320, header.Height); - todo_wine expect(1, U(header).WmfHeader.mtType); + expect(320, header.Width); + expect(320, header.Height); + expect(1, U(header).WmfHeader.mtType); expect(0, header.EmfPlusHeaderSize); expect(0, header.LogicalDpiX); expect(0, header.LogicalDpiY);

1 0

Michael Stefaniuc : mscoree: Use the proper COM method wrappers.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: 478f3dd67bab9fc31fcd93069fe37f493bca2df4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=478f3dd67bab9fc31fcd93069… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 8 21:24:48 2016 +0200 mscoree: Use the proper COM method wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index 5da1102..b8bf882 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -396,13 +396,13 @@ static HRESULT WINAPI ConfigFileHandler_Error_QueryInterface(ISAXErrorHandler *i static ULONG WINAPI ConfigFileHandler_Error_AddRef(ISAXErrorHandler *iface) { ConfigFileHandler *This = impl_from_ISAXErrorHandler(iface); - return IUnknown_AddRef((IUnknown*)This); + return ISAXContentHandler_AddRef(&This->ISAXContentHandler_iface); } static ULONG WINAPI ConfigFileHandler_Error_Release(ISAXErrorHandler *iface) { ConfigFileHandler *This = impl_from_ISAXErrorHandler(iface); - return IUnknown_Release((IUnknown*)This); + return ISAXContentHandler_Release(&This->ISAXContentHandler_iface); } static HRESULT WINAPI ConfigFileHandler_error(ISAXErrorHandler *iface,

1 0

Sebastian Lackner : hidclass.sys: Do not return last error / HRESULT values in NTSTATUS functions.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: 8f76052902463e5788d623061ad613fa73a59d6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f76052902463e5788d623061… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Sep 12 15:47:36 2016 +0200 hidclass.sys: Do not return last error / HRESULT values in NTSTATUS functions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index b90e701..d2a4710 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -77,7 +77,7 @@ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRAT IoAttachDeviceToDeviceStack(*device, native_device); - return S_OK; + return STATUS_SUCCESS; } NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) @@ -118,7 +118,7 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) if (!devinfo) { FIXME( "failed to get ClassDevs %x\n", GetLastError()); - return GetLastError(); + return STATUS_UNSUCCESSFUL; } Data.cbSize = sizeof(Data); if (!SetupDiCreateDeviceInfoW(devinfo, ext->instance_id, &GUID_DEVCLASS_HIDCLASS, NULL, NULL, DICD_INHERIT_CLASSDRVS, &Data)) @@ -126,24 +126,28 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) if (GetLastError() == ERROR_DEVINST_ALREADY_EXISTS) { SetupDiDestroyDeviceInfoList(devinfo); - return ERROR_SUCCESS; + return STATUS_SUCCESS; } FIXME( "failed to Create Device Info %x\n", GetLastError()); - return GetLastError(); + goto error; } if (!SetupDiRegisterDeviceInfo( devinfo, &Data, 0, NULL, NULL, NULL )) { FIXME( "failed to Register Device Info %x\n", GetLastError()); - return GetLastError(); + goto error; } if (!SetupDiCreateDeviceInterfaceW( devinfo, &Data, &hidGuid, NULL, 0, NULL)) { FIXME( "failed to Create Device Interface %x\n", GetLastError()); - return GetLastError(); + goto error; } + SetupDiDestroyDeviceInfoList(devinfo); + return STATUS_SUCCESS; - return S_OK; +error: + SetupDiDestroyDeviceInfoList(devinfo); + return STATUS_UNSUCCESSFUL; } void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device)

1 0

Andrey Gusev : api-ms-win-core-versionansi-l1-1-0: Add dll.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: ba4d20cfcbedab32e29551763ffd5f30c4c13ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba4d20cfcbedab32e29551763… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Sep 12 11:59:46 2016 +0300 api-ms-win-core-versionansi-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-versionansi-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-versionansi-l1-1-0.spec | 4 ++++ tools/make_specfiles | 1 + 5 files changed, 9 insertions(+) diff --git a/configure b/configure index 941ae9e..0bda5d3 100755 --- a/configure +++ b/configure @@ -953,6 +953,7 @@ enable_api_ms_win_core_toolhelp_l1_1_0 enable_api_ms_win_core_url_l1_1_0 enable_api_ms_win_core_util_l1_1_0 enable_api_ms_win_core_version_l1_1_0 +enable_api_ms_win_core_versionansi_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_1 enable_api_ms_win_core_winrt_l1_1_0 @@ -17609,6 +17610,7 @@ wine_fn_config_dll api-ms-win-core-toolhelp-l1-1-0 enable_api_ms_win_core_toolhe wine_fn_config_dll api-ms-win-core-url-l1-1-0 enable_api_ms_win_core_url_l1_1_0 wine_fn_config_dll api-ms-win-core-util-l1-1-0 enable_api_ms_win_core_util_l1_1_0 wine_fn_config_dll api-ms-win-core-version-l1-1-0 enable_api_ms_win_core_version_l1_1_0 +wine_fn_config_dll api-ms-win-core-versionansi-l1-1-0 enable_api_ms_win_core_versionansi_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-1 enable_api_ms_win_core_winrt_error_l1_1_1 wine_fn_config_dll api-ms-win-core-winrt-l1-1-0 enable_api_ms_win_core_winrt_l1_1_0 diff --git a/configure.ac b/configure.ac index ab0feca..15c8469 100644 --- a/configure.ac +++ b/configure.ac @@ -2729,6 +2729,7 @@ WINE_CONFIG_DLL(api-ms-win-core-toolhelp-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-version-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-versionansi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0) diff --git a/dlls/api-ms-win-core-versionansi-l1-1-0/Makefile.in b/dlls/api-ms-win-core-versionansi-l1-1-0/Makefile.in new file mode 100644 index 0000000..0691db9 --- /dev/null +++ b/dlls/api-ms-win-core-versionansi-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-versionansi-l1-1-0.dll diff --git a/dlls/api-ms-win-core-versionansi-l1-1-0/api-ms-win-core-versionansi-l1-1-0.spec b/dlls/api-ms-win-core-versionansi-l1-1-0/api-ms-win-core-versionansi-l1-1-0.spec new file mode 100644 index 0000000..58a1711 --- /dev/null +++ b/dlls/api-ms-win-core-versionansi-l1-1-0/api-ms-win-core-versionansi-l1-1-0.spec @@ -0,0 +1,4 @@ +@ stdcall GetFileVersionInfoExA(long str long long ptr) version.GetFileVersionInfoExA +@ stdcall GetFileVersionInfoSizeExA(long str ptr) version.GetFileVersionInfoSizeExA +@ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) version.VerFindFileA +@ stdcall VerQueryValueA(ptr str ptr ptr) version.VerQueryValueA diff --git a/tools/make_specfiles b/tools/make_specfiles index a45bb7d..6cfc4f0 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -239,6 +239,7 @@ my @dll_groups = ], [ "version", + "api-ms-win-core-versionansi-l1-1-0", "api-ms-win-core-version-l1-1-0", "api-ms-win-downlevel-version-l1-1-0", ],

1 0

Michael Stefaniuc : quartz: Use the proper COM method wrappers.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: ddfc1a2e88250f92c075728f9fe6061b02f00dd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddfc1a2e88250f92c075728f9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 12 10:18:29 2016 +0200 quartz: Use the proper COM method wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 8 ++++---- dlls/quartz/filesource.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 49b998b..9e8f69c 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -667,7 +667,7 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) if (!pDSoundRender->blocked || FAILED(hr)) { - IUnknown_Release((IUnknown *)pDSoundRender); + IBaseFilter_Release(&pDSoundRender->renderer.filter.IBaseFilter_iface); return HRESULT_FROM_WIN32(GetLastError()); } @@ -1281,17 +1281,17 @@ static const IAMDirectSoundVtbl IAMDirectSound_Vtbl = static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { DSoundRenderImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); + return IBaseFilter_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppv); } static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) { DSoundRenderImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_AddRef((IUnknown*)This); + return IBaseFilter_AddRef(&This->renderer.filter.IBaseFilter_iface); } static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) { DSoundRenderImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_Release((IUnknown*)This); + return IBaseFilter_Release(&This->renderer.filter.IBaseFilter_iface); } static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) { diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 269dd13..1024bd0 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1434,17 +1434,17 @@ static const IAsyncReaderVtbl FileAsyncReader_Vtbl = static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { AsyncReader *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); + return IBaseFilter_QueryInterface(&This->filter.IBaseFilter_iface, riid, ppv); } static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) { AsyncReader *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_AddRef((IUnknown*)This); + return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); } static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) { AsyncReader *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_Release((IUnknown*)This); + return IBaseFilter_Release(&This->filter.IBaseFilter_iface); } static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) {

1 0

Michael Stefaniuc : msi: Use CONTAINING_RECORD() to get from a field to a struct.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: c0a6f0f7a87e28019a1e78732869c99f229134e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a6f0f7a87e28019a1e78732… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 8 22:21:04 2016 +0200 msi: Use CONTAINING_RECORD() to get from a field to a struct. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/automation.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index b94fa84..06ad2f9 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1031,7 +1031,7 @@ static HRESULT list_invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr) { - ListObject *list = (ListObject*)This; + ListObject *list = CONTAINING_RECORD(This, ListObject, autoobj); IUnknown *pUnk = NULL; HRESULT hr; @@ -1079,7 +1079,7 @@ static HRESULT list_invoke( static void list_free(AutomationObject *This) { - ListObject *list = (ListObject*)This; + ListObject *list = CONTAINING_RECORD(This, ListObject, autoobj); int i; for (i = 0; i < list->count; i++) @@ -1367,7 +1367,7 @@ static HRESULT session_invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr) { - SessionObject *session = (SessionObject*)This; + SessionObject *session = CONTAINING_RECORD(This, SessionObject, autoobj); WCHAR *szString; DWORD dwLen = 0; MSIHANDLE msiHandle;

1 0

Sebastian Lackner : jscript: Simplify create_utc_string and add basic tests.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: 57291c4bfd7a3478cc679ea48ee15e942921ec45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57291c4bfd7a3478cc679ea48… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Sep 11 18:50:26 2016 +0200 jscript: Simplify create_utc_string and add basic tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/date.c | 39 +++++++++++---------------------------- dlls/jscript/tests/api.js | 4 ++++ 2 files changed, 15 insertions(+), 28 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index a9d2ab4..a66a286 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -654,9 +654,10 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva BOOL formatAD = TRUE; WCHAR week[64], month[64]; + WCHAR buf[192]; DateInstance *date; jsstr_t *date_str; - int len, size, year, day; + int year, day; DWORD lcid_en; if(!(date = date_this(jsthis))) @@ -669,48 +670,30 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva } if(r) { - WCHAR *ptr; - - len = 17; - lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - size = GetLocaleInfoW(lcid_en, week_ids[(int)week_day(date->time)], week, sizeof(week)/sizeof(*week)); - len += size-1; - - size = GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(date->time)], month, sizeof(month)/sizeof(*month)); - len += size-1; + week[0] = 0; + GetLocaleInfoW(lcid_en, week_ids[(int)week_day(date->time)], week, sizeof(week)/sizeof(*week)); - year = year_from_time(date->time); - if(year<0) - year = -year+1; - do { - year /= 10; - len++; - } while(year); + month[0] = 0; + GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(date->time)], month, sizeof(month)/sizeof(*month)); year = year_from_time(date->time); if(year<0) { formatAD = FALSE; year = -year+1; - len += 5; } day = date_from_time(date->time); - do { - day /= 10; - len++; - } while(day); - day = date_from_time(date->time); - - date_str = jsstr_alloc_buf(len, &ptr); - if(!date_str) - return E_OUTOFMEMORY; - sprintfW(ptr, formatAD?formatADW:formatBCW, week, day, month, year, + sprintfW(buf, formatAD ? formatADW : formatBCW, week, day, month, year, (int)hour_from_time(date->time), (int)min_from_time(date->time), (int)sec_from_time(date->time)); + date_str = jsstr_alloc(buf); + if(!date_str) + return E_OUTOFMEMORY; + *r = jsval_string(date_str); } return S_OK; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 40a749b..5a78b3a 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2151,6 +2151,8 @@ ok(Date.parse("Tue, 22 Mar 2016 09:57:55 -0300") === Date.parse("Tue, 22 Mar 201 ok(Date.parse("Tue, 22 Mar 2016 09:57:55 +0400") === Date.parse("Tue, 22 Mar 2016 09:57:55 UTC+0400"), "Date.parse(\"Tue, 22 Mar 2016 09:57:55 +0400\") = " + Date.parse("Tue, 22 Mar 2016 09:57:55 +0400")); +tmp = (new Date()).toGMTString(); +ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); tmp = (new Date()).toLocaleDateString(); ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); tmp = (new Date(1600, 1, 1, 0, 0, 0, 0)).toLocaleDateString(); @@ -2163,6 +2165,8 @@ tmp = (new Date()).toString(); ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); tmp = (new Date()).toTimeString(); ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); +tmp = (new Date()).toUTCString(); +ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);

1 0

Bruno Jesus : ws2_32: Use correct WS_ prefixed family.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: 6135a3fa93958e5c8dfdc05f046abf9625e1174c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6135a3fa93958e5c8dfdc05f0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Sep 9 14:33:54 2016 -0300 ws2_32: Use correct WS_ prefixed family. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f0dc04f..2d54013 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4701,19 +4701,17 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID addr = inet_addr(ptr->IpAddressList.IpAddress.String); mask = inet_addr(ptr->IpAddressList.IpMask.String); bcast = addr | ~mask; - intArray->iiAddress.AddressIn.sin_family = AF_INET; + intArray->iiAddress.AddressIn.sin_family = WS_AF_INET; intArray->iiAddress.AddressIn.sin_port = 0; - intArray->iiAddress.AddressIn.sin_addr.WS_s_addr = - addr; - intArray->iiNetmask.AddressIn.sin_family = AF_INET; + intArray->iiAddress.AddressIn.sin_addr.WS_s_addr = addr; + + intArray->iiNetmask.AddressIn.sin_family = WS_AF_INET; intArray->iiNetmask.AddressIn.sin_port = 0; - intArray->iiNetmask.AddressIn.sin_addr.WS_s_addr = - mask; - intArray->iiBroadcastAddress.AddressIn.sin_family = - AF_INET; + intArray->iiNetmask.AddressIn.sin_addr.WS_s_addr = mask; + + intArray->iiBroadcastAddress.AddressIn.sin_family = WS_AF_INET; intArray->iiBroadcastAddress.AddressIn.sin_port = 0; - intArray->iiBroadcastAddress.AddressIn.sin_addr. - WS_s_addr = bcast; + intArray->iiBroadcastAddress.AddressIn.sin_addr.WS_s_addr = bcast; intArray++; numInt++; } @@ -4797,7 +4795,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID sa[i].lpSockaddr = (SOCKADDR *)&sockaddr[i]; sa[i].iSockaddrLength = sizeof(SOCKADDR); - sockaddr[i].sin_family = AF_INET; + sockaddr[i].sin_family = WS_AF_INET; sockaddr[i].sin_port = 0; sockaddr[i].sin_addr.WS_s_addr = inet_addr(p->IpAddressList.IpAddress.String); i++; @@ -4936,7 +4934,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID SetLastError(WSAEFAULT); return SOCKET_ERROR; } - if (daddr->sa_family != AF_INET) + if (daddr->sa_family != WS_AF_INET) { FIXME("unsupported address family %d\n", daddr->sa_family); status = WSAEAFNOSUPPORT; @@ -4969,7 +4967,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID status = WSAEFAULT; break; } - saddr_in->sin_family = AF_INET; + saddr_in->sin_family = WS_AF_INET; saddr_in->sin_addr.S_un.S_addr = ipAddrTable->table[found_index].dwAddr; saddr_in->sin_port = 0; total = sizeof(struct WS_sockaddr_in);

1 0

Michael Stefaniuc : mscoree: There can be only one QI implementation in a COM object.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: cac5a5996a6bba6e9c99de5f3acda59510a0cddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac5a5996a6bba6e9c99de5f3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 8 21:25:27 2016 +0200 mscoree: There can be only one QI implementation in a COM object. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/config.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index b8bf882..a52a521 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -73,18 +73,19 @@ static inline ConfigFileHandler *impl_from_ISAXErrorHandler(ISAXErrorHandler *if static HRESULT WINAPI ConfigFileHandler_QueryInterface(ISAXContentHandler *iface, REFIID riid, void **ppvObject) { - if (IsEqualGUID(riid, &IID_ISAXContentHandler) || - IsEqualGUID(riid, &IID_IUnknown)) - { - *ppvObject = iface; - } + ConfigFileHandler *This = impl_from_ISAXContentHandler(iface); + + if (IsEqualGUID(riid, &IID_ISAXContentHandler) || IsEqualGUID(riid, &IID_IUnknown)) + *ppvObject = &This->ISAXContentHandler_iface; + else if (IsEqualGUID(riid, &IID_ISAXErrorHandler)) + *ppvObject = &This->ISAXErrorHandler_iface; else { WARN("Unsupported interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } - ISAXContentHandler_AddRef(iface); + IUnknown_AddRef((IUnknown*)*ppvObject); return S_OK; } @@ -377,20 +378,8 @@ static const struct ISAXContentHandlerVtbl ConfigFileHandlerVtbl = static HRESULT WINAPI ConfigFileHandler_Error_QueryInterface(ISAXErrorHandler *iface, REFIID riid, void **ppvObject) { - if (IsEqualGUID(riid, &IID_ISAXErrorHandler) || - IsEqualGUID(riid, &IID_IUnknown)) - { - *ppvObject = iface; - } - else - { - WARN("Unsupported interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; - } - - ISAXErrorHandler_AddRef(iface); - - return S_OK; + ConfigFileHandler *This = impl_from_ISAXErrorHandler(iface); + return ISAXContentHandler_QueryInterface(&This->ISAXContentHandler_iface, riid, ppvObject); } static ULONG WINAPI ConfigFileHandler_Error_AddRef(ISAXErrorHandler *iface)

1 0