wine-commits July 2009

wine-commits@winehq.org

4 participants
1067 discussions

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

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: 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 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 : 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

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

Paul Vriens : urlmon/tests: Don't check for out of memory (Coverity).
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 024725515ecd3d55fd546649b55eed09e5371d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=024725515ecd3d55fd546649b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 2 10:13:51 2009 +0200 urlmon/tests: Don't check for out of memory (Coverity). --- dlls/urlmon/tests/misc.c | 33 +++++++++++++-------------------- 1 files changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 6436cd7..674092a 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1191,26 +1191,19 @@ static void test_user_agent(void) ok(size > 0, "size=%d, expected non-zero\n", size); str2 = HeapAlloc(GetProcessHeap(), 0, (size+20)*sizeof(CHAR)); - if (!str2) - { - skip("skipping rest of ObtainUserAgent tests, out of memory\n"); - } - else - { - saved = size; - hres = ObtainUserAgentString(0, str2, &size); - ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); - ok(size == saved, "size=%d, expected %d\n", size, saved); - ok(strlen(expected) <= strlen(str2) && - !memcmp(expected, str2, strlen(expected)*sizeof(CHAR)), - "user agent was \"%s\", expected to start with \"%s\"\n", - str2, expected); - - size = saved+10; - hres = ObtainUserAgentString(0, str2, &size); - ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); - ok(size == saved, "size=%d, expected %d\n", size, saved); - } + saved = size; + hres = ObtainUserAgentString(0, str2, &size); + ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); + ok(size == saved, "size=%d, expected %d\n", size, saved); + ok(strlen(expected) <= strlen(str2) && + !memcmp(expected, str2, strlen(expected)*sizeof(CHAR)), + "user agent was \"%s\", expected to start with \"%s\"\n", + str2, expected); + + size = saved+10; + hres = ObtainUserAgentString(0, str2, &size); + ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); + ok(size == saved, "size=%d, expected %d\n", size, saved); size = 0; hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, NULL, 0, &size, 0);

1 0

Michael Stefaniuc : oleaut32: Fix a small error in a comment.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: eddc78e4803ccd65fbf9ca41e08f8639be5298b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddc78e4803ccd65fbf9ca41e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:36:55 2009 +0200 oleaut32: Fix a small error in a comment. --- dlls/oleaut32/variant.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 37965f8..7a5f325 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -588,7 +588,7 @@ void WINAPI VariantInit(VARIANTARG* pVarg) * * RETURNS * Success: S_OK. Any previous value in pVarg is freed and its type is set to VT_EMPTY. - * Failure: DISP_E_BADVARTYPE, if the variant is a not a valid variant type. + * Failure: DISP_E_BADVARTYPE, if the variant is not a valid variant type. */ HRESULT WINAPI VariantClear(VARIANTARG* pVarg) {

1 0

Michael Stefaniuc : notepad: Fix the Finnish translation.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 55b1a1977e55e81db77ae1fe2c35dd659e522cc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b1a1977e55e81db77ae1fe2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:36:41 2009 +0200 notepad: Fix the Finnish translation. --- programs/notepad/Fi.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Fi.rc b/programs/notepad/Fi.rc index bd4b204..914a03f 100644 --- a/programs/notepad/Fi.rc +++ b/programs/notepad/Fi.rc @@ -52,6 +52,7 @@ POPUP "&Muokkaa" { POPUP "&Etsi" { MENUITEM "Etsi...", CMD_SEARCH MENUITEM "Etsi &seuraava\tF3", CMD_SEARCH_NEXT + MENUITEM "&Korvaa...\tCtrl+H", CMD_REPLACE } POPUP "&Apua" { MENUITEM "&Sis�lt�", CMD_HELP_CONTENTS

1 0

Michael Stefaniuc : hhctrl.ocx: Fix a memory leak on an error path (Smatch) .
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: d6eb5eb7c6f828474da2436023f422725016b119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6eb5eb7c6f828474da243602… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:32:31 2009 +0200 hhctrl.ocx: Fix a memory leak on an error path (Smatch). --- dlls/hhctrl.ocx/chm.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index c3a7499..b7df8e7 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -370,8 +370,10 @@ CHMInfo *OpenCHM(LPCWSTR szFile) if (!(ret = heap_alloc_zero(sizeof(CHMInfo)))) return NULL; - if (!(ret->szFile = strdupW(szFile))) + if (!(ret->szFile = strdupW(szFile))) { + heap_free(ret); return NULL; + } hres = CoCreateInstance(&CLSID_ITStorage, NULL, CLSCTX_INPROC_SERVER, &IID_IITStorage, (void **) &ret->pITStorage) ;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2009