um: reorganize projects

* libservice -> service
* libsimple -> wrappers/simple
* libnt_path_converter -> wrappers/special/nt_path_converter

42 files changed, 16 insertions, 15 deletions

diff --git a/um/CMakeLists.txt b/um/CMakeLists.txt
index 31c8511..f7d8b24 100644
--- a/um/CMakeLists.txt
+++ b/um/CMakeLists.txt
@@ -1,6 +1,4 @@
 project(windows7_drivers_utils)
 
-add_subdirectory(libservice)
-
-add_subdirectory(libnt_path_converter)
-add_subdirectory(libsimple)
+add_subdirectory(service)
+add_subdirectory(wrappers)
diff --git a/um/README.md b/um/README.md
index f18091a..e926e9a 100644
--- a/um/README.md
+++ b/um/README.md
@@ -7,10 +7,10 @@ A couple of usage examples are included along with the drivers.
 * [libsimple]: [simple] driver usage examples.
 * [libnt_path_converter]: [nt_path_converter] driver usage examples.
 
-[libservice]: libservice/README.md
-[libsimple]: libsimple/README.md
+[libservice]: service/README.md
+[libsimple]: wrappers/simple/README.md
 [simple]: ../km/src/simple
-[libnt_path_converter]: libnt_path_converter/README.md
+[libnt_path_converter]: wrappers/special/nt_path_converter/README.md
 [nt_path_converter]: ../km/src/special/nt_path_converter
 
 Building the utilities
@@ -22,12 +22,12 @@ For example, using Visual Studio 2013 Update 4 for Windows Desktop (targetting
 x86):
 
     > cd
-    C:\workspace\build\windows7-drivers
+    C:\workspace\build\windows7-drivers\um
 
     > cmake -G "Visual Studio 12 2013" C:\workspace\personal\windows7-drivers\um
     ...
 
-    > msbuild windows7_drivers_utils.sln
+    > cmake --build . --config release
     ...
 
 See also
diff --git a/um/libservice/CMakeLists.txt b/um/service/CMakeLists.txt
index 34b3d13..34b3d13 100644
--- a/um/libservice/CMakeLists.txt
+++ b/um/service/CMakeLists.txt
diff --git a/um/libservice/README.md b/um/service/README.md
index f9fb601..f9fb601 100644
--- a/um/libservice/README.md
+++ b/um/service/README.md
diff --git a/um/libservice/include/libservice/all.hpp b/um/service/include/libservice/all.hpp
index a5761e0..a5761e0 100644
--- a/um/libservice/include/libservice/all.hpp
+++ b/um/service/include/libservice/all.hpp
diff --git a/um/libservice/include/libservice/common.hpp b/um/service/include/libservice/common.hpp
index a1c46fb..a1c46fb 100644
--- a/um/libservice/include/libservice/common.hpp
+++ b/um/service/include/libservice/common.hpp
diff --git a/um/libservice/include/libservice/device.hpp b/um/service/include/libservice/device.hpp
index ac292c8..ac292c8 100644
--- a/um/libservice/include/libservice/device.hpp
+++ b/um/service/include/libservice/device.hpp
diff --git a/um/libservice/include/libservice/handle.hpp b/um/service/include/libservice/handle.hpp
index 5e351d2..5e351d2 100644
--- a/um/libservice/include/libservice/handle.hpp
+++ b/um/service/include/libservice/handle.hpp
diff --git a/um/libservice/include/libservice/service.hpp b/um/service/include/libservice/service.hpp
index 089f790..089f790 100644
--- a/um/libservice/include/libservice/service.hpp
+++ b/um/service/include/libservice/service.hpp
diff --git a/um/libservice/include/libservice/service_handle.hpp b/um/service/include/libservice/service_handle.hpp
index 2883ff3..2883ff3 100644
--- a/um/libservice/include/libservice/service_handle.hpp
+++ b/um/service/include/libservice/service_handle.hpp
diff --git a/um/libservice/include/libservice/service_manager.hpp b/um/service/include/libservice/service_manager.hpp
index 80e6f12..80e6f12 100644
--- a/um/libservice/include/libservice/service_manager.hpp
+++ b/um/service/include/libservice/service_manager.hpp
diff --git a/um/libservice/include/libservice/singleton.hpp b/um/service/include/libservice/singleton.hpp
index 1c7b1a7..1c7b1a7 100644
--- a/um/libservice/include/libservice/singleton.hpp
+++ b/um/service/include/libservice/singleton.hpp
diff --git a/um/libservice/include/libservice/windows_error.hpp b/um/service/include/libservice/windows_error.hpp
index f7ac90e..f7ac90e 100644
--- a/um/libservice/include/libservice/windows_error.hpp
+++ b/um/service/include/libservice/windows_error.hpp
diff --git a/um/libservice/src/device.cpp b/um/service/src/device.cpp
index 5643106..5643106 100644
--- a/um/libservice/src/device.cpp
+++ b/um/service/src/device.cpp
diff --git a/um/libservice/src/handle.cpp b/um/service/src/handle.cpp
index 7567781..7567781 100644
--- a/um/libservice/src/handle.cpp
+++ b/um/service/src/handle.cpp
diff --git a/um/libservice/src/service.cpp b/um/service/src/service.cpp
index 8b5e043..8b5e043 100644
--- a/um/libservice/src/service.cpp
+++ b/um/service/src/service.cpp
diff --git a/um/libservice/src/service_handle.cpp b/um/service/src/service_handle.cpp
index adce7f0..adce7f0 100644
--- a/um/libservice/src/service_handle.cpp
+++ b/um/service/src/service_handle.cpp
diff --git a/um/libservice/src/service_manager.cpp b/um/service/src/service_manager.cpp
index 61662de..61662de 100644
--- a/um/libservice/src/service_manager.cpp
+++ b/um/service/src/service_manager.cpp
diff --git a/um/libservice/src/windows_error.cpp b/um/service/src/windows_error.cpp
index f27018b..f27018b 100644
--- a/um/libservice/src/windows_error.cpp
+++ b/um/service/src/windows_error.cpp
diff --git a/um/libservice/test/CMakeLists.txt b/um/service/test/CMakeLists.txt
index 4780deb..4780deb 100644
--- a/um/libservice/test/CMakeLists.txt
+++ b/um/service/test/CMakeLists.txt
diff --git a/um/libservice/test/windows_error.cpp b/um/service/test/windows_error.cpp
index b909670..b909670 100644
--- a/um/libservice/test/windows_error.cpp
+++ b/um/service/test/windows_error.cpp
diff --git a/um/libservice/utils/CMakeLists.txt b/um/service/utils/CMakeLists.txt
index 061ab25..061ab25 100644
--- a/um/libservice/utils/CMakeLists.txt
+++ b/um/service/utils/CMakeLists.txt
diff --git a/um/libservice/utils/install_service.cpp b/um/service/utils/install_service.cpp
index f36af75..f36af75 100644
--- a/um/libservice/utils/install_service.cpp
+++ b/um/service/utils/install_service.cpp
diff --git a/um/libservice/utils/start_service.cpp b/um/service/utils/start_service.cpp
index fafee53..fafee53 100644
--- a/um/libservice/utils/start_service.cpp
+++ b/um/service/utils/start_service.cpp
diff --git a/um/libservice/utils/stop_service.cpp b/um/service/utils/stop_service.cpp
index 800c7a9..800c7a9 100644
--- a/um/libservice/utils/stop_service.cpp
+++ b/um/service/utils/stop_service.cpp
diff --git a/um/libservice/utils/uninstall_service.cpp b/um/service/utils/uninstall_service.cpp
index 395bb51..395bb51 100644
--- a/um/libservice/utils/uninstall_service.cpp
+++ b/um/service/utils/uninstall_service.cpp
diff --git a/um/wrappers/CMakeLists.txt b/um/wrappers/CMakeLists.txt
new file mode 100644
index 0000000..834a76b
--- /dev/null
+++ b/um/wrappers/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(simple)
+add_subdirectory(special)
diff --git a/um/libsimple/CMakeLists.txt b/um/wrappers/simple/CMakeLists.txt
index ff61bd7..ff61bd7 100644
--- a/um/libsimple/CMakeLists.txt
+++ b/um/wrappers/simple/CMakeLists.txt
diff --git a/um/libsimple/README.md b/um/wrappers/simple/README.md
index ac00d63..51a46cb 100644
--- a/um/libsimple/README.md
+++ b/um/wrappers/simple/README.md
@@ -3,7 +3,7 @@ simple driver utilities
 
 [simple] driver usage examples.
 
-[simple]: ../../km/src/simple
+[simple]: ../../../km/src/simple
 
 Usage
 -----
@@ -39,5 +39,5 @@ See also
 * [Building the utilities]
 * [License]
 
-[Building the utilities]: ../README.md#building-the-utilities
-[License]: ../../README.md#license
+[Building the utilities]: ../../README.md#building-the-utilities
+[License]: ../../../README.md#license
diff --git a/um/libnt_path_converter/include/libnt_path_converter/all.hpp b/um/wrappers/simple/include/libsimple/all.hpp
index 474b802..474b802 100644
--- a/um/libnt_path_converter/include/libnt_path_converter/all.hpp
+++ b/um/wrappers/simple/include/libsimple/all.hpp
diff --git a/um/libsimple/include/libsimple/device.hpp b/um/wrappers/simple/include/libsimple/device.hpp
index 3318818..3318818 100644
--- a/um/libsimple/include/libsimple/device.hpp
+++ b/um/wrappers/simple/include/libsimple/device.hpp
diff --git a/um/libsimple/src/device.cpp b/um/wrappers/simple/src/device.cpp
index 57e6963..57e6963 100644
--- a/um/libsimple/src/device.cpp
+++ b/um/wrappers/simple/src/device.cpp
diff --git a/um/libsimple/utils/CMakeLists.txt b/um/wrappers/simple/utils/CMakeLists.txt
index 8824e3e..8824e3e 100644
--- a/um/libsimple/utils/CMakeLists.txt
+++ b/um/wrappers/simple/utils/CMakeLists.txt
diff --git a/um/libsimple/utils/exchange_ints.cpp b/um/wrappers/simple/utils/exchange_ints.cpp
index 2935b2f..2935b2f 100644
--- a/um/libsimple/utils/exchange_ints.cpp
+++ b/um/wrappers/simple/utils/exchange_ints.cpp
diff --git a/um/wrappers/special/CMakeLists.txt b/um/wrappers/special/CMakeLists.txt
new file mode 100644
index 0000000..ed48e00
--- /dev/null
+++ b/um/wrappers/special/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(nt_path_converter)
diff --git a/um/libnt_path_converter/CMakeLists.txt b/um/wrappers/special/nt_path_converter/CMakeLists.txt
index 69f85d0..69f85d0 100644
--- a/um/libnt_path_converter/CMakeLists.txt
+++ b/um/wrappers/special/nt_path_converter/CMakeLists.txt
diff --git a/um/libnt_path_converter/README.md b/um/wrappers/special/nt_path_converter/README.md
index 74653dc..71b4948 100644
--- a/um/libnt_path_converter/README.md
+++ b/um/wrappers/special/nt_path_converter/README.md
@@ -3,7 +3,7 @@ nt_path_converter driver utilities
 
 [nt_path_converter] driver usage examples.
 
-[nt_path_converter]: ../../km/src/special/nt_path_converter
+[nt_path_converter]: ../../../../km/src/special/nt_path_converter
 
 Usage
 -----
@@ -27,5 +27,5 @@ See also
 * [Building the utilities]
 * [License]
 
-[Building the utilities]: ../README.md#building-the-utilities
-[License]: ../../README.md#license
+[Building the utilities]: ../../../README.md#building-the-utilities
+[License]: ../../../../README.md#license
diff --git a/um/libsimple/include/libsimple/all.hpp b/um/wrappers/special/nt_path_converter/include/libnt_path_converter/all.hpp
index 474b802..474b802 100644
--- a/um/libsimple/include/libsimple/all.hpp
+++ b/um/wrappers/special/nt_path_converter/include/libnt_path_converter/all.hpp
diff --git a/um/libnt_path_converter/include/libnt_path_converter/device.hpp b/um/wrappers/special/nt_path_converter/include/libnt_path_converter/device.hpp
index e1d75fb..e1d75fb 100644
--- a/um/libnt_path_converter/include/libnt_path_converter/device.hpp
+++ b/um/wrappers/special/nt_path_converter/include/libnt_path_converter/device.hpp
diff --git a/um/libnt_path_converter/src/device.cpp b/um/wrappers/special/nt_path_converter/src/device.cpp
index 90cd12f..90cd12f 100644
--- a/um/libnt_path_converter/src/device.cpp
+++ b/um/wrappers/special/nt_path_converter/src/device.cpp
diff --git a/um/libnt_path_converter/utils/CMakeLists.txt b/um/wrappers/special/nt_path_converter/utils/CMakeLists.txt
index 9915995..9915995 100644
--- a/um/libnt_path_converter/utils/CMakeLists.txt
+++ b/um/wrappers/special/nt_path_converter/utils/CMakeLists.txt
diff --git a/um/libnt_path_converter/utils/convert_nt_path.cpp b/um/wrappers/special/nt_path_converter/utils/convert_nt_path.cpp
index 0055db2..0055db2 100644
--- a/um/libnt_path_converter/utils/convert_nt_path.cpp
+++ b/um/wrappers/special/nt_path_converter/utils/convert_nt_path.cpp