[pschweitzer] 35730: - Added a base address for netshell.dll - Relocated imm32.dll

Author: pschweitzer
Date: Thu Aug 28 06:50:29 2008
New Revision: 35730

URL: http://svn.reactos.org/svn/reactos?rev=35730&view=rev
Log:
- Added a base address for netshell.dll
- Relocated imm32.dll

Modified:
    trunk/reactos/baseaddress.rbuild
    trunk/reactos/dll/win32/netshell/netshell.c
    trunk/reactos/dll/win32/netshell/netshell.rbuild

Modified: trunk/reactos/baseaddress.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=3573...
==============================================================================
--- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original)
+++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Thu Aug 28 06:50:29 2008
@@ -127,11 +127,12 @@
   <property name="BASEADDRESS_COMCTL32" value="0x76160000" />
   <property name="BASEADDRESS_COMDLG32" value="0x76210000" />
   <property name="BASEADDRESS_WINSTA" value="0x762F0000" />
+  <property name="BASEADDRESS_IMM32" value="0x76320000" />
   <property name="BASEADDRESS_RICHED32" value="0x76340000" />
   <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_NETSHELL" value="0x76390000" />
   <property name="BASEADDRESS_LSASRV" value="0x76540000" />
   <property name="BASEADDRESS_MIDIMAP" value="0x76600000" />
   <property name="BASEADDRESS_ODBC32" value="0x76660000" />

Modified: trunk/reactos/dll/win32/netshell/netshell.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshell...
==============================================================================
--- trunk/reactos/dll/win32/netshell/netshell.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/netshell.c [iso-8859-1] Thu Aug 28 06:50:29 2008
@@ -47,6 +47,8 @@
     return S_FALSE;
 }

+//#define CHECKPOINT1 ERR("\n");
+
 STDAPI
 DllRegisterServer(void)
 {
@@ -55,8 +57,12 @@
     WCHAR szNet[20];
     UINT Length, Offset;

+    //CHECKPOINT1;
+
     if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szNetConnectClass, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS)
         return SELFREG_E_CLASS;
+
+    //CHECKPOINT1;

if (LoadStringW(netshell_hInstance, IDS_NETWORKCONNECTION, szName, MAX_PATH))
     {
@@ -64,11 +70,15 @@
         RegSetValueW(hKey, NULL, REG_SZ, szName, (wcslen(szName)+1) * sizeof(WCHAR));
     }

+    //CHECKPOINT1;
+
     if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szNamespaceKey, 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS)
     {
         RegSetValueW(hSubKey, NULL, REG_SZ, szName, (wcslen(szName)+1) * sizeof(WCHAR));
         RegCloseKey(hSubKey);
     }
+
+    //CHECKPOINT1;

Length = swprintf(szNet, L",-%u", IDS_NETWORKCONNECTION);
     Offset = GetModuleFileNameW(netshell_hInstance, &szName[1], MAX_PATH);
@@ -80,7 +90,12 @@
         RegSetValueExW(hKey, L"LocalizedString", 0, REG_SZ, (const LPBYTE)szName, (wcslen(szName)+1) * sizeof(WCHAR));
     }

+
+    //CHECKPOINT1;
+
     szName[Offset+1] = L'\0';
+
+    //CHECKPOINT1;

/* store default icon */
     if (RegCreateKeyExW(hKey, L"DefaultIcon", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS)
@@ -88,17 +103,23 @@
         RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR));
         RegCloseKey(hSubKey);
     }
+    //CHECKPOINT1;
     if (RegCreateKeyExW(hKey, L"InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS)
     {
         RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR));
         RegCloseKey(hSubKey);
     }

+
+    //CHECKPOINT1;
+
     if (RegCreateKeyExW(hKey, L"ShellFolder", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS)
     {
         DWORD dwAttributes = SFGAO_FOLDER;
         RegSetValueExW(hSubKey, L"Attributes",0, REG_BINARY, (const LPBYTE)&dwAttributes, sizeof(DWORD));
     }
+
+    //CHECKPOINT1;

return S_OK;
 }

Modified: trunk/reactos/dll/win32/netshell/netshell.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshell...
==============================================================================
--- trunk/reactos/dll/win32/netshell/netshell.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/netshell.rbuild [iso-8859-1] Thu Aug 28 06:50:29 2008
@@ -1,4 +1,4 @@
-<module name="netshell" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="netshell.dll">
+<module name="netshell" type="win32dll" baseaddress="${BASEADDRESS_NETSHELL}" installbase="system32" installname="netshell.dll">
    <autoregister infsection="OleControlDlls" type="Both" />
    <importlibrary definition="netshell.spec.def" />
    <include base="netshell">.</include>