January 2011 - Wine-commits

André Hentschel : Wine 1.3.12 freigegeben
by Jeremy Newman 31 Jan '11

31 Jan '11

Module: website Branch: master Commit: c9454d0cc7d950e38cd08f29685cfa085018a4c3 URL: http://source.winehq.org/git/website.git/?a=commit;h=c9454d0cc7d950e38cd08f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 31 21:08:38 2011 +0100 Wine 1.3.12 freigegeben --- news/de/2011012101.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2011012101.xml b/news/de/2011012101.xml new file mode 100644 index 0000000..ea60971 --- /dev/null +++ b/news/de/2011012101.xml @@ -0,0 +1,17 @@ +<news> +<date>21. Januar 2011</date> +<title>Wine 1.3.12 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.12 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.12">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für mehrere Symbolgrößen im winemenubuilder.</li> + <li>Verbesserungen am Hilfebetrachter.</li> + <li>Erster Spatenstich für die DOSBox Integration.</li> + <li>Verschiedene MSI Fehlerbehebungen.</li> + <li>Einige Fehlerbehebungen am Wine Debugger.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.12.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Juan Lang : crypt32/tests: Don't assign a return value that' s never checked (clang).
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 36bc1c7f8f96743fae24849dc84bbbfeb91e4e7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=36bc1c7f8f96743fae24849dc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 28 13:20:23 2011 -0800 crypt32/tests: Don't assign a return value that's never checked (clang). --- dlls/crypt32/tests/store.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index b749719..521fc48 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -1844,7 +1844,7 @@ static void testCertOpenSystemStore(void) if (store) CertCloseStore(store, 0); /* Delete it so other tests succeed next time around */ - store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, + CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_DELETE_FLAG, BogusW); RegDeleteKeyW(HKEY_CURRENT_USER, BogusPathW); }

1 0

Hans Leidekker : programs: Add a stubbed PlugPlay service.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 2133b6c38d7284a36c14ea24fdbe9b53c5bf1bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2133b6c38d7284a36c14ea24f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 31 15:26:17 2011 +0100 programs: Add a stubbed PlugPlay service. --- configure | 1 + configure.ac | 1 + programs/plugplay/Makefile.in | 9 ++++ programs/plugplay/main.c | 99 +++++++++++++++++++++++++++++++++++++++++ tools/wine.inf.in | 11 +++++ 5 files changed, 121 insertions(+), 0 deletions(-) diff --git a/configure b/configure index c178d92..89cbede 100755 --- a/configure +++ b/configure @@ -15395,6 +15395,7 @@ wine_fn_config_program ngen enable_ngen install wine_fn_config_program notepad enable_notepad po,install,installbin wine_fn_config_program oleview enable_oleview po,install wine_fn_config_program ping enable_ping install +wine_fn_config_program plugplay enable_plugplay install wine_fn_config_program progman enable_progman po,install wine_fn_config_program reg enable_reg po,install wine_fn_config_program regedit enable_regedit po,install,installbin diff --git a/configure.ac b/configure.ac index b4be299..48ed667 100644 --- a/configure.ac +++ b/configure.ac @@ -2896,6 +2896,7 @@ WINE_CONFIG_PROGRAM(ngen,,[install]) WINE_CONFIG_PROGRAM(notepad,,[po,install,installbin]) WINE_CONFIG_PROGRAM(oleview,,[po,install]) WINE_CONFIG_PROGRAM(ping,,[install]) +WINE_CONFIG_PROGRAM(plugplay,,[install]) WINE_CONFIG_PROGRAM(progman,,[po,install]) WINE_CONFIG_PROGRAM(reg,,[po,install]) WINE_CONFIG_PROGRAM(regedit,,[po,install,installbin]) diff --git a/programs/plugplay/Makefile.in b/programs/plugplay/Makefile.in new file mode 100644 index 0000000..bbe06dd --- /dev/null +++ b/programs/plugplay/Makefile.in @@ -0,0 +1,9 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +MODULE = plugplay.exe +APPMODE = -mconsole -municode +IMPORTS = advapi32 + +C_SRCS = \ + main.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/plugplay/main.c b/programs/plugplay/main.c new file mode 100644 index 0000000..cbf01d5 --- /dev/null +++ b/programs/plugplay/main.c @@ -0,0 +1,99 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#define WIN32_LEAN_AND_MEAN + +#include <windows.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(plugplay); + +static WCHAR plugplayW[] = {'P','l','u','g','P','l','a','y',0}; + +static SERVICE_STATUS_HANDLE service_handle; +static HANDLE stop_event; + +static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) +{ + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + + switch(ctrl) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + WINE_TRACE( "shutting down\n" ); + status.dwCurrentState = SERVICE_STOP_PENDING; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + SetEvent( stop_event ); + return NO_ERROR; + default: + WINE_FIXME( "got service ctrl %x\n", ctrl ); + status.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus( service_handle, &status ); + return NO_ERROR; + } +} + +static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) +{ + SERVICE_STATUS status; + + WINE_TRACE( "starting service\n" ); + + stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); + + service_handle = RegisterServiceCtrlHandlerExW( plugplayW, service_handler, NULL ); + if (!service_handle) + return; + + status.dwServiceType = SERVICE_WIN32; + status.dwCurrentState = SERVICE_RUNNING; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 10000; + SetServiceStatus( service_handle, &status ); + + WaitForSingleObject( stop_event, INFINITE ); + + status.dwCurrentState = SERVICE_STOPPED; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + WINE_TRACE( "service stopped\n" ); +} + +int wmain( int argc, WCHAR *argv[] ) +{ + static const SERVICE_TABLE_ENTRYW service_table[] = + { + { plugplayW, ServiceMain }, + { NULL, NULL } + }; + + StartServiceCtrlDispatcherW( service_table ); + return 0; +} diff --git a/tools/wine.inf.in b/tools/wine.inf.in index b2667af..4c06900 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -127,16 +127,19 @@ AddReg=\ AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService AddService=TermService,0,TerminalServices +AddService=PlugPlay,0,PlugPlayService [DefaultInstall.NT.Services] AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService AddService=TermService,0,TerminalServices +AddService=PlugPlay,0,PlugPlayService [DefaultInstall.ntamd64.Services] AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService AddService=TermService,0,TerminalServices +AddService=PlugPlay,0,PlugPlayService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -3009,6 +3012,14 @@ ServiceType=32 StartType=3 ErrorControl=1 +[PlugPlayService] +Description="Enables automatic configuration of devices" +DisplayName="Plug and Play Service" +ServiceBinary="%11%\plugplay.exe" +ServiceType=32 +StartType=2 +ErrorControl=1 + [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16

1 0

Alexander Morozov : winemapi: Implement MAPIResolveName.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: e5dee7d9650c2a57cc536b13114c3869679207d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5dee7d9650c2a57cc536b131… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Jan 13 16:56:24 2011 +0300 winemapi: Implement MAPIResolveName. --- dlls/winemapi/Makefile.in | 2 +- dlls/winemapi/main.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/winemapi/Makefile.in b/dlls/winemapi/Makefile.in index 0c1ff6e..0c9c8a6 100644 --- a/dlls/winemapi/Makefile.in +++ b/dlls/winemapi/Makefile.in @@ -1,5 +1,5 @@ MODULE = winemapi.dll -IMPORTS = shlwapi shell32 +IMPORTS = shlwapi shell32 mapi32 C_SRCS = \ main.c \ diff --git a/dlls/winemapi/main.c b/dlls/winemapi/main.c index a954ab7..0627aa2 100644 --- a/dlls/winemapi/main.c +++ b/dlls/winemapi/main.c @@ -26,6 +26,7 @@ #include "objbase.h" #include "mapidefs.h" #include "mapi.h" +#include "mapix.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winemapi); @@ -99,8 +100,31 @@ ULONG WINAPI MAPIReadMail(LHANDLE session, ULONG_PTR uiparam, LPSTR msg_id, ULONG WINAPI MAPIResolveName(LHANDLE session, ULONG_PTR uiparam, LPSTR name, FLAGS flags, ULONG reserved, lpMapiRecipDesc *recip) { - FIXME("(stub)\n"); - return MAPI_E_NOT_SUPPORTED; + static const char smtp[] = "SMTP:"; + + SCODE scode; + char *p; + + TRACE("(0x%08lx 0x%08lx %s 0x%08x 0x%08x %p)\n", session, uiparam, + debugstr_a(name), flags, reserved, recip); + + if (!name || !strlen(name)) + return MAPI_E_FAILURE; + + scode = MAPIAllocateBuffer(sizeof(**recip) + sizeof(smtp) + strlen(name), + (LPVOID *)recip); + if (scode != S_OK) + return MAPI_E_INSUFFICIENT_MEMORY; + + ZeroMemory(*recip, sizeof(**recip)); + p = (char *)(*recip + 1); + strcpy(p, smtp); + strcpy(p + sizeof(smtp) - 1, name); + + (*recip)->ulRecipClass = MAPI_TO; + (*recip)->lpszName = p + sizeof(smtp) - 1; + (*recip)->lpszAddress = p; + return SUCCESS_SUCCESS; } ULONG WINAPI MAPISaveMail(LHANDLE session, ULONG_PTR uiparam, lpMapiMessage msg,

1 0

Alexander Morozov : winemapi: Address can contain "SMTP:".
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: f5b39cfc3cdf3d180b2d05ac0a2e6c407b3ca4ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5b39cfc3cdf3d180b2d05ac0… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Jan 14 17:58:55 2011 +0300 winemapi: Address can contain "SMTP:". --- dlls/winemapi/sendmail.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winemapi/sendmail.c b/dlls/winemapi/sendmail.c index 44c1d00..e4629bb 100644 --- a/dlls/winemapi/sendmail.c +++ b/dlls/winemapi/sendmail.c @@ -66,6 +66,7 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, const char *address, *subject, *body; static const char format[] = "mailto:\"%s\"?subject=\"%s\"&cc=\"%s\"&bcc=\"%s\"&body=\"%s\""; + static const char smtp[] = "smtp:"; char *mailto = NULL, *escape = NULL; char empty_string[] = ""; HRESULT res; @@ -86,6 +87,8 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, } address = message->lpRecips[i].lpszAddress; + if (!strncasecmp(address, smtp, sizeof(smtp) - 1)) + address += sizeof(smtp) - 1; if (address) { @@ -169,6 +172,8 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, for (i = 0; i < message->nRecipCount; i++) { address = message->lpRecips[i].lpszAddress; + if (!strncasecmp(address, smtp, sizeof(smtp) - 1)) + address += sizeof(smtp) - 1; if (address) {

1 0

Alexander Scott-Johns : winex11.drv: Remove unused constant, and fix a comment.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: d2d4fe67bee46512fb3e0cd4725cbee8542a423c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d4fe67bee46512fb3e0cd47… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Mon Jan 31 02:35:44 2011 +0000 winex11.drv: Remove unused constant, and fix a comment. --- dlls/winex11.drv/clipboard.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 75f94e1..e54e15c 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -86,10 +86,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipboard); /* Maximum wait time for selection notify */ -#define SELECTION_RETRIES 500 /* wait for .1 seconds */ +#define SELECTION_RETRIES 500 /* wait for .5 seconds */ #define SELECTION_WAIT 1000 /* us */ -/* Minimum seconds that must lapse between owner queries */ -#define OWNERQUERYLAPSETIME 1 /* Selection masks */ #define S_NOSELECTION 0

1 0

Alexander Scott-Johns : winex11.drv: Improve error handling in bitmap synthesizing code.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 356eaa1ee2cdaf8dac75656ff878a55f5f0cd80e URL: http://source.winehq.org/git/wine.git/?a=commit;h=356eaa1ee2cdaf8dac75656ff… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Mon Jan 31 15:38:31 2011 +0000 winex11.drv: Improve error handling in bitmap synthesizing code. --- dlls/winex11.drv/clipboard.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index e54e15c..3610af7 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1060,21 +1060,23 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedBitmap(Display *display) if (lpSource->hData || X11DRV_CLIPBOARD_RenderFormat(display, lpSource)) { HDC hdc; - HBITMAP hData; + HBITMAP hData = NULL; unsigned int offset; LPBITMAPINFOHEADER lpbmih; hdc = GetDC(NULL); lpbmih = GlobalLock(lpSource->hData); + if (lpbmih) + { + offset = sizeof(BITMAPINFOHEADER) + + ((lpbmih->biBitCount <= 8) ? (sizeof(RGBQUAD) * + (1 << lpbmih->biBitCount)) : 0); - offset = sizeof(BITMAPINFOHEADER) - + ((lpbmih->biBitCount <= 8) ? (sizeof(RGBQUAD) * - (1 << lpbmih->biBitCount)) : 0); - - hData = CreateDIBitmap(hdc, lpbmih, CBM_INIT, (LPBYTE)lpbmih + - offset, (LPBITMAPINFO) lpbmih, DIB_RGB_COLORS); + hData = CreateDIBitmap(hdc, lpbmih, CBM_INIT, (LPBYTE)lpbmih + + offset, (LPBITMAPINFO) lpbmih, DIB_RGB_COLORS); - GlobalUnlock(lpSource->hData); + GlobalUnlock(lpSource->hData); + } ReleaseDC(NULL, hdc); if (hData)

1 0

Juan Lang : crypt32/tests: Test return value rather than output buffer before checking buffer contents (clang).
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: d0f1e195321156a6d4a0eefe6ce19a2232cc449c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0f1e195321156a6d4a0eefe6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 28 13:11:37 2011 -0800 crypt32/tests: Test return value rather than output buffer before checking buffer contents (clang). --- dlls/crypt32/tests/encode.c | 394 +++++++++++++++++++++--------------------- 1 files changed, 197 insertions(+), 197 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0f1e195321156a6d4a0e…

1 0

Juan Lang : crypt32/tests: Test some return values (clang).
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: a4fe05a0f3fc7cd3aa908b5f196e207b0766a430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4fe05a0f3fc7cd3aa908b5f1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jan 31 08:11:04 2011 -0800 crypt32/tests: Test some return values (clang). --- dlls/crypt32/tests/cert.c | 1 + dlls/crypt32/tests/msg.c | 1 + dlls/crypt32/tests/store.c | 3 +++ 3 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index d3b362c..9ee53fe 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1514,6 +1514,7 @@ static void testGetIssuerCert(void) /* With only the child certificate, no issuer will be found */ ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain7_1, sizeof(chain7_1), CERT_STORE_ADD_ALWAYS, &child); + ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); parent = CertGetIssuerCertificateFromStore(store, child, NULL, &flags); ok(parent == NULL, "Expected no issuer\n"); /* Adding an issuer allows one (and only one) issuer to be found */ diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 77b468c..2e27c0f 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -3253,6 +3253,7 @@ static void test_msg_control(void) "Expected E_INVALIDARG, got %08x\n", GetLastError()); } ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); /* or after an update. */ for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) { diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index c9103e9..b749719 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -1171,6 +1171,7 @@ static void testSystemStore(void) /* Now check whether deleting is allowed */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_DELETE_FLAG, BogusW); + ok(!store, "Didn't expect a store to be returned when deleting\n"); RegDeleteKeyW(HKEY_CURRENT_USER, BogusPathW); } @@ -2243,6 +2244,8 @@ static void testAddCertificateLink(void) if (buf) { ret = CertSerializeCertificateStoreElement(linked, 0, buf, &size); + ok(ret, "CertSerializeCertificateStoreElement failed: %08x\n", + GetLastError()); /* The serialized linked certificate is identical to the serialized * original certificate. */

1 0

Juan Lang : crypt32/tests: Remove dead assignments (clang).
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 2984605602e3955ce02db5832f67743be829da34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2984605602e3955ce02db5832… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jan 31 08:12:20 2011 -0800 crypt32/tests: Remove dead assignments (clang). --- dlls/crypt32/tests/main.c | 2 +- dlls/crypt32/tests/msg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 410f9a9..5f2e4d0 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -93,7 +93,7 @@ static void test_findExtension(void) { /* crashes */ SetLastError(0xdeadbeef); - ret = CertFindExtension(NULL, 1, NULL); + CertFindExtension(NULL, 1, NULL); /* returns NULL, last error is ERROR_INVALID_PARAMETER * crashes on Vista */ diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 2e27c0f..fc54041 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -3618,8 +3618,8 @@ static void test_msg_get_and_verify_signer(void) /* Crash */ if (0) { - ret = CryptMsgGetAndVerifySigner(NULL, 0, NULL, 0, NULL, NULL); - ret = CryptMsgGetAndVerifySigner(NULL, 0, NULL, 0, NULL, &signerIndex); + CryptMsgGetAndVerifySigner(NULL, 0, NULL, 0, NULL, NULL); + CryptMsgGetAndVerifySigner(NULL, 0, NULL, 0, NULL, &signerIndex); } msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL);

1 0