Commit cd770eaf authored by Alexandre Julliard's avatar Alexandre Julliard

Temporarily moved advapi32 registry support back into libwine.so, and

made advapi32 a separate dll.
parent 71189b52
......@@ -93,6 +93,7 @@ X_DLLS = \
DLLS = \
@X_DLLS@ \
advapi32 \
avifil32 \
comctl32 \
comdlg32 \
......
......@@ -38,7 +38,6 @@ SUBDIRS = \
controls \
debugger \
dlls \
dlls/advapi32 \
dlls/ntdll \
documentation \
files \
......@@ -81,7 +80,6 @@ INSTALLSUBDIRS = \
LIBOBJS = \
controls/controls.o \
console/console.o \
dlls/advapi32/advapi32.o \
dlls/ntdll/ntdll.o \
files/files.o \
graphics/graphics.o \
......
......@@ -13,6 +13,7 @@ XFILES = \
DLLFILES = \
@XFILES@ \
advapi32/libadvapi32.@LIBEXT@ \
avifil32/libavifil32.@LIBEXT@ \
comctl32/libcomctl32.@LIBEXT@ \
commdlg/libcomdlg32.@LIBEXT@ \
......@@ -118,6 +119,7 @@ EXTRADLLNAMES = \
wprocs
SUBDIRS = \
advapi32 \
avifil32 \
comctl32 \
commdlg \
......@@ -180,6 +182,9 @@ all: $(DLLS:%=lib%.@LIBEXT@) $(EXTRADLLNAMES:%=lib%.@LIBEXT@)
# Map library name to directory
libadvapi32.@LIBEXT@: advapi32/libadvapi32.@LIBEXT@
$(RM) $@ && $(LN_S) advapi32/libadvapi32.@LIBEXT@ $@
libavifil32.@LIBEXT@ libavifile.@LIBEXT@: avifil32/libavifil32.@LIBEXT@
$(RM) $@ && $(LN_S) avifil32/libavifil32.@LIBEXT@ $@
......
Makefile
*.spec.c
*.spec.glue.s
Makefile
libadvapi32.so.1.0
DEFS = @DLLFLAGS@ -D__WINE__
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = advapi32
SPEC_SRCS = advapi32.spec
SOVERSION = 1.0
C_SRCS = \
advapi.c \
crypt.c \
eventlog.c \
registry.c \
security.c \
service.c
all: check_wrc $(MODULE).o
@MAKE_RULES@
@MAKE_DLL_RULES@
### Dependencies:
......@@ -58,24 +58,24 @@ BOOLEAN WINAPI RtlAllocateAndInitializeSid (
if (pIdentifierAuthority)
memcpy(&(*pSid)->IdentifierAuthority, pIdentifierAuthority, sizeof (SID_IDENTIFIER_AUTHORITY));
*GetSidSubAuthorityCount(*pSid) = nSubAuthorityCount;
*RtlSubAuthorityCountSid(*pSid) = nSubAuthorityCount;
if (nSubAuthorityCount > 0)
*GetSidSubAuthority(*pSid, 0) = nSubAuthority0;
*RtlSubAuthoritySid(*pSid, 0) = nSubAuthority0;
if (nSubAuthorityCount > 1)
*GetSidSubAuthority(*pSid, 1) = nSubAuthority1;
*RtlSubAuthoritySid(*pSid, 1) = nSubAuthority1;
if (nSubAuthorityCount > 2)
*GetSidSubAuthority(*pSid, 2) = nSubAuthority2;
*RtlSubAuthoritySid(*pSid, 2) = nSubAuthority2;
if (nSubAuthorityCount > 3)
*GetSidSubAuthority(*pSid, 3) = nSubAuthority3;
*RtlSubAuthoritySid(*pSid, 3) = nSubAuthority3;
if (nSubAuthorityCount > 4)
*GetSidSubAuthority(*pSid, 4) = nSubAuthority4;
*RtlSubAuthoritySid(*pSid, 4) = nSubAuthority4;
if (nSubAuthorityCount > 5)
*GetSidSubAuthority(*pSid, 5) = nSubAuthority5;
*RtlSubAuthoritySid(*pSid, 5) = nSubAuthority5;
if (nSubAuthorityCount > 6)
*GetSidSubAuthority(*pSid, 6) = nSubAuthority6;
*RtlSubAuthoritySid(*pSid, 6) = nSubAuthority6;
if (nSubAuthorityCount > 7)
*GetSidSubAuthority(*pSid, 7) = nSubAuthority7;
*RtlSubAuthoritySid(*pSid, 7) = nSubAuthority7;
return STATUS_SUCCESS;
}
......@@ -91,7 +91,7 @@ BOOL WINAPI RtlEqualSid( PSID pSid1, PSID pSid2 )
if (*RtlSubAuthorityCountSid(pSid1) != *RtlSubAuthorityCountSid(pSid2))
return FALSE;
if (memcmp(pSid1, pSid2, GetLengthSid(pSid1)) != 0)
if (memcmp(pSid1, pSid2, RtlLengthSid(pSid1)) != 0)
return FALSE;
return TRUE;
......@@ -164,7 +164,7 @@ BOOL WINAPI RtlInitializeSid(
memcpy(&pSid->IdentifierAuthority, pIdentifierAuthority, sizeof (SID_IDENTIFIER_AUTHORITY));
for (i = 0; i < nSubAuthorityCount; i++)
*GetSidSubAuthority(pSid, i) = 0;
*RtlSubAuthoritySid(pSid, i) = 0;
return TRUE;
}
......
......@@ -14,6 +14,7 @@ C_SRCS = \
instr.c \
ldt.c \
local.c \
registry.c \
selector.c \
string.c \
virtual.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment