Ros-diffs October 2015

ros-diffs@reactos.org

18 participants
347 discussions

[hbelusca] 69717: [MSCONFIG_NEW] - Port the Services page in C++ and implement hide/show MS/ReactOS services & enable/disable. WIP. - Fix resource ID for the "delete" button in the FreeLdr page. - ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Oct 26 23:03:21 2015 New Revision: 69717 URL: http://svn.reactos.org/svn/reactos?rev=69717&view=rev Log: [MSCONFIG_NEW] - Port the Services page in C++ and implement hide/show MS/ReactOS services & enable/disable. WIP. - Fix resource ID for the "delete" button in the FreeLdr page. - Revert the freeldr "advanced" dialog that I erroneously removed in r69638. CORE-9333 Added: trunk/reactos/base/applications/msconfig_new/regutils.c (with props) trunk/reactos/base/applications/msconfig_new/regutils.h (with props) trunk/reactos/base/applications/msconfig_new/srvpage.cpp (with props) Removed: trunk/reactos/base/applications/msconfig_new/srvpage.c Modified: trunk/reactos/base/applications/msconfig_new/CMakeLists.txt trunk/reactos/base/applications/msconfig_new/fileextractdialog.c trunk/reactos/base/applications/msconfig_new/freeldrpage.c trunk/reactos/base/applications/msconfig_new/generalpage.c trunk/reactos/base/applications/msconfig_new/lang/bg-BG.rc trunk/reactos/base/applications/msconfig_new/lang/ca-ES.rc trunk/reactos/base/applications/msconfig_new/lang/cs-CZ.rc trunk/reactos/base/applications/msconfig_new/lang/de-DE.rc trunk/reactos/base/applications/msconfig_new/lang/el-GR.rc trunk/reactos/base/applications/msconfig_new/lang/en-US.rc trunk/reactos/base/applications/msconfig_new/lang/es-ES.rc trunk/reactos/base/applications/msconfig_new/lang/fr-FR.rc trunk/reactos/base/applications/msconfig_new/lang/he-IL.rc trunk/reactos/base/applications/msconfig_new/lang/hu-HU.rc trunk/reactos/base/applications/msconfig_new/lang/id-ID.rc trunk/reactos/base/applications/msconfig_new/lang/it-IT.rc trunk/reactos/base/applications/msconfig_new/lang/ko-KR.rc trunk/reactos/base/applications/msconfig_new/lang/nl-NL.rc trunk/reactos/base/applications/msconfig_new/lang/no-NO.rc trunk/reactos/base/applications/msconfig_new/lang/pl-PL.rc trunk/reactos/base/applications/msconfig_new/lang/pt-BR.rc trunk/reactos/base/applications/msconfig_new/lang/ro-RO.rc trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc trunk/reactos/base/applications/msconfig_new/lang/sk-SK.rc trunk/reactos/base/applications/msconfig_new/lang/sq-AL.rc trunk/reactos/base/applications/msconfig_new/lang/sv-SE.rc trunk/reactos/base/applications/msconfig_new/lang/th-TH.rc trunk/reactos/base/applications/msconfig_new/lang/tr-TR.rc trunk/reactos/base/applications/msconfig_new/lang/uk-UA.rc trunk/reactos/base/applications/msconfig_new/lang/zh-CN.rc trunk/reactos/base/applications/msconfig_new/lang/zh-TW.rc trunk/reactos/base/applications/msconfig_new/msconfig.c trunk/reactos/base/applications/msconfig_new/msconfig.h trunk/reactos/base/applications/msconfig_new/resource.h trunk/reactos/base/applications/msconfig_new/srvpage.h trunk/reactos/base/applications/msconfig_new/toolspage.cpp trunk/reactos/base/applications/msconfig_new/utils.c trunk/reactos/base/applications/msconfig_new/xmldomparser.cpp trunk/reactos/base/applications/msconfig_new/xmldomparser.hpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/msconfig_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/fileextractdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/freeldrpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/generalpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/msconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Added: trunk/reactos/base/applications/msconfig_new/regutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Added: trunk/reactos/base/applications/msconfig_new/regutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Removed: trunk/reactos/base/applications/msconfig_new/srvpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Added: trunk/reactos/base/applications/msconfig_new/srvpage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/srvpage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/toolspage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/xmldomparser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/xmldomparser.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…

8 years, 10 months

[spetreolle] 69716: Disable mmdevapi from build. Its Vista+, called by apps, and relies on wine-only dlls like winepulse.drv, winealsa.drv, wineoss.drv. CORE-10418

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Mon Oct 26 22:56:55 2015 New Revision: 69716 URL: http://svn.reactos.org/svn/reactos?rev=69716&view=rev Log: Disable mmdevapi from build. Its Vista+, called by apps, and relies on wine-only dlls like winepulse.drv,winealsa.drv,wineoss.drv. CORE-10418 Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/media/inf/syssetup.inf Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Mon Oct 26 22:56:55 2015 @@ -85,7 +85,7 @@ add_subdirectory(mciwave) add_subdirectory(mgmtapi) add_subdirectory(mlang) -add_subdirectory(mmdevapi) +#add_subdirectory(mmdevapi) add_subdirectory(mmdrv) add_subdirectory(modemui) add_subdirectory(mpr) Modified: trunk/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev… ============================================================================== --- trunk/reactos/media/inf/syssetup.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/syssetup.inf [iso-8859-1] Mon Oct 26 22:56:55 2015 @@ -61,7 +61,7 @@ 11,,jscript.dll,1 ;11,,ksproxy.ax,1 11,,mlang.dll,1 -11,,mmdevapi.dll,1 +;11,,mmdevapi.dll,1 11,,mscat32.dll,1 11,,msctf.dll,1 11,,mshtml.dll,3

8 years, 10 months

[hbelusca] 69715: [COMSUPP]: Use "operator new" and "operator delete" in order to avoid strange linkage problems (like "operator delete[]" not found, etc...) while being compatible with MS version ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Oct 26 22:30:44 2015 New Revision: 69715 URL: http://svn.reactos.org/svn/reactos?rev=69715&view=rev Log: [COMSUPP]: Use "operator new" and "operator delete" in order to avoid strange linkage problems (like "operator delete[]" not found, etc...) while being compatible with MS version of comsupp.lib. Modified: trunk/reactos/lib/sdk/comsupp/comsupp.cpp Modified: trunk/reactos/lib/sdk/comsupp/comsupp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/comsupp/comsupp.cp… ============================================================================== --- trunk/reactos/lib/sdk/comsupp/comsupp.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/comsupp/comsupp.cpp [iso-8859-1] Mon Oct 26 22:30:44 2015 @@ -109,7 +109,7 @@ } /* Allocate the string */ - szOut = new char[cb]; + szOut = (char*)::operator new(cb * sizeof(char)); if (!szOut) { ::_com_issue_error(HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY)); @@ -123,7 +123,7 @@ /* We failed, clean everything up */ cwch = ::GetLastError(); - delete[] szOut; + ::operator delete(szOut); szOut = NULL; ::_com_issue_error(!IS_ERROR(cwch) ? HRESULT_FROM_WIN32(cwch) : cwch);

8 years, 10 months

[ekohl] 69714: [NTOSKRNL][LSASRV] - Move the message typedefs into a shared header file. - Implement LsapRmCreateLogonSession and LsapRmDeleteLogonSession. Call LsapRmCreateLogonSession in LsapCrea...

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Oct 26 21:03:40 2015 New Revision: 69714 URL: http://svn.reactos.org/svn/reactos?rev=69714&view=rev Log: [NTOSKRNL][LSASRV] - Move the message typedefs into a shared header file. - Implement LsapRmCreateLogonSession and LsapRmDeleteLogonSession. Call LsapRmCreateLogonSession in LsapCreateLogonSession. Added: trunk/reactos/include/reactos/srmp.h (with props) Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/session.c trunk/reactos/dll/win32/lsasrv/srm.c trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/ntoskrnl/se/srm.c Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Mon Oct 26 21:03:40 2015 @@ -32,6 +32,8 @@ #include <ntsam.h> #include <ntlsa.h> #include <sddl.h> + +#include <srmp.h> #include <lsass.h> #include <lsa_s.h> @@ -425,6 +427,14 @@ NTSTATUS LsapRmInitializeServer(VOID); +NTSTATUS +LsapRmCreateLogonSession( + PLUID LogonId); + +NTSTATUS +LsapRmDeleteLogonSession( + PLUID LogonId); + /* utils.c */ INT LsapLoadString(HINSTANCE hInstance, Modified: trunk/reactos/dll/win32/lsasrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/session.c… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] Mon Oct 26 21:03:40 2015 @@ -68,7 +68,7 @@ { PLSAP_LOGON_SESSION Session; - TRACE("LsapSetLogonSessionData()\n"); + TRACE("LsapSetLogonSessionData(%p)\n", LogonId); Session = LsapGetLogonSession(LogonId); if (Session == NULL) @@ -84,8 +84,9 @@ LsapCreateLogonSession(IN PLUID LogonId) { PLSAP_LOGON_SESSION Session; - - TRACE("()\n"); + NTSTATUS Status; + + TRACE("LsapCreateLogonSession(%p)\n", LogonId); /* Fail, if a session already exists */ if (LsapGetLogonSession(LogonId) != NULL) @@ -101,6 +102,16 @@ /* Initialize the session entry */ RtlCopyLuid(&Session->LogonId, LogonId); + TRACE("LsapCreateLogonSession(<0x%lx,0x%lx>)\n", + LogonId->HighPart, LogonId->LowPart); + + Status = LsapRmCreateLogonSession(LogonId); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Session); + return Status; + } + /* Insert the new session into the session list */ InsertHeadList(&SessionListHead, &Session->Entry); SessionCount++; @@ -115,7 +126,7 @@ { PLSAP_LOGON_SESSION Session; - TRACE("()\n"); + TRACE("LsapDeleteLogonSession(%p)\n", LogonId); /* Fail, if the session does not exist */ Session = LsapGetLogonSession(LogonId); Modified: trunk/reactos/dll/win32/lsasrv/srm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/srm.c?rev… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/srm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/srm.c [iso-8859-1] Mon Oct 26 21:03:40 2015 @@ -11,28 +11,6 @@ #include "lsasrv.h" #include <ndk/ntndk.h> - -typedef struct _LSAP_RM_API_MESSAGE -{ - PORT_MESSAGE Header; - ULONG ApiNumber; - union - { - UCHAR Fill[PORT_MAXIMUM_MESSAGE_LENGTH - sizeof(PORT_MESSAGE)]; - struct - { - ULONG Info1; - } WriteLog; - - } u; -} LSAP_RM_API_MESSAGE, *PLSAP_RM_API_MESSAGE; - -enum _LSAP_API_NUMBER -{ - LsapAdtWriteLogApi = 1, - LsapComponentTestApi, - LsapAsyncApi -}; /* GLOBALS *****************************************************************/ @@ -262,3 +240,83 @@ return STATUS_SUCCESS; } + +NTSTATUS +LsapRmCreateLogonSession( + PLUID LogonId) +{ + SEP_RM_API_MESSAGE RequestMessage; + SEP_RM_API_MESSAGE ReplyMessage; + NTSTATUS Status; + + TRACE("LsapRmCreateLogonSession(%p)\n", LogonId); + + RequestMessage.Header.u2.ZeroInit = 0; + RequestMessage.Header.u1.s1.TotalLength = + (CSHORT)(sizeof(PORT_MESSAGE) + sizeof(ULONG) + sizeof(LUID)); + RequestMessage.Header.u1.s1.DataLength = + RequestMessage.Header.u1.s1.TotalLength - + (CSHORT)sizeof(PORT_MESSAGE); + + RequestMessage.ApiNumber = (ULONG)RmCreateLogonSession; + RtlCopyLuid(&RequestMessage.u.LogonLuid, LogonId); + + ReplyMessage.Header.u2.ZeroInit = 0; + ReplyMessage.Header.u1.s1.TotalLength = + (CSHORT)(sizeof(PORT_MESSAGE) + sizeof(ULONG) + sizeof(NTSTATUS)); + ReplyMessage.Header.u1.s1.DataLength = + ReplyMessage.Header.u1.s1.TotalLength - + (CSHORT)sizeof(PORT_MESSAGE); + + ReplyMessage.u.ResultStatus = STATUS_SUCCESS; + + Status = NtRequestWaitReplyPort(SeRmCommandPort, + (PPORT_MESSAGE)&RequestMessage, + (PPORT_MESSAGE)&ReplyMessage); + if (NT_SUCCESS(Status)) + { + Status = ReplyMessage.u.ResultStatus; + } + + return Status; +} + +NTSTATUS +LsapRmDeleteLogonSession( + PLUID LogonId) +{ + SEP_RM_API_MESSAGE RequestMessage; + SEP_RM_API_MESSAGE ReplyMessage; + NTSTATUS Status; + + TRACE("LsapRmDeleteLogonSession(%p)\n", LogonId); + + RequestMessage.Header.u2.ZeroInit = 0; + RequestMessage.Header.u1.s1.TotalLength = + (CSHORT)(sizeof(PORT_MESSAGE) + sizeof(ULONG) + sizeof(LUID)); + RequestMessage.Header.u1.s1.DataLength = + RequestMessage.Header.u1.s1.TotalLength - + (CSHORT)sizeof(PORT_MESSAGE); + + RequestMessage.ApiNumber = (ULONG)RmDeleteLogonSession; + RtlCopyLuid(&RequestMessage.u.LogonLuid, LogonId); + + ReplyMessage.Header.u2.ZeroInit = 0; + ReplyMessage.Header.u1.s1.TotalLength = + (CSHORT)(sizeof(PORT_MESSAGE) + sizeof(ULONG) + sizeof(NTSTATUS)); + ReplyMessage.Header.u1.s1.DataLength = + ReplyMessage.Header.u1.s1.TotalLength - + (CSHORT)sizeof(PORT_MESSAGE); + + ReplyMessage.u.ResultStatus = STATUS_SUCCESS; + + Status = NtRequestWaitReplyPort(SeRmCommandPort, + (PPORT_MESSAGE)&RequestMessage, + (PPORT_MESSAGE)&ReplyMessage); + if (NT_SUCCESS(Status)) + { + Status = ReplyMessage.u.ResultStatus; + } + + return Status; +} Added: trunk/reactos/include/reactos/srmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/srmp.h?rev… ============================================================================== --- trunk/reactos/include/reactos/srmp.h (added) +++ trunk/reactos/include/reactos/srmp.h [iso-8859-1] Mon Oct 26 21:03:40 2015 @@ -0,0 +1,51 @@ +#ifndef _SRMP_ +#define _SRMP_ + +typedef enum _RM_API_NUMBER +{ + RmAuditSetCommand = 1, + RmCreateLogonSession = 2, + RmDeleteLogonSession = 3 +} RM_API_NUMBER; + +typedef struct _SEP_RM_API_MESSAGE +{ + PORT_MESSAGE Header; + ULONG ApiNumber; + union + { + UCHAR Fill[PORT_MAXIMUM_MESSAGE_LENGTH - sizeof(PORT_MESSAGE)]; + NTSTATUS ResultStatus; + struct + { + BOOLEAN Enabled; + ULONG Flags[9]; + } SetAuditEvent; + LUID LogonLuid; + } u; +} SEP_RM_API_MESSAGE, *PSEP_RM_API_MESSAGE; + + +typedef enum _LSAP_API_NUMBER +{ + LsapAdtWriteLogApi = 1, + LsapComponentTestApi, + LsapAsyncApi +} LSAP_API_NUMBER; + +typedef struct _LSAP_RM_API_MESSAGE +{ + PORT_MESSAGE Header; + ULONG ApiNumber; + union + { + UCHAR Fill[PORT_MAXIMUM_MESSAGE_LENGTH - sizeof(PORT_MESSAGE)]; + struct + { + ULONG Info1; + } WriteLog; + + } u; +} LSAP_RM_API_MESSAGE, *PLSAP_RM_API_MESSAGE; + +#endif /* _SRMP_ */ Propchange: trunk/reactos/include/reactos/srmp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Mon Oct 26 21:03:40 2015 @@ -88,6 +88,9 @@ /* PNP GUIDs */ #include <umpnpmgr/sysguid.h> +/* SRM header */ +#include <srmp.h> + #define ExRaiseStatus RtlRaiseStatus // Modified: trunk/reactos/ntoskrnl/se/srm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/srm.c?rev=6971… ============================================================================== --- trunk/reactos/ntoskrnl/se/srm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/srm.c [iso-8859-1] Mon Oct 26 21:03:40 2015 @@ -19,30 +19,6 @@ /* PRIVATE DEFINITIONS ********************************************************/ #define SEP_LOGON_SESSION_TAG 'sLeS' - -enum _RM_API_NUMBER -{ - RmAuditSetCommand = 1, - RmCreateLogonSession = 2, - RmDeleteLogonSession = 3 -}; - -typedef struct _SEP_RM_API_MESSAGE -{ - PORT_MESSAGE Header; - ULONG ApiNumber; - union - { - UCHAR Fill[PORT_MAXIMUM_MESSAGE_LENGTH - sizeof(PORT_MESSAGE)]; - NTSTATUS ResultStatus; - struct - { - BOOLEAN Enabled; - ULONG Flags[9]; - } SetAuditEvent; - LUID LogonLuid; - } u; -} SEP_RM_API_MESSAGE, *PSEP_RM_API_MESSAGE; typedef struct _SEP_LOGON_SESSION_REFERENCES {

8 years, 10 months

[gadamopoulos] 69713: [SHELL32] - Remove a few todo comments that are now completed. Also remove numbers to make it simpler to remove one entry from the todo list.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Oct 26 15:51:21 2015 New Revision: 69713 URL: http://svn.reactos.org/svn/reactos?rev=69713&view=rev Log: [SHELL32] - Remove a few todo comments that are now completed. Also remove numbers to make it simpler to remove one entry from the todo list. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Mon Oct 26 15:51:21 2015 @@ -24,28 +24,23 @@ * built according to the columns shown. * * FIXME: CheckToolbar: handle the "new folder" and "folder up" button - * - * FIXME: ShellView_FillList: consider sort orders */ /* TODO: -1. Load/Save the view state from/into the stream provided by the ShellBrowser. -2. Let the shell folder sort items. -3. Code to merge menus in the shellbrowser is incorrect. -4. Move the background context menu creation into shell view. It should store the - shell view HWND to send commands. -5. Send init, measure, and draw messages to context menu during tracking. -6. Shell view should do SetCommandTarget on internet toolbar. -7. When editing starts on item, set edit text to for editing value. -8. When shell view is called back for item info, let listview save the value. -9. Shell view should update status bar. -10. Fix shell view to handle view mode popup exec. -11. The background context menu should have a pidl just like foreground menus. This - causes crashes when dynamic handlers try to use the NULL pidl. -12. The SHELLDLL_DefView should not be filled with blue unconditionally. This causes - annoying flashing of blue even on XP, and is not correct. -13. Reorder of columns doesn't work - might be bug in comctl32 +- Load/Save the view state from/into the stream provided by the ShellBrowser. +- Code to merge menus in the shellbrowser is incorrect. +- Move the background context menu creation into shell view. It should store the + shell view HWND to send commands. +- Shell view should do SetCommandTarget on internet toolbar. +- When editing starts on item, set edit text to for editing value. +- When shell view is called back for item info, let listview save the value. +- Fix shell view to handle view mode popup exec. +- The background context menu should have a pidl just like foreground menus. This + causes crashes when dynamic handlers try to use the NULL pidl. +- The SHELLDLL_DefView should not be filled with blue unconditionally. This causes + annoying flashing of blue even on XP, and is not correct. +- Reorder of columns doesn't work - might be bug in comctl32 */ #include "precomp.h"

8 years, 10 months

[gadamopoulos] 69712: [SHELL32] - Implement CompareIDs for the folders in the shell namespace. The previous implementation was a generic solution that just compared names. - CDefView: Implement usi...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Oct 26 15:07:44 2015 New Revision: 69712 URL: http://svn.reactos.org/svn/reactos?rev=69712&view=rev Log: [SHELL32] - Implement CompareIDs for the folders in the shell namespace. The previous implementation was a generic solution that just compared names. - CDefView: Implement using CompareIDs method from the IShellFolder. Remove the previous implementation that was hardcoded in the CDefView and worked mostly for file items. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp trunk/reactos/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shlfolder.cpp trunk/reactos/include/reactos/shellutils.h Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Mon Oct 26 15:07:44 2015 @@ -131,7 +131,6 @@ BOOL CreateList(); void UpdateListColors(); BOOL InitList(); - static INT CALLBACK CompareItems(LPVOID lParam1, LPVOID lParam2, LPARAM lpData); static INT CALLBACK ListViewCompareItems(LPARAM lParam1, LPARAM lParam2, LPARAM lpData); PCUITEMID_CHILD _PidlByItem(int i); @@ -335,13 +334,6 @@ END_COM_MAP() }; -/* ListView Header ID's */ -#define LISTVIEW_COLUMN_NAME 0 -#define LISTVIEW_COLUMN_SIZE 1 -#define LISTVIEW_COLUMN_TYPE 2 -#define LISTVIEW_COLUMN_TIME 3 -#define LISTVIEW_COLUMN_ATTRIB 4 - /*menu items */ #define IDM_VIEW_FILES (FCIDM_SHVIEWFIRST + 0x500) #define IDM_VIEW_IDW (FCIDM_SHVIEWFIRST + 0x501) @@ -648,30 +640,6 @@ return TRUE; } -/********************************************************** -* ShellView_CompareItems() -* -* NOTES -* internal, CALLBACK for DSA_Sort -*/ -INT CALLBACK CDefView::CompareItems(LPVOID lParam1, LPVOID lParam2, LPARAM lpData) -{ - int ret; - TRACE("pidl1=%p pidl2=%p lpsf=%p\n", lParam1, lParam2, (LPVOID) lpData); - - if (!lpData) - return 0; - - IShellFolder* psf = reinterpret_cast<IShellFolder*>(lpData); - PCUIDLIST_RELATIVE pidl1 = reinterpret_cast<PCUIDLIST_RELATIVE>(lParam1); - PCUIDLIST_RELATIVE pidl2 = reinterpret_cast<PCUIDLIST_RELATIVE>(lParam2); - - ret = (SHORT)SCODE_CODE(psf->CompareIDs(0, pidl1, pidl2)); - TRACE("ret=%i\n", ret); - - return ret; -} - /************************************************************************* * ShellView_ListViewCompareItems * @@ -686,89 +654,20 @@ * A negative value if the first item should precede the second, * a positive value if the first item should follow the second, * or zero if the two items are equivalent - * - * NOTES - * FIXME: function does what ShellView_CompareItems is supposed to do. - * unify it and figure out how to use the undocumented first parameter - * of IShellFolder_CompareIDs to do the job this function does and - * move this code to IShellFolder. - * make LISTVIEW_SORT_INFO obsolete - * the way this function works is only usable if we had only - * filesystemfolders (25/10/99 jsch) */ INT CALLBACK CDefView::ListViewCompareItems(LPARAM lParam1, LPARAM lParam2, LPARAM lpData) { - INT nDiff = 0; - FILETIME fd1, fd2; - char strName1[MAX_PATH], strName2[MAX_PATH]; - BOOL bIsFolder1, bIsFolder2, bIsBothFolder; PCUIDLIST_RELATIVE pidl1 = reinterpret_cast<PCUIDLIST_RELATIVE>(lParam1); PCUIDLIST_RELATIVE pidl2 = reinterpret_cast<PCUIDLIST_RELATIVE>(lParam2); - LISTVIEW_SORT_INFO *pSortInfo = reinterpret_cast<LPLISTVIEW_SORT_INFO>(lpData); - - - bIsFolder1 = _ILIsFolder(pidl1); - bIsFolder2 = _ILIsFolder(pidl2); - bIsBothFolder = bIsFolder1 && bIsFolder2; - - /* When sorting between a File and a Folder, the Folder gets sorted first */ - if ( (bIsFolder1 || bIsFolder2) && !bIsBothFolder) - { - nDiff = bIsFolder1 ? -1 : 1; - } - else - { - /* Sort by Time: Folders or Files can be sorted */ - - if(pSortInfo->nHeaderID == LISTVIEW_COLUMN_TIME) - { - _ILGetFileDateTime(pidl1, &fd1); - _ILGetFileDateTime(pidl2, &fd2); - nDiff = CompareFileTime(&fd2, &fd1); - } - /* Sort by Attribute: Folder or Files can be sorted */ - else if(pSortInfo->nHeaderID == LISTVIEW_COLUMN_ATTRIB) - { - _ILGetFileAttributes(pidl1, strName1, MAX_PATH); - _ILGetFileAttributes(pidl2, strName2, MAX_PATH); - nDiff = lstrcmpiA(strName1, strName2); - } - /* Sort by FileName: Folder or Files can be sorted */ - else if (pSortInfo->nHeaderID == LISTVIEW_COLUMN_NAME || bIsBothFolder) - { - /* Sort by Text */ - _ILSimpleGetText(pidl1, strName1, MAX_PATH); - _ILSimpleGetText(pidl2, strName2, MAX_PATH); - nDiff = lstrcmpiA(strName1, strName2); - } - /* Sort by File Size, Only valid for Files */ - else if (pSortInfo->nHeaderID == LISTVIEW_COLUMN_SIZE) - { - nDiff = (INT)(_ILGetFileSize(pidl1, NULL, 0) - _ILGetFileSize(pidl2, NULL, 0)); - } - /* Sort by File Type, Only valid for Files */ - else if (pSortInfo->nHeaderID == LISTVIEW_COLUMN_TYPE) - { - /* Sort by Type */ - _ILGetFileType(pidl1, strName1, MAX_PATH); - _ILGetFileType(pidl2, strName2, MAX_PATH); - nDiff = lstrcmpiA(strName1, strName2); - } - } - /* If the Date, FileSize, FileType, Attrib was the same, sort by FileName */ - - if (nDiff == 0) - { - _ILSimpleGetText(pidl1, strName1, MAX_PATH); - _ILSimpleGetText(pidl2, strName2, MAX_PATH); - nDiff = lstrcmpiA(strName1, strName2); - } - - if (!pSortInfo->bIsAscending) - { + CDefView *pThis = reinterpret_cast<CDefView*>(lpData); + + HRESULT hres = pThis->m_pSFParent->CompareIDs(pThis->m_sortInfo.nHeaderID, pidl1, pidl2); + if (FAILED_UNEXPECTEDLY(hres)) + return 0; + + SHORT nDiff = HRESULT_CODE(hres); + if (!pThis->m_sortInfo.bIsAscending) nDiff = -nDiff; - } - return nDiff; } @@ -975,13 +874,16 @@ } } - /* sort the array */ - DPA_Sort(hdpa, CompareItems, reinterpret_cast<LPARAM>(m_pSFParent.p)); - /*turn the listview's redrawing off*/ m_ListView.SetRedraw(FALSE); DPA_DestroyCallback( hdpa, fill_list, this); + + /* sort the array */ + m_pSF2Parent->GetDefaultColumn(NULL, (ULONG*)&m_sortInfo.nHeaderID, NULL); + m_sortInfo.bIsAscending = TRUE; + m_sortInfo.nLastHeaderID = m_sortInfo.nHeaderID; + m_ListView.SortItems(ListViewCompareItems, this); /*turn the listview's redrawing back on and force it to draw*/ m_ListView.SetRedraw(TRUE); @@ -1658,7 +1560,7 @@ m_sortInfo.nHeaderID = dwCmdID - 0x30; m_sortInfo.bIsAscending = TRUE; m_sortInfo.nLastHeaderID = m_sortInfo.nHeaderID; - m_ListView.SortItems(ListViewCompareItems, &m_sortInfo); + m_ListView.SortItems(ListViewCompareItems, this); break; case FCIDM_SHVIEW_SELECTALL: @@ -1788,7 +1690,7 @@ m_sortInfo.bIsAscending = TRUE; m_sortInfo.nLastHeaderID = m_sortInfo.nHeaderID; - m_ListView.SortItems(ListViewCompareItems, &m_sortInfo); + m_ListView.SortItems(ListViewCompareItems, this); break; case LVN_GETDISPINFOA: Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] Mon Oct 26 15:07:44 2015 @@ -49,7 +49,7 @@ */ static const shvheader ControlPanelSFHeader[] = { - {IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15},/*FIXME*/ + {IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 20},/*FIXME*/ {IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 80},/*FIXME*/ }; @@ -336,15 +336,34 @@ /************************************************************************** * CControlPanelFolder::CompareIDs */ - HRESULT WINAPI CControlPanelFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { - int nReturn; - - TRACE("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", this, lParam, pidl1, pidl2); - nReturn = SHELL32_CompareIDs(this, lParam, pidl1, pidl2); - TRACE("-- %i\n", nReturn); - return nReturn; + /* Dont use SHELL32_CompareGuidItems because it would cause guid items to come first */ + if (_ILIsSpecialFolder(pidl1) || _ILIsSpecialFolder(pidl2)) + { + return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); + } + PIDLCPanelStruct *pData1 = _ILGetCPanelPointer(pidl1); + PIDLCPanelStruct *pData2 = _ILGetCPanelPointer(pidl2); + + if (!pData1 || !pData2 || LOWORD(lParam)>= CONROLPANELSHELLVIEWCOLUMNS) + return E_INVALIDARG; + + int result; + switch(LOWORD(lParam)) + { + case 0: /* name */ + result = wcsicmp(pData1->szName + pData1->offsDispName, pData2->szName + pData2->offsDispName); + break; + case 1: /* comment */ + result = wcsicmp(pData1->szName + pData1->offsComment, pData2->szName + pData2->offsComment); + break; + default: + ERR("Got wrong lParam!\n"); + return E_INVALIDARG; + } + + return MAKE_COMPARE_HRESULT(result); } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Mon Oct 26 15:07:44 2015 @@ -63,14 +63,13 @@ int SHELL_ConfirmMsgBox(HWND hWnd, LPWSTR lpszText, LPWSTR lpszCaption, HICON hIcon, BOOL bYesToAll); static const shvheader DesktopSFHeader[] = { - {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, + {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15}, {IDS_SHV_COLUMN2, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, - {IDS_SHV_COLUMN3, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, - {IDS_SHV_COLUMN4, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 12}, - {IDS_SHV_COLUMN5, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 5} + {IDS_SHV_COLUMN3, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 10}, + {IDS_SHV_COLUMN4, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 12}, }; -#define DESKTOPSHELLVIEWCOLUMNS 5 +#define DESKTOPSHELLVIEWCOLUMNS 4 static const DWORD dwDesktopAttributes = SFGAO_HASSUBFOLDER | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR | @@ -465,7 +464,7 @@ HRESULT WINAPI CDesktopFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { if (_ILIsSpecialFolder(pidl1) || _ILIsSpecialFolder(pidl2)) - return SHELL32_CompareIDs ((IShellFolder *)this, lParam, pidl1, pidl2); + return SHELL32_CompareGuidItems(this, lParam, pidl1, pidl2); return m_DesktopFSFolder->CompareIDs(lParam, pidl1, pidl2); } Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Mon Oct 26 15:07:44 2015 @@ -58,8 +58,8 @@ */ static const shvheader MyComputerSFHeader[] = { - {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, - {IDS_SHV_COLUMN3, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, + {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15}, + {IDS_SHV_COLUMN3, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 10}, {IDS_SHV_COLUMN6, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, {IDS_SHV_COLUMN7, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, }; @@ -298,12 +298,52 @@ HRESULT WINAPI CDrivesFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { - int nReturn; - - TRACE("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", this, lParam, pidl1, pidl2); - nReturn = SHELL32_CompareIDs (this, lParam, pidl1, pidl2); - TRACE("-- %i\n", nReturn); - return nReturn; + if (_ILIsSpecialFolder(pidl1) || _ILIsSpecialFolder(pidl2)) + return SHELL32_CompareGuidItems(this, lParam, pidl1, pidl2); + + if (!_ILIsDrive(pidl1) || !_ILIsDrive(pidl2) || LOWORD(lParam) >= MYCOMPUTERSHELLVIEWCOLUMNS) + return E_INVALIDARG; + + CHAR* pszDrive1 = _ILGetDataPointer(pidl1)->u.drive.szDriveName; + CHAR* pszDrive2 = _ILGetDataPointer(pidl2)->u.drive.szDriveName; + + int result; + switch(LOWORD(lParam)) + { + case 0: /* name */ + { + result = stricmp(pszDrive1, pszDrive2); + return MAKE_COMPARE_HRESULT(result); + } + case 1: /* Type */ + { + return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); + } + case 2: /* Size */ + case 3: /* Size Available */ + { + ULARGE_INTEGER Drive1Available, Drive1Total, Drive2Available, Drive2Total; + + if (GetVolumeInformationA(pszDrive1, NULL, 0, NULL, NULL, NULL, NULL, 0)) + GetDiskFreeSpaceExA(pszDrive1, &Drive1Available, &Drive1Total, NULL); + else + Drive1Available.QuadPart = Drive1Total.QuadPart = 0; + + if (GetVolumeInformationA(pszDrive2, NULL, 0, NULL, NULL, NULL, NULL, 0)) + GetDiskFreeSpaceExA(pszDrive2, &Drive2Available, &Drive2Total, NULL); + else + Drive2Available.QuadPart = Drive2Total.QuadPart = 0; + + LARGE_INTEGER Diff; + if (lParam == 2) /* Size */ + Diff.QuadPart = Drive1Total.QuadPart - Drive2Total.QuadPart; + else /* Size available */ + Diff.QuadPart = Drive1Available.QuadPart - Drive2Available.QuadPart; + + return MAKE_COMPARE_HRESULT(Diff.QuadPart); + } + } + return E_INVALIDARG; } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Mon Oct 26 15:07:44 2015 @@ -94,11 +94,11 @@ static const shvheader GenericSFHeader[] = { - {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, + {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15}, {IDS_SHV_COLUMN2, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, - {IDS_SHV_COLUMN3, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, - {IDS_SHV_COLUMN4, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 12}, - {IDS_SHV_COLUMN5, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 5} + {IDS_SHV_COLUMN3, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 10}, + {IDS_SHV_COLUMN4, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 12}, + {IDS_SHV_COLUMN5, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 10} }; #define GENERICSHELLVIEWCOLUMNS 5 @@ -319,12 +319,46 @@ PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { - int nReturn; - - TRACE("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", this, lParam, pidl1, pidl2); - nReturn = SHELL32_CompareIDs(this, lParam, pidl1, pidl2); - TRACE("-- %i\n", nReturn); - return nReturn; + LPPIDLDATA pData1 = _ILGetDataPointer(pidl1); + LPPIDLDATA pData2 = _ILGetDataPointer(pidl2); + FileStructW* pDataW1 = _ILGetFileStructW(pidl1); + FileStructW* pDataW2 = _ILGetFileStructW(pidl2); + BOOL bIsFolder1 = _ILIsFolder(pidl1); + BOOL bIsFolder2 = _ILIsFolder(pidl2); + LPWSTR pExtension1, pExtension2; + + if (!pDataW1 || !pDataW2 || LOWORD(lParam) >= GENERICSHELLVIEWCOLUMNS) + return E_INVALIDARG; + + /* When sorting between a File and a Folder, the Folder gets sorted first */ + if (bIsFolder1 != bIsFolder2) + { + return MAKE_COMPARE_HRESULT(bIsFolder1 ? -1 : 1); + } + + int result; + switch (LOWORD(lParam)) + { + case 0: /* Name */ + result = wcsicmp(pDataW1->wszName, pDataW2->wszName); + break; + case 2: /* Type */ + pExtension1 = PathFindExtensionW(pDataW1->wszName); + pExtension2 = PathFindExtensionW(pDataW2->wszName); + result = wcsicmp(pExtension1, pExtension2); + break; + case 1: /* Size */ + result = pData1->u.file.dwFileSize - pData2->u.file.dwFileSize; + break; + case 3: /* Modified */ + result = pData1->u.file.uFileDate - pData2->u.file.uFileDate; + if (result == 0) + result = pData1->u.file.uFileTime - pData2->u.file.uFileTime; + break; + case 4: /* Attributes */ + return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); + } + return MAKE_COMPARE_HRESULT(result); } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp [iso-8859-1] Mon Oct 26 15:07:44 2015 @@ -57,12 +57,12 @@ }; static shvheader PrinterSFHeader[] = { - {IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, - {IDS_SHV_COLUMN_DOCUMENTS , SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, - {IDS_SHV_COLUMN_STATUS, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, - {IDS_SHV_COLUMN_COMMENTS, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, - {IDS_SHV_COLUMN_LOCATION, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, - {IDS_SHV_COLUMN_MODEL, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15} + {IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15}, + {IDS_SHV_COLUMN_DOCUMENTS , SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15}, + {IDS_SHV_COLUMN_STATUS, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15}, + {IDS_SHV_COLUMN_COMMENTS, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15}, + {IDS_SHV_COLUMN_LOCATION, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15}, + {IDS_SHV_COLUMN_MODEL, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15} }; #define COLUMN_NAME 0 @@ -390,12 +390,7 @@ */ HRESULT WINAPI CPrinterFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { - int nReturn; - - TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", this, lParam, pidl1, pidl2); - nReturn = SHELL32_CompareIDs (this, lParam, pidl1, pidl2); - TRACE ("-- %i\n", nReturn); - return nReturn; + return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Mon Oct 26 15:07:44 2015 @@ -492,11 +492,41 @@ HRESULT WINAPI CRecycleBin::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { - /* TODO */ - TRACE("(%p, %p, %p, %p)\n", this, (void *)lParam, pidl1, pidl2); - if (pidl1->mkid.cb != pidl2->mkid.cb) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, pidl1->mkid.cb - pidl2->mkid.cb); - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (unsigned short)memcmp(pidl1->mkid.abID, pidl2->mkid.abID, pidl1->mkid.cb)); + PIDLRecycleStruct* pData1 = _ILGetRecycleStruct(pidl1); + PIDLRecycleStruct* pData2 = _ILGetRecycleStruct(pidl2); + LPWSTR pName1, pName2; + + if(!pData1 || !pData2 || LOWORD(lParam) >= COLUMNS_COUNT) + return E_INVALIDARG; + + SHORT result; + LONGLONG diff; + switch (LOWORD(lParam)) + { + case 0: /* Name */ + pName1 = PathFindFileNameW(pData1->szName); + pName2 = PathFindFileNameW(pData2->szName); + result = wcsicmp(pName1, pName2); + break; + case 1: /* Orig. Location */ + result = wcsicmp(pData1->szName, pData2->szName); + break; + case 2: /* Date Deleted */ + result = CompareFileTime(&pData1->DeletionTime, &pData2->DeletionTime); + break; + case 3: /* Size */ + diff = pData1->FileSize.QuadPart - pData2->FileSize.QuadPart; + return MAKE_COMPARE_HRESULT(diff); + case 4: /* Type */ + pName1 = PathFindExtensionW(pData1->szName); + pName2 = PathFindExtensionW(pData2->szName); + result = wcsicmp(pName1, pName2); + break; + case 5: /* Modified */ + result = CompareFileTime(&pData1->LastModification, &pData2->LastModification); + break; + } + return MAKE_COMPARE_HRESULT(result); } HRESULT WINAPI CRecycleBin::CreateViewObject(HWND hwndOwner, REFIID riid, void **ppv) Modified: trunk/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr.h… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] Mon Oct 26 15:07:44 2015 @@ -47,7 +47,6 @@ HRESULT SHELL32_BindToFS (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut); -HRESULT SHELL32_CompareIDs (IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path); HRESULT SHELL32_BindToGuidItem(LPCITEMIDLIST pidlRoot, @@ -73,6 +72,10 @@ DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); + +HRESULT SHELL32_CompareDetails(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); + +HRESULT SHELL32_CompareGuidItems(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); extern "C" BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey); Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Mon Oct 26 15:07:44 2015 @@ -609,77 +609,43 @@ return S_OK; } -/*********************************************************************** - * SHELL32_CompareIDs - */ -HRESULT SHELL32_CompareIDs(IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) -{ - int type1, - type2; - char szTemp1[MAX_PATH]; - char szTemp2[MAX_PATH]; - HRESULT nReturn; - LPITEMIDLIST firstpidl; - LPITEMIDLIST nextpidl1; - LPITEMIDLIST nextpidl2; - CComPtr<IShellFolder> psf; - - /* test for empty pidls */ - BOOL isEmpty1 = _ILIsDesktop(pidl1); - BOOL isEmpty2 = _ILIsDesktop(pidl2); - - if (isEmpty1 && isEmpty2) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); - if (isEmpty1) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD) -1); - if (isEmpty2) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 1); - - /* test for different types. Sort order is the PT_* constant */ - type1 = _ILGetDataPointer(pidl1)->type; - type2 = _ILGetDataPointer(pidl2)->type; - if (type1 < type2) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD) -1); - else if (type1 > type2) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 1); - - /* test for name of pidl */ - _ILSimpleGetText(pidl1, szTemp1, MAX_PATH); - _ILSimpleGetText(pidl2, szTemp2, MAX_PATH); - nReturn = lstrcmpiA(szTemp1, szTemp2); - if (nReturn < 0) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD) -1); - else if (nReturn > 0) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 1); - - /* test of complex pidls */ - firstpidl = ILCloneFirst(pidl1); - nextpidl1 = ILGetNext(pidl1); - nextpidl2 = ILGetNext(pidl2); - - /* optimizing: test special cases and bind not deeper */ - /* the deeper shellfolder would do the same */ - isEmpty1 = _ILIsDesktop(nextpidl1); - isEmpty2 = _ILIsDesktop(nextpidl2); - - if (isEmpty1 && isEmpty2) - { - nReturn = MAKE_HRESULT( SEVERITY_SUCCESS, 0, 0 ); - } - else if (isEmpty1) - { - nReturn = MAKE_HRESULT( SEVERITY_SUCCESS, 0, (WORD)-1 ); - } - else if (isEmpty2) - { - nReturn = MAKE_HRESULT( SEVERITY_SUCCESS, 0, 1 ); - /* optimizing end */ - } - else if (SUCCEEDED(iface->BindToObject(firstpidl, NULL, IID_PPV_ARG(IShellFolder, &psf)))) { - nReturn = psf->CompareIDs(lParam, nextpidl1, nextpidl2); - } - ILFree(firstpidl); - return nReturn; +HRESULT SHELL32_CompareDetails(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +{ + SHELLDETAILS sd; + WCHAR wszItem1[MAX_PATH], wszItem2[MAX_PATH]; + + isf->GetDetailsOf(pidl1, lParam, &sd); + StrRetToBufW(&sd.str, pidl1, wszItem1, MAX_PATH); + isf->GetDetailsOf(pidl2, lParam, &sd); + StrRetToBufW(&sd.str, pidl2, wszItem2, MAX_PATH); + int ret = wcsicmp(wszItem1, wszItem2); + + return MAKE_COMPARE_HRESULT(ret); +} + +HRESULT SHELL32_CompareGuidItems(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +{ + if (pidl1->mkid.cb == 0 || pidl2->mkid.cb == 0) + { + ERR("Got an empty pidl!\n"); + return E_INVALIDARG; + } + + BOOL bIsGuidFolder1 = _ILIsSpecialFolder(pidl1); + BOOL bIsGuidFolder2 = _ILIsSpecialFolder(pidl2); + + if (!bIsGuidFolder1 && !bIsGuidFolder2) + { + ERR("Got no guid pidl!\n"); + return E_INVALIDARG; + } + else if (bIsGuidFolder1 && bIsGuidFolder2) + { + return SHELL32_CompareDetails(isf, lParam, pidl1, pidl2); + } + + /* Guid folders come first compared to everything else */ + return MAKE_COMPARE_HRESULT(bIsGuidFolder1 ? -1 : 1); } HRESULT SH_ParseGuidDisplayName(IShellFolder2 * pFolder, Modified: trunk/reactos/include/reactos/shellutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shellutils… ============================================================================== --- trunk/reactos/include/reactos/shellutils.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/shellutils.h [iso-8859-1] Mon Oct 26 15:07:44 2015 @@ -514,4 +514,9 @@ #endif /* __cplusplus */ +#define S_LESSTHAN 0xffff +#define S_EQUAL S_OK +#define S_GREATERTHAN S_FALSE +#define MAKE_COMPARE_HRESULT(x) ((x)>0 ? S_GREATERTHAN : ((x)<0 ? S_LESSTHAN : S_EQUAL)) + #endif /* __ROS_SHELL_UTILS_H */

8 years, 10 months

[gedmurphy] 69711: [WMVCORE] - Add dll to the correct destination dir CORE-10404

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Oct 26 14:43:29 2015 New Revision: 69711 URL: http://svn.reactos.org/svn/reactos?rev=69711&view=rev Log: [WMVCORE] - Add dll to the correct destination dir CORE-10404 Modified: trunk/reactos/dll/win32/wmvcore/CMakeLists.txt Modified: trunk/reactos/dll/win32/wmvcore/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmvcore/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/wmvcore/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wmvcore/CMakeLists.txt [iso-8859-1] Mon Oct 26 14:43:29 2015 @@ -13,4 +13,4 @@ set_module_type(wmvcore win32dll) target_link_libraries(wmvcore wine) add_importlibs(wmvcore msvcrt kernel32 ntdll) -add_cd_file(TARGET wmvcore DESTINATION reactos/system32/wbem FOR all) +add_cd_file(TARGET wmvcore DESTINATION reactos/system32 FOR all)

8 years, 10 months

[tfaber] 69710: [USER32_APITEST] - Add some tests for other WS_CHILD/WS_POPUP combinations

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 26 12:12:01 2015 New Revision: 69710 URL: http://svn.reactos.org/svn/reactos?rev=69710&view=rev Log: [USER32_APITEST] - Add some tests for other WS_CHILD/WS_POPUP combinations Modified: trunk/rostests/apitests/user32/CreateWindowEx.c Modified: trunk/rostests/apitests/user32/CreateWindowEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CreateWin… ============================================================================== --- trunk/rostests/apitests/user32/CreateWindowEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CreateWindowEx.c [iso-8859-1] Mon Oct 26 12:12:01 2015 @@ -15,6 +15,19 @@ DWORD dwError; SetLastError(0x1234); + hWnd = CreateWindowExW(0, L"BUTTON", NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + dwError = GetLastError(); + ok(hWnd != NULL, "hWnd = %p\n", hWnd); + ok(dwError == 0, "error = %lu\n", dwError); + DestroyWindow(hWnd); + + SetLastError(0x1234); + hWnd = CreateWindowExW(0, L"BUTTON", NULL, 0, 0, 0, 0, 0, (HWND)(LONG_PTR)-1, NULL, NULL, NULL); + dwError = GetLastError(); + ok(hWnd == NULL, "hWnd = %p\n", hWnd); + ok(dwError == ERROR_INVALID_WINDOW_HANDLE, "error = %lu\n", dwError); + + SetLastError(0x1234); hWnd = CreateWindowExW(0, L"BUTTON", NULL, WS_CHILD, 0, 0, 0, 0, NULL, NULL, NULL, NULL); dwError = GetLastError(); ok(hWnd == NULL, "hWnd = %p\n", hWnd); @@ -25,4 +38,30 @@ dwError = GetLastError(); ok(hWnd == NULL, "hWnd = %p\n", hWnd); ok(dwError == ERROR_INVALID_WINDOW_HANDLE, "error = %lu\n", dwError); + + SetLastError(0x1234); + hWnd = CreateWindowExW(0, L"BUTTON", NULL, WS_POPUP, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + dwError = GetLastError(); + ok(hWnd != NULL, "hWnd = %p\n", hWnd); + ok(dwError == 0, "error = %lu\n", dwError); + DestroyWindow(hWnd); + + SetLastError(0x1234); + hWnd = CreateWindowExW(0, L"BUTTON", NULL, WS_POPUP, 0, 0, 0, 0, (HWND)(LONG_PTR)-1, NULL, NULL, NULL); + dwError = GetLastError(); + ok(hWnd == NULL, "hWnd = %p\n", hWnd); + ok(dwError == ERROR_INVALID_WINDOW_HANDLE, "error = %lu\n", dwError); + + SetLastError(0x1234); + hWnd = CreateWindowExW(0, L"BUTTON", NULL, WS_CHILD|WS_POPUP, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + dwError = GetLastError(); + ok(hWnd != NULL, "hWnd = %p\n", hWnd); + ok(dwError == 0, "error = %lu\n", dwError); + DestroyWindow(hWnd); + + SetLastError(0x1234); + hWnd = CreateWindowExW(0, L"BUTTON", NULL, WS_CHILD|WS_POPUP, 0, 0, 0, 0, (HWND)(LONG_PTR)-1, NULL, NULL, NULL); + dwError = GetLastError(); + ok(hWnd == NULL, "hWnd = %p\n", hWnd); + ok(dwError == ERROR_INVALID_WINDOW_HANDLE, "error = %lu\n", dwError); }

8 years, 10 months

[gadamopoulos] 69709: [WIN32K] - co_UserCreateWindowEx: Fail when a wrong handle was passed for the parent window. "Fixes" a crash down the road due to missing null checks in other places (null che...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Oct 26 12:09:34 2015 New Revision: 69709 URL: http://svn.reactos.org/svn/reactos?rev=69709&view=rev Log: [WIN32K] - co_UserCreateWindowEx: Fail when a wrong handle was passed for the parent window. "Fixes" a crash down the road due to missing null checks in other places (null checks are needed because desktop windows don't have parents). Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Mon Oct 26 12:09:34 2015 @@ -1947,6 +1947,12 @@ ParentWindow = hWndParent ? UserGetWindowObject(hWndParent): NULL; OwnerWindow = hWndOwner ? UserGetWindowObject(hWndOwner): NULL; + if (hWndParent && !ParentWindow) + { + ERR("Got invalid parent window handle\n"); + goto cleanup; + } + /* FIXME: Is this correct? */ if(OwnerWindow) OwnerWindow = UserGetAncestor(OwnerWindow, GA_ROOT);

8 years, 10 months

[tfaber] 69708: [USER32_APITEST] - Remove nonexistent test...

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 26 12:05:35 2015 New Revision: 69708 URL: http://svn.reactos.org/svn/reactos?rev=69708&view=rev Log: [USER32_APITEST] - Remove nonexistent test... Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/testlist.c Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Mon Oct 26 12:05:35 2015 @@ -9,7 +9,6 @@ DestroyCursorIcon.c DrawIconEx.c desktop.c - DestroyWindow.c EnumDisplaySettings.c GetDCEx.c GetIconInfo.c Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Mon Oct 26 12:05:35 2015 @@ -11,7 +11,6 @@ extern void func_DestroyCursorIcon(void); extern void func_DrawIconEx(void); extern void func_desktop(void); -extern void func_DestroyWindow(void); extern void func_EnumDisplaySettings(void); extern void func_GetDCEx(void); extern void func_GetIconInfo(void); @@ -48,7 +47,6 @@ { "DestroyCursorIcon", func_DestroyCursorIcon }, { "DrawIconEx", func_DrawIconEx }, { "desktop", func_desktop }, - { "DestroyWindow", func_DestroyWindow }, { "EnumDisplaySettings", func_EnumDisplaySettings }, { "GetDCEx", func_GetDCEx }, { "GetIconInfo", func_GetIconInfo },

8 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
...
35
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 October 2015