June 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : oleaut32/tests: Test that user memory functions are not called.
by Alexandre Julliard June 16, 2015

June 16, 2015

Module: wine Branch: master Commit: 0533b38f70dcb30bc865941a99caa665cb6ba239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0533b38f70dcb30bc865941a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 16 09:29:00 2015 +0300 oleaut32/tests: Test that user memory functions are not called. --- dlls/oleaut32/tests/usrmarshal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index b1fe49e..88a0731 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -190,11 +190,13 @@ static void check_safearray(void *buffer, LPSAFEARRAY lpsa) static void * WINAPI user_allocate(SIZE_T size) { + ok(0, "unexpected user_allocate call\n"); return CoTaskMemAlloc(size); } static void WINAPI user_free(void *p) { + ok(0, "unexpected user_free call\n"); CoTaskMemFree(p); }

1 0

Nikolay Sivov : ole32: Marshal HBRUSH as remotable handle.
by Alexandre Julliard June 16, 2015

June 16, 2015

Module: wine Branch: master Commit: 61368e76e4b7a31940310a87b47816acb1eea48f URL: http://source.winehq.org/git/wine.git/?a=commit;h=61368e76e4b7a31940310a87b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 16 08:57:30 2015 +0300 ole32: Marshal HBRUSH as remotable handle. --- dlls/ole32/ole32.spec | 8 ++++---- dlls/ole32/tests/usrmarshal.c | 45 +++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/usrmarshal.c | 1 + 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 7019450..b36e683 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -124,10 +124,10 @@ @ stdcall HBITMAP_UserMarshal(ptr ptr ptr) @ stdcall HBITMAP_UserSize(ptr long ptr) @ stdcall HBITMAP_UserUnmarshal(ptr ptr ptr) -@ stub HBRUSH_UserFree -@ stub HBRUSH_UserMarshal -@ stub HBRUSH_UserSize -@ stub HBRUSH_UserUnmarshal +@ stdcall HBRUSH_UserFree(ptr ptr) +@ stdcall HBRUSH_UserMarshal(ptr ptr ptr) +@ stdcall HBRUSH_UserSize(ptr long ptr) +@ stdcall HBRUSH_UserUnmarshal(ptr ptr ptr) @ stdcall HDC_UserFree(ptr ptr) @ stdcall HDC_UserMarshal(ptr ptr ptr) @ stdcall HDC_UserSize(ptr long ptr) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 6f90c53..b1803df 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -44,6 +44,11 @@ unsigned char * __RPC_USER HMETAFILEPICT_UserMarshal (ULONG *, unsigned char *, unsigned char * __RPC_USER HMETAFILEPICT_UserUnmarshal(ULONG *, unsigned char *, HMETAFILEPICT *); void __RPC_USER HMETAFILEPICT_UserFree(ULONG *, HMETAFILEPICT *); +ULONG __RPC_USER HBRUSH_UserSize(ULONG *, ULONG, HBRUSH *); +unsigned char * __RPC_USER HBRUSH_UserMarshal(ULONG *, unsigned char *, HBRUSH *); +unsigned char * __RPC_USER HBRUSH_UserUnmarshal(ULONG *, unsigned char *, HBRUSH *); +void __RPC_USER HBRUSH_UserFree(ULONG *, HBRUSH *); + static BOOL g_expect_user_alloc; static void * WINAPI user_allocate(SIZE_T size) { @@ -932,6 +937,45 @@ static void test_marshal_HICON(void) DestroyIcon(hIcon); } +static void test_marshal_HBRUSH(void) +{ + MIDL_STUB_MESSAGE stub_msg; + HBRUSH hBrush, hBrush2; + USER_MARSHAL_CB umcb; + RPC_MESSAGE rpc_msg; + unsigned char *buffer; + LOGBRUSH logbrush; + wireHBRUSH wirehbrush; + ULONG size; + + logbrush.lbStyle = BS_SOLID; + logbrush.lbColor = RGB(0, 0, 0); + logbrush.lbHatch = 0; + + hBrush = CreateBrushIndirect(&logbrush); + ok(hBrush != 0, "CreateBrushIndirect failed\n"); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = HBRUSH_UserSize(&umcb.Flags, 0, &hBrush); + ok(size == sizeof(*wirehbrush), "Wrong size %d\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HBRUSH_UserMarshal(&umcb.Flags, buffer, &hBrush); + wirehbrush = (wireHBRUSH)buffer; + ok(wirehbrush->fContext == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08x\n", wirehbrush->fContext); + ok(wirehbrush->u.hInproc == (LONG_PTR)hBrush, "Marshaled value should be %p instead of %x\n", hBrush, wirehbrush->u.hRemote); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HBRUSH_UserUnmarshal(&umcb.Flags, buffer, &hBrush2); + ok(hBrush == hBrush2, "Didn't unmarshal properly\n"); + HeapFree(GetProcessHeap(), 0, buffer); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + HBRUSH_UserFree(&umcb.Flags, &hBrush2); + DeleteObject(hBrush); +} + START_TEST(usrmarshal) { CoInitialize(NULL); @@ -947,6 +991,7 @@ START_TEST(usrmarshal) test_marshal_SNB(); test_marshal_HDC(); test_marshal_HICON(); + test_marshal_HBRUSH(); CoUninitialize(); } diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 89f4f4a..957338a 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -343,6 +343,7 @@ IMPL_WIREM_HANDLE(HMENU) IMPL_WIREM_HANDLE(HWND) IMPL_WIREM_HANDLE(HDC) IMPL_WIREM_HANDLE(HICON) +IMPL_WIREM_HANDLE(HBRUSH) /****************************************************************************** * HGLOBAL_UserSize [OLE32.@]

1 0

Nikolay Sivov : dwrite: Validate format property values.
by Alexandre Julliard June 16, 2015

June 16, 2015

Module: wine Branch: master Commit: 0ec13316a77a3de780b07097a0ffb0a7473d05f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec13316a77a3de780b07097a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 15 16:30:23 2015 +0300 dwrite: Validate format property values. --- dlls/dwrite/layout.c | 20 ++++++++++++++++++++ dlls/dwrite/tests/layout.c | 18 ++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 4b91f6e..72f0885 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3615,7 +3615,12 @@ static ULONG WINAPI dwritetextformat_Release(IDWriteTextFormat1 *iface) static HRESULT WINAPI dwritetextformat_SetTextAlignment(IDWriteTextFormat1 *iface, DWRITE_TEXT_ALIGNMENT alignment) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); + TRACE("(%p)->(%d)\n", This, alignment); + + if ((UINT32)alignment > DWRITE_TEXT_ALIGNMENT_JUSTIFIED) + return E_INVALIDARG; + This->format.textalignment = alignment; return S_OK; } @@ -3623,7 +3628,12 @@ static HRESULT WINAPI dwritetextformat_SetTextAlignment(IDWriteTextFormat1 *ifac static HRESULT WINAPI dwritetextformat_SetParagraphAlignment(IDWriteTextFormat1 *iface, DWRITE_PARAGRAPH_ALIGNMENT alignment) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); + TRACE("(%p)->(%d)\n", This, alignment); + + if ((UINT32)alignment > DWRITE_PARAGRAPH_ALIGNMENT_CENTER) + return E_INVALIDARG; + This->format.paralign = alignment; return S_OK; } @@ -3631,7 +3641,12 @@ static HRESULT WINAPI dwritetextformat_SetParagraphAlignment(IDWriteTextFormat1 static HRESULT WINAPI dwritetextformat_SetWordWrapping(IDWriteTextFormat1 *iface, DWRITE_WORD_WRAPPING wrapping) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); + TRACE("(%p)->(%d)\n", This, wrapping); + + if ((UINT32)wrapping > DWRITE_WORD_WRAPPING_CHARACTER) + return E_INVALIDARG; + This->format.wrapping = wrapping; return S_OK; } @@ -3688,7 +3703,12 @@ static HRESULT WINAPI dwritetextformat_SetLineSpacing(IDWriteTextFormat1 *iface, FLOAT spacing, FLOAT baseline) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); + TRACE("(%p)->(%d %f %f)\n", This, method, spacing, baseline); + + if (spacing < 0.0 || (UINT32)method > DWRITE_LINE_SPACING_METHOD_UNIFORM) + return E_INVALIDARG; + This->format.spacingmethod = method; This->format.spacing = spacing; This->format.baseline = baseline; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 86f4f63..ee7cfcb 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -849,12 +849,21 @@ if (0) /* crashes on native */ hr = IDWriteTextFormat_SetTextAlignment(format, DWRITE_TEXT_ALIGNMENT_LEADING); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteTextFormat_SetTextAlignment(format, DWRITE_TEXT_ALIGNMENT_JUSTIFIED+1); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteTextFormat_SetParagraphAlignment(format, DWRITE_PARAGRAPH_ALIGNMENT_NEAR); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteTextFormat_SetParagraphAlignment(format, DWRITE_PARAGRAPH_ALIGNMENT_CENTER+1); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteTextFormat_SetWordWrapping(format, DWRITE_WORD_WRAPPING_WRAP); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteTextFormat_SetWordWrapping(format, DWRITE_WORD_WRAPPING_CHARACTER+1); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteTextFormat_SetReadingDirection(format, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -864,6 +873,15 @@ if (0) /* crashes on native */ hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_DEFAULT, 0.0, 0.0); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_DEFAULT, 0.0, -10.0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_DEFAULT, -10.0, 0.0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_UNIFORM+1, 0.0, 0.0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteTextFormat_SetTrimming(format, &trimming, NULL); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Henri Verbeet : d2d1: Implement d2d_geometry_sink_AddQuadraticBezier().
by Alexandre Julliard June 16, 2015

June 16, 2015

Module: wine Branch: master Commit: 5d5fdbc63ba5d7fb913fe0d91b984f160824624d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d5fdbc63ba5d7fb913fe0d91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 22:30:07 2015 +0200 d2d1: Implement d2d_geometry_sink_AddQuadraticBezier(). --- dlls/d2d1/geometry.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 4ba851d..0054a47 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -121,7 +121,9 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddBezier(ID2D1GeometrySink *ifa static void STDMETHODCALLTYPE d2d_geometry_sink_AddQuadraticBezier(ID2D1GeometrySink *iface, const D2D1_QUADRATIC_BEZIER_SEGMENT *bezier) { - FIXME("iface %p, bezier %p stub!\n", iface, bezier); + TRACE("iface %p, bezier %p.\n", iface, bezier); + + ID2D1GeometrySink_AddQuadraticBeziers(iface, bezier, 1); } static void STDMETHODCALLTYPE d2d_geometry_sink_AddQuadraticBeziers(ID2D1GeometrySink *iface,

1 0

Hans Leidekker : winhttp: Keep the session open in the request object.
by Alexandre Julliard June 16, 2015

June 16, 2015

Module: wine Branch: master Commit: b22ace7f7bceed769a7206755882cd3620f14200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22ace7f7bceed769a7206755… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 15 17:33:41 2015 +0200 winhttp: Keep the session open in the request object. Cookies have session scope in winhttp and they are not saved, so we need to keep the session open to ensure that cookies are passed along with subsequent requests. --- dlls/winhttp/request.c | 194 ++++++++++++++++++++++++++++--------------------- 1 file changed, 110 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b22ace7f7bceed769a720…

1 0

Hans Leidekker : winhttp: Correctly handle relative redirect paths.
by Alexandre Julliard June 16, 2015

June 16, 2015

Module: wine Branch: master Commit: 9736644ed50f996091afe16243c3fa4a373498a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9736644ed50f996091afe1624… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 15 17:32:50 2015 +0200 winhttp: Correctly handle relative redirect paths. --- dlls/winhttp/request.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2fee2c3..5aa90e4 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2296,13 +2296,21 @@ static BOOL handle_redirect( request_t *request, DWORD status ) { WCHAR *path, *p; - len = strlenW( location ) + 1; - if (location[0] != '/') len++; - if (!(p = path = heap_alloc( len * sizeof(WCHAR) ))) goto end; - - if (location[0] != '/') *p++ = '/'; - strcpyW( p, location ); - + if (location[0] == '/') + { + len = strlenW( location ); + if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; + strcpyW( path, location ); + } + else + { + if ((p = strrchrW( request->path, '/' ))) *p = 0; + len = strlenW( request->path ) + 1 + strlenW( location ); + if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; + strcpyW( path, request->path ); + strcatW( path, slashW ); + strcatW( path, location ); + } heap_free( request->path ); request->path = path;

1 0

Qian Hong : include: Remove duplicate macro definition in shellapi.h.
by Alexandre Julliard June 16, 2015

June 16, 2015

Module: wine Branch: master Commit: 0edeb9b9b10b1af0ca33b4202ab9d1d5037ae7d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0edeb9b9b10b1af0ca33b4202… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Jun 16 15:58:21 2015 +0800 include: Remove duplicate macro definition in shellapi.h. --- include/shellapi.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/shellapi.h b/include/shellapi.h index ecf0b21..8492155 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -250,12 +250,6 @@ void WINAPI SHFreeNameMappings(HANDLE hNameMappings); /****************************************** * ShellExecute */ -#define SE_ERR_SHARE 26 -#define SE_ERR_ASSOCINCOMPLETE 27 -#define SE_ERR_DDETIMEOUT 28 -#define SE_ERR_DDEFAIL 29 -#define SE_ERR_DDEBUSY 30 -#define SE_ERR_NOASSOC 31 HINSTANCE WINAPI ShellExecuteA(HWND,LPCSTR,LPCSTR,LPCSTR,LPCSTR,INT); HINSTANCE WINAPI ShellExecuteW(HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT);

1 0

Bruno Jesus : dmband: Don' t fake success on IDirectMusicUtils_IPersistStream_ParseReference.
by Alexandre Julliard June 16, 2015

June 16, 2015

Module: wine Branch: master Commit: 00303530822f5736a24b38d2a0347666aef138b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00303530822f5736a24b38d2a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jun 15 10:24:39 2015 -0300 dmband: Don't fake success on IDirectMusicUtils_IPersistStream_ParseReference. --- dlls/dmband/dmutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index 760afe8..b121564 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -321,7 +321,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, } TRACE_(dmfile)("** DM Reference End of Load ***\n"); - return S_OK; + return hr; } /* FOURCC to string conversion for debug messages */

1 0

Henri Verbeet : d2d1: Implement d2d_geometry_sink_AddBezier().
by Alexandre Julliard June 16, 2015

June 16, 2015

Module: wine Branch: master Commit: 8b170f0f59aab3dd0e775217a95227b1bfc4cf2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b170f0f59aab3dd0e775217a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 22:30:08 2015 +0200 d2d1: Implement d2d_geometry_sink_AddBezier(). --- dlls/d2d1/geometry.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 0054a47..2f3a6cc 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -115,7 +115,9 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddLine(ID2D1GeometrySink *iface static void STDMETHODCALLTYPE d2d_geometry_sink_AddBezier(ID2D1GeometrySink *iface, const D2D1_BEZIER_SEGMENT *bezier) { - FIXME("iface %p, bezier %p stub!\n", iface, bezier); + TRACE("iface %p, bezier %p.\n", iface, bezier); + + d2d_geometry_sink_AddBeziers(iface, bezier, 1); } static void STDMETHODCALLTYPE d2d_geometry_sink_AddQuadraticBezier(ID2D1GeometrySink *iface,

1 0

Bruno Jesus : dmime: Don' t fake success on IDirectMusicUtils_IPersistStream_ParseReference.
by Alexandre Julliard June 16, 2015

June 16, 2015

Module: wine Branch: master Commit: f9a83377bc7f95eef7bb518d33eeb71ffaae3d9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a83377bc7f95eef7bb518d3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jun 15 10:26:03 2015 -0300 dmime: Don't fake success on IDirectMusicUtils_IPersistStream_ParseReference. --- dlls/dmime/dmutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 6e61e16..75a62a4 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -216,7 +216,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, } TRACE("** DM Reference End of Load ***\n"); - return S_OK; + return hr; } /* FOURCC to string conversion for debug messages */

1 0