September 2012 - Wine-Commits

Dan Kegel : msvcr100: Add wmemmove_s and wmemcpy_s.
by Alexandre Julliard Sept. 3, 2012

Sept. 3, 2012

Module: wine Branch: master Commit: 481a8036ea8193743a7f8c87b3d1a667917093fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=481a8036ea8193743a7f8c87b… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Aug 31 08:00:24 2012 -0700 msvcr100: Add wmemmove_s and wmemcpy_s. --- configure | 1 + configure.ac | 1 + dlls/msvcr100/msvcr100.c | 55 +++++++++ dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr100/tests/Makefile.in | 9 ++ dlls/msvcr100/tests/msvcr100.c | 257 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 325 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=481a8036ea8193743a7f8…

1 0

Rico Schüller : d3dx9: Don' t use memcpy in ID3DXConstantTable::GetDesc().
by Alexandre Julliard Sept. 3, 2012

Sept. 3, 2012

Module: wine Branch: master Commit: 792cd67bf194ae8797566c87528288a3de95c63a URL: http://source.winehq.org/git/wine.git/?a=commit;h=792cd67bf194ae8797566c875… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Sep 3 09:57:49 2012 +0200 d3dx9: Don't use memcpy in ID3DXConstantTable::GetDesc(). --- dlls/d3dx9_36/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 33b86f6..766b897 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -914,7 +914,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetDesc(ID3DXConstantTable *iface, if (!desc) return D3DERR_INVALIDCALL; - memcpy(desc, &This->desc, sizeof(This->desc)); + *desc = This->desc; return D3D_OK; }

1 0

Michael Stefaniuc : include/windowsx.h: Avoid a TRUE: FALSE conditional expression.
by Alexandre Julliard Sept. 3, 2012

Sept. 3, 2012

Module: wine Branch: master Commit: c21000ea81a63d4ed7c4810dc12d2bccd72edada URL: http://source.winehq.org/git/wine.git/?a=commit;h=c21000ea81a63d4ed7c4810dc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 3 10:41:28 2012 +0200 include/windowsx.h: Avoid a TRUE:FALSE conditional expression. --- include/windowsx.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/windowsx.h b/include/windowsx.h index 2920229..0f84622 100644 --- a/include/windowsx.h +++ b/include/windowsx.h @@ -232,7 +232,7 @@ extern "C" { ((UINT)SendMessage((hwndCtl), BM_SETSTATE, (WPARAM)(int)(state), 0L)) #define Button_SetStyle(hwndCtl, style, fRedraw) \ - ((void)SendMessage((hwndCtl), BM_SETSTYLE, (WPARAM)LOWORD(style), MAKELPARAM(((fRedraw) ? TRUE : FALSE), 0))) + ((void)SendMessage((hwndCtl), BM_SETSTYLE, (WPARAM)LOWORD(style), MAKELPARAM((fRedraw) != 0, 0))) #define Button_SetText(hwndCtl, lpsz) \ SetWindowText((hwndCtl), (lpsz))

1 0

Jacek Caban : urlmon: Avoid direct notifications from callbacks from Read call.
by Alexandre Julliard Sept. 3, 2012

Sept. 3, 2012

Module: wine Branch: master Commit: 719ab21d751558811c66f050f9c5151c474452a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=719ab21d751558811c66f050f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 3 13:58:55 2012 +0200 urlmon: Avoid direct notifications from callbacks from Read call. --- dlls/urlmon/bindprot.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 48c9130..60912a4 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -171,9 +171,14 @@ static void push_task(BindProtocol *This, task_header_t *task, task_proc_t proc) } } +static inline BOOL is_apartment_thread(BindProtocol *This) +{ + return This->apartment_thread == GetCurrentThreadId(); +} + static inline BOOL do_direct_notif(BindProtocol *This) { - return !(This->pi & PI_APARTMENTTHREADED) || (This->apartment_thread == GetCurrentThreadId() && !This->continue_call); + return !(This->pi & PI_APARTMENTTHREADED) || (is_apartment_thread(This) && !This->continue_call); } static HRESULT handle_mime_filter(BindProtocol *This, IInternetProtocol *mime_filter) @@ -735,7 +740,11 @@ static HRESULT WINAPI ProtocolHandler_Read(IInternetProtocol *iface, void *pv, if(read < cb) { ULONG cread = 0; + if(is_apartment_thread(This)) + This->continue_call++; hres = IInternetProtocol_Read(This->protocol, (BYTE*)pv+read, cb-read, &cread); + if(is_apartment_thread(This)) + This->continue_call--; read += cread; }

1 0

Jacek Caban : jscript: Fixed argument conversion in disp_call_value when ' this' is specified.
by Alexandre Julliard Sept. 3, 2012

Sept. 3, 2012

Module: wine Branch: master Commit: 7fec767864f89f60e68b3d08654d269d286c4ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fec767864f89f60e68b3d086… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 3 15:47:14 2012 +0200 jscript: Fixed argument conversion in disp_call_value when 'this' is specified. --- dlls/jscript/dispex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 501ce4a..3e28c90 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1170,7 +1170,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W } for(i=0; i<argc; i++) - dp.rgvarg[argc-i-1] = argv[i]; + dp.rgvarg[dp.cArgs-i-1] = argv[i]; if(jsthis) { V_VT(dp.rgvarg) = VT_DISPATCH; V_DISPATCH(dp.rgvarg) = jsthis;

1 0

Rico Schüller : d3dx9: Remove FormatType typedef.
by Alexandre Julliard Sept. 3, 2012

Sept. 3, 2012

Module: wine Branch: master Commit: 587468dc6d48d5446b7b228834077ca42984f0c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587468dc6d48d5446b7b22883… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Sep 3 09:57:45 2012 +0200 d3dx9: Remove FormatType typedef. --- dlls/d3dx9_36/d3dx9_36_private.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index a5b3070..f6f797e 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -45,10 +45,10 @@ struct volume }; /* for internal use */ -typedef enum _FormatType { +enum format_type { FORMAT_ARGB, /* unsigned */ FORMAT_UNKNOWN -} FormatType; +}; struct pixel_format_desc { D3DFORMAT format; @@ -58,7 +58,7 @@ struct pixel_format_desc { UINT block_width; UINT block_height; UINT block_byte_count; - FormatType type; + enum format_type type; void (*from_rgba)(const struct vec4 *src, struct vec4 *dst); void (*to_rgba)(const struct vec4 *src, struct vec4 *dst); };

1 0

Jacek Caban : urlmon: Added better debug traces for BINDSTATUS values.
by Alexandre Julliard Sept. 3, 2012

Sept. 3, 2012

Module: wine Branch: master Commit: 3636a2527946e0a85d288ffbe0950092e2f6ba07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3636a2527946e0a85d288ffbe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 3 13:58:18 2012 +0200 urlmon: Added better debug traces for BINDSTATUS values. --- dlls/urlmon/bindctx.c | 2 +- dlls/urlmon/binding.c | 3 +- dlls/urlmon/bindprot.c | 2 +- dlls/urlmon/urlmon_main.c | 61 +++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon_main.h | 2 + 5 files changed, 67 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 9ddf96a..79260ef 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -158,7 +158,7 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallbackEx *iface { BindStatusCallback *This = impl_from_IBindStatusCallbackEx(iface); - TRACE("%p)->(%u %u %u %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, + TRACE("%p)->(%u %u %s %s)\n", This, ulProgress, ulProgressMax, debugstr_bindstatus(ulStatusCode), debugstr_w(szStatusText)); return IBindStatusCallback_OnProgress(This->callback, ulProgress, diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 4988cea..3cb49f1 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -980,7 +980,7 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink { Binding *This = impl_from_IInternetProtocolSink(iface); - TRACE("(%p)->(%u %s)\n", This, ulStatusCode, debugstr_w(szStatusText)); + TRACE("(%p)->(%s %s)\n", This, debugstr_bindstatus(ulStatusCode), debugstr_w(szStatusText)); switch(ulStatusCode) { case BINDSTATUS_FINDINGRESOURCE: @@ -1133,6 +1133,7 @@ static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *i TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); stop_binding(This, hrResult, szResult); + IInternetProtocolEx_Terminate(&This->protocol->IInternetProtocolEx_iface, 0); return S_OK; } diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 043ff85..603002d 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -822,7 +822,7 @@ static HRESULT WINAPI ProtocolSinkHandler_ReportProgress(IInternetProtocolSink * { BindProtocol *This = impl_from_IInternetProtocolSinkHandler(iface); - TRACE("(%p)->(%u %s)\n", This, status_code, debugstr_w(status_text)); + TRACE("(%p)->(%s %s)\n", This, debugstr_bindstatus(status_code), debugstr_w(status_text)); if(!This->protocol_sink) return S_OK; diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index f2abe13..7fb2090 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -166,6 +166,67 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) return TRUE; } +const char *debugstr_bindstatus(ULONG status) +{ + switch(status) { +#define X(x) case x: return #x; break + X(BINDSTATUS_FINDINGRESOURCE); + X(BINDSTATUS_CONNECTING); + X(BINDSTATUS_REDIRECTING); + X(BINDSTATUS_BEGINDOWNLOADDATA); + X(BINDSTATUS_DOWNLOADINGDATA); + X(BINDSTATUS_ENDDOWNLOADDATA); + X(BINDSTATUS_BEGINDOWNLOADCOMPONENTS); + X(BINDSTATUS_INSTALLINGCOMPONENTS); + X(BINDSTATUS_ENDDOWNLOADCOMPONENTS); + X(BINDSTATUS_USINGCACHEDCOPY); + X(BINDSTATUS_SENDINGREQUEST); + X(BINDSTATUS_CLASSIDAVAILABLE); + X(BINDSTATUS_MIMETYPEAVAILABLE); + X(BINDSTATUS_CACHEFILENAMEAVAILABLE); + X(BINDSTATUS_BEGINSYNCOPERATION); + X(BINDSTATUS_ENDSYNCOPERATION); + X(BINDSTATUS_BEGINUPLOADDATA); + X(BINDSTATUS_UPLOADINGDATA); + X(BINDSTATUS_ENDUPLOADINGDATA); + X(BINDSTATUS_PROTOCOLCLASSID); + X(BINDSTATUS_ENCODING); + X(BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE); + X(BINDSTATUS_CLASSINSTALLLOCATION); + X(BINDSTATUS_DECODING); + X(BINDSTATUS_LOADINGMIMEHANDLER); + X(BINDSTATUS_CONTENTDISPOSITIONATTACH); + X(BINDSTATUS_FILTERREPORTMIMETYPE); + X(BINDSTATUS_CLSIDCANINSTANTIATE); + X(BINDSTATUS_IUNKNOWNAVAILABLE); + X(BINDSTATUS_DIRECTBIND); + X(BINDSTATUS_RAWMIMETYPE); + X(BINDSTATUS_PROXYDETECTING); + X(BINDSTATUS_ACCEPTRANGES); + X(BINDSTATUS_COOKIE_SENT); + X(BINDSTATUS_COMPACT_POLICY_RECEIVED); + X(BINDSTATUS_COOKIE_SUPPRESSED); + X(BINDSTATUS_COOKIE_STATE_UNKNOWN); + X(BINDSTATUS_COOKIE_STATE_ACCEPT); + X(BINDSTATUS_COOKIE_STATE_REJECT); + X(BINDSTATUS_COOKIE_STATE_PROMPT); + X(BINDSTATUS_COOKIE_STATE_LEASH); + X(BINDSTATUS_COOKIE_STATE_DOWNGRADE); + X(BINDSTATUS_POLICY_HREF); + X(BINDSTATUS_P3P_HEADER); + X(BINDSTATUS_SESSION_COOKIE_RECEIVED); + X(BINDSTATUS_PERSISTENT_COOKIE_RECEIVED); + X(BINDSTATUS_SESSION_COOKIES_ALLOWED); + X(BINDSTATUS_CACHECONTROL); + X(BINDSTATUS_CONTENTDISPOSITIONFILENAME); + X(BINDSTATUS_MIMETEXTPLAINMISMATCH); + X(BINDSTATUS_PUBLISHERAVAILABLE); + X(BINDSTATUS_DISPLAYNAMEAVAILABLE); +#undef X + default: + return wine_dbg_sprintf("(invalid status %u)", status); + } +} /*********************************************************************** * DllInstall (URLMON.@) diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 4231307..7260e94 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -221,6 +221,8 @@ tls_data_t *get_tls_data(void) DECLSPEC_HIDDEN; HWND get_notif_hwnd(void) DECLSPEC_HIDDEN; void release_notif_hwnd(HWND) DECLSPEC_HIDDEN; +const char *debugstr_bindstatus(ULONG) DECLSPEC_HIDDEN; + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len);

1 0

Rico Schüller : d3dx9: Remove PixelFormatDesc typedef.
by Alexandre Julliard Sept. 3, 2012

Sept. 3, 2012

Module: wine Branch: master Commit: 8da881161544f5ab717ce5cdce90930c8bd9a7e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8da881161544f5ab717ce5cdc… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Sep 3 09:57:41 2012 +0200 d3dx9: Remove PixelFormatDesc typedef. --- dlls/d3dx9_36/d3dx9_36_private.h | 16 ++++++++-------- dlls/d3dx9_36/surface.c | 32 +++++++++++++++++--------------- dlls/d3dx9_36/texture.c | 10 +++++----- dlls/d3dx9_36/util.c | 7 +++---- dlls/d3dx9_36/volume.c | 2 +- 5 files changed, 34 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8da881161544f5ab717ce…

1 0

Jacek Caban : urlmon: Process pending tasks before exiting Start function.
by Alexandre Julliard Sept. 3, 2012

Sept. 3, 2012

Module: wine Branch: master Commit: 8bf9d8e90d870bc7a3b994864e409554bf4db01e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bf9d8e90d870bc7a3b994864… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 3 13:58:30 2012 +0200 urlmon: Process pending tasks before exiting Start function. --- dlls/urlmon/bindprot.c | 48 ++++++++++++++++++++++++++++-------------------- 1 files changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 603002d..48c9130 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -34,32 +34,38 @@ struct _task_header_t { #define WM_MK_CONTINUE (WM_USER+101) #define WM_MK_RELEASE (WM_USER+102) -static LRESULT WINAPI notif_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +static void process_tasks(BindProtocol *This) { - switch(msg) { - case WM_MK_CONTINUE: { - BindProtocol *This = (BindProtocol*)lParam; - task_header_t *task; + task_header_t *task; - while(1) { - EnterCriticalSection(&This->section); + while(1) { + EnterCriticalSection(&This->section); - task = This->task_queue_head; - if(task) { - This->task_queue_head = task->next; - if(!This->task_queue_head) - This->task_queue_tail = NULL; - } + task = This->task_queue_head; + if(task) { + This->task_queue_head = task->next; + if(!This->task_queue_head) + This->task_queue_tail = NULL; + } - LeaveCriticalSection(&This->section); + LeaveCriticalSection(&This->section); - if(!task) - break; + if(!task) + break; - This->continue_call++; - task->proc(This, task); - This->continue_call--; - } + This->continue_call++; + task->proc(This, task); + This->continue_call--; + } +} + +static LRESULT WINAPI notif_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) { + case WM_MK_CONTINUE: { + BindProtocol *This = (BindProtocol*)lParam; + + process_tasks(This); IInternetProtocolEx_Release(&This->IInternetProtocolEx_iface); return 0; @@ -543,6 +549,8 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr &This->IInternetBindInfo_iface, 0, 0); } + if(SUCCEEDED(hres)) + process_tasks(This); return hres; }

1 0

Jacek Caban : urlmon: Added more tests.
by Alexandre Julliard Sept. 3, 2012

Sept. 3, 2012

Module: wine Branch: master Commit: 3cd189c0c07c2ecaccbf387e68b3a5775c809cd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd189c0c07c2ecaccbf387e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 3 13:59:08 2012 +0200 urlmon: Added more tests. --- dlls/urlmon/tests/url.c | 55 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 40 insertions(+), 15 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 5be3f02..a929ace 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -218,6 +218,7 @@ static LPCWSTR urls[] = { MK_URL, https_urlW, ftp_urlW, + winetest_urlW, winetest_urlW }; @@ -231,7 +232,8 @@ static enum { MK_TEST, HTTPS_TEST, FTP_TEST, - WINETEST_TEST + WINETEST_TEST, + WINETEST_SYNC_TEST } test_protocol; static enum { @@ -705,6 +707,9 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, CHECK_CALLED(Obj_OnProgress_SENDINGREQUEST); else CHECK_CALLED(OnProgress_SENDINGREQUEST); + case WINETEST_SYNC_TEST: + IInternetProtocolSink_AddRef(pOIProtSink); + protocol_sink = pOIProtSink; default: break; } @@ -848,9 +853,14 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, CHECK_CALLED(Obj_OnProgress_MIMETYPEAVAILABLE); else CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); + }else if(test_protocol == WINETEST_SYNC_TEST) { + SET_EXPECT(OnProgress_MIMETYPEAVAILABLE); + hres = IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, wszTextHtml); + ok(hres == S_OK, + "ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08x\n", hres); + CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); }else { - hres = IInternetProtocolSink_ReportProgress(pOIProtSink, - BINDSTATUS_MIMETYPEAVAILABLE, wszTextHtml); + hres = IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_MIMETYPEAVAILABLE, wszTextHtml); ok(hres == S_OK, "ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08x\n", hres); } @@ -862,7 +872,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, SET_EXPECT(Read); if(bind_to_object) { - if(test_protocol != FILE_TEST && test_protocol != MK_TEST) + if(test_protocol != FILE_TEST && test_protocol != MK_TEST && test_protocol != WINETEST_SYNC_TEST) SET_EXPECT(Obj_OnProgress_MIMETYPEAVAILABLE); SET_EXPECT(Obj_OnProgress_BEGINDOWNLOADDATA); if(test_protocol == FILE_TEST) @@ -887,7 +897,8 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, SET_EXPECT(LockRequest); if(!filedwl_api) SET_EXPECT(OnDataAvailable); - SET_EXPECT(OnStopBinding); + if(test_protocol != WINETEST_SYNC_TEST) /* Set in Read after ReportResult call */ + SET_EXPECT(OnStopBinding); } hres = IInternetProtocolSink_ReportData(pOIProtSink, bscf, 13, 13); @@ -911,7 +922,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, CHECK_CALLED(OnObjectAvailable); CHECK_CALLED(Obj_OnStopBinding); }else { - if(test_protocol != FILE_TEST && test_protocol != MK_TEST) + if(test_protocol != FILE_TEST && test_protocol != MK_TEST && test_protocol != WINETEST_SYNC_TEST) CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); CHECK_CALLED(OnProgress_BEGINDOWNLOADDATA); if(test_protocol == FILE_TEST) @@ -928,17 +939,19 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, hres = IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_BEGINDOWNLOADDATA, NULL); ok(hres == S_OK, "ReportProgress(BINDSTATUS_BEGINDOWNLOADDATA) failed: %08x\n", hres); CHECK_CALLED(Read); - }else if(!bind_to_object && test_protocol == ABOUT_TEST) { + }else if(!bind_to_object && test_protocol == FILE_TEST) { SET_EXPECT(Read); hres = IInternetProtocolSink_ReportData(pOIProtSink, bscf, 13, 13); ok(hres == S_OK, "ReportData failed: %08x\n", hres); CHECK_CALLED(Read); } - SET_EXPECT(Terminate); - hres = IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL); - ok(hres == S_OK, "ReportResult failed: %08x\n", hres); - CHECK_CALLED(Terminate); + if(test_protocol != WINETEST_SYNC_TEST) { + SET_EXPECT(Terminate); + hres = IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL); + ok(hres == S_OK, "ReportResult failed: %08x\n", hres); + CHECK_CALLED(Terminate); + } return S_OK; } @@ -1119,6 +1132,8 @@ static HRESULT WINAPI Protocol_Resume(IInternetProtocol *iface) static HRESULT WINAPI Protocol_Read(IInternetProtocol *iface, void *pv, ULONG cb, ULONG *pcbRead) { + HRESULT hres; + static const char data[] = "<HTML></HTML>"; CHECK_EXPECT2(Read); @@ -1139,8 +1154,6 @@ static HRESULT WINAPI Protocol_Read(IInternetProtocol *iface, void *pv, } if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST) { - HRESULT hres; - static int pending = TRUE; pending = !pending; @@ -1184,6 +1197,13 @@ static HRESULT WINAPI Protocol_Read(IInternetProtocol *iface, void *pv, return S_FALSE; } + if(test_protocol == WINETEST_SYNC_TEST) { + hres = IInternetProtocolSink_ReportResult(protocol_sink, S_OK, 0, NULL); + ok(hres == S_OK, "ReportResult failed: %08x\n", hres); + + SET_EXPECT(OnStopBinding); + } + ok(*pcbRead == 0, "*pcbRead=%d, expected 0\n", *pcbRead); read += *pcbRead = sizeof(data)-1; memcpy(pv, data, sizeof(data)); @@ -2917,7 +2937,8 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) if(is_urlmon_protocol(test_protocol)) SET_EXPECT(SetPriority); SET_EXPECT(Start); - if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST) + if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST + || test_protocol == WINETEST_SYNC_TEST) SET_EXPECT(Terminate); if(tymed != TYMED_FILE || (test_protocol != ABOUT_TEST && test_protocol != ITS_TEST)) SET_EXPECT(UnlockRequest); @@ -3057,7 +3078,8 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) if(is_urlmon_protocol(test_protocol)) CHECK_CALLED(SetPriority); CHECK_CALLED(Start); - if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST) { + if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST + || test_protocol == WINETEST_SYNC_TEST) { if(tymed == TYMED_FILE) CLEAR_CALLED(Read); CHECK_CALLED(Terminate); @@ -3959,6 +3981,9 @@ START_TEST(url) trace("emulated about test (to object)...\n"); test_BindToObject(ABOUT_TEST, BINDTEST_EMULATE); + trace("emulalated test reporting result in read...\n"); + test_BindToStorage(WINETEST_SYNC_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); + trace("file test...\n"); test_BindToStorage(FILE_TEST, 0, TYMED_ISTREAM);

1 0