From a8e3dcc9e1e52b5190d46c932cf14d103fb14458 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Oct 2014 18:58:35 +0000 Subject: [PATCH] [ADVAPI32] * Introduce a wine folder to group the Wine synced source files. * Use the crypt folder as a starting point. More will follow. CORE-8540 svn path=/trunk/; revision=64937 --- reactos/dll/win32/advapi32/CMakeLists.txt | 6 +++--- reactos/dll/win32/advapi32/advapi32.h | 2 +- reactos/dll/win32/advapi32/{crypt => wine}/crypt.c | 0 reactos/dll/win32/advapi32/{crypt => wine}/crypt.h | 0 reactos/dll/win32/advapi32/{crypt => wine}/crypt_des.c | 0 reactos/dll/win32/advapi32/{crypt => wine}/crypt_lmhash.c | 0 reactos/dll/win32/advapi32/{crypt => wine}/ros_diff.patch | 0 reactos/media/doc/README.WINE | 8 +++++--- 8 files changed, 9 insertions(+), 7 deletions(-) rename reactos/dll/win32/advapi32/{crypt => wine}/crypt.c (100%) rename reactos/dll/win32/advapi32/{crypt => wine}/crypt.h (100%) rename reactos/dll/win32/advapi32/{crypt => wine}/crypt_des.c (100%) rename reactos/dll/win32/advapi32/{crypt => wine}/crypt_lmhash.c (100%) rename reactos/dll/win32/advapi32/{crypt => wine}/ros_diff.patch (100%) diff --git a/reactos/dll/win32/advapi32/CMakeLists.txt b/reactos/dll/win32/advapi32/CMakeLists.txt index 484f9234914..fe6bf4647de 100644 --- a/reactos/dll/win32/advapi32/CMakeLists.txt +++ b/reactos/dll/win32/advapi32/CMakeLists.txt @@ -17,9 +17,6 @@ add_rpc_files(client ${REACTOS_SOURCE_DIR}/include/reactos/idl/svcctl.idl) list(APPEND SOURCE - crypt/crypt.c - crypt/crypt_des.c - crypt/crypt_lmhash.c misc/dllmain.c misc/efs.c misc/hwprofiles.c @@ -44,6 +41,9 @@ list(APPEND SOURCE service/sctrl.c token/privilege.c token/token.c + wine/crypt.c + wine/crypt_des.c + wine/crypt_lmhash.c advapi32.h) add_library(advapi32 SHARED diff --git a/reactos/dll/win32/advapi32/advapi32.h b/reactos/dll/win32/advapi32/advapi32.h index 41e40f7c255..ce8af8c0890 100644 --- a/reactos/dll/win32/advapi32/advapi32.h +++ b/reactos/dll/win32/advapi32/advapi32.h @@ -39,7 +39,7 @@ #include #include -#include "crypt/crypt.h" +#include "wine/crypt.h" #ifndef HAS_FN_PROGRESSW #define FN_PROGRESSW FN_PROGRESS diff --git a/reactos/dll/win32/advapi32/crypt/crypt.c b/reactos/dll/win32/advapi32/wine/crypt.c similarity index 100% rename from reactos/dll/win32/advapi32/crypt/crypt.c rename to reactos/dll/win32/advapi32/wine/crypt.c diff --git a/reactos/dll/win32/advapi32/crypt/crypt.h b/reactos/dll/win32/advapi32/wine/crypt.h similarity index 100% rename from reactos/dll/win32/advapi32/crypt/crypt.h rename to reactos/dll/win32/advapi32/wine/crypt.h diff --git a/reactos/dll/win32/advapi32/crypt/crypt_des.c b/reactos/dll/win32/advapi32/wine/crypt_des.c similarity index 100% rename from reactos/dll/win32/advapi32/crypt/crypt_des.c rename to reactos/dll/win32/advapi32/wine/crypt_des.c diff --git a/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c b/reactos/dll/win32/advapi32/wine/crypt_lmhash.c similarity index 100% rename from reactos/dll/win32/advapi32/crypt/crypt_lmhash.c rename to reactos/dll/win32/advapi32/wine/crypt_lmhash.c diff --git a/reactos/dll/win32/advapi32/crypt/ros_diff.patch b/reactos/dll/win32/advapi32/wine/ros_diff.patch similarity index 100% rename from reactos/dll/win32/advapi32/crypt/ros_diff.patch rename to reactos/dll/win32/advapi32/wine/ros_diff.patch diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index ac419a318bb..14c16741d8d 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -256,9 +256,11 @@ check Wine current souces first as it may already be fixed. reactos/lib/3rdparty/strmbase # Synced to Wine-1.7.27 advapi32 - - reactos/dll/win32/advapi32/crypt/*.c # Synced to Wine-1.7.27 - reactos/dll/win32/advapi32/sec/cred.c # Synced to Wine-1.7.27 - reactos/dll/win32/advapi32/sec/sid.c # Out of Sync + reactos/dll/win32/advapi32/wine/crypt.c # Synced to Wine-1.7.27 + reactos/dll/win32/advapi32/wine/crypt_des.c # Synced to Wine-1.7.27 + reactos/dll/win32/advapi32/wine/crypt_lmhash.c # Synced to Wine-1.7.27 + reactos/dll/win32/advapi32/sec/cred.c # Synced to Wine-1.7.27 + reactos/dll/win32/advapi32/sec/sid.c # Out of Sync gdi32 - reactos/dll/win32/gdi32/objects/linedda.c # Synced at 20090410 -- 2.17.1