March 2009 - Wine-Commits - list.winehq.org

Jacek Caban : urlmon: Move HttpProtocolVtbl to its implementation ( code clean up).
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: a7ef2f4ef0af1cb954ecb7abb6f2c36d1dba3aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7ef2f4ef0af1cb954ecb7abb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 2 03:21:22 2009 +0100 urlmon: Move HttpProtocolVtbl to its implementation (code clean up). --- dlls/urlmon/http.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 99c22ff..80eefbe 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -461,6 +461,22 @@ static HRESULT WINAPI HttpProtocol_UnlockRequest(IInternetProtocol *iface) #undef PROTOCOL_THIS +static const IInternetProtocolVtbl HttpProtocolVtbl = { + HttpProtocol_QueryInterface, + HttpProtocol_AddRef, + HttpProtocol_Release, + HttpProtocol_Start, + HttpProtocol_Continue, + HttpProtocol_Abort, + HttpProtocol_Terminate, + HttpProtocol_Suspend, + HttpProtocol_Resume, + HttpProtocol_Read, + HttpProtocol_Seek, + HttpProtocol_LockRequest, + HttpProtocol_UnlockRequest +}; + #define PRIORITY_THIS(iface) DEFINE_THIS(HttpProtocol, InternetPriority, iface) static HRESULT WINAPI HttpPriority_QueryInterface(IInternetPriority *iface, REFIID riid, void **ppv) @@ -511,22 +527,6 @@ static const IInternetPriorityVtbl HttpPriorityVtbl = { HttpPriority_GetPriority }; -static const IInternetProtocolVtbl HttpProtocolVtbl = { - HttpProtocol_QueryInterface, - HttpProtocol_AddRef, - HttpProtocol_Release, - HttpProtocol_Start, - HttpProtocol_Continue, - HttpProtocol_Abort, - HttpProtocol_Terminate, - HttpProtocol_Suspend, - HttpProtocol_Resume, - HttpProtocol_Read, - HttpProtocol_Seek, - HttpProtocol_LockRequest, - HttpProtocol_UnlockRequest -}; - static HRESULT create_http_protocol(BOOL https, void **ppobj) { HttpProtocol *ret;

1 0

Jacek Caban : urlmon: Added IInternetPriority interface stup implementation to FtpProtocol.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 4063a32f80de44307cb34e0b0e2137142dcf510a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4063a32f80de44307cb34e0b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 2 03:21:43 2009 +0100 urlmon: Added IInternetPriority interface stup implementation to FtpProtocol. --- dlls/urlmon/ftp.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index 7b528ad..f79641e 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -23,12 +23,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { const IInternetProtocolVtbl *lpInternetProtocolVtbl; + const IInternetPriorityVtbl *lpInternetPriorityVtbl; + LONG ref; } FtpProtocol; #define PROTOCOL_THIS(iface) DEFINE_THIS(FtpProtocol, InternetProtocol, iface) #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) +#define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) static HRESULT WINAPI FtpProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { @@ -44,6 +47,9 @@ static HRESULT WINAPI FtpProtocol_QueryInterface(IInternetProtocol *iface, REFII }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { TRACE("(%p)->(IID_IInternetProtocol %p)\n", This, ppv); *ppv = PROTOCOL(This); + }else if(IsEqualGUID(&IID_IInternetPriority, riid)) { + TRACE("(%p)->(IID_IInternetPriority %p)\n", This, ppv); + *ppv = PRIORITY(This); } if(*ppv) { @@ -173,6 +179,50 @@ static const IInternetProtocolVtbl FtpProtocolVtbl = { FtpProtocol_UnlockRequest }; +#define PRIORITY_THIS(iface) DEFINE_THIS(FtpProtocol, InternetPriority, iface) + +static HRESULT WINAPI FtpPriority_QueryInterface(IInternetPriority *iface, REFIID riid, void **ppv) +{ + FtpProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_QueryInterface(PROTOCOL(This), riid, ppv); +} + +static ULONG WINAPI FtpPriority_AddRef(IInternetPriority *iface) +{ + FtpProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_AddRef(PROTOCOL(This)); +} + +static ULONG WINAPI FtpPriority_Release(IInternetPriority *iface) +{ + FtpProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_Release(PROTOCOL(This)); +} + +static HRESULT WINAPI FtpPriority_SetPriority(IInternetPriority *iface, LONG nPriority) +{ + FtpProtocol *This = PRIORITY_THIS(iface); + FIXME("(%p)->(%d)\n", This, nPriority); + return E_NOTIMPL; +} + +static HRESULT WINAPI FtpPriority_GetPriority(IInternetPriority *iface, LONG *pnPriority) +{ + FtpProtocol *This = PRIORITY_THIS(iface); + FIXME("(%p)->(%p)\n", This, pnPriority); + return E_NOTIMPL; +} + +#undef PRIORITY_THIS + +static const IInternetPriorityVtbl FtpPriorityVtbl = { + FtpPriority_QueryInterface, + FtpPriority_AddRef, + FtpPriority_Release, + FtpPriority_SetPriority, + FtpPriority_GetPriority +}; + HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) { FtpProtocol *ret; @@ -184,6 +234,7 @@ HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) ret = heap_alloc(sizeof(FtpProtocol)); ret->lpInternetProtocolVtbl = &FtpProtocolVtbl; + ret->lpInternetPriorityVtbl = &FtpPriorityVtbl; ret->ref = 1; *ppobj = PROTOCOL(ret);

1 0

Jacek Caban : urlmon: Move HttpProtocol:: Continue implementation to generic Protocol object.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: c2ffe977793a62a4c0bfddda395d9baf6e602826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ffe977793a62a4c0bfddda3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 2 03:20:46 2009 +0100 urlmon: Move HttpProtocol::Continue implementation to generic Protocol object. --- dlls/urlmon/http.c | 271 +++++++++++++++------------------------------ dlls/urlmon/protocol.c | 68 +++++++++++ dlls/urlmon/urlmon_main.h | 2 + 3 files changed, 157 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2ffe977793a62a4c0bfd…

1 0

Jacek Caban : urlmon: Move strndupW implementation to header file.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 4ae60c6f006a1f6da054b46bbc371b5256a12db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae60c6f006a1f6da054b46bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 2 03:19:18 2009 +0100 urlmon: Move strndupW implementation to header file. --- dlls/urlmon/http.c | 20 ++++---------------- dlls/urlmon/urlmon_main.h | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index edaa340..87d2036 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -219,18 +219,6 @@ static void CALLBACK HTTPPROTOCOL_InternetStatusCallback( IInternetProtocolSink_ReportProgress(This->base.protocol_sink, ulStatusCode, (LPWSTR)lpvStatusInformation); } -static inline LPWSTR strndupW(LPCWSTR string, int len) -{ - LPWSTR ret = NULL; - if (string && - (ret = heap_alloc((len+1)*sizeof(WCHAR))) != NULL) - { - memcpy(ret, string, len*sizeof(WCHAR)); - ret[len] = 0; - } - return ret; -} - /* * Interface implementations */ @@ -345,10 +333,10 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl hres = MK_E_SYNTAX; goto done; } - host = strndupW(url.lpszHostName, url.dwHostNameLength); - path = strndupW(url.lpszUrlPath, url.dwUrlPathLength); - user = strndupW(url.lpszUserName, url.dwUserNameLength); - pass = strndupW(url.lpszPassword, url.dwPasswordLength); + host = heap_strndupW(url.lpszHostName, url.dwHostNameLength); + path = heap_strndupW(url.lpszUrlPath, url.dwUrlPathLength); + user = heap_strndupW(url.lpszUserName, url.dwUserNameLength); + pass = heap_strndupW(url.lpszPassword, url.dwPasswordLength); if (!url.nPort) url.nPort = This->https ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index bc2fea8..36862d1 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -133,6 +133,21 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) return ret; } +static inline LPWSTR heap_strndupW(LPCWSTR str, int len) +{ + LPWSTR ret = NULL; + + if(str) { + ret = heap_alloc((len+1)*sizeof(WCHAR)); + if(ret) { + memcpy(ret, str, len*sizeof(WCHAR)); + ret[len] = 0; + } + } + + return ret; +} + static inline LPWSTR heap_strdupAtoW(const char *str) { LPWSTR ret = NULL;

1 0

Jacek Caban : urlmon: Ignore report_data call if binding is stopped.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: b105b084a2efdd09c1a8827ab257f68cac8a0cfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b105b084a2efdd09c1a8827ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 2 03:18:19 2009 +0100 urlmon: Ignore report_data call if binding is stopped. --- dlls/urlmon/binding.c | 2 +- dlls/urlmon/tests/url.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 41fa677..fb30367 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1200,7 +1200,7 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres TRACE("(%p)->(%d %u %u)\n", This, bscf, progress, progress_max); - if(This->download_state == END_DOWNLOAD) + if(This->download_state == END_DOWNLOAD || (This->state & BINDING_STOPPED)) return; if(GetCurrentThreadId() != This->apartment_thread) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 094d21d..e56d0ca 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1201,8 +1201,7 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallback *iface, ULONG ulP break; case BINDSTATUS_DOWNLOADINGDATA: CHECK_EXPECT2(OnProgress_DOWNLOADINGDATA); - if(iface == &objbsc) - todo_wine ok(0, "unexpected call\n"); + ok(iface != &objbsc, "unexpected call\n"); ok(download_state == DOWNLOADING, "Download state was %d, expected DOWNLOADING\n", download_state); break;

1 0

Jacek Caban : urlmon: Moved HttpProtocol::[Lock|Unlock] Request implementation to generic Protocol object.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 7c77c57ab85ee03d68b54161aa4410d3c2e94486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c77c57ab85ee03d68b54161a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 2 03:19:44 2009 +0100 urlmon: Moved HttpProtocol::[Lock|Unlock]Request implementation to generic Protocol object. --- dlls/urlmon/Makefile.in | 1 + dlls/urlmon/http.c | 14 ++------------ dlls/urlmon/protocol.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon_main.h | 3 +++ 4 files changed, 50 insertions(+), 12 deletions(-) diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index d853541..0a9497c 100644 --- a/dlls/urlmon/Makefile.in +++ b/dlls/urlmon/Makefile.in @@ -17,6 +17,7 @@ C_SRCS = \ http.c \ internet.c \ mk.c \ + protocol.c \ regsvr.c \ sec_mgr.c \ session.c \ diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 87d2036..ab5aa38 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -827,10 +827,7 @@ static HRESULT WINAPI HttpProtocol_LockRequest(IInternetProtocol *iface, DWORD d TRACE("(%p)->(%08x)\n", This, dwOptions); - if (!InternetLockRequestFile(This->base.request, &This->base.lock)) - WARN("InternetLockRequest failed: %d\n", GetLastError()); - - return S_OK; + return protocol_lock_request(&This->base); } static HRESULT WINAPI HttpProtocol_UnlockRequest(IInternetProtocol *iface) @@ -839,14 +836,7 @@ static HRESULT WINAPI HttpProtocol_UnlockRequest(IInternetProtocol *iface) TRACE("(%p)\n", This); - if (This->base.lock) - { - if (!InternetUnlockRequestFile(This->base.lock)) - WARN("InternetUnlockRequest failed: %d\n", GetLastError()); - This->base.lock = 0; - } - - return S_OK; + return protocol_unlock_request(&This->base); } #undef PROTOCOL_THIS diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c new file mode 100644 index 0000000..b25c9de --- /dev/null +++ b/dlls/urlmon/protocol.c @@ -0,0 +1,44 @@ +/* + * Copyright 2007 Misha Koshelev + * Copyright 2009 Jacek Caban 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 + */ + +#include "urlmon_main.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(urlmon); + +HRESULT protocol_lock_request(Protocol *protocol) +{ + if (!InternetLockRequestFile(protocol->request, &protocol->lock)) + WARN("InternetLockRequest failed: %d\n", GetLastError()); + + return S_OK; +} + +HRESULT protocol_unlock_request(Protocol *protocol) +{ + if(!protocol->lock) + return S_OK; + + if(!InternetUnlockRequestFile(protocol->lock)) + WARN("InternetUnlockRequest failed: %d\n", GetLastError()); + protocol->lock = 0; + + return S_OK; +} diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 36862d1..906cd31 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -98,6 +98,9 @@ typedef struct { LONG priority; } Protocol; +HRESULT protocol_lock_request(Protocol*); +HRESULT protocol_unlock_request(Protocol*); + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len);

1 0

Jacek Caban : urlmon: Move some HttpProtocol variables to generic Protocol object.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: b0a9ddae670d1661d86954d8013390b754d12031 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a9ddae670d1661d86954d80… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 2 03:19:00 2009 +0100 urlmon: Move some HttpProtocol variables to generic Protocol object. --- dlls/urlmon/http.c | 230 ++++++++++++++++++++++----------------------- dlls/urlmon/urlmon_main.h | 24 +++++- 2 files changed, 136 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0a9ddae670d1661d8695…

1 0

Mike Ruprecht : winedbg: Fix typo in a comment.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: c7b204e98ae84e43a1724a26e33e2ae082d6de41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b204e98ae84e43a1724a26e… Author: Mike Ruprecht <cmaiku(a)gmail.com> Date: Sun Mar 1 14:09:19 2009 -0600 winedbg: Fix typo in a comment. --- programs/winedbg/be_i386.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index c3bf155..0d6d058 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -226,7 +226,7 @@ static void be_i386_print_context(HANDLE hThread, const CONTEXT* ctx, int all_re if (ctx->EFlags & 0x00004000) *pt-- = 'N'; /* Nested Task Flag */ if (ctx->EFlags & 0x00008000) *pt-- = '-'; if (ctx->EFlags & 0x00010000) *pt-- = 'R'; /* Resume Flag */ - if (ctx->EFlags & 0x00020000) *pt-- = 'V'; /* Vritual Mode Flag */ + if (ctx->EFlags & 0x00020000) *pt-- = 'V'; /* Virtual Mode Flag */ if (ctx->EFlags & 0x00040000) *pt-- = 'a'; /* Alignment Check Flag */ switch (get_selector_type(hThread, ctx, ctx->SegCs))

1 0

Paul Vriens : fusion/tests: Skip some tests on .NET 1.x.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 7a435c01ca922fadd941aebda68abc0df54cebd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a435c01ca922fadd941aebda… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Feb 28 21:52:36 2009 +0100 fusion/tests: Skip some tests on .NET 1.x. --- dlls/fusion/tests/asmname.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 98004ea..b989c37 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -437,7 +437,11 @@ static void test_CreateAssemblyNameObject(void) ok(hi == 0, "Expected 0, got %08x\n", hi); ok(lo == 0, "Expected 0, got %08x\n", lo); - test_assembly_name_props(name, defaults); + if (hr == S_OK) + win_skip(".NET 1.x doesn't handle ASM_NAME_PROCESSOR_ID_ARRAY" + " and ASM_NAME_OSINFO_ARRAY correctly\n"); + else + test_assembly_name_props(name, defaults); IAssemblyName_Release(name); @@ -469,7 +473,11 @@ static void test_CreateAssemblyNameObject(void) ok(hi == 0, "Expected 0, got %08x\n", hi); ok(lo == 0, "Expected 0, got %08x\n", lo); - test_assembly_name_props(name, emptyname); + if (hr == S_OK) + win_skip(".NET 1.x doesn't handle ASM_NAME_PROCESSOR_ID_ARRAY" + " and ASM_NAME_OSINFO_ARRAY correctly\n"); + else + test_assembly_name_props(name, emptyname); IAssemblyName_Release(name); @@ -502,7 +510,11 @@ static void test_CreateAssemblyNameObject(void) ok(hi == 0, "Expected 0, got %08x\n", hi); ok(lo == 0, "Expected 0, got %08x\n", lo); - test_assembly_name_props(name, winename); + if (hr == S_OK) + win_skip(".NET 1.x doesn't handle ASM_NAME_PROCESSOR_ID_ARRAY" + " and ASM_NAME_OSINFO_ARRAY correctly\n"); + else + test_assembly_name_props(name, winename); IAssemblyName_Release(name);

1 0

Paul Vriens : crypt32/tests: Don't crash on NT4.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 1461b2c1b48c6b6701e9146ff6a2aebfa3674086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1461b2c1b48c6b6701e9146ff… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Feb 28 19:54:25 2009 +0100 crypt32/tests: Don't crash on NT4. --- dlls/crypt32/tests/msg.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 14492fe..42da890 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2635,6 +2635,14 @@ static void test_msg_control(void) CMSG_HASHED_ENCODE_INFO hashInfo = { 0 }; CMSG_SIGNED_ENCODE_INFO signInfo = { sizeof(signInfo), 0 }; CMSG_CTRL_DECRYPT_PARA decryptPara = { sizeof(decryptPara), 0 }; + BOOL old_crypt32 = FALSE; + + /* I_CertUpdateStore can be used for verification if crypt32 is new enough */ + if (!GetProcAddress(GetModuleHandleA("crypt32.dll"), "I_CertUpdateStore")) + { + win_skip("Some tests will crash on older crypt32 implementations\n"); + old_crypt32 = TRUE; + } /* Crashes ret = CryptMsgControl(NULL, 0, 0, NULL); @@ -2644,7 +2652,7 @@ static void test_msg_control(void) msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, NULL); /* either with no prior update.. */ - for (i = 1; have_nt && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) + for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); @@ -2653,7 +2661,7 @@ static void test_msg_control(void) } ret = CryptMsgUpdate(msg, NULL, 0, TRUE); /* or after an update. */ - for (i = 1; have_nt && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) + for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); @@ -2668,7 +2676,7 @@ static void test_msg_control(void) msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, &hashInfo, NULL, NULL); /* either with no prior update.. */ - for (i = 1; have_nt && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) + for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); @@ -2677,7 +2685,7 @@ static void test_msg_control(void) } ret = CryptMsgUpdate(msg, NULL, 0, TRUE); /* or after an update. */ - for (i = 1; have_nt && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) + for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); @@ -2691,7 +2699,7 @@ static void test_msg_control(void) msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); /* either before an update.. */ - for (i = 1; have_nt && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) + for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); @@ -2700,7 +2708,7 @@ static void test_msg_control(void) } ret = CryptMsgUpdate(msg, NULL, 0, TRUE); /* or after an update. */ - for (i = 1; have_nt && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) + for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL);

1 0