September 2008 - Wine-commits

Alexandre Julliard : widl: Add support for finally function in proxy methods.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 5ce606e834a7f0d1f5cab7a3d9b7c7c411e7be3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce606e834a7f0d1f5cab7a3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 30 11:25:22 2008 +0200 widl: Add support for finally function in proxy methods. --- tools/widl/proxy.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 40 insertions(+), 4 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index c932b34..8f1618e 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -115,6 +115,9 @@ static void init_proxy(const statement_list_t *stmts) print_proxy( "#undef RpcTryExcept\n"); print_proxy( "#undef RpcExcept\n"); print_proxy( "#undef RpcEndExcept\n"); + print_proxy( "#undef RpcTryFinally\n"); + print_proxy( "#undef RpcFinally\n"); + print_proxy( "#undef RpcEndFinally\n"); print_proxy( "#undef RpcExceptionCode\n"); print_proxy( "\n"); print_proxy( "struct __proxy_frame\n"); @@ -123,8 +126,15 @@ static void init_proxy(const statement_list_t *stmts) print_proxy( " sigjmp_buf jmp;\n"); print_proxy( " DWORD code;\n"); print_proxy( " MIDL_STUB_MESSAGE *stub;\n"); + print_proxy( " void *this;\n"); + print_proxy( " int fullptr;\n"); print_proxy( "};\n"); print_proxy( "\n"); + print_proxy("static void __proxy_finally_handler( struct __proxy_frame *frame )\n"); + print_proxy( "{\n"); + print_proxy( " if (frame->fullptr) NdrFullPointerXlatFree( frame->stub->FullPtrXlatTables );\n"); + print_proxy( " if (frame->this) NdrProxyFreeBuffer( frame->this, frame->stub );\n" ); + print_proxy( "}\n\n"); print_proxy( "static DWORD __proxy_exception_handler( EXCEPTION_RECORD *record,\n"); print_proxy( " EXCEPTION_REGISTRATION_RECORD *frame,\n"); print_proxy( " CONTEXT *context,\n"); @@ -133,12 +143,17 @@ static void init_proxy(const statement_list_t *stmts) print_proxy( " struct __proxy_frame *proxy_frame = (struct __proxy_frame *)frame;\n"); print_proxy( "\n"); print_proxy( " if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL))\n"); + print_proxy( " {\n" ); + print_proxy( " if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))\n"); + print_proxy( " __proxy_finally_handler( proxy_frame );\n"); print_proxy( " return ExceptionContinueSearch;\n"); + print_proxy( " }\n" ); print_proxy( " if (proxy_frame->stub->dwStubPhase == PROXY_SENDRECEIVE)\n"); print_proxy( " return ExceptionContinueSearch;\n"); print_proxy( "\n"); print_proxy( " proxy_frame->code = record->ExceptionCode;\n"); print_proxy( " __wine_rtl_unwind( frame, record );\n"); + print_proxy( " __proxy_finally_handler( proxy_frame );\n"); print_proxy( " __wine_pop_frame( frame );\n"); print_proxy( " siglongjmp( proxy_frame->jmp, 1 );\n"); print_proxy( "}\n"); @@ -166,6 +181,27 @@ static void init_proxy(const statement_list_t *stmts) print_proxy( "\n"); print_proxy( "#define RpcExceptionCode() (__proxy_frame.code)\n"); print_proxy( "\n"); + print_proxy( "#define RpcTryFinallyProxy(ptr) \\\n"); + print_proxy(" __proxy_frame.this = This; \\\n"); + print_proxy(" __proxy_frame.fullptr = ptr;\n"); + print_proxy( "\n"); + print_proxy( "#define RpcFinallyProxy \\\n"); + print_proxy(" __proxy_frame.this = 0; \\\n"); + print_proxy(" __proxy_frame.fullptr = 0;\n"); + print_proxy( "\n"); + print_proxy( "#define RpcTryFinallyStub\n"); + print_proxy( "\n"); + print_proxy( "#define RpcFinallyStub\n"); + print_proxy( "\n"); + print_proxy( "#define RpcEndFinally\n"); + print_proxy( "\n"); + print_proxy( "#else /* USE_COMPILER_EXCEPTIONS */\n"); + print_proxy( "\n"); + print_proxy( "#define RpcTryFinallyProxy(ptr) RpcTryFinally\n"); + print_proxy( "#define RpcTryFinallyStub RpcTryFinally\n"); + print_proxy( "#define RpcFinallyProxy RpcFinally\n"); + print_proxy( "#define RpcFinallyStub RpcFinally\n"); + print_proxy( "\n"); print_proxy( "#endif /* USE_COMPILER_EXCEPTIONS */\n"); print_proxy( "\n"); write_formatstringsdecl(proxy, indent, stmts, need_proxy); @@ -355,7 +391,7 @@ static void gen_proxy(type_t *iface, const func_t *cur, int idx, print_proxy( "NdrProxyInitialize(This, &_RpcMessage, &_StubMsg, &Object_StubDesc, %d);\n", idx); proxy_check_pointers( cur->args ); - print_proxy( "RpcTryFinally\n" ); + print_proxy( "RpcTryFinallyProxy(%d)\n", has_full_pointer ); print_proxy( "{\n" ); indent++; @@ -389,7 +425,7 @@ static void gen_proxy(type_t *iface, const func_t *cur, int idx, indent--; print_proxy( "}\n"); - print_proxy( "RpcFinally\n" ); + print_proxy( "RpcFinallyProxy\n" ); print_proxy( "{\n" ); indent++; if (has_full_pointer) @@ -449,7 +485,7 @@ static void gen_stub(type_t *iface, const func_t *cur, const char *cas, write_parameters_init(proxy, indent, cur); - print_proxy("RpcTryFinally\n"); + print_proxy("RpcTryFinallyStub\n"); print_proxy("{\n"); indent++; if (has_full_pointer) @@ -499,7 +535,7 @@ static void gen_stub(type_t *iface, const func_t *cur, const char *cas, indent--; print_proxy("}\n"); - print_proxy("RpcFinally\n"); + print_proxy("RpcFinallyStub\n"); print_proxy("{\n"); write_remoting_arguments(proxy, indent+1, cur, PASS_OUT, PHASE_FREE);

1 0

Vladimir Pankratov : appwiz.cpl: Add Russian translation.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 854d35e1a04ac192b33c4826aa843c27269b3bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=854d35e1a04ac192b33c4826a… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Aug 29 06:55:37 2008 +0000 appwiz.cpl: Add Russian translation. --- dlls/appwiz.cpl/Ru.rc | 79 +++++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/appwiz.rc | 1 + 2 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Ru.rc b/dlls/appwiz.cpl/Ru.rc new file mode 100644 index 0000000..cfb77c0 --- /dev/null +++ b/dlls/appwiz.cpl/Ru.rc @@ -0,0 +1,79 @@ +/* +* Add/Remove Programs Russian resources +* +* Copyright 2008 Vladimir Pankratov +* +* 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 +* +*/ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_CPL_TITLE, "��/�� " + IDS_CPL_DESC, "�� , �� ." + IDS_TAB1_TITLE, "��" + + IDS_UNINSTALL_FAILED, "�� , '%s'. �� ?" + IDS_NOT_SPECIFIED, "��" + + IDS_COLUMN_NAME, "��" + IDS_COLUMN_PUBLISHER, "��" + IDS_COLUMN_VERSION, "��" +} + +/* TODO: it's best to use the constant WC_LISTVIEW instead of SysListView32 directly, but the Wine resource compiler doesn't seem to like that... */ + +IDD_MAIN DIALOG 0, 0, 320, 235 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "��/��" +FONT 8, "MS Sans Serif" +{ +CONTROL "�� CD-ROM, �� , �� .", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "��&��...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "&�� . �� , �� /��.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 55, 270, 32 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "��/&��...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 216, 198, 94, 14 + CONTROL "&�� ...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 116, 198, 94, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "MS Sans Serif" +{ + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "�� %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 23 + CONTROL "��:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 33, 60, 8 + CONTROL "��:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 43, 60, 8 + CONTROL "�� :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 53, 60, 8 + CONTROL "��:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 63, 64, 8 + CONTROL "��:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 73, 68, 8 + CONTROL "�� 'Readme':", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 83, 60, 8 + CONTROL "��:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 93, 60, 8 + CONTROL "��:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 103, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 33, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 43, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 53, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 63, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 73, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 83, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 93, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 103, 136, 8 +} diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index c86f9a8..6565d98 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -29,6 +29,7 @@ #include "Fr.rc" #include "Nl.rc" #include "No.rc" +#include "Ru.rc" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0

Juan Lang : crypt32: Add tests for CertCreateCTLContext.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: e6bcb4581f5ee0b752f8cbfbc3b4295a45c9a9d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6bcb4581f5ee0b752f8cbfbc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 29 07:27:11 2008 -0700 crypt32: Add tests for CertCreateCTLContext. --- dlls/crypt32/tests/Makefile.in | 1 + dlls/crypt32/tests/ctl.c | 187 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 188 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6bcb4581f5ee0b752f8c…

1 0

Juan Lang : crypt32: Implement CertCreateCTLContext and CertFreeCTLContext.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 429b1e1b41f0d5b849c7ddc2c20712d53e47c8dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=429b1e1b41f0d5b849c7ddc2c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 29 07:29:00 2008 -0700 crypt32: Implement CertCreateCTLContext and CertFreeCTLContext. --- dlls/crypt32/Makefile.in | 1 + dlls/crypt32/ctl.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/store.c | 14 ---- dlls/crypt32/tests/ctl.c | 8 -- 4 files changed, 178 insertions(+), 22 deletions(-) diff --git a/dlls/crypt32/Makefile.in b/dlls/crypt32/Makefile.in index 16fbd5e..10ffda9 100644 --- a/dlls/crypt32/Makefile.in +++ b/dlls/crypt32/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ collectionstore.c \ context.c \ crl.c \ + ctl.c \ decode.c \ encode.c \ filestore.c \ diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c new file mode 100644 index 0000000..728d008 --- /dev/null +++ b/dlls/crypt32/ctl.c @@ -0,0 +1,177 @@ +/* + * Copyright 2008 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 <assert.h> +#include <stdarg.h> + +#define NONAMELESSUNION +#include "windef.h" +#include "winbase.h" +#include "wincrypt.h" +#include "wine/debug.h" +#include "crypt32_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(crypt); + +PCCTL_CONTEXT WINAPI CertCreateCTLContext(DWORD dwMsgAndCertEncodingType, + const BYTE *pbCtlEncoded, DWORD cbCtlEncoded) +{ + PCTL_CONTEXT ctl = NULL; + HCRYPTMSG msg; + BOOL ret; + BYTE *content = NULL; + DWORD contentSize = 0, size; + PCTL_INFO ctlInfo = NULL; + + TRACE("(%08x, %p, %d)\n", dwMsgAndCertEncodingType, pbCtlEncoded, + cbCtlEncoded); + + if (GET_CERT_ENCODING_TYPE(dwMsgAndCertEncodingType) != X509_ASN_ENCODING) + { + SetLastError(E_INVALIDARG); + return NULL; + } + if (!pbCtlEncoded || !cbCtlEncoded) + { + SetLastError(ERROR_INVALID_DATA); + return NULL; + } + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING | X509_ASN_ENCODING, 0, 0, + 0, NULL, NULL); + if (!msg) + return NULL; + ret = CryptMsgUpdate(msg, pbCtlEncoded, cbCtlEncoded, TRUE); + if (!ret) + { + SetLastError(ERROR_INVALID_DATA); + goto end; + } + /* Check that it's really a CTL */ + ret = CryptMsgGetParam(msg, CMSG_INNER_CONTENT_TYPE_PARAM, 0, NULL, &size); + if (ret) + { + char *innerContent = CryptMemAlloc(size); + + if (innerContent) + { + ret = CryptMsgGetParam(msg, CMSG_INNER_CONTENT_TYPE_PARAM, 0, + innerContent, &size); + if (ret) + { + if (strcmp(innerContent, szOID_CTL)) + { + SetLastError(ERROR_INVALID_DATA); + ret = FALSE; + } + } + CryptMemFree(innerContent); + } + else + { + SetLastError(ERROR_OUTOFMEMORY); + ret = FALSE; + } + } + if (!ret) + goto end; + ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, NULL, &contentSize); + if (!ret) + goto end; + content = CryptMemAlloc(contentSize); + if (content) + { + ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, content, + &contentSize); + if (ret) + { + ret = CryptDecodeObjectEx(dwMsgAndCertEncodingType, PKCS_CTL, + content, contentSize, CRYPT_DECODE_ALLOC_FLAG, NULL, + (BYTE *)&ctlInfo, &size); + if (ret) + { + ctl = (PCTL_CONTEXT)Context_CreateDataContext( + sizeof(CTL_CONTEXT)); + if (ctl) + { + BYTE *data = CryptMemAlloc(cbCtlEncoded); + + if (data) + { + memcpy(data, pbCtlEncoded, cbCtlEncoded); + ctl->dwMsgAndCertEncodingType = + X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; + ctl->pbCtlEncoded = data; + ctl->cbCtlEncoded = cbCtlEncoded; + ctl->pCtlInfo = ctlInfo; + ctl->hCertStore = NULL; + ctl->hCryptMsg = msg; + ctl->pbCtlContext = content; + ctl->cbCtlContext = contentSize; + } + else + { + SetLastError(ERROR_OUTOFMEMORY); + ret = FALSE; + } + } + else + { + SetLastError(ERROR_OUTOFMEMORY); + ret = FALSE; + } + } + } + } + else + { + SetLastError(ERROR_OUTOFMEMORY); + ret = FALSE; + } + +end: + if (!ret) + { + CryptMemFree(ctl); + ctl = NULL; + LocalFree(ctlInfo); + CryptMemFree(content); + CryptMsgClose(msg); + } + return (PCCTL_CONTEXT)ctl; +} + +static void CTLDataContext_Free(void *context) +{ + PCTL_CONTEXT ctlContext = (PCTL_CONTEXT)context; + + CryptMsgClose(ctlContext->hCryptMsg); + CryptMemFree(ctlContext->pbCtlEncoded); + CryptMemFree(ctlContext->pbCtlContext); + LocalFree(ctlContext->pCtlInfo); +} + +BOOL WINAPI CertFreeCTLContext(PCCTL_CONTEXT pCTLContext) +{ + TRACE("(%p)\n", pCTLContext); + + if (pCTLContext) + Context_Release((void *)pCTLContext, sizeof(CTL_CONTEXT), + CTLDataContext_Free); + return TRUE; +} diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 9534e5c..9ce6be4 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1043,14 +1043,6 @@ PCCRL_CONTEXT WINAPI CertEnumCRLsInStore(HCERTSTORE hCertStore, return ret; } -PCCTL_CONTEXT WINAPI CertCreateCTLContext(DWORD dwCertEncodingType, - const BYTE* pbCtlEncoded, DWORD cbCtlEncoded) -{ - FIXME("(%08x, %p, %08x): stub\n", dwCertEncodingType, pbCtlEncoded, - cbCtlEncoded); - return NULL; -} - BOOL WINAPI CertAddEncodedCTLToStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType, const BYTE *pbCtlEncoded, DWORD cbCtlEncoded, DWORD dwAddDisposition, PCCTL_CONTEXT *ppCtlContext) @@ -1076,12 +1068,6 @@ PCCTL_CONTEXT WINAPI CertDuplicateCTLContext(PCCTL_CONTEXT pCtlContext) return pCtlContext; } -BOOL WINAPI CertFreeCTLContext(PCCTL_CONTEXT pCtlContext) -{ - FIXME("(%p): stub\n", pCtlContext ); - return TRUE; -} - BOOL WINAPI CertDeleteCTLFromStore(PCCTL_CONTEXT pCtlContext) { FIXME("(%p): stub\n", pCtlContext); diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index 215c057..9d4eee4 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -113,19 +113,16 @@ static void testCreateCTL(void) SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(0, NULL, 0); - todo_wine ok(!ctl && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, NULL, 0); - todo_wine ok(!ctl && GetLastError() == ERROR_INVALID_DATA, "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError()); /* An empty CTL can't be created.. */ SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, emptyCTL, sizeof(emptyCTL)); - todo_wine ok(!ctl && GetLastError() == ERROR_INVALID_DATA, "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError()); @@ -134,21 +131,18 @@ static void testCreateCTL(void) */ SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, signedCTL, sizeof(signedCTL)); - todo_wine ok(!ctl && GetLastError() == ERROR_INVALID_DATA, "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError()); SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, ctlWithOneEntry, sizeof(ctlWithOneEntry)); - todo_wine ok(!ctl && GetLastError() == ERROR_INVALID_DATA, "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError()); SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, signedCTLWithSubjectAlgorithm, sizeof(signedCTLWithSubjectAlgorithm)); - todo_wine ok(!ctl && GetLastError() == ERROR_INVALID_DATA, "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError()); @@ -156,7 +150,6 @@ static void testCreateCTL(void) */ ctl = CertCreateCTLContext(X509_ASN_ENCODING, signedCTLWithCTLInnerContent, sizeof(signedCTLWithCTLInnerContent)); - todo_wine ok(ctl != NULL, "CertCreateCTLContext failed: %08x\n", GetLastError()); if (ctl) { @@ -175,7 +168,6 @@ static void testCreateCTL(void) ctl = CertCreateCTLContext(X509_ASN_ENCODING, signedCTLWithCTLInnerContentAndBadSig, sizeof(signedCTLWithCTLInnerContentAndBadSig)); - todo_wine ok(ctl != NULL, "CertCreateCTLContext failed: %08x\n", GetLastError()); if (ctl) CertFreeCTLContext(ctl);

1 0

Alexandre Julliard : widl: Replace write_name() by get_name() to make the code more readable.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 29e20b869cbc3bbed8373b2d6d2d972f09c9e501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29e20b869cbc3bbed8373b2d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 30 11:15:04 2008 +0200 widl: Replace write_name() by get_name() to make the code more readable. --- tools/widl/client.c | 3 +- tools/widl/header.c | 62 +++++++++++++++++-------------------------------- tools/widl/header.h | 2 - tools/widl/proxy.c | 29 +++++------------------ tools/widl/server.c | 21 +++------------- tools/widl/typegen.c | 9 ++----- 6 files changed, 36 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29e20b869cbc3bbed8373…

1 0