June 2009 - Wine-Commits - list.winehq.org

Vincent Povirk : windowscodecs: Implement GetFrame for BMP decoder.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: eca8ef6924724a009b63032ebc376c53cb4ef5c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca8ef6924724a009b63032eb… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Jun 13 17:32:16 2009 -0500 windowscodecs: Implement GetFrame for BMP decoder. --- dlls/windowscodecs/bmpdecode.c | 156 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 154 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index f60471e..5ab8121 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -59,12 +59,141 @@ typedef struct { } BITMAPCOREHEADER2; typedef struct { + const IWICBitmapFrameDecodeVtbl *lpVtbl; + LONG ref; + IStream *stream; + BITMAPFILEHEADER bfh; + BITMAPV5HEADER bih; +} BmpFrameDecode; + +HRESULT WINAPI BmpFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, + void **ppv) +{ + BmpFrameDecode *This = (BmpFrameDecode*)iface; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapSource, iid) || + IsEqualIID(&IID_IWICBitmapFrameDecode, iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI BmpFrameDecode_AddRef(IWICBitmapFrameDecode *iface) +{ + BmpFrameDecode *This = (BmpFrameDecode*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI BmpFrameDecode_Release(IWICBitmapFrameDecode *iface) +{ + BmpFrameDecode *This = (BmpFrameDecode*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + IStream_Release(This->stream); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI BmpFrameDecode_GetSize(IWICBitmapFrameDecode *iface, + UINT *puiWidth, UINT *puiHeight) +{ + FIXME("(%p,%p,%p): stub\n", iface, puiWidth, puiHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpFrameDecode_GetPixelFormat(IWICBitmapFrameDecode *iface, + WICPixelFormatGUID *pPixelFormat) +{ + FIXME("(%p,%p): stub\n", iface, pPixelFormat); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpFrameDecode_GetResolution(IWICBitmapFrameDecode *iface, + double *pDpiX, double *pDpiY) +{ + FIXME("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, + const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) +{ + FIXME("(%p,%p,%u,%u,%p): stub\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpFrameDecode_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, + IWICMetadataQueryReader **ppIMetadataQueryReader) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpFrameDecode_GetColorContexts(IWICBitmapFrameDecode *iface, + UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface, + IWICBitmapSource **ppIThumbnail) +{ + FIXME("(%p,%p): stub\n", iface, ppIThumbnail); + return E_NOTIMPL; +} + +static const IWICBitmapFrameDecodeVtbl BmpFrameDecode_Vtbl = { + BmpFrameDecode_QueryInterface, + BmpFrameDecode_AddRef, + BmpFrameDecode_Release, + BmpFrameDecode_GetSize, + BmpFrameDecode_GetPixelFormat, + BmpFrameDecode_GetResolution, + BmpFrameDecode_CopyPalette, + BmpFrameDecode_CopyPixels, + BmpFrameDecode_GetMetadataQueryReader, + BmpFrameDecode_GetColorContexts, + BmpFrameDecode_GetThumbnail +}; + +typedef struct { const IWICBitmapDecoderVtbl *lpVtbl; LONG ref; BOOL initialized; IStream *stream; BITMAPFILEHEADER bfh; BITMAPV5HEADER bih; + BmpFrameDecode *framedecode; } BmpDecoder; static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) @@ -140,6 +269,7 @@ static ULONG WINAPI BmpDecoder_Release(IWICBitmapDecoder *iface) if (ref == 0) { if (This->stream) IStream_Release(This->stream); + if (This->framedecode) IUnknown_Release((IUnknown*)This->framedecode); HeapFree(GetProcessHeap(), 0, This); } @@ -229,8 +359,29 @@ static HRESULT WINAPI BmpDecoder_GetFrameCount(IWICBitmapDecoder *iface, static HRESULT WINAPI BmpDecoder_GetFrame(IWICBitmapDecoder *iface, UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) { - FIXME("(%p,%u,%p): stub\n", iface, index, ppIBitmapFrame); - return E_NOTIMPL; + BmpDecoder *This = (BmpDecoder*)iface; + + if (index != 0) return E_INVALIDARG; + + if (!This->stream) return WINCODEC_ERR_WRONGSTATE; + + if (!This->framedecode) + { + This->framedecode = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpFrameDecode)); + if (!This->framedecode) return E_OUTOFMEMORY; + + This->framedecode->lpVtbl = &BmpFrameDecode_Vtbl; + This->framedecode->ref = 1; + This->framedecode->stream = This->stream; + IStream_AddRef(This->stream); + This->framedecode->bfh = This->bfh; + This->framedecode->bih = This->bih; + } + + *ppIBitmapFrame = (IWICBitmapFrameDecode*)This->framedecode; + IWICBitmapFrameDecode_AddRef((IWICBitmapFrameDecode*)This->framedecode); + + return S_OK; } static const IWICBitmapDecoderVtbl BmpDecoder_Vtbl = { @@ -268,6 +419,7 @@ HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->ref = 1; This->initialized = FALSE; This->stream = NULL; + This->framedecode = NULL; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

Vincent Povirk : windowscodecs: Add test for BMP decoder.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: b19e329be41fd55b5ec6d0e932f9466dc7b18072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b19e329be41fd55b5ec6d0e93… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 10 15:57:15 2009 -0500 windowscodecs: Add test for BMP decoder. --- configure | 9 ++ configure.ac | 1 + dlls/Makefile.in | 5 + dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/tests/Makefile.in | 13 +++ dlls/windowscodecs/tests/bmpformat.c | 151 ++++++++++++++++++++++++++++++++++ 6 files changed, 180 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b19e329be41fd55b5ec6d…

1 0

Vincent Povirk : windowscodecs: Implement GetSize for BMP decoder.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 7c7f70a3177524ff7c2d871dcc8fc5d22bd65c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7f70a3177524ff7c2d871dc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 24 16:20:29 2009 -0500 windowscodecs: Implement GetSize for BMP decoder. --- dlls/windowscodecs/bmpdecode.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 5ab8121..7db5dfb 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -116,11 +116,36 @@ static ULONG WINAPI BmpFrameDecode_Release(IWICBitmapFrameDecode *iface) return ref; } +static HRESULT BmpHeader_GetSize(BITMAPV5HEADER *bih, UINT *puiWidth, UINT *puiHeight) +{ + switch (bih->bV5Size) + { + case sizeof(BITMAPCOREHEADER): + { + BITMAPCOREHEADER *bch = (BITMAPCOREHEADER*)bih; + *puiWidth = bch->bcWidth; + *puiHeight = bch->bcHeight; + return S_OK; + } + case sizeof(BITMAPCOREHEADER2): + case sizeof(BITMAPINFOHEADER): + case sizeof(BITMAPV4HEADER): + case sizeof(BITMAPV5HEADER): + *puiWidth = bih->bV5Width; + *puiHeight = bih->bV5Height; + return S_OK; + default: + return E_FAIL; + } +} + static HRESULT WINAPI BmpFrameDecode_GetSize(IWICBitmapFrameDecode *iface, UINT *puiWidth, UINT *puiHeight) { - FIXME("(%p,%p,%p): stub\n", iface, puiWidth, puiHeight); - return E_NOTIMPL; + BmpFrameDecode *This = (BmpFrameDecode*)iface; + TRACE("(%p,%p,%p)\n", iface, puiWidth, puiHeight); + + return BmpHeader_GetSize(&This->bih, puiWidth, puiHeight); } static HRESULT WINAPI BmpFrameDecode_GetPixelFormat(IWICBitmapFrameDecode *iface,

1 0

Vincent Povirk : windowscodecs: Add a stub decoder for the BMP format.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 429c784cd719fe487abf7c391a3c74e2472cefdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=429c784cd719fe487abf7c391… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 10 15:40:27 2009 -0500 windowscodecs: Add a stub decoder for the BMP format. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/bmpdecode.c | 202 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/regsvr.c | 6 + dlls/windowscodecs/wincodecs_private.h | 1 + 5 files changed, 211 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 05d5521..9cd6ee1 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -6,6 +6,7 @@ MODULE = windowscodecs.dll IMPORTS = uuid ole32 advapi32 kernel32 C_SRCS = \ + bmpdecode.c \ clsfactory.c \ imgfactory.c \ main.c \ diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c new file mode 100644 index 0000000..2ab8034 --- /dev/null +++ b/dlls/windowscodecs/bmpdecode.c @@ -0,0 +1,202 @@ +/* + * Copyright 2009 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "objbase.h" +#include "wincodec.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +typedef struct { + const IWICBitmapDecoderVtbl *lpVtbl; + LONG ref; +} BmpDecoder; + +HRESULT WINAPI BmpDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, + void **ppv) +{ + BmpDecoder *This = (BmpDecoder*)iface; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapDecoder, iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI BmpDecoder_AddRef(IWICBitmapDecoder *iface) +{ + BmpDecoder *This = (BmpDecoder*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI BmpDecoder_Release(IWICBitmapDecoder *iface) +{ + BmpDecoder *This = (BmpDecoder*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI BmpDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, + DWORD *pdwCapability) +{ + FIXME("(%p,%p,%p): stub\n", iface, pIStream, pdwCapability); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, + WICDecodeOptions cacheOptions) +{ + FIXME("(%p,%p,%x): stub\n", iface, pIStream, cacheOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_GetContainerFormat(IWICBitmapDecoder *iface, + GUID *pguidContainerFormat) +{ + FIXME("(%p,%p): stub\n", iface, pguidContainerFormat); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, + IWICBitmapDecoderInfo **ppIDecoderInfo) +{ + FIXME("(%p,%p): stub\n", iface, ppIDecoderInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_CopyPalette(IWICBitmapDecoder *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, + IWICMetadataQueryReader **ppIMetadataQueryReader) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_GetPreview(IWICBitmapDecoder *iface, + IWICBitmapSource **ppIBitmapSource) +{ + FIXME("(%p,%p): stub\n", iface, ppIBitmapSource); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_GetColorContexts(IWICBitmapDecoder *iface, + UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_GetThumbnail(IWICBitmapDecoder *iface, + IWICBitmapSource **ppIThumbnail) +{ + FIXME("(%p,%p): stub\n", iface, ppIThumbnail); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_GetFrameCount(IWICBitmapDecoder *iface, + UINT *pCount) +{ + FIXME("(%p,%p): stub\n", iface, pCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpDecoder_GetFrame(IWICBitmapDecoder *iface, + UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) +{ + FIXME("(%p,%u,%p): stub\n", iface, index, ppIBitmapFrame); + return E_NOTIMPL; +} + +static const IWICBitmapDecoderVtbl BmpDecoder_Vtbl = { + BmpDecoder_QueryInterface, + BmpDecoder_AddRef, + BmpDecoder_Release, + BmpDecoder_QueryCapability, + BmpDecoder_Initialize, + BmpDecoder_GetContainerFormat, + BmpDecoder_GetDecoderInfo, + BmpDecoder_CopyPalette, + BmpDecoder_GetMetadataQueryReader, + BmpDecoder_GetPreview, + BmpDecoder_GetColorContexts, + BmpDecoder_GetThumbnail, + BmpDecoder_GetFrameCount, + BmpDecoder_GetFrame +}; + +HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + BmpDecoder *This; + HRESULT ret; + + TRACE("(%p,%s,%p)\n", pUnkOuter, debugstr_guid(iid), ppv); + + *ppv = NULL; + + if (pUnkOuter) return CLASS_E_NOAGGREGATION; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpDecoder)); + if (!This) return E_OUTOFMEMORY; + + This->lpVtbl = &BmpDecoder_Vtbl; + This->ref = 1; + + ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); + IUnknown_Release((IUnknown*)This); + + return ret; +} diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index b74746c..37e30e5 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -43,6 +43,7 @@ typedef struct { static classinfo wic_classes[] = { {&CLSID_WICImagingFactory, ImagingFactory_CreateInstance}, + {&CLSID_WICBmpDecoder, BmpDecoder_CreateInstance}, {0}}; typedef struct { diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index fef2979..ddb781a 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -309,6 +309,12 @@ static struct regsvr_coclass const coclass_list[] = { "windowscodecs.dll", "Apartment" }, + { &CLSID_WICBmpDecoder, + "WIC BMP Decoder", + NULL, + "windowscodecs.dll", + "Apartment" + }, { NULL } /* list terminator */ }; diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index b453920..0070bfc 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -20,5 +20,6 @@ #define WINCODECS_PRIVATE_H extern HRESULT ImagingFactory_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); +extern HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); #endif /* WINCODECS_PRIVATE_H */

1 0

Piotr Caban : jscript: Added Date_toLocaleTimeString implementation.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 0e379fbe05d874b8dc0fe32659f33ce9555113ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e379fbe05d874b8dc0fe3265… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jun 28 23:39:27 2009 +0200 jscript: Added Date_toLocaleTimeString implementation. --- dlls/jscript/date.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 8c40bab..ce703a4 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -561,11 +561,51 @@ static HRESULT Date_toLocaleDateString(DispatchEx *dispex, LCID lcid, WORD flags return S_OK; } +/* ECMA-262 3rd Edition 15.9.5.7 */ static HRESULT Date_toLocaleTimeString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR NaNW[] = { 'N','a','N',0 }; + SYSTEMTIME st; + DateInstance *date; + BSTR date_str; + int len; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + date = (DateInstance*)dispex; + + if(isnan(date->time)) { + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(NaNW); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + return S_OK; + } + + st = create_systemtime(local_time(date->time, date)); + + if(st.wYear<1601 || st.wYear>9999) + return Date_toTimeString(dispex, lcid, flags, dp, retv, ei, caller); + + if(retv) { + len = GetTimeFormatW(lcid, 0, &st, NULL, NULL, 0); + date_str = SysAllocStringLen(NULL, len); + if(!date_str) + return E_OUTOFMEMORY; + GetTimeFormatW(lcid, 0, &st, NULL, date_str, len); + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = date_str; + } + return S_OK; } /* ECMA-262 3rd Edition 15.9.5.9 */

1 0

Piotr Caban : jscript: Added Date_toDateString implementation.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: fd89475380b1c3317485bae9929035fac48cec8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd89475380b1c3317485bae99… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jun 28 23:39:36 2009 +0200 jscript: Added Date_toDateString implementation. --- dlls/jscript/date.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 102 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 3996b7e..8bf811f 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -500,11 +500,111 @@ static HRESULT Date_toUTCString(DispatchEx *dispex, LCID lcid, WORD flags, DISPP return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.9.5.3 */ static HRESULT Date_toDateString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR NaNW[] = { 'N','a','N',0 }; + static const WCHAR formatADW[] = { '%','s',' ','%','s',' ','%','d',' ','%','d',0 }; + static const WCHAR formatBCW[] = { '%','s',' ','%','s',' ','%','d',' ','%','d',' ','B','.','C','.',0 }; + + static const DWORD week_ids[] = { LOCALE_SABBREVDAYNAME7, LOCALE_SABBREVDAYNAME1, + LOCALE_SABBREVDAYNAME2, LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4, + LOCALE_SABBREVDAYNAME5, LOCALE_SABBREVDAYNAME6 }; + static const DWORD month_ids[] = { LOCALE_SABBREVMONTHNAME1, LOCALE_SABBREVMONTHNAME2, + LOCALE_SABBREVMONTHNAME3, LOCALE_SABBREVMONTHNAME4, + LOCALE_SABBREVMONTHNAME5, LOCALE_SABBREVMONTHNAME6, + LOCALE_SABBREVMONTHNAME7, LOCALE_SABBREVMONTHNAME8, + LOCALE_SABBREVMONTHNAME9, LOCALE_SABBREVMONTHNAME10, + LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 }; + + BOOL formatAD = TRUE; + BSTR week, month; + DateInstance *date; + BSTR date_str; + DOUBLE time; + int len, size, year, day; + DWORD lcid_en, week_id, month_id; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + date = (DateInstance*)dispex; + + if(isnan(date->time)) { + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(NaNW); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + return S_OK; + } + + time = local_time(date->time, date); + + if(retv) { + len = 5; + + lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); + + week_id = week_ids[(int)week_day(time)]; + size = GetLocaleInfoW(lcid_en, week_id, NULL, 0); + week = SysAllocStringLen(NULL, size); + if(!week) + return E_OUTOFMEMORY; + GetLocaleInfoW(lcid_en, week_id, week, size); + len += size-1; + + month_id = month_ids[(int)month_from_time(time)]; + size = GetLocaleInfoW(lcid_en, month_id, NULL, 0); + month = SysAllocStringLen(NULL, size); + if(!month) { + SysFreeString(week); + return E_OUTOFMEMORY; + } + GetLocaleInfoW(lcid_en, month_id, month, size); + len += size-1; + + year = year_from_time(time)/10; + while(year) { + year /= 10; + len++; + } + + year = year_from_time(time); + if(year<0) { + formatAD = FALSE; + year = -year+1; + len += 5; + } + + day = date_from_time(time)/10; + while(day) { + day /= 10; + len++; + } + day = date_from_time(time); + + date_str = SysAllocStringLen(NULL, len); + if(!date_str) { + SysFreeString(week); + SysFreeString(month); + return E_OUTOFMEMORY; + } + sprintfW(date_str, formatAD?formatADW:formatBCW, week, month, day, year); + + SysFreeString(week); + SysFreeString(month); + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = date_str; + } + return S_OK; } /* ECMA-262 3rd Edition 15.9.5.4 */

1 0

Piotr Caban : jscript: Added Date_toLocaleString implementation.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 9b011bd0f7b783910195afcb7820be55fb1d016c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b011bd0f7b783910195afcb7… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jun 28 23:39:45 2009 +0200 jscript: Added Date_toLocaleString implementation. --- dlls/jscript/date.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index ae91c64..8c3b41e 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -458,11 +458,54 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.9.1.5 */ static HRESULT Date_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR NaNW[] = { 'N','a','N',0 }; + SYSTEMTIME st; + DateInstance *date; + BSTR date_str; + int date_len, time_len; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + date = (DateInstance*)dispex; + + if(isnan(date->time)) { + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(NaNW); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + return S_OK; + } + + st = create_systemtime(local_time(date->time, date)); + + if(st.wYear<1601 || st.wYear>9999) + return Date_toString(dispex, lcid, flags, dp, retv, ei, caller); + + if(retv) { + date_len = GetDateFormatW(lcid, DATE_LONGDATE, &st, NULL, NULL, 0); + time_len = GetTimeFormatW(lcid, 0, &st, NULL, NULL, 0); + date_str = SysAllocStringLen(NULL, date_len+time_len-1); + if(!date_str) + return E_OUTOFMEMORY; + GetDateFormatW(lcid, DATE_LONGDATE, &st, NULL, date_str, date_len); + GetTimeFormatW(lcid, 0, &st, NULL, &date_str[date_len], time_len); + date_str[date_len-1] = ' '; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = date_str; + } + return S_OK; } static HRESULT Date_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,

1 0

Piotr Caban : jscript: Added Date_toLocaleDateString implementation.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 6dc3b7beb77cc9f3c69dc72fab121b05cd98ca2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dc3b7beb77cc9f3c69dc72fa… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jun 28 23:39:15 2009 +0200 jscript: Added Date_toLocaleDateString implementation. --- dlls/jscript/date.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index e68b3e9..8c40bab 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -435,6 +435,22 @@ static inline DOUBLE time_clip(DOUBLE time) return floor(time); } +static SYSTEMTIME create_systemtime(DOUBLE time) +{ + SYSTEMTIME st; + + st.wYear = year_from_time(time); + st.wMonth = month_from_time(time) + 1; + st.wDayOfWeek = week_day(time); + st.wDay = date_from_time(time); + st.wHour = hour_from_time(time); + st.wMinute = min_from_time(time); + st.wSecond = sec_from_time(time); + st.wMilliseconds = ms_from_time(time); + + return st; +} + static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -498,11 +514,51 @@ static HRESULT Date_toTimeString(DispatchEx *dispex, LCID lcid, WORD flags, DISP return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.9.5.6 */ static HRESULT Date_toLocaleDateString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR NaNW[] = { 'N','a','N',0 }; + SYSTEMTIME st; + DateInstance *date; + BSTR date_str; + int len; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + date = (DateInstance*)dispex; + + if(isnan(date->time)) { + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(NaNW); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + return S_OK; + } + + st = create_systemtime(local_time(date->time, date)); + + if(st.wYear<1601 || st.wYear>9999) + return Date_toDateString(dispex, lcid, flags, dp, retv, ei, caller); + + if(retv) { + len = GetDateFormatW(lcid, DATE_LONGDATE, &st, NULL, NULL, 0); + date_str = SysAllocStringLen(NULL, len); + if(!date_str) + return E_OUTOFMEMORY; + GetDateFormatW(lcid, DATE_LONGDATE, &st, NULL, date_str, len); + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = date_str; + } + return S_OK; } static HRESULT Date_toLocaleTimeString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,

1 0

Piotr Caban : jscript: Added Date_toTimeString implementation.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 40b88e261a44ecdc1dffce3901d612924c7c98d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b88e261a44ecdc1dffce390… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jun 28 23:39:32 2009 +0200 jscript: Added Date_toTimeString implementation. --- dlls/jscript/date.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index ce703a4..3996b7e 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -507,11 +507,68 @@ static HRESULT Date_toDateString(DispatchEx *dispex, LCID lcid, WORD flags, DISP return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.9.5.4 */ static HRESULT Date_toTimeString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR NaNW[] = { 'N','a','N',0 }; + static const WCHAR formatW[] = { '%','0','2','d',':','%','0','2','d',':','%','0','2','d', + ' ','U','T','C','%','c','%','0','2','d','%','0','2','d',0 }; + static const WCHAR formatUTCW[] = { '%','0','2','d',':','%','0','2','d', + ':','%','0','2','d',' ','U','T','C',0 }; + DateInstance *date; + BSTR date_str; + DOUBLE time; + WCHAR sign; + int offset; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + date = (DateInstance*)dispex; + + if(isnan(date->time)) { + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(NaNW); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + return S_OK; + } + + time = local_time(date->time, date); + + if(retv) { + date_str = SysAllocStringLen(NULL, 17); + if(!date_str) + return E_OUTOFMEMORY; + + offset = date->bias + + daylight_saving_ta(time, date); + + if(offset < 0) { + sign = '+'; + offset = -offset; + } + else sign = '-'; + + if(offset) + sprintfW(date_str, formatW, (int)hour_from_time(time), + (int)min_from_time(time), (int)sec_from_time(time), + sign, offset/60, offset%60); + else + sprintfW(date_str, formatUTCW, (int)hour_from_time(time), + (int)min_from_time(time), (int)sec_from_time(time)); + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = date_str; + } + return S_OK; } /* ECMA-262 3rd Edition 15.9.5.6 */

1 0

Piotr Caban : jscript: Added Date_toUTCString implementation.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 5be6deb844e471dfba2bf8dcdcee1472e975f014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5be6deb844e471dfba2bf8dcd… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jun 28 23:39:40 2009 +0200 jscript: Added Date_toUTCString implementation. --- dlls/jscript/date.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 103 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 8bf811f..ae91c64 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -493,11 +493,112 @@ static HRESULT Date_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.9.5.42 */ static HRESULT Date_toUTCString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR NaNW[] = { 'N','a','N',0 }; + static const WCHAR formatADW[] = { '%','s',',',' ','%','d',' ','%','s',' ','%','d',' ', + '%','0','2','d',':','%','0','2','d',':','%','0','2','d',' ','U','T','C',0 }; + static const WCHAR formatBCW[] = { '%','s',',',' ','%','d',' ','%','s',' ','%','d',' ','B','.','C','.',' ', + '%','0','2','d',':','%','0','2','d',':','%','0','2','d',' ','U','T','C',0 }; + + static const DWORD week_ids[] = { LOCALE_SABBREVDAYNAME7, LOCALE_SABBREVDAYNAME1, + LOCALE_SABBREVDAYNAME2, LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4, + LOCALE_SABBREVDAYNAME5, LOCALE_SABBREVDAYNAME6 }; + static const DWORD month_ids[] = { LOCALE_SABBREVMONTHNAME1, LOCALE_SABBREVMONTHNAME2, + LOCALE_SABBREVMONTHNAME3, LOCALE_SABBREVMONTHNAME4, + LOCALE_SABBREVMONTHNAME5, LOCALE_SABBREVMONTHNAME6, + LOCALE_SABBREVMONTHNAME7, LOCALE_SABBREVMONTHNAME8, + LOCALE_SABBREVMONTHNAME9, LOCALE_SABBREVMONTHNAME10, + LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 }; + + BOOL formatAD = TRUE; + BSTR week, month; + DateInstance *date; + BSTR date_str; + int len, size, year, day; + DWORD lcid_en, week_id, month_id; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + date = (DateInstance*)dispex; + + if(isnan(date->time)) { + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(NaNW); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + return S_OK; + } + + if(retv) { + len = 17; + + lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); + + week_id = week_ids[(int)week_day(date->time)]; + size = GetLocaleInfoW(lcid_en, week_id, NULL, 0); + week = SysAllocStringLen(NULL, size); + if(!week) + return E_OUTOFMEMORY; + GetLocaleInfoW(lcid_en, week_id, week, size); + len += size-1; + + month_id = month_ids[(int)month_from_time(date->time)]; + size = GetLocaleInfoW(lcid_en, month_id, NULL, 0); + month = SysAllocStringLen(NULL, size); + if(!month) { + SysFreeString(week); + return E_OUTOFMEMORY; + } + GetLocaleInfoW(lcid_en, month_id, month, size); + len += size-1; + + year = year_from_time(date->time)/10; + while(year) { + year /= 10; + len++; + } + + year = year_from_time(date->time); + if(year<0) { + formatAD = FALSE; + year = -year+1; + len += 5; + } + + day = date_from_time(date->time)/10; + while(day) { + day /= 10; + len++; + } + day = date_from_time(date->time); + + date_str = SysAllocStringLen(NULL, len); + if(!date_str) { + SysFreeString(week); + SysFreeString(month); + return E_OUTOFMEMORY; + } + sprintfW(date_str, 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)); + + SysFreeString(week); + SysFreeString(month); + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = date_str; + } + return S_OK; } /* ECMA-262 3rd Edition 15.9.5.3 */

1 0