October 2016 - Wine-Commits

Jacek Caban : ntdll: Cache error information for cacheable handles with no fd.
by Alexandre Julliard Oct. 28, 2016

Oct. 28, 2016

Module: wine Branch: master Commit: 3b30002aecf7cd55970979f7e02a53866fe66f1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b30002aecf7cd55970979f7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 24 17:48:49 2016 +0200 ntdll: Cache error information for cacheable handles with no fd. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 25c6473..59b9ab9 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -876,22 +876,25 @@ static BOOL add_fd_to_cache( HANDLE handle, int fd, enum server_fd_type type, /*********************************************************************** * get_cached_fd */ -static inline int get_cached_fd( HANDLE handle, enum server_fd_type *type, - unsigned int *access, unsigned int *options ) +static inline NTSTATUS get_cached_fd( HANDLE handle, int *fd, enum server_fd_type *type, + unsigned int *access, unsigned int *options ) { unsigned int entry, idx = handle_to_index( handle, &entry ); - int fd = -1; + union fd_cache_entry cache; - if (entry < FD_CACHE_ENTRIES && fd_cache[entry]) - { - union fd_cache_entry cache; - cache.data = interlocked_cmpxchg64( &fd_cache[entry][idx].data, 0, 0 ); - fd = cache.s.fd - 1; - if (type) *type = cache.s.type; - if (access) *access = cache.s.access; - if (options) *options = cache.s.options; - } - return fd; + if (entry >= FD_CACHE_ENTRIES || !fd_cache[entry]) return STATUS_INVALID_HANDLE; + + cache.data = interlocked_cmpxchg64( &fd_cache[entry][idx].data, 0, 0 ); + if (!cache.data) return STATUS_INVALID_HANDLE; + + /* if fd type is invalid, fd stores an error value */ + if (cache.s.type == FD_TYPE_INVALID) return cache.s.fd - 1; + + *fd = cache.s.fd - 1; + if (type) *type = cache.s.type; + if (access) *access = cache.s.access; + if (options) *options = cache.s.options; + return STATUS_SUCCESS; } @@ -907,7 +910,7 @@ int server_remove_fd_from_cache( HANDLE handle ) { union fd_cache_entry cache; cache.data = interlocked_xchg64( &fd_cache[entry][idx].data, 0 ); - fd = cache.s.fd - 1; + if (cache.s.type != FD_TYPE_INVALID) fd = cache.s.fd - 1; } return fd; @@ -924,19 +927,19 @@ int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, { sigset_t sigset; obj_handle_t fd_handle; - int ret = 0, fd; + int ret, fd = -1; unsigned int access = 0; *unix_fd = -1; *needs_close = 0; wanted_access &= FILE_READ_DATA | FILE_WRITE_DATA | FILE_APPEND_DATA; - fd = get_cached_fd( handle, type, &access, options ); - if (fd != -1) goto done; + ret = get_cached_fd( handle, &fd, type, &access, options ); + if (ret != STATUS_INVALID_HANDLE) goto done; server_enter_uninterrupted_section( &fd_cache_section, &sigset ); - fd = get_cached_fd( handle, type, &access, options ); - if (fd == -1) + ret = get_cached_fd( handle, &fd, type, &access, options ); + if (ret == STATUS_INVALID_HANDLE) { SERVER_START_REQ( get_handle_fd ) { @@ -955,6 +958,10 @@ int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, } else ret = STATUS_TOO_MANY_OPENED_FILES; } + else if (reply->cacheable) + { + add_fd_to_cache( handle, ret, FD_TYPE_INVALID, 0, 0 ); + } } SERVER_END_REQ; }

1 0

Nikolay Sivov : d2d1: Store gradient stop collection pointer for linear gradient brush.
by Alexandre Julliard Oct. 28, 2016

Oct. 28, 2016

Module: wine Branch: master Commit: 5f4bba4303ebce3f220ddcab8b7d11be18902151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4bba4303ebce3f220ddcab8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 28 09:51:06 2016 +0300 d2d1: Store gradient stop collection pointer for linear gradient brush. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 10 ++++++++-- dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 8725992..4110b48 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -373,7 +373,10 @@ static ULONG STDMETHODCALLTYPE d2d_linear_gradient_brush_Release(ID2D1LinearGrad TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + ID2D1GradientStopCollection_Release(brush->u.linear.gradient); d2d_brush_destroy(brush); + } return refcount; } @@ -465,9 +468,11 @@ static D2D1_POINT_2F * STDMETHODCALLTYPE d2d_linear_gradient_brush_GetEndPoint(I static void STDMETHODCALLTYPE d2d_linear_gradient_brush_GetGradientStopCollection(ID2D1LinearGradientBrush *iface, ID2D1GradientStopCollection **gradient) { - FIXME("iface %p, gradient %p stub!\n", iface, gradient); + struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface); + + TRACE("iface %p, gradient %p.\n", iface, gradient); - *gradient = NULL; + ID2D1GradientStopCollection_AddRef(*gradient = brush->u.linear.gradient); } static const struct ID2D1LinearGradientBrushVtbl d2d_linear_gradient_brush_vtbl = @@ -496,6 +501,7 @@ HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory, const D2D1_LINEA d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_LINEAR, brush_desc, (ID2D1BrushVtbl *)&d2d_linear_gradient_brush_vtbl); (*brush)->u.linear.desc = *gradient_brush_desc; + ID2D1GradientStopCollection_AddRef((*brush)->u.linear.gradient = gradient); TRACE("Created brush %p.\n", *brush); return S_OK; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index f8c0d45..021a703 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -199,6 +199,7 @@ struct d2d_brush struct { D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES desc; + ID2D1GradientStopCollection *gradient; } linear; } u; };

1 0

Nikolay Sivov : d2d1: Support setting and getting back start and end point for linear gradient brush.
by Alexandre Julliard Oct. 28, 2016

Oct. 28, 2016

Module: wine Branch: master Commit: 0f44063006ae74b4ece987ba345d36078bfe0c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f44063006ae74b4ece987ba3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 28 09:51:05 2016 +0300 d2d1: Support setting and getting back start and end point for linear gradient brush. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 29 +++++++++++++++++++---------- dlls/d2d1/d2d1_private.h | 4 ++++ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 38872ea..8725992 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -423,32 +423,42 @@ static void STDMETHODCALLTYPE d2d_linear_gradient_brush_GetTransform(ID2D1Linear static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetStartPoint(ID2D1LinearGradientBrush *iface, D2D1_POINT_2F start_point) { - FIXME("iface %p, start_point {%.8e, %.8e} stub!\n", iface, start_point.x, start_point.y); + struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface); + + TRACE("iface %p, start_point {%.8e, %.8e}.\n", iface, start_point.x, start_point.y); + + brush->u.linear.desc.startPoint = start_point; } static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetEndPoint(ID2D1LinearGradientBrush *iface, D2D1_POINT_2F end_point) { - FIXME("iface %p, end_point {%.8e, %.8e} stub!\n", iface, end_point.x, end_point.y); + struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface); + + TRACE("iface %p, end_point {%.8e, %.8e}.\n", iface, end_point.x, end_point.y); + + brush->u.linear.desc.endPoint = end_point; } static D2D1_POINT_2F * STDMETHODCALLTYPE d2d_linear_gradient_brush_GetStartPoint(ID2D1LinearGradientBrush *iface, D2D1_POINT_2F *point) { - FIXME("iface %p, point %p stub!\n", iface, point); + struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface); + + TRACE("iface %p, point %p.\n", iface, point); - point->x = 0.0f; - point->y = 0.0f; + *point = brush->u.linear.desc.startPoint; return point; } static D2D1_POINT_2F * STDMETHODCALLTYPE d2d_linear_gradient_brush_GetEndPoint(ID2D1LinearGradientBrush *iface, D2D1_POINT_2F *point) { - FIXME("iface %p, point %p stub!\n", iface, point); + struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface); - point->x = 0.0f; - point->y = 0.0f; + TRACE("iface %p, point %p.\n", iface, point); + + *point = brush->u.linear.desc.endPoint; return point; } @@ -483,10 +493,9 @@ HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory, const D2D1_LINEA if (!(*brush = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**brush)))) return E_OUTOFMEMORY; - FIXME("Ignoring brush properties.\n"); - d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_LINEAR, brush_desc, (ID2D1BrushVtbl *)&d2d_linear_gradient_brush_vtbl); + (*brush)->u.linear.desc = *gradient_brush_desc; TRACE("Created brush %p.\n", *brush); return S_OK; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 8497ea8..f8c0d45 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -196,6 +196,10 @@ struct d2d_brush D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode; ID3D10SamplerState *sampler_state; } bitmap; + struct + { + D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES desc; + } linear; } u; };

1 0

Alistair Leslie-Hughes : comdlg32/tests: Test when a directory is passed to OpenFileName Dialog.
by Alexandre Julliard Oct. 27, 2016

Oct. 27, 2016

Module: wine Branch: master Commit: 3126d9ca4c29737af1526ea8aae92a2dadf62665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3126d9ca4c29737af1526ea8a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 27 06:53:39 2016 +0000 comdlg32/tests: Test when a directory is passed to OpenFileName Dialog. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/tests/filedlg.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 0fe2d84..9270b66 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1226,6 +1226,46 @@ static void test_null_filename(void) ok(ofnW.nFileExtension == 0, "ofnW.nFileExtension is 0x%x, should be 0\n", ofnW.nFileExtension); } +static void test_directory_filename(void) +{ + OPENFILENAMEA ofnA = {0}; + OPENFILENAMEW ofnW = {0}; + WCHAR filterW[] = {'t','e','x','t','\0','*','.','t','x','t','\0', + 'A','l','l','\0','*','\0','\0'}; + char szInitialDir[MAX_PATH] = {0}; + WCHAR szInitialDirW[MAX_PATH] = {0}; + DWORD ret; + + GetWindowsDirectoryA(szInitialDir, MAX_PATH); + GetWindowsDirectoryW(szInitialDirW, MAX_PATH); + + szInitialDir[strlen(szInitialDir)] = '\\'; + szInitialDirW[lstrlenW(szInitialDirW)] = '\\'; + + ofnA.lStructSize = OPENFILENAME_SIZE_VERSION_400A; + ofnA.lpstrFile = szInitialDir; + ofnA.nMaxFile = MAX_PATH; + ofnA.lpfnHook = test_null_wndproc; + ofnA.Flags = OFN_ENABLEHOOK | OFN_EXPLORER; + ofnA.hInstance = GetModuleHandleA(NULL); + ofnA.lpstrFilter = "text\0*.txt\0All\0*\0\0"; + ofnA.lpstrDefExt = NULL; + ret = GetOpenFileNameA(&ofnA); + todo_wine ok(!ret, "GetOpenFileNameA returned %#x\n", ret); + + /* unicode tests */ + ofnW.lStructSize = OPENFILENAME_SIZE_VERSION_400W; + ofnW.lpstrFile = szInitialDirW; + ofnW.nMaxFile = MAX_PATH; + ofnW.lpfnHook = test_null_wndproc; + ofnW.Flags = OFN_ENABLEHOOK | OFN_EXPLORER; + ofnW.hInstance = GetModuleHandleW(NULL); + ofnW.lpstrFilter = filterW; + ofnW.lpstrDefExt = NULL; + ret = GetOpenFileNameW(&ofnW); + todo_wine ok(!ret, "GetOpenFileNameW returned %#x\n", ret); +} + START_TEST(filedlg) { test_DialogCancel(); @@ -1239,4 +1279,5 @@ START_TEST(filedlg) if( resizesupported) test_resizable2(); test_extension(); test_null_filename(); + test_directory_filename(); }

1 0

Jacek Caban : xmllite: Return success when setting XmlReaderProperty_MaxElementDepth property.
by Alexandre Julliard Oct. 27, 2016

Oct. 27, 2016

Module: wine Branch: master Commit: 0414332b0828350ac4c31ff069e909fc278e31f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0414332b0828350ac4c31ff06… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 27 17:34:56 2016 +0200 xmllite: Return success when setting XmlReaderProperty_MaxElementDepth property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 3 +++ dlls/xmllite/tests/reader.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ca090ca..b6fce80 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2600,6 +2600,9 @@ static HRESULT WINAPI xmlreader_SetProperty(IXmlReader* iface, UINT property, LO if (value < 0 || value > _DtdProcessing_Last) return E_INVALIDARG; This->dtdmode = value; break; + case XmlReaderProperty_MaxElementDepth: + FIXME("Ignoring MaxElementDepth %ld\n", value); + break; default: FIXME("Unimplemented property (%u)\n", property); return E_NOTIMPL; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 544afc1..d0b6184 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1796,6 +1796,9 @@ static void test_reader_properties(void) hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MultiLanguage, 0); ok(hr == S_OK, "SetProperty failed: %08x\n", hr); + hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 0); + ok(hr == S_OK, "SetProperty failed: %08x\n", hr); + IXmlReader_Release(reader); }

1 0

Sebastian Lackner : hidclass.sys: Do not return failure when trying to set same ringbuffer size.
by Alexandre Julliard Oct. 27, 2016

Oct. 27, 2016

Module: wine Branch: master Commit: 74a79a77223b2ac8539f4e75fbd1026f67b414a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a79a77223b2ac8539f4e75f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 27 16:40:55 2016 +0200 hidclass.sys: Do not return failure when trying to set same ringbuffer size. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/buffer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c index 894853d..14e83e4 100644 --- a/dlls/hidclass.sys/buffer.c +++ b/dlls/hidclass.sys/buffer.c @@ -102,8 +102,10 @@ NTSTATUS RingBuffer_SetSize(struct ReportRingBuffer *ring, UINT size) BYTE* new_buffer; int i; - if (size < MIN_BUFFER_SIZE || size > MAX_BUFFER_SIZE || size == ring->size) + if (size < MIN_BUFFER_SIZE || size > MAX_BUFFER_SIZE) return STATUS_INVALID_PARAMETER; + if (size == ring->size) + return STATUS_SUCCESS; EnterCriticalSection(&ring->lock); ring->start = ring->end = 0;

1 0

Sebastian Lackner : hidclass.sys: Only return new reports when reading data from ringbuffer.
by Alexandre Julliard Oct. 27, 2016

Oct. 27, 2016

Module: wine Branch: master Commit: b22aa57ab9d23adf2e9bc54aaa650aa1ee6f6f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22aa57ab9d23adf2e9bc54aa… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 27 16:45:00 2016 +0200 hidclass.sys: Only return new reports when reading data from ringbuffer. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c index 14e83e4..0b29f97 100644 --- a/dlls/hidclass.sys/buffer.c +++ b/dlls/hidclass.sys/buffer.c @@ -170,7 +170,7 @@ UINT RingBuffer_AddPointer(struct ReportRingBuffer *ring) for( ;count < ring->pointer_alloc; count++) ring->pointers[count] = POINTER_UNUSED; } - ring->pointers[idx] = ring->start; + ring->pointers[idx] = ring->end; LeaveCriticalSection(&ring->lock); return idx; }

1 0

Sebastian Lackner : hidclass.sys: Avoid magic constants in ringbuffer implementation.
by Alexandre Julliard Oct. 27, 2016

Oct. 27, 2016

Module: wine Branch: master Commit: 115c69110d6796cf214ecf7f3dd3011c1da3f5a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=115c69110d6796cf214ecf7f3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 27 16:40:35 2016 +0200 hidclass.sys: Avoid magic constants in ringbuffer implementation. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/buffer.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c index 23636e0..894853d 100644 --- a/dlls/hidclass.sys/buffer.c +++ b/dlls/hidclass.sys/buffer.c @@ -26,6 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); +#define POINTER_UNUSED 0xffffffff #define BASE_BUFFER_SIZE 32 #define MIN_BUFFER_SIZE 2 #define MAX_BUFFER_SIZE 512 @@ -34,7 +35,7 @@ struct ReportRingBuffer { UINT start, end, size; - int *pointers; + UINT *pointers; UINT pointer_alloc; UINT buffer_size; @@ -46,7 +47,10 @@ struct ReportRingBuffer struct ReportRingBuffer* RingBuffer_Create(UINT buffer_size) { struct ReportRingBuffer *ring; + int i; + TRACE("Create Ring Buffer with buffer size %i\n",buffer_size); + ring = HeapAlloc(GetProcessHeap(), 0, sizeof(*ring)); if (!ring) return NULL; @@ -54,13 +58,14 @@ struct ReportRingBuffer* RingBuffer_Create(UINT buffer_size) ring->size = BASE_BUFFER_SIZE; ring->buffer_size = buffer_size; ring->pointer_alloc = 2; - ring->pointers = HeapAlloc(GetProcessHeap(), 0, sizeof(int) * ring->pointer_alloc); + ring->pointers = HeapAlloc(GetProcessHeap(), 0, sizeof(UINT) * ring->pointer_alloc); if (!ring->pointers) { HeapFree(GetProcessHeap(), 0, ring); return NULL; } - memset(ring->pointers, 0xff, sizeof(int) * ring->pointer_alloc); + for (i = 0; i < ring->pointer_alloc; i++) + ring->pointers[i] = POINTER_UNUSED; ring->buffer = HeapAlloc(GetProcessHeap(), 0, buffer_size * ring->size); if (!ring->buffer) { @@ -104,7 +109,7 @@ NTSTATUS RingBuffer_SetSize(struct ReportRingBuffer *ring, UINT size) ring->start = ring->end = 0; for (i = 0; i < ring->pointer_alloc; i++) { - if (ring->pointers[i] != 0xffffffff) + if (ring->pointers[i] != POINTER_UNUSED) ring->pointers[i] = 0; } new_buffer = HeapAlloc(GetProcessHeap(), 0, ring->buffer_size * size); @@ -125,7 +130,7 @@ void RingBuffer_Read(struct ReportRingBuffer *ring, UINT index, void *output, UI void *ret = NULL; EnterCriticalSection(&ring->lock); - if (index >= ring->pointer_alloc || ring->pointers[index] == 0xffffffff) + if (index >= ring->pointer_alloc || ring->pointers[index] == POINTER_UNUSED) { LeaveCriticalSection(&ring->lock); *size = 0; @@ -153,15 +158,15 @@ UINT RingBuffer_AddPointer(struct ReportRingBuffer *ring) UINT idx; EnterCriticalSection(&ring->lock); for (idx = 0; idx < ring->pointer_alloc; idx++) - if (ring->pointers[idx] == -1) + if (ring->pointers[idx] == POINTER_UNUSED) break; if (idx >= ring->pointer_alloc) { int count = idx = ring->pointer_alloc; ring->pointer_alloc *= 2; - ring->pointers = HeapReAlloc(GetProcessHeap(), 0, ring->pointers, sizeof(int) * ring->pointer_alloc); + ring->pointers = HeapReAlloc(GetProcessHeap(), 0, ring->pointers, sizeof(UINT) * ring->pointer_alloc); for( ;count < ring->pointer_alloc; count++) - ring->pointers[count] = -1; + ring->pointers[count] = POINTER_UNUSED; } ring->pointers[idx] = ring->start; LeaveCriticalSection(&ring->lock); @@ -172,7 +177,7 @@ void RingBuffer_RemovePointer(struct ReportRingBuffer *ring, UINT index) { EnterCriticalSection(&ring->lock); if (index < ring->pointer_alloc) - ring->pointers[index] = 0xffffffff; + ring->pointers[index] = POINTER_UNUSED; LeaveCriticalSection(&ring->lock); }

1 0

Bruno Jesus : comdlg32: Avoid crash when a path is passed into Open File Dialog.
by Alexandre Julliard Oct. 27, 2016

Oct. 27, 2016

Module: wine Branch: master Commit: 58091188929f9786b408912c991420f54f489f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=58091188929f9786b408912c9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 27 06:53:27 2016 +0000 comdlg32: Avoid crash when a path is passed into Open File Dialog. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 95eacd3..67b3566 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1565,10 +1565,16 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) result = GetFullPathNameW(fodInfos->filename, MAX_PATH, tmpBuf, &nameBit); if (result) { - /* nameBit is always shorter than the original filename */ - lstrcpyW(fodInfos->filename,nameBit); + /* nameBit is always shorter than the original filename. It may be NULL + * when the filename contains only a drive name instead of file name */ + if (nameBit) + { + lstrcpyW(fodInfos->filename,nameBit); + *nameBit = 0x00; + } + else + *fodInfos->filename = '\0'; - *nameBit = 0x00; MemFree(fodInfos->initdir); fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf) + 1)*sizeof(WCHAR)); lstrcpyW(fodInfos->initdir, tmpBuf);

1 0

Aric Stewart : winebus.sys: Implement IOCTL_HID_SET_OUTPUT_REPORT for hidraw.
by Alexandre Julliard Oct. 27, 2016

Oct. 27, 2016

Module: wine Branch: master Commit: 253204570e65331dc4f4278f544f2b5f69c950d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=253204570e65331dc4f4278f5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 27 08:37:41 2016 -0500 winebus.sys: Implement IOCTL_HID_SET_OUTPUT_REPORT for hidraw. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_udev.c | 18 ++++++++++++++++++ dlls/winebus.sys/main.c | 10 ++++++++++ 3 files changed, 29 insertions(+) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index dcebd96..18bebcf 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -26,6 +26,7 @@ typedef struct NTSTATUS (*get_reportdescriptor)(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length); NTSTATUS (*get_string)(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length); NTSTATUS (*begin_report_processing)(DEVICE_OBJECT *device); + NTSTATUS (*set_output_report)(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written); } platform_vtbl; void *get_platform_private(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 664ce58..be8e93f 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -284,12 +284,30 @@ static NTSTATUS begin_report_processing(DEVICE_OBJECT *device) return STATUS_SUCCESS; } +static NTSTATUS hidraw_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) +{ + struct platform_private* ext = impl_from_DEVICE_OBJECT(device); + ssize_t rc; + rc = write(ext->device_fd, report, length); + if (rc > 0) + { + *written = rc; + return STATUS_SUCCESS; + } + else + { + *written = 0; + return STATUS_UNSUCCESSFUL; + } +} + static const platform_vtbl hidraw_vtbl = { compare_platform_device, hidraw_get_reportdescriptor, hidraw_get_string, begin_report_processing, + hidraw_set_output_report, }; static void try_add_device(struct udev_device *dev) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 29de07a..802122f 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -531,6 +531,16 @@ NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) LeaveCriticalSection(&ext->report_cs); break; } + case IOCTL_HID_SET_OUTPUT_REPORT: + case IOCTL_HID_WRITE_REPORT: + { + HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); + TRACE_(hid_report)("IOCTL_HID_WRITE_REPORT / IOCTL_HID_SET_OUTPUT_REPORT\n"); + irp->IoStatus.u.Status = status = ext->vtbl->set_output_report( + device, packet->reportId, packet->reportBuffer, + packet->reportBufferLen, &irp->IoStatus.Information); + break; + } default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode;

1 0