wine-commits July 2007

wine-commits@winehq.org

3 participants
957 discussions

H. Verbeet : wined3d: Only call activate_dimensions() if the texture is used.
by Alexandre Julliard 02 Jul '07

02 Jul '07

Module: wine Branch: master Commit: 9ed84211c1cd75c750d5fb5218b60a31e97628bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed84211c1cd75c750d5fb521… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Jul 1 23:41:04 2007 +0200 wined3d: Only call activate_dimensions() if the texture is used. --- dlls/wined3d/state.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index cbe30fe..bdb4d5b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1658,6 +1658,7 @@ static void activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock, static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[stage]; + BOOL tex_used = stateblock->wineD3DDevice->fixed_function_usage_map[stage]; TRACE("Setting color op for stage %d\n", stage); @@ -1718,7 +1719,7 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D * if the sampler for this stage is dirty */ if(!isStateDirty(context, STATE_SAMPLER(stage))) { - if (mapped_stage != -1) activate_dimensions(stage, stateblock, context); + if (tex_used) activate_dimensions(stage, stateblock, context); } /* Set the texture combiners */

1 0

H. Verbeet : wined3d: Call IWineD3DDeviceImpl_FindTexUnitMap for cards without support for NV_REGISTER_COMBINERS as well .
by Alexandre Julliard 02 Jul '07

02 Jul '07

Module: wine Branch: master Commit: 5e78a83cb20bb70032b5cab68cc9ac2880d12a0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e78a83cb20bb70032b5cab68… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Jul 1 23:40:57 2007 +0200 wined3d: Call IWineD3DDeviceImpl_FindTexUnitMap for cards without support for NV_REGISTER_COMBINERS as well. --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/device.c | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 60830dc..5b2ab01 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -807,9 +807,9 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU glEnable(GL_TEXTURE_SHADER_NV); checkGLcall("glEnable(GL_TEXTURE_SHADER_NV)"); } - if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { - IWineD3DDeviceImpl_FindTexUnitMap(This); - } + + IWineD3DDeviceImpl_FindTexUnitMap(This); + for(i=0; i < context->numDirtyEntries; i++) { dirtyState = context->dirtyArray[i]; idx = dirtyState >> 5; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ed6b6f9..4a15b33 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3261,7 +3261,7 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { device_update_fixed_function_usage_map(This); - if (This->stateBlock->lowest_disabled_stage <= GL_LIMITS(textures)) { + if (!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->lowest_disabled_stage <= GL_LIMITS(textures)) { for (i = 0; i < This->stateBlock->lowest_disabled_stage; ++i) { if (!This->fixed_function_usage_map[i]) continue; @@ -3368,9 +3368,7 @@ static void device_map_vsamplers(IWineD3DDeviceImpl *This, BOOL ps) { void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { BOOL vs = use_vs(This); BOOL ps = use_ps(This); - /* This code can assume that GL_NV_register_combiners are supported, otherwise - * it is never called. - * + /* * Rules are: * -> Pixel shaders need a 1:1 map. In theory the shader input could be mapped too, but * that would be really messy and require shader recompilation

1 0

Kai Blin : ws2_32: Handle IPv6 in WSAStringToAddress.
by Alexandre Julliard 02 Jul '07

02 Jul '07

Module: wine Branch: master Commit: fd133237b072eef23345d180928aaf25aee424cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd133237b072eef23345d1809… Author: Kai Blin <kai.blin(a)gmail.com> Date: Fri Jun 29 23:39:20 2007 +0200 ws2_32: Handle IPv6 in WSAStringToAddress. --- configure | 2 ++ configure.ac | 1 + dlls/ws2_32/socket.c | 39 +++++++++++++++++++++++++++++++++++---- include/config.h.in | 3 +++ 4 files changed, 41 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 7e2549a..3f1ff43 100755 --- a/configure +++ b/configure @@ -15828,6 +15828,7 @@ fi + for ac_func in \ _pclose \ _popen \ @@ -15857,6 +15858,7 @@ for ac_func in \ gettid \ gettimeofday \ getuid \ + inet_pton \ kqueue \ lstat \ memmove \ diff --git a/configure.ac b/configure.ac index f499a70..b262128 100644 --- a/configure.ac +++ b/configure.ac @@ -1151,6 +1151,7 @@ AC_CHECK_FUNCS(\ gettid \ gettimeofday \ getuid \ + inet_pton \ kqueue \ lstat \ memmove \ diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 90fa9b0..b3f1bae 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4457,7 +4457,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, switch(AddressFamily) { - case AF_INET: + case WS_AF_INET: { struct in_addr inetaddr; @@ -4494,8 +4494,9 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, break; } - case AF_INET6: + case WS_AF_INET6: { + struct in6_addr inetaddr; /* If lpAddressLength is too small, tell caller the size we need */ if (*lpAddressLength < sizeof(SOCKADDR_IN6)) { @@ -4503,8 +4504,38 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, res = WSAEFAULT; break; } - FIXME("We don't support IPv6 yet.\n"); - res = WSAEINVAL; +#ifdef HAVE_INET_PTON + memset(lpAddress, 0, sizeof(SOCKADDR_IN6)); + + ((LPSOCKADDR_IN6)lpAddress)->sin6_family = WS_AF_INET6; + + /* This one is a bit tricky. An IPv6 address contains colons, so the + * check from IPv4 doesn't work like that. However, IPv6 addresses that + * contain a port are written with braces like [fd12:3456:7890::1]:12345 + * so what we will do is to look for ']', check if the next char is a + * colon, and if it is, parse the port as in IPv4. */ + + ptrPort = strchr(workBuffer, ']'); + if(ptrPort && *(++ptrPort) == ':') + { + ((LPSOCKADDR_IN6)lpAddress)->sin6_port = (WS_u_short)atoi(ptrPort+1); + *ptrPort = '\0'; + } + else + { + ((LPSOCKADDR_IN6)lpAddress)->sin6_port = 0; + } + + if(inet_pton(AF_INET6, workBuffer, &inetaddr) > 0) + { + memcpy(&((LPSOCKADDR_IN6)lpAddress)->sin6_addr, &inetaddr, + sizeof(struct in6_addr)); + res = 0; + } + else +#endif /* HAVE_INET_PTON */ + res = WSAEINVAL; + break; } default: diff --git a/include/config.h.in b/include/config.h.in index 331e5cc..09d133c 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -240,6 +240,9 @@ /* Define to 1 if you have the `inet_network' function. */ #undef HAVE_INET_NETWORK +/* Define to 1 if you have the `inet_pton' function. */ +#undef HAVE_INET_PTON + /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H

1 0

Michael Stefaniuc : ntdll: Fix missing unlock on error path. Found by Smatch.
by Alexandre Julliard 02 Jul '07

02 Jul '07

Module: wine Branch: master Commit: bf6a96ca663852f24ff652f0dd3b8027ae787dc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf6a96ca663852f24ff652f0d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 29 22:50:18 2007 +0200 ntdll: Fix missing unlock on error path. Found by Smatch. --- dlls/ntdll/loader.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2826d19..bdf09f3 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1806,7 +1806,11 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); if (status != STATUS_BUFFER_TOO_SMALL) break; /* grow the buffer and retry */ - if (!(filename = RtlAllocateHeap( GetProcessHeap(), 0, size ))) return STATUS_NO_MEMORY; + if (!(filename = RtlAllocateHeap( GetProcessHeap(), 0, size ))) + { + status = STATUS_NO_MEMORY; + break; + } } if (status == STATUS_SUCCESS)

1 0

Juan Lang : crypt32: Accept ERROR_INVALID_PARAMETER in addition to ERROR_PATH_NOT_FOUND ( and remove no-longer-useful checkFileStoreFailure).
by Alexandre Julliard 02 Jul '07

02 Jul '07

Module: wine Branch: master Commit: ef134dc70335a76b38d62d52e94c23bd55d2932e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef134dc70335a76b38d62d52e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jun 29 13:00:48 2007 -0700 crypt32: Accept ERROR_INVALID_PARAMETER in addition to ERROR_PATH_NOT_FOUND (and remove no-longer-useful checkFileStoreFailure). --- dlls/crypt32/tests/store.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 549c0c6..aa8f653 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -1191,16 +1191,6 @@ static void testFileStore(void) DeleteFileW(filename); } -static void checkFileStoreFailure(LPCWSTR filename, DWORD dwEncodingType, - DWORD dwFlags, DWORD expectedError) -{ - HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_FILENAME_W, - dwEncodingType, 0, dwFlags, filename); - - ok(!store && GetLastError() == expectedError, - "Expected %08x, got %08x\n", expectedError, GetLastError()); -} - static BOOL initFileFromData(LPCWSTR filename, const BYTE *pb, DWORD cb) { HANDLE file = CreateFileW(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, @@ -1225,17 +1215,23 @@ static void testFileNameStore(void) WCHAR filename[MAX_PATH]; HCERTSTORE store; BOOL ret; + DWORD GLE; - checkFileStoreFailure(NULL, 0, 0, ERROR_PATH_NOT_FOUND); + store = CertOpenStore(CERT_STORE_PROV_FILENAME_W, 0, 0, 0, NULL); + GLE = GetLastError(); + ok(!store && (GLE == ERROR_PATH_NOT_FOUND || GLE == ERROR_INVALID_PARAMETER), + "Expected ERROR_PATH_NOT_FOUND or ERROR_INVALID_PARAMETER, got %08x\n", + GLE); if (!GetTempFileNameW(szDot, szPrefix, 0, filename)) return; DeleteFileW(filename); /* The two flags are mutually exclusive */ - checkFileStoreFailure(filename, 0, - CERT_FILE_STORE_COMMIT_ENABLE_FLAG | CERT_STORE_READONLY_FLAG, - E_INVALIDARG); + store = CertOpenStore(CERT_STORE_PROV_FILENAME_W, 0, 0, + CERT_FILE_STORE_COMMIT_ENABLE_FLAG | CERT_STORE_READONLY_FLAG, filename); + ok(!store && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); /* In all of the following tests, the encoding type seems to be ignored */ if (initFileFromData(filename, bigCert, sizeof(bigCert)))

1 0

Juan Lang : crypt32: Accept ERROR_BADKEY in addition to ERROR_INVALID_HANDLE.
by Alexandre Julliard 02 Jul '07

02 Jul '07

Module: wine Branch: master Commit: 11e6717e667db19fb5b2ffd4315fba76832809e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11e6717e667db19fb5b2ffd43… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jun 29 12:56:43 2007 -0700 crypt32: Accept ERROR_BADKEY in addition to ERROR_INVALID_HANDLE. --- dlls/crypt32/tests/store.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 84eba11..549c0c6 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -595,14 +595,16 @@ static void testRegStore(void) HCERTSTORE store; LONG rc; HKEY key = NULL; - DWORD disp; + DWORD disp, GLE; store = CertOpenStore(CERT_STORE_PROV_REG, 0, 0, 0, NULL); - ok(!store && GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + GLE = GetLastError(); + ok(!store && (GLE == ERROR_INVALID_HANDLE || GLE == ERROR_BADKEY), + "Expected ERROR_INVALID_HANDLE or ERROR_BADKEY, got %d\n", GLE); store = CertOpenStore(CERT_STORE_PROV_REG, 0, 0, 0, key); - ok(!store && GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + GLE = GetLastError(); + ok(!store && (GLE == ERROR_INVALID_HANDLE || GLE == ERROR_BADKEY), + "Expected ERROR_INVALID_HANDLE or ERROR_BADKEY, got %d\n", GLE); /* Opening up any old key works.. */ key = HKEY_CURRENT_USER;

1 0

Juan Lang : crypt32: Accept OSS errors as well.
by Alexandre Julliard 02 Jul '07

02 Jul '07

Module: wine Branch: master Commit: f575d8569bb73dc843ab30daa7c7b305bb813159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f575d8569bb73dc843ab30daa… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jun 29 12:53:35 2007 -0700 crypt32: Accept OSS errors as well. --- dlls/crypt32/tests/store.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 52cf965..84eba11 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -99,6 +99,7 @@ static void testMemStore(void) HCERTSTORE store1, store2; PCCERT_CONTEXT context; BOOL ret; + DWORD GLE; /* NULL provider */ store1 = CertOpenStore(0, 0, 0, 0, NULL); @@ -124,13 +125,15 @@ static void testMemStore(void) context = NULL; ret = CertAddEncodedCertificateToStore(store1, X509_ASN_ENCODING, emptyCert, sizeof(emptyCert), CERT_STORE_ADD_ALWAYS, &context); - /* Windows returns CRYPT_E_ASN1_EOD, but accept CRYPT_E_ASN1_CORRUPT as - * well (because matching errors is tough in this case) + /* Windows returns CRYPT_E_ASN1_EOD or OSS_DATA_ERROR, but accept + * CRYPT_E_ASN1_CORRUPT as well (because matching errors is tough in this + * case) */ - ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || GetLastError() == - CRYPT_E_ASN1_CORRUPT), - "Expected CRYPT_E_ASN1_EOD or CRYPT_E_ASN1_CORRUPT, got %08x\n", - GetLastError()); + GLE = GetLastError(); + ok(!ret && (GLE == CRYPT_E_ASN1_EOD || GLE == CRYPT_E_ASN1_CORRUPT || + GLE == OSS_DATA_ERROR), + "Expected CRYPT_E_ASN1_EOD or CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08x\n", + GLE); /* add a "signed" cert--the signature isn't a real signature, so this adds * without any check of the signature's validity */ @@ -152,10 +155,11 @@ static void testMemStore(void) /* try adding a "signed" CRL as a cert */ ret = CertAddEncodedCertificateToStore(store1, X509_ASN_ENCODING, signedCRL, sizeof(signedCRL), CERT_STORE_ADD_ALWAYS, &context); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || GetLastError() == - CRYPT_E_ASN1_CORRUPT), - "Expected CRYPT_E_ASN1_BADTAG or CRYPT_E_ASN1_CORRUPT, got %08x\n", - GetLastError()); + GLE = GetLastError(); + ok(!ret && (GLE == CRYPT_E_ASN1_BADTAG || GLE == CRYPT_E_ASN1_CORRUPT || + GLE == OSS_DATA_ERROR), + "Expected CRYPT_E_ASN1_BADTAG or CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08x\n", + GLE); /* add a cert to store1 */ ret = CertAddEncodedCertificateToStore(store1, X509_ASN_ENCODING, bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, &context);

1 0

Juan Lang : crypt32: Accept OSS errors.
by Alexandre Julliard 02 Jul '07

02 Jul '07

Module: wine Branch: master Commit: e64e66c41d0fd9d0c390308db1554a75f6d69bd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e64e66c41d0fd9d0c390308db… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jun 29 12:43:00 2007 -0700 crypt32: Accept OSS errors. --- dlls/crypt32/tests/crl.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index d47be6d..462d89f 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -87,22 +87,25 @@ static void init_function_pointers(void) static void testCreateCRL(void) { PCCRL_CONTEXT context; + DWORD GLE; context = CertCreateCRLContext(0, NULL, 0); ok(!context && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); context = CertCreateCRLContext(X509_ASN_ENCODING, NULL, 0); - ok(!context && GetLastError() == CRYPT_E_ASN1_EOD, - "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); + GLE = GetLastError(); + ok(!context && (GLE == CRYPT_E_ASN1_EOD || GLE == OSS_MORE_INPUT), + "Expected CRYPT_E_ASN1_EOD or OSS_MORE_INPUT, got %08x\n", GLE); context = CertCreateCRLContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); - ok(!context && GetLastError() == CRYPT_E_ASN1_CORRUPT, - "Expected CRYPT_E_ASN1_CORRUPT, got %08x\n", GetLastError()); + GLE = GetLastError(); + ok(!context && (GLE == CRYPT_E_ASN1_CORRUPT || GLE == OSS_DATA_ERROR), + "Expected CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08x\n", GLE); context = CertCreateCRLContext(X509_ASN_ENCODING, signedCRL, sizeof(signedCRL) - 1); - ok(!context && (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == CRYPT_E_ASN1_CORRUPT), - "Expected CRYPT_E_ASN1_EOD or CRYPT_E_ASN1_CORRUPT, got %08x\n", - GetLastError()); + ok(!context && (GLE == CRYPT_E_ASN1_EOD || GLE == CRYPT_E_ASN1_CORRUPT || + GLE == OSS_DATA_ERROR), + "Expected CRYPT_E_ASN1_EOD or CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08x\n", + GLE); context = CertCreateCRLContext(X509_ASN_ENCODING, signedCRL, sizeof(signedCRL)); ok(context != NULL, "CertCreateCRLContext failed: %08x\n", GetLastError()); @@ -120,6 +123,7 @@ static void testAddCRL(void) CERT_STORE_CREATE_NEW_FLAG, NULL); PCCRL_CONTEXT context; BOOL ret; + DWORD GLE; if (!store) return; @@ -148,11 +152,13 @@ static void testAddCRL(void) /* No CRL */ ret = CertAddEncodedCRLToStore(0, X509_ASN_ENCODING, NULL, 0, 0, NULL); - ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, - "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); + GLE = GetLastError(); + ok(!ret && (GLE == CRYPT_E_ASN1_EOD || GLE == OSS_MORE_INPUT), + "Expected CRYPT_E_ASN1_EOD or OSS_MORE_INPUT, got %08x\n", GLE); ret = CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, NULL, 0, 0, NULL); - ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, - "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); + GLE = GetLastError(); + ok(!ret && (GLE == CRYPT_E_ASN1_EOD || GLE == OSS_MORE_INPUT), + "Expected CRYPT_E_ASN1_EOD or OSS_MORE_INPUT, got %08x\n", GLE); /* Weird--bad add disposition leads to an access violation in Windows. */ ret = CertAddEncodedCRLToStore(0, X509_ASN_ENCODING, signedCRL,

1 0

Juan Lang : crypt32: Don' t fail when CryptVerifyCertificateSignatureEx is missing, use skip ( and get rid of unnecessary indenting).
by Alexandre Julliard 02 Jul '07

02 Jul '07

Module: wine Branch: master Commit: 85eeccc5857df12dbbce4e78b9c7b5beb6c67184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85eeccc5857df12dbbce4e78b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jun 29 12:38:07 2007 -0700 crypt32: Don't fail when CryptVerifyCertificateSignatureEx is missing, use skip (and get rid of unnecessary indenting). --- dlls/crypt32/tests/cert.c | 93 ++++++++++++++++++++++----------------------- 1 files changed, 46 insertions(+), 47 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 25008be..a14137c 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -33,9 +33,7 @@ static BOOL (WINAPI * pCryptVerifyCertificateSignatureEx) (HCRYPTPROV, DWORD, DWORD, void *, DWORD, void *, DWORD, void *); #define CRYPT_GET_PROC(func) \ - p ## func = (void *)GetProcAddress(hCrypt32, #func); \ - if(!p ## func) \ - trace("GetProcAddress(hCrypt32, \"%s\") failed\n", #func); \ + p ## func = (void *)GetProcAddress(hCrypt32, #func); static void init_function_pointers(void) { @@ -968,22 +966,25 @@ static void testVerifyCertSig(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, DWORD size = 0; BOOL ret; - if(pCryptVerifyCertificateSignatureEx) { - ret = pCryptVerifyCertificateSignatureEx(0, 0, 0, NULL, 0, NULL, 0, NULL); - ok(!ret && GetLastError() == E_INVALIDARG, - "Expected E_INVALIDARG, got %08x\n", GetLastError()); - ret = pCryptVerifyCertificateSignatureEx(csp, 0, 0, NULL, 0, NULL, 0, NULL); - ok(!ret && GetLastError() == E_INVALIDARG, - "Expected E_INVALIDARG, got %08x\n", GetLastError()); - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, 0, NULL, 0, - NULL, 0, NULL); - ok(!ret && GetLastError() == E_INVALIDARG, - "Expected E_INVALIDARG, got %08x\n", GetLastError()); - /* This crashes - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, - CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, NULL, 0, NULL, 0, NULL); - */ + if (!pCryptVerifyCertificateSignatureEx) + { + skip("no CryptVerifyCertificateSignatureEx support\n"); + return; } + ret = pCryptVerifyCertificateSignatureEx(0, 0, 0, NULL, 0, NULL, 0, NULL); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + ret = pCryptVerifyCertificateSignatureEx(csp, 0, 0, NULL, 0, NULL, 0, NULL); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, 0, NULL, 0, + NULL, 0, NULL); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + /* This crashes + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, NULL, 0, NULL, 0, NULL); + */ info.ToBeSigned.cbData = toBeSigned->cbData; info.ToBeSigned.pbData = toBeSigned->pbData; info.SignatureAlgorithm.pszObjId = (LPSTR)sigOID; @@ -999,34 +1000,32 @@ static void testVerifyCertSig(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, CRYPT_DATA_BLOB certBlob = { 0, NULL }; PCERT_PUBLIC_KEY_INFO pubKeyInfo = NULL; - if(pCryptVerifyCertificateSignatureEx) { - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, - CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); - ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, - "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); - certBlob.cbData = 1; - certBlob.pbData = (void *)0xdeadbeef; - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, - CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %08x\n", GetLastError()); - certBlob.cbData = size; - certBlob.pbData = cert; - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, - CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); - ok(!ret && GetLastError() == E_INVALIDARG, - "Expected E_INVALIDARG, got %08x\n", GetLastError()); - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, - CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, - CRYPT_VERIFY_CERT_SIGN_ISSUER_NULL, NULL, 0, NULL); - ok(!ret && GetLastError() == E_INVALIDARG, - "Expected E_INVALIDARG, got %08x\n", GetLastError()); - /* This crashes - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, - CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, - CRYPT_VERIFY_CERT_SIGN_ISSUER_PUBKEY, NULL, 0, NULL); - */ - } + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); + ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); + certBlob.cbData = 1; + certBlob.pbData = (void *)0xdeadbeef; + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %08x\n", GetLastError()); + certBlob.cbData = size; + certBlob.pbData = cert; + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, + CRYPT_VERIFY_CERT_SIGN_ISSUER_NULL, NULL, 0, NULL); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + /* This crashes + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, + CRYPT_VERIFY_CERT_SIGN_ISSUER_PUBKEY, NULL, 0, NULL); + */ CryptExportPublicKeyInfoEx(csp, AT_SIGNATURE, X509_ASN_ENCODING, (LPSTR)sigOID, 0, NULL, NULL, &size); pubKeyInfo = HeapAlloc(GetProcessHeap(), 0, size); @@ -1035,7 +1034,7 @@ static void testVerifyCertSig(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, ret = CryptExportPublicKeyInfoEx(csp, AT_SIGNATURE, X509_ASN_ENCODING, (LPSTR)sigOID, 0, NULL, pubKeyInfo, &size); ok(ret, "CryptExportKey failed: %08x\n", GetLastError()); - if (ret && pCryptVerifyCertificateSignatureEx) + if (ret) { ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob,

1 0

Juan Lang : crypt32: Use skip to avoid failures where support is missing.
by Alexandre Julliard 02 Jul '07

02 Jul '07

Module: wine Branch: master Commit: 68b052057b28f86314538478d0f9834800faaf41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b052057b28f86314538478d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jun 29 12:37:08 2007 -0700 crypt32: Use skip to avoid failures where support is missing. --- dlls/crypt32/tests/encode.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index af08b77..c0940d5 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -3086,6 +3086,11 @@ static void test_encodeCRLIssuingDistPoint(DWORD dwEncoding) ret = CryptEncodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, NULL, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + { + skip("no X509_ISSUING_DIST_POINT encode support\n"); + return; + } ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", GetLastError()); ret = CryptEncodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, &point, @@ -3218,6 +3223,11 @@ static void test_decodeCRLIssuingDistPoint(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, emptySequence, emptySequence[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + { + skip("no X509_ISSUING_DIST_POINT decode support\n"); + return; + } ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2007