December 2007 - Wine-commits

Roderick Colenbrander : wined3d: Only store the palette index in the alpha component when the primary render target uses P8 .
by Alexandre Julliard 28 Dec '07

28 Dec '07

Module: wine Branch: master Commit: f3df6cf42b4e705b5e687df08b9f8c3ff8b2d41c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3df6cf42b4e705b5e687df08… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Dec 23 20:51:58 2007 +0100 wined3d: Only store the palette index in the alpha component when the primary render target uses P8. This was already done in other places but I missed this spot. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index df89db9..24cc14d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1931,7 +1931,7 @@ static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4] if (device->render_targets && device->render_targets[0]) { IWineD3DSurfaceImpl* render_target = (IWineD3DSurfaceImpl*)device->render_targets[0]; - if(render_target->resource.usage & WINED3DUSAGE_RENDERTARGET) + if((render_target->resource.usage & WINED3DUSAGE_RENDERTARGET) && (render_target->resource.format == WINED3DFMT_P8)) index_in_alpha = TRUE; }

1 0

Jacek Caban : urlmon: Rename BindProtocol's IInternetProtocolSink methods.
by Alexandre Julliard 28 Dec '07

28 Dec '07

Module: wine Branch: master Commit: 3c985a442ad1ac9b407a4a8e4b195df2b3793961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c985a442ad1ac9b407a4a8e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 28 02:00:53 2007 +0100 urlmon: Rename BindProtocol's IInternetProtocolSink methods. Binding's implementation uses the same names, what makes reading logs harder. --- dlls/urlmon/bindprot.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 05f8f91..f97fc4f 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -399,26 +399,26 @@ static const IInternetPriorityVtbl InternetPriorityVtbl = { #define PROTSINK_THIS(iface) DEFINE_THIS(BindProtocol, InternetProtocolSink, iface) -static HRESULT WINAPI InternetProtocolSink_QueryInterface(IInternetProtocolSink *iface, +static HRESULT WINAPI BPInternetProtocolSink_QueryInterface(IInternetProtocolSink *iface, REFIID riid, void **ppv) { BindProtocol *This = PROTSINK_THIS(iface); return IInternetProtocol_QueryInterface(PROTOCOL(This), riid, ppv); } -static ULONG WINAPI InternetProtocolSink_AddRef(IInternetProtocolSink *iface) +static ULONG WINAPI BPInternetProtocolSink_AddRef(IInternetProtocolSink *iface) { BindProtocol *This = PROTSINK_THIS(iface); return IInternetProtocol_AddRef(PROTOCOL(This)); } -static ULONG WINAPI InternetProtocolSink_Release(IInternetProtocolSink *iface) +static ULONG WINAPI BPInternetProtocolSink_Release(IInternetProtocolSink *iface) { BindProtocol *This = PROTSINK_THIS(iface); return IInternetProtocol_Release(PROTOCOL(This)); } -static HRESULT WINAPI InternetProtocolSink_Switch(IInternetProtocolSink *iface, +static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOLDATA *pProtocolData) { BindProtocol *This = PROTSINK_THIS(iface); @@ -428,7 +428,7 @@ static HRESULT WINAPI InternetProtocolSink_Switch(IInternetProtocolSink *iface, return IInternetProtocolSink_Switch(This->protocol_sink, pProtocolData); } -static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink *iface, +static HRESULT WINAPI BPInternetProtocolSink_ReportProgress(IInternetProtocolSink *iface, ULONG ulStatusCode, LPCWSTR szStatusText) { BindProtocol *This = PROTSINK_THIS(iface); @@ -453,7 +453,7 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink return E_NOTIMPL; } -static HRESULT WINAPI InternetProtocolSink_ReportData(IInternetProtocolSink *iface, +static HRESULT WINAPI BPInternetProtocolSink_ReportData(IInternetProtocolSink *iface, DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax) { BindProtocol *This = PROTSINK_THIS(iface); @@ -463,7 +463,7 @@ static HRESULT WINAPI InternetProtocolSink_ReportData(IInternetProtocolSink *ifa return IInternetProtocolSink_ReportData(This->protocol_sink, grfBSCF, ulProgress, ulProgressMax); } -static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *iface, +static HRESULT WINAPI BPInternetProtocolSink_ReportResult(IInternetProtocolSink *iface, HRESULT hrResult, DWORD dwError, LPCWSTR szResult) { BindProtocol *This = PROTSINK_THIS(iface); @@ -476,13 +476,13 @@ static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *i #undef PROTSINK_THIS static const IInternetProtocolSinkVtbl InternetProtocolSinkVtbl = { - InternetProtocolSink_QueryInterface, - InternetProtocolSink_AddRef, - InternetProtocolSink_Release, - InternetProtocolSink_Switch, - InternetProtocolSink_ReportProgress, - InternetProtocolSink_ReportData, - InternetProtocolSink_ReportResult + BPInternetProtocolSink_QueryInterface, + BPInternetProtocolSink_AddRef, + BPInternetProtocolSink_Release, + BPInternetProtocolSink_Switch, + BPInternetProtocolSink_ReportProgress, + BPInternetProtocolSink_ReportData, + BPInternetProtocolSink_ReportResult }; #define SERVPROV_THIS(iface) DEFINE_THIS(BindProtocol, ServiceProvider, iface)

1 0

Dmitry Timoshkov : user32: Reimplement IsHungAppWindow.
by Alexandre Julliard 28 Dec '07

28 Dec '07

Module: wine Branch: master Commit: e735e199ad52314cf6fd9094cbc626dfb8782ded URL: http://source.winehq.org/git/wine.git/?a=commit;h=e735e199ad52314cf6fd9094c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Dec 28 10:59:13 2007 +0800 user32: Reimplement IsHungAppWindow. --- dlls/user32/message.c | 11 +++++++++-- include/wine/server_protocol.h | 18 +++++++++++++++++- server/protocol.def | 8 ++++++++ server/queue.c | 16 ++++++++++++++++ server/request.h | 2 ++ server/trace.c | 13 +++++++++++++ 6 files changed, 65 insertions(+), 3 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index d3f4a3a..67bf10e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3556,6 +3556,13 @@ BOOL WINAPI GetGUIThreadInfo( DWORD id, GUITHREADINFO *info ) */ BOOL WINAPI IsHungAppWindow( HWND hWnd ) { - DWORD_PTR dwResult; - return !SendMessageTimeoutA(hWnd, WM_NULL, 0, 0, SMTO_ABORTIFHUNG, 5000, &dwResult); + BOOL ret; + + SERVER_START_REQ( is_window_hung ) + { + req->win = hWnd; + ret = !wine_server_call_err( req ) && reply->is_hung; + } + SERVER_END_REQ; + return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index fea45f8..798fda5 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2597,6 +2597,19 @@ struct kill_win_timer_reply +struct is_window_hung_request +{ + struct request_header __header; + user_handle_t win; +}; +struct is_window_hung_reply +{ + struct reply_header __header; + int is_hung; +}; + + + struct get_serial_info_request { struct request_header __header; @@ -4382,6 +4395,7 @@ enum request REQ_get_message_reply, REQ_set_win_timer, REQ_kill_win_timer, + REQ_is_window_hung, REQ_get_serial_info, REQ_set_serial_info, REQ_register_async, @@ -4620,6 +4634,7 @@ union generic_request struct get_message_reply_request get_message_reply_request; struct set_win_timer_request set_win_timer_request; struct kill_win_timer_request kill_win_timer_request; + struct is_window_hung_request is_window_hung_request; struct get_serial_info_request get_serial_info_request; struct set_serial_info_request set_serial_info_request; struct register_async_request register_async_request; @@ -4856,6 +4871,7 @@ union generic_reply struct get_message_reply_reply get_message_reply_reply; struct set_win_timer_reply set_win_timer_reply; struct kill_win_timer_reply kill_win_timer_reply; + struct is_window_hung_reply is_window_hung_reply; struct get_serial_info_reply get_serial_info_reply; struct set_serial_info_reply set_serial_info_reply; struct register_async_reply register_async_reply; @@ -4960,6 +4976,6 @@ union generic_reply struct add_fd_completion_reply add_fd_completion_reply; }; -#define SERVER_PROTOCOL_VERSION 334 +#define SERVER_PROTOCOL_VERSION 335 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index aa10f89..bfd7242 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1925,6 +1925,14 @@ enum message_type @END +/* check if the thread owning the window is hung */ +(a)REQ(is_window_hung) + user_handle_t win; /* window handle */ +(a)REPLY + int is_hung; +(a)END + + /* Retrieve info about a serial port */ @REQ(get_serial_info) obj_handle_t handle; /* handle to comm port */ diff --git a/server/queue.c b/server/queue.c index d837e84..a32bd7e 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1562,6 +1562,22 @@ void post_win_event( struct thread *thread, unsigned int event, } } + +/* check if the thread owning the window is hung */ +DECL_HANDLER(is_window_hung) +{ + struct thread *thread; + + thread = get_window_thread( req->win ); + if (thread) + { + reply->is_hung = is_queue_hung( thread->queue ); + release_object( thread ); + } + else reply->is_hung = 0; +} + + /* get the message queue of the current thread */ DECL_HANDLER(get_msg_queue) { diff --git a/server/request.h b/server/request.h index cc1d3d1..6c5f146 100644 --- a/server/request.h +++ b/server/request.h @@ -239,6 +239,7 @@ DECL_HANDLER(accept_hardware_message); DECL_HANDLER(get_message_reply); DECL_HANDLER(set_win_timer); DECL_HANDLER(kill_win_timer); +DECL_HANDLER(is_window_hung); DECL_HANDLER(get_serial_info); DECL_HANDLER(set_serial_info); DECL_HANDLER(register_async); @@ -476,6 +477,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_get_message_reply, (req_handler)req_set_win_timer, (req_handler)req_kill_win_timer, + (req_handler)req_is_window_hung, (req_handler)req_get_serial_info, (req_handler)req_set_serial_info, (req_handler)req_register_async, diff --git a/server/trace.c b/server/trace.c index 4bcd545..47e059e 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2412,6 +2412,16 @@ static void dump_kill_win_timer_request( const struct kill_win_timer_request *re fprintf( stderr, " id=%lx", req->id ); } +static void dump_is_window_hung_request( const struct is_window_hung_request *req ) +{ + fprintf( stderr, " win=%p", req->win ); +} + +static void dump_is_window_hung_reply( const struct is_window_hung_reply *req ) +{ + fprintf( stderr, " is_hung=%d", req->is_hung ); +} + static void dump_get_serial_info_request( const struct get_serial_info_request *req ) { fprintf( stderr, " handle=%p", req->handle ); @@ -3878,6 +3888,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_message_reply_request, (dump_func)dump_set_win_timer_request, (dump_func)dump_kill_win_timer_request, + (dump_func)dump_is_window_hung_request, (dump_func)dump_get_serial_info_request, (dump_func)dump_set_serial_info_request, (dump_func)dump_register_async_request, @@ -4112,6 +4123,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_message_reply_reply, (dump_func)dump_set_win_timer_reply, (dump_func)0, + (dump_func)dump_is_window_hung_reply, (dump_func)dump_get_serial_info_reply, (dump_func)0, (dump_func)0, @@ -4346,6 +4358,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "get_message_reply", "set_win_timer", "kill_win_timer", + "is_window_hung", "get_serial_info", "set_serial_info", "register_async",

1 0

Roderick Colenbrander : wined3d: In case of GL_EXT_paletted_textures we use GL_COLOR_INDEX and don' t need a GL_RED fixup.
by Alexandre Julliard 28 Dec '07

28 Dec '07

Module: wine Branch: master Commit: 756cb66e78bd402b385d2babca495609ac318960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=756cb66e78bd402b385d2babc… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Dec 23 20:47:15 2007 +0100 wined3d: In case of GL_EXT_paletted_textures we use GL_COLOR_INDEX and don't need a GL_RED fixup. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f9df55e..df89db9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1402,7 +1402,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ *convert = CONVERT_PALETTED; } } - else if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { + else if(!GL_SUPPORT(EXT_PALETTED_TEXTURE) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { *format = GL_RED; *internal = GL_RGBA; *type = GL_UNSIGNED_BYTE;

1 0

Jacek Caban : urlmon: Added [Un]RegisterMimeFilter implementation.
by Alexandre Julliard 28 Dec '07

28 Dec '07

Module: wine Branch: master Commit: 8a669c9a1905c33af6dacd7ce116d024a3072a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a669c9a1905c33af6dacd7ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 28 02:00:10 2007 +0100 urlmon: Added [Un]RegisterMimeFilter implementation. --- dlls/urlmon/session.c | 53 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index f5a644f..a63509c 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -31,7 +31,16 @@ typedef struct name_space { struct name_space *next; } name_space; +typedef struct mime_filter { + IClassFactory *cf; + CLSID clsid; + LPWSTR mime; + + struct mime_filter *next; +} mime_filter; + static name_space *name_space_list = NULL; +static mime_filter *mime_filter_list = NULL; static name_space *find_name_space(LPCWSTR protocol) { @@ -200,8 +209,8 @@ static HRESULT WINAPI InternetSession_RegisterNameSpace(IInternetSession *iface, IClassFactory_AddRef(pCF); new_name_space->cf = pCF; - new_name_space->protocol = heap_strdupW(pwzProtocol); new_name_space->clsid = *rclsid; + new_name_space->protocol = heap_strdupW(pwzProtocol); new_name_space->next = name_space_list; name_space_list = new_name_space; @@ -242,15 +251,49 @@ static HRESULT WINAPI InternetSession_UnregisterNameSpace(IInternetSession *ifac static HRESULT WINAPI InternetSession_RegisterMimeFilter(IInternetSession *iface, IClassFactory *pCF, REFCLSID rclsid, LPCWSTR pwzType) { - FIXME("(%p %s %s)\n", pCF, debugstr_guid(rclsid), debugstr_w(pwzType)); - return E_NOTIMPL; + mime_filter *filter; + + TRACE("(%p %s %s)\n", pCF, debugstr_guid(rclsid), debugstr_w(pwzType)); + + filter = heap_alloc(sizeof(mime_filter)); + + IClassFactory_AddRef(pCF); + filter->cf = pCF; + filter->clsid = *rclsid; + filter->mime = heap_strdupW(pwzType); + + filter->next = mime_filter_list; + mime_filter_list = filter; + + return S_OK; } static HRESULT WINAPI InternetSession_UnregisterMimeFilter(IInternetSession *iface, IClassFactory *pCF, LPCWSTR pwzType) { - FIXME("(%p %s)\n", pCF, debugstr_w(pwzType)); - return E_NOTIMPL; + mime_filter *iter, *prev = NULL; + + TRACE("(%p %s)\n", pCF, debugstr_w(pwzType)); + + for(iter = mime_filter_list; iter; iter = iter->next) { + if(iter->cf == pCF && !strcmpW(iter->mime, pwzType)) + break; + prev = iter; + } + + if(!iter) + return S_OK; + + if(prev) + prev->next = iter->next; + else + mime_filter_list = iter->next; + + IClassFactory_Release(iter->cf); + heap_free(iter->mime); + heap_free(iter); + + return S_OK; } static HRESULT WINAPI InternetSession_CreateBinding(IInternetSession *iface,

1 0

Jacek Caban : urlmon: Added mime filters tests.
by Alexandre Julliard 28 Dec '07

28 Dec '07

Module: wine Branch: master Commit: f4ded1c2a5712922e5f08dc8b2ac2e5d88208344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4ded1c2a5712922e5f08dc8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 28 02:00:24 2007 +0100 urlmon: Added mime filters tests. --- dlls/urlmon/tests/misc.c | 48 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 76b257b..ba36d8a 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -935,6 +935,13 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **ppv) { + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProtocolCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppv) +{ CHECK_EXPECT(CreateInstance); ok(iface == expect_cf, "unexpected iface\n"); @@ -960,8 +967,17 @@ static const IClassFactoryVtbl ClassFactoryVtbl = { ClassFactory_LockServer }; -static IClassFactory test_protocol_cf = { &ClassFactoryVtbl }; -static IClassFactory test_protocol_cf2 = { &ClassFactoryVtbl }; +static const IClassFactoryVtbl ProtocolCFVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ProtocolCF_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory test_protocol_cf = { &ProtocolCFVtbl }; +static IClassFactory test_protocol_cf2 = { &ProtocolCFVtbl }; +static IClassFactory test_cf = { &ClassFactoryVtbl }; static void test_NameSpace(void) { @@ -1089,6 +1105,33 @@ static void test_NameSpace(void) IInternetSession_Release(session); } +static void test_MimeFilter(void) +{ + IInternetSession *session; + HRESULT hres; + + static const WCHAR mimeW[] = {'t','e','s','t','/','m','i','m','e',0}; + + hres = CoInternetGetSession(0, &session, 0); + ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IInternetSession_RegisterMimeFilter(session, &test_cf, &IID_NULL, mimeW); + ok(hres == S_OK, "RegisterMimeFilter failed: %08x\n", hres); + + hres = IInternetSession_UnregisterMimeFilter(session, &test_cf, mimeW); + ok(hres == S_OK, "UnregisterMimeFilter failed: %08x\n", hres); + + hres = IInternetSession_UnregisterMimeFilter(session, &test_cf, mimeW); + ok(hres == S_OK, "UnregisterMimeFilter failed: %08x\n", hres); + + hres = IInternetSession_UnregisterMimeFilter(session, (void*)0xdeadbeef, mimeW); + ok(hres == S_OK, "UnregisterMimeFilter failed: %08x\n", hres); + + IInternetSession_Release(session); +} + static ULONG WINAPI unk_Release(IUnknown *iface) { CHECK_EXPECT(unk_Release); @@ -1243,6 +1286,7 @@ START_TEST(misc) test_SecurityManager(); test_ZoneManager(); test_NameSpace(); + test_MimeFilter(); test_ReleaseBindInfo(); test_UrlMkGetSessionOption(); test_ObtainUserAgentString();

1 0

Jacek Caban : urlmon: Use heap_alloc_zero to allocate BindProtocol.
by Alexandre Julliard 28 Dec '07

28 Dec '07

Module: wine Branch: master Commit: 8f095223573b5674149bf1817eb455bcc0c42284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f095223573b5674149bf1817… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 28 02:00:37 2007 +0100 urlmon: Use heap_alloc_zero to allocate BindProtocol. --- dlls/urlmon/bindprot.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index a41575c..05f8f91 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -530,7 +530,7 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { HRESULT create_binding_protocol(LPCWSTR url, IInternetProtocol **protocol) { - BindProtocol *ret = heap_alloc(sizeof(BindProtocol)); + BindProtocol *ret = heap_alloc_zero(sizeof(BindProtocol)); ret->lpInternetProtocolVtbl = &BindProtocolVtbl; ret->lpInternetBindInfoVtbl = &InternetBindInfoVtbl; @@ -539,11 +539,6 @@ HRESULT create_binding_protocol(LPCWSTR url, IInternetProtocol **protocol) ret->lpInternetProtocolSinkVtbl = &InternetProtocolSinkVtbl; ret->ref = 1; - ret->protocol = NULL; - ret->bind_info = NULL; - ret->protocol_sink = NULL; - ret->service_provider = NULL; - ret->priority = 0; URLMON_LockModule();

1 0

Jacek Caban : mshtml: Added AboutProtocolInfo::QueryInfo implementation.
by Alexandre Julliard 28 Dec '07

28 Dec '07

Module: wine Branch: master Commit: 8a87ea5b6ae11b184b16d1c67ec60c4e4d4f0c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a87ea5b6ae11b184b16d1c67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 28 01:58:41 2007 +0100 mshtml: Added AboutProtocolInfo::QueryInfo implementation. --- dlls/mshtml/protocol.c | 42 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index e70e78e..ba70d74 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -251,6 +251,8 @@ static HRESULT WINAPI AboutProtocol_Start(IInternetProtocol *iface, LPCWSTR szUr IInternetBindInfo_GetBindInfo(pOIBindInfo, &grfBINDF, &bindinfo); ReleaseBindInfo(&bindinfo); + TRACE("bindf %x\n", grfBINDF); + if(strlenW(szUrl)>=sizeof(wszAbout)/sizeof(WCHAR) && !memcmp(wszAbout, szUrl, sizeof(wszAbout))) { text = szUrl + sizeof(wszAbout)/sizeof(WCHAR); if(!strcmpW(wszBlank, text)) @@ -449,9 +451,43 @@ static HRESULT WINAPI AboutProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, QUERYOPTION QueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD* pcbBuf, DWORD dwReserved) { - FIXME("%p)->(%s %08x %08x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer, - cbBuffer, pcbBuf, dwReserved); - return E_NOTIMPL; + TRACE("%p)->(%s %08x %08x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer, + cbBuffer, pcbBuf, dwReserved); + + switch(QueryOption) { + case QUERY_CAN_NAVIGATE: + return INET_E_USE_DEFAULT_PROTOCOLHANDLER; + + case QUERY_USES_NETWORK: + if(!pBuffer || cbBuffer < sizeof(DWORD)) + return E_FAIL; + + *(DWORD*)pBuffer = 0; + if(pcbBuf) + *pcbBuf = sizeof(DWORD); + + break; + + case QUERY_IS_CACHED: + FIXME("Unsupported option QUERY_IS_CACHED\n"); + return E_NOTIMPL; + case QUERY_IS_INSTALLEDENTRY: + FIXME("Unsupported option QUERY_IS_INSTALLEDENTRY\n"); + return E_NOTIMPL; + case QUERY_IS_CACHED_OR_MAPPED: + FIXME("Unsupported option QUERY_IS_CACHED_OR_MAPPED\n"); + return E_NOTIMPL; + case QUERY_IS_SECURE: + FIXME("Unsupported option QUERY_IS_SECURE\n"); + return E_NOTIMPL; + case QUERY_IS_SAFE: + FIXME("Unsupported option QUERY_IS_SAFE\n"); + return E_NOTIMPL; + default: + return E_FAIL; + } + + return S_OK; } static const IInternetProtocolInfoVtbl AboutProtocolInfoVtbl = {

1 0

Jacek Caban : mshtml: Added ResProtocolInfo::QueryInfo implementation.
by Alexandre Julliard 28 Dec '07

28 Dec '07

Module: wine Branch: master Commit: e93353b2b5a49791aad1f205c8594021c6f839ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=e93353b2b5a49791aad1f205c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 28 01:58:53 2007 +0100 mshtml: Added ResProtocolInfo::QueryInfo implementation. --- dlls/mshtml/protocol.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index ba70d74..f702870 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -880,9 +880,30 @@ static HRESULT WINAPI ResProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, LP QUERYOPTION QueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD* pcbBuf, DWORD dwReserved) { - FIXME("%p)->(%s %08x %08x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer, - cbBuffer, pcbBuf, dwReserved); - return E_NOTIMPL; + TRACE("%p)->(%s %08x %08x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer, + cbBuffer, pcbBuf, dwReserved); + + switch(QueryOption) { + case QUERY_USES_NETWORK: + if(!pBuffer || cbBuffer < sizeof(DWORD)) + return E_FAIL; + + *(DWORD*)pBuffer = 0; + if(pcbBuf) + *pcbBuf = sizeof(DWORD); + break; + + case QUERY_IS_SECURE: + FIXME("not supporte QUERY_IS_SECURE\n"); + return E_NOTIMPL; + case QUERY_IS_SAFE: + FIXME("not supporte QUERY_IS_SAFE\n"); + return E_NOTIMPL; + default: + return INET_E_USE_DEFAULT_PROTOCOLHANDLER; + } + + return S_OK; } static const IInternetProtocolInfoVtbl ResProtocolInfoVtbl = {

1 0

Jacek Caban : mshtml: Added QueryInfo tests.
by Alexandre Julliard 28 Dec '07

28 Dec '07

Module: wine Branch: master Commit: c19fb7f011cf94153fb04d77ef0fc3f46e8ad9dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19fb7f011cf94153fb04d77e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 28 01:59:06 2007 +0100 mshtml: Added QueryInfo tests. --- dlls/mshtml/tests/protocol.c | 106 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 0164a52..2e9d6e9 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -367,6 +367,52 @@ static void test_res_protocol(void) hres = IInternetProtocolInfo_CompareUrl(protocol_info, NULL, NULL, 0xdeadbeef); ok(hres == E_NOTIMPL, "CompareUrl failed: %08x\n", hres); + for(i=0; i<30; i++) { + if(i == QUERY_USES_NETWORK || i == QUERY_IS_SECURE || i == QUERY_IS_SAFE) + continue; + + hres = IInternetProtocolInfo_QueryInfo(protocol_info, blank_url, i, 0, + buf, sizeof(buf), &size, 0); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, + "QueryInfo(%d) returned: %08x, expected INET_E_USE_DEFAULT_PROTOCOLHANDLER\n", i, hres); + } + + size = 0xdeadbeef; + memset(buf, '?', sizeof(buf)); + hres = IInternetProtocolInfo_QueryInfo(protocol_info, blank_url, QUERY_USES_NETWORK, 0, + buf, sizeof(buf), &size, 0); + ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08x\n", hres); + ok(size == sizeof(DWORD), "size=%d\n", size); + ok(!*(DWORD*)buf, "buf=%d\n", *(DWORD*)buf); + + memset(buf, '?', sizeof(buf)); + hres = IInternetProtocolInfo_QueryInfo(protocol_info, blank_url, QUERY_USES_NETWORK, 0, + buf, sizeof(buf), NULL, 0); + ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08x\n", hres); + ok(!*(DWORD*)buf, "buf=%d\n", *(DWORD*)buf); + + hres = IInternetProtocolInfo_QueryInfo(protocol_info, blank_url, QUERY_USES_NETWORK, 0, + buf, 3, &size, 0); + ok(hres == E_FAIL, "QueryInfo(QUERY_USES_NETWORK) failed: %08x, expected E_FAIL\n", hres); + + size = 0xdeadbeef; + memset(buf, '?', sizeof(buf)); + hres = IInternetProtocolInfo_QueryInfo(protocol_info, NULL, QUERY_USES_NETWORK, 0, + buf, sizeof(buf), &size, 0); + ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08x, expected E_FAIL\n", hres); + ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08x\n", hres); + ok(size == sizeof(DWORD), "size=%d\n", size); + ok(!*(DWORD*)buf, "buf=%d\n", *(DWORD*)buf); + + hres = IInternetProtocolInfo_QueryInfo(protocol_info, blank_url, QUERY_USES_NETWORK, 0, + NULL, sizeof(buf), &size, 0); + ok(hres == E_FAIL, "QueryInfo(QUERY_USES_NETWORK) failed: %08x, expected E_FAIL\n", hres); + + hres = IInternetProtocolInfo_QueryInfo(protocol_info, blank_url, 60, 0, + NULL, sizeof(buf), &size, 0); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, + "QueryInfo failed: %08x, expected INET_E_USE_DEFAULT_PROTOCOLHANDLER\n", hres); + IInternetProtocolInfo_Release(protocol_info); } @@ -380,6 +426,12 @@ static void test_res_protocol(void) ok(hres == S_OK, "Could not get IInternetProtocol: %08x\n", hres); if(SUCCEEDED(hres)) { + IInternetPriority *priority; + + hres = IInternetProtocol_QueryInterface(protocol, &IID_IInternetPriority, (void**)&priority); + ok(hres == E_NOINTERFACE, + "QueryInterface(IInternetPriority) returned %08x, expected E_NOINTEFACE\n", hres); + test_protocol_fail(protocol, wrong_url1, E_INVALIDARG, FALSE); test_protocol_fail(protocol, wrong_url2, HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), FALSE); @@ -560,6 +612,54 @@ static void test_about_protocol(void) hres = IInternetProtocolInfo_CompareUrl(protocol_info, NULL, NULL, 0xdeadbeef); ok(hres == E_NOTIMPL, "CompareUrl failed: %08x\n", hres); + for(i=0; i<30; i++) { + switch(i) { + case QUERY_CAN_NAVIGATE: + case QUERY_USES_NETWORK: + case QUERY_IS_CACHED: + case QUERY_IS_INSTALLEDENTRY: + case QUERY_IS_CACHED_OR_MAPPED: + case QUERY_IS_SECURE: + case QUERY_IS_SAFE: + break; + default: + hres = IInternetProtocolInfo_QueryInfo(protocol_info, blank_url, i, 0, + buf, sizeof(buf), &size, 0); + ok(hres == E_FAIL, "QueryInfo(%d) returned: %08x, expected E_FAIL\n", i, hres); + } + } + + hres = IInternetProtocolInfo_QueryInfo(protocol_info, blank_url, QUERY_CAN_NAVIGATE, 0, + buf, sizeof(buf), &size, 0); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, + "QueryInfo returned: %08x, expected INET_E_USE_DEFAULT_PROTOCOLHANDLER\n", hres); + + size = 0xdeadbeef; + memset(buf, '?', sizeof(buf)); + hres = IInternetProtocolInfo_QueryInfo(protocol_info, blank_url, QUERY_USES_NETWORK, 0, + buf, sizeof(buf), &size, 0); + ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08x\n", hres); + ok(size == sizeof(DWORD), "size=%d\n", size); + ok(!*(DWORD*)buf, "buf=%d\n", *(DWORD*)buf); + + memset(buf, '?', sizeof(buf)); + hres = IInternetProtocolInfo_QueryInfo(protocol_info, blank_url, QUERY_USES_NETWORK, 0, + buf, sizeof(buf), NULL, 0); + ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08x\n", hres); + ok(!*(DWORD*)buf, "buf=%d\n", *(DWORD*)buf); + + hres = IInternetProtocolInfo_QueryInfo(protocol_info, blank_url, QUERY_USES_NETWORK, 0, + buf, 3, &size, 0); + ok(hres == E_FAIL, "QueryInfo(QUERY_USES_NETWORK) failed: %08x, expected E_FAIL\n", hres); + + hres = IInternetProtocolInfo_QueryInfo(protocol_info, blank_url, QUERY_USES_NETWORK, 0, + NULL, sizeof(buf), &size, 0); + ok(hres == E_FAIL, "QueryInfo(QUERY_USES_NETWORK) failed: %08x, expected E_FAIL\n", hres); + + hres = IInternetProtocolInfo_QueryInfo(protocol_info, blank_url, 60, 0, + NULL, sizeof(buf), &size, 0); + ok(hres == E_FAIL, "QueryInfo failed: %08x, expected E_FAIL\n", hres); + IInternetProtocolInfo_Release(protocol_info); } @@ -573,6 +673,12 @@ static void test_about_protocol(void) ok(hres == S_OK, "Could not get IInternetProtocol: %08x\n", hres); if(SUCCEEDED(hres)) { + IInternetPriority *priority; + + hres = IInternetProtocol_QueryInterface(protocol, &IID_IInternetPriority, (void**)&priority); + ok(hres == E_NOINTERFACE, + "QueryInterface(IInternetPriority) returned %08x, expected E_NOINTEFACE\n", hres); + protocol_start(protocol, blank_url); hres = IInternetProtocol_LockRequest(protocol, 0); ok(hres == S_OK, "LockRequest failed: %08x\n", hres);

1 0