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

Piotr Caban : msvfw32: Don't use strncasecmp.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 12783557155987d37c1c7828b8c3c20a3c5300ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=12783557155987d37c1c7828… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 2 16:51:44 2019 +0200 msvfw32: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 235410b..fe140b2 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -35,6 +35,7 @@ #include "winreg.h" #include "winnls.h" #include "wingdi.h" +#include "winternl.h" #include "winuser.h" #include "commdlg.h" #include "vfw.h" @@ -220,7 +221,7 @@ static int compare_fourcc(DWORD fcc1, DWORD fcc2) char fcc_str2[4]; fourcc_to_string(fcc_str1, fcc1); fourcc_to_string(fcc_str2, fcc2); - return strncasecmp(fcc_str1, fcc_str2, 4); + return _strnicmp(fcc_str1, fcc_str2, 4); } static DWORD get_size_image(LONG width, LONG height, WORD depth)

1 0

Jacek Caban : mfobjects.idl: Add missing MFVideoTransferMatrix entries.
by Alexandre Julliard April 2, 2019

April 2, 2019

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

Francois Gouget : urlmon/tests: Minor spelling tweak in a comment.
by Alexandre Julliard April 2, 2019

April 2, 2019

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 April 2, 2019

April 2, 2019

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

Gijs Vermeulen : kernel32: Add DECLSPEC_HOTPATCH to SizeofResource().
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 002a19599be273b9f947425a820897816317c378 URL: https://source.winehq.org/git/wine.git/?a=commit;h=002a19599be273b9f947425a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Apr 2 18:46:15 2019 +0200 kernel32: Add DECLSPEC_HOTPATCH to SizeofResource(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28140 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index a04fe62..5c9383d 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -617,7 +617,7 @@ BOOL WINAPI FreeResource( HGLOBAL handle ) /********************************************************************** * SizeofResource (KERNEL32.@) */ -DWORD WINAPI SizeofResource( HINSTANCE hModule, HRSRC hRsrc ) +DWORD WINAPI DECLSPEC_HOTPATCH SizeofResource( HINSTANCE hModule, HRSRC hRsrc ) { if (!hRsrc) return 0; return ((PIMAGE_RESOURCE_DATA_ENTRY)hRsrc)->Size;

1 0

Piotr Caban : ntoskrnl.exe: Don't use strcasecmp.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 5e807741319eb53f9646ade8a5b41c6bb9398cd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e807741319eb53f9646ade8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 2 16:51:36 2019 +0200 ntoskrnl.exe: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 77a610d..f336012 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4101,7 +4101,7 @@ void * __cdecl NTOSKRNL_memset( void *dst, int c, size_t n ) */ int __cdecl NTOSKRNL__stricmp( LPCSTR str1, LPCSTR str2 ) { - return strcasecmp( str1, str2 ); + return _strnicmp( str1, str2, -1 ); } /********************************************************************* @@ -4109,7 +4109,7 @@ int __cdecl NTOSKRNL__stricmp( LPCSTR str1, LPCSTR str2 ) */ int __cdecl NTOSKRNL__strnicmp( LPCSTR str1, LPCSTR str2, size_t n ) { - return strncasecmp( str1, str2, n ); + return _strnicmp( str1, str2, n ); } /*********************************************************************

1 0

Piotr Caban : mshtml: Don't use strncasecmp.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 5ab0d1443cc7a1019f23d5848a8acb0d5002233a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ab0d1443cc7a1019f23d584… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 2 16:51:50 2019 +0200 mshtml: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9b9e575..97435c7 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" +#include "winternl.h" #include "ole2.h" #include "shlguid.h" #include "wininet.h" @@ -1181,7 +1182,7 @@ static nsresult NSAPI nsChannel_SetRequestMethod(nsIHttpChannel *iface, nsACString_GetData(aRequestMethod, &method); for(i=0; i < ARRAY_SIZE(request_method_strings); i++) { - if(!strcasecmp(method, request_method_strings[i])) { + if(!_strnicmp(method, request_method_strings[i], -1)) { This->request_method = i; return NS_OK; } @@ -3708,11 +3709,11 @@ static BOOL is_gecko_special_uri(const char *spec) unsigned int i; for(i=0; i < ARRAY_SIZE(special_schemes); i++) { - if(!strncasecmp(spec, special_schemes[i], strlen(special_schemes[i]))) + if(!_strnicmp(spec, special_schemes[i], strlen(special_schemes[i]))) return TRUE; } - if(!strncasecmp(spec, "file:", 5)) { + if(!_strnicmp(spec, "file:", 5)) { const char *ptr = spec+5; while(*ptr == '/') ptr++; @@ -3753,7 +3754,7 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC } } - if(aOriginCharset && *aOriginCharset && strncasecmp(aOriginCharset, "utf", 3)) { + if(aOriginCharset && *aOriginCharset && _strnicmp(aOriginCharset, "utf", 3)) { BSTR charset; int len;

1 0

Piotr Caban : msvideo.dll16: Don't use strncasecmp.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 87a6f2fc0ffde2ecfc60d79eb1fd91825d340b41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87a6f2fc0ffde2ecfc60d79e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 2 16:51:40 2019 +0200 msvideo.dll16: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvideo.dll16/msvideo16.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index bc239a8..840de2e 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -28,6 +28,7 @@ #include "winver.h" #include "winnls.h" #include "winreg.h" +#include "winternl.h" #include "winuser.h" #include "wine/winbase16.h" #include "wownt32.h" @@ -892,7 +893,7 @@ DWORD WINAPI VideoCapDriverDescAndVer16(WORD nr, LPSTR buf1, WORD buf1len, bufLen = ARRAY_SIZE(buf); lRet = RegEnumKeyExA(hKey, i, buf, &bufLen, 0, 0, 0, &lastWrite); if (lRet != ERROR_SUCCESS) continue; - if (strncasecmp(buf, "vid", 3)) continue; + if (_strnicmp(buf, "vid", 3)) continue; if (nr--) continue; fnLen = sizeof(fn); lRet = RegQueryValueExA(hKey, buf, 0, 0, (LPBYTE)fn, &fnLen); @@ -907,7 +908,7 @@ DWORD WINAPI VideoCapDriverDescAndVer16(WORD nr, LPSTR buf1, WORD buf1len, { for (s = buf; *s; s += strlen(s) + 1) { - if (strncasecmp(s, "vid", 3)) continue; + if (_strnicmp(s, "vid", 3)) continue; if (nr--) continue; if (GetPrivateProfileStringA("drivers32", s, NULL, fn, sizeof(fn), "system.ini")) found = TRUE;

1 0

Michael Müller : l3codeca.acm: Check input format in MPEG3_StreamOpen.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 99d4cdcf0b89c5fc03a60f503a434b46bf1367e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99d4cdcf0b89c5fc03a60f50… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Apr 1 01:37:31 2019 +0200 l3codeca.acm: Check input format in MPEG3_StreamOpen. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/l3codeca.acm/mpegl3.c | 15 ++++++++- dlls/msacm32/tests/msacm.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletion(-) diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index 8ad6ae8..2e92937 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -212,6 +212,7 @@ static void MPEG3_Reset(PACMDRVSTREAMINSTANCE adsi, AcmMpeg3Data* aad) */ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) { + LRESULT error = MMSYSERR_NOTSUPPORTED; AcmMpeg3Data* aad; int err; @@ -235,6 +236,18 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEG) && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { + if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3) + { + MPEGLAYER3WAVEFORMAT *formatmp3 = (MPEGLAYER3WAVEFORMAT *)adsi->pwfxSrc; + + if (adsi->pwfxSrc->cbSize < MPEGLAYER3_WFX_EXTRA_BYTES || + formatmp3->wID != MPEGLAYER3_ID_MPEG) + { + error = ACMERR_NOTPOSSIBLE; + goto theEnd; + } + } + /* resampling or mono <=> stereo not available * MPEG3 algo only define 16 bit per sample output */ @@ -270,7 +283,7 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) theEnd: HeapFree(GetProcessHeap(), 0, aad); adsi->dwDriver = 0L; - return MMSYSERR_NOTSUPPORTED; + return error; } /*********************************************************************** diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 180639f..04b4e09 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1276,6 +1276,88 @@ static void test_acmFormatChoose(void) HeapFree(GetProcessHeap(), 0, pwfx); } +static void test_mp3(void) +{ + MPEGLAYER3WAVEFORMAT src; + WAVEFORMATEX dst; + HACMSTREAM has; + DWORD output; + MMRESULT mr; + + src.wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3; + src.wfx.nSamplesPerSec = 11025; + src.wfx.wBitsPerSample = 0; + src.wfx.nChannels = 1; + src.wfx.nBlockAlign = 576; + src.wfx.nAvgBytesPerSec = 2000; + + src.wID = MPEGLAYER3_ID_MPEG; + src.fdwFlags = 0; + src.nBlockSize = 576; + src.nFramesPerBlock = 1; + src.nCodecDelay = 0; + + dst.cbSize = 0; + dst.wFormatTag = WAVE_FORMAT_PCM; + dst.nSamplesPerSec = 11025; + dst.wBitsPerSample = 16; + dst.nChannels = 1; + dst.nBlockAlign = dst.wBitsPerSample * dst.nChannels / 8; + dst.nAvgBytesPerSec = dst.nSamplesPerSec * dst.nBlockAlign; + + src.wfx.cbSize = 0; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == ACMERR_NOTPOSSIBLE, "expected error ACMERR_NOTPOSSIBLE, got 0x%x\n", mr); + if (mr == MMSYSERR_NOERROR) acmStreamClose(has, 0); + + src.wfx.cbSize = MPEGLAYER3_WFX_EXTRA_BYTES; + src.wID = 0; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == ACMERR_NOTPOSSIBLE, "expected error ACMERR_NOTPOSSIBLE, got 0x%x\n", mr); + if (mr == MMSYSERR_NOERROR) acmStreamClose(has, 0); + + src.wID = MPEGLAYER3_ID_MPEG; + src.nBlockSize = 0; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == MMSYSERR_NOERROR || broken(mr == ACMERR_NOTPOSSIBLE) /* Win 2008 */, + "failed with error 0x%x\n", mr); + if (mr == MMSYSERR_NOERROR) + { + mr = acmStreamClose(has, 0); + ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); + } + src.nBlockSize = 576; + src.wfx.nAvgBytesPerSec = 0; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == MMSYSERR_NOERROR || broken(mr == ACMERR_NOTPOSSIBLE) /* Win 2008 */, + "failed with error 0x%x\n", mr); + if (mr == MMSYSERR_NOERROR) + { + /* causes a division by zero exception in XP, Vista, + but throws ACMERR_NOTPOSSIBLE on others */ + if (0) acmStreamSize(has, 4000, &output, ACM_STREAMSIZEF_SOURCE); + mr = acmStreamClose(has, 0); + ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); + } + + src.wfx.nAvgBytesPerSec = 2000; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == MMSYSERR_NOERROR || broken(mr == ACMERR_NOTPOSSIBLE) /* Win 2008 */, + "failed with error 0x%x\n", mr); + if (mr == MMSYSERR_NOERROR) + { + mr = acmStreamSize(has, 4000, &output, ACM_STREAMSIZEF_SOURCE); + ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); + mr = acmStreamClose(has, 0); + ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); + } +} + static struct { struct @@ -1446,6 +1528,7 @@ START_TEST(msacm) test_acmFormatSuggest(); test_acmFormatTagDetails(); test_acmFormatChoose(); + test_mp3(); /* Test acmDriverAdd in the end as it may conflict * with other tests due to codec lookup order */ test_acmDriverAdd();

1 0

Zebediah Figura : rpcrt4: Properly handle complex arrays in the typelib marshaller.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 3fd7a32a015923a5e153343cdc7b1d26ffb81c4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fd7a32a015923a5e153343c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 1 17:38:25 2019 -0500 rpcrt4: Properly handle complex arrays in the typelib marshaller. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 52 ++++++++++++++++++++++++------------------ dlls/rpcrt4/ndr_typelib.c | 33 +++++++++++++++++++-------- 2 files changed, 53 insertions(+), 32 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 4f84442..ac0969b 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1481,21 +1481,21 @@ static HRESULT WINAPI Widget_variant_array(IWidget *iface, VARIANT in[2], VARIAN { ok(V_VT(&in[0]) == VT_I4, "Got wrong type %u.\n", V_VT(&in[0])); ok(V_I4(&in[0]) == 1, "Got wrong value %d.\n", V_I4(&in[0])); - ok(V_VT(&in[1]) == VT_I4, "Got wrong type %u.\n", V_VT(&in[1])); - ok(V_I4(&in[1]) == 2, "Got wrong value %d.\n", V_I4(&in[1])); + ok(V_VT(&in[1]) == (VT_BYREF|VT_I4), "Got wrong type %u.\n", V_VT(&in[1])); + ok(*V_I4REF(&in[1]) == 2, "Got wrong value %d.\n", *V_I4REF(&in[1])); ok(V_VT(&out[0]) == VT_EMPTY, "Got wrong type %u.\n", V_VT(&out[0])); ok(V_VT(&out[1]) == VT_EMPTY, "Got wrong type %u.\n", V_VT(&out[1])); ok(V_VT(&in_out[0]) == VT_I4, "Got wrong type %u.\n", V_VT(&in_out[0])); ok(V_I4(&in_out[0]) == 5, "Got wrong type %u.\n", V_VT(&in_out[0])); - ok(V_VT(&in_out[1]) == VT_I4, "Got wrong type %u.\n", V_VT(&in_out[1])); - ok(V_I4(&in_out[1]) == 6, "Got wrong type %u.\n", V_VT(&in_out[1])); + ok(V_VT(&in_out[1]) == VT_BSTR, "Got wrong type %u.\n", V_VT(&in_out[1])); + ok(!lstrcmpW(V_BSTR(&in_out[1]), test_bstr1), "Got wrong value %s.\n", wine_dbgstr_w(V_BSTR(&in[1]))); - V_VT(&in[0]) = VT_I1; V_I1(&in[0]) = 7; - V_VT(&in[1]) = VT_I1; V_I1(&in[1]) = 8; - V_VT(&out[0]) = VT_I1; V_I1(&out[0]) = 9; - V_VT(&out[1]) = VT_I1; V_I1(&out[1]) = 10; - V_VT(&in_out[0]) = VT_I1; V_I1(&in_out[0]) = 11; - V_VT(&in_out[1]) = VT_I1; V_I1(&in_out[1]) = 12; + V_VT(&in[0]) = VT_I1; V_I1(&in[0]) = 7; + V_VT(&in[1]) = VT_I1; V_I1(&in[1]) = 8; + V_VT(&out[0]) = VT_I1; V_I1(&out[0]) = 9; + V_VT(&out[1]) = VT_BSTR; V_BSTR(&out[1]) = SysAllocString(test_bstr2); + V_VT(&in_out[0]) = VT_I1; V_I1(&in_out[0]) = 11; + V_VT(&in_out[1]) = VT_UNKNOWN; V_UNKNOWN(&in_out[1]) = (IUnknown *)create_disp_obj(); return S_OK; } @@ -2581,9 +2581,11 @@ static void test_marshal_struct(IWidget *widget, IDispatch *disp) static void test_marshal_array(IWidget *widget, IDispatch *disp) { VARIANT var_in[2], var_out[2], var_in_out[2]; + ISomethingFromDispatch *proxy_sfd; array_t in, out, in_out; MYSTRUCT struct_in[2]; HRESULT hr; + int i = 2; memcpy(in, test_array1, sizeof(array_t)); memcpy(out, test_array2, sizeof(array_t)); @@ -2594,26 +2596,32 @@ static void test_marshal_array(IWidget *widget, IDispatch *disp) ok(!memcmp(&out, &test_array5, sizeof(array_t)), "Arrays didn't match.\n"); ok(!memcmp(&in_out, &test_array6, sizeof(array_t)), "Arrays didn't match.\n"); - V_VT(&var_in[0]) = VT_I4; V_I4(&var_in[0]) = 1; - V_VT(&var_in[1]) = VT_I4; V_I4(&var_in[1]) = 2; - V_VT(&var_out[0]) = VT_I4; V_I4(&var_out[0]) = 3; - V_VT(&var_out[1]) = VT_I4; V_I4(&var_out[1]) = 4; - V_VT(&var_in_out[0]) = VT_I4; V_I4(&var_in_out[0]) = 5; - V_VT(&var_in_out[1]) = VT_I4; V_I4(&var_in_out[1]) = 6; + V_VT(&var_in[0]) = VT_I4; V_I4(&var_in[0]) = 1; + V_VT(&var_in[1]) = VT_BYREF|VT_I4; V_I4REF(&var_in[1]) = &i; + V_VT(&var_out[0]) = VT_I4; V_I4(&var_out[0]) = 3; + V_VT(&var_out[1]) = VT_I4; V_I4(&var_out[1]) = 4; + V_VT(&var_in_out[0]) = VT_I4; V_I4(&var_in_out[0]) = 5; + V_VT(&var_in_out[1]) = VT_BSTR; V_BSTR(&var_in_out[1]) = SysAllocString(test_bstr1); hr = IWidget_variant_array(widget, var_in, var_out, var_in_out); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(V_VT(&var_in[0]) == VT_I4, "Got wrong type %u.\n", V_VT(&var_in[0])); ok(V_I4(&var_in[0]) == 1, "Got wrong value %d.\n", V_I4(&var_in[0])); - ok(V_VT(&var_in[1]) == VT_I4, "Got wrong type %u.\n", V_VT(&var_in[1])); - ok(V_I4(&var_in[1]) == 2, "Got wrong value %d.\n", V_I4(&var_in[1])); + ok(V_VT(&var_in[1]) == (VT_BYREF|VT_I4), "Got wrong type %u.\n", V_VT(&var_in[1])); + ok(V_I4REF(&var_in[1]) == &i, "Got wrong value %p.\n", V_I4REF(&var_in[1])); + ok(i == 2, "Got wrong value %d.\n", i); ok(V_VT(&var_out[0]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_out[0])); ok(V_I1(&var_out[0]) == 9, "Got wrong value %u.\n", V_VT(&var_out[0])); - ok(V_VT(&var_out[1]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_out[1])); - ok(V_I1(&var_out[1]) == 10, "Got wrong value %u.\n", V_VT(&var_out[1])); + ok(V_VT(&var_out[1]) == VT_BSTR, "Got wrong type %u.\n", V_VT(&var_out[1])); + ok(!lstrcmpW(V_BSTR(&var_out[1]), test_bstr2), "Got wrong value %s.\n", wine_dbgstr_w(V_BSTR(&var_out[1]))); ok(V_VT(&var_in_out[0]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_in_out[0])); ok(V_I1(&var_in_out[0]) == 11, "Got wrong value %u.\n", V_VT(&var_in_out[0])); - ok(V_VT(&var_in_out[1]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_in_out[1])); - ok(V_I1(&var_in_out[1]) == 12, "Got wrong value %u.\n", V_VT(&var_in_out[1])); + ok(V_VT(&var_in_out[1]) == VT_UNKNOWN, "Got wrong type %u.\n", V_VT(&var_in_out[1])); + hr = IUnknown_QueryInterface(V_UNKNOWN(&var_in_out[1]), &IID_ISomethingFromDispatch, (void **)&proxy_sfd); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ISomethingFromDispatch_anotherfn(proxy_sfd); + ok(hr == 0x01234567, "Got hr %#x.\n", hr); + ISomethingFromDispatch_Release(proxy_sfd); + release_iface(V_UNKNOWN(&var_in_out[1])); memcpy(&struct_in[0], &test_mystruct1, sizeof(MYSTRUCT)); memcpy(&struct_in[1], &test_mystruct2, sizeof(MYSTRUCT)); diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 5a4de51..5c48010 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -326,9 +326,13 @@ static unsigned char get_struct_fc(ITypeInfo *typeinfo, TYPEATTR *attr) static unsigned char get_array_fc(ITypeInfo *typeinfo, TYPEDESC *desc) { - if (get_basetype(typeinfo, desc)) + switch (desc->vt) + { + case VT_CY: return FC_LGFARRAY; - else if (desc->vt == VT_USERDEFINED) + case VT_CARRAY: + return get_array_fc(typeinfo, &desc->lpadesc->tdescElem); + case VT_USERDEFINED: { ITypeInfo *refinfo; TYPEATTR *attr; @@ -351,8 +355,9 @@ static unsigned char get_array_fc(ITypeInfo *typeinfo, TYPEDESC *desc) return fc; } - else - return FC_BOGUS_ARRAY; + default: + return get_basetype(typeinfo, desc) ? FC_LGFARRAY : FC_BOGUS_ARRAY; + } } static BOOL type_is_non_iface_pointer(ITypeInfo *typeinfo, TYPEDESC *desc) @@ -616,14 +621,11 @@ static size_t write_array_tfs(ITypeInfo *typeinfo, unsigned char *str, size_t *len, ARRAYDESC *desc) { unsigned char fc = get_array_fc(typeinfo, &desc->tdescElem); - ULONG size = type_memsize(typeinfo, &desc->tdescElem); unsigned char basetype; size_t ref = 0, off; + ULONG size = 1; USHORT i; - if (fc != FC_LGFARRAY) - FIXME("complex arrays not implemented\n"); - if (!(basetype = get_basetype(typeinfo, &desc->tdescElem))) ref = write_type_tfs(typeinfo, str, len, &desc->tdescElem, FALSE, FALSE); @@ -633,9 +635,20 @@ static size_t write_array_tfs(ITypeInfo *typeinfo, unsigned char *str, off = *len; - WRITE_CHAR(str, *len, FC_LGFARRAY); + WRITE_CHAR(str, *len, fc); WRITE_CHAR(str, *len, 0); - WRITE_INT (str, *len, size); + if (fc == FC_BOGUS_ARRAY) + { + WRITE_SHORT(str, *len, size); + WRITE_INT(str, *len, 0xffffffff); /* conformance */ + WRITE_INT(str, *len, 0xffffffff); /* variance */ + } + else + { + size *= type_memsize(typeinfo, &desc->tdescElem); + WRITE_INT(str, *len, size); + } + if (basetype) WRITE_CHAR(str, *len, basetype); else

1 0

Zebediah Figura : quartz/tests: Link to strmiids and uuid.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 90114c4adf514788f39f645aaf0a33b1b10e23e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90114c4adf514788f39f645a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 1 21:38:22 2019 -0500 quartz/tests: Link to strmiids and uuid. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 2 +- dlls/quartz/tests/filtermapper.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index f4c56c1..902e57e 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = quartz.dll -IMPORTS = oleaut32 ole32 advapi32 user32 msvfw32 +IMPORTS = advapi32 msvfw32 ole32 oleaut32 strmiids user32 uuid C_SRCS = \ acmwrapper.c \ diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 2f82ce0..fc4fa95 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -22,14 +22,11 @@ #include "wine/test.h" #include "winbase.h" -#include "initguid.h" #include "dshow.h" #include "winternl.h" - +#include "initguid.h" #include "wine/fil_data.h" -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); - /* Helper function, checks if filter with given name was enumerated. */ static BOOL enum_find_filter(const WCHAR *wszFilterName, IEnumMoniker *pEnum) {

1 0

Zebediah Figura : quartz/tests: Add tests for IVMRFilterConfig on the VMR7.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 0efaac5108140f4c08619097324344bca6621af2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0efaac5108140f4c08619097… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 1 21:38:23 2019 -0500 quartz/tests: Add tests for IVMRFilterConfig on the VMR7. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 1 + dlls/quartz/tests/vmr7.c | 140 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 902e57e..ce59b73 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ mpegsplit.c \ systemclock.c \ videorenderer.c \ + vmr7.c \ waveparser.c diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c new file mode 100644 index 0000000..b420991 --- /dev/null +++ b/dlls/quartz/tests/vmr7.c @@ -0,0 +1,140 @@ +/* + * Video Mixing Renderer 7 unit tests + * + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "dshow.h" +#include "d3d9.h" +#include "vmr9.h" +#include "wine/test.h" + +static void test_filter_config(void) +{ + IVMRFilterConfig *config; + DWORD count, mode; + HRESULT hr; + ULONG ref; + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowed); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowed); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowless); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(mode == VMRMode_Windowless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowed); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Renderless); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(mode == VMRMode_Renderless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowless); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetNumberOfStreams(config, &count); + todo_wine ok(hr == VFW_E_VMR_NOT_IN_MIXER_MODE, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_SetNumberOfStreams(config, 3); + if (hr != VFW_E_DDRAW_CAPS_NOT_SUITABLE) + { + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetNumberOfStreams(config, &count); + todo_wine { + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); + } + + hr = IVMRFilterConfig_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); + + /* Despite MSDN, you can still change the rendering mode after setting the + * stream count. */ + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowless); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(mode == VMRMode_Windowless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig_GetNumberOfStreams(config, &count); + todo_wine { + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); + } + } + else + skip("Mixing mode is not supported.\n"); + + ref = IVMRFilterConfig_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +START_TEST(vmr7) +{ + CoInitialize(NULL); + + test_filter_config(); + + CoUninitialize(); +}

1 0

Zebediah Figura : quartz/vmr9: Avoid unloading d3d9 while holding d3d9 objects.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: e4b58b450b1c0e35a1ef02d15b9dbb024ae210a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4b58b450b1c0e35a1ef02d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 1 21:38:24 2019 -0500 quartz/vmr9: Avoid unloading d3d9 while holding d3d9 objects. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index de30049..885fbe2 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -834,7 +834,6 @@ static ULONG WINAPI VMR9Inner_Release(IUnknown * iface) { TRACE("Destroying\n"); BaseControlWindow_Destroy(&This->baseControlWindow); - FreeLibrary(This->hD3d9); if (This->allocator) IVMRSurfaceAllocatorEx9_Release(This->allocator); @@ -848,6 +847,7 @@ static ULONG WINAPI VMR9Inner_Release(IUnknown * iface) This->allocator_d3d9_dev = NULL; } + FreeLibrary(This->hD3d9); CoTaskMemFree(This); } return refCount;

1 0

Alexandre Julliard : msvcrt: Export an import symbol for __acrt_iob_func() for compatibility with Mingw.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: b360bf81cb1ca68ed86dbdcef67849e58440f16d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b360bf81cb1ca68ed86dbdce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 2 15:54:00 2019 +0200 msvcrt: Export an import symbol for __acrt_iob_func() for compatibility with Mingw. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/iob.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msvcrt/iob.c b/dlls/msvcrt/iob.c index 53a7147..c02913b 100644 --- a/dlls/msvcrt/iob.c +++ b/dlls/msvcrt/iob.c @@ -34,3 +34,9 @@ MSVCRT_FILE * CDECL __acrt_iob_func(unsigned idx) { return __p__iob() + idx; } + +#ifdef __i386__ +void *_imp____acrt_iob_func = __acrt_iob_func; +#else +void *__imp___acrt_iob_func = __acrt_iob_func; +#endif

1 0

Alexandre Julliard : libport: Don't hide the casemap and wctype tables.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: a37c38191ec096972119f2a57f46858a59588eff URL: https://source.winehq.org/git/wine.git/?a=commit;h=a37c38191ec096972119f2a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 2 16:38:04 2019 +0200 libport: Don't hide the casemap and wctype tables. For libwine backwards compatibility. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/casemap.c | 4 ++-- libs/port/wctype.c | 2 +- tools/make_unicode | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/port/casemap.c b/libs/port/casemap.c index d440fce..1c975db 100644 --- a/libs/port/casemap.c +++ b/libs/port/casemap.c @@ -4,7 +4,7 @@ #include "wine/unicode.h" -const WCHAR DECLSPEC_HIDDEN wine_casemap_lower[4259] = +const WCHAR wine_casemap_lower[4259] = { /* index */ 0x01bf, 0x02bf, 0x03bf, 0x044f, 0x054f, 0x064f, 0x0100, 0x0100, @@ -562,7 +562,7 @@ const WCHAR DECLSPEC_HIDDEN wine_casemap_lower[4259] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; -const WCHAR DECLSPEC_HIDDEN wine_casemap_upper[4828] = +const WCHAR wine_casemap_upper[4828] = { /* index */ 0x019f, 0x029f, 0x039f, 0x045a, 0x0556, 0x0656, 0x0100, 0x0100, diff --git a/libs/port/wctype.c b/libs/port/wctype.c index bb0eab5..4153cb8 100644 --- a/libs/port/wctype.c +++ b/libs/port/wctype.c @@ -3,7 +3,7 @@ #include "wine/unicode.h" -const unsigned short DECLSPEC_HIDDEN wine_wctype_table[17152] = +const unsigned short wine_wctype_table[17152] = { /* offsets */ 0x0100, 0x0200, 0x0300, 0x0400, 0x0500, 0x0600, 0x0700, 0x0800, diff --git a/tools/make_unicode b/tools/make_unicode index 0f3cdcc..5060548 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1599,7 +1599,7 @@ sub dump_mirroring($) print OUTPUT "/* generated from $UNIDATA/BidiMirroring.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n"; - dump_case_table( "wine_mirror_map", @mirror_table ); + dump_case_table( "DECLSPEC_HIDDEN wine_mirror_map", @mirror_table ); close OUTPUT; save_file($filename); } @@ -1757,9 +1757,9 @@ sub dump_digit_folding($) print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n"; - dump_case_table( "wine_digitmap", @digitmap_table ); + dump_case_table( "DECLSPEC_HIDDEN wine_digitmap", @digitmap_table ); print OUTPUT "\n"; - dump_case_table( "wine_compatmap", @compatmap_table ); + dump_case_table( "DECLSPEC_HIDDEN wine_compatmap", @compatmap_table ); close OUTPUT; save_file($filename); } @@ -1836,7 +1836,7 @@ sub dump_case_table($@) # dump the table - printf OUTPUT "const WCHAR DECLSPEC_HIDDEN %s[%d] =\n", $name, $index * 256 + 512 - $removed; + printf OUTPUT "const WCHAR %s[%d] =\n", $name, $index * 256 + 512 - $removed; printf OUTPUT "{\n /* index */\n"; printf OUTPUT "%s,\n", DUMP_ARRAY( "0x%04x", 256, @filled ); printf OUTPUT " /* defaults */\n"; @@ -1892,7 +1892,7 @@ sub dump_simple_mapping($$@) my $def = shift; my @array = compress_array( 256, $def, @_[0..65535] ); - printf OUTPUT "const unsigned short DECLSPEC_HIDDEN %s[%d] =\n{\n", $name, $#array+1; + printf OUTPUT "const unsigned short %s[%d] =\n{\n", $name, $#array+1; printf OUTPUT " /* offsets */\n%s,\n", DUMP_ARRAY( "0x%04x", 0, @array[0..255] ); printf OUTPUT " /* values */\n%s\n};\n", DUMP_ARRAY( "0x%04x", 0, @array[256..$#array] ); }

1 0

Alistair Leslie-Hughes : uianimation: Add DllCanUnloadNow, DllGetClassObject, DllRegisterServer, DllUnregisterServer stubs.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 10c51972e99f3a97b7e40ac28ec9c5cd55240c38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10c51972e99f3a97b7e40ac2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 1 23:37:19 2019 +0000 uianimation: Add DllCanUnloadNow, DllGetClassObject, DllRegisterServer, DllUnregisterServer stubs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/main.c | 40 +++++++++++++++++++++++++++++++++++++++ dlls/uianimation/uianimation.spec | 8 ++++---- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index 0fa9bfb..92d594f 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -23,6 +23,8 @@ #include "windef.h" #include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" #include "uianimation.h" @@ -30,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(uianimation); +static HINSTANCE hinstance; + BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) { TRACE("(%p %d %p)\n", dll, reason, reserved); @@ -39,8 +43,44 @@ BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + hinstance = dll; DisableThreadLibraryCalls( dll ); break; } return TRUE; } + +/****************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) +{ + FIXME( "(%s %s %p)\n", debugstr_guid( clsid ), debugstr_guid( iid ), obj ); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +/****************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow( void ) +{ + TRACE( "()\n" ); + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer + */ +HRESULT WINAPI DllRegisterServer( void ) +{ + return __wine_register_resources( hinstance ); +} + +/*********************************************************************** + * DllUnregisterServer + */ +HRESULT WINAPI DllUnregisterServer( void ) +{ + return __wine_unregister_resources( hinstance ); +} diff --git a/dlls/uianimation/uianimation.spec b/dlls/uianimation/uianimation.spec index a43b12d..b16365d 100644 --- a/dlls/uianimation/uianimation.spec +++ b/dlls/uianimation/uianimation.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow() -@ stub DllGetClassObject(ptr ptr ptr) -@ stub DllRegisterServer() -@ stub DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Alexandre Julliard : msvcp: Define _vsnprintf().
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 4f1f95b1b3e25d302c2a0c4118ca303c649cc9dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f1f95b1b3e25d302c2a0c41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 2 16:47:01 2019 +0200 msvcp: Define _vsnprintf(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/msvcp_main.c | 6 ++++++ dlls/vcruntime140/misc.c | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 7aef4cd..fbf4a79 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -136,6 +136,12 @@ int WINAPIV sprintf(char *buf, const char *fmt, ...) __ms_va_end(valist); return ret; } + +int __cdecl _vsnprintf( char *buf, size_t size, const char *fmt, __ms_va_list args ) +{ + return __stdio_common_vsprintf( UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, + buf, size, fmt, NULL, args ); +} #endif static void init_cxx_funcs(void) diff --git a/dlls/vcruntime140/misc.c b/dlls/vcruntime140/misc.c index cc64175..028bde5 100644 --- a/dlls/vcruntime140/misc.c +++ b/dlls/vcruntime140/misc.c @@ -22,6 +22,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcruntime); +#define UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR (0x0002) +int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, size_t len, const char *format, + _locale_t locale, __ms_va_list valist); + int* CDECL __processing_throw(void); /********************************************************************* @@ -54,3 +58,9 @@ int __cdecl __uncaught_exceptions(void) { return *__processing_throw(); } + +int __cdecl _vsnprintf( char *buf, size_t size, const char *fmt, __ms_va_list args ) +{ + return __stdio_common_vsprintf( UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, + buf, size, fmt, NULL, args ); +}

1 0

Zebediah Figura : quartz/vmr9: Implement IVMRFilterConfig:: SetRenderingMode().
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: edf1e7696f36b650cddb76275d3a460c271a93ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=edf1e7696f36b650cddb7627… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 1 21:38:25 2019 -0500 quartz/vmr9: Implement IVMRFilterConfig::SetRenderingMode(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42372 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 20 ++++++++++---------- dlls/quartz/vmr9.c | 7 ++++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index b420991..105e6b2 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -40,14 +40,14 @@ static void test_filter_config(void) ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowed); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowed); - todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); ref = IVMRFilterConfig_Release(config); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -57,14 +57,14 @@ static void test_filter_config(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowless); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(mode == VMRMode_Windowless, "Got mode %#x.\n", mode); + ok(mode == VMRMode_Windowless, "Got mode %#x.\n", mode); hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowed); - todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); ref = IVMRFilterConfig_Release(config); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -74,14 +74,14 @@ static void test_filter_config(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Renderless); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(mode == VMRMode_Renderless, "Got mode %#x.\n", mode); + ok(mode == VMRMode_Renderless, "Got mode %#x.\n", mode); hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowless); - todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); ref = IVMRFilterConfig_Release(config); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -111,11 +111,11 @@ static void test_filter_config(void) /* Despite MSDN, you can still change the rendering mode after setting the * stream count. */ hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowless); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(mode == VMRMode_Windowless, "Got mode %#x.\n", mode); + ok(mode == VMRMode_Windowless, "Got mode %#x.\n", mode); hr = IVMRFilterConfig_GetNumberOfStreams(config, &count); todo_wine { diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 885fbe2..2a39d11 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1246,10 +1246,11 @@ static HRESULT WINAPI VMR7FilterConfig_GetRenderingPrefs(IVMRFilterConfig *iface static HRESULT WINAPI VMR7FilterConfig_SetRenderingMode(IVMRFilterConfig *iface, DWORD mode) { - struct quartz_vmr *This = impl_from_IVMRFilterConfig(iface); + struct quartz_vmr *filter = impl_from_IVMRFilterConfig(iface); - FIXME("(%p/%p)->(%u) stub\n", iface, This, mode); - return E_NOTIMPL; + TRACE("iface %p, mode %#x.\n", iface, mode); + + return IVMRFilterConfig9_SetRenderingMode(&filter->IVMRFilterConfig9_iface, mode); } static HRESULT WINAPI VMR7FilterConfig_GetRenderingMode(IVMRFilterConfig *iface, DWORD *mode)

1 0

Alexandre Julliard : msvcrt: Add MSVCRT_ prefix to the spawn() functions.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: ac38c175b5c39c23aff7047786d529220d77fc31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac38c175b5c39c23aff70477… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 2 10:48:23 2019 +0200 msvcrt: Add MSVCRT_ prefix to the spawn() functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 12 ++++++------ dlls/msvcr100/msvcr100.spec | 24 ++++++++++++------------ dlls/msvcr110/msvcr110.spec | 24 ++++++++++++------------ dlls/msvcr120/msvcr120.spec | 24 ++++++++++++------------ dlls/msvcr70/msvcr70.spec | 24 ++++++++++++------------ dlls/msvcr71/msvcr71.spec | 24 ++++++++++++------------ dlls/msvcr80/msvcr80.spec | 24 ++++++++++++------------ dlls/msvcr90/msvcr90.spec | 24 ++++++++++++------------ dlls/msvcrt/msvcrt.spec | 24 ++++++++++++------------ dlls/msvcrt/process.c | 24 ++++++++++++------------ dlls/msvcrtd/msvcrtd.spec | 24 ++++++++++++------------ dlls/ucrtbase/ucrtbase.spec | 24 ++++++++++++------------ 12 files changed, 138 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac38c175b5c39c23aff7…

1 0

Zebediah Figura : quartz/tests: Add some tests for video renderer media types.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 3f5ab4c06c21a6afcb20f0fe2485f6abbcd563e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f5ab4c06c21a6afcb20f0fe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 1 21:38:21 2019 -0500 quartz/tests: Add some tests for video renderer media types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 69 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index c7f0df4..c7053e5 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -269,6 +269,74 @@ todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_media_types(void) +{ + IBaseFilter *filter = create_video_renderer(); + AM_MEDIA_TYPE *mt, req_mt = {{0}}; + VIDEOINFOHEADER vih = + { + {0}, {0}, 0, 0, 0, + {sizeof(BITMAPINFOHEADER), 32, 24, 1, 0, BI_RGB} + }; + IEnumMediaTypes *enummt; + unsigned int i; + HRESULT hr; + ULONG ref; + IPin *pin; + + static const GUID *subtype_tests[] = + { + &MEDIASUBTYPE_RGB8, + &MEDIASUBTYPE_RGB565, + &MEDIASUBTYPE_RGB24, + &MEDIASUBTYPE_RGB32, + }; + + IBaseFilter_FindPin(filter, sink_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &mt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + req_mt.majortype = MEDIATYPE_Video; + req_mt.formattype = FORMAT_VideoInfo; + req_mt.cbFormat = sizeof(VIDEOINFOHEADER); + req_mt.pbFormat = (BYTE *)&vih; + + for (i = 0; i < ARRAY_SIZE(subtype_tests); ++i) + { + req_mt.subtype = *subtype_tests[i]; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_OK, "Got hr %#x for subtype %s.\n", hr, wine_dbgstr_guid(subtype_tests[i])); + } + + req_mt.subtype = MEDIASUBTYPE_NULL; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + req_mt.subtype = MEDIASUBTYPE_RGB24; + + req_mt.majortype = MEDIATYPE_NULL; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + req_mt.majortype = MEDIATYPE_Video; + + req_mt.formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + req_mt.formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -333,6 +401,7 @@ START_TEST(videorenderer) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); test_basefilter(); CoUninitialize();

1 0

Józef Kucia : test: Test root CBV descriptor with big buffer.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: vkd3d Branch: master Commit: e88d6f4f2a7ad1b7d7b3b8ed9f5ab02c8b5ab018 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e88d6f4f2a7ad1b7d7b3b8e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:54 2019 +0200 test: Test root CBV descriptor with big buffer. This test is for commit 22330b541446b62f10ef7d03dff709318420757a. 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> --- tests/d3d12.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9a17a71..00005c4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10477,6 +10477,7 @@ static void test_immediate_constant_buffer(void) 0x0010000a, 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0090902a, 0x0010000a, 0x00000000, 0x0100003e, }; + static const unsigned int MAX_CB_SIZE = D3D12_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT * sizeof(struct vec4); static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; static struct vec4 expected_result[] = { @@ -10501,7 +10502,7 @@ static void test_immediate_constant_buffer(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, desc.rt_format, NULL, &ps, NULL); - cb = create_upload_buffer(context.device, sizeof(index), NULL); + cb = create_upload_buffer(context.device, 2 * MAX_CB_SIZE, NULL); for (i = 0; i < ARRAY_SIZE(expected_result); ++i) {

1 0

Józef Kucia : tests: Use vkd3d_optional_device_extensions_info.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: vkd3d Branch: master Commit: 0eb2817c226b2694ff1a07aba136a8664de8f47b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0eb2817c226b2694ff1a07a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:55 2019 +0200 tests: Use vkd3d_optional_device_extensions_info. 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> --- tests/d3d12_crosstest.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 723659e..2103caf 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -455,29 +455,30 @@ static VkPhysicalDevice select_physical_device(struct vkd3d_instance *instance) static HRESULT create_vkd3d_device(struct vkd3d_instance *instance, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { - struct vkd3d_device_create_info device_create_info; - VkPhysicalDevice vk_physical_device; - static const char * const device_extensions[] = { VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME, }; + static const struct vkd3d_optional_device_extensions_info optional_extensions = + { + .type = VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO, + .extensions = device_extensions, + .extension_count = ARRAY_SIZE(device_extensions), + }; + + struct vkd3d_device_create_info device_create_info; + VkPhysicalDevice vk_physical_device; if (!(vk_physical_device = select_physical_device(instance))) return E_INVALIDARG; memset(&device_create_info, 0, sizeof(device_create_info)); device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; + device_create_info.next = &optional_extensions; device_create_info.minimum_feature_level = minimum_feature_level; device_create_info.instance = instance; device_create_info.vk_physical_device = vk_physical_device; - if (check_device_extension(vk_physical_device, VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME)) - { - device_create_info.device_extensions = device_extensions; - device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); - } - return vkd3d_create_device(&device_create_info, iid, device); }

1 0

Józef Kucia : tests: Add test for updating descriptor tables after changing root signature.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: vkd3d Branch: master Commit: ba1766fe307750a630e7241e2a9c2afc3bf21f69 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ba1766fe307750a630e7241… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:53 2019 +0200 tests: Add test for updating descriptor tables after changing root signature. This test is for commit 74fbfee61101901666069f1f7e868e0205266c10. 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> --- tests/d3d12.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=ba1766fe307750a630e…

1 0

Józef Kucia : vkd3d: Avoid copying empty ranges in d3d12_device_CopyDescriptors().
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: vkd3d Branch: master Commit: 91e88a820e708804614203c834e0acac8a62c4d5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=91e88a820e708804614203c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:52 2019 +0200 vkd3d: Avoid copying empty ranges in d3d12_device_CopyDescriptors(). 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> --- libs/vkd3d/device.c | 34 ++++++++++++++++------------------ libs/vkd3d/resource.c | 2 ++ tests/d3d12.c | 34 ++++++++++++++++++++++++++++++---- 3 files changed, 48 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 8676434..9b18bc9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2306,29 +2306,27 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device *iface, } dst_range_idx = dst_idx = 0; - dst = d3d12_desc_from_cpu_handle(dst_descriptor_range_offsets[0]); - dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[0] : 1; - for (src_range_idx = 0; src_range_idx < src_descriptor_range_count; ++src_range_idx) + src_range_idx = src_idx = 0; + while (dst_range_idx < dst_descriptor_range_count && src_range_idx < src_descriptor_range_count) { - src = d3d12_desc_from_cpu_handle(src_descriptor_range_offsets[src_range_idx]); + dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[dst_range_idx] : 1; src_range_size = src_descriptor_range_sizes ? src_descriptor_range_sizes[src_range_idx] : 1; - for (src_idx = 0; src_idx < src_range_size; ++src_idx) - { - if (dst_idx >= dst_range_size) - { - dst_idx = 0; - ++dst_range_idx; - if (dst_range_idx >= dst_descriptor_range_count) - return; - - dst = d3d12_desc_from_cpu_handle(dst_descriptor_range_offsets[dst_range_idx]); - dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[dst_range_idx] : 1; - } + dst = d3d12_desc_from_cpu_handle(dst_descriptor_range_offsets[dst_range_idx]); + src = d3d12_desc_from_cpu_handle(src_descriptor_range_offsets[src_range_idx]); - d3d12_desc_copy(dst++, src++, device); + while (dst_idx < dst_range_size && src_idx < src_range_size) + d3d12_desc_copy(&dst[dst_idx++], &src[src_idx++], device); - ++dst_idx; + if (dst_idx >= dst_range_size) + { + ++dst_range_idx; + dst_idx = 0; + } + if (src_idx >= src_range_size) + { + ++src_range_idx; + src_idx = 0; } } } diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a6c22fd..8485585 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1600,6 +1600,8 @@ static void d3d12_desc_destroy(struct d3d12_desc *descriptor, void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src, struct d3d12_device *device) { + assert(dst != src); + d3d12_desc_destroy(dst, device); *dst = *src; diff --git a/tests/d3d12.c b/tests/d3d12.c index a9255b3..79bca28 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15168,12 +15168,16 @@ static void test_copy_descriptors(void) dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 9); dst_range_sizes[0] = 4; - dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 13); - dst_range_sizes[1] = 3; + dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 9); + dst_range_sizes[1] = 0; + dst_handles[2] = get_cpu_descriptor_handle(&context, heap, 13); + dst_range_sizes[2] = 3; + dst_handles[3] = get_cpu_descriptor_handle(&context, heap, 13); + dst_range_sizes[3] = 0; src_handles[0] = get_cpu_descriptor_handle(&context, cpu_heap, 10); - src_range_sizes[0] = 7; + src_range_sizes[0] = 8; /* t0-t6 */ - ID3D12Device_CopyDescriptors(device, 2, dst_handles, dst_range_sizes, + ID3D12Device_CopyDescriptors(device, 4, dst_handles, dst_range_sizes, 1, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); /* copy 1 uninitialized descriptor (19) */ @@ -15195,6 +15199,28 @@ static void test_copy_descriptors(void) get_cpu_descriptor_handle(&context, cpu_heap, 22), D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + /* range sizes equal to 0 */ + dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 19); + dst_range_sizes[0] = 0; + dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 19); + dst_range_sizes[1] = 0; + src_handles[0] = get_cpu_descriptor_handle(&context, cpu_heap, 0); + src_range_sizes[0] = 1; + src_handles[1] = get_cpu_descriptor_handle(&context, cpu_heap, 0); + src_range_sizes[1] = 4; + ID3D12Device_CopyDescriptors(device, 2, dst_handles, dst_range_sizes, + 2, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 19); + dst_range_sizes[0] = 4; + dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 19); + dst_range_sizes[1] = 4; + src_handles[0] = get_cpu_descriptor_handle(&context, cpu_heap, 0); + src_range_sizes[0] = 0; + src_handles[1] = get_cpu_descriptor_handle(&context, cpu_heap, 0); + src_range_sizes[1] = 0; + ID3D12Device_CopyDescriptors(device, 2, dst_handles, dst_range_sizes, + 2, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); heaps[0] = sampler_heap; heaps[1] = heap; ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, ARRAY_SIZE(heaps), heaps);

1 0

Józef Kucia : vkd3d: Enable VK_EXT_descriptor_indexing.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: vkd3d Branch: master Commit: a1ec97ca2aaba36650870f847bf08781aeed6723 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a1ec97ca2aaba36650870f8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:56 2019 +0200 vkd3d: Enable VK_EXT_descriptor_indexing. This extension brings dynamic indexing for all descriptor types and the update after bind feature. VK_KHR_maintenance3 is required by VK_EXT_descriptor_indexing. 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> --- libs/vkd3d/device.c | 164 ++++++++++++++++++++++++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 2 + libs/vkd3d/vulkan_procs.h | 3 + 3 files changed, 168 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=a1ec97ca2aaba366508…

1 0