September 2018 - Wine-Commits

Rodrigo Saboya : wine.inf: Updates E. South America Standard Time DST data.
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

Module: wine Branch: master Commit: b29cdbd5f23548d9631e5c98ec923b6d2d16a3f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b29cdbd5f23548d9631e5c98… Author: Rodrigo Saboya <saboya(a)gmail.com> Date: Tue Sep 11 14:27:42 2018 -0300 wine.inf: Updates E. South America Standard Time DST data. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45786 Signed-off-by: Rodrigo Saboya <saboya(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 4f241c0..f10284b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2806,7 +2806,7 @@ HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"TZI",1,a8,fd,ff,f HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Display",,"America/Sao_Paulo" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Dlt",,"E. South America Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Std",,"E. South America Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,df,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2023",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,e7,07,02,00,00,00,1a,00,00,00,00,00,00,00,00,00,e7,07,0a,00,00,00,0f,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2026",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,ea,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,ea,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00

1 0

Alex Henrie : msvcrt: Don't report an underflow for ldexp(0, x) or _scalb( 0, x).
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

Module: wine Branch: master Commit: b6774e38e657bdedb598538cbaf78f42d1f611f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6774e38e657bdedb598538c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Sep 10 22:42:03 2018 -0600 msvcrt: Don't report an underflow for ldexp(0, x) or _scalb(0, x). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: piotr(a)codeweavers.com Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 2 +- dlls/ucrtbase/tests/misc.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 8d5b687..a1ba552 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1015,7 +1015,7 @@ double CDECL MSVCRT_ldexp(double num, MSVCRT_long exp) if (isfinite(num) && !isfinite(z)) math_error(_OVERFLOW, "ldexp", num, exp, z); - else if (isfinite(num) && !z) + else if (num && isfinite(num) && !z) math_error(_UNDERFLOW, "ldexp", num, exp, z); else if (z == 0 && signbit(z)) z = 0.0; /* Convert -0 -> +0 */ diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 2a9648a..bd8034e 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -694,11 +694,13 @@ static void test_math_errors(void) } testsdl[] = { {"_scalb", -INFINITY, 1, -1, -1}, {"_scalb", -1e100, 1, -1, -1}, + {"_scalb", 0, 1, -1, -1}, {"_scalb", 1e100, 1, -1, -1}, {"_scalb", INFINITY, 1, -1, -1}, {"_scalb", 1, 1e9, ERANGE, _OVERFLOW}, {"ldexp", -INFINITY, 1, -1, -1}, {"ldexp", -1e100, 1, -1, -1}, + {"ldexp", 0, 1, -1, -1}, {"ldexp", 1e100, 1, -1, -1}, {"ldexp", INFINITY, 1, -1, -1}, {"ldexp", 1, -1e9, -1, _UNDERFLOW},

1 0

Jason Edmeades : cmd: Handle whitespace in 'for' argument items.
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

Module: wine Branch: master Commit: becfbb80b4e80680b32cc240b2465e4972590b14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=becfbb80b4e80680b32cc240… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Sep 10 23:30:18 2018 +0100 cmd: Handle whitespace in 'for' argument items. Avoid whitespace affecting the parsing of a for loops items. The leading and trailing quote or backtick needed removing, and it was assumed that the trailing character would be that character, which was wrong when there was whitespace unless the parameter is trimmed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45731 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 8 +++++++- programs/cmd/tests/test_builtins.cmd | 7 ++++++- programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 25d5be1..1e6181d 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2069,17 +2069,22 @@ static HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd WCHAR temp_str[MAX_PATH]; WCHAR temp_file[MAX_PATH]; WCHAR temp_cmd[MAXSTRING]; + WCHAR *trimmed = NULL; 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 */ + /* Remove leading and trailing character (but there may be trailing whitespace too) */ if ((iscmd && (itemstr[0] == '`' && usebackq)) || (iscmd && (itemstr[0] == '\'' && !usebackq)) || (!iscmd && (itemstr[0] == '"' && usebackq))) { + trimmed = WCMD_strtrim(itemstr); + if (trimmed) { + itemstr = trimmed; + } itemstr[strlenW(itemstr)-1] = 0x00; itemstr++; } @@ -2106,6 +2111,7 @@ static HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd hinput = CreateFileW(itemstr, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); } + heap_free(trimmed); return hinput; } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index de9c889..e74d491 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1702,8 +1702,11 @@ 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 %%i in ( "a b c" ) do echo X%%iX 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 usebackq %%i in ( 'a b c' ) do echo X%%iX>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) @@ -1755,9 +1758,11 @@ for /f "usebackq" %%i in (`echo.Passed2`) do echo %%i for /f usebackq %%i in (`echo.Passed3`) do echo %%i for /f "usebackq" %%i in (`"c:\windows\system32\cmd.exe" /C echo Passed4`) do echo %%i for /f "usebackq" %%i in (`""c:\windows\system32\cmd.exe" /C echo Passed5"`) do echo %%i +for /f %%i in ( 'echo.Passed6' ) do echo %%i +for /f "usebackq" %%i in ( `echo.Passed7` ) do echo %%i goto :ContinueFORF :SkipFORFcmdNT4 -for /l %%i in (1,1,5) do echo Missing functionality - Broken%%i +for /l %%i in (1,1,7) 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 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 3829318..021a5b0 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1180,7 +1180,9 @@ WINE_bar correctly 6(a)or_broken@ERROR: WINE_bar incorrectly 5 [6] --- for /F ------ string argument a +XaX a(a)or_broken@no output +XaX(a)or_broken@no output a a(a)or_broken@no output a @@ -1218,6 +1220,8 @@ Passed2(a)or_broken@Missing functionality - Broken2 Passed3(a)or_broken@Missing functionality - Broken3 Passed4(a)or_broken@Missing functionality - Broken4 Passed5(a)or_broken@Missing functionality - Broken5 +Passed6(a)or_broken@Missing functionality - Broken6 +Passed7(a)or_broken@Missing functionality - Broken7 ------ eol option and(a)or_broken@Broken NT4 functionality1 Line(a)or_broken@Broken NT4 functionality2

1 0

Jason Edmeades : cmd: Handle "for" loop handling of tokens, where * does not follow a number.
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

Module: wine Branch: master Commit: 1a7333bec627a31a43d380ecc63e5792e302373e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a7333bec627a31a43d380ec… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Sep 10 23:30:19 2018 +0100 cmd: Handle "for" loop handling of tokens, where * does not follow a number. With the 'for' loop /f syntax, if tokens are requested the the normal syntax is something like tokens=1,2* but there is valid syntax like 1,2,* (which effectively means the same). Make this other syntax work. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45722 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 48 +++++++++++++++++++------------- programs/cmd/tests/test_builtins.cmd | 3 +- programs/cmd/tests/test_builtins.cmd.exp | 1 + 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1e6181d..e6a9ce3 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1836,8 +1836,8 @@ static int WCMD_for_nexttoken(int lasttoken, WCHAR *tokenstr, if (doall) *doall = FALSE; if (duplicates) *duplicates = FALSE; - WINE_TRACE("Find next token after %d in %s was %d\n", lasttoken, - wine_dbgstr_w(tokenstr), nexttoken); + WINE_TRACE("Find next token after %d in %s\n", lasttoken, + wine_dbgstr_w(tokenstr)); /* Loop through the token string, parsing it. Valid syntax is: token=m or x-y with comma delimiter and optionally * to finish*/ @@ -1845,11 +1845,21 @@ static int WCMD_for_nexttoken(int lasttoken, WCHAR *tokenstr, int nextnumber1, nextnumber2 = -1; WCHAR *nextchar; - /* It is valid syntax tokens=* which just means get whole line */ + /* Remember if the next character is a star, it indicates a need to + show all remaining tokens and should be the last character */ if (*pos == '*') { if (doall) *doall = TRUE; if (totalfound) (*totalfound)++; - nexttoken = 0; + /* If we have not found a next token to return, then indicate + time to process the star */ + if (nexttoken == -1) { + if (lasttoken == -1) { + /* Special case the syntax of tokens=* which just means get whole line */ + nexttoken = 0; + } else { + nexttoken = lasttoken; + } + } break; } @@ -1882,8 +1892,9 @@ static int WCMD_for_nexttoken(int lasttoken, WCHAR *tokenstr, if (nextnumber2 >= nextnumber1 && totalfound) { *totalfound = *totalfound + 1 + (nextnumber2 - nextnumber1); } + pos = nextchar; - } else { + } else if (pos != nextchar) { if (totalfound) (*totalfound)++; /* See if the number found is one we have already seen */ @@ -1894,26 +1905,25 @@ static int WCMD_for_nexttoken(int lasttoken, WCHAR *tokenstr, ((nexttoken == -1) || (nextnumber1 < nexttoken))) { nexttoken = nextnumber1; } + pos = nextchar; + } else { + /* Step on to the next character, usually over comma */ + if (*pos) pos++; } - /* Remember if it is followed by a star, and if it is indicate a need to - show all tokens, unless a duplicate has been found */ - if (*nextchar == '*') { - if (doall) *doall = TRUE; - if (totalfound) (*totalfound)++; - } - - /* Step on to the next character */ - pos = nextchar; - if (*pos) pos++; } /* Return result */ - if (nexttoken == -1) nexttoken = lasttoken; - WINE_TRACE("Found next token after %d was %d\n", lasttoken, nexttoken); - if (totalfound) WINE_TRACE("Found total tokens in total %d\n", *totalfound); - if (doall && *doall) WINE_TRACE("Request for all tokens found\n"); + if (nexttoken == -1) { + WINE_TRACE("No next token found, previous was %d\n", lasttoken); + nexttoken = lasttoken; + } else if (nexttoken==lasttoken && doall && *doall) { + WINE_TRACE("Request for all remaining tokens now\n"); + } else { + WINE_TRACE("Found next token after %d was %d\n", lasttoken, nexttoken); + } + if (totalfound) WINE_TRACE("Found total tokens to be %d\n", *totalfound); if (duplicates && *duplicates) WINE_TRACE("Duplicate numbers found\n"); return nexttoken; } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index e74d491..bed3950 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1840,11 +1840,12 @@ for /f "tokens=1,2,3*" %%i in ("a b c d e f g") do echo h=%%h i=%%i j=%%j k=%%k for /f "tokens=1,1,3*" %%i in ("a b c d e f g") do echo h=%%h i=%%i j=%%j k=%%k l=%%l m=%%m n=%%n o=%%o for /f "tokens=2,2,3*" %%i in ("a b c d e f g") do echo h=%%h i=%%i j=%%j k=%%k l=%%l m=%%m n=%%n o=%%o for /f "tokens=3,2,3*" %%i in ("a b c d e f g") do echo h=%%h i=%%i j=%%j k=%%k l=%%l m=%%m n=%%n o=%%o -rem Special case tokens=* +rem Special case tokens=* or tokens=n,* echo 3.14>testfile FOR /F "tokens=*" %%A IN (testfile) DO @echo 1:%%A,%%B FOR /F "tokens=1*" %%A IN (testfile) DO @echo 2:%%A,%%B FOR /F "tokens=2*" %%A IN (testfile) DO @echo 3:%%A,%%B +FOR /F "tokens=1,* delims=." %%A IN (testfile) DO @echo 4:%%A,%%B del testfile cd .. rd /s/q foobar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 021a5b0..5cca037 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1269,6 +1269,7 @@ h=%h i=b j=c k= l= m=%m n=%n o=%o(a)or_broken@h=%h i=b j=c k= l= m= n=%n o=%o h=%h i=b j=c k= l= m=%m n=%n o=%o(a)or_broken@h=%h i=b j=c k= l= m= n=%n o=%o 1:3.14,%B 2:3.14, +4:3,14 ------ parameter splitting :forFParameterSplittingFunc myparam1=myvalue1 myparam2=myparam2 mytest(a)space@@space@@space@ :forFParameterSplittingFunc myparam1=myvalue1 myparam2=myparam2 mytest(a)space@@space@@space@

1 0

Jason Edmeades : cmd: Handle unechoed rem commands inside a (..) section.
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

Module: wine Branch: master Commit: f87e25a7bc2a8917091a9d9d93139bb77eb1e154 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f87e25a7bc2a8917091a9d9d… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Sep 10 23:30:20 2018 +0100 cmd: Handle unechoed rem commands inside a (..) section. When processing a (..) multiline section, each line is processed and if it starts with a '@' it is not echoed, but more importantly if is 'rem' then anything else on that line should be ignored. The reported issue was that a pipe was being executed when it was hidden behind a rem, which was trigged by the preceeding '@' character not being skipped. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45729 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 6 ++++++ programs/cmd/tests/test_builtins.cmd.exp | 1 + programs/cmd/wcmdmain.c | 13 +++++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index bed3950..79233d8 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1427,6 +1427,12 @@ for /L %%i in (2,2,1) do ( echo %%i echo FAILED ) +echo --- rems inside for loops +for /f %%i IN ("hello") DO ( + REM foo|echo ERROR unexpected execution 1 + @REM foo|echo ERROR unexpected execution 2 + @ REM foo|echo ERROR unexpected execution 3 +) echo --- ifs inside for loops for %%i in (test) do ( echo a1 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 5cca037..797a9cc 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -996,6 +996,7 @@ ErrorLevel 0 -1 1 3 +--- rems inside for loops --- ifs inside for loops a1 b1 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index c8a41d3..5ef4a2b 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2308,12 +2308,21 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE } while (*extraData == 0x00); curPos = extraSpace; - if (context) handleExpansion(extraSpace, FALSE, FALSE); + + /* Skip preceding whitespace */ + while (*curPos == ' ' || *curPos == '\t') curPos++; + + /* Replace env vars if in a batch context */ + if (context) handleExpansion(curPos, FALSE, FALSE); + /* Continue to echo commands IF echo is on and in batch program */ - if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) { + if (context && echo_mode && *curPos && *curPos != '@') { WCMD_output_asis(extraSpace); WCMD_output_asis(newlineW); } + + /* Skip repeated 'no echo' characters and whitespace */ + while (*curPos == '@' || *curPos == ' ' || *curPos == '\t') curPos++; } }

1 0

Alistair Leslie-Hughes : ddraw: Accept the d3d1 and d3d2 versions of D3DFINDDEVICERESULT in ddraw_find_device ().
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

Module: wine Branch: master Commit: 96ba1bc478ef15a5a6d1fcc35468da1682afb5ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=96ba1bc478ef15a5a6d1fcc3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 11 18:57:28 2018 +0430 ddraw: Accept the d3d1 and d3d2 versions of D3DFINDDEVICERESULT in ddraw_find_device(). Based off a patch by Michael Müller. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 69 ++++++++++++++++++++++++++++++++++++++++------- dlls/ddraw/tests/ddraw1.c | 57 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 57 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 57 ++++++++++++++++++++++++++++++++++++++- include/d3dhal.h | 69 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 297 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=96ba1bc478ef15a5a6d1…

1 0

Henri Verbeet : ddraw: Find the correct GUIDs for each D3D version in FindDevice().
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

Module: wine Branch: master Commit: 8577ff54adeb510209242e4092c5394acaf0051c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8577ff54adeb510209242e40… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 11 18:57:27 2018 +0430 ddraw: Find the correct GUIDs for each D3D version in FindDevice(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 83 ++++++++++++++++++++++++++++++----------------- dlls/ddraw/tests/ddraw1.c | 6 ++-- dlls/ddraw/tests/ddraw2.c | 8 ++--- 3 files changed, 59 insertions(+), 38 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e5f1e4f..170a549 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4018,35 +4018,20 @@ static HRESULT WINAPI d3d1_CreateViewport(IDirect3D *iface, IDirect3DViewport ** outer_unknown); } -/***************************************************************************** - * IDirect3D3::FindDevice - * - * This method finds a device with the requested properties and returns a - * device description - * - * Versions 1, 2 and 3 - * Params: - * fds: Describes the requested device characteristics - * fdr: Returns the device description - * - * Returns: - * D3D_OK on success - * DDERR_INVALIDPARAMS if no device was found - * - *****************************************************************************/ -static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) +static HRESULT ddraw_find_device(struct ddraw *ddraw, const D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr, + unsigned int guid_count, const GUID * const *guids) { - struct ddraw *ddraw = impl_from_IDirect3D3(iface); D3DDEVICEDESC7 desc7; D3DDEVICEDESC desc1; + unsigned int i; HRESULT hr; - TRACE("iface %p, fds %p, fdr %p.\n", iface, fds, fdr); + TRACE("ddraw %p, fds %p, fdr %p, guid_count %u, guids %p.\n", ddraw, fds, fdr, guid_count, guids); - if (!fds || !fdr) return DDERR_INVALIDPARAMS; + if (!fds || !fdr) + return DDERR_INVALIDPARAMS; - if (fds->dwSize != sizeof(D3DFINDDEVICESEARCH) - || fdr->dwSize != sizeof(D3DFINDDEVICERESULT)) + if (fds->dwSize != sizeof(*fds) || fdr->dwSize != sizeof(*fdr)) return DDERR_INVALIDPARAMS; if (fds->dwFlags & D3DFDS_COLORMODEL) @@ -4054,12 +4039,22 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd if (fds->dwFlags & D3DFDS_GUID) { - TRACE("Trying to match guid %s.\n", debugstr_guid(&(fds->guid))); - if (!IsEqualGUID(&IID_D3DDEVICE_WineD3D, &fds->guid) - && !IsEqualGUID(&IID_IDirect3DHALDevice, &fds->guid) - && !IsEqualGUID(&IID_IDirect3DRGBDevice, &fds->guid)) + BOOL found = FALSE; + + TRACE("Trying to match GUID %s.\n", debugstr_guid(&fds->guid)); + + for (i = 0; i < guid_count; ++i) + { + if (IsEqualGUID(guids[i], &fds->guid)) + { + found = TRUE; + break; + } + } + + if (!found) { - WARN("No match for this GUID.\n"); + WARN("Failed to match GUID %s.\n", debugstr_guid(&fds->guid)); return DDERR_NOTFOUND; } } @@ -4079,22 +4074,52 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd return D3D_OK; } +static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) +{ + struct ddraw *ddraw = impl_from_IDirect3D3(iface); + static const GUID * const guids[] = + { + &IID_D3DDEVICE_WineD3D, + &IID_IDirect3DHALDevice, + &IID_IDirect3DRGBDevice, + }; + + TRACE("iface %p, fds %p, fdr %p.\n", iface, fds, fdr); + + return ddraw_find_device(ddraw, fds, fdr, ARRAY_SIZE(guids), guids); +} + static HRESULT WINAPI d3d2_FindDevice(IDirect3D2 *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) { struct ddraw *ddraw = impl_from_IDirect3D2(iface); + static const GUID * const guids[] = + { + &IID_D3DDEVICE_WineD3D, + &IID_IDirect3DHALDevice, + &IID_IDirect3DMMXDevice, + &IID_IDirect3DRGBDevice, + &IID_IDirect3DRampDevice, + }; TRACE("iface %p, fds %p, fdr %p.\n", iface, fds, fdr); - return d3d3_FindDevice(&ddraw->IDirect3D3_iface, fds, fdr); + return ddraw_find_device(ddraw, fds, fdr, ARRAY_SIZE(guids), guids); } static HRESULT WINAPI d3d1_FindDevice(IDirect3D *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) { struct ddraw *ddraw = impl_from_IDirect3D(iface); + static const GUID * const guids[] = + { + &IID_D3DDEVICE_WineD3D, + &IID_IDirect3DHALDevice, + &IID_IDirect3DRGBDevice, + &IID_IDirect3DRampDevice, + }; TRACE("iface %p, fds %p, fdr %p.\n", iface, fds, fdr); - return d3d3_FindDevice(&ddraw->IDirect3D3_iface, fds, fdr); + return ddraw_find_device(ddraw, fds, fdr, ARRAY_SIZE(guids), guids); } /***************************************************************************** diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index b8dafdb..ba9f128 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -11728,12 +11728,11 @@ static void test_find_device(void) { const GUID *guid; HRESULT hr; - BOOL todo; } tests[] = { {&IID_IDirect3D, DDERR_NOTFOUND}, - {&IID_IDirect3DRampDevice, D3D_OK, TRUE}, + {&IID_IDirect3DRampDevice, D3D_OK}, {&IID_IDirect3DRGBDevice, D3D_OK}, {&IID_IDirect3DMMXDevice, DDERR_NOTFOUND}, {&IID_IDirect3DRefDevice, DDERR_NOTFOUND}, @@ -11784,8 +11783,7 @@ static void test_find_device(void) result.dwSize = sizeof(result); hr = IDirect3D_FindDevice(d3d, &search, &result); - todo_wine_if(tests[i].todo) - ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); ok(result.dwSize == sizeof(result), "Test %u: Got unexpected result size %u.\n", i, result.dwSize); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 762b4d9..b5739c3 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13010,14 +13010,13 @@ static void test_find_device(void) { const GUID *guid; HRESULT hr; - BOOL todo; } tests[] = { {&IID_IDirect3D, DDERR_NOTFOUND}, - {&IID_IDirect3DRampDevice, D3D_OK, TRUE}, + {&IID_IDirect3DRampDevice, D3D_OK}, {&IID_IDirect3DRGBDevice, D3D_OK}, - {&IID_IDirect3DMMXDevice, D3D_OK, TRUE}, + {&IID_IDirect3DMMXDevice, D3D_OK}, {&IID_IDirect3DRefDevice, DDERR_NOTFOUND}, {&IID_IDirect3DTnLHalDevice, DDERR_NOTFOUND}, {&IID_IDirect3DNullDevice, DDERR_NOTFOUND}, @@ -13066,8 +13065,7 @@ static void test_find_device(void) result.dwSize = sizeof(result); hr = IDirect3D2_FindDevice(d3d, &search, &result); - todo_wine_if(tests[i].todo) - ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); ok(result.dwSize == sizeof(result), "Test %u: Got unexpected result size %u.\n", i, result.dwSize); }

1 0

Henri Verbeet : ddraw: Ignore the colour model in d3d3_FindDevice().
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

Module: wine Branch: master Commit: 29b794dcca5ac0fe6391588dafee46b6e0a4f45a URL: https://source.winehq.org/git/wine.git/?a=commit;h=29b794dcca5ac0fe6391588d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 11 18:57:26 2018 +0430 ddraw: Ignore the colour model in d3d3_FindDevice(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 8 ++------ dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e60c5f3..e5f1e4f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4049,12 +4049,8 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd || fdr->dwSize != sizeof(D3DFINDDEVICERESULT)) return DDERR_INVALIDPARAMS; - if ((fds->dwFlags & D3DFDS_COLORMODEL) - && fds->dcmColorModel != D3DCOLOR_RGB) - { - WARN("Trying to request a non-RGB D3D color model. Not supported.\n"); - return DDERR_INVALIDPARAMS; /* No real idea what to return here :-) */ - } + if (fds->dwFlags & D3DFDS_COLORMODEL) + WARN("Ignoring colour model %#x.\n", fds->dcmColorModel); if (fds->dwFlags & D3DFDS_GUID) { diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 641847a..b8dafdb 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -11812,7 +11812,7 @@ static void test_find_device(void) search.dcmColorModel = 0xdeadbeef; result.dwSize = sizeof(result); hr = IDirect3D_FindDevice(d3d, &search, &result); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); IDirect3D_Release(d3d); IDirectDraw_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 02f430a..762b4d9 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13094,7 +13094,7 @@ static void test_find_device(void) search.dcmColorModel = 0xdeadbeef; result.dwSize = sizeof(result); hr = IDirect3D2_FindDevice(d3d, &search, &result); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); IDirect3D2_Release(d3d); IDirectDraw2_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 942d025..337ccb0 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15186,7 +15186,7 @@ static void test_find_device(void) search.dcmColorModel = 0xdeadbeef; result.dwSize = sizeof(result); hr = IDirect3D3_FindDevice(d3d, &search, &result); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); IDirect3D3_Release(d3d); IDirectDraw4_Release(ddraw);

1 0

Józef Kucia : d3d10core/tests: Test D3D10_BLEND_DESC normalization.
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

Module: wine Branch: master Commit: 365cb779ac18ded3f213af8837d7c885f60ef7f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=365cb779ac18ded3f213af88… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 11 13:48:08 2018 +0200 d3d10core/tests: Test D3D10_BLEND_DESC normalization. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index e675c12..11eede7 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -3984,18 +3984,9 @@ static void test_create_blend_state(void) hr = ID3D10Device_CreateBlendState(device, NULL, &blend_state1); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - blend_desc.AlphaToCoverageEnable = FALSE; - blend_desc.SrcBlend = D3D10_BLEND_ONE; - blend_desc.DestBlend = D3D10_BLEND_ZERO; - blend_desc.BlendOp = D3D10_BLEND_OP_ADD; - blend_desc.SrcBlendAlpha = D3D10_BLEND_ONE; - blend_desc.DestBlendAlpha = D3D10_BLEND_ZERO; - blend_desc.BlendOpAlpha = D3D10_BLEND_OP_ADD; + memset(&blend_desc, 0, sizeof(blend_desc)); for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) - { - blend_desc.BlendEnable[i] = FALSE; blend_desc.RenderTargetWriteMask[i] = D3D10_COLOR_WRITE_ENABLE_ALL; - } expected_refcount = get_refcount(device) + 1; hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state1); @@ -4013,6 +4004,31 @@ static void test_create_blend_state(void) ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D10Device_Release(tmp); + ID3D10BlendState_GetDesc(blend_state1, &blend_desc); + ok(blend_desc.AlphaToCoverageEnable == FALSE, + "Got unexpected alpha to coverage enable %#x.\n", blend_desc.AlphaToCoverageEnable); + ok(blend_desc.SrcBlend == D3D10_BLEND_ONE, + "Got unexpected src blend %#x.\n", blend_desc.SrcBlend); + ok(blend_desc.DestBlend == D3D10_BLEND_ZERO, + "Got unexpected dest blend %#x.\n", blend_desc.DestBlend); + ok(blend_desc.BlendOp == D3D10_BLEND_OP_ADD, + "Got unexpected blend op %#x.\n", blend_desc.BlendOp); + ok(blend_desc.SrcBlendAlpha == D3D10_BLEND_ONE, + "Got unexpected src blend alpha %#x.\n", blend_desc.SrcBlendAlpha); + ok(blend_desc.DestBlendAlpha == D3D10_BLEND_ZERO, + "Got unexpected dest blend alpha %#x.\n", blend_desc.DestBlendAlpha); + ok(blend_desc.BlendOpAlpha == D3D10_BLEND_OP_ADD, + "Got unexpected blend op alpha %#x.\n", blend_desc.BlendOpAlpha); + for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) + { + ok(blend_desc.BlendEnable[i] == FALSE, + "Got unexpected blend enable %#x for render target %u.\n", + blend_desc.BlendEnable[i], i); + ok(blend_desc.RenderTargetWriteMask[i] == D3D10_COLOR_WRITE_ENABLE_ALL, + "Got unexpected render target write mask %#x for render target %u.\n", + blend_desc.RenderTargetWriteMask[i], i); + } + /* Not available on all Windows versions. */ check_interface(blend_state1, &IID_ID3D10BlendState1, TRUE, TRUE);

1 0

Gabriel Ivăncescu : shell32/autocomplete: Handle heap_alloc failure.
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

Module: wine Branch: master Commit: 97006eb6619e27edabd4ab2c8181207e10c09ca6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97006eb6619e27edabd4ab2c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 10 22:09:32 2018 +0300 shell32/autocomplete: Handle heap_alloc failure. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 587d41f..6a77ddb 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -210,7 +210,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, int len; len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, 0); - msg = heap_alloc((len + 1)*sizeof(WCHAR)); + if (!(msg = heap_alloc((len + 1) * sizeof(WCHAR)))) + return 0; SendMessageW(This->hwndListBox, LB_GETTEXT, sel, (LPARAM)msg); SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)msg); SendMessageW(hwnd, EM_SETSEL, lstrlenW(msg), lstrlenW(msg)); @@ -329,7 +330,8 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, if (sel < 0) break; len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, 0); - msg = heap_alloc((len + 1)*sizeof(WCHAR)); + if (!(msg = heap_alloc((len + 1) * sizeof(WCHAR)))) + break; SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); SendMessageW(This->hwndEdit, WM_SETTEXT, 0, (LPARAM)msg); SendMessageW(This->hwndEdit, EM_SETSEL, 0, lstrlenW(msg));

1 0