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

Hans Leidekker : winebrowser: Support file URLs with a query or an anchor.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: dff300c04b9a5dff487f304fcf2f72b6eeb01bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff300c04b9a5dff487f304fc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 2 11:16:33 2009 +0200 winebrowser: Support file URLs with a query or an anchor. --- programs/winebrowser/main.c | 48 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 38 insertions(+), 10 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index d551c20..b959d38 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -66,6 +66,15 @@ static char *strdup_unixcp( const WCHAR *str ) return ret; } +static WCHAR *strdupW( const WCHAR *src ) +{ + WCHAR *dst; + if (!src) return NULL; + if ((dst = HeapAlloc( GetProcessHeap(), 0, (strlenW( src ) + 1) * sizeof(WCHAR) ))) + strcpyW( dst, src ); + return dst; +} + /* try to launch a unix app from a comma separated string of app names */ static int launch_app( WCHAR *candidates, const WCHAR *argv1 ) { @@ -329,7 +338,7 @@ int wmain(int argc, WCHAR *argv[]) static const WCHAR mailtoW[] = {'m','a','i','l','t','o',':',0}; static const WCHAR fileW[] = {'f','i','l','e',':',0}; - WCHAR *url = argv[1]; + WCHAR *p, *filenameW = NULL, *fileurlW = NULL, *url = argv[1]; wine_get_unix_file_name_t wine_get_unix_file_name_ptr; int ret = 1; @@ -347,7 +356,6 @@ int wmain(int argc, WCHAR *argv[]) /* handle an RFC1738 file URL */ if (!strncmpiW( url, fileW, 5 )) { - WCHAR *p; DWORD len = strlenW( url ) + 1; if (UrlUnescapeW( url, NULL, &len, URL_UNESCAPE_INPLACE ) != S_OK) @@ -390,20 +398,38 @@ int wmain(int argc, WCHAR *argv[]) else { char *unixpath; - if ((unixpath = wine_get_unix_file_name_ptr( url ))) + WCHAR c = 0; + + if (!(filenameW = strdupW( url ))) goto done; + if ((p = strchrW( filenameW, '?' )) || (p = strchrW( filenameW, '#' ))) + { + c = *p; + *p = 0; + } + + if ((unixpath = wine_get_unix_file_name_ptr( filenameW ))) { struct stat dummy; if (stat( unixpath, &dummy ) >= 0) { - int len; - WCHAR *unixpathW; + static const WCHAR schemeW[] = {'f','i','l','e',':','/','/',0}; + int len, len_scheme; + + len = len_scheme = strlenW( schemeW ); + len += MultiByteToWideChar( CP_UNIXCP, 0, unixpath, -1, NULL, 0 ); + if (p) + { + *p = c; + len += strlenW( p ); + } + + if (!(fileurlW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) goto done; - len = MultiByteToWideChar( CP_UNIXCP, 0, unixpath, -1, NULL, 0 ); - if ((unixpathW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) - MultiByteToWideChar( CP_UNIXCP, 0, unixpath, -1, unixpathW, len ); + strcpyW( fileurlW, schemeW ); + MultiByteToWideChar( CP_UNIXCP, 0, unixpath, -1, fileurlW + len_scheme, len - len_scheme ); + if (p) strcatW( fileurlW, p ); - ret = open_http_url( unixpathW ); - HeapFree( GetProcessHeap(), 0, unixpathW ); + ret = open_http_url( fileurlW ); goto done; } } @@ -417,5 +443,7 @@ int wmain(int argc, WCHAR *argv[]) done: HeapFree(GetProcessHeap(), 0, ddeString); + HeapFree( GetProcessHeap(), 0, filenameW ); + HeapFree( GetProcessHeap(), 0, fileurlW ); return ret; }

1 0

Vincent Povirk : include: Define some WIC pixel format GUIDs.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 5574f0138e54940b12b5dce20dcc2acd1a736643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5574f0138e54940b12b5dce20… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 1 12:40:07 2009 -0500 include: Define some WIC pixel format GUIDs. --- include/wincodec.idl | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 84aafcb..e72bb36 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -54,6 +54,18 @@ typedef enum WICBitmapDecoderCapabilities { typedef GUID WICPixelFormatGUID; typedef REFGUID REFWICPixelFormatGUID; +cpp_quote("DEFINE_GUID(GUID_WICPixelFormatDontCare, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x00);") +cpp_quote("#define GUID_WICPixelFormatUndefined GUID_WICPixelFormatDontCare") + +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat1bppIndexed, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x01);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat2bppIndexed, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x02);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat4bppIndexed, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x03);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat8bppIndexed, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x04);") + +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGR555, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x09);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat24bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0c);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0e);") + typedef struct WICRect { INT X; INT Y;

1 0

Vincent Povirk : windowscodecs: Implement GetPixelFormat for BMP decoder.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 02d0462f067d4ade4dcecf98575fc67494a93aa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02d0462f067d4ade4dcecf985… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 1 13:18:02 2009 -0500 windowscodecs: Implement GetPixelFormat for BMP decoder. --- dlls/windowscodecs/bmpdecode.c | 86 +++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/bmpformat.c | 4 ++ 2 files changed, 88 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index e2378ba..46b2527 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -64,6 +64,8 @@ typedef struct { IStream *stream; BITMAPFILEHEADER bfh; BITMAPV5HEADER bih; + const WICPixelFormatGUID *pixelformat; + int bitsperpixel; } BmpFrameDecode; static HRESULT WINAPI BmpFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, @@ -151,8 +153,12 @@ static HRESULT WINAPI BmpFrameDecode_GetSize(IWICBitmapFrameDecode *iface, static HRESULT WINAPI BmpFrameDecode_GetPixelFormat(IWICBitmapFrameDecode *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%p): stub\n", iface, pPixelFormat); - return E_NOTIMPL; + BmpFrameDecode *This = (BmpFrameDecode*)iface; + TRACE("(%p,%p)\n", iface, pPixelFormat); + + memcpy(pPixelFormat, This->pixelformat, sizeof(GUID)); + + return S_OK; } static HRESULT BmpHeader_GetResolution(BITMAPV5HEADER *bih, double *pDpiX, double *pDpiY) @@ -241,6 +247,8 @@ typedef struct { BITMAPFILEHEADER bfh; BITMAPV5HEADER bih; BmpFrameDecode *framedecode; + const WICPixelFormatGUID *pixelformat; + int bitsperpixel; } BmpDecoder; static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) @@ -269,6 +277,78 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) if (FAILED(hr)) return hr; if (bytestoread != bytesread) return E_FAIL; + /* decide what kind of bitmap this is and how/if we can read it */ + if (This->bih.bV5Size == sizeof(BITMAPCOREHEADER)) + { + BITMAPCOREHEADER *bch = (BITMAPCOREHEADER*)&This->bih; + TRACE("BITMAPCOREHEADER with depth=%i\n", bch->bcBitCount); + This->bitsperpixel = bch->bcBitCount; + switch(bch->bcBitCount) + { + case 1: + This->pixelformat = &GUID_WICPixelFormat1bppIndexed; + break; + case 2: + This->pixelformat = &GUID_WICPixelFormat2bppIndexed; + break; + case 4: + This->pixelformat = &GUID_WICPixelFormat4bppIndexed; + break; + case 8: + This->pixelformat = &GUID_WICPixelFormat8bppIndexed; + break; + case 24: + This->pixelformat = &GUID_WICPixelFormat24bppBGR; + break; + default: + This->pixelformat = &GUID_WICPixelFormatUndefined; + WARN("unsupported bit depth %i for BITMAPCOREHEADER\n", bch->bcBitCount); + break; + } + } + else /* struct is compatible with BITMAPINFOHEADER */ + { + TRACE("bitmap header=%i compression=%i depth=%i\n", This->bih.bV5Size, This->bih.bV5Compression, This->bih.bV5BitCount); + switch(This->bih.bV5Compression) + { + case BI_RGB: + This->bitsperpixel = This->bih.bV5BitCount; + switch(This->bih.bV5BitCount) + { + case 1: + This->pixelformat = &GUID_WICPixelFormat1bppIndexed; + break; + case 2: + This->pixelformat = &GUID_WICPixelFormat2bppIndexed; + break; + case 4: + This->pixelformat = &GUID_WICPixelFormat4bppIndexed; + break; + case 8: + This->pixelformat = &GUID_WICPixelFormat8bppIndexed; + break; + case 16: + This->pixelformat = &GUID_WICPixelFormat16bppBGR555; + break; + case 24: + This->pixelformat = &GUID_WICPixelFormat24bppBGR; + break; + case 32: + This->pixelformat = &GUID_WICPixelFormat32bppBGR; + break; + default: + This->pixelformat = &GUID_WICPixelFormatUndefined; + FIXME("unsupported bit depth %i for uncompressed RGB\n", This->bih.bV5BitCount); + } + break; + default: + This->bitsperpixel = 0; + This->pixelformat = &GUID_WICPixelFormatUndefined; + FIXME("unsupported bitmap type header=%i compression=%i depth=%i\n", This->bih.bV5Size, This->bih.bV5Compression, This->bih.bV5BitCount); + break; + } + } + This->initialized = TRUE; return S_OK; @@ -423,6 +503,8 @@ static HRESULT WINAPI BmpDecoder_GetFrame(IWICBitmapDecoder *iface, IStream_AddRef(This->stream); This->framedecode->bfh = This->bfh; This->framedecode->bih = This->bih; + This->framedecode->pixelformat = This->pixelformat; + This->framedecode->bitsperpixel = This->bitsperpixel; } *ppIBitmapFrame = (IWICBitmapFrameDecode*)This->framedecode; diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 05c34e9..11c5a67 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -102,6 +102,10 @@ static void test_decode_24bpp(void) ok(dpiX == 96.0, "expected dpiX=96.0, got %f\n", dpiX); ok(dpiY == 96.0, "expected dpiY=96.0, got %f\n", dpiY); + hr = IWICBitmapFrameDecode_GetPixelFormat(framedecode, &guidresult); + ok(SUCCEEDED(hr), "GetPixelFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_WICPixelFormat24bppBGR), "unexpected pixel format\n"); + IWICBitmapFrameDecode_Release(framedecode); }

1 0

Vincent Povirk : windowscodecs: Simplify the BMP GetSize code and fix for top-down dibs.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 07538b79cbec7c398de9707eea4ef21a376cd90b URL: http://source.winehq.org/git/wine.git/?a=commit;h=07538b79cbec7c398de9707ee… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 1 15:53:47 2009 -0500 windowscodecs: Simplify the BMP GetSize code and fix for top-down dibs. --- dlls/windowscodecs/bmpdecode.c | 36 ++++++++++++------------------------ 1 files changed, 12 insertions(+), 24 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 46b2527..8391a1b 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -118,36 +118,24 @@ static ULONG WINAPI BmpFrameDecode_Release(IWICBitmapFrameDecode *iface) return ref; } -static HRESULT BmpHeader_GetSize(BITMAPV5HEADER *bih, UINT *puiWidth, UINT *puiHeight) -{ - switch (bih->bV5Size) - { - case sizeof(BITMAPCOREHEADER): - { - BITMAPCOREHEADER *bch = (BITMAPCOREHEADER*)bih; - *puiWidth = bch->bcWidth; - *puiHeight = bch->bcHeight; - return S_OK; - } - case sizeof(BITMAPCOREHEADER2): - case sizeof(BITMAPINFOHEADER): - case sizeof(BITMAPV4HEADER): - case sizeof(BITMAPV5HEADER): - *puiWidth = bih->bV5Width; - *puiHeight = bih->bV5Height; - return S_OK; - default: - return E_FAIL; - } -} - static HRESULT WINAPI BmpFrameDecode_GetSize(IWICBitmapFrameDecode *iface, UINT *puiWidth, UINT *puiHeight) { BmpFrameDecode *This = (BmpFrameDecode*)iface; TRACE("(%p,%p,%p)\n", iface, puiWidth, puiHeight); - return BmpHeader_GetSize(&This->bih, puiWidth, puiHeight); + if (This->bih.bV5Size == sizeof(BITMAPCOREHEADER)) + { + BITMAPCOREHEADER *bch = (BITMAPCOREHEADER*)&This->bih; + *puiWidth = bch->bcWidth; + *puiHeight = bch->bcHeight; + } + else + { + *puiWidth = This->bih.bV5Width; + *puiHeight = abs(This->bih.bV5Height); + } + return S_OK; } static HRESULT WINAPI BmpFrameDecode_GetPixelFormat(IWICBitmapFrameDecode *iface,

1 0

Vincent Povirk : windowscodecs: Implement CopyPixels for BMP decoder.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 5b7de464ca1d93ce92201bc6c0484ba6550fe073 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7de464ca1d93ce92201bc6c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 1 15:48:56 2009 -0500 windowscodecs: Implement CopyPixels for BMP decoder. --- dlls/windowscodecs/bmpdecode.c | 97 +++++++++++++++++++++++++++++++- dlls/windowscodecs/main.c | 53 +++++++++++++++++ dlls/windowscodecs/tests/bmpformat.c | 42 ++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 4 + 4 files changed, 193 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b7de464ca1d93ce92201…

1 0

Vincent Povirk : windowscodecs: Implement QueryCapability for BMP decoder.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 2322254c836febd6902ff2ae640d439c70565ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2322254c836febd6902ff2ae6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 1 16:03:37 2009 -0500 windowscodecs: Implement QueryCapability for BMP decoder. --- dlls/windowscodecs/bmpdecode.c | 19 +++++++++++++++++-- dlls/windowscodecs/tests/bmpformat.c | 10 +++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index a6b7577..b81987c 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -329,9 +329,14 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) { HRESULT hr; ULONG bytestoread, bytesread; + LARGE_INTEGER seek; if (This->initialized) return WINCODEC_ERR_WRONGSTATE; + seek.QuadPart = 0; + hr = IStream_Seek(stream, seek, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) return hr; + hr = IStream_Read(stream, &This->bfh, sizeof(BITMAPFILEHEADER), &bytesread); if (FAILED(hr)) return hr; if (bytesread != sizeof(BITMAPFILEHEADER) || @@ -483,8 +488,18 @@ static ULONG WINAPI BmpDecoder_Release(IWICBitmapDecoder *iface) static HRESULT WINAPI BmpDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, DWORD *pdwCapability) { - FIXME("(%p,%p,%p): stub\n", iface, pIStream, pdwCapability); - return E_NOTIMPL; + HRESULT hr; + BmpDecoder *This = (BmpDecoder*)iface; + + hr = BmpDecoder_ReadHeaders(This, pIStream); + if (FAILED(hr)) return hr; + + if (This->read_data_func == BmpFrameDecode_ReadUnsupported) + *pdwCapability = 0; + else + *pdwCapability = WICBitmapDecoderCapabilityCanDecodeAllImages; + + return S_OK; } static HRESULT WINAPI BmpDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index c266dda..fb6f491 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -157,7 +157,7 @@ static void test_decode_24bpp(void) /* cannot querycapability after initialize */ hr = IWICBitmapDecoder_QueryCapability(decoder, bmpstream, &capability); - todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, hr=%x\n", hr); + ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, hr=%x\n", hr); hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapDecoder, (void**)&decoder2); @@ -165,17 +165,17 @@ static void test_decode_24bpp(void) if (SUCCEEDED(hr)) { hr = IWICBitmapDecoder_QueryCapability(decoder2, bmpstream, &capability); - todo_wine ok(hr == S_OK, "QueryCapability failed, hr=%x\n", hr); - todo_wine ok(capability == (WICBitmapDecoderCapabilityCanDecodeAllImages), + ok(hr == S_OK, "QueryCapability failed, hr=%x\n", hr); + ok(capability == (WICBitmapDecoderCapabilityCanDecodeAllImages), "unexpected capabilities: %x\n", capability); /* cannot initialize after querycapability */ hr = IWICBitmapDecoder_Initialize(decoder2, bmpstream, WICDecodeMetadataCacheOnLoad); - todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, hr=%x\n", hr); + ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, hr=%x\n", hr); /* cannot querycapability twice */ hr = IWICBitmapDecoder_QueryCapability(decoder2, bmpstream, &capability); - todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, hr=%x\n", hr); + ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, hr=%x\n", hr); } IStream_Release(bmpstream);

1 0

Michael Stefaniuc : msvidc32: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: ece4f64ecfb370a11c532dd02a13b0468a7757b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece4f64ecfb370a11c532dd02… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:27:08 2009 +0200 msvidc32: Build language resource files separately. Do not include them from an other rc file. --- dlls/msvidc32/Makefile.in | 18 +++++++++++++++++- dlls/msvidc32/msvidc32_Da.rc | 2 ++ dlls/msvidc32/msvidc32_De.rc | 2 ++ dlls/msvidc32/msvidc32_En.rc | 2 ++ dlls/msvidc32/msvidc32_Fr.rc | 2 ++ dlls/msvidc32/msvidc32_Hu.rc | 2 ++ dlls/msvidc32/msvidc32_Ko.rc | 2 ++ dlls/msvidc32/msvidc32_Lt.rc | 4 ++-- dlls/msvidc32/msvidc32_Nl.rc | 2 ++ dlls/msvidc32/msvidc32_No.rc | 2 ++ dlls/msvidc32/msvidc32_Pl.rc | 2 ++ dlls/msvidc32/msvidc32_Pt.rc | 2 ++ dlls/msvidc32/msvidc32_Ro.rc | 2 ++ dlls/msvidc32/msvidc32_Ru.rc | 2 ++ dlls/msvidc32/msvidc32_Si.rc | 4 ++-- dlls/msvidc32/msvidc32_Sv.rc | 2 ++ dlls/msvidc32/msvidc32_Tr.rc | 2 ++ dlls/msvidc32/msvidc32_private.h | 2 ++ dlls/msvidc32/rsrc.rc | 37 ------------------------------------- 19 files changed, 51 insertions(+), 42 deletions(-) diff --git a/dlls/msvidc32/Makefile.in b/dlls/msvidc32/Makefile.in index 3f9be06..faa0f18 100644 --- a/dlls/msvidc32/Makefile.in +++ b/dlls/msvidc32/Makefile.in @@ -8,7 +8,23 @@ IMPORTS = user32 kernel32 C_SRCS = \ msvideo1.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + msvidc32_Da.rc \ + msvidc32_De.rc \ + msvidc32_En.rc \ + msvidc32_Fr.rc \ + msvidc32_Hu.rc \ + msvidc32_Ko.rc \ + msvidc32_Lt.rc \ + msvidc32_Nl.rc \ + msvidc32_No.rc \ + msvidc32_Pl.rc \ + msvidc32_Pt.rc \ + msvidc32_Ro.rc \ + msvidc32_Ru.rc \ + msvidc32_Si.rc \ + msvidc32_Sv.rc \ + msvidc32_Tr.rc @MAKE_DLL_RULES@ diff --git a/dlls/msvidc32/msvidc32_Da.rc b/dlls/msvidc32/msvidc32_Da.rc index 50ae3f6..0b28606 100644 --- a/dlls/msvidc32/msvidc32_Da.rc +++ b/dlls/msvidc32/msvidc32_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_De.rc b/dlls/msvidc32/msvidc32_De.rc index 1d0de70..c31635c 100644 --- a/dlls/msvidc32/msvidc32_De.rc +++ b/dlls/msvidc32/msvidc32_De.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_En.rc b/dlls/msvidc32/msvidc32_En.rc index 93c8518..8ac6b59 100644 --- a/dlls/msvidc32/msvidc32_En.rc +++ b/dlls/msvidc32/msvidc32_En.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Fr.rc b/dlls/msvidc32/msvidc32_Fr.rc index 3592f31..b250deb 100644 --- a/dlls/msvidc32/msvidc32_Fr.rc +++ b/dlls/msvidc32/msvidc32_Fr.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Hu.rc b/dlls/msvidc32/msvidc32_Hu.rc index c031963..2949bae 100644 --- a/dlls/msvidc32/msvidc32_Hu.rc +++ b/dlls/msvidc32/msvidc32_Hu.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Ko.rc b/dlls/msvidc32/msvidc32_Ko.rc index 11c18c1..e95cc94 100644 --- a/dlls/msvidc32/msvidc32_Ko.rc +++ b/dlls/msvidc32/msvidc32_Ko.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Lt.rc b/dlls/msvidc32/msvidc32_Lt.rc index f83bce3..ee75ead 100644 --- a/dlls/msvidc32/msvidc32_Lt.rc +++ b/dlls/msvidc32/msvidc32_Lt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + /* UTF-8 */ #pragma code_page(65001) @@ -26,5 +28,3 @@ STRINGTABLE DISCARDABLE IDS_NAME "MS-CRAM" IDS_DESCRIPTION "Wine Video 1 vaizdo kodekas" } - -#pragma code_page(default) diff --git a/dlls/msvidc32/msvidc32_Nl.rc b/dlls/msvidc32/msvidc32_Nl.rc index b68d3ef..c11ca47 100644 --- a/dlls/msvidc32/msvidc32_Nl.rc +++ b/dlls/msvidc32/msvidc32_Nl.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_No.rc b/dlls/msvidc32/msvidc32_No.rc index 6d27778..fa2a96f 100644 --- a/dlls/msvidc32/msvidc32_No.rc +++ b/dlls/msvidc32/msvidc32_No.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Pl.rc b/dlls/msvidc32/msvidc32_Pl.rc index af39271..221c41e 100644 --- a/dlls/msvidc32/msvidc32_Pl.rc +++ b/dlls/msvidc32/msvidc32_Pl.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Pt.rc b/dlls/msvidc32/msvidc32_Pt.rc index 8dcda92..ee0eed4 100644 --- a/dlls/msvidc32/msvidc32_Pt.rc +++ b/dlls/msvidc32/msvidc32_Pt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Ro.rc b/dlls/msvidc32/msvidc32_Ro.rc index fa7584a..62bcef0 100644 --- a/dlls/msvidc32/msvidc32_Ro.rc +++ b/dlls/msvidc32/msvidc32_Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Ru.rc b/dlls/msvidc32/msvidc32_Ru.rc index 2c84bff..1f1adc5 100644 --- a/dlls/msvidc32/msvidc32_Ru.rc +++ b/dlls/msvidc32/msvidc32_Ru.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Si.rc b/dlls/msvidc32/msvidc32_Si.rc index 060ad08..19d392f 100644 --- a/dlls/msvidc32/msvidc32_Si.rc +++ b/dlls/msvidc32/msvidc32_Si.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -25,5 +27,3 @@ STRINGTABLE DISCARDABLE IDS_NAME "MS-CRAM" IDS_DESCRIPTION "Wine Video 1 video kodek" } - -#pragma code_page(default) diff --git a/dlls/msvidc32/msvidc32_Sv.rc b/dlls/msvidc32/msvidc32_Sv.rc index 1f4770d..7c9b0bc 100644 --- a/dlls/msvidc32/msvidc32_Sv.rc +++ b/dlls/msvidc32/msvidc32_Sv.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Tr.rc b/dlls/msvidc32/msvidc32_Tr.rc index 2353b0c..d4b882b 100644 --- a/dlls/msvidc32/msvidc32_Tr.rc +++ b/dlls/msvidc32/msvidc32_Tr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_private.h b/dlls/msvidc32/msvidc32_private.h index b47c6e6..590600e 100644 --- a/dlls/msvidc32/msvidc32_private.h +++ b/dlls/msvidc32/msvidc32_private.h @@ -19,6 +19,8 @@ #ifndef __MSVIDC32_PRIVATE_H #define __MSVIDC32_PRIVATE_H +#include <windef.h> + #define IDS_NAME 100 #define IDS_DESCRIPTION 101 diff --git a/dlls/msvidc32/rsrc.rc b/dlls/msvidc32/rsrc.rc deleted file mode 100644 index 68c8dbf..0000000 --- a/dlls/msvidc32/rsrc.rc +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2005 Dmitry Timoshkov - * - * 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 "msvidc32_private.h" - -#include "msvidc32_Da.rc" -#include "msvidc32_De.rc" -#include "msvidc32_Fr.rc" -#include "msvidc32_En.rc" -#include "msvidc32_Hu.rc" -#include "msvidc32_Ko.rc" -#include "msvidc32_Lt.rc" -#include "msvidc32_Nl.rc" -#include "msvidc32_No.rc" -#include "msvidc32_Pl.rc" -#include "msvidc32_Pt.rc" -#include "msvidc32_Ro.rc" -#include "msvidc32_Ru.rc" -#include "msvidc32_Si.rc" -#include "msvidc32_Sv.rc" -#include "msvidc32_Tr.rc"

1 0

Michael Stefaniuc : sane.ds: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 6f4b74de5b5153cb6bd59fe253b1f83b65da5e3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4b74de5b5153cb6bd59fe25… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:27:58 2009 +0200 sane.ds: Build language resource files separately. Do not include them from an other rc file. --- dlls/sane.ds/Makefile.in | 18 +++++++++++++++++- dlls/sane.ds/resource.h | 4 ++++ dlls/sane.ds/rsrc.rc | 44 -------------------------------------------- dlls/sane.ds/sane_Da.rc | 2 ++ dlls/sane.ds/sane_De.rc | 2 ++ dlls/sane.ds/sane_En.rc | 2 ++ dlls/sane.ds/sane_Es.rc | 5 +++-- dlls/sane.ds/sane_Fi.rc | 2 ++ dlls/sane.ds/sane_Fr.rc | 2 ++ dlls/sane.ds/sane_Ko.rc | 2 ++ dlls/sane.ds/sane_Lt.rc | 4 ++-- dlls/sane.ds/sane_Nl.rc | 2 ++ dlls/sane.ds/sane_No.rc | 2 ++ dlls/sane.ds/sane_Pl.rc | 2 ++ dlls/sane.ds/sane_Pt.rc | 2 ++ dlls/sane.ds/sane_Ro.rc | 4 ++-- dlls/sane.ds/sane_Ru.rc | 2 ++ dlls/sane.ds/sane_Si.rc | 4 ++-- dlls/sane.ds/sane_Sv.rc | 2 ++ dlls/sane.ds/sane_Zh.rc | 4 ++-- 20 files changed, 56 insertions(+), 55 deletions(-) diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in index d136594..e394939 100644 --- a/dlls/sane.ds/Makefile.in +++ b/dlls/sane.ds/Makefile.in @@ -15,7 +15,23 @@ C_SRCS = \ ui.c RC_SRCS = \ - rsrc.rc + sane_Da.rc \ + sane_De.rc \ + sane_En.rc \ + sane_Es.rc \ + sane_Fi.rc \ + sane_Fr.rc \ + sane_Ko.rc \ + sane_Lt.rc \ + sane_Nl.rc \ + sane_No.rc \ + sane_Pl.rc \ + sane_Pt.rc \ + sane_Ro.rc \ + sane_Ru.rc \ + sane_Si.rc \ + sane_Sv.rc \ + sane_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/sane.ds/resource.h b/dlls/sane.ds/resource.h index abc2044..2454fbd 100644 --- a/dlls/sane.ds/resource.h +++ b/dlls/sane.ds/resource.h @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winbase.h> +#include <winuser.h> + #define IDD_DIALOG1 0x400 #define IDC_STATIC 0x401 diff --git a/dlls/sane.ds/rsrc.rc b/dlls/sane.ds/rsrc.rc deleted file mode 100644 index ac80eb9..0000000 --- a/dlls/sane.ds/rsrc.rc +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Top level resource file for Twain - * - * Copyright 2006 CodeWeavers, Aric Stewart - * - * 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 "winbase.h" -#include "winuser.h" -#include "winnls.h" - -#include "resource.h" - -#include "sane_Da.rc" -#include "sane_De.rc" -#include "sane_En.rc" -#include "sane_Es.rc" -#include "sane_Fi.rc" -#include "sane_Fr.rc" -#include "sane_Ko.rc" -#include "sane_Lt.rc" -#include "sane_Nl.rc" -#include "sane_No.rc" -#include "sane_Pl.rc" -#include "sane_Pt.rc" -#include "sane_Ro.rc" -#include "sane_Ru.rc" -#include "sane_Si.rc" -#include "sane_Sv.rc" -#include "sane_Zh.rc" diff --git a/dlls/sane.ds/sane_Da.rc b/dlls/sane.ds/sane_Da.rc index 5a93ff1..98d89da 100644 --- a/dlls/sane.ds/sane_Da.rc +++ b/dlls/sane.ds/sane_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_De.rc b/dlls/sane.ds/sane_De.rc index 172098e..a1be1e4 100644 --- a/dlls/sane.ds/sane_De.rc +++ b/dlls/sane.ds/sane_De.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_En.rc b/dlls/sane.ds/sane_En.rc index 3b58a0a..d0d56b8 100644 --- a/dlls/sane.ds/sane_En.rc +++ b/dlls/sane.ds/sane_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Es.rc b/dlls/sane.ds/sane_Es.rc index 0f0b4cb..c65ebf9 100644 --- a/dlls/sane.ds/sane_Es.rc +++ b/dlls/sane.ds/sane_Es.rc @@ -17,6 +17,9 @@ * 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 "resource.h" + #pragma code_page(65001) LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -39,5 +42,3 @@ STRINGTABLE DISCARDABLE 5 "%" 6 "ns" } - -#pragma code_page(default) diff --git a/dlls/sane.ds/sane_Fi.rc b/dlls/sane.ds/sane_Fi.rc index 85a664b..329eb06 100644 --- a/dlls/sane.ds/sane_Fi.rc +++ b/dlls/sane.ds/sane_Fi.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Fr.rc b/dlls/sane.ds/sane_Fr.rc index b54153c..49b0747 100644 --- a/dlls/sane.ds/sane_Fr.rc +++ b/dlls/sane.ds/sane_Fr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Ko.rc b/dlls/sane.ds/sane_Ko.rc index 980897a..4a145b2 100644 --- a/dlls/sane.ds/sane_Ko.rc +++ b/dlls/sane.ds/sane_Ko.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Lt.rc b/dlls/sane.ds/sane_Lt.rc index c96eceb..0afe173 100644 --- a/dlls/sane.ds/sane_Lt.rc +++ b/dlls/sane.ds/sane_Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -41,5 +43,3 @@ STRINGTABLE DISCARDABLE 5 "%" 6 "ns" } - -#pragma code_page(default) diff --git a/dlls/sane.ds/sane_Nl.rc b/dlls/sane.ds/sane_Nl.rc index 66559ab..ded7061 100644 --- a/dlls/sane.ds/sane_Nl.rc +++ b/dlls/sane.ds/sane_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 IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_No.rc b/dlls/sane.ds/sane_No.rc index 4d89f06..1392788 100644 --- a/dlls/sane.ds/sane_No.rc +++ b/dlls/sane.ds/sane_No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Pl.rc b/dlls/sane.ds/sane_Pl.rc index 43a7e8b..344d0c7 100644 --- a/dlls/sane.ds/sane_Pl.rc +++ b/dlls/sane.ds/sane_Pl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Pt.rc b/dlls/sane.ds/sane_Pt.rc index 4f4ffea..9b0ff41 100644 --- a/dlls/sane.ds/sane_Pt.rc +++ b/dlls/sane.ds/sane_Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Ro.rc b/dlls/sane.ds/sane_Ro.rc index 7199a61..dc02708 100644 --- a/dlls/sane.ds/sane_Ro.rc +++ b/dlls/sane.ds/sane_Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -39,5 +41,3 @@ STRINGTABLE DISCARDABLE 5 "%" 6 "ns" } - -#pragma code_page(default) diff --git a/dlls/sane.ds/sane_Ru.rc b/dlls/sane.ds/sane_Ru.rc index 58ee473..eefe277 100644 --- a/dlls/sane.ds/sane_Ru.rc +++ b/dlls/sane.ds/sane_Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Si.rc b/dlls/sane.ds/sane_Si.rc index ad6b875..04e7c67 100644 --- a/dlls/sane.ds/sane_Si.rc +++ b/dlls/sane.ds/sane_Si.rc @@ -18,6 +18,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 @@ -40,5 +42,3 @@ STRINGTABLE DISCARDABLE 5 "%" 6 "ns" } - -#pragma code_page(default) diff --git a/dlls/sane.ds/sane_Sv.rc b/dlls/sane.ds/sane_Sv.rc index 90aab55..dee4f45 100644 --- a/dlls/sane.ds/sane_Sv.rc +++ b/dlls/sane.ds/sane_Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Zh.rc b/dlls/sane.ds/sane_Zh.rc index 955b6e1..2487a6a 100644 --- a/dlls/sane.ds/sane_Zh.rc +++ b/dlls/sane.ds/sane_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) @@ -62,5 +64,3 @@ STRINGTABLE DISCARDABLE 5 "%" 6 "ns" } - -#pragma code_page(default)

1 0

Hans Leidekker : mlang: Add a test for IMultiLanguage2_IsCodePageInstallable.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 48efa30050df799f299c4c8369306e17c15a95db URL: http://source.winehq.org/git/wine.git/?a=commit;h=48efa30050df799f299c4c836… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 1 16:30:26 2009 +0200 mlang: Add a test for IMultiLanguage2_IsCodePageInstallable. --- dlls/mlang/tests/mlang.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index bd4fd6c..7a1290d 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1957,6 +1957,23 @@ static void test_GetFontUnicodeRanges(IMLangFontLink2 *font_link) DeleteDC(hdc); } +static void test_IsCodePageInstallable(IMultiLanguage2 *ml2) +{ + UINT i; + HRESULT hr; + + for (i = 0; i < 0xffff; i++) + { + hr = IMultiLanguage2_IsCodePageInstallable(ml2, i); + + /* it would be better to use IMultiLanguage2_ValidateCodePageEx here but that brings + * up an installation dialog on some platforms, even when specifying CPIOD_PEEK. + */ + if (IsValidCodePage(i)) + ok(hr == S_OK, "code page %u is valid but not installable 0x%08x\n", i, hr); + } +} + START_TEST(mlang) { IMultiLanguage *iML = NULL; @@ -2016,6 +2033,7 @@ START_TEST(mlang) test_multibyte_to_unicode_translations(iML2); test_IMultiLanguage2_ConvertStringFromUnicode(iML2); + test_IsCodePageInstallable(iML2); IMultiLanguage2_Release(iML2);

1 0

Aurimas Fišeras : oleview: Add Lithuanian translation.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 88aff8da884df48d2d7feda21e9a9f43964bad27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88aff8da884df48d2d7feda21… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Jun 30 23:53:55 2009 +0300 oleview: Add Lithuanian translation. --- programs/oleview/Lt.rc | 218 ++++++++++++++++++++++++++++++++++++++++++++++ programs/oleview/rsrc.rc | 1 + 2 files changed, 219 insertions(+), 0 deletions(-) diff --git a/programs/oleview/Lt.rc b/programs/oleview/Lt.rc new file mode 100644 index 0000000..ab887c2 --- /dev/null +++ b/programs/oleview/Lt.rc @@ -0,0 +1,218 @@ +/* + * OLE žiuryklė + * Lithuanian Language Support + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDM_MENU MENU +{ + POPUP "&Failas" + { + MENUITEM "Susieti su &failu...", IDM_BIND + MENUITEM "&Peržiūrėti TypeLib...", IDM_TYPELIB + MENUITEM SEPARATOR + MENUITEM "&Sistemos konfigūracija...", IDM_SYSCONF + MENUITEM "Paleisti &registro tvarkytuvę", IDM_REGEDIT + MENUITEM SEPARATOR + MENUITEM "Iš&eiti", IDM_EXIT + } + POPUP "&Objektas" + { + POPUP "&CoCreateInstance žymos bitai" + { + MENUITEM "CLSCTX_&INPROC_SERVER", IDM_FLAG_INSERV,CHECKED + MENUITEM "CLSCTX_INPROC_&HANDLER", IDM_FLAG_INHANDL + MENUITEM "CLSCTX_&LOCAL_SERVER", IDM_FLAG_LOCSERV,CHECKED + MENUITEM "CLSCTX_&REMOTE_SERVER", IDM_FLAG_REMSERV + } + MENUITEM SEPARATOR + MENUITEM "Peržiūrėti &tipų informaciją", IDM_TYPEINFO, GRAYED + MENUITEM SEPARATOR + MENUITEM "Sukurti &egzempliorių", IDM_CREATEINST, GRAYED + MENUITEM "Sukurti egzempliorių &kompiuteryje...", IDM_CREATEINSTON, GRAYED + MENUITEM "&Naikinti egzempliorių", IDM_RELEASEINST, GRAYED + MENUITEM SEPARATOR + MENUITEM "Kopijuoti C&LSID į iškarpinę", IDM_COPYCLSID, GRAYED + MENUITEM "Kopijuoti &HTML objekto gairę į iškarpinę", IDM_HTMLTAG, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Peržiūrėti...", IDM_VIEW, GRAYED + } + POPUP "&Rodinys" + { + MENUITEM "&Eksperto režimas", IDM_EXPERT,CHECKED + MENUITEM SEPARATOR + MENUITEM "&Paslėptų komponentų kategorijos", IDM_HIDDEN, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Įrankių juosta", IDM_TOOLBAR,CHECKED + MENUITEM "&Būsenos juosta", IDM_STATUSBAR,CHECKED + MENUITEM SEPARATOR + MENUITEM "&Atnaujinti\tF5", IDM_REFRESH + } + POPUP "&Žinynas" + { + MENUITEM "&Apie OLE žiurykę", IDM_ABOUT + } +} + +IDM_TYPELIB MENU +{ + POPUP "&Failas" + { + MENUITEM "Išsaugoti &kaip...", IDM_SAVEAS + MENUITEM "&Užverti", IDM_CLOSE + } + POPUP "&Rodinys" + { + MENUITEM "&Grupuoti pagal rūšį", IDM_GROUP + MENUITEM SEPARATOR + MENUITEM "&Įrankių juosta", IDM_TOOLBAR + MENUITEM "&Būsenos juosta", IDM_STATUSBAR,CHECKED + } +} + +STRINGTABLE +{ + IDS_APPNAME "OLE žiuryklė" + IDS_APPTITLE "OLE žiuryklė" + IDS_READY "Parengta" + IDS_ABOUT "OLE žiuryklė - OLE/COM objektų žiūryklė" + IDS_ABOUTVER "versija 1.0" + IDS_TYPELIBTITLE "ITypeLib žiūryklė" + IDS_OPEN "Atverti" + IDS_OPEN_TYPELIB_FILTER "TypeLib failai (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0Visi failai (*.*)\0*.*\0\0" + + IDM_BIND, "Susieti su failu per failo vardą" + IDM_TYPELIB, "Atverti TypeLib failą ir peržiūrėti jo turinį" + IDM_SYSCONF, "Keisti paskirstytojo COM kompiuterio nustatymus" + IDM_REGEDIT, "Paleisti Wine registro tvarkytuvę" + IDM_EXIT, "Išeiti iš programos. Paragina išsaugoti pakeitimus" + IDM_CREATEINST, "Sukurti pažymėto objekto egzempliorių" + IDM_CREATEINSTON, "Sukurti pažymėto objekto egzempliorių nurodytame kompiuteryje" + IDM_RELEASEINST, "Naikinti pažymėto objekto egzempliorių" + IDM_COPYCLSID, "Kopijuoti pažymėto elemento GUID į iškarpinę" + IDM_VIEW, "Rodyti žiūryklę pasirinktam elementui" + IDM_FLAG_INSERV, "Naudoti CLSCTX_INPROC_SERVER iškviečiant CoGetClassObject" + IDM_FLAG_INHANDL, "Naudoti CLSCTX_INPROC_HANDLER iškviečiant CoGetClassObject" + IDM_FLAG_LOCSERV, "Naudoti CLSCTX_LOCAL_SERVER iškviečiant CoGetClassObject" + IDM_FLAG_REMSERV, "Naudoti CLSCTX_REMOTE_SERVER iškviečiant CoGetClassObject" + IDM_EXPERT, "Perjungti tarp eksperto ir naujoko rodymo režimų" + IDM_HIDDEN, "Perjungti komponentų kategorijų, kurios turėjo būti nematomos, rodymą" + IDM_TOOLBAR, "Rodyti ar slėpti įrankių juostą" + IDM_STATUSBAR, "Rodyti ar slėpti būsenos juostą" + IDM_REFRESH, "Atnaujinti visus sąrašus" + IDM_ABOUT, "Parodo programos informaciją, versijos numerį ir autoriaus teises" + + IDM_SAVEAS, "Išsaugoti kaip .IDL ar .H failą" + IDM_CLOSE, "Užverti langą" + IDM_GROUP, "Grupuoti tipų informaciją pagal rūšį" + + IDS_TREE_OC, "Objektų klasės" + IDS_TREE_GBCC, "Sugrupuotos pagal komponento kategoriją" + IDS_TREE_O1O, "OLE 1.0 objektai" + IDS_TREE_CLO, "COM bibliotekos objektai" + IDS_TREE_AO, "Visi objektai" + IDS_TREE_AID, "Programų identifikatoriai" + IDS_TREE_TL, "Tipų bibliotekos" + IDS_TL_VER, "ver." + IDS_TREE_I, "Sąsajos" + + IDS_TAB_REG, "Registras" + IDS_TAB_IMPL, "Realizacija" + IDS_TAB_ACTIV, "Aktyvinimas" + + IDS_CGCOFAIL, "CoGetClassObject nepavyko." + IDS_ERROR_UNKN, "Nežinoma klaida" + IDS_TRUE, "Tiesa" + IDS_FALSE, "Netiesa" + IDS_BYTES, "baitai" + + IDS_ERROR_LOADTYPELIB, "LoadTypeLib( %s ) nepavyko ($%x)" + IDS_INHERITINTERFACES, "Paveldėtos sąsajos" +} + +DLG_CREATEINSTON DIALOG DISCARDABLE 0, 0, 250, 41 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Jungtis prie kito kompiuterio" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Kompiuterio vardas:", -1, 5, 6, 190, 8 + EDITTEXT IDC_MACHINE, 5, 16, 190, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "&Gerai", IDOK, 200, 5, 45, 14 + PUSHBUTTON "&Atsisakyti", IDCANCEL, 200, 22, 45, 14 +} + +DLG_SYSCONF DIALOG DISCARDABLE 0, 0, 170, 100 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Sistemos konfigūracija" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Sistemos nuostatos", -1, 5, 6, 160, 8 + CHECKBOX "Įjungti &paskirstytąjį COM", IDC_ENABLEDCOM, 5, 20, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "Įjungti &nuotolinį prisijungimą (tik Win95)", IDC_ENABLEREMOTE, 5, 35, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + LTEXT "Šios nuostatos keičia tik registro reikšmes.\nTai neturi jokios įtakos Wine našumui.", -1, 5, 50, 160, 40 + DEFPUSHBUTTON "&Gerai", IDOK, 70, 80, 45, 14 + PUSHBUTTON "&Atsisakyti", IDCANCEL, 120, 80, 45, 14 +} + +DLG_DEFAULT_IV DIALOG DISCARDABLE 0, 0, 280, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Numatytosios sąsajos žiūryklė" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Sąsaja", -1, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "IID:", -1, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Užverti", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&Peržiūrėti tipų informaciją", IDC_VIEWTYPEINFO, 6, 31, 90, 14, WS_DISABLED +} + +DLG_IPERSIST_IV DIALOG DISCARDABLE 0, 0, 280, 29 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "IPersist sąsajos žiūryklė" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Klasės vardas:", -1, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", -1, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Užverti", IDCANCEL, 230, 6, 45, 14 +} + +DLG_IPERSISTSTREAM_IV DIALOG DISCARDABLE 0, 0, 280, 68 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "IPersistStream sąsajos žiūryklė" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Klasės vardas:", -1, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", -1, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Užverti", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&IsDirty()", IDC_ISDIRTY_BUTTON, 6, 31, 50, 14 + LTEXT "???", IDC_ISDIRTY, 60, 34, 145, 8 + 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/rsrc.rc b/programs/oleview/rsrc.rc index 3f36889..14122b7 100644 --- a/programs/oleview/rsrc.rc +++ b/programs/oleview/rsrc.rc @@ -29,6 +29,7 @@ #include "Fr.rc" #include "Ja.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc"

1 0