November 2018 - Wine-commits

Michael Stefaniuc : Release 3.0.4.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: bab51fbb231e1e05990ff2bc4632cc915ffd9014 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bab51fbb231e1e05990ff2bc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 13 22:06:35 2018 +0100 Release 3.0.4. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 479 +++++++++++++++++++++++++++++++++++++------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +-- 4 files changed, 298 insertions(+), 204 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bab51fbb231e1e05990f…

1 0

Tag wine-3.0.4 : Alexandre Julliard : Release 3.0.4
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: refs/tags/wine-3.0.4 Tag: 5d633658b8ad620c8546507f35ea4e7c735c8b64 URL: https://source.winehq.org/git/wine.git/?a=tag;h=5d633658b8ad620c8546507f35e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 29 22:07:40 2018 +0100 Release 3.0.4

1 0

Rodrigo Saboya : wine.inf: Updates E. South America Standard Time DST data.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 8304053aadb2139880c9efd9f61b5bff285f9980 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8304053aadb2139880c9efd9… 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> (cherry picked from commit b29cdbd5f23548d9631e5c98ec923b6d2d16a3f8) Signed-off-by: Michael Stefaniuc <mstefani(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 1ed87dc..be3e861 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2799,7 +2799,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

Jason Edmeades : cmd: Handle special case tokens=* in for /f.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: f18ebeda4ebd0b5e1f81b23c66327c73868c3a05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f18ebeda4ebd0b5e1f81b23c… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Jul 15 23:15:27 2018 +0100 cmd: Handle special case tokens=* in for /f. for /f allows a special syntax of tokens=* (rather than tokens=1* for example) which just means put the whole line into the next variable). Note the handling of the 'next variable' was wrong in the case of it being 'A' or 'a' as the wrap calculation was wrong, but this only affected using this new syntax. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4030a952095398e5a42f0a74213f6a1e9186c4bc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/builtins.c | 28 ++++++++++++++++++---------- programs/cmd/tests/test_builtins.cmd | 12 ++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 5 +++++ 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 752cf43..9cd86b3 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1845,6 +1845,14 @@ 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 */ + if (*pos == '*') { + if (doall) *doall = TRUE; + if (totalfound) (*totalfound)++; + nexttoken = 0; + break; + } + /* Get the next number */ nextnumber1 = strtoulW(pos, &nextchar, 10); @@ -1973,22 +1981,22 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, */ lasttoken = -1; nexttoken = WCMD_for_nexttoken(lasttoken, forf_tokens, &totalfound, - NULL, &thisduplicate); + &starfound, &thisduplicate); varidx = FOR_VAR_IDX(variable); /* Empty out variables */ for (varoffset=0; - varidx >= 0 && varoffset<totalfound && ((varidx+varoffset)%26); + varidx >= 0 && varoffset<totalfound && (((varidx%26) + varoffset) < 26); varoffset++) { forloopcontext.variable[varidx + varoffset] = (WCHAR *)nullW; - /* Stop if we walk beyond z or Z */ - if (((varidx+varoffset) % 26) == 0) break; } - /* Loop extracting the tokens */ + /* Loop extracting the tokens + Note: nexttoken of 0 means there were no tokens requested, to handle + the special case of tokens=* */ varoffset = 0; WINE_TRACE("Parsing buffer into tokens: '%s'\n", wine_dbgstr_w(buffer)); - while (varidx >= 0 && (nexttoken > lasttoken)) { + while (varidx >= 0 && (nexttoken > 0 && (nexttoken > lasttoken))) { anyduplicates |= thisduplicate; /* Extract the token number requested and set into the next variable context */ @@ -1996,9 +2004,9 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, WINE_TRACE("Parsed token %d(%d) as parameter %s\n", nexttoken, varidx + varoffset, wine_dbgstr_w(parm)); if (varidx >=0) { - forloopcontext.variable[varidx + varoffset] = heap_strdupW(parm); + if (parm) forloopcontext.variable[varidx + varoffset] = heap_strdupW(parm); varoffset++; - if (((varidx + varoffset) %26) == 0) break; + if (((varidx%26)+varoffset) >= 26) break; } /* Find the next token */ @@ -2009,12 +2017,12 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, /* If all the rest of the tokens were requested, and there is still space in the variable range, write them now */ - if (!anyduplicates && starfound && varidx >= 0 && ((varidx+varoffset) % 26)) { + if (!anyduplicates && starfound && varidx >= 0 && (((varidx%26) + varoffset) < 26)) { nexttoken++; WCMD_parameter_with_delims(buffer, (nexttoken-1), &parm, FALSE, FALSE, forf_delims); WINE_TRACE("Parsed allremaining tokens (%d) as parameter %s\n", varidx + varoffset, wine_dbgstr_w(parm)); - forloopcontext.variable[varidx + varoffset] = heap_strdupW(parm); + if (parm) forloopcontext.variable[varidx + varoffset] = heap_strdupW(parm); } /* Execute the body of the foor loop with these values */ diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index cf9a986..08b9d9d 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1774,6 +1774,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=* +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 +del testfile cd .. rd /s/q foobar echo ------ parameter splitting @@ -1786,6 +1792,12 @@ goto :forFParameterSplittingEnd echo %~0 %~1 %~2 %~3 %~4 %~5 goto :eof :forFParameterSplittingEnd +echo 3.14>testfile +FOR /F "delims=. tokens=*" %%A IN (testfile) DO @echo 4:%%A,%%B +FOR /F "delims=. tokens=1*" %%A IN (testfile) DO @echo 5:%%A,%%B +FOR /F "delims=. tokens=2*" %%A IN (testfile) DO @echo 6:%%A,%%B +FOR /F "delims=. tokens=3*" %%A IN (testfile) DO @echo 7:%%A,%%B +del testfile echo ------------ Testing del ------------ echo abc > file diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index dd8d1d4..e105576 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1253,9 +1253,14 @@ h=%h i=a j=b k=c l=d e f g m=%m n=%n o=%o(a)or_broken@h=%h i=a j=b k=c l=d e f g m h=%h i=a j=c k= l= m=%m n=%n o=%o(a)or_broken@h=%h i=a 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 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, ------ parameter splitting :forFParameterSplittingFunc myparam1=myvalue1 myparam2=myparam2 mytest(a)space@@space@@space@ :forFParameterSplittingFunc myparam1=myvalue1 myparam2=myparam2 mytest(a)space@@space@@space@ +4:3.14,%B +5:3,14 +6:14, ------------ Testing del ------------ deleting 'file' errorlevel is 0, good

1 0

Jason Edmeades : cmd: Handle "for" loop handling of tokens, where * does not follow a number.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 5d6c525dc4d4390f468ffafaf1e6cdeb29f410d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d6c525dc4d4390f468ffafa… 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> (cherry picked from commit 1a7333bec627a31a43d380ecc63e5792e302373e) Signed-off-by: Michael Stefaniuc <mstefani(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 9cd86b3..48cfc13 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 08b9d9d..1874b0c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1774,11 +1774,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 e105576..ebb3161 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1255,6 +1255,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

Michael Müller : wininet: Resize buffer when call to InternetCanonicalizeUrlW fails in InternetCrackUrlW.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 6fd7afe2a0eb73cbe510f1e5f1aa7825ca088ccf URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fd7afe2a0eb73cbe510f1e5… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Aug 31 02:29:05 2018 +0000 wininet: Resize buffer when call to InternetCanonicalizeUrlW fails in InternetCrackUrlW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40598 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bfe8510ec0c7bcef0be1f6990c56ad235d8bccd6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/internet.c | 21 ++++++++++++++++++--- dlls/wininet/tests/url.c | 6 +++--- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 699962c..6be5ec7 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1661,7 +1661,7 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF if (dwFlags & ICU_DECODE) { - WCHAR *url_tmp; + WCHAR *url_tmp, *buffer; DWORD len = dwUrlLength + 1; BOOL ret; @@ -1670,9 +1670,24 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF SetLastError(ERROR_OUTOFMEMORY); return FALSE; } - ret = InternetCanonicalizeUrlW(url_tmp, url_tmp, &len, ICU_DECODE | ICU_NO_ENCODE); + + buffer = url_tmp; + ret = InternetCanonicalizeUrlW(url_tmp, buffer, &len, ICU_DECODE | ICU_NO_ENCODE); + if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + buffer = heap_alloc(len * sizeof(WCHAR)); + if (!buffer) + { + SetLastError(ERROR_OUTOFMEMORY); + heap_free(url_tmp); + return FALSE; + } + ret = InternetCanonicalizeUrlW(url_tmp, buffer, &len, ICU_DECODE | ICU_NO_ENCODE); + } if (ret) - ret = InternetCrackUrlW(url_tmp, len, dwFlags & ~ICU_DECODE, lpUC); + ret = InternetCrackUrlW(buffer, len, dwFlags & ~ICU_DECODE, lpUC); + + if (buffer != url_tmp) heap_free(buffer); heap_free(url_tmp); return ret; } diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 0af5835..2024b15 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -816,9 +816,9 @@ static void InternetCrackUrlW_test(void) comp.lpszUrlPath = urlpart; comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); r = InternetCrackUrlW(url3, 0, ICU_DECODE, &comp); - todo_wine ok(r, "InternetCrackUrlW failed unexpectedly\n"); - todo_wine ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host)); - ok(urlpart[0] == 0, "urlpart should be empty\n"); + ok(r, "InternetCrackUrlW failed unexpectedly\n"); + ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host)); + todo_wine ok(urlpart[0] == 0, "urlpart should be empty\n"); } static void fill_url_components(URL_COMPONENTSA *lpUrlComponents)

1 0

Alistair Leslie-Hughes : mfplat: Add MFTRegisterLocal stub.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 5f19d7ad19ca9996168fc0360286af61bf4fbf32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f19d7ad19ca9996168fc036… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 7 00:58:37 2018 +0000 mfplat: Add MFTRegisterLocal stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45622 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5b8565d60760f17ecac7bccf9f2c4477943de544) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mfplat/main.c | 10 ++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e0f8c80..f357e2a 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -231,6 +231,16 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags return hr; } +HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWSTR name, + UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, + UINT32 coutput, const MFT_REGISTER_TYPE_INFO* output_types) +{ + FIXME("(%p, %s, %s, %x, %u, %p, %u, %p)\n", factory, debugstr_guid(category), debugstr_w(name), + flags, cinput, input_types, coutput, output_types); + + return S_OK; +} + static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGISTER_TYPE_INFO *type) { HKEY htransform, hfilter; diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 8503b20..ba730e3 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -138,7 +138,7 @@ @ stdcall MFTEnumEx(int128 long ptr ptr ptr ptr) @ stub MFTGetInfo @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) -@ stub MFTRegisterLocal +@ stub MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stub MFTRegisterLocalByCLSID @ stdcall MFTUnregister(int128) @ stub MFTUnregisterLocal diff --git a/include/mfapi.h b/include/mfapi.h index ac8e3a4..3a10df7 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -80,6 +80,9 @@ HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags, UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes); +HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWSTR name, + UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, + UINT32 coutput, const MFT_REGISTER_TYPE_INFO* output_types); HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); HRESULT WINAPI MFUnlockPlatform(void);

1 0

Alistair Leslie-Hughes : mfplat: Correct spec for MFTRegisterLocal.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: a6721224613e0b041a3291334834d6f7ba804098 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6721224613e0b041a329133… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 10 22:11:59 2018 +0000 mfplat: Correct spec for MFTRegisterLocal. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 24279f1cf26832dad45d5bc850b5a193f408f521) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mfplat/mfplat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index ba730e3..8a1fcd0 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -138,7 +138,7 @@ @ stdcall MFTEnumEx(int128 long ptr ptr ptr ptr) @ stub MFTGetInfo @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) -@ stub MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) +@ stdcall MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stub MFTRegisterLocalByCLSID @ stdcall MFTUnregister(int128) @ stub MFTUnregisterLocal

1 0

Michael Stefaniuc : Revert "arm64: Use __builtin_ms_va_list and __attribute__((ms_abi)) on arm64."
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 578ea23ca37c86bfaa66899a26cb10182c276be8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=578ea23ca37c86bfaa66899a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 6 20:48:25 2018 +0100 Revert "arm64: Use __builtin_ms_va_list and __attribute__((ms_abi)) on arm64." This reverts commit 295359a17447d6ad487b6c652c3a98bbe17cee6e. It breaks compilation for ARM64 with other compilers than clang > 5.0. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46106 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 24 ------------------------ configure.ac | 7 ------- include/msvcrt/crtdefs.h | 6 +----- include/windef.h | 6 +----- include/wine/test.h | 4 ++-- 5 files changed, 4 insertions(+), 43 deletions(-) diff --git a/configure b/configure index 05da31d..289eab0 100755 --- a/configure +++ b/configure @@ -5314,30 +5314,6 @@ rm -f core conftest.err conftest.$ac_objext \ TARGETFLAGS="-marm -mfloat-abi=$float_abi" ;; - aarch64*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports __builtin_ms_va_list" >&5 -$as_echo_n "checking whether $CC supports __builtin_ms_va_list... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdarg.h> -int -main () -{ -void func(__builtin_ms_va_list *args); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error $? "You need clang >= 5.0 to build Wine for arm64." "$LINENO" 5 -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ;; i[3456789]86*) enable_win16=${enable_win16:-yes} ;; diff --git a/configure.ac b/configure.ac index 201ef0c..ec2e16f 100644 --- a/configure.ac +++ b/configure.ac @@ -202,13 +202,6 @@ case $host in CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" AC_SUBST(TARGETFLAGS,"-marm -mfloat-abi=$float_abi") ;; - aarch64*) - AC_MSG_CHECKING([whether $CC supports __builtin_ms_va_list]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])], - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]) - AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.])]) - ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes} ;; diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index 0c0b087..a9edef5 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -62,8 +62,6 @@ # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) -# elif defined(__aarch64__) && defined (__GNUC__) -# define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -84,15 +82,13 @@ # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __cdecl __attribute__((pcs("aapcs-vfp"))) -# elif defined(__aarch64__) && defined (__GNUC__) -# define __cdecl __attribute__((ms_abi)) # elif !defined(_MSC_VER) # define __cdecl # endif #endif /* __cdecl */ #ifndef __ms_va_list -# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) +# if defined(__x86_64__) && defined (__GNUC__) # define __ms_va_list __builtin_ms_va_list # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_end(list) __builtin_ms_va_end(list) diff --git a/include/windef.h b/include/windef.h index d12b14f..8a9f944 100644 --- a/include/windef.h +++ b/include/windef.h @@ -71,8 +71,6 @@ extern "C" { # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) -# elif defined(__aarch64__) && defined (__GNUC__) -# define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -93,15 +91,13 @@ extern "C" { # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __cdecl __attribute__((pcs("aapcs-vfp"))) -# elif defined(__aarch64__) && defined (__GNUC__) -# define __cdecl __attribute__((ms_abi)) # elif !defined(_MSC_VER) # define __cdecl # endif #endif /* __cdecl */ #ifndef __ms_va_list -# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) +# if defined(__x86_64__) && defined (__GNUC__) # define __ms_va_list __builtin_ms_va_list # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_end(list) __builtin_ms_va_end(list) diff --git a/include/wine/test.h b/include/wine/test.h index 3caff6c..4ec66d5 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -87,7 +87,7 @@ static inline int winetest_strcmpW( const WCHAR *str1, const WCHAR *str2 ) #define START_TEST(name) void func_##name(void) #endif -#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) #define __winetest_cdecl __cdecl #define __winetest_va_list __builtin_ms_va_list #else @@ -178,7 +178,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) WINETEST_PRI #include <stdio.h> #include <excpt.h> -#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) # define __winetest_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __winetest_va_end(list) __builtin_ms_va_end(list) #else

1 0

Alex Henrie : kernel32: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: eaad1973c918272a2128cd328f8656b5d4709d18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eaad1973c918272a2128cd32… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Sep 18 00:57:42 2018 -0600 kernel32: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b8b946dd0f2159b30b9775526c7aa5763bce71bd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 6d5f8d8..941177c 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -574,7 +574,7 @@ LPVOID WINAPI MapViewOfFileEx( HANDLE handle, DWORD access, * Failure: FALSE. * */ -BOOL WINAPI UnmapViewOfFile( LPCVOID addr ) +BOOL WINAPI DECLSPEC_HOTPATCH UnmapViewOfFile( const void *addr ) { NTSTATUS status;

1 0