Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 62992: [CRT] * Add missing EWOULDBLOCK define. [ADNS] * Make sure we get the intended EWOULDBLOCK here.
by akhaldi＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: akhaldi Date: Sat Apr 26 17:46:43 2014 New Revision: 62992 URL: http://svn.reactos.org/svn/reactos?rev=62992&view=rev Log: [CRT] * Add missing EWOULDBLOCK define. [ADNS] * Make sure we get the intended EWOULDBLOCK here. Modified: trunk/reactos/include/crt/errno.h trunk/reactos/lib/3rdparty/adns/adns_win32/adns_win32.h Modified: trunk/reactos/include/crt/errno.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/errno.h?rev=62… ============================================================================== --- trunk/reactos/include/crt/errno.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/errno.h [iso-8859-1] Sat Apr 26 17:46:43 2014 @@ -69,6 +69,8 @@ #define EDEADLOCK EDEADLK +#define EWOULDBLOCK 140 + #ifdef __cplusplus } #endif Modified: trunk/reactos/lib/3rdparty/adns/adns_win32/adns_win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/adns_win… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/adns_win32/adns_win32.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/adns/adns_win32/adns_win32.h [iso-8859-1] Sat Apr 26 17:46:43 2014 @@ -108,7 +108,15 @@ #define ADNS_CLEAR_ERRNO {WSASetLastError(errno = 0);} #define ENOBUFS WSAENOBUFS + +/* FIXME: there are two types of defines for this, + * one points to WSAEWOULDBLOCK and the other is from errno.h */ +#ifdef EWOULDBLOCK +#undef EWOULDBLOCK +#endif + #define EWOULDBLOCK WSAEWOULDBLOCK + #define EINPROGRESS WSAEINPROGRESS #define EMSGSIZE WSAEMSGSIZE #define ENOPROTOOPT WSAENOPROTOOPT

1 0

[akhaldi] 62991: [WINHTTP_WINETEST] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: akhaldi Date: Sat Apr 26 17:36:17 2014 New Revision: 62991 URL: http://svn.reactos.org/svn/reactos?rev=62991&view=rev Log: [WINHTTP_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/winhttp/notification.c trunk/rostests/winetests/winhttp/url.c trunk/rostests/winetests/winhttp/winhttp.c Modified: trunk/rostests/winetests/winhttp/notification.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/notific… ============================================================================== --- trunk/rostests/winetests/winhttp/notification.c [iso-8859-1] (original) +++ trunk/rostests/winetests/winhttp/notification.c [iso-8859-1] Sat Apr 26 17:36:17 2014 @@ -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 { @@ -44,9 +45,9 @@ { enum api function; /* api responsible for notification */ unsigned int status; /* status received */ - int todo; - int ignore; - int skipped_for_proxy; + BOOL todo; + BOOL ignore; + BOOL skipped_for_proxy; }; struct info @@ -89,7 +90,7 @@ DWORD size = sizeof(struct info *); WinHttpQueryOption( handle, WINHTTP_OPTION_CONTEXT_VALUE, &info, &size ); } - ok(i < info->count, "unexpected notification 0x%08x\n", status); + ok(i < info->count, "%u: unexpected notification 0x%08x\n", info->line, status); if (i >= info->count) return; status_ok = (info->test[i].status == status); @@ -107,7 +108,7 @@ todo_wine ok(function_ok, "%u: expected function %u got %u\n", info->line, info->test[i].function, info->function); } } - if (status_ok) info->index++; + if (status_ok && function_ok) info->index++; if (proxy_active()) { while (info->test[info->index].skipped_for_proxy) @@ -122,31 +123,31 @@ static const struct notification cache_test[] = { - { winhttp_connect, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, 0 }, - { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0, 1 }, - { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 } + { 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_CONNECTING_TO_SERVER }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, FALSE, TRUE }, + { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, + { 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 }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE } }; static void setup_test( struct info *info, enum api function, unsigned int line ) @@ -157,8 +158,6 @@ 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 @@ 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 @@ 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__ ); @@ -298,36 +297,34 @@ static const struct notification redirect_test[] = { - { winhttp_connect, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, 0 }, - { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REDIRECT, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 } + { winhttp_connect, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, + { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, + { 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 }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, + { 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, 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 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE } }; 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 @@ 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__ ); @@ -375,42 +372,40 @@ static const struct notification async_test[] = { - { winhttp_connect, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, 0 }, - { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, 0 }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REDIRECT, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE, 0 }, - { winhttp_query_data, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, 0 }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0, 1 }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0, 1 }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 } + { winhttp_connect, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, + { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, + { 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 }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE }, + { 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, 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 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE }, + { winhttp_query_data, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, FALSE, TRUE }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, FALSE, TRUE }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE } }; 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; @@ -420,7 +415,7 @@ info.test = async_test; info.count = sizeof(async_test) / sizeof(async_test[0]); info.index = 0; - info.wait = CreateEvent( NULL, FALSE, FALSE, NULL ); + info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); ses = WinHttpOpen( user_agent, 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); ok(ses != NULL, "failed to open session %u\n", GetLastError()); @@ -431,7 +426,7 @@ 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__ ); Modified: trunk/rostests/winetests/winhttp/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/url.c?r… ============================================================================== --- trunk/rostests/winetests/winhttp/url.c [iso-8859-1] (original) +++ trunk/rostests/winetests/winhttp/url.c [iso-8859-1] Sat Apr 26 17:36:17 2014 @@ -353,21 +353,21 @@ uc.dwExtraInfoLength = 20; ret = WinHttpCrackUrl( url1, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed\n" ); - ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme\n" ); - ok( !memcmp( uc.lpszScheme, http, sizeof(http) ), "unexpected scheme\n" ); - ok( uc.dwSchemeLength == 4, "unexpected scheme length\n" ); - ok( !memcmp( uc.lpszUserName, username, sizeof(username) ), "unexpected username\n" ); - ok( uc.dwUserNameLength == 8, "unexpected username length\n" ); - ok( !memcmp( uc.lpszPassword, password, sizeof(password) ), "unexpected password\n" ); - ok( uc.dwPasswordLength == 8, "unexpected password length\n" ); - ok( !memcmp( uc.lpszHostName, winehq, sizeof(winehq) ), "unexpected hostname\n" ); - ok( uc.dwHostNameLength == 14, "unexpected hostname length\n" ); + ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme: %u\n", uc.nScheme ); + ok( !memcmp( uc.lpszScheme, http, sizeof(http) ), "unexpected scheme: %s\n", wine_dbgstr_w(uc.lpszScheme) ); + ok( uc.dwSchemeLength == 4, "unexpected scheme length: %u\n", uc.dwSchemeLength ); + ok( !memcmp( uc.lpszUserName, username, sizeof(username) ), "unexpected username: %s\n", wine_dbgstr_w(uc.lpszUserName) ); + ok( uc.dwUserNameLength == 8, "unexpected username length: %u\n", uc.dwUserNameLength ); + ok( !memcmp( uc.lpszPassword, password, sizeof(password) ), "unexpected password: %s\n", wine_dbgstr_w(uc.lpszPassword) ); + ok( uc.dwPasswordLength == 8, "unexpected password length: %u\n", uc.dwPasswordLength ); + ok( !memcmp( uc.lpszHostName, winehq, sizeof(winehq) ), "unexpected hostname: %s\n", wine_dbgstr_w(uc.lpszHostName) ); + ok( uc.dwHostNameLength == 14, "unexpected hostname length: %u\n", uc.dwHostNameLength ); ok( uc.nPort == 80, "unexpected port: %u\n", uc.nPort ); - ok( !memcmp( uc.lpszUrlPath, about, sizeof(about) ), "unexpected path\n" ); - ok( uc.dwUrlPathLength == 11, "unexpected path length\n" ); - ok( !memcmp( uc.lpszExtraInfo, query, sizeof(query) ), "unexpected extra info\n" ); - ok( uc.dwExtraInfoLength == 6, "unexpected extra info length\n" ); + ok( !memcmp( uc.lpszUrlPath, about, sizeof(about) ), "unexpected path: %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); + ok( uc.dwUrlPathLength == 11, "unexpected path length: %u\n", uc.dwUrlPathLength ); + ok( !memcmp( uc.lpszExtraInfo, query, sizeof(query) ), "unexpected extra info: %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); + ok( uc.dwExtraInfoLength == 6, "unexpected extra info length: %u\n", uc.dwExtraInfoLength ); /* buffer of insufficient length */ scheme[0] = 0; @@ -376,15 +376,15 @@ SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( url1, 0, 0, &uc ); error = GetLastError(); - ok( !ret, "WinHttpCrackUrl failed\n" ); - ok( error == ERROR_INSUFFICIENT_BUFFER, "WinHttpCrackUrl failed\n" ); + ok( !ret, "WinHttpCrackUrl succeeded\n" ); + ok( error == ERROR_INSUFFICIENT_BUFFER, "got %u, expected ERROR_INSUFFICIENT_BUFFER\n", error ); ok( uc.dwSchemeLength == 5, "unexpected scheme length: %u\n", uc.dwSchemeLength ); /* no buffers */ reset_url_components( &uc ); ret = WinHttpCrackUrl( url_k1, 0, 0,&uc); - ok( ret, "WinHttpCrackUrl failed\n" ); + ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme\n" ); ok( uc.lpszScheme == url_k1,"unexpected scheme\n" ); ok( uc.dwSchemeLength == 4, "unexpected scheme length\n" ); @@ -403,7 +403,7 @@ reset_url_components( &uc ); ret = WinHttpCrackUrl( url_k2, 0, 0,&uc); - ok( ret, "WinHttpCrackUrl failed\n" ); + ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme\n" ); ok( uc.lpszScheme == url_k2, "unexpected scheme\n" ); ok( uc.dwSchemeLength == 4, "unexpected scheme length\n" ); @@ -422,7 +422,7 @@ reset_url_components( &uc ); ret = WinHttpCrackUrl( url_k3, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed\n" ); + ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); ok( uc.nScheme == INTERNET_SCHEME_HTTPS, "unexpected scheme\n" ); ok( uc.lpszScheme == url_k3, "unexpected scheme\n" ); ok( uc.dwSchemeLength == 5, "unexpected scheme length\n" ); @@ -441,61 +441,61 @@ /* bad parameters */ reset_url_components( &uc ); ret = WinHttpCrackUrl( url_k4, 0, 0, &uc ); - ok( !ret, "WinHttpCrackUrl failed\n" ); + ok( !ret, "WinHttpCrackUrl succeeded\n" ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url_k5, 0, 0, &uc ); - ok( !ret, "WinHttpCrackUrl failed\n" ); + ok( !ret, "WinHttpCrackUrl succeeded\n" ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url_k6, 0, 0, &uc ); - ok( !ret, "WinHttpCrackUrl failed\n" ); + ok( !ret, "WinHttpCrackUrl succeeded\n" ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url_k7, 0, 0, &uc ); - ok( !ret, "WinHttpCrackUrl failed\n" ); + ok( !ret, "WinHttpCrackUrl succeeded\n" ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url_k8, 0, 0, &uc ); - ok( !ret, "WinHttpCrackUrl failed\n" ); + ok( !ret, "WinHttpCrackUrl succeeded\n" ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url_k9, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed\n" ); - ok( uc.lpszUrlPath == url_k9 + 14, "unexpected path\n" ); - ok( uc.dwUrlPathLength == 0, "unexpected path length\n" ); - ok( uc.lpszExtraInfo == url_k9 + 14, "unexpected extra info\n" ); - ok( uc.dwExtraInfoLength == 0, "unexpected extra info length\n" ); + ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( uc.lpszUrlPath == url_k9 + 14, "unexpected path: %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); + ok( uc.dwUrlPathLength == 0, "unexpected path length: %u\n", uc.dwUrlPathLength ); + ok( uc.lpszExtraInfo == url_k9 + 14, "unexpected extra info: %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); + ok( uc.dwExtraInfoLength == 0, "unexpected extra info length: %u\n", uc.dwExtraInfoLength ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url_k10, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed\n" ); - ok( uc.lpszUrlPath == url_k10 + 13, "unexpected path\n" ); - ok( uc.dwUrlPathLength == 7, "unexpected path length\n" ); - ok( uc.lpszExtraInfo == url_k10 + 20, "unexpected extra info\n" ); - ok( uc.dwExtraInfoLength == 0, "unexpected extra info length\n" ); + ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( uc.lpszUrlPath == url_k10 + 13, "unexpected path: %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); + ok( uc.dwUrlPathLength == 7, "unexpected path length: %u\n", uc.dwUrlPathLength ); + ok( uc.lpszExtraInfo == url_k10 + 20, "unexpected extra info: %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); + ok( uc.dwExtraInfoLength == 0, "unexpected extra info length: %u\n", uc.dwExtraInfoLength ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url5, 0, 0, &uc ); - ok( !ret, "WinHttpCrackUrl failed\n" ); + ok( !ret, "WinHttpCrackUrl succeeded\n" ); reset_url_components( &uc ); ret = WinHttpCrackUrl( empty, 0, 0, &uc ); - ok( !ret, "WinHttpCrackUrl failed\n" ); + ok( !ret, "WinHttpCrackUrl succeeded\n" ); ret = WinHttpCrackUrl( url1, 0, 0, NULL ); - ok( !ret, "WinHttpCrackUrl failed\n" ); + ok( !ret, "WinHttpCrackUrl succeeded\n" ); ret = WinHttpCrackUrl( NULL, 0, 0, &uc ); - ok( !ret, "WinHttpCrackUrl failed\n" ); + ok( !ret, "WinHttpCrackUrl succeeded\n" ); /* decoding without buffers */ reset_url_components( &uc ); SetLastError(0xdeadbeef); ret = WinHttpCrackUrl( url8, 0, ICU_DECODE, &uc ); error = GetLastError(); - ok( !ret, "WinHttpCrackUrl failed\n" ); - ok( error == ERROR_INVALID_PARAMETER, "WinHttpCrackUrl failed\n" ); + ok( !ret, "WinHttpCrackUrl succeeded\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u, expected ERROR_INVALID_PARAMETER\n", error ); /* decoding with buffers */ uc.lpszScheme = scheme; @@ -538,7 +538,7 @@ path[0] = 0; ret = WinHttpCrackUrl( url7, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed\n" ); + ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); ok( !memcmp( uc.lpszHostName, winehq, sizeof(winehq) ), "unexpected host name: %s\n", wine_dbgstr_w(uc.lpszHostName) ); ok( uc.dwHostNameLength == 14, "unexpected host name length: %d\n", uc.dwHostNameLength ); ok( uc.nPort == 42, "unexpected port: %u\n", uc.nPort ); @@ -546,17 +546,17 @@ /* decoding without buffers */ reset_url_components( &uc ); ret = WinHttpCrackUrl( url9, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed\n" ); + ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); ok( uc.nPort == 0, "unexpected port: %u\n", uc.nPort ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url10, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed\n" ); + ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); ok( uc.nPort == 80, "unexpected port: %u\n", uc.nPort ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url11, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed\n" ); + ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); ok( uc.nPort == 443, "unexpected port: %u\n", uc.nPort ); reset_url_components( &uc ); @@ -575,7 +575,7 @@ reset_url_components( &uc ); ret = WinHttpCrackUrl( url12, 0, 0, &uc); - ok( ret, "WinHttpCrackUrl failed\n" ); + ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme\n" ); ok( uc.lpszScheme == url12,"unexpected scheme\n" ); ok( uc.dwSchemeLength == 4, "unexpected scheme length\n" ); @@ -603,7 +603,7 @@ uc.dwExtraInfoLength = 0; uc.nPort = 0; ret = WinHttpCrackUrl( url13, 0, ICU_DECODE, &uc ); - ok( ret, "WinHttpCrackUrl failed\n" ); + ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); uc.lpszScheme = scheme; uc.dwSchemeLength = 20; @@ -619,7 +619,7 @@ uc.dwExtraInfoLength = 0; uc.nPort = 0; ret = WinHttpCrackUrl( url14, 0, ICU_ESCAPE|ICU_DECODE, &uc ); - ok( ret, "WinHttpCrackUrl failed\n" ); + ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); ok( !lstrcmpW( uc.lpszHostName, hostnameW ), "unexpected host name\n" ); ok( !lstrcmpW( uc.lpszUrlPath, pathW ), "unexpected path\n" ); } Modified: trunk/rostests/winetests/winhttp/winhttp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/winhttp… ============================================================================== --- trunk/rostests/winetests/winhttp/winhttp.c [iso-8859-1] (original) +++ trunk/rostests/winetests/winhttp/winhttp.c [iso-8859-1] Sat Apr 26 17:36:17 2014 @@ -41,7 +41,7 @@ static const WCHAR test_useragent[] = {'W','i','n','e',' ','R','e','g','r','e','s','s','i','o','n',' ','T','e','s','t',0}; -static const WCHAR test_server[] = {'w','i','n','e','h','q','.','o','r','g',0}; +static const WCHAR test_winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR localhostW[] = {'l','o','c','a','l','h','o','s','t',0}; static BOOL proxy_active(void) @@ -146,7 +146,7 @@ "expected ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, got %u\n", GetLastError()); SetLastError(0xdeadbeef); - connection = WinHttpConnect(session, test_server, INTERNET_DEFAULT_HTTP_PORT, 0); + connection = WinHttpConnect(session, test_winehq, INTERNET_DEFAULT_HTTP_PORT, 0); ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u\n", GetLastError()); feature = WINHTTP_DISABLE_COOKIES; @@ -227,7 +227,7 @@ ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); /* Test with a valid server name */ - connection = WinHttpConnect (session, test_server, INTERNET_DEFAULT_HTTP_PORT, 0); + connection = WinHttpConnect (session, test_winehq, INTERNET_DEFAULT_HTTP_PORT, 0); ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); request = WinHttpOpenRequest(connection, NULL, NULL, NULL, WINHTTP_NO_REFERER, @@ -259,7 +259,6 @@ static void test_empty_headers_param(void) { - static const WCHAR winehq[] = {'w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR empty[] = {0}; HINTERNET ses, con, req; BOOL ret; @@ -267,7 +266,7 @@ ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); - con = WinHttpConnect(ses, winehq, 80, 0); + con = WinHttpConnect(ses, test_winehq, 80, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); @@ -283,6 +282,13 @@ static void test_SendRequest (void) { + static const WCHAR content_type[] = + {'C','o','n','t','e','n','t','-','T','y','p','e',':',' ','a','p','p','l','i','c','a','t','i','o','n', + '/','x','-','w','w','w','-','f','o','r','m','-','u','r','l','e','n','c','o','d','e','d',0}; + static const WCHAR test_file[] = {'t','e','s','t','s','/','p','o','s','t','.','p','h','p',0}; + static const WCHAR test_verb[] = {'P','O','S','T',0}; + static CHAR post_data[] = "mode=Test"; + static const char test_post[] = "mode => Test\0\n"; HINTERNET session, request, connection; DWORD header_len, optional_len, total_len, bytes_rw, size; DWORD_PTR context; @@ -290,16 +296,6 @@ CHAR buffer[256]; int i; - static const WCHAR test_site[] = {'c','r','o','s','s','o','v','e','r','.', - 'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; - static const WCHAR content_type[] = - {'C','o','n','t','e','n','t','-','T','y','p','e',':',' ','a','p','p','l','i','c','a','t','i','o','n', - '/','x','-','w','w','w','-','f','o','r','m','-','u','r','l','e','n','c','o','d','e','d',0}; - static const WCHAR test_file[] = {'/','p','o','s','t','t','e','s','t','.','p','h','p',0}; - static const WCHAR test_verb[] = {'P','O','S','T',0}; - static CHAR post_data[] = "mode=Test"; - static CHAR test_post[] = "mode => Test\\0\n"; - header_len = -1L; total_len = optional_len = sizeof(post_data); memset(buffer, 0xff, sizeof(buffer)); @@ -308,7 +304,7 @@ WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); ok(session != NULL, "WinHttpOpen failed to open session.\n"); - connection = WinHttpConnect (session, test_site, INTERNET_DEFAULT_HTTP_PORT, 0); + connection = WinHttpConnect (session, test_winehq, INTERNET_DEFAULT_HTTP_PORT, 0); ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); request = WinHttpOpenRequest(connection, test_verb, test_file, NULL, WINHTTP_NO_REFERER, @@ -355,8 +351,8 @@ ret = WinHttpReadData(request, buffer, sizeof(buffer) - 1, &bytes_rw); ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); - ok(bytes_rw == strlen(test_post), "Read %u bytes instead of %d.\n", bytes_rw, lstrlen(test_post)); - ok(strncmp(buffer, test_post, bytes_rw) == 0, "Data read did not match, got '%s'.\n", buffer); + ok(bytes_rw == sizeof(test_post) - 1, "Read %u bytes\n", bytes_rw); + ok(!memcmp(buffer, test_post, sizeof(test_post) - 1), "Data read did not match.\n"); ret = WinHttpCloseHandle(request); ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); @@ -413,15 +409,12 @@ WCHAR check_buffer[MAX_PATH]; DWORD index, len, oldlen; - static const WCHAR test_site[] = {'c','r','o','s','s','o','v','e','r','.', - 'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; static const WCHAR test_file[] = {'/','p','o','s','t','t','e','s','t','.','p','h','p',0}; static const WCHAR test_verb[] = {'P','O','S','T',0}; - static const WCHAR test_header_begin[] = {'P','O','S','T',' ','/','p','o','s','t','t','e','s','t','.','p','h','p',' ','H','T','T','P','/','1'}; static const WCHAR full_path_test_header_begin[] = - {'P','O','S','T',' ','h','t','t','p',':','/','/','c','r','o','s','s','o','v','e','r','.','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',':','8','0','/','p','o','s','t','t','e','s','t','.','p','h','p',' ','H','T','T','P','/','1'}; + {'P','O','S','T',' ','h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',':','8','0','/','p','o','s','t','.','p','h','p',' ','H','T','T','P','/','1'}; static const WCHAR test_header_end[] = {'\r','\n','\r','\n',0}; static const WCHAR test_header_name[] = {'W','a','r','n','i','n','g',0}; @@ -469,7 +462,7 @@ WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); ok(session != NULL, "WinHttpOpen failed to open session.\n"); - connection = WinHttpConnect (session, test_site, INTERNET_DEFAULT_HTTP_PORT, 0); + connection = WinHttpConnect (session, test_winehq, INTERNET_DEFAULT_HTTP_PORT, 0); ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); request = WinHttpOpenRequest(connection, test_verb, test_file, NULL, WINHTTP_NO_REFERER, @@ -816,8 +809,6 @@ static void test_secure_connection(void) { - static const WCHAR google[] = {'w','w','w','.','g','o','o','g','l','e','.','c','o','m',0}; - HINTERNET ses, con, req; DWORD size, status, policy, bitness, read_size; BOOL ret; @@ -832,7 +823,7 @@ ret = WinHttpSetOption(ses, WINHTTP_OPTION_REDIRECT_POLICY, &policy, sizeof(policy)); ok(ret, "failed to set redirect policy %u\n", GetLastError()); - con = WinHttpConnect(ses, google, 443, 0); + con = WinHttpConnect(ses, test_winehq, 443, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); /* try without setting WINHTTP_FLAG_SECURE */ @@ -922,8 +913,6 @@ static void test_request_parameter_defaults(void) { static const WCHAR empty[] = {0}; - static const WCHAR codeweavers[] = {'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; - HINTERNET ses, con, req; DWORD size, status, error; WCHAR *version; @@ -932,7 +921,7 @@ ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); - con = WinHttpConnect(ses, codeweavers, 0, 0); + con = WinHttpConnect(ses, test_winehq, 0, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); @@ -1126,8 +1115,6 @@ BOOL ret; DWORD value, size; HINTERNET ses, req, con; - static const WCHAR codeweavers[] = {'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; - ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); @@ -1288,7 +1275,7 @@ ok(ret, "%u\n", GetLastError()); ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); - con = WinHttpConnect(ses, codeweavers, 0, 0); + con = WinHttpConnect(ses, test_winehq, 0, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); /* Timeout values should match the last one set for session */ @@ -1717,11 +1704,8 @@ static void test_resolve_timeout(void) { - static const WCHAR codeweavers[] = - {'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; static const WCHAR nxdomain[] = - {'n','x','d','o','m','a','i','n','.','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; - + {'n','x','d','o','m','a','i','n','.','w','i','n','e','h','q','.','o','r','g',0}; HINTERNET ses, con, req; DWORD timeout; BOOL ret; @@ -1743,6 +1727,11 @@ SetLastError(0xdeadbeef); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + if(ret == 1) + { + skip("nxdomain returned success. Broken ISP redirects?\n"); + return; + } ok(!ret, "sent request\n"); ok(GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED, "expected ERROR_WINHTTP_NAME_NOT_RESOLVED got %u\n", GetLastError()); @@ -1761,7 +1750,7 @@ ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &timeout, sizeof(timeout)); ok(ret, "failed to set resolve timeout %u\n", GetLastError()); - con = WinHttpConnect(ses, codeweavers, 0, 0); + con = WinHttpConnect(ses, test_winehq, 0, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); @@ -1805,6 +1794,8 @@ HANDLE event; int port; }; + +#define BIG_BUFFER_LEN 0x2250 static DWORD CALLBACK server_thread(LPVOID param) { @@ -1863,6 +1854,13 @@ else send(c, noauthmsg, sizeof noauthmsg - 1, 0); } + if (strstr(buffer, "/big")) + { + char msg[BIG_BUFFER_LEN]; + memset(msg, 'm', sizeof(msg)); + send(c, okmsg, sizeof(okmsg) - 1, 0); + send(c, msg, sizeof(msg), 0); + } if (strstr(buffer, "/no_headers")) { send(c, page1, sizeof page1 - 1, 0); @@ -2085,13 +2083,19 @@ ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - ret = WinHttpReceiveResponse(req, NULL); - error = GetLastError(); - ok(!ret, "expected failure\n"); - ok(error == ERROR_WINHTTP_INVALID_SERVER_RESPONSE, "got %u\n", error); + if (!ret) + { + error = GetLastError(); + ok(error == ERROR_WINHTTP_INVALID_SERVER_RESPONSE, "got %u\n", error); + } + else + { + SetLastError(0xdeadbeef); + ret = WinHttpReceiveResponse(req, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_WINHTTP_INVALID_SERVER_RESPONSE, "got %u\n", error); + } WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -2133,6 +2137,55 @@ WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); +} + +static void test_multiple_reads(int port) +{ + static const WCHAR bigW[] = {'b','i','g',0}; + HINTERNET ses, con, req; + DWORD total_len = 0; + BOOL ret; + + ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + con = WinHttpConnect(ses, localhostW, port, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + req = WinHttpOpenRequest(con, NULL, bigW, NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + ok(ret, "failed to send request %u\n", GetLastError()); + + ret = WinHttpReceiveResponse(req, NULL); + ok(ret == TRUE, "expected success\n"); + + for (;;) + { + DWORD len = 0xdeadbeef; + ret = WinHttpQueryDataAvailable( req, &len ); + ok( ret, "WinHttpQueryDataAvailable failed with error %u\n", GetLastError() ); + if (ret) ok( len != 0xdeadbeef, "WinHttpQueryDataAvailable return wrong length\n" ); + if (len) + { + DWORD bytes_read; + char *buf = HeapAlloc( GetProcessHeap(), 0, len + 1 ); + + ret = WinHttpReadData( req, buf, len, &bytes_read ); + ok( len == bytes_read, "only got %u of %u available\n", bytes_read, len ); + + HeapFree( GetProcessHeap(), 0, buf ); + if (!bytes_read) break; + total_len += bytes_read; + } + if (!len) break; + } + ok(total_len == BIG_BUFFER_LEN, "got wrong length: 0x%x\n", total_len); + + WinHttpCloseHandle(req); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); } static void test_connection_info( int port ) @@ -2319,11 +2372,10 @@ { static const WCHAR usernameW[] = {'u','s','e','r','n','a','m','e',0}; static const WCHAR passwordW[] = {'p','a','s','s','w','o','r','d',0}; - static const WCHAR url1W[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',0}; - static const WCHAR url2W[] = {'w','i','n','e','h','q','.','o','r','g',0}; - static const WCHAR url3W[] = {'h','t','t','p',':','/','/','c','r','o','s','s','o','v','e','r','.', - 'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m','/', - 'p','o','s','t','t','e','s','t','.','p','h','p',0}; + static const WCHAR url1W[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR url2W[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR url3W[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.', + 'o','r','g','/','t','e','s','t','s','/','p','o','s','t','.','p','h','p',0}; static const WCHAR method1W[] = {'G','E','T',0}; static const WCHAR method2W[] = {'I','N','V','A','L','I','D',0}; static const WCHAR method3W[] = {'P','O','S','T',0}; @@ -2764,7 +2816,7 @@ if (!ret) { ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); - ok( url == (WCHAR *)0xdeadbeef, "got %p\n", url ); + ok( !url || broken(url == (WCHAR *)0xdeadbeef), "got %p\n", url ); } else { @@ -2779,7 +2831,7 @@ if (!ret) { ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); - ok( url == (WCHAR *)0xdeadbeef, "got %p\n", url ); + ok( !url || broken(url == (WCHAR *)0xdeadbeef), "got %p\n", url ); } else { @@ -2926,7 +2978,6 @@ static void test_chunked_read(void) { - static const WCHAR host[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR verb[] = {'/','t','e','s','t','c','h','u','n','k','e','d',0}; static const WCHAR chunked[] = {'c','h','u','n','k','e','d',0}; WCHAR header[32]; @@ -2940,7 +2991,7 @@ ok( ses != NULL, "WinHttpOpen failed with error %u\n", GetLastError() ); if (!ses) goto done; - con = WinHttpConnect( ses, host, 0, 0 ); + con = WinHttpConnect( ses, test_winehq, 0, 0 ); ok( con != NULL, "WinHttpConnect failed with error %u\n", GetLastError() ); if (!con) goto done; @@ -3028,7 +3079,7 @@ test_WinHttpGetProxyForUrl(); test_chunked_read(); - si.event = CreateEvent(NULL, 0, 0, NULL); + si.event = CreateEventW(NULL, 0, 0, NULL); si.port = 7532; thread = CreateThread(NULL, 0, server_thread, (LPVOID)&si, 0, NULL); @@ -3044,6 +3095,7 @@ test_no_headers(si.port); test_basic_authentication(si.port); test_bad_header(si.port); + test_multiple_reads(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, NULL, quitW);

1 0

[akhaldi] 62990: [WINHTTP] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: akhaldi Date: Sat Apr 26 17:34:51 2014 New Revision: 62990 URL: http://svn.reactos.org/svn/reactos?rev=62990&view=rev Log: [WINHTTP] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/winhttp/cookie.c trunk/reactos/dll/win32/winhttp/main.c trunk/reactos/dll/win32/winhttp/net.c trunk/reactos/dll/win32/winhttp/request.c trunk/reactos/dll/win32/winhttp/session.c trunk/reactos/dll/win32/winhttp/winhttp_private.h trunk/reactos/dll/win32/winhttp/winhttp_tlb.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/winhttp/cookie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/cookie.c… ============================================================================== --- trunk/reactos/dll/win32/winhttp/cookie.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/cookie.c [iso-8859-1] Sat Apr 26 17:34:51 2014 @@ -122,20 +122,21 @@ const WCHAR *p; int len; + if (!(p = strchrW( string, '=' ))) + { + WARN("no '=' in %s\n", debugstr_w(string)); + return NULL; + } + if (p == string) + { + WARN("empty cookie name in %s\n", debugstr_w(string)); + return NULL; + } + if (!(cookie = heap_alloc_zero( sizeof(cookie_t) ))) return NULL; list_init( &cookie->entry ); - if (!(p = strchrW( string, '=' ))) - { - WARN("no '=' in %s\n", debugstr_w(string)); - return NULL; - } - if (p == string) - { - WARN("empty cookie name in %s\n", debugstr_w(string)); - return NULL; - } len = p - string; if (!(cookie->name = heap_alloc( (len + 1) * sizeof(WCHAR) ))) { Modified: trunk/reactos/dll/win32/winhttp/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/winhttp/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/main.c [iso-8859-1] Sat Apr 26 17:34:51 2014 @@ -42,7 +42,7 @@ return TRUE; } -typedef HRESULT (*fnCreateInstance)( IUnknown *outer, void **obj ); +typedef HRESULT (*fnCreateInstance)( void **obj ); struct winhttp_cf { @@ -99,14 +99,11 @@ if (outer) return CLASS_E_NOAGGREGATION; - hr = cf->pfnCreateInstance( outer, (void **)&unknown ); + hr = cf->pfnCreateInstance( (void **)&unknown ); if (FAILED(hr)) return hr; hr = IUnknown_QueryInterface( unknown, riid, obj ); - if (FAILED(hr)) - return hr; - IUnknown_Release( unknown ); return hr; } Modified: trunk/reactos/dll/win32/winhttp/net.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/net.c?re… ============================================================================== --- trunk/reactos/dll/win32/winhttp/net.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/net.c [iso-8859-1] Sat Apr 26 17:34:51 2014 @@ -705,24 +705,23 @@ return TRUE; } -BOOL netconn_query_data_available( netconn_t *conn, DWORD *available ) -{ +ULONG netconn_query_data_available( netconn_t *conn ) +{ + if(!netconn_connected(conn)) + return 0; + + if(conn->secure) { + return conn->peek_len; + }else { #ifdef FIONREAD - int ret; - ULONG unread; -#endif - *available = 0; - if (!netconn_connected( conn )) return FALSE; - - if (conn->secure) - { - *available = conn->peek_len; - return TRUE; - } -#ifdef FIONREAD - if (!(ret = ioctlsocket( conn->socket, FIONREAD, &unread ))) *available = unread; -#endif - return TRUE; + ULONG unread; + + if(!ioctlsocket(conn->socket, FIONREAD, &unread)) + return unread; +#endif + } + + return 0; } DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) Modified: trunk/reactos/dll/win32/winhttp/request.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/request.… ============================================================================== --- trunk/reactos/dll/win32/winhttp/request.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/request.c [iso-8859-1] Sat Apr 26 17:34:51 2014 @@ -25,6 +25,7 @@ # include <arpa/inet.h> #endif +#include <assert.h> #include <winuser.h> #include <httprequest.h> @@ -852,7 +853,7 @@ /* * Set (header) termination string for request - * Make sure there's exactly two new lines at the end of the request + * Make sure there are exactly two new lines at the end of the request */ p = &requestString[strlenW(requestString)-1]; while ( (*p == '\n') || (*p == '\r') ) @@ -995,6 +996,8 @@ done: request->read_pos = request->read_size = 0; request->read_chunked = FALSE; + request->read_chunked_size = ~0u; + request->read_chunked_eof = FALSE; heap_free( addressW ); return TRUE; } @@ -1121,7 +1124,7 @@ request->optional_len = optional_len; len += optional_len; } - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, &len, sizeof(DWORD) ); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, &len, sizeof(len) ); end: if (async) @@ -1374,7 +1377,7 @@ char c0, c1, c2, c3; const WCHAR *p = base64; - while (len >= 4) + while (len > 4) { if ((c0 = decode_char( p[0] )) > 63) return 0; if ((c1 = decode_char( p[1] )) > 63) return 0; @@ -1411,6 +1414,21 @@ buf[i + 1] = (c1 << 4) | (c2 >> 2); } i += 2; + } + else + { + if ((c0 = decode_char( p[0] )) > 63) return 0; + if ((c1 = decode_char( p[1] )) > 63) return 0; + if ((c2 = decode_char( p[2] )) > 63) return 0; + if ((c3 = decode_char( p[3] )) > 63) return 0; + + if (buf) + { + buf[i + 0] = (c0 << 2) | (c1 >> 4); + buf[i + 1] = (c1 << 4) | (c2 >> 2); + buf[i + 2] = (c2 << 6) | c3; + } + i += 3; } return i; } @@ -1600,7 +1618,11 @@ { int len = strlenW( ++p ); in.cbBuffer = decode_base64( p, len, NULL ); - if (!(in.pvBuffer = heap_alloc( in.cbBuffer ))) return FALSE; + if (!(in.pvBuffer = heap_alloc( in.cbBuffer ))) { + destroy_authinfo( authinfo ); + *auth_ptr = NULL; + return FALSE; + } decode_base64( p, len, in.pvBuffer ); } out.BufferType = SECBUFFER_TOKEN; @@ -1608,6 +1630,8 @@ if (!(out.pvBuffer = heap_alloc( authinfo->max_token ))) { heap_free( in.pvBuffer ); + destroy_authinfo( authinfo ); + *auth_ptr = NULL; return FALSE; } out_desc.ulVersion = 0; @@ -1783,15 +1807,20 @@ { request->content_length = ~0u; request->read_chunked = TRUE; + request->read_chunked_size = ~0u; + request->read_chunked_eof = FALSE; } request->content_read = 0; return request->content_length; } /* read some more data into the read buffer */ -static BOOL read_more_data( request_t *request, int maxlen ) +static BOOL read_more_data( request_t *request, int maxlen, BOOL notify ) { int len; + BOOL ret; + + if (request->read_chunked_eof) return FALSE; if (request->read_size && request->read_pos) { @@ -1800,10 +1829,16 @@ request->read_pos = 0; } if (maxlen == -1) maxlen = sizeof(request->read_buf); - if (!netconn_recv( &request->netconn, request->read_buf + request->read_size, - maxlen - request->read_size, 0, &len )) return FALSE; + + if (notify) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); + + ret = netconn_recv( &request->netconn, request->read_buf + request->read_size, + maxlen - request->read_size, 0, &len ); + + if (notify) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, &len, sizeof(len) ); + request->read_size += len; - return TRUE; + return ret; } /* remove some amount of data from the read buffer */ @@ -1833,7 +1868,7 @@ remove_data( request, bytes_read ); if (eol) break; - if (!read_more_data( request, -1 )) return FALSE; + if (!read_more_data( request, -1, TRUE )) return FALSE; if (!request->read_size) { *len = 0; @@ -1852,7 +1887,7 @@ } /* discard data contents until we reach end of line */ -static BOOL discard_eol( request_t *request ) +static BOOL discard_eol( request_t *request, BOOL notify ) { do { @@ -1863,24 +1898,23 @@ break; } request->read_pos = request->read_size = 0; /* discard everything */ - if (!read_more_data( request, -1 )) return FALSE; + if (!read_more_data( request, -1, notify )) return FALSE; } while (request->read_size); return TRUE; } /* read the size of the next chunk */ -static BOOL start_next_chunk( request_t *request ) +static BOOL start_next_chunk( request_t *request, BOOL notify ) { DWORD chunk_size = 0; - if (!request->content_length) return TRUE; - if (request->content_length == request->content_read) - { - /* read terminator for the previous chunk */ - if (!discard_eol( request )) return FALSE; - request->content_length = ~0u; - request->content_read = 0; - } + assert(!request->read_chunked_size || request->read_chunked_size == ~0u); + + if (request->read_chunked_eof) return FALSE; + + /* read terminator for the previous chunk */ + if (!request->read_chunked_size && !discard_eol( request, notify )) return FALSE; + for (;;) { while (request->read_size) @@ -1892,17 +1926,22 @@ else if (ch == ';' || ch == '\r' || ch == '\n') { TRACE("reading %u byte chunk\n", chunk_size); - request->content_length = chunk_size; - request->content_read = 0; - if (!discard_eol( request )) return FALSE; - return TRUE; + + if (request->content_length == ~0u) request->content_length = chunk_size; + else request->content_length += chunk_size; + + request->read_chunked_size = chunk_size; + if (!chunk_size) request->read_chunked_eof = TRUE; + + return discard_eol( request, notify ); } remove_data( request, 1 ); } - if (!read_more_data( request, -1 )) return FALSE; + if (!read_more_data( request, -1, notify )) return FALSE; if (!request->read_size) { request->content_length = request->content_read = 0; + request->read_chunked_size = 0; return TRUE; } } @@ -1911,32 +1950,34 @@ /* return the size of data available to be read immediately */ static DWORD get_available_data( request_t *request ) { - if (request->read_chunked && - (request->content_length == ~0u || request->content_length == request->content_read)) - return 0; - return min( request->read_size, request->content_length - request->content_read ); + if (request->read_chunked) return min( request->read_chunked_size, request->read_size ); + return request->read_size; } /* check if we have reached the end of the data to read */ static BOOL end_of_read_data( request_t *request ) { - if (request->read_chunked) return (request->content_length == 0); + if (request->read_chunked) return request->read_chunked_eof; if (request->content_length == ~0u) return FALSE; return (request->content_length == request->content_read); } -static BOOL refill_buffer( request_t *request ) +static BOOL refill_buffer( request_t *request, BOOL notify ) { int len = sizeof(request->read_buf); - if (request->read_chunked && - (request->content_length == ~0u || request->content_length == request->content_read)) - { - if (!start_next_chunk( request )) return FALSE; - } - if (request->content_length != ~0u) len = min( len, request->content_length - request->content_read ); + if (request->read_chunked) + { + if (request->read_chunked_eof) return FALSE; + if (request->read_chunked_size == ~0u || !request->read_chunked_size) + { + if (!start_next_chunk( request, notify )) return FALSE; + } + } + if (!request->read_chunked && request->content_length != ~0u) + len = min( len, request->content_length - request->content_read ); if (len <= request->read_size) return TRUE; - if (!read_more_data( request, len )) return FALSE; + if (!read_more_data( request, len, notify )) return FALSE; if (!request->read_size) request->content_length = request->content_read = 0; return TRUE; } @@ -1955,8 +1996,6 @@ WCHAR status_codeW[4]; /* sizeof("nnn") */ if (!netconn_connected( &request->netconn )) return FALSE; - - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); received_len = 0; do @@ -2013,7 +2052,7 @@ header_t *header; buflen = MAX_REPLY_LEN; - if (!read_line( request, buffer, &buflen )) goto end; + if (!read_line( request, buffer, &buflen )) return TRUE; received_len += buflen; if (!*buffer) break; @@ -2038,9 +2077,6 @@ } TRACE("raw headers: %s\n", debugstr_w(raw_headers)); - -end: - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, &received_len, sizeof(DWORD) ); return TRUE; } @@ -2064,46 +2100,35 @@ static BOOL read_data( request_t *request, void *buffer, DWORD size, DWORD *read, BOOL async ) { - BOOL ret = TRUE; - int len, bytes_read = 0; - - if (request->read_chunked && - (request->content_length == ~0u || request->content_length == request->content_read)) - { - if (!start_next_chunk( request )) goto done; - } - if (request->content_length != ~0u) size = min( size, request->content_length - request->content_read ); - - if (request->read_size) - { - bytes_read = min( request->read_size, size ); - memcpy( buffer, request->read_buf + request->read_pos, bytes_read ); - remove_data( request, bytes_read ); - } - if (size > bytes_read && (!bytes_read || !async)) - { - if ((ret = netconn_recv( &request->netconn, (char *)buffer + bytes_read, size - bytes_read, - async ? 0 : MSG_WAITALL, &len ))) - bytes_read += len; - } + int count, bytes_read = 0; + + if (end_of_read_data( request )) goto done; + + while (size) + { + if (!(count = get_available_data( request ))) + { + if (!refill_buffer( request, async )) goto done; + if (!(count = get_available_data( request ))) goto done; + } + count = min( count, size ); + memcpy( (char *)buffer + bytes_read, request->read_buf + request->read_pos, count ); + remove_data( request, count ); + if (request->read_chunked) request->read_chunked_size -= count; + size -= count; + bytes_read += count; + request->content_read += count; + if (end_of_read_data( request )) goto done; + } + if (request->read_chunked && !request->read_chunked_size) refill_buffer( request, async ); done: - request->content_read += bytes_read; TRACE( "retrieved %u bytes (%u/%u)\n", bytes_read, request->content_read, request->content_length ); - if (async) - { - if (ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, buffer, bytes_read ); - else - { - WINHTTP_ASYNC_RESULT result; - result.dwResult = API_READ_DATA; - result.dwError = get_last_error(); - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); - } - } + + if (async) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, buffer, bytes_read ); if (read) *read = bytes_read; - if (!bytes_read && request->content_read == request->content_length) finished_reading( request ); - return ret; + if (end_of_read_data( request )) finished_reading( request ); + return TRUE; } /* read any content returned by the server so that the connection can be reused */ @@ -2112,11 +2137,6 @@ DWORD bytes_read; char buffer[2048]; - if (request->content_length == ~0u) - { - finished_reading( request ); - return; - } for (;;) { if (!read_data( request, buffer, sizeof(buffer), &bytes_read, FALSE ) || !bytes_read) return; @@ -2218,6 +2238,7 @@ if (!(ret = netconn_init( &request->netconn ))) goto end; request->read_pos = request->read_size = 0; request->read_chunked = FALSE; + request->read_chunked_eof = FALSE; } if (!(ret = add_host_header( request, WINHTTP_ADDREQ_FLAG_REPLACE ))) goto end; if (!(ret = open_connection( request ))) goto end; @@ -2300,6 +2321,8 @@ break; } + if (ret) refill_buffer( request, FALSE ); + if (async) { if (ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE, NULL, 0 ); @@ -2362,45 +2385,22 @@ static BOOL query_data_available( request_t *request, DWORD *available, BOOL async ) { - BOOL ret = TRUE; - DWORD count; - - if (!(count = get_available_data( request ))) - { - if (end_of_read_data( request )) - { - if (available) *available = 0; - return TRUE; - } - } - refill_buffer( request ); - count = get_available_data( request ); - - if (count == sizeof(request->read_buf)) /* check if we have even more pending in the socket */ - { - DWORD extra; - if ((ret = netconn_query_data_available( &request->netconn, &extra ))) - { - count = min( count + extra, request->content_length - request->content_read ); - } - } - if (async) - { - if (ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, &count, sizeof(count) ); - else - { - WINHTTP_ASYNC_RESULT result; - result.dwResult = API_QUERY_DATA_AVAILABLE; - result.dwError = get_last_error(); - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); - } - } - if (ret) - { - TRACE("%u bytes available\n", count); - if (available) *available = count; - } - return ret; + DWORD count = get_available_data( request ); + + if (!request->read_chunked) + count += netconn_query_data_available( &request->netconn ); + if (!count) + { + refill_buffer( request, async ); + count = get_available_data( request ); + if (!request->read_chunked) + count += netconn_query_data_available( &request->netconn ); + } + + if (async) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, &count, sizeof(count) ); + TRACE("%u bytes available\n", count); + if (available) *available = count; + return TRUE; } static void task_query_data_available( task_header_t *task ) @@ -2508,7 +2508,7 @@ if (async) { - if (ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, &num_bytes, sizeof(DWORD) ); + if (ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, &num_bytes, sizeof(num_bytes) ); else { WINHTTP_ASYNC_RESULT result; @@ -3810,11 +3810,11 @@ winhttp_request_SetAutoLogonPolicy }; -HRESULT WinHttpRequest_create( IUnknown *unknown, void **obj ) +HRESULT WinHttpRequest_create( void **obj ) { struct winhttp_request *request; - TRACE("%p, %p\n", unknown, obj); + TRACE("%p\n", obj); if (!(request = heap_alloc( sizeof(*request) ))) return E_OUTOFMEMORY; request->IWinHttpRequest_iface.lpVtbl = &winhttp_request_vtbl; Modified: trunk/reactos/dll/win32/winhttp/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/session.… ============================================================================== --- trunk/reactos/dll/win32/winhttp/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/session.c [iso-8859-1] Sat Apr 26 17:34:51 2014 @@ -1354,7 +1354,11 @@ FIXME("getaddrinfo not found at build time\n"); #endif } - if (!ret) set_last_error( ERROR_WINHTTP_AUTODETECTION_FAILED ); + if (!ret) + { + set_last_error( ERROR_WINHTTP_AUTODETECTION_FAILED ); + *url = NULL; + } return ret; } @@ -1597,11 +1601,11 @@ heap_free( hdr ); if (!ret) { - heap_free( config->lpszAutoConfigUrl ); + GlobalFree( config->lpszAutoConfigUrl ); config->lpszAutoConfigUrl = NULL; - heap_free( config->lpszProxy ); + GlobalFree( config->lpszProxy ); config->lpszProxy = NULL; - heap_free( config->lpszProxyBypass ); + GlobalFree( config->lpszProxyBypass ); config->lpszProxyBypass = NULL; } return ret; Modified: trunk/reactos/dll/win32/winhttp/winhttp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/winhttp_… ============================================================================== --- trunk/reactos/dll/win32/winhttp/winhttp_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/winhttp_private.h [iso-8859-1] Sat Apr 26 17:34:51 2014 @@ -202,9 +202,11 @@ int send_timeout; int recv_timeout; LPWSTR status_text; - DWORD content_length; /* total number of bytes to be read (per chunk) */ + DWORD content_length; /* total number of bytes to be read */ DWORD content_read; /* bytes read so far */ BOOL read_chunked; /* are we reading in chunked mode? */ + BOOL read_chunked_eof; /* end of stream in chunked mode */ + BOOL read_chunked_size; /* chunk size remaining */ DWORD read_pos; /* current read position in read_buf */ DWORD read_size; /* valid data size in read_buf */ char read_buf[4096]; /* buffer for already read but not returned data */ @@ -279,7 +281,7 @@ BOOL netconn_create( netconn_t *, int, int, int ) DECLSPEC_HIDDEN; BOOL netconn_init( netconn_t * ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; -BOOL netconn_query_data_available( netconn_t *, DWORD * ) DECLSPEC_HIDDEN; +ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr *, socklen_t *, int ) DECLSPEC_HIDDEN; BOOL netconn_secure_connect( netconn_t *, WCHAR * ) DECLSPEC_HIDDEN; @@ -295,7 +297,7 @@ BOOL set_server_for_hostname( connect_t *, LPCWSTR, INTERNET_PORT ) DECLSPEC_HIDDEN; void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; -extern HRESULT WinHttpRequest_create( IUnknown *, void ** ) DECLSPEC_HIDDEN; +extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; static inline const char *debugstr_variant( const VARIANT *v ) { Modified: trunk/reactos/dll/win32/winhttp/winhttp_tlb.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/winhttp_… ============================================================================== --- trunk/reactos/dll/win32/winhttp/winhttp_tlb.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/winhttp_tlb.idl [iso-8859-1] Sat Apr 26 17:34:51 2014 @@ -18,4 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep regtypelib + #include "httprequest.idl" Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Apr 26 17:34:51 2014 @@ -207,7 +207,7 @@ reactos/dll/win32/windowscodecsext # Synced to Wine-1.7.1 reactos/dll/win32/winemp3.acm # Synced to Wine-1.7.1 reactos/dll/win32/wing32 # Out of sync -reactos/dll/win32/winhttp # Synced to Wine-1.7.1 +reactos/dll/win32/winhttp # Synced to Wine-1.7.17 reactos/dll/win32/wininet # Synced to Wine-1.7.1 reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628

1 0

[akhaldi] 62989: [WUAPI] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: akhaldi Date: Sat Apr 26 17:23:51 2014 New Revision: 62989 URL: http://svn.reactos.org/svn/reactos?rev=62989&view=rev Log: [WUAPI] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/wuapi/downloader.c trunk/reactos/dll/win32/wuapi/installer.c trunk/reactos/dll/win32/wuapi/main.c trunk/reactos/dll/win32/wuapi/searcher.c trunk/reactos/dll/win32/wuapi/session.c trunk/reactos/dll/win32/wuapi/systeminfo.c trunk/reactos/dll/win32/wuapi/updates.c trunk/reactos/dll/win32/wuapi/wuapi_private.h trunk/reactos/dll/win32/wuapi/wuapi_tlb.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wuapi/downloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/downloader… ============================================================================== --- trunk/reactos/dll/win32/wuapi/downloader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/downloader.c [iso-8859-1] Sat Apr 26 17:23:51 2014 @@ -234,11 +234,11 @@ update_downloader_EndDownload }; -HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT UpdateDownloader_create( LPVOID *ppObj ) { update_downloader *downloader; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); downloader = HeapAlloc( GetProcessHeap(), 0, sizeof(*downloader) ); if (!downloader) return E_OUTOFMEMORY; Modified: trunk/reactos/dll/win32/wuapi/installer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/installer.… ============================================================================== --- trunk/reactos/dll/win32/wuapi/installer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/installer.c [iso-8859-1] Sat Apr 26 17:23:51 2014 @@ -329,11 +329,11 @@ update_installer_get_RebootRequiredBeforeInstallation }; -HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT UpdateInstaller_create( LPVOID *ppObj ) { update_installer *installer; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); installer = HeapAlloc( GetProcessHeap(), 0, sizeof(*installer) ); if (!installer) return E_OUTOFMEMORY; Modified: trunk/reactos/dll/win32/wuapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/main.c?rev… ============================================================================== --- trunk/reactos/dll/win32/wuapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/main.c [iso-8859-1] Sat Apr 26 17:23:51 2014 @@ -22,7 +22,7 @@ #include <rpcproxy.h> -typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); +typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj ); typedef struct _wucf { @@ -72,14 +72,11 @@ if (pOuter) return CLASS_E_NOAGGREGATION; - r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk ); + r = This->pfnCreateInstance( (LPVOID *)&punk ); if (FAILED(r)) return r; r = IUnknown_QueryInterface( punk, riid, ppobj ); - if (FAILED(r)) - return r; - IUnknown_Release( punk ); return r; } Modified: trunk/reactos/dll/win32/wuapi/searcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/searcher.c… ============================================================================== --- trunk/reactos/dll/win32/wuapi/searcher.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/searcher.c [iso-8859-1] Sat Apr 26 17:23:51 2014 @@ -301,11 +301,11 @@ update_searcher_put_ServiceID }; -HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT UpdateSearcher_create( LPVOID *ppObj ) { update_searcher *searcher; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); searcher = HeapAlloc( GetProcessHeap(), 0, sizeof(*searcher) ); if (!searcher) return E_OUTOFMEMORY; Modified: trunk/reactos/dll/win32/wuapi/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/session.c?… ============================================================================== --- trunk/reactos/dll/win32/wuapi/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/session.c [iso-8859-1] Sat Apr 26 17:23:51 2014 @@ -165,7 +165,7 @@ IUpdateSearcher **retval ) { TRACE("%p\n", This); - return UpdateSearcher_create( NULL, (LPVOID *)retval ); + return UpdateSearcher_create( (LPVOID *)retval ); } static HRESULT WINAPI update_session_CreateUpdateDownloader( @@ -173,7 +173,7 @@ IUpdateDownloader **retval ) { TRACE("%p\n", This); - return UpdateDownloader_create( NULL, (LPVOID *)retval ); + return UpdateDownloader_create( (LPVOID *)retval ); } static HRESULT WINAPI update_session_CreateUpdateInstaller( @@ -181,7 +181,7 @@ IUpdateInstaller **retval ) { TRACE("%p\n", This); - return UpdateInstaller_create( NULL, (LPVOID *)retval ); + return UpdateInstaller_create( (LPVOID *)retval ); } static const struct IUpdateSessionVtbl update_session_vtbl = @@ -203,11 +203,11 @@ update_session_CreateUpdateInstaller }; -HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT UpdateSession_create( LPVOID *ppObj ) { update_session *session; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); session = HeapAlloc( GetProcessHeap(), 0, sizeof(*session) ); if (!session) return E_OUTOFMEMORY; Modified: trunk/reactos/dll/win32/wuapi/systeminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/systeminfo… ============================================================================== --- trunk/reactos/dll/win32/wuapi/systeminfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/systeminfo.c [iso-8859-1] Sat Apr 26 17:23:51 2014 @@ -130,11 +130,11 @@ systeminfo_get_RebootRequired }; -HRESULT SystemInformation_create(IUnknown *pUnkOuter, LPVOID *ppObj) +HRESULT SystemInformation_create(LPVOID *ppObj) { systeminfo *info; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); info = HeapAlloc(GetProcessHeap(), 0, sizeof(*info)); if (!info) Modified: trunk/reactos/dll/win32/wuapi/updates.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/updates.c?… ============================================================================== --- trunk/reactos/dll/win32/wuapi/updates.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/updates.c [iso-8859-1] Sat Apr 26 17:23:51 2014 @@ -189,11 +189,11 @@ automatic_updates_EnableService }; -HRESULT AutomaticUpdates_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT AutomaticUpdates_create( LPVOID *ppObj ) { automatic_updates *updates; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); updates = HeapAlloc( GetProcessHeap(), 0, sizeof(*updates) ); if (!updates) return E_OUTOFMEMORY; Modified: trunk/reactos/dll/win32/wuapi/wuapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/wuapi_priv… ============================================================================== --- trunk/reactos/dll/win32/wuapi/wuapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/wuapi_private.h [iso-8859-1] Sat Apr 26 17:23:51 2014 @@ -36,11 +36,11 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(wuapi); -extern HRESULT AutomaticUpdates_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; -extern HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; -extern HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; -extern HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; -extern HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; -extern HRESULT SystemInformation_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +extern HRESULT AutomaticUpdates_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT UpdateSession_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT UpdateSearcher_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT UpdateDownloader_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT UpdateInstaller_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT SystemInformation_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; #endif /* _WUAPI_PRIVATE_H_ */ Modified: trunk/reactos/dll/win32/wuapi/wuapi_tlb.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/wuapi_tlb.… ============================================================================== --- trunk/reactos/dll/win32/wuapi/wuapi_tlb.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/wuapi_tlb.idl [iso-8859-1] Sat Apr 26 17:23:51 2014 @@ -18,4 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep regtypelib + #include "wuapi.idl" Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Apr 26 17:23:51 2014 @@ -216,7 +216,7 @@ reactos/dll/win32/wldap32 # Synced to Wine-1.7.17 reactos/dll/win32/wmi # Synced to Wine-1.7.17 reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.17 -reactos/dll/win32/wuapi # Synced to Wine-1.7.1 +reactos/dll/win32/wuapi # Synced to Wine-1.7.17 reactos/dll/win32/xinput1_1 # Synced to Wine-1.7.1 reactos/dll/win32/xinput1_2 # Synced to Wine-1.7.1 reactos/dll/win32/xinput1_3 # Synced to Wine-1.7.1

1 0

[akhaldi] 62988: [README.WINE] * Fix some inconsistencies. Spotted by Radek Liska.
by akhaldi＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: akhaldi Date: Sat Apr 26 17:15:50 2014 New Revision: 62988 URL: http://svn.reactos.org/svn/reactos?rev=62988&view=rev Log: [README.WINE] * Fix some inconsistencies. Spotted by Radek Liska. Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Apr 26 17:15:50 2014 @@ -60,8 +60,8 @@ reactos/dll/win32/cabinet # Synced to Wine-1.7.17 reactos/dll/win32/clusapi # Synced to Wine-1.7.1 reactos/dll/win32/comcat # Synced to Wine-1.7.1 -reactos/dll/win32/comctl32 # Synced to Wine 1.7.17 -reactos/dll/win32/comdlg32 # Synced to Wine 1.7.17 +reactos/dll/win32/comctl32 # Synced to Wine-1.7.17 +reactos/dll/win32/comdlg32 # Synced to Wine-1.7.17 reactos/dll/win32/compstui # Synced to Wine-1.7.1 reactos/dll/win32/credui # Synced to Wine-1.7.1 reactos/dll/win32/crypt32 # Synced to Wine-1.7.17 @@ -290,9 +290,9 @@ reactos/dll/win32/user32/controls/scrollbar.c # Forked reactos/dll/win32/user32/controls/static.c # Synced to Wine-1_1_39 - reactos/dll/win32/user32/include/dde_private.h # Synced to wine 1.1.24 - - reactos/dll/win32/user32/misc/dde.c # Synced to wine 1.1.24 (dde_misc.c) + reactos/dll/win32/user32/include/dde_private.h # Synced to Wine-1.1.24 + + reactos/dll/win32/user32/misc/dde.c # Synced to Wine-1.1.24 (dde_misc.c) reactos/dll/win32/user32/misc/ddeclient.c # Synced to Wine-1_1_23 reactos/dll/win32/user32/misc/ddeserver.c # Synced to Wine-1_1_23 reactos/dll/win32/user32/misc/exticon.c # Synced to Wine-1_1_22 @@ -300,7 +300,7 @@ reactos/dll/win32/user32/misc/winhelp.c # Last sync date unknown reactos/dll/win32/user32/misc/wsprintf.c # Synced to Wine-1_1_23 - reactos/dll/win32/user32/windows/cursoricon # Forked from wine 1.2-rc7 + reactos/dll/win32/user32/windows/cursoricon # Forked from Wine-1.2-rc7 reactos/dll/win32/user32/windows/defwnd.c # Forked reactos/dll/win32/user32/windows/draw.c # Forked at Wine-20020904 (uitools.c) reactos/dll/win32/user32/windows/mdi.c # Synced to Wine-1_1_40

1 0

[akhaldi] 62987: [WBEMPROX_WINETEST] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: akhaldi Date: Sat Apr 26 17:13:09 2014 New Revision: 62987 URL: http://svn.reactos.org/svn/reactos?rev=62987&view=rev Log: [WBEMPROX_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/wbemprox/query.c trunk/rostests/winetests/wbemprox/services.c Modified: trunk/rostests/winetests/wbemprox/query.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wbemprox/query.… ============================================================================== --- trunk/rostests/winetests/wbemprox/query.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wbemprox/query.c [iso-8859-1] Sat Apr 26 17:13:09 2014 @@ -46,7 +46,7 @@ { VARIANT var; - IEnumWbemClassObject_Next( *result, WBEM_INFINITE, 1, &obj, &count ); + IEnumWbemClassObject_Next( *result, 10000, 1, &obj, &count ); if (!count) break; if (IWbemClassObject_Get( obj, captionW, 0, &var, NULL, NULL ) == WBEM_S_NO_ERROR) @@ -616,6 +616,40 @@ SysFreeString( query ); } +static void test_GetNames( IWbemServices *services ) +{ + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + HRESULT hr; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + IWbemClassObject *obj; + SAFEARRAY *names; + ULONG count; + VARIANT val; + + IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (!count) break; + + VariantInit( &val ); + hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_NONSYSTEM_ONLY, &val, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + + SafeArrayDestroy( names ); + IWbemClassObject_Release( obj ); + } + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -654,6 +688,7 @@ test_StdRegProv( services ); test_notification_query_async( services ); test_query_async( services ); + test_GetNames( services ); SysFreeString( path ); IWbemServices_Release( services ); Modified: trunk/rostests/winetests/wbemprox/services.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wbemprox/servic… ============================================================================== --- trunk/rostests/winetests/wbemprox/services.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wbemprox/services.c [iso-8859-1] Sat Apr 26 17:13:09 2014 @@ -115,7 +115,7 @@ { const WCHAR *path; HRESULT result; - int todo; + BOOL todo; HRESULT result_broken; } test[] = @@ -124,10 +124,10 @@ { path1W, WBEM_E_INVALID_NAMESPACE }, { path2W, WBEM_E_INVALID_NAMESPACE }, { path3W, WBEM_E_INVALID_NAMESPACE }, - { path4W, WBEM_E_INVALID_NAMESPACE, 0, WBEM_E_INVALID_PARAMETER }, + { path4W, WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, { path5W, WBEM_E_INVALID_NAMESPACE }, - { path6W, 0x800706ba, 1 }, - { path7W, 0x800706ba, 1 }, + { path6W, 0x800706ba, TRUE }, + { path7W, 0x800706ba, TRUE }, { path8W, WBEM_E_INVALID_NAMESPACE }, { path9W, S_OK }, { path10W, WBEM_E_INVALID_PARAMETER },

1 0

[akhaldi] 62986: [WBEMPROX] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: akhaldi Date: Sat Apr 26 17:12:58 2014 New Revision: 62986 URL: http://svn.reactos.org/svn/reactos?rev=62986&view=rev Log: [WBEMPROX] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/wbemprox/builtin.c trunk/reactos/dll/win32/wbemprox/class.c trunk/reactos/dll/win32/wbemprox/main.c trunk/reactos/dll/win32/wbemprox/qualifier.c trunk/reactos/dll/win32/wbemprox/query.c trunk/reactos/dll/win32/wbemprox/services.c trunk/reactos/dll/win32/wbemprox/wbemlocator.c trunk/reactos/dll/win32/wbemprox/wbemprox.idl trunk/reactos/dll/win32/wbemprox/wbemprox_private.h trunk/reactos/dll/win32/wbemprox/wql.tab.c trunk/reactos/dll/win32/wbemprox/wql.y trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wbemprox/builtin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/builtin… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] Sat Apr 26 17:12:58 2014 @@ -51,10 +51,17 @@ {'C','I','M','_','L','o','g','i','c','a','l','D','i','s','k',0}; static const WCHAR class_networkadapterW[] = {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',0}; +static const WCHAR class_networkadapterconfigW[] = + {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r', + 'C','o','n','f','i','g','u','r','a','t','i','o','n',0}; static const WCHAR class_osW[] = {'W','i','n','3','2','_','O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; static const WCHAR class_paramsW[] = {'_','_','P','A','R','A','M','E','T','E','R','S',0}; +static const WCHAR class_physicalmediaW[] = + {'W','i','n','3','2','_','P','h','y','s','i','c','a','l','M','e','d','i','a',0}; +static const WCHAR class_physicalmemoryW[] = + {'W','i','n','3','2','_','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR class_qualifiersW[] = {'_','_','Q','U','A','L','I','F','I','E','R','S',0}; static const WCHAR class_process_getowner_outW[] = @@ -81,10 +88,16 @@ {'A','d','a','p','t','e','r','T','y','p','e',0}; static const WCHAR prop_addresswidthW[] = {'A','d','d','r','e','s','s','W','i','d','t','h',0}; +static const WCHAR prop_availabilityW[] = + {'A','v','a','i','l','a','b','i','l','i','t','y',0}; static const WCHAR prop_bootableW[] = {'B','o','o','t','a','b','l','e',0}; static const WCHAR prop_bootpartitionW[] = {'B','o','o','t','P','a','r','t','i','t','i','o','n',0}; +static const WCHAR prop_buildnumberW[] = + {'B','u','i','l','d','N','u','m','b','e','r',0}; +static const WCHAR prop_capacityW[] = + {'C','a','p','a','c','i','t','y',0}; static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; static const WCHAR prop_classW[] = @@ -137,12 +150,22 @@ {'H','a','n','d','l','e',0}; static const WCHAR prop_idW[] = {'I','D',0}; +static const WCHAR prop_identificationcodeW[] = + {'I','d','e','n','t','i','f','i','c','a','t','i','o','n','C','o','d','e',0}; static const WCHAR prop_indexW[] = {'I','n','d','e','x',0}; +static const WCHAR prop_installdateW[] = + {'I','n','s','t','a','l','l','D','a','t','e',0}; static const WCHAR prop_interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; +static const WCHAR prop_interfacetypeW[] = + {'I','n','t','e','r','f','a','c','e','T','y','p','e',0}; static const WCHAR prop_intvalueW[] = {'I','n','t','e','g','e','r','V','a','l','u','e',0}; +static const WCHAR prop_ipconnectionmetricW[] = + {'I','P','C','o','n','n','e','c','t','i','o','n','M','e','t','r','i','c',0}; +static const WCHAR prop_ipenabledW[] = + {'I','P','E','n','a','b','l','e','d',0}; static const WCHAR prop_lastbootuptimeW[] = {'L','a','s','t','B','o','o','t','U','p','T','i','m','e',0}; static const WCHAR prop_localdatetimeW[] = @@ -155,6 +178,8 @@ {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR prop_maxclockspeedW[] = {'M','a','x','C','l','o','c','k','S','p','e','e','d',0}; +static const WCHAR prop_mediatypeW[] = + {'M','e','d','i','a','T','y','p','e',0}; static const WCHAR prop_memberW[] = {'M','e','m','b','e','r',0}; static const WCHAR prop_methodW[] = @@ -201,6 +226,8 @@ {'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_servicetypeW[] = {'S','e','r','v','i','c','e','T','y','p','e',0}; +static const WCHAR prop_smbiosbiosversionW[] = + {'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0}; static const WCHAR prop_startmodeW[] = {'S','t','a','r','t','M','o','d','e',0}; static const WCHAR prop_sizeW[] = @@ -233,26 +260,33 @@ {'V','a','r','i','a','n','t','T','y','p','e',0}; static const WCHAR prop_versionW[] = {'V','e','r','s','i','o','n',0}; +static const WCHAR prop_volumeserialnumberW[] = + {'V','o','l','u','m','e','S','e','r','i','a','l','N','u','m','b','e','r',0}; /* column definitions must be kept in sync with record structures below */ static const struct column col_baseboard[] = { { prop_manufacturerW, CIM_STRING }, + { prop_modelW, CIM_STRING }, + { prop_nameW, CIM_STRING }, { prop_serialnumberW, CIM_STRING }, { prop_tagW, CIM_STRING|COL_FLAG_KEY } }; static const struct column col_bios[] = { - { prop_descriptionW, CIM_STRING }, - { prop_manufacturerW, CIM_STRING }, - { prop_releasedateW, CIM_DATETIME }, - { prop_serialnumberW, CIM_STRING }, - { prop_versionW, CIM_STRING|COL_FLAG_KEY } + { prop_descriptionW, CIM_STRING }, + { prop_identificationcodeW, CIM_STRING }, + { prop_manufacturerW, CIM_STRING }, + { prop_releasedateW, CIM_DATETIME }, + { prop_serialnumberW, CIM_STRING }, + { prop_smbiosbiosversionW, CIM_STRING }, + { prop_versionW, CIM_STRING|COL_FLAG_KEY } }; static const struct column col_cdromdrive[] = { { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, { prop_driveW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_mediatypeW, CIM_STRING }, { prop_nameW, CIM_STRING }, { prop_pnpdeviceidW, CIM_STRING } }; @@ -280,11 +314,14 @@ }; static const struct column col_diskdrive[] = { - { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, - { prop_indexW, CIM_UINT32, VT_I4 }, - { prop_manufacturerW, CIM_STRING }, - { prop_modelW, CIM_STRING }, - { prop_serialnumberW, CIM_STRING } + { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_indexW, CIM_UINT32, VT_I4 }, + { prop_interfacetypeW, CIM_STRING }, + { prop_manufacturerW, CIM_STRING }, + { prop_mediatypeW, CIM_STRING }, + { prop_modelW, CIM_STRING }, + { prop_serialnumberW, CIM_STRING }, + { prop_sizeW, CIM_UINT64 } }; static const struct column col_diskpartition[] = { @@ -300,38 +337,52 @@ }; static const struct column col_logicaldisk[] = { - { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_drivetypeW, CIM_UINT32, VT_I4 }, - { prop_filesystemW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_freespaceW, CIM_UINT64 }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_sizeW, CIM_UINT64 } + { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_drivetypeW, CIM_UINT32, VT_I4 }, + { prop_filesystemW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_freespaceW, CIM_UINT64 }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_sizeW, CIM_UINT64 }, + { prop_volumeserialnumberW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_networkadapter[] = { { prop_adaptertypeW, CIM_STRING }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_indexW, CIM_UINT32, VT_I4 }, { prop_interfaceindexW, CIM_UINT32, VT_I4 }, { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_manufacturerW, CIM_STRING }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_netconnectionstatusW, CIM_UINT16, VT_I4 }, { prop_physicaladapterW, CIM_BOOLEAN }, { prop_pnpdeviceidW, CIM_STRING }, { prop_speedW, CIM_UINT64 } }; +static const struct column col_networkadapterconfig[] = +{ + { prop_indexW, CIM_UINT32|COL_FLAG_KEY }, + { prop_ipconnectionmetricW, CIM_UINT32 }, + { prop_ipenabledW, CIM_BOOLEAN }, + { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC } +}; static const struct column col_os[] = { + { prop_buildnumberW, CIM_STRING }, { prop_captionW, CIM_STRING }, { prop_codesetW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_countrycodeW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_csdversionW, CIM_STRING }, + { prop_installdateW, CIM_DATETIME }, { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_localeW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_nameW, CIM_STRING }, { prop_osarchitectureW, CIM_STRING }, { prop_oslanguageW, CIM_UINT32, VT_I4 }, { prop_osproductsuiteW, CIM_UINT32, VT_I4 }, { prop_ostypeW, CIM_UINT16, VT_I4 }, + { prop_serialnumberW, CIM_STRING }, { prop_servicepackmajorW, CIM_UINT16, VT_I4 }, { prop_servicepackminorW, CIM_UINT16, VT_I4 }, { prop_suitemaskW, CIM_UINT32, VT_I4 }, @@ -347,6 +398,15 @@ { prop_typeW, CIM_UINT32 }, { prop_varianttypeW, CIM_UINT32 }, { prop_defaultvalueW, CIM_UINT32 } +}; +static const struct column col_physicalmedia[] = +{ + { prop_serialnumberW, CIM_STRING }, + { prop_tagW, CIM_STRING } +}; +static const struct column col_physicalmemory[] = +{ + { prop_capacityW, CIM_UINT64 } }; static const struct column col_process[] = { @@ -417,6 +477,7 @@ { { prop_adapterdactypeW, CIM_STRING }, { prop_adapterramW, CIM_UINT32, VT_I4 }, + { prop_availabilityW, CIM_UINT16 }, { prop_currentbitsperpixelW, CIM_UINT32 }, { prop_currenthorizontalresW, CIM_UINT32 }, { prop_currentverticalresW, CIM_UINT32 }, @@ -440,8 +501,12 @@ {'2','0','1','2','0','6','0','8','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0}; static const WCHAR bios_serialnumberW[] = {'0',0}; +static const WCHAR bios_smbiosbiosversionW[] = + {'W','i','n','e',0}; static const WCHAR bios_versionW[] = {'W','I','N','E',' ',' ',' ','-',' ','1',0}; +static const WCHAR cdromdrive_mediatypeW[] = + {'C','D','-','R','O','M',0}; static const WCHAR cdromdrive_nameW[] = {'W','i','n','e',' ','C','D','-','R','O','M',' ','A','T','A',' ','D','e','v','i','c','e',0}; static const WCHAR cdromdrive_pnpdeviceidW[]= @@ -457,29 +522,46 @@ {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; static const WCHAR compsys_modelW[] = {'W','i','n','e',0}; -static const WCHAR diskdrive_deviceidW[] = - {'\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0',0}; +static const WCHAR diskdrive_interfacetypeW[] = + {'I','D','E',0}; +static const WCHAR diskdrive_manufacturerW[] = + {'(','S','t','a','n','d','a','r','d',' ','d','i','s','k',' ','d','r','i','v','e','s',')',0}; +static const WCHAR diskdrive_mediatype_fixedW[] = + {'F','i','x','e','d',' ','h','a','r','d',' ','d','i','s','k',0}; +static const WCHAR diskdrive_mediatype_removableW[] = + {'R','e','m','o','v','a','b','l','e',' ','m','e','d','i','a',0}; static const WCHAR diskdrive_modelW[] = {'W','i','n','e',' ','D','i','s','k',' ','D','r','i','v','e',0}; -static const WCHAR diskdrive_manufacturerW[] = - {'(','S','t','a','n','d','a','r','d',' ','d','i','s','k',' ','d','r','i','v','e','s',')',0}; static const WCHAR diskdrive_serialW[] = {'W','I','N','E','H','D','I','S','K',0}; static const WCHAR networkadapter_pnpdeviceidW[]= {'P','C','I','\\','V','E','N','_','8','0','8','6','&','D','E','V','_','1','0','0','E','&', 'S','U','B','S','Y','S','_','0','0','1','E','8','0','8','6','&','R','E','V','_','0','2','\\', '3','&','2','6','7','A','6','1','6','A','&','1','&','1','8',0}; +static const WCHAR os_32bitW[] = + {'3','2','-','b','i','t',0}; +static const WCHAR os_64bitW[] = + {'6','4','-','b','i','t',0}; +static const WCHAR os_buildnumberW[] = + {'2','6','0','0',0}; static const WCHAR os_captionW[] = {'M','i','c','r','o','s','o','f','t',' ','W','i','n','d','o','w','s',' ','X','P',' ', 'V','e','r','s','i','o','n',' ','=',' ','5','.','1','.','2','6','0','0',0}; static const WCHAR os_csdversionW[] = {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','3',0}; -static const WCHAR os_32bitW[] = - {'3','2','-','b','i','t',0}; -static const WCHAR os_64bitW[] = - {'6','4','-','b','i','t',0}; +static const WCHAR os_installdateW[] = + {'2','0','1','4','0','1','0','1','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0}; +static const WCHAR os_nameW[] = + {'M','i','c','r','o','s','o','f','t',' ','W','i','n','d','o','w','s',' ','X','P',' ', + 'P','r','o','f','e','s','s','i','o','n','a','l','|','C',':','\\','W','I','N','D','O','W','S', + '|','\\','D','e','v','i','c','e','\\','H','a','r','d','d','i','s','k','0', + '\\','P','a','r','t','i','t','i','o','n','1',0}; +static const WCHAR os_serialnumberW[] = + {'1','2','3','4','5','-','O','E','M','-','1','2','3','4','5','6','7','-','1','2','3','4','5',0}; static const WCHAR os_versionW[] = {'5','.','1','.','2','6','0','0',0}; +static const WCHAR physicalmedia_tagW[] = + {'\\','\\','.','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0',0}; static const WCHAR sounddevice_productnameW[] = {'W','i','n','e',' ','A','u','d','i','o',' ','D','e','v','i','c','e',0}; static const WCHAR videocontroller_dactypeW[] = @@ -491,21 +573,26 @@ struct record_baseboard { const WCHAR *manufacturer; + const WCHAR *model; + const WCHAR *name; const WCHAR *serialnumber; const WCHAR *tag; }; struct record_bios { const WCHAR *description; + const WCHAR *identificationcode; const WCHAR *manufacturer; const WCHAR *releasedate; const WCHAR *serialnumber; + const WCHAR *smbiosbiosversion; const WCHAR *version; }; struct record_cdromdrive { const WCHAR *device_id; const WCHAR *drive; + const WCHAR *mediatype; const WCHAR *name; const WCHAR *pnpdevice_id; }; @@ -535,9 +622,12 @@ { const WCHAR *device_id; UINT32 index; + const WCHAR *interfacetype; const WCHAR *manufacturer; - const WCHAR *name; + const WCHAR *mediatype; + const WCHAR *model; const WCHAR *serialnumber; + UINT64 size; }; struct record_diskpartition { @@ -559,32 +649,46 @@ UINT64 freespace; const WCHAR *name; UINT64 size; + const WCHAR *volumeserialnumber; }; struct record_networkadapter { const WCHAR *adaptertype; const WCHAR *device_id; - INT32 interface_index; + UINT32 index; + UINT32 interface_index; const WCHAR *mac_address; const WCHAR *manufacturer; + const WCHAR *name; UINT16 netconnection_status; int physicaladapter; const WCHAR *pnpdevice_id; UINT64 speed; }; +struct record_networkadapterconfig +{ + UINT32 index; + UINT32 ipconnectionmetric; + int ipenabled; + const WCHAR *mac_address; +}; struct record_operatingsystem { + const WCHAR *buildnumber; const WCHAR *caption; const WCHAR *codeset; const WCHAR *countrycode; const WCHAR *csdversion; + const WCHAR *installdate; const WCHAR *lastbootuptime; const WCHAR *localdatetime; const WCHAR *locale; + const WCHAR *name; const WCHAR *osarchitecture; UINT32 oslanguage; UINT32 osproductsuite; UINT16 ostype; + const WCHAR *serialnumber; UINT16 servicepackmajor; UINT16 servicepackminor; UINT32 suitemask; @@ -600,6 +704,15 @@ UINT32 type; UINT32 varianttype; UINT32 defaultvalue; +}; +struct record_physicalmedia +{ + const WCHAR *serialnumber; + const WCHAR *tag; +}; +struct record_physicalmemory +{ + UINT64 capacity; }; struct record_process { @@ -670,6 +783,7 @@ { const WCHAR *adapter_dactype; UINT32 adapter_ram; + UINT16 availability; UINT32 current_bitsperpixel; UINT32 current_horizontalres; UINT32 current_verticalres; @@ -682,15 +796,12 @@ static const struct record_baseboard data_baseboard[] = { - { baseboard_manufacturerW, baseboard_serialnumberW, baseboard_tagW } + { baseboard_manufacturerW, baseboard_tagW, baseboard_tagW, baseboard_serialnumberW, baseboard_tagW } }; static const struct record_bios data_bios[] = { - { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, bios_versionW } -}; -static const struct record_diskdrive data_diskdrive[] = -{ - { diskdrive_deviceidW, 0, diskdrive_manufacturerW, diskdrive_modelW, diskdrive_serialW } + { bios_descriptionW, bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, + bios_smbiosbiosversionW, bios_versionW } }; static const struct record_param data_param[] = { @@ -720,6 +831,10 @@ #define FLAVOR_ID (WBEM_FLAVOR_FLAG_PROPAGATE_TO_INSTANCE | WBEM_FLAVOR_NOT_OVERRIDABLE |\ WBEM_FLAVOR_ORIGIN_PROPAGATED) +static const struct record_physicalmedia data_physicalmedia[] = +{ + { diskdrive_serialW, physicalmedia_tagW } +}; static const struct record_qualifier data_qualifier[] = { { class_process_getowner_outW, param_userW, CIM_SINT32, FLAVOR_ID, prop_idW, 0 }, @@ -738,12 +853,14 @@ static BOOL match_row( const struct table *table, UINT row, const struct expr *cond, enum fill_status *status ) { LONGLONG val; + UINT type; + if (!cond) { *status = FILL_STATUS_UNFILTERED; return TRUE; } - if (eval_cond( table, row, cond, &val ) != S_OK) + if (eval_cond( table, row, cond, &val, &type ) != S_OK) { *status = FILL_STATUS_FAILED; return FALSE; @@ -796,6 +913,7 @@ rec->device_id = cdromdrive_pnpdeviceidW; sprintfW( drive, fmtW, 'A' + i ); rec->drive = heap_strdupW( drive ); + rec->mediatype = cdromdrive_mediatypeW; rec->name = cdromdrive_nameW; rec->pnpdevice_id = cdromdrive_pnpdeviceidW; if (!match_row( table, row, cond, &status )) @@ -1177,10 +1295,12 @@ DWORD drives = GetLogicalDrives(); WIN32_FIND_DATAW data; HANDLE handle; - struct dirstack *dirstack = alloc_dirstack(2); + struct dirstack *dirstack; enum fill_status status = FILL_STATUS_UNFILTERED; if (!resize_table( table, 8, sizeof(*rec) )) return FILL_STATUS_FAILED; + + dirstack = alloc_dirstack(2); for (i = 0; i < sizeof(drives); i++) { @@ -1207,6 +1327,7 @@ if (!resize_table( table, row + 1, sizeof(*rec) )) { status = FILL_STATUS_FAILED; + FindClose( handle ); goto done; } if (!strcmpW( data.cFileName, dotW ) || !strcmpW( data.cFileName, dotdotW )) continue; @@ -1216,6 +1337,7 @@ { if (push_dir( dirstack, new_path, len )) continue; heap_free( new_path ); + FindClose( handle ); status = FILL_STATUS_FAILED; goto done; } @@ -1349,16 +1471,6 @@ return status; } -static WCHAR *get_filesystem( const WCHAR *root ) -{ - static const WCHAR ntfsW[] = {'N','T','F','S',0}; - WCHAR buffer[MAX_PATH + 1]; - - if (GetVolumeInformationW( root, NULL, 0, NULL, NULL, NULL, buffer, MAX_PATH + 1 )) - return heap_strdupW( buffer ); - return heap_strdupW( ntfsW ); -} - static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) { WCHAR root[] = {'\\','\\','.','\\','A',':',0}; @@ -1378,6 +1490,69 @@ CloseHandle( handle ); } return free.QuadPart; +} + +static enum fill_status fill_diskdrive( struct table *table, const struct expr *cond ) +{ + static const WCHAR fmtW[] = + {'\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','%','u',0}; + WCHAR device_id[sizeof(fmtW)/sizeof(fmtW[0]) + 10], root[] = {'A',':','\\',0}; + struct record_diskdrive *rec; + UINT i, row = 0, offset = 0, index = 0, type; + UINT64 size = 1024 * 1024 * 1024; + DWORD drives = GetLogicalDrives(); + enum fill_status status = FILL_STATUS_UNFILTERED; + + if (!resize_table( table, 2, sizeof(*rec) )) return FILL_STATUS_FAILED; + + for (i = 0; i < sizeof(drives); i++) + { + if (drives & (1 << i)) + { + root[0] = 'A' + i; + type = GetDriveTypeW( root ); + if (type != DRIVE_FIXED && type != DRIVE_REMOVABLE) + continue; + + if (!resize_table( table, row + 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + + rec = (struct record_diskdrive *)(table->data + offset); + sprintfW( device_id, fmtW, index ); + rec->device_id = heap_strdupW( device_id ); + rec->index = index; + rec->interfacetype = diskdrive_interfacetypeW; + rec->manufacturer = diskdrive_manufacturerW; + if (type == DRIVE_FIXED) + rec->mediatype = diskdrive_mediatype_fixedW; + else + rec->mediatype = diskdrive_mediatype_removableW; + rec->model = diskdrive_modelW; + rec->serialnumber = diskdrive_serialW; + get_freespace( root, &size ); + rec->size = size; + if (!match_row( table, row, cond, &status )) + { + free_row_values( table, row ); + continue; + } + offset += sizeof(*rec); + index++; + row++; + } + } + TRACE("created %u rows\n", row); + table->num_rows = row; + return status; +} + +static WCHAR *get_filesystem( const WCHAR *root ) +{ + static const WCHAR ntfsW[] = {'N','T','F','S',0}; + WCHAR buffer[MAX_PATH + 1]; + + if (GetVolumeInformationW( root, NULL, 0, NULL, NULL, NULL, buffer, MAX_PATH + 1 )) + return heap_strdupW( buffer ); + return heap_strdupW( ntfsW ); } static enum fill_status fill_diskpartition( struct table *table, const struct expr *cond ) @@ -1431,6 +1606,17 @@ return status; } +static WCHAR *get_volumeserialnumber( const WCHAR *root ) +{ + static const WCHAR fmtW[] = {'%','0','8','X',0}; + DWORD serial = 0; + WCHAR buffer[9]; + + GetVolumeInformationW( root, NULL, 0, &serial, NULL, NULL, NULL, 0 ); + sprintfW( buffer, fmtW, serial ); + return heap_strdupW( buffer ); +} + static enum fill_status fill_logicaldisk( struct table *table, const struct expr *cond ) { static const WCHAR fmtW[] = {'%','c',':',0}; @@ -1456,12 +1642,13 @@ rec = (struct record_logicaldisk *)(table->data + offset); sprintfW( device_id, fmtW, 'A' + i ); - rec->device_id = heap_strdupW( device_id ); - rec->drivetype = type; - rec->filesystem = get_filesystem( root ); - rec->freespace = get_freespace( root, &size ); - rec->name = heap_strdupW( device_id ); - rec->size = size; + rec->device_id = heap_strdupW( device_id ); + rec->drivetype = type; + rec->filesystem = get_filesystem( root ); + rec->freespace = get_freespace( root, &size ); + rec->name = heap_strdupW( device_id ); + rec->size = size; + rec->volumeserialnumber = get_volumeserialnumber( root ); if (!match_row( table, row, cond, &status )) { free_row_values( table, row ); @@ -1538,7 +1725,10 @@ heap_free( buffer ); return FILL_STATUS_FAILED; } - for (aa = buffer; aa; aa = aa->Next) count++; + for (aa = buffer; aa; aa = aa->Next) + { + if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK) count++; + } if (!resize_table( table, count, sizeof(*rec) )) { heap_free( buffer ); @@ -1546,13 +1736,17 @@ } for (aa = buffer; aa; aa = aa->Next) { + if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; + rec = (struct record_networkadapter *)(table->data + offset); sprintfW( device_id, fmtW, aa->u.s.IfIndex ); rec->adaptertype = get_adaptertype( aa->IfType, &physical ); rec->device_id = heap_strdupW( device_id ); + rec->index = aa->u.s.IfIndex; rec->interface_index = aa->u.s.IfIndex; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); rec->manufacturer = compsys_manufacturerW; + rec->name = heap_strdupW( aa->FriendlyName ); rec->netconnection_status = get_connection_status( aa->OperStatus ); rec->physicaladapter = physical; rec->pnpdevice_id = networkadapter_pnpdeviceidW; @@ -1569,6 +1763,74 @@ table->num_rows = row; heap_free( buffer ); + return status; +} + +static enum fill_status fill_networkadapterconfig( struct table *table, const struct expr *cond ) +{ + struct record_networkadapterconfig *rec; + IP_ADAPTER_ADDRESSES *aa, *buffer; + UINT row = 0, offset = 0, count = 0; + DWORD size = 0, ret; + enum fill_status status = FILL_STATUS_UNFILTERED; + + ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ); + if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; + + if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED; + if (GetAdaptersAddresses( AF_UNSPEC, 0, NULL, buffer, &size )) + { + heap_free( buffer ); + return FILL_STATUS_FAILED; + } + for (aa = buffer; aa; aa = aa->Next) + { + if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK) count++; + } + if (!resize_table( table, count, sizeof(*rec) )) + { + heap_free( buffer ); + return FILL_STATUS_FAILED; + } + for (aa = buffer; aa; aa = aa->Next) + { + if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; + + rec = (struct record_networkadapterconfig *)(table->data + offset); + rec->index = aa->u.s.IfIndex; + rec->ipconnectionmetric = 20; + rec->ipenabled = -1; + rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); + if (!match_row( table, row, cond, &status )) + { + free_row_values( table, row ); + continue; + } + offset += sizeof(*rec); + row++; + } + TRACE("created %u rows\n", row); + table->num_rows = row; + + heap_free( buffer ); + return status; +} + +static enum fill_status fill_physicalmemory( struct table *table, const struct expr *cond ) +{ + struct record_physicalmemory *rec; + enum fill_status status = FILL_STATUS_UNFILTERED; + UINT row = 0; + + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + + rec = (struct record_physicalmemory *)table->data; + rec->capacity = get_total_physical_memory(); + if (!match_row( table, row, cond, &status )) free_row_values( table, row ); + else row++; + + TRACE("created %u rows\n", row); + table->num_rows = row; return status; } @@ -1835,17 +2097,21 @@ if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_operatingsystem *)table->data; + rec->buildnumber = os_buildnumberW; rec->caption = os_captionW; rec->codeset = get_codeset(); rec->countrycode = get_countrycode(); rec->csdversion = os_csdversionW; + rec->installdate = os_installdateW; rec->lastbootuptime = get_lastbootuptime(); rec->localdatetime = get_localdatetime(); rec->locale = get_locale(); + rec->name = os_nameW; rec->osarchitecture = get_osarchitecture(); rec->oslanguage = GetSystemDefaultLangID(); rec->osproductsuite = 2461140; /* Windows XP Professional */ rec->ostype = 18; /* WINNT */ + rec->serialnumber = os_serialnumberW; rec->servicepackmajor = 3; rec->servicepackminor = 0; rec->suitemask = 272; /* Single User + Terminal */ @@ -2073,6 +2339,7 @@ rec = (struct record_videocontroller *)table->data; rec->adapter_dactype = videocontroller_dactypeW; rec->adapter_ram = vidmem; + rec->availability = 3; /* Running or Full Power */ rec->current_bitsperpixel = get_bits_per_pixel( &hres, &vres ); rec->current_horizontalres = hres; rec->current_verticalres = vres; @@ -2099,13 +2366,17 @@ { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, 0, NULL, fill_compsys }, { class_datafileW, SIZEOF(col_datafile), col_datafile, 0, 0, NULL, fill_datafile }, { class_directoryW, SIZEOF(col_directory), col_directory, 0, 0, NULL, fill_directory }, - { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, SIZEOF(data_diskdrive), 0, (BYTE *)data_diskdrive }, + { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, 0, 0, NULL, fill_diskdrive }, { class_diskpartitionW, SIZEOF(col_diskpartition), col_diskpartition, 0, 0, NULL, fill_diskpartition }, { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_logicaldisk2W, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, 0, NULL, fill_networkadapter }, + { class_networkadapterconfigW, SIZEOF(col_networkadapterconfig), col_networkadapterconfig, 0, 0, NULL, + fill_networkadapterconfig }, { class_osW, SIZEOF(col_os), col_os, 0, 0, NULL, fill_os }, { class_paramsW, SIZEOF(col_param), col_param, SIZEOF(data_param), 0, (BYTE *)data_param }, + { class_physicalmediaW, SIZEOF(col_physicalmedia), col_physicalmedia, SIZEOF(data_physicalmedia), 0, (BYTE *)data_physicalmedia }, + { class_physicalmemoryW, SIZEOF(col_physicalmemory), col_physicalmemory, 0, 0, NULL, fill_physicalmemory }, { class_processW, SIZEOF(col_process), col_process, 0, 0, NULL, fill_process }, { class_processorW, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor }, { class_qualifiersW, SIZEOF(col_qualifier), col_qualifier, SIZEOF(data_qualifier), 0, (BYTE *)data_qualifier }, Modified: trunk/reactos/dll/win32/wbemprox/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/class.c… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/class.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/class.c [iso-8859-1] Sat Apr 26 17:12:58 2014 @@ -139,7 +139,7 @@ TRACE("%p, %p\n", iface, ppEnum); - return EnumWbemClassObject_create( NULL, ec->query, (void **)ppEnum ); + return EnumWbemClassObject_create( ec->query, (void **)ppEnum ); } static HRESULT WINAPI enum_class_object_Skip( @@ -177,12 +177,11 @@ enum_class_object_Skip }; -HRESULT EnumWbemClassObject_create( - IUnknown *pUnkOuter, struct query *query, LPVOID *ppObj ) +HRESULT EnumWbemClassObject_create( struct query *query, LPVOID *ppObj ) { struct enum_class_object *ec; - TRACE("%p, %p\n", pUnkOuter, ppObj); + TRACE("%p\n", ppObj); ec = heap_alloc( sizeof(*ec) ); if (!ec) return E_OUTOFMEMORY; @@ -464,17 +463,17 @@ TRACE("%p, %s, %08x, %s, %p\n", iface, debugstr_w(wszQualifierName), lFlags, debugstr_variant(pQualifierVal), pNames); - if (wszQualifierName || pQualifierVal) - { - FIXME("qualifier not supported\n"); - return E_NOTIMPL; - } - if (lFlags != WBEM_FLAG_ALWAYS) + if (lFlags != WBEM_FLAG_ALWAYS && + lFlags != WBEM_FLAG_NONSYSTEM_ONLY && + lFlags != WBEM_FLAG_SYSTEM_ONLY) { FIXME("flags %08x not supported\n", lFlags); return E_NOTIMPL; } - return get_properties( ec->query->view, pNames ); + if (wszQualifierName || pQualifierVal) + FIXME("qualifier not supported\n"); + + return get_properties( ec->query->view, lFlags, pNames ); } static HRESULT WINAPI class_object_BeginEnumeration( @@ -538,7 +537,7 @@ TRACE("%p, %s, %p\n", iface, debugstr_w(wszProperty), ppQualSet); - return WbemQualifierSet_create( NULL, co->name, wszProperty, (void **)ppQualSet ); + return WbemQualifierSet_create( co->name, wszProperty, (void **)ppQualSet ); } static HRESULT WINAPI class_object_Clone( Modified: trunk/reactos/dll/win32/wbemprox/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/main.c?… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/main.c [iso-8859-1] Sat Apr 26 17:12:58 2014 @@ -24,7 +24,7 @@ static HINSTANCE instance; -typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); +typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj ); typedef struct { @@ -74,14 +74,11 @@ if (pOuter) return CLASS_E_NOAGGREGATION; - r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk ); + r = This->pfnCreateInstance( (LPVOID *)&punk ); if (FAILED(r)) return r; r = IUnknown_QueryInterface( punk, riid, ppobj ); - if (FAILED(r)) - return r; - IUnknown_Release( punk ); return r; } Modified: trunk/reactos/dll/win32/wbemprox/qualifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/qualifi… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/qualifier.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/qualifier.c [iso-8859-1] Sat Apr 26 17:12:58 2014 @@ -234,12 +234,11 @@ qualifier_set_EndEnumeration }; -HRESULT WbemQualifierSet_create( - IUnknown *pUnkOuter, const WCHAR *class, const WCHAR *member, LPVOID *ppObj ) +HRESULT WbemQualifierSet_create( const WCHAR *class, const WCHAR *member, LPVOID *ppObj ) { struct qualifier_set *set; - TRACE("%p, %p\n", pUnkOuter, ppObj); + TRACE("%p\n", ppObj); if (!(set = heap_alloc( sizeof(*set) ))) return E_OUTOFMEMORY; Modified: trunk/reactos/dll/win32/wbemprox/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/query.c… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/query.c [iso-8859-1] Sat Apr 26 17:12:58 2014 @@ -102,15 +102,93 @@ (expr->left->type == EXPR_SVAL && expr->right->type == EXPR_PROPVAL)); } +static inline BOOL is_boolcmp( const struct complex_expr *expr, UINT ltype, UINT rtype ) +{ + if (ltype == CIM_BOOLEAN && expr->left->type == EXPR_PROPVAL && + (expr->right->type == EXPR_SVAL || expr->right->type == EXPR_BVAL)) return TRUE; + else if (rtype == CIM_BOOLEAN && expr->right->type == EXPR_PROPVAL && + (expr->left->type == EXPR_SVAL || expr->left->type == EXPR_BVAL)) return TRUE; + return FALSE; +} + +static HRESULT eval_boolcmp( UINT op, LONGLONG lval, LONGLONG rval, UINT ltype, UINT rtype, LONGLONG *val ) +{ + static const WCHAR trueW[] = {'T','r','u','e',0}; + + if (ltype == CIM_STRING) lval = !strcmpiW( (const WCHAR *)(INT_PTR)lval, trueW ) ? -1 : 0; + else if (rtype == CIM_STRING) rval = !strcmpiW( (const WCHAR *)(INT_PTR)rval, trueW ) ? -1 : 0; + + switch (op) + { + case OP_EQ: + *val = (lval == rval); + break; + case OP_NE: + *val = (lval != rval); + break; + default: + ERR("unhandled operator %u\n", op); + return WBEM_E_INVALID_QUERY; + } + return S_OK; +} + +static UINT resolve_type( UINT left, UINT right ) +{ + switch (left) + { + case CIM_SINT8: + case CIM_SINT16: + case CIM_SINT32: + case CIM_SINT64: + case CIM_UINT8: + case CIM_UINT16: + case CIM_UINT32: + case CIM_UINT64: + switch (right) + { + case CIM_SINT8: + case CIM_SINT16: + case CIM_SINT32: + case CIM_SINT64: + case CIM_UINT8: + case CIM_UINT16: + case CIM_UINT32: + case CIM_UINT64: + return CIM_UINT64; + default: break; + } + break; + + case CIM_STRING: + if (right == CIM_STRING) return CIM_STRING; + break; + + case CIM_BOOLEAN: + if (right == CIM_BOOLEAN) return CIM_BOOLEAN; + break; + + default: + break; + } + return CIM_ILLEGAL; +} + static HRESULT eval_binary( const struct table *table, UINT row, const struct complex_expr *expr, - LONGLONG *val ) + LONGLONG *val, UINT *type ) { HRESULT lret, rret; LONGLONG lval, rval; - - lret = eval_cond( table, row, expr->left, &lval ); - rret = eval_cond( table, row, expr->right, &rval ); + UINT ltype, rtype; + + lret = eval_cond( table, row, expr->left, &lval, &ltype ); + rret = eval_cond( table, row, expr->right, &rval, &rtype ); if (lret != S_OK || rret != S_OK) return WBEM_E_INVALID_QUERY; + + *type = resolve_type( ltype, rtype ); + + if (is_boolcmp( expr, ltype, rtype )) + return eval_boolcmp( expr->op, lval, rval, ltype, rtype, val ); if (is_strcmp( expr )) { @@ -153,13 +231,22 @@ } static HRESULT eval_unary( const struct table *table, UINT row, const struct complex_expr *expr, - LONGLONG *val ) + LONGLONG *val, UINT *type ) { HRESULT hr; UINT column; LONGLONG lval; + if (expr->op == OP_NOT) + { + hr = eval_cond( table, row, expr->left, &lval, type ); + if (hr != S_OK) + return hr; + *val = !lval; + return S_OK; + } + hr = get_column_index( table, expr->left->u.propval->name, &column ); if (hr != S_OK) return hr; @@ -180,11 +267,13 @@ ERR("unknown operator %u\n", expr->op); return WBEM_E_INVALID_QUERY; } + + *type = table->columns[column].type & CIM_TYPE_MASK; return S_OK; } static HRESULT eval_propval( const struct table *table, UINT row, const struct property *propval, - LONGLONG *val ) + LONGLONG *val, UINT *type ) { HRESULT hr; @@ -194,31 +283,44 @@ if (hr != S_OK) return hr; + *type = table->columns[column].type & CIM_TYPE_MASK; return get_value( table, row, column, val ); } -HRESULT eval_cond( const struct table *table, UINT row, const struct expr *cond, LONGLONG *val ) +HRESULT eval_cond( const struct table *table, UINT row, const struct expr *cond, LONGLONG *val, UINT *type ) { if (!cond) { *val = 1; + *type = CIM_UINT64; return S_OK; } switch (cond->type) { case EXPR_COMPLEX: - return eval_binary( table, row, &cond->u.expr, val ); + return eval_binary( table, row, &cond->u.expr, val, type ); + case EXPR_UNARY: - return eval_unary( table, row, &cond->u.expr, val ); + return eval_unary( table, row, &cond->u.expr, val, type ); + case EXPR_PROPVAL: - return eval_propval( table, row, cond->u.propval, val ); + return eval_propval( table, row, cond->u.propval, val, type ); + case EXPR_SVAL: *val = (INT_PTR)cond->u.sval; - return S_OK; + *type = CIM_STRING; + return S_OK; + case EXPR_IVAL: + *val = cond->u.ival; + *type = CIM_UINT64; + return S_OK; + case EXPR_BVAL: *val = cond->u.ival; - return S_OK; + *type = CIM_BOOLEAN; + return S_OK; + default: ERR("invalid expression type\n"); break; @@ -245,6 +347,7 @@ { HRESULT hr; LONGLONG val = 0; + UINT type; if (j >= len) { @@ -253,7 +356,7 @@ if (!(tmp = heap_realloc( view->result, len * sizeof(UINT) ))) return E_OUTOFMEMORY; view->result = tmp; } - if ((hr = eval_cond( view->table, i, view->cond, &val )) != S_OK) return hr; + if ((hr = eval_cond( view->table, i, view->cond, &val, &type )) != S_OK) return hr; if (val) view->result[j++] = i; } view->count = j; @@ -302,7 +405,7 @@ if (hr != S_OK) goto done; hr = execute_view( query->view ); if (hr != S_OK) goto done; - hr = EnumWbemClassObject_create( NULL, query, (void **)result ); + hr = EnumWbemClassObject_create( query, (void **)result ); done: release_query( query ); @@ -844,7 +947,7 @@ return set_value( view->table, row, column, val, type ); } -HRESULT get_properties( const struct view *view, SAFEARRAY **props ) +HRESULT get_properties( const struct view *view, LONG flags, SAFEARRAY **props ) { SAFEARRAY *sa; BSTR str; @@ -855,7 +958,13 @@ for (i = 0; i < view->table->num_cols; i++) { + BOOL is_system; + if (is_method( view->table, i )) continue; + + is_system = is_system_prop( view->table->columns[i].name ); + if ((flags & WBEM_FLAG_NONSYSTEM_ONLY) && is_system) continue; + else if ((flags & WBEM_FLAG_SYSTEM_ONLY) && !is_system) continue; str = SysAllocString( view->table->columns[i].name ); if (!str || SafeArrayPutElement( sa, &i, str ) != S_OK) Modified: trunk/reactos/dll/win32/wbemprox/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/service… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/services.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/services.c [iso-8859-1] Sat Apr 26 17:12:58 2014 @@ -268,7 +268,7 @@ if ((strcmpiW( strNamespace, cimv2W ) && strcmpiW( strNamespace, defaultW )) || ws->namespace) return WBEM_E_INVALID_NAMESPACE; - return WbemServices_create( NULL, cimv2W, (void **)ppWorkingNamespace ); + return WbemServices_create( cimv2W, (void **)ppWorkingNamespace ); } static HRESULT WINAPI wbem_services_CancelAsyncCall( @@ -802,7 +802,7 @@ hr = execute_view( query->view ); if (hr != S_OK) goto done; - hr = EnumWbemClassObject_create( NULL, query, (void **)&result ); + hr = EnumWbemClassObject_create( query, (void **)&result ); if (hr != S_OK) goto done; hr = create_class_object( query->view->table->name, result, 0, NULL, &obj ); @@ -865,11 +865,11 @@ wbem_services_ExecMethodAsync }; -HRESULT WbemServices_create( IUnknown *pUnkOuter, const WCHAR *namespace, LPVOID *ppObj ) +HRESULT WbemServices_create( const WCHAR *namespace, LPVOID *ppObj ) { struct wbem_services *ws; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); ws = heap_alloc( sizeof(*ws) ); if (!ws) return E_OUTOFMEMORY; Modified: trunk/reactos/dll/win32/wbemprox/wbemlocator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/wbemloc… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/wbemlocator.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/wbemlocator.c [iso-8859-1] Sat Apr 26 17:12:58 2014 @@ -180,7 +180,7 @@ if (SecurityFlags) FIXME("unsupported flags\n"); - hr = WbemServices_create( NULL, namespace, (void **)ppNamespace ); + hr = WbemServices_create( namespace, (void **)ppNamespace ); heap_free( namespace ); heap_free( server ); if (SUCCEEDED( hr )) @@ -197,11 +197,11 @@ wbem_locator_ConnectServer }; -HRESULT WbemLocator_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT WbemLocator_create( LPVOID *ppObj ) { wbem_locator *wl; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); wl = heap_alloc( sizeof(*wl) ); if (!wl) return E_OUTOFMEMORY; Modified: trunk/reactos/dll/win32/wbemprox/wbemprox.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/wbempro… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/wbemprox.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/wbemprox.idl [iso-8859-1] Sat Apr 26 17:12:58 2014 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep register + [ helpstring("WBEM Locator"), threading(both), Modified: trunk/reactos/dll/win32/wbemprox/wbemprox_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/wbempro… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/wbemprox_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/wbemprox_private.h [iso-8859-1] Sat Apr 26 17:12:58 2014 @@ -78,7 +78,8 @@ OP_NE = 8, OP_ISNULL = 9, OP_NOTNULL = 10, - OP_LIKE = 11 + OP_LIKE = 11, + OP_NOT = 12 }; struct expr; @@ -211,7 +212,7 @@ void clear_table( struct table * ) DECLSPEC_HIDDEN; void free_table( struct table * ) DECLSPEC_HIDDEN; UINT get_type_size( CIMTYPE ) DECLSPEC_HIDDEN; -HRESULT eval_cond( const struct table *, UINT, const struct expr *, LONGLONG * ) DECLSPEC_HIDDEN; +HRESULT eval_cond( const struct table *, UINT, const struct expr *, LONGLONG *, UINT * ) DECLSPEC_HIDDEN; HRESULT get_column_index( const struct table *, const WCHAR *, UINT * ) DECLSPEC_HIDDEN; HRESULT get_value( const struct table *, UINT, UINT, LONGLONG * ) DECLSPEC_HIDDEN; BSTR get_value_bstr( const struct table *, UINT, UINT ) DECLSPEC_HIDDEN; @@ -224,7 +225,7 @@ SAFEARRAY *to_safearray( const struct array *, CIMTYPE ) DECLSPEC_HIDDEN; VARTYPE to_vartype( CIMTYPE ) DECLSPEC_HIDDEN; void destroy_array( struct array *, CIMTYPE ) DECLSPEC_HIDDEN; -HRESULT get_properties( const struct view *, SAFEARRAY ** ) DECLSPEC_HIDDEN; +HRESULT get_properties( const struct view *, LONG, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN; BSTR get_method_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; BSTR get_property_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; @@ -232,12 +233,12 @@ HRESULT create_signature( const WCHAR *, const WCHAR *, enum param_direction, IWbemClassObject ** ) DECLSPEC_HIDDEN; -HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; -HRESULT WbemServices_create(IUnknown *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemServices_create(const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; HRESULT create_class_object(const WCHAR *, IEnumWbemClassObject *, UINT, struct record *, IWbemClassObject **) DECLSPEC_HIDDEN; -HRESULT EnumWbemClassObject_create(IUnknown *, struct query *, LPVOID *) DECLSPEC_HIDDEN; -HRESULT WbemQualifierSet_create(IUnknown *, const WCHAR *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT EnumWbemClassObject_create(struct query *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemQualifierSet_create(const WCHAR *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; HRESULT process_get_owner(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT reg_enum_key(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/wbemprox/wql.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/wql.tab… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/wql.tab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/wql.tab.c [iso-8859-1] Sat Apr 26 17:12:58 2014 @@ -560,16 +560,16 @@ /* YYFINAL -- State number of the termination state. */ #define YYFINAL 9 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 67 +#define YYLAST 68 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 32 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 10 /* YYNRULES -- Number of rules. */ -#define YYNRULES 35 +#define YYNRULES 36 /* YYNRULES -- Number of states. */ -#define YYNSTATES 65 +#define YYNSTATES 67 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -618,9 +618,9 @@ static const yytype_uint8 yyprhs[] = { 0, 0, 3, 7, 12, 19, 21, 25, 27, 31, - 33, 35, 37, 41, 45, 49, 53, 57, 61, 65, - 69, 73, 77, 81, 85, 89, 93, 97, 101, 105, - 110, 112, 114, 116, 118, 120 + 33, 35, 37, 41, 45, 49, 52, 56, 60, 64, + 68, 72, 76, 80, 84, 88, 92, 96, 100, 104, + 108, 113, 115, 117, 119, 121, 123 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -630,15 +630,15 @@ 36, -1, 3, 34, 4, 36, 15, 38, -1, 35, -1, 35, 6, 34, -1, 5, -1, 36, 7, 36, -1, 36, -1, 21, -1, 14, -1, 9, 38, 10, - -1, 38, 23, 38, -1, 38, 22, 38, -1, 40, - 31, 41, -1, 40, 28, 41, -1, 40, 29, 41, - -1, 40, 27, 41, -1, 40, 26, 41, -1, 40, - 30, 41, -1, 41, 31, 40, -1, 41, 28, 40, - -1, 41, 29, 40, -1, 41, 27, 40, -1, 41, - 26, 40, -1, 41, 30, 40, -1, 40, 25, 39, - -1, 40, 8, 11, -1, 40, 8, 24, 11, -1, - 20, -1, 35, -1, 37, -1, 20, -1, 13, -1, - 12, -1 + -1, 38, 23, 38, -1, 38, 22, 38, -1, 24, + 38, -1, 40, 31, 41, -1, 40, 28, 41, -1, + 40, 29, 41, -1, 40, 27, 41, -1, 40, 26, + 41, -1, 40, 30, 41, -1, 41, 31, 40, -1, + 41, 28, 40, -1, 41, 29, 40, -1, 41, 27, + 40, -1, 41, 26, 40, -1, 41, 30, 40, -1, + 40, 25, 39, -1, 40, 8, 11, -1, 40, 8, + 24, 11, -1, 20, -1, 35, -1, 37, -1, 20, + -1, 13, -1, 12, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -647,7 +647,7 @@ 0, 221, 221, 233, 245, 260, 261, 265, 272, 278, 287, 296, 303, 309, 315, 321, 327, 333, 339, 345, 351, 357, 363, 369, 375, 381, 387, 393, 399, 405, - 414, 423, 432, 438, 444, 450 + 411, 420, 429, 438, 444, 450, 456 }; #endif @@ -684,16 +684,16 @@ 0, 32, 33, 33, 33, 34, 34, 34, 35, 35, 36, 37, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, - 39, 40, 41, 41, 41, 41 + 38, 39, 40, 41, 41, 41, 41 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 3, 4, 6, 1, 3, 1, 3, 1, - 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, - 1, 1, 1, 1, 1, 1 + 1, 1, 3, 3, 3, 2, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 4, 1, 1, 1, 1, 1, 1 }; /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. @@ -702,38 +702,38 @@ static const yytype_uint8 yydefact[] = { 0, 0, 0, 0, 7, 10, 0, 5, 9, 1, - 2, 0, 0, 0, 3, 6, 8, 0, 0, 35, - 34, 11, 33, 31, 32, 4, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 12, 14, 13, 28, 0, - 30, 27, 19, 18, 16, 17, 20, 15, 25, 24, - 22, 23, 26, 21, 29 + 2, 0, 0, 0, 3, 6, 8, 0, 0, 36, + 35, 11, 34, 0, 32, 33, 4, 0, 0, 0, + 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 12, 14, 13, + 29, 0, 31, 28, 20, 19, 17, 18, 21, 16, + 26, 25, 23, 24, 27, 22, 30 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { - -1, 2, 6, 23, 8, 24, 25, 51, 26, 27 + -1, 2, 6, 24, 8, 25, 26, 53, 27, 28 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -20 +#define YYPACT_NINF -18 static const yytype_int8 yypact[] = { - 2, 3, 6, -10, -20, -20, 24, 31, 33, -20, - -20, -10, 4, -10, 26, -20, -20, 18, 18, -20, - -20, -20, -20, -20, -20, -19, -8, 20, -9, 18, - 18, 5, 23, 22, 22, 22, 22, 22, 22, -10, - -10, -10, -10, -10, -10, -20, 41, -20, -20, 54, - -20, -20, -20, -20, -20, -20, -20, -20, -20, -20, - -20, -20, -20, -20, -20 + 7, 3, 12, -5, -18, -18, 31, 30, 21, -18, + -18, -5, 4, -5, 28, -18, -18, 17, 17, -18, + -18, -18, -18, 17, -18, -18, 11, -8, 24, 22, + -18, 17, 17, 16, 26, -9, -9, -9, -9, -9, + -9, -5, -5, -5, -5, -5, -5, -18, 19, -18, + -18, 37, -18, -18, -18, -18, -18, -18, -18, -18, + -18, -18, -18, -18, -18, -18, -18 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -20, -20, 55, 14, -1, -20, 15, -20, 13, 25 + -18, -18, 56, 1, 36, -18, -17, -18, 15, 27 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -742,30 +742,30 @@ #define YYTABLE_NINF -1 static const yytype_uint8 yytable[] = { - 31, 45, 10, 29, 30, 1, 9, 3, 4, 4, - 14, 5, 16, 29, 30, 7, 48, 32, 33, 34, - 35, 36, 37, 38, 5, 5, 7, 18, 11, 49, - 19, 20, 21, 28, 19, 20, 21, 12, 22, 5, - 13, 17, 22, 50, 46, 47, 39, 40, 41, 42, - 43, 44, 58, 59, 60, 61, 62, 63, 52, 53, - 54, 55, 56, 57, 30, 64, 0, 15 + 33, 29, 7, 19, 20, 21, 30, 3, 4, 4, + 1, 22, 9, 7, 48, 49, 5, 34, 35, 36, + 37, 38, 39, 40, 5, 5, 18, 50, 13, 19, + 20, 21, 47, 31, 32, 11, 12, 22, 5, 10, + 51, 23, 32, 17, 31, 32, 52, 14, 66, 16, + 41, 42, 43, 44, 45, 46, 60, 61, 62, 63, + 64, 65, 54, 55, 56, 57, 58, 59, 15 }; #define yypact_value_is_default(yystate) \ - ((yystate) == (-20)) + ((yystate) == (-18)) #define yytable_value_is_error(yytable_value) \ YYID (0) -static const yytype_int8 yycheck[] = -{ - 8, 10, 3, 22, 23, 3, 0, 4, 5, 5, - 11, 21, 13, 22, 23, 1, 11, 25, 26, 27, - 28, 29, 30, 31, 21, 21, 12, 9, 4, 24, - 12, 13, 14, 18, 12, 13, 14, 6, 20, 21, - 7, 15, 20, 20, 29, 30, 26, 27, 28, 29, - 30, 31, 39, 40, 41, 42, 43, 44, 33, 34, - 35, 36, 37, 38, 23, 11, -1, 12 +static const yytype_uint8 yycheck[] = +{ + 8, 18, 1, 12, 13, 14, 23, 4, 5, 5, + 3, 20, 0, 12, 31, 32, 21, 25, 26, 27, + 28, 29, 30, 31, 21, 21, 9, 11, 7, 12, + 13, 14, 10, 22, 23, 4, 6, 20, 21, 3, + 24, 24, 23, 15, 22, 23, 20, 11, 11, 13, + 26, 27, 28, 29, 30, 31, 41, 42, 43, 44, + 45, 46, 35, 36, 37, 38, 39, 40, 12 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -774,11 +774,11 @@ { 0, 3, 33, 4, 5, 21, 34, 35, 36, 0, 36, 4, 6, 7, 36, 34, 36, 15, 9, 12, - 13, 14, 20, 35, 37, 38, 40, 41, 38, 22, - 23, 8, 25, 26, 27, 28, 29, 30, 31, 26, - 27, 28, 29, 30, 31, 10, 38, 38, 11, 24, - 20, 39, 41, 41, 41, 41, 41, 41, 40, 40, - 40, 40, 40, 40, 11 + 13, 14, 20, 24, 35, 37, 38, 40, 41, 38, + 38, 22, 23, 8, 25, 26, 27, 28, 29, 30, + 31, 26, 27, 28, 29, 30, 31, 10, 38, 38, + 11, 24, 20, 39, 41, 41, 41, 41, 41, 41, + 40, 40, 40, 40, 40, 40, 11 }; #define yyerrok (yyerrstatus = 0) @@ -1766,16 +1766,27 @@ /* Line 1806 of yacc.c */ #line 322 "wql.y" { + (yyval.expr) = expr_unary( ctx, (yyvsp[(2) - (2)].expr), OP_NOT ); + if (!(yyval.expr)) + YYABORT; + } + break; + + case 16: + +/* Line 1806 of yacc.c */ +#line 328 "wql.y" + { (yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_EQ, (yyvsp[(3) - (3)].expr) ); if (!(yyval.expr)) YYABORT; } break; - case 16: - -/* Line 1806 of yacc.c */ -#line 328 "wql.y" + case 17: + +/* Line 1806 of yacc.c */ +#line 334 "wql.y" { (yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_GT, (yyvsp[(3) - (3)].expr) ); if (!(yyval.expr)) @@ -1783,10 +1794,10 @@ } break; - case 17: - -/* Line 1806 of yacc.c */ -#line 334 "wql.y" + case 18: + +/* Line 1806 of yacc.c */ +#line 340 "wql.y" { (yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_LT, (yyvsp[(3) - (3)].expr) ); if (!(yyval.expr)) @@ -1794,10 +1805,10 @@ } break; - case 18: - -/* Line 1806 of yacc.c */ -#line 340 "wql.y" + case 19: + +/* Line 1806 of yacc.c */ +#line 346 "wql.y" { (yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_LE, (yyvsp[(3) - (3)].expr) ); if (!(yyval.expr)) @@ -1805,10 +1816,10 @@ } break; - case 19: - -/* Line 1806 of yacc.c */ -#line 346 "wql.y" + case 20: + +/* Line 1806 of yacc.c */ +#line 352 "wql.y" { (yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_GE, (yyvsp[(3) - (3)].expr) ); if (!(yyval.expr)) @@ -1816,10 +1827,10 @@ } break; - case 20: - -/* Line 1806 of yacc.c */ -#line 352 "wql.y" + case 21: + +/* Line 1806 of yacc.c */ +#line 358 "wql.y" { (yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_NE, (yyvsp[(3) - (3)].expr) ); if (!(yyval.expr)) @@ -1827,10 +1838,10 @@ } break; - case 21: - -/* Line 1806 of yacc.c */ -#line 358 "wql.y" + case 22: + +/* Line 1806 of yacc.c */ +#line 364 "wql.y" { (yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_EQ, (yyvsp[(3) - (3)].expr) ); if (!(yyval.expr)) @@ -1838,10 +1849,10 @@ } break; - case 22: - -/* Line 1806 of yacc.c */ -#line 364 "wql.y" + case 23: + +/* Line 1806 of yacc.c */ +#line 370 "wql.y" { (yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_GT, (yyvsp[(3) - (3)].expr) ); if (!(yyval.expr)) @@ -1849,10 +1860,10 @@ } break; - case 23: - -/* Line 1806 of yacc.c */ -#line 370 "wql.y" + case 24: + +/* Line 1806 of yacc.c */ +#line 376 "wql.y" { (yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_LT, (yyvsp[(3) - (3)].expr) ); if (!(yyval.expr)) @@ -1860,10 +1871,10 @@ } break; - case 24: - -/* Line 1806 of yacc.c */ -#line 376 "wql.y" + case 25: + +/* Line 1806 of yacc.c */ +#line 382 "wql.y" { (yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_LE, (yyvsp[(3) - (3)].expr) ); if (!(yyval.expr)) @@ -1871,10 +1882,10 @@ } break; - case 25: - -/* Line 1806 of yacc.c */ -#line 382 "wql.y" + case 26: + +/* Line 1806 of yacc.c */ +#line 388 "wql.y" { (yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_GE, (yyvsp[(3) - (3)].expr) ); if (!(yyval.expr)) @@ -1882,10 +1893,10 @@ } break; - case 26: - -/* Line 1806 of yacc.c */ -#line 388 "wql.y" + case 27: + +/* Line 1806 of yacc.c */ +#line 394 "wql.y" { (yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_NE, (yyvsp[(3) - (3)].expr) ); if (!(yyval.expr)) @@ -1893,10 +1904,10 @@ } break; - case 27: - -/* Line 1806 of yacc.c */ -#line 394 "wql.y" + case 28: + +/* Line 1806 of yacc.c */ +#line 400 "wql.y" { (yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_LIKE, (yyvsp[(3) - (3)].expr) ); if (!(yyval.expr)) @@ -1904,10 +1915,10 @@ } break; - case 28: - -/* Line 1806 of yacc.c */ -#line 400 "wql.y" + case 29: + +/* Line 1806 of yacc.c */ +#line 406 "wql.y" { (yyval.expr) = expr_unary( ctx, (yyvsp[(1) - (3)].expr), OP_ISNULL ); if (!(yyval.expr)) @@ -1915,10 +1926,10 @@ } break; - case 29: - -/* Line 1806 of yacc.c */ -#line 406 "wql.y" + case 30: + +/* Line 1806 of yacc.c */ +#line 412 "wql.y" { (yyval.expr) = expr_unary( ctx, (yyvsp[(1) - (4)].expr), OP_NOTNULL ); if (!(yyval.expr)) @@ -1926,10 +1937,10 @@ } break; - case 30: - -/* Line 1806 of yacc.c */ -#line 415 "wql.y" + case 31: + +/* Line 1806 of yacc.c */ +#line 421 "wql.y" { (yyval.expr) = expr_sval( ctx, &(yyvsp[(1) - (1)].str) ); if (!(yyval.expr)) @@ -1937,10 +1948,10 @@ } break; - case 31: - -/* Line 1806 of yacc.c */ -#line 424 "wql.y" + case 32: + +/* Line 1806 of yacc.c */ +#line 430 "wql.y" { (yyval.expr) = expr_propval( ctx, (yyvsp[(1) - (1)].proplist) ); if (!(yyval.expr)) @@ -1948,10 +1959,10 @@ } break; - case 32: - -/* Line 1806 of yacc.c */ -#line 433 "wql.y" + case 33: + +/* Line 1806 of yacc.c */ +#line 439 "wql.y" { (yyval.expr) = expr_ival( ctx, (yyvsp[(1) - (1)].integer) ); if (!(yyval.expr)) @@ -1959,10 +1970,10 @@ } break; - case 33: - -/* Line 1806 of yacc.c */ -#line 439 "wql.y" + case 34: + +/* Line 1806 of yacc.c */ +#line 445 "wql.y" { (yyval.expr) = expr_sval( ctx, &(yyvsp[(1) - (1)].str) ); if (!(yyval.expr)) @@ -1970,10 +1981,10 @@ } break; - case 34: - -/* Line 1806 of yacc.c */ -#line 445 "wql.y" + case 35: + +/* Line 1806 of yacc.c */ +#line 451 "wql.y" { (yyval.expr) = expr_bval( ctx, -1 ); if (!(yyval.expr)) @@ -1981,10 +1992,10 @@ } break; - case 35: - -/* Line 1806 of yacc.c */ -#line 451 "wql.y" + case 36: + +/* Line 1806 of yacc.c */ +#line 457 "wql.y" { (yyval.expr) = expr_bval( ctx, 0 ); if (!(yyval.expr)) @@ -1995,7 +2006,7 @@ /* Line 1806 of yacc.c */ -#line 2011 "wql.tab.c" +#line 2022 "wql.tab.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2226,7 +2237,7 @@ /* Line 2067 of yacc.c */ -#line 458 "wql.y" +#line 464 "wql.y" HRESULT parse_query( const WCHAR *str, struct view **view, struct list *mem ) Modified: trunk/reactos/dll/win32/wbemprox/wql.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/wql.y?r… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/wql.y [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/wql.y [iso-8859-1] Sat Apr 26 17:12:58 2014 @@ -315,6 +315,12 @@ | expr TK_OR expr { $$ = expr_complex( ctx, $1, OP_OR, $3 ); + if (!$$) + YYABORT; + } + | TK_NOT expr + { + $$ = expr_unary( ctx, $2, OP_NOT ); if (!$$) YYABORT; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Apr 26 17:12:58 2014 @@ -201,7 +201,7 @@ reactos/dll/win32/vbscript # Synced to Wine-1.7.17 reactos/dll/win32/version # Synced to Wine-1.7.1 reactos/dll/win32/wbemdisp # Synced to Wine-1.7.17 -reactos/dll/win32/wbemprox # Synced to Wine-1.7.2 +reactos/dll/win32/wbemprox # Synced to Wine-1.7.17 reactos/dll/win32/wer # Autosync reactos/dll/win32/windowscodecs # Synced to Wine-1.7.17 reactos/dll/win32/windowscodecsext # Synced to Wine-1.7.1

1 0

[akhaldi] 62985: [RPCRT4_WINETEST] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: akhaldi Date: Sat Apr 26 16:58:32 2014 New Revision: 62985 URL: http://svn.reactos.org/svn/reactos?rev=62985&view=rev Log: [RPCRT4_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/rpcrt4/ndr_marshall.c trunk/rostests/winetests/rpcrt4/rpc.c trunk/rostests/winetests/rpcrt4/rpc_async.c trunk/rostests/winetests/rpcrt4/rpc_protseq.c trunk/rostests/winetests/rpcrt4/server.c trunk/rostests/winetests/rpcrt4/server.idl Modified: trunk/rostests/winetests/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/ndr_mars… ============================================================================== --- trunk/rostests/winetests/rpcrt4/ndr_marshall.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/ndr_marshall.c [iso-8859-1] Sat Apr 26 16:58:32 2014 @@ -2092,7 +2092,7 @@ StubDesc.RpcInterfaceInformation = (void *)&IFoo___RpcServerInterface; - status = RpcServerUseProtseqEp(ncalrpc, 20, endpoint, NULL); + status = RpcServerUseProtseqEpA(ncalrpc, 20, endpoint, NULL); ok(RPC_S_OK == status, "RpcServerUseProtseqEp failed with status %u\n", status); status = RpcServerRegisterIf(IFoo_v0_0_s_ifspec, NULL, NULL); ok(RPC_S_OK == status, "RpcServerRegisterIf failed with status %u\n", status); @@ -2104,12 +2104,12 @@ return; } - status = RpcStringBindingCompose(NULL, ncalrpc, NULL, endpoint, NULL, &binding); + status = RpcStringBindingComposeA(NULL, ncalrpc, NULL, endpoint, NULL, &binding); ok(status == RPC_S_OK, "RpcStringBindingCompose failed (%u)\n", status); - status = RpcBindingFromStringBinding(binding, &Handle); + status = RpcBindingFromStringBindingA(binding, &Handle); ok(status == RPC_S_OK, "RpcBindingFromStringBinding failed (%u)\n", status); - RpcStringFree(&binding); + RpcStringFreeA(&binding); NdrClientInitializeNew(&RpcMessage, &StubMsg, &StubDesc, 5); @@ -2208,7 +2208,7 @@ RPC_MESSAGE rpc_msg; RPC_STATUS (RPC_ENTRY *pNdrGetUserMarshalInfo)(ULONG *,ULONG,NDR_USER_MARSHAL_INFO *); - pNdrGetUserMarshalInfo = (void *)GetProcAddress(GetModuleHandle("rpcrt4.dll"), "NdrGetUserMarshalInfo"); + pNdrGetUserMarshalInfo = (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), "NdrGetUserMarshalInfo"); if (!pNdrGetUserMarshalInfo) { skip("NdrGetUserMarshalInfo not exported\n"); Modified: trunk/rostests/winetests/rpcrt4/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc.c?re… ============================================================================== --- trunk/rostests/winetests/rpcrt4/rpc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/rpc.c [iso-8859-1] Sat Apr 26 16:58:32 2014 @@ -113,7 +113,7 @@ ok( (UuidFromStringA((unsigned char*)str, &Uuid1) == RPC_S_INVALID_STRING_UUID), "Invalid UUID String\n" ); str[i2] = x; /* change it back so remaining tests are interesting. */ } - RpcStringFree((unsigned char **)&str); + RpcStringFreeA((unsigned char **)&str); } /* Uuid to String to Uuid (wchar) */ @@ -215,10 +215,10 @@ static unsigned char endpoint[] = "4114"; static unsigned char spn[] = "principal"; - status = RpcNetworkIsProtseqValid(foo); + status = RpcNetworkIsProtseqValidA(foo); ok(status == RPC_S_INVALID_RPC_PROTSEQ, "return wrong\n"); - status = RpcNetworkIsProtseqValid(ncacn_ip_tcp); + status = RpcNetworkIsProtseqValidA(ncacn_ip_tcp); ok(status == RPC_S_OK, "return wrong\n"); status = RpcMgmtStopServerListening(NULL); @@ -235,7 +235,7 @@ ok(status == RPC_S_NO_PROTSEQS_REGISTERED, "wrong RpcServerListen error (%u)\n", status); - status = RpcServerUseProtseqEp(ncacn_ip_tcp, 20, endpoint, NULL); + status = RpcServerUseProtseqEpA(ncacn_ip_tcp, 20, endpoint, NULL); ok(status == RPC_S_OK, "RpcServerUseProtseqEp failed (%u)\n", status); status = RpcServerRegisterIf(IFoo_v0_0_s_ifspec, NULL, NULL); @@ -252,30 +252,30 @@ "wrong RpcServerListen error (%u)\n", status); } - status = RpcStringBindingCompose(NULL, ncacn_ip_tcp, address, + status = RpcStringBindingComposeA(NULL, ncacn_ip_tcp, address, endpoint, NULL, &binding); ok(status == RPC_S_OK, "RpcStringBindingCompose failed (%u)\n", status); - status = RpcBindingFromStringBinding(binding, &IFoo_IfHandle); + status = RpcBindingFromStringBindingA(binding, &IFoo_IfHandle); ok(status == RPC_S_OK, "RpcBindingFromStringBinding failed (%u)\n", status); - status = RpcBindingSetAuthInfo(IFoo_IfHandle, NULL, RPC_C_AUTHN_LEVEL_NONE, + status = RpcBindingSetAuthInfoA(IFoo_IfHandle, NULL, RPC_C_AUTHN_LEVEL_NONE, RPC_C_AUTHN_WINNT, NULL, RPC_C_AUTHZ_NAME); ok(status == RPC_S_OK, "RpcBindingSetAuthInfo failed (%u)\n", status); - status = RpcBindingInqAuthInfo(IFoo_IfHandle, NULL, NULL, NULL, NULL, NULL); + status = RpcBindingInqAuthInfoA(IFoo_IfHandle, NULL, NULL, NULL, NULL, NULL); ok(status == RPC_S_BINDING_HAS_NO_AUTH, "RpcBindingInqAuthInfo failed (%u)\n", status); - status = RpcBindingSetAuthInfo(IFoo_IfHandle, spn, RPC_C_AUTHN_LEVEL_PKT_PRIVACY, + status = RpcBindingSetAuthInfoA(IFoo_IfHandle, spn, RPC_C_AUTHN_LEVEL_PKT_PRIVACY, RPC_C_AUTHN_WINNT, NULL, RPC_C_AUTHZ_NAME); ok(status == RPC_S_OK, "RpcBindingSetAuthInfo failed (%u)\n", status); level = authnsvc = authzsvc = 0; principal = (unsigned char *)0xdeadbeef; identity = (RPC_AUTH_IDENTITY_HANDLE *)0xdeadbeef; - status = RpcBindingInqAuthInfo(IFoo_IfHandle, &principal, &level, &authnsvc, + status = RpcBindingInqAuthInfoA(IFoo_IfHandle, &principal, &level, &authnsvc, &identity, &authzsvc); ok(status == RPC_S_OK, "RpcBindingInqAuthInfo failed (%u)\n", status); @@ -284,7 +284,7 @@ ok(level == RPC_C_AUTHN_LEVEL_PKT_PRIVACY, "expected RPC_C_AUTHN_LEVEL_PKT_PRIVACY, got %d\n", level); ok(authnsvc == RPC_C_AUTHN_WINNT, "expected RPC_C_AUTHN_WINNT, got %d\n", authnsvc); todo_wine ok(authzsvc == RPC_C_AUTHZ_NAME, "expected RPC_C_AUTHZ_NAME, got %d\n", authzsvc); - if (status == RPC_S_OK) RpcStringFree(&principal); + if (status == RPC_S_OK) RpcStringFreeA(&principal); status = RpcMgmtStopServerListening(NULL); ok(status == RPC_S_OK, "RpcMgmtStopServerListening failed (%u)\n", @@ -302,7 +302,7 @@ ok(status == RPC_S_OK, "RpcMgmtWaitServerListen failed (%u)\n", status); } - status = RpcStringFree(&binding); + status = RpcStringFreeA(&binding); ok(status == RPC_S_OK, "RpcStringFree failed (%u)\n", status); status = RpcBindingFree(&IFoo_IfHandle); @@ -659,7 +659,7 @@ { ULONG exception; int retval; - int (WINAPI *pI_RpcExceptionFilter)(ULONG) = (void *)GetProcAddress(GetModuleHandle("rpcrt4.dll"), "I_RpcExceptionFilter"); + int (WINAPI *pI_RpcExceptionFilter)(ULONG) = (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), "I_RpcExceptionFilter"); if (!pI_RpcExceptionFilter) { @@ -709,32 +709,23 @@ handle_t handle; RPC_CSTR binding; - status = RpcStringBindingCompose(NULL, ncacn_np, address, + status = RpcStringBindingComposeA(NULL, ncacn_np, address, endpoint, NULL, &binding); ok(status == RPC_S_OK, "RpcStringBindingCompose failed (%u)\n", status); - status = RpcBindingFromStringBinding(binding, &handle); + status = RpcBindingFromStringBindingA(binding, &handle); ok(status == RPC_S_OK, "RpcBindingFromStringBinding failed (%u)\n", status); - RpcStringFree(&binding); - - status = RpcBindingToStringBinding(handle, &binding); + RpcStringFreeA(&binding); + + status = RpcBindingToStringBindingA(handle, &binding); ok(status == RPC_S_OK, "RpcStringBindingFromBinding failed with error %u\n", status); ok(!strcmp((const char *)binding, "ncacn_np:.[\\\\pipe\\\\wine_rpc_test]"), "binding string didn't match what was expected: \"%s\"\n", binding); - RpcStringFree(&binding); + RpcStringFreeA(&binding); status = RpcBindingFree(&handle); ok(status == RPC_S_OK, "RpcBindingFree failed with error %u\n", status); -} - -static char *printGuid(char *buf, int size, const UUID *guid) -{ - snprintf(buf, size, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], - guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], - guid->Data4[6], guid->Data4[7]); - return buf; } static void test_UuidCreate(void) @@ -754,7 +745,6 @@ UUID and, or; RPC_STATUS rslt; int i; - char buf[39]; and = guid; or = guid; @@ -778,9 +768,9 @@ *dst |= *src; } ok(UuidEqual(&and, &v4and, &rslt), - "unexpected bits set in V4 UUID: %s\n", printGuid(buf, sizeof(buf), &and)); + "unexpected bits set in V4 UUID: %s\n", wine_dbgstr_guid(&and)); ok(UuidEqual(&or, &v4or, &rslt), - "unexpected bits set in V4 UUID: %s\n", printGuid(buf, sizeof(buf), &or)); + "unexpected bits set in V4 UUID: %s\n", wine_dbgstr_guid(&or)); } else { @@ -798,7 +788,7 @@ { UUID guid1; BYTE version; - RPC_STATUS (WINAPI *pUuidCreateSequential)(UUID *) = (void *)GetProcAddress(GetModuleHandle("rpcrt4.dll"), "UuidCreateSequential"); + RPC_STATUS (WINAPI *pUuidCreateSequential)(UUID *) = (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), "UuidCreateSequential"); RPC_STATUS ret; if (!pUuidCreateSequential) @@ -814,7 +804,6 @@ if (version == 1) { UUID guid2; - char buf[39]; if (!ret) { @@ -823,7 +812,7 @@ */ ok(!(guid1.Data4[2] & 0x01), "GUID does not appear to contain a MAC address: %s\n", - printGuid(buf, sizeof(buf), &guid1)); + wine_dbgstr_guid(&guid1)); } else { @@ -832,7 +821,7 @@ */ ok((guid1.Data4[2] & 0x01), "GUID does not appear to contain a multicast MAC address: %s\n", - printGuid(buf, sizeof(buf), &guid1)); + wine_dbgstr_guid(&guid1)); } /* Generate another GUID, and make sure its MAC address matches the * first. @@ -844,7 +833,7 @@ ok(version == 1, "unexpected version %d\n", version); ok(!memcmp(guid1.Data4, guid2.Data4, sizeof(guid2.Data4)), "unexpected value in MAC address: %s\n", - printGuid(buf, sizeof(buf), &guid2)); + wine_dbgstr_guid(&guid2)); } } @@ -903,12 +892,12 @@ ok( ret == RPC_S_OK, "got %u\n", ret ); ok( principal != (RPC_CSTR)0xdeadbeef, "expected valid principal\n" ); ok( !strcmp( (const char *)principal, username ), "got \'%s\'\n", principal ); - RpcStringFree( &principal ); + RpcStringFreeA( &principal ); ret = RpcServerRegisterAuthInfoA( saved_principal, RPC_C_AUTHN_WINNT, NULL, NULL ); ok( ret == RPC_S_OK, "got %u\n", ret ); - RpcStringFree( &saved_principal ); + RpcStringFreeA( &saved_principal ); HeapFree( GetProcessHeap(), 0, username ); } Modified: trunk/rostests/winetests/rpcrt4/rpc_async.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc_asyn… ============================================================================== --- trunk/rostests/winetests/rpcrt4/rpc_async.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/rpc_async.c [iso-8859-1] Sat Apr 26 16:58:32 2014 @@ -80,7 +80,7 @@ START_TEST( rpc_async ) { - HMODULE hRpcRt4 = GetModuleHandle("rpcrt4.dll"); + HMODULE hRpcRt4 = GetModuleHandleA("rpcrt4.dll"); pRpcAsyncInitializeHandle = (void *)GetProcAddress(hRpcRt4, "RpcAsyncInitializeHandle"); pRpcAsyncGetCallStatus = (void *)GetProcAddress(hRpcRt4, "RpcAsyncGetCallStatus"); if (!pRpcAsyncInitializeHandle || !pRpcAsyncGetCallStatus) Modified: trunk/rostests/winetests/rpcrt4/rpc_protseq.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc_prot… ============================================================================== --- trunk/rostests/winetests/rpcrt4/rpc_protseq.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/rpc_protseq.c [iso-8859-1] Sat Apr 26 16:58:32 2014 @@ -55,24 +55,24 @@ /* show that RpcServerUseProtseqEp(..., NULL, ...) is the same as * RpcServerUseProtseq(...) */ - status = RpcServerUseProtseqEp(ncalrpc, 0, NULL, NULL); + status = RpcServerUseProtseqEpA(ncalrpc, 0, NULL, NULL); ok(status == RPC_S_OK || broken(status == RPC_S_INVALID_ENDPOINT_FORMAT), "RpcServerUseProtseqEp with NULL endpoint failed with status %d\n", status); /* register protocol sequences without explicit endpoints */ - status = RpcServerUseProtseq(np, 0, NULL); + status = RpcServerUseProtseqA(np, 0, NULL); if (status == RPC_S_PROTSEQ_NOT_SUPPORTED) win_skip("ncacn_np not supported\n"); else ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_np) failed with status %d\n", status); if (status == RPC_S_OK) endpoints_registered++; - status = RpcServerUseProtseq(iptcp, 0, NULL); + status = RpcServerUseProtseqA(iptcp, 0, NULL); ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_ip_tcp) failed with status %d\n", status); if (status == RPC_S_OK) endpoints_registered++; - status = RpcServerUseProtseq(ncalrpc, 0, NULL); + status = RpcServerUseProtseqA(ncalrpc, 0, NULL); ok(status == RPC_S_OK, "RpcServerUseProtseqEp(ncalrpc) failed with status %d\n", status); if (status == RPC_S_OK) endpoints_registered++; @@ -85,24 +85,24 @@ for (i = 0; i < bindings->Count; i++) { RPC_CSTR str_bind; - status = RpcBindingToStringBinding(bindings->BindingH[i], &str_bind); + status = RpcBindingToStringBindingA(bindings->BindingH[i], &str_bind); ok(status == RPC_S_OK, "RpcBindingToStringBinding failed with status %d\n", status); trace("string binding: %s\n", str_bind); - RpcStringFree(&str_bind); + RpcStringFreeA(&str_bind); } RpcBindingVectorFree(&bindings); /* re-register - endpoints should be reused */ - status = RpcServerUseProtseq(np, 0, NULL); + status = RpcServerUseProtseqA(np, 0, NULL); if (status == RPC_S_PROTSEQ_NOT_SUPPORTED) win_skip("ncacn_np not supported\n"); else ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_np) failed with status %d\n", status); - status = RpcServerUseProtseq(iptcp, 0, NULL); + status = RpcServerUseProtseqA(iptcp, 0, NULL); ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_ip_tcp) failed with status %d\n", status); - status = RpcServerUseProtseq(ncalrpc, 0, NULL); + status = RpcServerUseProtseqA(ncalrpc, 0, NULL); ok(status == RPC_S_OK, "RpcServerUseProtseqEp(ncalrpc) failed with status %d\n", status); status = RpcServerInqBindings(&bindings); @@ -161,14 +161,14 @@ status = RpcEpRegisterA(IFoo_v0_0_s_ifspec, binding_vector, NULL, NULL); ok(status == RPC_S_OK, "%s: RpcEpRegisterA failed with error %u\n", protseq, status); - status = RpcStringBindingCompose(NULL, protseq, address, + status = RpcStringBindingComposeA(NULL, protseq, address, NULL, NULL, &binding); ok(status == RPC_S_OK, "%s: RpcStringBindingCompose failed (%u)\n", protseq, status); - status = RpcBindingFromStringBinding(binding, &handle); + status = RpcBindingFromStringBindingA(binding, &handle); ok(status == RPC_S_OK, "%s: RpcBindingFromStringBinding failed (%u)\n", protseq, status); - RpcStringFree(&binding); + RpcStringFreeA(&binding); status = RpcBindingReset(handle); ok(status == RPC_S_OK, "%s: RpcBindingReset failed with error %u\n", protseq, status); Modified: trunk/rostests/winetests/rpcrt4/server.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.c… ============================================================================== --- trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] Sat Apr 26 16:58:32 2014 @@ -53,6 +53,9 @@ /* type check statements generated in header file */ fnprintf *p_printf = printf; +static const WCHAR helloW[] = { 'H','e','l','l','o',0 }; +static const WCHAR worldW[] = { 'W','o','r','l','d','!',0 }; + static void InitFunctionPointers(void) { HMODULE hrpcrt4 = GetModuleHandleA("rpcrt4.dll"); @@ -569,6 +572,34 @@ /* ensure nul-termination */ if (name->size < sizeof(bossman)) name->name[name->size - 1] = 0; +} + +void __cdecl s_get_names(int *n, str_array_t *names) +{ + str_array_t list; + + list = MIDL_user_allocate(2 * sizeof(list[0])); + list[0] = MIDL_user_allocate(6); + strcpy(list[0], "Hello"); + list[1] = MIDL_user_allocate(7); + strcpy(list[1], "World!"); + + *names = list; + *n = 2; +} + +void __cdecl s_get_namesw(int *n, wstr_array_t *names) +{ + wstr_array_t list; + + list = MIDL_user_allocate(2 * sizeof(list[0])); + list[0] = MIDL_user_allocate(sizeof(helloW)); + lstrcpyW(list[0], helloW); + list[1] = MIDL_user_allocate(sizeof(worldW)); + lstrcpyW(list[1], worldW); + + *names = list; + *n = 2; } int __cdecl s_sum_pcarr2(int n, int **pa) @@ -1190,12 +1221,36 @@ if (!old_windows_version) { + int n; + str_array_t names; + wstr_array_t namesw; + name.size = 10; name.name = buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, name.size); get_name(&name); ok(name.name == buffer, "[in,out] pointer should have stayed as %p but instead changed to %p\n", name.name, buffer); ok(!strcmp(name.name, "Jeremy Wh"), "name didn't unmarshall properly, expected \"Jeremy Wh\", but got \"%s\"\n", name.name); HeapFree(GetProcessHeap(), 0, name.name); + + n = -1; + names = NULL; + get_names(&n, &names); + ok(n == 2, "expected 2, got %d\n", n); + ok(!strcmp(names[0], "Hello"), "expected Hello, got %s\n", names[0]); + ok(!strcmp(names[1], "World!"), "expected World!, got %s\n", names[1]); + MIDL_user_free(names[0]); + MIDL_user_free(names[1]); + MIDL_user_free(names); + + n = -1; + namesw = NULL; + get_namesw(&n, &namesw); + ok(n == 2, "expected 2, got %d\n", n); + ok(!lstrcmpW(namesw[0], helloW), "expected Hello, got %s\n", wine_dbgstr_w(namesw[0])); + ok(!lstrcmpW(namesw[1], worldW), "expected World!, got %s\n", wine_dbgstr_w(namesw[1])); + MIDL_user_free(namesw[0]); + MIDL_user_free(namesw[1]); + MIDL_user_free(namesw); } pa2 = a; @@ -1492,58 +1547,58 @@ if (strcmp(test, "tcp_basic") == 0) { - ok(RPC_S_OK == RpcStringBindingCompose(NULL, iptcp, address, port, NULL, &binding), "RpcStringBindingCompose\n"); - ok(RPC_S_OK == RpcBindingFromStringBinding(binding, &IServer_IfHandle), "RpcBindingFromStringBinding\n"); + ok(RPC_S_OK == RpcStringBindingComposeA(NULL, iptcp, address, port, NULL, &binding), "RpcStringBindingCompose\n"); + ok(RPC_S_OK == RpcBindingFromStringBindingA(binding, &IServer_IfHandle), "RpcBindingFromStringBinding\n"); run_tests(); authinfo_test(RPC_PROTSEQ_TCP, 0); - ok(RPC_S_OK == RpcStringFree(&binding), "RpcStringFree\n"); + ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); } else if (strcmp(test, "tcp_secure") == 0) { - ok(RPC_S_OK == RpcStringBindingCompose(NULL, iptcp, address, port, NULL, &binding), "RpcStringBindingCompose\n"); - ok(RPC_S_OK == RpcBindingFromStringBinding(binding, &IServer_IfHandle), "RpcBindingFromStringBinding\n"); + ok(RPC_S_OK == RpcStringBindingComposeA(NULL, iptcp, address, port, NULL, &binding), "RpcStringBindingCompose\n"); + ok(RPC_S_OK == RpcBindingFromStringBindingA(binding, &IServer_IfHandle), "RpcBindingFromStringBinding\n"); set_auth_info(IServer_IfHandle); authinfo_test(RPC_PROTSEQ_TCP, 1); - ok(RPC_S_OK == RpcStringFree(&binding), "RpcStringFree\n"); + ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); } else if (strcmp(test, "ncalrpc_basic") == 0) { - ok(RPC_S_OK == RpcStringBindingCompose(NULL, ncalrpc, NULL, guid, NULL, &binding), "RpcStringBindingCompose\n"); - ok(RPC_S_OK == RpcBindingFromStringBinding(binding, &IServer_IfHandle), "RpcBindingFromStringBinding\n"); + ok(RPC_S_OK == RpcStringBindingComposeA(NULL, ncalrpc, NULL, guid, NULL, &binding), "RpcStringBindingCompose\n"); + ok(RPC_S_OK == RpcBindingFromStringBindingA(binding, &IServer_IfHandle), "RpcBindingFromStringBinding\n"); run_tests(); /* can cause RPC_X_BAD_STUB_DATA exception */ authinfo_test(RPC_PROTSEQ_LRPC, 0); - ok(RPC_S_OK == RpcStringFree(&binding), "RpcStringFree\n"); + ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); } else if (strcmp(test, "ncalrpc_secure") == 0) { - ok(RPC_S_OK == RpcStringBindingCompose(NULL, ncalrpc, NULL, guid, NULL, &binding), "RpcStringBindingCompose\n"); - ok(RPC_S_OK == RpcBindingFromStringBinding(binding, &IServer_IfHandle), "RpcBindingFromStringBinding\n"); + ok(RPC_S_OK == RpcStringBindingComposeA(NULL, ncalrpc, NULL, guid, NULL, &binding), "RpcStringBindingCompose\n"); + ok(RPC_S_OK == RpcBindingFromStringBindingA(binding, &IServer_IfHandle), "RpcBindingFromStringBinding\n"); set_auth_info(IServer_IfHandle); authinfo_test(RPC_PROTSEQ_LRPC, 1); - ok(RPC_S_OK == RpcStringFree(&binding), "RpcStringFree\n"); + ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); } else if (strcmp(test, "np_basic") == 0) { - ok(RPC_S_OK == RpcStringBindingCompose(NULL, np, address_np, pipe, NULL, &binding), "RpcStringBindingCompose\n"); - ok(RPC_S_OK == RpcBindingFromStringBinding(binding, &IServer_IfHandle), "RpcBindingFromStringBinding\n"); + ok(RPC_S_OK == RpcStringBindingComposeA(NULL, np, address_np, pipe, NULL, &binding), "RpcStringBindingCompose\n"); + ok(RPC_S_OK == RpcBindingFromStringBindingA(binding, &IServer_IfHandle), "RpcBindingFromStringBinding\n"); run_tests(); authinfo_test(RPC_PROTSEQ_NMP, 0); stop(); - ok(RPC_S_OK == RpcStringFree(&binding), "RpcStringFree\n"); + ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); } } @@ -1560,13 +1615,13 @@ RPC_STATUS status, iptcp_status, np_status, ncalrpc_status; DWORD ret; - iptcp_status = RpcServerUseProtseqEp(iptcp, 20, port, NULL); + iptcp_status = RpcServerUseProtseqEpA(iptcp, 20, port, NULL); ok(iptcp_status == RPC_S_OK, "RpcServerUseProtseqEp(ncacn_ip_tcp) failed with status %d\n", iptcp_status); - ncalrpc_status = RpcServerUseProtseqEp(ncalrpc, 0, guid, NULL); + ncalrpc_status = RpcServerUseProtseqEpA(ncalrpc, 0, guid, NULL); ok(ncalrpc_status == RPC_S_OK, "RpcServerUseProtseqEp(ncalrpc) failed with status %d\n", ncalrpc_status); - np_status = RpcServerUseProtseqEp(np, 0, pipe, NULL); + np_status = RpcServerUseProtseqEpA(np, 0, pipe, NULL); if (np_status == RPC_S_PROTSEQ_NOT_SUPPORTED) skip("Protocol sequence ncacn_np is not supported\n"); else @@ -1584,7 +1639,7 @@ ok(status == RPC_S_OK, "RpcServerRegisterIf failed with status %d\n", status); status = RpcServerListen(1, 20, TRUE); ok(status == RPC_S_OK, "RpcServerListen failed with status %d\n", status); - stop_event = CreateEvent(NULL, FALSE, FALSE, NULL); + stop_event = CreateEventW(NULL, FALSE, FALSE, NULL); ok(stop_event != NULL, "CreateEvent failed with error %d\n", GetLastError()); if (iptcp_status == RPC_S_OK) Modified: trunk/rostests/winetests/rpcrt4/server.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.i… ============================================================================== --- trunk/rostests/winetests/rpcrt4/server.idl [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/server.idl [iso-8859-1] Sat Apr 26 16:58:32 2014 @@ -17,6 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma makedep client +#pragma makedep server #include "server_defines.h" @@ -325,6 +328,11 @@ } name_t; void get_name([in,out] name_t *name); + typedef char **str_array_t; + void get_names([out] int *n, [out, string, size_is(,*n)] str_array_t *names); + typedef WCHAR **wstr_array_t; + void get_namesw([out] int *n, [out, string, size_is(,*n)] wstr_array_t *names); + int sum_pcarr2(int n, [size_is(, n)] int **pa); int sum_L1_norms(int n, [size_is(n)] vector_t *vs);

1 0

[akhaldi] 62984: [RPCRT4] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: akhaldi Date: Sat Apr 26 16:58:18 2014 New Revision: 62984 URL: http://svn.reactos.org/svn/reactos?rev=62984&view=rev Log: [RPCRT4] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/rpcrt4/epm.idl trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/rpc_message.c trunk/reactos/dll/win32/rpcrt4/rpc_transport.c trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/rpcrt4/epm.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/epm.idl?r… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/epm.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/epm.idl [iso-8859-1] Sat Apr 26 16:58:18 2014 @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep client + #include "wine/epm.idl" Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] Sat Apr 26 16:58:18 2014 @@ -789,7 +789,7 @@ PFORMAT_STRING desc; NDR_MARSHALL m; ULONG pointer_id; - int pointer_needs_marshaling; + BOOL pointer_needs_marshaling; TRACE("(%p,%p,%p,%p)\n", pStubMsg, Buffer, Pointer, pFormat); TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr); @@ -804,14 +804,14 @@ ERR("NULL ref pointer is not allowed\n"); RpcRaiseException(RPC_X_NULL_REF_POINTER); } - pointer_needs_marshaling = 1; + pointer_needs_marshaling = TRUE; break; case RPC_FC_UP: /* unique pointer */ case RPC_FC_OP: /* object pointer - same as unique here */ if (Pointer) - pointer_needs_marshaling = 1; + pointer_needs_marshaling = TRUE; else - pointer_needs_marshaling = 0; + pointer_needs_marshaling = FALSE; pointer_id = Pointer ? NDR_POINTER_ID(pStubMsg) : 0; TRACE("writing 0x%08x to buffer\n", pointer_id); NDR_LOCAL_UINT32_WRITE(Buffer, pointer_id); @@ -857,7 +857,7 @@ PFORMAT_STRING desc; NDR_UNMARSHALL m; DWORD pointer_id = 0; - int pointer_needs_unmarshaling; + BOOL pointer_needs_unmarshaling; TRACE("(%p,%p,%p,%p,%p,%d)\n", pStubMsg, Buffer, pPointer, pSrcPointer, pFormat, fMustAlloc); TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr); @@ -867,16 +867,16 @@ switch (type) { case RPC_FC_RP: /* ref pointer (always non-null) */ - pointer_needs_unmarshaling = 1; + pointer_needs_unmarshaling = TRUE; break; case RPC_FC_UP: /* unique pointer */ pointer_id = NDR_LOCAL_UINT32_READ(Buffer); TRACE("pointer_id is 0x%08x\n", pointer_id); if (pointer_id) - pointer_needs_unmarshaling = 1; + pointer_needs_unmarshaling = TRUE; else { *pPointer = NULL; - pointer_needs_unmarshaling = 0; + pointer_needs_unmarshaling = FALSE; } break; case RPC_FC_OP: /* object pointer - we must free data before overwriting it */ @@ -888,11 +888,11 @@ fMustAlloc = TRUE; } if (pointer_id) - pointer_needs_unmarshaling = 1; + pointer_needs_unmarshaling = TRUE; else { *pPointer = NULL; - pointer_needs_unmarshaling = 0; + pointer_needs_unmarshaling = FALSE; } break; case RPC_FC_FP: @@ -972,7 +972,7 @@ unsigned type = pFormat[0], attr = pFormat[1]; PFORMAT_STRING desc; NDR_BUFFERSIZE m; - int pointer_needs_sizing; + BOOL pointer_needs_sizing; ULONG pointer_id; TRACE("(%p,%p,%p)\n", pStubMsg, Pointer, pFormat); @@ -1027,7 +1027,7 @@ PFORMAT_STRING desc; NDR_MEMORYSIZE m; DWORD pointer_id = 0; - int pointer_needs_sizing; + BOOL pointer_needs_sizing; TRACE("(%p,%p,%p)\n", pStubMsg, Buffer, pFormat); TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr); @@ -1037,16 +1037,16 @@ switch (type) { case RPC_FC_RP: /* ref pointer (always non-null) */ - pointer_needs_sizing = 1; + pointer_needs_sizing = TRUE; break; case RPC_FC_UP: /* unique pointer */ case RPC_FC_OP: /* object pointer - we must free data before overwriting it */ pointer_id = NDR_LOCAL_UINT32_READ(Buffer); TRACE("pointer_id is 0x%08x\n", pointer_id); if (pointer_id) - pointer_needs_sizing = 1; + pointer_needs_sizing = TRUE; else - pointer_needs_sizing = 0; + pointer_needs_sizing = FALSE; break; case RPC_FC_FP: { @@ -1193,7 +1193,7 @@ unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; unsigned char *saved_memory = pStubMsg->Memory; - pStubMsg->Memory = membase; + pStubMsg->Memory = pMemory; PointerMarshall(pStubMsg, bufptr, *(unsigned char**)memptr, info+4); pStubMsg->Memory = saved_memory; } @@ -1347,7 +1347,7 @@ unsigned char *memptr = membase + *(const SHORT*)&info[0]; unsigned char *saved_memory = pStubMsg->Memory; - pStubMsg->Memory = membase; + pStubMsg->Memory = pMemory; PointerBufferSize(pStubMsg, *(unsigned char**)memptr, info+4); pStubMsg->Memory = saved_memory; } @@ -2874,7 +2874,7 @@ case RPC_FC_POINTER: { unsigned char *saved_buffer; - int pointer_buffer_mark_set = 0; + BOOL pointer_buffer_mark_set = FALSE; TRACE("pointer=%p <= %p\n", *(unsigned char**)pMemory, pMemory); TRACE("pStubMsg->Buffer before %p\n", pStubMsg->Buffer); if (*pFormat != RPC_FC_POINTER) @@ -2886,7 +2886,7 @@ { pStubMsg->Buffer = pStubMsg->PointerBufferMark; pStubMsg->PointerBufferMark = NULL; - pointer_buffer_mark_set = 1; + pointer_buffer_mark_set = TRUE; } else if (*pPointer != RPC_FC_RP) safe_buffer_increment(pStubMsg, 4); /* for pointer ID */ @@ -3043,7 +3043,7 @@ case RPC_FC_POINTER: { unsigned char *saved_buffer; - int pointer_buffer_mark_set = 0; + BOOL pointer_buffer_mark_set = FALSE; TRACE("pointer => %p\n", pMemory); if (*pFormat != RPC_FC_POINTER) pPointer = pFormat; @@ -3054,7 +3054,7 @@ { pStubMsg->Buffer = pStubMsg->PointerBufferMark; pStubMsg->PointerBufferMark = NULL; - pointer_buffer_mark_set = 1; + pointer_buffer_mark_set = TRUE; } else if (*pPointer != RPC_FC_RP) safe_buffer_increment(pStubMsg, 4); /* for pointer ID */ @@ -3408,7 +3408,7 @@ case RPC_FC_POINTER: { unsigned char *saved_buffer; - int pointer_buffer_mark_set = 0; + BOOL pointer_buffer_mark_set = FALSE; if (*pFormat != RPC_FC_POINTER) pPointer = pFormat; if (*pPointer != RPC_FC_RP) @@ -3418,7 +3418,7 @@ { pStubMsg->Buffer = pStubMsg->PointerBufferMark; pStubMsg->PointerBufferMark = NULL; - pointer_buffer_mark_set = 1; + pointer_buffer_mark_set = TRUE; } else if (*pPointer != RPC_FC_RP) safe_buffer_increment(pStubMsg, 4); /* for pointer ID */ @@ -3564,7 +3564,7 @@ PFORMAT_STRING conf_array = NULL; PFORMAT_STRING pointer_desc = NULL; unsigned char *OldMemory = pStubMsg->Memory; - int pointer_buffer_mark_set = 0; + BOOL pointer_buffer_mark_set = FALSE; ULONG count = 0; ULONG max_count = 0; ULONG offset = 0; @@ -3587,7 +3587,7 @@ /* save it for use by embedded pointer code later */ pStubMsg->PointerBufferMark = (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength; TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->PointerBufferMark - pStubMsg->Buffer)); - pointer_buffer_mark_set = 1; + pointer_buffer_mark_set = TRUE; /* restore the original buffer length */ pStubMsg->BufferLength = saved_buffer_length; @@ -3650,7 +3650,7 @@ PFORMAT_STRING conf_array = NULL; PFORMAT_STRING pointer_desc = NULL; unsigned char *pMemory; - int pointer_buffer_mark_set = 0; + BOOL pointer_buffer_mark_set = FALSE; ULONG count = 0; ULONG max_count = 0; ULONG offset = 0; @@ -3673,7 +3673,7 @@ /* save it for use by embedded pointer code later */ pStubMsg->PointerBufferMark = pStubMsg->Buffer; TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->PointerBufferMark - saved_buffer)); - pointer_buffer_mark_set = 1; + pointer_buffer_mark_set = TRUE; /* restore the original buffer */ pStubMsg->Buffer = saved_buffer; @@ -4113,7 +4113,7 @@ unsigned char *pMemory, PFORMAT_STRING pFormat) { - int pointer_buffer_mark_set = 0; + BOOL pointer_buffer_mark_set = FALSE; TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); @@ -4144,7 +4144,7 @@ /* save it for use by embedded pointer code later */ pStubMsg->PointerBufferMark = (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength; TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer)); - pointer_buffer_mark_set = 1; + pointer_buffer_mark_set = TRUE; /* restore fields */ pStubMsg->ActualCount = saved_actual_count; @@ -4177,7 +4177,7 @@ unsigned char fMustAlloc) { unsigned char *saved_buffer; - int pointer_buffer_mark_set = 0; + BOOL pointer_buffer_mark_set = FALSE; int saved_ignore_embedded; TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -4204,7 +4204,7 @@ { /* save it for use by embedded pointer code later */ pStubMsg->PointerBufferMark = pStubMsg->Buffer; - pointer_buffer_mark_set = 1; + pointer_buffer_mark_set = TRUE; } /* restore the original buffer */ pStubMsg->Buffer = saved_buffer; @@ -5702,7 +5702,7 @@ if (m) { unsigned char *saved_buffer = NULL; - int pointer_buffer_mark_set = 0; + BOOL pointer_buffer_mark_set = FALSE; switch(*desc) { case RPC_FC_RP: @@ -5715,7 +5715,7 @@ { pStubMsg->Buffer = pStubMsg->PointerBufferMark; pStubMsg->PointerBufferMark = NULL; - pointer_buffer_mark_set = 1; + pointer_buffer_mark_set = TRUE; } else safe_buffer_increment(pStubMsg, 4); /* for pointer ID */ @@ -5770,7 +5770,7 @@ if (m) { unsigned char *saved_buffer = NULL; - int pointer_buffer_mark_set = 0; + BOOL pointer_buffer_mark_set = FALSE; switch(*desc) { case RPC_FC_RP: @@ -5783,7 +5783,7 @@ { pStubMsg->Buffer = pStubMsg->PointerBufferMark; pStubMsg->PointerBufferMark = NULL; - pointer_buffer_mark_set = 1; + pointer_buffer_mark_set = TRUE; } else pStubMsg->Buffer += 4; /* for pointer ID */ Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_message.c [iso-8859-1] Sat Apr 26 16:58:18 2014 @@ -60,20 +60,20 @@ return ret; } -static int packet_has_body(const RpcPktHdr *Header) +static BOOL packet_has_body(const RpcPktHdr *Header) { return (Header->common.ptype == PKT_FAULT) || (Header->common.ptype == PKT_REQUEST) || (Header->common.ptype == PKT_RESPONSE); } -static int packet_has_auth_verifier(const RpcPktHdr *Header) +static BOOL packet_has_auth_verifier(const RpcPktHdr *Header) { return !(Header->common.ptype == PKT_BIND_NACK) && !(Header->common.ptype == PKT_SHUTDOWN); } -static int packet_does_auth_negotiation(const RpcPktHdr *Header) +static BOOL packet_does_auth_negotiation(const RpcPktHdr *Header) { switch (Header->common.ptype) { Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] Sat Apr 26 16:58:18 2014 @@ -79,6 +79,8 @@ #define DEFAULT_NCACN_HTTP_TIMEOUT (60 * 1000) +#define ARRAYSIZE(a) (sizeof((a)) / sizeof((a)[0])) + WINE_DEFAULT_DEBUG_CHANNEL(rpc); static RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* OldConnection); @@ -136,6 +138,24 @@ } } +#ifndef __REACTOS__ +static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc) +{ + if (npc->listening) + return RPC_S_OK; + + npc->listening = TRUE; + npc->listen_thread = CreateThread(NULL, 0, listen_thread, npc, 0, NULL); + if (!npc->listen_thread) + { + npc->listening = FALSE; + ERR("Couldn't create listen thread (error was %d)\n", GetLastError()); + return RPC_S_OUT_OF_RESOURCES; + } + return RPC_S_OK; +} +#endif + static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) { RpcConnection_np *npc = (RpcConnection_np *) Connection; @@ -1909,6 +1929,19 @@ return RPC_S_OK; } +struct authinfo +{ + DWORD scheme; + CredHandle cred; + CtxtHandle ctx; + TimeStamp exp; + ULONG attr; + ULONG max_token; + char *data; + unsigned int data_len; + BOOL finished; /* finished authenticating */ +}; + typedef struct _RpcConnection_http { RpcConnection common; @@ -1916,6 +1949,7 @@ HINTERNET session; HINTERNET in_request; HINTERNET out_request; + WCHAR *servername; HANDLE timer_cancelled; HANDLE cancel_event; DWORD last_sent_time; @@ -2176,14 +2210,14 @@ HeapFree(GetProcessHeap(), 0, password); HeapFree(GetProcessHeap(), 0, user); HeapFree(GetProcessHeap(), 0, proxy); - HeapFree(GetProcessHeap(), 0, servername); if (!httpc->session) { ERR("InternetConnectW failed with error %d\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, servername); return RPC_S_SERVER_UNAVAILABLE; } - + httpc->servername = servername; return RPC_S_OK; } @@ -2194,6 +2228,8 @@ BOOL ret; RPC_STATUS status; + TRACE("sending echo request to server\n"); + prepare_async_request(async_data); ret = HttpSendRequestW(req, NULL, 0, NULL, 0); status = wait_async_request(async_data, ret, cancel_event); @@ -2210,9 +2246,8 @@ /* prepare the in pipe for use by RPC packets */ static RPC_STATUS rpcrt4_http_prepare_in_pipe(HINTERNET in_request, RpcHttpAsyncData *async_data, HANDLE cancel_event, - const UUID *connection_uuid, - const UUID *in_pipe_uuid, - const UUID *association_uuid) + const UUID *connection_uuid, const UUID *in_pipe_uuid, + const UUID *association_uuid, BOOL authorized) { BOOL ret; RPC_STATUS status; @@ -2220,10 +2255,12 @@ INTERNET_BUFFERSW buffers_in; DWORD bytes_written; - /* prepare in pipe */ - status = send_echo_request(in_request, async_data, cancel_event); - if (status != RPC_S_OK) return status; - + if (!authorized) + { + /* ask wininet to authorize, if necessary */ + status = send_echo_request(in_request, async_data, cancel_event); + if (status != RPC_S_OK) return status; + } memset(&buffers_in, 0, sizeof(buffers_in)); buffers_in.dwStructSize = sizeof(buffers_in); /* FIXME: get this from the registry */ @@ -2293,12 +2330,10 @@ } /* prepare the out pipe for use by RPC packets */ -static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, - RpcHttpAsyncData *async_data, - HANDLE cancel_event, - const UUID *connection_uuid, - const UUID *out_pipe_uuid, - ULONG *flow_control_increment) +static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, RpcHttpAsyncData *async_data, + HANDLE cancel_event, const UUID *connection_uuid, + const UUID *out_pipe_uuid, ULONG *flow_control_increment, + BOOL authorized) { BOOL ret; RPC_STATUS status; @@ -2306,13 +2341,22 @@ BYTE *data_from_server; RpcPktHdr pkt_from_server; ULONG field1, field3; - - status = send_echo_request(out_request, async_data, cancel_event); - if (status != RPC_S_OK) return status; + DWORD bytes_read; + BYTE buf[20]; + + if (!authorized) + { + /* ask wininet to authorize, if necessary */ + status = send_echo_request(out_request, async_data, cancel_event); + if (status != RPC_S_OK) return status; + } + else + InternetReadFile(out_request, buf, sizeof(buf), &bytes_read); hdr = RPCRT4_BuildHttpConnectHeader(TRUE, connection_uuid, out_pipe_uuid, NULL); if (!hdr) return RPC_S_OUT_OF_RESOURCES; + TRACE("sending HTTP connect header to server\n"); prepare_async_request(async_data); ret = HttpSendRequestW(out_request, NULL, 0, hdr, hdr->common.frag_len); status = wait_async_request(async_data, ret, cancel_event); @@ -2359,7 +2403,7 @@ static UINT encode_base64(const char *bin, unsigned int len, WCHAR *base64) { - static char enc[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + static const char enc[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; UINT i = 0, x; while (len > 0) @@ -2397,55 +2441,392 @@ return i; } -static RPC_STATUS insert_authorization_header(HINTERNET request, RpcQualityOfService *qos) -{ - static const WCHAR basicW[] = - {'A','u','t','h','o','r','i','z','a','t','i','o','n',':',' ','B','a','s','i','c',' '}; - RPC_HTTP_TRANSPORT_CREDENTIALS_W *creds; - SEC_WINNT_AUTH_IDENTITY_W *id; - int len, datalen, userlen, passlen; +static inline char decode_char( WCHAR c ) +{ + if (c >= 'A' && c <= 'Z') return c - 'A'; + if (c >= 'a' && c <= 'z') return c - 'a' + 26; + if (c >= '0' && c <= '9') return c - '0' + 52; + if (c == '+') return 62; + if (c == '/') return 63; + return 64; +} + +static unsigned int decode_base64( const WCHAR *base64, unsigned int len, char *buf ) +{ + unsigned int i = 0; + char c0, c1, c2, c3; + const WCHAR *p = base64; + + while (len > 4) + { + if ((c0 = decode_char( p[0] )) > 63) return 0; + if ((c1 = decode_char( p[1] )) > 63) return 0; + if ((c2 = decode_char( p[2] )) > 63) return 0; + if ((c3 = decode_char( p[3] )) > 63) return 0; + + if (buf) + { + buf[i + 0] = (c0 << 2) | (c1 >> 4); + buf[i + 1] = (c1 << 4) | (c2 >> 2); + buf[i + 2] = (c2 << 6) | c3; + } + len -= 4; + i += 3; + p += 4; + } + if (p[2] == '=') + { + if ((c0 = decode_char( p[0] )) > 63) return 0; + if ((c1 = decode_char( p[1] )) > 63) return 0; + + if (buf) buf[i] = (c0 << 2) | (c1 >> 4); + i++; + } + else if (p[3] == '=') + { + if ((c0 = decode_char( p[0] )) > 63) return 0; + if ((c1 = decode_char( p[1] )) > 63) return 0; + if ((c2 = decode_char( p[2] )) > 63) return 0; + + if (buf) + { + buf[i + 0] = (c0 << 2) | (c1 >> 4); + buf[i + 1] = (c1 << 4) | (c2 >> 2); + } + i += 2; + } + else + { + if ((c0 = decode_char( p[0] )) > 63) return 0; + if ((c1 = decode_char( p[1] )) > 63) return 0; + if ((c2 = decode_char( p[2] )) > 63) return 0; + if ((c3 = decode_char( p[3] )) > 63) return 0; + + if (buf) + { + buf[i + 0] = (c0 << 2) | (c1 >> 4); + buf[i + 1] = (c1 << 4) | (c2 >> 2); + buf[i + 2] = (c2 << 6) | c3; + } + i += 3; + } + return i; +} + +static struct authinfo *alloc_authinfo(void) +{ + struct authinfo *ret; + + if (!(ret = HeapAlloc(GetProcessHeap(), 0, sizeof(*ret) ))) return NULL; + + SecInvalidateHandle(&ret->cred); + SecInvalidateHandle(&ret->ctx); + memset(&ret->exp, 0, sizeof(ret->exp)); + ret->scheme = 0; + ret->attr = 0; + ret->max_token = 0; + ret->data = NULL; + ret->data_len = 0; + ret->finished = FALSE; + return ret; +} + +static void destroy_authinfo(struct authinfo *info) +{ + if (!info) return; + + if (SecIsValidHandle(&info->ctx)) + DeleteSecurityContext(&info->ctx); + if (SecIsValidHandle(&info->cred)) + FreeCredentialsHandle(&info->cred); + + HeapFree(GetProcessHeap(), 0, info->data); + HeapFree(GetProcessHeap(), 0, info); +} + +static const WCHAR basicW[] = {'B','a','s','i','c',0}; +static const WCHAR ntlmW[] = {'N','T','L','M',0}; +static const WCHAR passportW[] = {'P','a','s','s','p','o','r','t',0}; +static const WCHAR digestW[] = {'D','i','g','e','s','t',0}; +static const WCHAR negotiateW[] = {'N','e','g','o','t','i','a','t','e',0}; + +static const struct +{ + const WCHAR *str; + unsigned int len; + DWORD scheme; +} +auth_schemes[] = +{ + { basicW, ARRAYSIZE(basicW) - 1, RPC_C_HTTP_AUTHN_SCHEME_BASIC }, + { ntlmW, ARRAYSIZE(ntlmW) - 1, RPC_C_HTTP_AUTHN_SCHEME_NTLM }, + { passportW, ARRAYSIZE(passportW) - 1, RPC_C_HTTP_AUTHN_SCHEME_PASSPORT }, + { digestW, ARRAYSIZE(digestW) - 1, RPC_C_HTTP_AUTHN_SCHEME_DIGEST }, + { negotiateW, ARRAYSIZE(negotiateW) - 1, RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE } +}; +static const unsigned int num_auth_schemes = sizeof(auth_schemes)/sizeof(auth_schemes[0]); + +static DWORD auth_scheme_from_header( const WCHAR *header ) +{ + unsigned int i; + for (i = 0; i < num_auth_schemes; i++) + { + if (!strncmpiW( header, auth_schemes[i].str, auth_schemes[i].len ) && + (header[auth_schemes[i].len] == ' ' || !header[auth_schemes[i].len])) return auth_schemes[i].scheme; + } + return 0; +} + +static BOOL get_authvalue(HINTERNET request, DWORD scheme, WCHAR *buffer, DWORD buflen) +{ + DWORD len, index = 0; + for (;;) + { + len = buflen; + if (!HttpQueryInfoW(request, HTTP_QUERY_WWW_AUTHENTICATE, buffer, &len, &index)) return FALSE; + if (auth_scheme_from_header(buffer) == scheme) break; + } + return TRUE; +} + +static RPC_STATUS do_authorization(HINTERNET request, SEC_WCHAR *servername, + const RPC_HTTP_TRANSPORT_CREDENTIALS_W *creds, struct authinfo **auth_ptr) +{ + struct authinfo *info = *auth_ptr; + SEC_WINNT_AUTH_IDENTITY_W *id = creds->TransportCredentials; + RPC_STATUS status = RPC_S_SERVER_UNAVAILABLE; + + if ((!info && !(info = alloc_authinfo()))) return RPC_S_SERVER_UNAVAILABLE; + + switch (creds->AuthnSchemes[0]) + { + case RPC_C_HTTP_AUTHN_SCHEME_BASIC: + { + int userlen = WideCharToMultiByte(CP_UTF8, 0, id->User, id->UserLength, NULL, 0, NULL, NULL); + int passlen = WideCharToMultiByte(CP_UTF8, 0, id->Password, id->PasswordLength, NULL, 0, NULL, NULL); + + info->data_len = userlen + passlen + 1; + if (!(info->data = HeapAlloc(GetProcessHeap(), 0, info->data_len))) + { + status = RPC_S_OUT_OF_MEMORY; + break; + } + WideCharToMultiByte(CP_UTF8, 0, id->User, id->UserLength, info->data, userlen, NULL, NULL); + info->data[userlen] = ':'; + WideCharToMultiByte(CP_UTF8, 0, id->Password, id->PasswordLength, info->data + userlen + 1, passlen, NULL, NULL); + + info->scheme = RPC_C_HTTP_AUTHN_SCHEME_BASIC; + info->finished = TRUE; + status = RPC_S_OK; + break; + } + case RPC_C_HTTP_AUTHN_SCHEME_NTLM: + case RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE: + { + + static SEC_WCHAR ntlmW[] = {'N','T','L','M',0}, negotiateW[] = {'N','e','g','o','t','i','a','t','e',0}; + SECURITY_STATUS ret; + SecBufferDesc out_desc, in_desc; + SecBuffer out, in; + ULONG flags = ISC_REQ_CONNECTION|ISC_REQ_USE_DCE_STYLE|ISC_REQ_MUTUAL_AUTH|ISC_REQ_DELEGATE; + SEC_WCHAR *scheme; + int scheme_len; + const WCHAR *p; + WCHAR auth_value[2048]; + DWORD size = sizeof(auth_value); + BOOL first = FALSE; + + if (creds->AuthnSchemes[0] == RPC_C_HTTP_AUTHN_SCHEME_NTLM) scheme = ntlmW; + else scheme = negotiateW; + scheme_len = strlenW( scheme ); + + if (!*auth_ptr) + { + TimeStamp exp; + SecPkgInfoW *pkg_info; + + ret = AcquireCredentialsHandleW(NULL, scheme, SECPKG_CRED_OUTBOUND, NULL, id, NULL, NULL, &info->cred, &exp); + if (ret != SEC_E_OK) break; + + ret = QuerySecurityPackageInfoW(scheme, &pkg_info); + if (ret != SEC_E_OK) break; + + info->max_token = pkg_info->cbMaxToken; + FreeContextBuffer(pkg_info); + first = TRUE; + } + else + { + if (info->finished || !get_authvalue(request, creds->AuthnSchemes[0], auth_value, size)) break; + if (auth_scheme_from_header(auth_value) != info->scheme) + { + ERR("authentication scheme changed\n"); + break; + } + } + in.BufferType = SECBUFFER_TOKEN; + in.cbBuffer = 0; + in.pvBuffer = NULL; + + in_desc.ulVersion = 0; + in_desc.cBuffers = 1; + in_desc.pBuffers = &in; + + p = auth_value + scheme_len; + if (!first && *p == ' ') + { + int len = strlenW(++p); + in.cbBuffer = decode_base64(p, len, NULL); + if (!(in.pvBuffer = HeapAlloc(GetProcessHeap(), 0, in.cbBuffer))) break; + decode_base64(p, len, in.pvBuffer); + } + out.BufferType = SECBUFFER_TOKEN; + out.cbBuffer = info->max_token; + if (!(out.pvBuffer = HeapAlloc(GetProcessHeap(), 0, out.cbBuffer))) + { + HeapFree(GetProcessHeap(), 0, in.pvBuffer); + break; + } + out_desc.ulVersion = 0; + out_desc.cBuffers = 1; + out_desc.pBuffers = &out; + + ret = InitializeSecurityContextW(first ? &info->cred : NULL, first ? NULL : &info->ctx, + first ? servername : NULL, flags, 0, SECURITY_NETWORK_DREP, + in.pvBuffer ? &in_desc : NULL, 0, &info->ctx, &out_desc, + &info->attr, &info->exp); + HeapFree(GetProcessHeap(), 0, in.pvBuffer); + if (ret == SEC_E_OK) + { + HeapFree(GetProcessHeap(), 0, info->data); + info->data = out.pvBuffer; + info->data_len = out.cbBuffer; + info->finished = TRUE; + TRACE("sending last auth packet\n"); + status = RPC_S_OK; + } + else if (ret == SEC_I_CONTINUE_NEEDED) + { + HeapFree(GetProcessHeap(), 0, info->data); + info->data = out.pvBuffer; + info->data_len = out.cbBuffer; + TRACE("sending next auth packet\n"); + status = RPC_S_OK; + } + else + { + ERR("InitializeSecurityContextW failed with error 0x%08x\n", ret); + HeapFree(GetProcessHeap(), 0, out.pvBuffer); + break; + } + info->scheme = creds->AuthnSchemes[0]; + break; + } + default: + FIXME("scheme %u not supported\n", creds->AuthnSchemes[0]); + break; + } + + if (status != RPC_S_OK) + { + destroy_authinfo(info); + *auth_ptr = NULL; + return status; + } + *auth_ptr = info; + return RPC_S_OK; +} + +static RPC_STATUS insert_authorization_header(HINTERNET request, ULONG scheme, char *data, int data_len) +{ + static const WCHAR authW[] = {'A','u','t','h','o','r','i','z','a','t','i','o','n',':',' '}; + static const WCHAR basicW[] = {'B','a','s','i','c',' '}; + static const WCHAR negotiateW[] = {'N','e','g','o','t','i','a','t','e',' '}; + static const WCHAR ntlmW[] = {'N','T','L','M',' '}; + int scheme_len, auth_len = sizeof(authW) / sizeof(authW[0]), len = ((data_len + 2) * 4) / 3; + const WCHAR *scheme_str; WCHAR *header, *ptr; - char *data; RPC_STATUS status = RPC_S_SERVER_UNAVAILABLE; - if (!qos || qos->qos->AdditionalSecurityInfoType != RPC_C_AUTHN_INFO_TYPE_HTTP) - return RPC_S_OK; - - creds = qos->qos->u.HttpCredentials; - if (creds->AuthenticationTarget != RPC_C_HTTP_AUTHN_TARGET_SERVER || !creds->NumberOfAuthnSchemes) - return RPC_S_OK; - - if (creds->AuthnSchemes[0] != RPC_C_HTTP_AUTHN_SCHEME_BASIC) - { - FIXME("scheme %u not supported\n", creds->AuthnSchemes[0]); - return RPC_S_OK; - } - id = creds->TransportCredentials; - if (!id->User || !id->Password) return RPC_S_OK; - - userlen = WideCharToMultiByte(CP_UTF8, 0, id->User, id->UserLength, NULL, 0, NULL, NULL); - passlen = WideCharToMultiByte(CP_UTF8, 0, id->Password, id->PasswordLength, NULL, 0, NULL, NULL); - - datalen = userlen + passlen + 1; - if (!(data = HeapAlloc(GetProcessHeap(), 0, datalen))) return RPC_S_OUT_OF_MEMORY; - - WideCharToMultiByte(CP_UTF8, 0, id->User, id->UserLength, data, userlen, NULL, NULL); - data[userlen] = ':'; - WideCharToMultiByte(CP_UTF8, 0, id->Password, id->PasswordLength, data + userlen + 1, passlen, NULL, NULL); - - len = ((datalen + 2) * 4) / 3; - if ((header = HeapAlloc(GetProcessHeap(), 0, sizeof(basicW) + (len + 2) * sizeof(WCHAR)))) - { - memcpy(header, basicW, sizeof(basicW)); - ptr = header + sizeof(basicW) / sizeof(basicW[0]); - len = encode_base64(data, datalen, ptr); + switch (scheme) + { + case RPC_C_HTTP_AUTHN_SCHEME_BASIC: + scheme_str = basicW; + scheme_len = sizeof(basicW) / sizeof(basicW[0]); + break; + case RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE: + scheme_str = negotiateW; + scheme_len = sizeof(negotiateW) / sizeof(negotiateW[0]); + break; + case RPC_C_HTTP_AUTHN_SCHEME_NTLM: + scheme_str = ntlmW; + scheme_len = sizeof(ntlmW) / sizeof(ntlmW[0]); + break; + default: + ERR("unknown scheme %u\n", scheme); + return RPC_S_SERVER_UNAVAILABLE; + } + if ((header = HeapAlloc(GetProcessHeap(), 0, (auth_len + scheme_len + len + 2) * sizeof(WCHAR)))) + { + memcpy(header, authW, auth_len * sizeof(WCHAR)); + ptr = header + auth_len; + memcpy(ptr, scheme_str, scheme_len * sizeof(WCHAR)); + ptr += scheme_len; + len = encode_base64(data, data_len, ptr); ptr[len++] = '\r'; ptr[len++] = '\n'; ptr[len] = 0; - if ((HttpAddRequestHeadersW(request, header, -1, HTTP_ADDREQ_FLAG_ADD_IF_NEW))) status = RPC_S_OK; + if (HttpAddRequestHeadersW(request, header, -1, HTTP_ADDREQ_FLAG_ADD|HTTP_ADDREQ_FLAG_REPLACE)) + status = RPC_S_OK; HeapFree(GetProcessHeap(), 0, header); } - HeapFree(GetProcessHeap(), 0, data); + return status; +} + +static void drain_content(HINTERNET request) +{ + DWORD count, len = 0, size = sizeof(len); + char buf[2048]; + + HttpQueryInfoW(request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, &len, &size, NULL); + if (!len) return; + for (;;) + { + count = min(sizeof(buf), len); + if (!InternetReadFile(request, buf, count, &count) || !count) return; + len -= count; + } +} + +static RPC_STATUS authorize_request(RpcConnection_http *httpc, HINTERNET request) +{ + static const WCHAR authW[] = {'A','u','t','h','o','r','i','z','a','t','i','o','n',':','\r','\n',0}; + struct authinfo *info = NULL; + RPC_STATUS status; + BOOL ret; + + for (;;) + { + status = do_authorization(request, httpc->servername, httpc->common.QOS->qos->u.HttpCredentials, &info); + if (status != RPC_S_OK) break; + + status = insert_authorization_header(request, info->scheme, info->data, info->data_len); + if (status != RPC_S_OK) break; + + prepare_async_request(httpc->async_data); + ret = HttpSendRequestW(request, NULL, 0, NULL, 0); + status = wait_async_request(httpc->async_data, ret, httpc->cancel_event); + if (status != RPC_S_OK || info->finished) break; + + status = rpcrt4_http_check_response(request); + if (status != RPC_S_OK && status != ERROR_ACCESS_DENIED) break; + drain_content(request); + } + + if (info->scheme != RPC_C_HTTP_AUTHN_SCHEME_BASIC) + HttpAddRequestHeadersW(request, authW, -1, HTTP_ADDREQ_FLAG_REPLACE); + + destroy_authinfo(info); return status; } @@ -2471,6 +2852,31 @@ HeapFree(GetProcessHeap(), 0, header); } return status; +} + +static BOOL has_credentials(RpcConnection_http *httpc) +{ + RPC_HTTP_TRANSPORT_CREDENTIALS_W *creds; + SEC_WINNT_AUTH_IDENTITY_W *id; + + if (!httpc->common.QOS || httpc->common.QOS->qos->AdditionalSecurityInfoType != RPC_C_AUTHN_INFO_TYPE_HTTP) + return FALSE; + + creds = httpc->common.QOS->qos->u.HttpCredentials; + if (creds->AuthenticationTarget != RPC_C_HTTP_AUTHN_TARGET_SERVER || !creds->NumberOfAuthnSchemes) + return FALSE; + + id = creds->TransportCredentials; + if (!id || !id->User || !id->Password) return FALSE; + + return TRUE; +} + +static BOOL is_secure(RpcConnection_http *httpc) +{ + return httpc->common.QOS && + (httpc->common.QOS->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) && + (httpc->common.QOS->qos->u.HttpCredentials->Flags & RPC_C_HTTP_FLAG_USE_SSL); } static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) @@ -2485,7 +2891,7 @@ DWORD flags; WCHAR *url; RPC_STATUS status; - BOOL secure; + BOOL secure, credentials; HttpTimerThreadData *timer_data; HANDLE thread; @@ -2518,13 +2924,13 @@ strcatW(url, wszColon); MultiByteToWideChar(CP_ACP, 0, Connection->Endpoint, -1, url+strlenW(url), strlen(Connection->Endpoint)+1); - secure = httpc->common.QOS && - (httpc->common.QOS->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) && - (httpc->common.QOS->qos->u.HttpCredentials->Flags & RPC_C_HTTP_FLAG_USE_SSL); + secure = is_secure(httpc); + credentials = has_credentials(httpc); flags = INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_NO_AUTO_REDIRECT; if (secure) flags |= INTERNET_FLAG_SECURE; + if (credentials) flags |= INTERNET_FLAG_NO_AUTH; httpc->in_request = HttpOpenRequestW(httpc->session, wszVerbIn, url, NULL, NULL, wszAcceptTypes, flags, (DWORD_PTR)httpc->async_data); @@ -2534,13 +2940,28 @@ HeapFree(GetProcessHeap(), 0, url); return RPC_S_SERVER_UNAVAILABLE; } - status = insert_authorization_header(httpc->in_request, httpc->common.QOS); - if (status != RPC_S_OK) - return status; - status = insert_cookie_header(httpc->in_request, Connection->CookieAuth); if (status != RPC_S_OK) + { + HeapFree(GetProcessHeap(), 0, url); return status; + } + if (credentials) + { + status = authorize_request(httpc, httpc->in_request); + if (status != RPC_S_OK) + { + HeapFree(GetProcessHeap(), 0, url); + return status; + } + status = rpcrt4_http_check_response(httpc->in_request); + if (status != RPC_S_OK) + { + HeapFree(GetProcessHeap(), 0, url); + return status; + } + drain_content(httpc->in_request); + } httpc->out_request = HttpOpenRequestW(httpc->session, wszVerbOut, url, NULL, NULL, wszAcceptTypes, flags, (DWORD_PTR)httpc->async_data); @@ -2550,29 +2971,26 @@ ERR("HttpOpenRequestW failed with error %d\n", GetLastError()); return RPC_S_SERVER_UNAVAILABLE; } - status = insert_authorization_header(httpc->out_request, httpc->common.QOS); - if (status != RPC_S_OK) - return status; - status = insert_cookie_header(httpc->out_request, Connection->CookieAuth); if (status != RPC_S_OK) return status; - status = rpcrt4_http_prepare_in_pipe(httpc->in_request, - httpc->async_data, - httpc->cancel_event, - &httpc->connection_uuid, - &httpc->in_pipe_uuid, - &Connection->assoc->http_uuid); + if (credentials) + { + status = authorize_request(httpc, httpc->out_request); + if (status != RPC_S_OK) + return status; + } + + status = rpcrt4_http_prepare_in_pipe(httpc->in_request, httpc->async_data, httpc->cancel_event, + &httpc->connection_uuid, &httpc->in_pipe_uuid, + &Connection->assoc->http_uuid, credentials); if (status != RPC_S_OK) return status; - status = rpcrt4_http_prepare_out_pipe(httpc->out_request, - httpc->async_data, - httpc->cancel_event, - &httpc->connection_uuid, - &httpc->out_pipe_uuid, - &httpc->flow_control_increment); + status = rpcrt4_http_prepare_out_pipe(httpc->out_request, httpc->async_data, httpc->cancel_event, + &httpc->connection_uuid, &httpc->out_pipe_uuid, + &httpc->flow_control_increment, credentials); if (status != RPC_S_OK) return status; @@ -2835,6 +3253,8 @@ RpcHttpAsyncData_Release(httpc->async_data); if (httpc->cancel_event) CloseHandle(httpc->cancel_event); + HeapFree(GetProcessHeap(), 0, httpc->servername); + httpc->servername = NULL; return 0; } @@ -2992,8 +3412,6 @@ }, }; -#define ARRAYSIZE(a) (sizeof((a)) / sizeof((a)[0])) - const struct protseq_ops *rpcrt4_get_protseq_ops(const char *protseq) { unsigned int i; Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ma… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c [iso-8859-1] Sat Apr 26 16:58:18 2014 @@ -365,7 +365,8 @@ */ RPC_STATUS WINAPI UuidCreateSequential(UUID *Uuid) { - static int initialised, count; + static BOOL initialised; + static int count; ULONGLONG time; static ULONGLONG timelast; @@ -384,7 +385,7 @@ sequence &= 0x1fff; status = RPC_UuidGetNodeAddress(address); - initialised = 1; + initialised = TRUE; } /* Generate time element of the UUID. Account for going faster Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Apr 26 16:58:18 2014 @@ -166,7 +166,7 @@ reactos/dll/win32/resutils # Synced to Wine-1.7.1 reactos/dll/win32/riched20 # Synced to Wine-1.7.17 reactos/dll/win32/riched32 # Synced to Wine-1.7.1 -reactos/dll/win32/rpcrt4 # Synced to Wine-1.7.1 +reactos/dll/win32/rpcrt4 # Synced to Wine-1.7.17 reactos/dll/win32/rsabase # Synced to Wine-1.7.1 reactos/dll/win32/rsaenh # Synced to Wine-1.7.17 reactos/dll/win32/sccbase # Synced to Wine-1.7.1

1 0

[akhaldi] 62983: [RICHED20_WINETEST] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: akhaldi Date: Sat Apr 26 16:55:35 2014 New Revision: 62983 URL: http://svn.reactos.org/svn/reactos?rev=62983&view=rev Log: [RICHED20_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/riched20/editor.c trunk/rostests/winetests/riched20/richole.c trunk/rostests/winetests/riched20/txtsrv.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/editor… Modified: trunk/rostests/winetests/riched20/richole.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/richol… Modified: trunk/rostests/winetests/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/txtsrv…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs