November 2010 - Wine-commits

Austin English : winemine: Add a manpage.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 82415fff990b9fe0f2593adc62d5a499a835073e URL: http://source.winehq.org/git/wine.git/?a=commit;h=82415fff990b9fe0f2593adc6… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 24 05:48:13 2010 -0800 winemine: Add a manpage. --- .gitignore | 1 + programs/winemine/Makefile.in | 12 ++++++++++++ programs/winemine/winemine.man.in | 11 +++++++++++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 7375ae6..1f4999a 100644 --- a/.gitignore +++ b/.gitignore @@ -273,6 +273,7 @@ programs/winedbg/dbg.tab.c programs/winedbg/dbg.tab.h programs/winedbg/debug.yy.c programs/winedbg/winedbg.man +programs/winemine/winemine.man programs/winetest/*_test.exe programs/winetest/*_test.rc programs/winetest/build.nfo diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in index 4d5c5d1..33e9a19 100644 --- a/programs/winemine/Makefile.in +++ b/programs/winemine/Makefile.in @@ -33,6 +33,18 @@ RC_SRCS = \ Zh.rc \ rsrc.rc +MANPAGES = winemine.man + SVG_SRCS = winemine.svg @MAKE_PROG_RULES@ + +all: $(MANPAGES) + +install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) + $(INSTALL_DATA) winemine.man $(DESTDIR)$(mandir)/man$(prog_manext)/winemine.$(prog_manext) + +(a)WOW64_DISABLE@ install install-lib:: install-man-pages + +uninstall:: + $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/winemine.$(prog_manext) diff --git a/programs/winemine/winemine.man.in b/programs/winemine/winemine.man.in new file mode 100644 index 0000000..004a53d --- /dev/null +++ b/programs/winemine/winemine.man.in @@ -0,0 +1,11 @@ +.TH WINEMINE 1 "November 2010" "@PACKAGE_STRING@" "Wine Programs" +.SH NAME +winemine \- Wine Minesweeper game +.SH SYNOPSIS +.BR winemine +.SH DESCRIPTION +.B winemine +is the Wine Minesweeper game. The object of the game is to try to find all the hidden mines by +uncovering the tiles to see how many mines each tile is adjacent to, without uncovering a mine. +.SH "SEE ALSO" +.BR wine(1)

1 0

Gerald Pfeifer : ntdll/tests: Remove unused variable from test_query_volume_information_file.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 8c7164603f0df6d8b0d34be95bc19e7746049115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c7164603f0df6d8b0d34be95… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Nov 24 00:43:24 2010 +0100 ntdll/tests: Remove unused variable from test_query_volume_information_file. --- dlls/ntdll/tests/file.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 1b73dd9..285d9c5 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1468,11 +1468,10 @@ static void test_query_volume_information_file(void) OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; UNICODE_STRING nameW; - UINT len; FILE_FS_VOLUME_INFORMATION *ffvi; BYTE buf[sizeof(FILE_FS_VOLUME_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; - len = GetWindowsDirectoryW( path, MAX_PATH ); + GetWindowsDirectoryW( path, MAX_PATH ); pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); attr.Length = sizeof(attr); attr.RootDirectory = 0;

1 0

Paul Vriens : advapi32/tests: Add a test for driver services.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 10df397871b36d2913d5cb19d7813c4905bf2152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10df397871b36d2913d5cb19d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 24 10:00:24 2010 +0100 advapi32/tests: Add a test for driver services. --- dlls/advapi32/tests/service.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 5a4fabd..48d9386 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -335,6 +335,13 @@ static void test_create_delete_svc(void) ok(!svc_handle1, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + /* Test if ServiceType can be a combined one for drivers */ + SetLastError(0xdeadbeef); + svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, 0, SERVICE_KERNEL_DRIVER | SERVICE_FILE_SYSTEM_DRIVER, + SERVICE_BOOT_START, 0, pathname, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle1, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + /* The service already exists (check first, just in case) */ svc_handle1 = OpenServiceA(scm_handle, spooler, GENERIC_READ); if (svc_handle1)

1 0

Damjan Jovanovic : atl: Improve IRegistrar dword parsing.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: d2a221d2b5d915c2925568f14a97c7566fbca013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a221d2b5d915c2925568f14… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 24 11:09:05 2010 +0200 atl: Improve IRegistrar dword parsing. --- dlls/atl/registrar.c | 12 ++--- dlls/atl/tests/Makefile.in | 3 +- dlls/atl/tests/registrar.c | 120 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 9 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index eb33b3b..9a1154a 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -285,15 +285,11 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO } break; case 'd': { - WCHAR *end; DWORD dw; - if(*iter == '0' && iter[1] == 'x') { - iter += 2; - dw = strtolW(iter, &end, 16); - }else { - dw = strtolW(iter, &end, 10); - } - iter = end; + hres = get_word(&iter, buf); + if(FAILED(hres)) + break; + dw = atoiW(buf->str); lres = RegSetValueExW(hkey, name.len ? name.str : NULL, 0, REG_DWORD, (PBYTE)&dw, sizeof(dw)); if(lres != ERROR_SUCCESS) { diff --git a/dlls/atl/tests/Makefile.in b/dlls/atl/tests/Makefile.in index 5cb209e..b397c85 100644 --- a/dlls/atl/tests/Makefile.in +++ b/dlls/atl/tests/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = uuid atl oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 C_SRCS = \ atl_ax.c \ - module.c + module.c \ + registrar.c @MAKE_TEST_RULES@ diff --git a/dlls/atl/tests/registrar.c b/dlls/atl/tests/registrar.c new file mode 100644 index 0000000..cd2b755 --- /dev/null +++ b/dlls/atl/tests/registrar.c @@ -0,0 +1,120 @@ +/* + * ATL test program + * + * Copyright 2010 Damjan Jovanovic + * + * 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 <stdio.h> + +#define COBJMACROS + +#include <wine/test.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <wingdi.h> +#include <winnls.h> +#include <winerror.h> +#include <winnt.h> +#include <wtypes.h> +#include <olectl.h> +#include <ocidl.h> +#include <initguid.h> +#include <atliface.h> + +static const char textA[] = +"HKCR \n" +"{ \n" +" ForceRemove eebf73c4-50fd-478f-bbcf-db212221227a \n" +" { \n" +" val 'string' = s 'string' \n" +" val 'dword_quoted_dec' = d '1' \n" +" val 'dword_unquoted_dec' = d 1 \n" +" val 'dword_quoted_hex' = d '0xA' \n" +" val 'dword_unquoted_hex' = d 0xA \n" +" } \n" +"}"; + +static void test_registrar(void) +{ + IRegistrar *registrar = NULL; + HRESULT hr; + INT count; + WCHAR *textW = NULL; + + hr = CoCreateInstance(&CLSID_Registrar, NULL, CLSCTX_INPROC_SERVER, &IID_IRegistrar, (void**)&registrar); + if (FAILED(hr)) + { + skip("creating IRegistrar failed, hr = 0x%08X\n", hr); + return; + } + + count = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0); + textW = HeapAlloc(GetProcessHeap(), 0, count * sizeof(WCHAR)); + if (textW) + { + DWORD dword; + DWORD size; + LONG lret; + HKEY key; + + MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, count); + hr = IRegistrar_StringRegister(registrar, textW); + ok(SUCCEEDED(hr), "IRegistar_StringRegister failed, hr = 0x%08X\n", hr); + + lret = RegOpenKeyA(HKEY_CLASSES_ROOT, "eebf73c4-50fd-478f-bbcf-db212221227a", &key); + ok(lret == ERROR_SUCCESS, "error %d opening registry key\n", lret); + + size = sizeof(dword); + lret = RegQueryValueExA(key, "dword_unquoted_hex", NULL, NULL, (BYTE*)&dword, &size); + ok(lret == ERROR_SUCCESS, "RegQueryValueExA failed, error %d\n", lret); + ok(dword != 0xA, "unquoted hex is not supposed to be preserved\n"); + + size = sizeof(dword); + lret = RegQueryValueExA(key, "dword_quoted_hex", NULL, NULL, (BYTE*)&dword, &size); + ok(lret == ERROR_SUCCESS, "RegQueryValueExA failed, error %d\n", lret); + ok(dword != 0xA, "quoted hex is not supposed to be preserved\n"); + + size = sizeof(dword); + lret = RegQueryValueExA(key, "dword_unquoted_dec", NULL, NULL, (BYTE*)&dword, &size); + ok(lret == ERROR_SUCCESS, "RegQueryValueExA failed, error %d\n", lret); + ok(dword == 1, "unquoted dec is not supposed to be %d\n", dword); + + size = sizeof(dword); + lret = RegQueryValueExA(key, "dword_quoted_dec", NULL, NULL, (BYTE*)&dword, &size); + ok(lret == ERROR_SUCCESS, "RegQueryValueExA failed, error %d\n", lret); + ok(dword == 1, "quoted dec is not supposed to be %d\n", dword); + + hr = IRegistrar_StringUnregister(registrar, textW); + ok(SUCCEEDED(hr), "IRegistar_StringUnregister failed, hr = 0x%08X\n", hr); + RegCloseKey(key); + } + else + skip("allocating memory failed\n"); + + IRegistrar_Release(registrar); +} + +START_TEST(registrar) +{ + CoInitialize(NULL); + + test_registrar(); + + CoUninitialize(); +}

1 0

Damjan Jovanovic : atl: Add support for binary values in IRegistrar.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: cd4b9c11274640c3d7ee03ff9de9e4895669b884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd4b9c11274640c3d7ee03ff9… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 24 11:10:13 2010 +0200 atl: Add support for binary values in IRegistrar. --- dlls/atl/registrar.c | 35 +++++++++++++++++++++++++++++++++++ dlls/atl/tests/registrar.c | 17 +++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 9a1154a..99dfe73 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -299,6 +299,41 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO } break; } + case 'b': { + BYTE *bytes; + DWORD count; + DWORD i; + hres = get_word(&iter, buf); + if(FAILED(hres)) + break; + count = (lstrlenW(buf->str) + 1) / 2; + bytes = HeapAlloc(GetProcessHeap(), 0, count); + if(bytes == NULL) { + hres = E_OUTOFMEMORY; + break; + } + for(i = 0; i < count && buf->str[2*i]; i++) { + WCHAR digits[3]; + if(!isxdigitW(buf->str[2*i]) || !isxdigitW(buf->str[2*i + 1])) { + hres = E_FAIL; + break; + } + digits[0] = buf->str[2*i]; + digits[1] = buf->str[2*i + 1]; + digits[2] = 0; + bytes[i] = (BYTE) strtoulW(digits, NULL, 16); + } + if(SUCCEEDED(hres)) { + lres = RegSetValueExW(hkey, name.len ? name.str : NULL, 0, REG_BINARY, + bytes, count); + if(lres != ERROR_SUCCESS) { + WARN("Could not set value of key: 0x%08x\n", lres); + hres = HRESULT_FROM_WIN32(lres); + } + } + HeapFree(GetProcessHeap(), 0, bytes); + break; + } default: WARN("Wrong resource type: %s\n", debugstr_w(buf->str)); hres = DISP_E_EXCEPTION; diff --git a/dlls/atl/tests/registrar.c b/dlls/atl/tests/registrar.c index cd2b755..422608b 100644 --- a/dlls/atl/tests/registrar.c +++ b/dlls/atl/tests/registrar.c @@ -47,6 +47,8 @@ static const char textA[] = " val 'dword_unquoted_dec' = d 1 \n" " val 'dword_quoted_hex' = d '0xA' \n" " val 'dword_unquoted_hex' = d 0xA \n" +" val 'binary_quoted' = b 'deadbeef' \n" +" val 'binary_unquoted' = b deadbeef \n" " } \n" "}"; @@ -72,6 +74,7 @@ static void test_registrar(void) DWORD size; LONG lret; HKEY key; + BYTE bytes[4]; MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, count); hr = IRegistrar_StringRegister(registrar, textW); @@ -100,6 +103,20 @@ static void test_registrar(void) ok(lret == ERROR_SUCCESS, "RegQueryValueExA failed, error %d\n", lret); ok(dword == 1, "quoted dec is not supposed to be %d\n", dword); + size = 4; + lret = RegQueryValueExA(key, "binary_quoted", NULL, NULL, bytes, &size); + ok(lret == ERROR_SUCCESS, "RegQueryValueA, failed, error %d\n", lret); + ok(bytes[0] = 0xde && bytes[1] == 0xad && bytes[2] == 0xbe && bytes[3] == 0xef, + "binary quoted value was not preserved (it's 0x%02X%02X%02X%02X)\n", + 0xff & bytes[0], 0xff & bytes[1], 0xff & bytes[2], 0xff & bytes[3]); + + size = 4; + lret = RegQueryValueExA(key, "binary_unquoted", NULL, NULL, bytes, &size); + ok(lret == ERROR_SUCCESS, "RegQueryValueA, failed, error %d\n", lret); + ok(bytes[0] = 0xde && bytes[1] == 0xad && bytes[2] == 0xbe && bytes[3] == 0xef, + "binary unquoted value was not preserved (it's 0x%02X%02X%02X%02X)\n", + 0xff & bytes[0], 0xff & bytes[1], 0xff & bytes[2], 0xff & bytes[3]); + hr = IRegistrar_StringUnregister(registrar, textW); ok(SUCCEEDED(hr), "IRegistar_StringUnregister failed, hr = 0x%08X\n", hr); RegCloseKey(key);

1 0

Alexandre Julliard : winecrt0: Add a generic mechanism for dll registration through IRegistrar.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 4d966be69c0375e31a277cc0a9cf4bf75092038f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d966be69c0375e31a277cc0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 24 13:13:28 2010 +0100 winecrt0: Add a generic mechanism for dll registration through IRegistrar. --- dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/register.c | 142 +++++++++++++++++++++++++++++++++++++++++++++ include/rpcproxy.h | 29 ++++++++- tools/wine.inf.in | 2 +- 4 files changed, 170 insertions(+), 4 deletions(-) diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index ca95c89..d85fd3c 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -12,6 +12,7 @@ C_SRCS = \ exe_wentry.c \ exe_wmain.c \ init.c \ + register.c \ stub.c @MAKE_IMPLIB_RULES@ diff --git a/dlls/winecrt0/register.c b/dlls/winecrt0/register.c new file mode 100644 index 0000000..b1e1d17 --- /dev/null +++ b/dlls/winecrt0/register.c @@ -0,0 +1,142 @@ +/* + * Support functions for Wine dll registrations + * + * Copyright (c) 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 "config.h" +#include <stdarg.h> + +#define COBJMACROS +#define ATL_INITGUID +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "objbase.h" +#include "rpcproxy.h" +#include "atliface.h" + +static const WCHAR ole32W[] = {'o','l','e','3','2','.','d','l','l',0}; +static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; +static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; +static const WCHAR clsidW[] = {'C','L','S','I','D','_','P','S','F','a','c','t','o','r','y','B','u','f','f','e','r',0}; + +struct reg_info +{ + IRegistrar *registrar; + const CLSID *clsid; + BOOL do_register; + BOOL uninit; + HRESULT result; +}; + +static HMODULE ole32; +static HRESULT (WINAPI *pCoInitialize)(LPVOID); +static void (WINAPI *pCoUninitialize)(void); +static HRESULT (WINAPI *pCoCreateInstance)(REFCLSID,LPUNKNOWN,DWORD,REFIID,LPVOID*); +static INT (WINAPI *pStringFromGUID2)(REFGUID,LPOLESTR,INT); + +static IRegistrar *create_registrar( HMODULE inst, struct reg_info *info ) +{ + if (!ole32) + { + if (!(ole32 = LoadLibraryW( ole32W )) || + !(pCoInitialize = (void *)GetProcAddress( ole32, "CoInitialize" )) || + !(pCoUninitialize = (void *)GetProcAddress( ole32, "CoUninitialize" )) || + !(pCoCreateInstance = (void *)GetProcAddress( ole32, "CoCreateInstance" )) || + !(pStringFromGUID2 = (void *)GetProcAddress( ole32, "StringFromGUID2" ))) + { + info->result = E_NOINTERFACE; + return NULL; + } + } + info->uninit = SUCCEEDED( pCoInitialize( NULL )); + + info->result = pCoCreateInstance( &CLSID_Registrar, NULL, CLSCTX_INPROC_SERVER, + &IID_IRegistrar, (void **)&info->registrar ); + if (SUCCEEDED( info->result )) + { + WCHAR str[MAX_PATH]; + + GetModuleFileNameW( inst, str, MAX_PATH ); + IRegistrar_AddReplacement( info->registrar, moduleW, str ); + if (info->clsid) + { + pStringFromGUID2( info->clsid, str, MAX_PATH ); + IRegistrar_AddReplacement( info->registrar, clsidW, str ); + } + } + return info->registrar; +} + +static BOOL CALLBACK register_resource( HMODULE module, LPCWSTR type, LPWSTR name, LONG_PTR arg ) +{ + struct reg_info *info = (struct reg_info *)arg; + WCHAR *buffer; + HRSRC rsrc = FindResourceW( module, name, type ); + char *str = LoadResource( module, rsrc ); + DWORD lenW, lenA = SizeofResource( module, rsrc ); + + if (!str) return FALSE; + if (!info->registrar && !create_registrar( module, info )) return FALSE; + lenW = MultiByteToWideChar( CP_UTF8, 0, str, lenA, NULL, 0 ) + 1; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) + { + info->result = E_OUTOFMEMORY; + return FALSE; + } + MultiByteToWideChar( CP_UTF8, 0, str, lenA, buffer, lenW ); + buffer[lenW - 1] = 0; + + if (info->do_register) + info->result = IRegistrar_StringRegister( info->registrar, buffer ); + else + info->result = IRegistrar_StringUnregister( info->registrar, buffer ); + + HeapFree( GetProcessHeap(), 0, buffer ); + return SUCCEEDED(info->result); +} + +HRESULT __wine_register_resources( HMODULE module, const CLSID *clsid ) +{ + struct reg_info info; + + info.registrar = NULL; + info.clsid = clsid; + info.do_register = TRUE; + info.uninit = FALSE; + info.result = S_OK; + EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info ); + if (info.registrar) IRegistrar_Release( info.registrar ); + if (info.uninit) pCoUninitialize(); + return info.result; +} + +HRESULT __wine_unregister_resources( HMODULE module, const CLSID *clsid ) +{ + struct reg_info info; + + info.registrar = NULL; + info.clsid = clsid; + info.do_register = FALSE; + info.uninit = FALSE; + info.result = S_OK; + EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info ); + if (info.registrar) IRegistrar_Release( info.registrar ); + if (info.uninit) pCoUninitialize(); + return info.result; +} diff --git a/include/rpcproxy.h b/include/rpcproxy.h index 76a8812..fe7eb3e 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -203,6 +203,9 @@ RPCRTAPI HRESULT RPC_ENTRY RPCRTAPI HRESULT RPC_ENTRY NdrDllUnregisterProxy( HMODULE hDll, const ProxyFileInfo **pProxyFileList, const CLSID *pclsid ); +HRESULT __wine_register_resources( HMODULE module, const CLSID *clsid ) DECLSPEC_HIDDEN; +HRESULT __wine_unregister_resources( HMODULE module, const CLSID *clsid ) DECLSPEC_HIDDEN; + #define CSTDSTUBBUFFERRELEASE(pFactory) \ ULONG WINAPI CStdStubBuffer_Release(IRpcStubBuffer *This) \ { return NdrCStdStubBuffer_Release(This, (IPSFactoryBuffer *)pFactory); } @@ -285,6 +288,26 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \ # define DLLCANUNLOADNOW_ENTRY DllCanUnloadNow #endif +#ifdef WINE_REGISTER_DLL + +#define WINE_DO_REGISTER_DLL(pfl, clsid) \ + HRESULT hr = NdrDllRegisterProxy( hProxyDll, (pfl), (clsid) ); \ + if (SUCCEEDED(hr)) hr = __wine_register_resources( hProxyDll, clsid ); \ + return hr + +#define WINE_DO_UNREGISTER_DLL(pfl, clsid) \ + HRESULT hr = __wine_unregister_resources( hProxyDll, clsid ); \ + if (SUCCEEDED(hr)) hr = NdrDllUnregisterProxy( hProxyDll, (pfl), (clsid) ); \ + return hr + +#else + +#define WINE_DO_REGISTER_DLL(pfl, clsid) return NdrDllRegisterProxy( hProxyDll, (pfl), (clsid) ) +#define WINE_DO_UNREGISTER_DLL(pfl, clsid) return NdrDllUnregisterProxy( hProxyDll, (pfl), (clsid) ) + +#endif + + #define DLLDATA_GETPROXYDLLINFO(pfl, rclsid) \ void RPC_ENTRY GetProxyDllInfo(const ProxyFileInfo ***ppProxyFileInfo, \ const CLSID **ppClsid) DECLSPEC_HIDDEN; \ @@ -329,16 +352,16 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \ HRESULT WINAPI DLLREGISTERSERVER_ENTRY(void) DECLSPEC_HIDDEN; \ HRESULT WINAPI DLLREGISTERSERVER_ENTRY(void) \ { \ - return NdrDllRegisterProxy(hProxyDll, (pfl), (factory_clsid)); \ + WINE_DO_REGISTER_DLL( (pfl), (factory_clsid) ); \ } \ \ HRESULT WINAPI DLLUNREGISTERSERVER_ENTRY(void) DECLSPEC_HIDDEN; \ HRESULT WINAPI DLLUNREGISTERSERVER_ENTRY(void) \ { \ - return NdrDllUnregisterProxy(hProxyDll, (pfl), (factory_clsid)); \ + WINE_DO_UNREGISTER_DLL( (pfl), (factory_clsid) ); \ } -#ifdef REGISTER_PROXY_DLL +#if defined(REGISTER_PROXY_DLL) || defined(WINE_REGISTER_DLL) # define DLLREGISTRY_ROUTINES(pfl, factory_clsid) \ REGISTER_PROXY_DLL_ROUTINES(pfl, factory_clsid) #else diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 52e7810..1ceb2e4 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2484,12 +2484,12 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" [RegisterDllsSection] ;;some dlls have to be registered first 11,,ole32.dll,1 +11,,atl.dll,1 11,,oleaut32.dll,1 11,,shell32.dll,1 11,,actxprxy.dll,1 11,,amstream.dll,1 -11,,atl.dll,1 11,,avifil32.dll,1 11,,browseui.dll,1 11,,comctl32.dll,2

1 0

Adam Martinson : configure: Add a check for xmlSchemaSetParserStructuredErrors().
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 6ee2231d2bd74623791b578de000fd8182b054b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee2231d2bd74623791b578de… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 22 20:54:54 2010 -0600 configure: Add a check for xmlSchemaSetParserStructuredErrors(). --- configure | 42 ++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 ++ include/config.h.in | 3 +++ 3 files changed, 47 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 11e9d71..b9ff5e1 100755 --- a/configure +++ b/configure @@ -9202,6 +9202,48 @@ $as_echo "#define HAVE_XMLNEWDOCPI 1" >>confdefs.h fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlSchemaSetParserStructuredErrors in -lxml2" >&5 +$as_echo_n "checking for xmlSchemaSetParserStructuredErrors in -lxml2... " >&6; } +if test "${ac_cv_lib_xml2_xmlSchemaSetParserStructuredErrors+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lxml2 $ac_xml_libs $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char xmlSchemaSetParserStructuredErrors (); +int +main () +{ +return xmlSchemaSetParserStructuredErrors (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_xml2_xmlSchemaSetParserStructuredErrors=yes +else + ac_cv_lib_xml2_xmlSchemaSetParserStructuredErrors=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_xmlSchemaSetParserStructuredErrors" >&5 +$as_echo "$ac_cv_lib_xml2_xmlSchemaSetParserStructuredErrors" >&6; } +if test "x$ac_cv_lib_xml2_xmlSchemaSetParserStructuredErrors" = x""yes; then : + +$as_echo "#define HAVE_XMLSCHEMASSETPARSERSTRUCTUREDERRORS 1" >>confdefs.h + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlSchemaSetValidStructuredErrors in -lxml2" >&5 $as_echo_n "checking for xmlSchemaSetValidStructuredErrors in -lxml2... " >&6; } if test "${ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors+set}" = set; then : diff --git a/configure.ac b/configure.ac index ce708eb..6ad4532 100644 --- a/configure.ac +++ b/configure.ac @@ -1119,6 +1119,8 @@ then [AC_DEFINE(HAVE_XMLREADMEMORY,1,[Define if libxml2 has the xmlReadMemory function])],,$ac_xml_libs) AC_CHECK_LIB(xml2, xmlNewDocPI, [AC_DEFINE(HAVE_XMLNEWDOCPI,1,[Define if libxml2 has the xmlNewDocPI function])],,$ac_xml_libs) + AC_CHECK_LIB(xml2, xmlSchemaSetParserStructuredErrors, + [AC_DEFINE(HAVE_XMLSCHEMASSETPARSERSTRUCTUREDERRORS,1,[Define if libxml2 has the xmlSchemaSetParserStructuredErrors function])],,$ac_xml_libs) AC_CHECK_LIB(xml2, xmlSchemaSetValidStructuredErrors, [AC_DEFINE(HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS,1,[Define if libxml2 has the xmlSchemaSetValidStructuredErrors function])],,$ac_xml_libs) AC_CHECK_LIB(xml2, xmlFirstElementChild, diff --git a/include/config.h.in b/include/config.h.in index 3117f69..2643e99 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1117,6 +1117,9 @@ /* Define if libxml2 has the xmlReadMemory function */ #undef HAVE_XMLREADMEMORY +/* Define if libxml2 has the xmlSchemaSetParserStructuredErrors function */ +#undef HAVE_XMLSCHEMASSETPARSERSTRUCTUREDERRORS + /* Define if libxml2 has the xmlSchemaSetValidStructuredErrors function */ #undef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS

1 0

Adam Martinson : msxml3: Add schema parse/validate error callbacks.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 92bfadef7f27960c4e45a902f04f51e02e33b1b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92bfadef7f27960c4e45a902f… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 22 20:59:40 2010 -0600 msxml3: Add schema parse/validate error callbacks. --- dlls/msxml3/schema.c | 146 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 93 insertions(+), 53 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index e602e29..17439a5 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -214,6 +214,87 @@ static const BYTE hash_assoc_values[] = 116, 116, 116, 116, 116, 116 }; +static void LIBXML2_LOG_CALLBACK parser_error(void* ctx, char const* msg, ...) +{ + va_list ap; + va_start(ap, msg); + LIBXML2_CALLBACK_ERR(Schema_parse, msg, ap); + va_end(ap); +} + +static void LIBXML2_LOG_CALLBACK parser_warning(void* ctx, char const* msg, ...) +{ + va_list ap; + va_start(ap, msg); + LIBXML2_CALLBACK_WARN(Schema_parse, msg, ap); + va_end(ap); +} + +#ifdef HAVE_XMLSCHEMASSETPARSERSTRUCTUREDERRORS +static void parser_serror(void* ctx, xmlErrorPtr err) +{ + LIBXML2_CALLBACK_SERROR(Schema_parse, err); +} +#endif + +static inline xmlSchemaPtr Schema_parse(xmlSchemaParserCtxtPtr spctx) +{ + TRACE("(%p)\n", spctx); + + xmlSchemaSetParserErrors(spctx, parser_error, parser_warning, NULL); +#ifdef HAVE_XMLSCHEMASSETPARSERSTRUCTUREDERRORS + xmlSchemaSetParserStructuredErrors(spctx, parser_serror, NULL); +#endif + + return xmlSchemaParse(spctx); +} + +static void LIBXML2_LOG_CALLBACK validate_error(void* ctx, char const* msg, ...) +{ + va_list ap; + va_start(ap, msg); + LIBXML2_CALLBACK_ERR(Schema_validate_tree, msg, ap); + va_end(ap); +} + +static void LIBXML2_LOG_CALLBACK validate_warning(void* ctx, char const* msg, ...) +{ + va_list ap; + va_start(ap, msg); + LIBXML2_CALLBACK_WARN(Schema_validate_tree, msg, ap); + va_end(ap); +} + +#ifdef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS +static void validate_serror(void* ctx, xmlErrorPtr err) +{ + LIBXML2_CALLBACK_SERROR(Schema_validate_tree, err); +} +#endif + +static inline HRESULT Schema_validate_tree(xmlSchemaPtr schema, xmlNodePtr tree) +{ + xmlSchemaValidCtxtPtr svctx; + int err; + + TRACE("(%p, %p)\n", schema, tree); + /* TODO: if validateOnLoad property is false, + * we probably need to validate the schema here. */ + svctx = xmlSchemaNewValidCtxt(schema); + xmlSchemaSetValidErrors(svctx, validate_error, validate_warning, NULL); +#ifdef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS + xmlSchemaSetValidStructuredErrors(svctx, validate_serror, NULL); +#endif + + if (tree->type == XML_DOCUMENT_NODE) + err = xmlSchemaValidateDoc(svctx, (xmlDocPtr)tree); + else + err = xmlSchemaValidateOneElement(svctx, tree); + + xmlSchemaFreeValidCtxt(svctx); + return err? S_FALSE : S_OK; +} + static DWORD dt_hash(xmlChar const* str, int len /* calculated if -1 */) { DWORD hval = (len == -1)? xmlStrlen(str) : len; @@ -491,14 +572,16 @@ HRESULT dt_validate(XDR_DT dt, xmlChar const* content) xmlDocPtr tmp_doc; xmlNodePtr node; xmlNsPtr ns; - xmlSchemaValidCtxtPtr svctx; - BOOL valid; + HRESULT hr; + + TRACE("(dt:%s, %s)\n", dt_to_str(dt), wine_dbgstr_a((char const*)content)); + if (!datatypes_schema) { xmlSchemaParserCtxtPtr spctx; assert(datatypes_src != NULL); spctx = xmlSchemaNewMemParserCtxt((char const*)datatypes_src, datatypes_len); - datatypes_schema = xmlSchemaParse(spctx); + datatypes_schema = Schema_parse(spctx); xmlSchemaFreeParserCtxt(spctx); } @@ -539,22 +622,20 @@ HRESULT dt_validate(XDR_DT dt, xmlChar const* content) assert(datatypes_schema != NULL); if (content && xmlStrlen(content)) { - svctx = xmlSchemaNewValidCtxt(datatypes_schema); tmp_doc = xmlNewDoc(NULL); node = xmlNewChild((xmlNodePtr)tmp_doc, NULL, dt_to_str(dt), content); ns = xmlNewNs(node, DT_nsURI, BAD_CAST "dt"); xmlSetNs(node, ns); xmlDocSetRootElement(tmp_doc, node); - valid = !xmlSchemaValidateDoc(svctx, tmp_doc); - xmlSchemaFreeValidCtxt(svctx); + hr = Schema_validate_tree(datatypes_schema, (xmlNodePtr)tmp_doc); xmlFreeDoc(tmp_doc); } else { /* probably the node is being created manually and has no content yet */ - valid = TRUE; + hr = S_OK; } - return valid? S_OK : S_FALSE; + return hr; break; default: FIXME("need to handle dt:%s\n", dt_to_str(dt)); @@ -745,7 +826,7 @@ static cache_entry* cache_entry_from_url(char const* url, xmlChar const* nsURI) entry->ref = 0; if (spctx) { - if((entry->schema = xmlSchemaParse(spctx))) + if((entry->schema = Schema_parse(spctx))) { /* TODO: if the nsURI is different from the default xmlns or targetNamespace, * do we need to do something special here? */ @@ -783,7 +864,7 @@ static cache_entry* cache_entry_from_xsd_doc(xmlDocPtr doc, xmlChar const* nsURI entry->ref = 0; spctx = xmlSchemaNewDocParserCtxt(new_doc); - if ((entry->schema = xmlSchemaParse(spctx))) + if ((entry->schema = Schema_parse(spctx))) { xmldoc_init(entry->schema->doc, &CLSID_DOMDocument40); entry->doc = entry->schema->doc; @@ -812,7 +893,7 @@ static cache_entry* cache_entry_from_xdr_doc(xmlDocPtr doc, xmlChar const* nsURI entry->ref = 0; spctx = xmlSchemaNewDocParserCtxt(xsd_doc); - if ((entry->schema = xmlSchemaParse(spctx))) + if ((entry->schema = Schema_parse(spctx))) { entry->doc = new_doc; xmldoc_init(entry->schema->doc, &CLSID_DOMDocument30); @@ -1257,29 +1338,6 @@ static inline xmlNodePtr lookup_schema_element(xmlSchemaPtr schema, xmlNodePtr n return (decl != NULL)? decl->node : NULL; } -static void LIBXML2_LOG_CALLBACK validate_error(void* ctx, char const* msg, ...) -{ - va_list ap; - va_start(ap, msg); - LIBXML2_CALLBACK_ERR(SchemaCache_validate_tree, msg, ap); - va_end(ap); -} - -static void LIBXML2_LOG_CALLBACK validate_warning(void* ctx, char const* msg, ...) -{ - va_list ap; - va_start(ap, msg); - LIBXML2_CALLBACK_WARN(SchemaCache_validate_tree, msg, ap); - va_end(ap); -} - -#ifdef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS -static void validate_serror(void* ctx, xmlErrorPtr err) -{ - LIBXML2_CALLBACK_SERROR(SchemaCache_validate_tree, err); -} -#endif - HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); @@ -1297,25 +1355,7 @@ HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tr /* TODO: if the ns is not in the cache, and it's a URL, * do we try to load from that? */ if (schema) - { - xmlSchemaValidCtxtPtr svctx; - int err; - /* TODO: if validateOnLoad property is false, - * we probably need to validate the schema here. */ - svctx = xmlSchemaNewValidCtxt(schema); - xmlSchemaSetValidErrors(svctx, validate_error, validate_warning, NULL); -#ifdef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS - xmlSchemaSetValidStructuredErrors(svctx, validate_serror, NULL); -#endif - - if ((xmlNodePtr)tree->doc == tree) - err = xmlSchemaValidateDoc(svctx, (xmlDocPtr)tree); - else - err = xmlSchemaValidateOneElement(svctx, tree); - - xmlSchemaFreeValidCtxt(svctx); - return err? S_FALSE : S_OK; - } + return Schema_validate_tree(schema, tree); return E_FAIL; }

1 0

Alexander Morozov : crypt32/tests: Do not crash on some Win98.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 113c6145253530e64f7592bdef510fe46c64ca0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=113c6145253530e64f7592bde… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Nov 23 13:02:22 2010 +0300 crypt32/tests: Do not crash on some Win98. --- dlls/crypt32/tests/msg.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 63149e7..d560c30 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2081,15 +2081,18 @@ static void test_enveloped_msg_open(void) SetLastError(0xdeadbeef); context = CertCreateCertificateContext(X509_ASN_ENCODING, v1CertWithValidPubKey, sizeof(v1CertWithValidPubKey)); - ok(context != NULL, "CertCreateCertificateContext failed: %08x\n", - GetLastError()); - envelopedInfo.rgpRecipientCert = (PCERT_INFO *)&context->pCertInfo; - SetLastError(0xdeadbeef); - msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, - &envelopedInfo, NULL, NULL); - todo_wine - ok(msg != NULL, "CryptMsgOpenToEncode failed: %08x\n", GetLastError()); - CryptMsgClose(msg); + if (context) + { + envelopedInfo.rgpRecipientCert = (PCERT_INFO *)&context->pCertInfo; + SetLastError(0xdeadbeef); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, + &envelopedInfo, NULL, NULL); + todo_wine + ok(msg != NULL, "CryptMsgOpenToEncode failed: %08x\n", GetLastError()); + CryptMsgClose(msg); + } + else + win_skip("failed to create certificate context, skipping a test\n"); SetLastError(0xdeadbeef); ret = pCryptAcquireContextA(&envelopedInfo.hCryptProv, NULL, NULL,

1 0

Alexander Morozov : crypt32/tests: Fix test failures on WinME and some NT4.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 676d5db65a54e7dc661f3634ea96943943d11bb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=676d5db65a54e7dc661f3634e… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Nov 23 13:42:10 2010 +0300 crypt32/tests: Fix test failures on WinME and some NT4. --- dlls/crypt32/tests/msg.c | 75 ++++++++++++++++++++++++++++----------------- 1 files changed, 47 insertions(+), 28 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index d560c30..90dd783 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2159,7 +2159,9 @@ static void test_enveloped_msg_update(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); todo_wine - ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + ok(ret || + broken(!ret && GetLastError() == NTE_PERM), /* some NT4 */ + "CryptMsgUpdate failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, NULL, 0, TRUE); todo_wine @@ -2204,7 +2206,9 @@ static void test_enveloped_msg_update(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); todo_wine - ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + ok(ret || + broken(!ret && GetLastError() == NTE_PERM), /* some NT4 */ + "CryptMsgUpdate failed: %08x\n", GetLastError()); CryptMsgClose(msg); } SetLastError(0xdeadbeef); @@ -2242,7 +2246,9 @@ static void test_enveloped_msg_update(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); todo_wine - ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + ok(ret || + broken(!ret && GetLastError() == NTE_PERM), /* some NT4 */ + "CryptMsgUpdate failed: %08x\n", GetLastError()); CryptMsgClose(msg); } } @@ -2863,7 +2869,7 @@ static void test_decode_msg_get_param(void) { HCRYPTMSG msg; HCRYPTPROV hCryptProv; - HCRYPTKEY key; + HCRYPTKEY key = 0; BOOL ret; DWORD size = 0, value; LPBYTE buf; @@ -3099,27 +3105,34 @@ static void test_decode_msg_get_param(void) SetLastError(0xdeadbeef); ret = CryptImportKey(hCryptProv, publicPrivateKeyPair, sizeof(publicPrivateKeyPair), 0, 0, &key); - ok(ret, "CryptImportKey failed: %08x\n", GetLastError()); + ok(ret || + broken(!ret && GetLastError() == NTE_PERM), /* WinME and some NT4 */ + "CryptImportKey failed: %08x\n", GetLastError()); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); CryptMsgUpdate(msg, envelopedMessage, sizeof(envelopedMessage), TRUE); todo_wine check_param("enveloped message before decrypting", msg, CMSG_CONTENT_PARAM, envelopedMessage + sizeof(envelopedMessage) - 4, 4); - decryptPara.hCryptProv = hCryptProv; - SetLastError(0xdeadbeef); - ret = CryptMsgControl(msg, 0, CMSG_CTRL_DECRYPT, &decryptPara); - todo_wine - ok(ret, "CryptMsgControl failed: %08x\n", GetLastError()); - decryptPara.hCryptProv = 0; - SetLastError(0xdeadbeef); - ret = CryptMsgControl(msg, 0, CMSG_CTRL_DECRYPT, &decryptPara); - todo_wine - ok(!ret && GetLastError() == CRYPT_E_ALREADY_DECRYPTED, - "expected CRYPT_E_ALREADY_DECRYPTED, got %08x\n", GetLastError()); - todo_wine - check_param("enveloped message", msg, CMSG_CONTENT_PARAM, msgData, - sizeof(msgData)); + if (key) + { + decryptPara.hCryptProv = hCryptProv; + SetLastError(0xdeadbeef); + ret = CryptMsgControl(msg, 0, CMSG_CTRL_DECRYPT, &decryptPara); + todo_wine + ok(ret, "CryptMsgControl failed: %08x\n", GetLastError()); + decryptPara.hCryptProv = 0; + SetLastError(0xdeadbeef); + ret = CryptMsgControl(msg, 0, CMSG_CTRL_DECRYPT, &decryptPara); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_ALREADY_DECRYPTED, + "expected CRYPT_E_ALREADY_DECRYPTED, got %08x\n", GetLastError()); + todo_wine + check_param("enveloped message", msg, CMSG_CONTENT_PARAM, msgData, + sizeof(msgData)); + } + else + win_skip("failed to import a key, skipping tests\n"); CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, 0, NULL, @@ -3130,17 +3143,23 @@ static void test_decode_msg_get_param(void) check_param("enveloped bare message before decrypting", msg, CMSG_CONTENT_PARAM, envelopedBareMessage + sizeof(envelopedBareMessage) - 4, 4); - decryptPara.hCryptProv = hCryptProv; - SetLastError(0xdeadbeef); - ret = CryptMsgControl(msg, 0, CMSG_CTRL_DECRYPT, &decryptPara); - todo_wine - ok(ret, "CryptMsgControl failed: %08x\n", GetLastError()); - todo_wine - check_param("enveloped bare message", msg, CMSG_CONTENT_PARAM, msgData, - sizeof(msgData)); + if (key) + { + decryptPara.hCryptProv = hCryptProv; + SetLastError(0xdeadbeef); + ret = CryptMsgControl(msg, 0, CMSG_CTRL_DECRYPT, &decryptPara); + todo_wine + ok(ret, "CryptMsgControl failed: %08x\n", GetLastError()); + todo_wine + check_param("enveloped bare message", msg, CMSG_CONTENT_PARAM, msgData, + sizeof(msgData)); + } + else + win_skip("failed to import a key, skipping tests\n"); CryptMsgClose(msg); - CryptDestroyKey(key); + if (key) + CryptDestroyKey(key); CryptReleaseContext(hCryptProv, 0); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL);

1 0