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

Jacek Caban : urlmon: Don't threat '#' as path delimiter in file URIs.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: 1de7771a7ce2a20abd1eff32073420c6d8786fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1de7771a7ce2a20abd1eff320… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 24 15:06:17 2014 +0200 urlmon: Don't threat '#' as path delimiter in file URIs. --- dlls/urlmon/tests/uri.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 10 ++--- 2 files changed, 113 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index d448566..44ab0a8 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -385,6 +385,31 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, + { "file:///z:/test dir/README.txt#hash part", 0, S_OK, FALSE, + { + {"file:///z:/test%20dir/README.txt#hash%20part",S_OK}, + {"",S_FALSE}, + {"file:///z:/test%20dir/README.txt#hash%20part",S_OK}, + {"",S_FALSE}, + {".txt#hash%20part",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/z:/test%20dir/README.txt#hash%20part",S_OK}, + {"/z:/test%20dir/README.txt#hash%20part",S_OK}, + {"",S_FALSE}, + {"file:///z:/test dir/README.txt#hash part",S_OK}, + {"file",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, { "urn:nothing:should:happen here", 0, S_OK, FALSE, { {"urn:nothing:should:happen here",S_OK,FALSE}, @@ -587,6 +612,81 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, + { "C:/test/test.mp3#fragment|part", Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME|Uri_CREATE_FILE_USE_DOS_PATH|Uri_CREATE_NO_DECODE_EXTRA_INFO, S_OK, FALSE, + { + {"file://C:\\test\\test.mp3#fragment|part",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file://C:\\test\\test.mp3#fragment|part",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".mp3#fragment|part",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"C:\\test\\test.mp3#fragment|part",S_OK,FALSE}, + {"C:\\test\\test.mp3#fragment|part",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"C:/test/test.mp3#fragment|part",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "C:/test/test.mp3?query|part", Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME|Uri_CREATE_FILE_USE_DOS_PATH|Uri_CREATE_NO_DECODE_EXTRA_INFO, S_OK, FALSE, + { + {"file://C:\\test\\test.mp3?query|part",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file://C:\\test\\test.mp3?query|part",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".mp3",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"C:\\test\\test.mp3",S_OK,FALSE}, + {"C:\\test\\test.mp3?query|part",S_OK,FALSE}, + {"?query|part",S_OK,FALSE}, + {"C:/test/test.mp3?query|part",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "C:/test/test.mp3?query|part#hash|part", Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME|Uri_CREATE_FILE_USE_DOS_PATH|Uri_CREATE_NO_DECODE_EXTRA_INFO, S_OK, FALSE, + { + {"file://C:\\test\\test.mp3?query|part#hash|part",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file://C:\\test\\test.mp3?query|part#hash|part",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".mp3",S_OK,FALSE}, + {"#hash|part",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"C:\\test\\test.mp3",S_OK,FALSE}, + {"C:\\test\\test.mp3?query|part",S_OK,FALSE}, + {"?query|part",S_OK,FALSE}, + {"C:/test/test.mp3?query|part#hash|part",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, { "www.winehq.org/test", Uri_CREATE_ALLOW_IMPLICIT_WILDCARD_SCHEME, S_OK, FALSE, { {"*:www.winehq.org/test",S_OK,FALSE}, @@ -11137,6 +11237,14 @@ static const create_urlmon_test_t create_urlmon_tests[] = { "file:///c:/dir/file.txt", "file:///c:/dir/file.txt", "file:///c:/dir/file.txt", + }, + { + "c:\\dir\\file.txt#frag|part",Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, + NULL,0, + "file://c:\\dir\\file.txt#frag|part", + "file:///c:/dir/file.txt#frag%7Cpart", + "file:///c:/dir/file.txt#frag%7Cpart", + "file:///c:/dir/file.txt#frag%7Cpart", } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 1f18bc6..e43d372 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -348,8 +348,8 @@ static inline BOOL is_hexdigit(WCHAR val) { (val >= '0' && val <= '9')); } -static inline BOOL is_path_delim(WCHAR val) { - return (!val || val == '#' || val == '?'); +static inline BOOL is_path_delim(URL_SCHEME scheme, WCHAR val) { + return (!val || (val == '#' && scheme != URL_SCHEME_FILE) || val == '?'); } static inline BOOL is_slash(WCHAR c) @@ -1842,7 +1842,7 @@ static BOOL parse_path_hierarchical(const WCHAR **ptr, parse_data *data, DWORD f static const WCHAR slash[] = {'/',0}; const BOOL is_file = data->scheme_type == URL_SCHEME_FILE; - if(is_path_delim(**ptr)) { + if(is_path_delim(data->scheme_type, **ptr)) { if(data->scheme_type == URL_SCHEME_WILDCARD && !data->must_have_path) { data->path = NULL; data->path_len = 0; @@ -1852,7 +1852,7 @@ static BOOL parse_path_hierarchical(const WCHAR **ptr, parse_data *data, DWORD f data->path_len = 1; } } else { - while(!is_path_delim(**ptr)) { + while(!is_path_delim(data->scheme_type, **ptr)) { if(**ptr == '%' && data->scheme_type != URL_SCHEME_UNKNOWN && !is_file) { if(!check_pct_encoded(ptr)) { *ptr = start; @@ -1927,7 +1927,7 @@ static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags) else data->path = *ptr; - while(!is_path_delim(**ptr)) { + while(!is_path_delim(data->scheme_type, **ptr)) { if(**ptr == '%' && known_scheme) { if(!check_pct_encoded(ptr)) { *ptr = data->path;

1 0

Piotr Caban : msi: Add more feature state tests.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: de9f19df32f9beed1bcd81dd929543d87db0fc4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=de9f19df32f9beed1bcd81dd9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 24 12:35:46 2014 +0200 msi: Add more feature state tests. --- dlls/msi/tests/package.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de9f19df32f9beed1bcd8…

1 0

Alexandre Julliard : vnbt.vxd: Include winsock2.h before other headers.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: b6033972bf55b080392f391b72110d28280c1b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6033972bf55b080392f391b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 19:49:57 2014 +0200 vnbt.vxd: Include winsock2.h before other headers. --- dlls/vnbt.vxd/vnbt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vnbt.vxd/vnbt.c b/dlls/vnbt.vxd/vnbt.c index 9386a83..17f7d96 100644 --- a/dlls/vnbt.vxd/vnbt.c +++ b/dlls/vnbt.vxd/vnbt.c @@ -23,8 +23,8 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" -#include "iphlpapi.h" #include "winsock2.h" +#include "iphlpapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(vxd);

1 0

Jacek Caban : wine/debug.h: Added debugstr_variant and debugstr_vt aliases and removed all duplicated implementations.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: d2886a05f9fe26c89c50c7bce86bc0656c63643c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2886a05f9fe26c89c50c7bce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 24 16:26:23 2014 +0200 wine/debug.h: Added debugstr_variant and debugstr_vt aliases and removed all duplicated implementations. --- dlls/ieframe/ieframe.h | 2 -- dlls/ieframe/ieframe_main.c | 27 ------------------------ dlls/jscript/jscript.h | 1 - dlls/jscript/jsutils.c | 29 -------------------------- dlls/mshtml/main.c | 31 ---------------------------- dlls/mshtml/mshtml_private.h | 1 - dlls/msxml3/main.c | 44 ---------------------------------------- dlls/msxml3/msxml_private.h | 2 -- dlls/oleacc/main.c | 32 ----------------------------- dlls/oleacc/oleacc_private.h | 1 - dlls/oleaut32/variant.c | 10 --------- dlls/oleaut32/variant.h | 3 --- dlls/taskschd/taskschd.c | 31 ---------------------------- dlls/taskschd/taskschd_private.h | 1 - dlls/vbscript/vbscript.h | 2 -- dlls/vbscript/vbscript_main.c | 32 ----------------------------- dlls/wbemprox/wbemprox_private.h | 31 ---------------------------- dlls/winhttp/request.c | 3 ++- dlls/winhttp/winhttp_private.h | 31 ---------------------------- dlls/wshom.ocx/shell.c | 32 ----------------------------- include/wine/debug.h | 5 +++++ 21 files changed, 7 insertions(+), 344 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2886a05f9fe26c89c50c…

1 0

Piotr Caban : msi: Don' t check feature install level on features specified in arguments.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: b1a4055245db5cf7b8ba2e3d0d0839bfdb1ca2e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1a4055245db5cf7b8ba2e3d0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 24 12:35:37 2014 +0200 msi: Don't check feature install level on features specified in arguments. --- dlls/msi/action.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9dc804c..41f367b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1675,7 +1675,7 @@ static BOOL process_state_property(MSIPACKAGE* package, int level, LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - if (strcmpW( property, szRemove ) && !is_feature_selected( feature, level )) + if (feature->Level <= 0) continue; if (reinstall) @@ -1838,6 +1838,8 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) { FeatureList *fl; + if (!is_feature_selected( feature, level )) continue; + LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) { if (fl->feature->Attributes & msidbFeatureAttributesFollowParent && @@ -1862,8 +1864,6 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) debugstr_w(feature->Feature), feature->Level, feature->Installed, feature->ActionRequest, feature->Action); - if (!is_feature_selected( feature, level )) continue; - /* features with components that have compressed files are made local */ LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) {

1 0

Piotr Caban : msi: Fix feature actions overriding in process_state_property.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: 0dff7bff9afd6a69340ad99a6f348740b1ea3a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dff7bff9afd6a69340ad99a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 24 12:35:31 2014 +0200 msi: Fix feature actions overriding in process_state_property. --- dlls/msi/action.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index feb8296..9dc804c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1666,6 +1666,8 @@ static BOOL process_state_property(MSIPACKAGE* package, int level, { LPWSTR override; MSIFEATURE *feature; + BOOL remove = !strcmpW(property, szRemove); + BOOL reinstall = !strcmpW(property, szReinstall); override = msi_dup_property( package->db, property ); if (!override) @@ -1676,15 +1678,15 @@ static BOOL process_state_property(MSIPACKAGE* package, int level, if (strcmpW( property, szRemove ) && !is_feature_selected( feature, level )) continue; - if (!strcmpW(property, szReinstall)) state = feature->Installed; + if (reinstall) + state = (feature->Installed == INSTALLSTATE_ABSENT ? INSTALLSTATE_UNKNOWN : feature->Installed); + else if (remove) + state = (feature->Installed == INSTALLSTATE_ABSENT ? INSTALLSTATE_UNKNOWN : INSTALLSTATE_ABSENT); if (!strcmpiW( override, szAll )) { - if (feature->Installed != state) - { - feature->Action = state; - feature->ActionRequest = state; - } + feature->Action = state; + feature->ActionRequest = state; } else { @@ -1698,11 +1700,8 @@ static BOOL process_state_property(MSIPACKAGE* package, int level, if ((ptr2 && strlenW(feature->Feature) == len && !strncmpW(ptr, feature->Feature, len)) || (!ptr2 && !strcmpW(ptr, feature->Feature))) { - if (feature->Installed != state) - { - feature->Action = state; - feature->ActionRequest = state; - } + feature->Action = state; + feature->ActionRequest = state; break; } if (ptr2)

1 0

Nikolay Sivov : t2embed: Added TTDeleteEmbeddedFont() stub.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: c27e5ca511d65dfd1a516430676ef9b77fdccd53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c27e5ca511d65dfd1a5164306… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 24 08:27:33 2014 +0400 t2embed: Added TTDeleteEmbeddedFont() stub. --- dlls/t2embed/main.c | 6 ++++++ dlls/t2embed/t2embed.spec | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index e92c49c..e1a880d 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -84,3 +84,9 @@ LONG WINAPI TTIsEmbeddingEnabled(HDC hDC, BOOL *enabled) if (enabled) *enabled = FALSE; return E_API_NOTIMPL; } + +LONG WINAPI TTDeleteEmbeddedFont(HANDLE hFontReference, ULONG flags, ULONG *status) +{ + FIXME("(%p 0x%08x %p) stub\n", hFontReference, flags, status); + return E_API_NOTIMPL; +} diff --git a/dlls/t2embed/t2embed.spec b/dlls/t2embed/t2embed.spec index 120eaaa..e3be15c 100644 --- a/dlls/t2embed/t2embed.spec +++ b/dlls/t2embed/t2embed.spec @@ -1,22 +1,22 @@ @ stub TTCharToUnicode -@ stub TTDeleteEmbeddedFont -@ stdcall TTEmbedFont(ptr long long ptr ptr ptr ptr ptr long long ptr) +@ stdcall TTDeleteEmbeddedFont(long long ptr) +@ stdcall TTEmbedFont(long long long ptr ptr ptr ptr ptr long long ptr) @ stub TTEmbedFontFromFileA @ stub TTEnableEmbeddingForFacename @ stub TTGetEmbeddedFontInfo -@ stdcall TTGetEmbeddingType(ptr ptr) -@ stdcall TTIsEmbeddingEnabled(ptr ptr) +@ stdcall TTGetEmbeddingType(long ptr) +@ stdcall TTIsEmbeddingEnabled(long ptr) @ stub TTIsEmbeddingEnabledForFacename @ stdcall TTLoadEmbeddedFont(ptr long ptr long ptr ptr ptr wstr str ptr) @ stub TTRunValidationTests @ stub _TTCharToUnicode(a)24 @ stub _TTDeleteEmbeddedFont(a)12 -@ stdcall _TTEmbedFont(a)44(ptr long long ptr ptr ptr ptr ptr long long ptr) TTEmbedFont +@ stdcall _TTEmbedFont(a)44(long long long ptr ptr ptr ptr ptr long long ptr) TTEmbedFont @ stub _TTEmbedFontFromFileA(a)52 @ stub _TTEnableEmbeddingForFacename(a)8 @ stub _TTGetEmbeddedFontInfo(a)28 -@ stdcall _TTGetEmbeddingType(a)8(ptr ptr) TTGetEmbeddingType -@ stdcall _TTIsEmbeddingEnabled(a)8(ptr ptr) TTIsEmbeddingEnabled +@ stdcall _TTGetEmbeddingType(a)8(long ptr) TTGetEmbeddingType +@ stdcall _TTIsEmbeddingEnabled(a)8(long ptr) TTIsEmbeddingEnabled @ stub _TTIsEmbeddingEnabledForFacename(a)8 @ stdcall _TTLoadEmbeddedFont(a)40(ptr long ptr long ptr ptr ptr wstr str ptr) TTLoadEmbeddedFont @ stub _TTRunValidationTests(a)8

1 0

Jacek Caban : wininet: Moved DllInstall to internet.c.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: 1cfee7da6ee2ed8e854d030e51b99112420bf789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cfee7da6ee2ed8e854d030e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 24 12:20:00 2014 +0200 wininet: Moved DllInstall to internet.c. --- dlls/wininet/Makefile.in | 3 +-- dlls/wininet/internet.c | 9 +++++++++ dlls/wininet/wininet_main.c | 42 ------------------------------------------ 3 files changed, 10 insertions(+), 44 deletions(-) diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index 357b924..5379e03 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -14,7 +14,6 @@ C_SRCS = \ internet.c \ netconnection.c \ urlcache.c \ - utility.c \ - wininet_main.c + utility.c RC_SRCS = wininet.rc diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 3ed9bb1..2a2876c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -341,6 +341,15 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } /*********************************************************************** + * DllInstall (WININET.@) + */ +HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) +{ + FIXME("(%x %s): stub\n", bInstall, debugstr_w(cmdline)); + return S_OK; +} + +/*********************************************************************** * INTERNET_SaveProxySettings * * Stores the proxy settings given by lpwai into the registry diff --git a/dlls/wininet/wininet_main.c b/dlls/wininet/wininet_main.c deleted file mode 100644 index cf4a6f2..0000000 --- a/dlls/wininet/wininet_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * WinInet - * - * Copyright (c) 2000 Patrik Stridvall - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winreg.h" -#include "shlwapi.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wininet); - -/*********************************************************************** - * DllInstall (WININET.@) - */ -HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) -{ - FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE", - debugstr_w(cmdline)); - - return S_OK; -}

1 0

Jacek Caban : wininet: Fixed leak in InternetGetConnectedStateExA.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: e1dbfb762c5991bba130bceb5f9ddfe35ff92def URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1dbfb762c5991bba130bceb5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 24 12:19:49 2014 +0200 wininet: Fixed leak in InternetGetConnectedStateExA. --- dlls/wininet/internet.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index aa58e34..3ed9bb1 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1294,11 +1294,10 @@ BOOL WINAPI InternetGetConnectedStateExA(LPDWORD lpdwStatus, LPSTR lpszConnectio rc = InternetGetConnectedStateExW(lpdwStatus,lpwszConnectionName, dwNameLen, dwReserved); if (rc && lpwszConnectionName) - { WideCharToMultiByte(CP_ACP,0,lpwszConnectionName,-1,lpszConnectionName, dwNameLen, NULL, NULL); - heap_free(lpwszConnectionName); - } + + heap_free(lpwszConnectionName); return rc; }

1 0

Alexandre Julliard : libwine: No longer look for libraries in the dll path on Android.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: a6a9b05deeab21f24263de32a17b83a17c1403dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6a9b05deeab21f24263de32a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 09:25:15 2014 +0200 libwine: No longer look for libraries in the dll path on Android. --- libs/wine/loader.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index c2290df..3591ede 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -1014,23 +1014,6 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize ret = dlopen( path, flag | RTLD_FIRST ); } else -#elif defined(__ANDROID__) - if (!strchr( filename, '/' ) && nb_dll_paths) - { - unsigned int i; - char *buffer = malloc( dll_path_maxlen + strlen(filename) + 2 ); - - buffer[dll_path_maxlen] = '/'; - strcpy( buffer + dll_path_maxlen + 1, filename ); - for (i = 0; i < nb_dll_paths; i++) - { - char *path = prepend( buffer + dll_path_maxlen, dll_paths[i], strlen(dll_paths[i]) ); - ret = dlopen( path, flag | RTLD_FIRST ); - if (ret) break; - } - free( buffer ); - if (ret) return ret; - } #endif ret = dlopen( filename, flag | RTLD_FIRST ); s = dlerror();

1 0

Alexandre Julliard : libwine: Update LD_LIBRARY_PATH in the current process from the JNI environment.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: 8478cece692c1498e361388783f515f03c9ca71a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8478cece692c1498e36138878… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 09:24:49 2014 +0200 libwine: Update LD_LIBRARY_PATH in the current process from the JNI environment. --- libs/wine/loader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 5c0192d..c2290df 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -873,6 +873,12 @@ static jstring wine_init_jni( JNIEnv *env, jobject obj, jobjectArray cmdline, jo { const char *val = (*env)->GetStringUTFChars( env, val_obj, NULL ); setenv( var, val, 1 ); + if (!strcmp( var, "LD_LIBRARY_PATH" )) + { + void (*update_func)( const char * ) = dlsym( RTLD_DEFAULT, + "android_update_LD_LIBRARY_PATH" ); + if (update_func) update_func( val ); + } (*env)->ReleaseStringUTFChars( env, val_obj, val ); } else unsetenv( var );

1 0

Piotr Caban : msi: Don't publish features with non positive install level.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: 331c86f12450cfb4050fd194c5d70cf98821f9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=331c86f12450cfb4050fd194c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 24 12:35:16 2014 +0200 msi: Don't publish features with non positive install level. --- dlls/msi/action.c | 2 ++ dlls/msi/tests/package.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4c6d6af..feb8296 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4892,6 +4892,8 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) BOOL absent = FALSE; MSIRECORD *uirow; + if (feature->Level <= 0) continue; + if (feature->Action != INSTALLSTATE_LOCAL && feature->Action != INSTALLSTATE_SOURCE && feature->Action != INSTALLSTATE_ADVERTISED) absent = TRUE; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 043baf9..4211e8b 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2689,6 +2689,7 @@ static void test_states(void) {'w','i','n','e','t','e','s','t','3','-','p','a','c','k','a','g','e','.','m','s','i',0}; static const WCHAR msifile4W[] = {'w','i','n','e','t','e','s','t','4','-','p','a','c','k','a','g','e','.','m','s','i',0}; + INSTALLSTATE state; MSIHANDLE hpkg; UINT r; MSIHANDLE hdb; @@ -3217,10 +3218,16 @@ static void test_states(void) r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "five"); + ok(state == INSTALLSTATE_UNKNOWN, "state = %d\n", state); + /* all features installed locally */ r = MsiInstallProductA(msifile2, "ADDLOCAL=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "five"); + ok(state == INSTALLSTATE_UNKNOWN, "state = %d\n", state); + r = MsiOpenDatabaseW(msifile2W, MSIDBOPEN_DIRECT, &hdb); ok(r == ERROR_SUCCESS, "failed to open database: %d\n", r);

1 0

Daniel Lehman : cryptnet: Continue checking the revocation urls if one is offline.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: 3be7f3079c125155388c21d3072263a16cc7c4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be7f3079c125155388c21d30… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jul 23 13:08:34 2014 -0700 cryptnet: Continue checking the revocation urls if one is offline. --- dlls/cryptnet/cryptnet_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 3986f0f..df9eb49 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1553,7 +1553,8 @@ static DWORD verify_cert_revocation_from_dist_points_ext( endTime = timeout = 0; if (!ret) error = GetLastError(); - for (j = 0; !error && j < urlArray->cUrl; j++) + /* continue looping if one was offline; break if revoked or timed out */ + for (j = 0; (!error || error == CRYPT_E_REVOCATION_OFFLINE) && j < urlArray->cUrl; j++) { PCCRL_CONTEXT crl;

1 0

Francois Gouget : winetest: Whitespace cleanups.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: tools Branch: master Commit: 063320d223569d9be83d5a0f72ec4d400a8d6a72 URL: http://source.winehq.org/git/tools.git/?a=commit;h=063320d223569d9be83d5a0f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 24 16:31:40 2014 +0200 winetest: Whitespace cleanups. --- winetest/dissect | 8 ++++---- winetest/error.cgi | 3 +-- winetest/gather | 2 +- winetest/service.cgi | 8 ++++---- winetest/site | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index bbd156b..676f089 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -82,7 +82,7 @@ sub create_box($$$) return $box; } -($report,undef) = glob "$queuedir/rep*/report"; +($report, undef) = glob "$queuedir/rep*/report"; exit 2 unless defined $report; ($tmpdir = $report) =~ s|^(.+)/report$|$1|; @@ -206,7 +206,7 @@ if ($plid==1 && $major==4) { } elsif ($minor == 2) { $version = "win8"; } - } + } } elsif ($plid==3) { #$version = "ce$major$minor"; } @@ -340,9 +340,9 @@ while (<IN>) { if (defined $dll) { # Either winetest crashed or the report file was cut off if ($filesize == $maxfilesize) { - mydie "report reached file limit (runaway test?)\n"; + mydie "report reached file limit (runaway test?)\n"; } else { - mydie "report truncated (winetest crash?)\n"; + mydie "report truncated (winetest crash?)\n"; } } close SUM or mydie "error writing to '$tmpdir/summary.txt': $!\n"; diff --git a/winetest/error.cgi b/winetest/error.cgi index b9692ac..ea77204 100755 --- a/winetest/error.cgi +++ b/winetest/error.cgi @@ -1,5 +1,5 @@ #!/usr/bin/perl -# +# # This script replays errors to the wine-tests-results mailing list # # Copyright (C) 2004 Brian Vincent @@ -43,4 +43,3 @@ if ($error) { print "OK\n"; } - diff --git a/winetest/gather b/winetest/gather index f469fb1..5b56b61 100755 --- a/winetest/gather +++ b/winetest/gather @@ -513,7 +513,7 @@ sub singletest($$$) { else { my $report = $group->{reports} ? $group->{reports}->[0] : $group; - $label = "$groupname $report->{tag}"; + $label = "$groupname $report->{tag}"; if (-r "$datadir/$build/$report->{dir}/$testname.html") { $href = "$report->{dir}/$testname.html"; diff --git a/winetest/service.cgi b/winetest/service.cgi index 10e3c18..53e5f10 100755 --- a/winetest/service.cgi +++ b/winetest/service.cgi @@ -1,5 +1,5 @@ #!/usr/bin/perl -# +# # This script acts as the middle man between people who build # tests to be distributed to Windows clients and the actual # Windows clients @@ -32,8 +32,8 @@ # winetest/ # <name>.url contains url to find latest winetests at, must be # writable -# url.mask contains a reg ex to match against, only needs to -# be read-only, in the above example it might be +# url.mask contains a reg ex to match against, only needs to +# be read-only, in the above example it might be # something like: http://myserver/com/path/to # <name>.cookie contains a unique identifier of a program that # winrash clients can download, must be writable @@ -99,7 +99,7 @@ sub read_one_line($) ########################################################################## # # When we publish, we: -# 1) Look for <publish key value>/url.mask that had to have been +# 1) Look for <publish key value>/url.mask that had to have been # created by a web server admin thus ensuring this program is # approved for testing # 2) Download the cookie for the program from that web server diff --git a/winetest/site b/winetest/site index a942491..16ab682 100755 --- a/winetest/site +++ b/winetest/site @@ -54,6 +54,6 @@ if ($q->param('testing')) { # redirect to data dir when no vars present my $base = $q->url(-base => 1); print $q->redirect($base . "/data/" . $build); - + # done exit();

1 0

Francois Gouget : winetest: Standardize handling of service.cgi' s arguments and add prototypes.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: tools Branch: master Commit: 991c6c6eb454252342ed5d8d9a56f3966bddd453 URL: http://source.winehq.org/git/tools.git/?a=commit;h=991c6c6eb454252342ed5d8d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 24 16:24:01 2014 +0200 winetest: Standardize handling of service.cgi's arguments and add prototypes. The prototypes let Perl detect when the wrong number of parameters is passed to these functions. The functions have also been reordered so forward declarations are not necessary and are now called normally. --- winetest/service.cgi | 196 ++++++++++++++++++++++++++++----------------------- 1 file changed, 107 insertions(+), 89 deletions(-) diff --git a/winetest/service.cgi b/winetest/service.cgi index 1ec83b6..10e3c18 100755 --- a/winetest/service.cgi +++ b/winetest/service.cgi @@ -46,57 +46,56 @@ $data_root="/home/winehq/opt/winetest"; $lynx="/usr/bin/lynx"; @valid_programs=("winrash", "winetest"); -&main; -sub main { - my ($build, $urls, $cookies); - - print "Content-type: text/plain\n\n"; +########################################################################## +# +# Some convenience functions. Debug gives us output if debug=1. &read_one_line +# just opens files and returns one line, with trailing new lines removed. +# +########################################################################## - # first check for errors - my $error = cgi_error (); - if ($error) { - print $error; - exit; +# print a message if debugging is enabled +sub debug($) +{ + my ($msg) = @_; + if (param('debug')) { + print "$msg\n"; } +} - my $publish = param('publish'); - if ($publish) { - my $response = &releases_make($publish); - print "$response\n"; - exit; - } +# computes the MD5 sum of the arument +sub md5sum($) +{ + my ($string) = @_; + local $md5 = Digest::MD5->new; + $md5->add($string); + return $md5->hexdigest; +} - # for each of the programs we know about, see if they need an update - foreach $program (@valid_programs) { - ($build, $urls, $cookies) = &releases_read($program); - if (param($program)) { - my @history = split(/,/, param("$program" . "_history")); - push (@history, param($program)); - my @newhist = (); - foreach (@history) { - my ($prg, $rel) = split(/-/, $_); - if (($prg eq $program) and ($rel eq $build)) { - delete $$urls{$_}; - delete $$cookies{$_}; - push (@newhist, $_); - } - } - $winetest_history = join ',', @newhist; - } - if (scalar(%$urls)) { - &send_upgrade($urls, $winetest_history); - $update_sent = 1; - last; - } - } - if (!$update_sent) { - print "sleep 3600\n"; - return; - } +# write a string to a file +sub write_file($$) +{ + my ($filename, $content) = @_; + open(GENERIC_FH, $filename) + or ( debug("Can't open $filename for writing.") && die ); + print GENERIC_FH $content; + close(GENERIC_FH); +} +# read the content of a file +sub read_one_line($) +{ + my ($filename) = @_; + open(GENERIC_FH, $filename) + or ( debug("Can't open $filename."), die ); + $this_line = <GENERIC_FH>; + close(GENERIC_FH); + chomp $this_line; + + return $this_line; } + ########################################################################## # # When we publish, we: @@ -110,7 +109,8 @@ sub main { ########################################################################## # removes the current release from disk -sub releases_purge { +sub releases_purge($) +{ my ($project) = @_; system("rm -f $data_root/*/$project/*.cookie"); system("rm -f $data_root/*/$project/*.url"); @@ -119,7 +119,8 @@ sub releases_purge { # this function reads the current release information from disk # and returns ($thisrelease, %url, %cookies) # where the two maps are keyed by the full file name of the release -sub releases_read { +sub releases_read($) +{ my ($project) = @_; my (%urls, %cookies, $thisrelease); @@ -143,7 +144,7 @@ sub releases_read { if (scalar(%urls) == 0) { $thisrelease = $release; } elsif ($thisrelease ne $release) { - &debug("Invalid release state!") && die; + debug("Invalid release state!") && die; } $urls{$key} = $url; $cookies{$key} = $this_line; @@ -154,7 +155,8 @@ sub releases_read { } # try to add a new release to our portfolio -sub releases_make { +sub releases_make($) +{ my ($url) = @_; my ($name, $program, $build, $publisher); my ($urls, $cookies, $current_build, @other); @@ -186,43 +188,43 @@ sub releases_make { } # get current release info - ($current_build, $urls, $cookies) = &releases_read($program); + ($current_build, $urls, $cookies) = releases_read($program); # check to see how we should handle it if ($build lt $current_build) { return "Build is old, current build is $current_build"; } if ($build ne $current_build) { - &releases_purge($program); + releases_purge($program); } # check to see that the URL has the right format $base_path = "$data_root/$publisher/$program"; - $url_mask = &read_one_line("<$base_path/url.mask"); + $url_mask = read_one_line("<$base_path/url.mask"); if (!($url =~ $url_mask)) { return "Unrecognized URL format"; } # get the cookie now - $cookie = &read_one_line("$lynx -source $url.sig |"); + $cookie = read_one_line("$lynx -source $url.sig |"); # all is good, store the cookie, and URL now, this activetes the release - &write_file(">$base_path/$name.cookie", &md5sum($cookie)); - &write_file(">$base_path/$name.url", $url); + write_file(">$base_path/$name.cookie", md5sum($cookie)); + write_file(">$base_path/$name.url", $url); return "OK"; } - ########################################################################## -# +# # Issue commands understood by winrash. Try to be somewhat intelligent -# in figuring out what needs to be sent. +# in figuring out what needs to be sent. # ########################################################################## -sub send_upgrade { +sub send_upgrade($$) +{ my ($urls, $history) = @_; my (@names, $name, $url, $program); my ($build, $publisher, $id, @other); @@ -235,7 +237,7 @@ sub send_upgrade { $url = $$urls{$name}; ($program, $build, $publisher, @other) = split(/-/, $name); - &debug("Send upgrade received: $url"); + debug("Send upgrade received: $url"); print "error_url http://test.winehq.org/error\n"; print "error_sleep 3600\n"; @@ -262,45 +264,61 @@ sub send_upgrade { print "sleep 300\n"; } + ########################################################################## # -# Some convenience functions. Debug gives us output if debug=1. &read_one_line -# just opens files and returns one line, with trailing new lines removed. -# +# Main +# ########################################################################## -# print a message if debugging is enabled -sub debug { - if (param('debug')) { - print "$_[0]\n"; - } -} +sub main() +{ + my ($build, $urls, $cookies); -# computes the MD5 sum of the arument -sub md5sum { + print "Content-type: text/plain\n\n"; - local $md5 = Digest::MD5->new; - $md5->add($_[0]); - return $md5->hexdigest; -} + # first check for errors + my $error = cgi_error (); + if ($error) { + print $error; + exit; + } -# write a string to a file -sub write_file { - my ($filename, $content) = @_; - open(GENERIC_FH, $filename) - or ( &debug("Can't open $filename for writing.") && die ); - print GENERIC_FH $content; - close(GENERIC_FH); -} + my $publish = param('publish'); + if ($publish) { + my $response = releases_make($publish); + print "$response\n"; + exit; + } -# read the content of a file -sub read_one_line { - open(GENERIC_FH, $_[0]) - or ( &debug("Can't open $_[0]."), die ); - $this_line = <GENERIC_FH>; - close(GENERIC_FH); - chomp $this_line; + # for each of the programs we know about, see if they need an update + foreach $program (@valid_programs) { + ($build, $urls, $cookies) = releases_read($program); + if (param($program)) { + my @history = split(/,/, param("$program" . "_history")); + push (@history, param($program)); + my @newhist = (); + foreach (@history) { + my ($prg, $rel) = split(/-/, $_); + if (($prg eq $program) and ($rel eq $build)) { + delete $$urls{$_}; + delete $$cookies{$_}; + push (@newhist, $_); + } + } + $winetest_history = join ',', @newhist; + } + if (scalar(%$urls)) { + send_upgrade($urls, $winetest_history); + $update_sent = 1; + last; + } + } + if (!$update_sent) { + print "sleep 3600\n"; + return; + } - return $this_line; } +main();

1 0

Jacek Caban : mshtml: Avoid useless PATH changes and avoid buffer overflow in set_environment.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: wine Branch: master Commit: 1bd0f4f065da6db368f57c63d9bd89e98e1677b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd0f4f065da6db368f57c63d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 23 16:29:48 2014 +0200 mshtml: Avoid useless PATH changes and avoid buffer overflow in set_environment. --- dlls/mshtml/nsembed.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index fd87d37..0cc861f 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -438,8 +438,10 @@ static BOOL install_wine_gecko(void) static void set_environment(LPCWSTR gre_path) { - WCHAR path_env[MAX_PATH], buf[20]; - int len, debug_level = 0; + size_t len, gre_path_len; + int debug_level = 0; + WCHAR *path, buf[20]; + const WCHAR *ptr; static const WCHAR pathW[] = {'P','A','T','H',0}; static const WCHAR warnW[] = {'w','a','r','n',0}; @@ -449,13 +451,6 @@ static void set_environment(LPCWSTR gre_path) {'N','S','P','R','_','L','O','G','_','M','O','D','U','L','E','S',0}; static const WCHAR debug_formatW[] = {'a','l','l',':','%','d',0}; - /* We have to modify PATH as XPCOM loads other DLLs from this directory. */ - GetEnvironmentVariableW(pathW, path_env, sizeof(path_env)/sizeof(WCHAR)); - len = strlenW(path_env); - path_env[len++] = ';'; - strcpyW(path_env+len, gre_path); - SetEnvironmentVariableW(pathW, path_env); - SetEnvironmentVariableW(xpcom_debug_breakW, warnW); if(TRACE_ON(gecko)) @@ -467,6 +462,23 @@ static void set_environment(LPCWSTR gre_path) sprintfW(buf, debug_formatW, debug_level); SetEnvironmentVariableW(nspr_log_modulesW, buf); + + len = GetEnvironmentVariableW(pathW, NULL, 0); + gre_path_len = strlenW(gre_path); + path = heap_alloc((len+gre_path_len+1)*sizeof(WCHAR)); + if(!path) + return; + GetEnvironmentVariableW(pathW, path, len); + + /* We have to modify PATH as xul.dll loads other DLLs from this directory. */ + if(!(ptr = strstrW(path, gre_path)) + || (ptr > path && *(ptr-1) != ';') + || (ptr[gre_path_len] && ptr[gre_path_len] != ';')) { + if(len) + path[len-1] = ';'; + strcpyW(path+len, gre_path); + SetEnvironmentVariableW(pathW, path); + } } static BOOL load_xul(const PRUnichar *gre_path)

1 0

Bruno Jesus : rsaenh: Change the way AES 128 is derived to match Windows behavior.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: wine Branch: master Commit: 453d6dc105ee69df2a58c24c7cbebc9c6da0ad58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=453d6dc105ee69df2a58c24c7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 23 00:48:09 2014 -0300 rsaenh: Change the way AES 128 is derived to match Windows behavior. --- dlls/rsaenh/rsaenh.c | 26 +++++++++++++++++++++++--- dlls/rsaenh/tests/rsaenh.c | 5 ----- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index dd49618..0f0111b 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3926,6 +3926,8 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD switch (GET_ALG_CLASS(Algid)) { case ALG_CLASS_DATA_ENCRYPT: + { + int need_padding; *phKey = new_key(hProv, Algid, dwFlags, &pCryptKey); if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) return FALSE; @@ -3936,8 +3938,26 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD */ dwLen = RSAENH_MAX_HASH_SIZE; RSAENH_CPGetHashParam(pCryptHash->hProv, hBaseData, HP_HASHVAL, abHashValue, &dwLen, 0); - - if (dwLen < pCryptKey->dwKeyLen) { + + /* + * The usage of padding seems to vary from algorithm to algorithm. + * For now the only different case found was for AES with 128 bit key. + */ + switch(Algid) + { + case CALG_AES_128: + /* To reduce the chance of regressions we will only deviate + * from the old behavior for the tested hash lengths */ + if (dwLen == 16 || dwLen == 20) + { + need_padding = 1; + break; + } + default: + need_padding = dwLen < pCryptKey->dwKeyLen; + } + + if (need_padding) { BYTE pad1[RSAENH_HMAC_DEF_PAD_LEN], pad2[RSAENH_HMAC_DEF_PAD_LEN]; BYTE old_hashval[RSAENH_MAX_HASH_SIZE]; DWORD i; @@ -3966,7 +3986,7 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD memcpy(pCryptKey->abKeyValue, abHashValue, RSAENH_MIN(pCryptKey->dwKeyLen, sizeof(pCryptKey->abKeyValue))); break; - + } case ALG_CLASS_MSG_ENCRYPT: if (!lookup_handle(&handle_table, pCryptHash->hKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pMasterKey)) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index dad6a27..c49bd92 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1140,9 +1140,6 @@ static void test_aes(int keylen) result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, sizeof(pbData)); ok(result, "Expected OK, got last error %d\n", GetLastError()); ok(dwLen == 48, "Expected dwLen 48, got %d\n", dwLen); - if(i == 0) todo_wine - ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n"); - else ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n"); result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); @@ -3530,9 +3527,7 @@ static void test_key_derivation(const char *prov) memset(wine_broken, 0, sizeof(wine_broken)); wine_broken[8].mode = wine_broken[8].blen = 1; - wine_broken[9].exp_data = 1; wine_broken[20] = wine_broken[32] = wine_broken[44] = wine_broken[8]; - wine_broken[21] = wine_broken[33] = wine_broken[45] = wine_broken[9]; for (i=0; i<sizeof(tests)/sizeof(tests[0]); i++) {

1 0

Bruno Jesus : crypt32: CertGetIssuerCertificateFromStore must return error for self-signed certificates.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: wine Branch: master Commit: 7a40fdbf8cb68df269c1a1c47f6cc276ba1929e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a40fdbf8cb68df269c1a1c47… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jul 22 20:43:06 2014 -0300 crypt32: CertGetIssuerCertificateFromStore must return error for self-signed certificates. --- dlls/crypt32/cert.c | 6 ++++++ dlls/crypt32/chain.c | 2 +- dlls/crypt32/crypt32_private.h | 1 + dlls/crypt32/tests/cert.c | 4 ---- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 074b924..c35f504 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1883,6 +1883,12 @@ PCCERT_CONTEXT WINAPI CertGetIssuerCertificateFromStore(HCERTSTORE hCertStore, CertFreeCertificateContext(ret); ret = NULL; } + if (CRYPT_IsCertificateSelfSigned(pSubjectContext)) + { + CertFreeCertificateContext(ret); + ret = NULL; + SetLastError(CRYPT_E_SELF_SIGNED); + } } TRACE("returning %p\n", ret); return ret; diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 94d228a..056910f 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -265,7 +265,7 @@ typedef struct _CertificateChain LONG ref; } CertificateChain; -static BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) +BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) { PCERT_EXTENSION ext; DWORD size; diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 02bd902..fb5c5c3 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -337,6 +337,7 @@ WINECRYPT_CERTSTORE *CRYPT_FileNameOpenStoreA(HCRYPTPROV hCryptProv, WINECRYPT_CERTSTORE *CRYPT_FileNameOpenStoreW(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) DECLSPEC_HIDDEN; WINECRYPT_CERTSTORE *CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags) DECLSPEC_HIDDEN; +BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) DECLSPEC_HIDDEN; /* Allocates and initializes a certificate chain engine, but without creating * the root store. Instead, it uses root, and assumes the caller has done any diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index a19ef1e..259361c 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1728,9 +1728,7 @@ static void testGetIssuerCert(void) SetLastError(0xdeadbeef); flags = 0; parent = CertGetIssuerCertificateFromStore(store, cert3, NULL, &flags); -todo_wine ok(!parent, "Expected NULL\n"); -todo_wine ok(GetLastError() == CRYPT_E_SELF_SIGNED, "Expected CRYPT_E_SELF_SIGNED, got %08X\n", GetLastError()); CertFreeCertificateContext(child); @@ -1747,9 +1745,7 @@ todo_wine ok(cert1 != NULL, "CertEnumCertificatesInStore should have worked\n"); SetLastError(0xdeadbeef); parent = CertGetIssuerCertificateFromStore(store, cert1, NULL, &flags); -todo_wine ok(!parent, "Expected NULL\n"); -todo_wine ok(GetLastError() == CRYPT_E_SELF_SIGNED, "Expected CRYPT_E_SELF_SIGNED, got %08X\n", GetLastError()); CertCloseStore(store, 0);

1 0

Alexandre Julliard : ntdll: Directly use ucontext_t instead of SIGCONTEXT on all platforms.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: wine Branch: master Commit: 775263aa5c4f0fe7fd8679c15c861eb5ed8768eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=775263aa5c4f0fe7fd8679c15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 23 16:32:33 2014 +0200 ntdll: Directly use ucontext_t instead of SIGCONTEXT on all platforms. --- dlls/ntdll/signal_arm.c | 14 ++++++-------- dlls/ntdll/signal_arm64.c | 14 ++++++-------- dlls/ntdll/signal_i386.c | 41 ++++++++++++++--------------------------- 3 files changed, 26 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=775263aa5c4f0fe7fd867…

1 0

Jacek Caban : vbscript: Added support for title and type arguments of MsgBox.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: wine Branch: master Commit: 2c78d5815bc7b790f5285a6f1ee762b71daea8c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c78d5815bc7b790f5285a6f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 23 18:28:28 2014 +0200 vbscript: Added support for title and type arguments of MsgBox. --- dlls/vbscript/global.c | 55 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 68fa388..dc41db5 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -282,14 +282,15 @@ static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid) return obj; } -static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, VARIANT *res) +static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, unsigned type, BSTR orig_title, VARIANT *res) { SCRIPTUICHANDLING uic_handling = SCRIPTUICHANDLING_ALLOW; IActiveScriptSiteUIControl *ui_control; IActiveScriptSiteWindow *acts_window; + WCHAR *title_buf = NULL; const WCHAR *title; HWND hwnd = NULL; - int ret; + int ret = 0; HRESULT hres; hres = IActiveScriptSite_QueryInterface(ctx->site, &IID_IActiveScriptSiteUIControl, (void**)&ui_control); @@ -310,23 +311,43 @@ static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, VARIANT *res) return E_FAIL; } - title = (ctx->safeopt & INTERFACE_USES_SECURITY_MANAGER) ? vbscriptW : emptyW; - hres = IActiveScriptSite_QueryInterface(ctx->site, &IID_IActiveScriptSiteWindow, (void**)&acts_window); if(FAILED(hres)) { FIXME("No IActiveScriptSiteWindow\n"); return hres; } + if(ctx->safeopt & INTERFACE_USES_SECURITY_MANAGER) { + if(orig_title && *orig_title) { + WCHAR *ptr; + + title = title_buf = heap_alloc(sizeof(vbscriptW) + (strlenW(orig_title)+2)*sizeof(WCHAR)); + if(!title) + return E_OUTOFMEMORY; + + memcpy(title_buf, vbscriptW, sizeof(vbscriptW)); + ptr = title_buf + sizeof(vbscriptW)/sizeof(WCHAR)-1; + + *ptr++ = ':'; + *ptr++ = ' '; + strcpyW(ptr, orig_title); + }else { + title = vbscriptW; + } + }else { + title = orig_title ? orig_title : emptyW; + } + hres = IActiveScriptSiteWindow_GetWindow(acts_window, &hwnd); if(SUCCEEDED(hres)) { hres = IActiveScriptSiteWindow_EnableModeless(acts_window, FALSE); if(SUCCEEDED(hres)) { - ret = MessageBoxW(hwnd, prompt, title, MB_OK); + ret = MessageBoxW(hwnd, prompt, title, type); hres = IActiveScriptSiteWindow_EnableModeless(acts_window, TRUE); } } + heap_free(title_buf); IActiveScriptSiteWindow_Release(acts_window); if(FAILED(hres)) { FIXME("failed: %08x\n", hres); @@ -1385,22 +1406,34 @@ static HRESULT Global_InputBox(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_MsgBox(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - BSTR prompt; + BSTR prompt, title = NULL; + int type = MB_OK; HRESULT hres; TRACE("\n"); - if(args_cnt != 1) { - FIXME("unsupported arg_cnt %d\n", args_cnt); - return E_NOTIMPL; - } + assert(1 <= args_cnt && args_cnt <= 5); hres = to_string(args, &prompt); if(FAILED(hres)) return hres; - hres = show_msgbox(This->desc->ctx, prompt, res); + if(args_cnt > 1) + hres = to_int(args+1, &type); + + if(SUCCEEDED(hres) && args_cnt > 2) + hres = to_string(args+2, &title); + + if(SUCCEEDED(hres) && args_cnt > 3) { + FIXME("unsupported arg_cnt %d\n", args_cnt); + hres = E_NOTIMPL; + } + + if(SUCCEEDED(hres)) + hres = show_msgbox(This->desc->ctx, prompt, type, title, res); + SysFreeString(prompt); + SysFreeString(title); return hres; }

1 0

Jacek Caban : mshtml: Added IHTMLMetaElement:: charset property implementation.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: wine Branch: master Commit: 6031108076213818445668992d19a8ba0a483082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6031108076213818445668992… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 23 15:29:32 2014 +0200 mshtml: Added IHTMLMetaElement::charset property implementation. --- dlls/mshtml/htmlelem.c | 32 +++++++++++++++++++++++++++++--- dlls/mshtml/htmlinput.c | 2 +- dlls/mshtml/htmlmeta.c | 20 +++++++++++++------- dlls/mshtml/mshtml_private.h | 3 ++- dlls/mshtml/tests/dom.c | 39 ++++++++++++++++++++++++++++++++++++--- 5 files changed, 81 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8e246fe..8378d74 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -175,11 +175,12 @@ nsresult get_elem_attr_value(nsIDOMHTMLElement *nselem, const WCHAR *name, nsASt return NS_OK; } -HRESULT elem_string_attr_getter(HTMLElement *elem, const WCHAR *name, BSTR *p) +HRESULT elem_string_attr_getter(HTMLElement *elem, const WCHAR *name, BOOL use_null, BSTR *p) { const PRUnichar *val; nsAString val_str; nsresult nsres; + HRESULT hres = S_OK; nsres = get_elem_attr_value(elem->nselem, name, &val_str, &val); if(NS_FAILED(nsres)) @@ -187,9 +188,34 @@ HRESULT elem_string_attr_getter(HTMLElement *elem, const WCHAR *name, BSTR *p) TRACE("%s: returning %s\n", debugstr_w(name), debugstr_w(val)); - *p = SysAllocString(val); + if(*val || !use_null) { + *p = SysAllocString(val); + if(!*p) + hres = E_OUTOFMEMORY; + }else { + *p = NULL; + } nsAString_Finish(&val_str); - return *p ? S_OK : E_OUTOFMEMORY; + return hres; +} + +HRESULT elem_string_attr_setter(HTMLElement *elem, const WCHAR *name, const WCHAR *value) +{ + nsAString name_str, val_str; + nsresult nsres; + + nsAString_InitDepend(&name_str, name); + nsAString_InitDepend(&val_str, value); + nsres = nsIDOMHTMLElement_SetAttribute(elem->nselem, &name_str, &val_str); + nsAString_Finish(&name_str); + nsAString_Finish(&val_str); + + if(NS_FAILED(nsres)) { + WARN("SetAttribute failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } typedef struct diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index f5e086c..f832b88 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1337,7 +1337,7 @@ static HRESULT WINAPI HTMLLabelElement_get_htmlFor(IHTMLLabelElement *iface, BST TRACE("(%p)->(%p)\n", This, p); - return elem_string_attr_getter(&This->element, forW, p); + return elem_string_attr_getter(&This->element, forW, FALSE, p); } static HRESULT WINAPI HTMLLabelElement_put_accessKey(IHTMLLabelElement *iface, BSTR v) diff --git a/dlls/mshtml/htmlmeta.c b/dlls/mshtml/htmlmeta.c index e9783c8..ab73c3c 100644 --- a/dlls/mshtml/htmlmeta.c +++ b/dlls/mshtml/htmlmeta.c @@ -108,7 +108,7 @@ static HRESULT WINAPI HTMLMetaElement_get_httpEquiv(IHTMLMetaElement *iface, BST TRACE("(%p)->(%p)\n", This, p); - return elem_string_attr_getter(&This->element, httpEquivW, p); + return elem_string_attr_getter(&This->element, httpEquivW, TRUE, p); } static HRESULT WINAPI HTMLMetaElement_put_content(IHTMLMetaElement *iface, BSTR v) @@ -125,7 +125,7 @@ static HRESULT WINAPI HTMLMetaElement_get_content(IHTMLMetaElement *iface, BSTR TRACE("(%p)->(%p)\n", This, p); - return elem_string_attr_getter(&This->element, contentW, p); + return elem_string_attr_getter(&This->element, contentW, TRUE, p); } static HRESULT WINAPI HTMLMetaElement_put_name(IHTMLMetaElement *iface, BSTR v) @@ -142,7 +142,7 @@ static HRESULT WINAPI HTMLMetaElement_get_name(IHTMLMetaElement *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return elem_string_attr_getter(&This->element, nameW, p); + return elem_string_attr_getter(&This->element, nameW, TRUE, p); } static HRESULT WINAPI HTMLMetaElement_put_url(IHTMLMetaElement *iface, BSTR v) @@ -159,18 +159,24 @@ static HRESULT WINAPI HTMLMetaElement_get_url(IHTMLMetaElement *iface, BSTR *p) return E_NOTIMPL; } +static const WCHAR charsetW[] = {'c','h','a','r','s','e','t',0}; + static HRESULT WINAPI HTMLMetaElement_put_charset(IHTMLMetaElement *iface, BSTR v) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return elem_string_attr_setter(&This->element, charsetW, v); } static HRESULT WINAPI HTMLMetaElement_get_charset(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return elem_string_attr_getter(&This->element, charsetW, TRUE, p); } static const IHTMLMetaElementVtbl HTMLMetaElementVtbl = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8db2ba8..64b9087 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -959,7 +959,8 @@ IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOM IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; -HRESULT elem_string_attr_getter(HTMLElement*,const WCHAR*,BSTR*) DECLSPEC_HIDDEN; +HRESULT elem_string_attr_getter(HTMLElement*,const WCHAR*,BOOL,BSTR*) DECLSPEC_HIDDEN; +HRESULT elem_string_attr_setter(HTMLElement*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; /* commands */ typedef struct { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 533d7b7..33645c8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3803,7 +3803,6 @@ static void _test_meta_name(unsigned line, IUnknown *unk, const char *exname) BSTR name = NULL; HRESULT hres; - meta = _get_metaelem_iface(line, unk); hres = IHTMLMetaElement_get_name(meta, &name); ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); @@ -3819,7 +3818,6 @@ static void _test_meta_content(unsigned line, IUnknown *unk, const char *exconte BSTR content = NULL; HRESULT hres; - meta = _get_metaelem_iface(line, unk); hres = IHTMLMetaElement_get_content(meta, &content); ok_(__FILE__,line)(hres == S_OK, "get_content failed: %08x\n", hres); @@ -3835,7 +3833,6 @@ static void _test_meta_httpequiv(unsigned line, IUnknown *unk, const char *exval BSTR val = NULL; HRESULT hres; - meta = _get_metaelem_iface(line, unk); hres = IHTMLMetaElement_get_httpEquiv(meta, &val); ok_(__FILE__,line)(hres == S_OK, "get_httpEquiv failed: %08x\n", hres); @@ -3844,6 +3841,40 @@ static void _test_meta_httpequiv(unsigned line, IUnknown *unk, const char *exval IHTMLMetaElement_Release(meta); } +#define test_meta_charset(a,b) _test_meta_charset(__LINE__,a,b) +static void _test_meta_charset(unsigned line, IUnknown *unk, const char *exval) +{ + IHTMLMetaElement *meta; + BSTR val = NULL; + HRESULT hres; + + meta = _get_metaelem_iface(line, unk); + hres = IHTMLMetaElement_get_charset(meta, &val); + ok_(__FILE__,line)(hres == S_OK, "get_charset failed: %08x\n", hres); + if(exval) + ok_(__FILE__,line)(!strcmp_wa(val, exval), "charset = %s, expected %s\n", wine_dbgstr_w(val), exval); + else + ok_(__FILE__,line)(!val, "charset = %s, expected NULL\n", wine_dbgstr_w(val)); + SysFreeString(val); + IHTMLMetaElement_Release(meta); +} + +#define set_meta_charset(a,b) _set_meta_charset(__LINE__,a,b) +static void _set_meta_charset(unsigned line, IUnknown *unk, const char *vala) +{ + BSTR val = a2bstr(vala); + IHTMLMetaElement *meta; + HRESULT hres; + + meta = _get_metaelem_iface(line, unk); + hres = IHTMLMetaElement_put_charset(meta, val); + ok_(__FILE__,line)(hres == S_OK, "put_charset failed: %08x\n", hres); + SysFreeString(val); + IHTMLMetaElement_Release(meta); + + _test_meta_charset(line, unk, vala); +} + #define test_link_media(a,b) _test_link_media(__LINE__,a,b) static void _test_link_media(unsigned line, IHTMLElement *elem, const char *exval) { @@ -6969,6 +7000,8 @@ static void test_elems(IHTMLDocument2 *doc) test_meta_name((IUnknown*)elem, "meta name"); test_meta_content((IUnknown*)elem, "text/html; charset=utf-8"); test_meta_httpequiv((IUnknown*)elem, "Content-Type"); + test_meta_charset((IUnknown*)elem, NULL); + set_meta_charset((IUnknown*)elem, "utf-8"); IHTMLElement_Release(elem); }

1 0

Bruno Jesus : rsaenh: CALG_AES cannot be used if the key length was not specified.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: wine Branch: master Commit: f5c687e3652004e4efebe9352aadd02d179603cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c687e3652004e4efebe9352… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 23 00:48:51 2014 -0300 rsaenh: CALG_AES cannot be used if the key length was not specified. --- dlls/rsaenh/rsaenh.c | 10 +++++++++- dlls/rsaenh/tests/rsaenh.c | 17 ----------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 0f0111b..b4829f0 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -780,7 +780,7 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK { HCRYPTKEY hCryptKey; CRYPTKEY *pCryptKey; - DWORD dwKeyLen = HIWORD(dwFlags); + DWORD dwKeyLen = HIWORD(dwFlags), bKeyLen = dwKeyLen; const PROV_ENUMALGS_EX *peaAlgidInfo; *ppCryptKey = NULL; @@ -839,6 +839,14 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK */ break; + case CALG_AES: + if (!bKeyLen) + { + TRACE("missing key len for CALG_AES\n"); + SetLastError(NTE_BAD_ALGID); + return (HCRYPTKEY)INVALID_HANDLE_VALUE; + } + /* fall through */ default: if (dwKeyLen % 8 || dwKeyLen > peaAlgidInfo->dwMaxLen || diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index c49bd92..7106c80 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -3511,13 +3511,6 @@ static void test_key_derivation(const char *prov) /* 47 */ }, }; - - /* Temporary struct to hold wine broken cases */ - struct broken - { - int mode, exp_data, blen; - } wine_broken[sizeof(tests)/sizeof(tests[0])]; - /* Due to differences between encryption from <= 2000 and >= XP some tests need to be skipped */ int old_broken[sizeof(tests)/sizeof(tests[0])]; memset(old_broken, 0, sizeof(old_broken)); @@ -3525,10 +3518,6 @@ static void test_key_derivation(const char *prov) old_broken[27] = old_broken[28] = old_broken[39] = old_broken[40] = 1; uniquecontainer(NULL); - memset(wine_broken, 0, sizeof(wine_broken)); - wine_broken[8].mode = wine_broken[8].blen = 1; - wine_broken[20] = wine_broken[32] = wine_broken[44] = wine_broken[8]; - for (i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { if (win2k && old_broken[i]) continue; @@ -3567,23 +3556,17 @@ static void test_key_derivation(const char *prov) mode = 0xdeadbeef; result = CryptGetKeyParam(hKey, KP_MODE, (BYTE*)&mode, &len, 0); ok(result, "Test [%s %d]: CryptGetKeyParam failed with error %08x\n", prov, i, GetLastError()); - if (wine_broken[i].mode) winetest_start_todo("wine"); ok(mode == tests[i].chain_mode, "Test [%s %d]: Expected chaining mode %d, got %d\n", prov, i, tests[i].chain_mode, mode); - if (wine_broken[i].mode) winetest_end_todo("wine"); SetLastError(0xdeadbeef); len = 4; result = CryptEncrypt(hKey, 0, TRUE, 0, dvData, &len, sizeof(dvData)); ok(result, "Test [%s %d]: CryptEncrypt failed with error 0x%08x\n", prov, i, GetLastError()); - if (wine_broken[i].blen) winetest_start_todo("wine"); ok(len == tests[i].blocklen, "Test [%s %d]: Expected block len %d, got %d\n", prov, i, tests[i].blocklen, len); - if (wine_broken[i].blen) winetest_end_todo("wine"); - if (wine_broken[i].exp_data) winetest_start_todo("wine"); ok(!memcmp(dvData, tests[i].expected_enc, tests[i].blocklen), "Test [%s %d]: Encrypted data comparison failed\n", prov, i); - if (wine_broken[i].exp_data) winetest_end_todo("wine"); CryptDestroyKey(hKey); err:

1 0

Alexandre Julliard : configure: Add a check for sys/ ucontext.h and include it where appropriate.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: wine Branch: master Commit: 8d817997cea784bcf784759e1d3aa93c571c500e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d817997cea784bcf784759e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 23 16:30:13 2014 +0200 configure: Add a check for sys/ucontext.h and include it where appropriate. --- configure | 12 ++++++------ configure.ac | 6 +++--- dlls/ntdll/server.c | 4 +++- dlls/ntdll/signal_arm.c | 6 ++++-- dlls/ntdll/signal_arm64.c | 4 +++- dlls/ntdll/signal_i386.c | 11 +++-------- dlls/ntdll/signal_powerpc.c | 9 ++++----- dlls/ntdll/signal_x86_64.c | 15 ++++----------- include/config.h.in | 6 +++--- server/ptrace.c | 4 +++- 10 files changed, 36 insertions(+), 41 deletions(-) diff --git a/configure b/configure index 97a3d08..4b8f784 100755 --- a/configure +++ b/configure @@ -6812,13 +6812,13 @@ fi done -for ac_header in ucontext.h +for ac_header in sys/ucontext.h do : - ac_fn_c_check_header_compile "$LINENO" "ucontext.h" "ac_cv_header_ucontext_h" "#include <signal.h> + ac_fn_c_check_header_compile "$LINENO" "sys/ucontext.h" "ac_cv_header_sys_ucontext_h" "#include <signal.h> " -if test "x$ac_cv_header_ucontext_h" = xyes; then : +if test "x$ac_cv_header_sys_ucontext_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_UCONTEXT_H 1 +#define HAVE_SYS_UCONTEXT_H 1 _ACEOF fi @@ -6829,8 +6829,8 @@ done for ac_header in sys/thr.h do : ac_fn_c_check_header_compile "$LINENO" "sys/thr.h" "ac_cv_header_sys_thr_h" "#include <sys/types.h> -#ifdef HAVE_UCONTEXT_H -#include <ucontext.h> +#ifdef HAVE_SYS_UCONTEXT_H +#include <sys/ucontext.h> #endif " if test "x$ac_cv_header_sys_thr_h" = xyes; then : diff --git a/configure.ac b/configure.ac index 872d97a..a56cda0 100644 --- a/configure.ac +++ b/configure.ac @@ -631,12 +631,12 @@ AC_CHECK_HEADERS([resolv.h],,, AC_CHECK_HEADERS([ifaddrs.h],,,[#include <sys/types.h>]) -AC_CHECK_HEADERS(ucontext.h,,,[#include <signal.h>]) +AC_CHECK_HEADERS(sys/ucontext.h,,,[#include <signal.h>]) AC_CHECK_HEADERS([sys/thr.h],,, [#include <sys/types.h> -#ifdef HAVE_UCONTEXT_H -#include <ucontext.h> +#ifdef HAVE_SYS_UCONTEXT_H +#include <sys/ucontext.h> #endif]) AC_CHECK_HEADERS([pthread_np.h],,, diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index f3c6b38..aabda4f 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -63,8 +63,10 @@ #ifdef HAVE_SYS_UIO_H #include <sys/uio.h> #endif +#ifdef HAVE_SYS_UCONTEXT_H +# include <sys/ucontext.h> +#endif #ifdef HAVE_SYS_THR_H -#include <sys/ucontext.h> #include <sys/thr.h> #endif #ifdef HAVE_UNISTD_H diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 0eb7ce0..4671b6d 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -32,7 +32,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif - #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -46,6 +45,9 @@ #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif +#ifdef HAVE_SYS_UCONTEXT_H +# include <sys/ucontext.h> +#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -68,7 +70,7 @@ static pthread_key_t teb_key; */ #ifdef linux -#ifdef __ANDROID__ +#if defined(__ANDROID__) && !defined(HAVE_SYS_UCONTEXT_H) typedef struct ucontext { unsigned long uc_flags; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 2b82952..69bc806 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -31,7 +31,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif - #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -45,6 +44,9 @@ #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif +#ifdef HAVE_SYS_UCONTEXT_H +# include <sys/ucontext.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 7b4bc72..3180138 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -32,7 +32,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif - #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -43,17 +42,18 @@ # include <sys/syscall.h> # endif #endif - #ifdef HAVE_SYS_VM86_H # include <sys/vm86.h> #endif - #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif #ifdef HAVE_SYS_SYSCTL_H # include <sys/sysctl.h> #endif +#ifdef HAVE_SYS_UCONTEXT_H +# include <sys/ucontext.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -313,7 +313,6 @@ typedef struct sigcontext SIGCONTEXT; #ifdef _SCO_DS #include <sys/regset.h> #endif -#include <sys/ucontext.h> typedef struct ucontext SIGCONTEXT; #ifdef _SCO_DS @@ -357,7 +356,6 @@ typedef struct ucontext SIGCONTEXT; #define FPUX_sig(context) NULL /* FIXME */ #elif defined (__APPLE__) -# include <sys/ucontext.h> typedef ucontext_t SIGCONTEXT; @@ -407,9 +405,6 @@ typedef ucontext_t SIGCONTEXT; #endif #elif defined(__NetBSD__) -# include <sys/ucontext.h> -# include <sys/types.h> -# include <signal.h> typedef ucontext_t SIGCONTEXT; diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index a457bdf..0fca342 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -28,10 +28,10 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> +#include <sys/types.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif - #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -42,10 +42,12 @@ # include <sys/syscall.h> # endif #endif - #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif +#ifdef HAVE_SYS_UCONTEXT_H +# include <sys/ucontext.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -94,9 +96,6 @@ static pthread_key_t teb_key; #ifdef __APPLE__ -# include <sys/ucontext.h> -# include <sys/types.h> - /* All Registers access - only for local access */ # define REG_sig(reg_name, context) ((context)->uc_mcontext->ss.reg_name) # define FLOATREG_sig(reg_name, context) ((context)->uc_mcontext->fs.reg_name) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7007db0..5658537 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -28,25 +28,22 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> - -#ifdef HAVE_UCONTEXT_H -# include <ucontext.h> -#endif - +#include <sys/types.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif - #ifdef HAVE_MACHINE_SYSARCH_H # include <machine/sysarch.h> #endif - #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif +#ifdef HAVE_SYS_UCONTEXT_H +# include <sys/ucontext.h> +#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -165,7 +162,6 @@ extern int arch_prctl(int func, void *ptr); #define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.fpregs)) #elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) -#include <sys/ucontext.h> #define RAX_sig(context) ((context)->uc_mcontext.mc_rax) #define RBX_sig(context) ((context)->uc_mcontext.mc_rbx) @@ -200,9 +196,6 @@ extern int arch_prctl(int func, void *ptr); #define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.mc_fpstate)) #elif defined(__NetBSD__) -#include <sys/ucontext.h> -#include <sys/types.h> -#include <signal.h> #define RAX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RAX]) #define RBX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RBX]) diff --git a/include/config.h.in b/include/config.h.in index 79f8b45..50cfcb8 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1038,6 +1038,9 @@ /* Define to 1 if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H +/* Define to 1 if you have the <sys/ucontext.h> header file. */ +#undef HAVE_SYS_UCONTEXT_H + /* Define to 1 if you have the <sys/uio.h> header file. */ #undef HAVE_SYS_UIO_H @@ -1077,9 +1080,6 @@ /* Define if you have the timezone variable */ #undef HAVE_TIMEZONE -/* Define to 1 if you have the <ucontext.h> header file. */ -#undef HAVE_UCONTEXT_H - /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H diff --git a/server/ptrace.c b/server/ptrace.c index aea821d..cb436b6 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -40,8 +40,10 @@ #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif -#ifdef HAVE_SYS_THR_H +#ifdef HAVE_SYS_UCONTEXT_H # include <sys/ucontext.h> +#endif +#ifdef HAVE_SYS_THR_H # include <sys/thr.h> #endif #include <unistd.h>

1 0

Alexandre Julliard : configure: Improve the check for the resolver library.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: wine Branch: master Commit: 1b2977420e21bd638f9417ac65fc5f36e4d2248a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2977420e21bd638f9417ac6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 23 15:23:07 2014 +0200 configure: Improve the check for the resolver library. --- configure | 49 +++++++++++++++++++++++++++++++++---------------- configure.ac | 33 ++++++++++++++++++++------------- 2 files changed, 53 insertions(+), 29 deletions(-) diff --git a/configure b/configure index d7efbfd..97a3d08 100755 --- a/configure +++ b/configure @@ -11687,11 +11687,16 @@ fi if test "$ac_cv_header_resolv_h" = "yes" then - ac_save_LIBS="$LIBS" - for lib in '' -lresolv - do - LIBS="$lib $ac_save_LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolver library" >&5 +$as_echo_n "checking for resolver library... " >&6; } +if ${ac_cv_have_resolv+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_LIBS="$LIBS" + for lib in '' -lresolv + do + LIBS="$lib $ac_save_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> @@ -11700,25 +11705,37 @@ then int main () { -res_query("foo",ns_c_in,0,0,0); +if (!(_res.options & RES_INIT)) res_init(); res_query("foo",ns_c_in,0,0,0) ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - -$as_echo "#define HAVE_RESOLV 1" >>confdefs.h - - RESOLV_LIBS="$lib" - + ac_cv_have_resolv=${lib:-"none required"} +else + ac_cv_have_resolv="not found" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test "${RESOLV_LIBS+set}" = set; then - break - fi - done - LIBS="$ac_save_LIBS" + test "x$ac_cv_have_resolv" = "xnot found" || break + done + LIBS="$ac_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_resolv" >&5 +$as_echo "$ac_cv_have_resolv" >&6; } + + case "$ac_cv_have_resolv" in + "not found") ;; + "none required") + +$as_echo "#define HAVE_RESOLV 1" >>confdefs.h + ;; + *) + $as_echo "#define HAVE_RESOLV 1" >>confdefs.h + + RESOLV_LIBS=$ac_cv_have_resolv + ;; + esac fi if test "x$with_lcms2" != "xno" diff --git a/configure.ac b/configure.ac index c913f9f..872d97a 100644 --- a/configure.ac +++ b/configure.ac @@ -1419,21 +1419,28 @@ WINE_NOTICE_WITH(gphoto,[test "$ac_cv_lib_gphoto2_port_gp_port_info_list_new" != dnl **** Check for resolver library *** if test "$ac_cv_header_resolv_h" = "yes" then - ac_save_LIBS="$LIBS" - for lib in '' -lresolv - do - LIBS="$lib $ac_save_LIBS" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_NETINET_IN_H + AC_CACHE_CHECK([for resolver library], ac_cv_have_resolv, + [ac_save_LIBS="$LIBS" + for lib in '' -lresolv + do + LIBS="$lib $ac_save_LIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif -#include <resolv.h>]],[[res_query("foo",ns_c_in,0,0,0);]])], - [AC_DEFINE(HAVE_RESOLV, 1, [Define if you have the resolver library and header]) - AC_SUBST(RESOLV_LIBS,"$lib")]) - if test "${RESOLV_LIBS+set}" = set; then - break - fi - done - LIBS="$ac_save_LIBS" +#include <resolv.h>]],[[if (!(_res.options & RES_INIT)) res_init(); res_query("foo",ns_c_in,0,0,0)]])], + [ac_cv_have_resolv=${lib:-"none required"}],[ac_cv_have_resolv="not found"]) + test "x$ac_cv_have_resolv" = "xnot found" || break + done + LIBS="$ac_save_LIBS"]) + + case "$ac_cv_have_resolv" in + "not found") ;; + "none required") + AC_DEFINE(HAVE_RESOLV, 1, [Define if you have the resolver library and header]) ;; + *) + AC_DEFINE(HAVE_RESOLV, 1) + AC_SUBST(RESOLV_LIBS,$ac_cv_have_resolv) ;; + esac fi dnl **** Check for LittleCMS ***

1 0

Bruno Jesus : rsaenh/tests: Add many tests related to key derivation.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: wine Branch: master Commit: 0f31d82c04e14a87ce993ac94017dd9e3da605a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f31d82c04e14a87ce993ac94… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 23 00:47:33 2014 -0300 rsaenh/tests: Add many tests related to key derivation. --- dlls/rsaenh/tests/rsaenh.c | 350 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 350 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f31d82c04e14a87ce993…

1 0