diff --git a/build/VStudio/tools/fsptool.vcxproj b/build/VStudio/tools/fsptool.vcxproj index 728d64ec..0afb8eff 100644 --- a/build/VStudio/tools/fsptool.vcxproj +++ b/build/VStudio/tools/fsptool.vcxproj @@ -183,6 +183,9 @@ + + + diff --git a/build/VStudio/tools/fsptool.vcxproj.filters b/build/VStudio/tools/fsptool.vcxproj.filters index 077b0dba..de560d0b 100644 --- a/build/VStudio/tools/fsptool.vcxproj.filters +++ b/build/VStudio/tools/fsptool.vcxproj.filters @@ -5,9 +5,11 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd + + {bd82112e-6494-4345-b35b-25eae56d5127} + + + {dd21736e-dbea-4f24-8178-1903412e01f2} @@ -20,4 +22,9 @@ Source + + + Source\shared\um + + \ No newline at end of file diff --git a/build/VStudio/tools/launchctl.vcxproj b/build/VStudio/tools/launchctl.vcxproj index cd6f8bb0..10536e8d 100644 --- a/build/VStudio/tools/launchctl.vcxproj +++ b/build/VStudio/tools/launchctl.vcxproj @@ -180,9 +180,6 @@ $(OutDir)$(TargetName).public.pdb - - - @@ -199,6 +196,9 @@ {4a7c0b21-9e10-4c81-92de-1493efcf24eb} + + + diff --git a/build/VStudio/tools/launchctl.vcxproj.filters b/build/VStudio/tools/launchctl.vcxproj.filters index 09f921af..8ad055e5 100644 --- a/build/VStudio/tools/launchctl.vcxproj.filters +++ b/build/VStudio/tools/launchctl.vcxproj.filters @@ -5,18 +5,13 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - {e650819b-355e-455c-81c9-10dc7debe109} + + {9f7e57a6-7696-4de2-a9eb-cba60e24d02a} - - {744edf89-567a-40b7-b6f2-ee2bc7b9f0d9} + + {89fa307f-09d4-4373-a07f-49f23c698474} - - - Include\shared - - Source @@ -27,4 +22,9 @@ Source + + + Source\shared\um + + \ No newline at end of file diff --git a/build/VStudio/tools/launcher.vcxproj b/build/VStudio/tools/launcher.vcxproj index ae17af2e..ad8fe22e 100644 --- a/build/VStudio/tools/launcher.vcxproj +++ b/build/VStudio/tools/launcher.vcxproj @@ -193,9 +193,6 @@ {4a7c0b21-9e10-4c81-92de-1493efcf24eb} - - - _UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -204,6 +201,9 @@ _UNICODE;UNICODE;%(PreprocessorDefinitions) + + + diff --git a/build/VStudio/tools/launcher.vcxproj.filters b/build/VStudio/tools/launcher.vcxproj.filters index 1aed461c..a7ec84a8 100644 --- a/build/VStudio/tools/launcher.vcxproj.filters +++ b/build/VStudio/tools/launcher.vcxproj.filters @@ -5,11 +5,11 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - {11e7c0f2-7782-43ee-84fa-9e56efbe39de} + + {ebc5d08c-dcc6-4889-a482-84cefda188cd} - - {d83ea433-d9f7-494c-90b9-3a8997483cd9} + + {574d211e-3e2c-4551-bc78-4786f33c4093} @@ -20,14 +20,14 @@ Source - - - Include\shared - - Source + + + Source\shared\um + + \ No newline at end of file diff --git a/build/VStudio/winfsp_dll.vcxproj b/build/VStudio/winfsp_dll.vcxproj index aa32d799..b0788789 100644 --- a/build/VStudio/winfsp_dll.vcxproj +++ b/build/VStudio/winfsp_dll.vcxproj @@ -35,8 +35,8 @@ - - + + @@ -64,7 +64,7 @@ - + diff --git a/build/VStudio/winfsp_dll.vcxproj.filters b/build/VStudio/winfsp_dll.vcxproj.filters index a1788ed2..1fd13cd7 100644 --- a/build/VStudio/winfsp_dll.vcxproj.filters +++ b/build/VStudio/winfsp_dll.vcxproj.filters @@ -12,9 +12,6 @@ {1d6501f4-cebd-4a00-a774-deb782b59fb5} - - {c7b83307-0aa0-4593-b2d4-26ff2f1edfc6} - {0e7ab1b1-bfca-4439-accb-45a909be9cad} @@ -27,8 +24,14 @@ {96091a7b-3923-4a74-9491-3ee230c688f9} - - {613cce77-2428-4f9a-9187-f37e009253c1} + + {a099cca5-e40c-4f99-baff-b5399dac5406} + + + {c2e11b62-74a0-41af-9f5b-0846fe81563c} + + + {7963f853-656a-4fd7-b8df-e586c3fe3dab} @@ -41,9 +44,6 @@ Source - - Include\shared - Include\fuse @@ -80,8 +80,11 @@ Source\fuse3 - - Source\ku + + Source\shared\um + + + Source\shared\ku @@ -157,12 +160,12 @@ Source\fuse3 - - Source\ku - Source + + Source\shared\ku + diff --git a/build/VStudio/winfsp_sys.vcxproj b/build/VStudio/winfsp_sys.vcxproj index 6667004c..b62a7781 100644 --- a/build/VStudio/winfsp_sys.vcxproj +++ b/build/VStudio/winfsp_sys.vcxproj @@ -155,8 +155,8 @@ - - + + @@ -193,7 +193,7 @@ - + diff --git a/build/VStudio/winfsp_sys.vcxproj.filters b/build/VStudio/winfsp_sys.vcxproj.filters index 9e98a450..7f71883d 100644 --- a/build/VStudio/winfsp_sys.vcxproj.filters +++ b/build/VStudio/winfsp_sys.vcxproj.filters @@ -12,8 +12,11 @@ {904f0df1-2fb8-4f84-aa46-fa929488c39a} - - {235076b8-290c-4dec-b005-71d9b8e8cba7} + + {c4db9aa7-9474-4f0b-b38b-343a8a1e5686} + + + {df147bf8-bbdf-4de7-95ce-1e281925725a} @@ -110,15 +113,15 @@ Source - - Source\ku - - - Source\ku - Source + + Source\shared\ku + + + Source\shared\ku + @@ -130,8 +133,8 @@ Include\winfsp - - Source\ku + + Source\shared\ku diff --git a/src/dll/library.h b/src/dll/library.h index ea3e9865..fa3f5ec5 100644 --- a/src/dll/library.h +++ b/src/dll/library.h @@ -25,7 +25,7 @@ #define WINFSP_DLL_INTERNAL #include #include -#include +#include #include #define FSP_CFG_REJECT_EARLY_IRP diff --git a/src/fsptool/fsptool.c b/src/fsptool/fsptool.c index 3deae903..4cb989ee 100644 --- a/src/fsptool/fsptool.c +++ b/src/fsptool/fsptool.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include #include diff --git a/src/launcher/launchctl.c b/src/launcher/launchctl.c index 0a321bd2..049265a6 100644 --- a/src/launcher/launchctl.c +++ b/src/launcher/launchctl.c @@ -20,7 +20,7 @@ */ #include -#include +#include #define PROGNAME "launchctl" diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c index 2446c398..cd2397ed 100644 --- a/src/launcher/launcher.c +++ b/src/launcher/launcher.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include #include #include diff --git a/src/launcher/ptrans.c b/src/launcher/ptrans.c index 8c71d6fb..976d73ac 100644 --- a/src/launcher/ptrans.c +++ b/src/launcher/ptrans.c @@ -62,7 +62,7 @@ */ #include -#include +#include static PWSTR PathCopy(PWSTR Dest, PWSTR Arg, PWSTR ArgEnd, BOOLEAN WriteDest, WCHAR Replacement) { diff --git a/src/ku/library.h b/src/shared/ku/library.h similarity index 98% rename from src/ku/library.h rename to src/shared/ku/library.h index 9e110521..75f87163 100644 --- a/src/ku/library.h +++ b/src/shared/ku/library.h @@ -1,5 +1,5 @@ /** - * @file ku/library.h + * @file shared/ku/library.h * * @copyright 2015-2020 Bill Zissimopoulos */ @@ -19,8 +19,8 @@ * associated repository. */ -#ifndef WINFSP_KU_LIBRARY_H_INCLUDED -#define WINFSP_KU_LIBRARY_H_INCLUDED +#ifndef WINFSP_SHARED_KU_LIBRARY_H_INCLUDED +#define WINFSP_SHARED_KU_LIBRARY_H_INCLUDED #if !defined(_KERNEL_MODE) diff --git a/src/ku/posix.c b/src/shared/ku/posix.c similarity index 99% rename from src/ku/posix.c rename to src/shared/ku/posix.c index 88610dd2..79b51aeb 100644 --- a/src/ku/posix.c +++ b/src/shared/ku/posix.c @@ -1,5 +1,5 @@ /** - * @file ku/posix.c + * @file shared/ku/posix.c * POSIX Interop. * * This file provides routines for Windows/POSIX interoperability. It is based @@ -32,7 +32,7 @@ * associated repository. */ -#include +#include FSP_API NTSTATUS FspPosixMapUidToSid(UINT32 Uid, PSID *PSid); FSP_API NTSTATUS FspPosixMapSidToUid(PSID Sid, PUINT32 PUid); diff --git a/src/ku/uuid5.c b/src/shared/ku/uuid5.c similarity index 98% rename from src/ku/uuid5.c rename to src/shared/ku/uuid5.c index 1f71a155..2a68daf2 100644 --- a/src/ku/uuid5.c +++ b/src/shared/ku/uuid5.c @@ -1,5 +1,5 @@ /** - * @file dll/uuid5.c + * @file shared/ku/uuid5.c * * @copyright 2015-2020 Bill Zissimopoulos */ @@ -19,7 +19,7 @@ * associated repository. */ -#include +#include #include /* diff --git a/src/shared/minimal.h b/src/shared/um/minimal.h similarity index 97% rename from src/shared/minimal.h rename to src/shared/um/minimal.h index 94f2b1a4..94930e9e 100644 --- a/src/shared/minimal.h +++ b/src/shared/um/minimal.h @@ -1,5 +1,5 @@ /** - * @file shared/minimal.h + * @file shared/um/minimal.h * * @copyright 2015-2020 Bill Zissimopoulos */ @@ -19,8 +19,8 @@ * associated repository. */ -#ifndef WINFSP_SHARED_MINIMAL_H_INCLUDED -#define WINFSP_SHARED_MINIMAL_H_INCLUDED +#ifndef WINFSP_SHARED_UM_MINIMAL_H_INCLUDED +#define WINFSP_SHARED_UM_MINIMAL_H_INCLUDED /* * Eliminate dependency on the MSVCRT libraries. diff --git a/tst/winfsp-tests/uuid5-test.c b/tst/winfsp-tests/uuid5-test.c index cde5381e..39436ddb 100644 --- a/tst/winfsp-tests/uuid5-test.c +++ b/tst/winfsp-tests/uuid5-test.c @@ -25,7 +25,7 @@ #include "winfsp-tests.h" #pragma comment(lib, "bcrypt.lib") -#include +#include static void uuid5_test(void) {