diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index fab19559ffb..13d88ca69dd 100644
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -166,7 +166,7 @@ dll\win32\imm32\imm32.dll 1
dll\win32\iphlpapi\iphlpapi.dll 1
dll\win32\kernel32\kernel32.dll 1
dll\win32\lsasrv\lsasrv.dll 1
-dll\win32\lzexpand\lz32.dll 1
+dll\win32\lz32\lz32.dll 1
dll\win32\mapi32\mapi32.dll 1
dll\win32\winmm\midimap\midimap.dll 1
dll\win32\mmdrv\mmdrv.dll 1
@@ -194,7 +194,7 @@ dll\win32\opengl32\opengl32.dll 1
dll\win32\psapi\psapi.dll 1
dll\win32\powrprof\powrprof.dll 1
dll\win32\riched20\riched20.dll 1
-dll\win32\richedit\riched32.dll 1
+dll\win32\riched32\riched32.dll 1
dll\win32\rpcrt4\rpcrt4.dll 1
dll\win32\samlib\samlib.dll 1
dll\win32\samsrv\samsrv.dll 1
diff --git a/reactos/dll/win32/lz32/lz32.def b/reactos/dll/win32/lz32/lz32.def
new file mode 100644
index 00000000000..6ecbbbe3517
--- /dev/null
+++ b/reactos/dll/win32/lz32/lz32.def
@@ -0,0 +1,19 @@
+; File generated automatically from lzexpand/lz32.spec; do not edit!
+
+LIBRARY lz32.dll
+
+EXPORTS
+CopyLZFile@8=KERNEL32.CopyLZFile
+GetExpandedNameA@8=KERNEL32.GetExpandedNameA
+GetExpandedNameW@8=KERNEL32.GetExpandedNameW
+LZClose@4=KERNEL32.LZClose
+;LZCloseFile
+LZCopy@8=KERNEL32.LZCopy
+;LZCreateFileW
+LZDone@0=KERNEL32.LZDone
+LZInit@4=KERNEL32.LZInit
+LZOpenFileA@12=KERNEL32.LZOpenFileA
+LZOpenFileW@12=KERNEL32.LZOpenFileW
+LZRead@12=KERNEL32.LZRead
+LZSeek@12=KERNEL32.LZSeek
+LZStart@0=KERNEL32.LZStart
diff --git a/reactos/dll/win32/lz32/lz32.rbuild b/reactos/dll/win32/lz32/lz32.rbuild
new file mode 100644
index 00000000000..67cd488a54f
--- /dev/null
+++ b/reactos/dll/win32/lz32/lz32.rbuild
@@ -0,0 +1,10 @@
+
+
+ .
+
+
+ ntdll
+ kernel32
+ lzexpand_main.c
+ lz32.rc
+
diff --git a/reactos/dll/win32/lz32/lz32.rc b/reactos/dll/win32/lz32/lz32.rc
new file mode 100644
index 00000000000..e1a9dac7337
--- /dev/null
+++ b/reactos/dll/win32/lz32/lz32.rc
@@ -0,0 +1,5 @@
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION "Lempel-Ziv Expander\0"
+#define REACTOS_STR_INTERNAL_NAME "lz32\0"
+#define REACTOS_STR_ORIGINAL_FILENAME "lz32.dll\0"
+#include
diff --git a/reactos/dll/win32/lz32/lzexpand_main.c b/reactos/dll/win32/lz32/lzexpand_main.c
new file mode 100644
index 00000000000..0d71cdb3249
--- /dev/null
+++ b/reactos/dll/win32/lz32/lzexpand_main.c
@@ -0,0 +1,29 @@
+/*
+ * LZ Decompression functions
+ *
+ * Copyright 1996 Marcus Meissner
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "windows.h"
+
+BOOL STDCALL
+DllMain(HANDLE hDll,
+ DWORD dwReason,
+ LPVOID lpReserved)
+{
+ return TRUE;
+}
diff --git a/reactos/dll/win32/riched32/riched32.rbuild b/reactos/dll/win32/riched32/riched32.rbuild
new file mode 100644
index 00000000000..24eca302a5c
--- /dev/null
+++ b/reactos/dll/win32/riched32/riched32.rbuild
@@ -0,0 +1,17 @@
+
+
+ .
+ include/reactos/wine
+
+
+ 0x600
+ 0x501
+ 0x501
+ wine
+ ntdll
+ kernel32
+ user32
+ riched20
+ richedit.c
+ riched32.spec
+
diff --git a/reactos/dll/win32/riched32/riched32.spec b/reactos/dll/win32/riched32/riched32.spec
new file mode 100644
index 00000000000..2446ff7825b
--- /dev/null
+++ b/reactos/dll/win32/riched32/riched32.spec
@@ -0,0 +1 @@
+2 stdcall -private DllGetVersion (ptr)
diff --git a/reactos/dll/win32/riched32/richedit.c b/reactos/dll/win32/riched32/richedit.c
new file mode 100644
index 00000000000..155d4d8dc08
--- /dev/null
+++ b/reactos/dll/win32/riched32/richedit.c
@@ -0,0 +1,106 @@
+/*
+ * RichEdit32 functions
+ *
+ * This module is a simple wrapper for the RichEdit 2.0 control
+ *
+ * Copyright 2000 by Jean-Claude Batista
+ * Copyright 2005 Mike McCormack
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include
+#include
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winreg.h"
+#include "winerror.h"
+#include "winuser.h"
+#include "richedit.h"
+#include "shlwapi.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(richedit);
+
+/* Window procedure of the RichEdit 1.0 control in riched20.dll */
+extern LRESULT WINAPI RichEdit10ANSIWndProc(HWND, UINT, WPARAM, LPARAM);
+
+
+/* Unregisters the window class. */
+static BOOL RICHED32_Unregister(void)
+{
+ TRACE("\n");
+
+ UnregisterClassA(RICHEDIT_CLASS10A, NULL);
+ return TRUE;
+}
+
+
+/* Registers the window class. */
+static BOOL RICHED32_Register(void)
+{
+ WNDCLASSA wndClass;
+
+ ZeroMemory(&wndClass, sizeof(WNDCLASSA));
+ wndClass.style = CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS;
+ wndClass.lpfnWndProc = RichEdit10ANSIWndProc;
+ wndClass.cbClsExtra = 0;
+ wndClass.cbWndExtra = 4;
+ wndClass.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
+ wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+ wndClass.lpszClassName = RICHEDIT_CLASS10A; /* WC_RICHED32A; */
+
+ RegisterClassA(&wndClass);
+
+ return TRUE;
+}
+
+/* Initialization function */
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+ TRACE("\n");
+ switch (fdwReason)
+ {
+ case DLL_PROCESS_ATTACH:
+ DisableThreadLibraryCalls(hinstDLL);
+ return RICHED32_Register();
+
+ case DLL_PROCESS_DETACH:
+ return RICHED32_Unregister();
+ }
+ return TRUE;
+}
+
+/***********************************************************************
+ * DllGetVersion [RICHED32.2]
+ *
+ * Retrieves version information
+ */
+HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi)
+{
+ TRACE("\n");
+
+ if (pdvi->cbSize != sizeof(DLLVERSIONINFO))
+ return E_INVALIDARG;
+
+ pdvi->dwMajorVersion = 4;
+ pdvi->dwMinorVersion = 0;
+ pdvi->dwBuildNumber = 0;
+ pdvi->dwPlatformID = 0;
+
+ return S_OK;
+}
diff --git a/reactos/dll/win32/win32.rbuild b/reactos/dll/win32/win32.rbuild
index 54ff665e0a7..3c4205eaa44 100644
--- a/reactos/dll/win32/win32.rbuild
+++ b/reactos/dll/win32/win32.rbuild
@@ -91,8 +91,8 @@
-
-
+
+
@@ -172,8 +172,8 @@
-
-
+
+