wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Alexandre Julliard : include: Move XSTATE definitions to winnt.h.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: c6f2ef3d1cea1e02ade335a7f16dc3158f3a7e49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6f2ef3d1cea1e02ade335a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 24 11:37:38 2020 +0100 include: Move XSTATE definitions to winnt.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 47 ----------------------------------------------- include/winnt.h | 28 ++++++++++++++++++++++++++++ include/winternl.h | 14 ++++++++++++++ 3 files changed, 42 insertions(+), 47 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 6885de1cf89..c0b97e243aa 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1194,39 +1194,6 @@ typedef enum _ALTERNATIVE_ARCHITECTURE_TYPE #define NX_SUPPORT_POLICY_OPTIN 2 #define NX_SUPPORT_POLICY_OPTOUT 3 -#define XSTATE_LEGACY_FLOATING_POINT 0 -#define XSTATE_LEGACY_SSE 1 -#define XSTATE_GSSE 2 - -#define XSTATE_MASK_LEGACY_FLOATING_POINT (1 << XSTATE_LEGACY_FLOATING_POINT) -#define XSTATE_MASK_LEGACY_SSE (1 << XSTATE_LEGACY_SSE) -#define XSTATE_MASK_LEGACY (XSTATE_MASK_LEGACY_FLOATING_POINT | XSTATE_MASK_LEGACY_SSE) -#define XSTATE_MASK_GSSE (1 << XSTATE_GSSE) - -#define MAXIMUM_XSTATE_FEATURES 64 - -typedef struct _XSTATE_FEATURE -{ - ULONG Offset; - ULONG Size; -} XSTATE_FEATURE, *PXSTATE_FEATURE; - -typedef struct _XSTATE_CONFIGURATION -{ - ULONG64 EnabledFeatures; - ULONG64 EnabledVolatileFeatures; - ULONG Size; - ULONG OptimizedSave:1; - ULONG CompactionEnabled:1; - XSTATE_FEATURE Features[MAXIMUM_XSTATE_FEATURES]; - - ULONG64 EnabledSupervisorFeatures; - ULONG64 AlignedFeatures; - ULONG AllFeatureSize; - ULONG AllFeatures[MAXIMUM_XSTATE_FEATURES]; - ULONG64 EnabledUserVisibleSupervisorFeatures; -} XSTATE_CONFIGURATION, *PXSTATE_CONFIGURATION; - typedef struct _KUSER_SHARED_DATA { ULONG TickCountLowDeprecated; /* 0x000 */ ULONG TickCountMultiplier; /* 0x004 */ @@ -1836,20 +1803,6 @@ HANDLE WINAPI PsGetProcessInheritedFromUniqueProcessId(PEPROCESS); BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*); NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS); -#if defined(__x86_64__) || defined(__i386__) -NTSTATUS WINAPI RtlCopyExtendedContext(CONTEXT_EX*,ULONG,CONTEXT_EX*); -NTSTATUS WINAPI RtlInitializeExtendedContext(void*,ULONG,CONTEXT_EX**); -NTSTATUS WINAPI RtlInitializeExtendedContext2(void*,ULONG,CONTEXT_EX**,ULONG64); -ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64); -NTSTATUS WINAPI RtlGetExtendedContextLength(ULONG,ULONG*); -NTSTATUS WINAPI RtlGetExtendedContextLength2(ULONG,ULONG*,ULONG64); -void * WINAPI RtlLocateLegacyContext(CONTEXT_EX*,ULONG*); -void * WINAPI RtlLocateExtendedFeature(CONTEXT_EX*,ULONG,ULONG*); -void * WINAPI RtlLocateExtendedFeature2(CONTEXT_EX*,ULONG,XSTATE_CONFIGURATION*,ULONG*); -ULONG64 WINAPI RtlGetExtendedFeaturesMask(CONTEXT_EX*); -void WINAPI RtlSetExtendedFeaturesMask(CONTEXT_EX*,ULONG64); -#endif - #ifdef __x86_64__ void WINAPI RtlCopyMemoryNonTemporal(void*,const void*,SIZE_T); #else diff --git a/include/winnt.h b/include/winnt.h index 1945ee82eab..04353d9405d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1338,6 +1338,34 @@ NTSYSAPI PVOID WINAPI RtlVirtualUnwind(ULONG,ULONG64,ULONG64,RUNTIME_FUNCTION*,C #define XSTATE_IPT 8 #define XSTATE_CET_U 11 #define XSTATE_LWP 62 +#define MAXIMUM_XSTATE_FEATURES 64 + +#define XSTATE_MASK_LEGACY_FLOATING_POINT (1 << XSTATE_LEGACY_FLOATING_POINT) +#define XSTATE_MASK_LEGACY_SSE (1 << XSTATE_LEGACY_SSE) +#define XSTATE_MASK_LEGACY (XSTATE_MASK_LEGACY_FLOATING_POINT | XSTATE_MASK_LEGACY_SSE) +#define XSTATE_MASK_GSSE (1 << XSTATE_GSSE) + +typedef struct _XSTATE_FEATURE +{ + ULONG Offset; + ULONG Size; +} XSTATE_FEATURE, *PXSTATE_FEATURE; + +typedef struct _XSTATE_CONFIGURATION +{ + ULONG64 EnabledFeatures; + ULONG64 EnabledVolatileFeatures; + ULONG Size; + ULONG OptimizedSave:1; + ULONG CompactionEnabled:1; + XSTATE_FEATURE Features[MAXIMUM_XSTATE_FEATURES]; + + ULONG64 EnabledSupervisorFeatures; + ULONG64 AlignedFeatures; + ULONG AllFeatureSize; + ULONG AllFeatures[MAXIMUM_XSTATE_FEATURES]; + ULONG64 EnabledUserVisibleSupervisorFeatures; +} XSTATE_CONFIGURATION, *PXSTATE_CONFIGURATION; typedef struct _YMMCONTEXT { diff --git a/include/winternl.h b/include/winternl.h index 11b64d078f0..a5c4837837f 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3660,6 +3660,20 @@ NTSYSAPI NTSTATUS WINAPI RtlpUnWaitCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI NTSTATUS WINAPI vDbgPrintEx(ULONG,ULONG,LPCSTR,__ms_va_list); NTSYSAPI NTSTATUS WINAPI vDbgPrintExWithPrefix(LPCSTR,ULONG,ULONG,LPCSTR,__ms_va_list); +#if defined(__x86_64__) || defined(__i386__) +NTSYSAPI NTSTATUS WINAPI RtlCopyExtendedContext(CONTEXT_EX*,ULONG,CONTEXT_EX*); +NTSYSAPI NTSTATUS WINAPI RtlInitializeExtendedContext(void*,ULONG,CONTEXT_EX**); +NTSYSAPI NTSTATUS WINAPI RtlInitializeExtendedContext2(void*,ULONG,CONTEXT_EX**,ULONG64); +NTSYSAPI ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64); +NTSYSAPI NTSTATUS WINAPI RtlGetExtendedContextLength(ULONG,ULONG*); +NTSYSAPI NTSTATUS WINAPI RtlGetExtendedContextLength2(ULONG,ULONG*,ULONG64); +NTSYSAPI void * WINAPI RtlLocateLegacyContext(CONTEXT_EX*,ULONG*); +NTSYSAPI void * WINAPI RtlLocateExtendedFeature(CONTEXT_EX*,ULONG,ULONG*); +NTSYSAPI void * WINAPI RtlLocateExtendedFeature2(CONTEXT_EX*,ULONG,XSTATE_CONFIGURATION*,ULONG*); +NTSYSAPI ULONG64 WINAPI RtlGetExtendedFeaturesMask(CONTEXT_EX*); +NTSYSAPI void WINAPI RtlSetExtendedFeaturesMask(CONTEXT_EX*,ULONG64); +#endif + NTSYSAPI int __cdecl _strnicmp(LPCSTR,LPCSTR,size_t); /* 32-bit only functions */

1 0

Alexandre Julliard : include: Add asm helper macros to define import variables.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: d2452b572c045582bc7168c3f54081921d30376e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2452b572c045582bc7168c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 24 11:42:29 2020 +0100 include: Add asm helper macros to define import variables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/iob.c | 8 ++------ include/wine/asm.h | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/iob.c b/dlls/msvcrt/iob.c index a499f19309e..4d8456867a8 100644 --- a/dlls/msvcrt/iob.c +++ b/dlls/msvcrt/iob.c @@ -24,6 +24,7 @@ #endif #include <stdio.h> +#include <wine/asm.h> #undef __iob_func extern FILE * __cdecl __iob_func(void); @@ -35,9 +36,4 @@ FILE * __cdecl __acrt_iob_func(unsigned idx) { return __iob_func() + idx; } - -#ifdef __i386__ -void *_imp____acrt_iob_func = __acrt_iob_func; -#else -void *__imp___acrt_iob_func = __acrt_iob_func; -#endif +__ASM_GLOBAL_IMPORT(__acrt_iob_func) diff --git a/include/wine/asm.h b/include/wine/asm.h index 2d1607ca772..b4b6fb50eb8 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -83,6 +83,28 @@ #define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(__ASM_STDCALL(#name,args),code) #define __ASM_FASTCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(__ASM_FASTCALL(#name,args),code) +/* import variables */ + +#ifdef _WIN64 +#define __ASM_DEFINE_IMPORT(name) \ + __ASM_BLOCK_BEGIN(__LINE__) \ + asm(".data\n\t.balign 8\n\t.globl __imp_" name "\n__imp_" name ":\n\t.quad " name "\n\t.text"); \ + __ASM_BLOCK_END +#else +#define __ASM_DEFINE_IMPORT(name) \ + __ASM_BLOCK_BEGIN(__LINE__) \ + asm(".data\n\t.balign 4\n\t.globl __imp_" name "\n__imp_" name ":\n\t.long " name "\n\t.text"); \ + __ASM_BLOCK_END +#endif + +#ifdef _WIN32 +#define __ASM_GLOBAL_IMPORT(name) __ASM_DEFINE_IMPORT(__ASM_NAME(#name)) +#define __ASM_STDCALL_IMPORT(name,args) __ASM_DEFINE_IMPORT(__ASM_STDCALL(#name,args)) +#else +#define __ASM_GLOBAL_IMPORT(name) /* nothing */ +#define __ASM_STDCALL_IMPORT(name,args) /* nothing */ +#endif + /* fastcall support */ #if defined(__i386__) && !defined(_WIN32)

1 0

Bernhard Übelacker : gdi32: Avoid crash by initializing variable font_set.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 79d8ed4849c1fdc2d8a9e67e41d389ef0c227bac URL: https://source.winehq.org/git/wine.git/?a=commit;h=79d8ed4849c1fdc2d8a9e67e… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Tue Nov 24 13:54:21 2020 +0100 gdi32: Avoid crash by initializing variable font_set. If the call pFcStrListNext returns NULL the loop is never entered and the variable font_set never gets written, leading to a crash cleaning up font_set by pFcFontSetDestroy. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 993110e6fe0..e7684728c9c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1468,7 +1468,7 @@ static void init_fontconfig(void) static void fontconfig_add_fonts_from_dir_list( FcConfig *config, FcStrList *dir_list, FcStrSet *done_set, DWORD flags ) { const FcChar8 *dir; - FcFontSet *font_set; + FcFontSet *font_set = NULL; FcStrList *subdir_list = NULL; FcStrSet *subdir_set = NULL; FcCache *cache = NULL;

1 0

Zebediah Figura : qcap: Call the right method to clean up the video capture stream.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 9a317e5cb5ff6aa53c1e6765b6c2d98884046d70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a317e5cb5ff6aa53c1e6765… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 24 00:18:04 2020 -0600 qcap: Call the right method to clean up the video capture stream. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/vfwcapture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index a313e785f67..a79cce50380 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -85,7 +85,7 @@ static void vfw_capture_destroy(struct strmbase_filter *iface) if (filter->init) { if (filter->filter.state != State_Stopped) - filter->device->ops->stop_stream(filter->device); + filter->device->ops->cleanup_stream(filter->device); filter->device->ops->destroy(filter->device); }

1 0

Zebediah Figura : qcap: Get rid of the VfwCapture typedef.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 417654b1ce66450c8213d57edf7dd030226bfe26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=417654b1ce66450c8213d57e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 24 00:18:03 2020 -0600 qcap: Get rid of the VfwCapture typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/vfwcapture.c | 157 +++++++++++++++++++++++-------------------------- 1 file changed, 75 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=417654b1ce66450c8213…

1 0

Zebediah Figura : qcap: Remove "stub" from an implemented function.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: fdae81b2082ed74bfac750ce7c5cf55f28291fdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdae81b2082ed74bfac750ce… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 24 00:18:02 2020 -0600 qcap: Remove "stub" from an implemented function. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/filewriter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index be1e4e773ad..c3ba6c4d3eb 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -239,7 +239,7 @@ static HRESULT WINAPI filesinkfilter_SetFileName(IFileSinkFilter *iface, struct file_writer *filter = impl_from_IFileSinkFilter(iface); WCHAR *new_filename; - TRACE("filter %p, filename %s, mt %p, stub!\n", filter, debugstr_w(filename), mt); + TRACE("filter %p, filename %s, mt %p.\n", filter, debugstr_w(filename), mt); strmbase_dump_media_type(mt); if (mt)

1 0

Zebediah Figura : quartz: Avoid autoplugging renderers in IGraphBuilder::Connect().
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 68d355883016d88fbb6c1aad9ee131e0c0457c47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68d355883016d88fbb6c1aad… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 24 00:18:01 2020 -0600 quartz: Avoid autoplugging renderers in IGraphBuilder::Connect(). I don't know of an application that this helps, but it seems like an optimization worth performing. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index cf2421f64e2..58038829217 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1397,7 +1397,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *source, I EnterCriticalSection(&graph->cs); - hr = autoplug(graph, source, sink, FALSE, 0); + hr = autoplug(graph, source, sink, TRUE, 0); LeaveCriticalSection(&graph->cs);

1 0

Zebediah Figura : quartz/tests: Avoid some test failures related to timing.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: bc588e9c5274754e80bb24f14449c6af9c67dc87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc588e9c5274754e80bb24f1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 23 22:59:20 2020 -0600 quartz/tests: Avoid some test failures related to timing. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 11 ++++++++--- dlls/quartz/tests/vmr9.c | 17 +++++++++-------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index d7daa6deed5..fd39945b2e3 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1181,7 +1181,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control thread = send_frame(input); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); - hr = IMediaControl_GetState(control, 0, &state); + hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_BeginFlush(pin); @@ -1201,10 +1201,15 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control hr = IMediaControl_GetState(control, 0, &state); todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %#x.\n", state); thread = send_frame(input); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %#x.\n", state); + hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = join_thread(thread); @@ -2108,8 +2113,8 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our params.message = WM_SYSCOLORCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block.\n"); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(ret == ((QS_SENDMESSAGE << 16) | QS_SENDMESSAGE), "Got unexpected status %#x.\n", ret); + ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 1000, QS_SENDMESSAGE); + ok(!ret, "Did not find a sent message.\n"); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok(!WaitForSingleObject(thread, 1000), "Wait timed out.\n"); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index f88c43b07b5..8b46e4706a5 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1220,10 +1220,15 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control hr = IMediaControl_GetState(control, 0, &state); todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %#x.\n", state); thread = send_frame(input); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %#x.\n", state); + hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = join_thread(thread); @@ -1432,18 +1437,14 @@ static void test_sample_time(IPin *pin, IMemInputPin *input, IMediaControl *cont hr = join_thread(send_frame_time(input, -2, 0x00ff0000)); /* red */ ok(hr == S_OK, "Got hr %#x.\n", hr); - thread = send_frame_time(input, 2, 0x00ff00ff); /* magenta */ - ok(WaitForSingleObject(thread, 500) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); - hr = join_thread(thread); - ok(hr == S_OK, "Got hr %#x.\n", hr); - thread = send_frame_time(input, 1000000, 0x00ffffff); /* white */ ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IPin_BeginFlush(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = join_thread(thread); - ok(hr == S_OK, "Got hr %#x.\n", hr); + /* If the frame makes it to Receive() in time to be rendered, we get S_OK. */ + ok(hr == S_OK || hr == S_FALSE, "Got hr %#x.\n", hr); hr = IPin_EndFlush(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -2351,8 +2352,8 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our params.message = WM_SYSCOLORCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block.\n"); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(ret == ((QS_SENDMESSAGE << 16) | QS_SENDMESSAGE), "Got unexpected status %#x.\n", ret); + ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 1000, QS_SENDMESSAGE); + ok(!ret, "Did not find a sent message.\n"); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok(!WaitForSingleObject(thread, 1000), "Wait timed out.\n");

1 0

Kevin Puetz : ntdll: Don't access empty IMAGE_FILE_IMPORT_DIRECTORY.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 029ec25e54166535978a47bffe6efd846e8609fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=029ec25e54166535978a47bf… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Nov 23 19:55:25 2020 -0600 ntdll: Don't access empty IMAGE_FILE_IMPORT_DIRECTORY. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c2b6ea603e3..61c8f5e18f5 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -810,11 +810,15 @@ static NTSTATUS fixup_ntdll_imports( const char *name, HMODULE module ) { const IMAGE_NT_HEADERS *nt; const IMAGE_IMPORT_DESCRIPTOR *descr; + const IMAGE_DATA_DIRECTORY *dir; const IMAGE_THUNK_DATA *import_list; IMAGE_THUNK_DATA *thunk_list; nt = get_rva( module, ((IMAGE_DOS_HEADER *)module)->e_lfanew ); - descr = get_rva( module, nt->OptionalHeader.DataDirectory[IMAGE_FILE_IMPORT_DIRECTORY].VirtualAddress ); + dir = &nt->OptionalHeader.DataDirectory[IMAGE_FILE_IMPORT_DIRECTORY]; + if (!dir->VirtualAddress || !dir->Size) return STATUS_SUCCESS; + + descr = get_rva( module, dir->VirtualAddress ); for (; descr->Name && descr->FirstThunk; descr++) { thunk_list = get_rva( module, descr->FirstThunk );

1 0

Brendan Shanks : winebus.sys: Open IOHID devices individually to fix macOS Catalina and Big Sur.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 9c0c0e2b57e0a5e27a1e0a8d1d2ca4660a0e4a86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c0c0e2b57e0a5e27a1e0a8d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Nov 23 16:48:44 2020 -0800 winebus.sys: Open IOHID devices individually to fix macOS Catalina and Big Sur. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50153 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index df578b4b9d6..ee6225bf398 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -297,6 +297,13 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * if (str) CFStringToWSTR(str, serial_string, ARRAY_SIZE(serial_string)); uid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDLocationIDKey))); + if (IOHIDDeviceOpen(IOHIDDevice, 0) != kIOReturnSuccess) + { + ERR("Failed to open HID device %p (vid %04x, pid %04x)\n", IOHIDDevice, vid, pid); + return; + } + IOHIDDeviceScheduleWithRunLoop(IOHIDDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); + if (IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad) || IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick)) { @@ -365,6 +372,8 @@ static void handle_RemovalCallback(void *context, IOReturn result, void *sender, IOHIDDeviceRegisterInputReportCallback(IOHIDDevice, NULL, 0, NULL, NULL); /* Note: Yes, we leak the buffer. But according to research there is no safe way to deallocate that buffer. */ + IOHIDDeviceUnscheduleFromRunLoop(IOHIDDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); + IOHIDDeviceClose(IOHIDDevice, 0); device = bus_find_hid_device(&iohid_vtbl, IOHIDDevice); if (device) { @@ -383,13 +392,6 @@ static DWORD CALLBACK runloop_thread(void *args) IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, handle_DeviceMatchingCallback, NULL); IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, handle_RemovalCallback, NULL); IOHIDManagerScheduleWithRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); - if (IOHIDManagerOpen( hid_manager, 0 ) != kIOReturnSuccess) - { - ERR("Couldn't open IOHIDManager.\n"); - IOHIDManagerUnscheduleFromRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); - CFRelease(hid_manager); - return 0; - } CFRunLoopRun(); TRACE("Run Loop exiting\n");

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2020