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

Michael Stefaniuc : sane.ds: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

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

Vincent Povirk : include: Define some WIC pixel format GUIDs.
by Alexandre Julliard July 2, 2009

July 2, 2009

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 July 2, 2009

July 2, 2009

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

Michael Stefaniuc : oleaut32: Fix a small error in a comment.
by Alexandre Julliard July 2, 2009

July 2, 2009

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

Vincent Povirk : windowscodecs: Implement QueryCapability for BMP decoder.
by Alexandre Julliard July 2, 2009

July 2, 2009

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

Paul Vriens : urlmon/tests: Don't check for out of memory (Coverity).
by Alexandre Julliard July 2, 2009

July 2, 2009

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

Vincent Povirk : windowscodecs: Simplify the BMP GetSize code and fix for top-down dibs.
by Alexandre Julliard July 2, 2009

July 2, 2009

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 July 2, 2009

July 2, 2009

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

Michael Stefaniuc : notepad: Fix the Finnish translation.
by Alexandre Julliard July 2, 2009

July 2, 2009

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

Aurimas Fišeras : winmm: Add Lithuanian translation.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: f404fd787f730b02867ee549e3cdd7922981db50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f404fd787f730b02867ee549e… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jul 1 19:28:21 2009 +0300 winmm: Add Lithuanian translation. --- dlls/winmm/winmm_Lt.rc | 133 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/winmm/winmm_res.rc | 1 + 2 files changed, 134 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f404fd787f730b02867ee…

1 0