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

Michael Stefaniuc : user32: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

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

Alexandre Julliard : make_makefiles: Automatically update the source lists in the individual makefiles.
by Alexandre Julliard July 3, 2009

July 3, 2009

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"; + +(a)all_files = split /\0/, `git ls-files -c -z`; +(a)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

Frédéric Delanoy : hhctrl.ocx: Update French translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 90df7b139490a6692b0e16dc2f0e5b1169697618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90df7b139490a6692b0e16dc2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 3 02:08:06 2009 +0200 hhctrl.ocx: Update French translation. --- dlls/hhctrl.ocx/Fr.rc | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/hhctrl.ocx/Fr.rc b/dlls/hhctrl.ocx/Fr.rc index 206479e..2146a3c 100644 --- a/dlls/hhctrl.ocx/Fr.rc +++ b/dlls/hhctrl.ocx/Fr.rc @@ -21,6 +21,9 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE @@ -35,9 +38,9 @@ STRINGTABLE BEGIN IDTB_EXPAND "Afficher" IDTB_CONTRACT "Cacher" - IDTB_STOP "Arr�ter" + IDTB_STOP "Arrêter" IDTB_REFRESH "A&ctualiser" - IDTB_BACK "Pr�c�dent" + IDTB_BACK "Précédent" IDTB_HOME "Sommaire" IDTB_SYNC "Synchroniser" IDTB_PRINT "Imprimer" @@ -51,8 +54,8 @@ BEGIN IDTB_SEARCH "IDTB_SEARCH" IDTB_HISTORY "IDTB_HISTORY" IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Jump1" - IDTB_JUMP2 "Jump2" + IDTB_JUMP1 "Saut1" + IDTB_JUMP2 "Saut2" IDTB_CUSTOMIZE "Personnaliser" IDTB_ZOOM "Zoom" IDTB_TOC_NEXT "IDTB_TOC_NEXT"

1 0

Frédéric Delanoy : gphoto2.ds: Update French translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: e400b153782a845eba02541b6c42fa7d354ca5e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e400b153782a845eba02541b6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 3 01:57:07 2009 +0200 gphoto2.ds: Update French translation. --- dlls/gphoto2.ds/gphoto2_Fr.rc | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Fr.rc b/dlls/gphoto2.ds/gphoto2_Fr.rc index 3d5d6d5..39267e3 100644 --- a/dlls/gphoto2.ds/gphoto2_Fr.rc +++ b/dlls/gphoto2.ds/gphoto2_Fr.rc @@ -2,6 +2,7 @@ * French resources for Twain * * Copyright 2006 Jonathan Ernst + * Copyright 2009 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,21 +21,24 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Files on Camera" +CAPTION "Fichiers sur l'appareil photo" MENU 20545 FONT 8, "MS Sans Serif" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | WS_TABSTOP,7,7,358,229 - DEFPUSHBUTTON "Importer la s�lection",IDC_IMPORT,152,252,72,14 - PUSHBUTTON "Preview",IDC_FETCH,7,252,64,14 - PUSHBUTTON "Importer tous",IDC_IMPORTALL,80,252,64,14 - CONTROL "Skip This Dialog",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + DEFPUSHBUTTON "Importer la sélection",IDC_IMPORT,152,252,72,14 + PUSHBUTTON "Prévisualiser",IDC_FETCH,7,252,64,14 + PUSHBUTTON "Tout importer",IDC_IMPORTALL,80,252,64,14 + CONTROL "Sauter ce dialogue",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 PUSHBUTTON "Fermer",IDC_EXIT,315,252,50,14 END @@ -48,10 +52,10 @@ END IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER -CAPTION "Connexion � l'appareil photo" +CAPTION "Connexion à l'appareil photo" FONT 8, "MS Sans Serif" BEGIN CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 - LTEXT "Connexion � l'appareil photo... Veuillez patienter",IDC_STATIC,128,58, + LTEXT "Connexion à l'appareil photo... Veuillez patienter",IDC_STATIC,128,58, 116,8 END

1 0

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

July 3, 2009

Module: wine Branch: master Commit: a1b286086e11e68e9b11836e1df2a4e5eb2c45b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b286086e11e68e9b11836e1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 11:49:34 2009 +0200 ole32: Import the content of version.rc into the main rc file. There is no need for a separate file. --- dlls/ole32/ole32res.rc | 14 ++++---------- dlls/ole32/version.rc | 24 ------------------------ 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/dlls/ole32/ole32res.rc b/dlls/ole32/ole32res.rc index 0a649a6..60887a5 100644 --- a/dlls/ole32/ole32res.rc +++ b/dlls/ole32/ole32res.rc @@ -23,7 +23,10 @@ #include "winuser.h" #include "winnls.h" -#include "version.rc" +#define WINE_OLESELFREGISTER +#define WINE_FILENAME_STR "ole32.dll" + +#include <wine/wine_common_ver.rc> /* * Everything that does not depend on language, @@ -44,12 +47,3 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: drag_link.cur */ 3 CURSOR drag_link.cur - - -/* - * Everything specific to any language goes - * in one of the specific files. - * Note that you can and may override resources - * which also have a neutral version. This is to - * get localized bitmaps for example. - */ diff --git a/dlls/ole32/version.rc b/dlls/ole32/version.rc deleted file mode 100644 index fb85ade..0000000 --- a/dlls/ole32/version.rc +++ /dev/null @@ -1,24 +0,0 @@ -/* - * version information for ole32.dll - * - * Copyright (C) 2003 John K. Hohm - * - * 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_OLESELFREGISTER -#define WINE_FILENAME_STR "ole32.dll" - -#include <wine/wine_common_ver.rc>

1 0

Frédéric Delanoy : msi: Update French translation .
by Alexandre Julliard July 3, 2009

July 3, 2009

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

Rein Klazes : comdlg32/tests: fix a few test failures on Vista and higher.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: b46f8b1b32ec7036af3fc32c2f596f62be1f1c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46f8b1b32ec7036af3fc32c2… Author: Rein Klazes <wijn(a)online.nl> Date: Fri Jul 3 11:46:23 2009 +0200 comdlg32/tests: fix a few test failures on Vista and higher. --- dlls/comdlg32/tests/filedlg.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 6272f72..da51246 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -457,7 +457,7 @@ static LONG_PTR WINAPI test_ok_wndproc(HWND dlg, UINT msg, WPARAM wParam, LPARAM msgFILEOKSTRING = RegisterWindowMessageA( FILEOKSTRING); } if( msg == WM_NOTIFY) { - if(((LPNMHDR)lParam)->code == CDN_INITDONE) { + if(((LPNMHDR)lParam)->code == CDN_FOLDERCHANGE) { SetTimer( dlg, 0, 100, 0); PostMessage( parent, WM_COMMAND, IDOK, 0); return FALSE; @@ -520,9 +520,9 @@ static void test_ok(void) : (LPOFNHOOKPROC) test_ok_wndproc; ret = GetOpenFileNameA(&ofn); ok( ok_testcases[i].expclose == ok_testcases[i].actclose, - "Open File dialog should %shave closed.\n", + "testid %d: Open File dialog should %shave closed.\n", i, ok_testcases[i].expclose ? "" : "NOT "); - ok(ret == ok_testcases[i].expclose, "GetOpenFileName returned %#x\n", ret); + ok(ret == ok_testcases[i].expclose, "testid %d: GetOpenFileName returned %#x\n", i, ret); ret = CommDlgExtendedError(); ok(!ret, "CommDlgExtendedError returned %#x\n", ret); }

1 0

Hans Leidekker : iphlpapi/tests: Initialize a variable.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 91b6ebefa89cb8e71330348b39835dca78e63ff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91b6ebefa89cb8e71330348b3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 3 11:31:10 2009 +0200 iphlpapi/tests: Initialize a variable. --- dlls/iphlpapi/tests/iphlpapi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index f879c93..eaada07 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -829,6 +829,7 @@ static void test_GetAdaptersAddresses(void) ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, NULL); ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", ret); + size = 0; ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &size); ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); if (ret != ERROR_BUFFER_OVERFLOW) return;

1 0

Hans Leidekker : ole32: Use existing MTA in CoGetContextToken and CoGetObjectContext.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 6986d97f18730710aad132989104df5dee45c99f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6986d97f18730710aad132989… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 3 11:32:08 2009 +0200 ole32: Use existing MTA in CoGetContextToken and CoGetObjectContext. --- dlls/ole32/compobj.c | 18 +++++++++-- dlls/ole32/tests/compobj.c | 70 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 83 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 739c86d..7403b95 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4050,8 +4050,12 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) *ppv = NULL; if (!apt) { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; + if (!(apt = apartment_find_multi_threaded())) + { + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; + } + apartment_release(apt); } context = HeapAlloc(GetProcessHeap(), 0, sizeof(*context)); @@ -4089,7 +4093,15 @@ HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ) return E_OUTOFMEMORY; if (!info->apt) - return CO_E_NOTINITIALIZED; + { + APARTMENT *apt; + if (!(apt = apartment_find_multi_threaded())) + { + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; + } + apartment_release(apt); + } if (!token) return E_POINTER; diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index ff2462f..1435984 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1082,6 +1082,9 @@ static void test_CoGetObjectContext(void) IObjContext *pObjContext; APTTYPE apttype; THDTYPE thdtype; + struct info info; + HANDLE thread; + DWORD tid, exitcode; if (!pCoGetObjectContext) { @@ -1093,6 +1096,36 @@ static void test_CoGetObjectContext(void) ok(hr == CO_E_NOTINITIALIZED, "CoGetObjectContext should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); ok(pComThreadingInfo == NULL, "pComThreadingInfo should have been set to NULL\n"); + /* show that COM doesn't have to be initialized for multi-threaded apartments if another + thread has already done so */ + + info.wait = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + info.stop = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(info.stop != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + thread = CreateThread(NULL, 0, ole_initialize_thread, &info, 0, &tid); + ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); + + WaitForSingleObject(info.wait, INFINITE); + + pComThreadingInfo = NULL; + hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); + ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + IComThreadingInfo_Release(pComThreadingInfo); + + SetEvent(info.stop); + WaitForSingleObject(thread, INFINITE); + + GetExitCodeThread(thread, &exitcode); + hr = exitcode; + ok(hr == S_OK, "thread should have returned S_OK instead of 0x%08x\n", hr); + + CloseHandle(thread); + CloseHandle(info.wait); + CloseHandle(info.stop); + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); @@ -1260,6 +1293,9 @@ static void test_CoGetContextToken(void) ULONG refs; ULONG_PTR token; IObjContext *ctx; + struct info info; + HANDLE thread; + DWORD tid, exitcode; if (!pCoGetContextToken) { @@ -1272,6 +1308,36 @@ static void test_CoGetContextToken(void) ok(hr == CO_E_NOTINITIALIZED, "Expected CO_E_NOTINITIALIZED, got 0x%08x\n", hr); ok(token == 0xdeadbeef, "Expected 0, got 0x%lx\n", token); + /* show that COM doesn't have to be initialized for multi-threaded apartments if another + thread has already done so */ + + info.wait = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + info.stop = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(info.stop != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + thread = CreateThread(NULL, 0, ole_initialize_thread, &info, 0, &tid); + ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); + + WaitForSingleObject(info.wait, INFINITE); + + token = 0; + hr = pCoGetContextToken(&token); + ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + IUnknown_Release((IUnknown *)token); + + SetEvent(info.stop); + WaitForSingleObject(thread, INFINITE); + + GetExitCodeThread(thread, &exitcode); + hr = exitcode; + ok(hr == S_OK, "thread should have returned S_OK instead of 0x%08x\n", hr); + + CloseHandle(thread); + CloseHandle(info.wait); + CloseHandle(info.stop); + CoInitialize(NULL); hr = pCoGetContextToken(NULL); @@ -1283,10 +1349,10 @@ static void test_CoGetContextToken(void) ok(token, "Expected token != 0\n"); refs = IUnknown_AddRef((IUnknown *)token); - todo_wine ok(refs == 1, "Expected 1, got %u\n", refs); + ok(refs == 1, "Expected 1, got %u\n", refs); refs = IUnknown_Release((IUnknown *)token); - todo_wine ok(refs == 0, "Expected 0, got %u\n", refs); + ok(refs == 0, "Expected 0, got %u\n", refs); hr = pCoGetObjectContext(&IID_IObjContext, (void **)&ctx); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr);

1 0

Hans Leidekker : wintrust/tests: Initialize a variable.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 44db8883f86bd96f5cf8e565f45445efaf7b75d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44db8883f86bd96f5cf8e565f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 3 11:31:36 2009 +0200 wintrust/tests: Initialize a variable. --- dlls/wintrust/tests/asn.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index 308fb8b..a4f4fbb 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -725,6 +725,7 @@ static void test_decodeCatNameValue(void) DWORD size; CAT_NAMEVALUE *value; + buf = NULL; ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, emptyCatNameValue, sizeof(emptyCatNameValue), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); @@ -739,6 +740,7 @@ static void test_decodeCatNameValue(void) value->Value.cbData); LocalFree(buf); } + buf = NULL; ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, catNameValueWithTag, sizeof(catNameValueWithTag), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); @@ -754,6 +756,7 @@ static void test_decodeCatNameValue(void) value->Value.cbData); LocalFree(buf); } + buf = NULL; ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, catNameValueWithFlags, sizeof(catNameValueWithFlags), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); @@ -768,6 +771,7 @@ static void test_decodeCatNameValue(void) value->Value.cbData); LocalFree(buf); } + buf = NULL; ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, catNameValueWithValue, sizeof(catNameValueWithValue), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size);

1 0

Hans Leidekker : fusion/tests: Initialize a variable.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 9ae618f98c6f34befadc10c938164bcf7f9e6736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae618f98c6f34befadc10c93… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 3 11:30:48 2009 +0200 fusion/tests: Initialize a variable. --- dlls/fusion/tests/asmname.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 442f00f..864ded5 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -726,6 +726,7 @@ static void test_CreateAssemblyNameObject(void) ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; + str[0] = '\0'; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); todo_wine

1 0

Alexandre Julliard : widl: Struct alignment should be the largest alignment of all the struct members .
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 064775c9a0acfa0e302008c863af158b914ed7d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=064775c9a0acfa0e302008c86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 12:02:07 2009 +0200 widl: Struct alignment should be the largest alignment of all the struct members. --- tools/widl/typegen.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 861dada..5abf575 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1083,7 +1083,6 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align) { - int have_align = FALSE; unsigned int size = 0; const var_t *v; @@ -1092,11 +1091,7 @@ static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align { unsigned int falign = 0; unsigned int fsize = type_memsize(v->type, &falign); - if (!have_align) - { - *align = falign; - have_align = TRUE; - } + if (*align < falign) *align = falign; size = ROUND_SIZE(size, falign); size += fsize; } @@ -1128,7 +1123,7 @@ static unsigned int union_memsize(const var_list_t *fields, unsigned int *pmaxa) int get_padding(const var_list_t *fields) { unsigned short offset = 0; - int salign = -1; + unsigned int salign = 1; const var_t *f; if (!fields) @@ -1139,8 +1134,7 @@ int get_padding(const var_list_t *fields) type_t *ft = f->type; unsigned int align = 0; unsigned int size = type_memsize(ft, &align); - if (salign == -1) - salign = align; + if (align > salign) salign = align; offset = ROUND_SIZE(offset, align); offset += size; } @@ -2202,7 +2196,7 @@ static void write_struct_members(FILE *file, const type_t *type, { const var_t *field; unsigned short offset = 0; - int salign = -1; + unsigned int salign = 1; int padding; var_list_t *fields = type_struct_get_fields(type); @@ -2213,8 +2207,7 @@ static void write_struct_members(FILE *file, const type_t *type, { unsigned int align = 0; unsigned int size = type_memsize(ft, &align); - if (salign == -1) - salign = align; + if (salign < align) salign = align; if ((align - 1) & offset) { unsigned char fc = 0;

1 0

Henri Verbeet : wined3d: Don' t accept NULL as a valid result from glGetString().
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 17688365ed8a2f191e2a9f234bb43d053c64a1f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17688365ed8a2f191e2a9f234… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 3 09:39:22 2009 +0200 wined3d: Don't accept NULL as a valid result from glGetString(). --- dlls/wined3d/directx.c | 759 ++++++++++++++++++++++++++---------------------- 1 files changed, 411 insertions(+), 348 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17688365ed8a2f191e2a9…

1 0

Nikolay Sivov : comctl32/listview: Remove parent creation test. It' s unrelated to ListView.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: ab527a6e0f3633332d74f28459f6e8c64f602b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab527a6e0f3633332d74f2845… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jul 3 12:36:24 2009 +0400 comctl32/listview: Remove parent creation test. It's unrelated to ListView. --- dlls/comctl32/tests/listview.c | 27 --------------------------- 1 files changed, 0 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index d5bcbf5..d959deb 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -89,31 +89,6 @@ static HWND subclass_editbox(HWND hwndListview); static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; -static const struct message create_parent_wnd_seq[] = { - { WM_GETMINMAXINFO, sent }, - { WM_NCCREATE, sent }, - { WM_NCCALCSIZE, sent|wparam, 0 }, - { WM_CREATE, sent }, - { WM_SHOWWINDOW, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_QUERYNEWPALETTE, sent|optional }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGED, sent|optional }, - { WM_NCCALCSIZE, sent|wparam|optional, 1 }, - { WM_ACTIVATEAPP, sent|wparam, 1 }, - { WM_NCACTIVATE, sent|wparam, 1 }, - { WM_ACTIVATE, sent|wparam, 1 }, - { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, - { WM_IME_NOTIFY, sent|defwinproc|optional }, - { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, - /* Win9x adds SWP_NOZORDER below */ - { WM_WINDOWPOSCHANGED, sent, /*|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE*/ }, - { WM_NCCALCSIZE, sent|wparam|optional, 1 }, - { WM_SIZE, sent }, - { WM_MOVE, sent }, - { 0 } -}; - static const struct message create_ownerdrawfixed_parent_seq[] = { { WM_NOTIFYFORMAT, sent }, { WM_QUERYUISTATE, sent|optional }, /* Win2K and higher */ @@ -3707,9 +3682,7 @@ START_TEST(listview) init_msg_sequences(sequences, NUM_MSG_SEQUENCES); - flush_sequences(sequences, NUM_MSG_SEQUENCES); hwndparent = create_parent_window(FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, create_parent_wnd_seq, "create parent window", TRUE); flush_sequences(sequences, NUM_MSG_SEQUENCES); g_is_below_5 = is_below_comctl_5();

1 0

Alexandre Julliard : widl: Skip the existing correlation descriptor on unencapsulated unions when generating a different one .
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: fc7681a8ceae63a2d5c66a157e30338ed8a8f92a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc7681a8ceae63a2d5c66a157… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 11:44:10 2009 +0200 widl: Skip the existing correlation descriptor on unencapsulated unions when generating a different one. --- tools/widl/typegen.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b60a53c..861dada 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1521,8 +1521,11 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) type_t *ft = f->type; if (type_get_type(ft) == TYPE_UNION && is_attr(f->attrs, ATTR_SWITCHIS)) { + short reloff; unsigned int absoff = ft->typestring_offset; - short reloff = absoff - (*tfsoff + 6); + if (is_attr(ft->attrs, ATTR_SWITCHTYPE)) + absoff += 8; /* we already have a corr descr, skip it */ + reloff = absoff - (*tfsoff + 6); print_file(file, 0, "/* %d */\n", *tfsoff); print_file(file, 2, "0x%x,\t/* FC_NON_ENCAPSULATED_UNION */\n", RPC_FC_NON_ENCAPSULATED_UNION); print_file(file, 2, "0x%x,\t/* FIXME: always FC_LONG */\n", RPC_FC_LONG); @@ -2509,6 +2512,7 @@ static unsigned int write_union_tfs(FILE *file, type_t *type, unsigned int *tfso *tfsoff += write_conf_or_var_desc(file, NULL, *tfsoff, st, &dummy_expr ); print_file(file, 2, "NdrFcShort(0x2),\t/* Offset= 2 (%u) */\n", *tfsoff + 2); *tfsoff += 2; + print_file(file, 0, "/* %u */\n", *tfsoff); } print_file(file, 2, "NdrFcShort(0x%hx),\t/* %d */\n", size, size);

1 0

Alexandre Julliard : widl: Take into account structure field alignment when computing offsets.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: f6d2b49145e16cacc694f08b5b4442358c7c6718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6d2b49145e16cacc694f08b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 12:02:30 2009 +0200 widl: Take into account structure field alignment when computing offsets. --- tools/widl/typegen.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5abf575..9b39c63 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -59,6 +59,7 @@ struct expr_eval_routine const expr_t *expr; }; +static unsigned int field_memsize(const type_t *type, unsigned int *offset); static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align); static unsigned int write_struct_tfs(FILE *file, type_t *type, const char *name, unsigned int *tfsoff); static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *type, @@ -978,14 +979,13 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, if (fields) LIST_FOR_EACH_ENTRY( var, fields, const var_t, entry ) { - unsigned int align = 0; - /* FIXME: take alignment into account */ + unsigned int size = field_memsize( var->type, &offset ); if (var->name && !strcmp(var->name, subexpr->u.sval)) { correlation_variable = var->type; break; } - offset += type_memsize(var->type, &align); + offset += size; } if (!correlation_variable) error("write_conf_or_var_desc: couldn't find variable %s in structure\n", @@ -1081,6 +1081,16 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, return 4; } +/* return size and start offset of a data field based on current offset */ +static unsigned int field_memsize(const type_t *type, unsigned int *offset) +{ + unsigned int align = 0; + unsigned int size = type_memsize( type, &align ); + + *offset = ROUND_SIZE( *offset, align ); + return size; +} + static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align) { unsigned int size = 0; @@ -1511,8 +1521,8 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) if (fs) LIST_FOR_EACH_ENTRY(f, fs, var_t, entry) { - unsigned int align = 0; type_t *ft = f->type; + unsigned int size = field_memsize( ft, &offset ); if (type_get_type(ft) == TYPE_UNION && is_attr(f->attrs, ATTR_SWITCHIS)) { short reloff; @@ -1529,9 +1539,7 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) reloff, reloff, absoff); *tfsoff += 8; } - - /* FIXME: take alignment into account */ - offset += type_memsize(ft, &align); + offset += size; } }

1 0

Alexandre Julliard : widl: An ENUM16 is 32-bit wide in memory.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: d375d25d653f01a7f7e9fc37e885d2e6cb1fe482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d375d25d653f01a7f7e9fc37e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 12:06:31 2009 +0200 widl: An ENUM16 is 32-bit wide in memory. --- tools/widl/typegen.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9b39c63..3a5e2e5 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1194,14 +1194,11 @@ unsigned int type_memsize(const type_t *t, unsigned int *align) case TYPE_ENUM: switch (get_enum_fc(t)) { + case RPC_FC_ENUM16: case RPC_FC_ENUM32: size = 4; if (size > *align) *align = size; break; - case RPC_FC_ENUM16: - size = 2; - if (size > *align) *align = size; - break; default: error("type_memsize: Unknown enum type\n"); size = 0;

1 0

Henri Verbeet : wined3d: Don' t abuse blending to disable color writes in surface_depth_blt().
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 532b99078e5e04faf97a9e24138243a65393f6b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=532b99078e5e04faf97a9e241… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 3 09:39:21 2009 +0200 wined3d: Don't abuse blending to disable color writes in surface_depth_blt(). --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3e0413e..454a86f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4334,14 +4334,14 @@ static void surface_depth_blt(IWineD3DSurfaceImpl *This, GLuint texture, GLsizei glPushAttrib(GL_ENABLE_BIT | GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_VIEWPORT_BIT); glDisable(GL_CULL_FACE); - glEnable(GL_BLEND); + glDisable(GL_BLEND); glDisable(GL_ALPHA_TEST); glDisable(GL_SCISSOR_TEST); glDisable(GL_STENCIL_TEST); glEnable(GL_DEPTH_TEST); glDepthFunc(GL_ALWAYS); glDepthMask(GL_TRUE); - glBlendFunc(GL_ZERO, GL_ONE); + glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); glViewport(0, 0, w, h); surface_get_depth_blt_info(target, w, h, &info);

1 0

Henri Verbeet : wined3d: Get rid of wined3d_fake_gl_context_cs.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 23ce9d72b8b29525828b1270a8361ea02f4f9858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23ce9d72b8b29525828b1270a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 3 09:39:19 2009 +0200 wined3d: Get rid of wined3d_fake_gl_context_cs. --- dlls/wined3d/directx.c | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 513fbfe..b8534a6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -204,20 +204,8 @@ struct wined3d_fake_gl_ctx HGLRC gl_ctx; }; -static CRITICAL_SECTION wined3d_fake_gl_context_cs; -static CRITICAL_SECTION_DEBUG wined3d_fake_gl_context_cs_debug = -{ - 0, 0, &wined3d_fake_gl_context_cs, - { &wined3d_fake_gl_context_cs_debug.ProcessLocksList, - &wined3d_fake_gl_context_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": wined3d_fake_gl_context_cs") } -}; -static CRITICAL_SECTION wined3d_fake_gl_context_cs = { &wined3d_fake_gl_context_cs_debug, -1, 0, 0, 0, 0 }; - static void WineD3D_ReleaseFakeGLContext(struct wined3d_fake_gl_ctx *ctx) { - EnterCriticalSection(&wined3d_fake_gl_context_cs); - TRACE_(d3d_caps)("Destroying fake GL context.\n"); if (!pwglMakeCurrent(NULL, NULL)) @@ -228,8 +216,6 @@ static void WineD3D_ReleaseFakeGLContext(struct wined3d_fake_gl_ctx *ctx) pwglDeleteContext(ctx->gl_ctx); ReleaseDC(ctx->wnd, ctx->dc); DestroyWindow(ctx->wnd); - - LeaveCriticalSection(&wined3d_fake_gl_context_cs); } static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) @@ -237,8 +223,6 @@ static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) PIXELFORMATDESCRIPTOR pfd; int iPixelFormat; - EnterCriticalSection(&wined3d_fake_gl_context_cs); - TRACE("getting context...\n"); /* We need a fake window as a hdc retrieved using GetDC(0) can't be used for much GL purposes. */ @@ -292,7 +276,6 @@ static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) } context_set_last_device(NULL); - LeaveCriticalSection(&wined3d_fake_gl_context_cs); return TRUE; fail: @@ -303,7 +286,6 @@ fail: if (ctx->wnd) DestroyWindow(ctx->wnd); ctx->wnd = NULL; - LeaveCriticalSection(&wined3d_fake_gl_context_cs); return FALSE; }

1 0

Michael Stefaniuc : msacm32: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 9bb0f9c723a00703ab29ea9c015e1ffa354548da URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb0f9c723a00703ab29ea9c0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:38:29 2009 +0200 msacm32: Build language resource files separately. Do not include them from an other rc file. --- dlls/msacm32/Makefile.in | 23 ++++++++++++++++++++++- dlls/msacm32/msacm.rc | 46 ---------------------------------------------- dlls/msacm32/msacm_Cs.rc | 2 ++ dlls/msacm32/msacm_Da.rc | 2 ++ dlls/msacm32/msacm_De.rc | 2 ++ dlls/msacm32/msacm_En.rc | 2 ++ dlls/msacm32/msacm_Es.rc | 2 ++ dlls/msacm32/msacm_Fr.rc | 2 ++ dlls/msacm32/msacm_Hu.rc | 2 ++ dlls/msacm32/msacm_It.rc | 2 ++ dlls/msacm32/msacm_Ja.rc | 4 ++-- dlls/msacm32/msacm_Ko.rc | 2 ++ dlls/msacm32/msacm_Lt.rc | 4 ++-- dlls/msacm32/msacm_Nl.rc | 2 ++ dlls/msacm32/msacm_No.rc | 2 ++ dlls/msacm32/msacm_Pl.rc | 3 +++ dlls/msacm32/msacm_Pt.rc | 2 ++ dlls/msacm32/msacm_Ro.rc | 4 ++-- dlls/msacm32/msacm_Ru.rc | 2 ++ dlls/msacm32/msacm_Si.rc | 4 ++-- dlls/msacm32/msacm_Sv.rc | 2 ++ dlls/msacm32/msacm_Tr.rc | 2 ++ dlls/msacm32/msacm_Zh.rc | 4 ++-- dlls/msacm32/wineacm.h | 3 +++ 24 files changed, 68 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bb0f9c723a00703ab29e…

1 0

Michael Stefaniuc : winmm: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 0b16b40148f03318281a8b5ac67a5b4953b25e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b16b40148f03318281a8b5ac… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:38:04 2009 +0200 winmm: Build language resource files separately. Do not include them from an other rc file. --- dlls/winmm/Makefile.in | 21 ++++++++++++++++++++- dlls/winmm/winmm_Cs.rc | 3 +++ dlls/winmm/winmm_Da.rc | 3 +++ dlls/winmm/winmm_De.rc | 3 +++ dlls/winmm/winmm_En.rc | 3 +++ dlls/winmm/winmm_Es.rc | 3 +++ dlls/winmm/winmm_Fr.rc | 3 +++ dlls/winmm/winmm_It.rc | 3 +++ dlls/winmm/winmm_Ja.rc | 5 +++-- dlls/winmm/winmm_Ko.rc | 3 +++ dlls/winmm/winmm_Lt.rc | 5 +++-- dlls/winmm/winmm_Nl.rc | 3 +++ dlls/winmm/winmm_No.rc | 3 +++ dlls/winmm/winmm_Pl.rc | 3 +++ dlls/winmm/winmm_Pt.rc | 3 +++ dlls/winmm/winmm_Ru.rc | 3 +++ dlls/winmm/winmm_Si.rc | 5 +++-- dlls/winmm/winmm_Sk.rc | 3 +++ dlls/winmm/winmm_Tr.rc | 3 +++ dlls/winmm/winmm_res.rc | 24 ------------------------ 20 files changed, 74 insertions(+), 31 deletions(-) diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index a8ebc62..64c7b5b 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -24,7 +24,26 @@ C_SRCS16 = \ SPEC_SRCS16 = \ mmsystem.spec -RC_SRCS = winmm_res.rc +RC_SRCS = \ + winmm_Cs.rc \ + winmm_Da.rc \ + winmm_De.rc \ + winmm_En.rc \ + winmm_Es.rc \ + winmm_Fr.rc \ + winmm_It.rc \ + winmm_Ja.rc \ + winmm_Ko.rc \ + winmm_Lt.rc \ + winmm_Nl.rc \ + winmm_No.rc \ + winmm_Pl.rc \ + winmm_Pt.rc \ + winmm_Ru.rc \ + winmm_Si.rc \ + winmm_Sk.rc \ + winmm_Tr.rc \ + winmm_res.rc @MAKE_DLL_RULES@ diff --git a/dlls/winmm/winmm_Cs.rc b/dlls/winmm/winmm_Cs.rc index aa4cd63..36604d4 100644 --- a/dlls/winmm/winmm_Cs.rc +++ b/dlls/winmm/winmm_Cs.rc @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + /* Czech strings in CP1250 */ STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL diff --git a/dlls/winmm/winmm_Da.rc b/dlls/winmm/winmm_Da.rc index feeb9de..7f55353 100644 --- a/dlls/winmm/winmm_Da.rc +++ b/dlls/winmm/winmm_Da.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT BEGIN diff --git a/dlls/winmm/winmm_De.rc b/dlls/winmm/winmm_De.rc index 4b16e17..1ba3cae 100644 --- a/dlls/winmm/winmm_De.rc +++ b/dlls/winmm/winmm_De.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_En.rc b/dlls/winmm/winmm_En.rc index dd3e56c..1a945d8 100644 --- a/dlls/winmm/winmm_En.rc +++ b/dlls/winmm/winmm_En.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT BEGIN diff --git a/dlls/winmm/winmm_Es.rc b/dlls/winmm/winmm_Es.rc index 5d22f7b..8713075 100644 --- a/dlls/winmm/winmm_Es.rc +++ b/dlls/winmm/winmm_Es.rc @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_Fr.rc b/dlls/winmm/winmm_Fr.rc index de66778..665988e 100644 --- a/dlls/winmm/winmm_Fr.rc +++ b/dlls/winmm/winmm_Fr.rc @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/winmm/winmm_It.rc b/dlls/winmm/winmm_It.rc index 91d5818..f4c2fa0 100644 --- a/dlls/winmm/winmm_It.rc +++ b/dlls/winmm/winmm_It.rc @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_Ja.rc b/dlls/winmm/winmm_Ja.rc index 1805ac8..b8f1c53 100644 --- a/dlls/winmm/winmm_Ja.rc +++ b/dlls/winmm/winmm_Ja.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + /* UTF-8 */ #pragma code_page(65001) @@ -127,5 +130,3 @@ MCIERR_SEQ_PORTUNSPECIFIED, "システムに現在のMIDIポートが指定さ MCIERR_SEQ_TIMER, "全てのマルチメディアタイマは他のアプリケーションによって使用されています。タイマを使用しているアプリケーションを一つ終了してからやり直して下さい。" END - -#pragma code_page(default) diff --git a/dlls/winmm/winmm_Ko.rc b/dlls/winmm/winmm_Ko.rc index 1d5c074..bf7c8a5 100644 --- a/dlls/winmm/winmm_Ko.rc +++ b/dlls/winmm/winmm_Ko.rc @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT BEGIN diff --git a/dlls/winmm/winmm_Lt.rc b/dlls/winmm/winmm_Lt.rc index 4988036..6cb9981 100644 --- a/dlls/winmm/winmm_Lt.rc +++ b/dlls/winmm/winmm_Lt.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + /* UTF-8 */ #pragma code_page(65001) @@ -129,5 +132,3 @@ MCIERR_SEQ_PORTUNSPECIFIED, "Sistemoje nėra nurodytas dabartinis MIDI prie MCIERR_SEQ_TIMER, "Visi įvairialypės terpės laikmačiai yra naudojami kitų programų. Išeikite iš vienos tokios programos ir mėginkite vėl." END - -#pragma code_page(default) diff --git a/dlls/winmm/winmm_Nl.rc b/dlls/winmm/winmm_Nl.rc index 15f1535..ef8a7ad 100644 --- a/dlls/winmm/winmm_Nl.rc +++ b/dlls/winmm/winmm_Nl.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_No.rc b/dlls/winmm/winmm_No.rc index e2cbc30..511e4b3 100644 --- a/dlls/winmm/winmm_No.rc +++ b/dlls/winmm/winmm_No.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL BEGIN diff --git a/dlls/winmm/winmm_Pl.rc b/dlls/winmm/winmm_Pl.rc index c57c48b..5abf3f5 100644 --- a/dlls/winmm/winmm_Pl.rc +++ b/dlls/winmm/winmm_Pl.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_Pt.rc b/dlls/winmm/winmm_Pt.rc index 2da48d8..52adb07 100644 --- a/dlls/winmm/winmm_Pt.rc +++ b/dlls/winmm/winmm_Pt.rc @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN BEGIN diff --git a/dlls/winmm/winmm_Ru.rc b/dlls/winmm/winmm_Ru.rc index 9824cc5..3392260 100644 --- a/dlls/winmm/winmm_Ru.rc +++ b/dlls/winmm/winmm_Ru.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_Si.rc b/dlls/winmm/winmm_Si.rc index 04e6e1b..918e7f1 100644 --- a/dlls/winmm/winmm_Si.rc +++ b/dlls/winmm/winmm_Si.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + #pragma code_page(65001) STRINGTABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -126,5 +129,3 @@ MCIERR_SEQ_PORTUNSPECIFIED, "Zahtevana MIDI vrata niso nameščena." MCIERR_SEQ_TIMER, "Vsi većpredstavnostni števci so zasedeni. Zaprite enega od večpredstavnostih programov in poskusite znova." END - -#pragma code_page(default) diff --git a/dlls/winmm/winmm_Sk.rc b/dlls/winmm/winmm_Sk.rc index 80030c2..d9345ec 100644 --- a/dlls/winmm/winmm_Sk.rc +++ b/dlls/winmm/winmm_Sk.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_SLOVAK, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_Tr.rc b/dlls/winmm/winmm_Tr.rc index 36d5693..6c8a73e 100644 --- a/dlls/winmm/winmm_Tr.rc +++ b/dlls/winmm/winmm_Tr.rc @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT BEGIN diff --git a/dlls/winmm/winmm_res.rc b/dlls/winmm/winmm_res.rc index 676c185..808220d 100644 --- a/dlls/winmm/winmm_res.rc +++ b/dlls/winmm/winmm_res.rc @@ -23,31 +23,7 @@ */ #include "windef.h" -#include "winbase.h" #include "mmddk.h" -#include "winnls.h" - -/* Add your language specific defines here */ -#include "winmm_Cs.rc" -#include "winmm_Da.rc" -#include "winmm_De.rc" -#include "winmm_En.rc" -#include "winmm_Es.rc" -#include "winmm_Fr.rc" -#include "winmm_It.rc" -#include "winmm_Ko.rc" -#include "winmm_Lt.rc" -#include "winmm_Ja.rc" -#include "winmm_Nl.rc" -#include "winmm_No.rc" -#include "winmm_Pl.rc" -#include "winmm_Pt.rc" -#include "winmm_Ru.rc" -#include "winmm_Si.rc" -#include "winmm_Sk.rc" -#include "winmm_Tr.rc" - -/* do not add NLS specific stuff below that line */ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0

Michael Stefaniuc : wininet: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: d66c0921086f454be4343f32108bc8f94294981e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66c0921086f454be4343f321… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:38:15 2009 +0200 wininet: Build language resource files separately. Do not include them from an other rc file. --- dlls/wininet/Makefile.in | 28 +++++++++++++++++- dlls/wininet/resource.h | 3 ++ dlls/wininet/rsrc.rc | 67 -------------------------------------------- dlls/wininet/wininet_Bg.rc | 2 + dlls/wininet/wininet_Cs.rc | 2 + dlls/wininet/wininet_Da.rc | 2 + dlls/wininet/wininet_De.rc | 2 + dlls/wininet/wininet_En.rc | 2 + dlls/wininet/wininet_Eo.rc | 2 + dlls/wininet/wininet_Es.rc | 2 + dlls/wininet/wininet_Fi.rc | 2 + dlls/wininet/wininet_Fr.rc | 2 + dlls/wininet/wininet_Hu.rc | 2 + dlls/wininet/wininet_It.rc | 2 + dlls/wininet/wininet_Ja.rc | 4 +- dlls/wininet/wininet_Ko.rc | 2 + dlls/wininet/wininet_Lt.rc | 4 +- dlls/wininet/wininet_Nl.rc | 2 + dlls/wininet/wininet_No.rc | 2 + dlls/wininet/wininet_Pl.rc | 2 + dlls/wininet/wininet_Pt.rc | 2 + dlls/wininet/wininet_Ro.rc | 4 +- dlls/wininet/wininet_Ru.rc | 2 + dlls/wininet/wininet_Si.rc | 4 +- dlls/wininet/wininet_Sv.rc | 2 + dlls/wininet/wininet_Tr.rc | 2 + dlls/wininet/wininet_Uk.rc | 2 + dlls/wininet/wininet_Zh.rc | 4 +- 28 files changed, 79 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d66c0921086f454be4343…

1 0

Michael Stefaniuc : progman: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: b4b74945848aff46ef9903f518aab625da4260e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b74945848aff46ef9903f51… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:36:09 2009 +0200 progman: Build language resource files separately. Do not include them from an other rc file. --- programs/progman/Cs.rc | 2 + programs/progman/Da.rc | 2 + programs/progman/De.rc | 2 + programs/progman/En.rc | 2 + programs/progman/Es.rc | 2 + programs/progman/Fr.rc | 2 + programs/progman/Hu.rc | 2 + programs/progman/It.rc | 2 + programs/progman/Ko.rc | 2 + programs/progman/Lt.rc | 4 +- programs/progman/Makefile.in | 22 ++++++++++++++++++++- programs/progman/Nl.rc | 2 + programs/progman/No.rc | 2 + programs/progman/Pl.rc | 2 + programs/progman/Pt.rc | 2 + programs/progman/Ru.rc | 2 + programs/progman/Si.rc | 4 +- programs/progman/Sv.rc | 2 + programs/progman/Tr.rc | 2 + programs/progman/Zh.rc | 4 +- programs/progman/accel.rc | 3 ++ programs/progman/progman.h | 3 +- programs/progman/rsrc.rc | 43 ------------------------------------------ 23 files changed, 64 insertions(+), 51 deletions(-) diff --git a/programs/progman/Cs.rc b/programs/progman/Cs.rc index 07838b0..06139b9 100644 --- a/programs/progman/Cs.rc +++ b/programs/progman/Cs.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Czech strings in CP1250 */ /* Menu */ diff --git a/programs/progman/Da.rc b/programs/progman/Da.rc index b99c5f5..7e1438d 100644 --- a/programs/progman/Da.rc +++ b/programs/progman/Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT /* Menu */ diff --git a/programs/progman/De.rc b/programs/progman/De.rc index c94328c..b72118f 100644 --- a/programs/progman/De.rc +++ b/programs/progman/De.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/programs/progman/En.rc b/programs/progman/En.rc index 201deca..bd6aaaa 100644 --- a/programs/progman/En.rc +++ b/programs/progman/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT diff --git a/programs/progman/Es.rc b/programs/progman/Es.rc index 391a5e5..2888354 100644 --- a/programs/progman/Es.rc +++ b/programs/progman/Es.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL /* Menu */ diff --git a/programs/progman/Fr.rc b/programs/progman/Fr.rc index 39b3461..80ff466 100644 --- a/programs/progman/Fr.rc +++ b/programs/progman/Fr.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL /* Menu */ diff --git a/programs/progman/Hu.rc b/programs/progman/Hu.rc index 678d68d..9d53fb3 100644 --- a/programs/progman/Hu.rc +++ b/programs/progman/Hu.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT diff --git a/programs/progman/It.rc b/programs/progman/It.rc index 0c280f5..9e3437d 100644 --- a/programs/progman/It.rc +++ b/programs/progman/It.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL diff --git a/programs/progman/Ko.rc b/programs/progman/Ko.rc index 6c749f2..5c2cdd1 100644 --- a/programs/progman/Ko.rc +++ b/programs/progman/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/programs/progman/Lt.rc b/programs/progman/Lt.rc index ac55054..d484c55 100644 --- a/programs/progman/Lt.rc +++ b/programs/progman/Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ /* UTF-8 */ @@ -240,5 +242,3 @@ GARANTIJŲ; net be numanomų PERKAMUMO ar TINKAMUMO KONKREČIAI \ UŽDUOČIAI garantijų. Išsamią informaciją rasite GNU laisvojoje \ bendrojoje viešojoje licencijoje." } - -#pragma code_page(default) diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in index 9ed7859..921f9a8 100644 --- a/programs/progman/Makefile.in +++ b/programs/progman/Makefile.in @@ -14,7 +14,27 @@ C_SRCS = \ program.c \ string.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fr.rc \ + Hu.rc \ + It.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc \ + accel.rc @MAKE_PROG_RULES@ diff --git a/programs/progman/Nl.rc b/programs/progman/Nl.rc index 7b8c8d0..b2ca361 100644 --- a/programs/progman/Nl.rc +++ b/programs/progman/Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/programs/progman/No.rc b/programs/progman/No.rc index 1af4170..618e985 100644 --- a/programs/progman/No.rc +++ b/programs/progman/No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL diff --git a/programs/progman/Pl.rc b/programs/progman/Pl.rc index 626618c..351930c 100644 --- a/programs/progman/Pl.rc +++ b/programs/progman/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT diff --git a/programs/progman/Pt.rc b/programs/progman/Pt.rc index 227b767..98e4b86 100644 --- a/programs/progman/Pt.rc +++ b/programs/progman/Pt.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN /* Menu */ diff --git a/programs/progman/Ru.rc b/programs/progman/Ru.rc index 90d6302..7d6121b 100644 --- a/programs/progman/Ru.rc +++ b/programs/progman/Ru.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/programs/progman/Si.rc b/programs/progman/Si.rc index 1d394fd..1744705 100644 --- a/programs/progman/Si.rc +++ b/programs/progman/Si.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + #pragma code_page(65001) /* Menu */ @@ -244,5 +246,3 @@ 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." } - -#pragma code_page(default) diff --git a/programs/progman/Sv.rc b/programs/progman/Sv.rc index be43497..0d23948 100644 --- a/programs/progman/Sv.rc +++ b/programs/progman/Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL diff --git a/programs/progman/Tr.rc b/programs/progman/Tr.rc index a296331..6407acd 100644 --- a/programs/progman/Tr.rc +++ b/programs/progman/Tr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/programs/progman/Zh.rc b/programs/progman/Zh.rc index d42a3f2..d78ac76 100644 --- a/programs/progman/Zh.rc +++ b/programs/progman/Zh.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -410,5 +412,3 @@ IDS_LIBRARIES_DLL, "動態連接庫 (*.dll)" IDS_SYMBOL_FILES, "圖標檔案" IDS_SYMBOLS_ICO, "圖標 (*.ico)" } - -#pragma code_page(default) diff --git a/programs/progman/accel.rc b/programs/progman/accel.rc index c86c0f3..44edae5 100644 --- a/programs/progman/accel.rc +++ b/programs/progman/accel.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <winuser.h> +#include "progman.h" + ACCEL ACCELERATORS { VK_RETURN, PM_EXECUTE, VIRTKEY, ALT diff --git a/programs/progman/progman.h b/programs/progman/progman.h index 5f7504b..aa22c6d 100644 --- a/programs/progman/progman.h +++ b/programs/progman/progman.h @@ -26,7 +26,8 @@ #define MAX_PATHNAME_LEN 1024 #define MAX_LANGUAGE_NUMBER (PM_LAST_LANGUAGE - PM_FIRST_LANGUAGE) -#include "windows.h" +#include <windows.h> +#include <windef.h> /* Fallback icon */ #define DEFAULTICON OIC_WINLOGO diff --git a/programs/progman/rsrc.rc b/programs/progman/rsrc.rc deleted file mode 100644 index 167c201..0000000 --- a/programs/progman/rsrc.rc +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 1996 Ulrich Schmid - * - * 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 <windef.h> -#include <winuser.h> - -#include "progman.h" -#include "accel.rc" - -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fr.rc" -#include "Hu.rc" -#include "It.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc"

1 0

Michael Stefaniuc : winspool.drv: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 9d9eccc378a89c0b5a7779489a7a723f83d093c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9eccc378a89c0b5a7779489… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:38:43 2009 +0200 winspool.drv: Build language resource files separately. Do not include them from an other rc file. --- dlls/winspool.drv/Bg.rc | 2 ++ dlls/winspool.drv/Da.rc | 2 ++ dlls/winspool.drv/De.rc | 2 ++ dlls/winspool.drv/En.rc | 2 ++ dlls/winspool.drv/Eo.rc | 2 ++ dlls/winspool.drv/Es.rc | 2 ++ dlls/winspool.drv/Fi.rc | 2 ++ dlls/winspool.drv/Fr.rc | 2 ++ dlls/winspool.drv/It.rc | 2 ++ dlls/winspool.drv/Ko.rc | 2 ++ dlls/winspool.drv/Lt.rc | 4 ++-- dlls/winspool.drv/Makefile.in | 23 ++++++++++++++++++++++- dlls/winspool.drv/Nl.rc | 2 ++ dlls/winspool.drv/No.rc | 2 ++ dlls/winspool.drv/Pl.rc | 2 ++ dlls/winspool.drv/Pt.rc | 2 ++ dlls/winspool.drv/Ru.rc | 2 ++ dlls/winspool.drv/Si.rc | 4 ++-- dlls/winspool.drv/Sv.rc | 2 ++ dlls/winspool.drv/Tr.rc | 2 ++ dlls/winspool.drv/Zh.rc | 4 ++-- dlls/winspool.drv/winspool.rc | 25 ------------------------- dlls/winspool.drv/wspool.h | 3 +++ 23 files changed, 65 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d9eccc378a89c0b5a777…

1 0

Henri Verbeet : wined3d: Use a proper structure for storing initial GL context information.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 4cacf2e08ff40bfd114e269825d96f3aadbb0462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cacf2e08ff40bfd114e26982… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 3 09:39:18 2009 +0200 wined3d: Use a proper structure for storing initial GL context information. --- dlls/wined3d/directx.c | 109 +++++++++++++++++++++--------------------------- 1 files changed, 47 insertions(+), 62 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 87f6e89..513fbfe 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -197,9 +197,12 @@ glMultiTexCoordFunc multi_texcoord_funcs[WINED3D_FFP_EMIT_COUNT]; * function query some info from GL. */ -static BOOL wined3d_fake_gl_context_available = FALSE; -static HDC wined3d_fake_gl_context_hdc = NULL; -static HWND wined3d_fake_gl_context_hwnd = NULL; +struct wined3d_fake_gl_ctx +{ + HDC dc; + HWND wnd; + HGLRC gl_ctx; +}; static CRITICAL_SECTION wined3d_fake_gl_context_cs; static CRITICAL_SECTION_DEBUG wined3d_fake_gl_context_cs_debug = @@ -211,41 +214,27 @@ static CRITICAL_SECTION_DEBUG wined3d_fake_gl_context_cs_debug = }; static CRITICAL_SECTION wined3d_fake_gl_context_cs = { &wined3d_fake_gl_context_cs_debug, -1, 0, 0, 0, 0 }; -static void WineD3D_ReleaseFakeGLContext(void) { - HGLRC glCtx; - +static void WineD3D_ReleaseFakeGLContext(struct wined3d_fake_gl_ctx *ctx) +{ EnterCriticalSection(&wined3d_fake_gl_context_cs); - if(!wined3d_fake_gl_context_available) { - TRACE_(d3d_caps)("context not available\n"); - LeaveCriticalSection(&wined3d_fake_gl_context_cs); - return; - } + TRACE_(d3d_caps)("Destroying fake GL context.\n"); - glCtx = pwglGetCurrentContext(); - if (glCtx) + if (!pwglMakeCurrent(NULL, NULL)) { - TRACE_(d3d_caps)("destroying fake GL context\n"); - if (!pwglMakeCurrent(NULL, NULL)) - { - ERR("Failed to disable fake GL context.\n"); - } - pwglDeleteContext(glCtx); + ERR_(d3d_caps)("Failed to disable fake GL context.\n"); } - if (wined3d_fake_gl_context_hdc) - ReleaseDC(wined3d_fake_gl_context_hwnd, wined3d_fake_gl_context_hdc); - wined3d_fake_gl_context_hdc = NULL; /* Make sure we don't think that it is still around */ - if (wined3d_fake_gl_context_hwnd) - DestroyWindow(wined3d_fake_gl_context_hwnd); - wined3d_fake_gl_context_hwnd = NULL; - wined3d_fake_gl_context_available = FALSE; + + pwglDeleteContext(ctx->gl_ctx); + ReleaseDC(ctx->wnd, ctx->dc); + DestroyWindow(ctx->wnd); LeaveCriticalSection(&wined3d_fake_gl_context_cs); } -static BOOL WineD3D_CreateFakeGLContext(void) { +static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) +{ PIXELFORMATDESCRIPTOR pfd; - HGLRC glCtx = NULL; int iPixelFormat; EnterCriticalSection(&wined3d_fake_gl_context_cs); @@ -253,18 +242,18 @@ static BOOL WineD3D_CreateFakeGLContext(void) { TRACE("getting context...\n"); /* We need a fake window as a hdc retrieved using GetDC(0) can't be used for much GL purposes. */ - wined3d_fake_gl_context_hwnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", + ctx->wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL); - if (!wined3d_fake_gl_context_hwnd) + if (!ctx->wnd) { - ERR("HWND creation failed!\n"); + ERR_(d3d_caps)("Failed to create a window.\n"); goto fail; } - wined3d_fake_gl_context_hdc = GetDC(wined3d_fake_gl_context_hwnd); - if (!wined3d_fake_gl_context_hdc) + ctx->dc = GetDC(ctx->wnd); + if (!ctx->dc) { - ERR("GetDC failed!\n"); + ERR_(d3d_caps)("Failed to get a DC.\n"); goto fail; } @@ -277,43 +266,43 @@ static BOOL WineD3D_CreateFakeGLContext(void) { pfd.cColorBits = 32; pfd.iLayerType = PFD_MAIN_PLANE; - iPixelFormat = ChoosePixelFormat(wined3d_fake_gl_context_hdc, &pfd); + iPixelFormat = ChoosePixelFormat(ctx->dc, &pfd); if (!iPixelFormat) { /* If this happens something is very wrong as ChoosePixelFormat barely fails. */ - ERR("Can't find a suitable iPixelFormat.\n"); + ERR_(d3d_caps)("Can't find a suitable iPixelFormat.\n"); goto fail; } - DescribePixelFormat(wined3d_fake_gl_context_hdc, iPixelFormat, sizeof(pfd), &pfd); - SetPixelFormat(wined3d_fake_gl_context_hdc, iPixelFormat, &pfd); + DescribePixelFormat(ctx->dc, iPixelFormat, sizeof(pfd), &pfd); + SetPixelFormat(ctx->dc, iPixelFormat, &pfd); /* Create a GL context. */ - glCtx = pwglCreateContext(wined3d_fake_gl_context_hdc); - if (!glCtx) + ctx->gl_ctx = pwglCreateContext(ctx->dc); + if (!ctx->gl_ctx) { WARN_(d3d_caps)("Error creating default context for capabilities initialization.\n"); goto fail; } /* Make it the current GL context. */ - if (!pwglMakeCurrent(wined3d_fake_gl_context_hdc, glCtx)) + if (!pwglMakeCurrent(ctx->dc, ctx->gl_ctx)) { ERR_(d3d_caps)("Failed to make fake GL context current.\n"); goto fail; } context_set_last_device(NULL); - wined3d_fake_gl_context_available = TRUE; LeaveCriticalSection(&wined3d_fake_gl_context_cs); return TRUE; - fail: - if(wined3d_fake_gl_context_hdc) - ReleaseDC(wined3d_fake_gl_context_hwnd, wined3d_fake_gl_context_hdc); - wined3d_fake_gl_context_hdc = NULL; - if(wined3d_fake_gl_context_hwnd) - DestroyWindow(wined3d_fake_gl_context_hwnd); - wined3d_fake_gl_context_hwnd = NULL; - if(glCtx) pwglDeleteContext(glCtx); + +fail: + if (ctx->gl_ctx) pwglDeleteContext(ctx->gl_ctx); + ctx->gl_ctx = NULL; + if (ctx->dc) ReleaseDC(ctx->wnd, ctx->dc); + ctx->dc = NULL; + if (ctx->wnd) DestroyWindow(ctx->wnd); + ctx->wnd = NULL; + LeaveCriticalSection(&wined3d_fake_gl_context_cs); return FALSE; } @@ -4518,6 +4507,7 @@ BOOL InitAdapters(IWineD3DImpl *This) { struct WineD3DAdapter *adapter = &This->adapters[0]; const WineD3D_GL_Info *gl_info = &adapter->gl_info; + struct wined3d_fake_gl_ctx fake_gl_ctx = {0}; int iPixelFormat; int res; int i; @@ -4530,31 +4520,26 @@ BOOL InitAdapters(IWineD3DImpl *This) adapter->monitorPoint.x = -1; adapter->monitorPoint.y = -1; - if (!WineD3D_CreateFakeGLContext()) { + if (!WineD3D_CreateFakeGLContext(&fake_gl_ctx)) + { ERR("Failed to get a gl context for default adapter\n"); - WineD3D_ReleaseFakeGLContext(); goto nogl_adapter; } ret = IWineD3DImpl_FillGLCaps(&adapter->gl_info); if(!ret) { ERR("Failed to initialize gl caps for default adapter\n"); - WineD3D_ReleaseFakeGLContext(); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); goto nogl_adapter; } ret = initPixelFormats(&adapter->gl_info); if(!ret) { ERR("Failed to init gl formats\n"); - WineD3D_ReleaseFakeGLContext(); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); goto nogl_adapter; } - hdc = pwglGetCurrentDC(); - if(!hdc) { - ERR("Failed to get gl HDC\n"); - WineD3D_ReleaseFakeGLContext(); - goto nogl_adapter; - } + hdc = fake_gl_ctx.dc; adapter->driver = "Display"; adapter->description = "Direct3D HAL"; @@ -4691,7 +4676,7 @@ BOOL InitAdapters(IWineD3DImpl *This) { ERR("Disabling Direct3D because no hardware accelerated pixel formats have been found!\n"); - WineD3D_ReleaseFakeGLContext(); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); HeapFree(GetProcessHeap(), 0, adapter->cfgs); goto nogl_adapter; } @@ -4719,7 +4704,7 @@ BOOL InitAdapters(IWineD3DImpl *This) fixup_extensions(&adapter->gl_info); add_gl_compat_wrappers(&adapter->gl_info); - WineD3D_ReleaseFakeGLContext(); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); select_shader_mode(&adapter->gl_info, WINED3DDEVTYPE_HAL, &ps_selected_mode, &vs_selected_mode); select_shader_max_constants(ps_selected_mode, vs_selected_mode, &adapter->gl_info);

1 0

Henri Verbeet : d3d9/tests: Add a small test for having multiple device active at the same time.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 17c0e991065033eec1e14f5e985e418a555bc81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c0e991065033eec1e14f5e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 3 09:39:20 2009 +0200 d3d9/tests: Add a small test for having multiple device active at the same time. This is essentially the situation that caused problems with reusing the initial GL context. --- dlls/d3d9/tests/device.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 279c065..66f53b9 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2312,6 +2312,70 @@ err_out: return; } +static void test_multi_device(void) +{ + IDirect3DDevice9 *device1 = NULL, *device2 = NULL; + D3DPRESENT_PARAMETERS present_parameters; + HWND hwnd1 = NULL, hwnd2 = NULL; + IDirect3D9 *d3d9; + ULONG refcount; + HRESULT hr; + + d3d9 = pDirect3DCreate9(D3D_SDK_VERSION); + ok(d3d9 != NULL, "Failed to create a d3d9 object.\n"); + if (!d3d9) goto fail; + + hwnd1 = CreateWindow("static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); + ok(hwnd1 != NULL, "Failed to create a window.\n"); + if (!hwnd1) goto fail; + + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = hwnd1; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd1, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device1); + ok(SUCCEEDED(hr), "Failed to create a device, hr %#x\n", hr); + IDirect3D9_Release(d3d9); + d3d9 = NULL; + if (FAILED(hr)) goto fail; + + d3d9 = pDirect3DCreate9(D3D_SDK_VERSION); + ok(d3d9 != NULL, "Failed to create a d3d9 object.\n"); + if (!d3d9) goto fail; + + hwnd2 = CreateWindow("static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); + ok(hwnd2 != NULL, "Failed to create a window.\n"); + if (!hwnd2) goto fail; + + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = hwnd2; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd2, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device2); + ok(SUCCEEDED(hr), "Failed to create a device, hr %#x\n", hr); + IDirect3D9_Release(d3d9); + d3d9 = NULL; + if (FAILED(hr)) goto fail; + +fail: + if (d3d9) IDirect3D9_Release(d3d9); + if (device1) + { + refcount = IDirect3DDevice9_Release(device1); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (device2) + { + refcount = IDirect3DDevice9_Release(device2); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (hwnd1) DestroyWindow(hwnd1); + if (hwnd2) DestroyWindow(hwnd2); +} START_TEST(device) { @@ -2334,6 +2398,7 @@ START_TEST(device) } IDirect3D9_Release(d3d9); + test_multi_device(); test_display_formats(); test_display_modes(); test_swapchain();

1 0

Michael Stefaniuc : wineps.drv: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 47fc16fb5461960164260053abb0b9c2f39aa0c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47fc16fb5461960164260053a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:40:09 2009 +0200 wineps.drv: Build language resource files separately. Do not include them from an other rc file. --- dlls/wineps.drv/Makefile.in | 25 ++++++++++++++++++- dlls/wineps.drv/psdlg.h | 3 ++ dlls/wineps.drv/rsrc.rc | 57 ------------------------------------------- dlls/wineps.drv/wps_Bg.rc | 2 + dlls/wineps.drv/wps_Cs.rc | 2 + dlls/wineps.drv/wps_Da.rc | 2 + dlls/wineps.drv/wps_De.rc | 2 + dlls/wineps.drv/wps_En.rc | 2 + dlls/wineps.drv/wps_Es.rc | 2 + dlls/wineps.drv/wps_Fr.rc | 2 + dlls/wineps.drv/wps_Hu.rc | 2 + dlls/wineps.drv/wps_It.rc | 2 + dlls/wineps.drv/wps_Ja.rc | 4 +- dlls/wineps.drv/wps_Ko.rc | 2 + dlls/wineps.drv/wps_Lt.rc | 3 +- dlls/wineps.drv/wps_Nl.rc | 2 + dlls/wineps.drv/wps_No.rc | 2 + dlls/wineps.drv/wps_Pl.rc | 2 + dlls/wineps.drv/wps_Pt.rc | 2 + dlls/wineps.drv/wps_Ro.rc | 4 +- dlls/wineps.drv/wps_Ru.rc | 2 + dlls/wineps.drv/wps_Si.rc | 2 + dlls/wineps.drv/wps_Sk.rc | 2 + dlls/wineps.drv/wps_Sv.rc | 2 + dlls/wineps.drv/wps_Tr.rc | 2 + dlls/wineps.drv/wps_Zh.rc | 4 +- 26 files changed, 73 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47fc16fb5461960164260…

1 0

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

July 3, 2009

Module: wine Branch: master Commit: 83eb00cad38402a10c7a82b7492a6a36fb81fe16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83eb00cad38402a10c7a82b74… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:41:45 2009 +0200 shdocvw: Import the version.rc into the main rc file. There is no need for a separate file. --- dlls/shdocvw/shdocvw.rc | 10 +++++++++- dlls/shdocvw/version.rc | 27 --------------------------- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/dlls/shdocvw/shdocvw.rc b/dlls/shdocvw/shdocvw.rc index 47718c1..bb4809b 100644 --- a/dlls/shdocvw/shdocvw.rc +++ b/dlls/shdocvw/shdocvw.rc @@ -16,7 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "version.rc" +#define WINE_OLESELFREGISTER +#define WINE_FILEDESCRIPTION_STR "Wine core dll" +#define WINE_FILENAME_STR "shdocvw.dll" +#define WINE_FILEVERSION 6,0,2900,2180 +#define WINE_FILEVERSION_STR "6.0.2900.2180" +#define WINE_PRODUCTVERSION 6,0,2900,2180 +#define WINE_PRODUCTVERSION_STR "6.0.2900.2180" + +#include "wine/wine_common_ver.rc" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/dlls/shdocvw/version.rc b/dlls/shdocvw/version.rc deleted file mode 100644 index 103b77c..0000000 --- a/dlls/shdocvw/version.rc +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2003 Francois Gouget (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 - */ - -#define WINE_OLESELFREGISTER -#define WINE_FILEDESCRIPTION_STR "Wine core dll" -#define WINE_FILENAME_STR "shdocvw.dll" -#define WINE_FILEVERSION 6,0,2900,2180 -#define WINE_FILEVERSION_STR "6.0.2900.2180" -#define WINE_PRODUCTVERSION 6,0,2900,2180 -#define WINE_PRODUCTVERSION_STR "6.0.2900.2180" - -#include "wine/wine_common_ver.rc"

1 0

Jacek Caban : urlmon: Added IBindStatusCallbackEx tests ( also fixes some IE8 failures).
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 288eefc7f181a34fa93a750abba9638ea7e84903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=288eefc7f181a34fa93a750ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 23:21:08 2009 +0200 urlmon: Added IBindStatusCallbackEx tests (also fixes some IE8 failures). --- dlls/urlmon/tests/url.c | 144 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 114 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=288eefc7f181a34fa93a7…

1 0

Michael Stefaniuc : comdlg32: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: a15c263237d68707b6f0a2ae5791b5d32a58e650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a15c263237d68707b6f0a2ae5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:38:23 2009 +0200 comdlg32: Build language resource files separately. Do not include them from an other rc file. --- dlls/comdlg32/Makefile.in | 33 +++++++++++++++++++- dlls/comdlg32/cdlg_Bg.rc | 3 ++ dlls/comdlg32/cdlg_Ca.rc | 3 ++ dlls/comdlg32/cdlg_Cs.rc | 3 ++ dlls/comdlg32/cdlg_Da.rc | 3 ++ dlls/comdlg32/cdlg_De.rc | 3 ++ dlls/comdlg32/cdlg_El.rc | 3 ++ dlls/comdlg32/cdlg_En.rc | 3 ++ dlls/comdlg32/cdlg_Eo.rc | 3 ++ dlls/comdlg32/cdlg_Es.rc | 3 ++ dlls/comdlg32/cdlg_Fi.rc | 3 ++ dlls/comdlg32/cdlg_Fr.rc | 3 ++ dlls/comdlg32/cdlg_Hu.rc | 3 ++ dlls/comdlg32/cdlg_It.rc | 3 ++ dlls/comdlg32/cdlg_Ja.rc | 5 ++- dlls/comdlg32/cdlg_Ko.rc | 3 ++ dlls/comdlg32/cdlg_Lt.rc | 4 ++- dlls/comdlg32/cdlg_Nl.rc | 3 ++ dlls/comdlg32/cdlg_No.rc | 3 ++ dlls/comdlg32/cdlg_Pl.rc | 3 ++ dlls/comdlg32/cdlg_Pt.rc | 3 ++ dlls/comdlg32/cdlg_Ro.rc | 5 ++- dlls/comdlg32/cdlg_Ru.rc | 3 ++ dlls/comdlg32/cdlg_Si.rc | 5 ++- dlls/comdlg32/cdlg_Sk.rc | 3 ++ dlls/comdlg32/cdlg_Sv.rc | 3 ++ dlls/comdlg32/cdlg_Th.rc | 3 ++ dlls/comdlg32/cdlg_Tr.rc | 3 ++ dlls/comdlg32/cdlg_Uk.rc | 3 ++ dlls/comdlg32/cdlg_Wa.rc | 3 ++ dlls/comdlg32/cdlg_Zh.rc | 5 ++- dlls/comdlg32/cdlg_xx.rc | 4 +-- dlls/comdlg32/rsrc.rc | 73 --------------------------------------------- 33 files changed, 123 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a15c263237d68707b6f0a…

1 0

Jacek Caban : urlmon: Use GetBinfInfoEx in GetBindInfo implementation if possible.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: b6259956c18ca00eb80362c6781b9e6399f946b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6259956c18ca00eb80362c67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 23:21:37 2009 +0200 urlmon: Use GetBinfInfoEx in GetBindInfo implementation if possible. --- dlls/urlmon/bindctx.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index fe80456..1a89482 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -178,10 +178,22 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { BindStatusCallback *This = STATUSCLB_THIS(iface); + IBindStatusCallbackEx *bscex; + HRESULT hres; TRACE("(%p)->(%p %p)\n", This, grfBINDF, pbindinfo); - return IBindStatusCallback_GetBindInfo(This->callback, grfBINDF, pbindinfo); + hres = IBindStatusCallback_QueryInterface(This->callback, &IID_IBindStatusCallbackEx, (void**)&bscex); + if(SUCCEEDED(hres)) { + DWORD bindf2 = 0, reserv = 0; + + hres = IBindStatusCallbackEx_GetBindInfoEx(bscex, grfBINDF, pbindinfo, &bindf2, &reserv); + IBindStatusCallbackEx_Release(bscex); + }else { + hres = IBindStatusCallback_GetBindInfo(This->callback, grfBINDF, pbindinfo); + } + + return hres; } static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *iface,

1 0

Michael Stefaniuc : wineps.drv: Include a local header last.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 551d1efc9f65fa932beb13d8ed685c9ccd081c04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=551d1efc9f65fa932beb13d8e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:39:04 2009 +0200 wineps.drv: Include a local header last. --- dlls/wineps.drv/driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 158ea1f..904f97a 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -30,12 +30,12 @@ #include <string.h> #include "wine/debug.h" -#include "psdlg.h" #include "psdrv.h" #include "winuser.h" #include "wownt32.h" #include "prsht.h" +#include "psdlg.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv);

1 0

Michael Stefaniuc : winefile: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 08ac4a4c222ff1e115c8745b85c4df33f0ee1ce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08ac4a4c222ff1e115c8745b8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:37:52 2009 +0200 winefile: Build language resource files separately. Do not include them from an other rc file. --- programs/winefile/Cs.rc | 2 ++ programs/winefile/Da.rc | 2 ++ programs/winefile/De.rc | 2 ++ programs/winefile/En.rc | 2 ++ programs/winefile/Es.rc | 2 ++ programs/winefile/Fr.rc | 2 ++ programs/winefile/Hu.rc | 2 ++ programs/winefile/It.rc | 2 ++ programs/winefile/Ja.rc | 4 ++-- programs/winefile/Ko.rc | 2 ++ programs/winefile/Lt.rc | 4 ++-- programs/winefile/Makefile.in | 23 ++++++++++++++++++++++- programs/winefile/Nl.rc | 2 ++ programs/winefile/No.rc | 2 ++ programs/winefile/Pl.rc | 2 ++ programs/winefile/Pt.rc | 1 + programs/winefile/Ru.rc | 2 ++ programs/winefile/Si.rc | 4 ++-- programs/winefile/Sv.rc | 2 ++ programs/winefile/Tr.rc | 2 ++ programs/winefile/Zh.rc | 4 ++-- programs/winefile/resource.h | 2 ++ programs/winefile/rsrc.rc | 26 -------------------------- 23 files changed, 63 insertions(+), 35 deletions(-) diff --git a/programs/winefile/Cs.rc b/programs/winefile/Cs.rc index 6d2294a..ad71863 100644 --- a/programs/winefile/Cs.rc +++ b/programs/winefile/Cs.rc @@ -23,6 +23,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/programs/winefile/Da.rc b/programs/winefile/Da.rc index babc0da..ffc7415 100644 --- a/programs/winefile/Da.rc +++ b/programs/winefile/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT /* Menu */ diff --git a/programs/winefile/De.rc b/programs/winefile/De.rc index ae1a80f..e0718be 100644 --- a/programs/winefile/De.rc +++ b/programs/winefile/De.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL /* Menu */ diff --git a/programs/winefile/En.rc b/programs/winefile/En.rc index dc0ef28..644cf2f 100644 --- a/programs/winefile/En.rc +++ b/programs/winefile/En.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT /* Menu */ diff --git a/programs/winefile/Es.rc b/programs/winefile/Es.rc index fa82f4f..7e445ee 100644 --- a/programs/winefile/Es.rc +++ b/programs/winefile/Es.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL /* Menu */ diff --git a/programs/winefile/Fr.rc b/programs/winefile/Fr.rc index 73d7c8e..25e7874 100644 --- a/programs/winefile/Fr.rc +++ b/programs/winefile/Fr.rc @@ -23,6 +23,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL /* Menu */ diff --git a/programs/winefile/Hu.rc b/programs/winefile/Hu.rc index f73f376..f7ca49a 100644 --- a/programs/winefile/Hu.rc +++ b/programs/winefile/Hu.rc @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT /* Menu */ diff --git a/programs/winefile/It.rc b/programs/winefile/It.rc index 832d422..bfbf6f1 100644 --- a/programs/winefile/It.rc +++ b/programs/winefile/It.rc @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL /* Menu */ diff --git a/programs/winefile/Ja.rc b/programs/winefile/Ja.rc index cd68b65..b73486a 100644 --- a/programs/winefile/Ja.rc +++ b/programs/winefile/Ja.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -261,5 +263,3 @@ STRINGTABLE IDS_FREE_SPACE_FMT "%s of %s free" } - -#pragma code_page(default) diff --git a/programs/winefile/Ko.rc b/programs/winefile/Ko.rc index 02821d0..0a6207a 100644 --- a/programs/winefile/Ko.rc +++ b/programs/winefile/Ko.rc @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT /* Menu */ diff --git a/programs/winefile/Lt.rc b/programs/winefile/Lt.rc index 04445e7..32cec0e 100644 --- a/programs/winefile/Lt.rc +++ b/programs/winefile/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -259,5 +261,3 @@ STRINGTABLE IDS_FREE_SPACE_FMT "%s iš %s laisva" } - -#pragma code_page(default) diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in index 804e349..bd808b5 100644 --- a/programs/winefile/Makefile.in +++ b/programs/winefile/Makefile.in @@ -11,7 +11,28 @@ C_SRCS = \ splitpath.c \ winefile.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fr.rc \ + Hu.rc \ + It.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc \ + rsrc.rc SVG_SRCS = winefile.svg diff --git a/programs/winefile/Nl.rc b/programs/winefile/Nl.rc index 06eef8e..8f6f7f1 100644 --- a/programs/winefile/Nl.rc +++ b/programs/winefile/Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL /* Menu */ diff --git a/programs/winefile/No.rc b/programs/winefile/No.rc index 04f8509..eec8b82 100644 --- a/programs/winefile/No.rc +++ b/programs/winefile/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL /* Menu */ diff --git a/programs/winefile/Pl.rc b/programs/winefile/Pl.rc index 3131617..50247e3 100644 --- a/programs/winefile/Pl.rc +++ b/programs/winefile/Pl.rc @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT /* Menu */ diff --git a/programs/winefile/Pt.rc b/programs/winefile/Pt.rc index d23038d..176a5d7 100644 --- a/programs/winefile/Pt.rc +++ b/programs/winefile/Pt.rc @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" /* Menu */ diff --git a/programs/winefile/Ru.rc b/programs/winefile/Ru.rc index dd07152..ef8c657 100644 --- a/programs/winefile/Ru.rc +++ b/programs/winefile/Ru.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT /* Menu */ diff --git a/programs/winefile/Si.rc b/programs/winefile/Si.rc index 5aa006d..2010f59 100644 --- a/programs/winefile/Si.rc +++ b/programs/winefile/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -258,5 +260,3 @@ STRINGTABLE IDS_FREE_SPACE_FMT "Prosto: %s od %s" } - -#pragma code_page(default) diff --git a/programs/winefile/Sv.rc b/programs/winefile/Sv.rc index 6905c5e..4deddd9 100644 --- a/programs/winefile/Sv.rc +++ b/programs/winefile/Sv.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL /* Menu */ diff --git a/programs/winefile/Tr.rc b/programs/winefile/Tr.rc index 3a75a7e..8735264 100644 --- a/programs/winefile/Tr.rc +++ b/programs/winefile/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT /* Menu */ diff --git a/programs/winefile/Zh.rc b/programs/winefile/Zh.rc index aba7221..8eb3300 100644 --- a/programs/winefile/Zh.rc +++ b/programs/winefile/Zh.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -298,5 +300,3 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "取消", 2, 158, 23, 47, 14 PUSHBUTTON "幫助(&H)", 254, 158, 43, 47, 14 } - -#pragma code_page(default) diff --git a/programs/winefile/resource.h b/programs/winefile/resource.h index 1e843e5..7c14871 100644 --- a/programs/winefile/resource.h +++ b/programs/winefile/resource.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> /* images */ diff --git a/programs/winefile/rsrc.rc b/programs/winefile/rsrc.rc index 4a65aac..c921271 100644 --- a/programs/winefile/rsrc.rc +++ b/programs/winefile/rsrc.rc @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> - #include "resource.h" /* define language neutral resources */ @@ -52,26 +49,3 @@ IDB_DRIVEBAR BITMAP DISCARDABLE drivebar.bmp /* @makedep: images.bmp */ IDB_IMAGES BITMAP DISCARDABLE images.bmp - -/* include localised resources */ - -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fr.rc" -#include "Hu.rc" -#include "It.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc"

1 0

Michael Stefaniuc : oleview: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 313dd0c3a4ba1fd9576820c2adb508f7204d2bef URL: http://source.winehq.org/git/wine.git/?a=commit;h=313dd0c3a4ba1fd9576820c2a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:36:00 2009 +0200 oleview: Build language resource files separately. Do not include them from an other rc file. --- programs/oleview/Da.rc | 2 ++ programs/oleview/De.rc | 2 ++ programs/oleview/En.rc | 2 ++ programs/oleview/Fr.rc | 2 ++ programs/oleview/Ja.rc | 4 ++-- programs/oleview/Ko.rc | 2 ++ programs/oleview/Lt.rc | 4 ++-- programs/oleview/Makefile.in | 17 ++++++++++++++++- programs/oleview/Nl.rc | 2 ++ programs/oleview/No.rc | 2 ++ programs/oleview/Pl.rc | 2 ++ programs/oleview/Pt.rc | 2 ++ programs/oleview/Ru.rc | 2 ++ programs/oleview/Sv.rc | 2 ++ programs/oleview/Zh.rc | 4 ++-- programs/oleview/resource.h | 3 +++ programs/oleview/rsrc.rc | 18 ------------------ 17 files changed, 47 insertions(+), 25 deletions(-) diff --git a/programs/oleview/Da.rc b/programs/oleview/Da.rc index 02058f6..04b46e4 100644 --- a/programs/oleview/Da.rc +++ b/programs/oleview/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDM_MENU MENU diff --git a/programs/oleview/De.rc b/programs/oleview/De.rc index d010596..8e67cb4 100644 --- a/programs/oleview/De.rc +++ b/programs/oleview/De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDM_MENU MENU diff --git a/programs/oleview/En.rc b/programs/oleview/En.rc index 700e1d7..36dfada 100644 --- a/programs/oleview/En.rc +++ b/programs/oleview/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDM_MENU MENU diff --git a/programs/oleview/Fr.rc b/programs/oleview/Fr.rc index 56d7250..728f451 100644 --- a/programs/oleview/Fr.rc +++ b/programs/oleview/Fr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDM_MENU MENU diff --git a/programs/oleview/Ja.rc b/programs/oleview/Ja.rc index 955174c..8ed1eac 100644 --- a/programs/oleview/Ja.rc +++ b/programs/oleview/Ja.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -214,5 +216,3 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "&GetSizeMax", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 } - -#pragma code_page(default) diff --git a/programs/oleview/Ko.rc b/programs/oleview/Ko.rc index e1d61a9..0df4e7f 100644 --- a/programs/oleview/Ko.rc +++ b/programs/oleview/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDM_MENU MENU diff --git a/programs/oleview/Lt.rc b/programs/oleview/Lt.rc index ab887c2..a5d131c 100644 --- a/programs/oleview/Lt.rc +++ b/programs/oleview/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -214,5 +216,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&GetSizeMax()", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 } - -#pragma code_page(default) diff --git a/programs/oleview/Makefile.in b/programs/oleview/Makefile.in index 2c69eda..d1dad43 100644 --- a/programs/oleview/Makefile.in +++ b/programs/oleview/Makefile.in @@ -15,7 +15,22 @@ C_SRCS = \ tree.c \ typelib.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Da.rc \ + De.rc \ + En.rc \ + Fr.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Sv.rc \ + Zh.rc \ + rsrc.rc @MAKE_PROG_RULES@ diff --git a/programs/oleview/Nl.rc b/programs/oleview/Nl.rc index ed2821d..6e109af 100644 --- a/programs/oleview/Nl.rc +++ b/programs/oleview/Nl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDM_MENU MENU diff --git a/programs/oleview/No.rc b/programs/oleview/No.rc index f5e885a..5aecd77 100644 --- a/programs/oleview/No.rc +++ b/programs/oleview/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDM_MENU MENU diff --git a/programs/oleview/Pl.rc b/programs/oleview/Pl.rc index 77a0f8a..d3be5b3 100644 --- a/programs/oleview/Pl.rc +++ b/programs/oleview/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDM_MENU MENU diff --git a/programs/oleview/Pt.rc b/programs/oleview/Pt.rc index d520f49..dfc7aba 100644 --- a/programs/oleview/Pt.rc +++ b/programs/oleview/Pt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDM_MENU MENU diff --git a/programs/oleview/Ru.rc b/programs/oleview/Ru.rc index cf63d75..ab8f6b6 100644 --- a/programs/oleview/Ru.rc +++ b/programs/oleview/Ru.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_RUSSIAN IDM_MENU MENU diff --git a/programs/oleview/Sv.rc b/programs/oleview/Sv.rc index ed121f1..be9c053 100644 --- a/programs/oleview/Sv.rc +++ b/programs/oleview/Sv.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDM_MENU MENU diff --git a/programs/oleview/Zh.rc b/programs/oleview/Zh.rc index 8f9b59c..4d0f712 100644 --- a/programs/oleview/Zh.rc +++ b/programs/oleview/Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -406,5 +408,3 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "獲取最大(&G)", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 } - -#pragma code_page(default) diff --git a/programs/oleview/resource.h b/programs/oleview/resource.h index e88ec05..9e732e6 100644 --- a/programs/oleview/resource.h +++ b/programs/oleview/resource.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> + #define IDS_APPNAME 1 #define IDS_APPTITLE 2 #define IDM_MENU 3 diff --git a/programs/oleview/rsrc.rc b/programs/oleview/rsrc.rc index 14122b7..20537f3 100644 --- a/programs/oleview/rsrc.rc +++ b/programs/oleview/rsrc.rc @@ -18,26 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> - #include "resource.h" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Fr.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Sv.rc" -#include "Zh.rc" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDA_OLEVIEW ACCELERATORS DISCARDABLE

1 0

Jacek Caban : urlmon: Added IBindStatusCallbackEx implementation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: df826fe82fab3416eb194c7e361d6fa8d72bfb69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df826fe82fab3416eb194c7e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 23:22:13 2009 +0200 urlmon: Added IBindStatusCallbackEx implementation. --- dlls/urlmon/bindctx.c | 65 ++++++++++++++++++++++++++++++++-------------- dlls/urlmon/tests/url.c | 1 - 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 1a89482..0b3efa6 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -28,10 +28,10 @@ static WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_ extern IID IID_IBindStatusCallbackHolder; typedef struct { - const IBindStatusCallbackVtbl *lpBindStatusCallbackVtbl; - const IServiceProviderVtbl *lpServiceProviderVtbl; - const IHttpNegotiate2Vtbl *lpHttpNegotiate2Vtbl; - const IAuthenticateVtbl *lpAuthenticateVtbl; + const IBindStatusCallbackExVtbl *lpBindStatusCallbackExVtbl; + const IServiceProviderVtbl *lpServiceProviderVtbl; + const IHttpNegotiate2Vtbl *lpHttpNegotiate2Vtbl; + const IAuthenticateVtbl *lpAuthenticateVtbl; LONG ref; @@ -39,7 +39,8 @@ typedef struct { IServiceProvider *serv_prov; } BindStatusCallback; -#define STATUSCLB(x) ((IBindStatusCallback*) &(x)->lpBindStatusCallbackVtbl) +#define STATUSCLB(x) ((IBindStatusCallback*) &(x)->lpBindStatusCallbackExVtbl) +#define STATUSCLBEX(x) ((IBindStatusCallbackEx*)&(x)->lpBindStatusCallbackExVtbl) #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) #define HTTPNEG2(x) ((IHttpNegotiate2*) &(x)->lpHttpNegotiate2Vtbl) #define AUTHENTICATE(x) ((IAuthenticate*) &(x)->lpAuthenticateVtbl) @@ -56,9 +57,9 @@ static void *get_callback_iface(BindStatusCallback *This, REFIID riid) return SUCCEEDED(hres) ? ret : NULL; } -#define STATUSCLB_THIS(iface) DEFINE_THIS(BindStatusCallback, BindStatusCallback, iface) +#define STATUSCLB_THIS(iface) DEFINE_THIS(BindStatusCallback, BindStatusCallbackEx, iface) -static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *iface, +static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallbackEx *iface, REFIID riid, void **ppv) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -71,6 +72,9 @@ static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *ifa }else if(IsEqualGUID(&IID_IBindStatusCallback, riid)) { TRACE("(%p)->(IID_IBindStatusCallback, %p)\n", This, ppv); *ppv = STATUSCLB(This); + }else if(IsEqualGUID(&IID_IBindStatusCallbackEx, riid)) { + TRACE("(%p)->(IID_IBindStatusCallback, %p)\n", This, ppv); + *ppv = STATUSCLBEX(This); }else if(IsEqualGUID(&IID_IBindStatusCallbackHolder, riid)) { TRACE("(%p)->(IID_IBindStatusCallbackHolder, %p)\n", This, ppv); *ppv = This; @@ -97,7 +101,7 @@ static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *ifa return E_NOINTERFACE; } -static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallback *iface) +static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallbackEx *iface) { BindStatusCallback *This = STATUSCLB_THIS(iface); LONG ref = InterlockedIncrement(&This->ref); @@ -107,7 +111,7 @@ static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallback *iface) return ref; } -static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) +static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallbackEx *iface) { BindStatusCallback *This = STATUSCLB_THIS(iface); LONG ref = InterlockedDecrement(&This->ref); @@ -124,7 +128,7 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) return ref; } -static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *iface, +static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallbackEx *iface, DWORD dwReserved, IBinding *pbind) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -134,7 +138,7 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *ifa return IBindStatusCallback_OnStartBinding(This->callback, 0xff, pbind); } -static HRESULT WINAPI BindStatusCallback_GetPriority(IBindStatusCallback *iface, LONG *pnPriority) +static HRESULT WINAPI BindStatusCallback_GetPriority(IBindStatusCallbackEx *iface, LONG *pnPriority) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -143,7 +147,7 @@ static HRESULT WINAPI BindStatusCallback_GetPriority(IBindStatusCallback *iface, return IBindStatusCallback_GetPriority(This->callback, pnPriority); } -static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallback *iface, DWORD reserved) +static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallbackEx *iface, DWORD reserved) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -152,7 +156,7 @@ static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallback *ifac return IBindStatusCallback_OnLowResource(This->callback, reserved); } -static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, ULONG ulProgress, +static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallbackEx *iface, ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -164,7 +168,7 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, ulProgressMax, ulStatusCode, szStatusText); } -static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *iface, +static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallbackEx *iface, HRESULT hresult, LPCWSTR szError) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -174,7 +178,7 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac return IBindStatusCallback_OnStopBinding(This->callback, hresult, szError); } -static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, +static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallbackEx *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -196,7 +200,7 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, return hres; } -static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *iface, +static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallbackEx *iface, DWORD grfBSCF, DWORD dwSize, FORMATETC *pformatetc, STGMEDIUM *pstgmed) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -206,7 +210,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if return IBindStatusCallback_OnDataAvailable(This->callback, grfBSCF, dwSize, pformatetc, pstgmed); } -static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface, +static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallbackEx *iface, REFIID riid, IUnknown *punk) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -216,9 +220,29 @@ static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback * return IBindStatusCallback_OnObjectAvailable(This->callback, riid, punk); } +static HRESULT WINAPI BindStatusCallback_GetBindInfoEx(IBindStatusCallbackEx *iface, DWORD *grfBINDF, + BINDINFO *pbindinfo, DWORD *grfBINDF2, DWORD *pdwReserved) +{ + BindStatusCallback *This = STATUSCLB_THIS(iface); + IBindStatusCallbackEx *bscex; + HRESULT hres; + + TRACE("(%p)->(%p %p %p %p)\n", This, grfBINDF, pbindinfo, grfBINDF2, pdwReserved); + + hres = IBindStatusCallback_QueryInterface(This->callback, &IID_IBindStatusCallbackEx, (void**)&bscex); + if(SUCCEEDED(hres)) { + hres = IBindStatusCallbackEx_GetBindInfoEx(bscex, grfBINDF, pbindinfo, grfBINDF2, pdwReserved); + IBindStatusCallbackEx_Release(bscex); + }else { + hres = IBindStatusCallback_GetBindInfo(This->callback, grfBINDF, pbindinfo); + } + + return hres; +} + #undef STATUSCLB_THIS -static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = { +static const IBindStatusCallbackExVtbl BindStatusCallbackExVtbl = { BindStatusCallback_QueryInterface, BindStatusCallback_AddRef, BindStatusCallback_Release, @@ -229,7 +253,8 @@ static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = { BindStatusCallback_OnStopBinding, BindStatusCallback_GetBindInfo, BindStatusCallback_OnDataAvailable, - BindStatusCallback_OnObjectAvailable + BindStatusCallback_OnObjectAvailable, + BindStatusCallback_GetBindInfoEx }; #define SERVPROV_THIS(iface) DEFINE_THIS(BindStatusCallback, ServiceProvider, iface) @@ -439,7 +464,7 @@ static IBindStatusCallback *create_bsc(IBindStatusCallback *bsc) { BindStatusCallback *ret = heap_alloc_zero(sizeof(BindStatusCallback)); - ret->lpBindStatusCallbackVtbl = &BindStatusCallbackVtbl; + ret->lpBindStatusCallbackExVtbl = &BindStatusCallbackExVtbl; ret->lpServiceProviderVtbl = &BSCServiceProviderVtbl; ret->lpHttpNegotiate2Vtbl = &BSCHttpNegotiateVtbl; ret->lpAuthenticateVtbl = &BSCAuthenticateVtbl; diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 473c6ab..b5bf79c 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1941,7 +1941,6 @@ static void test_GetBindInfoEx(IBindStatusCallback *holder) hres = IBindStatusCallback_QueryInterface(holder, &IID_IBindStatusCallbackEx, (void**)&bscex); if(FAILED(hres)) { - todo_wine win_skip("IBindStatusCallbackEx not supported\n"); return; }

1 0

Huw Davies : gdi32/tests: Fix tests on win9x and winMe.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 395436d2e9eec57d84cfdc4e27d4dcc7a30d2358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=395436d2e9eec57d84cfdc4e2… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 2 17:08:31 2009 +0100 gdi32/tests: Fix tests on win9x and winMe. --- dlls/gdi32/tests/metafile.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index a85c608..d1966da 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2429,7 +2429,9 @@ static void getwinmetafilebits(UINT mode, int scale) default: pt.x = pt.y = 0; } - ok((short)rec->rdParm[0] == pt.y, "got %d expect %d\n", (short)rec->rdParm[0], pt.y); + ok((short)rec->rdParm[0] == pt.y || + broken(mode >= MM_LOMETRIC && mode <= MM_TWIPS && (short)rec->rdParm[0] == pt.y - 1), /* win9x, winme */ + "got %d expect %d\n", (short)rec->rdParm[0], pt.y); ok((short)rec->rdParm[1] == pt.x, "got %d expect %d\n", (short)rec->rdParm[1], pt.x); } if(rec_num == mfcomment_chunks + 2)

1 0

Frédéric Delanoy : crypt32: Update French translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: f6c42d37e578e85e1d0671944d94db422efc9cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c42d37e578e85e1d0671944… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 2 19:06:47 2009 +0200 crypt32: Update French translation. --- dlls/crypt32/crypt32_Fr.rc | 347 ++++++++++++++++++++++---------------------- 1 files changed, 175 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6c42d37e578e85e1d067…

1 0

Aurimas Fišeras : winecfg: Improve Lithuanian translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: e628509a29600a20ab3a51532262a6c97c84a620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e628509a29600a20ab3a51532… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jul 2 23:26:14 2009 +0300 winecfg: Improve Lithuanian translation. --- programs/winecfg/Lt.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc index 297b411..296390b 100644 --- a/programs/winecfg/Lt.rc +++ b/programs/winecfg/Lt.rc @@ -144,7 +144,7 @@ BEGIN LTEXT "&Tipas:",IDC_STATIC_TYPE,15,138,21,10 COMBOBOX IDC_COMBO_TYPE,41,135,77,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Žymė ir numeris",IDC_LABELSERIAL_STATIC,15,155,95,10 + LTEXT "Vardas ir serijos numeris",IDC_LABELSERIAL_STATIC,15,155,80,10 PUSHBUTTON "Rodyti papil&domas",IDC_BUTTON_SHOW_HIDE_ADVANCED,180,136,66,13 CONTROL "Automatiškai aptikti iš įrenginio:",IDC_RADIO_AUTODETECT,"Button", @@ -154,7 +154,7 @@ BEGIN CONTROL "P&riskirti rankiniu būdu:",IDC_RADIO_ASSIGN,"Button", BS_AUTORADIOBUTTON,15,195,85,10 - LTEXT "&Žymė:",IDC_STATIC_LABEL,33,208,29,12 + LTEXT "&Vardas:",IDC_STATIC_LABEL,33,208,29,12 EDITTEXT IDC_EDIT_LABEL,63,205,78,13,ES_AUTOHSCROLL | WS_TABSTOP LTEXT "N&umeris:",IDC_STATIC_SERIAL,33,225,29,12 EDITTEXT IDC_EDIT_SERIAL,63,221,78,13,ES_AUTOHSCROLL | WS_TABSTOP @@ -217,7 +217,7 @@ BEGIN IDS_CHOOSE_PATH "Prašome išsirinkti unix paskirties aplanką." IDS_HIDE_ADVANCED "Slėpti papil&domas" IDS_SHOW_ADVANCED "Rodyti papil&domas" - IDS_NOTHEME "(Nėra apipavidalinimo)" + IDS_NOTHEME "(nėra apipavidalinimo)" IDS_TAB_GRAPHICS "Grafika" IDS_TAB_DESKTOP_INTEGRATION "Darbalaukio integravimas" IDS_TAB_AUDIO "Garsas" @@ -226,7 +226,7 @@ BEGIN IDS_WINECFG_TITLE_APP "Wine konfigūravimas: %s" IDS_THEMEFILE "Apipavidalinimo failai" IDS_THEMEFILE_SELECT "Pasirinkite apipavidalinimo failą" - IDS_AUDIO_MISSING "Registre nėra nurodyta garso tvarkyklė.\n\nRekomenduojama tvarkyklė buvo parinkta.\nGalite naudoti šią tvarkyklę ar pasirinkti kitą, jei tokių yra.\n\nTurite paspausti 'Vykdyti', kad pasirinkimas įsigaliotų." + IDS_AUDIO_MISSING "Registre nėra nurodyta garso tvarkyklė.\n\nRekomenduojama tvarkyklė buvo parinkta.\nGalite naudoti šią tvarkyklę ar pasirinkti kitą, jei tokių yra.\n\nTurite paspausti „Vykdyti“, kad pasirinkimas įsigaliotų." IDS_SHELL_FOLDER "Aplankas" IDS_LINKS_TO "Susietas su" END @@ -261,10 +261,10 @@ BEGIN IDS_DRIVE_CDROM "CD-ROM" IDS_DRIVE_LETTERS_EXCEEDED "Nebegalite pridėti daugiau diskų.\n\nKiekvienas diskas turi turėti raidę, nuo A iki Z, todėl negalite turėti daugiau nei 26" IDS_SYSTEM_DRIVE_LABEL "Sisteminis diskas" - IDS_CONFIRM_DELETE_C "Ar tikrai norite ištrinti C diską?\n\nDaugelis Windows programų mano, kad C diskas egzistuoja ir neveikia, jei jis neegzistuoja. Jei tęsite, nepamirškite atkurti C disko!" + IDS_CONFIRM_DELETE_C "Ar tikrai norite pašalinti C diską?\n\nDaugelis Windows programų mano, kad C diskas egzistuoja ir neveikia, kai jis neegzistuoja. Jei tęsite, nepamirškite atkurti C disko!" IDS_COL_DRIVELETTER "Raidė" IDS_COL_DRIVEMAPPING "Disko atvaizdavimas" - IDS_NO_DRIVE_C "Neturite C disko. Tai nėra gerai.\n\nNepamirškite paspausti 'Pridėti' diskų kortelėje, kad jį sukurtumėte!\n" + IDS_NO_DRIVE_C "Neturite C disko. Tai nėra gerai.\n\nNepamirškite paspausti „Pridėti“ diskų kortelėje, kad jį sukurtumėte!\n" END STRINGTABLE DISCARDABLE @@ -288,7 +288,7 @@ BEGIN IDS_DEVICES_MIDIIN "MIDI In įrenginiai" IDS_DEVICES_AUX "Aux įrenginiai" IDS_DEVICES_MIXER "Mixer įrenginiai" - IDS_UNAVAILABLE_DRIVER "Registre rasta tvarkyklė, kuri yra neprieinama!\n\nPašalinti '%s' iš registro?" + IDS_UNAVAILABLE_DRIVER "Registre rasta tvarkyklė, kuri yra neprieinama!\n\nPašalinti „%s“ iš registro?" IDS_WARNING "Įspėjimas" END

1 0

Aurimas Fišeras : notepad: Update Lithuanian translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 509a580b6226435ed1d91b9d53c1451b44c18553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=509a580b6226435ed1d91b9d5… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jul 2 17:46:12 2009 +0300 notepad: Update Lithuanian translation. --- programs/notepad/Lt.rc | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Lt.rc b/programs/notepad/Lt.rc index 0a12305..ddc2d61 100644 --- a/programs/notepad/Lt.rc +++ b/programs/notepad/Lt.rc @@ -94,6 +94,14 @@ PUSHBUTTON "Atsisakyti", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "&Žinynas", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Koduotė:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" @@ -121,4 +129,12 @@ STRING_NOTFOUND, "Frazė „%s“ nerasta." STRING_OUT_OF_MEMORY, "Neužtenka atminties operacijai užbaigti.\n\ Norėdami atlaisvinti atminties uždarykite vieną ar daugiau programų." +STRING_UNICODE_LE, "Unikodas (UTF-16)" +STRING_UNICODE_BE, "Unikodas (UTF-16 mažėjantys baitai)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ + Šiame faile yra unikodo ženklų, kurie bus prarasti, jei išsaugosite failą %s koduotėje.\n\ + Norėdami išsaugoti šiuos ženklus, spauskite „Atsisakyti“ ir pasirinkite vieną iš \ + unikodo nuostatų koduotės išskleidžiamajame sąraše.\n\ + Tęsti?" }

1 0

Aurimas Fišeras : cmd: Add Lithuanian translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: d7a1cb2c25a00e07d8e6749099641629b6ebf6c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a1cb2c25a00e07d8e674909… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jul 2 17:09:14 2009 +0300 cmd: Add Lithuanian translation. --- programs/cmd/Lt.rc | 279 ++++++++++++++++++++++++++++++++++++++++++++++ programs/cmd/Makefile.in | 1 + 2 files changed, 280 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7a1cb2c25a00e07d8e67…

1 0