winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
July
June
May
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
August 2012
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
541 discussions
Start a n
N
ew thread
Vincent Povirk : windowscodecs: Implement BitmapImpl_SetPalette and CopyPalette.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: 3e36f1e4b5d1454fd9e5ae058ec95b34e7dd6496 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3e36f1e4b5d1454fd9e5ae058…
Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 14 14:01:11 2012 -0500 windowscodecs: Implement BitmapImpl_SetPalette and CopyPalette. --- dlls/windowscodecs/bitmap.c | 39 +++++++++++++++++++++++++++++++++--- dlls/windowscodecs/tests/bitmap.c | 8 +++--- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c index 5014488..1f8d87d 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct BitmapImpl { IWICBitmap IWICBitmap_iface; LONG ref; + IWICPalette *palette; + int palette_set; } BitmapImpl; static inline BitmapImpl *impl_from_IWICBitmap(IWICBitmap *iface) @@ -86,6 +88,7 @@ static ULONG WINAPI BitmapImpl_Release(IWICBitmap *iface) if (ref == 0) { + if (This->palette) IWICPalette_Release(This->palette); HeapFree(GetProcessHeap(), 0, This); } @@ -119,9 +122,13 @@ static HRESULT WINAPI BitmapImpl_GetResolution(IWICBitmap *iface, static HRESULT WINAPI BitmapImpl_CopyPalette(IWICBitmap *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p)\n", iface, pIPalette); + BitmapImpl *This = impl_from_IWICBitmap(iface); + TRACE("(%p,%p)\n", iface, pIPalette); - return E_NOTIMPL; + if (!This->palette_set) + return WINCODEC_ERR_PALETTEUNAVAILABLE; + + return IWICPalette_InitializeFromPalette(pIPalette, This->palette); } static HRESULT WINAPI BitmapImpl_CopyPixels(IWICBitmap *iface, @@ -142,9 +149,31 @@ static HRESULT WINAPI BitmapImpl_Lock(IWICBitmap *iface, const WICRect *prcLock, static HRESULT WINAPI BitmapImpl_SetPalette(IWICBitmap *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p)\n", iface, pIPalette); + BitmapImpl *This = impl_from_IWICBitmap(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, pIPalette); + + if (!This->palette) + { + IWICPalette *new_palette; + hr = PaletteImpl_Create(&new_palette); + + if (FAILED(hr)) return hr; + + if (InterlockedCompareExchangePointer((void**)&This->palette, new_palette, NULL)) + { + /* someone beat us to it */ + IWICPalette_Release(new_palette); + } + } + + hr = IWICPalette_InitializeFromPalette(This->palette, pIPalette); + + if (SUCCEEDED(hr)) + This->palette_set = 1; + + return S_OK; } static HRESULT WINAPI BitmapImpl_SetResolution(IWICBitmap *iface, @@ -180,6 +209,8 @@ HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, This->IWICBitmap_iface.lpVtbl = &BitmapImpl_Vtbl; This->ref = 1; + This->palette = NULL; + This->palette_set = 0; *ppIBitmap = &This->IWICBitmap_iface; diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 748a1f9..a5577a1 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -62,23 +62,23 @@ static void test_createbitmap(void) /* Palette is unavailable until explicitly set */ hr = IWICBitmap_CopyPalette(bitmap, palette); - todo_wine ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "IWICBitmap_CopyPalette failed hr=%x\n", hr); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "IWICBitmap_CopyPalette failed hr=%x\n", hr); hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedGray256, FALSE); ok(hr == S_OK, "IWICPalette_InitializePredefined failed hr=%x\n", hr); hr = IWICBitmap_SetPalette(bitmap, palette); - todo_wine ok(hr == S_OK, "IWICBitmap_SetPalette failed hr=%x\n", hr); + ok(hr == S_OK, "IWICBitmap_SetPalette failed hr=%x\n", hr); hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedGray4, FALSE); ok(hr == S_OK, "IWICPalette_InitializePredefined failed hr=%x\n", hr); hr = IWICBitmap_CopyPalette(bitmap, palette); - todo_wine ok(hr == S_OK, "IWICBitmap_CopyPalette failed hr=%x\n", hr); + ok(hr == S_OK, "IWICBitmap_CopyPalette failed hr=%x\n", hr); hr = IWICPalette_GetType(palette, &palettetype); ok(hr == S_OK, "IWICPalette_GetType failed hr=%x\n", hr); - todo_wine ok(palettetype == WICBitmapPaletteTypeFixedGray256, + ok(palettetype == WICBitmapPaletteTypeFixedGray256, "expected WICBitmapPaletteTypeFixedGray256, got %x\n", palettetype); IWICPalette_Release(palette);
1
0
0
0
Vincent Povirk : windowscodecs: Add a stub IWICBitmap implementation.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: f9b67b6c183806e9a1bc20bc7a2c98cb221334ad URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f9b67b6c183806e9a1bc20bc7…
Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 14 13:39:15 2012 -0500 windowscodecs: Add a stub IWICBitmap implementation. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/bitmap.c | 187 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/imgfactory.c | 4 +- dlls/windowscodecs/tests/bitmap.c | 14 ++- dlls/windowscodecs/wincodecs_private.h | 3 + 5 files changed, 201 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index acbb0e9..b462249 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -6,6 +6,7 @@ EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL -DWIDL_C_ EXTRALIBS = @APPLICATIONSERVICESLIB@ C_SRCS = \ + bitmap.c \ bmpdecode.c \ bmpencode.c \ clsfactory.c \ diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c new file mode 100644 index 0000000..5014488 --- /dev/null +++ b/dlls/windowscodecs/bitmap.c @@ -0,0 +1,187 @@ +/* + * Copyright 2012 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 "objbase.h" +#include "wincodec.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +typedef struct BitmapImpl { + IWICBitmap IWICBitmap_iface; + LONG ref; +} BitmapImpl; + +static inline BitmapImpl *impl_from_IWICBitmap(IWICBitmap *iface) +{ + return CONTAINING_RECORD(iface, BitmapImpl, IWICBitmap_iface); +} + +static HRESULT WINAPI BitmapImpl_QueryInterface(IWICBitmap *iface, REFIID iid, + void **ppv) +{ + BitmapImpl *This = impl_from_IWICBitmap(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_IWICBitmap, iid)) + { + *ppv = &This->IWICBitmap_iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI BitmapImpl_AddRef(IWICBitmap *iface) +{ + BitmapImpl *This = impl_from_IWICBitmap(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI BitmapImpl_Release(IWICBitmap *iface) +{ + BitmapImpl *This = impl_from_IWICBitmap(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 BitmapImpl_GetSize(IWICBitmap *iface, + UINT *puiWidth, UINT *puiHeight) +{ + FIXME("(%p,%p,%p)\n", iface, puiWidth, puiHeight); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapImpl_GetPixelFormat(IWICBitmap *iface, + WICPixelFormatGUID *pPixelFormat) +{ + FIXME("(%p,%p)\n", iface, pPixelFormat); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapImpl_GetResolution(IWICBitmap *iface, + double *pDpiX, double *pDpiY) +{ + FIXME("(%p,%p,%p)\n", iface, pDpiX, pDpiY); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapImpl_CopyPalette(IWICBitmap *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p)\n", iface, pIPalette); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapImpl_CopyPixels(IWICBitmap *iface, + const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) +{ + FIXME("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapImpl_Lock(IWICBitmap *iface, const WICRect *prcLock, + DWORD flags, IWICBitmapLock **ppILock) +{ + FIXME("(%p,%p,%x,%p)\n", iface, prcLock, flags, ppILock); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapImpl_SetPalette(IWICBitmap *iface, IWICPalette *pIPalette) +{ + FIXME("(%p,%p)\n", iface, pIPalette); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapImpl_SetResolution(IWICBitmap *iface, + double dpiX, double dpiY) +{ + FIXME("(%p,%f,%f)\n", iface, dpiX, dpiY); + + return E_NOTIMPL; +} + +static const IWICBitmapVtbl BitmapImpl_Vtbl = { + BitmapImpl_QueryInterface, + BitmapImpl_AddRef, + BitmapImpl_Release, + BitmapImpl_GetSize, + BitmapImpl_GetPixelFormat, + BitmapImpl_GetResolution, + BitmapImpl_CopyPalette, + BitmapImpl_CopyPixels, + BitmapImpl_Lock, + BitmapImpl_SetPalette, + BitmapImpl_SetResolution +}; + +HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, + REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, + IWICBitmap **ppIBitmap) +{ + BitmapImpl *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapImpl)); + if (!This) return E_OUTOFMEMORY; + + This->IWICBitmap_iface.lpVtbl = &BitmapImpl_Vtbl; + This->ref = 1; + + *ppIBitmap = &This->IWICBitmap_iface; + + return S_OK; +} diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index ea6df28..a739662 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -457,9 +457,9 @@ static HRESULT WINAPI ComponentFactory_CreateBitmap(IWICComponentFactory *iface, UINT uiWidth, UINT uiHeight, REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, IWICBitmap **ppIBitmap) { - FIXME("(%p,%u,%u,%s,%u,%p): stub\n", iface, uiWidth, uiHeight, + TRACE("(%p,%u,%u,%s,%u,%p)\n", iface, uiWidth, uiHeight, debugstr_guid(pixelFormat), option, ppIBitmap); - return E_NOTIMPL; + return BitmapImpl_Create(uiWidth, uiHeight, pixelFormat, option, ppIBitmap); } static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index ebcefb9..748a1f9 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -52,7 +52,7 @@ static void test_createbitmap(void) hr = IWICImagingFactory_CreateBitmap(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, WICBitmapCacheOnLoad, &bitmap); - todo_wine ok(hr == S_OK, "IWICImagingFactory_CreateBitmap failed hr=%x\n", hr); + ok(hr == S_OK, "IWICImagingFactory_CreateBitmap failed hr=%x\n", hr); if (FAILED(hr)) return; @@ -62,34 +62,35 @@ static void test_createbitmap(void) /* Palette is unavailable until explicitly set */ hr = IWICBitmap_CopyPalette(bitmap, palette); - ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "IWICBitmap_CopyPalette failed hr=%x\n", hr); + todo_wine ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "IWICBitmap_CopyPalette failed hr=%x\n", hr); hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedGray256, FALSE); ok(hr == S_OK, "IWICPalette_InitializePredefined failed hr=%x\n", hr); hr = IWICBitmap_SetPalette(bitmap, palette); - ok(hr == S_OK, "IWICBitmap_SetPalette failed hr=%x\n", hr); + todo_wine ok(hr == S_OK, "IWICBitmap_SetPalette failed hr=%x\n", hr); hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedGray4, FALSE); ok(hr == S_OK, "IWICPalette_InitializePredefined failed hr=%x\n", hr); hr = IWICBitmap_CopyPalette(bitmap, palette); - ok(hr == S_OK, "IWICBitmap_CopyPalette failed hr=%x\n", hr); + todo_wine ok(hr == S_OK, "IWICBitmap_CopyPalette failed hr=%x\n", hr); hr = IWICPalette_GetType(palette, &palettetype); ok(hr == S_OK, "IWICPalette_GetType failed hr=%x\n", hr); - ok(palettetype == WICBitmapPaletteTypeFixedGray256, + todo_wine ok(palettetype == WICBitmapPaletteTypeFixedGray256, "expected WICBitmapPaletteTypeFixedGray256, got %x\n", palettetype); IWICPalette_Release(palette); /* pixel data is initially zeroed */ hr = IWICBitmap_CopyPixels(bitmap, NULL, 9, 27, returned_data); - ok(hr == S_OK, "IWICBitmap_CopyPixels failed hr=%x\n", hr); + todo_wine ok(hr == S_OK, "IWICBitmap_CopyPixels failed hr=%x\n", hr); for (i=0; i<27; i++) ok(returned_data[i] == 0, "returned_data[%i] == %i\n", i, returned_data[i]); +todo_wine { /* Invalid lock rects */ rc.X = rc.Y = 0; rc.Width = 4; @@ -257,6 +258,7 @@ static void test_createbitmap(void) ok(hr == S_OK, "IWICBitmap_GetSize failed hr=%x\n", hr); ok(width == 3, "got %d, expected 3\n", width); ok(height == 3, "got %d, expected 3\n", height); +} IWICBitmap_Release(bitmap); } diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index a3a7548..0bee818 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -44,6 +44,9 @@ extern HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void* extern HRESULT TgaDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, + REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, + IWICBitmap **ppIBitmap) DECLSPEC_HIDDEN; extern HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) DECLSPEC_HIDDEN; extern HRESULT FlipRotator_Create(IWICBitmapFlipRotator **fliprotator) DECLSPEC_HIDDEN; extern HRESULT PaletteImpl_Create(IWICPalette **palette) DECLSPEC_HIDDEN;
1
0
0
0
Vincent Povirk : windowscodecs: Add tests for IWICBitmap.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: c2001c2b53b75045c1645ed1b23e7c4d711a7acd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c2001c2b53b75045c1645ed1b…
Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 14 11:28:32 2012 -0500 windowscodecs: Add tests for IWICBitmap. --- dlls/windowscodecs/tests/Makefile.in | 1 + dlls/windowscodecs/tests/bitmap.c | 279 ++++++++++++++++++++++++++++++++++ include/wincodec.idl | 7 + 3 files changed, 287 insertions(+), 0 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2001c2b53b75045c1645…
1
0
0
0
Piotr Caban : msvcp90: Added missing -ret64 option.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: c5f2e6623dde9e536b9dba3552312975b624e009 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c5f2e6623dde9e536b9dba355…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:27:41 2012 +0200 msvcp90: Added missing -ret64 option. --- dlls/msvcp90/msvcp90.spec | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 3b41cbd..680830f 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3240,8 +3240,8 @@ @ cdecl ?denorm_min@?$numeric_limits@M@std@@SAMXZ() std_numeric_limits_float_denorm_min @ cdecl ?denorm_min@?$numeric_limits@N@std@@SANXZ() std_numeric_limits_double_denorm_min @ cdecl ?denorm_min@?$numeric_limits@O@std@@SAOXZ() std_numeric_limits_long_double_denorm_min -@ cdecl ?denorm_min@?$numeric_limits@_J@std@@SA_JXZ() std_numeric_limits_int64_denorm_min -@ cdecl ?denorm_min@?$numeric_limits@_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_denorm_min +@ cdecl -ret64 ?denorm_min@?$numeric_limits@_J@std@@SA_JXZ() std_numeric_limits_int64_denorm_min +@ cdecl -ret64 ?denorm_min@?$numeric_limits@_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_denorm_min @ cdecl ?denorm_min@?$numeric_limits@_N@std@@SA_NXZ() std_numeric_limits_bool_denorm_min @ cdecl ?denorm_min@?$numeric_limits@_W@std@@SA_WXZ() std_numeric_limits_wchar_t_denorm_min @ thiscall -arch=win32 ?destroy@?$allocator@D@std@@QAEXPAD@Z(ptr ptr) MSVCP_allocator_char_destroy @@ -3754,8 +3754,8 @@ @ cdecl ?epsilon@?$numeric_limits@M@std@@SAMXZ() std_numeric_limits_float_epsilon @ cdecl ?epsilon@?$numeric_limits@N@std@@SANXZ() std_numeric_limits_double_epsilon @ cdecl ?epsilon@?$numeric_limits@O@std@@SAOXZ() std_numeric_limits_long_double_epsilon -@ cdecl ?epsilon@?$numeric_limits@_J@std@@SA_JXZ() std_numeric_limits_int64_epsilon -@ cdecl ?epsilon@?$numeric_limits@_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_epsilon +@ cdecl -ret64 ?epsilon@?$numeric_limits@_J@std@@SA_JXZ() std_numeric_limits_int64_epsilon +@ cdecl -ret64 ?epsilon@?$numeric_limits@_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_epsilon @ cdecl ?epsilon@?$numeric_limits@_N@std@@SA_NXZ() std_numeric_limits_bool_epsilon @ cdecl ?epsilon@?$numeric_limits@_W@std@@SA_WXZ() std_numeric_limits_wchar_t_epsilon @ cdecl -arch=win32 ?eq@?$char_traits@D@std@@SA_NABD0@Z(ptr ptr) MSVCP_char_traits_char_eq @@ -4294,8 +4294,8 @@ @ cdecl ?infinity@?$numeric_limits@M@std@@SAMXZ() std_numeric_limits_float_infinity @ cdecl ?infinity@?$numeric_limits@N@std@@SANXZ() std_numeric_limits_double_infinity @ cdecl ?infinity@?$numeric_limits@O@std@@SAOXZ() std_numeric_limits_long_double_infinity -@ cdecl ?infinity@?$numeric_limits@_J@std@@SA_JXZ() std_numeric_limits_int64_infinity -@ cdecl ?infinity@?$numeric_limits@_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_infinity +@ cdecl -ret64 ?infinity@?$numeric_limits@_J@std@@SA_JXZ() std_numeric_limits_int64_infinity +@ cdecl -ret64 ?infinity@?$numeric_limits@_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_infinity @ cdecl ?infinity@?$numeric_limits@_N@std@@SA_NXZ() std_numeric_limits_bool_infinity @ cdecl ?infinity@?$numeric_limits@_W@std@@SA_WXZ() std_numeric_limits_wchar_t_infinity @ thiscall -arch=win32 ?init@?$basic_ios@DU?$char_traits@D@std@@@std@@IAEXPAV?$basic_streambuf@DU?$char_traits@D@std@@@2@_N@Z(ptr ptr long) basic_ios_char_init @@ -4495,8 +4495,8 @@ @ cdecl ?max@?$numeric_limits@M@std@@SAMXZ() std_numeric_limits_float_max @ cdecl ?max@?$numeric_limits@N@std@@SANXZ() std_numeric_limits_double_max @ cdecl ?max@?$numeric_limits@O@std@@SAOXZ() std_numeric_limits_long_double_max -@ cdecl ?max@?$numeric_limits@_J@std@@SA_JXZ() std_numeric_limits_int64_max -@ cdecl ?max@?$numeric_limits@_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_max +@ cdecl -ret64 ?max@?$numeric_limits@_J@std@@SA_JXZ() std_numeric_limits_int64_max +@ cdecl -ret64 ?max@?$numeric_limits@_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_max @ cdecl ?max@?$numeric_limits@_N@std@@SA_NXZ() std_numeric_limits_bool_max @ cdecl ?max@?$numeric_limits@_W@std@@SA_WXZ() std_numeric_limits_wchar_t_max @ extern ?max_exponent10@?$numeric_limits@M@std@@2HB std_numeric_limits_float_max_exponent10 @@ -4533,8 +4533,8 @@ @ cdecl ?min@?$numeric_limits@M@std@@SAMXZ() std_numeric_limits_float_min @ cdecl ?min@?$numeric_limits@N@std@@SANXZ() std_numeric_limits_double_min @ cdecl ?min@?$numeric_limits@O@std@@SAOXZ() std_numeric_limits_long_double_min -@ cdecl ?min@?$numeric_limits@_J@std@@SA_JXZ() std_numeric_limits_int64_min -@ cdecl ?min@?$numeric_limits@_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_min +@ cdecl -ret64 ?min@?$numeric_limits@_J@std@@SA_JXZ() std_numeric_limits_int64_min +@ cdecl -ret64 ?min@?$numeric_limits@_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_min @ cdecl ?min@?$numeric_limits@_N@std@@SA_NXZ() std_numeric_limits_bool_min @ cdecl ?min@?$numeric_limits@_W@std@@SA_WXZ() std_numeric_limits_wchar_t_min @ extern ?min_exponent10@?$numeric_limits@M@std@@2HB std_numeric_limits_float_min_exponent10 @@ -4994,8 +4994,8 @@ @ cdecl ?quiet_NaN@?$numeric_limits@M@std@@SAMXZ() std_numeric_limits_float_quiet_NaN @ cdecl ?quiet_NaN@?$numeric_limits@N@std@@SANXZ() std_numeric_limits_double_quiet_NaN @ cdecl ?quiet_NaN@?$numeric_limits@O@std@@SAOXZ() std_numeric_limits_long_double_quiet_NaN -@ cdecl ?quiet_NaN@?$numeric_limits@_J@std@@SA_JXZ() std_numeric_limits_int64_quiet_NaN -@ cdecl ?quiet_NaN@?$numeric_limits@_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_quiet_NaN +@ cdecl -ret64 ?quiet_NaN@?$numeric_limits@_J@std@@SA_JXZ() std_numeric_limits_int64_quiet_NaN +@ cdecl -ret64 ?quiet_NaN@?$numeric_limits@_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_quiet_NaN @ cdecl ?quiet_NaN@?$numeric_limits@_N@std@@SA_NXZ() std_numeric_limits_bool_quiet_NaN @ cdecl ?quiet_NaN@?$numeric_limits@_W@std@@SA_WXZ() std_numeric_limits_wchar_t_quiet_NaN @ extern ?radix@_Num_base@std@@2HB std_Num_base_radix @@ -5222,8 +5222,8 @@ @ cdecl ?round_error@?$numeric_limits@M@std@@SAMXZ() std_numeric_limits_float_round_error @ cdecl ?round_error@?$numeric_limits@N@std@@SANXZ() std_numeric_limits_double_round_error @ cdecl ?round_error@?$numeric_limits@O@std@@SAOXZ() std_numeric_limits_long_double_round_error -@ cdecl ?round_error@?$numeric_limits@_J@std@@SA_JXZ() std_numeric_limits_int64_round_error -@ cdecl ?round_error@?$numeric_limits@_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_round_error +@ cdecl -ret64 ?round_error@?$numeric_limits@_J@std@@SA_JXZ() std_numeric_limits_int64_round_error +@ cdecl -ret64 ?round_error@?$numeric_limits@_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_round_error @ cdecl ?round_error@?$numeric_limits@_N@std@@SA_NXZ() std_numeric_limits_bool_round_error @ cdecl ?round_error@?$numeric_limits@_W@std@@SA_WXZ() std_numeric_limits_wchar_t_round_error @ extern ?round_style@_Num_base@std@@2W4float_round_style@2@B std_Num_base_round_style @@ -5400,8 +5400,8 @@ @ cdecl ?signaling_NaN@?$numeric_limits@M@std@@SAMXZ() std_numeric_limits_float_signaling_NaN @ cdecl ?signaling_NaN@?$numeric_limits@N@std@@SANXZ() std_numeric_limits_double_signaling_NaN @ cdecl ?signaling_NaN@?$numeric_limits@O@std@@SAOXZ() std_numeric_limits_long_double_signaling_NaN -@ cdecl ?signaling_NaN@?$numeric_limits@_J@std@@SA_JXZ() std_numeric_limits_int64_signaling_NaN -@ cdecl ?signaling_NaN@?$numeric_limits@_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_signaling_NaN +@ cdecl -ret64 ?signaling_NaN@?$numeric_limits@_J@std@@SA_JXZ() std_numeric_limits_int64_signaling_NaN +@ cdecl -ret64 ?signaling_NaN@?$numeric_limits@_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_signaling_NaN @ cdecl ?signaling_NaN@?$numeric_limits@_N@std@@SA_NXZ() std_numeric_limits_bool_signaling_NaN @ cdecl ?signaling_NaN@?$numeric_limits@_W@std@@SA_WXZ() std_numeric_limits_wchar_t_signaling_NaN @ cdecl ?sin@?$_Ctraits@M@std@@SAMM@Z(float) std_Ctraits_float_sin
1
0
0
0
Piotr Caban : msvcp90: Added strstreambuf seekpos and seekoff implementation.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: 0ef93eb0e5defae95b0fe9fddb2acdf17e190dde URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0ef93eb0e5defae95b0fe9fdd…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:27:28 2012 +0200 msvcp90: Added strstreambuf seekpos and seekoff implementation. --- dlls/msvcp90/ios.c | 59 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/msvcp90/msvcp90.h | 6 ++-- 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 78dbd67..6491278 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -12714,8 +12714,53 @@ int __thiscall strstreambuf_pbackfail(strstreambuf *this, int c) DEFINE_THISCALL_WRAPPER(strstreambuf_seekoff, 20) fpos_int* __thiscall strstreambuf_seekoff(strstreambuf *this, fpos_int *ret, streamoff off, int way, int mode) { - FIXME("(%p %p %ld %d %d) stub\n", this, ret, off, way, mode); - return NULL; + char *eback = basic_streambuf_char_eback(&this->base); + char *pptr = basic_streambuf_char_pptr(&this->base); + char *gptr = basic_streambuf_char_gptr(&this->base); + + TRACE("(%p %p %ld %d %d)\n", this, ret, off, way, mode); + + ret->off = 0; + ret->state = 0; + + if(pptr > this->seekhigh) + this->seekhigh = pptr; + + if((mode & OPENMODE_in) && gptr) { + if(way==SEEKDIR_cur && !(mode & OPENMODE_out)) + off += gptr-eback; + else if(way == SEEKDIR_end) + off += this->seekhigh-eback; + else if(way != SEEKDIR_beg) + off = -1; + + if(off<0 || off>this->seekhigh-eback) { + off = -1; + }else { + basic_streambuf_char_gbump(&this->base, eback-gptr+off); + if((mode & OPENMODE_out) && pptr) { + basic_streambuf_char_setp_next(&this->base, eback, + gptr, basic_streambuf_char_epptr(&this->base)); + } + } + }else if((mode & OPENMODE_out) && pptr) { + if(way == SEEKDIR_cur) + off += pptr-eback; + else if(way == SEEKDIR_end) + off += this->seekhigh-eback; + else if(way != SEEKDIR_beg) + off = -1; + + if(off<0 || off>this->seekhigh-eback) + off = -1; + else + basic_streambuf_char_pbump(&this->base, eback-pptr+off); + }else { + off = -1; + } + + ret->pos = off; + return ret; } /* ?seekpos@strstreambuf@std@@MAE?AV?$fpos@H@2@V32@H@Z */ @@ -12723,8 +12768,14 @@ fpos_int* __thiscall strstreambuf_seekoff(strstreambuf *this, fpos_int *ret, str DEFINE_THISCALL_WRAPPER(strstreambuf_seekpos, 36) fpos_int* __thiscall strstreambuf_seekpos(strstreambuf *this, fpos_int *ret, fpos_int pos, int mode) { - FIXME("(%p %p %s %d) stub\n", this, ret, debugstr_fpos_int(&pos), mode); - return NULL; + TRACE("(%p %p %s %d)\n", this, ret, debugstr_fpos_int(&pos), mode); + + if(pos.off==0 && pos.pos==-1 && pos.state==0) { + *ret = pos; + return ret; + } + + return strstreambuf_seekoff(this, ret, pos.off, SEEKDIR_beg, mode); } /* ?underflow@strstreambuf@std@@MAEHXZ */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 9343d16..b91faac 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -246,9 +246,9 @@ typedef enum { } IOSB_openmode; typedef enum { - SEEKDIR_beg = 0x1, - SEEKDIR_cur = 0x2, - SEEKDIR_end = 0x3, + SEEKDIR_beg = 0x0, + SEEKDIR_cur = 0x1, + SEEKDIR_end = 0x2, SEEKDIR_mask = 0x3 } IOSB_seekdir;
1
0
0
0
Piotr Caban : msvcp90: Reset width value in basic_istream class on error.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: e5d7d65791cb6e8b45e238782b12d897f7317ea5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e5d7d65791cb6e8b45e238782…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:27:18 2012 +0200 msvcp90: Reset width value in basic_istream class on error. --- dlls/msvcp90/ios.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 43fb46f..78dbd67 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8123,11 +8123,10 @@ basic_istream_char* __cdecl basic_istream_char_read_bstr( state = IOSTATE_goodbit; MSVCP_basic_string_char_append_ch(str, c); } - - ios_base_width_set(&base->base, 0); } basic_istream_char_sentry_destroy(istream); + ios_base_width_set(&base->base, 0); basic_ios_char_setstate(base, state | (c==EOF ? IOSTATE_eofbit : IOSTATE_goodbit)); return istream; } @@ -8156,12 +8155,11 @@ basic_istream_char* __cdecl basic_istream_char_read_str(basic_istream_char *istr state = IOSTATE_goodbit; *str++ = c; } - - *str = 0; - ios_base_width_set(&base->base, 0); } basic_istream_char_sentry_destroy(istream); + *str = 0; + ios_base_width_set(&base->base, 0); basic_ios_char_setstate(base, state | (c==EOF ? IOSTATE_eofbit : IOSTATE_goodbit)); return istream; } @@ -9550,11 +9548,10 @@ static basic_istream_wchar* basic_istream_read_bstr(basic_istream_wchar *istream state = IOSTATE_goodbit; MSVCP_basic_string_wchar_append_ch(str, c); } - - ios_base_width_set(&base->base, 0); } basic_istream_wchar_sentry_destroy(istream); + ios_base_width_set(&base->base, 0); basic_ios_wchar_setstate(base, state | (c==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit)); return istream; } @@ -9594,12 +9591,11 @@ basic_istream_wchar* basic_istream_read_str(basic_istream_wchar *istream, wchar_ state = IOSTATE_goodbit; *str++ = c; } - - *str = 0; - ios_base_width_set(&base->base, 0); } basic_istream_wchar_sentry_destroy(istream); + *str = 0; + ios_base_width_set(&base->base, 0); basic_ios_wchar_setstate(base, state | (c==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit)); return istream; }
1
0
0
0
Piotr Caban : msvcp90: Fixed basic_streambuf:: sputn functions behaviour when there's no place in buffer.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: 76821340a4ece7a4f140b96f7d2e62655634eaab URL:
http://source.winehq.org/git/wine.git/?a=commit;h=76821340a4ece7a4f140b96f7…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:27:09 2012 +0200 msvcp90: Fixed basic_streambuf::sputn functions behaviour when there's no place in buffer. --- dlls/msvcp90/ios.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a053103..43fb46f 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -1031,7 +1031,7 @@ streamsize __thiscall basic_streambuf_char__Xsgetn_s(basic_streambuf_char *this, if(chunk > count-copied) chunk = count-copied; - if(chunk) { + if(chunk > 0) { memcpy_s(ptr+copied, size, *this->prpos, chunk); *this->prpos += chunk; *this->prsize -= chunk; @@ -1450,7 +1450,7 @@ streamsize __thiscall basic_streambuf_char_xsputn(basic_streambuf_char *this, co if(chunk > count-copied) chunk = count-copied; - if(chunk) { + if(chunk > 0) { memcpy(*this->pwpos, ptr+copied, chunk); *this->pwpos += chunk; *this->pwsize -= chunk; @@ -1776,7 +1776,7 @@ streamsize __thiscall basic_streambuf_wchar__Xsgetn_s(basic_streambuf_wchar *thi if(chunk > count-copied) chunk = count-copied; - if(chunk) { + if(chunk > 0) { memcpy_s(ptr+copied, size, *this->prpos, chunk); *this->prpos += chunk; *this->prsize -= chunk; @@ -2269,7 +2269,7 @@ streamsize __thiscall basic_streambuf_wchar_xsputn(basic_streambuf_wchar *this, if(chunk > count-copied) chunk = count-copied; - if(chunk) { + if(chunk > 0) { memcpy(*this->pwpos, ptr+copied, chunk); *this->pwpos += chunk; *this->pwsize -= chunk;
1
0
0
0
Piotr Caban : msvcp90: Added partial strstreambuf implementation.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: f143f3e6bc74eb491a38530fd35ebc356fdf633b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f143f3e6bc74eb491a38530fd…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:26:58 2012 +0200 msvcp90: Added partial strstreambuf implementation. --- dlls/msvcp90/ios.c | 357 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 82 +++++----- 2 files changed, 398 insertions(+), 41 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=f143f3e6bc74eb491a385…
1
0
0
0
Piotr Caban : msvcp90: Use streamoff in std::_BADOFF definition.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: 1202e8bf87ea4d1058b425a26c630b085c9d160a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1202e8bf87ea4d1058b425a26…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:26:48 2012 +0200 msvcp90: Use streamoff in std::_BADOFF definition. --- dlls/msvcp90/msvcp90_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index 18a2514..9981e95 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -104,11 +104,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) /* ?_BADOFF@std@@3JB -> long const std::_BADOFF */ /* ?_BADOFF@std@@3_JB -> __int64 const std::_BADOFF */ -const INT_PTR std_BADOFF = -1; +const streamoff std_BADOFF = -1; /* ?_BADOFF_func@std@@YAABJXZ -> long const & __cdecl std::_BADOFF_func(void) */ /* ?_BADOFF_func@std@@YAAEB_JXZ -> __int64 const & __ptr64 __cdecl std::_BADOFF_func(void) */ -const INT_PTR * __cdecl std_BADOFF_func(void) +const streamoff * __cdecl std_BADOFF_func(void) { return &std_BADOFF; }
1
0
0
0
Piotr Caban : msvcp90: Added basic_stringstream<short> implementation.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: 625940a5607ba4c8fbe4706af010c246ee6a4062 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=625940a5607ba4c8fbe4706af…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:26:37 2012 +0200 msvcp90: Added basic_stringstream<short> implementation. --- dlls/msvcp90/ios.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 38 +++++++++++++------------- 2 files changed, 81 insertions(+), 19 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=625940a5607ba4c8fbe47…
1
0
0
0
← Newer
1
...
36
37
38
39
40
41
42
...
55
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
Results per page:
10
25
50
100
200