February 2014 - Wine-commits

Hans Leidekker : winhttp/tests: Move the status notification tests to test.winehq.org.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 5b409fb0d4de686148452331b591c8ae2e21b46f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b409fb0d4de686148452331b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 5 15:31:21 2014 +0100 winhttp/tests: Move the status notification tests to test.winehq.org. --- dlls/winhttp/tests/notification.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index f2a3692..f81a952 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -27,6 +27,7 @@ #include "wine/test.h" static const WCHAR user_agent[] = {'w','i','n','e','t','e','s','t',0}; +static const WCHAR test_winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; enum api { @@ -157,8 +158,6 @@ static void setup_test( struct info *info, enum api function, unsigned int line static void test_connection_cache( void ) { - static const WCHAR codeweavers[] = {'w','w','w','.','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; - HANDLE ses, con, req; DWORD size, status; BOOL ret; @@ -178,7 +177,7 @@ static void test_connection_cache( void ) ok(ret, "failed to set context value %u\n", GetLastError()); setup_test( &info, winhttp_connect, __LINE__ ); - con = WinHttpConnect( ses, codeweavers, 0, 0 ); + con = WinHttpConnect( ses, test_winehq, 0, 0 ); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); setup_test( &info, winhttp_open_request, __LINE__ ); @@ -242,7 +241,7 @@ static void test_connection_cache( void ) ok(ret, "failed to set context value %u\n", GetLastError()); setup_test( &info, winhttp_connect, __LINE__ ); - con = WinHttpConnect( ses, codeweavers, 0, 0 ); + con = WinHttpConnect( ses, test_winehq, 0, 0 ); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); setup_test( &info, winhttp_open_request, __LINE__ ); @@ -300,8 +299,8 @@ static const struct notification redirect_test[] = { { winhttp_connect, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, TRUE }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, TRUE }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, @@ -309,8 +308,8 @@ static const struct notification redirect_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REDIRECT }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, FALSE, TRUE }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, FALSE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, TRUE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, TRUE, TRUE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, FALSE, FALSE, TRUE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, FALSE, FALSE, TRUE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, @@ -326,8 +325,6 @@ static const struct notification redirect_test[] = static void test_redirect( void ) { - static const WCHAR codeweavers[] = {'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; - HANDLE ses, con, req; DWORD size, status; BOOL ret; @@ -347,7 +344,7 @@ static void test_redirect( void ) ok(ret, "failed to set context value %u\n", GetLastError()); setup_test( &info, winhttp_connect, __LINE__ ); - con = WinHttpConnect( ses, codeweavers, 0, 0 ); + con = WinHttpConnect( ses, test_winehq, 0, 0 ); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); setup_test( &info, winhttp_open_request, __LINE__ ); @@ -387,8 +384,8 @@ static const struct notification async_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REDIRECT }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, FALSE, TRUE }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, FALSE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, TRUE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, TRUE, TRUE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, FALSE, FALSE, TRUE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, FALSE, FALSE, TRUE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, @@ -409,8 +406,6 @@ static const struct notification async_test[] = static void test_async( void ) { - static const WCHAR codeweavers[] = {'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; - HANDLE ses, con, req; DWORD size, status; BOOL ret; @@ -431,7 +426,7 @@ static void test_async( void ) ok(ret, "failed to set context value %u\n", GetLastError()); setup_test( &info, winhttp_connect, __LINE__ ); - con = WinHttpConnect( ses, codeweavers, 0, 0 ); + con = WinHttpConnect( ses, test_winehq, 0, 0 ); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); setup_test( &info, winhttp_open_request, __LINE__ );

1 0

Hans Leidekker : winhttp/tests: Move the remaining tests to test.winehq.org.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 97505a7475a5c7fcfa2cc03bcea0438aa5af5e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97505a7475a5c7fcfa2cc03bc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 5 15:31:51 2014 +0100 winhttp/tests: Move the remaining tests to test.winehq.org. --- dlls/winhttp/tests/winhttp.c | 57 +++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97505a7475a5c7fcfa2cc…

1 0

Bruno Jesus : bcrypt: Add BCryptGenRandom stub.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 52aca431e4acb099ae66d5689616793b11314ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52aca431e4acb099ae66d5689… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Feb 3 16:24:21 2014 -0200 bcrypt: Add BCryptGenRandom stub. --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 17 ++++++++++++++--- include/bcrypt.h | 5 +++++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index e1ffb8a..87623f8 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -24,7 +24,7 @@ @ stub BCryptFinalizeKeyPair @ stub BCryptFinishHash @ stub BCryptFreeBuffer -@ stub BCryptGenRandom +@ stdcall BCryptGenRandom(ptr ptr long long) @ stub BCryptGenerateKeyPair @ stub BCryptGenerateSymmetricKey @ stub BCryptGetFipsAlgorithmMode diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 441b3ef..02d0a7d 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -18,11 +18,15 @@ */ #include "config.h" -#include "wine/port.h" -#include "wine/debug.h" +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" #include "winbase.h" #include "bcrypt.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); @@ -48,5 +52,12 @@ NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, *ppAlgList=NULL; *pAlgCount=0; - return ERROR_CALL_NOT_IMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE algorithm, UCHAR *buffer, ULONG count, ULONG flags) +{ + FIXME("%p, %p, %u, %08x - stub\n", algorithm, buffer, count, flags); + + return STATUS_NOT_IMPLEMENTED; } diff --git a/include/bcrypt.h b/include/bcrypt.h index 43d1f94..e7e7a59 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -47,4 +47,9 @@ typedef struct _BCRYPT_ALGORITHM_IDENTIFIER ULONG dwFlags; } BCRYPT_ALGORITHM_IDENTIFIER; +typedef PVOID BCRYPT_ALG_HANDLE; + +#define BCRYPT_RNG_USE_ENTROPY_IN_BUFFER 0x00000001 +#define BCRYPT_USE_SYSTEM_PREFERRED_RNG 0x00000002 + #endif /* __WINE_BCRYPT_H */

1 0

Bruno Jesus : bcrypt/tests: Add tests for BCryptGenRandom.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: a5807d08c57e60e600f746a1d057db8688a39290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5807d08c57e60e600f746a1d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Feb 3 16:24:48 2014 -0200 bcrypt/tests: Add tests for BCryptGenRandom. --- configure | 1 + configure.ac | 1 + dlls/bcrypt/tests/Makefile.in | 5 +++ dlls/bcrypt/tests/bcrypt.c | 76 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+) diff --git a/configure b/configure index 4e999a9..8c3e28e 100755 --- a/configure +++ b/configure @@ -16653,6 +16653,7 @@ wine_fn_config_test dlls/avifil32/tests avifil32_test wine_fn_config_dll avifile.dll16 enable_win16 wine_fn_config_dll avrt enable_avrt implib wine_fn_config_dll bcrypt enable_bcrypt +wine_fn_config_test dlls/bcrypt/tests bcrypt_test wine_fn_config_dll browseui enable_browseui clean,po wine_fn_config_test dlls/browseui/tests browseui_test wine_fn_config_dll cabinet enable_cabinet implib diff --git a/configure.ac b/configure.ac index 7f3c35b..c6769fc 100644 --- a/configure.ac +++ b/configure.ac @@ -2678,6 +2678,7 @@ WINE_CONFIG_TEST(dlls/avifil32/tests) WINE_CONFIG_DLL(avifile.dll16,enable_win16) WINE_CONFIG_DLL(avrt,,[implib]) WINE_CONFIG_DLL(bcrypt) +WINE_CONFIG_TEST(dlls/bcrypt/tests) WINE_CONFIG_DLL(browseui,,[clean,po]) WINE_CONFIG_TEST(dlls/browseui/tests) WINE_CONFIG_DLL(cabinet,,[implib]) diff --git a/dlls/bcrypt/tests/Makefile.in b/dlls/bcrypt/tests/Makefile.in new file mode 100644 index 0000000..b193519 --- /dev/null +++ b/dlls/bcrypt/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = bcrypt.dll +IMPORTS = user32 + +C_SRCS = \ + bcrypt.c diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c new file mode 100644 index 0000000..1d18634 --- /dev/null +++ b/dlls/bcrypt/tests/bcrypt.c @@ -0,0 +1,76 @@ +/* + * Unit test for bcrypt functions + * + * Copyright 2014 Bruno Jesus + * + * 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 <ntstatus.h> +#define WIN32_NO_STATUS +#include <windows.h> +#include <bcrypt.h> + +#include "wine/test.h" + +static NTSTATUS (WINAPI *pBCryptGenRandom)(BCRYPT_ALG_HANDLE hAlgorithm, PUCHAR pbBuffer, + ULONG cbBuffer, ULONG dwFlags); + +static BOOL Init(void) +{ + HMODULE hbcrypt = LoadLibraryA("bcrypt.dll"); + if (!hbcrypt) + { + win_skip("bcrypt library not available\n"); + return FALSE; + } + + pBCryptGenRandom = (void *)GetProcAddress(hbcrypt, "BCryptGenRandom"); + + return TRUE; +} + +static void test_BCryptGenRandom(void) +{ + NTSTATUS ret; + UCHAR buffer[256]; + + if (!pBCryptGenRandom) + { + win_skip("BCryptGenRandom is not available\n"); + return; + } + + todo_wine { + ret = pBCryptGenRandom(NULL, NULL, 0, 0); + ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); + ret = pBCryptGenRandom(NULL, buffer, 0, 0); + ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); + ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), 0); + ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); + ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); + ret = pBCryptGenRandom(NULL, NULL, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); + } +} + +START_TEST(bcrypt) +{ + if (!Init()) + return; + + test_BCryptGenRandom(); +}

1 0

Nikolay Sivov : crypt32/tests: Accept another error code on Win8.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: c7a11f9ed619dfd586e96917faa1ee83d64c7352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7a11f9ed619dfd586e96917f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 21:50:32 2014 +0400 crypt32/tests: Accept another error code on Win8. --- dlls/crypt32/tests/cert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index bd67c18..9c95629 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3724,7 +3724,7 @@ static void testAcquireCertPrivateKey(void) &keyProvInfo); ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &csp, &keySpec, &callerFree); - ok(!ret && GetLastError() == CRYPT_E_NO_KEY_PROPERTY, + ok(!ret && (GetLastError() == CRYPT_E_NO_KEY_PROPERTY || GetLastError() == NTE_BAD_KEYSET /* win8 */), "Expected CRYPT_E_NO_KEY_PROPERTY, got %08x\n", GetLastError()); pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL,

1 0

Bruno Jesus : ws2_32/tests: Fix AcceptEx tests related to address length.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 7a8d43043a86248af45d9456855e4564b81734db URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8d43043a86248af45d94568… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Feb 5 00:47:55 2014 -0200 ws2_32/tests: Fix AcceptEx tests related to address length. --- dlls/ws2_32/tests/sock.c | 56 +++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8cee632..1c22503 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5919,10 +5919,24 @@ static void test_AcceptEx(void) ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "AcceptEx on invalid listening socket " "returned %d + errno %d\n", bret, WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); +todo_wine + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on a non-listening socket " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + iret = listen(listener, 5); + if (iret != 0) { + skip("listening failed, errno = %d\n", WSAGetLastError()); + goto end; + } + bret = pAcceptEx(listener, INVALID_SOCKET, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on invalid accepting socket " +todo_wine + ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "AcceptEx on invalid listening socket " "returned %d + errno %d\n", bret, WSAGetLastError()); bret = pAcceptEx(listener, acceptor, NULL, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), @@ -5935,23 +5949,35 @@ static void test_AcceptEx(void) bret = pAcceptEx(listener, acceptor, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small local address size " - "returned %d + errno %d\n", bret, WSAGetLastError()); +todo_wine + ok(bret == FALSE && (WSAGetLastError() == ERROR_IO_PENDING || broken(WSAGetLastError() == WSAEINVAL)) /* NT4 */, + "AcceptEx on too small local address size returned %d + errno %d\n", + bret, WSAGetLastError()); + bret = CancelIo((HANDLE) listener); + ok(bret, "Failed to cancel pending accept socket\n"); bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 15, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small local address size " - "returned %d + errno %d\n", bret, WSAGetLastError()); +todo_wine + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx on too small local address " + "size returned %d + errno %d\n", + bret, WSAGetLastError()); + bret = CancelIo((HANDLE) listener); + ok(bret, "Failed to cancel pending accept socket\n"); bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, 0, &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small remote address size " - "returned %d + errno %d\n", bret, WSAGetLastError()); +todo_wine + ok(bret == FALSE && (WSAGetLastError() == WSAEFAULT || broken(WSAGetLastError() == WSAEINVAL)) /* NT4 */, + "AcceptEx on too small remote address size returned %d + errno %d\n", bret, WSAGetLastError()); bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 15, &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small remote address size " - "returned %d + errno %d\n", bret, WSAGetLastError()); +todo_wine + ok(bret == FALSE && (WSAGetLastError() == ERROR_IO_PENDING || broken(WSAGetLastError() == WSAEINVAL)) /* NT4 */, + "AcceptEx on too small remote address size returned %d + errno %d\n", bret, WSAGetLastError()); + bret = CancelIo((HANDLE) listener); + ok(bret, "Failed to cancel pending accept socket\n"); bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, @@ -5963,18 +5989,6 @@ static void test_AcceptEx(void) ok(bret == FALSE && WSAGetLastError() == ERROR_INVALID_PARAMETER, "AcceptEx on a NULL overlapped " "returned %d + errno %d\n", bret, WSAGetLastError()); - bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), - sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, - &bytesReturned, &overlapped); - todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on a non-listening socket " - "returned %d + errno %d\n", bret, WSAGetLastError()); - - iret = listen(listener, 5); - if (iret != 0) { - skip("listening failed, errno = %d\n", WSAGetLastError()); - goto end; - } - overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); if (overlapped.hEvent == NULL) { skip("could not create event object, errno = %d\n", GetLastError());

1 0

Nikolay Sivov : vbscript: Support VT_BYREF|VT_DISPATCH as a DISPID_NEWENUM source.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 9b037d559ec0639da9e0f71c0e825a282bb5135d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b037d559ec0639da9e0f71c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 09:05:17 2014 +0400 vbscript: Support VT_BYREF|VT_DISPATCH as a DISPID_NEWENUM source. --- dlls/vbscript/interp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 6365461..75e17af 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1074,12 +1074,13 @@ static HRESULT interp_newenum(exec_ctx_t *ctx) v = stack_pop(ctx); switch(V_VT(v)) { + case VT_DISPATCH|VT_BYREF: case VT_DISPATCH: { IEnumVARIANT *iter; DISPPARAMS dp = {0}; VARIANT iterv; - hres = disp_call(ctx->script, V_DISPATCH(v), DISPID_NEWENUM, &dp, &iterv); + hres = disp_call(ctx->script, V_ISBYREF(v) ? *V_DISPATCHREF(v) : V_DISPATCH(v), DISPID_NEWENUM, &dp, &iterv); VariantClear(v); if(FAILED(hres)) return hres;

1 0

Nikolay Sivov : wshom: Implement get_WorkingDirectory(), handle allocation failures.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 2b1f2001b153190bbd3bb138684149f672a0bf12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1f2001b153190bbd3bb1386… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 09:29:19 2014 +0400 wshom: Implement get_WorkingDirectory(), handle allocation failures. --- dlls/wshom.ocx/shell.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 2dc2bbe..ea9caba 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -409,7 +409,7 @@ static HRESULT WINAPI WshShortcut_get_Arguments(IWshShortcut *iface, BSTR *Argum return hr; *Arguments = SysAllocString(buffW); - return S_OK; + return *Arguments ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI WshShortcut_put_Arguments(IWshShortcut *iface, BSTR Arguments) @@ -501,14 +501,26 @@ static HRESULT WINAPI WshShortcut_put_WindowStyle(IWshShortcut *iface, int ShowC static HRESULT WINAPI WshShortcut_get_WorkingDirectory(IWshShortcut *iface, BSTR *WorkingDirectory) { WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p)->(%p): stub\n", This, WorkingDirectory); - return E_NOTIMPL; + WCHAR buffW[MAX_PATH]; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, WorkingDirectory); + + if (!WorkingDirectory) + return E_POINTER; + + *WorkingDirectory = NULL; + hr = IShellLinkW_GetWorkingDirectory(This->link, buffW, sizeof(buffW)/sizeof(WCHAR)); + if (FAILED(hr)) return hr; + + *WorkingDirectory = SysAllocString(buffW); + return *WorkingDirectory ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI WshShortcut_put_WorkingDirectory(IWshShortcut *iface, BSTR WorkingDirectory) { WshShortcut *This = impl_from_IWshShortcut(iface); - TRACE("(%p)->(%s): stub\n", This, debugstr_w(WorkingDirectory)); + TRACE("(%p)->(%s)\n", This, debugstr_w(WorkingDirectory)); return IShellLinkW_SetWorkingDirectory(This->link, WorkingDirectory); } @@ -584,6 +596,13 @@ static HRESULT WshShortcut_Create(const WCHAR *path, IDispatch **shortcut) } This->path_link = SysAllocString(path); + if (!This->path_link) + { + IShellLinkW_Release(This->link); + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } + *shortcut = (IDispatch*)&This->IWshShortcut_iface; return S_OK;

1 0

Dmitry Timoshkov : server: Fix generic access mapping for a thread.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 6e2de14df11d017da070a30f7a1e9437d8c5ee80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e2de14df11d017da070a30f7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 5 16:46:55 2014 +0900 server: Fix generic access mapping for a thread. --- dlls/advapi32/tests/security.c | 7 +------ server/thread.c | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 8f70faf..87f3ea93 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4985,7 +4985,7 @@ static void test_thread_security(void) switch (map[i].generic) { case GENERIC_READ: -todo_wine + case GENERIC_EXECUTE: ok(access == map[i].mapped || access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; @@ -4994,11 +4994,6 @@ todo_wine ok(access == map[i].mapped || access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION) /* Vista+ */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; - case GENERIC_EXECUTE: -todo_wine - ok(access == map[i].mapped || access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */, - "%d: expected %#x, got %#x\n", i, map[i].mapped, access); - break; case GENERIC_ALL: ok(access == map[i].mapped || access == THREAD_ALL_ACCESS_VISTA, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); diff --git a/server/thread.c b/server/thread.c index 623a3b3..dd0b6b0 100644 --- a/server/thread.c +++ b/server/thread.c @@ -331,9 +331,9 @@ static int thread_signaled( struct object *obj, struct wait_queue_entry *entry ) static unsigned int thread_map_access( struct object *obj, unsigned int access ) { - if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE; - if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | SYNCHRONIZE; - if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | THREAD_QUERY_INFORMATION | THREAD_GET_CONTEXT; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | THREAD_SET_INFORMATION | THREAD_SET_CONTEXT | THREAD_TERMINATE | THREAD_SUSPEND_RESUME; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE; if (access & GENERIC_ALL) access |= THREAD_ALL_ACCESS; return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); }

1 0

Nikolay Sivov : msxml3/tests: Fix a couple of test failure when msxml4 is actually present.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: fa21e6dd7c5d7b8fc3c445b3c56d9459316d4f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa21e6dd7c5d7b8fc3c445b3c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 12:43:20 2014 +0400 msxml3/tests: Fix a couple of test failure when msxml4 is actually present. --- dlls/msxml3/tests/domdoc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e33db88..6af47e7 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9807,6 +9807,8 @@ static void test_mxnamespacemanager(void) EXPECT_REF(mgr2, 2); prefixes = NULL; hr = IVBMXNamespaceManager_getDeclaredPrefixes(mgr2, &prefixes); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { IDispatchEx *dispex; @@ -9841,8 +9843,9 @@ static void test_mxnamespacemanager(void) V_DISPATCH(&ret) = (void*)0x1; hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); - ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + ok(V_VT(&ret) == VT_BSTR, "got %d\n", V_VT(&ret)); + ok(V_BSTR(&ret) != NULL, "got %p\n", V_BSTR(&ret)); + VariantClear(&ret); IDispatchEx_Release(dispex); IMXNamespacePrefixes_Release(prefixes);

1 0