October 2012 - Wine-Commits

Jason Edmeades : cmd: Strip quotes from for / f string before attempting to parse it.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: a45301cb939f4cfc5a574392c260184d82f35f98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a45301cb939f4cfc5a574392c… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Oct 23 21:35:05 2012 +0100 cmd: Strip quotes from for /f string before attempting to parse it. --- programs/cmd/builtins.c | 12 +++++++++++- programs/cmd/tests/test_builtins.cmd | 11 +++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 23 ++++++++++++++--------- 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 721a1b7..4bb4702 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2086,8 +2086,18 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { } else if (doFileset && ((!forf_usebackq && *itemStart == '"') || (forf_usebackq && *itemStart == '\''))) { + /* Remove leading and trailing character, ready to parse with delims= delimiters + Note that the last quote is removed from the set and the string terminates + there to mimic windows */ + WCHAR *strend = strrchrW(itemStart, forf_usebackq?'\'':'"'); + + if (strend) { + *strend = 0x00; + itemStart++; + } + /* Copy the item away from the global buffer used by WCMD_parameter */ - strcpyW(buffer, item); + strcpyW(buffer, itemStart); WCMD_parse_line(cmdStart, firstCmd, &cmdEnd, variable, buffer, &doExecuted, &forf_skip, forf_eol); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index acd5a44..bfd051b 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1111,11 +1111,22 @@ set var= echo --- for /F mkdir foobar & cd foobar echo ------ string argument +rem NT4 does not support usebackq for /F %%i in ("a b c") do echo %%i +for /f usebackq %%i in ('a b c') do echo %%i>output_file +if not exist output_file (echo no output) else (type output_file & del output_file) for /f %%i in ("a ") do echo %%i +for /f usebackq %%i in ('a ') do echo %%i>output_file +if not exist output_file (echo no output) else (type output_file & del output_file) for /f %%i in ("a") do echo %%i +for /f usebackq %%i in ('a') do echo %%i>output_file +if not exist output_file (echo no output) else (type output_file & del output_file) fOr /f %%i in (" a") do echo %%i +for /f usebackq %%i in (' a') do echo %%i>output_file +if not exist output_file (echo no output) else (type output_file & del output_file) for /f %%i in (" a ") do echo %%i +for /f usebackq %%i in (' a ') do echo %%i>output_file +if not exist output_file (echo no output) else (type output_file & del output_file) echo ------ fileset argument echo --------- basic blank handling echo a b c>foo diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 66820be..c15a58d 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -781,11 +781,16 @@ ErrorLevel 0 --- for /F ------ string argument -(a)todo_wine@a -(a)todo_wine@a a -(a)todo_wine@a -(a)todo_wine@a +a(a)or_broken@no output +a +a(a)or_broken@no output +a +a(a)or_broken@no output +a +a(a)or_broken@no output +a +a(a)or_broken@no output ------ fileset argument --------- basic blank handling a @@ -817,18 +822,18 @@ Passed3(a)or_broken@Missing functionality - Broken3 and(a)or_broken@Broken NT4 functionality1 Line(a)or_broken@Broken NT4 functionality2 Line(a)or_broken@Broken NT4 functionality3 -(a)todo_wine@ad -(a)todo_wine@z(a)y +ad +z(a)y a|d -(a)todo_wine@no output +no output @todo_wine(a)no output ------ delims option @todo_wine(a)a @todo_wine(a)a@space@ @todo_wine(a)a d -(a)todo_wine@a +a @todo_wine(a)C r -foo bar baz +(a)todo_wine@foo bar baz @todo_wine(a)c:\ ------ skip option c

1 0

Rico Schüller : wined3d: Fix return value for WINED3DFMT_ATI2N in CheckTextureCapability().
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: deae923cd8e3c9ce5bfcbaae673515c3f5074f12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deae923cd8e3c9ce5bfcbaae6… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Oct 24 14:53:44 2012 +0200 wined3d: Fix return value for WINED3DFMT_ATI2N in CheckTextureCapability(). --- dlls/wined3d/directx.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b18a99f..7b9b6a4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3857,9 +3857,6 @@ static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const TRACE("[OK]\n"); return TRUE; } - - TRACE("[OK]\n"); - return TRUE; } TRACE("[FAILED]\n"); return FALSE;

1 0

Michael Stefaniuc : user32: Use FIELD_OFFSET to calculate the size of a struct with variable length array .
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 8ab1fc5ff795a0f0a71e7779ca8f563c62198d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ab1fc5ff795a0f0a71e7779c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 24 10:26:02 2012 +0200 user32: Use FIELD_OFFSET to calculate the size of a struct with variable length array. --- dlls/user32/cursoricon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 62afa3d..8f6f9ce 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1330,7 +1330,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, } dir = (const CURSORICONFILEDIR*) bits; - if ( filesize < (sizeof(*dir) + sizeof(dir->idEntries[0])*(dir->idCount-1)) ) + if ( filesize < FIELD_OFFSET( CURSORICONFILEDIR, idEntries[dir->idCount] )) goto end; if ( fCursor )

1 0

Alexandre Julliard : gdi32: Remove an unused DC field.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 77c1856d43042958dd1e36c59ddd79c0f81a392d URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c1856d43042958dd1e36c59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 24 18:22:29 2012 +0200 gdi32: Remove an unused DC field. --- dlls/gdi32/dc.c | 4 +--- dlls/gdi32/gdi_private.h | 1 - 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 7d70bf4..030304c 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -351,7 +351,6 @@ INT nulldrv_SaveDC( PHYSDEV dev ) newdc->hBrush = dc->hBrush; newdc->hFont = dc->hFont; newdc->hBitmap = dc->hBitmap; - newdc->hDevice = dc->hDevice; newdc->hPalette = dc->hPalette; newdc->ROPmode = dc->ROPmode; newdc->polyFillMode = dc->polyFillMode; @@ -417,7 +416,7 @@ INT nulldrv_SaveDC( PHYSDEV dev ) /*********************************************************************** - * restore_dc_state + * nulldrv_RestoreDC */ BOOL nulldrv_RestoreDC( PHYSDEV dev, INT level ) { @@ -437,7 +436,6 @@ BOOL nulldrv_RestoreDC( PHYSDEV dev, INT level ) if (!PATH_RestorePath( dc, dcs )) return FALSE; dc->layout = dcs->layout; - dc->hDevice = dcs->hDevice; dc->ROPmode = dcs->ROPmode; dc->polyFillMode = dcs->polyFillMode; dc->stretchBltMode = dcs->stretchBltMode; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 806ca35..792a9e4 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -100,7 +100,6 @@ typedef struct tagDC HBRUSH hBrush; HFONT hFont; HBITMAP hBitmap; - HANDLE hDevice; HPALETTE hPalette; GdiFont *gdiFont;

1 0

Jason Edmeades : cmd: Add support parsing for /f options and implement skip .
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: d64298df9958721a9ef2abe88e29fb0024f298c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d64298df9958721a9ef2abe88… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sun Oct 21 23:46:46 2012 +0100 cmd: Add support parsing for /f options and implement skip. --- programs/cmd/builtins.c | 143 ++++++++++++++++++++++++++++-- programs/cmd/tests/test_builtins.cmd | 4 + programs/cmd/tests/test_builtins.cmd.exp | 9 ++- 3 files changed, 146 insertions(+), 10 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 279e80d..7bafd9e 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1511,6 +1511,119 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, return; } +/***************************************************************************** + * WCMD_parse_forf_options + * + * Parses the for /f 'options', extracting the values and validating the + * keywords. Note all keywords are optional. + * Parameters: + * options [I] The unparsed parameter string + * eol [O] Set to the comment character (eol=x) + * skip [O] Set to the number of lines to skip (skip=xx) + * delims [O] Set to the token delimiters (delims=) + * tokens [O] Set to the requested tokens, as provided (tokens=) + * usebackq [O] Set to TRUE if usebackq found + * + * Returns TRUE on success, FALSE on syntax error + * + */ +static BOOL WCMD_parse_forf_options(WCHAR *options, WCHAR *eol, int *skip, + WCHAR *delims, WCHAR *tokens, BOOL *usebackq) +{ + + WCHAR *pos = options; + int len = strlenW(pos); + static const WCHAR eolW[] = {'e','o','l','='}; + static const WCHAR skipW[] = {'s','k','i','p','='}; + static const WCHAR tokensW[] = {'t','o','k','e','n','s','='}; + static const WCHAR delimsW[] = {'d','e','l','i','m','s','='}; + static const WCHAR usebackqW[] = {'u','s','e','b','a','c','k','q'}; + static const WCHAR forf_defaultdelims[] = {' ', '\t', '\0'}; + static const WCHAR forf_defaulttokens[] = {'1', '\0'}; + + /* Initialize to defaults */ + strcpyW(delims, forf_defaultdelims); + strcpyW(tokens, forf_defaulttokens); + *eol = 0; + *skip = 0; + *usebackq = FALSE; + + /* Strip (optional) leading and trailing quotes */ + if ((*pos == '"') && (pos[len-1] == '"')) { + pos[len-1] = 0; + pos++; + } + + /* Process each keyword */ + while (pos && *pos) { + if (*pos == ' ' || *pos == '\t') { + pos++; + + /* Save End of line character (Ignore line if first token (based on delims) starts with it) */ + } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + pos, sizeof(eolW)/sizeof(WCHAR), + 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); + + /* 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, + pos, sizeof(skipW)/sizeof(WCHAR), + skipW, sizeof(skipW)/sizeof(WCHAR)) == CSTR_EQUAL) { + WCHAR *nextchar = NULL; + pos = pos + sizeof(skipW)/sizeof(WCHAR); + *skip = strtoulW(pos, &nextchar, 0); + WINE_TRACE("Found skip as %d lines\n", *skip); + pos = nextchar; + + /* Save if usebackq semantics are in effect */ + } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + pos, sizeof(usebackqW)/sizeof(WCHAR), + usebackqW, sizeof(usebackqW)/sizeof(WCHAR)) == CSTR_EQUAL) { + *usebackq = TRUE; + pos = pos + sizeof(usebackqW)/sizeof(WCHAR); + WINE_FIXME("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 + just a token delimiter! */ + } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + pos, sizeof(delimsW)/sizeof(WCHAR), + delimsW, sizeof(delimsW)/sizeof(WCHAR)) == CSTR_EQUAL) { + int i=0; + + pos = pos + sizeof(delimsW)/sizeof(WCHAR); + while (*pos && *pos != ' ') { + delims[i++] = *pos; + pos++; + } + if (*pos==' ' && *(pos+1)==0) delims[i++] = *pos; + delims[i++] = 0; /* Null terminate the delims */ + WINE_FIXME("Found delims as '%s'\n", wine_dbgstr_w(delims)); + + /* Save the tokens being requested */ + } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + pos, sizeof(tokensW)/sizeof(WCHAR), + tokensW, sizeof(tokensW)/sizeof(WCHAR)) == CSTR_EQUAL) { + int i=0; + + pos = pos + sizeof(tokensW)/sizeof(WCHAR); + while (*pos && *pos != ' ') { + tokens[i++] = *pos; + pos++; + } + tokens[i++] = 0; /* Null terminate the tokens */ + WINE_FIXME("Found tokens as '%s'\n", wine_dbgstr_w(tokens)); + + } else { + WINE_WARN("Unexpected data in optionsroot: '%s'\n", wine_dbgstr_w(pos)); + return FALSE; + } + } + return TRUE; +} + /************************************************************************** * WCMD_for * @@ -1536,7 +1649,6 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { int thisDepth; WCHAR optionsRoot[MAX_PATH]; DIRECTORY_STACK *dirsToWalk = NULL; - BOOL expandDirs = FALSE; BOOL useNumbers = FALSE; BOOL doFileset = FALSE; @@ -1546,6 +1658,11 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { int itemNum; CMD_LIST *thisCmdStart; int parameterNo = 0; + WCHAR forf_eol = 0; + int forf_skip = 0; + WCHAR forf_delims[256]; + WCHAR forf_tokens[MAXSTRING]; + BOOL forf_usebackq; /* Handle optional qualifiers (multiple are allowed) */ WCHAR *thisArg = WCMD_parameter(p, parameterNo++, NULL, NULL, FALSE, FALSE); @@ -1579,10 +1696,6 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { if (thisArg && *thisArg != '/' && *thisArg != '%') { parameterNo++; strcpyW(optionsRoot, thisArg); - if (!doRecurse) { - static unsigned int once; - if (!once++) WINE_FIXME("/F needs to handle options\n"); - } } break; } @@ -1600,8 +1713,17 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { return; } + /* With for /f parse the options if provided */ + if (doFileset) { + if (!WCMD_parse_forf_options(optionsRoot, &forf_eol, &forf_skip, + forf_delims, forf_tokens, &forf_usebackq)) + { + WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR)); + return; + } + /* Set up the list of directories to recurse if we are going to */ - if (doRecurse) { + } else if (doRecurse) { /* Allocate memory, add to list */ dirsToWalk = HeapAlloc(GetProcessHeap(), 0, sizeof(DIRECTORY_STACK)); dirsToWalk->next = NULL; @@ -1835,6 +1957,13 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { while (WCMD_fgets(buffer, sizeof(buffer)/sizeof(WCHAR), input)) { + /* Skip lines if requested */ + if (forf_skip) { + forf_skip--; + buffer[0] = 0; + continue; + } + /* Skip blank lines*/ parm = WCMD_parameter (buffer, 0, &where, NULL, FALSE, FALSE); WINE_TRACE("Parsed parameter: %s from %s\n", wine_dbgstr_w(parm), @@ -1871,7 +2000,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WINE_TRACE("Parsed parameter: %s from %s\n", wine_dbgstr_w(parm), wine_dbgstr_w(buffer)); - if (where) { + if (where && forf_skip == 0) { /* FIXME: The following should be moved into its own routine and reused for the string literal parsing below */ thisCmdStart = cmdStart; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index d314336..1f9ce95 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1179,6 +1179,10 @@ for /f "skip=3" %%i in (foo) do echo %%i > output_file if not exist output_file (echo no output) else (del output_file) for /f "skip=4" %%i in (foo) do echo %%i > output_file if not exist output_file (echo no output) else (del output_file) +for /f "skip=02" %%i in (foo) do echo %%i +for /f "skip=0x2" %%i in (foo) do echo %%i +for /f "skip=1" %%i in ("skipme") do echo %%i > output_file +if not exist output_file (echo no output) else (del output_file) cd .. rd /s/q foobar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 020246a..f1194a6 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -824,9 +824,12 @@ a|d foo bar baz @todo_wine(a)c:\ ------ skip option -(a)todo_wine@c -(a)todo_wine@no output -(a)todo_wine@no output +c +no output +no output +c +c +no output ------------ Testing del /a ------------ not-r.test not found after delete, good r.test found before delete, good

1 0

Jason Edmeades : cmd: Refactor building a list of directories out of WCMD_for.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 84ecf34c2c74dfff302dc198040629d74a29367d URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ecf34c2c74dfff302dc1980… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Oct 22 00:10:10 2012 +0100 cmd: Refactor building a list of directories out of WCMD_for. --- programs/cmd/builtins.c | 89 ++++++++++++++++++++++++++++------------------- 1 files changed, 53 insertions(+), 36 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7bafd9e..f706dff 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1624,6 +1624,58 @@ static BOOL WCMD_parse_forf_options(WCHAR *options, WCHAR *eol, int *skip, return TRUE; } +/***************************************************************************** + * WCMD_add_dirstowalk + * + * When recursing through directories (for /r), we need to add to the list of + * directories still to walk, any subdirectories of the one we are processing. + * + * Parameters + * options [I] The remaining list of directories still to process + * + * Note this routine inserts the subdirectories found between the entry being + * processed, and any other directory still to be processed, mimicing what + * Windows does + */ +static void WCMD_add_dirstowalk(DIRECTORY_STACK *dirsToWalk) { + DIRECTORY_STACK *remainingDirs = dirsToWalk; + WCHAR fullitem[MAX_PATH]; + WIN32_FIND_DATAW fd; + HANDLE hff; + + /* Build a generic search and add all directories on the list of directories + still to walk */ + strcpyW(fullitem, dirsToWalk->dirName); + strcatW(fullitem, slashstarW); + hff = FindFirstFileW(fullitem, &fd); + if (hff != INVALID_HANDLE_VALUE) { + do { + WINE_TRACE("Looking for subdirectories\n"); + if ((fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && + (strcmpW(fd.cFileName, dotdotW) != 0) && + (strcmpW(fd.cFileName, dotW) != 0)) + { + /* Allocate memory, add to list */ + DIRECTORY_STACK *toWalk = HeapAlloc(GetProcessHeap(), 0, sizeof(DIRECTORY_STACK)); + WINE_TRACE("(%p->%p)\n", remainingDirs, remainingDirs->next); + toWalk->next = remainingDirs->next; + remainingDirs->next = toWalk; + remainingDirs = toWalk; + toWalk->dirName = HeapAlloc(GetProcessHeap(), 0, + sizeof(WCHAR) * + (strlenW(dirsToWalk->dirName) + 2 + strlenW(fd.cFileName))); + strcpyW(toWalk->dirName, dirsToWalk->dirName); + strcatW(toWalk->dirName, slashW); + strcatW(toWalk->dirName, fd.cFileName); + WINE_TRACE("Added to stack %s (%p->%p)\n", wine_dbgstr_w(toWalk->dirName), + toWalk, toWalk->next); + } + } while (FindNextFileW(hff, &fd) != 0); + WINE_TRACE("Finished adding all subdirectories\n"); + FindClose (hff); + } +} + /************************************************************************** * WCMD_for * @@ -1779,7 +1831,6 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Loop repeatedly per-directory we are potentially walking, when in for /r mode, or once for the rest of the time. */ do { - WCHAR fullitem[MAX_PATH]; /* Save away the starting position for the commands (and offset for the first one) */ @@ -1789,41 +1840,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* If we are recursing directories (ie /R), add all sub directories now, then prefix the root when searching for the item */ - if (dirsToWalk) { - DIRECTORY_STACK *remainingDirs = dirsToWalk; - - /* Build a generic search and add all directories on the list of directories - still to walk */ - strcpyW(fullitem, dirsToWalk->dirName); - strcatW(fullitem, slashstarW); - hff = FindFirstFileW(fullitem, &fd); - if (hff != INVALID_HANDLE_VALUE) { - do { - WINE_TRACE("Looking for subdirectories\n"); - if ((fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && - (strcmpW(fd.cFileName, dotdotW) != 0) && - (strcmpW(fd.cFileName, dotW) != 0)) - { - /* Allocate memory, add to list */ - DIRECTORY_STACK *toWalk = HeapAlloc(GetProcessHeap(), 0, sizeof(DIRECTORY_STACK)); - WINE_TRACE("(%p->%p)\n", remainingDirs, remainingDirs->next); - toWalk->next = remainingDirs->next; - remainingDirs->next = toWalk; - remainingDirs = toWalk; - toWalk->dirName = HeapAlloc(GetProcessHeap(), 0, - sizeof(WCHAR) * - (strlenW(dirsToWalk->dirName) + 2 + strlenW(fd.cFileName))); - strcpyW(toWalk->dirName, dirsToWalk->dirName); - strcatW(toWalk->dirName, slashW); - strcatW(toWalk->dirName, fd.cFileName); - WINE_TRACE("Added to stack %s (%p->%p)\n", wine_dbgstr_w(toWalk->dirName), - toWalk, toWalk->next); - } - } while (FindNextFileW(hff, &fd) != 0); - WINE_TRACE("Finished adding all subdirectories\n"); - FindClose (hff); - } - } + if (dirsToWalk) WCMD_add_dirstowalk(dirsToWalk); thisSet = setStart; /* Loop through all set entries */

1 0

Jason Edmeades : cmd: Use a common function for the string parsing in for / f.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: a3688948d0f58a54015787eb7a657f7f804dd1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3688948d0f58a54015787eb7… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Oct 22 00:53:30 2012 +0100 cmd: Use a common function for the string parsing in for /f. --- programs/cmd/builtins.c | 97 +++++++++++++++++++++++++++-------------------- 1 files changed, 56 insertions(+), 41 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index f706dff..775bea0 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1677,6 +1677,54 @@ 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 + * if appropriate. + * + * Parameters: + * cmdStart [I] - Identifies the list of commands making up the + * for loop body (especially if brackets in use) + * firstCmd [I] - The textual start of the command after the DO + * which is within the first item of cmdStart + * cmdEnd [O] - Identifies where to continue after the DO + * variable [I] - The variable identified on the for line + * 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 + */ +static void WCMD_parse_line(CMD_LIST *cmdStart, + const WCHAR *firstCmd, + CMD_LIST **cmdEnd, + const WCHAR *variable, + WCHAR *buffer, + BOOL *doExecuted, + int *forf_skip) { + + WCHAR *parm, *where; + + /* Skip lines if requested */ + if (*forf_skip) { + (*forf_skip)--; + return; + } + + /* Extract the parameter */ + parm = WCMD_parameter (buffer, 0, &where, NULL, FALSE, FALSE); + WINE_TRACE("Parsed parameter: %s from %s\n", wine_dbgstr_w(parm), + wine_dbgstr_w(buffer)); + + if (where) { + CMD_LIST *thisCmdStart = cmdStart; + *doExecuted = TRUE; + WCMD_part_execute(&thisCmdStart, firstCmd, variable, parm, FALSE, TRUE); + *cmdEnd = thisCmdStart; + } + +} + +/************************************************************************** * WCMD_for * * Batch file loop processing. @@ -1851,6 +1899,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Loop through all entries on the same line */ WCHAR *item; WCHAR *itemStart; + WCHAR buffer[MAXSTRING]; WINE_TRACE("Processing for set %p\n", thisSet); i = 0; @@ -1970,33 +2019,11 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { } else { WCHAR buffer[MAXSTRING]; - WCHAR *where, *parm; while (WCMD_fgets(buffer, sizeof(buffer)/sizeof(WCHAR), input)) { - - /* Skip lines if requested */ - if (forf_skip) { - forf_skip--; - buffer[0] = 0; - continue; - } - - /* Skip blank lines*/ - parm = WCMD_parameter (buffer, 0, &where, NULL, FALSE, FALSE); - WINE_TRACE("Parsed parameter: %s from %s\n", wine_dbgstr_w(parm), - wine_dbgstr_w(buffer)); - - if (where) { - /* FIXME: The following should be moved into its own routine and - reused for the string literal parsing below */ - thisCmdStart = cmdStart; - doExecuted = TRUE; - WCMD_part_execute(&thisCmdStart, firstCmd, variable, parm, FALSE, TRUE); - cmdEnd = thisCmdStart; - } - + WCMD_parse_line(cmdStart, firstCmd, &cmdEnd, variable, buffer, &doExecuted, + &forf_skip); buffer[0] = 0; - } CloseHandle (input); } @@ -2008,23 +2035,11 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Filesets - A string literal */ } else if (doFileset && *itemStart == '"') { - WCHAR buffer[MAXSTRING]; - WCHAR *where, *parm; - - /* Skip blank lines, and re-extract parameter now string has quotes removed */ - strcpyW(buffer, item); - parm = WCMD_parameter (buffer, 0, &where, NULL, FALSE, FALSE); - WINE_TRACE("Parsed parameter: %s from %s\n", wine_dbgstr_w(parm), - wine_dbgstr_w(buffer)); - - if (where && forf_skip == 0) { - /* FIXME: The following should be moved into its own routine and - reused for the string literal parsing below */ - thisCmdStart = cmdStart; - doExecuted = TRUE; - WCMD_part_execute(&thisCmdStart, firstCmd, variable, parm, FALSE, TRUE); - cmdEnd = thisCmdStart; - } + + /* 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); } WINE_TRACE("Post-command, cmdEnd = %p\n", cmdEnd);

1 0

Henri Verbeet : wined3d: Set texture_level in surface_set_texture_target() as well.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: ddbe791d37a7b01cb602dab4862fe707eff2cd28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddbe791d37a7b01cb602dab48… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 21:01:05 2012 +0200 wined3d: Set texture_level in surface_set_texture_target() as well. --- dlls/d3d10core/device.c | 4 +- dlls/d3d8/d3d8_private.h | 6 ++-- dlls/d3d8/device.c | 48 ++++++++++++++------------------------- dlls/d3d8/surface.c | 8 +++--- dlls/d3d9/d3d9_private.h | 6 ++-- dlls/d3d9/device.c | 33 ++++++++++----------------- dlls/d3d9/surface.c | 8 +++--- dlls/ddraw/ddraw.c | 17 +++++-------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 10 +++----- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 29 ++++++++++------------- dlls/wined3d/texture.c | 6 ++-- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 2 +- 16 files changed, 77 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ddbe791d37a7b01cb602d…

1 0

Henri Verbeet : wined3d: Remove some dead code from gen_ffp_instr().
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 41c8f1ef8a8c785a16cddb5cbafc9a8e3e7e0267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c8f1ef8a8c785a16cddb5cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 21:01:06 2012 +0200 wined3d: Remove some dead code from gen_ffp_instr(). --- dlls/wined3d/arb_program_shader.c | 25 ++++--------------------- 1 files changed, 4 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2a74171..0c0b22a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5939,7 +5939,6 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta { const char *dstmask, *dstreg, *arg0, *arg1, *arg2; unsigned int mul = 1; - BOOL mul_final_dest = FALSE; if(color && alpha) dstmask = ""; else if(color) dstmask = ".xyz"; @@ -5971,11 +5970,6 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta /* FALLTHROUGH */ case WINED3D_TOP_MODULATE_2X: mul *= 2; - if (!strcmp(dstreg, "result.color")) - { - dstreg = "ret"; - mul_final_dest = TRUE; - } /* FALLTHROUGH */ case WINED3D_TOP_MODULATE: shader_addline(buffer, "MUL %s%s, %s, %s;\n", dstreg, dstmask, arg1, arg2); @@ -5983,11 +5977,6 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta case WINED3D_TOP_ADD_SIGNED_2X: mul = 2; - if (!strcmp(dstreg, "result.color")) - { - dstreg = "ret"; - mul_final_dest = TRUE; - } /* FALLTHROUGH */ case WINED3D_TOP_ADD_SIGNED: shader_addline(buffer, "SUB arg2, %s, const.w;\n", arg2); @@ -6048,11 +6037,6 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta case WINED3D_TOP_DOTPRODUCT3: mul = 4; - if (!strcmp(dstreg, "result.color")) - { - dstreg = "ret"; - mul_final_dest = TRUE; - } shader_addline(buffer, "SUB arg1, %s, const.w;\n", arg1); shader_addline(buffer, "SUB arg2, %s, const.w;\n", arg2); shader_addline(buffer, "DP3_SAT %s%s, arg1, arg2;\n", dstreg, dstmask); @@ -6076,11 +6060,10 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta FIXME("Unhandled texture op %08x\n", op); } - if(mul == 2) { - shader_addline(buffer, "MUL_SAT %s%s, %s, const.y;\n", mul_final_dest ? "result.color" : dstreg, dstmask, dstreg); - } else if(mul == 4) { - shader_addline(buffer, "MUL_SAT %s%s, %s, const.z;\n", mul_final_dest ? "result.color" : dstreg, dstmask, dstreg); - } + if (mul == 2) + shader_addline(buffer, "MUL_SAT %s%s, %s, const.y;\n", dstreg, dstmask, dstreg); + else if (mul == 4) + shader_addline(buffer, "MUL_SAT %s%s, %s, const.z;\n", dstreg, dstmask, dstreg); } static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, const struct wined3d_gl_info *gl_info)

1 0

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

Oct. 24, 2012

Module: wine Branch: master Commit: 0c84de4455e354b85ac5c0af1c3090fc5b4051b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c84de4455e354b85ac5c0af1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 21:01:07 2012 +0200 d3dx9: Avoid LPDIRECT3DVERTEXSHADER9. --- dlls/d3dx9_36/effect.c | 26 ++++++++++++++------------ include/d3dx9effect.h | 8 ++++---- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index dcd12d4..7fde7fd 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2717,18 +2717,19 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetPixelShader(ID3DXBaseEffect *iface, return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXBaseEffectImpl_GetVertexShader(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 *vshader) +static HRESULT WINAPI ID3DXBaseEffectImpl_GetVertexShader(struct ID3DXBaseEffect *iface, + D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); struct d3dx_parameter *param = get_valid_parameter(This, parameter); - TRACE("iface %p, parameter %p, vshader %p\n", This, parameter, vshader); + TRACE("iface %p, parameter %p, shader %p.\n", This, parameter, shader); - if (vshader && param && !param->element_count && param->type == D3DXPT_VERTEXSHADER) + if (shader && param && !param->element_count && param->type == D3DXPT_VERTEXSHADER) { - *vshader = *(LPDIRECT3DVERTEXSHADER9 *)param->data; - if (*vshader) IDirect3DVertexShader9_AddRef(*vshader); - TRACE("Returning %p\n", *vshader); + if ((*shader = *(struct IDirect3DVertexShader9 **)param->data)) + IDirect3DVertexShader9_AddRef(*shader); + TRACE("Returning %p.\n", *shader); return D3D_OK; } @@ -3379,14 +3380,15 @@ static HRESULT WINAPI ID3DXEffectImpl_GetPixelShader(ID3DXEffect *iface, return ID3DXBaseEffectImpl_GetPixelShader(base, parameter, shader); } -static HRESULT WINAPI ID3DXEffectImpl_GetVertexShader(ID3DXEffect *iface, D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 *vshader) +static HRESULT WINAPI ID3DXEffectImpl_GetVertexShader(struct ID3DXEffect *iface, + D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); ID3DXBaseEffect *base = This->base_effect; TRACE("Forward iface %p, base %p\n", This, base); - return ID3DXBaseEffectImpl_GetVertexShader(base, parameter, vshader); + return ID3DXBaseEffectImpl_GetVertexShader(base, parameter, shader); } static HRESULT WINAPI ID3DXEffectImpl_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end) @@ -4345,14 +4347,15 @@ static HRESULT WINAPI ID3DXEffectCompilerImpl_GetPixelShader(ID3DXEffectCompiler return ID3DXBaseEffectImpl_GetPixelShader(base, parameter, shader); } -static HRESULT WINAPI ID3DXEffectCompilerImpl_GetVertexShader(ID3DXEffectCompiler *iface, D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 *vshader) +static HRESULT WINAPI ID3DXEffectCompilerImpl_GetVertexShader(struct ID3DXEffectCompiler *iface, + D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { struct ID3DXEffectCompilerImpl *This = impl_from_ID3DXEffectCompiler(iface); ID3DXBaseEffect *base = This->base_effect; TRACE("Forward iface %p, base %p\n", This, base); - return ID3DXBaseEffectImpl_GetVertexShader(base, parameter, vshader); + return ID3DXBaseEffectImpl_GetVertexShader(base, parameter, shader); } static HRESULT WINAPI ID3DXEffectCompilerImpl_SetArrayRange(ID3DXEffectCompiler *iface, D3DXHANDLE parameter, UINT start, UINT end) @@ -4737,8 +4740,7 @@ static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr, break; case D3DXPT_VERTEXSHADER: - hr = IDirect3DDevice9_CreateVertexShader(device, (DWORD *)*ptr, (LPDIRECT3DVERTEXSHADER9 *)param->data); - if (hr != D3D_OK) + if (FAILED(hr = IDirect3DDevice9_CreateVertexShader(device, (DWORD *)*ptr, param->data))) { WARN("Failed to create vertex shader\n"); return hr; diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index bae911f..b3a16d7 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -151,7 +151,7 @@ DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown) STDMETHOD(SetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) PURE; STDMETHOD(GetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9* texture) PURE; STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DPixelShader9 **shader) PURE; - STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE; + STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; }; #undef INTERFACE @@ -179,7 +179,7 @@ DECLARE_INTERFACE_(ID3DXEffectStateManager, IUnknown) STDMETHOD(SetSamplerState)(THIS_ DWORD sampler, D3DSAMPLERSTATETYPE type, DWORD value) PURE; STDMETHOD(SetNPatchMode)(THIS_ FLOAT num_segments) PURE; STDMETHOD(SetFVF)(THIS_ DWORD format) PURE; - STDMETHOD(SetVertexShader)(THIS_ LPDIRECT3DVERTEXSHADER9 shader) PURE; + STDMETHOD(SetVertexShader)(THIS_ struct IDirect3DVertexShader9 *shader) PURE; STDMETHOD(SetVertexShaderConstantF)(THIS_ UINT register_index, CONST FLOAT* constant_data, UINT register_count) PURE; STDMETHOD(SetVertexShaderConstantI)(THIS_ UINT register_index, CONST INT* constant_data, UINT register_count) PURE; STDMETHOD(SetVertexShaderConstantB)(THIS_ UINT register_index, CONST BOOL* constant_data, UINT register_count) PURE; @@ -255,7 +255,7 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect) STDMETHOD(SetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) PURE; STDMETHOD(GetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9* texture) PURE; STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DPixelShader9 **shader) PURE; - STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE; + STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; /*** ID3DXEffect methods ***/ STDMETHOD(GetPool)(THIS_ LPD3DXEFFECTPOOL* pool) PURE; @@ -348,7 +348,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) STDMETHOD(SetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) PURE; STDMETHOD(GetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9* texture) PURE; STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DPixelShader9 **shader) PURE; - STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE; + STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; /*** ID3DXEffectCompiler methods ***/ STDMETHOD(SetLiteral)(THIS_ D3DXHANDLE parameter, BOOL literal) PURE;

1 0