July 2008 - Wine-commits - list.winehq.org

Hans Leidekker : wininet: Delete local file on error in FtpGetFile.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: b311cca552994e7b6c5f92d535b31704af9f9425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b311cca552994e7b6c5f92d53… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Sat Jul 19 19:53:19 2008 +0200 wininet: Delete local file on error in FtpGetFile. --- dlls/wininet/ftp.c | 1 + dlls/wininet/tests/ftp.c | 2 -- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index f35929d..cb24782 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1552,6 +1552,7 @@ static BOOL FTP_FtpGetFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, &iar, sizeof(INTERNET_ASYNC_RESULT)); } + if (!bSuccess) DeleteFileW(lpszNewFile); return bSuccess; } diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 992bce9..34aa68f 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -259,7 +259,6 @@ static void test_getfile(HINTERNET hFtp, HINTERNET hConnect) ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR, "Expected ERROR_INTERNET_EXTENDED_ERROR, got %d\n", GetLastError()); /* Currently Wine always creates the local file (even on failure) which is not correct, hence the test */ - todo_wine ok (GetFileAttributesA("should_also_be_non_existing_deadbeef") == INVALID_FILE_ATTRIBUTES, "Local file should not have been created\n"); @@ -280,7 +279,6 @@ static void test_getfile(HINTERNET hFtp, HINTERNET hConnect) ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR, "Expected ERROR_INTERNET_EXTENDED_ERROR, got %d\n", GetLastError()); /* Currently Wine always creates the local file (even on failure) which is not correct, hence the test */ - todo_wine ok (GetFileAttributesA("should_also_be_non_existing_deadbeef") == INVALID_FILE_ATTRIBUTES, "Local file should not have been created\n");

1 0

Hans Leidekker : wininet: Fix a memory leak.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: e3e2622e419b625741b4b638d680d89023885ca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3e2622e419b625741b4b638d… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Sat Jul 19 19:52:47 2008 +0200 wininet: Fix a memory leak. --- dlls/wininet/http.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b31996d..4f73602 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3833,7 +3833,10 @@ lend: if (bSuccess) return rc; else + { + HeapFree(GetProcessHeap(), 0, lpszRawHeaders); return 0; + } }

1 0

Hans Leidekker : setupapi: Fix two memory leaks in the test.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: da5e4f16d887ddab1f7c82f36d725969760dc286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5e4f16d887ddab1f7c82f36… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Sat Jul 19 19:54:23 2008 +0200 setupapi: Fix two memory leaks in the test. --- dlls/setupapi/tests/misc.c | 1 + dlls/setupapi/tests/query.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index f8750b6..a18fd37 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -400,6 +400,7 @@ static void test_SetupGetFileCompressionInfo(void) ok(target_size == sizeof(uncompressed), "got %d\n", target_size); ok(type == FILE_COMPRESSION_NONE, "got %d, expected FILE_COMPRESSION_NONE\n", type); + MyFree(name); DeleteFileA(source); } diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 1546ff9..9c35767 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -266,6 +266,8 @@ static void test_SetupGetInfInformation(void) ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); ok(check_info_filename(info, inf_two), "Expected returned filename to be equal\n"); + HeapFree(GetProcessHeap(), 0, info); + DeleteFileA(inf_filename); DeleteFileA(inf_one); DeleteFileA(inf_two);

1 0

Hans Leidekker : cabinet: Fix a memory leak.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 42506c94f29bb146790d89735f4d53b4722baf80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42506c94f29bb146790d89735… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Sat Jul 19 19:54:10 2008 +0200 cabinet: Fix a memory leak. --- dlls/cabinet/cabinet_main.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 7ebe63c..35810e3 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -338,7 +338,10 @@ HRESULT WINAPI Extract(SESSION *dest, LPCSTR szCabName) return E_FAIL; if (GetFileAttributesA(dest->Destination) == INVALID_FILE_ATTRIBUTES) - return S_OK; + { + res = S_OK; + goto end; + } /* split the cabinet name into path + name */ str = HeapAlloc(GetProcessHeap(), 0, lstrlenA(szCabName)+1);

1 0

Hans Leidekker : snmpapi: Fix a memory leak in the test.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: b72d6360621c6c09fa2d01feba809b6caf473d79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b72d6360621c6c09fa2d01feb… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Sat Jul 19 19:53:54 2008 +0200 snmpapi: Fix a memory leak in the test. --- dlls/snmpapi/tests/util.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/snmpapi/tests/util.c b/dlls/snmpapi/tests/util.c index 1aa245f..780556c 100644 --- a/dlls/snmpapi/tests/util.c +++ b/dlls/snmpapi/tests/util.c @@ -220,6 +220,7 @@ static void test_SnmpUtilOidCpyFree(void) ok(ret, "SnmpUtilOidCpy failed\n"); ok(src.idLength == dst.idLength, "SnmpUtilOidCpy failed\n"); ok(!memcmp(src.ids, dst.ids, dst.idLength * sizeof(UINT)), "SnmpUtilOidCpy failed\n"); + SnmpUtilOidFree(&dst); /* These crashes under win98 */ if(0)

1 0

Hans Leidekker : dnsapi: Fix a number of memory leaks.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 73d0e7fda37747eb7ab6593d5648c94c275b1f93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d0e7fda37747eb7ab6593d5… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Sat Jul 19 19:53:35 2008 +0200 dnsapi: Fix a number of memory leaks. --- dlls/dnsapi/record.c | 7 +++++-- dlls/dnsapi/tests/record.c | 8 ++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 9584031..9755a3d 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -680,7 +680,7 @@ BOOL WINAPI DnsRecordSetCompare( PDNS_RECORD set1, PDNS_RECORD set2, DNS_RRSET_ADD( rr1, u ); ret = FALSE; } - else heap_free( u ); + else DnsRecordListFree( u, DnsFreeRecordList ); } } @@ -696,7 +696,7 @@ BOOL WINAPI DnsRecordSetCompare( PDNS_RECORD set1, PDNS_RECORD set2, DNS_RRSET_ADD( rr2, u ); ret = FALSE; } - else heap_free( u ); + else DnsRecordListFree( u, DnsFreeRecordList ); } } @@ -704,7 +704,10 @@ BOOL WINAPI DnsRecordSetCompare( PDNS_RECORD set1, PDNS_RECORD set2, DNS_RRSET_TERMINATE( rr2 ); if (diff1) *diff1 = rr1.pFirstRR; + else DnsRecordListFree( rr1.pFirstRR, DnsFreeRecordList ); + if (diff2) *diff2 = rr2.pFirstRR; + else DnsRecordListFree( rr2.pFirstRR, DnsFreeRecordList ); return ret; diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c index 5d68bd4..8ce0f3d 100644 --- a/dlls/dnsapi/tests/record.c +++ b/dlls/dnsapi/tests/record.c @@ -89,9 +89,11 @@ static void test_DnsRecordSetCompare( void ) ok( DnsRecordSetCompare( rr1.pFirstRR, NULL, &diff1, &diff2 ) == FALSE, "succeeded unexpectedly\n" ); ok( diff1 != NULL && diff2 == NULL, "unexpected result: %p, %p\n", diff1, diff2 ); + DnsRecordListFree( diff1, DnsFreeRecordList ); ok( DnsRecordSetCompare( NULL, rr2.pFirstRR, &diff1, &diff2 ) == FALSE, "succeeded unexpectedly\n" ); ok( diff1 == NULL && diff2 != NULL, "unexpected result: %p, %p\n", diff1, diff2 ); + DnsRecordListFree( diff2, DnsFreeRecordList ); ok( DnsRecordSetCompare( rr1.pFirstRR, rr2.pFirstRR, NULL, &diff2 ) == TRUE, "failed unexpectedly\n" ); ok( diff2 == NULL, "unexpected result: %p\n", diff2 ); @@ -105,8 +107,14 @@ static void test_DnsRecordSetCompare( void ) r2.Data.A.IpAddress = 0; ok( DnsRecordSetCompare( rr1.pFirstRR, rr2.pFirstRR, NULL, &diff2 ) == FALSE, "succeeded unexpectedly\n" ); + DnsRecordListFree( diff2, DnsFreeRecordList ); + ok( DnsRecordSetCompare( rr1.pFirstRR, rr2.pFirstRR, &diff1, NULL ) == FALSE, "succeeded unexpectedly\n" ); + DnsRecordListFree( diff1, DnsFreeRecordList ); + ok( DnsRecordSetCompare( rr1.pFirstRR, rr2.pFirstRR, &diff1, &diff2 ) == FALSE, "succeeded unexpectedly\n" ); + DnsRecordListFree( diff1, DnsFreeRecordList ); + DnsRecordListFree( diff2, DnsFreeRecordList ); } static void test_DnsRecordSetDetach( void )

1 0

Jacek Caban : hhctrl.ocx: Fixed ref count handling in IOleClientSiteImpl.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 97e5728d7a67d1aae3d03a1042378b41e191f329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e5728d7a67d1aae3d03a104… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 19 12:28:30 2008 +0200 hhctrl.ocx: Fixed ref count handling in IOleClientSiteImpl. --- dlls/hhctrl.ocx/webbrowser.c | 94 ++++++++++++++++++++++++++++++------------ 1 files changed, 67 insertions(+), 27 deletions(-) diff --git a/dlls/hhctrl.ocx/webbrowser.c b/dlls/hhctrl.ocx/webbrowser.c index 4f17136..c9caa38 100644 --- a/dlls/hhctrl.ocx/webbrowser.c +++ b/dlls/hhctrl.ocx/webbrowser.c @@ -20,6 +20,10 @@ #include "hhctrl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); + #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) typedef struct IOleClientSiteImpl @@ -37,45 +41,62 @@ typedef struct IOleClientSiteImpl HWND hwndWindow; } IOleClientSiteImpl; +#define CLIENTSITE(x) ((IOleClientSite*) &(x)->lpVtbl) +#define DOCHOSTUI(x) ((IDocHostUIHandler*) &(x)->lpvtblDocHostUIHandler) +#define INPLACESITE(x) ((IOleInPlaceSite*) &(x)->lpvtblOleInPlaceSite) +#define INPLACEFRAME(x) ((IOleInPlaceFrame*) &(x)->lpvtblOleInPlaceFrame) + static HRESULT STDMETHODCALLTYPE Site_QueryInterface(IOleClientSite *iface, REFIID riid, void **ppvObj) { ICOM_THIS_MULTI(IOleClientSiteImpl, lpVtbl, iface); + *ppvObj = NULL; - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IOleClientSite)) - { - *ppvObj = This; - } - else if (IsEqualIID(riid, &IID_IOleInPlaceSite)) - { + if (IsEqualIID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppvObj); + *ppvObj = CLIENTSITE(This); + }else if(IsEqualIID(riid, &IID_IOleClientSite)) { + TRACE("(%p)->(IID_IOleClientSite %p)\n", This, ppvObj); + *ppvObj = CLIENTSITE(This); + }else if (IsEqualIID(riid, &IID_IOleInPlaceSite)) { + TRACE("(%p)->(IID_IOleInPlaceSite %p)\n", This, ppvObj); *ppvObj = &(This->lpvtblOleInPlaceSite); - } - else if (IsEqualIID(riid, &IID_IDocHostUIHandler)) - { + }else if (IsEqualIID(riid, &IID_IOleInPlaceFrame)) { + TRACE("(%p)->(IID_IOleInPlaceFrame %p)\n", This, ppvObj); + *ppvObj = &(This->lpvtblOleInPlaceSite); + }else if (IsEqualIID(riid, &IID_IDocHostUIHandler)) { + TRACE("(%p)->(IID_IDocHostUIHandler %p)\n", This, ppvObj); *ppvObj = &(This->lpvtblDocHostUIHandler); - } - else + }else { + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObj); return E_NOINTERFACE; + } + IUnknown_AddRef((IUnknown*)*ppvObj); return S_OK; } static ULONG STDMETHODCALLTYPE Site_AddRef(IOleClientSite *iface) { ICOM_THIS_MULTI(IOleClientSiteImpl, lpVtbl, iface); - return InterlockedIncrement(&This->ref); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG STDMETHODCALLTYPE Site_Release(IOleClientSite *iface) { ICOM_THIS_MULTI(IOleClientSiteImpl, lpVtbl, iface); - LONG refCount = InterlockedDecrement(&This->ref); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); - if (refCount) - return refCount; + if(!ref) + heap_free(This); - heap_free(This); - return 0; + return ref; } static HRESULT STDMETHODCALLTYPE Site_SaveObject(IOleClientSite *iface) @@ -126,17 +147,22 @@ static const IOleClientSiteVtbl MyIOleClientSiteTable = static HRESULT STDMETHODCALLTYPE UI_QueryInterface(IDocHostUIHandler *iface, REFIID riid, LPVOID *ppvObj) { ICOM_THIS_MULTI(IOleClientSiteImpl, lpvtblDocHostUIHandler, iface); - return Site_QueryInterface((IOleClientSite *)This, riid, ppvObj); + + return IOleClientSite_QueryInterface(CLIENTSITE(This), riid, ppvObj); } static ULONG STDMETHODCALLTYPE UI_AddRef(IDocHostUIHandler *iface) { - return 1; + ICOM_THIS_MULTI(IOleClientSiteImpl, lpvtblDocHostUIHandler, iface); + + return IOleClientSite_AddRef(CLIENTSITE(This)); } static ULONG STDMETHODCALLTYPE UI_Release(IDocHostUIHandler * iface) { - return 2; + ICOM_THIS_MULTI(IOleClientSiteImpl, lpvtblDocHostUIHandler, iface); + + return IOleClientSite_Release(CLIENTSITE(This)); } static HRESULT STDMETHODCALLTYPE UI_ShowContextMenu(IDocHostUIHandler *iface, DWORD dwID, POINT *ppt, IUnknown *pcmdtReserved, IDispatch *pdispReserved) @@ -246,17 +272,22 @@ static const IDocHostUIHandlerVtbl MyIDocHostUIHandlerTable = static HRESULT STDMETHODCALLTYPE InPlace_QueryInterface(IOleInPlaceSite *iface, REFIID riid, LPVOID *ppvObj) { ICOM_THIS_MULTI(IOleClientSiteImpl, lpvtblOleInPlaceSite, iface); - return Site_QueryInterface((IOleClientSite *)This, riid, ppvObj); + + return IOleClientSite_QueryInterface(CLIENTSITE(This), riid, ppvObj); } static ULONG STDMETHODCALLTYPE InPlace_AddRef(IOleInPlaceSite *iface) { - return 1; + ICOM_THIS_MULTI(IOleClientSiteImpl, lpvtblOleInPlaceSite, iface); + + return IOleClientSite_AddRef(CLIENTSITE(This)); } static ULONG STDMETHODCALLTYPE InPlace_Release(IOleInPlaceSite *iface) { - return 2; + ICOM_THIS_MULTI(IOleClientSiteImpl, lpvtblOleInPlaceSite, iface); + + return IOleClientSite_Release(CLIENTSITE(This)); } static HRESULT STDMETHODCALLTYPE InPlace_GetWindow(IOleInPlaceSite *iface, HWND *lphwnd) @@ -290,7 +321,10 @@ static HRESULT STDMETHODCALLTYPE InPlace_OnUIActivate(IOleInPlaceSite *iface) static HRESULT STDMETHODCALLTYPE InPlace_GetWindowContext(IOleInPlaceSite *iface, LPOLEINPLACEFRAME *lplpFrame, LPOLEINPLACEUIWINDOW *lplpDoc, LPRECT lprcPosRect, LPRECT lprcClipRect, LPOLEINPLACEFRAMEINFO lpFrameInfo) { ICOM_THIS_MULTI(IOleClientSiteImpl, lpvtblOleInPlaceSite, iface); - *lplpFrame = (LPOLEINPLACEFRAME)&This->lpvtblOleInPlaceFrame; + + *lplpFrame = INPLACEFRAME(This); + IOleInPlaceFrame_AddRef(INPLACEFRAME(This)); + *lplpDoc = NULL; lpFrameInfo->fMDIApp = FALSE; @@ -358,17 +392,23 @@ static const IOleInPlaceSiteVtbl MyIOleInPlaceSiteTable = static HRESULT STDMETHODCALLTYPE Frame_QueryInterface(IOleInPlaceFrame *iface, REFIID riid, LPVOID *ppvObj) { - return E_NOTIMPL; + ICOM_THIS_MULTI(IOleClientSiteImpl, lpvtblOleInPlaceFrame, iface); + + return IOleClientSite_QueryInterface(CLIENTSITE(This), riid, ppvObj); } static ULONG STDMETHODCALLTYPE Frame_AddRef(IOleInPlaceFrame *iface) { - return 1; + ICOM_THIS_MULTI(IOleClientSiteImpl, lpvtblOleInPlaceFrame, iface); + + return IOleClientSite_AddRef(CLIENTSITE(This)); } static ULONG STDMETHODCALLTYPE Frame_Release(IOleInPlaceFrame *iface) { - return 2; + ICOM_THIS_MULTI(IOleClientSiteImpl, lpvtblOleInPlaceFrame, iface); + + return IOleClientSite_Release(CLIENTSITE(This)); } static HRESULT STDMETHODCALLTYPE Frame_GetWindow(IOleInPlaceFrame *iface, HWND *lphwnd)

1 0

Jacek Caban : wininet: Move remeining InternetQueryOption implementation to vtbl.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 9f5748e6b4d177a7072563d826c01a3b85df1f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f5748e6b4d177a7072563d82… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 19 12:30:19 2008 +0200 wininet: Move remeining InternetQueryOption implementation to vtbl. --- dlls/wininet/internet.c | 231 ++++++++++++++++++++++------------------------- 1 files changed, 109 insertions(+), 122 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index cf21944..a306fd2 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2066,137 +2066,90 @@ DWORD INET_QueryOption(DWORD option, void *buffer, DWORD *size, BOOL unicode) return APPINFO_QueryOption(&ai.hdr, INTERNET_OPTION_PROXY, buffer, size, unicode); /* FIXME */ } + + case INTERNET_OPTION_MAX_CONNS_PER_SERVER: + TRACE("INTERNET_OPTION_MAX_CONNS_PER_SERVER\n"); + + if (*size < sizeof(ULONG)) + return ERROR_INSUFFICIENT_BUFFER; + + *(ULONG*)buffer = 2; + *size = sizeof(ULONG); + + return ERROR_SUCCESS; + + case INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER: + TRACE("INTERNET_OPTION_MAX_CONNS_1_0_SERVER\n"); + + if (*size < sizeof(ULONG)) + return ERROR_INSUFFICIENT_BUFFER; + + *(ULONG*)size = 4; + *size = sizeof(ULONG); + + return ERROR_SUCCESS; + + case INTERNET_OPTION_SECURITY_FLAGS: + FIXME("INTERNET_OPTION_SECURITY_FLAGS: Stub\n"); + return ERROR_SUCCESS; + + case INTERNET_OPTION_VERSION: { + static const INTERNET_VERSION_INFO info = { 1, 2 }; + + TRACE("INTERNET_OPTION_VERSION\n"); + + if (*size < sizeof(INTERNET_VERSION_INFO)) + return ERROR_INSUFFICIENT_BUFFER; + + memcpy(buffer, &info, sizeof(info)); + *size = sizeof(info); + + return ERROR_SUCCESS; } - FIXME("Stub for %d\n", option); - return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; -} + case INTERNET_OPTION_PER_CONNECTION_OPTION: { + INTERNET_PER_CONN_OPTION_LISTW *con = buffer; + DWORD res = ERROR_SUCCESS, i; -/*********************************************************************** - * INET_QueryOptionHelper (internal) - */ -static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD dwOption, - LPVOID lpBuffer, LPDWORD lpdwBufferLength) -{ - LPWININETHANDLEHEADER lpwhh; - BOOL bSuccess = FALSE; + FIXME("INTERNET_OPTION_PER_CONNECTION_OPTION stub\n"); - TRACE("(%p, 0x%08x, %p, %p)\n", hInternet, dwOption, lpBuffer, lpdwBufferLength); + if (*size < sizeof(INTERNET_PER_CONN_OPTION_LISTW)) + return ERROR_INSUFFICIENT_BUFFER; - lpwhh = WININET_GetObject( hInternet ); + for (i = 0; i < con->dwOptionCount; i++) { + INTERNET_PER_CONN_OPTIONW *option = con->pOptions + i; - switch (dwOption) - { - case INTERNET_OPTION_MAX_CONNS_PER_SERVER: - { - ULONG conn = 2; - TRACE("INTERNET_OPTION_MAX_CONNS_PER_SERVER: %d\n", conn); - if (*lpdwBufferLength < sizeof(ULONG)) - INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); - else - { - memcpy(lpBuffer, &conn, sizeof(ULONG)); - bSuccess = TRUE; - } - *lpdwBufferLength = sizeof(ULONG); - break; - } - case INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER: - { - ULONG conn = 4; - TRACE("INTERNET_OPTION_MAX_CONNS_1_0_SERVER: %d\n", conn); - if (*lpdwBufferLength < sizeof(ULONG)) - INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); - else - { - memcpy(lpBuffer, &conn, sizeof(ULONG)); - bSuccess = TRUE; - } - *lpdwBufferLength = sizeof(ULONG); - break; - } - case INTERNET_OPTION_SECURITY_FLAGS: - FIXME("INTERNET_OPTION_SECURITY_FLAGS: Stub\n"); - bSuccess = TRUE; - break; + switch (option->dwOption) { + case INTERNET_PER_CONN_FLAGS: + option->Value.dwValue = PROXY_TYPE_DIRECT; + break; - case INTERNET_OPTION_VERSION: - { - TRACE("INTERNET_OPTION_VERSION\n"); - if (*lpdwBufferLength < sizeof(INTERNET_VERSION_INFO)) - INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); - else - { - static const INTERNET_VERSION_INFO info = { 1, 2 }; - memcpy(lpBuffer, &info, sizeof(info)); - *lpdwBufferLength = sizeof(info); - bSuccess = TRUE; + case INTERNET_PER_CONN_PROXY_SERVER: + case INTERNET_PER_CONN_PROXY_BYPASS: + case INTERNET_PER_CONN_AUTOCONFIG_URL: + case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: + case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: + case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: + FIXME("Unhandled dwOption %d\n", option->dwOption); + option->Value.dwValue = 0; + res = ERROR_INVALID_PARAMETER; + break; + + default: + FIXME("Unknown dwOption %d\n", option->dwOption); + res = ERROR_INVALID_PARAMETER; + break; } - break; } - case INTERNET_OPTION_PER_CONNECTION_OPTION: - FIXME("INTERNET_OPTION_PER_CONNECTION_OPTION stub\n"); - if (*lpdwBufferLength < sizeof(INTERNET_PER_CONN_OPTION_LISTW)) - INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); - else - { - INTERNET_PER_CONN_OPTION_LISTW *con = lpBuffer; - int x; - bSuccess = TRUE; - for (x = 0; x < con->dwOptionCount; ++x) - { - INTERNET_PER_CONN_OPTIONW *option = con->pOptions + x; - switch (option->dwOption) - { - case INTERNET_PER_CONN_FLAGS: - option->Value.dwValue = PROXY_TYPE_DIRECT; - break; - - case INTERNET_PER_CONN_PROXY_SERVER: - case INTERNET_PER_CONN_PROXY_BYPASS: - case INTERNET_PER_CONN_AUTOCONFIG_URL: - case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: - case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: - case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: - case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: - case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: - FIXME("Unhandled dwOption %d\n", option->dwOption); - option->Value.dwValue = 0; - bSuccess = FALSE; - break; - - default: - FIXME("Unknown dwOption %d\n", option->dwOption); - bSuccess = FALSE; - break; - } - } - if (!bSuccess) - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - } - break; - case 66: - FIXME("66\n"); - bSuccess = TRUE; - break; - default: { - DWORD res; - if(lpwhh) - res = lpwhh->vtbl->QueryOption(lpwhh, dwOption, lpBuffer, lpdwBufferLength, bIsUnicode); - else - res = INET_QueryOption(dwOption, lpBuffer, lpdwBufferLength, bIsUnicode); - - if(res == ERROR_SUCCESS) - bSuccess = TRUE; - else - SetLastError(res); - } + return res; + } } - if (lpwhh) - WININET_Release( lpwhh ); - return bSuccess; + FIXME("Stub for %d\n", option); + return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; } /*********************************************************************** @@ -2212,7 +2165,24 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d BOOL WINAPI InternetQueryOptionW(HINTERNET hInternet, DWORD dwOption, LPVOID lpBuffer, LPDWORD lpdwBufferLength) { - return INET_QueryOptionHelper(TRUE, hInternet, dwOption, lpBuffer, lpdwBufferLength); + LPWININETHANDLEHEADER hdr; + DWORD res = ERROR_INVALID_HANDLE; + + TRACE("%p %d %p %p\n", hInternet, dwOption, lpBuffer, lpdwBufferLength); + + if(hInternet) { + hdr = WININET_GetObject(hInternet); + if (hdr) { + res = hdr->vtbl->QueryOption(hdr, dwOption, lpBuffer, lpdwBufferLength, TRUE); + WININET_Release(hdr); + } + }else { + res = INET_QueryOption(dwOption, lpBuffer, lpdwBufferLength, TRUE); + } + + if(res != ERROR_SUCCESS) + SetLastError(res); + return res == ERROR_SUCCESS; } /*********************************************************************** @@ -2228,7 +2198,24 @@ BOOL WINAPI InternetQueryOptionW(HINTERNET hInternet, DWORD dwOption, BOOL WINAPI InternetQueryOptionA(HINTERNET hInternet, DWORD dwOption, LPVOID lpBuffer, LPDWORD lpdwBufferLength) { - return INET_QueryOptionHelper(FALSE, hInternet, dwOption, lpBuffer, lpdwBufferLength); + LPWININETHANDLEHEADER hdr; + DWORD res = ERROR_INVALID_HANDLE; + + TRACE("%p %d %p %p\n", hInternet, dwOption, lpBuffer, lpdwBufferLength); + + if(hInternet) { + hdr = WININET_GetObject(hInternet); + if (hdr) { + res = hdr->vtbl->QueryOption(hdr, dwOption, lpBuffer, lpdwBufferLength, FALSE); + WININET_Release(hdr); + } + }else { + res = INET_QueryOption(dwOption, lpBuffer, lpdwBufferLength, FALSE); + } + + if(res != ERROR_SUCCESS) + SetLastError(res); + return res == ERROR_SUCCESS; }

1 0

Jacek Caban : wininet: Moved more InternetQueryOption implementation to vtbl.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 7426e7e0555f77336408c30a5e9095c4414005bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7426e7e0555f77336408c30a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 19 12:29:28 2008 +0200 wininet: Moved more InternetQueryOption implementation to vtbl. --- dlls/wininet/ftp.c | 9 +--- dlls/wininet/http.c | 6 +-- dlls/wininet/internet.c | 112 ++++++++++++++++++++++------------------------- dlls/wininet/internet.h | 2 + 4 files changed, 60 insertions(+), 69 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 36e9005..f35929d 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1227,8 +1227,7 @@ static DWORD FTPFILE_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *b return ERROR_SUCCESS; } - FIXME("Not implemented option %d\n", option); - return ERROR_INTERNET_INVALID_OPTION; + return INET_QueryOption(option, buffer, size, unicode); } static DWORD FTPFILE_ReadFile(WININETHANDLEHEADER *hdr, void *buffer, DWORD size, DWORD *read) @@ -2194,8 +2193,7 @@ static DWORD FTPSESSION_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void return ERROR_SUCCESS; } - FIXME("Not implemented option %d\n", option); - return ERROR_INTERNET_INVALID_OPTION; + return INET_QueryOption(option, buffer, size, unicode); } static const HANDLEHEADERVtbl FTPSESSIONVtbl = { @@ -3275,8 +3273,7 @@ static DWORD FTPFINDNEXT_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, voi return ERROR_SUCCESS; } - FIXME("Not implemented option %d\n", option); - return ERROR_INTERNET_INVALID_OPTION; + return INET_QueryOption(option, buffer, size, unicode); } static DWORD FTPFINDNEXT_FindNextFileW(WININETHANDLEHEADER *hdr, void *data) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index cefa836..b31996d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1579,8 +1579,7 @@ static DWORD HTTPREQ_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *b } } - FIXME("Not implemented option %d\n", option); - return ERROR_INTERNET_INVALID_OPTION; + return INET_QueryOption(option, buffer, size, unicode); } static DWORD HTTPREQ_SetOption(WININETHANDLEHEADER *hdr, DWORD option, void *buffer, DWORD size) @@ -3472,8 +3471,7 @@ static DWORD HTTPSESSION_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, voi return ERROR_SUCCESS; } - FIXME("Not implemented option %d\n", option); - return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; + return INET_QueryOption(option, buffer, size, unicode); } static const HANDLEHEADERVtbl HTTPSESSIONVtbl = { diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index cce504f..2e363d5 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -533,8 +533,7 @@ static DWORD APPINFO_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *b } } - FIXME("Not implemented option %d\n", option); - return ERROR_INTERNET_INVALID_OPTION; + return INET_QueryOption(option, buffer, size, unicode); } static const HANDLEHEADERVtbl APPINFOVtbl = { @@ -1955,6 +1954,49 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, return FALSE; } +DWORD INET_QueryOption(DWORD option, void *buffer, DWORD *size, BOOL unicode) +{ + switch(option) { + case INTERNET_OPTION_REQUEST_FLAGS: + TRACE("INTERNET_OPTION_REQUEST_FLAGS\n"); + + if (*size < sizeof(ULONG)) + return ERROR_INSUFFICIENT_BUFFER; + + *(ULONG*)buffer = 4; + *size = sizeof(ULONG); + + return ERROR_SUCCESS; + + case INTERNET_OPTION_HTTP_VERSION: + if (*size < sizeof(HTTP_VERSION_INFO)) + return ERROR_INSUFFICIENT_BUFFER; + + /* + * Presently hardcoded to 1.1 + */ + ((HTTP_VERSION_INFO*)buffer)->dwMajorVersion = 1; + ((HTTP_VERSION_INFO*)buffer)->dwMinorVersion = 1; + *size = sizeof(HTTP_VERSION_INFO); + + return ERROR_SUCCESS; + + case INTERNET_OPTION_CONNECTED_STATE: + FIXME("INTERNET_OPTION_CONNECTED_STATE: semi-stub\n"); + + if (*size < sizeof(ULONG)) + return ERROR_INSUFFICIENT_BUFFER; + + *(ULONG*)buffer = INTERNET_STATE_CONNECTED; + *size = sizeof(ULONG); + + return ERROR_SUCCESS; + } + + FIXME("Stub for %d\n", option); + return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; +} + /*********************************************************************** * INET_QueryOptionHelper (internal) */ @@ -1970,52 +2012,6 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d switch (dwOption) { - case INTERNET_OPTION_REQUEST_FLAGS: - { - ULONG flags = 4; - TRACE("INTERNET_OPTION_REQUEST_FLAGS: %d\n", flags); - if (*lpdwBufferLength < sizeof(ULONG)) - INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); - else - { - memcpy(lpBuffer, &flags, sizeof(ULONG)); - bSuccess = TRUE; - } - *lpdwBufferLength = sizeof(ULONG); - break; - } - - case INTERNET_OPTION_HTTP_VERSION: - { - if (*lpdwBufferLength < sizeof(HTTP_VERSION_INFO)) - INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); - else - { - /* - * Presently hardcoded to 1.1 - */ - ((HTTP_VERSION_INFO*)lpBuffer)->dwMajorVersion = 1; - ((HTTP_VERSION_INFO*)lpBuffer)->dwMinorVersion = 1; - bSuccess = TRUE; - } - *lpdwBufferLength = sizeof(HTTP_VERSION_INFO); - break; - } - case INTERNET_OPTION_CONNECTED_STATE: - { - DWORD *pdwConnectedState = (DWORD *)lpBuffer; - FIXME("INTERNET_OPTION_CONNECTED_STATE: semi-stub\n"); - - if (*lpdwBufferLength < sizeof(*pdwConnectedState)) - INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); - else - { - *pdwConnectedState = INTERNET_STATE_CONNECTED; - bSuccess = TRUE; - } - *lpdwBufferLength = sizeof(*pdwConnectedState); - break; - } case INTERNET_OPTION_PROXY: { LPWININETAPPINFOW lpwai = (LPWININETAPPINFOW)lpwhh; @@ -2209,19 +2205,17 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d bSuccess = TRUE; break; default: { - if(lpwhh) { - DWORD res; + DWORD res; + if(lpwhh) res = lpwhh->vtbl->QueryOption(lpwhh, dwOption, lpBuffer, lpdwBufferLength, bIsUnicode); - if(res == ERROR_SUCCESS) - bSuccess = TRUE; - else - SetLastError(res); - }else { - FIXME("Stub! %d\n", dwOption); - SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - break; - } + else + res = INET_QueryOption(dwOption, lpBuffer, lpdwBufferLength, bIsUnicode); + + if(res == ERROR_SUCCESS) + bSuccess = TRUE; + else + SetLastError(res); } } if (lpwhh) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 43b8d8e..bb694e9 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -347,6 +347,8 @@ LPWININETHANDLEHEADER WININET_AddRef( LPWININETHANDLEHEADER info ); BOOL WININET_Release( LPWININETHANDLEHEADER info ); BOOL WININET_FreeHandle( HINTERNET hinternet ); +DWORD INET_QueryOption(DWORD,void*,DWORD*,BOOL); + time_t ConvertTimeString(LPCWSTR asctime); HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName,

1 0

Jacek Caban : wininet: Moved InternetQueryOption(INTERNET_OPTION_PROXY) implementation to vtbl.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 46f2628448cfb0b2a3d6eae08ebf4036cf201ca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46f2628448cfb0b2a3d6eae08… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 19 12:29:56 2008 +0200 wininet: Moved InternetQueryOption(INTERNET_OPTION_PROXY) implementation to vtbl. --- dlls/wininet/internet.c | 175 ++++++++++++++++++++--------------------------- 1 files changed, 75 insertions(+), 100 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 2e363d5..cf21944 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -531,6 +531,71 @@ static DWORD APPINFO_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *b return ERROR_SUCCESS; } + + case INTERNET_OPTION_PROXY: + if (unicode) { + INTERNET_PROXY_INFOW *pi = (INTERNET_PROXY_INFOW *)buffer; + DWORD proxyBytesRequired = 0, proxyBypassBytesRequired = 0; + LPWSTR proxy, proxy_bypass; + + if (ai->lpszProxy) + proxyBytesRequired = (lstrlenW(ai->lpszProxy) + 1) * sizeof(WCHAR); + if (ai->lpszProxyBypass) + proxyBypassBytesRequired = (lstrlenW(ai->lpszProxyBypass) + 1) * sizeof(WCHAR); + if (*size < sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired + proxyBypassBytesRequired) + return ERROR_INSUFFICIENT_BUFFER; + + proxy = (LPWSTR)((LPBYTE)buffer + sizeof(INTERNET_PROXY_INFOW)); + proxy_bypass = (LPWSTR)((LPBYTE)buffer + sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired); + + pi->dwAccessType = ai->dwAccessType; + pi->lpszProxy = NULL; + pi->lpszProxyBypass = NULL; + if (ai->lpszProxy) { + lstrcpyW(proxy, ai->lpszProxy); + pi->lpszProxy = proxy; + } + + if (ai->lpszProxyBypass) { + lstrcpyW(proxy_bypass, ai->lpszProxyBypass); + pi->lpszProxyBypass = proxy_bypass; + } + + *size = sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired + proxyBypassBytesRequired; + return ERROR_SUCCESS; + }else { + INTERNET_PROXY_INFOA *pi = (INTERNET_PROXY_INFOA *)buffer; + DWORD proxyBytesRequired = 0, proxyBypassBytesRequired = 0; + LPSTR proxy, proxy_bypass; + + if (ai->lpszProxy) + proxyBytesRequired = WideCharToMultiByte(CP_ACP, 0, ai->lpszProxy, -1, NULL, 0, NULL, NULL); + if (ai->lpszProxyBypass) + proxyBypassBytesRequired = WideCharToMultiByte(CP_ACP, 0, ai->lpszProxyBypass, -1, + NULL, 0, NULL, NULL); + if (*size < sizeof(INTERNET_PROXY_INFOA) + proxyBytesRequired + proxyBypassBytesRequired) + return ERROR_INSUFFICIENT_BUFFER; + + proxy = (LPSTR)((LPBYTE)buffer + sizeof(INTERNET_PROXY_INFOA)); + proxy_bypass = (LPSTR)((LPBYTE)buffer + sizeof(INTERNET_PROXY_INFOA) + proxyBytesRequired); + + pi->dwAccessType = ai->dwAccessType; + pi->lpszProxy = NULL; + pi->lpszProxyBypass = NULL; + if (ai->lpszProxy) { + WideCharToMultiByte(CP_ACP, 0, ai->lpszProxy, -1, proxy, proxyBytesRequired, NULL, NULL); + pi->lpszProxy = proxy; + } + + if (ai->lpszProxyBypass) { + WideCharToMultiByte(CP_ACP, 0, ai->lpszProxyBypass, -1, proxy_bypass, + proxyBypassBytesRequired, NULL, NULL); + pi->lpszProxyBypass = proxy_bypass; + } + + *size = sizeof(INTERNET_PROXY_INFOA) + proxyBytesRequired + proxyBypassBytesRequired; + return ERROR_SUCCESS; + } } return INET_QueryOption(option, buffer, size, unicode); @@ -1991,6 +2056,16 @@ DWORD INET_QueryOption(DWORD option, void *buffer, DWORD *size, BOOL unicode) *size = sizeof(ULONG); return ERROR_SUCCESS; + + case INTERNET_OPTION_PROXY: { + WININETAPPINFOW ai; + + TRACE("Getting global proxy info\n"); + memset(&ai, 0, sizeof(WININETAPPINFOW)); + INTERNET_ConfigureProxy(&ai); + + return APPINFO_QueryOption(&ai.hdr, INTERNET_OPTION_PROXY, buffer, size, unicode); /* FIXME */ + } } FIXME("Stub for %d\n", option); @@ -2012,106 +2087,6 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d switch (dwOption) { - case INTERNET_OPTION_PROXY: - { - LPWININETAPPINFOW lpwai = (LPWININETAPPINFOW)lpwhh; - WININETAPPINFOW wai; - - if (lpwai == NULL) - { - TRACE("Getting global proxy info\n"); - memset(&wai, 0, sizeof(WININETAPPINFOW)); - INTERNET_ConfigureProxy( &wai ); - lpwai = &wai; - } - - if (bIsUnicode) - { - INTERNET_PROXY_INFOW *pPI = (INTERNET_PROXY_INFOW *)lpBuffer; - DWORD proxyBytesRequired = 0, proxyBypassBytesRequired = 0; - - if (lpwai->lpszProxy) - proxyBytesRequired = (lstrlenW(lpwai->lpszProxy) + 1) * - sizeof(WCHAR); - if (lpwai->lpszProxyBypass) - proxyBypassBytesRequired = - (lstrlenW(lpwai->lpszProxyBypass) + 1) * sizeof(WCHAR); - if (*lpdwBufferLength < sizeof(INTERNET_PROXY_INFOW) + - proxyBytesRequired + proxyBypassBytesRequired) - INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); - else - { - LPWSTR proxy = (LPWSTR)((LPBYTE)lpBuffer + - sizeof(INTERNET_PROXY_INFOW)); - LPWSTR proxy_bypass = (LPWSTR)((LPBYTE)lpBuffer + - sizeof(INTERNET_PROXY_INFOW) + - proxyBytesRequired); - - pPI->dwAccessType = lpwai->dwAccessType; - pPI->lpszProxy = NULL; - pPI->lpszProxyBypass = NULL; - if (lpwai->lpszProxy) - { - lstrcpyW(proxy, lpwai->lpszProxy); - pPI->lpszProxy = proxy; - } - - if (lpwai->lpszProxyBypass) - { - lstrcpyW(proxy_bypass, lpwai->lpszProxyBypass); - pPI->lpszProxyBypass = proxy_bypass; - } - bSuccess = TRUE; - } - *lpdwBufferLength = sizeof(INTERNET_PROXY_INFOW) + - proxyBytesRequired + proxyBypassBytesRequired; - } - else - { - INTERNET_PROXY_INFOA *pPI = (INTERNET_PROXY_INFOA *)lpBuffer; - DWORD proxyBytesRequired = 0, proxyBypassBytesRequired = 0; - - if (lpwai->lpszProxy) - proxyBytesRequired = WideCharToMultiByte(CP_ACP, 0, - lpwai->lpszProxy, -1, NULL, 0, NULL, NULL); - if (lpwai->lpszProxyBypass) - proxyBypassBytesRequired = WideCharToMultiByte(CP_ACP, 0, - lpwai->lpszProxyBypass, -1, NULL, 0, NULL, NULL); - if (*lpdwBufferLength < sizeof(INTERNET_PROXY_INFOA) + - proxyBytesRequired + proxyBypassBytesRequired) - INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); - else - { - LPSTR proxy = (LPSTR)((LPBYTE)lpBuffer + - sizeof(INTERNET_PROXY_INFOA)); - LPSTR proxy_bypass = (LPSTR)((LPBYTE)lpBuffer + - sizeof(INTERNET_PROXY_INFOA) + - proxyBytesRequired); - - pPI->dwAccessType = lpwai->dwAccessType; - pPI->lpszProxy = NULL; - pPI->lpszProxyBypass = NULL; - if (lpwai->lpszProxy) - { - WideCharToMultiByte(CP_ACP, 0, lpwai->lpszProxy, -1, - proxy, proxyBytesRequired, NULL, NULL); - pPI->lpszProxy = proxy; - } - - if (lpwai->lpszProxyBypass) - { - WideCharToMultiByte(CP_ACP, 0, lpwai->lpszProxyBypass, - -1, proxy_bypass, proxyBypassBytesRequired, - NULL, NULL); - pPI->lpszProxyBypass = proxy_bypass; - } - bSuccess = TRUE; - } - *lpdwBufferLength = sizeof(INTERNET_PROXY_INFOA) + - proxyBytesRequired + proxyBypassBytesRequired; - } - break; - } case INTERNET_OPTION_MAX_CONNS_PER_SERVER: { ULONG conn = 2;

1 0