Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:53:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Added a base address for netshell.dll

Browse source 
- Relocated imm32.dll

svn path=/trunk/; revision=35730
This commit is contained in:
Pierre Schweitzer 2008-08-28 11:50:29 +00:00
parent 687df0212a
commit d1d5f6306d
3 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/baseaddress.rbuild
View file

@ -127,11 +127,12 @@
<property name="BASEADDRESS_COMCTL32" value="0x76160000" /> <property name="BASEADDRESS_COMCTL32" value="0x76160000" />
<property name="BASEADDRESS_COMDLG32" value="0x76210000" /> <property name="BASEADDRESS_COMDLG32" value="0x76210000" />
<property name="BASEADDRESS_WINSTA" value="0x762F0000" /> <property name="BASEADDRESS_WINSTA" value="0x762F0000" />
<property name="BASEADDRESS_IMM32" value="0x76320000" />
<property name="BASEADDRESS_RICHED32" value="0x76340000" /> <property name="BASEADDRESS_RICHED32" value="0x76340000" />
<property name="BASEADDRESS_D3D8THK" value="0x76340000" /> <property name="BASEADDRESS_D3D8THK" value="0x76340000" />
<property name="BASEADDRESS_RICHED20" value="0x76360000" /> <property name="BASEADDRESS_RICHED20" value="0x76360000" />
<property name="BASEADDRESS_TWAIN_32" value="0x76380000" /> <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_LSASRV" value="0x76540000" />
<property name="BASEADDRESS_MIDIMAP" value="0x76600000" /> <property name="BASEADDRESS_MIDIMAP" value="0x76600000" />
<property name="BASEADDRESS_ODBC32" value="0x76660000" /> <property name="BASEADDRESS_ODBC32" value="0x76660000" />

21
reactos/dll/win32/netshell/netshell.c
View file

@ -47,6 +47,8 @@ DllCanUnloadNow(void)
return S_FALSE; return S_FALSE;
} }
//#define CHECKPOINT1 ERR("\n");
STDAPI STDAPI
DllRegisterServer(void) DllRegisterServer(void)
{ {
@ -55,21 +57,29 @@ DllRegisterServer(void)
WCHAR szNet[20]; WCHAR szNet[20];
UINT Length, Offset; UINT Length, Offset;
//CHECKPOINT1;
if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szNetConnectClass, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szNetConnectClass, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS)
return SELFREG_E_CLASS; return SELFREG_E_CLASS;
//CHECKPOINT1;
if (LoadStringW(netshell_hInstance, IDS_NETWORKCONNECTION, szName, MAX_PATH)) if (LoadStringW(netshell_hInstance, IDS_NETWORKCONNECTION, szName, MAX_PATH))
{ {
szName[MAX_PATH-1] = L'\0'; szName[MAX_PATH-1] = L'\0';
RegSetValueW(hKey, NULL, REG_SZ, szName, (wcslen(szName)+1) * sizeof(WCHAR)); 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) 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)); RegSetValueW(hSubKey, NULL, REG_SZ, szName, (wcslen(szName)+1) * sizeof(WCHAR));
RegCloseKey(hSubKey); RegCloseKey(hSubKey);
} }
//CHECKPOINT1;
Length = swprintf(szNet, L",-%u", IDS_NETWORKCONNECTION); Length = swprintf(szNet, L",-%u", IDS_NETWORKCONNECTION);
Offset = GetModuleFileNameW(netshell_hInstance, &szName[1], MAX_PATH); Offset = GetModuleFileNameW(netshell_hInstance, &szName[1], MAX_PATH);
if (Offset + Length + 2 < MAX_PATH) if (Offset + Length + 2 < MAX_PATH)
@ -80,26 +90,37 @@ DllRegisterServer(void)
RegSetValueExW(hKey, L"LocalizedString", 0, REG_SZ, (const LPBYTE)szName, (wcslen(szName)+1) * sizeof(WCHAR)); RegSetValueExW(hKey, L"LocalizedString", 0, REG_SZ, (const LPBYTE)szName, (wcslen(szName)+1) * sizeof(WCHAR));
} }
//CHECKPOINT1;
szName[Offset+1] = L'\0'; szName[Offset+1] = L'\0';
//CHECKPOINT1;
/* store default icon */ /* store default icon */
if (RegCreateKeyExW(hKey, L"DefaultIcon", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) if (RegCreateKeyExW(hKey, L"DefaultIcon", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS)
{ {
RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR)); RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR));
RegCloseKey(hSubKey); RegCloseKey(hSubKey);
} }
//CHECKPOINT1;
if (RegCreateKeyExW(hKey, L"InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) 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)); RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR));
RegCloseKey(hSubKey); RegCloseKey(hSubKey);
} }
//CHECKPOINT1;
if (RegCreateKeyExW(hKey, L"ShellFolder", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) if (RegCreateKeyExW(hKey, L"ShellFolder", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS)
{ {
DWORD dwAttributes = SFGAO_FOLDER; DWORD dwAttributes = SFGAO_FOLDER;
RegSetValueExW(hSubKey, L"Attributes",0, REG_BINARY, (const LPBYTE)&dwAttributes, sizeof(DWORD)); RegSetValueExW(hSubKey, L"Attributes",0, REG_BINARY, (const LPBYTE)&dwAttributes, sizeof(DWORD));
} }
//CHECKPOINT1;
return S_OK; return S_OK;
} }

2
reactos/dll/win32/netshell/netshell.rbuild
View file

@ -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" /> <autoregister infsection="OleControlDlls" type="Both" />
<importlibrary definition="netshell.spec.def" /> <importlibrary definition="netshell.spec.def" />
<include base="netshell">.</include> <include base="netshell">.</include>