September 2012 - Wine-Commits

Jacek Caban : vbscript: Added VT_R8 support to to_int.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 1fc2896c7c57e6feb8dbcf6156da1f505ad2668e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fc2896c7c57e6feb8dbcf615… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 14:36:15 2012 +0200 vbscript: Added VT_R8 support to to_int. --- dlls/vbscript/global.c | 9 +++++++++ dlls/vbscript/tests/api.vbs | 12 ++++++++++++ dlls/vbscript/vbscript.h | 13 +++++++++++++ 3 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 0facdf0..6e62a34 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -125,6 +125,15 @@ static HRESULT to_int(VARIANT *v, int *ret) case VT_I4: *ret = V_I4(v); break; + case VT_R8: { + double n = round(V_R8(v)); + if(!is_int32(n)) { + FIXME("%lf is out of int range\n", n); + return E_FAIL; + } + *ret = n; + break; + } default: FIXME("not supported %s\n", debugstr_variant(v)); return E_NOTIMPL; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index f7b4295..5efde28 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -124,6 +124,15 @@ Call ok(isNull(x), "InStr returned " & x) x = InStr(2, null, "abcd") Call ok(isNull(x), "InStr returned " & x) +x = InStr(1.3, "abcd", "bc") +Call ok(x = 2, "InStr returned " & x) + +x = InStr(2.3, "abcd", "bc") +Call ok(x = 2, "InStr returned " & x) + +x = InStr(2.6, "abcd", "bc") +Call ok(x = 0, "InStr returned " & x) + Sub TestMid(str, start, len, ex) x = Mid(str, start, len) Call ok(x = ex, "Mid(" & str & ", " & start & ", " & len & ") = " & x & " expected " & ex) @@ -182,6 +191,9 @@ Call ok(Len(empty) = 0, "Len(empty) = " & Len(empty)) Call ok(Space(1) = " ", "Space(1) = " & Space(1) & """") Call ok(Space(0) = "", "Space(0) = " & Space(0) & """") Call ok(Space(5) = " ", "Space(5) = " & Space(5) & """") +Call ok(Space(5.2) = " ", "Space(5.2) = " & Space(5.2) & """") +Call ok(Space(5.8) = " ", "Space(5.8) = " & Space(5.8) & """") +Call ok(Space(5.5) = " ", "Space(5.5) = " & Space(5.5) & """") Sub TestRound(val, exval, vt) Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 77cf0e7..41982da 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -343,6 +343,19 @@ TID_LIST HRESULT get_typeinfo(tid_t,ITypeInfo**) DECLSPEC_HIDDEN; +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif + +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif + +static inline BOOL is_int32(double d) +{ + return INT32_MIN <= d && d <= INT32_MAX && (double)(int)d == d; +} + HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : vbscript: Added MsgBox tests.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 44fb2605663fa9a027f70b6e8e9d2999e4583c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fb2605663fa9a027f70b6e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 14:36:58 2012 +0200 vbscript: Added MsgBox tests. --- dlls/vbscript/tests/run.c | 152 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 151 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 9c3725b..ae590bf 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -73,6 +73,9 @@ extern const CLSID CLSID_VBScript; expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CLEAR_CALLED(func) \ + expect_ ## func = called_ ## func = FALSE + DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_vbvar_d); @@ -87,6 +90,9 @@ DEFINE_EXPECT(global_propargput1_d); DEFINE_EXPECT(global_propargput1_i); DEFINE_EXPECT(collectionobj_newenum_i); DEFINE_EXPECT(Next); +DEFINE_EXPECT(GetWindow); +DEFINE_EXPECT(GetUIBehavior); +DEFINE_EXPECT(EnableModeless); #define DISPID_GLOBAL_REPORTSUCCESS 1000 #define DISPID_GLOBAL_TRACE 1001 @@ -112,9 +118,10 @@ DEFINE_EXPECT(Next); static const WCHAR testW[] = {'t','e','s','t',0}; static const WCHAR emptyW[] = {0}; -static BOOL strict_dispid_check, is_english; +static BOOL strict_dispid_check, is_english, allow_ui; static const char *test_name = "(null)"; static int test_counter; +static SCRIPTUICHANDLING uic_handling = SCRIPTUICHANDLING_NOUIERROR; static BSTR a2bstr(const char *str) { @@ -1178,6 +1185,86 @@ static IDispatchExVtbl GlobalVtbl = { static IDispatchEx Global = { &GlobalVtbl }; +static HRESULT WINAPI ActiveScriptSiteWindow_QueryInterface(IActiveScriptSiteWindow *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ActiveScriptSiteWindow_AddRef(IActiveScriptSiteWindow *iface) +{ + return 2; +} + +static ULONG WINAPI ActiveScriptSiteWindow_Release(IActiveScriptSiteWindow *iface) +{ + return 1; +} + +static HRESULT WINAPI ActiveScriptSiteWindow_GetWindow(IActiveScriptSiteWindow *iface, HWND *phwnd) +{ + if(!allow_ui) + CHECK_EXPECT(GetWindow); + *phwnd = NULL; + return S_OK; +} + +static HRESULT WINAPI ActiveScriptSiteWindow_EnableModeless(IActiveScriptSiteWindow *iface, BOOL fEnable) +{ + if(allow_ui) + return S_OK; + + CHECK_EXPECT(EnableModeless); + ok(!fEnable, "fEnable = %x\n", fEnable); + return E_FAIL; +} + +static const IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = { + ActiveScriptSiteWindow_QueryInterface, + ActiveScriptSiteWindow_AddRef, + ActiveScriptSiteWindow_Release, + ActiveScriptSiteWindow_GetWindow, + ActiveScriptSiteWindow_EnableModeless +}; + +static IActiveScriptSiteWindow ActiveScriptSiteWindow = { &ActiveScriptSiteWindowVtbl }; + +static HRESULT WINAPI ActiveScriptSiteUIControl_QueryInterface(IActiveScriptSiteUIControl *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ActiveScriptSiteUIControl_AddRef(IActiveScriptSiteUIControl *iface) +{ + return 2; +} + +static ULONG WINAPI ActiveScriptSiteUIControl_Release(IActiveScriptSiteUIControl *iface) +{ + return 1; +} + +static HRESULT WINAPI ActiveScriptSiteUIControl_GetUIBehavior(IActiveScriptSiteUIControl *iface, SCRIPTUICITEM UicItem, + SCRIPTUICHANDLING *pUicHandling) +{ + if(!allow_ui) { + CHECK_EXPECT(GetUIBehavior); + ok(UicItem == SCRIPTUICITEM_MSGBOX, "UidItem = %d\n", UicItem); + } + *pUicHandling = uic_handling; + return S_OK; +} + +static const IActiveScriptSiteUIControlVtbl ActiveScriptSiteUIControlVtbl = { + ActiveScriptSiteUIControl_QueryInterface, + ActiveScriptSiteUIControl_AddRef, + ActiveScriptSiteUIControl_Release, + ActiveScriptSiteUIControl_GetUIBehavior +}; + +static IActiveScriptSiteUIControl ActiveScriptSiteUIControl = { &ActiveScriptSiteUIControlVtbl }; + static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -1186,6 +1273,10 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, *ppv = iface; else if(IsEqualGUID(&IID_IActiveScriptSite, riid)) *ppv = iface; + else if(IsEqualGUID(&IID_IActiveScriptSiteWindow, riid)) + *ppv = &ActiveScriptSiteWindow; + else if(IsEqualGUID(&IID_IActiveScriptSiteUIControl, riid)) + *ppv = &ActiveScriptSiteUIControl; else return E_NOINTERFACE; @@ -1376,6 +1467,17 @@ static void parse_script_af(DWORD flags, const char *src) ok(hres == S_OK, "parse_script failed: %08x\n", hres); } +static HRESULT parse_script_ar(const char *src) +{ + BSTR tmp; + HRESULT hres; + + tmp = a2bstr(src); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp); + SysFreeString(tmp); + return hres; +} + static void parse_script_a(const char *src) { parse_script_af(SCRIPTITEM_GLOBALMEMBERS, src); @@ -1488,6 +1590,51 @@ static void test_gc(void) IActiveScriptParse_Release(parser); } +static void test_msgbox(void) +{ + HRESULT hres; + + uic_handling = SCRIPTUICHANDLING_NOUIDEFAULT; + + SET_EXPECT(GetUIBehavior); + SET_EXPECT(GetWindow); + SET_EXPECT(EnableModeless); + hres = parse_script_ar("MsgBox \"testing...\""); + CLEAR_CALLED(GetUIBehavior); + CLEAR_CALLED(GetWindow); + CLEAR_CALLED(EnableModeless); + if(FAILED(hres)) { + win_skip("Skipping MsgBox tests, broken (probably too old) vbscript\n"); + return; + } + + SET_EXPECT(GetUIBehavior); + parse_script_a("dim r\n r=MsgBox(\"testing...\")\n Call ok(r=0, \"r=\"&r)"); + CHECK_CALLED(GetUIBehavior); + + SET_EXPECT(GetUIBehavior); + parse_script_a("MsgBox 10"); + CHECK_CALLED(GetUIBehavior); + + uic_handling = SCRIPTUICHANDLING_ALLOW; + + SET_EXPECT(GetUIBehavior); + SET_EXPECT(GetWindow); + SET_EXPECT(EnableModeless); + hres = parse_script_ar("MsgBox \"testing...\""); + ok(FAILED(hres), "script not failed\n"); + CHECK_CALLED(GetUIBehavior); + CHECK_CALLED(GetWindow); + CHECK_CALLED(EnableModeless); + + uic_handling = SCRIPTUICHANDLING_NOUIERROR; + + SET_EXPECT(GetUIBehavior); + hres = parse_script_ar("MsgBox \"testing...\""); + ok(FAILED(hres), "script not failed\n"); + CHECK_CALLED(GetUIBehavior); +} + static HRESULT test_global_vars_ref(BOOL use_close) { IActiveScriptParse *parser; @@ -1736,6 +1883,7 @@ static void run_tests(void) test_procedures(); test_gc(); + test_msgbox(); } static BOOL check_vbscript(void) @@ -1767,6 +1915,8 @@ START_TEST(run) if(!check_vbscript()) { win_skip("Broken engine, probably too old\n"); }else if(argc > 2) { + allow_ui = TRUE; + uic_handling = SCRIPTUICHANDLING_ALLOW; run_from_file(argv[2]); }else { run_tests();

1 0

Jacek Caban : mshtml: Added IActiveScriptSiteUIControl tests.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

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

Nikolay Sivov : mlang: Forward ConvertStringToUnicode() to IMultiLanguage3 implementation.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

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

Jason Edmeades : cmd: Support for ^ character at end of line.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

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 Sept. 26, 2012

Sept. 26, 2012

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"', '', '' -(a)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 ------------ -(a)todo_wine@hello, world -(a)todo_wine@hello, world -(a)todo_wine@hell^o, world -(a)todo_wine@hell^o, world +hello, world +hello, world +hell^o, world +hell^o, world +baz baz -(a)todo_wine@baz -(a)todo_wine@foo | echo bar -(a)todo_wine@foo & echo bar -(a)todo_wine@bak & +foo | echo bar +foo & echo bar +bak & baz(a)space@ 0(a)or_broken@1 -(a)todo_wine@foo > foo -(a)todo_wine@< -(a)todo_wine@ffoof -(a)todo_wine@FOO=bar | baz -(a)todo_wine@0 -(a)todo_wine@FOO=bar ^| baz -(a)todo_wine@bar | baz -(a)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: Echo back command with whitespace removed first.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: a810e41e47172f0929cce27c60147e2b72e5ba83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a810e41e47172f0929cce27c6… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Sep 25 22:05:03 2012 +0100 cmd: Echo back command with whitespace removed first. --- programs/cmd/tests/test_builtins.cmd | 5 +++++ programs/cmd/tests/test_builtins.cmd.exp | 9 +++++++-- programs/cmd/wcmdmain.c | 17 ++++++++++++----- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 7c4b37f..d3bdf04 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -30,6 +30,9 @@ echo @tab@ on @space@ @echo off echo off(a)tab@@space@ +(a)echo noecho1 + @echo noecho2 +@@@@@echo echo3 echo ------------ Testing 'echo' [OFF] ------------ echo word echo 'singlequotedword' @@ -324,6 +327,8 @@ set VAR= echo ------------ Testing variable substitution ------------ echo --- in FOR variables for %%i in ("A B" C) do echo %%i +rem check works when prefix with @ +(a)for %%i in ("A B" C) do echo %%i rem quotes removal for %%i in ("A B" C) do echo '%%~i' rem fully qualified path diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 2888ffc..d2938ce 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -51,7 +51,7 @@ word(a)space@ @pwd@>echo word(a)space@@space@@space@ word(a)space@@space@ -(a)todo_wine@@pwd@>echo word(a)space@ +(a)pwd@>echo word(a)space@ word @pwd@>echo(a)tab@word(a)space@ @@ -63,7 +63,7 @@ word(a)space@@tab@ @pwd@>echo(a)tab@word(a)tab@@space@@space@ word(a)tab@@space@ -(a)todo_wine@@pwd@>echo word(a)space@ +(a)pwd@>echo word(a)space@ word @pwd@>echo(a)space@@tab(a)word@space@ @@ -76,6 +76,9 @@ word @tab(a)word @pwd@>echo @tab@ on @space@@space@ +noecho1 +noecho2 +echo3 ------------ Testing 'echo' [OFF] ------------ word 'singlequotedword' @@ -282,6 +285,8 @@ r(a)or_broken@qwerty --- in FOR variables "A B" C +"A B" +C 'A B'@or_broken@'' 'C'@or_broken@'' @pwd@\C D(a)or_broken@%~ff diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b095deb..c0d4925 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1819,27 +1819,34 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* Replace env vars if in a batch context */ if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); + + /* Skip preceeding whitespace */ + while (*curPos == ' ' || *curPos == '\t') curPos++; + /* Show prompt before batch line IF echo is on and in batch program */ - if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) { + if (context && echo_mode && *curPos && (*curPos != '@')) { static const WCHAR echoDot[] = {'e','c','h','o','.'}; static const WCHAR echoCol[] = {'e','c','h','o',':'}; const DWORD len = sizeof(echoDot)/sizeof(echoDot[0]); - DWORD curr_size = strlenW(extraSpace); + DWORD curr_size = strlenW(curPos); DWORD min_len = (curr_size < len ? curr_size : len); WCMD_show_prompt(); - WCMD_output_asis(extraSpace); + WCMD_output_asis(curPos); /* I don't know why Windows puts a space here but it does */ /* Except for lines starting with 'echo.' or 'echo:'. Ask MS why */ if (CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - extraSpace, min_len, echoDot, len) != CSTR_EQUAL + curPos, min_len, echoDot, len) != CSTR_EQUAL && CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - extraSpace, min_len, echoCol, len) != CSTR_EQUAL) + curPos, min_len, echoCol, len) != CSTR_EQUAL) { WCMD_output_asis(spaceW); } WCMD_output_asis(newlineW); } + /* Skip repeated 'no echo' characters */ + while (*curPos == '@') curPos++; + /* Start with an empty string, copying to the command string */ curStringLen = 0; curRedirsLen = 0;

1 0

Rico Schüller : d3dx9: Avoid variable assignment in D3DXQuaternionNormalize().
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 5accb12c1298a81a59e7d19080543ebf75635aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5accb12c1298a81a59e7d1908… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 26 13:57:21 2012 +0200 d3dx9: Avoid variable assignment in D3DXQuaternionNormalize(). --- dlls/d3dx9_36/math.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index c6fa19a..9be3011 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1338,23 +1338,20 @@ D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION *pout, CONST D3DXQU return pout; } -D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq) +D3DXQUATERNION * WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *out, const D3DXQUATERNION *q) { - D3DXQUATERNION out; FLOAT norm; - TRACE("(%p, %p)\n", pout, pq); - - norm = D3DXQuaternionLength(pq); + TRACE("out %p, q %p\n", out, q); - out.x = pq->x / norm; - out.y = pq->y / norm; - out.z = pq->z / norm; - out.w = pq->w / norm; + norm = D3DXQuaternionLength(q); - *pout=out; + out->x = q->x / norm; + out->y = q->y / norm; + out->z = q->z / norm; + out->w = q->w / norm; - return pout; + return out; } D3DXQUATERNION * WINAPI D3DXQuaternionRotationAxis(D3DXQUATERNION *out, const D3DXVECTOR3 *v, FLOAT angle)

1 0

Rico Schüller : d3dx9: Use float functions in D3DXQuaternionSlerp().
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: ce319e9d53374e94e544d958f4e490aa9dc4e104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce319e9d53374e94e544d958f… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 26 13:57:01 2012 +0200 d3dx9: Use float functions in D3DXQuaternionSlerp(). --- dlls/d3dx9_36/math.c | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 1e80e2e..7599a0a 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1435,32 +1435,35 @@ D3DXQUATERNION* WINAPI D3DXQuaternionRotationYawPitchRoll(D3DXQUATERNION *pout, return pout; } -D3DXQUATERNION* WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, FLOAT t) +D3DXQUATERNION * WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *out, const D3DXQUATERNION *q1, + const D3DXQUATERNION *q2, FLOAT t) { - FLOAT dot, epsilon, temp, theta, u; + FLOAT dot, temp; - TRACE("(%p, %p, %p, %f)\n", pout, pq1, pq2, t); + TRACE("out %p, q1 %p, q2 %p, t %f\n", out, q1, q2, t); - epsilon = 1.0f; temp = 1.0f - t; - u = t; - dot = D3DXQuaternionDot(pq1, pq2); - if ( dot < 0.0f ) + dot = D3DXQuaternionDot(q1, q2); + if (dot < 0.0f) { - epsilon = -1.0f; + t = -t; dot = -dot; } - if( 1.0f - dot > 0.001f ) + + if (1.0f - dot > 0.001f) { - theta = acos(dot); - temp = sin(theta * temp) / sin(theta); - u = sin(theta * u) / sin(theta); + FLOAT theta = acosf(dot); + + temp = sinf(theta * temp) / sinf(theta); + t = sinf(theta * t) / sinf(theta); } - pout->x = temp * pq1->x + epsilon * u * pq2->x; - pout->y = temp * pq1->y + epsilon * u * pq2->y; - pout->z = temp * pq1->z + epsilon * u * pq2->z; - pout->w = temp * pq1->w + epsilon * u * pq2->w; - return pout; + + out->x = temp * q1->x + t * q2->x; + out->y = temp * q1->y + t * q2->y; + out->z = temp * q1->z + t * q2->z; + out->w = temp * q1->w + t * q2->w; + + return out; } D3DXQUATERNION* WINAPI D3DXQuaternionSquad(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3, CONST D3DXQUATERNION *pq4, FLOAT t)

1 0

Rico Schüller : d3dx9: Fix shader constant byte calculation.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 3eb26010d8a1b350035dafeb47af4bdc1cc9766f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb26010d8a1b350035dafeb4… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 26 12:21:54 2012 +0200 d3dx9: Fix shader constant byte calculation. --- dlls/d3dx9_36/shader.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index c62c8e5..dfa0488 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -671,15 +671,6 @@ static inline int is_vertex_shader(DWORD version) return (version & 0xFFFF0000) == 0xFFFE0000; } -static DWORD calc_bytes(D3DXCONSTANT_DESC *desc) -{ - if (desc->RegisterSet != D3DXRS_FLOAT4 && desc->RegisterSet != D3DXRS_SAMPLER) - FIXME("Don't know how to calculate Bytes for constants of type %s\n", - debug_d3dxparameter_registerset(desc->RegisterSet)); - - return 4 * desc->Elements * desc->Rows * desc->Columns; -} - static inline struct ctab_constant *constant_from_handle(D3DXHANDLE handle) { return (struct ctab_constant *)handle; @@ -1656,7 +1647,7 @@ static HRESULT parse_ctab_constant_type(const char *ctab, DWORD typeoffset, stru } constant->desc.RegisterCount = max(0, min(max - index, size)); - constant->desc.Bytes = calc_bytes(&constant->desc); + constant->desc.Bytes = 4 * constant->desc.Elements * type->Rows * type->Columns; return D3D_OK;

1 0