October 2007 - Wine-commits

Jeremy Newman : EA Durbin <ead1234@hotmail.com>
by Jeremy Newman 19 Oct '07

19 Oct '07

Module: website Branch: master Commit: aa36d1b34cdb1a6e39b9f1459702f7e26037df3f URL: http://source.winehq.org/git/website.git/?a=commit;h=aa36d1b34cdb1a6e39b9f1… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 19 09:51:32 2007 -0500 EA Durbin <ead1234(a)hotmail.com> maintenance - prune some dead or moved links --- templates/en/resources.template | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/templates/en/resources.template b/templates/en/resources.template index c11ec16..c072acf 100644 --- a/templates/en/resources.template +++ b/templates/en/resources.template @@ -16,7 +16,6 @@ <ul> <li><a href="http://www.winprog.org/tutorial/">Win32 API Tutorial</a> If you know nothing about Windows, you can't do worse than start here. - <li><a href="ftp://ftp.borland.com/pub/delphi/techpubs/delphi2/win32.zip">Win32 API</a> Help File format, courtesy of Borland. <li><a href="http://msdn.microsoft.com/developercenters/">MSDN Online</a> Microsoft's new site. <li><a href="http://www.microsoft.com/windows/directx/default.aspx">DirectX</a> Multimedia API for games, etc. <li>The Open32 API is the subset of Win32 implemented by IBM's OS/2 Merlin. Open32 provides source code @@ -34,7 +33,6 @@ The official <a href="http://www.ecma-international.org/">European Computer Manufacturer's Association</a> specification of the Windows API. Known as APIW while it was in draft. <li><a href="ftp://ftp.cs.cmu.edu/afs/cs.cmu.edu/user/ralf/pub/WWW/files.html">DOS Interrupts</a> Ralf Brown's exhaustive and famous Interrupt List - <li><a href="http://sunsite.lanet.lv/ftp/mirror/x2ftp/msdos/programming/00Main.html">X2</a> DOS programming specifications <li><a href="http://garbo.uwasa.fi/pc/">Garbo</a> DOS archives </ul> @@ -62,17 +60,14 @@ <ul> <li><a href="http://www.tldp.org/HOWTO/Font-HOWTO/">TTF on Linux HOWTO</a> <li><a href="http://www.microsoft.com/typography/unicode/cs.htm">Charset info</a> From Microsoft. - <li><a href="http://rcum.uni-mb.si/local/fontfaq/cf_1.htm">comp.fonts</a> The home page is gone, but the <a href="http://nwalsh.com/comp.fonts/FAQ/index.html">FAQ</a> - is still available, as is the <a href="http://rcum.uni-mb.si/local/fontfaq/cf_18.htm#GLOSS6">Internet Font Archive</a>. + <li>comp.fonts<a href="http://nwalsh.com/comp.fonts/FAQ/index.html">FAQ</a> <li><a href="http://www.w3.org/Fonts/Panose/pan2.html">Panose 2.0</a> Font spec <li><a href="ftp://ftp.x.org/R5contrib/hp_xlfd_enhancements/hp_xlfd_enhancements">X11R6 Fonts</a> X is more typographically capable than it appears, as is made clear in this paper by Nathan Meyers. <li><a href="http://www.freetype.org/">FreeType</a> Free TrueType font engine <li><a href="http://www.linuxberg.com/preview/9995.html">t1lib</a> PostScript T1 font engine, extracted and improved from X11 sources. <li><a href="http://ftp.giga.or.at/pub/nih/ttftot42">TTFtoT42</a> Use TTF with Postscript rasterizers - <li><a href="http://www.curvesoft.com/tools.html">Curvesoft</a> Commercial type 1 rasterizer, includes FreeType based TTF rasterizer <li><a href="http://www.truedoc.com/webpages/samples/samples_l4.html">TrueDoc sample</a> Antialiasing and subpixel positioning sales pitch - <li><a href="http://crl.nmsu.edu/">CLR</a> Center for Linguistics Research <li><a href="http://czyborra.com/">Unicode Info</a> From Roman Czybora. <li>Charles Bigelow, <i>Scientific American</i>, 1983. <li><a href="http://grc.com/cleartype.htm">Subpixel antialiasing</a> Everything old is new again @@ -90,9 +85,7 @@ <ul> <li><a href="http://www.sandpile.org/">Sandpile.org</a> Another one. <li><a href="http://www.x86.org/">Intel Secrets</a> What Intel doesn't want you to know - <li><a href="http://www.intel.com/technology/itj/Q21999/ARTICLES/art_6.htm">Intel Documentation</a> What Intel does want you to know -- how to write code for their chips. - <li>Intel Chips with<a href="http://cedar.intel.com/cgi-bin/ids.dll/topic.jsp?catCode=DEC">SSE</a> - <li>Intel Chips with<a href="http://cedar.intel.com/cgi-bin/ids.dll/topic.jsp?catCode=DED">SSE2</a> + <li><a href="http://www.intel.com/technology/itj/archive.htm">Intel Documentation</a> What Intel does want you to know -- how to write code for their chips. <li>A link to the <a href="http://developer.intel.com/software/products/perflib/index.htm">Intel performance libraries</a> </ul>

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 19 Oct '07

19 Oct '07

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

Juan Lang : crypt32: Fix a couple leaked messages.
by Alexandre Julliard 19 Oct '07

19 Oct '07

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: Free root store when quitting.
by Alexandre Julliard 19 Oct '07

19 Oct '07

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: Free memory on an error path.
by Alexandre Julliard 19 Oct '07

19 Oct '07

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: Keep signer handle count separate from signer info.
by Alexandre Julliard 19 Oct '07

19 Oct '07

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

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

19 Oct '07

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: Pass reg store' s key and memory store to CRYPT_RegReadFromReg, rather than passing a private type.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: 4d203fe9028c8e17ab60a794ca9bef0ee04513fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d203fe9028c8e17ab60a794c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 18 11:12:32 2007 -0700 crypt32: Pass reg store's key and memory store to CRYPT_RegReadFromReg, rather than passing a private type. --- dlls/crypt32/regstore.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c index e7de5fd..3754011 100644 --- a/dlls/crypt32/regstore.c +++ b/dlls/crypt32/regstore.c @@ -63,8 +63,8 @@ static const WCHAR CRLsW[] = { 'C','R','L','s',0 }; static const WCHAR CTLsW[] = { 'C','T','L','s',0 }; static const WCHAR BlobW[] = { 'B','l','o','b',0 }; -static void CRYPT_RegReadSerializedFromReg(const WINE_REGSTOREINFO *store, HKEY key, - DWORD contextType) +static void CRYPT_RegReadSerializedFromReg(HKEY key, DWORD contextType, + HCERTSTORE store) { LONG rc; DWORD index = 0; @@ -136,7 +136,7 @@ static void CRYPT_RegReadSerializedFromReg(const WINE_REGSTOREINFO *store, HKEY { TRACE("hash matches, adding\n"); contextInterface->addContextToStore( - store->memStore, context, + store, context, CERT_STORE_ADD_REPLACE_EXISTING, NULL); } else @@ -156,7 +156,7 @@ static void CRYPT_RegReadSerializedFromReg(const WINE_REGSTOREINFO *store, HKEY } while (!rc); } -static void CRYPT_RegReadFromReg(const WINE_REGSTOREINFO *store) +static void CRYPT_RegReadFromReg(HKEY key, HCERTSTORE store) { static const WCHAR * const subKeys[] = { CertsW, CRLsW, CTLsW }; static const DWORD contextFlags[] = { CERT_STORE_CERTIFICATE_CONTEXT_FLAG, @@ -165,15 +165,15 @@ static void CRYPT_RegReadFromReg(const WINE_REGSTOREINFO *store) for (i = 0; i < sizeof(subKeys) / sizeof(subKeys[0]); i++) { - HKEY key; + HKEY hKey; LONG rc; - rc = RegCreateKeyExW(store->key, subKeys[i], 0, NULL, 0, KEY_READ, NULL, - &key, NULL); + rc = RegCreateKeyExW(key, subKeys[i], 0, NULL, 0, KEY_READ, NULL, + &hKey, NULL); if (!rc) { - CRYPT_RegReadSerializedFromReg(store, key, contextFlags[i]); - RegCloseKey(key); + CRYPT_RegReadSerializedFromReg(hKey, contextFlags[i], store); + RegCloseKey(hKey); } } } @@ -444,7 +444,7 @@ static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags, case CERT_STORE_CTRL_RESYNC: CRYPT_RegFlushStore(store, FALSE); CRYPT_EmptyStore(store->memStore); - CRYPT_RegReadFromReg(store); + CRYPT_RegReadFromReg(store->key, store->memStore); ret = TRUE; break; case CERT_STORE_CTRL_COMMIT: @@ -523,7 +523,7 @@ PWINECRYPT_CERTSTORE CRYPT_RegOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, regInfo->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PWINE_REGSTOREINFO->cs"); list_init(&regInfo->certsToDelete); list_init(&regInfo->crlsToDelete); - CRYPT_RegReadFromReg(regInfo); + CRYPT_RegReadFromReg(regInfo->key, regInfo->memStore); regInfo->dirty = FALSE; provInfo.cbSize = sizeof(provInfo); provInfo.cStoreProvFunc = sizeof(regProvFuncs) /

1 0

Juan Lang : crypt32: Use I_CertUpdateStore in registry stores.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: abc2aec88c98fffbebfb94d797eb7ad30c26ebc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc2aec88c98fffbebfb94d79… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 18 11:13:20 2007 -0700 crypt32: Use I_CertUpdateStore in registry stores. --- dlls/crypt32/crypt32_private.h | 1 - dlls/crypt32/regstore.c | 10 ++++++++-- dlls/crypt32/store.c | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 63d7c2d..8975522 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -233,7 +233,6 @@ typedef struct WINE_CRYPTCERTSTORE void CRYPT_InitStore(WINECRYPT_CERTSTORE *store, DWORD dwFlags, CertStoreType type); void CRYPT_FreeStore(PWINECRYPT_CERTSTORE store); -void CRYPT_EmptyStore(HCERTSTORE store); BOOL WINAPI I_CertUpdateStore(HCERTSTORE store1, HCERTSTORE store2, DWORD unk0, DWORD unk1); diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c index 3754011..35928b8 100644 --- a/dlls/crypt32/regstore.c +++ b/dlls/crypt32/regstore.c @@ -442,11 +442,17 @@ static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags, switch (dwCtrlType) { case CERT_STORE_CTRL_RESYNC: + { + HCERTSTORE memStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + CRYPT_RegFlushStore(store, FALSE); - CRYPT_EmptyStore(store->memStore); - CRYPT_RegReadFromReg(store->key, store->memStore); + CRYPT_RegReadFromReg(store->key, memStore); + I_CertUpdateStore(store->memStore, memStore, 0, 0); + CertCloseStore(memStore, 0); ret = TRUE; break; + } case CERT_STORE_CTRL_COMMIT: ret = CRYPT_RegFlushStore(store, dwFlags & CERT_STORE_CTRL_COMMIT_FORCE_FLAG); diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 28c37d2..57a2bd8 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -199,7 +199,7 @@ static BOOL CRYPT_MemDeleteCrl(PWINECRYPT_CERTSTORE store, void *pCrlContext) return TRUE; } -void CRYPT_EmptyStore(HCERTSTORE store) +static void CRYPT_EmptyStore(HCERTSTORE store) { PCCERT_CONTEXT cert; PCCRL_CONTEXT crl;

1 0

Juan Lang : crypt32: Use GetSystemTimeAsFileTime rather than GetSystemTime/ SystemTimeToFileTime.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: cf904c2bc4a314625d6dfb7a581d1e1de8e1bada URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf904c2bc4a314625d6dfb7a5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 18 11:14:12 2007 -0700 crypt32: Use GetSystemTimeAsFileTime rather than GetSystemTime/SystemTimeToFileTime. --- dlls/crypt32/cert.c | 5 +---- dlls/crypt32/crl.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index dcad7fa..2451973 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1305,10 +1305,7 @@ LONG WINAPI CertVerifyTimeValidity(LPFILETIME pTimeToVerify, if (!pTimeToVerify) { - SYSTEMTIME sysTime; - - GetSystemTime(&sysTime); - SystemTimeToFileTime(&sysTime, &fileTime); + GetSystemTimeAsFileTime(&fileTime); pTimeToVerify = &fileTime; } if ((ret = CompareFileTime(pTimeToVerify, &pCertInfo->NotBefore)) >= 0) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index bc7f73e..ada06fc 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -519,10 +519,7 @@ LONG WINAPI CertVerifyCRLTimeValidity(LPFILETIME pTimeToVerify, if (!pTimeToVerify) { - SYSTEMTIME sysTime; - - GetSystemTime(&sysTime); - SystemTimeToFileTime(&sysTime, &fileTime); + GetSystemTimeAsFileTime(&fileTime); pTimeToVerify = &fileTime; } if ((ret = CompareFileTime(pTimeToVerify, &pCrlInfo->ThisUpdate)) >= 0)

1 0