March 2009 - Wine-commits - list.winehq.org

Paul Vriens : shell32/tests: Skip some tests on Win95 because of W-functions.
by Alexandre Julliard 05 Mar '09

05 Mar '09

Module: wine Branch: master Commit: ebb6dd9c197e38c996acb0e8e6e582d90fe9b3b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebb6dd9c197e38c996acb0e8e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Mar 4 21:55:11 2009 +0100 shell32/tests: Skip some tests on Win95 because of W-functions. --- dlls/shell32/tests/shlfolder.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 9de37bd..404c413 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -853,7 +853,7 @@ static void test_SHGetPathFromIDList(void) if(!pSHGetPathFromIDListW || !pSHGetSpecialFolderPathW) { - skip("SHGetPathFromIDListW() or SHGetSpecialFolderPathW() is missing\n"); + win_skip("SHGetPathFromIDListW() or SHGetSpecialFolderPathW() is missing\n"); return; } @@ -868,7 +868,16 @@ static void test_SHGetPathFromIDList(void) result = pSHGetSpecialFolderPathW(NULL, wszDesktop, CSIDL_DESKTOP, FALSE); ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOP) failed! Last error: %u\n", GetLastError()); if (!result) return; - + + /* Check if we are on Win9x */ + SetLastError(0xdeadbeef); + lstrcmpiW(wszDesktop, wszDesktop); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("Most W-calls are not implemented\n"); + return; + } + result = pSHGetPathFromIDListW(pidlEmpty, wszPath); ok(result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); if (!result) return;

1 0

Paul Vriens : urlmon/tests: Use an action that is available on all IE versions.
by Alexandre Julliard 05 Mar '09

05 Mar '09

Module: wine Branch: master Commit: 907adb834c6407fe4cd4ce03c431555d1f5945e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=907adb834c6407fe4cd4ce03c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Mar 5 09:05:50 2009 +0100 urlmon/tests: Use an action that is available on all IE versions. --- dlls/urlmon/tests/misc.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 2123392..7702e1e 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -943,22 +943,27 @@ static void test_ZoneManager(void) IInternetZoneManager *zonemgr = NULL; BYTE buf[32]; HRESULT hres; + DWORD action = URLACTION_CREDENTIALS_USE; /* Implemented on all IE versions */ hres = CoInternetCreateZoneManager(NULL, &zonemgr, 0); ok(hres == S_OK, "CoInternetCreateZoneManager failed: %08x\n", hres); if(FAILED(hres)) return; - hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 3, 0x1a10, buf, + hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 3, action, buf, sizeof(DWORD), URLZONEREG_DEFAULT); ok(hres == S_OK, "GetZoneActionPolicy failed: %08x\n", hres); - ok(*(DWORD*)buf == 1, "policy=%d, expected 1\n", *(DWORD*)buf); + ok(*(DWORD*)buf == URLPOLICY_CREDENTIALS_SILENT_LOGON_OK || + *(DWORD*)buf == URLPOLICY_CREDENTIALS_MUST_PROMPT_USER || + *(DWORD*)buf == URLPOLICY_CREDENTIALS_CONDITIONAL_PROMPT || + *(DWORD*)buf == URLPOLICY_CREDENTIALS_ANONYMOUS_ONLY, + "unexpected policy=%d\n", *(DWORD*)buf); - hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 3, 0x1a10, NULL, + hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 3, action, NULL, sizeof(DWORD), URLZONEREG_DEFAULT); ok(hres == E_INVALIDARG, "GetZoneActionPolicy failed: %08x, expected E_INVALIDARG\n", hres); - hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 3, 0x1a10, buf, + hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 3, action, buf, 2, URLZONEREG_DEFAULT); ok(hres == E_INVALIDARG, "GetZoneActionPolicy failed: %08x, expected E_INVALIDARG\n", hres); @@ -966,7 +971,7 @@ static void test_ZoneManager(void) sizeof(DWORD), URLZONEREG_DEFAULT); ok(hres == E_FAIL, "GetZoneActionPolicy failed: %08x, expected E_FAIL\n", hres); - hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 13, 0x1a10, buf, + hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 13, action, buf, sizeof(DWORD), URLZONEREG_DEFAULT); ok(hres == E_INVALIDARG, "GetZoneActionPolicy failed: %08x, expected E_INVALIDARG\n", hres);

1 0

Tony Wasserka : d3dx9: Fix inclusions in some d3dx9 headers.
by Alexandre Julliard 05 Mar '09

05 Mar '09

Module: wine Branch: master Commit: 02efa19faaf2f07aae37f699dd56dbcbb1250a39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02efa19faaf2f07aae37f699d… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Wed Mar 4 20:27:49 2009 +0100 d3dx9: Fix inclusions in some d3dx9 headers. --- include/d3dx9core.h | 4 ++-- include/d3dx9mesh.h | 4 ++-- include/d3dx9shader.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/d3dx9core.h b/include/d3dx9core.h index 9a108fa..b33d8ff 100644 --- a/include/d3dx9core.h +++ b/include/d3dx9core.h @@ -16,11 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <d3dx9.h> + #ifndef __WINE_D3DX9CORE_H #define __WINE_D3DX9CORE_H -#include <d3dx9.h> - /********************************************** ***************** Definitions **************** **********************************************/ diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index a85f80d..39ad28a 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -16,11 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <d3dx9.h> + #ifndef __WINE_D3DX9MESH_H #define __WINE_D3DX9MESH_H -#include <d3dx9.h> - #ifdef __cplusplus extern "C" { #endif diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index a50b72a..899077e 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -16,11 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "d3dx9.h" + #ifndef __D3DX9SHADER_H__ #define __D3DX9SHADER_H__ -#include "d3dx9.h" - typedef LPCSTR D3DXHANDLE; typedef enum D3DXPARAMETER_CLASS

1 0

Juan Lang : crypt32: Fix some test failures on Win9x.
by Alexandre Julliard 05 Mar '09

05 Mar '09

Module: wine Branch: master Commit: bda6e4ed99d5329fea5bcece41af894ac5c69316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda6e4ed99d5329fea5bcece4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Mar 4 10:53:38 2009 -0800 crypt32: Fix some test failures on Win9x. --- dlls/crypt32/tests/msg.c | 37 +++++++++++++++++++++++++------------ 1 files changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 42da890..a56a4c6 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1837,7 +1837,13 @@ static void test_signed_msg_get_param(void) /* Content and bare content are always gettable */ size = 0; ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, NULL, &size); - ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(ret || broken(!ret /* Win9x */), "CryptMsgGetParam failed: %08x\n", + GetLastError()); + if (!ret) + { + skip("message parameters are broken, skipping tests"); + return; + } size = 0; ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); @@ -2201,8 +2207,9 @@ static void test_decode_msg_update(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, hashEmptyContent, sizeof(hashEmptyContent), TRUE); ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_PDU_MISMATCH /* Win9x */), - "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH, got %x\n", + GetLastError() == OSS_PDU_MISMATCH /* some Win9x */ || + GetLastError() == OSS_DATA_ERROR /* some Win9x */), + "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH or OSS_DATA_ERROR, got %x\n", GetLastError()); CryptMsgClose(msg); /* On the other hand, decoding the bare content of an empty hash message @@ -2213,8 +2220,9 @@ static void test_decode_msg_update(void) ret = CryptMsgUpdate(msg, hashEmptyBareContent, sizeof(hashEmptyBareContent), TRUE); ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_PDU_MISMATCH /* Win9x */), - "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH, got %x\n", + GetLastError() == OSS_PDU_MISMATCH /* some Win9x */ || + GetLastError() == OSS_DATA_ERROR /* some Win9x */), + "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH or OSS_DATA_ERROR, got %x\n", GetLastError()); CryptMsgClose(msg); /* but succeeds with explicit type. */ @@ -2222,7 +2230,8 @@ static void test_decode_msg_update(void) NULL); ret = CryptMsgUpdate(msg, hashEmptyBareContent, sizeof(hashEmptyBareContent), TRUE); - ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* win9x */), + "CryptMsgUpdate failed: %x\n", GetLastError()); CryptMsgClose(msg); /* And again, opening a (non-empty) hash message with unspecified type @@ -2239,8 +2248,9 @@ static void test_decode_msg_update(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, hashContent, sizeof(hashContent), TRUE); ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_PDU_MISMATCH /* Win9x */), - "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH, got %x\n", + GetLastError() == OSS_PDU_MISMATCH /* some Win9x */ || + GetLastError() == OSS_DATA_ERROR /* some Win9x */), + "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH or OSS_DATA_ERROR, got %x\n", GetLastError()); CryptMsgClose(msg); /* and decoding the bare content of a non-empty hash message fails with @@ -2250,8 +2260,9 @@ static void test_decode_msg_update(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, hashBareContent, sizeof(hashBareContent), TRUE); ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_PDU_MISMATCH /* Win9x */), - "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH, got %x\n", + GetLastError() == OSS_PDU_MISMATCH /* some Win9x */ || + GetLastError() == OSS_DATA_ERROR /* some Win9x */), + "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH or OSS_DATA_ERROR, got %x\n", GetLastError()); CryptMsgClose(msg); /* but succeeds with explicit type. */ @@ -2278,8 +2289,10 @@ static void test_decode_msg_update(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, signedWithCertAndCrlBareContent, sizeof(signedWithCertAndCrlBareContent), TRUE); - ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, - "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == OSS_DATA_ERROR /* Win9x */), + "Expected CRYPT_E_ASN1_BADTAG or OSS_DATA_ERROR, got %08x\n", + GetLastError()); CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, 0, NULL, NULL);

1 0

Jacek Caban : urlmon: Added gopher pluggable protocol implementation.
by Alexandre Julliard 05 Mar '09

05 Mar '09

Module: wine Branch: master Commit: 0da20926c3e33ed149d1dee9c1d08e94dfa0677a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da20926c3e33ed149d1dee9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 4 19:07:29 2009 +0100 urlmon: Added gopher pluggable protocol implementation. --- dlls/urlmon/gopher.c | 72 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 60 insertions(+), 12 deletions(-) diff --git a/dlls/urlmon/gopher.c b/dlls/urlmon/gopher.c index 6614a6d..c562657 100644 --- a/dlls/urlmon/gopher.c +++ b/dlls/urlmon/gopher.c @@ -33,6 +33,40 @@ typedef struct { #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) #define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) +#define ASYNCPROTOCOL_THIS(iface) DEFINE_THIS2(GopherProtocol, base, iface) + +static HRESULT GopherProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD request_flags, + IInternetBindInfo *bind_info) +{ + GopherProtocol *This = ASYNCPROTOCOL_THIS(prot); + + This->base.request = InternetOpenUrlW(This->base.internet, url, NULL, 0, + request_flags, (DWORD_PTR)&This->base); + if (!This->base.request && GetLastError() != ERROR_IO_PENDING) { + WARN("InternetOpenUrl failed: %d\n", GetLastError()); + return INET_E_RESOURCE_NOT_FOUND; + } + + return S_OK; +} + +static HRESULT GopherProtocol_start_downloading(Protocol *prot) +{ + return S_OK; +} + +static void GopherProtocol_close_connection(Protocol *prot) +{ +} + +#undef ASYNCPROTOCOL_THIS + +static const ProtocolVtbl AsyncProtocolVtbl = { + GopherProtocol_open_request, + GopherProtocol_start_downloading, + GopherProtocol_close_connection +}; + #define PROTOCOL_THIS(iface) DEFINE_THIS(GopherProtocol, InternetProtocol, iface) static HRESULT WINAPI GopherProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) @@ -92,16 +126,20 @@ static HRESULT WINAPI GopherProtocol_Start(IInternetProtocol *iface, LPCWSTR szU DWORD grfPI, DWORD dwReserved) { GopherProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, + + TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); - return E_NOTIMPL; + + return protocol_start(&This->base, PROTOCOL(This), szUrl, pOIProtSink, pOIBindInfo); } static HRESULT WINAPI GopherProtocol_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) { GopherProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%p)\n", This, pProtocolData); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pProtocolData); + + return protocol_continue(&This->base, pProtocolData); } static HRESULT WINAPI GopherProtocol_Abort(IInternetProtocol *iface, HRESULT hrReason, @@ -115,8 +153,11 @@ static HRESULT WINAPI GopherProtocol_Abort(IInternetProtocol *iface, HRESULT hrR static HRESULT WINAPI GopherProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) { GopherProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%08x)\n", This, dwOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%08x)\n", This, dwOptions); + + protocol_close_connection(&This->base); + return S_OK; } static HRESULT WINAPI GopherProtocol_Suspend(IInternetProtocol *iface) @@ -137,8 +178,10 @@ static HRESULT WINAPI GopherProtocol_Read(IInternetProtocol *iface, void *pv, ULONG cb, ULONG *pcbRead) { GopherProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); - return E_NOTIMPL; + + TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + + return protocol_read(&This->base, pv, cb, pcbRead); } static HRESULT WINAPI GopherProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, @@ -152,15 +195,19 @@ static HRESULT WINAPI GopherProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGE static HRESULT WINAPI GopherProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions) { GopherProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%08x)\n", This, dwOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%08x)\n", This, dwOptions); + + return protocol_lock_request(&This->base); } static HRESULT WINAPI GopherProtocol_UnlockRequest(IInternetProtocol *iface) { GopherProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return protocol_unlock_request(&This->base); } #undef PROTOCOL_THIS @@ -241,6 +288,7 @@ HRESULT GopherProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) ret = heap_alloc_zero(sizeof(GopherProtocol)); + ret->base.vtbl = &AsyncProtocolVtbl; ret->lpInternetProtocolVtbl = &GopherProtocolVtbl; ret->lpInternetPriorityVtbl = &GopherPriorityVtbl; ret->ref = 1;

1 0

Jacek Caban : urlmon: Get rid of URLMonikerImpl_BindToStorage_hack.
by Alexandre Julliard 05 Mar '09

05 Mar '09

Module: wine Branch: master Commit: 96a34b586fa843cf4f141a30f297f3b991f50d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a34b586fa843cf4f141a30f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 4 19:08:20 2009 +0100 urlmon: Get rid of URLMonikerImpl_BindToStorage_hack. --- dlls/urlmon/umon.c | 413 +-------------------------------------------- dlls/urlmon/umstream.c | 336 ------------------------------------ dlls/urlmon/urlmon_main.h | 13 -- 3 files changed, 1 insertions(+), 761 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96a34b586fa843cf4f141…

1 0

Jacek Caban : urlmon: Added gopher protocol handler stub implementation.
by Alexandre Julliard 05 Mar '09

05 Mar '09

Module: wine Branch: master Commit: cfb9c099b505ef987f824cb4df8512ec3d483f70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb9c099b505ef987f824cb4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 4 19:06:42 2009 +0100 urlmon: Added gopher protocol handler stub implementation. --- dlls/urlmon/Makefile.in | 1 + dlls/urlmon/gopher.c | 193 ++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/tests/protocol.c | 32 +++++++ dlls/urlmon/urlmon_main.c | 4 + dlls/urlmon/urlmon_main.h | 1 + 5 files changed, 231 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cfb9c099b505ef987f824…

1 0

Jacek Caban : urlmon: Added IInternetPriority implementation for gopher protocol.
by Alexandre Julliard 05 Mar '09

05 Mar '09

Module: wine Branch: master Commit: 44149b8a8c209ebf28a141db23f666caf95a8c80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44149b8a8c209ebf28a141db2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 4 19:07:05 2009 +0100 urlmon: Added IInternetPriority implementation for gopher protocol. --- dlls/urlmon/gopher.c | 58 ++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/tests/protocol.c | 2 + 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/gopher.c b/dlls/urlmon/gopher.c index d34ef5c..6614a6d 100644 --- a/dlls/urlmon/gopher.c +++ b/dlls/urlmon/gopher.c @@ -22,12 +22,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { + Protocol base; + const IInternetProtocolVtbl *lpInternetProtocolVtbl; + const IInternetPriorityVtbl *lpInternetPriorityVtbl; LONG ref; } GopherProtocol; #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) +#define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) #define PROTOCOL_THIS(iface) DEFINE_THIS(GopherProtocol, InternetProtocol, iface) @@ -45,6 +49,9 @@ static HRESULT WINAPI GopherProtocol_QueryInterface(IInternetProtocol *iface, RE }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { TRACE("(%p)->(IID_IInternetProtocol %p)\n", This, ppv); *ppv = PROTOCOL(This); + }else if(IsEqualGUID(&IID_IInternetPriority, riid)) { + TRACE("(%p)->(IID_IInternetPriority %p)\n", This, ppv); + *ppv = PRIORITY(This); } if(*ppv) { @@ -174,6 +181,56 @@ static const IInternetProtocolVtbl GopherProtocolVtbl = { GopherProtocol_UnlockRequest }; +#define PRIORITY_THIS(iface) DEFINE_THIS(GopherProtocol, InternetPriority, iface) + +static HRESULT WINAPI GopherPriority_QueryInterface(IInternetPriority *iface, REFIID riid, void **ppv) +{ + GopherProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_QueryInterface(PROTOCOL(This), riid, ppv); +} + +static ULONG WINAPI GopherPriority_AddRef(IInternetPriority *iface) +{ + GopherProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_AddRef(PROTOCOL(This)); +} + +static ULONG WINAPI GopherPriority_Release(IInternetPriority *iface) +{ + GopherProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_Release(PROTOCOL(This)); +} + +static HRESULT WINAPI GopherPriority_SetPriority(IInternetPriority *iface, LONG nPriority) +{ + GopherProtocol *This = PRIORITY_THIS(iface); + + TRACE("(%p)->(%d)\n", This, nPriority); + + This->base.priority = nPriority; + return S_OK; +} + +static HRESULT WINAPI GopherPriority_GetPriority(IInternetPriority *iface, LONG *pnPriority) +{ + GopherProtocol *This = PRIORITY_THIS(iface); + + TRACE("(%p)->(%p)\n", This, pnPriority); + + *pnPriority = This->base.priority; + return S_OK; +} + +#undef PRIORITY_THIS + +static const IInternetPriorityVtbl GopherPriorityVtbl = { + GopherPriority_QueryInterface, + GopherPriority_AddRef, + GopherPriority_Release, + GopherPriority_SetPriority, + GopherPriority_GetPriority +}; + HRESULT GopherProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) { GopherProtocol *ret; @@ -185,6 +242,7 @@ HRESULT GopherProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) ret = heap_alloc_zero(sizeof(GopherProtocol)); ret->lpInternetProtocolVtbl = &GopherProtocolVtbl; + ret->lpInternetPriorityVtbl = &GopherPriorityVtbl; ret->ref = 1; *ppobj = PROTOCOL(ret); diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 9759df6..c9c42e8 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1872,6 +1872,8 @@ static void test_gopher_protocol(void) IClassFactory_Release(factory); ok(hres == S_OK, "Could not get IInternetProtocol: %08x\n", hres); + test_priority(async_protocol); + IInternetProtocol_Release(async_protocol); }

1 0

Jacek Caban : urlmon: Added ftp protocol tests.
by Alexandre Julliard 05 Mar '09

05 Mar '09

Module: wine Branch: master Commit: aa1d032271494aa9ae0e5fdd43661f9c9036fd38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa1d032271494aa9ae0e5fdd4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 4 19:06:06 2009 +0100 urlmon: Added ftp protocol tests. --- dlls/urlmon/tests/protocol.c | 241 +++++++++++++++++++++++++++++++----------- 1 files changed, 181 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa1d032271494aa9ae0e5…

1 0

Jacek Caban : urlmon: Added ftp binding tests.
by Alexandre Julliard 05 Mar '09

05 Mar '09

Module: wine Branch: master Commit: d9960c34faf2bf1659a8d5d497753db871e5c40e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9960c34faf2bf1659a8d5d49… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 4 19:06:18 2009 +0100 urlmon: Added ftp binding tests. --- dlls/urlmon/tests/url.c | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index e56d0ca..6b57e1f 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -147,6 +147,9 @@ static const WCHAR MK_URL[] = {'m','k',':','@','M','S','I','T','S','t','o','r',' static const WCHAR https_urlW[] = {'h','t','t','p','s',':','/','/','w','w','w','.','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m', '/','t','e','s','t','.','h','t','m','l',0}; +static const WCHAR ftp_urlW[] = {'f','t','p',':','/','/','f','t','p','.','w','i','n','e','h','q','.','o','r','g', + '/','p','u','b','/','o','t','h','e','r','/', + 'w','i','n','e','l','o','g','o','.','x','c','f','.','t','a','r','.','b','z','2',0}; static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; @@ -179,7 +182,8 @@ static LPCWSTR urls[] = { INDEX_HTML, ITS_URL, MK_URL, - https_urlW + https_urlW, + ftp_urlW }; static WCHAR file_url[INTERNET_MAX_URL_LENGTH]; @@ -190,7 +194,8 @@ static enum { FILE_TEST, ITS_TEST, MK_TEST, - HTTPS_TEST + HTTPS_TEST, + FTP_TEST } test_protocol; static enum { @@ -1150,6 +1155,8 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallback *iface, ULONG ulP case BINDSTATUS_FINDINGRESOURCE: if(iface == &objbsc) CHECK_EXPECT(Obj_OnProgress_FINDINGRESOURCE); + else if(test_protocol == FTP_TEST) + todo_wine CHECK_EXPECT(OnProgress_FINDINGRESOURCE); else CHECK_EXPECT(OnProgress_FINDINGRESOURCE); if((bindf & BINDF_ASYNCHRONOUS) && emulate_protocol) @@ -1158,6 +1165,8 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallback *iface, ULONG ulP case BINDSTATUS_CONNECTING: if(iface == &objbsc) CHECK_EXPECT(Obj_OnProgress_CONNECTING); + else if(test_protocol == FTP_TEST) + todo_wine CHECK_EXPECT(OnProgress_CONNECTING); else CHECK_EXPECT(OnProgress_CONNECTING); if((bindf & BINDF_ASYNCHRONOUS) && emulate_protocol) @@ -1166,6 +1175,8 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallback *iface, ULONG ulP case BINDSTATUS_SENDINGREQUEST: if(iface == &objbsc) CHECK_EXPECT(Obj_OnProgress_SENDINGREQUEST); + else if(test_protocol == FTP_TEST) + CHECK_EXPECT2(OnProgress_SENDINGREQUEST); else CHECK_EXPECT(OnProgress_SENDINGREQUEST); if((bindf & BINDF_ASYNCHRONOUS) && emulate_protocol) @@ -2077,7 +2088,8 @@ static void test_BindToStorage(int protocol, BOOL emul, DWORD t) SET_EXPECT(OnProgress_FINDINGRESOURCE); SET_EXPECT(OnProgress_CONNECTING); } - if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == FILE_TEST) + if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == FTP_TEST + || test_protocol == FILE_TEST) SET_EXPECT(OnProgress_SENDINGREQUEST); if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) SET_EXPECT(OnResponse); @@ -2085,7 +2097,7 @@ static void test_BindToStorage(int protocol, BOOL emul, DWORD t) SET_EXPECT(OnProgress_BEGINDOWNLOADDATA); if(test_protocol == FILE_TEST) SET_EXPECT(OnProgress_CACHEFILENAMEAVAILABLE); - if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) + if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == FTP_TEST) SET_EXPECT(OnProgress_DOWNLOADINGDATA); SET_EXPECT(OnProgress_ENDDOWNLOADDATA); if(tymed != TYMED_FILE || test_protocol != ABOUT_TEST) @@ -2161,13 +2173,15 @@ static void test_BindToStorage(int protocol, BOOL emul, DWORD t) } if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == FILE_TEST) CHECK_CALLED(OnProgress_SENDINGREQUEST); + else if(test_protocol == FTP_TEST) + todo_wine CHECK_CALLED(OnProgress_SENDINGREQUEST); if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) CHECK_CALLED(OnResponse); CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); CHECK_CALLED(OnProgress_BEGINDOWNLOADDATA); if(test_protocol == FILE_TEST) CHECK_CALLED(OnProgress_CACHEFILENAMEAVAILABLE); - if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) + if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == FTP_TEST) CLEAR_CALLED(OnProgress_DOWNLOADINGDATA); CHECK_CALLED(OnProgress_ENDDOWNLOADDATA); if(tymed != TYMED_FILE || test_protocol != ABOUT_TEST) @@ -2708,6 +2722,11 @@ START_TEST(url) trace("test URLDownloadToFile for http protocol...\n"); test_URLDownloadToFile(HTTP_TEST, FALSE); + bindf |= BINDF_NOWRITECACHE; + + trace("ftp test...\n"); + test_BindToStorage(FTP_TEST, FALSE, TYMED_ISTREAM); + trace("test failures...\n"); test_BindToStorage_fail(); }

1 0