February 2007 - Wine-Commits

Rob Shearman : oleaut32: A value of PARAMFLAG_FNONE for wParamFlags means that the parameter is also marshaled and unmarshaled in the PARAMFLAG_FOUT case .
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: 0f45b2badfd46e7980cc85c84a8789bcb17e5759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f45b2badfd46e7980cc85c84… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 7 19:19:26 2007 +0000 oleaut32: A value of PARAMFLAG_FNONE for wParamFlags means that the parameter is also marshaled and unmarshaled in the PARAMFLAG_FOUT case. --- dlls/oleaut32/tmarshal.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 6326212..d192d01 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -1255,6 +1255,16 @@ _get_funcdesc( } } +static inline BOOL is_in_elem(const ELEMDESC *elem) +{ + return (elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN || !elem->u.paramdesc.wParamFlags); +} + +static inline BOOL is_out_elem(const ELEMDESC *elem) +{ + return (elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT || !elem->u.paramdesc.wParamFlags); +} + static DWORD xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) { @@ -1328,14 +1338,14 @@ xCall(LPVOID retptr, int method, TMProxy TRACE_(olerelay)("%s=",relaystr(names[i+1])); } /* No need to marshal other data than FIN and any VT_PTR. */ - if (!(elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN || !elem->u.paramdesc.wParamFlags) && (elem->tdesc.vt != VT_PTR)) { + if (!is_in_elem(elem) && (elem->tdesc.vt != VT_PTR)) { xargs+=_argsize(elem->tdesc.vt); if (relaydeb) TRACE_(olerelay)("[out]"); continue; } hres = serialize_param( tinfo, - elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN || !elem->u.paramdesc.wParamFlags, + is_in_elem(elem), relaydeb, FALSE, &elem->tdesc, @@ -1387,14 +1397,14 @@ xCall(LPVOID retptr, int method, TMProxy if (i+1<nrofnames && names[i+1]) TRACE_(olerelay)("%s=",relaystr(names[i+1])); } /* No need to marshal other data than FOUT and any VT_PTR */ - if (!(elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT) && (elem->tdesc.vt != VT_PTR)) { + if (!is_out_elem(elem) && (elem->tdesc.vt != VT_PTR)) { xargs += _argsize(elem->tdesc.vt); if (relaydeb) TRACE_(olerelay)("[in]"); continue; } hres = deserialize_param( tinfo, - elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT, + is_out_elem(elem), relaydeb, FALSE, &(elem->tdesc), @@ -1945,7 +1955,7 @@ TMStubImpl_Invoke( hres = deserialize_param( tinfo, - elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN || !elem->u.paramdesc.wParamFlags, + is_in_elem(elem), FALSE, TRUE, &(elem->tdesc), @@ -1991,7 +2001,7 @@ TMStubImpl_Invoke( ELEMDESC *elem = fdesc->lprgelemdescParam+i; hres = serialize_param( tinfo, - elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT, + is_out_elem(elem), FALSE, TRUE, &elem->tdesc,

1 0

Detlef Riekenberg : regedit: Remove unused resource.
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: 6fbbfd67b48f88eb5f7d40b632030e5a1612a6f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fbbfd67b48f88eb5f7d40b63… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Feb 7 17:41:42 2007 +0100 regedit: Remove unused resource. --- programs/regedit/Bg.rc | 12 ------------ programs/regedit/Cs.rc | 12 ------------ programs/regedit/De.rc | 12 ------------ programs/regedit/En.rc | 12 ------------ programs/regedit/Es.rc | 12 ------------ programs/regedit/Fr.rc | 12 ------------ programs/regedit/Hu.rc | 12 ------------ programs/regedit/It.rc | 12 ------------ programs/regedit/Ja.rc | 12 ------------ programs/regedit/Ko.rc | 12 ------------ programs/regedit/Nl.rc | 12 ------------ programs/regedit/No.rc | 12 ------------ programs/regedit/Pl.rc | 12 ------------ programs/regedit/Pt.rc | 29 ----------------------------- programs/regedit/Ru.rc | 12 ------------ programs/regedit/Si.rc | 12 ------------ programs/regedit/Tr.rc | 12 ------------ programs/regedit/resource.h | 1 - 18 files changed, 0 insertions(+), 222 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6fbbfd67b48f88eb5f7d4…

1 0

Jacek Caban : urlmon: Use queue for whole ReportData implementation.
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: 2eb2d74052f32d1fffa0c651b3a837447c3fbba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eb2d74052f32d1fffa0c651b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 7 17:29:52 2007 +0100 urlmon: Use queue for whole ReportData implementation. --- dlls/urlmon/binding.c | 71 +++++++++++++++++++++++++++--------------------- 1 files changed, 40 insertions(+), 31 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index b0eb9a8..8bc954d 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -812,26 +812,61 @@ static HRESULT WINAPI InternetProtocolSi return S_OK; } -static void report_data(Binding *This, DWORD bscf) +static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progress_max) { FORMATETC formatetc = {0, NULL, 1, -1, TYMED_ISTREAM}; + TRACE("(%p)->(%d %u %u)\n", This, bscf, progress, progress_max); + + if(GetCurrentThreadId() != This->apartment_thread) + FIXME("called from worked hread\n"); + + if(!This->verified_mime) { + LPWSTR mime; + + This->verified_mime = TRUE; + + fill_stream_buffer(This->stream); + + FindMimeFromData(NULL, This->url, This->stream->buf, + min(This->stream->buf_size, 255), This->mime, 0, &mime, 0); + + on_progress(This, progress, progress_max, BINDSTATUS_MIMETYPEAVAILABLE, mime); + } + + if(bscf & BSCF_FIRSTDATANOTIFICATION) { + on_progress(This, progress, progress_max, BINDSTATUS_BEGINDOWNLOADDATA, This->url); + } + + if(bscf & BSCF_LASTDATANOTIFICATION) + on_progress(This, progress, progress_max, BINDSTATUS_ENDDOWNLOADDATA, This->url); + + if(!This->request_locked) { + HRESULT hres = IInternetProtocol_LockRequest(This->protocol, 0); + This->request_locked = SUCCEEDED(hres); + } + fill_stream_buffer(This->stream); IBindStatusCallback_OnDataAvailable(This->callback, bscf, This->stream->buf_size, &formatetc, &This->stgmed); + + if(bscf & BSCF_LASTDATANOTIFICATION) + IBindStatusCallback_OnStopBinding(This->callback, S_OK, NULL); } typedef struct { task_header_t header; DWORD bscf; + ULONG progress; + ULONG progress_max; } report_data_task_t; static void report_data_proc(Binding *binding, task_header_t *t) { report_data_task_t *task = (report_data_task_t*)t; - report_data(binding, task->bscf); + report_data(binding, task->bscf, task->progress, task->progress_max); HeapFree(GetProcessHeap(), 0, task); } @@ -846,43 +881,17 @@ static HRESULT WINAPI InternetProtocolSi if(GetCurrentThreadId() != This->apartment_thread) FIXME("called from worked hread\n"); - if(!This->verified_mime) { - LPWSTR mime; - - This->verified_mime = TRUE; - - fill_stream_buffer(This->stream); - - FindMimeFromData(NULL, This->url, This->stream->buf, - min(This->stream->buf_size, 255), This->mime, 0, &mime, 0); - - on_progress(This, ulProgress, ulProgressMax, BINDSTATUS_MIMETYPEAVAILABLE, mime); - } - - if(grfBSCF & BSCF_FIRSTDATANOTIFICATION) { - on_progress(This, ulProgress, ulProgressMax, BINDSTATUS_BEGINDOWNLOADDATA, This->url); - } - - if(grfBSCF & BSCF_LASTDATANOTIFICATION) - on_progress(This, ulProgress, ulProgressMax, BINDSTATUS_ENDDOWNLOADDATA, This->url); - - if(!This->request_locked) { - HRESULT hres = IInternetProtocol_LockRequest(This->protocol, 0); - This->request_locked = SUCCEEDED(hres); - } - if(This->continue_call) { report_data_task_t *task = HeapAlloc(GetProcessHeap(), 0, sizeof(report_data_task_t)); task->bscf = grfBSCF; + task->progress = ulProgress; + task->progress_max = ulProgressMax; push_task(This, &task->header, report_data_proc); }else { - report_data(This, grfBSCF); + report_data(This, grfBSCF, ulProgress, ulProgressMax); } - if(grfBSCF & BSCF_LASTDATANOTIFICATION) - IBindStatusCallback_OnStopBinding(This->callback, S_OK, NULL); - return S_OK; }

1 0

Jacek Caban : urlmon: Added ReportProgress(BINDSTATUS_BEGINDOWNLOADDATA) implementation.
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: 16bf14d129297ce191425f4402df4b33aae33c3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=16bf14d129297ce191425f440… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 7 17:30:28 2007 +0100 urlmon: Added ReportProgress(BINDSTATUS_BEGINDOWNLOADDATA) implementation. --- dlls/urlmon/binding.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 496d429..b0eb9a8 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -786,6 +786,9 @@ static HRESULT WINAPI InternetProtocolSi case BINDSTATUS_CONNECTING: on_progress(This, 0, 0, BINDSTATUS_CONNECTING, szStatusText); break; + case BINDSTATUS_BEGINDOWNLOADDATA: + fill_stream_buffer(This->stream); + break; case BINDSTATUS_MIMETYPEAVAILABLE: { int len = strlenW(szStatusText)+1; This->mime = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR));

1 0

Jacek Caban : urlmon: Use custom task structs.
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: 4e4b5890798dae03a7c72aedf218f2876a6afcb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e4b5890798dae03a7c72aedf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 7 17:29:12 2007 +0100 urlmon: Use custom task structs. --- dlls/urlmon/binding.c | 137 ++++++++++++++++++++++++++---------------------- 1 files changed, 74 insertions(+), 63 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index e7e739c..496d429 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -36,27 +36,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct Binding Binding; -struct _task_t; +struct _task_header_t; -typedef void (*task_proc_t)(Binding*, struct _task_t*); +typedef void (*task_proc_t)(Binding*, struct _task_header_t*); -typedef struct { - Binding *binding; - ULONG progress; - ULONG progress_max; - ULONG status_code; - LPWSTR status_text; -} on_progress_data; - -typedef struct _task_t { +typedef struct _task_header_t { task_proc_t proc; - struct _task_t *next; - union { - on_progress_data on_progress; - PROTOCOLDATA *protocol_data; - DWORD bscf; - } data; -} task_t; + struct _task_header_t *next; +} task_header_t; typedef struct { const IStreamVtbl *lpStreamVtbl; @@ -96,7 +83,7 @@ struct Binding { STGMEDIUM stgmed; - task_t *task_queue_head, *task_queue_tail; + task_header_t *task_queue_head, *task_queue_tail; CRITICAL_SECTION section; }; @@ -109,11 +96,12 @@ struct Binding { #define WM_MK_CONTINUE (WM_USER+101) -static void push_task(Binding *binding, task_t *task) +static void push_task(Binding *binding, task_header_t *task, task_proc_t proc) { + task->proc = proc; task->next = NULL; - EnterCriticalSection(&binding->section); + EnterCriticalSection(&binding->section); if(binding->task_queue_tail) binding->task_queue_tail->next = task; @@ -123,22 +111,22 @@ static void push_task(Binding *binding, LeaveCriticalSection(&binding->section); } -static task_t *pop_task(Binding *binding) +static task_header_t *pop_task(Binding *binding) { - task_t *ret; + task_header_t *ret; - EnterCriticalSection(&binding->section); + EnterCriticalSection(&binding->section); - ret = binding->task_queue_head; - if(ret) { - binding->task_queue_head = ret->next; - if(!binding->task_queue_head) - binding->task_queue_tail = NULL; - } + ret = binding->task_queue_head; + if(ret) { + binding->task_queue_head = ret->next; + if(!binding->task_queue_head) + binding->task_queue_tail = NULL; + } - LeaveCriticalSection(&binding->section); + LeaveCriticalSection(&binding->section); - return ret; + return ret; } static void fill_stream_buffer(ProtocolStream *This) @@ -161,7 +149,7 @@ static LRESULT WINAPI notif_wnd_proc(HWN { if(msg == WM_MK_CONTINUE) { Binding *binding = (Binding*)lParam; - task_t *task; + task_header_t *task; while((task = pop_task(binding))) task->proc(binding, task); @@ -696,26 +684,32 @@ static ULONG WINAPI InternetProtocolSink return IBinding_Release(BINDING(This)); } -static void switch_proc(Binding *binding, task_t *t) +typedef struct { + task_header_t header; + PROTOCOLDATA *data; +} switch_task_t; + +static void switch_proc(Binding *binding, task_header_t *t) { - IInternetProtocol_Continue(binding->protocol, t->data.protocol_data); + switch_task_t *task = (switch_task_t*)t; + + IInternetProtocol_Continue(binding->protocol, task->data); - HeapFree(GetProcessHeap(), 0, t); + HeapFree(GetProcessHeap(), 0, task); } static HRESULT WINAPI InternetProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOLDATA *pProtocolData) { Binding *This = PROTSINK_THIS(iface); - task_t *task; + switch_task_t *task; TRACE("(%p)->(%p)\n", This, pProtocolData); - task = HeapAlloc(GetProcessHeap(), 0, sizeof(task_t)); - task->proc = switch_proc; - task->data.protocol_data = pProtocolData; + task = HeapAlloc(GetProcessHeap(), 0, sizeof(switch_task_t)); + task->data = pProtocolData; - push_task(This, task); + push_task(This, &task->header, switch_proc); IBinding_AddRef(BINDING(This)); PostMessageW(This->notif_hwnd, WM_MK_CONTINUE, 0, (LPARAM)This); @@ -723,19 +717,31 @@ static HRESULT WINAPI InternetProtocolSi return S_OK; } -static void on_progress_proc(Binding *This, task_t *t) +typedef struct { + task_header_t header; + + Binding *binding; + ULONG progress; + ULONG progress_max; + ULONG status_code; + LPWSTR status_text; +} on_progress_task_t; + +static void on_progress_proc(Binding *binding, task_header_t *t) { - IBindStatusCallback_OnProgress(This->callback, t->data.on_progress.progress, - t->data.on_progress.progress_max, t->data.on_progress.status_code, t->data.on_progress.status_text); + on_progress_task_t *task = (on_progress_task_t*)t; + + IBindStatusCallback_OnProgress(binding->callback, task->progress, + task->progress_max, task->status_code, task->status_text); - HeapFree(GetProcessHeap(), 0, t->data.on_progress.status_text); - HeapFree(GetProcessHeap(), 0, t); + HeapFree(GetProcessHeap(), 0, task->status_text); + HeapFree(GetProcessHeap(), 0, task); } static void on_progress(Binding *This, ULONG progress, ULONG progress_max, ULONG status_code, LPCWSTR status_text) { - task_t *task; + on_progress_task_t *task; if(GetCurrentThreadId() == This->apartment_thread && !This->continue_call) { IBindStatusCallback_OnProgress(This->callback, progress, progress_max, @@ -743,23 +749,22 @@ static void on_progress(Binding *This, U return; } - task = HeapAlloc(GetProcessHeap(), 0, sizeof(task_t)); + task = HeapAlloc(GetProcessHeap(), 0, sizeof(on_progress_task_t)); - task->proc = on_progress_proc; - task->data.on_progress.progress = progress; - task->data.on_progress.progress_max = progress_max; - task->data.on_progress.status_code = status_code; + task->progress = progress; + task->progress_max = progress_max; + task->status_code = status_code; if(status_text) { DWORD size = (strlenW(status_text)+1)*sizeof(WCHAR); - task->data.on_progress.status_text = HeapAlloc(GetProcessHeap(), 0, size); - memcpy(task->data.on_progress.status_text, status_text, size); + task->status_text = HeapAlloc(GetProcessHeap(), 0, size); + memcpy(task->status_text, status_text, size); }else { - task->data.on_progress.status_text = NULL; + task->status_text = NULL; } - push_task(This, task); + push_task(This, &task->header, on_progress_proc); if(GetCurrentThreadId() != This->apartment_thread) { IBinding_AddRef(BINDING(This)); @@ -814,11 +819,18 @@ static void report_data(Binding *This, D &formatetc, &This->stgmed); } -static void report_data_proc(Binding *binding, task_t *t) +typedef struct { + task_header_t header; + DWORD bscf; +} report_data_task_t; + +static void report_data_proc(Binding *binding, task_header_t *t) { - report_data(binding, t->data.bscf); + report_data_task_t *task = (report_data_task_t*)t; + + report_data(binding, task->bscf); - HeapFree(GetProcessHeap(), 0, t); + HeapFree(GetProcessHeap(), 0, task); } static HRESULT WINAPI InternetProtocolSink_ReportData(IInternetProtocolSink *iface, @@ -857,11 +869,10 @@ static HRESULT WINAPI InternetProtocolSi } if(This->continue_call) { - task_t *task = HeapAlloc(GetProcessHeap(), 0, sizeof(task_t)); - task->proc = report_data_proc; - task->data.bscf = grfBSCF; + report_data_task_t *task = HeapAlloc(GetProcessHeap(), 0, sizeof(report_data_task_t)); + task->bscf = grfBSCF; - push_task(This, task); + push_task(This, &task->header, report_data_proc); }else { report_data(This, grfBSCF); }

1 0

Jacek Caban : urlmon: Set BINDF_NEEDFILE flag for all not urlmon protocols.
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: 451a8a6dd00ba57f89b695ead49f2d6bb10ffcc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451a8a6dd00ba57f89b695ead… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 7 17:27:35 2007 +0100 urlmon: Set BINDF_NEEDFILE flag for all not urlmon protocols. --- dlls/urlmon/binding.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index edf3bd2..bba7af4 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1089,14 +1089,46 @@ static HRESULT get_protocol(Binding *Thi return hres; } +static BOOL is_urlmon_protocol(LPCWSTR url) +{ + static const WCHAR wszCdl[] = {'c','d','l'}; + static const WCHAR wszFile[] = {'f','i','l','e'}; + static const WCHAR wszFtp[] = {'f','t','p'}; + static const WCHAR wszGopher[] = {'g','o','p','h','e','r'}; + static const WCHAR wszHttp[] = {'h','t','t','p'}; + static const WCHAR wszHttps[] = {'h','t','t','p','s'}; + static const WCHAR wszMk[] = {'m','k'}; + + static const struct { + LPCWSTR scheme; + int len; + } protocol_list[] = { + {wszCdl, sizeof(wszCdl) /sizeof(WCHAR)}, + {wszFile, sizeof(wszFile) /sizeof(WCHAR)}, + {wszFtp, sizeof(wszFtp) /sizeof(WCHAR)}, + {wszGopher, sizeof(wszGopher)/sizeof(WCHAR)}, + {wszHttp, sizeof(wszHttp) /sizeof(WCHAR)}, + {wszHttps, sizeof(wszHttps) /sizeof(WCHAR)}, + {wszMk, sizeof(wszMk) /sizeof(WCHAR)} + }; + + int i, len = strlenW(url); + + for(i=0; i < sizeof(protocol_list)/sizeof(protocol_list[0]); i++) { + if(len >= protocol_list[i].len + && !memcmp(url, protocol_list[i].scheme, protocol_list[i].len*sizeof(WCHAR))) + return TRUE; + } + + return FALSE; +} + static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding **binding) { Binding *ret; int len; HRESULT hres; - static const WCHAR wszFile[] = {'f','i','l','e',':'}; - if(!IsEqualGUID(&IID_IStream, riid)) { FIXME("Unsupported riid %s\n", debugstr_guid(riid)); return E_NOTIMPL; @@ -1159,11 +1191,10 @@ static HRESULT Binding_Create(LPCWSTR ur ret->bindf |= BINDF_FROMURLMON; - len = strlenW(url)+1; - - if(len < sizeof(wszFile)/sizeof(WCHAR) || memcmp(wszFile, url, sizeof(wszFile))) + if(!is_urlmon_protocol(url)) ret->bindf |= BINDF_NEEDFILE; + len = strlenW(url)+1; ret->url = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); memcpy(ret->url, url, len*sizeof(WCHAR));

1 0

Jacek Caban : urlmon: Use proc instead of enum in task queue.
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: 079e3822bce7a13f525a7460cd747d72b1570193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=079e3822bce7a13f525a7460c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 7 17:31:04 2007 +0100 urlmon: Use proc instead of enum in task queue. --- dlls/urlmon/binding.c | 189 +++++++++++++++++++++++-------------------------- 1 files changed, 88 insertions(+), 101 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 79731c6..e7e739c 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -36,11 +36,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct Binding Binding; -enum task_enum { - TASK_ON_PROGRESS, - TASK_SWITCH, - TASK_DATA_AVAILABLE -}; +struct _task_t; + +typedef void (*task_proc_t)(Binding*, struct _task_t*); typedef struct { Binding *binding; @@ -51,7 +49,7 @@ typedef struct { } on_progress_data; typedef struct _task_t { - enum task_enum task; + task_proc_t proc; struct _task_t *next; union { on_progress_data on_progress; @@ -159,69 +157,14 @@ static void fill_stream_buffer(ProtocolS } } -static void on_data_available(Binding *binding, DWORD bscf) -{ - FORMATETC formatetc = {0, NULL, 1, -1, TYMED_ISTREAM}; - - if(GetCurrentThreadId() != binding->apartment_thread) - FIXME("called from worked hread\n"); - - if(binding->continue_call) { - task_t *task = HeapAlloc(GetProcessHeap(), 0, sizeof(task_t)); - task->task = TASK_DATA_AVAILABLE; - task->data.bscf = bscf; - - push_task(binding, task); - - return; - } - - fill_stream_buffer(binding->stream); - - IBindStatusCallback_OnDataAvailable(binding->callback, bscf, binding->stream->buf_size, - &formatetc, &binding->stgmed); -} - - -static void do_task(Binding *binding, task_t *task) -{ - switch(task->task) { - case TASK_ON_PROGRESS: { - on_progress_data *data = &task->data.on_progress; - - IBindStatusCallback_OnProgress(binding->callback, data->progress, - data->progress_max, data->status_code, data->status_text); - - HeapFree(GetProcessHeap(), 0, data->status_text); - HeapFree(GetProcessHeap(), 0, data); - - break; - } - case TASK_SWITCH: - binding->continue_call++; - IInternetProtocol_Continue(binding->protocol, task->data.protocol_data); - binding->continue_call--; - - break; - case TASK_DATA_AVAILABLE: - on_data_available(binding, task->data.bscf); - } -} - -static void do_tasks(Binding *This) -{ - task_t *task; - - while((task = pop_task(This))) - do_task(This, task); -} - static LRESULT WINAPI notif_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { if(msg == WM_MK_CONTINUE) { Binding *binding = (Binding*)lParam; + task_t *task; - do_tasks(binding); + while((task = pop_task(binding))) + task->proc(binding, task); IBinding_Release(BINDING(binding)); return 0; @@ -264,41 +207,6 @@ static HWND get_notif_hwnd(void) return hwnd; } -static void on_progress(Binding *This, ULONG progress, ULONG progress_max, - ULONG status_code, LPCWSTR status_text) -{ - task_t *task; - - if(GetCurrentThreadId() == This->apartment_thread && !This->continue_call) { - IBindStatusCallback_OnProgress(This->callback, progress, progress_max, - status_code, status_text); - return; - } - - task = HeapAlloc(GetProcessHeap(), 0, sizeof(task_t)); - - task->task = TASK_ON_PROGRESS; - task->data.on_progress.progress = progress; - task->data.on_progress.progress_max = progress_max; - task->data.on_progress.status_code = status_code; - - if(status_text) { - DWORD size = (strlenW(status_text)+1)*sizeof(WCHAR); - - task->data.on_progress.status_text = HeapAlloc(GetProcessHeap(), 0, size); - memcpy(task->data.on_progress.status_text, status_text, size); - }else { - task->data.on_progress.status_text = NULL; - } - - push_task(This, task); - - if(GetCurrentThreadId() != This->apartment_thread) { - IBinding_AddRef(BINDING(This)); - PostMessageW(This->notif_hwnd, WM_MK_CONTINUE, 0, (LPARAM)This); - } -} - static void dump_BINDINFO(BINDINFO *bi) { static const char * const BINDINFOF_str[] = { @@ -788,6 +696,13 @@ static ULONG WINAPI InternetProtocolSink return IBinding_Release(BINDING(This)); } +static void switch_proc(Binding *binding, task_t *t) +{ + IInternetProtocol_Continue(binding->protocol, t->data.protocol_data); + + HeapFree(GetProcessHeap(), 0, t); +} + static HRESULT WINAPI InternetProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOLDATA *pProtocolData) { @@ -797,7 +712,7 @@ static HRESULT WINAPI InternetProtocolSi TRACE("(%p)->(%p)\n", This, pProtocolData); task = HeapAlloc(GetProcessHeap(), 0, sizeof(task_t)); - task->task = TASK_SWITCH; + task->proc = switch_proc; task->data.protocol_data = pProtocolData; push_task(This, task); @@ -808,6 +723,50 @@ static HRESULT WINAPI InternetProtocolSi return S_OK; } +static void on_progress_proc(Binding *This, task_t *t) +{ + IBindStatusCallback_OnProgress(This->callback, t->data.on_progress.progress, + t->data.on_progress.progress_max, t->data.on_progress.status_code, t->data.on_progress.status_text); + + HeapFree(GetProcessHeap(), 0, t->data.on_progress.status_text); + HeapFree(GetProcessHeap(), 0, t); +} + +static void on_progress(Binding *This, ULONG progress, ULONG progress_max, + ULONG status_code, LPCWSTR status_text) +{ + task_t *task; + + if(GetCurrentThreadId() == This->apartment_thread && !This->continue_call) { + IBindStatusCallback_OnProgress(This->callback, progress, progress_max, + status_code, status_text); + return; + } + + task = HeapAlloc(GetProcessHeap(), 0, sizeof(task_t)); + + task->proc = on_progress_proc; + task->data.on_progress.progress = progress; + task->data.on_progress.progress_max = progress_max; + task->data.on_progress.status_code = status_code; + + if(status_text) { + DWORD size = (strlenW(status_text)+1)*sizeof(WCHAR); + + task->data.on_progress.status_text = HeapAlloc(GetProcessHeap(), 0, size); + memcpy(task->data.on_progress.status_text, status_text, size); + }else { + task->data.on_progress.status_text = NULL; + } + + push_task(This, task); + + if(GetCurrentThreadId() != This->apartment_thread) { + IBinding_AddRef(BINDING(This)); + PostMessageW(This->notif_hwnd, WM_MK_CONTINUE, 0, (LPARAM)This); + } +} + static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink *iface, ULONG ulStatusCode, LPCWSTR szStatusText) { @@ -845,6 +804,23 @@ static HRESULT WINAPI InternetProtocolSi return S_OK; } +static void report_data(Binding *This, DWORD bscf) +{ + FORMATETC formatetc = {0, NULL, 1, -1, TYMED_ISTREAM}; + + fill_stream_buffer(This->stream); + + IBindStatusCallback_OnDataAvailable(This->callback, bscf, This->stream->buf_size, + &formatetc, &This->stgmed); +} + +static void report_data_proc(Binding *binding, task_t *t) +{ + report_data(binding, t->data.bscf); + + HeapFree(GetProcessHeap(), 0, t); +} + static HRESULT WINAPI InternetProtocolSink_ReportData(IInternetProtocolSink *iface, DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax) { @@ -852,6 +828,9 @@ static HRESULT WINAPI InternetProtocolSi TRACE("(%p)->(%d %u %u)\n", This, grfBSCF, ulProgress, ulProgressMax); + if(GetCurrentThreadId() != This->apartment_thread) + FIXME("called from worked hread\n"); + if(!This->verified_mime) { LPWSTR mime; @@ -877,7 +856,15 @@ static HRESULT WINAPI InternetProtocolSi This->request_locked = SUCCEEDED(hres); } - on_data_available(This, grfBSCF); + if(This->continue_call) { + task_t *task = HeapAlloc(GetProcessHeap(), 0, sizeof(task_t)); + task->proc = report_data_proc; + task->data.bscf = grfBSCF; + + push_task(This, task); + }else { + report_data(This, grfBSCF); + } if(grfBSCF & BSCF_LASTDATANOTIFICATION) IBindStatusCallback_OnStopBinding(This->callback, S_OK, NULL);

1 0

Jacek Caban : urlmon: Unlock protocol only if it was locked.
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: e8d2b5430922282daa73f92a34baab1542e20659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d2b5430922282daa73f92a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 7 17:28:17 2007 +0100 urlmon: Unlock protocol only if it was locked. --- dlls/urlmon/binding.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index bba7af4..79731c6 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -91,6 +91,7 @@ struct Binding { LPWSTR url; BOOL verified_mime; DWORD continue_call; + BOOL request_locked; DWORD apartment_thread; HWND notif_hwnd; @@ -871,8 +872,10 @@ static HRESULT WINAPI InternetProtocolSi if(grfBSCF & BSCF_LASTDATANOTIFICATION) on_progress(This, ulProgress, ulProgressMax, BINDSTATUS_ENDDOWNLOADDATA, This->url); - if(grfBSCF & BSCF_FIRSTDATANOTIFICATION) - IInternetProtocol_LockRequest(This->protocol, 0); + if(!This->request_locked) { + HRESULT hres = IInternetProtocol_LockRequest(This->protocol, 0); + This->request_locked = SUCCEEDED(hres); + } on_data_available(This, grfBSCF); @@ -1155,6 +1158,7 @@ static HRESULT Binding_Create(LPCWSTR ur ret->notif_hwnd = get_notif_hwnd(); ret->verified_mime = FALSE; ret->continue_call = 0; + ret->request_locked = FALSE; ret->task_queue_head = ret->task_queue_tail = NULL; memset(&ret->bindinfo, 0, sizeof(BINDINFO)); @@ -1240,7 +1244,8 @@ HRESULT start_binding(LPCWSTR url, IBind } if(binding->stream->init_buf) { - IInternetProtocol_UnlockRequest(binding->protocol); + if(binding->request_locked) + IInternetProtocol_UnlockRequest(binding->protocol); IStream_AddRef(STREAM(binding->stream)); *ppv = binding->stream;

1 0

Francois Gouget : advpack: Make the header more consistent with the implementation and fix the winapi_check warnings .
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: 71d64d09acc1ebbe6708d75f47858a37556e8725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d64d09acc1ebbe6708d75f4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 7 16:23:47 2007 +0100 advpack: Make the header more consistent with the implementation and fix the winapi_check warnings. --- include/advpub.h | 4 ++-- tools/winapi/win32.api | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/advpub.h b/include/advpub.h index 70f5907..e144d66 100644 --- a/include/advpub.h +++ b/include/advpub.h @@ -249,8 +249,8 @@ HRESULT WINAPI RunSetupCommandW(HWND hWn LPCWSTR szCmdName, LPCWSTR szInfSection, LPCWSTR szDir, LPCWSTR lpszTitle, HANDLE *phEXE, DWORD dwFlags, LPVOID pvReserved); #define RunSetupCommand WINELIB_NAME_AW(RunSetupCommand) -HRESULT WINAPI SetPerUserSecValuesA(PPERUSERSECTIONA pPerUser); -HRESULT WINAPI SetPerUserSecValuesW(PPERUSERSECTIONW pPerUser); +HRESULT WINAPI SetPerUserSecValuesA(PERUSERSECTIONA* pPerUser); +HRESULT WINAPI SetPerUserSecValuesW(PERUSERSECTIONW* pPerUser); #define SetPerUserSecValues WINELIB_NAME_AW(SetPerUserSecValues) HRESULT WINAPI TranslateInfStringA(LPCSTR pszInfFilename, LPCSTR pszInstallSection, LPCSTR pszTranslateSection, LPCSTR pszTranslateKey, LPSTR pszBuffer, diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 1bca4b2..8ae0231 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -193,15 +193,18 @@ INT %ptr CABINFOA * +CABINFOW * HANDLE * HINF * LPDWORD LPVOID PDWORD PERUSERSECTIONA * +PERUSERSECTIONW * PVOID SETUPCOMMAND_PARAMS * STRTABLEA * +STRTABLEW * %str @@ -213,10 +216,6 @@ LPSTR LPCWSTR LPWSTR -%void - -void - %%amstream.dll %long

1 0

Ken Thomases : explorer: Fix leak: always release the CFDictionary.
by Alexandre Julliard Feb. 7, 2007

Feb. 7, 2007

Module: wine Branch: master Commit: 2689b5a3553c06119db1f9b02809675365e972bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2689b5a3553c06119db1f9b02… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 7 10:11:52 2007 -0600 explorer: Fix leak: always release the CFDictionary. --- programs/explorer/diskarb.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/explorer/diskarb.c b/programs/explorer/diskarb.c index 637d983..08a8097 100644 --- a/programs/explorer/diskarb.c +++ b/programs/explorer/diskarb.c @@ -53,10 +53,10 @@ static void appeared_callback( DADiskRef /* ignore non-removable devices */ if (!(ref = CFDictionaryGetValue( dict, CFSTR("DAMediaRemovable") )) || - !CFBooleanGetValue( ref )) return; + !CFBooleanGetValue( ref )) goto done; /* get device name */ - if (!(ref = CFDictionaryGetValue( dict, CFSTR("DAMediaBSDName") ))) return; + if (!(ref = CFDictionaryGetValue( dict, CFSTR("DAMediaBSDName") ))) goto done; strcpy( device, "/dev/r" ); CFStringGetCString( ref, device + 6, sizeof(device) - 6, kCFStringEncodingASCII ); @@ -75,6 +75,7 @@ static void appeared_callback( DADiskRef WINE_TRACE( "got mount notification for '%s' on '%s'\n", device, mount_point ); add_dos_device( device, device, mount_point, type ); +done: CFRelease( dict ); } @@ -93,16 +94,17 @@ static void disappeared_callback( DADisk /* ignore non-removable devices */ if (!(ref = CFDictionaryGetValue( dict, CFSTR("DAMediaRemovable") )) || - !CFBooleanGetValue( ref )) return; + !CFBooleanGetValue( ref )) goto done; /* get device name */ - if (!(ref = CFDictionaryGetValue( dict, CFSTR("DAMediaBSDName") ))) return; + if (!(ref = CFDictionaryGetValue( dict, CFSTR("DAMediaBSDName") ))) goto done; strcpy( device, "/dev/r" ); CFStringGetCString( ref, device + 6, sizeof(device) - 6, kCFStringEncodingASCII ); WINE_TRACE( "got unmount notification for '%s'\n", device ); remove_dos_device( device ); +done: CFRelease( dict ); }

1 0