May 2011 - Wine-Commits - list.winehq.org

Jeremy Newman : validation fixes
by Jeremy Newman May 4, 2011

May 4, 2011

Module: website Branch: master Commit: 4c6023fa2248feb29539082c2012d4305e7af27d URL: http://source.winehq.org/git/website.git/?a=commit;h=4c6023fa2248feb2953908… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed May 4 10:48:56 2011 -0500 validation fixes --- news/en/2010112601.xml | 6 +++--- news/en/2010120301.xml | 6 +++--- news/en/2010121001.xml | 6 +++--- news/en/2010122401.xml | 6 +++--- news/en/2011010701.xml | 6 +++--- news/en/2011012101.xml | 6 +++--- news/en/2011020401.xml | 6 +++--- news/en/2011021801.xml | 6 +++--- news/en/2011030401.xml | 6 +++--- news/en/2011031801.xml | 6 +++--- news/en/2011040101.xml | 6 +++--- news/en/2011040801.xml | 6 +++--- news/en/2011041501.xml | 6 +++--- news/en/2011042901.xml | 6 +++--- 14 files changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=4c6023fa2248feb295…

1 0

Jeremy Newman : copyright
by Jeremy Newman May 4, 2011

May 4, 2011

Module: website Branch: master Commit: 95ef55b12c82117d2643f9920592ab19ec1f06b5 URL: http://source.winehq.org/git/website.git/?a=commit;h=95ef55b12c82117d2643f9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed May 4 10:49:35 2011 -0500 copyright --- .../en/global/themes/winehq/content_nobox.template | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/templates/en/global/themes/winehq/content_nobox.template b/templates/en/global/themes/winehq/content_nobox.template index be1983b..7303d08 100644 --- a/templates/en/global/themes/winehq/content_nobox.template +++ b/templates/en/global/themes/winehq/content_nobox.template @@ -3,6 +3,7 @@ <head> <title>{$page_title}</title> <meta name="SearchTitle" content="{$page_title}"> + <meta name="copyright" content="Copyright {$curtime_year}. WineHQ.org All rights reserved"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> {$meta_keywords}

1 0

Jeremy Newman : fix js path when loading dynamically
by Jeremy Newman May 4, 2011

May 4, 2011

Module: website Branch: master Commit: 4afc4844146653d9225967e2a08204790cd1f4f9 URL: http://source.winehq.org/git/website.git/?a=commit;h=4afc4844146653d9225967… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed May 4 10:50:52 2011 -0500 fix js path when loading dynamically --- include/html.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/html.php b/include/html.php index f71e047..71214d4 100644 --- a/include/html.php +++ b/include/html.php @@ -1419,11 +1419,11 @@ class html { // in ajax mode, add the js link inline $js = ""; - $js_file = "{$this->_file_root}/js/{$match[1][$i]}.js"; + $js_file = "{$this->_file_root}/{$match[1][$i]}.js"; if (file_exists($js_file)) { $mtime = filemtime($js_file); - $js = "<script src=\"{$this->_web_root}/js/{$match[1][$i]}.js?v={$mtime}\" type=\"text/javascript\"></script>\n"; + $js = "<script src=\"{$this->_web_root}/{$match[1][$i]}.js?v={$mtime}\" type=\"text/javascript\"></script>\n"; unset($mtime); } $in = str_replace('', $js, $in);

1 0

Frédéric Delanoy : Add French donation page
by Jeremy Newman May 4, 2011

May 4, 2011

Module: website Branch: master Commit: 3d78c5908089b01ab50f36ffcb33a50430bb6b71 URL: http://source.winehq.org/git/website.git/?a=commit;h=3d78c5908089b01ab50f36… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue May 3 17:35:12 2011 +0200 Add French donation page --- templates/fr/donate.template | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/templates/fr/donate.template b/templates/fr/donate.template new file mode 100644 index 0000000..bf8e4a6 --- /dev/null +++ b/templates/fr/donate.template @@ -0,0 +1,56 @@ + + + +<h1 class="title">Faites un don au projet Wine</h1> + +<p>Il y a différentes façons de donner au projet Wine.</p> + +<table border="0" cellpadding="10" cellspacing="1" bgcolor="#EFEFEF"> + + <tr> + <td align="center" bgcolor="black" class="small"><b style="color: #FFFFFF">Alternative</b></td> + <td align="center" bgcolor="black" class="small"><b style="color: #FFFFFF">À propos de cette alternative</b></td> + </tr> + + <form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="donateForm" style="margin: 0; padding: 0;"> + <input type="hidden" name="cmd" value="_donations"> + <input type="hidden" name="business" value="donate(a)winehq.org"> + <input type="hidden" name="item_name" value="Don au projet Wine"> + <input type="hidden" name="lc" value="FR"> + <input type="hidden" name="currency_code" value="EUR"> + </form> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="javascript:document.donateForm.submit();">Paypal</a> + </td> + <td valign="top"> + Avec <a href="javascript:document.donateForm.submit();">Paypal</a>, vous +pouvez effectuer un don par carte de crédit ou via votre compte Paypal. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://www.freewear.org/?org=Wine">FreeWear</a> + </td> + <td valign="top"> + Vous pouvez acheter des vêtements Wine spécifiques sur <a +href="http://www.freewear.org/?org=Wine">FreeWear.org</a>. Pour chaque article +acheté, une partie du bénéfice est versée à Wine. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://www.winehq.org/contributing#wpf">Courrier</a> + </td> + <td valign="top"> + Vous pouvez également nous envoyer du cash, un chèque ou des mandats +internationaux libellés en dollars US. + Voyez <a href="http://www.winehq.org/contributing#wpf">ce lien</a> pour +plus d'informations. + </td> + </tr> + +</table>

1 0

Piotr Caban : imagehlp: Set Index in ImageAddCertificate function.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 0cd94ac51f5d7fd7d78f20848378cbbe269159a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cd94ac51f5d7fd7d78f20848… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 3 18:50:07 2011 +0200 imagehlp: Set Index in ImageAddCertificate function. --- dlls/imagehlp/integrity.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c index 2c72948..005a75b 100644 --- a/dlls/imagehlp/integrity.c +++ b/dlls/imagehlp/integrity.c @@ -392,10 +392,6 @@ BOOL WINAPI ImageAddCertificate( /* If we've already got a security directory, find the end of it */ if ((r) && (sd_VirtualAddr != 0)) { - offset = 0; - index = 0; - count = 0; - /* Check if the security directory is at the end of the file. If not, we should probably relocate it. */ if (GetFileSize(FileHandle, NULL) != sd_VirtualAddr + size) @@ -479,6 +475,8 @@ BOOL WINAPI ImageAddCertificate( if (!IMAGEHLP_RecalculateChecksum(FileHandle)) return FALSE; + if(Index) + *Index = index; return TRUE; }

1 0

Piotr Caban : crypt32: Fix content type in CRYPT_QueryEmbeddedMessageObject function.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: a343c1fbd0f37a5cadd98698ae5d580727ddf0c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a343c1fbd0f37a5cadd98698a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 3 18:51:09 2011 +0200 crypt32: Fix content type in CRYPT_QueryEmbeddedMessageObject function. --- dlls/crypt32/object.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 378ce51..2587c4d 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -672,8 +672,7 @@ static BOOL CRYPT_QueryEmbeddedMessageObject(DWORD dwObjectType, pdwMsgAndCertEncodingType, NULL, NULL, phCertStore, phMsg); if (ret && pdwContentType) - *pdwContentType = - CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED; + *pdwContentType = CERT_QUERY_CONTENT_PKCS7_SIGNED_EMBED; } CryptMemFree(blob.pbData); }

1 0

Piotr Caban : wintrust: Added CryptSIP{Get,Put}SignedDataMsg tests.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 1ece5b3ab6b106643dd372f97dcf5ff8df55444c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ece5b3ab6b106643dd372f97… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 3 18:50:59 2011 +0200 wintrust: Added CryptSIP{Get,Put}SignedDataMsg tests. --- dlls/wintrust/tests/crypt.c | 165 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 165 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 0236486..e5f36e1 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -115,6 +115,8 @@ static CRYPTCATATTRIBUTE * (WINAPI * pCryptCATEnumerateCatAttr)(HANDLE, CRYPTCAT 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 @@ static void InitFunctionPtrs(void) 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}}; @@ -1117,6 +1127,160 @@ static void test_cdf_parsing(void) 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 */ + 0, /* BaseOfData */ + 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) { char** myARGV; @@ -1151,4 +1315,5 @@ START_TEST(crypt) /* Create a catalog file out of our own catalog definition file */ test_create_catalog_file(); test_CryptCATAdminAddRemoveCatalog(); + test_sip(); }

1 0

Piotr Caban : wintrust: Fix CryptSIPGetSignedMsg (from PE file).
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 3a945c3987a2e488168a4b6f52c5f5609929229e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a945c3987a2e488168a4b6f5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 3 18:50:48 2011 +0200 wintrust: Fix CryptSIPGetSignedMsg (from PE file). --- dlls/wintrust/crypt.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 4f4ed24..341f45b 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -1016,16 +1016,27 @@ static BOOL WINTRUST_GetSignedMsgFromPEFile(SIP_SUBJECTINFO *pSubjectInfo, { 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) @@ -1044,7 +1055,7 @@ static BOOL WINTRUST_GetSignedMsgFromPEFile(SIP_SUBJECTINFO *pSubjectInfo, { 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); @@ -1053,10 +1064,10 @@ static BOOL WINTRUST_GetSignedMsgFromPEFile(SIP_SUBJECTINFO *pSubjectInfo, 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; @@ -1066,6 +1077,7 @@ static BOOL WINTRUST_GetSignedMsgFromPEFile(SIP_SUBJECTINFO *pSubjectInfo, else { memcpy(pbSignedDataMsg, pCert->bCertificate, pCert->dwLength); + *pcbSignedDataMsg = pCert->dwLength; switch (pCert->wCertificateType) { case WIN_CERT_TYPE_X509: @@ -1083,6 +1095,8 @@ static BOOL WINTRUST_GetSignedMsgFromPEFile(SIP_SUBJECTINFO *pSubjectInfo, } } error: + if(pSubjectInfo->hFile != file) + CloseHandle(file); HeapFree(GetProcessHeap(), 0, pCert); return ret; } @@ -1351,6 +1365,12 @@ BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEn 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, dwIndex, pcbSignedDataMsg, pbSignedDataMsg);

1 0

Piotr Caban : wintrust: Added CryptSIPPutSignedDataMsg implementation ( for PE files).
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 3a6196b79e4afa560e3c8f36bf23ab1f365e868a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a6196b79e4afa560e3c8f36b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 3 18:50:34 2011 +0200 wintrust: Added CryptSIPPutSignedDataMsg implementation (for PE files). --- dlls/wintrust/crypt.c | 68 ++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 59 insertions(+), 9 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index be93543..4f4ed24 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -1087,6 +1087,42 @@ error: 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; +} + /* structure offsets */ #define cfhead_Signature (0x00) #define cfhead_CabinetSize (0x08) @@ -1296,18 +1332,20 @@ static BOOL WINTRUST_GetSignedMsgFromCatFile(SIP_SUBJECTINFO *pSubjectInfo, 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, @@ -1337,11 +1375,23 @@ BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEn * CryptSIPPutSignedDataMsg (WINTRUST.@) */ BOOL WINAPI CryptSIPPutSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD pdwEncodingType, - DWORD* pdwIndex, DWORD cbSignedDataMsg, BYTE* pbSignedDataMsg) + DWORD* pdwIndex, DWORD cbSignedDataMsg, BYTE* pbSignedDataMsg) { - FIXME("(%p %d %p %d %p) stub\n", pSubjectInfo, pdwEncodingType, pdwIndex, + 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; }

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetString().
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: f3f59d2cf865c697f4c1c05b45e50ccdfded95db URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3f59d2cf865c697f4c1c05b4… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue May 3 14:46:59 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetString(). --- dlls/d3dx9_36/effect.c | 168 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 154 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 6373f1c..fcc3050 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -83,9 +83,11 @@ struct ID3DXBaseEffectImpl UINT parameter_count; UINT technique_count; + UINT object_count; D3DXHANDLE *parameter_handles; D3DXHANDLE *technique_handles; + D3DXHANDLE *objects; }; struct ID3DXEffectImpl @@ -292,11 +294,6 @@ static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) return; } - if (!child) - { - HeapFree(GetProcessHeap(), 0, param->data); - } - if (param->annotation_handles) { for (i = 0; i < param->annotation_count; ++i) @@ -320,6 +317,25 @@ static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) HeapFree(GetProcessHeap(), 0, param->member_handles); } + if (param->class == D3DXPC_OBJECT && !param->element_count) + { + switch(param->type) + { + case D3DXPT_STRING: + HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); + break; + + default: + FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); + break; + } + } + + if (!child) + { + HeapFree(GetProcessHeap(), 0, param->data); + } + /* only the parent has to release name and semantic */ if (!element) { @@ -1251,10 +1267,22 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetString(ID3DXBaseEffect *iface, D3DX static HRESULT WINAPI ID3DXBaseEffectImpl_GetString(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPCSTR *string) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, string %p stub\n", This, parameter, string); + TRACE("iface %p, parameter %p, string %p\n", This, parameter, string); - return E_NOTIMPL; + if (!param) param = get_parameter_by_name(This, NULL, parameter); + + if (string && param && !param->element_count && param->type == D3DXPT_STRING) + { + *string = *(LPCSTR *)param->data; + TRACE("Returning %s\n", debugstr_a(*string)); + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetTexture(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) @@ -2967,11 +2995,12 @@ static const struct ID3DXEffectCompilerVtbl ID3DXEffectCompiler_Vtbl = ID3DXEffectCompilerImpl_CompileShader, }; -static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value) +static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value, const char **ptr) { unsigned int i; HRESULT hr; UINT old_size = 0; + DWORD id; if (param->element_count) { @@ -2981,7 +3010,7 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value) { struct d3dx_parameter *member = get_parameter_struct(param->member_handles[i]); - hr = d3dx9_parse_value(member, (char *)value + old_size); + hr = d3dx9_parse_value(member, (char *)value + old_size, ptr); if (hr != D3D_OK) { WARN("Failed to parse value\n"); @@ -3010,7 +3039,7 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value) { struct d3dx_parameter *member = get_parameter_struct(param->member_handles[i]); - hr = d3dx9_parse_value(member, (char *)value + old_size); + hr = d3dx9_parse_value(member, (char *)value + old_size, ptr); if (hr != D3D_OK) { WARN("Failed to parse value\n"); @@ -3021,6 +3050,22 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value) } break; + case D3DXPC_OBJECT: + switch (param->type) + { + case D3DXPT_STRING: + read_dword(ptr, &id); + TRACE("Id: %u\n", id); + param->base->objects[id] = get_parameter_handle(param); + param->data = value; + break; + + default: + FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); + break; + } + break; + default: FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); break; @@ -3029,12 +3074,11 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value) return D3D_OK; } - static HRESULT d3dx9_parse_init_value(struct d3dx_parameter *param, const char *ptr) { UINT size = param->bytes; HRESULT hr; - void *value; + void *value = NULL; TRACE("param size: %u\n", size); @@ -3048,7 +3092,7 @@ static HRESULT d3dx9_parse_init_value(struct d3dx_parameter *param, const char * TRACE("Data: %s.\n", debugstr_an(ptr, size)); memcpy(value, ptr, size); - hr = d3dx9_parse_value(param, value); + hr = d3dx9_parse_value(param, value, &ptr); if (hr != D3D_OK) { WARN("Failed to parse value\n"); @@ -3086,6 +3130,46 @@ static HRESULT d3dx9_parse_name(char **name, const char *ptr) return D3D_OK; } +static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr) +{ + DWORD size; + HRESULT hr; + + TRACE("Parse data for parameter %s, type %s\n", debugstr_a(param->name), debug_d3dxparameter_type(param->type)); + + read_dword(ptr, &size); + TRACE("Data size: %#x\n", size); + + if (!size) + { + TRACE("Size is 0\n"); + *(void **)param->data = NULL; + return D3D_OK; + } + + switch (param->type) + { + case D3DXPT_STRING: + /* re-read with size (sizeof(DWORD) = 4) */ + hr = d3dx9_parse_name((LPSTR *)param->data, *ptr - 4); + if (hr != D3D_OK) + { + WARN("Failed to parse string data\n"); + return hr; + } + break; + + default: + FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); + break; + } + + + *ptr += ((size + 3) & ~3); + + return D3D_OK; +} + static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const char *data, const char **ptr, struct d3dx_parameter *parent, UINT flags) { @@ -3156,6 +3240,19 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch TRACE("Members: %u\n", param->member_count); break; + case D3DXPC_OBJECT: + switch (param->type) + { + case D3DXPT_STRING: + param->bytes = sizeof(LPCSTR); + break; + + default: + FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); + break; + } + break; + default: FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); break; @@ -3615,6 +3712,8 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * const char *ptr = data + start; D3DXHANDLE *parameter_handles = NULL; D3DXHANDLE *technique_handles = NULL; + D3DXHANDLE *objects = NULL; + unsigned int stringcount; HRESULT hr; unsigned int i; @@ -3624,7 +3723,20 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * read_dword(&ptr, &base->technique_count); TRACE("Technique count: %u\n", base->technique_count); - skip_dword_unknown(&ptr, 2); + skip_dword_unknown(&ptr, 1); + + read_dword(&ptr, &base->object_count); + TRACE("Object count: %u\n", base->object_count); + + objects = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*objects) * base->object_count); + if (!objects) + { + ERR("Out of memory\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + base->objects = objects; if (base->parameter_count) { @@ -3694,6 +3806,32 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * } } + read_dword(&ptr, &stringcount); + TRACE("String count: %u\n", stringcount); + + skip_dword_unknown(&ptr, 1); + + for (i = 0; i < stringcount; ++i) + { + DWORD id; + struct d3dx_parameter *param; + + read_dword(&ptr, &id); + TRACE("Id: %u\n", id); + + param = get_parameter_struct(base->objects[id]); + + hr = d3dx9_parse_data(param, &ptr); + if (hr != D3D_OK) + { + WARN("Failed to parse data\n"); + goto err_out; + } + } + + HeapFree(GetProcessHeap(), 0, objects); + base->objects = NULL; + base->technique_handles = technique_handles; base->parameter_handles = parameter_handles; @@ -3719,6 +3857,8 @@ err_out: HeapFree(GetProcessHeap(), 0, parameter_handles); } + HeapFree(GetProcessHeap(), 0, objects); + return hr; }

1 0