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

Jacek Caban : urlmon: Return E_FAIL in Binding::Switch implementation.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 00376b5b72c89fb5cbf2a8e326f97bd5315c561c URL: http://source.winehq.org/git/wine.git/?a=commit;h=00376b5b72c89fb5cbf2a8e32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 22:01:05 2009 +0200 urlmon: Return E_FAIL in Binding::Switch implementation. --- dlls/urlmon/binding.c | 27 ++------------------------- dlls/urlmon/tests/url.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index cd843b4..2e07f96 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1127,37 +1127,14 @@ static ULONG WINAPI InternetProtocolSink_Release(IInternetProtocolSink *iface) return IBinding_Release(BINDING(This)); } -typedef struct { - task_header_t header; - PROTOCOLDATA data; -} switch_task_t; - -static void switch_proc(Binding *binding, task_header_t *t) -{ - switch_task_t *task = (switch_task_t*)t; - - IInternetProtocol_Continue(binding->protocol, &task->data); - - heap_free(task); -} - static HRESULT WINAPI InternetProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOLDATA *pProtocolData) { Binding *This = PROTSINK_THIS(iface); - switch_task_t *task; - - TRACE("(%p)->(%p)\n", This, pProtocolData); - task = heap_alloc(sizeof(switch_task_t)); - task->data = *pProtocolData; + WARN("(%p)->(%p)\n", This, pProtocolData); - push_task(This, &task->header, switch_proc); - - IBinding_AddRef(BINDING(This)); - PostMessageW(This->notif_hwnd, WM_MK_CONTINUE, 0, (LPARAM)This); - - return S_OK; + return E_FAIL; } typedef struct { diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 6d3832e..7b9c89f 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -324,6 +324,28 @@ static ULONG WINAPI Protocol_Release(IInternetProtocol *iface) return 1; } +static void test_switch_fail(void) +{ + IInternetProtocolSink *binding_sink; + PROTOCOLDATA protocoldata; + HRESULT hres; + + static BOOL tested_switch_fail; + + if(tested_switch_fail) + return; + + tested_switch_fail = TRUE; + + hres = IBinding_QueryInterface(current_binding, &IID_IInternetProtocolSink, (void**)&binding_sink); + ok(hres == S_OK, "Could not get IInternetProtocolSink iface: %08x\n", hres); + if(SUCCEEDED(hres)) { + hres = IInternetProtocolSink_Switch(binding_sink, &protocoldata); + ok(hres == E_FAIL, "Switch failed: %08x, expected E_FAIL\n", hres); + IInternetProtocolSink_Release(binding_sink); + } +} + static DWORD WINAPI thread_proc(PVOID arg) { PROTOCOLDATA protocoldata; @@ -368,6 +390,8 @@ static DWORD WINAPI thread_proc(PVOID arg) else CHECK_CALLED(OnProgress_SENDINGREQUEST); + test_switch_fail(); + SET_EXPECT(Continue); prot_state = 1; hres = IInternetProtocolSink_Switch(protocol_sink, &protocoldata);

1 0

Jacek Caban : urlmon: Get rid of no longer needed thread checking in Binding object' s ReportData and ReportResult implementation.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 8ea07306e128a10b1d92fbff5f757fc12e13aeb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea07306e128a10b1d92fbff5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 22:01:39 2009 +0200 urlmon: Get rid of no longer needed thread checking in Binding object's ReportData and ReportResult implementation. --- dlls/urlmon/binding.c | 64 ++---------------------------------------------- 1 files changed, 3 insertions(+), 61 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 2e07f96..60152a5 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1305,22 +1305,6 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres } } -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, task->progress, task->progress_max); - - heap_free(task); -} - static HRESULT WINAPI InternetProtocolSink_ReportData(IInternetProtocolSink *iface, DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax) { @@ -1328,42 +1312,10 @@ static HRESULT WINAPI InternetProtocolSink_ReportData(IInternetProtocolSink *ifa TRACE("(%p)->(%d %u %u)\n", This, grfBSCF, ulProgress, ulProgressMax); - if(GetCurrentThreadId() != This->apartment_thread) - FIXME("called from worked hread\n"); - - if(This->continue_call) { - report_data_task_t *task = heap_alloc(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, ulProgress, ulProgressMax); - } - + report_data(This, grfBSCF, ulProgress, ulProgressMax); return S_OK; } -typedef struct { - task_header_t header; - - HRESULT hres; - LPWSTR str; -} report_result_task_t; - -static void report_result_proc(Binding *binding, task_header_t *t) -{ - report_result_task_t *task = (report_result_task_t*)t; - - IInternetProtocol_Terminate(binding->protocol, 0); - - stop_binding(binding, task->hres, task->str); - - heap_free(task->str); - heap_free(task); -} - static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *iface, HRESULT hrResult, DWORD dwError, LPCWSTR szResult) { @@ -1371,18 +1323,8 @@ static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *i TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); - if(GetCurrentThreadId() == This->apartment_thread && !This->continue_call) { - IInternetProtocol_Terminate(This->protocol, 0); - stop_binding(This, hrResult, szResult); - }else { - report_result_task_t *task = heap_alloc(sizeof(report_result_task_t)); - - task->hres = hrResult; - task->str = heap_strdupW(szResult); - - push_task(This, &task->header, report_result_proc); - } - + IInternetProtocol_Terminate(This->protocol, 0); + stop_binding(This, hrResult, szResult); return S_OK; }

1 0

Jacek Caban : urlmon: Get rid of no longer needed thread checking in Binding::ReportProgress.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: cd30018dbe49ea38532b6bc1feb86e8c7673b7a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd30018dbe49ea38532b6bc1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 22:01:54 2009 +0200 urlmon: Get rid of no longer needed thread checking in Binding::ReportProgress. --- dlls/urlmon/binding.c | 91 ++----------------------------------------------- 1 files changed, 3 insertions(+), 88 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 60152a5..b49ee8c 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -127,23 +127,6 @@ struct Binding { #define WM_MK_CONTINUE (WM_USER+101) #define WM_MK_RELEASE (WM_USER+102) -static void push_task(Binding *binding, task_header_t *task, task_proc_t proc) -{ - task->proc = proc; - task->next = NULL; - - EnterCriticalSection(&binding->section); - - if(binding->task_queue_tail) { - binding->task_queue_tail->next = task; - binding->task_queue_tail = task; - }else { - binding->task_queue_tail = binding->task_queue_head = task; - } - - LeaveCriticalSection(&binding->section); -} - static task_header_t *pop_task(Binding *binding) { task_header_t *ret; @@ -353,32 +336,12 @@ static void handle_mime_available(Binding *binding, BOOL verify) binding->clipboard_format = RegisterClipboardFormatW(binding->mime); } -typedef struct { - task_header_t header; - BOOL verify; -} mime_available_task_t; - -static void mime_available_proc(Binding *binding, task_header_t *t) -{ - mime_available_task_t *task = (mime_available_task_t*)t; - - handle_mime_available(binding, task->verify); - - heap_free(task); -} - static void mime_available(Binding *This, LPCWSTR mime, BOOL verify) { if(mime) set_binding_mime(This, mime); - if(GetCurrentThreadId() == This->apartment_thread) { - handle_mime_available(This, verify); - }else { - mime_available_task_t *task = heap_alloc(sizeof(task_header_t)); - task->verify = verify; - push_task(This, &task->header, mime_available_proc); - } + handle_mime_available(This, verify); } static void stop_binding(Binding *binding, HRESULT hres, LPCWSTR str) @@ -1137,59 +1100,11 @@ static HRESULT WINAPI InternetProtocolSink_Switch(IInternetProtocolSink *iface, return E_FAIL; } -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) -{ - 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); - - heap_free(task->status_text); - heap_free(task); -} - static void on_progress(Binding *This, ULONG progress, ULONG progress_max, ULONG status_code, LPCWSTR status_text) { - on_progress_task_t *task; - - if(GetCurrentThreadId() == This->apartment_thread && !This->continue_call) { - IBindStatusCallback_OnProgress(This->callback, progress, progress_max, - status_code, status_text); - return; - } - - task = heap_alloc(sizeof(on_progress_task_t)); - - 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->status_text = heap_alloc(size); - memcpy(task->status_text, status_text, size); - }else { - task->status_text = NULL; - } - - push_task(This, &task->header, on_progress_proc); - - if(GetCurrentThreadId() != This->apartment_thread) { - IBinding_AddRef(BINDING(This)); - PostMessageW(This->notif_hwnd, WM_MK_CONTINUE, 0, (LPARAM)This); - } + IBindStatusCallback_OnProgress(This->callback, progress, progress_max, + status_code, status_text); } static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink *iface,

1 0

Jacek Caban : urlmon: Get rid of no longer needed values in Binding object.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 89ab83db5d03e7ecd6c0c5a0a079fe584fdd2b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ab83db5d03e7ecd6c0c5a0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 22:02:12 2009 +0200 urlmon: Get rid of no longer needed values in Binding object. --- dlls/urlmon/binding.c | 39 --------------------------------------- 1 files changed, 0 insertions(+), 39 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index b49ee8c..8eca0cf 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -100,18 +100,14 @@ struct Binding { LPWSTR url; IID iid; BOOL report_mime; - DWORD continue_call; DWORD state; HRESULT hres; download_state_t download_state; IUnknown *obj; IMoniker *mon; IBindCtx *bctx; - - DWORD apartment_thread; HWND notif_hwnd; - task_header_t *task_queue_head, *task_queue_tail; CRITICAL_SECTION section; }; @@ -127,24 +123,6 @@ struct Binding { #define WM_MK_CONTINUE (WM_USER+101) #define WM_MK_RELEASE (WM_USER+102) -static task_header_t *pop_task(Binding *binding) -{ - task_header_t *ret; - - 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; - } - - LeaveCriticalSection(&binding->section); - - return ret; -} - static void fill_stgmed_buffer(stgmed_buf_t *buf) { DWORD read = 0; @@ -162,19 +140,6 @@ static void fill_stgmed_buffer(stgmed_buf_t *buf) static LRESULT WINAPI notif_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { - case WM_MK_CONTINUE: { - Binding *binding = (Binding*)lParam; - task_header_t *task; - - while((task = pop_task(binding))) { - binding->continue_call++; - task->proc(binding, task); - binding->continue_call--; - } - - IBinding_Release(BINDING(binding)); - return 0; - } case WM_MK_CONTINUE2: handle_bindprot_task((void*)lParam); return 0; @@ -1162,9 +1127,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(GetCurrentThreadId() != This->apartment_thread) - FIXME("called from worker thread\n"); - if(This->report_mime) mime_available(This, NULL, TRUE); @@ -1513,7 +1475,6 @@ static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, ret->to_object = to_obj; ret->iid = *riid; - ret->apartment_thread = GetCurrentThreadId(); ret->notif_hwnd = get_notif_hwnd(); ret->report_mime = !binding_ctx; ret->download_state = BEFORE_DOWNLOAD;

1 0

Jacek Caban : urlmon: Moved notif window handling to bindprot.c.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 372a0f24a2257d5a271bb1778a1b1bc89ad7365b URL: http://source.winehq.org/git/wine.git/?a=commit;h=372a0f24a2257d5a271bb1778… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 22:02:35 2009 +0200 urlmon: Moved notif window handling to bindprot.c. --- dlls/urlmon/binding.c | 82 -------------------------------- dlls/urlmon/bindprot.c | 114 +++++++++++++++++++++++++++++++++++++------- dlls/urlmon/urlmon_main.h | 3 - 3 files changed, 96 insertions(+), 103 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 8eca0cf..913f8fa 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -120,9 +120,6 @@ struct Binding { #define STREAM(x) ((IStream*) &(x)->lpStreamVtbl) #define HTTPNEG2(x) ((IHttpNegotiate2*) &(x)->lpHttpNegotiate2Vtbl) -#define WM_MK_CONTINUE (WM_USER+101) -#define WM_MK_RELEASE (WM_USER+102) - static void fill_stgmed_buffer(stgmed_buf_t *buf) { DWORD read = 0; @@ -137,85 +134,6 @@ static void fill_stgmed_buffer(stgmed_buf_t *buf) buf->init = TRUE; } -static LRESULT WINAPI notif_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch(msg) { - case WM_MK_CONTINUE2: - handle_bindprot_task((void*)lParam); - return 0; - case WM_MK_RELEASE: { - tls_data_t *data = get_tls_data(); - - if(!--data->notif_hwnd_cnt) { - DestroyWindow(hwnd); - data->notif_hwnd = NULL; - } - } - } - - return DefWindowProcW(hwnd, msg, wParam, lParam); -} - -HWND get_notif_hwnd(void) -{ - static ATOM wnd_class = 0; - tls_data_t *tls_data; - - static const WCHAR wszURLMonikerNotificationWindow[] = - {'U','R','L',' ','M','o','n','i','k','e','r',' ', - 'N','o','t','i','f','i','c','a','t','i','o','n',' ','W','i','n','d','o','w',0}; - - tls_data = get_tls_data(); - if(!tls_data) - return NULL; - - if(tls_data->notif_hwnd_cnt) { - tls_data->notif_hwnd_cnt++; - return tls_data->notif_hwnd; - } - - if(!wnd_class) { - static WNDCLASSEXW wndclass = { - sizeof(wndclass), 0, - notif_wnd_proc, 0, 0, - NULL, NULL, NULL, NULL, NULL, - wszURLMonikerNotificationWindow, - NULL - }; - - wndclass.hInstance = URLMON_hInstance; - - wnd_class = RegisterClassExW(&wndclass); - if (!wnd_class && GetLastError() == ERROR_CLASS_ALREADY_EXISTS) - wnd_class = 1; - } - - tls_data->notif_hwnd = CreateWindowExW(0, wszURLMonikerNotificationWindow, - wszURLMonikerNotificationWindow, 0, 0, 0, 0, 0, HWND_MESSAGE, - NULL, URLMON_hInstance, NULL); - if(tls_data->notif_hwnd) - tls_data->notif_hwnd_cnt++; - - TRACE("hwnd = %p\n", tls_data->notif_hwnd); - - return tls_data->notif_hwnd; -} - -void release_notif_hwnd(HWND hwnd) -{ - tls_data_t *data = get_tls_data(); - - if(!data || data->notif_hwnd != hwnd) { - PostMessageW(data->notif_hwnd, WM_MK_RELEASE, 0, 0); - return; - } - - if(!--data->notif_hwnd_cnt) { - DestroyWindow(data->notif_hwnd); - data->notif_hwnd = NULL; - } -} - static void dump_BINDINFO(BINDINFO *bi) { static const char * const BINDINFOF_str[] = { diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 9203755..7235b63 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -67,32 +67,110 @@ struct BindProtocol { #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) #define PROTSINK(x) ((IInternetProtocolSink*) &(x)->lpInternetProtocolSinkVtbl) -void handle_bindprot_task(void *v) +#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) { - BindProtocol *This = v; - task_header_t *task; + switch(msg) { + case WM_MK_CONTINUE: { + BindProtocol *This = (BindProtocol*)lParam; + task_header_t *task; + + 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; + } + + LeaveCriticalSection(&This->section); - while(1) { - EnterCriticalSection(&This->section); + if(!task) + break; - task = This->task_queue_head; - if(task) { - This->task_queue_head = task->next; - if(!This->task_queue_head) - This->task_queue_tail = NULL; + This->continue_call++; + task->proc(This, task); + This->continue_call--; } - LeaveCriticalSection(&This->section); + IInternetProtocol_Release(PROTOCOL(This)); + return 0; + } + case WM_MK_RELEASE: { + tls_data_t *data = get_tls_data(); - if(!task) - break; + if(!--data->notif_hwnd_cnt) { + DestroyWindow(hwnd); + data->notif_hwnd = NULL; + } + } + } + + return DefWindowProcW(hwnd, msg, wParam, lParam); +} + +HWND get_notif_hwnd(void) +{ + static ATOM wnd_class = 0; + tls_data_t *tls_data; + + static const WCHAR wszURLMonikerNotificationWindow[] = + {'U','R','L',' ','M','o','n','i','k','e','r',' ', + 'N','o','t','i','f','i','c','a','t','i','o','n',' ','W','i','n','d','o','w',0}; - This->continue_call++; - task->proc(This, task); - This->continue_call--; + tls_data = get_tls_data(); + if(!tls_data) + return NULL; + + if(tls_data->notif_hwnd_cnt) { + tls_data->notif_hwnd_cnt++; + return tls_data->notif_hwnd; + } + + if(!wnd_class) { + static WNDCLASSEXW wndclass = { + sizeof(wndclass), 0, + notif_wnd_proc, 0, 0, + NULL, NULL, NULL, NULL, NULL, + wszURLMonikerNotificationWindow, + NULL + }; + + wndclass.hInstance = URLMON_hInstance; + + wnd_class = RegisterClassExW(&wndclass); + if (!wnd_class && GetLastError() == ERROR_CLASS_ALREADY_EXISTS) + wnd_class = 1; + } + + tls_data->notif_hwnd = CreateWindowExW(0, wszURLMonikerNotificationWindow, + wszURLMonikerNotificationWindow, 0, 0, 0, 0, 0, HWND_MESSAGE, + NULL, URLMON_hInstance, NULL); + if(tls_data->notif_hwnd) + tls_data->notif_hwnd_cnt++; + + TRACE("hwnd = %p\n", tls_data->notif_hwnd); + + return tls_data->notif_hwnd; +} + +void release_notif_hwnd(HWND hwnd) +{ + tls_data_t *data = get_tls_data(); + + if(!data || data->notif_hwnd != hwnd) { + PostMessageW(data->notif_hwnd, WM_MK_RELEASE, 0, 0); + return; } - IInternetProtocol_Release(PROTOCOL(This)); + if(!--data->notif_hwnd_cnt) { + DestroyWindow(data->notif_hwnd); + data->notif_hwnd = NULL; + } } static void push_task(BindProtocol *This, task_header_t *task, task_proc_t proc) @@ -116,7 +194,7 @@ static void push_task(BindProtocol *This, task_header_t *task, task_proc_t proc) if(do_post) { IInternetProtocol_AddRef(PROTOCOL(This)); - PostMessageW(This->notif_hwnd, WM_MK_CONTINUE2, 0, (LPARAM)This); + PostMessageW(This->notif_hwnd, WM_MK_CONTINUE, 0, (LPARAM)This); } } diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 13eb4f3..c3f9448 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -119,9 +119,6 @@ tls_data_t *get_tls_data(void); HWND get_notif_hwnd(void); void release_notif_hwnd(HWND); -#define WM_MK_CONTINUE2 (WM_USER+103) -void handle_bindprot_task(void*); - static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len);

1 0

Jacek Caban : mshtml: Handle aCount < buf_size case correctly in nsIInputStream::Read implementation.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: db0bd528e77e2d2d6307b4d21d2635c5abe3cf81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db0bd528e77e2d2d6307b4d21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 23:08:24 2009 +0200 mshtml: Handle aCount < buf_size case correctly in nsIInputStream::Read implementation. --- dlls/mshtml/navigate.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 6e41699..f882e6c 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -152,18 +152,21 @@ static nsresult NSAPI nsInputStream_Read(nsIInputStream *iface, char *aBuf, PRUi PRUint32 *_retval) { nsProtocolStream *This = NSINSTREAM_THIS(iface); + DWORD read = aCount; TRACE("(%p)->(%p %d %p)\n", This, aBuf, aCount, _retval); - /* Gecko always calls Read with big enough buffer */ - if(aCount < This->buf_size) - FIXME("aCount < This->buf_size\n"); + if(read > This->buf_size) + read = This->buf_size; - *_retval = This->buf_size; - if(This->buf_size) - memcpy(aBuf, This->buf, This->buf_size); - This->buf_size = 0; + if(read) { + memcpy(aBuf, This->buf, read); + if(read < This->buf_size) + memmove(This->buf, This->buf+read, This->buf_size-read); + This->buf_size -= read; + } + *_retval = read; return NS_OK; }

1 0

Roderick Colenbrander : opengl32: Add a wglShareLists test.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 03c6a0d9d1ba17be8ba8ea15b167bd2b80e915da URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c6a0d9d1ba17be8ba8ea15b… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon May 11 22:12:10 2009 +0200 opengl32: Add a wglShareLists test. --- dlls/opengl32/tests/opengl.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 49659eb..48a75f8 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -285,6 +285,59 @@ static void test_setpixelformat(HDC winhdc) } } +static void test_sharelists(HDC winhdc) +{ + HGLRC hglrc1, hglrc2, hglrc3; + int res; + + hglrc1 = wglCreateContext(winhdc); + res = wglShareLists(0, 0); + ok(res == FALSE, "Sharing display lists for no contexts passed!\n"); + + /* Test 1: Create a context and just share lists without doing anything special */ + hglrc2 = wglCreateContext(winhdc); + if(hglrc2) + { + res = wglShareLists(hglrc1, hglrc2); + ok(res, "Sharing of display lists failed\n"); + wglDeleteContext(hglrc2); + } + + /* Test 2: Share display lists with a 'destination' context which has been made current */ + hglrc2 = wglCreateContext(winhdc); + if(hglrc2) + { + res = wglMakeCurrent(winhdc, hglrc2); + ok(res, "Make current failed\n"); + res = wglShareLists(hglrc1, hglrc2); + todo_wine ok(res, "Sharing display lists with a destination context which has been made current passed\n"); + wglMakeCurrent(0, 0); + wglDeleteContext(hglrc2); + } + + /* Test 3: Share display lists with a context which already shares display lists with another context. + * According to MSDN the second paramater can't share any display lists but some buggy drivers might allow it */ + hglrc3 = wglCreateContext(winhdc); + if(hglrc3) + { + res = wglShareLists(hglrc3, hglrc1); + ok(res == FALSE, "Sharing of display lists failed for a context which already shared lists before\n"); + wglDeleteContext(hglrc3); + } + + /* Test 4: Share display lists with a 'source' context which has been made current */ + hglrc2 = wglCreateContext(winhdc); + if(hglrc2) + { + res = wglMakeCurrent(winhdc, hglrc1); + ok(res, "Make current failed\n"); + res = wglShareLists(hglrc1, hglrc2); + ok(res, "Sharing display lists with a source context which has been made current passed\n"); + wglMakeCurrent(0, 0); + wglDeleteContext(hglrc2); + } +} + static void test_makecurrent(HDC winhdc) { BOOL ret; @@ -601,6 +654,7 @@ START_TEST(opengl) test_makecurrent(hdc); test_setpixelformat(hdc); + test_sharelists(hdc); test_colorbits(hdc); test_gdi_dbuf(hdc);

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_register to shader_arb_get_register_name().
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: fef425317101eef6e59f5d01437a0519ef061562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef425317101eef6e59f5d014… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 11 16:43:49 2009 +0200 wined3d: Pass a struct wined3d_shader_register to shader_arb_get_register_name(). --- dlls/wined3d/arb_program_shader.c | 90 +++++++++++++++--------------------- 1 files changed, 38 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fef425317101eef6e59f5…

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_register to shader_dump_register().
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 2039702035d71aa9ae35c2fe5904e347357f0ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2039702035d71aa9ae35c2fe5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 11 16:43:49 2009 +0200 wined3d: Pass a struct wined3d_shader_register to shader_dump_register(). --- dlls/wined3d/baseshader.c | 44 +++++++++++++++++++++----------------------- 1 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 8b8aef4..7018abe 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -721,15 +721,14 @@ static void shader_dump_decl_usage(const struct wined3d_shader_semantic *semanti } } -static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx, - enum wined3d_immconst_type immconst_type, const DWORD *immconst_data, - const struct wined3d_shader_src_param *rel_addr, const struct wined3d_shader_version *shader_version) +static void shader_dump_register(const struct wined3d_shader_register *reg, + const struct wined3d_shader_version *shader_version) { static const char * const rastout_reg_names[] = {"oPos", "oFog", "oPts"}; static const char * const misctype_reg_names[] = {"vPos", "vFace"}; - UINT offset = register_idx; + UINT offset = reg->idx; - switch (register_type) + switch (reg->type) { case WINED3DSPR_TEMP: TRACE("r"); @@ -744,7 +743,7 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type case WINED3DSPR_CONST3: case WINED3DSPR_CONST4: TRACE("c"); - offset = shader_get_float_offset(register_type, register_idx); + offset = shader_get_float_offset(reg->type, reg->idx); break; case WINED3DSPR_TEXTURE: /* vs: case WINED3DSPR_ADDR */ @@ -752,7 +751,7 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type break; case WINED3DSPR_RASTOUT: - TRACE("%s", rastout_reg_names[register_idx]); + TRACE("%s", rastout_reg_names[reg->idx]); break; case WINED3DSPR_COLOROUT: @@ -795,8 +794,8 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type break; case WINED3DSPR_MISCTYPE: - if (register_idx > 1) FIXME("Unhandled misctype register %d\n", register_idx); - else TRACE("%s", misctype_reg_names[register_idx]); + if (reg->idx > 1) FIXME("Unhandled misctype register %d\n", reg->idx); + else TRACE("%s", misctype_reg_names[reg->idx]); break; case WINED3DSPR_PREDICATE: @@ -808,41 +807,41 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type break; default: - TRACE("unhandled_rtype(%#x)", register_type); + TRACE("unhandled_rtype(%#x)", reg->type); break; } - if (register_type == WINED3DSPR_IMMCONST) + if (reg->type == WINED3DSPR_IMMCONST) { TRACE("("); - switch (immconst_type) + switch (reg->immconst_type) { case WINED3D_IMMCONST_FLOAT: - TRACE("%.8e", *(float *)immconst_data); + TRACE("%.8e", *(float *)reg->immconst_data); break; case WINED3D_IMMCONST_FLOAT4: TRACE("%.8e, %.8e, %.8e, %.8e", - *(float *)&immconst_data[0], *(float *)&immconst_data[1], - *(float *)&immconst_data[2], *(float *)&immconst_data[3]); + *(float *)&reg->immconst_data[0], *(float *)&reg->immconst_data[1], + *(float *)&reg->immconst_data[2], *(float *)&reg->immconst_data[3]); break; default: - TRACE("<unhandled immconst_type %#x>", immconst_type); + TRACE("<unhandled immconst_type %#x>", reg->immconst_type); break; } TRACE(")"); } - else if (register_type != WINED3DSPR_RASTOUT && register_type != WINED3DSPR_MISCTYPE) + else if (reg->type != WINED3DSPR_RASTOUT && reg->type != WINED3DSPR_MISCTYPE) { - if (rel_addr) + if (reg->rel_addr) { TRACE("["); - shader_dump_src_param(rel_addr, shader_version); + shader_dump_src_param(reg->rel_addr, shader_version); TRACE(" + "); } TRACE("%u", offset); - if (rel_addr) TRACE("]"); + if (reg->rel_addr) TRACE("]"); } } @@ -851,7 +850,7 @@ void shader_dump_dst_param(const struct wined3d_shader_dst_param *param, { DWORD write_mask = param->write_mask; - shader_dump_register(param->reg.type, param->reg.idx, 0, NULL, param->reg.rel_addr, shader_version); + shader_dump_register(&param->reg, shader_version); if (write_mask != WINED3DSP_WRITEMASK_ALL) { @@ -885,8 +884,7 @@ void shader_dump_src_param(const struct wined3d_shader_src_param *param, if (src_modifier == WINED3DSPSM_ABS || src_modifier == WINED3DSPSM_ABSNEG) TRACE("abs("); - shader_dump_register(param->reg.type, param->reg.idx, param->reg.immconst_type, - param->reg.immconst_data, param->reg.rel_addr, shader_version); + shader_dump_register(&param->reg, shader_version); if (src_modifier) {

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_register to shader_record_register_usage().
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: adc9bfe3fdc673c1c85e700861b4e692bf71b2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc9bfe3fdc673c1c85e70086… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 11 16:43:49 2009 +0200 wined3d: Pass a struct wined3d_shader_register to shader_record_register_usage(). --- dlls/wined3d/baseshader.c | 75 ++++++++++++++++++++------------------------- 1 files changed, 33 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 7018abe..1746917 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -246,24 +246,24 @@ static inline void set_bitmap_bit(DWORD *bitmap, DWORD bit) } static void shader_record_register_usage(IWineD3DBaseShaderImpl *This, struct shader_reg_maps *reg_maps, - DWORD register_type, UINT register_idx, BOOL has_rel_addr, BOOL pshader) + const struct wined3d_shader_register *reg, BOOL pshader) { - switch (register_type) + switch (reg->type) { case WINED3DSPR_TEXTURE: /* WINED3DSPR_ADDR */ - if (pshader) reg_maps->texcoord[register_idx] = 1; - else reg_maps->address[register_idx] = 1; + if (pshader) reg_maps->texcoord[reg->idx] = 1; + else reg_maps->address[reg->idx] = 1; break; case WINED3DSPR_TEMP: - reg_maps->temporary[register_idx] = 1; + reg_maps->temporary[reg->idx] = 1; break; case WINED3DSPR_INPUT: - if (!pshader) reg_maps->attributes[register_idx] = 1; + if (!pshader) reg_maps->attributes[reg->idx] = 1; else { - if (has_rel_addr) + if (reg->rel_addr) { /* If relative addressing is used, we must assume that all registers * are used. Even if it is a construct like v3[aL], we can't assume @@ -276,68 +276,68 @@ static void shader_record_register_usage(IWineD3DBaseShaderImpl *This, struct sh } else { - ((IWineD3DPixelShaderImpl *)This)->input_reg_used[register_idx] = TRUE; + ((IWineD3DPixelShaderImpl *)This)->input_reg_used[reg->idx] = TRUE; } } break; case WINED3DSPR_RASTOUT: - if (register_idx == 1) reg_maps->fog = 1; + if (reg->idx == 1) reg_maps->fog = 1; break; case WINED3DSPR_MISCTYPE: - if (pshader && register_idx == 0) reg_maps->vpos = 1; + if (pshader && reg->idx == 0) reg_maps->vpos = 1; break; case WINED3DSPR_CONST: - if (has_rel_addr) + if (reg->rel_addr) { if (!pshader) { - if (register_idx <= ((IWineD3DVertexShaderImpl *)This)->min_rel_offset) - ((IWineD3DVertexShaderImpl *)This)->min_rel_offset = register_idx; - else if (register_idx >= ((IWineD3DVertexShaderImpl *)This)->max_rel_offset) - ((IWineD3DVertexShaderImpl *)This)->max_rel_offset = register_idx; + if (reg->idx <= ((IWineD3DVertexShaderImpl *)This)->min_rel_offset) + ((IWineD3DVertexShaderImpl *)This)->min_rel_offset = reg->idx; + else if (reg->idx >= ((IWineD3DVertexShaderImpl *)This)->max_rel_offset) + ((IWineD3DVertexShaderImpl *)This)->max_rel_offset = reg->idx; } reg_maps->usesrelconstF = TRUE; } else { - set_bitmap_bit(reg_maps->constf, register_idx); + set_bitmap_bit(reg_maps->constf, reg->idx); } break; case WINED3DSPR_CONSTINT: - reg_maps->integer_constants |= (1 << register_idx); + reg_maps->integer_constants |= (1 << reg->idx); break; case WINED3DSPR_CONSTBOOL: - reg_maps->boolean_constants |= (1 << register_idx); + reg_maps->boolean_constants |= (1 << reg->idx); break; default: - TRACE("Not recording register of type %#x and idx %u\n", register_type, register_idx); + TRACE("Not recording register of type %#x and idx %u\n", reg->type, reg->idx); break; } } -static unsigned char get_instr_regcount(enum WINED3D_SHADER_INSTRUCTION_HANDLER instr, int param) +static unsigned int get_instr_extra_regcount(enum WINED3D_SHADER_INSTRUCTION_HANDLER instr, unsigned int param) { switch(instr) { case WINED3DSIH_M4x4: case WINED3DSIH_M3x4: - return param == 1 ? 4 : 1; + return param == 1 ? 3 : 0; case WINED3DSIH_M4x3: case WINED3DSIH_M3x3: - return param == 1 ? 3 : 1; + return param == 1 ? 2 : 0; case WINED3DSIH_M3x2: - return param == 1 ? 2 : 1; + return param == 1 ? 1 : 0; default: - return 1; + return 0; } } @@ -558,8 +558,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 } else { - shader_record_register_usage(This, reg_maps, dst_param.reg.type, - dst_param.reg.idx, !!dst_param.reg.rel_addr, pshader); + shader_record_register_usage(This, reg_maps, &dst_param.reg, pshader); } /* Declare 1.X samplers implicitly, based on the destination reg. number */ @@ -617,25 +616,17 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 for (i = 0; i < limit; ++i) { struct wined3d_shader_src_param src_param, src_rel_addr; + unsigned int count; fe->shader_read_src_param(fe_data, &pToken, &src_param, &src_rel_addr); - switch(get_instr_regcount(ins.handler_idx, i)) + count = get_instr_extra_regcount(ins.handler_idx, i); + + shader_record_register_usage(This, reg_maps, &src_param.reg, pshader); + while (count) { - case 4: - shader_record_register_usage(This, reg_maps, src_param.reg.type, - src_param.reg.idx + 3, !!src_param.reg.rel_addr, pshader); - /* drop through */ - case 3: - shader_record_register_usage(This, reg_maps, src_param.reg.type, - src_param.reg.idx + 2, !!src_param.reg.rel_addr, pshader); - /* drop through */ - case 2: - shader_record_register_usage(This, reg_maps, src_param.reg.type, - src_param.reg.idx + 1, !!src_param.reg.rel_addr, pshader); - /* drop through */ - case 1: - shader_record_register_usage(This, reg_maps, src_param.reg.type, - src_param.reg.idx, !!src_param.reg.rel_addr, pshader); + ++src_param.reg.idx; + shader_record_register_usage(This, reg_maps, &src_param.reg, pshader); + --count; } } }

1 0