November 2012 - Wine-Commits

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: 04bcba1c3ed777e23975bfe147087f28d257235b URL: http://source.winehq.org/git/wine.git/?a=commit;h=04bcba1c3ed777e23975bfe14… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Nov 28 22:48:10 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 0939da1..2f02cab 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-11-03 18:42+0300\n" +"PO-Revision-Date: 2012-11-28 22:47+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -10101,10 +10101,8 @@ msgid "Wine Command Prompt" msgstr "Wine komandų interpretatorius" #: cmd.rc:349 -#, fuzzy -#| msgid "CMD Version %1!S!\n" msgid "Wine CMD Version %1!S!\n" -msgstr "CMD versija %1!S!\n" +msgstr "Wine CMD versija %1!S!\n" #: cmd.rc:350 msgid "More? "

1 0

Piotr Caban : msvcrt: Added mbsrtowcs tests.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: 1ced0f460c28507cef344b751aa163ab863ea925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ced0f460c28507cef344b751… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 09:23:57 2012 +0000 msvcrt: Added mbsrtowcs tests. --- dlls/msvcrt/tests/string.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 743b5b3..840c4de 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -72,6 +72,7 @@ static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); static int (__cdecl *pwcstombs_s)(size_t*,char*,size_t,const wchar_t*,size_t); static int (__cdecl *pmbstowcs_s)(size_t*,wchar_t*,size_t,const char*,size_t); +static size_t (__cdecl *p_mbsrtowcs)(wchar_t*, const char**, size_t, mbstate_t*); static size_t (__cdecl *pwcsrtombs)(char*, const wchar_t**, size_t, int*); static errno_t (__cdecl *p_gcvt_s)(char*,size_t,double,int); static errno_t (__cdecl *p_itoa_s)(int,char*,size_t,int); @@ -1582,6 +1583,8 @@ static void test_mbstowcs(void) char mOut[6]; size_t ret; int err; + const char *pmbstr; + mbstate_t state; wOut[4] = '!'; wOut[5] = '\0'; mOut[4] = '!'; mOut[5] = '\0'; @@ -1672,6 +1675,38 @@ static void test_mbstowcs(void) ok(pwstr == NULL, "pwstr != NULL\n"); ok(!memcmp(mOut, mSimple, sizeof(mSimple)), "mOut = %s\n", mOut); + if(!p_mbsrtowcs) { + setlocale(LC_ALL, "C"); + win_skip("mbsrtowcs not available\n"); + return; + } + + pmbstr = mHiragana; + ret = p_mbsrtowcs(wOut, &pmbstr, 6, NULL); + ok(ret == 2, "mbsrtowcs did not return 2\n"); + ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); + ok(!pmbstr, "pmbstr != NULL\n"); + + state = mHiragana[0]; + pmbstr = mHiragana+1; + ret = p_mbsrtowcs(wOut, &pmbstr, 6, &state); + ok(ret == 2, "mbsrtowcs did not return 2\n"); + ok(wOut[0] == 0x3042, "wOut[0] = %x\n", wOut[0]); + ok(wOut[1] == 0xff61, "wOut[1] = %x\n", wOut[1]); + ok(wOut[2] == 0, "wOut[2] = %x\n", wOut[2]); + ok(!pmbstr, "pmbstr != NULL\n"); + + if (p_set_invalid_parameter_handler) + ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + "Invalid parameter handler was already set\n"); + errno = EBADF; + ret = p_mbsrtowcs(wOut, NULL, 6, &state); + ok(ret == -1, "mbsrtowcs did not return -1\n"); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + if (p_set_invalid_parameter_handler) + ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); + setlocale(LC_ALL, "C"); } @@ -2344,6 +2379,7 @@ START_TEST(string) p_tolower = (void*)GetProcAddress(hMsvcrt, "tolower"); p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen"); p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc"); + p_mbsrtowcs = (void*)GetProcAddress(hMsvcrt, "mbsrtowcs"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */

1 0

Piotr Caban : msvcrt: Added mbsrtowcs implementation.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: 5e50ec3df288b3bc9221c2deb802fa1ddc846df2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e50ec3df288b3bc9221c2deb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 09:23:39 2012 +0000 msvcrt: Added mbsrtowcs implementation. --- dlls/msvcrt/mbcs.c | 34 +++++++++++++++++++++++++++++++++- dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 71b5343..e06511d 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2077,7 +2077,7 @@ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, if(mbstr[size] == '\0') break; - size += (MSVCRT__isleadbyte_l(mbstr[size], locale) ? 2 : 1); + size += (MSVCRT__isleadbyte_l((unsigned char)mbstr[size], locale) ? 2 : 1); } size = MultiByteToWideChar(locinfo->lc_codepage, 0, @@ -2150,3 +2150,35 @@ int CDECL MSVCRT__mbstowcs_s(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, { return MSVCRT__mbstowcs_s_l(ret, wcstr, size, mbstr, count, NULL); } + +/********************************************************************* + * mbsrtowcs(MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT_mbsrtowcs(MSVCRT_wchar_t *wcstr, + const char **pmbstr, MSVCRT_size_t count, MSVCRT_mbstate_t *state) +{ + MSVCRT_mbstate_t s = (state ? *state : 0); + MSVCRT_wchar_t tmpdst; + MSVCRT_size_t ret = 0; + + if(!MSVCRT_CHECK_PMT(pmbstr != NULL)) + return -1; + + while(!wcstr || count>ret) { + int ch_len = MSVCRT_mbrtowc(&tmpdst, *pmbstr, 2, &s); + if(wcstr) + wcstr[ret] = tmpdst; + + if(ch_len < 0) { + return -1; + }else if(ch_len == 0) { + *pmbstr = NULL; + return ret; + } + + *pmbstr += ch_len; + ret++; + } + + return ret; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4f2fa9a..6a88832 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1331,7 +1331,7 @@ @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc # stub mbsdup_dbg(wstr long ptr long) -# stub mbsrtowcs(ptr ptr long ptr) +@ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs # stub mbsrtowcs_s(ptr ptr long ptr long ptr) @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s

1 0

Piotr Caban : msvcp100: Added exception throwing helpers.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: d55eabbb31f54a50be48aeebea4c7f85114fa4ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=d55eabbb31f54a50be48aeebe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 09:22:10 2012 +0000 msvcp100: Added exception throwing helpers. --- dlls/msvcp100/exception.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcp100/msvcp100.spec | 18 +++++++++--------- 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp100/exception.c b/dlls/msvcp100/exception.c index 1f4ffd2..2e9f1aa 100644 --- a/dlls/msvcp100/exception.c +++ b/dlls/msvcp100/exception.c @@ -454,6 +454,45 @@ void __cdecl _Nomemory(void) throw_exception(EXCEPTION_BAD_ALLOC, NULL); } +/* ?_Xmem(a)tr1@std@@YAXXZ */ +void __cdecl _Xmem(void) +{ + TRACE("()\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); +} + +/* ?_Xinvalid_argument(a)std@@YAXPBD(a)Z */ +/* ?_Xinvalid_argument(a)std@@YAXPEBD(a)Z */ +void __cdecl _Xinvalid_argument(const char *str) +{ + TRACE("(%s)\n", debugstr_a(str)); + throw_exception(EXCEPTION_INVALID_ARGUMENT, str); +} + +/* ?_Xlength_error(a)std@@YAXPBD(a)Z */ +/* ?_Xlength_error(a)std@@YAXPEBD(a)Z */ +void __cdecl _Xlength_error(const char *str) +{ + TRACE("(%s)\n", debugstr_a(str)); + throw_exception(EXCEPTION_LENGTH_ERROR, str); +} + +/* ?_Xout_of_range(a)std@@YAXPBD(a)Z */ +/* ?_Xout_of_range(a)std@@YAXPEBD(a)Z */ +void __cdecl _Xout_of_range(const char *str) +{ + TRACE("(%s)\n", debugstr_a(str)); + throw_exception(EXCEPTION_OUT_OF_RANGE, str); +} + +/* ?_Xruntime_error(a)std@@YAXPBD(a)Z */ +/* ?_Xruntime_error(a)std@@YAXPEBD(a)Z */ +void __cdecl _Xruntime_error(const char *str) +{ + TRACE("(%s)\n", debugstr_a(str)); + throw_exception(EXCEPTION_RUNTIME_ERROR, str); +} + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index e4ac191..6a67b3b 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1232,17 +1232,17 @@ @ stub ?_XLgamma(a)tr1@std@@YAOO(a)Z @ stub ?_Xbad(a)tr1@std@@YAXW4error_type(a)regex_constants@12@@Z @ stub ?_Xfunc(a)tr1@std@@YAXXZ -@ stub -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z -@ stub -arch=win64 ?_Xinvalid_argument(a)std@@YAXPEBD(a)Z -@ stub -arch=win32 ?_Xlength_error(a)std@@YAXPBD(a)Z -@ stub -arch=win64 ?_Xlength_error(a)std@@YAXPEBD(a)Z -@ stub ?_Xmem(a)tr1@std@@YAXXZ -@ stub -arch=win32 ?_Xout_of_range(a)std@@YAXPBD(a)Z -@ stub -arch=win64 ?_Xout_of_range(a)std@@YAXPEBD(a)Z +@ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) _Xinvalid_argument +@ cdecl -arch=win64 ?_Xinvalid_argument(a)std@@YAXPEBD(a)Z(str) _Xinvalid_argument +@ cdecl -arch=win32 ?_Xlength_error(a)std@@YAXPBD(a)Z(str) _Xlength_error +@ cdecl -arch=win64 ?_Xlength_error(a)std@@YAXPEBD(a)Z(str) _Xlength_error +@ cdecl ?_Xmem(a)tr1@std@@YAXXZ() _Xmem +@ cdecl -arch=win32 ?_Xout_of_range(a)std@@YAXPBD(a)Z(str) _Xout_of_range +@ cdecl -arch=win64 ?_Xout_of_range(a)std@@YAXPEBD(a)Z(str) _Xout_of_range @ stub -arch=win32 ?_Xoverflow_error(a)std@@YAXPBD(a)Z @ stub -arch=win64 ?_Xoverflow_error(a)std@@YAXPEBD(a)Z -@ stub -arch=win32 ?_Xruntime_error(a)std@@YAXPBD(a)Z -@ stub -arch=win64 ?_Xruntime_error(a)std@@YAXPEBD(a)Z +@ cdecl -arch=win32 ?_Xruntime_error(a)std@@YAXPBD(a)Z(str) _Xruntime_error +@ cdecl -arch=win64 ?_Xruntime_error(a)std@@YAXPEBD(a)Z(str) _Xruntime_error @ thiscall -arch=win32 ?always_noconv(a)codecvt_base@std@@QBE_NXZ(ptr) codecvt_base_always_noconv @ cdecl -arch=win64 ?always_noconv(a)codecvt_base@std@@QEBA_NXZ(ptr) codecvt_base_always_noconv @ thiscall -arch=win32 ?bad(a)ios_base@std@@QBE_NXZ(ptr) ios_base_bad

1 0

Nikolay Sivov : oledb32: Properly free property sets and propinfo sets ( Coverity).
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: 75cc571fabd101bace788a67c3e3a2cfdadd199b URL: http://source.winehq.org/git/wine.git/?a=commit;h=75cc571fabd101bace788a67c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 08:22:55 2012 -0500 oledb32: Properly free property sets and propinfo sets (Coverity). --- dlls/oledb32/datainit.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index b53e08a..a191c88 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -355,8 +355,8 @@ static void free_dbpropset(ULONG count, DBPROPSET *propset) VariantClear(&propset[i].rgProperties[p].vValue); CoTaskMemFree(&propset[i].rgProperties[p]); } - CoTaskMemFree(&propset[i]); } + CoTaskMemFree(propset); } static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset) @@ -372,8 +372,8 @@ static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset) VariantClear(&propinfoset[i].rgPropertyInfos[p].vValues); CoTaskMemFree(&propinfoset[i].rgPropertyInfos[p]); } - CoTaskMemFree(&propinfoset[i]); } + CoTaskMemFree(propinfoset); } static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, IUnknown *datasource,

1 0

Nikolay Sivov : wshom: Fix refcount for typeinfo pointers.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: 13d99144bdb256a7ff7fc377955c8d1253d667fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=13d99144bdb256a7ff7fc3779… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 07:26:41 2012 -0500 wshom: Fix refcount for typeinfo pointers. --- dlls/wshom.ocx/wshom_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index 1c6bb44..c253b61 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -77,6 +77,7 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) } *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(*typeinfo); return S_OK; }

1 0

Henri Verbeet : wined3d: Also unbind stream outputs and the geometry shader in stateblock_unbind_resources ().
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: 5d9d20ee0ef1ea7d4269fc12a79f80621dc5dffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d9d20ee0ef1ea7d4269fc12a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 28 22:11:47 2012 +0100 wined3d: Also unbind stream outputs and the geometry shader in stateblock_unbind_resources(). --- dlls/wined3d/stateblock.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c399bad..9b71486 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -491,6 +491,15 @@ void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) } } + for (i = 0; i < MAX_STREAM_OUT; ++i) + { + if ((buffer = state->stream_output[i].buffer)) + { + state->stream_output[i].buffer = NULL; + wined3d_buffer_decref(buffer); + } + } + for (i = 0; i < MAX_STREAMS; ++i) { if ((buffer = state->streams[i].buffer)) @@ -512,6 +521,12 @@ void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) wined3d_shader_decref(shader); } + if ((shader = state->geometry_shader)) + { + state->geometry_shader = NULL; + wined3d_shader_decref(shader); + } + if ((shader = state->pixel_shader)) { state->pixel_shader = NULL;

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXMATRIXSTACK.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: 8c94757c2b6d84110b7fdc82125053e8f44fa236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c94757c2b6d84110b7fdc821… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 28 22:11:46 2012 +0100 d3dx9: Avoid LPD3DXMATRIXSTACK. --- dlls/d3dx9_36/math.c | 2 +- include/d3dx9math.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 12073e3..e09dbec 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -877,7 +877,7 @@ D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm) static const unsigned int INITIAL_STACK_SIZE = 32; -HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK *ppstack) +HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, ID3DXMatrixStack **ppstack) { struct ID3DXMatrixStackImpl *object; diff --git a/include/d3dx9math.h b/include/d3dx9math.h index 0f5dc7c..769e086 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -451,7 +451,7 @@ DECLARE_INTERFACE_(ID3DXMatrixStack, IUnknown) extern "C" { #endif -HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack); +HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, ID3DXMatrixStack **stack); #ifdef __cplusplus }

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXMESH.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: d480f9e1a8c03029efa6604abe76d6873c75337c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d480f9e1a8c03029efa6604ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 28 22:11:44 2012 +0100 d3dx9: Avoid LPD3DXMESH. --- dlls/d3dx9_36/mesh.c | 19 ++++------ dlls/d3dx9_36/skin.c | 16 ++++---- include/d3dx9anim.h | 2 +- include/d3dx9mesh.h | 91 +++++++++++++++++++++++++++++++++----------------- 4 files changed, 76 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d480f9e1a8c03029efa66…

1 0

Andrew Talbot : winex11.drv: Remove unused variable.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: 00360e7c03acc63c619573e1c706f7952f44a917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00360e7c03acc63c619573e1c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 28 20:37:30 2012 +0000 winex11.drv: Remove unused variable. --- dlls/winex11.drv/palette.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index b9ad599..bd687ca 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -54,7 +54,6 @@ static PALETTEENTRY *COLOR_sysPal; /* current system palette */ static int COLOR_gapStart = 256; static int COLOR_gapEnd = -1; -static int COLOR_gapFilled = 0; UINT16 X11DRV_PALETTE_PaletteFlags = 0; @@ -670,7 +669,6 @@ static void X11DRV_PALETTE_FillDefaultColors( const PALETTEENTRY *sys_pal_templa if( --max <= 0 ) break; } } - COLOR_gapFilled = idx - COLOR_gapStart; } }

1 0