December 2008 - Wine-Commits

Henri Verbeet : wined3d: Use the actual fixup for the stage in gen_ati_shader().
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 4aeaba0d29a3be40d41773e98812e8d1812c49dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aeaba0d29a3be40d41773e98… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 10 10:04:40 2008 +0100 wined3d: Use the actual fixup for the stage in gen_ati_shader(). This fixes a regression introduced by commit 89139b75898fb5ac7094a641b0d91a06936a6c51. --- dlls/wined3d/ati_fragment_shader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 90ca192..f88de9e 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -351,6 +351,7 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con if(op[stage].cop != WINED3DTOP_BUMPENVMAP && op[stage].cop != WINED3DTOP_BUMPENVMAPLUMINANCE) continue; + fixup = op[stage].color_correction; if (fixup.x_source != CHANNEL_SOURCE_X || fixup.y_source != CHANNEL_SOURCE_Y) { FIXME("Swizzles not implemented\n");

1 0

Paul Vriens : riched32/tests: Remove the todo_wine logic where appropriate.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 3e6d1bfd936d3b8465388b6ccea37ad046d1565e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6d1bfd936d3b8465388b6cc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Dec 10 09:51:52 2008 +0100 riched32/tests: Remove the todo_wine logic where appropriate. --- dlls/riched32/tests/editor.c | 186 +++++++++++++++++------------------------ 1 files changed, 77 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e6d1bfd936d3b8465388…

1 0

Juan Lang : wintrust: Add tests for WVTAsn1SpcSpOpusInfoDecode.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 8610a0b537926eb72eeba0daf4e311fd210602c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8610a0b537926eb72eeba0daf… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 9 16:42:32 2008 -0800 wintrust: Add tests for WVTAsn1SpcSpOpusInfoDecode. --- dlls/wintrust/tests/asn.c | 74 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index 29b30d2..5cb5cb6 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -865,6 +865,79 @@ static void test_encodeSpOpusInfo(void) } } +static void test_decodeSpOpusInfo(void) +{ + BOOL ret; + DWORD size; + SPC_SP_OPUS_INFO *info; + + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, + emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, + &info, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(!info->pwszProgramName, "expected NULL\n"); + ok(!info->pMoreInfo, "expected NULL\n"); + ok(!info->pPublisherInfo, "expected NULL\n"); + LocalFree(info); + } + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, + spOpusInfoWithProgramName, sizeof(spOpusInfoWithProgramName), + CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(info->pwszProgramName && !lstrcmpW(info->pwszProgramName, + progName), "unexpected program name\n"); + ok(!info->pMoreInfo, "expected NULL\n"); + ok(!info->pPublisherInfo, "expected NULL\n"); + LocalFree(info); + } + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, + spOpusInfoWithMoreInfo, sizeof(spOpusInfoWithMoreInfo), + CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(!info->pwszProgramName, "expected NULL\n"); + ok(info->pMoreInfo != NULL, "expected a value for pMoreInfo\n"); + if (info->pMoreInfo) + { + ok(info->pMoreInfo->dwLinkChoice == SPC_URL_LINK_CHOICE, + "unexpected link choice %d\n", info->pMoreInfo->dwLinkChoice); + ok(!lstrcmpW(info->pMoreInfo->pwszUrl, winehq), + "unexpected link value\n"); + } + ok(!info->pPublisherInfo, "expected NULL\n"); + LocalFree(info); + } + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, + spOpusInfoWithPublisherInfo, sizeof(spOpusInfoWithPublisherInfo), + CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(!info->pwszProgramName, "expected NULL\n"); + ok(!info->pMoreInfo, "expected NULL\n"); + ok(info->pPublisherInfo != NULL, + "expected a value for pPublisherInfo\n"); + if (info->pPublisherInfo) + { + ok(info->pPublisherInfo->dwLinkChoice == SPC_URL_LINK_CHOICE, + "unexpected link choice %d\n", + info->pPublisherInfo->dwLinkChoice); + ok(!lstrcmpW(info->pPublisherInfo->pwszUrl, winehq), + "unexpected link value\n"); + } + LocalFree(info); + } +} + START_TEST(asn) { HMODULE hCrypt32 = LoadLibraryA("crypt32.dll"); @@ -882,6 +955,7 @@ START_TEST(asn) test_encodeCatNameValue(); test_decodeCatNameValue(); test_encodeSpOpusInfo(); + test_decodeSpOpusInfo(); FreeLibrary(hCrypt32); }

1 0

Paul Vriens : gdi32/tests: Fix a failure on NT4.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 024a6bce5fd1d383331720640b8e0a715c79c74b URL: http://source.winehq.org/git/wine.git/?a=commit;h=024a6bce5fd1d383331720640… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Dec 9 13:42:08 2008 +0100 gdi32/tests: Fix a failure on NT4. --- dlls/gdi32/tests/metafile.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 85bc529..21e6767 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -121,8 +121,11 @@ static int CALLBACK eto_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, const EMREXTTEXTOUTW *emr_ExtTextOutW = (const EMREXTTEXTOUTW *)emr; dx = (const INT *)((const char *)emr + emr_ExtTextOutW->emrtext.offDx); + SetLastError(0xdeadbeef); ret = GetObjectA(GetCurrentObject(hdc, OBJ_FONT), sizeof(device_lf), &device_lf); - ok( ret == sizeof(device_lf), "GetObjectA error %d\n", GetLastError()); + ok( ret == sizeof(device_lf) || + broken(ret == (sizeof(device_lf) - LF_FACESIZE + strlen(device_lf.lfFaceName) + 1)), /* NT4 */ + "GetObjectA error %d\n", GetLastError()); /* compare up to lfOutPrecision, other values are not interesting, * and in fact sometimes arbitrary adapted by Win9x.

1 0

Juan Lang : wintrust: Implement WVTAsn1SpcSpOpusInfoEncode.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 9e7c5626b307354b97ffd6a279a40ac22be7267c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e7c5626b307354b97ffd6a27… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 9 16:30:47 2008 -0800 wintrust: Implement WVTAsn1SpcSpOpusInfoEncode. --- dlls/wintrust/asn.c | 109 +++++++++++++++++++++++++++++++++++++++++---- dlls/wintrust/tests/asn.c | 5 -- 2 files changed, 100 insertions(+), 14 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 5d41589..3a51c91 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -740,15 +740,6 @@ BOOL WINAPI WVTAsn1SpcIndirectDataContentEncode(DWORD dwCertEncodingType, return ret; } -BOOL WINAPI WVTAsn1SpcSpOpusInfoEncode(DWORD dwCertEncodingType, - LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, - DWORD *pcbEncoded) -{ - FIXME("(0x%08x, %s, %p, %p, %p): stub\n", dwCertEncodingType, - debugstr_a(lpszStructType), pvStructInfo, pbEncoded, pcbEncoded); - return FALSE; -} - static BOOL WINAPI CRYPT_AsnEncodeBMPString(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -788,6 +779,106 @@ static BOOL WINAPI CRYPT_AsnEncodeBMPString(DWORD dwCertEncodingType, return ret; } +struct AsnEncodeTagSwappedItem +{ + BYTE tag; + const void *pvStructInfo; + CryptEncodeObjectFunc encodeFunc; +}; + +/* Sort of a wacky hack, it encodes something using the struct + * AsnEncodeTagSwappedItem's encodeFunc, then replaces the tag byte with the tag + * given in the struct AsnEncodeTagSwappedItem. + */ +static BOOL WINAPI CRYPT_AsnEncodeSwapTag(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret; + const struct AsnEncodeTagSwappedItem *item = pvStructInfo; + + ret = item->encodeFunc(dwCertEncodingType, lpszStructType, + item->pvStructInfo, pbEncoded, pcbEncoded); + if (ret && pbEncoded) + *pbEncoded = item->tag; + return ret; +} + +BOOL WINAPI WVTAsn1SpcSpOpusInfoEncode(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = FALSE; + + TRACE("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, + debugstr_a(lpszStructType), pvStructInfo, pbEncoded, pcbEncoded); + + __TRY + { + const SPC_SP_OPUS_INFO *info = pvStructInfo; + + if (info->pMoreInfo && + info->pMoreInfo->dwLinkChoice != SPC_URL_LINK_CHOICE && + info->pMoreInfo->dwLinkChoice != SPC_MONIKER_LINK_CHOICE && + info->pMoreInfo->dwLinkChoice != SPC_FILE_LINK_CHOICE) + SetLastError(E_INVALIDARG); + else if (info->pPublisherInfo && + info->pPublisherInfo->dwLinkChoice != SPC_URL_LINK_CHOICE && + info->pPublisherInfo->dwLinkChoice != SPC_MONIKER_LINK_CHOICE && + info->pPublisherInfo->dwLinkChoice != SPC_FILE_LINK_CHOICE) + SetLastError(E_INVALIDARG); + else + { + struct AsnEncodeSequenceItem items[3] = { { 0 } }; + struct AsnConstructedItem constructed[3] = { { 0 } }; + struct AsnEncodeTagSwappedItem swapped; + DWORD cItem = 0, cConstructed = 0; + + if (info->pwszProgramName) + { + swapped.tag = ASN_CONTEXT; + swapped.pvStructInfo = info->pwszProgramName; + swapped.encodeFunc = CRYPT_AsnEncodeBMPString; + constructed[cConstructed].tag = 0; + constructed[cConstructed].pvStructInfo = &swapped; + constructed[cConstructed].encodeFunc = CRYPT_AsnEncodeSwapTag; + items[cItem].pvStructInfo = &constructed[cConstructed]; + items[cItem].encodeFunc = CRYPT_AsnEncodeConstructed; + cConstructed++; + cItem++; + } + if (info->pMoreInfo) + { + constructed[cConstructed].tag = 1; + constructed[cConstructed].pvStructInfo = info->pMoreInfo; + constructed[cConstructed].encodeFunc = WVTAsn1SpcLinkEncode; + items[cItem].pvStructInfo = &constructed[cConstructed]; + items[cItem].encodeFunc = CRYPT_AsnEncodeConstructed; + cConstructed++; + cItem++; + } + if (info->pPublisherInfo) + { + constructed[cConstructed].tag = 2; + constructed[cConstructed].pvStructInfo = info->pPublisherInfo; + constructed[cConstructed].encodeFunc = WVTAsn1SpcLinkEncode; + items[cItem].pvStructInfo = &constructed[cConstructed]; + items[cItem].encodeFunc = CRYPT_AsnEncodeConstructed; + cConstructed++; + cItem++; + } + ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, + items, cItem, pbEncoded, pcbEncoded); + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + return ret; +} + static BOOL CRYPT_AsnEncodeInteger(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index 5fb83d5..29b30d2 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -810,7 +810,6 @@ static void test_encodeSpOpusInfo(void) memset(&info, 0, sizeof(info)); ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, (LPBYTE)&info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -821,7 +820,6 @@ static void test_encodeSpOpusInfo(void) info.pwszProgramName = progName; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, (LPBYTE)&info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -837,14 +835,12 @@ static void test_encodeSpOpusInfo(void) SetLastError(0xdeadbeef); ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, (LPBYTE)&info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); moreInfo.dwLinkChoice = SPC_URL_LINK_CHOICE; moreInfo.pwszUrl = winehq; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, (LPBYTE)&info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -858,7 +854,6 @@ static void test_encodeSpOpusInfo(void) info.pPublisherInfo = &moreInfo; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, (LPBYTE)&info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0

Juan Lang : wintrust: Add tests for WVTAsn1SpcSpOpusInfoEncode.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 796bb0734a5e32a36bbbc0412b72508ccb8ae669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=796bb0734a5e32a36bbbc0412… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 9 15:59:56 2008 -0800 wintrust: Add tests for WVTAsn1SpcSpOpusInfoEncode. --- dlls/wintrust/tests/asn.c | 85 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index 0cc02dc..5fb83d5 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -786,6 +786,90 @@ static void test_decodeCatNameValue(void) } } +static const WCHAR progName[] = { 'A',' ','p','r','o','g','r','a','m',0 }; +static const BYTE spOpusInfoWithProgramName[] = { +0x30,0x16,0xa0,0x14,0x80,0x12,0x00,0x41,0x00,0x20,0x00,0x70,0x00,0x72,0x00,0x6f, +0x00,0x67,0x00,0x72,0x00,0x61,0x00,0x6d }; +static WCHAR winehq[] = { 'h','t','t','p',':','/','/','w','i','n','e','h','q', + '.','o','r','g','/',0 }; +static const BYTE spOpusInfoWithMoreInfo[] = { +0x30,0x16,0xa1,0x14,0x80,0x12,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,0x69,0x6e, +0x65,0x68,0x71,0x2e,0x6f,0x72,0x67,0x2f }; +static const BYTE spOpusInfoWithPublisherInfo[] = { +0x30,0x16,0xa2,0x14,0x80,0x12,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,0x69,0x6e, +0x65,0x68,0x71,0x2e,0x6f,0x72,0x67,0x2f }; + +static void test_encodeSpOpusInfo(void) +{ + BOOL ret; + LPBYTE buf; + DWORD size; + SPC_SP_OPUS_INFO info; + SPC_LINK moreInfo; + + memset(&info, 0, sizeof(info)); + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, + (LPBYTE)&info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(emptySequence), "unexpected size %d\n", size); + ok(!memcmp(buf, emptySequence, size), "unexpected value\n"); + LocalFree(buf); + } + info.pwszProgramName = progName; + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, + (LPBYTE)&info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(spOpusInfoWithProgramName), "unexpected size %d\n", + size); + ok(!memcmp(buf, spOpusInfoWithProgramName, size), + "unexpected value\n"); + LocalFree(buf); + } + info.pwszProgramName = NULL; + memset(&moreInfo, 0, sizeof(moreInfo)); + info.pMoreInfo = &moreInfo; + SetLastError(0xdeadbeef); + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, + (LPBYTE)&info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + moreInfo.dwLinkChoice = SPC_URL_LINK_CHOICE; + moreInfo.pwszUrl = winehq; + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, + (LPBYTE)&info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(spOpusInfoWithMoreInfo), + "unexpected size %d\n", size); + ok(!memcmp(buf, spOpusInfoWithMoreInfo, size), + "unexpected value\n"); + LocalFree(buf); + } + info.pMoreInfo = NULL; + info.pPublisherInfo = &moreInfo; + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, + (LPBYTE)&info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(spOpusInfoWithPublisherInfo), + "unexpected size %d\n", size); + ok(!memcmp(buf, spOpusInfoWithPublisherInfo, size), + "unexpected value\n"); + LocalFree(buf); + } +} + START_TEST(asn) { HMODULE hCrypt32 = LoadLibraryA("crypt32.dll"); @@ -802,6 +886,7 @@ START_TEST(asn) test_decodeCatMemberInfo(); test_encodeCatNameValue(); test_decodeCatNameValue(); + test_encodeSpOpusInfo(); FreeLibrary(hCrypt32); }

1 0

Juan Lang : wintrust: Add stub for WVTAsn1SpcSpOpusInfoEncode.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: ffa3d341dbdbcc02f2a65feca43072af970b807b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa3d341dbdbcc02f2a65feca… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 9 15:03:11 2008 -0800 wintrust: Add stub for WVTAsn1SpcSpOpusInfoEncode. --- dlls/wintrust/asn.c | 9 +++++++++ dlls/wintrust/wintrust.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 4dfabc3..5d41589 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -740,6 +740,15 @@ BOOL WINAPI WVTAsn1SpcIndirectDataContentEncode(DWORD dwCertEncodingType, return ret; } +BOOL WINAPI WVTAsn1SpcSpOpusInfoEncode(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + FIXME("(0x%08x, %s, %p, %p, %p): stub\n", dwCertEncodingType, + debugstr_a(lpszStructType), pvStructInfo, pbEncoded, pcbEncoded); + return FALSE; +} + static BOOL WINAPI CRYPT_AsnEncodeBMPString(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded) diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 93a1b8e..6f83282 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -105,7 +105,7 @@ @ stub WVTAsn1SpcSpAgencyInfoDecode @ stub WVTAsn1SpcSpAgencyInfoEncode @ stdcall WVTAsn1SpcSpOpusInfoDecode(long str ptr long long ptr ptr) -@ stub WVTAsn1SpcSpOpusInfoEncode +@ stdcall WVTAsn1SpcSpOpusInfoEncode(long str ptr ptr ptr) @ stub WVTAsn1SpcStatementTypeDecode @ stub WVTAsn1SpcStatementTypeEncode @ stdcall WinVerifyTrust(long ptr ptr)

1 0

Juan Lang : crypt32: Allow setting CERT_KEY_PROV_HANDLE_PROP_ID if CERT_KEY_CONTEXT_PROP_ID has not previously been set .
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: b21da737fea9af77ff3872324f59db0f427efcc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21da737fea9af77ff3872324… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 9 15:00:44 2008 -0800 crypt32: Allow setting CERT_KEY_PROV_HANDLE_PROP_ID if CERT_KEY_CONTEXT_PROP_ID has not previously been set. --- dlls/crypt32/cert.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 8a590a5..8b5f2e8 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -540,13 +540,17 @@ static BOOL CertContext_SetProperty(void *context, DWORD dwPropId, { if (!(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG)) CryptReleaseContext(keyContext.hCryptProv, 0); - if (pvData) - keyContext.hCryptProv = *(const HCRYPTPROV *)pvData; - else - keyContext.hCryptProv = 0; - ret = CertContext_SetProperty(context, CERT_KEY_CONTEXT_PROP_ID, - 0, &keyContext); } + keyContext.cbSize = sizeof(keyContext); + if (pvData) + keyContext.hCryptProv = *(const HCRYPTPROV *)pvData; + else + { + keyContext.hCryptProv = 0; + keyContext.dwKeySpec = AT_SIGNATURE; + } + ret = CertContext_SetProperty(context, CERT_KEY_CONTEXT_PROP_ID, + 0, &keyContext); break; } default:

1 0

Juan Lang : crypt32: Remove unnecessary casts.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: fce8a26c009c68dd9076ff3849afc905f8534a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fce8a26c009c68dd9076ff384… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 9 14:46:55 2008 -0800 crypt32: Remove unnecessary casts. --- dlls/crypt32/cert.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 9cef6f8..8a590a5 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -476,7 +476,7 @@ static BOOL CertContext_SetProperty(void *context, DWORD dwPropId, { if (pvData) { - const CRYPT_DATA_BLOB *blob = (const CRYPT_DATA_BLOB *)pvData; + const CRYPT_DATA_BLOB *blob = pvData; ret = ContextPropertyList_SetProperty(properties, dwPropId, blob->pbData, blob->cbData); @@ -491,7 +491,7 @@ static BOOL CertContext_SetProperty(void *context, DWORD dwPropId, case CERT_DATE_STAMP_PROP_ID: if (pvData) ret = ContextPropertyList_SetProperty(properties, dwPropId, - (const BYTE *)pvData, sizeof(FILETIME)); + pvData, sizeof(FILETIME)); else { ContextPropertyList_RemoveProperty(properties, dwPropId); @@ -502,7 +502,7 @@ static BOOL CertContext_SetProperty(void *context, DWORD dwPropId, { if (pvData) { - const CERT_KEY_CONTEXT *keyContext = (const CERT_KEY_CONTEXT *)pvData; + const CERT_KEY_CONTEXT *keyContext = pvData; if (keyContext->cbSize != sizeof(CERT_KEY_CONTEXT)) { @@ -522,8 +522,7 @@ static BOOL CertContext_SetProperty(void *context, DWORD dwPropId, } case CERT_KEY_PROV_INFO_PROP_ID: if (pvData) - ret = CertContext_SetKeyProvInfoProperty(properties, - (const CRYPT_KEY_PROV_INFO *)pvData); + ret = CertContext_SetKeyProvInfoProperty(properties, pvData); else { ContextPropertyList_RemoveProperty(properties, dwPropId);

1 0

Rico Schüller : winhlp32: Fix German translation.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 8e02da9843c74f2dc58cceae3b3097d2609c1c84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e02da9843c74f2dc58cceae3… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 9 21:56:51 2008 +0100 winhlp32: Fix German translation. --- programs/winhlp32/De.rc | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/De.rc b/programs/winhlp32/De.rc index 49cda6d..c8ee650 100644 --- a/programs/winhlp32/De.rc +++ b/programs/winhlp32/De.rc @@ -74,6 +74,14 @@ CAPTION "Index" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Suche" +{ + LTEXT "Noch nicht implementiert", -1, 10, 10, 180, 150 +} + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

1 0