advapi32 compiles OK.

Build number auto-generated (see apps/buildno, include/reactos/version.h,
include/reactos/buildno.h).
include/internal/version.h moved in include/reactos.
Added default search paths for includes in .rc rule (rules.mak).

svn path=/trunk/; revision=756

diff --git a/reactos/Makefile b/reactos/Makefile
index 11ece2b..d4581b8 100644 (file)
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -15,8 +15,8 @@ include rules.mak
 # Required to run the system
 #
 COMPONENTS = iface_native ntoskrnl
-DLLS = ntdll kernel32 crtdll fmifs gdi32 psxdll
-#DLLS = advapi32 mingw32 user32
+DLLS = ntdll kernel32 crtdll advapi32 fmifs gdi32 psxdll
+#DLLS = mingw32 user32
 SUBSYS = smss win32k
 #SUBSYS = csrss
 
@@ -44,11 +44,13 @@ KERNEL_SERVICES = $(DEVICE_DRIVERS) $(FS_DRIVERS)
 APPS = args hello shell test cat bench
 # APPS = cmd
 
-all: $(COMPONENTS) $(DLLS) $(SUBSYS) $(LOADERS) $(KERNEL_SERVICES) $(APPS)
+all: buildno $(COMPONENTS) $(DLLS) $(SUBSYS) $(LOADERS) $(KERNEL_SERVICES) $(APPS)
+
 .PHONY: all
 
-clean: $(COMPONENTS:%=%_clean) $(DLLS:%=%_clean) $(LOADERS:%=%_clean) \
+clean: buildno_clean $(COMPONENTS:%=%_clean) $(DLLS:%=%_clean) $(LOADERS:%=%_clean) \
        $(KERNEL_SERVICES:%=%_clean) $(SUBSYS:%=%_clean) $(APPS:%=%_clean)
+       
 .PHONY: clean
 
 floppy: make_floppy_dirs autoexec_floppy $(COMPONENTS:%=%_floppy) \
@@ -60,6 +62,21 @@ dist: clean_dist_dir make_dist_dirs $(COMPONENTS:%=%_dist) $(DLLS:%=%_dist) \
       $(LOADERS:%=%_dist) $(KERNEL_SERVICES:%=%_dist) $(SUBSYS:%=%_dist) \
       $(APPS:%=%_dist)
 
+#
+# Build number generator
+#
+buildno: include/reactos/version.h
+       make -C apps/buildno
+
+buildno_clean:
+       make -C apps/buildno clean
+
+buildno_floppy:
+
+buildno_dist:
+
+.PHONY: buildno buildno_clean buildno_floppy buildno_dist
+
 #
 # Applications
 #

diff --git a/reactos/apps/utils/buildno/Makefile b/reactos/apps/utils/buildno/Makefile
new file mode 100644 (file)
index 0000000..845b0e2
--- /dev/null
+++ b/reactos/apps/utils/buildno/Makefile
@@ -0,0 +1,26 @@
+# $Id: Makefile,v 1.1 1999/11/07 08:03:21 ea Exp $
+#
+
+BASE_CFLAGS = -I../../include
+TARGETNAME=buildno
+CLEAN_FILES= $(TARGETNAME).o $(TARGETNAME).exe $(TARGETNAME).sym
+
+all: $(TARGETNAME)$(EXE_POSTFIX)
+       $(TARGETNAME)$(EXE_POSTFIX) -q
+
+$(TARGETNAME)$(EXE_POSTFIX): $(TARGETNAME).o
+       $(CC) -o $(TARGETNAME)$(EXE_POSTFIX) $(TARGETNAME).o
+       $(NM) --numeric-sort $(TARGETNAME)$(EXE_POSTFIX) > $(TARGETNAME).sym
+
+$(TARGETNAME).o: $(TARGETNAME).c ../../include/reactos/version.h
+
+clean: $(CLEAN_FILES:%=%_clean)
+
+$(CLEAN_FILES:%=%_clean): %_clean:
+       - $(RM) $*
+
+.phony: clean $(CLEAN_FILES:%=%_clean)
+
+include ../../rules.mak
+
+# EOF

diff --git a/reactos/apps/utils/buildno/buildno.c b/reactos/apps/utils/buildno/buildno.c
new file mode 100644 (file)
index 0000000..9d08dfd
--- /dev/null
+++ b/reactos/apps/utils/buildno/buildno.c
@@ -0,0 +1,262 @@
+/* $Id: buildno.c,v 1.1 1999/11/07 08:03:21 ea Exp $
+ *
+ * buildno - Generate the build number for ReactOS
+ *
+ * Copyright (c) 1999 Emanuele Aliberti
+ *
+ *
+ * It assumes the last release date is defined in
+ * <reactos/version.h> as a macro named
+ *
+ * KERNEL_RELEASE_DATE
+ *
+ * as a 32-bit unsigned long YYYYDDMM (UTC).
+ *
+ * The build number is the number of full days
+ * elapsed since the last release date (UTC).
+ *
+ * The build number is stored in the file
+ * <reactos/buildno.h> as a set of macros:
+ *
+ * KERNEL_VERSION_BUILD
+ * KERNEL_VERSION_BUILD_STR
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <reactos/version.h>
+
+#define FALSE 0
+#define TRUE  1
+
+/* File to (over)write */
+#define BUILDNO_INCLUDE_FILE "../../include/reactos/buildno.h"
+
+static char * argv0 = "";
+
+
+int
+elapsed_days (
+       time_t  t_today,
+       time_t  t_release_day
+       )
+{
+       double  seconds = difftime (t_today, t_release_day);
+       double  days = seconds / (double) 86400.0;
+       char    buf [32];
+       char    * dot = buf;
+
+       sprintf (buf, "%f", days );
+
+       while ( *dot && *dot != '.') ++dot;
+       *dot = '\0';
+       
+       return atol (buf);
+}
+
+void
+write_h (int build)
+{
+       FILE    *h = NULL;
+
+       h = fopen ( BUILDNO_INCLUDE_FILE, "w");
+       if (!h) 
+       {
+               fprintf (
+                       stderr,
+                       "%s: can not create file \"%s\"!\n",
+                       argv0,
+                       BUILDNO_INCLUDE_FILE
+                       );
+               return;
+       }
+       fprintf (
+               h,
+               "/* Do not edit - Machine generated */\n"
+               );
+       
+       fprintf (h, "#ifndef _INC_REACTOS_BUILDNO\n" );
+       fprintf (h, "#define _INC_REACTOS_BUILDNO\n" );
+
+       fprintf (
+               h,
+               "#define KERNEL_VERSION_BUILD\t%d\n",
+               build
+               );
+       fprintf (
+               h,
+               "#define KERNEL_VERSION_BUILD_STR\t\"%d\"\n",
+               build
+               );
+       fprintf (
+               h,
+               "#define KERNEL_RELEASE_RC\t\"%d.%d.%d.%d\\0\"\n",
+               KERNEL_VERSION_MAJOR,
+               KERNEL_VERSION_MINOR,
+               KERNEL_VERSION_PATCH_LEVEL,
+               build
+               );
+       fprintf (
+               h,
+               "#define KERNEL_RELEASE_STR\t\"%d.%d.%d.%d\"\n",
+               KERNEL_VERSION_MAJOR,
+               KERNEL_VERSION_MINOR,
+               KERNEL_VERSION_PATCH_LEVEL,
+               build
+               );
+       fprintf (
+               h,
+               "#define KERNEL_VERSION_RC\t\"%d.%d.%d\\0\"\n",
+               KERNEL_VERSION_MAJOR,
+               KERNEL_VERSION_MINOR,
+               KERNEL_VERSION_PATCH_LEVEL
+               );
+       fprintf (
+               h,
+               "#define KERNEL_VERSION_STR\t\"%d.%d.%d\"\n", 
+               KERNEL_VERSION_MAJOR,
+               KERNEL_VERSION_MINOR,
+               KERNEL_VERSION_PATCH_LEVEL
+               );
+       fprintf (
+               h,
+               "#endif\n/* EOF */\n"
+               );
+       
+       fclose (h);
+}
+
+void
+usage (void)
+{
+       fprintf (
+               stderr,
+               "Usage: %s [-q]\n",
+               argv0
+               );
+       exit (EXIT_SUCCESS);
+}
+
+
+int
+main (int argc, char * argv [])
+{
+       int             quiet = FALSE;
+
+       int             year = 0;
+       int             month = 0;
+       int             day = 0;
+       int             build = 0;
+
+       time_t          t0 = 0;
+       struct tm       t0_tm = {0};
+       time_t          t1 = 0;
+       struct tm       * t1_tm = NULL;
+
+       argv0 = argv[0];
+               
+       switch (argc)
+       {
+               case 1:
+                       break;
+               case 2:
+                       if (argv[1][0] == '-')
+                       {
+                               if (argv[1][1] == 'q')
+                               {
+                                       quiet = TRUE;
+                               }
+                               else
+                               {
+                                       usage ();
+                               }
+                       }
+                       else
+                       {
+                               usage ();
+                       }
+                       break;
+               default:
+                       usage ();
+       }
+       /*
+        * We are building TODAY!
+        */
+       time (& t0);
+       /*
+        * "Parse" the release date.
+        */
+       day = KERNEL_RELEASE_DATE % 100;
+       month = (       (       KERNEL_RELEASE_DATE
+                               % 10000
+                               )
+                               - day
+                       )
+                       / 100;
+       year =
+               (       KERNEL_RELEASE_DATE
+                       - (month * 100)
+                       - day
+                       )
+                       / 10000;
+       if (FALSE == quiet)
+       {
+               printf ( "\n\
+ReactOS Build Number Generator\n\n\
+Last release: %4d-%02d-%02d\n",
+                       year,
+                       month,
+                       day
+                       );
+       }
+       t0_tm.tm_year = year - ((year > 1999) ? 2000 : 1900);
+       t0_tm.tm_mon = month;
+       t0_tm.tm_mday = day;
+       
+       t0 = mktime (& t0_tm);
+
+       time (& t1); /* current build time */
+       t1_tm = gmtime (& t1);
+
+       t1_tm->tm_year +=
+               (t1_tm->tm_year < 70)
+               ? 2000
+               : 1900;
+       if (FALSE == quiet)
+       {
+               printf ( 
+                       "Current date: %4d-%02d-%02d\n\n",
+                       t1_tm->tm_year,
+                       t1_tm->tm_mon,
+                       t1_tm->tm_mday
+                       );
+       }
+       /*
+        * Compute delta days.
+        */
+       build = elapsed_days (t1, t0);
+
+       if (FALSE == quiet)
+       {
+               printf (
+                       "Build number: %d (elapsed days since last release)\n",
+                       build
+                       );
+               printf (
+                       "ROS Version : %d.%d.%d.%d\n",
+                       KERNEL_VERSION_MAJOR,
+                       KERNEL_VERSION_MINOR,
+                       KERNEL_VERSION_PATCH_LEVEL,
+                       build
+                       );
+       }
+       /*
+        * (Over)write the include file.
+        */
+       write_h (build);
+
+       return EXIT_SUCCESS;
+}
+
+
+/* EOF */

diff --git a/reactos/include/defines.h b/reactos/include/defines.h
index 7d5c497..0f22c59 100644 (file)
--- a/reactos/include/defines.h
+++ b/reactos/include/defines.h
@@ -5160,6 +5160,19 @@ DECLARE_HANDLE(HANDLE);
 #define IMAGE_DOS_SIGNATURE    (0x5a4d) /* e_magic field */
 #define IMAGE_NT_SIGNATURE     (0x4550) /* nt_signature field */
 
+/* To mark direction in formal parameters list */
+
+#ifndef IN
+#define IN
+#endif
+#ifndef OUT
+#define OUT
+#endif
+#ifndef OPTIONAL
+#define OPTIONAL
+#endif
+
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

diff --git a/reactos/include/internal/version.h b/reactos/include/internal/version.h
deleted file mode 100644 (file)
index ec042a2..0000000
--- a/reactos/include/internal/version.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     ReactOS kernel
- * FILE:        include/internal/version.h
- * PURPOSE:     Defines the current version
- * PROGRAMMER:  David Welch (welch@mcmail.com)
- */
-
-#ifndef __VERSION_H
-#define __VERSION_H
-
-#define KERNEL_VERSION   "0.0.14"
-#define KERNEL_MAJOR_VERSION    0
-#define KERNEL_MINOR_VERSION    0
-#define KERNEL_PATCH_LEVEL      14
-
-#endif

diff --git a/reactos/include/reactos/resource.h b/reactos/include/reactos/resource.h
index 20efd00..6dd93ef 100644 (file)
--- a/reactos/include/reactos/resource.h
+++ b/reactos/include/reactos/resource.h
@@ -1,30 +1,32 @@
 #ifndef _INC_REACTOS_RESOURCE_H
 #define _INC_REACTOS_RESOURCE_H
+#include <reactos/version.h>
+#include <reactos/buildno.h>
 
 /* Global File Version UINTs */
 
-#define RES_UINT_FV_MAJOR      0
-#define RES_UINT_FV_MINOR      0
-#define RES_UINT_FV_REVISION   14
+#define RES_UINT_FV_MAJOR      KERNEL_VERSION_MAJOR
+#define RES_UINT_FV_MINOR      KERNEL_VERSION_MINOR
+#define RES_UINT_FV_REVISION   KERNEL_VERSION_PATCH_LEVEL
 /* Build number as YYYYMMDD */
-#define RES_UINT_FV_BUILD      19991024
+#define RES_UINT_FV_BUILD      KERNEL_VERSION_BUILD
 
 /* ReactOS Product Version UINTs */
 
-#define RES_UINT_PV_MAJOR      0
-#define RES_UINT_PV_MINOR      0
-#define RES_UINT_PV_REVISION   14
+#define RES_UINT_PV_MAJOR      KERNEL_VERSION_MAJOR
+#define RES_UINT_PV_MINOR      KERNEL_VERSION_MINOR
+#define RES_UINT_PV_REVISION   KERNEL_VERSION_PATCH_LEVEL
 /* Build number as YYYYMMDD */
-#define RES_UINT_PV_BUILD      19990606
+#define RES_UINT_PV_BUILD      0
 
 /* Common version strings for rc scripts */
 
 #define RES_STR_COMPANY_NAME   "ReactOS Development Team\0"
 #define RES_STR_LEGAL_COPYRIGHT        "Copyright (c) 1998, 1999 ReactOS Team\0"
 #define RES_STR_PRODUCT_NAME   "ReactOS Operating System\0"
-#define RES_STR_PRODUCT_VERSION        "post 0.0.14\0"
+#define RES_STR_PRODUCT_VERSION        KERNEL_VERSION_RC
 
 /* FILE_VERSION defaults to PRODUCT_VERSION */
-#define RES_STR_FILE_VERSION   RES_STR_PRODUCT_VERSION
+#define RES_STR_FILE_VERSION   KERNEL_RELEASE_RC       
 
 #endif /* ndef _INC_REACTOS_RESOURCE_H */

diff --git a/reactos/include/reactos/version.h b/reactos/include/reactos/version.h
new file mode 100644 (file)
index 0000000..ba994d5
--- /dev/null
+++ b/reactos/include/reactos/version.h
@@ -0,0 +1,25 @@
+/* $Id: version.h,v 1.1 1999/11/07 08:03:24 ea Exp $
+ *
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     ReactOS kernel
+ * FILE:        include/internal/version.h
+ * PURPOSE:     Defines the current version
+ * PROGRAMMER:  David Welch (welch@mcmail.com)
+ * REVISIONS:
+ *     1999-11-06 (ea)
+ *             Moved from include/internal in include/reactos
+ *             to be used by buildno.
+ */
+
+#ifndef __VERSION_H
+#define __VERSION_H
+
+#define KERNEL_VERSION_MAJOR           0
+#define KERNEL_VERSION_MINOR           0
+#define KERNEL_VERSION_PATCH_LEVEL      14
+/* Edit each time a new release is out: format is YYYYMMDD (UTC) */
+#define KERNEL_RELEASE_DATE            19990606L
+
+#endif
+
+/* EOF */

diff --git a/reactos/lib/advapi32/advapi32.edf b/reactos/lib/advapi32/advapi32.edf
index 7e8634d..5f619ba 100644 (file)
--- a/reactos/lib/advapi32/advapi32.edf
+++ b/reactos/lib/advapi32/advapi32.edf
@@ -1,4 +1,4 @@
-; $Id: advapi32.edf,v 1.3 1999/10/26 19:47:02 ea Exp $
+; $Id: advapi32.edf,v 1.4 1999/11/07 08:03:24 ea Exp $
 ;
 ; advapi32.def
 ;
@@ -11,286 +11,285 @@ EXPORTS
 AbortSystemShutdownA=AbortSystemShutdownA@4
 AbortSystemShutdownW=AbortSystemShutdownW@4
 AccessCheck=AccessCheck@32
-AccessCheckAndAuditAlarmA=AccessCheckAndAuditAlarmA@44
-AccessCheckAndAuditAlarmW=AccessCheckAndAuditAlarmW@44
-AddAccessAllowedAce=AddAccessAllowedAce@16
-AddAccessDeniedAce=AddAccessDeniedAce@16
+;AccessCheckAndAuditAlarmA=AccessCheckAndAuditAlarmA@44
+;AccessCheckAndAuditAlarmW=AccessCheckAndAuditAlarmW@44
+;AddAccessAllowedAce=AddAccessAllowedAce@16
+;AddAccessDeniedAce=AddAccessDeniedAce@16
 AddAce=AddAce@20
 AddAuditAccessAce=AddAuditAccessAce@24
 AdjustTokenGroups=AdjustTokenGroups@24
 AdjustTokenPrivileges=AdjustTokenPrivileges@24
-AllocateAndInitializeSid=AllocateAndInitializeSid@44
-AllocateLocallyUniqueId=AllocateLocallyUniqueId@4
-AreAllAccessesGranted=AreAllAccessesGranted@8
-AreAnyAccessesGranted=AreAnyAccessesGranted@8
-BackupEventLogA=BackupEventLogA@8
-BackupEventLogW=BackupEventLogW@8
-BuildAccessRequestA=BuildAccessRequestA@12
-BuildAccessRequestW=BuildAccessRequestW@12
-BuildExplicitAccessWithNameA=BuildExplicitAccessWithNameA@20
-BuildExplicitAccessWithNameW=BuildExplicitAccessWithNameW@20
-BuildImpersonateExplicitAccessWithNameA
-BuildImpersonateExplicitAccessWithNameW
-BuildImpersonateTrusteeA
-BuildImpersonateTrusteeW
-BuildSecurityDescriptorA=BuildSecurityDescriptorA@36
-BuildSecurityDescriptorW=BuildSecurityDescriptorW@36
-BuildTrusteeWithNameA=BuildTrusteeWithNameA@8
-BuildTrusteeWithNameW=BuildTrusteeWithNameW@8
-BuildTrusteeWithSidA=BuildTrusteeWithSidA@8
-BuildTrusteeWithSidW=BuildTrusteeWithSidW@8
+;AllocateAndInitializeSid=AllocateAndInitializeSid@44
+;AllocateLocallyUniqueId=AllocateLocallyUniqueId@4
+;AreAllAccessesGranted=AreAllAccessesGranted@8
+;AreAnyAccessesGranted=AreAnyAccessesGranted@8
+;BackupEventLogA=BackupEventLogA@8
+;BackupEventLogW=BackupEventLogW@8
+;BuildAccessRequestA=BuildAccessRequestA@12
+;BuildAccessRequestW=BuildAccessRequestW@12
+;BuildExplicitAccessWithNameA=BuildExplicitAccessWithNameA@20
+;BuildExplicitAccessWithNameW=BuildExplicitAccessWithNameW@20
+;BuildImpersonateExplicitAccessWithNameA
+;BuildImpersonateExplicitAccessWithNameW
+;BuildImpersonateTrusteeA
+;BuildImpersonateTrusteeW
+;BuildSecurityDescriptorA=BuildSecurityDescriptorA@36
+;BuildSecurityDescriptorW=BuildSecurityDescriptorW@36
+;BuildTrusteeWithNameA=BuildTrusteeWithNameA@8
+;BuildTrusteeWithNameW=BuildTrusteeWithNameW@8
+;BuildTrusteeWithSidA=BuildTrusteeWithSidA@8
+;BuildTrusteeWithSidW=BuildTrusteeWithSidW@8
 ChangeServiceConfigA=ChangeServiceConfigA@44
 ChangeServiceConfigW=ChangeServiceConfigW@44
-ClearEventLogA=ClearEventLogA@8
-ClearEventLogW=ClearEventLogW@8
-ClearEventLogA=ClearEventLogA@8
+;ClearEventLogA=ClearEventLogA@8
+;ClearEventLogW=ClearEventLogW@8
 CloseServiceHandle=CloseServiceHandle@4
 ControlService=ControlService@12
-CopySid=CopySid@12
-CreatePrivateObjectSecurity=CreatePrivateObjectSecurity@24
-CreateProcessAsUserA=CreateProcessAsUserA@44
-CreateProcessAsUserW=CreateProcessAsUserW@44
+;CopySid=CopySid@12
+;CreatePrivateObjectSecurity=CreatePrivateObjectSecurity@24
+;CreateProcessAsUserA=CreateProcessAsUserA@44
+;CreateProcessAsUserW=CreateProcessAsUserW@44
 CreateServiceA=CreateServiceA@52
 CreateServiceW=CreateServiceW@52
-CryptAcquireContextA=CryptAcquireContextA@20
-CryptAcquireContextW=CryptAcquireContextW@20
-CryptCreateHash=CryptCreateHash@20
-CryptDecrypt=CryptDecrypt@24
-CryptDeriveKey=CryptDeriveKey@20
-CryptDestroyHash=CryptDestroyHash@4
-CryptDestroyKey=CryptDestroyKey@4
-CryptEncrypt=CryptEncrypt@28
-CryptExportKey=CryptExportKey@24
-CryptGenKey=CryptGenKey@16
-CryptGenRandom=CryptGenRandom@12
-CryptGetHashParam=CryptGetHashParam@20
-CryptGetKeyParam=CryptGetKeyParam@20
-CryptGetProvParam=CryptGetProvParam@20
-CryptGetUserKey=CryptGetUserKey@12
-CryptHashData=CryptHashData@16
-CryptHashSessionKey=CryptHashSessionKey@12
-CryptImportKey=CryptImportKey@24
-CryptReleaseContext=CryptReleaseContext@8
-CryptSetHashParam=CryptSetHashParam@16
-CryptSetKeyParam=CryptSetKeyParam@16
-CryptSetProvParam=CryptSetProvParam@16
-CryptSetProviderA=CryptSetProviderA@8
-CryptSetProviderW=CryptSetProviderW@8
-CryptSignHashA=CryptSignHashA@24
-CryptSignHashW=CryptSignHashW@24
-CryptVerifySignatureA=CryptVerifySignatureA@24
-CryptVerifySignatureW=CryptVerifySignatureW@24
+;CryptAcquireContextA=CryptAcquireContextA@20
+;CryptAcquireContextW=CryptAcquireContextW@20
+;CryptCreateHash=CryptCreateHash@20
+;CryptDecrypt=CryptDecrypt@24
+;CryptDeriveKey=CryptDeriveKey@20
+;CryptDestroyHash=CryptDestroyHash@4
+;CryptDestroyKey=CryptDestroyKey@4
+;CryptEncrypt=CryptEncrypt@28
+;CryptExportKey=CryptExportKey@24
+;CryptGenKey=CryptGenKey@16
+;CryptGenRandom=CryptGenRandom@12
+;CryptGetHashParam=CryptGetHashParam@20
+;CryptGetKeyParam=CryptGetKeyParam@20
+;CryptGetProvParam=CryptGetProvParam@20
+;CryptGetUserKey=CryptGetUserKey@12
+;CryptHashData=CryptHashData@16
+;CryptHashSessionKey=CryptHashSessionKey@12
+;CryptImportKey=CryptImportKey@24
+;CryptReleaseContext=CryptReleaseContext@8
+;CryptSetHashParam=CryptSetHashParam@16
+;CryptSetKeyParam=CryptSetKeyParam@16
+;CryptSetProvParam=CryptSetProvParam@16
+;CryptSetProviderA=CryptSetProviderA@8
+;CryptSetProviderW=CryptSetProviderW@8
+;CryptSignHashA=CryptSignHashA@24
+;CryptSignHashW=CryptSignHashW@24
+;CryptVerifySignatureA=CryptVerifySignatureA@24
+;CryptVerifySignatureW=CryptVerifySignatureW@24
 DeleteAce=DeleteAce@8
 DeleteService=DeleteService@4
-DenyAccessRightsA
-DenyAccessRightsW
-DeregisterEventSource=DeregisterEventSource@4
-DestroyPrivateObjectSecurity=DestroyPrivateObjectSecurity@4
+;DenyAccessRightsA
+;DenyAccessRightsW
+;DeregisterEventSource=DeregisterEventSource@4
+;DestroyPrivateObjectSecurity=DestroyPrivateObjectSecurity@4
 DuplicateToken=DuplicateToken@12
 DuplicateTokenEx=DuplicateTokenEx@24
-ElfBackupEventLogFileA=ElfBackupEventLogFileA@8
-ElfBackupEventLogFileW=ElfBackupEventLogFileW@8
-ElfChangeNotify=ElfChangeNotify@8
-ElfClearEventLogFileA=ElfClearEventLogFileA@8
-ElfClearEventLogFileW=ElfClearEventLogFileW@8
-ElfCloseEventLog=ElfCloseEventLog@4
-ElfDeregisterEventSource=ElfDeregisterEventSource@4
-ElfNumberOfRecords=ElfNumberOfRecords@8
-ElfOldestRecord=ElfOldestRecord@8
-ElfOpenBackupEventLogA=ElfOpenBackupEventLogA@12
-ElfOpenBackupEventLogW=ElfOpenBackupEventLogW@12
-ElfOpenEventLogA=ElfOpenEventLogA@12
-ElfOpenEventLogW=ElfOpenEventLogW@12
-ElfReadEventLogA=ElfReadEventLogA@28
-ElfReadEventLogW=ElfReadEventLogW@28
-ElfRegisterEventSourceA=ElfRegisterEventSourceA@12
-ElfRegisterEventSourceW=ElfRegisterEventSourceW@12
-ElfReportEventA=ElfReportEventA@48
-ElfReportEventW=ElfReportEventW@48
+;ElfBackupEventLogFileA=ElfBackupEventLogFileA@8
+;ElfBackupEventLogFileW=ElfBackupEventLogFileW@8
+;ElfChangeNotify=ElfChangeNotify@8
+;ElfClearEventLogFileA=ElfClearEventLogFileA@8
+;ElfClearEventLogFileW=ElfClearEventLogFileW@8
+;ElfCloseEventLog=ElfCloseEventLog@4
+;ElfDeregisterEventSource=ElfDeregisterEventSource@4
+;ElfNumberOfRecords=ElfNumberOfRecords@8
+;ElfOldestRecord=ElfOldestRecord@8
+;ElfOpenBackupEventLogA=ElfOpenBackupEventLogA@12
+;ElfOpenBackupEventLogW=ElfOpenBackupEventLogW@12
+;ElfOpenEventLogA=ElfOpenEventLogA@12
+;ElfOpenEventLogW=ElfOpenEventLogW@12
+;ElfReadEventLogA=ElfReadEventLogA@28
+;ElfReadEventLogW=ElfReadEventLogW@28
+;ElfRegisterEventSourceA=ElfRegisterEventSourceA@12
+;ElfRegisterEventSourceW=ElfRegisterEventSourceW@12
+;ElfReportEventA=ElfReportEventA@48
+;ElfReportEventW=ElfReportEventW@48
 EnumDependentServicesA=EnumDependentServicesA@24
 EnumDependentServicesW=EnumDependentServicesW@24
 EnumServiceGroupW=EnumServiceGroupW@36
 EnumServicesStatusA=EnumServicesStatusA@32
 EnumServicesStatusW=EnumServicesStatusW@32
-EqualPrefixSid=EqualPrefixSid@8
-EqualSid=EqualSid@8
+;EqualPrefixSid=EqualPrefixSid@8
+;EqualSid=EqualSid@8
 FindFirstFreeAce=FindFirstFreeAce@8
-FreeSid=FreeSid@4
+;FreeSid=FreeSid@4
 GetAce=GetAce@12
 GetAclInformation=GetAclInformation@16
-GetAuditedPermissionsFromAclA=GetAuditedPermissionsFromAclA@16
-GetAuditedPermissionsFromAclW=GetAuditedPermissionsFromAclW@16
-GetAuditedPermissionsFromSDA=GetAuditedPermissionsFromSDA@16
-GetAuditedPermissionsFromSDW=GetAuditedPermissionsFromSDW@16
-GetCurrentHwProfileA=GetCurrentHwProfileA@4
-GetCurrentHwProfileW=GetCurrentHwProfileW@4
-GetEffectiveAccessRightsA=GetEffectiveAccessRightsA@16
-GetEffectiveAccessRightsW=GetEffectiveAccessRightsW@16
-GetEffectiveRightsFromAclA=GetEffectiveRightsFromAclA@12
-GetEffectiveRightsFromAclW=GetEffectiveRightsFromAclW@12
-GetEffectiveRightsFromSDA=GetEffectiveRightsFromSDA@12
-GetEffectiveRightsFromSDW=GetEffectiveRightsFromSDW@12
-GetExplicitAccessRightsA=GetExplicitAccessRightsA@16
-GetExplicitAccessRightsW=GetExplicitAccessRightsW@16
-GetExplicitEntriesFromAclA=GetExplicitEntriesFromAclA@12
-GetExplicitEntriesFromAclW=GetExplicitEntriesFromAclW@12
-GetFileSecurityA=GetFileSecurityA@20
-GetFileSecurityW=GetFileSecurityW@20
-GetKernelObjectSecurity=GetKernelObjectSecurity@20
-GetLengthSid=GetLengthSid@4
-GetMultipleTrusteeA=GetMultipleTrusteeA@4
-GetMultipleTrusteeOperationA=GetMultipleTrusteeOperationA@4
-GetMultipleTrusteeOperationW=GetMultipleTrusteeOperationW@4
-GetMultipleTrusteeW=GetMultipleTrusteeW@4
-GetNamedSecurityInfoA=GetNamedSecurityInfoA@32
-GetNamedSecurityInfoW=GetNamedSecurityInfoW@32
-GetNumberOfEventLogRecords=GetNumberOfEventLogRecords@8
-GetOldestEventLogRecord=GetOldestEventLogRecord@8
-GetPrivateObjectSecurity=GetPrivateObjectSecurity@20
-GetSecurityDescriptorControl=GetSecurityDescriptorControl@12
-GetSecurityDescriptorDacl=GetSecurityDescriptorDacl@16
-GetSecurityDescriptorGroup=GetSecurityDescriptorGroup@12
-GetSecurityDescriptorLength=GetSecurityDescriptorLength@4
-GetSecurityDescriptorOwner=GetSecurityDescriptorOwner@12
-GetSecurityDescriptorSacl=GetSecurityDescriptorSacl@16
-GetSecurityInfo=GetSecurityInfo@32
+;GetAuditedPermissionsFromAclA=GetAuditedPermissionsFromAclA@16
+;GetAuditedPermissionsFromAclW=GetAuditedPermissionsFromAclW@16
+;GetAuditedPermissionsFromSDA=GetAuditedPermissionsFromSDA@16
+;GetAuditedPermissionsFromSDW=GetAuditedPermissionsFromSDW@16
+;GetCurrentHwProfileA=GetCurrentHwProfileA@4
+;GetCurrentHwProfileW=GetCurrentHwProfileW@4
+;GetEffectiveAccessRightsA=GetEffectiveAccessRightsA@16
+;GetEffectiveAccessRightsW=GetEffectiveAccessRightsW@16
+;GetEffectiveRightsFromAclA=GetEffectiveRightsFromAclA@12
+;GetEffectiveRightsFromAclW=GetEffectiveRightsFromAclW@12
+;GetEffectiveRightsFromSDA=GetEffectiveRightsFromSDA@12
+;GetEffectiveRightsFromSDW=GetEffectiveRightsFromSDW@12
+;GetExplicitAccessRightsA=GetExplicitAccessRightsA@16
+;GetExplicitAccessRightsW=GetExplicitAccessRightsW@16
+;GetExplicitEntriesFromAclA=GetExplicitEntriesFromAclA@12
+;GetExplicitEntriesFromAclW=GetExplicitEntriesFromAclW@12
+;GetFileSecurityA=GetFileSecurityA@20
+;GetFileSecurityW=GetFileSecurityW@20
+;GetKernelObjectSecurity=GetKernelObjectSecurity@20
+;GetLengthSid=GetLengthSid@4
+;GetMultipleTrusteeA=GetMultipleTrusteeA@4
+;GetMultipleTrusteeOperationA=GetMultipleTrusteeOperationA@4
+;GetMultipleTrusteeOperationW=GetMultipleTrusteeOperationW@4
+;GetMultipleTrusteeW=GetMultipleTrusteeW@4
+;GetNamedSecurityInfoA=GetNamedSecurityInfoA@32
+;GetNamedSecurityInfoW=GetNamedSecurityInfoW@32
+;GetNumberOfEventLogRecords=GetNumberOfEventLogRecords@8
+;GetOldestEventLogRecord=GetOldestEventLogRecord@8
+;GetPrivateObjectSecurity=GetPrivateObjectSecurity@20
+;GetSecurityDescriptorControl=GetSecurityDescriptorControl@12
+;GetSecurityDescriptorDacl=GetSecurityDescriptorDacl@16
+;GetSecurityDescriptorGroup=GetSecurityDescriptorGroup@12
+;GetSecurityDescriptorLength=GetSecurityDescriptorLength@4
+;GetSecurityDescriptorOwner=GetSecurityDescriptorOwner@12
+;GetSecurityDescriptorSacl=GetSecurityDescriptorSacl@16
+;GetSecurityInfo=GetSecurityInfo@32
 GetServiceDisplayNameA=GetServiceDisplayNameA@16
 GetServiceDisplayNameW=GetServiceDisplayNameW@16
 GetServiceKeyNameA=GetServiceKeyNameA@16
 GetServiceKeyNameW=GetServiceKeyNameW@16
-GetSidIdentifierAuthority=GetSidIdentifierAuthority@4
-GetSidLengthRequired=GetSidLengthRequired@4
-GetSidSubAuthority=GetSidSubAuthority@8
-GetSidSubAuthorityCount=GetSidSubAuthorityCount@4
+;GetSidIdentifierAuthority=GetSidIdentifierAuthority@4
+;GetSidLengthRequired=GetSidLengthRequired@4
+;GetSidSubAuthority=GetSidSubAuthority@8
+;GetSidSubAuthorityCount=GetSidSubAuthorityCount@4
 GetTokenInformation=GetTokenInformation@20
-GetTrusteeForm=GetTrusteeForm@4
-GetTrusteeNameA=GetTrusteeNameA@4
-GetTrusteeNameW=GetTrusteeNameW@4
-GetTrusteeTypeA=GetTrusteeTypeA@4
-GetTrusteeTypeW=GetTrusteeTypeW@4
-GetUserNameA=GetUserNameA@8
-GetUserNameW=GetUserNameW@8
-GrantAccessRightsA=GrantAccessRightsA@16
-GrantAccessRightsW=GrantAccessRightsW@16
-I_ScGetCurrentGroupStateW=I_ScGetCurrentGroupStateW@12
-I_ScSetServiceBitsA=I_ScSetServiceBitsA@20
-I_ScSetServiceBitsW=I_ScSetServiceBitsW@20
-ImpersonateLoggedOnUser=ImpersonateLoggedOnUser@4
-ImpersonateNamedPipeClient=ImpersonateNamedPipeClient@4
-ImpersonateSelf=ImpersonateSelf@4
+;GetTrusteeForm=GetTrusteeForm@4
+;GetTrusteeNameA=GetTrusteeNameA@4
+;GetTrusteeNameW=GetTrusteeNameW@4
+;GetTrusteeTypeA=GetTrusteeTypeA@4
+;GetTrusteeTypeW=GetTrusteeTypeW@4
+;GetUserNameA=GetUserNameA@8
+;GetUserNameW=GetUserNameW@8
+;GrantAccessRightsA=GrantAccessRightsA@16
+;GrantAccessRightsW=GrantAccessRightsW@16
+;I_ScGetCurrentGroupStateW=I_ScGetCurrentGroupStateW@12
+;I_ScSetServiceBitsA=I_ScSetServiceBitsA@20
+;I_ScSetServiceBitsW=I_ScSetServiceBitsW@20
+;ImpersonateLoggedOnUser=ImpersonateLoggedOnUser@4
+;ImpersonateNamedPipeClient=ImpersonateNamedPipeClient@4
+;ImpersonateSelf=ImpersonateSelf@4
 InitializeAcl=InitializeAcl@12
-InitializeSecurityDescriptor=InitializeSecurityDescriptor@8
-InitializeSid=InitializeSid@12
+;InitializeSecurityDescriptor=InitializeSecurityDescriptor@8
+;InitializeSid=InitializeSid@12
 InitiateSystemShutdownA=InitiateSystemShutdownA@20
 InitiateSystemShutdownW=InitiateSystemShutdownW@20
-IsAccessPermittedA=IsAccessPermittedA@20
-IsAccessPermittedW=IsAccessPermittedW@20
-IsTextUnicode=IsTextUnicode@12
+;IsAccessPermittedA=IsAccessPermittedA@20
+;IsAccessPermittedW=IsAccessPermittedW@20
+;IsTextUnicode=IsTextUnicode@12
 IsValidAcl=IsValidAcl@4
-IsValidSecurityDescriptor=IsValidSecurityDescriptor@4
-IsValidSid=IsValidSid@4
+;IsValidSecurityDescriptor=IsValidSecurityDescriptor@4
+;IsValidSid=IsValidSid@4
 LockServiceDatabase=LockServiceDatabase@4
-LogonUserA=LogonUserA@24
-LogonUserW=LogonUserW@24
-LookupAccountNameA=LookupAccountNameA@28
-LookupAccountNameW=LookupAccountNameW@28
-LookupAccountSidA=LookupAccountSidA@28
-LookupAccountSidW=LookupAccountSidW@28
-LookupPrivilegeDisplayNameA=LookupPrivilegeDisplayNameA@20
-LookupPrivilegeDisplayNameW=LookupPrivilegeDisplayNameW@20
-LookupPrivilegeNameA=LookupPrivilegeNameA@16
-LookupPrivilegeNameW=LookupPrivilegeNameW@16
-LookupPrivilegeValueA=LookupPrivilegeValueA@12
-LookupPrivilegeValueW=LookupPrivilegeValueW@12
-LookupSecurityDescriptorPartsA=LookupSecurityDescriptorPartsA@28
-LookupSecurityDescriptorPartsW=LookupSecurityDescriptorPartsW@28
-LsaAddAccountRights=LsaAddAccountRights@16
-LsaAddPrivilegesToAccount=LsaAddPrivilegesToAccount@8
-LsaClearAuditLog=LsaClearAuditLog@4
-LsaClose=LsaClose@4
-LsaCreateAccount=LsaCreateAccount@16
-LsaCreateSecret=LsaCreateSecret@16
-LsaCreateTrustedDomain=LsaCreateTrustedDomain@16
-LsaDelete=LsaDelete@4
-LsaDeleteTrustedDomain=LsaDeleteTrustedDomain@8
-LsaEnumerateAccountRights=LsaEnumerateAccountRights@16
-LsaEnumerateAccounts=LsaEnumerateAccounts@20
-LsaEnumerateAccountsWithUserRight=LsaEnumerateAccountsWithUserRight@16
-LsaEnumeratePrivileges=LsaEnumeratePrivileges@20
-LsaEnumeratePrivilegesOfAccount=LsaEnumeratePrivilegesOfAccount@8
-LsaEnumerateTrustedDomains=LsaEnumerateTrustedDomains@20
-LsaFreeMemory=LsaFreeMemory@4
-LsaGetQuotasForAccount=LsaGetQuotasForAccount@8
-LsaGetSystemAccessAccount=LsaGetSystemAccessAccount@8
-LsaGetUserName=LsaGetUserName@8
-LsaICLookupNames=LsaICLookupNames@28
-LsaICLookupSids=LsaICLookupSids@28
-LsaLookupNames=LsaLookupNames@20
-LsaLookupPrivilegeDisplayName=LsaLookupPrivilegeDisplayName@16
-LsaLookupPrivilegeName=LsaLookupPrivilegeName@12
-LsaLookupPrivilegeValue=LsaLookupPrivilegeValue@12
-LsaLookupSids=LsaLookupSids@20
-LsaNtStatusToWinError=LsaNtStatusToWinError@4
-LsaOpenAccount=LsaOpenAccount@16
-LsaOpenPolicy=LsaOpenPolicy@16
-LsaOpenSecret=LsaOpenSecret@16
-LsaOpenTrustedDomain=LsaOpenTrustedDomain@16
-LsaQueryInfoTrustedDomain=LsaQueryInfoTrustedDomain@12
-LsaQueryInformationPolicy=LsaQueryInformationPolicy@12
-LsaQuerySecret=LsaQuerySecret@20
-LsaQuerySecurityObject=LsaQuerySecurityObject@12
-LsaQueryTrustedDomainInfo=LsaQueryTrustedDomainInfo@16
-LsaRemoveAccountRights=LsaRemoveAccountRights@20
-LsaRemovePrivilegesFromAccount=LsaRemovePrivilegesFromAccount@12
-LsaRetrievePrivateData=LsaRetrievePrivateData@12
-LsaSetInformationPolicy=LsaSetInformationPolicy@12
-LsaSetInformationTrustedDomain=LsaSetInformationTrustedDomain@12
-LsaSetQuotasForAccount=LsaSetQuotasForAccount@8
-LsaSetSecret=LsaSetSecret@12
-LsaSetSecurityObject=LsaSetSecurityObject@12
-LsaSetSystemAccessAccount=LsaSetSystemAccessAccount@8
-LsaSetTrustedDomainInformation=LsaSetTrustedDomainInformation@16
-LsaStorePrivateData=LsaStorePrivateData@12
-MakeAbsoluteSD=MakeAbsoluteSD@44
-MakeSelfRelativeSD=MakeSelfRelativeSD@12
-MapGenericMask=MapGenericMask@8
-NTAccessMaskToProvAccessRights=NTAccessMaskToProvAccessRights@12
-NotifyBootConfigStatus=NotifyBootConfigStatus@4
-NotifyChangeEventLog=NotifyChangeEventLog@8
-ObjectCloseAuditAlarmA=ObjectCloseAuditAlarmA@12
-ObjectCloseAuditAlarmW=ObjectCloseAuditAlarmW@12
-ObjectDeleteAuditAlarmA=ObjectDeleteAuditAlarmA@12
-ObjectDeleteAuditAlarmW=ObjectDeleteAuditAlarmW@12
-ObjectOpenAuditAlarmA=ObjectOpenAuditAlarmA@48
-ObjectOpenAuditAlarmW=ObjectOpenAuditAlarmW@48
-ObjectPrivilegeAuditAlarmA=ObjectPrivilegeAuditAlarmA@24
-ObjectPrivilegeAuditAlarmW=ObjectPrivilegeAuditAlarmW@24
-OpenBackupEventLogA=OpenBackupEventLogA@8
-OpenBackupEventLogW=OpenBackupEventLogW@8
-OpenEventLogA=OpenEventLogA@8
-OpenEventLogW=OpenEventLogW@8
+;LogonUserA=LogonUserA@24
+;LogonUserW=LogonUserW@24
+;LookupAccountNameA=LookupAccountNameA@28
+;LookupAccountNameW=LookupAccountNameW@28
+;LookupAccountSidA=LookupAccountSidA@28
+;LookupAccountSidW=LookupAccountSidW@28
+;LookupPrivilegeDisplayNameA=LookupPrivilegeDisplayNameA@20
+;LookupPrivilegeDisplayNameW=LookupPrivilegeDisplayNameW@20
+;LookupPrivilegeNameA=LookupPrivilegeNameA@16
+;LookupPrivilegeNameW=LookupPrivilegeNameW@16
+;LookupPrivilegeValueA=LookupPrivilegeValueA@12
+;LookupPrivilegeValueW=LookupPrivilegeValueW@12
+;LookupSecurityDescriptorPartsA=LookupSecurityDescriptorPartsA@28
+;LookupSecurityDescriptorPartsW=LookupSecurityDescriptorPartsW@28
+;LsaAddAccountRights=LsaAddAccountRights@16
+;LsaAddPrivilegesToAccount=LsaAddPrivilegesToAccount@8
+;LsaClearAuditLog=LsaClearAuditLog@4
+;LsaClose=LsaClose@4
+;LsaCreateAccount=LsaCreateAccount@16
+;LsaCreateSecret=LsaCreateSecret@16
+;LsaCreateTrustedDomain=LsaCreateTrustedDomain@16
+;LsaDelete=LsaDelete@4
+;LsaDeleteTrustedDomain=LsaDeleteTrustedDomain@8
+;LsaEnumerateAccountRights=LsaEnumerateAccountRights@16
+;LsaEnumerateAccounts=LsaEnumerateAccounts@20
+;LsaEnumerateAccountsWithUserRight=LsaEnumerateAccountsWithUserRight@16
+;LsaEnumeratePrivileges=LsaEnumeratePrivileges@20
+;LsaEnumeratePrivilegesOfAccount=LsaEnumeratePrivilegesOfAccount@8
+;LsaEnumerateTrustedDomains=LsaEnumerateTrustedDomains@20
+;LsaFreeMemory=LsaFreeMemory@4
+;LsaGetQuotasForAccount=LsaGetQuotasForAccount@8
+;LsaGetSystemAccessAccount=LsaGetSystemAccessAccount@8
+;LsaGetUserName=LsaGetUserName@8
+;LsaICLookupNames=LsaICLookupNames@28
+;LsaICLookupSids=LsaICLookupSids@28
+;LsaLookupNames=LsaLookupNames@20
+;LsaLookupPrivilegeDisplayName=LsaLookupPrivilegeDisplayName@16
+;LsaLookupPrivilegeName=LsaLookupPrivilegeName@12
+;LsaLookupPrivilegeValue=LsaLookupPrivilegeValue@12
+;LsaLookupSids=LsaLookupSids@20
+;LsaNtStatusToWinError=LsaNtStatusToWinError@4
+;LsaOpenAccount=LsaOpenAccount@16
+;LsaOpenPolicy=LsaOpenPolicy@16
+;LsaOpenSecret=LsaOpenSecret@16
+;LsaOpenTrustedDomain=LsaOpenTrustedDomain@16
+;LsaQueryInfoTrustedDomain=LsaQueryInfoTrustedDomain@12
+;LsaQueryInformationPolicy=LsaQueryInformationPolicy@12
+;LsaQuerySecret=LsaQuerySecret@20
+;LsaQuerySecurityObject=LsaQuerySecurityObject@12
+;LsaQueryTrustedDomainInfo=LsaQueryTrustedDomainInfo@16
+;LsaRemoveAccountRights=LsaRemoveAccountRights@20
+;LsaRemovePrivilegesFromAccount=LsaRemovePrivilegesFromAccount@12
+;LsaRetrievePrivateData=LsaRetrievePrivateData@12
+;LsaSetInformationPolicy=LsaSetInformationPolicy@12
+;LsaSetInformationTrustedDomain=LsaSetInformationTrustedDomain@12
+;LsaSetQuotasForAccount=LsaSetQuotasForAccount@8
+;LsaSetSecret=LsaSetSecret@12
+;LsaSetSecurityObject=LsaSetSecurityObject@12
+;LsaSetSystemAccessAccount=LsaSetSystemAccessAccount@8
+;LsaSetTrustedDomainInformation=LsaSetTrustedDomainInformation@16
+;LsaStorePrivateData=LsaStorePrivateData@12
+;MakeAbsoluteSD=MakeAbsoluteSD@44
+;MakeSelfRelativeSD=MakeSelfRelativeSD@12
+;MapGenericMask=MapGenericMask@8
+;NTAccessMaskToProvAccessRights=NTAccessMaskToProvAccessRights@12
+;NotifyBootConfigStatus=NotifyBootConfigStatus@4
+;NotifyChangeEventLog=NotifyChangeEventLog@8
+;ObjectCloseAuditAlarmA=ObjectCloseAuditAlarmA@12
+;ObjectCloseAuditAlarmW=ObjectCloseAuditAlarmW@12
+;ObjectDeleteAuditAlarmA=ObjectDeleteAuditAlarmA@12
+;ObjectDeleteAuditAlarmW=ObjectDeleteAuditAlarmW@12
+;ObjectOpenAuditAlarmA=ObjectOpenAuditAlarmA@48
+;ObjectOpenAuditAlarmW=ObjectOpenAuditAlarmW@48
+;ObjectPrivilegeAuditAlarmA=ObjectPrivilegeAuditAlarmA@24
+;ObjectPrivilegeAuditAlarmW=ObjectPrivilegeAuditAlarmW@24
+;OpenBackupEventLogA=OpenBackupEventLogA@8
+;OpenBackupEventLogW=OpenBackupEventLogW@8
+;OpenEventLogA=OpenEventLogA@8
+;OpenEventLogW=OpenEventLogW@8
 OpenProcessToken=OpenProcessToken@12
 OpenSCManagerA=OpenSCManagerA@12
 OpenSCManagerW=OpenSCManagerW@12
 OpenServiceA=OpenServiceA@12
 OpenServiceW=OpenServiceW@12
 OpenThreadToken=OpenThreadToken@16
-PrivilegeCheck=PrivilegeCheck@12
-PrivilegedServiceAuditAlarmA=PrivilegedServiceAuditAlarmA@20
-PrivilegedServiceAuditAlarmW=PrivilegedServiceAuditAlarmW@20
-ProvAccessRightsToNTAccessMask=ProvAccessRightsToNTAccessMask@8
+;PrivilegeCheck=PrivilegeCheck@12
+;PrivilegedServiceAuditAlarmA=PrivilegedServiceAuditAlarmA@20
+;PrivilegedServiceAuditAlarmW=PrivilegedServiceAuditAlarmW@20
+;ProvAccessRightsToNTAccessMask=ProvAccessRightsToNTAccessMask@8
 QueryServiceConfigA=QueryServiceConfigA@16
 QueryServiceConfigW=QueryServiceConfigW@16
 QueryServiceLockStatusA=QueryServiceLockStatusA@16
 QueryServiceLockStatusW=QueryServiceLockStatusW@16
 QueryServiceObjectSecurity=QueryServiceObjectSecurity@20
 QueryServiceStatus=QueryServiceStatus@8
-QueryWindows31FilesMigration=QueryWindows31FilesMigration@4
-ReadEventLogA=ReadEventLogA@28
-ReadEventLogW=ReadEventLogW@28
+;QueryWindows31FilesMigration=QueryWindows31FilesMigration@4
+;ReadEventLogA=ReadEventLogA@28
+;ReadEventLogW=ReadEventLogW@28
 RegCloseKey=RegCloseKey@4
-RegConnectRegistryA=RegConnectRegistryA@12
-RegConnectRegistryW=RegConnectRegistryW@12
+;RegConnectRegistryA=RegConnectRegistryA@12
+;RegConnectRegistryW=RegConnectRegistryW@12
 RegCreateKeyA=RegCreateKeyA@12
 RegCreateKeyExA=RegCreateKeyExA@36
 RegCreateKeyExW=RegCreateKeyExW@36
@@ -298,15 +297,15 @@ RegCreateKeyW=RegCreateKeyW@12
 RegDeleteKeyA=RegDeleteKeyA@8
 RegDeleteKeyW=RegDeleteKeyW@8
 RegDeleteValueA=RegDeleteValueA@8
-RegDeleteValueW=RegDeleteValueW@8
+;RegDeleteValueW=RegDeleteValueW@8
 RegEnumKeyA=RegEnumKeyA@16
 RegEnumKeyExA=RegEnumKeyExA@32
-RegEnumKeyExW=RegEnumKeyExW@32
-RegEnumKeyW=RegEnumKeyW@16
+;RegEnumKeyExW=RegEnumKeyExW@32
+;RegEnumKeyW=RegEnumKeyW@16
 RegEnumValueA=RegEnumValueA@32
-RegEnumValueW=RegEnumValueW@32
+;RegEnumValueW=RegEnumValueW@32
 RegFlushKey=RegFlushKey@4
-RegGetKeySecurity=RegGetKeySecurity@16
+;RegGetKeySecurity=RegGetKeySecurity@16
 RegLoadKeyA=RegLoadKeyA@12
 RegLoadKeyW=RegLoadKeyW@12
 RegNotifyChangeKeyValue=RegNotifyChangeKeyValue@20
@@ -317,52 +316,52 @@ RegOpenKeyW=RegOpenKeyW@12
 RegQueryInfoKeyA=RegQueryInfoKeyA@48
 RegQueryInfoKeyW=RegQueryInfoKeyW@48
 RegQueryMultipleValuesA=RegQueryMultipleValuesA@20
-RegQueryMultipleValuesW=RegQueryMultipleValuesW@20
+;RegQueryMultipleValuesW=RegQueryMultipleValuesW@20
 RegQueryValueA=RegQueryValueA@16
 RegQueryValueExA=RegQueryValueExA@24
 RegQueryValueExW=RegQueryValueExW@24
-RegQueryValueW=RegQueryValueW@16
+;RegQueryValueW=RegQueryValueW@16
 RegReplaceKeyA=RegReplaceKeyA@16
-RegReplaceKeyW=RegReplaceKeyW@16
+;RegReplaceKeyW=RegReplaceKeyW@16
 RegRestoreKeyA=RegRestoreKeyA@12
-RegRestoreKeyW=RegRestoreKeyW@12
+;RegRestoreKeyW=RegRestoreKeyW@12
 RegSaveKeyA=RegSaveKeyA@12
-RegSaveKeyW=RegSaveKeyW@12
-RegSetKeySecurity=RegSetKeySecurity@12
+;RegSaveKeyW=RegSaveKeyW@12
+;RegSetKeySecurity=RegSetKeySecurity@12
 RegSetValueA=RegSetValueA@20
 RegSetValueExA=RegSetValueExA@24
-RegSetValueExW=RegSetValueExW@24
-RegSetValueW=RegSetValueW@20
+;RegSetValueExW=RegSetValueExW@24
+;RegSetValueW=RegSetValueW@20
 RegUnLoadKeyA=RegUnLoadKeyA@8
-RegUnLoadKeyW=RegUnLoadKeyW@8
-RegisterEventSourceA=RegisterEventSourceA@8
-RegisterEventSourceW=RegisterEventSourceW@8
+;RegUnLoadKeyW=RegUnLoadKeyW@8
+;RegisterEventSourceA=RegisterEventSourceA@8
+;RegisterEventSourceW=RegisterEventSourceW@8
 RegisterServiceCtrlHandlerA=RegisterServiceCtrlHandlerA@8
 RegisterServiceCtrlHandlerW=RegisterServiceCtrlHandlerW@8
-ReplaceAllAccessRightsA
-ReplaceAllAccessRightsW
-ReportEventA=ReportEventA@36
-ReportEventW=ReportEventW@36
-RevertToSelf=RevertToSelf@0
-RevokeExplicitAccessRightsA=RevokeExplicitAccessRightsA@16
-RevokeExplicitAccessRightsW=RevokeExplicitAccessRightsW@16
-SetAccessRightsA=SetAccessRightsA@16
-SetAccessRightsW=SetAccessRightsW@16
+;ReplaceAllAccessRightsA
+;ReplaceAllAccessRightsW
+;ReportEventA=ReportEventA@36
+;ReportEventW=ReportEventW@36
+;RevertToSelf=RevertToSelf@0
+;RevokeExplicitAccessRightsA=RevokeExplicitAccessRightsA@16
+;RevokeExplicitAccessRightsW=RevokeExplicitAccessRightsW@16
+;SetAccessRightsA=SetAccessRightsA@16
+;SetAccessRightsW=SetAccessRightsW@16
 SetAclInformation=SetAclInformation@16
-SetEntriesInAclA=SetEntriesInAclA@16
-SetEntriesInAclA=SetEntriesInAclA@16
-SetFileSecurityA=SetFileSecurityA@12
-SetFileSecurityW=SetFileSecurityW@12
-SetKernelObjectSecurity=SetKernelObjectSecurity@12
-SetNamedSecurityInfoA=SetNamedSecurityInfoA@28
-SetNamedSecurityInfoW=SetNamedSecurityInfoW@28
-SetPrivateObjectSecurity=SetPrivateObjectSecurity@20
-SetSecurityDescriptorDacl=SetSecurityDescriptorDacl@16
-SetSecurityDescriptorGroup=SetSecurityDescriptorGroup@12
-SetSecurityDescriptorOwner=SetSecurityDescriptorOwner@12
-SetSecurityDescriptorSacl=SetSecurityDescriptorSacl@16
-SetSecurityInfo=SetSecurityInfo@28
-SetServiceBits=SetServiceBits@16
+;SetEntriesInAclA=SetEntriesInAclA@16
+;SetEntriesInAclW=SetEntriesInAclW@16
+;SetFileSecurityA=SetFileSecurityA@12
+;SetFileSecurityW=SetFileSecurityW@12
+;SetKernelObjectSecurity=SetKernelObjectSecurity@12
+;SetNamedSecurityInfoA=SetNamedSecurityInfoA@28
+;SetNamedSecurityInfoW=SetNamedSecurityInfoW@28
+;SetPrivateObjectSecurity=SetPrivateObjectSecurity@20
+;SetSecurityDescriptorDacl=SetSecurityDescriptorDacl@16
+;SetSecurityDescriptorGroup=SetSecurityDescriptorGroup@12
+;SetSecurityDescriptorOwner=SetSecurityDescriptorOwner@12
+;SetSecurityDescriptorSacl=SetSecurityDescriptorSacl@16
+;SetSecurityInfo=SetSecurityInfo@28
+;SetServiceBits=SetServiceBits@16
 SetServiceObjectSecurity=SetServiceObjectSecurity@12
 SetServiceStatus=SetServiceStatus@8
 SetThreadToken=SetThreadToken@8
@@ -371,7 +370,7 @@ StartServiceA=StartServiceA@12
 StartServiceCtrlDispatcherA=StartServiceCtrlDispatcherA@4
 StartServiceCtrlDispatcherW=StartServiceCtrlDispatcherW@4
 StartServiceW=StartServiceW@12
-SynchronizeWindows31FilesAndWindowsNTRegistry=SynchronizeWindows31FilesAndWindowsNTRegistry@16
+;SynchronizeWindows31FilesAndWindowsNTRegistry=SynchronizeWindows31FilesAndWindowsNTRegistry@16
 SystemFunction001=SystemFunction001@12
 SystemFunction002=SystemFunction002@12
 SystemFunction003=SystemFunction003@8
@@ -406,6 +405,6 @@ SystemFunction031=SystemFunction031@8
 SystemFunction032=SystemFunction032@8
 SystemFunction033=SystemFunction033@8
 UnlockServiceDatabase=UnlockServiceDatabase@4
-WinLoadTrustProvider=WinLoadTrustProvider@4
-WinSubmitCertificate=WinSubmitCertificate@4
-WinVerifyTrust=WinVerifyTrust@12
+;WinLoadTrustProvider=WinLoadTrustProvider@4
+;WinSubmitCertificate=WinSubmitCertificate@4
+;WinVerifyTrust=WinVerifyTrust@12

diff --git a/reactos/lib/advapi32/advapi32.rc b/reactos/lib/advapi32/advapi32.rc
index f3a690a..aebf7d3 100644 (file)
--- a/reactos/lib/advapi32/advapi32.rc
+++ b/reactos/lib/advapi32/advapi32.rc
@@ -1,5 +1,5 @@
-#include "../../include/defines.h"
-#include "../../include/reactos/resource.h"
+#include <defines.h>
+#include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
@@ -22,7 +22,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName",       RES_STR_COMPANY_NAME
             VALUE "FileDescription",   "Advanced W32 Base API\0"
-            VALUE "FileVersion",       "post 0.0.13\0"
+            VALUE "FileVersion",       RES_STR_FILE_VERSION
             VALUE "InternalName",      "advapi32\0"
             VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
             VALUE "OriginalFilename",  "advapi32.dll\0"

diff --git a/reactos/lib/advapi32/makefile b/reactos/lib/advapi32/makefile
index 9199190..2a936e4 100644 (file)
--- a/reactos/lib/advapi32/makefile
+++ b/reactos/lib/advapi32/makefile
@@ -1,19 +1,20 @@
-# $Id: makefile,v 1.9 1999/10/25 06:58:09 rex Exp $
+# $Id: makefile,v 1.10 1999/11/07 08:03:24 ea Exp $
 #
 # Makefile for ReactOS advapi32.dll
 #
 
 BASE_CFLAGS = -I../../include
 
-TARGET=advapi32
+TARGETNAME=advapi32
+
 ifneq ($(HOST),mingw32-windows)
   ifneq ($(HOST),mingw32-linux)
-    DLLTARGET=$(TARGET).a
+    DLLTARGET=$(TARGETNAME).a
   else
-    DLLTARGET=$(TARGET).dll
+    DLLTARGET=$(TARGETNAME).dll
   endif
 else
-  DLLTARGET=$(TARGET).dll
+  DLLTARGET=$(TARGETNAME).dll
 endif
 
 
@@ -22,65 +23,96 @@ MISC_OBJECTS = misc/dllmain.o misc/shutdown.o \
 
 REGISTRY_OBJECTS = reg/reg.o
 
-SECURITY_OBJECTS = sec/lsa.o sec/sec.o
-#SECURITY_OBJECTS = sec/lsa.o sec/rtlsec.o sec/sec.o
+SECURITY_OBJECTS = sec/lsa.o sec/sec.o sec/ac.o
 
 SERVICE_OBJECTS = service/scm.o
 
 TOKEN_OBJECTS = token/token.o
 
-RESOURCE_OBJECT = advapi32.coff
+RESOURCE_OBJECT = $(TARGETNAME).coff
 
 OBJECTS = $(MISC_OBJECTS) $(REGISTRY_OBJECTS) $(SECURITY_OBJECTS) \
           $(SERVICE_OBJECTS) $(TOKEN_OBJECTS) \
          $(RESOURCE_OBJECT)
 
+ifeq ($(DOSCLI),yes)
+CLEAN_FILES = misc\*.o reg\*.o sec\*.o service\*.o token\*.o \
+              $(TARGETNAME).o $(TARGETNAME).a junk.tmp base.tmp temp.exp \
+             $(TARGETNAME).dll $(TARGETNAME).sym $(TARGETNAME).coff
+else
+CLEAN_FILES = misc/*.o reg/*.o sec/*.o service/*.o token/*.o \
+              $(TARGETNAME).o $(TARGETNAME).a junk.tmp base.tmp temp.exp \
+             $(TARGETNAME).dll $(TARGETNAME).sym $(TARGETNAME).coff
+endif
+
 all: $(DLLTARGET)
 
-$(TARGET).coff: $(TARGET).rc ../../include/reactos/resource.h
-       $(RC) $(TARGET).rc $(TARGET).coff
+$(TARGETNAME).coff: $(TARGETNAME).rc ../../include/reactos/resource.h
 
-$(TARGET).a: $(OBJECTS)
-       $(LD) -r $(OBJECTS) -o $(TARGET).a
+$(TARGETNAME).a: $(OBJECTS)
+       $(LD) -r $(OBJECTS) -o $(TARGETNAME).a
 
-$(TARGET).dll: $(DLLMAIN) $(OBJECTS) $(TARGET).def
-       $(LD) -r $(OBJECTS) -o $(TARGET).o
+$(TARGETNAME).dll: $(DLLMAIN) $(OBJECTS) $(TARGETNAME).def
+       $(LD) -r $(OBJECTS) -o $(TARGETNAME).o
        $(DLLTOOL) \
-               --dllname $(TARGET).dll \
-               --def $(TARGET).def \
+               --dllname $(TARGETNAME).dll \
+               --def $(TARGETNAME).def \
                --kill-at \
-               --output-lib $(TARGET).a
+               --output-lib $(TARGETNAME).a
        $(CC) \
-               $(TARGET).o \
+               $(TARGETNAME).o \
                ../ntdll/ntdll.a \
                ../kernel32/kernel32.a \
-               -specs=$(TARGET)_specs \
+               -specs=$(TARGETNAME)_specs \
                -mdll \
                -o junk.tmp \
                -Wl,--base-file,base.tmp 
        - $(RM) junk.tmp
        $(DLLTOOL) \
-               --dllname $(TARGET).dll \
+               --dllname $(TARGETNAME).dll \
                --base-file base.tmp \
                --output-exp temp.exp \
-               --def $(TARGET).edf
+               --def $(TARGETNAME).edf
        - $(RM) base.tmp
        $(CC) \
-               $(TARGET).o \
+               $(TARGETNAME).o \
                ../ntdll/ntdll.a \
                ../kernel32/kernel32.a \
-               -specs=$(TARGET)_specs \
+               -specs=$(TARGETNAME)_specs \
                -mdll \
-               -o $(TARGET).dll \
+               -o $(TARGETNAME).dll \
                -Wl,--image-base,0x20000000 \
                -Wl,--file-alignment,0x1000 \
                -Wl,--section-alignment,0x1000 \
                -Wl,temp.exp
        - $(RM) temp.exp
-       $(NM) --numeric-sort $(TARGET).dll > $(TARGET).sym
+       $(NM) --numeric-sort $(TARGETNAME).dll > $(TARGETNAME).sym
+
+
+clean: $(CLEAN_FILES:%=%_clean)
+
+$(CLEAN_FILES:%=%_clean): %_clean:
+       - $(RM) $*
 
+.PHONY: clean $(CLEAN_FILES:%=%_clean)
 
-clean:
+floppy: $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll
+
+$(FLOPPY_DIR)/dlls/$(TARGETNAME).dll: $(TARGETNAME).dll
+ifeq ($(DOSCLI),yes)
+       $(CP) $(TARGETNAME).dll $(FLOPPY_DIR)\dlls\$(TARGETNAME).dll
+else
+       $(CP) $(TARGETNAME).dll $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll
+endif
+
+dist: $(DIST_DIR)/dlls/$(TARGETNAME).dll
+
+$(DIST_DIR)/dlls/$(TARGETNAME).dll: $(TARGETNAME).dll
+ifeq ($(DOSCLI),yes)
+       $(CP) $(TARGETNAME).dll ..\..\$(DIST_DIR)\dlls\$(TARGETNAME).dll
+else
+       $(CP) $(TARGETNAME).dll ../../$(DIST_DIR)/dlls/$(TARGETNAME).dll
+endif
 
 include ../../rules.mak
 

diff --git a/reactos/lib/advapi32/service/scm.c b/reactos/lib/advapi32/service/scm.c
index 3f2524a..85d4695 100644 (file)
--- a/reactos/lib/advapi32/service/scm.c
+++ b/reactos/lib/advapi32/service/scm.c
@@ -1,4 +1,4 @@
-/* $Id: scm.c,v 1.3 1999/07/26 20:46:40 ea Exp $
+/* $Id: scm.c,v 1.4 1999/11/07 08:03:25 ea Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -388,11 +388,43 @@ LockServiceDatabase(
        SC_HANDLE       hSCManager
        )
 {
-       SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+       SetLastError (ERROR_CALL_NOT_IMPLEMENTED);
        return NULL;
 }
 
 
+/**********************************************************************
+ *     OpenSCManagerA
+ */
+SC_HANDLE
+STDCALL
+OpenSCManagerA(
+       LPCSTR  lpMachineName,
+       LPCSTR  lpDatabaseName,
+       DWORD   dwDesiredAccess
+       )
+{
+       SetLastError (ERROR_CALL_NOT_IMPLEMENTED);
+       return INVALID_HANDLE_VALUE;
+}
+
+
+/**********************************************************************
+ *     OpenSCManagerW
+ */
+SC_HANDLE
+STDCALL
+OpenSCManagerW(
+       LPCWSTR lpMachineName,
+       LPCWSTR lpDatabaseName,
+       DWORD   dwDesiredAccess
+       )
+{
+       SetLastError (ERROR_CALL_NOT_IMPLEMENTED);
+       return INVALID_HANDLE_VALUE;
+}
+
+
 /**********************************************************************
  *     OpenServiceA
  */

diff --git a/reactos/lib/kernel32/kernel32.rc b/reactos/lib/kernel32/kernel32.rc
index e76d449..78588bb 100644 (file)
--- a/reactos/lib/kernel32/kernel32.rc
+++ b/reactos/lib/kernel32/kernel32.rc
@@ -1,5 +1,5 @@
-#include "../../include/defines.h"
-#include "../../include/reactos/resource.h"
+#include <defines.h>
+#include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 

diff --git a/reactos/lib/ntdll/ntdll.rc b/reactos/lib/ntdll/ntdll.rc
index f8d5386..3d18969 100644 (file)
--- a/reactos/lib/ntdll/ntdll.rc
+++ b/reactos/lib/ntdll/ntdll.rc
@@ -1,5 +1,5 @@
-#include "../../include/defines.h"
-#include "../../include/reactos/resource.h"
+#include <defines.h>
+#include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 

diff --git a/reactos/lib/psxdll/libc/stdlib/exit.c b/reactos/lib/psxdll/libc/stdlib/exit.c
index e8e2d41..055b8df 100644 (file)
--- a/reactos/lib/psxdll/libc/stdlib/exit.c
+++ b/reactos/lib/psxdll/libc/stdlib/exit.c
@@ -1,4 +1,4 @@
-/* $Id: exit.c,v 1.1 1999/10/12 21:19:40 ea Exp $
+/* $Id: exit.c,v 1.2 1999/11/07 08:03:27 ea Exp $
  *
  * reactos/lib/psxdll/libc/stdlib/exit.c
  *
@@ -18,6 +18,7 @@ _exit (
                NtCurrentProcess(),
                code
                );
+       /* FIXME: notify psxss.exe we died */
 }
 
 

diff --git a/reactos/lib/psxdll/makefile b/reactos/lib/psxdll/makefile
index 7a4aa85..97b1049 100644 (file)
--- a/reactos/lib/psxdll/makefile
+++ b/reactos/lib/psxdll/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.3 1999/10/21 16:11:42 ekohl Exp $
+# $Id: makefile,v 1.4 1999/11/07 08:03:26 ea Exp $
 #
 # ReactOS psxdll.dll makefile
 #
@@ -78,9 +78,13 @@ $(TARGETNAME).dll: $(DLLMAIN) $(OBJECTS) $(DEFS)
 
 
 ifeq ($(DOSCLI),yes)
-CLEAN_FILES=*.o *.a misc\*.o
+CLEAN_FILES = *.o *.a misc\*.o libc\stdlib\*.o \
+              $(TARGETNAME).o $(TARGETNAME).a junk.tmp base.tmp temp.exp \
+             $(TARGETNAME).dll $(TARGETNAME).sym $(TARGETNAME).coff
 else
-CLEAN_FILES=*.o *.a misc/*.o
+CLEAN_FILES = *.o *.a misc/*.o libc/stdlib/*.o \
+              $(TARGET).o $(TARGET).a junk.tmp base.tmp temp.exp \
+             $(TARGETNAME).dll $(TARGETNAME).sym $(TARGETNAME).coff
 endif
 
 clean: $(CLEAN_FILES:%=%_clean)

diff --git a/reactos/ntoskrnl/ke/main.c b/reactos/ntoskrnl/ke/main.c
index b1f722f..b35c524 100644 (file)
--- a/reactos/ntoskrnl/ke/main.c
+++ b/reactos/ntoskrnl/ke/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.28 1999/11/02 08:55:40 dwelch Exp $
+/* $Id: main.c,v 1.29 1999/11/07 08:03:28 ea Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -13,7 +13,7 @@
 
 #include <ddk/ntddk.h>
 #include <internal/ntoskrnl.h>
-#include <internal/version.h>
+#include <reactos/buildno.h>
 #include <internal/mm.h>
 #include <string.h>
 #include <internal/string.h>
@@ -153,7 +153,7 @@ asmlinkage void _main(boot_param* _bp)
     */
    HalInitSystem (0, &bp);
    
-   HalDisplayString("Starting ReactOS "KERNEL_VERSION" (Build "__DATE__", "__TIME__")\n");
+   HalDisplayString("Starting ReactOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n");
 
    /*
     * Initialize the debug output

diff --git a/reactos/ntoskrnl/makefile_rex b/reactos/ntoskrnl/makefile_rex
index d7e4ce8..db7d62e 100644 (file)
--- a/reactos/ntoskrnl/makefile_rex
+++ b/reactos/ntoskrnl/makefile_rex
@@ -1,4 +1,4 @@
-# $Id: makefile_rex,v 1.34 1999/11/02 08:55:38 dwelch Exp $
+# $Id: makefile_rex,v 1.35 1999/11/07 08:03:27 ea Exp $
 #
 # ReactOS Operating System
 #
@@ -217,6 +217,8 @@ endif
 
 ex/napi.o: ex/napi.c ../include/ntdll/napi.h
 
+ke/main.o: ke/main.c ../include/reactos/buildno.h
+
 #WITH_DEBUGGING = yes
 WIN32_LEAN_AND_MEAN = yes
 #WARNINGS_ARE_ERRORS = yes

diff --git a/reactos/ntoskrnl/ntoskrnl.rc b/reactos/ntoskrnl/ntoskrnl.rc
index 65fb559..067df12 100644 (file)
--- a/reactos/ntoskrnl/ntoskrnl.rc
+++ b/reactos/ntoskrnl/ntoskrnl.rc
@@ -1,5 +1,5 @@
-#include "../include/defines.h"
-#include "../include/reactos/resource.h"
+#include <defines.h>
+#include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 

diff --git a/reactos/rules.mak b/reactos/rules.mak
index 80714f0..350a5e4 100644 (file)
--- a/reactos/rules.mak
+++ b/reactos/rules.mak
@@ -79,6 +79,7 @@ AS = $(PREFIX)gcc -c -x assembler-with-cpp
 CPP = $(PREFIX)cpp
 AR = $(PREFIX)ar
 RC = $(PREFIX)windres
+RCINC = --include-dir ../include --include-dir ../../include --include-dir ../../../include
 
 %.o: %.cc
        $(CC) $(CFLAGS) -c $< -o $@
@@ -87,7 +88,7 @@ RC = $(PREFIX)windres
 %.o: %.asm
        $(NASM_CMD) $(NFLAGS) $< -o $@
 %.coff: %.rc
-       $(RC) $< $@
+       $(RC) $(RCINC) $< $@
 
 
 RULES_MAK_INCLUDED = 1

diff --git a/reactos/subsys/smss/makefile b/reactos/subsys/smss/makefile
index a4903eb..922ddda 100644 (file)
--- a/reactos/subsys/smss/makefile
+++ b/reactos/subsys/smss/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.1 1999/09/05 12:29:50 ekohl Exp $
+# $Id: makefile,v 1.2 1999/11/07 08:03:28 ea Exp $
 #
 # Session Manager
 #
@@ -20,7 +20,6 @@ all: $(TARGET).exe
 
 
 $(TARGET).coff: $(TARGET).rc
-       $(RC) $(TARGET).rc $(TARGET).coff
 
 $(TARGET).exe: $(OBJECTS) $(LIBS)
        $(LD) \

diff --git a/reactos/subsys/smss/smss.rc b/reactos/subsys/smss/smss.rc
index 53534f8..c8e6cd1 100644 (file)
--- a/reactos/subsys/smss/smss.rc
+++ b/reactos/subsys/smss/smss.rc
@@ -1,5 +1,5 @@
-#include "../../include/defines.h"
-#include "../../include/reactos/resource.h"
+#include <defines.h>
+#include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US