February 2015 - Wine-commits

Henri Verbeet : dxgi: Implement dxgi_factory_GetPrivateData().
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 00daa8bc64ec647e477a48d5ed477488d648e40d URL: http://source.winehq.org/git/wine.git/?a=commit;h=00daa8bc64ec647e477a48d5e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 16 12:25:51 2015 +0100 dxgi: Implement dxgi_factory_GetPrivateData(). --- dlls/dxgi/factory.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 3943051..df36d82 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -113,9 +113,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateDataInterface(IDXGIFacto static HRESULT STDMETHODCALLTYPE dxgi_factory_GetPrivateData(IDXGIFactory1 *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_factory *factory = impl_from_IDXGIFactory1(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_get_private_data(&factory->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_factory_GetParent(IDXGIFactory1 *iface, REFIID iid, void **parent)

1 0

Henri Verbeet : dxgi: Implement dxgi_output_SetPrivateData().
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 7e2423e16afccddee12adcebfbebfb69c7bb73f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e2423e16afccddee12adcebf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 16 12:25:52 2015 +0100 dxgi: Implement dxgi_output_SetPrivateData(). --- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/output.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 45f2404..727a75f 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -119,6 +119,7 @@ struct dxgi_output { IDXGIOutput IDXGIOutput_iface; LONG refcount; + struct wined3d_private_store private_store; struct dxgi_adapter *adapter; }; diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index f4a5c29..326c128 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -68,6 +68,7 @@ static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput *iface) if (!refcount) { + wined3d_private_store_cleanup(&This->private_store); HeapFree(GetProcessHeap(), 0, This); } @@ -79,9 +80,11 @@ static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput *iface) static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateData(IDXGIOutput *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_output *output = impl_from_IDXGIOutput(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_set_private_data(&output->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateDataInterface(IDXGIOutput *iface, @@ -289,5 +292,6 @@ void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) { output->IDXGIOutput_iface.lpVtbl = &dxgi_output_vtbl; output->refcount = 1; + wined3d_private_store_init(&output->private_store); output->adapter = adapter; }

1 0

Henri Verbeet : dxgi: Implement dxgi_output_SetPrivateDataInterface().
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: c8221e293e6458f7a70cf22baf7f092ebf5de56d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8221e293e6458f7a70cf22ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 16 12:25:53 2015 +0100 dxgi: Implement dxgi_output_SetPrivateDataInterface(). --- dlls/dxgi/output.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 326c128..b85fe0f 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -90,9 +90,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateData(IDXGIOutput *iface, static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateDataInterface(IDXGIOutput *iface, REFGUID guid, const IUnknown *object) { - FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); + struct dxgi_output *output = impl_from_IDXGIOutput(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, object %p.\n", iface, debugstr_guid(guid), object); + + return dxgi_set_private_data_interface(&output->private_store, guid, object); } static HRESULT STDMETHODCALLTYPE dxgi_output_GetPrivateData(IDXGIOutput *iface,

1 0

Henri Verbeet : dxgi: Implement dxgi_output_GetPrivateData().
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 3fe5d9b6d2e592c4635e1aaf9a64001492baf90e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe5d9b6d2e592c4635e1aaf9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 16 12:25:54 2015 +0100 dxgi: Implement dxgi_output_GetPrivateData(). --- dlls/dxgi/output.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index b85fe0f..6ff10a9 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -100,9 +100,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateDataInterface(IDXGIOutput static HRESULT STDMETHODCALLTYPE dxgi_output_GetPrivateData(IDXGIOutput *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_output *output = impl_from_IDXGIOutput(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_get_private_data(&output->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_output_GetParent(IDXGIOutput *iface,

1 0

Austin English : d3dx9_36: Add D3DXDisassembleShader stub.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: c19876ed4ed7de550b4fe4a06ef1c28d5b516da2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19876ed4ed7de550b4fe4a06… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 10 17:30:00 2015 -0600 d3dx9_36: Add D3DXDisassembleShader stub. --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/shader.c | 6 ++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- 21 files changed, 26 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c19876ed4ed7de550b4fe…

1 0

Austin English : crytpui: Add CryptUIWizDigitalSign stub.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: edb5ccc3f956d911930d18fd05a232c3c97ee3bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb5ccc3f956d911930d18fd0… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 11 20:26:37 2015 -0600 crytpui: Add CryptUIWizDigitalSign stub. --- dlls/cryptui/cryptui.spec | 2 +- dlls/cryptui/main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/cryptui/cryptui.spec b/dlls/cryptui/cryptui.spec index c4b579a..dfdc5a4 100644 --- a/dlls/cryptui/cryptui.spec +++ b/dlls/cryptui/cryptui.spec @@ -30,7 +30,7 @@ 30 stub CryptUIWizBuildCTL 31 stub CryptUIWizCertRequest 32 stub CryptUIWizCreateCertRequestNoDS -33 stub CryptUIWizDigitalSign +33 stdcall CryptUIWizDigitalSign(long long wstr ptr ptr) 34 stdcall CryptUIWizExport(long ptr wstr ptr ptr) 35 stub CryptUIWizFreeCertRequestNoDS 36 stub CryptUIWizFreeDigitalSignContext diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 9f76456..616ccf7 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -7057,3 +7057,10 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateFromStore(HCERTSTORE hCertStore FIXME("%p %p %s %s %d %d %p: stub\n", hCertStore, hwnd, debugstr_w(pwszTitle), debugstr_w(pwszDisplayString), dwDontUseColumn, dwFlags, pvReserved); return NULL; } + +BOOL WINAPI CryptUIWizDigitalSign(DWORD flags, HWND parent, LPCWSTR title, PCCRYPTUI_WIZ_DIGITAL_SIGN_INFO info, + PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *context) +{ + FIXME("%d %p %s %p %p: stub\n", flags, parent, debugstr_w(title), info, context); + return FALSE; +}

1 0

Stefan Dösinger : ddraw/tests: Port D3D1_TextureMapBlendTest to ddraw1.c.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: c0efc3ebf89f3fa5ed81007d07264120f5386cd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0efc3ebf89f3fa5ed81007d0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 15 20:39:10 2015 +0100 ddraw/tests: Port D3D1_TextureMapBlendTest to ddraw1.c. --- dlls/ddraw/tests/ddraw1.c | 386 ++++++++++++++++++++++++ dlls/ddraw/tests/visual.c | 746 +--------------------------------------------- 2 files changed, 389 insertions(+), 743 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0efc3ebf89f3fa5ed810…

1 0

Stefan Dösinger : ddraw/tests: Port test_texturemapblend to ddraw2.c.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 8c158c1e33df1cee7747d1761c27f5d8f2362f41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c158c1e33df1cee7747d1761… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 15 20:39:11 2015 +0100 ddraw/tests: Port test_texturemapblend to ddraw2.c. --- dlls/ddraw/tests/ddraw2.c | 332 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 332 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c158c1e33df1cee7747d…

1 0

Hans Leidekker : winhttp: Implement a task queue for asynchronous requests.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: d6c9c984e5c2c30fe7b37e21465ec71a1ad8c3de URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c9c984e5c2c30fe7b37e214… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 16 14:40:38 2015 +0100 winhttp: Implement a task queue for asynchronous requests. This ensures that asynchronous calls are completed in the right order. --- dlls/winhttp/request.c | 81 ++++++++++++++++++++++++++++++++++++++---- dlls/winhttp/session.c | 19 ++++++++-- dlls/winhttp/winhttp_private.h | 6 ++++ 3 files changed, 96 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index dc13fd0..2932108 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -178,20 +178,87 @@ static const WCHAR *attribute_table[] = NULL /* WINHTTP_QUERY_PASSPORT_CONFIG = 78 */ }; -static DWORD CALLBACK task_thread( LPVOID param ) +static task_header_t *dequeue_task( request_t *request ) { - task_header_t *task = param; + task_header_t *task; - task->proc( task ); + EnterCriticalSection( &request->task_cs ); + TRACE("%u tasks queued\n", list_count( &request->task_queue )); + task = LIST_ENTRY( list_head( &request->task_queue ), task_header_t, entry ); + if (task) list_remove( &task->entry ); + LeaveCriticalSection( &request->task_cs ); - release_object( &task->request->hdr ); - heap_free( task ); - return ERROR_SUCCESS; + TRACE("returning task %p\n", task); + return task; +} + +static DWORD CALLBACK task_proc( LPVOID param ) +{ + request_t *request = param; + HANDLE handles[2]; + + handles[0] = request->task_wait; + handles[1] = request->task_cancel; + for (;;) + { + DWORD err = WaitForMultipleObjects( 2, handles, FALSE, INFINITE ); + switch (err) + { + case WAIT_OBJECT_0: + { + task_header_t *task; + while ((task = dequeue_task( request ))) + { + task->proc( task ); + release_object( &task->request->hdr ); + heap_free( task ); + } + break; + } + case WAIT_OBJECT_0 + 1: + TRACE("exiting\n"); + return 0; + + default: + ERR("wait failed %u (%u)\n", err, GetLastError()); + break; + } + } + return 0; } static BOOL queue_task( task_header_t *task ) { - return QueueUserWorkItem( task_thread, task, WT_EXECUTELONGFUNCTION ); + request_t *request = task->request; + + if (!request->task_thread) + { + if (!(request->task_wait = CreateEventW( NULL, FALSE, FALSE, NULL ))) return FALSE; + if (!(request->task_cancel = CreateEventW( NULL, FALSE, FALSE, NULL ))) + { + CloseHandle( request->task_wait ); + request->task_wait = NULL; + return FALSE; + } + if (!(request->task_thread = CreateThread( NULL, 0, task_proc, request, 0, NULL ))) + { + CloseHandle( request->task_wait ); + request->task_wait = NULL; + CloseHandle( request->task_cancel ); + request->task_cancel = NULL; + return FALSE; + } + InitializeCriticalSection( &request->task_cs ); + request->task_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": request.task_cs"); + } + + EnterCriticalSection( &request->task_cs ); + TRACE("queueing task %p\n", task ); + list_add_tail( &request->task_queue, &task->entry ); + LeaveCriticalSection( &request->task_cs ); + + SetEvent( request->task_wait ); + return TRUE; } static void free_header( header_t *header ) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 56e776d..0eca509 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -70,9 +70,12 @@ DWORD get_last_error( void ) void send_callback( object_header_t *hdr, DWORD status, LPVOID info, DWORD buflen ) { - TRACE("%p, 0x%08x, %p, %u\n", hdr, status, info, buflen); - - if (hdr->callback && (hdr->notify_mask & status)) hdr->callback( hdr->handle, hdr->context, status, info, buflen ); + if (hdr->callback && (hdr->notify_mask & status)) + { + TRACE("%p, 0x%08x, %p, %u\n", hdr, status, info, buflen); + hdr->callback( hdr->handle, hdr->context, status, info, buflen ); + TRACE("returning from 0x%08x callback\n", status); + } } /*********************************************************************** @@ -556,6 +559,15 @@ static void request_destroy( object_header_t *hdr ) TRACE("%p\n", request); + if (request->task_thread) + { + SetEvent( request->task_cancel ); + WaitForSingleObject( request->task_thread, INFINITE ); + CloseHandle( request->task_thread ); + CloseHandle( request->task_cancel ); + CloseHandle( request->task_wait ); + DeleteCriticalSection( &request->task_cs ); + } release_object( &request->connect->hdr ); destroy_authinfo( request->authinfo ); @@ -1057,6 +1069,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o request->hdr.context = connect->hdr.context; request->hdr.redirect_policy = connect->hdr.redirect_policy; list_init( &request->hdr.children ); + list_init( &request->task_queue ); addref_object( &connect->hdr ); request->connect = connect; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 51043fd..4c567ed 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -201,12 +201,18 @@ typedef struct DWORD num_accept_types; struct authinfo *authinfo; struct authinfo *proxy_authinfo; + HANDLE task_wait; + HANDLE task_cancel; + HANDLE task_thread; + struct list task_queue; + CRITICAL_SECTION task_cs; } request_t; typedef struct _task_header_t task_header_t; struct _task_header_t { + struct list entry; request_t *request; void (*proc)( task_header_t * ); };

1 0

Hans Leidekker : winhttp: Return an error from winhttp_request_get_ResponseBody if the request is not sent.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 6f046e0f518ea19b510ed14463a484aaa485050c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f046e0f518ea19b510ed1446… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 16 14:41:10 2015 +0100 winhttp: Return an error from winhttp_request_get_ResponseBody if the request is not sent. --- dlls/winhttp/request.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2932108..135a291 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3664,6 +3664,11 @@ static HRESULT WINAPI winhttp_request_get_ResponseBody( if (!body) return E_INVALIDARG; EnterCriticalSection( &request->cs ); + if (request->state < REQUEST_STATE_SENT) + { + err = ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND; + goto done; + } if (!(sa = SafeArrayCreateVector( VT_UI1, 0, request->offset ))) { err = ERROR_OUTOFMEMORY;

1 0