Ros-diffs February 2018

ros-diffs@reactos.org

24 participants
240 discussions

03/03: [MBEDTLS] Don't link with zlib, we don't use it. CORE-14290

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=25bca520f54cce06bdabc… commit 25bca520f54cce06bdabc8af278a76882a3c2d79 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 3 14:37:22 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 4 12:54:44 2018 +0100 [MBEDTLS] Don't link with zlib, we don't use it. CORE-14290 --- dll/3rdparty/mbedtls/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/dll/3rdparty/mbedtls/CMakeLists.txt b/dll/3rdparty/mbedtls/CMakeLists.txt index c5af423712..0fbb59bbf4 100644 --- a/dll/3rdparty/mbedtls/CMakeLists.txt +++ b/dll/3rdparty/mbedtls/CMakeLists.txt @@ -84,7 +84,6 @@ add_library(mbedtls SHARED ${CMAKE_CURRENT_BINARY_DIR}/mbedtls.def) set_module_type(mbedtls win32dll) -target_link_libraries(mbedtls zlib) add_importlibs(mbedtls advapi32 msvcrt kernel32 ntdll) # to use `_vsnprintf_s` looks like we have to define MINGW_HAS_SECURE_API

6 years, 7 months

02/03: [USETUP] Use the smaller zlib_solo instead of the full zlib. CORE-14290

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc51b419c7eb2beffb422… commit dc51b419c7eb2beffb4226f94e3c8e7e567fe2f2 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 3 14:36:40 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 4 12:54:39 2018 +0100 [USETUP] Use the smaller zlib_solo instead of the full zlib. CORE-14290 --- base/setup/usetup/CMakeLists.txt | 2 +- base/setup/usetup/cabinet.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index 5922a4f040..46034af752 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -40,7 +40,7 @@ if(USE_CLANG_CL) add_target_compile_flags(usetup "-Wno-invalid-source-encoding") endif() -target_link_libraries(usetup zlib inflib ext2lib vfatlib) +target_link_libraries(usetup zlib_solo inflib ext2lib vfatlib) set_module_type(usetup nativecui) add_importlibs(usetup ntdll) add_pch(usetup usetup.h SOURCE) diff --git a/base/setup/usetup/cabinet.c b/base/setup/usetup/cabinet.c index 326d4935cf..8cc35aa796 100644 --- a/base/setup/usetup/cabinet.c +++ b/base/setup/usetup/cabinet.c @@ -10,6 +10,7 @@ #include "usetup.h" +#define Z_SOLO #include <zlib.h> #define NDEBUG

6 years, 7 months

01/03: [ROSLOAD] Fix clang-cl build.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=324180a32e9ec14a70a93… commit 324180a32e9ec14a70a93d31baf40f73b4742064 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 4 12:54:15 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 4 12:54:32 2018 +0100 [ROSLOAD] Fix clang-cl build. --- boot/environ/app/rosload/rosload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/environ/app/rosload/rosload.c b/boot/environ/app/rosload/rosload.c index 65ec28b2bf..9eda2d31fe 100644 --- a/boot/environ/app/rosload/rosload.c +++ b/boot/environ/app/rosload/rosload.c @@ -344,7 +344,7 @@ ArchRestoreProcessorFeatures ( if (ArchXCr0BitsToClear) { /* Clear them */ -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) __xsetbv(0, __xgetbv(0) & ~ArchXCr0BitsToClear); #endif ArchXCr0BitsToClear = 0;

6 years, 7 months

01/01: [SETUPAPI] Update some more functions to the current coding style, add annotations and add function names to the TRACE calls.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7fc2ef4d278546e788f0… commit c7fc2ef4d278546e788f0e85238fb814fdff43bf Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Feb 3 23:16:31 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 4 11:17:30 2018 +0100 [SETUPAPI] Update some more functions to the current coding style, add annotations and add function names to the TRACE calls. --- dll/win32/setupapi/cfgmgr.c | 218 +++++++++++++++++++++++++++++++------------- 1 file changed, 156 insertions(+), 62 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index 14f05963e2..4ccd7ae8f5 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -1483,10 +1483,14 @@ CM_Delete_Range( /*********************************************************************** * CM_Disable_DevNode [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Disable_DevNode( - DEVINST dnDevInst, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Disable_DevNode( + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags) { - TRACE("%p %lx\n", dnDevInst, ulFlags); + TRACE("CM_Disable_DevNode(%p %lx)\n", + dnDevInst, ulFlags); return CM_Disable_DevNode_Ex(dnDevInst, ulFlags, NULL); } @@ -1494,15 +1498,20 @@ CONFIGRET WINAPI CM_Disable_DevNode( /*********************************************************************** * CM_Disable_DevNode_Ex [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Disable_DevNode_Ex( - DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Disable_DevNode_Ex( + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL; LPWSTR lpDevInst; CONFIGRET ret; - FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine); + FIXME("CM_Disable_DevNode_Ex(%p %lx %p)\n", + dnDevInst, ulFlags, hMachine); if (!pSetupIsUserAdmin()) return CR_ACCESS_DENIED; @@ -1554,11 +1563,14 @@ CONFIGRET WINAPI CM_Disable_DevNode_Ex( /*********************************************************************** * CM_Disconnect_Machine [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Disconnect_Machine( + _In_opt_ HMACHINE hMachine) { PMACHINE_INFO pMachine; - TRACE("%lx\n", hMachine); + TRACE("CM_Disconnect_Machine(%lx)\n", hMachine); pMachine = (PMACHINE_INFO)hMachine; if (pMachine == NULL) @@ -1598,10 +1610,13 @@ CM_Dup_Range_List( /*********************************************************************** * CM_Enable_DevNode [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Enable_DevNode( - DEVINST dnDevInst, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Enable_DevNode( + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags) { - TRACE("%p %lx\n", dnDevInst, ulFlags); + TRACE("CM_Enable_DevNode(%p %lx)\n", dnDevInst, ulFlags); return CM_Enable_DevNode_Ex(dnDevInst, ulFlags, NULL); } @@ -1609,15 +1624,19 @@ CONFIGRET WINAPI CM_Enable_DevNode( /*********************************************************************** * CM_Enable_DevNode_Ex [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Enable_DevNode_Ex( - DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Enable_DevNode_Ex( + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL; LPWSTR lpDevInst; CONFIGRET ret; - TRACE("%p %lx %p\n", dnDevInst, ulFlags, hMachine); + TRACE("CM_Enable_DevNode_Ex(%p %lx %p)\n", dnDevInst, ulFlags, hMachine); if (!pSetupIsUserAdmin()) return CR_ACCESS_DENIED; @@ -1669,10 +1688,16 @@ CONFIGRET WINAPI CM_Enable_DevNode_Ex( /*********************************************************************** * CM_Enumerate_Classes [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Enumerate_Classes( - ULONG ulClassIndex, LPGUID ClassGuid, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Enumerate_Classes( + _In_ ULONG ulClassIndex, + _Out_ LPGUID ClassGuid, + _In_ ULONG ulFlags) { - TRACE("%lx %p %lx\n", ulClassIndex, ClassGuid, ulFlags); + TRACE("CM_Enumerate_Classes(%lx %p %lx)\n", + ulClassIndex, ClassGuid, ulFlags); + return CM_Enumerate_Classes_Ex(ulClassIndex, ClassGuid, ulFlags, NULL); } @@ -1680,15 +1705,21 @@ CONFIGRET WINAPI CM_Enumerate_Classes( /*********************************************************************** * CM_Enumerate_Classes_Ex [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Enumerate_Classes_Ex( - ULONG ulClassIndex, LPGUID ClassGuid, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Enumerate_Classes_Ex( + _In_ ULONG ulClassIndex, + _Out_ LPGUID ClassGuid, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { WCHAR szBuffer[MAX_GUID_STRING_LEN]; RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret = CR_SUCCESS; ULONG ulLength = MAX_GUID_STRING_LEN; - TRACE("%lx %p %lx %p\n", ulClassIndex, ClassGuid, ulFlags, hMachine); + TRACE("CM_Enumerate_Classes_Ex(%lx %p %lx %p)\n", + ulClassIndex, ClassGuid, ulFlags, hMachine); if (ClassGuid == NULL) return CR_INVALID_POINTER; @@ -1741,10 +1772,17 @@ CONFIGRET WINAPI CM_Enumerate_Classes_Ex( /*********************************************************************** * CM_Enumerate_EnumeratorsA [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Enumerate_EnumeratorsA( - ULONG ulEnumIndex, PCHAR Buffer, PULONG pulLength, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Enumerate_EnumeratorsA( + _In_ ULONG ulEnumIndex, + _Out_ PCHAR Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags) { - TRACE("%lu %p %p %lx\n", ulEnumIndex, Buffer, pulLength, ulFlags); + TRACE("CM_Enumerate_EnumeratorsA(%lu %p %p %lx)\n", + ulEnumIndex, Buffer, pulLength, ulFlags); + return CM_Enumerate_Enumerators_ExA(ulEnumIndex, Buffer, pulLength, ulFlags, NULL); } @@ -1753,10 +1791,17 @@ CONFIGRET WINAPI CM_Enumerate_EnumeratorsA( /*********************************************************************** * CM_Enumerate_EnumeratorsW [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Enumerate_EnumeratorsW( - ULONG ulEnumIndex, PWCHAR Buffer, PULONG pulLength, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Enumerate_EnumeratorsW( + _In_ ULONG ulEnumIndex, + _Out_ PWCHAR Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags) { - TRACE("%lu %p %p %lx\n", ulEnumIndex, Buffer, pulLength, ulFlags); + TRACE("CM_Enumerate_EnumeratorsW(%lu %p %p %lx)\n", + ulEnumIndex, Buffer, pulLength, ulFlags); + return CM_Enumerate_Enumerators_ExW(ulEnumIndex, Buffer, pulLength, ulFlags, NULL); } @@ -1765,17 +1810,22 @@ CONFIGRET WINAPI CM_Enumerate_EnumeratorsW( /*********************************************************************** * CM_Enumerate_Enumerators_ExA [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Enumerate_Enumerators_ExA( - ULONG ulEnumIndex, PCHAR Buffer, PULONG pulLength, ULONG ulFlags, - HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Enumerate_Enumerators_ExA( + _In_ ULONG ulEnumIndex, + _Out_ PCHAR Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { WCHAR szBuffer[MAX_DEVICE_ID_LEN]; ULONG ulOrigLength; ULONG ulLength; CONFIGRET ret = CR_SUCCESS; - TRACE("%lu %p %p %lx %lx\n", ulEnumIndex, Buffer, pulLength, ulFlags, - hMachine); + TRACE("CM_Enumerate_Enumerators_ExA(%lu %p %p %lx %lx)\n", + ulEnumIndex, Buffer, pulLength, ulFlags, hMachine); if (Buffer == NULL || pulLength == NULL) return CR_INVALID_POINTER; @@ -1811,15 +1861,20 @@ CONFIGRET WINAPI CM_Enumerate_Enumerators_ExA( /*********************************************************************** * CM_Enumerate_Enumerators_ExW [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Enumerate_Enumerators_ExW( - ULONG ulEnumIndex, PWCHAR Buffer, PULONG pulLength, ULONG ulFlags, - HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Enumerate_Enumerators_ExW( + _In_ ULONG ulEnumIndex, + _Out_ PWCHAR Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret; - TRACE("%lu %p %p %lx %lx\n", ulEnumIndex, Buffer, pulLength, ulFlags, - hMachine); + TRACE("CM_Enumerate_Enumerators_ExW(%lu %p %p %lx %lx)\n", + ulEnumIndex, Buffer, pulLength, ulFlags, hMachine); if (Buffer == NULL || pulLength == NULL) return CR_INVALID_POINTER; @@ -1942,10 +1997,15 @@ done: /*********************************************************************** * CM_Free_Log_Conf [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Free_Log_Conf( - LOG_CONF lcLogConfToBeFreed, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Free_Log_Conf( + _In_ LOG_CONF lcLogConfToBeFreed, + _In_ ULONG ulFlags) { - TRACE("%lx %lx\n", lcLogConfToBeFreed, ulFlags); + TRACE("CM_Free_Log_Conf(%lx %lx)\n", + lcLogConfToBeFreed, ulFlags); + return CM_Free_Log_Conf_Ex(lcLogConfToBeFreed, ulFlags, NULL); } @@ -1953,8 +2013,12 @@ CONFIGRET WINAPI CM_Free_Log_Conf( /*********************************************************************** * CM_Free_Log_Conf_Ex [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Free_Log_Conf_Ex( - LOG_CONF lcLogConfToBeFreed, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Free_Log_Conf_Ex( + _In_ LOG_CONF lcLogConfToBeFreed, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL; @@ -1962,7 +2026,8 @@ CONFIGRET WINAPI CM_Free_Log_Conf_Ex( PLOG_CONF_INFO pLogConfInfo; CONFIGRET ret; - TRACE("%lx %lx %lx\n", lcLogConfToBeFreed, ulFlags, hMachine); + TRACE("CM_Free_Log_Conf_Ex(%lx %lx %lx)\n", + lcLogConfToBeFreed, ulFlags, hMachine); if (!pSetupIsUserAdmin()) return CR_ACCESS_DENIED; @@ -2012,12 +2077,14 @@ CONFIGRET WINAPI CM_Free_Log_Conf_Ex( /*********************************************************************** * CM_Free_Log_Conf_Handle [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Free_Log_Conf_Handle( - LOG_CONF lcLogConf) +CONFIGRET +WINAPI +CM_Free_Log_Conf_Handle( + _In_ LOG_CONF lcLogConf) { PLOG_CONF_INFO pLogConfInfo; - TRACE("%lx\n", lcLogConf); + TRACE("CM_Free_Log_Conf_Handle(%lx)\n", lcLogConf); pLogConfInfo = (PLOG_CONF_INFO)lcLogConf; if (pLogConfInfo == NULL || pLogConfInfo->ulMagic != LOG_CONF_MAGIC) @@ -2080,10 +2147,16 @@ CM_Free_Range_List( /*********************************************************************** * CM_Free_Res_Des [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Free_Res_Des( - PRES_DES prdResDes, RES_DES rdResDes, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Free_Res_Des( + _Out_ PRES_DES prdResDes, + _In_ RES_DES rdResDes, + _In_ ULONG ulFlags) { - TRACE("%p %p %lx\n", prdResDes, rdResDes, ulFlags); + TRACE("CM_Free_Res_Des(%p %p %lx)\n", + prdResDes, rdResDes, ulFlags); + return CM_Free_Res_Des_Ex(prdResDes, rdResDes, ulFlags, NULL); } @@ -2091,11 +2164,16 @@ CONFIGRET WINAPI CM_Free_Res_Des( /*********************************************************************** * CM_Free_Res_Des_Ex [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Free_Res_Des_Ex( - PRES_DES prdResDes, RES_DES rdResDes, ULONG ulFlags, - HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Free_Res_Des_Ex( + _Out_ PRES_DES prdResDes, + _In_ RES_DES rdResDes, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { - FIXME("%p %p %lx %lx\n", prdResDes, rdResDes, ulFlags, hMachine); + FIXME("CM_Free_Res_Des_Ex(%p %p %lx %lx)\n", + prdResDes, rdResDes, ulFlags, hMachine); return CR_CALL_NOT_IMPLEMENTED; } @@ -2104,10 +2182,12 @@ CONFIGRET WINAPI CM_Free_Res_Des_Ex( /*********************************************************************** * CM_Free_Res_Des_Handle [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Free_Res_Des_Handle( - RES_DES rdResDes) +CONFIGRET +WINAPI +CM_Free_Res_Des_Handle( + _In_ RES_DES rdResDes) { - FIXME("%p\n", rdResDes); + FIXME("CM_Free_Res_Des_Handle(%p)\n", rdResDes); return CR_CALL_NOT_IMPLEMENTED; } @@ -2116,10 +2196,16 @@ CONFIGRET WINAPI CM_Free_Res_Des_Handle( /*********************************************************************** * CM_Get_Child [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Child( - PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Get_Child( + _Out_ PDEVINST pdnDevInst, + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags) { - TRACE("%p %p %lx\n", pdnDevInst, dnDevInst, ulFlags); + TRACE("CM_Get_Child(%p %p %lx)\n", + pdnDevInst, dnDevInst, ulFlags); + return CM_Get_Child_Ex(pdnDevInst, dnDevInst, ulFlags, NULL); } @@ -2127,8 +2213,13 @@ CONFIGRET WINAPI CM_Get_Child( /*********************************************************************** * CM_Get_Child_Ex [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Child_Ex( - PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Get_Child_Ex( + _Out_ PDEVINST pdnDevInst, + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { WCHAR szRelatedDevInst[MAX_DEVICE_ID_LEN]; RPC_BINDING_HANDLE BindingHandle = NULL; @@ -2137,7 +2228,8 @@ CONFIGRET WINAPI CM_Get_Child_Ex( DWORD dwIndex, dwLength = MAX_DEVICE_ID_LEN; CONFIGRET ret; - TRACE("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); + TRACE("CM_Get_Child_Ex(%p %lx %lx %lx)\n", + pdnDevInst, dnDevInst, ulFlags, hMachine); if (pdnDevInst == NULL) return CR_INVALID_POINTER; @@ -5839,7 +5931,9 @@ CONFIGRET WINAPI CM_Reenumerate_DevNode( */ CONFIGRET WINAPI CM_Reenumerate_DevNode_Ex( - DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags, + _In_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL;

6 years, 7 months

01/01: [STOBJECT] Revert b7c3398 because it was not the cause of the original problem I wanted to fix (notify structure not completely zeroed-out on the receiver side of the notification).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5de33ab010f3cb3ab495c… commit 5de33ab010f3cb3ab495cd1f5cfde60a0257d61d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 4 02:23:28 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 4 02:23:28 2018 +0100 [STOBJECT] Revert b7c3398 because it was not the cause of the original problem I wanted to fix (notify structure not completely zeroed-out on the receiver side of the notification). --- dll/shellext/stobject/csystray.cpp | 5 ++--- dll/shellext/stobject/hotplug.cpp | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dll/shellext/stobject/csystray.cpp b/dll/shellext/stobject/csystray.cpp index f75f25d54c..89bd5c5ac0 100644 --- a/dll/shellext/stobject/csystray.cpp +++ b/dll/shellext/stobject/csystray.cpp @@ -121,12 +121,11 @@ HRESULT CSysTray::ProcessIconMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, LR *--*/ HRESULT CSysTray::NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip, DWORD dwstate) { - NOTIFYICONDATA nim; + NOTIFYICONDATA nim = { 0 }; TRACE("NotifyIcon code=%d, uId=%d, hIcon=%p, szTip=%S\n", code, uId, hIcon, szTip); - ZeroMemory(&nim, sizeof(nim)); - nim.cbSize = sizeof(nim); + nim.cbSize = sizeof(NOTIFYICONDATA); nim.uFlags = NIF_MESSAGE | NIF_ICON | NIF_STATE | NIF_TIP; nim.hIcon = hIcon; nim.uID = uId; diff --git a/dll/shellext/stobject/hotplug.cpp b/dll/shellext/stobject/hotplug.cpp index 9550d23960..5c6d3099a8 100644 --- a/dll/shellext/stobject/hotplug.cpp +++ b/dll/shellext/stobject/hotplug.cpp @@ -100,10 +100,8 @@ HRESULT EnumHotpluggedDevices(CSimpleArray<DEVINST> &devList) *--*/ HRESULT NotifyBalloon(CSysTray* pSysTray, LPCWSTR szTitle = NULL, LPCWSTR szInfo = NULL, UINT uId = ID_ICON_HOTPLUG) { - NOTIFYICONDATA nim; - - ZeroMemory(&nim, sizeof(nim)); - nim.cbSize = sizeof(nim); + NOTIFYICONDATA nim = { 0 }; + nim.cbSize = sizeof(NOTIFYICONDATA); nim.uID = uId; nim.hWnd = pSysTray->GetHWnd();

6 years, 7 months

05/05: [EXPLORER] Don't use deprecated StrNCpy function but use the string-safe StringCchCopy instead. Also fix a copy-paste error in the _countofs.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04498f3eb52a7d5f960d0… commit 04498f3eb52a7d5f960d096f53be8808dc68dd93 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 4 01:56:11 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 4 01:57:05 2018 +0100 [EXPLORER] Don't use deprecated StrNCpy function but use the string-safe StringCchCopy instead. Also fix a copy-paste error in the _countofs. --- base/shell/explorer/syspager.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 4656d8f6fa..9ba0f2fc99 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -107,8 +107,8 @@ private: Info(InternalIconData * source) { pSource = source; - StrNCpy(szInfo, source->szInfo, _countof(szInfo)); - StrNCpy(szInfoTitle, source->szInfoTitle, _countof(szInfoTitle)); + StringCchCopy(szInfo, _countof(szInfo), source->szInfo); + StringCchCopy(szInfoTitle, _countof(szInfoTitle), source->szInfoTitle); uIcon = source->dwInfoFlags & NIIF_ICON_MASK; if (source->dwInfoFlags == NIIF_USER) uIcon = reinterpret_cast<WPARAM>(source->hIcon); @@ -775,8 +775,8 @@ BOOL CNotifyToolbar::AddButton(_In_ CONST NOTIFYICONDATA *iconData) if (iconData->uFlags & NIF_INFO) { // NOTE: In Vista+, the uTimeout value is disregarded, and the accessibility settings are used always. - StrNCpy(notifyItem->szInfo, iconData->szInfo, _countof(notifyItem->szInfo)); - StrNCpy(notifyItem->szInfoTitle, iconData->szInfoTitle, _countof(notifyItem->szInfo)); + StringCchCopy(notifyItem->szInfo, _countof(notifyItem->szInfo), iconData->szInfo); + StringCchCopy(notifyItem->szInfoTitle, _countof(notifyItem->szInfoTitle), iconData->szInfoTitle); notifyItem->dwInfoFlags = iconData->dwInfoFlags; notifyItem->uTimeout = iconData->uTimeout; } @@ -913,8 +913,8 @@ BOOL CNotifyToolbar::UpdateButton(_In_ CONST NOTIFYICONDATA *iconData) if (iconData->uFlags & NIF_INFO) { // NOTE: In Vista+, the uTimeout value is disregarded, and the accessibility settings are used always. - StrNCpy(notifyItem->szInfo, iconData->szInfo, _countof(notifyItem->szInfo)); - StrNCpy(notifyItem->szInfoTitle, iconData->szInfoTitle, _countof(notifyItem->szInfo)); + StringCchCopy(notifyItem->szInfo, _countof(notifyItem->szInfo), iconData->szInfo); + StringCchCopy(notifyItem->szInfoTitle, _countof(notifyItem->szInfoTitle), iconData->szInfoTitle); notifyItem->dwInfoFlags = iconData->dwInfoFlags; notifyItem->uTimeout = iconData->uTimeout; }

6 years, 7 months

04/05: [STOBJECT] Fully zero-out the full NOTIFYICONDATA structure (it wasn't zeroed out correctly in MSVC build).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7c3398f95d0aa54f2b5b… commit b7c3398f95d0aa54f2b5bd1acae0bef496af7e29 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 4 01:54:55 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 4 01:57:02 2018 +0100 [STOBJECT] Fully zero-out the full NOTIFYICONDATA structure (it wasn't zeroed out correctly in MSVC build). --- dll/shellext/stobject/csystray.cpp | 5 +++-- dll/shellext/stobject/hotplug.cpp | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dll/shellext/stobject/csystray.cpp b/dll/shellext/stobject/csystray.cpp index 89bd5c5ac0..f75f25d54c 100644 --- a/dll/shellext/stobject/csystray.cpp +++ b/dll/shellext/stobject/csystray.cpp @@ -121,11 +121,12 @@ HRESULT CSysTray::ProcessIconMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, LR *--*/ HRESULT CSysTray::NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip, DWORD dwstate) { - NOTIFYICONDATA nim = { 0 }; + NOTIFYICONDATA nim; TRACE("NotifyIcon code=%d, uId=%d, hIcon=%p, szTip=%S\n", code, uId, hIcon, szTip); - nim.cbSize = sizeof(NOTIFYICONDATA); + ZeroMemory(&nim, sizeof(nim)); + nim.cbSize = sizeof(nim); nim.uFlags = NIF_MESSAGE | NIF_ICON | NIF_STATE | NIF_TIP; nim.hIcon = hIcon; nim.uID = uId; diff --git a/dll/shellext/stobject/hotplug.cpp b/dll/shellext/stobject/hotplug.cpp index 5c6d3099a8..9550d23960 100644 --- a/dll/shellext/stobject/hotplug.cpp +++ b/dll/shellext/stobject/hotplug.cpp @@ -100,8 +100,10 @@ HRESULT EnumHotpluggedDevices(CSimpleArray<DEVINST> &devList) *--*/ HRESULT NotifyBalloon(CSysTray* pSysTray, LPCWSTR szTitle = NULL, LPCWSTR szInfo = NULL, UINT uId = ID_ICON_HOTPLUG) { - NOTIFYICONDATA nim = { 0 }; - nim.cbSize = sizeof(NOTIFYICONDATA); + NOTIFYICONDATA nim; + + ZeroMemory(&nim, sizeof(nim)); + nim.cbSize = sizeof(nim); nim.uID = uId; nim.hWnd = pSysTray->GetHWnd();

6 years, 7 months

03/05: [NETSHELL] Don't use hardcoded values.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af4bdd4388746333b584b… commit af4bdd4388746333b584b3c996e8f580e3701094 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 4 01:53:24 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 4 01:56:59 2018 +0100 [NETSHELL] Don't use hardcoded values. --- dll/shellext/netshell/lanstatusui.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/shellext/netshell/lanstatusui.cpp b/dll/shellext/netshell/lanstatusui.cpp index 599eb22841..6cfd065b46 100644 --- a/dll/shellext/netshell/lanstatusui.cpp +++ b/dll/shellext/netshell/lanstatusui.cpp @@ -232,7 +232,7 @@ UpdateLanStatus(HWND hwndDlg, LANSTATUSUI_CONTEXT * pContext) nid.cbSize = sizeof(nid); nid.uID = pContext->uID; nid.hWnd = pContext->hwndStatusDlg; - nid.uVersion = 3; + nid.uVersion = NOTIFYICON_VERSION; if (pContext->pNet->GetProperties(&pProperties) == S_OK) { @@ -1041,7 +1041,7 @@ CLanStatus::InitializeNetTaskbarNotifications() nid.cbSize = sizeof(nid); nid.uID = Index++; nid.uFlags = NIF_MESSAGE; - nid.uVersion = 3; + nid.uVersion = NOTIFYICON_VERSION; nid.uCallbackMessage = WM_SHOWSTATUSDLG; nid.hWnd = hwndDlg;

6 years, 7 months

02/05: [SHELL32] Fix copy-pasta.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ecabcce59d7c773d9d9d… commit 5ecabcce59d7c773d9d9d24f718b242892203b47 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 4 01:52:50 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 4 01:56:56 2018 +0100 [SHELL32] Fix copy-pasta. --- dll/win32/shell32/systray.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/systray.cpp b/dll/win32/shell32/systray.cpp index 435411a172..aa07708d4d 100644 --- a/dll/win32/shell32/systray.cpp +++ b/dll/win32/shell32/systray.cpp @@ -125,7 +125,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW pnid) { WARN("Invalid cbSize (%d) - using only Win95 fields (size=%d)\n", pnid->cbSize, NOTIFYICONDATAW_V1_SIZE); - cbSize = NOTIFYICONDATAA_V1_SIZE; + cbSize = NOTIFYICONDATAW_V1_SIZE; } else cbSize = pnid->cbSize;

6 years, 7 months

01/05: [PSDK] Fix NOTIFYICONDATA structure; add NOTIFYICONDATA_V3_SIZE definitions.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d2139b7d8b9f8e36e070… commit 9d2139b7d8b9f8e36e07059b9ff8ee65ef5f29df Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 4 01:51:46 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 4 01:56:53 2018 +0100 [PSDK] Fix NOTIFYICONDATA structure; add NOTIFYICONDATA_V3_SIZE definitions. --- sdk/include/psdk/shellapi.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/include/psdk/shellapi.h b/sdk/include/psdk/shellapi.h index 5845c2a9bb..2e26e59868 100644 --- a/sdk/include/psdk/shellapi.h +++ b/sdk/include/psdk/shellapi.h @@ -217,8 +217,6 @@ typedef struct _NOTIFYICONDATAA { } DUMMYUNIONNAME; CHAR szInfoTitle[64]; DWORD dwInfoFlags; -#else - CHAR szTip[64]; #endif #if (NTDDI_VERSION >= NTDDI_WINXP) GUID guidItem; @@ -236,7 +234,7 @@ typedef struct _NOTIFYICONDATAW { UINT uCallbackMessage; HICON hIcon; #if (NTDDI_VERSION < NTDDI_WIN2K) - CHAR szTip[64]; + WCHAR szTip[64]; #endif #if (NTDDI_VERSION >= NTDDI_WIN2K) WCHAR szTip[128]; @@ -249,14 +247,12 @@ typedef struct _NOTIFYICONDATAW { } DUMMYUNIONNAME; WCHAR szInfoTitle[64]; DWORD dwInfoFlags; -#else - WCHAR szTip[64]; #endif #if (NTDDI_VERSION >= NTDDI_WINXP) GUID guidItem; #endif #if (NTDDI_VERSION >= NTDDI_VISTA) - HICON hBalloonIcon; + HICON hBalloonIcon; #endif } NOTIFYICONDATAW,*PNOTIFYICONDATAW; @@ -264,6 +260,8 @@ typedef struct _NOTIFYICONDATAW { #define NOTIFYICONDATAW_V1_SIZE FIELD_OFFSET(NOTIFYICONDATAW, szTip[64]) #define NOTIFYICONDATAA_V2_SIZE FIELD_OFFSET(NOTIFYICONDATAA, guidItem) #define NOTIFYICONDATAW_V2_SIZE FIELD_OFFSET(NOTIFYICONDATAW, guidItem) +#define NOTIFYICONDATAA_V3_SIZE FIELD_OFFSET(NOTIFYICONDATAA, hBalloonIcon) +#define NOTIFYICONDATAW_V3_SIZE FIELD_OFFSET(NOTIFYICONDATAW, hBalloonIcon) #if WINVER >= 0x400 typedef struct _DRAGINFOA { @@ -612,6 +610,7 @@ DoEnvironmentSubstW( #ifdef UNICODE #define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAW_V1_SIZE #define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAW_V2_SIZE +#define NOTIFYICONDATA_V3_SIZE NOTIFYICONDATAW_V3_SIZE typedef NOTIFYICONDATAW NOTIFYICONDATA,*PNOTIFYICONDATA; typedef DRAGINFOW DRAGINFO,*LPDRAGINFO; typedef SHELLEXECUTEINFOW SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO; @@ -639,6 +638,7 @@ typedef LPSHNAMEMAPPINGW LPSHNAMEMAPPING; #else #define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAA_V1_SIZE #define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAA_V2_SIZE +#define NOTIFYICONDATA_V3_SIZE NOTIFYICONDATAA_V3_SIZE typedef NOTIFYICONDATAA NOTIFYICONDATA,*PNOTIFYICONDATA; typedef DRAGINFOA DRAGINFO,*LPDRAGINFO; typedef SHELLEXECUTEINFOA SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO;

6 years, 7 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 February 2018