June 2011 - Wine-Commits - list.winehq.org

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: 53dab6864efc6309c9074d7bed40f5931b6c0c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=53dab6864efc6309c9074d7be… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat May 21 10:12:43 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) diff --git a/po/lt.po b/po/lt.po index a22c6da..bfbf7d8 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,14 +6,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-05-23 19:33+0300\n" +"PO-Revision-Date: 2011-06-14 20:36+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Virtaal 0.7.0-rc1\n" +"X-Generator: Virtaal 0.7.0-rc2\n" "X-Project-Style: default\n" #: appwiz.rc:28 @@ -6004,11 +6004,7 @@ msgstr "Lentelė" #: shdoclc.rc:100 shell32.rc:82 #, fuzzy msgid "&Select" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Pažymėti\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Iš&rinkti" +msgstr "&Parinkti" #: shdoclc.rc:102 msgid "&Cell" @@ -8414,11 +8410,11 @@ msgstr "Įvedimo eilutė per ilga.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" -msgstr "" +msgstr "DirectX diagnostikos įrankis" #: dxdiag.rc:28 msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" -msgstr "" +msgstr "Naudojimas: dxdiag [/whql:off | /whql:on] [/t failas | /x failas]" #: hostname.rc:27 msgid "Usage: hostname\n" @@ -9302,13 +9298,8 @@ msgid "Status &Bar" msgstr "&Būsenos juosta" #: regedit.rc:67 winefile.rc:50 -#, fuzzy msgid "Sp&lit" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Skaidyti\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Polangių skirtukas" +msgstr "Po&langių skirtukas" #: regedit.rc:74 msgid "&Remove Favorite..."

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: 3933deb93a0b9aee3ed96a88466d2124e4f764cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3933deb93a0b9aee3ed96a884… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jun 14 19:59:25 2011 +0200 po: Update French translation. --- po/fr.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 9060caa..34505dc 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-04-29 09:22+0100\n" +"PO-Revision-Date: 2011-06-14 19:58+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -8476,11 +8476,11 @@ msgstr "La ligne d'entrée est trop longue.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" -msgstr "" +msgstr "Outil de diagnostic DirectX" #: dxdiag.rc:28 msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" -msgstr "" +msgstr "Usage : dxdiag [/whql:off | /whql:on] [/t fichier | /x fichier]" #: hostname.rc:27 msgid "Usage: hostname\n"

1 0

Marcus Meissner : shlwapi: Removed superflous NULL check (Coverity).
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: e9d4ca069c92de1c9b567fb294d6fc50ab7d9418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d4ca069c92de1c9b567fb29… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jun 15 10:07:55 2011 +0200 shlwapi: Removed superflous NULL check (Coverity). --- dlls/shlwapi/string.c | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 6102f3c..d0f0f0e 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -2473,17 +2473,12 @@ char WINAPI SHStripMneumonicA(LPCSTR lpszStr) if ((lpszIter = StrChrA(lpszStr, '&'))) { lpszTmp = CharNextA(lpszIter); - if (lpszTmp && *lpszTmp) + if (*lpszTmp) { if (*lpszTmp != '&') ch = *lpszTmp; - while (lpszIter && *lpszIter) - { - lpszTmp = CharNextA(lpszIter); - *lpszIter = *lpszTmp; - lpszIter = lpszTmp; - } + memmove( lpszIter, lpszTmp, strlen(lpszTmp) + 1 ); } } @@ -2507,17 +2502,12 @@ WCHAR WINAPI SHStripMneumonicW(LPCWSTR lpszStr) if ((lpszIter = StrChrW(lpszStr, '&'))) { lpszTmp = lpszIter + 1; - if (lpszTmp && *lpszTmp) + if (*lpszTmp) { if (*lpszTmp != '&') ch = *lpszTmp; - while (lpszIter && *lpszIter) - { - lpszTmp = lpszIter + 1; - *lpszIter = *lpszTmp; - lpszIter = lpszTmp; - } + memmove( lpszIter, lpszTmp, (strlenW(lpszTmp) + 1) * sizeof(WCHAR) ); } }

1 0

Austin English : winsta: Add a stub for WinStationGetProcessSid.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: ee31a6ae6fa0e8779898fd1292c33cfb7e110a22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee31a6ae6fa0e8779898fd129… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 14 14:56:45 2011 -0700 winsta: Add a stub for WinStationGetProcessSid. --- dlls/winsta/main.c | 8 ++++++++ dlls/winsta/winsta.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index 707e33f..505163b 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -59,3 +59,11 @@ BOOLEAN WINAPI WinStationQueryInformationW( HANDLE server, ULONG logon_id, WINST SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + +BOOL WINAPI WinStationGetProcessSid( PVOID a, HANDLE server, DWORD process_id, PFILETIME process_start_time, + PBYTE process_user_sid, PDWORD sid_size) +{ + FIXME( "(%p, %p, %d, %p, %p, %p): stub\n", a, server, process_id, process_start_time, process_user_sid, sid_size); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/dlls/winsta/winsta.spec b/dlls/winsta/winsta.spec index 53d4479..32185d3 100644 --- a/dlls/winsta/winsta.spec +++ b/dlls/winsta/winsta.spec @@ -39,7 +39,7 @@ @ stub WinStationGetLanAdapterNameA @ stub WinStationGetLanAdapterNameW @ stub WinStationGetMachinePolicy -@ stub WinStationGetProcessSid +@ stdcall WinStationGetProcessSid(ptr ptr long ptr ptr ptr) @ stub WinStationGetTermSrvCountersValue @ stub WinStationInstallLicense @ stub WinStationIsHelpAssistantSession

1 0

Hans Leidekker : wuapi: Add missing method stubs for IUpdateInstaller and IUpdateSearcher.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: d27478b4769daa79c882fbe70230e5a6d55a796e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d27478b4769daa79c882fbe70… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 15 09:52:26 2011 +0200 wuapi: Add missing method stubs for IUpdateInstaller and IUpdateSearcher. --- dlls/wuapi/installer.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wuapi/searcher.c | 78 ++++++++++++++++++++++++++++++++++- 2 files changed, 185 insertions(+), 1 deletions(-) diff --git a/dlls/wuapi/installer.c b/dlls/wuapi/installer.c index efc6ea3..f60d618 100644 --- a/dlls/wuapi/installer.c +++ b/dlls/wuapi/installer.c @@ -213,6 +213,103 @@ static HRESULT WINAPI update_installer_put_Updates( return E_NOTIMPL; } +static HRESULT WINAPI update_installer_BeginInstall( + IUpdateInstaller *This, + IUnknown *onProgressChanged, + IUnknown *onCompleted, + VARIANT state, + IInstallationJob **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_BeginUninstall( + IUpdateInstaller *This, + IUnknown *onProgressChanged, + IUnknown *onCompleted, + VARIANT state, + IInstallationJob **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_EndInstall( + IUpdateInstaller *This, + IInstallationJob *value, + IInstallationResult **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_EndUninstall( + IUpdateInstaller *This, + IInstallationJob *value, + IInstallationResult **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_Install( + IUpdateInstaller *This, + IInstallationResult **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_RunWizard( + IUpdateInstaller *This, + BSTR dialogTitle, + IInstallationResult **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_get_IsBusy( + IUpdateInstaller *This, + VARIANT_BOOL *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_Uninstall( + IUpdateInstaller *This, + IInstallationResult **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_get_AllowSourcePrompts( + IUpdateInstaller *This, + VARIANT_BOOL *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_put_AllowSourcePrompts( + IUpdateInstaller *This, + VARIANT_BOOL value ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_installer_get_RebootRequiredBeforeInstallation( + IUpdateInstaller *This, + VARIANT_BOOL *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static const struct IUpdateInstallerVtbl update_installer_vtbl = { update_installer_QueryInterface, @@ -232,6 +329,17 @@ static const struct IUpdateInstallerVtbl update_installer_vtbl = update_installer_get_ParentWindow, update_installer_get_Updates, update_installer_put_Updates, + update_installer_BeginInstall, + update_installer_BeginUninstall, + update_installer_EndInstall, + update_installer_EndUninstall, + update_installer_Install, + update_installer_RunWizard, + update_installer_get_IsBusy, + update_installer_Uninstall, + update_installer_get_AllowSourcePrompts, + update_installer_put_AllowSourcePrompts, + update_installer_get_RebootRequiredBeforeInstallation }; HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ) diff --git a/dlls/wuapi/searcher.c b/dlls/wuapi/searcher.c index da3dd81..522f99a 100644 --- a/dlls/wuapi/searcher.c +++ b/dlls/wuapi/searcher.c @@ -217,6 +217,74 @@ static HRESULT WINAPI update_searcher_EndSearch( return E_NOTIMPL; } +static HRESULT WINAPI update_searcher_EscapeString( + IUpdateSearcher *This, + BSTR unescaped, + BSTR *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_QueryHistory( + IUpdateSearcher *This, + LONG startIndex, + LONG count, + IUpdateHistoryEntryCollection **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_Search( + IUpdateSearcher *This, + BSTR criteria, + ISearchResult **retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_get_Online( + IUpdateSearcher *This, + VARIANT_BOOL *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_put_Online( + IUpdateSearcher *This, + VARIANT_BOOL value ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_GetTotalHistoryCount( + IUpdateSearcher *This, + LONG *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_get_ServiceID( + IUpdateSearcher *This, + BSTR *retval ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI update_searcher_put_ServiceID( + IUpdateSearcher *This, + BSTR value ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static const struct IUpdateSearcherVtbl update_searcher_vtbl = { update_searcher_QueryInterface, @@ -235,7 +303,15 @@ static const struct IUpdateSearcherVtbl update_searcher_vtbl = update_searcher_get_ServerSelection, update_searcher_put_ServerSelection, update_searcher_BeginSearch, - update_searcher_EndSearch + update_searcher_EndSearch, + update_searcher_EscapeString, + update_searcher_QueryHistory, + update_searcher_Search, + update_searcher_get_Online, + update_searcher_put_Online, + update_searcher_GetTotalHistoryCount, + update_searcher_get_ServiceID, + update_searcher_put_ServiceID }; HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj )

1 0

Krzysztof Nowicki : user32: Make more functions hot-patchable for Steam.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: 74159467168c7925857267f3aef71f09face2c9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=74159467168c7925857267f3a… Author: Krzysztof Nowicki <krissn(a)op.pl> Date: Tue Jun 14 22:24:31 2011 +0200 user32: Make more functions hot-patchable for Steam. --- dlls/user32/scroll.c | 18 ++++++++++-------- dlls/user32/sysparams.c | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 6e6bc37..be205ef 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -28,6 +28,8 @@ * If you discover missing features, or bugs, please note them below. */ +#include "config.h" + #include <stdarg.h> #include "windef.h" @@ -1611,7 +1613,7 @@ LRESULT ScrollBarWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM * (corresponding to the 76 different positions of the window on * the text), and info->nPage=25. */ -INT WINAPI SetScrollInfo(HWND hwnd, INT nBar, const SCROLLINFO *info, BOOL bRedraw) +INT WINAPI DECLSPEC_HOTPATCH SetScrollInfo(HWND hwnd, INT nBar, const SCROLLINFO *info, BOOL bRedraw) { TRACE("hwnd=%p nBar=%d info=%p, bRedraw=%d\n", hwnd, nBar, info, bRedraw); @@ -1781,7 +1783,7 @@ done: * ( if nBar is SB_CTL, GetScrollInfo returns TRUE even if nothing * is filled) */ -BOOL WINAPI GetScrollInfo(HWND hwnd, INT nBar, LPSCROLLINFO info) +BOOL WINAPI DECLSPEC_HOTPATCH GetScrollInfo(HWND hwnd, INT nBar, LPSCROLLINFO info) { TRACE("hwnd=%p nBar=%d info=%p\n", hwnd, nBar, info); @@ -1840,7 +1842,7 @@ BOOL WINAPI GetScrollBarInfo(HWND hwnd, LONG idObject, LPSCROLLBARINFO info) * Note the ambiguity when 0 is returned. Use GetLastError * to make sure there was an error (and to know which one). */ -INT WINAPI SetScrollPos( HWND hwnd, INT nBar, INT nPos, BOOL bRedraw) +INT WINAPI DECLSPEC_HOTPATCH SetScrollPos( HWND hwnd, INT nBar, INT nPos, BOOL bRedraw) { SCROLLINFO info; SCROLLBAR_INFO *infoPtr; @@ -1873,7 +1875,7 @@ INT WINAPI SetScrollPos( HWND hwnd, INT nBar, INT nPos, BOOL bRedraw) * There is ambiguity when 0 is returned. Use GetLastError * to make sure there was an error (and to know which one). */ -INT WINAPI GetScrollPos(HWND hwnd, INT nBar) +INT WINAPI DECLSPEC_HOTPATCH GetScrollPos(HWND hwnd, INT nBar) { TRACE("hwnd=%p nBar=%d\n", hwnd, nBar); @@ -1903,7 +1905,7 @@ INT WINAPI GetScrollPos(HWND hwnd, INT nBar) * Success: TRUE * Failure: FALSE */ -BOOL WINAPI SetScrollRange(HWND hwnd, INT nBar, INT minVal, INT maxVal, BOOL bRedraw) +BOOL WINAPI DECLSPEC_HOTPATCH SetScrollRange(HWND hwnd, INT nBar, INT minVal, INT maxVal, BOOL bRedraw) { SCROLLINFO info; @@ -1932,7 +1934,7 @@ BOOL WINAPI SetScrollRange(HWND hwnd, INT nBar, INT minVal, INT maxVal, BOOL bRe * RETURNS * TRUE if values is filled */ -BOOL WINAPI GetScrollRange(HWND hwnd, INT nBar, LPINT lpMin, LPINT lpMax) +BOOL WINAPI DECLSPEC_HOTPATCH GetScrollRange(HWND hwnd, INT nBar, LPINT lpMin, LPINT lpMax) { TRACE("hwnd=%p nBar=%d lpMin=%p lpMax=%p\n", hwnd, nBar, lpMin, lpMax); @@ -2004,7 +2006,7 @@ static BOOL SCROLL_ShowScrollBar( HWND hwnd, INT nBar, BOOL fShowH, BOOL fShowV * Success: TRUE * Failure: FALSE */ -BOOL WINAPI ShowScrollBar(HWND hwnd, INT nBar, BOOL fShow) +BOOL WINAPI DECLSPEC_HOTPATCH ShowScrollBar(HWND hwnd, INT nBar, BOOL fShow) { if ( !hwnd ) return FALSE; @@ -2020,7 +2022,7 @@ BOOL WINAPI ShowScrollBar(HWND hwnd, INT nBar, BOOL fShow) * * Enables or disables the scroll bars. */ -BOOL WINAPI EnableScrollBar( HWND hwnd, UINT nBar, UINT flags ) +BOOL WINAPI DECLSPEC_HOTPATCH EnableScrollBar( HWND hwnd, UINT nBar, UINT flags ) { BOOL bFineWithMe; SCROLLBAR_INFO *infoPtr; diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 0bd1dd2..5423bcf 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2910,7 +2910,7 @@ UINT WINAPI GetDoubleClickTime(void) /************************************************************************* * GetSysColor (USER32.@) */ -COLORREF WINAPI GetSysColor( INT nIndex ) +COLORREF WINAPI DECLSPEC_HOTPATCH GetSysColor( INT nIndex ) { if (nIndex >= 0 && nIndex < NUM_SYS_COLORS) return SysColors[nIndex]; @@ -3025,7 +3025,7 @@ DWORD_PTR WINAPI SetSysColorsTemp( const COLORREF *pPens, const HBRUSH *pBrushes /*********************************************************************** * GetSysColorBrush (USER32.@) */ -HBRUSH WINAPI GetSysColorBrush( INT index ) +HBRUSH WINAPI DECLSPEC_HOTPATCH GetSysColorBrush( INT index ) { if (0 <= index && index < NUM_SYS_COLORS) return SysColorBrushes[index]; WARN("Unknown index(%d)\n", index );

1 0

Vincent Povirk : windowscodecs: Treat unspecified extra channels as alpha data.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: 785f84a63c52530760185aa82cfb6d0090a316d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=785f84a63c52530760185aa82… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jun 14 14:30:26 2011 -0500 windowscodecs: Treat unspecified extra channels as alpha data. --- dlls/windowscodecs/tiffformat.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 1175a77..65de4ff 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -347,12 +347,10 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) else switch(extra_samples[0]) { - case 0: /* Unspecified data */ - decode_info->format = &GUID_WICPixelFormat32bppBGR; - break; case 1: /* Associated (pre-multiplied) alpha data */ decode_info->format = &GUID_WICPixelFormat32bppPBGRA; break; + case 0: /* Unspecified data */ case 2: /* Unassociated alpha data */ decode_info->format = &GUID_WICPixelFormat32bppBGRA; break; @@ -367,13 +365,10 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) else switch(extra_samples[0]) { - case 0: /* Unspecified data */ - /* decode_info->format = &GUID_WICPixelFormat64bppRGB; */ - FIXME("64-bit RGB is unsupported\n"); - return E_FAIL; case 1: /* Associated (pre-multiplied) alpha data */ decode_info->format = &GUID_WICPixelFormat64bppPRGBA; break; + case 0: /* Unspecified data */ case 2: /* Unassociated alpha data */ decode_info->format = &GUID_WICPixelFormat64bppRGBA; break;

1 0

David Hedberg : rsaenh: Don' t fail on signature verification if the signed hash lacks the OID.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: f8755d84221ce6dc803af2ea89ae98d7e3260393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8755d84221ce6dc803af2ea8… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Wed Jun 15 06:21:30 2011 +0200 rsaenh: Don't fail on signature verification if the signed hash lacks the OID. --- dlls/rsaenh/rsaenh.c | 15 ++++++++++----- dlls/rsaenh/tests/rsaenh.c | 23 +++++++++++++++++------ 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 61d1b87..2516af6 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -4472,16 +4472,21 @@ BOOL WINAPI RSAENH_CPVerifySignature(HCRYPTPROV hProv, HCRYPTHASH hHash, CONST B goto cleanup; } - if (!build_hash_signature(pbConstructed, dwSigLen, aiAlgid, abHashValue, dwHashLen, dwFlags)) { + if (build_hash_signature(pbConstructed, dwSigLen, aiAlgid, abHashValue, dwHashLen, dwFlags) && + !memcmp(pbDecrypted, pbConstructed, dwSigLen)) { + res = TRUE; goto cleanup; } - if (memcmp(pbDecrypted, pbConstructed, dwSigLen)) { - SetLastError(NTE_BAD_SIGNATURE); + if (!(dwFlags & CRYPT_NOHASHOID) && + build_hash_signature(pbConstructed, dwSigLen, aiAlgid, abHashValue, dwHashLen, dwFlags|CRYPT_NOHASHOID) && + !memcmp(pbDecrypted, pbConstructed, dwSigLen)) { + res = TRUE; goto cleanup; } - - res = TRUE; + + SetLastError(NTE_BAD_SIGNATURE); + cleanup: HeapFree(GetProcessHeap(), 0, pbConstructed); HeapFree(GetProcessHeap(), 0, pbDecrypted); diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index ccccb59..27fedd9 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1771,15 +1771,14 @@ static void test_verify_signature(void) { ok(result, "%08x\n", GetLastError()); if (!result) return; - result = CryptVerifySignature(hHash, abSignatureMD2NoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); + /* It seems that CPVerifySignature doesn't care about the OID at all. */ + result = CryptVerifySignature(hHash, abSignatureMD2NoOID, 128, hPubSignKey, NULL, 0); ok(result, "%08x\n", GetLastError()); if (!result) return; - /* Next test fails on WinXP SP2. It seems that CPVerifySignature doesn't care about - * the OID at all. */ - /*result = CryptVerifySignature(hHash, abSignatureMD2NoOID, 128, hPubSignKey, NULL, 0); - ok(!result && GetLastError()==NTE_BAD_SIGNATURE, "%08lx\n", GetLastError()); - if (result) return;*/ + result = CryptVerifySignature(hHash, abSignatureMD2NoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); + ok(result, "%08x\n", GetLastError()); + if (!result) return; CryptDestroyHash(hHash); @@ -1795,6 +1794,10 @@ static void test_verify_signature(void) { ok(result, "%08x\n", GetLastError()); if (!result) return; + result = CryptVerifySignature(hHash, abSignatureMD4NoOID, 128, hPubSignKey, NULL, 0); + ok(result, "%08x\n", GetLastError()); + if (!result) return; + result = CryptVerifySignature(hHash, abSignatureMD4NoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); ok(result, "%08x\n", GetLastError()); if (!result) return; @@ -1813,6 +1816,10 @@ static void test_verify_signature(void) { ok(result, "%08x\n", GetLastError()); if (!result) return; + result = CryptVerifySignature(hHash, abSignatureMD5NoOID, 128, hPubSignKey, NULL, 0); + ok(result, "%08x\n", GetLastError()); + if (!result) return; + result = CryptVerifySignature(hHash, abSignatureMD5NoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); ok(result, "%08x\n", GetLastError()); if (!result) return; @@ -1831,6 +1838,10 @@ static void test_verify_signature(void) { ok(result, "%08x\n", GetLastError()); if (!result) return; + result = CryptVerifySignature(hHash, abSignatureSHANoOID, 128, hPubSignKey, NULL, 0); + ok(result, "%08x\n", GetLastError()); + if (!result) return; + result = CryptVerifySignature(hHash, abSignatureSHANoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); ok(result, "%08x\n", GetLastError()); if (!result) return;

1 0

Henri Verbeet : wined3d: Don' t clear the alloc flags in wined3d_surface_set_format().
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: 8153674c4a25c625c5705a182792300b66475f9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8153674c4a25c625c5705a182… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 14 20:28:12 2011 +0200 wined3d: Don't clear the alloc flags in wined3d_surface_set_format(). Changing the format is only allowed for surfaces with format WINED3DFMT_UNKNOWN, in which case there can't be a GL texture allocated. --- dlls/wined3d/surface.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6202513..132a98a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3099,7 +3099,6 @@ HRESULT CDECL wined3d_surface_set_format(struct wined3d_surface *surface, enum w surface->resource.size = wined3d_format_calculate_size(format, surface->resource.device->surface_alignment, surface->pow2Width, surface->pow2Height); surface->flags |= (WINED3DFMT_D16_LOCKABLE == format_id) ? SFLAG_LOCKABLE : 0; - surface->flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); surface->resource.format = format; TRACE("size %u, byte_count %u\n", surface->resource.size, format->byte_count);

1 0

Henri Verbeet : wined3d: Check the source rectangle is a multiple of the format block size in wined3d_device_update_surface ().
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: c19c26e4be76e206043f8a81b5b5f39589df4cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19c26e4be76e206043f8a81b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 14 20:28:10 2011 +0200 wined3d: Check the source rectangle is a multiple of the format block size in wined3d_device_update_surface(). --- dlls/wined3d/device.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d907d9a..ba5db37 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4741,6 +4741,7 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, UINT update_w, update_h; CONVERT_TYPES convert; UINT dst_w, dst_h; + UINT src_w, src_h; DWORD sampler; POINT p; RECT r; @@ -4792,6 +4793,9 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } + src_w = src_surface->resource.width; + src_h = src_surface->resource.height; + dst_w = dst_surface->resource.width; dst_h = dst_surface->resource.height; @@ -4805,6 +4809,14 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } + /* NPOT block sizes would be silly. */ + if ((update_w & (src_format->block_width - 1) || update_h & (src_format->block_height - 1)) + && (src_w != update_w || dst_w != update_w || src_h != update_h || dst_h != update_h)) + { + WARN("Update rect not block-aligned.\n"); + return WINED3DERR_INVALIDCALL; + } + /* This call loads the OpenGL surface directly, instead of copying the * surface to the destination's sysmem copy. If surface conversion is * needed, use BltFast instead to copy in sysmem and use regular surface @@ -4831,8 +4843,7 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, if (!data.addr) ERR("Source surface has no allocated memory, but should be a sysmem surface.\n"); - surface_upload_data(dst_surface, gl_info, src_format, src_rect, - src_surface->resource.width, dst_point, FALSE, &data); + surface_upload_data(dst_surface, gl_info, src_format, src_rect, src_w, dst_point, FALSE, &data); context_release(context);

1 0