October 2012 - Wine-Commits

Piotr Caban : msvcp90: Convert characters to unsigned char before passing them to functions operating on integers .
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 4a566ed3d6acd8a6e18eeaeb41d55d0f793029de URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a566ed3d6acd8a6e18eeaeb4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 23 18:11:06 2012 +0200 msvcp90: Convert characters to unsigned char before passing them to functions operating on integers. --- dlls/msvcp90/ios.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a3c44f2..c577f77 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -1055,7 +1055,7 @@ int __thiscall basic_streambuf_char_uflow(basic_streambuf_char *this) if(call_basic_streambuf_char_underflow(this)==EOF) return EOF; - ret = **this->prpos; + ret = (unsigned char)**this->prpos; (*this->prsize)--; (*this->prpos)++; return ret; @@ -1393,10 +1393,10 @@ int __thiscall basic_streambuf_char_sputbackc(basic_streambuf_char *this, char c if(*this->prpos && *this->prpos>*this->prbuf && (*this->prpos)[-1]==ch) { (*this->prsize)++; (*this->prpos)--; - return ch; + return (unsigned char)ch; } - return call_basic_streambuf_char_pbackfail(this, ch); + return call_basic_streambuf_char_pbackfail(this, (unsigned char)ch); } /* ?sputc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAEHD(a)Z */ @@ -1407,7 +1407,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? (*basic_streambuf_char__Pninc(this) = ch) : - call_basic_streambuf_char_overflow(this, ch); + call_basic_streambuf_char_overflow(this, (unsigned char)ch); } /* ?sungetc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAEHXZ */ @@ -1419,7 +1419,7 @@ int __thiscall basic_streambuf_char_sungetc(basic_streambuf_char *this) if(*this->prpos && *this->prpos>*this->prbuf) { (*this->prsize)++; (*this->prpos)--; - return **this->prpos; + return (unsigned char)**this->prpos; } return call_basic_streambuf_char_pbackfail(this, EOF); @@ -1444,7 +1444,7 @@ int __thiscall basic_streambuf_char_sbumpc(basic_streambuf_char *this) { TRACE("(%p)\n", this); return basic_streambuf_char__Gnavail(this) ? - *basic_streambuf_char__Gninc(this) : call_basic_streambuf_char_uflow(this); + (int)(unsigned char)*basic_streambuf_char__Gninc(this) : call_basic_streambuf_char_uflow(this); } /* ?sgetc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAEHXZ */ @@ -1454,7 +1454,7 @@ int __thiscall basic_streambuf_char_sgetc(basic_streambuf_char *this) { TRACE("(%p)\n", this); return basic_streambuf_char__Gnavail(this) ? - *basic_streambuf_char_gptr(this) : call_basic_streambuf_char_underflow(this); + (int)(unsigned char)*basic_streambuf_char_gptr(this) : call_basic_streambuf_char_underflow(this); } /* ?snextc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAEHXZ */ @@ -1465,7 +1465,7 @@ int __thiscall basic_streambuf_char_snextc(basic_streambuf_char *this) TRACE("(%p)\n", this); if(basic_streambuf_char__Gnavail(this) > 1) - return *basic_streambuf_char__Gnpreinc(this); + return (unsigned char)*basic_streambuf_char__Gnpreinc(this); return basic_streambuf_char_sbumpc(this)==EOF ? EOF : basic_streambuf_char_sgetc(this); } @@ -1502,7 +1502,7 @@ streamsize __thiscall basic_streambuf_char_xsputn(basic_streambuf_char *this, co *this->pwpos += chunk; *this->pwsize -= chunk; copied += chunk; - }else if(call_basic_streambuf_char_overflow(this, ptr[copied]) != EOF) { + }else if(call_basic_streambuf_char_overflow(this, (unsigned char)ptr[copied]) != EOF) { copied++; }else { break; @@ -2714,7 +2714,7 @@ int __thiscall basic_filebuf_char_pbackfail(basic_filebuf_char *this, int c) return EOF; if(basic_streambuf_char_gptr(&this->base)>basic_streambuf_char_eback(&this->base) - && (c==EOF || basic_streambuf_char_gptr(&this->base)[-1]==(char)c)) { + && (c==EOF || (int)(unsigned char)basic_streambuf_char_gptr(&this->base)[-1]==c)) { basic_streambuf_char__Gndec(&this->base); return c==EOF ? !c : c; }else if(c!=EOF && !this->cvt) { @@ -2739,7 +2739,7 @@ int __thiscall basic_filebuf_char_uflow(basic_filebuf_char *this) return EOF; if(basic_streambuf_char_gptr(&this->base) < basic_streambuf_char_egptr(&this->base)) - return *basic_streambuf_char__Gninc(&this->base); + return (unsigned char)*basic_streambuf_char__Gninc(&this->base); c = fgetc(this->file); if(!this->cvt || c==EOF) @@ -2764,7 +2764,7 @@ int __thiscall basic_filebuf_char_uflow(basic_filebuf_char *this) ungetc(buf[i], this->file); return ch; case CODECVT_noconv: - return buf[0]; + return (unsigned char)buf[0]; default: return EOF; } @@ -2784,7 +2784,7 @@ int __thiscall basic_filebuf_char_underflow(basic_filebuf_char *this) TRACE("(%p)\n", this); if(basic_streambuf_char_gptr(&this->base) < basic_streambuf_char_egptr(&this->base)) - return *basic_streambuf_char_gptr(&this->base); + return (unsigned char)*basic_streambuf_char_gptr(&this->base); ret = call_basic_streambuf_char_uflow(&this->base); if(ret != EOF) @@ -3312,7 +3312,7 @@ unsigned short __thiscall basic_filebuf_wchar_pbackfail(basic_filebuf_wchar *thi return WEOF; if(basic_streambuf_wchar_gptr(&this->base)>basic_streambuf_wchar_eback(&this->base) - && (c==WEOF || basic_streambuf_wchar_gptr(&this->base)[-1]==(wchar_t)c)) { + && (c==WEOF || basic_streambuf_wchar_gptr(&this->base)[-1]==c)) { basic_streambuf_wchar__Gndec(&this->base); return c==WEOF ? !c : c; }else if(c!=WEOF && !this->cvt) { @@ -3784,7 +3784,7 @@ int __thiscall basic_stringbuf_char_underflow(basic_stringbuf_char *this) basic_streambuf_char_setg(&this->base, basic_streambuf_char_eback(&this->base), cur, this->seekhigh); if(cur < this->seekhigh) - return *cur; + return (unsigned char)*cur; return EOF; } @@ -7444,7 +7444,7 @@ DEFINE_THISCALL_WRAPPER(basic_istream_char_getline_delim, 16) basic_istream_char* __thiscall basic_istream_char_getline_delim(basic_istream_char *this, char *str, streamsize count, char delim) { basic_ios_char *base = basic_istream_char_get_basic_ios(this); - int ch = delim; + int ch = (unsigned char)delim; TRACE("(%p %p %ld %c)\n", this, str, count, delim); @@ -7456,7 +7456,7 @@ basic_istream_char* __thiscall basic_istream_char_getline_delim(basic_istream_ch while(count > 1) { ch = basic_streambuf_char_sbumpc(strbuf); - if(ch==EOF || ch==delim) + if(ch==EOF || ch==(unsigned char)delim) break; *str++ = ch; @@ -7464,12 +7464,12 @@ basic_istream_char* __thiscall basic_istream_char_getline_delim(basic_istream_ch count--; } - if(ch == delim) + if(ch == (unsigned char)delim) this->count++; else if(ch != EOF) { ch = basic_streambuf_char_sgetc(strbuf); - if(ch == delim) { + if(ch == (unsigned char)delim) { basic_streambuf_char__Gninc(strbuf); this->count++; } @@ -7478,7 +7478,7 @@ basic_istream_char* __thiscall basic_istream_char_getline_delim(basic_istream_ch basic_istream_char_sentry_destroy(this); basic_ios_char_setstate(base, (ch==EOF ? IOSTATE_eofbit : IOSTATE_goodbit) | - (!this->count || (ch!=delim && ch!=EOF) ? IOSTATE_failbit : IOSTATE_goodbit)); + (!this->count || (ch!=(unsigned char)delim && ch!=EOF) ? IOSTATE_failbit : IOSTATE_goodbit)); if(count > 0) *str = 0; return this; @@ -8128,7 +8128,7 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( basic_istream_char *istream, basic_string_char *str, char delim) { IOSB_iostate state = IOSTATE_failbit; - int c = delim; + int c = (unsigned char)delim; TRACE("(%p %p %c)\n", istream, str, delim); @@ -8139,7 +8139,7 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( if(c != EOF) state = IOSTATE_goodbit; - for(; c!=delim && c!=EOF; c = basic_istream_char_get(istream)) { + for(; c!=(unsigned char)delim && c!=EOF; c = basic_istream_char_get(istream)) { state = IOSTATE_goodbit; MSVCP_basic_string_char_append_ch(str, c); }

1 0

Piotr Caban : msvcp: Sync implementations.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: a26119d21d93c214331b17d640d05cc3bef8e0e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26119d21d93c214331b17d64… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 23 18:12:06 2012 +0200 msvcp: Sync implementations. --- dlls/msvcp100/ios.c | 42 +++++++++++++++++++++--------------------- dlls/msvcp60/ios.c | 44 ++++++++++++++++++++++---------------------- dlls/msvcp71/ios.c | 44 ++++++++++++++++++++++---------------------- 3 files changed, 65 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a26119d21d93c214331b1…

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DVOLUMETEXTURE9.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 80382486aa65d41b170473f02698b943da4a60f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80382486aa65d41b170473f02… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 21:01:08 2012 +0200 d3dx9: Avoid LPDIRECT3DVOLUMETEXTURE9. --- dlls/d3dx9_36/texture.c | 15 +---- include/d3dx9tex.h | 162 +++++++++++----------------------------------- 2 files changed, 42 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80382486aa65d41b17047…

1 0

Henri Verbeet : d3d10: Implement D3D10DisassembleShader().
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: cb876cdb97df011b87c527550a5129cac63631c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb876cdb97df011b87c527550… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 21:01:04 2012 +0200 d3d10: Implement D3D10DisassembleShader(). --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/shader.c | 9 +++++++++ include/d3d10shader.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 9f6210b..1e6eb36 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -7,7 +7,7 @@ @ stub D3D10CreateEffectPoolFromMemory @ stdcall D3D10CreateStateBlock(ptr ptr ptr) @ stub D3D10DisassembleEffect -@ stub D3D10DisassembleShader +@ stdcall D3D10DisassembleShader(ptr long long ptr ptr) @ stdcall D3D10GetGeometryShaderProfile(ptr) @ stdcall D3D10GetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob @ stdcall D3D10GetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c index 499da12..864f21f 100644 --- a/dlls/d3d10/shader.c +++ b/dlls/d3d10/shader.c @@ -147,3 +147,12 @@ HRESULT WINAPI D3D10CompileShader(const char *data, SIZE_T data_size, const char return D3DCompile(data, data_size, filename, defines, include, entrypoint, profile, flags, 0, shader, error_messages); } + +HRESULT WINAPI D3D10DisassembleShader(const void *data, SIZE_T data_size, + BOOL color_code, const char *comments, ID3D10Blob **disassembly) +{ + TRACE("data %p, data_size %#lx, color_code %#x, comments %p, disassembly %p.\n", + data, data_size, color_code, comments, disassembly); + + return D3DDisassemble(data, data_size, color_code ? D3D_DISASM_ENABLE_COLOR_CODE : 0, comments, disassembly); +} diff --git a/include/d3d10shader.h b/include/d3d10shader.h index af32539..06b4c3e 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -214,6 +214,8 @@ extern "C" { HRESULT WINAPI D3D10CompileShader(LPCSTR data, SIZE_T data_size, LPCSTR filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, LPCSTR entrypoint, LPCSTR profile, UINT flags, ID3D10Blob **shader, ID3D10Blob **error_messages); +HRESULT WINAPI D3D10DisassembleShader(const void *data, SIZE_T data_size, + BOOL color_code, const char *comments, ID3D10Blob **disassembly); LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device);

1 0

Piotr Caban : msvcrt: Fixed _ungetwc implementation.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 39345a1b15ed4870b5ce49fbdf877ad226c836f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39345a1b15ed4870b5ce49fbd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 23 18:09:48 2012 +0200 msvcrt: Fixed _ungetwc implementation. --- dlls/msvcrt/file.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d9ce987..185b1e2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3995,9 +3995,12 @@ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) MSVCRT_wint_t CDECL MSVCRT_ungetwc(MSVCRT_wint_t wc, MSVCRT_FILE * file) { MSVCRT_wchar_t mwc = wc; - char * pp = (char *)&mwc; + unsigned char * pp = (unsigned char *)&mwc; int i; + if (wc == MSVCRT_WEOF) + return MSVCRT_WEOF; + MSVCRT__lock_file(file); for(i=sizeof(MSVCRT_wchar_t)-1;i>=0;i--) { if(pp[i] != MSVCRT_ungetc(pp[i],file)) {

1 0

Jason Edmeades : cmd: Add support for usebackq (for /f).
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 9171fd145438072d60effda0709b17ddb89437a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9171fd145438072d60effda07… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Oct 22 22:22:28 2012 +0100 cmd: Add support for usebackq (for /f). --- programs/cmd/batch.c | 1 + programs/cmd/builtins.c | 108 ++++++++++++++++++++--------- programs/cmd/tests/test_builtins.cmd | 14 +++- programs/cmd/tests/test_builtins.cmd.exp | 4 + 4 files changed, 90 insertions(+), 37 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 02d1fcf..1c0bc24 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -113,6 +113,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, BOOL called, WCHAR *startLabel, HA HeapFree(GetProcessHeap(), 0, context->batchfileW); LocalFree (context); if ((prev_context != NULL) && (!called)) { + WINE_TRACE("Batch completed, but was not 'called' so skipping outer batch too\n"); prev_context -> skip_rest = TRUE; context = prev_context; } diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 6ecadac..6e252fe 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1583,7 +1583,7 @@ static BOOL WCMD_parse_forf_options(WCHAR *options, WCHAR *eol, int *skip, usebackqW, sizeof(usebackqW)/sizeof(WCHAR)) == CSTR_EQUAL) { *usebackq = TRUE; pos = pos + sizeof(usebackqW)/sizeof(WCHAR); - WINE_FIXME("Found usebackq\n"); + WINE_TRACE("Found usebackq\n"); /* Save the supplied delims. Slightly odd as space can be a delimiter but only if you finish the optionsroot string with delims= otherwise the space is @@ -1727,6 +1727,67 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, } /************************************************************************** + * WCMD_forf_getinputhandle + * + * Return a file handle which can be used for reading the input lines, + * either to a specific file (which may be quote delimited as we have to + * read the parameters in raw mode) or to a command which we need to + * execute. The command being executed runs in its own shell and stores + * its data in a temporary file. + * + * Parameters: + * usebackq [I] - Indicates whether usebackq is in effect or not + * itemStr [I] - The item to be handled, either a filename or + * whole command string to execute + * iscmd [I] - Identifies whether this is a command or not + * + * Returns a file handle which can be used to read the input lines from. + */ +HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd) { + WCHAR temp_str[MAX_PATH]; + WCHAR temp_file[MAX_PATH]; + WCHAR temp_cmd[MAXSTRING]; + HANDLE hinput = INVALID_HANDLE_VALUE; + static const WCHAR redirOutW[] = {'>','%','s','\0'}; + static const WCHAR cmdW[] = {'C','M','D','\0'}; + static const WCHAR cmdslashcW[] = {'C','M','D','.','E','X','E',' ', + '/','C',' ','"','%','s','"','\0'}; + + /* Remove leading and trailing character */ + if ((iscmd && (itemstr[0] == '`' && usebackq)) || + (iscmd && (itemstr[0] == '\'' && !usebackq)) || + (!iscmd && (itemstr[0] == '"' && usebackq))) + { + itemstr[strlenW(itemstr)-1] = 0x00; + itemstr++; + } + + if (iscmd) { + /* Get temp filename */ + GetTempPathW(sizeof(temp_str)/sizeof(WCHAR), temp_str); + GetTempFileNameW(temp_str, cmdW, 0, temp_file); + + /* Redirect output to the temporary file */ + wsprintfW(temp_str, redirOutW, temp_file); + wsprintfW(temp_cmd, cmdslashcW, itemstr); + WINE_TRACE("Issuing '%s' with redirs '%s'\n", + wine_dbgstr_w(temp_cmd), wine_dbgstr_w(temp_str)); + WCMD_execute (temp_cmd, temp_str, NULL, NULL, NULL, FALSE); + + /* Open the file, read line by line and process */ + hinput = CreateFileW(temp_file, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, NULL); + + } else { + /* Open the file, read line by line and process */ + WINE_TRACE("Reading input to parse from '%s'\n", wine_dbgstr_w(itemstr)); + hinput = CreateFileW(itemstr, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + } + return hinput; +} + +/************************************************************************** * WCMD_for * * Batch file loop processing. @@ -1764,7 +1825,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { int forf_skip = 0; WCHAR forf_delims[256]; WCHAR forf_tokens[MAXSTRING]; - BOOL forf_usebackq; + BOOL forf_usebackq = FALSE; /* Handle optional qualifiers (multiple are allowed) */ WCHAR *thisArg = WCMD_parameter(p, parameterNo++, NULL, NULL, FALSE, FALSE); @@ -1974,41 +2035,25 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* else ignore them! */ /* Filesets - either a list of files, or a command to run and parse the output */ - } else if (doFileset && *itemStart != '"') { + } else if (doFileset && ((!forf_usebackq && *itemStart != '"') || + (forf_usebackq && *itemStart != '\''))) { HANDLE input; - WCHAR temp_file[MAX_PATH]; WINE_TRACE("Processing for filespec from item %d '%s'\n", itemNum, wine_dbgstr_w(item)); /* If backquote or single quote, we need to launch that command and parse the results - use a temporary file */ - if (*itemStart == '`' || *itemStart == '\'') { - - WCHAR temp_path[MAX_PATH], temp_cmd[MAXSTRING]; - static const WCHAR redirOut[] = {'>','%','s','\0'}; - static const WCHAR cmdW[] = {'C','M','D','\0'}; - - /* Remove trailing character */ - itemStart[strlenW(itemStart)-1] = 0x00; + if ((forf_usebackq && *itemStart == '`') || + (!forf_usebackq && *itemStart == '\'')) { - /* Get temp filename */ - GetTempPathW(sizeof(temp_path)/sizeof(WCHAR), temp_path); - GetTempFileNameW(temp_path, cmdW, 0, temp_file); - - /* Execute program and redirect output */ - wsprintfW(temp_cmd, redirOut, (itemStart+1), temp_file); - WCMD_execute (itemStart, temp_cmd, NULL, NULL, NULL, FALSE); - - /* Open the file, read line by line and process */ - input = CreateFileW(temp_file, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + /* Use itemstart because the command is the whole set, not just the first token */ + input = WCMD_forf_getinputhandle(forf_usebackq, itemStart, TRUE); } else { - /* Open the file, read line by line and process */ - input = CreateFileW(item, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + /* Use item because the file to process is just the first item in the set */ + input = WCMD_forf_getinputhandle(forf_usebackq, item, FALSE); } /* Process the input file */ @@ -2020,8 +2065,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { } else { - WCHAR buffer[MAXSTRING]; - + /* Read line by line until end of file */ while (WCMD_fgets(buffer, sizeof(buffer)/sizeof(WCHAR), input)) { WCMD_parse_line(cmdStart, firstCmd, &cmdEnd, variable, buffer, &doExecuted, &forf_skip, forf_eol); @@ -2030,13 +2074,9 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { CloseHandle (input); } - /* Delete the temporary file */ - if (*itemStart == '`' || *itemStart == '\'') { - DeleteFileW(temp_file); - } - /* Filesets - A string literal */ - } else if (doFileset && *itemStart == '"') { + } else if (doFileset && ((!forf_usebackq && *itemStart == '"') || + (forf_usebackq && *itemStart == '\''))) { /* Copy the item away from the global buffer used by WCMD_parameter */ strcpyW(buffer, item); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 11b5dbd..acd5a44 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1147,9 +1147,17 @@ echo.>> bar echo kkk>>bar for /f %%k in (foo bar) do echo %%k for /f %%k in (bar foo) do echo %%k -rem echo ------ command argument -rem Not implemented on NT4 -rem FIXME: Not testable right now in wine: not implemented and would need +echo ------ command argument +rem Not implemented on NT4, need to skip it as no way to get output otherwise +if "%CD%"=="" goto :SkipFORFcmdNT4 +for /f %%i in ('echo.Passed1') do echo %%i +for /f "usebackq" %%i in (`echo.Passed2`) do echo %%i +for /f usebackq %%i in (`echo.Passed3`) do echo %%i +goto :ContinueFORF +:SkipFORFcmdNT4 +for /l %%i in (1,1,3) do echo Missing functionality - Broken%%i +:ContinueFORF +rem FIXME: Rest not testable right now in wine: not implemented and would need rem preliminary grep-like program implementation (e.g. like findstr or fc) even rem for a simple todo_wine test rem (for /f "usebackq" %%i in (`echo z a b`) do echo %%i) || echo not supported diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8980c1b..66820be 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -809,6 +809,10 @@ kkk a b c +------ command argument +Passed1(a)or_broken@Missing functionality - Broken1 +Passed2(a)or_broken@Missing functionality - Broken2 +Passed3(a)or_broken@Missing functionality - Broken3 ------ eol option and(a)or_broken@Broken NT4 functionality1 Line(a)or_broken@Broken NT4 functionality2

1 0

Christian Costa : d3dxof: Fix remaining 'objects.txt' filename.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 82dd739064bea6732c44f81fdf6309d8c206d5b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82dd739064bea6732c44f81fd… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 23 23:14:34 2012 +0200 d3dxof: Fix remaining 'objects.txt' filename. --- dlls/d3dxof/tests/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 182bf33..9ff76b2 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -756,7 +756,7 @@ static void test_dump(void) hr = IDirectXFile_RegisterTemplates(lpDirectXFile, pvData, cbSize); ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); - hr = IDirectXFile_CreateEnumObject(lpDirectXFile, (LPVOID)"objects.txt", DXFILELOAD_FROMFILE, &lpDirectXFileEnumObject); + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, (LPVOID)"objects.x", DXFILELOAD_FROMFILE, &lpDirectXFileEnumObject); ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); while (SUCCEEDED(hr = IDirectXFileEnumObject_GetNextDataObject(lpDirectXFileEnumObject, &lpDirectXFileData)))

1 0

Jason Edmeades : cmd: Implement support for for /f eol=c option.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 293da2d06cd6f161953a5797df279f832ae604c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=293da2d06cd6f161953a5797d… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Oct 22 01:00:11 2012 +0100 cmd: Implement support for for /f eol=c option. --- programs/cmd/builtins.c | 22 ++++++++++++---------- programs/cmd/tests/test_builtins.cmd | 11 +++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 775bea0..6ecadac 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1565,7 +1565,7 @@ static BOOL WCMD_parse_forf_options(WCHAR *options, WCHAR *eol, int *skip, eolW, sizeof(eolW)/sizeof(WCHAR)) == CSTR_EQUAL) { *eol = *(pos + sizeof(eolW)/sizeof(WCHAR)); pos = pos + sizeof(eolW)/sizeof(WCHAR) + 1; - WINE_FIXME("Found eol as %c(%x)\n", *eol, *eol); + WINE_TRACE("Found eol as %c(%x)\n", *eol, *eol); /* Save number of lines to skip (Can be in base 10, hex (0x...) or octal (0xx) */ } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, @@ -1680,7 +1680,7 @@ static void WCMD_add_dirstowalk(DIRECTORY_STACK *dirsToWalk) { * WCMD_parse_line * * When parsing file or string contents (for /f), once the string to parse - * hase been identified, handle the various options and call the do part + * has been identified, handle the various options and call the do part * if appropriate. * * Parameters: @@ -1693,14 +1693,16 @@ static void WCMD_add_dirstowalk(DIRECTORY_STACK *dirsToWalk) { * buffer [I] - The string to parse * doExecuted [O] - Set to TRUE if the DO is ever executed once * forf_skip [I/O] - How many lines to skip first + * forf_eol [I] - The 'end of line' (comment) character */ -static void WCMD_parse_line(CMD_LIST *cmdStart, +static void WCMD_parse_line(CMD_LIST *cmdStart, const WCHAR *firstCmd, - CMD_LIST **cmdEnd, + CMD_LIST **cmdEnd, const WCHAR *variable, - WCHAR *buffer, - BOOL *doExecuted, - int *forf_skip) { + WCHAR *buffer, + BOOL *doExecuted, + int *forf_skip, + WCHAR forf_eol) { WCHAR *parm, *where; @@ -1715,7 +1717,7 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, WINE_TRACE("Parsed parameter: %s from %s\n", wine_dbgstr_w(parm), wine_dbgstr_w(buffer)); - if (where) { + if (where && where[0] != forf_eol) { CMD_LIST *thisCmdStart = cmdStart; *doExecuted = TRUE; WCMD_part_execute(&thisCmdStart, firstCmd, variable, parm, FALSE, TRUE); @@ -2022,7 +2024,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { while (WCMD_fgets(buffer, sizeof(buffer)/sizeof(WCHAR), input)) { WCMD_parse_line(cmdStart, firstCmd, &cmdEnd, variable, buffer, &doExecuted, - &forf_skip); + &forf_skip, forf_eol); buffer[0] = 0; } CloseHandle (input); @@ -2039,7 +2041,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Copy the item away from the global buffer used by WCMD_parameter */ strcpyW(buffer, item); WCMD_parse_line(cmdStart, firstCmd, &cmdEnd, variable, buffer, &doExecuted, - &forf_skip); + &forf_skip, forf_eol); } WINE_TRACE("Post-command, cmdEnd = %p\n", cmdEnd); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 1f9ce95..11b5dbd 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1155,6 +1155,17 @@ rem for a simple todo_wine test rem (for /f "usebackq" %%i in (`echo z a b`) do echo %%i) || echo not supported rem (for /f usebackq %%i in (`echo z a b`) do echo %%i) || echo not supported echo ------ eol option +if "%CD%"=="" goto :SkipFORFeolNT4 +echo Line one>foo +echo and Line two>>foo +echo Line three>>foo +for /f "eol=L" %%i in (foo) do echo %%i +for /f "eol=a" %%i in (foo) do echo %%i +del foo +goto :ContinueFORFeol +:SkipFORFeolNT4 +for /l %%i in (1,1,3) do echo Broken NT4 functionality%%i +:ContinueFORFeol for /f "eol=@" %%i in (" ad") do echo %%i for /f "eol=@" %%i in (" z(a)y") do echo %%i for /f "eol=|" %%i in ("a|d") do echo %%i diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index f1194a6..8980c1b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -810,6 +810,9 @@ a b c ------ eol option +and(a)or_broken@Broken NT4 functionality1 +Line(a)or_broken@Broken NT4 functionality2 +Line(a)or_broken@Broken NT4 functionality3 @todo_wine(a)ad @todo_wine(a)z@y a|d

1 0

Daniel Lehman : msvcp90: Set failbit at end of istream<>::sentry::_Ipfx.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: d6e86edb990947af81deb583be11a43bead17bb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e86edb990947af81deb583b… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Sep 27 15:33:33 2012 -0700 msvcp90: Set failbit at end of istream<>::sentry::_Ipfx. --- dlls/msvcp100/ios.c | 79 ++++++++++++++++--------------- dlls/msvcp60/ios.c | 75 +++++++++++++++-------------- dlls/msvcp71/ios.c | 75 +++++++++++++++-------------- dlls/msvcp90/ios.c | 75 +++++++++++++++-------------- dlls/msvcp90/tests/ios.c | 118 ++++++++++++++++++++++++++++++++++++++-------- 5 files changed, 256 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6e86edb990947af81deb…

1 0

Francois Gouget : testbot/VMs: Remove some redundant VM log messages.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: tools Branch: master Commit: 8b7730c8c5a7757c0890483cb366d095b1704e3e URL: http://source.winehq.org/git/tools.git/?a=commit;h=8b7730c8c5a7757c0890483c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 24 12:15:33 2012 +0200 testbot/VMs: Remove some redundant VM log messages. The general principle is that traces should be generated by the tools, not by the Perl modules. --- testbot/bin/Engine.pl | 2 +- testbot/bin/RevertVM.pl | 7 ++++--- testbot/lib/WineTestBot/VMs.pm | 4 ---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index d504a50..f453927 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -433,7 +433,7 @@ sub HandleGetScreenshot my ($ErrMessage, $ImageSize, $ImageBytes) = $VM->CaptureScreenImage(); if (defined($ErrMessage)) { - LogMsg "Screenshot failed: $ErrMessage\n"; + LogMsg "Failed to take screenshot of $VMName: $ErrMessage\n"; return "0$ErrMessage"; } diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index d7b262e..fbf479f 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -71,8 +71,6 @@ if (! $VMKey) die "Usage: RevertVM.pl VMName"; } -LogMsg "Revert of $VMKey started\n"; - my $VMs = CreateVMs(); my $VM = $VMs->GetItem($VMKey); if (! defined($VM)) @@ -80,6 +78,7 @@ if (! defined($VM)) FatalError "VM $VMKey doesn't exist"; } +LogMsg "Reverting $VMKey to ", $VM->IdleSnapshot, "\n"; $VM->Status("reverting"); my ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) @@ -103,7 +102,8 @@ if (defined($ErrMessage)) foreach my $WaitCount (1..3) { - $ErrMessage = $VM->WaitForToolsInGuest(); + LogMsg "Waiting for ", $VM->Name, " (up to ${WaitForToolsInVM}s)\n"; + $ErrMessage = $VM->WaitForToolsInGuest($WaitForToolsInVM); if (! defined($ErrMessage)) { last; @@ -116,6 +116,7 @@ if (defined($ErrMessage)) if ($SleepAfterRevert != 0) { + LogMsg "Letting ", $VM->Name, " settle for ${SleepAfterRevert}s\n"; sleep($SleepAfterRevert); } diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2b4786e..6dc8b8a 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -195,7 +195,6 @@ use WineTestBot::Config; use WineTestBot::Engine::Notify; use WineTestBot::TestAgent; use WineTestBot::WineTestBotObjects; -use WineTestBot::Log; use vars qw (@ISA @EXPORT); @@ -284,7 +283,6 @@ sub _GetSnapshot($$) sub RevertToSnapshot($$) { my ($self, $SnapshotName) = @_; - LogMsg("Reverting ", $self->VirtDomain, " to $SnapshotName\n"); my ($ErrMessage, $Domain, $Snapshot) = $self->_GetSnapshot($SnapshotName); return $ErrMessage if (defined $ErrMessage); @@ -351,7 +349,6 @@ sub WaitForToolsInGuest($;$) my ($self, $Timeout) = @_; $Timeout ||= $WaitForToolsInVM; - LogMsg("Waiting for ", $self->Name, " (up to ${Timeout}s)\n"); my ($Status, $Err) = TestAgent::GetStatus($self->Hostname, $Timeout); # In fact we don't care about the status return $Err; @@ -389,7 +386,6 @@ sub _Stream2Image($$$) sub CaptureScreenImage($) { my ($self) = @_; - LogMsg("CaptureScreenImage ", $self->Name, "\n"); my ($ErrMessage, $Domain) = $self->_GetDomain(); return ($ErrMessage, undef, undef) if (defined $ErrMessage);

1 0