Index: trunk/src/NTDLL/makefile
===================================================================
--- trunk/src/NTDLL/makefile	(revision 1894)
+++ trunk/src/NTDLL/makefile	(revision 1895)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.13 1999-11-10 14:14:50 sandervl Exp $
+# $Id: makefile,v 1.14 1999-11-30 19:42:09 sandervl Exp $
 
 #
@@ -10,4 +10,5 @@
 PDWIN32_LIB = ..\..\lib
 PDWIN32_BIN = ..\..\bin
+PDWIN32_TOOLS = ..\..\tools\bin
 
 
@@ -43,11 +44,15 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) sbsstub.obj $(TARGET).def $(PDWIN32_LIB)\kernel32.lib $(PDWIN32_LIB)\user32.lib $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) sbsstub.obj $(TARGET).def $(PDWIN32_LIB)\kernel32.lib $(PDWIN32_LIB)\user32.lib $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
 # PMWINX.LIB LIBULS.LIB LIBCONV.LIB
         $(CP) $@ $(PDWIN32_BIN)
 
-$(TARGET).lib: $(TARGET).def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $**
-        $(CP) $@ $(PDWIN32_LIB)
+$(TARGET).lib: $(TARGET)exp.def
+        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
+
+#SvL: Doesn't work. So use fixed one for now..... (TODO)
+#$(TARGET)exp.def: $(TARGET).def
+#        $(IMPDEF) $** $@
 
 
Index: trunk/src/NTDLL/ntdll.def
===================================================================
--- trunk/src/NTDLL/ntdll.def	(revision 1894)
+++ trunk/src/NTDLL/ntdll.def	(revision 1895)
@@ -1,3 +1,3 @@
-; $Id: ntdll.def,v 1.23 1999-11-10 14:14:51 sandervl Exp $
+; $Id: ntdll.def,v 1.24 1999-11-30 19:42:09 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -6,21 +6,4 @@
 DATA MULTIPLE NONSHARED
 
-IMPORTS
-    fwd_RtlUnwind                    =  KERNEL32.RtlUnwind
-    fwd_memmove                      =  KERNEL32.memmove
-    fwd_RtlFillMemory                =  KERNEL32.RtlFillMemory
-    fwd_RtlMoveMemory                =  KERNEL32.RtlMoveMemory
-    fwd_RtlZeroMemory                =  KERNEL32.RtlZeroMemory
-    fwd_RtlInitializeCriticalSection =  KERNEL32.InitializeCriticalSection
-    fwd_RtlLeaveCriticalSection      =  KERNEL32.LeaveCriticalSection
-    fwd_RtlEnterCriticalSection      =  KERNEL32.EnterCriticalSection
-    fwd_RtlDeleteCriticalSection     =  KERNEL32.DeleteCriticalSection
-
-    _lstrncmpW@12                    =  KERNEL32.lstrncmpW
-    _lstrncmpiA@12                   =  KERNEL32.lstrncmpiA
-    _lstrncmpiW@12                   =  KERNEL32.lstrncmpiW
-    HEAP_strdupW                     =  KERNEL32.HEAP_strdupW
-    HEAP_strdupWtoA                  =  KERNEL32.HEAP_strdupWtoA
-
 EXPORTS
 
@@ -29,12 +12,8 @@
 ; -------------------
 
-    RtlUnwind                    =  fwd_RtlUnwind
-    RtlFillMemory                =  fwd_RtlFillMemory
-    RtlMoveMemory                =  fwd_RtlMoveMemory
-    RtlZeroMemory                =  fwd_RtlZeroMemory
-    RtlInitializeCriticalSection =  fwd_RtlInitializeCriticalSection
-    RtlLeaveCriticalSection      =  fwd_RtlLeaveCriticalSection
-    RtlEnterCriticalSection      =  fwd_RtlEnterCriticalSection
-    RtlDeleteCriticalSection     =  fwd_RtlDeleteCriticalSection
+    RtlFillMemory              = _RtlFillMemory@12           @588
+    RtlMoveMemory              = _RtlMoveMemory@12           @589
+    RtlUnwind                  = RtlUnwindAsm                   @590
+    RtlZeroMemory              = _RtlZeroMemory@8            @591
 
 ; unknown
@@ -46,150 +25,150 @@
 ; real functions
     NtAlertThread                 = _NtAlertThread@8                  @57
-    ZwAlertThread                 = _NtAlertThread@8
+    ZwAlertThread                 = _NtAlertThread@8                  @700
     NtAllocateUuids               = _NtAllocateUuids@16               @59
-    ZwAllocateUuids               = _NtAllocateUuids@16
+    ZwAllocateUuids               = _NtAllocateUuids@16		      @701
     NtTestAlert                   = _NtTestAlert@8                    @232
-    ZwTestAlert                   = _NtTestAlert@8
+    ZwTestAlert                   = _NtTestAlert@8		      @702
     NtWriteRequestData            = _NtWriteRequestData@20            @246
-    ZwWriteRequestData            = _NtWriteRequestData@20
+    ZwWriteRequestData            = _NtWriteRequestData@20	      @703
     NtImpersonateClientOfPort     = _NtImpersonateClientOfPort@16     @112
-    ZwImpersonateClientOfPort     = _NtImpersonateClientOfPort@16
+    ZwImpersonateClientOfPort     = _NtImpersonateClientOfPort@16     @704
     NtQuerySystemTime             = _NtQuerySystemTime@4              @169
-    ZwQuerySystemTime             = _NtQuerySystemTime@4
+    ZwQuerySystemTime             = _NtQuerySystemTime@4              @705
     NtReadRequestData             = _NtReadRequestData@20             @178
-    ZwReadRequestData             = _NtReadRequestData@20
+    ZwReadRequestData             = _NtReadRequestData@20             @706
 
     NtReplyPort                   = _NtReplyPort@16                   @187
-    ZwReplyPort                   = _NtReplyPort@16
+    ZwReplyPort                   = _NtReplyPort@16                   @707
     NtReplyWaitReplyPort          = _NtReplyWaitReplyPort@16          @189
-    ZwReplyWaitReplyPort          = _NtReplyWaitReplyPort@16
+    ZwReplyWaitReplyPort          = _NtReplyWaitReplyPort@16          @708
     NtRequestPort                 = _NtRequestPort@16                 @190
-    ZwRequestPort                 = _NtRequestPort@16
+    ZwRequestPort                 = _NtRequestPort@16                 @709
 
 
     NtOpenFile                    = _NtOpenFile@24                    @127
-    ZwOpenFile                    = _NtOpenFile@24
+    ZwOpenFile                    = _NtOpenFile@24                    @710
     NtCreateFile                  = _NtCreateFile@44                  @73
-    ZwCreateFile                  = _NtCreateFile@44
-    NtReadFile                    = _NtReadFile@36
-    ZwReadFile                    = _NtReadFile@36
+    ZwCreateFile                  = _NtCreateFile@44                  @711
+    NtReadFile                    = _NtReadFile@36                    @712
+    ZwReadFile                    = _NtReadFile@36                    @713
     NtDeviceIoControlFile         = _NtDeviceIoControlFile@40         @94
-    ZwDeviceIoControlFile         = _NtDeviceIoControlFile@40
+    ZwDeviceIoControlFile         = _NtDeviceIoControlFile@40         @714
     NtFsControlFile               = _NtFsControlFile@40               @108
-    ZwFsControlFile               = _NtFsControlFile@40
-    NtSetVolumeInformationFile    = _NtSetVolumeInformationFile@16
-    ZwSetVolumeInformationFile    = _NtSetVolumeInformationFile@16
-    NtQueryInformationFile        = _NtQueryInformationFile@20
-    ZwQueryInformationFile        = _NtQueryInformationFile@20
-    NtSetInformationFile          = _NtSetInformationFile@20
-    ZwSetInformationFile          = _NtSetInformationFile@20
-    NtQueryDirectoryFile          = _NtQueryDirectoryFile@44
-    ZwQueryDirectoryFile          = _NtQueryDirectoryFile@44
+    ZwFsControlFile               = _NtFsControlFile@40               @715
+    NtSetVolumeInformationFile    = _NtSetVolumeInformationFile@16    @716
+    ZwSetVolumeInformationFile    = _NtSetVolumeInformationFile@16    @717
+    NtQueryInformationFile        = _NtQueryInformationFile@20        @718
+    ZwQueryInformationFile        = _NtQueryInformationFile@20        @719
+    NtSetInformationFile          = _NtSetInformationFile@20          @720
+    ZwSetInformationFile          = _NtSetInformationFile@20          @721
+    NtQueryDirectoryFile          = _NtQueryDirectoryFile@44          @722 
+    ZwQueryDirectoryFile          = _NtQueryDirectoryFile@44          @723
     NtClose                       = _NtClose@4                        @65
-    ZwClose                       = _NtClose@4
+    ZwClose                       = _NtClose@4 			      @724
     NtCreateTimer                 = _NtCreateTimer@16                 @87
-    ZwCreateTimer                 = _NtCreateTimer@16
+    ZwCreateTimer                 = _NtCreateTimer@16                 @725
     NtSetTimer                    = _NtSetTimer@28                    @221
-    ZwSetTimer                    = _NtSetTimer@28
-    NtQueryTimerResolution        = _NtQueryTimerResolution@12
-    ZwQueryTimerResolution        = _NtQueryTimerResolution@12
-    NtTerminateProcess            = _NtTerminateProcess@8
-    ZwTerminateProcess            = _NtTerminateProcess@8
-    NtQueryInformationProcess     = _NtQueryInformationProcess@20
-    ZwQueryInformationProcess     = _NtQueryInformationProcess@20
+    ZwSetTimer                    = _NtSetTimer@28                    @726
+    NtQueryTimerResolution        = _NtQueryTimerResolution@12        @727
+    ZwQueryTimerResolution        = _NtQueryTimerResolution@12        @728
+    NtTerminateProcess            = _NtTerminateProcess@8             @729
+    ZwTerminateProcess            = _NtTerminateProcess@8             @730
+    NtQueryInformationProcess     = _NtQueryInformationProcess@20     @731
+    ZwQueryInformationProcess     = _NtQueryInformationProcess@20     @732
     NtSetInformationProcess       = _NtSetInformationProcess@16       @207
-    ZwSetInformationProcess       = _NtSetInformationProcess@16
-    NtResumeThread                = _NtResumeThread@8
-    ZwResumeThread                = _NtResumeThread@8
-    NtTerminateThread             = _NtTerminateThread@8
-    ZwTerminateThread             = _NtTerminateThread@8
-    NtQueryInformationThread      = _NtQueryInformationThread@20
-    ZwQueryInformationThread      = _NtQueryInformationThread@20
-    NtSetInformationThread        = _NtSetInformationThread@16
-    ZwSetInformationThread        = _NtSetInformationThread@16
-    NtDuplicateToken              = _NtDuplicateToken@24
-    ZwDuplicateToken              = _NtDuplicateToken@24
-    NtOpenProcessToken            = _NtOpenProcessToken@12
-    ZwOpenProcessToken            = _NtOpenProcessToken@12
-    NtOpenThreadToken             = _NtOpenThreadToken@16
-    ZwOpenThreadToken             = _NtOpenThreadToken@16
-    NtAdjustPrivilegesToken       = _NtAdjustPrivilegesToken@24
-    ZwAdjustPrivilegesToken       = _NtAdjustPrivilegesToken@24
+    ZwSetInformationProcess       = _NtSetInformationProcess@16       @733
+    NtResumeThread                = _NtResumeThread@8                 @734
+    ZwResumeThread                = _NtResumeThread@8                 @735
+    NtTerminateThread             = _NtTerminateThread@8              @736
+    ZwTerminateThread             = _NtTerminateThread@8              @737
+    NtQueryInformationThread      = _NtQueryInformationThread@20      @738
+    ZwQueryInformationThread      = _NtQueryInformationThread@20      @739
+    NtSetInformationThread        = _NtSetInformationThread@16        @740
+    ZwSetInformationThread        = _NtSetInformationThread@16        @741
+    NtDuplicateToken              = _NtDuplicateToken@24              @742
+    ZwDuplicateToken              = _NtDuplicateToken@24              @743
+    NtOpenProcessToken            = _NtOpenProcessToken@12            @744
+    ZwOpenProcessToken            = _NtOpenProcessToken@12            @745 
+    NtOpenThreadToken             = _NtOpenThreadToken@16             @746
+    ZwOpenThreadToken             = _NtOpenThreadToken@16             @747
+    NtAdjustPrivilegesToken       = _NtAdjustPrivilegesToken@24       @748
+    ZwAdjustPrivilegesToken       = _NtAdjustPrivilegesToken@24       @749
     NtQueryInformationToken       = _NtQueryInformationToken@20       @156
-    ZwQueryInformationToken       = _NtQueryInformationToken@20
-    NtCreateSection               = _NtCreateSection@28
-    ZwCreateSection               = _NtCreateSection@28
-    NtOpenSection                 = _NtOpenSection@12
-    ZwOpenSection                 = _NtOpenSection@12
-    NtQuerySection                = _NtQuerySection@20
-    ZwQuerySection                = _NtQuerySection@20
-    NtMapViewOfSection            = _NtMapViewOfSection@40
-    ZwMapViewOfSection            = _NtMapViewOfSection@40
-    NtCreatePort                  = _NtCreatePort@20
-    ZwCreatePort                  = _NtCreatePort@20
-    NtConnectPort                 = _NtConnectPort@32
-    ZwConnectPort                 = _NtConnectPort@32
-    NtListenPort                  = _NtListenPort@8
-    ZwListenPort                  = _NtListenPort@8
-    NtAcceptConnectPort           = _NtAcceptConnectPort@24
-    ZwAcceptConnectPort           = _NtAcceptConnectPort@24
-    NtCompleteConnectPort         = _NtCompleteConnectPort@4
-    ZwCompleteConnectPort         = _NtCompleteConnectPort@4
-    NtRegisterThreadTerminatePort = _NtRegisterThreadTerminatePort@4
-    ZwRegisterThreadTerminatePort = _NtRegisterThreadTerminatePort@4
-    NtRequestWaitReplyPort        = _NtRequestWaitReplyPort@12
-    ZwRequestWaitReplyPort        = _NtRequestWaitReplyPort@12
-    NtReplyWaitReceivePort        = _NtReplyWaitReceivePort@16
-    ZwReplyWaitReceivePort        = _NtReplyWaitReceivePort@16
-    NtSetIntervalProfile          = _NtSetIntervalProfile@8
-    ZwSetIntervalProfile          = _NtSetIntervalProfile@8
-    NtQueryPerformanceCounter     = _NtQueryPerformanceCounter@8
-    ZwQueryPerformanceCounter     = _NtQueryPerformanceCounter@8
-    NtCreateMailslotFile          = _NtCreateMailslotFile@32
-    ZwCreateMailslotFile          = _NtCreateMailslotFile@32
+    ZwQueryInformationToken       = _NtQueryInformationToken@20       @750
+    NtCreateSection               = _NtCreateSection@28               @751
+    ZwCreateSection               = _NtCreateSection@28               @752
+    NtOpenSection                 = _NtOpenSection@12                 @753
+    ZwOpenSection                 = _NtOpenSection@12                 @754
+    NtQuerySection                = _NtQuerySection@20                @755
+    ZwQuerySection                = _NtQuerySection@20                @756
+    NtMapViewOfSection            = _NtMapViewOfSection@40            @757
+    ZwMapViewOfSection            = _NtMapViewOfSection@40            @758
+    NtCreatePort                  = _NtCreatePort@20                  @759
+    ZwCreatePort                  = _NtCreatePort@20                  @760
+    NtConnectPort                 = _NtConnectPort@32                 @761
+    ZwConnectPort                 = _NtConnectPort@32                 @762
+    NtListenPort                  = _NtListenPort@8                   @763
+    ZwListenPort                  = _NtListenPort@8                   @764
+    NtAcceptConnectPort           = _NtAcceptConnectPort@24           @765
+    ZwAcceptConnectPort           = _NtAcceptConnectPort@24           @766
+    NtCompleteConnectPort         = _NtCompleteConnectPort@4          @767
+    ZwCompleteConnectPort         = _NtCompleteConnectPort@4          @768
+    NtRegisterThreadTerminatePort = _NtRegisterThreadTerminatePort@4  @769
+    ZwRegisterThreadTerminatePort = _NtRegisterThreadTerminatePort@4  @770
+    NtRequestWaitReplyPort        = _NtRequestWaitReplyPort@12        @771
+    ZwRequestWaitReplyPort        = _NtRequestWaitReplyPort@12        @772
+    NtReplyWaitReceivePort        = _NtReplyWaitReceivePort@16        @773
+    ZwReplyWaitReceivePort        = _NtReplyWaitReceivePort@16        @774
+    NtSetIntervalProfile          = _NtSetIntervalProfile@8           @775
+    ZwSetIntervalProfile          = _NtSetIntervalProfile@8           @776
+    NtQueryPerformanceCounter     = _NtQueryPerformanceCounter@8      @777
+    ZwQueryPerformanceCounter     = _NtQueryPerformanceCounter@8      @778
+    NtCreateMailslotFile          = _NtCreateMailslotFile@32          @779
+    ZwCreateMailslotFile          = _NtCreateMailslotFile@32          @780
     NtQuerySystemInformation      = _NtQuerySystemInformation@16      @95
-    ZwQuerySystemInformation      = _NtQuerySystemInformation@16
-    NtCreatePagingFile            = _NtCreatePagingFile@16
-    ZwCreatePagingFile            = _NtCreatePagingFile@16
-    NtDisplayString               = _NtDisplayString@4
-    ZwDisplayString               = _NtDisplayString@4
-
-    NtCreateSemaphore             = _NtCreateSemaphore@20
-    ZwCreateSemaphore             = _NtCreateSemaphore@20
-    NtOpenSemaphore               = _NtOpenSemaphore@12
-    ZwOpenSemaphore               = _NtOpenSemaphore@12
-    NtQuerySemaphore              = _NtQuerySemaphore@20
-    ZwQuerySemaphore              = _NtQuerySemaphore@20
-    NtReleaseSemaphore            = _NtReleaseSemaphore@12
-    ZwReleaseSemaphore            = _NtReleaseSemaphore@12
-    NtCreateEvent                 = _NtCreateEvent@20
-    ZwCreateEvent                 = _NtCreateEvent@20
-    NtOpenEvent                   = _NtOpenEvent@12
-    ZwOpenEvent                   = _NtOpenEvent@12
-    NtSetEvent                    = _NtSetEvent@8
-    ZwSetEvent                    = _NtSetEvent@8
+    ZwQuerySystemInformation      = _NtQuerySystemInformation@16      @781
+    NtCreatePagingFile            = _NtCreatePagingFile@16            @782
+    ZwCreatePagingFile            = _NtCreatePagingFile@16            @783
+    NtDisplayString               = _NtDisplayString@4                @784
+    ZwDisplayString               = _NtDisplayString@4                @785
+
+    NtCreateSemaphore             = _NtCreateSemaphore@20             @786
+    ZwCreateSemaphore             = _NtCreateSemaphore@20             @787
+    NtOpenSemaphore               = _NtOpenSemaphore@12               @788
+    ZwOpenSemaphore               = _NtOpenSemaphore@12               @789
+    NtQuerySemaphore              = _NtQuerySemaphore@20              @790
+    ZwQuerySemaphore              = _NtQuerySemaphore@20              @791
+    NtReleaseSemaphore            = _NtReleaseSemaphore@12            @792
+    ZwReleaseSemaphore            = _NtReleaseSemaphore@12            @793
+    NtCreateEvent                 = _NtCreateEvent@20                 @794
+    ZwCreateEvent                 = _NtCreateEvent@20                 @795
+    NtOpenEvent                   = _NtOpenEvent@12                   @796
+    ZwOpenEvent                   = _NtOpenEvent@12                   @797
+    NtSetEvent                    = _NtSetEvent@8                     @798
+    ZwSetEvent                    = _NtSetEvent@8                     @799
     NtResetEvent                  = _NtResetEvent@4                   @192
-    ZwResetEvent                  = _NtResetEvent@4
+    ZwResetEvent                  = _NtResetEvent@4                   @800
 
     NtQueryObject                 = _NtQueryObject@20                 @161
-    ZwQueryObject                 = _NtQueryObject@20
-    NtQuerySecurityObject         = _NtQuerySecurityObject@20
-    ZwQuerySecurityObject         = _NtQuerySecurityObject@20
-    NtDuplicateObject             = _NtDuplicateObject@28
-    ZwDuplicateObject             = _NtDuplicateObject@28
-    NtWaitForSingleObject         = _NtWaitForSingleObject@12
-    ZwWaitForSingleObject         = _NtWaitForSingleObject@12
+    ZwQueryObject                 = _NtQueryObject@20                 @801
+    NtQuerySecurityObject         = _NtQuerySecurityObject@20         @802
+    ZwQuerySecurityObject         = _NtQuerySecurityObject@20         @803
+    NtDuplicateObject             = _NtDuplicateObject@28             @804
+    ZwDuplicateObject             = _NtDuplicateObject@28             @805
+    NtWaitForSingleObject         = _NtWaitForSingleObject@12         @806
+    ZwWaitForSingleObject         = _NtWaitForSingleObject@12         @807
     NtOpenDirectoryObject         = _NtOpenDirectoryObject@12         @124
-    ZwOpenDirectoryObject         = _NtOpenDirectoryObject@12
-    NtCreateDirectoryObject       = _NtCreateDirectoryObject@12
-    ZwCreateDirectoryObject       = _NtCreateDirectoryObject@12
+    ZwOpenDirectoryObject         = _NtOpenDirectoryObject@12         @808
+    NtCreateDirectoryObject       = _NtCreateDirectoryObject@12       @809
+    ZwCreateDirectoryObject       = _NtCreateDirectoryObject@12       @810
     NtQueryDirectoryObject        = _NtQueryDirectoryObject@28        @149
-    ZwQueryDirectoryObject        = _NtQueryDirectoryObject@28
-    NtOpenSymbolicLinkObject      = _NtQuerySymbolicLinkObject@12
-    ZwOpenSymbolicLinkObject      = _NtQuerySymbolicLinkObject@12
-    NtCreateSymbolicLinkObject    = _NtCreateSymbolicLinkObject@16
-    ZwCreateSymbolicLinkObject    = _NtCreateSymbolicLinkObject@16
-    NtQuerySymbolicLinkObject     = _NtQuerySymbolicLinkObject@12
-    ZwQuerySymbolicLinkObject     = _NtQuerySymbolicLinkObject@12
+    ZwQueryDirectoryObject        = _NtQueryDirectoryObject@28        @811
+    NtOpenSymbolicLinkObject      = _NtQuerySymbolicLinkObject@12     @812
+    ZwOpenSymbolicLinkObject      = _NtQuerySymbolicLinkObject@12     @813
+    NtCreateSymbolicLinkObject    = _NtCreateSymbolicLinkObject@16    @814
+    ZwCreateSymbolicLinkObject    = _NtCreateSymbolicLinkObject@16    @815
+    NtQuerySymbolicLinkObject     = _NtQuerySymbolicLinkObject@12     @816
+    ZwQuerySymbolicLinkObject     = _NtQuerySymbolicLinkObject@12     @817
 
     NtCreateKey                   = _NtCreateKey@28
@@ -241,20 +220,20 @@
     RtlCopySid                    = _RtlCopySid@12                    @302
     RtlCreateSecurityDescriptor   = _RtlCreateSecurityDescriptor@8    @313
-    RtlValidSecurityDescriptor    = _RtlValidSecurityDescriptor@4
-    RtlLengthSecurityDescriptor   = _RtlLengthSecurityDescriptor@4
-    RtlGetDaclSecurityDescriptor  = _RtlGetDaclSecurityDescriptor@16
+    RtlValidSecurityDescriptor    = _RtlValidSecurityDescriptor@4     @600
+    RtlLengthSecurityDescriptor   = _RtlLengthSecurityDescriptor@4    @601
+    RtlGetDaclSecurityDescriptor  = _RtlGetDaclSecurityDescriptor@16  @602
     RtlSetDaclSecurityDescriptor  = _RtlSetDaclSecurityDescriptor@16  @483
-    RtlGetSaclSecurityDescriptor  = _RtlGetSaclSecurityDescriptor@16
-    RtlSetSaclSecurityDescriptor  = _RtlSetSaclSecurityDescriptor@16
+    RtlGetSaclSecurityDescriptor  = _RtlGetSaclSecurityDescriptor@16  @603
+    RtlSetSaclSecurityDescriptor  = _RtlSetSaclSecurityDescriptor@16  @604
     RtlGetOwnerSecurityDescriptor = _RtlGetOwnerSecurityDescriptor@12 @488
     RtlSetOwnerSecurityDescriptor = _RtlSetOwnerSecurityDescriptor@12 @487
     RtlSetGroupSecurityDescriptor = _RtlSetGroupSecurityDescriptor@12 @485
-    RtlGetGroupSecurityDescriptor = _RtlGetGroupSecurityDescriptor@12
+    RtlGetGroupSecurityDescriptor = _RtlGetGroupSecurityDescriptor@12 @605
     RtlCreateAcl                  = _RtlCreateAcl@12                  @306
     RtlFirstFreeAce               = _RtlFirstFreeAce@8                @370
     RtlAddAce                     = _RtlAddAce@20                     @260
-    RtlAddAccessAllowedAce        = _RtlAddAccessAllowedAce@16
-    RtlGetAce                     = _RtlGetAce@12
-    RtlAdjustPrivilege            = _RtlAdjustPrivilege@16
+    RtlAddAccessAllowedAce        = _RtlAddAccessAllowedAce@16        @606
+    RtlGetAce                     = _RtlGetAce@12                     @607
+    RtlAdjustPrivilege            = _RtlAdjustPrivilege@16            @608
 
     RtlAnsiStringToUnicodeString  = _RtlAnsiStringToUnicodeString@12  @269
@@ -373,5 +352,5 @@
 ; Note: CDECL does not decorate the function names with parameter bytes!
 
-    _CIpow                       = _NTDLL__CIpow                     @749
+    _CIpow                       = _NTDLL__CIpow                     @349
     _ftol                        = _NTDLL__ftol                      @864
     _ltoa                        = _NTDLL__ltoa                      @866
@@ -414,5 +393,5 @@
     memcmp                        = _NTDLL_memcmp                    @904
     memcpy                        = _NTDLL_memcpy                    @905
-    memmove                       = fwd_memmove                              @906
+    memmove                       = _OS2memmove                              @906
     memset                        = _NTDLL_memset                    @907
     pow                           = _NTDLL_pow                       @908
Index: trunk/src/NTDLL/ntdllexp.def
===================================================================
--- trunk/src/NTDLL/ntdllexp.def	(revision 1895)
+++ trunk/src/NTDLL/ntdllexp.def	(revision 1895)
@@ -0,0 +1,233 @@
+;Internal export definition file - autogenerated by ImpDef.
+LIBRARY NTDLL INITINSTANCE TERMINSTANCE
+EXPORTS
+    _RtlFillMemory@12                         @588
+    _RtlMoveMemory@12                         @589
+    RtlUnwindAsm                              @590
+    _RtlZeroMemory@8                          @591
+    _RtlLargeIntegerToChar@16                 @425
+    _NtAlertThread@8                          @57
+    _ZwAlertThread@8                          @700
+    _NtAllocateUuids@16                       @59
+    _ZwAllocateUuids@16                       @701
+    _NtTestAlert@8                            @232
+    _ZwTestAlert@8                            @702
+    _NtWriteRequestData@20                    @246
+    _ZwWriteRequestData@20                    @703
+    _NtImpersonateClientOfPort@16             @112
+    _ZwImpersonateClientOfPort@16             @704
+    _NtQuerySystemTime@4                      @169
+    _ZwQuerySystemTime@4                      @705
+    _NtReadRequestData@20                     @178
+    _ZwReadRequestData@20                     @706
+    _NtReplyPort@16                           @187
+    _ZwReplyPort@16                           @707
+    _NtReplyWaitReplyPort@16                  @189
+    _ZwReplyWaitReplyPort@16                  @708
+    _NtRequestPort@16                         @190
+    _ZwRequestPort@16                         @709
+    _NtOpenFile@24                            @127
+    _ZwOpenFile@24                            @710
+    _NtCreateFile@44                          @73
+    _ZwCreateFile@44                          @711
+    _NtReadFile@36                            @712
+    _ZwReadFile@36                            @713
+    _NtDeviceIoControlFile@40                 @94
+    _ZwDeviceIoControlFile@40                 @714
+    _NtFsControlFile@40                       @108
+    _ZwFsControlFile@40                       @715
+    _NtSetVolumeInformationFile@16            @716
+    _ZwSetVolumeInformationFile@16            @717
+    _NtQueryInformationFile@20                @718
+    _ZwQueryInformationFile@20                @719
+    _NtSetInformationFile@20                  @720
+    _ZwSetInformationFile@20                  @721
+    _NtQueryDirectoryFile@44                  @722
+    _ZwQueryDirectoryFile@44                  @723
+    _NtClose@4                                @65
+    _ZwClose@4                                @724
+    _NtCreateTimer@16                         @87
+    _ZwCreateTimer@16                         @725
+    _NtSetTimer@28                            @221
+    _ZwSetTimer@28                            @726
+    _NtQueryTimerResolution@12                @727
+    _ZwQueryTimerResolution@12                @728
+    _NtTerminateProcess@8                     @729
+    _ZwTerminateProcess@8                     @730
+    _NtQueryInformationProcess@20             @731
+    _ZwQueryInformationProcess@20             @732
+    _NtSetInformationProcess@16               @207
+    _ZwSetInformationProcess@16               @733
+    _NtResumeThread@8                         @734
+    _ZwResumeThread@8                         @735
+    _NtTerminateThread@8                      @736
+    _ZwTerminateThread@8                      @737
+    _NtQueryInformationThread@20              @738
+    _ZwQueryInformationThread@20              @739
+    _NtSetInformationThread@16                @740
+    _ZwSetInformationThread@16                @741
+    _NtDuplicateToken@24                      @742
+    _ZwDuplicateToken@24                      @743
+    _NtOpenProcessToken@12                    @744
+    _ZwOpenProcessToken@12                    @745
+    _NtOpenThreadToken@16                     @746
+    _ZwOpenThreadToken@16                     @747
+    _NtAdjustPrivilegesToken@24               @748
+    _ZwAdjustPrivilegesToken@24               @749
+    _NtQueryInformationToken@20               @156
+    _ZwQueryInformationToken@20               @750
+    _NtCreateSection@28                       @751
+    _ZwCreateSection@28                       @752
+    _NtOpenSection@12                         @753
+    _ZwOpenSection@12                         @754
+    _NtQuerySection@20                        @755
+    _ZwQuerySection@20                        @756
+    _NtMapViewOfSection@40                    @757
+    _ZwMapViewOfSection@40                    @758
+    _NtCreatePort@20                          @759
+    _ZwCreatePort@20                          @760
+    _NtConnectPort@32                         @761
+    _ZwConnectPort@32                         @762
+    _NtListenPort@8                           @763
+    _ZwListenPort@8                           @764
+    _NtAcceptConnectPort@24                   @765
+    _ZwAcceptConnectPort@24                   @766
+    _NtCompleteConnectPort@4                  @767
+    _ZwCompleteConnectPort@4                  @768
+    _NtRegisterThreadTerminatePort@4          @769
+    _ZwRegisterThreadTerminatePort@4          @770
+    _NtRequestWaitReplyPort@12                @771
+    _ZwRequestWaitReplyPort@12                @772
+    _NtReplyWaitReceivePort@16                @773
+    _ZwReplyWaitReceivePort@16                @774
+    _NtSetIntervalProfile@8                   @775
+    _ZwSetIntervalProfile@8                   @776
+    _NtQueryPerformanceCounter@8              @777
+    _ZwQueryPerformanceCounter@8              @778
+    _NtCreateMailslotFile@32                  @779
+    _ZwCreateMailslotFile@32                  @780
+    _NtQuerySystemInformation@16              @95
+    _ZwQuerySystemInformation@16              @781
+    _NtCreatePagingFile@16                    @782
+    _ZwCreatePagingFile@16                    @783
+    _NtDisplayString@4                        @784
+    _ZwDisplayString@4                        @785
+    _NtCreateSemaphore@20                     @786
+    _ZwCreateSemaphore@20                     @787
+    _NtOpenSemaphore@12                       @788
+    _ZwOpenSemaphore@12                       @789
+    _NtQuerySemaphore@20                      @790
+    _ZwQuerySemaphore@20                      @791
+    _NtReleaseSemaphore@12                    @792
+    _ZwReleaseSemaphore@12                    @793
+    _NtCreateEvent@20                         @794
+    _ZwCreateEvent@20                         @795
+    _NtOpenEvent@12                           @796
+    _ZwOpenEvent@12                           @797
+    _NtSetEvent@8                             @798
+    _ZwSetEvent@8                             @799
+    _NtResetEvent@4                           @192
+    _ZwResetEvent@4                           @800
+    _NtQueryObject@20                         @161
+    _ZwQueryObject@20                         @801
+    _NtQuerySecurityObject@20                 @802
+    _ZwQuerySecurityObject@20                 @803
+    _NtDuplicateObject@28                     @804
+    _ZwDuplicateObject@28                     @805
+    _NtWaitForSingleObject@12                 @806
+    _ZwWaitForSingleObject@12                 @807
+    _NtOpenDirectoryObject@12                 @124
+    _ZwOpenDirectoryObject@12                 @808
+    _NtCreateDirectoryObject@12               @809
+    _ZwCreateDirectoryObject@12               @810
+    _NtQueryDirectoryObject@28                @149
+    _ZwQueryDirectoryObject@28                @811
+    _NtOpenSymbolicLinkObject@12              @812
+    _ZwOpenSymbolicLinkObject@12              @813
+    _NtCreateSymbolicLinkObject@16            @814
+    _ZwCreateSymbolicLinkObject@16            @815
+    _NtQuerySymbolicLinkObject@12             @816
+    _ZwQuerySymbolicLinkObject@12             @817
+    _NtOpenKey@12                             @129
+    _RtlAllocateAndInitializeSid@44           @265
+    _RtlConvertSidToUnicodeString@12          @296
+    _RtlEqualSid@8                            @352
+    _RtlFreeSid@4                             @376
+    _RtlLengthRequiredSid@4                   @427
+    _RtlLengthSid@4                           @429
+    _RtlInitializeSid@12                      @410
+    _RtlSubAuthoritySid@8                     @497
+    _RtlSubAuthorityCountSid@4                @496
+    _RtlCopySid@12                            @302
+    _RtlCreateSecurityDescriptor@8            @313
+    _RtlValidSecurityDescriptor@4             @600
+    _RtlLengthSecurityDescriptor@4            @601
+    _RtlGetDaclSecurityDescriptor@16          @602
+    _RtlSetDaclSecurityDescriptor@16          @483
+    _RtlGetSaclSecurityDescriptor@16          @603
+    _RtlSetSaclSecurityDescriptor@16          @604
+    _RtlGetOwnerSecurityDescriptor@12         @488
+    _RtlSetOwnerSecurityDescriptor@12         @487
+    _RtlSetGroupSecurityDescriptor@12         @485
+    _RtlGetGroupSecurityDescriptor@12         @605
+    _RtlCreateAcl@12                          @306
+    _RtlFirstFreeAce@8                        @370
+    _RtlAddAce@20                             @260
+    _RtlAddAccessAllowedAce@16                @606
+    _RtlGetAce@12                             @607
+    _RtlAdjustPrivilege@16                    @608
+    _RtlAnsiStringToUnicodeString@12          @269
+    _RtlOemStringToUnicodeString@12           @447
+    _RtlMultiByteToUnicodeN@20                @446
+    _RtlOemToUnicodeN@20                      @448
+    _RtlInitAnsiString@8                      @399
+    _RtlInitString@8                          @402
+    _RtlInitUnicodeString@8                   @403
+    _RtlFreeUnicodeString@4                   @377
+    _RtlUnicodeStringToOemString@12           @511
+    _RtlUnicodeToMultiByteN@20                @513
+    _RtlUnicodeToOemN@20                      @515
+    _RtlUnicodeStringToAnsiString@12          @507
+    _RtlUpcaseUnicodeString@12                @520
+    _RtlxOemStringToUnicodeSize@4             @549
+    _RtlxAnsiStringToUnicodeSize@4            @548
+    _RtlIsTextUnicode@12                      @417
+    _RtlInitializeResource@4                  @409
+    _RtlDeleteResource@4                      @330
+    _RtlAcquireResourceExclusive@8            @256
+    _RtlAcquireResourceShared@8               @257
+    _RtlReleaseResource@4                     @471
+    _RtlDumpResource@4                        @340
+    _RtlCreateHeap@24                         @309
+    _RtlAllocateHeap@12                       @266
+    _RtlFreeHeap@12                           @374
+    _RtlDestroyHeap@4                         @333
+    _RtlSizeHeap@12                           @493
+    _RtlNormalizeProcessParams@4              @441
+    _RtlNtStatusToDosError@4                  @442
+    _RtlDosPathNameToNtPathName_U@16          @338
+    _RtlSystemTimeToLocalTime@8               @500
+    _RtlTimeToSecondsSince1970@8              @503
+    _RtlTimeToSecondsSince1980@8              @504
+    _RtlSecondsSince1970ToTime@8              @476
+    _RtlSecondsSince1980ToTime@8              @477
+    _RtlCopyLuid@8                            @321
+    _RtlLargeIntegerDivide@20                 @462
+    _RtlLargeIntegerAdd@16                    @460
+    _RtlEnlargedIntegerMultiply@8             @371
+    _RtlEnlargedUnsignedMultiply@8            @373
+    _RtlEnlargedUnsignedDivide@16             @372
+    _RtlExtendedLargeIntegerDivide@16         @390
+    _RtlExtendedMagicDivide@20                @391
+    _RtlExtendedIntegerMultiply@12            @389
+    _RtlLargeIntegerShiftLeft@12              @464
+    _RtlLargeIntegerShiftRight@12             @465
+    _RtlLargeIntegerArithmeticShift@12        @461
+    _RtlLargeIntegerNegate@8                  @463
+    _RtlLargeIntegerSubtract@16               @466
+    _RtlConvertLongToLargeInteger@4           @316
+    _RtlConvertUlongToLargeInteger@4          @320
+    _chkstk                                   @946
+    DbgBreakPoint                             @20
+    DbgUserBreakPoint                         @28
+    _DbgPrint                                 @21
