- add cryptnet.dll from wine (stub)

- relocate a few dlls

svn path=/trunk/; revision=26532

diff --git a/reactos/baseaddress.rbuild b/reactos/baseaddress.rbuild
index 7a733b9..9c0d323 100644 (file)
--- a/reactos/baseaddress.rbuild
+++ b/reactos/baseaddress.rbuild
@@ -10,6 +10,7 @@
   <property name="BASEADDRESS_VDMDBG" value="0x5b0d0000" />
   <property name="BASEADDRESS_OBJSEL" value="0x5b400000" />
   <property name="BASEADDRESS_SLAYER" value="0x5c7e0000" />
+  <property name="BASEADDRESS_COMMCTRL" value="0x5d090000" />
   <property name="BASEADDRESS_DPLAYX" value="0x5e080000" />
   <property name="BASEADDRESS_DINPUT" value="0x5f580000" />
   <property name="BASEADDRESS_NETID" value="0x5f660000" />
@@ -82,8 +83,7 @@
   <property name="BASEADDRESS_CABINET" value="0x75120000" />
   <property name="BASEADDRESS_IPHLPAPI" value="0x75700000" />
   <property name="BASEADDRESS_MSGINA" value="0x75970000" />
-  <property name="BASEADDRESS_IMM32" value="0x75e60000" />
-  <property name="BASEADDRESS_COMMCTRL" value="0x75e60000" />
+  <property name="BASEADDRESS_CRYPTNET" value="0x75e60000" />
   <property name="BASEADDRESS_RPCRT4" value="0x76000000" />
   <property name="BASEADDRESS_SHLWAPI" value="0x76120000" />
   <property name="BASEADDRESS_COMCTL32" value="0x76160000" />
@@ -93,6 +93,7 @@
   <property name="BASEADDRESS_D3D8THK" value="0x76340000" />
   <property name="BASEADDRESS_RICHED20" value="0x76360000" />
   <property name="BASEADDRESS_TWAIN_32" value="0x76380000" />
+  <property name="BASEADDRESS_IMM32" value="0x76390000" />
   <property name="BASEADDRESS_LSASRV" value="0x76540000" />
   <property name="BASEADDRESS_MIDIMAP" value="0x76600000" />
   <property name="BASEADDRESS_ODBC32" value="0x76660000" />

diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index f045147..8069165 100644 (file)
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -153,6 +153,7 @@ dll\win32\comdlg32\comdlg32.dll                     1
 dll\win32\crtdll\crtdll.dll                         1
 dll\win32\crypt32\crypt32.dll                       1
 dll\win32\cryptdll\cryptdll.dll                     1
+dll\win32\cryptnet\cryptnet.dll                     1
 dll\win32\cryptui\cryptui.dll                       1
 dll\win32\dbghelp\dbghelp.dll                       1
 dll\win32\devmgr\devmgr.dll                         1

diff --git a/reactos/dll/win32/cryptnet/cryptnet.rbuild b/reactos/dll/win32/cryptnet/cryptnet.rbuild
new file mode 100644 (file)
index 0000000..baff9ca
--- /dev/null
+++ b/reactos/dll/win32/cryptnet/cryptnet.rbuild
@@ -0,0 +1,16 @@
+<module name="cryptnet" type="win32dll" baseaddress="${BASEADDRESS_CRYPTNET}" installbase="system32" installname="cryptnet.dll" allowwarnings="true">\r
+       <importlibrary definition="cryptnet.spec.def" />\r
+       <include base="cryptnet">.</include>\r
+       <include base="ReactOS">include/reactos/wine</include>\r
+       <define name="__REACTOS__" />\r
+       <define name="__WINESRC__" />\r
+       <define name="__USE_W32API" />\r
+       <define name="_WIN32_IE">0x600</define>\r
+       <define name="_WIN32_WINNT">0x501</define>\r
+       <define name="WINVER">0x501</define>\r
+       <library>wine</library>\r
+       <library>kernel32</library>\r
+       <library>ntdll</library>\r
+       <file>cryptnet_main.c</file>\r
+       <file>cryptnet.spec</file>\r
+</module>\r

diff --git a/reactos/dll/win32/cryptnet/cryptnet.spec b/reactos/dll/win32/cryptnet/cryptnet.spec
new file mode 100644 (file)
index 0000000..62a8823
--- /dev/null
+++ b/reactos/dll/win32/cryptnet/cryptnet.spec
@@ -0,0 +1,18 @@
+@ stub CertDllVerifyCTLUsage
+@ stub CertDllVerifyRevocation
+@ stub CryptnetWlxLogoffEvent
+@ stub LdapProvOpenStore
+@ stub CryptCancelAsyncRetrieval
+@ stub CryptFlushTimeValidObject
+@ stub CryptGetObjectUrl
+@ stub CryptGetTimeValidObject
+@ stub CryptInstallCancelRetrieval
+@ stub CryptRetrieveObjectByUrlA
+@ stub CryptRetrieveObjectByUrlW
+@ stub CryptUninstallCancelRetrieval
+@ stdcall -private DllRegisterServer()
+@ stdcall -private DllUnregisterServer()
+@ stub I_CryptNetEnumUrlCacheEntry
+@ stub I_CryptNetGetHostNameFromUrl
+@ stub I_CryptNetGetUserDsStoreUrl
+@ stub I_CryptNetIsConnected

diff --git a/reactos/dll/win32/cryptnet/cryptnet_main.c b/reactos/dll/win32/cryptnet/cryptnet_main.c
new file mode 100644 (file)
index 0000000..3ecb0d3
--- /dev/null
+++ b/reactos/dll/win32/cryptnet/cryptnet_main.c
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2006 Maarten Lankhorst
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ */
+
+#include "config.h"
+#include "windef.h"
+#include "wine/debug.h"
+#include "winbase.h"
+#include "winnt.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(cryptnet);
+
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+   TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
+
+   switch (fdwReason) {
+      case DLL_WINE_PREATTACH:
+         return FALSE;  /* prefer native version */
+      case DLL_PROCESS_ATTACH:
+         DisableThreadLibraryCalls(hinstDLL);
+         break;
+      case DLL_PROCESS_DETACH:
+         /* Do uninitialisation here */
+         break;
+      default: break;
+   }
+   return TRUE;
+}
+
+/***********************************************************************
+ *    DllRegisterServer (CRYPTNET.@)
+ */
+HRESULT WINAPI DllRegisterServer(void)
+{
+   FIXME("stub\n");
+
+   return S_OK;
+}
+
+/***********************************************************************
+ *    DllUnregisterServer (CRYPTNET.@)
+ */
+HRESULT WINAPI DllUnregisterServer(void)
+{
+   FIXME("stub\n");
+
+   return S_OK;
+}

diff --git a/reactos/dll/win32/win32.rbuild b/reactos/dll/win32/win32.rbuild
index 6e6ba83..4a31ccd 100644 (file)
--- a/reactos/dll/win32/win32.rbuild
+++ b/reactos/dll/win32/win32.rbuild
@@ -52,6 +52,9 @@
 <directory name="cryptdll">
        <xi:include href="cryptdll/cryptdll.rbuild" />
 </directory>
+<directory name="cryptnet">
+       <xi:include href="cryptnet/cryptnet.rbuild" />
+</directory>
 <directory name="cryptui">
        <xi:include href="cryptui/cryptui.rbuild" />
 </directory>

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 1d81fbe..6294bbf 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -45,6 +45,7 @@ reactos/dll/win32/comctl32        # Autosync
 reactos/dll/win32/comdlg32        # Synced to Wine-0_9_16
 reactos/dll/win32/crypt32         # Autosync
 reactos/dll/win32/cryptdll        # Autosync
+reactos/dll/win32/cryptnet        # Autosync
 reactos/dll/win32/dbghelp         #
 reactos/dll/win32/icmp            # Synced to Wine-0_9_10
 reactos/dll/win32/imm32           # Autosync