From f9c3ffa9d19a7a316930617600898adb746215ce Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Tue, 9 Jan 2007 21:48:26 +0000
Subject: [PATCH 01/36] - Heavy cleanup of locking and lookup macros in ob_x.h.
 - Add calls to ObpInitializeDirectoryLookup where required. - Fixup calls to
 ObpAcquireDirectoryLockExclusive, but still keep them stubbed out for now.

svn path=/trunk/; revision=25403
---
 reactos/ntoskrnl/include/internal/ob_x.h | 227 ++++++++++++-----------
 reactos/ntoskrnl/ob/obhandle.c           |  12 +-
 reactos/ntoskrnl/ob/obinit.c             |   5 +-
 reactos/ntoskrnl/ob/oblife.c             |   9 +-
 reactos/ntoskrnl/ob/obname.c             |  17 +-
 reactos/ntoskrnl/ob/obref.c              |   2 +-
 6 files changed, 144 insertions(+), 128 deletions(-)

diff --git a/reactos/ntoskrnl/include/internal/ob_x.h b/reactos/ntoskrnl/include/internal/ob_x.h
index cf7ce2548a8..058be1bfe26 100644
--- a/reactos/ntoskrnl/include/internal/ob_x.h
+++ b/reactos/ntoskrnl/include/internal/ob_x.h
@@ -8,92 +8,12 @@
 
 #include "ex.h"
 
-#if DBG
-VOID
-FORCEINLINE
-ObpCalloutStart(IN PKIRQL CalloutIrql)
-{
-    /* Save the callout IRQL */
-    *CalloutIrql = KeGetCurrentIrql();
-}
-
-VOID
-FORCEINLINE
-ObpCalloutEnd(IN KIRQL CalloutIrql,
-              IN PCHAR Procedure,
-              IN POBJECT_TYPE ObjectType,
-              IN PVOID Object)
-{
-    /* Detect IRQL change */
-    if (CalloutIrql != KeGetCurrentIrql())
-    {
-        /* Print error */
-        DbgPrint("OB: ObjectType: %wZ  Procedure: %s  Object: %08x\n",
-                 &ObjectType->Name, Procedure, Object);
-        DbgPrint("    Returned at %x IRQL, but was called at %x IRQL\n",
-                 KeGetCurrentIrql(), CalloutIrql);
-        DbgBreakPoint();
-    }
-}
-#else
-VOID
-FORCEINLINE
-ObpCalloutStart(IN PKIRQL CalloutIrql)
-{
-    /* No-op */
-    UNREFERENCED_PARAMETER(CalloutIrql);
-}
-
-VOID
-FORCEINLINE
-ObpCalloutEnd(IN KIRQL CalloutIrql,
-              IN PCHAR Procedure,
-              IN POBJECT_TYPE ObjectType,
-              IN PVOID Object)
-{
-    UNREFERENCED_PARAMETER(CalloutIrql);
-}
-#endif
-
-VOID
-FORCEINLINE
-_ObpAcquireDirectoryLockShared(IN POBJECT_DIRECTORY Directory,
-                               IN POBP_LOOKUP_CONTEXT Context)
-{
-    /* It's not, set lock flag */
-    Context->LockStateSignature = 0xBBBB1234;
-
-    /* Lock it */
-    KeEnterCriticalRegion();
-    ExAcquirePushLockShared(&Directory->Lock);
-
-    /* Update lock flag */
-    Context->LockStateSignature = 0xDDDD1234;
-}
-
-VOID
-FORCEINLINE
-_ObpAcquireDirectoryLockExclusive(IN POBJECT_DIRECTORY Directory,
-                                  IN POBP_LOOKUP_CONTEXT Context)
-{
-    /* Update lock flag */
-    Context->LockStateSignature = 0xAAAA1234;
-
-    /* Lock it */
-    KeEnterCriticalRegion();
-    ExAcquirePushLockExclusive(&Directory->Lock);
-}
-
-VOID
-FORCEINLINE
-_ObpReleaseDirectoryLock(IN POBJECT_DIRECTORY Directory,
-                         IN POBP_LOOKUP_CONTEXT Context)
-{
-    /* Release the lock */
-    ExReleasePushLock(&Directory->Lock);
-    Context->LockStateSignature = 0xEEEE1234;
-    KeLeaveCriticalRegion();
-}
+#define OBP_LOCK_STATE_PRE_ACQUISITION_EXCLUSIVE    0xAAAA1234
+#define OBP_LOCK_STATE_PRE_ACQUISITION_SHARED       0xBBBB1234
+#define OBP_LOCK_STATE_POST_ACQUISITION_EXCLUSIVE   0xCCCC1234
+#define OBP_LOCK_STATE_POST_ACQUISITION_SHARED      0xDDDD1234
+#define OBP_LOCK_STATE_RELEASED                     0xEEEE1234
+#define OBP_LOCK_STATE_INITIALIZED                  0xFFFF1234
 
 ULONG
 FORCEINLINE
@@ -159,23 +79,69 @@ _ObpDecrementQueryReference(IN POBJECT_HEADER_NAME_INFO HeaderNameInfo)
 
 VOID
 FORCEINLINE
-_ObpCleanupDirectoryLookup(IN POBP_LOOKUP_CONTEXT Context,
-                           IN BOOLEAN DereferenceObject)
+_ObpAcquireDirectoryLockShared(IN POBJECT_DIRECTORY Directory,
+                               IN POBP_LOOKUP_CONTEXT Context)
+{
+    /* It's not, set lock flag */
+    Context->LockStateSignature = OBP_LOCK_STATE_PRE_ACQUISITION_SHARED;
+
+    /* Lock it */
+    KeEnterCriticalRegion();
+    ExAcquirePushLockShared(&Directory->Lock);
+
+    /* Update lock flag */
+    Context->LockStateSignature = OBP_LOCK_STATE_POST_ACQUISITION_SHARED;
+}
+
+VOID
+FORCEINLINE
+_ObpAcquireDirectoryLockExclusive(IN POBJECT_DIRECTORY Directory,
+                                  IN POBP_LOOKUP_CONTEXT Context)
+{
+    /* Update lock flag */
+    Context->LockStateSignature = OBP_LOCK_STATE_PRE_ACQUISITION_EXCLUSIVE;
+
+    /* Acquire an exclusive directory lock */
+    KeEnterCriticalRegion();
+    ExAcquirePushLockExclusive(&Directory->Lock);
+
+    /* Set the directory */
+    Context->Directory = Directory;
+
+    /* Update lock settings */
+    Context->LockStateSignature = OBP_LOCK_STATE_POST_ACQUISITION_EXCLUSIVE;
+    Context->DirectoryLocked = TRUE;
+}
+
+VOID
+FORCEINLINE
+_ObpReleaseDirectoryLock(IN POBJECT_DIRECTORY Directory,
+                         IN POBP_LOOKUP_CONTEXT Context)
+{
+    /* Release the lock */
+    ExReleasePushLock(&Directory->Lock);
+    Context->LockStateSignature = OBP_LOCK_STATE_RELEASED;
+    KeLeaveCriticalRegion();
+}
+
+VOID
+FORCEINLINE
+_ObpInitializeDirectoryLookup(IN POBP_LOOKUP_CONTEXT Context)
+{
+    /* Initialize a null context */
+    Context->Object = NULL;
+    Context->Directory = NULL;
+    Context->DirectoryLocked = FALSE;
+    Context->LockStateSignature = OBP_LOCK_STATE_INITIALIZED;
+}
+
+VOID
+FORCEINLINE
+_ObpReleaseLookupContextObject(IN POBP_LOOKUP_CONTEXT Context)
 {
     POBJECT_HEADER ObjectHeader;
     POBJECT_HEADER_NAME_INFO HeaderNameInfo;
 
-    /* Check if we came back with the directory locked */
-    if (Context->DirectoryLocked)
-    {
-        /* Release the lock */
-        _ObpReleaseDirectoryLock(Context->Directory, Context);
-    }
-
-    /* Clear the context  */
-    Context->Directory = NULL;
-    Context->DirectoryLocked = FALSE;
-
     /* Check if we had found an object */
     if (Context->Object)
     {
@@ -186,20 +152,27 @@ _ObpCleanupDirectoryLookup(IN POBP_LOOKUP_CONTEXT Context,
         /* Check if we do have name information */
         if (HeaderNameInfo) _ObpDecrementQueryReference(HeaderNameInfo);
 
-        /* Check if we need to dereference it */
-        if (DereferenceObject) ObDereferenceObject(Context->Object);
+        /* Dereference the object */
+        ObDereferenceObject(Context->Object);
+        Context->Object = NULL;
     }
 }
 
 VOID
 FORCEINLINE
-_ObpInitializeDirectoryLookup(IN POBP_LOOKUP_CONTEXT Context)
+_ObpCleanupDirectoryLookup(IN POBP_LOOKUP_CONTEXT Context)
 {
-    /* Initialize a null context */
-    Context->Object = NULL;
+    /* Check if we came back with the directory locked */
+    if (Context->DirectoryLocked)
+    {
+        /* Release the lock */
+        _ObpReleaseDirectoryLock(Context->Directory, Context);
+    }
+
+    /* Clear the context  */
     Context->Directory = NULL;
     Context->DirectoryLocked = FALSE;
-    Context->LockStateSignature = 0xFFFF1234;
+    _ObpReleaseLookupContextObject(Context);
 }
 
 #if _OB_DEBUG_
@@ -365,5 +338,49 @@ ObpFreeAndReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateIn
     ObpFreeCapturedAttributes(ObjectCreateInfo, LookasideCreateInfoList);
 }
 
+#if DBG
+VOID
+FORCEINLINE
+ObpCalloutStart(IN PKIRQL CalloutIrql)
+{
+    /* Save the callout IRQL */
+    *CalloutIrql = KeGetCurrentIrql();
+}
 
+VOID
+FORCEINLINE
+ObpCalloutEnd(IN KIRQL CalloutIrql,
+              IN PCHAR Procedure,
+              IN POBJECT_TYPE ObjectType,
+              IN PVOID Object)
+{
+    /* Detect IRQL change */
+    if (CalloutIrql != KeGetCurrentIrql())
+    {
+        /* Print error */
+        DbgPrint("OB: ObjectType: %wZ  Procedure: %s  Object: %08x\n",
+                 &ObjectType->Name, Procedure, Object);
+        DbgPrint("    Returned at %x IRQL, but was called at %x IRQL\n",
+                 KeGetCurrentIrql(), CalloutIrql);
+        DbgBreakPoint();
+    }
+}
+#else
+VOID
+FORCEINLINE
+ObpCalloutStart(IN PKIRQL CalloutIrql)
+{
+    /* No-op */
+    UNREFERENCED_PARAMETER(CalloutIrql);
+}
 
+VOID
+FORCEINLINE
+ObpCalloutEnd(IN KIRQL CalloutIrql,
+              IN PCHAR Procedure,
+              IN POBJECT_TYPE ObjectType,
+              IN PVOID Object)
+{
+    UNREFERENCED_PARAMETER(CalloutIrql);
+}
+#endif
diff --git a/reactos/ntoskrnl/ob/obhandle.c b/reactos/ntoskrnl/ob/obhandle.c
index fcdcd09ffe8..3fc6cb1a8cc 100644
--- a/reactos/ntoskrnl/ob/obhandle.c
+++ b/reactos/ntoskrnl/ob/obhandle.c
@@ -1249,7 +1249,7 @@ ObpCreateHandle(IN OB_OPEN_REASON OpenReason,
     if ((Type) && (ObjectType != Type))
     {
         /* They don't, cleanup */
-        //if (Context) ObpCleanupDirectoryLookup(Object, Context);
+        //if (Context) ObpCleanupDirectoryLookup(Context);
         return STATUS_OBJECT_TYPE_MISMATCH;
     }
 
@@ -1287,7 +1287,7 @@ ObpCreateHandle(IN OB_OPEN_REASON OpenReason,
          * We failed (meaning security failure, according to NT Internals)
          * detach and return
          */
-        //if (Context) ObpCleanupDirectoryLookup(Object, Context);
+        //if (Context) ObpCleanupDirectoryLookup(Context);
         if (AttachedToProcess) KeUnstackDetachProcess(&ApcState);
         return Status;
     }
@@ -1327,7 +1327,8 @@ ObpCreateHandle(IN OB_OPEN_REASON OpenReason,
     }
 
     /* Now we can release the object */
-    //if (Context) ObpCleanupDirectoryLookup(Object, Context);
+    //if (Context) ObpCleanupDirectoryLookup(Context);
+    if (Context) Context->Object = NULL;
 
     /* Save the object header */
     NewEntry.Object = ObjectHeader;
@@ -2116,7 +2117,7 @@ ObOpenObjectByName(IN POBJECT_ATTRIBUTES ObjectAttributes,
     if (!NT_SUCCESS(Status))
     {
         /* Cleanup after lookup */
-        //ObpCleanupDirectoryLookup(&TempBuffer->LookupContext, TRUE);
+        //ObpCleanupDirectoryLookup(&TempBuffer->LookupContext);
         TempBuffer->LookupContext.Object = NULL;
         goto Cleanup;
     }
@@ -2151,7 +2152,8 @@ ObOpenObjectByName(IN POBJECT_ATTRIBUTES ObjectAttributes,
         Status = STATUS_INVALID_PARAMETER;
 
         /* Cleanup after lookup */
-        //ObpCleanupDirectoryLookup(&TempBuffer->LookupContext, TRUE);
+        //ObpCleanupDirectoryLookup(&TempBuffer->LookupContext);
+        TempBuffer->LookupContext.Object = NULL;
     }
     else
     {
diff --git a/reactos/ntoskrnl/ob/obinit.c b/reactos/ntoskrnl/ob/obinit.c
index f7e6ab93d88..e4d68b2eafa 100644
--- a/reactos/ntoskrnl/ob/obinit.c
+++ b/reactos/ntoskrnl/ob/obinit.c
@@ -283,9 +283,6 @@ ObPostPhase0:
 
     /* Lock it */
     //ObpAcquireDirectoryLockExclusive(ObpTypeDirectoryObject, &Context);
-
-    /* Setup directory */
-    // FIXME: ObpSetLookupDirectory(Dir);?
     Context.Directory = ObpTypeDirectoryObject;
     Context.DirectoryLocked = TRUE;
     Context.LockStateSignature = 0xCCCC1234;
@@ -326,7 +323,7 @@ ObPostPhase0:
     }
 
     /* Cleanup after lookup */
-    //ObpCleanupDirectoryLookup(&Context, TRUE);
+    //ObpCleanupDirectoryLookup(&Context);
     Context.Object = NULL;
 
     /* Initialize DOS Devices Directory and related Symbolic Links */
diff --git a/reactos/ntoskrnl/ob/oblife.c b/reactos/ntoskrnl/ob/oblife.c
index 6384275e179..c692d87af94 100644
--- a/reactos/ntoskrnl/ob/oblife.c
+++ b/reactos/ntoskrnl/ob/oblife.c
@@ -958,14 +958,19 @@ ObCreateObjectType(IN PUNICODE_STRING TypeName,
         if (*p++ == OBJ_NAME_PATH_SEPARATOR) return STATUS_OBJECT_NAME_INVALID;
     }
 
-    Context.Object = NULL;
+    /* Setup a lookup context */
+    ObpInitializeDirectoryLookup(&Context);
 
     /* Check if we've already created the directory of types */
     if (ObpTypeDirectoryObject)
     {
-        /* Then scan it to figure out if we've already created this type */
+        /* Acquire the directory lock */
+        //ObpAcquireDirectoryLockExclusive(ObpTypeDirectoryObject, &Context);
         Context.Directory = ObpTypeDirectoryObject;
         Context.DirectoryLocked = TRUE;
+        Context.LockStateSignature = 0xCCCC1234;
+
+        /* Do the lookup */
         if (ObpLookupEntryDirectory(ObpTypeDirectoryObject,
                                     TypeName,
                                     OBJ_CASE_INSENSITIVE,
diff --git a/reactos/ntoskrnl/ob/obname.c b/reactos/ntoskrnl/ob/obname.c
index 6f57486173d..ce0e71a7955 100644
--- a/reactos/ntoskrnl/ob/obname.c
+++ b/reactos/ntoskrnl/ob/obname.c
@@ -194,12 +194,10 @@ ObpDeleteNameCheck(IN PVOID Object)
          !(ObjectHeader->Flags & OB_FLAG_PERMANENT))
     {
         /* Setup a lookup context */
-        Context.Object = NULL;
+        ObpInitializeDirectoryLookup(&Context);
 
         /* Lock the directory */
         //ObpAcquireDirectoryLockExclusive(ObjectNameInfo->Directory, &Context);
-
-        /* Set the lookup parameters */
         Context.Directory = ObjectNameInfo->Directory;
         Context.DirectoryLocked = TRUE;
         Context.LockStateSignature = 0xCCCC1234;
@@ -255,7 +253,7 @@ ObpDeleteNameCheck(IN PVOID Object)
         }
 
         /* Cleanup after lookup */
-        //ObpCleanupDirectoryLookup(&Context, TRUE);
+        //ObpCleanupDirectoryLookup(&Context);
         Context.Object = NULL;
 
         /* Remove another query reference since we added one on top */
@@ -313,7 +311,7 @@ ObpLookupObjectName(IN HANDLE RootHandle,
             InsertObject);
 
     /* Initialize starting state */
-    LookupContext->Object = NULL;
+    ObpInitializeDirectoryLookup(LookupContext);
     *FoundObject = NULL;
     Status = STATUS_SUCCESS;
     Object = NULL;
@@ -575,10 +573,7 @@ ReparseNewDir:
             if (InsertObject)
             {
                 /* Lock the directory */
-                //ObpAcquireDirectoryLockExclusive(LookupContext, Directory);
-
-                /* Setup the context */
-                // FIXME: ObpSetLookupDirectory(Dir);?
+                //ObpAcquireDirectoryLockExclusive(Directory, LookupContext);
                 LookupContext->Directory = Directory;
                 LookupContext->DirectoryLocked = TRUE;
                 LookupContext->LockStateSignature = 0xCCCC1234;
@@ -701,7 +696,7 @@ Reparse:
             InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1);
 
             /* Cleanup from the first lookup */
-            //ObpCleanupDirectoryLookup(LookupContext, TRUE);
+            //ObpCleanupDirectoryLookup(LookupContext);
             LookupContext->Object = NULL;
 
             /* Check if we have a referenced directory */
@@ -868,7 +863,7 @@ Reparse:
     if (!NT_SUCCESS(Status))
     {
         /* Cleanup after lookup */
-        //ObpCleanupDirectoryLookup(LookupContext, TRUE);
+        //ObpCleanupDirectoryLookup(LookupContext);
         LookupContext->Object = NULL;
     }
 
diff --git a/reactos/ntoskrnl/ob/obref.c b/reactos/ntoskrnl/ob/obref.c
index bc4b768263d..16763d45a97 100644
--- a/reactos/ntoskrnl/ob/obref.c
+++ b/reactos/ntoskrnl/ob/obref.c
@@ -430,7 +430,7 @@ ObReferenceObjectByName(IN PUNICODE_STRING ObjectPath,
                                  &Object);
 
     /* Cleanup after lookup */
-    //ObpCleanupDirectoryLookup(&Context, TRUE);
+    //ObpCleanupDirectoryLookup(&Context);
     Context.Object = NULL;
 
     /* Check if the lookup succeeded */

From cf06d4975f650d62afb58aba00a5924e77a91e63 Mon Sep 17 00:00:00 2001
From: Johannes Anderwald <johannes.anderwald@reactos.org>
Date: Tue, 9 Jan 2007 22:02:17 +0000
Subject: [PATCH 02/36]  Updated French translation by Pierre Schweitzer 2007
 (heis_spiter AT hotmail DOT com) See issue #1969 for more details.

svn path=/trunk/; revision=25404
---
 reactos/dll/cpl/desk/Fr.rc | 57 +++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/reactos/dll/cpl/desk/Fr.rc b/reactos/dll/cpl/desk/Fr.rc
index 53196da600c..528e456ae44 100644
--- a/reactos/dll/cpl/desk/Fr.rc
+++ b/reactos/dll/cpl/desk/Fr.rc
@@ -1,4 +1,5 @@
 /* French translation by Benoit Plante 2005 (cmoibenlepro AT hotmail DOT com) */
+/* Updated French translation by Pierre Schweitzer 2007 (heis_spiter AT hotmail DOT com) */
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
@@ -88,19 +89,19 @@ IDR_POPUP_MENU MENU DISCARDABLE
 BEGIN
   POPUP ""
   BEGIN
-	MENUITEM "&Configure",     ID_MENU_CONFIG
-	MENUITEM "&Preview",       ID_MENU_PREVIEW
+	MENUITEM "&Configurer",     ID_MENU_CONFIG
+	MENUITEM "A&perçu",       ID_MENU_PREVIEW
 	MENUITEM SEPARATOR
-	MENUITEM "&Add",           ID_MENU_ADD
-	MENUITEM "&Delete\tDel",   ID_MENU_DELETE
+	MENUITEM "&Ajouer",           ID_MENU_ADD
+	MENUITEM "Supprimer\tSuppr",   ID_MENU_DELETE
   END
 END
 
 IDR_PREVIEW_MENU MENU
 BEGIN
     MENUITEM "Normal",           ID_MENU_NORMAL
-    MENUITEM "Disabled",         ID_MENU_DISABLED
-    MENUITEM "Selected",         ID_MENU_SELECTED
+    MENUITEM "Désactivé",         ID_MENU_DISABLED
+    MENUITEM "Sélectionné",         ID_MENU_SELECTED
 END
 
 STRINGTABLE 
@@ -132,32 +133,32 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_INACTWIN "Inactive Window"
-    IDS_ACTWIN   "Active Window"
-    IDS_WINTEXT  "Window Text"
-    IDS_MESSBOX  "Message Box"
-    IDS_MESSTEXT "Message Text"
+    IDS_INACTWIN "Fenêtre inactive"
+    IDS_ACTWIN   "Fenêtre active"
+    IDS_WINTEXT  "Texte de la fenêtre"
+    IDS_MESSBOX  "Boîte de message"
+    IDS_MESSTEXT "Texte de message"
     IDS_BUTTEXT  "OK"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ITEM_3D_OBJECTS      "3D Objects"
-    IDS_ITEM_SCROLLBAR       "Scrollbar"
-    IDS_ITEM_DESKTOP         "Desktop"
-    IDS_ITEM_MESSAGE_BOX     "Message Box"
-    IDS_ITEM_WINDOW          "Window"
-    IDS_ITEM_APP_BACKGROUND  "Application Background"
-    IDS_ITEM_SELECTED_ITEMS  "Selected Items"
+    IDS_ITEM_3D_OBJECTS      "Objets 3D"
+    IDS_ITEM_SCROLLBAR       "Barre de défilement"
+    IDS_ITEM_DESKTOP         "Bureau"
+    IDS_ITEM_MESSAGE_BOX     "Boîte de message"
+    IDS_ITEM_WINDOW          "Fenêtre"
+    IDS_ITEM_APP_BACKGROUND  "Espace de travail de l'application"
+    IDS_ITEM_SELECTED_ITEMS  "Éléments sélectionnés"
     IDS_ITEM_MENU            "Menu"
-    IDS_ITEM_PALETTE_TITLE   "Palette Title"
-    IDS_ITEM_TOOLTIP         "Tooltip"
-    IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border"
-    IDS_ITEM_ACTIVE_WINDOW   "Active Window Border"
-    IDS_ITEM_ICON            "Icon"
-    IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)"
-    IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)"
-    IDS_ITEM_INACTIVE_TITLE  "Inactive Title Bar"
-    IDS_ITEM_ACTIVE_TITLE    "Active Title Bar"
-    IDS_ITEM_CAPTION_BUTTONS "Caption Buttons"
+    IDS_ITEM_PALETTE_TITLE   "Tite de palette"
+    IDS_ITEM_TOOLTIP         "Info-bulle"
+    IDS_ITEM_INACTIVE_WINDOW "Bordure de fenêtre inactive"
+    IDS_ITEM_ACTIVE_WINDOW   "Bordure de fenêtre active"
+    IDS_ITEM_ICON            "Icône"
+    IDS_ITEM_ICON_SPACE_HORZ "Espacement des icônes (horizontal)"
+    IDS_ITEM_ICON_SPACE_VERT "Espacement des icônes (vertical)"
+    IDS_ITEM_INACTIVE_TITLE  "Barre de titre inactive"
+    IDS_ITEM_ACTIVE_TITLE    "Barre de titre active"
+    IDS_ITEM_CAPTION_BUTTONS "Boutons de barre de titre"
 END

From 208da846ac90dbd4d0c0f26aabdbc3bdfb2a6336 Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Tue, 9 Jan 2007 22:55:40 +0000
Subject: [PATCH 03/36] Implement new keyboard driver and layout structures to
 help Saveliy Tretiakovs LoadKeyboardLayout implementation.

svn path=/trunk/; revision=25405
---
 .../subsystems/win32/win32k/include/input.h    | 18 ++++++++++++++++++
 .../subsystems/win32/win32k/ntuser/keyboard.c  |  3 +++
 2 files changed, 21 insertions(+)

diff --git a/reactos/subsystems/win32/win32k/include/input.h b/reactos/subsystems/win32/win32k/include/input.h
index 4619b680c27..bee57e3653e 100644
--- a/reactos/subsystems/win32/win32k/include/input.h
+++ b/reactos/subsystems/win32/win32k/include/input.h
@@ -3,6 +3,24 @@
 
 #include <internal/kbd.h>
 
+typedef struct _KBDRVFILE
+{
+  PSINGLE_LIST_ENTRY pkbdfChain;
+  WCHAR wcKBDF[9];              // used w GetKeyboardLayoutName same as wszKLID.
+  struct _KBDTABLES* KBTables;  // KBDTABLES in ntoskrnl/include/internal/kbd.h
+} KBDRVFILE, *PKBDRVFILE;
+
+typedef struct _KBL
+{
+  PLIST_ENTRY pklChain;
+  DWORD dwKBLFlags;
+  HKL hkl;
+  PKBDRVFILE pkbdf;
+} KBL, *PKBL;
+
+#define KBL_UNLOADED 0x2000000
+#define KBL_RESET    0x4000000
+
 NTSTATUS FASTCALL
 InitInputImpl(VOID);
 NTSTATUS FASTCALL
diff --git a/reactos/subsystems/win32/win32k/ntuser/keyboard.c b/reactos/subsystems/win32/win32k/ntuser/keyboard.c
index d97660630a6..e8ea2681b48 100644
--- a/reactos/subsystems/win32/win32k/ntuser/keyboard.c
+++ b/reactos/subsystems/win32/win32k/ntuser/keyboard.c
@@ -53,6 +53,9 @@
 BYTE gQueueKeyStateTable[256];
 
 
+PKBDRVFILE KBLList = NULL; // Keyboard layout list.
+
+
 /* FUNCTIONS *****************************************************************/
 
 /* Initialization -- Right now, just zero the key state and init the lock */

From 8fb22da8e53e3481f70d0a9f56f5c43cea31ba2b Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Tue, 9 Jan 2007 23:00:21 +0000
Subject: [PATCH 04/36] - Add currency page controls. - Display currency format
 information.

svn path=/trunk/; revision=25406
---
 reactos/dll/cpl/intl/Fr.rc      | 178 ++++++++++---------
 reactos/dll/cpl/intl/Ja.rc      |  20 ++-
 reactos/dll/cpl/intl/currency.c | 299 +++++++++++++++++++++++++++++++-
 reactos/dll/cpl/intl/cz.rc      |  20 ++-
 reactos/dll/cpl/intl/de.rc      |  20 ++-
 reactos/dll/cpl/intl/en.rc      |  20 ++-
 reactos/dll/cpl/intl/es.rc      |  20 ++-
 reactos/dll/cpl/intl/hu.rc      |  20 ++-
 reactos/dll/cpl/intl/nl.rc      |  20 ++-
 reactos/dll/cpl/intl/resource.h |  12 +-
 reactos/dll/cpl/intl/ru.rc      |  20 ++-
 reactos/dll/cpl/intl/sv.rc      |  38 +++-
 reactos/dll/cpl/intl/uk.rc      |  20 ++-
 13 files changed, 606 insertions(+), 101 deletions(-)

diff --git a/reactos/dll/cpl/intl/Fr.rc b/reactos/dll/cpl/intl/Fr.rc
index 4377a00e4ab..3a52d591b17 100644
--- a/reactos/dll/cpl/intl/Fr.rc
+++ b/reactos/dll/cpl/intl/Fr.rc
@@ -1,82 +1,100 @@
 /* French translation by Benoit Plante 2005 (cmoibenlepro AT hotmail DOT com) */
 
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-
-IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Général"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "Page de propriétés 1",-1,73,74,90,8
-END
-
-
-IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Nombres"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "Page de propriétés 2",-1,73,74,90,8
-END
-
-
-IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Devise"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "Page de propriétés 3",-1,73,74,90,8
-END
-
-
-IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Heure"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  GROUPBOX "Apparence de l'heure", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
-  LTEXT "Échantillon d'heure:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
-  EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
-  LTEXT "Format d'heure:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
-  COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  LTEXT "&Séparateur des heures:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP
-  COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  LTEXT "Symbole de l'avant-midi(A&M):", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP
-  COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  LTEXT "Symbole de l'après-midi(&PM):", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP
-  COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE
-  LTEXT "Notation de l'heure\n\n\
-h = heure    m = minute    s = seconde    t = AM ou PM\n\n\
-h = 12 heures   H =24 heures \n\
-hh, mm, ss = Zéro de départ   h, m, s = Pas de zéro de départ",
-        -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP
-END
-
-
-IDD_DATEPAGE DIALOGEX 0, 0, 246, 188
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Date"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "Page de propriétés 5",-1,73,74,90,8
-END
-
-
-IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Langues"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  GROUPBOX "Langue principale", -1, 8, 11, 228, 74
-  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
-  LTEXT "Sélectionnez la langue principale que vous voulez utiliser:", -1, 38, 25, 193, 22
-  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
-END
-
-
-STRINGTABLE
-BEGIN
-  IDS_CPLNAME "Options régionales"
-  IDS_CPLDESCRIPTION "Selectionner les langues, les formats de nombres, les devises, l'heure et la date."
-END
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+
+IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Général"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Page de propriétés 1",-1,73,74,90,8
+END
+
+
+IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Nombres"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Page de propriétés 2",-1,73,74,90,8
+END
+
+
+IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Devise"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+END
+
+
+IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Heure"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  GROUPBOX "Apparence de l'heure", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Échantillon d'heure:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "Format d'heure:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  LTEXT "&Séparateur des heures:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  LTEXT "Symbole de l'avant-midi(A&M):", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  LTEXT "Symbole de l'après-midi(&PM):", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE
+  LTEXT "Notation de l'heure\n\n\
+h = heure    m = minute    s = seconde    t = AM ou PM\n\n\
+h = 12 heures   H =24 heures \n\
+hh, mm, ss = Zéro de départ   h, m, s = Pas de zéro de départ",
+        -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP
+END
+
+
+IDD_DATEPAGE DIALOGEX 0, 0, 246, 188
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Date"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Page de propriétés 5",-1,73,74,90,8
+END
+
+
+IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Langues"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  GROUPBOX "Langue principale", -1, 8, 11, 228, 74
+  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
+  LTEXT "Sélectionnez la langue principale que vous voulez utiliser:", -1, 38, 25, 193, 22
+  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+END
+
+
+STRINGTABLE
+BEGIN
+  IDS_CPLNAME "Options régionales"
+  IDS_CPLDESCRIPTION "Selectionner les langues, les formats de nombres, les devises, l'heure et la date."
+END
diff --git a/reactos/dll/cpl/intl/Ja.rc b/reactos/dll/cpl/intl/Ja.rc
index 5614e386aae..366a6ba85b9 100644
--- a/reactos/dll/cpl/intl/Ja.rc
+++ b/reactos/dll/cpl/intl/Ja.rc
@@ -23,7 +23,25 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "’ʉÝ"
 FONT 9, "MS UI Gothic"
 BEGIN
-  LTEXT "Property Page 3",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
diff --git a/reactos/dll/cpl/intl/currency.c b/reactos/dll/cpl/intl/currency.c
index 9700546e152..5fea83f7123 100644
--- a/reactos/dll/cpl/intl/currency.c
+++ b/reactos/dll/cpl/intl/currency.c
@@ -27,24 +27,305 @@
 #include <windows.h>
 #include <commctrl.h>
 #include <cpl.h>
+#include <tchar.h>
 
 #include "intl.h"
 #include "resource.h"
 
 
+typedef struct _GLOBAL_DATA
+{
+    TCHAR szCurrencySymbol[6];
+    TCHAR szDecimalSep[4];
+    TCHAR szThousandSep[4];
+    TCHAR szGrouping[10];
+
+    int PositiveOrder;
+    int NegativeOrder;
+    int NumDigits;
+
+} GLOBAL_DATA, *PGLOBAL_DATA;
+
+
+static VOID
+GetInitialCurrencyValues(PGLOBAL_DATA pGlobalData)
+{
+    TCHAR szBuffer[256];
+    int ret;
+
+    /* Get currency symbol */
+    ret = GetLocaleInfo(LOCALE_USER_DEFAULT,
+                        LOCALE_SCURRENCY,
+                        pGlobalData->szCurrencySymbol, 6);
+
+    /* Get positive format */
+    ret = GetLocaleInfo(LOCALE_USER_DEFAULT,
+                        LOCALE_ICURRENCY,
+                        szBuffer, 256);
+    if (ret != 0)
+    {
+        pGlobalData->PositiveOrder = _ttoi(szBuffer);
+    }
+
+    /* Get negative format */
+    ret = GetLocaleInfo(LOCALE_USER_DEFAULT,
+                        LOCALE_INEGCURR,
+                        szBuffer, 256);
+    if (ret != 0)
+    {
+        pGlobalData->NegativeOrder = _ttoi(szBuffer);
+    }
+
+    /* Get number of fractional digits */
+    ret = GetLocaleInfo(LOCALE_USER_DEFAULT,
+                        LOCALE_ICURRDIGITS,
+                        szBuffer, 256);
+    if (ret != 0)
+    {
+        pGlobalData->NumDigits = _ttoi(szBuffer);
+    }
+
+    /* Get decimal separator */
+    ret = GetLocaleInfoW(LOCALE_USER_DEFAULT,
+                         LOCALE_SMONDECIMALSEP,
+                         pGlobalData->szDecimalSep, 4);
+
+    /* Get group separator */
+    ret = GetLocaleInfo(LOCALE_USER_DEFAULT,
+                        LOCALE_SMONTHOUSANDSEP,
+                        pGlobalData->szThousandSep, 4);
+
+    /* Get grouping */
+    ret = GetLocaleInfo(LOCALE_USER_DEFAULT,
+                        LOCALE_SMONGROUPING,
+                        pGlobalData->szGrouping, 10);
+
+}
+
+
+static VOID
+UpdateExamples(HWND hwndDlg, PGLOBAL_DATA pGlobalData)
+{
+    TCHAR szBuffer[256];
+    CURRENCYFMT cyFmt;
+
+    cyFmt.NumDigits = pGlobalData->NumDigits;
+    cyFmt.LeadingZero = 0;
+    cyFmt.Grouping = 3;
+    cyFmt.lpDecimalSep = pGlobalData->szDecimalSep;
+    cyFmt.lpThousandSep = pGlobalData->szThousandSep;
+    cyFmt.PositiveOrder = pGlobalData->PositiveOrder;
+    cyFmt.NegativeOrder = pGlobalData->NegativeOrder;
+    cyFmt.lpCurrencySymbol = pGlobalData->szCurrencySymbol;
+
+    /* positive example */
+    GetCurrencyFormat(LOCALE_USER_DEFAULT, 0,
+                      _T("123456789.00"),
+                      &cyFmt, szBuffer, 256);
+
+    SetDlgItemText(hwndDlg,
+                   IDC_CURRENCYPOSSAMPLE,
+                   szBuffer);
+
+    /* negative example */
+    GetCurrencyFormat(LOCALE_USER_DEFAULT, 0,
+                      _T("-123456789.00"),
+                      &cyFmt, szBuffer, 256);
+
+    SetDlgItemText(hwndDlg,
+                   IDC_CURRENCYNEGSAMPLE,
+                   szBuffer);
+}
+
+
+static VOID
+OnInitDialog(HWND hwndDlg, PGLOBAL_DATA pGlobalData)
+{
+    TCHAR szBuffer[256];
+    CURRENCYFMT cyFmt;
+    int i;
+
+    GetInitialCurrencyValues(pGlobalData);
+
+    /* Set currency symbol */
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYSYMBOL),
+                CB_ADDSTRING,
+                0,
+                (LPARAM)pGlobalData->szCurrencySymbol);
+
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYSYMBOL),
+                CB_SETCURSEL,
+                0, /* index */
+                0);
+
+
+    /* positive currency values */
+    cyFmt.NumDigits = pGlobalData->NumDigits;
+    cyFmt.LeadingZero = 0;
+    cyFmt.Grouping = 3;
+    cyFmt.lpDecimalSep = pGlobalData->szDecimalSep;
+    cyFmt.lpThousandSep = pGlobalData->szThousandSep;
+    cyFmt.NegativeOrder = 0;
+    cyFmt.lpCurrencySymbol = pGlobalData->szCurrencySymbol;
+
+    for (i = 0; i < 4; i++)
+    {
+        cyFmt.PositiveOrder = i;
+        GetCurrencyFormat(LOCALE_USER_DEFAULT, 0,
+                          _T("1.1"),
+                          &cyFmt, szBuffer, 256);
+
+        SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYPOSVALUE),
+                    CB_INSERTSTRING,
+                    -1,
+                    (LPARAM)szBuffer);
+    }
+
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYPOSVALUE),
+                CB_SETCURSEL,
+                pGlobalData->PositiveOrder,
+                0);
+
+    /* negative currency values */
+    cyFmt.PositiveOrder = 0;
+    for (i = 0; i < 16; i++)
+    {
+        cyFmt.NegativeOrder = i;
+        GetCurrencyFormat(LOCALE_USER_DEFAULT, 0,
+                          _T("-1.1"),
+                          &cyFmt, szBuffer, 256);
+
+        SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYNEGVALUE),
+                    CB_INSERTSTRING,
+                    -1,
+                    (LPARAM)szBuffer);
+    }
+
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYNEGVALUE),
+                CB_SETCURSEL,
+                pGlobalData->NegativeOrder, /* index */
+                0);
+
+    /* decimal separator */
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECSEP),
+                CB_ADDSTRING,
+                0,
+                (LPARAM)pGlobalData->szDecimalSep);
+
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECSEP),
+                CB_SETCURSEL,
+                0, /* index */
+                0);
+
+
+    /* */
+    for (i = 0; i < 10; i++)
+    {
+        szBuffer[0] = _T('0') + i;
+        szBuffer[1] = 0;
+        SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECNUM),
+                    CB_ADDSTRING,
+                    0,
+                    (LPARAM)szBuffer);
+    }
+
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECNUM),
+                CB_SETCURSEL,
+                pGlobalData->NumDigits, /* index */
+                0);
+
+
+    /* digit group separator */
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPSEP),
+                CB_ADDSTRING,
+                0,
+                (LPARAM)pGlobalData->szThousandSep);
+
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPSEP),
+                CB_SETCURSEL,
+                0, /* index */
+                0);
+
+    /* digit grouping */
+    cyFmt.NumDigits = 0;
+    cyFmt.LeadingZero = 0;
+    cyFmt.lpDecimalSep = _T("");
+    cyFmt.lpThousandSep = pGlobalData->szThousandSep;
+    cyFmt.NegativeOrder = 0;
+    cyFmt.lpCurrencySymbol = _T("");
+    cyFmt.Grouping = 0;
+    GetCurrencyFormat(LOCALE_USER_DEFAULT, 0,
+                      _T("123456789"),
+                      &cyFmt, szBuffer, 256);
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM),
+                CB_INSERTSTRING,
+                -1,
+                (LPARAM)szBuffer);
+
+    cyFmt.Grouping = 3;
+    GetCurrencyFormat(LOCALE_USER_DEFAULT, 0,
+                      _T("123456789"),
+                      &cyFmt, szBuffer, 256);
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM),
+                CB_INSERTSTRING,
+                -1,
+                (LPARAM)szBuffer);
+
+    cyFmt.Grouping = 32;
+    GetCurrencyFormat(LOCALE_USER_DEFAULT, 0,
+                      _T("123456789"),
+                      &cyFmt, szBuffer, 256);
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM),
+                CB_INSERTSTRING,
+                -1,
+                (LPARAM)szBuffer);
+
+    i = 0;
+    if (pGlobalData->szGrouping[0] == _T('3'))
+    {
+        if ((pGlobalData->szGrouping[1] == _T(';')) &&
+            (pGlobalData->szGrouping[2] == _T('2')))
+            i = 2;
+        else
+            i = 1;
+    }
+
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM),
+                CB_SETCURSEL,
+                i, /* index */
+                0);
+
+    /* Show the examples */
+    UpdateExamples(hwndDlg, pGlobalData);
+}
+
+
 /* Property page dialog callback */
 INT_PTR CALLBACK
 CurrencyPageProc(HWND hwndDlg,
-		 UINT uMsg,
-		 WPARAM wParam,
-		 LPARAM lParam)
+                 UINT uMsg,
+                 WPARAM wParam,
+                 LPARAM lParam)
 {
-  switch(uMsg)
-  {
-    case WM_INITDIALOG:
-      break;
-  }
-  return FALSE;
+    PGLOBAL_DATA pGlobalData;
+
+    pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER);
+
+    switch (uMsg)
+    {
+        case WM_INITDIALOG:
+            pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA));
+            SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData);
+            OnInitDialog(hwndDlg, pGlobalData);
+            break;
+
+
+        case WM_DESTROY:
+            HeapFree(GetProcessHeap(), 0, pGlobalData);
+            break;
+    }
+
+    return FALSE;
 }
 
 /* EOF */
diff --git a/reactos/dll/cpl/intl/cz.rc b/reactos/dll/cpl/intl/cz.rc
index 1eca1973d44..69ab2dcfee2 100644
--- a/reactos/dll/cpl/intl/cz.rc
+++ b/reactos/dll/cpl/intl/cz.rc
@@ -25,7 +25,25 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Mìna"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 3",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
diff --git a/reactos/dll/cpl/intl/de.rc b/reactos/dll/cpl/intl/de.rc
index 4553386f3a9..5e2535acad0 100644
--- a/reactos/dll/cpl/intl/de.rc
+++ b/reactos/dll/cpl/intl/de.rc
@@ -25,7 +25,25 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Währung"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 3",-1,73,74,90,8
+  GROUPBOX "Darstellung", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positiv:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "Negativ:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "&Währungssymbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "Format für &positive Beträge:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "Format für &negative Beträge:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Dezimaltrennzeichen:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Anzahl der Dezimalstellen:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Symbol für Zifferngruppierung:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Zifferngruppierung:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
diff --git a/reactos/dll/cpl/intl/en.rc b/reactos/dll/cpl/intl/en.rc
index 88d88542650..be3f714f3df 100644
--- a/reactos/dll/cpl/intl/en.rc
+++ b/reactos/dll/cpl/intl/en.rc
@@ -25,7 +25,25 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Currency"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 3",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
diff --git a/reactos/dll/cpl/intl/es.rc b/reactos/dll/cpl/intl/es.rc
index fada44838ad..04b2b48385f 100644
--- a/reactos/dll/cpl/intl/es.rc
+++ b/reactos/dll/cpl/intl/es.rc
@@ -29,7 +29,25 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Moneda"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 3",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
diff --git a/reactos/dll/cpl/intl/hu.rc b/reactos/dll/cpl/intl/hu.rc
index 980fc8fdfd1..f84f90a2ed0 100644
--- a/reactos/dll/cpl/intl/hu.rc
+++ b/reactos/dll/cpl/intl/hu.rc
@@ -24,7 +24,25 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Pénznem"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "3.tulajdonságlap",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
diff --git a/reactos/dll/cpl/intl/nl.rc b/reactos/dll/cpl/intl/nl.rc
index 3f6d4c9945f..4e49f667388 100644
--- a/reactos/dll/cpl/intl/nl.rc
+++ b/reactos/dll/cpl/intl/nl.rc
@@ -25,7 +25,25 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Valuta"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 3",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
diff --git a/reactos/dll/cpl/intl/resource.h b/reactos/dll/cpl/intl/resource.h
index d125194b565..ffd0718c4df 100644
--- a/reactos/dll/cpl/intl/resource.h
+++ b/reactos/dll/cpl/intl/resource.h
@@ -8,7 +8,17 @@
 
 #define IDD_GENERALPAGE		100
 #define IDD_NUMBERSPAGE		101
-#define IDD_CURRENCYPAGE	102
+
+#define IDD_CURRENCYPAGE	140
+#define IDC_CURRENCYPOSSAMPLE	141
+#define IDC_CURRENCYNEGSAMPLE	142
+#define IDC_CURRENCYSYMBOL	143
+#define IDC_CURRENCYPOSVALUE	144
+#define IDC_CURRENCYNEGVALUE	145
+#define IDC_CURRENCYDECSEP	146
+#define IDC_CURRENCYDECNUM	148
+#define IDC_CURRENCYGRPSEP	149
+#define IDC_CURRENCYGRPNUM	150
 
 #define IDD_TIMEPAGE		103
 #define IDC_TIMESAMPLE		107
diff --git a/reactos/dll/cpl/intl/ru.rc b/reactos/dll/cpl/intl/ru.rc
index c7d293a68bc..4994f35fafd 100644
--- a/reactos/dll/cpl/intl/ru.rc
+++ b/reactos/dll/cpl/intl/ru.rc
@@ -25,7 +25,25 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Äåíåæíàÿ åäèíèöà"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Âêëàäêà 3",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
diff --git a/reactos/dll/cpl/intl/sv.rc b/reactos/dll/cpl/intl/sv.rc
index e566700b7fe..705e0e75a4f 100644
--- a/reactos/dll/cpl/intl/sv.rc
+++ b/reactos/dll/cpl/intl/sv.rc
@@ -26,7 +26,25 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Valuta"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 3",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
@@ -35,7 +53,23 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Tid"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 4",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Time sample:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "&Time format:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  LTEXT "Time &separator:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  LTEXT "A&M symbol:", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  LTEXT "&PM symbol:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE
+  LTEXT "Time format notation\n\n\
+h = hour    m = minute    s = second    t = am or pm\n\n\
+h = 12 hour   H = 24 hour\n\
+hh, mm, ss = leading zero   h, m, s = no leading zero",
+        -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP
 END
 
 
diff --git a/reactos/dll/cpl/intl/uk.rc b/reactos/dll/cpl/intl/uk.rc
index e1f93d5352b..2e5bf5609c5 100644
--- a/reactos/dll/cpl/intl/uk.rc
+++ b/reactos/dll/cpl/intl/uk.rc
@@ -32,7 +32,25 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Ãðîøîâà îäèíèöÿ"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Âêëàäêà âëàñòèâîñòåé 3",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 

From 6e3ccb6ffd2d4855aee25571093fa797b2c16129 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 10 Jan 2007 01:00:46 +0000
Subject: [PATCH 05/36] - Fix a bug in ExfWakePushLock. - Implement object
 directory locking to avoid race conditions in Ob and enable most of the query
 referencing code.

svn path=/trunk/; revision=25407
---
 reactos/ntoskrnl/ex/pushlock.c           |  2 +-
 reactos/ntoskrnl/include/internal/ob_x.h | 60 ++++--------------------
 reactos/ntoskrnl/ob/obdir.c              |  6 +--
 reactos/ntoskrnl/ob/obhandle.c           | 19 ++++----
 reactos/ntoskrnl/ob/obinit.c             |  8 +---
 reactos/ntoskrnl/ob/oblife.c             | 17 +++----
 reactos/ntoskrnl/ob/obname.c             | 20 +++-----
 reactos/ntoskrnl/ob/obref.c              |  3 +-
 8 files changed, 41 insertions(+), 94 deletions(-)

diff --git a/reactos/ntoskrnl/ex/pushlock.c b/reactos/ntoskrnl/ex/pushlock.c
index bccf40a2482..80103eaa68b 100644
--- a/reactos/ntoskrnl/ex/pushlock.c
+++ b/reactos/ntoskrnl/ex/pushlock.c
@@ -97,7 +97,7 @@ ExfWakePushLock(PEX_PUSH_LOCK PushLock,
                 OldValue = NewValue;
 
                 /* Check if it's still locked */
-                if (OldValue.Locked) continue;
+                if (!OldValue.Locked) break;
             }
         }
 
diff --git a/reactos/ntoskrnl/include/internal/ob_x.h b/reactos/ntoskrnl/include/internal/ob_x.h
index 058be1bfe26..34a5011857a 100644
--- a/reactos/ntoskrnl/include/internal/ob_x.h
+++ b/reactos/ntoskrnl/include/internal/ob_x.h
@@ -51,7 +51,7 @@ ObpIncrementQueryReference(IN POBJECT_HEADER ObjectHeader,
 
 VOID
 FORCEINLINE
-_ObpDecrementQueryReference(IN POBJECT_HEADER_NAME_INFO HeaderNameInfo)
+ObpDecrementQueryReference(IN POBJECT_HEADER_NAME_INFO HeaderNameInfo)
 {
     POBJECT_DIRECTORY Directory;
 
@@ -79,7 +79,7 @@ _ObpDecrementQueryReference(IN POBJECT_HEADER_NAME_INFO HeaderNameInfo)
 
 VOID
 FORCEINLINE
-_ObpAcquireDirectoryLockShared(IN POBJECT_DIRECTORY Directory,
+ObpAcquireDirectoryLockShared(IN POBJECT_DIRECTORY Directory,
                                IN POBP_LOOKUP_CONTEXT Context)
 {
     /* It's not, set lock flag */
@@ -95,7 +95,7 @@ _ObpAcquireDirectoryLockShared(IN POBJECT_DIRECTORY Directory,
 
 VOID
 FORCEINLINE
-_ObpAcquireDirectoryLockExclusive(IN POBJECT_DIRECTORY Directory,
+ObpAcquireDirectoryLockExclusive(IN POBJECT_DIRECTORY Directory,
                                   IN POBP_LOOKUP_CONTEXT Context)
 {
     /* Update lock flag */
@@ -115,7 +115,7 @@ _ObpAcquireDirectoryLockExclusive(IN POBJECT_DIRECTORY Directory,
 
 VOID
 FORCEINLINE
-_ObpReleaseDirectoryLock(IN POBJECT_DIRECTORY Directory,
+ObpReleaseDirectoryLock(IN POBJECT_DIRECTORY Directory,
                          IN POBP_LOOKUP_CONTEXT Context)
 {
     /* Release the lock */
@@ -126,7 +126,7 @@ _ObpReleaseDirectoryLock(IN POBJECT_DIRECTORY Directory,
 
 VOID
 FORCEINLINE
-_ObpInitializeDirectoryLookup(IN POBP_LOOKUP_CONTEXT Context)
+ObpInitializeDirectoryLookup(IN POBP_LOOKUP_CONTEXT Context)
 {
     /* Initialize a null context */
     Context->Object = NULL;
@@ -137,7 +137,7 @@ _ObpInitializeDirectoryLookup(IN POBP_LOOKUP_CONTEXT Context)
 
 VOID
 FORCEINLINE
-_ObpReleaseLookupContextObject(IN POBP_LOOKUP_CONTEXT Context)
+ObpReleaseLookupContextObject(IN POBP_LOOKUP_CONTEXT Context)
 {
     POBJECT_HEADER ObjectHeader;
     POBJECT_HEADER_NAME_INFO HeaderNameInfo;
@@ -150,7 +150,7 @@ _ObpReleaseLookupContextObject(IN POBP_LOOKUP_CONTEXT Context)
         HeaderNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader);
 
         /* Check if we do have name information */
-        if (HeaderNameInfo) _ObpDecrementQueryReference(HeaderNameInfo);
+        if (HeaderNameInfo) ObpDecrementQueryReference(HeaderNameInfo);
 
         /* Dereference the object */
         ObDereferenceObject(Context->Object);
@@ -160,61 +160,21 @@ _ObpReleaseLookupContextObject(IN POBP_LOOKUP_CONTEXT Context)
 
 VOID
 FORCEINLINE
-_ObpCleanupDirectoryLookup(IN POBP_LOOKUP_CONTEXT Context)
+ObpCleanupDirectoryLookup(IN POBP_LOOKUP_CONTEXT Context)
 {
     /* Check if we came back with the directory locked */
     if (Context->DirectoryLocked)
     {
         /* Release the lock */
-        _ObpReleaseDirectoryLock(Context->Directory, Context);
+        ObpReleaseDirectoryLock(Context->Directory, Context);
     }
 
     /* Clear the context  */
     Context->Directory = NULL;
     Context->DirectoryLocked = FALSE;
-    _ObpReleaseLookupContextObject(Context);
+    ObpReleaseLookupContextObject(Context);
 }
 
-#if _OB_DEBUG_
-#define ObpAcquireDirectoryLockShared(a, b)                                 \
-{                                                                           \
-    DbgPrint("OB QUERY: Acquiring lock at %s %d\n", __FUNCTION__, __LINE__);\
-    _ObpAcquireDirectoryLockShared(a, b);                                   \
-}
-#define ObpAcquireDirectoryLockExclusive(a, b)                              \
-{                                                                           \
-    DbgPrint("OB QUERY: Acquiring lock at %s %d\n", __FUNCTION__, __LINE__);\
-    _ObpAcquireDirectoryLockExclusive(a, b);                                \
-}
-#define ObpReleaseDirectoryLock(a, b)                                       \
-{                                                                           \
-    DbgPrint("OB QUERY: Releasing lock at %s %d\n", __FUNCTION__, __LINE__);\
-    _ObpReleaseDirectoryLock(a, b);                                         \
-}
-#define ObpInitializeDirectoryLookup(a)                                     \
-{                                                                           \
-    DbgPrint("OB QUERY: Initialization at %s %d\n", __FUNCTION__, __LINE__);\
-    _ObpInitializeDirectoryLookup(a);                                       \
-}
-#define ObpCleanupDirectoryLookup(a, b)                                     \
-{                                                                           \
-    DbgPrint("OB QUERY: Cleanup at %s %d\n", __FUNCTION__, __LINE__);       \
-    _ObpCleanupDirectoryLookup(a, b);                                       \
-}
-#define ObpDecrementQueryReference(a)                                       \
-{                                                                           \
-    DbgPrint("OB QUERY: Decrement at %s %d\n", __FUNCTION__, __LINE__);     \
-    _ObpDecrementQueryReference(a);                                         \
-}
-#else
-#define ObpDecrementQueryReference          _ObpDecrementQueryReference
-#define ObpAcquireDirectoryLockExclusive    _ObpAcquireDirectoryLockExclusive
-#define ObpAcquireDirectoryLockShared       _ObpAcquireDirectoryLockShared
-#define ObpReleaseDirectoryLock             _ObpReleaseDirectoryLock
-#define ObpInitializeDirectoryLookup        _ObpInitializeDirectoryLookup
-#define ObpCleanupDirectoryLookup           _ObpCleanupDirectoryLookup
-#endif
-
 VOID
 FORCEINLINE
 ObpEnterObjectTypeMutex(IN POBJECT_TYPE ObjectType)
diff --git a/reactos/ntoskrnl/ob/obdir.c b/reactos/ntoskrnl/ob/obdir.c
index 663b112ff93..5ec63bcaf08 100644
--- a/reactos/ntoskrnl/ob/obdir.c
+++ b/reactos/ntoskrnl/ob/obdir.c
@@ -247,11 +247,11 @@ ObpLookupEntryDirectory(IN POBJECT_DIRECTORY Directory,
         if (HeaderNameInfo)
         {
             /* Add a query reference */
-            //ObpIncrementQueryReference(ObjectHeader, HeaderNameInfo);
+            ObpIncrementQueryReference(ObjectHeader, HeaderNameInfo);
         }
 
         /* Reference the object being looked up */
-        //ObReferenceObject(FoundObject);
+        ObReferenceObject(FoundObject);
 
         /* Check if the directory was locked */
         if (!Context->DirectoryLocked)
@@ -282,7 +282,7 @@ Quickie:
     if (Context->Object)
     {
         /* We already did a lookup, so remove this object's query reference */
-        //ObpRemoveQueryReference(Context->Object);
+        //ObpDecrementQueryReference(Context->Object);
     }
 
     /* Return the object we found */
diff --git a/reactos/ntoskrnl/ob/obhandle.c b/reactos/ntoskrnl/ob/obhandle.c
index 3fc6cb1a8cc..c9395df23e8 100644
--- a/reactos/ntoskrnl/ob/obhandle.c
+++ b/reactos/ntoskrnl/ob/obhandle.c
@@ -1249,7 +1249,7 @@ ObpCreateHandle(IN OB_OPEN_REASON OpenReason,
     if ((Type) && (ObjectType != Type))
     {
         /* They don't, cleanup */
-        //if (Context) ObpCleanupDirectoryLookup(Context);
+        if (Context) ObpCleanupDirectoryLookup(Context);
         return STATUS_OBJECT_TYPE_MISMATCH;
     }
 
@@ -1287,7 +1287,7 @@ ObpCreateHandle(IN OB_OPEN_REASON OpenReason,
          * We failed (meaning security failure, according to NT Internals)
          * detach and return
          */
-        //if (Context) ObpCleanupDirectoryLookup(Context);
+        if (Context) ObpCleanupDirectoryLookup(Context);
         if (AttachedToProcess) KeUnstackDetachProcess(&ApcState);
         return Status;
     }
@@ -1327,8 +1327,7 @@ ObpCreateHandle(IN OB_OPEN_REASON OpenReason,
     }
 
     /* Now we can release the object */
-    //if (Context) ObpCleanupDirectoryLookup(Context);
-    if (Context) Context->Object = NULL;
+    if (Context) ObpCleanupDirectoryLookup(Context);
 
     /* Save the object header */
     NewEntry.Object = ObjectHeader;
@@ -2117,8 +2116,7 @@ ObOpenObjectByName(IN POBJECT_ATTRIBUTES ObjectAttributes,
     if (!NT_SUCCESS(Status))
     {
         /* Cleanup after lookup */
-        //ObpCleanupDirectoryLookup(&TempBuffer->LookupContext);
-        TempBuffer->LookupContext.Object = NULL;
+        ObpCleanupDirectoryLookup(&TempBuffer->LookupContext);
         goto Cleanup;
     }
 
@@ -2152,8 +2150,7 @@ ObOpenObjectByName(IN POBJECT_ATTRIBUTES ObjectAttributes,
         Status = STATUS_INVALID_PARAMETER;
 
         /* Cleanup after lookup */
-        //ObpCleanupDirectoryLookup(&TempBuffer->LookupContext);
-        TempBuffer->LookupContext.Object = NULL;
+        ObpCleanupDirectoryLookup(&TempBuffer->LookupContext);
     }
     else
     {
@@ -2589,6 +2586,9 @@ ObInsertObject(IN PVOID Object,
         /* Check if anything until now failed */
         if (!NT_SUCCESS(Status))
         {
+            /* Cleanup after lookup */
+            ObpCleanupDirectoryLookup(&Context);
+
             /* Remove query reference that we added */
             if (ObjectNameInfo) ObpDecrementQueryReference(ObjectNameInfo);
 
@@ -2657,6 +2657,9 @@ ObInsertObject(IN PVOID Object,
         /* Check if anything until now failed */
         if (!NT_SUCCESS(Status))
         {
+            /* Cleanup lookup context */
+            ObpCleanupDirectoryLookup(&Context);
+
             /* Remove query reference that we added */
             if (ObjectNameInfo) ObpDecrementQueryReference(ObjectNameInfo);
 
diff --git a/reactos/ntoskrnl/ob/obinit.c b/reactos/ntoskrnl/ob/obinit.c
index e4d68b2eafa..5f023dda3bf 100644
--- a/reactos/ntoskrnl/ob/obinit.c
+++ b/reactos/ntoskrnl/ob/obinit.c
@@ -282,10 +282,7 @@ ObPostPhase0:
     ObpInitializeDirectoryLookup(&Context);
 
     /* Lock it */
-    //ObpAcquireDirectoryLockExclusive(ObpTypeDirectoryObject, &Context);
-    Context.Directory = ObpTypeDirectoryObject;
-    Context.DirectoryLocked = TRUE;
-    Context.LockStateSignature = 0xCCCC1234;
+    ObpAcquireDirectoryLockExclusive(ObpTypeDirectoryObject, &Context);
 
     /* Loop the object types */
     ListHead = &ObTypeObjectType->TypeList;
@@ -323,8 +320,7 @@ ObPostPhase0:
     }
 
     /* Cleanup after lookup */
-    //ObpCleanupDirectoryLookup(&Context);
-    Context.Object = NULL;
+    ObpCleanupDirectoryLookup(&Context);
 
     /* Initialize DOS Devices Directory and related Symbolic Links */
     Status = ObpCreateDosDevicesDirectory();
diff --git a/reactos/ntoskrnl/ob/oblife.c b/reactos/ntoskrnl/ob/oblife.c
index c692d87af94..488af3131a1 100644
--- a/reactos/ntoskrnl/ob/oblife.c
+++ b/reactos/ntoskrnl/ob/oblife.c
@@ -965,10 +965,7 @@ ObCreateObjectType(IN PUNICODE_STRING TypeName,
     if (ObpTypeDirectoryObject)
     {
         /* Acquire the directory lock */
-        //ObpAcquireDirectoryLockExclusive(ObpTypeDirectoryObject, &Context);
-        Context.Directory = ObpTypeDirectoryObject;
-        Context.DirectoryLocked = TRUE;
-        Context.LockStateSignature = 0xCCCC1234;
+        ObpAcquireDirectoryLockExclusive(ObpTypeDirectoryObject, &Context);
 
         /* Do the lookup */
         if (ObpLookupEntryDirectory(ObpTypeDirectoryObject,
@@ -978,7 +975,7 @@ ObCreateObjectType(IN PUNICODE_STRING TypeName,
                                     &Context))
         {
             /* We have already created it, so fail */
-            Context.Object = NULL;
+            ObpCleanupDirectoryLookup(&Context);
             return STATUS_OBJECT_NAME_COLLISION;
         }
     }
@@ -990,7 +987,7 @@ ObCreateObjectType(IN PUNICODE_STRING TypeName,
     if (!ObjectName.Buffer)
     {
         /* Out of memory, fail */
-        Context.Object = NULL;
+        ObpCleanupDirectoryLookup(&Context);
         return STATUS_INSUFFICIENT_RESOURCES;
     }
 
@@ -1007,9 +1004,8 @@ ObCreateObjectType(IN PUNICODE_STRING TypeName,
                                (POBJECT_HEADER*)&Header);
     if (!NT_SUCCESS(Status))
     {
-        Context.Object = NULL;
-
         /* Free the name and fail */
+        ObpCleanupDirectoryLookup(&Context);
         ExFreePool(ObjectName.Buffer);
         return Status;
     }
@@ -1138,7 +1134,8 @@ ObCreateObjectType(IN PUNICODE_STRING TypeName,
             ObReferenceObject(ObpTypeDirectoryObject);
         }
 
-        Context.Object = NULL;
+        /* Cleanup the lookup context */
+        ObpCleanupDirectoryLookup(&Context);
 
         /* Return the object type and success */
         *ObjectType = LocalObjectType;
@@ -1146,7 +1143,7 @@ ObCreateObjectType(IN PUNICODE_STRING TypeName,
     }
 
     /* If we got here, then we failed */
-    Context.Object = NULL;
+    ObpCleanupDirectoryLookup(&Context);
     return STATUS_INSUFFICIENT_RESOURCES;
 }
 
diff --git a/reactos/ntoskrnl/ob/obname.c b/reactos/ntoskrnl/ob/obname.c
index ce0e71a7955..2becdbc3bd8 100644
--- a/reactos/ntoskrnl/ob/obname.c
+++ b/reactos/ntoskrnl/ob/obname.c
@@ -191,16 +191,14 @@ ObpDeleteNameCheck(IN PVOID Object)
     if (!(ObjectHeader->HandleCount) &&
          (ObjectNameInfo) &&
          (ObjectNameInfo->Name.Length) &&
+         (ObjectNameInfo->Directory) &&
          !(ObjectHeader->Flags & OB_FLAG_PERMANENT))
     {
         /* Setup a lookup context */
         ObpInitializeDirectoryLookup(&Context);
 
         /* Lock the directory */
-        //ObpAcquireDirectoryLockExclusive(ObjectNameInfo->Directory, &Context);
-        Context.Directory = ObjectNameInfo->Directory;
-        Context.DirectoryLocked = TRUE;
-        Context.LockStateSignature = 0xCCCC1234;
+        ObpAcquireDirectoryLockExclusive(ObjectNameInfo->Directory, &Context);
 
         /* Do the lookup */
         Object = ObpLookupEntryDirectory(ObjectNameInfo->Directory,
@@ -253,8 +251,7 @@ ObpDeleteNameCheck(IN PVOID Object)
         }
 
         /* Cleanup after lookup */
-        //ObpCleanupDirectoryLookup(&Context);
-        Context.Object = NULL;
+        ObpCleanupDirectoryLookup(&Context);
 
         /* Remove another query reference since we added one on top */
         ObpDecrementQueryReference(ObjectNameInfo);
@@ -573,10 +570,7 @@ ReparseNewDir:
             if (InsertObject)
             {
                 /* Lock the directory */
-                //ObpAcquireDirectoryLockExclusive(Directory, LookupContext);
-                LookupContext->Directory = Directory;
-                LookupContext->DirectoryLocked = TRUE;
-                LookupContext->LockStateSignature = 0xCCCC1234;
+                ObpAcquireDirectoryLockExclusive(Directory, LookupContext);
             }
         }
 
@@ -696,8 +690,7 @@ Reparse:
             InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1);
 
             /* Cleanup from the first lookup */
-            //ObpCleanupDirectoryLookup(LookupContext);
-            LookupContext->Object = NULL;
+            ObpCleanupDirectoryLookup(LookupContext);
 
             /* Check if we have a referenced directory */
             if (ReferencedDirectory)
@@ -863,8 +856,7 @@ Reparse:
     if (!NT_SUCCESS(Status))
     {
         /* Cleanup after lookup */
-        //ObpCleanupDirectoryLookup(LookupContext);
-        LookupContext->Object = NULL;
+        ObpCleanupDirectoryLookup(LookupContext);
     }
 
     /* Check if we have a device map and dereference it if so */
diff --git a/reactos/ntoskrnl/ob/obref.c b/reactos/ntoskrnl/ob/obref.c
index 16763d45a97..60e83cf7abd 100644
--- a/reactos/ntoskrnl/ob/obref.c
+++ b/reactos/ntoskrnl/ob/obref.c
@@ -430,8 +430,7 @@ ObReferenceObjectByName(IN PUNICODE_STRING ObjectPath,
                                  &Object);
 
     /* Cleanup after lookup */
-    //ObpCleanupDirectoryLookup(&Context);
-    Context.Object = NULL;
+    ObpCleanupDirectoryLookup(&Context);
 
     /* Check if the lookup succeeded */
     if (NT_SUCCESS(Status))

From 70d1578a28bbf2268bcbe2742b4ab0be17944156 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 10 Jan 2007 03:35:59 +0000
Subject: [PATCH 06/36] - Implement ObReferenceProcessHandleTable and
 ObDereferenceProcessHandleTable and use them where appropriate to avoid race
 issues if the process is being killed meanwhile. - Implement
 ObpReferenceProcessObjectByHandle and simplfy ObDuplicateObject. - Disable
 hard errors while closing handles, and protect against races. Also print our
 error message since it seems handles aren't being closed now (message
 displays leak count). - Honour DUPLICATE_CLOSE_SOURCE during failure paths in
 ObDuplicateObject, and catch race conditions. - Add some more sanity checks
 and speed up some internal referencing.

svn path=/trunk/; revision=25408
---
 reactos/ntoskrnl/KrnlFun.c             |   5 -
 reactos/ntoskrnl/include/internal/ob.h |  12 +
 reactos/ntoskrnl/ob/obhandle.c         | 297 ++++++++++++++++++++++---
 reactos/ntoskrnl/ob/obref.c            |  22 +-
 4 files changed, 289 insertions(+), 47 deletions(-)

diff --git a/reactos/ntoskrnl/KrnlFun.c b/reactos/ntoskrnl/KrnlFun.c
index 19fc3355f82..41337191e2d 100644
--- a/reactos/ntoskrnl/KrnlFun.c
+++ b/reactos/ntoskrnl/KrnlFun.c
@@ -8,11 +8,6 @@
 //                     Do NOT ask when it will be fixed.
 //              Failure to respect this will *ACHIEVE NOTHING*.
 //
-//
-// Ob:
-//  - Add Directory Lock.
-//  - Add Object Table Referencing.
-//
 // Ex:
 //  - Fixup existing code that talks to Ke.
 //  - Implement Generic Callback mechanism.
diff --git a/reactos/ntoskrnl/include/internal/ob.h b/reactos/ntoskrnl/include/internal/ob.h
index 0c845d2aa60..f9fbf9c3cfb 100644
--- a/reactos/ntoskrnl/include/internal/ob.h
+++ b/reactos/ntoskrnl/include/internal/ob.h
@@ -171,6 +171,18 @@ ObpCreateHandleTable(
     IN PEPROCESS Process
 );
 
+PHANDLE_TABLE
+NTAPI
+ObReferenceProcessHandleTable(
+    IN PEPROCESS Process
+);
+
+VOID
+NTAPI
+ObDereferenceProcessHandleTable(
+    IN PEPROCESS Process
+);
+
 VOID
 NTAPI
 ObKillProcess(
diff --git a/reactos/ntoskrnl/ob/obhandle.c b/reactos/ntoskrnl/ob/obhandle.c
index c9395df23e8..34cd8bae2bf 100644
--- a/reactos/ntoskrnl/ob/obhandle.c
+++ b/reactos/ntoskrnl/ob/obhandle.c
@@ -23,6 +23,165 @@ PHANDLE_TABLE ObpKernelHandleTable = NULL;
 
 /* PRIVATE FUNCTIONS *********************************************************/
 
+PHANDLE_TABLE
+NTAPI
+ObReferenceProcessHandleTable(IN PEPROCESS Process)
+{
+    PHANDLE_TABLE HandleTable = NULL;
+
+    /* Lock the process */
+    if (ExAcquireRundownProtection(&Process->RundownProtect))
+    {
+        /* Get the handle table */
+        HandleTable = Process->ObjectTable;
+        if (!HandleTable)
+        {
+            /* No table, release the lock */
+            ExReleaseRundownProtection(&Process->RundownProtect);
+        }
+    }
+
+    /* Return the handle table */
+    return HandleTable;
+}
+
+VOID
+NTAPI
+ObDereferenceProcessHandleTable(IN PEPROCESS Process)
+{
+    /* Release the process lock */
+    ExReleaseRundownProtection(&Process->RundownProtect);
+}
+
+NTSTATUS
+NTAPI
+ObpReferenceProcessObjectByHandle(IN HANDLE Handle,
+                                  IN PEPROCESS Process,
+                                  IN PHANDLE_TABLE HandleTable,
+                                  IN KPROCESSOR_MODE AccessMode,
+                                  OUT PVOID *Object,
+                                  OUT POBJECT_HANDLE_INFORMATION HandleInformation)
+{
+    PHANDLE_TABLE_ENTRY HandleEntry;
+    POBJECT_HEADER ObjectHeader;
+    ACCESS_MASK GrantedAccess;
+    ULONG Attributes;
+    PEPROCESS CurrentProcess;
+    PETHREAD CurrentThread;
+    NTSTATUS Status;
+    PAGED_CODE();
+
+    /* Assume failure */
+    *Object = NULL;
+
+    /* Check if the caller wants the current process */
+    if (Handle == NtCurrentProcess())
+    {
+        /* Get the current process */
+        CurrentProcess = PsGetCurrentProcess();
+
+        /* Check if the caller wanted handle information */
+        if (HandleInformation)
+        {
+            /* Return it */
+            HandleInformation->HandleAttributes = 0;
+            HandleInformation->GrantedAccess = Process->GrantedAccess;
+        }
+
+        /* Reference ourselves */
+        ObjectHeader = OBJECT_TO_OBJECT_HEADER(CurrentProcess);
+        InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1);
+
+        /* Return the pointer */
+        *Object = CurrentProcess;
+        return STATUS_SUCCESS;
+    }
+
+    /* Check if the caller wants the current thread */
+    if (Handle == NtCurrentThread())
+    {
+        /* Get the current thread */
+        CurrentThread = PsGetCurrentThread();
+
+        /* Check if the caller wanted handle information */
+        if (HandleInformation)
+        {
+            /* Return it */
+            HandleInformation->HandleAttributes = 0;
+            HandleInformation->GrantedAccess = CurrentThread->GrantedAccess;
+        }
+
+        /* Reference ourselves */
+        ObjectHeader = OBJECT_TO_OBJECT_HEADER(CurrentThread);
+        InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1);
+
+        /* Return the pointer */
+        *Object = CurrentThread;
+        return STATUS_SUCCESS;
+    }
+
+    /* Check if this is a kernel handle */
+    if (ObIsKernelHandle(Handle, AccessMode))
+    {
+        /* Use the kernel handle table and get the actual handle value */
+        Handle = ObKernelHandleToHandle(Handle);
+        HandleTable = ObpKernelHandleTable;
+    }
+    else
+    {
+        /* Otherwise use this process's handle table */
+        HandleTable = PsGetCurrentProcess()->ObjectTable;
+    }
+
+    /* Enter a critical region while we touch the handle table */
+    ASSERT(HandleTable != NULL);
+    KeEnterCriticalRegion();
+
+    /* Get the handle entry */
+    HandleEntry = ExMapHandleToPointer(HandleTable, Handle);
+    if (HandleEntry)
+    {
+        /* Get the object header and validate the type*/
+        ObjectHeader = EX_HTE_TO_HDR(HandleEntry);
+
+        /* Get the granted access and validate it */
+        GrantedAccess = HandleEntry->GrantedAccess;
+
+        /* Mask out the internal attributes */
+        Attributes = HandleEntry->ObAttributes &
+                     (EX_HANDLE_ENTRY_PROTECTFROMCLOSE |
+                      EX_HANDLE_ENTRY_INHERITABLE |
+                      EX_HANDLE_ENTRY_AUDITONCLOSE);
+
+        /* Fill out the information */
+        HandleInformation->HandleAttributes = Attributes;
+        HandleInformation->GrantedAccess = GrantedAccess;
+
+        /* Return the pointer */
+        *Object = &ObjectHeader->Body;
+
+        /* Add a reference */
+        InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1);
+
+        /* Unlock the handle */
+        ExUnlockHandleTableEntry(HandleTable, HandleEntry);
+        KeLeaveCriticalRegion();
+
+        /* Return success */
+        ASSERT(*Object != NULL);
+        return STATUS_SUCCESS;
+    }
+    else
+    {
+        /* Invalid handle */
+        Status = STATUS_INVALID_HANDLE;
+    }
+
+    /* Return failure status */
+    KeLeaveCriticalRegion();
+    return Status;
+}
+
 BOOLEAN
 NTAPI
 ObpEnumFindHandleProcedure(IN PHANDLE_TABLE_ENTRY HandleEntry,
@@ -1741,11 +1900,15 @@ ObpCreateHandleTable(IN PEPROCESS Parent,
     /* Check if we have a parent */
     if (Parent)
     {
+        /* Get the parent's table */
+        HandleTable = ObReferenceProcessHandleTable(Parent);
+        if (!HandleTable) return STATUS_PROCESS_IS_TERMINATING;
+
         /* Duplicate the parent's */
         HandleTable = ExDupHandleTable(Process,
                                        ObpDuplicateHandleCallback,
                                        NULL,
-                                       Parent->ObjectTable);
+                                       HandleTable);
     }
     else
     {
@@ -1753,11 +1916,14 @@ ObpCreateHandleTable(IN PEPROCESS Parent,
         HandleTable = ExCreateHandleTable(Process);
     }
 
-    /* Now write it and make sure we got one */
+    /* Now write it */
     Process->ObjectTable = HandleTable;
-    if (!HandleTable) return STATUS_INSUFFICIENT_RESOURCES;
 
-    /* If we got here then the table was created OK */
+    /* Dereference the parent's handle table if we have one */
+    if (Parent) ObDereferenceProcessHandleTable(Parent);
+
+    /* Fail or succeed depending on whether we got a handle table or not */
+    if (!HandleTable) return STATUS_INSUFFICIENT_RESOURCES;
     return STATUS_SUCCESS;
 }
 
@@ -1778,10 +1944,21 @@ VOID
 NTAPI
 ObKillProcess(IN PEPROCESS Process)
 {
-    PHANDLE_TABLE HandleTable = Process->ObjectTable;
+    PHANDLE_TABLE HandleTable;
     OBP_CLOSE_HANDLE_CONTEXT Context;
+    BOOLEAN HardErrors;
     PAGED_CODE();
 
+    /* Wait for process rundown */
+    ExWaitForRundownProtectionRelease(&Process->RundownProtect);
+
+    /* Get the object table */
+    HandleTable = Process->ObjectTable;
+    if (!HandleTable) return;
+
+    /* Disable hard errors while we close handles */
+    HardErrors = IoSetThreadHardErrorMode(FALSE);
+
     /* Enter a critical region */
     KeEnterCriticalRegion();
 
@@ -1793,13 +1970,20 @@ ObKillProcess(IN PEPROCESS Process)
     ExSweepHandleTable(HandleTable,
                        ObpCloseHandleCallback,
                        &Context);
+    if (HandleTable->HandleCount != 0)
+    {
+        DPRINT1("FIXME: %d handles remain!\n", HandleTable->HandleCount);
+    }
 
-    /* Destroy the table and leave the critical region */
-    ExDestroyHandleTable(HandleTable);
+    /* Leave the critical region */
     KeLeaveCriticalRegion();
 
-    /* Clear the object table */
+    /* Re-enable hard errors */
+    IoSetThreadHardErrorMode(HardErrors);
+
+    /* Destroy the object table */
     Process->ObjectTable = NULL;
+    ExDestroyHandleTable(HandleTable);
 }
 
 NTSTATUS
@@ -1820,12 +2004,12 @@ ObDuplicateObject(IN PEPROCESS SourceProcess,
     POBJECT_TYPE ObjectType;
     HANDLE NewHandle;
     KAPC_STATE ApcState;
-    NTSTATUS Status = STATUS_SUCCESS;
+    NTSTATUS Status;
     ACCESS_MASK TargetAccess, SourceAccess;
     ACCESS_STATE AccessState;
     PACCESS_STATE PassedAccessState = NULL;
     AUX_DATA AuxData;
-    PHANDLE_TABLE HandleTable = NULL;
+    PHANDLE_TABLE HandleTable;
     OBJECT_HANDLE_INFORMATION HandleInformation;
     PAGED_CODE();
     OBTRACE(OB_HANDLE_DEBUG,
@@ -1835,32 +2019,77 @@ ObDuplicateObject(IN PEPROCESS SourceProcess,
             SourceProcess,
             TargetProcess);
 
-    /* Check if we're not in the source process */
-    if (SourceProcess != PsGetCurrentProcess())
+    /* Check if we're not duplicating the same access */
+    if (!(Options & DUPLICATE_SAME_ACCESS))
     {
-        /* Attach to it */
-        KeStackAttachProcess(&SourceProcess->Pcb, &ApcState);
-        AttachedToProcess = TRUE;
+        /* Validate the desired access */
+        Status = STATUS_SUCCESS; //ObpValidateDesiredAccess(DesiredAccess);
+        if (!NT_SUCCESS(Status)) return Status;
     }
 
-    /* Now reference the source handle */
-    Status = ObReferenceObjectByHandle(SourceHandle,
-                                       0,
-                                       NULL,
-                                       PreviousMode,
-                                       (PVOID*)&SourceObject,
-                                       &HandleInformation);
+    /* Reference the object table */
+    HandleTable = ObReferenceProcessHandleTable(SourceProcess);
+    if (!HandleTable) return STATUS_PROCESS_IS_TERMINATING;
 
-    /* Check if we were attached */
-    if (AttachedToProcess)
+    /* Reference the process object */
+    Status = ObpReferenceProcessObjectByHandle(SourceHandle,
+                                               0,
+                                               HandleTable,
+                                               PreviousMode,
+                                               &SourceObject,
+                                               &HandleInformation);
+    if (!NT_SUCCESS(Status))
     {
-        /* We can safely detach now */
-        KeUnstackDetachProcess(&ApcState);
-        AttachedToProcess = FALSE;
+        /* Fail */
+        ObDereferenceProcessHandleTable(SourceProcess);
+        return Status;
     }
 
-    /* Fail if we couldn't reference it */
-    if (!NT_SUCCESS(Status)) return Status;
+    /* Check if there's no target process */
+    if (!TargetProcess)
+    {
+        /* Check if the caller wanted actual duplication */
+        if (!(Options & DUPLICATE_CLOSE_SOURCE))
+        {
+            /* Invalid request */
+            Status = STATUS_INVALID_PARAMETER;
+        }
+        else
+        {
+            /* Otherwise, do the attach */
+            KeStackAttachProcess(&SourceProcess->Pcb, &ApcState);
+
+            /* Close the handle and detach */
+            NtClose(SourceHandle);
+            KeUnstackDetachProcess(&ApcState);
+        }
+
+        /* Return */
+        ObDereferenceProcessHandleTable(SourceProcess);
+        ObDereferenceObject(SourceObject);
+        return Status;
+    }
+
+    /* Get the target handle table */
+    HandleTable = ObReferenceProcessHandleTable(TargetProcess);
+    if (!HandleTable)
+    {
+        /* Check if the caller wanted us to close the handle */
+        if (Options & DUPLICATE_CLOSE_SOURCE)
+        {
+            /* Do the attach */
+            KeStackAttachProcess(&SourceProcess->Pcb, &ApcState);
+
+            /* Close the handle and detach */
+            NtClose(SourceHandle);
+            KeUnstackDetachProcess(&ApcState);
+        }
+
+        /* Return */
+        ObDereferenceProcessHandleTable(SourceProcess);
+        ObDereferenceObject(SourceObject);
+        return STATUS_PROCESS_IS_TERMINATING;
+    }
 
     /* Get the source access */
     SourceAccess = HandleInformation.GrantedAccess;
@@ -1898,7 +2127,8 @@ ObDuplicateObject(IN PEPROCESS SourceProcess,
     if (DesiredAccess & GENERIC_ACCESS)
     {
         /* Map it */
-        RtlMapGenericMask(&DesiredAccess, &ObjectType->TypeInfo.GenericMapping);
+        RtlMapGenericMask(&DesiredAccess,
+                          &ObjectType->TypeInfo.GenericMapping);
     }
 
     /* Set the target access */
@@ -1940,9 +2170,6 @@ ObDuplicateObject(IN PEPROCESS SourceProcess,
                                          HandleAttributes,
                                          PsGetCurrentProcess(),
                                          ObDuplicateHandle);
-
-        /* Set the handle table, now that we know this handle was added */
-        HandleTable = PsGetCurrentProcess()->ObjectTable;
     }
 
     /* Check if we were attached */
@@ -1990,6 +2217,10 @@ ObDuplicateObject(IN PEPROCESS SourceProcess,
     /* Return the handle */
     if (TargetHandle) *TargetHandle = NewHandle;
 
+    /* Dereference handle tables */
+    ObDereferenceProcessHandleTable(SourceProcess);
+    ObDereferenceProcessHandleTable(TargetProcess);
+
     /* Return status */
     OBTRACE(OB_HANDLE_DEBUG,
             "%s - Duplicated handle: %lx for %p into %p. Source: %p HC PC %lx %lx\n",
diff --git a/reactos/ntoskrnl/ob/obref.c b/reactos/ntoskrnl/ob/obref.c
index 60e83cf7abd..519f6798aa2 100644
--- a/reactos/ntoskrnl/ob/obref.c
+++ b/reactos/ntoskrnl/ob/obref.c
@@ -478,8 +478,8 @@ ObReferenceObjectByHandle(IN HANDLE Handle,
     NTSTATUS Status;
     PAGED_CODE();
 
-    /* Fail immediately if the handle is NULL */
-    if (!Handle) return STATUS_INVALID_HANDLE;
+    /* Assume failure */
+    *Object = NULL;
 
     /* Check if the caller wants the current process */
     if ((Handle == NtCurrentProcess()) &&
@@ -488,9 +488,6 @@ ObReferenceObjectByHandle(IN HANDLE Handle,
         /* Get the current process */
         CurrentProcess = PsGetCurrentProcess();
 
-        /* Reference ourselves */
-        ObReferenceObject(CurrentProcess);
-
         /* Check if the caller wanted handle information */
         if (HandleInformation)
         {
@@ -499,6 +496,10 @@ ObReferenceObjectByHandle(IN HANDLE Handle,
             HandleInformation->GrantedAccess = PROCESS_ALL_ACCESS;
         }
 
+        /* Reference ourselves */
+        ObjectHeader = OBJECT_TO_OBJECT_HEADER(CurrentProcess);
+        InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1);
+
         /* Return the pointer */
         *Object = CurrentProcess;
         return STATUS_SUCCESS;
@@ -516,9 +517,6 @@ ObReferenceObjectByHandle(IN HANDLE Handle,
         /* Get the current thread */
         CurrentThread = PsGetCurrentThread();
 
-        /* Reference ourselves */
-        ObReferenceObject(CurrentThread);
-
         /* Check if the caller wanted handle information */
         if (HandleInformation)
         {
@@ -527,6 +525,10 @@ ObReferenceObjectByHandle(IN HANDLE Handle,
             HandleInformation->GrantedAccess = THREAD_ALL_ACCESS;
         }
 
+        /* Reference ourselves */
+        ObjectHeader = OBJECT_TO_OBJECT_HEADER(CurrentThread);
+        InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1);
+
         /* Return the pointer */
         *Object = CurrentThread;
         return STATUS_SUCCESS;
@@ -551,6 +553,7 @@ ObReferenceObjectByHandle(IN HANDLE Handle,
     }
 
     /* Enter a critical region while we touch the handle table */
+    ASSERT(HandleTable != NULL);
     KeEnterCriticalRegion();
 
     /* Get the handle entry */
@@ -588,9 +591,10 @@ ObReferenceObjectByHandle(IN HANDLE Handle,
 
                 /* Unlock the handle */
                 ExUnlockHandleTableEntry(HandleTable, HandleEntry);
+                KeLeaveCriticalRegion();
 
                 /* Return success */
-                KeLeaveCriticalRegion();
+                ASSERT(*Object != NULL);
                 return STATUS_SUCCESS;
             }
             else

From 78749a977a9413fe7e5709a58edf299d2ff99ae5 Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Wed, 10 Jan 2007 03:42:10 +0000
Subject: [PATCH 07/36] Should be 7 zeros not 6.

svn path=/trunk/; revision=25409
---
 reactos/subsystems/win32/win32k/include/input.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/subsystems/win32/win32k/include/input.h b/reactos/subsystems/win32/win32k/include/input.h
index bee57e3653e..6f201eae1b7 100644
--- a/reactos/subsystems/win32/win32k/include/input.h
+++ b/reactos/subsystems/win32/win32k/include/input.h
@@ -18,8 +18,8 @@ typedef struct _KBL
   PKBDRVFILE pkbdf;
 } KBL, *PKBL;
 
-#define KBL_UNLOADED 0x2000000
-#define KBL_RESET    0x4000000
+#define KBL_UNLOADED 0x20000000
+#define KBL_RESET    0x40000000
 
 NTSTATUS FASTCALL
 InitInputImpl(VOID);

From d8160f0676ed8e723b0d911569b3543921ab2faa Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Wed, 10 Jan 2007 04:23:33 +0000
Subject: [PATCH 08/36] Make NtUserSetFocus accept NULL window.

svn path=/trunk/; revision=25410
---
 .../subsystems/win32/win32k/ntuser/focus.c    | 51 ++++++++++++-------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/reactos/subsystems/win32/win32k/ntuser/focus.c b/reactos/subsystems/win32/win32k/ntuser/focus.c
index f98a4289522..3f764aa2570 100644
--- a/reactos/subsystems/win32/win32k/ntuser/focus.c
+++ b/reactos/subsystems/win32/win32k/ntuser/focus.c
@@ -304,27 +304,37 @@ co_IntSetActiveWindow(PWINDOW_OBJECT Window OPTIONAL)
 
 static
 HWND FASTCALL
-co_IntSetFocusWindow(PWINDOW_OBJECT Window)
+co_IntSetFocusWindow(PWINDOW_OBJECT Window OPTIONAL)
 {
    HWND hWndPrev = 0;
    PUSER_MESSAGE_QUEUE ThreadQueue;
 
-   ASSERT_REFS_CO(Window);
+   if (Window)
+      ASSERT_REFS_CO(Window);
 
    ThreadQueue = (PUSER_MESSAGE_QUEUE)PsGetCurrentThreadWin32Thread()->MessageQueue;
    ASSERT(ThreadQueue != 0);
 
    hWndPrev = ThreadQueue->FocusWindow;
-   if (hWndPrev == Window->hSelf)
+
+   if (Window != 0)
    {
-      return hWndPrev;
+      if (hWndPrev == Window->hSelf)
+      {
+         return hWndPrev;
+      }
+
+      ThreadQueue->FocusWindow = Window->hSelf;
+
+      co_IntSendKillFocusMessages(hWndPrev, Window->hSelf);
+      co_IntSendSetFocusMessages(hWndPrev, Window->hSelf);
+   }
+   else
+   {
+      ThreadQueue->FocusWindow = 0;
+ 
+      co_IntSendKillFocusMessages(hWndPrev, 0);
    }
-
-   ThreadQueue->FocusWindow = Window->hSelf;
-
-   co_IntSendKillFocusMessages(hWndPrev, Window->hSelf);
-   co_IntSendSetFocusMessages(hWndPrev, Window->hSelf);
-
    return hWndPrev;
 }
 
@@ -562,16 +572,23 @@ NtUserSetFocus(HWND hWnd)
    DPRINT("Enter NtUserSetFocus(%x)\n", hWnd);
    UserEnterExclusive();
 
-   if (!(Window = UserGetWindowObject(hWnd)))
+   if (hWnd)
    {
-      RETURN(NULL);
-   }
+      if (!(Window = UserGetWindowObject(hWnd)))
+      {
+         RETURN(NULL);
+      }
 
-   UserRefObjectCo(Window, &Ref);
-   ret = co_UserSetFocus(Window);
-   UserDerefObjectCo(Window);
+      UserRefObjectCo(Window, &Ref);
+      ret = co_UserSetFocus(Window);
+      UserDerefObjectCo(Window);
    
-   RETURN(ret);
+      RETURN(ret);
+   }
+   else
+   {
+      RETURN( co_UserSetFocus(0));
+   }
 
 CLEANUP:
    DPRINT("Leave NtUserSetFocus, ret=%i\n",_ret_);

From 6af685313a7b1e54d40f710fc3adfa4eedb86329 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 10 Jan 2007 04:27:40 +0000
Subject: [PATCH 09/36] - Commit NTLPC and remove old implementation. - Yeah,
 this adds another regression on top of the new Ob stuff, but in the end it's
 for the better, as it removes more race conditions and buggy code. - This
 whole week I've fixed about 45 bugs and removed a dozen race conditions,
 sorry for the 2-3 regressions, they will be fixed ASAP. - DELETE
 MAKEFILE.AUTO BEFORE BUILDING THIS BUILD.

svn path=/trunk/; revision=25411
---
 reactos/config.template.rbuild                |    2 +-
 reactos/ntoskrnl/include/internal/lpc.h       |  242 ++-
 .../{lpc/ntlpc => include/internal}/lpc_x.h   |  244 +--
 reactos/ntoskrnl/lpc/close.c                  |  453 ++++--
 reactos/ntoskrnl/lpc/complete.c               |  426 ++++-
 reactos/ntoskrnl/lpc/connect.c                | 1371 ++++++-----------
 reactos/ntoskrnl/lpc/create.c                 |  315 ++--
 reactos/ntoskrnl/lpc/listen.c                 |   90 +-
 reactos/ntoskrnl/lpc/ntlpc/close.c            |  395 -----
 reactos/ntoskrnl/lpc/ntlpc/complete.c         |  376 -----
 reactos/ntoskrnl/lpc/ntlpc/connect.c          |  568 -------
 reactos/ntoskrnl/lpc/ntlpc/create.c           |  195 ---
 reactos/ntoskrnl/lpc/ntlpc/listen.c           |   53 -
 reactos/ntoskrnl/lpc/ntlpc/lpc.h              |  130 --
 reactos/ntoskrnl/lpc/ntlpc/port.c             |  109 --
 reactos/ntoskrnl/lpc/ntlpc/reply.c            |  491 ------
 reactos/ntoskrnl/lpc/ntlpc/send.c             |  426 -----
 reactos/ntoskrnl/lpc/port.c                   |  148 +-
 reactos/ntoskrnl/lpc/query.c                  |   69 -
 reactos/ntoskrnl/lpc/queue.c                  |   83 -
 reactos/ntoskrnl/lpc/receive.c                |   41 -
 reactos/ntoskrnl/lpc/reply.c                  |  849 +++++-----
 reactos/ntoskrnl/lpc/send.c                   |  765 ++++-----
 reactos/ntoskrnl/ntoskrnl.rbuild              |   42 +-
 reactos/ntoskrnl/ob/obhandle.c                |    3 +-
 25 files changed, 2554 insertions(+), 5332 deletions(-)
 rename reactos/ntoskrnl/{lpc/ntlpc => include/internal}/lpc_x.h (97%)
 delete mode 100644 reactos/ntoskrnl/lpc/ntlpc/close.c
 delete mode 100644 reactos/ntoskrnl/lpc/ntlpc/complete.c
 delete mode 100644 reactos/ntoskrnl/lpc/ntlpc/connect.c
 delete mode 100644 reactos/ntoskrnl/lpc/ntlpc/create.c
 delete mode 100644 reactos/ntoskrnl/lpc/ntlpc/listen.c
 delete mode 100644 reactos/ntoskrnl/lpc/ntlpc/lpc.h
 delete mode 100644 reactos/ntoskrnl/lpc/ntlpc/port.c
 delete mode 100644 reactos/ntoskrnl/lpc/ntlpc/reply.c
 delete mode 100644 reactos/ntoskrnl/lpc/ntlpc/send.c
 delete mode 100644 reactos/ntoskrnl/lpc/query.c
 delete mode 100644 reactos/ntoskrnl/lpc/queue.c
 delete mode 100644 reactos/ntoskrnl/lpc/receive.c

diff --git a/reactos/config.template.rbuild b/reactos/config.template.rbuild
index 92c8107b284..252e5234a78 100644
--- a/reactos/config.template.rbuild
+++ b/reactos/config.template.rbuild
@@ -75,6 +75,6 @@
   working on the \ntlpc directory. Leave this disabled unless you really know
   what you're doing.
 -->
-<property name="NTLPC" value="0" />
+<property name="NTLPC" value="1" />
 
 </rbuild>
diff --git a/reactos/ntoskrnl/include/internal/lpc.h b/reactos/ntoskrnl/include/internal/lpc.h
index 8803f81ad6d..5570e81c6dc 100644
--- a/reactos/ntoskrnl/include/internal/lpc.h
+++ b/reactos/ntoskrnl/include/internal/lpc.h
@@ -1,91 +1,56 @@
-#ifndef __INCLUDE_INTERNAL_PORT_H
-#define __INCLUDE_INTERNAL_PORT_H
+/*
+* PROJECT:         ReactOS Kernel
+* LICENSE:         GPL - See COPYING in the top level directory
+* FILE:            ntoskrnl/include/lpc.h
+* PURPOSE:         Internal header for the Local Procedure Call
+* PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
+*/
 
-/* EPORT.Type */
+//
+// Define this if you want debugging support
+//
+#define _LPC_DEBUG_                                         0x01
 
-#define EPORT_TYPE_SERVER_RQST_PORT   (0)
-#define EPORT_TYPE_SERVER_COMM_PORT   (1)
-#define EPORT_TYPE_CLIENT_COMM_PORT   (2)
+//
+// These define the Debug Masks Supported
+//
+#define LPC_CREATE_DEBUG                                    0x01
+#define LPC_CLOSE_DEBUG                                     0x02
+#define LPC_CONNECT_DEBUG                                   0x04
+#define LPC_LISTEN_DEBUG                                    0x08
+#define LPC_REPLY_DEBUG                                     0x10
+#define LPC_COMPLETE_DEBUG                                  0x20
+#define LPC_SEND_DEBUG                                      0x40
 
-/* EPORT.State */
-
-#define EPORT_INACTIVE                (0)
-#define EPORT_WAIT_FOR_CONNECT        (1)
-#define EPORT_WAIT_FOR_ACCEPT         (2)
-#define EPORT_WAIT_FOR_COMPLETE_SRV   (3)
-#define EPORT_WAIT_FOR_COMPLETE_CLT   (4)
-#define EPORT_CONNECTED_CLIENT        (5)
-#define EPORT_CONNECTED_SERVER        (6)
-#define EPORT_DISCONNECTED            (7)
-
-extern POBJECT_TYPE LpcPortObjectType;
-extern ULONG        LpcpNextMessageId;
-#ifndef NTLPC
-extern FAST_MUTEX   LpcpLock;
+//
+// Debug/Tracing support
+//
+#if _LPC_DEBUG_
+#ifdef NEW_DEBUG_SYSTEM_IMPLEMENTED // enable when Debug Filters are implemented
+#define LPCTRACE(x, ...)                                    \
+    {                                                       \
+        DbgPrintEx("%s [%.16s] - ",                         \
+                   __FUNCTION__,                            \
+                   PsGetCurrentProcess()->ImageFileName);   \
+        DbgPrintEx(__VA_ARGS__);                            \
+    }
+#else
+#define LPCTRACE(x, ...)                                    \
+    if (x & LpcpTraceLevel)                                 \
+    {                                                       \
+        DbgPrint("%s [%.16s:%lx] - ",                       \
+                 __FUNCTION__,                              \
+                 PsGetCurrentProcess()->ImageFileName,      \
+                 PsGetCurrentThreadId());                   \
+        DbgPrint(__VA_ARGS__);                              \
+    }
+#endif
 #endif
 
-typedef struct _EPORT_LISTENER
-{
-    HANDLE ListenerPid;
-    LIST_ENTRY ListenerListEntry;
-} EPORT_LISTENER, *PEPORT_LISTENER;
-
-typedef struct _EPORT
-{
-    KSPIN_LOCK Lock;
-    KSEMAPHORE Semaphore;
-    USHORT Type;
-    USHORT State;
-    struct _EPORT *RequestPort;
-    struct _EPORT *OtherPort;
-    ULONG QueueLength;
-    LIST_ENTRY QueueListHead;
-    ULONG ConnectQueueLength;
-    LIST_ENTRY ConnectQueueListHead;
-    ULONG MaxDataLength;
-    ULONG MaxConnectInfoLength;
-    ULONG MaxPoolUsage; /* size of NP zone */
-} EPORT, *PEPORT;
-
-typedef struct _EPORT_CONNECT_REQUEST_MESSAGE
-{
-    PORT_MESSAGE MessageHeader;
-    PEPROCESS ConnectingProcess;
-    struct _SECTION_OBJECT* SendSectionObject;
-    LARGE_INTEGER SendSectionOffset;
-    ULONG SendViewSize;
-    ULONG ConnectDataLength;
-    UCHAR ConnectData[0];
-} EPORT_CONNECT_REQUEST_MESSAGE, *PEPORT_CONNECT_REQUEST_MESSAGE;
-
-typedef struct _EPORT_CONNECT_REPLY_MESSAGE
-{
-    PORT_MESSAGE MessageHeader;
-    PVOID SendServerViewBase;
-    ULONG ReceiveClientViewSize;
-    PVOID ReceiveClientViewBase;
-    ULONG MaximumMessageSize;
-    ULONG ConnectDataLength;
-    UCHAR ConnectData[0];
-} EPORT_CONNECT_REPLY_MESSAGE, *PEPORT_CONNECT_REPLY_MESSAGE;
-
-typedef struct _QUEUEDMESSAGE
-{
-    PEPORT Sender;
-    LIST_ENTRY QueueListEntry;
-    PORT_MESSAGE Message;
-} QUEUEDMESSAGE, *PQUEUEDMESSAGE;
-
-NTSTATUS
-NTAPI
-LpcSendTerminationPort(
-    PEPORT Port,
-    LARGE_INTEGER CreationTime
-);
-
-/* Code in ntoskrnl/lpc/close.c */
-
-VOID 
+//
+// Internal Port Management
+//
+VOID
 NTAPI
 LpcpClosePort(
     IN PEPROCESS Process OPTIONAL,
@@ -97,66 +62,69 @@ LpcpClosePort(
 
 VOID
 NTAPI
-LpcpDeletePort(IN PVOID ObjectBody);
-
-VOID
-NTAPI
-LpcExitThread(IN PETHREAD Thread);
-
-/* Code in ntoskrnl/lpc/queue.c */
-
-VOID
-NTAPI
-EiEnqueueConnectMessagePort(
-    IN OUT PEPORT Port,
-    IN PQUEUEDMESSAGE Message
-);
-
-VOID
-NTAPI
-EiEnqueueMessagePort(
-    IN OUT PEPORT Port,
-    IN PQUEUEDMESSAGE Message
-);
-
-VOID
-NTAPI
-EiEnqueueMessageAtHeadPort(
-    IN OUT PEPORT Port,
-    IN PQUEUEDMESSAGE Message
-);
-
-PQUEUEDMESSAGE
-NTAPI
-EiDequeueConnectMessagePort(IN OUT PEPORT Port);
-
-PQUEUEDMESSAGE
-NTAPI
-EiDequeueMessagePort(IN OUT PEPORT Port);
-
-/* Code in ntoskrnl/lpc/port.c */
-
-NTSTATUS
-NTAPI
-LpcpInitializePort(
-    IN OUT PEPORT Port,
-    IN USHORT Type,
-    IN PEPORT Parent OPTIONAL
+LpcpDeletePort(
+    IN PVOID ObjectBody
 );
 
 NTSTATUS
 NTAPI
-LpcpInitSystem (VOID);
+LpcpInitializePortQueue(
+    IN PLPCP_PORT_OBJECT Port
+);
 
-/* Code in ntoskrnl/lpc/reply.c */
-
-NTSTATUS
+VOID
 NTAPI
-EiReplyOrRequestPort(
-    IN PEPORT Port,
-    IN PPORT_MESSAGE LpcReply,
+LpcpFreeToPortZone(
+    IN PLPCP_MESSAGE Message,
+    IN ULONG Flags
+);
+
+VOID
+NTAPI
+LpcpMoveMessage(
+    IN PPORT_MESSAGE Destination,
+    IN PPORT_MESSAGE Origin,
+    IN PVOID Data,
     IN ULONG MessageType,
-    IN PEPORT Sender
+    IN PCLIENT_ID ClientId
 );
 
-#endif /* __INCLUDE_INTERNAL_PORT_H */
+VOID
+NTAPI
+LpcpSaveDataInfoMessage(
+    IN PLPCP_PORT_OBJECT Port,
+    IN PLPCP_MESSAGE Message
+);
+
+//
+// Module-external utlity functions
+//
+VOID
+NTAPI
+LpcExitThread(
+    IN PETHREAD Thread
+);
+
+//
+// Initialization functions
+//
+NTSTATUS
+NTAPI
+LpcpInitSystem(
+    VOID
+);
+
+//
+// Global data inside the Process Manager
+//
+extern POBJECT_TYPE LpcPortObjectType;
+extern ULONG LpcpNextMessageId, LpcpNextCallbackId;
+extern KGUARDED_MUTEX LpcpLock;
+extern PAGED_LOOKASIDE_LIST LpcpMessagesLookaside;
+extern ULONG LpcpMaxMessageSize;
+extern ULONG LpcpTraceLevel;
+
+//
+// Inlined Functions
+//
+#include "lpc_x.h"
diff --git a/reactos/ntoskrnl/lpc/ntlpc/lpc_x.h b/reactos/ntoskrnl/include/internal/lpc_x.h
similarity index 97%
rename from reactos/ntoskrnl/lpc/ntlpc/lpc_x.h
rename to reactos/ntoskrnl/include/internal/lpc_x.h
index 3c0bc8fd86b..0ba3b0aac74 100644
--- a/reactos/ntoskrnl/lpc/ntlpc/lpc_x.h
+++ b/reactos/ntoskrnl/include/internal/lpc_x.h
@@ -1,122 +1,122 @@
-/*
-* PROJECT:         ReactOS Kernel
-* LICENSE:         GPL - See COPYING in the top level directory
-* FILE:            ntoskrnl/include/lpc_x.h
-* PURPOSE:         Intenral Inlined Functions for Local Procedure Call
-* PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
-*/
-
-//
-// Gets the message type, removing the kernel-mode flag
-//
-#define LpcpGetMessageType(x)                               \
-    ((x)->u2.s2.Type &~ LPC_KERNELMODE_MESSAGE)
-
-//
-// Waits on an LPC semaphore for a receive operation
-//
-#define LpcpReceiveWait(s, w)                               \
-{                                                           \
-    LPCTRACE(LPC_REPLY_DEBUG, "Wait: %p\n", s);             \
-    Status = KeWaitForSingleObject(s,                       \
-                                   WrLpcReceive,            \
-                                   w,                       \
-                                   FALSE,                   \
-                                   NULL);                   \
-    LPCTRACE(LPC_REPLY_DEBUG, "Wait done: %lx\n", Status);  \
-}
-
-//
-// Waits on an LPC semaphore for a reply operation
-//
-#define LpcpReplyWait(s, w)                                 \
-{                                                           \
-    LPCTRACE(LPC_SEND_DEBUG, "Wait: %p\n", s);              \
-    Status = KeWaitForSingleObject(s,                       \
-                                   WrLpcReply,              \
-                                   w,                       \
-                                   FALSE,                   \
-                                   NULL);                   \
-    LPCTRACE(LPC_SEND_DEBUG, "Wait done: %lx\n", Status);   \
-    if (Status == STATUS_USER_APC)                          \
-    {                                                       \
-        /* We were preempted by an APC */                   \
-        if (KeReadStateSemaphore(s))                        \
-        {                                                   \
-            /* It's still signaled, so wait on it */        \
-            KeWaitForSingleObject(s,                        \
-                                  Executive,                \
-                                  KernelMode,               \
-                                  FALSE,                    \
-                                  NULL);                    \
-            Status = STATUS_SUCCESS;                        \
-        }                                                   \
-    }                                                       \
-}
-
-//
-// Waits on an LPC semaphore for a connect operation
-//
-#define LpcpConnectWait(s, w)                               \
-{                                                           \
-    LPCTRACE(LPC_CONNECT_DEBUG, "Wait: %p\n", s);           \
-    Status = KeWaitForSingleObject(s,                       \
-                                   Executive,               \
-                                   w,                       \
-                                   FALSE,                   \
-                                   NULL);                   \
-    LPCTRACE(LPC_CONNECT_DEBUG, "Wait done: %lx\n", Status);\
-    if (Status == STATUS_USER_APC)                          \
-    {                                                       \
-        /* We were preempted by an APC */                   \
-        if (KeReadStateSemaphore(s))                        \
-        {                                                   \
-            /* It's still signaled, so wait on it */        \
-            KeWaitForSingleObject(s,                        \
-                                  Executive,                \
-                                  KernelMode,               \
-                                  FALSE,                    \
-                                  NULL);                    \
-            Status = STATUS_SUCCESS;                        \
-        }                                                   \
-    }                                                       \
-}
-
-//
-// Releases an LPC Semaphore to complete a wait
-//
-#define LpcpCompleteWait(s)                                 \
-{                                                           \
-    /* Release the semaphore */                             \
-    LPCTRACE(LPC_SEND_DEBUG, "Release: %p\n", s);           \
-    KeReleaseSemaphore(s, 1, 1, FALSE);                     \
-}
-
-//
-// Allocates a new message
-//
-PLPCP_MESSAGE
-FORCEINLINE
-LpcpAllocateFromPortZone(VOID)
-{
-    PLPCP_MESSAGE Message;
-
-    /* Allocate a message from the port zone while holding the lock */
-    KeAcquireGuardedMutex(&LpcpLock);
-    Message = ExAllocateFromPagedLookasideList(&LpcpMessagesLookaside);
-    if (!Message)
-    {
-        /* Fail, and let caller cleanup */
-        KeReleaseGuardedMutex(&LpcpLock);
-        return NULL;
-    }
-
-    /* Initialize it */
-    InitializeListHead(&Message->Entry);
-    Message->RepliedToThread = NULL;
-    Message->Request.u2.ZeroInit = 0;
-
-    /* Release the lock */
-    KeReleaseGuardedMutex(&LpcpLock);
-    return Message;
-}
+/*
+* PROJECT:         ReactOS Kernel
+* LICENSE:         GPL - See COPYING in the top level directory
+* FILE:            ntoskrnl/include/lpc_x.h
+* PURPOSE:         Intenral Inlined Functions for Local Procedure Call
+* PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
+*/
+
+//
+// Gets the message type, removing the kernel-mode flag
+//
+#define LpcpGetMessageType(x)                               \
+    ((x)->u2.s2.Type &~ LPC_KERNELMODE_MESSAGE)
+
+//
+// Waits on an LPC semaphore for a receive operation
+//
+#define LpcpReceiveWait(s, w)                               \
+{                                                           \
+    LPCTRACE(LPC_REPLY_DEBUG, "Wait: %p\n", s);             \
+    Status = KeWaitForSingleObject(s,                       \
+                                   WrLpcReceive,            \
+                                   w,                       \
+                                   FALSE,                   \
+                                   NULL);                   \
+    LPCTRACE(LPC_REPLY_DEBUG, "Wait done: %lx\n", Status);  \
+}
+
+//
+// Waits on an LPC semaphore for a reply operation
+//
+#define LpcpReplyWait(s, w)                                 \
+{                                                           \
+    LPCTRACE(LPC_SEND_DEBUG, "Wait: %p\n", s);              \
+    Status = KeWaitForSingleObject(s,                       \
+                                   WrLpcReply,              \
+                                   w,                       \
+                                   FALSE,                   \
+                                   NULL);                   \
+    LPCTRACE(LPC_SEND_DEBUG, "Wait done: %lx\n", Status);   \
+    if (Status == STATUS_USER_APC)                          \
+    {                                                       \
+        /* We were preempted by an APC */                   \
+        if (KeReadStateSemaphore(s))                        \
+        {                                                   \
+            /* It's still signaled, so wait on it */        \
+            KeWaitForSingleObject(s,                        \
+                                  Executive,                \
+                                  KernelMode,               \
+                                  FALSE,                    \
+                                  NULL);                    \
+            Status = STATUS_SUCCESS;                        \
+        }                                                   \
+    }                                                       \
+}
+
+//
+// Waits on an LPC semaphore for a connect operation
+//
+#define LpcpConnectWait(s, w)                               \
+{                                                           \
+    LPCTRACE(LPC_CONNECT_DEBUG, "Wait: %p\n", s);           \
+    Status = KeWaitForSingleObject(s,                       \
+                                   Executive,               \
+                                   w,                       \
+                                   FALSE,                   \
+                                   NULL);                   \
+    LPCTRACE(LPC_CONNECT_DEBUG, "Wait done: %lx\n", Status);\
+    if (Status == STATUS_USER_APC)                          \
+    {                                                       \
+        /* We were preempted by an APC */                   \
+        if (KeReadStateSemaphore(s))                        \
+        {                                                   \
+            /* It's still signaled, so wait on it */        \
+            KeWaitForSingleObject(s,                        \
+                                  Executive,                \
+                                  KernelMode,               \
+                                  FALSE,                    \
+                                  NULL);                    \
+            Status = STATUS_SUCCESS;                        \
+        }                                                   \
+    }                                                       \
+}
+
+//
+// Releases an LPC Semaphore to complete a wait
+//
+#define LpcpCompleteWait(s)                                 \
+{                                                           \
+    /* Release the semaphore */                             \
+    LPCTRACE(LPC_SEND_DEBUG, "Release: %p\n", s);           \
+    KeReleaseSemaphore(s, 1, 1, FALSE);                     \
+}
+
+//
+// Allocates a new message
+//
+PLPCP_MESSAGE
+FORCEINLINE
+LpcpAllocateFromPortZone(VOID)
+{
+    PLPCP_MESSAGE Message;
+
+    /* Allocate a message from the port zone while holding the lock */
+    KeAcquireGuardedMutex(&LpcpLock);
+    Message = ExAllocateFromPagedLookasideList(&LpcpMessagesLookaside);
+    if (!Message)
+    {
+        /* Fail, and let caller cleanup */
+        KeReleaseGuardedMutex(&LpcpLock);
+        return NULL;
+    }
+
+    /* Initialize it */
+    InitializeListHead(&Message->Entry);
+    Message->RepliedToThread = NULL;
+    Message->Request.u2.ZeroInit = 0;
+
+    /* Release the lock */
+    KeReleaseGuardedMutex(&LpcpLock);
+    return Message;
+}
diff --git a/reactos/ntoskrnl/lpc/close.c b/reactos/ntoskrnl/lpc/close.c
index cf569dc02b6..af9803dbfc7 100644
--- a/reactos/ntoskrnl/lpc/close.c
+++ b/reactos/ntoskrnl/lpc/close.c
@@ -1,25 +1,29 @@
-/* $Id$
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
+/*
+ * PROJECT:         ReactOS Kernel
+ * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            ntoskrnl/lpc/close.c
- * PURPOSE:         Communication mechanism
- *
- * PROGRAMMERS:     David Welch (welch@cwcom.net)
+ * PURPOSE:         Local Procedure Call: Rundown, Cleanup, Deletion
+ * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
  */
 
-/* INCLUDES *****************************************************************/
+/* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
+#include "lpc.h"
 #define NDEBUG
 #include <internal/debug.h>
 
-/* FUNCTIONS *****************************************************************/
+/* PRIVATE FUNCTIONS *********************************************************/
 
 VOID
 NTAPI
 LpcExitThread(IN PETHREAD Thread)
 {
+    PLPCP_MESSAGE Message;
+
+    /* Acquire the lock */
+    KeAcquireGuardedMutex(&LpcpLock);
+
     /* Make sure that the Reply Chain is empty */
     if (!IsListEmpty(&Thread->LpcReplyChain))
     {
@@ -31,104 +35,361 @@ LpcExitThread(IN PETHREAD Thread)
     Thread->LpcExitThreadCalled = TRUE;
     Thread->LpcReplyMessageId = 0;
 
-    /* FIXME: Reply to the LpcReplyMessage */
-}
-
-/**********************************************************************
- * NAME
- *
- * DESCRIPTION
- *
- * ARGUMENTS
- *
- * RETURN VALUE
- *
- * REVISIONS
- */
-VOID STDCALL
-LpcpClosePort (IN PEPROCESS Process OPTIONAL,
-               IN PVOID ObjectBody,
-               IN ACCESS_MASK GrantedAccess,
-               IN ULONG HandleCount,
-               IN ULONG SystemHandleCount)
-{
-  PEPORT Port = (PEPORT)ObjectBody;
-  PORT_MESSAGE Message;
-
-  /* FIXME Race conditions here! */
-
-  /*
-   * If the client has just closed its handle then tell the server what
-   * happened and disconnect this port.
-   */
-  if (!(HandleCount)&& (Port->State == EPORT_CONNECTED_CLIENT))
+    /* Check if there's a reply message */
+    Message = Thread->LpcReplyMessage;
+    if (Message)
     {
-      DPRINT("Informing server\n");
-      Message.u1.s1.TotalLength = sizeof(PORT_MESSAGE);
-      Message.u1.s1.DataLength = 0;
-      EiReplyOrRequestPort (Port->OtherPort,
-			    &Message,
-			    LPC_PORT_CLOSED,
-			    Port);
-      Port->OtherPort->OtherPort = NULL;
-      Port->OtherPort->State = EPORT_DISCONNECTED;
-      KeReleaseSemaphore( &Port->OtherPort->Semaphore,
-			  IO_NO_INCREMENT,
-			  1,
-			  FALSE );
-      ObDereferenceObject (Port);
+        /* FIXME: TODO */
+        KEBUGCHECK(0);
     }
 
-  /*
-   * If the server has closed all of its handles then disconnect the port,
-   * don't actually notify the client until it attempts an operation.
-   */
-  if (!(HandleCount)&& (Port->State == EPORT_CONNECTED_SERVER))
-    {
-        DPRINT("Cleaning up server\n");
-	Port->OtherPort->OtherPort = NULL;
-	Port->OtherPort->State = EPORT_DISCONNECTED;
-	ObDereferenceObject(Port->OtherPort);
-     }
+    /* Release the lock */
+    KeReleaseGuardedMutex(&LpcpLock);
 }
 
-
-/**********************************************************************
- * NAME
- *
- * DESCRIPTION
- *
- * ARGUMENTS
- *
- * RETURN VALUE
- *
- * REVISIONS
- */
-VOID STDCALL
-LpcpDeletePort (PVOID	ObjectBody)
+VOID
+NTAPI
+LpcpFreeToPortZone(IN PLPCP_MESSAGE Message,
+                   IN ULONG Flags)
 {
-   PLIST_ENTRY Entry;
-   PQUEUEDMESSAGE	Message;
+    PLPCP_CONNECTION_MESSAGE ConnectMessage;
+    PLPCP_PORT_OBJECT ClientPort = NULL;
+    PETHREAD Thread = NULL;
+    BOOLEAN LockHeld = Flags & 1;
+    PAGED_CODE();
+    LPCTRACE(LPC_CLOSE_DEBUG, "Message: %p. Flags: %lx\n", Message, Flags);
 
-   PEPORT Port = (PEPORT)ObjectBody;
+    /* Acquire the lock if not already */
+    if (!LockHeld) KeAcquireGuardedMutex(&LpcpLock);
 
-   DPRINT("Deleting port %x\n", Port);
+    /* Check if the queue list is empty */
+    if (!IsListEmpty(&Message->Entry))
+    {
+        /* Remove and re-initialize */
+        RemoveEntryList(&Message->Entry);
+        InitializeListHead(&Message->Entry);
+    }
 
-   /* Free all waiting messages */
-   while (!IsListEmpty(&Port->QueueListHead))
-     {
-       Entry = RemoveHeadList(&Port->QueueListHead);
-       Message = CONTAINING_RECORD (Entry, QUEUEDMESSAGE, QueueListEntry);
-       ExFreePool(Message);
-     }
+    /* Check if we've already replied */
+    if (Message->RepliedToThread)
+    {
+        /* Set thread to dereference and clean up */
+        Thread = Message->RepliedToThread;
+        Message->RepliedToThread = NULL;
+    }
 
-   while (!IsListEmpty(&Port->ConnectQueueListHead))
-     {
-       Entry = RemoveHeadList(&Port->ConnectQueueListHead);
-       Message = CONTAINING_RECORD (Entry, QUEUEDMESSAGE, QueueListEntry);
-       ExFreePool(Message);
-     }
+    /* Check if this is a connection request */
+    if (Message->Request.u2.s2.Type == LPC_CONNECTION_REQUEST)
+    {
+        /* Get the connection message */
+        ConnectMessage = (PLPCP_CONNECTION_MESSAGE)(Message + 1);
+
+        /* Clear the client port */
+        ClientPort = ConnectMessage->ClientPort;
+        if (ClientPort) ConnectMessage->ClientPort = NULL;
+    }
+
+    /* Release the lock */
+    KeReleaseGuardedMutex(&LpcpLock);
+
+    /* Check if we had anything to dereference */
+    if (Thread) ObDereferenceObject(Thread);
+    if (ClientPort) ObDereferenceObject(ClientPort);
+
+    /* Free the entry */
+    ExFreeToPagedLookasideList(&LpcpMessagesLookaside, Message);
+
+    /* Reacquire the lock if needed */
+    if ((LockHeld) && !(Flags & 2)) KeAcquireGuardedMutex(&LpcpLock);
 }
 
+VOID
+NTAPI
+LpcpDestroyPortQueue(IN PLPCP_PORT_OBJECT Port,
+                     IN BOOLEAN Destroy)
+{
+    PLIST_ENTRY ListHead, NextEntry;
+    PETHREAD Thread;
+    PLPCP_MESSAGE Message;
+    PLPCP_CONNECTION_MESSAGE ConnectMessage;
+    LPCTRACE(LPC_CLOSE_DEBUG, "Port: %p. Flags: %lx\n", Port, Port->Flags);
+
+    /* Hold the lock */
+    KeAcquireGuardedMutex(&LpcpLock);
+
+    /* Disconnect the port to which this port is connected */
+    if (Port->ConnectedPort) Port->ConnectedPort->ConnectedPort = NULL;
+
+    /* Check if this is a connection port */
+    if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CONNECTION_PORT)
+    {
+        /* Delete the name */
+        Port->Flags |= LPCP_NAME_DELETED;
+    }
+
+    /* Walk all the threads waiting and signal them */
+    ListHead = &Port->LpcReplyChainHead;
+    NextEntry = ListHead->Flink;
+    while (NextEntry != ListHead)
+    {
+        /* Get the Thread */
+        Thread = CONTAINING_RECORD(NextEntry, ETHREAD, LpcReplyChain);
+
+        /* Make sure we're not in exit */
+        if (Thread->LpcExitThreadCalled) break;
+
+        /* Move to the next entry */
+        NextEntry = NextEntry->Flink;
+
+        /* Remove and reinitialize the List */
+        RemoveEntryList(&Thread->LpcReplyChain);
+        InitializeListHead(&Thread->LpcReplyChain);
+
+        /* Check if someone is waiting */
+        if (!KeReadStateSemaphore(&Thread->LpcReplySemaphore))
+        {
+            /* Get the message and check if it's a connection request */
+            Message = Thread->LpcReplyMessage;
+            if (Message->Request.u2.s2.Type == LPC_CONNECTION_REQUEST)
+            {
+                /* Get the connection message */
+                ConnectMessage = (PLPCP_CONNECTION_MESSAGE)(Message + 1);
+
+                /* Check if it had a section */
+                if (ConnectMessage->SectionToMap)
+                {
+                    /* Dereference it */
+                    ObDereferenceObject(ConnectMessage->SectionToMap);
+                }
+            }
+
+            /* Clear the reply message */
+            Thread->LpcReplyMessage = NULL;
+
+            /* And remove the message from the port zone */
+            LpcpFreeToPortZone(Message, TRUE);
+        }
+
+        /* Release the semaphore and reset message id count */
+        Thread->LpcReplyMessageId = 0;
+        LpcpCompleteWait(&Thread->LpcReplySemaphore);
+    }
+
+    /* Reinitialize the list head */
+    InitializeListHead(&Port->LpcReplyChainHead);
+
+    /* Loop queued messages */
+    ListHead = &Port->MsgQueue.ReceiveHead;
+    NextEntry =  ListHead->Flink;
+    while (ListHead != NextEntry)
+    {
+        /* Get the message */
+        Message = CONTAINING_RECORD(NextEntry, LPCP_MESSAGE, Entry);
+        NextEntry = NextEntry->Flink;
+
+        /* Free and reinitialize it's list head */
+        InitializeListHead(&Message->Entry);
+
+        /* Remove it from the port zone */
+        LpcpFreeToPortZone(Message, TRUE);
+    }
+
+    /* Reinitialize the message queue list head */
+    InitializeListHead(&Port->MsgQueue.ReceiveHead);
+
+    /* Release the lock */
+    KeReleaseGuardedMutex(&LpcpLock);
+
+    /* Check if we have to free the port entirely */
+    if (Destroy)
+    {
+        /* Check if the semaphore exists */
+        if (Port->MsgQueue.Semaphore)
+        {
+            /* Use the semaphore to find the port queue and free it */
+            ExFreePool(CONTAINING_RECORD(Port->MsgQueue.Semaphore,
+                                         LPCP_NONPAGED_PORT_QUEUE,
+                                         Semaphore));
+        }
+    }
+}
+
+VOID
+NTAPI
+LpcpClosePort(IN PEPROCESS Process OPTIONAL,
+              IN PVOID Object,
+              IN ACCESS_MASK GrantedAccess,
+              IN ULONG ProcessHandleCount,
+              IN ULONG SystemHandleCount)
+{
+    PLPCP_PORT_OBJECT Port = (PLPCP_PORT_OBJECT)Object;
+    LPCTRACE(LPC_CLOSE_DEBUG, "Port: %p. Flags: %lx\n", Port, Port->Flags);
+
+    /* Only Server-side Connection Ports need clean up*/
+    if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CONNECTION_PORT)
+    {
+        /* Check the handle count */
+        switch (SystemHandleCount)
+        {
+            /* No handles left */
+            case 0:
+
+                /* Destroy the port queue */
+                LpcpDestroyPortQueue(Port, TRUE);
+                break;
+
+            /* Last handle remaining */
+            case 1:
+
+                /* Reset the queue only */
+                LpcpDestroyPortQueue(Port, FALSE);
+
+            /* More handles remain, do nothing */
+            default:
+                break;
+        }
+    }
+}
+
+VOID
+NTAPI
+LpcpFreePortClientSecurity(IN PLPCP_PORT_OBJECT Port)
+{
+    /* Check if this is a client port */
+    if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CLIENT_PORT)
+    {
+        /* Check if security is static */
+        if (!(Port->Flags & LPCP_SECURITY_DYNAMIC))
+        {
+            /* Check if we have a token */
+            if (Port->StaticSecurity.ClientToken)
+            {
+                /* Free security */
+                SeDeleteClientSecurity(&Port->StaticSecurity);
+            }
+        }
+    }
+}
+
+VOID
+NTAPI
+LpcpDeletePort(IN PVOID ObjectBody)
+{
+    LARGE_INTEGER Timeout;
+    PETHREAD Thread;
+    PLPCP_PORT_OBJECT Port = (PLPCP_PORT_OBJECT)ObjectBody;
+    PLPCP_PORT_OBJECT ConnectionPort;
+    PLPCP_MESSAGE Message;
+    PLIST_ENTRY ListHead, NextEntry;
+    HANDLE Pid;
+    CLIENT_DIED_MSG ClientDiedMsg;
+    Timeout.QuadPart = -1000000;
+    PAGED_CODE();
+    LPCTRACE(LPC_CLOSE_DEBUG, "Port: %p. Flags: %lx\n", Port, Port->Flags);
+
+    /* Check if this is a communication port */
+    if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_COMMUNICATION_PORT)
+    {
+        /* Acquire the lock */
+        KeAcquireGuardedMutex(&LpcpLock);
+
+        /* Get the thread */
+        Thread = Port->ClientThread;
+        if (Thread)
+        {
+            /* Clear it */
+            Port->ClientThread = NULL;
+
+            /* Release the lock and dereference */
+            KeReleaseGuardedMutex(&LpcpLock);
+            ObDereferenceObject(Thread);
+        }
+        else
+        {
+            /* Release the lock */
+            KeReleaseGuardedMutex(&LpcpLock);
+        }
+    }
+
+    /* Check if this is a client-side port */
+    if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CLIENT_PORT)
+    {
+        /* Setup the client died message */
+        ClientDiedMsg.h.u1.s1.TotalLength = sizeof(ClientDiedMsg);
+        ClientDiedMsg.h.u1.s1.DataLength = sizeof(ClientDiedMsg.CreateTime);
+        ClientDiedMsg.h.u2.ZeroInit = LPC_PORT_CLOSED;
+        ClientDiedMsg.CreateTime = PsGetCurrentProcess()->CreateTime;
+
+        /* Send it */
+        for (;;)
+        {
+            /* Send the message */
+            if (LpcRequestPort(Port,
+                               &ClientDiedMsg.h) != STATUS_NO_MEMORY) break;
+
+            /* Wait until trying again */
+            KeDelayExecutionThread(KernelMode, FALSE, &Timeout);
+        }
+    }
+
+    /* Destroy the port queue */
+    LpcpDestroyPortQueue(Port, TRUE);
+
+    /* Check if we had a client view */
+    if (Port->ClientSectionBase) MmUnmapViewOfSection(PsGetCurrentProcess(),
+                                                      Port->ClientSectionBase);
+
+    /* Check for a server view */
+    if (Port->ServerSectionBase) MmUnmapViewOfSection(PsGetCurrentProcess(),
+                                                      Port->ServerSectionBase);
+
+    /* Get the connection port */
+    ConnectionPort = Port->ConnectionPort;
+    if (ConnectionPort)
+    {
+        /* Get the PID */
+        Pid = PsGetCurrentProcessId();
+
+        /* Acquire the lock */
+        KeAcquireGuardedMutex(&LpcpLock);
+
+        /* Loop the data lists */
+        ListHead = &ConnectionPort->LpcDataInfoChainHead;
+        NextEntry = ListHead->Flink;
+        while (NextEntry != ListHead)
+        {
+            /* Get the message */
+            Message = CONTAINING_RECORD(NextEntry, LPCP_MESSAGE, Entry);
+            NextEntry = NextEntry->Flink;
+
+            /* Check if the PID matches */
+            if (Message->Request.ClientId.UniqueProcess == Pid)
+            {
+                /* Remove it */
+                RemoveEntryList(&Message->Entry);
+                LpcpFreeToPortZone(Message, TRUE);
+            }
+        }
+
+        /* Release the lock */
+        KeReleaseGuardedMutex(&LpcpLock);
+
+        /* Dereference the object unless it's the same port */
+        if (ConnectionPort != Port) ObDereferenceObject(ConnectionPort);
+    }
+
+    /* Check if this is a connection port with a server process*/
+    if (((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CONNECTION_PORT) &&
+        (ConnectionPort->ServerProcess))
+    {
+        /* Dereference the server process */
+        ObDereferenceObject(ConnectionPort->ServerProcess);
+        ConnectionPort->ServerProcess = NULL;
+    }
+
+    /* Free client security */
+    LpcpFreePortClientSecurity(Port);
+    LPCTRACE(LPC_CLOSE_DEBUG, "Port: %p deleted\n", Port);
+}
 
 /* EOF */
diff --git a/reactos/ntoskrnl/lpc/complete.c b/reactos/ntoskrnl/lpc/complete.c
index e14350d5623..b5e4e190ee1 100644
--- a/reactos/ntoskrnl/lpc/complete.c
+++ b/reactos/ntoskrnl/lpc/complete.c
@@ -1,82 +1,376 @@
-/* $Id$
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
- * FILE:            ntoskrnl/lpc/complete.c
- * PURPOSE:         Communication mechanism
- *
- * PROGRAMMERS:     David Welch (welch@cwcom.net)
- */
+/*
+* PROJECT:         ReactOS Kernel
+* LICENSE:         GPL - See COPYING in the top level directory
+* FILE:            ntoskrnl/lpc/complete.c
+* PURPOSE:         Local Procedure Call: Connection Completion
+* PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
+*/
 
 /* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
+#include "lpc.h"
 #define NDEBUG
 #include <internal/debug.h>
 
-/* FUNCTIONS *****************************************************************/
+/* PRIVATE FUNCTIONS *********************************************************/
 
-/***********************************************************************
- * NAME							EXPORTED
- *	NtCompleteConnectPort/1
- *
- * DESCRIPTION
- * 	Wake up the client thread that issued the NtConnectPort call
- * 	this server-side port was created for communicating with.
- *	To be used in LPC servers processes on reply ports only.
- *
- * ARGUMENTS
- *	hServerSideCommPort: a reply port handle returned by
- *	NtAcceptConnectPort.
- *
- * RETURN VALUE
- *	STATUS_SUCCESS or an error code from Ob.
- */
-NTSTATUS STDCALL
-NtCompleteConnectPort (HANDLE hServerSideCommPort)
+VOID
+NTAPI
+LpcpPrepareToWakeClient(IN PETHREAD Thread)
 {
-  NTSTATUS	Status;
-  PEPORT	ReplyPort;
+    PAGED_CODE();
 
-  DPRINT("NtCompleteConnectPort(hServerSideCommPort %x)\n", hServerSideCommPort);
-
-  /*
-   * Ask Ob to translate the port handle to EPORT
-   */
-  Status = ObReferenceObjectByHandle (hServerSideCommPort,
-				      PORT_ALL_ACCESS,
-				      LpcPortObjectType,
-				      UserMode,
-				      (PVOID*)&ReplyPort,
-				      NULL);
-  if (!NT_SUCCESS(Status))
+    /* Make sure the thread isn't dying and it has a valid chain */
+    if (!(Thread->LpcExitThreadCalled) &&
+        !(IsListEmpty(&Thread->LpcReplyChain)))
     {
-      return (Status);
+        /* Remove it from the list and reinitialize it */
+        RemoveEntryList(&Thread->LpcReplyChain);
+        InitializeListHead(&Thread->LpcReplyChain);
     }
-  /*
-   * Verify EPORT type is a server-side reply port;
-   * otherwise tell the caller the port handle is not
-   * valid.
-   */
-  if (ReplyPort->Type != EPORT_TYPE_SERVER_COMM_PORT)
-    {
-       ObDereferenceObject (ReplyPort);
-       return STATUS_INVALID_PORT_HANDLE;
-    }
-
-  ReplyPort->State = EPORT_CONNECTED_SERVER;
-  /*
-   * Wake up the client thread that issued NtConnectPort.
-   */
-  KeReleaseSemaphore(&ReplyPort->OtherPort->Semaphore, IO_NO_INCREMENT, 1,
-		     FALSE);
-  /*
-   * Tell Ob we are no more interested in ReplyPort
-   */
-  ObDereferenceObject (ReplyPort);
-
-  return (STATUS_SUCCESS);
 }
 
+/* PUBLIC FUNCTIONS **********************************************************/
+
+/*
+ * @implemented
+ */
+NTSTATUS
+NTAPI
+NtAcceptConnectPort(OUT PHANDLE PortHandle,
+                    IN PVOID PortContext OPTIONAL,
+                    IN PPORT_MESSAGE ReplyMessage,
+                    IN BOOLEAN AcceptConnection,
+                    IN PPORT_VIEW ServerView,
+                    IN PREMOTE_PORT_VIEW ClientView)
+{
+    PLPCP_PORT_OBJECT ConnectionPort, ServerPort, ClientPort;
+    PVOID ClientSectionToMap = NULL;
+    HANDLE Handle;
+    KPROCESSOR_MODE PreviousMode = KeGetPreviousMode();
+    NTSTATUS Status;
+    ULONG ConnectionInfoLength;
+    PLPCP_MESSAGE Message;
+    PLPCP_CONNECTION_MESSAGE ConnectMessage;
+    PEPROCESS ClientProcess;
+    PETHREAD ClientThread;
+    LARGE_INTEGER SectionOffset;
+    PAGED_CODE();
+    LPCTRACE(LPC_COMPLETE_DEBUG,
+             "Context: %p. Message: %p. Accept: %lx. Views: %p/%p\n",
+             PortContext,
+             ReplyMessage,
+             AcceptConnection,
+             ClientView,
+             ServerView);
+
+    /* Validate the size of the server view */
+    if ((ServerView) && (ServerView->Length != sizeof(PORT_VIEW)))
+    {
+        /* Invalid size */
+        return STATUS_INVALID_PARAMETER;
+    }
+
+    /* Validate the size of the client view */
+    if ((ClientView) && (ClientView->Length != sizeof(REMOTE_PORT_VIEW)))
+    {
+        /* Invalid size */
+        return STATUS_INVALID_PARAMETER;
+    }
+
+    /* Get the client process and thread */
+    Status = PsLookupProcessThreadByCid(&ReplyMessage->ClientId,
+                                        &ClientProcess,
+                                        &ClientThread);
+    if (!NT_SUCCESS(Status)) return Status;
+
+    /* Acquire the LPC Lock */
+    KeAcquireGuardedMutex(&LpcpLock);
+
+    /* Make sure that the client wants a reply, and this is the right one */
+    if (!(ClientThread->LpcReplyMessage) ||
+        !(ReplyMessage->MessageId) ||
+        (ClientThread->LpcReplyMessageId != ReplyMessage->MessageId))
+    {
+        /* Not the reply asked for, or no reply wanted, fail */
+        KeReleaseGuardedMutex(&LpcpLock);
+        ObDereferenceObject(ClientProcess);
+        ObDereferenceObject(ClientThread);
+        return STATUS_REPLY_MESSAGE_MISMATCH;
+    }
+
+    /* Now get the message and connection message */
+    Message = ClientThread->LpcReplyMessage;
+    ConnectMessage = (PLPCP_CONNECTION_MESSAGE)(Message + 1);
+
+    /* Get the client and connection port as well */
+    ClientPort = ConnectMessage->ClientPort;
+    ConnectionPort = ClientPort->ConnectionPort;
+
+    /* Make sure that the reply is being sent to the proper server process */
+    if (ConnectionPort->ServerProcess != PsGetCurrentProcess())
+    {
+        /* It's not, so fail */
+        KeReleaseGuardedMutex(&LpcpLock);
+        ObDereferenceObject(ClientProcess);
+        ObDereferenceObject(ClientThread);
+        return STATUS_REPLY_MESSAGE_MISMATCH;
+    }
+
+    /* At this point, don't let other accept attempts happen */
+    ClientThread->LpcReplyMessage = NULL;
+    ClientThread->LpcReplyMessageId = 0;
+
+    /* Clear the client port for now as well, then release the lock */
+    ConnectMessage->ClientPort = NULL;
+    KeReleaseGuardedMutex(&LpcpLock);
+
+    /* Get the connection information length */
+    ConnectionInfoLength = ReplyMessage->u1.s1.DataLength;
+    if (ConnectionInfoLength > ConnectionPort->MaxConnectionInfoLength)
+    {
+        /* Normalize it since it's too large */
+        ConnectionInfoLength = ConnectionPort->MaxConnectionInfoLength;
+    }
+
+    /* Set the sizes of our reply message */
+    Message->Request.u1.s1.DataLength = sizeof(LPCP_CONNECTION_MESSAGE) +
+                                    ConnectionInfoLength;
+    Message->Request.u1.s1.TotalLength = sizeof(LPCP_MESSAGE) +
+                                     Message->Request.u1.s1.DataLength;
+
+    /* Setup the reply message */
+    Message->Request.u2.s2.Type = LPC_REPLY;
+    Message->Request.u2.s2.DataInfoOffset = 0;
+    Message->Request.ClientId = ReplyMessage->ClientId;
+    Message->Request.MessageId = ReplyMessage->MessageId;
+    Message->Request.ClientViewSize = 0;
+    RtlMoveMemory(ConnectMessage + 1, ReplyMessage + 1, ConnectionInfoLength);
+
+    /* At this point, if the caller refused the connection, go to cleanup */
+    if (!AcceptConnection) goto Cleanup;
+
+    /* Otherwise, create the actual port */
+    Status = ObCreateObject(PreviousMode,
+                            LpcPortObjectType,
+                            NULL,
+                            PreviousMode,
+                            NULL,
+                            sizeof(LPCP_PORT_OBJECT),
+                            0,
+                            0,
+                            (PVOID*)&ServerPort);
+    if (!NT_SUCCESS(Status)) goto Cleanup;
+
+    /* Set it up */
+    RtlZeroMemory(ServerPort, sizeof(LPCP_PORT_OBJECT));
+    ServerPort->PortContext = PortContext;
+    ServerPort->Flags = LPCP_COMMUNICATION_PORT;
+    ServerPort->MaxMessageLength = ConnectionPort->MaxMessageLength;
+    InitializeListHead(&ServerPort->LpcReplyChainHead);
+    InitializeListHead(&ServerPort->LpcDataInfoChainHead);
+
+    /* Reference the connection port until we're fully setup */
+    ObReferenceObject(ConnectionPort);
+
+    /* Link the ports together */
+    ServerPort->ConnectionPort = ConnectionPort;
+    ServerPort->ConnectedPort = ClientPort;
+    ClientPort->ConnectedPort = ServerPort;
+
+    /* Also set the creator CID */
+    ServerPort->Creator = PsGetCurrentThread()->Cid;
+    ClientPort->Creator = Message->Request.ClientId;
+
+    /* Get the section associated and then clear it, while inside the lock */
+    KeAcquireGuardedMutex(&LpcpLock);
+    ClientSectionToMap = ConnectMessage->SectionToMap;
+    ConnectMessage->SectionToMap = NULL;
+    KeReleaseGuardedMutex(&LpcpLock);
+
+    /* Now check if there's a client section */
+    if (ClientSectionToMap)
+    {
+        /* Setup the offset */
+        SectionOffset.QuadPart = ConnectMessage->ClientView.SectionOffset;
+
+        /* Map the section */
+        Status = MmMapViewOfSection(ClientSectionToMap,
+                                    PsGetCurrentProcess(),
+                                    &ServerPort->ClientSectionBase,
+                                    0,
+                                    0,
+                                    &SectionOffset,
+                                    &ConnectMessage->ClientView.ViewSize,
+                                    ViewUnmap,
+                                    0,
+                                    PAGE_READWRITE);
+
+        /* Update the offset and check for mapping status */
+        ConnectMessage->ClientView.SectionOffset = SectionOffset.LowPart;
+        if (NT_SUCCESS(Status))
+        {
+            /* Set the view base */
+            ConnectMessage->ClientView.ViewRemoteBase = ServerPort->
+                                                        ClientSectionBase;
+        }
+        else
+        {
+            /* Otherwise, quit */
+            ObDereferenceObject(ServerPort);
+            goto Cleanup;
+        }
+    }
+
+    /* Check if there's a server section */
+    if (ServerView)
+    {
+        /* FIXME: TODO */
+        ASSERT(FALSE);
+    }
+
+    /* Reference the server port until it's fully inserted */
+    ObReferenceObject(ServerPort);
+
+    /* Insert the server port in the namespace */
+    Status = ObInsertObject(ServerPort,
+                            NULL,
+                            PORT_ALL_ACCESS,
+                            0,
+                            NULL,
+                            &Handle);
+    if (!NT_SUCCESS(Status))
+    {
+        /* We failed, remove the extra reference and cleanup */
+        ObDereferenceObject(ServerPort);
+        goto Cleanup;
+    }
+
+    /* Check if the caller gave a client view */
+    if (ClientView)
+    {
+        /* Fill it out */
+        ClientView->ViewBase = ConnectMessage->ClientView.ViewRemoteBase;
+        ClientView->ViewSize = ConnectMessage->ClientView.ViewSize;
+    }
+
+    /* Return the handle to user mode */
+    *PortHandle = Handle;
+    LPCTRACE(LPC_COMPLETE_DEBUG,
+             "Handle: %lx. Messages: %p/%p. Ports: %p/%p/%p\n",
+             Handle,
+             Message,
+             ConnectMessage,
+             ServerPort,
+             ClientPort,
+             ConnectionPort);
+
+    /* If there was no port context, use the handle by default */
+    if (!PortContext) ServerPort->PortContext = Handle;
+    ServerPort->ClientThread = ClientThread;
+
+    /* Set this message as the LPC Reply message while holding the lock */
+    KeAcquireGuardedMutex(&LpcpLock);
+    ClientThread->LpcReplyMessage = Message;
+    KeReleaseGuardedMutex(&LpcpLock);
+
+    /* Clear the thread pointer so it doesn't get cleaned later */
+    ClientThread = NULL;
+
+    /* Remove the extra reference we had added */
+    ObDereferenceObject(ServerPort);
+
+Cleanup:
+    /* If there was a section, dereference it */
+    if (ClientSectionToMap) ObDereferenceObject(ClientSectionToMap);
+
+    /* Check if we got here while still having a client thread */
+    if (ClientThread)
+    {
+        /* FIXME: Complex cleanup code */
+        ASSERT(FALSE);
+    }
+
+    /* Dereference the client port if we have one, and the process */
+    LPCTRACE(LPC_COMPLETE_DEBUG,
+             "Status: %lx. Thread: %p. Process: [%.16s]\n",
+             Status,
+             ClientThread,
+             ClientProcess->ImageFileName);
+    if (ClientPort) ObDereferenceObject(ClientPort);
+    ObDereferenceObject(ClientProcess);
+    return Status;
+}
+
+/*
+ * @implemented
+ */
+NTSTATUS
+NTAPI
+NtCompleteConnectPort(IN HANDLE PortHandle)
+{
+    NTSTATUS Status;
+    PLPCP_PORT_OBJECT Port;
+    KPROCESSOR_MODE PreviousMode = KeGetPreviousMode();
+    PETHREAD Thread;
+    PAGED_CODE();
+    LPCTRACE(LPC_COMPLETE_DEBUG, "Handle: %lx\n", PortHandle);
+
+    /* Get the Port Object */
+    Status = ObReferenceObjectByHandle(PortHandle,
+                                       PORT_ALL_ACCESS,
+                                       LpcPortObjectType,
+                                       PreviousMode,
+                                       (PVOID*)&Port,
+                                       NULL);
+    if (!NT_SUCCESS(Status)) return Status;
+
+    /* Make sure this is a connection port */
+    if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_COMMUNICATION_PORT)
+    {
+        /* It isn't, fail */
+        ObDereferenceObject(Port);
+        return STATUS_INVALID_PORT_HANDLE;
+    }
+
+    /* Acquire the lock */
+    KeAcquireGuardedMutex(&LpcpLock);
+
+    /* Make sure we have a client thread */
+    if (!Port->ClientThread)
+    {
+        /* We don't, fail */
+        KeReleaseGuardedMutex(&LpcpLock);
+        ObDereferenceObject(Port);
+        return STATUS_INVALID_PARAMETER;
+    }
+
+    /* Get the thread */
+    Thread = Port->ClientThread;
+
+    /* Make sure it has a reply message */
+    if (!Thread->LpcReplyMessage)
+    {
+        /* It doesn't, fail */
+        KeReleaseGuardedMutex(&LpcpLock);
+        ObDereferenceObject(Port);
+        return STATUS_PORT_DISCONNECTED;
+    }
+
+    /* Clear the client thread and wake it up */
+    Port->ClientThread = NULL;
+    LpcpPrepareToWakeClient(Thread);
+
+    /* Release the lock and wait for an answer */
+    KeReleaseGuardedMutex(&LpcpLock);
+    LpcpCompleteWait(&Thread->LpcReplySemaphore);
+
+    /* Dereference the Thread and Port  and return */
+    ObDereferenceObject(Port);
+    ObDereferenceObject(Thread);
+    LPCTRACE(LPC_COMPLETE_DEBUG, "Port: %p. Thread: %p\n", Port, Thread);
+    return Status;
+}
 
 /* EOF */
diff --git a/reactos/ntoskrnl/lpc/connect.c b/reactos/ntoskrnl/lpc/connect.c
index 6aa36904cfe..2b9259ef588 100644
--- a/reactos/ntoskrnl/lpc/connect.c
+++ b/reactos/ntoskrnl/lpc/connect.c
@@ -1,933 +1,568 @@
-/* $Id$
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
+/*
+ * PROJECT:         ReactOS Kernel
+ * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            ntoskrnl/lpc/connect.c
- * PURPOSE:         Communication mechanism
- *
- * PROGRAMMERS:     David Welch (welch@cwcom.net)
+ * PURPOSE:         Local Procedure Call: Connection Management
+ * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
  */
 
-/* INCLUDES *****************************************************************/
+/* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
+#include "lpc.h"
 #define NDEBUG
 #include <internal/debug.h>
 
-/* FUNCTIONS *****************************************************************/
+/* PRIVATE FUNCTIONS *********************************************************/
 
-/**********************************************************************
- * NAME							EXPORTED
- * 	EiConnectPort/12
- *
- * DESCRIPTION
- *
- * ARGUMENTS
- *
- * RETURN VALUE
- */
-NTSTATUS STDCALL
-EiConnectPort(IN PEPORT* ConnectedPort,
-	      IN PEPORT NamedPort,
-	      IN PVOID Section,
-	      IN LARGE_INTEGER SectionOffset,
-	      IN ULONG ViewSize,
-	      OUT PVOID* ClientSendViewBase,
-	      OUT PVOID* ServerSendViewBase,
-	      OUT PULONG ReceiveViewSize,
-	      OUT PVOID* ReceiveViewBase,
-	      OUT PULONG MaximumMessageSize,
-	      IN OUT PVOID ConnectData,
-	      IN OUT PULONG ConnectDataLength)
+PVOID
+NTAPI
+LpcpFreeConMsg(IN OUT PLPCP_MESSAGE *Message,
+               IN OUT PLPCP_CONNECTION_MESSAGE *ConnectMessage,
+               IN PETHREAD CurrentThread)
 {
-  PEPORT_CONNECT_REQUEST_MESSAGE RequestMessage;
-  ULONG RequestConnectDataLength;
-  PEPORT OurPort;
-  PQUEUEDMESSAGE Reply;
-  PEPORT_CONNECT_REPLY_MESSAGE CReply;
-  NTSTATUS Status;
-  KIRQL oldIrql;
+    PVOID SectionToMap;
 
-  if (ConnectDataLength == NULL)
+    /* Acquire the LPC lock */
+    KeAcquireGuardedMutex(&LpcpLock);
+
+    /* Check if the reply chain is not empty */
+    if (!IsListEmpty(&CurrentThread->LpcReplyChain))
     {
-      RequestConnectDataLength = 0;
-    }
-  else
-    {
-      RequestConnectDataLength = *ConnectDataLength;
+        /* Remove this entry and re-initialize it */
+        RemoveEntryList(&CurrentThread->LpcReplyChain);
+        InitializeListHead(&CurrentThread->LpcReplyChain);
     }
 
-  /*
-   * Create a port to represent our side of the connection
-   */
-  Status = ObCreateObject (KernelMode,
-			   LpcPortObjectType,
-			   NULL,
-			   KernelMode,
-			   NULL,
-			   sizeof(EPORT),
-			   0,
-			   0,
-			   (PVOID*)&OurPort);
-  if (!NT_SUCCESS(Status))
+    /* Check if there's a reply message */
+    if (CurrentThread->LpcReplyMessage)
     {
-      return (Status);
-    }
-  LpcpInitializePort(OurPort, EPORT_TYPE_CLIENT_COMM_PORT, NamedPort);
+        /* Get the message */
+        *Message = CurrentThread->LpcReplyMessage;
 
-  /*
-   * Allocate a request message.
-   */
-  RequestMessage = ExAllocatePool(NonPagedPool,
-				  sizeof(EPORT_CONNECT_REQUEST_MESSAGE) +
-				  RequestConnectDataLength);
-  if (RequestMessage == NULL)
+        /* Clear message data */
+        CurrentThread->LpcReceivedMessageId = 0;
+        CurrentThread->LpcReplyMessage = NULL;
+
+        /* Get the connection message and clear the section */
+        *ConnectMessage = (PLPCP_CONNECTION_MESSAGE)(*Message + 1);
+        SectionToMap = (*ConnectMessage)->SectionToMap;
+        (*ConnectMessage)->SectionToMap = NULL;
+    }
+    else
     {
-      ObDereferenceObject(OurPort);
-      return(STATUS_NO_MEMORY);
+        /* No message to return */
+        *Message = NULL;
+        SectionToMap = NULL;
     }
 
-  /*
-   * Initialize the request message.
-   */
-  RequestMessage->MessageHeader.u1.s1.DataLength =
-    sizeof(EPORT_CONNECT_REQUEST_MESSAGE) + RequestConnectDataLength -
-    sizeof(PORT_MESSAGE);
-  RequestMessage->MessageHeader.u1.s1.TotalLength =
-    sizeof(EPORT_CONNECT_REQUEST_MESSAGE) + RequestConnectDataLength;
-  DPRINT("RequestMessageSize %d\n",
-	 RequestMessage->MessageHeader.u1.s1.TotalLength);
-  RequestMessage->MessageHeader.ClientViewSize = 0;
-  RequestMessage->ConnectingProcess = PsGetCurrentProcess();
-  ObReferenceObjectByPointer(RequestMessage->ConnectingProcess,
-			     PROCESS_VM_OPERATION,
-			     NULL,
-			     KernelMode);
-  RequestMessage->SendSectionObject = (struct _SECTION_OBJECT*)Section;
-  RequestMessage->SendSectionOffset = SectionOffset;
-  RequestMessage->SendViewSize = ViewSize;
-  RequestMessage->ConnectDataLength = RequestConnectDataLength;
-  if (RequestConnectDataLength > 0)
-    {
-      memcpy(RequestMessage->ConnectData, ConnectData,
-	     RequestConnectDataLength);
-    }
-
-  /*
-   * Queue the message to the named port
-   */
-  EiReplyOrRequestPort(NamedPort,
-		       &RequestMessage->MessageHeader,
-		       LPC_CONNECTION_REQUEST,
-		       OurPort);
-  KeReleaseSemaphore(&NamedPort->Semaphore, IO_NO_INCREMENT, 1, FALSE);
-  ExFreePool(RequestMessage);
-
-  /*
-   * Wait for them to accept our connection
-   */
-  KeWaitForSingleObject(&OurPort->Semaphore,
-			UserRequest,
-			UserMode,
-			FALSE,
-			NULL);
-
-  /*
-   * Dequeue the response
-   */
-  KeAcquireSpinLock (&OurPort->Lock, &oldIrql);
-  Reply = EiDequeueMessagePort (OurPort);
-  KeReleaseSpinLock (&OurPort->Lock, oldIrql);
-  CReply = (PEPORT_CONNECT_REPLY_MESSAGE)&Reply->Message;
-
-  /*
-   * Do some initial cleanup.
-   */
-  ObDereferenceObject(PsGetCurrentProcess());
-
-  /*
-   * Check for connection refusal.
-   */
-  if (CReply->MessageHeader.u2.s2.Type == LPC_CONNECTION_REFUSED)
-    {
-      ObDereferenceObject(OurPort);
-      ExFreePool(Reply);
-      /*
-       * FIXME: Check what NT does here. Giving the user data back on
-       * connect failure sounds reasonable; it probably wouldn't break
-       * anything anyway.
-       */
-      if (ConnectDataLength != NULL)
-	{
-	  *ConnectDataLength = CReply->ConnectDataLength;
-	  memcpy(ConnectData, CReply->ConnectData, CReply->ConnectDataLength);
-	}
-      return(STATUS_PORT_CONNECTION_REFUSED);
-    }
-
-  /*
-   * Otherwise we are connected. Copy data back to the client.
-   */
-  *ServerSendViewBase = CReply->SendServerViewBase;
-  *ReceiveViewSize = CReply->ReceiveClientViewSize;
-  *ReceiveViewBase = CReply->ReceiveClientViewBase;
-  *MaximumMessageSize = CReply->MaximumMessageSize;
-  if (ConnectDataLength != NULL)
-    {
-      *ConnectDataLength = CReply->ConnectDataLength;
-      memcpy(ConnectData, CReply->ConnectData, CReply->ConnectDataLength);
-    }
-
-  /*
-   * Create our view of the send section object.
-   */
-  if (Section != NULL)
-    {
-      *ClientSendViewBase = 0;
-      Status = MmMapViewOfSection(Section,
-				  PsGetCurrentProcess(),
-				  ClientSendViewBase,
-				  0,
-				  ViewSize,
-				  &SectionOffset,
-				  &ViewSize,
-				  ViewUnmap,
-				  0 /* MEM_TOP_DOWN? */,
-				  PAGE_READWRITE);
-      if (!NT_SUCCESS(Status))
-	{
-	  /* FIXME: Cleanup here. */
-	  return(Status);
-	}
-    }
-
-  /*
-   * Do the final initialization of our port.
-   */
-  OurPort->State = EPORT_CONNECTED_CLIENT;
-
-  /*
-   * Cleanup.
-   */
-  ExFreePool(Reply);
-  *ConnectedPort = OurPort;
-  return(STATUS_SUCCESS);
+    /* Release the lock and return the section */
+    KeReleaseGuardedMutex(&LpcpLock);
+    return SectionToMap;
 }
 
-/**********************************************************************
- * NAME							EXPORTED
- * 	NtConnectPort/8
- *
- * DESCRIPTION
- *	Connect to a named port and wait for the other side to
- *	accept or reject the connection request.
- *
- * ARGUMENTS
- *	ConnectedPort
- *	PortName
- *	Qos
- *	WriteMap
- *	ReadMap
- *	MaxMessageSize
- *	ConnectInfo
- *	UserConnectInfoLength
- *
- * RETURN VALUE
- *
- * @unimplemented
+/* PUBLIC FUNCTIONS **********************************************************/
+
+/*
+ * @implemented
  */
-NTSTATUS STDCALL
-NtConnectPort (PHANDLE				UnsafeConnectedPortHandle,
-	       PUNICODE_STRING			PortName,
-	       PSECURITY_QUALITY_OF_SERVICE	Qos,
-	       PPORT_VIEW		UnsafeWriteMap,
-	       PREMOTE_PORT_VIEW		UnsafeReadMap,
-	       PULONG				UnsafeMaximumMessageSize,
-	       PVOID				UnsafeConnectData,
-	       PULONG				UnsafeConnectDataLength)
+NTSTATUS
+NTAPI
+NtSecureConnectPort(OUT PHANDLE PortHandle,
+                    IN PUNICODE_STRING PortName,
+                    IN PSECURITY_QUALITY_OF_SERVICE Qos,
+                    IN OUT PPORT_VIEW ClientView OPTIONAL,
+                    IN PSID ServerSid OPTIONAL,
+                    IN OUT PREMOTE_PORT_VIEW ServerView OPTIONAL,
+                    OUT PULONG MaxMessageLength OPTIONAL,
+                    IN OUT PVOID ConnectionInformation OPTIONAL,
+                    IN OUT PULONG ConnectionInformationLength OPTIONAL)
 {
-  HANDLE ConnectedPortHandle;
-  PORT_VIEW WriteMap;
-  REMOTE_PORT_VIEW ReadMap;
-  ULONG MaximumMessageSize;
-  PVOID ConnectData = NULL;
-  ULONG ConnectDataLength = 0;
-  PVOID SectionObject;
-  LARGE_INTEGER SectionOffset;
-  PEPORT ConnectedPort;
-  KPROCESSOR_MODE PreviousMode;
-  NTSTATUS Status = STATUS_SUCCESS;
-  PEPORT NamedPort;
-  
-  PreviousMode = ExGetPreviousMode();
-  
-  if (PreviousMode != KernelMode)
+    ULONG ConnectionInfoLength = 0;
+    PLPCP_PORT_OBJECT Port, ClientPort;
+    KPROCESSOR_MODE PreviousMode = KeGetPreviousMode();
+    NTSTATUS Status = STATUS_SUCCESS;
+    HANDLE Handle;
+    PVOID SectionToMap;
+    PLPCP_MESSAGE Message;
+    PLPCP_CONNECTION_MESSAGE ConnectMessage;
+    PETHREAD Thread = PsGetCurrentThread();
+    ULONG PortMessageLength;
+    LARGE_INTEGER SectionOffset;
+    PTOKEN Token;
+    PTOKEN_USER TokenUserInfo;
+    PAGED_CODE();
+    LPCTRACE(LPC_CONNECT_DEBUG,
+             "Name: %wZ. Qos: %p. Views: %p/%p. Sid: %p\n",
+             PortName,
+             Qos,
+             ClientView,
+             ServerView,
+             ServerSid);
+
+    /* Validate client view */
+    if ((ClientView) && (ClientView->Length != sizeof(PORT_VIEW)))
     {
-      _SEH_TRY
-        {
-          ProbeForWriteHandle(UnsafeConnectedPortHandle);
-          if (UnsafeMaximumMessageSize != NULL)
-            {
-              ProbeForWriteUlong(UnsafeMaximumMessageSize);
-            }
-        }
-      _SEH_HANDLE
-        {
-          Status = _SEH_GetExceptionCode();
-        }
-      _SEH_END;
-      
-      if (!NT_SUCCESS(Status))
-        {
-          return Status;
-        }
+        /* Fail */
+        return STATUS_INVALID_PARAMETER;
     }
 
-  /*
-   * Copy in write map and partially validate.
-   */
-  if (UnsafeWriteMap != NULL)
+    /* Validate server view */
+    if ((ServerView) && (ServerView->Length != sizeof(REMOTE_PORT_VIEW)))
     {
-      if (PreviousMode != KernelMode)
-        {
-          _SEH_TRY
-            {
-              ProbeForWrite(UnsafeWriteMap,
-                            sizeof(PORT_VIEW),
-                            1);
-              RtlCopyMemory(&WriteMap,
-                            UnsafeWriteMap,
-                            sizeof(PORT_VIEW));
-            }
-          _SEH_HANDLE
-            {
-              Status = _SEH_GetExceptionCode();
-            }
-          _SEH_END;
-
-          if (!NT_SUCCESS(Status))
-            {
-              return Status;
-            }
-        }
-      else
-        {
-          RtlCopyMemory(&WriteMap,
-                        UnsafeWriteMap,
-                        sizeof(PORT_VIEW));
-        }
-
-      if (WriteMap.Length != sizeof(PORT_VIEW))
-	{
-	  return(STATUS_INVALID_PARAMETER_4);
-	}
-      SectionOffset.QuadPart = WriteMap.SectionOffset;
-    }
-  else
-    {
-      WriteMap.SectionHandle = INVALID_HANDLE_VALUE;
+        /* Fail */
+        return STATUS_INVALID_PARAMETER;
     }
 
-  /*
-   * Handle connection data.
-   */
-  if (UnsafeConnectData)
+    /* Check if caller sent connection information length */
+    if (ConnectionInformationLength)
     {
-      if (PreviousMode != KernelMode)
-        {
-          _SEH_TRY
-            {
-              ConnectDataLength = ProbeForReadUlong(UnsafeConnectDataLength);
-            }
-          _SEH_HANDLE
-            {
-              Status = _SEH_GetExceptionCode();
-            }
-          _SEH_END;
+        /* Retrieve the input length */
+        ConnectionInfoLength = *ConnectionInformationLength;
+    }
 
-          if (!NT_SUCCESS(Status))
-            {
-              return Status;
-            }
-        }
-      else
-        {
-          ConnectDataLength = *UnsafeConnectDataLength;
-        }
+    /* Get the port */
+    Status = ObReferenceObjectByName(PortName,
+                                     0,
+                                     NULL,
+                                     PORT_ALL_ACCESS,
+                                     LpcPortObjectType,
+                                     PreviousMode,
+                                     NULL,
+                                     (PVOID *)&Port);
+    if (!NT_SUCCESS(Status)) return Status;
 
-      if (ConnectDataLength != 0)
-        {
-          ConnectData = ExAllocatePool(NonPagedPool, ConnectDataLength);
-          if (ConnectData == NULL)
-            {
-              return(STATUS_NO_MEMORY);
-            }
+    /* This has to be a connection port */
+    if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_CONNECTION_PORT)
+    {
+        /* It isn't, so fail */
+        ObDereferenceObject(Port);
+        return STATUS_INVALID_PORT_HANDLE;
+    }
 
-          if (PreviousMode != KernelMode)
+    /* Check if we have a SID */
+    if (ServerSid)
+    {
+        /* Make sure that we have a server */
+        if (Port->ServerProcess)
+        {
+            /* Get its token and query user information */
+            Token = PsReferencePrimaryToken(Port->ServerProcess);
+            //Status = SeQueryInformationToken(Token, TokenUser, (PVOID*)&TokenUserInfo);
+            // FIXME: Need SeQueryInformationToken
+            Status = STATUS_SUCCESS;
+            TokenUserInfo = ExAllocatePool(PagedPool, sizeof(TOKEN_USER));
+            TokenUserInfo->User.Sid = ServerSid;
+            PsDereferencePrimaryToken(Token);
+
+            /* Check for success */
+            if (NT_SUCCESS(Status))
             {
-              _SEH_TRY
+                /* Compare the SIDs */
+                if (!RtlEqualSid(ServerSid, TokenUserInfo->User.Sid))
                 {
-                  ProbeForWriteUlong(UnsafeConnectData);
-                  RtlCopyMemory(ConnectData,
-                                UnsafeConnectData,
-                                ConnectDataLength);
+                    /* Fail */
+                    Status = STATUS_SERVER_SID_MISMATCH;
                 }
-              _SEH_HANDLE
-                {
-                  Status = _SEH_GetExceptionCode();
-                }
-              _SEH_END;
 
-              if (!NT_SUCCESS(Status))
-                {
-                  ExFreePool(ConnectData);
-                  return Status;
-                }
-            }
-          else
-            {
-              RtlCopyMemory(ConnectData,
-                            UnsafeConnectData,
-                            ConnectDataLength);
+                /* Free token information */
+                ExFreePool(TokenUserInfo);
             }
         }
+        else
+        {
+            /* Invalid SID */
+            Status = STATUS_SERVER_SID_MISMATCH;
+        }
+
+        /* Check if SID failed */
+        if (!NT_SUCCESS(Status))
+        {
+            /* Quit */
+            ObDereferenceObject(Port);
+            return Status;
+        }
     }
 
-  /*
-   * Reference the named port.
-   */
-  Status = ObReferenceObjectByName (PortName,
+    /* Create the client port */
+    Status = ObCreateObject(PreviousMode,
+                            LpcPortObjectType,
+                            NULL,
+                            PreviousMode,
+                            NULL,
+                            sizeof(LPCP_PORT_OBJECT),
+                            0,
+                            0,
+                            (PVOID *)&ClientPort);
+    if (!NT_SUCCESS(Status))
+    {
+        /* Failed, dereference the server port and return */
+        ObDereferenceObject(Port);
+        return Status;
+    }
+
+    /* Setup the client port */
+    RtlZeroMemory(ClientPort, sizeof(LPCP_PORT_OBJECT));
+    ClientPort->Flags = LPCP_CLIENT_PORT;
+    ClientPort->ConnectionPort = Port;
+    ClientPort->MaxMessageLength = Port->MaxMessageLength;
+    ClientPort->SecurityQos = *Qos;
+    InitializeListHead(&ClientPort->LpcReplyChainHead);
+    InitializeListHead(&ClientPort->LpcDataInfoChainHead);
+
+    /* Check if we have dynamic security */
+    if (Qos->ContextTrackingMode == SECURITY_DYNAMIC_TRACKING)
+    {
+        /* Remember that */
+        ClientPort->Flags |= LPCP_SECURITY_DYNAMIC;
+    }
+    else
+    {
+        /* Create our own client security */
+        Status = SeCreateClientSecurity(Thread,
+                                        Qos,
+                                        FALSE,
+                                        &ClientPort->StaticSecurity);
+        if (!NT_SUCCESS(Status))
+        {
+            /* Security failed, dereference and return */
+            ObDereferenceObject(ClientPort);
+            return Status;
+        }
+    }
+
+    /* Initialize the port queue */
+    Status = LpcpInitializePortQueue(ClientPort);
+    if (!NT_SUCCESS(Status))
+    {
+        /* Failed */
+        ObDereferenceObject(ClientPort);
+        return Status;
+    }
+
+    /* Check if we have a client view */
+    if (ClientView)
+    {
+        /* Get the section handle */
+        Status = ObReferenceObjectByHandle(ClientView->SectionHandle,
+                                           SECTION_MAP_READ |
+                                           SECTION_MAP_WRITE,
+                                           MmSectionObjectType,
+                                           PreviousMode,
+                                           (PVOID*)&SectionToMap,
+                                           NULL);
+        if (!NT_SUCCESS(Status))
+        {
+            /* Fail */
+            ObDereferenceObject(Port);
+            return Status;
+        }
+
+        /* Set the section offset */
+        SectionOffset.QuadPart = ClientView->SectionOffset;
+
+        /* Map it */
+        Status = MmMapViewOfSection(SectionToMap,
+                                    PsGetCurrentProcess(),
+                                    &Port->ClientSectionBase,
                                     0,
+                                    0,
+                                    &SectionOffset,
+                                    &ClientView->ViewSize,
+                                    ViewUnmap,
+                                    0,
+                                    PAGE_READWRITE);
+
+        /* Update the offset */
+        ClientView->SectionOffset = SectionOffset.LowPart;
+
+        /* Check for failure */
+        if (!NT_SUCCESS(Status))
+        {
+            /* Fail */
+            ObDereferenceObject(SectionToMap);
+            ObDereferenceObject(Port);
+            return Status;
+        }
+
+        /* Update the base */
+        ClientView->ViewBase = Port->ClientSectionBase;
+    }
+    else
+    {
+        /* No section */
+        SectionToMap = NULL;
+    }
+
+    /* Normalize connection information */
+    if (ConnectionInfoLength > Port->MaxConnectionInfoLength)
+    {
+        /* Use the port's maximum allowed value */
+        ConnectionInfoLength = Port->MaxConnectionInfoLength;
+    }
+
+    /* Allocate a message from the port zone */
+    Message = LpcpAllocateFromPortZone();
+    if (!Message)
+    {
+        /* Fail if we couldn't allocate a message */
+        if (SectionToMap) ObDereferenceObject(SectionToMap);
+        ObDereferenceObject(ClientPort);
+        return STATUS_NO_MEMORY;
+    }
+
+    /* Set pointer to the connection message and fill in the CID */
+    ConnectMessage = (PLPCP_CONNECTION_MESSAGE)(Message + 1);
+    Message->Request.ClientId = Thread->Cid;
+
+    /* Check if we have a client view */
+    if (ClientView)
+    {
+        /* Set the view size */
+        Message->Request.ClientViewSize = ClientView->ViewSize;
+
+        /* Copy the client view and clear the server view */
+        RtlMoveMemory(&ConnectMessage->ClientView,
+                      ClientView,
+                      sizeof(PORT_VIEW));
+        RtlZeroMemory(&ConnectMessage->ServerView, sizeof(REMOTE_PORT_VIEW));
+    }
+    else
+    {
+        /* Set the size to 0 and clear the connect message */
+        Message->Request.ClientViewSize = 0;
+        RtlZeroMemory(ConnectMessage, sizeof(LPCP_CONNECTION_MESSAGE));
+    }
+
+    /* Set the section and client port. Port is NULL for now */
+    ConnectMessage->ClientPort = NULL;
+    ConnectMessage->SectionToMap = SectionToMap;
+
+    /* Set the data for the connection request message */
+    Message->Request.u1.s1.DataLength = sizeof(LPCP_CONNECTION_MESSAGE) +
+                                        ConnectionInfoLength;
+    Message->Request.u1.s1.TotalLength = sizeof(LPCP_MESSAGE) +
+                                         Message->Request.u1.s1.DataLength;
+    Message->Request.u2.s2.Type = LPC_CONNECTION_REQUEST;
+
+    /* Check if we have connection information */
+    if (ConnectionInformation)
+    {
+        /* Copy it in */
+        RtlMoveMemory(ConnectMessage + 1,
+                      ConnectionInformation,
+                      ConnectionInfoLength);
+    }
+
+    /* Acquire the port lock */
+    KeAcquireGuardedMutex(&LpcpLock);
+
+    /* Check if someone already deleted the port name */
+    if (Port->Flags & LPCP_NAME_DELETED)
+    {
+        /* Fail the request */
+        KeReleaseGuardedMutex(&LpcpLock);
+        Status = STATUS_OBJECT_NAME_NOT_FOUND;
+        goto Cleanup;
+    }
+
+    /* Associate no thread yet */
+    Message->RepliedToThread = NULL;
+
+    /* Generate the Message ID and set it */
+    Message->Request.MessageId =  LpcpNextMessageId++;
+    if (!LpcpNextMessageId) LpcpNextMessageId = 1;
+    Thread->LpcReplyMessageId = Message->Request.MessageId;
+
+    /* Insert the message into the queue and thread chain */
+    InsertTailList(&Port->MsgQueue.ReceiveHead, &Message->Entry);
+    InsertTailList(&Port->LpcReplyChainHead, &Thread->LpcReplyChain);
+    Thread->LpcReplyMessage = Message;
+
+    /* Now we can finally reference the client port and link it*/
+    ObReferenceObject(ClientPort);
+    ConnectMessage->ClientPort = ClientPort;
+
+    /* Release the lock */
+    KeReleaseGuardedMutex(&LpcpLock);
+    LPCTRACE(LPC_CONNECT_DEBUG,
+             "Messages: %p/%p. Ports: %p/%p. Status: %lx\n",
+             Message,
+             ConnectMessage,
+             Port,
+             ClientPort,
+             Status);
+
+    /* If this is a waitable port, set the event */
+    if (Port->Flags & LPCP_WAITABLE_PORT) KeSetEvent(&Port->WaitEvent,
+                                                     1,
+                                                     FALSE);
+
+    /* Release the queue semaphore */
+    LpcpCompleteWait(Port->MsgQueue.Semaphore);
+
+    /* Now wait for a reply */
+    LpcpConnectWait(&Thread->LpcReplySemaphore, PreviousMode);
+
+    /* Check if our wait ended in success */
+    if (Status != STATUS_SUCCESS) goto Cleanup;
+
+    /* Free the connection message */
+    SectionToMap = LpcpFreeConMsg(&Message, &ConnectMessage, Thread);
+
+    /* Check if we got a message back */
+    if (Message)
+    {
+        /* Check for new return length */
+        if ((Message->Request.u1.s1.DataLength -
+             sizeof(LPCP_CONNECTION_MESSAGE)) < ConnectionInfoLength)
+        {
+            /* Set new normalized connection length */
+            ConnectionInfoLength = Message->Request.u1.s1.DataLength -
+                                   sizeof(LPCP_CONNECTION_MESSAGE);
+        }
+
+        /* Check if we had connection information */
+        if (ConnectionInformation)
+        {
+            /* Check if we had a length pointer */
+            if (ConnectionInformationLength)
+            {
+                /* Return the length */
+                *ConnectionInformationLength = ConnectionInfoLength;
+            }
+
+            /* Return the connection information */
+            RtlMoveMemory(ConnectionInformation,
+                          ConnectMessage + 1,
+                          ConnectionInfoLength );
+        }
+
+        /* Make sure we had a connected port */
+        if (ClientPort->ConnectedPort)
+        {
+            /* Get the message length before the port might get killed */
+            PortMessageLength = Port->MaxMessageLength;
+
+            /* Insert the client port */
+            Status = ObInsertObject(ClientPort,
                                     NULL,
-                                    PORT_ALL_ACCESS,  /* DesiredAccess */
-                                    LpcPortObjectType,
-                                    PreviousMode,
-                                    NULL,
-                                    (PVOID*)&NamedPort);
-  if (!NT_SUCCESS(Status))
-    {
-      if (KeGetPreviousMode() != KernelMode)
-	{
-	  ExFreePool(ConnectData);
-	}
-      return(Status);
-    }
-
-  /*
-   * Reference the send section object.
-   */
-  if (WriteMap.SectionHandle != INVALID_HANDLE_VALUE)
-    {
-      Status = ObReferenceObjectByHandle(WriteMap.SectionHandle,
-					 SECTION_MAP_READ | SECTION_MAP_WRITE,
-					 MmSectionObjectType,
-					 PreviousMode,
-					 (PVOID*)&SectionObject,
-					 NULL);
-      if (!NT_SUCCESS(Status))
-	{
-	  ObDereferenceObject(NamedPort);
-	  if (KeGetPreviousMode() != KernelMode)
-	    {
-	      ExFreePool(ConnectData);
-	    }
-	  return(Status);
-	}
-    }
-  else
-    {
-      SectionObject = NULL;
-    }
-
-  /*
-   * Do the connection establishment.
-   */
-  Status = EiConnectPort(&ConnectedPort,
-			 NamedPort,
-			 SectionObject,
-			 SectionOffset,
-			 WriteMap.ViewSize,
-			 &WriteMap.ViewBase,
-			 &WriteMap.ViewRemoteBase,
-			 &ReadMap.ViewSize,
-			 &ReadMap.ViewBase,
-			 &MaximumMessageSize,
-			 ConnectData,
-			 &ConnectDataLength);
-  if (!NT_SUCCESS(Status))
-    {
-      /* FIXME: Again, check what NT does here. */
-      if (UnsafeConnectDataLength != NULL)
-	{
-	  if (PreviousMode != KernelMode)
-	    {
-              _SEH_TRY
-                {
-                  RtlCopyMemory(UnsafeConnectData,
-                                ConnectData,
-                                ConnectDataLength);
-                  *UnsafeConnectDataLength = ConnectDataLength;
-                }
-              _SEH_HANDLE
-                {
-                  Status = _SEH_GetExceptionCode();
-                }
-              _SEH_END;
-	    }
-	  else
-	    {
-               RtlCopyMemory(UnsafeConnectData,
-                             ConnectData,
-                             ConnectDataLength);
-               *UnsafeConnectDataLength = ConnectDataLength;
-	    }
-
-          ExFreePool(ConnectData);
-	}
-      return(Status);
-    }
-
-  /*
-   * Do some initial cleanup.
-   */
-  if (SectionObject != NULL)
-    {
-      ObDereferenceObject(SectionObject);
-      SectionObject = NULL;
-    }
-  ObDereferenceObject(NamedPort);
-  NamedPort = NULL;
-
-  /*
-   * Copy the data back to the caller.
-   */
-
-  if (UnsafeConnectDataLength != NULL)
-    {
-      if (PreviousMode != KernelMode)
-	{
-          _SEH_TRY
+                                    PORT_ALL_ACCESS,
+                                    0,
+                                    (PVOID *)NULL,
+                                    &Handle);
+            if (NT_SUCCESS(Status))
             {
-              *UnsafeConnectDataLength = ConnectDataLength;
-              
-              if (ConnectData != NULL)
+                /* Return the handle */
+                *PortHandle = Handle;
+                LPCTRACE(LPC_CONNECT_DEBUG,
+                         "Handle: %lx. Length: %lx\n",
+                         Handle,
+                         PortMessageLength);
+
+                /* Check if maximum length was requested */
+                if (MaxMessageLength) *MaxMessageLength = PortMessageLength;
+
+                /* Check if we had a client view */
+                if (ClientView)
                 {
-                  RtlCopyMemory(UnsafeConnectData,
-                                ConnectData,
-                                ConnectDataLength);
+                    /* Copy it back */
+                    RtlMoveMemory(ClientView,
+                                  &ConnectMessage->ClientView,
+                                  sizeof(PORT_VIEW));
+                }
+
+                /* Check if we had a server view */
+                if (ServerView)
+                {
+                    /* Copy it back */
+                    RtlMoveMemory(ServerView,
+                                  &ConnectMessage->ServerView,
+                                  sizeof(REMOTE_PORT_VIEW));
                 }
             }
-          _SEH_HANDLE
-            {
-              Status = _SEH_GetExceptionCode();
-            }
-          _SEH_END;
-
-	  if (!NT_SUCCESS(Status))
-	    {
-              if (ConnectData != NULL)
-                {
-                  ExFreePool(ConnectData);
-                }
-              return(Status);
-	    }
-	}
-      else
+        }
+        else
         {
-          *UnsafeConnectDataLength = ConnectDataLength;
-          
-          if (ConnectData != NULL)
+            /* No connection port, we failed */
+            if (SectionToMap) ObDereferenceObject(SectionToMap);
+
+            /* Check if it's because the name got deleted */
+            if (Port->Flags & LPCP_NAME_DELETED)
             {
-              RtlCopyMemory(UnsafeConnectData,
-                            ConnectData,
-                            ConnectDataLength);
+                /* Set the correct status */
+                Status = STATUS_OBJECT_NAME_NOT_FOUND;
             }
+            else
+            {
+                /* Otherwise, the caller refused us */
+                Status = STATUS_PORT_CONNECTION_REFUSED;
+            }
+
+            /* Kill the port */
+            ObDereferenceObject(ClientPort);
         }
 
-      if (ConnectData != NULL)
-	{
-	  ExFreePool(ConnectData);
-	}
+        /* Free the message */
+        LpcpFreeToPortZone(Message, FALSE);
+        return Status;
     }
-  Status = ObInsertObject(ConnectedPort,
-			  NULL,
-			  PORT_ALL_ACCESS,
-			  1,
-			  (PVOID*)&ConnectedPort,
-			  &ConnectedPortHandle);
-  if (!NT_SUCCESS(Status))
+
+    /* No reply message, fail */
+    if (SectionToMap) ObDereferenceObject(SectionToMap);
+    ObDereferenceObject(ClientPort);
+    return STATUS_PORT_CONNECTION_REFUSED;
+
+Cleanup:
+    /* We failed, free the message */
+    SectionToMap = LpcpFreeConMsg(&Message, &ConnectMessage, Thread);
+
+    /* Check if the semaphore got signaled */
+    if (KeReadStateSemaphore(&Thread->LpcReplySemaphore))
     {
-      return(Status);
+        /* Wait on it */
+        KeWaitForSingleObject(&Thread->LpcReplySemaphore,
+                              KernelMode,
+                              Executive,
+                              FALSE,
+                              NULL);
     }
 
-  if (PreviousMode != KernelMode)
-    {
-      _SEH_TRY
-        {
-          *UnsafeConnectedPortHandle = ConnectedPortHandle;
-          
-          if (UnsafeWriteMap != NULL)
-            {
-              RtlCopyMemory(UnsafeWriteMap,
-                            &WriteMap,
-                            sizeof(PORT_VIEW));
-            }
+    /* Check if we had a message and free it */
+    if (Message) LpcpFreeToPortZone(Message, FALSE);
 
-          if (UnsafeReadMap != NULL)
-            {
-              RtlCopyMemory(UnsafeReadMap,
-                            &ReadMap,
-                            sizeof(REMOTE_PORT_VIEW));
-            }
+    /* Dereference other objects */
+    if (SectionToMap) ObDereferenceObject(SectionToMap);
+    ObDereferenceObject(ClientPort);
 
-          if (UnsafeMaximumMessageSize != NULL)
-            {
-              *UnsafeMaximumMessageSize = MaximumMessageSize;
-            }
-        }
-      _SEH_HANDLE
-        {
-          Status = _SEH_GetExceptionCode();
-        }
-      _SEH_END;
-      
-      if (!NT_SUCCESS(Status))
-        {
-          return Status;
-        }
-    }
-  else
-    {
-      *UnsafeConnectedPortHandle = ConnectedPortHandle;
-      
-      if (UnsafeWriteMap != NULL)
-        {
-          RtlCopyMemory(UnsafeWriteMap,
-                        &WriteMap,
-                        sizeof(PORT_VIEW));
-        }
-
-      if (UnsafeReadMap != NULL)
-        {
-          RtlCopyMemory(UnsafeReadMap,
-                        &ReadMap,
-                        sizeof(REMOTE_PORT_VIEW));
-        }
-
-      if (UnsafeMaximumMessageSize != NULL)
-        {
-          *UnsafeMaximumMessageSize = MaximumMessageSize;
-        }
-    }
-
-  /*
-   * All done.
-   */
-
-  return(STATUS_SUCCESS);
+    /* Return status */
+    return Status;
 }
 
-
-/**********************************************************************
- * NAME							EXPORTED
- *	NtAcceptConnectPort/6
- *
- * DESCRIPTION
- *
- * ARGUMENTS
- *	ServerPortHandle
- *	NamedPortHandle
- *	LpcMessage
- *	AcceptIt
- *	WriteMap
- *	ReadMap
- *
- * RETURN VALUE
+/*
+ * @implemented
  */
-/*EXPORTED*/ NTSTATUS STDCALL
-NtAcceptConnectPort (PHANDLE			ServerPortHandle,
-		     HANDLE			NamedPortHandle,
-		     PPORT_MESSAGE		LpcMessage,
-		     BOOLEAN			AcceptIt,
-		     PPORT_VIEW	WriteMap,
-		     PREMOTE_PORT_VIEW	ReadMap)
+NTSTATUS
+NTAPI
+NtConnectPort(OUT PHANDLE PortHandle,
+              IN PUNICODE_STRING PortName,
+              IN PSECURITY_QUALITY_OF_SERVICE Qos,
+              IN PPORT_VIEW ClientView,
+              IN PREMOTE_PORT_VIEW ServerView,
+              OUT PULONG MaxMessageLength,
+              IN PVOID ConnectionInformation,
+              OUT PULONG ConnectionInformationLength)
 {
-  NTSTATUS	Status;
-  PEPORT		NamedPort;
-  PEPORT		OurPort = NULL;
-  PQUEUEDMESSAGE	ConnectionRequest;
-  KIRQL		oldIrql;
-  PEPORT_CONNECT_REQUEST_MESSAGE CRequest;
-  PEPORT_CONNECT_REPLY_MESSAGE CReply;
-  ULONG Size;
-  KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
-
-  Size = sizeof(EPORT_CONNECT_REPLY_MESSAGE);
-  if (LpcMessage)
-  {
-     Size += LpcMessage->u1.s1.DataLength;
-  }
-
-  CReply = ExAllocatePool(NonPagedPool, Size);
-  if (CReply == NULL)
-    {
-      return(STATUS_NO_MEMORY);
-    }
-
-  Status = ObReferenceObjectByHandle(NamedPortHandle,
-				     PORT_ALL_ACCESS,
-				     LpcPortObjectType,
-				     PreviousMode,
-				     (PVOID*)&NamedPort,
-				     NULL);
-  if (!NT_SUCCESS(Status))
-    {
-      ExFreePool(CReply);
-      return (Status);
-    }
-
-  /*
-   * Create a port object for our side of the connection
-   */
-  if (AcceptIt)
-    {
-      Status = ObCreateObject(PreviousMode,
-			      LpcPortObjectType,
-			      NULL,
-			      PreviousMode,
-			      NULL,
-			      sizeof(EPORT),
-			      0,
-			      0,
-			      (PVOID*)&OurPort);
-      if (!NT_SUCCESS(Status))
-	{
-	  ExFreePool(CReply);
-	  ObDereferenceObject(NamedPort);
-	  return(Status);
-	}
-
-      Status = ObInsertObject ((PVOID)OurPort,
-			       NULL,
-			       PORT_ALL_ACCESS,
-			       0,
-			       NULL,
-			       ServerPortHandle);
-      if (!NT_SUCCESS(Status))
-	{
-	  ObDereferenceObject(OurPort);
-	  ExFreePool(CReply);
-	  ObDereferenceObject(NamedPort);
-	  return(Status);
-	}
-
-      LpcpInitializePort(OurPort, EPORT_TYPE_SERVER_COMM_PORT, NamedPort);
-    }
-
-  /*
-   * Dequeue the connection request
-   */
-  KeAcquireSpinLock(&NamedPort->Lock, &oldIrql);
-  ConnectionRequest = EiDequeueConnectMessagePort (NamedPort);
-  KeReleaseSpinLock(&NamedPort->Lock, oldIrql);
-  CRequest = (PEPORT_CONNECT_REQUEST_MESSAGE)(&ConnectionRequest->Message);
-
-  /*
-   * Prepare the reply.
-   */
-  if (LpcMessage != NULL)
-    {
-      memcpy(&CReply->MessageHeader, LpcMessage, sizeof(PORT_MESSAGE));
-      memcpy(&CReply->ConnectData, (PVOID)(LpcMessage + 1),
-	     LpcMessage->u1.s1.DataLength);
-      CReply->MessageHeader.u1.s1.TotalLength =
-	sizeof(EPORT_CONNECT_REPLY_MESSAGE) + LpcMessage->u1.s1.DataLength;
-      CReply->MessageHeader.u1.s1.DataLength = CReply->MessageHeader.u1.s1.TotalLength -
-	sizeof(PORT_MESSAGE);
-      CReply->ConnectDataLength = LpcMessage->u1.s1.DataLength;
-    }
-  else
-    {
-      CReply->MessageHeader.u1.s1.TotalLength = sizeof(EPORT_CONNECT_REPLY_MESSAGE);
-      CReply->MessageHeader.u1.s1.DataLength = sizeof(EPORT_CONNECT_REPLY_MESSAGE) -
-	sizeof(PORT_MESSAGE);
-      CReply->ConnectDataLength = 0;
-    }
-  if (!AcceptIt)
-    {
-      EiReplyOrRequestPort(ConnectionRequest->Sender,
-			   &CReply->MessageHeader,
-			   LPC_CONNECTION_REFUSED,
-			   NamedPort);
-      KeReleaseSemaphore(&ConnectionRequest->Sender->Semaphore,
-			 IO_NO_INCREMENT,
-			 1,
-			 FALSE);
-      ObDereferenceObject(ConnectionRequest->Sender);
-      ExFreePool(ConnectionRequest);
-      ExFreePool(CReply);
-      ObDereferenceObject(NamedPort);
-      return (STATUS_SUCCESS);
-    }
-
-  /*
-   * Prepare the connection.
-   */
-  if (WriteMap != NULL)
-    {
-      PVOID SectionObject;
-      LARGE_INTEGER SectionOffset;
-
-      Status = ObReferenceObjectByHandle(WriteMap->SectionHandle,
-					 SECTION_MAP_READ | SECTION_MAP_WRITE,
-					 MmSectionObjectType,
-					 PreviousMode,
-					 (PVOID*)&SectionObject,
-					 NULL);
-      if (!NT_SUCCESS(Status))
-	{
-	  return(Status);
-	}
-
-      SectionOffset.QuadPart = WriteMap->SectionOffset;
-      WriteMap->ViewRemoteBase = 0;
-      CReply->ReceiveClientViewSize = WriteMap->ViewSize;
-      Status = MmMapViewOfSection(SectionObject,
-				  CRequest->ConnectingProcess,
-				  &WriteMap->ViewRemoteBase,
-				  0,
-				  CReply->ReceiveClientViewSize,
-				  &SectionOffset,
-				  &CReply->ReceiveClientViewSize,
-				  ViewUnmap,
-				  0 /* MEM_TOP_DOWN? */,
-				  PAGE_READWRITE);
-      if (!NT_SUCCESS(Status))
-	{
-	  return(Status);
-	}
-
-      WriteMap->ViewBase = 0;
-      Status = MmMapViewOfSection(SectionObject,
-				  PsGetCurrentProcess(),
-				  &WriteMap->ViewBase,
-				  0,
-				  WriteMap->ViewSize,
-				  &SectionOffset,
-				  &WriteMap->ViewSize,
-				  ViewUnmap,
-				  0 /* MEM_TOP_DOWN? */,
-				  PAGE_READWRITE);
-      if (!NT_SUCCESS(Status))
-	{
-	  return(Status);
-	}
-
-      ObDereferenceObject(SectionObject);
-    }
-  if (ReadMap != NULL && CRequest->SendSectionObject != NULL)
-    {
-      LARGE_INTEGER SectionOffset;
-
-      SectionOffset = CRequest->SendSectionOffset;
-      ReadMap->ViewSize = CRequest->SendViewSize;
-      ReadMap->ViewBase = 0;
-      Status = MmMapViewOfSection(CRequest->SendSectionObject,
-				  PsGetCurrentProcess(),
-				  &ReadMap->ViewBase,
-				  0,
-				  CRequest->SendViewSize,
-				  &SectionOffset,
-				  &CRequest->SendViewSize,
-				  ViewUnmap,
-				  0 /* MEM_TOP_DOWN? */,
-				  PAGE_READWRITE);
-      if (!NT_SUCCESS(Status))
-	{
-	  return(Status);
-	}
-    }
-
-  /*
-   * Finish the reply.
-   */
-  if (ReadMap != NULL)
-    {
-      CReply->SendServerViewBase = ReadMap->ViewBase;
-    }
-  else
-    {
-      CReply->SendServerViewBase = 0;
-    }
-  if (WriteMap != NULL)
-    {
-      CReply->ReceiveClientViewBase = WriteMap->ViewRemoteBase;
-    }
-  CReply->MaximumMessageSize = LPC_MAX_MESSAGE_LENGTH;
-
-
-  /*
-   * Connect the two ports
-   */
-  OurPort->OtherPort = ConnectionRequest->Sender;
-  OurPort->OtherPort->OtherPort = OurPort;
-  EiReplyOrRequestPort(ConnectionRequest->Sender,
-		       (PPORT_MESSAGE)CReply,
-		       LPC_REPLY,
-		       OurPort);
-  ExFreePool(ConnectionRequest);
-  ExFreePool(CReply);
-
-  //ObDereferenceObject(OurPort);
-  ObDereferenceObject(NamedPort);
-
-  return (STATUS_SUCCESS);
-}
-
-/**********************************************************************
- * NAME							EXPORTED
- * 	NtSecureConnectPort/9
- *
- * DESCRIPTION
- *	Connect to a named port and wait for the other side to
- *	accept the connection. Possibly verify that the server
- *	matches the ServerSid (trusted server).
- *	Present in w2k+.
- *
- * ARGUMENTS
- *	ConnectedPort
- *	PortName: fully qualified name in the Ob name space;
- *	Qos
- *	WriteMap
- *	ServerSid
- *	ReadMap
- *	MaxMessageSize
- *	ConnectInfo
- *	UserConnectInfoLength
- *
- * RETURN VALUE
- */
-NTSTATUS STDCALL
-NtSecureConnectPort (OUT    PHANDLE				ConnectedPort,
-		     IN     PUNICODE_STRING			PortName,
-		     IN     PSECURITY_QUALITY_OF_SERVICE	Qos,
-		     IN OUT PPORT_VIEW			WriteMap		OPTIONAL,
-		     IN     PSID				ServerSid		OPTIONAL,
-		     IN OUT PREMOTE_PORT_VIEW			ReadMap			OPTIONAL,
-		     OUT    PULONG				MaxMessageSize		OPTIONAL,
-		     IN OUT PVOID				ConnectInfo		OPTIONAL,
-		     IN OUT PULONG				UserConnectInfoLength	OPTIONAL)
-{
-  /* TODO: implement a new object type: WaitablePort */
-  /* TODO: verify the process' SID that hosts the rendez-vous port equals ServerSid */
-  return NtConnectPort (ConnectedPort,
-		        PortName,
-		        Qos,
-		        WriteMap,
-		        ReadMap,
-		        MaxMessageSize,
-		        ConnectInfo,
-		        UserConnectInfoLength);
+    /* Call the newer API */
+    return NtSecureConnectPort(PortHandle,
+                               PortName,
+                               Qos,
+                               ClientView,
+                               NULL,
+                               ServerView,
+                               MaxMessageLength,
+                               ConnectionInformation,
+                               ConnectionInformationLength);
 }
 
 /* EOF */
diff --git a/reactos/ntoskrnl/lpc/create.c b/reactos/ntoskrnl/lpc/create.c
index 1fcefa0d6b0..2bf08c13e11 100644
--- a/reactos/ntoskrnl/lpc/create.c
+++ b/reactos/ntoskrnl/lpc/create.c
@@ -1,180 +1,195 @@
-/* $Id$
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
+/*
+ * PROJECT:         ReactOS Kernel
+ * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            ntoskrnl/lpc/create.c
- * PURPOSE:         Communication mechanism
- *
- * PROGRAMMERS:     David Welch (welch@cwcom.net)
+ * PURPOSE:         Local Procedure Call: Port/Queue/Message Creation
+ * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
  */
 
-/* INCLUDES *****************************************************************/
+/* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
+#include "lpc.h"
 #define NDEBUG
 #include <internal/debug.h>
 
-/**********************************************************************
- * NAME
- * 	LpcpVerifyCreateParameters/5
- *
- * DESCRIPTION
- *	Verify user parameters in NtCreatePort and in
- *	NtCreateWaitablePort.
- *
- * ARGUMENTS
- *
- * RETURN VALUE
- */
-static NTSTATUS STDCALL
-LpcpVerifyCreateParameters (IN	PHANDLE			PortHandle,
-			    IN	POBJECT_ATTRIBUTES	ObjectAttributes,
-			    IN	ULONG			MaxConnectInfoLength,
-			    IN	ULONG			MaxDataLength,
-			    IN	ULONG			MaxPoolUsage)
+/* PRIVATE FUNCTIONS *********************************************************/
+
+NTSTATUS
+NTAPI
+LpcpInitializePortQueue(IN PLPCP_PORT_OBJECT Port)
 {
-  if (NULL == PortHandle)
-    {
-      return (STATUS_INVALID_PARAMETER_1);
-    }
-  if (NULL == ObjectAttributes)
-    {
-      return (STATUS_INVALID_PARAMETER_2);
-    }
-  if ((ObjectAttributes->Attributes    & OBJ_OPENLINK)
-      || (ObjectAttributes->Attributes & OBJ_OPENIF)
-      || (ObjectAttributes->Attributes & OBJ_EXCLUSIVE)
-      || (ObjectAttributes->Attributes & OBJ_PERMANENT)
-      || (ObjectAttributes->Attributes & OBJ_INHERIT))
-  {
-    return (STATUS_INVALID_PORT_ATTRIBUTES);
-  }
-  if (MaxConnectInfoLength > LPC_MAX_DATA_LENGTH)
-    {
-      return (STATUS_INVALID_PARAMETER_3);
-    }
-  if (MaxDataLength > LPC_MAX_MESSAGE_LENGTH)
-    {
-      return (STATUS_INVALID_PARAMETER_4);
-    }
-  /* TODO: some checking is done also on MaxPoolUsage
-   * to avoid choking the executive */
-  return (STATUS_SUCCESS);
+    PLPCP_NONPAGED_PORT_QUEUE MessageQueue;
+
+    /* Allocate the queue */
+    MessageQueue = ExAllocatePoolWithTag(NonPagedPool,
+                                         sizeof(LPCP_NONPAGED_PORT_QUEUE),
+                                         TAG('P', 'o', 'r', 't'));
+    if (!MessageQueue) return STATUS_INSUFFICIENT_RESOURCES;
+
+    /* Set it up */
+    KeInitializeSemaphore(&MessageQueue->Semaphore, 0, MAXLONG);
+    MessageQueue->BackPointer = Port;
+
+    /* And link it with the Paged Pool part */
+    Port->MsgQueue.Semaphore = &MessageQueue->Semaphore;
+    InitializeListHead(&Port->MsgQueue.ReceiveHead);
+    return STATUS_SUCCESS;
 }
 
-/**********************************************************************
- * NAME							EXPORTED
- * 	NtCreatePort/5
- *
- * DESCRIPTION
- *
- * ARGUMENTS
- *	PortHandle,
- *	ObjectAttributes,
- *	MaxConnectInfoLength,
- *	MaxDataLength,
- *	MaxPoolUsage: size of NP zone the NP part of msgs is kept in
- *
- * RETURN VALUE
- */
-/*EXPORTED*/ NTSTATUS STDCALL
-NtCreatePort (PHANDLE		      PortHandle,
-	      POBJECT_ATTRIBUTES    ObjectAttributes,
-	      ULONG	       MaxConnectInfoLength,
-	      ULONG			MaxDataLength,
-	      ULONG			MaxPoolUsage)
+NTSTATUS
+NTAPI
+LpcpCreatePort(OUT PHANDLE PortHandle,
+               IN POBJECT_ATTRIBUTES ObjectAttributes,
+               IN ULONG MaxConnectionInfoLength,
+               IN ULONG MaxMessageLength,
+               IN ULONG MaxPoolUsage,
+               IN BOOLEAN Waitable)
 {
-  PEPORT		Port;
-  NTSTATUS	Status;
+    KPROCESSOR_MODE PreviousMode = KeGetPreviousMode();
+    NTSTATUS Status;
+    PLPCP_PORT_OBJECT Port;
+    LPCTRACE(LPC_CREATE_DEBUG, "Name: %wZ\n", ObjectAttributes->ObjectName);
 
-  DPRINT("NtCreatePort() Name %x\n", ObjectAttributes->ObjectName->Buffer);
+    /* Create the Object */
+    Status = ObCreateObject(PreviousMode,
+                            LpcPortObjectType,
+                            ObjectAttributes,
+                            PreviousMode,
+                            NULL,
+                            sizeof(LPCP_PORT_OBJECT),
+                            0,
+                            0,
+                            (PVOID*)&Port);
+    if (!NT_SUCCESS(Status)) return Status;
 
-  /* Verify parameters */
-  Status = LpcpVerifyCreateParameters (PortHandle,
-				       ObjectAttributes,
-				       MaxConnectInfoLength,
-				       MaxDataLength,
-				       MaxPoolUsage);
-  if (STATUS_SUCCESS != Status)
+    /* Set up the Object */
+    RtlZeroMemory(Port, sizeof(LPCP_PORT_OBJECT));
+    Port->ConnectionPort = Port;
+    Port->Creator = PsGetCurrentThread()->Cid;
+    InitializeListHead(&Port->LpcDataInfoChainHead);
+    InitializeListHead(&Port->LpcReplyChainHead);
+
+    /* Check if we don't have a name */
+    if (!ObjectAttributes->ObjectName->Buffer)
     {
-      return (Status);
+        /* Set up for an unconnected port */
+        Port->Flags = LPCP_UNCONNECTED_PORT;
+        Port->ConnectedPort = Port;
+        Port->ServerProcess = NULL;
+    }
+    else
+    {
+        /* Set up for a named connection port */
+        Port->Flags = LPCP_CONNECTION_PORT;
+        Port->ServerProcess = PsGetCurrentProcess();
+
+        /* Don't let the process die on us */
+        ObReferenceObject(Port->ServerProcess);
     }
 
-  /* Ask Ob to create the object */
-  Status = ObCreateObject (ExGetPreviousMode(),
-			   LpcPortObjectType,
-			   ObjectAttributes,
-			   ExGetPreviousMode(),
-			   NULL,
-			   sizeof(EPORT),
-			   0,
-			   0,
-			   (PVOID*)&Port);
-  if (!NT_SUCCESS(Status))
+    /* Check if this is a waitable port */
+    if (Waitable) Port->Flags |= LPCP_WAITABLE_PORT;
+
+    /* Setup the port queue */
+    Status = LpcpInitializePortQueue(Port);
+    if (!NT_SUCCESS(Status))
     {
-      return (Status);
+        /* Fail */
+        ObDereferenceObject(Port);
+        return Status;
     }
 
-  Status = ObInsertObject ((PVOID)Port,
-			   NULL,
-			   PORT_ALL_ACCESS,
-			   0,
-			   NULL,
-			   PortHandle);
-  if (!NT_SUCCESS(Status))
+    /* Check if this is a waitable port */
+    if (Port->Flags & LPCP_WAITABLE_PORT)
     {
-      ObDereferenceObject (Port);
-      return (Status);
+        /* Setup the wait event */
+        KeInitializeEvent(&Port->WaitEvent, NotificationEvent, FALSE);
     }
 
-  Status = LpcpInitializePort (Port, EPORT_TYPE_SERVER_RQST_PORT, NULL);
-  Port->MaxConnectInfoLength = LPC_MAX_DATA_LENGTH;
-  Port->MaxDataLength = LPC_MAX_MESSAGE_LENGTH;
-  Port->MaxPoolUsage = MaxPoolUsage;
+    /* Set the maximum message size allowed */
+    Port->MaxMessageLength = LpcpMaxMessageSize -
+                             FIELD_OFFSET(LPCP_MESSAGE, Request);
 
-  return (Status);
+    /* Now subtract the actual message structures and get the data size */
+    Port->MaxConnectionInfoLength = Port->MaxMessageLength -
+                                    sizeof(PORT_MESSAGE) -
+                                    sizeof(LPCP_CONNECTION_MESSAGE);
+
+    /* Validate the sizes */
+    if (Port->MaxConnectionInfoLength < MaxConnectionInfoLength)
+    {
+        /* Not enough space for your request */
+        ObDereferenceObject(Port);
+        return STATUS_INVALID_PARAMETER_3;
+    }
+    else if (Port->MaxMessageLength < MaxMessageLength)
+    {
+        /* Not enough space for your request */
+        ObDereferenceObject(Port);
+        return STATUS_INVALID_PARAMETER_4;
+    }
+
+    /* Now set the custom setting */
+    Port->MaxMessageLength = MaxMessageLength;
+
+    /* Insert it now */
+    Status = ObInsertObject((PVOID)Port,
+                            NULL,
+                            PORT_ALL_ACCESS,
+                            0,
+                            NULL,
+                            PortHandle);
+
+    /* Return success or the error */
+    LPCTRACE(LPC_CREATE_DEBUG, "Port: %p. Handle: %lx\n", Port, *PortHandle);
+    return Status;
 }
 
-/**********************************************************************
- * NAME							EXPORTED
- * 	NtCreateWaitablePort/5
- *
- * DESCRIPTION
- *	Waitable ports can be connected to with NtSecureConnectPort.
- *	No port interface can be used with waitable ports but
- *	NtReplyWaitReceivePort and NtReplyWaitReceivePortEx.
- * 	Present only in w2k+.
- *
- * ARGUMENTS
- *	PortHandle,
- *	ObjectAttributes,
- *	MaxConnectInfoLength,
- *	MaxDataLength,
- *	MaxPoolUsage
- *
- * RETURN VALUE
- */
-/*EXPORTED*/ NTSTATUS STDCALL
-NtCreateWaitablePort (OUT	PHANDLE			PortHandle,
-		      IN	POBJECT_ATTRIBUTES	ObjectAttributes,
-		      IN	ULONG			MaxConnectInfoLength,
-		      IN	ULONG			MaxDataLength,
-		      IN	ULONG			MaxPoolUsage)
-{
-  NTSTATUS Status;
+/* PUBLIC FUNCTIONS **********************************************************/
 
-  /* Verify parameters */
-  Status = LpcpVerifyCreateParameters (PortHandle,
-				       ObjectAttributes,
-				       MaxConnectInfoLength,
-				       MaxDataLength,
-				       MaxPoolUsage);
-  if (STATUS_SUCCESS != Status)
-    {
-      return (Status);
-    }
-  /* TODO */
-  return (STATUS_NOT_IMPLEMENTED);
+/*
+ * @implemented
+ */
+NTSTATUS
+NTAPI
+NtCreatePort(OUT PHANDLE PortHandle,
+             IN POBJECT_ATTRIBUTES ObjectAttributes,
+             IN ULONG MaxConnectInfoLength,
+             IN ULONG MaxDataLength,
+             IN ULONG MaxPoolUsage)
+{
+    PAGED_CODE();
+
+    /* Call the internal API */
+    return LpcpCreatePort(PortHandle,
+                          ObjectAttributes,
+                          MaxConnectInfoLength,
+                          MaxDataLength,
+                          MaxPoolUsage,
+                          FALSE);
+}
+
+/*
+ * @implemented
+ */
+NTSTATUS
+NTAPI
+NtCreateWaitablePort(OUT PHANDLE PortHandle,
+                     IN POBJECT_ATTRIBUTES ObjectAttributes,
+                     IN ULONG MaxConnectInfoLength,
+                     IN ULONG MaxDataLength,
+                     IN ULONG MaxPoolUsage)
+{
+    PAGED_CODE();
+
+    /* Call the internal API */
+    return LpcpCreatePort(PortHandle,
+                          ObjectAttributes,
+                          MaxConnectInfoLength,
+                          MaxDataLength,
+                          MaxPoolUsage,
+                          TRUE);
 }
 
 /* EOF */
diff --git a/reactos/ntoskrnl/lpc/listen.c b/reactos/ntoskrnl/lpc/listen.c
index 901c816f1ec..ee2ade0c03d 100644
--- a/reactos/ntoskrnl/lpc/listen.c
+++ b/reactos/ntoskrnl/lpc/listen.c
@@ -1,72 +1,52 @@
-/* $Id$
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
+/*
+ * PROJECT:         ReactOS Kernel
+ * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            ntoskrnl/lpc/listen.c
- * PURPOSE:         Communication mechanism
- *
- * PROGRAMMERS:     David Welch (welch@cwcom.net)
+ * PURPOSE:         Local Procedure Call: Listening
+ * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
  */
 
 /* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
+#include "lpc.h"
 #define NDEBUG
 #include <internal/debug.h>
 
-/* FUNCTIONS *****************************************************************/
+/* PUBLIC FUNCTIONS **********************************************************/
 
-/**********************************************************************
- * NAME							EXPORTED
- *	NtListenPort@8
- *
- * DESCRIPTION
- *	Listen on a named port and wait for a connection attempt.
- *
- * ARGUMENTS
- *	PortHandle	[IN] LPC port to listen on.
- *
- *	ConnectMsg	[IN] User provided storage for a
- *			possible connection request LPC message.
- *
- * RETURN VALUE
- *	STATUS_SUCCESS if a connection request is received
- *	successfully; otherwise an error code.
- *
- *	The buffer ConnectMessage is filled with the connection
- *	request message queued by NtConnectPort() in PortHandle.
- *
- * NOTE
+/*
+ * @implemented
  */
-/*EXPORTED*/ NTSTATUS STDCALL
-NtListenPort (IN	HANDLE		PortHandle,
-	      IN	PPORT_MESSAGE	ConnectMsg)
+NTSTATUS
+NTAPI
+NtListenPort(IN HANDLE PortHandle,
+             OUT PPORT_MESSAGE ConnectMessage)
 {
-  NTSTATUS	Status;
+        NTSTATUS Status;
+        PAGED_CODE();
+        LPCTRACE(LPC_LISTEN_DEBUG, "Handle: %lx\n", PortHandle);
 
-  /*
-   * Wait forever for a connection request.
-   */
-  for (;;)
-    {
-      Status = NtReplyWaitReceivePort(PortHandle,
-				      NULL,
-				      NULL,
-				      ConnectMsg);
-      /*
-       * Accept only LPC_CONNECTION_REQUEST requests.
-       * Drop any other message.
-       */
-      if (!NT_SUCCESS(Status) ||
-	  LPC_CONNECTION_REQUEST == ConnectMsg->u2.s2.Type)
-	{
-	  DPRINT("Got message (type %x)\n", LPC_CONNECTION_REQUEST);
-	  break;
-	}
-      DPRINT("Got message (type %x)\n", ConnectMsg->u2.s2.Type);
-    }
+        /* Wait forever for a connection request. */
+        for (;;)
+        {
+            /* Do the wait */
+            Status = NtReplyWaitReceivePort(PortHandle,
+                                            NULL,
+                                            NULL,
+                                            ConnectMessage);
 
-  return (Status);
+            /* Accept only LPC_CONNECTION_REQUEST requests. */
+            if ((Status != STATUS_SUCCESS) ||
+                (LpcpGetMessageType(ConnectMessage) == LPC_CONNECTION_REQUEST))
+            {
+                /* Break out */
+                break;
+            }
+        }
+
+        /* Return status */
+        return Status;
 }
 
 
diff --git a/reactos/ntoskrnl/lpc/ntlpc/close.c b/reactos/ntoskrnl/lpc/ntlpc/close.c
deleted file mode 100644
index af9803dbfc7..00000000000
--- a/reactos/ntoskrnl/lpc/ntlpc/close.c
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
- * PROJECT:         ReactOS Kernel
- * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            ntoskrnl/lpc/close.c
- * PURPOSE:         Local Procedure Call: Rundown, Cleanup, Deletion
- * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <ntoskrnl.h>
-#include "lpc.h"
-#define NDEBUG
-#include <internal/debug.h>
-
-/* PRIVATE FUNCTIONS *********************************************************/
-
-VOID
-NTAPI
-LpcExitThread(IN PETHREAD Thread)
-{
-    PLPCP_MESSAGE Message;
-
-    /* Acquire the lock */
-    KeAcquireGuardedMutex(&LpcpLock);
-
-    /* Make sure that the Reply Chain is empty */
-    if (!IsListEmpty(&Thread->LpcReplyChain))
-    {
-        /* It's not, remove the entry */
-        RemoveEntryList(&Thread->LpcReplyChain);
-    }
-
-    /* Set the thread in exit mode */
-    Thread->LpcExitThreadCalled = TRUE;
-    Thread->LpcReplyMessageId = 0;
-
-    /* Check if there's a reply message */
-    Message = Thread->LpcReplyMessage;
-    if (Message)
-    {
-        /* FIXME: TODO */
-        KEBUGCHECK(0);
-    }
-
-    /* Release the lock */
-    KeReleaseGuardedMutex(&LpcpLock);
-}
-
-VOID
-NTAPI
-LpcpFreeToPortZone(IN PLPCP_MESSAGE Message,
-                   IN ULONG Flags)
-{
-    PLPCP_CONNECTION_MESSAGE ConnectMessage;
-    PLPCP_PORT_OBJECT ClientPort = NULL;
-    PETHREAD Thread = NULL;
-    BOOLEAN LockHeld = Flags & 1;
-    PAGED_CODE();
-    LPCTRACE(LPC_CLOSE_DEBUG, "Message: %p. Flags: %lx\n", Message, Flags);
-
-    /* Acquire the lock if not already */
-    if (!LockHeld) KeAcquireGuardedMutex(&LpcpLock);
-
-    /* Check if the queue list is empty */
-    if (!IsListEmpty(&Message->Entry))
-    {
-        /* Remove and re-initialize */
-        RemoveEntryList(&Message->Entry);
-        InitializeListHead(&Message->Entry);
-    }
-
-    /* Check if we've already replied */
-    if (Message->RepliedToThread)
-    {
-        /* Set thread to dereference and clean up */
-        Thread = Message->RepliedToThread;
-        Message->RepliedToThread = NULL;
-    }
-
-    /* Check if this is a connection request */
-    if (Message->Request.u2.s2.Type == LPC_CONNECTION_REQUEST)
-    {
-        /* Get the connection message */
-        ConnectMessage = (PLPCP_CONNECTION_MESSAGE)(Message + 1);
-
-        /* Clear the client port */
-        ClientPort = ConnectMessage->ClientPort;
-        if (ClientPort) ConnectMessage->ClientPort = NULL;
-    }
-
-    /* Release the lock */
-    KeReleaseGuardedMutex(&LpcpLock);
-
-    /* Check if we had anything to dereference */
-    if (Thread) ObDereferenceObject(Thread);
-    if (ClientPort) ObDereferenceObject(ClientPort);
-
-    /* Free the entry */
-    ExFreeToPagedLookasideList(&LpcpMessagesLookaside, Message);
-
-    /* Reacquire the lock if needed */
-    if ((LockHeld) && !(Flags & 2)) KeAcquireGuardedMutex(&LpcpLock);
-}
-
-VOID
-NTAPI
-LpcpDestroyPortQueue(IN PLPCP_PORT_OBJECT Port,
-                     IN BOOLEAN Destroy)
-{
-    PLIST_ENTRY ListHead, NextEntry;
-    PETHREAD Thread;
-    PLPCP_MESSAGE Message;
-    PLPCP_CONNECTION_MESSAGE ConnectMessage;
-    LPCTRACE(LPC_CLOSE_DEBUG, "Port: %p. Flags: %lx\n", Port, Port->Flags);
-
-    /* Hold the lock */
-    KeAcquireGuardedMutex(&LpcpLock);
-
-    /* Disconnect the port to which this port is connected */
-    if (Port->ConnectedPort) Port->ConnectedPort->ConnectedPort = NULL;
-
-    /* Check if this is a connection port */
-    if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CONNECTION_PORT)
-    {
-        /* Delete the name */
-        Port->Flags |= LPCP_NAME_DELETED;
-    }
-
-    /* Walk all the threads waiting and signal them */
-    ListHead = &Port->LpcReplyChainHead;
-    NextEntry = ListHead->Flink;
-    while (NextEntry != ListHead)
-    {
-        /* Get the Thread */
-        Thread = CONTAINING_RECORD(NextEntry, ETHREAD, LpcReplyChain);
-
-        /* Make sure we're not in exit */
-        if (Thread->LpcExitThreadCalled) break;
-
-        /* Move to the next entry */
-        NextEntry = NextEntry->Flink;
-
-        /* Remove and reinitialize the List */
-        RemoveEntryList(&Thread->LpcReplyChain);
-        InitializeListHead(&Thread->LpcReplyChain);
-
-        /* Check if someone is waiting */
-        if (!KeReadStateSemaphore(&Thread->LpcReplySemaphore))
-        {
-            /* Get the message and check if it's a connection request */
-            Message = Thread->LpcReplyMessage;
-            if (Message->Request.u2.s2.Type == LPC_CONNECTION_REQUEST)
-            {
-                /* Get the connection message */
-                ConnectMessage = (PLPCP_CONNECTION_MESSAGE)(Message + 1);
-
-                /* Check if it had a section */
-                if (ConnectMessage->SectionToMap)
-                {
-                    /* Dereference it */
-                    ObDereferenceObject(ConnectMessage->SectionToMap);
-                }
-            }
-
-            /* Clear the reply message */
-            Thread->LpcReplyMessage = NULL;
-
-            /* And remove the message from the port zone */
-            LpcpFreeToPortZone(Message, TRUE);
-        }
-
-        /* Release the semaphore and reset message id count */
-        Thread->LpcReplyMessageId = 0;
-        LpcpCompleteWait(&Thread->LpcReplySemaphore);
-    }
-
-    /* Reinitialize the list head */
-    InitializeListHead(&Port->LpcReplyChainHead);
-
-    /* Loop queued messages */
-    ListHead = &Port->MsgQueue.ReceiveHead;
-    NextEntry =  ListHead->Flink;
-    while (ListHead != NextEntry)
-    {
-        /* Get the message */
-        Message = CONTAINING_RECORD(NextEntry, LPCP_MESSAGE, Entry);
-        NextEntry = NextEntry->Flink;
-
-        /* Free and reinitialize it's list head */
-        InitializeListHead(&Message->Entry);
-
-        /* Remove it from the port zone */
-        LpcpFreeToPortZone(Message, TRUE);
-    }
-
-    /* Reinitialize the message queue list head */
-    InitializeListHead(&Port->MsgQueue.ReceiveHead);
-
-    /* Release the lock */
-    KeReleaseGuardedMutex(&LpcpLock);
-
-    /* Check if we have to free the port entirely */
-    if (Destroy)
-    {
-        /* Check if the semaphore exists */
-        if (Port->MsgQueue.Semaphore)
-        {
-            /* Use the semaphore to find the port queue and free it */
-            ExFreePool(CONTAINING_RECORD(Port->MsgQueue.Semaphore,
-                                         LPCP_NONPAGED_PORT_QUEUE,
-                                         Semaphore));
-        }
-    }
-}
-
-VOID
-NTAPI
-LpcpClosePort(IN PEPROCESS Process OPTIONAL,
-              IN PVOID Object,
-              IN ACCESS_MASK GrantedAccess,
-              IN ULONG ProcessHandleCount,
-              IN ULONG SystemHandleCount)
-{
-    PLPCP_PORT_OBJECT Port = (PLPCP_PORT_OBJECT)Object;
-    LPCTRACE(LPC_CLOSE_DEBUG, "Port: %p. Flags: %lx\n", Port, Port->Flags);
-
-    /* Only Server-side Connection Ports need clean up*/
-    if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CONNECTION_PORT)
-    {
-        /* Check the handle count */
-        switch (SystemHandleCount)
-        {
-            /* No handles left */
-            case 0:
-
-                /* Destroy the port queue */
-                LpcpDestroyPortQueue(Port, TRUE);
-                break;
-
-            /* Last handle remaining */
-            case 1:
-
-                /* Reset the queue only */
-                LpcpDestroyPortQueue(Port, FALSE);
-
-            /* More handles remain, do nothing */
-            default:
-                break;
-        }
-    }
-}
-
-VOID
-NTAPI
-LpcpFreePortClientSecurity(IN PLPCP_PORT_OBJECT Port)
-{
-    /* Check if this is a client port */
-    if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CLIENT_PORT)
-    {
-        /* Check if security is static */
-        if (!(Port->Flags & LPCP_SECURITY_DYNAMIC))
-        {
-            /* Check if we have a token */
-            if (Port->StaticSecurity.ClientToken)
-            {
-                /* Free security */
-                SeDeleteClientSecurity(&Port->StaticSecurity);
-            }
-        }
-    }
-}
-
-VOID
-NTAPI
-LpcpDeletePort(IN PVOID ObjectBody)
-{
-    LARGE_INTEGER Timeout;
-    PETHREAD Thread;
-    PLPCP_PORT_OBJECT Port = (PLPCP_PORT_OBJECT)ObjectBody;
-    PLPCP_PORT_OBJECT ConnectionPort;
-    PLPCP_MESSAGE Message;
-    PLIST_ENTRY ListHead, NextEntry;
-    HANDLE Pid;
-    CLIENT_DIED_MSG ClientDiedMsg;
-    Timeout.QuadPart = -1000000;
-    PAGED_CODE();
-    LPCTRACE(LPC_CLOSE_DEBUG, "Port: %p. Flags: %lx\n", Port, Port->Flags);
-
-    /* Check if this is a communication port */
-    if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_COMMUNICATION_PORT)
-    {
-        /* Acquire the lock */
-        KeAcquireGuardedMutex(&LpcpLock);
-
-        /* Get the thread */
-        Thread = Port->ClientThread;
-        if (Thread)
-        {
-            /* Clear it */
-            Port->ClientThread = NULL;
-
-            /* Release the lock and dereference */
-            KeReleaseGuardedMutex(&LpcpLock);
-            ObDereferenceObject(Thread);
-        }
-        else
-        {
-            /* Release the lock */
-            KeReleaseGuardedMutex(&LpcpLock);
-        }
-    }
-
-    /* Check if this is a client-side port */
-    if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CLIENT_PORT)
-    {
-        /* Setup the client died message */
-        ClientDiedMsg.h.u1.s1.TotalLength = sizeof(ClientDiedMsg);
-        ClientDiedMsg.h.u1.s1.DataLength = sizeof(ClientDiedMsg.CreateTime);
-        ClientDiedMsg.h.u2.ZeroInit = LPC_PORT_CLOSED;
-        ClientDiedMsg.CreateTime = PsGetCurrentProcess()->CreateTime;
-
-        /* Send it */
-        for (;;)
-        {
-            /* Send the message */
-            if (LpcRequestPort(Port,
-                               &ClientDiedMsg.h) != STATUS_NO_MEMORY) break;
-
-            /* Wait until trying again */
-            KeDelayExecutionThread(KernelMode, FALSE, &Timeout);
-        }
-    }
-
-    /* Destroy the port queue */
-    LpcpDestroyPortQueue(Port, TRUE);
-
-    /* Check if we had a client view */
-    if (Port->ClientSectionBase) MmUnmapViewOfSection(PsGetCurrentProcess(),
-                                                      Port->ClientSectionBase);
-
-    /* Check for a server view */
-    if (Port->ServerSectionBase) MmUnmapViewOfSection(PsGetCurrentProcess(),
-                                                      Port->ServerSectionBase);
-
-    /* Get the connection port */
-    ConnectionPort = Port->ConnectionPort;
-    if (ConnectionPort)
-    {
-        /* Get the PID */
-        Pid = PsGetCurrentProcessId();
-
-        /* Acquire the lock */
-        KeAcquireGuardedMutex(&LpcpLock);
-
-        /* Loop the data lists */
-        ListHead = &ConnectionPort->LpcDataInfoChainHead;
-        NextEntry = ListHead->Flink;
-        while (NextEntry != ListHead)
-        {
-            /* Get the message */
-            Message = CONTAINING_RECORD(NextEntry, LPCP_MESSAGE, Entry);
-            NextEntry = NextEntry->Flink;
-
-            /* Check if the PID matches */
-            if (Message->Request.ClientId.UniqueProcess == Pid)
-            {
-                /* Remove it */
-                RemoveEntryList(&Message->Entry);
-                LpcpFreeToPortZone(Message, TRUE);
-            }
-        }
-
-        /* Release the lock */
-        KeReleaseGuardedMutex(&LpcpLock);
-
-        /* Dereference the object unless it's the same port */
-        if (ConnectionPort != Port) ObDereferenceObject(ConnectionPort);
-    }
-
-    /* Check if this is a connection port with a server process*/
-    if (((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CONNECTION_PORT) &&
-        (ConnectionPort->ServerProcess))
-    {
-        /* Dereference the server process */
-        ObDereferenceObject(ConnectionPort->ServerProcess);
-        ConnectionPort->ServerProcess = NULL;
-    }
-
-    /* Free client security */
-    LpcpFreePortClientSecurity(Port);
-    LPCTRACE(LPC_CLOSE_DEBUG, "Port: %p deleted\n", Port);
-}
-
-/* EOF */
diff --git a/reactos/ntoskrnl/lpc/ntlpc/complete.c b/reactos/ntoskrnl/lpc/ntlpc/complete.c
deleted file mode 100644
index b5e4e190ee1..00000000000
--- a/reactos/ntoskrnl/lpc/ntlpc/complete.c
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
-* PROJECT:         ReactOS Kernel
-* LICENSE:         GPL - See COPYING in the top level directory
-* FILE:            ntoskrnl/lpc/complete.c
-* PURPOSE:         Local Procedure Call: Connection Completion
-* PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
-*/
-
-/* INCLUDES ******************************************************************/
-
-#include <ntoskrnl.h>
-#include "lpc.h"
-#define NDEBUG
-#include <internal/debug.h>
-
-/* PRIVATE FUNCTIONS *********************************************************/
-
-VOID
-NTAPI
-LpcpPrepareToWakeClient(IN PETHREAD Thread)
-{
-    PAGED_CODE();
-
-    /* Make sure the thread isn't dying and it has a valid chain */
-    if (!(Thread->LpcExitThreadCalled) &&
-        !(IsListEmpty(&Thread->LpcReplyChain)))
-    {
-        /* Remove it from the list and reinitialize it */
-        RemoveEntryList(&Thread->LpcReplyChain);
-        InitializeListHead(&Thread->LpcReplyChain);
-    }
-}
-
-/* PUBLIC FUNCTIONS **********************************************************/
-
-/*
- * @implemented
- */
-NTSTATUS
-NTAPI
-NtAcceptConnectPort(OUT PHANDLE PortHandle,
-                    IN PVOID PortContext OPTIONAL,
-                    IN PPORT_MESSAGE ReplyMessage,
-                    IN BOOLEAN AcceptConnection,
-                    IN PPORT_VIEW ServerView,
-                    IN PREMOTE_PORT_VIEW ClientView)
-{
-    PLPCP_PORT_OBJECT ConnectionPort, ServerPort, ClientPort;
-    PVOID ClientSectionToMap = NULL;
-    HANDLE Handle;
-    KPROCESSOR_MODE PreviousMode = KeGetPreviousMode();
-    NTSTATUS Status;
-    ULONG ConnectionInfoLength;
-    PLPCP_MESSAGE Message;
-    PLPCP_CONNECTION_MESSAGE ConnectMessage;
-    PEPROCESS ClientProcess;
-    PETHREAD ClientThread;
-    LARGE_INTEGER SectionOffset;
-    PAGED_CODE();
-    LPCTRACE(LPC_COMPLETE_DEBUG,
-             "Context: %p. Message: %p. Accept: %lx. Views: %p/%p\n",
-             PortContext,
-             ReplyMessage,
-             AcceptConnection,
-             ClientView,
-             ServerView);
-
-    /* Validate the size of the server view */
-    if ((ServerView) && (ServerView->Length != sizeof(PORT_VIEW)))
-    {
-        /* Invalid size */
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    /* Validate the size of the client view */
-    if ((ClientView) && (ClientView->Length != sizeof(REMOTE_PORT_VIEW)))
-    {
-        /* Invalid size */
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    /* Get the client process and thread */
-    Status = PsLookupProcessThreadByCid(&ReplyMessage->ClientId,
-                                        &ClientProcess,
-                                        &ClientThread);
-    if (!NT_SUCCESS(Status)) return Status;
-
-    /* Acquire the LPC Lock */
-    KeAcquireGuardedMutex(&LpcpLock);
-
-    /* Make sure that the client wants a reply, and this is the right one */
-    if (!(ClientThread->LpcReplyMessage) ||
-        !(ReplyMessage->MessageId) ||
-        (ClientThread->LpcReplyMessageId != ReplyMessage->MessageId))
-    {
-        /* Not the reply asked for, or no reply wanted, fail */
-        KeReleaseGuardedMutex(&LpcpLock);
-        ObDereferenceObject(ClientProcess);
-        ObDereferenceObject(ClientThread);
-        return STATUS_REPLY_MESSAGE_MISMATCH;
-    }
-
-    /* Now get the message and connection message */
-    Message = ClientThread->LpcReplyMessage;
-    ConnectMessage = (PLPCP_CONNECTION_MESSAGE)(Message + 1);
-
-    /* Get the client and connection port as well */
-    ClientPort = ConnectMessage->ClientPort;
-    ConnectionPort = ClientPort->ConnectionPort;
-
-    /* Make sure that the reply is being sent to the proper server process */
-    if (ConnectionPort->ServerProcess != PsGetCurrentProcess())
-    {
-        /* It's not, so fail */
-        KeReleaseGuardedMutex(&LpcpLock);
-        ObDereferenceObject(ClientProcess);
-        ObDereferenceObject(ClientThread);
-        return STATUS_REPLY_MESSAGE_MISMATCH;
-    }
-
-    /* At this point, don't let other accept attempts happen */
-    ClientThread->LpcReplyMessage = NULL;
-    ClientThread->LpcReplyMessageId = 0;
-
-    /* Clear the client port for now as well, then release the lock */
-    ConnectMessage->ClientPort = NULL;
-    KeReleaseGuardedMutex(&LpcpLock);
-
-    /* Get the connection information length */
-    ConnectionInfoLength = ReplyMessage->u1.s1.DataLength;
-    if (ConnectionInfoLength > ConnectionPort->MaxConnectionInfoLength)
-    {
-        /* Normalize it since it's too large */
-        ConnectionInfoLength = ConnectionPort->MaxConnectionInfoLength;
-    }
-
-    /* Set the sizes of our reply message */
-    Message->Request.u1.s1.DataLength = sizeof(LPCP_CONNECTION_MESSAGE) +
-                                    ConnectionInfoLength;
-    Message->Request.u1.s1.TotalLength = sizeof(LPCP_MESSAGE) +
-                                     Message->Request.u1.s1.DataLength;
-
-    /* Setup the reply message */
-    Message->Request.u2.s2.Type = LPC_REPLY;
-    Message->Request.u2.s2.DataInfoOffset = 0;
-    Message->Request.ClientId = ReplyMessage->ClientId;
-    Message->Request.MessageId = ReplyMessage->MessageId;
-    Message->Request.ClientViewSize = 0;
-    RtlMoveMemory(ConnectMessage + 1, ReplyMessage + 1, ConnectionInfoLength);
-
-    /* At this point, if the caller refused the connection, go to cleanup */
-    if (!AcceptConnection) goto Cleanup;
-
-    /* Otherwise, create the actual port */
-    Status = ObCreateObject(PreviousMode,
-                            LpcPortObjectType,
-                            NULL,
-                            PreviousMode,
-                            NULL,
-                            sizeof(LPCP_PORT_OBJECT),
-                            0,
-                            0,
-                            (PVOID*)&ServerPort);
-    if (!NT_SUCCESS(Status)) goto Cleanup;
-
-    /* Set it up */
-    RtlZeroMemory(ServerPort, sizeof(LPCP_PORT_OBJECT));
-    ServerPort->PortContext = PortContext;
-    ServerPort->Flags = LPCP_COMMUNICATION_PORT;
-    ServerPort->MaxMessageLength = ConnectionPort->MaxMessageLength;
-    InitializeListHead(&ServerPort->LpcReplyChainHead);
-    InitializeListHead(&ServerPort->LpcDataInfoChainHead);
-
-    /* Reference the connection port until we're fully setup */
-    ObReferenceObject(ConnectionPort);
-
-    /* Link the ports together */
-    ServerPort->ConnectionPort = ConnectionPort;
-    ServerPort->ConnectedPort = ClientPort;
-    ClientPort->ConnectedPort = ServerPort;
-
-    /* Also set the creator CID */
-    ServerPort->Creator = PsGetCurrentThread()->Cid;
-    ClientPort->Creator = Message->Request.ClientId;
-
-    /* Get the section associated and then clear it, while inside the lock */
-    KeAcquireGuardedMutex(&LpcpLock);
-    ClientSectionToMap = ConnectMessage->SectionToMap;
-    ConnectMessage->SectionToMap = NULL;
-    KeReleaseGuardedMutex(&LpcpLock);
-
-    /* Now check if there's a client section */
-    if (ClientSectionToMap)
-    {
-        /* Setup the offset */
-        SectionOffset.QuadPart = ConnectMessage->ClientView.SectionOffset;
-
-        /* Map the section */
-        Status = MmMapViewOfSection(ClientSectionToMap,
-                                    PsGetCurrentProcess(),
-                                    &ServerPort->ClientSectionBase,
-                                    0,
-                                    0,
-                                    &SectionOffset,
-                                    &ConnectMessage->ClientView.ViewSize,
-                                    ViewUnmap,
-                                    0,
-                                    PAGE_READWRITE);
-
-        /* Update the offset and check for mapping status */
-        ConnectMessage->ClientView.SectionOffset = SectionOffset.LowPart;
-        if (NT_SUCCESS(Status))
-        {
-            /* Set the view base */
-            ConnectMessage->ClientView.ViewRemoteBase = ServerPort->
-                                                        ClientSectionBase;
-        }
-        else
-        {
-            /* Otherwise, quit */
-            ObDereferenceObject(ServerPort);
-            goto Cleanup;
-        }
-    }
-
-    /* Check if there's a server section */
-    if (ServerView)
-    {
-        /* FIXME: TODO */
-        ASSERT(FALSE);
-    }
-
-    /* Reference the server port until it's fully inserted */
-    ObReferenceObject(ServerPort);
-
-    /* Insert the server port in the namespace */
-    Status = ObInsertObject(ServerPort,
-                            NULL,
-                            PORT_ALL_ACCESS,
-                            0,
-                            NULL,
-                            &Handle);
-    if (!NT_SUCCESS(Status))
-    {
-        /* We failed, remove the extra reference and cleanup */
-        ObDereferenceObject(ServerPort);
-        goto Cleanup;
-    }
-
-    /* Check if the caller gave a client view */
-    if (ClientView)
-    {
-        /* Fill it out */
-        ClientView->ViewBase = ConnectMessage->ClientView.ViewRemoteBase;
-        ClientView->ViewSize = ConnectMessage->ClientView.ViewSize;
-    }
-
-    /* Return the handle to user mode */
-    *PortHandle = Handle;
-    LPCTRACE(LPC_COMPLETE_DEBUG,
-             "Handle: %lx. Messages: %p/%p. Ports: %p/%p/%p\n",
-             Handle,
-             Message,
-             ConnectMessage,
-             ServerPort,
-             ClientPort,
-             ConnectionPort);
-
-    /* If there was no port context, use the handle by default */
-    if (!PortContext) ServerPort->PortContext = Handle;
-    ServerPort->ClientThread = ClientThread;
-
-    /* Set this message as the LPC Reply message while holding the lock */
-    KeAcquireGuardedMutex(&LpcpLock);
-    ClientThread->LpcReplyMessage = Message;
-    KeReleaseGuardedMutex(&LpcpLock);
-
-    /* Clear the thread pointer so it doesn't get cleaned later */
-    ClientThread = NULL;
-
-    /* Remove the extra reference we had added */
-    ObDereferenceObject(ServerPort);
-
-Cleanup:
-    /* If there was a section, dereference it */
-    if (ClientSectionToMap) ObDereferenceObject(ClientSectionToMap);
-
-    /* Check if we got here while still having a client thread */
-    if (ClientThread)
-    {
-        /* FIXME: Complex cleanup code */
-        ASSERT(FALSE);
-    }
-
-    /* Dereference the client port if we have one, and the process */
-    LPCTRACE(LPC_COMPLETE_DEBUG,
-             "Status: %lx. Thread: %p. Process: [%.16s]\n",
-             Status,
-             ClientThread,
-             ClientProcess->ImageFileName);
-    if (ClientPort) ObDereferenceObject(ClientPort);
-    ObDereferenceObject(ClientProcess);
-    return Status;
-}
-
-/*
- * @implemented
- */
-NTSTATUS
-NTAPI
-NtCompleteConnectPort(IN HANDLE PortHandle)
-{
-    NTSTATUS Status;
-    PLPCP_PORT_OBJECT Port;
-    KPROCESSOR_MODE PreviousMode = KeGetPreviousMode();
-    PETHREAD Thread;
-    PAGED_CODE();
-    LPCTRACE(LPC_COMPLETE_DEBUG, "Handle: %lx\n", PortHandle);
-
-    /* Get the Port Object */
-    Status = ObReferenceObjectByHandle(PortHandle,
-                                       PORT_ALL_ACCESS,
-                                       LpcPortObjectType,
-                                       PreviousMode,
-                                       (PVOID*)&Port,
-                                       NULL);
-    if (!NT_SUCCESS(Status)) return Status;
-
-    /* Make sure this is a connection port */
-    if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_COMMUNICATION_PORT)
-    {
-        /* It isn't, fail */
-        ObDereferenceObject(Port);
-        return STATUS_INVALID_PORT_HANDLE;
-    }
-
-    /* Acquire the lock */
-    KeAcquireGuardedMutex(&LpcpLock);
-
-    /* Make sure we have a client thread */
-    if (!Port->ClientThread)
-    {
-        /* We don't, fail */
-        KeReleaseGuardedMutex(&LpcpLock);
-        ObDereferenceObject(Port);
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    /* Get the thread */
-    Thread = Port->ClientThread;
-
-    /* Make sure it has a reply message */
-    if (!Thread->LpcReplyMessage)
-    {
-        /* It doesn't, fail */
-        KeReleaseGuardedMutex(&LpcpLock);
-        ObDereferenceObject(Port);
-        return STATUS_PORT_DISCONNECTED;
-    }
-
-    /* Clear the client thread and wake it up */
-    Port->ClientThread = NULL;
-    LpcpPrepareToWakeClient(Thread);
-
-    /* Release the lock and wait for an answer */
-    KeReleaseGuardedMutex(&LpcpLock);
-    LpcpCompleteWait(&Thread->LpcReplySemaphore);
-
-    /* Dereference the Thread and Port  and return */
-    ObDereferenceObject(Port);
-    ObDereferenceObject(Thread);
-    LPCTRACE(LPC_COMPLETE_DEBUG, "Port: %p. Thread: %p\n", Port, Thread);
-    return Status;
-}
-
-/* EOF */
diff --git a/reactos/ntoskrnl/lpc/ntlpc/connect.c b/reactos/ntoskrnl/lpc/ntlpc/connect.c
deleted file mode 100644
index 2b9259ef588..00000000000
--- a/reactos/ntoskrnl/lpc/ntlpc/connect.c
+++ /dev/null
@@ -1,568 +0,0 @@
-/*
- * PROJECT:         ReactOS Kernel
- * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            ntoskrnl/lpc/connect.c
- * PURPOSE:         Local Procedure Call: Connection Management
- * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <ntoskrnl.h>
-#include "lpc.h"
-#define NDEBUG
-#include <internal/debug.h>
-
-/* PRIVATE FUNCTIONS *********************************************************/
-
-PVOID
-NTAPI
-LpcpFreeConMsg(IN OUT PLPCP_MESSAGE *Message,
-               IN OUT PLPCP_CONNECTION_MESSAGE *ConnectMessage,
-               IN PETHREAD CurrentThread)
-{
-    PVOID SectionToMap;
-
-    /* Acquire the LPC lock */
-    KeAcquireGuardedMutex(&LpcpLock);
-
-    /* Check if the reply chain is not empty */
-    if (!IsListEmpty(&CurrentThread->LpcReplyChain))
-    {
-        /* Remove this entry and re-initialize it */
-        RemoveEntryList(&CurrentThread->LpcReplyChain);
-        InitializeListHead(&CurrentThread->LpcReplyChain);
-    }
-
-    /* Check if there's a reply message */
-    if (CurrentThread->LpcReplyMessage)
-    {
-        /* Get the message */
-        *Message = CurrentThread->LpcReplyMessage;
-
-        /* Clear message data */
-        CurrentThread->LpcReceivedMessageId = 0;
-        CurrentThread->LpcReplyMessage = NULL;
-
-        /* Get the connection message and clear the section */
-        *ConnectMessage = (PLPCP_CONNECTION_MESSAGE)(*Message + 1);
-        SectionToMap = (*ConnectMessage)->SectionToMap;
-        (*ConnectMessage)->SectionToMap = NULL;
-    }
-    else
-    {
-        /* No message to return */
-        *Message = NULL;
-        SectionToMap = NULL;
-    }
-
-    /* Release the lock and return the section */
-    KeReleaseGuardedMutex(&LpcpLock);
-    return SectionToMap;
-}
-
-/* PUBLIC FUNCTIONS **********************************************************/
-
-/*
- * @implemented
- */
-NTSTATUS
-NTAPI
-NtSecureConnectPort(OUT PHANDLE PortHandle,
-                    IN PUNICODE_STRING PortName,
-                    IN PSECURITY_QUALITY_OF_SERVICE Qos,
-                    IN OUT PPORT_VIEW ClientView OPTIONAL,
-                    IN PSID ServerSid OPTIONAL,
-                    IN OUT PREMOTE_PORT_VIEW ServerView OPTIONAL,
-                    OUT PULONG MaxMessageLength OPTIONAL,
-                    IN OUT PVOID ConnectionInformation OPTIONAL,
-                    IN OUT PULONG ConnectionInformationLength OPTIONAL)
-{
-    ULONG ConnectionInfoLength = 0;
-    PLPCP_PORT_OBJECT Port, ClientPort;
-    KPROCESSOR_MODE PreviousMode = KeGetPreviousMode();
-    NTSTATUS Status = STATUS_SUCCESS;
-    HANDLE Handle;
-    PVOID SectionToMap;
-    PLPCP_MESSAGE Message;
-    PLPCP_CONNECTION_MESSAGE ConnectMessage;
-    PETHREAD Thread = PsGetCurrentThread();
-    ULONG PortMessageLength;
-    LARGE_INTEGER SectionOffset;
-    PTOKEN Token;
-    PTOKEN_USER TokenUserInfo;
-    PAGED_CODE();
-    LPCTRACE(LPC_CONNECT_DEBUG,
-             "Name: %wZ. Qos: %p. Views: %p/%p. Sid: %p\n",
-             PortName,
-             Qos,
-             ClientView,
-             ServerView,
-             ServerSid);
-
-    /* Validate client view */
-    if ((ClientView) && (ClientView->Length != sizeof(PORT_VIEW)))
-    {
-        /* Fail */
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    /* Validate server view */
-    if ((ServerView) && (ServerView->Length != sizeof(REMOTE_PORT_VIEW)))
-    {
-        /* Fail */
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    /* Check if caller sent connection information length */
-    if (ConnectionInformationLength)
-    {
-        /* Retrieve the input length */
-        ConnectionInfoLength = *ConnectionInformationLength;
-    }
-
-    /* Get the port */
-    Status = ObReferenceObjectByName(PortName,
-                                     0,
-                                     NULL,
-                                     PORT_ALL_ACCESS,
-                                     LpcPortObjectType,
-                                     PreviousMode,
-                                     NULL,
-                                     (PVOID *)&Port);
-    if (!NT_SUCCESS(Status)) return Status;
-
-    /* This has to be a connection port */
-    if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_CONNECTION_PORT)
-    {
-        /* It isn't, so fail */
-        ObDereferenceObject(Port);
-        return STATUS_INVALID_PORT_HANDLE;
-    }
-
-    /* Check if we have a SID */
-    if (ServerSid)
-    {
-        /* Make sure that we have a server */
-        if (Port->ServerProcess)
-        {
-            /* Get its token and query user information */
-            Token = PsReferencePrimaryToken(Port->ServerProcess);
-            //Status = SeQueryInformationToken(Token, TokenUser, (PVOID*)&TokenUserInfo);
-            // FIXME: Need SeQueryInformationToken
-            Status = STATUS_SUCCESS;
-            TokenUserInfo = ExAllocatePool(PagedPool, sizeof(TOKEN_USER));
-            TokenUserInfo->User.Sid = ServerSid;
-            PsDereferencePrimaryToken(Token);
-
-            /* Check for success */
-            if (NT_SUCCESS(Status))
-            {
-                /* Compare the SIDs */
-                if (!RtlEqualSid(ServerSid, TokenUserInfo->User.Sid))
-                {
-                    /* Fail */
-                    Status = STATUS_SERVER_SID_MISMATCH;
-                }
-
-                /* Free token information */
-                ExFreePool(TokenUserInfo);
-            }
-        }
-        else
-        {
-            /* Invalid SID */
-            Status = STATUS_SERVER_SID_MISMATCH;
-        }
-
-        /* Check if SID failed */
-        if (!NT_SUCCESS(Status))
-        {
-            /* Quit */
-            ObDereferenceObject(Port);
-            return Status;
-        }
-    }
-
-    /* Create the client port */
-    Status = ObCreateObject(PreviousMode,
-                            LpcPortObjectType,
-                            NULL,
-                            PreviousMode,
-                            NULL,
-                            sizeof(LPCP_PORT_OBJECT),
-                            0,
-                            0,
-                            (PVOID *)&ClientPort);
-    if (!NT_SUCCESS(Status))
-    {
-        /* Failed, dereference the server port and return */
-        ObDereferenceObject(Port);
-        return Status;
-    }
-
-    /* Setup the client port */
-    RtlZeroMemory(ClientPort, sizeof(LPCP_PORT_OBJECT));
-    ClientPort->Flags = LPCP_CLIENT_PORT;
-    ClientPort->ConnectionPort = Port;
-    ClientPort->MaxMessageLength = Port->MaxMessageLength;
-    ClientPort->SecurityQos = *Qos;
-    InitializeListHead(&ClientPort->LpcReplyChainHead);
-    InitializeListHead(&ClientPort->LpcDataInfoChainHead);
-
-    /* Check if we have dynamic security */
-    if (Qos->ContextTrackingMode == SECURITY_DYNAMIC_TRACKING)
-    {
-        /* Remember that */
-        ClientPort->Flags |= LPCP_SECURITY_DYNAMIC;
-    }
-    else
-    {
-        /* Create our own client security */
-        Status = SeCreateClientSecurity(Thread,
-                                        Qos,
-                                        FALSE,
-                                        &ClientPort->StaticSecurity);
-        if (!NT_SUCCESS(Status))
-        {
-            /* Security failed, dereference and return */
-            ObDereferenceObject(ClientPort);
-            return Status;
-        }
-    }
-
-    /* Initialize the port queue */
-    Status = LpcpInitializePortQueue(ClientPort);
-    if (!NT_SUCCESS(Status))
-    {
-        /* Failed */
-        ObDereferenceObject(ClientPort);
-        return Status;
-    }
-
-    /* Check if we have a client view */
-    if (ClientView)
-    {
-        /* Get the section handle */
-        Status = ObReferenceObjectByHandle(ClientView->SectionHandle,
-                                           SECTION_MAP_READ |
-                                           SECTION_MAP_WRITE,
-                                           MmSectionObjectType,
-                                           PreviousMode,
-                                           (PVOID*)&SectionToMap,
-                                           NULL);
-        if (!NT_SUCCESS(Status))
-        {
-            /* Fail */
-            ObDereferenceObject(Port);
-            return Status;
-        }
-
-        /* Set the section offset */
-        SectionOffset.QuadPart = ClientView->SectionOffset;
-
-        /* Map it */
-        Status = MmMapViewOfSection(SectionToMap,
-                                    PsGetCurrentProcess(),
-                                    &Port->ClientSectionBase,
-                                    0,
-                                    0,
-                                    &SectionOffset,
-                                    &ClientView->ViewSize,
-                                    ViewUnmap,
-                                    0,
-                                    PAGE_READWRITE);
-
-        /* Update the offset */
-        ClientView->SectionOffset = SectionOffset.LowPart;
-
-        /* Check for failure */
-        if (!NT_SUCCESS(Status))
-        {
-            /* Fail */
-            ObDereferenceObject(SectionToMap);
-            ObDereferenceObject(Port);
-            return Status;
-        }
-
-        /* Update the base */
-        ClientView->ViewBase = Port->ClientSectionBase;
-    }
-    else
-    {
-        /* No section */
-        SectionToMap = NULL;
-    }
-
-    /* Normalize connection information */
-    if (ConnectionInfoLength > Port->MaxConnectionInfoLength)
-    {
-        /* Use the port's maximum allowed value */
-        ConnectionInfoLength = Port->MaxConnectionInfoLength;
-    }
-
-    /* Allocate a message from the port zone */
-    Message = LpcpAllocateFromPortZone();
-    if (!Message)
-    {
-        /* Fail if we couldn't allocate a message */
-        if (SectionToMap) ObDereferenceObject(SectionToMap);
-        ObDereferenceObject(ClientPort);
-        return STATUS_NO_MEMORY;
-    }
-
-    /* Set pointer to the connection message and fill in the CID */
-    ConnectMessage = (PLPCP_CONNECTION_MESSAGE)(Message + 1);
-    Message->Request.ClientId = Thread->Cid;
-
-    /* Check if we have a client view */
-    if (ClientView)
-    {
-        /* Set the view size */
-        Message->Request.ClientViewSize = ClientView->ViewSize;
-
-        /* Copy the client view and clear the server view */
-        RtlMoveMemory(&ConnectMessage->ClientView,
-                      ClientView,
-                      sizeof(PORT_VIEW));
-        RtlZeroMemory(&ConnectMessage->ServerView, sizeof(REMOTE_PORT_VIEW));
-    }
-    else
-    {
-        /* Set the size to 0 and clear the connect message */
-        Message->Request.ClientViewSize = 0;
-        RtlZeroMemory(ConnectMessage, sizeof(LPCP_CONNECTION_MESSAGE));
-    }
-
-    /* Set the section and client port. Port is NULL for now */
-    ConnectMessage->ClientPort = NULL;
-    ConnectMessage->SectionToMap = SectionToMap;
-
-    /* Set the data for the connection request message */
-    Message->Request.u1.s1.DataLength = sizeof(LPCP_CONNECTION_MESSAGE) +
-                                        ConnectionInfoLength;
-    Message->Request.u1.s1.TotalLength = sizeof(LPCP_MESSAGE) +
-                                         Message->Request.u1.s1.DataLength;
-    Message->Request.u2.s2.Type = LPC_CONNECTION_REQUEST;
-
-    /* Check if we have connection information */
-    if (ConnectionInformation)
-    {
-        /* Copy it in */
-        RtlMoveMemory(ConnectMessage + 1,
-                      ConnectionInformation,
-                      ConnectionInfoLength);
-    }
-
-    /* Acquire the port lock */
-    KeAcquireGuardedMutex(&LpcpLock);
-
-    /* Check if someone already deleted the port name */
-    if (Port->Flags & LPCP_NAME_DELETED)
-    {
-        /* Fail the request */
-        KeReleaseGuardedMutex(&LpcpLock);
-        Status = STATUS_OBJECT_NAME_NOT_FOUND;
-        goto Cleanup;
-    }
-
-    /* Associate no thread yet */
-    Message->RepliedToThread = NULL;
-
-    /* Generate the Message ID and set it */
-    Message->Request.MessageId =  LpcpNextMessageId++;
-    if (!LpcpNextMessageId) LpcpNextMessageId = 1;
-    Thread->LpcReplyMessageId = Message->Request.MessageId;
-
-    /* Insert the message into the queue and thread chain */
-    InsertTailList(&Port->MsgQueue.ReceiveHead, &Message->Entry);
-    InsertTailList(&Port->LpcReplyChainHead, &Thread->LpcReplyChain);
-    Thread->LpcReplyMessage = Message;
-
-    /* Now we can finally reference the client port and link it*/
-    ObReferenceObject(ClientPort);
-    ConnectMessage->ClientPort = ClientPort;
-
-    /* Release the lock */
-    KeReleaseGuardedMutex(&LpcpLock);
-    LPCTRACE(LPC_CONNECT_DEBUG,
-             "Messages: %p/%p. Ports: %p/%p. Status: %lx\n",
-             Message,
-             ConnectMessage,
-             Port,
-             ClientPort,
-             Status);
-
-    /* If this is a waitable port, set the event */
-    if (Port->Flags & LPCP_WAITABLE_PORT) KeSetEvent(&Port->WaitEvent,
-                                                     1,
-                                                     FALSE);
-
-    /* Release the queue semaphore */
-    LpcpCompleteWait(Port->MsgQueue.Semaphore);
-
-    /* Now wait for a reply */
-    LpcpConnectWait(&Thread->LpcReplySemaphore, PreviousMode);
-
-    /* Check if our wait ended in success */
-    if (Status != STATUS_SUCCESS) goto Cleanup;
-
-    /* Free the connection message */
-    SectionToMap = LpcpFreeConMsg(&Message, &ConnectMessage, Thread);
-
-    /* Check if we got a message back */
-    if (Message)
-    {
-        /* Check for new return length */
-        if ((Message->Request.u1.s1.DataLength -
-             sizeof(LPCP_CONNECTION_MESSAGE)) < ConnectionInfoLength)
-        {
-            /* Set new normalized connection length */
-            ConnectionInfoLength = Message->Request.u1.s1.DataLength -
-                                   sizeof(LPCP_CONNECTION_MESSAGE);
-        }
-
-        /* Check if we had connection information */
-        if (ConnectionInformation)
-        {
-            /* Check if we had a length pointer */
-            if (ConnectionInformationLength)
-            {
-                /* Return the length */
-                *ConnectionInformationLength = ConnectionInfoLength;
-            }
-
-            /* Return the connection information */
-            RtlMoveMemory(ConnectionInformation,
-                          ConnectMessage + 1,
-                          ConnectionInfoLength );
-        }
-
-        /* Make sure we had a connected port */
-        if (ClientPort->ConnectedPort)
-        {
-            /* Get the message length before the port might get killed */
-            PortMessageLength = Port->MaxMessageLength;
-
-            /* Insert the client port */
-            Status = ObInsertObject(ClientPort,
-                                    NULL,
-                                    PORT_ALL_ACCESS,
-                                    0,
-                                    (PVOID *)NULL,
-                                    &Handle);
-            if (NT_SUCCESS(Status))
-            {
-                /* Return the handle */
-                *PortHandle = Handle;
-                LPCTRACE(LPC_CONNECT_DEBUG,
-                         "Handle: %lx. Length: %lx\n",
-                         Handle,
-                         PortMessageLength);
-
-                /* Check if maximum length was requested */
-                if (MaxMessageLength) *MaxMessageLength = PortMessageLength;
-
-                /* Check if we had a client view */
-                if (ClientView)
-                {
-                    /* Copy it back */
-                    RtlMoveMemory(ClientView,
-                                  &ConnectMessage->ClientView,
-                                  sizeof(PORT_VIEW));
-                }
-
-                /* Check if we had a server view */
-                if (ServerView)
-                {
-                    /* Copy it back */
-                    RtlMoveMemory(ServerView,
-                                  &ConnectMessage->ServerView,
-                                  sizeof(REMOTE_PORT_VIEW));
-                }
-            }
-        }
-        else
-        {
-            /* No connection port, we failed */
-            if (SectionToMap) ObDereferenceObject(SectionToMap);
-
-            /* Check if it's because the name got deleted */
-            if (Port->Flags & LPCP_NAME_DELETED)
-            {
-                /* Set the correct status */
-                Status = STATUS_OBJECT_NAME_NOT_FOUND;
-            }
-            else
-            {
-                /* Otherwise, the caller refused us */
-                Status = STATUS_PORT_CONNECTION_REFUSED;
-            }
-
-            /* Kill the port */
-            ObDereferenceObject(ClientPort);
-        }
-
-        /* Free the message */
-        LpcpFreeToPortZone(Message, FALSE);
-        return Status;
-    }
-
-    /* No reply message, fail */
-    if (SectionToMap) ObDereferenceObject(SectionToMap);
-    ObDereferenceObject(ClientPort);
-    return STATUS_PORT_CONNECTION_REFUSED;
-
-Cleanup:
-    /* We failed, free the message */
-    SectionToMap = LpcpFreeConMsg(&Message, &ConnectMessage, Thread);
-
-    /* Check if the semaphore got signaled */
-    if (KeReadStateSemaphore(&Thread->LpcReplySemaphore))
-    {
-        /* Wait on it */
-        KeWaitForSingleObject(&Thread->LpcReplySemaphore,
-                              KernelMode,
-                              Executive,
-                              FALSE,
-                              NULL);
-    }
-
-    /* Check if we had a message and free it */
-    if (Message) LpcpFreeToPortZone(Message, FALSE);
-
-    /* Dereference other objects */
-    if (SectionToMap) ObDereferenceObject(SectionToMap);
-    ObDereferenceObject(ClientPort);
-
-    /* Return status */
-    return Status;
-}
-
-/*
- * @implemented
- */
-NTSTATUS
-NTAPI
-NtConnectPort(OUT PHANDLE PortHandle,
-              IN PUNICODE_STRING PortName,
-              IN PSECURITY_QUALITY_OF_SERVICE Qos,
-              IN PPORT_VIEW ClientView,
-              IN PREMOTE_PORT_VIEW ServerView,
-              OUT PULONG MaxMessageLength,
-              IN PVOID ConnectionInformation,
-              OUT PULONG ConnectionInformationLength)
-{
-    /* Call the newer API */
-    return NtSecureConnectPort(PortHandle,
-                               PortName,
-                               Qos,
-                               ClientView,
-                               NULL,
-                               ServerView,
-                               MaxMessageLength,
-                               ConnectionInformation,
-                               ConnectionInformationLength);
-}
-
-/* EOF */
diff --git a/reactos/ntoskrnl/lpc/ntlpc/create.c b/reactos/ntoskrnl/lpc/ntlpc/create.c
deleted file mode 100644
index 2bf08c13e11..00000000000
--- a/reactos/ntoskrnl/lpc/ntlpc/create.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * PROJECT:         ReactOS Kernel
- * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            ntoskrnl/lpc/create.c
- * PURPOSE:         Local Procedure Call: Port/Queue/Message Creation
- * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <ntoskrnl.h>
-#include "lpc.h"
-#define NDEBUG
-#include <internal/debug.h>
-
-/* PRIVATE FUNCTIONS *********************************************************/
-
-NTSTATUS
-NTAPI
-LpcpInitializePortQueue(IN PLPCP_PORT_OBJECT Port)
-{
-    PLPCP_NONPAGED_PORT_QUEUE MessageQueue;
-
-    /* Allocate the queue */
-    MessageQueue = ExAllocatePoolWithTag(NonPagedPool,
-                                         sizeof(LPCP_NONPAGED_PORT_QUEUE),
-                                         TAG('P', 'o', 'r', 't'));
-    if (!MessageQueue) return STATUS_INSUFFICIENT_RESOURCES;
-
-    /* Set it up */
-    KeInitializeSemaphore(&MessageQueue->Semaphore, 0, MAXLONG);
-    MessageQueue->BackPointer = Port;
-
-    /* And link it with the Paged Pool part */
-    Port->MsgQueue.Semaphore = &MessageQueue->Semaphore;
-    InitializeListHead(&Port->MsgQueue.ReceiveHead);
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS
-NTAPI
-LpcpCreatePort(OUT PHANDLE PortHandle,
-               IN POBJECT_ATTRIBUTES ObjectAttributes,
-               IN ULONG MaxConnectionInfoLength,
-               IN ULONG MaxMessageLength,
-               IN ULONG MaxPoolUsage,
-               IN BOOLEAN Waitable)
-{
-    KPROCESSOR_MODE PreviousMode = KeGetPreviousMode();
-    NTSTATUS Status;
-    PLPCP_PORT_OBJECT Port;
-    LPCTRACE(LPC_CREATE_DEBUG, "Name: %wZ\n", ObjectAttributes->ObjectName);
-
-    /* Create the Object */
-    Status = ObCreateObject(PreviousMode,
-                            LpcPortObjectType,
-                            ObjectAttributes,
-                            PreviousMode,
-                            NULL,
-                            sizeof(LPCP_PORT_OBJECT),
-                            0,
-                            0,
-                            (PVOID*)&Port);
-    if (!NT_SUCCESS(Status)) return Status;
-
-    /* Set up the Object */
-    RtlZeroMemory(Port, sizeof(LPCP_PORT_OBJECT));
-    Port->ConnectionPort = Port;
-    Port->Creator = PsGetCurrentThread()->Cid;
-    InitializeListHead(&Port->LpcDataInfoChainHead);
-    InitializeListHead(&Port->LpcReplyChainHead);
-
-    /* Check if we don't have a name */
-    if (!ObjectAttributes->ObjectName->Buffer)
-    {
-        /* Set up for an unconnected port */
-        Port->Flags = LPCP_UNCONNECTED_PORT;
-        Port->ConnectedPort = Port;
-        Port->ServerProcess = NULL;
-    }
-    else
-    {
-        /* Set up for a named connection port */
-        Port->Flags = LPCP_CONNECTION_PORT;
-        Port->ServerProcess = PsGetCurrentProcess();
-
-        /* Don't let the process die on us */
-        ObReferenceObject(Port->ServerProcess);
-    }
-
-    /* Check if this is a waitable port */
-    if (Waitable) Port->Flags |= LPCP_WAITABLE_PORT;
-
-    /* Setup the port queue */
-    Status = LpcpInitializePortQueue(Port);
-    if (!NT_SUCCESS(Status))
-    {
-        /* Fail */
-        ObDereferenceObject(Port);
-        return Status;
-    }
-
-    /* Check if this is a waitable port */
-    if (Port->Flags & LPCP_WAITABLE_PORT)
-    {
-        /* Setup the wait event */
-        KeInitializeEvent(&Port->WaitEvent, NotificationEvent, FALSE);
-    }
-
-    /* Set the maximum message size allowed */
-    Port->MaxMessageLength = LpcpMaxMessageSize -
-                             FIELD_OFFSET(LPCP_MESSAGE, Request);
-
-    /* Now subtract the actual message structures and get the data size */
-    Port->MaxConnectionInfoLength = Port->MaxMessageLength -
-                                    sizeof(PORT_MESSAGE) -
-                                    sizeof(LPCP_CONNECTION_MESSAGE);
-
-    /* Validate the sizes */
-    if (Port->MaxConnectionInfoLength < MaxConnectionInfoLength)
-    {
-        /* Not enough space for your request */
-        ObDereferenceObject(Port);
-        return STATUS_INVALID_PARAMETER_3;
-    }
-    else if (Port->MaxMessageLength < MaxMessageLength)
-    {
-        /* Not enough space for your request */
-        ObDereferenceObject(Port);
-        return STATUS_INVALID_PARAMETER_4;
-    }
-
-    /* Now set the custom setting */
-    Port->MaxMessageLength = MaxMessageLength;
-
-    /* Insert it now */
-    Status = ObInsertObject((PVOID)Port,
-                            NULL,
-                            PORT_ALL_ACCESS,
-                            0,
-                            NULL,
-                            PortHandle);
-
-    /* Return success or the error */
-    LPCTRACE(LPC_CREATE_DEBUG, "Port: %p. Handle: %lx\n", Port, *PortHandle);
-    return Status;
-}
-
-/* PUBLIC FUNCTIONS **********************************************************/
-
-/*
- * @implemented
- */
-NTSTATUS
-NTAPI
-NtCreatePort(OUT PHANDLE PortHandle,
-             IN POBJECT_ATTRIBUTES ObjectAttributes,
-             IN ULONG MaxConnectInfoLength,
-             IN ULONG MaxDataLength,
-             IN ULONG MaxPoolUsage)
-{
-    PAGED_CODE();
-
-    /* Call the internal API */
-    return LpcpCreatePort(PortHandle,
-                          ObjectAttributes,
-                          MaxConnectInfoLength,
-                          MaxDataLength,
-                          MaxPoolUsage,
-                          FALSE);
-}
-
-/*
- * @implemented
- */
-NTSTATUS
-NTAPI
-NtCreateWaitablePort(OUT PHANDLE PortHandle,
-                     IN POBJECT_ATTRIBUTES ObjectAttributes,
-                     IN ULONG MaxConnectInfoLength,
-                     IN ULONG MaxDataLength,
-                     IN ULONG MaxPoolUsage)
-{
-    PAGED_CODE();
-
-    /* Call the internal API */
-    return LpcpCreatePort(PortHandle,
-                          ObjectAttributes,
-                          MaxConnectInfoLength,
-                          MaxDataLength,
-                          MaxPoolUsage,
-                          TRUE);
-}
-
-/* EOF */
diff --git a/reactos/ntoskrnl/lpc/ntlpc/listen.c b/reactos/ntoskrnl/lpc/ntlpc/listen.c
deleted file mode 100644
index ee2ade0c03d..00000000000
--- a/reactos/ntoskrnl/lpc/ntlpc/listen.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * PROJECT:         ReactOS Kernel
- * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            ntoskrnl/lpc/listen.c
- * PURPOSE:         Local Procedure Call: Listening
- * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <ntoskrnl.h>
-#include "lpc.h"
-#define NDEBUG
-#include <internal/debug.h>
-
-/* PUBLIC FUNCTIONS **********************************************************/
-
-/*
- * @implemented
- */
-NTSTATUS
-NTAPI
-NtListenPort(IN HANDLE PortHandle,
-             OUT PPORT_MESSAGE ConnectMessage)
-{
-        NTSTATUS Status;
-        PAGED_CODE();
-        LPCTRACE(LPC_LISTEN_DEBUG, "Handle: %lx\n", PortHandle);
-
-        /* Wait forever for a connection request. */
-        for (;;)
-        {
-            /* Do the wait */
-            Status = NtReplyWaitReceivePort(PortHandle,
-                                            NULL,
-                                            NULL,
-                                            ConnectMessage);
-
-            /* Accept only LPC_CONNECTION_REQUEST requests. */
-            if ((Status != STATUS_SUCCESS) ||
-                (LpcpGetMessageType(ConnectMessage) == LPC_CONNECTION_REQUEST))
-            {
-                /* Break out */
-                break;
-            }
-        }
-
-        /* Return status */
-        return Status;
-}
-
-
-/* EOF */
diff --git a/reactos/ntoskrnl/lpc/ntlpc/lpc.h b/reactos/ntoskrnl/lpc/ntlpc/lpc.h
deleted file mode 100644
index 5570e81c6dc..00000000000
--- a/reactos/ntoskrnl/lpc/ntlpc/lpc.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-* PROJECT:         ReactOS Kernel
-* LICENSE:         GPL - See COPYING in the top level directory
-* FILE:            ntoskrnl/include/lpc.h
-* PURPOSE:         Internal header for the Local Procedure Call
-* PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
-*/
-
-//
-// Define this if you want debugging support
-//
-#define _LPC_DEBUG_                                         0x01
-
-//
-// These define the Debug Masks Supported
-//
-#define LPC_CREATE_DEBUG                                    0x01
-#define LPC_CLOSE_DEBUG                                     0x02
-#define LPC_CONNECT_DEBUG                                   0x04
-#define LPC_LISTEN_DEBUG                                    0x08
-#define LPC_REPLY_DEBUG                                     0x10
-#define LPC_COMPLETE_DEBUG                                  0x20
-#define LPC_SEND_DEBUG                                      0x40
-
-//
-// Debug/Tracing support
-//
-#if _LPC_DEBUG_
-#ifdef NEW_DEBUG_SYSTEM_IMPLEMENTED // enable when Debug Filters are implemented
-#define LPCTRACE(x, ...)                                    \
-    {                                                       \
-        DbgPrintEx("%s [%.16s] - ",                         \
-                   __FUNCTION__,                            \
-                   PsGetCurrentProcess()->ImageFileName);   \
-        DbgPrintEx(__VA_ARGS__);                            \
-    }
-#else
-#define LPCTRACE(x, ...)                                    \
-    if (x & LpcpTraceLevel)                                 \
-    {                                                       \
-        DbgPrint("%s [%.16s:%lx] - ",                       \
-                 __FUNCTION__,                              \
-                 PsGetCurrentProcess()->ImageFileName,      \
-                 PsGetCurrentThreadId());                   \
-        DbgPrint(__VA_ARGS__);                              \
-    }
-#endif
-#endif
-
-//
-// Internal Port Management
-//
-VOID
-NTAPI
-LpcpClosePort(
-    IN PEPROCESS Process OPTIONAL,
-    IN PVOID Object,
-    IN ACCESS_MASK GrantedAccess,
-    IN ULONG ProcessHandleCount,
-    IN ULONG SystemHandleCount
-);
-
-VOID
-NTAPI
-LpcpDeletePort(
-    IN PVOID ObjectBody
-);
-
-NTSTATUS
-NTAPI
-LpcpInitializePortQueue(
-    IN PLPCP_PORT_OBJECT Port
-);
-
-VOID
-NTAPI
-LpcpFreeToPortZone(
-    IN PLPCP_MESSAGE Message,
-    IN ULONG Flags
-);
-
-VOID
-NTAPI
-LpcpMoveMessage(
-    IN PPORT_MESSAGE Destination,
-    IN PPORT_MESSAGE Origin,
-    IN PVOID Data,
-    IN ULONG MessageType,
-    IN PCLIENT_ID ClientId
-);
-
-VOID
-NTAPI
-LpcpSaveDataInfoMessage(
-    IN PLPCP_PORT_OBJECT Port,
-    IN PLPCP_MESSAGE Message
-);
-
-//
-// Module-external utlity functions
-//
-VOID
-NTAPI
-LpcExitThread(
-    IN PETHREAD Thread
-);
-
-//
-// Initialization functions
-//
-NTSTATUS
-NTAPI
-LpcpInitSystem(
-    VOID
-);
-
-//
-// Global data inside the Process Manager
-//
-extern POBJECT_TYPE LpcPortObjectType;
-extern ULONG LpcpNextMessageId, LpcpNextCallbackId;
-extern KGUARDED_MUTEX LpcpLock;
-extern PAGED_LOOKASIDE_LIST LpcpMessagesLookaside;
-extern ULONG LpcpMaxMessageSize;
-extern ULONG LpcpTraceLevel;
-
-//
-// Inlined Functions
-//
-#include "lpc_x.h"
diff --git a/reactos/ntoskrnl/lpc/ntlpc/port.c b/reactos/ntoskrnl/lpc/ntlpc/port.c
deleted file mode 100644
index dcc5a979d44..00000000000
--- a/reactos/ntoskrnl/lpc/ntlpc/port.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * PROJECT:         ReactOS Kernel
- * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            ntoskrnl/lpc/port.c
- * PURPOSE:         Local Procedure Call: Port Management
- * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <ntoskrnl.h>
-#include "lpc.h"
-#define NDEBUG
-#include <internal/debug.h>
-
-/* GLOBALS *******************************************************************/
-
-POBJECT_TYPE LpcPortObjectType;
-ULONG LpcpMaxMessageSize;
-PAGED_LOOKASIDE_LIST LpcpMessagesLookaside;
-KGUARDED_MUTEX LpcpLock;
-ULONG LpcpTraceLevel = LPC_CLOSE_DEBUG;
-ULONG LpcpNextMessageId = 1, LpcpNextCallbackId = 1;
-
-static GENERIC_MAPPING LpcpPortMapping = 
-{
-    STANDARD_RIGHTS_READ,
-    STANDARD_RIGHTS_WRITE,
-    0,
-    PORT_ALL_ACCESS
-};
-
-/* PRIVATE FUNCTIONS *********************************************************/
-
-NTSTATUS
-INIT_FUNCTION
-NTAPI
-LpcpInitSystem(VOID)
-{
-    OBJECT_TYPE_INITIALIZER ObjectTypeInitializer;
-    UNICODE_STRING Name;
-
-    /* Setup the LPC Lock */
-    KeInitializeGuardedMutex(&LpcpLock);
-
-    /* Create the Port Object Type */
-    RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer));
-    RtlInitUnicodeString(&Name, L"Port");
-    ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer);
-    ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(LPCP_PORT_OBJECT);
-    ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(LPCP_NONPAGED_PORT_QUEUE);
-    ObjectTypeInitializer.GenericMapping = LpcpPortMapping;
-    ObjectTypeInitializer.PoolType = PagedPool;
-    ObjectTypeInitializer.UseDefaultObject = TRUE;
-    ObjectTypeInitializer.CloseProcedure = LpcpClosePort;
-    ObjectTypeInitializer.DeleteProcedure = LpcpDeletePort;
-    ObjectTypeInitializer.ValidAccessMask = PORT_ALL_ACCESS;
-    ObjectTypeInitializer.MaintainTypeList = TRUE;
-    ObCreateObjectType(&Name,
-                       &ObjectTypeInitializer,
-                       NULL,
-                       &LpcPortObjectType);
-
-    /* Allocate the LPC lookaside list */
-    LpcpMaxMessageSize = LPCP_MAX_MESSAGE_SIZE;
-    ExInitializePagedLookasideList(&LpcpMessagesLookaside,
-                                   NULL,
-                                   NULL,
-                                   0,
-                                   LpcpMaxMessageSize,
-                                   TAG('L', 'p', 'c', 'M'),
-                                   32);
-
-    /* We're done */
-    return STATUS_SUCCESS;
-}
-
-/* PUBLIC FUNCTIONS **********************************************************/
-
-NTSTATUS
-NTAPI
-NtImpersonateClientOfPort(IN HANDLE PortHandle,
-                          IN PPORT_MESSAGE ClientMessage)
-{
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
-}
-
-NTSTATUS
-NTAPI
-NtQueryPortInformationProcess(VOID)
-{
-    /* This is all this function does */
-    return STATUS_UNSUCCESSFUL;
-}
-
-NTSTATUS
-NTAPI
-NtQueryInformationPort(IN HANDLE PortHandle,
-                       IN PORT_INFORMATION_CLASS PortInformationClass,
-                       OUT PVOID PortInformation,
-                       IN ULONG PortInformationLength,
-                       OUT PULONG ReturnLength)
-{
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
-}
-
-/* EOF */
diff --git a/reactos/ntoskrnl/lpc/ntlpc/reply.c b/reactos/ntoskrnl/lpc/ntlpc/reply.c
deleted file mode 100644
index 311002eb2eb..00000000000
--- a/reactos/ntoskrnl/lpc/ntlpc/reply.c
+++ /dev/null
@@ -1,491 +0,0 @@
-/*
- * PROJECT:         ReactOS Kernel
- * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            ntoskrnl/lpc/reply.c
- * PURPOSE:         Local Procedure Call: Receive (Replies)
- * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <ntoskrnl.h>
-#include "lpc.h"
-#define NDEBUG
-#include <internal/debug.h>
-
-/* PRIVATE FUNCTIONS *********************************************************/
-
-VOID
-NTAPI
-LpcpFreeDataInfoMessage(IN PLPCP_PORT_OBJECT Port,
-                        IN ULONG MessageId,
-                        IN ULONG CallbackId)
-{
-    PLPCP_MESSAGE Message;
-    PLIST_ENTRY ListHead, NextEntry;
-
-    /* Check if the port we want is the connection port */
-    if ((Port->Flags & LPCP_PORT_TYPE_MASK) > LPCP_UNCONNECTED_PORT)
-    {
-        /* Use it */
-        Port = Port->ConnectionPort;
-    }
-
-    /* Loop the list */
-    ListHead = &Port->LpcDataInfoChainHead;
-    NextEntry = ListHead->Flink;
-    while (ListHead != NextEntry)
-    {
-        /* Get the message */
-        Message = CONTAINING_RECORD(NextEntry, LPCP_MESSAGE, Entry);
-
-        /* Make sure it matches */
-        if ((Message->Request.MessageId == MessageId) &&
-            (Message->Request.CallbackId == CallbackId))
-        {
-            /* Unlink and free it */
-            RemoveEntryList(&Message->Entry);
-            InitializeListHead(&Message->Entry);
-            LpcpFreeToPortZone(Message, TRUE);
-            break;
-        }
-
-        /* Go to the next entry */
-        NextEntry = NextEntry->Flink;
-    }
-}
-
-VOID
-NTAPI
-LpcpSaveDataInfoMessage(IN PLPCP_PORT_OBJECT Port,
-                        IN PLPCP_MESSAGE Message)
-{
-    PAGED_CODE();
-
-    /* Acquire the lock */
-    KeAcquireGuardedMutex(&LpcpLock);
-
-    /* Check if the port we want is the connection port */
-    if ((Port->Flags & LPCP_PORT_TYPE_MASK) > LPCP_UNCONNECTED_PORT)
-    {
-        /* Use it */
-        Port = Port->ConnectionPort;
-    }
-
-    /* Link the message */
-    InsertTailList(&Port->LpcDataInfoChainHead, &Message->Entry);
-
-    /* Release the lock */
-    KeReleaseGuardedMutex(&LpcpLock);
-}
-
-VOID
-NTAPI
-LpcpMoveMessage(IN PPORT_MESSAGE Destination,
-                IN PPORT_MESSAGE Origin,
-                IN PVOID Data,
-                IN ULONG MessageType,
-                IN PCLIENT_ID ClientId)
-{
-    /* Set the Message size */
-    LPCTRACE((LPC_REPLY_DEBUG | LPC_SEND_DEBUG),
-             "Destination/Origin: %p/%p. Data: %p. Length: %lx\n",
-             Destination,
-             Origin,
-             Data,
-             Origin->u1.Length);
-    Destination->u1.Length = Origin->u1.Length;
-
-    /* Set the Message Type */
-    Destination->u2.s2.Type = !MessageType ?
-                              Origin->u2.s2.Type : MessageType & 0xFFFF;
-
-    /* Check if we have a Client ID */
-    if (ClientId)
-    {
-        /* Set the Client ID */
-        Destination->ClientId.UniqueProcess = ClientId->UniqueProcess;
-        Destination->ClientId.UniqueThread = ClientId->UniqueThread;
-    }
-    else
-    {
-        /* Otherwise, copy it */
-        Destination->ClientId.UniqueProcess = Origin->ClientId.UniqueProcess;
-        Destination->ClientId.UniqueThread = Origin->ClientId.UniqueThread;
-    }
-
-    /* Copy the MessageId and ClientViewSize */
-    Destination->MessageId = Origin->MessageId;
-    Destination->ClientViewSize = Origin->ClientViewSize;
-
-    /* Copy the Message Data */
-    RtlMoveMemory(Destination + 1,
-                  Data,
-                  ((Destination->u1.Length & 0xFFFF) + 3) &~3);
-}
-
-/* PUBLIC FUNCTIONS **********************************************************/
-
-/*
- * @unimplemented
- */
-NTSTATUS
-NTAPI
-NtReplyPort(IN HANDLE PortHandle,
-            IN PPORT_MESSAGE LpcReply)
-{
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
-}
-
-/*
- * @implemented
- */
-NTSTATUS
-NTAPI
-NtReplyWaitReceivePortEx(IN HANDLE PortHandle,
-                         OUT PVOID *PortContext OPTIONAL,
-                         IN PPORT_MESSAGE ReplyMessage OPTIONAL,
-                         OUT PPORT_MESSAGE ReceiveMessage,
-                         IN PLARGE_INTEGER Timeout OPTIONAL)
-{
-    PLPCP_PORT_OBJECT Port, ReceivePort;
-    KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(), WaitMode = PreviousMode;
-    NTSTATUS Status;
-    PLPCP_MESSAGE Message;
-    PETHREAD Thread = PsGetCurrentThread(), WakeupThread;
-    PLPCP_CONNECTION_MESSAGE ConnectMessage;
-    ULONG ConnectionInfoLength;
-    PAGED_CODE();
-    LPCTRACE(LPC_REPLY_DEBUG,
-             "Handle: %lx. Messages: %p/%p. Context: %p\n",
-             PortHandle,
-             ReplyMessage,
-             ReceiveMessage,
-             PortContext);
-
-    /* If this is a system thread, then let it page out its stack */
-    if (Thread->SystemThread) WaitMode = UserMode;
-
-    /* Check if caller has a reply message */
-    if (ReplyMessage)
-    {
-        /* Validate its length */
-        if ((ReplyMessage->u1.s1.DataLength + sizeof(PORT_MESSAGE)) >
-            ReplyMessage->u1.s1.TotalLength)
-        {
-            /* Fail */
-            return STATUS_INVALID_PARAMETER;
-        }
-
-        /* Make sure it has a valid ID */
-        if (!ReplyMessage->MessageId) return STATUS_INVALID_PARAMETER;
-    }
-
-    /* Get the Port object */
-    Status = ObReferenceObjectByHandle(PortHandle,
-                                       0,
-                                       LpcPortObjectType,
-                                       PreviousMode,
-                                       (PVOID*)&Port,
-                                       NULL);
-    if (!NT_SUCCESS(Status)) return Status;
-
-    /* Check if the caller has a reply message */
-    if (ReplyMessage)
-    {
-        /* Validate its length in respect to the port object */
-        if ((ReplyMessage->u1.s1.TotalLength > Port->MaxMessageLength) ||
-            (ReplyMessage->u1.s1.TotalLength <= ReplyMessage->u1.s1.DataLength))
-        {
-            /* Too large, fail */
-            ObDereferenceObject(Port);
-            return STATUS_PORT_MESSAGE_TOO_LONG;
-        }
-    }
-
-    /* Check if this is anything but a client port */
-    if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_CLIENT_PORT)
-    {
-        /* Use the connection port */
-        ReceivePort = Port->ConnectionPort;
-    }
-    else
-    {
-        /* Otherwise, use the port itself */
-        ReceivePort = Port;
-    }
-
-    /* Check if the caller gave a reply message */
-    if (ReplyMessage)
-    {
-        /* Get the ETHREAD corresponding to it */
-        Status = PsLookupProcessThreadByCid(&ReplyMessage->ClientId,
-                                            NULL,
-                                            &WakeupThread);
-        if (!NT_SUCCESS(Status))
-        {
-            /* No thread found, fail */
-            ObDereferenceObject(Port);
-            return Status;
-        }
-
-        /* Allocate a message from the port zone */
-        Message = LpcpAllocateFromPortZone();
-        if (!Message)
-        {
-            /* Fail if we couldn't allocate a message */
-            ObDereferenceObject(WakeupThread);
-            ObDereferenceObject(Port);
-            return STATUS_NO_MEMORY;
-        }
-
-        /* Keep the lock acquired */
-        KeAcquireGuardedMutex(&LpcpLock);
-
-        /* Make sure this is the reply the thread is waiting for */
-        if (WakeupThread->LpcReplyMessageId != ReplyMessage->MessageId)
-        {
-            /* It isn't, fail */
-            LpcpFreeToPortZone(Message, TRUE);
-            KeReleaseGuardedMutex(&LpcpLock);
-            ObDereferenceObject(WakeupThread);
-            ObDereferenceObject(Port);
-            return STATUS_REPLY_MESSAGE_MISMATCH;
-        }
-
-        /* Copy the message */
-        LpcpMoveMessage(&Message->Request,
-                        ReplyMessage,
-                        ReplyMessage + 1,
-                        LPC_REPLY,
-                        NULL);
-
-        /* Free any data information */
-        LpcpFreeDataInfoMessage(Port,
-                                ReplyMessage->MessageId,
-                                ReplyMessage->CallbackId);
-
-        /* Reference the thread while we use it */
-        ObReferenceObject(WakeupThread);
-        Message->RepliedToThread = WakeupThread;
-
-        /* Set this as the reply message */
-        WakeupThread->LpcReplyMessageId = 0;
-        WakeupThread->LpcReplyMessage = (PVOID)Message;
-
-        /* Check if we have messages on the reply chain */
-        if (!(WakeupThread->LpcExitThreadCalled) &&
-            !(IsListEmpty(&WakeupThread->LpcReplyChain)))
-        {
-            /* Remove us from it and reinitialize it */
-            RemoveEntryList(&WakeupThread->LpcReplyChain);
-            InitializeListHead(&WakeupThread->LpcReplyChain);
-        }
-
-        /* Check if this is the message the thread had received */
-        if ((Thread->LpcReceivedMsgIdValid) &&
-            (Thread->LpcReceivedMessageId == ReplyMessage->MessageId))
-        {
-            /* Clear this data */
-            Thread->LpcReceivedMessageId = 0;
-            Thread->LpcReceivedMsgIdValid = FALSE;
-        }
-
-        /* Release the lock and release the LPC semaphore to wake up waiters */
-        KeReleaseGuardedMutex(&LpcpLock);
-        LpcpCompleteWait(&WakeupThread->LpcReplySemaphore);
-
-        /* Now we can let go of the thread */
-        ObDereferenceObject(WakeupThread);
-    }
-
-    /* Now wait for someone to reply to us */
-    LpcpReceiveWait(ReceivePort->MsgQueue.Semaphore, WaitMode);
-    if (Status != STATUS_SUCCESS) goto Cleanup;
-
-    /* Wait done, get the LPC lock */
-    KeAcquireGuardedMutex(&LpcpLock);
-
-    /* Check if we've received nothing */
-    if (IsListEmpty(&ReceivePort->MsgQueue.ReceiveHead))
-    {
-        /* Check if this was a waitable port and wake it */
-        if (ReceivePort->Flags & LPCP_WAITABLE_PORT)
-        {
-            /* Reset its event */
-            KeResetEvent(&ReceivePort->WaitEvent);
-        }
-
-        /* Release the lock and fail */
-        KeReleaseGuardedMutex(&LpcpLock);
-        ObDereferenceObject(Port);
-        return STATUS_UNSUCCESSFUL;
-    }
-
-    /* Get the message on the queue */
-    Message = CONTAINING_RECORD(RemoveHeadList(&ReceivePort->
-                                               MsgQueue.ReceiveHead),
-                                LPCP_MESSAGE,
-                                Entry);
-
-    /* Check if the queue is empty now */
-    if (IsListEmpty(&ReceivePort->MsgQueue.ReceiveHead))
-    {
-        /* Check if this was a waitable port */
-        if (ReceivePort->Flags & LPCP_WAITABLE_PORT)
-        {
-            /* Reset its event */
-            KeResetEvent(&ReceivePort->WaitEvent);
-        }
-    }
-
-    /* Re-initialize the message's list entry */
-    InitializeListHead(&Message->Entry);
-
-    /* Set this as the received message */
-    Thread->LpcReceivedMessageId = Message->Request.MessageId;
-    Thread->LpcReceivedMsgIdValid = TRUE;
-
-    /* Done touching global data, release the lock */
-    KeReleaseGuardedMutex(&LpcpLock);
-
-    /* Check if this was a connection request */
-    if (LpcpGetMessageType(&Message->Request) == LPC_CONNECTION_REQUEST)
-    {
-        /* Get the connection message */
-        ConnectMessage = (PLPCP_CONNECTION_MESSAGE)(Message + 1);
-        LPCTRACE(LPC_REPLY_DEBUG,
-                 "Request Messages: %p/%p\n",
-                 Message,
-                 ConnectMessage);
-
-        /* Get its length */
-        ConnectionInfoLength = Message->Request.u1.s1.DataLength -
-                               sizeof(LPCP_CONNECTION_MESSAGE);
-
-        /* Return it as the receive message */
-        *ReceiveMessage = Message->Request;
-
-        /* Clear our stack variable so the message doesn't get freed */
-        Message = NULL;
-
-        /* Setup the receive message */
-        ReceiveMessage->u1.s1.TotalLength = sizeof(LPCP_MESSAGE) +
-                                            ConnectionInfoLength;
-        ReceiveMessage->u1.s1.DataLength = ConnectionInfoLength;
-        RtlMoveMemory(ReceiveMessage + 1,
-                      ConnectMessage + 1,
-                      ConnectionInfoLength);
-
-        /* Clear the port context if the caller requested one */
-        if (PortContext) *PortContext = NULL;
-    }
-    else if (Message->Request.u2.s2.Type != LPC_REPLY)
-    {
-        /* Otherwise, this is a new message or event */
-        LPCTRACE(LPC_REPLY_DEBUG,
-                 "Non-Reply Messages: %p/%p\n",
-                 &Message->Request,
-                 (&Message->Request) + 1);
-
-        /* Copy it */
-        LpcpMoveMessage(ReceiveMessage,
-                        &Message->Request,
-                        (&Message->Request) + 1,
-                        0,
-                        NULL);
-
-        /* Return its context */
-        if (PortContext) *PortContext = Message->PortContext;
-
-        /* And check if it has data information */
-        if (Message->Request.u2.s2.DataInfoOffset)
-        {
-            /* It does, save it, and don't free the message below */
-            LpcpSaveDataInfoMessage(Port, Message);
-            Message = NULL;
-        }
-    }
-    else
-    {
-        /* This is a reply message, should never happen! */
-        ASSERT(FALSE);
-    }
-
-    /* If we have a message pointer here, free it */
-    if (Message) LpcpFreeToPortZone(Message, FALSE);
-
-Cleanup:
-    /* All done, dereference the port and return the status */
-    LPCTRACE(LPC_REPLY_DEBUG,
-             "Port: %p. Status: %p\n",
-             Port,
-             Status);
-    ObDereferenceObject(Port);
-    return Status;
-}
-
-/*
- * @implemented
- */
-NTSTATUS
-NTAPI
-NtReplyWaitReceivePort(IN HANDLE PortHandle,
-                       OUT PVOID *PortContext OPTIONAL,
-                       IN PPORT_MESSAGE ReplyMessage OPTIONAL,
-                       OUT PPORT_MESSAGE ReceiveMessage)
-{
-    /* Call the newer API */
-    return NtReplyWaitReceivePortEx(PortHandle,
-                                    PortContext,
-                                    ReplyMessage,
-                                    ReceiveMessage,
-                                    NULL);
-}
-
-/*
- * @unimplemented
- */
-NTSTATUS
-NTAPI
-NtReplyWaitReplyPort(IN HANDLE PortHandle,
-                     IN PPORT_MESSAGE ReplyMessage)
-{
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-NTSTATUS
-NTAPI
-NtReadRequestData(IN HANDLE PortHandle,
-                  IN PPORT_MESSAGE Message,
-                  IN ULONG Index,
-                  IN PVOID Buffer,
-                  IN ULONG BufferLength,
-                  OUT PULONG Returnlength)
-{
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-NTSTATUS
-NTAPI
-NtWriteRequestData(IN HANDLE PortHandle,
-                   IN PPORT_MESSAGE Message,
-                   IN ULONG Index,
-                   IN PVOID Buffer,
-                   IN ULONG BufferLength,
-                   OUT PULONG ReturnLength)
-{
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
-}
-
-/* EOF */
diff --git a/reactos/ntoskrnl/lpc/ntlpc/send.c b/reactos/ntoskrnl/lpc/ntlpc/send.c
deleted file mode 100644
index f49e0a6550f..00000000000
--- a/reactos/ntoskrnl/lpc/ntlpc/send.c
+++ /dev/null
@@ -1,426 +0,0 @@
-/*
- * PROJECT:         ReactOS Kernel
- * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            ntoskrnl/lpc/send.c
- * PURPOSE:         Local Procedure Call: Sending (Requests)
- * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <ntoskrnl.h>
-#include "lpc.h"
-#define NDEBUG
-#include <internal/debug.h>
-
-/* PUBLIC FUNCTIONS **********************************************************/
-
-/*
- * @implemented
- */
-NTSTATUS
-NTAPI
-LpcRequestPort(IN PVOID PortObject,
-               IN PPORT_MESSAGE LpcMessage)
-{
-    PLPCP_PORT_OBJECT Port = (PLPCP_PORT_OBJECT)PortObject, QueuePort;
-    ULONG MessageType;
-    PLPCP_MESSAGE Message;
-    KPROCESSOR_MODE PreviousMode = KeGetPreviousMode();
-    PAGED_CODE();
-    LPCTRACE(LPC_SEND_DEBUG, "Port: %p. Message: %p\n", Port, LpcMessage);
-
-    /* Check if this is a non-datagram message */
-    if (LpcMessage->u2.s2.Type)
-    {
-        /* Get the message type */
-        MessageType = LpcpGetMessageType(LpcMessage);
-
-        /* Validate it */
-        if ((MessageType < LPC_DATAGRAM) || (MessageType > LPC_CLIENT_DIED))
-        {
-            /* Fail */
-            return STATUS_INVALID_PARAMETER;
-        }
-
-        /* Mark this as a kernel-mode message only if we really came from there */
-        if ((PreviousMode == KernelMode) &&
-            (LpcMessage->u2.s2.Type & LPC_KERNELMODE_MESSAGE))
-        {
-            /* We did, this is a kernel mode message */
-            MessageType |= LPC_KERNELMODE_MESSAGE;
-        }
-    }
-    else
-    {
-        /* This is a datagram */
-        MessageType = LPC_DATAGRAM;
-    }
-
-    /* Can't have data information on this type of call */
-    if (LpcMessage->u2.s2.DataInfoOffset) return STATUS_INVALID_PARAMETER;
-
-    /* Validate message sizes */
-    if ((LpcMessage->u1.s1.TotalLength > Port->MaxMessageLength) ||
-        (LpcMessage->u1.s1.TotalLength <= LpcMessage->u1.s1.DataLength))
-    {
-        /* Fail */
-        return STATUS_PORT_MESSAGE_TOO_LONG;
-    }
-
-    /* Allocate a new message */
-    Message = LpcpAllocateFromPortZone();
-    if (!Message) return STATUS_NO_MEMORY;
-
-    /* Clear the context */
-    Message->PortContext = NULL;
-
-    /* Copy the message */
-    LpcpMoveMessage(&Message->Request,
-                    LpcMessage,
-                    LpcMessage + 1,
-                    MessageType,
-                    &PsGetCurrentThread()->Cid);
-
-    /* Acquire the LPC lock */
-    KeAcquireGuardedMutex(&LpcpLock);
-
-    /* Check if this is anything but a connection port */
-    if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_CONNECTION_PORT)
-    {
-        /* The queue port is the connected port */
-        QueuePort = Port->ConnectedPort;
-        if (QueuePort)
-        {
-            /* Check if this is a client port */
-            if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CLIENT_PORT)
-            {
-                /* Then copy the context */
-                Message->PortContext = QueuePort->PortContext;
-                QueuePort = Port->ConnectionPort;
-            }
-            else if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_COMMUNICATION_PORT)
-            {
-                /* Any other kind of port, use the connection port */
-                QueuePort = Port->ConnectionPort;
-            }
-        }
-    }
-    else
-    {
-        /* For connection ports, use the port itself */
-        QueuePort = PortObject;
-    }
-
-    /* Make sure we have a port */
-    if (QueuePort)
-    {
-        /* Generate the Message ID and set it */
-        Message->Request.MessageId =  LpcpNextMessageId++;
-        if (!LpcpNextMessageId) LpcpNextMessageId = 1;
-        Message->Request.CallbackId = 0;
-
-        /* No Message ID for the thread */
-        PsGetCurrentThread()->LpcReplyMessageId = 0;
-
-        /* Insert the message in our chain */
-        InsertTailList(&QueuePort->MsgQueue.ReceiveHead, &Message->Entry);
-
-        /* Release the lock and release the semaphore */
-        KeReleaseGuardedMutex(&LpcpLock);
-        LpcpCompleteWait(QueuePort->MsgQueue.Semaphore);
-
-        /* If this is a waitable port, wake it up */
-        if (QueuePort->Flags & LPCP_WAITABLE_PORT)
-        {
-            /* Wake it */
-            KeSetEvent(&QueuePort->WaitEvent, IO_NO_INCREMENT, FALSE);
-        }
-
-        /* We're done */
-        LPCTRACE(LPC_SEND_DEBUG, "Port: %p. Message: %p\n", QueuePort, Message);
-        return STATUS_SUCCESS;
-    }
-
-    /* If we got here, then free the message and fail */
-    LpcpFreeToPortZone(Message, TRUE);
-    KeReleaseGuardedMutex(&LpcpLock);
-    return STATUS_PORT_DISCONNECTED;
-}
-
-/*
-* @unimplemented
-*/
-NTSTATUS
-NTAPI
-LpcRequestWaitReplyPort(IN PVOID Port,
-                        IN PPORT_MESSAGE LpcMessageRequest,
-                        OUT PPORT_MESSAGE LpcMessageReply)
-{
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-NTSTATUS
-NTAPI
-NtRequestPort(IN HANDLE PortHandle,
-              IN PPORT_MESSAGE LpcMessage)
-{
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
-}
-
-/*
- * @implemented
- */
-NTSTATUS
-NTAPI
-NtRequestWaitReplyPort(IN HANDLE PortHandle,
-                       IN PPORT_MESSAGE LpcRequest,
-                       IN OUT PPORT_MESSAGE LpcReply)
-{
-    PLPCP_PORT_OBJECT Port, QueuePort, ReplyPort;
-    KPROCESSOR_MODE PreviousMode = KeGetPreviousMode();
-    NTSTATUS Status;
-    PLPCP_MESSAGE Message;
-    PETHREAD Thread = PsGetCurrentThread();
-    BOOLEAN Callback;
-    PKSEMAPHORE Semaphore;
-    ULONG MessageType;
-    PAGED_CODE();
-    LPCTRACE(LPC_SEND_DEBUG,
-             "Handle: %lx. Messages: %p/%p. Type: %lx\n",
-             PortHandle,
-             LpcRequest,
-             LpcReply,
-             LpcpGetMessageType(LpcRequest));
-
-    /* Check if the thread is dying */
-    if (Thread->LpcExitThreadCalled) return STATUS_THREAD_IS_TERMINATING;
-
-    /* Check if this is an LPC Request */
-    if (LpcpGetMessageType(LpcRequest) == LPC_REQUEST)
-    {
-        /* Then it's a callback */
-        Callback = TRUE;
-    }
-    else if (LpcpGetMessageType(LpcRequest))
-    {
-        /* This is a not kernel-mode message */
-        return STATUS_INVALID_PARAMETER;
-    }
-    else
-    {
-        /* This is a kernel-mode message without a callback */
-        LpcRequest->u2.s2.Type |= LPC_REQUEST;
-        Callback = FALSE;
-    }
-
-    /* Get the message type */
-    MessageType = LpcRequest->u2.s2.Type;
-
-    /* Validate the length */
-    if ((LpcRequest->u1.s1.DataLength + sizeof(PORT_MESSAGE)) >
-         LpcRequest->u1.s1.TotalLength)
-    {
-        /* Fail */
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    /* Reference the object */
-    Status = ObReferenceObjectByHandle(PortHandle,
-                                       0,
-                                       LpcPortObjectType,
-                                       PreviousMode,
-                                       (PVOID*)&Port,
-                                       NULL);
-    if (!NT_SUCCESS(Status)) return Status;
-
-    /* Validate the message length */
-    if ((LpcRequest->u1.s1.TotalLength > Port->MaxMessageLength) ||
-        (LpcRequest->u1.s1.TotalLength <= LpcRequest->u1.s1.DataLength))
-    {
-        /* Fail */
-        ObDereferenceObject(Port);
-        return STATUS_PORT_MESSAGE_TOO_LONG;
-    }
-
-    /* Allocate a message from the port zone */
-    Message = LpcpAllocateFromPortZone();
-    if (!Message)
-    {
-        /* Fail if we couldn't allocate a message */
-        ObDereferenceObject(Port);
-        return STATUS_NO_MEMORY;
-    }
-
-    /* Check if this is a callback */
-    if (Callback)
-    {
-        /* FIXME: TODO */
-        Semaphore = NULL; // we'd use the Thread Semaphore here
-        ASSERT(FALSE);
-    }
-    else
-    {
-        /* No callback, just copy the message */
-        LpcpMoveMessage(&Message->Request,
-                        LpcRequest,
-                        LpcRequest + 1,
-                        MessageType,
-                        &Thread->Cid);
-
-        /* Acquire the LPC lock */
-        KeAcquireGuardedMutex(&LpcpLock);
-
-        /* Right now clear the port context */
-        Message->PortContext = NULL;
-
-        /* Check if this is a not connection port */
-        if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_CONNECTION_PORT)
-        {
-            /* We want the connected port */
-            QueuePort = Port->ConnectedPort;
-            if (!QueuePort)
-            {
-                /* We have no connected port, fail */
-                LpcpFreeToPortZone(Message, TRUE);
-                KeReleaseGuardedMutex(&LpcpLock);
-                ObDereferenceObject(Port);
-                return STATUS_PORT_DISCONNECTED;
-            }
-
-            /* This will be the rundown port */
-            ReplyPort = QueuePort;
-
-            /* Check if this is a communication port */
-            if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CLIENT_PORT)
-            {
-                /* Copy the port context and use the connection port */
-                Message->PortContext = ReplyPort->PortContext;
-                QueuePort = Port->ConnectionPort;
-            }
-            else if ((Port->Flags & LPCP_PORT_TYPE_MASK) !=
-                      LPCP_COMMUNICATION_PORT)
-            {
-                /* Use the connection port for anything but communication ports */
-                QueuePort = Port->ConnectionPort;
-            }
-        }
-        else
-        {
-            /* Otherwise, for a connection port, use the same port object */
-            QueuePort = ReplyPort = Port;
-        }
-
-        /* No reply thread */
-        Message->RepliedToThread = NULL;
-
-        /* Generate the Message ID and set it */
-        Message->Request.MessageId =  LpcpNextMessageId++;
-        if (!LpcpNextMessageId) LpcpNextMessageId = 1;
-        Message->Request.CallbackId = 0;
-
-        /* Set the message ID for our thread now */
-        Thread->LpcReplyMessageId = Message->Request.MessageId;
-        Thread->LpcReplyMessage = NULL;
-
-        /* Insert the message in our chain */
-        InsertTailList(&QueuePort->MsgQueue.ReceiveHead, &Message->Entry);
-        InsertTailList(&ReplyPort->LpcReplyChainHead, &Thread->LpcReplyChain);
-
-        /* Release the lock and get the semaphore we'll use later */
-        KeReleaseGuardedMutex(&LpcpLock);
-        Semaphore = QueuePort->MsgQueue.Semaphore;
-
-        /* If this is a waitable port, wake it up */
-        if (QueuePort->Flags & LPCP_WAITABLE_PORT)
-        {
-            /* Wake it */
-            KeSetEvent(&QueuePort->WaitEvent, IO_NO_INCREMENT, FALSE);
-        }
-    }
-
-    /* Now release the semaphore */
-    LpcpCompleteWait(Semaphore);
-
-    /* And let's wait for the reply */
-    LpcpReplyWait(&Thread->LpcReplySemaphore, PreviousMode);
-
-    /* Acquire the LPC lock */
-    KeAcquireGuardedMutex(&LpcpLock);
-
-    /* Get the LPC Message and clear our thread's reply data */
-    Message = Thread->LpcReplyMessage;
-    Thread->LpcReplyMessage = NULL;
-    Thread->LpcReplyMessageId = 0;
-
-    /* Check if we have anything on the reply chain*/
-    if (!IsListEmpty(&Thread->LpcReplyChain))
-    {
-        /* Remove this thread and reinitialize the list */
-        RemoveEntryList(&Thread->LpcReplyChain);
-        InitializeListHead(&Thread->LpcReplyChain);
-    }
-
-    /* Release the lock */
-    KeReleaseGuardedMutex(&LpcpLock);
-
-    /* Check if we got a reply */
-    if (Status == STATUS_SUCCESS)
-    {
-        /* Check if we have a valid message */
-        if (Message)
-        {
-            LPCTRACE(LPC_SEND_DEBUG,
-                     "Reply Messages: %p/%p\n",
-                     &Message->Request,
-                     (&Message->Request) + 1);
-
-            /* Move the message */
-            LpcpMoveMessage(LpcReply,
-                            &Message->Request,
-                            (&Message->Request) + 1,
-                            0,
-                            NULL);
-
-            /* Check if this is an LPC request with data information */
-            if ((LpcpGetMessageType(&Message->Request) == LPC_REQUEST) &&
-                (Message->Request.u2.s2.DataInfoOffset))
-            {
-                /* Save the data information */
-                LpcpSaveDataInfoMessage(Port, Message);
-            }
-            else
-            {
-                /* Otherwise, just free it */
-                LpcpFreeToPortZone(Message, FALSE);
-            }
-        }
-        else
-        {
-            /* We don't have a reply */
-            Status = STATUS_LPC_REPLY_LOST;
-        }
-    }
-    else
-    {
-        /* The wait failed, free the message while holding the lock */
-        KeAcquireGuardedMutex(&LpcpLock);
-        LpcpFreeToPortZone(Message, TRUE);
-        KeReleaseGuardedMutex(&LpcpLock);
-    }
-
-    /* All done */
-    LPCTRACE(LPC_SEND_DEBUG,
-             "Port: %p. Status: %p\n",
-             Port,
-             Status);
-    ObDereferenceObject(Port);
-    return Status;
-}
-
-/* EOF */
diff --git a/reactos/ntoskrnl/lpc/port.c b/reactos/ntoskrnl/lpc/port.c
index 18fec96de83..dcc5a979d44 100644
--- a/reactos/ntoskrnl/lpc/port.c
+++ b/reactos/ntoskrnl/lpc/port.c
@@ -1,29 +1,26 @@
-/* $Id$
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
+/*
+ * PROJECT:         ReactOS Kernel
+ * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            ntoskrnl/lpc/port.c
- * PURPOSE:         Communication mechanism
- *
- * PROGRAMMERS:     David Welch (welch@cwcom.net)
+ * PURPOSE:         Local Procedure Call: Port Management
+ * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
  */
 
-/* INCLUDES *****************************************************************/
+/* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
+#include "lpc.h"
 #define NDEBUG
 #include <internal/debug.h>
 
-#if defined (ALLOC_PRAGMA)
-#pragma alloc_text(INIT, LpcpInitSystem)
-#endif
- 
-
 /* GLOBALS *******************************************************************/
 
-POBJECT_TYPE	LpcPortObjectType = 0;
-ULONG		LpcpNextMessageId = 0; /* 0 is not a valid ID */
-FAST_MUTEX	LpcpLock; /* global internal sync in LPC facility */
+POBJECT_TYPE LpcPortObjectType;
+ULONG LpcpMaxMessageSize;
+PAGED_LOOKASIDE_LIST LpcpMessagesLookaside;
+KGUARDED_MUTEX LpcpLock;
+ULONG LpcpTraceLevel = LPC_CLOSE_DEBUG;
+ULONG LpcpNextMessageId = 1, LpcpNextCallbackId = 1;
 
 static GENERIC_MAPPING LpcpPortMapping = 
 {
@@ -33,105 +30,60 @@ static GENERIC_MAPPING LpcpPortMapping =
     PORT_ALL_ACCESS
 };
 
-/* FUNCTIONS *****************************************************************/
-
+/* PRIVATE FUNCTIONS *********************************************************/
 
 NTSTATUS
 INIT_FUNCTION
 NTAPI
-LpcpInitSystem (VOID)
+LpcpInitSystem(VOID)
 {
     OBJECT_TYPE_INITIALIZER ObjectTypeInitializer;
     UNICODE_STRING Name;
 
-    DPRINT("Creating Port Object Type\n");
-  
+    /* Setup the LPC Lock */
+    KeInitializeGuardedMutex(&LpcpLock);
+
     /* Create the Port Object Type */
     RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer));
     RtlInitUnicodeString(&Name, L"Port");
     ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer);
-    ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(EPORT);
+    ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(LPCP_PORT_OBJECT);
+    ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(LPCP_NONPAGED_PORT_QUEUE);
     ObjectTypeInitializer.GenericMapping = LpcpPortMapping;
-    ObjectTypeInitializer.PoolType = NonPagedPool;
+    ObjectTypeInitializer.PoolType = PagedPool;
     ObjectTypeInitializer.UseDefaultObject = TRUE;
     ObjectTypeInitializer.CloseProcedure = LpcpClosePort;
     ObjectTypeInitializer.DeleteProcedure = LpcpDeletePort;
     ObjectTypeInitializer.ValidAccessMask = PORT_ALL_ACCESS;
-    ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &LpcPortObjectType);
+    ObjectTypeInitializer.MaintainTypeList = TRUE;
+    ObCreateObjectType(&Name,
+                       &ObjectTypeInitializer,
+                       NULL,
+                       &LpcPortObjectType);
 
-    LpcpNextMessageId = 0;
-    ExInitializeFastMutex (& LpcpLock);
+    /* Allocate the LPC lookaside list */
+    LpcpMaxMessageSize = LPCP_MAX_MESSAGE_SIZE;
+    ExInitializePagedLookasideList(&LpcpMessagesLookaside,
+                                   NULL,
+                                   NULL,
+                                   0,
+                                   LpcpMaxMessageSize,
+                                   TAG('L', 'p', 'c', 'M'),
+                                   32);
 
-    return(STATUS_SUCCESS);
+    /* We're done */
+    return STATUS_SUCCESS;
 }
 
+/* PUBLIC FUNCTIONS **********************************************************/
 
-/**********************************************************************
- * NAME							INTERNAL
- *	NiInitializePort/3
- *
- * DESCRIPTION
- *	Initialize the EPORT object attributes. The Port
- *	object enters the inactive state.
- *
- * ARGUMENTS
- *	Port	Pointer to an EPORT object to initialize.
- *	Type	connect (RQST), or communication port (COMM)
- *	Parent	OPTIONAL connect port a communication port
- *		is created from
- *
- * RETURN VALUE
- *	STATUS_SUCCESS if initialization succedeed. An error code
- *	otherwise.
- */
-NTSTATUS STDCALL
-LpcpInitializePort (IN OUT  PEPORT Port,
-		  IN      USHORT Type,
-		  IN      PEPORT Parent OPTIONAL)
+NTSTATUS
+NTAPI
+NtImpersonateClientOfPort(IN HANDLE PortHandle,
+                          IN PPORT_MESSAGE ClientMessage)
 {
-  if ((Type != EPORT_TYPE_SERVER_RQST_PORT) &&
-      (Type != EPORT_TYPE_SERVER_COMM_PORT) &&
-      (Type != EPORT_TYPE_CLIENT_COMM_PORT))
-  {
-	  return STATUS_INVALID_PARAMETER_2;
-  }
-  memset (Port, 0, sizeof(EPORT));
-  KeInitializeSpinLock (& Port->Lock);
-  KeInitializeSemaphore( &Port->Semaphore, 0, MAXLONG );
-  Port->RequestPort = Parent;
-  Port->OtherPort = NULL;
-  Port->QueueLength = 0;
-  Port->ConnectQueueLength = 0;
-  Port->Type = Type;
-  Port->State = EPORT_INACTIVE;
-  InitializeListHead (& Port->QueueListHead);
-  InitializeListHead (& Port->ConnectQueueListHead);
-
-  return (STATUS_SUCCESS);
-}
-
-
-/* MISCELLANEA SYSTEM SERVICES */
-
-
-/**********************************************************************
- * NAME							SYSTEM
- *	NtImpersonateClientOfPort/2
- *
- * DESCRIPTION
- *
- * ARGUMENTS
- *	PortHandle,
- *	ClientMessage
- *
- * RETURN VALUE
- */
-NTSTATUS STDCALL
-NtImpersonateClientOfPort (HANDLE		PortHandle,
-			   PPORT_MESSAGE	ClientMessage)
-{
-  UNIMPLEMENTED;
-  return(STATUS_NOT_IMPLEMENTED);
+    UNIMPLEMENTED;
+    return STATUS_NOT_IMPLEMENTED;
 }
 
 NTSTATUS
@@ -142,4 +94,16 @@ NtQueryPortInformationProcess(VOID)
     return STATUS_UNSUCCESSFUL;
 }
 
+NTSTATUS
+NTAPI
+NtQueryInformationPort(IN HANDLE PortHandle,
+                       IN PORT_INFORMATION_CLASS PortInformationClass,
+                       OUT PVOID PortInformation,
+                       IN ULONG PortInformationLength,
+                       OUT PULONG ReturnLength)
+{
+    UNIMPLEMENTED;
+    return STATUS_NOT_IMPLEMENTED;
+}
+
 /* EOF */
diff --git a/reactos/ntoskrnl/lpc/query.c b/reactos/ntoskrnl/lpc/query.c
deleted file mode 100644
index 3463047c82a..00000000000
--- a/reactos/ntoskrnl/lpc/query.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* $Id$
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
- * FILE:            ntoskrnl/lpc/query.c
- * PURPOSE:         Communication mechanism
- *
- * PROGRAMMERS:     David Welch (welch@cwcom.net)
- */
-
-/* INCLUDES *****************************************************************/
-
-#include <ntoskrnl.h>
-#define NDEBUG
-#include <internal/debug.h>
-
-/* FUNCTIONS *****************************************************************/
-
-/**********************************************************************
- * NAME							EXPORTED
- *	NtQueryInformationPort@20
- *
- * DESCRIPTION
- *
- * ARGUMENTS
- *	PortHandle		[IN]
- *	PortInformationClass	[IN]
- *	PortInformation		[OUT]
- *	PortInformationLength	[IN]
- *	ReturnLength		[OUT]
- *
- * RETURN VALUE
- *	STATUS_SUCCESS if the call succedeed. An error code
- *	otherwise.
- *
- * NOTES
- * 	P. Dabak reports that this system service seems to return
- * 	no information.
- */
-/*EXPORTED*/ NTSTATUS STDCALL
-NtQueryInformationPort (IN	HANDLE	PortHandle,
-			IN	PORT_INFORMATION_CLASS	PortInformationClass,
-			OUT	PVOID	PortInformation,
-			IN	ULONG	PortInformationLength,
-			OUT	PULONG	ReturnLength)
-{
-  NTSTATUS	Status;
-  PEPORT		Port;
-
-  Status = ObReferenceObjectByHandle (PortHandle,
-				      PORT_ALL_ACCESS,   /* AccessRequired */
-				      LpcPortObjectType,
-				      UserMode,
-				      (PVOID *) & Port,
-				      NULL);
-  if (!NT_SUCCESS(Status))
-    {
-      DPRINT("NtQueryInformationPort() = %x\n", Status);
-      return (Status);
-    }
-  /*
-   * FIXME: NT does nothing here!
-   */
-  ObDereferenceObject (Port);
-  return STATUS_SUCCESS;
-}
-
-
-/* EOF */
diff --git a/reactos/ntoskrnl/lpc/queue.c b/reactos/ntoskrnl/lpc/queue.c
deleted file mode 100644
index 971e1085d51..00000000000
--- a/reactos/ntoskrnl/lpc/queue.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* $Id$
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
- * FILE:            ntoskrnl/lpc/queue.c
- * PURPOSE:         Communication mechanism
- *
- * PROGRAMMERS:     David Welch (welch@cwcom.net)
- */
-
-/* INCLUDES *****************************************************************/
-
-#include <ntoskrnl.h>
-#define NDEBUG
-#include <internal/debug.h>
-
-/* FUNCTIONS *****************************************************************/
-
-VOID STDCALL
-EiEnqueueMessagePort (IN OUT	PEPORT		Port,
-		      IN	PQUEUEDMESSAGE	Message)
-{
-  InsertTailList (&Port->QueueListHead,
-		  &Message->QueueListEntry);
-  Port->QueueLength++;
-}
-
-VOID STDCALL
-EiEnqueueMessageAtHeadPort (IN OUT	PEPORT		Port,
-			    IN	PQUEUEDMESSAGE	Message)
-{
-  InsertTailList (&Port->QueueListHead,
-		  &Message->QueueListEntry);
-  Port->QueueLength++;
-}
-
-PQUEUEDMESSAGE STDCALL
-EiDequeueMessagePort (IN OUT	PEPORT	Port)
-{
-  PQUEUEDMESSAGE	Message;
-  PLIST_ENTRY	entry;
-
-  if (IsListEmpty(&Port->QueueListHead))
-    {
-      return(NULL);
-    }
-  entry = RemoveHeadList (&Port->QueueListHead);
-  Message = CONTAINING_RECORD (entry, QUEUEDMESSAGE, QueueListEntry);
-  Port->QueueLength--;
-
-  return (Message);
-}
-
-
-VOID STDCALL
-EiEnqueueConnectMessagePort (IN OUT	PEPORT		Port,
-			     IN	PQUEUEDMESSAGE	Message)
-{
-  InsertTailList (&Port->ConnectQueueListHead,
-		  &Message->QueueListEntry);
-  Port->ConnectQueueLength++;
-}
-
-
-PQUEUEDMESSAGE STDCALL
-EiDequeueConnectMessagePort (IN OUT	PEPORT	Port)
-{
-  PQUEUEDMESSAGE	Message;
-  PLIST_ENTRY	entry;
-
-  if (IsListEmpty(&Port->ConnectQueueListHead))
-    {
-      return(NULL);
-    }
-  entry = RemoveHeadList (&Port->ConnectQueueListHead);
-  Message = CONTAINING_RECORD (entry, QUEUEDMESSAGE, QueueListEntry);
-  Port->ConnectQueueLength--;
-
-  return (Message);
-}
-
-
-/* EOF */
diff --git a/reactos/ntoskrnl/lpc/receive.c b/reactos/ntoskrnl/lpc/receive.c
deleted file mode 100644
index 83631aa388d..00000000000
--- a/reactos/ntoskrnl/lpc/receive.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $Id$
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
- * FILE:            ntoskrnl/lpc/receive.c
- * PURPOSE:         Communication mechanism
- *
- * PROGRAMMERS:     David Welch (welch@cwcom.net)
- */
-
-/* INCLUDES *****************************************************************/
-
-#include <ntoskrnl.h>
-#define NDEBUG
-#include <internal/debug.h>
-
-/* FUNCTIONS *****************************************************************/
-
-/**********************************************************************
- * NAME							SYSTEM
- *
- * DESCRIPTION
- *
- * ARGUMENTS
- *
- * RETURN VALUE
- */
-NTSTATUS STDCALL
-NtReadRequestData (HANDLE		PortHandle,
-		   PPORT_MESSAGE	Message,
-		   ULONG		Index,
-		   PVOID		Buffer,
-		   ULONG		BufferLength,
-		   PULONG		Returnlength)
-{
-	UNIMPLEMENTED;
-	return(STATUS_NOT_IMPLEMENTED);
-}
-
-
-/* EOF */
diff --git a/reactos/ntoskrnl/lpc/reply.c b/reactos/ntoskrnl/lpc/reply.c
index 5fb58c22fb6..311002eb2eb 100644
--- a/reactos/ntoskrnl/lpc/reply.c
+++ b/reactos/ntoskrnl/lpc/reply.c
@@ -1,421 +1,141 @@
-/* $Id$
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
+/*
+ * PROJECT:         ReactOS Kernel
+ * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            ntoskrnl/lpc/reply.c
- * PURPOSE:         Communication mechanism
- *
- * PROGRAMMERS:     David Welch (welch@cwcom.net)
+ * PURPOSE:         Local Procedure Call: Receive (Replies)
+ * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
  */
 
 /* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
+#include "lpc.h"
 #define NDEBUG
 #include <internal/debug.h>
 
-/* GLOBALS *******************************************************************/
+/* PRIVATE FUNCTIONS *********************************************************/
 
-/* FUNCTIONS *****************************************************************/
-
-/**********************************************************************
- * NAME
- *
- * DESCRIPTION
- *
- * ARGUMENTS
- *
- * RETURN VALUE
- *
- * REVISIONS
- */
-NTSTATUS STDCALL
-EiReplyOrRequestPort (IN	PEPORT		Port,
-		      IN	PPORT_MESSAGE	LpcReply,
-		      IN	ULONG		MessageType,
-		      IN	PEPORT		Sender)
+VOID
+NTAPI
+LpcpFreeDataInfoMessage(IN PLPCP_PORT_OBJECT Port,
+                        IN ULONG MessageId,
+                        IN ULONG CallbackId)
 {
-   KIRQL oldIrql;
-   PQUEUEDMESSAGE MessageReply;
-   ULONG Size;
+    PLPCP_MESSAGE Message;
+    PLIST_ENTRY ListHead, NextEntry;
 
-   if (Port == NULL)
-     {
-       KEBUGCHECK(0);
-     }
+    /* Check if the port we want is the connection port */
+    if ((Port->Flags & LPCP_PORT_TYPE_MASK) > LPCP_UNCONNECTED_PORT)
+    {
+        /* Use it */
+        Port = Port->ConnectionPort;
+    }
 
-   Size = sizeof(QUEUEDMESSAGE);
-   if (LpcReply && LpcReply->u1.s1.TotalLength > (CSHORT)sizeof(PORT_MESSAGE))
-     {
-       Size += LpcReply->u1.s1.TotalLength - sizeof(PORT_MESSAGE);
-     }
-   MessageReply = ExAllocatePoolWithTag(NonPagedPool, Size, 
-					TAG_LPC_MESSAGE);
-   MessageReply->Sender = Sender;
+    /* Loop the list */
+    ListHead = &Port->LpcDataInfoChainHead;
+    NextEntry = ListHead->Flink;
+    while (ListHead != NextEntry)
+    {
+        /* Get the message */
+        Message = CONTAINING_RECORD(NextEntry, LPCP_MESSAGE, Entry);
 
-   if (LpcReply != NULL)
-     {
-       memcpy(&MessageReply->Message, LpcReply, LpcReply->u1.s1.TotalLength);
-     }
-   else
-     {
-       MessageReply->Message.u1.s1.TotalLength = sizeof(PORT_MESSAGE);
-       MessageReply->Message.u1.s1.DataLength = 0;
-     }
+        /* Make sure it matches */
+        if ((Message->Request.MessageId == MessageId) &&
+            (Message->Request.CallbackId == CallbackId))
+        {
+            /* Unlink and free it */
+            RemoveEntryList(&Message->Entry);
+            InitializeListHead(&Message->Entry);
+            LpcpFreeToPortZone(Message, TRUE);
+            break;
+        }
 
-   MessageReply->Message.ClientId.UniqueProcess = PsGetCurrentProcessId();
-   MessageReply->Message.ClientId.UniqueThread = PsGetCurrentThreadId();
-   MessageReply->Message.u2.s2.Type = (CSHORT)MessageType;
-   MessageReply->Message.MessageId = InterlockedIncrementUL(&LpcpNextMessageId);
-
-   KeAcquireSpinLock(&Port->Lock, &oldIrql);
-   EiEnqueueMessagePort(Port, MessageReply);
-   KeReleaseSpinLock(&Port->Lock, oldIrql);
-
-   return(STATUS_SUCCESS);
+        /* Go to the next entry */
+        NextEntry = NextEntry->Flink;
+    }
 }
 
-
-/**********************************************************************
- * NAME							EXPORTED
- *
- * DESCRIPTION
- *
- * ARGUMENTS
- *
- * RETURN VALUE
- *
- * REVISIONS
- */
-NTSTATUS STDCALL
-NtReplyPort (IN	HANDLE		PortHandle,
-	     IN	PPORT_MESSAGE	LpcReply)
+VOID
+NTAPI
+LpcpSaveDataInfoMessage(IN PLPCP_PORT_OBJECT Port,
+                        IN PLPCP_MESSAGE Message)
 {
-   NTSTATUS Status;
-   PEPORT Port;
+    PAGED_CODE();
 
-   DPRINT("NtReplyPort(PortHandle %x, LpcReply %x)\n", PortHandle, LpcReply);
+    /* Acquire the lock */
+    KeAcquireGuardedMutex(&LpcpLock);
 
-   Status = ObReferenceObjectByHandle(PortHandle,
-				      PORT_ALL_ACCESS,   /* AccessRequired */
-				      LpcPortObjectType,
-				      UserMode,
-				      (PVOID*)&Port,
-				      NULL);
-   if (!NT_SUCCESS(Status))
-     {
-	DPRINT("NtReplyPort() = %x\n", Status);
-	return(Status);
-     }
+    /* Check if the port we want is the connection port */
+    if ((Port->Flags & LPCP_PORT_TYPE_MASK) > LPCP_UNCONNECTED_PORT)
+    {
+        /* Use it */
+        Port = Port->ConnectionPort;
+    }
 
-   if (EPORT_DISCONNECTED == Port->State)
-     {
-	ObDereferenceObject(Port);
-	return STATUS_PORT_DISCONNECTED;
-     }
+    /* Link the message */
+    InsertTailList(&Port->LpcDataInfoChainHead, &Message->Entry);
 
-   Status = EiReplyOrRequestPort(Port->OtherPort,
-				 LpcReply,
-				 LPC_REPLY,
-				 Port);
-   KeReleaseSemaphore(&Port->OtherPort->Semaphore, IO_NO_INCREMENT, 1, FALSE);
-
-   ObDereferenceObject(Port);
-
-   return(Status);
+    /* Release the lock */
+    KeReleaseGuardedMutex(&LpcpLock);
 }
 
-
-/**********************************************************************
- * NAME							EXPORTED
- *	NtReplyWaitReceivePortEx
- *
- * DESCRIPTION
- *	Can be used with waitable ports.
- *	Present only in w2k+.
- *
- * ARGUMENTS
- * 	PortHandle
- * 	PortId
- * 	LpcReply
- * 	LpcMessage
- * 	Timeout
- *
- * RETURN VALUE
- *
- * REVISIONS
- */
-NTSTATUS STDCALL
-NtReplyWaitReceivePortEx(IN HANDLE PortHandle,
-                         OUT PVOID *PortContext OPTIONAL,
-                         IN PPORT_MESSAGE ReplyMessage OPTIONAL,
-                         OUT PPORT_MESSAGE ReceiveMessage,
-			             IN PLARGE_INTEGER Timeout OPTIONAL)
+VOID
+NTAPI
+LpcpMoveMessage(IN PPORT_MESSAGE Destination,
+                IN PPORT_MESSAGE Origin,
+                IN PVOID Data,
+                IN ULONG MessageType,
+                IN PCLIENT_ID ClientId)
 {
-   PEPORT Port;
-   KIRQL oldIrql;
-   PQUEUEDMESSAGE Request;
-   BOOLEAN Disconnected;
-   LARGE_INTEGER to;
-   KPROCESSOR_MODE PreviousMode;
-   NTSTATUS Status = STATUS_SUCCESS;
-   
-   PreviousMode = ExGetPreviousMode();
+    /* Set the Message size */
+    LPCTRACE((LPC_REPLY_DEBUG | LPC_SEND_DEBUG),
+             "Destination/Origin: %p/%p. Data: %p. Length: %lx\n",
+             Destination,
+             Origin,
+             Data,
+             Origin->u1.Length);
+    Destination->u1.Length = Origin->u1.Length;
 
-   DPRINT("NtReplyWaitReceivePortEx(PortHandle %x, LpcReply %x, "
-	  "LpcMessage %x)\n", PortHandle, ReplyMessage, ReceiveMessage);
+    /* Set the Message Type */
+    Destination->u2.s2.Type = !MessageType ?
+                              Origin->u2.s2.Type : MessageType & 0xFFFF;
 
-   if (PreviousMode != KernelMode)
-     {
-       _SEH_TRY
-         {
-           ProbeForWrite(ReceiveMessage,
-                         sizeof(PORT_MESSAGE),
-                         1);
-         }
-       _SEH_HANDLE
-         {
-           Status = _SEH_GetExceptionCode();
-         }
-       _SEH_END;
-       
-       if (!NT_SUCCESS(Status))
-         {
-           return Status;
-         }
-     }
+    /* Check if we have a Client ID */
+    if (ClientId)
+    {
+        /* Set the Client ID */
+        Destination->ClientId.UniqueProcess = ClientId->UniqueProcess;
+        Destination->ClientId.UniqueThread = ClientId->UniqueThread;
+    }
+    else
+    {
+        /* Otherwise, copy it */
+        Destination->ClientId.UniqueProcess = Origin->ClientId.UniqueProcess;
+        Destination->ClientId.UniqueThread = Origin->ClientId.UniqueThread;
+    }
 
-   Status = ObReferenceObjectByHandle(PortHandle,
-				      PORT_ALL_ACCESS,
-				      LpcPortObjectType,
-				      UserMode,
-				      (PVOID*)&Port,
-				      NULL);
-   if (!NT_SUCCESS(Status))
-     {
-	DPRINT1("NtReplyWaitReceivePortEx() = %x\n", Status);
-	return(Status);
-     }
-   if( Port->State == EPORT_DISCONNECTED )
-     {
-       /* If the port is disconnected, force the timeout to be 0
-        * so we don't wait for new messages, because there won't be
-        * any, only try to remove any existing messages
-	*/
-       Disconnected = TRUE;
-       to.QuadPart = 0;
-       Timeout = &to;
-     }
-   else Disconnected = FALSE;
+    /* Copy the MessageId and ClientViewSize */
+    Destination->MessageId = Origin->MessageId;
+    Destination->ClientViewSize = Origin->ClientViewSize;
 
-   /*
-    * Send the reply, only if port is connected
-    */
-   if (ReplyMessage != NULL && !Disconnected)
-     {
-	Status = EiReplyOrRequestPort(Port->OtherPort,
-				      ReplyMessage,
-				      LPC_REPLY,
-				      Port);
-	KeReleaseSemaphore(&Port->OtherPort->Semaphore, IO_NO_INCREMENT, 1,
-			   FALSE);
-
-	if (!NT_SUCCESS(Status))
-	  {
-	     ObDereferenceObject(Port);
-	     DPRINT1("NtReplyWaitReceivePortEx() = %x\n", Status);
-	     return(Status);
-	  }
-     }
-
-   /*
-    * Want for a message to be received
-    */
-   Status = KeWaitForSingleObject(&Port->Semaphore,
-				  UserRequest,
-				  UserMode,
-				  FALSE,
-				  Timeout);
-   if( Status == STATUS_TIMEOUT )
-     {
-       /*
-	* if the port is disconnected, and there are no remaining messages,
-        * return STATUS_PORT_DISCONNECTED
-	*/
-       ObDereferenceObject(Port);
-       return(Disconnected ? STATUS_PORT_DISCONNECTED : STATUS_TIMEOUT);
-     }
-
-   if (!NT_SUCCESS(Status))
-     {
-       if (STATUS_THREAD_IS_TERMINATING != Status)
-	 {
-	   DPRINT1("NtReplyWaitReceivePortEx() = %x\n", Status);
-	 }
-       ObDereferenceObject(Port);
-       return(Status);
-     }
-
-   /*
-    * Dequeue the message
-    */
-   KeAcquireSpinLock(&Port->Lock, &oldIrql);
-   Request = EiDequeueMessagePort(Port);
-   KeReleaseSpinLock(&Port->Lock, oldIrql);
-
-   if (Request == NULL)
-     {
-       ObDereferenceObject(Port);
-       return STATUS_UNSUCCESSFUL;
-     }
-
-   if (Request->Message.u2.s2.Type == LPC_CONNECTION_REQUEST)
-     {
-       PORT_MESSAGE Header;
-       PEPORT_CONNECT_REQUEST_MESSAGE CRequest;
-
-       CRequest = (PEPORT_CONNECT_REQUEST_MESSAGE)&Request->Message;
-       memcpy(&Header, &Request->Message, sizeof(PORT_MESSAGE));
-       Header.u1.s1.DataLength = (CSHORT)CRequest->ConnectDataLength;
-       Header.u1.s1.TotalLength = Header.u1.s1.DataLength + sizeof(PORT_MESSAGE);
-       
-       if (PreviousMode != KernelMode)
-         {
-           _SEH_TRY
-             {
-               ProbeForWrite((PVOID)(ReceiveMessage + 1),
-                             CRequest->ConnectDataLength,
-                             1);
-
-               RtlCopyMemory(ReceiveMessage,
-                             &Header,
-                             sizeof(PORT_MESSAGE));
-               RtlCopyMemory((PVOID)(ReceiveMessage + 1),
-                             CRequest->ConnectData,
-                             CRequest->ConnectDataLength);
-             }
-           _SEH_HANDLE
-             {
-               Status = _SEH_GetExceptionCode();
-             }
-           _SEH_END;
-         }
-       else
-         {
-           RtlCopyMemory(ReceiveMessage,
-                         &Header,
-                         sizeof(PORT_MESSAGE));
-           RtlCopyMemory((PVOID)(ReceiveMessage + 1),
-                         CRequest->ConnectData,
-                         CRequest->ConnectDataLength);
-         }
-     }
-   else
-     {
-       if (PreviousMode != KernelMode)
-         {
-           _SEH_TRY
-             {
-               ProbeForWrite(ReceiveMessage,
-                             Request->Message.u1.s1.TotalLength,
-                             1);
-
-               RtlCopyMemory(ReceiveMessage,
-                             &Request->Message,
-                             Request->Message.u1.s1.TotalLength);
-             }
-           _SEH_HANDLE
-             {
-               Status = _SEH_GetExceptionCode();
-             }
-           _SEH_END;
-         }
-       else
-         {
-           RtlCopyMemory(ReceiveMessage,
-                         &Request->Message,
-                         Request->Message.u1.s1.TotalLength);
-         }
-     }
-   if (!NT_SUCCESS(Status))
-     {
-       /*
-	* Copying the message to the caller's buffer failed so
-	* undo what we did and return.
-	* FIXME: Also increment semaphore.
-	*/
-       KeAcquireSpinLock(&Port->Lock, &oldIrql);
-       EiEnqueueMessageAtHeadPort(Port, Request);
-       KeReleaseSpinLock(&Port->Lock, oldIrql);
-       ObDereferenceObject(Port);
-       return(Status);
-     }
-   if (Request->Message.u2.s2.Type == LPC_CONNECTION_REQUEST)
-     {
-       KeAcquireSpinLock(&Port->Lock, &oldIrql);
-       EiEnqueueConnectMessagePort(Port, Request);
-       KeReleaseSpinLock(&Port->Lock, oldIrql);
-     }
-   else
-     {
-       ExFreePool(Request);
-     }
-
-   /*
-    * Dereference the port
-    */
-   ObDereferenceObject(Port);
-   return(STATUS_SUCCESS);
+    /* Copy the Message Data */
+    RtlMoveMemory(Destination + 1,
+                  Data,
+                  ((Destination->u1.Length & 0xFFFF) + 3) &~3);
 }
 
+/* PUBLIC FUNCTIONS **********************************************************/
 
-/**********************************************************************
- * NAME						EXPORTED
- *	NtReplyWaitReceivePort
- *
- * DESCRIPTION
- *	Can be used with waitable ports.
- *
- * ARGUMENTS
- * 	PortHandle
- * 	PortId
- * 	LpcReply
- * 	LpcMessage
- *
- * RETURN VALUE
- *
- * REVISIONS
+/*
+ * @unimplemented
  */
-NTSTATUS STDCALL
-NtReplyWaitReceivePort(IN HANDLE PortHandle,
-                       OUT PVOID *PortContext OPTIONAL,
-                       IN PPORT_MESSAGE ReplyMessage OPTIONAL,
-                       OUT PPORT_MESSAGE ReceiveMessage)
+NTSTATUS
+NTAPI
+NtReplyPort(IN HANDLE PortHandle,
+            IN PPORT_MESSAGE LpcReply)
 {
-    return NtReplyWaitReceivePortEx(PortHandle,
-				                    PortContext,
-				                    ReplyMessage,
-				                    ReceiveMessage,
-				                    NULL);
-}
-
-/**********************************************************************
- * NAME
- *
- * DESCRIPTION
- *
- * ARGUMENTS
- *
- * RETURN VALUE
- *
- * REVISIONS
- */
-NTSTATUS STDCALL
-NtReplyWaitReplyPort (HANDLE		PortHandle,
-		      PPORT_MESSAGE	ReplyMessage)
-{
-   UNIMPLEMENTED;
-   return(STATUS_NOT_IMPLEMENTED);
+    UNIMPLEMENTED;
+    return STATUS_NOT_IMPLEMENTED;
 }
 
 /*
@@ -423,36 +143,349 @@ NtReplyWaitReplyPort (HANDLE		PortHandle,
  */
 NTSTATUS
 NTAPI
-LpcRequestWaitReplyPort(IN PVOID Port,
-                        IN PPORT_MESSAGE LpcMessageRequest,
-                        OUT PPORT_MESSAGE LpcMessageReply)
+NtReplyWaitReceivePortEx(IN HANDLE PortHandle,
+                         OUT PVOID *PortContext OPTIONAL,
+                         IN PPORT_MESSAGE ReplyMessage OPTIONAL,
+                         OUT PPORT_MESSAGE ReceiveMessage,
+                         IN PLARGE_INTEGER Timeout OPTIONAL)
 {
-    HANDLE PortHandle;
+    PLPCP_PORT_OBJECT Port, ReceivePort;
+    KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(), WaitMode = PreviousMode;
     NTSTATUS Status;
-    UNICODE_STRING PortName;
-    ULONG ConnectInfoLength;
+    PLPCP_MESSAGE Message;
+    PETHREAD Thread = PsGetCurrentThread(), WakeupThread;
+    PLPCP_CONNECTION_MESSAGE ConnectMessage;
+    ULONG ConnectionInfoLength;
+    PAGED_CODE();
+    LPCTRACE(LPC_REPLY_DEBUG,
+             "Handle: %lx. Messages: %p/%p. Context: %p\n",
+             PortHandle,
+             ReplyMessage,
+             ReceiveMessage,
+             PortContext);
 
-    //
-    // OMG HAXX!
-    //
-    RtlInitUnicodeString(&PortName, L"\\Windows\\ApiPort");
-    ConnectInfoLength = 0;
-    Status = ZwConnectPort(&PortHandle,
-                           &PortName,
-                           NULL,
-                           NULL,
-                           NULL,
-                           NULL,
-                           NULL,
-                           &ConnectInfoLength);
+    /* If this is a system thread, then let it page out its stack */
+    if (Thread->SystemThread) WaitMode = UserMode;
 
-    Status = ZwRequestWaitReplyPort(PortHandle,
-                                    LpcMessageRequest,
-                                    LpcMessageReply);
+    /* Check if caller has a reply message */
+    if (ReplyMessage)
+    {
+        /* Validate its length */
+        if ((ReplyMessage->u1.s1.DataLength + sizeof(PORT_MESSAGE)) >
+            ReplyMessage->u1.s1.TotalLength)
+        {
+            /* Fail */
+            return STATUS_INVALID_PARAMETER;
+        }
 
-    /* Close the handle */
-    ObCloseHandle(PortHandle, KernelMode);
+        /* Make sure it has a valid ID */
+        if (!ReplyMessage->MessageId) return STATUS_INVALID_PARAMETER;
+    }
+
+    /* Get the Port object */
+    Status = ObReferenceObjectByHandle(PortHandle,
+                                       0,
+                                       LpcPortObjectType,
+                                       PreviousMode,
+                                       (PVOID*)&Port,
+                                       NULL);
+    if (!NT_SUCCESS(Status)) return Status;
+
+    /* Check if the caller has a reply message */
+    if (ReplyMessage)
+    {
+        /* Validate its length in respect to the port object */
+        if ((ReplyMessage->u1.s1.TotalLength > Port->MaxMessageLength) ||
+            (ReplyMessage->u1.s1.TotalLength <= ReplyMessage->u1.s1.DataLength))
+        {
+            /* Too large, fail */
+            ObDereferenceObject(Port);
+            return STATUS_PORT_MESSAGE_TOO_LONG;
+        }
+    }
+
+    /* Check if this is anything but a client port */
+    if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_CLIENT_PORT)
+    {
+        /* Use the connection port */
+        ReceivePort = Port->ConnectionPort;
+    }
+    else
+    {
+        /* Otherwise, use the port itself */
+        ReceivePort = Port;
+    }
+
+    /* Check if the caller gave a reply message */
+    if (ReplyMessage)
+    {
+        /* Get the ETHREAD corresponding to it */
+        Status = PsLookupProcessThreadByCid(&ReplyMessage->ClientId,
+                                            NULL,
+                                            &WakeupThread);
+        if (!NT_SUCCESS(Status))
+        {
+            /* No thread found, fail */
+            ObDereferenceObject(Port);
+            return Status;
+        }
+
+        /* Allocate a message from the port zone */
+        Message = LpcpAllocateFromPortZone();
+        if (!Message)
+        {
+            /* Fail if we couldn't allocate a message */
+            ObDereferenceObject(WakeupThread);
+            ObDereferenceObject(Port);
+            return STATUS_NO_MEMORY;
+        }
+
+        /* Keep the lock acquired */
+        KeAcquireGuardedMutex(&LpcpLock);
+
+        /* Make sure this is the reply the thread is waiting for */
+        if (WakeupThread->LpcReplyMessageId != ReplyMessage->MessageId)
+        {
+            /* It isn't, fail */
+            LpcpFreeToPortZone(Message, TRUE);
+            KeReleaseGuardedMutex(&LpcpLock);
+            ObDereferenceObject(WakeupThread);
+            ObDereferenceObject(Port);
+            return STATUS_REPLY_MESSAGE_MISMATCH;
+        }
+
+        /* Copy the message */
+        LpcpMoveMessage(&Message->Request,
+                        ReplyMessage,
+                        ReplyMessage + 1,
+                        LPC_REPLY,
+                        NULL);
+
+        /* Free any data information */
+        LpcpFreeDataInfoMessage(Port,
+                                ReplyMessage->MessageId,
+                                ReplyMessage->CallbackId);
+
+        /* Reference the thread while we use it */
+        ObReferenceObject(WakeupThread);
+        Message->RepliedToThread = WakeupThread;
+
+        /* Set this as the reply message */
+        WakeupThread->LpcReplyMessageId = 0;
+        WakeupThread->LpcReplyMessage = (PVOID)Message;
+
+        /* Check if we have messages on the reply chain */
+        if (!(WakeupThread->LpcExitThreadCalled) &&
+            !(IsListEmpty(&WakeupThread->LpcReplyChain)))
+        {
+            /* Remove us from it and reinitialize it */
+            RemoveEntryList(&WakeupThread->LpcReplyChain);
+            InitializeListHead(&WakeupThread->LpcReplyChain);
+        }
+
+        /* Check if this is the message the thread had received */
+        if ((Thread->LpcReceivedMsgIdValid) &&
+            (Thread->LpcReceivedMessageId == ReplyMessage->MessageId))
+        {
+            /* Clear this data */
+            Thread->LpcReceivedMessageId = 0;
+            Thread->LpcReceivedMsgIdValid = FALSE;
+        }
+
+        /* Release the lock and release the LPC semaphore to wake up waiters */
+        KeReleaseGuardedMutex(&LpcpLock);
+        LpcpCompleteWait(&WakeupThread->LpcReplySemaphore);
+
+        /* Now we can let go of the thread */
+        ObDereferenceObject(WakeupThread);
+    }
+
+    /* Now wait for someone to reply to us */
+    LpcpReceiveWait(ReceivePort->MsgQueue.Semaphore, WaitMode);
+    if (Status != STATUS_SUCCESS) goto Cleanup;
+
+    /* Wait done, get the LPC lock */
+    KeAcquireGuardedMutex(&LpcpLock);
+
+    /* Check if we've received nothing */
+    if (IsListEmpty(&ReceivePort->MsgQueue.ReceiveHead))
+    {
+        /* Check if this was a waitable port and wake it */
+        if (ReceivePort->Flags & LPCP_WAITABLE_PORT)
+        {
+            /* Reset its event */
+            KeResetEvent(&ReceivePort->WaitEvent);
+        }
+
+        /* Release the lock and fail */
+        KeReleaseGuardedMutex(&LpcpLock);
+        ObDereferenceObject(Port);
+        return STATUS_UNSUCCESSFUL;
+    }
+
+    /* Get the message on the queue */
+    Message = CONTAINING_RECORD(RemoveHeadList(&ReceivePort->
+                                               MsgQueue.ReceiveHead),
+                                LPCP_MESSAGE,
+                                Entry);
+
+    /* Check if the queue is empty now */
+    if (IsListEmpty(&ReceivePort->MsgQueue.ReceiveHead))
+    {
+        /* Check if this was a waitable port */
+        if (ReceivePort->Flags & LPCP_WAITABLE_PORT)
+        {
+            /* Reset its event */
+            KeResetEvent(&ReceivePort->WaitEvent);
+        }
+    }
+
+    /* Re-initialize the message's list entry */
+    InitializeListHead(&Message->Entry);
+
+    /* Set this as the received message */
+    Thread->LpcReceivedMessageId = Message->Request.MessageId;
+    Thread->LpcReceivedMsgIdValid = TRUE;
+
+    /* Done touching global data, release the lock */
+    KeReleaseGuardedMutex(&LpcpLock);
+
+    /* Check if this was a connection request */
+    if (LpcpGetMessageType(&Message->Request) == LPC_CONNECTION_REQUEST)
+    {
+        /* Get the connection message */
+        ConnectMessage = (PLPCP_CONNECTION_MESSAGE)(Message + 1);
+        LPCTRACE(LPC_REPLY_DEBUG,
+                 "Request Messages: %p/%p\n",
+                 Message,
+                 ConnectMessage);
+
+        /* Get its length */
+        ConnectionInfoLength = Message->Request.u1.s1.DataLength -
+                               sizeof(LPCP_CONNECTION_MESSAGE);
+
+        /* Return it as the receive message */
+        *ReceiveMessage = Message->Request;
+
+        /* Clear our stack variable so the message doesn't get freed */
+        Message = NULL;
+
+        /* Setup the receive message */
+        ReceiveMessage->u1.s1.TotalLength = sizeof(LPCP_MESSAGE) +
+                                            ConnectionInfoLength;
+        ReceiveMessage->u1.s1.DataLength = ConnectionInfoLength;
+        RtlMoveMemory(ReceiveMessage + 1,
+                      ConnectMessage + 1,
+                      ConnectionInfoLength);
+
+        /* Clear the port context if the caller requested one */
+        if (PortContext) *PortContext = NULL;
+    }
+    else if (Message->Request.u2.s2.Type != LPC_REPLY)
+    {
+        /* Otherwise, this is a new message or event */
+        LPCTRACE(LPC_REPLY_DEBUG,
+                 "Non-Reply Messages: %p/%p\n",
+                 &Message->Request,
+                 (&Message->Request) + 1);
+
+        /* Copy it */
+        LpcpMoveMessage(ReceiveMessage,
+                        &Message->Request,
+                        (&Message->Request) + 1,
+                        0,
+                        NULL);
+
+        /* Return its context */
+        if (PortContext) *PortContext = Message->PortContext;
+
+        /* And check if it has data information */
+        if (Message->Request.u2.s2.DataInfoOffset)
+        {
+            /* It does, save it, and don't free the message below */
+            LpcpSaveDataInfoMessage(Port, Message);
+            Message = NULL;
+        }
+    }
+    else
+    {
+        /* This is a reply message, should never happen! */
+        ASSERT(FALSE);
+    }
+
+    /* If we have a message pointer here, free it */
+    if (Message) LpcpFreeToPortZone(Message, FALSE);
+
+Cleanup:
+    /* All done, dereference the port and return the status */
+    LPCTRACE(LPC_REPLY_DEBUG,
+             "Port: %p. Status: %p\n",
+             Port,
+             Status);
+    ObDereferenceObject(Port);
     return Status;
 }
 
+/*
+ * @implemented
+ */
+NTSTATUS
+NTAPI
+NtReplyWaitReceivePort(IN HANDLE PortHandle,
+                       OUT PVOID *PortContext OPTIONAL,
+                       IN PPORT_MESSAGE ReplyMessage OPTIONAL,
+                       OUT PPORT_MESSAGE ReceiveMessage)
+{
+    /* Call the newer API */
+    return NtReplyWaitReceivePortEx(PortHandle,
+                                    PortContext,
+                                    ReplyMessage,
+                                    ReceiveMessage,
+                                    NULL);
+}
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+NTAPI
+NtReplyWaitReplyPort(IN HANDLE PortHandle,
+                     IN PPORT_MESSAGE ReplyMessage)
+{
+    UNIMPLEMENTED;
+    return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+NTAPI
+NtReadRequestData(IN HANDLE PortHandle,
+                  IN PPORT_MESSAGE Message,
+                  IN ULONG Index,
+                  IN PVOID Buffer,
+                  IN ULONG BufferLength,
+                  OUT PULONG Returnlength)
+{
+    UNIMPLEMENTED;
+    return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+NTAPI
+NtWriteRequestData(IN HANDLE PortHandle,
+                   IN PPORT_MESSAGE Message,
+                   IN ULONG Index,
+                   IN PVOID Buffer,
+                   IN ULONG BufferLength,
+                   OUT PULONG ReturnLength)
+{
+    UNIMPLEMENTED;
+    return STATUS_NOT_IMPLEMENTED;
+}
+
 /* EOF */
diff --git a/reactos/ntoskrnl/lpc/send.c b/reactos/ntoskrnl/lpc/send.c
index 1dc522f7e66..f49e0a6550f 100644
--- a/reactos/ntoskrnl/lpc/send.c
+++ b/reactos/ntoskrnl/lpc/send.c
@@ -1,395 +1,426 @@
-/* $Id$
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
+/*
+ * PROJECT:         ReactOS Kernel
+ * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            ntoskrnl/lpc/send.c
- * PURPOSE:         Communication mechanism
- *
- * PROGRAMMERS:     David Welch (welch@cwcom.net)
+ * PURPOSE:         Local Procedure Call: Sending (Requests)
+ * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
  */
 
-/* INCLUDES *****************************************************************/
+/* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
-
+#include "lpc.h"
 #define NDEBUG
 #include <internal/debug.h>
 
-/**********************************************************************
- * NAME
- *	LpcRequestPort/2
- *
- * DESCRIPTION
- *
- * ARGUMENTS
- *
- * RETURN VALUE
- *
- * REVISIONS
- *	2002-03-01 EA
- *	I investigated this function a bit more in depth.
- *	It looks like the legal values for the MessageType field in the
- *	message to send are in the range LPC_NEW_MESSAGE .. LPC_CLIENT_DIED,
- *	but LPC_DATAGRAM is explicitly forbidden.
- *
+/* PUBLIC FUNCTIONS **********************************************************/
+
+/*
  * @implemented
  */
-NTSTATUS STDCALL LpcRequestPort (IN	PVOID		PortObject,
-				 IN	PPORT_MESSAGE	LpcMessage)
+NTSTATUS
+NTAPI
+LpcRequestPort(IN PVOID PortObject,
+               IN PPORT_MESSAGE LpcMessage)
 {
-   NTSTATUS Status;
-   PEPORT Port = (PEPORT)PortObject;
+    PLPCP_PORT_OBJECT Port = (PLPCP_PORT_OBJECT)PortObject, QueuePort;
+    ULONG MessageType;
+    PLPCP_MESSAGE Message;
+    KPROCESSOR_MODE PreviousMode = KeGetPreviousMode();
+    PAGED_CODE();
+    LPCTRACE(LPC_SEND_DEBUG, "Port: %p. Message: %p\n", Port, LpcMessage);
 
-   DPRINT("LpcRequestPort(PortHandle %08x, LpcMessage %08x)\n", Port, LpcMessage);
+    /* Check if this is a non-datagram message */
+    if (LpcMessage->u2.s2.Type)
+    {
+        /* Get the message type */
+        MessageType = LpcpGetMessageType(LpcMessage);
 
-#ifdef __USE_NT_LPC__
-   /* Check the message's type */
-   if (LPC_NEW_MESSAGE == LpcMessage->u2.s2.Type)
-   {
-      LpcMessage->u2.s2.Type = LPC_DATAGRAM;
-   }
-   else if (LPC_DATAGRAM == LpcMessage->u2.s2.Type)
-   {
-      return STATUS_INVALID_PARAMETER;
-   }
-   else if (LpcMessage->u2.s2.Type > LPC_CLIENT_DIED)
-   {
-      return STATUS_INVALID_PARAMETER;
-   }
-   /* Check the range offset */
-   if (0 != LpcMessage->VirtualRangesOffset)
-   {
-      return STATUS_INVALID_PARAMETER;
-   }
-#endif
+        /* Validate it */
+        if ((MessageType < LPC_DATAGRAM) || (MessageType > LPC_CLIENT_DIED))
+        {
+            /* Fail */
+            return STATUS_INVALID_PARAMETER;
+        }
 
-   Status = EiReplyOrRequestPort(Port,
-				 LpcMessage,
-				 LPC_DATAGRAM,
-				 Port);
-   KeReleaseSemaphore( &Port->Semaphore, IO_NO_INCREMENT, 1, FALSE );
+        /* Mark this as a kernel-mode message only if we really came from there */
+        if ((PreviousMode == KernelMode) &&
+            (LpcMessage->u2.s2.Type & LPC_KERNELMODE_MESSAGE))
+        {
+            /* We did, this is a kernel mode message */
+            MessageType |= LPC_KERNELMODE_MESSAGE;
+        }
+    }
+    else
+    {
+        /* This is a datagram */
+        MessageType = LPC_DATAGRAM;
+    }
 
-   return(Status);
+    /* Can't have data information on this type of call */
+    if (LpcMessage->u2.s2.DataInfoOffset) return STATUS_INVALID_PARAMETER;
+
+    /* Validate message sizes */
+    if ((LpcMessage->u1.s1.TotalLength > Port->MaxMessageLength) ||
+        (LpcMessage->u1.s1.TotalLength <= LpcMessage->u1.s1.DataLength))
+    {
+        /* Fail */
+        return STATUS_PORT_MESSAGE_TOO_LONG;
+    }
+
+    /* Allocate a new message */
+    Message = LpcpAllocateFromPortZone();
+    if (!Message) return STATUS_NO_MEMORY;
+
+    /* Clear the context */
+    Message->PortContext = NULL;
+
+    /* Copy the message */
+    LpcpMoveMessage(&Message->Request,
+                    LpcMessage,
+                    LpcMessage + 1,
+                    MessageType,
+                    &PsGetCurrentThread()->Cid);
+
+    /* Acquire the LPC lock */
+    KeAcquireGuardedMutex(&LpcpLock);
+
+    /* Check if this is anything but a connection port */
+    if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_CONNECTION_PORT)
+    {
+        /* The queue port is the connected port */
+        QueuePort = Port->ConnectedPort;
+        if (QueuePort)
+        {
+            /* Check if this is a client port */
+            if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CLIENT_PORT)
+            {
+                /* Then copy the context */
+                Message->PortContext = QueuePort->PortContext;
+                QueuePort = Port->ConnectionPort;
+            }
+            else if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_COMMUNICATION_PORT)
+            {
+                /* Any other kind of port, use the connection port */
+                QueuePort = Port->ConnectionPort;
+            }
+        }
+    }
+    else
+    {
+        /* For connection ports, use the port itself */
+        QueuePort = PortObject;
+    }
+
+    /* Make sure we have a port */
+    if (QueuePort)
+    {
+        /* Generate the Message ID and set it */
+        Message->Request.MessageId =  LpcpNextMessageId++;
+        if (!LpcpNextMessageId) LpcpNextMessageId = 1;
+        Message->Request.CallbackId = 0;
+
+        /* No Message ID for the thread */
+        PsGetCurrentThread()->LpcReplyMessageId = 0;
+
+        /* Insert the message in our chain */
+        InsertTailList(&QueuePort->MsgQueue.ReceiveHead, &Message->Entry);
+
+        /* Release the lock and release the semaphore */
+        KeReleaseGuardedMutex(&LpcpLock);
+        LpcpCompleteWait(QueuePort->MsgQueue.Semaphore);
+
+        /* If this is a waitable port, wake it up */
+        if (QueuePort->Flags & LPCP_WAITABLE_PORT)
+        {
+            /* Wake it */
+            KeSetEvent(&QueuePort->WaitEvent, IO_NO_INCREMENT, FALSE);
+        }
+
+        /* We're done */
+        LPCTRACE(LPC_SEND_DEBUG, "Port: %p. Message: %p\n", QueuePort, Message);
+        return STATUS_SUCCESS;
+    }
+
+    /* If we got here, then free the message and fail */
+    LpcpFreeToPortZone(Message, TRUE);
+    KeReleaseGuardedMutex(&LpcpLock);
+    return STATUS_PORT_DISCONNECTED;
 }
 
+/*
+* @unimplemented
+*/
+NTSTATUS
+NTAPI
+LpcRequestWaitReplyPort(IN PVOID Port,
+                        IN PPORT_MESSAGE LpcMessageRequest,
+                        OUT PPORT_MESSAGE LpcMessageReply)
+{
+    UNIMPLEMENTED;
+    return STATUS_NOT_IMPLEMENTED;
+}
 
-/**********************************************************************
- * NAME
- *	NtRequestPort/2
- *
- * DESCRIPTION
- *
- * ARGUMENTS
- *
- * RETURN VALUE
- *
- * REVISIONS
- *
+/*
+ * @unimplemented
+ */
+NTSTATUS
+NTAPI
+NtRequestPort(IN HANDLE PortHandle,
+              IN PPORT_MESSAGE LpcMessage)
+{
+    UNIMPLEMENTED;
+    return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
  * @implemented
  */
-NTSTATUS STDCALL NtRequestPort (IN	HANDLE		PortHandle,
-				IN	PPORT_MESSAGE	LpcMessage)
+NTSTATUS
+NTAPI
+NtRequestWaitReplyPort(IN HANDLE PortHandle,
+                       IN PPORT_MESSAGE LpcRequest,
+                       IN OUT PPORT_MESSAGE LpcReply)
 {
-   NTSTATUS Status;
-   PEPORT Port;
+    PLPCP_PORT_OBJECT Port, QueuePort, ReplyPort;
+    KPROCESSOR_MODE PreviousMode = KeGetPreviousMode();
+    NTSTATUS Status;
+    PLPCP_MESSAGE Message;
+    PETHREAD Thread = PsGetCurrentThread();
+    BOOLEAN Callback;
+    PKSEMAPHORE Semaphore;
+    ULONG MessageType;
+    PAGED_CODE();
+    LPCTRACE(LPC_SEND_DEBUG,
+             "Handle: %lx. Messages: %p/%p. Type: %lx\n",
+             PortHandle,
+             LpcRequest,
+             LpcReply,
+             LpcpGetMessageType(LpcRequest));
 
-   DPRINT("NtRequestPort(PortHandle %x LpcMessage %x)\n", PortHandle,
-	  LpcMessage);
+    /* Check if the thread is dying */
+    if (Thread->LpcExitThreadCalled) return STATUS_THREAD_IS_TERMINATING;
 
-   Status = ObReferenceObjectByHandle(PortHandle,
-				      PORT_ALL_ACCESS,
-				      LpcPortObjectType,
-				      UserMode,
-				      (PVOID*)&Port,
-				      NULL);
-   if (!NT_SUCCESS(Status))
-     {
-	DPRINT("NtRequestPort() = %x\n", Status);
-	return(Status);
-     }
+    /* Check if this is an LPC Request */
+    if (LpcpGetMessageType(LpcRequest) == LPC_REQUEST)
+    {
+        /* Then it's a callback */
+        Callback = TRUE;
+    }
+    else if (LpcpGetMessageType(LpcRequest))
+    {
+        /* This is a not kernel-mode message */
+        return STATUS_INVALID_PARAMETER;
+    }
+    else
+    {
+        /* This is a kernel-mode message without a callback */
+        LpcRequest->u2.s2.Type |= LPC_REQUEST;
+        Callback = FALSE;
+    }
 
-   Status = LpcRequestPort(Port->OtherPort,
-			   LpcMessage);
+    /* Get the message type */
+    MessageType = LpcRequest->u2.s2.Type;
 
-   ObDereferenceObject(Port);
-   return(Status);
+    /* Validate the length */
+    if ((LpcRequest->u1.s1.DataLength + sizeof(PORT_MESSAGE)) >
+         LpcRequest->u1.s1.TotalLength)
+    {
+        /* Fail */
+        return STATUS_INVALID_PARAMETER;
+    }
+
+    /* Reference the object */
+    Status = ObReferenceObjectByHandle(PortHandle,
+                                       0,
+                                       LpcPortObjectType,
+                                       PreviousMode,
+                                       (PVOID*)&Port,
+                                       NULL);
+    if (!NT_SUCCESS(Status)) return Status;
+
+    /* Validate the message length */
+    if ((LpcRequest->u1.s1.TotalLength > Port->MaxMessageLength) ||
+        (LpcRequest->u1.s1.TotalLength <= LpcRequest->u1.s1.DataLength))
+    {
+        /* Fail */
+        ObDereferenceObject(Port);
+        return STATUS_PORT_MESSAGE_TOO_LONG;
+    }
+
+    /* Allocate a message from the port zone */
+    Message = LpcpAllocateFromPortZone();
+    if (!Message)
+    {
+        /* Fail if we couldn't allocate a message */
+        ObDereferenceObject(Port);
+        return STATUS_NO_MEMORY;
+    }
+
+    /* Check if this is a callback */
+    if (Callback)
+    {
+        /* FIXME: TODO */
+        Semaphore = NULL; // we'd use the Thread Semaphore here
+        ASSERT(FALSE);
+    }
+    else
+    {
+        /* No callback, just copy the message */
+        LpcpMoveMessage(&Message->Request,
+                        LpcRequest,
+                        LpcRequest + 1,
+                        MessageType,
+                        &Thread->Cid);
+
+        /* Acquire the LPC lock */
+        KeAcquireGuardedMutex(&LpcpLock);
+
+        /* Right now clear the port context */
+        Message->PortContext = NULL;
+
+        /* Check if this is a not connection port */
+        if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_CONNECTION_PORT)
+        {
+            /* We want the connected port */
+            QueuePort = Port->ConnectedPort;
+            if (!QueuePort)
+            {
+                /* We have no connected port, fail */
+                LpcpFreeToPortZone(Message, TRUE);
+                KeReleaseGuardedMutex(&LpcpLock);
+                ObDereferenceObject(Port);
+                return STATUS_PORT_DISCONNECTED;
+            }
+
+            /* This will be the rundown port */
+            ReplyPort = QueuePort;
+
+            /* Check if this is a communication port */
+            if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CLIENT_PORT)
+            {
+                /* Copy the port context and use the connection port */
+                Message->PortContext = ReplyPort->PortContext;
+                QueuePort = Port->ConnectionPort;
+            }
+            else if ((Port->Flags & LPCP_PORT_TYPE_MASK) !=
+                      LPCP_COMMUNICATION_PORT)
+            {
+                /* Use the connection port for anything but communication ports */
+                QueuePort = Port->ConnectionPort;
+            }
+        }
+        else
+        {
+            /* Otherwise, for a connection port, use the same port object */
+            QueuePort = ReplyPort = Port;
+        }
+
+        /* No reply thread */
+        Message->RepliedToThread = NULL;
+
+        /* Generate the Message ID and set it */
+        Message->Request.MessageId =  LpcpNextMessageId++;
+        if (!LpcpNextMessageId) LpcpNextMessageId = 1;
+        Message->Request.CallbackId = 0;
+
+        /* Set the message ID for our thread now */
+        Thread->LpcReplyMessageId = Message->Request.MessageId;
+        Thread->LpcReplyMessage = NULL;
+
+        /* Insert the message in our chain */
+        InsertTailList(&QueuePort->MsgQueue.ReceiveHead, &Message->Entry);
+        InsertTailList(&ReplyPort->LpcReplyChainHead, &Thread->LpcReplyChain);
+
+        /* Release the lock and get the semaphore we'll use later */
+        KeReleaseGuardedMutex(&LpcpLock);
+        Semaphore = QueuePort->MsgQueue.Semaphore;
+
+        /* If this is a waitable port, wake it up */
+        if (QueuePort->Flags & LPCP_WAITABLE_PORT)
+        {
+            /* Wake it */
+            KeSetEvent(&QueuePort->WaitEvent, IO_NO_INCREMENT, FALSE);
+        }
+    }
+
+    /* Now release the semaphore */
+    LpcpCompleteWait(Semaphore);
+
+    /* And let's wait for the reply */
+    LpcpReplyWait(&Thread->LpcReplySemaphore, PreviousMode);
+
+    /* Acquire the LPC lock */
+    KeAcquireGuardedMutex(&LpcpLock);
+
+    /* Get the LPC Message and clear our thread's reply data */
+    Message = Thread->LpcReplyMessage;
+    Thread->LpcReplyMessage = NULL;
+    Thread->LpcReplyMessageId = 0;
+
+    /* Check if we have anything on the reply chain*/
+    if (!IsListEmpty(&Thread->LpcReplyChain))
+    {
+        /* Remove this thread and reinitialize the list */
+        RemoveEntryList(&Thread->LpcReplyChain);
+        InitializeListHead(&Thread->LpcReplyChain);
+    }
+
+    /* Release the lock */
+    KeReleaseGuardedMutex(&LpcpLock);
+
+    /* Check if we got a reply */
+    if (Status == STATUS_SUCCESS)
+    {
+        /* Check if we have a valid message */
+        if (Message)
+        {
+            LPCTRACE(LPC_SEND_DEBUG,
+                     "Reply Messages: %p/%p\n",
+                     &Message->Request,
+                     (&Message->Request) + 1);
+
+            /* Move the message */
+            LpcpMoveMessage(LpcReply,
+                            &Message->Request,
+                            (&Message->Request) + 1,
+                            0,
+                            NULL);
+
+            /* Check if this is an LPC request with data information */
+            if ((LpcpGetMessageType(&Message->Request) == LPC_REQUEST) &&
+                (Message->Request.u2.s2.DataInfoOffset))
+            {
+                /* Save the data information */
+                LpcpSaveDataInfoMessage(Port, Message);
+            }
+            else
+            {
+                /* Otherwise, just free it */
+                LpcpFreeToPortZone(Message, FALSE);
+            }
+        }
+        else
+        {
+            /* We don't have a reply */
+            Status = STATUS_LPC_REPLY_LOST;
+        }
+    }
+    else
+    {
+        /* The wait failed, free the message while holding the lock */
+        KeAcquireGuardedMutex(&LpcpLock);
+        LpcpFreeToPortZone(Message, TRUE);
+        KeReleaseGuardedMutex(&LpcpLock);
+    }
+
+    /* All done */
+    LPCTRACE(LPC_SEND_DEBUG,
+             "Port: %p. Status: %p\n",
+             Port,
+             Status);
+    ObDereferenceObject(Port);
+    return Status;
 }
 
-
-/**********************************************************************
- * NAME
- *	NtRequestWaitReplyPort/3
- *
- * DESCRIPTION
- *
- * ARGUMENTS
- *
- * RETURN VALUE
- *
- * REVISIONS
- *
- * @implemented
- */
-NTSTATUS STDCALL
-NtRequestWaitReplyPort (IN HANDLE PortHandle,
-			PPORT_MESSAGE UnsafeLpcRequest,
-			PPORT_MESSAGE UnsafeLpcReply)
-{
-   PETHREAD CurrentThread;
-   struct _KPROCESS *AttachedProcess;
-   PEPORT Port;
-   PQUEUEDMESSAGE Message;
-   KIRQL oldIrql;
-   PPORT_MESSAGE LpcRequest;
-   USHORT LpcRequestMessageSize = 0, LpcRequestDataSize = 0;
-   KPROCESSOR_MODE PreviousMode;
-   NTSTATUS Status = STATUS_SUCCESS;
-   
-   PreviousMode = ExGetPreviousMode();
-   
-   if (PreviousMode != KernelMode)
-     {
-       _SEH_TRY
-         {
-           ProbeForRead(UnsafeLpcRequest,
-                        sizeof(PORT_MESSAGE),
-                        1);
-           ProbeForWrite(UnsafeLpcReply,
-                         sizeof(PORT_MESSAGE),
-                         1);
-           LpcRequestMessageSize = UnsafeLpcRequest->u1.s1.TotalLength;
-         }
-       _SEH_HANDLE
-         {
-           Status = _SEH_GetExceptionCode();
-         }
-       _SEH_END;
-       
-       if (!NT_SUCCESS(Status))
-         {
-           return Status;
-         }
-     }
-   else
-     {
-       LpcRequestMessageSize = UnsafeLpcRequest->u1.s1.TotalLength;
-     }
-
-   DPRINT("NtRequestWaitReplyPort(PortHandle %x, LpcRequest %x, "
-	  "LpcReply %x)\n", PortHandle, UnsafeLpcRequest, UnsafeLpcReply);
-
-   Status = ObReferenceObjectByHandle(PortHandle,
-				      PORT_ALL_ACCESS,
-				      LpcPortObjectType,
-				      UserMode,
-				      (PVOID*)&Port,
-				      NULL);
-   if (!NT_SUCCESS(Status))
-     {
-	return(Status);
-     }
-
-   if (EPORT_DISCONNECTED == Port->State)
-     {
-	ObDereferenceObject(Port);
-	return STATUS_PORT_DISCONNECTED;
-     }
-
-   /* win32k sometimes needs to KeAttach() the CSRSS process in order to make
-      the PortHandle valid. Now that we've got the EPORT structure from the
-      handle we can undo this, so everything is normal again. Need to
-      re-KeAttach() before returning though */
-   CurrentThread = PsGetCurrentThread();
-   if (&CurrentThread->ThreadsProcess->Pcb == CurrentThread->Tcb.ApcState.Process)
-     {
-       AttachedProcess = NULL;
-     }
-   else
-     {
-       AttachedProcess = CurrentThread->Tcb.ApcState.Process;
-       KeDetachProcess();
-     }
-
-   if (LpcRequestMessageSize > LPC_MAX_MESSAGE_LENGTH)
-     {
-       if (NULL != AttachedProcess)
-         {
-           KeAttachProcess(AttachedProcess);
-         }
-       ObDereferenceObject(Port);
-       return(STATUS_PORT_MESSAGE_TOO_LONG);
-     }
-   LpcRequest = ExAllocatePool(NonPagedPool, LpcRequestMessageSize);
-   if (LpcRequest == NULL)
-     {
-       if (NULL != AttachedProcess)
-         {
-           KeAttachProcess(AttachedProcess);
-         }
-       ObDereferenceObject(Port);
-       return(STATUS_NO_MEMORY);
-     }
-   if (PreviousMode != KernelMode)
-     {
-       _SEH_TRY
-         {
-           RtlCopyMemory(LpcRequest,
-                         UnsafeLpcRequest,
-                         LpcRequestMessageSize);
-           LpcRequestMessageSize = LpcRequest->u1.s1.TotalLength;
-           LpcRequestDataSize = LpcRequest->u1.s1.DataLength;
-         }
-       _SEH_HANDLE
-         {
-           Status = _SEH_GetExceptionCode();
-         }
-       _SEH_END;
-       
-       if (!NT_SUCCESS(Status))
-         {
-           ExFreePool(LpcRequest);
-           if (NULL != AttachedProcess)
-             {
-               KeAttachProcess(AttachedProcess);
-             }
-           ObDereferenceObject(Port);
-           return(Status);
-         }
-     }
-   else
-     {
-       RtlCopyMemory(LpcRequest,
-                     UnsafeLpcRequest,
-                     LpcRequestMessageSize);
-       LpcRequestMessageSize = LpcRequest->u1.s1.TotalLength;
-       LpcRequestDataSize = LpcRequest->u1.s1.DataLength;
-     }
-
-   if (LpcRequestMessageSize > LPC_MAX_MESSAGE_LENGTH)
-     {
-       ExFreePool(LpcRequest);
-       if (NULL != AttachedProcess)
-         {
-           KeAttachProcess(AttachedProcess);
-         }
-       ObDereferenceObject(Port);
-       return(STATUS_PORT_MESSAGE_TOO_LONG);
-     }
-   if (LpcRequestDataSize > LPC_MAX_DATA_LENGTH)
-     {
-       ExFreePool(LpcRequest);
-       if (NULL != AttachedProcess)
-         {
-           KeAttachProcess(AttachedProcess);
-         }
-       ObDereferenceObject(Port);
-       return(STATUS_PORT_MESSAGE_TOO_LONG);
-     }
-
-   Status = EiReplyOrRequestPort(Port->OtherPort,
-				 LpcRequest,
-                 LpcRequest->u2.s2.Type == LPC_ERROR_EVENT ? LPC_ERROR_EVENT : LPC_REQUEST,
-				 Port);
-   if (!NT_SUCCESS(Status))
-     {
-	DPRINT1("Enqueue failed\n");
-	ExFreePool(LpcRequest);
-        if (NULL != AttachedProcess)
-          {
-            KeAttachProcess(AttachedProcess);
-          }
-	ObDereferenceObject(Port);
-	return(Status);
-     }
-   ExFreePool(LpcRequest);
-   KeReleaseSemaphore (&Port->OtherPort->Semaphore, IO_NO_INCREMENT,
-		       1, FALSE);
-
-   /*
-    * Wait for a reply
-    */
-   Status = KeWaitForSingleObject(&Port->Semaphore,
-			          UserRequest,
-			          UserMode,
-			          FALSE,
-			          NULL);
-   if (Status == STATUS_SUCCESS)
-     {
-
-       /*
-        * Dequeue the reply
-        */
-       KeAcquireSpinLock(&Port->Lock, &oldIrql);
-       Message = EiDequeueMessagePort(Port);
-       KeReleaseSpinLock(&Port->Lock, oldIrql);
-       if (Message)
-         {
-           DPRINT("Message->Message.u1.s1.TotalLength %d\n",
-	          Message->Message.u1.s1.TotalLength);
-           if (PreviousMode != KernelMode)
-             {
-               _SEH_TRY
-                 {
-                   RtlCopyMemory(UnsafeLpcReply,
-                                 &Message->Message,
-                                 Message->Message.u1.s1.TotalLength);
-                 }
-               _SEH_HANDLE
-                 {
-                   Status = _SEH_GetExceptionCode();
-                 }
-               _SEH_END;
-             }
-           else
-             {
-               RtlCopyMemory(UnsafeLpcReply,
-                             &Message->Message,
-                             Message->Message.u1.s1.TotalLength);
-             }
-           ExFreePool(Message);
-         }
-       else
-         Status = STATUS_UNSUCCESSFUL;
-     }
-   else
-     {
-       if (NT_SUCCESS(Status))
-         {
-	   Status = STATUS_UNSUCCESSFUL;
-	 }
-     }
-   if (NULL != AttachedProcess)
-     {
-       KeAttachProcess(AttachedProcess);
-     }
-   ObDereferenceObject(Port);
-
-   return(Status);
-}
-
-
-/**********************************************************************
- * NAME
- *	NtWriteRequestData/6
- *
- * DESCRIPTION
- *
- * ARGUMENTS
- *
- * RETURN VALUE
- *
- * REVISIONS
- */
-NTSTATUS STDCALL NtWriteRequestData (HANDLE		PortHandle,
-				     PPORT_MESSAGE	Message,
-				     ULONG		Index,
-				     PVOID		Buffer,
-				     ULONG		BufferLength,
-				     PULONG		ReturnLength)
-{
-   UNIMPLEMENTED;
-   return(STATUS_NOT_IMPLEMENTED);
-}
-
-
 /* EOF */
diff --git a/reactos/ntoskrnl/ntoskrnl.rbuild b/reactos/ntoskrnl/ntoskrnl.rbuild
index 10c6ed34404..dd73ec5d4fc 100644
--- a/reactos/ntoskrnl/ntoskrnl.rbuild
+++ b/reactos/ntoskrnl/ntoskrnl.rbuild
@@ -9,9 +9,6 @@
     <define name="__NO_CTYPE_INLINES" />
     <define name="__USE_W32API" />
     <define name="WIN9X_COMPAT_SPINLOCK" />
-    <if property="NTLPC" value="1">
-        <define name="NTLPC" />
-    </if>
     <include base="cmlib">.</include>
     <include base="ntoskrnl">include</include>
     <include base="ReactOS">include/reactos/drivers</include>
@@ -230,35 +227,16 @@
             <file>loader.c</file>
             <file>rtl.c</file>
     </directory>
-    <if property="NTLPC" value="0">
-        <directory name="lpc">
-                <file>close.c</file>
-                <file>complete.c</file>
-                <file>connect.c</file>
-                <file>create.c</file>
-                <file>listen.c</file>
-                <file>port.c</file>
-                <file>query.c</file>
-                <file>queue.c</file>
-                <file>receive.c</file>
-                <file>reply.c</file>
-                <file>send.c</file>
-        </directory>
-    </if>
-    <if property="NTLPC" value="1">
-        <directory name="lpc">
-            <directory name="ntlpc">
-                <file>close.c</file>
-                <file>complete.c</file>
-                <file>connect.c</file>
-                <file>create.c</file>
-                <file>listen.c</file>
-                <file>port.c</file>
-                <file>reply.c</file>
-                <file>send.c</file>
-            </directory>
-        </directory>
-    </if>
+    <directory name="lpc">
+            <file>close.c</file>
+            <file>complete.c</file>
+            <file>connect.c</file>
+            <file>create.c</file>
+            <file>listen.c</file>
+            <file>port.c</file>
+            <file>reply.c</file>
+            <file>send.c</file>
+    </directory>
     <directory name="mm">
         <if property="ARCH" value="i386">
             <directory name="i386">
diff --git a/reactos/ntoskrnl/ob/obhandle.c b/reactos/ntoskrnl/ob/obhandle.c
index 34cd8bae2bf..3622370a9c7 100644
--- a/reactos/ntoskrnl/ob/obhandle.c
+++ b/reactos/ntoskrnl/ob/obhandle.c
@@ -1716,8 +1716,7 @@ ObpSetHandleAttributes(IN PHANDLE_TABLE HandleTable,
                        IN OUT PHANDLE_TABLE_ENTRY HandleTableEntry,
                        IN PVOID Context)
 {
-    POBP_SET_HANDLE_ATTRIBUTES_CONTEXT SetHandleInfo =
-        (POBP_SET_HANDLE_ATTRIBUTES_CONTEXT)Context;
+    POBP_SET_HANDLE_ATTRIBUTES_CONTEXT SetHandleInfo = Context;
     POBJECT_HEADER ObjectHeader = EX_HTE_TO_HDR(HandleTableEntry);
     PAGED_CODE();
 

From b824f044923cede20cd1550cb351f4b13bbd6729 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Wed, 10 Jan 2007 04:51:27 +0000
Subject: [PATCH 10/36] remove focus from window, when it gets diabled - fixes
 bug 843 See issue #843 for more details.

svn path=/trunk/; revision=25412
---
 reactos/dll/win32/user32/windows/input.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/reactos/dll/win32/user32/windows/input.c b/reactos/dll/win32/user32/windows/input.c
index 6f7bac23902..43305ae3595 100644
--- a/reactos/dll/win32/user32/windows/input.c
+++ b/reactos/dll/win32/user32/windows/input.c
@@ -36,6 +36,7 @@
 /* Directory to load key layouts from */
 #define SYSTEMROOT_DIR L"\\SystemRoot\\System32\\"
 
+#define STATE_GWL_OFFSET  0
 
 /* GLOBALS *******************************************************************/
 
@@ -338,11 +339,24 @@ EnableWindow(HWND hWnd,
 	     BOOL bEnable)
 {
     LONG Style = NtUserGetWindowLong(hWnd, GWL_STYLE, FALSE);
-    Style = bEnable ? Style & ~WS_DISABLED : Style | WS_DISABLED;
-    NtUserSetWindowLong(hWnd, GWL_STYLE, Style, FALSE);
-
-    SendMessageA(hWnd, WM_ENABLE, (LPARAM) IsWindowEnabled(hWnd), 0);
+    /* check if updating is needed */
+    UINT bIsDisabled = (Style & WS_DISABLED);
+    if ( (bIsDisabled && bEnable) || (!bIsDisabled && !bEnable) )
+    {
+        if (bEnable)
+        {
+            Style &= ~WS_DISABLED;
+        }
+        else
+        {
+            /* Remove keyboard focus from that window */
+            SetFocus(NULL);
+            Style |= WS_DISABLED;
+        }
+        NtUserSetWindowLong(hWnd, GWL_STYLE, Style, FALSE);
 
+        SendMessageA(hWnd, WM_ENABLE, (LPARAM) IsWindowEnabled(hWnd), 0);
+    }
     // Return nonzero if it was disabled, or zero if it wasn't:
     return IsWindowEnabled(hWnd);
 }

From b432f6d20fdb15354a5757b88188d4ba5133e344 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 10 Jan 2007 06:09:57 +0000
Subject: [PATCH 11/36] - Fix build.

svn path=/trunk/; revision=25413
---
 reactos/ntoskrnl/lpc/close.c    | 3 +--
 reactos/ntoskrnl/lpc/complete.c | 3 +--
 reactos/ntoskrnl/lpc/connect.c  | 3 +--
 reactos/ntoskrnl/lpc/create.c   | 3 +--
 reactos/ntoskrnl/lpc/listen.c   | 3 +--
 reactos/ntoskrnl/lpc/port.c     | 5 ++---
 reactos/ntoskrnl/lpc/reply.c    | 3 +--
 reactos/ntoskrnl/lpc/send.c     | 3 +--
 8 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/reactos/ntoskrnl/lpc/close.c b/reactos/ntoskrnl/lpc/close.c
index af9803dbfc7..88ed35a657c 100644
--- a/reactos/ntoskrnl/lpc/close.c
+++ b/reactos/ntoskrnl/lpc/close.c
@@ -9,9 +9,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
-#include "lpc.h"
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 /* PRIVATE FUNCTIONS *********************************************************/
 
diff --git a/reactos/ntoskrnl/lpc/complete.c b/reactos/ntoskrnl/lpc/complete.c
index b5e4e190ee1..eeda2e4c412 100644
--- a/reactos/ntoskrnl/lpc/complete.c
+++ b/reactos/ntoskrnl/lpc/complete.c
@@ -9,9 +9,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
-#include "lpc.h"
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 /* PRIVATE FUNCTIONS *********************************************************/
 
diff --git a/reactos/ntoskrnl/lpc/connect.c b/reactos/ntoskrnl/lpc/connect.c
index 2b9259ef588..73a57ff3219 100644
--- a/reactos/ntoskrnl/lpc/connect.c
+++ b/reactos/ntoskrnl/lpc/connect.c
@@ -9,9 +9,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
-#include "lpc.h"
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 /* PRIVATE FUNCTIONS *********************************************************/
 
diff --git a/reactos/ntoskrnl/lpc/create.c b/reactos/ntoskrnl/lpc/create.c
index 2bf08c13e11..a0478d5ed5e 100644
--- a/reactos/ntoskrnl/lpc/create.c
+++ b/reactos/ntoskrnl/lpc/create.c
@@ -9,9 +9,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
-#include "lpc.h"
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 /* PRIVATE FUNCTIONS *********************************************************/
 
diff --git a/reactos/ntoskrnl/lpc/listen.c b/reactos/ntoskrnl/lpc/listen.c
index ee2ade0c03d..8bc84c324be 100644
--- a/reactos/ntoskrnl/lpc/listen.c
+++ b/reactos/ntoskrnl/lpc/listen.c
@@ -9,9 +9,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
-#include "lpc.h"
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 /* PUBLIC FUNCTIONS **********************************************************/
 
diff --git a/reactos/ntoskrnl/lpc/port.c b/reactos/ntoskrnl/lpc/port.c
index dcc5a979d44..b085e9183d3 100644
--- a/reactos/ntoskrnl/lpc/port.c
+++ b/reactos/ntoskrnl/lpc/port.c
@@ -9,9 +9,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
-#include "lpc.h"
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 /* GLOBALS *******************************************************************/
 
@@ -19,7 +18,7 @@ POBJECT_TYPE LpcPortObjectType;
 ULONG LpcpMaxMessageSize;
 PAGED_LOOKASIDE_LIST LpcpMessagesLookaside;
 KGUARDED_MUTEX LpcpLock;
-ULONG LpcpTraceLevel = LPC_CLOSE_DEBUG;
+ULONG LpcpTraceLevel = 0;
 ULONG LpcpNextMessageId = 1, LpcpNextCallbackId = 1;
 
 static GENERIC_MAPPING LpcpPortMapping = 
diff --git a/reactos/ntoskrnl/lpc/reply.c b/reactos/ntoskrnl/lpc/reply.c
index 311002eb2eb..1e613b02e5b 100644
--- a/reactos/ntoskrnl/lpc/reply.c
+++ b/reactos/ntoskrnl/lpc/reply.c
@@ -9,9 +9,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
-#include "lpc.h"
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 /* PRIVATE FUNCTIONS *********************************************************/
 
diff --git a/reactos/ntoskrnl/lpc/send.c b/reactos/ntoskrnl/lpc/send.c
index f49e0a6550f..8605a70edb7 100644
--- a/reactos/ntoskrnl/lpc/send.c
+++ b/reactos/ntoskrnl/lpc/send.c
@@ -9,9 +9,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
-#include "lpc.h"
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 /* PUBLIC FUNCTIONS **********************************************************/
 

From de1bca6b2c0f12ecc85075243eedef1f548fbff0 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Wed, 10 Jan 2007 18:31:33 +0000
Subject: [PATCH 12/36] sorry, forgot to remove that line

svn path=/trunk/; revision=25414
---
 reactos/dll/win32/user32/windows/input.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/reactos/dll/win32/user32/windows/input.c b/reactos/dll/win32/user32/windows/input.c
index 43305ae3595..0d4fe32b36e 100644
--- a/reactos/dll/win32/user32/windows/input.c
+++ b/reactos/dll/win32/user32/windows/input.c
@@ -36,8 +36,6 @@
 /* Directory to load key layouts from */
 #define SYSTEMROOT_DIR L"\\SystemRoot\\System32\\"
 
-#define STATE_GWL_OFFSET  0
-
 /* GLOBALS *******************************************************************/
 
 typedef struct __TRACKINGLIST {

From 35f20cc413651924b6c0badefc9a727b9d9a8358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Wed, 10 Jan 2007 19:39:01 +0000
Subject: [PATCH 13/36] Move x86 specific part to i386/ directory. Fix a few
 warnings

svn path=/trunk/; revision=25415
---
 reactos/lib/rtl/austin/udict.h |  4 +-
 reactos/lib/rtl/i386/thread.c  | 80 ++++++++++++++++++++++++++++++++++
 reactos/lib/rtl/nls.c          |  4 +-
 reactos/lib/rtl/rtl.rbuild     |  1 +
 reactos/lib/rtl/thread.c       | 57 ------------------------
 5 files changed, 85 insertions(+), 61 deletions(-)
 create mode 100644 reactos/lib/rtl/i386/thread.c

diff --git a/reactos/lib/rtl/austin/udict.h b/reactos/lib/rtl/austin/udict.h
index f5b9620590f..033413e1d14 100644
--- a/reactos/lib/rtl/austin/udict.h
+++ b/reactos/lib/rtl/austin/udict.h
@@ -57,8 +57,8 @@ typedef enum {
 
 typedef enum {
     udict_balanced = 0,
-    udict_leftheavy = -1,
-    udict_rightheavy = 1
+    udict_leftheavy = 1,
+    udict_rightheavy = 2
 } udict_avl_balance_t;
 
 typedef union {
diff --git a/reactos/lib/rtl/i386/thread.c b/reactos/lib/rtl/i386/thread.c
new file mode 100644
index 00000000000..5f223fca151
--- /dev/null
+++ b/reactos/lib/rtl/i386/thread.c
@@ -0,0 +1,80 @@
+/*
+ * COPYRIGHT:         See COPYING in the top level directory
+ * PROJECT:           ReactOS system libraries
+ * PURPOSE:           Rtl user thread functions
+ * FILE:              lib/rtl/thread.c
+ * PROGRAMERS:
+ *                    Alex Ionescu (alex@relsoft.net)
+ *                    Eric Kohl
+ *                    KJK::Hyperion
+ */
+
+/* INCLUDES *****************************************************************/
+
+#include <rtl.h>
+#include "i386/ketypes.h"
+
+#define NDEBUG
+#include <debug.h>
+
+/* PRIVATE FUNCTIONS *******************************************************/
+
+/*
+ * @implemented
+ */
+VOID
+NTAPI
+RtlInitializeContext(IN HANDLE ProcessHandle,
+                     OUT PCONTEXT ThreadContext,
+                     IN PVOID ThreadStartParam  OPTIONAL,
+                     IN PTHREAD_START_ROUTINE ThreadStartAddress,
+                     IN PINITIAL_TEB InitialTeb)
+{
+    DPRINT("RtlInitializeContext: (hProcess: %p, ThreadContext: %p, Teb: %p\n",
+            ProcessHandle, ThreadContext, InitialTeb);
+
+    /*
+     * Set the Initial Registers
+     * This is based on NT's default values -- crazy apps might expect this...
+     */
+    ThreadContext->Ebp = 0;
+    ThreadContext->Eax = 0;
+    ThreadContext->Ebx = 1;
+    ThreadContext->Ecx = 2;
+    ThreadContext->Edx = 3;
+    ThreadContext->Esi = 4;
+    ThreadContext->Edi = 5;
+
+    /* Set the Selectors */
+    ThreadContext->SegGs = 0;
+    ThreadContext->SegFs = KGDT_R3_TEB;
+    ThreadContext->SegEs = KGDT_R3_DATA;
+    ThreadContext->SegDs = KGDT_R3_DATA;
+    ThreadContext->SegSs = KGDT_R3_DATA;
+    ThreadContext->SegCs = KGDT_R3_CODE;
+
+    /* Enable Interrupts */
+    ThreadContext->EFlags = EFLAGS_INTERRUPT_MASK;
+
+    /* Settings passed */
+    ThreadContext->Eip = (ULONG)ThreadStartAddress;
+    ThreadContext->Esp = (ULONG)InitialTeb;
+
+    /* Only the basic Context is initialized */
+    ThreadContext->ContextFlags = CONTEXT_CONTROL |
+                                  CONTEXT_INTEGER |
+                                  CONTEXT_SEGMENTS;
+
+    /* Set up ESP to the right value */
+    ThreadContext->Esp -= sizeof(PVOID);
+    ZwWriteVirtualMemory(ProcessHandle,
+                         (PVOID)ThreadContext->Esp,
+                         (PVOID)&ThreadStartParam,
+                         sizeof(PVOID),
+                         NULL);
+
+    /* Push it down one more notch for RETEIP */
+    ThreadContext->Esp -= sizeof(PVOID);
+}
+
+/* EOF */
diff --git a/reactos/lib/rtl/nls.c b/reactos/lib/rtl/nls.c
index 4bfa0c96160..4fd59e765d0 100644
--- a/reactos/lib/rtl/nls.c
+++ b/reactos/lib/rtl/nls.c
@@ -359,7 +359,7 @@ RtlResetRtlTranslations(IN PNLSTABLEINFO NlsTable)
    DPRINT("RtlResetRtlTranslations() called\n");
 
    /* Set ANSI data */
-   NlsAnsiToUnicodeTable = NlsTable->AnsiTableInfo.MultiByteTable;
+   NlsAnsiToUnicodeTable = (PWCHAR)NlsTable->AnsiTableInfo.MultiByteTable; /* Real type is PUSHORT */
    NlsUnicodeToAnsiTable = NlsTable->AnsiTableInfo.WideCharTable;
    NlsDbcsUnicodeToAnsiTable = (PWCHAR)NlsTable->AnsiTableInfo.WideCharTable;
    NlsMbCodePageTag = (NlsTable->AnsiTableInfo.DBCSCodePage != 0);
@@ -368,7 +368,7 @@ RtlResetRtlTranslations(IN PNLSTABLEINFO NlsTable)
    DPRINT("Ansi codepage %hu\n", NlsAnsiCodePage);
 
    /* Set OEM data */
-   NlsOemToUnicodeTable = NlsTable->OemTableInfo.MultiByteTable;
+   NlsOemToUnicodeTable = (PWCHAR)NlsTable->OemTableInfo.MultiByteTable; /* Real type is PUSHORT */
    NlsUnicodeToOemTable = NlsTable->OemTableInfo.WideCharTable;
    NlsDbcsUnicodeToOemTable = (PWCHAR)NlsTable->OemTableInfo.WideCharTable;
    NlsMbOemCodePageTag = (NlsTable->OemTableInfo.DBCSCodePage != 0);
diff --git a/reactos/lib/rtl/rtl.rbuild b/reactos/lib/rtl/rtl.rbuild
index 4ddf39a7afa..674cdfd93bd 100644
--- a/reactos/lib/rtl/rtl.rbuild
+++ b/reactos/lib/rtl/rtl.rbuild
@@ -39,6 +39,7 @@
 			<file>sin_asm.s</file>
 			<file>sqrt_asm.s</file>
 			<file>tan_asm.s</file>
+			<file>thread.c</file>
 		</directory>
 	</if>
 	<directory name="austin">
diff --git a/reactos/lib/rtl/thread.c b/reactos/lib/rtl/thread.c
index 55dae05113c..0b87c7b469b 100644
--- a/reactos/lib/rtl/thread.c
+++ b/reactos/lib/rtl/thread.c
@@ -12,7 +12,6 @@
 /* INCLUDES *****************************************************************/
 
 #include <rtl.h>
-#include "i386/ketypes.h"
 
 #define NDEBUG
 #include <debug.h>
@@ -218,62 +217,6 @@ RtlCreateUserThread(IN HANDLE ProcessHandle,
     return Status;
 }
 
-/*
- * FIXME: Should go in /i386
- @implemented
-*/
-VOID
-NTAPI
-RtlInitializeContext(IN HANDLE ProcessHandle,
-                     OUT PCONTEXT ThreadContext,
-                     IN PVOID ThreadStartParam  OPTIONAL,
-                     IN PTHREAD_START_ROUTINE ThreadStartAddress,
-                     IN PINITIAL_TEB InitialTeb)
-{
-    /*
-     * Set the Initial Registers
-     * This is based on NT's default values -- crazy apps might expect this...
-     */
-    ThreadContext->Ebp = 0;
-    ThreadContext->Eax = 0;
-    ThreadContext->Ebx = 1;
-    ThreadContext->Ecx = 2;
-    ThreadContext->Edx = 3;
-    ThreadContext->Esi = 4;
-    ThreadContext->Edi = 5;
-
-    /* Set the Selectors */
-    ThreadContext->SegGs = 0;
-    ThreadContext->SegFs = KGDT_R3_TEB;
-    ThreadContext->SegEs = KGDT_R3_DATA;
-    ThreadContext->SegDs = KGDT_R3_DATA;
-    ThreadContext->SegSs = KGDT_R3_DATA;
-    ThreadContext->SegCs = KGDT_R3_CODE;
-
-    /* Enable Interrupts */
-    ThreadContext->EFlags = EFLAGS_INTERRUPT_MASK;
-
-    /* Settings passed */
-    ThreadContext->Eip = (ULONG)ThreadStartAddress;
-    ThreadContext->Esp = (ULONG)InitialTeb;
-
-    /* Only the basic Context is initialized */
-    ThreadContext->ContextFlags = CONTEXT_CONTROL |
-                                  CONTEXT_INTEGER |
-                                  CONTEXT_SEGMENTS;
-
-    /* Set up ESP to the right value */
-    ThreadContext->Esp -= sizeof(PVOID);
-    ZwWriteVirtualMemory(ProcessHandle,
-                         (PVOID)ThreadContext->Esp,
-                         (PVOID)&ThreadStartParam,
-                         sizeof(PVOID),
-                         NULL);
-
-    /* Push it down one more notch for RETEIP */
-    ThreadContext->Esp -= sizeof(PVOID);
-}
-
 /*
  * @implemented
  */

From 263d5e238b3bb2757e62fa2baeb4076920d0e94b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Wed, 10 Jan 2007 19:39:52 +0000
Subject: [PATCH 14/36] Allow use of ROS_PREFIX on MS Windows platforms (needed
 for cross-compiling)

svn path=/trunk/; revision=25416
---
 reactos/Makefile | 81 +++++++++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/reactos/Makefile b/reactos/Makefile
index b13b55055ed..9392802ee9f 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -274,45 +274,48 @@ endif
 	cp = $(Q)cp
 	NUL = /dev/null
 else # mingw32-windows
-  ifeq ($(OSTYPE),msys)
-	HOST=mingw32-linux
-	export EXEPREFIX = ./
-	export EXEPOSTFIX = .exe
-	export SEP = /
-	mkdir = -$(Q)mkdir -p
-	gcc = $(Q)gcc
-	gpp = $(Q)g++
-	ld = $(Q)ld
-	nm = $(Q)nm
-	objdump = $(Q)objdump
-	ar = $(Q)ar
-	objcopy = $(Q)objcopy
-	dlltool = $(Q)dlltool
-	strip = $(Q)strip
-	windres = $(Q)windres
-	rm = $(Q)rm -f
-	cp = $(Q)cp
-	NUL = /dev/null
-  else
-	export EXEPREFIX =
-	export EXEPOSTFIX = .exe
-	ROS_EMPTY =
-	export SEP = \$(ROS_EMPTY)
-	mkdir = -$(Q)mkdir
-	gcc = $(Q)gcc
-	gpp = $(Q)g++
-	ld = $(Q)ld
-	nm = $(Q)nm
-	objdump = $(Q)objdump
-	ar = $(Q)ar
-	objcopy = $(Q)objcopy
-	dlltool = $(Q)dlltool
-	strip = $(Q)strip
-	windres = $(Q)windres
-	rm = $(Q)del /f /q
-	cp = $(Q)copy /y
-	NUL = NUL
-  endif
+	ifeq ($(OSTYPE),msys)
+		HOST=mingw32-linux
+		export EXEPREFIX = ./
+		export EXEPOSTFIX = .exe
+		export SEP = /
+		mkdir = -$(Q)mkdir -p
+		rm = $(Q)rm -f
+		cp = $(Q)cp
+		NUL = /dev/null
+	else
+		export EXEPREFIX =
+		export EXEPOSTFIX = .exe
+		ROS_EMPTY =
+		export SEP = \$(ROS_EMPTY)
+		mkdir = -$(Q)mkdir
+		rm = $(Q)del /f /q
+		cp = $(Q)copy /y
+		NUL = NUL
+	endif
+	ifeq ($(ROS_PREFIX),)
+		gcc = $(Q)gcc
+		gpp = $(Q)g++
+		ld = $(Q)ld
+		nm = $(Q)nm
+		objdump = $(Q)objdump
+		ar = $(Q)ar
+		objcopy = $(Q)objcopy
+		dlltool = $(Q)dlltool
+		strip = $(Q)strip
+		windres = $(Q)windres
+	else
+		gcc = $(ROS_PREFIX)-gcc
+		gpp = $(Q)$(ROS_PREFIX)-g++
+		ld = $(Q)$(ROS_PREFIX)-ld
+		nm = $(Q)$(ROS_PREFIX)-nm
+		objdump = $(Q)$(ROS_PREFIX)-objdump
+		ar = $(Q)$(ROS_PREFIX)-ar
+		objcopy = $(Q)$(ROS_PREFIX)-objcopy
+		dlltool = $(Q)$(ROS_PREFIX)-dlltool
+		strip = $(Q)$(ROS_PREFIX)-strip
+		windres = $(Q)$(ROS_PREFIX)-windres
+	endif
 endif
 
 ifneq ($(ROS_INTERMEDIATE),)

From e6f6ed291d18789e77dd28d6f6564e97bb4d7dca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Wed, 10 Jan 2007 19:48:35 +0000
Subject: [PATCH 15/36] Disable some boot options on non-x86 platforms. You can
 enable them again for specific platforms if needed.

svn path=/trunk/; revision=25417
---
 reactos/boot/freeldr/freeldr/bootmgr.c          |  4 ++++
 reactos/boot/freeldr/freeldr/custom.c           | 14 +++++++++++++-
 reactos/boot/freeldr/freeldr/drivemap.c         |  2 ++
 reactos/boot/freeldr/freeldr/include/drivemap.h |  3 ++-
 reactos/boot/freeldr/freeldr/include/linux.h    |  3 ++-
 reactos/boot/freeldr/freeldr/include/miscboot.h |  2 ++
 reactos/boot/freeldr/freeldr/include/options.h  |  2 ++
 reactos/boot/freeldr/freeldr/linuxboot.c        |  2 ++
 reactos/boot/freeldr/freeldr/miscboot.c         |  2 ++
 9 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/reactos/boot/freeldr/freeldr/bootmgr.c b/reactos/boot/freeldr/freeldr/bootmgr.c
index 43b1ef6c18b..ac0dd3fee5c 100644
--- a/reactos/boot/freeldr/freeldr/bootmgr.c
+++ b/reactos/boot/freeldr/freeldr/bootmgr.c
@@ -119,11 +119,14 @@ NoGui:
 		}
 
 		// Install the drive mapper according to this sections drive mappings
+#ifdef __i386__
 		DriveMapMapDrivesInSection(OperatingSystemSectionNames[SelectedOperatingSystem]);
+#endif
 		if (_stricmp(SettingValue, "ReactOS") == 0)
 		{
 			LoadAndBootReactOS(OperatingSystemSectionNames[SelectedOperatingSystem]);
 		}
+#ifdef __i386__
 		else if (_stricmp(SettingValue, "WindowsNT40") == 0)
 		{
 			LoadAndBootWindows(OperatingSystemSectionNames[SelectedOperatingSystem], _WIN32_WINNT_NT4);
@@ -156,6 +159,7 @@ NoGui:
 		{
 			LoadAndBootDrive(OperatingSystemSectionNames[SelectedOperatingSystem]);
 		}
+#endif
 	}
 
 
diff --git a/reactos/boot/freeldr/freeldr/custom.c b/reactos/boot/freeldr/freeldr/custom.c
index 38b61dd0620..e4d9de58f91 100644
--- a/reactos/boot/freeldr/freeldr/custom.c
+++ b/reactos/boot/freeldr/freeldr/custom.c
@@ -33,7 +33,15 @@ const CHAR	CustomBootPrompt[] = "Press ENTER to boot your custom boot setup.";
 
 VOID OptionMenuCustomBoot(VOID)
 {
-	PCSTR	CustomBootMenuList[] = { "Disk", "Partition", "Boot Sector File", "ReactOS", "Linux" };
+	PCSTR	CustomBootMenuList[] = {
+#ifdef __i386__
+		"Disk",
+		"Partition",
+		"Boot Sector File",
+		"ReactOS",
+		"Linux"
+#endif /* __i386__ */
+		};
 	ULONG		CustomBootMenuCount = sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]);
 	ULONG		SelectedMenuItem;
 
@@ -45,6 +53,7 @@ VOID OptionMenuCustomBoot(VOID)
 
 	switch (SelectedMenuItem)
 	{
+#ifdef __i386__
 	case 0: // Disk
 		OptionMenuCustomBootDisk();
 		break;
@@ -60,9 +69,11 @@ VOID OptionMenuCustomBoot(VOID)
 	case 4: // Linux
 		OptionMenuCustomBootLinux();
 		break;
+#endif /* __i386__ */
 	}
 }
 
+#ifdef __i386__
 VOID OptionMenuCustomBootDisk(VOID)
 {
 	CHAR	SectionName[100];
@@ -397,3 +408,4 @@ VOID OptionMenuCustomBootLinux(VOID)
 
 	LoadAndBootLinux(SectionName, "Custom Linux Setup");
 }
+#endif /* __i386__ */
diff --git a/reactos/boot/freeldr/freeldr/drivemap.c b/reactos/boot/freeldr/freeldr/drivemap.c
index 31ecab7a37b..7e82f13eea5 100644
--- a/reactos/boot/freeldr/freeldr/drivemap.c
+++ b/reactos/boot/freeldr/freeldr/drivemap.c
@@ -22,6 +22,7 @@
 #define NDEBUG
 #include <debug.h>
 
+#ifdef __i386__
 BOOLEAN	DriveMapInstalled = FALSE;	// Tells us if we have already installed our drive map int 13h handler code
 ULONG		OldInt13HandlerAddress = 0;	// Address of BIOS int 13h handler
 ULONG		DriveMapHandlerAddress = 0;	// Linear address of our drive map handler
@@ -222,3 +223,4 @@ VOID DriveMapRemoveInt13Handler(VOID)
 		DriveMapInstalled = FALSE;
 	}
 }
+#endif /* __i386__ */
diff --git a/reactos/boot/freeldr/freeldr/include/drivemap.h b/reactos/boot/freeldr/freeldr/include/drivemap.h
index 1d25f1f29f7..29a3d2cc5c2 100644
--- a/reactos/boot/freeldr/freeldr/include/drivemap.h
+++ b/reactos/boot/freeldr/freeldr/include/drivemap.h
@@ -20,7 +20,7 @@
 #ifndef __DRIVEMAP_H
 #define __DRIVEMAP_H
 
-
+#ifdef __i386__
 typedef struct
 {
 	UCHAR		DriveMapCount;		// Count of drives currently mapped
@@ -39,5 +39,6 @@ extern PVOID			DriveMapInt13HandlerStart;
 extern PVOID			DriveMapInt13HandlerEnd;
 extern ULONG				DriveMapOldInt13HandlerAddress;
 extern DRIVE_MAP_LIST	DriveMapInt13HandlerMapList;
+#endif /* __i386__ */
 
 #endif // #defined __DRIVEMAP_H
diff --git a/reactos/boot/freeldr/freeldr/include/linux.h b/reactos/boot/freeldr/freeldr/include/linux.h
index 90c6a8aea9c..14d3bf0d8be 100644
--- a/reactos/boot/freeldr/freeldr/include/linux.h
+++ b/reactos/boot/freeldr/freeldr/include/linux.h
@@ -22,7 +22,7 @@
 #ifndef __LINUX_H
 #define __LINUX_H
 
-
+#ifdef __i386__
 #define LINUX_LOADER_TYPE_LILO			0x01
 #define LINUX_LOADER_TYPE_LOADLIN		0x11
 #define LINUX_LOADER_TYPE_BOOTSECT		0x21
@@ -135,5 +135,6 @@ BOOLEAN	LinuxReadSetupSector(PFILE LinuxKernelFile);
 BOOLEAN	LinuxReadKernel(PFILE LinuxKernelFile);
 BOOLEAN	LinuxCheckKernelVersion(VOID);
 BOOLEAN	LinuxReadInitrd(PFILE LinuxInitrdFile);
+#endif /* __i386__ */
 
 #endif // defined __LINUX_H
diff --git a/reactos/boot/freeldr/freeldr/include/miscboot.h b/reactos/boot/freeldr/freeldr/include/miscboot.h
index e274c9ae2af..c0aea8381c2 100644
--- a/reactos/boot/freeldr/freeldr/include/miscboot.h
+++ b/reactos/boot/freeldr/freeldr/include/miscboot.h
@@ -20,8 +20,10 @@
 #ifndef __BOOT_H
 #define __BOOT_H
 
+#ifdef __i386__
 VOID	LoadAndBootBootSector(PCSTR OperatingSystemName);
 VOID	LoadAndBootPartition(PCSTR OperatingSystemName);
 VOID	LoadAndBootDrive(PCSTR OperatingSystemName);
+#endif /* __i386__ */
 
 #endif // defined __BOOT_H
diff --git a/reactos/boot/freeldr/freeldr/include/options.h b/reactos/boot/freeldr/freeldr/include/options.h
index 82ac6150e69..72cfa53aaea 100644
--- a/reactos/boot/freeldr/freeldr/include/options.h
+++ b/reactos/boot/freeldr/freeldr/include/options.h
@@ -25,10 +25,12 @@ VOID	DoOptionsMenu(VOID);
 VOID	OptionMenuReboot(VOID);
 
 VOID	OptionMenuCustomBoot(VOID);
+#ifdef __i386__
 VOID	OptionMenuCustomBootDisk(VOID);
 VOID	OptionMenuCustomBootPartition(VOID);
 VOID	OptionMenuCustomBootBootSectorFile(VOID);
 VOID	OptionMenuCustomBootReactOS(VOID);
 VOID	OptionMenuCustomBootLinux(VOID);
+#endif /* __i386__ */
 
 #endif // #defined __OPTIONS_H
diff --git a/reactos/boot/freeldr/freeldr/linuxboot.c b/reactos/boot/freeldr/freeldr/linuxboot.c
index 27589bd6a26..5c086ef00fa 100644
--- a/reactos/boot/freeldr/freeldr/linuxboot.c
+++ b/reactos/boot/freeldr/freeldr/linuxboot.c
@@ -23,6 +23,7 @@
 #define NDEBUG
 #include <debug.h>
 
+#ifdef __i386__
 #define	LINUX_READ_CHUNK_SIZE	0x20000			// Read 128k at a time
 
 
@@ -491,3 +492,4 @@ BOOLEAN LinuxReadInitrd(PFILE LinuxInitrdFile)
 
 	return TRUE;
 }
+#endif /* __i386__ */
diff --git a/reactos/boot/freeldr/freeldr/miscboot.c b/reactos/boot/freeldr/freeldr/miscboot.c
index bbbf34f9ac2..a96bbd5cd28 100644
--- a/reactos/boot/freeldr/freeldr/miscboot.c
+++ b/reactos/boot/freeldr/freeldr/miscboot.c
@@ -19,6 +19,7 @@
 
 #include <freeldr.h>
 
+#ifdef __i386__
 VOID LoadAndBootBootSector(PCSTR OperatingSystemName)
 {
 	PFILE	FilePointer;
@@ -213,3 +214,4 @@ VOID LoadAndBootDrive(PCSTR OperatingSystemName)
 	//DisableA20();
 	ChainLoadBiosBootSectorCode();
 }
+#endif /* __i386__ */

From d9466bc852262df680de042e6ca3835f2e5504ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Wed, 10 Jan 2007 19:57:52 +0000
Subject: [PATCH 16/36] Move up wpp include, as it is needed by widl

svn path=/trunk/; revision=25418
---
 reactos/tools/tools.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/tools/tools.mak b/reactos/tools/tools.mak
index 1ef5a123eaf..cbc5f417af7 100644
--- a/reactos/tools/tools.mak
+++ b/reactos/tools/tools.mak
@@ -56,8 +56,8 @@ include tools/rgenstat/rgenstat.mak
 include tools/rsym.mak
 include tools/sysreg/sysreg.mak
 include tools/unicode/unicode.mak
+include tools/wpp/wpp.mak
 include tools/widl/widl.mak
 include tools/winebuild/winebuild.mak
 include tools/wmc/wmc.mak
-include tools/wpp/wpp.mak
 include tools/wrc/wrc.mak
\ No newline at end of file

From f1f9bb147e92e7851a020d5e73403c4576eb25ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Wed, 10 Jan 2007 20:02:41 +0000
Subject: [PATCH 17/36] Don't rely on stdio.h to define EOF, as native stdio.h
 can conflict with ROS headers

svn path=/trunk/; revision=25419
---
 reactos/lib/string/sscanf.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/reactos/lib/string/sscanf.c b/reactos/lib/string/sscanf.c
index 39b28f22299..fdb2bc78363 100644
--- a/reactos/lib/string/sscanf.c
+++ b/reactos/lib/string/sscanf.c
@@ -5,7 +5,8 @@
 #include <ndk/rtlfuncs.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <stdio.h>
+
+#define EOF		(-1)
 
 /* helper function for *scanf.  Returns the value of character c in the
  * given base, or -1 if the given character is not a digit of the base.

From 11f6279e1191e0a233d7d1f535a2eef353baf888 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Wed, 10 Jan 2007 22:52:07 +0000
Subject: [PATCH 18/36] Fix warnings

svn path=/trunk/; revision=25421
---
 reactos/ntoskrnl/fsrtl/largemcb.c        | 12 ++++++++++--
 reactos/ntoskrnl/include/internal/ob_x.h |  4 ++--
 reactos/ntoskrnl/ob/oblife.c             |  2 +-
 reactos/ntoskrnl/ob/obname.c             |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/reactos/ntoskrnl/fsrtl/largemcb.c b/reactos/ntoskrnl/fsrtl/largemcb.c
index f0e4c8c1cac..a63dc90a623 100644
--- a/reactos/ntoskrnl/fsrtl/largemcb.c
+++ b/reactos/ntoskrnl/fsrtl/largemcb.c
@@ -58,6 +58,9 @@ FsRtlGetNextLargeMcbEntry(IN PLARGE_MCB Mcb,
                           OUT PLONGLONG SectorCount)
 {
     KEBUGCHECK(0);
+    *Vbn = 0;
+    *Lbn = 0;
+    *SectorCount= 0;
     return FALSE;
 }
 
@@ -132,6 +135,8 @@ FsRtlLookupLargeMcbEntry(IN PLARGE_MCB Mcb,
                          OUT PULONG Index OPTIONAL)
 {
     KEBUGCHECK(0);
+    *Lbn = 0;
+    *SectorCountFromLbn = 0;
     return FALSE;
 }
 
@@ -146,6 +151,9 @@ FsRtlLookupLastLargeMcbEntryAndIndex(IN PLARGE_MCB OpaqueMcb,
                                      OUT PULONG Index)
 {
     KEBUGCHECK(0);
+    *LargeVbn = 0;
+    *LargeLbn = 0;
+    *Index = 0;
     return FALSE;
 }
 
@@ -172,8 +180,8 @@ FsRtlLookupLastMcbEntry(IN PMCB Mcb,
                         OUT PLBN Lbn)
 {
     BOOLEAN Return = FALSE;
-    LONGLONG llVbn;
-    LONGLONG llLbn;
+    LONGLONG llVbn = 0;
+    LONGLONG llLbn = 0;
 
     /* Call the Large version */
     Return = FsRtlLookupLastLargeMcbEntry(
diff --git a/reactos/ntoskrnl/include/internal/ob_x.h b/reactos/ntoskrnl/include/internal/ob_x.h
index 34a5011857a..c768d3e373b 100644
--- a/reactos/ntoskrnl/include/internal/ob_x.h
+++ b/reactos/ntoskrnl/include/internal/ob_x.h
@@ -27,7 +27,7 @@ ObpIncrementQueryReference(IN POBJECT_HEADER ObjectHeader,
     while ((NewValue != 0) && (References = NewValue))
     {
         /* Increment the number of references */
-        if (InterlockedCompareExchange(&ObjectNameInfo->QueryReferences,
+        if (InterlockedCompareExchange((PLONG)&ObjectNameInfo->QueryReferences,
                                        NewValue + 1,
                                        NewValue) == References)
         {
@@ -56,7 +56,7 @@ ObpDecrementQueryReference(IN POBJECT_HEADER_NAME_INFO HeaderNameInfo)
     POBJECT_DIRECTORY Directory;
 
     /* Remove a query reference and check if it was the last one */
-    if (!InterlockedExchangeAdd(&HeaderNameInfo->QueryReferences, -1))
+    if (!InterlockedExchangeAdd((PLONG)&HeaderNameInfo->QueryReferences, -1))
     {
         /* Check if we have a name */
         if (HeaderNameInfo->Name.Buffer)
diff --git a/reactos/ntoskrnl/ob/oblife.c b/reactos/ntoskrnl/ob/oblife.c
index 488af3131a1..b791acb7833 100644
--- a/reactos/ntoskrnl/ob/oblife.c
+++ b/reactos/ntoskrnl/ob/oblife.c
@@ -801,7 +801,7 @@ ObpAllocateObject(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo,
     if (ObjectType)
     {
         /* Increase the number of objects of this type */
-        InterlockedIncrement(&ObjectType->TotalNumberOfObjects);
+        InterlockedIncrement((PLONG)&ObjectType->TotalNumberOfObjects);
 
         /* Update the high water */
         ObjectType->HighWaterNumberOfObjects = max(ObjectType->
diff --git a/reactos/ntoskrnl/ob/obname.c b/reactos/ntoskrnl/ob/obname.c
index 2becdbc3bd8..afa422a346f 100644
--- a/reactos/ntoskrnl/ob/obname.c
+++ b/reactos/ntoskrnl/ob/obname.c
@@ -238,7 +238,7 @@ ObpDeleteNameCheck(IN PVOID Object)
                     (ObjectNameInfo->QueryReferences & 0x40000000))
                 {
                     /* Add deletion flag */
-                    InterlockedExchangeAdd(&ObjectNameInfo->QueryReferences,
+                    InterlockedExchangeAdd((PLONG)&ObjectNameInfo->QueryReferences,
                                            0xC0000000);
                 }
 

From b2c4c0e76ea473b941924c777d6b14587425366e Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Wed, 10 Jan 2007 23:48:02 +0000
Subject: [PATCH 19/36] Don't remove keyboard focus from any other window than
 the one that was disabled.

svn path=/trunk/; revision=25422
---
 reactos/dll/win32/user32/windows/input.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/reactos/dll/win32/user32/windows/input.c b/reactos/dll/win32/user32/windows/input.c
index 0d4fe32b36e..ed5a7138ee7 100644
--- a/reactos/dll/win32/user32/windows/input.c
+++ b/reactos/dll/win32/user32/windows/input.c
@@ -347,9 +347,12 @@ EnableWindow(HWND hWnd,
         }
         else
         {
-            /* Remove keyboard focus from that window */
-            SetFocus(NULL);
             Style |= WS_DISABLED;
+            /* Remove keyboard focus from that window if it had focus */
+            if (hWnd == GetFocus())
+            {
+               SetFocus(NULL);
+            }
         }
         NtUserSetWindowLong(hWnd, GWL_STYLE, Style, FALSE);
 

From dc8aa9ffd77a5fde7b14ab97579382061eeb0a1a Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Wed, 10 Jan 2007 23:55:53 +0000
Subject: [PATCH 20/36] - Make IntSystemParametersInfo send a WM_SETTINGCHANGE
 message when needed. - Some code cleanup

svn path=/trunk/; revision=25423
---
 reactos/subsystems/win32/win32k/ntuser/misc.c | 138 ++++++++++--------
 1 file changed, 79 insertions(+), 59 deletions(-)

diff --git a/reactos/subsystems/win32/win32k/ntuser/misc.c b/reactos/subsystems/win32/win32k/ntuser/misc.c
index 44c245d0916..cf5708537bf 100644
--- a/reactos/subsystems/win32/win32k/ntuser/misc.c
+++ b/reactos/subsystems/win32/win32k/ntuser/misc.c
@@ -909,6 +909,7 @@ IntSystemParametersInfo(
 {
    PWINSTATION_OBJECT WinStaObject;
    NTSTATUS Status;
+   BOOL bChanged = FALSE;
 
    static BOOL bInitialized = FALSE;
    static LOGFONTW IconFont;
@@ -956,16 +957,18 @@ IntSystemParametersInfo(
       case SPI_SETDOUBLECLKHEIGHT:
       case SPI_SETDOUBLECLICKTIME:
       case SPI_SETDESKWALLPAPER:
+      case SPI_SETSCREENSAVERRUNNING: 
+      case SPI_SETSCREENSAVETIMEOUT:
+      case SPI_SETFLATMENU:
+         /* We will change something, so set the flag here */
+         bChanged = TRUE;
       case SPI_GETDESKWALLPAPER:
       case SPI_GETWHEELSCROLLLINES:
       case SPI_GETWHEELSCROLLCHARS:
-      case SPI_SETSCREENSAVERRUNNING: 
       case SPI_GETSCREENSAVERRUNNING:
       case SPI_GETSCREENSAVETIMEOUT:
-      case SPI_SETSCREENSAVETIMEOUT:
       case SPI_GETSCREENSAVEACTIVE:
       case SPI_GETFLATMENU:
-      case SPI_SETFLATMENU:
          {
             PSYSTEM_CURSORINFO CurInfo;
 
@@ -982,43 +985,42 @@ IntSystemParametersInfo(
             switch(uiAction)
             {
                case SPI_GETFLATMENU:
-                  if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->FlatMenu;    
-                  return TRUE;
+                  ASSERT(pvParam);
+                  *((UINT*)pvParam) = WinStaObject->FlatMenu;
                   break;
-               case SPI_SETFLATMENU:				   
-                  WinStaObject->FlatMenu = uiParam;                               
+               case SPI_SETFLATMENU:
+                  WinStaObject->FlatMenu = uiParam;
                   break;
                case SPI_GETSCREENSAVETIMEOUT:
-                  if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->ScreenSaverTimeOut;                   
-                  return TRUE;
-                  break;
-               case SPI_SETSCREENSAVETIMEOUT:				  
-                  WinStaObject->ScreenSaverTimeOut = uiParam;                  
+                   ASSERT(pvParam);
+                   *((UINT*)pvParam) = WinStaObject->ScreenSaverTimeOut;
+               break;
+               case SPI_SETSCREENSAVETIMEOUT:
+                  WinStaObject->ScreenSaverTimeOut = uiParam;
                   break;
                case SPI_GETSCREENSAVERRUNNING:
                   if (pvParam != NULL) *((BOOL*)pvParam) = WinStaObject->ScreenSaverRunning;
-                  return TRUE;
                   break;
-               case SPI_SETSCREENSAVERRUNNING:				  
+               case SPI_SETSCREENSAVERRUNNING:
                   if (pvParam != NULL) *((BOOL*)pvParam) = WinStaObject->ScreenSaverRunning;
-                  WinStaObject->ScreenSaverRunning = uiParam;				                     
+                  WinStaObject->ScreenSaverRunning = uiParam;
                   break;
                case SPI_GETSCREENSAVEACTIVE:
                   /* FIXME: how to disable the screensaver? */
-                  if (pvParam != NULL) *((BOOL*)pvParam) = TRUE;
-                  return TRUE;
+                  ASSERT(pvParam);
+                  *((BOOL*)pvParam) = TRUE;
                   break;
                case SPI_GETWHEELSCROLLLINES:
+                  ASSERT(pvParam);
                   CurInfo = IntGetSysCursorInfo(WinStaObject);
-                  if (pvParam != NULL) *((UINT*)pvParam) = CurInfo->WheelScroLines;
+                  *((UINT*)pvParam) = CurInfo->WheelScroLines;
                   /* FIXME add this value to scroll list as scroll value ?? */
-                  return TRUE;
                   break;
                case SPI_GETWHEELSCROLLCHARS:
+                  ASSERT(pvParam);
                   CurInfo = IntGetSysCursorInfo(WinStaObject);
-                  if (pvParam != NULL) *((UINT*)pvParam) = CurInfo->WheelScroChars;
+                  *((UINT*)pvParam) = CurInfo->WheelScroChars;
                   // FIXME add this value to scroll list as scroll value ?? 
-                  return TRUE;
                   break;
                case SPI_SETDOUBLECLKWIDTH:
                   CurInfo = IntGetSysCursorInfo(WinStaObject);
@@ -1125,7 +1127,7 @@ IntSystemParametersInfo(
                      if(!KeyValuePartialInfo)
                      {
                         NtClose(KeyHandle);
-                        return 0;
+                        return FALSE;
                      }
 
                      Status = ZwQueryValueKey(KeyHandle, &Tile, KeyValuePartialInformation,
@@ -1134,7 +1136,7 @@ IntSystemParametersInfo(
                      {
                         ZwClose(KeyHandle);
                         ExFreePool(KeyValuePartialInfo);
-                        return 0;
+                        return FALSE;
                      }
                 
                      Tile.Length = KeyValuePartialInfo->DataLength;
@@ -1160,7 +1162,7 @@ IntSystemParametersInfo(
                      if(!KeyValuePartialInfo)
                      {
                         ZwClose(KeyHandle);
-                        return 0;
+                        return FALSE;
                      }
 
                      Status = ZwQueryValueKey(KeyHandle, &Style, KeyValuePartialInformation,
@@ -1169,7 +1171,7 @@ IntSystemParametersInfo(
                      {
                         ZwClose(KeyHandle);
                         ExFreePool(KeyValuePartialInfo);
-                        return 0;
+                        return FALSE;
                      }
                 
                      Style.Length = KeyValuePartialInfo->DataLength;
@@ -1210,7 +1212,7 @@ IntSystemParametersInfo(
             /* FIXME save the value to the registry */
 
             ObDereferenceObject(WinStaObject);
-            return TRUE;
+            break;
          }
       case SPI_SETWORKAREA:
          {
@@ -1226,8 +1228,9 @@ IntSystemParametersInfo(
             ASSERT(pvParam);
             rc = (RECT*)pvParam;
             Desktop->WorkArea = *rc;
+            bChanged = TRUE;
 
-            return TRUE;
+            break;
          }
       case SPI_GETWORKAREA:
          {
@@ -1242,13 +1245,14 @@ IntSystemParametersInfo(
             ASSERT(pvParam);
             IntGetDesktopWorkArea(Desktop, (PRECT)pvParam);
 
-            return TRUE;
+            break;
          }
       case SPI_SETGRADIENTCAPTIONS:
          {
             GradientCaptions = (pvParam != NULL);
             /* FIXME - should be checked if the color depth is higher than 8bpp? */
-            return TRUE;
+            bChanged = TRUE;
+            break;
          }
       case SPI_GETGRADIENTCAPTIONS:
          {
@@ -1256,78 +1260,83 @@ IntSystemParametersInfo(
             BOOL Ret = GradientCaptions;
 
             hDC = IntGetScreenDC();
-            if(hDC)
+            if(!hDC)
             {
-               Ret = (NtGdiGetDeviceCaps(hDC, BITSPIXEL) > 8) && Ret;
-
-               ASSERT(pvParam);
-               *((PBOOL)pvParam) = Ret;
-               return TRUE;
+               return FALSE;
             }
-            return FALSE;
+            Ret = (NtGdiGetDeviceCaps(hDC, BITSPIXEL) > 8) && Ret;
+
+            ASSERT(pvParam);
+            *((PBOOL)pvParam) = Ret;
+            break;
          }
       case SPI_SETFONTSMOOTHING:
          {
             IntEnableFontRendering(uiParam != 0);
-            return TRUE;
+            bChanged = TRUE;
+            break;
          }
       case SPI_GETFONTSMOOTHING:
          {
             ASSERT(pvParam);
             *((BOOL*)pvParam) = IntIsFontRenderingEnabled();
-            return TRUE;
+            break;
          }
       case SPI_GETICONTITLELOGFONT:
          {
             ASSERT(pvParam);
             *((LOGFONTW*)pvParam) = IconFont;
-            return TRUE;
+            break;
          }
       case SPI_GETNONCLIENTMETRICS:
          {
             ASSERT(pvParam);
             *((NONCLIENTMETRICSW*)pvParam) = pMetrics;
-            return TRUE;
+            break;
          }
       case SPI_SETNONCLIENTMETRICS:
          {
             ASSERT(pvParam);
             pMetrics = *((NONCLIENTMETRICSW*)pvParam);
-            return TRUE;
+            bChanged = TRUE;
+            break;
          }
       case SPI_GETMINIMIZEDMETRICS:
          {
             ASSERT(pvParam);
             *((MINIMIZEDMETRICS*)pvParam) = MinimizedMetrics;
-            return TRUE;
+            break;
          }
       case SPI_SETMINIMIZEDMETRICS:
          {
             ASSERT(pvParam);
             MinimizedMetrics = *((MINIMIZEDMETRICS*)pvParam);
-            return TRUE;
+            bChanged = TRUE;
+            break;
          }
       case SPI_GETFOCUSBORDERHEIGHT:
          {
             ASSERT(pvParam);
             *((UINT*)pvParam) = FocusBorderHeight;
-            return TRUE;
+            break;
          }
       case SPI_GETFOCUSBORDERWIDTH:
          {
             ASSERT(pvParam);
             *((UINT*)pvParam) = FocusBorderWidth;
-            return TRUE;
+            break;
          }
       case SPI_SETFOCUSBORDERHEIGHT:
          {
             FocusBorderHeight = (UINT)pvParam;
-            return TRUE;
+            bChanged = TRUE;
+            break;
          }
       case SPI_SETFOCUSBORDERWIDTH:
          {
             FocusBorderWidth = (UINT)pvParam;
-            return TRUE;
+            bChanged = TRUE;
+            break;
          }
 
       default:
@@ -1337,7 +1346,18 @@ IntSystemParametersInfo(
             return FALSE;
          }
    }
-   return FALSE;
+   /* Did we change something ? */
+   if (bChanged)
+   {
+      /* Shall we send a WM_SETTINGCHANGE message ? */
+      if (fWinIni & (SPIF_UPDATEINIFILE | SPIF_SENDCHANGE))
+      {
+         /* Broadcast WM_SETTINGCHANGE to all toplevel windows */
+         /* FIXME: lParam should be pointer to a string containing the reg key */
+         UserPostMessage(HWND_BROADCAST, WM_SETTINGCHANGE, (WPARAM)uiAction, 0);
+      }
+   }
+   return TRUE;
 }
 
 /*
@@ -1396,14 +1416,14 @@ UserSystemParametersInfo(
       case SPI_GETGRADIENTCAPTIONS:
       case SPI_GETFOCUSBORDERHEIGHT:
       case SPI_GETFOCUSBORDERWIDTH:
-      case SPI_GETWHEELSCROLLLINES:
+	  case SPI_GETWHEELSCROLLLINES:
       case SPI_GETWHEELSCROLLCHARS:
-      case SPI_GETSCREENSAVERRUNNING:
-      case SPI_SETSCREENSAVERRUNNING:
-      case SPI_GETSCREENSAVETIMEOUT:
-      case SPI_SETSCREENSAVETIMEOUT:
-      case SPI_GETSCREENSAVEACTIVE:
-      case SPI_GETFLATMENU:
+	  case SPI_GETSCREENSAVERRUNNING:
+	  case SPI_SETSCREENSAVERRUNNING:
+	  case SPI_GETSCREENSAVETIMEOUT:
+	  case SPI_SETSCREENSAVETIMEOUT:
+	  case SPI_GETSCREENSAVEACTIVE:
+	  case SPI_GETFLATMENU:
       case SPI_SETFLATMENU:
          {
             BOOL Ret;
@@ -1529,10 +1549,10 @@ UserSystemParametersInfo(
             return( TRUE);
          }
       default :
-         {
-            DPRINT1("FIXME: UNIMPLEMENTED SPI Code: %lx \n",uiAction );
-            break;
-         }
+		  {
+              DPRINT1("FIXME: UNIMPLEMENTED SPI Code: %lx \n",uiAction );
+			  break;
+		  }
    }
    return( FALSE);
 }

From 98a086245c84c9fb7e28def80cd5bad75c2df49d Mon Sep 17 00:00:00 2001
From: Peter Ward <dralnix@gmail.com>
Date: Thu, 11 Jan 2007 14:47:50 +0000
Subject: [PATCH 21/36] - Applied patch for "Invalid Sync after loading
 BLUE.SYS (bootCD-dbg)". - See issue
 http://www.reactos.org/bugzilla/show_bug.cgi?id=1953 - Patch by Dmitry G.
 Gorbachev (hto at mail cnt dot ru).

svn path=/trunk/; revision=25425
---
 reactos/drivers/base/blue/blue.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/drivers/base/blue/blue.c b/reactos/drivers/base/blue/blue.c
index 6ef84ffb709..2b1743cb4fd 100644
--- a/reactos/drivers/base/blue/blue.c
+++ b/reactos/drivers/base/blue/blue.c
@@ -109,7 +109,7 @@ static const VGA_REGISTERS VidpMode3Regs =
    /* Sequencer Registers */
    {0x03, 0x00, 0x03, 0x00, 0x02},
    /* Misc Output Register */
-   0xE3
+   0x67
 };
 
 static const UCHAR DefaultPalette[] =

From c093c9b6b5614c6c193a07b04b0b55edd56d25ce Mon Sep 17 00:00:00 2001
From: Peter Ward <dralnix@gmail.com>
Date: Thu, 11 Jan 2007 15:22:04 +0000
Subject: [PATCH 22/36] - Fix a couple of typos, patch by GreyGhost.

svn path=/trunk/; revision=25426
---
 reactos/base/applications/cacls/lang/en-US.rc     | 2 +-
 reactos/base/applications/imagesoft/lang/en-US.rc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/base/applications/cacls/lang/en-US.rc b/reactos/base/applications/cacls/lang/en-US.rc
index dfc4b4b2325..4ccd5c5b88b 100644
--- a/reactos/base/applications/cacls/lang/en-US.rc
+++ b/reactos/base/applications/cacls/lang/en-US.rc
@@ -24,7 +24,7 @@ CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
                               C  Change (write)\n\
                               F  Full control\n\
    /D user       Deny specified user access.\n\
-Wildcards can be used to specify more that one file in a command.\n\
+Wildcards can be used to specify more than one file in a command.\n\
 You can specify more than one user in a command.\n\n\
 Abbreviations:\n\
    CI - Container Inherit.\n\
diff --git a/reactos/base/applications/imagesoft/lang/en-US.rc b/reactos/base/applications/imagesoft/lang/en-US.rc
index 7e8272c1b16..a7718967e96 100644
--- a/reactos/base/applications/imagesoft/lang/en-US.rc
+++ b/reactos/base/applications/imagesoft/lang/en-US.rc
@@ -171,7 +171,7 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
   IDS_IMAGE_MONOCHROME  "Monochrome (1 bit)"
-  IDS_IMAGE_GREYSCALE   "Greyscale (8 bit)"
+  IDS_IMAGE_GREYSCALE   "Grayscale (8 bit)"
   IDS_IMAGE_PALETTE     "Palette or 256 color (8 bit)"
   IDS_IMAGE_TRUECOLOR   "True color (24 bit)"
 

From 44592e4e76c79546f1a58d4b062900515bde6e5c Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Thu, 11 Jan 2007 20:32:20 +0000
Subject: [PATCH 23/36] added a dependencymap backend (it doesn't do anything
 yet)

svn path=/trunk/; revision=25429
---
 .../rbuild/backend/codeblocks/codeblocks.cpp  |   2 +-
 .../backend/dependencymap/dependencymap.cpp   | 127 ++++++++++++++++++
 .../backend/dependencymap/dependencymap.h     |  57 ++++++++
 reactos/tools/rbuild/rbuild.mak               |  33 ++++-
 4 files changed, 217 insertions(+), 2 deletions(-)
 create mode 100644 reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp
 create mode 100644 reactos/tools/rbuild/backend/dependencymap/dependencymap.h

diff --git a/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp b/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp
index 09b1b7ead42..8e935cd6655 100644
--- a/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp
+++ b/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp
@@ -747,7 +747,7 @@ CBBackend::_generate_cbproj ( const Module& module )
 		else if ( extension == ".idl" || extension == ".IDL" )		
 		{
 			fprintf ( OUT, "\t\t\t<Option compile=\"1\" />\r\n" );
-			fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"%s\\tools\\widl\\widl.exe %s %s -h -H &quot;$(TARGET_OUTPUT_DIR)\\$file_c.h&quot; -c -C &quot;$(TARGET_OUTPUT_DIR)\\$file_c.c&quot; $file\\ngcc %s -c &quot;$(TARGET_OUTPUT_DIR)\\$file_c.c&quot; -o &quot;$(TARGET_OUTPUT_DIR)\\$file_c.o&quot;\" />\r\n", outdir.c_str(), widl_options.c_str(), windres_defines.c_str(), widl_options.c_str() );
+			fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"%s\\tools\\widl\\widl.exe %s %s -h -H &quot;$(TARGET_OUTPUT_DIR)$filetitle_c.h&quot; -c -C &quot;$(TARGET_OUTPUT_DIR)$filetitle_c.c&quot; $file\\ngcc %s -c &quot;$(TARGET_OUTPUT_DIR)$filetitle_c.c&quot; -o &quot;$(TARGET_OUTPUT_DIR)$file_c.o&quot;\" />\r\n", outdir.c_str(), widl_options.c_str(), windres_defines.c_str(), widl_options.c_str() );
 		}
 		else if ( extension == ".spec" || extension == ".SPEC" )		
 		{
diff --git a/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp b/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp
new file mode 100644
index 00000000000..8b3e6d5c2a7
--- /dev/null
+++ b/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2007 Christoph von Wittich
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifdef _MSC_VER
+#pragma warning ( disable : 4786 )
+#endif//_MSC_VER
+
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <vector>
+
+#include <stdio.h>
+
+#include "dependencymap.h"
+#include "../mingw/mingw.h"
+
+using std::string;
+using std::vector;
+using std::ifstream;
+
+#ifdef OUT
+#undef OUT
+#endif//OUT
+
+
+static class DepMapFactory : public Backend::Factory
+{
+	public:
+
+		DepMapFactory() : Factory("DepMap", "Dependency Map") {}
+		Backend *operator() (Project &project,
+		                     Configuration& configuration)
+		{
+			return new DepMapBackend(project, configuration);
+		}
+		
+} factory;
+
+
+DepMapBackend::DepMapBackend(Project &project,
+	Configuration& configuration) : Backend(project, configuration)
+{
+
+}
+
+void DepMapBackend::Process()
+{
+	string filename_depmap ( "dependencymap.xml" );
+	printf ( "Creating dependecy map: %s\n", filename_depmap.c_str() );
+
+	m_DepMapFile = fopen ( filename_depmap.c_str(), "wb" );
+
+	if ( !m_DepMapFile )
+	{
+		printf ( "Could not create file '%s'.\n", filename_depmap.c_str() );
+		return;
+	}
+
+	_generate_depmap ( m_DepMapFile );
+
+	fclose ( m_DepMapFile );
+	printf ( "Done.\n" );
+}
+
+void
+DepMapBackend::_clean_project_files ( void )
+{
+	remove ( "dependencymap.xml" );
+}
+
+void
+DepMapBackend::_generate_depmap ( FILE* OUT )
+{
+
+	/* add dependencies */
+	for ( size_t i = 0; i < ProjectNode.modules.size(); i++ )
+	{
+		Module& module = *ProjectNode.modules[i];
+
+		if ((module.type != Iso) && 
+			(module.type != LiveIso) &&
+			(module.type != IsoRegTest) &&
+			(module.type != LiveIsoRegTest))
+		{
+			vector<const IfableData*> ifs_list;
+			ifs_list.push_back ( &module.project.non_if_data );
+			ifs_list.push_back ( &module.non_if_data );
+			while ( ifs_list.size() )
+			{
+				const IfableData& data = *ifs_list.back();
+				ifs_list.pop_back();
+				const vector<Library*>& libs = data.libraries;
+				for ( size_t j = 0; j < libs.size(); j++ )
+				{
+					//add module.name and libs[j]->name 
+				}
+			}
+		}	
+	}
+
+/* save data to file
+	fprintf ( OUT, "\r\n" );
+*/
+}
+
+
+DepMapConfiguration::DepMapConfiguration ( const std::string &name )
+{
+	/* nothing to do here */
+}
+
+
diff --git a/reactos/tools/rbuild/backend/dependencymap/dependencymap.h b/reactos/tools/rbuild/backend/dependencymap/dependencymap.h
new file mode 100644
index 00000000000..493daf6ba9b
--- /dev/null
+++ b/reactos/tools/rbuild/backend/dependencymap/dependencymap.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2007 Christoph von Wittich
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef __DEPMAP_H__
+#define __DEPMAP_H__
+
+#include <fstream>
+#include <vector>
+#include <string>
+
+#include "../backend.h"
+
+class DepMapConfiguration
+{
+	public:
+		DepMapConfiguration(const std::string &name = "");
+		virtual ~DepMapConfiguration() {}
+		std::string name;
+};
+
+class DepMapBackend : public Backend
+{
+	public:
+
+		DepMapBackend(Project &project,
+		              Configuration& configuration);
+		virtual ~DepMapBackend() {}
+
+		virtual void Process();
+
+	private:
+
+		FILE* m_DepMapFile;
+
+		std::vector<DepMapConfiguration*> m_configurations;
+		void _generate_depmap ( FILE* OUT );
+		void _clean_project_files ( void );
+
+};
+
+
+#endif // __DEPMAP_H__
+
diff --git a/reactos/tools/rbuild/rbuild.mak b/reactos/tools/rbuild/rbuild.mak
index cc7b536e955..3b83d67941e 100644
--- a/reactos/tools/rbuild/rbuild.mak
+++ b/reactos/tools/rbuild/rbuild.mak
@@ -119,6 +119,23 @@ $(RBUILD_CODEBLOCKS_OUT): | $(RBUILD_BACKEND_OUT)
 	${mkdir} $@
 endif
 
+RBUILD_DEPMAP_BASE = $(RBUILD_BACKEND_BASE_)dependencymap
+RBUILD_DEPMAP_BASE_ = $(RBUILD_DEPMAP_BASE)$(SEP)
+RBUILD_DEPMAP_INT = $(INTERMEDIATE_)$(RBUILD_DEPMAP_BASE)
+RBUILD_DEPMAP_INT_ = $(RBUILD_DEPMAP_INT)$(SEP)
+RBUILD_DEPMAP_OUT = $(OUTPUT_)$(RBUILD_DEPMAP_BASE)
+RBUILD_DEPMAP_OUT_ = $(RBUILD_DEPMAP_OUT)$(SEP)
+
+$(RBUILD_DEPMAP_INT): | $(RBUILD_BACKEND_INT)
+	$(ECHO_MKDIR)
+	${mkdir} $@
+
+ifneq ($(INTERMEDIATE),$(OUTPUT))
+$(RBUILD_DEPMAP_OUT): | $(RBUILD_BACKEND_OUT)
+	$(ECHO_MKDIR)
+	${mkdir} $@
+endif
+
 
 RBUILD_MSVC_BASE = $(RBUILD_BACKEND_BASE_)msvc
 RBUILD_MSVC_BASE_ = $(RBUILD_MSVC_BASE)$(SEP)
@@ -158,6 +175,11 @@ RBUILD_BACKEND_CODEBLOCKS_BASE_SOURCES = $(addprefix $(RBUILD_CODEBLOCKS_BASE_),
 	codeblocks.cpp \
 	)
 
+RBUILD_BACKEND_DEPMAP_BASE_SOURCES = $(addprefix $(RBUILD_DEPMAP_BASE_), \
+	dependencymap.cpp \
+	)
+
+
 RBUILD_BACKEND_MSVC_BASE_SOURCES = $(addprefix $(RBUILD_MSVC_BASE_), \
 	genguid.cpp \
 	msvc.cpp \
@@ -170,6 +192,7 @@ RBUILD_BACKEND_SOURCES = \
 	$(RBUILD_BACKEND_DEVCPP_BASE_SOURCES) \
 	$(RBUILD_BACKEND_MSVC_BASE_SOURCES) \
 	$(RBUILD_BACKEND_CODEBLOCKS_BASE_SOURCES) \
+	$(RBUILD_BACKEND_DEPMAP_BASE_SOURCES) \
 	$(RBUILD_BACKEND_BASE_)backend.cpp
 
 RBUILD_COMMON_SOURCES = \
@@ -225,6 +248,9 @@ RBUILD_BACKEND_MSVCCPP_HEADERS = \
 RBUILD_BACKEND_CODEBLOCKS_HEADERS = \
 	codeblocks.h
 
+RBUILD_BACKEND_DEPMAP_HEADERS = \
+	dependencymap.h
+
 RBUILD_BACKEND_MINGW_HEADERS = \
 	mingw.h \
 	modulehandler.h
@@ -234,7 +260,8 @@ RBUILD_BACKEND_HEADERS = \
 	$(addprefix devcpp$(SEP), $(RBUILD_BACKEND_DEVCPP_HEADERS)) \
 	$(addprefix msvc$(SEP), $(RBUILD_BACKEND_MSVC_HEADERS)) \
 	$(addprefix mingw$(SEP), $(RBUILD_BACKEND_MINGW_HEADERS)) \
-	$(addprefix codeblocks$(SEP), $(RBUILD_BACKEND_CODEBLOCKS_HEADERS))
+	$(addprefix codeblocks$(SEP), $(RBUILD_BACKEND_CODEBLOCKS_HEADERS)) \
+	$(addprefix dependencymap$(SEP), $(RBUILD_BACKEND_DEPMAP_HEADERS))
 
 RBUILD_HEADERS = \
 	$(addprefix $(RBUILD_BASE_), \
@@ -403,6 +430,10 @@ $(RBUILD_CODEBLOCKS_INT_)codeblocks.o: $(RBUILD_CODEBLOCKS_BASE_)codeblocks.cpp
 	$(ECHO_CC)
 	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
 
+$(RBUILD_DEPMAP_INT_)dependencymap.o: $(RBUILD_DEPMAP_BASE_)dependencymap.cpp $(RBUILD_HEADERS) | $(RBUILD_DEPMAP_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
 $(RBUILD_MSVC_INT_)genguid.o: $(RBUILD_MSVC_BASE_)genguid.cpp $(RBUILD_HEADERS) | $(RBUILD_MSVC_INT)
 	$(ECHO_CC)
 	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@

From c4d9ae331664fe0fb4307c559be0a84ed23d0264 Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Thu, 11 Jan 2007 20:33:04 +0000
Subject: [PATCH 24/36] added target depmap to makefile

svn path=/trunk/; revision=25430
---
 reactos/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/reactos/Makefile b/reactos/Makefile
index 9392802ee9f..d04d828a215 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -432,6 +432,10 @@ cb: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
 	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) cb
 
+.PHONY: depmap
+depmap: $(RBUILD_TARGET)
+	$(ECHO_RBUILD)
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) depmap
 
 .PHONY: msvc
 msvc: $(RBUILD_TARGET)

From a8dce67086029050f0c51e302a72942bf8b61c9c Mon Sep 17 00:00:00 2001
From: Dmitry Gorbachev <gorbachev@reactos.org>
Date: Thu, 11 Jan 2007 22:44:26 +0000
Subject: [PATCH 25/36] Thai language support: keyboard layout

svn path=/trunk/; revision=25431
---
 reactos/boot/bootdata/hivesys.inf          |   4 +-
 reactos/boot/bootdata/packages/reactos.dff |   1 +
 reactos/boot/bootdata/txtsetup.sif         |   2 +
 reactos/dll/keyboard/kbdth/kbdth.c         | 384 +++++++++++++++++++++
 reactos/dll/keyboard/kbdth/kbdth.def       |   8 +
 reactos/dll/keyboard/kbdth/kbdth.rbuild    |   9 +
 reactos/dll/keyboard/kbdth/kbdth.rc        |   5 +
 reactos/dll/keyboard/keyboard.rbuild       |   3 +
 8 files changed, 415 insertions(+), 1 deletion(-)
 create mode 100644 reactos/dll/keyboard/kbdth/kbdth.c
 create mode 100644 reactos/dll/keyboard/kbdth/kbdth.def
 create mode 100644 reactos/dll/keyboard/kbdth/kbdth.rbuild
 create mode 100644 reactos/dll/keyboard/kbdth/kbdth.rc

diff --git a/reactos/boot/bootdata/hivesys.inf b/reactos/boot/bootdata/hivesys.inf
index 5d50bc5ddbf..62e33df442d 100644
--- a/reactos/boot/bootdata/hivesys.inf
+++ b/reactos/boot/bootdata/hivesys.inf
@@ -57,6 +57,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout File",0
 HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout Text",0x00000000,"Russian"
 HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout File",0x00000000,"kbdse.dll"
 HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout Text",0x00000000,"SE"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041e","Layout File",0x00000000,"kbdth.dll"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041e","Layout Text",0x00000000,"Thai"
 HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout File",0x00000000,"kbdur.dll"
 HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout Text",0x00000000,"Ukrainian"
 HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout File",0x00000000,"kbduk.dll"
@@ -321,7 +323,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041b",0x00000000,"2"
 HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041c",0x00000000,"2"
 HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041d",0x00000000,"1"
 HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000081d",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00000000,""
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00000000,"2"
 HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041f",0x00000000,"6"
 ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000420",0x00000000,""
 HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000421",0x00000000,"1"
diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index a9410091001..9b9c367132b 100644
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -142,6 +142,7 @@ dll\keyboard\kbdru\kbdru.dll                        1
 dll\keyboard\kbdse\kbdse.dll                        1
 dll\keyboard\kbdsg\kbdsg.dll                        1
 dll\keyboard\kbdsk\kbdsk.dll                        1
+dll\keyboard\kbdth\kbdth.dll                        1
 dll\keyboard\kbduk\kbduk.dll                        1
 dll\keyboard\kbdur\kbdur.dll                        1
 dll\keyboard\kbdus\kbdus.dll                        1
diff --git a/reactos/boot/bootdata/txtsetup.sif b/reactos/boot/bootdata/txtsetup.sif
index b9a043f6648..96d5d003d37 100644
--- a/reactos/boot/bootdata/txtsetup.sif
+++ b/reactos/boot/bootdata/txtsetup.sif
@@ -110,6 +110,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)"
 0000041B = "Slovak (QWERTZ)"
 0000040A = "Spanish (traditional short)"
 0000041D = "Swedish (Sweden)"
+0000041E = "Thai (traditional)"
 00000422 = "Ukrainian"
 
 [Files.KeyboardLayout]
@@ -122,6 +123,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)"
 0000040E = kbdhu.dll
 00000419 = kbdru.dll
 0000041D = kbdse.dll
+0000041E = kbdth.dll
 00000422 = kbdur.dll
 00000809 = kbduk.dll
 00000807 = kbdsg.dll
diff --git a/reactos/dll/keyboard/kbdth/kbdth.c b/reactos/dll/keyboard/kbdth/kbdth.c
new file mode 100644
index 00000000000..9629b194801
--- /dev/null
+++ b/reactos/dll/keyboard/kbdth/kbdth.c
@@ -0,0 +1,384 @@
+/*
+ * ReactOS Thai keyboard layout (traditional)
+ * Copyright (C) 2007 ReactOS
+ * License: LGPL, see: LGPL.txt
+ * 
+ */
+
+#include <windows.h>
+#include <internal/kbd.h>
+
+#ifdef _M_IA64
+#define ROSDATA static __declspec(allocate(".data"))
+#else
+#ifdef _MSC_VER
+#pragma data_seg(".data")
+#define ROSDATA static
+#else
+#define ROSDATA static __attribute__((section(".data")))
+#endif
+#endif
+
+#define VK_EMPTY 0xff   /* The non-existent VK */
+#define KSHIFT   0x001  /* Shift modifier */
+#define KCTRL    0x002  /* Ctrl modifier */
+#define KALT     0x004  /* Alt modifier */
+#define KEXT     0x100  /* Extended key code */
+#define KMULTI   0x200  /* Multi-key */
+#define KSPEC    0x400  /* Special key */
+#define KNUMP    0x800  /* Number-pad */
+#define KNUMS    0xc00  /* Special + number pad */
+#define KMEXT    0x300  /* Multi + ext */
+
+ROSDATA USHORT scancode_to_vk[] = {
+  /* Numbers Row */
+  /* - 00 - */
+  /* 1 ...         2 ...         3 ...         4 ... */     
+  VK_EMPTY,     VK_ESCAPE,    '1',          '2',
+  '3',          '4',          '5',          '6',
+  '7',          '8',          '9',          '0',
+  VK_OEM_MINUS, VK_OEM_PLUS,  VK_BACK,
+  /* - 0f - */
+  /* First Letters Row */
+  VK_TAB,       'Q',          'W',          'E',
+  'R',          'T',          'Y',          'U',
+  'I',          'O',          'P',          
+  VK_OEM_4,     VK_OEM_6,     VK_RETURN,
+  /* - 1d - */
+  /* Second Letters Row */
+  VK_LCONTROL,  
+  'A',          'S',          'D',          'F',
+  'G',          'H',          'J',          'K',
+  'L',          VK_OEM_1,     VK_OEM_7,     VK_OEM_3, 
+  VK_LSHIFT,    VK_OEM_5,
+  /* - 2c - */
+  /* Third letters row */
+  'Z',          'X',          'C',          'V',
+  'B',          'N',          'M',          VK_OEM_COMMA,
+  VK_OEM_PERIOD,VK_OEM_2,     VK_RSHIFT | KEXT,
+  /* - 37 - */
+  /* Bottom Row */
+  VK_MULTIPLY,  VK_LMENU,     VK_SPACE,     VK_CAPITAL,
+  
+  /* - 3b - */
+  /* F-Keys */
+  VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, 
+  VK_F7, VK_F8, VK_F9, VK_F10,
+  /* - 45 - */
+  /* Locks */
+  VK_NUMLOCK | KMEXT,   
+  VK_SCROLL  | KMULTI,    
+  /* - 47 - */
+  /* Number-Pad */
+  VK_HOME   | KNUMS,      VK_UP     | KNUMS,      VK_PRIOR | KNUMS, VK_SUBTRACT,
+  VK_LEFT   | KNUMS,      VK_CLEAR  | KNUMS,      VK_RIGHT | KNUMS, VK_ADD,
+  VK_END    | KNUMS,      VK_DOWN   | KNUMS,      VK_NEXT  | KNUMS,
+  VK_INSERT | KNUMS,      VK_DELETE | KNUMS,
+  /* - 54 - */
+  /* Presumably PrtSc */
+  VK_SNAPSHOT,
+  /* - 55 - */
+  /* Oddities, and the remaining standard F-Keys */
+  VK_EMPTY,     VK_OEM_102,     VK_F11,       VK_F12,
+  /* - 59 - */
+  VK_CLEAR,	  VK_OEM_WSCTRL, VK_OEM_FINISH, VK_OEM_JUMP, VK_EREOF, /* EREOF */
+  VK_OEM_BACKTAB, VK_OEM_AUTO,   VK_EMPTY,      VK_ZOOM,               /* ZOOM */
+  VK_HELP,
+  /* - 64 - */
+  /* Even more F-Keys (for example, NCR keyboards from the early 90's) */
+  VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20,
+  VK_F21, VK_F22, VK_F23,
+  /* - 6f - */
+  /* Not sure who uses these codes */
+  VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET,
+  /* - 72 - */
+  VK_EMPTY, 0xc1, VK_EMPTY, VK_EMPTY,
+  /* - 76 - */
+  /* One more f-key */
+  VK_F24,
+  /* - 77 - */
+  VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
+  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
+  0,
+  /* - 80 - */
+  0
+};
+
+ROSDATA VSC_VK extcode0_to_vk[] = {
+  { 0x10, VK_MEDIA_PREV_TRACK | KEXT },
+  { 0x19, VK_MEDIA_NEXT_TRACK | KEXT },
+  { 0x1D, VK_RCONTROL | KEXT },
+  { 0x20, VK_VOLUME_MUTE | KEXT },
+  { 0x21, VK_LAUNCH_APP2 | KEXT },
+  { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT },
+  { 0x24, VK_MEDIA_STOP | KEXT },
+  { 0x2E, VK_VOLUME_DOWN | KEXT },
+  { 0x30, VK_VOLUME_UP | KEXT },
+  { 0x32, VK_BROWSER_HOME | KEXT },
+  { 0x35, VK_DIVIDE | KEXT },
+  { 0x37, VK_SNAPSHOT | KEXT },
+  { 0x38, VK_RMENU | KEXT },
+  { 0x47, VK_HOME | KEXT },
+  { 0x48, VK_UP | KEXT },
+  { 0x49, VK_PRIOR | KEXT },
+  { 0x4B, VK_LEFT | KEXT },
+  { 0x4D, VK_RIGHT | KEXT },
+  { 0x4F, VK_END | KEXT },
+  { 0x50, VK_DOWN | KEXT },
+  { 0x51, VK_NEXT | KEXT },
+  { 0x52, VK_INSERT | KEXT },
+  { 0x53, VK_DELETE | KEXT },
+  { 0x5B, VK_LWIN | KEXT },
+  { 0x5C, VK_RWIN | KEXT },
+  { 0x5D, VK_APPS | KEXT },
+  { 0x5F, VK_SLEEP | KEXT },
+  { 0x65, VK_BROWSER_SEARCH | KEXT },
+  { 0x66, VK_BROWSER_FAVORITES | KEXT },
+  { 0x67, VK_BROWSER_REFRESH | KEXT },
+  { 0x68, VK_BROWSER_STOP | KEXT },
+  { 0x69, VK_BROWSER_FORWARD | KEXT },
+  { 0x6A, VK_BROWSER_BACK | KEXT },
+  { 0x6B, VK_LAUNCH_APP1 | KEXT },
+  { 0x6C, VK_LAUNCH_MAIL | KEXT },
+  { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT },
+  { 0x1C, VK_RETURN | KEXT },
+  { 0x46, VK_CANCEL | KEXT },
+  { 0, 0 },
+};
+
+ROSDATA VSC_VK extcode1_to_vk[] = {
+  { 0x1d, VK_PAUSE},
+  { 0, 0 },
+};
+
+ROSDATA VK_TO_BIT modifier_keys[] = {
+  { VK_SHIFT,   KSHIFT },
+  { VK_CONTROL, KCTRL },
+  { VK_MENU,    KALT },
+  { 0,          0 }
+};
+
+ROSDATA MODIFIERS modifier_bits = {
+  modifier_keys,
+  3,
+  { 0, 1, 2, 3 } /* Modifier bit order */
+};
+
+#define NOCAPS 0
+#define CAPS   KSHIFT /* Caps -> shift */
+
+ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = {
+  { VK_OEM_3,     0, {'_',    '%'   } },
+  { '1',          0, {0x0e45, '+'   } },
+  { '2',          0, {'/',    0x0e51} },
+  { '3',          0, {'-',    0x0e52} },
+  { '4',          0, {0x0e20, 0x0e53} },
+  { '5',          0, {0x0e16, 0x0e54} },
+  { '6',          0, {0x0e38, 0x0e39} },
+  { '7',          0, {0x0e36, 0x0e3f} },
+  { '8',          0, {0x0e04, 0x0e55} },
+  { '9',          0, {0x0e15, 0x0e56} },
+  { '0',          0, {0x0e08, 0x0e57} },
+  { VK_OEM_MINUS, 0, {0x0e02, 0x0e58} },
+  { VK_OEM_PLUS,  0, {0x0e0a, 0x0e59} },
+  { VK_OEM_5,     0, {0x0e03, 0x0e05} },
+
+  { VK_OEM_4,     0, {0x0e1a, 0x0e10} },
+  { VK_OEM_6,     0, {0x0e25, ','   } },
+  { VK_OEM_1,     0, {0x0e27, 0x0e0b} },
+  { VK_OEM_7,     0, {0x0e07, '.'   } },
+  { VK_OEM_COMMA, 0, {0x0e21, 0x0e12} },
+  { VK_OEM_PERIOD,0, {0x0e43, 0x0e2c} },
+  { VK_OEM_2,     0, {0x0e1d, 0x0e26} },
+
+  { VK_TAB,	  0, {'\t', '\t'} },
+  { VK_ADD,       0, {'+',  '+' } },
+  { VK_SUBTRACT,  0, {'-',  '-' } },
+  { VK_MULTIPLY,  0, {'*',  '*' } },
+  { VK_DIVIDE,    0, {'/',  '/' } },
+  { VK_ESCAPE,    0, {0x1b, 0x1b} },
+  { VK_SPACE,     0, {' ',  ' ' } },
+  { 0, 0 }
+};
+
+ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = {
+  { VK_BACK,      0, {'\b', '\b', 0x7f} },
+  { VK_RETURN,    0, {'\r', '\r', '\n'} },
+  { 0, 0 }
+};
+
+ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = {
+  { 'Q',          0, {0x0e46, 0x0e50, 0x11, 0x11} },
+  { 'W',          0, {0x0e44, '\"'  , 0x17, 0x17} },
+  { 'E',          0, {0x0e33, 0x0e0e, 0x05, 0x05} },
+  { 'R',          0, {0x0e1e, 0x0e11, 0x12, 0x12} },
+  { 'T',          0, {0x0e30, 0x0e18, 0x14, 0x14} },
+  { 'Y',          0, {0x0e31, 0x0e4d, 0x19, 0x19} },
+  { 'U',          0, {0x0e35, 0x0e4a, 0x15, 0x15} },
+  { 'I',          0, {0x0e23, 0x0e13, 0x09, 0x09} },
+  { 'O',          0, {0x0e19, 0x0e2f, 0x0f, 0x0f} },
+  { 'P',          0, {0x0e22, 0x0e0d, 0x10, 0x10} },
+
+  { 'A',          0, {0x0e1f, 0x0e24, 0x01, 0x01} },
+  { 'S',          0, {0x0e2b, 0x0e06, 0x13, 0x13} },
+  { 'D',          0, {0x0e01, 0x0e0f, 0x04, 0x04} },
+  { 'F',          0, {0x0e14, 0x0e42, 0x06, 0x06} },
+  { 'G',          0, {0x0e40, 0x0e0c, 0x07, 0x07} },
+  { 'H',          0, {0x0e49, 0x0e47, 0x08, 0x08} },
+  { 'J',          0, {0x0e48, 0x0e4b, 0x0a, 0x0a} },
+  { 'K',          0, {0x0e32, 0x0e29, 0x0b, 0x0b} },
+  { 'L',          0, {0x0e2a, 0x0e28, 0x0c, 0x0c} },
+
+  { 'Z',          0, {0x0e1c, '('   , 0x1a, 0x1a} },
+  { 'X',          0, {0x0e1b, ')'   , 0x18, 0x18} },
+  { 'C',          0, {0x0e41, 0x0e09, 0x03, 0x03} },
+  { 'V',          0, {0x0e2d, 0x0e2e, 0x16, 0x16} },
+  { 'B',          0, {0x0e34, 0x0e3a, 0x02, 0x02} },
+  { 'N',          0, {0x0e37, 0x0e4c, 0x0e, 0x0e} },
+  { 'M',          0, {0x0e17, '?'   , 0x0d, 0x0d} },
+  { 0, 0 }
+};
+
+ROSDATA VK_TO_WCHARS1 keypad_numbers[] = {
+  { VK_NUMPAD0,   0, {'0'} },
+  { VK_NUMPAD1,   0, {'1'} },
+  { VK_NUMPAD2,   0, {'2'} },
+  { VK_NUMPAD3,   0, {'3'} },
+  { VK_NUMPAD4,   0, {'4'} },
+  { VK_NUMPAD5,   0, {'5'} },
+  { VK_NUMPAD6,   0, {'6'} },
+  { VK_NUMPAD7,   0, {'7'} },
+  { VK_NUMPAD8,   0, {'8'} },
+  { VK_NUMPAD9,   0, {'9'} },
+  { VK_DECIMAL,   0, {'.'} },
+  { 0, 0 }
+};
+
+#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) }
+
+ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = {
+  vk_master(1, keypad_numbers),
+  vk_master(2, key_to_chars_2mod),
+  vk_master(3, key_to_chars_3mod),
+  vk_master(4, key_to_chars_4mod),
+  { 0, 0, 0 }
+};
+
+ROSDATA VSC_LPWSTR key_names[] = {
+  { 0x00, L"" },
+  { 0x01, L"Esc" },
+  { 0x0e, L"Backspace" },
+  { 0x0f, L"Tab" },
+  { 0x1c, L"Enter" },
+  { 0x1d, L"Ctrl" },
+  { 0x2a, L"Shift" },
+  { 0x36, L"Right Shift" },
+  { 0x37, L"Num *" },
+  { 0x38, L"Alt" },
+  { 0x39, L"Space" },
+  { 0x3a, L"Caps Lock" },
+  { 0x3b, L"F1" },
+  { 0x3c, L"F2" },
+  { 0x3d, L"F3" },
+  { 0x3e, L"F4" },
+  { 0x3f, L"F5" },
+  { 0x40, L"F6" },
+  { 0x41, L"F7" },
+  { 0x42, L"F8" },
+  { 0x43, L"F9" },
+  { 0x44, L"F10" },
+  { 0x45, L"Pause" },
+  { 0x46, L"Scroll Lock" },
+  { 0x47, L"Num 7" },
+  { 0x48, L"Num 8" },
+  { 0x49, L"Num 9" },
+  { 0x4a, L"Num -" },
+  { 0x4b, L"Num 4" },
+  { 0x4c, L"Num 5" },
+  { 0x4d, L"Num 6" },
+  { 0x4e, L"Num +" },
+  { 0x4f, L"Num 1" },
+  { 0x50, L"Num 2" },
+  { 0x51, L"Num 3" },
+  { 0x52, L"Num 0" },
+  { 0x53, L"Num Del" },
+  { 0x54, L"Sys Req" },
+  { 0x57, L"F11" },
+  { 0x58, L"F12" },
+  { 0x7c, L"F13" },
+  { 0x7d, L"F14" },
+  { 0x7e, L"F15" },
+  { 0x7f, L"F16" },
+  { 0x80, L"F17" },
+  { 0x81, L"F18" },
+  { 0x82, L"F19" },
+  { 0x83, L"F20" },
+  { 0x84, L"F21" },
+  { 0x85, L"F22" },
+  { 0x86, L"F23" },
+  { 0x87, L"F24" },
+  { 0, NULL }
+};
+
+ROSDATA VSC_LPWSTR extended_key_names[] = {
+  { 0x1c, L"Num Enter" },
+  { 0x1d, L"Right Control" },
+  { 0x35, L"Num /" },
+  { 0x37, L"Prnt Scrn" },
+  { 0x38, L"Right Alt" },
+  { 0x45, L"Num Lock" },
+  { 0x46, L"Break" },
+  { 0x47, L"Home" },
+  { 0x48, L"Up" },
+  { 0x49, L"Page Up" },
+  { 0x4b, L"Left" },
+  { 0x4c, L"Center" },
+  { 0x4d, L"Right" },
+  { 0x4f, L"End" },
+  { 0x50, L"Down" },
+  { 0x51, L"Page Down" },
+  { 0x52, L"Insert" },
+  { 0x53, L"Delete" },
+  { 0x54, L"<ReactOS>" },
+  { 0x56, L"Help" },
+  { 0x5b, L"Left <ReactOS>" },
+  { 0x5c, L"Right <ReactOS>" },
+  { 0x5d, L"Application" },
+  { 0, NULL }
+};
+
+/* Finally, the master table */
+ROSDATA KBDTABLES keyboard_layout_table = {
+  /* modifier assignments */
+  &modifier_bits,
+  
+  /* character from vk tables */
+  vk_to_wchar_master_table,
+  
+  /* diacritical marks -- currently implemented by wine code */
+  NULL,
+
+  /* Key names */
+  (VSC_LPWSTR *)key_names,
+  (VSC_LPWSTR *)extended_key_names,
+  NULL, /* Dead key names */
+
+  /* scan code to virtual key maps */
+  scancode_to_vk,
+  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  extcode0_to_vk,
+  extcode1_to_vk,
+
+  MAKELONG(0,1), /* Version 1.0 */
+
+  /* Ligatures */
+  0,
+  0,
+  NULL
+};
+
+PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+  return &keyboard_layout_table;
+}
+
+/* EOF */
diff --git a/reactos/dll/keyboard/kbdth/kbdth.def b/reactos/dll/keyboard/kbdth/kbdth.def
new file mode 100644
index 00000000000..83fd698a004
--- /dev/null
+++ b/reactos/dll/keyboard/kbdth/kbdth.def
@@ -0,0 +1,8 @@
+;
+; ReactOS Operating System
+;
+LIBRARY kbdth.dll
+
+EXPORTS
+KbdLayerDescriptor
+;EOF
diff --git a/reactos/dll/keyboard/kbdth/kbdth.rbuild b/reactos/dll/keyboard/kbdth/kbdth.rbuild
new file mode 100644
index 00000000000..38ed7ece7e5
--- /dev/null
+++ b/reactos/dll/keyboard/kbdth/kbdth.rbuild
@@ -0,0 +1,9 @@
+<module name="kbdth" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdth.dll" allowwarnings="true">
+	<importlibrary definition="kbdth.def" />
+	<include base="ntoskrnl">include</include>
+	<define name="_DISABLE_TIDENTS" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_WINNT">0x0500</define>
+	<file>kbdth.c</file>
+	<file>kbdth.rc</file>
+</module>
diff --git a/reactos/dll/keyboard/kbdth/kbdth.rc b/reactos/dll/keyboard/kbdth/kbdth.rc
new file mode 100644
index 00000000000..f8fb8366e45
--- /dev/null
+++ b/reactos/dll/keyboard/kbdth/kbdth.rc
@@ -0,0 +1,5 @@
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Thai Keyboard Layout (traditional)\0"
+#define REACTOS_STR_INTERNAL_NAME	"kbdth\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"kbdth.dll\0"
+#include <reactos/version.rc>
diff --git a/reactos/dll/keyboard/keyboard.rbuild b/reactos/dll/keyboard/keyboard.rbuild
index 280651591c3..012d708b54a 100644
--- a/reactos/dll/keyboard/keyboard.rbuild
+++ b/reactos/dll/keyboard/keyboard.rbuild
@@ -35,6 +35,9 @@
 	<directory name="kbdsk">
 		<xi:include href="kbdsk/kbdsk.rbuild" />
 	</directory>
+	<directory name="kbdth">
+		<xi:include href="kbdth/kbdth.rbuild" />
+	</directory>
 	<directory name="kbduk">
 		<xi:include href="kbduk/kbduk.rbuild" />
 	</directory>

From 2aab0c74eb003957ea9639370a3ae47f910890f2 Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Fri, 12 Jan 2007 21:11:44 +0000
Subject: [PATCH 26/36] backport the start of a pe loader, backport allot of
 bug fix. like open file, reading file. My working copy have allot of hacks
 and is a big mess. This stuff is cleanup from it.

svn path=/trunk/; revision=25433
---
 rosapps/devutils/cputointel/CpuToIntel.c      |   2 +
 rosapps/devutils/cputointel/ImageLoader.c     | 389 ++++++++++++++++++
 rosapps/devutils/cputointel/PPC/PPCBrain.c    |  31 +-
 rosapps/devutils/cputointel/cputointel.rbuild |   1 +
 .../devutils/cputointel/dummycpu/DummyBrain.c |  40 +-
 rosapps/devutils/cputointel/misc.c            | 305 +-------------
 rosapps/devutils/cputointel/misc.h            |   2 +-
 7 files changed, 445 insertions(+), 325 deletions(-)
 create mode 100644 rosapps/devutils/cputointel/ImageLoader.c

diff --git a/rosapps/devutils/cputointel/CpuToIntel.c b/rosapps/devutils/cputointel/CpuToIntel.c
index e018c1b9e93..18ff6bda9cd 100644
--- a/rosapps/devutils/cputointel/CpuToIntel.c
+++ b/rosapps/devutils/cputointel/CpuToIntel.c
@@ -84,6 +84,8 @@ int main(int argc, char * argv[])
     }
 
     return LoadPFileImage(infile,outfile,BaseAddress,cpuid,type);
+    //return LoadPFileImage("e:\\cputointel.exe","e:\\cputointel.asm",0,0,0);
+
 }
 
 
diff --git a/rosapps/devutils/cputointel/ImageLoader.c b/rosapps/devutils/cputointel/ImageLoader.c
new file mode 100644
index 00000000000..950588265e0
--- /dev/null
+++ b/rosapps/devutils/cputointel/ImageLoader.c
@@ -0,0 +1,389 @@
+#include <windows.h>
+#include <winnt.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "misc.h"
+#include "ARM/ARM.h"
+#include "m68k/m68k.h"
+#include "PPC/PPC.h"
+
+CPU_INT LoadPFileImage( char *infileName, char *outputfileName, 
+                     CPU_UNINT BaseAddress, char *cpuid,
+                     CPU_UNINT type)
+{
+    FILE *infp;
+    FILE *outfp;
+    CPU_BYTE *cpu_buffer;   
+    CPU_UNINT cpu_pos = 0;
+    CPU_UNINT cpu_size=0;
+     //fopen("testms.exe","RB");
+    
+
+    /* Open file for read */
+
+    if (!(infp = fopen(infileName, "rb")))
+    {
+        printf("Can not open file %s\n",infileName);
+        return 3;
+    }
+
+    /* Open file for write */
+    if (!(outfp = fopen(outputfileName,"wb")))
+    {
+        printf("Can not open file %s\n",outputfileName);
+        return 4;
+    }
+
+    /* Load the binary file to a memory buffer */
+    fseek(infp,0,SEEK_END);
+    if (ferror(infp))
+    {
+        printf("error can not seek in the read file");
+        fclose(infp);
+        fclose(outfp);
+        return 5;
+    }
+    
+    /* get the memory size buffer */
+    cpu_size = ftell(infp);
+    if (ferror(infp))
+    {
+        printf("error can not get file size of the read file");
+        fclose(infp);
+        fclose(outfp);
+        return 6;
+    }
+
+    /* Load the binary file to a memory buffer */
+    fseek(infp,0,SEEK_SET);
+    if (ferror(infp))
+    {
+        printf("error can not seek in the read file");
+        fclose(infp);
+        fclose(outfp);
+        return 5;
+    }
+
+    if (cpu_size==0)
+    {
+        printf("error file size is Zero lenght of the read file");
+        fclose(infp);
+        fclose(outfp);
+        return 7;
+    }
+
+    /* alloc memory now */
+   ;
+    if (!(cpu_buffer = (unsigned char *) malloc(cpu_size+1)))
+    {
+        printf("error can not alloc %uld size for memory buffer",cpu_size);
+        fclose(infp);
+        fclose(outfp);
+        return 8;
+    }
+    ZeroMemory(cpu_buffer,cpu_size);
+
+    /* read from the file now in one sweep */
+    fread((void *)cpu_buffer,1,cpu_size,infp);
+    if (ferror(infp))
+    {
+        printf("error can not read file ");
+        fclose(infp);
+        fclose(outfp);
+        return 9;
+    }
+    fclose(infp);
+
+    if (type==0) 
+    {
+       if ( PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size, outfp) !=0)
+       {
+            type=1;
+       }
+    }
+
+    if (type== 1)
+    {
+        if (stricmp(cpuid,"m68000"))
+                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68000,outfp);
+        else if (stricmp(cpuid,"m68010"))
+                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68010,outfp);
+        else if (stricmp(cpuid,"m68020"))
+                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68020,outfp);
+        else if (stricmp(cpuid,"m68030"))
+                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68030,outfp);
+        else if (stricmp(cpuid,"m68040"))
+                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68040,outfp);
+        else if (stricmp(cpuid,"ppc"))
+                return PPCBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,0,outfp);
+        else if (stricmp(cpuid,"arm4"))
+                return ARMBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,4,outfp);
+    }
+
+    if (type==2) 
+    {
+       return PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size, outfp);
+
+    }
+
+    return 0;
+}
+
+CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos,
+                     CPU_UNINT base,  CPU_UNINT size,
+                     FILE *outfp)
+{
+    //INT sizeofHeader = IMAGE_NT_SIGNATURE;
+    PIMAGE_DOS_HEADER DosHeader;
+    PIMAGE_NT_HEADERS NtHeader;
+    PIMAGE_SECTION_HEADER SectionHeader;
+
+    DosHeader = (PIMAGE_DOS_HEADER)memory;
+    if ( (DosHeader->e_magic != IMAGE_DOS_SIGNATURE) ||
+         (size < 0x3c+2) )
+    {
+        printf("No MZ file \n");
+        return -1;
+    }
+
+    
+
+    NtHeader = (PIMAGE_NT_HEADERS) (((ULONG)memory) + ((ULONG)DosHeader->e_lfanew));
+    if (NtHeader->Signature != IMAGE_NT_SIGNATURE)
+    {
+        printf("No PE header found \n");
+    }
+
+    if (!(NtHeader->FileHeader.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE))
+    {
+        printf("No execute image found \n");
+        return -1;
+    }
+
+    switch(NtHeader->OptionalHeader.Subsystem)
+    {
+        case IMAGE_SUBSYSTEM_EFI_APPLICATION:
+             fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_EFI_APPLICATION");
+             printf("This exe file is desgin run in EFI bios as applactions\n");
+             break;
+        case IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER:
+             fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER");
+             printf("This exe file is desgin run in EFI bios as service driver\n");
+             break;
+        case IMAGE_SUBSYSTEM_EFI_ROM:
+             fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_EFI_ROM");
+             printf("This exe file is EFI ROM\n");
+             break;
+        case IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER:
+             fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER");
+             printf("This exe file is desgin run in EFI bios as driver\n");
+             break;
+        case IMAGE_SUBSYSTEM_NATIVE:
+             fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_NATIVE");
+             printf("This exe file does not need any subsystem\n");
+             break;
+        case IMAGE_SUBSYSTEM_NATIVE_WINDOWS:
+             fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_NATIVE_WINDOWS");
+             printf("This exe file is desgin run on Windows 9x as driver \n");
+             break;
+        case IMAGE_SUBSYSTEM_OS2_CUI:
+             fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_OS2_CUI");
+             printf("This exe file is desgin run on OS2 as CUI\n");
+             break;
+        case IMAGE_SUBSYSTEM_POSIX_CUI:
+             fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_POSIX_CUI");
+             printf("This exe file is desgin run on POSIX as CUI\n");
+             break;
+        case IMAGE_SUBSYSTEM_WINDOWS_CE_GUI:
+             fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_WINDOWS_CE_GUI");
+             printf("This exe file is desgin run on Windows CE as GUI\n");
+             break;
+        case IMAGE_SUBSYSTEM_WINDOWS_CUI:
+             fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_WINDOWS_CUI");
+             printf("This exe file is desgin run on Windows as CUI\n");
+             break;
+        case IMAGE_SUBSYSTEM_WINDOWS_GUI:
+             fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_WINDOWS_GUI");
+             printf("This exe file is desgin run on Windows as GUI\n");
+             break;
+        case IMAGE_SUBSYSTEM_XBOX:
+             fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_XBOX");
+             printf("This exe file is desgin run on X-Box\n");
+             break;
+        default:
+            fprintf(outfp,"; OS type : Unknown");
+            printf("Unknown OS : SubID : %d\n",NtHeader->OptionalHeader.Subsystem);
+            break;
+    }
+
+
+
+
+    /*
+    SectionHeader->Name == ".tls$"
+    SectionHeader->Name == ".tls"
+    SectionHeader->Name == ".text"  // Executable code 
+    SectionHeader->Name == ".sxdata"
+    SectionHeader->Name == ".sdata"
+    SectionHeader->Name == ".sbss"
+    SectionHeader->Name == ".rsrc" // rc data
+    SectionHeader->Name == ".reloc"
+    SectionHeader->Name == ".rdata" // read only initialized data
+    SectionHeader->Name == ".pdata"
+    SectionHeader->Name == ".idlsym" 
+    SectionHeader->Name == ".idata" // Import tables 
+    SectionHeader->Name == ".edata" // Export tables 
+    SectionHeader->Name == ".drective"
+    SectionHeader->Name == ".debug$T"
+    SectionHeader->Name == ".debug$S"
+    SectionHeader->Name == ".debug$P"
+    SectionHeader->Name == ".debug$F"
+    SectionHeader->Name == ".data"  //data segment 
+    SectionHeader->Name == ".cormeta"
+    SectionHeader->Name == ".bss"  // bss segment 
+
+    undoc
+    SectionHeader->Name == ".textbss"  // bss segment 
+    */
+
+
+   
+    //*base =  NtHeader->OptionalHeader.AddressOfEntryPoint;
+
+   SectionHeader = IMAGE_FIRST_SECTION(NtHeader);
+   while (SectionHeader != NULL)
+   {
+       if (strcmpi(SectionHeader->Name,".rsrc"))
+       {
+           /* FIXME add a rc bin to text scanner */
+       }
+
+       else if (strcmpi(SectionHeader->Name,".textbss"))
+       {
+          /* FIXME add a bss to text scanner */
+       }
+
+       else if (strcmpi(SectionHeader->Name,".text"))
+       {
+            switch (NtHeader->FileHeader.Machine)
+            {
+                case IMAGE_FILE_MACHINE_ALPHA:
+                     printf("CPU ALPHA Detected no CPUBrain implement for it\n");
+                     return -1;
+
+                case IMAGE_FILE_MACHINE_ALPHA64:
+                     printf("CPU ALPHA64/AXP64 Detected no CPUBrain implement for it\n");
+                     return -1;
+
+                case IMAGE_FILE_MACHINE_AM33:
+                     printf("CPU AM33 Detected no CPUBrain implement for it\n");
+                     return -1;
+
+                case IMAGE_FILE_MACHINE_AMD64:
+                     printf("CPU AMD64 Detected no CPUBrain implement for it\n");
+                     return -1;
+
+                case IMAGE_FILE_MACHINE_ARM:
+                     printf("CPU ARM Detected no CPUBrain implement for it\n");
+                     return -1;
+
+                case IMAGE_FILE_MACHINE_CEE:
+                     printf("CPU CEE Detected no CPUBrain implement for it\n");
+                     return -1;
+
+                case IMAGE_FILE_MACHINE_CEF:
+                     printf("CPU CEF Detected no CPUBrain implement for it\n");
+                     return -1;
+
+                case IMAGE_FILE_MACHINE_EBC:
+                     printf("CPU EBC Detected no CPUBrain implement for it\n");
+                     return -1;
+
+                case IMAGE_FILE_MACHINE_I386:
+                     printf("CPU I386 Detected no CPUBrain implement for it\n");
+                     return -1;
+
+                case IMAGE_FILE_MACHINE_IA64:
+                     printf("CPU IA64 Detected no CPUBrain implement for it\n");
+                     return -1;
+
+                case IMAGE_FILE_MACHINE_M32R:
+                     printf("CPU M32R Detected no CPUBrain implement for it\n");
+                     return -1;
+
+                case IMAGE_FILE_MACHINE_MIPS16:
+                     printf("CPU MIPS16 Detected no CPUBrain implement for it\n");
+                     return -1;
+
+                case IMAGE_FILE_MACHINE_MIPSFPU:
+                     printf("CPU MIPSFPU Detected no CPUBrain implement for it\n");
+                     return -1;
+
+                case IMAGE_FILE_MACHINE_MIPSFPU16:
+                     printf("CPU MIPSFPU16 Detected no CPUBrain implement for it\n");
+                     return -1;
+
+               case IMAGE_FILE_MACHINE_POWERPC:
+                    printf("CPU POWERPC Detected no CPUBrain implement for it\n");
+                    return -1;
+
+               case IMAGE_FILE_MACHINE_POWERPCFP:
+                    printf("CPU POWERPCFP Detected no CPUBrain implement for it\n");
+                    return -1;
+
+               case IMAGE_FILE_MACHINE_R10000:
+                    printf("CPU R10000 Detected no CPUBrain implement for it\n");
+                    return -1;
+
+               case IMAGE_FILE_MACHINE_R3000:
+                    printf("CPU R3000 Detected no CPUBrain implement for it\n");
+                    return -1;
+
+               case IMAGE_FILE_MACHINE_R4000:
+                    printf("CPU R4000 Detected no CPUBrain implement for it\n");
+                    return -1;
+
+               case IMAGE_FILE_MACHINE_SH3:
+                    printf("CPU SH3 Detected no CPUBrain implement for it\n");
+                    return -1;
+
+               case IMAGE_FILE_MACHINE_SH3DSP:
+                    printf("CPU SH3DSP Detected no CPUBrain implement for it\n");
+                    return -1;
+
+               case IMAGE_FILE_MACHINE_SH3E:
+                    printf("CPU SH3E Detected no CPUBrain implement for it\n");
+                    return -1;
+
+               case IMAGE_FILE_MACHINE_SH4:
+                    printf("CPU SH4 Detected no CPUBrain implement for it\n");
+                    return -1;
+
+               case IMAGE_FILE_MACHINE_SH5:
+                    printf("CPU SH5 Detected no CPUBrain implement for it\n");
+                    return -1;
+
+               case IMAGE_FILE_MACHINE_THUMB:
+                    printf("CPU THUMB Detected no CPUBrain implement for it\n");
+                    return -1;
+
+               case IMAGE_FILE_MACHINE_TRICORE:
+                    printf("CPU TRICORE Detected no CPUBrain implement for it\n");
+                    return -1;
+
+               case IMAGE_FILE_MACHINE_WCEMIPSV2:
+                    printf("CPU WCEMIPSV2 Detected no CPUBrain implement for it\n");
+                    return -1;
+
+               default:
+                    printf("Unknown Machine : %d",NtHeader->FileHeader.Machine);
+                    return -1;
+            }
+      }
+      /* FIXME add couter to next sections */
+   } 
+
+   return 0;
+}
diff --git a/rosapps/devutils/cputointel/PPC/PPCBrain.c b/rosapps/devutils/cputointel/PPC/PPCBrain.c
index c0401864557..aa2d32557ed 100644
--- a/rosapps/devutils/cputointel/PPC/PPCBrain.c
+++ b/rosapps/devutils/cputointel/PPC/PPCBrain.c
@@ -5,17 +5,26 @@
 #include "PPC.h"
 #include "../misc.h"
 
-/* retun 
- * 0 = Ok 
- * 1 = unimplemt 
- * 2 = Unkonwn Opcode 
- * 3 = can not open read file
- * 4 = can not open write file
- * 5 = can not seek to end of read file
- * 6 = can not get the file size of the read file
- * 7 = read file size is Zero
- * 8 = can not alloc memory
- * 9 = can not read file
+/* 
+ * DummyBrain is example how you create you own cpu brain to translate from 
+ * cpu to intel assembler, I have not add DummyBrain to the loader it is not
+ * need it in our example. When you write you own brain, it must be setup in
+ * misc.c function LoadPFileImage and PEFileStart, PEFileStart maybe does not
+ * need the brain you have writen so you do not need setup it there then.
+ *
+ * input param: 
+ *         cpu_buffer   : the memory buffer with loaded program we whant translate
+ *         cpu_pos      : the positions in the cpu_buffer 
+ *         cpu_size     : the alloced memory size of the cpu_buffer
+ *         BaseAddress  : the virtual memory address we setup to use.
+ *         cpuarch      : the sub arch for the brain, example if it exists more one
+ *                        cpu with same desgin but few other opcode or extend opcode
+ *         outfp        : the output file pointer
+ *
+ * return value
+ *         0            : Ok 
+ *         1            : unimplemt 
+ *         2            : Unkonwn Opcode
  */
 
 CPU_INT PPCBrain(    CPU_BYTE *cpu_buffer,
diff --git a/rosapps/devutils/cputointel/cputointel.rbuild b/rosapps/devutils/cputointel/cputointel.rbuild
index 0a7b145830b..23420558721 100644
--- a/rosapps/devutils/cputointel/cputointel.rbuild
+++ b/rosapps/devutils/cputointel/cputointel.rbuild
@@ -7,6 +7,7 @@
 	<library>user32</library>
 
 	<file>CpuToIntel.c</file>
+	<file>ImageLoader.c</file>
 	<file>misc.c</file>
 
 	<file>ARM/ARMBrain.c</file>
diff --git a/rosapps/devutils/cputointel/dummycpu/DummyBrain.c b/rosapps/devutils/cputointel/dummycpu/DummyBrain.c
index e1ffb099e78..79ceefb069f 100644
--- a/rosapps/devutils/cputointel/dummycpu/DummyBrain.c
+++ b/rosapps/devutils/cputointel/dummycpu/DummyBrain.c
@@ -5,17 +5,28 @@
 #include "Dummy.h"
 #include "../misc.h"
 
-/* retun 
- * 0 = Ok 
- * 1 = unimplemt 
- * 2 = Unkonwn Opcode 
- * 3 = can not open read file
- * 4 = can not open write file
- * 5 = can not seek to end of read file
- * 6 = can not get the file size of the read file
- * 7 = read file size is Zero
- * 8 = can not alloc memory
- * 9 = can not read file
+
+
+/* 
+ * DummyBrain is example how you create you own cpu brain to translate from 
+ * cpu to intel assembler, I have not add DummyBrain to the loader it is not
+ * need it in our example. When you write you own brain, it must be setup in
+ * misc.c function LoadPFileImage and PEFileStart, PEFileStart maybe does not
+ * need the brain you have writen so you do not need setup it there then.
+ *
+ * input param: 
+ *         cpu_buffer   : the memory buffer with loaded program we whant translate
+ *         cpu_pos      : the positions in the cpu_buffer 
+ *         cpu_size     : the alloced memory size of the cpu_buffer
+ *         BaseAddress  : the virtual memory address we setup to use.
+ *         cpuarch      : the sub arch for the brain, example if it exists more one
+ *                        cpu with same desgin but few other opcode or extend opcode
+ *         outfp        : the output file pointer
+ *
+ * return value
+ *         0            : Ok 
+ *         1            : unimplemt 
+ *         2            : Unkonwn Opcode
  */
 
 CPU_INT DummyBrain(  CPU_BYTE *cpu_buffer,
@@ -30,10 +41,7 @@ CPU_INT DummyBrain(  CPU_BYTE *cpu_buffer,
     CPU_INT retcode = 0;
     CPU_INT retsize;
 
-
-
-
-    /* now we start the process */    
+    /* now we start the process */
     while (cpu_pos<cpu_size)
     {
         cpu_oldpos = cpu_pos;
@@ -75,5 +83,5 @@ CPU_INT DummyBrain(  CPU_BYTE *cpu_buffer,
             break;
         }
     }
-    return retcode;    
+    return retcode;
 }
diff --git a/rosapps/devutils/cputointel/misc.c b/rosapps/devutils/cputointel/misc.c
index be536a6bcfb..beef898205e 100644
--- a/rosapps/devutils/cputointel/misc.c
+++ b/rosapps/devutils/cputointel/misc.c
@@ -29,303 +29,6 @@
  * type 2 : exe/dll/sys
  */
 
-CPU_INT LoadPFileImage( char *infileName, char *outputfileName, 
-                     CPU_UNINT BaseAddress, char *cpuid,
-                     CPU_UNINT type)
-{
-    FILE *infp;
-    FILE *outfp;
-    CPU_BYTE *cpu_buffer;   
-    CPU_UNINT cpu_pos = 0;
-    CPU_UNINT cpu_size=0;
-
-
-    /* Open file for read */
-    if (!(infp = fopen(infileName,"RB")))
-    {
-        printf("Can not open file %s\n",infileName);
-        return 3;
-    }
-
-    /* Open file for write */
-    if (!(outfp = fopen(outputfileName,"WB")))
-    {
-        printf("Can not open file %s\n",outputfileName);
-        return 4;
-    }
-
-    /* Load the binary file to a memory buffer */
-    fseek(infp,0,SEEK_END);
-    if (!ferror(infp))
-    {
-        printf("error can not seek in the read file");
-        fclose(infp);
-        fclose(outfp);
-        return 5;
-    }
-    
-    /* get the memory size buffer */
-    cpu_size = ftell(infp);
-    if (!ferror(infp))
-    {
-        printf("error can not get file size of the read file");
-        fclose(infp);
-        fclose(outfp);
-        return 6;
-    }
-
-    if (cpu_size==0)
-    {
-        printf("error file size is Zero lenght of the read file");
-        fclose(infp);
-        fclose(outfp);
-        return 7;
-    }
-
-    /* alloc memory now */
-    if (!(cpu_buffer = (unsigned char *) malloc(cpu_size)))
-    {
-        printf("error can not alloc %uld size for memory buffer",cpu_size);
-        fclose(infp);
-        fclose(outfp);
-        return 8;
-    }
-
-    /* read from the file now in one sweep */
-    fread(cpu_buffer,1,cpu_size,infp);
-    if (!ferror(infp))
-    {
-        printf("error can not read file ");
-        fclose(infp);
-        fclose(outfp);
-        return 9;
-    }
-    fclose(infp);
-
-    if (type==0) 
-    {
-       if ( PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size) !=0)
-       {
-            type=1;
-       }
-    }
-
-    if (type== 1)
-    {
-        if (stricmp(cpuid,"m68000"))
-                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68000,outfp);
-        else if (stricmp(cpuid,"m68010"))
-                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68010,outfp);
-        else if (stricmp(cpuid,"m68020"))
-                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68020,outfp);
-        else if (stricmp(cpuid,"m68030"))
-                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68030,outfp);
-        else if (stricmp(cpuid,"m68040"))
-                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68040,outfp);
-        else if (stricmp(cpuid,"ppc"))
-                return PPCBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,0,outfp);
-        else if (stricmp(cpuid,"arm4"))
-                return ARMBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,4,outfp);
-    }
-
-    if (type==2) 
-    {
-       return PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size);
-
-    }
-
-    return 0;
-}
-
-CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos,
-                     CPU_UNINT base,  CPU_UNINT size)
-{
-    PIMAGE_DOS_HEADER DosHeader;
-    PIMAGE_NT_HEADERS NtHeader;
-
-    DosHeader = (PIMAGE_DOS_HEADER)memory;
-    if ( (DosHeader->e_magic != IMAGE_DOS_SIGNATURE) ||
-         (size < 0x3c+2) )
-    {
-        printf("No MZ file \n");
-        return -1;
-    }
-
-    NtHeader = (PIMAGE_NT_HEADERS) memory+ DosHeader->e_lfanew;
-    if (NtHeader->Signature != IMAGE_NT_SIGNATURE)
-    {
-        printf("No PE header found \n");
-    }
-
-    if (!(NtHeader->FileHeader.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE))
-    {
-        printf("No execute image found \n");
-        return -1;
-    }
-
-    switch(NtHeader->OptionalHeader.Subsystem)
-    {
-        case IMAGE_SUBSYSTEM_EFI_APPLICATION:
-             printf("This exe file is desgin run in EFI bios as applactions\n");
-             break;
-        case IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER:
-             printf("This exe file is desgin run in EFI bios as service driver\n");
-             break;
-        case IMAGE_SUBSYSTEM_EFI_ROM:
-             printf("This exe file is EFI ROM\n");
-             break;
-        case IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER:
-             printf("This exe file is desgin run in EFI bios as driver\n");
-             break;
-        case IMAGE_SUBSYSTEM_NATIVE:
-             printf("This exe file does not need any subsystem\n");
-             break;
-        case IMAGE_SUBSYSTEM_NATIVE_WINDOWS:
-             printf("This exe file is desgin run on Windows 9x as driver \n");
-             break;
-        case IMAGE_SUBSYSTEM_OS2_CUI:
-             printf("This exe file is desgin run on OS2 as CUI\n");
-             break;
-        case IMAGE_SUBSYSTEM_POSIX_CUI:
-             printf("This exe file is desgin run on POSIX as CUI\n");
-             break;
-        case IMAGE_SUBSYSTEM_WINDOWS_CE_GUI:
-             printf("This exe file is desgin run on Windows CE as GUI\n");
-             break;
-        case IMAGE_SUBSYSTEM_WINDOWS_CUI:
-             printf("This exe file is desgin run on Windows as CUI\n");
-             break;
-        case IMAGE_SUBSYSTEM_WINDOWS_GUI:
-             printf("This exe file is desgin run on Windows as GUI\n");
-             break;
-        case IMAGE_SUBSYSTEM_XBOX:
-             printf("This exe file is desgin run on X-Box\n");
-             break;
-        default:
-            printf("Unknown OS : SubID : %d\n",NtHeader->OptionalHeader.Subsystem);
-            break;
-    }
-
-    //*base =  NtHeader->OptionalHeader.AddressOfEntryPoint;
-
-
-    /* return */
-    switch (NtHeader->FileHeader.Machine)
-   {
-        case IMAGE_FILE_MACHINE_ALPHA:
-             printf("CPU ALPHA Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_ALPHA64:
-             printf("CPU ALPHA64/AXP64 Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_AM33:
-             printf("CPU AM33 Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_AMD64:
-             printf("CPU AMD64 Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_ARM:
-             printf("CPU ARM Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_CEE:
-             printf("CPU CEE Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_CEF:
-             printf("CPU CEF Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_EBC:
-             printf("CPU EBC Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_I386:
-             printf("CPU I386 Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_IA64:
-             printf("CPU IA64 Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_M32R:
-             printf("CPU M32R Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_MIPS16:
-             printf("CPU MIPS16 Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_MIPSFPU:
-             printf("CPU MIPSFPU Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_MIPSFPU16:
-             printf("CPU MIPSFPU16 Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_POWERPC:
-             printf("CPU POWERPC Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_POWERPCFP:
-             printf("CPU POWERPCFP Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_R10000:
-             printf("CPU R10000 Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_R3000:
-             printf("CPU R3000 Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_R4000:
-             printf("CPU R4000 Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_SH3:
-             printf("CPU SH3 Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_SH3DSP:
-             printf("CPU SH3DSP Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_SH3E:
-             printf("CPU SH3E Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_SH4:
-             printf("CPU SH4 Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_SH5:
-             printf("CPU SH5 Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_THUMB:
-             printf("CPU THUMB Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_TRICORE:
-             printf("CPU TRICORE Detected no CPUBrain implement for it\n");
-             return -1;
-
-        case IMAGE_FILE_MACHINE_WCEMIPSV2:
-             printf("CPU WCEMIPSV2 Detected no CPUBrain implement for it\n");
-             return -1;
-
-        default:
-            printf("Unknown Machine : %d",NtHeader->FileHeader.Machine);
-            return -1;
-   }
-
-}
 
 
 /* Conveting bit array to a int byte */
@@ -393,3 +96,11 @@ CPU_UNINT GetMaskByte32(CPU_BYTE *bit)
 }
 
 
+
+// add no carry
+
+
+
+
+
+
diff --git a/rosapps/devutils/cputointel/misc.h b/rosapps/devutils/cputointel/misc.h
index b7cb59534ea..4a876bb38b4 100644
--- a/rosapps/devutils/cputointel/misc.h
+++ b/rosapps/devutils/cputointel/misc.h
@@ -12,7 +12,7 @@
 
 /* Prototypes for misc stuff */
 CPU_INT LoadPFileImage(char *infileName, char *outputfileName, CPU_UNINT BaseAddress, char *cpuid, CPU_UNINT type);
-CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos, CPU_UNINT base,  CPU_UNINT size);
+CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos, CPU_UNINT base,  CPU_UNINT size, FILE *outfp);
 
 CPU_UNINT ConvertBitToByte(CPU_BYTE *bit);
 CPU_UNINT GetMaskByte(CPU_BYTE *bit);

From 40628588f81f0c6299b1baccbf310e02870ffbb2 Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Sat, 13 Jan 2007 09:56:05 +0000
Subject: [PATCH 27/36] 1. finish the peloader, left todo add decoder for each
 sectionheader, add the base address when u call a brain, and some other
 minior fix 2. fix some comment that was wrong.

svn path=/trunk/; revision=25434
---
 rosapps/devutils/cputointel/ImageLoader.c     | 92 ++++++++++---------
 rosapps/devutils/cputointel/PPC/PPCBrain.c    |  2 +
 .../devutils/cputointel/dummycpu/DummyBrain.c |  2 +
 rosapps/devutils/cputointel/m68k/M68kBrain.c  | 15 +--
 4 files changed, 58 insertions(+), 53 deletions(-)

diff --git a/rosapps/devutils/cputointel/ImageLoader.c b/rosapps/devutils/cputointel/ImageLoader.c
index 950588265e0..360b08b4bfd 100644
--- a/rosapps/devutils/cputointel/ImageLoader.c
+++ b/rosapps/devutils/cputointel/ImageLoader.c
@@ -9,6 +9,10 @@
 #include "m68k/m68k.h"
 #include "PPC/PPC.h"
 
+/*
+ *
+ */
+
 CPU_INT LoadPFileImage( char *infileName, char *outputfileName, 
                      CPU_UNINT BaseAddress, char *cpuid,
                      CPU_UNINT type)
@@ -135,10 +139,11 @@ CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos,
                      CPU_UNINT base,  CPU_UNINT size,
                      FILE *outfp)
 {
-    //INT sizeofHeader = IMAGE_NT_SIGNATURE;
     PIMAGE_DOS_HEADER DosHeader;
     PIMAGE_NT_HEADERS NtHeader;
     PIMAGE_SECTION_HEADER SectionHeader;
+    INT NumberOfSections;
+    INT NumberOfSectionsCount=0;
 
     DosHeader = (PIMAGE_DOS_HEADER)memory;
     if ( (DosHeader->e_magic != IMAGE_DOS_SIGNATURE) ||
@@ -148,8 +153,6 @@ CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos,
         return -1;
     }
 
-    
-
     NtHeader = (PIMAGE_NT_HEADERS) (((ULONG)memory) + ((ULONG)DosHeader->e_lfanew));
     if (NtHeader->Signature != IMAGE_NT_SIGNATURE)
     {
@@ -218,9 +221,6 @@ CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos,
             break;
     }
 
-
-
-
     /*
     SectionHeader->Name == ".tls$"
     SectionHeader->Name == ".tls"
@@ -248,141 +248,147 @@ CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos,
     SectionHeader->Name == ".textbss"  // bss segment 
     */
 
-
-   
     //*base =  NtHeader->OptionalHeader.AddressOfEntryPoint;
 
-   SectionHeader = IMAGE_FIRST_SECTION(NtHeader);
-   while (SectionHeader != NULL)
-   {
-       if (strcmpi(SectionHeader->Name,".rsrc"))
+    SectionHeader = IMAGE_FIRST_SECTION(NtHeader);
+    NumberOfSections = NtHeader->FileHeader.NumberOfSections;
+
+    for (NumberOfSectionsCount = 0; NumberOfSectionsCount < NumberOfSections; NumberOfSectionsCount++, SectionHeader++)
+    {
+       if (strnicmp(SectionHeader->Name,".rsrc",5)==0)
        {
            /* FIXME add a rc bin to text scanner */
        }
 
-       else if (strcmpi(SectionHeader->Name,".textbss"))
+       else if (strnicmp(SectionHeader->Name,".textbss",8)==0)
        {
           /* FIXME add a bss to text scanner */
        }
 
-       else if (strcmpi(SectionHeader->Name,".text"))
+       
+       else if (strnicmp(SectionHeader->Name,".text",5)==0)
        {
             switch (NtHeader->FileHeader.Machine)
             {
                 case IMAGE_FILE_MACHINE_ALPHA:
                      printf("CPU ALPHA Detected no CPUBrain implement for it\n");
-                     return -1;
+                     return 3;
 
                 case IMAGE_FILE_MACHINE_ALPHA64:
                      printf("CPU ALPHA64/AXP64 Detected no CPUBrain implement for it\n");
-                     return -1;
+                     return 3;
 
                 case IMAGE_FILE_MACHINE_AM33:
                      printf("CPU AM33 Detected no CPUBrain implement for it\n");
-                     return -1;
+                     return 3;
 
                 case IMAGE_FILE_MACHINE_AMD64:
                      printf("CPU AMD64 Detected no CPUBrain implement for it\n");
-                     return -1;
+                     return 3;
 
                 case IMAGE_FILE_MACHINE_ARM:
                      printf("CPU ARM Detected no CPUBrain implement for it\n");
-                     return -1;
+                     return 3;
 
                 case IMAGE_FILE_MACHINE_CEE:
                      printf("CPU CEE Detected no CPUBrain implement for it\n");
-                     return -1;
+                     return 3;
 
                 case IMAGE_FILE_MACHINE_CEF:
                      printf("CPU CEF Detected no CPUBrain implement for it\n");
-                     return -1;
+                     return 3;
 
                 case IMAGE_FILE_MACHINE_EBC:
                      printf("CPU EBC Detected no CPUBrain implement for it\n");
-                     return -1;
+                     return 3;
 
                 case IMAGE_FILE_MACHINE_I386:
                      printf("CPU I386 Detected no CPUBrain implement for it\n");
-                     return -1;
+                     return 3;
 
                 case IMAGE_FILE_MACHINE_IA64:
                      printf("CPU IA64 Detected no CPUBrain implement for it\n");
-                     return -1;
+                     return 3;
 
                 case IMAGE_FILE_MACHINE_M32R:
                      printf("CPU M32R Detected no CPUBrain implement for it\n");
-                     return -1;
+                     return 3;
 
                 case IMAGE_FILE_MACHINE_MIPS16:
                      printf("CPU MIPS16 Detected no CPUBrain implement for it\n");
-                     return -1;
+                     return 3;
 
                 case IMAGE_FILE_MACHINE_MIPSFPU:
                      printf("CPU MIPSFPU Detected no CPUBrain implement for it\n");
-                     return -1;
+                     return 3;
 
                 case IMAGE_FILE_MACHINE_MIPSFPU16:
                      printf("CPU MIPSFPU16 Detected no CPUBrain implement for it\n");
-                     return -1;
+                     return 3;
 
                case IMAGE_FILE_MACHINE_POWERPC:
                     printf("CPU POWERPC Detected no CPUBrain implement for it\n");
-                    return -1;
+                         //PPCBrain(memory, pos, cpu_size, base, 0, outfp);
+                    return PPCBrain(memory+SectionHeader->PointerToRawData,  0, SectionHeader->SizeOfRawData, 0, 0, outfp);
+
+                    return 3;
 
                case IMAGE_FILE_MACHINE_POWERPCFP:
                     printf("CPU POWERPCFP Detected no CPUBrain implement for it\n");
-                    return -1;
+                    return 3;
 
                case IMAGE_FILE_MACHINE_R10000:
                     printf("CPU R10000 Detected no CPUBrain implement for it\n");
-                    return -1;
+                    return 3;
 
                case IMAGE_FILE_MACHINE_R3000:
                     printf("CPU R3000 Detected no CPUBrain implement for it\n");
-                    return -1;
+                    return 3;
 
                case IMAGE_FILE_MACHINE_R4000:
                     printf("CPU R4000 Detected no CPUBrain implement for it\n");
-                    return -1;
+                    return 3;
 
                case IMAGE_FILE_MACHINE_SH3:
                     printf("CPU SH3 Detected no CPUBrain implement for it\n");
-                    return -1;
+                    return 3;
 
                case IMAGE_FILE_MACHINE_SH3DSP:
                     printf("CPU SH3DSP Detected no CPUBrain implement for it\n");
-                    return -1;
+                    return 3;
 
                case IMAGE_FILE_MACHINE_SH3E:
                     printf("CPU SH3E Detected no CPUBrain implement for it\n");
-                    return -1;
+                    return 3;
 
                case IMAGE_FILE_MACHINE_SH4:
                     printf("CPU SH4 Detected no CPUBrain implement for it\n");
-                    return -1;
+                    return 3;
 
                case IMAGE_FILE_MACHINE_SH5:
                     printf("CPU SH5 Detected no CPUBrain implement for it\n");
-                    return -1;
+                    return 3;
 
                case IMAGE_FILE_MACHINE_THUMB:
                     printf("CPU THUMB Detected no CPUBrain implement for it\n");
-                    return -1;
+                    return 3;
 
                case IMAGE_FILE_MACHINE_TRICORE:
                     printf("CPU TRICORE Detected no CPUBrain implement for it\n");
-                    return -1;
+                    return 3;
 
                case IMAGE_FILE_MACHINE_WCEMIPSV2:
                     printf("CPU WCEMIPSV2 Detected no CPUBrain implement for it\n");
-                    return -1;
+                    return 3;
 
                default:
                     printf("Unknown Machine : %d",NtHeader->FileHeader.Machine);
-                    return -1;
+                    return 4;
+            /* End case swich */
             }
+       /* End if .text statment */
       }
-      /* FIXME add couter to next sections */
+    /* End for loop */
    } 
 
    return 0;
diff --git a/rosapps/devutils/cputointel/PPC/PPCBrain.c b/rosapps/devutils/cputointel/PPC/PPCBrain.c
index aa2d32557ed..f5bb0a4c645 100644
--- a/rosapps/devutils/cputointel/PPC/PPCBrain.c
+++ b/rosapps/devutils/cputointel/PPC/PPCBrain.c
@@ -25,6 +25,8 @@
  *         0            : Ok 
  *         1            : unimplemt 
  *         2            : Unkonwn Opcode
+ *         3            : unimplement cpu
+ *         4            : unknown machine
  */
 
 CPU_INT PPCBrain(    CPU_BYTE *cpu_buffer,
diff --git a/rosapps/devutils/cputointel/dummycpu/DummyBrain.c b/rosapps/devutils/cputointel/dummycpu/DummyBrain.c
index 79ceefb069f..5d82da1f769 100644
--- a/rosapps/devutils/cputointel/dummycpu/DummyBrain.c
+++ b/rosapps/devutils/cputointel/dummycpu/DummyBrain.c
@@ -27,6 +27,8 @@
  *         0            : Ok 
  *         1            : unimplemt 
  *         2            : Unkonwn Opcode
+ *         3            : unimplement cpu
+ *         4            : unknown machine
  */
 
 CPU_INT DummyBrain(  CPU_BYTE *cpu_buffer,
diff --git a/rosapps/devutils/cputointel/m68k/M68kBrain.c b/rosapps/devutils/cputointel/m68k/M68kBrain.c
index 088bf02cdc1..99501a98180 100644
--- a/rosapps/devutils/cputointel/m68k/M68kBrain.c
+++ b/rosapps/devutils/cputointel/m68k/M68kBrain.c
@@ -6,16 +6,11 @@
 #include "../misc.h"
 
 /* retun 
- * 0 = Ok 
- * 1 = unimplemt 
- * 2 = Unkonwn Opcode 
- * 3 = can not open read file
- * 4 = can not open write file
- * 5 = can not seek to end of read file
- * 6 = can not get the file size of the read file
- * 7 = read file size is Zero
- * 8 = can not alloc memory
- * 9 = can not read file
+ *         0            : Ok 
+ *         1            : unimplemt 
+ *         2            : Unkonwn Opcode
+ *         3            : unimplement cpu
+ *         4            : unknown machine
  */
 
 CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,

From 40bbafca90dad24487b92f6c3764f68f271ff993 Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Sat, 13 Jan 2007 10:27:17 +0000
Subject: [PATCH 28/36] Create a folder call From and start move in all cpu we
 will in futer translate from

svn path=/trunk/; revision=25435
---
 rosapps/devutils/cputointel/CpuToIntel.c             |  4 ++--
 rosapps/devutils/cputointel/{ => From}/PPC/PPC.h     |  2 +-
 .../devutils/cputointel/{ => From}/PPC/PPCBrain.c    |  2 +-
 .../devutils/cputointel/{ => From}/PPC/PPCBrain.h    |  2 +-
 .../devutils/cputointel/{ => From}/PPC/PPCopcode.c   |  2 +-
 .../devutils/cputointel/{ => From}/dummycpu/Dummy.h  |  2 +-
 .../cputointel/{ => From}/dummycpu/DummyBrain.c      |  2 +-
 .../cputointel/{ => From}/dummycpu/DummyBrain.h      |  2 +-
 .../cputointel/{ => From}/dummycpu/Dummyopcode.c     |  2 +-
 .../devutils/cputointel/{ => From}/m68k/M68kBrain.c  |  2 +-
 .../devutils/cputointel/{ => From}/m68k/M68kBrain.h  |  2 +-
 .../devutils/cputointel/{ => From}/m68k/M68kopcode.c |  0
 rosapps/devutils/cputointel/{ => From}/m68k/m68k.h   |  2 +-
 rosapps/devutils/cputointel/ImageLoader.c            |  4 ++--
 rosapps/devutils/cputointel/cputointel.rbuild        | 12 ++++++------
 rosapps/devutils/cputointel/misc.c                   |  4 ++--
 16 files changed, 23 insertions(+), 23 deletions(-)
 rename rosapps/devutils/cputointel/{ => From}/PPC/PPC.h (96%)
 rename rosapps/devutils/cputointel/{ => From}/PPC/PPCBrain.c (99%)
 rename rosapps/devutils/cputointel/{ => From}/PPC/PPCBrain.h (94%)
 rename rosapps/devutils/cputointel/{ => From}/PPC/PPCopcode.c (98%)
 rename rosapps/devutils/cputointel/{ => From}/dummycpu/Dummy.h (96%)
 rename rosapps/devutils/cputointel/{ => From}/dummycpu/DummyBrain.c (99%)
 rename rosapps/devutils/cputointel/{ => From}/dummycpu/DummyBrain.h (94%)
 rename rosapps/devutils/cputointel/{ => From}/dummycpu/Dummyopcode.c (98%)
 rename rosapps/devutils/cputointel/{ => From}/m68k/M68kBrain.c (99%)
 rename rosapps/devutils/cputointel/{ => From}/m68k/M68kBrain.h (98%)
 rename rosapps/devutils/cputointel/{ => From}/m68k/M68kopcode.c (100%)
 rename rosapps/devutils/cputointel/{ => From}/m68k/m68k.h (99%)

diff --git a/rosapps/devutils/cputointel/CpuToIntel.c b/rosapps/devutils/cputointel/CpuToIntel.c
index 18ff6bda9cd..196350f99f9 100644
--- a/rosapps/devutils/cputointel/CpuToIntel.c
+++ b/rosapps/devutils/cputointel/CpuToIntel.c
@@ -4,8 +4,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "ARM/ARM.h"
-#include "m68k/m68k.h"
-#include "PPC/PPC.h"
+#include "From/m68k/m68k.h"
+#include "From/PPC/PPC.h"
 #include "misc.h"
 
 int main(int argc, char * argv[])
diff --git a/rosapps/devutils/cputointel/PPC/PPC.h b/rosapps/devutils/cputointel/From/PPC/PPC.h
similarity index 96%
rename from rosapps/devutils/cputointel/PPC/PPC.h
rename to rosapps/devutils/cputointel/From/PPC/PPC.h
index 3c5ed389393..4d9a7af4121 100644
--- a/rosapps/devutils/cputointel/PPC/PPC.h
+++ b/rosapps/devutils/cputointel/From/PPC/PPC.h
@@ -1,5 +1,5 @@
 
-#include "../misc.h"
+#include "../../misc.h"
 
 CPU_INT PPCBrain(    CPU_BYTE *cpu_buffer,
                      CPU_UNINT cpu_pos,
diff --git a/rosapps/devutils/cputointel/PPC/PPCBrain.c b/rosapps/devutils/cputointel/From/PPC/PPCBrain.c
similarity index 99%
rename from rosapps/devutils/cputointel/PPC/PPCBrain.c
rename to rosapps/devutils/cputointel/From/PPC/PPCBrain.c
index f5bb0a4c645..1b6314e5fdb 100644
--- a/rosapps/devutils/cputointel/PPC/PPCBrain.c
+++ b/rosapps/devutils/cputointel/From/PPC/PPCBrain.c
@@ -3,7 +3,7 @@
 #include <stdlib.h> 
 #include "PPCBrain.h"
 #include "PPC.h"
-#include "../misc.h"
+#include "../../misc.h"
 
 /* 
  * DummyBrain is example how you create you own cpu brain to translate from 
diff --git a/rosapps/devutils/cputointel/PPC/PPCBrain.h b/rosapps/devutils/cputointel/From/PPC/PPCBrain.h
similarity index 94%
rename from rosapps/devutils/cputointel/PPC/PPCBrain.h
rename to rosapps/devutils/cputointel/From/PPC/PPCBrain.h
index a2547b22f8d..5e33bd8cc50 100644
--- a/rosapps/devutils/cputointel/PPC/PPCBrain.h
+++ b/rosapps/devutils/cputointel/From/PPC/PPCBrain.h
@@ -1,5 +1,5 @@
 
-#include "../misc.h"
+#include "../../misc.h"
 
 
 /* example how setup a opcode, this opcode is 16bit long (taken from M68K) 
diff --git a/rosapps/devutils/cputointel/PPC/PPCopcode.c b/rosapps/devutils/cputointel/From/PPC/PPCopcode.c
similarity index 98%
rename from rosapps/devutils/cputointel/PPC/PPCopcode.c
rename to rosapps/devutils/cputointel/From/PPC/PPCopcode.c
index 30c37854928..2d2bf2845d4 100644
--- a/rosapps/devutils/cputointel/PPC/PPCopcode.c
+++ b/rosapps/devutils/cputointel/From/PPC/PPCopcode.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h> 
 #include "PPC.h"
-#include "misc.h"
+#include "../../misc.h"
 
 
 /* cpuDummyInit_Add
diff --git a/rosapps/devutils/cputointel/dummycpu/Dummy.h b/rosapps/devutils/cputointel/From/dummycpu/Dummy.h
similarity index 96%
rename from rosapps/devutils/cputointel/dummycpu/Dummy.h
rename to rosapps/devutils/cputointel/From/dummycpu/Dummy.h
index fdc7117bf35..fab485df72a 100644
--- a/rosapps/devutils/cputointel/dummycpu/Dummy.h
+++ b/rosapps/devutils/cputointel/From/dummycpu/Dummy.h
@@ -1,5 +1,5 @@
 
-#include "../misc.h"
+#include "../../misc.h"
 
 CPU_INT DummyBrain(  CPU_BYTE *cpu_buffer,
                      CPU_UNINT cpu_pos,
diff --git a/rosapps/devutils/cputointel/dummycpu/DummyBrain.c b/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c
similarity index 99%
rename from rosapps/devutils/cputointel/dummycpu/DummyBrain.c
rename to rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c
index 5d82da1f769..db58c111b03 100644
--- a/rosapps/devutils/cputointel/dummycpu/DummyBrain.c
+++ b/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c
@@ -3,7 +3,7 @@
 #include <stdlib.h> 
 #include "DummyBrain.h"
 #include "Dummy.h"
-#include "../misc.h"
+#include "../../misc.h"
 
 
 
diff --git a/rosapps/devutils/cputointel/dummycpu/DummyBrain.h b/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.h
similarity index 94%
rename from rosapps/devutils/cputointel/dummycpu/DummyBrain.h
rename to rosapps/devutils/cputointel/From/dummycpu/DummyBrain.h
index 3b9c7aaaa48..24248dd6d4c 100644
--- a/rosapps/devutils/cputointel/dummycpu/DummyBrain.h
+++ b/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.h
@@ -1,5 +1,5 @@
 
-#include "../misc.h"
+#include "../../misc.h"
 
 
 /* example how setup a opcode, this opcode is 16bit long (taken from M68K) 
diff --git a/rosapps/devutils/cputointel/dummycpu/Dummyopcode.c b/rosapps/devutils/cputointel/From/dummycpu/Dummyopcode.c
similarity index 98%
rename from rosapps/devutils/cputointel/dummycpu/Dummyopcode.c
rename to rosapps/devutils/cputointel/From/dummycpu/Dummyopcode.c
index 86e7d9355e0..51ae803dcac 100644
--- a/rosapps/devutils/cputointel/dummycpu/Dummyopcode.c
+++ b/rosapps/devutils/cputointel/From/dummycpu/Dummyopcode.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h> 
 #include "Dummy.h"
-#include "misc.h"
+#include "../../misc.h"
 
 
 /* cpuDummyInit_Add
diff --git a/rosapps/devutils/cputointel/m68k/M68kBrain.c b/rosapps/devutils/cputointel/From/m68k/M68kBrain.c
similarity index 99%
rename from rosapps/devutils/cputointel/m68k/M68kBrain.c
rename to rosapps/devutils/cputointel/From/m68k/M68kBrain.c
index 99501a98180..df7417452be 100644
--- a/rosapps/devutils/cputointel/m68k/M68kBrain.c
+++ b/rosapps/devutils/cputointel/From/m68k/M68kBrain.c
@@ -3,7 +3,7 @@
 #include <stdlib.h> 
 #include "M68kBrain.h"
 #include "m68k.h"
-#include "../misc.h"
+#include "../../misc.h"
 
 /* retun 
  *         0            : Ok 
diff --git a/rosapps/devutils/cputointel/m68k/M68kBrain.h b/rosapps/devutils/cputointel/From/m68k/M68kBrain.h
similarity index 98%
rename from rosapps/devutils/cputointel/m68k/M68kBrain.h
rename to rosapps/devutils/cputointel/From/m68k/M68kBrain.h
index dfebd03e2d8..7fb28d14d41 100644
--- a/rosapps/devutils/cputointel/m68k/M68kBrain.h
+++ b/rosapps/devutils/cputointel/From/m68k/M68kBrain.h
@@ -1,5 +1,5 @@
 
-#include "../misc.h"
+#include "../../misc.h"
 
 CPU_BYTE cpuM68kInit_Abcd[16]      = {1,1,1,1,2,2,2,1,0,0,0,0,2,2,2,2}; 
 CPU_BYTE cpuM68kInit_Add[16]       = {1,1,0,1,2,2,2,2,2,2,2,2,2,2,2,2};
diff --git a/rosapps/devutils/cputointel/m68k/M68kopcode.c b/rosapps/devutils/cputointel/From/m68k/M68kopcode.c
similarity index 100%
rename from rosapps/devutils/cputointel/m68k/M68kopcode.c
rename to rosapps/devutils/cputointel/From/m68k/M68kopcode.c
diff --git a/rosapps/devutils/cputointel/m68k/m68k.h b/rosapps/devutils/cputointel/From/m68k/m68k.h
similarity index 99%
rename from rosapps/devutils/cputointel/m68k/m68k.h
rename to rosapps/devutils/cputointel/From/m68k/m68k.h
index 155e38dbee1..124e7a4349e 100644
--- a/rosapps/devutils/cputointel/m68k/m68k.h
+++ b/rosapps/devutils/cputointel/From/m68k/m68k.h
@@ -1,5 +1,5 @@
 
-#include "../misc.h"
+#include "../../misc.h"
 CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
                      CPU_UNINT cpu_pos,
                      CPU_UNINT cpu_size,
diff --git a/rosapps/devutils/cputointel/ImageLoader.c b/rosapps/devutils/cputointel/ImageLoader.c
index 360b08b4bfd..7570745e45c 100644
--- a/rosapps/devutils/cputointel/ImageLoader.c
+++ b/rosapps/devutils/cputointel/ImageLoader.c
@@ -6,8 +6,8 @@
 #include <string.h>
 #include "misc.h"
 #include "ARM/ARM.h"
-#include "m68k/m68k.h"
-#include "PPC/PPC.h"
+#include "From/m68k/m68k.h"
+#include "From/PPC/PPC.h"
 
 /*
  *
diff --git a/rosapps/devutils/cputointel/cputointel.rbuild b/rosapps/devutils/cputointel/cputointel.rbuild
index 23420558721..68288bbf0d1 100644
--- a/rosapps/devutils/cputointel/cputointel.rbuild
+++ b/rosapps/devutils/cputointel/cputointel.rbuild
@@ -13,13 +13,13 @@
 	<file>ARM/ARMBrain.c</file>
 	<file>ARM/ARMopcode.c</file>
 
-	<file>m68k/M68kBrain.c</file>
-	<file>m68k/M68kopcode.c</file>
+	<file>From/m68k/M68kBrain.c</file>
+	<file>From/m68k/M68kopcode.c</file>
 
-	<file>PPC/PPCBrain.c</file>
-	<file>PPC/PPCopcode.c</file>
+	<file>From/PPC/PPCBrain.c</file>
+	<file>From/PPC/PPCopcode.c</file>
 
-	<file>dummycpu/DummyBrain.c</file>
-	<file>dummycpu/Dummyopcode.c</file>
+	<file>From/dummycpu/DummyBrain.c</file>
+	<file>From/dummycpu/Dummyopcode.c</file>
 
 </module>
\ No newline at end of file
diff --git a/rosapps/devutils/cputointel/misc.c b/rosapps/devutils/cputointel/misc.c
index beef898205e..f291b76ad21 100644
--- a/rosapps/devutils/cputointel/misc.c
+++ b/rosapps/devutils/cputointel/misc.c
@@ -8,8 +8,8 @@
 #include <string.h>
 #include "misc.h"
 #include "ARM/ARM.h"
-#include "m68k/m68k.h"
-#include "PPC/PPC.h"
+#include "From/m68k/m68k.h"
+#include "From/PPC/PPC.h"
 
 
 /* retun 

From 4ffa7852606ff38d1fe37f9910413ef004a67dc2 Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Sat, 13 Jan 2007 10:39:12 +0000
Subject: [PATCH 29/36] 1. last move is done arm to  From folder 2. remove some
 include in CpuToIntel.c file they are not longer need it.

svn path=/trunk/; revision=25436
---
 rosapps/devutils/cputointel/CpuToIntel.c      |  3 -
 rosapps/devutils/cputointel/From/ARM/ARM.h    | 17 +++++
 .../devutils/cputointel/From/ARM/ARMBrain.c   | 72 +++++++++++++++++++
 .../devutils/cputointel/From/ARM/ARMBrain.h   | 12 ++++
 .../devutils/cputointel/From/ARM/ARMopcode.c  | 39 ++++++++++
 rosapps/devutils/cputointel/ImageLoader.c     |  2 +-
 rosapps/devutils/cputointel/cputointel.rbuild |  4 +-
 rosapps/devutils/cputointel/misc.c            |  2 +-
 8 files changed, 144 insertions(+), 7 deletions(-)
 create mode 100644 rosapps/devutils/cputointel/From/ARM/ARM.h
 create mode 100644 rosapps/devutils/cputointel/From/ARM/ARMBrain.c
 create mode 100644 rosapps/devutils/cputointel/From/ARM/ARMBrain.h
 create mode 100644 rosapps/devutils/cputointel/From/ARM/ARMopcode.c

diff --git a/rosapps/devutils/cputointel/CpuToIntel.c b/rosapps/devutils/cputointel/CpuToIntel.c
index 196350f99f9..40dfd910533 100644
--- a/rosapps/devutils/cputointel/CpuToIntel.c
+++ b/rosapps/devutils/cputointel/CpuToIntel.c
@@ -3,9 +3,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ARM/ARM.h"
-#include "From/m68k/m68k.h"
-#include "From/PPC/PPC.h"
 #include "misc.h"
 
 int main(int argc, char * argv[])
diff --git a/rosapps/devutils/cputointel/From/ARM/ARM.h b/rosapps/devutils/cputointel/From/ARM/ARM.h
new file mode 100644
index 00000000000..9ed48f207ac
--- /dev/null
+++ b/rosapps/devutils/cputointel/From/ARM/ARM.h
@@ -0,0 +1,17 @@
+
+#include "../../misc.h"
+
+CPU_INT ARMBrain(    CPU_BYTE *cpu_buffer,
+                     CPU_UNINT cpu_pos,
+                     CPU_UNINT cpu_size,
+                     CPU_UNINT BaseAddress,
+                     CPU_UNINT cpuarch,
+                     FILE *outfp);
+
+/* here we put the prototype for the opcode api that brain need we show a example for it */
+CPU_INT ARM_(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
+
+
+/* Export comment thing see m68k for example 
+ * in dummy we do not show it, for it is diffent for each cpu
+ */
diff --git a/rosapps/devutils/cputointel/From/ARM/ARMBrain.c b/rosapps/devutils/cputointel/From/ARM/ARMBrain.c
new file mode 100644
index 00000000000..1a570eaeb79
--- /dev/null
+++ b/rosapps/devutils/cputointel/From/ARM/ARMBrain.c
@@ -0,0 +1,72 @@
+
+#include <stdio.h>
+#include <stdlib.h> 
+#include "ARMBrain.h"
+#include "ARM.h"
+#include "../../misc.h"
+
+/* retun 
+ *         0            : Ok 
+ *         1            : unimplemt 
+ *         2            : Unkonwn Opcode
+ *         3            : unimplement cpu
+ *         4            : unknown machine
+ */
+
+CPU_INT ARMBrain(  CPU_BYTE *cpu_buffer,
+                   CPU_UNINT cpu_pos,
+                   CPU_UNINT cpu_size,
+                   CPU_UNINT BaseAddress,
+                   CPU_UNINT cpuarch,
+                   FILE *outfp)
+{
+    CPU_UNINT cpu_oldpos;
+    CPU_INT cpuint;
+    CPU_INT retcode = 0;
+    CPU_INT retsize;
+
+
+    /* now we start the process */    
+    while (cpu_pos<cpu_size)
+    {
+        cpu_oldpos = cpu_pos;
+
+        cpuint = cpu_buffer[cpu_pos];
+    
+        /* Add */
+        if ((cpuint - (cpuint & GetMaskByte32(cpuARMInit_))) == ConvertBitToByte32(cpuARMInit_))
+        {
+            retsize = ARM_( outfp, cpu_buffer, cpu_pos, cpu_size,
+                                 BaseAddress, cpuarch);
+            if (retsize<0)
+                 retcode = 1;
+            else
+                 cpu_pos += retsize;
+        }
+    
+        /* Found all Opcode and breakout and return no error found */
+        if (cpu_pos >=cpu_size)
+        {
+            break;
+        }
+
+        /* Check if we have found a cpu opcode */
+        if (cpu_oldpos == cpu_pos)
+        {            
+            if (retcode == 0)
+            {              
+                /* no unimplement error where found so we return a msg for unknown opcode */
+                printf("Unkonwn Opcode found at 0x%8x opcode 0x%2x\n",cpu_oldpos+BaseAddress,(unsigned int)cpu_buffer[cpu_oldpos]);                
+                retcode = 2;
+            }
+        }
+
+        /* Erorro Found ? */
+        if (retcode!=0)
+        {
+            /* Erorro Found break and return the error code */
+            break;
+        }
+    }
+    return retcode;    
+}
diff --git a/rosapps/devutils/cputointel/From/ARM/ARMBrain.h b/rosapps/devutils/cputointel/From/ARM/ARMBrain.h
new file mode 100644
index 00000000000..93ef2b8ae32
--- /dev/null
+++ b/rosapps/devutils/cputointel/From/ARM/ARMBrain.h
@@ -0,0 +1,12 @@
+
+#include "../../misc.h"
+
+
+/* example how setup a opcode, this opcode is 16bit long (taken from M68K) 
+ * 0 and 1 mean normal bit, 2 mean mask bit the bit that are determent diffent 
+ * thing in the opcode, example which reg so on, it can be etither 0 or 1 in 
+ * the opcode. but a opcode have also normal bit that is always been set to 
+ * same. thuse bit are always 0 or 1
+ */
+CPU_BYTE cpuARMInit_[32] = {2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2};
+
diff --git a/rosapps/devutils/cputointel/From/ARM/ARMopcode.c b/rosapps/devutils/cputointel/From/ARM/ARMopcode.c
new file mode 100644
index 00000000000..eb6cd6bb339
--- /dev/null
+++ b/rosapps/devutils/cputointel/From/ARM/ARMopcode.c
@@ -0,0 +1,39 @@
+
+#include <stdio.h>
+#include <stdlib.h> 
+#include "../../misc.h"
+
+
+/* cpuDummyInit_Add
+ * Input param : 
+ *               out         : The file pointer that we write to (the output file to intel asm) 
+ *               cpu_buffer  : The memory buffer we have our binary code that we whant convert
+ *               cpu_pos     : Current positions in the cpu_buffer 
+ *               cpu_size    : The memory size of the cpu_buffer
+ *               BaseAddress : The base address you whant the binay file should run from 
+ *               cpuarch     : if it exists diffent cpu from a manufactor like pentium,
+ *                             pentinum-mmx so on, use this flag to specify which type 
+ *                             of cpu you whant or do not use it if it does not exists
+ *                             other or any sub model.
+ *
+ * Return value :
+ *               value -1            : unimplement 
+ *               value  0            : wrong opcode or not vaild opcode
+ *               value +1 and higher : who many byte we should add to cpu_pos
+ */
+ 
+CPU_INT ARM_( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
+                   CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+
+{
+    /* 
+     * ConvertBitToByte() is perfect to use to get the bit being in use from a bit array
+     * GetMaskByte() is perfect if u whant known which bit have been mask out 
+     * see M68kopcode.c and how it use the ConvertBitToByte()
+     */
+
+    fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
+
+    printf(";Add unimplement\n");
+    return -1;
+}
diff --git a/rosapps/devutils/cputointel/ImageLoader.c b/rosapps/devutils/cputointel/ImageLoader.c
index 7570745e45c..03d05f965bd 100644
--- a/rosapps/devutils/cputointel/ImageLoader.c
+++ b/rosapps/devutils/cputointel/ImageLoader.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "misc.h"
-#include "ARM/ARM.h"
+#include "From/ARM/ARM.h"
 #include "From/m68k/m68k.h"
 #include "From/PPC/PPC.h"
 
diff --git a/rosapps/devutils/cputointel/cputointel.rbuild b/rosapps/devutils/cputointel/cputointel.rbuild
index 68288bbf0d1..ad6b6d0853f 100644
--- a/rosapps/devutils/cputointel/cputointel.rbuild
+++ b/rosapps/devutils/cputointel/cputointel.rbuild
@@ -10,8 +10,8 @@
 	<file>ImageLoader.c</file>
 	<file>misc.c</file>
 
-	<file>ARM/ARMBrain.c</file>
-	<file>ARM/ARMopcode.c</file>
+	<file>From/ARM/ARMBrain.c</file>
+	<file>From/ARM/ARMopcode.c</file>
 
 	<file>From/m68k/M68kBrain.c</file>
 	<file>From/m68k/M68kopcode.c</file>
diff --git a/rosapps/devutils/cputointel/misc.c b/rosapps/devutils/cputointel/misc.c
index f291b76ad21..c93dca9b06f 100644
--- a/rosapps/devutils/cputointel/misc.c
+++ b/rosapps/devutils/cputointel/misc.c
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "misc.h"
-#include "ARM/ARM.h"
+#include "From/ARM/ARM.h"
 #include "From/m68k/m68k.h"
 #include "From/PPC/PPC.h"
 

From b339ec7ea9711e539fac7237611b1487a8e6ea09 Mon Sep 17 00:00:00 2001
From: Johannes Anderwald <johannes.anderwald@reactos.org>
Date: Sat, 13 Jan 2007 12:19:56 +0000
Subject: [PATCH 30/36] - make sysreg compilable under Linux - sysreg is now
 able to start the emulator but it cannot get any debug data yet. But this
 might be due that i tested sysreg in linux under vmware which then ran
 qemu....

svn path=/trunk/; revision=25437
---
 reactos/tools/sysreg/os_support.cpp   | 19 +++++++++++++++---
 reactos/tools/sysreg/os_support.h     | 14 ++++++--------
 reactos/tools/sysreg/pipe_reader.cpp  |  4 ++--
 reactos/tools/sysreg/rosboot_test.cpp | 28 +++++++++++++++------------
 reactos/tools/sysreg/sysreg.cpp       |  6 ++++--
 reactos/tools/sysreg/sysreg.mak       |  2 --
 reactos/tools/sysreg/txtmode.cfg      | 20 ++++++++++---------
 7 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/reactos/tools/sysreg/os_support.cpp b/reactos/tools/sysreg/os_support.cpp
index 13828e866b6..15fa570995d 100644
--- a/reactos/tools/sysreg/os_support.cpp
+++ b/reactos/tools/sysreg/os_support.cpp
@@ -57,7 +57,7 @@ namespace System_
 		free(command);
 		return pid;
 	}
-#elif defined (__LINUX__)
+#else
 /********************************************************************************************************************/
 	OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs)
 	{
@@ -66,11 +66,24 @@ namespace System_
 		if ((pid = fork()) < 0)
 		{
 			cerr << "OsSupport::createProcess> fork failed" << endl;
-			return pid;
+			return 0;
 		}
-
+		if (pid == 0)
+		{
+			execv(procname, procargs);
+			return 0;
+		}
+		
+		return pid;
 	}
 
+	bool OsSupport::terminateProcess(OsSupport::ProcessID pid)
+	{
+		kill(pid, SIGKILL);
+		return true;
+	}
+
+
 #endif
 
 } // end of namespace System_
diff --git a/reactos/tools/sysreg/os_support.h b/reactos/tools/sysreg/os_support.h
index 3f63ae47b9a..af046f6756f 100644
--- a/reactos/tools/sysreg/os_support.h
+++ b/reactos/tools/sysreg/os_support.h
@@ -10,10 +10,12 @@
  * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at)
  */
 
-#ifdef WIN32
+#if 0
 #include <windows.h>
-#elif defined(__LINUX__)
+#else
 #include <unistd.h>
+#include <sys/types.h>
+#include <signal.h>
 #endif
 
 #include "user_types.h"
@@ -34,14 +36,10 @@ namespace System_
 #ifdef WIN32
 
 		typedef DWORD ProcessID;
-
-#elif defined(__LINUX__)
+#else
 
 		typedef pid_t ProcessID;
-
-#else
-#error you need to define pid handle type for your platform
-#endif
+		#endif
 
 //---------------------------------------------------------------------------------------
 ///
diff --git a/reactos/tools/sysreg/pipe_reader.cpp b/reactos/tools/sysreg/pipe_reader.cpp
index 8e7d5883aec..88de72e3a34 100644
--- a/reactos/tools/sysreg/pipe_reader.cpp
+++ b/reactos/tools/sysreg/pipe_reader.cpp
@@ -36,7 +36,7 @@ namespace System_
 			return false;
 		}
 		// 
-		m_File = _tpopen(PipeCmd.c_str(), AccessMode.c_str());
+		m_File = popen(PipeCmd.c_str(), "r"); //AccessMode.c_str());
 		if (m_File)
 		{
 			cerr << "PipeReader::openPipe> successfully opened pipe" << endl;
@@ -57,7 +57,7 @@ namespace System_
 			return false;
 		}
 
-		int res = _pclose(m_File);
+		int res = pclose(m_File);
 		
 		if (res == INT_MAX)
 		{
diff --git a/reactos/tools/sysreg/rosboot_test.cpp b/reactos/tools/sysreg/rosboot_test.cpp
index c6dd8aa562b..19f0326f342 100644
--- a/reactos/tools/sysreg/rosboot_test.cpp
+++ b/reactos/tools/sysreg/rosboot_test.cpp
@@ -11,8 +11,8 @@
 
 #include "rosboot_test.h"
 #include "pipe_reader.h"
-#include "namedpipe_reader.h"
-#include "sym_file.h"
+//#include "namedpipe_reader.h"
+//#include "sym_file.h"
 #include "file_reader.h"
 #include "os_support.h"
 
@@ -24,14 +24,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
+#include <math.h>
  
-
+			
 namespace Sysreg_
 {
 	using std::vector;
 	using System_::PipeReader;
+#if 0
 	using System_::NamedPipeReader;
 	using System_::SymbolFile;
+#endif
 	using System_::FileReader;
 	using System_::OsSupport;
 
@@ -93,7 +96,8 @@ namespace Sysreg_
 		{
 			TCHAR * stop;
 			m_Timeout = _tcstod(timeout.c_str (), &stop);
-			if (_isnan(m_Timeout) || m_Timeout == 0.0)
+
+			if (isnan(m_Timeout) || m_Timeout == 0.0)
 			{
 				cerr << "Warning: overriding timeout with default of 60 sec" << endl;
 				m_Timeout = 60.0;
@@ -289,10 +293,10 @@ namespace Sysreg_
 				///
 				string result;
 				result.reserve (200);
-
+#if 0
 				SymbolFile::resolveAddress (modulename, address, result);
 				cerr << result << endl;
-				
+#endif				
 				///
 				/// TODO
 				///
@@ -338,17 +342,18 @@ namespace Sysreg_
 //---------------------------------------------------------------------------------------
 	bool RosBootTest::fetchDebugByPipe(string boot_cmd)
 	{
-		NamedPipeReader namedpipe_reader;
 		string pipecmd = _T("");
+		bool ret = true;
 		
 		///
 		/// FIXME
 		/// split up arguments
 
 		OsSupport::ProcessID pid = OsSupport::createProcess ((TCHAR*)boot_cmd.c_str (), 0, NULL); 
-
+#if 0		
 		string::size_type pipe_pos = boot_cmd.find (_T("serial pipe:"));
 
+		NamedPipeReader namedpipe_reader;
 		if (pipe_pos != string::npos)
 		{
 			pipe_pos += 12;
@@ -371,7 +376,7 @@ namespace Sysreg_
 			/// delay reading until emulator is ready
 			///
 
-			_sleep( (clock_t)m_Delayread * CLOCKS_PER_SEC );
+			sleep( (clock_t)m_Delayread * CLOCKS_PER_SEC );
 		}
 
 		if (!namedpipe_reader.openPipe(pipecmd))
@@ -382,7 +387,6 @@ namespace Sysreg_
 		string Buffer;
 		Buffer.reserve (500);
 
-		bool ret = true;
 		vector<string> vect;
 		size_t lines = 0;
 		bool write_log;
@@ -436,7 +440,7 @@ namespace Sysreg_
 		}
 		_sleep(3* CLOCKS_PER_SEC);
 		OsSupport::terminateProcess (pid);
-
+#endif
 		return ret;
 	}
 //---------------------------------------------------------------------------------------
@@ -457,7 +461,7 @@ namespace Sysreg_
 			/// delay reading until emulator is ready
 			///
 
-			_sleep( (clock_t)m_Delayread * CLOCKS_PER_SEC );
+			sleep( (clock_t)m_Delayread * CLOCKS_PER_SEC );
 		}
 
 		OsSupport::ProcessID pid = 0;
diff --git a/reactos/tools/sysreg/sysreg.cpp b/reactos/tools/sysreg/sysreg.cpp
index e36c2e4ef2c..0d4fde4ed9e 100644
--- a/reactos/tools/sysreg/sysreg.cpp
+++ b/reactos/tools/sysreg/sysreg.cpp
@@ -20,7 +20,9 @@ using Sysreg_::ConfigParser;
 using Sysreg_::RegressionTest;
 using Sysreg_::RosBootTest;
 
+#if 0
 using System_::SymbolFile;
+#endif
 
 typedef ComponentFactoryTemplate<RegressionTest, string> ComponentFactory;
 
@@ -87,9 +89,9 @@ int _tmain(int argc, TCHAR * argv[])
 	string envvar;
 	string ros = _T("ROS_OUTPUT");
 	config.getStringValue (ros, envvar);
-
+#if 0
 	SymbolFile::initialize (config, envvar);
-	
+#endif	
 	if (regtest->execute (config))
 	{
 		cout << "The regression test " << regtest->getName () << " completed successfully" << endl;
diff --git a/reactos/tools/sysreg/sysreg.mak b/reactos/tools/sysreg/sysreg.mak
index 3fcc89ab7cd..ee36f7f1dcc 100644
--- a/reactos/tools/sysreg/sysreg.mak
+++ b/reactos/tools/sysreg/sysreg.mak
@@ -22,9 +22,7 @@ SYSREGBUILD_SOURCES = $(addprefix $(SYSREGBUILD_BASE_),\
 	conf_parser.cpp \
 	env_var.cpp \
 	pipe_reader.cpp \
-	namedpipe_reader.cpp \
 	rosboot_test.cpp \
-	sym_file.cpp \
 	sysreg.cpp \
 	file_reader.cpp \
 	os_support.cpp \
diff --git a/reactos/tools/sysreg/txtmode.cfg b/reactos/tools/sysreg/txtmode.cfg
index b13639118e3..672ff7da0f7 100644
--- a/reactos/tools/sysreg/txtmode.cfg
+++ b/reactos/tools/sysreg/txtmode.cfg
@@ -27,7 +27,9 @@ ROS_ADDR2LINE=addr2line.exe --exe=
 ; This value is the command which is executed to gain debugging data
 ; this value is mandatory
 
-ROSBOOT_CMD=D:\reactos\qemu\qemu.exe -serial pipe:qemu -boot d -m 128 -L D:\reactos\qemu\ D:\reactos\RosVM.vmdk -cdrom D:\Reactos\ReactOS-RegTest.iso -pidfile pid.txt
+;ROSBOOT_CMD=D:\reactos\qemu\qemu.exe -serial pipe:qemu -boot d -m 128 -L D:\reactos\qemu\ D:\reactos\RosVM.vmdk -cdrom ; D:\Reactos\ReactOS-RegTest.iso -pidfile pid.txt
+
+ROSBOOT_CMD=/usr/bin/qemu -serial file:/home/freenet/reactos/tools/sysreg/txtmode.log -boot d -m 64 -L /home/freenet/reactos/qemu /home/freenet/reactos/qemu/c.img -cdrom /home/freenet/reactos/ReactOS.iso
 
 ;
 ; ROSBOOT_PIDFILE
@@ -47,8 +49,8 @@ ROSBOOT_PID_FILE=pid.txt
 ; If the value is set to pipe, then sysreg will read from pipe created by the
 ; ROSBOOT_CMD
 ;
-;ROSBOOT_DEBUG_PORT=file
-ROSBOOT_DEBUG_PORT=pipe
+ROSBOOT_DEBUG_PORT=file
+;ROSBOOT_DEBUG_PORT=pipe
 
 ;
 ; ROSBOOT_DEBUG_FILE
@@ -60,7 +62,8 @@ ROSBOOT_DEBUG_PORT=pipe
 ; debug data to the specified debug file
 ;
 
-ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\txtmode.log
+;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\txtmode.log
+ROSBOOT_DEBUG_FILE=/home/freenet/reactos/tools/sysreg/txtmode.log
 
 ; ROSBOOT_DELAY_READ;
 ;
@@ -94,9 +97,9 @@ ROSBOOT_TIME_OUT=180.0
 ;
 ; CP_NAME is the value of the ROSBOOT_CHECK_POINT variable
 
-ROSBOOT_CHECK_POINT=USETUP_COMPLETE
-;ROSBOOT_CHECK_POINT=SYSSETUP_COMPLETE
-;ROSBOOT_CHECK_POINT=THIRDBOOT_COMPLETE
+;ROSBOOT_CHECK_POINT=USETUP_COMPLETE
+ROSBOOT_CHECK_POINT=SYSSETUP_COMPLETE
+ROSBOOT_CHECK_POINT=THIRDBOOT_COMPLETE
 
 ; ROSBOOT_CRITICAL_APP
 ;
@@ -114,5 +117,4 @@ ROSBOOT_CHECK_POINT=USETUP_COMPLETE
 
 
 ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe
-;ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe lsass.exe
-
+;ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe lsass.exe
\ No newline at end of file

From 9b4a7b1fc57eb03bc4aaf4b9e247d484ccf5fac5 Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Sat, 13 Jan 2007 12:23:25 +0000
Subject: [PATCH 31/36] adding option for disambler mode, disambler mode does
 not translate a binary file. it doing a disambler of the file

svn path=/trunk/; revision=25438
---
 rosapps/devutils/cputointel/CpuToIntel.c      | 18 ++++-
 rosapps/devutils/cputointel/From/ARM/ARM.h    |  5 +-
 .../devutils/cputointel/From/ARM/ARMBrain.c   | 33 +++++++-
 .../devutils/cputointel/From/ARM/ARMopcode.c  | 14 +++-
 rosapps/devutils/cputointel/From/PPC/PPC.h    |  5 +-
 .../devutils/cputointel/From/PPC/PPCBrain.c   | 15 +++-
 .../devutils/cputointel/From/PPC/PPCopcode.c  |  3 +-
 .../devutils/cputointel/From/dummycpu/Dummy.h |  5 +-
 .../cputointel/From/dummycpu/DummyBrain.c     | 15 +++-
 .../cputointel/From/dummycpu/Dummyopcode.c    | 13 +++-
 .../devutils/cputointel/From/m68k/M68kBrain.c | 75 +++++++++++++------
 .../cputointel/From/m68k/M68kopcode.c         | 72 ++++++++++++------
 rosapps/devutils/cputointel/From/m68k/m68k.h  | 51 ++++++-------
 rosapps/devutils/cputointel/ImageLoader.c     | 33 ++++----
 rosapps/devutils/cputointel/misc.h            |  4 +-
 15 files changed, 253 insertions(+), 108 deletions(-)

diff --git a/rosapps/devutils/cputointel/CpuToIntel.c b/rosapps/devutils/cputointel/CpuToIntel.c
index 40dfd910533..579c6c9394f 100644
--- a/rosapps/devutils/cputointel/CpuToIntel.c
+++ b/rosapps/devutils/cputointel/CpuToIntel.c
@@ -13,6 +13,7 @@ int main(int argc, char * argv[])
     char *outfile=NULL;
     char *cpuid=NULL;
     CPU_INT type=0;
+    CPU_INT mode = 1;
 
 
     printf("Usage :\n");
@@ -35,6 +36,7 @@ int main(int argc, char * argv[])
     printf("       -inBin filename  : the bin file you whant convert\n");
     printf("       -inExe filename  : the PE file you whant convert\n");
     printf("       -OutAsm filename : the Asm file you whant create\n");
+    printf("       -OutDis filename : Do disambler of the source file\n");
     printf("------------------------------------------------------------------\n");
     printf("More cpu will be added with the time or options, this is      \n");
     printf("version 0.0.1 of the cpu to intel converter writen by         \n");
@@ -42,10 +44,12 @@ int main(int argc, char * argv[])
     printf("yet, more that basic desgin how it should be writen.          \n");
     printf("Copyright 2006 by Magnus Olsen, licen under GPL 2.0 for now.  \n");
 
-    if (argc < 7)
-        return .110;
 
-    for (t=1; t<7;t+=2)
+    if (argc <4)
+        return 110;
+
+    /* fixme better error checking for the input param */
+    for (t=1; t<argc;t+=2)
     {
         if (stricmp(argv[t],"-in"))
         {
@@ -69,6 +73,11 @@ int main(int argc, char * argv[])
         {
             outfile = argv[t+1];
         }
+        if (stricmp(argv[t],"-OutDis"))
+        {
+            outfile = argv[t+1];
+            mode = 0;
+        }
         if (stricmp(argv[t],"-BaseAddress"))
         {
             BaseAddress = atol(argv[t+1]);
@@ -80,7 +89,8 @@ int main(int argc, char * argv[])
 
     }
 
-    return LoadPFileImage(infile,outfile,BaseAddress,cpuid,type);
+
+    return LoadPFileImage(infile,outfile,BaseAddress,cpuid,type, mode);
     //return LoadPFileImage("e:\\cputointel.exe","e:\\cputointel.asm",0,0,0);
 
 }
diff --git a/rosapps/devutils/cputointel/From/ARM/ARM.h b/rosapps/devutils/cputointel/From/ARM/ARM.h
index 9ed48f207ac..1a69ff1dc54 100644
--- a/rosapps/devutils/cputointel/From/ARM/ARM.h
+++ b/rosapps/devutils/cputointel/From/ARM/ARM.h
@@ -6,10 +6,11 @@ CPU_INT ARMBrain(    CPU_BYTE *cpu_buffer,
                      CPU_UNINT cpu_size,
                      CPU_UNINT BaseAddress,
                      CPU_UNINT cpuarch,
-                     FILE *outfp);
+                     FILE *outfp,
+                     CPU_INT mode);
 
 /* here we put the prototype for the opcode api that brain need we show a example for it */
-CPU_INT ARM_(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
+CPU_INT ARM_(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
 
 
 /* Export comment thing see m68k for example 
diff --git a/rosapps/devutils/cputointel/From/ARM/ARMBrain.c b/rosapps/devutils/cputointel/From/ARM/ARMBrain.c
index 1a570eaeb79..4a4bcd50f59 100644
--- a/rosapps/devutils/cputointel/From/ARM/ARMBrain.c
+++ b/rosapps/devutils/cputointel/From/ARM/ARMBrain.c
@@ -5,7 +5,33 @@
 #include "ARM.h"
 #include "../../misc.h"
 
-/* retun 
+/* 
+ * DummyBrain is example how you create you own cpu brain to translate from 
+ * cpu to intel assembler, I have not add DummyBrain to the loader it is not
+ * need it in our example. When you write you own brain, it must be setup in
+ * misc.c function LoadPFileImage and PEFileStart, PEFileStart maybe does not
+ * need the brain you have writen so you do not need setup it there then.
+ *
+ * input param: 
+ *         cpu_buffer   : the memory buffer with loaded program we whant translate
+ *         cpu_pos      : the positions in the cpu_buffer 
+ *         cpu_size     : the alloced memory size of the cpu_buffer
+ *         BaseAddress  : the virtual memory address we setup to use.
+ *         cpuarch      : the sub arch for the brain, example if it exists more one
+ *                        cpu with same desgin but few other opcode or extend opcode
+ *         outfp        : the output file pointer
+ *
+ *           mode       : if we should run disambler of this binary or
+ *                        translate it, Disambler will not calc the
+ *                        the row name right so we simple give each
+                          row a name. In translations mode we run a 
+ *                        analys so we getting better optimzing and 
+ *                        only row name there we need.
+ *                        value for mode are :
+ *                                             0 = disambler mode
+ *                                             1 = translate mode intel
+ *
+ * return value
  *         0            : Ok 
  *         1            : unimplemt 
  *         2            : Unkonwn Opcode
@@ -18,7 +44,8 @@ CPU_INT ARMBrain(  CPU_BYTE *cpu_buffer,
                    CPU_UNINT cpu_size,
                    CPU_UNINT BaseAddress,
                    CPU_UNINT cpuarch,
-                   FILE *outfp)
+                   FILE *outfp,
+                   CPU_INT mode)
 {
     CPU_UNINT cpu_oldpos;
     CPU_INT cpuint;
@@ -37,7 +64,7 @@ CPU_INT ARMBrain(  CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte32(cpuARMInit_))) == ConvertBitToByte32(cpuARMInit_))
         {
             retsize = ARM_( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                 BaseAddress, cpuarch);
+                                 BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
diff --git a/rosapps/devutils/cputointel/From/ARM/ARMopcode.c b/rosapps/devutils/cputointel/From/ARM/ARMopcode.c
index eb6cd6bb339..f3aa86f17f3 100644
--- a/rosapps/devutils/cputointel/From/ARM/ARMopcode.c
+++ b/rosapps/devutils/cputointel/From/ARM/ARMopcode.c
@@ -15,6 +15,17 @@
  *                             pentinum-mmx so on, use this flag to specify which type 
  *                             of cpu you whant or do not use it if it does not exists
  *                             other or any sub model.
+ *
+ *                mode       : if we should run disambler of this binary or
+ *                             translate it, Disambler will not calc the
+ *                             the row name right so we simple give each
+                               row a name. In translations mode we run a 
+ *                             analys so we getting better optimzing and 
+ *                             only row name there we need.
+ *                             value for mode are :
+ *                                                  0 = disambler mode
+ *                                                  1 = translate mode intel
+ 
  *
  * Return value :
  *               value -1            : unimplement 
@@ -23,7 +34,8 @@
  */
  
 CPU_INT ARM_( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                   CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                   CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                   CPU_INT mode)
 
 {
     /* 
diff --git a/rosapps/devutils/cputointel/From/PPC/PPC.h b/rosapps/devutils/cputointel/From/PPC/PPC.h
index 4d9a7af4121..4b7969c20e4 100644
--- a/rosapps/devutils/cputointel/From/PPC/PPC.h
+++ b/rosapps/devutils/cputointel/From/PPC/PPC.h
@@ -6,11 +6,12 @@ CPU_INT PPCBrain(    CPU_BYTE *cpu_buffer,
                      CPU_UNINT cpu_size,
                      CPU_UNINT BaseAddress,
                      CPU_UNINT cpuarch,
-                     FILE *outfp);
+                     FILE *outfp,
+                     CPU_INT mode);
 
 
 /* here we put the prototype for the opcode api that brain need we show a example for it */
-CPU_INT PPC_Addx(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
+CPU_INT PPC_Addx(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
 
 
 /* Export comment thing see m68k for example 
diff --git a/rosapps/devutils/cputointel/From/PPC/PPCBrain.c b/rosapps/devutils/cputointel/From/PPC/PPCBrain.c
index 1b6314e5fdb..010bf96b803 100644
--- a/rosapps/devutils/cputointel/From/PPC/PPCBrain.c
+++ b/rosapps/devutils/cputointel/From/PPC/PPCBrain.c
@@ -21,6 +21,16 @@
  *                        cpu with same desgin but few other opcode or extend opcode
  *         outfp        : the output file pointer
  *
+ *           mode       : if we should run disambler of this binary or
+ *                        translate it, Disambler will not calc the
+ *                        the row name right so we simple give each
+                          row a name. In translations mode we run a 
+ *                        analys so we getting better optimzing and 
+ *                        only row name there we need.
+ *                        value for mode are :
+ *                                             0 = disambler mode
+ *                                             1 = translate mode intel
+ *
  * return value
  *         0            : Ok 
  *         1            : unimplemt 
@@ -34,7 +44,8 @@ CPU_INT PPCBrain(    CPU_BYTE *cpu_buffer,
                      CPU_UNINT cpu_size,
                      CPU_UNINT BaseAddress,
                      CPU_UNINT cpuarch,
-                     FILE *outfp)
+                     FILE *outfp,
+                     CPU_INT mode)
 {
     CPU_UNINT cpu_oldpos;
     CPU_INT cpuint;
@@ -53,7 +64,7 @@ CPU_INT PPCBrain(    CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte32(cpuPPCInit_Addx))) == ConvertBitToByte32(cpuPPCInit_Addx))
         {
             retsize = PPC_Addx( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                 BaseAddress, cpuarch);
+                                 BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
diff --git a/rosapps/devutils/cputointel/From/PPC/PPCopcode.c b/rosapps/devutils/cputointel/From/PPC/PPCopcode.c
index 2d2bf2845d4..9f7e86417b8 100644
--- a/rosapps/devutils/cputointel/From/PPC/PPCopcode.c
+++ b/rosapps/devutils/cputointel/From/PPC/PPCopcode.c
@@ -24,7 +24,8 @@
  */
  
 CPU_INT PPC_Addx( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                   CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                   CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                   CPU_INT mode)
 
 {
     /* 
diff --git a/rosapps/devutils/cputointel/From/dummycpu/Dummy.h b/rosapps/devutils/cputointel/From/dummycpu/Dummy.h
index fab485df72a..d5b17b11081 100644
--- a/rosapps/devutils/cputointel/From/dummycpu/Dummy.h
+++ b/rosapps/devutils/cputointel/From/dummycpu/Dummy.h
@@ -6,10 +6,11 @@ CPU_INT DummyBrain(  CPU_BYTE *cpu_buffer,
                      CPU_UNINT cpu_size,
                      CPU_UNINT BaseAddress,
                      CPU_UNINT cpuarch,
-                     FILE *outfp);
+                     FILE *outfp,
+                     CPU_INT mode);
 
 /* here we put the prototype for the opcode api that brain need we show a example for it */
-CPU_INT DUMMY_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
+CPU_INT DUMMY_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
 
 
 /* Export comment thing see m68k for example 
diff --git a/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c b/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c
index db58c111b03..2d4d33cf453 100644
--- a/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c
+++ b/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c
@@ -23,6 +23,16 @@
  *                        cpu with same desgin but few other opcode or extend opcode
  *         outfp        : the output file pointer
  *
+ *           mode       : if we should run disambler of this binary or
+ *                        translate it, Disambler will not calc the
+ *                        the row name right so we simple give each
+                          row a name. In translations mode we run a 
+ *                        analys so we getting better optimzing and 
+ *                        only row name there we need.
+ *                        value for mode are :
+ *                                             0 = disambler mode
+ *                                             1 = translate mode intel
+ *
  * return value
  *         0            : Ok 
  *         1            : unimplemt 
@@ -36,7 +46,8 @@ CPU_INT DummyBrain(  CPU_BYTE *cpu_buffer,
                      CPU_UNINT cpu_size,
                      CPU_UNINT BaseAddress,
                      CPU_UNINT cpuarch,
-                     FILE *outfp)
+                     FILE *outfp,
+                     CPU_INT mode)
 {
     CPU_UNINT cpu_oldpos;
     CPU_INT cpuint;
@@ -54,7 +65,7 @@ CPU_INT DummyBrain(  CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuDummyInit_Add))) == ConvertBitToByte(cpuDummyInit_Add))
         {
             retsize = DUMMY_Add( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                 BaseAddress, cpuarch);
+                                 BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
diff --git a/rosapps/devutils/cputointel/From/dummycpu/Dummyopcode.c b/rosapps/devutils/cputointel/From/dummycpu/Dummyopcode.c
index 51ae803dcac..9630d6270d3 100644
--- a/rosapps/devutils/cputointel/From/dummycpu/Dummyopcode.c
+++ b/rosapps/devutils/cputointel/From/dummycpu/Dummyopcode.c
@@ -17,6 +17,16 @@
  *                             of cpu you whant or do not use it if it does not exists
  *                             other or any sub model.
  *
+ *                mode       : if we should run disambler of this binary or
+ *                             translate it, Disambler will not calc the
+ *                             the row name right so we simple give each
+                               row a name. In translations mode we run a 
+ *                             analys so we getting better optimzing and 
+ *                             only row name there we need.
+ *                             value for mode are :
+ *                                                  0 = disambler mode
+ *                                                  1 = translate mode intel
+ *
  * Return value :
  *               value -1            : unimplement 
  *               value  0            : wrong opcode or not vaild opcode
@@ -24,7 +34,8 @@
  */
  
 CPU_INT DUMMY_Add( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                   CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                   CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                   CPU_INT mode)
 
 {
     /* 
diff --git a/rosapps/devutils/cputointel/From/m68k/M68kBrain.c b/rosapps/devutils/cputointel/From/m68k/M68kBrain.c
index df7417452be..b7222ae5708 100644
--- a/rosapps/devutils/cputointel/From/m68k/M68kBrain.c
+++ b/rosapps/devutils/cputointel/From/m68k/M68kBrain.c
@@ -5,7 +5,33 @@
 #include "m68k.h"
 #include "../../misc.h"
 
-/* retun 
+/* 
+ * DummyBrain is example how you create you own cpu brain to translate from 
+ * cpu to intel assembler, I have not add DummyBrain to the loader it is not
+ * need it in our example. When you write you own brain, it must be setup in
+ * misc.c function LoadPFileImage and PEFileStart, PEFileStart maybe does not
+ * need the brain you have writen so you do not need setup it there then.
+ *
+ * input param: 
+ *         cpu_buffer   : the memory buffer with loaded program we whant translate
+ *         cpu_pos      : the positions in the cpu_buffer 
+ *         cpu_size     : the alloced memory size of the cpu_buffer
+ *         BaseAddress  : the virtual memory address we setup to use.
+ *         cpuarch      : the sub arch for the brain, example if it exists more one
+ *                        cpu with same desgin but few other opcode or extend opcode
+ *         outfp        : the output file pointer
+ *
+ *           mode       : if we should run disambler of this binary or
+ *                        translate it, Disambler will not calc the
+ *                        the row name right so we simple give each
+                          row a name. In translations mode we run a 
+ *                        analys so we getting better optimzing and 
+ *                        only row name there we need.
+ *                        value for mode are :
+ *                                             0 = disambler mode
+ *                                             1 = translate mode intel
+ *
+ * return value
  *         0            : Ok 
  *         1            : unimplemt 
  *         2            : Unkonwn Opcode
@@ -18,7 +44,8 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
                      CPU_UNINT cpu_size,
                      CPU_UNINT BaseAddress,
                      CPU_UNINT cpuarch,
-                     FILE *outfp)
+                     FILE *outfp,
+                     CPU_INT mode)
 {
     CPU_UNINT cpu_oldpos;
     CPU_INT cpuint;
@@ -36,7 +63,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Abcd))) == ConvertBitToByte(cpuM68kInit_Abcd))
         {
             retsize = M68k_Abcd( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                 BaseAddress, cpuarch);
+                                 BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -46,7 +73,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Add))) == ConvertBitToByte(cpuM68kInit_Add))
         {
             retsize = M68k_Add( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                BaseAddress, cpuarch);
+                                BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -56,7 +83,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Addi))) == ConvertBitToByte(cpuM68kInit_Addi))
         {
             retsize = M68k_Addi( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                 BaseAddress, cpuarch);
+                                 BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -66,7 +93,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Addq))) == ConvertBitToByte(cpuM68kInit_Addq))
         {
             retsize = M68k_Addq( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                 BaseAddress, cpuarch);
+                                 BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -76,7 +103,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Addx))) == ConvertBitToByte(cpuM68kInit_Addx))
         {
             retsize = M68k_Addx( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                 BaseAddress, cpuarch);
+                                 BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -86,7 +113,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_And))) == ConvertBitToByte(cpuM68kInit_And))
         {
             retsize = M68k_Add( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                BaseAddress, cpuarch);
+                                BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -96,7 +123,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Andi))) == ConvertBitToByte(cpuM68kInit_Andi))
         {
             retsize = M68k_Andi( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                 BaseAddress, cpuarch);
+                                 BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -110,7 +137,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
             {
                 cpu_pos++;
                 retsize = M68k_AndToCCR( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                         BaseAddress, cpuarch);
+                                         BaseAddress, cpuarch, mode);
                 if (retsize<0)
                     retcode = 1;
                 else
@@ -126,7 +153,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bhi))) == ConvertBitToByte(cpuM68kInit_Bhi))
         {
             retsize = M68k_Bhi( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                BaseAddress, cpuarch);
+                                BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -137,7 +164,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bls))) == ConvertBitToByte(cpuM68kInit_Bls))
         {
             retsize = M68k_Bls( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                BaseAddress, cpuarch);
+                                BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -148,7 +175,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bcc))) == ConvertBitToByte(cpuM68kInit_Bcc))
         {
             retsize = M68k_Bcc( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                BaseAddress, cpuarch);
+                                BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -159,7 +186,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bcs))) == ConvertBitToByte(cpuM68kInit_Bcs))
         {
             retsize = M68k_Bcs( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                BaseAddress, cpuarch);
+                                BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -170,7 +197,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bne))) == ConvertBitToByte(cpuM68kInit_Bne))
         {
             retsize = M68k_Bne( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                BaseAddress, cpuarch);
+                                BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -181,7 +208,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Beq))) == ConvertBitToByte(cpuM68kInit_Beq))
         {
             retsize = M68k_Beq( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                BaseAddress, cpuarch);
+                                BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -192,7 +219,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bvc))) == ConvertBitToByte(cpuM68kInit_Bvc))
         {
             retsize = M68k_Bvc( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                BaseAddress, cpuarch);
+                                BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -203,7 +230,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bvs))) == ConvertBitToByte(cpuM68kInit_Bvs))
         {
             retsize = M68k_Bvs( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                BaseAddress, cpuarch);
+                                BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -214,7 +241,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bpl))) == ConvertBitToByte(cpuM68kInit_Bpl))
         {
             retsize = M68k_Bpl( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                BaseAddress, cpuarch);
+                                BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -225,7 +252,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bmi))) == ConvertBitToByte(cpuM68kInit_Bmi))
         {
             retsize = M68k_Bmi( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                BaseAddress, cpuarch);
+                                BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -236,7 +263,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bge))) == ConvertBitToByte(cpuM68kInit_Bge))
         {
             retsize = M68k_Bge( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                BaseAddress, cpuarch);
+                                BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -247,7 +274,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Blt))) == ConvertBitToByte(cpuM68kInit_Blt))
         {
             retsize = M68k_Blt( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                BaseAddress, cpuarch);
+                                BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -258,7 +285,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bgt))) == ConvertBitToByte(cpuM68kInit_Bgt))
         {
             retsize = M68k_Bgt( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                BaseAddress, cpuarch);
+                                BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
@@ -269,7 +296,7 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
         if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Ble))) == ConvertBitToByte(cpuM68kInit_Ble))
         {
             retsize = M68k_Ble( outfp, cpu_buffer, cpu_pos, cpu_size,
-                                BaseAddress, cpuarch);
+                                BaseAddress, cpuarch, mode);
             if (retsize<0)
                  retcode = 1;
             else
diff --git a/rosapps/devutils/cputointel/From/m68k/M68kopcode.c b/rosapps/devutils/cputointel/From/m68k/M68kopcode.c
index 5bfb33905df..8eaffaffa3f 100644
--- a/rosapps/devutils/cputointel/From/m68k/M68kopcode.c
+++ b/rosapps/devutils/cputointel/From/m68k/M68kopcode.c
@@ -6,7 +6,8 @@
 
 
 CPU_INT M68k_Abcd( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                   CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                   CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                   CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -15,7 +16,8 @@ CPU_INT M68k_Abcd( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                 CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                 CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                 CPU_INT dismode)
 {
     CPU_INT opmode;
     CPU_INT mode;
@@ -87,7 +89,8 @@ CPU_INT M68k_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Addi( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                   CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                   CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                   CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -96,7 +99,8 @@ CPU_INT M68k_Addi( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Addq( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                   CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                   CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                   CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -105,7 +109,8 @@ CPU_INT M68k_Addq( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Addx( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                   CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                   CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                   CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -114,7 +119,8 @@ CPU_INT M68k_Addx( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_And( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                  CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -123,7 +129,8 @@ CPU_INT M68k_And( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Andi( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                   CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                   CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                   CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -132,7 +139,8 @@ CPU_INT M68k_Andi( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_AndToCCR( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                       CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                       CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                       CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -141,7 +149,8 @@ CPU_INT M68k_AndToCCR( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Asl( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                  CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -150,7 +159,8 @@ CPU_INT M68k_Asl( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Asr( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                  CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -159,7 +169,8 @@ CPU_INT M68k_Asr( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Bhi( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                  CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -168,7 +179,8 @@ CPU_INT M68k_Bhi( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Bls( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                  CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -177,7 +189,8 @@ CPU_INT M68k_Bls( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Bcc( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                  CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -186,7 +199,8 @@ CPU_INT M68k_Bcc( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Bcs( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                  CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -195,7 +209,8 @@ CPU_INT M68k_Bcs( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Bne( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                  CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -204,7 +219,8 @@ CPU_INT M68k_Bne( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Beq( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                  CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -213,7 +229,8 @@ CPU_INT M68k_Beq( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Bvc( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                  CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -222,7 +239,8 @@ CPU_INT M68k_Bvc( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Bvs( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                  CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -231,7 +249,8 @@ CPU_INT M68k_Bvs( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Bpl( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                  CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -240,7 +259,8 @@ CPU_INT M68k_Bpl( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Bmi( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                  CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -249,7 +269,8 @@ CPU_INT M68k_Bmi( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Bge( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                  CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -258,7 +279,8 @@ CPU_INT M68k_Bge( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Blt( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                  CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -267,7 +289,8 @@ CPU_INT M68k_Blt( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Bgt( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                  CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
@@ -276,7 +299,8 @@ CPU_INT M68k_Bgt( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
 }
 
 CPU_INT M68k_Ble( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
-                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch)
+                  CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                  CPU_INT mode)
 {
     fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
 
diff --git a/rosapps/devutils/cputointel/From/m68k/m68k.h b/rosapps/devutils/cputointel/From/m68k/m68k.h
index 124e7a4349e..e6be2a69959 100644
--- a/rosapps/devutils/cputointel/From/m68k/m68k.h
+++ b/rosapps/devutils/cputointel/From/m68k/m68k.h
@@ -5,33 +5,34 @@ CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
                      CPU_UNINT cpu_size,
                      CPU_UNINT BaseAddress,
                      CPU_UNINT cpuarch,
-                     FILE *outfp);
+                     FILE *outfp,
+                     CPU_INT mode);
 
 
-CPU_INT M68k_Abcd(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Addi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Addq(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Addx(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_And(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Andi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_AndToCCR(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Asl(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Asr(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Bhi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Bls(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Bcc(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Bcs(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Bne(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Beq(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Bvc(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Bvs(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Bpl(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Bmi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Bge(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Blt(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Bgt(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
-CPU_INT M68k_Ble(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch);
+CPU_INT M68k_Abcd(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Addi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Addq(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Addx(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_And(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Andi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_AndToCCR(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Asl(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Asr(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Bhi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Bls(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Bcc(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Bcs(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Bne(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Beq(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Bvc(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Bvs(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Bpl(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Bmi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Bge(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Blt(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Bgt(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
+CPU_INT M68k_Ble(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
 
 extern CPU_BYTE M68k_Rx[16];
 extern CPU_BYTE M68k_RM[16];
diff --git a/rosapps/devutils/cputointel/ImageLoader.c b/rosapps/devutils/cputointel/ImageLoader.c
index 03d05f965bd..758717424b3 100644
--- a/rosapps/devutils/cputointel/ImageLoader.c
+++ b/rosapps/devutils/cputointel/ImageLoader.c
@@ -10,12 +10,19 @@
 #include "From/PPC/PPC.h"
 
 /*
- *
+ * infileName       file name to convert or disambler 
+ * outputfileName   file name to save to
+ * BaseAddress      the address we should emulate
+ * cpuid            the cpu we choice not vaild for pe loader
+ * type             the loading mode Auto, PE, bin
+ * mode             disambler mode : 0 the arch cpu.
+ *                  translate mode : 1 intel
+ * 
  */
 
 CPU_INT LoadPFileImage( char *infileName, char *outputfileName, 
                      CPU_UNINT BaseAddress, char *cpuid,
-                     CPU_UNINT type)
+                     CPU_UNINT type, CPU_INT mode)
 {
     FILE *infp;
     FILE *outfp;
@@ -102,7 +109,7 @@ CPU_INT LoadPFileImage( char *infileName, char *outputfileName,
 
     if (type==0) 
     {
-       if ( PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size, outfp) !=0)
+       if ( PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size, outfp, mode) !=0)
        {
             type=1;
        }
@@ -111,24 +118,24 @@ CPU_INT LoadPFileImage( char *infileName, char *outputfileName,
     if (type== 1)
     {
         if (stricmp(cpuid,"m68000"))
-                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68000,outfp);
+                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68000,outfp,mode);
         else if (stricmp(cpuid,"m68010"))
-                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68010,outfp);
+                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68010,outfp,mode);
         else if (stricmp(cpuid,"m68020"))
-                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68020,outfp);
+                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68020,outfp,mode);
         else if (stricmp(cpuid,"m68030"))
-                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68030,outfp);
+                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68030,outfp,mode);
         else if (stricmp(cpuid,"m68040"))
-                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68040,outfp);
+                return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68040,outfp,mode);
         else if (stricmp(cpuid,"ppc"))
-                return PPCBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,0,outfp);
+                return PPCBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,0,outfp,mode);
         else if (stricmp(cpuid,"arm4"))
-                return ARMBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,4,outfp);
+                return ARMBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,4,outfp,mode);
     }
 
     if (type==2) 
     {
-       return PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size, outfp);
+       return PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size, outfp, mode);
 
     }
 
@@ -137,7 +144,7 @@ CPU_INT LoadPFileImage( char *infileName, char *outputfileName,
 
 CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos,
                      CPU_UNINT base,  CPU_UNINT size,
-                     FILE *outfp)
+                     FILE *outfp, CPU_INT mode)
 {
     PIMAGE_DOS_HEADER DosHeader;
     PIMAGE_NT_HEADERS NtHeader;
@@ -329,7 +336,7 @@ CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos,
                case IMAGE_FILE_MACHINE_POWERPC:
                     printf("CPU POWERPC Detected no CPUBrain implement for it\n");
                          //PPCBrain(memory, pos, cpu_size, base, 0, outfp);
-                    return PPCBrain(memory+SectionHeader->PointerToRawData,  0, SectionHeader->SizeOfRawData, 0, 0, outfp);
+                    return PPCBrain(memory+SectionHeader->PointerToRawData,  0, SectionHeader->SizeOfRawData, 0, 0, outfp,mode);
 
                     return 3;
 
diff --git a/rosapps/devutils/cputointel/misc.h b/rosapps/devutils/cputointel/misc.h
index 4a876bb38b4..b453af12319 100644
--- a/rosapps/devutils/cputointel/misc.h
+++ b/rosapps/devutils/cputointel/misc.h
@@ -11,8 +11,8 @@
 #define CPU_BYTE    unsigned char
 
 /* Prototypes for misc stuff */
-CPU_INT LoadPFileImage(char *infileName, char *outputfileName, CPU_UNINT BaseAddress, char *cpuid, CPU_UNINT type);
-CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos, CPU_UNINT base,  CPU_UNINT size, FILE *outfp);
+CPU_INT LoadPFileImage(char *infileName, char *outputfileName, CPU_UNINT BaseAddress, char *cpuid, CPU_UNINT type, CPU_INT mode);
+CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos, CPU_UNINT base, CPU_UNINT size, FILE *outfp, CPU_INT mode);
 
 CPU_UNINT ConvertBitToByte(CPU_BYTE *bit);
 CPU_UNINT GetMaskByte(CPU_BYTE *bit);

From ad3d7fea3670e958e8bf46f90f335d826aa214ee Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Sat, 13 Jan 2007 14:34:50 +0000
Subject: [PATCH 32/36] adding print out the type of asm file in the asm file

svn path=/trunk/; revision=25439
---
 rosapps/devutils/cputointel/CpuToIntel.c  |  2 +-
 rosapps/devutils/cputointel/ImageLoader.c | 40 +++++++++++++++++++++--
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/rosapps/devutils/cputointel/CpuToIntel.c b/rosapps/devutils/cputointel/CpuToIntel.c
index 579c6c9394f..72cb0d45090 100644
--- a/rosapps/devutils/cputointel/CpuToIntel.c
+++ b/rosapps/devutils/cputointel/CpuToIntel.c
@@ -91,7 +91,7 @@ int main(int argc, char * argv[])
 
 
     return LoadPFileImage(infile,outfile,BaseAddress,cpuid,type, mode);
-    //return LoadPFileImage("e:\\cputointel.exe","e:\\cputointel.asm",0,0,0);
+    //return LoadPFileImage("e:\\testms.exe","e:\\cputointel.asm",0,0,0,0);
 
 }
 
diff --git a/rosapps/devutils/cputointel/ImageLoader.c b/rosapps/devutils/cputointel/ImageLoader.c
index 758717424b3..f8e0b34ba51 100644
--- a/rosapps/devutils/cputointel/ImageLoader.c
+++ b/rosapps/devutils/cputointel/ImageLoader.c
@@ -273,68 +273,92 @@ CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos,
        }
 
        
-       else if (strnicmp(SectionHeader->Name,".text",5)==0)
+       else if (strnicmp(SectionHeader->Name,".text\0",6)==0)
        {
+           /*
+                FIXME we should output gas syntax 
+                BITS 32
+                GLOBAL _lrotate;
+                EXTERN _printf;
+                COMMON _commvar 4;
+           */
+
+            fprintf(outfp,".SECTION .text");
             switch (NtHeader->FileHeader.Machine)
             {
                 case IMAGE_FILE_MACHINE_ALPHA:
                      printf("CPU ALPHA Detected no CPUBrain implement for it\n");
+                     fprintf(outfp,"; CPU found Alpha");
                      return 3;
 
                 case IMAGE_FILE_MACHINE_ALPHA64:
                      printf("CPU ALPHA64/AXP64 Detected no CPUBrain implement for it\n");
+                     fprintf(outfp,"; CPU found Alpha64/AXP64");
                      return 3;
 
                 case IMAGE_FILE_MACHINE_AM33:
                      printf("CPU AM33 Detected no CPUBrain implement for it\n");
+                     fprintf(outfp,"; CPU found AM33");
                      return 3;
 
                 case IMAGE_FILE_MACHINE_AMD64:
                      printf("CPU AMD64 Detected no CPUBrain implement for it\n");
+                     fprintf(outfp,"; CPU found AMD64");
                      return 3;
 
                 case IMAGE_FILE_MACHINE_ARM:
                      printf("CPU ARM Detected no CPUBrain implement for it\n");
+                     fprintf(outfp,"; CPU found ARM");
                      return 3;
 
                 case IMAGE_FILE_MACHINE_CEE:
                      printf("CPU CEE Detected no CPUBrain implement for it\n");
+                     fprintf(outfp,"; CPU found CEE");
                      return 3;
 
                 case IMAGE_FILE_MACHINE_CEF:
                      printf("CPU CEF Detected no CPUBrain implement for it\n");
+                     fprintf(outfp,"; CPU found CEF");
                      return 3;
 
                 case IMAGE_FILE_MACHINE_EBC:
                      printf("CPU EBC Detected no CPUBrain implement for it\n");
+                     fprintf(outfp,"; CPU found EBC");
                      return 3;
 
                 case IMAGE_FILE_MACHINE_I386:
                      printf("CPU I386 Detected no CPUBrain implement for it\n");
+                     fprintf(outfp,"; CPU found I386");
                      return 3;
 
                 case IMAGE_FILE_MACHINE_IA64:
                      printf("CPU IA64 Detected no CPUBrain implement for it\n");
+                     fprintf(outfp,"; CPU found IA64");
                      return 3;
 
                 case IMAGE_FILE_MACHINE_M32R:
                      printf("CPU M32R Detected no CPUBrain implement for it\n");
+                     fprintf(outfp,"; CPU found M32R");
                      return 3;
 
                 case IMAGE_FILE_MACHINE_MIPS16:
                      printf("CPU MIPS16 Detected no CPUBrain implement for it\n");
+                     fprintf(outfp,"; CPU found MIPS16");
                      return 3;
 
                 case IMAGE_FILE_MACHINE_MIPSFPU:
                      printf("CPU MIPSFPU Detected no CPUBrain implement for it\n");
+                     fprintf(outfp,"; CPU found MIPSFPU");
                      return 3;
 
                 case IMAGE_FILE_MACHINE_MIPSFPU16:
                      printf("CPU MIPSFPU16 Detected no CPUBrain implement for it\n");
+                     fprintf(outfp,"; CPU found MIPSFPU16");
                      return 3;
 
                case IMAGE_FILE_MACHINE_POWERPC:
-                    printf("CPU POWERPC Detected no CPUBrain implement for it\n");
+                    printf("CPU POWERPC Detected partily CPUBrain implement for it\n");
+                    fprintf(outfp,"; CPU found POWERPC");
                          //PPCBrain(memory, pos, cpu_size, base, 0, outfp);
                     return PPCBrain(memory+SectionHeader->PointerToRawData,  0, SectionHeader->SizeOfRawData, 0, 0, outfp,mode);
 
@@ -342,50 +366,62 @@ CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos,
 
                case IMAGE_FILE_MACHINE_POWERPCFP:
                     printf("CPU POWERPCFP Detected no CPUBrain implement for it\n");
+                    fprintf(outfp,"; CPU found POWERPCFP");
                     return 3;
 
                case IMAGE_FILE_MACHINE_R10000:
                     printf("CPU R10000 Detected no CPUBrain implement for it\n");
+                    fprintf(outfp,"; CPU found R10000");
                     return 3;
 
                case IMAGE_FILE_MACHINE_R3000:
                     printf("CPU R3000 Detected no CPUBrain implement for it\n");
+                    fprintf(outfp,"; CPU found R3000");
                     return 3;
 
                case IMAGE_FILE_MACHINE_R4000:
                     printf("CPU R4000 Detected no CPUBrain implement for it\n");
+                    fprintf(outfp,"; CPU found R4000");
                     return 3;
 
                case IMAGE_FILE_MACHINE_SH3:
                     printf("CPU SH3 Detected no CPUBrain implement for it\n");
+                    fprintf(outfp,"; CPU found SH3");
                     return 3;
 
                case IMAGE_FILE_MACHINE_SH3DSP:
                     printf("CPU SH3DSP Detected no CPUBrain implement for it\n");
+                    fprintf(outfp,"; CPU found SH3DSP");
                     return 3;
 
                case IMAGE_FILE_MACHINE_SH3E:
                     printf("CPU SH3E Detected no CPUBrain implement for it\n");
+                    fprintf(outfp,"; CPU found SH3E");
                     return 3;
 
                case IMAGE_FILE_MACHINE_SH4:
                     printf("CPU SH4 Detected no CPUBrain implement for it\n");
+                    fprintf(outfp,"; CPU found SH4");
                     return 3;
 
                case IMAGE_FILE_MACHINE_SH5:
                     printf("CPU SH5 Detected no CPUBrain implement for it\n");
+                    fprintf(outfp,"; CPU found SH5");
                     return 3;
 
                case IMAGE_FILE_MACHINE_THUMB:
                     printf("CPU THUMB Detected no CPUBrain implement for it\n");
+                    fprintf(outfp,"; CPU found THUMB");
                     return 3;
 
                case IMAGE_FILE_MACHINE_TRICORE:
                     printf("CPU TRICORE Detected no CPUBrain implement for it\n");
+                    fprintf(outfp,"; CPU found TRICORE");
                     return 3;
 
                case IMAGE_FILE_MACHINE_WCEMIPSV2:
                     printf("CPU WCEMIPSV2 Detected no CPUBrain implement for it\n");
+                    fprintf(outfp,"; CPU found WCEMIPSV2");
                     return 3;
 
                default:

From 350c6a32c29ea17281b8b6a22e1d6878a0e9487f Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Sat, 13 Jan 2007 17:27:14 +0000
Subject: [PATCH 33/36] adding GetData32Be, GetData32Le for getting 4bytes from
 big or lite endian start implment Ld for ppc.

svn path=/trunk/; revision=25440
---
 rosapps/devutils/cputointel/From/PPC/PPC.h    |  8 +++++
 .../devutils/cputointel/From/PPC/PPCBrain.c   | 15 +++++++--
 .../devutils/cputointel/From/PPC/PPCBrain.h   | 15 +++++++++
 .../devutils/cputointel/From/PPC/PPCopcode.c  | 28 +++++++++++++++++
 .../cputointel/From/dummycpu/DummyBrain.c     |  8 ++++-
 rosapps/devutils/cputointel/misc.c            | 31 +++++++++++++++++++
 rosapps/devutils/cputointel/misc.h            |  3 ++
 7 files changed, 105 insertions(+), 3 deletions(-)

diff --git a/rosapps/devutils/cputointel/From/PPC/PPC.h b/rosapps/devutils/cputointel/From/PPC/PPC.h
index 4b7969c20e4..dd7ba1f01fb 100644
--- a/rosapps/devutils/cputointel/From/PPC/PPC.h
+++ b/rosapps/devutils/cputointel/From/PPC/PPC.h
@@ -14,6 +14,14 @@ CPU_INT PPCBrain(    CPU_BYTE *cpu_buffer,
 CPU_INT PPC_Addx(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode);
 
 
+CPU_INT PPC_Ld( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
+                   CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                   CPU_INT mode);
+
 /* Export comment thing see m68k for example 
  * in dummy we do not show it, for it is diffent for each cpu
  */
+
+extern CPU_BYTE PPC_D[32];
+extern CPU_BYTE PPC_A[32];
+extern CPU_BYTE PPC_ds[32];
diff --git a/rosapps/devutils/cputointel/From/PPC/PPCBrain.c b/rosapps/devutils/cputointel/From/PPC/PPCBrain.c
index 010bf96b803..e201d587d14 100644
--- a/rosapps/devutils/cputointel/From/PPC/PPCBrain.c
+++ b/rosapps/devutils/cputointel/From/PPC/PPCBrain.c
@@ -58,8 +58,8 @@ CPU_INT PPCBrain(    CPU_BYTE *cpu_buffer,
     {
         cpu_oldpos = cpu_pos;
 
-        cpuint = cpu_buffer[cpu_pos];
-    
+        cpuint = GetData32Le(&cpu_buffer[cpu_pos]);
+
         /* Add */
         if ((cpuint - (cpuint & GetMaskByte32(cpuPPCInit_Addx))) == ConvertBitToByte32(cpuPPCInit_Addx))
         {
@@ -70,6 +70,17 @@ CPU_INT PPCBrain(    CPU_BYTE *cpu_buffer,
             else
                  cpu_pos += retsize;
         }
+
+         /* Ld aslo known as Li */
+        if ((cpuint - (cpuint & GetMaskByte32(cpuPPCInit_Ld))) == ConvertBitToByte32(cpuPPCInit_Ld))
+        {
+            retsize = PPC_Ld( outfp, cpu_buffer, cpu_pos, cpu_size,
+                                 BaseAddress, cpuarch, mode);
+            if (retsize<0)
+                 retcode = 1;
+            else
+                 cpu_pos += retsize;
+        }
     
         /* Found all Opcode and breakout and return no error found */
         if (cpu_pos >=cpu_size)
diff --git a/rosapps/devutils/cputointel/From/PPC/PPCBrain.h b/rosapps/devutils/cputointel/From/PPC/PPCBrain.h
index 5e33bd8cc50..cfe076f383f 100644
--- a/rosapps/devutils/cputointel/From/PPC/PPCBrain.h
+++ b/rosapps/devutils/cputointel/From/PPC/PPCBrain.h
@@ -10,3 +10,18 @@
  */
 CPU_BYTE cpuPPCInit_Addx[32] = {2,0,1,0,1,0,0,0,0,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,0};
 
+
+CPU_BYTE cpuPPCInit_Ld[32]  = {0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,1,1,1,0,0,0};
+CPU_BYTE cpuPPCInit_Ldu[32] = {1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,1,1,1,0,0,0};
+
+
+/* mask */
+CPU_BYTE PPC_D[32]     = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0,0,0,0,0};
+CPU_BYTE PPC_A[32]     = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0};
+CPU_BYTE PPC_ds[32]    = {0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+
+/* bit index
+                          3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
+                          1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+*/
+
diff --git a/rosapps/devutils/cputointel/From/PPC/PPCopcode.c b/rosapps/devutils/cputointel/From/PPC/PPCopcode.c
index 9f7e86417b8..5b42a9a3bbe 100644
--- a/rosapps/devutils/cputointel/From/PPC/PPCopcode.c
+++ b/rosapps/devutils/cputointel/From/PPC/PPCopcode.c
@@ -39,3 +39,31 @@ CPU_INT PPC_Addx( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
     printf(";Add unimplement\n");
     return -1;
 }
+ //                                                          stb
+                                                             
+ // li  %r3, 0  : op    00          00         60           38
+ // li = ld
+//                   0000 0000   0000 0000  0100 0000    0011 1000
+CPU_INT PPC_Ld( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos,
+                   CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,
+                   CPU_INT mode)
+{
+    CPU_UNINT formA;
+    CPU_UNINT formD;
+    CPU_UNINT formDS;
+    CPU_UNINT opcode;
+
+    opcode = GetData32Le(cpu_buffer);
+    formA = (opcode & ConvertBitToByte(PPC_A)) >> 5;
+    formD = (opcode & ConvertBitToByte(PPC_D)) >> 10;
+    formDS = (opcode & ConvertBitToByte(PPC_ds)) >> 15;
+
+    if (mode==0)
+    {
+        fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos);
+    }
+
+    printf(";not full implement \n");
+    return 4;
+}
+
diff --git a/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c b/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c
index 2d4d33cf453..c6a91d90e24 100644
--- a/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c
+++ b/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c
@@ -59,7 +59,13 @@ CPU_INT DummyBrain(  CPU_BYTE *cpu_buffer,
     {
         cpu_oldpos = cpu_pos;
 
-        cpuint = cpu_buffer[cpu_pos];
+        /* use the GetData32Be or GetData32Le
+           to read from the memory the
+           Le is for small endian and the
+           Be is for big endian
+           the 32 is how many bits we should read 
+         */
+        cpuint = GetData32Be(&cpu_buffer[cpu_pos]);
     
         /* Add */
         if ((cpuint - (cpuint & GetMaskByte(cpuDummyInit_Add))) == ConvertBitToByte(cpuDummyInit_Add))
diff --git a/rosapps/devutils/cputointel/misc.c b/rosapps/devutils/cputointel/misc.c
index c93dca9b06f..ed28b03605d 100644
--- a/rosapps/devutils/cputointel/misc.c
+++ b/rosapps/devutils/cputointel/misc.c
@@ -97,6 +97,37 @@ CPU_UNINT GetMaskByte32(CPU_BYTE *bit)
 
 
 
+CPU_UNINT GetData32Le(CPU_BYTE *cpu_buffer)
+{
+    CPU_UNINT cpuint;
+    CPU_UNINT split1;
+    CPU_UNINT split2;
+    CPU_UNINT split3;
+    CPU_UNINT split4;
+
+    cpuint = *((CPU_UNINT*) &cpu_buffer[0]);
+
+    split1 = cpu_buffer[0];
+    split2 = cpu_buffer[1];
+    split3 = cpu_buffer[2];
+    split4 = cpu_buffer[3];
+
+
+    cpuint = split4+(split3 <<8 )+(split2 <<16 )+(split1 <<24 );
+
+    return cpuint;
+}
+
+CPU_UNINT GetData32Be(CPU_BYTE *cpu_buffer)
+{
+    CPU_UNINT cpuint;
+
+    cpuint = *((CPU_UNINT*) &cpu_buffer[0]);
+
+    return cpuint;
+}
+
+
 // add no carry
 
 
diff --git a/rosapps/devutils/cputointel/misc.h b/rosapps/devutils/cputointel/misc.h
index b453af12319..7d75849c533 100644
--- a/rosapps/devutils/cputointel/misc.h
+++ b/rosapps/devutils/cputointel/misc.h
@@ -20,3 +20,6 @@ CPU_UNINT GetMaskByte(CPU_BYTE *bit);
 CPU_UNINT ConvertBitToByte32(CPU_BYTE *bit);
 CPU_UNINT GetMaskByte32(CPU_BYTE *bit);
 
+CPU_UNINT GetData32Le(CPU_BYTE *cpu_buffer);
+CPU_UNINT GetData32Be(CPU_BYTE *cpu_buffer);
+

From bbf29dfdf86f511fc7656feac110dae000338e08 Mon Sep 17 00:00:00 2001
From: Johannes Anderwald <johannes.anderwald@reactos.org>
Date: Sat, 13 Jan 2007 18:20:53 +0000
Subject: [PATCH 34/36] - add italian translation by Paolo Devoti,
 devotip@tiscali.it - fixes bug 1974, 1975, 1976

svn path=/trunk/; revision=25441
---
 reactos/dll/cpl/intl/intl.rc     |   1 +
 reactos/dll/cpl/intl/it.rc       | 101 +++++++++++++++++++
 reactos/dll/cpl/liccpa/It.rc     |  28 ++++++
 reactos/dll/cpl/liccpa/liccpa.rc |   1 +
 reactos/dll/cpl/main/It.rc       | 164 +++++++++++++++++++++++++++++++
 reactos/dll/cpl/main/rsrc.rc     |   1 +
 6 files changed, 296 insertions(+)
 create mode 100644 reactos/dll/cpl/intl/it.rc
 create mode 100644 reactos/dll/cpl/liccpa/It.rc
 create mode 100644 reactos/dll/cpl/main/It.rc

diff --git a/reactos/dll/cpl/intl/intl.rc b/reactos/dll/cpl/intl/intl.rc
index 36ff2eae93b..f9250459f5c 100644
--- a/reactos/dll/cpl/intl/intl.rc
+++ b/reactos/dll/cpl/intl/intl.rc
@@ -32,3 +32,4 @@ IDC_FLAGS ICON "resources/flags.ico"
 #include "Fr.rc"
 #include "ru.rc"
 #include "uk.rc"
+#include "it.rc"
diff --git a/reactos/dll/cpl/intl/it.rc b/reactos/dll/cpl/intl/it.rc
new file mode 100644
index 00000000000..7f4e51cacba
--- /dev/null
+++ b/reactos/dll/cpl/intl/it.rc
@@ -0,0 +1,101 @@
+/* $Id: intl.rc 12852 2005-01-06 13:58:04Z mf $ */
+// Italian language resource file (Paolo Devoti, devotip@tiscali.it, 2007-01-10)
+
+LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
+
+IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Generale"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Pagina delle proprietà 1",-1,73,74,90,8
+END
+
+
+IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Numeri"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Pagina delle proprietà 2",-1,73,74,90,8
+END
+
+
+IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Valuta"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  GROUPBOX "Esempio", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positivo:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "Negativo:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "&Simbolo valuta:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Importo positivo:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Importo negativo:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Separatore decimale:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Numbero decimali:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Simbolo di raggruppamento:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Raggruppamento cifre:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+END
+
+
+IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Tempo"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  GROUPBOX "Esempio", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Tempo:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
+  LTEXT "&Formato tempo:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  LTEXT "&Separatore tempo:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  LTEXT "Simbolo A&M:", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  LTEXT "Simbolo &PM:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE
+  LTEXT "Notazione del formato del tempo\n\n\
+h = ore    m = minuti    s = secondi    t = am o pm\n\n\
+h = 12 ore   H = 24 ore\n\
+hh, mm, ss = zero a sinistra   h, m, s = nessuno zero a sinistra",
+        -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP
+END
+
+
+IDD_DATEPAGE DIALOGEX 0, 0, 246, 188
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Data"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Pagina delle proprietà 5",-1,73,74,90,8
+END
+
+
+IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Input Locale"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  GROUPBOX "Lingua principale", -1, 8, 11, 228, 74
+  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
+  LTEXT "Scegli la lingua principale e le opzioni regionali che intendi usare:", -1, 38, 25, 193, 22
+  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+END
+
+
+STRINGTABLE
+BEGIN
+  IDS_CPLNAME "opzioni regionali"
+  IDS_CPLDESCRIPTION "Scegli la lingua, il formato per i numeri, la valuta, data e ora."
+END
diff --git a/reactos/dll/cpl/liccpa/It.rc b/reactos/dll/cpl/liccpa/It.rc
new file mode 100644
index 00000000000..c784e3c2f18
--- /dev/null
+++ b/reactos/dll/cpl/liccpa/It.rc
@@ -0,0 +1,28 @@
+// Italian language resource file (Paolo Devoti, devotip@tiscali.it, 2007-01-10)
+LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
+
+IDD_PROPPAGE1 DIALOG DISCARDABLE  20, 40, 315, 104
+STYLE DS_MODALFRAME | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU
+CAPTION "Scegli il tipo di licenza d'uso"
+FONT 8, "Helv"
+BEGIN
+	CONTROL "Licenza d'uso per Client",                           100, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 4, 4, 239, 94
+	CONTROL "Per Sistema o Per Utente",                           102, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 79, 107, 12
+	CONTROL "Per Server. Numero di connessioni contemporanee:",   103, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 38, 163, 9
+	CONTROL "Prodotto:",                                          105, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 13, 20, 31, 8
+	CONTROL "",                                                   106, "COMBOBOX", CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP, 49, 20, 171, 12
+	CONTROL "OK",                                                 107, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 7, 46, 14
+	CONTROL "Annulla",                                            108, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 27, 46, 14
+	CONTROL "Aiuto",                                              109, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 48, 46, 14
+	CONTROL "Replicazione...",                                    110, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 68, 46, 14
+	CONTROL "Aggiungi licenze",                                   111, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 30, 56, 65, 15
+	CONTROL "Togli licenze",                                      112, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 112, 56, 61, 16
+	CONTROL "",                                                   114, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 187, 39, 32, 12
+END
+
+STRINGTABLE 
+BEGIN
+  IDS_CPLNAME_1 "Gestione licenze"
+  IDS_CPLDESCRIPTION_1 "Gestione licenze"
+  IDS_REACTOS "ReactOS - Software Libero"
+END
diff --git a/reactos/dll/cpl/liccpa/liccpa.rc b/reactos/dll/cpl/liccpa/liccpa.rc
index 15683082714..88db8c9d537 100644
--- a/reactos/dll/cpl/liccpa/liccpa.rc
+++ b/reactos/dll/cpl/liccpa/liccpa.rc
@@ -17,3 +17,4 @@ IDC_CPLICON_1 ICON "resources/cpl_icon1.ico"
 #include "Ja.rc"
 #include "Es.rc"
 #include "Ru.rc"
+#include "It.rc"
diff --git a/reactos/dll/cpl/main/It.rc b/reactos/dll/cpl/main/It.rc
new file mode 100644
index 00000000000..d103e276931
--- /dev/null
+++ b/reactos/dll/cpl/main/It.rc
@@ -0,0 +1,164 @@
+// Italian language resource file (Paolo Devoti, devotip@tiscali.it, 2007-01-10)
+
+LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
+
+IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Velocità"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  GROUPBOX "Ripetizione caratteri", -1, 5, 5, 230, 130
+  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  LTEXT "Ritardo della ripetizione", -1, 40, 15, 50, 10
+  LTEXT "Lungo", -1, 40, 30, 20, 10
+  LTEXT "Corto", -1, 200, 30, 20, 10
+  CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
+  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  LTEXT "&Frequenza ripetizione", -1, 40, 70, 50, 10
+  LTEXT "Lenta", -1, 40, 85, 20, 10
+  LTEXT "Veloce", -1, 200, 85, 20, 10
+  CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17
+  LTEXT "Clicca qui e tieni premuto un tasto per provare la frequenza di ripetizione:", -1, 15, 105, 150, 10
+  EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 115, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP
+  GROUPBOX "Frequenza di lampeggio del Cursore:", -1, 5, 145, 230, 50
+  LTEXT "Nessuna", -1, 40, 165, 30, 10
+  LTEXT "Veloce", -1, 200, 165, 30, 10
+  CONTROL "",IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 165, 130, 17
+END
+
+IDD_HARDWARE DIALOGEX 0, 0, 246, 228
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Hardware"
+FONT 8, "MS Shell Dlg"
+BEGIN
+END
+
+IDD_CLICK_LOCK DIALOGEX 0, 0, 246, 100
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU
+CAPTION "Rilevazione Clic"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Breve", -1, 35,  50, 30, 10
+  LTEXT "Lungo", -1, 140, 50, 30, 10
+  CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 50, 70, 17
+  PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15
+  PUSHBUTTON "&Annulla", IDCANCEL, 175, 75, 50, 15
+  LTEXT "&Regola per quanto deve rimanere premuto il tasto di un mouse o una trackball prima che il clic sia rilevato",-1,60,15,170,30
+  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+END
+
+IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION
+CAPTION "Bottoni"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  GROUPBOX "Configurazione dei botton", -1, 5, 5, 230, 70
+  CHECKBOX "&Scambia il bottone secondario e primario", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10
+  CONTROL  "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE
+  LTEXT "Assegna al tasto destro del mouse le funzioni principali come ad esempio la selezione e il trascinamento", -1, 10, 30, 140, 30
+  GROUPBOX "Velocità del doppio clic", -1, 5, 75, 230, 70
+  LTEXT "Fai doppio clic sulla cartella ver verificare le impostazioni. Se la cartella non si apre o chiude, prova a usare una velocità minore.", -1, 10, 85, 160, 30
+  LTEXT "Velocità:   Lenta", -1, 10, 120, 90, 8
+  LTEXT "Veloce", -1, 140, 120, 30, 8
+  CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17
+  CONTROL  "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE
+  GROUPBOX "Blocca clic", -1, 5, 150, 230, 70
+  CHECKBOX "&Abilita Blocca Clic", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20
+  PUSHBUTTON "&Impostazioni...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 
+  LTEXT "Permette di selezionare e trascinare senza tenere premuto il tasto del mouse . Per attivare premere brevemente il tasto del mouse. Per disattivare, cliccare di nuovo", -1, 10, 180, 190, 30
+END
+
+IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION
+CAPTION "Puntatore"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  GROUPBOX "Schema", -1, 5, 5, 170, 45
+  COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+  CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120
+  PUSHBUTTON "Salva come...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15
+  PUSHBUTTON "&Cancella", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15
+  CONTROL  "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE
+  LTEXT "&Personalizza", -1, 5, 60, 40, 10
+  CHECKBOX "&Abilita l'ombra del puntatore", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10
+  PUSHBUTTON "Usa predefinito", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15
+  PUSHBUTTON "&Esplora", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15
+END
+
+IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 75
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU
+CAPTION "Salva lo Schema"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Salva questo schema di cursori come:", -1, 5, 5, 100, 10
+  EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP
+  PUSHBUTTON "&Ok", IDOK, 60, 45, 50, 15
+  PUSHBUTTON "&Annulla", IDCANCEL, 115, 45, 50, 15
+END
+
+
+IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION
+CAPTION "Opzioni del puntatore"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  GROUPBOX "Motion", -1, 5, 5, 230, 60
+  LTEXT "Scegli una volocità per il puntatore:", -1, 60, 15, 110, 10
+  LTEXT "Lento", -1, 60, 30, 20, 10
+  CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17
+  LTEXT "Veloce", -1, 170, 30, 20, 10
+  ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15
+  CHECKBOX "&Aumenta la precisione del puntatore", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10
+  GROUPBOX "Salta a", -1, 5, 65, 230, 40
+  CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10
+  ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15
+  LTEXT "Muove automaticamente il puntatore al bottone preselezionato nelle finestre di dialogo", -1, 73, 75, 152, 20
+  GROUPBOX "Visibilità", -1, 5, 105, 230, 90
+  CHECKBOX "&Visualizza la traccia del puntatore", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10
+  LTEXT "Corta", -1, 60, 130, 30, 10
+  LTEXT "Lunga", -1, 160, 130, 30, 10
+  ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15
+  CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17
+  CHECKBOX "&Nascondi il puntatore mentre si scrive", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10
+  ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15
+  CHECKBOX "&Mostra la posizione del puntatore quando si preme il tasto CTRL", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10
+  ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15
+END
+
+IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION
+CAPTION "Rotella"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  GROUPBOX "Scorrimento", -1, 5, 5, 230, 80
+  LTEXT "Gira la rotella una tacca per scorrere", -1, 60, 15, 150, 10
+  CONTROL "Il seguente numero di linee per volta", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10
+  EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP 
+  CONTROL   "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12
+  CONTROL "&Uno schermo alla volta", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10
+  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+END
+
+STRINGTABLE
+BEGIN
+  IDS_CPLNAME_1 "Mouse"
+  IDS_CPLDESCRIPTION_1 "Modifica le impostazioni del mouse."
+  IDS_CPLNAME_2 "Tastiera"
+  IDS_CPLDESCRIPTION_2 "Modifica le impostazioni della tastiera."
+  IDS_ARROW "Selezione normale"
+  IDS_HELP "Selezione aiuto"
+  IDS_APPSTARTING "Lavora in sottofondo"
+  IDS_WAIT "Occupato"
+  IDS_CROSSHAIR "Selezione di precisione"
+  IDS_IBEAM "Seleziona testo"
+  IDS_NWPEN "Scrittura manuale"
+  IDS_NO "Non disponibile"
+  IDS_SIZENS "Ridimensiona in verticale"
+  IDS_SIZENWSE "Ridimensiona in Diagonale 1"
+  IDS_SIZENESW "Ridimensiona in Diagonale 2"
+  IDS_SIZEALL "Muovi"
+  IDS_UPARROW "Selezione alternativa"
+  IDS_HAND "Seleziona collegamento"
+  IDS_NONE "(Nessuna)"
+  IDS_SYSTEM_SCHEME "(Schema di sistema)"
+END
diff --git a/reactos/dll/cpl/main/rsrc.rc b/reactos/dll/cpl/main/rsrc.rc
index 0aadb02215f..647a3d17c5b 100644
--- a/reactos/dll/cpl/main/rsrc.rc
+++ b/reactos/dll/cpl/main/rsrc.rc
@@ -19,3 +19,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "Ru.rc"
 #include "Uk.rc"
 #include "Cz.rc"
+#include "It.rc"

From 1b7e5efafdd036ad2450e27ac27878d4f4687643 Mon Sep 17 00:00:00 2001
From: Johannes Anderwald <johannes.anderwald@reactos.org>
Date: Sat, 13 Jan 2007 18:39:38 +0000
Subject: [PATCH 35/36] - add italian translation by Paolo Devoti,
 devotip@tiscali.it - fixes some issues with the patch (missing \ or \n or ")
 See issue #1983 for more details.

svn path=/trunk/; revision=25442
---
 reactos/base/shell/cmd/cmd.rc   |   1 +
 reactos/base/shell/cmd/it-IT.rc | 657 ++++++++++++++++++++++++++++++++
 2 files changed, 658 insertions(+)
 create mode 100644 reactos/base/shell/cmd/it-IT.rc

diff --git a/reactos/base/shell/cmd/cmd.rc b/reactos/base/shell/cmd/cmd.rc
index 0d5136d9333..cec1409f354 100644
--- a/reactos/base/shell/cmd/cmd.rc
+++ b/reactos/base/shell/cmd/cmd.rc
@@ -17,6 +17,7 @@
 #include "hu-HU.rc"
 #include "nb-NO.rc"
 #include "uk-UA.rc"
+#include "it-IT.rc"
 
 STRINGTABLE DISCARDABLE
 {
diff --git a/reactos/base/shell/cmd/it-IT.rc b/reactos/base/shell/cmd/it-IT.rc
new file mode 100644
index 00000000000..f14426d78fe
--- /dev/null
+++ b/reactos/base/shell/cmd/it-IT.rc
@@ -0,0 +1,657 @@
+#include "windows.h"
+#include "resource.h"
+
+LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
+STRINGTABLE DISCARDABLE
+{
+
+STRING_ATTRIB_HELP,    "Visualizza o modifica gli attributi dei file.\n\n\
+ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\
+       [/S [/D]]\n\n\
+  +   Attiva un attributo\n\
+  -   Toglie un attributo\n\
+  R   Attributo di file di sola lettura\n\
+  A   Attributo di file di archivio\n\
+  S   Attributo di file di sistema\n\
+  H   Attributo di file nascosto\n\
+  /S  Tratta i file indicati nella cartella corrente e in\n\
+       tutte le sottocartelle\n\
+  /D  Tratta anche le cartelle\n\n\
+Scrivi ATTRIB senza parametri per visualizzare gli attributi di tutti i file.\n"
+
+STRING_ALIAS_HELP,  "Attiva, toglie o visualizza gli alias.\n\n\
+ALIAS [alias=[comando]]\n\n\
+  alias    Nome dell'alias.\n\
+  comando  Testo che corrisponde all'alias.\n\n\
+Per visualizzare tutti gli alias:\n\
+  ALIAS\n\n\
+Per attivarne uno nuovo o sostituire uno esistente:\n\
+  ALIAS da=dir a:\n\n\
+Per rimuovere un alias:\n\
+  ALIAS da="
+
+STRING_BEEP_HELP, "Segnale acustico.\n\nBEEP\n"
+
+STRING_CALL_HELP, "Chiama un programma batch da un altro.\n\n\
+CALL [disco:][percorso]nomefile [Parametri]\n\n\
+  Parametri  Indicano le informazioni richieste per il programma batch."
+
+STRING_CD_HELP,      "Cambia la cartella corrente o ne visualizza nome\n\n\
+CHDIR [/D][disco:][percorso]\n\
+CHDIR[..|.]\n\
+CD [/D][disco:][percorso]\n\
+CD[..|.]\n\n\
+  ..   cartella padre\n\
+  .    cartella corrente\n\
+  /D   Cambia il disco e la cartella corrente.\n\n\
+Scrivi CD disco: per visualizzare la cartella corrente del disco indicato.\n\
+Scrivi CD senza parametri per visualizzare il disco e la cartella corrente.\n"
+
+STRING_CHCP_HELP,   "Visualizza o attiva il numero di tabella dei codici.\n\n\
+CHCP [nnn]\n\n\
+  nnn   Indica il numero di tabella dei codici.\n\n\
+Scrivi CHCP senza parametri per visualizzare il numero attuale.\n"
+
+STRING_CHOICE_HELP, "Aspetta che l'utente scelga una delle scelte disponibili.\n\n\
+CHOICE  [/C[:]scelta][/N][/S][/T[:]c,nn][testo]\n\n\
+  /C[:]scelta   Indica i tasti ammessi. Sono predefiniti YN.\n\
+  /N            Non visualizza le scelte e ? alla fine del messaggio di richiesta.\n\
+  /S            Considera i tasti di scelta come sensibili al case.\n\
+  /T[:]s,nn     Scelta predefinita a S dopo nn secondi.\n\
+  testo         Messaggio di richiesta da visualizzare.\n\n\
+ERRORLEVEL è valorizzato alla posizione in elenco delle scelta dell'utente.\n"
+
+STRING_CLS_HELP, "Cancella lo schermo.\n\nCLS\n"
+
+STRING_CMD_HELP1, "\nComandi interni disponibilin:\n"
+
+STRING_CMD_HELP2, "\nFunzioni disponibili:"
+
+STRING_CMD_HELP3,"  [alias]"
+
+STRING_CMD_HELP4,"  [storia]"
+
+STRING_CMD_HELP5,"  [completamento automatico dei nomi dei file]"
+
+STRING_CMD_HELP6,"  [cartelle]"
+
+STRING_CMD_HELP7,"  [ridirezione e piping]"
+
+STRING_CMD_HELP8, "Attiva un altro interprete dei comandi ReactOS.\n\n\
+CMD [/[C|K] comando][/P][/Q][/T:bf]\n\n\
+  /C comando  Esegue il comando indicato e poi termina.\n\
+  /K comando  Esegue il comando indicato e poi rimane in esecuzione.\n\
+  /P          CMD rimane permanente ed esegue autoexec.bat\n\
+              (non può essere fermato).\n\
+  /T:bf       Definisce i colori di primo piano e sfondo\n\
+              (vedi anche il comando COLOR).\n"
+
+STRING_COLOR_HELP1, "Definisce i colori predefiniti di primo piano e sfondo.\n\n\
+COLOR [attr [/-F]] \n\n\
+  attr        Indica gli attributi di colore per i messaggi su console\n\
+  /-F         Non riempie lo spazio vuoto della consol con gli attributi di colore\n\n\
+Ci sono tre modi per indicare i colori:\n\
+1) [bright] nome su [bright] nome  (sono necessarie solo le prime tre lettere)\n\
+2) decimale su decimale\n\
+3) due cifre esadecimali\n\n\
+I colori sono:\n\
+dec  esa  name       dec  esa  nome\n\
+0    0    Black       8   8    Gray(Bright black)\n\
+1    1    Blue        9   9    Bright Blue\n\
+2    2    Green      10   A    Bright Green\n\
+3    3    Cyan       11   B    Bright Cyan\n\
+4    4    Red        12   C    Bright Red\n\
+5    5    Magenta    13   D    Bright Magenta\n\
+6    6    Yellow     14   E    Bright Yellow\n\
+7    7    White      15   F    Bright White\n"
+
+STRING_COPY_HELP1,  "Sovrascrivi %s (Si/No/Tutti)? "
+
+STRING_COPY_HELP2, "Copia uno o piu' file in un'altra destinazione.\n\n\
+COPY [/V][/Y|/-Y][/A|/B] sorgente [/A|/B]\n\
+     [+ sorgente [/A|/B] [+ ...]] [destinazione [/A|/B]]\n\n\
+  sorgente     Inica il file o i file da copiare.\n\
+  /A           Indica un file di testo ASCII.\n\
+  /B           Indica un file binario.\n\
+  destinazione Indica la cartella e/o il nome di file per i nuovi/o file.\n\
+  /V           Verifies that new files are written correctly.\n\
+  /Y           Elimina le richieste di conferma per le sovrascrittura\n\
+               di un file di destinazione già esistente.\n\
+  /-Y          Effettua le richieste di conferma per le sovrascrittura\n\
+               di un file di destinazione già esistente.\n\n\
+La selezione  /Y può trovarsi nella variabile di ambiente  COPYCMD .\n\
+...\n"
+
+STRING_DATE_HELP1, "\nScrivi la nuova data (mm%cdd%cyyyy): "
+
+STRING_DATE_HELP2, "\nScrivi la nuova data (dd%cmm%cyyyy): "
+
+STRING_DATE_HELP3, "\nnScrivi la nuova data (yyyy%cmm%cdd): "
+
+STRING_DATE_HELP4, "Visualizza o imposta la nuova data.\n\n\
+DATE [/T][data]\n\n\
+  /T    Visualizzazione\n\n\
+Scrivi  DATE senza parametri per visualizzare la data attuale e\n\
+chiedere quella nuova. Premi ENTER per mantenerla inalterata.\n"
+				
+STRING_DEL_HELP1,  "Cancella uno o piu' file.\n\n\
+DEL [/N /P /T /Q /S /W /Y /Z /A[[:]attributi]] file ...\n\
+DELETE [/N /P /T /Q /S /W /Y /Z /A[[:]attributi]] file ...\n\
+ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributi]] file ...\n\n\
+      file  Indica i file da cancellare.\n\n\
+  /N    Nulla.\n\
+  /P    Chiede conferma per ogni file.\n\
+  /T    Totali. Visualizza il numero di file cancellati e lo spazio liberato.\n\
+  /Q    Tacito.\n\
+  /W    Sovrascive con valori casuali prima di cancellare.\n\
+  /Y    Cancella anche *.* senza chiedere conferma.\n\
+  /F    Forza la cancellazione di file nascost, di sistema o in sola lettura.\n\
+  /S    Cancella i file anche nelle sottocartelle\n\
+  /A    Seleziona i file da cancellare in base agli attributi.\n\
+        attributes\n\
+        R     Sola lettura\n\
+        S     Sistema\n\
+        A     Archiviabile\n\
+        H     nascosto\n\
+        -     prefisso con il significato di non\n"
+
+STRING_DEL_HELP2, "All files in the directory will be deleted!\nAre you sure (Y/N)?"
+STRING_DEL_HELP3, "    %lu file deleted\n"
+STRING_DEL_HELP4, "    %lu files deleted\n"
+
+STRING_DELAY_HELP, "aspetta per il tempo indicato in secondi o millisecondi\n\
+DELAY [/m]n\n\n\
+  /m          precisa che n è in millisecondi\n\
+              altrimenti n è in secondi\n"
+
+STRING_DIR_HELP1, "DIR [disco:][percorso][nomefilen] [/A[[:]attributi]] [/B] [/C] [/D] [/L] [/N]\n\
+  [/O[[:]orderinamento]] [/P] [/Q] [/S] [/T[[:]tempo]] [/W] [/X] [/4]\n\n\
+  [disco:][percorso][nomefilen]\n\
+              Indica disco, percorso e/o file da elencare.\n\n\
+  /A          Visualizza i file con gli attributi indicati.\n\
+  attributes   D  Cartelle                R  Sola lettura\n\
+               H  file nascosti           A  Archiviabile\n\
+               S  file di sistema         -  Prefisso con il significato di non\n\
+  /B          Formato essenziale (nessuna intestazione o sintesi).\n\
+  /C          Visualizza il separatore delle migliaia nella dimensione dei file.\n\
+              Questa è la norma.  Usa /-C per non visualizzarlo.\n\
+  /D          Ugualmente largo ma i file sono ordinati per colonne.\n\
+  /L          Usa minuscole.\n\
+  /N          Nuovo formato con i nomi dei file sulla estrema destra.\n\
+  /O          Elenca i file ordinati.\n\
+  sortorder    N  Per nome (alfabetico)    S  Dimensione (per primo il piu' piccolo)\n\
+               E  Estensione (alfabetico)  D  By date/time (per primo il piu' vecchio)\n\
+               G  Le cartelle per prime    -  Prefisso per invertire l'ordine\n\
+  /P          Pasa dopo ogni schermata piena.\n\
+  /Q          Visualizza il proprietario del file.\n\
+  /S          Visualizza i file nella cartella indicata e nelle sottocartelle.\n\
+  /T          Sceglie quale campo di tempo è usato per gli ordinamenti.\n\
+  timefield   C  Creazione\n\
+              A  Ultimo Accesso\n\
+              W  Ultima scrittura\n\
+  /W          Usa il formato largo.\n\
+  /X          Visualizza i nomi brevi corrispondenti a quelli estesi non-8.3\n\
+              Il formato è analogo a quello di  /N con inseriti i nomi brevi\n\
+              prima dei nomi lunghi. Se non c'è un nome breve vengono messi degli spazi\n\
+  /4          Visualizza gli anni su quattro cifre\n\n\
+Le selezioni possono trovarsi nella variabile di ambienteDIRCMD.  Sovrascrivi\n\
+le selezioni preimpostate mettendo - (trattino) prima della selezione per esempio, /-W.\n"
+
+STRING_DIR_HELP2, " Il Volume nel disco %c è %s\n"
+STRING_DIR_HELP3, " Il Volume nel disco %c non ha etichetta.\n"
+STRING_DIR_HELP4, " Il numero di serie del Volume è %04X-%04X\n"
+STRING_DIR_HELP5, "\n     Numero dei file elencati:\n%16i % 14s byte\n"
+STRING_DIR_HELP6, "%16i Cartelle% 15s byte\n"
+STRING_DIR_HELP7, "\n Cartelle di %s\n\n"
+STRING_DIR_HELP8, "%16i File% 14s byte\n"
+
+STRING_DIRSTACK_HELP1, "Salva la directory corrente per l'uso con il comando POPD, poi\n\
+cambia alla cartella indicata.\n\n\
+PUSHD [percorso | ..]\n\n\
+  percorso        Indica la cartella che deve diventare quella corrente\n"
+
+STRING_DIRSTACK_HELP2, "cambia alla cartella memorizzata da PUSHD.\n\nPOPD"
+
+STRING_DIRSTACK_HELP3, "Visualizza il contenuto dello stack delle cartelle.\n\nDIRS"
+
+STRING_DIRSTACK_HELP4, "Stack delle cartelle vuoto"
+
+STRING_ECHO_HELP1,  "Stampa un messaggio senza andare a capo.\n\n\
+  ECHOS messaggio"
+
+STRING_ECHO_HELP2,  "Stampa un messaggio sullo standard error.\n\n\
+  ECHOERR messagio\n\
+  ECHOERR.           Stampa una linea vuota"
+
+STRING_ECHO_HELP3, "Stampa un messaggio senza andare a capo sullo standard error.\n\n\
+  ECHOSERR messaggio"
+
+STRING_ECHO_HELP4, "Visualizza un messaggio o abilita e disabilita la\n\
+                    visualizzazione dei comandi.\n\n\
+  ECHO [ON | OFF]\n\
+  ECHO [messagio]\n\
+  ECHO.             Stampa una linea vuota\n\n\
+Usa ECHO senza parametri pr visualizzare lo stato attuale di ECHO."
+
+STRING_ECHO_HELP5, "ECHO è %s\n"
+
+STRING_EXIT_HELP, "Esce dall'interprete dei comandi.\n\n\
+  EXIT [/b] [ExitCode]\n\n\
+    /B            Esce solo dalle procedure batch.\n\
+                  Se eseguito al di fuori di un batch esce da cmd.exe\n\
+    ExitCode      Verrà assegnato a ERRORLEVEL"
+
+STRING_FOR_HELP1, "Esegue un comand specifico per ogni file indicato\n\n\
+FOR %variabile IN (listafile) DO comando [parametri]\n\n\
+  %variabile Indica un parametro sostituibile.\n\
+  (listafile)Indica un insieme di uno o piu' file. Si possono usare i\
+             caratteri jolly.\n\
+  comando    Indica un comando da eseguire per ogni file.\n\
+  parametri  Indica i parametri o le selezioni per il comando.\n\n\
+Per usare FOR in un batch usare %%variable invece di %variable.\n"
+
+STRING_FREE_HELP1, "\nIl Volume del disco %s è %-11s\n\
+ Il numero di serie è %s\n\
+  %16s bytes totali su disco \n\
+  %16s bytes usati\n\
+  %16s bytes liberi\n"
+
+STRING_FREE_HELP2, "Visualizza le informazioni sul disco.\n\nFREE [disco: ...]\n"
+
+STRING_IF_HELP1, "Esegue una elaborazione condizionale nei batch.\n\n\
+  IF [NOT] ERRORLEVEL numero comando\n\
+  IF [NOT] stringa1==stringa2 comando\n\
+  IF [NOT] EXIST nomefile comando\n\
+  IF [NOT] DEFINED variabile comando\n\n\
+NOT               Indica che il comando deve essere eseguito solo se \n\
+                  la condizione è falsa\n\
+ERRORLEVEL number La condizione è verificata se l'ultimo programma eseguito\n\
+                  ha lasciato un codice d'uscita maggiore o uguale a quello\n\
+                  indicato.\n\
+command           E' il comando da eseguire se la condizione è verificata.\n\
+string1==string2  E' verificata se sono uguali le due stringhe\n\
+EXIST nomefile    E' verificata se il file esiste.\n\
+DEFINED variabile E' verificata se la variabile è definita.\n"
+
+STRING_GOTO_HELP1,  "Porta l'esecuzione di un batch alla linea con l'etichetta\n\
+                     indicata.\n\n\
+GOTO etichetta\n\n\
+  etichetta  Indica il testo utilizzato come etichetta in un batch.\n\n\
+Nel batch questa deve trovarsi da sola in una linea con davanti due punti :.\n"
+
+STRING_LABEL_HELP1, "Visualizza o modifica l'etichetta di un disco.\n\n\
+LABEL [disco:][etichetta]\n"
+
+STRING_LABEL_HELP2, "Il Volume nel disco %c: è %s\n"
+STRING_LABEL_HELP3, "Il Volume nel disco %c: non ha etichetta\n"
+STRING_LABEL_HELP4, "Il numero di serie del Volume è %04X-%04X\n"
+STRING_LABEL_HELP5, "Etichetta del disco (11 Caratteri, INVIO per nessuna)? "
+
+STRING_LOCALE_HELP1, "L'ora attuale è"
+
+STRING_MKDIR_HELP,   "Crea una directory.\n\n\
+MKDIR [disco:]percorso\n\
+MD    [disco:]percorso"
+
+STRING_MEMMORY_HELP1, "Visualizza la quantità della memoria di sistema.\n\n\
+MEMORY"
+
+STRING_MEMMORY_HELP2, "\n  %12s%% carico di memoria.\n\n\
+  %13s byte RAM fisica totale.\n\
+  %13s byte RAM fisica disponibile.\n\n\
+  %13s byte file di paginazione totale.\n\
+  %13s byte file di paginazione disponibile.\n\n\
+  %13s byte memoria virtuale totale.\n\
+  %13s byte memoria virtuale totale disponibile.\n"
+
+STRING_MISC_HELP1, "Premi un tasto per continuare...\n"
+
+STRING_MOVE_HELP1, "Sovrascrivi %s (Si/No/Tutti)? "
+
+STRING_MOVE_HELP2, "Sposta i file o cambia il nome a file e cartelle.\n\n\
+Per spostare uno o piu' file:\n\
+MOVE [/N][disco:][percorso]nomefile1[,...] destinazione\n\n\
+To rename a directory:\n\
+MOVE [/N][disco:][percorso]]cartella1 cartella2\n\n\
+  [disco:][percorso]nomefile1  indica la posizione e il nome del file\n\
+                               o dei file da spostare.\n\
+  /N                           Nulla. Effettua il comando ma senza alterare\n\
+                               file e cartelle.\n\n\
+Limitazioni attuali:\n\
+  - Non è possibile spostare file e cartelle da un disco a un altero.\n"
+
+STRING_MSGBOX_HELP, "Visualizza un messaggio e restituisce la risposta\n\
+dell'utente\n\n\
+MSGBOX tipo ['titolo'] messaggio\n\n\
+tipo          bottone visualizzato\n\
+              i valori possibili sono: OK, OKCANCEL,\n\
+              YESNO, YESNOCANCEL\n\
+titolo        titolo della finestra di dialogo\n\
+messaggio     testo visualizzato\n\n\n\
+ERRORLEVEL assume il valore in funzione del bottone premuto:\n\n\
+YES  :  10    |  NO      :  11\n\
+OK   :  10    |  CANCEL  :  12\n"
+
+STRING_PATH_HELP1, "visualizza o imposta i percorsi di ricerca per\n\
+gli eseguibili.\n\n\
+PATH [[disco:][percorso[;...]]\n\
+PATH ;\n\n\
+Usa PATH ; per rimuovere tutti i percorsi di ricerca e indicare all'interprete\n\
+dei comandi di cercare solo nella cartella corrente\n\
+PATH senza parametri visualizza i percorsi attualmente impostati.\n"
+
+STRING_PROMPT_HELP1, "Modifica il messaggio di pronto a eseguire comandi.\n\n\
+PROMPT [testo]\n\n\
+  testo   Indica il nuovo messaggio.\n\n\
+Può essere composto da un testo qualunque e dai seguenti codici speciali:\n\n\
+  $A   & (E commerciale)\n\
+  $B   | (pipe)\n\
+  $C   ( (parentesi sinistra)\n\
+  $D   Data attuale\n\
+  $E   Codice del carattere Escape (ASCII code 27)\n\
+  $F   ) (parentesi destra)\n\
+  $G   > (simbolo di maggiore di)\n\
+  $H   Backspace (cancella il carattere precedente)\n\
+  $L   < (simbolo di minore di)\n\
+  $N   Disco corrente\n\
+  $P   Disco e percorso corrente\n\
+  $Q   = (simbolo di uguale)\n\
+  $T   Ora attuale\n\
+  $V   Versione del sistema operativo\n\
+  $_   CR LF (a capo)\n\
+  $$   $ (simbolo dollaro)\n"
+
+STRING_PAUSE_HELP1, "Ferma l'esecuzione del batch e mostra il seguente messaggio:\n\
+'Premi un tasto per continuare...' o il messaggio indicato.\n\n\
+PAUSE [messaggio]"
+
+STRING_PROMPT_HELP2, "  $+   Mostra la profondità attuale dello stack delle cartelle"
+
+STRING_PROMPT_HELP3, "\nUsa PROMPT senza parametri per attivare quello predefinito."
+
+STRING_REM_HELP, "Inizia una linea di commento.\n\n\
+REM [Commento]"
+
+STRING_RMDIR_HELP,   "Cancella una cartella.\n\n\
+RMDIR [disco:]percorso\nRD [disco:]percorso\n\
+/S			cancella tutti i file e le cartelle indicate\n\
+/Q			non chiede conferma\n"
+STRING_RMDIR_HELP2,	"La cartella non è vuota!\n"
+
+STRING_REN_HELP1, "Rinomina file/cartella or file/cartelle.\n\n\
+RENAME [/E /N /P /Q /S /T] vecchi_onome ... novo_nome\n\
+REN    [/E /N /P /Q /S /T] vecchi_onome ... novo_nome\n\n\
+  /E    Nessun messaggio di errore.\n\
+  /N    Nulla.\n\
+  /P    Chiede conferma per ogni file.\n\
+        (Non implementato!)\n\
+  /Q    Silente.\n\
+  /S    Rinomina le sottocartelle.\n\
+  /T    Visualizza il numero totale di file rinominati.\n\n\
+Non è possibile indicare un nuovo disco o percorso nella destinazione.\n\
+Usare il comando MOVE.\n"
+
+STRING_REN_HELP2, "    %lu file rinominato\n"
+
+STRING_REN_HELP3, "    %lu files rinominati\n"
+		 
+STRING_SHIFT_HELP, "Cambia la posizione dei parametri in un batch.\n\n\
+SHIFT [DOWN]"
+
+STRING_SCREEN_HELP, "muove il cursore e opzionalmente stampa del testo\n\n\
+SCREEN riga colonna [testo]\n\n\
+  riga        riga a cui portare il cursore\n\
+  colonna     colonna a cui portare il cursore"
+
+STRING_SET_HELP, "Visualizza, assegna o rimuove le variabili di ambiente.\n\n\
+SET [variabile[=][stringa]]\n\n\
+  variabile Indica il nome della variabile.\n\
+  stringa   Indica il testo da assegnare alla variabile.\n\n\
+Usa SET senza parametri per visualizzare le variabili attuali.\n"
+
+STRING_START_HELP1, "Attiva un comando.\n\n\
+START comando\n\n\
+  comando     Indica il comando da eseguire.\n\n\
+Al momento tutti i comandi sono attivati in modo asincrono.\n"
+
+STRING_TITLE_HELP, "Assegna il titolo per la finestra dei comandi.\n\n\
+TITLE [stringa]\n\n\
+stringa      Indica il titolo.\n"
+
+STRING_TIME_HELP1, "Visualizza o assegna l'ora di sistema.\n\n\
+TIME [/T][ora]\n\n\
+  /T    Visualizza solo\n\n\
+Se TIME è usato senza parametri viene visualizzata l'ra attuale e richiesta\n\
+quella nuova. Premere INVIO per non modificarla.\n"
+
+STRING_TIME_HELP2, "Inserisci la nuova ora: "
+
+STRING_TIMER_HELP1, "Sono trascorsi %d millisecondi\n"
+
+STRING_TIMER_HELP2, "Sono trascorsi %02d%c%02d%c%02d%c%02d\n"
+
+STRING_TIMER_HELP3, "permette l'uso di dieci cronometri.\n\n\
+TIMER  [ON|OFF] [/S] [/n] [/Fn]\n\n\
+  ON          attiva il cronometro\n\
+  OFF         ferma il cronometro\n\
+  /S          tempo parziale. Restituisce il tempo attuale\n\
+              senza fermare il cronometro\n\
+  /n          Indica quale cronometro.\n\
+              Sono validi i numeri da 0 a 9\n\
+              Se non indicato è predefinito 1\n\
+  /Fn         tipo di formato \n\
+              n può essere:\n\
+                    0    millisecondi\n\
+                    1    hh%cmm%css%cdd\n\n\
+se non sono indicati ON, OFF o /S verrà commutato lo stato\n\
+del cronometro da attivo a fermo o viceversa\n\n"
+
+STRING_TYPE_HELP1, "Visualizza il contenuto di un file di testo.\n\n\
+TYPE [disco:][percorso]nomefile \n\
+  /P 		  Mostra una schermata alla volta.\n"
+
+STRING_VERIFY_HELP1, "Questo comando non è implementato!!\n\
+Attiva o disattiva la verifica automatica della scrittura dei file\n\
+su disco.\n\n\
+VERIFY [ON | OFF]\n\n\
+Usa VERIFY senza parametri per visualizzare l'impostazione corrente.\n"
+
+STRING_VERIFY_HELP2, "VERIFY è %s.\n"
+
+STRING_VERIFY_HELP3, "E' necessario indicare ON o OFF."
+
+STRING_VERSION_HELP1, "Visualizza la versione dell'interprete dei comandi\n\n\
+VER [/C][/R][/W]\n\n\
+  /C  Visualizza i crediti.\n\
+  /R  Visualizza le informazioni di redistribuzione.\n\
+  /W  Visualizza le informazioni di garanzia."
+
+STRING_VERSION_HELP2, " disponibile PRIVO DI OGNI GARANZIA; per i dettagli\n\
+usare: `ver /w'. Questo è software libero, e siete i benvenuti se lo distribuite\n\
+con alcune condizioni; usare `ver /r' per i dettagli. Usare `ver /c' per un\n\
+elenco dei crediti."
+
+STRING_VERSION_HELP3, "\n Questo programma e' distribuito con la speranza che possa essere utile,\n\
+ ma PRIVO DI OGNI GARANZIA; senza nemmeno una garanzia implicita di\n\
+ VENDIBILITA o ADEGUATEZZA PER UN PARTICOLARE SCOPO.  Vedere\n\
+ la 'GNU General Public License' per ulteriori dettagli."
+
+STRING_VERSION_HELP4, "\n Questo è software libero; potete distribuirlo e/o modificarlo\n\
+ nell'ambito della licenza 'GNU General Public License' così come pubblicata da \n\
+ Free Software Foundation; a scelta la versione 2 della licenza o una\n\
+ qualunque successiva.\n"
+
+STRING_VERSION_HELP5, "\nInviare le segnalazioni di anomalie a <ros-dev@reactos.org>.\n\
+Gli aggiornamenti sono disponibili presso: http://www.reactos.org"
+
+STRING_VERSION_HELP6, "\nVersione FreeDOS scritto da:\n"
+
+STRING_VERSION_HELP7, "\nVersione ReactOS scritto da:\n"
+
+STRING_VOL_HELP1, " Il Volume del disco %c: è %s"
+STRING_VOL_HELP2, " Il Volume del disco %c: non ha etichetta"
+STRING_VOL_HELP3, " Il numero diserie del Volume è %04X-%04X\n"
+STRING_VOL_HELP4, "Visualizza l'etichetta del volume del disco e il numero di serie se disponibili.\n\n\
+VOL [disco:]"
+
+STRING_WINDOW_HELP1, "cambia l'aspetto della finestra della console\n\n\
+WINDOW [/POS[=]sinistra,alto,larghezza,altezza]\n\
+              [MIN|MAX|RESTORE] ['titolo']\n\n\
+/POS          specify window placement and dimensions\n\
+MIN           minimizza la finestra\n\
+MAX           massimizzala finestra\n\
+RESTORE       ripristina la finestra"
+
+STRING_WINDOW_HELP2, "cambia l'aspetto della finestra della console\n\n\
+ACTIVATE 'window' [/POS[=]sinistra,alto,larghezza,altezza]\n\
+              [MIN|MAX|RESTORE] ['title']\n\n\
+window        finestra su cui eseguire l'azione\n\
+/POS          indica la posizione e la dimensione della finestra\n\
+MIN           minimizza la finestra\n\
+MAX           massimizzala finestra\n\
+RESTORE       ripristina la finestra\n\
+titolo        il nuovo titolo\n"
+
+
+STRING_HELP1, "Elenco di tutti i comandi disponibili (+ descrizione)\n\n\
+  comando /?   Per i dettagli su uno specifico comando\n\n\
+?        Elenco di tutti i comandi disponibili.\n\
+ALIAS    Imposta, toglie o visualizza gli alias.\n\
+ATTRIB   Visualizza o modifica gli attributi dei file.\n\
+BEEP     Segnale acustico.\n\
+CALL     Chiama un batch da un'altro.\n\
+CD       Visualizza il nome o modifica la cartella corrente.\n\
+CHCP     Visualizza o imposta il numero della tabella dei codici.\n\
+CHOICE   Aspetta che l'utente scelga una tra le opzioni disponibili.\n\
+CLS      Cancella lo schermo.\n\
+CMD      Esegue un altro interprete dei comandi.\n\
+COLOR    Imposta i colori della console.\n\
+COPY     Copia uno o piu' file in un'altra destinazione.\n\
+DATE     Visualizza o modifica la data.\n\
+DELETE   Cancella uno o piu' file.\n\
+DIR      Visualizza un elenco di file e sottocartelle in una cartella.\n\
+ECHO     Visualizza messaggi, o abilita e disabilita la visualizzazione dei comandi.\n\
+ERASE    Cancella uno o piu' file.\n\
+EXIT     Esce dall'interprete dei comandi.\n\
+FOR      Esegue un comando per ognuno dei file indicati.\n\
+FREE     Spazio libero.\n\
+GOTO     Salta a una etichettadurante l'esecuzione di un batch.\n\
+HELP     Fornisce informazioni sui comandi di ReactOS.\n\
+HISTORY  Elenco degli ultimi comandi usati\n\
+IF       Esegue elaborazioni condizionali in un batch.\n\
+LABEL    Crea, modifica, o cancella l'etichetta di un disco.\n\
+MD       Crea una cartella.\n\
+MKDIR    Crea una cartella.\n\
+MOVE     Muove uno o piu' file da una cartella a un'altra\n\
+PATH     Visualizza o imposta i percorsi di ricerca per gli eseguibili.\n\
+PAUSE    Ferma l'esecuzione di un batch e visualizza un messaggio.\n\
+POPD     Ripristina il valore precedente della cartella corrente salvato da\n\
+         PUSHD.\n\
+PROMPT   Cambia il messaggio di pronto per i comandi.\n\
+PUSHD    Salva la cartella corrente e poi la cambia.\n\
+RD       Rimuove una cartella.\n\
+REM      Commenti in un batch.\n\
+REN      Rinomina uno piu' file.\n\
+RENAME   Rinomina uno piu' file.\n\
+RMDIR    Rimuove una cartella.\n\
+SCREEN   Sposta il cursore e visualizza un testo.\n\
+SET      Visualizza, modifica, o cancella le variabili di ambiente.\n\
+SHIFT    Scorre la posizione dei parametri nei batch.\n"
+STRING_HELP2, "START    Apre una finestra separata ed esegue uno specifico comando.\n\
+TIME     Visualizza o modifica l'ora di sistema.\n\
+TIMER    Permette l'uso di cronometri.\n\
+TITLE    Imposta il titolo della finestra per una sessione di CMD.EXE.\n\
+TYPE     Visualizza il contenuto di un file di testo.\n\
+VER      Visualizza la versione di ReactOS.\n\
+VERIFY   Richiede che ReactOS verifichi che i file siano scritti correttamente\n\
+         su disco.\n\
+VOL      Visualizza l'etichetta del volume e il numero di serie del disco.\n"
+
+
+STRING_CHOICE_OPTION,         "SN"
+STRING_COPY_OPTION,           "SNT"
+
+
+STRING_ALIAS_ERROR,          "Linea di comando troppo lunga dopo l'espansione degli alias!\n"
+STRING_BATCH_ERROR,          "Errore durante l'apertura di un batch\n"
+STRING_CHCP_ERROR1,          "Tabella dei codici attiva: %u\n"
+STRING_CHCP_ERROR4,          "Tabella dei codici non valida\n"
+STRING_CHOICE_ERROR,         "Opzione non valida. Formato atteso: /C[:]opzioni"
+STRING_CHOICE_ERROR_TXT,     "Opzione non valida. Formato atteso: /T[:]c,nn"
+STRING_CHOICE_ERROR_OPTION,  "Opzione non valida: %s"
+STRING_MD_ERROR,             "Una cartella o file esiste già.\n"
+STRING_MD_ERROR2,            "Il percorso della nuova cartella non esiste.\n"
+STRING_CMD_ERROR1,           "Impossibile ridirigere dal file %s\n"
+STRING_CMD_ERROR2,           "Errore nella creazione del file temporaneo per la ridirezione\n"
+STRING_CMD_ERROR3,           "Impossibile ridirigere nel file %s\n"
+STRING_CMD_ERROR4,           "Esecuzione di %s...\n"
+STRING_CMD_ERROR5,           "Esecuzione di cmdexit.bat...\n"
+STRING_COLOR_ERROR1,         "Il colore di primo piano e sfondo non possono essere uguali"
+STRING_COLOR_ERROR2,         "errore nella indicazione dei colori"
+STRING_COLOR_ERROR3,         "Colore %x\n"
+STRING_COLOR_ERROR4,         "i colori non possono essere uguali!"
+STRING_CONSOLE_ERROR,        "errore sconosciuto: %d\n"
+STRING_COPY_ERROR1,          "Errore: Impossibile aprire il file sorgente - %s!\n"
+STRING_COPY_ERROR2,          "Errore: Impossibile copiare un file su se stesso!\n"
+STRING_COPY_ERROR3,          "Errore durante la scrittura della destinazione!\n"
+STRING_COPY_ERROR4,          "Errore: Non ancora implementato!\n"
+STRING_DATE_ERROR,           "Data non valida."
+STRING_DEL_ERROR5,           "Il file %s sarà cancellato! "
+STRING_DEL_ERROR6,           "Sei sicuro (S/N)?"
+STRING_DEL_ERROR7,           "Cancellazione di: %s\n"
+STRING_ERROR_ERROR1,         "Errore sconosciuto! Codice errore: 0x%lx\n"
+STRING_ERROR_ERROR2,         "Errore di sintassi"
+STRING_FOR_ERROR1,           "'in' mancante nella istruzione for."
+STRING_FOR_ERROR2,           "Parentesi mancanti."
+STRING_FOR_ERROR3,           "'do' mancante." 
+STRING_FOR_ERROR4,           "nessuno comando dopo 'do'."
+STRING_FREE_ERROR1,          "Disco non valido"
+STRING_FREE_ERROR2,          "non etichettato"
+STRING_GOTO_ERROR1,          "Nessuna etichetta indicata per GOTO"
+STRING_GOTO_ERROR2,          "Etichetta '%s' non trovata\n"
+
+STRING_MOVE_ERROR1,          "[OK]\n"
+STRING_MOVE_ERROR2,          "[Errore]\n"
+
+STRING_REN_ERROR1,           "MoveFile() fallita. Errore: %lu\n"
+
+STRING_START_ERROR1,         "Nessun supporto ai batch al momento!"
+
+STRING_TIME_ERROR1,          "Ora non valida."
+
+STRING_TYPE_ERROR1,          "Opzione '/%s' non valida\n"
+
+STRING_WINDOW_ERROR1,        "finestra non trovata"
+
+
+STRING_ERROR_PARAMETERF_ERROR,     "Formato del parametro errato - %c\n"
+STRING_ERROR_INVALID_SWITCH,       "Selezione non valida - /%c\n"
+STRING_ERROR_TOO_MANY_PARAMETERS,  "Troppi parametri - %s\n"
+STRING_ERROR_PATH_NOT_FOUND,       "Percorso non trovato\n"
+STRING_ERROR_FILE_NOT_FOUND,       "File non trovato\n"
+STRING_ERROR_REQ_PARAM_MISSING,    "Parametro obbligatorio mancante\n"
+STRING_ERROR_INVALID_DRIVE,        "Disco non valido\n"
+STRING_ERROR_INVALID_PARAM_FORMAT, "Formato dei parametri non valido - %s\n"
+STRING_ERROR_BADCOMMAND,           "Comando o nome di file errato\n"
+STRING_ERROR_OUT_OF_MEMORY,        "Errore di memoria esaurita.\n"
+STRING_ERROR_CANNOTPIPE,           "Errore!  Impossibile ridirigere!  Impossibile aprire un file temporaneo!\n"
+STRING_ERROR_D_PAUSEMSG,           "Premi un tasto per continuare . . ."
+STRING_ERROR_DRIVER_NOT_READY,     "Disco non pronto"
+
+STRING_PATH_ERROR,                 "CMD: Non nell'ambiente '%s'\n"
+
+STRING_CMD_SHELLINFO,              "\nInterprete di linea di comando di ReactOS"
+STRING_VERSION_RUNVER,             " in esecuzione su %s"
+STRING_COPY_FILE ,                 "        %d file copiati\n"
+STRING_DELETE_WIPE,                "resi illeggibili"
+STRING_FOR_ERROR,                  "variabile non valida."
+STRING_SCREEN_COL,                 "valore non valido per colonna"
+STRING_SCREEN_ROW,                 "valore non valido per riga"
+STRING_TIMER_TIME                  "Timer %d è %s: "
+
+STRING_INVALID_OPERAND,            "Operando non valido."
+STRING_EXPECTED_CLOSE_PAREN,       "Attesa una ')'."
+STRING_EXPECTED_NUMBER_OR_VARIABLE,"Attesa un numero o un nome di variabile."
+STRING_SYNTAX_COMMAND_INCORRECT,   "La sintassi del comando è errata."
+
+}

From 088891d47e873779845bf3892bbbeb7e3da83241 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sat, 13 Jan 2007 19:15:12 +0000
Subject: [PATCH 36/36] Add hit-testing for caption buttons.

svn path=/trunk/; revision=25443
---
 reactos/dll/cpl/desk/preview.c | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/reactos/dll/cpl/desk/preview.c b/reactos/dll/cpl/desk/preview.c
index ae83c1b06b9..f7a72b9c579 100644
--- a/reactos/dll/cpl/desk/preview.c
+++ b/reactos/dll/cpl/desk/preview.c
@@ -3,7 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        lib/cpl/desk/preview.c
  * PURPOSE:     Draws the preview control
- * COPYRIGHT:   Copyright 2006 Eric Kohl
+ * COPYRIGHT:   Copyright 2006, 2007 Eric Kohl
  */
 
 #include "desk.h"
@@ -37,9 +37,11 @@ typedef struct _PREVIEW_DATA
     RECT rcDesktop;
     RECT rcInactiveFrame;
     RECT rcInactiveCaption;
+    RECT rcInactiveCaptionButtons;
 
     RECT rcActiveFrame;
     RECT rcActiveCaption;
+    RECT rcActiveCaptionButtons;
     RECT rcActiveMenuBar;
     RECT rcSelectedMenuItem;
     RECT rcActiveClient;
@@ -47,6 +49,7 @@ typedef struct _PREVIEW_DATA
 
     RECT rcDialogFrame;
     RECT rcDialogCaption;
+    RECT rcDialogCaptionButtons;
     RECT rcDialogClient;
 
     RECT rcDialogButton;
@@ -215,6 +218,12 @@ OnSize(INT cx, INT cy, PPREVIEW_DATA pPreviewData)
     pPreviewData->rcInactiveCaption.right = pPreviewData->rcInactiveFrame.right - pPreviewData->cxEdge - 1/*3*/ - 1;
     pPreviewData->rcInactiveCaption.bottom = pPreviewData->rcInactiveFrame.top + pPreviewData->cyCaption /*20*/ + 2;
 
+    /* Calculate the inactive caption buttons rectangle */
+    pPreviewData->rcInactiveCaptionButtons.left = pPreviewData->rcInactiveCaption.right - 2 - 2 - 3 * 16;
+    pPreviewData->rcInactiveCaptionButtons.top = pPreviewData->rcInactiveCaption.top + 2;
+    pPreviewData->rcInactiveCaptionButtons.right = pPreviewData->rcInactiveCaption.right - 2;
+    pPreviewData->rcInactiveCaptionButtons.bottom = pPreviewData->rcInactiveCaption.bottom - 2;
+
     /* Calculate the active window rectangle */
     pPreviewData->rcActiveFrame.left = pPreviewData->rcInactiveFrame.left + 3 + 1;
     pPreviewData->rcActiveFrame.top = pPreviewData->rcInactiveCaption.bottom + 1;
@@ -227,6 +236,12 @@ OnSize(INT cx, INT cy, PPREVIEW_DATA pPreviewData)
     pPreviewData->rcActiveCaption.right = pPreviewData->rcActiveFrame.right - 3 - 1;
     pPreviewData->rcActiveCaption.bottom = pPreviewData->rcActiveFrame.top + pPreviewData->cyCaption/*20*/ + 2;
 
+    /* Calculate the active caption buttons rectangle */
+    pPreviewData->rcActiveCaptionButtons.left = pPreviewData->rcActiveCaption.right - 2 - 2 - 3 * 16;
+    pPreviewData->rcActiveCaptionButtons.top = pPreviewData->rcActiveCaption.top + 2;
+    pPreviewData->rcActiveCaptionButtons.right = pPreviewData->rcActiveCaption.right - 2;
+    pPreviewData->rcActiveCaptionButtons.bottom = pPreviewData->rcActiveCaption.bottom - 2;
+
     /* Calculate the active menu bar rectangle */
     pPreviewData->rcActiveMenuBar.left = pPreviewData->rcActiveFrame.left + 3 + 1;
     pPreviewData->rcActiveMenuBar.top = pPreviewData->rcActiveCaption.bottom + 1;
@@ -258,6 +273,12 @@ OnSize(INT cx, INT cy, PPREVIEW_DATA pPreviewData)
     pPreviewData->rcDialogCaption.right = pPreviewData->rcDialogFrame.right - 3;
     pPreviewData->rcDialogCaption.bottom = pPreviewData->rcDialogFrame.top + 20 + 1;
 
+    /* Calculate the inactive caption buttons rectangle */
+    pPreviewData->rcDialogCaptionButtons.left = pPreviewData->rcDialogCaption.right - 2 - 16;
+    pPreviewData->rcDialogCaptionButtons.top = pPreviewData->rcDialogCaption.top + 2;
+    pPreviewData->rcDialogCaptionButtons.right = pPreviewData->rcDialogCaption.right - 2;
+    pPreviewData->rcDialogCaptionButtons.bottom = pPreviewData->rcDialogCaption.bottom - 2;
+
     /* Calculate the dialog client rectangle */
     pPreviewData->rcDialogClient.left = pPreviewData->rcDialogFrame.left + 3;
     pPreviewData->rcDialogClient.top = pPreviewData->rcDialogCaption.bottom + 1;
@@ -368,6 +389,8 @@ OnLButtonDown(HWND hwnd, int xPos, int yPos, PPREVIEW_DATA pPreviewData)
     if (PtInRect(&pPreviewData->rcInactiveCaption, pt))
         type = IDX_INACTIVE_CAPTION;
 
+    if (PtInRect(&pPreviewData->rcInactiveCaptionButtons, pt))
+        type = IDX_CAPTION_BUTTON;
 
     if (PtInRect(&pPreviewData->rcActiveFrame, pt))
         type = IDX_ACTIVE_BORDER;
@@ -375,6 +398,9 @@ OnLButtonDown(HWND hwnd, int xPos, int yPos, PPREVIEW_DATA pPreviewData)
     if (PtInRect(&pPreviewData->rcActiveCaption, pt))
         type = IDX_ACTIVE_CAPTION;
 
+    if (PtInRect(&pPreviewData->rcActiveCaptionButtons, pt))
+        type = IDX_CAPTION_BUTTON;
+
     if (PtInRect(&pPreviewData->rcActiveMenuBar, pt))
         type = IDX_MENU;
 
@@ -387,13 +413,15 @@ OnLButtonDown(HWND hwnd, int xPos, int yPos, PPREVIEW_DATA pPreviewData)
     if (PtInRect(&pPreviewData->rcActiveScroll, pt))
         type = IDX_SCROLLBAR;
 
-
     if (PtInRect(&pPreviewData->rcDialogFrame, pt))
         type = IDX_DIALOG;
 
     if (PtInRect(&pPreviewData->rcDialogCaption, pt))
         type = IDX_ACTIVE_CAPTION;
 
+    if (PtInRect(&pPreviewData->rcDialogCaptionButtons, pt))
+        type = IDX_CAPTION_BUTTON;
+
     if (PtInRect(&pPreviewData->rcDialogButton, pt))
         type = IDX_3D_OBJECTS;