Ros-dev

ros-dev@reactos.org

5789 discussions

Re: [ros-dev] [ros-diffs] [akhaldi] 68051: [LAUTUS] Make the text files UTF-8 without BOM, and convert them to UTF-16 LE at compile time. Remove the now unneeded application/octet-stream type property and set native EOL one...

by Thomas Faber

Quick note: Files that get embedded into binaries or put on the CD should not use native EOL, but CRLF. This applies e.g. to inf files, as well as text files that are resources (which I believe is what these inis are?). The idea is that in a perfect world the CD image build by a Unix builder is identical to the one built by a Windows builder. On 2015-06-06 20:27, akhaldi(a)svn.reactos.org wrote: > [LAUTUS] Make the text files UTF-8 without BOM, and convert them to UTF-16 LE at compile time. Remove the now unneeded application/octet-stream type property and set native EOL one. CORE-9770 > Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI > ------------------------------------------------------------------------------ > svn:eol-style = native >

10 years

Name of builders/testers in buildbot

by Timo Kreuzer

Hi, The names for our builders / testers don't seem to be optimal to me. And since they seem to be sorted in the waterfall display alphabetically now, I suggest renaming them in the following way: Build_GCCLin_Debug Build_GCCLin_Release Build_GCCWin Build_MSVC_x64 Build_MSVC_x86 Test_KVM Test_VBox Test_VMW Test_VMW_Hybrid Test_WHS This way it is much more consistent, limited to actually useful information and would sort them nicely with builders left and testers right. Regards, Timo

10 years

Re: [ros-dev] [ros-diffs] [akhaldi] 68069: [OLE32_APITEST] Add test for IInitializeSpy. By Mark Jansen. See ROSTESTS-175 for more details.

by Thomas Faber

For future reference: (1) It's a bad idea to move something to a different file and edit it at the same time (2) Those constructor parameters really should be optional. The interface was trivial before, and it's a good idea to keep it that way. (I'm really only saying this because it broke the additional tests I had in my working copy :D) On 2015-06-08 13:05, akhaldi(a)svn.reactos.org wrote: > Added: trunk/rostests/apitests/include/unknownbase.h > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/include/unknownb… > ============================================================================== > --- trunk/rostests/apitests/include/unknownbase.h (added) > +++ trunk/rostests/apitests/include/unknownbase.h [iso-8859-1] Mon Jun 8 11:05:35 2015 > @@ -0,0 +1,47 @@ > +#ifndef APITESTS_UNKNOWNBASE_H > +#define APITESTS_UNKNOWNBASE_H > + > +template<typename Interface> > +class CUnknownBase : public Interface > +{ > + LONG m_lRef; > + bool m_AutoDelete; > +protected: > + virtual const QITAB* GetQITab() = 0; > +public: > + > + CUnknownBase(bool autoDelete, LONG initialRef) > + : m_lRef(initialRef), > + m_AutoDelete(autoDelete) > + { > + } > + > + ULONG STDMETHODCALLTYPE AddRef () > + { > + return InterlockedIncrement( &m_lRef ); > + } > + > + ULONG STDMETHODCALLTYPE Release() > + { > + long newref = InterlockedDecrement( &m_lRef ); > + if (m_AutoDelete && newref<=0) > + { > + delete this; > + } > + return newref; > + } > + > + HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppv) > + { > + return QISearch(this, GetQITab(), riid, ppv); > + } > + > + virtual ~CUnknownBase() {} > + > + LONG GetRef() const > + { > + return m_lRef; > + } > +}; > + > +#endif // APITESTS_UNKNOWNBASE_H

10 years

Changes in authentication for Jira

by Pierre Schweitzer

Dear all, We have proceed to a complete reimplementation of authentication server which serves Jira & Fisheye. The purpose is to rely on something maintained and stable. It should not change anything for you on daily usage. 58 accounts have been left out and will not be able to connect to Jira due to incompatible account name (using invalid chars). If you happen to be incapable of log in, please contact me so that I can rename your account. New accounts cannot be created with such invalid chars any longer. As a side note, this was a major blocker for our upgrade to Jira 6. If we do not spot anything wrong with our new authentication mechanism, then, then the upgrade to Jira 6 should happen in the next days. With my best regards, -- Pierre Schweitzer <pierre(a)reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

10 years

PATCH: Get configure and host-tools building on arm again

by Steven Edwards

-- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

10 years

Writing an API-Test for localspl.dll

by Colin Finck

Hi all, In order to verify the exact behaviour of localspl.dll on Windows Server 2003, I'm trying to write an API-Test for it. This is no problem for winspool.drv or even the Print Processor functions of localspl.dll, but its Print Provider functions pose some serious problems: * You get a table of function pointers by calling InitializePrintProvidor. * Instead of just handing over the pointers, this function first calls many undocumented ones from spoolss.dll, including CacheAddName, CacheCreateAndAddNode, GetServerPolicy, SplInitializeWinSpoolDrv, SplIsUpgrade. * Out of these undocumented functions, GetServerPolicy is the most problematic one, because it itself relies on a function pointer given by spoolsv.exe to spoolss.dll in an initialization function. My API-Test is not spoolsv.exe, so I don't initialize spoolss.dll the same way. Thus, GetServerPolicy will fail and InitializePrintProvidor as well. * For now, I worked around this problem by stubbing these functions in my spoolss.dll. I.e., GetServerPolicy just returns TRUE there and I get further. * On top of this, InitializePrintProvidor also makes use of RevertToPrinterSelf and ImpersonatePrinterClient. To let these functions succeed, the current thread actually needs to impersonate a user. For now, I worked around this problem by doing: OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE, &hToken); DuplicateToken(hToken, SecurityImpersonation, &hDup); ImpersonateLoggedOnUser(hDup); before calling InitializePrintProvidor. * Finally, this lets InitializePrintProvidor succeed and it gave me the table of function pointers. Unfortunately, even simple query functions like fpEnumPrinters do a RevertToPrinterSelf and then expect to be in the SYSTEM context of spoolsv.exe. When my API-Test was just run in a usual Administrator user context under Windows Server 2003, fpEnumPrinters didn't succeed. For now, I worked around this problem by running my test program as a service in the SYSTEM context. With all these problems presented, can you think of any way how I can now write a reliable API-Test for localspl.dll that could be run regularly under Windows Server 2003 and ReactOS? One idea would be to load the system spoolss.dll and then rewire the GetServerPolicy import to a function that just returns TRUE all the time. Still then, I have the problem that my API-Test would need to be run in the SYSTEM security context. Creative ideas are welcome! :) Cheers, Colin

10 years

Gallium Nine?

by Mohamed MEDIOUNI

Can Gallium Nine be used instead of WineD3D?

10 years

Vote for removing rapps DB from trunk

by daniel.reimer＠reactos.org

Hey guys, as some of you might have seen already we now have two copies of the more and more increasing RAPPS DB in trunk. This is: a) Absolutely unnecessary and does only result in one thing, two differing DBs b) Shows even more that it’s not useful to have it in trunk at all. Because of this I start a vote now to get your opinion in completely removing the RAPPS DB from trunk into a subtree like done for many other things, too. What do you think? Greetings Daniel Reimer Gesendet von Windows Mail

10 years, 1 month

Re: [ros-dev] [ros-diffs] [dquintana] 67976: [DEVMGMT_NEW] At the request of Christoph von Wittich, bring devmgmt_new into the build. * Created CMakeLists.txt and added to parent folder. * Removed some references to CAtlStr...

by Ged Murphy

Eeek, I was working on this via VS and have quite a few changes in my WC, including CAtlString support for our ATL lib... -----Original Message----- From: Ros-diffs [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dquintana(a)svn.reactos.org Sent: 30 May 2015 20:54 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [dquintana] 67976: [DEVMGMT_NEW] At the request of Christoph von Wittich, bring devmgmt_new into the build. * Created CMakeLists.txt and added to parent folder. * Removed some references to CAtlStr... Author: dquintana Date: Sat May 30 19:53:44 2015 New Revision: 67976 URL: http://svn.reactos.org/svn/reactos?rev=67976&view=rev Log: [DEVMGMT_NEW] At the request of Christoph von Wittich, bring devmgmt_new into the build. * Created CMakeLists.txt and added to parent folder. * Removed some references to CAtlString that were not needed and are not implemented in our headers. * Fixed build with gcc. * Spread all the changes done to the english resources to the other languages. Many languages now contain untranslated strings that will need to be fixed. Note that I made no effort to fix any bugs or improve any features. The app comes as-is, except it now builds with rosbe. Added: trunk/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt (with props) trunk/reactos/base/applications/mscutils/devmgmt_new/precomp.h - copied, changed from r67940, trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.h trunk/reactos/base/applications/mscutils/devmgmt_new/resource.h - copied unchanged from r67940, trunk/reactos/base/applications/mscutils/devmgmt_new/Resource.h Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/Resource.h trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.exe.manifest trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.h trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.sln trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj.filters trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.h trunk/reactos/base/applications/mscutils/devmgmt_new/targetver.h Modified: trunk/reactos/base/applications/mscutils/CMakeLists.txt trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h trunk/reactos/base/applications/mscutils/devmgmt_new/Devices.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/mscutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/Devices.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/Resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.exe.manifest URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.sln URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Copied: trunk/reactos/base/applications/mscutils/devmgmt_new/precomp.h (from r67940, trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/targetver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…

10 years, 1 month

Re: [ros-dev] [ros-diffs] [cwittich] 67981: [DEVMGMT_NEW] enable/disable context menu items on selection change

by Ged Murphy

I also have all the code for this, but for choosing which icons to show in the toolbar. The context menu would have been able to use this code.... -----Original Message----- From: Ros-diffs [mailto:ros-diffs-bounces@reactos.org] On Behalf Of cwittich(a)svn.reactos.org Sent: 31 May 2015 10:15 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [cwittich] 67981: [DEVMGMT_NEW] enable/disable context menu items on selection change Author: cwittich Date: Sun May 31 09:14:29 2015 New Revision: 67981 URL: http://svn.reactos.org/svn/reactos?rev=67981&view=rev Log: [DEVMGMT_NEW] enable/disable context menu items on selection change Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp [iso-8859-1] Sun May 31 09:14:29 2015 @@ -110,6 +110,30 @@ (VOID)m_Devices->Uninitialize(); return TRUE; +} + +BOOL CDeviceView::HasChildItem( + _In_ HTREEITEM Item) +{ + return (TreeView_GetChild(m_hTreeView, Item) != NULL); } + +BOOL CDeviceView::IsRootItem( + _In_ HTREEITEM Item) +{ + return (TreeView_GetRoot(m_hTreeView) == Item); } + +BOOL CDeviceView::IsRootItemSelected() +{ + return (TreeView_GetRoot(m_hTreeView) == +TreeView_GetSelection(m_hTreeView)); +} + +VOID CDeviceView::EnableContextMenuItem( + _In_ UINT Id, + _In_ UINT Enabled) +{ + EnableMenuItem(m_hShortcutMenu, Id, Enabled); } VOID Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h [iso-8859-1] Sun May 31 09:14:29 2015 @@ -34,6 +34,11 @@ BOOL Initialize(); BOOL Uninitialize(); + VOID EnableContextMenuItem( + _In_ UINT Id, + _In_ UINT Enabled + ); + VOID ShowContextMenu( _In_ INT xPos, _In_ INT yPos @@ -49,12 +54,27 @@ VOID Refresh(); VOID DisplayPropertySheet(); VOID SetFocus(); - + + BOOL IsRootItemSelected(); + + BOOL IsRootItem( + _In_ HTREEITEM Item + ); + + BOOL HasChildItem( + _In_ HTREEITEM Item + ); + VOID SetDeviceListType(ListDevices List) { m_ListDevices = List; } + ListDevices GetDeviceListType() + { + return m_ListDevices; + } + VOID ShowHiddenDevices(_In_ BOOL ShowHidden) { m_ShowHidden = ShowHidden; Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp [iso-8859-1] Sun May 31 09:14:29 2015 @@ -429,7 +429,61 @@ break; } - + + case TVN_SELCHANGED: + { + LPNM_TREEVIEW pnmtv = (LPNM_TREEVIEW)lParam; + ListDevices ListType = m_DeviceView->GetDeviceListType(); + + if (ListType == DevicesByType) + { + if (!m_DeviceView->HasChildItem(pnmtv->itemNew.hItem)) + { + SendMessage(m_hToolBar, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + + EnableMenuItem(GetMenu(m_hMainWnd), IDC_PROP, MF_ENABLED); + m_DeviceView->EnableContextMenuItem(IDC_PROP, MF_ENABLED); + } + else + { + SendMessage(m_hToolBar, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, + 0)); + + EnableMenuItem(GetMenu(m_hMainWnd), IDC_PROP, MF_GRAYED); + m_DeviceView->EnableContextMenuItem(IDC_PROP, MF_GRAYED); + } + } + else if (ListType == DevicesByConnection) + { + if (m_DeviceView->IsRootItem(pnmtv->itemNew.hItem)) + { + SendMessage(m_hToolBar, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, + 0)); + + EnableMenuItem(GetMenu(m_hMainWnd), IDC_PROP, MF_GRAYED); + m_DeviceView->EnableContextMenuItem(IDC_PROP, MF_GRAYED); + } + else + { + SendMessage(m_hToolBar, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + + EnableMenuItem(GetMenu(m_hMainWnd), IDC_PROP, MF_ENABLED); + m_DeviceView->EnableContextMenuItem(IDC_PROP, MF_ENABLED); + } + } + } + break; + case NM_DBLCLK: { m_DeviceView->DisplayPropertySheet(); @@ -438,7 +492,18 @@ case NM_RETURN: { - m_DeviceView->DisplayPropertySheet(); + ListDevices ListType = m_DeviceView->GetDeviceListType(); + if (ListType == DevicesByType) + { + m_DeviceView->DisplayPropertySheet(); + } + else if (ListType == DevicesByConnection) + { + if (!m_DeviceView->IsRootItemSelected()) + { + m_DeviceView->DisplayPropertySheet(); + } + } break; } }

10 years, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev