wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

Nikolay Sivov : dwrite/tests: Remove unused functions (Clang).
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 474033a4b8ea5eba7fecdc2739bd62857e6ae930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=474033a4b8ea5eba7fecdc273… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 21:22:32 2016 +0300 dwrite/tests: Remove unused functions (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 9 +-------- dlls/dwrite/tests/layout.c | 7 ------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index ea09bd5..90d7f6f 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -114,13 +114,6 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index call_seq->count = call_seq->size = 0; } -static inline void flush_sequences(struct call_sequence **seq, int n) -{ - int i; - for (i = 0; i < n; i++) - flush_sequence(seq, i); -} - static void init_call_sequences(struct call_sequence **seq, int n) { int i; @@ -902,7 +895,7 @@ static void init_expected_sa(struct call_sequence **seq, const struct sa_test *t static const struct call_entry end_of_sequence = { LastKind }; int i; - flush_sequence(seq, 0); + flush_sequence(seq, ANALYZER_ID); /* add expected calls */ for (i = 0; i < test->item_count; i++) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 54056c7..9b9af6c 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -321,13 +321,6 @@ static inline void flush_sequence(struct drawcall_sequence **seg, int sequence_i call_seq->count = call_seq->size = 0; } -static inline void flush_sequences(struct drawcall_sequence **seq, int n) -{ - int i; - for (i = 0; i < n; i++) - flush_sequence(seq, i); -} - static void init_call_sequences(struct drawcall_sequence **seq, int n) { int i;

1 0

Nikolay Sivov : oledb32/tests: Simplify recount check.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: dc8f504b51663770cbf2d8ea5246762bd005bfce URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc8f504b51663770cbf2d8ea5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 21:22:12 2016 +0300 oledb32/tests: Simplify recount check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/database.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 483454e..fdf4220 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -42,9 +42,10 @@ static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e' #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { - ULONG rc = IUnknown_AddRef(obj); - IUnknown_Release(obj); - ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__, line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } static void test_GetDataSource(WCHAR *initstring)

1 0

Nikolay Sivov : msxml3/tests: Simplify refcount checks.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 11a01849e81cd0118ee792c6db935b365006dfaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a01849e81cd0118ee792c6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 21:21:59 2016 +0300 msxml3/tests: Simplify refcount checks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 7 ++++--- dlls/msxml3/tests/saxreader.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index f228b41..b50b153 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -43,9 +43,10 @@ #define EXPECT_REF(node,ref) _expect_ref((IUnknown*)node, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { - ULONG rc = IUnknown_AddRef(obj); - IUnknown_Release(obj); - ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__, line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } DEFINE_GUID(SID_SContainerDispatch, 0xb722be00, 0x4e68, 0x101b, 0xa2, 0xbc, 0x00, 0xaa, 0x00, 0x40, 0x47, 0x70); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index a2dc3fb..5fc62b7 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -43,9 +43,10 @@ static const WCHAR emptyW[] = {0}; #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { - ULONG rc = IUnknown_AddRef(obj); - IUnknown_Release(obj); - ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__, line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } static LONG get_refcount(void *iface)

1 0

Nikolay Sivov : dwrite/tests: Simplify refcount check a bit.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: a3e3dfcef2cd21362169a58e72e49ef4061a66f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e3dfcef2cd21362169a58e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 21:21:46 2016 +0300 dwrite/tests: Simplify refcount check a bit. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 13d27da..54056c7 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -225,9 +225,10 @@ static void get_script_analysis(const WCHAR *str, UINT32 len, DWRITE_SCRIPT_ANAL #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { - ULONG rc = IUnknown_AddRef(obj); - IUnknown_Release(obj); - ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } enum drawcall_modifiers_kind {

1 0

Nikolay Sivov : comctl32/monthcal: Take into account day name width when setting calendar column width.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 2f2651a14eb4b5035b5ca19862ce7ca8cc0ee81b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f2651a14eb4b5035b5ca1986… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 21:21:08 2016 +0300 comctl32/monthcal: Take into account day name width when setting calendar column width. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 92e5367..36acb41 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -118,7 +118,6 @@ typedef struct HFONT hFont; HFONT hBoldFont; int textHeight; - int textWidth; int height_increment; int width_increment; INT delta; /* scroll rate; # of months that the */ @@ -2494,9 +2493,10 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) INT xdiv, dx, dy, i, j, x, y, c_dx, c_dy; WCHAR buff[80]; TEXTMETRICW tm; - SIZE size, sz; + INT day_width; RECT client; HFONT font; + SIZE size; HDC hdc; GetClientRect(infoPtr->hwndSelf, &client); @@ -2508,27 +2508,30 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) GetTextMetricsW(hdc, &tm); infoPtr->textHeight = tm.tmHeight + tm.tmExternalLeading + tm.tmInternalLeading; - /* find largest abbreviated day name for current locale */ - size.cx = sz.cx = 0; + /* find widest day name for current locale and font */ + day_width = 0; for (i = 0; i < 7; i++) { + SIZE sz; + if (get_localized_dayname(infoPtr, i, buff, countof(buff))) { GetTextExtentPoint32W(hdc, buff, lstrlenW(buff), &sz); - if (sz.cx > size.cx) size.cx = sz.cx; + if (sz.cx > day_width) day_width = sz.cx; } else /* locale independent fallback on failure */ { - static const WCHAR SunW[] = { 'S','u','n',0 }; - - GetTextExtentPoint32W(hdc, SunW, lstrlenW(SunW), &size); + static const WCHAR sunW[] = { 'S','u','n' }; + GetTextExtentPoint32W(hdc, sunW, countof(sunW), &sz); + day_width = sz.cx; break; } } - infoPtr->textWidth = size.cx + 2; + day_width += 2; /* recalculate the height and width increments and offsets */ + size.cx = 0; GetTextExtentPoint32W(hdc, O0W, 2, &size); /* restore the originally selected font */ @@ -2537,7 +2540,7 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) xdiv = (infoPtr->dwStyle & MCS_WEEKNUMBERS) ? 8 : 7; - infoPtr->width_increment = size.cx * 2 + 4; + infoPtr->width_increment = max(day_width, size.cx * 2 + 4); infoPtr->height_increment = infoPtr->textHeight; /* calculate title area */

1 0

Nikolay Sivov : comctl32/monthcal: Added support for MCS_SHORTDAYSOFWEEK style.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 7912acaab91d9ee5c88ac5bba6f45fc8b01a26b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7912acaab91d9ee5c88ac5bba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 21:21:07 2016 +0300 comctl32/monthcal: Added support for MCS_SHORTDAYSOFWEEK style. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 19 +++++++++++++++---- include/commctrl.rh | 1 + 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 9d5b42e..92e5367 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1156,6 +1156,18 @@ static void MONTHCAL_PaintLeadTrailMonths(const MONTHCAL_INFO *infoPtr, HDC hdc, } } +static int get_localized_dayname(const MONTHCAL_INFO *infoPtr, unsigned int day, WCHAR *buff, unsigned int count) +{ + LCTYPE lctype; + + if (infoPtr->dwStyle & MCS_SHORTDAYSOFWEEK) + lctype = LOCALE_SSHORTESTDAYNAME1 + day; + else + lctype = LOCALE_SABBREVDAYNAME1 + day; + + return GetLocaleInfoW(LOCALE_USER_DEFAULT, lctype, buff, count); +} + /* paint a calendar area */ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx) { @@ -1196,7 +1208,7 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const i = infoPtr->firstDay; for(j = 0; j < 7; j++) { - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1 + (i+j+6)%7, buf, countof(buf)); + get_localized_dayname(infoPtr, (i + j + 6) % 7, buf, countof(buf)); DrawTextW(hdc, buf, strlenW(buf), &r, DT_CENTER | DT_VCENTER | DT_SINGLELINE); OffsetRect(&r, infoPtr->width_increment, 0); } @@ -2500,8 +2512,7 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) size.cx = sz.cx = 0; for (i = 0; i < 7; i++) { - if(GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1 + i, - buff, countof(buff))) + if (get_localized_dayname(infoPtr, i, buff, countof(buff))) { GetTextExtentPoint32W(hdc, buff, lstrlenW(buff), &sz); if (sz.cx > size.cx) size.cx = sz.cx; @@ -2703,7 +2714,7 @@ static INT MONTHCAL_StyleChanged(MONTHCAL_INFO *infoPtr, WPARAM wStyleType, infoPtr->dwStyle = lpss->styleNew; /* make room for week numbers */ - if ((lpss->styleNew ^ lpss->styleOld) & MCS_WEEKNUMBERS) + if ((lpss->styleNew ^ lpss->styleOld) & (MCS_WEEKNUMBERS | MCS_SHORTDAYSOFWEEK)) MONTHCAL_UpdateSize(infoPtr); return 0; diff --git a/include/commctrl.rh b/include/commctrl.rh index 863e141..b778ee7 100644 --- a/include/commctrl.rh +++ b/include/commctrl.rh @@ -186,6 +186,7 @@ #define MCS_NOTODAY 0x0010 #define MCS_NOTODAYCIRCLE 0x0008 #define MCS_NOTRAILINGDATES 0x0040 +#define MCS_SHORTDAYSOFWEEK 0x0080 /* Datetime Control */ #define DTS_SHORTDATEFORMAT 0x0000

1 0

Henri Verbeet : wined3d: Make wined3d_device_get_ps_consts_b() consistent with wined3d_device_get_ps_consts_f().
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: d701a76ca1d184a620d4d42e39693e68a3fc4ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d701a76ca1d184a620d4d42e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 19:42:00 2016 +0200 wined3d: Make wined3d_device_get_ps_consts_b() consistent with wined3d_device_get_ps_consts_f(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 14 +++++++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9fc49ea..dd7f46a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3189,7 +3189,7 @@ static HRESULT WINAPI d3d9_device_GetPixelShaderConstantB(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_get_ps_consts_b(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_get_ps_consts_b(device->wined3d_device, reg_idx, count, data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 43ae2eb..da83b56 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2640,17 +2640,17 @@ HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, } HRESULT CDECL wined3d_device_get_ps_consts_b(const struct wined3d_device *device, - UINT start_register, BOOL *constants, UINT bool_count) + unsigned int start_idx, unsigned int count, BOOL *constants) { - UINT count = min(bool_count, WINED3D_MAX_CONSTS_B - start_register); - - TRACE("device %p, start_register %u, constants %p, bool_count %u.\n", - device, start_register, constants, bool_count); + TRACE("device %p, start_idx %u, count %u,constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_B) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_B) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.ps_consts_b[start_register], count * sizeof(BOOL)); + if (count > WINED3D_MAX_CONSTS_B - start_idx) + count = WINED3D_MAX_CONSTS_B - start_idx; + memcpy(constants, &device->state.ps_consts_b[start_idx], count * sizeof(*constants)); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3d6a641..01699df 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -70,7 +70,7 @@ @ cdecl wined3d_device_get_predication(ptr ptr) @ cdecl wined3d_device_get_primitive_type(ptr ptr) @ cdecl wined3d_device_get_ps_cb(ptr long) -@ cdecl wined3d_device_get_ps_consts_b(ptr long ptr long) +@ cdecl wined3d_device_get_ps_consts_b(ptr long long ptr) @ cdecl wined3d_device_get_ps_consts_f(ptr long long ptr) @ cdecl wined3d_device_get_ps_consts_i(ptr long long ptr) @ cdecl wined3d_device_get_ps_resource_view(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 63550a1..a770d7f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2123,7 +2123,7 @@ void __cdecl wined3d_device_get_primitive_type(const struct wined3d_device *devi enum wined3d_primitive_type *primitive_topology); struct wined3d_buffer * __cdecl wined3d_device_get_ps_cb(const struct wined3d_device *device, UINT idx); HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *device, - UINT start_register, BOOL *constants, UINT bool_count); + unsigned int start_idx, unsigned int count, BOOL *constants); HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *device, unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Make wined3d_device_set_ps_consts_b() consistent with wined3d_device_set_ps_consts_f().
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 0a8951d99b2691f733188f01e2a7608cb1a76409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8951d99b2691f733188f01e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 19:41:59 2016 +0200 wined3d: Make wined3d_device_set_ps_consts_b() consistent with wined3d_device_set_ps_consts_f(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 24 ++++++++++++++---------- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 25ed842..9fc49ea 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3174,7 +3174,7 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantB(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_ps_consts_b(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_set_ps_consts_b(device->wined3d_device, reg_idx, count, data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1761829..43ae2eb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2607,24 +2607,28 @@ struct wined3d_sampler * CDECL wined3d_device_get_ps_sampler(const struct wined3 } HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, - UINT start_register, const BOOL *constants, UINT bool_count) + unsigned int start_idx, unsigned int count, const BOOL *constants) { - UINT count = min(bool_count, WINED3D_MAX_CONSTS_B - start_register); - UINT i; + unsigned int i; - TRACE("device %p, start_register %u, constants %p, bool_count %u.\n", - device, start_register, constants, bool_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_B) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_B) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->ps_consts_b[start_register], constants, count * sizeof(BOOL)); - for (i = 0; i < count; ++i) - TRACE("Set BOOL constant %u to %s.\n", start_register + i, constants[i] ? "true" : "false"); + if (count > WINED3D_MAX_CONSTS_B - start_idx) + count = WINED3D_MAX_CONSTS_B - start_idx; + memcpy(&device->update_state->ps_consts_b[start_idx], constants, count * sizeof(*constants)); + if (TRACE_ON(d3d)) + { + for (i = 0; i < count; ++i) + TRACE("Set BOOL constant %u to %#x.\n", start_idx + i, constants[i]); + } if (device->recording) { - for (i = start_register; i < count + start_register; ++i) + for (i = start_idx; i < count + start_idx; ++i) device->recording->changed.pixelShaderConstantsB |= (1u << i); } else diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index d5a7c61..cb5a141 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -933,7 +933,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_ps_consts_b; ++i) { wined3d_device_set_ps_consts_b(device, stateblock->contained_ps_consts_b[i], - stateblock->state.ps_consts_b + stateblock->contained_ps_consts_b[i], 1); + 1, &stateblock->state.ps_consts_b[stateblock->contained_ps_consts_b[i]]); } /* Render states. */ diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e7f7ca2..3d6a641 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -129,7 +129,7 @@ @ cdecl wined3d_device_set_predication(ptr ptr long) @ cdecl wined3d_device_set_primitive_type(ptr long) @ cdecl wined3d_device_set_ps_cb(ptr long ptr) -@ cdecl wined3d_device_set_ps_consts_b(ptr long ptr long) +@ cdecl wined3d_device_set_ps_consts_b(ptr long long ptr) @ cdecl wined3d_device_set_ps_consts_f(ptr long long ptr) @ cdecl wined3d_device_set_ps_consts_i(ptr long long ptr) @ cdecl wined3d_device_set_ps_resource_view(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9eb0f46..63550a1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2215,7 +2215,7 @@ void __cdecl wined3d_device_set_primitive_type(struct wined3d_device *device, enum wined3d_primitive_type primitive_topology); void __cdecl wined3d_device_set_ps_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_set_ps_consts_b(struct wined3d_device *device, - UINT start_register, const BOOL *constants, UINT bool_count); + unsigned int start_idx, unsigned int count, const BOOL *constants); HRESULT __cdecl wined3d_device_set_ps_consts_f(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_set_ps_consts_i(struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Make wined3d_device_get_vs_consts_b() consistent with wined3d_device_get_vs_consts_f().
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 9c8c391146b529b497101374269476cb6c6cff0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8c391146b529b4971013742… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 19:41:58 2016 +0200 wined3d: Make wined3d_device_get_vs_consts_b() consistent with wined3d_device_get_vs_consts_f(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 14 +++++++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0d28826..25ed842 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2899,7 +2899,7 @@ static HRESULT WINAPI d3d9_device_GetVertexShaderConstantB(IDirect3DDevice9Ex *i TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_get_vs_consts_b(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_get_vs_consts_b(device->wined3d_device, reg_idx, count, data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ec489e9..1761829 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2407,17 +2407,17 @@ HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, } HRESULT CDECL wined3d_device_get_vs_consts_b(const struct wined3d_device *device, - UINT start_register, BOOL *constants, UINT bool_count) + unsigned int start_idx, unsigned int count, BOOL *constants) { - UINT count = min(bool_count, WINED3D_MAX_CONSTS_B - start_register); - - TRACE("device %p, start_register %u, constants %p, bool_count %u.\n", - device, start_register, constants, bool_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_B) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_B) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.vs_consts_b[start_register], count * sizeof(BOOL)); + if (count > WINED3D_MAX_CONSTS_B - start_idx) + count = WINED3D_MAX_CONSTS_B - start_idx; + memcpy(constants, &device->state.vs_consts_b[start_idx], count * sizeof(*constants)); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2495120..e7f7ca2 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -93,7 +93,7 @@ @ cdecl wined3d_device_get_vertex_shader(ptr) @ cdecl wined3d_device_get_viewport(ptr ptr) @ cdecl wined3d_device_get_vs_cb(ptr long) -@ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long) +@ cdecl wined3d_device_get_vs_consts_b(ptr long long ptr) @ cdecl wined3d_device_get_vs_consts_f(ptr long long ptr) @ cdecl wined3d_device_get_vs_consts_i(ptr long long ptr) @ cdecl wined3d_device_get_vs_resource_view(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2020475..9eb0f46 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2159,7 +2159,7 @@ struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wi void __cdecl wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport); struct wined3d_buffer * __cdecl wined3d_device_get_vs_cb(const struct wined3d_device *device, UINT idx); HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *device, - UINT start_register, BOOL *constants, UINT bool_count); + unsigned int start_idx, unsigned int count, BOOL *constants); HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *device, unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Make wined3d_device_set_vs_consts_b() consistent with wined3d_device_set_vs_consts_f().
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 73ba87658c8f3990685c62f75dfb40e86e9db99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=73ba87658c8f3990685c62f75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 19:41:57 2016 +0200 wined3d: Make wined3d_device_set_vs_consts_b() consistent with wined3d_device_set_vs_consts_f(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 24 ++++++++++++++---------- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1938016..0d28826 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2884,7 +2884,7 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantB(IDirect3DDevice9Ex *i TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_vs_consts_b(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_set_vs_consts_b(device->wined3d_device, reg_idx, count, data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 316be5d..ec489e9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2374,24 +2374,28 @@ static void device_invalidate_shader_constants(const struct wined3d_device *devi } HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, - UINT start_register, const BOOL *constants, UINT bool_count) + unsigned int start_idx, unsigned int count, const BOOL *constants) { - UINT count = min(bool_count, WINED3D_MAX_CONSTS_B - start_register); - UINT i; + unsigned int i; - TRACE("device %p, start_register %u, constants %p, bool_count %u.\n", - device, start_register, constants, bool_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_B) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_B) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->vs_consts_b[start_register], constants, count * sizeof(BOOL)); - for (i = 0; i < count; ++i) - TRACE("Set BOOL constant %u to %s.\n", start_register + i, constants[i] ? "true" : "false"); + if (count > WINED3D_MAX_CONSTS_B - start_idx) + count = WINED3D_MAX_CONSTS_B - start_idx; + memcpy(&device->update_state->vs_consts_b[start_idx], constants, count * sizeof(*constants)); + if (TRACE_ON(d3d)) + { + for (i = 0; i < count; ++i) + TRACE("Set BOOL constant %u to %#x.\n", start_idx + i, constants[i]); + } if (device->recording) { - for (i = start_register; i < count + start_register; ++i) + for (i = start_idx; i < count + start_idx; ++i) device->recording->changed.vertexShaderConstantsB |= (1u << i); } else diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index a57591b..d5a7c61 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -911,7 +911,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_vs_consts_b; ++i) { wined3d_device_set_vs_consts_b(device, stateblock->contained_vs_consts_b[i], - stateblock->state.vs_consts_b + stateblock->contained_vs_consts_b[i], 1); + 1, &stateblock->state.vs_consts_b[stateblock->contained_vs_consts_b[i]]); } apply_lights(device, &stateblock->state); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c4446b8..2495120 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -149,7 +149,7 @@ @ cdecl wined3d_device_set_vertex_shader(ptr ptr) @ cdecl wined3d_device_set_viewport(ptr ptr) @ cdecl wined3d_device_set_vs_cb(ptr long ptr) -@ cdecl wined3d_device_set_vs_consts_b(ptr long ptr long) +@ cdecl wined3d_device_set_vs_consts_b(ptr long long ptr) @ cdecl wined3d_device_set_vs_consts_f(ptr long long ptr) @ cdecl wined3d_device_set_vs_consts_i(ptr long long ptr) @ cdecl wined3d_device_set_vs_resource_view(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index af320a4..2020475 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2247,7 +2247,7 @@ void __cdecl wined3d_device_set_vertex_shader(struct wined3d_device *device, str void __cdecl wined3d_device_set_viewport(struct wined3d_device *device, const struct wined3d_viewport *viewport); void __cdecl wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_set_vs_consts_b(struct wined3d_device *device, - UINT start_register, const BOOL *constants, UINT bool_count); + unsigned int start_idx, unsigned int count, const BOOL *constants); HRESULT __cdecl wined3d_device_set_vs_consts_f(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_set_vs_consts_i(struct wined3d_device *device,

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2016