April 2019 - Wine-commits - list.winehq.org

Nikolay Sivov : mfplat: Trace known format ids in MFCalculateImageSize().
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: fee85530dc224d59c08cbe09697dadbe76689c59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fee85530dc224d59c08cbe09… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 2 11:46:16 2019 +0300 mfplat: Trace known format ids in MFCalculateImageSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 2 +- dlls/mfplat/mediatype.c | 2 +- dlls/mfplat/mfplat_private.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index be3a78d..a3e784c 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -687,7 +687,7 @@ const char *debugstr_attr(const GUID *guid) return ret ? wine_dbg_sprintf("%s", ret->name) : wine_dbgstr_guid(guid); } -static const char *debugstr_mf_guid(const GUID *guid) +const char *debugstr_mf_guid(const GUID *guid) { static const struct guid_def guid_defs[] = { diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 49143c5..f4a2577 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -1759,7 +1759,7 @@ HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height }; struct uncompressed_video_format *format; - TRACE("%s, %u, %u, %p.\n", debugstr_guid(subtype), width, height, size); + TRACE("%s, %u, %u, %p.\n", debugstr_mf_guid(subtype), width, height, size); format = bsearch(subtype, video_formats, ARRAY_SIZE(video_formats), sizeof(*video_formats), uncompressed_video_format_compare); diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 5b183d4..d7a7547f 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -43,6 +43,7 @@ struct attributes extern HRESULT init_attributes_object(struct attributes *object, UINT32 size) DECLSPEC_HIDDEN; extern void clear_attributes_object(struct attributes *object) DECLSPEC_HIDDEN; extern const char *debugstr_attr(const GUID *guid) DECLSPEC_HIDDEN; +extern const char *debugstr_mf_guid(const GUID *guid) DECLSPEC_HIDDEN; extern HRESULT attributes_GetItem(struct attributes *object, REFGUID key, PROPVARIANT *value) DECLSPEC_HIDDEN; extern HRESULT attributes_GetItemType(struct attributes *object, REFGUID key, MF_ATTRIBUTE_TYPE *type) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : mfplat: Use attributes helpers for events.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: bf8d536c2218cdc857278f4ecd85f2693c1cbb6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf8d536c2218cdc857278f4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 2 11:46:17 2019 +0300 mfplat: Use attributes helpers for events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 220 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 155 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf8d536c2218cdc85727…

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 9a6feb8500fec7d07bf83d7d1870e2548bb60e0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a6feb8500fec7d07bf83d7d… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Sun Mar 31 05:14:38 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 416 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 244 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9a6feb8500fec7d07bf8…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: e6ec186f8acff11a4d515264dd71a01be305b7d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6ec186f8acff11a4d515264… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Apr 2 10:26:27 2019 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 44 +++++++++++++------------------------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/po/lt.po b/po/lt.po index f7356ed..f986efe 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-03-27 10:40+0300\n" +"PO-Revision-Date: 2019-04-02 10:23+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -7040,16 +7040,12 @@ msgid "No events available.\n" msgstr "Nėra pasiekiamų įvykių.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Unsupported state transition.\n" msgid "Invalid media source state transition\n" -msgstr "Nepalaikomas būsenos perėjimas.\n" +msgstr "Neteisingas medijos šaltinio būsenos perėjimas\n" #: mferror.mc:452 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "End of media stream has been reached\n" -msgstr "Registras atkurtas.\n" +msgstr "Pasiekta medijos srauto pabaiga\n" #: mferror.mc:459 msgid "Shutdown() was called.\n" @@ -7057,57 +7053,43 @@ msgstr "Shutdown() buvo iškviesta.\n" #: mferror.mc:466 msgid "Media stream has no duration set\n" -msgstr "" +msgstr "Medijos srautui nenustatyta trukmė\n" #: mferror.mc:473 msgid "Media format was recognized but is invalid\n" -msgstr "" +msgstr "Medijos formatas atpažintas, bet neteisingas\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found\n" -msgstr "Savybių aibė nerasta.\n" +msgstr "Savybė nerasta\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Property is empty.\n" msgid "Property is read-only\n" -msgstr "Savybė tuščia.\n" +msgstr "Savybė tik skaitymui\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Property type is not allowed.\n" msgid "Property is not allowed\n" -msgstr "Savybės tipas neleidžiamas.\n" +msgstr "Savybė neleidžiama\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started\n" -msgstr "Išteklius naudojamas.\n" +msgstr "Medijos šaltinis nepradėtas\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported time format.\n" msgid "Unsupported media format\n" -msgstr "Nepalaikomas laiko formatas.\n" +msgstr "Nepalaikomas medijos formatas\n" #: mferror.mc:515 msgid "Media source is in wrong state\n" -msgstr "" +msgstr "Medijos šaltinis neteisingoje būsenoje\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected\n" -msgstr "Neaptikta duomenų.\n" +msgstr "Nepasirinktas nė vienas medijos srautas\n" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported time format.\n" msgid "Unsupported media source characteristics\n" -msgstr "Nepalaikomas laiko formatas.\n" +msgstr "Nepalaikomos medijos šaltinio charakteristikos\n" #: mferror.mc:536 msgid "Optional node is invalid.\n"

1 0

Vincent Povirk : uninstaller: Re-exec as 64-bit in wow64.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 88580a3ad6e6afea25716b8717a33d20184154e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88580a3ad6e6afea25716b87… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 30 15:55:43 2019 -0500 uninstaller: Re-exec as 64-bit in wow64. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/main.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 142d3d1..fa9a23c 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -165,6 +165,31 @@ int wmain(int argc, WCHAR *argv[]) static const WCHAR listW[] = { '-','-','l','i','s','t',0 }; static const WCHAR removeW[] = { '-','-','r','e','m','o','v','e',0 }; int i = 1; + BOOL is_wow64; + + if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) + { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR filename[MAX_PATH]; + void *redir; + DWORD exit_code; + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + GetModuleFileNameW( 0, filename, MAX_PATH ); + + Wow64DisableWow64FsRedirection( &redir ); + if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + { + WINE_TRACE( "restarting %s\n", wine_dbgstr_w(filename) ); + WaitForSingleObject( pi.hProcess, INFINITE ); + GetExitCodeProcess( pi.hProcess, &exit_code ); + ExitProcess( exit_code ); + } + else WINE_ERR( "failed to restart 64-bit %s, err %d\n", wine_dbgstr_w(filename), GetLastError() ); + Wow64RevertWow64FsRedirection( redir ); + } while( i<argc ) {

1 0

Gijs Vermeulen : msvcrt/tests: Add missing return value check.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: e49a937ae30c1552adb0ffeceb68f92c4efb7618 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e49a937ae30c1552adb0ffec… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Apr 1 18:00:16 2019 +0200 msvcrt/tests: Add missing return value check. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index ff3a87d..09492e3 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3250,6 +3250,7 @@ static void test__wcsset_s(void) str[1] = 0; str[2] = 'b'; r = p__wcsset_s(str, 3, 'c'); + ok(r == 0, "r = %d\n", r); ok(str[0] == 'c', "str[0] = %d\n", str[0]); ok(str[1] == 0, "str[1] = %d\n", str[1]); ok(str[2] == 'b', "str[2] = %d\n", str[2]);

1 0

Francois Gouget : urlmon/tests: Minor spelling tweak in a comment.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: bc501222f055c36e7fcef46f2b16ab3cffa2ab17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc501222f055c36e7fcef46f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 1 18:23:38 2019 +0200 urlmon/tests: Minor spelling tweak in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 0f2b14e..1aef981 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2972,7 +2972,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) if(protocol == FTP_TEST) { - /* FTP url dont have any escape characters, so convert the url to what is expected */ + /* FTP urls don't have any escape characters so convert the url to what is expected */ DWORD size = 0; UrlUnescapeW(current_url, NULL, &size, URL_UNESCAPE_INPLACE); }

1 0

Gijs Vermeulen : msvcrt: Implement _wcsnset_s.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 92ba9e7b6dd3b4d5fe2349ea1a5c413778c53143 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92ba9e7b6dd3b4d5fe2349ea… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Apr 1 19:57:07 2019 +0200 msvcrt: Implement _wcsnset_s. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46902 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 42 ++++++++++++++++++++++ dlls/msvcrt/wcs.c | 24 +++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 11 files changed, 75 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index 7854437..ead56fb 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -87,7 +87,7 @@ @ cdecl _wcsnicoll(wstr wstr long) ucrtbase._wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) ucrtbase._wcsnicoll_l @ cdecl _wcsnset(wstr long long) ucrtbase._wcsnset -@ stub _wcsnset_s +@ cdecl _wcsnset_s(wstr long long long) ucrtbase._wcsnset_s @ cdecl _wcsrev(wstr) ucrtbase._wcsrev @ cdecl _wcsset(wstr long) ucrtbase._wcsset @ cdecl _wcsset_s(wstr long long) ucrtbase._wcsset_s diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 668fb58..e435766 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1507,7 +1507,7 @@ @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset -@ stub _wcsnset_s +@ cdecl _wcsnset_s(wstr long long long) MSVCRT__wcsnset_s @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 220c122..39dfb8c 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1865,7 +1865,7 @@ @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset -@ stub _wcsnset_s +@ cdecl _wcsnset_s(wstr long long long) MSVCRT__wcsnset_s @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 28b849a..8cd39ea 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1883,7 +1883,7 @@ @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset -@ stub _wcsnset_s +@ cdecl _wcsnset_s(wstr long long long) MSVCRT__wcsnset_s @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 2bb377b..dc3f3bd 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1576,7 +1576,7 @@ @ cdecl _wcsnicoll(wstr wstr long) msvcr120._wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) msvcr120._wcsnicoll_l @ cdecl _wcsnset(wstr long long) msvcr120._wcsnset -@ stub _wcsnset_s +@ cdecl _wcsnset_s(wstr long long long) msvcr120._wcsnset_s @ cdecl _wcsrev(wstr) msvcr120._wcsrev @ cdecl _wcsset(wstr long) msvcr120._wcsset @ cdecl _wcsset_s(wstr long long) msvcr120._wcsset_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 53826db..c9208b2 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1186,7 +1186,7 @@ @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset -@ stub _wcsnset_s +@ cdecl _wcsnset_s(wstr long long long) MSVCRT__wcsnset_s @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5a9f891..7a2ce05 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1162,7 +1162,7 @@ @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset -@ stub _wcsnset_s +@ cdecl _wcsnset_s(wstr long long long) MSVCRT__wcsnset_s @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d452616..101e2c7 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1117,7 +1117,7 @@ @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset -# stub _wcsnset_s(wstr long long) +@ cdecl _wcsnset_s(wstr long long long) MSVCRT__wcsnset_s @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 09492e3..cbfa53a 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -101,6 +101,7 @@ static int (__cdecl *p__atodbl_l)(_CRT_DOUBLE*,char*,_locale_t); static double (__cdecl *p__atof_l)(const char*,_locale_t); static double (__cdecl *p__strtod_l)(const char *,char**,_locale_t); static int (__cdecl *p__strnset_s)(char*,size_t,int,size_t); +static int (__cdecl *p__wcsnset_s)(wchar_t*,size_t,wchar_t,size_t); static int (__cdecl *p__wcsset_s)(wchar_t*,size_t,wchar_t); static size_t (__cdecl *p__mbsnlen)(const unsigned char*, size_t); static int (__cdecl *p__mbccpy_s)(unsigned char*, size_t, int*, const unsigned char*); @@ -3221,6 +3222,45 @@ static void test__strnset_s(void) ok(!buf[0] && buf[1]=='c' && buf[2]=='b', "buf = %s\n", buf); } +static void test__wcsnset_s(void) +{ + wchar_t text[] = { 't','e','x','t',0 }; + int r; + + if(!p__wcsnset_s) { + win_skip("_wcsnset_s not available\n"); + return; + } + + r = p__wcsnset_s(NULL, 0, 'a', 0); + ok(r == 0, "r = %d\n", r); + + r = p__wcsnset_s(text, 0, 'a', 1); + ok(r == EINVAL, "r = %d\n", r); + ok(text[0] == 't', "text[0] = %d\n", text[0]); + + r = p__wcsnset_s(NULL, 2, 'a', 1); + ok(r == EINVAL, "r = %d\n", r); + + r = p__wcsnset_s(text, 2, 'a', 3); + ok(r == EINVAL, "r = %d\n", r); + ok(text[0] == 0, "text[0] = %d\n", text[0]); + ok(text[1] == 'e', "text[1] = %d\n", text[1]); + + text[0] = 't'; + r = p__wcsnset_s(text, 5, 'a', 1); + ok(r == 0, "r = %d\n", r); + ok(text[0] == 'a', "text[0] = %d\n", text[0]); + ok(text[1] == 'e', "text[1] = %d\n", text[1]); + + text[1] = 0; + r = p__wcsnset_s(text, 5, 'b', 3); + ok(r == 0, "r = %d\n", r); + ok(text[0] == 'b', "text[0] = %d\n", text[0]); + ok(text[1] == 0, "text[1] = %d\n", text[1]); + ok(text[2] == 'x', "text[2] = %d\n", text[2]); +} + static void test__wcsset_s(void) { wchar_t str[10]; @@ -3788,6 +3828,7 @@ START_TEST(string) p__atof_l = (void*)GetProcAddress(hMsvcrt, "_atof_l"); p__strtod_l = (void*)GetProcAddress(hMsvcrt, "_strtod_l"); p__strnset_s = (void*)GetProcAddress(hMsvcrt, "_strnset_s"); + p__wcsnset_s = (void*)GetProcAddress(hMsvcrt, "_wcsnset_s"); p__wcsset_s = (void*)GetProcAddress(hMsvcrt, "_wcsset_s"); p__mbsnlen = (void*)GetProcAddress(hMsvcrt, "_mbsnlen"); p__mbccpy_s = (void*)GetProcAddress(hMsvcrt, "_mbccpy_s"); @@ -3854,6 +3895,7 @@ START_TEST(string) test_strncpy(); test_strxfrm(); test__strnset_s(); + test__wcsnset_s(); test__wcsset_s(); test__mbscmp(); test__ismbclx(); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 28e82ec..2a75030 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -174,6 +174,30 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsnset( MSVCRT_wchar_t* str, MSVCRT_wchar_t c, MS } /********************************************************************* + * _wcsnset_s (MSVCRT.@) + */ +int CDECL MSVCRT__wcsnset_s( MSVCRT_wchar_t *str, MSVCRT_size_t size, MSVCRT_wchar_t c, MSVCRT_size_t count ) +{ + MSVCRT_size_t i; + + if(!str && !size && !count) return 0; + if(!MSVCRT_CHECK_PMT(str != NULL)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(size > 0)) return MSVCRT_EINVAL; + + for(i=0; i<size-1 && i<count; i++) { + if(!str[i]) return 0; + str[i] = c; + } + for(; i<size; i++) + if(!str[i]) return 0; + + str[0] = 0; + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; +} + +/********************************************************************* * _wcsrev (MSVCRT.@) */ MSVCRT_wchar_t* CDECL MSVCRT__wcsrev( MSVCRT_wchar_t* str ) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index e50d89c..d218aa3 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2032,7 +2032,7 @@ @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset -@ stub _wcsnset_s +@ cdecl _wcsnset_s(wstr long long long) MSVCRT__wcsnset_s @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s

1 0

Jacek Caban : mfobjects.idl: Add missing MFVideoTransferMatrix entries.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: c1f851179ea7faa3c0eb113fb9f067e8628d283c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1f851179ea7faa3c0eb113f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 2 15:28:39 2019 +0200 mfobjects.idl: Add missing MFVideoTransferMatrix entries. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfobjects.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/mfobjects.idl b/include/mfobjects.idl index 1f17c82..0cc8f42 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -270,6 +270,8 @@ typedef enum _MFVideoTransferMatrix { MFVideoTransferMatrix_BT709 = 1, MFVideoTransferMatrix_BT601 = 2, MFVideoTransferMatrix_SMPTE240M = 3, + MFVideoTransferMatrix_BT2020_10 = 4, + MFVideoTransferMatrix_BT2020_12 = 5, MFVideoTransferMatrix_Last, MFVideoTransferMatrix_ForceDWORD = 0x7fffffff } MFVideoTransferMatrix;

1 0

Piotr Caban : shell.dll16: Don't use strncasecmp.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: fab4b11bc22e6f3109ba6fd52f78e33954c80f9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fab4b11bc22e6f3109ba6fd5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 2 16:51:32 2019 +0200 shell.dll16: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell.dll16/shell.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell.dll16/shell.c b/dlls/shell.dll16/shell.c index be8ffeb..748db67 100644 --- a/dlls/shell.dll16/shell.c +++ b/dlls/shell.dll16/shell.c @@ -40,6 +40,7 @@ #include "wingdi.h" #include "shlobj.h" #include "shlwapi.h" +#include "winternl.h" #include "wine/winbase16.h" #include "wine/winuser16.h" @@ -358,7 +359,7 @@ static LPSTR SHELL_FindString(LPSTR lpEnv, LPCSTR entry) l = strlen(entry); for( ; *lpEnv ; lpEnv+=strlen(lpEnv)+1 ) - { if( strncasecmp(lpEnv, entry, l) ) + { if( _strnicmp(lpEnv, entry, l) ) continue; if( !*(lpEnv+l) ) return (lpEnv + l); /* empty entry */

1 0