wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Aaryaman Vasishta : d3drm/tests: Add texture loading tests.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 889176b9d2b3f0d2a7ec5e8e1658e4a78a2ecef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=889176b9d2b3f0d2a7ec5e8e1… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Jan 15 12:55:52 2016 +0100 d3drm/tests: Add texture loading tests. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 275 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 275 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=889176b9d2b3f0d2a7ec5…

1 0

Piotr Caban : msvcrt: Fix modff signature.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 0806b06f2ba7a690661d6ae417270bdbc7370953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0806b06f2ba7a690661d6ae41… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 15 17:01:02 2016 +0100 msvcrt: Fix modff signature. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f8937b3..661a1b4 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -331,7 +331,7 @@ float CDECL MSVCRT__scalbf(float num, MSVCRT_long power) /********************************************************************* * modff (MSVCRT.@) */ -double CDECL MSVCRT_modff( float x, float *iptr ) +float CDECL MSVCRT_modff( float x, float *iptr ) { return modff( x, iptr ); }

1 0

Alexandre Julliard : server: Allow the object attributes to be omitted in requests.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 4c763a41ee0915d33398f7244952e5fff0c758b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c763a41ee0915d33398f7244… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 18:25:58 2016 +0900 server: Allow the object attributes to be omitted in requests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 8 +------- include/wine/server_protocol.h | 2 +- server/request.c | 8 ++++++++ server/trace.c | 22 +++++++++++++--------- 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index bbbcfba..36a9c86 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -86,13 +86,7 @@ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_a *ret = NULL; *ret_len = 0; - if (!attr) - { - *ret = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); - if (!*ret) return STATUS_NO_MEMORY; - *ret_len = len; - return STATUS_SUCCESS; - } + if (!attr) return STATUS_SUCCESS; if ((sd = attr->SecurityDescriptor)) { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 65f0536..8dd4994 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -6171,6 +6171,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 493 +#define SERVER_PROTOCOL_VERSION 494 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/request.c b/server/request.c index 7b7d8b1..2debf6d 100644 --- a/server/request.c +++ b/server/request.c @@ -169,9 +169,17 @@ void *set_reply_data_size( data_size_t size ) const struct object_attributes *get_req_object_attributes( const struct security_descriptor **sd, struct unicode_str *name ) { + static const struct object_attributes empty_attributes; const struct object_attributes *attr = get_req_data(); data_size_t size = get_req_data_size(); + if (!size) + { + *sd = NULL; + name->len = 0; + return &empty_attributes; + } + if ((size < sizeof(*attr)) || (size - sizeof(*attr) < attr->sd_len) || (size - sizeof(*attr) - attr->sd_len < attr->name_len)) { diff --git a/server/trace.c b/server/trace.c index e02b8c3..edfcaf5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1074,20 +1074,27 @@ static void dump_varargs_object_attributes( const char *prefix, data_size_t size const struct object_attributes *objattr = cur_data; fprintf( stderr,"%s{", prefix ); - if (size >= sizeof(struct object_attributes)) + if (size) { const WCHAR *str; - fprintf( stderr, "rootdir=%04x,attributes=%08x", objattr->rootdir, objattr->attributes ); - if (objattr->sd_len > size - sizeof(*objattr) || - objattr->name_len > size - sizeof(*objattr) - objattr->sd_len) + + if (size < sizeof(*objattr) || + (size - sizeof(*objattr) < objattr->sd_len) || + (size - sizeof(*objattr) - objattr->sd_len < objattr->name_len)) + { + fprintf( stderr, "***invalid***}" ); + remove_data( size ); return; + } + + fprintf( stderr, "rootdir=%04x,attributes=%08x", objattr->rootdir, objattr->attributes ); dump_inline_security_descriptor( ",sd=", (const struct security_descriptor *)(objattr + 1), objattr->sd_len ); str = (const WCHAR *)objattr + (sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR); fprintf( stderr, ",name=L\"" ); dump_strW( str, objattr->name_len / sizeof(WCHAR), stderr, "\"\"" ); fputc( '\"', stderr ); remove_data( ((sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR)) * sizeof(WCHAR) + - objattr->name_len ); + (objattr->name_len / sizeof(WCHAR)) * sizeof(WCHAR) ); } fputc( '}', stderr ); } @@ -3928,10 +3935,7 @@ static void dump_get_directory_entry_reply( const struct get_directory_entry_rep static void dump_create_symlink_request( const struct create_symlink_request *req ) { fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); - fprintf( stderr, ", name_len=%u", req->name_len ); - dump_varargs_unicode_str( ", name=", min(cur_size,req->name_len) ); + dump_varargs_object_attributes( ", objattr=", cur_size ); dump_varargs_unicode_str( ", target_name=", cur_size ); }

1 0

Alexandre Julliard : server: Add a helper function to validate and return object attributes.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 9504e2addf3a689e1e0316355452a676bf149dfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9504e2addf3a689e1e0316355… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 18:15:31 2016 +0900 server: Add a helper function to validate and return object attributes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/event.c | 17 ++++------------- server/file.c | 11 ++++------- server/mapping.c | 10 ++-------- server/mutex.c | 10 ++-------- server/named_pipe.c | 12 +++--------- server/process.c | 7 ++----- server/request.c | 27 +++++++++++++++++++++++++++ server/request.h | 2 ++ server/security.h | 9 --------- server/semaphore.c | 10 ++-------- server/token.c | 24 ------------------------ 11 files changed, 48 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9504e2addf3a689e1e031…

1 0

Alexandre Julliard : server: Store the attributes in the object_attributes structure.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 7350682aa6ec7702f26f76ccbaa7d2f11a85c93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7350682aa6ec7702f26f76ccb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 17:53:34 2016 +0900 server: Store the attributes in the object_attributes structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 2 -- dlls/ntdll/sync.c | 6 +----- dlls/ntdll/virtual.c | 1 - include/wine/server_protocol.h | 23 ++++++-------------- server/event.c | 15 +++++++------ server/file.c | 2 +- server/mapping.c | 8 ++++--- server/mutex.c | 7 +++--- server/named_pipe.c | 4 ++-- server/process.c | 7 +++--- server/protocol.def | 15 ++++--------- server/request.h | 48 ++++++++++++++++++------------------------ server/semaphore.c | 7 +++--- server/trace.c | 10 +-------- 14 files changed, 62 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7350682aa6ec7702f26f7…

1 0

Alexandre Julliard : ntdll: Add a helper function to allocate the full object_attributes structure.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 3198fb0c1c3779882944659d52a676319ffcc68d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3198fb0c1c3779882944659d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 17:40:56 2016 +0900 ntdll: Add a helper function to allocate the full object_attributes structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 33 +++---- dlls/ntdll/ntdll_misc.h | 7 +- dlls/ntdll/sync.c | 237 +++++++++++++++++++----------------------------- dlls/ntdll/virtual.c | 24 +---- 4 files changed, 113 insertions(+), 188 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3198fb0c1c37798829446…

1 0

Carlo Bramini : user32: Remove unused variables in SCROLL_TrackScrollBar.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 8d0d1e563ca7697902df9c285ff13ce648697537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d0d1e563ca7697902df9c285… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Fri Jan 15 12:20:40 2016 +0300 user32: Remove unused variables in SCROLL_TrackScrollBar. Signed-off-by: Carlo Bramini <carlo.bramix(a)libero.it> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index be205ef..b28ee44 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1096,7 +1096,6 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) { MSG msg; - INT xoffset = 0, yoffset = 0; if (scrollbar != SB_CTL) { @@ -1117,8 +1116,8 @@ void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) msg.message == WM_MOUSEMOVE || (msg.message == WM_SYSTIMER && msg.wParam == SCROLL_TIMER)) { - pt.x = (short)LOWORD(msg.lParam) + xoffset; - pt.y = (short)HIWORD(msg.lParam) + yoffset; + pt.x = (short)LOWORD(msg.lParam); + pt.y = (short)HIWORD(msg.lParam); SCROLL_HandleScrollEvent( hwnd, scrollbar, msg.message, pt ); } else

1 0

Nikolay Sivov : dwrite: Always initialize out pointers.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: ac7954b7b93015ece09bf374484a0f3505f22aba URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac7954b7b93015ece09bf3744… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 15 12:12:24 2016 +0300 dwrite: Always initialize out pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a19f2c7..313c77e 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3880,9 +3880,13 @@ static const IDWriteFontFileStreamVtbl localfontfilestreamvtbl = localfontfilestream_GetLastWriteTime }; -static HRESULT create_localfontfilestream(const void *file_ptr, UINT64 size, struct local_cached_stream *entry, IDWriteFontFileStream** iface) +static HRESULT create_localfontfilestream(const void *file_ptr, UINT64 size, struct local_cached_stream *entry, IDWriteFontFileStream **ret) { - struct dwrite_localfontfilestream *This = heap_alloc(sizeof(struct dwrite_localfontfilestream)); + struct dwrite_localfontfilestream *This; + + *ret = NULL; + + This = heap_alloc(sizeof(struct dwrite_localfontfilestream)); if (!This) return E_OUTOFMEMORY; @@ -3893,7 +3897,7 @@ static HRESULT create_localfontfilestream(const void *file_ptr, UINT64 size, str This->size = size; This->entry = entry; - *iface = &This->IDWriteFontFileStream_iface; + *ret = &This->IDWriteFontFileStream_iface; return S_OK; } @@ -4060,9 +4064,13 @@ static const struct IDWriteLocalFontFileLoaderVtbl localfontfileloadervtbl = { localfontfileloader_GetLastWriteTimeFromKey }; -HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) +HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader **ret) { - struct dwrite_localfontfileloader *This = heap_alloc(sizeof(struct dwrite_localfontfileloader)); + struct dwrite_localfontfileloader *This; + + *ret = NULL; + + This = heap_alloc(sizeof(struct dwrite_localfontfileloader)); if (!This) return E_OUTOFMEMORY; @@ -4070,7 +4078,7 @@ HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) This->ref = 1; list_init(&This->streams); - *iface = &This->IDWriteLocalFontFileLoader_iface; + *ret = &This->IDWriteLocalFontFileLoader_iface; return S_OK; }

1 0

Paul Gofman : ole32/tests: OleGetClipboard should succeed when COM/ OLE is not inited.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: d3b42a13d2132dc7916ffa624bd560058aba158f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b42a13d2132dc7916ffa624… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jan 15 15:09:55 2016 +0300 ole32/tests: OleGetClipboard should succeed when COM/OLE is not inited. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/clipboard.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 1087de3..3eb9901 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -455,6 +455,17 @@ static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) return S_OK; } +static void test_get_clipboard_unitialized(void) +{ + HRESULT hr; + IDataObject *pDObj; + + pDObj = (IDataObject *)0xdeadbeef; + hr = OleGetClipboard(&pDObj); + todo_wine ok(hr == S_OK, "OleGetClipboard() got 0x%08x instead of 0x%08x\n", hr, S_OK); + if (pDObj && pDObj != (IDataObject *)0xdeadbeef) IDataObject_Release(pDObj); +} + static void test_get_clipboard(void) { HRESULT hr; @@ -1592,6 +1603,7 @@ static void test_get_clipboard_locked(void) START_TEST(clipboard) { + test_get_clipboard_unitialized(); test_set_clipboard(); test_consumer_refs(); test_flushed_getdata();

1 0

Paul Gofman : ole32: Zero output interface pointer in OleGetClipboard() on error.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 5d4b23e6e7eb939ffb2605685099f88d3ebca751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d4b23e6e7eb939ffb2605685… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jan 15 15:09:54 2016 +0300 ole32: Zero output interface pointer in OleGetClipboard() on error. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 1 + dlls/ole32/tests/clipboard.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index ca9520f..b871bbc 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -2201,6 +2201,7 @@ HRESULT WINAPI OleGetClipboard(IDataObject **obj) TRACE("(%p)\n", obj); if(!obj) return E_INVALIDARG; + *obj = NULL; if(FAILED(hr = get_ole_clipbrd(&clipbrd))) return hr; diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 02097ea..1087de3 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -1571,6 +1571,25 @@ static void test_multithreaded_clipboard(void) OleUninitialize(); } +static void test_get_clipboard_locked(void) +{ + HRESULT hr; + IDataObject *pDObj; + + OleInitialize(NULL); + + pDObj = (IDataObject *)0xdeadbeef; + /* lock clipboard */ + OpenClipboard(NULL); + hr = OleGetClipboard(&pDObj); + todo_wine ok(hr == CLIPBRD_E_CANT_OPEN, "OleGetClipboard() got 0x%08x instead of 0x%08x\n", hr, CLIPBRD_E_CANT_OPEN); + todo_wine ok(pDObj == NULL, "OleGetClipboard() got 0x%p instead of NULL\n",pDObj); + if (pDObj) IDataObject_Release(pDObj); + CloseClipboard(); + + OleUninitialize(); +} + START_TEST(clipboard) { test_set_clipboard(); @@ -1579,4 +1598,5 @@ START_TEST(clipboard) test_nonole_clipboard(); test_getdatahere(); test_multithreaded_clipboard(); + test_get_clipboard_locked(); }

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2016