Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[sedwards] 13304: Windows is stupid. Why they hell would you be case insensitive but case retaining

by sedwards＠svn.reactos.com

Windows is stupid. Why they hell would you be case insensitive but case retaining Deleted: trunk/reactos/lib/setupapi/Makefile _____ Deleted: trunk/reactos/lib/setupapi/Makefile --- trunk/reactos/lib/setupapi/Makefile 2005-01-26 00:43:24 UTC (rev 13303) +++ trunk/reactos/lib/setupapi/Makefile 2005-01-26 00:43:49 UTC (rev 13304) @@ -1,415 +0,0 @@ -EXTRADEFS = -D_SETUPAPI_ -TOPSRCDIR = ../.. -TOPOBJDIR = ../.. -SRCDIR = . - -MODULE = setupapi.dll -IMPORTS = user32 version advapi32 rpcrt4 kernel32 ntdll -DELAYIMPORTS = shell32 -EXTRALIBS = $(LIBUNICODE) - -C_SRCS = \ - devinst.c \ - dirid.c \ - diskspace.c \ - install.c \ - misc.c \ - parser.c \ - queue.c \ - setupcab.c \ - stubs.c - -C_SRCS16 = \ - devinst16.c \ - infparse.c \ - setupx_main.c \ - virtcopy.c - -SPEC_SRCS16 = setupx.spec - -RC_SRCS= setupapi.rc - - -# Global rules for building dlls -*-Makefile-*- -# -# Each individual makefile should define the following variables: -# MODULE : name of the main module being built -# EXTRALIBS : extra libraries to link in (optional) -# SPEC_SRCS16 : interface definition files for 16-bit dlls (optional) -# SUBSYSTEM : (optional) subsystem (for native dlls) -# -# plus all variables required by the global Make.rules.in -# - -DLLDEFS = -DLLFLAGS = -D_REENTRANT -DLLEXT = -DEFS = -D__WINESRC__ $(DLLDEFS) $(EXTRADEFS) -MAINSPEC = $(MODULE:%.dll=%).spec -SPEC_DEF = $(MAINSPEC).def -WIN16_FILES = $(SPEC_SRCS16:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16) -ALL_OBJS = $(OBJS) $(MODULE).dbg.o -ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) -IMPORTLIBS = $(DELAYIMPORTS:%=$(DLLDIR)/lib%.$(IMPLIBEXT)) $(IMPORTS:%=$(DLLDIR)/lib%.$(IMPLIBEXT)) - -all: $(MODULE)$(DLLEXT) $(SUBDIRS) - - -# Global rules shared by all makefiles -*-Makefile-*- -# -# Each individual makefile must define the following variables: -# TOPSRCDIR : top-level source directory -# TOPOBJDIR : top-level object directory -# SRCDIR : source directory for this module -# MODULE : name of the module being built -# -# Each individual makefile may define the following additional variables: -# C_SRCS : C sources for the module -# C_SRCS16 : 16-bit C sources for the module -# RC_SRCS : resource source files -# EXTRA_SRCS : extra source files for make depend -# EXTRA_OBJS : extra object files -# IMPORTS : dlls to import -# DELAYIMPORTS : dlls to import in delayed mode -# SUBDIRS : subdirectories that contain a Makefile -# EXTRASUBDIRS : subdirectories that do not contain a Makefile -# INSTALLSUBDIRS : subdirectories to run make install/uninstall into - -# First some useful definitions - -SHELL = /bin/sh -CC = mingw32-gcc -CFLAGS = -g -O2 -CPPFLAGS = -LIBS = -BISON = bison -YACC = $(BISON) -y -LEX = flex -LEXLIB = -EXEEXT = .exe -OBJEXT = o -LIBEXT = dll -DLLEXT = -IMPLIBEXT = a -LDSHARED = -DLLTOOL = mingw32-dlltool -DLLWRAP = mingw32-dllwrap -AR = mingw32-ar rc -RANLIB = mingw32-ranlib -STRIP = mingw32-strip -WINDRES = mingw32-windres -LN = ln -LN_S = ln -s -TOOLSDIR = /usr/src/wine-tools/ -AS = mingw32-as -LD = mingw32-ld -LDFLAGS = -RM = rm -f -MV = mv -LINT = -LINTFLAGS = -FONTFORGE = fontforge -INCLUDES = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL) -EXTRACFLAGS = -Wall -pipe -fno-strength-reduce -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) -ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS) -IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS) -MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755 -WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi_check/winapi_check -WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper -C2MAN = $(TOPSRCDIR)/tools/c2man.pl -RUNTEST = $(TOPSRCDIR)/tools/runtest -WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild -MAKEDEP = $(TOOLSDIR)/tools/makedep -WRC = $(TOOLSDIR)/tools/wrc/wrc -BIN2RES = $(TOOLSDIR)/tools/bin2res -WMC = $(TOOLSDIR)/tools/wmc/wmc -WIDL = $(TOOLSDIR)/tools/widl/widl -WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc -SFNT2FNT = $(TOOLSDIR)/tools/sfnt2fnt -FNT2FON = $(TOOLSDIR)/tools/fnt2fon -RC = $(WRC) -RC16 = $(WRC) -RCFLAGS = --nostdinc $(INCLUDES) $(DEFS) $(EXTRARCFLAGS) -RC16FLAGS = -O res16 $(RCFLAGS) -LDPATH = LD_LIBRARY_PATH="$(TOOLSDIR)/libs/unicode:$$LD_LIBRARY_PATH" -DLLDIR = $(TOPOBJDIR)/dlls -LIBDIR = $(TOPOBJDIR)/libs -LIBPORT = -L$(TOPOBJDIR)/libs/port -lwine_port -LIBUNICODE = -L$(TOPOBJDIR)/libs/unicode -lwine_unicode -LIBWINE = -L$(TOPOBJDIR)/libs/wine -lwine - - - -# Installation infos - -INSTALL = /usr/bin/ginstall -c $(INSTALL_FLAGS) -INSTALL_PROGRAM = ${INSTALL} $(INSTALL_PROGRAM_FLAGS) -INSTALL_SCRIPT = ${INSTALL} $(INSTALL_SCRIPT_FLAGS) -INSTALL_DATA = ${INSTALL} -m 644 $(INSTALL_DATA_FLAGS) -prefix = /usr/local -exec_prefix = ${prefix} -bindir = ${exec_prefix}/bin -libdir = ${exec_prefix}/lib -datadir = ${prefix}/share -infodir = ${prefix}/info -mandir = ${prefix}/man -sysconfdir = ${prefix}/etc -includedir = ${prefix}/include/wine -dlldir = ${exec_prefix}/lib/wine -prog_manext = 1 -api_manext = 3w -conf_manext = 5 -CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \ - *.flc *.spec.c *.spec.def *.dbg.c *.tab.c *.tab.h lex.yy.c core - -OBJS = $(C_SRCS:.c=.o) $(EXTRA_OBJS) - -RCOBJS = $(RC_SRCS:.rc=.res.o) -LINTS = $(C_SRCS:.c=.ln) - -# Implicit rules - -.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.c .spec.def .idl .h .ok .sfd .ttf - -.c.o: - $(CC) -c $(ALLCFLAGS) -o $@ $< - -.s.o: - $(AS) -o $@ $< - -.mc.mc.rc: - $(LDPATH) $(WMC) -i -U -H /dev/null -o $@ $< - -.rc.res: - $(LDPATH) $(RC) $(RCFLAGS) -fo$@ $< - -.res.res.o: - $(WINDRES) -i $< -o $@ - -.spec.spec.c: - $(WINEBUILD) $(DEFS) -o $@ --main-module $(MODULE) --dll $< - -.spec.spec.def: - $(WINEBUILD) -w $(DEFS) -o $@ --def $< - -.idl.h: - $(WIDL) $(IDLFLAGS) -h -H $@ $< - -.c.ln: - $(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 ) - -.c.ok: - $(RUNTEST) $(RUNTESTFLAGS) $< && touch $@ - -.sfd.ttf: - $(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< - -# 'all' target first in case the enclosing Makefile didn't define any target - -all: Makefile - -filter: - @$(TOPSRCDIR)/tools/winapi/make_filter --make $(MAKE) all - -.PHONY: all filter - -# Rules for resources - -$(RC_BINARIES): $(BIN2RES) $(RC_BINSRC) - $(BIN2RES) -f -o $@ $(SRCDIR)/$(RC_BINSRC) - -$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) $(RC_BINARIES) - -# Rule for main module debug channels - -$(MODULE).dbg.c: $(C_SRCS) $(C_SRCS16) $(WINEBUILD) - $(WINEBUILD) $(DEFS) -o $@ --debug -C$(SRCDIR) $(C_SRCS) $(C_SRCS16) - -# Rules for makefile - -Makefile: Makefile.in $(TOPSRCDIR)/configure - @echo Makefile is older than $?, please rerun $(TOPSRCDIR)/configure - @exit 1 - -# Rule for linting - -$(MODULE).ln : $(LINTS) - if test "$(LINTS)" ; \ - then \ - $(LINT) $(ALLLINTFLAGS) -o$(MODULE) $(LINTS) ; \ - $(MV) llib-l$(MODULE).ln $(MODULE).ln ; \ - else \ - $(LINT) $(ALLLINTFLAGS) -C$(MODULE) /dev/null ; \ - fi - -lint:: $(MODULE).ln - -# Rules for Windows API checking - -winapi_check:: dummy - $(WINAPI_CHECK) $(WINAPI_CHECK_FLAGS) $(WINAPI_CHECK_EXTRA_FLAGS) . - -.PHONY: winapi_check - -# Rules for dependencies - -$(SUBDIRS:%=%/__depend__): dummy - cd `dirname $@` && $(MAKE) depend - -depend: $(IDL_SRCS:.idl=.h) $(SUBDIRS:%=%/__depend__) - $(MAKEDEP) $(INCLUDES) -C$(SRCDIR) $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(IDL_SRCS) $(EXTRA_SRCS) - -.PHONY: depend $(SUBDIRS:%=%/__depend__) - -# Rules for cleaning - -$(SUBDIRS:%=%/__clean__): dummy - cd `dirname $@` && $(MAKE) clean - -$(SUBDIRS:%=%/__testclean__): dummy - cd `dirname $@` && $(MAKE) testclean - -$(EXTRASUBDIRS:%=%/__clean__): dummy - -cd `dirname $@` && $(RM) $(CLEAN_FILES) - -testclean:: $(SUBDIRS:%=%/__testclean__) - -clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) - $(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(IDL_SRCS:.idl=.h) $(PROGRAMS) $(RC_BINARIES) - -.PHONY: clean testclean $(SUBDIRS:%=%/__clean__) $(SUBDIRS:%=%/__testclean__) $(EXTRASUBDIRS:%=%/__clean__) - -# Rules for installing - -$(SUBDIRS:%=%/__install__): dummy - cd `dirname $@` && $(MAKE) install - -$(SUBDIRS:%=%/__install-lib__): dummy - cd `dirname $@` && $(MAKE) install-lib - -$(SUBDIRS:%=%/__install-dev__): dummy - cd `dirname $@` && $(MAKE) install-dev - -$(SUBDIRS:%=%/__uninstall__): dummy - cd `dirname $@` && $(MAKE) uninstall - -install:: $(INSTALLSUBDIRS:%=%/__install__) - -uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) - -.PHONY: install install-lib install-dev uninstall \ - $(SUBDIRS:%=%/__install__) $(SUBDIRS:%=%/__uninstall__) \ - $(SUBDIRS:%=%/__install-lib__) $(SUBDIRS:%=%/__install-dev__) - -# Rules for checking that no imports are missing - -$(SUBDIRS:%=%/__checklink__): dummy - @cd `dirname $@` && $(MAKE) checklink - -.PHONY: checklink $(SUBDIRS:%=%/__checklink__) - -# Rules for testing - -$(SUBDIRS:%=%/__test__): dummy - @cd `dirname $@` && $(MAKE) test - -$(SUBDIRS:%=%/__crosstest__): dummy - @cd `dirname $@` && $(MAKE) crosstest - -.PHONY: check test crosstest $(SUBDIRS:%=%/__test__) $(SUBDIRS:%=%/__crosstest__) - -# Misc. rules - -$(MC_SRCS:.mc=.mc.rc): $(WMC) - -$(IDL_SRCS:.idl=.h): $(WIDL) - -$(SUBDIRS): dummy - @cd $@ && $(MAKE) - -dummy: - -.PHONY: dummy $(SUBDIRS) - -# End of global rules - -# Rules for .so files - -$(MODULE).so: $(MAINSPEC) $(RC_SRCS:.rc=.res) $(ALL_OBJS) $(IMPORTLIBS) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(RC_SRCS:.rc=.res) $(SUBSYSTEM:%=-Wb,--subsystem,%) -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(IMPORTS:%=-l%) $(ALL_LIBS) - -# Rules for .dll files - -$(MODULE): $(RCOBJS) $(OBJS) $(MODULE).dbg.o $(SPEC_DEF) $(IMPORTLIBS) Makefile.in - $(DLLWRAP) -k --def $(SPEC_DEF) -o $@ $(RCOBJS) $(OBJS) $(MODULE).dbg.o -L$(DLLDIR) $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS) - -$(SPEC_DEF): $(WINEBUILD) - -# Rules for checking that no imports are missing - -.PHONY: checklink16 $(WIN16_FILES:%=__checklink16__%) - -$(WIN16_FILES:%=__checklink16__%): checklink16 - -checklink16:: $(MAINSPEC).o $(OBJS) $(MODULE).dbg.o dummy - $(CC) -o checklink -Wl,-rpath,$(TOPOBJDIR)/libs $(TOPSRCDIR)/dlls/checklink.c $(MAINSPEC).o $(OBJS) $(MODULE).dbg.o -L$(DLLDIR) $(ALL_LIBS) -lm && $(RM) checklink $(MAINSPEC).c $(MAINSPEC).o - -checklink:: $(WIN16_FILES:%=__checklink16__%) - -# Rules for testing - -check test:: $(SUBDIRS:%=%/__test__) - -crosstest:: $(SUBDIRS:%=%/__crosstest__) - -# Rule to explicitly generate the .spec.c for debugging - -$(MAINSPEC).c: $(MAINSPEC) $(RC_SRCS:.rc=.res) $(ALL_OBJS) $(IMPORTLIBS) $(WINEBUILD) - $(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --dll $(SRCDIR)/$(MAINSPEC) $(SUBSYSTEM:%=--subsystem %) $(RC_SRCS:.rc=.res) $(ALL_OBJS) -L$(DLLDIR) $(DELAYIMPORTS:%=-d%) $(IMPORTS:%=-l%) - -# Rules for auto documentation - -man: $(C_SRCS) - $(C2MAN) -o $(TOPOBJDIR)/documentation/man$(api_manext) -R$(TOPOBJDIR) -S$(api_manext) $(INCLUDES) $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16) - -doc-html: $(C_SRCS) - $(C2MAN) -o $(TOPOBJDIR)/documentation/html -R$(TOPSRCDIR) $(INCLUDES) -Th $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16) - -doc-sgml: $(C_SRCS) - $(C2MAN) -o $(TOPOBJDIR)/documentation/api-guide -R$(TOPSRCDIR) $(INCLUDES) -Ts $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16) - -.PHONY: man doc-html doc-sgml - -# Rules for installation - -EXE_SPECS16 = $(SPEC_SRCS16:.exe.spec=.exe) -DRV_SPECS16 = $(EXE_SPECS16:.drv.spec=.drv) -ALL_SPECS16 = $(DRV_SPECS16:.spec=.dll) - -WIN16_INSTALL = $(ALL_SPECS16:%=_install_/%) - -.PHONY: install_lib $(ALL_SPECS16:%=_install_/%) $(ALL_SPECS16:%=_uninstall_/%) - -$(ALL_SPECS16:%=_install_/%): install_lib - cd $(dlldir) && $(RM) `basename $@`$(DLLEXT) && $(LN_S) $(MODULE)$(DLLEXT) `basename $@`$(DLLEXT) - -$(ALL_SPECS16:%=_uninstall_/%): dummy - $(RM) $(dlldir)/`basename $@`$(DLLEXT) - -install_lib: $(MODULE)$(DLLEXT) - $(MKINSTALLDIRS) $(dlldir) - $(INSTALL_PROGRAM) $(MODULE)$(DLLEXT) $(dlldir)/$(MODULE)$(DLLEXT) - -install:: install_lib - -uninstall:: $(ALL_SPECS16:%=_uninstall_/%) - $(RM) $(dlldir)/$(MODULE)$(DLLEXT) - -# Misc. rules - -$(SPEC_SRCS16:.spec=.spec.c): $(WINEBUILD) - -# End of global dll rules - -### Dependencies:

19 years, 7 months

[weiden] 13303: don't shift the PIDs of objects so the first bit can be used to lock objects, as the lower 2 bits of PIDs are now always zero just test and set this bit

by weiden＠svn.reactos.com

don't shift the PIDs of objects so the first bit can be used to lock objects, as the lower 2 bits of PIDs are now always zero just test and set this bit Modified: trunk/reactos/include/win32k/ntuser.h Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c _____ Modified: trunk/reactos/include/win32k/ntuser.h --- trunk/reactos/include/win32k/ntuser.h 2005-01-26 00:12:33 UTC (rev 13302) +++ trunk/reactos/include/win32k/ntuser.h 2005-01-26 00:43:24 UTC (rev 13303) @@ -1814,7 +1814,7 @@ typedef struct _GDI_TABLE_ENTRY { PVOID KernelData; /* Points to the kernel mode structure */ - LONG ProcessId; /* process id that created the object, 0 for stock objects */ + HANDLE ProcessId; /* process id that created the object, 0 for stock objects */ LONG Type; /* the first 16 bit is the object type including the stock obj flag, the last 16 bits is just the object type */ PVOID UserData; /* Points to the user mode structure, usually NULL though */ } GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY; _____ Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c --- trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-01-26 00:12:33 UTC (rev 13302) +++ trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-01-26 00:43:24 UTC (rev 13303) @@ -327,7 +327,7 @@ PW32PROCESS W32Process; PGDIOBJHDR newObject; PPAGED_LOOKASIDE_LIST LookasideList; - LONG CurrentProcessId, LockedProcessId; + HANDLE CurrentProcessId, LockedProcessId; #ifdef GDI_DEBUG ULONG Attempts = 0; #endif @@ -351,11 +351,8 @@ PGDIOBJ ObjectBody; LONG TypeInfo; - /* shift the process id to the left so we can use the first bit to lock - the object. - FIXME - don't shift once ROS' PIDs match with nt! */ - CurrentProcessId = (LONG)PsGetCurrentProcessId() << 1; - LockedProcessId = CurrentProcessId | 0x1; + CurrentProcessId = PsGetCurrentProcessId(); + LockedProcessId = (HANDLE)((ULONG_PTR)CurrentProcessId | 0x1); newObject->LockingThread = NULL; newObject->Locks = 0; @@ -376,7 +373,7 @@ FreeEntry = InterlockedPopEntrySList(&HandleTable->FreeEntriesHead); if(FreeEntry != NULL) { - LONG PrevProcId; + HANDLE PrevProcId; UINT Index; HGDIOBJ Handle; @@ -387,8 +384,8 @@ Handle = (HGDIOBJ)((Index & 0xFFFF) | (ObjectType & 0xFFFF0000)); LockHandle: - PrevProcId = InterlockedCompareExchange(&Entry->ProcessId, LockedProcessId, 0); - if(PrevProcId == 0) + PrevProcId = InterlockedCompareExchangePointer(&Entry->ProcessId, LockedProcessId, 0); + if(PrevProcId == NULL) { ASSERT(Entry->KernelData == NULL); @@ -399,7 +396,7 @@ Entry->Type = TypeInfo; /* unlock the entry */ - InterlockedExchange(&Entry->ProcessId, CurrentProcessId); + InterlockedExchangePointer(&Entry->ProcessId, CurrentProcessId); #ifdef GDI_DEBUG memset ( GDIHandleAllocator[Index], 0xcd, GDI_STACK_LEVELS * sizeof(ULONG) ); @@ -468,7 +465,8 @@ { PGDI_TABLE_ENTRY Entry; PPAGED_LOOKASIDE_LIST LookasideList; - LONG ProcessId, LockedProcessId, PrevProcId, ExpectedType; + HANDLE ProcessId, LockedProcessId, PrevProcId; + LONG ExpectedType; #ifdef GDI_DEBUG ULONG Attempts = 0; #endif @@ -484,10 +482,8 @@ return FALSE; } - /* shift the process id to the left so we can use the first bit to lock the object. - FIXME - don't shift once ROS' PIDs match with nt! */ - ProcessId = (LONG)PsGetCurrentProcessId() << 1; - LockedProcessId = ProcessId | 0x1; + ProcessId = PsGetCurrentProcessId(); + LockedProcessId = (HANDLE)((ULONG_PTR)ProcessId | 0x1); ExpectedType = ((ObjectType != GDI_OBJECT_TYPE_DONTCARE) ? ObjectType : 0); @@ -496,7 +492,7 @@ LockHandle: /* lock the object, we must not delete global objects, so don't exchange the locking process ID to zero when attempting to lock a global object... */ - PrevProcId = InterlockedCompareExchange(&Entry->ProcessId, LockedProcessId, ProcessId); + PrevProcId = InterlockedCompareExchangePointer(&Entry->ProcessId, LockedProcessId, ProcessId); if(PrevProcId == ProcessId) { if(Entry->Type != 0 && Entry->KernelData != NULL && (ExpectedType == 0 || ((Entry->Type << 16) == ExpectedType))) @@ -516,7 +512,7 @@ Entry->KernelData = NULL; /* unlock the handle slot */ - InterlockedExchange(&Entry->ProcessId, 0); + InterlockedExchangePointer(&Entry->ProcessId, NULL); /* push this entry to the free list */ InterlockedPushEntrySList(&HandleTable->FreeEntriesHead, @@ -546,7 +542,7 @@ Entry->Type = 0; /* unlock the handle slot */ - InterlockedExchange(&Entry->ProcessId, 0); + InterlockedExchangePointer(&Entry->ProcessId, NULL); /* report a successful deletion as the object is actually removed from the table */ return TRUE; @@ -562,7 +558,7 @@ { DPRINT1("Attempted to delete object 0x%x which was already deleted!\n", hObj); } - InterlockedExchange(&Entry->ProcessId, PrevProcId); + InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); } } else if(PrevProcId == LockedProcessId) @@ -581,13 +577,13 @@ } else { - if((PrevProcId >> 1) == 0) + if(((ULONG_PTR)PrevProcId & 0x1) == 0) { DPRINT1("Attempted to free global gdi handle 0x%x, caller needs to get ownership first!!!", hObj); } else { - DPRINT1("Attempted to free foreign handle: 0x%x Owner: 0x%x from Caller: 0x%x\n", hObj, PrevProcId >> 1, ProcessId >> 1); + DPRINT1("Attempted to free foreign handle: 0x%x Owner: 0x%x from Caller: 0x%x\n", hObj, (ULONG_PTR)PrevProcId & ~0x1, (ULONG_PTR)ProcessId & ~0x1); } #ifdef GDI_DEBUG DPRINT1("-> called from %s:%i\n", file, line); @@ -712,7 +708,7 @@ PGDI_TABLE_ENTRY Entry, End; PEPROCESS CurrentProcess; PW32PROCESS W32Process; - LONG ProcId; + HANDLE ProcId; ULONG Index = RESERVE_ENTRIES_COUNT; DPRINT("Starting CleanupForProcess prochandle %x Pid %d\n", Process, Process->UniqueProcessId); @@ -728,7 +724,7 @@ { /* FIXME - Instead of building the handle here and delete it using GDIOBJ_FreeObj we should delete it directly here! */ - ProcId = ((LONG)Process->UniqueProcessId << 1); + ProcId = Process->UniqueProcessId; End = &HandleTable->Entries[GDI_HANDLE_COUNT]; for(Entry = &HandleTable->Entries[RESERVE_ENTRIES_COUNT]; @@ -736,7 +732,7 @@ Entry++, Index++) { /* ignore the lock bit */ - if((Entry->ProcessId & ~0x1) == ProcId && Entry->Type != 0) + if((HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1) == ProcId && Entry->Type != 0) { HGDIOBJ ObjectHandle; @@ -785,7 +781,8 @@ { PGDI_TABLE_ENTRY Entry; PETHREAD Thread; - LONG ProcessId, LockedProcessId, PrevProcId, ExpectedType; + HANDLE ProcessId, LockedProcessId, PrevProcId; + LONG ExpectedType; #ifdef GDI_DEBUG ULONG Attempts = 0; #endif @@ -794,10 +791,8 @@ Thread = PsGetCurrentThread(); - /* shift the process id to the left so we can use the first bit to lock the object. - FIXME - don't shift once ROS' PIDs match with nt! */ - ProcessId = (LONG)PsGetCurrentProcessId() << 1; - LockedProcessId = ProcessId | 0x1; + ProcessId = PsGetCurrentProcessId(); + LockedProcessId = (HANDLE)((ULONG_PTR)ProcessId | 0x1); ExpectedType = ((ObjectType != GDI_OBJECT_TYPE_DONTCARE) ? ObjectType : 0); @@ -805,7 +800,7 @@ LockHandle: /* lock the object, we must not delete stock objects, so don't check!!! */ - PrevProcId = InterlockedCompareExchange(&Entry->ProcessId, LockedProcessId, ProcessId); + PrevProcId = InterlockedCompareExchangePointer(&Entry->ProcessId, LockedProcessId, ProcessId); if(PrevProcId == ProcessId) { LONG EntryType = Entry->Type << 16; @@ -835,14 +830,14 @@ #endif } - InterlockedExchange(&Entry->ProcessId, PrevProcId); + InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); /* we're done, return the object body */ return GDIHdrToBdy(GdiHdr); } else { - InterlockedExchange(&Entry->ProcessId, PrevProcId); + InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); #ifdef GDI_DEBUG if(++Attempts > 20) @@ -857,7 +852,7 @@ } else { - InterlockedExchange(&Entry->ProcessId, PrevProcId); + InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); if(EntryType == 0) { @@ -888,17 +883,17 @@ /* try again */ goto LockHandle; } - else if((PrevProcId & ~0x1) == 0) + else if(((ULONG_PTR)PrevProcId & ~0x1) == 0) { /* we're trying to lock a global object, change the ProcessId to 0 and try again */ - ProcessId = 0x0; - LockedProcessId = ProcessId |0x1; + ProcessId = NULL; + LockedProcessId = (HANDLE)((ULONG_PTR)ProcessId | 0x1); goto LockHandle; } else { - DPRINT1("Attempted to lock foreign handle: 0x%x, Owner: 0x%x locked: 0x%x Caller: 0x%x, stockobj: 0x%x\n", hObj, PrevProcId >> 1, PrevProcId & 0x1, PsGetCurrentProcessId(), GDI_HANDLE_IS_STOCKOBJ(hObj)); + DPRINT1("Attempted to lock foreign handle: 0x%x, Owner: 0x%x locked: 0x%x Caller: 0x%x, stockobj: 0x%x\n", hObj, (ULONG_PTR)PrevProcId & ~0x1, (ULONG_PTR)PrevProcId & 0x1, PsGetCurrentProcessId(), GDI_HANDLE_IS_STOCKOBJ(hObj)); KeRosDumpStackFrames ( NULL, 20 ); #ifdef GDI_DEBUG DPRINT1("-> called from %s:%i\n", file, line); @@ -927,7 +922,7 @@ { PGDI_TABLE_ENTRY Entry; PETHREAD Thread; - LONG ProcessId, LockedProcessId, PrevProcId; + HANDLE ProcessId, LockedProcessId, PrevProcId; #ifdef GDI_DEBUG ULONG Attempts = 0; #endif @@ -935,16 +930,14 @@ DPRINT("GDIOBJ_UnlockObj: hObj: 0x%08x\n", hObj); Thread = PsGetCurrentThread(); - /* shift the process id to the left so we can use the first bit to lock the object. - FIXME - don't shift once ROS' PIDs match with nt! */ - ProcessId = (LONG)PsGetCurrentProcessId() << 1; - LockedProcessId = ProcessId | 0x1; + ProcessId = PsGetCurrentProcessId(); + LockedProcessId = (HANDLE)((ULONG_PTR)ProcessId | 0x1); Entry = GDI_HANDLE_GET_ENTRY(HandleTable, hObj); LockHandle: /* lock the handle, we must not delete stock objects, so don't check!!! */ - PrevProcId = InterlockedCompareExchange(&Entry->ProcessId, LockedProcessId, ProcessId); + PrevProcId = InterlockedCompareExchangePointer(&Entry->ProcessId, LockedProcessId, ProcessId); if(PrevProcId == ProcessId) { /* we're unlocking an object that belongs to our process or it's a global @@ -982,7 +975,7 @@ /* we should delete the handle */ Entry->KernelData = NULL; - InterlockedExchange(&Entry->ProcessId, 0); + InterlockedExchangePointer(&Entry->ProcessId, 0); InterlockedPushEntrySList(&HandleTable->FreeEntriesHead, &HandleTable->FreeEntries[GDI_ENTRY_TO_INDEX(HandleTable, Entry)]); @@ -1005,7 +998,7 @@ else { /* remove the handle slot lock */ - InterlockedExchange(&Entry->ProcessId, PrevProcId); + InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); Ret = TRUE; } @@ -1017,7 +1010,7 @@ { DPRINT1("Attempted to unlock object 0x%x, previously locked by other thread (0x%x) from %s:%i (called from %s:%i)\n", hObj, PrevThread, GdiHdr->lockfile, GdiHdr->lockline, file, line); - InterlockedExchange(&Entry->ProcessId, PrevProcId); + InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); } #endif else @@ -1029,7 +1022,7 @@ } #endif /* FIXME - we should give up after some time unless we want to wait forever! */ - InterlockedExchange(&Entry->ProcessId, PrevProcId); + InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); DelayExecution(); goto LockHandle; @@ -1037,7 +1030,7 @@ } else { - InterlockedExchange(&Entry->ProcessId, PrevProcId); + InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); DPRINT1("Attempted to unlock object 0x%x that is deleted!\n", hObj); } } @@ -1055,17 +1048,17 @@ /* try again */ goto LockHandle; } - else if((PrevProcId & ~0x1) == 0) + else if(((ULONG_PTR)PrevProcId & ~0x1) == 0) { /* we're trying to unlock a global object, change the ProcessId to 0 and try again */ - ProcessId = 0x0; - LockedProcessId = ProcessId |0x1; + ProcessId = NULL; + LockedProcessId = (HANDLE)((ULONG_PTR)ProcessId | 0x1); goto LockHandle; } else { - DPRINT1("Attempted to unlock foreign handle: 0x%x, Owner: 0x%x locked: 0x%x Caller: 0x%x, stockobj: 0x%x\n", hObj, PrevProcId >> 1, PrevProcId & 0x1, PsGetCurrentProcessId(), GDI_HANDLE_IS_STOCKOBJ(hObj)); + DPRINT1("Attempted to unlock foreign handle: 0x%x, Owner: 0x%x locked: 0x%x Caller: 0x%x, stockobj: 0x%x\n", hObj, (ULONG_PTR)PrevProcId & ~0x1, (ULONG_PTR)PrevProcId & 0x1, PsGetCurrentProcessId(), GDI_HANDLE_IS_STOCKOBJ(hObj)); } return FALSE; @@ -1075,19 +1068,19 @@ GDIOBJ_OwnedByCurrentProcess(HGDIOBJ ObjectHandle) { PGDI_TABLE_ENTRY Entry; - LONG ProcessId; + HANDLE ProcessId; BOOL Ret; DPRINT("GDIOBJ_OwnedByCurrentProcess: ObjectHandle: 0x%08x\n", ObjectHandle); if(!GDI_HANDLE_IS_STOCKOBJ(ObjectHandle)) { - ProcessId = (LONG)PsGetCurrentProcessId() << 1; + ProcessId = PsGetCurrentProcessId(); Entry = GDI_HANDLE_GET_ENTRY(HandleTable, ObjectHandle); Ret = Entry->KernelData != NULL && Entry->Type != 0 && - (Entry->ProcessId & ~0x1) == ProcessId; + (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1) == ProcessId; return Ret; } @@ -1103,7 +1096,7 @@ * MIGHT ATTEMPT TO LOCK THE OBJECT DURING THIS CALL!!! */ PGDI_TABLE_ENTRY Entry; - LONG ProcessId, LockedProcessId, PrevProcId; + HANDLE ProcessId, LockedProcessId, PrevProcId; PETHREAD Thread; #ifdef GDI_DEBUG ULONG Attempts = 0; @@ -1117,16 +1110,14 @@ if(!GDI_HANDLE_IS_STOCKOBJ(*hObj)) { - /* shift the process id to the left so we can use the first bit to lock the object. - FIXME - don't shift once ROS' PIDs match with nt! */ - ProcessId = (LONG)PsGetCurrentProcessId() << 1; - LockedProcessId = ProcessId | 0x1; + ProcessId = PsGetCurrentProcessId(); + LockedProcessId = (HANDLE)((ULONG_PTR)ProcessId | 0x1); Entry = GDI_HANDLE_GET_ENTRY(HandleTable, *hObj); LockHandle: /* lock the object, we must not convert stock objects, so don't check!!! */ - PrevProcId = InterlockedCompareExchange(&Entry->ProcessId, LockedProcessId, ProcessId); + PrevProcId = InterlockedCompareExchangePointer(&Entry->ProcessId, LockedProcessId, ProcessId); if(PrevProcId == ProcessId) { LONG NewType, PrevType, OldType; @@ -1165,7 +1156,7 @@ NTSTATUS Status; /* FIXME */ - Status = PsLookupProcessByProcessId((PVOID)(PrevProcId >> 1), &OldProcess); + Status = PsLookupProcessByProcessId((HANDLE)((ULONG_PTR)PrevProcId & ~0x1), &OldProcess); if(NT_SUCCESS(Status)) { W32Process = OldProcess->Win32Process; @@ -1178,7 +1169,7 @@ } /* remove the process id lock and make it global */ - InterlockedExchange(&Entry->ProcessId, GDI_GLOBAL_PROCESS); + InterlockedExchangePointer(&Entry->ProcessId, GDI_GLOBAL_PROCESS); *hObj = (HGDIOBJ)((ULONG)(*hObj) | GDI_HANDLE_STOCK_MASK); @@ -1199,7 +1190,7 @@ /* WTF?! The object is already locked by a different thread! Release the lock, wait a bit and try again! FIXME - we should give up after some time unless we want to wait forever! */ - InterlockedExchange(&Entry->ProcessId, PrevProcId); + InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); DelayExecution(); goto LockHandle; @@ -1237,7 +1228,7 @@ GDIOBJ_SetOwnership(HGDIOBJ ObjectHandle, PEPROCESS NewOwner) { PGDI_TABLE_ENTRY Entry; - LONG ProcessId, LockedProcessId, PrevProcId; + HANDLE ProcessId, LockedProcessId, PrevProcId; PETHREAD Thread; #ifdef GDI_DEBUG ULONG Attempts = 0; @@ -1249,16 +1240,14 @@ if(!GDI_HANDLE_IS_STOCKOBJ(ObjectHandle)) { - /* shift the process id to the left so we can use the first bit to lock the object. - FIXME - don't shift once ROS' PIDs match with nt! */ - ProcessId = (LONG)PsGetCurrentProcessId() << 1; - LockedProcessId = ProcessId | 0x1; + ProcessId = PsGetCurrentProcessId(); + LockedProcessId = (HANDLE)((ULONG_PTR)ProcessId | 0x1); Entry = GDI_HANDLE_GET_ENTRY(HandleTable, ObjectHandle); LockHandle: /* lock the object, we must not convert stock objects, so don't check!!! */ - PrevProcId = InterlockedCompareExchange(&Entry->ProcessId, ProcessId, LockedProcessId); + PrevProcId = InterlockedCompareExchangePointer(&Entry->ProcessId, ProcessId, LockedProcessId); if(PrevProcId == ProcessId) { PETHREAD PrevThread; @@ -1276,7 +1265,7 @@ /* dereference the process' object counter */ /* FIXME */ - Status = PsLookupProcessByProcessId((PVOID)(PrevProcId >> 1), &OldProcess); + Status = PsLookupProcessByProcessId((HANDLE)((ULONG_PTR)PrevProcId & ~0x1), &OldProcess); if(NT_SUCCESS(Status)) { W32Process = OldProcess->Win32Process; @@ -1289,8 +1278,7 @@ if(NewOwner != NULL) { - /* FIXME */ - ProcessId = (LONG)PsGetProcessId(NewOwner) << 1; + ProcessId = PsGetProcessId(NewOwner); /* Increase the new process' object counter */ W32Process = NewOwner->Win32Process; @@ -1303,7 +1291,7 @@ ProcessId = 0; /* remove the process id lock and change it to the new process id */ - InterlockedExchange(&Entry->ProcessId, ProcessId); + InterlockedExchangePointer(&Entry->ProcessId, ProcessId); /* we're done! */ return; @@ -1325,7 +1313,7 @@ being deleted in the meantime (because we don't have aquired a reference at this point). FIXME - we should give up after some time unless we want to wait forever! */ - InterlockedExchange(&Entry->ProcessId, PrevProcId); + InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); DelayExecution(); goto LockHandle; @@ -1350,16 +1338,16 @@ /* try again */ goto LockHandle; } - else if((PrevProcId >> 1) == 0) + else if(((ULONG_PTR)PrevProcId & ~0x1) == 0) { /* allow changing ownership of global objects */ - ProcessId = 0; - LockedProcessId = ProcessId | 0x1; + ProcessId = NULL; + LockedProcessId = (HANDLE)((ULONG_PTR)ProcessId | 0x1); goto LockHandle; } - else if((PrevProcId >> 1) != (LONG)PsGetCurrentProcessId()) + else if((HANDLE)((ULONG_PTR)PrevProcId & ~0x1) != PsGetCurrentProcessId()) { - DPRINT1("Attempted to change ownership of object 0x%x (pid: 0x%x) from pid 0x%x!!!\n", ObjectHandle, PrevProcId >> 1, PsGetCurrentProcessId()); + DPRINT1("Attempted to change ownership of object 0x%x (pid: 0x%x) from pid 0x%x!!!\n", ObjectHandle, (ULONG_PTR)PrevProcId & ~0x1, PsGetCurrentProcessId()); } else { @@ -1373,7 +1361,7 @@ { PGDI_TABLE_ENTRY FromEntry; PETHREAD Thread; - LONG FromProcessId, FromLockedProcessId, FromPrevProcId; + HANDLE FromProcessId, FromLockedProcessId, FromPrevProcId; #ifdef GDI_DEBUG ULONG Attempts = 0; #endif @@ -1386,12 +1374,12 @@ { FromEntry = GDI_HANDLE_GET_ENTRY(HandleTable, CopyFrom); - FromProcessId = FromEntry->ProcessId & ~0x1; - FromLockedProcessId = FromProcessId | 0x1; + FromProcessId = (HANDLE)((ULONG_PTR)FromEntry->ProcessId & ~0x1); + FromLockedProcessId = (HANDLE)((ULONG_PTR)FromProcessId | 0x1); LockHandleFrom: /* lock the object, we must not convert stock objects, so don't check!!! */ - FromPrevProcId = InterlockedCompareExchange(&FromEntry->ProcessId, FromProcessId, FromLockedProcessId); + FromPrevProcId = InterlockedCompareExchangePointer(&FromEntry->ProcessId, FromProcessId, FromLockedProcessId); if(FromPrevProcId == FromProcessId) { PETHREAD PrevThread; @@ -1408,11 +1396,11 @@ { /* now let's change the ownership of the target object */ - if((FromPrevProcId & ~0x1) != 0) + if(((ULONG_PTR)FromPrevProcId & ~0x1) != 0) { PEPROCESS ProcessTo; /* FIXME */ - if(NT_SUCCESS(PsLookupProcessByProcessId((PVOID)(FromPrevProcId >> 1), &ProcessTo))) + if(NT_SUCCESS(PsLookupProcessByProcessId((HANDLE)((ULONG_PTR)FromPrevPro cId & ~0x1), &ProcessTo))) { GDIOBJ_SetOwnership(CopyTo, ProcessTo); ObDereferenceObject(ProcessTo); @@ -1424,7 +1412,7 @@ GDIOBJ_SetOwnership(CopyTo, NULL); } - InterlockedExchange(&FromEntry->ProcessId, FromPrevProcId); + InterlockedExchangePointer(&FromEntry->ProcessId, FromPrevProcId); } else { @@ -1443,7 +1431,7 @@ being deleted in the meantime (because we don't have aquired a reference at this point). FIXME - we should give up after some time unless we want to wait forever! */ - InterlockedExchange(&FromEntry->ProcessId, FromPrevProcId); + InterlockedExchangePointer(&FromEntry->ProcessId, FromPrevProcId); DelayExecution(); goto LockHandleFrom; @@ -1468,12 +1456,12 @@ /* try again */ goto LockHandleFrom; } - else if((FromPrevProcId >> 1) != (LONG)PsGetCurrentProcessId()) + else if((HANDLE)((ULONG_PTR)FromPrevProcId & ~0x1) != PsGetCurrentProcessId()) { /* FIXME - should we really allow copying ownership from objects that we don't even own? */ - DPRINT1("WARNING! Changing copying ownership of object 0x%x (pid: 0x%x) to pid 0x%x!!!\n", CopyFrom, FromPrevProcId >> 1, PsGetCurrentProcessId()); - FromProcessId = FromPrevProcId & ~0x1; - FromLockedProcessId = FromProcessId | 0x1; + DPRINT1("WARNING! Changing copying ownership of object 0x%x (pid: 0x%x) to pid 0x%x!!!\n", CopyFrom, (ULONG_PTR)FromPrevProcId & ~0x1, PsGetCurrentProcessId()); + FromProcessId = (HANDLE)((ULONG_PTR)FromPrevProcId & ~0x1); + FromLockedProcessId = (HANDLE)((ULONG_PTR)FromProcessId | 0x1); goto LockHandleFrom; } else

19 years, 7 months

[mf] 13302: first draft of SDI browser application derived from ROS Explorer

by mf＠svn.reactos.com

first draft of SDI browser application derived from ROS Explorer Added: trunk/reactos/subsys/system/ibrowser/ Added: trunk/reactos/subsys/system/ibrowser/Makefile Added: trunk/reactos/subsys/system/ibrowser/Makefile.MinGW Added: trunk/reactos/subsys/system/ibrowser/Makefile.PCH Added: trunk/reactos/subsys/system/ibrowser/expat.license Added: trunk/reactos/subsys/system/ibrowser/favorites.cpp Added: trunk/reactos/subsys/system/ibrowser/favorites.h Added: trunk/reactos/subsys/system/ibrowser/ibrowser.cpp Added: trunk/reactos/subsys/system/ibrowser/ibrowser.dsp Added: trunk/reactos/subsys/system/ibrowser/ibrowser.dsw Added: trunk/reactos/subsys/system/ibrowser/ibrowser.h Added: trunk/reactos/subsys/system/ibrowser/ibrowser.rc Added: trunk/reactos/subsys/system/ibrowser/ibrowser_intres.h Added: trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc Added: trunk/reactos/subsys/system/ibrowser/mainframe.cpp Added: trunk/reactos/subsys/system/ibrowser/mainframe.h Added: trunk/reactos/subsys/system/ibrowser/make_ibrowser.dsp Added: trunk/reactos/subsys/system/ibrowser/precomp.cpp Added: trunk/reactos/subsys/system/ibrowser/precomp.h Added: trunk/reactos/subsys/system/ibrowser/readme.txt Added: trunk/reactos/subsys/system/ibrowser/res/ Added: trunk/reactos/subsys/system/ibrowser/res/dot.ico Added: trunk/reactos/subsys/system/ibrowser/res/dot_red.ico Added: trunk/reactos/subsys/system/ibrowser/res/dot_trans.ico Added: trunk/reactos/subsys/system/ibrowser/res/favorites.ico Added: trunk/reactos/subsys/system/ibrowser/res/ibrowser.ico Added: trunk/reactos/subsys/system/ibrowser/res/network.ico Added: trunk/reactos/subsys/system/ibrowser/res/reactos.ico Added: trunk/reactos/subsys/system/ibrowser/res/toolbar.bmp Added: trunk/reactos/subsys/system/ibrowser/utility/ Added: trunk/reactos/subsys/system/ibrowser/utility/comutil.h Deleted: trunk/reactos/subsys/system/ibrowser/utility/dragdropimpl.cpp Deleted: trunk/reactos/subsys/system/ibrowser/utility/dragdropimpl.h Deleted: trunk/reactos/subsys/system/ibrowser/utility/shellbrowserimpl.cpp Deleted: trunk/reactos/subsys/system/ibrowser/utility/shellbrowserimpl.h Deleted: trunk/reactos/subsys/system/ibrowser/utility/shellclasses.cpp Deleted: trunk/reactos/subsys/system/ibrowser/utility/shellclasses.dsp Deleted: trunk/reactos/subsys/system/ibrowser/utility/shellclasses.dsw Deleted: trunk/reactos/subsys/system/ibrowser/utility/shellclasses.h Deleted: trunk/reactos/subsys/system/ibrowser/utility/shelltests.cpp Deleted: trunk/reactos/subsys/system/ibrowser/utility/splitpath.c Deleted: trunk/reactos/subsys/system/ibrowser/utility/treedroptarget.h Modified: trunk/reactos/subsys/system/ibrowser/utility/utility.cpp Modified: trunk/reactos/subsys/system/ibrowser/utility/utility.h Modified: trunk/reactos/subsys/system/ibrowser/utility/window.cpp Modified: trunk/reactos/subsys/system/ibrowser/utility/window.h Added: trunk/reactos/subsys/system/ibrowser/webchild.cpp Added: trunk/reactos/subsys/system/ibrowser/webchild.h Property changes on: trunk/reactos/subsys/system/ibrowser ___________________________________________________________________ Name: svn:ignore + *.coff *.exe *.d *.o *.a *.sym *.map bin Debug Release DRelease UDebug URelease _NO_COMUTIL doxy-doc Win32 WineDll WineRelease *.ncb *.opt *.aps *.ncb *.plg *.suo buildno.h notifyhook.dll *.gch *.h.pch pack.* .gdbinit start-gdb.bat libexpat.dll _____ Added: trunk/reactos/subsys/system/ibrowser/Makefile --- trunk/reactos/subsys/system/ibrowser/Makefile 2005-01-26 00:03:05 UTC (rev 13301) +++ trunk/reactos/subsys/system/ibrowser/Makefile 2005-01-26 00:12:33 UTC (rev 13302) @@ -0,0 +1,47 @@ +# +# ROS Internet Web Browser +# +# Makefile +# + +PATH_TO_TOP := ../../.. + +TARGET_TYPE := program + +TARGET_APPTYPE := windows + +TARGET_NAME := ibrowser + +TARGET_INSTALLDIR := . + +TARGET_CFLAGS := \ + -D__USE_W32API -DWIN32 -D_ROS_ \ + -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 \ + -DUNICODE -fexceptions -Wall + +TARGET_CPPFLAGS := $(TARGET_CFLAGS) + +TARGET_RCFLAGS := -D__USE_W32API -DWIN32 -D_ROS_ -D__WINDRES__ + +TARGET_SDKLIBS := gdi32.a comctl32.a ole32.a oleaut32.a shell32.a expat.a + +TARGET_GCCLIBS := stdc++ uuid + +TARGET_OBJECTS := \ + ibrowser.o \ + mainframe.o \ + webchild.o \ + favorites.o \ + utility/utility.o \ + utility/window.o \ + utility/xmlstorage.o + +TARGET_CPPAPP := yes + +TARGET_PCH := precomp.h + +DEP_OBJECTS := $(TARGET_OBJECTS) + +include $(PATH_TO_TOP)/rules.mak +include $(TOOLS_PATH)/helper.mk +include $(TOOLS_PATH)/depend.mk Property changes on: trunk/reactos/subsys/system/ibrowser/Makefile ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/ibrowser/Makefile.MinGW --- trunk/reactos/subsys/system/ibrowser/Makefile.MinGW 2005-01-26 00:03:05 UTC (rev 13301) +++ trunk/reactos/subsys/system/ibrowser/Makefile.MinGW 2005-01-26 00:12:33 UTC (rev 13302) @@ -0,0 +1,67 @@ +# +# ROS Internet Web Browser +# +# Makefile.MinGW +# + +CC = gcc +CXX = g++ +LINK = g++ + +CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. +RCFLAGS = -DWIN32 -D__WINDRES__ +LFLAGS = -Wl,--subsystem,windows + +ifdef DEBUG +CFLAGS += -D_DEBUG -g +RCFLAGS += -D_DEBUG +LFLAGS += -g +else +CFLAGS += -DNDEBUG -Os +RCFLAGS += -DNDEBUG +LFLAGS += -s +endif + +ifndef UNICODE +UNICODE = 1 +endif + +ifeq ($(UNICODE),1) +CFLAGS += -DUNICODE +# LFLAGS+= -Wl,--entry,_wWinMain@16 +RCFLAGS += -DUNICODE +endif + +CXXFLAGS = $(CFLAGS) + +EXEC_SUFFIX = .exe +RES_SUFFIX = .coff + +VPATH = utility + +PROGRAM = ibrowser + +TARGET = $(PROGRAM)$(EXEC_SUFFIX) + +OBJECTS = \ + utility.o \ + window.o \ + ibrowser.o \ + webchild.o \ + mainframe.o \ + favorites.o \ + xmlstorage.o + +LIBS = gdi32 comctl32 shell32 ole32 uuid oleaut32 + +all: $(TARGET) + +$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) libexpat.dll + $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) $(addprefix -l,$(DELAYIMPORTS)) + +ibrowser$(RES_SUFFIX): $(PROGRAM)_intres.rc res/*.bmp res/*.ico + windres $(RCFLAGS) -o $@ $(PROGRAM)_intres.rc + +clean: + rm -f $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) \ + desktop/*.o dialogs/*.o shell/*.o taskbar/*.o utility/*.o _____ Added: trunk/reactos/subsys/system/ibrowser/Makefile.PCH --- trunk/reactos/subsys/system/ibrowser/Makefile.PCH 2005-01-26 00:03:05 UTC (rev 13301) +++ trunk/reactos/subsys/system/ibrowser/Makefile.PCH 2005-01-26 00:12:33 UTC (rev 13302) @@ -0,0 +1,72 @@ +# +# ROS Internet Web Browser +# +# Makefile.PCH +# +# MinGW Makefile with precompiled header support +# + +CC = gcc +CXX = g++ +LINK = g++ + +CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. +RCFLAGS = -DWIN32 -D__WINDRES__ +LFLAGS = -Wl,--subsystem,windows + +ifdef DEBUG +CFLAGS += -D_DEBUG -g +RCFLAGS += -D_DEBUG +LFLAGS += -g +else +CFLAGS += -DNDEBUG -Os -march=pentium4 +RCFLAGS += -DNDEBUG +LFLAGS += -s +endif + +ifndef UNICODE +UNICODE = 1 +endif + +ifeq ($(UNICODE),1) +CFLAGS += -DUNICODE +# LFLAGS+= -Wl,--entry,_wWinMain@16 +RCFLAGS += -DUNICODE +endif + +CXXFLAGS = $(CFLAGS) + +EXEC_SUFFIX = .exe +RES_SUFFIX = .coff + +VPATH = utility + +PROGRAM = ibrowser + +TARGET = $(PROGRAM)$(EXEC_SUFFIX) + +OBJECTS = \ + utility.o \ + window.o \ + ibrowser.o \ + webchild.o \ + mainframe.o \ + favorites.o \ + xmlstorage.o + +LIBS = gdi32 comctl32 shell32 ole32 oleaut32 uuid + +all: precomp.h.gch $(TARGET) + +precomp.h.gch: *.h utility/*.h + $(CXX) $(CFLAGS) precomp.h + +$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) libexpat.dll + $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) $(addprefix -l,$(DELAYIMPORTS)) + +ibrowser$(RES_SUFFIX): $(PROGRAM)_intres.rc res/*.bmp res/*.ico + windres $(RCFLAGS) -o $@ $(PROGRAM)_intres.rc + +clean: + rm -f $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) precomp.h.gch \ + utility/*.o _____ Copied: trunk/reactos/subsys/system/ibrowser/expat.license (from rev 13252, trunk/reactos/subsys/system/explorer/expat.license) _____ Copied: trunk/reactos/subsys/system/ibrowser/favorites.cpp (from rev 13256, trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp) --- trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp 2005-01-24 22:02:09 UTC (rev 13256) +++ trunk/reactos/subsys/system/ibrowser/favorites.cpp 2005-01-26 00:12:33 UTC (rev 13302) @@ -0,0 +1,494 @@ +/* + * Copyright 2004 Martin Fuchs + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + + // + // Explorer and Desktop clone + // + // favorites.cpp + // + // Martin Fuchs, 04.04.2004 + // + + +#include "precomp.h" + + +String DecodeURLString(const char* s) +{ + TCHAR buffer[BUFFER_LEN]; + LPTSTR o = buffer; + + for(const char* p=s; *p; ++p) + if (*p == '%') { + if (!strncmp(p+1, "20", 2)) { + *o++ = ' '; + p += 2; + } else + *o++ = *p; + } else + *o++ = *p; + + return String(buffer, o-buffer); +} + + + /// read .URL file +bool Bookmark::read_url(LPCTSTR path) +{ + char line[BUFFER_LEN]; + + tifstream in(path); + + while(in.good()) { + in.getline(line, BUFFER_LEN); + + const char* p = line; + while(isspace(*p)) + ++p; + + const char* keyword = p; + const char* eq = strchr(p, '='); + + if (eq) { + const char* cont = eq + 1; + while(isspace(*cont)) + ++cont; + + if (!strnicmp(keyword, "URL", 3)) + _url = DecodeURLString(cont); + else if (!strnicmp(keyword, "IconFile", 8)) + _icon_path = DecodeURLString(cont); + } + } + + return true; +} + + /// convert XBEL bookmark node +bool Bookmark::read(const_XMLPos& pos) +{ + _url = pos.get("href").c_str(); + + if (pos.go_down("title")) { + _name = pos->get_content(); + pos.back(); + } + + if (pos.go_down("desc")) { + _description = pos->get_content(); + pos.back(); + } + + if (pos.go_down("info")) { + const_XMLChildrenFilter metadata(pos, "metadata"); + + for(const_XMLChildrenFilter::const_iterator it=metadata.begin(); it!=metadata.end(); ++it) { + const XMLNode& node = **it; + const_XMLPos sub_pos(&node); + + if (node.get("owner") == "ros-explorer") { + if (sub_pos.go_down("icon")) { + _icon_path = sub_pos.get("path").c_str(); + _icon_idx = XS_toi(sub_pos.get("index")); + + sub_pos.back(); // </icon> + } + } + } + + pos.back(); // </metadata> + pos.back(); // </info> + } + + return !_url.empty(); // _url is mandatory. +} + + /// write XBEL bookmark node +void Bookmark::write(XMLPos& pos) const +{ + pos.create("bookmark"); + + pos["href"] = _url.c_str(); + + if (!_name.empty()) { + pos.create("title"); + pos->set_content(_name); + pos.back(); + } + + if (!_description.empty()) { + pos.create("desc"); + pos->set_content(_description); + pos.back(); + } + + if (!_icon_path.empty()) { + pos.create("info"); + pos.create("metadata"); + pos["owner"] = "ros-explorer"; + pos.create("icon"); + pos["path"] = _icon_path.c_str(); + pos["index"].printf(XS_TEXT("%d"), _icon_idx); + pos.back(); // </icon> + pos.back(); // </metadata> + pos.back(); // </info> + } + + pos.back(); +} + + + /// read bookmark folder from XBEL formated XML tree +void BookmarkFolder::read(const_XMLPos& pos) +{ + if (pos.go_down("title")) { + _name = pos->get_content(); + pos.back(); + } + + if (pos.go_down("desc")) { + _description = pos->get_content(); + pos.back(); + } + + _bookmarks.read(pos); +} + + /// write bookmark folder content from XBEL formated XML tree +void BookmarkFolder::write(XMLPos& pos) const +{ + pos.create("folder"); + + if (!_name.empty()) { + pos.create("title"); + pos->set_content(_name); + pos.back(); + } + + if (!_description.empty()) { + pos.create("desc"); + pos->set_content(_description); + pos.back(); + } + + _bookmarks.write(pos); +} + + +BookmarkNode::BookmarkNode() + : _type(BMNT_NONE) +{ + _pbookmark = NULL; +} + +BookmarkNode::BookmarkNode(const Bookmark& bm) + : _type(BMNT_BOOKMARK) +{ + _pbookmark = new Bookmark(bm); +} + +BookmarkNode::BookmarkNode(const BookmarkFolder& bmf) + : _type(BMNT_FOLDER) +{ + _pfolder = new BookmarkFolder(bmf); +} + +BookmarkNode::BookmarkNode(const BookmarkNode& other) + : _type(other._type) +{ + if (other._type == BMNT_BOOKMARK) + _pbookmark = new Bookmark(*other._pbookmark); + else if (other._type == BMNT_FOLDER) + _pfolder = new BookmarkFolder(*other._pfolder); + else + _pbookmark = NULL; +} + +BookmarkNode::~BookmarkNode() +{ + if (_type == BMNT_BOOKMARK) + delete _pbookmark; + else if (_type == BMNT_FOLDER) + delete _pfolder; +} + +BookmarkNode& BookmarkNode::operator=(const Bookmark& bm) +{ + clear(); + + _pbookmark = new Bookmark(bm); + + return *this; +} + +BookmarkNode& BookmarkNode::operator=(const BookmarkFolder& bmf) +{ + clear(); + + _pfolder = new BookmarkFolder(bmf); + + return *this; +} + +BookmarkNode& BookmarkNode::operator=(const BookmarkNode& other) +{ + clear(); + + _type = other._type; + + if (other._type == BMNT_BOOKMARK) + _pbookmark = new Bookmark(*other._pbookmark); + else if (other._type == BMNT_FOLDER) + _pfolder = new BookmarkFolder(*other._pfolder); + + return *this; +} + +void BookmarkNode::clear() +{ + if (_type == BMNT_BOOKMARK) { + delete _pbookmark; + _pbookmark = NULL; + } + else if (_type == BMNT_FOLDER) { + delete _pfolder; + _pfolder = NULL; + } + + _type = BMNT_NONE; +} + + + /// read bookmark list from XBEL formated XML tree +void BookmarkList::read(const_XMLPos& pos) +{ + const XMLNode::Children& children = pos->get_children(); + + for(XMLNode::Children::const_iterator it=children.begin(); it!=children.end(); ++it) { + const XMLNode& node = **it; + const_XMLPos sub_pos(&node); + + if (node == "folder") { + BookmarkFolder folder; + + folder.read(sub_pos); + + push_back(folder); + } else if (node == "bookmark") { + Bookmark bookmark; + + if (bookmark.read(sub_pos)) + push_back(bookmark); + } + } +} + + /// write bookmark list into XBEL formated XML tree +void BookmarkList::write(XMLPos& pos) const +{ + for(const_iterator it=begin(); it!=end(); ++it) { + const BookmarkNode& node = *it; + + if (node._type == BookmarkNode::BMNT_FOLDER) { + const BookmarkFolder& folder = *node._pfolder; + + folder.write(pos); + + pos.back(); + } else if (node._type == BookmarkNode::BMNT_BOOKMARK) { + const Bookmark& bookmark = *node._pbookmark; + + if (!bookmark._url.empty()) + bookmark.write(pos); + } + } +} + + + /// fill treeview control with bookmark tree content +void BookmarkList::fill_tree(HWND hwnd, HTREEITEM parent, HIMAGELIST himagelist, HDC hdc_wnd) const +{ + TV_INSERTSTRUCT tvi; + + tvi.hParent = parent; + tvi.hInsertAfter = TVI_LAST; + + TV_ITEM& tv = tvi.item; + tv.mask = TVIF_TEXT|TVIF_IMAGE|TVIF_SELECTEDIMAGE|TVIF_PARAM; + + for(const_iterator it=begin(); it!=end(); ++it) { + const BookmarkNode& node = *it; + + tv.lParam = (LPARAM)&node; + + if (node._type == BookmarkNode::BMNT_FOLDER) { + const BookmarkFolder& folder = *node._pfolder; + + tv.pszText = (LPTSTR)folder._name.c_str(); + tv.iImage = 3; // folder + tv.iSelectedImage = 4; // open folder + HTREEITEM hitem = TreeView_InsertItem(hwnd, &tvi); + + folder._bookmarks.fill_tree(hwnd, hitem, himagelist, hdc_wnd); + } else if (node._type == BookmarkNode::BMNT_BOOKMARK) { + const Bookmark& bookmark = *node._pbookmark; + + tv.pszText = (LPTSTR)bookmark._name.c_str(); + tv.iImage = 1; // bookmark + tv.iSelectedImage = 2; // selected bookmark + + if (!bookmark._icon_path.empty()) { + const Icon& icon = g_icon_cache.extract(bookmark._icon_path, bookmark._icon_idx); + + if ((ICON_ID)icon != ICID_NONE) + tv.iImage = tv.iSelectedImage = icon.add_to_imagelist(himagelist, hdc_wnd); + } + + TreeView_InsertItem(hwnd, &tvi); + } + } +} + + +/*@@ + + /// import Internet Explorer bookmarks from Favorites folder into bookmark list +void BookmarkList::import_IE_favorites(ShellDirectory& dir, HWND hwnd) +{ + TCHAR path[MAX_PATH], ext[_MAX_EXT]; + + dir.smart_scan(SORT_NAME, SCAN_FILESYSTEM); + + for(Entry*entry=dir._down; entry; entry=entry->_next) { + if (entry->_shell_attribs & SFGAO_HIDDEN) // ignore files like "desktop.ini" + continue; + + String name; + + if (entry->_etype == ET_SHELL) + name = dir._folder.get_name(static_cast<ShellEntry*>(entry)->_pidl); + else + name = entry->_display_name; + + if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + BookmarkFolder new_folder; + + new_folder._name = DecodeXMLString(name); + + if (entry->_etype == ET_SHELL) { + ShellDirectory new_dir(dir._folder, static_cast<ShellEntry*>(entry)->_pidl, hwnd); + new_folder._bookmarks.import_IE_favorites(new_dir, hwnd); + } else { + entry->get_path(path); + ShellDirectory new_dir(GetDesktopFolder(), path, hwnd); + new_folder._bookmarks.import_IE_favorites(new_dir, hwnd); + } + + push_back(new_folder); + } else { + Bookmark bookmark; + + bookmark._name = DecodeXMLString(name); + + entry->get_path(path); + _tsplitpath(path, NULL, NULL, NULL, ext); + + if (!_tcsicmp(ext, TEXT(".url"))) { + bookmark.read_url(path); + push_back(bookmark); + } else { + ///@todo read shell links + //assert(0); + } + } + } +} + +*/ + + + /// read XBEL bookmark file +bool Favorites::read(LPCTSTR path) +{ + XMLDoc xbel; + + if (!xbel.read(path)) + if (xbel._last_error == XML_ERROR_NO_ELEMENTS) + return false; + else + MessageBox(0/*@@g_Globals._hwndDesktop*/, String(xbel._last_error_msg.c_str()), + TEXT("ROS Explorer - reading bookmark file"), MB_OK); + + const_XMLPos pos(&xbel); + + if (!pos.go_down("xbel")) + return false; + + super::read(pos); + + pos.back(); + + return true; +} + + /// write XBEL bookmark file +void Favorites::write(LPCTSTR path) const +{ + XMLDoc xbel; + + XMLPos pos(&xbel); + pos.create("xbel"); + super::write(pos); + pos.back(); + + xbel.write(path, XMLNode::FORMAT_SMART, XMLHeader("1.0", "UTF-8", "<!DOCTYPE xbel" + " PUBLIC \"+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML\"\n" + " \"http://www.python.org/topics/xml/dtds/xbel-1.0.dtd\">")); +} + + +/*@@ + + /// import Internet Explorer bookmarks from Favorites folder +bool Favorites::import_IE_favorites(HWND hwnd) +{ + WaitCursor wait; + + StartMenuShellDirs dirs; + + try { + dirs.push_back(ShellDirectory(GetDesktopFolder(), SpecialFolderPath(CSIDL_COMMON_FAVORITES, hwnd), hwnd)); + dirs.push_back(ShellDirectory(GetDesktopFolder(), SpecialFolderPath(CSIDL_FAVORITES, hwnd), hwnd)); + } catch(COMException&) { + } + + for(StartMenuShellDirs::iterator it=dirs.begin(); it!=dirs.end(); ++it) { + StartMenuDirectory& smd = *it; + ShellDirectory& dir = smd._dir; + + try { + super::import_IE_favorites(dir, hwnd); + } catch(COMException&) { + } + } + + return true; +} + +*/ _____ Copied: trunk/reactos/subsys/system/ibrowser/favorites.h (from rev 13256, trunk/reactos/subsys/system/explorer/taskbar/favorites.h) _____ Added: trunk/reactos/subsys/system/ibrowser/ibrowser.cpp --- trunk/reactos/subsys/system/ibrowser/ibrowser.cpp 2005-01-26 00:03:05 UTC (rev 13301) +++ trunk/reactos/subsys/system/ibrowser/ibrowser.cpp 2005-01-26 00:12:33 UTC (rev 13302) @@ -0,0 +1,517 @@ +/* + * Copyright 2005 Martin Fuchs + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + + // + // ROS Internet Web Browser + // + // ibrowser.cpp + // + // Martin Fuchs, 24.01.2005 + // + + +#include "precomp.h" + +#include "ibrowser_intres.h" + +#include <locale.h> // for setlocale() + +#ifndef __WINE__ +#include <io.h> // for dup2() +#include <fcntl.h> // for _O_RDONLY +#endif + + + // globals + +HINSTANCE g_hInstance; +IconCache g_icon_cache; +ATOM g_hframeClass; + + +/*@@ +void ExplorerGlobals::read_persistent() +{ + // read configuration file + _cfg_dir.printf(TEXT("%s\\ReactOS"), (LPCTSTR)SpecialFolderFSPath(CSIDL_APPDATA,0)); + _cfg_path.printf(TEXT("%s\\ros-ibrowser-cfg.xml"), _cfg_dir.c_str()); + + if (!_cfg.read(_cfg_path)) { + if (_cfg._last_error != XML_ERROR_NO_ELEMENTS) + MessageBox(g_Globals._hwndDesktop, String(_cfg._last_error_msg.c_str()), + TEXT("ROS Explorer - reading user settings"), MB_OK); + + _cfg.read(TEXT("ibrowser-cfg-template.xml")); + } + + // read bookmarks + _favorites_path.printf(TEXT("%s\\ros-ibrowser-bookmarks.xml"), _cfg_dir.c_str()); + + if (!_favorites.read(_favorites_path)) { + _favorites.import_IE_favorites(0); + _favorites.write(_favorites_path); + } +} + +void ExplorerGlobals::write_persistent() +{ + // write configuration file + RecursiveCreateDirectory(_cfg_dir); + + _cfg.write(_cfg_path); + _favorites.write(_favorites_path); +} + + +XMLPos ExplorerGlobals::get_cfg() +{ + XMLPos cfg_pos(&_cfg); + + cfg_pos.smart_create("ibrowser-cfg"); + + return cfg_pos; +} + +XMLPos ExplorerGlobals::get_cfg(const char* path) +{ + XMLPos cfg_pos(&_cfg); + + cfg_pos.smart_create("ibrowser-cfg"); + cfg_pos.create_relative(path); + + return cfg_pos; +} +*/ + + +Icon::Icon() + : _id(ICID_UNKNOWN), + _itype(IT_STATIC), + _hicon(0) +{ +} + +Icon::Icon(ICON_ID id, UINT nid) + : _id(id), + _itype(IT_STATIC), + _hicon(SmallIcon(nid)) +{ +} + +Icon::Icon(ICON_TYPE itype, int id, HICON hIcon) + : _id((ICON_ID)id), + _itype(itype), + _hicon(hIcon) +{ +} + +Icon::Icon(ICON_TYPE itype, int id, int sys_idx) + : _id((ICON_ID)id), + _itype(itype), + _sys_idx(sys_idx) +{ +} + +void Icon::draw(HDC hdc, int x, int y, int cx, int cy, COLORREF bk_color, HBRUSH bk_brush) const +{ + if (_itype == IT_SYSCACHE) + ImageList_DrawEx(g_icon_cache.get_sys_imagelist(), _sys_idx, hdc, x, y, cx, cy, bk_color, CLR_DEFAULT, ILD_NORMAL); + else + DrawIconEx(hdc, x, y, _hicon, cx, cy, 0, bk_brush, DI_NORMAL); +} + +HBITMAP Icon::create_bitmap(COLORREF bk_color, HBRUSH hbrBkgnd, HDC hdc_wnd) const +{ + if (_itype == IT_SYSCACHE) { + HIMAGELIST himl = g_icon_cache.get_sys_imagelist(); + + int cx, cy; + ImageList_GetIconSize(himl, &cx, &cy); + + HBITMAP hbmp = CreateCompatibleBitmap(hdc_wnd, cx, cy); + HDC hdc = CreateCompatibleDC(hdc_wnd); + HBITMAP hbmp_old = SelectBitmap(hdc, hbmp); + ImageList_DrawEx(himl, _sys_idx, hdc, 0, 0, cx, cy, bk_color, CLR_DEFAULT, ILD_NORMAL); + SelectBitmap(hdc, hbmp_old); + DeleteDC(hdc); + + return hbmp; + } else + return create_bitmap_from_icon(_hicon, hbrBkgnd, hdc_wnd); +} + + +int Icon::add_to_imagelist(HIMAGELIST himl, HDC hdc_wnd, COLORREF bk_color, HBRUSH bk_brush) const +{ + int ret; + + if (_itype == IT_SYSCACHE) { + HIMAGELIST himl = g_icon_cache.get_sys_imagelist(); + + int cx, cy; + ImageList_GetIconSize(himl, &cx, &cy); + + HBITMAP hbmp = CreateCompatibleBitmap(hdc_wnd, cx, cy); + HDC hdc = CreateCompatibleDC(hdc_wnd); + HBITMAP hbmp_old = SelectBitmap(hdc, hbmp); + ImageList_DrawEx(himl, _sys_idx, hdc, 0, 0, cx, cy, bk_color, CLR_DEFAULT, ILD_NORMAL); + SelectBitmap(hdc, hbmp_old); + DeleteDC(hdc); + + ret = ImageList_Add(himl, hbmp, 0); + + DeleteObject(hbmp); + } else + ret = ImageList_AddAlphaIcon(himl, _hicon, bk_brush, hdc_wnd); + + return ret; +} + +HBITMAP create_bitmap_from_icon(HICON hIcon, HBRUSH hbrush_bkgnd, HDC hdc_wnd) +{ + int cx = GetSystemMetrics(SM_CXSMICON); + int cy = GetSystemMetrics(SM_CYSMICON); + HBITMAP hbmp = CreateCompatibleBitmap(hdc_wnd, cx, cy); + + MemCanvas canvas; + BitmapSelection sel(canvas, hbmp); + + RECT rect = {0, 0, cx, cy}; + FillRect(canvas, &rect, hbrush_bkgnd); + + DrawIconEx(canvas, 0, 0, hIcon, cx, cy, 0, hbrush_bkgnd, DI_NORMAL); + + return hbmp; +} + +int ImageList_AddAlphaIcon(HIMAGELIST himl, HICON hIcon, HBRUSH hbrush_bkgnd, HDC hdc_wnd) +{ + HBITMAP hbmp = create_bitmap_from_icon(hIcon, hbrush_bkgnd, hdc_wnd); + + int ret = ImageList_Add(himl, hbmp, 0); + + DeleteObject(hbmp); + + return ret; +} + + +int IconCache::s_next_id = ICID_DYNAMIC; + + +void IconCache::init() +{ + _icons[ICID_NONE] = Icon(IT_STATIC, ICID_NONE, (HICON)0); + + _icons[ICID_IBROWSER] = Icon(ICID_IBROWSER, IDI_IBROWSER); + _icons[ICID_BOOKMARK] = Icon(ICID_BOOKMARK, IDI_DOT_TRANS); +} + + +const Icon& IconCache::extract(const String& path) +{ + PathMap::iterator found = _pathMap.find(path); + + if (found != _pathMap.end()) + return _icons[found->second]; + + SHFILEINFO sfi; + +#if 1 // use system image list + HIMAGELIST himlSys = (HIMAGELIST) SHGetFileInfo(path, 0, &sfi, sizeof(sfi), SHGFI_SYSICONINDEX|SHGFI_SMALLICON); + + if (himlSys) { + _himlSys = himlSys; + + const Icon& icon = add(sfi.iIcon/*, IT_SYSCACHE*/); +#else + if (SHGetFileInfo(path, 0, &sfi, sizeof(sfi), SHGFI_ICON|SHGFI_SMALLICON)) { + const Icon& icon = add(sfi.hIcon, IT_CACHED); +#endif + + ///@todo limit cache size + _pathMap[path] = icon; + + return icon; + } else [truncated at 1000 lines; 8277 more skipped]

19 years, 7 months

[weiden] 13301: 1. fixed NtCreateProcess to do some buffer checks and moved the implementation to an internal function so it can be shared with PsCreateSystemProcess(). Also don't leak so many resources on failures

by weiden＠svn.reactos.com

1. fixed NtCreateProcess to do some buffer checks and moved the implementation to an internal function so it can be shared with PsCreateSystemProcess(). Also don't leak so many resources on failures 2. processes should acuire a cid handle for their unique process id 3. fixed several instances in structures where process ids were DWORD/ULONG instead of HANDLEs Modified: trunk/reactos/include/csrss/csrss.h Modified: trunk/reactos/include/ddk/psfuncs.h Modified: trunk/reactos/include/ntos/zwtypes.h Modified: trunk/reactos/lib/kernel32/misc/console.c Modified: trunk/reactos/lib/kernel32/process/create.c Modified: trunk/reactos/lib/kernel32/process/proc.c Modified: trunk/reactos/lib/psapi/psapi.c Modified: trunk/reactos/lib/user32/misc/exit.c Modified: trunk/reactos/ntoskrnl/ex/mutant.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/ke/profile.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/pageop.c Modified: trunk/reactos/ntoskrnl/mm/rmap.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/ps/cid.c Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/subsys/csrss/api/process.c Modified: trunk/reactos/subsys/csrss/api/wapi.c Modified: trunk/reactos/subsys/csrss/include/api.h Modified: trunk/reactos/subsys/csrss/win32csr/conio.c Modified: trunk/reactos/subsys/csrss/win32csr/exitros.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/w32api/include/ddk/ntapi.h Modified: trunk/reactos/w32api/include/ddk/ntifs.h _____ Modified: trunk/reactos/include/csrss/csrss.h --- trunk/reactos/include/csrss/csrss.h 2005-01-25 23:57:57 UTC (rev 13300) +++ trunk/reactos/include/csrss/csrss.h 2005-01-26 00:03:05 UTC (rev 13301) @@ -19,7 +19,7 @@ typedef struct { - ULONG NewProcessId; + HANDLE NewProcessId; ULONG Flags; PCONTROLDISPATCHER CtrlDispatcher; } CSRSS_CREATE_PROCESS_REQUEST, *PCSRSS_CREATE_PROCESS_REQUEST; @@ -359,7 +359,7 @@ typedef struct { - DWORD ProcessId; + HANDLE ProcessId; } CSRSS_REGISTER_SERVICES_PROCESS_REQUEST, *PCSRSS_REGISTER_SERVICES_PROCESS_REQUEST; typedef struct @@ -476,7 +476,7 @@ typedef struct { HANDLE Handle; - DWORD ProcessId; + HANDLE ProcessId; } CSRSS_DUPLICATE_HANDLE_REQUEST, *PCSRSS_DUPLICATE_HANDLE_REQUEST; typedef struct @@ -562,7 +562,7 @@ typedef struct { - DWORD ProcessId; + HANDLE ProcessId; BOOL Register; } CSRSS_REGISTER_LOGON_PROCESS_REQUEST, *PCSRSS_REGISTER_LOGON_PROCESS_REQUEST; _____ Modified: trunk/reactos/include/ddk/psfuncs.h --- trunk/reactos/include/ddk/psfuncs.h 2005-01-25 23:57:57 UTC (rev 13300) +++ trunk/reactos/include/ddk/psfuncs.h 2005-01-26 00:03:05 UTC (rev 13301) @@ -395,7 +395,7 @@ LARGE_INTEGER STDCALL PsGetProcessExitTime(VOID); BOOLEAN STDCALL PsIsThreadTerminating(struct _ETHREAD* Thread); -NTSTATUS STDCALL PsLookupProcessByProcessId(IN PVOID ProcessId, +NTSTATUS STDCALL PsLookupProcessByProcessId(IN HANDLE ProcessId, OUT PEPROCESS *Process); NTSTATUS STDCALL PsLookupProcessThreadByCid(IN PCLIENT_ID Cid, _____ Modified: trunk/reactos/include/ntos/zwtypes.h --- trunk/reactos/include/ntos/zwtypes.h 2005-01-25 23:57:57 UTC (rev 13300) +++ trunk/reactos/include/ntos/zwtypes.h 2005-01-26 00:03:05 UTC (rev 13301) @@ -684,8 +684,8 @@ PPEB PebBaseAddress; KAFFINITY AffinityMask; KPRIORITY BasePriority; - ULONG UniqueProcessId; - ULONG InheritedFromUniqueProcessId; + HANDLE UniqueProcessId; + HANDLE InheritedFromUniqueProcessId; } PROCESS_BASIC_INFORMATION, *PPROCESS_BASIC_INFORMATION; // Information class 1 @@ -1332,8 +1332,8 @@ LARGE_INTEGER KernelTime; UNICODE_STRING ProcessName; KPRIORITY BasePriority; - ULONG ProcessId; - ULONG InheritedFromProcessId; + HANDLE ProcessId; + HANDLE InheritedFromProcessId; ULONG HandleCount; ULONG Reserved2[2]; VM_COUNTERS VmCounters; @@ -1350,8 +1350,8 @@ LARGE_INTEGER KernelTime; UNICODE_STRING ProcessName; KPRIORITY BasePriority; - ULONG ProcessId; - ULONG InheritedFromProcessId; + HANDLE ProcessId; + HANDLE InheritedFromProcessId; ULONG HandleCount; ULONG Reserved2[2]; VM_COUNTERS VmCounters; _____ Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-01-25 23:57:57 UTC (rev 13300) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-01-26 00:03:05 UTC (rev 13301) @@ -206,7 +206,7 @@ Request.Type = CSRSS_DUPLICATE_HANDLE; Request.Data.DuplicateHandleRequest.Handle = hConsole; - Request.Data.DuplicateHandleRequest.ProcessId = GetCurrentProcessId(); + Request.Data.DuplicateHandleRequest.ProcessId = GetTeb()->Cid.UniqueProcess; Status = CsrClientCallServer(&Request, &Reply, sizeof(CSRSS_API_REQUEST), _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-01-25 23:57:57 UTC (rev 13300) +++ trunk/reactos/lib/kernel32/process/create.c 2005-01-26 00:03:05 UTC (rev 13301) @@ -1157,9 +1157,9 @@ &ProcessBasicInfo, sizeof(ProcessBasicInfo), &retlen); - DPRINT("ProcessBasicInfo.UniqueProcessId %d\n", + DPRINT("ProcessBasicInfo.UniqueProcessId 0x%x\n", ProcessBasicInfo.UniqueProcessId); - lpProcessInformation->dwProcessId = ProcessBasicInfo.UniqueProcessId; + lpProcessInformation->dwProcessId = (DWORD)ProcessBasicInfo.UniqueProcessId; /* * Tell the csrss server we are creating a new process _____ Modified: trunk/reactos/lib/kernel32/process/proc.c --- trunk/reactos/lib/kernel32/process/proc.c 2005-01-25 23:57:57 UTC (rev 13300) +++ trunk/reactos/lib/kernel32/process/proc.c 2005-01-26 00:03:05 UTC (rev 13301) @@ -324,7 +324,7 @@ return 0; } - return ProcessBasic.UniqueProcessId; + return (DWORD)ProcessBasic.UniqueProcessId; } _____ Modified: trunk/reactos/lib/psapi/psapi.c --- trunk/reactos/lib/psapi/psapi.c 2005-01-25 23:57:57 UTC (rev 13300) +++ trunk/reactos/lib/psapi/psapi.c 2005-01-26 00:03:05 UTC (rev 13301) @@ -83,7 +83,7 @@ } /* return current process */ - *Context->lpidProcess = CurrentProcess->ProcessId; + *Context->lpidProcess = (DWORD)CurrentProcess->ProcessId; /* go to next array slot */ Context->lpidProcess++; _____ Modified: trunk/reactos/lib/user32/misc/exit.c --- trunk/reactos/lib/user32/misc/exit.c 2005-01-25 23:57:57 UTC (rev 13300) +++ trunk/reactos/lib/user32/misc/exit.c 2005-01-26 00:03:05 UTC (rev 13301) @@ -104,7 +104,7 @@ NTSTATUS Status; Request.Type = CSRSS_REGISTER_SERVICES_PROCESS; - Request.Data.RegisterServicesProcessRequest.ProcessId = ServicesProcessId; + Request.Data.RegisterServicesProcessRequest.ProcessId = (HANDLE)ServicesProcessId; Status = CsrClientCallServer(&Request, &Reply, _____ Modified: trunk/reactos/ntoskrnl/ex/mutant.c --- trunk/reactos/ntoskrnl/ex/mutant.c 2005-01-25 23:57:57 UTC (rev 13300) +++ trunk/reactos/ntoskrnl/ex/mutant.c 2005-01-26 00:03:05 UTC (rev 13301) @@ -196,7 +196,7 @@ KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; - DPRINT1("NtOpenMutant(0x%x, 0x%x, 0x%x)\n", MutantHandle, DesiredAccess, ObjectAttributes); + DPRINT("NtOpenMutant(0x%x, 0x%x, 0x%x)\n", MutantHandle, DesiredAccess, ObjectAttributes); PreviousMode = ExGetPreviousMode(); _____ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c --- trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-01-25 23:57:57 UTC (rev 13300) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-01-26 00:03:05 UTC (rev 13301) @@ -401,7 +401,7 @@ return (STATUS_INFO_LENGTH_MISMATCH); } - PsLookupProcessByProcessId((PVOID) 1, &TheIdleProcess); + TheIdleProcess = PsInitialSystemProcess; /* FIXME */ Spi->IdleTime.QuadPart = TheIdleProcess->Pcb.KernelTime * 100000LL; @@ -505,8 +505,6 @@ Spi->SecondLevelTbFills = 0; /* FIXME */ Spi->SystemCalls = 0; /* FIXME */ - ObDereferenceObject(TheIdleProcess); - return (STATUS_SUCCESS); } @@ -609,7 +607,7 @@ SpiCur->BasePriority = pr->Pcb.BasePriority; SpiCur->ProcessId = pr->UniqueProcessId; - SpiCur->InheritedFromProcessId = (DWORD)(pr->InheritedFromUniqueProcessId); + SpiCur->InheritedFromProcessId = pr->InheritedFromUniqueProcessId; SpiCur->HandleCount = ObpGetHandleCountByHandleTable(&pr->HandleTable); SpiCur->VmCounters.PeakVirtualSize = pr->PeakVirtualSize; SpiCur->VmCounters.VirtualSize = pr->VirtualSize.QuadPart; @@ -949,7 +947,7 @@ } DPRINT("SystemFullMemoryInformation\n"); - PsLookupProcessByProcessId((PVOID) 1, &TheIdleProcess); + TheIdleProcess = PsInitialSystemProcess; /* FIXME */ DPRINT("PID: %d, KernelTime: %u PFFree: %d PFUsed: %d\n", TheIdleProcess->UniqueProcessId, @@ -963,8 +961,6 @@ *Spi = MiMemoryConsumers[MC_USER].PagesUsed; - ObDereferenceObject(TheIdleProcess); - return (STATUS_SUCCESS); } _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-01-25 23:57:57 UTC (rev 13300) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-01-26 00:03:05 UTC (rev 13301) @@ -296,7 +296,7 @@ * These fields are used to identify the operation if it is against a * virtual memory area. */ - ULONG Pid; + HANDLE Pid; PVOID Address; /* * These fields are used to identify the operation if it is against a @@ -569,10 +569,10 @@ MmReleasePageOp(PMM_PAGEOP PageOp); PMM_PAGEOP -MmGetPageOp(PMEMORY_AREA MArea, ULONG Pid, PVOID Address, +MmGetPageOp(PMEMORY_AREA MArea, HANDLE Pid, PVOID Address, PMM_SECTION_SEGMENT Segment, ULONG Offset, ULONG OpType, BOOL First); PMM_PAGEOP -MmCheckForPageOp(PMEMORY_AREA MArea, ULONG Pid, PVOID Address, +MmCheckForPageOp(PMEMORY_AREA MArea, HANDLE Pid, PVOID Address, PMM_SECTION_SEGMENT Segment, ULONG Offset); VOID MmInitializePageOp(VOID); _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-01-25 23:57:57 UTC (rev 13300) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-01-26 00:03:05 UTC (rev 13301) @@ -323,7 +323,7 @@ /* Unknown. */ PKTHREAD LockOwner; /* 090 */ /* Process id. */ - ULONG UniqueProcessId; /* 094 */ + HANDLE UniqueProcessId; /* 094 */ /* Unknown. */ LIST_ENTRY ActiveProcessLinks; /* 098 */ /* Unknown. */ _____ Modified: trunk/reactos/ntoskrnl/ke/profile.c --- trunk/reactos/ntoskrnl/ke/profile.c 2005-01-25 23:57:57 UTC (rev 13300) +++ trunk/reactos/ntoskrnl/ke/profile.c 2005-01-26 00:03:05 UTC (rev 13301) @@ -140,13 +140,13 @@ } else { - ULONG Pid; + HANDLE Pid; PKPROCESS_PROFILE current; PLIST_ENTRY current_entry; PLIST_ENTRY ListHead; Pid = Profile->Process->UniqueProcessId; - ListHead = &ProcessProfileListHashTable[Pid % PROFILE_HASH_TABLE_SIZE]; + ListHead = &ProcessProfileListHashTable[(ULONG_PTR)Pid % PROFILE_HASH_TABLE_SIZE]; current_entry = ListHead; while(current_entry != ListHead) @@ -154,7 +154,7 @@ current = CONTAINING_RECORD(current_entry, KPROCESS_PROFILE, ListEntry); - if (current->Pid == (HANDLE)Pid) + if (current->Pid == Pid) { KiInsertProfileIntoProcess(&current->ProfileListHead, Profile); KeReleaseSpinLock(&ProfileListLock, oldIrql); @@ -166,7 +166,7 @@ current = ExAllocatePool(NonPagedPool, sizeof(KPROCESS_PROFILE)); - current->Pid = (HANDLE)Pid; + current->Pid = Pid; InitializeListHead(&current->ProfileListHead); InsertTailList(ListHead, &current->ListEntry); @@ -188,7 +188,7 @@ } else { - ULONG Pid; + HANDLE Pid; PLIST_ENTRY ListHead; PKPROCESS_PROFILE current; PLIST_ENTRY current_entry; @@ -196,7 +196,7 @@ RemoveEntryList(&Profile->ListEntry); Pid = Profile->Process->UniqueProcessId; - ListHead = &ProcessProfileListHashTable[Pid % PROFILE_HASH_TABLE_SIZE]; + ListHead = &ProcessProfileListHashTable[(ULONG_PTR)Pid % PROFILE_HASH_TABLE_SIZE]; current_entry = ListHead; while(current_entry != ListHead) @@ -204,7 +204,7 @@ current = CONTAINING_RECORD(current_entry, KPROCESS_PROFILE, ListEntry); - if (current->Pid == (HANDLE)Pid) + if (current->Pid == Pid) { if (IsListEmpty(&current->ProfileListHead)) { _____ Modified: trunk/reactos/ntoskrnl/mm/anonmem.c --- trunk/reactos/ntoskrnl/mm/anonmem.c 2005-01-25 23:57:57 UTC (rev 13300) +++ trunk/reactos/ntoskrnl/mm/anonmem.c 2005-01-26 00:03:05 UTC (rev 13301) @@ -272,7 +272,7 @@ /* * Get or create a page operation */ - PageOp = MmGetPageOp(MemoryArea, (ULONG)MemoryArea->Process->UniqueProcessId, + PageOp = MmGetPageOp(MemoryArea, MemoryArea->Process->UniqueProcessId, (PVOID)PAGE_ROUND_DOWN(Address), NULL, 0, MM_PAGEOP_PAGEIN, FALSE); if (PageOp == NULL) _____ Modified: trunk/reactos/ntoskrnl/mm/pageop.c --- trunk/reactos/ntoskrnl/mm/pageop.c 2005-01-25 23:57:57 UTC (rev 13300) +++ trunk/reactos/ntoskrnl/mm/pageop.c 2005-01-26 00:03:05 UTC (rev 13301) @@ -67,7 +67,7 @@ } PMM_PAGEOP -MmCheckForPageOp(PMEMORY_AREA MArea, ULONG Pid, PVOID Address, +MmCheckForPageOp(PMEMORY_AREA MArea, HANDLE Pid, PVOID Address, PMM_SECTION_SEGMENT Segment, ULONG Offset) { ULONG_PTR Hash; @@ -129,7 +129,7 @@ } PMM_PAGEOP -MmGetPageOp(PMEMORY_AREA MArea, ULONG Pid, PVOID Address, +MmGetPageOp(PMEMORY_AREA MArea, HANDLE Pid, PVOID Address, PMM_SECTION_SEGMENT Segment, ULONG Offset, ULONG OpType, BOOL First) /* * FUNCTION: Get a page operation descriptor corresponding to _____ Modified: trunk/reactos/ntoskrnl/mm/rmap.c --- trunk/reactos/ntoskrnl/mm/rmap.c 2005-01-25 23:57:57 UTC (rev 13300) +++ trunk/reactos/ntoskrnl/mm/rmap.c 2005-01-26 00:03:05 UTC (rev 13301) @@ -136,7 +136,7 @@ /* * Get or create a pageop */ - PageOp = MmGetPageOp(MemoryArea, 0, 0, + PageOp = MmGetPageOp(MemoryArea, NULL, 0, MemoryArea->Data.SectionData.Segment, Offset, MM_PAGEOP_PAGEOUT, TRUE); @@ -163,7 +163,7 @@ } else if (Type == MEMORY_AREA_VIRTUAL_MEMORY) { - PageOp = MmGetPageOp(MemoryArea, Address < (PVOID)KERNEL_BASE ? Process->UniqueProcessId : 0, + PageOp = MmGetPageOp(MemoryArea, Address < (PVOID)KERNEL_BASE ? Process->UniqueProcessId : NULL, Address, NULL, 0, MM_PAGEOP_PAGEOUT, TRUE); if (PageOp == NULL) @@ -260,7 +260,7 @@ /* * Get or create a pageop */ - PageOp = MmGetPageOp(MemoryArea, 0, 0, + PageOp = MmGetPageOp(MemoryArea, NULL, 0, MemoryArea->Data.SectionData.Segment, Offset, MM_PAGEOP_PAGEOUT, TRUE); if (PageOp == NULL) @@ -286,7 +286,7 @@ } else if (Type == MEMORY_AREA_VIRTUAL_MEMORY) { - PageOp = MmGetPageOp(MemoryArea, Address < (PVOID)KERNEL_BASE ? Process->UniqueProcessId : 0, + PageOp = MmGetPageOp(MemoryArea, Address < (PVOID)KERNEL_BASE ? Process->UniqueProcessId : NULL, Address, NULL, 0, MM_PAGEOP_PAGEOUT, TRUE); if (PageOp == NULL) { _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-01-25 23:57:57 UTC (rev 13300) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-01-26 00:03:05 UTC (rev 13301) @@ -665,7 +665,7 @@ /* * Get or create a page operation descriptor */ - PageOp = MmGetPageOp(MemoryArea, 0, 0, Segment, Offset, MM_PAGEOP_PAGEIN, FALSE); + PageOp = MmGetPageOp(MemoryArea, NULL, 0, Segment, Offset, MM_PAGEOP_PAGEIN, FALSE); if (PageOp == NULL) { DPRINT1("MmGetPageOp failed\n"); @@ -1187,7 +1187,7 @@ /* * Get or create a pageop */ - PageOp = MmGetPageOp(MemoryArea, 0, 0, Segment, Offset, + PageOp = MmGetPageOp(MemoryArea, NULL, 0, Segment, Offset, MM_PAGEOP_ACCESSFAULT, FALSE); if (PageOp == NULL) { @@ -3589,7 +3589,7 @@ Section = MArea->Data.SectionData.Section; Segment = MArea->Data.SectionData.Segment; - PageOp = MmCheckForPageOp(MArea, 0, NULL, Segment, Offset); + PageOp = MmCheckForPageOp(MArea, NULL, NULL, Segment, Offset); while (PageOp) { @@ -3606,7 +3606,7 @@ MmLockAddressSpace(&MArea->Process->AddressSpace); MmLockSectionSegment(Segment); MmspCompleteAndReleasePageOp(PageOp); - PageOp = MmCheckForPageOp(MArea, 0, NULL, Segment, Offset); + PageOp = MmCheckForPageOp(MArea, NULL, NULL, Segment, Offset); } Entry = MmGetPageEntrySectionSegment(Segment, Offset); _____ Modified: trunk/reactos/ntoskrnl/ps/cid.c --- trunk/reactos/ntoskrnl/ps/cid.c 2005-01-25 23:57:57 UTC (rev 13300) +++ trunk/reactos/ntoskrnl/ps/cid.c 2005-01-26 00:03:05 UTC (rev 13301) @@ -70,7 +70,7 @@ cido->Obj.Object = Object; KeAcquireSpinLock(&CidLock, &oldIrql); - cido->Handle = (HANDLE)(++CidCounter); + cido->Handle = (HANDLE)((ULONG_PTR)(++CidCounter) << 2); InsertTailList(&CidHead, &cido->Entry); KeReleaseSpinLock(&CidLock, oldIrql); _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-25 23:57:57 UTC (rev 13300) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-26 00:03:05 UTC (rev 13301) @@ -23,7 +23,6 @@ LIST_ENTRY PsProcessListHead; static KSPIN_LOCK PsProcessListLock; -static ULONG PiNextProcessUniqueId = 0; /* TODO */ static LARGE_INTEGER ShortPsLockDelay, PsLockTimeout; static GENERIC_MAPPING PiProcessMapping = {STANDARD_RIGHTS_READ | PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, @@ -192,26 +191,54 @@ { PACCESS_TOKEN Token; HANDLE hToken; - NTSTATUS Status; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; + + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode == UserMode) + { + _SEH_TRY + { + ProbeForWrite(TokenHandle, + sizeof(HANDLE), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - Status = PsOpenTokenOfProcess(ProcessHandle, - &Token); - if (!NT_SUCCESS(Status)) + if(!NT_SUCCESS(Status)) { - return(Status); + return Status; } - Status = ObCreateHandle(PsGetCurrentProcess(), - Token, - DesiredAccess, - FALSE, - &hToken); - ObDereferenceObject(Token); + } + Status = PsOpenTokenOfProcess(ProcessHandle, + &Token); if(NT_SUCCESS(Status)) + { + Status = ObCreateHandle(PsGetCurrentProcess(), + Token, + DesiredAccess, + FALSE, + &hToken); + ObDereferenceObject(Token); + + _SEH_TRY { - Status = MmCopyToCaller(TokenHandle, &hToken, sizeof(HANDLE)); + *TokenHandle = hToken; } - return(Status); + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + return Status; } @@ -224,7 +251,7 @@ ObReferenceObjectByPointer(Process->Token, TOKEN_ALL_ACCESS, SepTokenObjectType, - UserMode); + KernelMode); return(Process->Token); } @@ -239,16 +266,16 @@ Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_QUERY_INFORMATION, PsProcessType, - UserMode, + ExGetPreviousMode(), (PVOID*)&Process, NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - *Token = PsReferencePrimaryToken(Process); - ObDereferenceObject(Process); - return(STATUS_SUCCESS); + if(NT_SUCCESS(Status)) + { + *Token = PsReferencePrimaryToken(Process); + ObDereferenceObject(Process); + } + + return Status; } @@ -269,7 +296,7 @@ current_entry = current_entry->Flink; if (current->UniqueProcessId != PsInitialSystemProcess->UniqueProcessId && - current->UniqueProcessId != (ULONG)PsGetCurrentProcessId()) + current->UniqueProcessId != PsGetCurrentProcessId()) { PiTerminateProcessThreads(current, STATUS_SUCCESS); } @@ -373,8 +400,17 @@ } #endif - PsInitialSystemProcess->UniqueProcessId = - InterlockedIncrementUL(&PiNextProcessUniqueId); /* TODO */ + strcpy(PsInitialSystemProcess->ImageFileName, "System"); + + Status = PsCreateCidHandle(PsInitialSystemProcess, + PsProcessType, + &PsInitialSystemProcess->UniqueProcessId); + if(!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create CID handle (unique process id) for the system process!\n"); + return; + } + PsInitialSystemProcess->Win32WindowStation = (HANDLE)0; KeAcquireSpinLock(&PsProcessListLock, &oldIrql); @@ -382,8 +418,6 @@ &PsInitialSystemProcess->ProcessListEntry); InitializeListHead(&PsInitialSystemProcess->ThreadListHead); KeReleaseSpinLock(&PsProcessListLock, oldIrql); - - strcpy(PsInitialSystemProcess->ImageFileName, "System"); SepCreateSystemProcessToken(PsInitialSystemProcess); } @@ -610,109 +644,112 @@ } } -/* - * @implemented - */ -NTSTATUS STDCALL -PsCreateSystemProcess(PHANDLE ProcessHandle, - ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes) -{ - HANDLE SystemProcessHandle; - NTSTATUS Status; - - /* FIXME - what about security? should there be any privilege checks or something - security related? */ - - Status = ObCreateHandle(PsGetCurrentProcess(), - PsInitialSystemProcess, - PROCESS_CREATE_PROCESS | PROCESS_CREATE_THREAD | PROCESS_QUERY_INFORMATION, - FALSE, - &SystemProcessHandle); - if(!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create a handle for the system process!\n"); - return Status; - } - - Status = NtCreateProcess(ProcessHandle, - DesiredAccess, - ObjectAttributes, - SystemProcessHandle, - FALSE, - NULL, - NULL, - NULL); - - NtClose(SystemProcessHandle); - - return Status; -} - -NTSTATUS STDCALL -NtCreateProcess(OUT PHANDLE ProcessHandle, +NTSTATUS +PspCreateProcess(OUT PHANDLE ProcessHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN HANDLE ParentProcess, + IN HANDLE ParentProcess OPTIONAL, IN BOOLEAN InheritObjectTable, IN HANDLE SectionHandle OPTIONAL, IN HANDLE DebugPort OPTIONAL, IN HANDLE ExceptionPort OPTIONAL) -/* - * FUNCTION: Creates a process. - * ARGUMENTS: - * ProcessHandle (OUT) = Caller supplied storage for the resulting - * handle - * DesiredAccess = Specifies the allowed or desired access to the - * process can be a combination of - * STANDARD_RIGHTS_REQUIRED| .. - * ObjectAttribute = Initialized attributes for the object, contains - * the rootdirectory and the filename - * ParentProcess = Handle to the parent process. - * InheritObjectTable = Specifies to inherit the objects of the parent - * process if true. - * SectionHandle = Handle to a section object to back the image file - * DebugPort = Handle to a DebugPort if NULL the system default debug - * port will be used. - * ExceptionPort = Handle to a exception port. - * REMARKS: - * This function maps to the win32 CreateProcess. - * RETURNS: Status - */ { + HANDLE hProcess; PEPROCESS Process; PEPROCESS pParentProcess; PKPROCESS KProcess; - NTSTATUS Status; KIRQL oldIrql; PVOID LdrStartupAddr; - PVOID ImageBase; - PEPORT pDebugPort; - PEPORT pExceptionPort; PVOID BaseAddress; PMEMORY_AREA MemoryArea; PHYSICAL_ADDRESS BoundaryAddressMultiple; + KPROCESSOR_MODE PreviousMode; + PVOID ImageBase = NULL; + PEPORT pDebugPort = NULL; + PEPORT pExceptionPort = NULL; + PSECTION_OBJECT SectionObject = NULL; + NTSTATUS Status = STATUS_SUCCESS; - DPRINT("NtCreateProcess(ObjectAttributes %x)\n",ObjectAttributes); + DPRINT("PspCreateProcess(ObjectAttributes %x)\n", ObjectAttributes); + + PreviousMode = ExGetPreviousMode(); BoundaryAddressMultiple.QuadPart = 0; - Status = ObReferenceObjectByHandle(ParentProcess, - PROCESS_CREATE_PROCESS, - PsProcessType, - ExGetPreviousMode(), - (PVOID*)&pParentProcess, - NULL); - if (!NT_SUCCESS(Status)) + if(ParentProcess != NULL) + { + Status = ObReferenceObjectByHandle(ParentProcess, + PROCESS_CREATE_PROCESS, + PsProcessType, + PreviousMode, + (PVOID*)&pParentProcess, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference the parent process: Status: 0x%x\n", Status); + return(Status); + } + } + else + { + pParentProcess = NULL; + } + + /* + * Add the debug port + */ + if (DebugPort != NULL) { - DPRINT("NtCreateProcess() = %x\n",Status); - return(Status); + Status = ObReferenceObjectByHandle(DebugPort, + PORT_ALL_ACCESS, + LpcPortObjectType, + PreviousMode, + (PVOID*)&pDebugPort, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference the debug port: Status: 0x%x\n", Status); + goto exitdereferenceobjects; + } } - Status = ObCreateObject(ExGetPreviousMode(), + /* + * Add the exception port + */ + if (ExceptionPort != NULL) + { + Status = ObReferenceObjectByHandle(ExceptionPort, + PORT_ALL_ACCESS, + LpcPortObjectType, + PreviousMode, + (PVOID*)&pExceptionPort, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference the exception port: Status: 0x%x\n", Status); + goto exitdereferenceobjects; + } + } + + if (SectionHandle != NULL) + { + Status = ObReferenceObjectByHandle(SectionHandle, + 0, + MmSectionObjectType, + PreviousMode, + (PVOID*)&SectionObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference process image section: Status: 0x%x\n", Status); + goto exitdereferenceobjects; + } + } + + Status = ObCreateObject(PreviousMode, PsProcessType, ObjectAttributes, - ExGetPreviousMode(), + PreviousMode, NULL, sizeof(EPROCESS), 0, @@ -720,32 +757,92 @@ (PVOID*)&Process); if (!NT_SUCCESS(Status)) { - ObDereferenceObject(pParentProcess); - DPRINT("ObCreateObject() = %x\n",Status); - return(Status); + DPRINT1("Failed to create process object, Status: 0x%x\n", Status); + +exitdereferenceobjects: + if(SectionObject != NULL) + ObDereferenceObject(SectionObject); + if(pExceptionPort != NULL) + ObDereferenceObject(pExceptionPort); + if(pDebugPort != NULL) + ObDereferenceObject(pDebugPort); + if(pParentProcess != NULL) + ObDereferenceObject(pParentProcess); + return Status; } - Status = ObInsertObject ((PVOID)Process, - NULL, - DesiredAccess, - 0, - NULL, - ProcessHandle); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject (Process); - ObDereferenceObject (pParentProcess); - DPRINT("ObInsertObject() = %x\n",Status); - return Status; - } + KProcess = &Process->Pcb; + + RtlZeroMemory(Process, sizeof(EPROCESS)); + + Status = PsCreateCidHandle(Process, + PsProcessType, + &Process->UniqueProcessId); + if(!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create CID handle (unique process ID)! Status: 0x%x\n", Status); + ObDereferenceObject(Process); + goto exitdereferenceobjects; + } - KeInitializeDispatcherHeader(&Process->Pcb.DispatcherHeader, + Process->DebugPort = pDebugPort; + Process->ExceptionPort = pExceptionPort; + + if(SectionObject != NULL) + { + UNICODE_STRING FileName; + PWCHAR szSrc; + PCHAR szDest; + USHORT lnFName = 0; + + /* + * Determine the image file name and save it to the EPROCESS structure + */ + + FileName = SectionObject->FileObject->FileName; + szSrc = (PWCHAR)(FileName.Buffer + (FileName.Length / sizeof(WCHAR)) - 1); + while(szSrc >= FileName.Buffer) + { + if(*szSrc == L'\\') + { + szSrc++; + break; + } + else + { + szSrc--; + lnFName++; + } + } + + /* copy the image file name to the process and truncate it to 15 characters + if necessary */ + szDest = Process->ImageFileName; + lnFName = min(lnFName, sizeof(Process->ImageFileName) - 1); + while(lnFName-- > 0) + { + *(szDest++) = (UCHAR)*(szSrc++); + } + /* *szDest = '\0'; */ + } + + KeInitializeDispatcherHeader(&KProcess->DispatcherHeader, InternalProcessType, sizeof(EPROCESS), FALSE); - KProcess = &Process->Pcb; + /* Inherit parent process's affinity. */ - KProcess->Affinity = pParentProcess->Pcb.Affinity; + if(pParentProcess != NULL) + { + KProcess->Affinity = pParentProcess->Pcb.Affinity; + Process->InheritedFromUniqueProcessId = pParentProcess->UniqueProcessId; + Process->SessionId = pParentProcess->SessionId; + } + else + { + KProcess->Affinity = KeActiveProcessors; + } + KProcess->BasePriority = PROCESS_PRIO_NORMAL; KProcess->IopmOffset = 0xffff; KProcess->LdtDescriptor[0] = 0; @@ -755,13 +852,11 @@ KProcess->AutoAlignment = 0; MmInitializeAddressSpace(Process, &Process->AddressSpace); - Process->UniqueProcessId = InterlockedIncrementUL(&PiNextProcessUniqueId); /* TODO */ - Process->InheritedFromUniqueProcessId = - (HANDLE)pParentProcess->UniqueProcessId; + ObCreateHandleTable(pParentProcess, InheritObjectTable, Process); - MmCopyMmInfo(ParentProcess, Process); + MmCopyMmInfo(pParentProcess ? pParentProcess : PsInitialSystemProcess, Process); KeInitializeEvent(&Process->LockEvent, SynchronizationEvent, FALSE); Process->LockCount = 0; @@ -778,50 +873,6 @@ Process->Pcb.State = PROCESS_STATE_ACTIVE; /* - * Add the debug port - */ - if (DebugPort != NULL) - { - Status = ObReferenceObjectByHandle(DebugPort, - PORT_ALL_ACCESS, - LpcPortObjectType, - UserMode, - (PVOID*)&pDebugPort, - NULL); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(Process); - ObDereferenceObject(pParentProcess); - ZwClose(*ProcessHandle); - *ProcessHandle = NULL; - return(Status); - } - Process->DebugPort = pDebugPort; - } - - /* - * Add the exception port - */ - if (ExceptionPort != NULL) - { - Status = ObReferenceObjectByHandle(ExceptionPort, - PORT_ALL_ACCESS, - LpcPortObjectType, - UserMode, - (PVOID*)&pExceptionPort, - NULL); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(Process); - ObDereferenceObject(pParentProcess); - ZwClose(*ProcessHandle); - *ProcessHandle = NULL; - return(Status); - } - Process->ExceptionPort = pExceptionPort; - } - - /* * Now we have created the process proper */ @@ -843,7 +894,8 @@ { MmUnlockAddressSpace(&Process->AddressSpace); DPRINT1("Failed to protect the highest 64KB of the process address space\n"); - KEBUGCHECK(0); + ObDereferenceObject(Process); + goto exitdereferenceobjects; } /* Protect the lowest 64KB of the process address space */ @@ -863,7 +915,8 @@ { MmUnlockAddressSpace(&Process->AddressSpace); DPRINT1("Failed to protect the lowest 64KB of the process address space\n"); - KEBUGCHECK(0); + ObDereferenceObject(Process); + goto exitdereferenceobjects; } #endif @@ -883,7 +936,8 @@ { MmUnlockAddressSpace(&Process->AddressSpace); DPRINT1("Failed to protect the memory above the shared user page\n"); - KEBUGCHECK(0); [truncated at 1000 lines; 675 more skipped]

19 years, 7 months

[hbirr] 13285: - Fixed the directory index of a file for FATX.

by hbirr＠svn.reactos.com

- Fixed the directory index of a file for FATX. - Initialize some values from the RFCB. Modified: trunk/reactos/drivers/fs/vfat/fcb.c _____ Modified: trunk/reactos/drivers/fs/vfat/fcb.c --- trunk/reactos/drivers/fs/vfat/fcb.c 2005-01-25 21:14:57 UTC (rev 13284) +++ trunk/reactos/drivers/fs/vfat/fcb.c 2005-01-25 21:16:19 UTC (rev 13285) @@ -137,6 +137,10 @@ ExInitializeResourceLite(&rcFCB->MainResource); FsRtlInitializeFileLock(&rcFCB->FileLock, NULL, NULL); ExInitializeFastMutex(&rcFCB->LastMutex); + rcFCB->RFCB.PagingIoResource = &rcFCB->PagingIoResource; + rcFCB->RFCB.Resource = &rcFCB->MainResource; + rcFCB->RFCB.IsFastIoPossible = FastIoIsNotPossible; + return rcFCB; } @@ -425,6 +429,7 @@ FCB->RFCB.FileSize.QuadPart = Size; FCB->RFCB.ValidDataLength.QuadPart = Size; FCB->RFCB.AllocationSize.QuadPart = Size; + FCB->RFCB.IsFastIoPossible = FastIoIsNotPossible; vfatFCBInitializeCacheFromVolume(pVCB, FCB); vfatAddFCBToTable(pVCB, FCB); @@ -538,6 +543,12 @@ } rcFCB->dirIndex = DirContext->DirIndex; rcFCB->startIndex = DirContext->StartIndex; + if ((rcFCB->Flags & FCB_IS_FATX_ENTRY) && !vfatFCBIsRoot (directoryFCB)) + { + ASSERT(DirContext->DirIndex >= 2 && DirContext->StartIndex >= 2); + rcFCB->dirIndex = DirContext->DirIndex-2; + rcFCB->startIndex = DirContext->StartIndex-2; + } rcFCB->RFCB.FileSize.QuadPart = Size; rcFCB->RFCB.ValidDataLength.QuadPart = Size; rcFCB->RFCB.AllocationSize.QuadPart = ROUND_UP(Size, vcb->FatInfo.BytesPerCluster);

19 years, 7 months

[weiden] 13300: enable the SeSystemtimePrivilege privilege which is required to call SetLocalTime

by weiden＠svn.reactos.com

enable the SeSystemtimePrivilege privilege which is required to call SetLocalTime Modified: trunk/reactos/lib/syssetup/wizard.c _____ Modified: trunk/reactos/lib/syssetup/wizard.c --- trunk/reactos/lib/syssetup/wizard.c 2005-01-25 23:50:22 UTC (rev 13299) +++ trunk/reactos/lib/syssetup/wizard.c 2005-01-25 23:57:57 UTC (rev 13300) @@ -1121,6 +1121,62 @@ } +static BOOL +SetSystemLocalTime(HWND hwnd, PSETUPDATA SetupData) +{ + HANDLE hToken; + TOKEN_PRIVILEGES priv, previouspriv; + BOOL Ret = FALSE; + + /* + * enable the SeSystemtimePrivilege privilege + */ + + if(OpenProcessToken(GetCurrentProcess(), + TOKEN_ADJUST_PRIVILEGES, + &hToken)) + { + priv.PrivilegeCount = 1; + priv.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + + if(LookupPrivilegeValue(NULL, + SE_SYSTEMTIME_NAME, + &priv.Privileges[0].Luid)) + { + if(AdjustTokenPrivileges(hToken, + FALSE, + &priv, + sizeof(previouspriv), + &previouspriv, + 0) && + GetLastError() == ERROR_SUCCESS) + { + /* + * we successfully enabled it, we're permitted to change the system time + */ + Ret = SetLocalTime(&SetupData->SystemTime); + + /* + * for the sake of security, restore the previous status again + */ + if(previouspriv.PrivilegeCount > 0) + { + AdjustTokenPrivileges(hToken, + FALSE, + &previouspriv, + 0, + NULL, + 0); + } + } + } + CloseHandle(hToken); + } + + return Ret; +} + + INT_PTR CALLBACK DateTimePageDlgProc(HWND hwndDlg, UINT uMsg, @@ -1167,7 +1223,13 @@ SetLocalTimeZone(GetDlgItem(hwndDlg, IDC_TIMEZONELIST), SetupData); SetAutoDaylightInfo(GetDlgItem(hwndDlg, IDC_AUTODAYLIGHT)); - SetLocalTime(&SetupData->SystemTime); + if(!SetSystemLocalTime(hwndDlg, SetupData)) + { + MessageBox(hwndDlg, + _T("Setup was unable to set the local time."), + _T("ReactOS Setup"), + MB_ICONWARNING | MB_OK); + } } break;

19 years, 7 months

[sedwards] 13299: Forgot to add Makefiles

by sedwards＠svn.reactos.com

Forgot to add Makefiles Added: trunk/reactos/lib/setupapi/Makefile.ros-template Added: trunk/reactos/lib/setupapi/makefile _____ Added: trunk/reactos/lib/setupapi/Makefile.ros-template --- trunk/reactos/lib/setupapi/Makefile.ros-template 2005-01-25 23:40:05 UTC (rev 13298) +++ trunk/reactos/lib/setupapi/Makefile.ros-template 2005-01-25 23:50:22 UTC (rev 13299) @@ -0,0 +1,21 @@ +# $Id: Makefile.ros-template 12852 2005-01-06 13:58:04Z mf $ + +TARGET_NAME = setupapi + +TARGET_OBJECTS = @C_SRCS@ + +TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ -D__WINESRC__ + +TARGET_SDKLIBS = @IMPORTS@ wine.a ntdll.a wine_unicode.a + +TARGET_BASE = $(TARGET_BASE_LIB_SETUPAPI) + +TARGET_RC_SRCS = @RC_SRCS@ +TARGET_RC_BINSRC = @RC_BINSRC@ +TARGET_RC_BINARIES = @RC_BINARIES@ + +default: all + +DEP_OBJECTS = $(TARGET_OBJECTS) + +include $(TOOLS_PATH)/depend.mk _____ Added: trunk/reactos/lib/setupapi/makefile --- trunk/reactos/lib/setupapi/makefile 2005-01-25 23:40:05 UTC (rev 13298) +++ trunk/reactos/lib/setupapi/makefile 2005-01-25 23:50:22 UTC (rev 13299) @@ -0,0 +1,9 @@ +# $Id: makefile 12852 2005-01-06 13:58:04Z mf $ + +PATH_TO_TOP = ../.. + +TARGET_TYPE = winedll + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk

19 years, 7 months

[ion] 13298: Sorry for incorrect file comiited.

by ion＠svn.reactos.com

Sorry for incorrect file comiited. Modified: trunk/reactos/config _____ Modified: trunk/reactos/config --- trunk/reactos/config 2005-01-25 23:39:07 UTC (rev 13297) +++ trunk/reactos/config 2005-01-25 23:40:05 UTC (rev 13298) @@ -30,7 +30,7 @@ # # Whether to compile with optimizations # -OPTIMIZED := 1 +OPTIMIZED := 0 # # Whether to compile a multiprocessor or single processor version @@ -45,7 +45,7 @@ # # whether to use a 3GB User, 1GB Kernel memory map # -3GB := 0 +3GB := 1 # # Which version of NDIS do we support up to?

19 years, 7 months

[sedwards] 13297: fixed building of setupapi.

by sedwards＠svn.reactos.com

fixed building of setupapi. Modified: trunk/reactos/lib/setupapi/setupcab.c _____ Modified: trunk/reactos/lib/setupapi/setupcab.c --- trunk/reactos/lib/setupapi/setupcab.c 2005-01-25 23:36:57 UTC (rev 13296) +++ trunk/reactos/lib/setupapi/setupcab.c 2005-01-25 23:39:07 UTC (rev 13297) @@ -39,8 +39,8 @@ #include "fdi.h" #include "wine/unicode.h" -#include "msvcrt/fcntl.h" -#include "msvcrt/share.h" +#include "fcntl.h" +#include "share.h" #include "wine/debug.h"

19 years, 7 months

[sedwards] 13296: Imported setupapi from the vendor branch. (Again).

by sedwards＠svn.reactos.com

Imported setupapi from the vendor branch. (Again). Added: trunk/reactos/lib/setupapi/ _____ Copied: trunk/reactos/lib/setupapi (from rev 13295, vendor/wine/dlls/setupapi/current)

19 years, 7 months

← Newer
1
...
5
6
7
8
9
10
11
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2005