September 2012 - Wine-Commits

Jason Edmeades : cmd: for / l with zero iterations failed to skip its commands.
by Alexandre Julliard Sept. 3, 2012

Sept. 3, 2012

Module: wine Branch: master Commit: 1a9413b98a04358935424c54a73fa8b38f03832e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a9413b98a04358935424c54a… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Sep 2 23:25:21 2012 +0100 cmd: for /l with zero iterations failed to skip its commands. --- programs/cmd/builtins.c | 18 +++++++++++------- programs/cmd/tests/test_builtins.cmd | 5 +++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index e28ff10..a83947b 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -968,7 +968,7 @@ void WCMD_echo (const WCHAR *command) */ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, const WCHAR *variable, const WCHAR *value, - BOOL isIF, BOOL conditionTRUE) + BOOL isIF, BOOL executecmds) { CMD_LIST *curPosition = *cmdList; int myDepth = (*cmdList)->bracketDepth; @@ -976,13 +976,13 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, 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); + executecmds); /* Skip leading whitespace between condition and the command */ while (firstcmd && *firstcmd && (*firstcmd==' ' || *firstcmd=='\t')) firstcmd++; /* Process the first command, if there is one */ - if (conditionTRUE && firstcmd && *firstcmd) { + if (executecmds && firstcmd && *firstcmd) { WCHAR *command = WCMD_strdupW(firstcmd); WCMD_execute (firstcmd, (*cmdList)->redirects, variable, value, cmdList); HeapFree(GetProcessHeap(), 0, command); @@ -994,9 +994,7 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, /* Process any other parts of the command */ if (*cmdList) { - BOOL processThese = TRUE; - - if (isIF) processThese = conditionTRUE; + BOOL processThese = executecmds; while (*cmdList) { static const WCHAR ifElse[] = {'e','l','s','e'}; @@ -1372,8 +1370,14 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { thisCmdStart = cmdStart; WCMD_part_execute(&thisCmdStart, firstCmd, variable, thisNum, FALSE, TRUE); - cmdEnd = thisCmdStart; } + + /* Now skip over the subsequent commands if we did not perform the for loop */ + if (thisCmdStart == cmdStart) { + WINE_TRACE("Skipping for loop commands due to no valid iterations\n"); + WCMD_part_execute(&thisCmdStart, firstCmd, variable, thisNum, FALSE, FALSE); + } + cmdEnd = thisCmdStart; } /* When the loop ends, either something like a GOTO or EXIT /b has terminated diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 4856578..36bc73f 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -685,6 +685,11 @@ for /L %%i in (1,1,1) do echo %%i for /L %%i in (1,-2,-1) do echo %%i for /L %%i in (-1,-1,-1) do echo %%i for /L %%i in (1,2, 3) do echo %%i +rem Test zero iteration skips the body of the for +for /L %%i in (2,2,1) do ( + echo %%i + echo FAILED +) echo --- for /a rem No output when using "set expr" syntax, unless in interactive mode rem Need to use "set envvar=expr" to use in a batch script diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 0011d35..c444be6 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -469,8 +469,8 @@ bar 2 1 -1 -(a)todo_wine@ErrorLevel 0 -(a)todo_wine@ErrorLevel 0 +ErrorLevel 0 +ErrorLevel 0 1 2 3

1 0

Marcus Meissner : quartz: Handle freeing pins in error case (Coverity).
by Alexandre Julliard Sept. 3, 2012

Sept. 3, 2012

Module: wine Branch: master Commit: 791bc1cb93a2b17af2ef969df30b19bf5cec3afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=791bc1cb93a2b17af2ef969df… Author: Marcus Meissner <meissner(a)suse.de> Date: Sun Sep 2 14:57:15 2012 +0200 quartz: Handle freeing pins in error case (Coverity). --- dlls/quartz/filtergraph.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 1cc1df9..239cf0b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -906,12 +906,13 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, IEnumPins* penumpins; IEnumMoniker* pEnumMoniker; GUID tab[2]; - ULONG nb; + ULONG nb = 0; IMoniker* pMoniker; ULONG pin; PIN_INFO PinInfo; CLSID FilterCLSID; PIN_DIRECTION dir; + unsigned int i = 0; TRACE("(%p/%p)->(%p, %p)\n", This, iface, ppinOut, ppinIn); @@ -1012,7 +1013,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, { VARIANT var; GUID clsid; - IPin** ppins; + IPin** ppins = NULL; IPin* ppinfilter = NULL; IBaseFilter* pfilter = NULL; IAMGraphBuilderCallback *callback = NULL; @@ -1104,7 +1105,6 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, hr = GetInternalConnections(pfilter, ppinfilter, &ppins, &nb); if (SUCCEEDED(hr)) { - unsigned int i; if (nb == 0) { IPin_Disconnect(ppinfilter); IPin_Disconnect(ppinOut); @@ -1157,6 +1157,8 @@ error: IFilterGraph2_RemoveFilter(iface, pfilter); IBaseFilter_Release(pfilter); } + while (++i < nb) IPin_Release(ppins[i]); + CoTaskMemFree(ppins); } out:

1 0

Marcus Meissner : shell32: Use characters not bytes in one place (Coverity) .
by Alexandre Julliard Sept. 3, 2012

Sept. 3, 2012

Module: wine Branch: master Commit: 006ee88278ff455075165b29fa53c0ab989f6db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=006ee88278ff455075165b29f… Author: Marcus Meissner <meissner(a)suse.de> Date: Sun Sep 2 15:12:34 2012 +0200 shell32: Use characters not bytes in one place (Coverity). --- dlls/shell32/shlexec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index e351d86..a1599e4 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1430,7 +1430,7 @@ static BOOL SHELL_translate_idlist( LPSHELLEXECUTEINFOW sei, LPWSTR wszParameter BOOL appKnownSingular = FALSE; /* last chance to translate IDList: now also allow CLSID paths */ - if (SUCCEEDED(SHELL_GetPathFromIDListForExecuteW(sei->lpIDList, buffer, sizeof(buffer)))) { + if (SUCCEEDED(SHELL_GetPathFromIDListForExecuteW(sei->lpIDList, buffer, sizeof(buffer)/sizeof(WCHAR)))) { if (buffer[0]==':' && buffer[1]==':') { /* open shell folder for the specified class GUID */ if (strlenW(buffer) + 1 > parametersLen)

1 0

Jason Edmeades : cmd: for loops did not respect boundaries.
by Alexandre Julliard Sept. 3, 2012

Sept. 3, 2012

Module: wine Branch: master Commit: 3a25888f38dbfed5d80368aaea4c2bd4f601dc7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a25888f38dbfed5d80368aae… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Sep 2 22:08:57 2012 +0100 cmd: for loops did not respect boundaries. --- programs/cmd/builtins.c | 2 +- programs/cmd/tests/test_builtins.cmd | 18 ++++++++++++------ programs/cmd/tests/test_builtins.cmd.exp | 19 +++++++++++++++++++ 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ebb1c80..e28ff10 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1364,7 +1364,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WINE_TRACE("FOR /L provided range from %d to %d step %d\n", numbers[0], numbers[2], numbers[1]); for (i=numbers[0]; - (numbers[1]<0)? i>numbers[2] : i<numbers[2]; + (numbers[1]<0)? i>=numbers[2] : i<=numbers[2]; i=i + numbers[1]) { sprintfW(thisNum, fmt, i); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 6295f9e..4856578 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -673,12 +673,18 @@ for /L %%i in (1,2,a) do echo %%i echo ErrorLevel %ErrorLevel% for /L %%i in (1,a,b) do echo %%i echo ErrorLevel %ErrorLevel% -rem FIXME: following test cases cannot be currently tested due to an inconsistent/buggy 'for /L' parsing. -rem for /L %%i in (a,2,b) do echo %%i -rem for /L %%i in (1,1,1) do echo %%i -rem for /L %%i in (1,-2,-1) do echo %%i -rem for /L %%i in (-1,-1,-1) do echo %%i -rem for /L %%i in (1,2, 3) do echo %%i +rem Test boundaries +for /l %%i in (1,1,4) do echo %%i +for /l %%i in (1,2,4) do echo %%i +for /l %%i in (4,-1,1) do echo %%i +for /l %%i in (4,-2,1) do echo %%i +for /l %%i in (1,-1,4) do echo %%i +for /l %%i in (4,1,1) do echo %%i +for /L %%i in (a,2,b) do echo %%i +for /L %%i in (1,1,1) do echo %%i +for /L %%i in (1,-2,-1) do echo %%i +for /L %%i in (-1,-1,-1) do echo %%i +for /L %%i in (1,2, 3) do echo %%i echo --- for /a rem No output when using "set expr" syntax, unless in interactive mode rem Need to use "set envvar=expr" to use in a batch script diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index bb75515..0011d35 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -471,6 +471,25 @@ bar -1 @todo_wine(a)ErrorLevel 0 @todo_wine(a)ErrorLevel 0 +1 +2 +3 +4 +1 +3 +4 +3 +2 +1 +4 +2 +0 +1 +1 +-1 +-1 +1 +3 --- for /a ------ individual operations 0

1 0

Marcus Meissner : dinput: Added some missing free/close in disabled case ( Coverity).
by Alexandre Julliard Sept. 3, 2012

Sept. 3, 2012

Module: wine Branch: master Commit: e10a658c0cde12f7713d9e4c13e1a35b5108202d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10a658c0cde12f7713d9e4c1… Author: Marcus Meissner <meissner(a)suse.de> Date: Sun Sep 2 15:01:27 2012 +0200 dinput: Added some missing free/close in disabled case (Coverity). --- dlls/dinput/joystick_linuxinput.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 341e169..466b6bf 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -251,7 +251,13 @@ static void find_joydevs(void) else joydev.name = joydev.device; - if (device_disabled_registry(joydev.name)) continue; + if (device_disabled_registry(joydev.name)) { + close(fd); + HeapFree(GetProcessHeap(), 0, joydev.name); + if (joydev.name != joydev.device) + HeapFree(GetProcessHeap(), 0, joydev.device); + continue; + } joydev.guid = DInput_Wine_Joystick_Base_GUID; joydev.guid.Data3 += have_joydevs;

1 0

Philip Pemberton : kernel32: Scan for SCSI scanners and printers.
by Alexandre Julliard Sept. 3, 2012

Sept. 3, 2012

Module: wine Branch: master Commit: e3e1ddcf2fe7ed597cf38177220d75ef15d47405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3e1ddcf2fe7ed597cf381772… Author: Philip Pemberton <philpem(a)philpem.me.uk> Date: Sun Sep 2 17:11:13 2012 +0100 kernel32: Scan for SCSI scanners and printers. --- dlls/kernel32/oldconfig.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index 02dac06..4a5355d 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -374,6 +374,8 @@ static void create_hardware_branch(void) else if (strncmp(dev.type, "Sequential-Access", 17) == 0) nType = DRIVE_REMOVABLE; else if (strncmp(dev.type, "CD-ROM", 6) == 0) nType = DRIVE_CDROM; else if (strncmp(dev.type, "Processor", 9) == 0) nType = DRIVE_NO_ROOT_DIR; + else if (strncmp(dev.type, "Scanner", 7) == 0) nType = DRIVE_NO_ROOT_DIR; + else if (strncmp(dev.type, "Printer", 7) == 0) nType = DRIVE_NO_ROOT_DIR; else continue; strcpy(cDevModel, dev.vendor);

1 0

Marcus Meissner : gameux: Move SysFreeString to success branches (Coverity) .
by Alexandre Julliard Sept. 3, 2012

Sept. 3, 2012

Module: wine Branch: master Commit: c7355f7921495c056ae2b9393d55f0f8ff01bfdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7355f7921495c056ae2b9393… Author: Marcus Meissner <meissner(a)suse.de> Date: Sun Sep 2 14:47:15 2012 +0200 gameux: Move SysFreeString to success branches (Coverity). --- dlls/gameux/gamestatistics.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index f069708..619c616 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -240,10 +240,9 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) { TRACE(" storing statistic %d: name: %s\n", j, debugstr_w(V_BSTR(&vValue))); hr = IXMLDOMElement_setAttribute(statisticsElement, bstrName, vValue); + SysFreeString(V_BSTR(&vValue)); } - SysFreeString(V_BSTR(&vValue)); - if(SUCCEEDED(hr)) { V_VT(&vValue) = VT_BSTR; @@ -256,10 +255,9 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) { TRACE(" storing statistic %d: name: %s\n", j, debugstr_w(V_BSTR(&vValue))); hr = IXMLDOMElement_setAttribute(statisticsElement, bstrValue, vValue); + SysFreeString(V_BSTR(&vValue)); } - SysFreeString(V_BSTR(&vValue)); - if(SUCCEEDED(hr)) hr = IXMLDOMNode_appendChild(categoryNode, statisticsNode, &statisticsNode);

1 0

Francois Gouget : testbot/doc: Add a diagram of the WineTestBot schema.
by Alexandre Julliard Sept. 3, 2012

Sept. 3, 2012

Module: tools Branch: master Commit: c82cc26ca9b8991164eda01a5a5de686eb2871b3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c82cc26ca9b8991164eda01a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 31 17:39:58 2012 +0200 testbot/doc: Add a diagram of the WineTestBot schema. --- testbot/doc/winetestbot-schema.dia | 2927 ++++++++++++++++++++++++++++++++++++ 1 files changed, 2927 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=c82cc26ca9b8991164ed…

1 0