wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Paul Vriens : inetcomm: Prevent possible dereferences (Coverity).
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: e7f4f3b69cbf9a5e248fbf696f11c281f9f20a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f4f3b69cbf9a5e248fbf696… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu May 14 09:18:08 2009 +0200 inetcomm: Prevent possible dereferences (Coverity). --- dlls/inetcomm/smtptransport.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c index 91070b6..d17419f 100644 --- a/dlls/inetcomm/smtptransport.c +++ b/dlls/inetcomm/smtptransport.c @@ -732,7 +732,7 @@ static HRESULT WINAPI SMTPTransport_CommandMAIL(ISMTPTransport2 *iface, LPSTR ps SMTPTransport *This = (SMTPTransport *)iface; const char szCommandFormat[] = "MAIL FROM: <%s>\n"; char *szCommand; - int len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszEmailFrom); + int len; HRESULT hr; TRACE("(%s)\n", debugstr_a(pszEmailFrom)); @@ -740,6 +740,7 @@ static HRESULT WINAPI SMTPTransport_CommandMAIL(ISMTPTransport2 *iface, LPSTR ps if (!pszEmailFrom) return E_INVALIDARG; + len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszEmailFrom); szCommand = HeapAlloc(GetProcessHeap(), 0, len); if (!szCommand) return E_OUTOFMEMORY; @@ -758,7 +759,7 @@ static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR ps SMTPTransport *This = (SMTPTransport *)iface; const char szCommandFormat[] = "RCPT TO: <%s>\n"; char *szCommand; - int len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszEmailTo); + int len; HRESULT hr; TRACE("(%s)\n", debugstr_a(pszEmailTo)); @@ -766,6 +767,7 @@ static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR ps if (!pszEmailTo) return E_INVALIDARG; + len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszEmailTo); szCommand = HeapAlloc(GetProcessHeap(), 0, len); if (!szCommand) return E_OUTOFMEMORY; @@ -833,7 +835,7 @@ static HRESULT WINAPI SMTPTransport_CommandAUTH(ISMTPTransport2 *iface, SMTPTransport *This = (SMTPTransport *)iface; const char szCommandFormat[] = "AUTH %s\n"; char *szCommand; - int len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszAuthType); + int len; HRESULT hr; TRACE("(%s)\n", debugstr_a(pszAuthType)); @@ -841,6 +843,7 @@ static HRESULT WINAPI SMTPTransport_CommandAUTH(ISMTPTransport2 *iface, if (!pszAuthType) return E_INVALIDARG; + len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszAuthType); szCommand = HeapAlloc(GetProcessHeap(), 0, len); if (!szCommand) return E_OUTOFMEMORY;

1 0

Jacek Caban : urlmon: Use PI_MIMEVERIFICATION in Binding object.
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: 81a9f4a357e12631a9cfb3231724e1ea3239a7be URL: http://source.winehq.org/git/wine.git/?a=commit;h=81a9f4a357e12631a9cfb3231… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 00:49:33 2009 +0200 urlmon: Use PI_MIMEVERIFICATION in Binding object. --- dlls/urlmon/binding.c | 61 ++++++++----------------------------------------- 1 files changed, 10 insertions(+), 51 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 913f8fa..3ff4683 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -178,53 +178,17 @@ static void dump_BINDINFO(BINDINFO *bi) ); } -static void set_binding_mime(Binding *binding, LPCWSTR mime) +static void mime_available(Binding *This, LPCWSTR mime) { - EnterCriticalSection(&binding->section); + heap_free(This->mime); + This->mime = heap_strdupW(mime); - if(binding->report_mime) { - heap_free(binding->mime); - binding->mime = heap_strdupW(mime); - } - - LeaveCriticalSection(&binding->section); -} - -static void handle_mime_available(Binding *binding, BOOL verify) -{ - BOOL report_mime; - - EnterCriticalSection(&binding->section); - report_mime = binding->report_mime; - binding->report_mime = FALSE; - LeaveCriticalSection(&binding->section); - - if(!report_mime) + if(!This->mime || !This->report_mime) return; - if(verify) { - LPWSTR mime = NULL; - - fill_stgmed_buffer(binding->stgmed_buf); - FindMimeFromData(NULL, binding->url, binding->stgmed_buf->buf, - min(binding->stgmed_buf->size, 255), binding->mime, 0, &mime, 0); - - heap_free(binding->mime); - binding->mime = heap_strdupW(mime); - CoTaskMemFree(mime); - } - - IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_MIMETYPEAVAILABLE, binding->mime); - - binding->clipboard_format = RegisterClipboardFormatW(binding->mime); -} - -static void mime_available(Binding *This, LPCWSTR mime, BOOL verify) -{ - if(mime) - set_binding_mime(This, mime); + IBindStatusCallback_OnProgress(This->callback, 0, 0, BINDSTATUS_MIMETYPEAVAILABLE, This->mime); - handle_mime_available(This, verify); + This->clipboard_format = RegisterClipboardFormatW(This->mime); } static void stop_binding(Binding *binding, HRESULT hres, LPCWSTR str) @@ -1007,22 +971,20 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink case BINDSTATUS_BEGINDOWNLOADDATA: fill_stgmed_buffer(This->stgmed_buf); break; - case BINDSTATUS_MIMETYPEAVAILABLE: - set_binding_mime(This, szStatusText); - break; case BINDSTATUS_SENDINGREQUEST: on_progress(This, 0, 0, BINDSTATUS_SENDINGREQUEST, szStatusText); break; case BINDSTATUS_PROTOCOLCLASSID: break; + case BINDSTATUS_MIMETYPEAVAILABLE: case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE: - mime_available(This, szStatusText, FALSE); + mime_available(This, szStatusText); break; case BINDSTATUS_CACHEFILENAMEAVAILABLE: heap_free(This->stgmed_buf->cache_file); This->stgmed_buf->cache_file = heap_strdupW(szStatusText); break; - case BINDSTATUS_DIRECTBIND: + case BINDSTATUS_DIRECTBIND: /* FIXME: Handle BINDSTATUS_DIRECTBIND in BindProtocol */ This->report_mime = FALSE; break; case BINDSTATUS_ACCEPTRANGES: @@ -1045,9 +1007,6 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres if(This->download_state == END_DOWNLOAD || (This->state & BINDING_STOPPED)) return; - if(This->report_mime) - mime_available(This, NULL, TRUE); - if(This->download_state == BEFORE_DOWNLOAD) { fill_stgmed_buffer(This->stgmed_buf); @@ -1502,7 +1461,7 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, I report_data(binding, 0, 0, 0); }else { hres = IInternetProtocol_Start(binding->protocol, url, PROTSINK(binding), - BINDINF(binding), PI_APARTMENTTHREADED, 0); + BINDINF(binding), PI_APARTMENTTHREADED|PI_MIMEVERIFICATION, 0); TRACE("start ret %08x\n", hres);

1 0

Jacek Caban : urlmon: Added PI_MIMEVERIFICATION tests.
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: b23ccb1303485b3df3932b30e7665c5a0f9ed887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23ccb1303485b3df3932b30e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 00:49:21 2009 +0200 urlmon: Added PI_MIMEVERIFICATION tests. --- dlls/urlmon/tests/protocol.c | 100 ++++++++++++++++++++++++++++++----------- 1 files changed, 73 insertions(+), 27 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index a973211..725c3cc 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -115,7 +115,7 @@ static IInternetProtocol *async_protocol = NULL; static BOOL first_data_notif = FALSE, http_is_first = FALSE, http_post_test = FALSE; static int state = 0, prot_state; -static DWORD bindf = 0, ex_priority = 0; +static DWORD bindf, ex_priority , pi; static IInternetProtocol *binding_protocol; static IInternetBindInfo *prot_bind_info; static IInternetProtocolSink *binding_sink; @@ -125,6 +125,7 @@ static BOOL binding_test; static PROTOCOLDATA protocoldata, *pdata; static DWORD prot_read; static BOOL security_problem = FALSE; +static BOOL async_read_pending; static enum { FILE_TEST, @@ -1088,7 +1089,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) { - DWORD bscf = 0; + DWORD bscf = 0, pr; HRESULT hres; CHECK_EXPECT(Continue); @@ -1121,10 +1122,12 @@ static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, IHttpNegotiate_Release(http_negotiate); ok(hres == S_OK, "OnResponse failed: %08x\n", hres); - SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); + if(!(pi & PI_MIMEVERIFICATION)) + SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); hres = IInternetProtocolSink_ReportProgress(binding_sink, BINDSTATUS_MIMETYPEAVAILABLE, text_htmlW); - CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); + if(!(pi & PI_MIMEVERIFICATION)) + CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); ok(hres == S_OK, "ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08x\n", hres); @@ -1137,11 +1140,32 @@ static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, break; } - SET_EXPECT(ReportData); + pr = prot_read; + if(pi & PI_MIMEVERIFICATION) { + if(pr < 200) + SET_EXPECT(Read); + if(pr == 200) { + SET_EXPECT(Read); + SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); + } + } + if(!(pi & PI_MIMEVERIFICATION) || pr >= 200) + SET_EXPECT(ReportData); + hres = IInternetProtocolSink_ReportData(binding_sink, bscf, 100, 400); - CHECK_CALLED(ReportData); ok(hres == S_OK, "ReportData failed: %08x\n", hres); + if(pi & PI_MIMEVERIFICATION) { + if(pr < 200) + CHECK_CALLED(Read); + if(pr == 200) { + CLEAR_CALLED(Read); + CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); + } + } + if(!(pi & PI_MIMEVERIFICATION) || pr >= 200) + CHECK_CALLED(ReportData); + if(prot_state == 3) prot_state = 4; @@ -1177,14 +1201,26 @@ static HRESULT WINAPI Protocol_Resume(IInternetProtocol *iface) static HRESULT WINAPI Protocol_Read(IInternetProtocol *iface, void *pv, ULONG cb, ULONG *pcbRead) { - static BOOL b = TRUE; + if(pi & PI_MIMEVERIFICATION) { + CHECK_EXPECT2(Read); - CHECK_EXPECT(Read); + if(prot_read < 300) { + ok(pv != expect_pv, "pv == expect_pv\n"); + if(prot_read < 300) + ok(cb == 2048-prot_read, "cb=%d\n", cb); + else + ok(cb == 700, "cb=%d\n", cb); + }else { + ok(expect_pv <= pv && (BYTE*)pv < (BYTE*)expect_pv + cb, "pv != expect_pv\n"); + } + }else { + CHECK_EXPECT(Read); - ok(pv == expect_pv, "pv != expect_pv\n"); - ok(cb == 1000, "cb=%d\n", cb); + ok(pv == expect_pv, "pv != expect_pv\n"); + ok(cb == 1000, "cb=%d\n", cb); + ok(!*pcbRead, "*pcbRead = %d\n", *pcbRead); + } ok(pcbRead != NULL, "pcbRead == NULL\n"); - ok(!*pcbRead, "*pcbRead = %d\n", *pcbRead); if(prot_state == 3) { HRESULT hres; @@ -1196,8 +1232,10 @@ static HRESULT WINAPI Protocol_Read(IInternetProtocol *iface, void *pv, return S_FALSE; } - if((b = !b)) + if((async_read_pending = !async_read_pending)) { + *pcbRead = 0; return tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST ? E_PENDING : S_FALSE; + } memset(pv, 'x', 100); prot_read += *pcbRead = 100; @@ -1287,6 +1325,16 @@ static const IClassFactoryVtbl ClassFactoryVtbl = { static IClassFactory ClassFactory = { &ClassFactoryVtbl }; +static void init_test(int prot, BOOL is_binding) +{ + tested_protocol = prot; + binding_test = is_binding; + first_data_notif = TRUE; + prot_read = 0; + prot_state = 0; + async_read_pending = TRUE; +} + static void test_priority(IInternetProtocol *protocol) { IInternetPriority *priority; @@ -1540,7 +1588,7 @@ static void test_file_protocol(void) { static const char html_doc[] = "<HTML></HTML>"; trace("Testing file protocol...\n"); - tested_protocol = FILE_TEST; + init_test(FILE_TEST, FALSE); SetLastError(0xdeadbeef); file = CreateFileW(wszIndexHtml, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, @@ -1849,7 +1897,7 @@ static void test_https_protocol(void) '.','c','o','m','/','t','e','s','t','.','h','t','m','l',0}; trace("Testing https protocol (from urlmon)...\n"); - tested_protocol = HTTPS_TEST; + init_test(HTTPS_TEST, FALSE); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; test_http_protocol_url(codeweavers_url, TRUE, TRUE); } @@ -1986,7 +2034,7 @@ static void test_mk_protocol(void) static const WCHAR wrong_url2[] = {'m','k',':','/','t','e','s','t','.','h','t','m','l',0}; trace("Testing mk protocol...\n"); - tested_protocol = MK_TEST; + init_test(MK_TEST, FALSE); hres = CoGetClassObject(&CLSID_MkProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); @@ -2059,8 +2107,7 @@ static void test_CreateBinding(void) static const WCHAR wsz_test[] = {'t','e','s','t',0}; trace("Testing CreateBinding...\n"); - tested_protocol = BIND_TEST; - binding_test = TRUE; + init_test(BIND_TEST, TRUE); hres = CoInternetGetSession(0, &session, 0); ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres); @@ -2168,19 +2215,16 @@ static void test_CreateBinding(void) IInternetSession_Release(session); } -static void test_binding(int prot) +static void test_binding(int prot, DWORD grf_pi) { IInternetProtocol *protocol; IInternetSession *session; ULONG ref; HRESULT hres; - trace("Testing %s binding...\n", debugstr_w(protocol_names[prot])); - - tested_protocol = prot; - binding_test = TRUE; - first_data_notif = TRUE; - prot_read = 0; + trace("Testing %s binding (grfPI %x)...\n", debugstr_w(protocol_names[prot]), grf_pi); + init_test(prot, TRUE); + pi = grf_pi; hres = CoInternetGetSession(0, &session, 0); ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres); @@ -2208,7 +2252,7 @@ static void test_binding(int prot) SET_EXPECT(Start); expect_hrResult = S_OK; - hres = IInternetProtocol_Start(protocol, binding_urls[prot], &protocol_sink, &bind_info, 0, 0); + hres = IInternetProtocol_Start(protocol, binding_urls[prot], &protocol_sink, &bind_info, pi, 0); ok(hres == S_OK, "Start failed: %08x\n", hres); CHECK_CALLED(QueryService_InternetProtocol); @@ -2264,8 +2308,10 @@ START_TEST(protocol) test_gopher_protocol(); test_mk_protocol(); test_CreateBinding(); - test_binding(FILE_TEST); - test_binding(HTTP_TEST); + test_binding(FILE_TEST, 0); + test_binding(HTTP_TEST, 0); + test_binding(FILE_TEST, PI_MIMEVERIFICATION); + test_binding(HTTP_TEST, PI_MIMEVERIFICATION); CloseHandle(event_complete); CloseHandle(event_complete2);

1 0

Jacek Caban : urlmon: Added PI_MIMEVERIFICATION support.
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: 299ce6c18eb7dfaf8f339658b2f5e606936fb8bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=299ce6c18eb7dfaf8f339658b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 00:49:01 2009 +0200 urlmon: Added PI_MIMEVERIFICATION support. --- dlls/urlmon/bindprot.c | 163 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 125 insertions(+), 38 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 7235b63..d431095 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -50,6 +50,7 @@ struct BindProtocol { LONG priority; BOOL reported_result; + BOOL reported_mime; BOOL from_urlmon; DWORD pi; @@ -59,6 +60,11 @@ struct BindProtocol { CRITICAL_SECTION section; task_header_t *task_queue_head, *task_queue_tail; + + BYTE *buf; + DWORD buf_size; + LPWSTR mime; + LPWSTR url; }; #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) @@ -67,6 +73,9 @@ struct BindProtocol { #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) #define PROTSINK(x) ((IInternetProtocolSink*) &(x)->lpInternetProtocolSinkVtbl) +#define BUFFER_SIZE 2048 +#define MIME_TEST_SIZE 255 + #define WM_MK_CONTINUE (WM_USER+101) #define WM_MK_RELEASE (WM_USER+102) @@ -272,6 +281,9 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocol *iface) if(This->notif_hwnd) release_notif_hwnd(This->notif_hwnd); DeleteCriticalSection(&This->section); + + heap_free(This->mime); + heap_free(This->url); heap_free(This); URLMON_UnlockModule(); @@ -300,6 +312,7 @@ static HRESULT WINAPI BindProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl return E_INVALIDARG; This->pi = grfPI; + This->url = heap_strdupW(szUrl); hres = IInternetProtocolSink_QueryInterface(pOIProtSink, &IID_IServiceProvider, (void**)&service_provider); @@ -417,11 +430,30 @@ static HRESULT WINAPI BindProtocol_Read(IInternetProtocol *iface, void *pv, { BindProtocol *This = PROTOCOL_THIS(iface); ULONG read = 0; - HRESULT hres; + HRESULT hres = S_OK; TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); - hres = IInternetProtocol_Read(This->protocol, pv, cb, &read); + if(This->buf) { + read = min(cb, This->buf_size); + memcpy(pv, This->buf, read); + + if(read == This->buf_size) { + heap_free(This->buf); + This->buf = NULL; + }else { + memmove(This->buf, This->buf+cb, This->buf_size-cb); + } + + This->buf_size -= read; + } + + if(read < cb) { + ULONG cread = 0; + + hres = IInternetProtocol_Read(This->protocol, (BYTE*)pv+read, cb, &cread); + read += cread; + } *pcbRead = read; return hres; @@ -674,6 +706,47 @@ static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface return IInternetProtocolSink_Switch(This->protocol_sink, pProtocolData); } +static void report_progress(BindProtocol *This, ULONG status_code, LPCWSTR status_text) +{ + switch(status_code) { + case BINDSTATUS_FINDINGRESOURCE: + case BINDSTATUS_CONNECTING: + case BINDSTATUS_BEGINDOWNLOADDATA: + case BINDSTATUS_SENDINGREQUEST: + case BINDSTATUS_CACHEFILENAMEAVAILABLE: + case BINDSTATUS_DIRECTBIND: + case BINDSTATUS_ACCEPTRANGES: + if(This->protocol_sink) + IInternetProtocolSink_ReportProgress(This->protocol_sink, status_code, status_text); + break; + + case BINDSTATUS_MIMETYPEAVAILABLE: + if(!This->reported_mime) { + heap_free(This->mime); + This->mime = heap_strdupW(status_text); + } + + if(This->protocol_sink && !(This->pi & PI_MIMEVERIFICATION)) + IInternetProtocolSink_ReportProgress(This->protocol_sink, status_code, status_text); + break; + + case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE: + if(!This->reported_mime) { + heap_free(This->mime); + This->mime = heap_strdupW(status_text); + } + + if(This->protocol_sink) { + This->reported_mime = TRUE; + IInternetProtocolSink_ReportProgress(This->protocol_sink, BINDSTATUS_MIMETYPEAVAILABLE, status_text); + } + break; + + default: + FIXME("unsupported ulStatusCode %u\n", status_code); + } +} + typedef struct { task_header_t header; @@ -685,63 +758,79 @@ static void on_progress_proc(BindProtocol *This, task_header_t *t) { on_progress_task_t *task = (on_progress_task_t*)t; - IInternetProtocolSink_ReportProgress(This->protocol_sink, task->status_code, task->status_text); + report_progress(This, task->status_code, task->status_text); heap_free(task->status_text); heap_free(task); } -static void report_progress(BindProtocol *This, ULONG status_code, LPCWSTR status_text) +static HRESULT WINAPI BPInternetProtocolSink_ReportProgress(IInternetProtocolSink *iface, + ULONG ulStatusCode, LPCWSTR szStatusText) { + BindProtocol *This = PROTSINK_THIS(iface); + + TRACE("(%p)->(%u %s)\n", This, ulStatusCode, debugstr_w(szStatusText)); + if(do_direct_notif(This)) { - IInternetProtocolSink_ReportProgress(This->protocol_sink, status_code, status_text); + report_progress(This, ulStatusCode, szStatusText); }else { on_progress_task_t *task; task = heap_alloc(sizeof(on_progress_task_t)); - task->status_code = status_code; - task->status_text = heap_strdupW(status_text); + task->status_code = ulStatusCode; + task->status_text = heap_strdupW(szStatusText); push_task(This, &task->header, on_progress_proc); } + + return S_OK; } -static HRESULT WINAPI BPInternetProtocolSink_ReportProgress(IInternetProtocolSink *iface, - ULONG ulStatusCode, LPCWSTR szStatusText) +static HRESULT report_data(BindProtocol *This, DWORD bscf, ULONG progress, ULONG progress_max) { - BindProtocol *This = PROTSINK_THIS(iface); + if(!This->protocol_sink) + return S_OK; - TRACE("(%p)->(%u %s)\n", This, ulStatusCode, debugstr_w(szStatusText)); + if((This->pi & PI_MIMEVERIFICATION) && !This->reported_mime) { + DWORD read = 0; + LPWSTR mime; + HRESULT hres; - switch(ulStatusCode) { - case BINDSTATUS_FINDINGRESOURCE: - case BINDSTATUS_CONNECTING: - case BINDSTATUS_BEGINDOWNLOADDATA: - case BINDSTATUS_SENDINGREQUEST: - case BINDSTATUS_CACHEFILENAMEAVAILABLE: - case BINDSTATUS_DIRECTBIND: - case BINDSTATUS_ACCEPTRANGES: - case BINDSTATUS_MIMETYPEAVAILABLE: - if(!This->protocol_sink) - return S_OK; - report_progress(This, ulStatusCode, szStatusText); - break; + if(!This->buf) { + This->buf = heap_alloc(BUFFER_SIZE); + if(!This->buf) + return E_OUTOFMEMORY; + } - case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE: - if(!This->protocol_sink) + do { + read = 0; + hres = IInternetProtocol_Read(This->protocol, This->buf+This->buf_size, BUFFER_SIZE-This->buf_size, &read); + if(hres != S_OK) + break; + This->buf_size += read; + }while(This->buf_size < MIME_TEST_SIZE); + if(FAILED(hres) && hres != E_PENDING) + return hres; + + This->buf_size += read; + if(This->buf_size < MIME_TEST_SIZE && hres != S_FALSE) return S_OK; - report_progress(This, - This->from_urlmon ? BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE : BINDSTATUS_MIMETYPEAVAILABLE, - szStatusText); - break; - default: - FIXME("unsupported ulStatusCode %u\n", ulStatusCode); - return E_NOTIMPL; + + hres = FindMimeFromData(NULL, This->url, This->buf, min(This->buf_size, MIME_TEST_SIZE), This->mime, 0, &mime, 0); + if(FAILED(hres)) + return hres; + + heap_free(This->mime); + This->mime = heap_strdupW(mime); + CoTaskMemFree(mime); + + This->reported_mime = TRUE; + IInternetProtocolSink_ReportProgress(This->protocol_sink, BINDSTATUS_MIMETYPEAVAILABLE, This->mime); } - return S_OK; + return IInternetProtocolSink_ReportData(This->protocol_sink, bscf, progress, progress_max); } typedef struct { @@ -755,9 +844,7 @@ static void report_data_proc(BindProtocol *This, task_header_t *t) { report_data_task_t *task = (report_data_task_t*)t; - if(This->protocol_sink) - IInternetProtocolSink_ReportData(This->protocol_sink, task->bscf, task->progress, task->progress_max); - + report_data(This, task->bscf, task->progress, task->progress_max); heap_free(task); } @@ -786,7 +873,7 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportData(IInternetProtocolSink *i return S_OK; } - return IInternetProtocolSink_ReportData(This->protocol_sink, grfBSCF, ulProgress, ulProgressMax); + return report_data(This, grfBSCF, ulProgress, ulProgressMax); } typedef struct {

1 0

Aric Stewart : msctf: Map out currently missing interfaces.
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: daab4e27213c858ebe3eb86f4f403e83692d2a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daab4e27213c858ebe3eb86f4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 13 14:45:44 2009 -0500 msctf: Map out currently missing interfaces. --- dlls/msctf/context.c | 8 ++++++++ dlls/msctf/inputprocessor.c | 3 +++ dlls/msctf/threadmgr.c | 5 +++++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 38d8ad6..dff4fd8 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -58,6 +58,13 @@ typedef struct tagContextSink { typedef struct tagContext { const ITfContextVtbl *ContextVtbl; const ITfSourceVtbl *SourceVtbl; + /* const ITfContextCompositionVtbl *ContextCompositionVtbl; */ + /* const ITfContextOwnerCompositionServicesVtbl *ContextOwnerCompositionServicesVtbl; */ + /* const ITfContextOwnerServicesVtbl *ContextOwnerServicesVtbl; */ + /* const ITfInsertAtSelectionVtbl *InsertAtSelectionVtbl; */ + /* const ITfMouseTrackerVtbl *MouseTrackerVtbl; */ + /* const ITfQueryEmbeddedVtbl *QueryEmbeddedVtbl; */ + /* const ITfSourceSingleVtbl *SourceSingleVtbl; */ LONG refCount; TfClientId tidOwner; @@ -79,6 +86,7 @@ typedef struct tagContext { typedef struct tagTextStoreACPSink { const ITextStoreACPSinkVtbl *TextStoreACPSinkVtbl; + /* const ITextStoreACPServicesVtbl *TextStoreACPServicesVtbl; */ LONG refCount; Context *pContext; diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 8d36cd5..90daa2f 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -59,6 +59,9 @@ typedef struct tagInputProcessorProfilesSink { typedef struct tagInputProcessorProfiles { const ITfInputProcessorProfilesVtbl *InputProcessorProfilesVtbl; const ITfSourceVtbl *SourceVtbl; + /* const ITfInputProcessorProfileMgrVtbl *InputProcessorProfileMgrVtbl; */ + /* const ITfInputProcessorProfilesExVtbl *InputProcessorProfilesExVtbl; */ + /* const ITfInputProcessorProfileSubstituteLayoutVtbl *InputProcessorProfileSubstituteLayoutVtbl; */ LONG refCount; LANGID currentLanguage; diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 277923e..c91e536 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -71,6 +71,11 @@ typedef struct tagACLMulti { const ITfKeystrokeMgrVtbl *KeystrokeMgrVtbl; const ITfMessagePumpVtbl *MessagePumpVtbl; const ITfClientIdVtbl *ClientIdVtbl; + /* const ITfThreadMgrExVtbl *ThreadMgrExVtbl; */ + /* const ITfConfigureSystemKeystrokeFeedVtbl *ConfigureSystemKeystrokeFeedVtbl; */ + /* const ITfLangBarItemMgrVtbl *LangBarItemMgrVtbl; */ + /* const ITfUIElementMgrVtbl *UIElementMgrVtbl; */ + /* const ITfSourceSingleVtbl *SourceSingleVtbl; */ LONG refCount; const ITfThreadMgrEventSinkVtbl *ThreadMgrEventSinkVtbl; /* internal */

1 0

Vincent Povirk : gdiplus: Add string format traces.
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: abae88a825fac79a5210411966828dc94c78c063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abae88a825fac79a521041196… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 13 15:30:24 2009 -0500 gdiplus: Add string format traces. --- dlls/gdiplus/stringformat.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index 21053b7..bfe7d34 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -35,6 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, GpStringFormat **format) { + TRACE("(%i, %x, %p)\n", attr, lang, format); + if(!format) return InvalidParameter; @@ -189,6 +191,8 @@ GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat *format, GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat *format, StringAlignment align) { + TRACE("(%p, %i)\n", format, align); + if(!format) return InvalidParameter; @@ -201,6 +205,8 @@ GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat *format, GpStatus WINGDIPAPI GdipSetStringFormatDigitSubstitution(GpStringFormat *format, LANGID language, StringDigitSubstitute substitute) { + TRACE("(%p, %x, %i)\n", format, language, substitute); + if(!format) return InvalidParameter; @@ -213,6 +219,8 @@ GpStatus WINGDIPAPI GdipSetStringFormatDigitSubstitution(GpStringFormat *format, GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat *format, INT hkpx) { + TRACE("(%p, %i)\n", format, hkpx); + if(!format || hkpx < 0 || hkpx > 2) return InvalidParameter; @@ -224,6 +232,8 @@ GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat *format, GpStatus WINGDIPAPI GdipSetStringFormatLineAlign(GpStringFormat *format, StringAlignment align) { + TRACE("(%p, %i)\n", format, align); + if(!format) return InvalidParameter; @@ -246,6 +256,8 @@ GpStatus WINGDIPAPI GdipSetStringFormatMeasurableCharacterRanges(GpStringFormat* GpStatus WINGDIPAPI GdipSetStringFormatTabStops(GpStringFormat *format, REAL firsttab, INT count, GDIPCONST REAL *tabs) { + TRACE("(%p, %0.2f, %i, %p)\n", format, firsttab, count, tabs); + if(!format || !tabs) return InvalidParameter; @@ -276,6 +288,8 @@ GpStatus WINGDIPAPI GdipSetStringFormatTabStops(GpStringFormat *format, REAL fir GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat *format, StringTrimming trimming) { + TRACE("(%p, %i)\n", format, trimming); + if(!format) return InvalidParameter; @@ -286,6 +300,8 @@ GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat *format, GpStatus WINGDIPAPI GdipSetStringFormatFlags(GpStringFormat *format, INT flags) { + TRACE("(%p, %x)\n", format, flags); + if(!format) return InvalidParameter;

1 0

Vincent Povirk : gdiplus: Add a trace to GdipMeasureString.
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: 0f80aa8816c12ef8ff2fd8a18850a4be56a83347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f80aa8816c12ef8ff2fd8a18… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 13 14:30:00 2009 -0500 gdiplus: Add a trace to GdipMeasureString. --- dlls/gdiplus/graphics.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 623af7f..5e5883f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2935,6 +2935,10 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, nheight; SIZE size; + TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics, + debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, + bounds, codepointsfitted, linesfilled); + if(!graphics || !string || !font || !rect) return InvalidParameter;

1 0

Vincent Povirk : gdiplus: Add a trace to GdipDrawString.
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: 3dd5ce7874ad07965753c9f4936018bd70dc7a46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd5ce7874ad07965753c9f49… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 13 13:55:46 2009 -0500 gdiplus: Add a trace to GdipDrawString. --- dlls/gdiplus/gdiplus.c | 6 ++++++ dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/graphics.c | 3 +++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 35caad8..52a9c39 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -380,3 +380,9 @@ inline void delete_element(region_element* element) break; } } + +const char *debugstr_rectf(CONST RectF* rc) +{ + if (!rc) return "(null)"; + return wine_dbg_sprintf("(%0.2f,%0.2f,%0.2f,%0.2f)", rc->X, rc->Y, rc->Width, rc->Height); +} diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index f3bf797..1ee24a1 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -69,6 +69,8 @@ static inline REAL deg2rad(REAL degrees) return M_PI * degrees / 180.0; } +extern const char *debugstr_rectf(CONST RectF* rc); + struct GpPen{ UINT style; GpUnit unit; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 07b2114..623af7f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2016,6 +2016,9 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string SIZE size; RECT drawcoord; + TRACE("(%p, %s, %i, %p, %s, %p, %p)\n", graphics, debugstr_wn(string, length), + length, font, debugstr_rectf(rect), format, brush); + if(!graphics || !string || !font || !brush || !rect) return InvalidParameter;

1 0

Paul Vriens : wininet/tests: Fix some test failures on systems with IE6 or older.
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: 82f22bbaee5cd4d2b486a27c2112d6e9338fd0b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f22bbaee5cd4d2b486a27c2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed May 13 20:50:36 2009 +0200 wininet/tests: Fix some test failures on systems with IE6 or older. --- dlls/wininet/tests/urlcache.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 62e4bd2..b7df03e 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -249,8 +249,12 @@ static void test_GetDiskInfoA(void) strcpy(p, "\\non\\existing\\path"); ret = GetDiskInfoA(path, NULL, NULL, NULL); error = GetLastError(); - ok(!ret, "GetDiskInfoA succeeded\n"); - ok(error == ERROR_PATH_NOT_FOUND, "got %u expected ERROR_PATH_NOT_FOUND\n", error); + ok(!ret || + broken(ret), /* < IE7 */ + "GetDiskInfoA succeeded\n"); + ok(error == ERROR_PATH_NOT_FOUND || + broken(error == 0xdeadbeef), /* < IE7 */ + "got %u expected ERROR_PATH_NOT_FOUND\n", error); SetLastError(0xdeadbeef); ret = GetDiskInfoA(NULL, NULL, NULL, NULL);

1 0

Henri Verbeet : wined3d: Add missing GL locking to test_pbo_functionality() .
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: 318fb7036b08e02c132cca1927cbde23a6fb350c URL: http://source.winehq.org/git/wine.git/?a=commit;h=318fb7036b08e02c132cca192… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 13 18:22:55 2009 +0200 wined3d: Add missing GL locking to test_pbo_functionality(). --- dlls/wined3d/directx.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f5d4d3e..8e3c807 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3907,6 +3907,8 @@ static void test_pbo_functionality(WineD3D_GL_Info *gl_info) { return; } + ENTER_GL(); + while(glGetError()); glGenTextures(1, &texture); glBindTexture(GL_TEXTURE_2D, texture); @@ -3934,6 +3936,8 @@ static void test_pbo_functionality(WineD3D_GL_Info *gl_info) { GL_EXTCALL(glDeleteBuffersARB(1, &pbo)); checkGLcall("PBO test cleanup\n"); + LEAVE_GL(); + if(memcmp(check, pattern, sizeof(check)) != 0) { WARN_(d3d_caps)("PBO test failed, read back data doesn't match original\n"); WARN_(d3d_caps)("Disabling PBOs. This may result in slower performance\n");

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2009