October 2007 - Wine-Commits

Jeremy Newman : Scott Ritchie <scott@open-vote.org>
by Jeremy Newman Oct. 19, 2007

Oct. 19, 2007

Module: website Branch: master Commit: a7596032addea851b7bf6d681bfb37581b73fb5d URL: http://source.winehq.org/git/website.git/?a=commit;h=a7596032addea851b7bf6d… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 19 09:30:18 2007 -0500 Scott Ritchie <scott(a)open-vote.org> Update download-deb and download page for Ubuntu Gutsy --- templates/en/download-deb.template | 24 +++++++++++++----------- templates/en/download.template | 26 +++++++++++++------------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/templates/en/download-deb.template b/templates/en/download-deb.template index 1d78f60..c716eb0 100644 --- a/templates/en/download-deb.template +++ b/templates/en/download-deb.template @@ -25,6 +25,8 @@ list of trusted APT keys by copy and pasting the following: Next, add the repository to your system's list of APT sources: +For Ubuntu Gutsy (7.10): +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/gutsy.list -O /etc/apt/sources.list.d/winehq.list For Ubuntu Feisty (7.04): sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/feisty.list -O /etc/apt/sources.list.d/winehq.list For Ubuntu Edgy (6.10): *64-bit packages not available* @@ -39,18 +41,18 @@ using the Synaptic Package Manager under System->Administration. Alternatively, can install from the terminal by running 'sudo apt-get update' to update APT's package information and then 'sudo apt-get install wine'. -<h2>64-bit Users:</h2> +<h2>Upgrading to a new version of Ubuntu</h2> + +If you are upgrading the entire system, such as going from Ubuntu 7.04 to 7.10, you will need to +come back to this page and enter the command for the new version above. The built in update manager +will not switch the Wine repository automatically. -Packages for the 64 bit version of Ubuntu Feisty (7.04) are now available, however -for users of Debian and older Ubuntus the entries above are for i386 users only. -Attempting to use these repositories with a different architecture will result -in 404 errors as APT will be looking for files not in the repository. +<h2>64-bit Users:</h2> -If you are using an older 64 bit distribution and would still like a working Wine package, -there is a relatively easy hack that can be used to install the 32-bit package -into the 64-bit distribution and have it function normally. See -<a href="http://wiki.winehq.org/UbuntuAMD64">this page on the Wine wiki</a> -for more details. +If you are using a very old version of Ubuntu where 64 bit packages are not available +and would still like a working Wine package, there is a relatively easy hack that can be +used to install the 32-bit package and have it function normally. See +<a href="http://wiki.winehq.org/UbuntuAMD64">this page on the Wine wiki</a> for more details. <h2>Older .deb packages</h2> @@ -58,7 +60,7 @@ for more details. the packages are available at <a href=http://wine.budgetdedicated.com/archive/index.html>the WineHQ .deb packages archive</a>. -If you wish to use these packages, you'll have to install them by hand, such as by double clicking them or using dpkg -i +You can install the packages by double-clicking on them. Very fast and reliable webhosting for the APT repository is graciously provided by <a href="http://www.budgetdedicated.com/">budgetdedicated.com</a>. diff --git a/templates/en/download.template b/templates/en/download.template index 33dc3d7..7df2fb6 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -22,7 +22,7 @@ for post-installation instructions. <tr bgcolor="#ffffff"> <td align=center><a href="{$root}/site/download-rh"> - <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a> + <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a> </td> <td> <a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Red Hat / CentOS / Fedora</a> binary and source .rpms for Red Hat Enterprise Linux 4, 5; CentOS 4, 5; Fedora Core 5, 6; Fedora Linux 7 and @@ -36,27 +36,27 @@ for post-installation instructions. <tr bgcolor="#ffffff"> <td align=center><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…"> - <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> + <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">SUSE</a> release binary and source .rpms and daily snapshot RPMs for SUSE Linux 9.3, 10.0, 10.1, and openSUSE 10.2. - </td> + </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> <tr bgcolor="#ffffff"> <td align=center><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…"> - <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> + <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…">Mandriva</a> binary .rpms for Mandriva Linux 2006 and 2007. Download the 2007.1 package if your Mandriva is a 2007.1 - release, eg. 2007 Spring. Download the 2007.0 package if your Mandriva is the first 2007 release.</td> + release, eg. 2007 Spring. Download the 2007.0 package if your Mandriva is the first 2007 release.</td> <td><a href="mailto:marco(a)mandrivaclub.nl">Marco Meijer</a></td> </tr> <tr bgcolor="#ffffff"> <td align=center><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> + <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">Slackware</a> binary .tgz for Slackware 10.2</td> @@ -65,25 +65,25 @@ for post-installation instructions. <tr bgcolor="#ffffff"> <td align=center><a href="{$root}/site/download-deb"> - <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> + <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/site/download-deb">Ubuntu</a> - binary and source .debs for Ubuntu Feisty (7.04), Edgy (6.10), and Dapper (6.06)</td> + binary and source .debs for Ubuntu Gutsy (7.10), Feisty (7.04), Edgy (6.10), and Dapper (6.06) <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> <tr bgcolor="#ffffff"> <td align=center><a href="{$root}/site/download-deb"> - <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian linux" border="0"></a> + <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian linux" border="0"></a> </td> <td> <a href="{$root}/site/download-deb">Debian</a> - binary and source .debs for Debian Etch (4.0)</td> + binary and source .debs for Debian Etch (4.0)</td> <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> <tr bgcolor="#ffffff"> <td align=center><a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> + <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> </td> <td> <a href="http://www.freshports.org/emulators/wine/">FreeBSD</a> source for FreeBSD 5.3 or later</td> @@ -92,7 +92,7 @@ for post-installation instructions. <tr bgcolor="#ffffff"> <td align=center><a href="http://www.pbidir.com/search.php?str=wine"> - <img src="{$root}/images/distro/pcbsd.png" width="50" height="50" alt="FreeBSD" border="0"></a> + <img src="{$root}/images/distro/pcbsd.png" width="50" height="50" alt="FreeBSD" border="0"></a> </td> <td> <a href="http://www.pbidir.com/search.php?str=wine">PC-BSD</a> binary packages .pbi for PC-BSD (FreeBSD based OS)</td> @@ -101,7 +101,7 @@ for post-installation instructions. <tr bgcolor="#ffffff"> <td align=center><a href="http://www.blastwave.org/wine/"> - <img src="{$root}/images/distro/sun.png" width="50" height="50" alt="Sun Solaris" border="0"></a> + <img src="{$root}/images/distro/sun.png" width="50" height="50" alt="Sun Solaris" border="0"></a> </td> <td> <a href="http://www.blastwave.org/wine/">Solaris</a> binary and source for Solaris 9 and 10</td>

1 0

Francois Gouget : winex11.drv: Remove the coloruse == -1 special case. Add X11DRV_DIB_GetColorCount() for computing a bitmap's number of colors.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: 0d24ebfcbbe04e808622b1835b536301b61c9bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d24ebfcbbe04e808622b1835… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 18 17:10:06 2007 +0200 winex11.drv: Remove the coloruse == -1 special case. Add X11DRV_DIB_GetColorCount() for computing a bitmap's number of colors. --- dlls/winex11.drv/dib.c | 102 +++++++++++++++++++++++++++-------------------- 1 files changed, 59 insertions(+), 43 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 4c28928..e24bd96 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -257,6 +257,34 @@ static int DIB_GetBitmapInfoEx( const BITMAPINFOHEADER *header, LONG *width, /*********************************************************************** + * X11DRV_DIB_GetColorCount + * + * Computes the number of colors for the bitmap palette. + * Should not be called for a >8-bit deep bitmap. + */ +static unsigned int X11DRV_DIB_GetColorCount(const BITMAPINFO *info) +{ + unsigned int colors; + BOOL core_info = info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER); + + if (core_info) + { + colors = 1 << ((const BITMAPCOREINFO*)info)->bmciHeader.bcBitCount; + } + else + { + colors = info->bmiHeader.biClrUsed; + if (!colors) colors = 1 << info->bmiHeader.biBitCount; + } + if (colors > 256) + { + ERR("called with >256 colors!\n"); + colors = 0; + } + return colors; +} + +/*********************************************************************** * DIB_GetBitmapInfo * * Get the info from a bitmap header. @@ -343,15 +371,10 @@ static int *X11DRV_DIB_GenColorMap( X11DRV_PDEVICE *physDev, int *colorMapping, } else /* DIB_PAL_COLORS */ { - if (colorPtr) { - const WORD * index = (const WORD *)colorPtr; + const WORD * index = (const WORD *)colorPtr; - for (i = start; i < end; i++, index++) - colorMapping[i] = X11DRV_PALETTE_ToPhysical( physDev, PALETTEINDEX(*index) ); - } else { - for (i = start; i < end; i++) - colorMapping[i] = X11DRV_PALETTE_ToPhysical( physDev, PALETTEINDEX(i) ); - } + for (i = start; i < end; i++, index++) + colorMapping[i] = X11DRV_PALETTE_ToPhysical( physDev, PALETTEINDEX(*index) ); } return colorMapping; @@ -366,40 +389,21 @@ static int *X11DRV_DIB_GenColorMap( X11DRV_PDEVICE *physDev, int *colorMapping, static int *X11DRV_DIB_BuildColorMap( X11DRV_PDEVICE *physDev, WORD coloruse, WORD depth, const BITMAPINFO *info, int *nColors ) { - unsigned int colors; BOOL isInfo; const void *colorPtr; int *colorMapping; - isInfo = info->bmiHeader.biSize != sizeof(BITMAPCOREHEADER); - if (isInfo) - { - colors = info->bmiHeader.biClrUsed; - if (!colors) colors = 1 << info->bmiHeader.biBitCount; - } - else - { - colors = 1 << ((const BITMAPCOREHEADER *)info)->bcBitCount; - } + *nColors = X11DRV_DIB_GetColorCount(info); + if (!*nColors) return NULL; - colorPtr = (const BYTE*) info + (WORD) info->bmiHeader.biSize; - - if (colors > 256) - { - ERR("called with >256 colors!\n"); - return NULL; - } - - /* just so CopyDIBSection doesn't have to create an identity palette */ - if (coloruse == (WORD)-1) colorPtr = NULL; - - if (!(colorMapping = HeapAlloc(GetProcessHeap(), 0, colors * sizeof(int) ))) + isInfo = info->bmiHeader.biSize != sizeof(BITMAPCOREHEADER); + colorPtr = (const BYTE*)info + (WORD)info->bmiHeader.biSize; + if (!(colorMapping = HeapAlloc(GetProcessHeap(), 0, *nColors * sizeof(int) ))) return NULL; - *nColors = colors; return X11DRV_DIB_GenColorMap( physDev, colorMapping, coloruse, depth, - isInfo, colorPtr, 0, colors); + isInfo, colorPtr, 0, *nColors); } /*********************************************************************** @@ -4199,7 +4203,9 @@ void X11DRV_DIB_CopyDIBSection(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physD { DIBSECTION dib; X_PHYSBITMAP *physBitmap; - int nColorMap = 0, *colorMap = NULL, aColorMap = FALSE; + unsigned int nColorMap; + int* x11ColorMap; + int freeColorMap; TRACE("(%p,%p,%d,%d,%d,%d,%d,%d)\n", physDevSrc->hdc, physDevDst->hdc, xSrc, ySrc, xDest, yDest, width, height); @@ -4228,24 +4234,34 @@ void X11DRV_DIB_CopyDIBSection(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physD * use the DIB colormap instead - this is necessary in some * cases since we need to do depth conversion in some places * where real Windows can just copy data straight over */ - colorMap = physBitmap->colorMap; + x11ColorMap = physBitmap->colorMap; nColorMap = physBitmap->nColorMap; + freeColorMap = FALSE; } else { - colorMap = X11DRV_DIB_BuildColorMap( physDevSrc, (WORD)-1, - dib.dsBm.bmBitsPixel, - (BITMAPINFO*)&dib.dsBmih, - &nColorMap ); - if (colorMap) aColorMap = TRUE; + const BITMAPINFO* info = (BITMAPINFO*)&dib.dsBmih; + int i; + + nColorMap = X11DRV_DIB_GetColorCount(info); + x11ColorMap = HeapAlloc(GetProcessHeap(), 0, nColorMap * sizeof(int)); + for (i = 0; i < nColorMap; i++) + x11ColorMap[i] = X11DRV_PALETTE_ToPhysical(physDevSrc, PALETTEINDEX(i)); + freeColorMap = TRUE; } } + else + { + nColorMap = 0; + x11ColorMap = NULL; + freeColorMap = FALSE; + } /* perform the copy */ - X11DRV_DIB_DoCopyDIBSection(physBitmap, FALSE, colorMap, nColorMap, + X11DRV_DIB_DoCopyDIBSection(physBitmap, FALSE, x11ColorMap, nColorMap, physDevDst->drawable, physDevDst->gc, xSrc, ySrc, physDevDst->dc_rect.left + xDest, physDevDst->dc_rect.top + yDest, width, height); /* free color mapping */ - if (aColorMap) - HeapFree(GetProcessHeap(), 0, colorMap); + if (freeColorMap) + HeapFree(GetProcessHeap(), 0, x11ColorMap); } }

1 0

Alexandre Julliard : ntdll: Fixed off-by-one error in RtlGetFullPathName_U (spotted by Michael Builov).
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: 7475ecac530f81bf66338fa49f01839f352ae87e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7475ecac530f81bf66338fa49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 19 14:40:23 2007 +0200 ntdll: Fixed off-by-one error in RtlGetFullPathName_U (spotted by Michael Builov). --- dlls/ntdll/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 6f161a3..db4cd10 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -809,7 +809,7 @@ DWORD WINAPI RtlGetFullPathName_U(const WCHAR* name, ULONG size, WCHAR* buffer, { LPWSTR tmp = RtlAllocateHeap(GetProcessHeap(), 0, reqsize); reqsize = get_full_path_helper(name, tmp, reqsize); - if (reqsize > size) /* it may have worked the second time */ + if (reqsize + sizeof(WCHAR) > size) /* it may have worked the second time */ { RtlFreeHeap(GetProcessHeap(), 0, tmp); return reqsize + sizeof(WCHAR);

1 0

Juan Lang : crypt32: Free memory on an error path.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: b85492e851810d66e023d75eb24fd533e4406876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b85492e851810d66e023d75eb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 18 21:52:06 2007 -0700 crypt32: Free memory on an error path. --- dlls/crypt32/oid.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index ccc4f68..c35554f 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -567,7 +567,11 @@ BOOL WINAPI CryptGetDefaultOIDFunctionAddress(HCRYPTOIDFUNCSET hFuncSet, *phFuncAddr = addr; } else + { + CryptFreeOIDFunctionAddress(*phFuncAddr, 0); SetLastError(ERROR_FILE_NOT_FOUND); + *phFuncAddr = NULL; + } } } }

1 0

Juan Lang : crypt32: Free root store when quitting.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: 1dce5ed3b04caa3575194de15ae0813a54551d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dce5ed3b04caa3575194de15… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 18 21:50:46 2007 -0700 crypt32: Free root store when quitting. --- dlls/crypt32/crypt32_private.h | 1 + dlls/crypt32/main.c | 1 + dlls/crypt32/rootstore.c | 5 +++++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 8975522..8293e82 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -126,6 +126,7 @@ HCRYPTPROV CRYPT_GetDefaultProvider(void); void crypt_oid_init(HINSTANCE hinst); void crypt_oid_free(void); void crypt_sip_free(void); +void root_store_free(void); void default_chain_engine_free(void); /* Some typedefs that make it easier to abstract which type of context we're diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 12f2885..727246e 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -45,6 +45,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved) case DLL_PROCESS_DETACH: crypt_oid_free(); crypt_sip_free(); + root_store_free(); default_chain_engine_free(); if (hDefProv) CryptReleaseContext(hDefProv, 0); break; diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 0bd537d..b96e456 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -504,3 +504,8 @@ PWINECRYPT_CERTSTORE CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags) CertDuplicateStore(CRYPT_rootStore); return CRYPT_rootStore; } + +void root_store_free(void) +{ + CertCloseStore(CRYPT_rootStore, 0); +}

1 0

Juan Lang : crypt32: Fix a couple leaked messages.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: d8fb290ee1ddcedb6d8cdddbfa213e12afd2dc5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8fb290ee1ddcedb6d8cdddbf… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 18 20:48:33 2007 -0700 crypt32: Fix a couple leaked messages. --- dlls/crypt32/tests/msg.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 711677b..47321af 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1926,6 +1926,7 @@ static void test_decode_msg_update(void) ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), TRUE); ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + CryptMsgClose(msg); /* but decoding it as an explicitly typed message fails. */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, 0, NULL, NULL); @@ -2447,6 +2448,7 @@ static void test_msg_control(void) sizeof(signedWithCertWithValidPubKeyContent), TRUE); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); ok(ret, "CryptMsgControl failed: %08x\n", GetLastError()); + CryptMsgClose(msg); } static void test_msg_get_signer_count(void)

1 0

Juan Lang : crypt32: Keep signer handle count separate from signer info.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: 8882936073aa878b6519264288389896338328dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8882936073aa878b651926428… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 19 03:48:50 2007 -0700 crypt32: Keep signer handle count separate from signer info. --- dlls/crypt32/msg.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 193396f..30c0ddb 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -806,6 +806,7 @@ typedef struct _CSignerHandles typedef struct _CSignedMsgData { CRYPT_SIGNED_INFO *info; + DWORD cSignerHandle; CSignerHandles *signerHandles; } CSignedMsgData; @@ -841,13 +842,22 @@ static BOOL CSignedMsgData_AllocateHandles(CSignedMsgData *msg_data) msg_data->signerHandles = CryptMemAlloc(msg_data->info->cSignerInfo * sizeof(CSignerHandles)); if (msg_data->signerHandles) + { + msg_data->cSignerHandle = msg_data->info->cSignerInfo; memset(msg_data->signerHandles, 0, msg_data->info->cSignerInfo * sizeof(CSignerHandles)); + } else + { + msg_data->cSignerHandle = 0; ret = FALSE; + } } else + { + msg_data->cSignerHandle = 0; msg_data->signerHandles = NULL; + } return ret; } @@ -855,7 +865,7 @@ static void CSignedMsgData_CloseHandles(CSignedMsgData *msg_data) { DWORD i; - for (i = 0; i < msg_data->info->cSignerInfo; i++) + for (i = 0; i < msg_data->cSignerHandle; i++) { if (msg_data->signerHandles[i].contentHash) CryptDestroyHash(msg_data->signerHandles[i].contentHash); @@ -863,6 +873,8 @@ static void CSignedMsgData_CloseHandles(CSignedMsgData *msg_data) CryptDestroyHash(msg_data->signerHandles[i].authAttrHash); } CryptMemFree(msg_data->signerHandles); + msg_data->signerHandles = NULL; + msg_data->cSignerHandle = 0; } static BOOL CSignedMsgData_UpdateHash(CSignedMsgData *msg_data, @@ -871,7 +883,7 @@ static BOOL CSignedMsgData_UpdateHash(CSignedMsgData *msg_data, DWORD i; BOOL ret = TRUE; - for (i = 0; ret && i < msg_data->info->cSignerInfo; i++) + for (i = 0; ret && i < msg_data->cSignerHandle; i++) ret = CryptHashData(msg_data->signerHandles[i].contentHash, pbData, cbData, 0); return ret; @@ -1140,7 +1152,7 @@ static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, break; } case CMSG_COMPUTED_HASH_PARAM: - if (dwIndex >= msg->msg_data.info->cSignerInfo) + if (dwIndex >= msg->msg_data.cSignerHandle) SetLastError(CRYPT_E_INVALID_INDEX); else ret = CryptGetHashParam( @@ -1279,6 +1291,7 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, { msg->msg_data.info->cSignerInfo = 0; msg->msg_data.signerHandles = NULL; + msg->msg_data.cSignerHandle = 0; } } if (ret) @@ -2023,7 +2036,7 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, case CMSG_COMPUTED_HASH_PARAM: if (msg->u.signed_data.info) { - if (dwIndex >= msg->u.signed_data.info->cSignerInfo) + if (dwIndex >= msg->u.signed_data.cSignerHandle) SetLastError(CRYPT_E_INVALID_INDEX); else ret = CryptGetHashParam(

1 0

Juan Lang : crypt32: Make sure a signed encode message' s signer info is always initialized.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: 6763841e19338abb3b72ba3d5684bc82cd63d139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6763841e19338abb3b72ba3d5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 18 20:47:30 2007 -0700 crypt32: Make sure a signed encode message's signer info is always initialized. --- dlls/crypt32/msg.c | 46 +++++++++++++++++++++++++++------------------- 1 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 2d19736..38abd48 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1248,33 +1248,41 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, } else ret = FALSE; - if (ret && info->cSigners) + if (ret) { - msg->msg_data.info->rgSignerInfo = - CryptMemAlloc(info->cSigners * sizeof(CMSG_SIGNER_INFO)); - if (msg->msg_data.info->rgSignerInfo) + if (info->cSigners) { - msg->msg_data.info->cSignerInfo = info->cSigners; - memset(msg->msg_data.info->rgSignerInfo, 0, - msg->msg_data.info->cSignerInfo * sizeof(CMSG_SIGNER_INFO)); - ret = CSignedMsgData_AllocateHandles(&msg->msg_data); - for (i = 0; ret && i < msg->msg_data.info->cSignerInfo; i++) + msg->msg_data.info->rgSignerInfo = + CryptMemAlloc(info->cSigners * sizeof(CMSG_SIGNER_INFO)); + if (msg->msg_data.info->rgSignerInfo) { - ret = CSignerInfo_Construct( - &msg->msg_data.info->rgSignerInfo[i], - &info->rgSigners[i]); - if (ret) + msg->msg_data.info->cSignerInfo = info->cSigners; + memset(msg->msg_data.info->rgSignerInfo, 0, + msg->msg_data.info->cSignerInfo * sizeof(CMSG_SIGNER_INFO)); + ret = CSignedMsgData_AllocateHandles(&msg->msg_data); + for (i = 0; ret && i < msg->msg_data.info->cSignerInfo; i++) { - ret = CSignedMsgData_ConstructSignerHandles( - &msg->msg_data, i, info->rgSigners[i].hCryptProv); - if (dwFlags & CMSG_CRYPT_RELEASE_CONTEXT_FLAG) - CryptReleaseContext(info->rgSigners[i].hCryptProv, - 0); + ret = CSignerInfo_Construct( + &msg->msg_data.info->rgSignerInfo[i], + &info->rgSigners[i]); + if (ret) + { + ret = CSignedMsgData_ConstructSignerHandles( + &msg->msg_data, i, info->rgSigners[i].hCryptProv); + if (dwFlags & CMSG_CRYPT_RELEASE_CONTEXT_FLAG) + CryptReleaseContext(info->rgSigners[i].hCryptProv, + 0); + } } } + else + ret = FALSE; } else - ret = FALSE; + { + msg->msg_data.info->cSignerInfo = 0; + msg->msg_data.signerHandles = NULL; + } } if (ret) ret = CRYPT_ConstructBlobArray(

1 0

Juan Lang : crypt32: Set lower quality chain count and pointer to 0 when freeing them.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: 9ae5ef664185682737174a1eece83fe8eb51a84c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae5ef664185682737174a1ee… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 18 20:46:57 2007 -0700 crypt32: Set lower quality chain count and pointer to 0 when freeing them. --- dlls/crypt32/chain.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 9832f0e..92043b1 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1062,6 +1062,8 @@ static void CRYPT_FreeLowerQualityChains(PCertificateChain chain) for (i = 0; i < chain->context.cLowerQualityChainContext; i++) CertFreeCertificateChain(chain->context.rgpLowerQualityChainContext[i]); CryptMemFree(chain->context.rgpLowerQualityChainContext); + chain->context.cLowerQualityChainContext = 0; + chain->context.rgpLowerQualityChainContext = NULL; } static void CRYPT_FreeChainContext(PCertificateChain chain) @@ -1365,11 +1367,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, } while (ret && alternate); chain = CRYPT_ChooseHighestQualityChain(chain); if (!(dwFlags & CERT_CHAIN_RETURN_LOWER_QUALITY_CONTEXTS)) - { CRYPT_FreeLowerQualityChains(chain); - chain->context.cLowerQualityChainContext = 0; - chain->context.rgpLowerQualityChainContext = NULL; - } if (ppChainContext) *ppChainContext = (PCCERT_CHAIN_CONTEXT)chain; else

1 0

Juan Lang : crypt32: Get rid of an unused key.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: cc88619f86f8e8e3edef83e57ed362d05930afd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc88619f86f8e8e3edef83e57… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 18 20:48:01 2007 -0700 crypt32: Get rid of an unused key. --- dlls/crypt32/msg.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 38abd48..193396f 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -801,7 +801,6 @@ typedef struct _CSignerHandles { HCRYPTHASH contentHash; HCRYPTHASH authAttrHash; - HCRYPTKEY key; } CSignerHandles; typedef struct _CSignedMsgData @@ -858,8 +857,6 @@ static void CSignedMsgData_CloseHandles(CSignedMsgData *msg_data) for (i = 0; i < msg_data->info->cSignerInfo; i++) { - if (msg_data->signerHandles[i].key) - CryptDestroyKey(msg_data->signerHandles[i].key); if (msg_data->signerHandles[i].contentHash) CryptDestroyHash(msg_data->signerHandles[i].contentHash); if (msg_data->signerHandles[i].authAttrHash)

1 0