wine-commits August 2019

wine-commits@winehq.org

2 participants
703 discussions

Alexandre Julliard : winedump: Add dumping for exception info for ARM64.
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: wine Branch: master Commit: 509e8d2093c4a54ce29a4cc668fc1318114b93ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=509e8d2093c4a54ce29a4cc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 20 20:21:57 2019 +0200 winedump: Add dumping for exception info for ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pe.c | 364 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 358 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=509e8d2093c4a54ce29a…

1 0

Isira Seneviratne : cabinet/tests: Alter string declaration to include null terminator.
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: wine Branch: master Commit: 6054f2cc6e2eb4ebef547eef3b41822b1b280640 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6054f2cc6e2eb4ebef547eef… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Sun Aug 18 16:32:34 2019 +0530 cabinet/tests: Alter string declaration to include null terminator. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/tests/fdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 1f1c6e2..732f816 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -776,7 +776,7 @@ static UINT CDECL fdi_mem_read(INT_PTR hf, void *pv, UINT cb) static UINT CDECL fdi_mem_write(INT_PTR hf, void *pv, UINT cb) { - static const char expected[12] = "Hello World!"; + static const char expected[] = "Hello World!"; trace("mem_write(%#lx,%p,%u)\n", hf, pv, cb);

1 0

Sven Baars : windowscodecs/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: wine Branch: master Commit: 4321cd9d7e69cac0156679f6147597ef45e57562 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4321cd9d7e69cac0156679f6… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Aug 18 23:24:32 2019 +0200 windowscodecs/tests: Fix a memory leak (Valgrind). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43387 Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/metadata.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index b434648..a955702 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -3029,6 +3029,7 @@ static void test_queryreader(void) ok(hr == E_INVALIDARG, "got %#x\n", hr); IWICMetadataQueryReader_Release(new_reader); + PropVariantClear(&value); } else if (value.vt == VT_LPSTR) ok(!lstrcmpA(U(value).pszVal, test_data[i].str_value), "%u: expected %s, got %s\n",

1 0

Benedikt Bär : ucrtbase: Add more functions for Star Citizen 3.6.1.
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: wine Branch: master Commit: 6ed6d33ec252eff8eb6584b288271927826ac86e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ed6d33ec252eff8eb6584b2… Author: Benedikt Bär <beniwtv(a)relamp.tk> Date: Fri Aug 16 20:22:19 2019 +0200 ucrtbase: Add more functions for Star Citizen 3.6.1. Signed-off-by: Benedikt Bär <beniwtv(a)relamp.tk> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 10 +++++----- dlls/ucrtbase/ucrtbase.spec | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index d496889..1d5e2f8 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -840,7 +840,7 @@ @ stub _o__wfullpath @ stub _o__wgetcwd @ stub _o__wgetdcwd -@ stub _o__wgetenv +@ cdecl _o__wgetenv(wstr) ucrtbase._o__wgetenv @ stub _o__wgetenv_s @ stub _o__wmakepath @ stub _o__wmakepath_s @@ -857,7 +857,7 @@ @ stub _o__wrmdir @ stub _o__wsearchenv @ stub _o__wsearchenv_s -@ stub _o__wsetlocale +@ cdecl _o__wsetlocale(long wstr) ucrtbase._o__wsetlocale @ stub _o__wsopen_dispatch @ stub _o__wsopen_s @ stub _o__wspawnv @@ -913,7 +913,7 @@ @ stub _o_atanhf @ stub _o_atanhl @ cdecl _o_atof(str) ucrtbase._o_atof -@ stub _o_atoi +@ cdecl _o_atoi(str) ucrtbase._o_atoi @ stub _o_atol @ stub _o_atoll @ stub _o_bsearch @@ -922,7 +922,7 @@ @ cdecl _o_calloc(long long) ucrtbase._o_calloc @ stub _o_cbrt @ stub _o_cbrtf -@ stub _o_ceil +@ cdecl _o_ceil(double) ucrtbase._o_ceil @ stub _o_ceilf @ stub _o_clearerr @ stub _o_clearerr_s @@ -952,7 +952,7 @@ @ stub _o_fgets @ stub _o_fgetwc @ stub _o_fgetws -@ stub _o_floor +@ cdecl _o_floor(double) ucrtbase._o_floor @ stub _o_floorf @ stub _o_fma @ stub _o_fmaf diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6684742..070f0d6 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1504,7 +1504,7 @@ @ stub _o__wfullpath @ stub _o__wgetcwd @ stub _o__wgetdcwd -@ stub _o__wgetenv +@ cdecl _o__wgetenv(wstr) MSVCRT__wgetenv @ stub _o__wgetenv_s @ stub _o__wmakepath @ stub _o__wmakepath_s @@ -1521,7 +1521,7 @@ @ stub _o__wrmdir @ stub _o__wsearchenv @ stub _o__wsearchenv_s -@ stub _o__wsetlocale +@ cdecl _o__wsetlocale(long wstr) MSVCRT__wsetlocale @ stub _o__wsopen_dispatch @ stub _o__wsopen_s @ stub _o__wspawnv @@ -1577,7 +1577,7 @@ @ stub _o_atanhf @ stub _o_atanhl @ cdecl _o_atof(str) MSVCRT_atof -@ stub _o_atoi +@ cdecl _o_atoi(str) MSVCRT_atoi @ stub _o_atol @ stub _o_atoll @ stub _o_bsearch @@ -1586,7 +1586,7 @@ @ cdecl _o_calloc(long long) MSVCRT_calloc @ stub _o_cbrt @ stub _o_cbrtf -@ stub _o_ceil +@ cdecl _o_ceil(double) MSVCRT_ceil @ stub _o_ceilf @ stub _o_clearerr @ stub _o_clearerr_s @@ -1616,7 +1616,7 @@ @ stub _o_fgets @ stub _o_fgetwc @ stub _o_fgetws -@ stub _o_floor +@ cdecl _o_floor(double) MSVCRT_floor @ stub _o_floorf @ stub _o_fma @ stub _o_fmaf

1 0

Steven Bell : kernel32: Add stub implementation of EnumSystemFirmwareTables.
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: wine Branch: master Commit: d97f33f0344777de561e0fc3e4e3039778e166f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d97f33f0344777de561e0fc3… Author: Steven Bell <bell.steven(a)gmail.com> Date: Mon Aug 19 10:10:06 2019 -0700 kernel32: Add stub implementation of EnumSystemFirmwareTables. A recent change to the game Everquest adds a call to EnumSystemFirmwareTables. Signed-off-by: Steven Bell <bell.steven(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-sysinfo-l1-2-0.spec | 2 +- .../api-ms-win-core-sysinfo-l1-2-1.spec | 2 +- dlls/kernel32/cpu.c | 10 ++++++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec b/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec index 9b05674..1103427 100644 --- a/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec +++ b/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec @@ -1,4 +1,4 @@ -@ stub EnumSystemFirmwareTables +@ stdcall EnumSystemFirmwareTables(long ptr long) kernel32.EnumSystemFirmwareTables @ stdcall GetComputerNameExA(long ptr ptr) kernel32.GetComputerNameExA @ stdcall GetComputerNameExW(long ptr ptr) kernel32.GetComputerNameExW @ stdcall GetLocalTime(ptr) kernel32.GetLocalTime diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec b/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec index 6da2f25..9a89b4b 100644 --- a/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec +++ b/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec @@ -1,5 +1,5 @@ @ stub DnsHostnameToComputerNameExW -@ stub EnumSystemFirmwareTables +@ stdcall EnumSystemFirmwareTables(long ptr long) kernel32.EnumSystemFirmwareTables @ stdcall GetComputerNameExA(long ptr ptr) kernel32.GetComputerNameExA @ stdcall GetComputerNameExW(long ptr ptr) kernel32.GetComputerNameExW @ stdcall GetLocalTime(ptr) kernel32.GetLocalTime diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 7668a10..3f4f6c6 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -365,3 +365,13 @@ UINT WINAPI GetSystemFirmwareTable(DWORD provider, DWORD id, void *buffer, DWORD HeapFree(GetProcessHeap(), 0, sfti); return buffer_size; } + + +/*********************************************************************** + * EnumSystemFirmwareTables (KERNEL32.@) + */ +UINT WINAPI EnumSystemFirmwareTables(DWORD provider, void *buffer, DWORD size) +{ + FIXME("(0x%08x, %p, %d)\n", provider, buffer, size); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 016c302..fb8e4c9 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -418,7 +418,7 @@ @ stdcall EnumResourceTypesW(long ptr long) @ stdcall EnumSystemCodePagesA(ptr long) @ stdcall EnumSystemCodePagesW(ptr long) -# @ stub EnumSystemFirmwareTables +@ stdcall EnumSystemFirmwareTables(long ptr long) @ stdcall EnumSystemGeoID(long long ptr) @ stdcall EnumSystemLanguageGroupsA(ptr long ptr) @ stdcall EnumSystemLanguageGroupsW(ptr long ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7021447..7dff3ed 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -312,7 +312,7 @@ @ stdcall EnumResourceTypesExA(long ptr long long long) @ stdcall EnumResourceTypesExW(long ptr long long long) @ stdcall EnumSystemCodePagesW(ptr long) kernel32.EnumSystemCodePagesW -# @ stub EnumSystemFirmwareTables +@ stdcall EnumSystemFirmwareTables(long ptr long) kernel32.EnumSystemFirmwareTables @ stdcall EnumSystemGeoID(long long ptr) kernel32.EnumSystemGeoID @ stdcall EnumSystemLanguageGroupsW(ptr long ptr) kernel32.EnumSystemLanguageGroupsW @ stdcall EnumSystemLocalesA(ptr long) kernel32.EnumSystemLocalesA

1 0

Alistair Leslie-Hughes : dbgeng: Support interfaces IDebugClient2-7.
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: wine Branch: master Commit: 3d7d3dc3ae3cd20b7499d6f2d1b251ed91d988f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d7d3dc3ae3cd20b7499d6f2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 20 04:35:48 2019 +0000 dbgeng: Support interfaces IDebugClient2-7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44958 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 478 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 426 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d7d3dc3ae3cd20b7499…

1 0

Zebediah Figura : ntoskrnl.exe: Implement IoReleaseRemoveLockAndWaitEx().
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: wine Branch: master Commit: c0b05a2c74af6ce9276ae932a94465d95e5f7d43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0b05a2c74af6ce9276ae932… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 19 22:27:50 2019 -0500 ntoskrnl.exe: Implement IoReleaseRemoveLockAndWaitEx(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 -------- dlls/ntoskrnl.exe/sync.c | 19 +++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6be5990..91bd7da 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3805,14 +3805,6 @@ void WINAPI KeFlushQueuedDpcs(void) } /********************************************************************* - * IoReleaseRemoveLockAndWaitEx (NTOSKRNL.@) - */ -void WINAPI IoReleaseRemoveLockAndWaitEx(PIO_REMOVE_LOCK lock, PVOID tag, ULONG size) -{ - FIXME("stub: %p %p %u\n", lock, tag, size); -} - -/********************************************************************* * DbgQueryDebugFilterState (NTOSKRNL.@) */ NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG component, ULONG level) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 7f4d263..4ab8b49 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1239,3 +1239,22 @@ void WINAPI IoReleaseRemoveLockEx( IO_REMOVE_LOCK *lock, void *tag, ULONG size ) else if (count < 0) ERR("Lock %p is not acquired!\n", lock); } + +/*********************************************************************** + * IoReleaseRemoveLockAndWaitEx (NTOSKRNL.EXE.@) + */ +void WINAPI IoReleaseRemoveLockAndWaitEx( IO_REMOVE_LOCK *lock, void *tag, ULONG size ) +{ + LONG count; + + TRACE("lock %p, tag %p, size %u.\n", lock, tag, size); + + lock->Common.Removed = TRUE; + + if (!(count = InterlockedDecrement( &lock->Common.IoCount ))) + KeSetEvent( &lock->Common.RemoveEvent, IO_NO_INCREMENT, FALSE ); + else if (count < 0) + ERR("Lock %p is not acquired!\n", lock); + else + KeWaitForSingleObject( &lock->Common.RemoveEvent, Executive, KernelMode, FALSE, NULL ); +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5e2e119..21c9539 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1603,6 +1603,7 @@ void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE void WINAPI IoQueueWorkItem(PIO_WORKITEM,PIO_WORKITEM_ROUTINE,WORK_QUEUE_TYPE,void*); NTSTATUS WINAPI IoRegisterDeviceInterface(PDEVICE_OBJECT,const GUID*,PUNICODE_STRING,PUNICODE_STRING); void WINAPI IoReleaseCancelSpinLock(KIRQL); +void WINAPI IoReleaseRemoveLockAndWaitEx(IO_REMOVE_LOCK*,void*,ULONG); void WINAPI IoReleaseRemoveLockEx(IO_REMOVE_LOCK*,void*,ULONG); NTSTATUS WINAPI IoSetDeviceInterfaceState(UNICODE_STRING*,BOOLEAN); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG);

1 0

Zebediah Figura : ntoskrnl.exe: Implement IoReleaseRemoveLockEx().
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: wine Branch: master Commit: 9d899c753afb36823720a6c2e8e1098c65012e54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d899c753afb36823720a6c2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 19 22:27:49 2019 -0500 ntoskrnl.exe: Implement IoReleaseRemoveLockEx(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 15 +++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3128c35..230c8d6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -448,7 +448,7 @@ @ stdcall IoRegisterShutdownNotification(ptr) @ stdcall IoReleaseCancelSpinLock(long) @ stdcall IoReleaseRemoveLockAndWaitEx(ptr ptr long) -@ stub IoReleaseRemoveLockEx +@ stdcall IoReleaseRemoveLockEx(ptr ptr long) @ stub IoReleaseVpbSpinLock @ stub IoRemoveShareAccess @ stub IoReportDetectedDevice diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index f54fe2a..7f4d263 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1224,3 +1224,18 @@ NTSTATUS WINAPI IoAcquireRemoveLockEx( IO_REMOVE_LOCK *lock, void *tag, InterlockedIncrement( &lock->Common.IoCount ); return STATUS_SUCCESS; } + +/*********************************************************************** + * IoReleaseRemoveLockEx (NTOSKRNL.EXE.@) + */ +void WINAPI IoReleaseRemoveLockEx( IO_REMOVE_LOCK *lock, void *tag, ULONG size ) +{ + LONG count; + + TRACE("lock %p, tag %p, size %u.\n", lock, tag, size); + + if (!(count = InterlockedDecrement( &lock->Common.IoCount ))) + KeSetEvent( &lock->Common.RemoveEvent, IO_NO_INCREMENT, FALSE ); + else if (count < 0) + ERR("Lock %p is not acquired!\n", lock); +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index da200c5..5e2e119 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1603,6 +1603,7 @@ void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE void WINAPI IoQueueWorkItem(PIO_WORKITEM,PIO_WORKITEM_ROUTINE,WORK_QUEUE_TYPE,void*); NTSTATUS WINAPI IoRegisterDeviceInterface(PDEVICE_OBJECT,const GUID*,PUNICODE_STRING,PUNICODE_STRING); void WINAPI IoReleaseCancelSpinLock(KIRQL); +void WINAPI IoReleaseRemoveLockEx(IO_REMOVE_LOCK*,void*,ULONG); NTSTATUS WINAPI IoSetDeviceInterfaceState(UNICODE_STRING*,BOOLEAN); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG);

1 0

Zebediah Figura : ntoskrnl.exe: Implement IoAcquireRemoveLockEx().
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: wine Branch: master Commit: 2a92951769be921db460245b163ad280974c854b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a92951769be921db460245b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 19 22:27:48 2019 -0500 ntoskrnl.exe: Implement IoAcquireRemoveLockEx(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 ------------- dlls/ntoskrnl.exe/sync.c | 15 +++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 20cee6c..6be5990 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3051,19 +3051,6 @@ BOOLEAN WINAPI IoSetThreadHardErrorMode(BOOLEAN EnableHardErrors) } /***************************************************** - * IoAcquireRemoveLockEx (NTOSKRNL.EXE.@) - */ - -NTSTATUS WINAPI IoAcquireRemoveLockEx(PIO_REMOVE_LOCK lock, PVOID tag, - LPCSTR file, ULONG line, ULONG lock_size) -{ - FIXME("(%p, %p, %s, %u, %u): stub\n", lock, tag, debugstr_a(file), line, lock_size); - - return STATUS_NOT_IMPLEMENTED; -} - - -/***************************************************** * DllMain */ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 0b2ca6f..f54fe2a 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1209,3 +1209,18 @@ void WINAPI IoInitializeRemoveLockEx( IO_REMOVE_LOCK *lock, ULONG tag, lock->Common.Removed = FALSE; lock->Common.IoCount = 0; } + +/*********************************************************************** + * IoAcquireRemoveLockEx (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoAcquireRemoveLockEx( IO_REMOVE_LOCK *lock, void *tag, + const char *file, ULONG line, ULONG size ) +{ + TRACE("lock %p, tag %p, file %s, line %u, size %u.\n", lock, tag, debugstr_a(file), line, size); + + if (lock->Common.Removed) + return STATUS_DELETE_PENDING; + + InterlockedIncrement( &lock->Common.IoCount ); + return STATUS_SUCCESS; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 864c0c9..da200c5 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1565,6 +1565,7 @@ void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN); void WINAPI IoAcquireCancelSpinLock(KIRQL*); +NTSTATUS WINAPI IoAcquireRemoveLockEx(IO_REMOVE_LOCK*,void*,const char*,ULONG, ULONG); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR); PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN);

1 0

Zebediah Figura : ntoskrnl.exe: Implement IoInitializeRemoveLockEx().
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: wine Branch: master Commit: afe444f75a53bd988ee1316674761d0c5aaff35b URL: https://source.winehq.org/git/wine.git/?a=commit;h=afe444f75a53bd988ee13166… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 19 22:27:47 2019 -0500 ntoskrnl.exe: Implement IoInitializeRemoveLockEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47623 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 ----------- dlls/ntoskrnl.exe/sync.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index fe66b3d..20cee6c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3050,17 +3050,6 @@ BOOLEAN WINAPI IoSetThreadHardErrorMode(BOOLEAN EnableHardErrors) return FALSE; } - -/***************************************************** - * IoInitializeRemoveLockEx (NTOSKRNL.EXE.@) - */ -VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK lock, ULONG tag, - ULONG maxmin, ULONG high, ULONG size) -{ - FIXME("(%p %u %u %u %u) stub\n", lock, tag, maxmin, high, size); -} - - /***************************************************** * IoAcquireRemoveLockEx (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index ea4165c..0b2ca6f 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1195,3 +1195,17 @@ ULONG WINAPI ExIsResourceAcquiredSharedLite( ERESOURCE *resource ) return ret; } + +/*********************************************************************** + * IoInitializeRemoveLockEx (NTOSKRNL.EXE.@) + */ +void WINAPI IoInitializeRemoveLockEx( IO_REMOVE_LOCK *lock, ULONG tag, + ULONG max_minutes, ULONG max_count, ULONG size ) +{ + TRACE("lock %p, tag %#x, max_minutes %u, max_count %u, size %u.\n", + lock, tag, max_minutes, max_count, size); + + KeInitializeEvent( &lock->Common.RemoveEvent, SynchronizationEvent, FALSE ); + lock->Common.Removed = FALSE; + lock->Common.IoCount = 0; +}

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
71
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 August 2019