wine-commits July 2018

wine-commits@winehq.org

2 participants
405 discussions

Dmitry Timoshkov : comctl32/listbox: Fix the listbox sorting algorithm.
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: wine Branch: master Commit: 02c36b52b0071482d369deacb3a617a7f01e8a85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02c36b52b0071482d369deac… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 5 08:14:34 2018 +0300 comctl32/listbox: Fix the listbox sorting algorithm. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42602 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 11 ++++++----- dlls/comctl32/tests/listbox.c | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index a1fdf83..e033975 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -791,10 +791,11 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) { INT index, min, max, res; - if (!(descr->style & LBS_SORT)) return -1; /* Add it at the end */ + if (!descr->nb_items || !(descr->style & LBS_SORT)) return -1; /* Add it at the end */ + min = 0; - max = descr->nb_items; - while (min != max) + max = descr->nb_items - 1; + while (min <= max) { index = (min + max) / 2; if (HAS_STRINGS(descr)) @@ -817,10 +818,10 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) res = SendMessageW( descr->owner, WM_COMPAREITEM, id, (LPARAM)&cis ); } if (!res) return index; - if (res > 0) max = index; + if (res > 0) max = index - 1; else min = index + 1; } - return exact ? -1 : max; + return exact ? -1 : min; } diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 69d3381..9af675b 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2032,7 +2032,7 @@ static void test_WM_MEASUREITEM(void) ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 2"); ok(ret == 2, "expected 2, got %ld\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, lb_addstring_sort_parent_seq, "LB_ADDSTRING (LBS_SORT)", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, lb_addstring_sort_parent_seq, "LB_ADDSTRING (LBS_SORT)", FALSE); DestroyWindow(listbox); /* LBS_HASSTRINGS */

1 0

Dmitry Timoshkov : comctl32/listbox: Fix order of items passed in WM_COMPAREITEM data.
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: wine Branch: master Commit: 7decba4e2bf985acbc38d9895e18d691ac914a3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7decba4e2bf985acbc38d989… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 5 08:14:33 2018 +0300 comctl32/listbox: Fix order of items passed in WM_COMPAREITEM data. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42602 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 12 ++++++------ dlls/comctl32/tests/listbox.c | 4 ---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 94712fd..a1fdf83 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -798,7 +798,7 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) { index = (min + max) / 2; if (HAS_STRINGS(descr)) - res = LISTBOX_lstrcmpiW( descr->locale, str, descr->items[index].str); + res = LISTBOX_lstrcmpiW( descr->locale, descr->items[index].str, str ); else { COMPAREITEMSTRUCT cis; @@ -809,15 +809,15 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) cis.hwndItem = descr->self; /* note that some application (MetaStock) expects the second item * to be in the listbox */ - cis.itemID1 = -1; - cis.itemData1 = (ULONG_PTR)str; - cis.itemID2 = index; - cis.itemData2 = descr->items[index].data; + cis.itemID1 = index; + cis.itemData1 = descr->items[index].data; + cis.itemID2 = -1; + cis.itemData2 = (ULONG_PTR)str; cis.dwLocaleId = descr->locale; res = SendMessageW( descr->owner, WM_COMPAREITEM, id, (LPARAM)&cis ); } if (!res) return index; - if (res < 0) max = index; + if (res > 0) max = index; else min = index + 1; } return exact ? -1 : max; diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 790c2c4..69d3381 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -326,9 +326,7 @@ static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARA ok(wParam == cis->CtlID, "expected %#x, got %#lx\n", cis->CtlID, wParam); ok(cis->hwndItem == ctrl, "expected %p, got %p\n", ctrl, cis->hwndItem); -todo_wine ok((int)cis->itemID1 >= 0, "expected >= 0, got %d\n", cis->itemID1); -todo_wine ok((int)cis->itemID2 == -1, "expected -1, got %d\n", cis->itemID2); if (cis->CtlType == ODT_LISTBOX) @@ -2030,10 +2028,8 @@ static void test_WM_MEASUREITEM(void) ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 0"); ok(ret == 0, "expected 0, got %ld\n", ret); ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 1"); -todo_wine ok(ret == 1, "expected 1, got %ld\n", ret); ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 2"); -todo_wine ok(ret == 2, "expected 2, got %ld\n", ret); ok_sequence(sequences, PARENT_SEQ_INDEX, lb_addstring_sort_parent_seq, "LB_ADDSTRING (LBS_SORT)", TRUE);

1 0

Michael Stefaniuc : quartz: Use the more common ARRAY_SIZE spelling.
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: wine Branch: master Commit: e7bcc1193aeb88079e63d7e799daff43ff5c8522 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7bcc1193aeb88079e63d7e7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 00:21:22 2018 +0200 quartz: Use the more common ARRAY_SIZE spelling. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index d78f643..d189d1d 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -43,8 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) - typedef struct FilterMapper3Impl { IUnknown IUnknown_inner; @@ -264,7 +262,7 @@ static HRESULT WINAPI FilterMapper3_CreateCategory( { LPWSTR wClsidAMCat = NULL; LPWSTR wClsidCategory = NULL; - WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + ARRAYSIZE(wszSlashInstance)-1 + (CHARS_IN_GUID-1) * 2 + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + ARRAY_SIZE(wszSlashInstance)-1 + (CHARS_IN_GUID-1) * 2 + 1]; HKEY hKey = NULL; LONG lRet; HRESULT hr; @@ -1268,7 +1266,7 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface, CLSID c LPWSTR wszClsid = NULL; HKEY hKey; LONG lRet; - WCHAR wszKeyName[ARRAYSIZE(wszFilterSlash)-1 + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszFilterSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s, %s, %x)\n", iface, debugstr_guid(&clsid), debugstr_w(szName), dwMerit); @@ -1337,7 +1335,7 @@ static HRESULT WINAPI FilterMapper_RegisterPin( HKEY hKey = NULL; HKEY hPinsKey = NULL; WCHAR * wszPinsKeyName; - WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s, %s, %d, %d, %d, %d, %s, %s)\n", iface, debugstr_guid(&Filter), debugstr_w(szName), bRendered, bOutput, bZero, bMany, debugstr_guid(&ConnectsToFilter), debugstr_w(ConnectsToPin)); @@ -1498,7 +1496,7 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID LONG lRet; LPWSTR wszClsid = NULL; HKEY hKey; - WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s)\n", iface, debugstr_guid(&Filter)); @@ -1563,7 +1561,7 @@ static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID Fi LPWSTR wszClsid = NULL; HKEY hKey = NULL; WCHAR * wszPinNameKey; - WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s, %s)\n", iface, debugstr_guid(&Filter), debugstr_w(Name));

1 0

Zebediah Figura : quartz: Inline copying pin info and update comment.
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: wine Branch: master Commit: 1105d0bafb4d86731795600116ff49d9f65ebaa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1105d0bafb4d867317956001… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 00:43:25 2018 +0200 quartz: Inline copying pin info and update comment. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/pin.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 5197d5c..a3674f2 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -138,18 +138,6 @@ out: return hr; } - -static void Copy_PinInfo(PIN_INFO * pDest, const PIN_INFO * pSrc) -{ - /* Tempting to just do a memcpy, but the name field is - 128 characters long! We will probably never exceed 10 - most of the time, so we are better off copying - each field manually */ - strcpyW(pDest->achName, pSrc->achName); - pDest->dir = pSrc->dir; - pDest->pFilter = pSrc->pFilter; -} - static HRESULT deliver_endofstream(IPin* pin, LPVOID unused) { return IPin_EndOfStream( pin ); @@ -179,15 +167,20 @@ static HRESULT deliver_newsegment(IPin *pin, LPVOID data) /*** PullPin implementation ***/ -static HRESULT PullPin_Init(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PULL pSampleProc, LPVOID pUserData, - QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, REQUESTPROC pCustomRequest, STOPPROCESSPROC pDone, LPCRITICAL_SECTION pCritSec, PullPin * pPinImpl) +static HRESULT PullPin_Init(const IPinVtbl *PullPin_Vtbl, const PIN_INFO *info, + SAMPLEPROC_PULL pSampleProc, void *pUserData, QUERYACCEPTPROC pQueryAccept, + CLEANUPPROC pCleanUp, REQUESTPROC pCustomRequest, STOPPROCESSPROC pDone, + LPCRITICAL_SECTION pCritSec, PullPin *pPinImpl) { /* Common attributes */ pPinImpl->pin.IPin_iface.lpVtbl = PullPin_Vtbl; pPinImpl->pin.refCount = 1; pPinImpl->pin.pConnectedTo = NULL; pPinImpl->pin.pCritSec = pCritSec; - Copy_PinInfo(&pPinImpl->pin.pinInfo, pPinInfo); + /* avoid copying uninitialized data */ + strcpyW(pPinImpl->pin.pinInfo.achName, info->achName); + pPinImpl->pin.pinInfo.dir = info->dir; + pPinImpl->pin.pinInfo.pFilter = info->pFilter; ZeroMemory(&pPinImpl->pin.mtCurrent, sizeof(AM_MEDIA_TYPE)); /* Input pin attributes */

1 0

Zebediah Figura : strmbase: Update comment for copying pin info.
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: wine Branch: master Commit: 567be5b60ee6c165828f6a43b252299b5f9f6dcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=567be5b60ee6c165828f6a43… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 00:43:24 2018 +0200 strmbase: Update comment for copying pin info. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index ef22a57..a100ae1 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -145,10 +145,7 @@ out: static void Copy_PinInfo(PIN_INFO * pDest, const PIN_INFO * pSrc) { - /* Tempting to just do a memcpy, but the name field is - 128 characters long! We will probably never exceed 10 - most of the time, so we are better off copying - each field manually */ + /* avoid copying uninitialized data */ strcpyW(pDest->achName, pSrc->achName); pDest->dir = pSrc->dir; pDest->pFilter = pSrc->pFilter;

1 0

Jason Edmeades : xcopy: Add support for xcopy /k.
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: wine Branch: master Commit: 1bfe68512d4b10c3426e05564e13d18800420470 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bfe68512d4b10c3426e0556… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Wed Jul 4 22:08:41 2018 +0100 xcopy: Add support for xcopy /k. xcopy should remove read only permissions from the destination file unless the /k option is supplied. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40706 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 38 +++++++++++++++++++++++++++++++++++++- po/bg.po | 3 ++- po/ca.po | 38 +++++++++++++++++++++++++++++++++++++- po/cs.po | 38 +++++++++++++++++++++++++++++++++++++- po/da.po | 38 +++++++++++++++++++++++++++++++++++++- po/de.po | 38 +++++++++++++++++++++++++++++++++++++- po/el.po | 3 ++- po/en.po | 4 +++- po/en_US.po | 4 +++- po/eo.po | 3 ++- po/es.po | 38 +++++++++++++++++++++++++++++++++++++- po/fa.po | 3 ++- po/fi.po | 38 +++++++++++++++++++++++++++++++++++++- po/fr.po | 38 +++++++++++++++++++++++++++++++++++++- po/he.po | 38 +++++++++++++++++++++++++++++++++++++- po/hi.po | 3 ++- po/hr.po | 38 +++++++++++++++++++++++++++++++++++++- po/hu.po | 38 +++++++++++++++++++++++++++++++++++++- po/it.po | 38 +++++++++++++++++++++++++++++++++++++- po/ja.po | 38 +++++++++++++++++++++++++++++++++++++- po/ko.po | 38 +++++++++++++++++++++++++++++++++++++- po/lt.po | 38 +++++++++++++++++++++++++++++++++++++- po/ml.po | 3 ++- po/nb_NO.po | 38 +++++++++++++++++++++++++++++++++++++- po/nl.po | 38 +++++++++++++++++++++++++++++++++++++- po/or.po | 3 ++- po/pa.po | 3 ++- po/pl.po | 38 +++++++++++++++++++++++++++++++++++++- po/pt_BR.po | 38 +++++++++++++++++++++++++++++++++++++- po/pt_PT.po | 38 +++++++++++++++++++++++++++++++++++++- po/rm.po | 3 ++- po/ro.po | 38 +++++++++++++++++++++++++++++++++++++- po/ru.po | 38 +++++++++++++++++++++++++++++++++++++- po/sk.po | 3 ++- po/sl.po | 38 +++++++++++++++++++++++++++++++++++++- po/sr_RS(a)cyrillic.po | 3 ++- po/sr_RS(a)latin.po | 3 ++- po/sv.po | 38 +++++++++++++++++++++++++++++++++++++- po/te.po | 3 ++- po/th.po | 3 ++- po/tr.po | 38 +++++++++++++++++++++++++++++++++++++- po/uk.po | 38 +++++++++++++++++++++++++++++++++++++- po/wa.po | 3 ++- po/wine.pot | 3 ++- po/zh_CN.po | 38 +++++++++++++++++++++++++++++++++++++- po/zh_TW.po | 38 +++++++++++++++++++++++++++++++++++++- programs/xcopy/tests/xcopy.c | 25 +++++++++++++++++++++++++ programs/xcopy/xcopy.c | 25 ++++++++++++++++++------- programs/xcopy/xcopy.h | 1 + programs/xcopy/xcopy.rc | 1 + 50 files changed, 1119 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1bfe68512d4b10c3426e…

1 0

Jason Edmeades : cmd: Fix issue in WCMD_assoc highlighted by valgrind.
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: wine Branch: master Commit: ab46a89c3b8649844a70ee30abffbbd275128bc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab46a89c3b8649844a70ee30… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Wed Jul 4 22:08:40 2018 +0100 cmd: Fix issue in WCMD_assoc highlighted by valgrind. In an error condition, the wrong variable was being used for an insert, resulting in a read from uninitialized data. This could be triggered for example by 'ftype jason=', and the error message should have included jason but instead was just ''. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38849 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 3a0981d..57a41c4 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4923,7 +4923,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { LoadStringW(hinst, WCMD_NOFTYPE, msgbuffer, sizeof(msgbuffer)/sizeof(WCHAR)); } - WCMD_output_stderr(msgbuffer, keyValue); + WCMD_output_stderr(msgbuffer, args); errorlevel = 2; }

1 0

Jason Edmeades : cmd: Call and goto finds the next matching label.
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: wine Branch: master Commit: 254dc78c2cc5aec26b8af6956c3525c1880bf570 URL: https://source.winehq.org/git/wine.git/?a=commit;h=254dc78c2cc5aec26b8af695… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Wed Jul 4 22:08:39 2018 +0100 cmd: Call and goto finds the next matching label. A call or a goto will find the next matching label not the first one in the file. This means it could be later in the file or it could be earlier in the file, so make goto (which 'call' also uses) first scan from current file position to the end of the file, and subsequently from the start of the file to the wrap point. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42823 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 67 +++++++++++++++++++++++--------- programs/cmd/tests/test_builtins.cmd | 51 ++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 13 +++++++ 3 files changed, 113 insertions(+), 18 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 35b68bd..3a0981d 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2582,30 +2582,61 @@ void WCMD_goto (CMD_LIST **cmdList) { if (labelend) *labelend = 0x00; WINE_TRACE("goto label: '%s'\n", wine_dbgstr_w(paramStart)); - SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); - while (*paramStart && - WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { - str = string; + /* Loop through potentially twice - once from current file position + through to the end, and second time from start to current file + position */ + if (*paramStart) { + int loop; + LARGE_INTEGER startli; + for (loop=0; loop<2; loop++) { + if (loop==0) { + /* On first loop, save the file size */ + startli.QuadPart = 0; + startli.u.LowPart = SetFilePointer(context -> h, startli.u.LowPart, + &startli.u.HighPart, FILE_CURRENT); + } else { + /* On second loop, start at the beginning of the file */ + WINE_TRACE("Label not found, trying from beginning of file\n"); + if (loop==1) SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); + } - /* Ignore leading whitespace or no-echo character */ - while (*str=='@' || isspaceW (*str)) str++; + while (WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { + str = string; - /* If the first real character is a : then this is a label */ - if (*str == ':') { - str++; + /* Ignore leading whitespace or no-echo character */ + while (*str=='@' || isspaceW (*str)) str++; - /* Skip spaces between : and label */ - while (isspaceW (*str)) str++; - WINE_TRACE("str before brk %s\n", wine_dbgstr_w(str)); + /* If the first real character is a : then this is a label */ + if (*str == ':') { + str++; - /* Label ends at whitespace or redirection characters */ - labelend = strpbrkW(str, labelEndsW); - if (labelend) *labelend = 0x00; - WINE_TRACE("comparing found label %s\n", wine_dbgstr_w(str)); + /* Skip spaces between : and label */ + while (isspaceW (*str)) str++; + WINE_TRACE("str before brk %s\n", wine_dbgstr_w(str)); - if (lstrcmpiW (str, paramStart) == 0) return; - } + /* Label ends at whitespace or redirection characters */ + labelend = strpbrkW(str, labelEndsW); + if (labelend) *labelend = 0x00; + WINE_TRACE("comparing found label %s\n", wine_dbgstr_w(str)); + + if (lstrcmpiW (str, paramStart) == 0) return; + } + + /* See if we have gone beyond the end point if second time through */ + if (loop==1) { + LARGE_INTEGER curli; + curli.QuadPart = 0; + curli.u.LowPart = SetFilePointer(context -> h, curli.u.LowPart, + &curli.u.HighPart, FILE_CURRENT); + if (curli.QuadPart > startli.QuadPart) { + WINE_TRACE("Reached wrap point, label not found\n"); + break; + } + } + } + } } + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOTARGET)); context -> skip_rest = TRUE; } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 49c2d9e..0a8122c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -3027,6 +3027,57 @@ echo FAILURE at dest 10 :dest10:this is also ignored echo Correctly ignored trailing information +rem Testing which label is reached when there are many options +echo Begin: +set nextlabel= +call :sub +set nextlabel=middle +goto :sub + +:sub +echo ..First sub +if not "%nextlabel%"=="" goto :%nextlabel% +goto :EOF + +:sub +echo ..Second sub +if not "%nextlabel%"=="" goto :%nextlabel% +goto :EOF + +:middle +echo Middle: +set nextlabel= +call :sub +set nextlabel=nearend +goto :sub + +:sub +echo ..Third sub +if not "%nextlabel%"=="" goto :%nextlabel% +goto :EOF + +:nearend +echo Near end: +set nextlabel= +call :sub +set nextlabel=end +goto :sub + +:sub +echo ..Fourth sub +if not "%nextlabel%"=="" goto :%nextlabel% +goto :EOF + +:end +echo At end: +set nextlabel= +call :sub +set nextlabel=done +goto :sub + +:done +echo Finished + echo ------------ Testing PATH ------------ set WINE_backup_path=%path% set path=original diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index cfde83b..7f4f724 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1582,6 +1582,19 @@ goto with redirections worked Ignoring double colons worked label with mixed whitespace and no echo worked Correctly ignored trailing information +Begin: +..First sub +..First sub +Middle: +..Third sub +..Third sub +Near end: +..Fourth sub +..Fourth sub +At end: +..First sub +..First sub +Finished ------------ Testing PATH ------------ PATH=original PATH=try2

1 0

Jason Edmeades : cmd: Support "c:<space>" etc when changing drive letters.
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: wine Branch: master Commit: daee8b753c52011d1dd745e399cbe25ac9e9ac47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=daee8b753c52011d1dd745e3… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Wed Jul 4 22:08:38 2018 +0100 cmd: Support "c:<space>" etc when changing drive letters. This allows whitespace and any other text on the line when changing drive letters. Mostly I expect it crops up when commands are concatenated and the readability whitespace is added to the end of the command. For example C: & dir results in "C: " and "dir" as the two commands. We cannot unconditionally remove whitespace as some commands rely on it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40694 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 35 ++++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 7 +++++++ programs/cmd/wcmdmain.c | 9 ++++++-- 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 6f2ef4a..49c2d9e 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -3042,6 +3042,41 @@ echo ------------ Testing start /W ------------ echo start /W failed to wait>foobar.txt start /W "" cmd /C "ping -n1 & echo start /W seems to really wait>foobar.txt"& type foobar.txt& del foobar.txt +echo ------------ Testing changing the drive letter ---------- +pushd C:\ + +echo Normal: +call :setError 0 +C: +if errorlevel 1 echo Normal drive change failed + +echo Normal+space +call :setError 0 +C:@space@ +if errorlevel 1 echo Normal+space drive change failed + +echo Normal+space+garbage +call :setError 0 +C: garbage +if errorlevel 1 echo Normal+space+garbage drive change failed + +call :setError 0 +echo Quoted should fail +"C:" +if not errorlevel 1 echo quoted drive change unexpectedly worked + +echo Normal+tab +call :setError 0 +C:@tab@ +if errorlevel 1 echo Normal+tab drive change failed + +echo Normal+tab+garbage +call :setError 0 +C:@tab@garbagetab +if errorlevel 1 echo Normal+tab+garbage drive change failed + +popd + echo ------------ Testing combined CALLs/GOTOs ------------ echo @echo off>foo.cmd echo goto :eof>>foot.cmd diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 0eb5b96..cfde83b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1588,6 +1588,13 @@ PATH=try2 PATH=try3 ------------ Testing start /W ------------ start /W seems to really wait +------------ Testing changing the drive letter ---------- +Normal: +Normal+space +Normal+space+garbage +Quoted should fail +Normal+tab +Normal+tab+garbage ------------ Testing combined CALLs/GOTOs ------------ world cheball diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 827ddd2..0d02f1f 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1327,13 +1327,18 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, cmd = new_cmd; /* - * Changing default drive has to be handled as a special case. + * Changing default drive has to be handled as a special case, anything + * else if it exists after whitespace is ignored */ - if ((strlenW(cmd) == 2) && (cmd[1] == ':') && IsCharAlphaW(cmd[0])) { + if ((cmd[1] == ':') && IsCharAlphaW(cmd[0]) && + (!cmd[2] || cmd[2] == ' ' || cmd[2] == '\t')) { WCHAR envvar[5]; WCHAR dir[MAX_PATH]; + /* Ignore potential garbage on the same line */ + cmd[2]=0x00; + /* According to MSDN CreateProcess docs, special env vars record the current directory on each drive, in the form =C: so see if one specified, and if so go back to it */

1 0

Alexandre Julliard : Revert "add perm news blurb about wineconf".
by Alexandre Julliard 05 Jul '18

05 Jul '18

Module: website Branch: master Commit: a766c9724eedfba2fee2ab28ae98749af2dc29f1 URL: https://source.winehq.org/git/website.git/?a=commit;h=a766c9724eedfba2fee2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 5 17:37:34 2018 +0200 Revert "add perm news blurb about wineconf". This reverts commit 941ab4df439b4e0f76ec1b1a3e69a484feac7b08. WineConf 2018 is over. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/en/home.template | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/templates/en/home.template b/templates/en/home.template index 8eec1bf..0411569 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -161,20 +161,6 @@ <h1 class="title"><a href="{$root}/news">News and Updates</a></h1> - <p class="newstitle"><a href="/news/2018030801">WineConf 2018 - 25th anniversary</a></p> - <div class="newsblock"> - <p>The Wine Project is pleased to announce that WineConf 2018 will - take place on June 29 - July 1 2018 in The Hague, The - Netherlands. This will coincide with the 25th anniversary of Wine.</p> - <p>WineConf is the Wine Project's annual conference, where members of - the Wine community, the broader Free Software community and interested - users meet up over food and beverages. We traditionally also have a - number of talks by attendees, as well as some formal and informal - discussions about anything vaguely Wine related.</p> - <p>Please see the <a href="https://wiki.winehq.org/WineConf2018">WineConf2018 page</a> - for further details.</p> - </div> -  <p><a href="{$root}/news" class="btn btn-default"><span class="glyphicon glyphicon-chevron-right"></span> more news...</a></p>

1 0

← Newer
1
...
34
35
36
37
38
39
40
41
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 July 2018