Ros-diffs March 2019

ros-diffs@reactos.org

36 participants
217 discussions

[reactos] 01/01: [BOOTDATA] Comment out (but still keep it for documentation purposes only) the overridden default user shell, since we use by default the one specified in HKLM Winlogon key. If people want to override it for a given user, or at a global level, they can do it later.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dbb69cb2d940278910a40… commit dbb69cb2d940278910a40d1228389a7a1fd1aea8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 5 22:33:35 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Mar 5 22:33:35 2019 +0100 [BOOTDATA] Comment out (but still keep it for documentation purposes only) the overridden default user shell, since we use by default the one specified in HKLM Winlogon key. If people want to override it for a given user, or at a global level, they can do it later. See CORE-15807 --- boot/bootdata/hivedef.inf | 4 ++-- boot/bootdata/hivesft.inf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index b9411a27cc..844ba9c7d3 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -1893,9 +1893,9 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","HideFileExt" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","StartMenuLogoff",0x00010003,0x00000001 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","Hidden",0x00010003,1 -; default shell +; Default shell for the current user (overrides the defaults from the HKLM Winlogon sub-key) HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x00000012 -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" +;HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run",,0x00000012 diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index efd5c0833e..ba5b3919e1 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -1467,7 +1467,7 @@ HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FATX",0x00000000,"ufatx.dll" HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","EXT2",0x00000000,"uext2.dll" HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","BtrFS",0x00000000,"ubtrfs.dll" -; Winlogon settings +; Global Winlogon settings HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe"

5 years, 9 months

[reactos] 14/14: [REACTOS] Fix 64 bit issues

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5f6ea2965e26cb28aa07… commit f5f6ea2965e26cb28aa0743b93ce1ec43c827774 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 6 23:14:09 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Mar 4 21:58:42 2019 +0100 [REACTOS] Fix 64 bit issues --- dll/win32/advapi32/service/sctrl.c | 6 +++--- dll/win32/windowscodecs/typeof.h | 6 ++++-- drivers/network/tcpip/tcpip/ninfo.c | 4 ++-- sdk/include/psdk/imagehlp.h | 6 ++++++ sdk/lib/atl/atlbase.h | 2 +- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dll/win32/advapi32/service/sctrl.c b/dll/win32/advapi32/service/sctrl.c index ec5a4cc4bf..68ec2a6ac6 100644 --- a/dll/win32/advapi32/service/sctrl.c +++ b/dll/win32/advapi32/service/sctrl.c @@ -174,7 +174,7 @@ ScServiceMainStubA(LPVOID Context) /* Set service tag */ Teb = NtCurrentTeb(); - Teb->SubProcessTag = (PVOID)ThreadParams->dwServiceTag; + Teb->SubProcessTag = UlongToPtr(ThreadParams->dwServiceTag); /* Call the main service routine and free the arguments vector */ (ThreadParams->lpServiceMain)(ThreadParams->dwArgCount, @@ -203,7 +203,7 @@ ScServiceMainStubW(LPVOID Context) /* Set service tag */ Teb = NtCurrentTeb(); - Teb->SubProcessTag = (PVOID)ThreadParams->dwServiceTag; + Teb->SubProcessTag = UlongToPtr(ThreadParams->dwServiceTag); /* Call the main service routine and free the arguments vector */ (ThreadParams->lpServiceMain)(ThreadParams->dwArgCount, @@ -552,7 +552,7 @@ ScControlService(PACTIVE_SERVICE lpService, TRACE("Service: %S\n", (PWSTR)((ULONG_PTR)ControlPacket + ControlPacket->dwServiceNameOffset)); /* Set service tag */ - NtCurrentTeb()->SubProcessTag = (PVOID)lpService->dwServiceTag; + NtCurrentTeb()->SubProcessTag = UlongToPtr(lpService->dwServiceTag); if (lpService->HandlerFunction) { diff --git a/dll/win32/windowscodecs/typeof.h b/dll/win32/windowscodecs/typeof.h index 12e6b8bcc4..b20434b7cc 100644 --- a/dll/win32/windowscodecs/typeof.h +++ b/dll/win32/windowscodecs/typeof.h @@ -1,9 +1,11 @@ #define typeof(X_) __typeof_ ## X_ #ifdef _WIN64 +#define __typeof_uintptr unsigned long long #define __typeof_intptr long long #define __typeof_longptr long long #else +#define __typeof_uintptr unsigned int #define __typeof_intptr int #define __typeof_longptr long #endif @@ -38,7 +40,7 @@ typedef void (__cdecl typeof(jpeg_set_defaults))(struct jpeg_compress_struct *); typedef unsigned int (__cdecl typeof(jpeg_write_scanlines))(struct jpeg_compress_struct *, char **, unsigned int); typedef void (*png_error_ptr_1)(struct png_struct_def *, const char *); -typedef void (*png_rw_ptr_1)(struct png_struct_def *, unsigned char *, unsigned int); +typedef void (*png_rw_ptr_1)(struct png_struct_def *, unsigned char *, __typeof_uintptr); typedef void (*png_flush_ptr_1)(struct png_struct_def *); typedef struct png_info_def* (__cdecl typeof(png_create_info_struct))(struct png_struct_def *); typedef struct png_struct_def * (__cdecl typeof(png_create_read_struct))(const char *, void *, png_error_ptr_1, png_error_ptr_1); @@ -80,7 +82,7 @@ typedef void (__cdecl typeof(png_set_PLTE))(struct png_struct_def *, struct png_ typedef void (__cdecl typeof(png_set_tRNS))(struct png_struct_def *, struct png_info_def *, const unsigned char *, int, const struct png_color_16_struct *); typedef void (__cdecl typeof(png_set_filter))(struct png_struct_def *, int, int); typedef void *thandle_t_1; -typedef int (*TIFFReadWriteProc_1)(thandle_t_1, void *, __typeof_intptr); +typedef __typeof_intptr (*TIFFReadWriteProc_1)(thandle_t_1, void *, __typeof_intptr); typedef unsigned int (*TIFFSeekProc_1)(void *, unsigned int, int); typedef int (*TIFFCloseProc_1)(thandle_t_1); typedef unsigned int (*TIFFSizeProc_1)(thandle_t_1); diff --git a/drivers/network/tcpip/tcpip/ninfo.c b/drivers/network/tcpip/tcpip/ninfo.c index 5c0952b033..30a59480a2 100644 --- a/drivers/network/tcpip/tcpip/ninfo.c +++ b/drivers/network/tcpip/tcpip/ninfo.c @@ -203,7 +203,7 @@ TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile, Size = sizeof(MIB_TCPROW); } - TcpRow.dwOwningPid = (DWORD)AddrFile->ProcessId; + TcpRow.dwOwningPid = HandleToUlong(AddrFile->ProcessId); TcpRow.liCreateTimestamp = AddrFile->CreationTime; if (AddrFile->Listener != NULL) @@ -290,7 +290,7 @@ TDI_STATUS InfoTdiQueryGetConnectionUdpTable(PADDRESS_FILE AddrFile, UdpRow.dwLocalAddr = AddrFile->Address.Address.IPv4Address; UdpRow.dwLocalPort = AddrFile->Port; - UdpRow.dwOwningPid = (DWORD)AddrFile->ProcessId; + UdpRow.dwOwningPid = HandleToUlong(AddrFile->ProcessId); UdpRow.liCreateTimestamp = AddrFile->CreationTime; UdpRow.dwFlags = 0; /* FIXME */ if (Class == TcpUdpClassOwner) diff --git a/sdk/include/psdk/imagehlp.h b/sdk/include/psdk/imagehlp.h index bed6492d6b..99227b2435 100644 --- a/sdk/include/psdk/imagehlp.h +++ b/sdk/include/psdk/imagehlp.h @@ -18,6 +18,12 @@ #ifndef _IMAGEHLP_H #define _IMAGEHLP_H +#ifdef _WIN64 +#ifndef _IMAGEHLP64 +#define _IMAGEHLP64 +#endif +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/sdk/lib/atl/atlbase.h b/sdk/lib/atl/atlbase.h index d327aadf4d..598abc3f3d 100644 --- a/sdk/lib/atl/atlbase.h +++ b/sdk/lib/atl/atlbase.h @@ -1231,7 +1231,7 @@ public: LONG SetStringValue(LPCTSTR pszValueName, LPCTSTR pszValue, DWORD dwType = REG_SZ) throw() { - ULONG length; + SIZE_T length; switch (dwType) { case REG_SZ:

5 years, 9 months

[reactos] 13/14: [LIBTIRPC] Silence MSVC warnings

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d3377a5c021899557bd0… commit 3d3377a5c021899557bd015b09ca8aae9816c075 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jan 5 12:06:17 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Mar 4 21:58:42 2019 +0100 [LIBTIRPC] Silence MSVC warnings --- dll/3rdparty/libtirpc/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/3rdparty/libtirpc/CMakeLists.txt b/dll/3rdparty/libtirpc/CMakeLists.txt index aaa4ac036c..46714d6d71 100644 --- a/dll/3rdparty/libtirpc/CMakeLists.txt +++ b/dll/3rdparty/libtirpc/CMakeLists.txt @@ -2,7 +2,7 @@ spec2def(libtirpc.dll libtirpc/libtirpc.spec ADD_IMPORTLIB) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_definitions(-DUNICODE -D_WIN32 -DPORTMAP -Dstrdup=_strdup) +add_definitions(-DUNICODE -D_WIN32 -DPORTMAP -Dstrdup=_strdup -D_CRT_NONSTDC_NO_DEPRECATE=1) include_directories(${REACTOS_SOURCE_DIR}/dll/3rdparty/libtirpc/tirpc) @@ -94,6 +94,7 @@ add_library(libtirpc SHARED ${CMAKE_CURRENT_BINARY_DIR}/libtirpc.def) if(MSVC AND (NOT USE_CLANG_CL)) + add_target_compile_flags(libtirpc "/wd4101 /wd4133 /wd4473 /wd4477") else() # FIXME: Tons of warnings. add_target_compile_flags(libtirpc "-w")

5 years, 9 months

[reactos] 12/14: [GDI32] Add casts to silence warnings on x64

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7dabd235ec1ac0ae9dfb2… commit 7dabd235ec1ac0ae9dfb2a1b0e78cef2216bc987 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 13 15:29:13 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Mar 4 21:58:42 2019 +0100 [GDI32] Add casts to silence warnings on x64 The cast is required, because FARPROC is only compatible with function pointer types that return INT_PTR and the ones used return int/BOOL. --- win32ss/gdi/gdi32/misc/wingl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/win32ss/gdi/gdi32/misc/wingl.c b/win32ss/gdi/gdi32/misc/wingl.c index 13fee27278..3e993443f9 100644 --- a/win32ss/gdi/gdi32/misc/wingl.c +++ b/win32ss/gdi/gdi32/misc/wingl.c @@ -84,20 +84,20 @@ static BOOL OpenGLEnable(void) thread-safe */ } - - if (!OpenGLInitFunction("wglChoosePixelFormat", &glChoosePixelFormat)) + /* The cast is required on x64, because FARPROC has INT_PTR sized return */ + if (!OpenGLInitFunction("wglChoosePixelFormat", (FARPROC*)&glChoosePixelFormat)) Ret = FALSE; - if (!OpenGLInitFunction("wglSetPixelFormat", &glSetPixelFormat)) + if (!OpenGLInitFunction("wglSetPixelFormat", (FARPROC*)&glSetPixelFormat)) Ret = FALSE; - if (!OpenGLInitFunction("wglSwapBuffers", &glSwapBuffers)) + if (!OpenGLInitFunction("wglSwapBuffers", (FARPROC*)&glSwapBuffers)) Ret = FALSE; - if (!OpenGLInitFunction("wglDescribePixelFormat", &glDescribePixelFormat)) + if (!OpenGLInitFunction("wglDescribePixelFormat", (FARPROC*)&glDescribePixelFormat)) Ret = FALSE; - if (!OpenGLInitFunction("wglGetPixelFormat", &glGetPixelFormat)) + if (!OpenGLInitFunction("wglGetPixelFormat", (FARPROC*)&glGetPixelFormat)) Ret = FALSE; return Ret;

5 years, 9 months

[reactos] 11/14: [GDI32] Fix bDDCreateSurface

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=711dbd19f7ea9d51c2a0b… commit 711dbd19f7ea9d51c2a0bf52ae5bf9d2fa23f32d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 13 15:09:57 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Mar 4 21:58:42 2019 +0100 [GDI32] Fix bDDCreateSurface --- win32ss/gdi/gdi32/misc/gdientry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/gdi/gdi32/misc/gdientry.c b/win32ss/gdi/gdi32/misc/gdientry.c index 61943bfa5b..dffa8ab63f 100644 --- a/win32ss/gdi/gdi32/misc/gdientry.c +++ b/win32ss/gdi/gdi32/misc/gdientry.c @@ -1409,7 +1409,7 @@ bDDCreateSurface(LPDDRAWI_DDRAWSURFACE_LCL pSurface, RtlMoveMemory(&SurfaceMore.ddsCapsEx, &pSurface->ddckCKDestBlt, sizeof(DDSCAPSEX)); - SurfaceMore.dwSurfaceHandle = (DWORD)pSurface->dbnOverlayNode.object_int->lpVtbl; + SurfaceMore.dwSurfaceHandle = pSurface->lpSurfMore->dwSurfaceHandle; /* Set up SurfaceGlobal struct */ SurfaceGlobal.fpVidMem = pSurface->lpGbl->fpVidMem;

5 years, 9 months

[reactos] 10/14: [DXG] Fix 64 bit build

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2620930066713461f9e92… commit 2620930066713461f9e9225febc17a29d4ae9933 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 6 23:41:52 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Mar 4 21:58:42 2019 +0100 [DXG] Fix 64 bit build --- win32ss/reactx/dxg/main.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/win32ss/reactx/dxg/main.c b/win32ss/reactx/dxg/main.c index cba89cb604..7bcd329b9e 100644 --- a/win32ss/reactx/dxg/main.c +++ b/win32ss/reactx/dxg/main.c @@ -40,9 +40,7 @@ DxDdStartupDxGraphics (ULONG SizeEngDrv, { PDRVFN drv_func; - ULONG peng_funcs; - PULONG peng_func; - + PFN *peng_funcs; UINT i; /* Test see if the data is vaild we got from win32k.sys */ @@ -75,9 +73,9 @@ DxDdStartupDxGraphics (ULONG SizeEngDrv, * and if it really are exported */ - peng_funcs = (ULONG)&gpEngFuncs; + peng_funcs = (PFN*)&gpEngFuncs; - for (i=1 ; i < DXENG_INDEX_DxEngLoadImage + 1; i++) + for (i = 1; i < DXENG_INDEX_DxEngLoadImage + 1; i++) { drv_func = &pDxEngDrv->pdrvfn[i]; @@ -86,8 +84,8 @@ DxDdStartupDxGraphics (ULONG SizeEngDrv, { return STATUS_INTERNAL_ERROR; } - peng_func = (PULONG)(peng_funcs+(i * sizeof(ULONG))); - *peng_func = (ULONG)drv_func->pfn; + + peng_funcs[i] = drv_func->pfn; } /* Note 12/1-2004 : Why is this set to 0x618 */

5 years, 9 months

[reactos] 09/14: [VGA_NEW] Fix 64 bit issues

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72e43c4b3374e0df6197b… commit 72e43c4b3374e0df6197b90c891b670cc306af2d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 13 15:56:23 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Mar 4 21:58:42 2019 +0100 [VGA_NEW] Fix 64 bit issues --- win32ss/drivers/miniport/vga_new/modeset.c | 18 +++++++++--------- win32ss/drivers/miniport/vga_new/vga.c | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/win32ss/drivers/miniport/vga_new/modeset.c b/win32ss/drivers/miniport/vga_new/modeset.c index 4df1004b87..2466edc702 100644 --- a/win32ss/drivers/miniport/vga_new/modeset.c +++ b/win32ss/drivers/miniport/vga_new/modeset.c @@ -33,7 +33,7 @@ VgaQueryAvailableModes( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE_INFORMATION ModeInformation, ULONG ModeInformationSize, - PULONG OutputSize + PULONG_PTR OutputSize ); VP_STATUS @@ -42,7 +42,7 @@ VgaQueryNumberOfAvailableModes( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_NUM_MODES NumModes, ULONG NumModesSize, - PULONG OutputSize + PULONG_PTR OutputSize ); VP_STATUS @@ -51,7 +51,7 @@ VgaQueryCurrentMode( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE_INFORMATION ModeInformation, ULONG ModeInformationSize, - PULONG OutputSize + PULONG_PTR OutputSize ); VOID @@ -99,12 +99,12 @@ Return Value: { ULONG ulCmd; - ULONG ulPort; + ULONG_PTR ulPort; UCHAR jValue; USHORT usValue; ULONG culCount; ULONG ulIndex; - ULONG ulBase; + ULONG_PTR ulBase; if (pusCmdStream == NULL) { @@ -112,7 +112,7 @@ Return Value: return TRUE; } - ulBase = (ULONG)HwDeviceExtension->IOAddress; + ulBase = (ULONG_PTR)HwDeviceExtension->IOAddress; // // Now set the adapter to the desired mode. @@ -518,7 +518,7 @@ VgaQueryAvailableModes( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE_INFORMATION ModeInformation, ULONG ModeInformationSize, - PULONG OutputSize + PULONG_PTR OutputSize ) /*++ @@ -656,7 +656,7 @@ VgaQueryNumberOfAvailableModes( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_NUM_MODES NumModes, ULONG NumModesSize, - PULONG OutputSize + PULONG_PTR OutputSize ) /*++ @@ -720,7 +720,7 @@ VgaQueryCurrentMode( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE_INFORMATION ModeInformation, ULONG ModeInformationSize, - PULONG OutputSize + PULONG_PTR OutputSize ) /*++ diff --git a/win32ss/drivers/miniport/vga_new/vga.c b/win32ss/drivers/miniport/vga_new/vga.c index 1b07397419..4190625418 100644 --- a/win32ss/drivers/miniport/vga_new/vga.c +++ b/win32ss/drivers/miniport/vga_new/vga.c @@ -53,7 +53,7 @@ VgaQueryAvailableModes( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE_INFORMATION ModeInformation, ULONG ModeInformationSize, - PULONG OutputSize + PULONG_PTR OutputSize ); VP_STATUS @@ -62,7 +62,7 @@ VgaQueryNumberOfAvailableModes( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_NUM_MODES NumModes, ULONG NumModesSize, - PULONG OutputSize + PULONG_PTR OutputSize ); VP_STATUS @@ -71,7 +71,7 @@ VgaQueryCurrentMode( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE_INFORMATION ModeInformation, ULONG ModeInformationSize, - PULONG OutputSize + PULONG_PTR OutputSize ); VP_STATUS

5 years, 9 months

[reactos] 08/14: [SACDRV] Fix CHECK_PARAMETER_WITH_STATUS error handling macro

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=403fec1b272587bba4acd… commit 403fec1b272587bba4acd79fd4d3f591b13b0fc8 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 13 19:23:41 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Mar 4 21:58:42 2019 +0100 [SACDRV] Fix CHECK_PARAMETER_WITH_STATUS error handling macro --- drivers/sac/driver/sacdrv.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/sac/driver/sacdrv.h b/drivers/sac/driver/sacdrv.h index 602afd05ed..0280b6c9d1 100644 --- a/drivers/sac/driver/sacdrv.h +++ b/drivers/sac/driver/sacdrv.h @@ -44,10 +44,9 @@ // // SAC Parameter Checking Macros // -#define CHECK_PARAMETER_WITH_STATUS(Parameter, Status) \ +#define CHECK_PARAMETER_WITH_STATUS(Condition, Status) \ { \ - ASSERT(((PVOID)(Parameter)) != NULL); \ - if (((PVOID)(Parameter)) == NULL) \ + if (!NT_VERIFY(Condition)) \ { \ return Status; \ } \

5 years, 9 months

[reactos] 07/14: [CDROM_NEW] Fix SLIST_ENTRY vs SINGLE_LIST_ENTRY issues

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05f4951b8c2f49b3b0645… commit 05f4951b8c2f49b3b0645f825854c8e6fd34f8a7 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 7 02:59:24 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Mar 4 21:58:42 2019 +0100 [CDROM_NEW] Fix SLIST_ENTRY vs SINGLE_LIST_ENTRY issues --- drivers/storage/class/cdrom_new/cdrom.c | 4 ++-- drivers/storage/class/cdrom_new/mmc.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/storage/class/cdrom_new/cdrom.c b/drivers/storage/class/cdrom_new/cdrom.c index cbf3efb612..e4703e3073 100644 --- a/drivers/storage/class/cdrom_new/cdrom.c +++ b/drivers/storage/class/cdrom_new/cdrom.c @@ -1412,9 +1412,9 @@ CdRomStartIo( // ExInterlockedPushEntrySList(&(cdData->Mmc.DelayedIrps), - (PSINGLE_LIST_ENTRY)&(Irp->Tail.Overlay.DriverContext[0]), + (PSLIST_ENTRY)&(Irp->Tail.Overlay.DriverContext[0]), // ReactOS &(cdData->Mmc.DelayedLock)); - + queueDepth = ExQueryDepthSList(&(cdData->Mmc.DelayedIrps)); if (queueDepth == 1) { diff --git a/drivers/storage/class/cdrom_new/mmc.c b/drivers/storage/class/cdrom_new/mmc.c index 7dcc3614a1..8ea84a89ef 100644 --- a/drivers/storage/class/cdrom_new/mmc.c +++ b/drivers/storage/class/cdrom_new/mmc.c @@ -1233,7 +1233,11 @@ CdRompFlushDelayedList( IN BOOLEAN CalledFromWorkItem ) { +#ifdef __REACTOS__ + PSLIST_ENTRY list; +#else PSINGLE_LIST_ENTRY list; +#endif PIRP irp; // NOTE - REF #0002

5 years, 9 months

[reactos] 06/14: [CLASSPNP] Fix SLIST_ENTRY vs SINGLE_LIST_ENTRY issues

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dfd876a96b8aa57c5a9a3… commit dfd876a96b8aa57c5a9a3abb1a8e3f51cb1dc4a9 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jan 8 05:17:19 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Mar 4 21:58:42 2019 +0100 [CLASSPNP] Fix SLIST_ENTRY vs SINGLE_LIST_ENTRY issues --- drivers/storage/classpnp/class.c | 4 ++-- drivers/storage/classpnp/classp.h | 12 ++++++------ drivers/storage/classpnp/xferpkt.c | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/storage/classpnp/class.c b/drivers/storage/classpnp/class.c index f89fa32d23..a1ff1cf9b9 100644 --- a/drivers/storage/classpnp/class.c +++ b/drivers/storage/classpnp/class.c @@ -2254,8 +2254,8 @@ VOID NTAPI ServiceTransferRequest(PDEVICE_OBJECT Fdo, PIRP Irp) PUCHAR bufPtr = MmGetMdlVirtualAddress(Irp->MdlAddress); LARGE_INTEGER targetLocation = currentSp->Parameters.Read.ByteOffset; PTRANSFER_PACKET pkt; - SINGLE_LIST_ENTRY pktList; - PSINGLE_LIST_ENTRY slistEntry; + SLIST_ENTRY pktList; + PSLIST_ENTRY slistEntry; ULONG numPackets; //KIRQL oldIrql; ULONG i; diff --git a/drivers/storage/classpnp/classp.h b/drivers/storage/classpnp/classp.h index d75882702d..9db575418a 100644 --- a/drivers/storage/classpnp/classp.h +++ b/drivers/storage/classpnp/classp.h @@ -283,8 +283,8 @@ typedef struct _CLASS_ERROR_LOG_DATA { typedef struct _TRANSFER_PACKET { + SLIST_ENTRY SlistEntry; // for when in free list (use fast slist) LIST_ENTRY AllPktsListEntry; // entry in fdoData's static AllTransferPacketsList - SINGLE_LIST_ENTRY SlistEntry; // for when in free list (use fast slist) PIRP Irp; PDEVICE_OBJECT Fdo; @@ -475,25 +475,25 @@ struct _CLASS_PRIVATE_FDO_DATA { /* * Simple singly-linked-list queuing macros, with no synchronization. */ -static inline VOID SimpleInitSlistHdr(SINGLE_LIST_ENTRY *SListHdr) +static inline VOID SimpleInitSlistHdr(SLIST_ENTRY *SListHdr) { SListHdr->Next = NULL; } -static inline VOID SimplePushSlist(SINGLE_LIST_ENTRY *SListHdr, SINGLE_LIST_ENTRY *SListEntry) +static inline VOID SimplePushSlist(SLIST_ENTRY *SListHdr, SLIST_ENTRY *SListEntry) { SListEntry->Next = SListHdr->Next; SListHdr->Next = SListEntry; } -static inline SINGLE_LIST_ENTRY *SimplePopSlist(SINGLE_LIST_ENTRY *SListHdr) +static inline SLIST_ENTRY *SimplePopSlist(SLIST_ENTRY *SListHdr) { - SINGLE_LIST_ENTRY *sListEntry = SListHdr->Next; + SLIST_ENTRY *sListEntry = SListHdr->Next; if (sListEntry){ SListHdr->Next = sListEntry->Next; sListEntry->Next = NULL; } return sListEntry; } -static inline BOOLEAN SimpleIsSlistEmpty(SINGLE_LIST_ENTRY *SListHdr) +static inline BOOLEAN SimpleIsSlistEmpty(SLIST_ENTRY *SListHdr) { return (SListHdr->Next == NULL); } diff --git a/drivers/storage/classpnp/xferpkt.c b/drivers/storage/classpnp/xferpkt.c index 390afe7614..865ae7feb4 100644 --- a/drivers/storage/classpnp/xferpkt.c +++ b/drivers/storage/classpnp/xferpkt.c @@ -240,8 +240,8 @@ VOID NTAPI EnqueueFreeTransferPacket(PDEVICE_OBJECT Fdo, PTRANSFER_PACKET Pkt) * 1. Immediately snap down to our UPPER threshold. */ if (fdoData->NumTotalTransferPackets > MaxWorkingSetTransferPackets){ - SINGLE_LIST_ENTRY pktList; - PSINGLE_LIST_ENTRY slistEntry; + SLIST_ENTRY pktList; + PSLIST_ENTRY slistEntry; PTRANSFER_PACKET pktToDelete; DBGTRACE(ClassDebugTrace, ("Exiting stress, block freeing (%d-%d) packets.", fdoData->NumTotalTransferPackets, MaxWorkingSetTransferPackets)); @@ -324,7 +324,7 @@ PTRANSFER_PACKET NTAPI DequeueFreeTransferPacket(PDEVICE_OBJECT Fdo, BOOLEAN All PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Fdo->DeviceExtension; PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData; PTRANSFER_PACKET pkt; - PSINGLE_LIST_ENTRY slistEntry; + PSLIST_ENTRY slistEntry; //KIRQL oldIrql; slistEntry = InterlockedPopEntrySList(&fdoData->FreeTransferPacketsList);

5 years, 9 months

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 March 2019