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
July 2009
----- 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
4 participants
1067 discussions
Start a n
N
ew thread
Vincent Povirk : windowscodecs: Implement HasAlpha for palettes.
by Alexandre Julliard
03 Jul '09
03 Jul '09
Module: wine Branch: master Commit: 3cf9d94999cc9012cf46f27299a1b5a0968c34b1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3cf9d94999cc9012cf46f2729…
Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 2 17:47:19 2009 -0500 windowscodecs: Implement HasAlpha for palettes. --- dlls/windowscodecs/palette.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index ccf1176..842d3b5 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -225,8 +225,23 @@ static HRESULT WINAPI PaletteImpl_IsGrayscale(IWICPalette *iface, BOOL *pfIsGray static HRESULT WINAPI PaletteImpl_HasAlpha(IWICPalette *iface, BOOL *pfHasAlpha) { - FIXME("(%p,%p): stub\n", iface, pfHasAlpha); - return E_NOTIMPL; + PaletteImpl *This = (PaletteImpl*)iface; + int i; + + TRACE("(%p,%p)\n", iface, pfHasAlpha); + + if (!pfHasAlpha) return E_INVALIDARG; + + *pfHasAlpha = FALSE; + + for (i=0; i<This->count; i++) + if ((This->colors[i]&0xff000000) != 0xff000000) + { + *pfHasAlpha = TRUE; + break; + } + + return S_OK; } static const IWICPaletteVtbl PaletteImpl_Vtbl = {
1
0
0
0
Vincent Povirk : windowscodecs: Implement IsBlackWhite and IsGrayscale for palettes.
by Alexandre Julliard
03 Jul '09
03 Jul '09
Module: wine Branch: master Commit: cf8a26aff6b9f73f3184048b4b8beaafb8ec5f2d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cf8a26aff6b9f73f3184048b4…
Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 2 17:44:31 2009 -0500 windowscodecs: Implement IsBlackWhite and IsGrayscale for palettes. --- dlls/windowscodecs/palette.c | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index a3d67aa..ccf1176 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -186,14 +186,41 @@ static HRESULT WINAPI PaletteImpl_GetColors(IWICPalette *iface, UINT colorCount, static HRESULT WINAPI PaletteImpl_IsBlackWhite(IWICPalette *iface, BOOL *pfIsBlackWhite) { - FIXME("(%p,%p): stub\n", iface, pfIsBlackWhite); - return E_NOTIMPL; + PaletteImpl *This = (PaletteImpl*)iface; + + TRACE("(%p,%p)\n", iface, pfIsBlackWhite); + + if (!pfIsBlackWhite) return E_INVALIDARG; + + if (This->type == WICBitmapPaletteTypeFixedBW) + *pfIsBlackWhite = TRUE; + else + *pfIsBlackWhite = FALSE; + + return S_OK; } static HRESULT WINAPI PaletteImpl_IsGrayscale(IWICPalette *iface, BOOL *pfIsGrayscale) { - FIXME("(%p,%p): stub\n", iface, pfIsGrayscale); - return E_NOTIMPL; + PaletteImpl *This = (PaletteImpl*)iface; + + TRACE("(%p,%p)\n", iface, pfIsGrayscale); + + if (!pfIsGrayscale) return E_INVALIDARG; + + switch(This->type) + { + case WICBitmapPaletteTypeFixedBW: + case WICBitmapPaletteTypeFixedGray4: + case WICBitmapPaletteTypeFixedGray16: + case WICBitmapPaletteTypeFixedGray256: + *pfIsGrayscale = TRUE; + break; + default: + *pfIsGrayscale = FALSE; + } + + return S_OK; } static HRESULT WINAPI PaletteImpl_HasAlpha(IWICPalette *iface, BOOL *pfHasAlpha)
1
0
0
0
Vincent Povirk : windowscodecs: Implement GetColorCount and GetType for palettes.
by Alexandre Julliard
03 Jul '09
03 Jul '09
Module: wine Branch: master Commit: 9a6400bc32a3b589df7113b63f96155209f733ea URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9a6400bc32a3b589df7113b63…
Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 2 17:39:40 2009 -0500 windowscodecs: Implement GetColorCount and GetType for palettes. --- dlls/windowscodecs/palette.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index cacfd70..a3d67aa 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -142,14 +142,28 @@ static HRESULT WINAPI PaletteImpl_InitializeFromPalette(IWICPalette *iface, static HRESULT WINAPI PaletteImpl_GetType(IWICPalette *iface, WICBitmapPaletteType *pePaletteType) { - FIXME("(%p,%p): stub\n", iface, pePaletteType); - return E_NOTIMPL; + PaletteImpl *This = (PaletteImpl*)iface; + + TRACE("(%p,%p)\n", iface, pePaletteType); + + if (!pePaletteType) return E_INVALIDARG; + + *pePaletteType = This->type; + + return S_OK; } static HRESULT WINAPI PaletteImpl_GetColorCount(IWICPalette *iface, UINT *pcCount) { - FIXME("(%p,%p): stub\n", iface, pcCount); - return E_NOTIMPL; + PaletteImpl *This = (PaletteImpl*)iface; + + TRACE("(%p,%p)\n", iface, pcCount); + + if (!pcCount) return E_INVALIDARG; + + *pcCount = This->count; + + return S_OK; } static HRESULT WINAPI PaletteImpl_GetColors(IWICPalette *iface, UINT colorCount,
1
0
0
0
Vincent Povirk : windowscodecs: Implement InitializeCustom and GetColors for palettes.
by Alexandre Julliard
03 Jul '09
03 Jul '09
Module: wine Branch: master Commit: 9f9b71c3ee0a5becef3510d3a6b2a4d11ce6eb73 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9f9b71c3ee0a5becef3510d3a…
Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 2 17:37:06 2009 -0500 windowscodecs: Implement InitializeCustom and GetColors for palettes. --- dlls/windowscodecs/palette.c | 49 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 42aa7f0..cacfd70 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -37,6 +37,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct { const IWICPaletteVtbl *lpIWICPaletteVtbl; LONG ref; + UINT count; + WICColor *colors; + WICBitmapPaletteType type; } PaletteImpl; static HRESULT WINAPI PaletteImpl_QueryInterface(IWICPalette *iface, REFIID iid, @@ -79,7 +82,10 @@ static ULONG WINAPI PaletteImpl_Release(IWICPalette *iface) TRACE("(%p) refcount=%u\n", iface, ref); if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This->colors); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -94,8 +100,29 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, static HRESULT WINAPI PaletteImpl_InitializeCustom(IWICPalette *iface, WICColor *pColors, UINT colorCount) { - FIXME("(%p,%p,%u): stub\n", iface, pColors, colorCount); - return E_NOTIMPL; + PaletteImpl *This = (PaletteImpl*)iface; + WICColor *new_colors; + + TRACE("(%p,%p,%u)\n", iface, pColors, colorCount); + + if (colorCount == 0) + { + new_colors = NULL; + } + else + { + if (!pColors) return E_INVALIDARG; + new_colors = HeapAlloc(GetProcessHeap(), 0, sizeof(WICColor) * colorCount); + if (!new_colors) return E_OUTOFMEMORY; + memcpy(new_colors, pColors, sizeof(WICColor) * colorCount); + } + + HeapFree(GetProcessHeap(), 0, This->colors); + This->colors = new_colors; + This->count = colorCount; + This->type = WICBitmapPaletteTypeCustom; + + return S_OK; } static HRESULT WINAPI PaletteImpl_InitializeFromBitmap(IWICPalette *iface, @@ -128,8 +155,19 @@ static HRESULT WINAPI PaletteImpl_GetColorCount(IWICPalette *iface, UINT *pcCoun static HRESULT WINAPI PaletteImpl_GetColors(IWICPalette *iface, UINT colorCount, WICColor *pColors, UINT *pcActualColors) { - FIXME("(%p,%i,%p,%p): stub\n", iface, colorCount, pColors, pcActualColors); - return E_NOTIMPL; + PaletteImpl *This = (PaletteImpl*)iface; + + TRACE("(%p,%i,%p,%p)\n", iface, colorCount, pColors, pcActualColors); + + if (!pColors || !pcActualColors) return E_INVALIDARG; + + if (This->count < colorCount) colorCount = This->count; + + memcpy(pColors, This->colors, sizeof(WICColor) * colorCount); + + *pcActualColors = colorCount; + + return S_OK; } static HRESULT WINAPI PaletteImpl_IsBlackWhite(IWICPalette *iface, BOOL *pfIsBlackWhite) @@ -175,6 +213,9 @@ HRESULT PaletteImpl_Create(IWICPalette **palette) This->lpIWICPaletteVtbl = &PaletteImpl_Vtbl; This->ref = 1; + This->count = 0; + This->colors = NULL; + This->type = WICBitmapPaletteTypeCustom; *palette = (IWICPalette*)This;
1
0
0
0
Vincent Povirk : windowscodecs: Add stub implementation of IWICPalette.
by Alexandre Julliard
03 Jul '09
03 Jul '09
Module: wine Branch: master Commit: 4b9071b37ba272180de501d14db0cdd88a158b73 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4b9071b37ba272180de501d14…
Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 2 17:09:47 2009 -0500 windowscodecs: Add stub implementation of IWICPalette. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/imgfactory.c | 4 +- dlls/windowscodecs/palette.c | 182 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 2 + 4 files changed, 187 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 939a2bf..4de3b62 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ clsfactory.c \ imgfactory.c \ main.c \ + palette.c \ regsvr.c @MAKE_DLL_RULES@ diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 2edcdcd..b727d16 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -140,8 +140,8 @@ static HRESULT WINAPI ImagingFactory_CreateEncoder(IWICImagingFactory *iface, static HRESULT WINAPI ImagingFactory_CreatePalette(IWICImagingFactory *iface, IWICPalette **ppIPalette) { - FIXME("(%p,%p): stub\n", iface, ppIPalette); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIPalette); + return PaletteImpl_Create(ppIPalette); } static HRESULT WINAPI ImagingFactory_CreateFormatConverter(IWICImagingFactory *iface, diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c new file mode 100644 index 0000000..42aa7f0 --- /dev/null +++ b/dlls/windowscodecs/palette.c @@ -0,0 +1,182 @@ +/* + * 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 IWICPaletteVtbl *lpIWICPaletteVtbl; + LONG ref; +} PaletteImpl; + +static HRESULT WINAPI PaletteImpl_QueryInterface(IWICPalette *iface, REFIID iid, + void **ppv) +{ + PaletteImpl *This = (PaletteImpl*)iface; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICPalette, iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI PaletteImpl_AddRef(IWICPalette *iface) +{ + PaletteImpl *This = (PaletteImpl*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI PaletteImpl_Release(IWICPalette *iface) +{ + PaletteImpl *This = (PaletteImpl*)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 PaletteImpl_InitializePredefined(IWICPalette *iface, + WICBitmapPaletteType ePaletteType, BOOL fAddTransparentColor) +{ + FIXME("(%p,%u,%i): stub\n", iface, ePaletteType, fAddTransparentColor); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_InitializeCustom(IWICPalette *iface, + WICColor *pColors, UINT colorCount) +{ + FIXME("(%p,%p,%u): stub\n", iface, pColors, colorCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_InitializeFromBitmap(IWICPalette *iface, + IWICBitmapSource *pISurface, UINT colorCount, BOOL fAddTransparentColor) +{ + FIXME("(%p,%p,%u,%i): stub\n", iface, pISurface, colorCount, fAddTransparentColor); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_InitializeFromPalette(IWICPalette *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_GetType(IWICPalette *iface, + WICBitmapPaletteType *pePaletteType) +{ + FIXME("(%p,%p): stub\n", iface, pePaletteType); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_GetColorCount(IWICPalette *iface, UINT *pcCount) +{ + FIXME("(%p,%p): stub\n", iface, pcCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_GetColors(IWICPalette *iface, UINT colorCount, + WICColor *pColors, UINT *pcActualColors) +{ + FIXME("(%p,%i,%p,%p): stub\n", iface, colorCount, pColors, pcActualColors); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_IsBlackWhite(IWICPalette *iface, BOOL *pfIsBlackWhite) +{ + FIXME("(%p,%p): stub\n", iface, pfIsBlackWhite); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_IsGrayscale(IWICPalette *iface, BOOL *pfIsGrayscale) +{ + FIXME("(%p,%p): stub\n", iface, pfIsGrayscale); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_HasAlpha(IWICPalette *iface, BOOL *pfHasAlpha) +{ + FIXME("(%p,%p): stub\n", iface, pfHasAlpha); + return E_NOTIMPL; +} + +static const IWICPaletteVtbl PaletteImpl_Vtbl = { + PaletteImpl_QueryInterface, + PaletteImpl_AddRef, + PaletteImpl_Release, + PaletteImpl_InitializePredefined, + PaletteImpl_InitializeCustom, + PaletteImpl_InitializeFromBitmap, + PaletteImpl_InitializeFromPalette, + PaletteImpl_GetType, + PaletteImpl_GetColorCount, + PaletteImpl_GetColors, + PaletteImpl_IsBlackWhite, + PaletteImpl_IsGrayscale, + PaletteImpl_HasAlpha +}; + +HRESULT PaletteImpl_Create(IWICPalette **palette) +{ + PaletteImpl *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(PaletteImpl)); + if (!This) return E_OUTOFMEMORY; + + This->lpIWICPaletteVtbl = &PaletteImpl_Vtbl; + This->ref = 1; + + *palette = (IWICPalette*)This; + + return S_OK; +} diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 313dca5..a6e09ff 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -22,6 +22,8 @@ extern HRESULT ImagingFactory_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); extern HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); +extern HRESULT PaletteImpl_Create(IWICPalette **palette); + extern HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, UINT srcwidth, UINT srcheight, INT srcstride, const WICRect *rc, UINT dststride, UINT dstbuffersize, BYTE *dstbuffer);
1
0
0
0
Vincent Povirk : include: Add definitions for IWICPalette.
by Alexandre Julliard
03 Jul '09
03 Jul '09
Module: wine Branch: master Commit: b11e2d8db7058c9ba2f054e3f7fa7bb669b1c0f9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b11e2d8db7058c9ba2f054e3f…
Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 1 16:59:51 2009 -0500 include: Add definitions for IWICPalette. --- include/wincodec.idl | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index e72bb36..e5f22e3 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -51,6 +51,24 @@ typedef enum WICBitmapDecoderCapabilities { WICBitmapDecoderCapabilityCanDecodeThumbnail = 0x00000010, } WICBitmapDecoderCapabilities; +typedef enum WICBitmapPaletteType { + WICBitmapPaletteTypeCustom = 0x00000000, + WICBitmapPaletteTypeMedianCut = 0x00000001, + WICBitmapPaletteTypeFixedBW = 0x00000002, + WICBitmapPaletteTypeFixedHalftone8 = 0x00000003, + WICBitmapPaletteTypeFixedHalftone27 = 0x00000004, + WICBitmapPaletteTypeFixedHalftone64 = 0x00000005, + WICBitmapPaletteTypeFixedHalftone125 = 0x00000006, + WICBitmapPaletteTypeFixedHalftone216 = 0x00000007, + WICBitmapPaletteTypeFixedWebPalette = WICBitmapPaletteTypeFixedHalftone216, + WICBitmapPaletteTypeFixedHalftone252 = 0x00000008, + WICBitmapPaletteTypeFixedHalftone256 = 0x00000009, + WICBitmapPaletteTypeFixedGray4 = 0x0000000A, + WICBitmapPaletteTypeFixedGray16 = 0x0000000B, + WICBitmapPaletteTypeFixedGray256 = 0x0000000C, + WICBITMAPPALETTETYPE_FORCE_DWORD = CODEC_FORCE_DWORD +} WICBitmapPaletteType; + typedef GUID WICPixelFormatGUID; typedef REFGUID REFWICPixelFormatGUID; @@ -73,6 +91,8 @@ typedef struct WICRect { INT Height; } WICRect; +typedef UINT32 WICColor; + cpp_quote("#define WINCODEC_ERR_WRONGSTATE 0x88982f04") cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44") @@ -121,6 +141,49 @@ interface IWICBitmapSource : IUnknown [ object, + uuid(00000040-a8f2-4877-ba0a-fd2b6645fb94) +] +interface IWICPalette : IUnknown +{ + HRESULT InitializePredefined( + [in] WICBitmapPaletteType ePaletteType, + [in] BOOL fAddTransparentColor); + + HRESULT InitializeCustom( + [in, size_is(colorCount)] WICColor *pColors, + [in] UINT colorCount); + + HRESULT InitializeFromBitmap( + [in] IWICBitmapSource *pISurface, + [in] UINT colorCount, + [in] BOOL fAddTransparentColor); + + HRESULT InitializeFromPalette( + [in] IWICPalette *pIPalette); + + HRESULT GetType( + [out] WICBitmapPaletteType *pePaletteType); + + HRESULT GetColorCount( + [out] UINT *pcCount); + + HRESULT GetColors( + [in] UINT colorCount, + [out, size_is(colorCount)] WICColor *pColors, + [out] UINT *pcActualColors); + + HRESULT IsBlackWhite( + [out] BOOL *pfIsBlackWhite); + + HRESULT IsGrayscale( + [out] BOOL *pfIsGrayscale); + + HRESULT HasAlpha( + [out] BOOL *pfHasAlpha); +} + +[ + object, uuid(3b16811b-6a43-4ec9-a813-3d930c13b940) ] interface IWICBitmapFrameDecode : IWICBitmapSource
1
0
0
0
Alexandre Julliard : makefiles: Regenerate the source lists using make_makefiles.
by Alexandre Julliard
03 Jul '09
03 Jul '09
Module: wine Branch: master Commit: 56af92b07313d741a962f36e3a77090b13d5d02f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=56af92b07313d741a962f36e3…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 13:26:38 2009 +0200 makefiles: Regenerate the source lists using make_makefiles. --- dlls/d3dxof/Makefile.in | 2 +- dlls/dmband/Makefile.in | 2 +- dlls/dxgi/Makefile.in | 4 +- dlls/dxguid/Makefile.in | 4 +- dlls/itss/Makefile.in | 2 +- dlls/jscript/Makefile.in | 2 +- dlls/loadperf/Makefile.in | 2 +- dlls/msvfw32/Makefile.in | 4 +- dlls/ole32/Makefile.in | 2 +- dlls/shell32/Makefile.in | 2 +- dlls/spoolss/Makefile.in | 2 +- dlls/winealsa.drv/Makefile.in | 2 +- dlls/wined3d/Makefile.in | 4 +- dlls/wineesd.drv/Makefile.in | 4 +- dlls/wintrust/Makefile.in | 2 +- libs/wine/Makefile.in | 98 ++++++++++++++++++++-------------------- programs/secedit/Makefile.in | 2 +- programs/winedbg/Makefile.in | 2 +- programs/winemine/Makefile.in | 2 +- tools/Makefile.in | 2 +- 20 files changed, 73 insertions(+), 73 deletions(-) diff --git a/dlls/d3dxof/Makefile.in b/dlls/d3dxof/Makefile.in index d3566dd..9ea5555 100644 --- a/dlls/d3dxof/Makefile.in +++ b/dlls/d3dxof/Makefile.in @@ -7,8 +7,8 @@ IMPORTLIB = d3dxof IMPORTS = dxguid uuid ole32 advapi32 kernel32 C_SRCS = \ - main.c \ d3dxof.c \ + main.c \ parsing.c \ regsvr.c diff --git a/dlls/dmband/Makefile.in b/dlls/dmband/Makefile.in index 157ba5e..f749373 100644 --- a/dlls/dmband/Makefile.in +++ b/dlls/dmband/Makefile.in @@ -8,8 +8,8 @@ IMPORTS = dxguid uuid ole32 advapi32 kernel32 C_SRCS = \ band.c \ bandtrack.c \ - dmutils.c \ dmband_main.c \ + dmutils.c \ regsvr.c RC_SRCS = version.rc diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in index d340b6f..f30910d 100644 --- a/dlls/dxgi/Makefile.in +++ b/dlls/dxgi/Makefile.in @@ -11,9 +11,9 @@ C_SRCS = \ device.c \ dxgi_main.c \ factory.c \ - utils.c \ surface.c \ - swapchain.c + swapchain.c \ + utils.c RC_SRCS = version.rc diff --git a/dlls/dxguid/Makefile.in b/dlls/dxguid/Makefile.in index e3806ac..e202d3b 100644 --- a/dlls/dxguid/Makefile.in +++ b/dlls/dxguid/Makefile.in @@ -5,9 +5,9 @@ VPATH = @srcdir@ MODULE = dxguid C_SRCS = \ - dx8guid.c \ - dx9guid.c \ dx10guid.c \ + dx8guid.c \ + dx9guid.c \ dxguid.c @MAKE_IMPLIB_RULES@ diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in index 9614ab6..28ba67a 100644 --- a/dlls/itss/Makefile.in +++ b/dlls/itss/Makefile.in @@ -8,8 +8,8 @@ EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ chm_lib.c \ - lzx.c \ itss.c \ + lzx.c \ moniker.c \ protocol.c \ storage.c diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 5d7ee69..3a32a29 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -28,7 +28,7 @@ C_SRCS = \ IDL_TLB_SRCS = jsglobal.idl BISON_SRCS = \ - parser.y + parser.y @MAKE_DLL_RULES@ diff --git a/dlls/loadperf/Makefile.in b/dlls/loadperf/Makefile.in index 1a57159..c092f3f 100644 --- a/dlls/loadperf/Makefile.in +++ b/dlls/loadperf/Makefile.in @@ -7,7 +7,7 @@ IMPORTLIB = loadperf IMPORTS = kernel32 C_SRCS = \ - loadperf_main.c + loadperf_main.c @MAKE_DLL_RULES@ diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in index 4eb3b10..cb92c00 100644 --- a/dlls/msvfw32/Makefile.in +++ b/dlls/msvfw32/Makefile.in @@ -7,9 +7,9 @@ IMPORTLIB = msvfw32 IMPORTS = winmm version comctl32 user32 gdi32 advapi32 kernel32 ntdll C_SRCS = \ + drawdib.c \ mciwnd.c \ - msvideo_main.c \ - drawdib.c + msvideo_main.c RC_SRCS = \ msvfw32_Da.rc \ diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index eb1ac5e..c6f7cbd 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -31,8 +31,8 @@ C_SRCS = \ memlockbytes.c \ moniker.c \ ole2.c \ - ole2stubs.c \ ole2impl.c \ + ole2stubs.c \ ole32_main.c \ oleobj.c \ oleproxy.c \ diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 499cca6..744c8dd 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -17,8 +17,8 @@ C_SRCS = \ clipboard.c \ control.c \ cpanelfolder.c \ - dde.c \ dataobject.c \ + dde.c \ debughlp.c \ dialogs.c \ dragdrophelper.c \ diff --git a/dlls/spoolss/Makefile.in b/dlls/spoolss/Makefile.in index 00fc258..646a11d 100644 --- a/dlls/spoolss/Makefile.in +++ b/dlls/spoolss/Makefile.in @@ -6,7 +6,7 @@ MODULE = spoolss.dll IMPORTLIB = spoolss IMPORTS = winspool kernel32 -C_SRCS = \ +C_SRCS = \ router.c \ spoolss_main.c diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index 3e07ef2..1f7a78d 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -12,8 +12,8 @@ C_SRCS = \ dsoutput.c \ midi.c \ mixer.c \ - waveinit.c \ wavein.c \ + waveinit.c \ waveout.c @MAKE_DLL_RULES@ diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 2fcb4ec..cdafc91 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -29,12 +29,12 @@ C_SRCS = \ shader_sm4.c \ state.c \ stateblock.c \ - surface_base.c \ surface.c \ + surface_base.c \ surface_gdi.c \ swapchain.c \ - swapchain_gdi.c \ swapchain_base.c \ + swapchain_gdi.c \ texture.c \ utils.c \ vertexdeclaration.c \ diff --git a/dlls/wineesd.drv/Makefile.in b/dlls/wineesd.drv/Makefile.in index b34e374..e42d04c 100644 --- a/dlls/wineesd.drv/Makefile.in +++ b/dlls/wineesd.drv/Makefile.in @@ -8,8 +8,8 @@ EXTRAINCL = @ESDINCL@ EXTRALIBS = @ESDLIBS@ C_SRCS = \ - esound.c \ - audio.c + audio.c \ + esound.c @MAKE_DLL_RULES@ diff --git a/dlls/wintrust/Makefile.in b/dlls/wintrust/Makefile.in index f747179..6f2f406 100644 --- a/dlls/wintrust/Makefile.in +++ b/dlls/wintrust/Makefile.in @@ -15,7 +15,7 @@ C_SRCS = \ wintrust_main.c RC_SRCS = \ - version.rc + version.rc @MAKE_DLL_RULES@ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index c846848..7e7baf1 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -17,50 +17,14 @@ DYNAME = libwine.$(SOVERSION).dylib INSTALLDIRS = $(DESTDIR)$(libdir) C_SRCS = \ - casemap.c \ - collation.c \ - compose.c \ - config.c \ - cptable.c \ - debug.c \ - fold.c \ - ldt.c \ - loader.c \ - mbtowc.c \ - mmap.c \ - port.c \ - sortkey.c \ - string.c \ - utf8.c \ - wctomb.c \ - wctype.c \ c_037.c \ - c_424.c \ - c_437.c \ - c_500.c \ - c_737.c \ - c_775.c \ - c_850.c \ - c_852.c \ - c_855.c \ - c_856.c \ - c_857.c \ - c_860.c \ - c_861.c \ - c_862.c \ - c_863.c \ - c_864.c \ - c_865.c \ - c_866.c \ - c_869.c \ - c_874.c \ - c_875.c \ - c_878.c \ - c_932.c \ - c_936.c \ - c_949.c \ - c_950.c \ + c_10000.c \ + c_10006.c \ + c_10007.c \ + c_10029.c \ c_1006.c \ + c_10079.c \ + c_10081.c \ c_1026.c \ c_1250.c \ c_1251.c \ @@ -72,12 +36,6 @@ C_SRCS = \ c_1257.c \ c_1258.c \ c_1361.c \ - c_10000.c \ - c_10006.c \ - c_10007.c \ - c_10029.c \ - c_10079.c \ - c_10081.c \ c_20127.c \ c_20866.c \ c_20932.c \ @@ -95,7 +53,49 @@ C_SRCS = \ c_28603.c \ c_28604.c \ c_28605.c \ - c_28606.c + c_28606.c \ + c_424.c \ + c_437.c \ + c_500.c \ + c_737.c \ + c_775.c \ + c_850.c \ + c_852.c \ + c_855.c \ + c_856.c \ + c_857.c \ + c_860.c \ + c_861.c \ + c_862.c \ + c_863.c \ + c_864.c \ + c_865.c \ + c_866.c \ + c_869.c \ + c_874.c \ + c_875.c \ + c_878.c \ + c_932.c \ + c_936.c \ + c_949.c \ + c_950.c \ + casemap.c \ + collation.c \ + compose.c \ + config.c \ + cptable.c \ + debug.c \ + fold.c \ + ldt.c \ + loader.c \ + mbtowc.c \ + mmap.c \ + port.c \ + sortkey.c \ + string.c \ + utf8.c \ + wctomb.c \ + wctype.c EXTRA_OBJS = version.o diff --git a/programs/secedit/Makefile.in b/programs/secedit/Makefile.in index 58fa913..0b356d8 100644 --- a/programs/secedit/Makefile.in +++ b/programs/secedit/Makefile.in @@ -8,7 +8,7 @@ APPMODE = -mconsole IMPORTS = kernel32 C_SRCS = \ - main.c \ + main.c @MAKE_PROG_RULES@ diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 9147f1b..c3329e2 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -22,8 +22,8 @@ C_SRCS = \ info.c \ memory.c \ source.c \ - symbol.c \ stack.c \ + symbol.c \ tgt_active.c \ tgt_minidump.c \ tgt_module.c \ diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in index 09adf9e..7e5d91b 100644 --- a/programs/winemine/Makefile.in +++ b/programs/winemine/Makefile.in @@ -8,7 +8,7 @@ IMPORTS = user32 gdi32 advapi32 kernel32 DELAYIMPORTS = shell32 C_SRCS = \ - dialog.c \ + dialog.c \ main.c RC_SRCS = \ diff --git a/tools/Makefile.in b/tools/Makefile.in index ea4e007..b711a7b 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -27,7 +27,7 @@ C_SRCS = \ make_ctests.c \ makedep.c \ relpath.c \ - sfnt2fnt.c \ + sfnt2fnt.c INSTALLSUBDIRS = \ widl \
1
0
0
0
Alexandre Julliard : make_makefiles: Automatically update the source lists in the individual makefiles.
by Alexandre Julliard
03 Jul '09
03 Jul '09
Module: wine Branch: master Commit: 88b74519ae86081af38a1e2dd5e0b8417e1f5039 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=88b74519ae86081af38a1e2dd…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 13:26:01 2009 +0200 make_makefiles: Automatically update the source lists in the individual makefiles. --- tools/make_makefiles | 119 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 106 insertions(+), 13 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 91f7d39..99a120c 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -118,7 +118,21 @@ my %private_idl_headers = ( "wine/winedxgi.idl" => 1, ); -my (@makefiles, %makefiles); +my %ignored_source_files = ( + "dlls/wineps.drv/afm2c.c" => 1, + "dlls/wineps.drv/mkagl.c" => 1, + "programs/winetest/dist.rc" => 1, +); + +my (@all_files, @makefiles, %makefiles); + +sub dirname($) +{ + my $ret = shift; + return "" unless $ret =~ /\//; + $ret =~ s!/[^/]*$!!; + return $ret; +} # update a file if changed sub update_file($) @@ -178,6 +192,49 @@ sub replace_in_file($$$@) return update_file($file); } +# replace a variable in a makefile +sub replace_makefile_variable($$) +{ + my ($file, $var) = @_; + my $make = $makefiles{$file}; + + return unless defined ${$make}{"=$var"}; + + my @values = @{${$make}{"=$var"}}; + ${$make}{$var} = \@values; + + open NEW_FILE, ">$file.in.new" or die "cannot create $file.in.new"; + + open OLD_FILE, "$file.in" or die "cannot open $file.in"; + while (<OLD_FILE>) + { + if (/^\s*($var\s+)=/) + { + # try to preserve formatting + my $prefix = $1; + my $multiline = /\\$/ || (@values > 1); + while (/\\$/) + { + $_ = <OLD_FILE>; + last unless $_; + } + if ($multiline) + { + print NEW_FILE "$var = \\\n\t" . join(" \\\n\t", sort @values) . "\n"; + } + else + { + print NEW_FILE "$prefix= @values\n"; + } + next; + } + print NEW_FILE $_; + } + close OLD_FILE; + close NEW_FILE; + return update_file("$file.in"); +} + # parse the specified makefile to identify the rules file sub parse_makefile($) { @@ -191,7 +248,9 @@ sub parse_makefile($) while (<MAKE>) { chomp; + next if (/^\s*#/); while (/\\$/) { chop; $_ .= <MAKE>; chomp; } # merge continued lines + next if (/^\s*$/); if (/^\@(MAKE.*RULES)\@/) { @@ -199,12 +258,12 @@ sub parse_makefile($) $make{"=rules"} = $makerules{$var}; next; } - if (/^(MODULE|IMPORTLIB|TESTDLL)\s*=\s*(.*)/) + if (/^\s*(MODULE|IMPORTLIB|TESTDLL)\s*=\s*(.*)/) { $make{$1} = $2; next; } - if (/^(BISON_SRCS|LEX_SRCS|IDL_[CHIPS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|MC_SRCS|RC_SRCS|RC_SRCS16|RC_BINARIES|SPEC_SRCS16|EXTRA_OBJS16|MANPAGES|PROGRAMS)\s*=\s*(.*)/) + if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|C_SRCS16|RC_SRCS16|SPEC_SRCS16|EXTRA_OBJS16|MANPAGES|PROGRAMS)\s*=\s*(.*)/) { my @list = split(/\s+/, $2); $make{$1} = \@list; @@ -214,6 +273,30 @@ sub parse_makefile($) return %make; } +# assign source files to their respective makefile +sub assign_sources_to_makefiles() +{ + foreach my $file (@all_files) + { + next if defined $ignored_source_files{$file}; + my $dir = dirname( $file ); + + while ($dir && !defined $makefiles{"$dir/Makefile"}) { $dir = dirname( $dir ); } + next unless $dir; + + die "no makefile found for $file\n" unless defined $makefiles{"$dir/Makefile"}; + + my $make = $makefiles{"$dir/Makefile"}; + my $basename = substr( $file, length($dir) + 1 ); + + if ($basename =~ /\.c$/) { push @{${$make}{"=C_SRCS"}}, $basename; } + elsif ($basename =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $basename; } + elsif ($basename =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $basename; } + elsif ($basename =~ /\.rc$/) { push @{${$make}{"=RC_SRCS"}}, $basename; } + elsif ($basename =~ /\.rc$/) { push @{${$make}{"=RC_SRCS"}}, $basename; } + elsif ($basename =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $basename; } + } +} ################################################################ # update the makefile list in configure.ac @@ -256,6 +339,20 @@ sub update_makefiles(@) push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules]$args)\n"; } + # update the source variables in all the makefiles + + foreach my $file (sort @_) + { + my %make = %{$makefiles{$file}}; + + replace_makefile_variable( $file, "LEX_SRCS" ); + replace_makefile_variable( $file, "BISON_SRCS" ); + replace_makefile_variable( $file, "MC_SRCS" ); + replace_makefile_variable( $file, "SVG_SRCS" ); + replace_makefile_variable( $file, "C_SRCS" ) unless defined $make{"C_SRCS16"}; + replace_makefile_variable( $file, "RC_SRCS" ) unless defined $make{"RC_SRCS16"}; + } + push @lines, "\ndnl Build dependencies for test files compiled into winetest\n"; replace_in_file( "configure.ac", '^WINE_CONFIG_MAKERULES', '^dnl Build dependencies for test files compiled into winetest$', @lines); } @@ -491,9 +588,8 @@ sub update_dlls(@) sub update_includes() { - return unless -d ".git"; my (@h_srcs, @private_idl_srcs, @public_idl_srcs, @tlb_srcs, %subdirs); - my @includes = map { s/^include\///; $_; } split /\0/, `git ls-files -c -z include`; + my @includes = map { (my $ret = $_) =~ s/^include\///; $ret; } grep /^include\//, @all_files; foreach my $incl (@includes) { if ($incl =~ /(.*)\//) { $subdirs{$1} = 1; } @@ -561,14 +657,10 @@ sub update_gitignore(@) } -if (-d ".git") -{ - @makefiles = map { s/\.in$//; $_; } split /\0/, `git ls-files -c -z Makefile.in \\*/Makefile.in`; -} -else -{ - @makefiles = map { s/^\.\/(.*)\.in/$1/; $_; } split(/\s/,`find . -name Makefile.in -print`); -} +die "needs to be run from a git checkout" unless -d ".git"; + +@all_files = split /\0/, `git ls-files -c -z`; +@makefiles = map { my $ret = $_; $ret =~ s/\.in$//; $ret; } grep /Makefile.in$/, @all_files; foreach my $file (sort values %makerules, @makefiles) { @@ -576,6 +668,7 @@ foreach my $file (sort values %makerules, @makefiles) $makefiles{$file} = \%make; } +assign_sources_to_makefiles(); update_makefiles( @makefiles ); push @ignores, update_includes(); push @ignores, update_ignores( @makefiles );
1
0
0
0
Michael Stefaniuc : user32: Build language resource files separately.
by Alexandre Julliard
03 Jul '09
03 Jul '09
Module: wine Branch: master Commit: 3090323c89399c39c01058d83aeeccace8be31cf URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3090323c89399c39c01058d83…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:38:57 2009 +0200 user32: Build language resource files separately. Do not include them from an other rc file. --- dlls/user32/Makefile.in | 32 ++++++++++++++- dlls/user32/resources.h | 28 +++++++++++++ dlls/user32/resources/user32.rc | 76 ----------------------------------- dlls/user32/resources/user32_Bg.rc | 2 + dlls/user32/resources/user32_Ca.rc | 2 + dlls/user32/resources/user32_Cs.rc | 2 + dlls/user32/resources/user32_Da.rc | 2 + dlls/user32/resources/user32_De.rc | 2 + dlls/user32/resources/user32_En.rc | 2 + dlls/user32/resources/user32_Eo.rc | 2 + dlls/user32/resources/user32_Es.rc | 2 + dlls/user32/resources/user32_Fi.rc | 2 + dlls/user32/resources/user32_Fr.rc | 2 + dlls/user32/resources/user32_Hu.rc | 2 + dlls/user32/resources/user32_It.rc | 2 + dlls/user32/resources/user32_Ja.rc | 4 +- dlls/user32/resources/user32_Ko.rc | 2 + dlls/user32/resources/user32_Lt.rc | 4 +- dlls/user32/resources/user32_Nl.rc | 2 + dlls/user32/resources/user32_No.rc | 2 + dlls/user32/resources/user32_Pl.rc | 2 + dlls/user32/resources/user32_Pt.rc | 2 + dlls/user32/resources/user32_Ro.rc | 4 +- dlls/user32/resources/user32_Ru.rc | 2 + dlls/user32/resources/user32_Si.rc | 4 +- dlls/user32/resources/user32_Sk.rc | 2 + dlls/user32/resources/user32_Sv.rc | 2 + dlls/user32/resources/user32_Tr.rc | 2 + dlls/user32/resources/user32_Uk.rc | 2 + dlls/user32/resources/user32_Wa.rc | 2 + dlls/user32/resources/user32_Zh.rc | 4 +- dlls/user32/resources/user32_bin.rc | 1 + dlls/user32/resources/version.rc | 2 + 33 files changed, 118 insertions(+), 87 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=3090323c89399c39c0105…
1
0
0
0
Frédéric Delanoy : msi: Update French translation .
by Alexandre Julliard
03 Jul '09
03 Jul '09
Module: wine Branch: master Commit: e801cae5209fa082071d3bb5448752f1dc6383c1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e801cae5209fa082071d3bb54…
Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 3 02:22:29 2009 +0200 msi: Update French translation. --- dlls/msi/msi_Fr.rc | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/msi/msi_Fr.rc b/dlls/msi/msi_Fr.rc index a4cd0bc..f7f7338 100644 --- a/dlls/msi/msi_Fr.rc +++ b/dlls/msi/msi_Fr.rc @@ -20,17 +20,20 @@ #include "windef.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - 4 "The specified installation package could not be opened. Please check the file path and try again." + 4 "Le paquet d'installation spécifié n'a pu être ouvert. Veuillez vérifier le chemin du fichier et réessayer." 5 "Le chemin %s est introuvable" - 9 "ins�rez le disque %s" - 10 "mauvais param�tres" + 9 "insérez le disque %s" + 10 "mauvais paramètres" 11 "saisissez le nom du dossier contenant %s" - 12 "source d'installation pour la fonctionnalit� manquante" - 13 "lecteur r�seau pour la fonctionnalit� manquant" - 14 "fonctionnalit� depuis:" - 15 "s�lectionnez le dossier contenant %s" + 12 "source d'installation pour la fonctionnalité manquante" + 13 "lecteur réseau pour la fonctionnalité manquante" + 14 "fonctionnalité depuis :" + 15 "sélectionnez le dossier contenant %s" }
1
0
0
0
← Newer
1
...
88
89
90
91
92
93
94
...
107
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
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
Results per page:
10
25
50
100
200