October 2009 - Wine-commits

Alexandre Julliard : version: Abstract resource finding into a common function.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: e04b9984b60c4eecf31ae7b29717ce0a6871d575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e04b9984b60c4eecf31ae7b29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 1 13:53:42 2009 +0200 version: Abstract resource finding into a common function. --- dlls/version/resource.c | 58 +++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 32 deletions(-) diff --git a/dlls/version/resource.c b/dlls/version/resource.c index efd9115..2523aaa 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -390,38 +390,46 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, } +/*********************************************************************** + * find_resource [internal] + */ +DWORD find_resource( HFILE lzfd, LPCSTR type, LPCSTR id, DWORD *reslen, DWORD *offset ) +{ + DWORD magic = read_xx_header( lzfd ); + + switch (magic) + { + case IMAGE_OS2_SIGNATURE: + if (!find_ne_resource( lzfd, type, id, reslen, offset )) magic = 0; + break; + case IMAGE_NT_SIGNATURE: + if (!find_pe_resource( lzfd, type, id, reslen, offset )) magic = 0; + break; + } + return magic; +} + + /************************************************************************* * GetFileResourceSize [VER.2] */ DWORD WINAPI GetFileResourceSize16( LPCSTR lpszFileName, LPCSTR lpszResType, LPCSTR lpszResId, LPDWORD lpdwFileOffset ) { - BOOL retv = FALSE; HFILE lzfd; OFSTRUCT ofs; - DWORD reslen; + DWORD reslen = 0; TRACE("(%s,type=%p,id=%p,off=%p)\n", debugstr_a(lpszFileName), lpszResType, lpszResId, lpszResId ); lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ ); - if ( lzfd < 0 ) return 0; - - switch ( read_xx_header( lzfd ) ) + if (lzfd >= 0) { - case IMAGE_OS2_SIGNATURE: - retv = find_ne_resource( lzfd, lpszResType, lpszResId, - &reslen, lpdwFileOffset ); - break; - - case IMAGE_NT_SIGNATURE: - retv = find_pe_resource( lzfd, lpszResType, lpszResId, - &reslen, lpdwFileOffset ); - break; + if (!find_resource( lzfd, lpszResType, lpszResId, &reslen, lpdwFileOffset )) reslen = 0; + LZClose( lzfd ); } - - LZClose( lzfd ); - return retv? reslen : 0; + return reslen; } @@ -432,7 +440,6 @@ DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType, LPCSTR lpszResId, DWORD dwFileOffset, DWORD dwResLen, LPVOID lpvData ) { - BOOL retv = FALSE; HFILE lzfd; OFSTRUCT ofs; DWORD reslen = dwResLen; @@ -446,20 +453,7 @@ DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType, if ( !dwFileOffset ) { - switch ( read_xx_header( lzfd ) ) - { - case IMAGE_OS2_SIGNATURE: - retv = find_ne_resource( lzfd, lpszResType, lpszResId, - &reslen, &dwFileOffset ); - break; - - case IMAGE_NT_SIGNATURE: - retv = find_pe_resource( lzfd, lpszResType, lpszResId, - &reslen, &dwFileOffset ); - break; - } - - if ( !retv ) + if (!find_resource( lzfd, lpszResType, lpszResId, &reslen, &dwFileOffset )) { LZClose( lzfd ); return 0;

1 0

Alexandre Julliard : version: Use the find_resource function instead of the 16-bit entry points to load 16-bit resources .
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: e84c42d92afc45891eefc78fa3961c66b533504b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84c42d92afc45891eefc78fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 1 13:54:58 2009 +0200 version: Use the find_resource function instead of the 16-bit entry points to load 16-bit resources. --- dlls/version/info.c | 36 +++++++++++++++++++++++------------- 1 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index 95dadaf..f88b239 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -30,6 +30,7 @@ #include "winbase.h" #include "winver.h" #include "winternl.h" +#include "lzexpand.h" #include "wine/winuser16.h" #include "wine/unicode.h" #include "winerror.h" @@ -37,6 +38,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ver); +extern DWORD find_resource( HFILE lzfd, LPCSTR type, LPCSTR id, DWORD *reslen, DWORD *offset ); + /****************************************************************************** * * This function will print via standard TRACE, debug info regarding @@ -344,23 +347,30 @@ static DWORD VERSION_GetFileVersionInfo_16( LPCSTR filename, DWORD datasize, LPV } /* first try without loading a 16-bit module */ - if (is_builtin) - len = 0; - else - len = GetFileResourceSize16( filename, - MAKEINTRESOURCEA(VS_FILE_INFO), - MAKEINTRESOURCEA(VS_VERSION_INFO), - &offset ); - if (len) - { - if (!data) return len; - - len = GetFileResource16( filename, - MAKEINTRESOURCEA(VS_FILE_INFO), - MAKEINTRESOURCEA(VS_VERSION_INFO), - offset, datasize, data ); + len = 0; + if (!is_builtin) + { + OFSTRUCT ofs; + HFILE lzfd = LZOpenFileA( (LPSTR)filename, &ofs, OF_READ ); + + if (lzfd >= 0) + { + if (find_resource( lzfd, MAKEINTRESOURCEA(VS_FILE_INFO), MAKEINTRESOURCEA(VS_VERSION_INFO), + &len, &offset )) + { + if (data) + { + LZSeek( lzfd, offset, 0 /* SEEK_SET */ ); + len = LZRead( lzfd, data, min( len, datasize ) ); + } + } + LZClose( lzfd ); + } + if (len) { + if (!data) return len; + vffi = (VS_FIXEDFILEINFO *)VersionInfo16_Value( (VS_VERSION_INFO_STRUCT16 *)data ); if ( vffi->dwSignature == VS_FFI_SIGNATURE )

1 0

Alexandre Julliard : version: Moved GetFileResourceSize16/ GetFileResource16 to ver16.c.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: dbbc40affa69a66d2f0993492e5e910210835ceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbbc40affa69a66d2f0993492… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 1 13:56:13 2009 +0200 version: Moved GetFileResourceSize16/GetFileResource16 to ver16.c. --- dlls/version/resource.c | 58 --------------------------------------------- dlls/version/ver16.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 58 deletions(-) diff --git a/dlls/version/resource.c b/dlls/version/resource.c index 2523aaa..0f8e086 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -408,61 +408,3 @@ DWORD find_resource( HFILE lzfd, LPCSTR type, LPCSTR id, DWORD *reslen, DWORD *o } return magic; } - - -/************************************************************************* - * GetFileResourceSize [VER.2] - */ -DWORD WINAPI GetFileResourceSize16( LPCSTR lpszFileName, LPCSTR lpszResType, - LPCSTR lpszResId, LPDWORD lpdwFileOffset ) -{ - HFILE lzfd; - OFSTRUCT ofs; - DWORD reslen = 0; - - TRACE("(%s,type=%p,id=%p,off=%p)\n", - debugstr_a(lpszFileName), lpszResType, lpszResId, lpszResId ); - - lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ ); - if (lzfd >= 0) - { - if (!find_resource( lzfd, lpszResType, lpszResId, &reslen, lpdwFileOffset )) reslen = 0; - LZClose( lzfd ); - } - return reslen; -} - - -/************************************************************************* - * GetFileResource [VER.3] - */ -DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType, - LPCSTR lpszResId, DWORD dwFileOffset, - DWORD dwResLen, LPVOID lpvData ) -{ - HFILE lzfd; - OFSTRUCT ofs; - DWORD reslen = dwResLen; - - TRACE("(%s,type=%p,id=%p,off=%d,len=%d,data=%p)\n", - debugstr_a(lpszFileName), lpszResType, lpszResId, - dwFileOffset, dwResLen, lpvData ); - - lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ ); - if ( lzfd < 0 ) return 0; - - if ( !dwFileOffset ) - { - if (!find_resource( lzfd, lpszResType, lpszResId, &reslen, &dwFileOffset )) - { - LZClose( lzfd ); - return 0; - } - } - - LZSeek( lzfd, dwFileOffset, SEEK_SET ); - reslen = LZRead( lzfd, lpvData, min( reslen, dwResLen ) ); - LZClose( lzfd ); - - return reslen; -} diff --git a/dlls/version/ver16.c b/dlls/version/ver16.c index 3ffb920..f399cd2 100644 --- a/dlls/version/ver16.c +++ b/dlls/version/ver16.c @@ -23,11 +23,71 @@ #include "windef.h" #include "wine/winbase16.h" #include "winver.h" +#include "lzexpand.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ver); +extern DWORD find_resource( HFILE lzfd, LPCSTR type, LPCSTR id, DWORD *reslen, DWORD *offset ); + +/************************************************************************* + * GetFileResourceSize [VER.2] + */ +DWORD WINAPI GetFileResourceSize16( LPCSTR lpszFileName, LPCSTR lpszResType, + LPCSTR lpszResId, LPDWORD lpdwFileOffset ) +{ + HFILE lzfd; + OFSTRUCT ofs; + DWORD reslen = 0; + + TRACE("(%s,type=%p,id=%p,off=%p)\n", + debugstr_a(lpszFileName), lpszResType, lpszResId, lpszResId ); + + lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ ); + if (lzfd >= 0) + { + if (!find_resource( lzfd, lpszResType, lpszResId, &reslen, lpdwFileOffset )) reslen = 0; + LZClose( lzfd ); + } + return reslen; +} + + +/************************************************************************* + * GetFileResource [VER.3] + */ +DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType, + LPCSTR lpszResId, DWORD dwFileOffset, + DWORD dwResLen, LPVOID lpvData ) +{ + HFILE lzfd; + OFSTRUCT ofs; + DWORD reslen = dwResLen; + + TRACE("(%s,type=%p,id=%p,off=%d,len=%d,data=%p)\n", + debugstr_a(lpszFileName), lpszResType, lpszResId, + dwFileOffset, dwResLen, lpvData ); + + lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ ); + if ( lzfd < 0 ) return 0; + + if ( !dwFileOffset ) + { + if (!find_resource( lzfd, lpszResType, lpszResId, &reslen, &dwFileOffset )) + { + LZClose( lzfd ); + return 0; + } + } + + LZSeek( lzfd, dwFileOffset, 0 /* SEEK_SET */ ); + reslen = LZRead( lzfd, lpvData, min( reslen, dwResLen ) ); + LZClose( lzfd ); + + return reslen; +} + /************************************************************************* * GetFileVersionInfoSize [VER.6] */

1 0

Alexandre Julliard : version: Make ver.dll into a stand-alone 16-bit module .
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 3ed5986dd68ddbaaecf9676f808e9c062f27f914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ed5986dd68ddbaaecf9676f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 1 13:57:08 2009 +0200 version: Make ver.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 + configure.ac | 1 + dlls/Makefile.in | 4 - dlls/ver.dll16/Makefile.in | 14 + .../{version/ver.spec => ver.dll16/ver.dll16.spec} | 0 dlls/ver.dll16/version.c | 558 ++++++++++++++++++++ dlls/version/Makefile.in | 5 - dlls/version/ver16.c | 182 ------- 9 files changed, 582 insertions(+), 192 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ed5986dd68ddbaaecf96…

1 0

Alexandre Julliard : version: Simplify the resource loading since we always load the same type and id now .
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: f6fc2dba0718d28ccbb98f9e8b15a8e034dc88b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6fc2dba0718d28ccbb98f9e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 1 13:58:24 2009 +0200 version: Simplify the resource loading since we always load the same type and id now. --- dlls/version/info.c | 5 +- dlls/version/resource.c | 127 +++++++++-------------------------------------- 2 files changed, 25 insertions(+), 107 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index f88b239..de6dd4b 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ver); -extern DWORD find_resource( HFILE lzfd, LPCSTR type, LPCSTR id, DWORD *reslen, DWORD *offset ); +extern DWORD find_version_resource( HFILE lzfd, DWORD *reslen, DWORD *offset ); /****************************************************************************** * @@ -355,8 +355,7 @@ static DWORD VERSION_GetFileVersionInfo_16( LPCSTR filename, DWORD datasize, LPV if (lzfd >= 0) { - if (find_resource( lzfd, MAKEINTRESOURCEA(VS_FILE_INFO), MAKEINTRESOURCEA(VS_VERSION_INFO), - &len, &offset )) + if (find_version_resource( lzfd, &len, &offset )) { if (data) { diff --git a/dlls/version/resource.c b/dlls/version/resource.c index 0f8e086..9af07fe 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -36,6 +36,7 @@ #include "windef.h" #include "winbase.h" #include "lzexpand.h" +#include "winver.h" #include "wine/unicode.h" #include "wine/winbase16.h" @@ -88,56 +89,6 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_default( const IMAGE_RESOURCE_ } -/********************************************************************** - * find_entry_by_name - * - * Find an entry by name in a resource directory - * Copied from loader/pe_resource.c - */ -static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_name( const IMAGE_RESOURCE_DIRECTORY *dir, - LPCSTR name, const void *root ) -{ - const IMAGE_RESOURCE_DIRECTORY *ret = NULL; - LPWSTR nameW; - DWORD namelen; - - if (!HIWORD(name)) return find_entry_by_id( dir, LOWORD(name), root ); - if (name[0] == '#') - { - return find_entry_by_id( dir, atoi(name+1), root ); - } - - namelen = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); - if ((nameW = HeapAlloc( GetProcessHeap(), 0, namelen * sizeof(WCHAR) ))) - { - const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; - const IMAGE_RESOURCE_DIR_STRING_U *str; - int min, max, res, pos; - - MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, namelen ); - namelen--; /* remove terminating null */ - entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); - min = 0; - max = dir->NumberOfNamedEntries - 1; - while (min <= max) - { - pos = (min + max) / 2; - str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const char *)root + entry[pos].u1.s1.NameOffset); - res = strncmpiW( nameW, str->NameString, str->Length ); - if (!res && namelen == str->Length) - { - ret = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s3.OffsetToDirectory); - break; - } - if (res < 0) max = pos - 1; - else min = pos + 1; - } - HeapFree( GetProcessHeap(), 0, nameW ); - } - return ret; -} - - /*********************************************************************** * read_xx_header [internal] */ @@ -171,9 +122,10 @@ static int read_xx_header( HFILE lzfd ) /*********************************************************************** * find_ne_resource [internal] */ -static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, - DWORD *resLen, DWORD *resOff ) +static BOOL find_ne_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) { + const WORD typeid = VS_FILE_INFO | 0x8000; + const WORD resid = VS_VERSION_INFO | 0x8000; IMAGE_OS2_HEADER nehd; NE_TYPEINFO *typeInfo; NE_NAMEINFO *nameInfo; @@ -206,55 +158,23 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, /* Find resource */ typeInfo = (NE_TYPEINFO *)(resTab + 2); - - if (HIWORD(typeid) != 0) /* named type */ - { - BYTE len = strlen( typeid ); - while (typeInfo->type_id) - { - if (!(typeInfo->type_id & 0x8000)) - { - BYTE *p = resTab + typeInfo->type_id; - if ((*p == len) && !strncasecmp( (char*)p+1, typeid, len )) goto found_type; - } - typeInfo = (NE_TYPEINFO *)((char *)(typeInfo + 1) + - typeInfo->count * sizeof(NE_NAMEINFO)); - } - } - else /* numeric type id */ + while (typeInfo->type_id) { - WORD id = LOWORD(typeid) | 0x8000; - while (typeInfo->type_id) - { - if (typeInfo->type_id == id) goto found_type; - typeInfo = (NE_TYPEINFO *)((char *)(typeInfo + 1) + - typeInfo->count * sizeof(NE_NAMEINFO)); - } + if (typeInfo->type_id == typeid) goto found_type; + typeInfo = (NE_TYPEINFO *)((char *)(typeInfo + 1) + + typeInfo->count * sizeof(NE_NAMEINFO)); } - TRACE("No typeid entry found for %p\n", typeid ); + TRACE("No typeid entry found\n" ); HeapFree( GetProcessHeap(), 0, resTab ); return FALSE; found_type: nameInfo = (NE_NAMEINFO *)(typeInfo + 1); - if (HIWORD(resid) != 0) /* named resource */ - { - BYTE len = strlen( resid ); - for (count = typeInfo->count; count > 0; count--, nameInfo++) - { - BYTE *p = resTab + nameInfo->id; - if (nameInfo->id & 0x8000) continue; - if ((*p == len) && !strncasecmp( (char*)p+1, resid, len )) goto found_name; - } - } - else /* numeric resource id */ - { - WORD id = LOWORD(resid) | 0x8000; - for (count = typeInfo->count; count > 0; count--, nameInfo++) - if (nameInfo->id == id) goto found_name; - } - TRACE("No resid entry found for %p\n", typeid ); + for (count = typeInfo->count; count > 0; count--, nameInfo++) + if (nameInfo->id == resid) goto found_name; + + TRACE("No resid entry found\n" ); HeapFree( GetProcessHeap(), 0, resTab ); return FALSE; @@ -270,8 +190,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, /*********************************************************************** * find_pe_resource [internal] */ -static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, - DWORD *resLen, DWORD *resOff ) +static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) { IMAGE_NT_HEADERS pehd; DWORD pehdoffset; @@ -344,22 +263,22 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, resDir = resSection + (resDataDir->VirtualAddress - sections[i].VirtualAddress); resPtr = resDir; - resPtr = find_entry_by_name( resPtr, typeid, resDir ); + resPtr = find_entry_by_id( resPtr, VS_FILE_INFO, resDir ); if ( !resPtr ) { - TRACE("No typeid entry found for %p\n", typeid ); + TRACE("No typeid entry found\n" ); goto done; } - resPtr = find_entry_by_name( resPtr, resid, resDir ); + resPtr = find_entry_by_id( resPtr, VS_VERSION_INFO, resDir ); if ( !resPtr ) { - TRACE("No resid entry found for %p\n", resid ); + TRACE("No resid entry found\n" ); goto done; } resPtr = find_entry_default( resPtr, resDir ); if ( !resPtr ) { - TRACE("No default language entry found for %p\n", resid ); + TRACE("No default language entry found\n" ); goto done; } @@ -391,19 +310,19 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, /*********************************************************************** - * find_resource [internal] + * find_version_resource [internal] */ -DWORD find_resource( HFILE lzfd, LPCSTR type, LPCSTR id, DWORD *reslen, DWORD *offset ) +DWORD find_version_resource( HFILE lzfd, DWORD *reslen, DWORD *offset ) { DWORD magic = read_xx_header( lzfd ); switch (magic) { case IMAGE_OS2_SIGNATURE: - if (!find_ne_resource( lzfd, type, id, reslen, offset )) magic = 0; + if (!find_ne_resource( lzfd, reslen, offset )) magic = 0; break; case IMAGE_NT_SIGNATURE: - if (!find_pe_resource( lzfd, type, id, reslen, offset )) magic = 0; + if (!find_pe_resource( lzfd, reslen, offset )) magic = 0; break; } return magic;

1 0

Juan Lang : wininet: Move initialization of SSL_CTX to library initialization time.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 5c6f47f7a764b632d9ef08490c48fe425be2f3f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c6f47f7a764b632d9ef08490… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 29 11:05:11 2009 -0700 wininet: Move initialization of SSL_CTX to library initialization time. --- dlls/wininet/netconnection.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index b5ca18a..2e97017 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -209,6 +209,14 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) pBIO_new_fp(stderr, BIO_NOCLOSE); /* FIXME: should use winedebug stuff */ meth = pSSLv23_method(); + ctx = pSSL_CTX_new(meth); + if (!pSSL_CTX_set_default_verify_paths(ctx)) + { + ERR("SSL_CTX_set_default_verify_paths failed: %s\n", + pERR_error_string(pERR_get_error(), 0)); + INTERNET_SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } #else FIXME("can't use SSL, not compiled in.\n"); INTERNET_SetLastError(ERROR_INTERNET_SECURITY_CHANNEL_ERROR); @@ -371,14 +379,6 @@ BOOL NETCON_secure_connect(WININET_NETCONNECTION *connection, LPCWSTR hostname) return FALSE; } - ctx = pSSL_CTX_new(meth); - if (!pSSL_CTX_set_default_verify_paths(ctx)) - { - ERR("SSL_CTX_set_default_verify_paths failed: %s\n", - pERR_error_string(pERR_get_error(), 0)); - INTERNET_SetLastError(ERROR_OUTOFMEMORY); - return FALSE; - } connection->ssl_s = pSSL_new(ctx); if (!connection->ssl_s) {

1 0

Jacek Caban : urlmon: Improve QueryCustomPolicy stub.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: e41d6eb94d4d4737a7d7b04258c5357352881da7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e41d6eb94d4d4737a7d7b0425… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 00:00:33 2009 +0200 urlmon: Improve QueryCustomPolicy stub. --- dlls/urlmon/sec_mgr.c | 4 ++-- dlls/urlmon/tests/sec_mgr.c | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 173fad7..b3d468d 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -590,8 +590,8 @@ static HRESULT WINAPI SecManagerImpl_QueryCustomPolicy(IInternetSecurityManager return hres; } - FIXME("Default action is not implemented\n"); - return E_NOTIMPL; + WARN("Unknown guidKey %s\n", debugstr_guid(guidKey)); + return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); } static HRESULT WINAPI SecManagerImpl_SetZoneMapping(IInternetSecurityManager *iface, diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 80a4552..8820811 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -71,6 +71,10 @@ static const BYTE secid10_2[] = static const GUID CLSID_TestActiveX = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x06,0x46}}; +/* Defined as extern in urlmon.idl, but not exported by uuid.lib */ +const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = + {0x10200490,0xfa38,0x11d0,{0xac,0x0e,0x00,0xa0,0xc9,0xf,0xff,0xc0}}; + static struct secmgr_test { LPCWSTR url; DWORD zone; @@ -297,7 +301,9 @@ static void test_special_url_action(IInternetSecurityManager *secmgr, IInternetZ static void test_activex(IInternetSecurityManager *secmgr) { - DWORD policy; + DWORD policy, policy_size; + struct CONFIRMSAFETY cs; + BYTE *ppolicy; HRESULT hres; policy = 0xdeadbeef; @@ -305,6 +311,13 @@ static void test_activex(IInternetSecurityManager *secmgr) sizeof(DWORD), (BYTE*)&CLSID_TestActiveX, sizeof(CLSID), 0, 0); ok(hres == S_OK, "ProcessUrlAction(URLACTION_ACTIVEX_RUN) failed: %08x\n", hres); ok(policy == URLPOLICY_ALLOW || policy == URLPOLICY_DISALLOW, "policy = %x\n", policy); + + cs.clsid = CLSID_TestActiveX; + cs.pUnk = (IUnknown*)0xdeadbeef; + cs.dwFlags = 0; + hres = IInternetSecurityManager_QueryCustomPolicy(secmgr, url1, &GUID_CUSTOM_CONFIRMOBJECTSAFETY, + &ppolicy, &policy_size, (BYTE*)&cs, sizeof(cs), 0); + ok(hres == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "QueryCusromPolicy failed: %08x\n", hres); } static void test_polices(void)

1 0

Jacek Caban : urlmon: Added support for URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 3b92a3f3a3f1b87e786565c00d0c5722925ba6e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b92a3f3a3f1b87e786565c00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 00:00:53 2009 +0200 urlmon: Added support for URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY. --- dlls/urlmon/sec_mgr.c | 1 + dlls/urlmon/tests/sec_mgr.c | 7 +++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index b3d468d..7a1255a 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -238,6 +238,7 @@ static HRESULT get_action_policy(DWORD zone, DWORD action, BYTE *policy, DWORD s switch(action) { case URLACTION_SCRIPT_OVERRIDE_SAFETY: + case URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY: *(DWORD*)policy = URLPOLICY_DISALLOW; return S_OK; } diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 8820811..62471cf 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -297,6 +297,12 @@ static void test_special_url_action(IInternetSecurityManager *secmgr, IInternetZ hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url1, action, (BYTE*)&policy, sizeof(WCHAR), NULL, 0, 0, 0); ok(hres == S_FALSE, "ProcessUrlAction(%x) failed: %08x, expected S_FALSE\n", action, hres); + + policy = 0xdeadbeef; + hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url1, action, (BYTE*)&policy, + sizeof(DWORD), NULL, 0, 0, 0); + ok(hres == S_FALSE, "ProcessUrlAction(%x) failed: %08x, expected S_FALSE\n", action, hres); + ok(policy == URLPOLICY_DISALLOW, "policy = %x\n", policy); } static void test_activex(IInternetSecurityManager *secmgr) @@ -338,6 +344,7 @@ static void test_polices(void) test_url_action(secmgr, zonemgr, 0xdeadbeef); test_special_url_action(secmgr, zonemgr, URLACTION_SCRIPT_OVERRIDE_SAFETY); + test_special_url_action(secmgr, zonemgr, URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY); test_activex(secmgr);

1 0

Jacek Caban : mshtml: Added QueryCustomPolicy implementation.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 81079eb221782dbfb16d21453cc0e892f2b1ea3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=81079eb221782dbfb16d21453… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 00:01:17 2009 +0200 mshtml: Added QueryCustomPolicy implementation. --- dlls/mshtml/secmgr.c | 82 +++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/script.c | 93 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 171 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index c9b1e46..be56e5d 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -27,6 +27,8 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "objsafe.h" +#include "activscp.h" #include "wine/debug.h" @@ -36,6 +38,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; +/* Defined as extern in urlmon.idl, but not exported by uuid.lib */ +const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = + {0x10200490,0xfa38,0x11d0,{0xac,0x0e,0x00,0xa0,0xc9,0xf,0xff,0xc0}}; + #define HOSTSECMGR_THIS(iface) DEFINE_THIS(HTMLDocumentNode, IInternetHostSecurityManager, iface) static HRESULT WINAPI InternetHostSecurityManager_QueryInterface(IInternetHostSecurityManager *iface, REFIID riid, void **ppv) @@ -78,12 +84,84 @@ static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHost pContext, cbContext, dwFlags, dwReserved); } +static DWORD confirm_safety(HTMLDocumentNode *This, const WCHAR *url, IUnknown *obj) +{ + DWORD policy, enabled_opts, supported_opts; + IObjectSafety *obj_safety; + HRESULT hres; + + /* FIXME: Check URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY */ + + hres = IInternetSecurityManager_ProcessUrlAction(This->secmgr, url, URLACTION_SCRIPT_SAFE_ACTIVEX, + (BYTE*)&policy, sizeof(policy), NULL, 0, 0, 0); + if(FAILED(hres) || policy != URLPOLICY_ALLOW) + return URLPOLICY_DISALLOW; + + hres = IUnknown_QueryInterface(obj, &IID_IObjectSafety, (void**)&obj_safety); + if(FAILED(hres)) + return URLPOLICY_DISALLOW; + + hres = IObjectSafety_GetInterfaceSafetyOptions(obj_safety, &IID_IDispatchEx, &supported_opts, &enabled_opts); + if(SUCCEEDED(hres)) { + enabled_opts = INTERFACESAFE_FOR_UNTRUSTED_CALLER; + if(supported_opts & INTERFACE_USES_SECURITY_MANAGER) + enabled_opts |= INTERFACE_USES_SECURITY_MANAGER; + hres = IObjectSafety_SetInterfaceSafetyOptions(obj_safety, &IID_IDispatchEx, enabled_opts, enabled_opts); + } + IObjectSafety_Release(obj_safety); + if(FAILED(hres)) + return URLPOLICY_DISALLOW; + + return URLPOLICY_ALLOW; +} + static HRESULT WINAPI InternetHostSecurityManager_QueryCustomPolicy(IInternetHostSecurityManager *iface, REFGUID guidKey, BYTE **ppPolicy, DWORD *pcbPolicy, BYTE *pContext, DWORD cbContext, DWORD dwReserved) { HTMLDocumentNode *This = HOSTSECMGR_THIS(iface); - FIXME("(%p)->(%s %p %p %p %d %x)\n", This, debugstr_guid(guidKey), ppPolicy, pcbPolicy, pContext, cbContext, dwReserved); - return E_NOTIMPL; + const WCHAR *url; + HRESULT hres; + + TRACE("(%p)->(%s %p %p %p %d %x)\n", This, debugstr_guid(guidKey), ppPolicy, pcbPolicy, pContext, cbContext, dwReserved); + + url = This->basedoc.doc_obj->url ? This->basedoc.doc_obj->url : about_blankW; + + hres = IInternetSecurityManager_QueryCustomPolicy(This->secmgr, url, guidKey, ppPolicy, pcbPolicy, + pContext, cbContext, dwReserved); + if(hres != HRESULT_FROM_WIN32(ERROR_NOT_FOUND)) + return hres; + + if(IsEqualGUID(&GUID_CUSTOM_CONFIRMOBJECTSAFETY, guidKey)) { + IActiveScript *active_script; + struct CONFIRMSAFETY *cs; + DWORD policy; + + if(cbContext != sizeof(struct CONFIRMSAFETY)) { + FIXME("wrong context size\n"); + return E_FAIL; + } + + cs = (struct CONFIRMSAFETY*)pContext; + hres = IUnknown_QueryInterface(cs->pUnk, &IID_IActiveScript, (void**)&active_script); + if(SUCCEEDED(hres)) { + FIXME("Got IAciveScript iface\n"); + IActiveScript_Release(active_script); + return E_FAIL; + } + + policy = confirm_safety(This, url, cs->pUnk); + + *ppPolicy = CoTaskMemAlloc(sizeof(policy)); + if(!*ppPolicy) + return E_OUTOFMEMORY; + + *(DWORD*)*ppPolicy = policy; + *pcbPolicy = sizeof(policy); + return S_OK; + } + + FIXME("Unknown guidKey %s\n", debugstr_guid(guidKey)); + return hres; } #undef HOSTSECMGR_THIS diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 89b076c..5f59ea4 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -37,6 +37,10 @@ DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +/* Defined as extern in urlmon.idl, but not exported by uuid.lib */ +const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = + {0x10200490,0xfa38,0x11d0,{0xac,0x0e,0x00,0xa0,0xc9,0xf,0xff,0xc0}}; + #ifdef _WIN64 #define CTXARG_T DWORDLONG @@ -110,6 +114,10 @@ DEFINE_EXPECT(GetScriptDispatch); DEFINE_EXPECT(funcDisp); DEFINE_EXPECT(script_testprop_d); DEFINE_EXPECT(script_testprop_i); +DEFINE_EXPECT(AXQueryInterface_IActiveScript); +DEFINE_EXPECT(AXQueryInterface_IObjectSafety); +DEFINE_EXPECT(AXGetInterfaceSafetyOptions); +DEFINE_EXPECT(AXSetInterfaceSafetyOptions); #define TESTSCRIPT_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80746}" @@ -519,7 +527,7 @@ static SCRIPTSTATE state; static HRESULT WINAPI ObjectSafety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) { *ppv = NULL; - ok(0, "unexpected call\n"); + ok(0, "unexpected call %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -573,11 +581,72 @@ static const IObjectSafetyVtbl ObjectSafetyVtbl = { static IObjectSafety ObjectSafety = { &ObjectSafetyVtbl }; +static HRESULT WINAPI AXObjectSafety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IActiveScript, riid)) { + CHECK_EXPECT(AXQueryInterface_IActiveScript); + return E_NOINTERFACE; + } + + if(IsEqualGUID(&IID_IObjectSafety, riid)) { + CHECK_EXPECT(AXQueryInterface_IObjectSafety); + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected call %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static HRESULT WINAPI AXObjectSafety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, + DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions) +{ + CHECK_EXPECT(AXGetInterfaceSafetyOptions); + + ok(IsEqualGUID(&IID_IDispatchEx, riid), "unexpected riid %s\n", debugstr_guid(riid)); + ok(pdwSupportedOptions != NULL, "pdwSupportedOptions == NULL\n"); + ok(pdwEnabledOptions != NULL, "pdwEnabledOptions == NULL\n"); + + *pdwSupportedOptions = INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER; + *pdwEnabledOptions = INTERFACE_USES_DISPEX; + + return S_OK; +} + +static HRESULT WINAPI AXObjectSafety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, + DWORD dwOptionSetMask, DWORD dwEnabledOptions) +{ + CHECK_EXPECT(AXSetInterfaceSafetyOptions); + + ok(IsEqualGUID(&IID_IDispatchEx, riid), "unexpected riid %s\n", debugstr_guid(riid)); + + ok(dwOptionSetMask == (INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACE_USES_SECURITY_MANAGER), + "dwOptionSetMask=%x\n", dwOptionSetMask); + ok(dwEnabledOptions == (INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACE_USES_SECURITY_MANAGER), + "dwEnabledOptions=%x\n", dwOptionSetMask); + + return S_OK; +} + +static const IObjectSafetyVtbl AXObjectSafetyVtbl = { + AXObjectSafety_QueryInterface, + ObjectSafety_AddRef, + ObjectSafety_Release, + AXObjectSafety_GetInterfaceSafetyOptions, + AXObjectSafety_SetInterfaceSafetyOptions +}; + +static IObjectSafety AXObjectSafety = { &AXObjectSafetyVtbl }; + static void test_security(void) { IInternetHostSecurityManager *sec_mgr; IServiceProvider *sp; - DWORD policy; + DWORD policy, policy_size; + struct CONFIRMSAFETY cs; + BYTE *ppolicy; HRESULT hres; hres = IActiveScriptSite_QueryInterface(site, &IID_IServiceProvider, (void**)&sp); @@ -593,6 +662,26 @@ static void test_security(void) ok(hres == S_OK, "ProcessUrlAction failed: %08x\n", hres); ok(policy == URLPOLICY_ALLOW, "policy = %x\n", policy); + cs.clsid = CLSID_TestActiveX; + cs.pUnk = (IUnknown*)&AXObjectSafety; + cs.dwFlags = 0; + + SET_EXPECT(AXQueryInterface_IActiveScript); + SET_EXPECT(AXQueryInterface_IObjectSafety); + SET_EXPECT(AXGetInterfaceSafetyOptions); + SET_EXPECT(AXSetInterfaceSafetyOptions); + hres = IInternetHostSecurityManager_QueryCustomPolicy(sec_mgr, &GUID_CUSTOM_CONFIRMOBJECTSAFETY, + &ppolicy, &policy_size, (BYTE*)&cs, sizeof(cs), 0); + CHECK_CALLED(AXQueryInterface_IActiveScript); + CHECK_CALLED(AXQueryInterface_IObjectSafety); + CHECK_CALLED(AXGetInterfaceSafetyOptions); + CHECK_CALLED(AXSetInterfaceSafetyOptions); + + ok(hres == S_OK, "QueryCusromPolicy failed: %08x\n", hres); + ok(policy_size == sizeof(DWORD), "policy_size = %d\n", policy_size); + ok(*(DWORD*)ppolicy == URLPOLICY_ALLOW, "policy = %x\n", *(DWORD*)ppolicy); + CoTaskMemFree(ppolicy); + IInternetHostSecurityManager_Release(sec_mgr); }

1 0

Michael Stefaniuc : server: A signed 1-bit bitfield doesn't make much sense ; use unsigned.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 0eed4405de418405b43c2b56c92689cd2e2763a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eed4405de418405b43c2b56c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 1 00:22:55 2009 +0200 server: A signed 1-bit bitfield doesn't make much sense; use unsigned. --- server/fd.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index d2da624..72ebcfe 100644 --- a/server/fd.c +++ b/server/fd.c @@ -192,8 +192,8 @@ struct fd unsigned int sharing; /* file sharing mode */ int unix_fd; /* unix file descriptor */ unsigned int no_fd_status;/* status to return when unix_fd is -1 */ - int signaled :1; /* is the fd signaled? */ - int fs_locks :1; /* can we use filesystem locks for this fd? */ + unsigned int signaled :1; /* is the fd signaled? */ + unsigned int fs_locks :1; /* can we use filesystem locks for this fd? */ int poll_index; /* index of fd in poll array */ struct async_queue *read_q; /* async readers of this fd */ struct async_queue *write_q; /* async writers of this fd */

1 0