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

Vincent Povirk : windowscodecs: Add test for IWICPalette.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: dd5a9a0aa11577da5016efdf3424f3f65686aaf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd5a9a0aa11577da5016efdf3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 1 17:39:13 2009 -0500 windowscodecs: Add test for IWICPalette. --- dlls/windowscodecs/tests/Makefile.in | 3 +- dlls/windowscodecs/tests/palette.c | 158 ++++++++++++++++++++++++++++++++++ 2 files changed, 160 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index 829bbdd..2bb8c01 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -6,7 +6,8 @@ TESTDLL = windowscodecs.dll IMPORTS = kernel32 ole32 CTESTS = \ - bmpformat.c + bmpformat.c \ + palette.c @MAKE_TEST_RULES@ diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c new file mode 100644 index 0000000..d1e5c88 --- /dev/null +++ b/dlls/windowscodecs/tests/palette.c @@ -0,0 +1,158 @@ +/* + * 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 <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "objbase.h" +#include "wincodec.h" +#include "wine/test.h" + +static void test_custom_palette(void) +{ + IWICImagingFactory *factory; + IWICPalette *palette; + HRESULT hr; + WICBitmapPaletteType type=0xffffffff; + UINT count=1; + const WICColor initcolors[4]={0xff000000,0xff0000ff,0xffffff00,0xffffffff}; + WICColor colors[4]; + BOOL boolresult; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (!SUCCEEDED(hr)) return; + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(SUCCEEDED(hr), "CreatePalette failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICPalette_GetType(palette, &type); + ok(SUCCEEDED(hr), "GetType failed, hr=%x\n", hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %x\n", type); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(SUCCEEDED(hr), "GetColorCount failed, hr=%x\n", hr); + ok(count == 0, "expected 0, got %u\n", count); + + hr = IWICPalette_GetColors(palette, 0, colors, &count); + ok(SUCCEEDED(hr), "GetColors failed, hr=%x\n", hr); + ok(count == 0, "expected 0, got %u\n", count); + + hr = IWICPalette_GetColors(palette, 4, colors, &count); + ok(SUCCEEDED(hr), "GetColors failed, hr=%x\n", hr); + ok(count == 0, "expected 0, got %u\n", count); + + memcpy(colors, initcolors, sizeof(initcolors)); + hr = IWICPalette_InitializeCustom(palette, colors, 4); + ok(SUCCEEDED(hr), "InitializeCustom failed, hr=%x\n", hr); + + hr = IWICPalette_GetType(palette, &type); + ok(SUCCEEDED(hr), "GetType failed, hr=%x\n", hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %x\n", type); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(SUCCEEDED(hr), "GetColorCount failed, hr=%x\n", hr); + ok(count == 4, "expected 4, got %u\n", count); + + memset(colors, 0, sizeof(colors)); + count = 0; + hr = IWICPalette_GetColors(palette, 4, colors, &count); + ok(SUCCEEDED(hr), "GetColors failed, hr=%x\n", hr); + ok(count == 4, "expected 4, got %u\n", count); + ok(!memcmp(colors, initcolors, sizeof(colors)), "got unexpected palette data\n"); + + memset(colors, 0, sizeof(colors)); + count = 0; + hr = IWICPalette_GetColors(palette, 2, colors, &count); + ok(SUCCEEDED(hr), "GetColors failed, hr=%x\n", hr); + ok(count == 2, "expected 2, got %u\n", count); + ok(!memcmp(colors, initcolors, sizeof(WICColor)*2), "got unexpected palette data\n"); + + count = 0; + hr = IWICPalette_GetColors(palette, 6, colors, &count); + ok(SUCCEEDED(hr), "GetColors failed, hr=%x\n", hr); + ok(count == 4, "expected 4, got %u\n", count); + + hr = IWICPalette_HasAlpha(palette, &boolresult); + ok(SUCCEEDED(hr), "HasAlpha failed, hr=%x\n", hr); + ok(!boolresult, "expected FALSE, got TRUE\n"); + + hr = IWICPalette_IsBlackWhite(palette, &boolresult); + ok(SUCCEEDED(hr), "IsBlackWhite failed, hr=%x\n", hr); + ok(!boolresult, "expected FALSE, got TRUE\n"); + + hr = IWICPalette_IsGrayscale(palette, &boolresult); + ok(SUCCEEDED(hr), "IsGrayscale failed, hr=%x\n", hr); + ok(!boolresult, "expected FALSE, got TRUE\n"); + + /* try a palette with some alpha in it */ + colors[2] = 0x80ffffff; + hr = IWICPalette_InitializeCustom(palette, colors, 4); + ok(SUCCEEDED(hr), "InitializeCustom failed, hr=%x\n", hr); + + hr = IWICPalette_HasAlpha(palette, &boolresult); + ok(SUCCEEDED(hr), "HasAlpha failed, hr=%x\n", hr); + ok(boolresult, "expected TRUE, got FALSE\n"); + + /* setting to a 0-color palette is acceptable */ + hr = IWICPalette_InitializeCustom(palette, NULL, 0); + ok(SUCCEEDED(hr), "InitializeCustom failed, hr=%x\n", hr); + + /* IWICPalette is paranoid about NULL pointers */ + hr = IWICPalette_GetType(palette, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %x\n", hr); + + hr = IWICPalette_GetColorCount(palette, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %x\n", hr); + + hr = IWICPalette_InitializeCustom(palette, NULL, 4); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %x\n", hr); + + hr = IWICPalette_GetColors(palette, 4, NULL, &count); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %x\n", hr); + + hr = IWICPalette_GetColors(palette, 4, colors, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %x\n", hr); + + hr = IWICPalette_HasAlpha(palette, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %x\n", hr); + + hr = IWICPalette_IsBlackWhite(palette, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %x\n", hr); + + hr = IWICPalette_IsGrayscale(palette, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %x\n", hr); + + IWICPalette_Release(palette); + } + + IWICImagingFactory_Release(factory); +} + +START_TEST(palette) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + test_custom_palette(); + + CoUninitialize(); +}

1 0

Piotr Caban : jscript: Added DateConstr_UTC implementation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 60ddd438d3bc23079a3c2108e400d3252ef48821 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ddd438d3bc23079a3c2108e… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 3 02:45:22 2009 +0200 jscript: Added DateConstr_UTC implementation. --- dlls/jscript/date.c | 158 +++++++++++++++++++++++++++++---------------------- 1 files changed, 89 insertions(+), 69 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 7888a1c..d20ee96 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2210,8 +2210,92 @@ static HRESULT DateConstr_parse(DispatchEx *dispex, LCID lcid, WORD flags, DISPP static HRESULT DateConstr_UTC(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT year, month, vdate, hours, minutes, seconds, ms; + DOUBLE y; + int arg_no = arg_cnt(dp); + HRESULT hres; + + TRACE("\n"); + + if(arg_no>0) { + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &year); + if(FAILED(hres)) + return hres; + y = num_val(&year); + if(0<=y && y<=99) + y += 1900; + } + else y = 1900; + + if(arg_no>1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &month); + if(FAILED(hres)) + return hres; + } + else { + V_VT(&month) = VT_R8; + V_R8(&month) = 0; + } + + if(arg_no>2) { + hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &vdate); + if(FAILED(hres)) + return hres; + } + else { + V_VT(&vdate) = VT_R8; + V_R8(&vdate) = 1; + } + + if(arg_no>3) { + hres = to_number(dispex->ctx, get_arg(dp, 3), ei, &hours); + if(FAILED(hres)) + return hres; + } + else { + V_VT(&hours) = VT_R8; + V_R8(&hours) = 0; + } + + if(arg_no>4) { + hres = to_number(dispex->ctx, get_arg(dp, 4), ei, &minutes); + if(FAILED(hres)) + return hres; + } + else { + V_VT(&minutes) = VT_R8; + V_R8(&minutes) = 0; + } + + if(arg_no>5) { + hres = to_number(dispex->ctx, get_arg(dp, 5), ei, &seconds); + if(FAILED(hres)) + return hres; + } + else { + V_VT(&seconds) = VT_R8; + V_R8(&seconds) = 0; + } + + if(arg_no>6) { + hres = to_number(dispex->ctx, get_arg(dp, 6), ei, &ms); + if(FAILED(hres)) + return hres; + } + else { + V_VT(&ms) = VT_R8; + V_R8(&ms) = 0; + } + + if(retv) { + V_VT(retv) = VT_R8; + V_R8(retv) = time_clip(make_date( + make_day(y, num_val(&month), num_val(&vdate)), + make_time(num_val(&hours), num_val(&minutes), + num_val(&seconds), num_val(&ms)))); + } + + return S_OK; } static HRESULT DateConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, @@ -2266,76 +2350,12 @@ static HRESULT DateConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPP /* ECMA-262 3rd Edition 15.9.3.1 */ default: { - VARIANT year, month, vdate, hours, minutes, seconds, ms; + VARIANT ret_date; DateInstance *di; - int arg_no = arg_cnt(dp), y; - - hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &year); - if(FAILED(hres)) - return hres; - y = num_val(&year); - if(0<=y && y<=99) - y += 1900; - - hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &month); - if(FAILED(hres)) - return hres; - - if(arg_no>2) { - hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &vdate); - if(FAILED(hres)) - return hres; - } - else { - V_VT(&vdate) = VT_R8; - V_R8(&vdate) = 1; - } - - if(arg_no>3) { - hres = to_number(dispex->ctx, get_arg(dp, 3), ei, &hours); - if(FAILED(hres)) - return hres; - } - else { - V_VT(&hours) = VT_R8; - V_R8(&hours) = 0; - } - - if(arg_no>4) { - hres = to_number(dispex->ctx, get_arg(dp, 4), ei, &minutes); - if(FAILED(hres)) - return hres; - } - else { - V_VT(&minutes) = VT_R8; - V_R8(&minutes) = 0; - } - - if(arg_no>5) { - hres = to_number(dispex->ctx, get_arg(dp, 5), ei, &seconds); - if(FAILED(hres)) - return hres; - } - else { - V_VT(&seconds) = VT_R8; - V_R8(&seconds) = 0; - } - - if(arg_no>6) { - hres = to_number(dispex->ctx, get_arg(dp, 6), ei, &ms); - if(FAILED(hres)) - return hres; - } - else { - V_VT(&ms) = VT_R8; - V_R8(&ms) = 0; - } + DateConstr_UTC(dispex, lcid, flags, dp, &ret_date, ei, sp); - hres = create_date(dispex->ctx, TRUE, time_clip( - make_date(make_day(y, num_val(&month), num_val(&vdate)), - make_time(num_val(&hours), num_val(&minutes), - num_val(&seconds), num_val(&ms)))), &date); + hres = create_date(dispex->ctx, TRUE, num_val(&ret_date), &date); if(FAILED(hres)) return hres;

1 0

Vincent Povirk : windowscodecs: Implement HasAlpha for palettes.
by Alexandre Julliard July 3, 2009

July 3, 2009

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

Vincent Povirk : windowscodecs: Implement GetColorCount and GetType for palettes.
by Alexandre Julliard July 3, 2009

July 3, 2009

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

Vincent Povirk : include: Add definitions for IWICPalette.
by Alexandre Julliard July 3, 2009

July 3, 2009

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

Piotr Caban : jscript: Added stub implementation of Date constructor properties.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 41e297af1120e5f0007f46a42cd0b49021506c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41e297af1120e5f0007f46a42… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 3 02:45:12 2009 +0200 jscript: Added stub implementation of Date constructor properties. --- dlls/jscript/array.c | 2 +- dlls/jscript/bool.c | 2 +- dlls/jscript/date.c | 33 ++++++++++++++++++++++++++++++++- dlls/jscript/dispex.c | 2 +- dlls/jscript/function.c | 19 +++++++++++-------- dlls/jscript/jscript.h | 5 ++++- dlls/jscript/number.c | 2 +- dlls/jscript/object.c | 2 +- dlls/jscript/regexp.c | 2 +- dlls/jscript/string.c | 2 +- 10 files changed, 54 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41e297af1120e5f0007f4…

1 0

Alexandre Julliard : makefiles: Regenerate the source lists using make_makefiles.
by Alexandre Julliard July 3, 2009

July 3, 2009

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

Michael Stefaniuc : msiexec: Import the version.rc into the main rc file.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 2885b0b8f4a84a2c980d034200330fb8cae64bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2885b0b8f4a84a2c980d03420… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 11:49:52 2009 +0200 msiexec: Import the version.rc into the main rc file. There is no need for a separate file. --- programs/msiexec/rsrc.rc | 11 ++++++++++- programs/msiexec/version.rc | 28 ---------------------------- 2 files changed, 10 insertions(+), 29 deletions(-) diff --git a/programs/msiexec/rsrc.rc b/programs/msiexec/rsrc.rc index 01e43be..cfc8937 100644 --- a/programs/msiexec/rsrc.rc +++ b/programs/msiexec/rsrc.rc @@ -18,7 +18,16 @@ #include <windows.h> -#include "version.rc" +#define WINE_FILEDESCRIPTION_STR "Wine Installer" +#define WINE_FILENAME_STR "msiexec.exe" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 3,1,4000,1823 +#define WINE_FILEVERSION_STR "3.1.4000.1823" +#define WINE_PRODUCTVERSION 3,1,4000,1823 +#define WINE_PRODUCTVERSION_STR "3.1.4000.1823" +#define WINE_PRODUCTNAME_STR "Wine Installer" + +#include "wine/wine_common_ver.rc" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/programs/msiexec/version.rc b/programs/msiexec/version.rc deleted file mode 100644 index 0777594..0000000 --- a/programs/msiexec/version.rc +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2004 Mike McCormack - * - * 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 - */ - -#define WINE_FILEDESCRIPTION_STR "Wine Installer" -#define WINE_FILENAME_STR "msiexec.exe" -#define WINE_FILETYPE VFT_APP -#define WINE_FILEVERSION 3,1,4000,1823 -#define WINE_FILEVERSION_STR "3.1.4000.1823" -#define WINE_PRODUCTVERSION 3,1,4000,1823 -#define WINE_PRODUCTVERSION_STR "3.1.4000.1823" -#define WINE_PRODUCTNAME_STR "Wine Installer" - -#include "wine/wine_common_ver.rc"

1 0

Michael Stefaniuc : cards: Build the version.rc file separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: d87f49d2c1691887e2a7ab90975149352017d932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d87f49d2c1691887e2a7ab909… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 11:49:25 2009 +0200 cards: Build the version.rc file separately. Do not include it in an other rc file. --- dlls/cards/Makefile.in | 3 ++- dlls/cards/cards.rc | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/cards/Makefile.in b/dlls/cards/Makefile.in index 93c53fc..11ca3a8 100644 --- a/dlls/cards/Makefile.in +++ b/dlls/cards/Makefile.in @@ -10,7 +10,8 @@ C_SRCS = \ cards.c RC_SRCS = \ - cards.rc + cards.rc \ + version.rc @MAKE_DLL_RULES@ diff --git a/dlls/cards/cards.rc b/dlls/cards/cards.rc index b4ef1de..f881aa8 100644 --- a/dlls/cards/cards.rc +++ b/dlls/cards/cards.rc @@ -240,5 +240,3 @@ unused2 BITMAP b2fv.bmp /* @makedep: theo.bmp */ 68 BITMAP theo.bmp - -#include "version.rc"

1 0

Michael Stefaniuc : urlmon: Import the version.rc into the main rc file.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 25764235f9445d6d4554adceb0f2688e688c3d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25764235f9445d6d4554adceb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 12:16:59 2009 +0200 urlmon: Import the version.rc into the main rc file. There is no need for a separate file. --- dlls/urlmon/rsrc.rc | 8 +++++++- dlls/urlmon/version.rc | 27 --------------------------- 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/dlls/urlmon/rsrc.rc b/dlls/urlmon/rsrc.rc index d71b2fa..c87ea81 100644 --- a/dlls/urlmon/rsrc.rc +++ b/dlls/urlmon/rsrc.rc @@ -19,4 +19,10 @@ /* @makedep: urlmon.inf */ REGINST REGINST urlmon.inf -#include "version.rc" +#define WINE_FILENAME_STR "urlmon.dll" +#define WINE_FILEVERSION 6,0,2800,1485 +#define WINE_FILEVERSION_STR "6.0.2800.1485" +#define WINE_PRODUCTVERSION 6,0,2800,1485 +#define WINE_PRODUCTVERSION_STR "6.0.2800.1485" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/urlmon/version.rc b/dlls/urlmon/version.rc deleted file mode 100644 index 10cc721..0000000 --- a/dlls/urlmon/version.rc +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2005 - * - * Stefan Leichter - * - * 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 - */ - -#define WINE_FILENAME_STR "urlmon.dll" -#define WINE_FILEVERSION 6,0,2800,1485 -#define WINE_FILEVERSION_STR "6.0.2800.1485" -#define WINE_PRODUCTVERSION 6,0,2800,1485 -#define WINE_PRODUCTVERSION_STR "6.0.2800.1485" - -#include "wine/wine_common_ver.rc"

1 0