June 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Remove support for being loaded directly from libwine.
by Alexandre Julliard 29 Jun '20

29 Jun '20

Module: wine Branch: master Commit: 83a4549e9baa252d0fb92d14e5a39119b8583813 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83a4549e9baa252d0fb92d14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 12:11:57 2020 +0200 ntdll: Remove support for being loaded directly from libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 35 ++--------------------------------- dlls/ntdll/unix/loader.c | 37 ------------------------------------- 2 files changed, 2 insertions(+), 70 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index aa7b58b732..ab554438af 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3900,33 +3900,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } -static NTSTATUS load_ntdll_so( HMODULE module, const IMAGE_NT_HEADERS *nt ) -{ - NTSTATUS (__cdecl *init_func)( HMODULE module, const void *ptr_in, void *ptr_out ); - Dl_info info; - char *name; - void *handle; - - if (!dladdr( load_ntdll_so, &info )) - { - fprintf( stderr, "cannot get path to ntdll.dll.so\n" ); - exit(1); - } - name = strdup( info.dli_fname ); - strcpy( name + strlen(name) - strlen(".dll.so"), ".so" ); - if (!(handle = dlopen( name, RTLD_NOW ))) - { - fprintf( stderr, "failed to load %s: %s\n", name, dlerror() ); - exit(1); - } - if (!(init_func = dlsym( handle, "__wine_init_unix_lib" ))) - { - fprintf( stderr, "init func not found in %s\n", name ); - exit(1); - } - return init_func( module, nt, &unix_funcs ); -} - /*********************************************************************** * __wine_process_init */ @@ -3948,13 +3921,9 @@ void __wine_process_init(void) HMODULE ntdll_module = (HMODULE)((__wine_spec_nt_header.OptionalHeader.ImageBase + 0xffff) & ~0xffff); INITIAL_TEB stack; SIZE_T info_size; - TEB *teb; - PEB *peb; - - if (!unix_funcs) load_ntdll_so( ntdll_module, &__wine_spec_nt_header ); + TEB *teb = thread_init( &info_size ); + PEB *peb = teb->Peb; - teb = thread_init( &info_size ); - peb = teb->Peb; peb->ProcessHeap = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL ); peb->LoaderLock = &loader_section; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 10b483a95a..6043367a8e 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -105,10 +105,6 @@ static void (CDECL *p__wine_set_unix_funcs)( int version, const struct unix_func static void fatal_error( const char *err, ... ) __attribute__((noreturn, format(printf,1,2))); #endif -extern int __wine_main_argc; -extern char **__wine_main_argv; -extern char **__wine_main_environ; - #if defined(linux) || defined(__APPLE__) static const BOOL use_preloader = TRUE; #else @@ -1803,39 +1799,6 @@ void __wine_main( int argc, char *argv[], char *envp[] ) } -static int add_area( void *base, size_t size, void *arg ) -{ - mmap_add_reserved_area( base, size ); - return 0; -} - -/*********************************************************************** - * __wine_init_unix_lib - * - * Lib entry point called by ntdll.dll.so if not yet initialized. - */ -NTSTATUS __cdecl __wine_init_unix_lib( HMODULE module, const void *ptr_in, void *ptr_out ) -{ - const IMAGE_NT_HEADERS *nt = ptr_in; - -#ifdef __APPLE__ - extern char **__wine_get_main_environment(void); - char **envp = __wine_get_main_environment(); -#else - char **envp = __wine_main_environ; -#endif - init_paths( __wine_main_argc, __wine_main_argv, envp ); - - ntdll_module = module; - map_so_dll( nt, module ); - fixup_ntdll_imports( &__wine_spec_nt_header ); - init_environment( __wine_main_argc, __wine_main_argv, envp ); - wine_dll_set_callback( load_builtin_callback ); - *(struct unix_funcs **)ptr_out = &unix_funcs; - wine_mmap_enum_reserved_areas( add_area, NULL, 0 ); - return STATUS_SUCCESS; -} - BOOL WINAPI DECLSPEC_HIDDEN DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { if (reason == DLL_PROCESS_ATTACH) LdrDisableThreadCalloutsForDll( inst );

1 0

Alexandre Julliard : ntdll: Setup the main thread before initializing ntdll.
by Alexandre Julliard 29 Jun '20

29 Jun '20

Module: wine Branch: master Commit: 43be3507c04b56938e985047f2ab55147ed8ddd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43be3507c04b56938e985047… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 12:19:13 2020 +0200 ntdll: Setup the main thread before initializing ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 47 +++++++++++++++++++++++++++--- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/thread.c | 65 +----------------------------------------- dlls/ntdll/unix/loader.c | 28 ++++++++++++++++-- dlls/ntdll/unix/thread.c | 27 ------------------ dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unixlib.h | 3 +- 7 files changed, 70 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43be3507c04b56938e98…

1 0

Changping Yu : kernel32/tests: Add test for thread enumeration order in toolhelp.
by Alexandre Julliard 29 Jun '20

29 Jun '20

Module: wine Branch: master Commit: ab7485bb4beccae445717719bff718f11f80e3d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab7485bb4beccae445717719… Author: Changping Yu <dead.ash(a)hotmail.com> Date: Mon Jun 29 11:25:01 2020 +0800 kernel32/tests: Add test for thread enumeration order in toolhelp. Signed-off-by: Changping Yu <dead.ash(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/toolhelp.c | 174 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 172 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index 9250f8dc54..eab35e0a47 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -22,11 +22,14 @@ #include <stdlib.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "tlhelp32.h" #include "wine/test.h" #include "winuser.h" +#include "winternl.h" static char selfname[MAX_PATH]; @@ -38,9 +41,12 @@ static BOOL (WINAPI *pProcess32First)(HANDLE, LPPROCESSENTRY32); static BOOL (WINAPI *pProcess32Next)(HANDLE, LPPROCESSENTRY32); static BOOL (WINAPI *pThread32First)(HANDLE, LPTHREADENTRY32); static BOOL (WINAPI *pThread32Next)(HANDLE, LPTHREADENTRY32); +static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, void *, ULONG, ULONG *); /* 1 minute should be more than enough */ #define WAIT_TIME (60 * 1000) +/* Specify the number of simultaneous threads to test */ +#define NUM_THREADS 4 static DWORD WINAPI sub_thread(void* pmt) { @@ -150,6 +156,166 @@ static void test_process(DWORD curr_pid, DWORD sub_pcs_pid) ok(!pProcess32First( hSnapshot, &pe ), "shouldn't return a process\n"); } +static DWORD WINAPI get_id_thread(void* curr_pid) +{ + HANDLE hSnapshot; + THREADENTRY32 te; + HANDLE ev, threads[NUM_THREADS]; + DWORD thread_ids[NUM_THREADS]; + DWORD thread_traversed[NUM_THREADS]; + DWORD tid, first_tid = 0; + BOOL found = FALSE; + int i, matched_idx = -1; + ULONG buf_size = 0; + NTSTATUS status; + BYTE* pcs_buffer = NULL; + DWORD pcs_offset = 0; + SYSTEM_PROCESS_INFORMATION* spi = NULL; + + ev = CreateEventW(NULL, TRUE, FALSE, NULL); + ok(ev != NULL, "Cannot create event\n"); + + for (i = 0; i < NUM_THREADS; i++) + { + threads[i] = CreateThread(NULL, 0, sub_thread, ev, 0, &tid); + ok(threads[i] != NULL, "Cannot create thread\n"); + thread_ids[i] = tid; + } + + hSnapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0); + ok(hSnapshot != NULL, "Cannot create snapshot\n"); + + /* Check that this current process is enumerated */ + te.dwSize = sizeof(te); + ok(pThread32First(hSnapshot, &te), "Thread cannot traverse\n"); + do + { + if (found) + { + if (te.th32OwnerProcessID != PtrToUlong(curr_pid)) break; + + if (matched_idx >= 0) + { + thread_traversed[matched_idx++] = te.th32ThreadID; + if (matched_idx >= NUM_THREADS) break; + } + else if (thread_ids[0] == te.th32ThreadID) + { + matched_idx = 0; + thread_traversed[matched_idx++] = te.th32ThreadID; + } + } + else if (te.th32OwnerProcessID == PtrToUlong(curr_pid)) + { + found = TRUE; + first_tid = te.th32ThreadID; + } + } + while (pThread32Next(hSnapshot, &te)); + + ok(found, "Couldn't find self and/or sub-process in process list\n"); + + /* Check if the thread order is strictly consistent */ + found = FALSE; + for (i = 0; i < NUM_THREADS; i++) + { + if (thread_traversed[i] != thread_ids[i]) + { + found = TRUE; + break; + } + /* Reset data */ + thread_traversed[i] = 0; + } + todo_wine + ok(found == FALSE, "The thread order is not strictly consistent\n"); + + /* Determine the order by NtQuerySystemInformation function */ + pcs_buffer = NULL; + status = pNtQuerySystemInformation(SystemProcessInformation, pcs_buffer, buf_size, &buf_size); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Failed with %x\n", status); + if (status == STATUS_INFO_LENGTH_MISMATCH) + { + pcs_buffer = HeapAlloc(GetProcessHeap(), 0, buf_size); + ok(pcs_buffer != NULL, "Unable to allocate space\n"); + found = FALSE; + matched_idx = -1; + + status = NtQuerySystemInformation(SystemProcessInformation, pcs_buffer, buf_size, &buf_size); + do { + spi = (SYSTEM_PROCESS_INFORMATION*)&pcs_buffer[pcs_offset]; + if (spi->UniqueProcessId == curr_pid) + { + found = TRUE; + break; + } + pcs_offset += spi->NextEntryOffset; + } while (spi->NextEntryOffset != 0); + + ok(found && spi, "No process found\n"); + for (i = 0; i < spi->dwThreadCount; i++) + { + tid = HandleToULong(spi->ti[i].ClientId.UniqueThread); + if (matched_idx > 0) + { + thread_traversed[matched_idx++] = tid; + if (matched_idx >= NUM_THREADS) break; + } + else if (tid == thread_ids[0]) + { + matched_idx = 0; + thread_traversed[matched_idx++] = tid; + } + } + } + if (pcs_buffer) + HeapFree(GetProcessHeap(), 0, pcs_buffer); + + ok(matched_idx > 0, "No thread id match found\n"); + + found = FALSE; + for (i = 0; i < NUM_THREADS; i++) + { + if (thread_traversed[i] != thread_ids[i]) + { + found = TRUE; + break; + } + } + todo_wine + ok(found == FALSE, "wrong order in NtQuerySystemInformation function\n"); + + SetEvent(ev); + WaitForMultipleObjects( NUM_THREADS, threads, TRUE, WAIT_TIME ); + for (i = 0; i < NUM_THREADS; i++) + CloseHandle(threads[i]); + CloseHandle(ev); + CloseHandle(hSnapshot); + + return first_tid; +} + +static void test_main_thread(DWORD curr_pid, DWORD main_tid) +{ + HANDLE thread; + DWORD tid = 0; + int error; + + /* Check that the main thread id is first one in this thread. */ + tid = get_id_thread(ULongToPtr(curr_pid)); + todo_wine + ok(tid == main_tid, "The first thread id returned is not the main thread id\n"); + + /* Check that the main thread id is first one in other thread. */ + thread = CreateThread(NULL, 0, get_id_thread, ULongToPtr(curr_pid), 0, NULL); + error = WaitForSingleObject(thread, WAIT_TIME); + ok(error == WAIT_OBJECT_0, "Thread did not complete within timelimit\n"); + + ok(GetExitCodeThread(thread, &tid), "Could not retrieve exit code\n"); + todo_wine + ok(tid == main_tid, "The first thread id returned is not the main thread id\n"); +} + static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) { HANDLE hSnapshot; @@ -158,7 +324,7 @@ static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) int num = 0; unsigned curr_found = 0; unsigned sub_found = 0; - + hSnapshot = pCreateToolhelp32Snapshot( TH32CS_SNAPTHREAD, 0 ); ok(hSnapshot != NULL, "Cannot create snapshot\n"); @@ -291,6 +457,7 @@ START_TEST(toolhelp) HANDLE ev1, ev2; DWORD w; HANDLE hkernel32 = GetModuleHandleA("kernel32"); + HANDLE hntdll = GetModuleHandleA("ntdll.dll"); pCreateToolhelp32Snapshot = (VOID *) GetProcAddress(hkernel32, "CreateToolhelp32Snapshot"); pModule32First = (VOID *) GetProcAddress(hkernel32, "Module32First"); @@ -299,11 +466,13 @@ START_TEST(toolhelp) pProcess32Next = (VOID *) GetProcAddress(hkernel32, "Process32Next"); pThread32First = (VOID *) GetProcAddress(hkernel32, "Thread32First"); pThread32Next = (VOID *) GetProcAddress(hkernel32, "Thread32Next"); + pNtQuerySystemInformation = (VOID *) GetProcAddress(hntdll, "NtQuerySystemInformation"); if (!pCreateToolhelp32Snapshot || !pModule32First || !pModule32Next || !pProcess32First || !pProcess32Next || - !pThread32First || !pThread32Next) + !pThread32First || !pThread32Next || + !pNtQuerySystemInformation) { win_skip("Needed functions are not available, most likely running on Windows NT\n"); return; @@ -339,6 +508,7 @@ START_TEST(toolhelp) test_process(pid, info.dwProcessId); test_thread(pid, info.dwProcessId); + test_main_thread(pid, GetCurrentThreadId()); test_module(pid, curr_expected_modules, ARRAY_SIZE(curr_expected_modules)); test_module(info.dwProcessId, sub_expected_modules, ARRAY_SIZE(sub_expected_modules));

1 0

Changping Yu : kernel32: Adjust thread creation insertion order.
by Alexandre Julliard 29 Jun '20

29 Jun '20

Module: wine Branch: master Commit: 59ce4e3eb878ca470ec0f153f567e92a3a577922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59ce4e3eb878ca470ec0f153… Author: Changping Yu <dead.ash(a)hotmail.com> Date: Mon Jun 29 13:08:27 2020 +0800 kernel32: Adjust thread creation insertion order. Signed-off-by: Changping Yu <dead.ash(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/toolhelp.c | 4 ---- server/thread.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index eab35e0a47..7d27f22196 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -227,7 +227,6 @@ static DWORD WINAPI get_id_thread(void* curr_pid) /* Reset data */ thread_traversed[i] = 0; } - todo_wine ok(found == FALSE, "The thread order is not strictly consistent\n"); /* Determine the order by NtQuerySystemInformation function */ @@ -282,7 +281,6 @@ static DWORD WINAPI get_id_thread(void* curr_pid) break; } } - todo_wine ok(found == FALSE, "wrong order in NtQuerySystemInformation function\n"); SetEvent(ev); @@ -303,7 +301,6 @@ static void test_main_thread(DWORD curr_pid, DWORD main_tid) /* Check that the main thread id is first one in this thread. */ tid = get_id_thread(ULongToPtr(curr_pid)); - todo_wine ok(tid == main_tid, "The first thread id returned is not the main thread id\n"); /* Check that the main thread id is first one in other thread. */ @@ -312,7 +309,6 @@ static void test_main_thread(DWORD curr_pid, DWORD main_tid) ok(error == WAIT_OBJECT_0, "Thread did not complete within timelimit\n"); ok(GetExitCodeThread(thread, &tid), "Could not retrieve exit code\n"); - todo_wine ok(tid == main_tid, "The first thread id returned is not the main thread id\n"); } diff --git a/server/thread.c b/server/thread.c index 3cf447b1a0..23c0538150 100644 --- a/server/thread.c +++ b/server/thread.c @@ -329,7 +329,7 @@ struct thread *create_thread( int fd, struct process *process, const struct secu thread->affinity = process->affinity; if (!current) current = thread; - list_add_head( &thread_list, &thread->entry ); + list_add_tail( &thread_list, &thread->entry ); if (sd && !set_sd_defaults_from_token( &thread->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |

1 0

Vijay Kiran Kamuju : include: Fix typo in DS3DALG_DEFAULT.
by Alexandre Julliard 29 Jun '20

29 Jun '20

Module: wine Branch: master Commit: 3a17ee90663566f7ca53e61be26f0e9bee201566 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a17ee90663566f7ca53e61b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Jun 29 11:41:29 2020 +0200 include: Fix typo in DS3DALG_DEFAULT. Spotted by Ozkan Sezer Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dsound.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dsound.h b/include/dsound.h index 85235ef1bb..bfb52a297a 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -116,7 +116,7 @@ DEFINE_GUID(DSDEVID_DefaultVoiceCapture, 0xDEF00003,0x9C6D,0x47ED,0xAA,0xF1,0x4D DEFINE_GUID(DSDEVID_WinePlayback, 0x40316A1D,0x605B,0xD611,0x87,0xC6,0x00,0x80,0xAD,0x00,0x02,0xFE); -#define DSD3DALG_DEFAULT GUID_NULL +#define DS3DALG_DEFAULT GUID_NULL DEFINE_GUID(DS3DALG_NO_VIRTUALIZATION, 0xc241333f,0x1c1b,0x11d2,0x94,0xf5,0x00,0xc0,0x4f,0xc2,0x8a,0xca); DEFINE_GUID(DS3DALG_HRTF_FULL, 0xc2413340,0x1c1b,0x11d2,0x94,0xf5,0x00,0xc0,0x4f,0xc2,0x8a,0xca); DEFINE_GUID(DS3DALG_HRTF_LIGHT, 0xc2413342,0x1c1b,0x11d2,0x94,0xf5,0x00,0xc0,0x4f,0xc2,0x8a,0xca);

1 0

Nikolay Sivov : evr: Add IMFVideoProcessor stub.
by Alexandre Julliard 29 Jun '20

29 Jun '20

Module: wine Branch: master Commit: 881336569c593057503f66f4f5857f1a43571c80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=881336569c593057503f66f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 29 15:43:37 2020 +0300 evr: Add IMFVideoProcessor stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 8 +-- include/evr9.idl | 2 +- 3 files changed, 137 insertions(+), 7 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 006427b77a..e8905f633a 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -49,6 +49,7 @@ struct video_mixer IMFGetService IMFGetService_iface; IMFVideoMixerBitmap IMFVideoMixerBitmap_iface; IMFVideoPositionMapper IMFVideoPositionMapper_iface; + IMFVideoProcessor IMFVideoProcessor_iface; LONG refcount; struct input_stream inputs[MAX_MIXER_INPUT_STREAMS]; @@ -95,6 +96,11 @@ static struct video_mixer *impl_from_IMFVideoPositionMapper(IMFVideoPositionMapp return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoPositionMapper_iface); } +static struct video_mixer *impl_from_IMFVideoProcessor(IMFVideoProcessor *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoProcessor_iface); +} + static int video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; @@ -152,6 +158,10 @@ static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, { *obj = &mixer->IMFVideoPositionMapper_iface; } + else if (IsEqualIID(riid, &IID_IMFVideoProcessor)) + { + *obj = &mixer->IMFVideoProcessor_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -914,6 +924,129 @@ static const IMFVideoPositionMapperVtbl video_mixer_position_mapper_vtbl = video_mixer_position_mapper_MapOutputCoordinateToInputStream, }; +static HRESULT WINAPI video_mixer_processor_QueryInterface(IMFVideoProcessor *iface, REFIID riid, void **obj) +{ + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, obj); +} + +static ULONG WINAPI video_mixer_processor_AddRef(IMFVideoProcessor *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_processor_Release(IMFVideoProcessor *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_processor_GetAvailableVideoProcessorModes(IMFVideoProcessor *iface, UINT *count, + GUID **modes) +{ + FIXME("%p, %p, %p.\n", iface, count, modes); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetVideoProcessorCaps(IMFVideoProcessor *iface, GUID *mode, + DXVA2_VideoProcessorCaps *caps) +{ + FIXME("%p, %s, %p.\n", iface, debugstr_guid(mode), caps); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetVideoProcessorMode(IMFVideoProcessor *iface, GUID *mode) +{ + FIXME("%p, %p.\n", iface, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_SetVideoProcessorMode(IMFVideoProcessor *iface, GUID *mode) +{ + FIXME("%p, %s.\n", iface, debugstr_guid(mode)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetProcAmpRange(IMFVideoProcessor *iface, DWORD prop, DXVA2_ValueRange *range) +{ + FIXME("%p, %#x, %p.\n", iface, prop, range); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetProcAmpValues(IMFVideoProcessor *iface, DWORD flags, DXVA2_ProcAmpValues *values) +{ + FIXME("%p, %#x, %p.\n", iface, flags, values); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_SetProcAmpValues(IMFVideoProcessor *iface, DWORD flags, DXVA2_ProcAmpValues *values) +{ + FIXME("%p, %#x, %p.\n", iface, flags, values); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetFilteringRange(IMFVideoProcessor *iface, DWORD prop, DXVA2_ValueRange *range) +{ + FIXME("%p, %#x, %p.\n", iface, prop, range); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetFilteringValue(IMFVideoProcessor *iface, DWORD prop, DXVA2_Fixed32 *value) +{ + FIXME("%p, %#x, %p.\n", iface, prop, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_SetFilteringValue(IMFVideoProcessor *iface, DWORD prop, DXVA2_Fixed32 *value) +{ + FIXME("%p, %#x, %p.\n", iface, prop, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetBackgroundColor(IMFVideoProcessor *iface, COLORREF *color) +{ + FIXME("%p, %p.\n", iface, color); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_SetBackgroundColor(IMFVideoProcessor *iface, COLORREF color) +{ + FIXME("%p, %#x.\n", iface, color); + + return E_NOTIMPL; +} + +static const IMFVideoProcessorVtbl video_mixer_processor_vtbl = +{ + video_mixer_processor_QueryInterface, + video_mixer_processor_AddRef, + video_mixer_processor_Release, + video_mixer_processor_GetAvailableVideoProcessorModes, + video_mixer_processor_GetVideoProcessorCaps, + video_mixer_processor_GetVideoProcessorMode, + video_mixer_processor_SetVideoProcessorMode, + video_mixer_processor_GetProcAmpRange, + video_mixer_processor_GetProcAmpValues, + video_mixer_processor_SetProcAmpValues, + video_mixer_processor_GetFilteringRange, + video_mixer_processor_GetFilteringValue, + video_mixer_processor_SetFilteringValue, + video_mixer_processor_GetBackgroundColor, + video_mixer_processor_SetBackgroundColor, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -943,6 +1076,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFGetService_iface.lpVtbl = &video_mixer_getservice_vtbl; object->IMFVideoMixerBitmap_iface.lpVtbl = &video_mixer_bitmap_vtbl; object->IMFVideoPositionMapper_iface.lpVtbl = &video_mixer_position_mapper_vtbl; + object->IMFVideoProcessor_iface.lpVtbl = &video_mixer_processor_vtbl; object->refcount = 1; object->input_count = 1; video_mixer_init_input(&object->inputs[0]); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 5bfa87014d..c37f921b09 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -405,10 +405,8 @@ static void test_default_mixer(void) IUnknown_Release(unk); hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoPositionMapper, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -425,10 +423,8 @@ todo_wine IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoMixerControl, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); diff --git a/include/evr9.idl b/include/evr9.idl index 1572d87838..b3d363cdee 100644 --- a/include/evr9.idl +++ b/include/evr9.idl @@ -62,7 +62,7 @@ interface IMFVideoMixerBitmap : IUnknown [ object, - uuid(6AB0000C-FECE-4d1f-A2AC-A9573530656E), + uuid(6ab0000c-fece-4d1f-a2ac-a9573530656e), pointer_default(unique) ] interface IMFVideoProcessor : IUnknown

1 0

Nikolay Sivov : evr: Add input type validation through dxva.
by Alexandre Julliard 29 Jun '20

29 Jun '20

Module: wine Branch: master Commit: 43eebcd3e6f27b385715bc95f4b86dad665bd97c URL: https://source.winehq.org/git/wine.git/?a=commit;h=43eebcd3e6f27b385715bc95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 29 15:43:38 2020 +0300 evr: Add input type validation through dxva. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 201 +++++++++++++++++++++++++++++++++++++++++++++++---- dlls/evr/tests/evr.c | 87 +++++++++++++++++++++- 2 files changed, 269 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43eebcd3e6f27b385715…

1 0

Nikolay Sivov : evr: Store background color property for the mixer.
by Alexandre Julliard 29 Jun '20

29 Jun '20

Module: wine Branch: master Commit: 7a2dc025a3342821de2810ab6e6cfedff1408f55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a2dc025a3342821de2810ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 29 15:43:39 2020 +0300 evr: Store background color property for the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 25 +++++++++++++++++++++---- dlls/evr/tests/evr.c | 10 +++++----- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 6fcad15ec6..23994375d4 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -67,6 +67,8 @@ struct video_mixer unsigned int input_count; struct output_stream output; + COLORREF bkgnd_color; + IDirect3DDeviceManager9 *device_manager; CRITICAL_SECTION cs; @@ -1187,16 +1189,31 @@ static HRESULT WINAPI video_mixer_processor_SetFilteringValue(IMFVideoProcessor static HRESULT WINAPI video_mixer_processor_GetBackgroundColor(IMFVideoProcessor *iface, COLORREF *color) { - FIXME("%p, %p.\n", iface, color); + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, color); + + if (!color) + return E_POINTER; + + EnterCriticalSection(&mixer->cs); + *color = mixer->bkgnd_color; + LeaveCriticalSection(&mixer->cs); + + return S_OK; } static HRESULT WINAPI video_mixer_processor_SetBackgroundColor(IMFVideoProcessor *iface, COLORREF color) { - FIXME("%p, %#x.\n", iface, color); + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); - return E_NOTIMPL; + TRACE("%p, %#x.\n", iface, color); + + EnterCriticalSection(&mixer->cs); + mixer->bkgnd_color = color; + LeaveCriticalSection(&mixer->cs); + + return S_OK; } static const IMFVideoProcessorVtbl video_mixer_processor_vtbl = diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 6259e63632..70fc6b18e2 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -413,21 +413,21 @@ static void test_default_mixer(void) hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, (void **)&processor); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoProcessor_GetBackgroundColor(processor, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + color = 1; hr = IMFVideoProcessor_GetBackgroundColor(processor, &color); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!color, "Unexpected color %#x.\n", color); -} + hr = IMFVideoProcessor_SetBackgroundColor(processor, 0x00121212); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetBackgroundColor(processor, &color); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(color == 0x121212, "Unexpected color %#x.\n", color); -} + hr = IMFVideoProcessor_GetFilteringRange(processor, DXVA2_DetailFilterChromaLevel, &range); todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr);

1 0

Hans Leidekker : winhttp: Reimplement the task queue using thread pool work objects.
by Alexandre Julliard 29 Jun '20

29 Jun '20

Module: wine Branch: master Commit: c7d140d34aa6f40a92f95fd8698501d3283c9296 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7d140d34aa6f40a92f95fd8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 29 15:46:10 2020 +0200 winhttp: Reimplement the task queue using thread pool work objects. Simplifies cleanup. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 336 +++++++++++++++++++---------------------- dlls/winhttp/session.c | 12 +- dlls/winhttp/winhttp_private.h | 31 ++-- 3 files changed, 169 insertions(+), 210 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c7d140d34aa6f40a92f9…

1 0

Hans Leidekker : winhttp: Copy the reason buffer.
by Alexandre Julliard 29 Jun '20

29 Jun '20

Module: wine Branch: master Commit: 7b7fdb8585b78fcb9ead0b65472196c0fffe23c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b7fdb8585b78fcb9ead0b65… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 29 15:46:11 2020 +0200 winhttp: Copy the reason buffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 8 ++++---- dlls/winhttp/tests/winhttp.c | 6 ++++++ dlls/winhttp/winhttp_private.h | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index bc3d365f7c..06588d6f60 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3463,7 +3463,7 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r TRACE("%p, %u, %p, %u\n", hsocket, status, reason, len); - if (len && !reason) return ERROR_INVALID_PARAMETER; + if ((len && !reason) || len > sizeof(socket->reason)) return ERROR_INVALID_PARAMETER; if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) @@ -3484,7 +3484,7 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; s->socket = socket; s->status = status; - s->reason = reason; + memcpy( s->reason, reason, len ); s->len = len; addref_object( &socket->hdr ); @@ -3569,7 +3569,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas TRACE("%p, %u, %p, %u\n", hsocket, status, reason, len); - if (len && !reason) return ERROR_INVALID_PARAMETER; + if ((len && !reason) || len > sizeof(socket->reason)) return ERROR_INVALID_PARAMETER; if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) @@ -3590,7 +3590,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; s->socket = socket; s->status = status; - s->reason = reason; + memcpy( s->reason, reason, len ); s->len = len; addref_object( &socket->hdr ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 12f5136973..84063fdc82 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3356,6 +3356,9 @@ static void test_websocket(int port) error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 1); ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, buf, sizeof(buf)); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, (void *)"success", sizeof("success")); ok(!error, "got %u\n", error); @@ -3363,6 +3366,9 @@ static void test_websocket(int port) error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 1); ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, buf, sizeof(buf)); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, (void *)"success2", sizeof("success2")); ok(!error, "got %u\n", error); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index ac7e9ff09b..9d0b9c308a 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -244,7 +244,7 @@ struct socket enum socket_opcode opcode; DWORD read_size; USHORT status; - char reason[128]; + char reason[123]; DWORD reason_len; }; @@ -305,7 +305,7 @@ struct socket_shutdown { struct socket *socket; USHORT status; - const void *reason; + char reason[123]; DWORD len; };

1 0