August 2011 - Wine-Commits - list.winehq.org

Frédéric Delanoy : cmd/tests: Add basic cd tests.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 6bd0671f074cb643a1072625bae572d4a6bb9331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd0671f074cb643a1072625b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:59:00 2011 +0200 cmd/tests: Add basic cd tests. --- programs/cmd/tests/test_builtins.cmd | 32 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 13 ++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index ffbc814..c640ec4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -244,6 +244,38 @@ if exist bar6 ( del bar6 ) +echo ------------ Testing cd ------------ +mkdir foobar +cd foobar +echo blabla > singleFile +dir /b +echo Current dir: %CD% +cd +cd .. +cd +cd foobar(a)space@ +cd +cd .. +cd +cd @space(a)foobar +cd +cd.. +cd +cd foobar +cd..(a)space@ +cd +if not exist foobar (cd ..) +cd foobar +mkdir "bar bak" +cd "bar bak" +cd +cd .. +cd bar bak +cd +cd ..\.. +cd +rd /Q/s foobar + echo ------------ Testing type ------------ echo bar> foobaz @echo on diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 2954e16..1580637 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -179,6 +179,19 @@ foo4 @todo_wine(a)...on failure conditional || @todo_wine(a)foo5 @todo_wine(a)foo6@space@ +------------ Testing cd ------------ +singleFile +Current dir: @pwd@\foobar(a)or_broken@Current dir:@space@ +(a)pwd@\foobar +(a)pwd@ +(a)pwd@\foobar +(a)pwd@ +(a)pwd@\foobar +(a)pwd@ +(a)todo_wine@@pwd@ +(a)pwd@\foobar\bar bak +(a)pwd@\foobar\bar bak +(a)pwd@ ------------ Testing type ------------ @pwd@>type foobaz(a)space@

1 0

Frédéric Delanoy : cmd: Rename WCMD_strtrim_leading_spaces to WCMD_skip_leading_spaces to better reflect its purpose .
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: bb47576f59260a3f13894eec311c78d3fb046876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb47576f59260a3f13894eec3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:58:58 2011 +0200 cmd: Rename WCMD_strtrim_leading_spaces to WCMD_skip_leading_spaces to better reflect its purpose. --- programs/cmd/builtins.c | 14 +++++++------- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index e738626..0e95cc3 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -186,11 +186,11 @@ void WCMD_choice (WCHAR * command) { have_console = GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &oldmode); errorlevel = 0; - my_command = WCMD_strdupW(WCMD_strtrim_leading_spaces(command)); + my_command = WCMD_strdupW(WCMD_skip_leading_spaces(command)); if (!my_command) return; - ptr = WCMD_strtrim_leading_spaces(my_command); + ptr = WCMD_skip_leading_spaces(my_command); while (*ptr == '/') { switch (toupperW(ptr[1])) { case 'C': @@ -213,19 +213,19 @@ void WCMD_choice (WCHAR * command) { if (*ptr) { /* terminate allowed chars */ *ptr = 0; - ptr = WCMD_strtrim_leading_spaces(&ptr[1]); + ptr = WCMD_skip_leading_spaces(&ptr[1]); } WINE_TRACE("answer-list: %s\n", wine_dbgstr_w(opt_c)); break; case 'N': opt_n = TRUE; - ptr = WCMD_strtrim_leading_spaces(&ptr[2]); + ptr = WCMD_skip_leading_spaces(&ptr[2]); break; case 'S': opt_s = TRUE; - ptr = WCMD_strtrim_leading_spaces(&ptr[2]); + ptr = WCMD_skip_leading_spaces(&ptr[2]); break; case 'T': @@ -252,7 +252,7 @@ void WCMD_choice (WCHAR * command) { answer[count] = 0; opt_timeout = atoiW(answer); - ptr = WCMD_strtrim_leading_spaces(ptr); + ptr = WCMD_skip_leading_spaces(ptr); break; default: @@ -1315,7 +1315,7 @@ void WCMD_give_help (WCHAR *command) { int i; - command = WCMD_strtrim_leading_spaces(command); + command = WCMD_skip_leading_spaces(command); if (strlenW(command) == 0) { WCMD_output_asis (WCMD_LoadMessage(WCMD_ALLHELP)); } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 0c7f622..1104d8e 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -96,7 +96,7 @@ int WCMD_volume (int mode, WCHAR *command); WCHAR *WCMD_fgets (WCHAR *s, int n, HANDLE stream); WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where); -WCHAR *WCMD_strtrim_leading_spaces (WCHAR *string); +WCHAR *WCMD_skip_leading_spaces (WCHAR *string); void WCMD_HandleTildaModifiers(WCHAR **start, WCHAR *forVariable, WCHAR *forValue, BOOL justFors); void WCMD_splitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2018a12..c23fefd 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -441,12 +441,12 @@ void WCMD_strsubstW(WCHAR* start, WCHAR* next, WCHAR* insert, int len) { } /*************************************************************************** - * WCMD_strtrim_leading_spaces + * WCMD_skip_leading_spaces * - * Remove leading spaces from a string. Return a pointer to the first - * non-space character. Does not modify the input string + * Return a pointer to the first non-space character of string. + * Does not modify the input string. */ -WCHAR *WCMD_strtrim_leading_spaces (WCHAR *string) { +WCHAR *WCMD_skip_leading_spaces (WCHAR *string) { WCHAR *ptr; @@ -1392,7 +1392,7 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, /* * Strip leading whitespaces, and a '@' if supplied */ - whichcmd = WCMD_strtrim_leading_spaces(cmd); + whichcmd = WCMD_skip_leading_spaces(cmd); WINE_TRACE("Command: '%s'\n", wine_dbgstr_w(cmd)); if (whichcmd[0] == '@') whichcmd++; @@ -1409,7 +1409,7 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, whichcmd, count, inbuilt[i], -1) == CSTR_EQUAL) break; } - p = WCMD_strtrim_leading_spaces (&whichcmd[count]); + p = WCMD_skip_leading_spaces (&whichcmd[count]); WCMD_parse (p, quals, param1, param2); WINE_TRACE("param1: %s, param2: %s\n", wine_dbgstr_w(param1), wine_dbgstr_w(param2));

1 0

Frédéric Delanoy : cmd: Fix a FOR parsing bug when multiple spaces follow an IN.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 303af43ff5ded3c148c7e10ab7d9b0cd18de4bdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=303af43ff5ded3c148c7e10ab… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:58:57 2011 +0200 cmd: Fix a FOR parsing bug when multiple spaces follow an IN. --- programs/cmd/builtins.c | 4 +++- programs/cmd/tests/test_builtins.cmd | 1 + programs/cmd/tests/test_builtins.cmd.exp | 1 + 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8bb84f6..e738626 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -976,7 +976,9 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { while (*curPos && *curPos==' ') curPos++; /* Ensure line continues with IN */ - if (!*curPos || lstrcmpiW (curPos, inW)) { + if (!*curPos + || CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + curPos, 3, inW, -1) != CSTR_EQUAL) { WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index a83e568..ffbc814 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -318,6 +318,7 @@ for %%i in (A B C) do echo %%j for %%i in (A B C) do call :forTestFun1 %%i for %%i in (1,4,1) do echo %%i for %%i in (A, B,C) do echo %%i +for %%i in (X) do echo %%i goto :endForTestFun1 :forTestFun1 echo %1 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7ebe57a..2954e16 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -223,6 +223,7 @@ C A B C +X ...imbricated FORs @todo_wine(a)X Y @todo_wine(a)X Y

1 0

Frédéric Delanoy : cmd: Clarify some trace messages.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 07583906078af0bef58540b684adc2f873db0e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07583906078af0bef58540b68… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:58:55 2011 +0200 cmd: Clarify some trace messages. --- programs/cmd/builtins.c | 2 +- programs/cmd/wcmdmain.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 254b2c7..8bb84f6 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1219,7 +1219,7 @@ void WCMD_part_execute(CMD_LIST **cmdList, WCHAR *firstcmd, WCHAR *variable, CMD_LIST *curPosition = *cmdList; int myDepth = (*cmdList)->bracketDepth; - WINE_TRACE("cmdList(%p), firstCmd(%p), with '%s'='%s', doIt(%d)\n", + WINE_TRACE("cmdList(%p), firstCmd(%p), with variable '%s'='%s', doIt(%d)\n", cmdList, wine_dbgstr_w(firstcmd), wine_dbgstr_w(variable), wine_dbgstr_w(value), conditionTRUE); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 0bab2d0..2018a12 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1211,7 +1211,7 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, STD_ERROR_HANDLE}; BOOL piped = FALSE; - WINE_TRACE("command on entry:%s (%p), with '%s'='%s'\n", + WINE_TRACE("command on entry:%s (%p), with forVariable '%s'='%s'\n", wine_dbgstr_w(command), cmdList, wine_dbgstr_w(forVariable), wine_dbgstr_w(forValue));

1 0

Frédéric Delanoy : cmd: Use CSTR_* instead of hardcoded values as result of CompareStringW.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: d1731eb98a2d1143fe7b7b7d58abb2c3c57a1754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1731eb98a2d1143fe7b7b7d5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:58:53 2011 +0200 cmd: Use CSTR_* instead of hardcoded values as result of CompareStringW. --- programs/cmd/builtins.c | 12 ++++++------ programs/cmd/wcmdmain.c | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 09c166f..254b2c7 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1003,7 +1003,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WINE_TRACE("Looking for 'do' in %p\n", *cmdList); if ((*cmdList == NULL) || (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - (*cmdList)->command, 3, doW, -1) != 2)) { + (*cmdList)->command, 3, doW, -1) != CSTR_EQUAL)) { WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } @@ -1277,7 +1277,7 @@ void WCMD_part_execute(CMD_LIST **cmdList, WCHAR *firstcmd, WCHAR *variable, } else { if (isIF && CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - (*cmdList)->command, 5, ifElse, -1) == 2) { + (*cmdList)->command, 5, ifElse, -1) == CSTR_EQUAL) { /* Swap between if and else processing */ processThese = !processThese; @@ -1320,7 +1320,7 @@ void WCMD_give_help (WCHAR *command) { else { for (i=0; i<=WCMD_EXIT; i++) { if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - command, -1, inbuilt[i], -1) == 2) { + command, -1, inbuilt[i], -1) == CSTR_EQUAL) { WCMD_output_asis (WCMD_LoadMessage(i)); return; } @@ -2090,7 +2090,7 @@ void WCMD_setshow_default (WCHAR *command) { /* Skip /D and trailing whitespace if on the front of the command line */ if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - command, 2, parmD, -1) == 2) { + command, 2, parmD, -1) == CSTR_EQUAL) { command += 2; while (*command && *command==' ') command++; } @@ -2262,7 +2262,7 @@ static int WCMD_setshow_sortenv(const WCHAR *s, const WCHAR *stub) for( i=0; i<count; i++ ) { if (!stub || CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - str[i], stublen, stub, -1) == 2) { + str[i], stublen, stub, -1) == CSTR_EQUAL) { /* Don't display special internal variables */ if (str[i][0] != '=') { WCMD_output_asis(str[i]); @@ -2298,7 +2298,7 @@ void WCMD_setshow_env (WCHAR *s) { /* See if /P supplied, and if so echo the prompt, and read in a reply */ if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - s, 2, parmP, -1) == 2) { + s, 2, parmP, -1) == CSTR_EQUAL) { WCHAR string[MAXSTRING]; DWORD count; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 0111c15..0bab2d0 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -597,7 +597,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR *forVar, WCHAR *forVal) { SORT_STRINGSORT, thisVar, (colonpos - thisVar) - 1, - forVar, -1) == 2)) { + forVar, -1) == CSTR_EQUAL)) { strcpyW(thisVarContents, forVal); len = strlenW(thisVarContents); @@ -817,7 +817,7 @@ static void handleExpansion(WCHAR *cmd, BOOL justFors, WCHAR *forVariable, WCHAR SORT_STRINGSORT, p, strlenW(forVariable), - forVariable, -1) == 2)) { + forVariable, -1) == CSTR_EQUAL)) { WCMD_strsubstW(p, p + strlenW(forVariable), forValue, -1); } else if (!justFors) { @@ -1828,12 +1828,12 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF /* If command starts with 'rem', ignore any &&, ( etc */ if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 4, remCmd, -1) == 2) { + curPos, 4, remCmd, -1) == CSTR_EQUAL) { inRem = TRUE; /* If command starts with 'for', handle ('s mid line after IN or DO */ } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 4, forCmd, -1) == 2) { + curPos, 4, forCmd, -1) == CSTR_EQUAL) { inFor = TRUE; /* If command starts with 'if' or 'else', handle ('s mid line. We should ensure this @@ -1843,11 +1843,11 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF echo they equal )" will be parsed wrong */ } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 3, ifCmd, -1) == 2) { + curPos, 3, ifCmd, -1) == CSTR_EQUAL) { inIf = TRUE; } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 5, ifElse, -1) == 2) { + curPos, 5, ifElse, -1) == CSTR_EQUAL) { inElse = TRUE; lastWasElse = TRUE; onlyWhiteSpace = TRUE; @@ -1861,7 +1861,7 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF is then 0, and all whitespace is skipped */ } else if (inFor && (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 3, forDO, -1) == 2)) { + curPos, 3, forDO, -1) == CSTR_EQUAL)) { WINE_TRACE("Found DO\n"); lastWasDo = TRUE; onlyWhiteSpace = TRUE; @@ -1879,7 +1879,7 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF WINE_TRACE("Found 'FOR', comparing next parm: '%s'\n", wine_dbgstr_w(curPos)); if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 3, forIN, -1) == 2) { + curPos, 3, forIN, -1) == CSTR_EQUAL) { WINE_TRACE("Found IN\n"); lastWasIn = TRUE; onlyWhiteSpace = TRUE;

1 0

Frédéric Delanoy : cmd: Remove reference to no longer existing WCMD_read_console from header file.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 822759a3675c801dae21efea383a7600606acdab URL: http://source.winehq.org/git/wine.git/?a=commit;h=822759a3675c801dae21efea3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:58:54 2011 +0200 cmd: Remove reference to no longer existing WCMD_read_console from header file. --- programs/cmd/wcmd.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 8ed7a01..0c7f622 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -76,7 +76,6 @@ void WCMD_pause (void); void WCMD_popd (void); void WCMD_print_error (void); void WCMD_pushd (WCHAR *); -int WCMD_read_console (WCHAR *string, int str_len); void WCMD_remove_dir (WCHAR *command); void WCMD_rename (void); void WCMD_run_program (WCHAR *command, int called);

1 0

Frédéric Delanoy : cmd/tests: Fix bug where an output line was marked as matching when the expected line only differs by a terminal @space@.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: bc8fde1c0003b7e753dd60bf4909ddc7d6efa4be URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc8fde1c0003b7e753dd60bf4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:58:56 2011 +0200 cmd/tests: Fix bug where an output line was marked as matching when the expected line only differs by a terminal @space(a). --- programs/cmd/tests/batch.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 3f8826f..17649d4 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -168,9 +168,13 @@ static const char *compare_line(const char *out_line, const char *out_end, const }else if(exp_ptr+sizeof(space_cmd) <= exp_end && !memcmp(exp_ptr, space_cmd, sizeof(space_cmd))) { exp_ptr += sizeof(space_cmd); - if(out_ptr < out_end && *out_ptr == ' ') + if(out_ptr < out_end && *out_ptr == ' ') { out_ptr++; - continue; + continue; + } else { + err = out_end; + } + }else if(exp_ptr+sizeof(or_broken_cmd) <= exp_end && !memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd))) { if(out_ptr == out_end)

1 0

Thomas Mullaly : msxml3/tests: Added IStream tests for IMXWriter.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: ae36cd5f35a7cb4cb77d7661b990c3f301d18e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae36cd5f35a7cb4cb77d7661b… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Aug 12 19:11:30 2011 -0400 msxml3/tests: Added IStream tests for IMXWriter. --- dlls/msxml3/tests/saxreader.c | 244 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 244 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 4e021c6..ad350db 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2,6 +2,7 @@ * XML test * * Copyright 2008 Piotr Caban + * Copyright 2011 Thomas Mullaly * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -96,6 +97,17 @@ static const WCHAR szCarriageRetTest[] = { '<','/','B','a','n','k','A','c','c','o','u','n','t','>','\0' }; +static const WCHAR szUtf16XML[] = { +'<','?','x','m','l',' ','v','e','r','s','i','o','n','=','"','1','.','0','"',' ', +'e','n','c','o','d','i','n','g','=','"','U','T','F','-','1','6','"',' ', +'s','t','a','n','d','a','l','o','n','e','=','"','n','o','"','?','>','\r','\n' +}; + +static const CHAR szUtf16BOM[] = {0xff, 0xfe}; + +static const CHAR szUtf8XML[] = +"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\r\n"; + static const CHAR szTestXML[] = "<?xml version=\"1.0\" ?>\n" "<BankAccount>\n" @@ -696,6 +708,152 @@ static const ISAXAttributesVtbl SAXAttributesVtbl = static ISAXAttributes saxattributes = { &SAXAttributesVtbl }; +typedef struct mxwriter_write_test_t { + BOOL last; + const BYTE *data; + DWORD cb; + BOOL null_written; +} mxwriter_write_test; + +typedef struct mxwriter_stream_test_t { + VARIANT_BOOL bom; + const char *encoding; + mxwriter_write_test expected_writes[4]; +} mxwriter_stream_test; + +static const mxwriter_write_test *current_write_test; +static DWORD current_stream_test_index; + +static HRESULT WINAPI istream_QueryInterface(IStream *iface, REFIID riid, void **ppvObject) +{ + *ppvObject = NULL; + + if(IsEqualGUID(riid, &IID_IStream) || IsEqualGUID(riid, &IID_IUnknown)) + *ppvObject = iface; + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI istream_AddRef(IStream *iface) +{ + return 2; +} + +static ULONG WINAPI istream_Release(IStream *iface) +{ + return 1; +} + +static HRESULT WINAPI istream_Read(IStream *iface, void *pv, ULONG cb, ULONG *pcbRead) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Write(IStream *iface, const void *pv, ULONG cb, ULONG *pcbWritten) +{ + ok(pv != NULL, "pv == NULL\n"); + + if(current_write_test->last) { + ok(0, "Too many Write calls made on test %d\n", current_stream_test_index); + return E_FAIL; + } + + ok(current_write_test->cb == cb, "Expected %d, but got %d on test %d\n", + current_write_test->cb, cb, current_stream_test_index); + + if(!pcbWritten) + ok(current_write_test->null_written, "pcbWritten was NULL on test %d\n", current_stream_test_index); + else + ok(!memcmp(current_write_test->data, pv, cb), "Unexpected data on test %d\n", current_stream_test_index); + + ++current_write_test; + + if(pcbWritten) + *pcbWritten = cb; + + return S_OK; +} + +static HRESULT WINAPI istream_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, + ULARGE_INTEGER *plibNewPosition) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_CopyTo(IStream *iface, IStream *pstm, ULARGE_INTEGER cb, + ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *plibWritten) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Commit(IStream *iface, DWORD grfCommitFlags) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Revert(IStream *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_LockRegion(IStream *iface, ULARGE_INTEGER libOffset, + ULARGE_INTEGER cb, DWORD dwLockType) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_UnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, + ULARGE_INTEGER cb, DWORD dwLockType) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Stat(IStream *iface, STATSTG *pstatstg, DWORD grfStatFlag) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Clone(IStream *iface, IStream **ppstm) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IStreamVtbl StreamVtbl = { + istream_QueryInterface, + istream_AddRef, + istream_Release, + istream_Read, + istream_Write, + istream_Seek, + istream_SetSize, + istream_CopyTo, + istream_Commit, + istream_Revert, + istream_LockRegion, + istream_UnlockRegion, + istream_Stat, + istream_Clone +}; + +static IStream mxstream = { &StreamVtbl }; + static void test_saxreader(void) { HRESULT hr; @@ -1349,6 +1507,91 @@ static void test_mxwriter_characters(void) free_bstrs(); } +static const mxwriter_stream_test mxwriter_stream_tests[] = { + { + VARIANT_TRUE,"UTF-16", + { + {FALSE,(const BYTE*)szUtf16BOM,sizeof(szUtf16BOM),TRUE}, + {FALSE,(const BYTE*)szUtf16XML,sizeof(szUtf16XML)}, + {TRUE} + } + }, + { + VARIANT_FALSE,"UTF-16", + { + {FALSE,(const BYTE*)szUtf16XML,sizeof(szUtf16XML)}, + {TRUE} + } + }, + { + VARIANT_TRUE,"UTF-8", + { + {FALSE,(const BYTE*)szUtf8XML,sizeof(szUtf8XML)-1}, + /* For some reason Windows makes an empty write call when UTF-8 encoding is used + * and the writer is released. + */ + {FALSE,NULL,0}, + {TRUE} + } + }, + { + VARIANT_TRUE,"UTF-16", + { + {FALSE,(const BYTE*)szUtf16BOM,sizeof(szUtf16BOM),TRUE}, + {FALSE,(const BYTE*)szUtf16XML,sizeof(szUtf16XML)}, + {TRUE} + } + } +}; + +static void test_mxwriter_stream(void) +{ + DWORD test_count = sizeof(mxwriter_stream_tests)/sizeof(mxwriter_stream_tests[0]); + + for(current_stream_test_index = 0; current_stream_test_index < test_count; ++current_stream_test_index) { + const mxwriter_stream_test *test = mxwriter_stream_tests+current_stream_test_index; + IMXWriter *writer; + ISAXContentHandler *content; + HRESULT hr; + VARIANT dest; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + ok(hr == S_OK, "QueryInterface(ISAXContentHandler) failed: %08x\n", hr); + + hr = IMXWriter_put_encoding(writer, _bstr_(test->encoding)); + ok(hr == S_OK, "put_encoding failed with %08x on test %d\n", hr, current_stream_test_index); + + V_VT(&dest) = VT_UNKNOWN; + V_UNKNOWN(&dest) = (IUnknown*)&mxstream; + hr = IMXWriter_put_output(writer, dest); + ok(hr == S_OK, "put_output failed with %08x on test %d\n", hr, current_stream_test_index); + VariantClear(&dest); + + hr = IMXWriter_put_byteOrderMark(writer, test->bom); + ok(hr == S_OK, "put_byteOrderMark failed with %08x on test %d\n", hr, current_stream_test_index); + + current_write_test = test->expected_writes; + + hr = ISAXContentHandler_startDocument(content); + ok(hr == S_OK, "startDocument failed with %08x on test %d\n", hr, current_stream_test_index); + + hr = ISAXContentHandler_endDocument(content); + todo_wine ok(hr == S_OK, "endDocument failed with %08x on test %d\n", hr, current_stream_test_index); + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + + todo_wine ok(current_write_test->last, "The last %d write calls on test %d were missed\n", + current_write_test-test->expected_writes, current_stream_test_index); + } + + free_bstrs(); +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -1384,6 +1627,7 @@ START_TEST(saxreader) test_mxwriter_characters(); test_mxwriter_properties(); test_mxwriter_flush(); + test_mxwriter_stream(); } else win_skip("MXXMLWriter not supported\n");

1 0

Per Johansson : winemenubuilder: Use start. exe to open URLs to respect URL handlers in registry.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 1a3b85a5bda240ef96a678781ef1a98e595932dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a3b85a5bda240ef96a678781… Author: Per Johansson <per(a)morth.org> Date: Thu Aug 11 20:21:25 2011 +0200 winemenubuilder: Use start.exe to open URLs to respect URL handlers in registry. --- programs/winemenubuilder/winemenubuilder.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 6d627cb..e6dc504 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2962,6 +2962,7 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link IPropertyStorage *pPropStg; PROPSPEC ps[2]; PROPVARIANT pv[2]; + char *start_path = NULL; if ( !link ) { @@ -3004,6 +3005,13 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link goto cleanup; } + start_path = get_start_exe_path(); + if (start_path == NULL) + { + WINE_ERR("out of memory\n"); + goto cleanup; + } + ps[0].ulKind = PRSPEC_PROPID; ps[0].u.propid = PID_IS_ICONFILE; ps[1].ulKind = PRSPEC_PROPID; @@ -3063,14 +3071,14 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link location = heap_printf("%s/%s.desktop", xdg_desktop_dir, lastEntry); if (location) { - r = !write_desktop_entry(NULL, location, lastEntry, "winebrowser", escaped_urlPath, NULL, NULL, icon_name); + r = !write_desktop_entry(NULL, location, lastEntry, start_path, escaped_urlPath, NULL, NULL, icon_name); if (r == 0) chmod(location, 0755); HeapFree(GetProcessHeap(), 0, location); } } else - r = !write_menu_entry(unix_link, link_name, "winebrowser", escaped_urlPath, NULL, NULL, icon_name); + r = !write_menu_entry(unix_link, link_name, start_path, escaped_urlPath, NULL, NULL, icon_name); ret = (r != 0); ReleaseSemaphore(hSem, 1, NULL);

1 0

Thomas Mullaly : msxml3: Added IStream support to IMXWriter.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: f1f57f236896670bb35fb9afb14cd70c759a3698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f57f236896670bb35fb9afb… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Aug 12 19:11:08 2011 -0400 msxml3: Added IStream support to IMXWriter. --- dlls/msxml3/msxml_private.h | 16 ++++ dlls/msxml3/mxwriter.c | 193 ++++++++++++++++++++++++++++++++++++---- dlls/msxml3/tests/saxreader.c | 36 ++++---- 3 files changed, 206 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1f57f236896670bb35fb…

1 0