February 2015 - Wine-Commits

Thomas Faber : gdi32/tests: Avoid variable length arrays (MSVC).
by Alexandre Julliard Feb. 17, 2015

Feb. 17, 2015

Module: wine Branch: master Commit: 656bc70f80e72774f3d266308157f44c89bce6ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=656bc70f80e72774f3d266308… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Feb 16 09:14:34 2015 +0100 gdi32/tests: Avoid variable length arrays (MSVC). --- dlls/gdi32/tests/bitmap.c | 2 +- dlls/gdi32/tests/pen.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 351a5ca..84f843f 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1588,7 +1588,7 @@ static BOOL is_black_pen( COLORREF fg, COLORREF bg, int r, int g, int b ) static void test_bitmap_colors( HDC hdc, COLORREF fg, COLORREF bg, int r, int g, int b ) { static const WORD pattern_bits[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa }; - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors ) + 256 * sizeof(RGBQUAD)]; BITMAPINFO *info = (BITMAPINFO *)buffer; RGBQUAD *colors = info->bmiColors; WORD bits[16]; diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index 156700f..43f00d8 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -512,7 +512,7 @@ static void test_ps_userstyle(void) LOGBRUSH lb; HPEN pen; INT size, i; - char buffer[offsetof(EXTLOGPEN, elpStyleEntry[16])]; + char buffer[offsetof(EXTLOGPEN, elpStyleEntry) + 16 * sizeof(DWORD)]; EXTLOGPEN *ext_pen = (EXTLOGPEN *)buffer; lb.lbColor = 0x00ff0000; @@ -569,7 +569,7 @@ static void test_ps_userstyle(void) static void test_brush_pens(void) { - char buffer[offsetof(EXTLOGPEN, elpStyleEntry[16])]; + char buffer[offsetof(EXTLOGPEN, elpStyleEntry) + 16 * sizeof(DWORD)]; EXTLOGPEN *elp = (EXTLOGPEN *)buffer; LOGBRUSH lb; HPEN pen = 0;

1 0

Thomas Faber : winegstreamer: Avoid empty initializer braces.
by Alexandre Julliard Feb. 17, 2015

Feb. 17, 2015

Module: wine Branch: master Commit: ed761920ca7a6803485a74bb3a08a3762b5951b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed761920ca7a6803485a74bb3… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Feb 14 09:35:56 2015 +0100 winegstreamer: Avoid empty initializer braces. --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 4e5f04d..de48efd 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -707,7 +707,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, gboolean last, GS PIN_INFO piOutput; const char *typename; char *name; - AM_MEDIA_TYPE amt = { }; + AM_MEDIA_TYPE amt = {{0}}; GstCaps *caps; GstStructure *arg; GstPad *mypad;

1 0

Stefan Dösinger : ddraw/tests: Port D3D1_ViewportClearTest to ddraw1.c (v2).
by Alexandre Julliard Feb. 17, 2015

Feb. 17, 2015

Module: wine Branch: master Commit: f64815e6513d4f2f8ba097ff2abb6b5752962af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f64815e6513d4f2f8ba097ff2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 16 19:10:41 2015 +0100 ddraw/tests: Port D3D1_ViewportClearTest to ddraw1.c (v2). --- dlls/ddraw/tests/ddraw1.c | 66 +++++++++++ dlls/ddraw/tests/ddraw2.c | 66 +++++++++++ dlls/ddraw/tests/visual.c | 291 +--------------------------------------------- 3 files changed, 134 insertions(+), 289 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f64815e6513d4f2f8ba09…

1 0

Henri Verbeet : dxgi: Implement dxgi_swapchain_SetPrivateDataInterface().
by Alexandre Julliard Feb. 17, 2015

Feb. 17, 2015

Module: wine Branch: master Commit: e37272ee864a9fa85f2030116377d9089d6ef85c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e37272ee864a9fa85f2030116… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 17 10:15:41 2015 +0100 dxgi: Implement dxgi_swapchain_SetPrivateDataInterface(). --- dlls/dxgi/swapchain.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 4ac3421..a348ecc 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -92,9 +92,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_SetPrivateData(IDXGISwapChain *i static HRESULT STDMETHODCALLTYPE dxgi_swapchain_SetPrivateDataInterface(IDXGISwapChain *iface, REFGUID guid, const IUnknown *object) { - FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, object %p.\n", iface, debugstr_guid(guid), object); + + return dxgi_set_private_data_interface(&swapchain->private_store, guid, object); } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetPrivateData(IDXGISwapChain *iface,

1 0

Henri Verbeet : dxgi: Implement dxgi_swapchain_SetPrivateData().
by Alexandre Julliard Feb. 17, 2015

Feb. 17, 2015

Module: wine Branch: master Commit: 59ffc7bc8d3ca0df113a334da0eec390a025559c URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ffc7bc8d3ca0df113a334da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 17 10:15:40 2015 +0100 dxgi: Implement dxgi_swapchain_SetPrivateData(). --- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/swapchain.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 206fce6..8703158 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -144,6 +144,7 @@ struct dxgi_swapchain { IDXGISwapChain IDXGISwapChain_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_swapchain *wined3d_swapchain; }; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 437537a..4ac3421 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -82,9 +82,11 @@ static ULONG STDMETHODCALLTYPE dxgi_swapchain_Release(IDXGISwapChain *iface) static HRESULT STDMETHODCALLTYPE dxgi_swapchain_SetPrivateData(IDXGISwapChain *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_swapchain *swapchain = impl_from_IDXGISwapChain(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(&swapchain->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_SetPrivateDataInterface(IDXGISwapChain *iface, @@ -276,6 +278,9 @@ static const struct IDXGISwapChainVtbl dxgi_swapchain_vtbl = static void STDMETHODCALLTYPE dxgi_swapchain_wined3d_object_released(void *parent) { + struct dxgi_swapchain *swapchain = parent; + + wined3d_private_store_cleanup(&swapchain->private_store); HeapFree(GetProcessHeap(), 0, parent); } @@ -291,11 +296,13 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device swapchain->IDXGISwapChain_iface.lpVtbl = &dxgi_swapchain_vtbl; swapchain->refcount = 1; + wined3d_private_store_init(&swapchain->private_store); if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, &dxgi_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); + wined3d_private_store_cleanup(&swapchain->private_store); return hr; }

1 0

Nikolay Sivov : wshom.ocx: Implement RegRead().
by Alexandre Julliard Feb. 17, 2015

Feb. 17, 2015

Module: wine Branch: master Commit: 41c44f918504cc0aefc3a54625d2b87b349593cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c44f918504cc0aefc3a5462… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 16 11:26:24 2015 +0300 wshom.ocx: Implement RegRead(). --- dlls/wshom.ocx/shell.c | 177 ++++++++++++++++++++++++++++++++- dlls/wshom.ocx/tests/Makefile.in | 2 +- dlls/wshom.ocx/tests/wshom.c | 205 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 376 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41c44f918504cc0aefc3a…

1 0

Thomas Faber : quartz: Avoid empty initializer braces.
by Alexandre Julliard Feb. 17, 2015

Feb. 17, 2015

Module: wine Branch: master Commit: 7f9a63e5fdb0636bd68e3a7b9a18423460d3f365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9a63e5fdb0636bd68e3a7b9… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Feb 14 09:33:23 2015 +0100 quartz: Avoid empty initializer braces. --- dlls/quartz/dsoundrender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 9f96654..8e34655 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -916,7 +916,7 @@ static LONG cookie_counter = 1; static DWORD WINAPI DSoundAdviseThread(LPVOID lpParam) { DSoundRenderImpl *This = lpParam; - struct dsoundrender_timer head = { }; + struct dsoundrender_timer head = {NULL}; MSG msg; TRACE("(%p): Main Loop\n", This);

1 0

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

Feb. 16, 2015

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 : netapi32: Add a partial implementation of NetUserEnum.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: 56ff1cc76a6e79dd67526532094eb7832b391811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56ff1cc76a6e79dd675265320… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 16 14:42:29 2015 +0100 netapi32: Add a partial implementation of NetUserEnum. --- dlls/netapi32/netapi32.c | 63 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 5 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index d2a61fa..3823fa9 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -2287,13 +2287,66 @@ NetUserGetLocalGroups(LPCWSTR servername, LPCWSTR username, DWORD level, */ NET_API_STATUS WINAPI NetUserEnum(LPCWSTR servername, DWORD level, DWORD filter, LPBYTE* bufptr, - DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, - LPDWORD resume_handle) + DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, + LPDWORD resume_handle) { - FIXME("(%s,%d, 0x%d,%p,%d,%p,%p,%p) stub!\n", debugstr_w(servername), level, - filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); + NET_API_STATUS status; + USER_INFO_0 *info; + WCHAR *user; + DWORD size; + + TRACE("(%s, %u, 0x%x, %p, %u, %p, %p, %p)\n", debugstr_w(servername), level, + filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); + + status = NETAPI_ValidateServername(servername); + if (status != NERR_Success) + return status; - return ERROR_ACCESS_DENIED; + if (!NETAPI_IsLocalComputer(servername)) + { + FIXME("Only implemented for local computer, but remote server" + "%s was requested.\n", debugstr_w(servername)); + return NERR_InvalidComputer; + } + + if (level) + { + FIXME("level %u not supported\n", level); + return ERROR_INVALID_LEVEL; + } + + size = UNLEN + 1; + status = NetApiBufferAllocate(size * sizeof(WCHAR), (void **)&user); + if (status != NERR_Success) + return status; + + if (!GetUserNameW(user, &size)) + { + NetApiBufferFree(user); + return ERROR_NOT_ENOUGH_MEMORY; + } + + size = sizeof(*info) + (strlenW(user) + 1) * sizeof(WCHAR); + + if (prefmaxlen < size) + status = ERROR_MORE_DATA; + else + status = NetApiBufferAllocate(size, (void **)&info); + + if (status != NERR_Success) + { + NetApiBufferFree(user); + return status; + } + + info->usri0_name = (WCHAR *)((char *)info + sizeof(*info)); + strcpyW(info->usri0_name, user); + + *bufptr = (BYTE *)info; + *entriesread = *totalentries = 1; + + NetApiBufferFree(user); + return NERR_Success; } /************************************************************

1 0

Hans Leidekker : wbemprox: Fix the type mapping for Win32_SoundDevice.StatusInfo.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: 797bd65f624de0f8575bfe1efda0d8a6be738e8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=797bd65f624de0f8575bfe1ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 16 14:43:02 2015 +0100 wbemprox: Fix the type mapping for Win32_SoundDevice.StatusInfo. --- dlls/wbemprox/builtin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 79ce561..16c58a8 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -543,7 +543,7 @@ static const struct column col_sounddevice[] = { { prop_nameW, CIM_STRING }, { prop_productnameW, CIM_STRING }, - { prop_statusinfoW, CIM_UINT16 } + { prop_statusinfoW, CIM_UINT16, VT_I4 } }; static const struct column col_stdregprov[] = {

1 0