August 2007 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Remove ugly code from stateblock init.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: f41ab3be9b84f17798bf0d60158772b5d77ebc7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41ab3be9b84f17798bf0d601… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 30 18:46:20 2007 +0200 wined3d: Remove ugly code from stateblock init. --- dlls/wined3d/stateblock.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 14c8533..b3700ee 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -914,15 +914,8 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILFAIL, WINED3DSTENCILOP_KEEP); IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILZFAIL, WINED3DSTENCILOP_KEEP); IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILPASS, WINED3DSTENCILOP_KEEP); - - /* Setting stencil func also uses values for stencil ref/mask, so manually set defaults - * so only a single call performed (and ensure defaults initialized before making that call) - * - * IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILREF, 0); - * IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILMASK, 0xFFFFFFFF); - */ - This->renderState[WINED3DRS_STENCILREF] = 0; - This->renderState[WINED3DRS_STENCILMASK] = 0xFFFFFFFF; + IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILREF, 0); + IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILMASK, 0xFFFFFFFF); IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILFUNC, WINED3DCMP_ALWAYS); IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILWRITEMASK, 0xFFFFFFFF); IWineD3DDevice_SetRenderState(device, WINED3DRS_TEXTUREFACTOR, 0xFFFFFFFF);

1 0

James Hawkins : msi: Add tests for the RemoveFiles standard action.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: b353a09569d32a8302ffe6278944d9cf4f514b10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b353a09569d32a8302ffe6278… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Aug 10 18:38:13 2007 -0700 msi: Add tests for the RemoveFiles standard action. --- dlls/msi/tests/install.c | 196 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 196 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b353a09569d32a8302ffe…

1 0

Evan Stade : gdiplus: Fix test to pass in Windows.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 2ba471e0d6d5fa5515445e12cf9281905ce37b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ba471e0d6d5fa5515445e12c… Author: Evan Stade <estade(a)gmail.com> Date: Fri Aug 10 16:22:47 2007 -0700 gdiplus: Fix test to pass in Windows. --- dlls/gdiplus/tests/image.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 0dda717..d19a14c 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -73,5 +73,17 @@ static void test_Scan0() START_TEST(image) { + struct GdiplusStartupInput gdiplusStartupInput; + ULONG_PTR gdiplusToken; + + gdiplusStartupInput.GdiplusVersion = 1; + gdiplusStartupInput.DebugEventCallback = NULL; + gdiplusStartupInput.SuppressBackgroundThread = 0; + gdiplusStartupInput.SuppressExternalCodecs = 0; + + GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_Scan0(); + + GdiplusShutdown(gdiplusToken); }

1 0

Juan Lang : wintrust: Implement encoding SPC links.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 06b51457e1622a4f14a3150b96363c2d55e48450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b51457e1622a4f14a3150b9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 10 14:06:39 2007 -0700 wintrust: Implement encoding SPC links. --- dlls/wintrust/asn.c | 222 ++++++++++++++++++++++++++++++++++++++++++++- dlls/wintrust/tests/asn.c | 8 -- 2 files changed, 220 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06b51457e1622a4f14a31…

1 0

Juan Lang : wintrust: Add tests for encoding and decoding SPC PE image data .
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 6a9d049b74f4a4baa71684069679979d33d2d216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9d049b74f4a4baa71684069… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 10 14:35:36 2007 -0700 wintrust: Add tests for encoding and decoding SPC PE image data. --- dlls/wintrust/tests/asn.c | 224 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 224 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index e5e7f6e..11b0584 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -217,8 +217,232 @@ static void test_decodeSPCLink(void) "Expected CRYPT_E_BAD_ENCODE, got %08x\n", GetLastError()); } +static const BYTE emptySequence[] = { 0x30,0x00 }; +static BYTE flags[] = { 1 }; +static const BYTE onlyFlagsPEImage[] = { 0x30,0x04,0x03,0x02,0x00,0x01 }; +static const BYTE moreFlagsPEImage[] = { +0x30,0x06,0x03,0x04,0x04,0xff,0x80,0x10 }; +static const BYTE onlyEmptyFilePEImage[] = { +0x30,0x06,0xa0,0x04,0xa2,0x02,0x80,0x00 }; +static const BYTE flagsAndEmptyFilePEImage[] = { +0x30,0x0a,0x03,0x02,0x00,0x01,0xa0,0x04,0xa2,0x02,0x80,0x00 }; +static const BYTE flagsAndFilePEImage[] = { +0x30,0x1c,0x03,0x02,0x00,0x01,0xa0,0x16,0xa2,0x14,0x80,0x12,0x00,0x68,0x00, +0x74,0x00,0x74,0x00,0x70,0x00,0x3a,0x00,0x2f,0x00,0x2f,0x22,0x6f,0x57,0x5b }; + +static void test_encodeSPCPEImage(void) +{ + BOOL ret; + DWORD size = 0; + LPBYTE buf; + SPC_PE_IMAGE_DATA imageData = { { 0 } }; + SPC_LINK link = { 0 }; + + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, + &imageData, 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, sizeof(emptySequence)), + "Unexpected value\n"); + LocalFree(buf); + } + /* With an invalid link: */ + imageData.pFile = &link; + SetLastError(0xdeadbeef); + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, + &imageData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(!ret && GetLastError () == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + /* With just unused bits field set: */ + imageData.pFile = NULL; + imageData.Flags.cUnusedBits = 1; + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, + &imageData, 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, sizeof(emptySequence)), + "Unexpected value\n"); + LocalFree(buf); + } + /* With flags set: */ + imageData.Flags.cUnusedBits = 0; + imageData.Flags.pbData = flags; + imageData.Flags.cbData = sizeof(flags); + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, + &imageData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(onlyFlagsPEImage), "Unexpected size %d\n", size); + ok(!memcmp(buf, onlyFlagsPEImage, sizeof(onlyFlagsPEImage)), + "Unexpected value\n"); + LocalFree(buf); + } + /* With just an empty file: */ + imageData.Flags.cbData = 0; + link.dwLinkChoice = SPC_FILE_LINK_CHOICE; + imageData.pFile = &link; + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, + &imageData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(onlyEmptyFilePEImage), "Unexpected size %d\n", size); + ok(!memcmp(buf, onlyEmptyFilePEImage, sizeof(onlyEmptyFilePEImage)), + "Unexpected value\n"); + LocalFree(buf); + } + /* With flags and an empty file: */ + imageData.Flags.pbData = flags; + imageData.Flags.cbData = sizeof(flags); + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, + &imageData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(flagsAndEmptyFilePEImage), "Unexpected size %d\n", + size); + ok(!memcmp(buf, flagsAndEmptyFilePEImage, + sizeof(flagsAndEmptyFilePEImage)), "Unexpected value\n"); + LocalFree(buf); + } + /* Finally, a non-empty file: */ + link.pwszFile = (LPWSTR)nihongoURL; + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, + &imageData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(flagsAndFilePEImage), "Unexpected size %d\n", size); + ok(!memcmp(buf, flagsAndFilePEImage, sizeof(flagsAndFilePEImage)), + "Unexpected value\n"); + LocalFree(buf); + } +} + +static void test_decodeSPCPEImage(void) +{ + static const WCHAR emptyString[] = { 0 }; + BOOL ret; + LPBYTE buf = NULL; + DWORD size = 0; + SPC_PE_IMAGE_DATA *imageData; + + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, + emptySequence, sizeof(emptySequence), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + imageData = (SPC_PE_IMAGE_DATA *)buf; + ok(imageData->Flags.cbData == 0, "Expected empty flags, got %d\n", + imageData->Flags.cbData); + ok(imageData->pFile == NULL, "Expected no file\n"); + LocalFree(buf); + } + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, + onlyFlagsPEImage, sizeof(onlyFlagsPEImage), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + imageData = (SPC_PE_IMAGE_DATA *)buf; + ok(imageData->Flags.cbData == sizeof(flags), + "Unexpected flags size %d\n", imageData->Flags.cbData); + if (imageData->Flags.cbData) + ok(!memcmp(imageData->Flags.pbData, flags, sizeof(flags)), + "Unexpected flags\n"); + ok(imageData->pFile == NULL, "Expected no file\n"); + LocalFree(buf); + } + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, + onlyEmptyFilePEImage, sizeof(onlyEmptyFilePEImage), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + imageData = (SPC_PE_IMAGE_DATA *)buf; + ok(imageData->Flags.cbData == 0, "Expected empty flags, got %d\n", + imageData->Flags.cbData); + ok(imageData->pFile != NULL, "Expected a file\n"); + if (imageData->pFile) + { + ok(imageData->pFile->dwLinkChoice == SPC_FILE_LINK_CHOICE, + "Expected SPC_FILE_LINK_CHOICE, got %d\n", + imageData->pFile->dwLinkChoice); + ok(!lstrcmpW(imageData->pFile->pwszFile, emptyString), + "Unexpected file\n"); + } + LocalFree(buf); + } + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, + flagsAndEmptyFilePEImage, sizeof(flagsAndEmptyFilePEImage), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + imageData = (SPC_PE_IMAGE_DATA *)buf; + ok(imageData->Flags.cbData == sizeof(flags), + "Unexpected flags size %d\n", imageData->Flags.cbData); + if (imageData->Flags.cbData) + ok(!memcmp(imageData->Flags.pbData, flags, sizeof(flags)), + "Unexpected flags\n"); + ok(imageData->pFile != NULL, "Expected a file\n"); + if (imageData->pFile) + { + ok(imageData->pFile->dwLinkChoice == SPC_FILE_LINK_CHOICE, + "Expected SPC_FILE_LINK_CHOICE, got %d\n", + imageData->pFile->dwLinkChoice); + ok(!lstrcmpW(imageData->pFile->pwszFile, emptyString), + "Unexpected file\n"); + } + LocalFree(buf); + } + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, + flagsAndFilePEImage, sizeof(flagsAndFilePEImage), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + imageData = (SPC_PE_IMAGE_DATA *)buf; + ok(imageData->Flags.cbData == sizeof(flags), + "Unexpected flags size %d\n", imageData->Flags.cbData); + if (imageData->Flags.cbData) + ok(!memcmp(imageData->Flags.pbData, flags, sizeof(flags)), + "Unexpected flags\n"); + ok(imageData->pFile != NULL, "Expected a file\n"); + if (imageData->pFile) + { + ok(imageData->pFile->dwLinkChoice == SPC_FILE_LINK_CHOICE, + "Expected SPC_FILE_LINK_CHOICE, got %d\n", + imageData->pFile->dwLinkChoice); + ok(!lstrcmpW(imageData->pFile->pwszFile, nihongoURL), + "Unexpected file\n"); + } + LocalFree(buf); + } +} + START_TEST(asn) { test_encodeSPCLink(); test_decodeSPCLink(); + test_encodeSPCPEImage(); + test_decodeSPCPEImage(); }

1 0

Juan Lang : wintrust: Add missing definitions.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 98dd6c75e29c84a31a2845a1f704afe21cc22fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=98dd6c75e29c84a31a2845a1f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 10 11:02:45 2007 -0700 wintrust: Add missing definitions. --- include/wintrust.h | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 103 insertions(+), 0 deletions(-) diff --git a/include/wintrust.h b/include/wintrust.h index f7c0667..7b0f388 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -377,9 +377,15 @@ CRYPT_PROVIDER_DATA * WINAPI WTHelperProvDataFromStateData(HANDLE hStateData); #define SPC_SP_AGENCY_INFO_OBJID "1.3.6.1.4.1.311.2.1.10" #define SPC_STATEMENT_TYPE_OBJID "1.3.6.1.4.1.311.2.1.11" #define SPC_SP_OPUS_INFO_OBJID "1.3.6.1.4.1.311.2.1.12" +#define SPC_CERT_EXTENSIONS_OBJID "1.3.6.1.4.1.311.2.1.14" #define SPC_PE_IMAGE_DATA_OBJID "1.3.6.1.4.1.311.2.1.15" +#define SPC_RAW_FILE_DATA_OBJID "1.3.6.1.4.1.311.2.1.18" +#define SPC_STRUCTURED_STORAGE_DATA_OBJID "1.3.6.1.4.1.311.2.1.19" #define SPC_JAVA_CLASS_DATA_OBJID "1.3.6.1.4.1.311.2.1.20" +#define SPC_INDIVIDUAL_SP_KEY_PURPOSE_OBJID "1.3.6.1.4.1.311.2.1.21" +#define SPC_COMMERCIAL_SP_KEY_PURPOSE_OBJID "1.3.6.1.4.1.311.2.1.22" #define SPC_CAB_DATA_OBJID "1.3.6.1.4.1.311.2.1.25" +#define SPC_GLUE_RDN_OBJID "1.3.6.1.4.1.311.2.1.25" #define SPC_MINIMAL_CRITERIA_OBJID "1.3.6.1.4.1.311.2.1.26" #define SPC_FINANCIAL_CRITERIA_OBJID "1.3.6.1.4.1.311.2.1.27" #define SPC_LINK_OBJID "1.3.6.1.4.1.311.2.1.28" @@ -401,6 +407,103 @@ CRYPT_PROVIDER_DATA * WINAPI WTHelperProvDataFromStateData(HANDLE hStateData); #define CAT_NAMEVALUE_STRUCT ((LPCSTR) 2221) #define CAT_MEMBERINFO_STRUCT ((LPCSTR) 2222) +#define SPC_UUID_LENGTH 16 +typedef BYTE SPC_UUID[SPC_UUID_LENGTH]; + +typedef struct _SPC_SERIALIZED_OBJECT +{ + SPC_UUID ClassId; + CRYPT_DATA_BLOB SerializedData; +} SPC_SERIALIZED_OBJECT, *PSPC_SERIALIZED_OBJECT; + +typedef struct SPC_SIGINFO_ +{ + DWORD dwSipVersion; + GUID gSIPGuid; + DWORD dwReserved1; + DWORD dwReserved2; + DWORD dwReserved3; + DWORD dwReserved4; + DWORD dwReserved5; +} SPC_SIGINFO, *PSPC_SIGINFO; + +#define SPC_URL_LINK_CHOICE 1 +#define SPC_MONIKER_LINK_CHOICE 2 +#define SPC_FILE_LINK_CHOICE 3 + +typedef struct SPC_LINK_ +{ + DWORD dwLinkChoice; + union + { + LPWSTR pwszUrl; + SPC_SERIALIZED_OBJECT Moniker; + LPWSTR pwszFile; + } DUMMYUNIONNAME; +} SPC_LINK, *PSPC_LINK; + +typedef struct _SPC_PE_IMAGE_DATA +{ + CRYPT_BIT_BLOB Flags; + PSPC_LINK pFile; +} SPC_PE_IMAGE_DATA, *PSPC_PE_IMAGE_DATA; + +typedef struct _SPC_INDIRECT_DATA_CONTENT +{ + CRYPT_ATTRIBUTE_TYPE_VALUE Data; + CRYPT_ALGORITHM_IDENTIFIER DigestAlgorithm; + CRYPT_HASH_BLOB Digest; +} SPC_INDIRECT_DATA_CONTENT, *PSPC_INDIRECT_DATA_CONTENT; + +typedef struct _SPC_FINANCIAL_CRITERIA +{ + BOOL fFinancialInfoAvailable; + BOOL fMeetsCriteria; +} SPC_FINANCIAL_CRITERIA, *PSPC_FINANCIAL_CRITERIA; + +typedef struct _SPC_IMAGE +{ + struct SPC_LINK_ *pImageLink; + CRYPT_DATA_BLOB Bitmap; + CRYPT_DATA_BLOB Metafile; + CRYPT_DATA_BLOB EnhancedMetafile; + CRYPT_DATA_BLOB GifFile; +} SPC_IMAGE, *PSPC_IMAGE; + +typedef struct _SPC_SP_AGENCY_INFO +{ + struct SPC_LINK_ *pPolicyInformation; + LPWSTR pwszPolicyDisplayText; + PSPC_IMAGE pLogoImage; + struct SPC_LINK_ *pLogoLink; +} SPC_SP_AGENCY_INFO, *PSPC_SP_AGENCY_INFO; + +typedef struct _SPC_STATEMENT_TYPE +{ + DWORD cKeyPurposeId; + LPSTR *rgpszKeyPurposeId; +} SPC_STATEMENT_TYPE, *PSPC_STATEMENT_TYPE; + +typedef struct _SPC_SP_OPUS_INFO +{ + LPCWSTR pwszProgramName; + struct SPC_LINK_ *pMoreInfo; + struct SPC_LINK_ *pPublisherInfo; +} SPC_SP_OPUS_INFO, *PSPC_SP_OPUS_INFO; + +typedef struct _CAT_NAMEVALUE +{ + LPWSTR pwszTag; + DWORD fdwFlags; + CRYPT_DATA_BLOB Value; +} CAT_NAMEVALUE, *PCAT_NAMEVALUE; + +typedef struct _CAT_MEMBERINFO +{ + LPWSTR pwszSubjGuid; + DWORD dwCertVersion; +} CAT_MEMBERINFO, *PCAT_MEMBERINFO; + #define WIN_SPUB_ACTION_PUBLISHED_SOFTWARE \ { 0x64b9d180, 0x8da2, 0x11cf, { 0x87,0x36,0x00,0xaa,0x00,0xa4,0x85,0xeb }}

1 0

Juan Lang : wintrust: Add tests for encoding/decoding SPC links.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 44047e02c2f1f1497e744664611dccb67ded54b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44047e02c2f1f1497e7446646… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 10 11:15:39 2007 -0700 wintrust: Add tests for encoding/decoding SPC links. --- dlls/wintrust/tests/Makefile.in | 3 +- dlls/wintrust/tests/asn.c | 236 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 238 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/tests/Makefile.in b/dlls/wintrust/tests/Makefile.in index 50fadcc..59a7716 100644 --- a/dlls/wintrust/tests/Makefile.in +++ b/dlls/wintrust/tests/Makefile.in @@ -3,9 +3,10 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = wintrust.dll -IMPORTS = user32 advapi32 kernel32 +IMPORTS = crypt32 user32 advapi32 kernel32 CTESTS = \ + asn.c \ crypt.c \ register.c diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c new file mode 100644 index 0000000..da83b5f --- /dev/null +++ b/dlls/wintrust/tests/asn.c @@ -0,0 +1,236 @@ +/* Unit test suite for wintrust asn functions + * + * Copyright 2007 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * 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 <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wincrypt.h" +#include "wintrust.h" + +#include "wine/test.h" + +static WCHAR url[] = { 'h','t','t','p',':','/','/','w','i','n','e','h','q','.', + 'o','r','g',0 }; +static const WCHAR nihongoURL[] = { 'h','t','t','p',':','/','/',0x226f, + 0x575b, 0 }; +static const BYTE emptyURLSPCLink[] = { 0x80,0x00 }; +static const BYTE urlSPCLink[] = { +0x80,0x11,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,0x69,0x6e,0x65,0x68,0x71, +0x2e,0x6f,0x72,0x67}; +static const BYTE fileSPCLink[] = { +0xa2,0x14,0x80,0x12,0x00,0x68,0x00,0x74,0x00,0x74,0x00,0x70,0x00,0x3a,0x00, +0x2f,0x00,0x2f,0x22,0x6f,0x57,0x5b }; +static const BYTE emptyMonikerSPCLink[] = { +0xa1,0x14,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x04,0x00 }; +static BYTE data[] = { 0xba, 0xad, 0xf0, 0x0d }; +static const BYTE monikerSPCLink[] = { +0xa1,0x18,0x04,0x10,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea, +0xea,0xea,0xea,0xea,0xea,0x04,0x04,0xba,0xad,0xf0,0x0d }; + +static void test_encodeSPCLink(void) +{ + BOOL ret; + DWORD size = 0; + LPBYTE buf; + SPC_LINK link = { 0 }; + + SetLastError(0xdeadbeef); + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, &link, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + link.dwLinkChoice = SPC_URL_LINK_CHOICE; + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, &link, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(emptyURLSPCLink), "Unexpected size %d\n", size); + ok(!memcmp(buf, emptyURLSPCLink, size), "Unexpected value\n"); + LocalFree(buf); + } + /* With an invalid char: */ + link.pwszUrl = (LPWSTR)nihongoURL; + size = 1; + SetLastError(0xdeadbeef); + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, &link, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_INVALID_IA5_STRING, + "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. + */ + todo_wine + ok(size == 0, "Expected size 0, got %d\n", size); + link.pwszUrl = url; + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, &link, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(urlSPCLink), "Unexpected size %d\n", size); + ok(!memcmp(buf, urlSPCLink, size), "Unexpected value\n"); + LocalFree(buf); + } + link.dwLinkChoice = SPC_FILE_LINK_CHOICE; + link.pwszFile = (LPWSTR)nihongoURL; + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, &link, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(fileSPCLink), "Unexpected size %d\n", size); + ok(!memcmp(buf, fileSPCLink, size), "Unexpected value\n"); + LocalFree(buf); + } + link.dwLinkChoice = SPC_MONIKER_LINK_CHOICE; + memset(&link.Moniker, 0, sizeof(link.Moniker)); + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, &link, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(emptyMonikerSPCLink), "Unexpected size %d\n", size); + ok(!memcmp(buf, emptyMonikerSPCLink, size), "Unexpected value\n"); + LocalFree(buf); + } + memset(&link.Moniker.ClassId, 0xea, sizeof(link.Moniker.ClassId)); + link.Moniker.SerializedData.pbData = data; + link.Moniker.SerializedData.cbData = sizeof(data); + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, &link, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(monikerSPCLink), "Unexpected size %d\n", size); + ok(!memcmp(buf, monikerSPCLink, size), "Unexpected value\n"); + LocalFree(buf); + } +} + +static const BYTE badMonikerSPCLink[] = { +0xa1,0x19,0x04,0x11,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea, +0xea,0xea,0xea,0xea,0xea,0xea,0x04,0x04,0xba,0xad,0xf0,0x0d }; + +static void test_decodeSPCLink(void) +{ + BOOL ret; + LPBYTE buf = NULL; + DWORD size = 0; + SPC_LINK *link; + + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, + emptyURLSPCLink, sizeof(emptyURLSPCLink), CRYPT_DECODE_ALLOC_FLAG, NULL, + (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + link = (SPC_LINK *)buf; + ok(link->dwLinkChoice == SPC_URL_LINK_CHOICE, + "Expected SPC_URL_LINK_CHOICE, got %d\n", link->dwLinkChoice); + ok(lstrlenW(link->pwszUrl) == 0, "Expected empty string\n"); + LocalFree(buf); + } + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, + urlSPCLink, sizeof(urlSPCLink), CRYPT_DECODE_ALLOC_FLAG, NULL, + (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + link = (SPC_LINK *)buf; + ok(link->dwLinkChoice == SPC_URL_LINK_CHOICE, + "Expected SPC_URL_LINK_CHOICE, got %d\n", link->dwLinkChoice); + ok(!lstrcmpW(link->pwszUrl, url), "Unexpected URL\n"); + LocalFree(buf); + } + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, + fileSPCLink, sizeof(fileSPCLink), CRYPT_DECODE_ALLOC_FLAG, NULL, + (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + link = (SPC_LINK *)buf; + ok(link->dwLinkChoice == SPC_FILE_LINK_CHOICE, + "Expected SPC_FILE_LINK_CHOICE, got %d\n", link->dwLinkChoice); + ok(!lstrcmpW(link->pwszFile, nihongoURL), "Unexpected file\n"); + LocalFree(buf); + } + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, + emptyMonikerSPCLink, sizeof(emptyMonikerSPCLink), CRYPT_DECODE_ALLOC_FLAG, + NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + SPC_SERIALIZED_OBJECT emptyMoniker = { { 0 } }; + + link = (SPC_LINK *)buf; + ok(link->dwLinkChoice == SPC_MONIKER_LINK_CHOICE, + "Expected SPC_MONIKER_LINK_CHOICE, got %d\n", link->dwLinkChoice); + ok(!memcmp(&link->Moniker, &emptyMoniker, sizeof(emptyMoniker)), + "Unexpected value\n"); + LocalFree(buf); + } + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, + monikerSPCLink, sizeof(monikerSPCLink), CRYPT_DECODE_ALLOC_FLAG, NULL, + (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + SPC_UUID id; + + link = (SPC_LINK *)buf; + ok(link->dwLinkChoice == SPC_MONIKER_LINK_CHOICE, + "Expected SPC_MONIKER_LINK_CHOICE, got %d\n", link->dwLinkChoice); + memset(&id, 0xea, sizeof(id)); + ok(!memcmp(&link->Moniker.ClassId, &id, sizeof(id)), + "Unexpected value\n"); + ok(link->Moniker.SerializedData.cbData == sizeof(data), + "Unexpected data size %d\n", link->Moniker.SerializedData.cbData); + ok(!memcmp(link->Moniker.SerializedData.pbData, data, sizeof(data)), + "Unexpected value\n"); + LocalFree(buf); + } + SetLastError(0xdeadbeef); + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, + badMonikerSPCLink, sizeof(badMonikerSPCLink), CRYPT_DECODE_ALLOC_FLAG, + NULL, (BYTE *)&buf, &size); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_BAD_ENCODE, + "Expected CRYPT_E_BAD_ENCODE, got %08x\n", GetLastError()); +} + +START_TEST(asn) +{ + test_encodeSPCLink(); + test_decodeSPCLink(); +}

1 0

Juan Lang : wintrust: Implement decoding SPC links.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 29cae46fce50cfa059bedca1034fbd82f55a9810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29cae46fce50cfa059bedca10… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 10 11:23:55 2007 -0700 wintrust: Implement decoding SPC links. --- dlls/wintrust/Makefile.in | 2 +- dlls/wintrust/asn.c | 347 ++++++++++++++++++++++++++++++++++++++++++++- dlls/wintrust/tests/asn.c | 12 +- 3 files changed, 348 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29cae46fce50cfa059bed…

1 0

Juan Lang : wintrust: Add stubs for SPC_LINK and SPC_PE_IMAGE encoding/ decoding.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 4c5efcc412c8c05ad2da24f58578bfe5b3cd77ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c5efcc412c8c05ad2da24f58… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 10 10:56:25 2007 -0700 wintrust: Add stubs for SPC_LINK and SPC_PE_IMAGE encoding/decoding. --- dlls/wintrust/Makefile.in | 1 + dlls/wintrust/asn.c | 69 +++++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/wintrust.spec | 8 ++-- 3 files changed, 74 insertions(+), 4 deletions(-) diff --git a/dlls/wintrust/Makefile.in b/dlls/wintrust/Makefile.in index 720cd33..b6e547d 100644 --- a/dlls/wintrust/Makefile.in +++ b/dlls/wintrust/Makefile.in @@ -8,6 +8,7 @@ IMPORTS = crypt32 user32 advapi32 kernel32 DELAYIMPORTS = imagehlp C_SRCS = \ + asn.c \ crypt.c \ register.c \ wintrust_main.c diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c new file mode 100644 index 0000000..7acba64 --- /dev/null +++ b/dlls/wintrust/asn.c @@ -0,0 +1,69 @@ +/* wintrust asn functions + * + * Copyright 2007 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * 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 <stdarg.h> +#define NONAMELESSUNION +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wincrypt.h" +#include "wintrust.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cryptasn); + +BOOL WINAPI WVTAsn1SpcLinkEncode(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + FIXME("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, + debugstr_a(lpszStructType), pvStructInfo, pbEncoded, + pcbEncoded); + return FALSE; +} + +BOOL WINAPI WVTAsn1SpcPeImageDataEncode(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + FIXME("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, + debugstr_a(lpszStructType), pvStructInfo, pbEncoded, + pcbEncoded); + return FALSE; +} + +BOOL WINAPI WVTAsn1SpcLinkDecode(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + void *pvStructInfo, DWORD *pcbStructInfo) +{ + FIXME("(0x%08x, %s, %p, %d, 0x%08x, %p, %p)\n", dwCertEncodingType, + debugstr_a(lpszStructType), pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pcbStructInfo); + return FALSE; +} + +BOOL WINAPI WVTAsn1SpcPeImageDataDecode(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + void *pvStructInfo, DWORD *pcbStructInfo) +{ + FIXME("(0x%08x, %s, %p, %d, 0x%08x, %p, %p)\n", dwCertEncodingType, + debugstr_a(lpszStructType), pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pcbStructInfo); + return FALSE; +} diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index ba02687..7e31548 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -94,12 +94,12 @@ @ stub WVTAsn1SpcFinancialCriteriaInfoEncode @ stub WVTAsn1SpcIndirectDataContentDecode @ stub WVTAsn1SpcIndirectDataContentEncode -@ stub WVTAsn1SpcLinkDecode -@ stub WVTAsn1SpcLinkEncode +@ stdcall WVTAsn1SpcLinkDecode(long str ptr long long ptr ptr) +@ stdcall WVTAsn1SpcLinkEncode(long str ptr ptr ptr) @ stub WVTAsn1SpcMinimalCriteriaInfoDecode @ stub WVTAsn1SpcMinimalCriteriaInfoEncode -@ stub WVTAsn1SpcPeImageDataDecode -@ stub WVTAsn1SpcPeImageDataEncode +@ stdcall WVTAsn1SpcPeImageDataDecode(long str ptr long long ptr ptr) +@ stdcall WVTAsn1SpcPeImageDataEncode(long str ptr ptr ptr) @ stub WVTAsn1SpcSigInfoDecode @ stub WVTAsn1SpcSigInfoEncode @ stub WVTAsn1SpcSpAgencyInfoDecode

1 0

Juan Lang : crypt32: Use helper functions to simplify CryptEncodeObject and CryptEncodeObjectEx .
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: f848055151c4e9c3db6f8e4cd067f820de4799e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f848055151c4e9c3db6f8e4cd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 10 11:21:03 2007 -0700 crypt32: Use helper functions to simplify CryptEncodeObject and CryptEncodeObjectEx. --- dlls/crypt32/encode.c | 180 ++++++++++++++++++++++++++++--------------------- 1 files changed, 102 insertions(+), 78 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index aa650bd..4dd8c99 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -92,44 +92,6 @@ static BOOL WINAPI CRYPT_AsnEncodeChoiceOfTime(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded); -BOOL WINAPI CryptEncodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, - const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded) -{ - static HCRYPTOIDFUNCSET set = NULL; - BOOL ret = FALSE; - HCRYPTOIDFUNCADDR hFunc; - CryptEncodeObjectFunc pCryptEncodeObject; - - TRACE_(crypt)("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, - debugstr_a(lpszStructType), pvStructInfo, pbEncoded, - pcbEncoded); - - if (!pbEncoded && !pcbEncoded) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* Try registered DLL first.. */ - if (!set) - set = CryptInitOIDFunctionSet(CRYPT_OID_ENCODE_OBJECT_FUNC, 0); - CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, - (void **)&pCryptEncodeObject, &hFunc); - if (pCryptEncodeObject) - { - ret = pCryptEncodeObject(dwCertEncodingType, lpszStructType, - pvStructInfo, pbEncoded, pcbEncoded); - CryptFreeOIDFunctionAddress(hFunc, 0); - } - else - { - /* If not, use CryptEncodeObjectEx */ - ret = CryptEncodeObjectEx(dwCertEncodingType, lpszStructType, - pvStructInfo, 0, NULL, pbEncoded, pcbEncoded); - } - return ret; -} - BOOL CRYPT_EncodeEnsureSpace(DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded, DWORD bytesNeeded) { @@ -3335,34 +3297,18 @@ BOOL CRYPT_AsnEncodePKCSSignedInfo(CRYPT_SIGNED_INFO *signedInfo, void *pvData, return ret; } -BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, - const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, - void *pvEncoded, DWORD *pcbEncoded) +static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, + LPCSTR lpszStructType) { - static HCRYPTOIDFUNCSET set = NULL; - BOOL ret = FALSE; CryptEncodeObjectExFunc encodeFunc = NULL; - HCRYPTOIDFUNCADDR hFunc = NULL; - - TRACE_(crypt)("(0x%08x, %s, %p, 0x%08x, %p, %p, %p)\n", dwCertEncodingType, - debugstr_a(lpszStructType), pvStructInfo, dwFlags, pEncodePara, - pvEncoded, pcbEncoded); - if (!pvEncoded && !pcbEncoded) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } if ((dwCertEncodingType & CERT_ENCODING_TYPE_MASK) != X509_ASN_ENCODING && (dwCertEncodingType & CMSG_ENCODING_TYPE_MASK) != PKCS_7_ASN_ENCODING) { SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; + return NULL; } - SetLastError(NOERROR); - if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG && pvEncoded) - *(BYTE **)pvEncoded = NULL; if (!HIWORD(lpszStructType)) { switch (LOWORD(lpszStructType)) @@ -3461,8 +3407,6 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, case (WORD)PKCS7_SIGNER_INFO: encodeFunc = CRYPT_AsnEncodePKCSSignerInfo; break; - default: - FIXME("%d: unimplemented\n", LOWORD(lpszStructType)); } } else if (!strcmp(lpszStructType, szOID_CERT_EXTENSIONS)) @@ -3499,32 +3443,113 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, encodeFunc = CRYPT_AsnEncodeEnhancedKeyUsage; else if (!strcmp(lpszStructType, szOID_ISSUING_DIST_POINT)) encodeFunc = CRYPT_AsnEncodeIssuingDistPoint; - else - TRACE_(crypt)("OID %s not found or unimplemented, looking for DLL\n", - debugstr_a(lpszStructType)); + return encodeFunc; +} + +static CryptEncodeObjectFunc CRYPT_LoadEncoderFunc(DWORD dwCertEncodingType, + LPCSTR lpszStructType, HCRYPTOIDFUNCADDR *hFunc) +{ + static HCRYPTOIDFUNCSET set = NULL; + CryptEncodeObjectFunc encodeFunc = NULL; + + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_ENCODE_OBJECT_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, + (void **)&encodeFunc, hFunc); + return encodeFunc; +} + +static CryptEncodeObjectExFunc CRYPT_LoadEncoderExFunc(DWORD dwCertEncodingType, + LPCSTR lpszStructType, HCRYPTOIDFUNCADDR *hFunc) +{ + static HCRYPTOIDFUNCSET set = NULL; + CryptEncodeObjectExFunc encodeFunc = NULL; + + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_ENCODE_OBJECT_EX_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, + (void **)&encodeFunc, hFunc); + return encodeFunc; +} + +BOOL WINAPI CryptEncodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, + const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret = FALSE; + HCRYPTOIDFUNCADDR hFunc = NULL; + CryptEncodeObjectFunc pCryptEncodeObject = NULL; + CryptEncodeObjectExFunc pCryptEncodeObjectEx = NULL; + + TRACE_(crypt)("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, + debugstr_a(lpszStructType), pvStructInfo, pbEncoded, + pcbEncoded); + + if (!pbEncoded && !pcbEncoded) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!(pCryptEncodeObjectEx = CRYPT_GetBuiltinEncoder(dwCertEncodingType, + lpszStructType))) + { + pCryptEncodeObject = CRYPT_LoadEncoderFunc(dwCertEncodingType, + lpszStructType, &hFunc); + if (!pCryptEncodeObject) + pCryptEncodeObjectEx = CRYPT_LoadEncoderExFunc(dwCertEncodingType, + lpszStructType, &hFunc); + } + if (pCryptEncodeObject) + { + ret = pCryptEncodeObject(dwCertEncodingType, lpszStructType, + pvStructInfo, pbEncoded, pcbEncoded); + } + else if (pCryptEncodeObjectEx) + ret = pCryptEncodeObjectEx(dwCertEncodingType, lpszStructType, + pvStructInfo, 0, NULL, pbEncoded, pcbEncoded); + if (hFunc) + CryptFreeOIDFunctionAddress(hFunc, 0); + TRACE_(crypt)("returning %d\n", ret); + return ret; +} + +BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, + const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, + void *pvEncoded, DWORD *pcbEncoded) +{ + BOOL ret = FALSE; + HCRYPTOIDFUNCADDR hFunc = NULL; + CryptEncodeObjectExFunc encodeFunc = NULL; + + TRACE_(crypt)("(0x%08x, %s, %p, 0x%08x, %p, %p, %p)\n", dwCertEncodingType, + debugstr_a(lpszStructType), pvStructInfo, dwFlags, pEncodePara, + pvEncoded, pcbEncoded); + + if (!pvEncoded && !pcbEncoded) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + SetLastError(NOERROR); + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG && pvEncoded) + *(BYTE **)pvEncoded = NULL; + encodeFunc = CRYPT_GetBuiltinEncoder(dwCertEncodingType, lpszStructType); if (!encodeFunc) { - if (!set) - set = CryptInitOIDFunctionSet(CRYPT_OID_ENCODE_OBJECT_EX_FUNC, 0); - CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, - (void **)&encodeFunc, &hFunc); + TRACE_(crypt)("OID %s not found or unimplemented, looking for DLL\n", + debugstr_a(lpszStructType)); + encodeFunc = CRYPT_LoadEncoderExFunc(dwCertEncodingType, lpszStructType, + &hFunc); } if (encodeFunc) ret = encodeFunc(dwCertEncodingType, lpszStructType, pvStructInfo, dwFlags, pEncodePara, pvEncoded, pcbEncoded); else { - static HCRYPTOIDFUNCSET encodeObjectSet = NULL; - CryptEncodeObjectFunc pCryptEncodeObject; + CryptEncodeObjectFunc pCryptEncodeObject = + CRYPT_LoadEncoderFunc(dwCertEncodingType, lpszStructType, &hFunc); - /* Try CryptEncodeObject function. Don't call CryptEncodeObject - * directly, as that could cause an infinite loop. - */ - if (!encodeObjectSet) - encodeObjectSet = - CryptInitOIDFunctionSet(CRYPT_OID_ENCODE_OBJECT_FUNC, 0); - CryptGetOIDFunctionAddress(encodeObjectSet, dwCertEncodingType, - lpszStructType, 0, (void **)&pCryptEncodeObject, &hFunc); if (pCryptEncodeObject) { if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) @@ -3541,11 +3566,10 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, ret = pCryptEncodeObject(dwCertEncodingType, lpszStructType, pvStructInfo, pvEncoded, pcbEncoded); } - else - SetLastError(ERROR_FILE_NOT_FOUND); } if (hFunc) CryptFreeOIDFunctionAddress(hFunc, 0); + TRACE_(crypt)("returning %d\n", ret); return ret; }

1 0