Ros-diffs July 2012

ros-diffs@reactos.org

14 participants
193 discussions

[tfaber] 56880: [WINTRUST] - Do not delay-import imagehlp. Fixes crash in wintrust:crypt See issue #7171 for more details.

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Jul 13 09:27:45 2012 New Revision: 56880 URL: http://svn.reactos.org/svn/reactos?rev=56880&view=rev Log: [WINTRUST] - Do not delay-import imagehlp. Fixes crash in wintrust:crypt See issue #7171 for more details. Modified: trunk/reactos/dll/win32/wintrust/CMakeLists.txt Modified: trunk/reactos/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] Fri Jul 13 09:27:45 2012 @@ -17,7 +17,9 @@ add_library(wintrust SHARED ${SOURCE}) set_module_type(wintrust win32dll) target_link_libraries(wintrust wine ${PSEH_LIB}) -add_delay_importlibs(wintrust cryptui imagehlp) -add_importlibs(wintrust crypt32 user32 advapi32 msvcrt kernel32 ntdll) +# FIXME: imagehlp should be delay-imported. See bug 7171 +#add_delay_importlibs(wintrust cryptui imagehlp) +add_delay_importlibs(wintrust cryptui) +add_importlibs(wintrust imagehlp crypt32 user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET wintrust DESTINATION reactos/system32 FOR all)

12 years, 5 months

[tfaber] 56879: [WINTRUST] - Sync to Wine 1.5.4

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Jul 13 08:19:36 2012 New Revision: 56879 URL: http://svn.reactos.org/svn/reactos?rev=56879&view=rev Log: [WINTRUST] - Sync to Wine 1.5.4 Removed: trunk/reactos/dll/win32/wintrust/wintrust_ros.diff Modified: trunk/reactos/dll/win32/wintrust/CMakeLists.txt trunk/reactos/dll/win32/wintrust/crypt.c trunk/reactos/dll/win32/wintrust/softpub.c trunk/reactos/dll/win32/wintrust/wintrust.spec trunk/reactos/dll/win32/wintrust/wintrust_main.c trunk/reactos/dll/win32/wintrust/wintrust_priv.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] Fri Jul 13 08:19:36 2012 @@ -2,15 +2,14 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -set_rc_compiler() spec2def(wintrust.dll wintrust.spec ADD_IMPORTLIB) list(APPEND SOURCE + asn.c crypt.c register.c + softpub.c wintrust_main.c - asn.c - softpub.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/wintrust_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/wintrust.def) Modified: trunk/reactos/dll/win32/wintrust/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/crypt.c… ============================================================================== --- trunk/reactos/dll/win32/wintrust/crypt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/crypt.c [iso-8859-1] Fri Jul 13 08:19:36 2012 @@ -858,7 +858,6 @@ return INVALID_HANDLE_VALUE; } - if (!dwPublicVersion) dwPublicVersion = 0x00000100; if (!dwEncodingType) dwEncodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; if (fdwOpenFlags & CRYPTCAT_OPEN_ALWAYS) flags |= OPEN_ALWAYS; @@ -1017,16 +1016,27 @@ { BOOL ret; WIN_CERTIFICATE *pCert = NULL; + HANDLE file; TRACE("(%p %p %d %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, pcbSignedDataMsg, pbSignedDataMsg); + + if(pSubjectInfo->hFile && pSubjectInfo->hFile!=INVALID_HANDLE_VALUE) + file = pSubjectInfo->hFile; + else + { + file = CreateFileW(pSubjectInfo->pwsFileName, GENERIC_READ, + FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); + if(file == INVALID_HANDLE_VALUE) + return FALSE; + } if (!pbSignedDataMsg) { WIN_CERTIFICATE cert; /* app hasn't passed buffer, just get the length */ - ret = ImageGetCertificateHeader(pSubjectInfo->hFile, dwIndex, &cert); + ret = ImageGetCertificateHeader(file, dwIndex, &cert); if (ret) { switch (cert.wCertificateType) @@ -1045,7 +1055,7 @@ { DWORD len = 0; - ret = ImageGetCertificateData(pSubjectInfo->hFile, dwIndex, NULL, &len); + ret = ImageGetCertificateData(file, dwIndex, NULL, &len); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) goto error; pCert = HeapAlloc(GetProcessHeap(), 0, len); @@ -1054,10 +1064,10 @@ ret = FALSE; goto error; } - ret = ImageGetCertificateData(pSubjectInfo->hFile, dwIndex, pCert, - &len); + ret = ImageGetCertificateData(file, dwIndex, pCert, &len); if (!ret) goto error; + pCert->dwLength -= FIELD_OFFSET(WIN_CERTIFICATE, bCertificate); if (*pcbSignedDataMsg < pCert->dwLength) { *pcbSignedDataMsg = pCert->dwLength; @@ -1067,6 +1077,7 @@ else { memcpy(pbSignedDataMsg, pCert->bCertificate, pCert->dwLength); + *pcbSignedDataMsg = pCert->dwLength; switch (pCert->wCertificateType) { case WIN_CERT_TYPE_X509: @@ -1084,7 +1095,45 @@ } } error: + if(pSubjectInfo->hFile != file) + CloseHandle(file); HeapFree(GetProcessHeap(), 0, pCert); + return ret; +} + +static BOOL WINTRUST_PutSignedMsgToPEFile(SIP_SUBJECTINFO* pSubjectInfo, DWORD pdwEncodingType, + DWORD* pdwIndex, DWORD cbSignedDataMsg, BYTE* pbSignedDataMsg) +{ + WIN_CERTIFICATE *cert; + HANDLE file; + DWORD size; + BOOL ret; + + if(pSubjectInfo->hFile && pSubjectInfo->hFile!=INVALID_HANDLE_VALUE) + file = pSubjectInfo->hFile; + else + { + file = CreateFileW(pSubjectInfo->pwsFileName, GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); + if(file == INVALID_HANDLE_VALUE) + return FALSE; + } + + /* int aligned WIN_CERTIFICATE structure with cbSignedDataMsg+1 bytes of data */ + size = FIELD_OFFSET(WIN_CERTIFICATE, bCertificate[cbSignedDataMsg+4]) & (~3); + cert = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if(!cert) + return FALSE; + + cert->dwLength = size; + cert->wRevision = WIN_CERT_REVISION_2_0; + cert->wCertificateType = WIN_CERT_TYPE_PKCS_SIGNED_DATA; + memcpy(cert->bCertificate, pbSignedDataMsg, cbSignedDataMsg); + ret = ImageAddCertificate(file, cert, pdwIndex); + + HeapFree(GetProcessHeap(), 0, cert); + if(file != pSubjectInfo->hFile) + CloseHandle(file); return ret; } @@ -1297,22 +1346,30 @@ return ret; } +/* GUIDs used by CryptSIPGetSignedDataMsg and CryptSIPPutSignedDataMsg */ +static const GUID unknown = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47, + 0x00,0xC0,0x4F,0xC2,0x95,0xEE } }; +static const GUID cabGUID = { 0xC689AABA, 0x8E78, 0x11D0, { 0x8C,0x47, + 0x00,0xC0,0x4F,0xC2,0x95,0xEE } }; +static const GUID catGUID = { 0xDE351A43, 0x8E59, 0x11D0, { 0x8C,0x47, + 0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; + /*********************************************************************** * CryptSIPGetSignedDataMsg (WINTRUST.@) */ BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEncodingType, DWORD dwIndex, DWORD* pcbSignedDataMsg, BYTE* pbSignedDataMsg) { - static const GUID unknown = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47, - 0x00,0xC0,0x4F,0xC2,0x95,0xEE } }; - static const GUID cabGUID = { 0xC689AABA, 0x8E78, 0x11D0, { 0x8C,0x47, - 0x00,0xC0,0x4F,0xC2,0x95,0xEE } }; - static const GUID catGUID = { 0xDE351A43, 0x8E59, 0x11D0, { 0x8C,0x47, - 0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; BOOL ret; TRACE("(%p %p %d %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, pcbSignedDataMsg, pbSignedDataMsg); + + if(!pSubjectInfo) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if (!memcmp(pSubjectInfo->pgSubjectType, &unknown, sizeof(unknown))) ret = WINTRUST_GetSignedMsgFromPEFile(pSubjectInfo, pdwEncodingType, @@ -1338,11 +1395,23 @@ * CryptSIPPutSignedDataMsg (WINTRUST.@) */ BOOL WINAPI CryptSIPPutSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD pdwEncodingType, - DWORD* pdwIndex, DWORD cbSignedDataMsg, BYTE* pbSignedDataMsg) -{ - FIXME("(%p %d %p %d %p) stub\n", pSubjectInfo, pdwEncodingType, pdwIndex, + DWORD* pdwIndex, DWORD cbSignedDataMsg, BYTE* pbSignedDataMsg) +{ + TRACE("(%p %d %p %d %p)\n", pSubjectInfo, pdwEncodingType, pdwIndex, cbSignedDataMsg, pbSignedDataMsg); - + + if(!pSubjectInfo) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if(!memcmp(pSubjectInfo->pgSubjectType, &unknown, sizeof(unknown))) + return WINTRUST_PutSignedMsgToPEFile(pSubjectInfo, pdwEncodingType, + pdwIndex, cbSignedDataMsg, pbSignedDataMsg); + else + FIXME("unimplemented for subject type %s\n", + debugstr_guid(pSubjectInfo->pgSubjectType)); + return FALSE; } Modified: trunk/reactos/dll/win32/wintrust/softpub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/softpub… ============================================================================== --- trunk/reactos/dll/win32/wintrust/softpub.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/softpub.c [iso-8859-1] Fri Jul 13 08:19:36 2012 @@ -24,6 +24,7 @@ #include "wintrust.h" #include "mssip.h" #include "softpub.h" +#include "winnls.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wintrust); @@ -116,7 +117,20 @@ data->pWintrustData->u.pFile->pcwszFilePath, data->pWintrustData->u.pFile->hFile, &data->u.pPDSip->gSubject)) - err = GetLastError(); + { + LARGE_INTEGER fileSize; + DWORD sipError = GetLastError(); + + /* Special case for empty files: the error is expected to be + * TRUST_E_SUBJECT_FORM_UNKNOWN, rather than whatever + * CryptSIPRetrieveSubjectGuid returns. + */ + if (GetFileSizeEx(data->pWintrustData->u.pFile->hFile, &fileSize) + && !fileSize.QuadPart) + err = TRUST_E_SUBJECT_FORM_UNKNOWN; + else + err = sipError; + } } else data->u.pPDSip->gSubject = *data->pWintrustData->u.pFile->pgKnownSubject; @@ -469,6 +483,98 @@ return signerInfo; } +static BOOL WINTRUST_GetTimeFromCounterSigner( + const CMSG_CMS_SIGNER_INFO *counterSignerInfo, FILETIME *time) +{ + DWORD i; + BOOL foundTimeStamp = FALSE; + + for (i = 0; !foundTimeStamp && i < counterSignerInfo->AuthAttrs.cAttr; i++) + { + if (!strcmp(counterSignerInfo->AuthAttrs.rgAttr[i].pszObjId, + szOID_RSA_signingTime)) + { + const CRYPT_ATTRIBUTE *attr = + &counterSignerInfo->AuthAttrs.rgAttr[i]; + DWORD j; + + for (j = 0; !foundTimeStamp && j < attr->cValue; j++) + { + static const DWORD encoding = X509_ASN_ENCODING | + PKCS_7_ASN_ENCODING; + DWORD size = sizeof(FILETIME); + + foundTimeStamp = CryptDecodeObjectEx(encoding, + X509_CHOICE_OF_TIME, + attr->rgValue[j].pbData, attr->rgValue[j].cbData, 0, NULL, + time, &size); + } + } + } + return foundTimeStamp; +} + +static LPCSTR filetime_to_str(const FILETIME *time) +{ + static char date[80]; + char dateFmt[80]; /* sufficient for all versions of LOCALE_SSHORTDATE */ + SYSTEMTIME sysTime; + + if (!time) return NULL; + + GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, + sizeof(dateFmt) / sizeof(dateFmt[0])); + FileTimeToSystemTime(time, &sysTime); + GetDateFormatA(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, + sizeof(date) / sizeof(date[0])); + return date; +} + +static FILETIME WINTRUST_GetTimeFromSigner(const CRYPT_PROVIDER_DATA *data, + const CMSG_SIGNER_INFO *signerInfo) +{ + DWORD i; + FILETIME time; + BOOL foundTimeStamp = FALSE; + + for (i = 0; !foundTimeStamp && i < signerInfo->UnauthAttrs.cAttr; i++) + { + if (!strcmp(signerInfo->UnauthAttrs.rgAttr[i].pszObjId, + szOID_RSA_counterSign)) + { + const CRYPT_ATTRIBUTE *attr = &signerInfo->UnauthAttrs.rgAttr[i]; + DWORD j; + + for (j = 0; j < attr->cValue; j++) + { + static const DWORD encoding = X509_ASN_ENCODING | + PKCS_7_ASN_ENCODING; + CMSG_CMS_SIGNER_INFO *counterSignerInfo; + DWORD size; + BOOL ret = CryptDecodeObjectEx(encoding, CMS_SIGNER_INFO, + attr->rgValue[j].pbData, attr->rgValue[j].cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &counterSignerInfo, &size); + if (ret) + { + /* FIXME: need to verify countersigner signature too */ + foundTimeStamp = WINTRUST_GetTimeFromCounterSigner( + counterSignerInfo, &time); + LocalFree(counterSignerInfo); + } + } + } + } + if (!foundTimeStamp) + { + TRACE("returning system time %s\n", + filetime_to_str(&data->sftSystemTime)); + time = data->sftSystemTime; + } + else + TRACE("returning time from message %s\n", filetime_to_str(&time)); + return time; +} + static DWORD WINTRUST_SaveSigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) { DWORD err; @@ -479,7 +585,7 @@ CRYPT_PROVIDER_SGNR sgnr = { sizeof(sgnr), { 0 } }; sgnr.psSigner = signerInfo; - sgnr.sftVerifyAsOf = data->sftSystemTime; + sgnr.sftVerifyAsOf = WINTRUST_GetTimeFromSigner(data, signerInfo); if (!data->psPfns->pfnAddSgnr2Chain(data, FALSE, signerIdx, &sgnr)) err = GetLastError(); else @@ -1101,7 +1207,8 @@ CryptMsgClose(data->hMsg); if (data->fOpenedFile && - data->pWintrustData->dwUnionChoice == WTD_CHOICE_FILE) + data->pWintrustData->dwUnionChoice == WTD_CHOICE_FILE && + data->pWintrustData->u.pFile) CloseHandle(data->pWintrustData->u.pFile->hFile); return S_OK; Modified: trunk/reactos/dll/win32/wintrust/wintrust.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust.spec [iso-8859-1] Fri Jul 13 08:19:36 2012 @@ -45,12 +45,12 @@ @ stdcall DriverCleanupPolicy(ptr) @ stdcall DriverFinalPolicy(ptr) @ stdcall DriverInitializePolicy(ptr) -@ stub FindCertsByIssuer +@ stdcall FindCertsByIssuer(ptr ptr ptr ptr long wstr long) @ stdcall GenericChainCertificateTrust(ptr) @ stdcall GenericChainFinalProv(ptr) @ stdcall HTTPSCertificateTrust(ptr) @ stdcall HTTPSFinalProv(ptr) -@ stub IsCatalogFile +@ stdcall IsCatalogFile(ptr wstr) @ stub MsCatConstructHashTag @ stub MsCatFreeHashTag @ stub OfficeCleanupPolicy Modified: trunk/reactos/dll/win32/wintrust/wintrust_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust_main.c [iso-8859-1] Fri Jul 13 08:19:36 2012 @@ -1201,3 +1201,31 @@ FIXME("Stub\n"); return S_OK; } + +/*********************************************************************** + * IsCatalogFile + */ +BOOL WINAPI IsCatalogFile(HANDLE hFile, WCHAR *pwszFileName) +{ + static const GUID catGUID = { 0xDE351A43, 0x8E59, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; + GUID guid; + + TRACE("(%p, %s)\n", hFile, debugstr_w(pwszFileName)); + + if (!CryptSIPRetrieveSubjectGuid(pwszFileName, hFile, &guid)) + return FALSE; + return IsEqualGUID(&guid, &catGUID); +} + +/*********************************************************************** + * FindCertsByIssuer + */ +HRESULT WINAPI FindCertsByIssuer(PCERT_CHAIN pCertChains, DWORD *pcbCertChains, + DWORD *pcCertChains, BYTE* pbEncodedIssuerName, DWORD cbEncodedIssuerName, + LPCWSTR pwszPurpose, DWORD dwKeySpec) +{ + FIXME("(%p, %p, %p, %p, %d, %s, %d): stub\n", pCertChains, pcbCertChains, + pcCertChains, pbEncodedIssuerName, cbEncodedIssuerName, + debugstr_w(pwszPurpose), dwKeySpec); + return E_FAIL; +} Modified: trunk/reactos/dll/win32/wintrust/wintrust_priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust_priv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust_priv.h [iso-8859-1] Fri Jul 13 08:19:36 2012 @@ -18,14 +18,14 @@ #ifndef __WINTRUST_PRIV_H__ #define __WINTRUST_PRIV_H__ -void * WINAPI WINTRUST_Alloc(DWORD cb) __WINE_ALLOC_SIZE(1); -void WINAPI WINTRUST_Free(void *p); -BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store); +void * WINAPI WINTRUST_Alloc(DWORD cb) __WINE_ALLOC_SIZE(1) DECLSPEC_HIDDEN; +void WINAPI WINTRUST_Free(void *p) DECLSPEC_HIDDEN; +BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store) DECLSPEC_HIDDEN; BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, - BOOL fCounterSigner, DWORD idxSigner, CRYPT_PROVIDER_SGNR *sgnr); + BOOL fCounterSigner, DWORD idxSigner, CRYPT_PROVIDER_SGNR *sgnr) DECLSPEC_HIDDEN; BOOL WINAPI WINTRUST_AddCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, - BOOL fCounterSigner, DWORD idxCounterSigner, PCCERT_CONTEXT pCert2Add); + BOOL fCounterSigner, DWORD idxCounterSigner, PCCERT_CONTEXT pCert2Add) DECLSPEC_HIDDEN; BOOL WINAPI WINTRUST_AddPrivData(CRYPT_PROVIDER_DATA *data, - CRYPT_PROVIDER_PRIVDATA *pPrivData2Add); + CRYPT_PROVIDER_PRIVDATA *pPrivData2Add) DECLSPEC_HIDDEN; #endif /* ndef __WINTRUST_PRIV_H__ */ Removed: trunk/reactos/dll/win32/wintrust/wintrust_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust_ros.diff (removed) @@ -1,31 +1,0 @@ -Index: wintrust_main.c -=================================================================== ---- wintrust_main.c (revision 23867) -+++ wintrust_main.c (working copy) -@@ -83,7 +83,26 @@ - */ - LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData ) - { -+ static const GUID gen_verify_v2 = WINTRUST_ACTION_GENERIC_VERIFY_V2; -+ - FIXME("%p %s %p\n", hwnd, debugstr_guid(ActionID), ActionData); -+ -+ /* Trust providers can be found at: -+ * HKLM\SOFTWARE\Microsoft\Cryptography\Providers\Trust\CertCheck\ -+ * -+ * Process Explorer expects a correct implementation, so we -+ * return TRUST_E_PROVIDER_UNKNOWN. -+ * -+ * Girotel needs ERROR_SUCCESS. -+ * -+ * For now return TRUST_E_PROVIDER_UNKNOWN only when -+ * ActionID = WINTRUST_ACTION_GENERIC_VERIFY_V2. -+ * -+ */ -+ -+ if (IsEqualCLSID(ActionID, &gen_verify_v2)) -+ return TRUST_E_PROVIDER_UNKNOWN; -+ - return ERROR_SUCCESS; - } - Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Jul 13 08:19:36 2012 @@ -189,7 +189,7 @@ reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 -reactos/dll/win32/wintrust # Autosync +reactos/dll/win32/wintrust # Synced to Wine-1.5.4 reactos/dll/win32/wldap32 # Autosync reactos/dll/win32/wmi # Synced to Wine-1.5.4 reactos/dll/win32/wtsapi32 # Synced to Wine-1.5.4

12 years, 5 months

[tfaber] 56878: [WINTRUST_WINETEST] - Sync to Wine 1.5.4 - Fix MSVC build. Already applied upstream.

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Jul 13 07:43:41 2012 New Revision: 56878 URL: http://svn.reactos.org/svn/reactos?rev=56878&view=rev Log: [WINTRUST_WINETEST] - Sync to Wine 1.5.4 - Fix MSVC build. Already applied upstream. Modified: trunk/rostests/winetests/wintrust/CMakeLists.txt trunk/rostests/winetests/wintrust/asn.c trunk/rostests/winetests/wintrust/crypt.c trunk/rostests/winetests/wintrust/register.c trunk/rostests/winetests/wintrust/softpub.c Modified: trunk/rostests/winetests/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/CMakeL… ============================================================================== --- trunk/rostests/winetests/wintrust/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/CMakeLists.txt [iso-8859-1] Fri Jul 13 07:43:41 2012 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE asn.c Modified: trunk/rostests/winetests/wintrust/asn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/asn.c?… ============================================================================== --- trunk/rostests/winetests/wintrust/asn.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/asn.c [iso-8859-1] Fri Jul 13 07:43:41 2012 @@ -150,7 +150,7 @@ CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && (GetLastError() == CRYPT_E_INVALID_IA5_STRING || - GetLastError() == OSS_BAD_PTR /* Win9x */), + GetLastError() == OSS_BAD_PTR /* WinNT */), "Expected CRYPT_E_INVALID_IA5_STRING, got %08x\n", GetLastError()); /* Unlike the crypt32 string encoding routines, size is not set to the * index of the first invalid character. @@ -298,7 +298,7 @@ NULL, &buf, &size); ok(!ret && (GetLastError() == CRYPT_E_BAD_ENCODE || - GetLastError() == OSS_DATA_ERROR /* Win9x */), + GetLastError() == OSS_DATA_ERROR /* WinNT */), "Expected CRYPT_E_BAD_ENCODE, got %08x\n", GetLastError()); } Modified: trunk/rostests/winetests/wintrust/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/crypt.… ============================================================================== --- trunk/rostests/winetests/wintrust/crypt.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/crypt.c [iso-8859-1] Fri Jul 13 07:43:41 2012 @@ -115,6 +115,8 @@ static CRYPTCATMEMBER * (WINAPI * pCryptCATEnumerateMember)(HANDLE, CRYPTCATMEMBER *); static CRYPTCATATTRIBUTE * (WINAPI * pCryptCATEnumerateAttr)(HANDLE, CRYPTCATMEMBER *, CRYPTCATATTRIBUTE *); static BOOL (WINAPI * pCryptCATClose)(HANDLE); +static pCryptSIPGetSignedDataMsg pGetSignedDataMsg; +static pCryptSIPPutSignedDataMsg pPutSignedDataMsg; static void InitFunctionPtrs(void) { @@ -144,6 +146,14 @@ WINTRUST_GET_PROC(CryptCATClose) #undef WINTRUST_GET_PROC + + pGetSignedDataMsg = (void*)GetProcAddress(hWintrust, "CryptSIPGetSignedDataMsg"); + if(!pGetSignedDataMsg) + trace("GetProcAddress(CryptSIPGetSignedDataMsg) failed\n"); + + pPutSignedDataMsg = (void*)GetProcAddress(hWintrust, "CryptSIPPutSignedDataMsg"); + if(!pPutSignedDataMsg) + trace("GetProcAddress(CryptSIPPutSignedDataMsg) failed\n"); } static GUID dummy = {0xdeadbeef,0xdead,0xbeef,{0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}}; @@ -616,6 +626,7 @@ /* Set the attributes so we can delete the file */ attrs = FILE_ATTRIBUTE_NORMAL; ret = SetFileAttributesA(tmpfile, attrs); + ok(ret, "SetFileAttributesA failed %u\n", GetLastError()); DeleteFileA(tmpfile); } @@ -784,7 +795,7 @@ /* Only enumerate the members */ trace("Only members\n"); - attrcount = membercount = 0; + membercount = 0; catcdf = pCryptCATCDFOpen(cdffileW, NULL); catmember = NULL; @@ -892,8 +903,7 @@ catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback); ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); todo_wine - ok(GetLastError() == ERROR_SHARING_VIOLATION || - broken(GetLastError() == ERROR_SUCCESS), /* win9x */ + ok(GetLastError() == ERROR_SHARING_VIOLATION, "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); DeleteFileA(cdffileA); @@ -908,8 +918,7 @@ catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback); ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); todo_wine - ok(GetLastError() == ERROR_SHARING_VIOLATION || - broken(GetLastError() == ERROR_SUCCESS), /* win9x */ + ok(GetLastError() == ERROR_SHARING_VIOLATION, "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); DeleteFileA(cdffileA); ok(!DeleteFileA(catfileA), "Didn't expect a catalog file to be created\n"); @@ -924,8 +933,7 @@ catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback); ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); todo_wine - ok(GetLastError() == ERROR_SHARING_VIOLATION || - broken(GetLastError() == ERROR_SUCCESS), /* win9x */ + ok(GetLastError() == ERROR_SHARING_VIOLATION, "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); DeleteFileA(cdffileA); ok(!DeleteFileA(catfileA), "Didn't expect a catalog file to be created\n"); @@ -1117,6 +1125,162 @@ DeleteFileA(cdffileA); todo_wine ok(DeleteFileA(catfileA), "Expected a catalog file to be created\n"); +} + +static const struct +{ + WORD e_magic; /* 00: MZ Header signature */ + WORD unused[29]; + DWORD e_lfanew; /* 3c: Offset to extended header */ +} dos_header = +{ + IMAGE_DOS_SIGNATURE, { 0 }, sizeof(dos_header) +}; + +static IMAGE_NT_HEADERS nt_header = +{ + IMAGE_NT_SIGNATURE, /* Signature */ + { + IMAGE_FILE_MACHINE_I386, /* Machine */ + 1, /* NumberOfSections */ + 0, /* TimeDateStamp */ + 0, /* PointerToSymbolTable */ + 0, /* NumberOfSymbols */ + sizeof(IMAGE_OPTIONAL_HEADER), /* SizeOfOptionalHeader */ + IMAGE_FILE_EXECUTABLE_IMAGE /* Characteristics */ + }, + { + IMAGE_NT_OPTIONAL_HDR_MAGIC, /* Magic */ + 2, /* MajorLinkerVersion */ + 15, /* MinorLinkerVersion */ + 0, /* SizeOfCode */ + 0, /* SizeOfInitializedData */ + 0, /* SizeOfUninitializedData */ + 0, /* AddressOfEntryPoint */ + 0x10, /* BaseOfCode, also serves as e_lfanew in the truncated MZ header */ +#ifndef _WIN64 + 0, /* BaseOfData */ +#endif + 0x10000000, /* ImageBase */ + 0, /* SectionAlignment */ + 0, /* FileAlignment */ + 4, /* MajorOperatingSystemVersion */ + 0, /* MinorOperatingSystemVersion */ + 1, /* MajorImageVersion */ + 0, /* MinorImageVersion */ + 4, /* MajorSubsystemVersion */ + 0, /* MinorSubsystemVersion */ + 0, /* Win32VersionValue */ + 0x200, /* SizeOfImage */ + sizeof(dos_header) + sizeof(nt_header), /* SizeOfHeaders */ + 0, /* CheckSum */ + IMAGE_SUBSYSTEM_WINDOWS_CUI, /* Subsystem */ + 0, /* DllCharacteristics */ + 0, /* SizeOfStackReserve */ + 0, /* SizeOfStackCommit */ + 0, /* SizeOfHeapReserve */ + 3, /* SizeOfHeapCommit */ + 2, /* LoaderFlags */ + 1, /* NumberOfRvaAndSizes */ + { { 0 } } /* DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES] */ + } +}; + +static void test_sip(void) +{ + static WCHAR nameW[] = {'t','e','s','t','.','e','x','e',0}; + SIP_SUBJECTINFO info; + DWORD index, encoding, size; + HANDLE file; + GUID guid; + BOOL ret; + char buf[1024]; + + file = CreateFileW(nameW, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "can't create file\n"); + if(file == INVALID_HANDLE_VALUE) + return; + WriteFile(file, &dos_header, sizeof(dos_header), &size, NULL); + WriteFile(file, &nt_header, sizeof(nt_header), &size, NULL); + memset(buf, 0, sizeof(buf)); + WriteFile(file, buf, 0x200 - sizeof(dos_header) - sizeof(nt_header), &size, NULL); + CloseHandle(file); + + file= CreateFileW(nameW, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "can't open file\n"); + + memset(&info, 0, sizeof(SIP_SUBJECTINFO)); + info.cbSize = sizeof(SIP_SUBJECTINFO); + info.pgSubjectType = &guid; + ret = CryptSIPRetrieveSubjectGuid(NULL, file, info.pgSubjectType); + ok(ret, "CryptSIPRetrieveSubjectGuid failed (%x)\n", GetLastError()); + + ret = pPutSignedDataMsg(&info, X509_ASN_ENCODING, &index, 4, (BYTE*)"test"); + ok(!ret, "CryptSIPPutSignedDataMsg succeedded\n"); + index = GetLastError(); + ok(index == ERROR_PATH_NOT_FOUND, "GetLastError returned %x\n", index); + + info.hFile = file; + info.pwsFileName = nameW; + ret = pPutSignedDataMsg(&info, X509_ASN_ENCODING, &index, 4, (BYTE*)"test"); + ok(!ret, "CryptSIPPutSignedDataMsg succeedded\n"); + index = GetLastError(); + todo_wine ok(index == ERROR_INVALID_PARAMETER, "GetLastError returned %x\n", index); + + info.hFile = INVALID_HANDLE_VALUE; + info.pwsFileName = nameW; + ret = pPutSignedDataMsg(&info, X509_ASN_ENCODING, &index, 4, (BYTE*)"test"); + ok(!ret, "CryptSIPPutSignedDataMsg succeedded\n"); + index = GetLastError(); + ok(index == ERROR_SHARING_VIOLATION, "GetLastError returned %x\n", index); + + CloseHandle(file); + file= CreateFileW(nameW, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + info.hFile = file; + info.pwsFileName = (void*)0xdeadbeef; + ret = pPutSignedDataMsg(&info, X509_ASN_ENCODING, &index, 4, (BYTE*)"test"); + ok(ret, "CryptSIPPutSignedDataMsg failed (%x)\n", GetLastError()); + ok(index == 0, "index = %x\n", index); + + CloseHandle(file); + file= CreateFileW(nameW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + info.hFile = INVALID_HANDLE_VALUE; + info.pwsFileName = nameW; + ret = pPutSignedDataMsg(&info, X509_ASN_ENCODING, &index, 14, (BYTE*)"longer message"); + ok(ret, "CryptSIPPutSignedDataMsg failed (%x)\n", GetLastError()); + ok(index == 1, "index = %x\n", index); + + size = 0; + encoding = 0xdeadbeef; + ret = pGetSignedDataMsg(&info, &encoding, 0, &size, NULL); + ok(ret, "CryptSIPGetSignedDataMsg failed (%x)\n", GetLastError()); + ok(encoding == 0xdeadbeef, "encoding = %x\n", encoding); + ok(size == 16, "size = %d\n", size); + + ret = pGetSignedDataMsg(&info, &encoding, 0, &size, (BYTE*)buf); + ok(ret, "CryptSIPGetSignedDataMsg failed (%x)\n", GetLastError()); + ok(encoding == (X509_ASN_ENCODING|PKCS_7_ASN_ENCODING), "encoding = %x\n", encoding); + ok(size == 8, "size = %d\n", size); + ok(!memcmp(buf, "test\0\0\0\0", 8), "buf = %s\n", buf); + + size = 0; + encoding = 0xdeadbeef; + ret = pGetSignedDataMsg(&info, &encoding, 1, &size, NULL); + ok(ret, "CryptSIPGetSignedDataMsg failed (%x)\n", GetLastError()); + ok(encoding == 0xdeadbeef, "encoding = %x\n", encoding); + ok(size == 24, "size = %d\n", size); + + ret = pGetSignedDataMsg(&info, &encoding, 1, &size, (BYTE*)buf); + ok(ret, "CryptSIPGetSignedDataMsg failed (%x)\n", GetLastError()); + ok(encoding == (X509_ASN_ENCODING|PKCS_7_ASN_ENCODING), "encoding = %x\n", encoding); + ok(size == 16, "size = %d\n", size); + ok(!strcmp(buf, "longer message"), "buf = %s\n", buf); + + CryptReleaseContext(info.hProv, 0); + CloseHandle(file); + DeleteFileW(nameW); } START_TEST(crypt) @@ -1153,4 +1317,5 @@ /* Create a catalog file out of our own catalog definition file */ test_create_catalog_file(); test_CryptCATAdminAddRemoveCatalog(); + test_sip(); } Modified: trunk/rostests/winetests/wintrust/register.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/regist… ============================================================================== --- trunk/rostests/winetests/wintrust/register.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/register.c [iso-8859-1] Fri Jul 13 07:43:41 2012 @@ -299,6 +299,7 @@ ok(ret, "WintrustSetRegPolicyFlags failed: %d\n", GetLastError()); size = sizeof(flags1); r = RegQueryValueExA(key, State, NULL, NULL, (LPBYTE)&flags1, &size); + ok(!r, "RegQueryValueEx failed: %d\n", r); ok(flags1 == flags3, "Got %08x flags instead of %08x\n", flags1, flags3); pWintrustSetRegPolicyFlags(flags2); Modified: trunk/rostests/winetests/wintrust/softpub.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/softpu… ============================================================================== --- trunk/rostests/winetests/wintrust/softpub.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/softpub.c [iso-8859-1] Fri Jul 13 07:43:41 2012 @@ -1,7 +1,8 @@ /* * wintrust softpub functions tests * - * Copyright 2007 Juan Lang + * Copyright 2007,2010 Juan Lang + * Copyright 2010 Andrey Turkin * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,9 +18,10 @@ * 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 <assert.h> + #include <stdio.h> #include <stdarg.h> + #include <windef.h> #include <winbase.h> #include <winerror.h> @@ -74,6 +76,37 @@ struct _CRYPT_PROVUI_FUNCS *psUIpfns; SAFE_PROVIDER_CLEANUP_CALL pfnCleanupPolicy; } SAFE_PROVIDER_FUNCTIONS; + +static BOOL (WINAPI * pWTHelperGetKnownUsages)(DWORD action, PCCRYPT_OID_INFO **usages); +static BOOL (WINAPI * CryptSIPCreateIndirectData_p)(SIP_SUBJECTINFO *, DWORD *, SIP_INDIRECT_DATA *); +static VOID (WINAPI * CertFreeCertificateChain_p)(PCCERT_CHAIN_CONTEXT); + +static void InitFunctionPtrs(void) +{ + HMODULE hWintrust = GetModuleHandleA("wintrust.dll"); + HMODULE hCrypt32 = GetModuleHandleA("crypt32.dll"); + +#define WINTRUST_GET_PROC(func) \ + p ## func = (void*)GetProcAddress(hWintrust, #func); \ + if(!p ## func) { \ + trace("GetProcAddress(%s) failed\n", #func); \ + } + + WINTRUST_GET_PROC(WTHelperGetKnownUsages) + +#undef WINTRUST_GET_PROC + +#define CRYPT32_GET_PROC(func) \ + func ## _p = (void*)GetProcAddress(hCrypt32, #func); \ + if(!func ## _p) { \ + trace("GetProcAddress(%s) failed\n", #func); \ + } + + CRYPT32_GET_PROC(CryptSIPCreateIndirectData) + CRYPT32_GET_PROC(CertFreeCertificateChain) + +#undef CRYPT32_GET_PROC +} static const BYTE v1CertWithPubKey[] = { 0x30,0x81,0x95,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, @@ -244,6 +277,25 @@ MultiByteToWideChar(0, 0, notepadPath, -1, notepadPathW, size); } +/* Creates a test file and returns a handle to it. The file's path is returned + * in temp_file, which must be at least MAX_PATH characters in length. + */ +static HANDLE create_temp_file(WCHAR *temp_file) +{ + HANDLE file = INVALID_HANDLE_VALUE; + WCHAR temp_path[MAX_PATH]; + + if (GetTempPathW(sizeof(temp_path) / sizeof(temp_path[0]), temp_path)) + { + static const WCHAR img[] = { 'i','m','g',0 }; + + if (GetTempFileNameW(temp_path, img, 0, temp_file)) + file = CreateFileW(temp_file, GENERIC_READ | GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + } + return file; +} + static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) { HRESULT ret; @@ -266,7 +318,7 @@ funcs->pfnAlloc(TRUSTERROR_MAX_STEPS * sizeof(DWORD)); if (data.padwTrustStepErrors) { - WCHAR notepadPathW[MAX_PATH]; + WCHAR pathW[MAX_PATH]; PROVDATA_SIP provDataSIP = { 0 }; static const GUID unknown = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47, 0x00,0xC0,0x4F,0xC2,0x95,0xEE } }; @@ -301,11 +353,31 @@ /* Crashes ret = funcs->pfnObjectTrust(&data); */ - getNotepadPath(notepadPathW, MAX_PATH); - fileInfo.pcwszFilePath = notepadPathW; + /* Create and test with an empty file */ + fileInfo.hFile = create_temp_file(pathW); /* pfnObjectTrust now crashes unless both pPDSip and psPfns are set */ U(data).pPDSip = &provDataSIP; data.psPfns = (CRYPT_PROVIDER_FUNCTIONS *)funcs; + ret = funcs->pfnObjectTrust(&data); + ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == + TRUST_E_SUBJECT_FORM_UNKNOWN, + "expected TRUST_E_SUBJECT_FORM_UNKNOWN, got %08x\n", + data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); + CloseHandle(fileInfo.hFile); + fileInfo.hFile = NULL; + fileInfo.pcwszFilePath = pathW; + ret = funcs->pfnObjectTrust(&data); + ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == + TRUST_E_SUBJECT_FORM_UNKNOWN, + "expected TRUST_E_SUBJECT_FORM_UNKNOWN, got %08x\n", + data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); + DeleteFileW(pathW); + /* Test again with a file we expect to exist, and to contain no + * signature. + */ + getNotepadPath(pathW, MAX_PATH); ret = funcs->pfnObjectTrust(&data); ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == @@ -346,6 +418,7 @@ { fileInfo.pgKnownSubject = (GUID *)0xdeadbeef; ret = funcs->pfnObjectTrust(&data); + ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); } funcs->pfnFree(data.padwTrustStepErrors); } @@ -382,6 +455,12 @@ CRYPT_PROVIDER_SGNR sgnr = { sizeof(sgnr), { 0 } }; HRESULT ret; + if (!CertFreeCertificateChain_p) + { + win_skip("CertFreeCertificateChain not found\n"); + return; + } + data.padwTrustStepErrors = funcs->pfnAlloc(TRUSTERROR_MAX_STEPS * sizeof(DWORD)); if (!data.padwTrustStepErrors) @@ -409,6 +488,8 @@ WINTRUST_DATA wintrust_data = { 0 }; ret = funcs->pfnAddCert2Chain(&data, 0, FALSE, 0, cert); + ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + /* If pWintrustData isn't set, crashes attempting to access * pWintrustData->fdwRevocationChecks */ @@ -439,10 +520,11 @@ data.pasSigners[0].pasCertChain[0].dwConfidence); CertFreeCertificateContext( data.pasSigners[0].pasCertChain[0].pCert); - CertFreeCertificateChain(data.pasSigners[0].pChainContext); + CertFreeCertificateChain_p(data.pasSigners[0].pChainContext); CertFreeCertificateContext(cert); } } + funcs->pfnFree(data.padwTrustStepErrors); } static void test_provider_funcs(void) @@ -464,6 +546,195 @@ } } +/* minimal PE file image */ +#define VA_START 0x400000 +#define FILE_PE_START 0x50 +#define NUM_SECTIONS 3 +#define FILE_TEXT 0x200 +#define RVA_TEXT 0x1000 +#define RVA_BSS 0x2000 +#define FILE_IDATA 0x400 +#define RVA_IDATA 0x3000 +#define FILE_TOTAL 0x600 +#define RVA_TOTAL 0x4000 +#include <pshpack1.h> +struct Imports { + IMAGE_IMPORT_DESCRIPTOR descriptors[2]; + IMAGE_THUNK_DATA32 original_thunks[2]; + IMAGE_THUNK_DATA32 thunks[2]; + struct __IMPORT_BY_NAME { + WORD hint; + char funcname[0x20]; + } ibn; + char dllname[0x10]; +}; +#define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks)) + +static struct _PeImage { + IMAGE_DOS_HEADER dos_header; + char __alignment1[FILE_PE_START - sizeof(IMAGE_DOS_HEADER)]; + IMAGE_NT_HEADERS32 nt_headers; + IMAGE_SECTION_HEADER sections[NUM_SECTIONS]; + char __alignment2[FILE_TEXT - FILE_PE_START - sizeof(IMAGE_NT_HEADERS32) - + NUM_SECTIONS * sizeof(IMAGE_SECTION_HEADER)]; + unsigned char text_section[FILE_IDATA-FILE_TEXT]; + struct Imports idata_section; + char __alignment3[FILE_TOTAL-FILE_IDATA-sizeof(struct Imports)]; +} bin = { + /* dos header */ + {IMAGE_DOS_SIGNATURE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0}, 0, 0, {0}, FILE_PE_START}, + /* alignment before PE header */ + {0}, + /* nt headers */ + {IMAGE_NT_SIGNATURE, + /* basic headers - 3 sections, no symbols, EXE file */ + {IMAGE_FILE_MACHINE_I386, NUM_SECTIONS, 0, 0, 0, sizeof(IMAGE_OPTIONAL_HEADER32), + IMAGE_FILE_32BIT_MACHINE | IMAGE_FILE_EXECUTABLE_IMAGE}, + /* optional header */ + {IMAGE_NT_OPTIONAL_HDR32_MAGIC, 4, 0, FILE_IDATA-FILE_TEXT, + FILE_TOTAL-FILE_IDATA + FILE_IDATA-FILE_TEXT, 0x400, + RVA_TEXT, RVA_TEXT, RVA_BSS, VA_START, 0x1000, 0x200, 4, 0, 1, 0, 4, 0, 0, + RVA_TOTAL, FILE_TEXT, 0, IMAGE_SUBSYSTEM_WINDOWS_GUI, 0, + 0x200000, 0x1000, 0x100000, 0x1000, 0, 0x10, + {{0, 0}, + {RVA_IDATA, sizeof(struct Imports)} + } + } + }, + /* sections */ + { + {".text", {0x100}, RVA_TEXT, FILE_IDATA-FILE_TEXT, FILE_TEXT, + 0, 0, 0, 0, IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_MEM_READ}, + {".bss", {0x400}, RVA_BSS, 0, 0, 0, 0, 0, 0, + IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE}, + {".idata", {sizeof(struct Imports)}, RVA_IDATA, FILE_TOTAL-FILE_IDATA, FILE_IDATA, 0, + 0, 0, 0, IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE} + }, + /* alignment before first section */ + {0}, + /* .text section */ + { + 0x31, 0xC0, /* xor eax, eax */ + 0xFF, 0x25, EXIT_PROCESS&0xFF, (EXIT_PROCESS>>8)&0xFF, (EXIT_PROCESS>>16)&0xFF, + (EXIT_PROCESS>>24)&0xFF, /* jmp ExitProcess */ + 0 + }, + /* .idata section */ + { + { + {{RVA_IDATA + FIELD_OFFSET(struct Imports, original_thunks)}, 0, 0, + RVA_IDATA + FIELD_OFFSET(struct Imports, dllname), + RVA_IDATA + FIELD_OFFSET(struct Imports, thunks) + }, + {{0}, 0, 0, 0, 0} + }, + {{{RVA_IDATA+FIELD_OFFSET(struct Imports, ibn)}}, {{0}}}, + {{{RVA_IDATA+FIELD_OFFSET(struct Imports, ibn)}}, {{0}}}, + {0,"ExitProcess"}, + "KERNEL32.DLL" + }, + /* final alignment */ + {0} +}; +#include <poppack.h> + +static void test_sip_create_indirect_data(void) +{ + static GUID unknown = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47, + 0x00,0xC0,0x4F,0xC2,0x95,0xEE } }; + static char oid_sha1[] = szOID_OIWSEC_sha1; + BOOL ret; + SIP_SUBJECTINFO subjinfo = { 0 }; + WCHAR temp_file[MAX_PATH]; + HANDLE file; + DWORD count; + + if (!CryptSIPCreateIndirectData_p) + { + skip("Missing CryptSIPCreateIndirectData\n"); + return; + } + SetLastError(0xdeadbeef); + ret = CryptSIPCreateIndirectData_p(NULL, NULL, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptSIPCreateIndirectData_p(&subjinfo, NULL, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + subjinfo.cbSize = sizeof(subjinfo); + SetLastError(0xdeadbeef); + ret = CryptSIPCreateIndirectData_p(&subjinfo, NULL, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + file = create_temp_file(temp_file); + if (file == INVALID_HANDLE_VALUE) + { + skip("couldn't create temp file\n"); + return; + } + WriteFile(file, &bin, sizeof(bin), &count, NULL); + FlushFileBuffers(file); + + subjinfo.hFile = file; + SetLastError(0xdeadbeef); + ret = CryptSIPCreateIndirectData_p(&subjinfo, NULL, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + subjinfo.pgSubjectType = &unknown; + SetLastError(0xdeadbeef); + ret = CryptSIPCreateIndirectData_p(&subjinfo, NULL, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + count = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = CryptSIPCreateIndirectData_p(&subjinfo, &count, NULL); + todo_wine + ok(!ret && (GetLastError() == NTE_BAD_ALGID || + GetLastError() == ERROR_INVALID_PARAMETER /* Win7 */), + "expected NTE_BAD_ALGID or ERROR_INVALID_PARAMETER, got %08x\n", + GetLastError()); + ok(count == 0xdeadbeef, "expected count to be unmodified, got %d\n", count); + subjinfo.DigestAlgorithm.pszObjId = oid_sha1; + count = 0xdeadbeef; + ret = CryptSIPCreateIndirectData_p(&subjinfo, &count, NULL); + todo_wine + ok(ret, "CryptSIPCreateIndirectData failed: %d\n", GetLastError()); + ok(count, "expected a positive count\n"); + if (ret) + { + SIP_INDIRECT_DATA *indirect = HeapAlloc(GetProcessHeap(), 0, count); + + count = 256; + ret = CryptSIPCreateIndirectData_p(&subjinfo, &count, indirect); + ok(ret, "CryptSIPCreateIndirectData failed: %d\n", GetLastError()); + /* If the count is larger than needed, it's unmodified */ + ok(count == 256, "unexpected count %d\n", count); + ok(!strcmp(indirect->Data.pszObjId, SPC_PE_IMAGE_DATA_OBJID), + "unexpected data oid %s\n", + indirect->Data.pszObjId); + ok(!strcmp(indirect->DigestAlgorithm.pszObjId, oid_sha1), + "unexpected digest algorithm oid %s\n", + indirect->DigestAlgorithm.pszObjId); + ok(indirect->Digest.cbData == 20, "unexpected hash size %d\n", + indirect->Digest.cbData); + if (indirect->Digest.cbData == 20) + { + const BYTE hash[20] = { + 0x8a,0xd5,0x45,0x53,0x3d,0x67,0xdf,0x2f,0x78,0xe0, + 0x55,0x0a,0xe0,0xd9,0x7a,0x28,0x3e,0xbf,0x45,0x2b }; + + ok(!memcmp(indirect->Digest.pbData, hash, 20), + "unexpected value\n"); + } + + HeapFree(GetProcessHeap(), 0, indirect); + } + CloseHandle(file); + DeleteFileW(temp_file); +} + static void test_wintrust(void) { static GUID generic_action_v2 = WINTRUST_ACTION_GENERIC_VERIFY_V2; @@ -471,7 +742,7 @@ WINTRUST_FILE_INFO file; LONG r; HRESULT hr; - WCHAR notepadPathW[MAX_PATH]; + WCHAR pathW[MAX_PATH]; memset(&wtd, 0, sizeof(wtd)); wtd.cbStruct = sizeof(wtd); @@ -482,31 +753,30 @@ wtd.dwStateAction = WTD_STATEACTION_VERIFY; memset(&file, 0, sizeof(file)); file.cbStruct = sizeof(file); - getNotepadPath(notepadPathW, MAX_PATH); - file.pcwszFilePath = notepadPathW; + file.pcwszFilePath = pathW; + /* Test with an empty file */ + file.hFile = create_temp_file(pathW); + r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(r == TRUST_E_SUBJECT_FORM_UNKNOWN, + "expected TRUST_E_SUBJECT_FORM_UNKNOWN, got %08x\n", r); + CloseHandle(file.hFile); + DeleteFileW(pathW); + file.hFile = NULL; + /* Test with a known file path, which we expect not have a signature */ + getNotepadPath(pathW, MAX_PATH); r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); ok(r == TRUST_E_NOSIGNATURE || r == CRYPT_E_FILE_ERROR, "expected TRUST_E_NOSIGNATURE or CRYPT_E_FILE_ERROR, got %08x\n", r); + wtd.dwStateAction = WTD_STATEACTION_CLOSE; + r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(r == S_OK, "WinVerifyTrust failed: %08x\n", r); + wtd.dwStateAction = WTD_STATEACTION_VERIFY; hr = WinVerifyTrustEx(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); - ok(hr == TRUST_E_NOSIGNATURE || r == CRYPT_E_FILE_ERROR, + ok(hr == TRUST_E_NOSIGNATURE || hr == CRYPT_E_FILE_ERROR, "expected TRUST_E_NOSIGNATURE or CRYPT_E_FILE_ERROR, got %08x\n", hr); -} - -static BOOL (WINAPI * pWTHelperGetKnownUsages)(DWORD action, PCCRYPT_OID_INFO **usages); - -static void InitFunctionPtrs(void) -{ - HMODULE hWintrust = GetModuleHandleA("wintrust.dll"); - -#define WINTRUST_GET_PROC(func) \ - p ## func = (void*)GetProcAddress(hWintrust, #func); \ - if(!p ## func) { \ - trace("GetProcAddress(%s) failed\n", #func); \ - } - - WINTRUST_GET_PROC(WTHelperGetKnownUsages) - -#undef WINTRUST_GET_PROC + wtd.dwStateAction = WTD_STATEACTION_CLOSE; + r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(r == S_OK, "WinVerifyTrust failed: %08x\n", r); } static void test_get_known_usages(void) @@ -577,6 +847,7 @@ { InitFunctionPtrs(); test_provider_funcs(); + test_sip_create_indirect_data(); test_wintrust(); test_get_known_usages(); }

12 years, 5 months

[tfaber] 56877: [ADVAPI32][USER32][ROSSYM_NEW] - Fix misuse of RtlCreateUnicodeStringFromAsciiz

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jul 12 19:48:30 2012 New Revision: 56877 URL: http://svn.reactos.org/svn/reactos?rev=56877&view=rev Log: [ADVAPI32][USER32][ROSSYM_NEW] - Fix misuse of RtlCreateUnicodeStringFromAsciiz Modified: trunk/reactos/dll/win32/advapi32/misc/efs.c trunk/reactos/dll/win32/advapi32/misc/logon.c trunk/reactos/dll/win32/advapi32/sec/audit.c trunk/reactos/dll/win32/advapi32/sec/misc.c trunk/reactos/lib/rossym_new/fromfile.c trunk/reactos/lib/rossym_new/frommem.c trunk/reactos/win32ss/user/user32/misc/desktop.c trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/dll/win32/advapi32/misc/efs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/ef… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/efs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/efs.c [iso-8859-1] Thu Jul 12 19:48:30 2012 @@ -30,13 +30,11 @@ DWORD dwReserved) { UNICODE_STRING FileName; - NTSTATUS Status; BOOL ret; - Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); - if (!NT_SUCCESS(Status)) + if (!RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName)) { - SetLastError(RtlNtStatusToDosError(Status)); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -67,13 +65,11 @@ EncryptFileA(LPCSTR lpFileName) { UNICODE_STRING FileName; - NTSTATUS Status; BOOL ret; - Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); - if (!NT_SUCCESS(Status)) + if (!RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName)) { - SetLastError(RtlNtStatusToDosError(Status)); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -117,17 +113,15 @@ LPDWORD lpStatus) { UNICODE_STRING FileName; - NTSTATUS Status; BOOL ret = FALSE; TRACE("(%s, %p)\n", lpFileName, lpStatus); FileName.Buffer = NULL; - Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); - if (!NT_SUCCESS(Status)) + if (!RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName)) { - SetLastError(RtlNtStatusToDosError(Status)); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; } Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] Thu Jul 12 19:48:30 2012 @@ -156,34 +156,27 @@ UNICODE_STRING UserName; UNICODE_STRING Domain; UNICODE_STRING Password; - NTSTATUS Status; BOOL ret = FALSE; UserName.Buffer = NULL; Domain.Buffer = NULL; Password.Buffer = NULL; - Status = RtlCreateUnicodeStringFromAsciiz(&UserName, - lpszUsername); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); + if (!RtlCreateUnicodeStringFromAsciiz(&UserName, lpszUsername)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto UsernameDone; } - Status = RtlCreateUnicodeStringFromAsciiz(&Domain, - lpszDomain); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); + if (!RtlCreateUnicodeStringFromAsciiz(&Domain, lpszDomain)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto DomainDone; } - Status = RtlCreateUnicodeStringFromAsciiz(&Password, - lpszPassword); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); + if (!RtlCreateUnicodeStringFromAsciiz(&Password, lpszPassword)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto PasswordDone; } Modified: trunk/reactos/dll/win32/advapi32/sec/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/aud… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/audit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/audit.c [iso-8859-1] Thu Jul 12 19:48:30 2012 @@ -156,11 +156,9 @@ UNICODE_STRING Name; NTSTATUS Status; - Status = RtlCreateUnicodeStringFromAsciiz(&Name, - (PCHAR)SubsystemName); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); + if (!RtlCreateUnicodeStringFromAsciiz(&Name, SubsystemName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -216,11 +214,9 @@ UNICODE_STRING Name; NTSTATUS Status; - Status = RtlCreateUnicodeStringFromAsciiz(&Name, - (PCHAR)SubsystemName); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); + if (!RtlCreateUnicodeStringFromAsciiz(&Name, SubsystemName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Thu Jul 12 19:48:30 2012 @@ -207,14 +207,11 @@ LPDWORD lpnLengthNeeded) { UNICODE_STRING FileName; - NTSTATUS Status; BOOL bResult; - Status = RtlCreateUnicodeStringFromAsciiz(&FileName, - (LPSTR)lpFileName); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); + if (!RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -344,14 +341,11 @@ PSECURITY_DESCRIPTOR pSecurityDescriptor) { UNICODE_STRING FileName; - NTSTATUS Status; BOOL bResult; - Status = RtlCreateUnicodeStringFromAsciiz(&FileName, - (LPSTR)lpFileName); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); + if (!RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -1758,14 +1752,11 @@ PACL pSacl) { UNICODE_STRING ObjectName; - NTSTATUS Status; DWORD Ret; - Status = RtlCreateUnicodeStringFromAsciiz(&ObjectName, - pObjectName); - if (!NT_SUCCESS(Status)) - { - return RtlNtStatusToDosError(Status); + if (!RtlCreateUnicodeStringFromAsciiz(&ObjectName, pObjectName)) + { + return ERROR_NOT_ENOUGH_MEMORY; } Ret = SetNamedSecurityInfoW(ObjectName.Buffer, @@ -2260,14 +2251,11 @@ #else INERNAL_FNPROGRESSW_DATA ifnProgressData; UNICODE_STRING ObjectName; - NTSTATUS Status; DWORD Ret; - Status = RtlCreateUnicodeStringFromAsciiz(&ObjectName, - pObjectName); - if (!NT_SUCCESS(Status)) - { - return RtlNtStatusToDosError(Status); + if (!RtlCreateUnicodeStringFromAsciiz(&ObjectName, pObjectName)) + { + return ERROR_NOT_ENOUGH_MEMORY; } ifnProgressData.fnProgress = fnProgress; Modified: trunk/reactos/lib/rossym_new/fromfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/fromfile.c?… ============================================================================== --- trunk/reactos/lib/rossym_new/fromfile.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/fromfile.c [iso-8859-1] Thu Jul 12 19:48:30 2012 @@ -111,8 +111,8 @@ NTSTATUS Status; ULONG StringOffset; - Status = RtlCreateUnicodeStringFromAsciiz(&intConv, (PCSZ)SectionHeaders[SectionIndex].Name + 1); - if (!NT_SUCCESS(Status)) goto freeall; + if (!RtlCreateUnicodeStringFromAsciiz(&intConv, (PCSZ)SectionHeaders[SectionIndex].Name + 1)) + goto freeall; Status = RtlUnicodeStringToInteger(&intConv, 10, &StringOffset); RtlFreeUnicodeString(&intConv); if (!NT_SUCCESS(Status)) goto freeall; Modified: trunk/reactos/lib/rossym_new/frommem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/frommem.c?r… ============================================================================== --- trunk/reactos/lib/rossym_new/frommem.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/frommem.c [iso-8859-1] Thu Jul 12 19:48:30 2012 @@ -70,8 +70,8 @@ NTSTATUS Status; ULONG StringOffset; - Status = RtlCreateUnicodeStringFromAsciiz(&intConv, (PCSZ)SectionHeaders[SectionIndex].Name + 1); - if (!NT_SUCCESS(Status)) goto freeall; + if (!RtlCreateUnicodeStringFromAsciiz(&intConv, (PCSZ)SectionHeaders[SectionIndex].Name + 1)) + goto freeall; Status = RtlUnicodeStringToInteger(&intConv, 10, &StringOffset); RtlFreeUnicodeString(&intConv); if (!NT_SUCCESS(Status)) goto freeall; Modified: trunk/reactos/win32ss/user/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/desktop.c [iso-8859-1] Thu Jul 12 19:48:30 2012 @@ -281,16 +281,14 @@ case SPI_SETDESKWALLPAPER: { - NTSTATUS Status; UNICODE_STRING ustrWallpaper; BOOL Ret; if (pvParam) { - Status = RtlCreateUnicodeStringFromAsciiz(&ustrWallpaper, pvParam); - if (!NT_SUCCESS(Status)) + if (!RtlCreateUnicodeStringFromAsciiz(&ustrWallpaper, pvParam)) { - ERR("Status = 0x%x\n", Status); + ERR("RtlCreateUnicodeStringFromAsciiz failed\n"); return FALSE; } pvParam = &ustrWallpaper; Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Thu Jul 12 19:48:30 2012 @@ -4635,7 +4635,6 @@ UNICODE_STRING MenuText; BOOL res = FALSE; BOOL CleanHeap = FALSE; - NTSTATUS Status; if((lpmii->cbSize == sizeof(MENUITEMINFOA)) || (lpmii->cbSize == sizeof(MENUITEMINFOA) - sizeof(HBITMAP))) @@ -4652,10 +4651,9 @@ ((mi.fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(mi.fType) == MF_STRING))) && mi.dwTypeData != NULL) { - Status = RtlCreateUnicodeStringFromAsciiz(&MenuText, (LPSTR)mi.dwTypeData); - if (!NT_SUCCESS (Status)) + if (!RtlCreateUnicodeStringFromAsciiz(&MenuText, (LPSTR)mi.dwTypeData)) { - SetLastError (RtlNtStatusToDosError(Status)); + SetLastError (ERROR_NOT_ENOUGH_MEMORY); return FALSE; } mi.dwTypeData = MenuText.Buffer;

12 years, 5 months

[tfaber] 56876: [REGEDIT] - Use COUNT_OF where appropriate. Miscellaneous code cleanup. Patch by Hermès Bélusca See issue #7182 for more details.

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jul 12 19:10:48 2012 New Revision: 56876 URL: http://svn.reactos.org/svn/reactos?rev=56876&view=rev Log: [REGEDIT] - Use COUNT_OF where appropriate. Miscellaneous code cleanup. Patch by Hermès Bélusca See issue #7182 for more details. Modified: trunk/reactos/base/applications/regedit/about.c trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/edit.c trunk/reactos/base/applications/regedit/find.c trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/listview.c trunk/reactos/base/applications/regedit/main.c trunk/reactos/base/applications/regedit/regedit.c trunk/reactos/base/applications/regedit/regproc.c trunk/reactos/base/applications/regedit/security.c trunk/reactos/base/applications/regedit/settings.c trunk/reactos/base/applications/regedit/treeview.c Modified: trunk/reactos/base/applications/regedit/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/about.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/about.c [iso-8859-1] Thu Jul 12 19:10:48 2012 @@ -24,6 +24,6 @@ void ShowAboutBox(HWND hWnd) { TCHAR AppStr[255]; - LoadString(hInst, IDS_APP_TITLE, AppStr, sizeof(AppStr)/sizeof(TCHAR)); + LoadString(hInst, IDS_APP_TITLE, AppStr, COUNT_OF(AppStr)); ShellAbout(hWnd, AppStr, _T(""), LoadIcon(hInst, MAKEINTRESOURCE(IDI_REGEDIT))); } Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] Thu Jul 12 19:10:48 2012 @@ -292,7 +292,7 @@ case WM_KEYUP: if (wParam == VK_RETURN) { - GetWindowText(hwnd, s_szNode, sizeof(s_szNode) / sizeof(s_szNode[0])); + GetWindowText(hwnd, s_szNode, COUNT_OF(s_szNode)); SelectNode(g_pChildWnd->hTreeWnd, s_szNode); } break; @@ -325,7 +325,7 @@ HFONT hFont; TCHAR buffer[MAX_PATH]; /* load "My Computer" string */ - LoadString(hInst, IDS_MY_COMPUTER, buffer, sizeof(buffer)/sizeof(TCHAR)); + LoadString(hInst, IDS_MY_COMPUTER, buffer, COUNT_OF(buffer)); g_pChildWnd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ChildWnd)); if (!g_pChildWnd) return 0; @@ -557,7 +557,7 @@ if (ptvdi->item.pszText) { keyPath = GetItemPath(g_pChildWnd->hTreeWnd, TreeView_GetParent(g_pChildWnd->hTreeWnd, ptvdi->item.hItem), &hRootKey); - _sntprintf(szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]), _T("%s\\%s"), keyPath, ptvdi->item.pszText); + _sntprintf(szBuffer, COUNT_OF(szBuffer), _T("%s\\%s"), keyPath, ptvdi->item.pszText); keyPath = GetItemPath(g_pChildWnd->hTreeWnd, ptvdi->item.hItem, &hRootKey); if (RegOpenKeyEx(hRootKey, szBuffer, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { @@ -693,7 +693,7 @@ (void)TreeView_GetItem(g_pChildWnd->hTreeWnd, &item); /* Set the Expand/Collapse menu item appropriately */ - LoadString(hInst, (item.state & TVIS_EXPANDED) ? IDS_COLLAPSE : IDS_EXPAND, buffer, sizeof(buffer) / sizeof(buffer[0])); + LoadString(hInst, (item.state & TVIS_EXPANDED) ? IDS_COLLAPSE : IDS_EXPAND, buffer, COUNT_OF(buffer)); memset(&mii, 0, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_STRING | MIIM_STATE | MIIM_ID; @@ -720,18 +720,18 @@ /* Come up with suggestions */ keyPath = GetItemPath(g_pChildWnd->hTreeWnd, NULL, &hRootKey); - SuggestKeys(hRootKey, keyPath, Suggestions, sizeof(Suggestions) / sizeof(Suggestions[0])); + SuggestKeys(hRootKey, keyPath, Suggestions, COUNT_OF(Suggestions)); if (Suggestions[0]) { AppendMenu(hContextMenu, MF_SEPARATOR, 0, NULL); - LoadString(hInst, IDS_GOTO_SUGGESTED_KEY, resource, sizeof(resource) / sizeof(resource[0])); + LoadString(hInst, IDS_GOTO_SUGGESTED_KEY, resource, COUNT_OF(resource)); s = Suggestions; wID = ID_TREE_SUGGESTION_MIN; while(*s && (wID <= ID_TREE_SUGGESTION_MAX)) { - _sntprintf(buffer, sizeof(buffer) / sizeof(buffer[0]), resource, s); + _sntprintf(buffer, COUNT_OF(buffer), resource, s); memset(&mii, 0, sizeof(mii)); mii.cbSize = sizeof(mii); Modified: trunk/reactos/base/applications/regedit/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/edit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/edit.c [iso-8859-1] Thu Jul 12 19:10:48 2012 @@ -108,7 +108,7 @@ else { TCHAR buffer[255]; - LoadString(hInst, IDS_DEFAULT_VALUE_NAME, buffer, sizeof(buffer)/sizeof(TCHAR)); + LoadString(hInst, IDS_DEFAULT_VALUE_NAME, buffer, COUNT_OF(buffer)); SetDlgItemText(hwndDlg, IDC_VALUE_NAME, buffer); } SetDlgItemText(hwndDlg, IDC_VALUE_DATA, stringValueData); @@ -176,7 +176,7 @@ else { TCHAR buffer[255]; - LoadString(hInst, IDS_DEFAULT_VALUE_NAME, buffer, sizeof(buffer)/sizeof(TCHAR)); + LoadString(hInst, IDS_DEFAULT_VALUE_NAME, buffer, COUNT_OF(buffer)); SetDlgItemText(hwndDlg, IDC_VALUE_NAME, buffer); } SetDlgItemText(hwndDlg, IDC_VALUE_DATA, stringValueData); @@ -296,7 +296,7 @@ else { TCHAR buffer[255]; - LoadString(hInst, IDS_DEFAULT_VALUE_NAME, buffer, sizeof(buffer)/sizeof(TCHAR)); + LoadString(hInst, IDS_DEFAULT_VALUE_NAME, buffer, COUNT_OF(buffer)); SetDlgItemText(hwndDlg, IDC_VALUE_NAME, buffer); } CheckRadioButton (hwndDlg, IDC_FORMAT_HEX, IDC_FORMAT_DEC, IDC_FORMAT_HEX); @@ -397,7 +397,7 @@ else { TCHAR buffer[255]; - LoadString(hInst, IDS_DEFAULT_VALUE_NAME, buffer, sizeof(buffer)/sizeof(TCHAR)); + LoadString(hInst, IDS_DEFAULT_VALUE_NAME, buffer, COUNT_OF(buffer)); SetDlgItemText(hwndDlg, IDC_VALUE_NAME, buffer); } hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA); @@ -451,13 +451,13 @@ /* Load the column labels from the resource file. */ lvC.iSubItem = 0; lvC.cx = (rc.right - rc.left) / 2; - LoadString(hInst, IDS_DMA_CHANNEL, szText, sizeof(szText)/sizeof(TCHAR)); + LoadString(hInst, IDS_DMA_CHANNEL, szText, COUNT_OF(szText)); if (ListView_InsertColumn(hwndLV, 0, &lvC) == -1) return FALSE; lvC.iSubItem = 1; lvC.cx = (rc.right - rc.left) - lvC.cx; - LoadString(hInst, IDS_DMA_PORT, szText, sizeof(szText)/sizeof(TCHAR)); + LoadString(hInst, IDS_DMA_PORT, szText, COUNT_OF(szText)); if (ListView_InsertColumn(hwndLV, 1, &lvC) == -1) return FALSE; @@ -471,23 +471,23 @@ /* Load the column labels from the resource file. */ lvC.iSubItem = 0; lvC.cx = width; - LoadString(hInst, IDS_INTERRUPT_VECTOR, szText, sizeof(szText)/sizeof(TCHAR)); + LoadString(hInst, IDS_INTERRUPT_VECTOR, szText, COUNT_OF(szText)); if (ListView_InsertColumn(hwndLV, 0, &lvC) == -1) return FALSE; lvC.iSubItem = 1; - LoadString(hInst, IDS_INTERRUPT_LEVEL, szText, sizeof(szText)/sizeof(TCHAR)); + LoadString(hInst, IDS_INTERRUPT_LEVEL, szText, COUNT_OF(szText)); if (ListView_InsertColumn(hwndLV, 1, &lvC) == -1) return FALSE; lvC.iSubItem = 2; - LoadString(hInst, IDS_INTERRUPT_AFFINITY, szText, sizeof(szText)/sizeof(TCHAR)); + LoadString(hInst, IDS_INTERRUPT_AFFINITY, szText, COUNT_OF(szText)); if (ListView_InsertColumn(hwndLV, 2, &lvC) == -1) return FALSE; lvC.iSubItem = 3; lvC.cx = (rc.right - rc.left) - 3 * width; - LoadString(hInst, IDS_INTERRUPT_TYPE, szText, sizeof(szText)/sizeof(TCHAR)); + LoadString(hInst, IDS_INTERRUPT_TYPE, szText, COUNT_OF(szText)); if (ListView_InsertColumn(hwndLV, 3, &lvC) == -1) return FALSE; @@ -501,18 +501,18 @@ /* Load the column labels from the resource file. */ lvC.iSubItem = 0; lvC.cx = width; - LoadString(hInst, IDS_MEMORY_ADDRESS, szText, sizeof(szText)/sizeof(TCHAR)); + LoadString(hInst, IDS_MEMORY_ADDRESS, szText, COUNT_OF(szText)); if (ListView_InsertColumn(hwndLV, 0, &lvC) == -1) return FALSE; lvC.iSubItem = 1; - LoadString(hInst, IDS_MEMORY_LENGTH, szText, sizeof(szText)/sizeof(TCHAR)); + LoadString(hInst, IDS_MEMORY_LENGTH, szText, COUNT_OF(szText)); if (ListView_InsertColumn(hwndLV, 1, &lvC) == -1) return FALSE; lvC.iSubItem = 2; lvC.cx = (rc.right - rc.left) - 2 * width; - LoadString(hInst, IDS_MEMORY_ACCESS, szText, sizeof(szText)/sizeof(TCHAR)); + LoadString(hInst, IDS_MEMORY_ACCESS, szText, COUNT_OF(szText)); if (ListView_InsertColumn(hwndLV, 2, &lvC) == -1) return FALSE; @@ -526,18 +526,18 @@ /* Load the column labels from the resource file. */ lvC.iSubItem = 0; lvC.cx = width; - LoadString(hInst, IDS_PORT_ADDRESS, szText, sizeof(szText)/sizeof(TCHAR)); + LoadString(hInst, IDS_PORT_ADDRESS, szText, COUNT_OF(szText)); if (ListView_InsertColumn(hwndLV, 0, &lvC) == -1) return FALSE; lvC.iSubItem = 1; - LoadString(hInst, IDS_PORT_LENGTH, szText, sizeof(szText)/sizeof(TCHAR)); + LoadString(hInst, IDS_PORT_LENGTH, szText, COUNT_OF(szText)); if (ListView_InsertColumn(hwndLV, 1, &lvC) == -1) return FALSE; lvC.iSubItem = 2; lvC.cx = (rc.right - rc.left) - 2 * width; - LoadString(hInst, IDS_PORT_ACCESS, szText, sizeof(szText)/sizeof(TCHAR)); + LoadString(hInst, IDS_PORT_ACCESS, szText, COUNT_OF(szText)); if (ListView_InsertColumn(hwndLV, 2, &lvC) == -1) return FALSE; @@ -550,18 +550,18 @@ /* Load the column labels from the resource file. */ lvC.iSubItem = 0; lvC.cx = width; - LoadString(hInst, IDS_SPECIFIC_RESERVED1, szText, sizeof(szText)/sizeof(TCHAR)); + LoadString(hInst, IDS_SPECIFIC_RESERVED1, szText, COUNT_OF(szText)); if (ListView_InsertColumn(hwndLV, 0, &lvC) == -1) return FALSE; lvC.iSubItem = 1; - LoadString(hInst, IDS_SPECIFIC_RESERVED2, szText, sizeof(szText)/sizeof(TCHAR)); + LoadString(hInst, IDS_SPECIFIC_RESERVED2, szText, COUNT_OF(szText)); if (ListView_InsertColumn(hwndLV, 1, &lvC) == -1) return FALSE; lvC.iSubItem = 2; lvC.cx = (rc.right - rc.left) - 2 * width; - LoadString(hInst, IDS_SPECIFIC_DATASIZE, szText, sizeof(szText)/sizeof(TCHAR)); + LoadString(hInst, IDS_SPECIFIC_DATASIZE, szText, COUNT_OF(szText)); if (ListView_InsertColumn(hwndLV, 2, &lvC) == -1) return FALSE; @@ -715,9 +715,9 @@ ListView_SetItemText(hwndLV, iItem, 1, buffer); if (pDescriptor->Flags & CM_RESOURCE_PORT_IO) - LoadString(hInst, IDS_PORT_PORT_IO, buffer, sizeof(buffer)/sizeof(TCHAR)); + LoadString(hInst, IDS_PORT_PORT_IO, buffer, COUNT_OF(buffer)); else - LoadString(hInst, IDS_PORT_MEMORY_IO, buffer, sizeof(buffer)/sizeof(TCHAR)); + LoadString(hInst, IDS_PORT_MEMORY_IO, buffer, COUNT_OF(buffer)); ListView_SetItemText(hwndLV, iItem, 2, buffer); } break; @@ -746,9 +746,9 @@ ListView_SetItemText(hwndLV, iItem, 2, buffer); if (pDescriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED) - LoadString(hInst, IDS_INTERRUPT_EDGE_SENSITIVE, buffer, sizeof(buffer)/sizeof(TCHAR)); + LoadString(hInst, IDS_INTERRUPT_EDGE_SENSITIVE, buffer, COUNT_OF(buffer)); else - LoadString(hInst, IDS_INTERRUPT_LEVEL_SENSITIVE, buffer, sizeof(buffer)/sizeof(TCHAR)); + LoadString(hInst, IDS_INTERRUPT_LEVEL_SENSITIVE, buffer, COUNT_OF(buffer)); ListView_SetItemText(hwndLV, iItem, 3, buffer); } @@ -781,15 +781,15 @@ switch (pDescriptor->Flags & (CM_RESOURCE_MEMORY_READ_ONLY | CM_RESOURCE_MEMORY_WRITE_ONLY)) { case CM_RESOURCE_MEMORY_READ_ONLY: - LoadString(hInst, IDS_MEMORY_READ_ONLY, buffer, sizeof(buffer)/sizeof(TCHAR)); + LoadString(hInst, IDS_MEMORY_READ_ONLY, buffer, COUNT_OF(buffer)); break; case CM_RESOURCE_MEMORY_WRITE_ONLY: - LoadString(hInst, IDS_MEMORY_WRITE_ONLY, buffer, sizeof(buffer)/sizeof(TCHAR)); + LoadString(hInst, IDS_MEMORY_WRITE_ONLY, buffer, COUNT_OF(buffer)); break; default: - LoadString(hInst, IDS_MEMORY_READ_WRITE, buffer, sizeof(buffer)/sizeof(TCHAR)); + LoadString(hInst, IDS_MEMORY_READ_WRITE, buffer, COUNT_OF(buffer)); break; } @@ -951,13 +951,13 @@ /* Load the column labels from the resource file. */ lvC.iSubItem = 0; lvC.cx = (rc.right - rc.left) / 2; - LoadString(hInst, IDS_BUSNUMBER, szText, sizeof(szText)/sizeof(TCHAR)); + LoadString(hInst, IDS_BUSNUMBER, szText, COUNT_OF(szText)); if (ListView_InsertColumn(hWndListView, 0, &lvC) == -1) return FALSE; lvC.iSubItem = 1; lvC.cx = (rc.right - rc.left) - lvC.cx; - LoadString(hInst, IDS_INTERFACE, szText, sizeof(szText)/sizeof(TCHAR)); + LoadString(hInst, IDS_INTERFACE, szText, COUNT_OF(szText)); if (ListView_InsertColumn(hWndListView, 1, &lvC) == -1) return FALSE; @@ -1456,8 +1456,8 @@ return FALSE; } - LoadString(hInst, IDS_QUERY_DELETE_KEY_CONFIRM, caption, sizeof(caption)/sizeof(TCHAR)); - LoadString(hInst, IDS_QUERY_DELETE_KEY_ONE, msg, sizeof(msg)/sizeof(TCHAR)); + LoadString(hInst, IDS_QUERY_DELETE_KEY_CONFIRM, caption, COUNT_OF(caption)); + LoadString(hInst, IDS_QUERY_DELETE_KEY_ONE, msg, COUNT_OF(msg)); if (MessageBox(g_pChildWnd->hWnd, msg, caption, MB_ICONQUESTION | MB_YESNO) != IDYES) goto done; Modified: trunk/reactos/base/applications/regedit/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/find.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/find.c [iso-8859-1] Thu Jul 12 19:10:48 2012 @@ -774,7 +774,7 @@ hControl = GetDlgItem(hDlg, IDC_FINDWHAT); if (hControl) - GetWindowText(hControl, s_szFindWhat, sizeof(s_szFindWhat) / sizeof(s_szFindWhat[0])); + GetWindowText(hControl, s_szFindWhat, COUNT_OF(s_szFindWhat)); EndDialog(hDlg, 1); break; @@ -788,7 +788,7 @@ switch(LOWORD(wParam)) { case IDC_FINDWHAT: - GetWindowText((HWND) lParam, s_szSavedFindValue, sizeof(s_szSavedFindValue) / sizeof(s_szSavedFindValue[0])); + GetWindowText((HWND) lParam, s_szSavedFindValue, COUNT_OF(s_szSavedFindValue)); hControl = GetDlgItem(hDlg, IDOK); if (hControl) { @@ -817,8 +817,8 @@ { TCHAR msg[128], caption[128]; - LoadString(hInst, IDS_FINISHEDFIND, msg, sizeof(msg)/sizeof(TCHAR)); - LoadString(hInst, IDS_APP_TITLE, caption, sizeof(caption)/sizeof(TCHAR)); + LoadString(hInst, IDS_FINISHEDFIND, msg, COUNT_OF(msg)); + LoadString(hInst, IDS_APP_TITLE, caption, COUNT_OF(caption)); MessageBox(0, msg, caption, MB_ICONINFORMATION); } } Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Thu Jul 12 19:10:48 2012 @@ -924,7 +924,7 @@ InitInfo.cbSize = sizeof(InitInfo); InitInfo.pwzTargetComputer = NULL; - InitInfo.cDsScopeInfos = sizeof(Scopes) / sizeof(Scopes[0]); + InitInfo.cDsScopeInfos = COUNT_OF(Scopes); InitInfo.aDsScopeInfos = Scopes; InitInfo.flOptions = 0; InitInfo.cAttributesToFetch = 0; @@ -1065,7 +1065,7 @@ hRet = InvokeRemoteRegistryPickerDialog(ObjectPicker, hWnd, szComputerName, - sizeof(szComputerName) / sizeof(szComputerName[0])); + COUNT_OF(szComputerName)); if (hRet == S_OK) { /* FIXME - connect to the registry */ @@ -1269,7 +1269,7 @@ mii.fMask = MIIM_TYPE; mii.fType = MFT_STRING; mii.dwTypeData = szFavorite; - mii.cch = sizeof(szFavorite) / sizeof(szFavorite[0]); + mii.cch = COUNT_OF(szFavorite); if (GetMenuItemInfo(hMenu, LOWORD(wParam) - ID_FAVORITES_MIN, TRUE, &mii)) { Modified: trunk/reactos/base/applications/regedit/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] Thu Jul 12 19:10:48 2012 @@ -176,7 +176,7 @@ { TCHAR buffer[255]; /* load (value not set) string */ - LoadString(hInst, IDS_VALUE_NOT_SET, buffer, sizeof(buffer)/sizeof(TCHAR)); + LoadString(hInst, IDS_VALUE_NOT_SET, buffer, COUNT_OF(buffer)); ListView_SetItemText(hwndLV, index, 2, buffer); } break; @@ -216,7 +216,7 @@ } else { - LoadString(hInst, IDS_INVALID_DWORD, buf, sizeof(buf)/sizeof(TCHAR)); + LoadString(hInst, IDS_INVALID_DWORD, buf, COUNT_OF(buf)); } ListView_SetItemText(hwndLV, index, 2, buf); } @@ -241,7 +241,7 @@ else { TCHAR szText[128]; - LoadString(hInst, IDS_BINARY_EMPTY, szText, sizeof(szText)/sizeof(TCHAR)); + LoadString(hInst, IDS_BINARY_EMPTY, szText, COUNT_OF(szText)); ListView_SetItemText(hwndLV, index, 2, szText); } } @@ -266,7 +266,7 @@ lvC.iSubItem = index; lvC.cx = default_column_widths[index]; lvC.fmt = column_alignment[index]; - LoadString(hInst, IDS_LIST_COLUMN_FIRST + index, szText, sizeof(szText)/sizeof(TCHAR)); + LoadString(hInst, IDS_LIST_COLUMN_FIRST + index, szText, COUNT_OF(szText)); if (ListView_InsertColumn(hWndListView, index, &lvC) == -1) return FALSE; } return TRUE; @@ -313,7 +313,7 @@ switch (plvdi->item.iSubItem) { case 0: - LoadString(hInst, IDS_DEFAULT_VALUE_NAME, buffer, sizeof(buffer)/sizeof(TCHAR)); + LoadString(hInst, IDS_DEFAULT_VALUE_NAME, buffer, COUNT_OF(buffer)); plvdi->item.pszText = buffer; break; case 1: @@ -358,7 +358,7 @@ default: { TCHAR buf2[200]; - LoadString(hInst, IDS_UNKNOWN_TYPE, buf2, sizeof(buf2)/sizeof(TCHAR)); + LoadString(hInst, IDS_UNKNOWN_TYPE, buf2, COUNT_OF(buf2)); wsprintf(buffer, buf2, ((LINE_INFO*)plvdi->item.lParam)->dwValType); plvdi->item.pszText = buffer; break; @@ -453,8 +453,8 @@ { TCHAR msg[128], caption[128]; - LoadString(hInst, IDS_ERR_RENVAL_TOEMPTY, msg, sizeof(msg)/sizeof(TCHAR)); - LoadString(hInst, IDS_ERR_RENVAL_CAPTION, caption, sizeof(caption)/sizeof(TCHAR)); + LoadString(hInst, IDS_ERR_RENVAL_TOEMPTY, msg, COUNT_OF(msg)); + LoadString(hInst, IDS_ERR_RENVAL_CAPTION, caption, COUNT_OF(caption)); MessageBox(0, msg, caption, 0); *Result = TRUE; } Modified: trunk/reactos/base/applications/regedit/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/main.c [iso-8859-1] Thu Jul 12 19:10:48 2012 @@ -82,10 +82,11 @@ wcChild.cbWndExtra = sizeof(HANDLE); wcChild.hInstance = hInstance; wcChild.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_REGEDIT)); - wcChild.hCursor = LoadCursor(0, IDC_ARROW), - wcChild.lpszClassName = szChildClass, - wcChild.hIconSm = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_REGEDIT), IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); + wcChild.hCursor = LoadCursor(0, IDC_ARROW); + wcChild.lpszClassName = szChildClass; + wcChild.hIconSm = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_REGEDIT), + IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), LR_SHARED); RegisterClassEx(&wcChild); /* register child windows class */ Modified: trunk/reactos/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] Thu Jul 12 19:10:48 2012 @@ -108,7 +108,7 @@ pos++; } } - memcpy(file_name, *command_line, pos * sizeof((*command_line)[0])); + memcpy(file_name, *command_line, pos * sizeof(WCHAR)); /* remove the last backslash */ if (file_name[pos - 1] == L'\\') { @@ -163,8 +163,8 @@ } import_registry_file(fp); get_file_name(&s, filename); - LoadString(hInst, IDS_APP_TITLE, szTitle, sizeof(szTitle)); - LoadString(hInst, IDS_IMPORTED_OK, szText, sizeof(szTitle)); + LoadString(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); + LoadString(hInst, IDS_IMPORTED_OK, szText, COUNT_OF(szText)); /* show successful import */ if (!silent) MessageBox(NULL, szText, szTitle, MB_OK); @@ -322,18 +322,17 @@ } if (*s && action == ACTION_UNDEF) - { - TCHAR szTitle[256], szText[256]; - LoadString(hInst, IDS_APP_TITLE, szTitle, sizeof(szTitle)); - LoadString(hInst, IDS_IMPORT_PROMPT, szText, sizeof(szTitle)); - /* request import confirmation */ - if (silent || MessageBox(NULL, szText, szTitle, MB_YESNO) == IDYES) - { - action = ACTION_ADD; - } - else return TRUE; - } - if (action == ACTION_UNDEF) + { + TCHAR szTitle[256], szText[256]; + LoadString(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); + LoadString(hInst, IDS_IMPORT_PROMPT, szText, COUNT_OF(szText)); + /* request import confirmation */ + if (silent || MessageBox(NULL, szText, szTitle, MB_YESNO) == IDYES) + action = ACTION_ADD; + else + return TRUE; + } + if (action == ACTION_UNDEF) return FALSE; return PerformRegAction(action, s, silent); Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regproc.c [iso-8859-1] Thu Jul 12 19:10:48 2012 @@ -36,7 +36,7 @@ "HKEY_CURRENT_CONFIG", "HKEY_CURRENT_USER", "HKEY_DYN_DATA" }; -#define REG_CLASS_NUMBER (sizeof(reg_class_names) / sizeof(reg_class_names[0])) +#define REG_CLASS_NUMBER (COUNT_OF(reg_class_names)) const WCHAR* reg_class_namesW[REG_CLASS_NUMBER] = { Modified: trunk/reactos/base/applications/regedit/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/security.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/security.c [iso-8859-1] Thu Jul 12 19:10:48 2012 @@ -447,7 +447,7 @@ ULONG* piDefaultAccess) { *ppAccess = RegAccess; - *pcAccesses = sizeof(RegAccess) / sizeof(RegAccess[0]); + *pcAccesses = COUNT_OF(RegAccess); *piDefaultAccess = RegDefaultAccess; return S_OK; } @@ -475,7 +475,7 @@ if (obj->ObjectInfo.dwFlags & SI_CONTAINER) { *ppInheritTypes = RegInheritTypes; - *pcInheritTypes = sizeof(RegInheritTypes) / sizeof(RegInheritTypes[0]); + *pcInheritTypes = COUNT_OF(RegInheritTypes); return S_OK; } Modified: trunk/reactos/base/applications/regedit/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/settings.c [iso-8859-1] Thu Jul 12 19:10:48 2012 @@ -128,7 +128,7 @@ if (keyPath) { rootName = get_root_key_name(hRootKey); - _sntprintf(szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]), _T("My Computer\\%s\\%s"), rootName, keyPath); + _sntprintf(szBuffer, COUNT_OF(szBuffer), _T("My Computer\\%s\\%s"), rootName, keyPath); RegSetValueEx(hKey, _T("LastKey"), 0, REG_SZ, (LPBYTE) szBuffer, (DWORD) _tcslen(szBuffer) * sizeof(szBuffer[0])); } Modified: trunk/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] Thu Jul 12 19:10:48 2012 @@ -586,7 +586,7 @@ else if (RegOpenKey(hRootKey, pszKeyPath, &hKey) != ERROR_SUCCESS) goto done; - if (LoadString(hInst, IDS_NEW_KEY, szNewKeyFormat, sizeof(szNewKeyFormat) / sizeof(szNewKeyFormat[0])) <= 0) + if (LoadString(hInst, IDS_NEW_KEY, szNewKeyFormat, COUNT_OF(szNewKeyFormat)) <= 0) goto done; /* Need to create a new key with a unique name */ @@ -704,7 +704,7 @@ tvi.hItem = hChildItem; tvi.mask = TVIF_TEXT | TVIF_CHILDREN; tvi.pszText = szBuffer; - tvi.cchTextMax = sizeof(szBuffer) / sizeof(szBuffer[0]); + tvi.cchTextMax = COUNT_OF(szBuffer); (void)TreeView_GetItem(hwndTV, &tvi);

12 years, 5 months

[jgardou] 56875: [WIN32K] * When cleaning DC, also "clean" the associated brushes Fixes some asserts hit with Baldur's Gate launcher

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Jul 12 17:00:39 2012 New Revision: 56875 URL: http://svn.reactos.org/svn/reactos?rev=56875&view=rev Log: [WIN32K] * When cleaning DC, also "clean" the associated brushes Fixes some asserts hit with Baldur's Gate launcher Modified: trunk/reactos/win32ss/gdi/ntgdi/dcstate.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dcstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcstate.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcstate.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcstate.c [iso-8859-1] Thu Jul 12 17:00:39 2012 @@ -73,7 +73,17 @@ dc = DC_LockDc(hDC); if (!dc) return FALSE; // Clean the DC - if (defaultDCstate) DC_vCopyState(defaultDCstate, dc, FALSE); + if (defaultDCstate) + { + DC_vCopyState(defaultDCstate, dc, FALSE); + /* Update the brushes now, because they reference some objects (the DC palette) + * Which belong to the current process, and this DC might be used for another process + * after being cleaned up (for GetDC(0) for instance) */ + DC_vUpdateFillBrush(dc); + DC_vUpdateBackgroundBrush(dc); + DC_vUpdateLineBrush(dc); + DC_vUpdateTextBrush(dc); + } DC_UnlockDc(dc);

12 years, 5 months

[jgardou] 56872: [OPENGL32] * Use the TEB instead of TLS to store the thread curent context

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Jul 12 11:39:23 2012 New Revision: 56872 URL: http://svn.reactos.org/svn/reactos?rev=56872&view=rev Log: [OPENGL32] * Use the TEB instead of TLS to store the thread curent context Modified: trunk/reactos/dll/win32/opengl32/opengl32.c trunk/reactos/dll/win32/opengl32/opengl32.h trunk/reactos/dll/win32/opengl32/wgl.c Modified: trunk/reactos/dll/win32/opengl32/opengl32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.c [iso-8859-1] Thu Jul 12 11:39:23 2012 @@ -20,15 +20,12 @@ /* global vars */ -/* Do not assume it have the free value MAXDWORD set, any value can be in here */ -DWORD OPENGL32_tls = MAXDWORD; GLPROCESSDATA OPENGL32_processdata; static BOOL OPENGL32_ThreadAttach( void ) { - GLTHREADDATA* lpData = NULL; PROC *dispatchTable = NULL; TEB *teb = NULL; @@ -38,16 +35,6 @@ if (dispatchTable == NULL) { DBGPRINT( "Error: Couldn't allocate GL dispatch table" ); - return FALSE; - } - - lpData = (GLTHREADDATA*)HeapAlloc( GetProcessHeap(), - HEAP_GENERATE_EXCEPTIONS | HEAP_ZERO_MEMORY, - sizeof (GLTHREADDATA) ); - if (lpData == NULL) - { - DBGPRINT( "Error: Couldn't allocate GLTHREADDATA" ); - HeapFree( GetProcessHeap(), 0, dispatchTable ); return FALSE; } @@ -62,7 +49,8 @@ #undef X teb->glTable = dispatchTable; - TlsSetValue( OPENGL32_tls, lpData ); + /* At first we have no context */ + teb->glCurrentRC = NULL; return TRUE; } @@ -71,20 +59,9 @@ static void OPENGL32_ThreadDetach( void ) { - GLTHREADDATA* lpData = NULL; TEB* teb = NtCurrentTeb(); rosglMakeCurrent( NULL, NULL ); - - lpData = (GLTHREADDATA*)TlsGetValue( OPENGL32_tls ); - if (lpData != NULL) - { - if (!HeapFree( GetProcessHeap(), 0, lpData )) - DBGPRINT( "Warning: HeapFree() on GLTHREADDATA failed (%d)", - GetLastError() ); - lpData = NULL; - } - TlsSetValue( OPENGL32_tls, NULL ); if (teb->glTable != NULL) { @@ -106,10 +83,6 @@ NULL, /* lpSecurityDescriptor */ TRUE /* bInheritHandle */ }; - OPENGL32_tls = TlsAlloc(); - if (OPENGL32_tls == MAXDWORD) - return FALSE; - memset( &OPENGL32_processdata, 0, sizeof (OPENGL32_processdata) ); /* create driver, glrc & dcdata list mutex */ @@ -181,10 +154,6 @@ CloseHandle( OPENGL32_processdata.glrc_mutex ); if (OPENGL32_processdata.dcdata_mutex != NULL) CloseHandle( OPENGL32_processdata.dcdata_mutex ); - - /* free TLS */ - if (OPENGL32_tls != MAXDWORD) - TlsFree(OPENGL32_tls); } Modified: trunk/reactos/dll/win32/opengl32/opengl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.h [iso-8859-1] Thu Jul 12 11:39:23 2012 @@ -177,15 +177,7 @@ HANDLE dcdata_mutex; /*!< Mutex to protect glrc list */ } GLPROCESSDATA; -/* TLS data */ -typedef struct tagGLTHREADDATA -{ - GLRC *glrc; /*!< current GL rendering context */ -} GLTHREADDATA; - -extern DWORD OPENGL32_tls; extern GLPROCESSDATA OPENGL32_processdata; -#define OPENGL32_threaddata ((GLTHREADDATA *)TlsGetValue( OPENGL32_tls )) /* function prototypes */ GLDRIVERDATA *OPENGL32_LoadICD( LPCWSTR driver ); Modified: trunk/reactos/dll/win32/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/wgl.c?r… ============================================================================== --- trunk/reactos/dll/win32/opengl32/wgl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/wgl.c [iso-8859-1] Thu Jul 12 11:39:23 2012 @@ -871,7 +871,7 @@ APIENTRY rosglGetCurrentContext() { - return (HGLRC)(OPENGL32_threaddata->glrc); + return NtCurrentTeb()->glCurrentRC; } @@ -884,11 +884,9 @@ APIENTRY rosglGetCurrentDC() { - /* FIXME: is it correct to return NULL when there is no current GLRC or - is there another way to find out the wanted HDC? */ - if (OPENGL32_threaddata->glrc == NULL) - return NULL; - return (HDC)(OPENGL32_threaddata->glrc->hdc); + GLRC* glrc = (GLRC*)NtCurrentTeb()->glCurrentRC; + if(glrc) return glrc->hdc; + return NULL; } @@ -918,19 +916,18 @@ rosglGetProcAddress( LPCSTR proc ) { PROC func; - GLDRIVERDATA *icd; + GLRC* glrc = (GLRC*)NtCurrentTeb()->glCurrentRC; /* FIXME we should Flush the gl here */ - if (OPENGL32_threaddata->glrc == NULL) + if (glrc == NULL) { DBGPRINT( "Error: No current GLRC!" ); SetLastError( ERROR_INVALID_FUNCTION ); return NULL; } - icd = OPENGL32_threaddata->glrc->icd; - func = icd->DrvGetProcAddress( proc ); + func = glrc->icd->DrvGetProcAddress( proc ); if (func != NULL) { DBGPRINT( "Info: Proc \"%s\" loaded from ICD.", proc ); @@ -947,19 +944,18 @@ rosglGetDefaultProcAddress( LPCSTR proc ) { PROC func; - GLDRIVERDATA *icd; + GLRC* glrc = (GLRC*)NtCurrentTeb()->glCurrentRC; /* wglGetDefaultProcAddress does not flush the gl */ - if (OPENGL32_threaddata->glrc == NULL) + if (glrc == NULL) { DBGPRINT( "Error: No current GLRC!" ); SetLastError( ERROR_INVALID_FUNCTION ); return NULL; } - icd = OPENGL32_threaddata->glrc->icd; - func = icd->DrvGetProcAddress( proc ); + func = glrc->icd->DrvGetProcAddress( proc ); if (func != NULL) { DBGPRINT( "Info: Proc \"%s\" loaded from ICD.", proc ); @@ -989,9 +985,6 @@ DBGTRACE( "Called!" ); - if (OPENGL32_threaddata == NULL) - return FALSE; - /* Is t a new context ? */ if (glrc != NULL) { @@ -1020,9 +1013,9 @@ } /* Unset previous one */ - if (OPENGL32_threaddata->glrc != NULL) - { - GLRC *oldglrc = OPENGL32_threaddata->glrc; + if (NtCurrentTeb()->glCurrentRC != NULL) + { + GLRC *oldglrc = (GLRC*)NtCurrentTeb()->glCurrentRC; oldglrc->is_current = FALSE; oldglrc->thread_id = 0; oldglrc->hdc = NULL; @@ -1039,6 +1032,7 @@ if (icdTable == NULL) { DBGPRINT( "Error: DrvSetContext failed (%d)\n", GetLastError() ); + NtCurrentTeb()->glCurrentRC = NULL; return FALSE; } DBGPRINT( "Info: DrvSetContext succeeded!" ); @@ -1048,17 +1042,17 @@ glrc->is_current = TRUE; glrc->thread_id = GetCurrentThreadId(); glrc->hdc = hdc; - OPENGL32_threaddata->glrc = glrc; - } - else if(OPENGL32_threaddata->glrc) + NtCurrentTeb()->glCurrentRC = (HGLRC)glrc; + } + else if(NtCurrentTeb()->glCurrentRC) { /* This is a call to unset the context */ - GLRC *oldglrc = OPENGL32_threaddata->glrc; + GLRC *oldglrc = (GLRC*)NtCurrentTeb()->glCurrentRC; oldglrc->is_current = FALSE; oldglrc->thread_id = 0; oldglrc->hdc = NULL; oldglrc->icd->DrvReleaseContext(oldglrc->hglrc); - OPENGL32_threaddata->glrc = NULL; + NtCurrentTeb()->glCurrentRC = NULL; } else {

12 years, 5 months

[jgardou] 56874: [NTDLL] * Fix Cookie for loader locking generation Silences "LdrUnlockLoaderLock() called with an invalid cookie!" debug messages

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Jul 12 14:55:53 2012 New Revision: 56874 URL: http://svn.reactos.org/svn/reactos?rev=56874&view=rev Log: [NTDLL] * Fix Cookie for loader locking generation Silences "LdrUnlockLoaderLock() called with an invalid cookie!" debug messages Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Thu Jul 12 14:55:53 2012 @@ -37,7 +37,7 @@ { /* Generate a cookie */ return (((ULONG_PTR)NtCurrentTeb()->RealClientId.UniqueThread & 0xFFF) << 16) | - _InterlockedIncrement(&LdrpLoaderLockAcquisitonCount); + (_InterlockedIncrement(&LdrpLoaderLockAcquisitonCount) & 0xFFFF); } /* @@ -1540,19 +1540,19 @@ LdrUnloadAlternateResourceModule(IN PVOID BaseAddress) { ULONG_PTR Cookie; - + /* Acquire the loader lock */ LdrLockLoaderLock(TRUE, NULL, &Cookie); - + /* Check if there's any alternate resources loaded */ if (AlternateResourceModuleCount) { UNIMPLEMENTED; } - + /* Release the loader lock */ LdrUnlockLoaderLock(1, Cookie); - + /* All done */ return TRUE; } @@ -1570,9 +1570,9 @@ { /* Is MUI Support enabled? */ if (!LdrAlternateResourcesEnabled()) return STATUS_SUCCESS; - + UNIMPLEMENTED; return STATUS_MUI_FILE_NOT_FOUND; } - + /* EOF */

12 years, 5 months

[jgardou] 56873:

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Jul 12 14:06:34 2012 New Revision: 56873 URL: http://svn.reactos.org/svn/reactos?rev=56873&view=rev Log: [OPENGL32] * Track pixel format with window handle for device contexts * Fix SetPixelFormat in case pixel format were already set Modified: trunk/reactos/dll/win32/opengl32/opengl32.h trunk/reactos/dll/win32/opengl32/wgl.c Modified: trunk/reactos/dll/win32/opengl32/opengl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.h [iso-8859-1] Thu Jul 12 14:06:34 2012 @@ -158,7 +158,7 @@ /* OpenGL private device context data */ typedef struct tagGLDCDATA { - HDC hdc; /*!< Device context handle for which this data is */ + HANDLE handle; /*!< Handle for which this data is (HWND for device, HDC for memory context) */ GLDRIVERDATA *icd; /*!< Driver used for this DC */ int pixel_format; /*!< Selected pixel format */ Modified: trunk/reactos/dll/win32/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/wgl.c?r… ============================================================================== --- trunk/reactos/dll/win32/opengl32/wgl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/wgl.c [iso-8859-1] Thu Jul 12 14:06:34 2012 @@ -250,6 +250,7 @@ ROSGL_GetPrivateDCData( HDC hdc ) { GLDCDATA *data; + HANDLE handle; /* check hdc */ if (GetObjectType( hdc ) != OBJ_DC && GetObjectType( hdc ) != OBJ_MEMDC) @@ -267,11 +268,17 @@ return NULL; /* FIXME: do we have to expect such an error and handle it? */ } + /* We must use the window to identify our data, as pixel format is + * specific to a window for device context */ + handle = WindowFromDC(hdc); + if(!handle) + handle = hdc; + /* look for data in list */ data = OPENGL32_processdata.dcdata_list; while (data != NULL) { - if (data->hdc == hdc) /* found */ + if (data->handle == handle) /* found */ break; data = data->next; } @@ -288,7 +295,7 @@ } else { - data->hdc = hdc; + data->handle = handle; /* append data to list */ if (OPENGL32_processdata.dcdata_list == NULL) @@ -1111,34 +1118,32 @@ WINAPI rosglSetPixelFormat( HDC hdc, int iFormat, CONST PIXELFORMATDESCRIPTOR *pfd ) { - GLDRIVERDATA *icd; GLDCDATA *dcdata; + GLDRIVERDATA* icd; DBGTRACE( "Called!" ); - /* load ICD */ - icd = ROSGL_ICDForHDC( hdc ); - if (icd == NULL) - { - DBGPRINT( "Warning: ICDForHDC() failed" ); + /* Get private DC data */ + dcdata = ROSGL_GetPrivateDCData( hdc ); + if (dcdata == NULL) + { + DBGPRINT( "Error: ROSGL_GetPrivateDCData() failed!" ); return FALSE; } - - /* call ICD */ + /* you can set the same pixel format twice, but you can't modify it */ + if(dcdata->pixel_format) return dcdata->pixel_format == iFormat; + + icd = ROSGL_ICDForHDC(hdc); + if(icd == NULL) + return 0; + + /* Call ICD function */ if (!icd->DrvSetPixelFormat( hdc, iFormat, pfd )) { DBGPRINT( "Warning: DrvSetPixelFormat(format=%d) failed (%d)", iFormat, GetLastError() ); return FALSE; } - - /* store format in private DC data */ - dcdata = ROSGL_GetPrivateDCData( hdc ); - if (dcdata == NULL) - { - DBGPRINT( "Error: ROSGL_GetPrivateDCData() failed!" ); - return FALSE; - } dcdata->pixel_format = iFormat; return TRUE;

12 years, 5 months

[jgardou] 56871: [OPENGL32] - fix wine tests a bit

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Jul 12 00:34:09 2012 New Revision: 56871 URL: http://svn.reactos.org/svn/reactos?rev=56871&view=rev Log: [OPENGL32] - fix wine tests a bit Modified: trunk/reactos/dll/win32/opengl32/wgl.c Modified: trunk/reactos/dll/win32/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/wgl.c?r… ============================================================================== --- trunk/reactos/dll/win32/opengl32/wgl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/wgl.c [iso-8859-1] Thu Jul 12 00:34:09 2012 @@ -486,6 +486,32 @@ } +/*! \brief Returns the current pixelformat. + * + * \param hdc [IN] Handle to DC to get the pixelformat from + * + * \return Pixelformat index + * \retval 0 Failure + */ +int +WINAPI +rosglGetPixelFormat( HDC hdc ) +{ + GLDCDATA *dcdata; + + DBGTRACE( "Called!" ); + + dcdata = ROSGL_GetPrivateDCData( hdc ); + if (dcdata == NULL) + { + DBGPRINT( "Error: ROSGL_GetPrivateDCData failed!" ); + return 0; + } + + return dcdata->pixel_format; +} + + /*! \brief Attempts to find the best matching pixel format for HDC * * This function is comparing each available format with the preferred one @@ -673,23 +699,32 @@ return NULL; } */ + + /* load ICD */ + icd = ROSGL_ICDForHDC( hdc ); + if (icd == NULL) + { + DBGPRINT( "Couldn't get ICD by HDC :-(" ); + /* FIXME: fallback? */ + return NULL; + } + /* create new GLRC */ glrc = ROSGL_NewContext(); if (glrc == NULL) return NULL; - /* load ICD */ - icd = ROSGL_ICDForHDC( hdc ); - if (icd == NULL) - { - ROSGL_DeleteContext( glrc ); - DBGPRINT( "Couldn't get ICD by HDC :-(" ); - /* FIXME: fallback? */ - return NULL; - } /* Don't forget to refcount it, icd will be released when last context is deleted */ InterlockedIncrement((LONG*)&icd->refcount); - + + /* You can't create a context without first setting a valid pixel format */ + if(rosglGetPixelFormat(hdc) == 0) + { + ROSGL_DeleteContext( glrc ); + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + return NULL; + } + /* create context */ if (icd->DrvCreateLayerContext != NULL) @@ -735,7 +770,7 @@ /*! \brief Delete an OpenGL context * - * \param hglrc [IN] Handle to GLRC to delete; must not be a threads current RC! + * \param hglrc [IN] Handle to GLRC to delete; * * \retval TRUE Success * \retval FALSE Failure (i.e. GLRC is current for a thread) @@ -754,12 +789,18 @@ return FALSE; } - /* make sure GLRC is not current for some thread */ + /* On windows, this is allowed to delete a context which is current */ if (glrc->is_current) { - DBGPRINT( "Error: GLRC is current for DC 0x%08x", glrc->hdc ); - SetLastError( ERROR_INVALID_FUNCTION ); - return FALSE; + /* But only for its own thread */ + if(glrc->thread_id != GetCurrentThreadId()) + { + DBGPRINT( "Error: GLRC is current for DC 0x%08x", glrc->hdc ); + SetLastError( ERROR_INVALID_FUNCTION ); + return FALSE; + } + /* Unset it before going further */ + rosglMakeCurrent(glrc->hdc, NULL); } /* release ICD's context */ @@ -862,32 +903,6 @@ } -/*! \brief Returns the current pixelformat. - * - * \param hdc [IN] Handle to DC to get the pixelformat from - * - * \return Pixelformat index - * \retval 0 Failure - */ -int -WINAPI -rosglGetPixelFormat( HDC hdc ) -{ - GLDCDATA *dcdata; - - DBGTRACE( "Called!" ); - - dcdata = ROSGL_GetPrivateDCData( hdc ); - if (dcdata == NULL) - { - DBGPRINT( "Error: ROSGL_GetPrivateDCData failed!" ); - return 0; - } - - return dcdata->pixel_format; -} - - /*! \brief Get the address for an OpenGL extension function. * * The addresses this function returns are only valid within the same thread @@ -977,24 +992,8 @@ if (OPENGL32_threaddata == NULL) return FALSE; - /* flush current context */ - if (OPENGL32_threaddata->glrc != NULL) - { - glFlush(); - } - - /* check if current context is unset */ - if (glrc == NULL) - { - if (OPENGL32_threaddata->glrc != NULL) - { - glrc = OPENGL32_threaddata->glrc; - glrc->icd->DrvReleaseContext( glrc->hglrc ); - glrc->is_current = FALSE; - OPENGL32_threaddata->glrc = NULL; - } - } - else + /* Is t a new context ? */ + if (glrc != NULL) { /* check hdc */ if (GetObjectType( hdc ) != OBJ_DC && GetObjectType( hdc ) != OBJ_MEMDC) @@ -1018,6 +1017,16 @@ DBGPRINT( "Error: hglrc is current for thread 0x%08x", glrc->thread_id ); SetLastError( ERROR_INVALID_HANDLE ); return FALSE; + } + + /* Unset previous one */ + if (OPENGL32_threaddata->glrc != NULL) + { + GLRC *oldglrc = OPENGL32_threaddata->glrc; + oldglrc->is_current = FALSE; + oldglrc->thread_id = 0; + oldglrc->hdc = NULL; + oldglrc->icd->DrvReleaseContext(oldglrc->hglrc); } /* call the ICD */ @@ -1036,13 +1045,34 @@ } /* make it current */ - if (OPENGL32_threaddata->glrc != NULL) - OPENGL32_threaddata->glrc->is_current = FALSE; glrc->is_current = TRUE; glrc->thread_id = GetCurrentThreadId(); glrc->hdc = hdc; OPENGL32_threaddata->glrc = glrc; } + else if(OPENGL32_threaddata->glrc) + { + /* This is a call to unset the context */ + GLRC *oldglrc = OPENGL32_threaddata->glrc; + oldglrc->is_current = FALSE; + oldglrc->thread_id = 0; + oldglrc->hdc = NULL; + oldglrc->icd->DrvReleaseContext(oldglrc->hglrc); + OPENGL32_threaddata->glrc = NULL; + } + else + { + /* + * To make wine tests happy. + * Now, who cares if MakeCurrentContext(NULL, NULL) fails when current context is already NULL + */ + if (GetObjectType( hdc ) != OBJ_DC && GetObjectType( hdc ) != OBJ_MEMDC) + { + DBGPRINT( "Error: hdc is not a DC handle!" ); + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } + } if (ROSGL_SetContextCallBack( icdTable ) != ERROR_SUCCESS && icdTable == NULL) {

12 years, 5 months

← Newer
1
...
11
12
13
14
15
16
17
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2012