July 2017 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Introduce wined3d fence objects.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: c45b908abc0c4d163dbff0e4e8456c155286f04b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c45b908abc0c4d163dbff0e4e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Jul 9 13:25:49 2017 +0200 wined3d: Introduce wined3d fence objects. Use fences for the APPLESYNC codepath, and implement event queries on top of fences. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 54 +++++------- dlls/wined3d/context.c | 92 ++++++++++---------- dlls/wined3d/drawprim.c | 12 +-- dlls/wined3d/query.c | 185 ++++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 70 +++++++++------- 5 files changed, 235 insertions(+), 178 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c45b908abc0c4d163dbff…

1 0

Alexandre Julliard : winex11: Load a monochrome cursor instead of converting a color one when possible.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 2e0a1cfd8355ee0328838eb56b283494103fcd3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0a1cfd8355ee0328838eb56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 11:42:08 2017 +0200 winex11: Load a monochrome cursor instead of converting a color one when possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 259263d..5ace405 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1160,6 +1160,43 @@ done: } /*********************************************************************** + * create_xlib_load_mono_cursor + * + * Create a monochrome X cursor from a color Windows one by trying to load the monochrome resource. + */ +static Cursor create_xlib_load_mono_cursor( HDC hdc, HANDLE handle, int width, int height ) +{ + Cursor cursor = None; + HANDLE mono; + ICONINFOEXW info; + BITMAP bm; + + if (!(mono = CopyImage( handle, IMAGE_CURSOR, width, height, LR_MONOCHROME | LR_COPYFROMRESOURCE ))) + return None; + + info.cbSize = sizeof(info); + if (GetIconInfoExW( mono, &info )) + { + if (!info.hbmColor) + { + GetObjectW( info.hbmMask, sizeof(bm), &bm ); + bm.bmHeight = max( 1, bm.bmHeight / 2 ); + /* make sure hotspot is valid */ + if (info.xHotspot >= bm.bmWidth || info.yHotspot >= bm.bmHeight) + { + info.xHotspot = bm.bmWidth / 2; + info.yHotspot = bm.bmHeight / 2; + } + cursor = create_xlib_monochrome_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); + } + else DeleteObject( info.hbmColor ); + DeleteObject( info.hbmMask ); + } + DestroyCursor( mono ); + return cursor; +} + +/*********************************************************************** * create_xlib_color_cursor * * Create a color X cursor from a Windows one. @@ -1334,6 +1371,7 @@ static Cursor create_cursor( HANDLE handle ) if (pXcursorImagesLoadCursor) cursor = create_xcursor_cursor( hdc, &info, handle, bm.bmWidth, bm.bmHeight ); #endif + if (!cursor) cursor = create_xlib_load_mono_cursor( hdc, handle, bm.bmWidth, bm.bmHeight ); if (!cursor) cursor = create_xlib_color_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); DeleteObject( info.hbmColor ); }

1 0

Zebediah Figura : msi: Correctly format the template field for MsiProcessMessage().
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: f9f53fe624be10ada6a2dc7f79ed92d5cc09c8df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f53fe624be10ada6a2dc7f7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 10 20:46:40 2017 +0200 msi: Correctly format the template field for MsiProcessMessage(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 4 +- dlls/msi/msi.rc | 6 +- dlls/msi/msipriv.h | 2 + dlls/msi/package.c | 150 +++++++++++++++++++++----------- dlls/msi/resource.h | 10 ++- dlls/msi/tests/package.c | 51 ++++++++++- po/ar.po | 214 ++++++++++++++++++++++++--------------------- po/bg.po | 212 ++++++++++++++++++++++++--------------------- po/ca.po | 214 ++++++++++++++++++++++++--------------------- po/cs.po | 214 ++++++++++++++++++++++++--------------------- po/da.po | 214 ++++++++++++++++++++++++--------------------- po/de.po | 214 ++++++++++++++++++++++++--------------------- po/el.po | 212 ++++++++++++++++++++++++--------------------- po/en.po | 216 +++++++++++++++++++++++++--------------------- po/en_US.po | 216 +++++++++++++++++++++++++--------------------- po/eo.po | 212 ++++++++++++++++++++++++--------------------- po/es.po | 214 ++++++++++++++++++++++++--------------------- po/fa.po | 212 ++++++++++++++++++++++++--------------------- po/fi.po | 220 ++++++++++++++++++++++++++--------------------- po/fr.po | 214 ++++++++++++++++++++++++--------------------- po/he.po | 212 ++++++++++++++++++++++++--------------------- po/hi.po | 212 ++++++++++++++++++++++++--------------------- po/hr.po | 214 ++++++++++++++++++++++++--------------------- po/hu.po | 214 ++++++++++++++++++++++++--------------------- po/it.po | 214 ++++++++++++++++++++++++--------------------- po/ja.po | 218 +++++++++++++++++++++++++--------------------- po/ko.po | 214 ++++++++++++++++++++++++--------------------- po/lt.po | 220 ++++++++++++++++++++++++++--------------------- po/ml.po | 212 ++++++++++++++++++++++++--------------------- po/nb_NO.po | 214 ++++++++++++++++++++++++--------------------- po/nl.po | 214 ++++++++++++++++++++++++--------------------- po/or.po | 212 ++++++++++++++++++++++++--------------------- po/pa.po | 212 ++++++++++++++++++++++++--------------------- po/pl.po | 220 ++++++++++++++++++++++++++--------------------- po/pt_BR.po | 214 ++++++++++++++++++++++++--------------------- po/pt_PT.po | 214 ++++++++++++++++++++++++--------------------- po/rm.po | 212 ++++++++++++++++++++++++--------------------- po/ro.po | 214 ++++++++++++++++++++++++--------------------- po/ru.po | 220 ++++++++++++++++++++++++++--------------------- po/sk.po | 212 ++++++++++++++++++++++++--------------------- po/sl.po | 214 ++++++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 212 ++++++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 212 ++++++++++++++++++++++++--------------------- po/sv.po | 214 ++++++++++++++++++++++++--------------------- po/te.po | 212 ++++++++++++++++++++++++--------------------- po/th.po | 212 ++++++++++++++++++++++++--------------------- po/tr.po | 214 ++++++++++++++++++++++++--------------------- po/uk.po | 220 ++++++++++++++++++++++++++--------------------- po/wa.po | 212 ++++++++++++++++++++++++--------------------- po/wine.pot | 212 ++++++++++++++++++++++++--------------------- po/zh_CN.po | 214 ++++++++++++++++++++++++--------------------- po/zh_TW.po | 214 ++++++++++++++++++++++++--------------------- 52 files changed, 5488 insertions(+), 4583 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9f53fe624be10ada6a2d…

1 0

Nikolay Sivov : d3drm: Use existing helper to manage visuals array.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 671ac168e2d008b6dd6f62d441e1bb8bf9b28048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=671ac168e2d008b6dd6f62d44… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 10 13:40:48 2017 +0300 d3drm: Use existing helper to manage visuals array. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 4 ++-- dlls/d3drm/frame.c | 33 +++++++-------------------------- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 16c1415..861c3ab 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -68,8 +68,8 @@ struct d3drm_frame SIZE_T nb_children; SIZE_T children_size; IDirect3DRMFrame3 **children; - ULONG nb_visuals; - ULONG visuals_capacity; + SIZE_T nb_visuals; + SIZE_T visuals_size; IDirect3DRMVisual **visuals; SIZE_T nb_lights; SIZE_T lights_size; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 7d89686..aa7633b 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -1064,9 +1064,8 @@ static HRESULT WINAPI d3drm_frame1_AddRotation(IDirect3DRMFrame *iface, static HRESULT WINAPI d3drm_frame3_AddVisual(IDirect3DRMFrame3 *iface, IUnknown *visual) { - struct d3drm_frame *This = impl_from_IDirect3DRMFrame3(iface); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); ULONG i; - IDirect3DRMVisual** visuals; TRACE("iface %p, visual %p.\n", iface, visual); @@ -1074,33 +1073,15 @@ static HRESULT WINAPI d3drm_frame3_AddVisual(IDirect3DRMFrame3 *iface, IUnknown return D3DRMERR_BADOBJECT; /* Check if already existing and return gracefully without increasing ref count */ - for (i = 0; i < This->nb_visuals; i++) - if (This->visuals[i] == (IDirect3DRMVisual *)visual) + for (i = 0; i < frame->nb_visuals; i++) + if (frame->visuals[i] == (IDirect3DRMVisual *)visual) return D3DRM_OK; - if ((This->nb_visuals + 1) > This->visuals_capacity) - { - ULONG new_capacity; - - if (!This->visuals_capacity) - { - new_capacity = 16; - visuals = HeapAlloc(GetProcessHeap(), 0, new_capacity * sizeof(IDirect3DRMVisual*)); - } - else - { - new_capacity = This->visuals_capacity * 2; - visuals = HeapReAlloc(GetProcessHeap(), 0, This->visuals, new_capacity * sizeof(IDirect3DRMVisual*)); - } - - if (!visuals) - return E_OUTOFMEMORY; - - This->visuals_capacity = new_capacity; - This->visuals = visuals; - } + if (!d3drm_array_reserve((void **)&frame->visuals, &frame->visuals_size, + frame->nb_visuals + 1, sizeof(*frame->visuals))) + return E_OUTOFMEMORY; - This->visuals[This->nb_visuals++] = (IDirect3DRMVisual *)visual; + frame->visuals[frame->nb_visuals++] = (IDirect3DRMVisual *)visual; IDirect3DRMVisual_AddRef(visual); return D3DRM_OK;

1 0

Nikolay Sivov : d3drm: Use existing helper to manage child frames array.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: b3903a13771afe9e22af54bc5867dde7de114530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3903a13771afe9e22af54bc5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 10 13:40:46 2017 +0300 d3drm: Use existing helper to manage child frames array. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 4 ++-- dlls/d3drm/frame.c | 31 ++++++------------------------- 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 067c0e6..89e6414 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -65,8 +65,8 @@ struct d3drm_frame IDirect3DRM *d3drm; LONG ref; struct d3drm_frame *parent; - ULONG nb_children; - ULONG children_capacity; + SIZE_T nb_children; + SIZE_T children_size; IDirect3DRMFrame3 **children; ULONG nb_visuals; ULONG visuals_capacity; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 0d6ee14..ffe7506 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -807,7 +807,7 @@ static HRESULT WINAPI d3drm_frame1_GetClassName(IDirect3DRMFrame *iface, DWORD * static HRESULT WINAPI d3drm_frame3_AddChild(IDirect3DRMFrame3 *iface, IDirect3DRMFrame3 *child) { - struct d3drm_frame *This = impl_from_IDirect3DRMFrame3(iface); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); struct d3drm_frame *child_obj = unsafe_impl_from_IDirect3DRMFrame3(child); TRACE("iface %p, child %p.\n", iface, child); @@ -831,32 +831,13 @@ static HRESULT WINAPI d3drm_frame3_AddChild(IDirect3DRMFrame3 *iface, IDirect3DR } } - if ((This->nb_children + 1) > This->children_capacity) - { - ULONG new_capacity; - IDirect3DRMFrame3** children; - - if (!This->children_capacity) - { - new_capacity = 16; - children = HeapAlloc(GetProcessHeap(), 0, new_capacity * sizeof(IDirect3DRMFrame3*)); - } - else - { - new_capacity = This->children_capacity * 2; - children = HeapReAlloc(GetProcessHeap(), 0, This->children, new_capacity * sizeof(IDirect3DRMFrame3*)); - } - - if (!children) - return E_OUTOFMEMORY; - - This->children_capacity = new_capacity; - This->children = children; - } + if (!d3drm_array_reserve((void **)&frame->children, &frame->children_size, + frame->nb_children + 1, sizeof(*frame->children))) + return E_OUTOFMEMORY; - This->children[This->nb_children++] = child; + frame->children[frame->nb_children++] = child; IDirect3DRMFrame3_AddRef(child); - child_obj->parent = This; + child_obj->parent = frame; return D3DRM_OK; }

1 0

Alex Henrie : msvcr120: Correct asinh specfile definitions.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: fff25a6052cf5e204196b4f497b3ae4707955a9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fff25a6052cf5e204196b4f49… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jul 9 22:55:02 2017 -0600 msvcr120: Correct asinh specfile definitions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) 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 d5ade42..6a9ccae 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 @@ -129,9 +129,9 @@ @ stub acoshl @ cdecl asin(double) ucrtbase.asin @ cdecl -arch=arm,x86_64 asinf(float) ucrtbase.asinf -@ cdecl asinh(double double) ucrtbase.asinh -@ cdecl asinhf(float float) ucrtbase.asinhf -@ cdecl asinhl(double double) ucrtbase.asinhl +@ cdecl asinh(double) ucrtbase.asinh +@ cdecl asinhf(float) ucrtbase.asinhf +@ cdecl asinhl(double) ucrtbase.asinhl @ cdecl atan(double) ucrtbase.atan @ cdecl atan2(double double) ucrtbase.atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) ucrtbase.atan2f diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 15cfe60..54f6c81 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2018,9 +2018,9 @@ @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin @ cdecl -arch=arm,x86_64 asinf(float) MSVCRT_asinf -@ cdecl asinh(double double) MSVCR120_asinh -@ cdecl asinhf(float float) MSVCR120_asinhf -@ cdecl asinhl(double double) MSVCR120_asinhl +@ cdecl asinh(double) MSVCR120_asinh +@ cdecl asinhf(float) MSVCR120_asinhf +@ cdecl asinhl(double) MSVCR120_asinhl @ cdecl atan(double) MSVCRT_atan @ cdecl -arch=arm,x86_64 atanf(float) MSVCRT_atanf @ cdecl atan2(double double) MSVCRT_atan2 diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 9690d4d..129456f 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1684,9 +1684,9 @@ @ cdecl asctime_s(ptr long ptr) msvcr120.asctime_s @ cdecl asin(double) msvcr120.asin @ cdecl -arch=arm,x86_64 asinf(float) msvcr120.asinf -@ cdecl asinh(double double) msvcr120.asinh -@ cdecl asinhf(float float) msvcr120.asinhf -@ cdecl asinhl(double double) msvcr120.asinhl +@ cdecl asinh(double) msvcr120.asinh +@ cdecl asinhf(float) msvcr120.asinhf +@ cdecl asinhl(double) msvcr120.asinhl @ cdecl atan(double) msvcr120.atan @ cdecl -arch=arm,x86_64 atanf(float) msvcr120.atanf @ cdecl atan2(double double) msvcr120.atan2 diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a27a2c6..5a0f957 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2160,9 +2160,9 @@ @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin @ cdecl -arch=arm,x86_64 asinf(float) MSVCRT_asinf -@ cdecl asinh(double double) MSVCR120_asinh -@ cdecl asinhf(float float) MSVCR120_asinhf -@ cdecl asinhl(double double) MSVCR120_asinhl +@ cdecl asinh(double) MSVCR120_asinh +@ cdecl asinhf(float) MSVCR120_asinhf +@ cdecl asinhl(double) MSVCR120_asinhl @ cdecl atan(double) MSVCRT_atan @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f

1 0

Zebediah Figura : msi: Allow setting NULL in MsiSetInteger().
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 1505912ce14d09bb2a84ad01886fd2a7b4fe9d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1505912ce14d09bb2a84ad018… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 7 09:03:13 2017 -0500 msi: Allow setting NULL in MsiSetInteger(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/record.c | 13 +++++++++++-- dlls/msi/tests/record.c | 19 +++++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 51e7a23..39ef70f 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -333,8 +333,17 @@ UINT MSI_RecordSetInteger( MSIRECORD *rec, UINT iField, int iVal ) return ERROR_INVALID_PARAMETER; MSI_FreeField( &rec->fields[iField] ); - rec->fields[iField].type = MSIFIELD_INT; - rec->fields[iField].u.iVal = iVal; + + if (iVal == MSI_NULL_INTEGER) + { + rec->fields[iField].type = MSIFIELD_NULL; + rec->fields[iField].u.szwVal = NULL; + } + else + { + rec->fields[iField].type = MSIFIELD_INT; + rec->fields[iField].u.iVal = iVal; + } return ERROR_SUCCESS; } diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 38d0f76..5caaefc 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -162,6 +162,21 @@ static void test_msirecord(void) ok(bufW[0] == 0, "MsiRecordGetStringW returned the wrong string\n"); ok(sz == 0, "MsiRecordGetStringW returned the wrong length\n"); + /* same record, but add a null integer to it */ + r = MsiRecordSetInteger(h, 0, 1); + ok(r == ERROR_SUCCESS, "Failed to set integer at 0\n"); + r = MsiRecordIsNull(h, 0); + ok(r == FALSE, "expected field to be non-null\n"); + r = MsiRecordSetInteger(h, 0, MSI_NULL_INTEGER); + ok(r == ERROR_SUCCESS, "Failed to set integer at 0\n"); + r = MsiRecordIsNull(h, 0); + ok(r == TRUE, "expected field to be null\n"); + sz = sizeof buf; + r = MsiRecordGetStringA(h, 0, buf, &sz); + ok(r == ERROR_SUCCESS, "Failed to get string at 0\n"); + ok(buf[0] == 0, "MsiRecordGetStringA returned the wrong string\n"); + ok(sz == 0, "MsiRecordGetStringA returned the wrong length\n"); + /* same record, but add a string to it */ r = MsiRecordSetStringA(h,0,str); ok(r == ERROR_SUCCESS, "Failed to set string at 0\n"); @@ -431,7 +446,7 @@ static void test_MsiRecordGetString(void) r = MsiRecordGetStringA(rec, 1, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, "5"), "Expected \"5\", got \"%s\"\n", buf); - ok(sz == 1, "Expectd 1, got %d\n", sz); + ok(sz == 1, "Expected 1, got %d\n", sz); r = MsiRecordSetInteger(rec, 1, -5); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -441,7 +456,7 @@ static void test_MsiRecordGetString(void) r = MsiRecordGetStringA(rec, 1, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, "-5"), "Expected \"-5\", got \"%s\"\n", buf); - ok(sz == 2, "Expectd 2, got %d\n", sz); + ok(sz == 2, "Expected 2, got %d\n", sz); MsiCloseHandle(rec); }

1 0

Nikolay Sivov : d3drm: Use existing helper to manage mesh groups.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 2d9089d8aae5ab6ffa1bff5813f4047988130b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d9089d8aae5ab6ffa1bff581… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 10 13:40:49 2017 +0300 d3drm: Use existing helper to manage mesh groups. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 4 ++-- dlls/d3drm/meshbuilder.c | 24 ++---------------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 861c3ab..65e0016 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -168,8 +168,8 @@ struct d3drm_mesh IDirect3DRMMesh IDirect3DRMMesh_iface; LONG ref; IDirect3DRM *d3drm; - DWORD groups_capacity; - DWORD nb_groups; + SIZE_T nb_groups; + SIZE_T groups_size; struct mesh_group *groups; }; diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index bb37678..c95cb46 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2532,28 +2532,8 @@ static HRESULT WINAPI d3drm_mesh_AddGroup(IDirect3DRMMesh *iface, unsigned verte if (!face_data || !id) return E_POINTER; - if ((mesh->nb_groups + 1) > mesh->groups_capacity) - { - struct mesh_group *groups; - ULONG new_capacity; - - if (!mesh->groups_capacity) - { - new_capacity = 16; - groups = HeapAlloc(GetProcessHeap(), 0, new_capacity * sizeof(*groups)); - } - else - { - new_capacity = mesh->groups_capacity * 2; - groups = HeapReAlloc(GetProcessHeap(), 0, mesh->groups, new_capacity * sizeof(*groups)); - } - - if (!groups) - return E_OUTOFMEMORY; - - mesh->groups_capacity = new_capacity; - mesh->groups = groups; - } + if (!d3drm_array_reserve((void **)&mesh->groups, &mesh->groups_size, mesh->nb_groups + 1, sizeof(*mesh->groups))) + return E_OUTOFMEMORY; group = mesh->groups + mesh->nb_groups;

1 0

Józef Kucia : d3d11/tests: Prefer draw_color_quad() to custom pixel shader.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 0c2bbdd95ccfe2574474386df5f1da5447f80b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c2bbdd95ccfe2574474386df… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Jul 9 13:52:20 2017 +0200 d3d11/tests: Prefer draw_color_quad() to custom pixel shader. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 69d8517..00e11fb 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7967,28 +7967,12 @@ static void test_scissor(void) D3D11_RASTERIZER_DESC rs_desc; ID3D11RasterizerState *rs; D3D11_RECT scissor_rect; - ID3D11PixelShader *ps; ID3D11Device *device; DWORD color; HRESULT hr; static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; - static const DWORD ps_code[] = - { -#if 0 - float4 main(float4 position : SV_POSITION) : SV_Target - { - return float4(0.0, 1.0, 0.0, 1.0); - } -#endif - 0x43425844, 0x30240e72, 0x012f250c, 0x8673c6ea, 0x392e4cec, 0x00000001, 0x000000d4, 0x00000003, - 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, - 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, - 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, - 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, - 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, - 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, - }; + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; if (!init_test_context(&test_context, NULL)) return; @@ -7996,9 +7980,6 @@ static void test_scissor(void) device = test_context.device; immediate_context = test_context.immediate_context; - hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); - ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); - rs_desc.FillMode = D3D11_FILL_SOLID; rs_desc.CullMode = D3D11_CULL_BACK; rs_desc.FrontCounterClockwise = FALSE; @@ -8012,8 +7993,6 @@ static void test_scissor(void) hr = ID3D11Device_CreateRasterizerState(device, &rs_desc, &rs); ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); - ID3D11DeviceContext_PSSetShader(immediate_context, ps, NULL, 0); - scissor_rect.left = 160; scissor_rect.top = 120; scissor_rect.right = 480; @@ -8023,7 +8002,7 @@ static void test_scissor(void) ID3D11DeviceContext_ClearRenderTargetView(immediate_context, test_context.backbuffer_rtv, red); check_texture_color(test_context.backbuffer, 0xff0000ff, 1); - draw_quad(&test_context); + draw_color_quad(&test_context, &green); color = get_texture_color(test_context.backbuffer, 320, 60); ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color); color = get_texture_color(test_context.backbuffer, 80, 240); @@ -8037,7 +8016,7 @@ static void test_scissor(void) ID3D11DeviceContext_ClearRenderTargetView(immediate_context, test_context.backbuffer_rtv, red); ID3D11DeviceContext_RSSetState(immediate_context, rs); - draw_quad(&test_context); + draw_color_quad(&test_context, &green); color = get_texture_color(test_context.backbuffer, 320, 60); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); color = get_texture_color(test_context.backbuffer, 80, 240); @@ -8050,7 +8029,6 @@ static void test_scissor(void) ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); ID3D11RasterizerState_Release(rs); - ID3D11PixelShader_Release(ps); release_test_context(&test_context); }

1 0

Józef Kucia : d3d10core/tests: Prefer draw_color_quad () to custom pixel shader.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: d165f4200d0690eb5314dfee3770ef95133ee072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d165f4200d0690eb5314dfee3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Jul 9 13:52:19 2017 +0200 d3d10core/tests: Prefer draw_color_quad() to custom pixel shader. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 5159bad..a10f40d 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -4279,37 +4279,18 @@ static void test_scissor(void) D3D10_RASTERIZER_DESC rs_desc; ID3D10RasterizerState *rs; D3D10_RECT scissor_rect; - ID3D10PixelShader *ps; ID3D10Device *device; DWORD color; HRESULT hr; static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; - static const DWORD ps_code[] = - { -#if 0 - float4 main(float4 position : SV_POSITION) : SV_Target - { - return float4(0.0, 1.0, 0.0, 1.0); - } -#endif - 0x43425844, 0x30240e72, 0x012f250c, 0x8673c6ea, 0x392e4cec, 0x00000001, 0x000000d4, 0x00000003, - 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, - 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, - 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, - 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, - 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, - 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, - }; + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; if (!init_test_context(&test_context)) return; device = test_context.device; - hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); - ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); - rs_desc.FillMode = D3D10_FILL_SOLID; rs_desc.CullMode = D3D10_CULL_BACK; rs_desc.FrontCounterClockwise = FALSE; @@ -4323,8 +4304,6 @@ static void test_scissor(void) hr = ID3D10Device_CreateRasterizerState(device, &rs_desc, &rs); ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); - ID3D10Device_PSSetShader(device, ps); - scissor_rect.left = 160; scissor_rect.top = 120; scissor_rect.right = 480; @@ -4334,7 +4313,7 @@ static void test_scissor(void) ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); check_texture_color(test_context.backbuffer, 0xff0000ff, 1); - draw_quad(&test_context); + draw_color_quad(&test_context, &green); color = get_texture_color(test_context.backbuffer, 320, 60); ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color); color = get_texture_color(test_context.backbuffer, 80, 240); @@ -4348,7 +4327,7 @@ static void test_scissor(void) ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); ID3D10Device_RSSetState(device, rs); - draw_quad(&test_context); + draw_color_quad(&test_context, &green); color = get_texture_color(test_context.backbuffer, 320, 60); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); color = get_texture_color(test_context.backbuffer, 80, 240); @@ -4361,7 +4340,6 @@ static void test_scissor(void) ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); ID3D10RasterizerState_Release(rs); - ID3D10PixelShader_Release(ps); release_test_context(&test_context); }

1 0