ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

made advapi32 a separate dll.
This commit is contained in:
Alexandre Julliard 2000-07-25 15:10:52 +00:00
parent 71189b5224
commit cd770eafcd
8 changed files with 1197 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Make.rules.in
View File

@ -93,6 +93,7 @@ X_DLLS = \
DLLS = \ DLLS = \
@X_DLLS@ \ @X_DLLS@ \
advapi32 \
avifil32 \ avifil32 \
comctl32 \ comctl32 \
comdlg32 \ comdlg32 \

2
Makefile.in
View File

@ -38,7 +38,6 @@ SUBDIRS = \
controls \ controls \
debugger \ debugger \
dlls \ dlls \
dlls/advapi32 \
dlls/ntdll \ dlls/ntdll \
documentation \ documentation \
files \ files \
@ -81,7 +80,6 @@ INSTALLSUBDIRS = \
LIBOBJS = \ LIBOBJS = \
controls/controls.o \ controls/controls.o \
console/console.o \ console/console.o \
dlls/advapi32/advapi32.o \
dlls/ntdll/ntdll.o \ dlls/ntdll/ntdll.o \
files/files.o \ files/files.o \
graphics/graphics.o \ graphics/graphics.o \

5
dlls/Makefile.in
View File

@ -13,6 +13,7 @@ XFILES = \
DLLFILES = \ DLLFILES = \
@XFILES@ \ @XFILES@ \
advapi32/libadvapi32.@LIBEXT@ \
avifil32/libavifil32.@LIBEXT@ \ avifil32/libavifil32.@LIBEXT@ \
comctl32/libcomctl32.@LIBEXT@ \ comctl32/libcomctl32.@LIBEXT@ \
commdlg/libcomdlg32.@LIBEXT@ \ commdlg/libcomdlg32.@LIBEXT@ \
@ -118,6 +119,7 @@ EXTRADLLNAMES = \
wprocs wprocs
SUBDIRS = \ SUBDIRS = \
advapi32 \
avifil32 \ avifil32 \
comctl32 \ comctl32 \
commdlg \ commdlg \
@ -180,6 +182,9 @@ all: $(DLLS:%=lib%.@LIBEXT@) $(EXTRADLLNAMES:%=lib%.@LIBEXT@)
# Map library name to directory # Map library name to directory
libadvapi32.@LIBEXT@: advapi32/libadvapi32.@LIBEXT@
$(RM) $@ && $(LN_S) advapi32/libadvapi32.@LIBEXT@ $@
libavifil32.@LIBEXT@ libavifile.@LIBEXT@: avifil32/libavifil32.@LIBEXT@ libavifil32.@LIBEXT@ libavifile.@LIBEXT@: avifil32/libavifil32.@LIBEXT@
$(RM) $@ && $(LN_S) avifil32/libavifil32.@LIBEXT@ $@ $(RM) $@ && $(LN_S) avifil32/libavifil32.@LIBEXT@ $@

3
dlls/advapi32/.cvsignore
View File

@ -1,3 +1,4 @@
Makefile
*.spec.c *.spec.c
*.spec.glue.s *.spec.glue.s
Makefile
libadvapi32.so.1.0

9
dlls/advapi32/Makefile.in
View File

@ -1,23 +1,18 @@
DEFS = @DLLFLAGS@ -D__WINE__
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = advapi32 MODULE = advapi32
SOVERSION = 1.0
SPEC_SRCS = advapi32.spec
C_SRCS = \ C_SRCS = \
advapi.c \ advapi.c \
crypt.c \ crypt.c \
eventlog.c \ eventlog.c \
registry.c \
security.c \ security.c \
service.c service.c
all: check_wrc $(MODULE).o @MAKE_DLL_RULES@
@MAKE_RULES@
### Dependencies: ### Dependencies:

22
dlls/ntdll/sec.c
View File

@ -58,24 +58,24 @@ BOOLEAN WINAPI RtlAllocateAndInitializeSid (
if (pIdentifierAuthority) if (pIdentifierAuthority)
memcpy(&(*pSid)->IdentifierAuthority, pIdentifierAuthority, sizeof (SID_IDENTIFIER_AUTHORITY)); memcpy(&(*pSid)->IdentifierAuthority, pIdentifierAuthority, sizeof (SID_IDENTIFIER_AUTHORITY));
*GetSidSubAuthorityCount(*pSid) = nSubAuthorityCount; *RtlSubAuthorityCountSid(*pSid) = nSubAuthorityCount;
if (nSubAuthorityCount > 0) if (nSubAuthorityCount > 0)
*GetSidSubAuthority(*pSid, 0) = nSubAuthority0; *RtlSubAuthoritySid(*pSid, 0) = nSubAuthority0;
if (nSubAuthorityCount > 1) if (nSubAuthorityCount > 1)
*GetSidSubAuthority(*pSid, 1) = nSubAuthority1; *RtlSubAuthoritySid(*pSid, 1) = nSubAuthority1;
if (nSubAuthorityCount > 2) if (nSubAuthorityCount > 2)
*GetSidSubAuthority(*pSid, 2) = nSubAuthority2; *RtlSubAuthoritySid(*pSid, 2) = nSubAuthority2;
if (nSubAuthorityCount > 3) if (nSubAuthorityCount > 3)
*GetSidSubAuthority(*pSid, 3) = nSubAuthority3; *RtlSubAuthoritySid(*pSid, 3) = nSubAuthority3;
if (nSubAuthorityCount > 4) if (nSubAuthorityCount > 4)
*GetSidSubAuthority(*pSid, 4) = nSubAuthority4; *RtlSubAuthoritySid(*pSid, 4) = nSubAuthority4;
if (nSubAuthorityCount > 5) if (nSubAuthorityCount > 5)
*GetSidSubAuthority(*pSid, 5) = nSubAuthority5; *RtlSubAuthoritySid(*pSid, 5) = nSubAuthority5;
if (nSubAuthorityCount > 6) if (nSubAuthorityCount > 6)
*GetSidSubAuthority(*pSid, 6) = nSubAuthority6; *RtlSubAuthoritySid(*pSid, 6) = nSubAuthority6;
if (nSubAuthorityCount > 7) if (nSubAuthorityCount > 7)
*GetSidSubAuthority(*pSid, 7) = nSubAuthority7; *RtlSubAuthoritySid(*pSid, 7) = nSubAuthority7;
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -91,7 +91,7 @@ BOOL WINAPI RtlEqualSid( PSID pSid1, PSID pSid2 )
if (*RtlSubAuthorityCountSid(pSid1) != *RtlSubAuthorityCountSid(pSid2)) if (*RtlSubAuthorityCountSid(pSid1) != *RtlSubAuthorityCountSid(pSid2))
return FALSE; return FALSE;
if (memcmp(pSid1, pSid2, GetLengthSid(pSid1)) != 0) if (memcmp(pSid1, pSid2, RtlLengthSid(pSid1)) != 0)
return FALSE; return FALSE;
return TRUE; return TRUE;
@ -164,7 +164,7 @@ BOOL WINAPI RtlInitializeSid(
memcpy(&pSid->IdentifierAuthority, pIdentifierAuthority, sizeof (SID_IDENTIFIER_AUTHORITY)); memcpy(&pSid->IdentifierAuthority, pIdentifierAuthority, sizeof (SID_IDENTIFIER_AUTHORITY));
for (i = 0; i < nSubAuthorityCount; i++) for (i = 0; i < nSubAuthorityCount; i++)
*GetSidSubAuthority(pSid, i) = 0; *RtlSubAuthoritySid(pSid, i) = 0;
return TRUE; return TRUE;
} }

1
memory/Makefile.in
View File

@ -14,6 +14,7 @@ C_SRCS = \
instr.c \ instr.c \
ldt.c \ ldt.c \
local.c \ local.c \
registry.c \
selector.c \ selector.c \
string.c \ string.c \
virtual.c virtual.c

1175
memory/registry.c Normal file
View File

File diff suppressed because it is too large Load Diff