Ros-diffs August 2019

ros-diffs@reactos.org

36 participants
281 discussions

[reactos] 06/13: [PSDK] Fix #ifdef in winuser.h

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94e5e79e3b004f7f11fa5… commit 94e5e79e3b004f7f11fa52da3f37e944cd5d4cdd Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 20 16:02:44 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 18:04:57 2019 +0200 [PSDK] Fix #ifdef in winuser.h --- sdk/include/psdk/winuser.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h index 594b15beb17..3ec3858e12c 100644 --- a/sdk/include/psdk/winuser.h +++ b/sdk/include/psdk/winuser.h @@ -5600,14 +5600,14 @@ typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX; #define wsprintf wsprintfW #define wvsprintf wvsprintfW -#ifndef NOGDI +#if defined(_WINGDI_) && !defined(NOGDI) #define ChangeDisplaySettings ChangeDisplaySettingsW #define ChangeDisplaySettingsEx ChangeDisplaySettingsExW #define CreateDesktop CreateDesktopW #define EnumDisplaySettings EnumDisplaySettingsW #define EnumDisplaySettingsEx EnumDisplaySettingsExW #define EnumDisplayDevices EnumDisplayDevicesW -#endif /* NOGDI */ +#endif /* _WINGDI_ && !NOGDI */ #else /* UNICODE */ #define EDITWORDBREAKPROC EDITWORDBREAKPROCA #define PROPENUMPROC PROPENUMPROCA @@ -5772,7 +5772,7 @@ typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX; #define EnumDisplaySettings EnumDisplaySettingsA #define EnumDisplaySettingsEx EnumDisplaySettingsExA #define EnumDisplayDevices EnumDisplayDevicesA -#endif /* NOGDI */ +#endif /* _WINGDI_ && !NOGDI */ #endif /* UNICODE */ #endif /* RC_INVOKED */

5 years, 4 months

[reactos] 05/13: [VIDEOPRT] Fix order of some exports

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93028748c9580f7d0d0bd… commit 93028748c9580f7d0d0bd9bae94c067e866f2fb1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jul 12 13:23:04 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 18:04:57 2019 +0200 [VIDEOPRT] Fix order of some exports --- win32ss/drivers/videoprt/videoprt.spec | 66 +++++++++++++++++----------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/win32ss/drivers/videoprt/videoprt.spec b/win32ss/drivers/videoprt/videoprt.spec index 15d1a841f0b..ee12c0692de 100644 --- a/win32ss/drivers/videoprt/videoprt.spec +++ b/win32ss/drivers/videoprt/videoprt.spec @@ -72,30 +72,30 @@ @ stdcall -arch=i386,arm VideoPortQuerySystemTime(ptr) NTOSKRNL.KeQuerySystemTime @ stdcall -arch=x86_64 VideoPortQuerySystemTime(ptr) @ stdcall VideoPortQueueDpc(ptr ptr ptr) -@ stdcall -arch=i386,arm VideoPortReadPortUchar(ptr) HAL.READ_PORT_UCHAR -@ stdcall -arch=x86_64 VideoPortReadPortUchar(ptr) -@ stdcall -arch=i386,arm VideoPortReadPortUshort(ptr) HAL.READ_PORT_USHORT -@ stdcall -arch=x86_64 VideoPortReadPortUshort(ptr) -@ stdcall -arch=i386,arm VideoPortReadPortUlong(ptr) HAL.READ_PORT_ULONG -@ stdcall -arch=x86_64 VideoPortReadPortUlong(ptr) @ stdcall -arch=i386,arm VideoPortReadPortBufferUchar(ptr ptr long) HAL.READ_PORT_BUFFER_UCHAR @ stdcall -arch=x86_64 VideoPortReadPortBufferUchar(ptr ptr long) -@ stdcall -arch=i386,arm VideoPortReadPortBufferUshort(ptr ptr long) HAL.READ_PORT_BUFFER_USHORT -@ stdcall -arch=x86_64 VideoPortReadPortBufferUshort(ptr ptr long) @ stdcall -arch=i386,arm VideoPortReadPortBufferUlong(ptr ptr long) HAL.READ_PORT_BUFFER_ULONG @ stdcall -arch=x86_64 VideoPortReadPortBufferUlong(ptr ptr long) -@ stdcall -arch=i386,arm VideoPortReadRegisterUchar(ptr) NTOSKRNL.READ_REGISTER_UCHAR -@ stdcall -arch=x86_64 VideoPortReadRegisterUchar(ptr) -@ stdcall -arch=i386,arm VideoPortReadRegisterUshort(ptr) NTOSKRNL.READ_REGISTER_USHORT -@ stdcall -arch=x86_64 VideoPortReadRegisterUshort(ptr) -@ stdcall -arch=i386,arm VideoPortReadRegisterUlong(ptr) NTOSKRNL.READ_REGISTER_ULONG -@ stdcall -arch=x86_64 VideoPortReadRegisterUlong(ptr) +@ stdcall -arch=i386,arm VideoPortReadPortBufferUshort(ptr ptr long) HAL.READ_PORT_BUFFER_USHORT +@ stdcall -arch=x86_64 VideoPortReadPortBufferUshort(ptr ptr long) +@ stdcall -arch=i386,arm VideoPortReadPortUchar(ptr) HAL.READ_PORT_UCHAR +@ stdcall -arch=x86_64 VideoPortReadPortUchar(ptr) +@ stdcall -arch=i386,arm VideoPortReadPortUlong(ptr) HAL.READ_PORT_ULONG +@ stdcall -arch=x86_64 VideoPortReadPortUlong(ptr) +@ stdcall -arch=i386,arm VideoPortReadPortUshort(ptr) HAL.READ_PORT_USHORT +@ stdcall -arch=x86_64 VideoPortReadPortUshort(ptr) @ stdcall -arch=i386,arm VideoPortReadRegisterBufferUchar(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_UCHAR @ stdcall -arch=x86_64 VideoPortReadRegisterBufferUchar(ptr ptr long) -@ stdcall -arch=i386,arm VideoPortReadRegisterBufferUshort(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_USHORT -@ stdcall -arch=x86_64 VideoPortReadRegisterBufferUshort(ptr ptr long) @ stdcall -arch=i386,arm VideoPortReadRegisterBufferUlong(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_ULONG @ stdcall -arch=x86_64 VideoPortReadRegisterBufferUlong(ptr ptr long) +@ stdcall -arch=i386,arm VideoPortReadRegisterBufferUshort(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_USHORT +@ stdcall -arch=x86_64 VideoPortReadRegisterBufferUshort(ptr ptr long) +@ stdcall -arch=i386,arm VideoPortReadRegisterUchar(ptr) NTOSKRNL.READ_REGISTER_UCHAR +@ stdcall -arch=x86_64 VideoPortReadRegisterUchar(ptr) +@ stdcall -arch=i386,arm VideoPortReadRegisterUlong(ptr) NTOSKRNL.READ_REGISTER_ULONG +@ stdcall -arch=x86_64 VideoPortReadRegisterUlong(ptr) +@ stdcall -arch=i386,arm VideoPortReadRegisterUshort(ptr) NTOSKRNL.READ_REGISTER_USHORT +@ stdcall -arch=x86_64 VideoPortReadRegisterUshort(ptr) @ stdcall VideoPortReadStateEvent(ptr ptr) @ stdcall VideoPortRegisterBugcheckCallback(ptr long ptr long) @ stdcall VideoPortReleaseBuffer(ptr ptr) @@ -122,31 +122,31 @@ @ stdcall VideoPortUnmapMemory(ptr ptr ptr) @ stdcall VideoPortVerifyAccessRanges(ptr long ptr) @ stdcall VideoPortWaitForSingleObject(ptr ptr ptr) -@ stdcall -arch=i386,arm VideoPortWritePortUchar(ptr long) HAL.WRITE_PORT_UCHAR -@ stdcall -arch=x86_64 VideoPortWritePortUchar(ptr long) -@ stdcall -arch=i386,arm VideoPortWritePortUshort(ptr long) HAL.WRITE_PORT_USHORT -@ stdcall -arch=x86_64 VideoPortWritePortUshort(ptr long) -@ stdcall -arch=i386,arm VideoPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG -@ stdcall -arch=x86_64 VideoPortWritePortUlong(ptr long) @ stdcall -arch=i386,arm VideoPortWritePortBufferUchar(ptr ptr long) HAL.WRITE_PORT_BUFFER_UCHAR @ stdcall -arch=x86_64 VideoPortWritePortBufferUchar(ptr ptr long) -@ stdcall -arch=i386,arm VideoPortWritePortBufferUshort(ptr ptr long) HAL.WRITE_PORT_BUFFER_USHORT -@ stdcall -arch=x86_64 VideoPortWritePortBufferUshort(ptr ptr long) @ stdcall -arch=i386,arm VideoPortWritePortBufferUlong(ptr ptr long) HAL.WRITE_PORT_BUFFER_ULONG @ stdcall -arch=x86_64 VideoPortWritePortBufferUlong(ptr ptr long) -@ stdcall -arch=i386,arm VideoPortWriteRegisterUchar(ptr long) NTOSKRNL.WRITE_REGISTER_UCHAR -@ stdcall -arch=x86_64 VideoPortWriteRegisterUchar(ptr long) -@ stdcall -arch=i386,arm VideoPortWriteRegisterUshort(ptr long) NTOSKRNL.WRITE_REGISTER_USHORT -@ stdcall -arch=x86_64 VideoPortWriteRegisterUshort(ptr long) -@ stdcall -arch=i386,arm VideoPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG -@ stdcall -arch=x86_64 VideoPortWriteRegisterUlong(ptr long) +@ stdcall -arch=i386,arm VideoPortWritePortBufferUshort(ptr ptr long) HAL.WRITE_PORT_BUFFER_USHORT +@ stdcall -arch=x86_64 VideoPortWritePortBufferUshort(ptr ptr long) +@ stdcall -arch=i386,arm VideoPortWritePortUchar(ptr long) HAL.WRITE_PORT_UCHAR +@ stdcall -arch=x86_64 VideoPortWritePortUchar(ptr long) +@ stdcall -arch=i386,arm VideoPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG +@ stdcall -arch=x86_64 VideoPortWritePortUlong(ptr long) +@ stdcall -arch=i386,arm VideoPortWritePortUshort(ptr long) HAL.WRITE_PORT_USHORT +@ stdcall -arch=x86_64 VideoPortWritePortUshort(ptr long) @ stdcall -arch=i386,arm VideoPortWriteRegisterBufferUchar(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR @ stdcall -arch=x86_64 VideoPortWriteRegisterBufferUchar(ptr ptr long) -@ stdcall -arch=i386,arm VideoPortWriteRegisterBufferUshort(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT -@ stdcall -arch=x86_64 VideoPortWriteRegisterBufferUshort(ptr ptr long) @ stdcall -arch=i386,arm VideoPortWriteRegisterBufferUlong(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG @ stdcall -arch=x86_64 VideoPortWriteRegisterBufferUlong(ptr ptr long) -@ stdcall VideoPortZeroMemory(ptr long) NTOSKRNL.RtlZeroMemory +@ stdcall -arch=i386,arm VideoPortWriteRegisterBufferUshort(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT +@ stdcall -arch=x86_64 VideoPortWriteRegisterBufferUshort(ptr ptr long) +@ stdcall -arch=i386,arm VideoPortWriteRegisterUchar(ptr long) NTOSKRNL.WRITE_REGISTER_UCHAR +@ stdcall -arch=x86_64 VideoPortWriteRegisterUchar(ptr long) +@ stdcall -arch=i386,arm VideoPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG +@ stdcall -arch=x86_64 VideoPortWriteRegisterUlong(ptr long) +@ stdcall -arch=i386,arm VideoPortWriteRegisterUshort(ptr long) NTOSKRNL.WRITE_REGISTER_USHORT +@ stdcall -arch=x86_64 VideoPortWriteRegisterUshort(ptr long) @ stdcall VideoPortZeroDeviceMemory(ptr long) NTOSKRNL.RtlZeroMemory +@ stdcall VideoPortZeroMemory(ptr long) NTOSKRNL.RtlZeroMemory @ stdcall VpNotifyEaData(ptr ptr) @ stdcall WdDdiWatchdogDpcCallback(ptr ptr ptr ptr)

5 years, 4 months

[reactos] 04/13: [NTOS:EX] Use InterlockedExchangeAdd64 instead of InterlockedCompareExchange64 loop in ExAllocateLocallyUniqueId

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fffe4f6385fed59082ea5… commit fffe4f6385fed59082ea5e1fd3b91b99f848ef3d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jul 12 15:54:52 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 18:04:57 2019 +0200 [NTOS:EX] Use InterlockedExchangeAdd64 instead of InterlockedCompareExchange64 loop in ExAllocateLocallyUniqueId --- ntoskrnl/ex/uuid.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/ntoskrnl/ex/uuid.c b/ntoskrnl/ex/uuid.c index 4d3c2932bce..8af4776d0b1 100644 --- a/ntoskrnl/ex/uuid.c +++ b/ntoskrnl/ex/uuid.c @@ -339,27 +339,9 @@ VOID NTAPI ExAllocateLocallyUniqueId(OUT LUID *LocallyUniqueId) { - LARGE_INTEGER PrevLuid; - LONGLONG NewLuid, CompLuid; - /* Atomically increment the luid */ - PrevLuid.QuadPart = ExpLuid.QuadPart; - for (NewLuid = ExpLuid.QuadPart + ExpLuidIncrement; ; - NewLuid = PrevLuid.QuadPart + ExpLuidIncrement) - { - CompLuid = InterlockedCompareExchange64(&ExpLuid.QuadPart, - NewLuid, - PrevLuid.QuadPart); - if (CompLuid == PrevLuid.QuadPart) - { - break; - } - - PrevLuid.QuadPart = CompLuid; - } - - LocallyUniqueId->LowPart = PrevLuid.LowPart; - LocallyUniqueId->HighPart = PrevLuid.HighPart; + *(LONG64*)LocallyUniqueId = InterlockedExchangeAdd64(&ExpLuid.QuadPart, + ExpLuidIncrement); }

5 years, 4 months

[reactos] 03/13: [WIN32K] InitVideo() should return NTSTATUS, so return STATUS_SUCCESS instead of 1

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21c9f2a48811afa5acb37… commit 21c9f2a48811afa5acb37424e70daee5c8f4e01a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 11 21:53:03 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 18:04:57 2019 +0200 [WIN32K] InitVideo() should return NTSTATUS, so return STATUS_SUCCESS instead of 1 --- win32ss/user/ntuser/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c index 19264d613b0..20bbdfceacb 100644 --- a/win32ss/user/ntuser/display.c +++ b/win32ss/user/ntuser/display.c @@ -282,7 +282,7 @@ InitVideo(VOID) InitSysParams(); - return 1; + return STATUS_SUCCESS; } NTSTATUS

5 years, 4 months

[reactos] 02/13: [NTOS:IO] Improve an alignment

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e50873376d9139496203e… commit e50873376d9139496203ea2b890c26a186ecbed3 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jan 4 18:29:24 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 18:04:57 2019 +0200 [NTOS:IO] Improve an alignment --- ntoskrnl/io/iomgr/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/device.c b/ntoskrnl/io/iomgr/device.c index 3810dd587c4..56a4bd7e3ed 100644 --- a/ntoskrnl/io/iomgr/device.c +++ b/ntoskrnl/io/iomgr/device.c @@ -1084,7 +1084,8 @@ IoCreateDevice(IN PDRIVER_OBJECT DriverObject, if (DeviceName) ObjectAttributes.Attributes |= OBJ_PERMANENT; /* Align the Extension Size to 8-bytes */ - AlignedDeviceExtensionSize = (DeviceExtensionSize + 7) &~ 7; + AlignedDeviceExtensionSize = ALIGN_UP_BY(DeviceExtensionSize, + MEMORY_ALLOCATION_ALIGNMENT); /* Total Size */ TotalSize = AlignedDeviceExtensionSize +

5 years, 4 months

[reactos] 01/13: [KSUSER] Improve pointer arithmetics

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06e631fafec517ed5ee9d… commit 06e631fafec517ed5ee9da196684be5052b4a311 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Dec 28 18:35:30 2017 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 18:04:57 2019 +0200 [KSUSER] Improve pointer arithmetics --- dll/directx/ksuser/ksuser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/directx/ksuser/ksuser.c b/dll/directx/ksuser/ksuser.c index 12b54e96261..d59a84e8058 100644 --- a/dll/directx/ksuser/ksuser.c +++ b/dll/directx/ksuser/ksuser.c @@ -195,7 +195,7 @@ KsCreatePin(HANDLE FilterHandle, PHANDLE ConnectionHandle) { ULONG BufferSize = sizeof(KSPIN_CONNECT); - PKSDATAFORMAT DataFormat = ((PKSDATAFORMAT) ((ULONG_PTR)Connect + sizeof(KSPIN_CONNECT))); + PKSDATAFORMAT DataFormat = (PKSDATAFORMAT)(Connect + 1); BufferSize += DataFormat->FormatSize;

5 years, 4 months

[reactos] 01/01: [SHELL32] Fix Desktop Properties menu item action (#1833)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=944aba1fcce206af0e1d3… commit 944aba1fcce206af0e1d35187a0df12571dc318b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 15 23:10:06 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 15 23:10:06 2019 +0900 [SHELL32] Fix Desktop Properties menu item action (#1833) 1. Right Click the Desktop. 2. Choose "Properties" menu item. 3. "Properties for Display" dialog must be shown. The parameters of ShellExecuteW were wrong. The execution parameters must be separated from the file parameter. CORE-16299 --- dll/win32/shell32/folders/CDesktopFolder.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/folders/CDesktopFolder.cpp b/dll/win32/shell32/folders/CDesktopFolder.cpp index 4105932915e..277499fbc41 100644 --- a/dll/win32/shell32/folders/CDesktopFolder.cpp +++ b/dll/win32/shell32/folders/CDesktopFolder.cpp @@ -845,8 +845,11 @@ HRESULT WINAPI CDesktopFolder::CallBack(IShellFolder *psf, HWND hwndOwner, IData { if (uMsg == DFM_INVOKECOMMAND && wParam == 0) { - if (32 >= (UINT_PTR)ShellExecuteW(hwndOwner, L"open", L"rundll32.exe shell32.dll,Control_RunDLL desk.cpl", NULL, NULL, SW_SHOWNORMAL)) + if (32 >= (UINT_PTR)ShellExecuteW(hwndOwner, L"open", L"rundll32.exe", + L"shell32.dll,Control_RunDLL desk.cpl", NULL, SW_SHOWNORMAL)) + { return E_FAIL; + } return S_OK; } else if (uMsg == DFM_MERGECONTEXTMENU)

5 years, 4 months

[reactos] 01/01: [KERNEL32] implement CreateSemaphoreExW/A and adjust macroses for it

by Denis Malikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=18a9993d69b142cfd8da5… commit 18a9993d69b142cfd8da51862a19e3dca4763187 Author: Denis Malikov <filedem(a)gmail.com> AuthorDate: Sun Nov 18 23:51:20 2018 +0700 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 15 15:50:59 2019 +0200 [KERNEL32] implement CreateSemaphoreExW/A and adjust macroses for it --- dll/win32/kernel32/client/job.c | 2 +- dll/win32/kernel32/client/synch.c | 62 ++++++++++++++++++++++++++++++++++--- dll/win32/kernel32/include/base_x.h | 9 ++---- dll/win32/kernel32/kernel32.spec | 4 +-- 4 files changed, 63 insertions(+), 14 deletions(-) diff --git a/dll/win32/kernel32/client/job.c b/dll/win32/kernel32/client/job.c index a15944b4234..c40f7fc6654 100644 --- a/dll/win32/kernel32/client/job.c +++ b/dll/win32/kernel32/client/job.c @@ -39,7 +39,7 @@ CreateJobObjectW(IN LPSECURITY_ATTRIBUTES lpJobAttributes, IN LPCWSTR lpName) { /* Create the NT object */ - CreateNtObjectFromWin32Api(JobObject, JobObject, JOB_OBJECT, lpJobAttributes, lpName); + CreateNtObjectFromWin32Api(JobObject, JobObject, JOB_OBJECT_ALL_ACCESS, lpJobAttributes, lpName); } /* diff --git a/dll/win32/kernel32/client/synch.c b/dll/win32/kernel32/client/synch.c index 267950fcc1f..f7df2f710a2 100644 --- a/dll/win32/kernel32/client/synch.c +++ b/dll/win32/kernel32/client/synch.c @@ -332,7 +332,7 @@ CreateWaitableTimerW(IN LPSECURITY_ATTRIBUTES lpTimerAttributes OPTIONAL, IN BOOL bManualReset, IN LPCWSTR lpTimerName OPTIONAL) { - CreateNtObjectFromWin32Api(WaitableTimer, Timer, TIMER, + CreateNtObjectFromWin32Api(WaitableTimer, Timer, TIMER_ALL_ACCESS, lpTimerAttributes, lpTimerName, bManualReset ? NotificationTimer : SynchronizationTimer); @@ -446,13 +446,67 @@ CreateSemaphoreW(IN LPSECURITY_ATTRIBUTES lpSemaphoreAttributes OPTIONAL, IN LONG lMaximumCount, IN LPCWSTR lpName OPTIONAL) { - CreateNtObjectFromWin32Api(Semaphore, Semaphore, SEMAPHORE, + CreateNtObjectFromWin32Api(Semaphore, Semaphore, SEMAPHORE_ALL_ACCESS, lpSemaphoreAttributes, lpName, lInitialCount, lMaximumCount); } +HANDLE +WINAPI +DECLSPEC_HOTPATCH +CreateSemaphoreExW(IN LPSECURITY_ATTRIBUTES lpSemaphoreAttributes OPTIONAL, + IN LONG lInitialCount, + IN LONG lMaximumCount, + IN LPCWSTR lpName OPTIONAL, + IN DWORD dwFlags OPTIONAL, + IN DWORD dwDesiredAccess OPTIONAL) +{ + CreateNtObjectFromWin32Api(Semaphore, Semaphore, dwDesiredAccess, + lpSemaphoreAttributes, + lpName, + lInitialCount, + lMaximumCount); +} + +HANDLE +WINAPI +DECLSPEC_HOTPATCH +CreateSemaphoreExA(IN LPSECURITY_ATTRIBUTES lpSemaphoreAttributes OPTIONAL, + IN LONG lInitialCount, + IN LONG lMaximumCount, + IN LPCSTR lpName OPTIONAL, + IN DWORD dwFlags OPTIONAL, + IN DWORD dwDesiredAccess OPTIONAL) +{ + ConvertAnsiToUnicodePrologue + + if (!lpName) + { + return CreateSemaphoreExW(lpSemaphoreAttributes, + lInitialCount, + lMaximumCount, + NULL, + dwFlags, + dwDesiredAccess); + } + + ConvertAnsiToUnicodeBody(lpName) + + if (NT_SUCCESS(Status)) + { + return CreateSemaphoreExW(lpSemaphoreAttributes, + lInitialCount, + lMaximumCount, + UnicodeCache->Buffer, + dwFlags, + dwDesiredAccess); + } + + ConvertAnsiToUnicodeEpilogue +} + /* * @implemented */ @@ -523,7 +577,7 @@ CreateMutexW(IN LPSECURITY_ATTRIBUTES lpMutexAttributes OPTIONAL, IN BOOL bInitialOwner, IN LPCWSTR lpName OPTIONAL) { - CreateNtObjectFromWin32Api(Mutex, Mutant, MUTEX, + CreateNtObjectFromWin32Api(Mutex, Mutant, MUTEX_ALL_ACCESS, lpMutexAttributes, lpName, bInitialOwner); @@ -599,7 +653,7 @@ CreateEventW(IN LPSECURITY_ATTRIBUTES lpEventAttributes OPTIONAL, IN BOOL bInitialState, IN LPCWSTR lpName OPTIONAL) { - CreateNtObjectFromWin32Api(Event, Event, EVENT, + CreateNtObjectFromWin32Api(Event, Event, EVENT_ALL_ACCESS, lpEventAttributes, lpName, bManualReset ? NotificationEvent : SynchronizationEvent, diff --git a/dll/win32/kernel32/include/base_x.h b/dll/win32/kernel32/include/base_x.h index 4db8186f654..7b54bbdd9a2 100644 --- a/dll/win32/kernel32/include/base_x.h +++ b/dll/win32/kernel32/include/base_x.h @@ -132,14 +132,9 @@ // This macro uses the CreateNtObjectFromWin32Api macros from above to create an // NT object based on the Win32 API settings. // -// Note that it is hardcoded to always use XXX_ALL_ACCESS permissions, which is -// the behavior up until Vista. When/if the target moves to Vista, the macro can -// be improved to support caller-specified access masks, as the underlying macro -// above does support this. -// -#define CreateNtObjectFromWin32Api(obj, ntobj, capsobj, sec, name, ...) \ +#define CreateNtObjectFromWin32Api(obj, ntobj, access, sec, name, ...) \ CreateNtObjectFromWin32ApiPrologue \ - CreateNtObjectFromWin32ApiBody(ntobj, sec, name, capsobj##_ALL_ACCESS, ##__VA_ARGS__); \ + CreateNtObjectFromWin32ApiBody(ntobj, sec, name, access, ##__VA_ARGS__); \ CreateNtObjectFromWin32ApiEpilogue // diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index 6e1506985c0..36122395322 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -158,8 +158,8 @@ @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) @ stdcall CreateSemaphoreA(ptr long long str) -@ stdcall -stub -version=0x600+ CreateSemaphoreExA(ptr long long str long long) -@ stdcall -stub -version=0x600+ CreateSemaphoreExW(ptr long long wstr long long) +@ stdcall -version=0x600+ CreateSemaphoreExA(ptr long long str long long) +@ stdcall -version=0x600+ CreateSemaphoreExW(ptr long long wstr long long) @ stdcall CreateSemaphoreW(ptr long long wstr) @ stdcall -i386 CreateSocketHandle() @ stdcall -version=0x600+ CreateSymbolicLinkA(str str long)

5 years, 4 months

[reactos] 01/01: [KERNEL32] Partially fix dll/win32/kernel32/client/vista.c compilation as NT6

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40ab30d6a0b6fccdf2aa4… commit 40ab30d6a0b6fccdf2aa4f55b674f74b5f4e5592 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Aug 15 15:42:34 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 15 15:42:34 2019 +0200 [KERNEL32] Partially fix dll/win32/kernel32/client/vista.c compilation as NT6 CORE-12596 --- dll/win32/kernel32/client/vista.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/kernel32/client/vista.c b/dll/win32/kernel32/client/vista.c index d56c7ae7a62..8fa60a995cd 100644 --- a/dll/win32/kernel32/client/vista.c +++ b/dll/win32/kernel32/client/vista.c @@ -39,7 +39,8 @@ SleepConditionVariableCS(IN OUT PCONDITION_VARIABLE ConditionVariable, IN OUT PCRITICAL_SECTION CriticalSection, IN DWORD dwMilliseconds) { - NTSTATUS Status = 0; + NTSTATUS Status = STATUS_SUCCESS; +#if 0 LARGE_INTEGER TimeOut; PLARGE_INTEGER TimeOutPtr = NULL; @@ -49,7 +50,6 @@ SleepConditionVariableCS(IN OUT PCONDITION_VARIABLE ConditionVariable, TimeOutPtr = &TimeOut; } -#if 0 Status = RtlSleepConditionVariableCS((PRTL_CONDITION_VARIABLE)ConditionVariable, (PRTL_CRITICAL_SECTION)CriticalSection, TimeOutPtr); @@ -74,7 +74,8 @@ SleepConditionVariableSRW(IN OUT PCONDITION_VARIABLE ConditionVariable, IN DWORD dwMilliseconds, IN ULONG Flags) { - NTSTATUS Status = 0; + NTSTATUS Status = STATUS_SUCCESS; +#if 0 LARGE_INTEGER TimeOut; PLARGE_INTEGER TimeOutPtr = NULL; @@ -84,7 +85,6 @@ SleepConditionVariableSRW(IN OUT PCONDITION_VARIABLE ConditionVariable, TimeOutPtr = &TimeOut; } -#if 0 Status = RtlSleepConditionVariableSRW((PRTL_CONDITION_VARIABLE)ConditionVariable, (PRTL_SRWLOCK)SRWLock, TimeOutPtr,

5 years, 4 months

[reactos] 02/02: [3RDPARTY] Suppress MSVC printf format warnings in 3rd-party code

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad89837c0eeacbc20326b… commit ad89837c0eeacbc20326b7c4b588d2bf59718dee Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 20 17:34:24 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 15:24:12 2019 +0200 [3RDPARTY] Suppress MSVC printf format warnings in 3rd-party code --- base/applications/wordpad/CMakeLists.txt | 5 +++++ base/services/nfsd/CMakeLists.txt | 5 +++++ dll/3rdparty/libtirpc/CMakeLists.txt | 3 +++ dll/win32/atl/CMakeLists.txt | 5 +++++ dll/win32/comctl32/CMakeLists.txt | 5 +++++ dll/win32/dbghelp/CMakeLists.txt | 5 +++++ modules/rostests/winetests/kernel32/CMakeLists.txt | 5 +++++ modules/rostests/winetests/msvcrt/CMakeLists.txt | 5 +++++ modules/rostests/winetests/oleacc/CMakeLists.txt | 5 +++++ modules/rostests/winetests/user32/CMakeLists.txt | 5 +++++ 10 files changed, 48 insertions(+) diff --git a/base/applications/wordpad/CMakeLists.txt b/base/applications/wordpad/CMakeLists.txt index 652ca7cbdc5..80d9117a270 100644 --- a/base/applications/wordpad/CMakeLists.txt +++ b/base/applications/wordpad/CMakeLists.txt @@ -4,6 +4,11 @@ remove_definitions(-D_WIN32_IE=0x600) add_definitions(-D__ROS_LONG64__) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +if (MSVC) + # Disable warning C4477 (printf format warnings) + add_compile_flags("/wd4477") +endif() + list(APPEND SOURCE olecallback.c print.c diff --git a/base/services/nfsd/CMakeLists.txt b/base/services/nfsd/CMakeLists.txt index 3ab680be23e..f0451522686 100644 --- a/base/services/nfsd/CMakeLists.txt +++ b/base/services/nfsd/CMakeLists.txt @@ -7,6 +7,11 @@ include_directories( ${REACTOS_SOURCE_DIR}/drivers/filesystems/nfs ${REACTOS_SOURCE_DIR}/dll/np/nfs) +if (MSVC) + # Disable warning C4477 (printf format warnings) + add_compile_flags("/wd4477") +endif() + list(APPEND SOURCE acl.c callback_server.c diff --git a/dll/3rdparty/libtirpc/CMakeLists.txt b/dll/3rdparty/libtirpc/CMakeLists.txt index dd636c99289..1cadd650861 100644 --- a/dll/3rdparty/libtirpc/CMakeLists.txt +++ b/dll/3rdparty/libtirpc/CMakeLists.txt @@ -9,6 +9,9 @@ include_directories(${REACTOS_SOURCE_DIR}/dll/3rdparty/libtirpc/tirpc) if(MSVC) # error C4133: '=': incompatible types - from 'char *' to 'int32_t *' replace_compile_flags("/we4133" " ") + + # Disable warning C4477 (printf format warnings) + add_compile_flags("/wd4313") endif() list(APPEND SOURCE diff --git a/dll/win32/atl/CMakeLists.txt b/dll/win32/atl/CMakeLists.txt index 475ebab24ff..ac492112eeb 100644 --- a/dll/win32/atl/CMakeLists.txt +++ b/dll/win32/atl/CMakeLists.txt @@ -9,6 +9,11 @@ add_definitions( include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(atl.dll atl.spec ADD_IMPORTLIB) +if(MSVC) + # Disable warning C4477 (printf format warnings) + add_compile_flags("/wd4477") +endif() + list(APPEND SOURCE atl.c atl30.c diff --git a/dll/win32/comctl32/CMakeLists.txt b/dll/win32/comctl32/CMakeLists.txt index 8c05f33e6e1..f6f22daa569 100644 --- a/dll/win32/comctl32/CMakeLists.txt +++ b/dll/win32/comctl32/CMakeLists.txt @@ -10,6 +10,11 @@ add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(comctl32.dll comctl32.spec ADD_IMPORTLIB) +if(MSVC) + # Disable warning C4477 (printf format warnings) + add_compile_flags("/wd4477") +endif() + list(APPEND SOURCE animate.c button.c diff --git a/dll/win32/dbghelp/CMakeLists.txt b/dll/win32/dbghelp/CMakeLists.txt index 27b44e32cae..319d38c0e80 100644 --- a/dll/win32/dbghelp/CMakeLists.txt +++ b/dll/win32/dbghelp/CMakeLists.txt @@ -1,4 +1,9 @@ +if(MSVC) + # Disable warning C4477 (printf format warnings) + add_compile_flags("/wd4477") +endif() + if(NOT CMAKE_CROSSCOMPILING) add_definitions(-DDBGHELP_STATIC_LIB) diff --git a/modules/rostests/winetests/kernel32/CMakeLists.txt b/modules/rostests/winetests/kernel32/CMakeLists.txt index a33f10d99a1..619e4407720 100644 --- a/modules/rostests/winetests/kernel32/CMakeLists.txt +++ b/modules/rostests/winetests/kernel32/CMakeLists.txt @@ -3,6 +3,11 @@ include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) add_definitions(-DWINVER=0x600 -D_WIN32_WINNT=0x601) +if(MSVC) + # Disable warning C4477 (printf format warnings) + add_compile_flags("/wd4477") +endif() + list(APPEND SOURCE actctx.c atom.c diff --git a/modules/rostests/winetests/msvcrt/CMakeLists.txt b/modules/rostests/winetests/msvcrt/CMakeLists.txt index c456d9c0038..359fb2aa674 100644 --- a/modules/rostests/winetests/msvcrt/CMakeLists.txt +++ b/modules/rostests/winetests/msvcrt/CMakeLists.txt @@ -4,6 +4,11 @@ add_definitions( -D_CRT_NONSTDC_NO_DEPRECATE -D__msvcrt_ulong=ULONG) +if(MSVC) + # Disable warning C4477 (printf format warnings) + add_compile_flags("/wd4477") +endif() + list(APPEND SOURCE cpp.c data.c diff --git a/modules/rostests/winetests/oleacc/CMakeLists.txt b/modules/rostests/winetests/oleacc/CMakeLists.txt index 31181220aca..5e645917efe 100644 --- a/modules/rostests/winetests/oleacc/CMakeLists.txt +++ b/modules/rostests/winetests/oleacc/CMakeLists.txt @@ -1,4 +1,9 @@ +if(MSVC) + # Disable warning C4477 (printf format warnings) + add_compile_flags("/wd4477") +endif() + add_executable(oleacc_winetest main.c testlist.c) set_module_type(oleacc_winetest win32cui) target_link_libraries(oleacc_winetest uuid) diff --git a/modules/rostests/winetests/user32/CMakeLists.txt b/modules/rostests/winetests/user32/CMakeLists.txt index fc73d16b5fc..8c6f769c95f 100644 --- a/modules/rostests/winetests/user32/CMakeLists.txt +++ b/modules/rostests/winetests/user32/CMakeLists.txt @@ -2,6 +2,11 @@ remove_definitions(-DWINVER=0x502 -D_WIN32_WINNT=0x502) add_definitions(-DWINVER=0x600 -D_WIN32_WINNT=0x600) +if(MSVC) + # Disable warning C4477 (printf format warnings) + add_compile_flags("/wd4477") +endif() + list(APPEND SOURCE broadcast.c class.c

5 years, 4 months

← Newer
1
...
14
15
16
17
18
19
20
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2019