wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Jason Edmeades : cmd: Support for ^ character at end of line.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 2ff533c1f2c6b6054260d7a448126a0d32015a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ff533c1f2c6b6054260d7a44… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Sep 25 21:02:09 2012 +0100 cmd: Support for ^ character at end of line. Based on a patch by John Chow. --- programs/cmd/tests/test_builtins.cmd | 9 +++++ programs/cmd/tests/test_builtins.cmd.exp | 6 +++ programs/cmd/wcmdmain.c | 52 +++++++++++++++++++++++++---- 3 files changed, 59 insertions(+), 8 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index e8ffe53..7c4b37f 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -197,6 +197,15 @@ echo ^hell^o, world echo hell^o, world echo hell^^o, world echo hell^^^o, world +echo hello^ +world +echo hello^ + +world +echo hello^ + + +echo finished mkdir foobar echo baz> foobar\baz type foobar\baz diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index b019280..2888ffc 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -201,6 +201,12 @@ hello, world hello, world hell^o, world hell^o, world +helloworld +hello +world +hello + +finished baz baz foo | echo bar diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index a328f83..b095deb 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1788,6 +1788,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE BOOL lastWasIn = FALSE; BOOL lastWasElse = FALSE; BOOL lastWasRedirect = TRUE; + BOOL lastWasCaret = FALSE; /* Allocate working space for a command read from keyboard, file etc */ if (!extraSpace) @@ -1856,6 +1857,12 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE lastWasWhiteSpace, onlyWhiteSpace); */ + /* Prevent overflow caused by the caret escape char*/ + if (*curLen >= MAXSTRING) { + WINE_ERR("Overflow detected in command\n"); + return NULL; + } + /* Certain commands need special handling */ if (curStringLen == 0 && curCopyTo == curString) { static const WCHAR forDO[] = {'d','o'}; @@ -1928,6 +1935,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE else thisChar = 'X'; /* Character with no special processing */ lastWasWhiteSpace = FALSE; /* Will be reset below */ + lastWasCaret = FALSE; switch (thisChar) { @@ -2070,7 +2078,15 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE } break; - case '^': if (!inQuotes) curPos++; + case '^': if (!inQuotes) { + /* If we reach the end of the input, we need to wait for more */ + if (*(curPos+1) == 0x00) { + lastWasCaret = TRUE; + WINE_TRACE("Caret found at end of line\n"); + break; + } + curPos++; + } curCopyTo[(*curLen)++] = *curPos; break; @@ -2147,8 +2163,9 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE lastWasIn = lastWasDo = FALSE; } - /* If we have reached the end, add this command into the list */ - if (*curPos == 0x00 && *curLen > 0) { + /* If we have reached the end, add this command into the list + Do not add command to list if escape char ^ was last */ + if (*curPos == 0x00 && !lastWasCaret && *curLen > 0) { /* Add an entry to the command list */ WCMD_addCommand(curString, &curStringLen, @@ -2158,19 +2175,38 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE &lastEntry, output); } - /* If we have reached the end of the string, see if bracketing outstanding */ - if (*curPos == 0x00 && curDepth > 0 && readFrom != INVALID_HANDLE_VALUE) { + /* If we have reached the end of the string, see if bracketing or + final caret is outstanding */ + if (*curPos == 0x00 && (curDepth > 0 || lastWasCaret) && + readFrom != INVALID_HANDLE_VALUE) { + WCHAR *extraData; + + WINE_TRACE("Need to read more data as outstanding brackets or carets\n"); inRem = FALSE; prevDelim = CMD_NONE; inQuotes = 0; memset(extraSpace, 0x00, (MAXSTRING+1) * sizeof(WCHAR)); + extraData = extraSpace; /* Read more, skipping any blank lines */ - while (*extraSpace == 0x00) { + do { + WINE_TRACE("Read more input\n"); if (!context) WCMD_output_asis( WCMD_LoadMessage(WCMD_MOREPROMPT)); - if (!WCMD_fgets(extraSpace, MAXSTRING, readFrom)) + if (!WCMD_fgets(extraData, MAXSTRING, readFrom)) break; - } + + /* Edge case for carets - a completely blank line (ie was just + CRLF) is oddly added as an LF but then more data is received (but + only once more!) */ + if (lastWasCaret) { + if (*extraSpace == 0x00) { + WINE_TRACE("Read nothing, so appending LF char and will try again\n"); + *extraData++ = '\r'; + *extraData = 0x00; + } else break; + } + + } while (*extraData == 0x00); curPos = extraSpace; if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); /* Continue to echo commands IF echo is on and in batch program */

1 0

Jason Edmeades : cmd: Add circumflex support into command shell.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: d8c0fbcedc266fadcb48cd560adcc909c9738d0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c0fbcedc266fadcb48cd560… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Sep 25 13:45:28 2012 +0100 cmd: Add circumflex support into command shell. --- programs/cmd/tests/test_builtins.cmd.exp | 34 +++++++++++++++--------------- programs/cmd/wcmdmain.c | 4 +++ 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index a4f874c..b019280 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -123,7 +123,7 @@ bar2 'a', '~`+', '.{}!+b' 'a', 'b', '' '"a;b"', '', '' -@todo_wine@'a', 'b', '' +'a', 'b', '' 'a[b]{c}(d)e', '', '' 'a', '', '' second line @@ -197,25 +197,25 @@ A B C ------------ Testing circumflex escape character ------------ -@todo_wine@hello, world -@todo_wine@hello, world -@todo_wine@hell^o, world -@todo_wine@hell^o, world +hello, world +hello, world +hell^o, world +hell^o, world +baz baz -@todo_wine@baz -@todo_wine@foo | echo bar -@todo_wine@foo & echo bar -@todo_wine@bak & +foo | echo bar +foo & echo bar +bak & baz@space@ 0@or_broken@1 -@todo_wine@foo > foo -@todo_wine@< -@todo_wine@ffoof -@todo_wine@FOO=bar | baz -@todo_wine@0 -@todo_wine@FOO=bar ^| baz -@todo_wine@bar | baz -@todo_wine@0 +foo > foo +< +ffoof +FOO=bar | baz +0 +FOO=bar ^| baz +bar | baz +0 ------------ Testing 'set' ------------ 1 0 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 94d2b76..a328f83 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2070,6 +2070,10 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE } break; + case '^': if (!inQuotes) curPos++; + curCopyTo[(*curLen)++] = *curPos; + break; + case '&': if (!inQuotes) { lastWasRedirect = FALSE;

1 0

Jason Edmeades : cmd: Fix parameterization around delimiters.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: e35b239b41317e62659ab94534e34f029d26df3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35b239b41317e62659ab9453… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Wed Sep 26 00:07:20 2012 +0100 cmd: Fix parameterization around delimiters. --- programs/cmd/batch.c | 63 ++++++++++++++++++++++-------- programs/cmd/builtins.c | 36 +++++++++-------- programs/cmd/directory.c | 2 +- programs/cmd/tests/test_builtins.cmd | 44 +++++++++++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 59 ++++++++++++++++++++-------- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 8 ++-- 7 files changed, 154 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e35b239b41317e62659ab…

1 0

Nikolay Sivov : mlang: Forward ConvertStringReset() to IMultiLanguage3.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 1ed2bd14b71ebe140b2376570c01aa7f183344d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed2bd14b71ebe140b2376570… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 26 17:43:40 2012 +0400 mlang: Forward ConvertStringReset() to IMultiLanguage3. --- dlls/mlang/mlang.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 1d82291..67c318b 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2180,8 +2180,8 @@ static HRESULT WINAPI fnIMultiLanguage_ConvertStringFromUnicode( static HRESULT WINAPI fnIMultiLanguage_ConvertStringReset( IMultiLanguage* iface) { - FIXME("\n"); - return E_NOTIMPL; + MLang_impl *This = impl_from_IMultiLanguage( iface ); + return IMultiLanguage3_ConvertStringReset(&This->IMultiLanguage3_iface); } static HRESULT WINAPI fnIMultiLanguage_GetRfc1766FromLcid(

1 0

Nikolay Sivov : mlang: Forward ConvertStringToUnicode() to IMultiLanguage3 implementation.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: c8c624a9c3b10968012d6d5cc5c53d060adc1fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8c624a9c3b10968012d6d5cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 26 17:41:39 2012 +0400 mlang: Forward ConvertStringToUnicode() to IMultiLanguage3 implementation. --- dlls/mlang/mlang.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index d56dd1a..1d82291 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2152,15 +2152,16 @@ static HRESULT WINAPI fnIMultiLanguage_ConvertString( static HRESULT WINAPI fnIMultiLanguage_ConvertStringToUnicode( IMultiLanguage* iface, - DWORD* pdwMode, - DWORD dwEncoding, - CHAR* pSrcStr, - UINT* pcSrcSize, - WCHAR* pDstStr, - UINT* pcDstSize) + DWORD* mode, + DWORD src_enc, + CHAR* src, + UINT* src_size, + WCHAR* dest, + UINT* dest_size) { - return ConvertINetMultiByteToUnicode(pdwMode, dwEncoding, - (LPCSTR)pSrcStr, (LPINT)pcSrcSize, pDstStr, (LPINT)pcDstSize); + MLang_impl *This = impl_from_IMultiLanguage( iface ); + return IMultiLanguage3_ConvertStringToUnicode(&This->IMultiLanguage3_iface, + mode, src_enc, src, src_size, dest, dest_size); } static HRESULT WINAPI fnIMultiLanguage_ConvertStringFromUnicode(

1 0

Nikolay Sivov : mlang: Forward ConvertString() to IMultiLanguage3 implementation.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 9f16a0883d92f1086c5e7206abae9053f54bee0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f16a0883d92f1086c5e7206a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 26 17:39:11 2012 +0400 mlang: Forward ConvertString() to IMultiLanguage3 implementation. --- dlls/mlang/mlang.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 9cfcf16..d56dd1a 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2137,16 +2137,17 @@ static HRESULT WINAPI fnIMultiLanguage_IsConvertible( static HRESULT WINAPI fnIMultiLanguage_ConvertString( IMultiLanguage* iface, - DWORD* pdwMode, - DWORD dwSrcEncoding, - DWORD dwDstEncoding, - BYTE* pSrcStr, - UINT* pcSrcSize, - BYTE* pDstStr, - UINT* pcDstSize) + DWORD* mode, + DWORD src_enc, + DWORD dst_enc, + BYTE* src, + UINT* src_size, + BYTE* dest, + UINT* dest_size) { - return ConvertINetString(pdwMode, dwSrcEncoding, dwDstEncoding, - (LPCSTR)pSrcStr, (LPINT)pcSrcSize, (LPSTR)pDstStr, (LPINT)pcDstSize); + MLang_impl *This = impl_from_IMultiLanguage( iface ); + return IMultiLanguage3_ConvertString(&This->IMultiLanguage3_iface, mode, src_enc, + dst_enc, src, src_size, dest, dest_size); } static HRESULT WINAPI fnIMultiLanguage_ConvertStringToUnicode(

1 0

Nikolay Sivov : mlang: Implement IMLangConvertCharset_DoConversionFromUnicode().
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 97e30dfe70087e2e74226dc8520cee311c0dc7dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e30dfe70087e2e74226dc85… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 26 17:35:45 2012 +0400 mlang: Implement IMLangConvertCharset_DoConversionFromUnicode(). --- dlls/mlang/mlang.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index d86f80a..9cfcf16 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3627,8 +3627,8 @@ static HRESULT WINAPI MLangConvertCharset_DoConversionFromUnicode(IMLangConvertC WCHAR *src, UINT *src_size, CHAR *dest, UINT *dest_size) { struct convert_charset *This = impl_from_IMLangConvertCharset(iface); - FIXME("(%p)->(%p %p %p %p): stub\n", This, src, src_size, dest, dest_size); - return E_NOTIMPL; + TRACE("(%p)->(%p %p %p %p)\n", This, src, src_size, dest, dest_size); + return ConvertINetUnicodeToMultiByte(NULL, This->dst_cp, src, (INT*)src_size, dest, (INT*)dest_size); } static const IMLangConvertCharsetVtbl MLangConvertCharsetVtbl =

1 0

Nikolay Sivov : mlang: Ignore MLCONVCHARF_USEDEFCHAR in IMLangConvertCharset_Initialize().
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: b8228aaf980d7012b8e29430d5791b4c8c09664b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8228aaf980d7012b8e29430d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 26 17:30:09 2012 +0400 mlang: Ignore MLCONVCHARF_USEDEFCHAR in IMLangConvertCharset_Initialize(). --- dlls/mlang/mlang.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 0253eec..d86f80a 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3568,6 +3568,7 @@ static HRESULT WINAPI MLangConvertCharset_Initialize(IMLangConvertCharset *iface TRACE("(%p)->(%u %u 0x%08x)\n", This, src_cp, dst_cp, prop); + prop &= ~MLCONVCHARF_USEDEFCHAR; if (prop) FIXME("property 0x%08x not supported\n", prop);

1 0

Alexandre Julliard : wineps: Always escape Postscript reserved characters in font names.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 16f900fd5adc03317012cc7e02d2bc369352e378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f900fd5adc03317012cc7e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 26 16:58:03 2012 +0200 wineps: Always escape Postscript reserved characters in font names. --- dlls/wineps.drv/download.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index fbd868c..037ea34 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -49,6 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); */ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str) { + static const char reserved_chars[] = " %/(){}[]<>\n\r\t\b\f"; int len; char *p; DWORD size; @@ -92,7 +93,7 @@ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str memcpy(*str, strings + name_record->offset, name_record->length); *(*str + name_record->length) = '\0'; HeapFree(GetProcessHeap(), 0, name); - return; + goto done; } if(name_record->platform_id == 3 && name_record->encoding_id == 1 && name_record->language_id == 0x409 && name_record->name_id == 6) @@ -110,7 +111,7 @@ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str WideCharToMultiByte(1252, 0, unicode, -1, *str, len, NULL, NULL); HeapFree(GetProcessHeap(), 0, unicode); HeapFree(GetProcessHeap(), 0, name); - return; + goto done; } } TRACE("Unable to find PostScript name\n"); @@ -122,11 +123,8 @@ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str *str = HeapAlloc(GetProcessHeap(),0,len); strcpy(*str, (char*)potm + (ptrdiff_t)potm->otmpFaceName); - p = *str; - while((p = strchr(p, ' '))) - *p = '_'; - - return; +done: + for (p = *str; *p; p++) if (strchr( reserved_chars, *p )) *p = '_'; } /****************************************************************************

1 0

Jacek Caban : mshtml: Added IActiveScriptSiteUIControl tests.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 62e340226cc968d24d67fff9bdec35cb16f19c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e340226cc968d24d67fff9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 14:37:47 2012 +0200 mshtml: Added IActiveScriptSiteUIControl tests. --- dlls/mshtml/tests/script.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 0fa6eba..ddf3613 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2084,6 +2084,22 @@ static void test_default_arg_conv(IHTMLWindow2 *window) IDispatchEx_Release(dispex); } +static void test_ui(void) +{ + IActiveScriptSiteUIControl *ui_control; + SCRIPTUICHANDLING uic_handling = 10; + HRESULT hres; + + hres = IActiveScriptSite_QueryInterface(site, &IID_IActiveScriptSiteUIControl, (void**)&ui_control); + ok(hres == S_OK, "Could not get IActiveScriptSiteUIControl: %08x\n", hres); + + hres = IActiveScriptSiteUIControl_GetUIBehavior(ui_control, SCRIPTUICITEM_MSGBOX, &uic_handling); + ok(hres == S_OK, "GetUIBehavior failed: %08x\n", hres); + ok(uic_handling == SCRIPTUICHANDLING_ALLOW, "uic_handling = %d\n", uic_handling); + + IActiveScriptSiteUIControl_Release(ui_control); +} + static void test_script_run(void) { IDispatchEx *document, *dispex; @@ -2308,6 +2324,7 @@ static void test_script_run(void) test_global_id(); test_security(); + test_ui(); } static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *iface,

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
83
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 September 2012