21 Feb
2017
21 Feb
'17
9:04 a.m.
Author: akhaldi
Date: Tue Feb 21 09:04:05 2017
New Revision: 73870
URL: http://svn.reactos.org/svn/reactos?rev=73870&view=rev
Log:
* Revert r73869 because wmi was mentioned nowhere in CORE-9111, nor in our tree
restructure wiki, nor any developers discussions. This is the ReactOS trunk, not a
branch.
Added:
trunk/reactos/base/applications/cmdutils/mofcomp/
- copied from r73868, trunk/reactos/base/applications/cmdutils/mofcomp/
trunk/reactos/base/applications/cmdutils/wmic/
- copied from r73868, trunk/reactos/base/applications/cmdutils/wmic/
trunk/reactos/base/services/wmisvc/
- copied from r73868, trunk/reactos/base/services/wmisvc/
trunk/reactos/dll/win32/framedyn/
- copied from r73868, trunk/reactos/dll/win32/framedyn/
trunk/reactos/dll/win32/wbemdisp/
- copied from r73868, trunk/reactos/dll/win32/wbemdisp/
trunk/reactos/dll/win32/wbemprox/
- copied from r73868, trunk/reactos/dll/win32/wbemprox/
trunk/reactos/dll/win32/wmi/
- copied from r73868, trunk/reactos/dll/win32/wmi/
trunk/reactos/dll/win32/wmiutils/
- copied from r73868, trunk/reactos/dll/win32/wmiutils/
Modified:
trunk/reactos/base/CMakeLists.txt
trunk/reactos/base/applications/cmdutils/CMakeLists.txt
trunk/reactos/base/services/CMakeLists.txt
trunk/reactos/boot/bootdata/hivesft.inf
trunk/reactos/boot/bootdata/hivesys.inf
trunk/reactos/dll/win32/CMakeLists.txt
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/base/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/CMakeLists.txt?rev=73…
==============================================================================
--- trunk/reactos/base/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/CMakeLists.txt [iso-8859-1] Tue Feb 21 09:04:05 2017
@@ -4,4 +4,3 @@
add_subdirectory(setup)
add_subdirectory(shell)
add_subdirectory(system)
-add_subdirectory(wmi)
Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Tue Feb 21
09:04:05 2017
@@ -9,6 +9,7 @@
add_subdirectory(hostname)
add_subdirectory(lodctr)
add_subdirectory(mode)
+add_subdirectory(mofcomp)
add_subdirectory(more)
add_subdirectory(reg)
add_subdirectory(schtasks)
@@ -16,5 +17,6 @@
add_subdirectory(taskkill)
add_subdirectory(tree)
add_subdirectory(whoami)
+add_subdirectory(wmic)
add_subdirectory(wscript)
add_subdirectory(xcopy)
Modified: trunk/reactos/base/services/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/CMakeLists.t…
==============================================================================
--- trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] Tue Feb 21 09:04:05 2017
@@ -13,3 +13,4 @@
add_subdirectory(umpnpmgr)
add_subdirectory(wkssvc)
add_subdirectory(wlansvc)
+add_subdirectory(wmisvc)
Modified: trunk/reactos/boot/bootdata/hivesft.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?…
==============================================================================
--- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Tue Feb 21 09:04:05 2017
@@ -91,6 +91,13 @@
HKLM,"SOFTWARE\Microsoft\Rpc\SecurityService","9",2,"secur32.dll"
HKLM,"SOFTWARE\Microsoft\Secure",,0x00000012
+
+; WBem
+HKLM,"SOFTWARE\Microsoft\wbem\ess",,0x00000012
+HKLM,"SOFTWARE\Microsoft\wbem\Transports",,0x00000012
+HKLM,"SOFTWARE\Microsoft\wbem\Scripting",,0x00000012
+HKLM,"SOFTWARE\Microsoft\wbem","Installation
Directory",0x00020000,"%SystemRoot%\system32\wbem"
+HKLM,"SOFTWARE\Microsoft\wbem","MOF Self-Install
Directory",0x00020000,"%SystemRoot%\system32\wbem\mof"
; HTML Help
HKLM,"SOFTWARE\Microsoft\Active Setup\Installed
Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9}",,2,"HTML Help"
Modified: trunk/reactos/boot/bootdata/hivesys.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?…
==============================================================================
--- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Tue Feb 21 09:04:05 2017
@@ -1997,6 +1997,18 @@
HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Start",0x00010001,0x00000003
HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Type",0x00010001,0x00000020
+; WMI Service
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","DependOnService",0x00010000,"RPCSS"
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","DisplayName",0x00000000,"ReactOS
Management Infrastructure"
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Description",0x00000000,"Provides
interface to system management information"
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","ErrorControl",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Group",0x00000000,"WMI"
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe
-k netsvcs"
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","ObjectName",0x00000000,"LocalSystem"
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Start",0x00010001,0x00000002
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Type",0x00010001,0x00000020
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\wbem\wmisvc.dll"
+
; Sound Blaster (NT4)
;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Description",0x00000000,"Sound
Blaster (NT4)"
;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ErrorControl",0x00010001,0x00000001
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] Tue Feb 21 09:04:05 2017
@@ -42,6 +42,7 @@
add_subdirectory(fltlib)
add_subdirectory(fmifs)
add_subdirectory(fontsub)
+add_subdirectory(framedyn)
add_subdirectory(fusion)
add_subdirectory(gdiplus)
add_subdirectory(getuname)
@@ -219,6 +220,8 @@
add_subdirectory(vbscript)
add_subdirectory(version)
add_subdirectory(vssapi)
+add_subdirectory(wbemdisp)
+add_subdirectory(wbemprox)
if(ARCH STREQUAL "i386")
add_subdirectory(wdmaud.drv)
endif()
@@ -235,6 +238,8 @@
add_subdirectory(wintrust)
add_subdirectory(wlanapi)
add_subdirectory(wldap32)
+add_subdirectory(wmi)
+add_subdirectory(wmiutils)
add_subdirectory(wmvcore)
add_subdirectory(ws2_32)
add_subdirectory(ws2help)
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Feb 21 09:04:05 2017
@@ -20,11 +20,6 @@
reactos/sdk/tools/wpp # Synced to WineStaging-1.9.11
The following libraries are shared with Wine.
-
-reactos/base/wmi/wbemdisp # Synced to WineStaging-1.9.16
-reactos/base/wmi/wbemprox # Synced to WineStaging-1.9.23
-reactos/base/wmi/wmi # Synced to WineStaging-1.9.11
-reactos/base/wmi/wmiutils # Synced to WineStaging-1.9.11
reactos/dll/directx/wine/amstream # Synced to WineStaging-1.9.23
reactos/dll/directx/wine/d3d8 # Synced to WineStaging-1.9.4
@@ -199,6 +194,8 @@
reactos/dll/win32/vbscript # Synced to WineStaging-1.9.23
reactos/dll/win32/version # Synced to WineStaging-1.9.11
reactos/dll/win32/vssapi # Synced to WineStaging-1.9.11
+reactos/dll/win32/wbemdisp # Synced to WineStaging-1.9.16
+reactos/dll/win32/wbemprox # Synced to WineStaging-1.9.23
reactos/dll/win32/windowscodecs # Synced to WineStaging-1.9.23
reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.9.11
reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.9.23
@@ -211,6 +208,8 @@
reactos/dll/win32/winscard # Synced to WineStaging-1.9.11
reactos/dll/win32/wintrust # Synced to WineStaging-1.9.23
reactos/dll/win32/wldap32 # Synced to WineStaging-1.9.11
+reactos/dll/win32/wmi # Synced to WineStaging-1.9.11
+reactos/dll/win32/wmiutils # Synced to WineStaging-1.9.11
reactos/dll/win32/wmvcore # Synced to WineStaging-1.9.11
reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.9.11
reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.9.11
@@ -231,6 +230,7 @@
reactos/base/applications/cmdutils/reg # Synced to WineStaging-1.9.16
reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-1.9.14
reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.9.11
+reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.9.11
reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.9.16
reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.9.11
reactos/base/applications/games/winmine # Synced to WineStaging-1.9.16 with our own
resources.
@@ -244,10 +244,6 @@
reactos/base/services/rpcss # Synced to WineStaging-1.9.16
reactos/base/system/expand # Synced to WineStaging-1.9.11
reactos/base/system/msiexec # Synced to WineStaging-1.9.11
-
-reactos/base/wmi/mofcomp # Synced to Wine-2.2
-reactos/base/wmi/wmic # Synced to WineStaging-1.9.11
-
reactos/modules/rosapps/winfile # Autosync
In addition the following libs, dlls and source files are mostly based on code ported