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

Zebediah Figura : quartz/vmr9: Allow AdviseSurfaceAllocator() to be called multiple times.
by Alexandre Julliard July 24, 2020

July 24, 2020

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

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

July 24, 2020

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

Matteo Bruni : include: Flesh out d3dx10math.h a bit more.
by Alexandre Julliard July 24, 2020

July 24, 2020

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

Alexandre Julliard : include: Add 64-bit versions of the TEB and PEB for WoW64 mode.
by Alexandre Julliard July 24, 2020

July 24, 2020

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

Serge Gautherie : winapi_test: Remove MIDL_STUB_MESSAGE field exclusions.
by Alexandre Julliard July 24, 2020

July 24, 2020

Module: wine Branch: master Commit: 151af8c04249bdd90e095c456e45ef416fcbfe97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=151af8c04249bdd90e095c45… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Thu Jul 23 11:42:05 2020 +0200 winapi_test: Remove MIDL_STUB_MESSAGE field exclusions. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/generated.c | 24 ++++++++++++++++++++++++ tools/winapi/tests.dat | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index 72672cd3a9..7dd5968318 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -593,6 +593,15 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Memory, 8) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Memory, 8) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Memory, 48) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, IsClient, 56) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Pad, 57) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags2, 58) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, ReuseBuffer, 60) @@ -614,6 +623,9 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags, 97) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, UniquePtrCount, 98) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, MaxCount, 8) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, MaxCount, 8) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, MaxCount, 104) @@ -1442,6 +1454,15 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Memory, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Memory, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Memory, 28) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, IsClient, 32) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Pad, 33) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags2, 34) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, ReuseBuffer, 36) @@ -1463,6 +1484,9 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags, 57) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, UniquePtrCount, 58) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, MaxCount, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, MaxCount, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, MaxCount, 60) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index e6a09923af..48813393fc 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -967,7 +967,7 @@ MALLOC_FREE_STRUCT MIDL_FORMAT_STRING MIDL_SERVER_INFO MIDL_STUB_DESC -MIDL_STUB_MESSAGE: !UniquePtrCount !IsClient !Pad !uFlags2 +MIDL_STUB_MESSAGE MIDL_STUBLESS_PROXY_INFO MIDL_SYNTAX_INFO NDR_CCONTEXT

1 0

Zhiyi Zhang : winex11.drv: Sort display modes.
by Alexandre Julliard July 24, 2020

July 24, 2020

Module: wine Branch: master Commit: a8b4cf7f2d3d1fbd79308a106a84e753cdac69e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8b4cf7f2d3d1fbd79308a10… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 24 17:22:43 2020 +0800 winex11.drv: Sort display modes. Although tests show that their order are not always guaranteed on Windows, most of the time it is sorted. It also makes sure that when a 0Hz or 1Hz display mode is specified for ChangeDisplaySettingsExW(), the chosen display mode is the one with the highest frequency. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 28c405ae0e..0249575617 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include <stdlib.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -333,6 +334,22 @@ BOOL get_primary_adapter(WCHAR *name) return FALSE; } +static int mode_compare(const void *p1, const void *p2) +{ + const DEVMODEW *a = p1, *b = p2; + + if (a->dmBitsPerPel != b->dmBitsPerPel) + return b->dmBitsPerPel - a->dmBitsPerPel; + + if (a->dmPelsWidth != b->dmPelsWidth) + return a->dmPelsWidth - b->dmPelsWidth; + + if (a->dmPelsHeight != b->dmPelsHeight) + return a->dmPelsHeight - b->dmPelsHeight; + + return b->dmDisplayFrequency - a->dmDisplayFrequency; +} + /*********************************************************************** * EnumDisplaySettingsEx (X11DRV.@) * @@ -379,6 +396,8 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo return FALSE; } + qsort(modes, mode_count, sizeof(*modes) + modes[0].dmDriverExtra, mode_compare); + if (cached_modes) handler.free_modes(cached_modes); lstrcpyW(cached_device_name, name); @@ -477,6 +496,7 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, const DEVMODEW *dev_mode) if (!handler.get_modes(id, 0, &modes, &mode_count)) return NULL; + qsort(modes, mode_count, sizeof(*modes) + modes[0].dmDriverExtra, mode_compare); for (mode_idx = 0; mode_idx < mode_count; ++mode_idx) { found_mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*modes) + modes[0].dmDriverExtra) * mode_idx);

1 0

Matteo Bruni : d3dcompiler: Don't link to dxguid or uuid.
by Alexandre Julliard July 24, 2020

July 24, 2020

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

Alexandre Julliard : ntdll: Store the thread startup info in the ntdll_thread_data structure.
by Alexandre Julliard July 24, 2020

July 24, 2020

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: Store the filesystem redirection flag in the 64-bit TEB.
by Alexandre Julliard July 24, 2020

July 24, 2020

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

Ziqing Hui : windowscodecs/tests: Add more compressed test DDS images.
by Alexandre Julliard July 24, 2020

July 24, 2020

Module: wine Branch: master Commit: 2d0480ecc39574cb65de1b92e49fddd9c018fd6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d0480ecc39574cb65de1b92… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 23 14:02:36 2020 +0800 windowscodecs/tests: Add more compressed test DDS images. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 128 +++++++++++++++++++++++++++++------ 1 file changed, 107 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d0480ecc39574cb65de…

1 0