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

Piotr Caban : msvcrt: Optimize tolower function when locale was never changed.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: a6debb6796853e557a980ba0a293e6a8a6bbfc74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6debb6796853e557a980ba0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 23 11:59:05 2019 +0100 msvcrt: Optimize tolower function when locale was never changed. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e867af3bfeb5fc50d76cf26816d294d5342fe48c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/ctype.c | 4 +++- dlls/msvcrt/locale.c | 4 ++++ dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/tests/string.c | 14 ++++++++++---- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 758411a..17b12e2 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -458,7 +458,9 @@ int CDECL MSVCRT__tolower_l(int c, MSVCRT__locale_t locale) */ int CDECL MSVCRT_tolower(int c) { - return MSVCRT__tolower_l(c, NULL); + if(initial_locale) + return c>='A' && c<='Z' ? c-'A'+'a' : c; + return MSVCRT__tolower_l(c, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 1e56395..a1e827d 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -48,6 +48,7 @@ int MSVCRT___lc_collate_cp = 0; LCID MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1] = { 0 }; int MSVCRT___mb_cur_max = 1; static unsigned char charmax = CHAR_MAX; +BOOL initial_locale = TRUE; #define MSVCRT_LEADBYTE 0x8000 #define MSVCRT_C1_DEFINED 0x200 @@ -1780,6 +1781,9 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) _lock_locales(); + if(locale[0] != 'C' || locale[1] != '\0') + initial_locale = FALSE; + if(locinfo->lc_handle[MSVCRT_LC_COLLATE]!=newlocinfo->lc_handle[MSVCRT_LC_COLLATE] || locinfo->lc_id[MSVCRT_LC_COLLATE].wCodePage!=newlocinfo->lc_id[MSVCRT_LC_COLLATE].wCodePage) { locinfo->lc_collate_cp = newlocinfo->lc_collate_cp; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index fc91066..02b8628 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -283,6 +283,7 @@ extern MSVCRT__locale_t MSVCRT_locale DECLSPEC_HIDDEN; extern unsigned int MSVCRT___lc_codepage; extern int MSVCRT___lc_collate_cp; extern WORD MSVCRT__ctype [257]; +extern BOOL initial_locale DECLSPEC_HIDDEN; void msvcrt_set_errno(int) DECLSPEC_HIDDEN; #if _MSVCR_VER >= 80 diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index e80a518..a159132 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2788,13 +2788,19 @@ static void test_tolower(void) errno = 0xdeadbeef; ret = p_tolower((char)0xF4); - todo_wine ok(ret == (char)0xF4, "ret = %x\n", ret); - todo_wine ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(ret == (char)0xF4, "ret = %x\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); errno = 0xdeadbeef; ret = p_tolower((char)0xD0); - todo_wine ok(ret == (char)0xD0, "ret = %x\n", ret); - todo_wine ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(ret == (char)0xD0, "ret = %x\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + setlocale(LC_ALL, "C"); + errno = 0xdeadbeef; + ret = p_tolower((char)0xF4); + ok(ret == (char)0xF4, "ret = %x\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); /* test C locale after setting locale */ if(!setlocale(LC_ALL, "us")) {

1 0

Piotr Caban : msvcrt: Optimize toupper function when locale was never changed.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: f7888052448e06db5444171028f82a0b0eaa90b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7888052448e06db54441710… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 23 11:59:11 2019 +0100 msvcrt: Optimize toupper function when locale was never changed. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 688671763154c569b286567810d2e0ed3341dbac) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/ctype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 17b12e2..3b037aa 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -398,6 +398,8 @@ int CDECL MSVCRT__toupper_l(int c, MSVCRT__locale_t locale) */ int CDECL MSVCRT_toupper(int c) { + if(initial_locale) + return c>='a' && c<='z' ? c-'a'+'A' : c; return MSVCRT__toupper_l(c, NULL); }

1 0

Jacek Caban : ntoskrnl.exe: Add __C_specific_handler entry.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 1ddfedd051dc82360a8a9a3e57fa07901fc1371a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ddfedd051dc82360a8a9a3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 31 16:12:39 2019 +0100 ntoskrnl.exe: Add __C_specific_handler entry. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 496447f03b8dc92ea1d2af8bea6e63680e6bcc7d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a30459a..7a58683 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1407,6 +1407,7 @@ @ stdcall ZwWaitForSingleObject(long long ptr) NtWaitForSingleObject @ stdcall ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile @ stdcall -private ZwYieldExecution() NtYieldExecution +@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) @ stdcall -private -arch=arm,x86_64 -norelay __chkstk() @ cdecl -private -arch=i386 _CIcos() msvcrt._CIcos @ cdecl -private -arch=i386 _CIsin() msvcrt._CIsin

1 0

Sebastian Lackner : wtsapi32: Improve WTSQueryUserToken stub.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: e98f71163995f5e70727170d9771f1b7e9096bec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e98f71163995f5e70727170d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 23 03:22:56 2019 +0100 wtsapi32: Improve WTSQueryUserToken stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39663 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0e89c840a6c8227b387aadac539e5f6edf3dbd16) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wtsapi32/tests/wtsapi.c | 1 - dlls/wtsapi32/wtsapi32.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index c24bd49..67f56bb 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -112,7 +112,6 @@ static void test_WTSQueryUserToken(void) SetLastError(0xdeadbeef); ret = WTSQueryUserToken(WTS_CURRENT_SESSION, NULL); ok(!ret, "expected WTSQueryUserToken to fail\n"); - todo_wine ok(GetLastError()==ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); } diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 5569502..3edf921 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -254,8 +254,17 @@ BOOL WINAPI WTSQuerySessionInformationW( */ BOOL WINAPI WTSQueryUserToken(ULONG session_id, PHANDLE token) { - FIXME("%u %p\n", session_id, token); - return FALSE; + FIXME("%u %p semi-stub!\n", session_id, token); + + if (!token) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return DuplicateHandle(GetCurrentProcess(), GetCurrentProcessToken(), + GetCurrentProcess(), token, + 0, FALSE, DUPLICATE_SAME_ACCESS); } /************************************************************

1 0

Fabian Maurer : api-ms-win-crt-private-l1-1-0: Update to 10.0.17134.12 ( WinBuild.160101.0800).
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 697e9d04b244a6532eb4930e1e403b9dff6bad54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=697e9d04b244a6532eb4930e… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Jan 27 16:06:00 2019 +0100 api-ms-win-crt-private-l1-1-0: Update to 10.0.17134.12 (WinBuild.160101.0800). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d77464d8da222d895a0be05c238c1b5e718e4756) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 31 +++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 60a9258..9bddd3d 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -15,6 +15,7 @@ @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ucrtbase.__C_specific_handler +@ stub __C_specific_handler_noexcept @ cdecl -arch=i386,x86_64,arm,arm64 __CxxDetectRethrow(ptr) ucrtbase.__CxxDetectRethrow @ cdecl -arch=i386,x86_64,arm,arm64 __CxxExceptionFilter(ptr ptr long ptr) ucrtbase.__CxxExceptionFilter @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __CxxFrameHandler(ptr ptr ptr ptr) ucrtbase.__CxxFrameHandler @@ -44,6 +45,7 @@ @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy @ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy +@ stub __std_terminate @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare @ cdecl __std_type_info_destroy_list(ptr) ucrtbase.__std_type_info_destroy_list @ cdecl __std_type_info_hash(ptr) ucrtbase.__std_type_info_hash @@ -51,6 +53,7 @@ @ cdecl __unDName(ptr str long ptr ptr long) ucrtbase.__unDName @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) ucrtbase.__unDNameEx @ cdecl __uncaught_exception() ucrtbase.__uncaught_exception +@ stub __uncaught_exceptions @ cdecl -arch=i386 -norelay _chkesp() ucrtbase._chkesp @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) ucrtbase._except_handler2 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) ucrtbase._except_handler3 @@ -87,6 +90,10 @@ @ stub _o__W_Getmonths @ stub _o__W_Gettnames @ stub _o__Wcsftime +@ stub _o____lc_codepage_func +@ stub _o____lc_collate_cp_func +@ stub _o____lc_locale_name_func +@ stub _o____mb_cur_max_func @ stub _o___acrt_iob_func @ stub _o___conio_common_vcprintf @ stub _o___conio_common_vcprintf_p @@ -135,6 +142,10 @@ @ stub _o___p__wpgmptr @ stub _o___pctype_func @ stub _o___pwctype_func +@ stub _o___std_exception_copy +@ stub _o___std_exception_destroy +@ stub _o___std_type_info_destroy_list +@ stub _o___std_type_info_name @ stub _o___stdio_common_vfprintf @ stub _o___stdio_common_vfprintf_p @ stub _o___stdio_common_vfprintf_s @@ -184,6 +195,7 @@ @ stub _o__cabs @ stub _o__callnewh @ stub _o__calloc_base +@ stub _o__cexit @ stub _o__cgets @ stub _o__cgets_s @ stub _o__cgetws @@ -195,11 +207,15 @@ @ stub _o__chsize_s @ stub _o__close @ stub _o__commit +@ stub _o__configthreadlocale +@ stub _o__configure_narrow_argv @ stub _o__configure_wide_argv +@ stub _o__controlfp_s @ stub _o__cputs @ stub _o__cputws @ stub _o__creat @ stub _o__create_locale +@ stub _o__crt_atexit @ stub _o__ctime32_s @ stub _o__ctime64_s @ stub _o__cwait @@ -231,6 +247,7 @@ @ stub _o__execve @ stub _o__execvp @ stub _o__execvpe +@ stub _o__exit @ stub _o__expand @ stub _o__fclose_nolock @ stub _o__fcloseall @@ -301,6 +318,8 @@ @ stub _o__get_errno @ stub _o__get_fmode @ stub _o__get_heap_handle +@ stub _o__get_initial_narrow_environment +@ stub _o__get_initial_wide_environment @ stub _o__get_invalid_parameter_handler @ stub _o__get_narrow_winmain_command_line @ stub _o__get_osfhandle @@ -345,7 +364,9 @@ @ stub _o__i64toa_s @ stub _o__i64tow @ stub _o__i64tow_s +@ stub _o__initialize_narrow_environment @ cdecl _o__initialize_onexit_table(ptr) ucrtbase._o__initialize_onexit_table +@ stub _o__initialize_wide_environment @ stub _o__invalid_parameter_noinfo @ stub _o__invalid_parameter_noinfo_noreturn @ stub _o__isatty @@ -617,6 +638,7 @@ @ stub _o__pclose @ stub _o__pipe @ stub _o__popen +@ stub _o__purecall @ stub _o__putc_nolock @ stub _o__putch @ stub _o__putch_nolock @@ -638,9 +660,13 @@ @ stub _o__scalbf @ stub _o__searchenv @ stub _o__searchenv_s +@ stub _o__seh_filter_dll +@ stub _o__seh_filter_exe @ stub _o__set_abort_behavior +@ stub _o__set_app_type @ stub _o__set_doserrno @ stub _o__set_errno +@ stub _o__set_fmode @ stub _o__set_invalid_parameter_handler @ stub _o__set_new_handler @ stub _o__set_new_mode @@ -910,6 +936,7 @@ @ stub _o_erfcl @ stub _o_erff @ stub _o_erfl +@ stub _o_exit @ stub _o_exp @ stub _o_exp2 @ stub _o_exp2f @@ -1026,7 +1053,7 @@ @ stub _o_mbstowcs @ stub _o_mbstowcs_s @ stub _o_mbtowc -@ stub _o_memset +@ stub _o_memcpy_s @ stub _o_modf @ stub _o_modff @ stub _o_nan @@ -1061,6 +1088,7 @@ @ stub _o_remquo @ stub _o_remquof @ stub _o_remquol +@ stub _o_rename @ stub _o_rewind @ stub _o_rint @ stub _o_rintf @@ -1076,6 +1104,7 @@ @ stub _o_scalbnl @ stub _o_set_terminate @ stub _o_setbuf +@ stub _o_setlocale @ stub _o_setvbuf @ stub _o_sin @ stub _o_sinf

1 0

Fabian Maurer : ucrtbase: Forward a few functions for dxil.dll and pkgmgr.exe.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: fe771ad8ac6878b4d573ddae95f7470349cc5be7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe771ad8ac6878b4d573ddae… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Jan 27 16:06:01 2019 +0100 ucrtbase: Forward a few functions for dxil.dll and pkgmgr.exe. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44469 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e9c90afc065d7a3c57b532aa214b9b4b4546ee83) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 38 +++++++++++----------- dlls/ucrtbase/ucrtbase.spec | 38 +++++++++++----------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 9bddd3d..77be3a5 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -127,11 +127,11 @@ @ stub _o___libm_sse2_sinf @ stub _o___libm_sse2_tan @ stub _o___libm_sse2_tanf -@ stub _o___p___argc +@ cdecl _o___p___argc() ucrtbase._o___p___argc @ stub _o___p___argv -@ stub _o___p___wargv +@ cdecl _o___p___wargv() ucrtbase._o___p___wargv @ stub _o___p__acmdln -@ stub _o___p__commode +@ cdecl _o___p__commode() ucrtbase._o___p__commode @ stub _o___p__environ @ stub _o___p__fmode @ stub _o___p__mbcasemap @@ -144,7 +144,7 @@ @ stub _o___pwctype_func @ stub _o___std_exception_copy @ stub _o___std_exception_destroy -@ stub _o___std_type_info_destroy_list +@ cdecl _o___std_type_info_destroy_list(ptr) ucrtbase._o___std_type_info_destroy_list @ stub _o___std_type_info_name @ stub _o___stdio_common_vfprintf @ stub _o___stdio_common_vfprintf_p @@ -207,15 +207,15 @@ @ stub _o__chsize_s @ stub _o__close @ stub _o__commit -@ stub _o__configthreadlocale +@ cdecl _o__configthreadlocale(long) ucrtbase._o__configthreadlocale @ stub _o__configure_narrow_argv -@ stub _o__configure_wide_argv -@ stub _o__controlfp_s +@ cdecl _o__configure_wide_argv(long) ucrtbase._o__configure_wide_argv +@ cdecl _o__controlfp_s(ptr long long) ucrtbase._o__controlfp_s @ stub _o__cputs @ stub _o__cputws @ stub _o__creat @ stub _o__create_locale -@ stub _o__crt_atexit +@ cdecl _o__crt_atexit(ptr) ucrtbase._o__crt_atexit @ stub _o__ctime32_s @ stub _o__ctime64_s @ stub _o__cwait @@ -319,7 +319,7 @@ @ stub _o__get_fmode @ stub _o__get_heap_handle @ stub _o__get_initial_narrow_environment -@ stub _o__get_initial_wide_environment +@ cdecl _o__get_initial_wide_environment() ucrtbase._o__get_initial_wide_environment @ stub _o__get_invalid_parameter_handler @ stub _o__get_narrow_winmain_command_line @ stub _o__get_osfhandle @@ -366,7 +366,7 @@ @ stub _o__i64tow_s @ stub _o__initialize_narrow_environment @ cdecl _o__initialize_onexit_table(ptr) ucrtbase._o__initialize_onexit_table -@ stub _o__initialize_wide_environment +@ cdecl _o__initialize_wide_environment() ucrtbase._o__initialize_wide_environment @ stub _o__invalid_parameter_noinfo @ stub _o__invalid_parameter_noinfo_noreturn @ stub _o__isatty @@ -660,16 +660,16 @@ @ stub _o__scalbf @ stub _o__searchenv @ stub _o__searchenv_s -@ stub _o__seh_filter_dll -@ stub _o__seh_filter_exe +@ cdecl _o__seh_filter_dll(long ptr) ucrtbase._o__seh_filter_dll +@ cdecl _o__seh_filter_exe(long ptr) ucrtbase._o__seh_filter_exe @ stub _o__set_abort_behavior -@ stub _o__set_app_type +@ cdecl _o__set_app_type(long) ucrtbase._o__set_app_type @ stub _o__set_doserrno @ stub _o__set_errno -@ stub _o__set_fmode +@ cdecl _o__set_fmode(long) ucrtbase._o__set_fmode @ stub _o__set_invalid_parameter_handler @ stub _o__set_new_handler -@ stub _o__set_new_mode +@ cdecl _o__set_new_mode(long) ucrtbase._o__set_new_mode @ stub _o__set_thread_local_invalid_parameter_handler @ stub _o__seterrormode @ stub _o__setmbcp @@ -919,7 +919,7 @@ @ stub _o_bsearch @ stub _o_bsearch_s @ stub _o_btowc -@ stub _o_calloc +@ cdecl _o_calloc(long long) ucrtbase._o_calloc @ stub _o_cbrt @ stub _o_cbrtf @ stub _o_ceil @@ -936,7 +936,7 @@ @ stub _o_erfcl @ stub _o_erff @ stub _o_erfl -@ stub _o_exit +@ cdecl _o_exit(long) ucrtbase._o_exit @ stub _o_exp @ stub _o_exp2 @ stub _o_exp2f @@ -967,7 +967,7 @@ @ stub _o_fputws @ stub _o_fread @ stub _o_fread_s -@ stub _o_free +@ cdecl _o_free(ptr) ucrtbase._o_free @ stub _o_freopen @ stub _o_freopen_s @ stub _o_frexp @@ -1142,7 +1142,7 @@ @ stub _o_tmpfile_s @ stub _o_tmpnam_s @ stub _o_tolower -@ stub _o_toupper +@ cdecl _o_toupper(long) ucrtbase._o_toupper @ stub _o_towlower @ stub _o_towupper @ stub _o_ungetc diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index cb45aa5..2d1d8da 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -791,11 +791,11 @@ @ stub _o___libm_sse2_sinf @ stub _o___libm_sse2_tan @ stub _o___libm_sse2_tanf -@ stub _o___p___argc +@ cdecl _o___p___argc() MSVCRT___p___argc @ stub _o___p___argv -@ stub _o___p___wargv +@ cdecl _o___p___wargv() MSVCRT___p___wargv @ stub _o___p__acmdln -@ stub _o___p__commode +@ cdecl _o___p__commode() __p__commode @ stub _o___p__environ @ stub _o___p__fmode @ stub _o___p__mbcasemap @@ -808,7 +808,7 @@ @ stub _o___pwctype_func @ stub _o___std_exception_copy @ stub _o___std_exception_destroy -@ stub _o___std_type_info_destroy_list +@ cdecl _o___std_type_info_destroy_list(ptr) MSVCRT_type_info_destroy_list @ stub _o___std_type_info_name @ stub _o___stdio_common_vfprintf @ stub _o___stdio_common_vfprintf_p @@ -871,15 +871,15 @@ @ stub _o__chsize_s @ stub _o__close @ stub _o__commit -@ stub _o__configthreadlocale +@ cdecl _o__configthreadlocale(long) _configthreadlocale @ stub _o__configure_narrow_argv -@ stub _o__configure_wide_argv -@ stub _o__controlfp_s +@ cdecl _o__configure_wide_argv(long) _configure_wide_argv +@ cdecl _o__controlfp_s(ptr long long) _controlfp_s @ stub _o__cputs @ stub _o__cputws @ stub _o__creat @ stub _o__create_locale -@ stub _o__crt_atexit +@ cdecl _o__crt_atexit(ptr) MSVCRT__crt_atexit @ stub _o__ctime32_s @ stub _o__ctime64_s @ stub _o__cwait @@ -983,7 +983,7 @@ @ stub _o__get_fmode @ stub _o__get_heap_handle @ stub _o__get_initial_narrow_environment -@ stub _o__get_initial_wide_environment +@ cdecl _o__get_initial_wide_environment() _get_initial_wide_environment @ stub _o__get_invalid_parameter_handler @ stub _o__get_narrow_winmain_command_line @ stub _o__get_osfhandle @@ -1030,7 +1030,7 @@ @ stub _o__i64tow_s @ stub _o__initialize_narrow_environment @ cdecl _o__initialize_onexit_table(ptr) MSVCRT__initialize_onexit_table -@ stub _o__initialize_wide_environment +@ cdecl _o__initialize_wide_environment() _initialize_wide_environment @ stub _o__invalid_parameter_noinfo @ stub _o__invalid_parameter_noinfo_noreturn @ stub _o__isatty @@ -1324,16 +1324,16 @@ @ stub _o__scalbf @ stub _o__searchenv @ stub _o__searchenv_s -@ stub _o__seh_filter_dll -@ stub _o__seh_filter_exe +@ cdecl _o__seh_filter_dll(long ptr) __CppXcptFilter +@ cdecl _o__seh_filter_exe(long ptr) _XcptFilter @ stub _o__set_abort_behavior -@ stub _o__set_app_type +@ cdecl _o__set_app_type(long) MSVCRT___set_app_type @ stub _o__set_doserrno @ stub _o__set_errno -@ stub _o__set_fmode +@ cdecl _o__set_fmode(long) MSVCRT__set_fmode @ stub _o__set_invalid_parameter_handler @ stub _o__set_new_handler -@ stub _o__set_new_mode +@ cdecl _o__set_new_mode(long) MSVCRT__set_new_mode @ stub _o__set_thread_local_invalid_parameter_handler @ stub _o__seterrormode @ stub _o__setmbcp @@ -1583,7 +1583,7 @@ @ stub _o_bsearch @ stub _o_bsearch_s @ stub _o_btowc -@ stub _o_calloc +@ cdecl _o_calloc(long long) MSVCRT_calloc @ stub _o_cbrt @ stub _o_cbrtf @ stub _o_ceil @@ -1600,7 +1600,7 @@ @ stub _o_erfcl @ stub _o_erff @ stub _o_erfl -@ stub _o_exit +@ cdecl _o_exit(long) MSVCRT_exit @ stub _o_exp @ stub _o_exp2 @ stub _o_exp2f @@ -1631,7 +1631,7 @@ @ stub _o_fputws @ stub _o_fread @ stub _o_fread_s -@ stub _o_free +@ cdecl _o_free(ptr) MSVCRT_free @ stub _o_freopen @ stub _o_freopen_s @ stub _o_frexp @@ -1807,7 +1807,7 @@ @ stub _o_tmpfile_s @ stub _o_tmpnam_s @ stub _o_tolower -@ stub _o_toupper +@ cdecl _o_toupper(long) MSVCRT__toupper @ stub _o_towlower @ stub _o_towupper @ stub _o_ungetc

1 0

Zhiyi Zhang : user32: Check for null handle in GetRawInputData().
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: b357d44e9efcef300c481f1182fc01aaf6bc201c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b357d44e9efcef300c481f11… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jan 23 23:27:09 2019 +0800 user32: Check for null handle in GetRawInputData(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46499 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bd730a5f412c1e3b8a05b3b297ca0642e23fb92b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/rawinput.c | 3 +++ dlls/user32/tests/input.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index cf3028a..4bfccdf 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -281,6 +281,9 @@ UINT WINAPI GetRawInputData(HRAWINPUT rawinput, UINT command, void *data, UINT * TRACE("rawinput %p, command %#x, data %p, data_size %p, header_size %u.\n", rawinput, command, data, data_size, header_size); + if (!ri) + return ~0U; + if (header_size != sizeof(RAWINPUTHEADER)) { WARN("Invalid structure size %u.\n", header_size); diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 14fd5f8..ffdd4b7 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1530,6 +1530,16 @@ static void test_GetRawInputDeviceList(void) ok(odevcount == oret, "expected %d, got %d\n", oret, odevcount); } +static void test_GetRawInputData(void) +{ + UINT size; + UINT ret; + + /* Null raw input handle */ + ret = GetRawInputData(NULL, RID_INPUT, NULL, &size, sizeof(RAWINPUTHEADER)); + ok(ret == ~0U, "Expect ret %u, got %u\n", ~0U, ret); +} + static void test_key_map(void) { HKL kl = GetKeyboardLayout(0); @@ -2697,6 +2707,7 @@ START_TEST(input) test_attach_input(); test_GetKeyState(); test_OemKeyScan(); + test_GetRawInputData(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx();

1 0

Nikolay Sivov : user32/dialog: Fix setting negative dialog item ids.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: ed80f1c4e7be32910a87272dec07ccc3025a8ca8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed80f1c4e7be32910a87272d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 24 11:52:01 2019 +0300 user32/dialog: Fix setting negative dialog item ids. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46494 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 47a44e6d9c4ffafce562f73d31fa3318b229ab3a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/dialog.c | 4 ++-- dlls/user32/tests/dialog.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 9 +++++++++ dlls/user32/user_private.h | 1 + 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 72e6eee..deaeb84 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -131,8 +131,8 @@ static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info, if (dialogEx) { - /* id is a DWORD for DIALOGEX */ - info->id = GET_DWORD(p); + /* id is 4 bytes for DIALOGEX */ + info->id = GET_LONG(p); p += 2; } else diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 8c9bd21..070ddce 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1181,9 +1181,47 @@ static void test_GetDlgItemText(void) "string retrieved using GetDlgItemText should have been NULL terminated\n"); } +static INT_PTR CALLBACK getdlgitem_test_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + if (msg == WM_INITDIALOG) + { + char text[64]; + LONG_PTR val; + HWND hwnd; + BOOL ret; + + hwnd = GetDlgItem(hdlg, -1); + ok(hwnd != NULL, "Expected dialog item.\n"); + + *text = 0; + ret = GetDlgItemTextA(hdlg, -1, text, ARRAY_SIZE(text)); + ok(ret && !strcmp(text, "Text1"), "Unexpected item text.\n"); + + val = GetWindowLongA(hwnd, GWLP_ID); + ok(val == -1, "Unexpected id.\n"); + + val = GetWindowLongPtrA(hwnd, GWLP_ID); + ok(val == -1, "Unexpected id %ld.\n", val); + + hwnd = GetDlgItem(hdlg, -2); + ok(hwnd != NULL, "Expected dialog item.\n"); + + val = GetWindowLongA(hwnd, GWLP_ID); + ok(val == -2, "Unexpected id.\n"); + + val = GetWindowLongPtrA(hwnd, GWLP_ID); + ok(val == -2, "Unexpected id %ld.\n", val); + + EndDialog(hdlg, 0xdead); + } + + return FALSE; +} + static void test_GetDlgItem(void) { HWND hwnd, child1, child2, hwnd2; + INT_PTR retval; BOOL ret; hwnd = CreateWindowA("button", "parent", WS_VISIBLE, 0, 0, 100, 100, NULL, 0, g_hinst, NULL); @@ -1230,6 +1268,9 @@ static void test_GetDlgItem(void) DestroyWindow(child1); DestroyWindow(child2); DestroyWindow(hwnd); + + retval = DialogBoxParamA(g_hinst, "GETDLGITEM_TEST_DIALOG", NULL, getdlgitem_test_dialog_proc, 0); + ok(retval == 0xdead, "Unexpected return value.\n"); } static INT_PTR CALLBACK DestroyDlgWinProc (HWND hDlg, UINT uiMsg, diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 3823ed3..4301af6 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -237,6 +237,15 @@ FONT 8, "MS Sans Serif" CONTROL "oddlengthtext", -1, "TESTCONTROL", WS_CHILD|WS_VISIBLE|WS_BORDER|WS_TABSTOP, 10,60,100,50 { 1,2,3,4,5 } } +GETDLGITEM_TEST_DIALOG DIALOGEX 6, 15, 207, 111 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Test Dialog" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Text1",-1,10,10,100,50 + LTEXT "Text2",-2,10,10,100,50 +} + /* @makedep: test_mono.bmp */ 100 BITMAP test_mono.bmp diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index bf02ee5..514cf67 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -33,6 +33,7 @@ #define GET_WORD(ptr) (*(const WORD *)(ptr)) #define GET_DWORD(ptr) (*(const DWORD *)(ptr)) +#define GET_LONG(ptr) (*(const LONG *)(ptr)) #define WM_SYSTIMER 0x0118 #define WM_POPUPSYSTEMMENU 0x0313

1 0

Matteo Bruni : d3dx9: Improve D3DXMatrixTransformation() implementation.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: e36c8d616e0194d0edea30d85cb62808a237d91c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e36c8d616e0194d0edea30d8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:00 2019 +0100 d3dx9: Improve D3DXMatrixTransformation() implementation. Inspired by a patch from David Adam. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33456 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f54260a789387ab40de3d80291ad9000176dabe1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/math.c | 104 +++++++++++++++++++++++---------------------------- 1 file changed, 46 insertions(+), 58 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 8909c3c..02e917d 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -744,82 +744,70 @@ D3DXMATRIX* WINAPI D3DXMatrixShadow(D3DXMATRIX *pout, const D3DXVECTOR4 *plight, return pout; } -D3DXMATRIX* WINAPI D3DXMatrixTransformation(D3DXMATRIX *pout, const D3DXVECTOR3 *pscalingcenter, const D3DXQUATERNION *pscalingrotation, const D3DXVECTOR3 *pscaling, const D3DXVECTOR3 *protationcenter, const D3DXQUATERNION *protation, const D3DXVECTOR3 *ptranslation) +D3DXMATRIX * WINAPI D3DXMatrixTransformation(D3DXMATRIX *out, const D3DXVECTOR3 *scaling_center, + const D3DXQUATERNION *scaling_rotation, const D3DXVECTOR3 *scaling, + const D3DXVECTOR3 *rotation_center, const D3DXQUATERNION *rotation, + const D3DXVECTOR3 *translation) { - D3DXMATRIX m1, m2, m3, m4, m5, m6, m7; - D3DXQUATERNION prc; - D3DXVECTOR3 psc, pt; + static const D3DXVECTOR3 zero_vector; + D3DXMATRIX m1, msr1, ms, msr, msc, mrc1, mr, mrc, mt; + D3DXVECTOR3 sc, rc; + D3DXQUATERNION q; - TRACE("pout %p, pscalingcenter %p, pscalingrotation %p, pscaling %p, protationcentr %p, protation %p, ptranslation %p\n", - pout, pscalingcenter, pscalingrotation, pscaling, protationcenter, protation, ptranslation); + TRACE("out %p, scaling_center %p, scaling_rotation %p, scaling %p, rotation_center %p," + " rotation %p, translation %p.\n", + out, scaling_center, scaling_rotation, scaling, rotation_center, rotation, translation); - if ( !pscalingcenter ) + if (scaling) { - psc.x = 0.0f; - psc.y = 0.0f; - psc.z = 0.0f; - } - else - { - psc.x = pscalingcenter->x; - psc.y = pscalingcenter->y; - psc.z = pscalingcenter->z; - } - - if ( !protationcenter ) - { - prc.x = 0.0f; - prc.y = 0.0f; - prc.z = 0.0f; + sc = scaling_center ? *scaling_center : zero_vector; + D3DXMatrixTranslation(&m1, -sc.x, -sc.y, -sc.z); + if (scaling_rotation) + { + q.x = -scaling_rotation->x; + q.y = -scaling_rotation->y; + q.z = -scaling_rotation->z; + q.w = scaling_rotation->w; + D3DXMatrixRotationQuaternion(&msr1, &q); + D3DXMatrixMultiply(&m1, &m1, &msr1); + } + D3DXMatrixScaling(&ms, scaling->x, scaling->y, scaling->z); + D3DXMatrixMultiply(&m1, &m1, &ms); + if (scaling_rotation) + { + D3DXMatrixRotationQuaternion(&msr, scaling_rotation); + D3DXMatrixMultiply(&m1, &m1, &msr); + } + D3DXMatrixTranslation(&msc, sc.x, sc.y, sc.z); + D3DXMatrixMultiply(&m1, &m1, &msc); } else { - prc.x = protationcenter->x; - prc.y = protationcenter->y; - prc.z = protationcenter->z; + D3DXMatrixIdentity(&m1); } - if ( !ptranslation ) - { - pt.x = 0.0f; - pt.y = 0.0f; - pt.z = 0.0f; - } - else + if (rotation) { - pt.x = ptranslation->x; - pt.y = ptranslation->y; - pt.z = ptranslation->z; + rc = rotation_center ? *rotation_center : zero_vector; + D3DXMatrixTranslation(&mrc1, -rc.x, -rc.y, -rc.z); + D3DXMatrixMultiply(&m1, &m1, &mrc1); + D3DXMatrixRotationQuaternion(&mr, rotation); + D3DXMatrixMultiply(&m1, &m1, &mr); + D3DXMatrixTranslation(&mrc, rc.x, rc.y, rc.z); + D3DXMatrixMultiply(&m1, &m1, &mrc); } - D3DXMatrixTranslation(&m1, -psc.x, -psc.y, -psc.z); - - if ( !pscalingrotation ) + if (translation) { - D3DXMatrixIdentity(&m2); - D3DXMatrixIdentity(&m4); + D3DXMatrixTranslation(&mt, translation->x, translation->y, translation->z); + D3DXMatrixMultiply(out, &m1, &mt); } else { - D3DXMatrixRotationQuaternion(&m4, pscalingrotation); - D3DXMatrixInverse(&m2, NULL, &m4); + *out = m1; } - if ( !pscaling ) D3DXMatrixIdentity(&m3); - else D3DXMatrixScaling(&m3, pscaling->x, pscaling->y, pscaling->z); - - if ( !protation ) D3DXMatrixIdentity(&m6); - else D3DXMatrixRotationQuaternion(&m6, protation); - - D3DXMatrixTranslation(&m5, psc.x - prc.x, psc.y - prc.y, psc.z - prc.z); - D3DXMatrixTranslation(&m7, prc.x + pt.x, prc.y + pt.y, prc.z + pt.z); - D3DXMatrixMultiply(&m1, &m1, &m2); - D3DXMatrixMultiply(&m1, &m1, &m3); - D3DXMatrixMultiply(&m1, &m1, &m4); - D3DXMatrixMultiply(&m1, &m1, &m5); - D3DXMatrixMultiply(&m1, &m1, &m6); - D3DXMatrixMultiply(pout, &m1, &m7); - return pout; + return out; } D3DXMATRIX* WINAPI D3DXMatrixTransformation2D(D3DXMATRIX *pout, const D3DXVECTOR2 *pscalingcenter, FLOAT scalingrotation, const D3DXVECTOR2 *pscaling, const D3DXVECTOR2 *protationcenter, FLOAT rotation, const D3DXVECTOR2 *ptranslation)

1 0

Nikolay Sivov : mf/session: Add stubs for playback rate API.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 8e6fa7e9b02cb7e43d68db7e8f51a28bb6b3fb7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e6fa7e9b02cb7e43d68db7e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 14 16:08:51 2019 +0300 mf/session: Add stubs for playback rate API. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/mf/tests/mf.c | 33 ++++++++++++++ include/mfidl.idl | 30 ++++++++++++ 3 files changed, 194 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 7923581..e33a5ce 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -55,6 +55,8 @@ struct media_session { IMFMediaSession IMFMediaSession_iface; IMFGetService IMFGetService_iface; + IMFRateSupport IMFRateSupport_iface; + IMFRateControl IMFRateControl_iface; IMFAsyncCallback commands_callback; LONG refcount; IMFMediaEventQueue *event_queue; @@ -124,6 +126,16 @@ static struct media_session *impl_from_IMFGetService(IMFGetService *iface) return CONTAINING_RECORD(iface, struct media_session, IMFGetService_iface); } +static struct media_session *impl_session_from_IMFRateSupport(IMFRateSupport *iface) +{ + return CONTAINING_RECORD(iface, struct media_session, IMFRateSupport_iface); +} + +static struct media_session *impl_session_from_IMFRateControl(IMFRateControl *iface) +{ + return CONTAINING_RECORD(iface, struct media_session, IMFRateControl_iface); +} + static struct session_op *impl_op_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct session_op, IUnknown_iface); @@ -467,7 +479,30 @@ static ULONG WINAPI session_get_service_Release(IMFGetService *iface) static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) { - FIXME("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + struct media_session *session = impl_from_IMFGetService(iface); + + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + *obj = NULL; + + if (IsEqualGUID(service, &MF_RATE_CONTROL_SERVICE)) + { + if (IsEqualIID(riid, &IID_IMFRateSupport)) + { + *obj = &session->IMFRateSupport_iface; + } + else if (IsEqualIID(riid, &IID_IMFRateControl)) + { + *obj = &session->IMFRateControl_iface; + } + + if (*obj) + IUnknown_AddRef((IUnknown *)*obj); + + return *obj ? S_OK : E_NOINTERFACE; + } + else + FIXME("Unsupported service %s.\n", debugstr_guid(service)); return E_NOTIMPL; } @@ -543,6 +578,99 @@ static const IMFAsyncCallbackVtbl session_commands_callback_vtbl = session_commands_callback_Invoke, }; +static HRESULT WINAPI session_rate_support_QueryInterface(IMFRateSupport *iface, REFIID riid, void **obj) +{ + struct media_session *session = impl_session_from_IMFRateSupport(iface); + return IMFMediaSession_QueryInterface(&session->IMFMediaSession_iface, riid, obj); +} + +static ULONG WINAPI session_rate_support_AddRef(IMFRateSupport *iface) +{ + struct media_session *session = impl_session_from_IMFRateSupport(iface); + return IMFMediaSession_AddRef(&session->IMFMediaSession_iface); +} + +static ULONG WINAPI session_rate_support_Release(IMFRateSupport *iface) +{ + struct media_session *session = impl_session_from_IMFRateSupport(iface); + return IMFMediaSession_Release(&session->IMFMediaSession_iface); +} + +static HRESULT WINAPI session_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, + BOOL thin, float *rate) +{ + FIXME("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI session_rate_support_GetFastestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, + BOOL thin, float *rate) +{ + FIXME("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI session_rate_support_IsSupported(IMFRateSupport *iface, BOOL thin, float rate, + float *nearest_supported_rate) +{ + FIXME("%p, %d, %f, %p.\n", iface, thin, rate, nearest_supported_rate); + + return E_NOTIMPL; +} + +static const IMFRateSupportVtbl session_rate_support_vtbl = +{ + session_rate_support_QueryInterface, + session_rate_support_AddRef, + session_rate_support_Release, + session_rate_support_GetSlowestRate, + session_rate_support_GetFastestRate, + session_rate_support_IsSupported, +}; + +static HRESULT WINAPI session_rate_control_QueryInterface(IMFRateControl *iface, REFIID riid, void **obj) +{ + struct media_session *session = impl_session_from_IMFRateControl(iface); + return IMFMediaSession_QueryInterface(&session->IMFMediaSession_iface, riid, obj); +} + +static ULONG WINAPI session_rate_control_AddRef(IMFRateControl *iface) +{ + struct media_session *session = impl_session_from_IMFRateControl(iface); + return IMFMediaSession_AddRef(&session->IMFMediaSession_iface); +} + +static ULONG WINAPI session_rate_control_Release(IMFRateControl *iface) +{ + struct media_session *session = impl_session_from_IMFRateControl(iface); + return IMFMediaSession_Release(&session->IMFMediaSession_iface); +} + +static HRESULT WINAPI session_rate_control_SetRate(IMFRateControl *iface, BOOL thin, float rate) +{ + FIXME("%p, %d, %f.\n", iface, thin, rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI session_rate_control_GetRate(IMFRateControl *iface, BOOL *thin, float *rate) +{ + FIXME("%p, %p, %p.\n", iface, thin, rate); + + return E_NOTIMPL; +} + +static const IMFRateControlVtbl session_rate_control_vtbl = +{ + session_rate_control_QueryInterface, + session_rate_control_AddRef, + session_rate_control_Release, + session_rate_control_SetRate, + session_rate_control_GetRate, +}; + /*********************************************************************** * MFCreateMediaSession (mf.@) */ @@ -562,6 +690,8 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses object->IMFMediaSession_iface.lpVtbl = &mfmediasessionvtbl; object->IMFGetService_iface.lpVtbl = &session_get_service_vtbl; + object->IMFRateSupport_iface.lpVtbl = &session_rate_support_vtbl; + object->IMFRateControl_iface.lpVtbl = &session_rate_control_vtbl; object->commands_callback.lpVtbl = &session_commands_callback_vtbl; object->refcount = 1; if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index fc068a9..b64d3f9 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -943,8 +943,12 @@ todo_wine static void test_media_session(void) { + MFCLOCK_PROPERTIES clock_props; IMFMediaSession *session; + IMFRateControl *rc, *rc2; + IMFRateSupport *rs; IMFGetService *gs; + IMFClock *clock; IUnknown *unk; HRESULT hr; @@ -959,6 +963,35 @@ static void test_media_session(void) hr = IMFMediaSession_QueryInterface(session, &IID_IMFGetService, (void **)&gs); ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rs); + ok(hr == S_OK, "Failed to get rate support interface, hr %#x.\n", hr); + + hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, (void **)&rc); + ok(hr == S_OK, "Failed to get rate control interface, hr %#x.\n", hr); + + hr = IMFRateSupport_QueryInterface(rs, &IID_IMFMediaSession, (void **)&unk); + ok(hr == S_OK, "Failed to get session interface, hr %#x.\n", hr); + ok(unk == (IUnknown *)session, "Unexpected pointer.\n"); + IUnknown_Release(unk); + + hr = IMFMediaSession_GetClock(session, &clock); +todo_wine + ok(hr == S_OK, "Failed to get clock, hr %#x.\n", hr); + +if (SUCCEEDED(hr)) +{ + hr = IMFClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rc2); + ok(hr == S_OK, "Failed to get rate control, hr %#x.\n", hr); + IMFRateControl_Release(rc2); + + hr = IMFClock_GetProperties(clock, &clock_props); + ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + +} + IMFRateControl_Release(rc); + IMFRateSupport_Release(rs); + IMFGetService_Release(gs); test_session_events(session); diff --git a/include/mfidl.idl b/include/mfidl.idl index 5db737e..fac3bcf 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -89,6 +89,34 @@ interface IMFClock : IUnknown HRESULT GetProperties([out] MFCLOCK_PROPERTIES *props); } +typedef enum _MFRATE_DIRECTION +{ + MFRATE_FORWARD, + MFRATE_REVERSE +} MFRATE_DIRECTION; + +[ + object, + uuid(0a9ccdbc-d797-4563-9667-94ec5d79292d), +] +interface IMFRateSupport : IUnknown +{ + HRESULT GetSlowestRate( + [in] MFRATE_DIRECTION direction, + [in] BOOL thin, + [out] float *rate); + + HRESULT GetFastestRate( + [in] MFRATE_DIRECTION direction, + [in] BOOL thin, + [out] float *rate); + + HRESULT IsRateSupported( + [in] BOOL thin, + [in] float rate, + [in, out, unique] float *nearest_supported_rate); +} + [ object, uuid(88ddcd21-03c3-4275-91ed-55ee3929328f) @@ -745,3 +773,5 @@ cpp_quote("EXTERN_GUID(MF_TOPOLOGY_PROJECTSTOP, 0x7ed3f803, 0x86bb, 0x4b3f, 0xb7 cpp_quote("EXTERN_GUID(MF_TOPOLOGY_RESOLUTION_STATUS, 0x494bbcde, 0xb031, 0x4e38, 0x97, 0xc4, 0xd5, 0x42, 0x2d, 0xd6, 0x18, 0xdc);") cpp_quote("EXTERN_GUID(MF_TOPOLOGY_START_TIME_ON_PRESENTATION_SWITCH, 0xc8cc113f, 0x7951, 0x4548, 0xaa, 0xd6, 0x9e, 0xd6, 0x20, 0x2e, 0x62, 0xb3);") cpp_quote("EXTERN_GUID(MF_TOPOLOGY_STATIC_PLAYBACK_OPTIMIZATIONS, 0xb86cac42, 0x41a6, 0x4b79, 0x89, 0x7a, 0x1a, 0xb0, 0xe5, 0x2b, 0x4a, 0x1b);") + +cpp_quote("EXTERN_GUID(MF_RATE_CONTROL_SERVICE, 0x866fa297, 0xb802, 0x4bf8, 0x9d, 0xc9, 0x5e, 0x3b, 0x6a, 0x9f, 0x53, 0xc9);")

1 0