Ros-diffs July 2012

ros-diffs@reactos.org

14 participants
193 discussions

[tfaber] 56890: [WINHTTP_WINETEST] - Sync to Wine 1.5.4
by tfaber＠svn.reactos.org 14 Jul '12

14 Jul '12

Author: tfaber Date: Sat Jul 14 16:03:58 2012 New Revision: 56890 URL: http://svn.reactos.org/svn/reactos?rev=56890&view=rev Log: [WINHTTP_WINETEST] - Sync to Wine 1.5.4 Modified: trunk/rostests/winetests/winhttp/CMakeLists.txt trunk/rostests/winetests/winhttp/notification.c trunk/rostests/winetests/winhttp/testlist.c trunk/rostests/winetests/winhttp/url.c trunk/rostests/winetests/winhttp/winhttp.c Modified: trunk/rostests/winetests/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/CMakeLi… ============================================================================== --- trunk/rostests/winetests/winhttp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/winhttp/CMakeLists.txt [iso-8859-1] Sat Jul 14 16:03:58 2012 @@ -1,16 +1,14 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE notification.c - testlist.c url.c - winhttp.c) + winhttp.c + testlist.c) add_executable(winhttp_winetest ${SOURCE}) -target_link_libraries(winhttp_winetest wine) +target_link_libraries(winhttp_winetest wine uuid) set_module_type(winhttp_winetest win32cui) -add_importlibs(winhttp_winetest winhttp crypt32 ws2_32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(winhttp_winetest winhttp oleaut32 ole32 crypt32 advapi32 ws2_32 msvcrt kernel32 ntdll) add_cd_file(TARGET winhttp_winetest DESTINATION reactos/bin FOR all) 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 Jul 14 16:03:58 2012 @@ -135,6 +135,16 @@ { 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 } }; @@ -190,6 +200,32 @@ setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); + + setup_test( &info, winhttp_open_request, __LINE__ ); + req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSetOption( req, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); + ok(ret, "failed to set context value %u\n", GetLastError()); + + setup_test( &info, winhttp_send_request, __LINE__ ); + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok(ret, "failed to send request %u\n", GetLastError()); + + setup_test( &info, winhttp_receive_response, __LINE__ ); + ret = WinHttpReceiveResponse( req, NULL ); + ok(ret, "failed to receive response %u\n", GetLastError()); + + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok(ret, "failed unexpectedly %u\n", GetLastError()); + ok(status == 200, "request failed unexpectedly %u\n", status); + + setup_test( &info, winhttp_close_handle, __LINE__ ); + WinHttpCloseHandle( req ); + + setup_test( &info, winhttp_close_handle, __LINE__ ); + WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); @@ -208,6 +244,29 @@ setup_test( &info, winhttp_connect, __LINE__ ); con = WinHttpConnect( ses, codeweavers, 0, 0 ); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + setup_test( &info, winhttp_open_request, __LINE__ ); + req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSetOption( req, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); + ok(ret, "failed to set context value %u\n", GetLastError()); + + setup_test( &info, winhttp_send_request, __LINE__ ); + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok(ret, "failed to send request %u\n", GetLastError()); + + setup_test( &info, winhttp_receive_response, __LINE__ ); + ret = WinHttpReceiveResponse( req, NULL ); + ok(ret, "failed to receive response %u\n", GetLastError()); + + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok(ret, "failed unexpectedly %u\n", GetLastError()); + ok(status == 200, "request failed unexpectedly %u\n", status); + + setup_test( &info, winhttp_close_handle, __LINE__ ); + WinHttpCloseHandle( req ); setup_test( &info, winhttp_open_request, __LINE__ ); req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); Modified: trunk/rostests/winetests/winhttp/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/testlis… ============================================================================== --- trunk/rostests/winetests/winhttp/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/winhttp/testlist.c [iso-8859-1] Sat Jul 14 16:03:58 2012 @@ -6,14 +6,14 @@ #define STANDALONE #include "wine/test.h" -extern void func_winhttp(void); extern void func_notification(void); extern void func_url(void); +extern void func_winhttp(void); const struct test winetest_testlist[] = { - { "winhttp", func_winhttp }, - { "notification", func_notification }, - { "url", func_url }, - { 0, 0 } + { "notification", func_notification }, + { "url", func_url }, + { "winhttp", func_winhttp }, + { 0, 0 } }; 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 Jul 14 16:03:58 2012 @@ -67,8 +67,10 @@ '@','w','w','w','.','w','i','n','e','h','q','.','o','r','g',':','4','4','3','/','s','i','t','e','/','a','b','o','u','t','?','q','u','e','r','y',0}; static const WCHAR url12[] = {'h','t','t','p',':','/','/','e','x','a','m','p','l','e','.','n','e','t','/','p','a','t','h','?','v','a','r','1','=','e','x','a','m','p','l','e','@','e','x','a','m','p','l','e','.','c','o','m','&','v','a','r','2','=','x','&','v','a','r','3','=','y', 0}; - - +static const WCHAR url13[] = + {'h','t','t','p','s',':','/','/','t','o','o','l','s','.','g','o','o','g','l','e','.','c','o','m','/','s','e','r','v','i','c','e','/','u','p','d','a','t','e','2','?','w','=','3',':','B','x','D','H','o','W','y','8','e','z','M',0}; +static const WCHAR url14[] = + {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o',' ','g','/','p','a','t','h',' ','w','i','t','h',' ','s','p','a','c','e','s',0}; static const WCHAR url_k1[] = {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', @@ -318,6 +320,10 @@ static void WinHttpCrackUrl_test( void ) { + static const WCHAR hostnameW[] = + {'w','i','n','e','h','q','.','o',' ','g',0}; + static const WCHAR pathW[] = + {'/','p','a','t','h','%','2','0','w','i','t','h','%','2','0','s','p','a','c','e','s',0}; URL_COMPONENTSW uc; WCHAR scheme[20], user[20], pass[20], host[20], path[80], extra[40]; DWORD error; @@ -570,7 +576,6 @@ reset_url_components( &uc ); ret = WinHttpCrackUrl( url12, 0, 0, &uc); - ok( ret, "WinHttpCrackUrl failed\n" ); ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme\n" ); ok( uc.lpszScheme == url12,"unexpected scheme\n" ); @@ -584,6 +589,40 @@ ok( uc.dwUrlPathLength == 5, "unexpected path length\n" ); ok( uc.lpszExtraInfo == url12 + 23, "unexpected extra info\n" ); ok( uc.dwExtraInfoLength == 39, "unexpected extra info length\n" ); + + uc.lpszScheme = scheme; + uc.dwSchemeLength = 20; + uc.lpszHostName = host; + uc.dwHostNameLength = 20; + uc.lpszUserName = NULL; + uc.dwUserNameLength = 0; + uc.lpszPassword = NULL; + uc.dwPasswordLength = 0; + uc.lpszUrlPath = path; + uc.dwUrlPathLength = 40; + uc.lpszExtraInfo = NULL; + uc.dwExtraInfoLength = 0; + uc.nPort = 0; + ret = WinHttpCrackUrl( url13, 0, ICU_DECODE, &uc ); + ok( ret, "WinHttpCrackUrl failed\n" ); + + uc.lpszScheme = scheme; + uc.dwSchemeLength = 20; + uc.lpszHostName = host; + uc.dwHostNameLength = 20; + uc.lpszUserName = NULL; + uc.dwUserNameLength = 0; + uc.lpszPassword = NULL; + uc.dwPasswordLength = 0; + uc.lpszUrlPath = path; + uc.dwUrlPathLength = 40; + uc.lpszExtraInfo = NULL; + uc.dwExtraInfoLength = 0; + uc.nPort = 0; + ret = WinHttpCrackUrl( url14, 0, ICU_ESCAPE|ICU_DECODE, &uc ); + ok( ret, "WinHttpCrackUrl failed\n" ); + ok( !lstrcmpW( uc.lpszHostName, hostnameW ), "unexpected host name\n" ); + ok( !lstrcmpW( uc.lpszUrlPath, pathW ), "unexpected path\n" ); } START_TEST(url) 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 Jul 14 16:03:58 2012 @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include <stdarg.h> #include <stdlib.h> #include <windef.h> @@ -26,6 +27,8 @@ #include <wincrypt.h> #include <winreg.h> #include <winsock.h> +#include "initguid.h" +#include <httprequest.h> #include "wine/test.h" @@ -656,7 +659,8 @@ test_header_name, buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, reverse ? test_flag_coalesce_reverse : test_flag_coalesce, sizeof(reverse ? test_flag_coalesce_reverse : test_flag_coalesce)) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); + ok(memcmp(buffer, reverse ? test_flag_coalesce_reverse : test_flag_coalesce, + reverse ? sizeof(test_flag_coalesce_reverse) : sizeof(test_flag_coalesce)) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, @@ -680,7 +684,8 @@ test_header_name, buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, reverse ? test_flag_coalesce_comma_reverse : test_flag_coalesce_comma, sizeof(reverse ? test_flag_coalesce_comma_reverse : test_flag_coalesce_comma)) == 0, + ok(memcmp(buffer, reverse ? test_flag_coalesce_comma_reverse : test_flag_coalesce_comma, + reverse ? sizeof(test_flag_coalesce_comma_reverse) : sizeof(test_flag_coalesce_comma)) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); @@ -706,7 +711,8 @@ test_header_name, buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, reverse ? test_flag_coalesce_semicolon_reverse : test_flag_coalesce_semicolon, sizeof(reverse ? test_flag_coalesce_semicolon_reverse : test_flag_coalesce_semicolon)) == 0, + ok(memcmp(buffer, reverse ? test_flag_coalesce_semicolon_reverse : test_flag_coalesce_semicolon, + reverse ? sizeof(test_flag_coalesce_semicolon_reverse) : sizeof(test_flag_coalesce_semicolon)) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); @@ -1745,11 +1751,6 @@ static const char okmsg[] = "HTTP/1.1 200 OK\r\n" -"Server: winetest\r\n" -"\r\n"; - -static const char notokmsg[] = -"HTTP/1.1 400 Bad Request\r\n" "Server: winetest\r\n" "\r\n"; @@ -1952,6 +1953,7 @@ { static const WCHAR no_headersW[] = {'/','n','o','_','h','e','a','d','e','r','s',0}; HINTERNET ses, con, req; + DWORD error; BOOL ret; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); @@ -1966,12 +1968,52 @@ 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); WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); +} + +static void test_bad_header( int port ) +{ + static const WCHAR bad_headerW[] = + {'C','o','n','t','e','n','t','-','T','y','p','e',':',' ', + 't','e','x','t','/','h','t','m','l','\n','\r',0}; + static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; + static const WCHAR content_typeW[] = {'C','o','n','t','e','n','t','-','T','y','p','e',0}; + WCHAR buffer[32]; + HINTERNET ses, con, req; + DWORD index, len; + 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, NULL, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpAddRequestHeaders( req, bad_headerW, ~0u, WINHTTP_ADDREQ_FLAG_ADD ); + ok( ret, "failed to add header %u\n", GetLastError() ); + + index = 0; + buffer[0] = 0; + len = sizeof(buffer); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM|WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + content_typeW, buffer, &len, &index ); + ok( ret, "failed to query headers %u\n", GetLastError() ); + ok( !lstrcmpW( buffer, text_htmlW ), "got %s\n", wine_dbgstr_w(buffer) ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); } static void test_credentials(void) @@ -2093,6 +2135,574 @@ WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); +} + +static void test_IWinHttpRequest(void) +{ + 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 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}; + static const WCHAR proxy_serverW[] = {'p','r','o','x','y','s','e','r','v','e','r',0}; + static const WCHAR bypas_listW[] = {'b','y','p','a','s','s','l','i','s','t',0}; + static const WCHAR connectionW[] = {'C','o','n','n','e','c','t','i','o','n',0}; + static const WCHAR dateW[] = {'D','a','t','e',0}; + static const WCHAR test_dataW[] = {'t','e','s','t','d','a','t','a',128,0}; + HRESULT hr; + IWinHttpRequest *req; + BSTR method, url, username, password, response = NULL, status_text = NULL, headers = NULL; + BSTR date, today, connection, value = NULL; + VARIANT async, empty, timeout, body, proxy_server, bypass_list, data; + VARIANT_BOOL succeeded; + LONG status; + WCHAR todayW[WINHTTP_TIME_FORMAT_BUFSIZE]; + SYSTEMTIME st; + + GetSystemTime( &st ); + WinHttpTimeFromSystemTime( &st, todayW ); + + CoInitialize( NULL ); + hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); + ok( hr == S_OK, "got %08x\n", hr ); + + V_VT( &empty ) = VT_ERROR; + V_ERROR( &empty ) = 0xdeadbeef; + + V_VT( &async ) = VT_BOOL; + V_BOOL( &async ) = VARIANT_FALSE; + + method = SysAllocString( method3W ); + url = SysAllocString( url3W ); + hr = IWinHttpRequest_Open( req, method, url, async ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( method ); + SysFreeString( url ); + + V_VT( &data ) = VT_BSTR; + V_BSTR( &data ) = SysAllocString( test_dataW ); + hr = IWinHttpRequest_Send( req, data ); + ok( hr == S_OK || broken(hr == HRESULT_FROM_WIN32(ERROR_WINHTTP_INVALID_SERVER_RESPONSE)), + "got %08x\n", hr ); + SysFreeString( V_BSTR( &data ) ); + + hr = IWinHttpRequest_Open( req, NULL, NULL, empty ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + method = SysAllocString( method1W ); + hr = IWinHttpRequest_Open( req, method, NULL, empty ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_Open( req, method, NULL, async ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + url = SysAllocString( url1W ); + hr = IWinHttpRequest_Open( req, NULL, url, empty ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_Abort( req ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Open( req, method, url, empty ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Abort( req ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Release( req ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); + ok( hr == S_OK, "got %08x\n", hr ); + + SysFreeString( url ); + url = SysAllocString( url2W ); + hr = IWinHttpRequest_Open( req, method, url, async ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ), "got %08x\n", hr ); + + SysFreeString( method ); + method = SysAllocString( method2W ); + hr = IWinHttpRequest_Open( req, method, url, async ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ), "got %08x\n", hr ); + + SysFreeString( method ); + method = SysAllocString( method1W ); + SysFreeString( url ); + url = SysAllocString( url1W ); + hr = IWinHttpRequest_Open( req, method, url, async ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Abort( req ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Send( req, empty ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + + hr = IWinHttpRequest_Abort( req ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Release( req ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_get_ResponseText( req, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_get_ResponseText( req, &response ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + hr = IWinHttpRequest_get_Status( req, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_get_Status( req, &status ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + hr = IWinHttpRequest_get_StatusText( req, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_get_StatusText( req, &status_text ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + hr = IWinHttpRequest_get_ResponseBody( req, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetTimeouts( req, 10000, 10000, 10000, 10000 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetCredentials( req, NULL, NULL, 0xdeadbeef ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + + VariantInit( &proxy_server ); + V_VT( &proxy_server ) = VT_ERROR; + VariantInit( &bypass_list ); + V_VT( &bypass_list ) = VT_ERROR; + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_GetAllResponseHeaders( req, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_GetAllResponseHeaders( req, &headers ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + hr = IWinHttpRequest_GetResponseHeader( req, NULL, NULL ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + connection = SysAllocString( connectionW ); + hr = IWinHttpRequest_GetResponseHeader( req, connection, NULL ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + hr = IWinHttpRequest_GetResponseHeader( req, connection, &value ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + hr = IWinHttpRequest_SetRequestHeader( req, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + date = SysAllocString( dateW ); + hr = IWinHttpRequest_SetRequestHeader( req, date, NULL ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + + today = SysAllocString( todayW ); + hr = IWinHttpRequest_SetRequestHeader( req, date, today ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + + hr = IWinHttpRequest_SetAutoLogonPolicy( req, 0xdeadbeef ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); + ok( hr == S_OK, "got %08x\n", hr ); + + SysFreeString( method ); + method = SysAllocString( method1W ); + SysFreeString( url ); + url = SysAllocString( url1W ); + hr = IWinHttpRequest_Open( req, method, url, async ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_get_ResponseText( req, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_get_ResponseText( req, &response ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + hr = IWinHttpRequest_get_Status( req, &status ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + hr = IWinHttpRequest_get_StatusText( req, &status_text ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + hr = IWinHttpRequest_get_ResponseBody( req, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetTimeouts( req, 10000, 10000, 10000, 10000 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetCredentials( req, NULL, NULL, 0xdeadbeef ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + username = SysAllocString( usernameW ); + hr = IWinHttpRequest_SetCredentials( req, username, NULL, 0xdeadbeef ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + password = SysAllocString( passwordW ); + hr = IWinHttpRequest_SetCredentials( req, NULL, password, 0xdeadbeef ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetCredentials( req, username, password, 0xdeadbeef ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetCredentials( req, NULL, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetCredentials( req, username, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); + ok( hr == S_OK, "got %08x\n", hr ); + + V_VT( &proxy_server ) = VT_BSTR; + V_BSTR( &proxy_server ) = SysAllocString( proxy_serverW ); + V_VT( &bypass_list ) = VT_BSTR; + V_BSTR( &bypass_list ) = SysAllocString( bypas_listW ); + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetProxy( req, 0xdeadbeef, proxy_server, bypass_list ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_GetAllResponseHeaders( req, &headers ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + hr = IWinHttpRequest_GetResponseHeader( req, connection, &value ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + hr = IWinHttpRequest_SetRequestHeader( req, date, today ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetRequestHeader( req, date, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Send( req, empty ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Send( req, empty ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_get_ResponseText( req, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_get_ResponseText( req, &response ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( response ); + + hr = IWinHttpRequest_get_Status( req, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + status = 0; + hr = IWinHttpRequest_get_Status( req, &status ); + ok( hr == S_OK, "got %08x\n", hr ); + trace("%d\n", status); + + hr = IWinHttpRequest_get_StatusText( req, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_get_StatusText( req, &status_text ); + ok( hr == S_OK, "got %08x\n", hr ); + trace("%s\n", wine_dbgstr_w(status_text)); + SysFreeString( status_text ); + + hr = IWinHttpRequest_get_ResponseBody( req, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetCredentials( req, username, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_GetAllResponseHeaders( req, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_GetAllResponseHeaders( req, &headers ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( headers ); + + hr = IWinHttpRequest_GetResponseHeader( req, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_GetResponseHeader( req, connection, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_GetResponseHeader( req, connection, &value ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( value ); + + hr = IWinHttpRequest_SetRequestHeader( req, date, today ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND ), "got %08x\n", hr ); + + hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); + ok( hr == S_OK, "got %08x\n", hr ); + + VariantInit( &timeout ); + V_VT( &timeout ) = VT_I4; + V_I4( &timeout ) = 10; + hr = IWinHttpRequest_WaitForResponse( req, timeout, &succeeded ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_get_Status( req, &status ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_get_StatusText( req, &status_text ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( status_text ); + + hr = IWinHttpRequest_SetCredentials( req, username, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Send( req, empty ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_get_ResponseText( req, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_get_ResponseText( req, &response ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( response ); + + hr = IWinHttpRequest_get_ResponseBody( req, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + VariantInit( &body ); + V_VT( &body ) = VT_ERROR; + hr = IWinHttpRequest_get_ResponseBody( req, &body ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &body ) == (VT_ARRAY|VT_UI1), "got %08x\n", V_VT( &body ) ); + + hr = VariantClear( &body ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_GetAllResponseHeaders( req, &headers ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( headers ); + + hr = IWinHttpRequest_GetResponseHeader( req, connection, &value ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( value ); + + hr = IWinHttpRequest_SetRequestHeader( req, date, today ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND ), "got %08x\n", hr ); + + hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Send( req, empty ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Abort( req ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Abort( req ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Release( req ); + ok( hr == S_OK, "got %08x\n", hr ); + + SysFreeString( method ); + SysFreeString( url ); + SysFreeString( username ); + SysFreeString( password ); + SysFreeString( connection ); + SysFreeString( date ); + SysFreeString( today ); + VariantClear( &proxy_server ); + VariantClear( &bypass_list ); + CoUninitialize(); +} + +static void test_WinHttpDetectAutoProxyConfigUrl(void) +{ + BOOL ret; + WCHAR *url; + DWORD error; + +if (0) /* crashes on some win2k systems */ +{ + SetLastError(0xdeadbeef); + ret = WinHttpDetectAutoProxyConfigUrl( 0, NULL ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); +} + url = NULL; + SetLastError(0xdeadbeef); + ret = WinHttpDetectAutoProxyConfigUrl( 0, &url ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + +if (0) /* crashes on some win2k systems */ +{ + SetLastError(0xdeadbeef); + ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, NULL ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); +} + url = NULL; + SetLastError(0xdeadbeef); + ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, &url ); + error = GetLastError(); + if (!ret) + ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + else + { + trace("%s\n", wine_dbgstr_w(url)); + GlobalFree( url ); + } +} + +static void test_WinHttpGetIEProxyConfigForCurrentUser(void) +{ + BOOL ret; + DWORD error; + WINHTTP_CURRENT_USER_IE_PROXY_CONFIG cfg; + + memset( &cfg, 0, sizeof(cfg) ); + + SetLastError(0xdeadbeef); + ret = WinHttpGetIEProxyConfigForCurrentUser( NULL ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + ret = WinHttpGetIEProxyConfigForCurrentUser( &cfg ); + ok( ret, "expected success\n" ); + trace("%d\n", cfg.fAutoDetect); + trace("%s\n", wine_dbgstr_w(cfg.lpszAutoConfigUrl)); + trace("%s\n", wine_dbgstr_w(cfg.lpszProxy)); + trace("%s\n", wine_dbgstr_w(cfg.lpszProxyBypass)); + GlobalFree( cfg.lpszAutoConfigUrl ); + GlobalFree( cfg.lpszProxy ); + GlobalFree( cfg.lpszProxyBypass ); +} + +static void test_WinHttpGetProxyForUrl(void) +{ + static const WCHAR urlW[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR emptyW[] = {0}; + BOOL ret; + DWORD error; + HINTERNET session; + WINHTTP_AUTOPROXY_OPTIONS options; + WINHTTP_PROXY_INFO info; + + memset( &options, 0, sizeof(options) ); + + SetLastError(0xdeadbeef); + ret = WinHttpGetProxyForUrl( NULL, NULL, NULL, NULL ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_HANDLE, "got %u\n", error ); + + session = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ok( session != NULL, "failed to open session %u\n", GetLastError() ); + + SetLastError(0xdeadbeef); + ret = WinHttpGetProxyForUrl( session, NULL, NULL, NULL ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError(0xdeadbeef); + ret = WinHttpGetProxyForUrl( session, emptyW, NULL, NULL ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError(0xdeadbeef); + ret = WinHttpGetProxyForUrl( session, urlW, NULL, NULL ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError(0xdeadbeef); + ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT; + options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DNS_A; + + SetLastError(0xdeadbeef); + ret = WinHttpGetProxyForUrl( session, urlW, &options, NULL ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT; + options.dwAutoDetectFlags = 0; + + SetLastError(0xdeadbeef); + ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT | WINHTTP_AUTOPROXY_CONFIG_URL; + options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DNS_A; + + SetLastError(0xdeadbeef); + ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT; + options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DNS_A; + + memset( &info, 0, sizeof(info) ); + ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); + if (ret) + { + trace("%u\n", info.dwAccessType); + trace("%s\n", wine_dbgstr_w(info.lpszProxy)); + trace("%s\n", wine_dbgstr_w(info.lpszProxyBypass)); + GlobalFree( (WCHAR *)info.lpszProxy ); + GlobalFree( (WCHAR *)info.lpszProxyBypass ); + } + WinHttpCloseHandle( session ); } START_TEST (winhttp) @@ -2116,6 +2726,10 @@ test_Timeouts(); test_resolve_timeout(); test_credentials(); + test_IWinHttpRequest(); + test_WinHttpDetectAutoProxyConfigUrl(); + test_WinHttpGetIEProxyConfigForCurrentUser(); + test_WinHttpGetProxyForUrl(); si.event = CreateEvent(NULL, 0, 0, NULL); si.port = 7532; @@ -2131,6 +2745,7 @@ test_basic_request(si.port, NULL, basicW); test_no_headers(si.port); test_basic_authentication(si.port); + test_bad_header(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, NULL, quitW);

1 0

[akhaldi] 56889: [BOOTCD] * Convert the cab generation into a custom command + custom target.
by akhaldi＠svn.reactos.org 14 Jul '12

14 Jul '12

Author: akhaldi Date: Sat Jul 14 14:08:37 2012 New Revision: 56889 URL: http://svn.reactos.org/svn/reactos?rev=56889&view=rev Log: [BOOTCD] * Convert the cab generation into a custom command + custom target. Modified: trunk/reactos/boot/bootdata/packages/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/packages/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/CMa… ============================================================================== --- trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] Sat Jul 14 14:08:37 2012 @@ -33,9 +33,12 @@ COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -L ${CMAKE_CURRENT_BINARY_DIR} -I -P ${REACTOS_SOURCE_DIR} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff native-cabman) -# Then we create the actual cab file using a custom target -add_custom_target(reactos_cab +# Then we create the actual cab file +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -L ${CMAKE_CURRENT_BINARY_DIR} -N -P ${REACTOS_SOURCE_DIR} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf native-cabman) +# Finally, we create the reactos_cab target +add_custom_target(reactos_cab ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab) add_cd_file(TARGET reactos_cab FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB FOR bootcd regtest)

1 0

[fireball] 56888: [EXPLORER_NEW] - Fix possible buffer overflow: ExpandEnvironmentStrings wants character count size of a buffer, not byte sized. Spotted by Thomas Faber. See issue #6053 for more d...
by fireball＠svn.reactos.org 14 Jul '12

14 Jul '12

Author: fireball Date: Sat Jul 14 12:02:19 2012 New Revision: 56888 URL: http://svn.reactos.org/svn/reactos?rev=56888&view=rev Log: [EXPLORER_NEW] - Fix possible buffer overflow: ExpandEnvironmentStrings wants character count size of a buffer, not byte sized. Spotted by Thomas Faber. See issue #6053 for more details. Modified: trunk/reactos/base/shell/explorer/services/startup.c Modified: trunk/reactos/base/shell/explorer/services/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/servic… ============================================================================== --- trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] Sat Jul 14 12:02:19 2012 @@ -245,7 +245,7 @@ DWORD exit_code=0; WCHAR szCmdLineExp[MAX_PATH+1]= L"\0"; - ExpandEnvironmentStrings(cmdline, szCmdLineExp, sizeof(szCmdLineExp)); + ExpandEnvironmentStringsW(cmdline, szCmdLineExp, sizeof(szCmdLineExp) / sizeof(WCHAR)); memset(&si, 0, sizeof(si)); si.cb=sizeof(si);

1 0

[fireball] 56887: [EXPLORER_NEW] - Revert r56865, it duplicates same action (expanding the var), spotted by Thomas Faber. See issue #6053 for more details.
by fireball＠svn.reactos.org 14 Jul '12

14 Jul '12

Author: fireball Date: Sat Jul 14 11:54:07 2012 New Revision: 56887 URL: http://svn.reactos.org/svn/reactos?rev=56887&view=rev Log: [EXPLORER_NEW] - Revert r56865, it duplicates same action (expanding the var), spotted by Thomas Faber. See issue #6053 for more details. Modified: trunk/reactos/base/shell/explorer/services/startup.c Modified: trunk/reactos/base/shell/explorer/services/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/servic… ============================================================================== --- trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] Sat Jul 14 11:54:07 2012 @@ -364,7 +364,6 @@ { DWORD nValLength=nMaxValue, nDataLength=nMaxCmdLine; DWORD type; - WCHAR szCmdLineExp[MAX_PATH+1]= L"\0"; --i; @@ -391,8 +390,7 @@ continue; } - ExpandEnvironmentStrings(szCmdLine, szCmdLineExp, sizeof(szCmdLineExp)); - if ((res=runCmd(szCmdLineExp, NULL, bSynchronous, FALSE))==INVALID_RUNCMD_RETURN) + if ((res=runCmd(szCmdLine, NULL, bSynchronous, FALSE))==INVALID_RUNCMD_RETURN) { printf("Error running cmd #%ld (%ld)\n", i, GetLastError()); }

1 0

[fireball] 56886: [WS2_32_NEW] - Fix uninitialized variable usage warning, based on a patch by Edijs Kolesnikovics. See issue #6828 for more details.
by fireball＠svn.reactos.org 14 Jul '12

14 Jul '12

Author: fireball Date: Sat Jul 14 11:44:26 2012 New Revision: 56886 URL: http://svn.reactos.org/svn/reactos?rev=56886&view=rev Log: [WS2_32_NEW] - Fix uninitialized variable usage warning, based on a patch by Edijs Kolesnikovics. See issue #6828 for more details. Modified: trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c [iso-8859-1] Sat Jul 14 11:44:26 2012 @@ -28,13 +28,14 @@ PWSPROCESS Process; PWSTHREAD Thread; PWSSOCKET Socket; - INT ErrorCode, OldErrorCode; + INT ErrorCode, OldErrorCode = ERROR_SUCCESS; INT Status; BOOLEAN TryAgain = TRUE; DPRINT("connect: %lx, %p, %lx\n", s, name, namelen); /* Enter prolog */ - if ((ErrorCode = WsApiProlog(&Process, &Thread)) == ERROR_SUCCESS) + ErrorCode = WsApiProlog(&Process, &Thread); + if (ErrorCode == ERROR_SUCCESS) { /* Get the Socket Context */ if ((Socket = WsSockGetSocket(s)))

1 0

[tfaber] 56885: [WUAPI] - Add missing interface registration
by tfaber＠svn.reactos.org 14 Jul '12

14 Jul '12

Author: tfaber Date: Sat Jul 14 11:30:50 2012 New Revision: 56885 URL: http://svn.reactos.org/svn/reactos?rev=56885&view=rev Log: [WUAPI] - Add missing interface registration Added: trunk/reactos/dll/win32/wuapi/wuapi.rgs (with props) Modified: trunk/reactos/dll/win32/wuapi/wuapi.rc Modified: trunk/reactos/dll/win32/wuapi/wuapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/wuapi.rc?r… ============================================================================== --- trunk/reactos/dll/win32/wuapi/wuapi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/wuapi.rc [iso-8859-1] Sat Jul 14 11:30:50 2012 @@ -1,2 +1,5 @@ /* @makedep: wuapi_tlb.tlb */ 1 TYPELIB wuapi_tlb.tlb + +/* @makedep: wuapi.rgs */ +1 WINE_REGISTRY wuapi.rgs Added: trunk/reactos/dll/win32/wuapi/wuapi.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/wuapi.rgs?… ============================================================================== --- trunk/reactos/dll/win32/wuapi/wuapi.rgs (added) +++ trunk/reactos/dll/win32/wuapi/wuapi.rgs [iso-8859-1] Sat Jul 14 11:30:50 2012 @@ -1,0 +1,263 @@ +HKCR +{ + NoRemove Typelib + { + NoRemove '{B596CC9F-56E5-419E-A622-E01BB457431E}' + { + '2.0' = s 'WUAPI 2.0 Type Library' + { + '0' { win32 = s '%MODULE%' } + FLAGS = s '0' + } + } + } + NoRemove Interface + { + '{2EE48F22-AF3C-405F-8970-F71BE12EE9A2}' = s 'IAutomaticUpdatesSettings' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{673425BF-C082-4C7C-BDFD-569464B8E0CE}' = s 'IAutomaticUpdates' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{174C81FE-AECD-4DAE-B8A0-2C6318DD86A8}' = s 'IWebProxy' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{816858A4-260D-4260-933A-2585F1ABC76B}' = s 'IUpdateSession' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{7C907864-346C-4AEB-8F3F-57DA289F969F}' = s 'IImageInformation' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{81DDC1B8-9D35-47A6-B471-5B80F519223B}' = s 'ICategory' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{3A56BFB8-576C-43F7-9335-FE4838FD7E37}' = s 'ICategoryCollection' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{EFF90582-2DDC-480F-A06D-60F3FBC362C3}' = s 'IStringCollection' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{A376DD5E-09D4-427F-AF7C-FED5B6E1C1D6}' = s 'IUpdateException' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{503626A3-8E14-4729-9355-0FE664BD2321}' = s 'IUpdateExceptionCollection' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{46297823-9940-4C09-AED9-CD3EA6D05968}' = s 'IUpdateIdentity' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{D9A59339-E245-4DBD-9686-4D5763E39624}' = s 'IInstallationBehavior' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{54A2CB2D-9A0C-48B6-8A50-9ABB69EE2D02}' = s 'IUpdateDownloadContent' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{BC5513C8-B3B8-4BF7-A4D4-361C0D8C88BA}' = s 'IUpdateDownloadContentCollection' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{6A92B07A-D821-4682-B423-5C805022CC4D}' = s 'IUpdate' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{07F7438C-7709-4CA5-B518-91279288134E}' = s 'IUpdateCollection' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{7366EA16-7A1A-4EA2-B042-973D3E9CD99B}' = s 'ISearchJob' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{D40CFF62-E08C-4498-941A-01E25F0FD33C}' = s 'ISearchResult' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{BE56A644-AF0E-4E0E-A311-C1D8E695CBFF}' = s 'IUpdateHistoryEntry' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{A7F04F3C-A290-435B-AADF-A116C3357A5C}' = s 'IUpdateHistoryEntryCollection' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{8F45ABF1-F9AE-4B95-A933-F0F66E5056EA}' = s 'IUpdateSearcher' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{BF99AF76-B575-42AD-8AA4-33CBB5477AF1}' = s 'IUpdateDownloadResult' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{D31A5BAC-F719-4178-9DBB-5E2CB47FD18A}' = s 'IDownloadProgress' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{C574DE85-7358-43F6-AAE8-8697E62D8BA7}' = s 'IDownloadJob' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{DAA4FDD0-4727-4DBE-A1E7-745DCA317144}' = s 'IDownloadResult' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{68F1C6F9-7ECC-4666-A464-247FE12496C3}' = s 'IUpdateDownloader' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{D940F0F8-3CBB-4FD0-993F-471E7F2328AD}' = s 'IUpdateInstallationResult' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{345C8244-43A3-4E32-A368-65F073B76F36}' = s 'IInstallationProgress' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{5C209F0B-BAD5-432A-9556-4699BED2638A}' = s 'IInstallationJob' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{A43C56D6-7451-48D4-AF96-B6CD2D0D9B7A}' = s 'IInstallationResult' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{7B929C68-CCDC-4226-96B1-8724600B54C2}' = s 'IUpdateInstaller' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + '{ADE87BF7-7B56-4275-8FAB-B9B0E591844B}' = s 'ISystemInformation' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' { val Version = s '2.0' } + } + } + NoRemove CLSID + { + '{BFE18E9C-6D87-4450-B37C-E02F0B373803}' = s 'AutomaticUpdates Class' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + ProgId = s 'Microsoft.Update.AutoUpdate.1' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' + Version = s '2.0' + VersionIndependentProgId = s 'Microsoft.Update.AutoUpdate' + } + '{4CB43D7F-7EEE-4906-8698-60DA1C38F2FE}' = s 'UpdateSession Class' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + ProgId = s 'Microsoft.Update.Session.1' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' + Version = s '2.0' + VersionIndependentProgId = s 'Microsoft.Update.Session' + } + '{C01B9BA0-BEA7-41BA-B604-D0A36F469133}' = s 'SystemInformation Class' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + ProgId = s 'Microsoft.Update.SystemInfo.1' + TypeLib = s '{B596CC9F-56E5-419E-A622-E01BB457431E}' + Version = s '2.0' + VersionIndependentProgId = s 'Microsoft.Update.SystemInfo' + } + } + 'Microsoft.Update.AutoUpdate.1' = s 'AutomaticUpdates Class' + { + CLSID = s '{BFE18E9C-6D87-4450-B37C-E02F0B373803}' + } + 'Microsoft.Update.AutoUpdate' = s 'AutomaticUpdates Class' + { + CLSID = s '{BFE18E9C-6D87-4450-B37C-E02F0B373803}' + CurVer = s 'Microsoft.Update.AutoUpdate.1' + } + 'Microsoft.Update.Session.1' = s 'UpdateSession Class' + { + CLSID = s '{4CB43D7F-7EEE-4906-8698-60DA1C38F2FE}' + } + 'Microsoft.Update.Session' = s 'UpdateSession Class' + { + CLSID = s '{4CB43D7F-7EEE-4906-8698-60DA1C38F2FE}' + CurVer = s 'Microsoft.Update.Session.1' + } + 'Microsoft.Update.SystemInfo.1' = s 'SystemInformation Class' + { + CLSID = s '{C01B9BA0-BEA7-41BA-B604-D0A36F469133}' + } + 'Microsoft.Update.SystemInfo' = s 'SystemInformation Class' + { + CLSID = s '{C01B9BA0-BEA7-41BA-B604-D0A36F469133}' + CurVer = s 'Microsoft.Update.SystemInfo.1' + } +} Propchange: trunk/reactos/dll/win32/wuapi/wuapi.rgs ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 56884: [CMLIB] - Hermes Belusca: Fix wrong definition of CMHIVE structure (defined only 3 FileHandles when 4 is needed). See issue #7162 for more details.
by fireball＠svn.reactos.org 14 Jul '12

14 Jul '12

Author: fireball Date: Sat Jul 14 10:57:16 2012 New Revision: 56884 URL: http://svn.reactos.org/svn/reactos?rev=56884&view=rev Log: [CMLIB] - Hermes Belusca: Fix wrong definition of CMHIVE structure (defined only 3 FileHandles when 4 is needed). See issue #7162 for more details. Modified: trunk/reactos/lib/cmlib/cmlib.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=5688… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Sat Jul 14 10:57:16 2012 @@ -151,7 +151,7 @@ typedef struct _CMHIVE { HHIVE Hive; - HANDLE FileHandles[3]; + HANDLE FileHandles[HFILE_TYPE_MAX]; LIST_ENTRY NotifyList; LIST_ENTRY HiveList; EX_PUSH_LOCK HiveLock;

1 0

[akhaldi] 56883: [WIN32SS] * Remove some unused-but-set variables.
by akhaldi＠svn.reactos.org 14 Jul '12

14 Jul '12

Author: akhaldi Date: Sat Jul 14 09:31:24 2012 New Revision: 56883 URL: http://svn.reactos.org/svn/reactos?rev=56883&view=rev Log: [WIN32SS] * Remove some unused-but-set variables. Modified: trunk/reactos/win32ss/user/ntuser/object.c Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] Sat Jul 14 09:31:24 2012 @@ -501,38 +501,32 @@ { case otWindow: { - PWND Window; - if ((Window = UserGetWindowObject((HWND) handle))) return TRUE; + if (UserGetWindowObject((HWND) handle)) return TRUE; return FALSE; } case otMenu: { - PMENU_OBJECT Menu; - if ((Menu = UserGetMenuObject((HMENU) handle))) return TRUE; + if (UserGetMenuObject((HMENU) handle)) return TRUE; return FALSE; } case otAccel: { - PACCELERATOR_TABLE Accel; - if ((Accel = UserGetAccelObject((HACCEL) handle))) return TRUE; + if (UserGetAccelObject((HACCEL) handle)) return TRUE; return FALSE; } case otCursorIcon: { - PCURICON_OBJECT Cursor; - if ((Cursor = UserGetCurIconObject((HCURSOR) handle))) return TRUE; + if (UserGetCurIconObject((HCURSOR) handle)) return TRUE; return FALSE; } case otHook: { - PHOOK Hook; - if ((Hook = IntGetHookObject((HHOOK) handle))) return TRUE; + if (IntGetHookObject((HHOOK) handle)) return TRUE; return FALSE; } case otMonitor: { - PMONITOR Monitor; - if ((Monitor = UserGetMonitorObject((HMONITOR) handle))) return TRUE; + if (UserGetMonitorObject((HMONITOR) handle)) return TRUE; return FALSE; } case otCallProc:

1 0

[akhaldi] 56882: [UNIATA] * Improve the way DDKAPI, DDKCDECLAPI and DDKFASTAPI are defined. With that we don't need ReactOS specific defines anymore. * Already sent upstream.
by akhaldi＠svn.reactos.org 14 Jul '12

14 Jul '12

Author: akhaldi Date: Sat Jul 14 09:21:40 2012 New Revision: 56882 URL: http://svn.reactos.org/svn/reactos?rev=56882&view=rev Log: [UNIATA] * Improve the way DDKAPI, DDKCDECLAPI and DDKFASTAPI are defined. With that we don't need ReactOS specific defines anymore. * Already sent upstream. Modified: trunk/reactos/drivers/storage/ide/uniata/config.h Modified: trunk/reactos/drivers/storage/ide/uniata/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/config.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/config.h [iso-8859-1] Sat Jul 14 09:21:40 2012 @@ -110,16 +110,17 @@ #define DEF_U64(x) (x##ULL) #define DEF_I64(x) (x##LL) - /* ReactOS-specific defines */ - #ifdef USE_REACTOS_DDK - #define DDKFASTAPI __attribute__((fastcall)) - #else //USE_REACTOS_DDK + #ifndef DDKAPI + #define DDKAPI __attribute__((stdcall)) + #endif - #define DDKAPI __attribute__((stdcall)) - #define DDKFASTAPI __attribute__((fastcall)) - #define DDKCDECLAPI __attribute__((cdecl)) + #ifndef DDKCDECLAPI + #define DDKCDECLAPI __attribute__((cdecl)) + #endif - #endif //DDKAPI + #ifndef DDKFASTAPI + #define DDKFASTAPI __attribute__((fastcall)) + #endif #define DECLSPEC_NAKED __attribute__((naked)) @@ -128,11 +129,17 @@ #define DEF_U64(x) (x##UI64) #define DEF_I64(x) (x##I64) - /* ReactOS-specific defines */ + #ifndef DDKAPI + #define DDKAPI __stdcall + #endif - #define DDKAPI __stdcall - #define DDKFASTAPI __fastcall - #define DDKCDECLAPI _cdecl + #ifndef DDKCDECLAPI + #define DDKCDECLAPI _cdecl + #endif + + #ifndef DDKFASTAPI + #define DDKFASTAPI __fastcall + #endif #define DECLSPEC_NAKED __declspec(naked)

1 0

[jgardou] 56881: [GCC-INTRINSICS] * Use GCC intrinsics for InterlockedIncrement/Decrement functions
by jgardou＠svn.reactos.org 13 Jul '12

13 Jul '12

Author: jgardou Date: Fri Jul 13 14:51:46 2012 New Revision: 56881 URL: http://svn.reactos.org/svn/reactos?rev=56881&view=rev Log: [GCC-INTRINSICS] * Use GCC intrinsics for InterlockedIncrement/Decrement functions Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Fri Jul 13 14:51:46 2012 @@ -248,6 +248,38 @@ } #endif +__INTRIN_INLINE long _InterlockedDecrement(volatile long * const lpAddend) +{ + return __sync_sub_and_fetch(lpAddend, 1); +} + +__INTRIN_INLINE long _InterlockedIncrement(volatile long * const lpAddend) +{ + return __sync_add_and_fetch(lpAddend, 1); +} + +__INTRIN_INLINE short _InterlockedDecrement16(volatile short * const lpAddend) +{ + return __sync_sub_and_fetch(lpAddend, 1); +} + +__INTRIN_INLINE short _InterlockedIncrement16(volatile short * const lpAddend) +{ + return __sync_add_and_fetch(lpAddend, 1); +} + +#if defined(_M_AMD64) +__INTRIN_INLINE long long _InterlockedDecrement64(volatile long long * const lpAddend) +{ + return __sync_sub_and_fetch(lpAddend, 1); +} + +__INTRIN_INLINE long long _InterlockedIncrement64(volatile long long * const lpAddend) +{ + return __sync_add_and_fetch(lpAddend, 1); +} +#endif + #else __INTRIN_INLINE char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand) @@ -458,6 +490,38 @@ return y; } + +__INTRIN_INLINE long _InterlockedDecrement(volatile long * const lpAddend) +{ + return _InterlockedExchangeAdd(lpAddend, -1) - 1; +} + +__INTRIN_INLINE long _InterlockedIncrement(volatile long * const lpAddend) +{ + return _InterlockedExchangeAdd(lpAddend, 1) + 1; +} + +__INTRIN_INLINE short _InterlockedDecrement16(volatile short * const lpAddend) +{ + return _InterlockedExchangeAdd16(lpAddend, -1) - 1; +} + +__INTRIN_INLINE short _InterlockedIncrement16(volatile short * const lpAddend) +{ + return _InterlockedExchangeAdd16(lpAddend, 1) + 1; +} + +#if defined(_M_AMD64) +__INTRIN_INLINE long long _InterlockedDecrement64(volatile long long * const lpAddend) +{ + return _InterlockedExchangeAdd64(lpAddend, -1) - 1; +} + +__INTRIN_INLINE long long _InterlockedIncrement64(volatile long long * const lpAddend) +{ + return _InterlockedExchangeAdd64(lpAddend, 1) + 1; +} +#endif #endif @@ -504,38 +568,6 @@ return Value; } - -__INTRIN_INLINE long _InterlockedDecrement(volatile long * const lpAddend) -{ - return _InterlockedExchangeAdd(lpAddend, -1) - 1; -} - -__INTRIN_INLINE long _InterlockedIncrement(volatile long * const lpAddend) -{ - return _InterlockedExchangeAdd(lpAddend, 1) + 1; -} - -__INTRIN_INLINE short _InterlockedDecrement16(volatile short * const lpAddend) -{ - return _InterlockedExchangeAdd16(lpAddend, -1) - 1; -} - -__INTRIN_INLINE short _InterlockedIncrement16(volatile short * const lpAddend) -{ - return _InterlockedExchangeAdd16(lpAddend, 1) + 1; -} - -#if defined(_M_AMD64) -__INTRIN_INLINE long long _InterlockedDecrement64(volatile long long * const lpAddend) -{ - return _InterlockedExchangeAdd64(lpAddend, -1) - 1; -} - -__INTRIN_INLINE long long _InterlockedIncrement64(volatile long long * const lpAddend) -{ - return _InterlockedExchangeAdd64(lpAddend, 1) + 1; -} -#endif __INTRIN_INLINE unsigned char _interlockedbittestandreset(volatile long * a, const long b) {

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2012