ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winhttp: Add support for retrieving the URL codepage.

This commit is contained in:
Hans Leidekker 2015-08-26 08:45:07 +02:00 committed by Alexandre Julliard
parent 3a771b6066
commit 58bf3ca17f
2 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/winhttp/request.c
View File

@ -3999,8 +3999,25 @@ static HRESULT WINAPI winhttp_request_get_Option(
WinHttpRequestOption option,
VARIANT *value )
{
FIXME("\n");
return E_NOTIMPL;
struct winhttp_request *request = impl_from_IWinHttpRequest( iface );
HRESULT hr = S_OK;
TRACE("%p, %u, %p\n", request, option, value);
EnterCriticalSection( &request->cs );
switch (option)
{
case WinHttpRequestOption_URLCodePage:
V_VT( value ) = VT_I4;
V_I4( value ) = request->url_codepage;
break;
default:
FIXME("unimplemented option %u\n", option);
hr = E_NOTIMPL;
break;
}
LeaveCriticalSection( &request->cs );
return hr;
}
static HRESULT WINAPI winhttp_request_put_Option(

36
dlls/winhttp/tests/winhttp.c
View File

@ -3043,11 +3043,12 @@ static void test_IWinHttpRequest(void)
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};
static const WCHAR utf8W[] = {'u','t','f','-','8',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, body2, proxy_server, bypass_list, data;
VARIANT async, empty, timeout, body, body2, proxy_server, bypass_list, data, cp;
VARIANT_BOOL succeeded;
LONG status;
WCHAR todayW[WINHTTP_TIME_FORMAT_BUFSIZE];
@ -3131,6 +3132,39 @@ static void test_IWinHttpRequest(void)
hr = IWinHttpRequest_Open( req, method, url, async );
ok( hr == S_OK, "got %08x\n", hr );
V_VT( &cp ) = VT_ERROR;
V_ERROR( &cp ) = 0xdeadbeef;
hr = IWinHttpRequest_get_Option( req, WinHttpRequestOption_URLCodePage, &cp );
ok( hr == S_OK, "got %08x\n", hr );
ok( V_VT( &cp ) == VT_I4, "got %08x\n", V_VT( &cp ) );
ok( V_I4( &cp ) == CP_UTF8, "got %u\n", V_I4( &cp ) );
V_VT( &cp ) = VT_UI4;
V_UI4( &cp ) = CP_ACP;
hr = IWinHttpRequest_put_Option( req, WinHttpRequestOption_URLCodePage, cp );
ok( hr == S_OK, "got %08x\n", hr );
V_VT( &cp ) = VT_ERROR;
V_ERROR( &cp ) = 0xdeadbeef;
hr = IWinHttpRequest_get_Option( req, WinHttpRequestOption_URLCodePage, &cp );
ok( hr == S_OK, "got %08x\n", hr );
ok( V_VT( &cp ) == VT_I4, "got %08x\n", V_VT( &cp ) );
ok( V_I4( &cp ) == CP_ACP, "got %u\n", V_I4( &cp ) );
value = SysAllocString( utf8W );
V_VT( &cp ) = VT_BSTR;
V_BSTR( &cp ) = value;
hr = IWinHttpRequest_put_Option( req, WinHttpRequestOption_URLCodePage, cp );
ok( hr == S_OK, "got %08x\n", hr );
SysFreeString( value );
V_VT( &cp ) = VT_ERROR;
V_ERROR( &cp ) = 0xdeadbeef;
hr = IWinHttpRequest_get_Option( req, WinHttpRequestOption_URLCodePage, &cp );
ok( hr == S_OK, "got %08x\n", hr );
ok( V_VT( &cp ) == VT_I4, "got %08x\n", V_VT( &cp ) );
ok( V_I4( &cp ) == CP_UTF8, "got %u\n", V_I4( &cp ) );
hr = IWinHttpRequest_Abort( req );
ok( hr == S_OK, "got %08x\n", hr );