March 2016 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : user32: Don' t crash in DrawTextEx when tab length is zero.
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 84d0c4f0da4982c3f67cce9552b7d971d7a0e1d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d0c4f0da4982c3f67cce955… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 2 15:22:10 2016 +1100 user32: Don't crash in DrawTextEx when tab length is zero. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/text.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/user32/text.c | 2 +- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 0352d66..eccf972 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -44,8 +44,9 @@ static void test_DrawTextCalcRect(void) static WCHAR emptystringW[] = { 0 }; static CHAR wordbreak_text[] = "line1 line2"; static WCHAR wordbreak_textW[] = {'l','i','n','e','1',' ','l','i','n','e','2',0}; + static char tabstring[] = "one\ttwo"; INT textlen, textheight, heightcheck; - RECT rect = { 0, 0, 100, 0 }; + RECT rect = { 0, 0, 100, 0 }, rect2; BOOL ret; DRAWTEXTPARAMS dtp; BOOL conform_xp = TRUE; @@ -580,6 +581,42 @@ static void test_DrawTextCalcRect(void) ok(textheight >= heightcheck * 6, "Got unexpected textheight %d, expected at least %d.\n", textheight, heightcheck * 6); + /* DT_TABSTOP | DT_EXPANDTABS tests */ + SetRect( &rect, 0,0, 10, 10); + textheight = DrawTextA(hdc, tabstring, -1, &rect, DT_TABSTOP | DT_EXPANDTABS ); + ok(textheight >= heightcheck, "Got unexpected textheight %d\n", textheight); + + SetRect( &rect, 0,0, 10, 10); + memset(&dtp, 0, sizeof(dtp)); + dtp.cbSize = sizeof(dtp); + textheight = DrawTextExA(hdc, tabstring, -1, &rect, DT_CALCRECT, &dtp); + ok(textheight >= heightcheck, "Got unexpected textheight %d\n", textheight); + ok(dtp.iTabLength == 0, "invalid dtp.iTabLength = %i\n",dtp.iTabLength); + + SetRect( &rect2, 0,0, 10, 10); + memset(&dtp, 0, sizeof(dtp)); + dtp.cbSize = sizeof(dtp); + textheight = DrawTextExA(hdc, tabstring, -1, &rect2, DT_CALCRECT | DT_TABSTOP | DT_EXPANDTABS, &dtp); + ok(textheight >= heightcheck, "Got unexpected textheight %d\n", textheight); + ok(dtp.iTabLength == 0, "invalid dtp.iTabLength = %i\n",dtp.iTabLength); + ok(rect.left == rect2.left && rect.right != rect2.right && rect.top == rect2.top && rect.bottom == rect2.bottom, + "incorrect rect %d,%d-%d,%d rect2 %d,%d-%d,%d\n", + rect.left, rect.top, rect.right, rect.bottom, rect2.left, rect2.top, rect2.right, rect2.bottom ); + + SetRect( &rect, 0,0, 10, 10); + memset(&dtp, 0, sizeof(dtp)); + dtp.cbSize = sizeof(dtp); + dtp.iTabLength = 8; + textheight = DrawTextExA(hdc, tabstring, -1, &rect, DT_CALCRECT | DT_TABSTOP | DT_EXPANDTABS, &dtp); + ok(textheight >= heightcheck, "Got unexpected textheight %d\n", textheight); + ok(dtp.iTabLength == 8, "invalid dtp.iTabLength = %i\n",dtp.iTabLength); + ok(rect.left == rect2.left, "unexpected value %d, got %d\n", rect.left, rect2.left); + /* XP, 2003 appear to not give the same values. */ + ok(rect.right == rect2.right || broken(rect.right > rect2.right), "unexpected value %d, got %d\n",rect.right, rect2.right); + ok(rect.top == rect2.top, "unexpected value %d, got %d\n", rect.top, rect2.top); + ok(rect.bottom == rect2.bottom , "unexpected value %d, got %d\n", rect.bottom, rect2.bottom); + + SelectObject(hdc, hOldFont); ret = DeleteObject(hFont); ok( ret, "DeleteObject error %u\n", GetLastError()); diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 7b0302e..2ac3afd 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -948,7 +948,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (flags & DT_EXPANDTABS) { - int tabstop = ((flags & DT_TABSTOP) && dtp) ? dtp->iTabLength : 8; + int tabstop = ((flags & DT_TABSTOP) && dtp && dtp->iTabLength) ? dtp->iTabLength : 8; tabwidth = tm.tmAveCharWidth * tabstop; }

1 0

Nikolay Sivov : ole32: Fix refcounting of IObjContext per-thread instance.
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: cf218bca423a78f9ee45dfbbda784bc285307471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf218bca423a78f9ee45dfbbd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 14 20:30:54 2016 +0300 ole32: Fix refcounting of IObjContext per-thread instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 61 ++++++++++++++++++++-------------------------- dlls/ole32/tests/compobj.c | 46 ++++++++++++++++++++-------------- 2 files changed, 55 insertions(+), 52 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index b095aeb..857f985 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4683,10 +4683,15 @@ static ULONG Context_AddRef(Context *This) static ULONG Context_Release(Context *This) { - ULONG refs = InterlockedDecrement(&This->refs); - if (!refs) + /* Context instance is initially created with CoGetContextToken() with refcount set to 0, + releasing context while refcount is at 0 destroys it. */ + if (!This->refs) + { HeapFree(GetProcessHeap(), 0, This); - return refs; + return 0; + } + + return InterlockedDecrement(&This->refs); } static HRESULT WINAPI Context_CTI_QueryInterface(IComThreadingInfo *iface, REFIID riid, LPVOID *ppv) @@ -4924,39 +4929,19 @@ static const IObjContextVtbl Context_Object_Vtbl = */ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) { - APARTMENT *apt = COM_CurrentApt(); - Context *context; + IObjContext *context; HRESULT hr; TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); *ppv = NULL; - if (!apt) - { - if (!(apt = apartment_find_multi_threaded())) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; - } - apartment_release(apt); - } - - context = HeapAlloc(GetProcessHeap(), 0, sizeof(*context)); - if (!context) - return E_OUTOFMEMORY; - - context->IComThreadingInfo_iface.lpVtbl = &Context_Threading_Vtbl; - context->IContextCallback_iface.lpVtbl = &Context_Callback_Vtbl; - context->IObjContext_iface.lpVtbl = &Context_Object_Vtbl; - context->refs = 1; - - hr = IComThreadingInfo_QueryInterface(&context->IComThreadingInfo_iface, riid, ppv); - IComThreadingInfo_Release(&context->IComThreadingInfo_iface); + hr = CoGetContextToken((ULONG_PTR*)&context); + if (FAILED(hr)) + return hr; - return hr; + return IObjContext_QueryInterface(context, riid, ppv); } - /*********************************************************************** * CoGetContextToken [OLE32.@] */ @@ -4985,16 +4970,24 @@ HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ) if (!info->context_token) { - HRESULT hr; - IObjContext *ctx; + Context *context; + + context = HeapAlloc(GetProcessHeap(), 0, sizeof(*context)); + if (!context) + return E_OUTOFMEMORY; + + context->IComThreadingInfo_iface.lpVtbl = &Context_Threading_Vtbl; + context->IContextCallback_iface.lpVtbl = &Context_Callback_Vtbl; + context->IObjContext_iface.lpVtbl = &Context_Object_Vtbl; + /* Context token does not take a reference, it's always zero until + interface is explicitely requested with CoGetObjectContext(). */ + context->refs = 0; - hr = CoGetObjectContext(&IID_IObjContext, (void **)&ctx); - if (FAILED(hr)) return hr; - info->context_token = ctx; + info->context_token = &context->IObjContext_iface; } *token = (ULONG_PTR)info->context_token; - TRACE("apt->context_token=%p\n", info->context_token); + TRACE("context_token=%p\n", info->context_token); return S_OK; } diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index d684e33..1af24b6 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1774,7 +1774,7 @@ static void test_CoGetObjectContext(void) { HRESULT hr; ULONG refs; - IComThreadingInfo *pComThreadingInfo; + IComThreadingInfo *pComThreadingInfo, *threadinginfo2; IContextCallback *pContextCallback; IObjContext *pObjContext; APTTYPE apttype; @@ -1786,7 +1786,7 @@ static void test_CoGetObjectContext(void) if (!pCoGetObjectContext) { - skip("CoGetObjectContext not present\n"); + win_skip("CoGetObjectContext not present\n"); return; } @@ -1812,6 +1812,12 @@ static void test_CoGetObjectContext(void) hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + threadinginfo2 = NULL; + hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&threadinginfo2); + ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + ok(pComThreadingInfo == threadinginfo2, "got different instance\n"); + IComThreadingInfo_Release(threadinginfo2); + hr = IComThreadingInfo_GetCurrentLogicalThreadId(pComThreadingInfo, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); @@ -1854,11 +1860,8 @@ static void test_CoGetObjectContext(void) hr = pCoGetObjectContext(&IID_IContextCallback, (void **)&pContextCallback); ok_ole_success(hr, "CoGetObjectContext(ContextCallback)"); - if (hr == S_OK) - { - refs = IContextCallback_Release(pContextCallback); - ok(refs == 0, "pContextCallback should have 0 refs instead of %d refs\n", refs); - } + refs = IContextCallback_Release(pContextCallback); + ok(refs == 0, "pContextCallback should have 0 refs instead of %d refs\n", refs); CoUninitialize(); @@ -1881,11 +1884,8 @@ static void test_CoGetObjectContext(void) hr = pCoGetObjectContext(&IID_IContextCallback, (void **)&pContextCallback); ok_ole_success(hr, "CoGetObjectContext(ContextCallback)"); - if (hr == S_OK) - { - refs = IContextCallback_Release(pContextCallback); - ok(refs == 0, "pContextCallback should have 0 refs instead of %d refs\n", refs); - } + refs = IContextCallback_Release(pContextCallback); + ok(refs == 0, "pContextCallback should have 0 refs instead of %d refs\n", refs); hr = pCoGetObjectContext(&IID_IObjContext, (void **)&pObjContext); ok_ole_success(hr, "CoGetObjectContext"); @@ -2007,7 +2007,7 @@ static void test_CoGetContextToken(void) { HRESULT hr; ULONG refs; - ULONG_PTR token; + ULONG_PTR token, token2; IObjContext *ctx; struct info info; HANDLE thread; @@ -2042,6 +2042,11 @@ static void test_CoGetContextToken(void) hr = pCoGetContextToken(&token); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + token2 = 0; + hr = pCoGetContextToken(&token2); + ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + ok(token == token2, "got different token\n"); + SetEvent(info.stop); ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); @@ -2063,18 +2068,23 @@ static void test_CoGetContextToken(void) ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); ok(token, "Expected token != 0\n"); + token2 = 0; + hr = pCoGetContextToken(&token2); + ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + ok(token2 == token, "got different token\n"); + refs = IUnknown_AddRef((IUnknown *)token); - todo_wine ok(refs == 1, "Expected 1, got %u\n", refs); + ok(refs == 1, "Expected 1, got %u\n", refs); hr = pCoGetObjectContext(&IID_IObjContext, (void **)&ctx); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); - todo_wine ok(ctx == (IObjContext *)token, "Expected interface pointers to be the same\n"); + ok(ctx == (IObjContext *)token, "Expected interface pointers to be the same\n"); refs = IObjContext_AddRef(ctx); - todo_wine ok(refs == 3, "Expected 3, got %u\n", refs); + ok(refs == 3, "Expected 3, got %u\n", refs); refs = IObjContext_Release(ctx); - todo_wine ok(refs == 2, "Expected 2, got %u\n", refs); + ok(refs == 2, "Expected 2, got %u\n", refs); refs = IUnknown_Release((IUnknown *)token); ok(refs == 1, "Expected 1, got %u\n", refs); @@ -2084,7 +2094,7 @@ static void test_CoGetContextToken(void) hr = pCoGetContextToken(&token); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); ok(token, "Expected token != 0\n"); - todo_wine ok(ctx == (IObjContext *)token, "Expected interface pointers to be the same\n"); + ok(ctx == (IObjContext *)token, "Expected interface pointers to be the same\n"); refs = IObjContext_AddRef(ctx); ok(refs == 2, "Expected 1, got %u\n", refs);

1 0

Matteo Bruni : d3dx9: Cleanup header includes.
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 4d1192ad893bdbdf2e394c3f9c2b31e02cade758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d1192ad893bdbdf2e394c3f9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 15 04:03:22 2016 +0100 d3dx9: Cleanup header includes. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/animation.c | 6 ++++-- dlls/d3dx9_36/core.c | 12 +++--------- dlls/d3dx9_36/d3dx9_36_main.c | 11 ++--------- dlls/d3dx9_36/{d3dx9_36_private.h => d3dx9_private.h} | 12 +++++------- dlls/d3dx9_36/effect.c | 7 +------ dlls/d3dx9_36/font.c | 3 +-- dlls/d3dx9_36/line.c | 6 ++++-- dlls/d3dx9_36/math.c | 8 +------- dlls/d3dx9_36/mesh.c | 9 ++------- dlls/d3dx9_36/render.c | 6 ++++-- dlls/d3dx9_36/shader.c | 7 +------ dlls/d3dx9_36/skin.c | 6 ++++-- dlls/d3dx9_36/sprite.c | 6 ++++-- dlls/d3dx9_36/surface.c | 7 ++++--- dlls/d3dx9_36/texture.c | 7 ++++--- dlls/d3dx9_36/util.c | 6 ++++-- dlls/d3dx9_36/volume.c | 6 ++++-- dlls/d3dx9_36/xfile.c | 6 +++--- 18 files changed, 55 insertions(+), 76 deletions(-) diff --git a/dlls/d3dx9_36/animation.c b/dlls/d3dx9_36/animation.c index 9a8f8b5..818bd7a 100644 --- a/dlls/d3dx9_36/animation.c +++ b/dlls/d3dx9_36/animation.c @@ -18,8 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" -#include "d3dx9_36_private.h" +#include "config.h" +#include "wine/port.h" + +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index 1b767e3..1eb289e 100644 --- a/dlls/d3dx9_36/core.c +++ b/dlls/d3dx9_36/core.c @@ -17,16 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> +#include "config.h" +#include "wine/port.h" -#define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "wine/debug.h" -#include "wine/unicode.h" - -#include "d3dx9_36_private.h" +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/d3dx9_36_main.c b/dlls/d3dx9_36/d3dx9_36_main.c index 4a94b28..04c1877 100644 --- a/dlls/d3dx9_36/d3dx9_36_main.c +++ b/dlls/d3dx9_36/d3dx9_36_main.c @@ -22,16 +22,9 @@ #include "config.h" #include "wine/port.h" -#include "initguid.h" - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" +#include "initguid.h" +#include "d3dx9_private.h" /*********************************************************************** * DllMain. diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_private.h similarity index 96% rename from dlls/d3dx9_36/d3dx9_36_private.h rename to dlls/d3dx9_36/d3dx9_private.h index 79f3b76..bc9581d 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -19,15 +19,13 @@ * */ -#ifndef __WINE_D3DX9_36_PRIVATE_H -#define __WINE_D3DX9_36_PRIVATE_H +#ifndef __WINE_D3DX9_PRIVATE_H +#define __WINE_D3DX9_PRIVATE_H -#include <stdarg.h> +#define NONAMELESSUNION +#include "wine/debug.h" #define COBJMACROS -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" #include "d3dx9.h" #define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array)) @@ -110,4 +108,4 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN; void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN; -#endif /* __WINE_D3DX9_36_PRIVATE_H */ +#endif /* __WINE_D3DX9_PRIVATE_H */ diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index fef0245..8f82784 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -19,13 +19,8 @@ #include "config.h" #include "wine/port.h" -#define NONAMELESSUNION -#include "wine/debug.h" -#include "wine/unicode.h" -#include "windef.h" -#include "wingdi.h" -#include "d3dx9_36_private.h" +#include "d3dx9_private.h" #include "d3dcompiler.h" /* Constants for special INT/FLOAT conversation */ diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index dd1243e..5522dea 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -20,9 +20,8 @@ #include "config.h" #include "wine/port.h" -#include "wine/debug.h" +#include "d3dx9_private.h" #include "wine/unicode.h" -#include "d3dx9_36_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index 5de44f4..356d54f 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -17,8 +17,10 @@ * */ -#include "wine/debug.h" -#include "d3dx9_36_private.h" +#include "config.h" +#include "wine/port.h" + +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 123bd2f..da33074 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -22,16 +22,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "config.h" #include "wine/port.h" -#include "windef.h" -#include "wingdi.h" -#include "d3dx9_36_private.h" - -#include "wine/debug.h" +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index b2dbd27..3204ea7 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -27,23 +27,18 @@ #include "config.h" #include "wine/port.h" -#define COBJMACROS -#define NONAMELESSUNION #include <assert.h> #ifdef HAVE_FLOAT_H # include <float.h> #endif -#include "windef.h" -#include "wingdi.h" -#include "d3dx9.h" + +#include "d3dx9_private.h" #undef MAKE_DDHRESULT #include "dxfile.h" #include "rmxfguid.h" #include "rmxftmpl.h" -#include "wine/debug.h" #include "wine/unicode.h" #include "wine/list.h" -#include "d3dx9_36_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/render.c b/dlls/d3dx9_36/render.c index cca6b44..ad83307 100644 --- a/dlls/d3dx9_36/render.c +++ b/dlls/d3dx9_36/render.c @@ -17,8 +17,10 @@ * */ -#include "wine/debug.h" -#include "d3dx9_36_private.h" +#include "config.h" +#include "wine/port.h" + +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e25480d..9723aa4 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -21,14 +21,9 @@ #include "config.h" #include "wine/port.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "windef.h" -#include "wingdi.h" -#include "objbase.h" +#include "d3dx9_private.h" #include "d3dcommon.h" #include "d3dcompiler.h" -#include "d3dx9_36_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index 9b93af6..f197d33 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -18,8 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" -#include "d3dx9_36_private.h" +#include "config.h" +#include "wine/port.h" + +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index 8fbabc3..4a7437f 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -17,8 +17,10 @@ * */ -#include "wine/debug.h" -#include "d3dx9_36_private.h" +#include "config.h" +#include "wine/port.h" + +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 4fa2a76..1bfe75a 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -18,9 +18,10 @@ * */ -#include "wine/debug.h" -#include "wine/unicode.h" -#include "d3dx9_36_private.h" +#include "config.h" +#include "wine/port.h" + +#include "d3dx9_private.h" #include "initguid.h" #include "ole2.h" diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 27f08ad..1d13c08 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -19,9 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/unicode.h" -#include "wine/debug.h" -#include "d3dx9_36_private.h" +#include "config.h" +#include "wine/port.h" + +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 94899cf..d8cd43a 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -17,8 +17,10 @@ * */ -#include "wine/debug.h" -#include "d3dx9_36_private.h" +#include "config.h" +#include "wine/port.h" + +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index fae8542..5a006ef 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -16,8 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" -#include "d3dx9_36_private.h" +#include "config.h" +#include "wine/port.h" + +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index eda0d7e..1575454 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -17,10 +17,10 @@ * */ -#include "wine/debug.h" +#include "config.h" +#include "wine/port.h" -#define COBJMACROS -#include "d3dx9.h" +#include "d3dx9_private.h" #include "d3dx9xof.h" #undef MAKE_DDHRESULT #include "dxfile.h"

1 0

Alexandre Julliard : advapi32: Fix null termination in RegQueryInfoKeyA.
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 303daeef58b7fe56ef991dde8504d65c11924937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=303daeef58b7fe56ef991dde8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 15 14:06:29 2016 +0900 advapi32: Fix null termination in RegQueryInfoKeyA. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 2 +- dlls/advapi32/tests/registry.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index aa451b1..7992384 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1162,12 +1162,12 @@ LSTATUS WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDW (WCHAR *)(buf_ptr + info->ClassOffset), info->ClassLength ); if (len) { - class[len - 1] = 0; if (*class_len + 1 > len) { status = STATUS_BUFFER_OVERFLOW; *class_len -= 1; } + class[*class_len] = 0; } } else status = STATUS_SUCCESS; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c2b0e12..f877b36 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1987,6 +1987,17 @@ static void test_reg_query_info(void) "classbuffer = \"%.*s\", expected %s\n", (int)sizeof(classbuffer), classbuffer, expectbuffer); + memset(classbuffer, 0x55, sizeof(classbuffer)); + classlen = 0xdeadbeef; + ret = RegQueryInfoKeyA(subkey, classbuffer, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == sizeof(subkey_class) - 1, "classlen = %u\n", classlen); + memset(expectbuffer, 0x55, sizeof(expectbuffer)); + strcpy(expectbuffer, subkey_class); + ok(!memcmp(classbuffer, expectbuffer, sizeof(classbuffer)), + "classbuffer = \"%.*s\", expected %s\n", + (int)sizeof(classbuffer), classbuffer, expectbuffer); + memset(classbufferW, 0x55, sizeof(classbufferW)); classlen = sizeof(subkey_class); ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -1998,6 +2009,17 @@ static void test_reg_query_info(void) "classbufferW = %s, expected %s\n", wine_dbgstr_wn(classbufferW, sizeof(classbufferW) / sizeof(WCHAR)), wine_dbgstr_w(expectbufferW)); + memset(classbufferW, 0x55, sizeof(classbufferW)); + classlen = 0xdeadbeef; + ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == sizeof(subkey_class) - 1, "classlen = %u\n", classlen); + memset(expectbufferW, 0x55, sizeof(expectbufferW)); + lstrcpyW(expectbufferW, subkey_classW); + ok(!memcmp(classbufferW, expectbufferW, sizeof(classbufferW)), + "classbufferW = %s, expected %s\n", + wine_dbgstr_wn(classbufferW, sizeof(classbufferW) / sizeof(WCHAR)), wine_dbgstr_w(expectbufferW)); + RegDeleteKeyA(subsubkey, ""); RegCloseKey(subsubkey); RegDeleteKeyA(subkey, "");

1 0

Stefan Dösinger : wined3d: Merge wined3d_surface_update_desc() into wined3d_texture_update_desc().
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 2efaddc74ee86a1a3d4b799b00ea12e260003e40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2efaddc74ee86a1a3d4b799b0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 14 17:02:18 2016 +0100 wined3d: Merge wined3d_surface_update_desc() into wined3d_texture_update_desc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 79 ------------------------------------------ dlls/wined3d/texture.c | 75 ++++++++++++++++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 67 insertions(+), 89 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 64ed04a..f7ca370 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1677,85 +1677,6 @@ static inline unsigned short float_32_to_16(const float *in) return ret; } -HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) -{ - struct wined3d_resource *texture_resource = &surface->container->resource; - unsigned int width, height; - BOOL create_dib = FALSE; - DWORD valid_location = 0; - HRESULT hr; - - if (surface->flags & SFLAG_DIBSECTION) - { - DeleteDC(surface->hDC); - DeleteObject(surface->dib.DIBsection); - surface->dib.bitmap_data = NULL; - surface->flags &= ~SFLAG_DIBSECTION; - create_dib = TRUE; - } - - surface->locations = 0; - wined3d_resource_free_sysmem(&surface->resource); - - width = texture_resource->width; - height = texture_resource->height; - surface->resource.width = width; - surface->resource.height = height; - if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] || gl_info->supported[ARB_TEXTURE_RECTANGLE] - || gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) - { - surface->pow2Width = width; - surface->pow2Height = height; - } - else - { - surface->pow2Width = surface->pow2Height = 1; - while (surface->pow2Width < width) - surface->pow2Width <<= 1; - while (surface->pow2Height < height) - surface->pow2Height <<= 1; - } - - if (surface->container->user_memory) - { - surface->resource.map_binding = WINED3D_LOCATION_USER_MEMORY; - valid_location = WINED3D_LOCATION_USER_MEMORY; - } - surface->resource.format = texture_resource->format; - surface->resource.multisample_type = texture_resource->multisample_type; - surface->resource.multisample_quality = texture_resource->multisample_quality; - surface->resource.size = surface->container->slice_pitch; - - /* The format might be changed to a format that needs conversion. - * If the surface didn't use PBOs previously but could now, don't - * change it - whatever made us not use PBOs might come back, e.g. - * color keys. */ - if (surface->resource.map_binding == WINED3D_LOCATION_BUFFER - && !wined3d_texture_use_pbo(surface->container, gl_info)) - surface->resource.map_binding = create_dib ? WINED3D_LOCATION_DIB : WINED3D_LOCATION_SYSMEM; - - if (create_dib) - { - if (FAILED(hr = surface_create_dib_section(surface))) - { - ERR("Failed to create dib section, hr %#x.\n", hr); - return hr; - } - if (!valid_location) - valid_location = WINED3D_LOCATION_DIB; - } - - if (!valid_location) - { - surface_prepare_system_memory(surface); - valid_location = WINED3D_LOCATION_SYSMEM; - } - - surface_validate_location(surface, valid_location); - - return WINED3D_OK; -} - static void convert_r32_float_r16_float(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c86d640..cdde12c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -670,6 +670,8 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); UINT resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); struct wined3d_surface *surface; + DWORD valid_location = 0; + BOOL create_dib = FALSE; TRACE("texture %p, width %u, height %u, format %s, multisample_type %#x, multisample_quality %u, " "mem %p, pitch %u.\n", @@ -713,13 +715,19 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT if (device->d3d_initialized) texture->resource.resource_ops->resource_unload(&texture->resource); - texture->resource.format = format; - texture->resource.multisample_type = multisample_type; - texture->resource.multisample_quality = multisample_quality; - texture->resource.width = width; - texture->resource.height = height; + if (surface->flags & SFLAG_DIBSECTION) + { + DeleteDC(surface->hDC); + surface->hDC = NULL; + DeleteObject(surface->dib.DIBsection); + surface->dib.DIBsection = NULL; + surface->dib.bitmap_data = NULL; + surface->flags &= ~SFLAG_DIBSECTION; + create_dib = TRUE; + } + + wined3d_resource_free_sysmem(&surface->resource); - texture->user_memory = mem; if ((texture->row_pitch = pitch)) texture->slice_pitch = height * pitch; else @@ -727,12 +735,63 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_format_calculate_pitch(format, 1, width, height, &texture->row_pitch, &texture->slice_pitch); - texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; + texture->resource.format = format; + texture->resource.multisample_type = multisample_type; + texture->resource.multisample_quality = multisample_quality; + texture->resource.width = width; + texture->resource.height = height; + + surface->resource.format = format; + surface->resource.multisample_type = multisample_type; + surface->resource.multisample_quality = multisample_quality; + surface->resource.width = width; + surface->resource.height = height; + surface->resource.size = texture->slice_pitch; + if (((width & (width - 1)) || (height & (height - 1))) && !gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] && !gl_info->supported[ARB_TEXTURE_RECTANGLE] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) + { texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; + surface->pow2Width = surface->pow2Height = 1; + while (surface->pow2Width < width) + surface->pow2Width <<= 1; + while (surface->pow2Height < height) + surface->pow2Height <<= 1; + } + else + { + texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; + surface->pow2Width = width; + surface->pow2Height = height; + } + + surface->locations = 0; + + if ((texture->user_memory = mem)) + { + surface->resource.map_binding = WINED3D_LOCATION_USER_MEMORY; + valid_location = WINED3D_LOCATION_USER_MEMORY; + } + else if (create_dib && SUCCEEDED(surface_create_dib_section(surface))) + { + valid_location = WINED3D_LOCATION_DIB; + } + else + { + wined3d_surface_prepare(surface, NULL, WINED3D_LOCATION_SYSMEM); + valid_location = WINED3D_LOCATION_SYSMEM; + } + + /* The format might be changed to a format that needs conversion. + * If the surface didn't use PBOs previously but could now, don't + * change it - whatever made us not use PBOs might come back, e.g. + * color keys. */ + if (surface->resource.map_binding == WINED3D_LOCATION_BUFFER && !wined3d_texture_use_pbo(texture, gl_info)) + surface->resource.map_binding = surface->dib.DIBsection ? WINED3D_LOCATION_DIB : WINED3D_LOCATION_SYSMEM; - return wined3d_surface_update_desc(surface, gl_info); + surface_validate_location(surface, valid_location); + + return WINED3D_OK; } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 15fe6c9..df16d63 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2623,8 +2623,6 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, void surface_set_dirty(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, GLint level) DECLSPEC_HIDDEN; void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; -HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, - const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN; void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Introduce wined3d_texture_use_pbo().
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: bad48492574045c3fbdb233ec667cfa9ba678153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bad48492574045c3fbdb233ec… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 14 17:02:17 2016 +0100 wined3d: Introduce wined3d_texture_use_pbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 18 +++--------------- dlls/wined3d/texture.c | 11 +++++++++++ dlls/wined3d/volume.c | 4 +--- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d06f1eb..64ed04a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -518,19 +518,6 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) surface_invalidate_location(surface, WINED3D_LOCATION_SYSMEM); } -static BOOL surface_use_pbo(const struct wined3d_surface *surface) -{ - const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; - struct wined3d_texture *texture = surface->container; - - return texture->resource.pool == WINED3D_POOL_DEFAULT - && surface->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU - && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] - && !texture->resource.format->convert - && !(texture->flags & WINED3D_TEXTURE_PIN_SYSMEM) - && !(texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED); -} - static HRESULT surface_private_setup(struct wined3d_surface *surface) { /* TODO: Check against the maximum texture sizes supported by the video card. */ @@ -597,7 +584,7 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) surface->locations = WINED3D_LOCATION_DISCARDED; - if (surface_use_pbo(surface)) + if (wined3d_texture_use_pbo(texture, gl_info)) surface->resource.map_binding = WINED3D_LOCATION_BUFFER; return WINED3D_OK; @@ -1743,7 +1730,8 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, const struc * If the surface didn't use PBOs previously but could now, don't * change it - whatever made us not use PBOs might come back, e.g. * color keys. */ - if (surface->resource.map_binding == WINED3D_LOCATION_BUFFER && !surface_use_pbo(surface)) + if (surface->resource.map_binding == WINED3D_LOCATION_BUFFER + && !wined3d_texture_use_pbo(surface->container, gl_info)) surface->resource.map_binding = create_dib ? WINED3D_LOCATION_DIB : WINED3D_LOCATION_SYSMEM; if (create_dib) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e0b5510..c86d640 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -28,6 +28,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(winediag); +BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) +{ + return texture->resource.pool == WINED3D_POOL_DEFAULT + && texture->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU + && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] + && !texture->resource.format->convert + && !(texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED)); +} + static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_texture_ops *texture_ops, UINT layer_count, UINT level_count, const struct wined3d_resource_desc *desc, DWORD flags, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops, @@ -61,6 +70,8 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return hr; } wined3d_resource_update_draw_binding(&texture->resource); + if ((flags & WINED3D_TEXTURE_CREATE_MAPPABLE) || desc->format == WINED3DFMT_D16_LOCKABLE) + texture->resource.access_flags |= WINED3D_RESOURCE_ACCESS_CPU; texture->texture_ops = texture_ops; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index e1749ac..c846ec4 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -489,9 +489,7 @@ HRESULT wined3d_volume_init(struct wined3d_volume *volume, struct wined3d_textur volume->texture_level = level; volume->locations = WINED3D_LOCATION_DISCARDED; - if (desc->pool == WINED3D_POOL_DEFAULT && desc->usage & WINED3DUSAGE_DYNAMIC - && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] - && !format->convert) + if (wined3d_texture_use_pbo(container, gl_info)) { wined3d_resource_free_sysmem(&volume->resource); volume->resource.map_binding = WINED3D_LOCATION_BUFFER; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 83a9d04..15fe6c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2458,6 +2458,8 @@ void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture, void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, + const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; #define WINED3D_LOCATION_DISCARDED 0x00000001 #define WINED3D_LOCATION_SYSMEM 0x00000002

1 0

Hugh McMaster : reg: Fail if /v is passed without an argument.
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 735dca607409b7409b8adc4dd3e126c49d4603c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=735dca607409b7409b8adc4dd… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 15 23:23:55 2016 +1100 reg: Fail if /v is passed without an argument. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 24 +++++++++++++++++++++--- programs/reg/tests/reg.c | 13 +++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 1167ccb..29be40e 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -601,7 +601,13 @@ int wmain(int argc, WCHAR *argvW[]) for (i = 1; i < argc; i++) { if (!lstrcmpiW(argvW[i], slashVW)) - value_name = argvW[++i]; + { + if (!(value_name = argvW[++i])) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + } else if (!lstrcmpiW(argvW[i], slashVEW)) value_empty = TRUE; else if (!lstrcmpiW(argvW[i], slashTW)) @@ -652,7 +658,13 @@ int wmain(int argc, WCHAR *argvW[]) for (i = 1; i < argc; i++) { if (!lstrcmpiW(argvW[i], slashVW)) - value_name = argvW[++i]; + { + if (!(value_name = argvW[++i])) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + } else if (!lstrcmpiW(argvW[i], slashVEW)) value_empty = TRUE; else if (!lstrcmpiW(argvW[i], slashVAW)) @@ -683,7 +695,13 @@ int wmain(int argc, WCHAR *argvW[]) for (i = 1; i < argc; i++) { if (!lstrcmpiW(argvW[i], slashVW)) - value_name = argvW[++i]; + { + if (!(value_name = argvW[++i])) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + } else if (!lstrcmpiW(argvW[i], slashVEW)) value_empty = TRUE; else if (!lstrcmpiW(argvW[i], slashSW)) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 6a55537..d1db5c4 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -519,6 +519,19 @@ static void test_v_flags(void) run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /va", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* No /v argument */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /d Test /f /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /f /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } START_TEST(reg)

1 0

Alex Henrie : user32: Don't put a default icon on modal dialogs.
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 9a28e350644b6850f08880a7faa8bce8c41af812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a28e350644b6850f08880a7f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Mar 13 22:35:27 2016 -0600 user32: Don't put a default icon on modal dialogs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 053353a..68320af 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -168,10 +168,10 @@ static HICON NC_IconForWindow( HWND hwnd ) if (!hIcon) hIcon = (HICON) GetClassLongPtrW( hwnd, GCLP_HICONSM ); if (!hIcon) hIcon = (HICON) GetClassLongPtrW( hwnd, GCLP_HICON ); - /* If there is no hIcon specified and this is a modal dialog, + /* If there is no icon specified and this is not a modal dialog, * get the default one. */ - if (!hIcon && (GetWindowLongW( hwnd, GWL_STYLE ) & DS_MODALFRAME)) + if (!hIcon && !(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_DLGMODALFRAME)) hIcon = LoadImageW(0, (LPCWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); return hIcon;

1 0

Nikolay Sivov : comctl32/datetime: Use MCM_GETRANGE result directly in DTM_GETRANGE.
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: a62d17874423a13eb7a39edf71b9fcd549b85e4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62d17874423a13eb7a39edf7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 14 20:19:26 2016 +0300 comctl32/datetime: Use MCM_GETRANGE result directly in DTM_GETRANGE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 4 +--- dlls/comctl32/tests/datetime.c | 7 +++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 5c73a90..83db50e 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1555,7 +1555,6 @@ static LRESULT WINAPI DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { DATETIME_INFO *infoPtr = ((DATETIME_INFO *)GetWindowLongPtrW (hwnd, 0)); - LRESULT ret; TRACE ("%x, %lx, %lx\n", uMsg, wParam, lParam); @@ -1571,8 +1570,7 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return DATETIME_SetSystemTime (infoPtr, wParam, (SYSTEMTIME *) lParam); case DTM_GETRANGE: - ret = SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, wParam, lParam); - return ret ? ret : 1; /* bug emulation */ + return SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, wParam, lParam); case DTM_SETRANGE: return SendMessageW (infoPtr->hMonthCal, MCM_SETRANGE, wParam, lParam); diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 61ecfb5..708921f 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -404,6 +404,13 @@ static void test_dtm_set_and_get_range(void) ok_sequence(sequences, DATETIME_SEQ_INDEX, test_dtm_set_and_get_range_seq, "test_dtm_set_and_get_range", FALSE); + /* DTM_SETRANGE with 0 flags */ + r = SendMessageA(hWnd, DTM_SETRANGE, 0, (LPARAM)st); + ok(r, "got %lu\n", r); + r = SendMessageA(hWnd, DTM_GETRANGE, 0, (LPARAM)getSt); + ok(r == 0, "got %lu\n", r); + ok(getSt[0].wYear == 0 && getSt[1].wYear == 0, "got %u, %u\n", getSt[0].wYear, getSt[1].wYear); + DestroyWindow(hWnd); }

1 0

Andrew Eikum : dinput: Fix condition effect joystick offset calculation.
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 99341249173710d5441ba3d415e53aeb37b91fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99341249173710d5441ba3d41… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 14 11:39:48 2016 -0500 dinput: Fix condition effect joystick offset calculation. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 3f17217..0e7be2c 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -67,6 +67,11 @@ static inline LinuxInputEffectImpl *impl_from_IDirectInputEffect(IDirectInputEff return CONTAINING_RECORD(iface, LinuxInputEffectImpl, IDirectInputEffect_iface); } +double ff_effect_direction_to_rad(unsigned int dir) +{ + return (dir & 0xffff) * M_PI / 0x8000; +} + /****************************************************************************** * LinuxInputEffectImpl */ @@ -172,8 +177,10 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetParameters( return diErr; else { if (peff->dwFlags & DIEFF_CARTESIAN) { - peff->rglDirection[0] = sin(M_PI * 3 * This->effect.direction / 0x7FFF) * 1000; - peff->rglDirection[1] = cos(M_PI * 3 * This->effect.direction / 0x7FFF) * 1000; + /* rotate so 0 points right */ + double angle = ff_effect_direction_to_rad(This->effect.direction + 0xc000); + peff->rglDirection[0] = sin(angle) * 1000; + peff->rglDirection[1] = -cos(angle) * 1000; } else { /* Polar and spherical coordinates are the same for two or less * axes. @@ -505,9 +512,11 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( /* One condition block. This needs to be rotated to direction, * and expanded to separate x and y conditions. */ int i; - double factor[2]; - factor[0] = asin((This->effect.direction * 3.0 * M_PI) / 0x7FFF); - factor[1] = acos((This->effect.direction * 3.0 * M_PI) / 0x7FFF); + double factor[2], angle; + /* rotate so 0 points right */ + angle = ff_effect_direction_to_rad(This->effect.direction + 0xc000); + factor[0] = sin(angle); + factor[1] = -cos(angle); for (i = 0; i < 2; ++i) { This->effect.u.condition[i].center = (int)(factor[i] * (tsp->lOffset / 10) * 32); This->effect.u.condition[i].right_coeff = (int)(factor[i] * (tsp->lPositiveCoefficient / 10) * 32);

1 0