wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

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

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

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@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@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@space@@space@@space@ :forFParameterSplittingFunc myparam1=myvalue1 myparam2=myparam2 mytest@space@@space@@space@

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@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@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@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@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@space@@space@@space@ :forFParameterSplittingFunc myparam1=myvalue1 myparam2=myparam2 mytest@space@@space@@space@ +4:3.14,%B +5:3,14 +6:14, ------------ Testing del ------------ deleting 'file' errorlevel is 0, good

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

Jactry Zeng : ole32: Partially implement OleCreateStaticFromData() for OLERENDER_FORMAT.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 21fda36997313fea5b888673808596df68e8524d URL: https://source.winehq.org/git/wine.git/?a=commit;h=21fda36997313fea5b888673… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Sep 4 20:57:06 2018 +0800 ole32: Partially implement OleCreateStaticFromData() for OLERENDER_FORMAT. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42710 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 68e35eb7456e68d4233ffc5e795511823a45ba6a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/ole2impl.c | 97 +++++++++++++++++++++++- dlls/ole32/tests/ole2.c | 191 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 286 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21fda36997313fea5b88…

1 0

Alistair Leslie-Hughes : mfplat: Implement MFCreateSample.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: f1dd23ca094039b3da2c1f81b2239dc755d8c8e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1dd23ca094039b3da2c1f81… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 12 23:52:11 2018 +0000 mfplat: Implement MFCreateSample. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45617 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b0826c016142ba669f5836bb34685147fdd4a697) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mfplat/main.c | 443 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 17 ++ include/mfapi.h | 1 + 4 files changed, 462 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1dd23ca094039b3da2c…

1 0

Alistair Leslie-Hughes : mfplat: Forward IMFMediaType to IMFAttributes.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 92c399b19982a0f29d1bd5573d9e2d68d3532768 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92c399b19982a0f29d1bd557… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 12 00:19:07 2018 +0000 mfplat: Forward IMFMediaType to IMFAttributes. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 71dec0996070bda9b9562e67e7a46ac8f4c59604) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mfplat/main.c | 170 ++++++++++++++--------------------------------------- 1 file changed, 43 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=92c399b19982a0f29d1b…

1 0

Louis Lenders : pidgen: Add stub for PIDGenSimpW.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 9179d4466e8b92309b8dee175524d08df494f917 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9179d4466e8b92309b8dee17… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Sep 6 13:23:29 2018 +0200 pidgen: Add stub for PIDGenSimpW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45770 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit db2d831600f9677f81023d639d30f21fcfa29eb3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/pidgen/main.c | 7 +++++++ dlls/pidgen/pidgen.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/pidgen/main.c b/dlls/pidgen/main.c index cf165ea..95f5389 100644 --- a/dlls/pidgen/main.c +++ b/dlls/pidgen/main.c @@ -50,3 +50,10 @@ int WINAPI PIDGenSimpA(LPCSTR str, int p1, int p2, int p3, int p4, int p5, int p return 0; } + +int WINAPI PIDGenSimpW(const WCHAR* str, int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8) +{ + FIXME("%s,%d,%d,%d,%d,%d,%d,%d,%d\n", debugstr_w(str), p1, p2, p3, p4, p5, p6, p7, p8); + + return 0; +} diff --git a/dlls/pidgen/pidgen.spec b/dlls/pidgen/pidgen.spec index 8b7e778..aba0107 100644 --- a/dlls/pidgen/pidgen.spec +++ b/dlls/pidgen/pidgen.spec @@ -1,7 +1,7 @@ @ stub PIDGenA @ stub PIDGenW @ stdcall PIDGenSimpA(str long long long long long long long long) -@ stub PIDGenSimpW +@ stdcall PIDGenSimpW(wstr long long long long long long long long) @ stub SetupPIDGenA @ stub SetupPIDGenW @ stub VerifyPIDSequenceW

1 0

Henri Verbeet : d3d10: Handle D3D10_DRIVER_TYPE_WARP in D3D10CreateDevice( ).
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 5d756e2020773688743b9e1cf608134553d64e54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d756e2020773688743b9e1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 5 03:05:45 2018 +0430 d3d10: Handle D3D10_DRIVER_TYPE_WARP in D3D10CreateDevice(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f6484434cb68cfb497464f9df28a3e1d0c4f8ca3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d10/d3d10_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 52585f0..480e17e 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -63,6 +63,8 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver switch (driver_type) { + case D3D10_DRIVER_TYPE_WARP: + FIXME("WARP driver not implemented, falling back to hardware.\n"); case D3D10_DRIVER_TYPE_HARDWARE: { hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter);

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2018