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

Serge Gautherie : mlang: Fix scripts values in fnIMLangFontLink2_GetScriptFontInfo().
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 2dc0758b5d0fe4ef49b7d0635299e5cb9e0360df URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dc0758b5d0fe4ef49b7d063… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Wed Jul 15 17:07:10 2020 +0200 mlang: Fix scripts values in fnIMLangFontLink2_GetScriptFontInfo(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 1b1aed370e..e3582cca2d 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3565,7 +3565,7 @@ static HRESULT WINAPI fnIMLangFontLink2_GetScriptFontInfo(IMLangFontLink2* This, { if (j >= *puiFonts) break; - pScriptFont[j].scripts = 1 << mlang_data[i].sid; + pScriptFont[j].scripts = (SCRIPT_IDS)1 << mlang_data[i].sid; if (dwFlags == SCRIPTCONTF_FIXED_FONT) { MultiByteToWideChar(CP_ACP, 0, mlang_data[i].fixed_font, -1,

1 0

Alexandre Julliard : ntdll: Use syscall thunks for event functions.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: f4c403d1f2100934c24241b0ed8f4e19cb0ff4dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4c403d1f2100934c24241b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:25:43 2020 +0200 ntdll: Use syscall thunks for event functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 28 +++++++++---------- dlls/ntdll/sync.c | 72 ------------------------------------------------ dlls/ntdll/unix/loader.c | 7 ----- dlls/ntdll/unixlib.h | 12 +------- 4 files changed, 15 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f4c403d1f2100934c242…

1 0

Alexandre Julliard : ntdll: Use syscall thunks for semaphore functions.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: bc2164e07487edccc32bff06691d14ab017a3f47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc2164e07487edccc32bff06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:14:26 2020 +0200 ntdll: Use syscall thunks for semaphore functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 16 ++++++++-------- dlls/ntdll/sync.c | 38 -------------------------------------- dlls/ntdll/unix/loader.c | 4 ---- dlls/ntdll/unixlib.h | 9 +-------- 4 files changed, 9 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bc2164e07487edccc32b…

1 0

Zebediah Figura : quartz/tests: Add some tests for pin connection on the DirectSound renderer.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 52862838db98b462ae6db8fec220b7903f8bf7b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52862838db98b462ae6db8fe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 15 22:57:17 2020 -0500 quartz/tests: Add some tests for pin connection on the DirectSound renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 138 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 0b45d712dc..22d5bf6282 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -25,6 +25,7 @@ #include "dsound.h" #include "amaudio.h" #include "mmreg.h" +#include "wine/strmbase.h" #include "wine/test.h" static const WCHAR sink_id[] = L"Audio Input pin (rendered)"; @@ -38,6 +39,12 @@ static IBaseFilter *create_dsound_render(void) return filter; } +static inline BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b) +{ + return !memcmp(a, b, offsetof(AM_MEDIA_TYPE, pbFormat)) + && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); +} + static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -573,6 +580,136 @@ static void test_enum_media_types(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +struct testfilter +{ + struct strmbase_filter filter; + struct strmbase_source source; +}; + +static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, filter); +} + +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + if (!index) + return &filter->source.pin; + return NULL; +} + +static void testfilter_destroy(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + strmbase_source_cleanup(&filter->source); + strmbase_filter_cleanup(&filter->filter); +} + +static const struct strmbase_filter_ops testfilter_ops = +{ + .filter_get_pin = testfilter_get_pin, + .filter_destroy = testfilter_destroy, +}; + +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) +{ + return S_OK; +} + +static const struct strmbase_source_ops testsource_ops = +{ + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, +}; + +static void testfilter_init(struct testfilter *filter) +{ + static const GUID clsid = {0xabacab}; + strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); + strmbase_source_init(&filter->source, &filter->filter, L"", &testsource_ops); +} + +static void test_connect_pin(void) +{ + WAVEFORMATEX wfx = + { + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 2, + .nSamplesPerSec = 44100, + .nAvgBytesPerSec = 44100 * 4, + .nBlockAlign = 4, + .wBitsPerSample = 16, + }; + AM_MEDIA_TYPE req_mt = + { + .majortype = MEDIATYPE_Audio, + .subtype = MEDIASUBTYPE_PCM, + .formattype = FORMAT_WaveFormatEx, + .cbFormat = sizeof(wfx), + .pbFormat = (BYTE *)&wfx, + }; + IBaseFilter *filter = create_dsound_render(); + struct testfilter source; + IFilterGraph2 *graph; + AM_MEDIA_TYPE mt; + IPin *pin, *peer; + HRESULT hr; + ULONG ref; + + testfilter_init(&source); + + CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&graph); + IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, L"source"); + IFilterGraph2_AddFilter(graph, filter, L"sink"); + + IBaseFilter_FindPin(filter, sink_id, &pin); + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(peer == &source.source.pin.IPin_iface, "Got peer %p.\n", peer); + IPin_Release(peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); + + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(source.source.pin.peer == pin, "Got peer %p.\n", source.source.pin.peer); + IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&source.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -829,6 +966,7 @@ START_TEST(dsoundrender) test_enum_media_types(); test_unconnected_filter_state(); test_media_types(); + test_connect_pin(); test_basefilter(); CoUninitialize();

1 0

Puetz Kevin A : include: GWL_ID is not a HANDLE or pointer, and should be available on _WIN64.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 493e9a6164f48e133f07c079398a9a7e7c43e7d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=493e9a6164f48e133f07c079… Author: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Date: Wed Jul 15 13:02:40 2020 +0000 include: GWL_ID is not a HANDLE or pointer, and should be available on _WIN64. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winuser.h b/include/winuser.h index 311b1481be..53661f6c78 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1217,9 +1217,9 @@ typedef struct tagSTYLESTRUCT { /* Offsets for GetWindowLong() and GetWindowWord() */ #define GWL_EXSTYLE (-20) #define GWL_STYLE (-16) +#define GWL_ID (-12) #if !defined _WIN64 && !defined __WINESRC__ # define GWL_USERDATA (-21) -# define GWL_ID (-12) # define GWL_HWNDPARENT (-8) # define GWL_HINSTANCE (-6) # define GWL_WNDPROC (-4)

1 0

Alexandre Julliard : ntdll: Use syscall thunks for wait functions.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 9f8acda1677e90a5f429ef8db739adce700629ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f8acda1677e90a5f429ef8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:30:34 2020 +0200 ntdll: Use syscall thunks for wait functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 20 +++++++++---------- dlls/ntdll/sync.c | 50 ------------------------------------------------ dlls/ntdll/unix/loader.c | 5 ----- dlls/ntdll/unixlib.h | 11 +---------- 4 files changed, 11 insertions(+), 75 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 405fac61e8..0183a10cab 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -191,7 +191,7 @@ @ stdcall -arch=win32,arm64 NtCurrentTeb() # @ stub NtDebugActiveProcess # @ stub NtDebugContinue -@ stdcall NtDelayExecution(long ptr) +@ stdcall -syscall NtDelayExecution(long ptr) @ stdcall NtDeleteAtom(long) # @ stub NtDeleteBootEntry @ stdcall NtDeleteFile(ptr) @@ -401,7 +401,7 @@ @ stdcall NtSetValueKey(long ptr long long ptr long) @ stdcall NtSetVolumeInformationFile(long ptr ptr long long) @ stdcall NtShutdownSystem(long) -@ stdcall NtSignalAndWaitForSingleObject(long long long ptr) +@ stdcall -syscall NtSignalAndWaitForSingleObject(long long long ptr) @ stub NtStartProfile @ stub NtStopProfile @ stdcall NtSuspendProcess(long) @@ -423,16 +423,16 @@ @ stub NtW32Call # @ stub NtWaitForDebugEvent @ stdcall NtWaitForKeyedEvent(long ptr long ptr) -@ stdcall NtWaitForMultipleObjects(long ptr long long ptr) +@ stdcall -syscall NtWaitForMultipleObjects(long ptr long long ptr) @ stub NtWaitForProcessMutant -@ stdcall NtWaitForSingleObject(long long ptr) +@ stdcall -syscall NtWaitForSingleObject(long long ptr) @ stub NtWaitHighEventPair @ stub NtWaitLowEventPair @ stdcall NtWriteFile(long long ptr ptr ptr ptr long ptr ptr) @ stdcall NtWriteFileGather(long long ptr ptr ptr ptr long ptr ptr) @ stub NtWriteRequestData @ stdcall NtWriteVirtualMemory(long ptr ptr long ptr) -@ stdcall NtYieldExecution() +@ stdcall -syscall NtYieldExecution() @ stub PfxFindPrefix @ stub PfxInitialize @ stub PfxInsertPrefix @@ -1176,7 +1176,7 @@ # @ stub ZwCreateWaitablePort # @ stub ZwDebugActiveProcess # @ stub ZwDebugContinue -@ stdcall -private ZwDelayExecution(long ptr) NtDelayExecution +@ stdcall -private -syscall ZwDelayExecution(long ptr) NtDelayExecution @ stdcall -private ZwDeleteAtom(long) NtDeleteAtom # @ stub ZwDeleteBootEntry @ stdcall -private ZwDeleteFile(ptr) NtDeleteFile @@ -1385,7 +1385,7 @@ @ stdcall -private ZwSetValueKey(long ptr long long ptr long) NtSetValueKey @ stdcall -private ZwSetVolumeInformationFile(long ptr ptr long long) NtSetVolumeInformationFile @ stdcall -private ZwShutdownSystem(long) NtShutdownSystem -@ stdcall -private ZwSignalAndWaitForSingleObject(long long long ptr) NtSignalAndWaitForSingleObject +@ stdcall -private -syscall ZwSignalAndWaitForSingleObject(long long long ptr) NtSignalAndWaitForSingleObject @ stub ZwStartProfile @ stub ZwStopProfile @ stdcall -private ZwSuspendProcess(long) NtSuspendProcess @@ -1407,16 +1407,16 @@ @ stub ZwW32Call # @ stub ZwWaitForDebugEvent @ stdcall -private ZwWaitForKeyedEvent(long ptr long ptr) NtWaitForKeyedEvent -@ stdcall -private ZwWaitForMultipleObjects(long ptr long long ptr) NtWaitForMultipleObjects +@ stdcall -private -syscall ZwWaitForMultipleObjects(long ptr long long ptr) NtWaitForMultipleObjects @ stub ZwWaitForProcessMutant -@ stdcall -private ZwWaitForSingleObject(long long ptr) NtWaitForSingleObject +@ stdcall -private -syscall ZwWaitForSingleObject(long long ptr) NtWaitForSingleObject @ stub ZwWaitHighEventPair @ stub ZwWaitLowEventPair @ stdcall -private ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile @ stdcall -private ZwWriteFileGather(long long ptr ptr ptr ptr long ptr ptr) NtWriteFileGather @ stub ZwWriteRequestData @ stdcall -private ZwWriteVirtualMemory(long ptr ptr long ptr) NtWriteVirtualMemory -@ stdcall -private ZwYieldExecution() NtYieldExecution +@ stdcall -private -syscall ZwYieldExecution() NtYieldExecution @ cdecl -private -arch=i386 _CIcos() @ cdecl -private -arch=i386 _CIlog() @ cdecl -private -arch=i386 _CIpow() diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 6eb328f025..a6666e042e 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -167,56 +167,6 @@ NTSTATUS WINAPI NtSetTimerResolution(IN ULONG resolution, -/* wait operations */ - -/****************************************************************** - * NtWaitForMultipleObjects (NTDLL.@) - */ -NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, - BOOLEAN wait_any, BOOLEAN alertable, - const LARGE_INTEGER *timeout ) -{ - return unix_funcs->NtWaitForMultipleObjects( count, handles, wait_any, alertable, timeout ); -} - - -/****************************************************************** - * NtWaitForSingleObject (NTDLL.@) - */ -NTSTATUS WINAPI NtWaitForSingleObject(HANDLE handle, BOOLEAN alertable, const LARGE_INTEGER *timeout ) -{ - return unix_funcs->NtWaitForSingleObject( handle, alertable, timeout ); -} - - -/****************************************************************** - * NtSignalAndWaitForSingleObject (NTDLL.@) - */ -NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE signal, HANDLE wait, - BOOLEAN alertable, const LARGE_INTEGER *timeout ) -{ - return unix_funcs->NtSignalAndWaitForSingleObject( signal, wait, alertable, timeout ); -} - - -/****************************************************************** - * NtYieldExecution (NTDLL.@) - */ -NTSTATUS WINAPI NtYieldExecution(void) -{ - return unix_funcs->NtYieldExecution(); -} - - -/****************************************************************** - * NtDelayExecution (NTDLL.@) - */ -NTSTATUS WINAPI NtDelayExecution( BOOLEAN alertable, const LARGE_INTEGER *timeout ) -{ - return unix_funcs->NtDelayExecution( alertable, timeout ); -} - - /****************************************************************************** * NtCreateKeyedEvent (NTDLL.@) */ diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 53c12384e9..d2ebeae935 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1372,7 +1372,6 @@ static struct unix_funcs unix_funcs = NtCreateThreadEx, NtCreateUserProcess, NtCurrentTeb, - NtDelayExecution, NtDeleteFile, NtDeviceIoControlFile, NtDuplicateObject, @@ -1430,7 +1429,6 @@ static struct unix_funcs unix_funcs = NtSetLdtEntries, NtSetSystemTime, NtSetVolumeInformationFile, - NtSignalAndWaitForSingleObject, NtSuspendProcess, NtSuspendThread, NtTerminateProcess, @@ -1438,12 +1436,9 @@ static struct unix_funcs unix_funcs = NtUnlockVirtualMemory, NtUnmapViewOfSection, NtWaitForKeyedEvent, - NtWaitForMultipleObjects, - NtWaitForSingleObject, NtWriteFile, NtWriteFileGather, NtWriteVirtualMemory, - NtYieldExecution, DbgUiIssueRemoteBreakin, RtlGetSystemTimePrecise, RtlWaitOnAddress, diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 5546107d02..9f83b30c40 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 79 +#define NTDLL_UNIXLIB_VERSION 80 struct unix_funcs { @@ -67,7 +67,6 @@ struct unix_funcs RTL_USER_PROCESS_PARAMETERS *params, PS_CREATE_INFO *info, PS_ATTRIBUTE_LIST *attr ); TEB * (WINAPI *NtCurrentTeb)(void); - NTSTATUS (WINAPI *NtDelayExecution)( BOOLEAN alertable, const LARGE_INTEGER *timeout ); NTSTATUS (WINAPI *NtDeleteFile)( OBJECT_ATTRIBUTES *attr ); NTSTATUS (WINAPI *NtDeviceIoControlFile)( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io, ULONG code, @@ -184,8 +183,6 @@ struct unix_funcs NTSTATUS (WINAPI *NtSetSystemTime)( const LARGE_INTEGER *new, LARGE_INTEGER *old ); NTSTATUS (WINAPI *NtSetVolumeInformationFile)( HANDLE handle, IO_STATUS_BLOCK *io, void *info, ULONG length, FS_INFORMATION_CLASS class ); - NTSTATUS (WINAPI *NtSignalAndWaitForSingleObject)( HANDLE signal, HANDLE wait, - BOOLEAN alertable, const LARGE_INTEGER *timeout ); NTSTATUS (WINAPI *NtSuspendProcess)( HANDLE handle ); NTSTATUS (WINAPI *NtSuspendThread)( HANDLE handle, ULONG *count ); NTSTATUS (WINAPI *NtTerminateProcess)( HANDLE handle, LONG exit_code ); @@ -195,11 +192,6 @@ struct unix_funcs NTSTATUS (WINAPI *NtUnmapViewOfSection)( HANDLE process, PVOID addr ); NTSTATUS (WINAPI *NtWaitForKeyedEvent)( HANDLE handle, const void *key, BOOLEAN alertable, const LARGE_INTEGER *timeout ); - NTSTATUS (WINAPI *NtWaitForMultipleObjects)( DWORD count, const HANDLE *handles, - BOOLEAN wait_any, BOOLEAN alertable, - const LARGE_INTEGER *timeout ); - NTSTATUS (WINAPI *NtWaitForSingleObject)( HANDLE handle, BOOLEAN alertable, - const LARGE_INTEGER *timeout ); NTSTATUS (WINAPI *NtWriteFile)( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, const void *buffer, ULONG length, LARGE_INTEGER *offset, ULONG *key ); @@ -209,7 +201,6 @@ struct unix_funcs LARGE_INTEGER *offset, ULONG *key ); NTSTATUS (WINAPI *NtWriteVirtualMemory)( HANDLE process, void *addr, const void *buffer, SIZE_T size, SIZE_T *bytes_written ); - NTSTATUS (WINAPI *NtYieldExecution)(void); /* other Win32 API functions */ NTSTATUS (WINAPI *DbgUiIssueRemoteBreakin)( HANDLE process );

1 0

Alexandre Julliard : ntdll: Use syscall thunks for job functions.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 66e6d87ab86c393f189aa8d409b62b3e028ed17e URL: https://source.winehq.org/git/wine.git/?a=commit;h=66e6d87ab86c393f189aa8d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:27:34 2020 +0200 ntdll: Use syscall thunks for job functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 28 ++++++++++---------- dlls/ntdll/sync.c | 68 ------------------------------------------------ dlls/ntdll/unix/loader.c | 7 ----- dlls/ntdll/unixlib.h | 13 +-------- 4 files changed, 15 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=66e6d87ab86c393f189a…

1 0

Alexandre Julliard : kernelbase: Use FSCTL_GET_OBJECT_ID to compare file identities.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: d1f83537e7f064f0f77ead043617bc213c8c0053 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1f83537e7f064f0f77ead04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 09:14:56 2020 +0200 kernelbase: Use FSCTL_GET_OBJECT_ID to compare file identities. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 9d082f1a64..d9b3440869 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -473,12 +473,12 @@ DWORD file_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) */ static BOOL is_same_file( HANDLE h1, HANDLE h2 ) { - FILE_ID_INFORMATION id1, id2; + FILE_OBJECTID_BUFFER id1, id2; IO_STATUS_BLOCK io; - return !NtQueryInformationFile( h1, &io, &id1, sizeof(id1), FileIdInformation ) && - !NtQueryInformationFile( h2, &io, &id2, sizeof(id2), FileIdInformation ) && - !memcmp( &id1, &id2, sizeof(FILE_ID_INFORMATION) ); + return (!NtFsControlFile( h1, 0, NULL, NULL, &io, FSCTL_GET_OBJECT_ID, NULL, 0, &id1, sizeof(id1) ) && + !NtFsControlFile( h2, 0, NULL, NULL, &io, FSCTL_GET_OBJECT_ID, NULL, 0, &id2, sizeof(id2) ) && + !memcmp( &id1.ObjectId, &id2.ObjectId, sizeof(id1.ObjectId) )); }

1 0

Puetz Kevin A : oleaut32: Cut off only non-empty \[0-9]+$ resource-id in RegisterTypeLib.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 380fbe006ad153078a8cf0cfe4ecf6d2f11c2291 URL: https://source.winehq.org/git/wine.git/?a=commit;h=380fbe006ad153078a8cf0cf… Author: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Date: Thu Jul 16 21:06:17 2020 +0200 oleaut32: Cut off only non-empty \[0-9]+$ resource-id in RegisterTypeLib. Check if szFullPath ended with '\\' (was explicitly a directory). Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 01bb16efbc..06667850a3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -730,7 +730,7 @@ HRESULT WINAPI RegisterTypeLib(ITypeLib *ptlib, const WCHAR *szFullPath, const W if ((disposition == REG_CREATED_NEW_KEY) && (szHelpDir == NULL)) { szHelpDir = freeHelpDir = SysAllocString(szFullPath); file_name = wcsrchr(szHelpDir, '\\'); - if (file_name && file_name[0]) { + if (file_name && file_name[1]) { /* possible remove a numeric \index (resource-id) */ WCHAR *end_ptr = file_name + 1; while ('0' <= *end_ptr && *end_ptr <= '9') end_ptr++;

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_filter enumeration to vkd3d_shader_filter.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: vkd3d Branch: master Commit: d1849b86ea9225aa0c4d65cffc26bdf9702310f3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d1849b86ea9225aa0c4d65c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 14:56:47 2020 +0430 vkd3d-shader: Rename the vkd3d_filter enumeration to vkd3d_shader_filter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 82 +++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index b2c3dc9..2ae35ae 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -325,46 +325,46 @@ struct vkd3d_shader_spirv_domain_shader_target_info }; /* root signature 1.0 */ -enum vkd3d_filter -{ - VKD3D_FILTER_MIN_MAG_MIP_POINT = 0x0, - VKD3D_FILTER_MIN_MAG_POINT_MIP_LINEAR = 0x1, - VKD3D_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x4, - VKD3D_FILTER_MIN_POINT_MAG_MIP_LINEAR = 0x5, - VKD3D_FILTER_MIN_LINEAR_MAG_MIP_POINT = 0x10, - VKD3D_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x11, - VKD3D_FILTER_MIN_MAG_LINEAR_MIP_POINT = 0x14, - VKD3D_FILTER_MIN_MAG_MIP_LINEAR = 0x15, - VKD3D_FILTER_ANISOTROPIC = 0x55, - VKD3D_FILTER_COMPARISON_MIN_MAG_MIP_POINT = 0x80, - VKD3D_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR = 0x81, - VKD3D_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x84, - VKD3D_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR = 0x85, - VKD3D_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT = 0x90, - VKD3D_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x91, - VKD3D_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT = 0x94, - VKD3D_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR = 0x95, - VKD3D_FILTER_COMPARISON_ANISOTROPIC = 0xd5, - VKD3D_FILTER_MINIMUM_MIN_MAG_MIP_POINT = 0x100, - VKD3D_FILTER_MINIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x101, - VKD3D_FILTER_MINIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x104, - VKD3D_FILTER_MINIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x105, - VKD3D_FILTER_MINIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x110, - VKD3D_FILTER_MINIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x111, - VKD3D_FILTER_MINIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x114, - VKD3D_FILTER_MINIMUM_MIN_MAG_MIP_LINEAR = 0x115, - VKD3D_FILTER_MINIMUM_ANISOTROPIC = 0x155, - VKD3D_FILTER_MAXIMUM_MIN_MAG_MIP_POINT = 0x180, - VKD3D_FILTER_MAXIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x181, - VKD3D_FILTER_MAXIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x184, - VKD3D_FILTER_MAXIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x185, - VKD3D_FILTER_MAXIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x190, - VKD3D_FILTER_MAXIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x191, - VKD3D_FILTER_MAXIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x194, - VKD3D_FILTER_MAXIMUM_MIN_MAG_MIP_LINEAR = 0x195, - VKD3D_FILTER_MAXIMUM_ANISOTROPIC = 0x1d5, - - VKD3D_FORCE_32_BIT_ENUM(VKD3D_FILTER), +enum vkd3d_shader_filter +{ + VKD3D_SHADER_FILTER_MIN_MAG_MIP_POINT = 0x000, + VKD3D_SHADER_FILTER_MIN_MAG_POINT_MIP_LINEAR = 0x001, + VKD3D_SHADER_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x004, + VKD3D_SHADER_FILTER_MIN_POINT_MAG_MIP_LINEAR = 0x005, + VKD3D_SHADER_FILTER_MIN_LINEAR_MAG_MIP_POINT = 0x010, + VKD3D_SHADER_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x011, + VKD3D_SHADER_FILTER_MIN_MAG_LINEAR_MIP_POINT = 0x014, + VKD3D_SHADER_FILTER_MIN_MAG_MIP_LINEAR = 0x015, + VKD3D_SHADER_FILTER_ANISOTROPIC = 0x055, + VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_MIP_POINT = 0x080, + VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR = 0x081, + VKD3D_SHADER_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x084, + VKD3D_SHADER_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR = 0x085, + VKD3D_SHADER_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT = 0x090, + VKD3D_SHADER_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x091, + VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT = 0x094, + VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR = 0x095, + VKD3D_SHADER_FILTER_COMPARISON_ANISOTROPIC = 0x0d5, + VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_MIP_POINT = 0x100, + VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x101, + VKD3D_SHADER_FILTER_MINIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x104, + VKD3D_SHADER_FILTER_MINIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x105, + VKD3D_SHADER_FILTER_MINIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x110, + VKD3D_SHADER_FILTER_MINIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x111, + VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x114, + VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_MIP_LINEAR = 0x115, + VKD3D_SHADER_FILTER_MINIMUM_ANISOTROPIC = 0x155, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_MIP_POINT = 0x180, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x181, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x184, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x185, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x190, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x191, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x194, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_MIP_LINEAR = 0x195, + VKD3D_SHADER_FILTER_MAXIMUM_ANISOTROPIC = 0x1d5, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_FILTER), }; enum vkd3d_texture_address_mode @@ -403,7 +403,7 @@ enum vkd3d_static_border_color struct vkd3d_static_sampler_desc { - enum vkd3d_filter filter; + enum vkd3d_shader_filter filter; enum vkd3d_texture_address_mode address_u; enum vkd3d_texture_address_mode address_v; enum vkd3d_texture_address_mode address_w;

1 0