Ros-diffs June 2020

ros-diffs@reactos.org

20 participants
95 discussions

[reactos] 01/01: [UDFS] Zero-initialize IO_STATUS_BLOCK data in UDFCommonCreate Some places have been changed to return FILE_DOES_NOT_EXIST, everything else just returns 0. FastFAT driver from MS does the same (tm), so I'm not going to have a big research here. CORE-16623

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c40b0866b1f90a5acb9f9… commit c40b0866b1f90a5acb9f9f53a1355efe3fb0aa9c Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Mon Jun 29 02:37:12 2020 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Mon Jun 29 02:37:12 2020 +0300 [UDFS] Zero-initialize IO_STATUS_BLOCK data in UDFCommonCreate Some places have been changed to return FILE_DOES_NOT_EXIST, everything else just returns 0. FastFAT driver from MS does the same (tm), so I'm not going to have a big research here. CORE-16623 Co-authored-by: Suraj K Suresh <kssuraj15(a)gmail.com> --- drivers/filesystems/udfs/create.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/filesystems/udfs/create.cpp b/drivers/filesystems/udfs/create.cpp index a00038e3d0b..8b05350881a 100644 --- a/drivers/filesystems/udfs/create.cpp +++ b/drivers/filesystems/udfs/create.cpp @@ -231,7 +231,7 @@ UDFCommonCreate( PtrUDFFCB PtrRelatedFCB = NULL, PtrNewFcb = NULL; PtrUDFNTRequiredFCB NtReqFcb; - ULONG ReturnedInformation; + ULONG ReturnedInformation = 0; UNICODE_STRING TargetObjectName; UNICODE_STRING RelatedObjectName; @@ -487,6 +487,7 @@ UDFCommonCreate( if (Vcb->SoftEjectReq) { AdPrint((" Eject requested\n")); + ReturnedInformation = FILE_DOES_NOT_EXIST; try_return(RC = STATUS_FILE_INVALID); } @@ -580,6 +581,7 @@ UDFCommonCreate( if ((RequestedDisposition != FILE_OPEN) && (RequestedDisposition != FILE_OPEN_IF)) { // cannot create a new volume, I'm afraid ... + ReturnedInformation = FILE_DOES_NOT_EXIST; try_return(RC = STATUS_ACCESS_DENIED); } #endif //UDF_READ_ONLY_BUILD @@ -1026,6 +1028,7 @@ op_vol_accs_dnd: if(Vcb->VCBFlags & UDF_VCB_FLAGS_RAW_DISK) { ReturnedInformation = 0; AdPrint((" Can't open File on blank volume ;)\n")); + ReturnedInformation = FILE_DOES_NOT_EXIST; try_return(RC = STATUS_OBJECT_NAME_NOT_FOUND); } @@ -1042,6 +1045,7 @@ op_vol_accs_dnd: try_return(RC = STATUS_OBJECT_NAME_INVALID); } if(StreamOpen && !UDFStreamsSupported(Vcb)) { + ReturnedInformation = FILE_DOES_NOT_EXIST; try_return(RC = STATUS_OBJECT_NAME_INVALID); } @@ -1450,6 +1454,7 @@ Skip_open_attempt: } else { AdPrint((" Open Target: unexpected error\n")); NewFileInfo = NULL; + ReturnedInformation = FILE_DOES_NOT_EXIST; try_return(RC = STATUS_OBJECT_NAME_INVALID); } @@ -1500,6 +1505,7 @@ Skip_open_attempt: if ((RequestedDisposition != FILE_CREATE) && (RequestedDisposition != FILE_OPEN_IF) && (RequestedDisposition != FILE_OVERWRITE_IF) && (RequestedDisposition != FILE_SUPERSEDE)) { AdPrint((" File doesn't exist (2)\n")); + ReturnedInformation = FILE_DOES_NOT_EXIST; try_return(RC); } // Check Volume ReadOnly attr

4 years, 2 months

[reactos] 01/01: [MSWSOCK] Use a correct prototype for SvchostPushServiceGlobals stub See https://www.geoffchappell.com/studies/windows/win32/services/svchost/dll/svchostpushserviceglobals.htm.

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=622f187c04c7444c2420f… commit 622f187c04c7444c2420fd60cfb1792d92e99112 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Thu Jun 18 21:06:34 2020 +0300 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jun 27 14:55:28 2020 +0200 [MSWSOCK] Use a correct prototype for SvchostPushServiceGlobals stub See https://www.geoffchappell.com/studies/windows/win32/services/svchost/dll/sv…. --- dll/win32/mswsock/mswsock.spec | 2 +- dll/win32/mswsock/stubs.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dll/win32/mswsock/mswsock.spec b/dll/win32/mswsock/mswsock.spec index 0fef34d96d9..8f8f0e7e5f4 100644 --- a/dll/win32/mswsock/mswsock.spec +++ b/dll/win32/mswsock/mswsock.spec @@ -18,7 +18,7 @@ @ stdcall SetServiceW(long long long ptr ptr ptr) @ stdcall StartWsdpService() @ stdcall StopWsdpService() -@ stdcall SvchostPushServiceGlobals(long) +@ stdcall SvchostPushServiceGlobals(ptr) @ stdcall TransmitFile(long long long long ptr ptr long) @ stdcall WSARecvEx(long ptr long ptr) @ stdcall WSPStartup(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) diff --git a/dll/win32/mswsock/stubs.c b/dll/win32/mswsock/stubs.c index a05284c6eb1..f026bc61cff 100644 --- a/dll/win32/mswsock/stubs.c +++ b/dll/win32/mswsock/stubs.c @@ -12,6 +12,7 @@ #include <windef.h> #include <ws2spi.h> #include <nspapi.h> +#include <svc.h> typedef DWORD (* LPFN_NSPAPI)(VOID); typedef struct _NS_ROUTINE { @@ -441,14 +442,14 @@ StopWsdpService() /* * @unimplemented + * + * See https://www.geoffchappell.com/studies/windows/win32/services/svchost/dll/sv… */ -DWORD +VOID WINAPI -SvchostPushServiceGlobals(DWORD Value) +SvchostPushServiceGlobals(SVCHOST_GLOBALS *lpGlobals) { OutputDebugStringW(L"mswsock SvchostPushServiceGlobals stub called\n"); - - return 0; }

4 years, 2 months

[reactos] 01/01: [SDK][SVCHOST] Move all global svchost declarations to public header.

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dcc5dd2a69db67d3d2bf9… commit dcc5dd2a69db67d3d2bf9263d45c5cb531f0497a Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Thu Jun 18 15:03:01 2020 +0300 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jun 27 14:54:22 2020 +0200 [SDK][SVCHOST] Move all global svchost declarations to public header. Also update the includes. It will allow to use those declarations globally where they are required (e. g. for SvchostPushServiceGlobals functions in some services). No functional changes. --- base/services/svchost/svchost.h | 49 ++----------------------------------- sdk/include/reactos/svc.h | 54 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 47 deletions(-) diff --git a/base/services/svchost/svchost.h b/base/services/svchost/svchost.h index 2b768110d0d..519394caff7 100644 --- a/base/services/svchost/svchost.h +++ b/base/services/svchost/svchost.h @@ -15,11 +15,9 @@ #include <rpc.h> #include <ndk/rtlfuncs.h> #include <ndk/kdtypes.h> +#include <dpfilter.h> -// -// FIXME: Should go in public headers -// -#define DPFLTR_SVCHOST_ID 28 +#include <svc.h> // // This prints out a SVCHOST-specific debug print, with the PID/TID @@ -35,49 +33,6 @@ #define DBG_ERR(fmt, ...) SvchostDbgPrint(1, fmt, __VA_ARGS__) #define DBG_TRACE(fmt, ...) SvchostDbgPrint(4, fmt, __VA_ARGS__) -// -// This is the callback that a hosted service can register for stop notification -// FIXME: GLOBAL HEADER -// -typedef VOID - (CALLBACK *PSVCHOST_STOP_CALLBACK) ( - _In_ PVOID lpParameter, - _In_ BOOLEAN TimerOrWaitFired - ); - -// -// Hosted Services and SvcHost Use this Structure -// FIXME: GLOBAL HEADER -// -typedef struct _SVCHOST_GLOBALS -{ - PVOID NullSid; - PVOID WorldSid; - PVOID LocalSid; - PVOID NetworkSid; - PVOID LocalSystemSid; - PVOID LocalServiceSid; - PVOID NetworkServiceSid; - PVOID BuiltinDomainSid; - PVOID AuthenticatedUserSid; - PVOID AnonymousLogonSid; - PVOID AliasAdminsSid; - PVOID AliasUsersSid; - PVOID AliasGuestsSid; - PVOID AliasPowerUsersSid; - PVOID AliasAccountOpsSid; - PVOID AliasSystemOpsSid; - PVOID AliasPrintOpsSid; - PVOID AliasBackupOpsSid; - PVOID RpcpStartRpcServer; - PVOID RpcpStopRpcServer; - PVOID RpcpStopRpcServerEx; - PVOID SvcNetBiosOpen; - PVOID SvcNetBiosClose; - PVOID SvcNetBiosReset; - PVOID SvcRegisterStopCallback; -} SVCHOST_GLOBALS, *PSVCHOST_GLOBALS; - // // This is the callback for them to receive it // diff --git a/sdk/include/reactos/svc.h b/sdk/include/reactos/svc.h new file mode 100644 index 00000000000..b028f1a0bf5 --- /dev/null +++ b/sdk/include/reactos/svc.h @@ -0,0 +1,54 @@ +/* + * PROJECT: ReactOS Service Host + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: sdk/include/reactos/svc.h + * PURPOSE: Global Header for Service Host + * PROGRAMMERS: ReactOS Portable Systems Group + */ +/* See https://www.geoffchappell.com/studies/windows/win32/services/svchost/proces… */ + +#ifndef __SVC_H +#define __SVC_H + +// +// This is the callback that a hosted service can register for stop notification +// +typedef VOID +(CALLBACK *PSVCHOST_STOP_CALLBACK) ( + _In_ PVOID lpParameter, + _In_ BOOLEAN TimerOrWaitFired + ); + +// +// Hosted Services and SvcHost Use this Structure +// +typedef struct _SVCHOST_GLOBALS +{ + PVOID NullSid; + PVOID WorldSid; + PVOID LocalSid; + PVOID NetworkSid; + PVOID LocalSystemSid; + PVOID LocalServiceSid; + PVOID NetworkServiceSid; + PVOID BuiltinDomainSid; + PVOID AuthenticatedUserSid; + PVOID AnonymousLogonSid; + PVOID AliasAdminsSid; + PVOID AliasUsersSid; + PVOID AliasGuestsSid; + PVOID AliasPowerUsersSid; + PVOID AliasAccountOpsSid; + PVOID AliasSystemOpsSid; + PVOID AliasPrintOpsSid; + PVOID AliasBackupOpsSid; + PVOID RpcpStartRpcServer; + PVOID RpcpStopRpcServer; + PVOID RpcpStopRpcServerEx; + PVOID SvcNetBiosOpen; + PVOID SvcNetBiosClose; + PVOID SvcNetBiosReset; + PVOID SvcRegisterStopCallback; +} SVCHOST_GLOBALS, *PSVCHOST_GLOBALS; + +#endif /* __SVC_H */

4 years, 2 months

[reactos] 02/02: [MSI] Remove obsolete '__ASM_DEFINE_FUNC()'

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2dfcb500e2a065580c7c2… commit 2dfcb500e2a065580c7c25a5d431d1f7710b8b41 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Jun 10 10:09:14 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jun 27 14:48:00 2020 +0200 [MSI] Remove obsolete '__ASM_DEFINE_FUNC()' MSVC build reports: {{ dll\win32\msi\msvchelper.h(3): warning C4005: '__ASM_DEFINE_FUNC': macro redefinition sdk\include\reactos\wine/asm.h(60): note: see previous definition of '__ASM_DEFINE_FUNC' dll\win32\msi\custom.c(547): warning C4003: not enough actual parameters for macro '__ASM_DEFINE_FUNC' }} Addendum to 476c99b and 9efafd6. --- dll/win32/msi/msi_ros.diff | 3 +-- dll/win32/msi/msvchelper.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dll/win32/msi/msi_ros.diff b/dll/win32/msi/msi_ros.diff index 7198d57b507..3d153bb231e 100644 --- a/dll/win32/msi/msi_ros.diff +++ b/dll/win32/msi/msi_ros.diff @@ -197,10 +197,9 @@ Index: D:/trunk/dll/win32/msi/msvchelper.h =================================================================== --- D:/trunk/dll/win32/msi/msvchelper.h (revision 0) +++ D:/trunk/dll/win32/msi/msvchelper.h (revision 51711) -@@ -0,0 +1,13 @@ +@@ -0,0 +1,12 @@ + +#ifdef __i386__ -+#define __ASM_DEFINE_FUNC(name,suffix,code) + +typedef unsigned int (__stdcall *__MSVC__MsiCustomActionEntryPoint)(unsigned int); + diff --git a/dll/win32/msi/msvchelper.h b/dll/win32/msi/msvchelper.h index 26a6266be69..0ad6d72308d 100644 --- a/dll/win32/msi/msvchelper.h +++ b/dll/win32/msi/msvchelper.h @@ -1,6 +1,5 @@ #ifdef __i386__ -#define __ASM_DEFINE_FUNC(name,suffix,code) typedef unsigned int (__stdcall *__MSVC__MsiCustomActionEntryPoint)(unsigned int);

4 years, 2 months

[reactos] 01/02: [OLE32] ole32_ros.diff: Remove remnant '__ASM_STDCALL_FUNC()'

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82272f03e3c6360378a14… commit 82272f03e3c6360378a144f768f42ce4470ce881 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Jun 10 10:09:14 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jun 27 14:48:00 2020 +0200 [OLE32] ole32_ros.diff: Remove remnant '__ASM_STDCALL_FUNC()' Addendum to 0f5d91b. CORE-16441 --- dll/win32/ole32/ole32_ros.diff | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dll/win32/ole32/ole32_ros.diff b/dll/win32/ole32/ole32_ros.diff index 649e8766919..39218d6b3b6 100644 --- a/dll/win32/ole32/ole32_ros.diff +++ b/dll/win32/ole32/ole32_ros.diff @@ -40,17 +40,6 @@ diff -pudN e:\wine\dlls\ole32/compobj.c e:\reactos\dll\win32\ole32/compobj.c diff -pudN e:\wine\dlls\ole32/stg_prop.c e:\reactos\dll\win32\ole32/stg_prop.c --- e:\wine\dlls\ole32/stg_prop.c 2016-11-16 17:29:23 +0100 +++ e:\reactos\dll\win32\ole32/stg_prop.c 2016-08-15 16:49:04 +0100 -@@ -41,6 +41,10 @@ - - WINE_DEFAULT_DEBUG_CHANNEL(storage); - -+#ifdef _MSC_VER -+#define __ASM_STDCALL_FUNC(name,args,code) -+#endif -+ - static inline StorageImpl *impl_from_IPropertySetStorage( IPropertySetStorage *iface ) - { - return CONTAINING_RECORD(iface, StorageImpl, base.IPropertySetStorage_iface); @@ -1013,7 +1017,13 @@ static HRESULT PropertyStorage_ReadDicti return hr; }

4 years, 2 months

[reactos] 01/01: [APISETS] api-ms-win-crt-utility-l1-1-0: Fix 'llabs' return type

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf88ce89c83abf8e110df… commit bf88ce89c83abf8e110dfcd2e5131c71764a4a78 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Jun 10 10:09:14 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jun 27 14:46:15 2020 +0200 [APISETS] api-ms-win-crt-utility-l1-1-0: Fix 'llabs' return type MSVC 'Release' build reports: 'dll\apisets\api-ms-win-crt-utility-l1-1-0_stubs.c(41): warning C4391: 'int llabs()': incorrect return type for intrinsic function, expected '__int64'' Addendum to 3f15a0d. --- dll/apisets/api-ms-win-crt-utility-l1-1-0.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/apisets/api-ms-win-crt-utility-l1-1-0.spec b/dll/apisets/api-ms-win-crt-utility-l1-1-0.spec index 63a0577de96..b0e273e84a9 100644 --- a/dll/apisets/api-ms-win-crt-utility-l1-1-0.spec +++ b/dll/apisets/api-ms-win-crt-utility-l1-1-0.spec @@ -18,7 +18,7 @@ @ stub imaxdiv @ stdcall labs() msvcrt.labs @ stdcall ldiv() msvcrt.ldiv -@ stub llabs +@ stub -ret64 llabs @ stub lldiv @ stdcall qsort() msvcrt.qsort @ stub qsort_s

4 years, 2 months

[reactos] 01/01: [POWRPROF_APITEST] Fix cppcheck warnings.

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02680ace4dcc6d75b6790… commit 02680ace4dcc6d75b67904727fcca83bd81b1ebf Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Jun 1 21:29:02 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jun 27 14:43:08 2020 +0200 [POWRPROF_APITEST] Fix cppcheck warnings. * test_CallNtPowerInformation(): Fix 2 'sizeof(sizeof())' copypastas * test_ValidatePowerPolicies_Next(): Delete a duplicate line --- modules/rostests/apitests/powrprof/power.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/powrprof/power.c b/modules/rostests/apitests/powrprof/power.c index d95b8d108e4..d09b99b8a19 100644 --- a/modules/rostests/apitests/powrprof/power.c +++ b/modules/rostests/apitests/powrprof/power.c @@ -60,7 +60,7 @@ void test_CallNtPowerInformation(void) /* LastSleepTime tests */ retval = CallNtPowerInformation(LastSleepTime, 0, 0, 0, 0); ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); - retval = CallNtPowerInformation(LastSleepTime, &atime, sizeof(sizeof(ULONGLONG)), 0, 0); + retval = CallNtPowerInformation(LastSleepTime, &atime, sizeof(ULONGLONG), 0, 0); ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); retval = CallNtPowerInformation(LastSleepTime, &atime, sizeof(ULONGLONG), &ctime, sizeof(ULONGLONG)); ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); @@ -70,7 +70,7 @@ void test_CallNtPowerInformation(void) /* LastWakeTime tests */ retval = CallNtPowerInformation(LastWakeTime, 0, 0, 0, 0); ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); - retval = CallNtPowerInformation(LastWakeTime, &atime, sizeof(sizeof(ULONGLONG)), 0, 0); + retval = CallNtPowerInformation(LastWakeTime, &atime, sizeof(ULONGLONG), 0, 0); ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); retval = CallNtPowerInformation(LastWakeTime, &atime, sizeof(ULONGLONG), &ctime, sizeof(ULONGLONG)); ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); @@ -4621,7 +4621,6 @@ pPP_original->user.OptimizeForPowerDc=1; ok(ret, "function was expected to succeed error %i\n",(UINT)GetLastError()); ok(globalcompare(gpp,gpp_compare),"Difference Found\n"); pp_compare.user.MaxSleepAc=4; - pp_compare.user.MaxSleepAc=4; ok(compare(pp,pp_compare),"Difference Found\n"); pPP_original->user.MaxSleepAc=PowerSystemShutdown;

4 years, 2 months

[reactos] 02/02: [CRT] _onexit(): Fix 'memcpy()' size

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b9cbc5179a929fbcea0d… commit 0b9cbc5179a929fbcea0d3f4f5f667ff565b348a Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Jun 1 21:29:02 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jun 27 14:38:21 2020 +0200 [CRT] _onexit(): Fix 'memcpy()' size Cherry-pick https://source.winehq.org/git/wine.git/commit/70bff7377dbe9bdaaac5e86c49ee4… --- sdk/lib/crt/stdlib/atexit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/crt/stdlib/atexit.c b/sdk/lib/crt/stdlib/atexit.c index 49247baddc7..32c5f7effaf 100644 --- a/sdk/lib/crt/stdlib/atexit.c +++ b/sdk/lib/crt/stdlib/atexit.c @@ -76,7 +76,7 @@ _onexit_t CDECL _onexit(_onexit_t func) UNLOCK_EXIT; return NULL; } - memcpy (newtable, atexit_table, atexit_table_size); + memcpy (newtable, atexit_table, atexit_table_size*sizeof(_onexit_t)); atexit_table_size += 32; free (atexit_table); atexit_table = newtable;

4 years, 2 months

[reactos] 01/02: [CRTDLL][CRT] Remove remnant declaration, silence cppcheck false positive.

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4213c70e2e9dbf4764be3… commit 4213c70e2e9dbf4764be30c6a35c3d3c930e6943 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Jun 1 21:29:02 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jun 27 14:35:32 2020 +0200 [CRTDLL][CRT] Remove remnant declaration, silence cppcheck false positive. * _atexit_cleanup is no longer used * Fix cppcheck 'pointerSize' warning --- dll/win32/crtdll/dllmain.c | 1 - sdk/lib/crt/stdlib/atexit.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/crtdll/dllmain.c b/dll/win32/crtdll/dllmain.c index 41e481da858..8d6af8c69b2 100644 --- a/dll/win32/crtdll/dllmain.c +++ b/dll/win32/crtdll/dllmain.c @@ -32,7 +32,6 @@ extern void __getmainargs( int *argc, char ***argv, char ***envp, extern int BlockEnvToEnvironA(void); extern int BlockEnvToEnvironW(void); extern void FreeEnvironment(char **environment); -extern void _atexit_cleanup(void); extern unsigned int _osver; extern unsigned int _winminor; diff --git a/sdk/lib/crt/stdlib/atexit.c b/sdk/lib/crt/stdlib/atexit.c index 6ab8942b333..49247baddc7 100644 --- a/sdk/lib/crt/stdlib/atexit.c +++ b/sdk/lib/crt/stdlib/atexit.c @@ -69,7 +69,7 @@ _onexit_t CDECL _onexit(_onexit_t func) { _onexit_t *newtable; TRACE("expanding table\n"); - newtable = calloc(atexit_table_size + 32, sizeof(void *)); + newtable = calloc(atexit_table_size + 32, sizeof(_onexit_t)); if (!newtable) { TRACE("failed!\n");

4 years, 2 months

[reactos] 01/01: [SYSDM] Set the proper icon in title bar

by Jared Smudde

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e20be0fbf8da950e602c… commit 9e20be0fbf8da950e602c6b1fe1e75f7ffe52442 Author: Jared Smudde <computerwhiz02(a)hotmail.com> AuthorDate: Fri Jun 26 19:51:22 2020 -0500 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Sat Jun 27 10:22:07 2020 +0200 [SYSDM] Set the proper icon in title bar --- dll/cpl/sysdm/sysdm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/sysdm/sysdm.c b/dll/cpl/sysdm/sysdm.c index 817c0015db7..a93b02ceb1e 100644 --- a/dll/cpl/sysdm/sysdm.c +++ b/dll/cpl/sysdm/sysdm.c @@ -128,7 +128,7 @@ PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) { case PSCB_INITIALIZED: { - hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_USERPROF)); + hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLSYSTEM)); SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); break; } @@ -161,7 +161,7 @@ SystemApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) psh.dwFlags = PSH_PROPTITLE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = hwnd; psh.hInstance = hApplet; - psh.pszIcon = MAKEINTRESOURCEW(IDI_USERPROF); + psh.pszIcon = MAKEINTRESOURCEW(IDI_CPLSYSTEM); psh.pszCaption = MAKEINTRESOURCE(IDS_CPLSYSTEMNAME); psh.nPages = 0; psh.nStartPage = 0;

4 years, 2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2020