wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Dan Kegel : vcomp: Better stubs for omp_get_dynamic, omp_set_dynamic.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: d58ade2d4250e32eb3b96131f0fd09bdc1d4ed15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d58ade2d4250e32eb3b96131f… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Sep 29 20:20:39 2012 -0700 vcomp: Better stubs for omp_get_dynamic, omp_set_dynamic. --- dlls/vcomp/main.c | 11 +++++++++++ dlls/vcomp/vcomp.spec | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 78c2c08..1f80563 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -29,6 +29,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcomp); +int CDECL omp_get_dynamic(void) +{ + TRACE("stub\n"); + return 0; +} + int CDECL omp_get_max_threads(void) { TRACE("stub\n"); @@ -53,6 +59,11 @@ double CDECL omp_get_wtime(void) return GetTickCount() / 1000.0; } +void CDECL omp_set_dynamic(int val) +{ + TRACE("(%d): stub\n", val); +} + void CDECL omp_set_num_threads(int num_threads) { TRACE("(%d): stub\n", num_threads); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index a29b9f9..ce66c52 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -90,7 +90,7 @@ @ stub _vcomp_single_end @ stub omp_destroy_lock @ stub omp_destroy_nest_lock -@ stub omp_get_dynamic +@ cdecl omp_get_dynamic() @ cdecl omp_get_max_threads() @ stub omp_get_nested @ cdecl omp_get_num_procs() @@ -101,7 +101,7 @@ @ stub omp_in_parallel @ stub omp_init_lock @ stub omp_init_nest_lock -@ stub omp_set_dynamic +@ cdecl omp_set_dynamic(long) @ stub omp_set_lock @ stub omp_set_nest_lock @ stub omp_set_nested

1 0

Dan Kegel : vcomp: Better stub for omp_get_max_threads.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: ed23241733c5071aec3d1d51275ed478cc97f745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed23241733c5071aec3d1d512… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Sep 29 20:20:38 2012 -0700 vcomp: Better stub for omp_get_max_threads. --- dlls/vcomp/main.c | 6 ++++++ dlls/vcomp/vcomp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index a369af1..78c2c08 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -29,6 +29,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcomp); +int CDECL omp_get_max_threads(void) +{ + TRACE("stub\n"); + return 1; +} + int CDECL omp_get_num_procs(void) { TRACE("stub\n"); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index cca56f1..a29b9f9 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -91,7 +91,7 @@ @ stub omp_destroy_lock @ stub omp_destroy_nest_lock @ stub omp_get_dynamic -@ stub omp_get_max_threads +@ cdecl omp_get_max_threads() @ stub omp_get_nested @ cdecl omp_get_num_procs() @ cdecl omp_get_num_threads()

1 0

Dan Kegel : vcomp: Better stub for omp_set_num_threads.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 54a10eb1aa0bb0fe46a205a67de2b39eb82a17ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a10eb1aa0bb0fe46a205a67… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Sep 29 20:20:37 2012 -0700 vcomp: Better stub for omp_set_num_threads. --- dlls/vcomp/main.c | 5 +++++ dlls/vcomp/vcomp.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 170bd43..a369af1 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -47,6 +47,11 @@ double CDECL omp_get_wtime(void) return GetTickCount() / 1000.0; } +void CDECL omp_set_num_threads(int num_threads) +{ + TRACE("(%d): stub\n", num_threads); +} + void CDECL _vcomp_set_num_threads(int num_threads) { TRACE("(%d): stub\n", num_threads); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index e53a475..cca56f1 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -105,7 +105,7 @@ @ stub omp_set_lock @ stub omp_set_nest_lock @ stub omp_set_nested -@ stub omp_set_num_threads +@ cdecl omp_set_num_threads(long) @ stub omp_test_lock @ stub omp_test_nest_lock @ stub omp_unset_lock

1 0

Dan Kegel : vcomp: Better stub for omp_get_num_threads.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 9ba01e0246b4edc832b864b35867fa54bde3876a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba01e0246b4edc832b864b35… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Sep 29 20:20:36 2012 -0700 vcomp: Better stub for omp_get_num_threads. --- dlls/vcomp/main.c | 6 ++++++ dlls/vcomp/vcomp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 1e51eef..170bd43 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -35,6 +35,12 @@ int CDECL omp_get_num_procs(void) return 1; } +int CDECL omp_get_num_threads(void) +{ + TRACE("stub\n"); + return 1; +} + /* Time in seconds since "some time in the past" */ double CDECL omp_get_wtime(void) { diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 3e02bea..e53a475 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -94,7 +94,7 @@ @ stub omp_get_max_threads @ stub omp_get_nested @ cdecl omp_get_num_procs() -@ stub omp_get_num_threads +@ cdecl omp_get_num_threads() @ stub omp_get_thread_num @ stub omp_get_wtick @ cdecl omp_get_wtime()

1 0

Jacek Caban : vbscript: Added RTrim implementation.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: ed3d0e00aeca051b648af31baa897ff9e0a90776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3d0e00aeca051b648af31ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 10:34:07 2012 +0200 vbscript: Added RTrim implementation. --- dlls/vbscript/global.c | 25 +++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 12 ++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 6db59ca..e2319ae 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -879,8 +879,29 @@ static HRESULT Global_LTrim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR static HRESULT Global_RTrim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, conv_str = NULL; + WCHAR *ptr; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + if(V_VT(arg) == VT_BSTR) { + str = V_BSTR(arg); + }else { + hres = to_string(arg, &conv_str); + if(FAILED(hres)) + return hres; + str = conv_str; + } + + for(ptr = str+SysStringLen(str); ptr-1 > str && isspaceW(*(ptr-1)); ptr--); + + str = SysAllocStringLen(str, ptr-str); + SysFreeString(conv_str); + if(!str) + return E_OUTOFMEMORY; + + return return_bstr(res, str); } static HRESULT Global_Trim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index b64043d..6bcded8 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -254,6 +254,18 @@ Sub TestRound(val, exval, vt) Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val))) End Sub +Sub TestRTrim(str, exstr) + Call ok(RTrim(str) = exstr, "RTrim(" & str & ") = " & RTrim(str)) +End Sub + +TestRTrim " test ", " test" +TestRTrim "test ", "test" +TestRTrim " test", " test" +TestRTrim "test", "test" +TestRTrim "", "" +TestRTrim 123, "123" +if isEnglishLang then TestRTrim true, "True" + TestRound 3, 3, "VT_I2" TestRound 3.3, 3, "VT_R8" TestRound 3.8, 4, "VT_R8"

1 0

Jacek Caban : vbscript: Added LTrim() implementation.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 71a4a1d43a5b50e5b68b99b16617148a44027334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a4a1d43a5b50e5b68b99b16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 10:33:50 2012 +0200 vbscript: Added LTrim() implementation. --- dlls/vbscript/global.c | 25 +++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 12 ++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index e6211b7..6db59ca 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -852,8 +852,29 @@ static HRESULT Global_UCase(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR static HRESULT Global_LTrim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, conv_str = NULL; + WCHAR *ptr; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + if(V_VT(arg) == VT_BSTR) { + str = V_BSTR(arg); + }else { + hres = to_string(arg, &conv_str); + if(FAILED(hres)) + return hres; + str = conv_str; + } + + for(ptr = str; *ptr && isspaceW(*ptr); ptr++); + + str = SysAllocString(ptr); + SysFreeString(conv_str); + if(!str) + return E_OUTOFMEMORY; + + return return_bstr(res, str); } static HRESULT Global_RTrim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 7553d59..b64043d 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -237,6 +237,18 @@ TestTrim "", "" TestTrim 123, "123" if isEnglishLang then TestTrim true, "True" +Sub TestLTrim(str, exstr) + Call ok(LTrim(str) = exstr, "LTrim(" & str & ") = " & LTrim(str)) +End Sub + +TestLTrim " test ", "test " +TestLTrim "test ", "test " +TestLTrim " test", "test" +TestLTrim "test", "test" +TestLTrim "", "" +TestLTrim 123, "123" +if isEnglishLang then TestLTrim true, "True" + Sub TestRound(val, exval, vt) Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val)))

1 0

Jacek Caban : vbscript: Added Trim() implementation.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 3ea9a170c0beb6c68cef50e3c81c2c883562efce URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea9a170c0beb6c68cef50e3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 10:33:30 2012 +0200 vbscript: Added Trim() implementation. --- dlls/vbscript/global.c | 26 ++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 12 ++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index fa600ee..e6211b7 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -864,8 +864,30 @@ static HRESULT Global_RTrim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR static HRESULT Global_Trim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, conv_str = NULL; + WCHAR *begin_ptr, *end_ptr; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + if(V_VT(arg) == VT_BSTR) { + str = V_BSTR(arg); + }else { + hres = to_string(arg, &conv_str); + if(FAILED(hres)) + return hres; + str = conv_str; + } + + for(begin_ptr = str; *begin_ptr && isspaceW(*begin_ptr); begin_ptr++); + for(end_ptr = str+SysStringLen(str); end_ptr-1 > begin_ptr && isspaceW(*(end_ptr-1)); end_ptr--); + + str = SysAllocStringLen(begin_ptr, end_ptr-begin_ptr); + SysFreeString(conv_str); + if(!str) + return E_OUTOFMEMORY; + + return return_bstr(res, str); } static HRESULT Global_Space(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 06122ef..7553d59 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -225,6 +225,18 @@ TestRight "test", 0, "" TestRight 123, 2, "23" if isEnglishLang then TestRight true, 2, "ue" +Sub TestTrim(str, exstr) + Call ok(Trim(str) = exstr, "Trim(" & str & ") = " & Trim(str)) +End Sub + +TestTrim " test ", "test" +TestTrim "test ", "test" +TestTrim " test", "test" +TestTrim "test", "test" +TestTrim "", "" +TestTrim 123, "123" +if isEnglishLang then TestTrim true, "True" + Sub TestRound(val, exval, vt) Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val)))

1 0

Jason Edmeades : cmd: Fix basic cmd.exe /c "echo hello" type syntax.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 88f14bb59045e1d8c8bb0a71abb50f505620c420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f14bb59045e1d8c8bb0a71a… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Oct 2 00:35:47 2012 +0100 cmd: Fix basic cmd.exe /c "echo hello" type syntax. Add checks for existance of command to run in order to keep the new quote handling capabilities of cmd.exe /C or /K. If the command cannot be found, drop back to /S processing mode as per cmd.exe help. --- programs/cmd/tests/test_builtins.cmd | 1 + programs/cmd/tests/test_builtins.cmd.exp | 7 ++- programs/cmd/wcmdmain.c | 71 +++++++++++++++++++++++++++++- 3 files changed, 74 insertions(+), 5 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 1c0f875..3e064b9 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1829,6 +1829,7 @@ rem Basic test of command line. Note a section prefix per command rem to resync, as wine does not output anything in these cases yet. echo --- Test 1 cmd.exe /c echo Line1 +cmd.exe /c echo "Line2" echo --- Test 2 cmd.exe /c echo Test quotes "&" work echo --- Test 3 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index e817706..6483f1e 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -910,6 +910,7 @@ value1 ------------ cmd.exe command lines ------------ --- Test 1 Line1 +@todo_wine@"Line2" --- Test 2 @todo_wine@Test quotes "&" work --- Test 3 @@ -929,11 +930,11 @@ Line1 --- Test 10 --- Test 11 --- Test 12 -@todo_wine@passed1 +passed1 --- Test 13 -@todo_wine@passed2@space@ +passed2@space@ --- Test 14 -@todo_wine@foobar +foobar --- Test 15 No prompts or I would not get here1 No prompts or I would not get here2 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 0e7a197..675256b 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2419,10 +2419,12 @@ int wmain (int argc, WCHAR *argvW[]) } } + /* If there is not exactly 2 quote characters, then /S (old behaviour) is enabled */ if (qcount!=2) opt_s = TRUE; - /* check argvW[0] for a space and invalid characters */ + /* check argvW[0] for a space and invalid characters. There must not be any invalid + * characters, but there must be one or more whitespace */ if (!opt_s) { opt_s = TRUE; p=*argvW; @@ -2432,7 +2434,7 @@ int wmain (int argc, WCHAR *argvW[]) opt_s = TRUE; break; } - if (*p==' ') + if (*p==' ' || *p=='\t') opt_s = FALSE; p++; } @@ -2507,6 +2509,71 @@ int wmain (int argc, WCHAR *argvW[]) WINE_TRACE("/c command line: '%s'\n", wine_dbgstr_w(cmd)); + /* Finally, we only stay in new mode IF the first parameter is quoted and + is a valid executable, ie must exist, otherwise drop back to old mode */ + if (!opt_s) { + WCHAR *thisArg = WCMD_parameter(cmd, 0, NULL, NULL, FALSE); + static const WCHAR extEXEW[] = {'.','e','x','e','\0'}; + static const WCHAR extCOMW[] = {'.','c','o','m','\0'}; + BOOL found = FALSE; + + /* If the supplied parameter has any directory information, look there */ + WINE_TRACE("First parameter is '%s'\n", wine_dbgstr_w(thisArg)); + if (strchrW(thisArg, '\\') != NULL) { + + GetFullPathNameW(thisArg, sizeof(string)/sizeof(WCHAR), string, NULL); + WINE_TRACE("Full path name '%s'\n", wine_dbgstr_w(string)); + p = string + strlenW(string); + + /* Does file exist with this name? */ + if (GetFileAttributesW(string) != INVALID_FILE_ATTRIBUTES) { + WINE_TRACE("Found file as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } else strcpyW(p, extEXEW); + + /* Does file exist with .exe appended */ + if (!found && GetFileAttributesW(string) != INVALID_FILE_ATTRIBUTES) { + WINE_TRACE("Found file as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } else strcpyW(p, extCOMW); + + /* Does file exist with .com appended */ + if (!found && GetFileAttributesW(string) != INVALID_FILE_ATTRIBUTES) { + WINE_TRACE("Found file as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } + + /* Otherwise we now need to look in the path to see if we can find it */ + } else { + p = thisArg + strlenW(thisArg); + + /* Does file exist with this name? */ + if (SearchPathW(NULL, thisArg, NULL, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { + WINE_TRACE("Found on path as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } + + /* Does file exist plus an extension of .exe? */ + if (SearchPathW(NULL, thisArg, extEXEW, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { + WINE_TRACE("Found on path as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } + + /* Does file exist plus an extension of .com? */ + if (SearchPathW(NULL, thisArg, extCOMW, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { + WINE_TRACE("Found on path as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } + } + + /* If not found, drop back to old behaviour */ + if (!found) { + WINE_TRACE("Binary not found, dropping back to old behaviour\n"); + opt_s = TRUE; + } + + } + /* strip first and last quote characters if opt_s; check for invalid * executable is done later */ if (opt_s && *cmd=='\"')

1 0

Jason Edmeades : cmd: cmd.exe /c or / k should suppress copy overwrite prompts.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: b1dacc6c379ede878b5740a8ab5df635538b6e14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1dacc6c379ede878b5740a8a… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Oct 1 22:37:17 2012 +0100 cmd: cmd.exe /c or /k should suppress copy overwrite prompts. --- programs/cmd/builtins.c | 3 +- programs/cmd/tests/test_builtins.cmd | 86 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 43 +++++++++++++++ programs/cmd/wcmdmain.c | 7 ++- 4 files changed, 137 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index f6922ad..f1c356c 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); extern int defaultColor; extern BOOL echo_mode; +extern BOOL interactive; struct env_stack *pushd_directories; const WCHAR dotW[] = {'.','\0'}; @@ -446,7 +447,7 @@ void WCMD_copy (void) { else { /* By default, we will force the overwrite in batch mode and ask for * confirmation in interactive mode. */ - force = !!context; + force = !interactive; /* If COPYCMD is set, then we force the overwrite with /Y and ask for * confirmation with /-Y. If COPYCMD is neither of those, then we use the diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index d89721a..1c0f875 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1816,8 +1816,94 @@ goto :eof :endlocalfinished echo %var% +set var= +set var2= cd .. & rd /q/s foobar +echo ------------ cmd.exe command lines ------------ +mkdir foobar +cd foobar +echo file1 > file1 + +rem Basic test of command line. Note a section prefix per command +rem to resync, as wine does not output anything in these cases yet. +echo --- Test 1 +cmd.exe /c echo Line1 +echo --- Test 2 +cmd.exe /c echo Test quotes "&" work +echo --- Test 3 +cmd.exe /c echo "&" +echo --- Test 4 +cmd.exe /c echo "<" +echo --- Test 5 +cmd.exe /c echo ">" +echo --- Test 6 +cmd.exe /c echo "\" +echo --- Test 7 +cmd.exe /c echo "|" +echo --- Test 8 +cmd.exe /c echo "`" +echo --- Test 9 +cmd.exe /c echo """ +echo --- Test 10 +echo on > file3 +@type file3 +@echo off +echo --- Test 11 +cmd.exe /c echo on >file3 +@type file3 +@echo off +echo --- Test 12 +cmd.exe /c "echo passed1" +echo --- Test 13 +cmd.exe /c " echo passed2 " +echo --- Test 14 +cmd.exe /c "dir /ad ..\fooba* /b" +echo --- Test 15 + +rem Ensure no interactive prompting when cmd.exe /c or /k +echo file2 > file2 +cmd.exe /c copy file1 file2 >nul +echo No prompts or I would not get here1 +rem - Try cmd.exe /k as well +cmd.exe /k "copy file1 file2 >nul && exit" +echo No prompts or I would not get here2 + +rem Non existing variable expansion is as per command line, ie left as-is +cmd.exe /c echo %%hello1%% +cmd.exe /c echo %%hello2 +cmd.exe /c echo %%hello3^:h=t%% +cmd.exe /c echo %%hello4%%%% + +rem Cannot issue a call from cmd.exe /c +cmd.exe /c call :hello5 + +rem %1-9 has no meaning +cmd.exe /c echo one = %%1 + +rem for loop vars need expanding +cmd.exe /c for /L %%i in (1,1,5) do @echo %%i + +rem goto's are ineffective +cmd.exe /c goto :fred +cmd.exe /c goto eof + +rem - %var% is expanded at read time, not execute time +set var=11 +cmd.exe /c "set var=22 && setlocal && set var=33 && endlocal && echo var contents: %%var%%" + +rem - endlocal ineffective on cmd.exe /c lines +cmd.exe /c "set var=22 && setlocal && set var=33 && endlocal && set var" +set var=99 + +rem - Environment is inherited ok +cmd.exe /c ECHO %%VAR%% + +rem - Exit works +cmd.exe /c exit + +cd .. +rd foobar /s /q echo ------------ Testing Errorlevel ------------ rem WARNING: Do *not* add tests using ErrorLevel after this section should_not_exist 2> nul > nul diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 4bab1ef..e817706 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -907,6 +907,49 @@ value1 2 1 1 +------------ cmd.exe command lines ------------ +--- Test 1 +Line1 +--- Test 2 +@todo_wine@Test quotes "&" work +--- Test 3 +@todo_wine@"&" +--- Test 4 +@todo_wine@"<" +--- Test 5 +@todo_wine@">" +--- Test 6 +@todo_wine@"\" +--- Test 7 +@todo_wine@"|" +--- Test 8 +@todo_wine@"`" +--- Test 9 +@todo_wine@""" +--- Test 10 +--- Test 11 +--- Test 12 +@todo_wine@passed1 +--- Test 13 +@todo_wine@passed2@space@ +--- Test 14 +@todo_wine@foobar +--- Test 15 +No prompts or I would not get here1 +No prompts or I would not get here2 +%hello1% +%hello2 +%hello3:h=t% +%hello4%% +one = %1 +1 +2 +3 +4 +5 +@todo_wine@var contents: 11 +var=33@space@ +99 ------------ Testing Errorlevel ------------ 9009 1 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 02babea..0e7a197 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -39,6 +39,7 @@ extern struct env_stack *pushd_directories; BATCH_CONTEXT *context = NULL; DWORD errorlevel; WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; +BOOL interactive; int defaultColor = 7; BOOL echo_mode = TRUE; @@ -2366,6 +2367,9 @@ int wmain (int argc, WCHAR *argvW[]) WCMD_echo(eoff); } + /* Until we start to read from the keyboard, stay as non-interactive */ + interactive = FALSE; + if (opt_c || opt_k) { int len,qcount; WCHAR** arg; @@ -2625,7 +2629,8 @@ int wmain (int argc, WCHAR *argvW[]) */ SetEnvironmentVariableW(promptW, defaultpromptW); - WCMD_version (); + interactive = TRUE; + if (!opt_k) WCMD_version (); while (TRUE) { /* Read until EOF (which for std input is never, but if redirect

1 0

Henri Verbeet : wined3d: Recognize the SM4 dcl_constantBuffer opcode.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 6d948e1a8cdd8a9a5ae2b6124468275cbf13f2b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d948e1a8cdd8a9a5ae2b6124… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 22:48:13 2012 +0200 wined3d: Recognize the SM4 dcl_constantBuffer opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 7 +++++++ dlls/wined3d/shader_sm4.c | 14 +++++++++++++- dlls/wined3d/wined3d_private.h | 7 +++++-- 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a54a37f..4f5efe0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5101,6 +5101,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_CRS */ shader_hw_map2gl, /* WINED3DSIH_CUT */ NULL, /* WINED3DSIH_DCL */ shader_hw_nop, + /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_hw_nop, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_hw_nop, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_hw_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index db04c6a..d344bfa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5120,6 +5120,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CRS */ shader_glsl_cross, /* WINED3DSIH_CUT */ shader_glsl_cut, /* WINED3DSIH_DCL */ shader_glsl_nop, + /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_glsl_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 72f2fa6..d07809b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -50,6 +50,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_CRS */ "crs", /* WINED3DSIH_CUT */ "cut", /* WINED3DSIH_DCL */ "dcl", + /* WINED3DSIH_DCL_CONSTANT_BUFFER */ "dcl_constantBuffer", /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ "dcl_inputPrimitive", /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ "dcl_outputTopology", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", @@ -1367,6 +1368,12 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe TRACE(" "); shader_dump_dst_param(&ins.declaration.semantic.reg, &shader_version); } + else if (ins.handler_idx == WINED3DSIH_DCL_CONSTANT_BUFFER) + { + TRACE("%s ", shader_opcode_names[ins.handler_idx]); + shader_dump_src_param(&ins.declaration.src, &shader_version); + TRACE(", %s", ins.flags & WINED3DSI_INDEXED_DYNAMIC ? "dynamicIndexed" : "immediateIndexed"); + } else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PRIMITIVE || ins.handler_idx == WINED3DSIH_DCL_OUTPUT_TOPOLOGY) { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f50fd76..cd93fb3 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -32,6 +32,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_PRIMITIVE_TYPE_SHIFT 11 #define WINED3D_SM4_PRIMITIVE_TYPE_MASK (0x7 << WINED3D_SM4_PRIMITIVE_TYPE_SHIFT) +#define WINED3D_SM4_INDEX_TYPE_SHIFT 11 +#define WINED3D_SM4_INDEX_TYPE_MASK (0x1 << WINED3D_SM4_INDEX_TYPE_SHIFT) + #define WINED3D_SM4_OPCODE_MASK 0xff #define WINED3D_SM4_REGISTER_MODIFIER (1 << 31) @@ -102,6 +105,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, WINED3D_SM4_OP_XOR = 0x57, + WINED3D_SM4_OP_DCL_CONSTANT_BUFFER = 0x59, WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY = 0x5c, WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE = 0x5d, WINED3D_SM4_OP_DCL_VERTICES_OUT = 0x5e, @@ -222,6 +226,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, "U", "UU"}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, "F", "U"}, {WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, "U", "UU"}, + {WINED3D_SM4_OP_DCL_CONSTANT_BUFFER, WINED3DSIH_DCL_CONSTANT_BUFFER, "", ""}, {WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY, WINED3DSIH_DCL_OUTPUT_TOPOLOGY, "", ""}, {WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE, WINED3DSIH_DCL_INPUT_PRIMITIVE, "", ""}, {WINED3D_SM4_OP_DCL_VERTICES_OUT, WINED3DSIH_DCL_VERTICES_OUT, "", ""}, @@ -592,7 +597,14 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi FIXME("Skipping modifier 0x%08x.\n", modifier); } - if (opcode == WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY) + if (opcode == WINED3D_SM4_OP_DCL_CONSTANT_BUFFER) + { + shader_sm4_read_src_param(priv, &p, WINED3D_DATA_FLOAT, + &ins->declaration.src, NULL); + if (opcode_token & WINED3D_SM4_INDEX_TYPE_MASK) + ins->flags |= WINED3DSI_INDEXED_DYNAMIC; + } + else if (opcode == WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY) { enum wined3d_sm4_output_primitive_type primitive_type; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6db495f..b14e85d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -374,8 +374,9 @@ enum wined3d_shader_dst_modifier }; /* Undocumented opcode control to identify projective texture lookups in ps 2.0 and later */ -#define WINED3DSI_TEXLD_PROJECT 1 -#define WINED3DSI_TEXLD_BIAS 2 +#define WINED3DSI_TEXLD_PROJECT 0x1 +#define WINED3DSI_TEXLD_BIAS 0x2 +#define WINED3DSI_INDEXED_DYNAMIC 0x4 enum wined3d_shader_rel_op { @@ -439,6 +440,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_CRS, WINED3DSIH_CUT, WINED3DSIH_DCL, + WINED3DSIH_DCL_CONSTANT_BUFFER, WINED3DSIH_DCL_INPUT_PRIMITIVE, WINED3DSIH_DCL_OUTPUT_TOPOLOGY, WINED3DSIH_DCL_VERTICES_OUT, @@ -670,6 +672,7 @@ struct wined3d_shader_instruction { struct wined3d_shader_semantic semantic; enum wined3d_primitive_type primitive_type; + struct wined3d_shader_src_param src; UINT count; } declaration; };

1 0

← Newer
1
...
87
88
89
90
91
92
93
...
96
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 October 2012