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

Zebediah Figura : quartz: Don't pause the graph in IMediaSeeking::SetPositions if it hasn't finished running yet.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 41a9f828704c64548e7cfc3c34804e5019d7202e URL: https://source.winehq.org/git/wine.git/?a=commit;h=41a9f828704c64548e7cfc3c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 23 19:29:24 2020 -0500 quartz: Don't pause the graph in IMediaSeeking::SetPositions if it hasn't finished running yet. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49604 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 4 ++-- dlls/quartz/tests/filtergraph.c | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index b691fd79fc..2c32b3bc43 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2398,7 +2398,7 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * EnterCriticalSection(&graph->cs); state = graph->state; - if (state == State_Running) + if (state == State_Running && !graph->needs_async_run) IMediaControl_Pause(&graph->IMediaControl_iface); LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) @@ -2434,7 +2434,7 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * graph->stream_elapsed = 0; } - if (state == State_Running) + if (state == State_Running && !graph->needs_async_run) IMediaControl_Run(&graph->IMediaControl_iface); LeaveCriticalSection(&graph->cs); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 4fcd27b291..cf641a4306 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3205,9 +3205,10 @@ static void test_filter_state(void) struct testpin source_pin, sink_pin; IFilterGraph2 *graph = create_graph(); - REFERENCE_TIME start_time; + REFERENCE_TIME start_time, time; IReferenceClock *clock; IMediaControl *control; + IMediaSeeking *seeking; FILTER_STATE mf_state; IMediaFilter *filter; OAFilterState state; @@ -3219,6 +3220,7 @@ static void test_filter_state(void) testfilter_init(&source, &source_pin, 1); testfilter_init(&sink, &sink_pin, 1); testfilter_init(&dummy, NULL, 0); + sink.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; IFilterGraph2_QueryInterface(graph, &IID_IMediaFilter, (void **)&filter); IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); @@ -3350,6 +3352,7 @@ static void test_filter_state(void) graph = create_graph(); IFilterGraph2_QueryInterface(graph, &IID_IMediaFilter, (void **)&filter); IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + IFilterGraph2_QueryInterface(graph, &IID_IMediaSeeking, (void **)&seeking); /* Add the filters in reverse order this time. */ IFilterGraph2_AddFilter(graph, &sink.IBaseFilter_iface, NULL); @@ -3511,6 +3514,13 @@ todo_wine ok(sink.state == State_Paused, "Got state %u.\n", sink.state); ok(source.state == State_Paused, "Got state %u.\n", source.state); + /* SetPositions() does not pause the graph in this case, since it is + * already in a paused state. */ + time = 0; + hr = IMediaSeeking_SetPositions(seeking, &time, AM_SEEKING_AbsolutePositioning, + NULL, AM_SEEKING_NoPositioning); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Run(control); todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -3684,6 +3694,7 @@ todo_wine source.expect_stop_prev = sink.expect_stop_prev = State_Running; IMediaFilter_Release(filter); IMediaControl_Release(control); + IMediaSeeking_Release(seeking); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); ok(source.ref == 1, "Got outstanding refcount %d.\n", source.ref);

1 0

Zebediah Figura : quartz/vmr9: Allow AdviseSurfaceAllocator() to be called multiple times.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 1ce2cae3e931a027aa0aee01ddd11bcbff6433c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ce2cae3e931a027aa0aee01… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 23 19:30:16 2020 -0500 quartz/vmr9: Allow AdviseSurfaceAllocator() to be called multiple times. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47161 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 132 ++++++++++++++++++++++++++++++++--------------- dlls/quartz/vmr9.c | 21 +++++++- 2 files changed, 109 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1ce2cae3e931a027aa0a…

1 0

Alexandre Julliard : include: Add 64-bit versions of the TEB and PEB for WoW64 mode.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 0e3f8c54c1178edde7baa1889b474bfcdd81ea64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e3f8c54c1178edde7baa188… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 24 10:30:59 2020 +0200 include: Add 64-bit versions of the TEB and PEB for WoW64 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 224 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0e3f8c54c1178edde7ba…

1 0

Alexandre Julliard : ntdll: Store the thread startup info in the ntdll_thread_data structure.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: e3b059b5bad4b7ff23459a6384c866e3da1bdee1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3b059b5bad4b7ff23459a63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 24 11:15:42 2020 +0200 ntdll: Store the thread startup info in the ntdll_thread_data structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 19 ++++--------------- dlls/ntdll/unix/unix_private.h | 2 ++ 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 8ade2d9c78..b2b97e1c57 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -83,13 +83,6 @@ static void pthread_exit_wrapper( int status ) } -/* info passed to a starting thread */ -struct startup_info -{ - PRTL_THREAD_START_ROUTINE entry; - void *arg; -}; - /*********************************************************************** * start_thread * @@ -97,7 +90,6 @@ struct startup_info */ static void start_thread( TEB *teb ) { - struct startup_info *info = (struct startup_info *)(teb + 1); struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; struct debug_info debug_info; BOOL suspend; @@ -106,8 +98,8 @@ static void start_thread( TEB *teb ) thread_data->debug_info = &debug_info; thread_data->pthread_id = pthread_self(); signal_init_thread( teb ); - server_init_thread( info->entry, &suspend ); - signal_start_thread( info->entry, info->arg, suspend, pRtlUserThreadStart, teb ); + server_init_thread( thread_data->start, &suspend ); + signal_start_thread( thread_data->start, thread_data->param, suspend, pRtlUserThreadStart, teb ); } @@ -152,7 +144,6 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT data_size_t len; struct object_attributes *objattr; struct ntdll_thread_data *thread_data; - struct startup_info *info; DWORD tid = 0; int request_pipe[2]; SIZE_T extra_stack = PTHREAD_STACK_MIN; @@ -236,10 +227,6 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT client_id.UniqueThread = ULongToHandle( tid ); teb->ClientId = client_id; - info = (struct startup_info *)(teb + 1); - info->entry = start; - info->arg = param; - teb->Tib.StackBase = stack.StackBase; teb->Tib.StackLimit = stack.StackLimit; teb->DeallocationStack = stack.DeallocationStack; @@ -247,6 +234,8 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; thread_data->request_fd = request_pipe[1]; thread_data->start_stack = (char *)teb->Tib.StackBase; + thread_data->start = start; + thread_data->param = param; pthread_attr_init( &pthread_attr ); pthread_attr_setstack( &pthread_attr, teb->DeallocationStack, diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 0ecc2456ba..af2ad40144 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -60,6 +60,8 @@ struct ntdll_thread_data BOOL wow64_redir; /* Wow64 filesystem redirection flag */ pthread_t pthread_id; /* pthread thread id */ struct list entry; /* entry in TEB list */ + PRTL_THREAD_START_ROUTINE start; /* thread entry point */ + void *param; /* thread entry point parameter */ }; C_ASSERT( sizeof(struct ntdll_thread_data) <= sizeof(((TEB *)0)->GdiTebBatch) );

1 0

Alexandre Julliard : ntdll: Allocate 64-bit TEB and PEB in WoW64 mode.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: a865a4f61d413d85d6ae4e57d3c14c0657d3a598 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a865a4f61d413d85d6ae4e57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 24 11:24:31 2020 +0200 ntdll: Allocate 64-bit TEB and PEB in WoW64 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 19 +++++++++-- dlls/ntdll/ntdll_misc.h | 4 +++ dlls/ntdll/tests/info.c | 42 +++++++++++++++++++++++ dlls/ntdll/unix/server.c | 14 +++++++- dlls/ntdll/unix/signal_i386.c | 6 ++-- dlls/ntdll/unix/unix_private.h | 17 +++++++--- dlls/ntdll/unix/virtual.c | 75 +++++++++++++++++++++++------------------- 7 files changed, 131 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a865a4f61d413d85d6ae…

1 0

Alexandre Julliard : ntdll: Store the filesystem redirection flag in the 64-bit TEB.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: d18b5669952bf1639be78fd699310231d4de0259 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d18b5669952bf1639be78fd6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 24 13:29:31 2020 +0200 ntdll: Store the filesystem redirection flag in the 64-bit TEB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 18 +++++++++++++----- dlls/ntdll/ntdll_misc.h | 19 ------------------- dlls/ntdll/signal_i386.c | 5 ++--- dlls/ntdll/tests/directory.c | 20 ++++++++++++++++++++ dlls/ntdll/unix/file.c | 9 +++++---- dlls/ntdll/unix/process.c | 4 +++- dlls/ntdll/unix/server.c | 2 -- dlls/ntdll/unix/unix_private.h | 5 ++++- include/winternl.h | 3 +++ 9 files changed, 50 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d18b5669952bf1639be7…

1 0

Matteo Bruni : ntdll: Don't read current CPU frequency on Linux.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: b37371bf20be58ee7bd0b63dbac15b474873bc86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b37371bf20be58ee7bd0b63d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 24 11:14:05 2020 +0200 ntdll: Don't read current CPU frequency on Linux. On the Linux boxes I tested, reading scaling_cur_freq usually takes about 12 ms per core. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47128 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 681d56a869..3756bd7cee 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2907,11 +2907,12 @@ NTSTATUS WINAPI NtPowerInformation( POWER_INFORMATION_LEVEL level, void *input, FILE* f; for(i = 0; i < out_cpus; i++) { - sprintf(filename, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_cur_freq", i); + sprintf(filename, "/sys/devices/system/cpu/cpu%d/cpufreq/cpuinfo_max_freq", i); f = fopen(filename, "r"); - if (f && (fscanf(f, "%d", &cpu_power[i].CurrentMhz) == 1)) { - cpu_power[i].CurrentMhz /= 1000; + if (f && (fscanf(f, "%d", &cpu_power[i].MaxMhz) == 1)) { + cpu_power[i].MaxMhz /= 1000; fclose(f); + cpu_power[i].CurrentMhz = cpu_power[i].MaxMhz; } else { if(i == 0) { @@ -2921,16 +2922,6 @@ NTSTATUS WINAPI NtPowerInformation( POWER_INFORMATION_LEVEL level, void *input, } else cpu_power[i].CurrentMhz = cpu_power[0].CurrentMhz; - if(f) fclose(f); - } - - sprintf(filename, "/sys/devices/system/cpu/cpu%d/cpufreq/cpuinfo_max_freq", i); - f = fopen(filename, "r"); - if (f && (fscanf(f, "%d", &cpu_power[i].MaxMhz) == 1)) { - cpu_power[i].MaxMhz /= 1000; - fclose(f); - } - else { cpu_power[i].MaxMhz = cpu_power[i].CurrentMhz; if(f) fclose(f); }

1 0

Matteo Bruni : include: Add ID3D10Device1 forward declaration.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 7af62f176d077045993c48a82ad2ce511da762dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=7af62f176d077045993c48a8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 24 11:14:06 2020 +0200 include: Add ID3D10Device1 forward declaration. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dx10core.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index c99ab82eb7..88f13d0765 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -71,4 +71,5 @@ cpp_quote(" HMODULE swrast, unsigned int flags, ID3D10Device **device);") cpp_quote("HRESULT WINAPI D3DX10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,") cpp_quote(" HMODULE swrast, unsigned int flags, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain,") cpp_quote(" ID3D10Device **device);") +interface ID3D10Device1; cpp_quote("HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1);")

1 0

Matteo Bruni : include: Flesh out d3dx10math.h a bit more.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: e48fccf76c4f821958494c1601f1c090f2fdba4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e48fccf76c4f821958494c16… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 24 11:14:07 2020 +0200 include: Flesh out d3dx10math.h a bit more. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dx10math.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/include/d3dx10math.h b/include/d3dx10math.h index a96784b108..c8bcfd2ce4 100644 --- a/include/d3dx10math.h +++ b/include/d3dx10math.h @@ -32,10 +32,65 @@ typedef enum _D3DX_CPU_OPTIMIZATION D3DX_SSE_OPTIMIZED } D3DX_CPU_OPTIMIZATION; +typedef struct D3DXFLOAT16 +{ +#ifdef __cplusplus + D3DXFLOAT16(); + D3DXFLOAT16(float f); + D3DXFLOAT16(const D3DXFLOAT16 &f); + + operator float(); + + BOOL operator==(const D3DXFLOAT16 &f) const; + BOOL operator!=(const D3DXFLOAT16 &f) const; +#endif + WORD value; +} D3DXFLOAT16, *LPD3DXFLOAT16; + +typedef struct D3DXCOLOR +{ +#ifdef __cplusplus +public: + D3DXCOLOR(){}; + D3DXCOLOR(UINT color); + D3DXCOLOR(const float *color); + D3DXCOLOR(const D3DXFLOAT16 *color); + D3DXCOLOR(float r, float g, float b, float a); + + operator UINT() const; + operator float *(); + operator const float *() const; + + D3DXCOLOR & operator+=(const D3DXCOLOR &color); + D3DXCOLOR & operator-=(const D3DXCOLOR &color); + D3DXCOLOR & operator*=(float n); + D3DXCOLOR & operator/=(float n); + + D3DXCOLOR operator+() const; + D3DXCOLOR operator-() const; + + D3DXCOLOR operator+(const D3DXCOLOR &color) const; + D3DXCOLOR operator-(const D3DXCOLOR &color) const; + D3DXCOLOR operator*(float n) const; + D3DXCOLOR operator/(float n) const; + + friend D3DXCOLOR operator*(float n, const D3DXCOLOR &color); + + BOOL operator==(const D3DXCOLOR &color) const; + BOOL operator!=(const D3DXCOLOR &color) const; +#endif + float r, g, b, a; +} D3DXCOLOR, *LPD3DXCOLOR; + #ifdef __cplusplus extern "C" { #endif +D3DXCOLOR *D3DXColorAdd(D3DXCOLOR *out, D3DXCOLOR c1, D3DXCOLOR c2); +D3DXCOLOR *D3DXColorLerp(D3DXCOLOR *out, D3DXCOLOR c1, D3DXCOLOR c2, float s); +D3DXCOLOR *D3DXColorModulate(D3DXCOLOR *out, D3DXCOLOR c1, D3DXCOLOR c2); +D3DXCOLOR *D3DXColorScale(D3DXCOLOR *out, D3DXCOLOR c, float s); +D3DXCOLOR *D3DXColorSubtract(D3DXCOLOR *out, D3DXCOLOR c1, D3DXCOLOR c2); D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable); #ifdef __cplusplus

1 0

Matteo Bruni : d3dcompiler: Don't link to dxguid or uuid.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 8928a417507b084a056360d644b5d06607a645cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8928a417507b084a056360d6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 24 11:14:09 2020 +0200 d3dcompiler: Don't link to dxguid or uuid. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/Makefile.in | 1 - dlls/d3dcompiler_43/reflection.c | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index d273e278c3..8464113cd1 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -1,5 +1,4 @@ MODULE = d3dcompiler_43.dll -IMPORTS = dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=43 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index b29db47c71..7a8af39b07 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -20,7 +20,6 @@ #include "initguid.h" #include "d3dcompiler_private.h" -#include "winternl.h" #include "d3d10.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler);

1 0