wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Alexandre Julliard : hnetcfg: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: c0be1ec8428590956214b3ff5f148fac4d4fc837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0be1ec8428590956214b3ff5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:47:19 2010 +0100 hnetcfg: Convert dll registration to the IRegistrar mechanism. --- dlls/hnetcfg/Makefile.in | 3 +- dlls/hnetcfg/hnetcfg.c | 20 ++ dlls/hnetcfg/hnetcfg.idl | 35 ++++ dlls/hnetcfg/regsvr.c | 430 ---------------------------------------------- 4 files changed, 57 insertions(+), 431 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0be1ec8428590956214b…

1 0

Alexandre Julliard : gameux: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 71dbeb2ebe3434e9abe67d64f981fffdcb78a168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71dbeb2ebe3434e9abe67d64f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:33:09 2010 +0100 gameux: Convert dll registration to the IRegistrar mechanism. --- dlls/gameux/Makefile.in | 4 +- dlls/gameux/main.c | 20 ++ dlls/gameux/regsvr.c | 532 ----------------------------------------------- include/gameux.idl | 8 + 4 files changed, 30 insertions(+), 534 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71dbeb2ebe3434e9abe67…

1 0

Alexandre Julliard : gameux: Add a typelib resource.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 092af1be3721d2f43638efc756ed3d0ba4396524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=092af1be3721d2f43638efc75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:18:11 2010 +0100 gameux: Add a typelib resource. --- .gitignore | 1 + dlls/gameux/Makefile.in | 4 +++- dlls/gameux/{version.rc => gameux_tlb.idl} | 14 +++----------- dlls/gameux/{version.rc => rsrc.rc} | 5 ++++- include/gameux.idl | 2 +- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 88001d8..36c11ee 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,7 @@ dlls/d3dcompiler_43/asmshader.yy.c dlls/dispex/disp_ex.h dlls/dispex/disp_ex_p.c dlls/dxdiagn/fil_data.h +dlls/gameux/gameux_tlb.tlb dlls/infosoft/infosoft.h dlls/jscript/jsglobal.tlb dlls/jscript/parser.tab.c diff --git a/dlls/gameux/Makefile.in b/dlls/gameux/Makefile.in index d47c907..94cc810 100644 --- a/dlls/gameux/Makefile.in +++ b/dlls/gameux/Makefile.in @@ -9,6 +9,8 @@ C_SRCS = \ main.c \ regsvr.c -RC_SRCS = version.rc +IDL_TLB_SRCS = gameux_tlb.idl + +RC_SRCS = rsrc.rc @MAKE_DLL_RULES@ diff --git a/dlls/gameux/version.rc b/dlls/gameux/gameux_tlb.idl similarity index 63% copy from dlls/gameux/version.rc copy to dlls/gameux/gameux_tlb.idl index 286add1..8b18ca0 100644 --- a/dlls/gameux/version.rc +++ b/dlls/gameux/gameux_tlb.idl @@ -1,7 +1,7 @@ /* - * Gameux library version resource + * Typelib for gameux * - * Copyright (C) 2010 Mariusz Pluciński + * Copyright 2010 Alexandre Julliard * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,12 +18,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_FILEDESCRIPTION_STR "Wine Games Explorer" -#define WINE_FILENAME_STR "gameux.dll" -#define WINE_FILEVERSION 6,1,7600,16385 -#define WINE_FILEVERSION_STR "6.1.7600.16385" -#define WINE_PRODUCTVERSION 6,1,7600,16385 -#define WINE_PRODUCTVERSION_STR "6.1.7600.16385" -#define WINE_EXTRAVALUES VALUE "OLESelfRegister","" - -#include "wine/wine_common_ver.rc" +#include "gameux.idl" diff --git a/dlls/gameux/version.rc b/dlls/gameux/rsrc.rc similarity index 93% rename from dlls/gameux/version.rc rename to dlls/gameux/rsrc.rc index 286add1..f5670b7 100644 --- a/dlls/gameux/version.rc +++ b/dlls/gameux/rsrc.rc @@ -1,5 +1,5 @@ /* - * Gameux library version resource + * Gameux library resources * * Copyright (C) 2010 Mariusz Pluciński * @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: gameux_tlb.tlb */ +1 TYPELIB gameux_tlb.tlb + #define WINE_FILEDESCRIPTION_STR "Wine Games Explorer" #define WINE_FILENAME_STR "gameux.dll" #define WINE_FILEVERSION 6,1,7600,16385 diff --git a/include/gameux.idl b/include/gameux.idl index 773e784..5c50a3c 100644 --- a/include/gameux.idl +++ b/include/gameux.idl @@ -24,7 +24,7 @@ import "ocidl.idl"; import "shobjidl.idl"; [ - uuid(1DE6CE3D-EA69-4671-941F-26F789F39C5B), + uuid(4F48A59C-942D-4F3C-83C9-4EFFE84E4959), version(1.0), helpstring("gameux public 1.0 Type Library") ]

1 0

Alexandre Julliard : wuapi: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 69f58161b9e818341bd3ace0b7bfe26f4a5b1d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f58161b9e818341bd3ace0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 10:34:19 2010 +0100 wuapi: Convert dll registration to the IRegistrar mechanism. --- dlls/wuapi/Makefile.in | 2 +- dlls/wuapi/main.c | 20 +++ dlls/wuapi/regsvr.c | 430 ------------------------------------------------ include/wuapi.idl | 21 ++- 4 files changed, 39 insertions(+), 434 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69f58161b9e818341bd3a…

1 0

Alexandre Julliard : wuapi: Add a typelib resource.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 2f0371e84dfbb9e82fcda981b7197742576966a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0371e84dfbb9e82fcda981b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 10:33:25 2010 +0100 wuapi: Add a typelib resource. --- .gitignore | 1 + dlls/wuapi/Makefile.in | 4 ++++ dlls/wuapi/rsrc.rc | 22 ++++++++++++++++++++++ dlls/wuapi/wuapi_tlb.idl | 21 +++++++++++++++++++++ include/wuapi.idl | 11 +++++++++++ 5 files changed, 59 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index a981f92..88001d8 100644 --- a/.gitignore +++ b/.gitignore @@ -145,6 +145,7 @@ dlls/urlmon/urlmon_urlmon.h dlls/urlmon/urlmon_urlmon_p.c dlls/windowscodecs/windowscodecs_wincodec.h dlls/windowscodecs/windowscodecs_wincodec_p.c +dlls/wuapi/wuapi_tlb.tlb include/activaut.h include/activdbg.h include/activscp.h diff --git a/dlls/wuapi/Makefile.in b/dlls/wuapi/Makefile.in index 658008a..563f611 100644 --- a/dlls/wuapi/Makefile.in +++ b/dlls/wuapi/Makefile.in @@ -11,4 +11,8 @@ C_SRCS = \ session.c \ updates.c +IDL_TLB_SRCS = wuapi_tlb.idl + +RC_SRCS = rsrc.rc + @MAKE_DLL_RULES@ diff --git a/dlls/wuapi/rsrc.rc b/dlls/wuapi/rsrc.rc new file mode 100644 index 0000000..9ddce3b --- /dev/null +++ b/dlls/wuapi/rsrc.rc @@ -0,0 +1,22 @@ +/* + * Resources for wuapi + * + * Copyright 2010 Alexandre Julliard + * + * 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 + */ + +/* @makedep: wuapi_tlb.tlb */ +1 TYPELIB wuapi_tlb.tlb diff --git a/dlls/wuapi/wuapi_tlb.idl b/dlls/wuapi/wuapi_tlb.idl new file mode 100644 index 0000000..120e364 --- /dev/null +++ b/dlls/wuapi/wuapi_tlb.idl @@ -0,0 +1,21 @@ +/* + * Typelib for wuapi + * + * Copyright 2010 Alexandre Julliard + * + * 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 "wuapi.idl" diff --git a/include/wuapi.idl b/include/wuapi.idl index dd5da68..31ae49c 100644 --- a/include/wuapi.idl +++ b/include/wuapi.idl @@ -21,6 +21,15 @@ cpp_quote("DEFINE_GUID(CLSID_UpdateSession, 0x4cb43d7f,0x7eee,0x4906,0x86,0x98,0 import "oaidl.idl"; +[ + helpstring("WUAPI 2.0 Type Library"), + uuid(b596cc9f-56e5-419e-a622-e01bb457431e), + version(2.0) +] +library WUApiLib { + +importlib("stdole2.tlb"); + interface ICategoryCollection; interface IStringCollection; interface IUpdateCollection; @@ -1287,3 +1296,5 @@ interface IUpdateInstaller : IDispatch HRESULT RebootRequiredBeforeInstallation( [out, retval] VARIANT_BOOL *retval); } + +} /* WUApiLib */

1 0

Alexandre Julliard : include: Define more wuapi interfaces to avoid undefined forward declarations.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 500c47ccab3b51ead2031be68a75eebb5a44806f URL: http://source.winehq.org/git/wine.git/?a=commit;h=500c47ccab3b51ead2031be68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 20:27:24 2010 +0100 include: Define more wuapi interfaces to avoid undefined forward declarations. --- include/wuapi.idl | 952 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 941 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=500c47ccab3b51ead2031…

1 0

Alexandre Julliard : widl: Support encoding the DECIMAL type in typelibs.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: cb246ca7a7bb34c815321a49e3013bc7a35cdc3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb246ca7a7bb34c815321a49e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 00:05:28 2010 +0100 widl: Support encoding the DECIMAL type in typelibs. --- tools/widl/write_msft.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index d762445..f11de5c 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -849,6 +849,12 @@ static int encode_type( *alignment = 8; break; + case VT_DECIMAL: + *encoded_type = default_type; + *width = 16; + *alignment = 8; + break; + case VT_VOID: *encoded_type = 0x80000000 | (VT_EMPTY << 16) | vt; *width = 0;

1 0

Alexandre Julliard : widl: Signal an error when trying to output an undefined interface into a typelib .
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 8c78994866430c1e56212bba1e1c3ff3ce62e77d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c78994866430c1e56212bba1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 20:32:08 2010 +0100 widl: Signal an error when trying to output an undefined interface into a typelib. --- tools/widl/write_msft.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 309145f..d762445 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2014,6 +2014,12 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) if (-1 < interface->typelib_idx) return; + if (!interface->details.iface) + { + error( "interface %s is referenced but not defined\n", interface->name ); + return; + } + if (is_attr(interface->attrs, ATTR_DISPINTERFACE)) return add_dispinterface_typeinfo(typelib, interface);

1 0

Michael Stefaniuc : shlwapi: The Italian translation uses UTF-8 encoding.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 287253a5a7b2940eb48f286e52fb41db3db9f22a URL: http://source.winehq.org/git/wine.git/?a=commit;h=287253a5a7b2940eb48f286e5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 17:13:46 2010 +0100 shlwapi: The Italian translation uses UTF-8 encoding. --- dlls/shlwapi/shlwapi_It.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi_It.rc b/dlls/shlwapi/shlwapi_It.rc index 2e34aae..ebfcc78 100644 --- a/dlls/shlwapi/shlwapi_It.rc +++ b/dlls/shlwapi/shlwapi_It.rc @@ -20,6 +20,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDD_ERR_DIALOG DIALOG 0, 0, 220, 60

1 0

Alexander Morozov : crypt32: Implement CryptEncryptMessage.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 02ab124cd2c602571cf165d751ea96f71c51b605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ab124cd2c602571cf165d75… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Dec 8 14:51:42 2010 +0300 crypt32: Implement CryptEncryptMessage. --- dlls/crypt32/message.c | 57 ++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/message.c | 16 ----------- 2 files changed, 55 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index 51b874e..e5b6f2a 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -536,8 +536,61 @@ BOOL WINAPI CryptEncryptMessage(PCRYPT_ENCRYPT_MESSAGE_PARA pEncryptPara, const BYTE *pbToBeEncrypted, DWORD cbToBeEncrypted, BYTE *pbEncryptedBlob, DWORD *pcbEncryptedBlob) { - FIXME("(%p, %d, %p, %p, %d, %p, %p): stub\n", pEncryptPara, cRecipientCert, + BOOL ret = TRUE; + DWORD i; + PCERT_INFO *certInfo = NULL; + CMSG_ENVELOPED_ENCODE_INFO envelopedInfo; + HCRYPTMSG msg = 0; + + TRACE("(%p, %d, %p, %p, %d, %p, %p)\n", pEncryptPara, cRecipientCert, rgpRecipientCert, pbToBeEncrypted, cbToBeEncrypted, pbEncryptedBlob, pcbEncryptedBlob); - return FALSE; + + if (pEncryptPara->cbSize != sizeof(CRYPT_ENCRYPT_MESSAGE_PARA) || + GET_CMSG_ENCODING_TYPE(pEncryptPara->dwMsgEncodingType) != + PKCS_7_ASN_ENCODING) + { + *pcbEncryptedBlob = 0; + SetLastError(E_INVALIDARG); + return FALSE; + } + + memset(&envelopedInfo, 0, sizeof(envelopedInfo)); + envelopedInfo.cbSize = sizeof(envelopedInfo); + envelopedInfo.hCryptProv = pEncryptPara->hCryptProv; + envelopedInfo.ContentEncryptionAlgorithm = + pEncryptPara->ContentEncryptionAlgorithm; + envelopedInfo.pvEncryptionAuxInfo = pEncryptPara->pvEncryptionAuxInfo; + + if (cRecipientCert) + { + certInfo = CryptMemAlloc(sizeof(PCERT_INFO) * cRecipientCert); + if (certInfo) + { + for (i = 0; i < cRecipientCert; ++i) + certInfo[i] = rgpRecipientCert[i]->pCertInfo; + envelopedInfo.cRecipients = cRecipientCert; + envelopedInfo.rgpRecipientCert = certInfo; + } + else + ret = FALSE; + } + + if (ret) + msg = CryptMsgOpenToEncode(pEncryptPara->dwMsgEncodingType, 0, + CMSG_ENVELOPED, &envelopedInfo, NULL, NULL); + if (msg) + { + ret = CryptMsgUpdate(msg, pbToBeEncrypted, cbToBeEncrypted, TRUE); + if (ret) + ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, pbEncryptedBlob, + pcbEncryptedBlob); + CryptMsgClose(msg); + } + else + ret = FALSE; + + CryptMemFree(certInfo); + if (!ret) *pcbEncryptedBlob = 0; + return ret; } diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index 69049b1..37ae6fd 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -1225,10 +1225,8 @@ static void test_encrypt_message(void) encryptedBlobSize = 255; ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, NULL, &encryptedBlobSize); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); - todo_wine ok(!encryptedBlobSize, "unexpected size %d\n", encryptedBlobSize); para.cbSize = sizeof(para); para.dwMsgEncodingType = X509_ASN_ENCODING; @@ -1236,23 +1234,19 @@ static void test_encrypt_message(void) encryptedBlobSize = 255; ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, NULL, &encryptedBlobSize); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); - todo_wine ok(!encryptedBlobSize, "unexpected size %d\n", encryptedBlobSize); para.dwMsgEncodingType = PKCS_7_ASN_ENCODING; SetLastError(0xdeadbeef); encryptedBlobSize = 255; ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, NULL, &encryptedBlobSize); - todo_wine ok(!ret && (GetLastError() == CRYPT_E_UNKNOWN_ALGO || GetLastError() == E_INVALIDARG), /* Win9x */ "expected CRYPT_E_UNKNOWN_ALGO or E_INVALIDARG, got %08x\n", GetLastError()); - todo_wine ok(!encryptedBlobSize, "unexpected size %d\n", encryptedBlobSize); para.hCryptProv = hCryptProv; @@ -1262,7 +1256,6 @@ static void test_encrypt_message(void) encryptedBlobSize = 0; ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, NULL, &encryptedBlobSize); - todo_wine ok(ret || broken(!ret) /* Win9x */, "CryptEncryptMessage failed: %08x\n", GetLastError()); @@ -1274,9 +1267,7 @@ static void test_encrypt_message(void) SetLastError(0xdeadbeef); ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, encryptedBlob, &encryptedBlobSize); - todo_wine ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); - todo_wine ok(encryptedBlobSize == sizeof(encryptedMessage), "unexpected size of encrypted blob %d\n", encryptedBlobSize); ok(!memcmp(encryptedBlob, encryptedMessage, encryptedBlobSize), @@ -1289,7 +1280,6 @@ static void test_encrypt_message(void) encryptedBlobSize = 0; ret = CryptEncryptMessage(&para, 2, certs, NULL, 0, NULL, &encryptedBlobSize); - todo_wine ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); if (ret) { @@ -1299,7 +1289,6 @@ static void test_encrypt_message(void) SetLastError(0xdeadbeef); ret = CryptEncryptMessage(&para, 2, certs, NULL, 0, encryptedBlob, &encryptedBlobSize); - todo_wine ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); CryptMemFree(encryptedBlob); } @@ -1309,7 +1298,6 @@ static void test_encrypt_message(void) encryptedBlobSize = 0; ret = CryptEncryptMessage(&para, 0, NULL, blob, sizeof(blob), NULL, &encryptedBlobSize); - todo_wine ok(ret || broken(!ret) /* Win9x */, "CryptEncryptMessage failed: %08x\n", GetLastError()); @@ -1321,13 +1309,11 @@ static void test_encrypt_message(void) SetLastError(0xdeadbeef); ret = CryptEncryptMessage(&para, 0, NULL, blob, sizeof(blob), encryptedBlob, &encryptedBlobSize); - todo_wine ok(ret || broken(!ret && GetLastError() == NTE_PERM), /* some NT4 */ "CryptEncryptMessage failed: %08x\n", GetLastError()); if (ret) { - todo_wine ok(encryptedBlobSize == 55, "unexpected size of encrypted blob %d\n", encryptedBlobSize); } @@ -1339,7 +1325,6 @@ static void test_encrypt_message(void) encryptedBlobSize = 0; ret = CryptEncryptMessage(&para, 2, certs, blob, sizeof(blob), NULL, &encryptedBlobSize); - todo_wine ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); if (ret) { @@ -1349,7 +1334,6 @@ static void test_encrypt_message(void) SetLastError(0xdeadbeef); ret = CryptEncryptMessage(&para, 2, certs, blob, sizeof(blob), encryptedBlob, &encryptedBlobSize); - todo_wine ok(ret || broken(!ret), /* some Win95 and some NT4 */ "CryptEncryptMessage failed: %08x\n", GetLastError());

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2010