August 2016 - Wine-commits - list.winehq.org

Aaryaman Vasishta : d3drm: Implement IDirect3DRMFrame*::GetScene.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: be90480c3ce1f128168e7bd01c49434ca9bec675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be90480c3ce1f128168e7bd01… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Tue Aug 16 01:38:15 2016 +0530 d3drm: Implement IDirect3DRMFrame*::GetScene. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/frame.c | 42 ++++++++++++++++++++++++++++++++++++------ dlls/d3drm/tests/d3drm.c | 24 ++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 2ff0241..d79a8e3 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -1339,23 +1339,53 @@ static HRESULT WINAPI d3drm_frame1_GetRotation(IDirect3DRMFrame *iface, static HRESULT WINAPI d3drm_frame3_GetScene(IDirect3DRMFrame3 *iface, IDirect3DRMFrame3 **scene) { - FIXME("iface %p, scene %p stub!\n", iface, scene); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - return E_NOTIMPL; + TRACE("iface %p, scene %p.\n", iface, scene); + + if (!scene) + return D3DRMERR_BADVALUE; + + while (frame->parent) + frame = frame->parent; + + *scene = &frame->IDirect3DRMFrame3_iface; + IDirect3DRMFrame3_AddRef(*scene); + + return D3DRM_OK; } static HRESULT WINAPI d3drm_frame2_GetScene(IDirect3DRMFrame2 *iface, IDirect3DRMFrame **scene) { - FIXME("iface %p, scene %p stub!\n", iface, scene); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); + IDirect3DRMFrame3 *frame3; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, scene %p.\n", iface, scene); + + if (!scene) + return D3DRMERR_BADVALUE; + + hr = IDirect3DRMFrame3_GetScene(&frame->IDirect3DRMFrame3_iface, &frame3); + if (FAILED(hr) || !frame3) + { + *scene = NULL; + return hr; + } + + hr = IDirect3DRMFrame3_QueryInterface(frame3, &IID_IDirect3DRMFrame, (void **)scene); + IDirect3DRMFrame3_Release(frame3); + + return hr; } static HRESULT WINAPI d3drm_frame1_GetScene(IDirect3DRMFrame *iface, IDirect3DRMFrame **scene) { - FIXME("iface %p, scene %p stub!\n", iface, scene); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); - return E_NOTIMPL; + TRACE("iface %p, scene %p.\n", iface, scene); + + return d3drm_frame2_GetScene(&frame->IDirect3DRMFrame2_iface, scene); } static D3DRMSORTMODE WINAPI d3drm_frame3_GetSortMode(IDirect3DRMFrame3 *iface) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 1abaed5..d86477d 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -885,6 +885,7 @@ static void test_Frame(void) IDirect3DRMFrame *pFrameP1; IDirect3DRMFrame *pFrameP2; IDirect3DRMFrame *pFrameTmp; + IDirect3DRMFrame *scene_frame; IDirect3DRMFrameArray *frame_array; IDirect3DRMMeshBuilder *mesh_builder; IDirect3DRMVisual *visual1; @@ -967,6 +968,19 @@ static void test_Frame(void) CHECK_REFCOUNT(pFrameP1, 1); CHECK_REFCOUNT(pFrameC, 2); + hr = IDirect3DRMFrame_GetScene(pFrameC, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRMFrame_GetScene(pFrameC, &scene_frame); + ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr); + ok(scene_frame == pFrameP1, "Expected scene frame == %p, got %p.\n", pFrameP1, scene_frame); + CHECK_REFCOUNT(pFrameP1, 2); + IDirect3DRMFrame_Release(scene_frame); + hr = IDirect3DRMFrame_GetScene(pFrameP1, &scene_frame); + ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr); + ok(scene_frame == pFrameP1, "Expected scene frame == %p, got %p.\n", pFrameP1, scene_frame); + CHECK_REFCOUNT(pFrameP1, 2); + IDirect3DRMFrame_Release(scene_frame); + frame_array = NULL; hr = IDirect3DRMFrame_GetChildren(pFrameP1, &frame_array); ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); @@ -1032,6 +1046,16 @@ static void test_Frame(void) ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); IDirect3DRMFrameArray_Release(frame_array); } + hr = IDirect3DRMFrame_GetScene(pFrameC, &scene_frame); + ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr); + ok(scene_frame == pFrameP2, "Expected scene frame == %p, got %p.\n", pFrameP2, scene_frame); + CHECK_REFCOUNT(pFrameP2, 2); + IDirect3DRMFrame_Release(scene_frame); + hr = IDirect3DRMFrame_GetScene(pFrameP2, &scene_frame); + ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr); + ok(scene_frame == pFrameP2, "Expected scene frame == %p, got %p.\n", pFrameP2, scene_frame); + CHECK_REFCOUNT(pFrameP2, 2); + IDirect3DRMFrame_Release(scene_frame); pFrameTmp = (void*)0xdeadbeef; hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);

1 0

Keno Fischer : preloader: Add proper CFI instructions to _start functions.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: 5f38bfed7cf408c1734d6bff8770c3b11edc665f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f38bfed7cf408c1734d6bff8… Author: Keno Fischer <keno(a)juliacomputing.com> Date: Thu Aug 11 15:04:39 2016 -0400 preloader: Add proper CFI instructions to _start functions. Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/preloader.c b/loader/preloader.c index db0e998..7cf2946 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -212,6 +212,7 @@ struct void _start(void); extern char _end[]; __ASM_GLOBAL_FUNC(_start, + __ASM_CFI("\t.cfi_undefined %eip\n") "\tmovl $243,%eax\n" /* SYS_set_thread_area */ "\tmovl $thread_ldt,%ebx\n" "\tint $0x80\n" /* allocate gs segment */ @@ -363,6 +364,7 @@ void *thread_data[256]; void _start(void); extern char _end[]; __ASM_GLOBAL_FUNC(_start, + __ASM_CFI(".cfi_undefined %rip\n\t") "movq %rsp,%rax\n\t" "leaq -144(%rsp),%rsp\n\t" /* allocate some space for extra aux values */ "movq %rax,(%rsp)\n\t" /* orig stack pointer */

1 0

Nikolay Sivov : strmbase: Fix media type leaks when creating IEnumMediaTypes instance (Valgrind).
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: 51021faaef8312c35e9772873ad588c194c5c709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51021faaef8312c35e9772873… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 15 16:38:33 2016 +0300 strmbase: Fix media type leaks when creating IEnumMediaTypes instance (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 63b9ec2..91c0ddc 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -125,18 +125,23 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e pEnumMediaTypes->basePin = basePin; i = 0; - while (enumFunc(basePin, i, &amt) == S_OK) i++; + while (enumFunc(basePin, i, &amt) == S_OK) + { + FreeMediaType(&amt); + i++; + } pEnumMediaTypes->enumMediaDetails.cMediaTypes = i; pEnumMediaTypes->enumMediaDetails.pMediaTypes = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * i); memset(pEnumMediaTypes->enumMediaDetails.pMediaTypes, 0, sizeof(AM_MEDIA_TYPE) * i); for (i = 0; i < pEnumMediaTypes->enumMediaDetails.cMediaTypes; i++) { - enumFunc(basePin,i,&amt); - if (FAILED(CopyMediaType(&pEnumMediaTypes->enumMediaDetails.pMediaTypes[i], &amt))) + HRESULT hr; + + if (FAILED(hr = enumFunc(basePin, i, &pEnumMediaTypes->enumMediaDetails.pMediaTypes[i]))) { IEnumMediaTypes_Release(&pEnumMediaTypes->IEnumMediaTypes_iface); - return E_OUTOFMEMORY; + return hr; } } *ppEnum = &pEnumMediaTypes->IEnumMediaTypes_iface;

1 0

Nikolay Sivov : gdi32: Append "TrueType" suffix to registry key names.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: fcd0f6b0749b6827ee466a620e0198abe8a387f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd0f6b0749b6827ee466a620… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 14 23:52:16 2016 +0300 gdi32: Append "TrueType" suffix to registry key names. 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/gdi32/freetype.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d989b67..0e82e5e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3131,20 +3131,21 @@ static void update_reg_entries(void) LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { LIST_FOR_EACH_ENTRY( face, &family->faces, Face, entry ) { char *buffer; + WCHAR *name; + if (!(face->flags & ADDFONT_EXTERNAL_FONT)) continue; - if(face->FullName) - { - len = strlenW(face->FullName) + sizeof(TrueType) / sizeof(WCHAR) + 1; - valueW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - strcpyW(valueW, face->FullName); - } - else - { - len = strlenW(family->FamilyName) + sizeof(TrueType) / sizeof(WCHAR) + 1; - valueW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - strcpyW(valueW, family->FamilyName); - } + name = face->FullName ? face->FullName : family->FamilyName; + + len = strlenW(name) + 1; + if (face->scalable) + len += sizeof(TrueType) / sizeof(WCHAR); + + valueW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + strcpyW(valueW, name); + + if (face->scalable) + strcatW(valueW, TrueType); buffer = strWtoA( CP_UNIXCP, face->file ); path = wine_get_dos_file_name( buffer );

1 0

Daniel Lehman : msvcr120: Add lgamma.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 28a54059683a3a01028f4ecf7d922e4b7c8b04f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28a54059683a3a01028f4ecf7… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jun 17 14:49:32 2016 -0700 msvcr120: Add lgamma. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 ++-- dlls/msvcr120/msvcr120.spec | 6 ++-- dlls/msvcr120_app/msvcr120_app.spec | 6 ++-- dlls/msvcrt/math.c | 34 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 ++-- include/config.h.in | 6 ++++ 8 files changed, 56 insertions(+), 12 deletions(-) diff --git a/configure b/configure index bf4d1a7..dccacb4 100755 --- a/configure +++ b/configure @@ -16935,6 +16935,8 @@ for ac_func in \ erff \ exp2 \ exp2f \ + lgamma \ + lgammaf \ llrint \ llrintf \ llround \ diff --git a/configure.ac b/configure.ac index 0fad32f..3a24aab 100644 --- a/configure.ac +++ b/configure.ac @@ -2527,6 +2527,8 @@ AC_CHECK_FUNCS(\ erff \ exp2 \ exp2f \ + lgamma \ + lgammaf \ llrint \ llrintf \ llround \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 05a0ac0..f886b97 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -258,9 +258,9 @@ @ stub ilogbf @ stub ilogbl @ cdecl ldexp(double long) ucrtbase.ldexp -@ stub lgamma -@ stub lgammaf -@ stub lgammal +@ cdecl lgamma(double) ucrtbase.lgamma +@ cdecl lgammaf(float) ucrtbase.lgammaf +@ cdecl lgammal(double) ucrtbase.lgammal @ cdecl -ret64 llrint(double) ucrtbase.llrint @ cdecl -ret64 llrintf(float) ucrtbase.llrintf @ cdecl -ret64 llrintl(double) ucrtbase.llrintl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index f65d150..953cdba 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2243,9 +2243,9 @@ @ cdecl labs(long) MSVCRT_labs @ cdecl ldexp(double long) MSVCRT_ldexp @ cdecl ldiv(long long) MSVCRT_ldiv -@ stub lgamma -@ stub lgammaf -@ stub lgammal +@ cdecl lgamma(double) MSVCR120_lgamma +@ cdecl lgammaf(float) MSVCR120_lgammaf +@ cdecl lgammal(double) MSVCR120_lgammal @ cdecl -ret64 llabs(int64) MSVCRT_llabs @ stub lldiv @ cdecl -ret64 llrint(double) MSVCR120_llrint diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index de68b87..c88cde0 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1906,9 +1906,9 @@ @ cdecl labs(long) msvcr120.labs @ cdecl ldexp(double long) msvcr120.ldexp @ cdecl ldiv(long long) msvcr120.ldiv -@ stub lgamma -@ stub lgammaf -@ stub lgammal +@ cdecl lgamma(double) msvcr120.lgamma +@ cdecl lgammaf(float) msvcr120.lgammaf +@ cdecl lgammal(double) msvcr120.lgammal @ cdecl -ret64 llabs(int64) msvcr120.llabs @ stub lldiv @ cdecl -ret64 llrint(double) msvcr120.llrint diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index cf33f01..e87151a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2843,3 +2843,37 @@ LDOUBLE CDECL MSVCR120_remainderl(LDOUBLE x, LDOUBLE y) { return MSVCR120_remainder(x, y); } + +/********************************************************************* + * lgamma (MSVCR120.@) + */ +double CDECL MSVCR120_lgamma(double x) +{ +#ifdef HAVE_LGAMMA + return lgamma(x); +#else + FIXME( "not implemented\n" ); + return 0.0; +#endif +} + +/********************************************************************* + * lgammaf (MSVCR120.@) + */ +float CDECL MSVCR120_lgammaf(float x) +{ +#ifdef HAVE_LGAMMAF + return lgammaf(x); +#else + FIXME( "not implemented\n" ); + return 0.0f; +#endif +} + +/********************************************************************* + * lgammal (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_lgammal(LDOUBLE x) +{ + return MSVCR120_lgamma(x); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index bb18d4f..ed985d2 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2377,9 +2377,9 @@ @ cdecl labs(long) MSVCRT_labs @ cdecl ldexp(double long) MSVCRT_ldexp @ cdecl ldiv(long long) MSVCRT_ldiv -@ stub lgamma -@ stub lgammaf -@ stub lgammal +@ cdecl lgamma(double) MSVCR120_lgamma +@ cdecl lgammaf(float) MSVCR120_lgammaf +@ cdecl lgammal(double) MSVCR120_lgammal @ cdecl -ret64 llabs(int64) MSVCRT_llabs @ stub lldiv @ cdecl -ret64 llrint(double) MSVCR120_llrint diff --git a/include/config.h.in b/include/config.h.in index 6acafca..382beb6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -351,6 +351,12 @@ /* Define to 1 if you have the `ldap_parse_vlv_control' function. */ #undef HAVE_LDAP_PARSE_VLV_CONTROL +/* Define to 1 if you have the `lgamma' function. */ +#undef HAVE_LGAMMA + +/* Define to 1 if you have the `lgammaf' function. */ +#undef HAVE_LGAMMAF + /* Define to 1 if you have the `gettextpo' library (-lgettextpo). */ #undef HAVE_LIBGETTEXTPO

1 0

Nikolay Sivov : comctl32/listview: Fix indentation warnings on GCC 6.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: fa846bdb270dde71adf1d042ba775c8a131c5c14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa846bdb270dde71adf1d042b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 15 09:51:47 2016 +0300 comctl32/listview: Fix indentation warnings on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 54 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cc1721b..56e2563 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -588,23 +588,28 @@ static const char* debugscrollinfo(const SCROLLINFO *pScrollInfo) if (pScrollInfo == NULL) return "(null)"; len = snprintf(buf, size, "{cbSize=%u, ", pScrollInfo->cbSize); - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (pScrollInfo->fMask & SIF_RANGE) len = snprintf(buf, size, "nMin=%d, nMax=%d, ", pScrollInfo->nMin, pScrollInfo->nMax); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (pScrollInfo->fMask & SIF_PAGE) len = snprintf(buf, size, "nPage=%u, ", pScrollInfo->nPage); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (pScrollInfo->fMask & SIF_POS) len = snprintf(buf, size, "nPos=%d, ", pScrollInfo->nPos); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (pScrollInfo->fMask & SIF_TRACKPOS) len = snprintf(buf, size, "nTrackPos=%d, ", pScrollInfo->nTrackPos); else len = 0; - if (len == -1) goto end; buf += len; + if (len == -1) goto end; + buf += len; goto undo; end: buf = text + strlen(text); @@ -629,27 +634,33 @@ static const char* debuglvitem_t(const LVITEMW *lpLVItem, BOOL isW) if (lpLVItem == NULL) return "(null)"; len = snprintf(buf, size, "{iItem=%d, iSubItem=%d, ", lpLVItem->iItem, lpLVItem->iSubItem); - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpLVItem->mask & LVIF_STATE) len = snprintf(buf, size, "state=%x, stateMask=%x, ", lpLVItem->state, lpLVItem->stateMask); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpLVItem->mask & LVIF_TEXT) len = snprintf(buf, size, "pszText=%s, cchTextMax=%d, ", debugtext_tn(lpLVItem->pszText, isW, 80), lpLVItem->cchTextMax); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpLVItem->mask & LVIF_IMAGE) len = snprintf(buf, size, "iImage=%d, ", lpLVItem->iImage); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpLVItem->mask & LVIF_PARAM) len = snprintf(buf, size, "lParam=%lx, ", lpLVItem->lParam); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpLVItem->mask & LVIF_INDENT) len = snprintf(buf, size, "iIndent=%d, ", lpLVItem->iIndent); else len = 0; - if (len == -1) goto end; buf += len; + if (len == -1) goto end; + buf += len; goto undo; end: buf = text + strlen(text); @@ -665,31 +676,38 @@ static const char* debuglvcolumn_t(const LVCOLUMNW *lpColumn, BOOL isW) if (lpColumn == NULL) return "(null)"; len = snprintf(buf, size, "{"); - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpColumn->mask & LVCF_SUBITEM) len = snprintf(buf, size, "iSubItem=%d, ", lpColumn->iSubItem); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpColumn->mask & LVCF_FMT) len = snprintf(buf, size, "fmt=%x, ", lpColumn->fmt); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpColumn->mask & LVCF_WIDTH) len = snprintf(buf, size, "cx=%d, ", lpColumn->cx); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpColumn->mask & LVCF_TEXT) len = snprintf(buf, size, "pszText=%s, cchTextMax=%d, ", debugtext_tn(lpColumn->pszText, isW, 80), lpColumn->cchTextMax); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpColumn->mask & LVCF_IMAGE) len = snprintf(buf, size, "iImage=%d, ", lpColumn->iImage); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpColumn->mask & LVCF_ORDER) len = snprintf(buf, size, "iOrder=%d, ", lpColumn->iOrder); else len = 0; - if (len == -1) goto end; buf += len; + if (len == -1) goto end; + buf += len; goto undo; end: buf = text + strlen(text);

1 0

Nikolay Sivov : oleaut32/tests: Fix indentation warning on GCC 6.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 00c591a947919cf67a01c86d2d5da4ee32c46dcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c591a947919cf67a01c86d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 15 09:58:02 2016 +0300 oleaut32/tests: Fix indentation warning on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/safearray.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index f57b886..651a0c3 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -708,7 +708,7 @@ static void test_safearray(void) if (!pSafeArrayAllocDescriptorEx) return; - for (i=0;i<sizeof(vttypes)/sizeof(vttypes[0]);i++) { + for (i = 0; i < sizeof(vttypes)/sizeof(vttypes[0]); i++) { a = NULL; hres = pSafeArrayAllocDescriptorEx(vttypes[i].vt,1,&a); ok(hres == S_OK, "SafeArrayAllocDescriptorEx gave hres 0x%x\n", hres); @@ -762,7 +762,7 @@ static void test_safearray(void) } hres = SafeArrayDestroyDescriptor(a); ok(hres == S_OK,"SADD failed with hres %x\n",hres); - } + } } static void test_SafeArrayAllocDestroyDescriptor(void)

1 0

Nikolay Sivov : msvcirt/tests: Fix indentation warnings on GCC 6.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 67d7690e5303e7d9b1f2ee78a63022cd721210a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d7690e5303e7d9b1f2ee78a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 15 10:14:50 2016 +0300 msvcirt/tests: Fix indentation warnings on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 84 ++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67d7690e5303e7d9b1f2e…

1 0

Benjamin Hodgetts : wined3d: Add Nvidia 1XXX range to detection list.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 9dff8b75e6ed4da1780e324951256e2593b4c8ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dff8b75e6ed4da1780e32495… Author: Benjamin Hodgetts <ben(a)xnode.org> Date: Thu Aug 11 22:58:03 2016 +0100 wined3d: Add Nvidia 1XXX range to detection list. Signed-off-by: Benjamin Hodgetts <ben(a)xnode.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 3 +++ 2 files changed, 9 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9da237d..50fb50d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1312,6 +1312,9 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970, "NVIDIA GeForce GTX 970", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980, "NVIDIA GeForce GTX 980", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_GEFORCE8, 8192}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1767,6 +1770,9 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ + {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ + {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ {"GTX 980", CARD_NVIDIA_GEFORCE_GTX980}, /* GeForce 900 - highend */ {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ {"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7883951..fc8c397 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1953,6 +1953,9 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX970 = 0x13c2, CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8, CARD_NVIDIA_GEFORCE_GTX980 = 0x13c0, + CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, + CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, + CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Hugh McMaster : reg/tests: Add more tests for 'reg import'.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 596ca595d87c2bcb3fe0f7f67f822d3af141b2ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=596ca595d87c2bcb3fe0f7f67… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 15 09:19:13 2016 +0000 reg/tests: Add more tests for 'reg import'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index fb5edbc..a275db9 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -856,6 +856,31 @@ static void test_import(void) test_import_str("REGEDIT4 FOO\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + test_import_str("REGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + test_import_str("REGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test1\"=\"Value1\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test1", REG_SZ, "Value1", 7, 0); + + test_import_str("REGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test2\"=\"Value2\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test2", REG_SZ, "Value2", 7, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test3\"=\"Value3\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test3", REG_SZ, "Value3", 7, 0); + test_import_str("Windows Registry Editor Version 4.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); @@ -863,6 +888,30 @@ static void test_import(void) test_import_str("Windows Registry Editor Version 5.00\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + test_import_str("Windows Registry Editor Version 5.00\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test4\"=\"Value4\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test4", REG_SZ, "Value4", 7, 0); + + test_import_str("Windows Registry Editor Version 5.00\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test5\"=\"Value5\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test5", REG_SZ, "Value5", 7, 0); + + test_import_str("Windows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test6\"=\"Value6\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test6", REG_SZ, "Value6", 7, 0); + + err = RegCloseKey(hkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + /* Test file contents - Unicode */ test_import_wstr("Windows Registry Editor Version 4.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */,

1 0