Ros-diffs

ros-diffs@reactos.org

81390 discussions

[martinf] 43: set svn:eol-style for Makefiles
by martinf＠svn.reactos.org 30 Jan '06

30 Jan '06

set svn:eol-style for Makefiles Modified: branches/lean-explorer/Make-rosshell-MinGW Modified: branches/lean-explorer/Make-rosshell.mak _____ Modified: branches/lean-explorer/Make-rosshell-MinGW --- branches/lean-explorer/Make-rosshell-MinGW 2006-01-30 08:00:18 UTC (rev 42) +++ branches/lean-explorer/Make-rosshell-MinGW 2006-01-30 08:00:33 UTC (rev 43) @@ -1,82 +1,82 @@ -# -# ReactOS lean shell -# -# Make-rosshell.MinGW -# -# MinGW Makefile with precompiled header support -# - -CC = gcc -CXX = g++ -LINK = g++ - -CFLAGS = -DWIN32 -DROSSHELL -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -fexceptions -Wall -I. -RCFLAGS = -DWIN32 -DROSSHELL -D__WINDRES__ -LFLAGS = -Wl,--subsystem,windows - -ifdef DEBUG -CFLAGS += -D_DEBUG -g -RCFLAGS += -D_DEBUG -LFLAGS += -g -else -CFLAGS += -DNDEBUG -Os -D_NO_CONTEXT -RCFLAGS += -DNDEBUG -LFLAGS += -s -endif - -ifndef UNICODE -UNICODE = 1 -endif - -ifeq ($(UNICODE),1) -CFLAGS += -DUNICODE -# LFLAGS+= -Wl,--entry,_wWinMain@16 -endif - -CXXFLAGS = $(CFLAGS) - -EXEC_SUFFIX = .exe -RES_SUFFIX = .coff - -VPATH = shell utility taskbar desktop dialogs - -PROGRAM = rosshell - -TARGET = $(PROGRAM)$(EXEC_SUFFIX) - -OBJECTS = \ - startup.o \ - shellclasses.o \ - utility.o \ - window.o \ - dragdropimpl.o \ - shellbrowserimpl.o \ - explorer.o \ - entries.o \ - shellfs.o \ - desktop.o \ - desktopbar.o \ - taskbar.o \ - startmenu.o \ - traynotify.o \ - quicklaunch.o \ - settings.o - -LIBS = gdi32 comctl32 ole32 uuid - -all: precomp.h.gch $(TARGET) - -precomp.h.gch: *.h utility/*.h shell/*.h desktop/*.h - $(CXX) $(CFLAGS) precomp.h - -$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) - $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) - -$(PROGRAM)$(RES_SUFFIX): explorer_intres.rc res/*.bmp res/*.ico - windres $(RCFLAGS) -o $@ explorer_intres.rc - -clean: - rm -f $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) precomp.h.gch \ - desktop/*.o dialogs/*.o shell/*.o taskbar/*.o utility/*.o - -ever: +# +# ReactOS lean shell +# +# Make-rosshell.MinGW +# +# MinGW Makefile with precompiled header support +# + +CC = gcc +CXX = g++ +LINK = g++ + +CFLAGS = -DWIN32 -DROSSHELL -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -fexceptions -Wall -I. +RCFLAGS = -DWIN32 -DROSSHELL -D__WINDRES__ +LFLAGS = -Wl,--subsystem,windows + +ifdef DEBUG +CFLAGS += -D_DEBUG -g +RCFLAGS += -D_DEBUG +LFLAGS += -g +else +CFLAGS += -DNDEBUG -Os -D_NO_CONTEXT +RCFLAGS += -DNDEBUG +LFLAGS += -s +endif + +ifndef UNICODE +UNICODE = 1 +endif + +ifeq ($(UNICODE),1) +CFLAGS += -DUNICODE +# LFLAGS+= -Wl,--entry,_wWinMain@16 +endif + +CXXFLAGS = $(CFLAGS) + +EXEC_SUFFIX = .exe +RES_SUFFIX = .coff + +VPATH = shell utility taskbar desktop dialogs + +PROGRAM = rosshell + +TARGET = $(PROGRAM)$(EXEC_SUFFIX) + +OBJECTS = \ + startup.o \ + shellclasses.o \ + utility.o \ + window.o \ + dragdropimpl.o \ + shellbrowserimpl.o \ + explorer.o \ + entries.o \ + shellfs.o \ + desktop.o \ + desktopbar.o \ + taskbar.o \ + startmenu.o \ + traynotify.o \ + quicklaunch.o \ + settings.o + +LIBS = gdi32 comctl32 ole32 uuid + +all: precomp.h.gch $(TARGET) + +precomp.h.gch: *.h utility/*.h shell/*.h desktop/*.h + $(CXX) $(CFLAGS) precomp.h + +$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) + $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) + +$(PROGRAM)$(RES_SUFFIX): explorer_intres.rc res/*.bmp res/*.ico + windres $(RCFLAGS) -o $@ explorer_intres.rc + +clean: + rm -f $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) precomp.h.gch \ + desktop/*.o dialogs/*.o shell/*.o taskbar/*.o utility/*.o + +ever: Property changes on: branches/lean-explorer/Make-rosshell-MinGW ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: branches/lean-explorer/Make-rosshell.mak --- branches/lean-explorer/Make-rosshell.mak 2006-01-30 08:00:18 UTC (rev 42) +++ branches/lean-explorer/Make-rosshell.mak 2006-01-30 08:00:33 UTC (rev 43) @@ -1,147 +1,147 @@ -# -# ReactOS lean shell -# -# Makefile -# - -# Windows is default host environment -ifeq ($(HOST),) -HOST = mingw32-windows -endif - -ifeq ($(HOST),mingw32-linux) -CC = mingw32-gcc -CXX = mingw32-g++ -LINK = mingw32-g++ -RC = mingw32-windres -CD_PREFIX := ./ -PREFIX = mingw32- -EXE_POSTFIX := -EXE_PREFIX := ./ -endif - -ifeq ($(HOST),mingw32-windows) -CC = gcc -CXX = g++ -LINK = g++ -RC = windres -CD_PREFIX := -PREFIX = -EXE_PREFIX := -EXE_POSTFIX := .exe -endif - -PATH_TO_TOP = ../../.. -TOOLS_PATH = $(PATH_TO_TOP)/tools - -ifndef UNICODE -UNICODE = 1 -endif - -CFLAGS = -I./ -DWIN32 -D_ROS_ -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -fexceptions -Wall -RCFLAGS = -DWIN32 -D_ROS_ -D__WINDRES__ -LFLAGS = -Wl,--subsystem,windows - -ifdef DEBUG -CFLAGS += -D_DEBUG -g -RCFLAGS += -D_DEBUG -LFLAGS += -g -else -CFLAGS += -DNDEBUG -Os -D_NO_CONTEXT -RCFLAGS += -DNDEBUG -LFLAGS += -s -endif - -ifeq ($(UNICODE),1) -CFLAGS += -DUNICODE -# LFLAGS+= -Wl,--entry,_wWinMain@16 -RCFLAGS += -DUNICODE -endif - -CXXFLAGS = $(CFLAGS) - -EXEC_SUFFIX = .exe -RES_SUFFIX = .coff - -VPATH = shell utility taskbar desktop dialogs - -PROGRAM = rosshell - -TARGET = $(PROGRAM)$(EXEC_SUFFIX) - -OBJECTS = \ - startup.o \ - shellclasses.o \ - utility.o \ - window.o \ - dragdropimpl.o \ - shellbrowserimpl.o \ - explorer.o \ - entries.o \ - shellfs.o \ - desktop.o \ - desktopbar.o \ - taskbar.o \ - startmenu.o \ - traynotify.o \ - quicklaunch.o \ - settings.o - -LIBS = gdi32 comctl32 ole32 uuid - -.PHONY: all depends implib clean install dist bootcd depends - -all: $(TARGET) - -ever: - -$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) - $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) - -$(PROGRAM)$(RES_SUFFIX): explorer_intres.rc res/*.bmp res/*.ico - $(RC) $(RCFLAGS) -o $@ explorer_intres.rc - -clean: - $(TOOLS_PATH)/rdel $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) \ - desktop/*.o dialogs/*.o shell/*.o taskbar/*.o utility/*.o - -# Use environment var ROS_INSTALL to override default install dir -ifneq ($(ROS_INSTALL),) -INSTALL_DIR = $(ROS_INSTALL) -else -ifeq ($(HOST),mingw32-windows) -INSTALL_DIR = C:/reactos -else -INSTALL_DIR = $(PATH_TO_TOP)/reactos -endif -endif - -implib: - -install: - -$(TOOLS_PATH)/rcopy $(TARGET) $(INSTALL_DIR)/$(TARGET) - -bootcd: - - -# dependency scanning - -DEP_FILTERED := $(filter-out $(DEP_EXCLUDE_FILTER), $(OBJECTS:.o=.d)) -DEP_FILES := $(join $(dir $(DEP_FILTERED)), $(addprefix ., $(notdir $(DEP_FILTERED)))) - -ifneq ($(MAKECMDGOALS),clean) --include $(DEP_FILES) -endif - -ifeq ($(HOST),mingw32-windows) -DEPENDS_EXE := ..\..\..\tools\depends -else -DEPENDS_EXE := $(TOOLS_PATH)/depends -endif - -.%.d: %.c $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) - $(CC) $(CFLAGS) -M $< | $(DEPENDS_EXE) $(@D) $@ - -.%.d: %.cpp $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) - $(CC) $(CFLAGS) -M $< | $(DEPENDS_EXE) $(@D) $@ - +# +# ReactOS lean shell +# +# Makefile +# + +# Windows is default host environment +ifeq ($(HOST),) +HOST = mingw32-windows +endif + +ifeq ($(HOST),mingw32-linux) +CC = mingw32-gcc +CXX = mingw32-g++ +LINK = mingw32-g++ +RC = mingw32-windres +CD_PREFIX := ./ +PREFIX = mingw32- +EXE_POSTFIX := +EXE_PREFIX := ./ +endif + +ifeq ($(HOST),mingw32-windows) +CC = gcc +CXX = g++ +LINK = g++ +RC = windres +CD_PREFIX := +PREFIX = +EXE_PREFIX := +EXE_POSTFIX := .exe +endif + +PATH_TO_TOP = ../../.. +TOOLS_PATH = $(PATH_TO_TOP)/tools + +ifndef UNICODE +UNICODE = 1 +endif + +CFLAGS = -I./ -DWIN32 -D_ROS_ -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -fexceptions -Wall +RCFLAGS = -DWIN32 -D_ROS_ -D__WINDRES__ +LFLAGS = -Wl,--subsystem,windows + +ifdef DEBUG +CFLAGS += -D_DEBUG -g +RCFLAGS += -D_DEBUG +LFLAGS += -g +else +CFLAGS += -DNDEBUG -Os -D_NO_CONTEXT +RCFLAGS += -DNDEBUG +LFLAGS += -s +endif + +ifeq ($(UNICODE),1) +CFLAGS += -DUNICODE +# LFLAGS+= -Wl,--entry,_wWinMain@16 +RCFLAGS += -DUNICODE +endif + +CXXFLAGS = $(CFLAGS) + +EXEC_SUFFIX = .exe +RES_SUFFIX = .coff + +VPATH = shell utility taskbar desktop dialogs + +PROGRAM = rosshell + +TARGET = $(PROGRAM)$(EXEC_SUFFIX) + +OBJECTS = \ + startup.o \ + shellclasses.o \ + utility.o \ + window.o \ + dragdropimpl.o \ + shellbrowserimpl.o \ + explorer.o \ + entries.o \ + shellfs.o \ + desktop.o \ + desktopbar.o \ + taskbar.o \ + startmenu.o \ + traynotify.o \ + quicklaunch.o \ + settings.o + +LIBS = gdi32 comctl32 ole32 uuid + +.PHONY: all depends implib clean install dist bootcd depends + +all: $(TARGET) + +ever: + +$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) + $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) + +$(PROGRAM)$(RES_SUFFIX): explorer_intres.rc res/*.bmp res/*.ico + $(RC) $(RCFLAGS) -o $@ explorer_intres.rc + +clean: + $(TOOLS_PATH)/rdel $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) \ + desktop/*.o dialogs/*.o shell/*.o taskbar/*.o utility/*.o + +# Use environment var ROS_INSTALL to override default install dir +ifneq ($(ROS_INSTALL),) +INSTALL_DIR = $(ROS_INSTALL) +else +ifeq ($(HOST),mingw32-windows) +INSTALL_DIR = C:/reactos +else +INSTALL_DIR = $(PATH_TO_TOP)/reactos +endif +endif + +implib: + +install: + -$(TOOLS_PATH)/rcopy $(TARGET) $(INSTALL_DIR)/$(TARGET) + +bootcd: + + +# dependency scanning + +DEP_FILTERED := $(filter-out $(DEP_EXCLUDE_FILTER), $(OBJECTS:.o=.d)) +DEP_FILES := $(join $(dir $(DEP_FILTERED)), $(addprefix ., $(notdir $(DEP_FILTERED)))) + +ifneq ($(MAKECMDGOALS),clean) +-include $(DEP_FILES) +endif + +ifeq ($(HOST),mingw32-windows) +DEPENDS_EXE := ..\..\..\tools\depends +else +DEPENDS_EXE := $(TOOLS_PATH)/depends +endif + +.%.d: %.c $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) + $(CC) $(CFLAGS) -M $< | $(DEPENDS_EXE) $(@D) $@ + +.%.d: %.cpp $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) + $(CC) $(CFLAGS) -M $< | $(DEPENDS_EXE) $(@D) $@ + Property changes on: branches/lean-explorer/Make-rosshell.mak ___________________________________________________________________ Name: svn:eol-style + native

1 0

[martinf] 42: set svn:eol-style for Makefiles
by martinf＠svn.reactos.org 30 Jan '06

30 Jan '06

set svn:eol-style for Makefiles Modified: trunk/reactos/base/shell/explorer/Make-rosshell-MinGW Modified: trunk/reactos/base/shell/explorer/Make-rosshell.mak _____ Modified: trunk/reactos/base/shell/explorer/Make-rosshell-MinGW --- trunk/reactos/base/shell/explorer/Make-rosshell-MinGW 2006-01-30 00:28:01 UTC (rev 41) +++ trunk/reactos/base/shell/explorer/Make-rosshell-MinGW 2006-01-30 08:00:18 UTC (rev 42) @@ -1,92 +1,92 @@ -# -# ReactOS shell -# -# Makefile-rosshell-MinGW -# -# MinGW Makefile with precompiled header support -# - -CC = gcc -CXX = g++ -LINK = g++ - -CFLAGS = -DWIN32 -DROSSHELL -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. -I$(EXPAT_INC) -RCFLAGS = -DWIN32 -DROSSHELL -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 = shell utility taskbar desktop dialogs services - -PROGRAM = rosshell - -TARGET = $(PROGRAM)$(EXEC_SUFFIX) - -OBJECTS = \ - startup.o \ - shellclasses.o \ - utility.o \ - window.o \ - dragdropimpl.o \ - shellbrowserimpl.o \ - explorer.o \ - entries.o \ - winfs.o \ - shellfs.o \ - pane.o \ - desktop.o \ - desktopbar.o \ - taskbar.o \ - startmenu.o \ - shellservices.o \ - traynotify.o \ - quicklaunch.o \ - favorites.o \ - searchprogram.o \ - settings.o \ - i386-stub-win32.o \ - xmlstorage.o - -LIBS = gdi32 comctl32 msimg32 ole32 uuid -DELAYIMPORTS = oleaut32 wsock32 - -all: precomp.h.gch $(TARGET) - -precomp.h.gch: *.h utility/*.h shell/*.h desktop/*.h - $(CXX) $(CFLAGS) precomp.h - -$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) notifyhook.dll libexpat.dll - $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) $(addprefix -l,$(DELAYIMPORTS)) - -$(PROGRAM)$(RES_SUFFIX): explorer_intres.rc res/*.bmp res/*.ico - windres $(RCFLAGS) -o $@ explorer_intres.rc - -notifyhook.dll: notifyhook/notifyhook.c notifyhook/notifyhook.h - $(CC) -D_WIN32_IE=0x0600 -Wall -D_NOTIFYHOOK_IMPL -Os -s notifyhook/notifyhook.c -shared -o $@ - -clean: - rm -f $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) precomp.h.gch \ - desktop/*.o dialogs/*.o shell/*.o taskbar/*.o utility/*.o +# +# ReactOS shell +# +# Makefile-rosshell-MinGW +# +# MinGW Makefile with precompiled header support +# + +CC = gcc +CXX = g++ +LINK = g++ + +CFLAGS = -DWIN32 -DROSSHELL -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. -I$(EXPAT_INC) +RCFLAGS = -DWIN32 -DROSSHELL -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 = shell utility taskbar desktop dialogs services + +PROGRAM = rosshell + +TARGET = $(PROGRAM)$(EXEC_SUFFIX) + +OBJECTS = \ + startup.o \ + shellclasses.o \ + utility.o \ + window.o \ + dragdropimpl.o \ + shellbrowserimpl.o \ + explorer.o \ + entries.o \ + winfs.o \ + shellfs.o \ + pane.o \ + desktop.o \ + desktopbar.o \ + taskbar.o \ + startmenu.o \ + shellservices.o \ + traynotify.o \ + quicklaunch.o \ + favorites.o \ + searchprogram.o \ + settings.o \ + i386-stub-win32.o \ + xmlstorage.o + +LIBS = gdi32 comctl32 msimg32 ole32 uuid +DELAYIMPORTS = oleaut32 wsock32 + +all: precomp.h.gch $(TARGET) + +precomp.h.gch: *.h utility/*.h shell/*.h desktop/*.h + $(CXX) $(CFLAGS) precomp.h + +$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) notifyhook.dll libexpat.dll + $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) $(addprefix -l,$(DELAYIMPORTS)) + +$(PROGRAM)$(RES_SUFFIX): explorer_intres.rc res/*.bmp res/*.ico + windres $(RCFLAGS) -o $@ explorer_intres.rc + +notifyhook.dll: notifyhook/notifyhook.c notifyhook/notifyhook.h + $(CC) -D_WIN32_IE=0x0600 -Wall -D_NOTIFYHOOK_IMPL -Os -s notifyhook/notifyhook.c -shared -o $@ + +clean: + rm -f $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) precomp.h.gch \ + desktop/*.o dialogs/*.o shell/*.o taskbar/*.o utility/*.o Property changes on: trunk/reactos/base/shell/explorer/Make-rosshell-MinGW ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/base/shell/explorer/Make-rosshell.mak --- trunk/reactos/base/shell/explorer/Make-rosshell.mak 2006-01-30 00:28:01 UTC (rev 41) +++ trunk/reactos/base/shell/explorer/Make-rosshell.mak 2006-01-30 08:00:18 UTC (rev 42) @@ -1,68 +1,68 @@ -# -# ReactOS shell -# -# Makefile -# - -PATH_TO_TOP := ../../.. - -TARGET_TYPE := program - -TARGET_APPTYPE := windows - -TARGET_NAME := rosshell - -TARGET_INSTALLDIR := . - -TARGET_CFLAGS := \ - -D__USE_W32API -DWIN32 -D_ROS_ \ - -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 \ - -DUNICODE -fexceptions -Wall -g \ - -I../../../include/expat - -TARGET_CPPFLAGS := $(TARGET_CFLAGS) - -TARGET_RCFLAGS := -D__USE_W32API -DWIN32 -D_ROS_ -D__WINDRES__ - -TARGET_SDKLIBS := \ - gdi32.a user32.a comctl32.a ole32.a oleaut32.a shell32.a expat.a \ - notifyhook.a ws2_32.a msimg32.a - -TARGET_GCCLIBS := stdc++ uuid - -TARGET_OBJECTS := \ - explorer.o \ - i386-stub-win32.o \ - desktop/desktop.o \ - dialogs/searchprogram.o \ - dialogs/settings.o \ - shell/entries.o \ - shell/shellfs.o \ - shell/pane.o \ - shell/winfs.o \ - services/startup.o \ - services/shellservices.o \ - taskbar/desktopbar.o \ - taskbar/taskbar.o \ - taskbar/startmenu.o \ - taskbar/traynotify.o \ - taskbar/quicklaunch.o \ - taskbar/favorites.o \ - utility/shellclasses.o \ - utility/utility.o \ - utility/window.o \ - utility/dragdropimpl.o \ - utility/shellbrowserimpl.o \ - utility/xmlstorage.o - -TARGET_CPPAPP := yes - -TARGET_PCH := precomp.h - -SUBDIRS := notifyhook - -DEP_OBJECTS := $(TARGET_OBJECTS) - -include $(PATH_TO_TOP)/rules.mak -include $(TOOLS_PATH)/helper.mk -include $(TOOLS_PATH)/depend.mk +# +# ReactOS shell +# +# Makefile +# + +PATH_TO_TOP := ../../.. + +TARGET_TYPE := program + +TARGET_APPTYPE := windows + +TARGET_NAME := rosshell + +TARGET_INSTALLDIR := . + +TARGET_CFLAGS := \ + -D__USE_W32API -DWIN32 -D_ROS_ \ + -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 \ + -DUNICODE -fexceptions -Wall -g \ + -I../../../include/expat + +TARGET_CPPFLAGS := $(TARGET_CFLAGS) + +TARGET_RCFLAGS := -D__USE_W32API -DWIN32 -D_ROS_ -D__WINDRES__ + +TARGET_SDKLIBS := \ + gdi32.a user32.a comctl32.a ole32.a oleaut32.a shell32.a expat.a \ + notifyhook.a ws2_32.a msimg32.a + +TARGET_GCCLIBS := stdc++ uuid + +TARGET_OBJECTS := \ + explorer.o \ + i386-stub-win32.o \ + desktop/desktop.o \ + dialogs/searchprogram.o \ + dialogs/settings.o \ + shell/entries.o \ + shell/shellfs.o \ + shell/pane.o \ + shell/winfs.o \ + services/startup.o \ + services/shellservices.o \ + taskbar/desktopbar.o \ + taskbar/taskbar.o \ + taskbar/startmenu.o \ + taskbar/traynotify.o \ + taskbar/quicklaunch.o \ + taskbar/favorites.o \ + utility/shellclasses.o \ + utility/utility.o \ + utility/window.o \ + utility/dragdropimpl.o \ + utility/shellbrowserimpl.o \ + utility/xmlstorage.o + +TARGET_CPPAPP := yes + +TARGET_PCH := precomp.h + +SUBDIRS := notifyhook + +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/base/shell/explorer/Make-rosshell.mak ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/3rdparty/adns/Makefile.in ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/3rdparty/adns/client/Makefile.in ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/3rdparty/adns/dynamic/Makefile.in ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/3rdparty/adns/src/Makefile.in ___________________________________________________________________ Name: svn:eol-style + native

1 0

[arty] 41: moved documentation
by arty＠svn.reactos.org 30 Jan '06

30 Jan '06

moved documentation Added: trunk/documentation/ Deleted: trunk/documentation/audit/ Added: trunk/documentation/audit/ Deleted: trunk/reactos/documentation/ _____ Copied: trunk/documentation (from rev 38, trunk/reactos/documentation) _____ Copied: trunk/documentation/audit (from rev 40, trunk/reactos/documentation/audit)

1 0

[arty] 40: Added null driver (originally written by David Welch and KJK:Hyperion).
by arty＠svn.reactos.org 30 Jan '06

30 Jan '06

Added null driver (originally written by David Welch and KJK:Hyperion). Added: trunk/reactos/drivers/base/null/ Added: trunk/reactos/drivers/base/null/null.c Added: trunk/reactos/drivers/base/null/null.h Added: trunk/reactos/drivers/base/null/null.rbuild Added: trunk/reactos/drivers/base/null/null.rc _____ Added: trunk/reactos/drivers/base/null/null.c --- trunk/reactos/drivers/base/null/null.c 2006-01-30 00:12:14 UTC (rev 39) +++ trunk/reactos/drivers/base/null/null.c 2006-01-30 00:15:24 UTC (rev 40) @@ -0,0 +1,205 @@ +/* $Id: null.c 18302 2005-10-06 21:39:18Z weiden $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: services/null/null.c + * PURPOSE: NULL device driver + * PROGRAMMER: David Welch (welch(a)mcmail.com) + * UPDATE HISTORY: + * 13/08/1998: Created + * 29/04/2002: Fixed bugs, added zero-stream device + * 28/06/2004: Compile against the DDK, use PSEH where necessary + */ + +/* INCLUDES */ +#include <ntddk.h> + +#include <pseh/pseh.h> + +#include "null.h" + +/* OBJECTS */ +static const NULL_EXTENSION nxNull = NullBitBucket; +static const NULL_EXTENSION nxZero = NullZeroStream; + +/* FUNCTIONS */ +static NTSTATUS STDCALL +NullDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + PIO_STACK_LOCATION piosStack = IoGetCurrentIrpStackLocation(Irp); + NTSTATUS nErrCode; + + nErrCode = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + switch(piosStack->MajorFunction) + { + /* opening and closing handles to the device */ + case IRP_MJ_CREATE: + case IRP_MJ_CLOSE: + switch(NULL_DEVICE_TYPE(DeviceObject)) + { + case NullBitBucket: + case NullZeroStream: + break; + + default: + ASSERT(FALSE); + } + + break; + + /* write data */ + case IRP_MJ_WRITE: + { + switch(NULL_DEVICE_TYPE(DeviceObject)) + { + case NullBitBucket: + Irp->IoStatus.Information = piosStack->Parameters.Write.Length; + break; + + case NullZeroStream: + nErrCode = STATUS_INVALID_DEVICE_REQUEST; + break; + + default: + ASSERT(FALSE); + } + + break; + } + + /* read data */ + case IRP_MJ_READ: + { + switch(NULL_DEVICE_TYPE(DeviceObject)) + { + case NullBitBucket: + nErrCode = STATUS_END_OF_FILE; + break; + + case NullZeroStream: + _SEH_TRY + { + RtlZeroMemory(Irp->AssociatedIrp.SystemBuffer, piosStack->Parameters.Read.Length); + Irp->IoStatus.Information = piosStack->Parameters.Read.Length; + } + _SEH_HANDLE + { + nErrCode = _SEH_GetExceptionCode(); + } + _SEH_END; + + break; + + default: + ASSERT(FALSE); + + } + + break; + } + + case IRP_MJ_QUERY_VOLUME_INFORMATION: + switch(piosStack->Parameters.QueryVolume.FsInformationClass) + { + case FileFsDeviceInformation: + { + ULONG BufferLength = piosStack->Parameters.QueryVolume.Length; + PFILE_FS_DEVICE_INFORMATION FsDeviceInfo = (PFILE_FS_DEVICE_INFORMATION)Irp->AssociatedIrp.SystemBuffer; + + if (BufferLength >= sizeof(FILE_FS_DEVICE_INFORMATION)) + { + FsDeviceInfo->DeviceType = FILE_DEVICE_NULL; + FsDeviceInfo->Characteristics = 0; /* FIXME: fix this !! */ + Irp->IoStatus.Information = sizeof(FILE_FS_DEVICE_INFORMATION); + nErrCode = STATUS_SUCCESS; + } + else + { + Irp->IoStatus.Information = 0; + nErrCode = STATUS_BUFFER_OVERFLOW; + } + } + break; + + default: + Irp->IoStatus.Information = 0; + nErrCode = STATUS_NOT_IMPLEMENTED; + } + break; + + default: + Irp->IoStatus.Information = 0; + nErrCode = STATUS_NOT_IMPLEMENTED; + + } + + Irp->IoStatus.Status = nErrCode; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return (nErrCode); +} + +static VOID STDCALL +NullUnload(PDRIVER_OBJECT DriverObject) +{ +} + +/* TODO: \Device\Zero should be memory-mappable */ +NTSTATUS STDCALL +DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) +{ + PDEVICE_OBJECT pdoNullDevice; + PDEVICE_OBJECT pdoZeroDevice; + UNICODE_STRING wstrNullDeviceName = RTL_CONSTANT_STRING(L"\\Device\\Null"); + UNICODE_STRING wstrZeroDeviceName = RTL_CONSTANT_STRING(L"\\Device\\Zero"); + NTSTATUS nErrCode; + + /* register driver routines */ + DriverObject->MajorFunction[IRP_MJ_CLOSE] = NullDispatch; + DriverObject->MajorFunction[IRP_MJ_CREATE] = NullDispatch; + DriverObject->MajorFunction[IRP_MJ_WRITE] = NullDispatch; + DriverObject->MajorFunction[IRP_MJ_READ] = NullDispatch; + DriverObject->DriverUnload = NullUnload; + + /* create null device */ + nErrCode = IoCreateDevice(DriverObject, + sizeof(NULL_EXTENSION), + &wstrNullDeviceName, + FILE_DEVICE_NULL, + 0, + FALSE, + &pdoNullDevice); + + /* failure */ + if(!NT_SUCCESS(nErrCode)) + { + return (nErrCode); + } + + pdoNullDevice->DeviceExtension = (PVOID)&nxNull; + + /* create zero device */ + nErrCode = IoCreateDevice(DriverObject, + sizeof(NULL_EXTENSION), + &wstrZeroDeviceName, + FILE_DEVICE_NULL, + FILE_READ_ONLY_DEVICE, /* zero device is read-only */ + FALSE, + &pdoZeroDevice); + + /* failure */ + if(!NT_SUCCESS(nErrCode)) + { + IoDeleteDevice(pdoNullDevice); + return (nErrCode); + } + + pdoZeroDevice->DeviceExtension = (PVOID)&nxZero; + pdoZeroDevice->Flags |= DO_BUFFERED_IO; + + return (nErrCode); +} + +/* EOF */ _____ Added: trunk/reactos/drivers/base/null/null.h --- trunk/reactos/drivers/base/null/null.h 2006-01-30 00:12:14 UTC (rev 39) +++ trunk/reactos/drivers/base/null/null.h 2006-01-30 00:15:24 UTC (rev 40) @@ -0,0 +1,22 @@ +/* $Id: null.h 18302 2005-10-06 21:39:18Z weiden $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: services/dd/null/null.h + * PURPOSE: NULL device driver internal definitions + * PROGRAMMER: KJK::Hyperion <noog(a)libero.it> + * UPDATE HISTORY: + * 29/04/2002: Created + */ + +typedef enum __tagNULL_EXTENSION{ + NullBitBucket, + NullZeroStream, +} NULL_EXTENSION, *PNULL_EXTENSION; + +#define NULL_DEVICE_TYPE(__DEVICE__) (*((PNULL_EXTENSION)((__DEVICE__)->DeviceExtension))) + +NTSTATUS STDCALL +DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); + +/* EOF */ _____ Added: trunk/reactos/drivers/base/null/null.rbuild --- trunk/reactos/drivers/base/null/null.rbuild 2006-01-30 00:12:14 UTC (rev 39) +++ trunk/reactos/drivers/base/null/null.rbuild 2006-01-30 00:15:24 UTC (rev 40) @@ -0,0 +1,9 @@ +<module name="null" type="kernelmodedriver" installbase="system32/drivers" installname="null.sys"> + <include base="null">.</include> + <define name="__USE_W32API" /> + <library>pseh</library> + <library>ntoskrnl</library> + <library>hal</library> + <file>null.c</file> + <file>null.rc</file> +</module> _____ Added: trunk/reactos/drivers/base/null/null.rc --- trunk/reactos/drivers/base/null/null.rc 2006-01-30 00:12:14 UTC (rev 39) +++ trunk/reactos/drivers/base/null/null.rc 2006-01-30 00:15:24 UTC (rev 40) @@ -0,0 +1,7 @@ +/* $Id: null.rc 12852 2005-01-06 13:58:04Z mf $ */ + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Null Device Driver\0" +#define REACTOS_STR_INTERNAL_NAME "null\0" +#define REACTOS_STR_ORIGINAL_FILENAME "null.sys\0" +#include <reactos/version.rc>

1 0

[arty] 39: Added analysis of null driver.
by arty＠svn.reactos.org 30 Jan '06

30 Jan '06

Added analysis of null driver. Added: trunk/reactos/documentation/audit/drivers/ Added: trunk/reactos/documentation/audit/drivers/base/ Added: trunk/reactos/documentation/audit/drivers/base/null.txt Added: trunk/reactos/documentation/audit/drivers/standard_driver_entry_tasks.tx t Added: trunk/reactos/documentation/audit/drivers/standard_irp_handling_tasks.tx t _____ Added: trunk/reactos/documentation/audit/drivers/base/null.txt --- trunk/reactos/documentation/audit/drivers/base/null.txt 2006-01-30 00:02:45 UTC (rev 38) +++ trunk/reactos/documentation/audit/drivers/base/null.txt 2006-01-30 00:12:14 UTC (rev 39) @@ -0,0 +1,32 @@ +Audit result: NULL driver +Result: Obvious implementation + +The null driver implements two virtual devices; + +\device\null -- A device which always consumes all bytes written and which +perpetually reads at EOF (this is similar to the unix /dev/null device). +@null.c:155 + +\device\zero -- A device which simulates an infinite well of zero bytes on +read, and which rejects attempts to write. +@null.c:156 + +The null driver initializes resources in its DriverEntry function as outlined +in drivers/standard_driver_entry_tasks.txt. This initialization can be +considered trivial, as it performs only tasks which are trivially considered +to be required. + +@null.c:159 -- Register dispatch functions +@null.c:167,184 -- Create device object +@null.c:176,193 -- Gracefully handle failures +@null.c:200 -- Set buffered IO flag as described here: +http://msdn.microsoft.com/library/default.asp?url=/library/en-us/IFSK_r /hh/IFSK_r/irpref_e73f783d-00eb-4d50-82a2-67ce60a36c76.xml.asp + +The null driver contains only one other nonempty function, the IRP handling +dispatch function. This function can be considered to be trivial in that +everything it does is trivially considered to be required as outlined in +drivers/standard_irp_handling_tasks.txt. + +@null.c:82 -- Protect the kernel mode environment +@null.c:58,62,78,85,115,121,127,133,138 -- Complete irps on behalf of user + processes. _____ Added: trunk/reactos/documentation/audit/drivers/standard_driver_entry_tasks.tx t --- trunk/reactos/documentation/audit/drivers/standard_driver_entry_tasks.tx t 2006-01-30 00:02:45 UTC (rev 38) +++ trunk/reactos/documentation/audit/drivers/standard_driver_entry_tasks.tx t 2006-01-30 00:12:14 UTC (rev 39) @@ -0,0 +1,12 @@ +These tasks are required of the DriverEntry portion of any driver, and are +described in "The Windows NT Device Driver Book" by Art Baker. + +While mostly outlined in chapters 4 and 5, essential tasks include: + +- Initializing the device object with function pointers which are called to + service IRPs on behalf of drivers and devices. +- Creating device objects used to represent driver instances and making them + available by name in the kernel namespace. +- Possibly acquiring resources for well known, fixed instance devices such as + legacy ISA. +- Gracefully handling errors and cleaning up resources. _____ Added: trunk/reactos/documentation/audit/drivers/standard_irp_handling_tasks.tx t --- trunk/reactos/documentation/audit/drivers/standard_irp_handling_tasks.tx t 2006-01-30 00:02:45 UTC (rev 38) +++ trunk/reactos/documentation/audit/drivers/standard_irp_handling_tasks.tx t 2006-01-30 00:12:14 UTC (rev 39) @@ -0,0 +1,19 @@ +These tasks are required of any IRP handling callbacks provided by a driver +and are outlined in "The Windows NT Device Driver Book" by Art Baker, chapters +9, 10 and 11. + +Essential tasks are: + +- In the case of device open, close and cleanup requests, manage resources + needed by each open device instance, including device specific and driver + specific data allocated in DRIVER_EXTENSION and DEVICE_EXTENSION structures, + any uncompleted, queued IRPs, and any internally queued requests on behalf + of either ioctls which cause persistent driver state changes or hardware with + persistent states that must be tracked. +- Actually interacting with hardware in order to fulfill user requests. +- Manage access to user buffers using MDLs. +- Complete or enqueue IRPs on behalf of user processes or other drivers. +- Manage timers and other system services needed to ensure that the system + functions correctly. +- Protect the kernel mode environment from harm by validating pointers to user + memory.

1 0

[arty] 38: First cut at a documentation tree for auditing code.
by arty＠svn.reactos.org 30 Jan '06

30 Jan '06

First cut at a documentation tree for auditing code. Layout and README by Peter Ward (dralnix). Added: trunk/reactos/documentation/ Added: trunk/reactos/documentation/README Added: trunk/reactos/documentation/api/ Added: trunk/reactos/documentation/articles/ Added: trunk/reactos/documentation/audit/ Added: trunk/reactos/documentation/reverse.engineering/ _____ Added: trunk/reactos/documentation/README --- trunk/reactos/documentation/README 2006-01-29 19:03:05 UTC (rev 37) +++ trunk/reactos/documentation/README 2006-01-30 00:02:45 UTC (rev 38) @@ -0,0 +1,11 @@ +This is the documentation directory for the ReactOS project. + + +Directory Layout: + +api\ : Documentation for various APIs. +articles\ : Howto's, Articles and related documentation. +audit\ : Documentation about and gathered by the audit. +reverse.engineering\ : Clean-Room effort documentation. + : _Only_ human language and pseudo-code documentation is allowed here. +

1 0

[martinf] 37: set svn:eolstyle in *.rbuild files
by martinf＠svn.reactos.org 29 Jan '06

29 Jan '06

set svn:eolstyle in *.rbuild files Modified: trunk/reactos/base/applications/applications.rbuild Modified: trunk/reactos/base/applications/ibrowser/ibrowser.rbuild Modified: trunk/reactos/base/applications/network/arp/arp.rbuild Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rbuild Modified: trunk/reactos/base/applications/network/netstat/netstat.rbuild Modified: trunk/reactos/base/applications/network/tracert/tracert.rbuild Modified: trunk/reactos/base/applications/winefile/winefile.rbuild Modified: trunk/reactos/base/base.rbuild Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.rbuild Modified: trunk/reactos/base/shell/explorer/explorer.rbuild Modified: trunk/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild Modified: trunk/reactos/base/shell/shell.rbuild Modified: trunk/reactos/base/system/msconfig/msconfig.rbuild Modified: trunk/reactos/base/system/sc/sc.rbuild Modified: trunk/reactos/base/system/servman/servman.rbuild Modified: trunk/reactos/base/system/system.rbuild Modified: trunk/reactos/boot/boot.rbuild Modified: trunk/reactos/boot/bootcd/bootcd.rbuild Modified: trunk/reactos/subsystems/subsystems.rbuild _____ Modified: trunk/reactos/base/applications/applications.rbuild --- trunk/reactos/base/applications/applications.rbuild 2006-01-29 15:59:25 UTC (rev 36) +++ trunk/reactos/base/applications/applications.rbuild 2006-01-29 19:03:05 UTC (rev 37) @@ -1,16 +1,16 @@ -<group> - -</group> +<group> + +</group> Property changes on: trunk/reactos/base/applications/applications.rbuild ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/base/applications/ibrowser/ibrowser.rbuild --- trunk/reactos/base/applications/ibrowser/ibrowser.rbuild 2006-01-29 15:59:25 UTC (rev 36) +++ trunk/reactos/base/applications/ibrowser/ibrowser.rbuild 2006-01-29 19:03:05 UTC (rev 37) @@ -1,31 +1,31 @@ -<module name="ibrowser" type="win32gui" installbase="system32" installname="ibrowser.exe" allowwarnings ="true"> - <linkerflag>-fexceptions</linkerflag> - <include base="ibrowser">.</include> - <include base="ReactOS">include/expat</include> - <define name="__USE_W32API" /> - <define name="UNICODE" /> - <define name="WIN32" /> - <define name="_ROS_" /> - <define name="_WIN32_IE">0x0600</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="WINVER">0x0500</define> - <library>uuid</library> - <library>kernel32</library> - <library>gdi32</library> - <library>comctl32</library> - <library>ole32</library> - <library>oleaut32</library> - <library>shell32</library> - <library>expat</library> - <pch>precomp.h</pch> - <directory name="utility"> - <file>utility.cpp</file> - <file>window.cpp</file> - <file>xmlstorage.cpp</file> - </directory> - <file>ibrowser.cpp</file> - <file>favorites.cpp</file> - <file>mainframe.cpp</file> - <file>webchild.cpp</file> - <file>ibrowser.rc</file> -</module> +<module name="ibrowser" type="win32gui" installbase="system32" installname="ibrowser.exe" allowwarnings ="true"> + <linkerflag>-fexceptions</linkerflag> + <include base="ibrowser">.</include> + <include base="ReactOS">include/expat</include> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="WIN32" /> + <define name="_ROS_" /> + <define name="_WIN32_IE">0x0600</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="WINVER">0x0500</define> + <library>uuid</library> + <library>kernel32</library> + <library>gdi32</library> + <library>comctl32</library> + <library>ole32</library> + <library>oleaut32</library> + <library>shell32</library> + <library>expat</library> + <pch>precomp.h</pch> + <directory name="utility"> + <file>utility.cpp</file> + <file>window.cpp</file> + <file>xmlstorage.cpp</file> + </directory> + <file>ibrowser.cpp</file> + <file>favorites.cpp</file> + <file>mainframe.cpp</file> + <file>webchild.cpp</file> + <file>ibrowser.rc</file> +</module> Property changes on: trunk/reactos/base/applications/ibrowser/ibrowser.rbuild ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/base/applications/network/arp/arp.rbuild --- trunk/reactos/base/applications/network/arp/arp.rbuild 2006-01-29 15:59:25 UTC (rev 36) +++ trunk/reactos/base/applications/network/arp/arp.rbuild 2006-01-29 19:03:05 UTC (rev 37) @@ -1,11 +1,11 @@ -<module name="arp" type="win32cui" installbase="system32" installname="arp.exe"> - <include base="arp">.</include> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>iphlpapi</library> - <library>ws2_32</library> - <library>shlwapi</library> - <file>arp.c</file> - <file>arp.rc</file> -</module> - +<module name="arp" type="win32cui" installbase="system32" installname="arp.exe"> + <include base="arp">.</include> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>iphlpapi</library> + <library>ws2_32</library> + <library>shlwapi</library> + <file>arp.c</file> + <file>arp.rc</file> +</module> + Property changes on: trunk/reactos/base/applications/network/arp/arp.rbuild ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rbuild --- trunk/reactos/base/applications/network/ipconfig/ipconfig.rbuild 2006-01-29 15:59:25 UTC (rev 36) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.rbuild 2006-01-29 19:03:05 UTC (rev 37) @@ -1,9 +1,9 @@ -<module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe" allowwarnings="true"> - <include base="ipconfig">.</include> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>user32</library> - <library>iphlpapi</library> - <file>ipconfig.c</file> - <file>ipconfig.rc</file> -</module> +<module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe" allowwarnings="true"> + <include base="ipconfig">.</include> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>user32</library> + <library>iphlpapi</library> + <file>ipconfig.c</file> + <file>ipconfig.rc</file> +</module> Property changes on: trunk/reactos/base/applications/network/ipconfig/ipconfig.rbuild ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/base/applications/network/netstat/netstat.rbuild --- trunk/reactos/base/applications/network/netstat/netstat.rbuild 2006-01-29 15:59:25 UTC (rev 36) +++ trunk/reactos/base/applications/network/netstat/netstat.rbuild 2006-01-29 19:03:05 UTC (rev 37) @@ -1,13 +1,13 @@ -<module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe" allowwarnings="true"> - <include base="netstat">.</include> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <library>kernel32</library> - <library>user32</library> - <library>ws2_32</library> - <library>snmpapi</library> - <library>iphlpapi</library> - <file>netstat.c</file> - <file>netstat.rc</file> -</module> +<module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe" allowwarnings="true"> + <include base="netstat">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>ws2_32</library> + <library>snmpapi</library> + <library>iphlpapi</library> + <file>netstat.c</file> + <file>netstat.rc</file> +</module> Property changes on: trunk/reactos/base/applications/network/netstat/netstat.rbuild ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/base/applications/network/tracert/tracert.rbuild --- trunk/reactos/base/applications/network/tracert/tracert.rbuild 2006-01-29 15:59:25 UTC (rev 36) +++ trunk/reactos/base/applications/network/tracert/tracert.rbuild 2006-01-29 19:03:05 UTC (rev 37) @@ -1,11 +1,11 @@ -<module name="tracert" type="win32cui" installbase="system32" installname="tracert.exe"> - <include base="tracert">.</include> - <define name="__USE_W32API" /> - <define name="__USE_W32_SOCKETS" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <library>kernel32</library> - <library>ws2_32</library> - <file>tracert.c</file> - <file>tracert.rc</file> -</module> +<module name="tracert" type="win32cui" installbase="system32" installname="tracert.exe"> + <include base="tracert">.</include> + <define name="__USE_W32API" /> + <define name="__USE_W32_SOCKETS" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>ws2_32</library> + <file>tracert.c</file> + <file>tracert.rc</file> +</module> Property changes on: trunk/reactos/base/applications/network/tracert/tracert.rbuild ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/base/applications/winefile/winefile.rbuild --- trunk/reactos/base/applications/winefile/winefile.rbuild 2006-01-29 15:59:25 UTC (rev 36) +++ trunk/reactos/base/applications/winefile/winefile.rbuild 2006-01-29 19:03:05 UTC (rev 37) @@ -1,19 +1,19 @@ -<module name="winefile" type="win32gui" installbase="system32" installname="winefile.exe" allowwarnings="true"> - <include base="winefile">.</include> - <define name="UNICODE" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <library>uuid</library> - <library>kernel32</library> - <library>gdi32</library> - <library>user32</library> - <library>comctl32</library> - <library>comdlg32</library> - <library>shell32</library> - <library>ole32</library> - <library>version</library> - <library>mpr</library> - <file>winefile.c</file> - <file>winefile.rc</file> -</module> +<module name="winefile" type="win32gui" installbase="system32" installname="winefile.exe" allowwarnings="true"> + <include base="winefile">.</include> + <define name="UNICODE" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>uuid</library> + <library>kernel32</library> + <library>gdi32</library> + <library>user32</library> + <library>comctl32</library> + <library>comdlg32</library> + <library>shell32</library> + <library>ole32</library> + <library>version</library> + <library>mpr</library> + <file>winefile.c</file> + <file>winefile.rc</file> +</module> Property changes on: trunk/reactos/base/applications/winefile/winefile.rbuild ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/base/base.rbuild --- trunk/reactos/base/base.rbuild 2006-01-29 15:59:25 UTC (rev 36) +++ trunk/reactos/base/base.rbuild 2006-01-29 19:03:05 UTC (rev 37) @@ -1,19 +1,19 @@ -<group> -<directory name="applications"> - <xi:include href="applications/applications.rbuild" /> -</directory> - -<directory name="shell"> - <xi:include href="shell/shell.rbuild" /> -</directory> -<directory name="system"> - <xi:include href="system/system.rbuild" /> -</directory> -</group> +<group> +<directory name="applications"> + <xi:include href="applications/applications.rbuild" /> +</directory> + +<directory name="shell"> + <xi:include href="shell/shell.rbuild" /> +</directory> +<directory name="system"> + <xi:include href="system/system.rbuild" /> +</directory> +</group> Property changes on: trunk/reactos/base/base.rbuild ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.rbuild --- trunk/reactos/base/services/tcpsvcs/tcpsvcs.rbuild 2006-01-29 15:59:25 UTC (rev 36) +++ trunk/reactos/base/services/tcpsvcs/tcpsvcs.rbuild 2006-01-29 19:03:05 UTC (rev 37) @@ -1,17 +1,17 @@ -<module name="tcpsvcs" type="win32cui" installbase="system32" installname="tcpsvcs.exe"> - <include base="arp">.</include> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>iphlpapi</library> - <library>ws2_32</library> - <library>shlwapi</library> - <file>tcpsvcs.c</file> - <file>skelserver.c</file> - <file>echo.c</file> - <file>discard.c</file> - <file>daytime.c</file> - <file>qotd.c</file> - <file>chargen.c</file> - <file>tcpsvcs.rc</file> - <pch>tcpsvcs.h</pch> -</module> +<module name="tcpsvcs" type="win32cui" installbase="system32" installname="tcpsvcs.exe"> + <include base="arp">.</include> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>iphlpapi</library> + <library>ws2_32</library> + <library>shlwapi</library> + <file>tcpsvcs.c</file> + <file>skelserver.c</file> + <file>echo.c</file> + <file>discard.c</file> + <file>daytime.c</file> + <file>qotd.c</file> + <file>chargen.c</file> + <file>tcpsvcs.rc</file> + <pch>tcpsvcs.h</pch> +</module> Property changes on: trunk/reactos/base/services/tcpsvcs/tcpsvcs.rbuild ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/base/shell/explorer/explorer.rbuild --- trunk/reactos/base/shell/explorer/explorer.rbuild 2006-01-29 15:59:25 UTC (rev 36) +++ trunk/reactos/base/shell/explorer/explorer.rbuild 2006-01-29 19:03:05 UTC (rev 37) @@ -1,74 +1,74 @@ -<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true"> - <linkerflag>-luuid</linkerflag> - <linkerflag>-lstdc++</linkerflag> - <linkerflag>-fexceptions</linkerflag> - <include base="explorer">.</include> - <define name="__USE_W32API" /> - <define name="UNICODE" /> - <define name="WIN32" /> - <define name="_ROS_" /> - <define name="_WIN32_IE">0x0600</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="WINVER">0x0500</define> - <define name="__WINDRES__" /> - <library>kernel32</library> - <library>gdi32</library> - <library>user32</library> - <library>ws2_32</library> - <library>msimg32</library> - <library>comctl32</library> - <library>ole32</library> - <library>oleaut32</library> - <library>shell32</library> - <library>expat</library> - <library>notifyhook</library> - <pch>precomp.h</pch> - <directory name="desktop"> - <file>desktop.cpp</file> - </directory> - <directory name="dialogs"> - <file>searchprogram.cpp</file> - <file>settings.cpp</file> - </directory> - <directory name="shell"> - <file>entries.cpp</file> - <file>fatfs.cpp</file> - <file>filechild.cpp</file> - <file>shellfs.cpp</file> - <file>mainframe.cpp</file> - <file>ntobjfs.cpp</file> - <file>pane.cpp</file> - <file>regfs.cpp</file> - <file>shellbrowser.cpp</file> - <file>unixfs.cpp</file> - <file>webchild.cpp</file> - <file>winfs.cpp</file> - </directory> - <directory name="services"> - <file>shellservices.cpp</file> - <file>startup.c</file> - </directory> - <directory name="taskbar"> - <file>desktopbar.cpp</file> - <file>favorites.cpp</file> - <file>taskbar.cpp</file> - <file>startmenu.cpp</file> - <file>traynotify.cpp</file> - <file>quicklaunch.cpp</file> - </directory> - <directory name="utility"> - <file>shellclasses.cpp</file> - <file>utility.cpp</file> - <file>window.cpp</file> - <file>dragdropimpl.cpp</file> - <file>shellbrowserimpl.cpp</file> - <file>xmlstorage.cpp</file> - </directory> - <file>explorer.cpp</file> - <file>i386-stub-win32.c</file> - <file>explorer.rc</file> -</module> -<installfile base=".">explorer-cfg-template.xml</installfile> -<directory name="notifyhook"> - <xi:include href="notifyhook/notifyhook.rbuild" /> -</directory> +<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true"> + <linkerflag>-luuid</linkerflag> + <linkerflag>-lstdc++</linkerflag> + <linkerflag>-fexceptions</linkerflag> + <include base="explorer">.</include> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="WIN32" /> + <define name="_ROS_" /> + <define name="_WIN32_IE">0x0600</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="WINVER">0x0500</define> + <define name="__WINDRES__" /> + <library>kernel32</library> + <library>gdi32</library> + <library>user32</library> + <library>ws2_32</library> + <library>msimg32</library> + <library>comctl32</library> + <library>ole32</library> + <library>oleaut32</library> + <library>shell32</library> + <library>expat</library> + <library>notifyhook</library> + <pch>precomp.h</pch> + <directory name="desktop"> + <file>desktop.cpp</file> + </directory> + <directory name="dialogs"> + <file>searchprogram.cpp</file> + <file>settings.cpp</file> + </directory> + <directory name="shell"> + <file>entries.cpp</file> + <file>fatfs.cpp</file> + <file>filechild.cpp</file> + <file>shellfs.cpp</file> + <file>mainframe.cpp</file> + <file>ntobjfs.cpp</file> + <file>pane.cpp</file> + <file>regfs.cpp</file> + <file>shellbrowser.cpp</file> + <file>unixfs.cpp</file> + <file>webchild.cpp</file> + <file>winfs.cpp</file> + </directory> + <directory name="services"> + <file>shellservices.cpp</file> + <file>startup.c</file> + </directory> + <directory name="taskbar"> + <file>desktopbar.cpp</file> + <file>favorites.cpp</file> + <file>taskbar.cpp</file> + <file>startmenu.cpp</file> + <file>traynotify.cpp</file> + <file>quicklaunch.cpp</file> + </directory> + <directory name="utility"> + <file>shellclasses.cpp</file> + <file>utility.cpp</file> + <file>window.cpp</file> + <file>dragdropimpl.cpp</file> + <file>shellbrowserimpl.cpp</file> + <file>xmlstorage.cpp</file> + </directory> + <file>explorer.cpp</file> + <file>i386-stub-win32.c</file> + <file>explorer.rc</file> +</module> +<installfile base=".">explorer-cfg-template.xml</installfile> +<directory name="notifyhook"> + <xi:include href="notifyhook/notifyhook.rbuild" /> +</directory> Property changes on: trunk/reactos/base/shell/explorer/explorer.rbuild ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild --- trunk/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild 2006-01-29 15:59:25 UTC (rev 36) +++ trunk/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild 2006-01-29 19:03:05 UTC (rev 37) @@ -1,10 +1,10 @@ -<module name="notifyhook" type="win32dll" baseaddress="${BASEADDRESS_NOTIFYHOOK}" installbase="system32" installname="notifyhook.dll"> - <importlibrary definition="notifyhook.def" /> - <include base="notifyhook">.</include> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x0600</define> - <define name="_NOTIFYHOOK_IMPL" /> - <library>kernel32</library> - <file>notifyhook.c</file> - <file>notifyhook.rc</file> -</module> +<module name="notifyhook" type="win32dll" baseaddress="${BASEADDRESS_NOTIFYHOOK}" installbase="system32" installname="notifyhook.dll"> + <importlibrary definition="notifyhook.def" /> + <include base="notifyhook">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0600</define> + <define name="_NOTIFYHOOK_IMPL" /> + <library>kernel32</library> + <file>notifyhook.c</file> + <file>notifyhook.rc</file> +</module> Property changes on: trunk/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/base/shell/shell.rbuild --- trunk/reactos/base/shell/shell.rbuild 2006-01-29 15:59:25 UTC (rev 36) +++ trunk/reactos/base/shell/shell.rbuild 2006-01-29 19:03:05 UTC (rev 37) @@ -1,10 +1,10 @@ -<group> - -</group> +<group> + +</group> Property changes on: trunk/reactos/base/shell/shell.rbuild ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/base/system/msconfig/msconfig.rbuild --- trunk/reactos/base/system/msconfig/msconfig.rbuild 2006-01-29 15:59:25 UTC (rev 36) +++ trunk/reactos/base/system/msconfig/msconfig.rbuild 2006-01-29 19:03:05 UTC (rev 37) @@ -1,26 +1,26 @@ -<module name="msconfig" type="win32gui" installbase="system32" installname="msconfig.exe"> - <include base="msconfig">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <library>kernel32</library> - <library>user32</library> - <library>advapi32</library> - <library>version</library> - <library>comctl32</library> - <library>shell32</library> - <compilationunit name="unit.c"> - <file>toolspage.c</file> - <file>srvpage.c</file> - <file>systempage.c</file> - <file>startuppage.c</file> - <file>freeldrpage.c</file> - <file>generalpage.c</file> - <file>msconfig.c</file> - </compilationunit> - <file>msconfig.rc</file> - <pch>precomp.h</pch> -</module> +<module name="msconfig" type="win32gui" installbase="system32" installname="msconfig.exe"> + <include base="msconfig">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>version</library> + <library>comctl32</library> + <library>shell32</library> + <compilationunit name="unit.c"> + <file>toolspage.c</file> + <file>srvpage.c</file> + <file>systempage.c</file> + <file>startuppage.c</file> + <file>freeldrpage.c</file> + <file>generalpage.c</file> + <file>msconfig.c</file> + </compilationunit> + <file>msconfig.rc</file> + <pch>precomp.h</pch> +</module> Property changes on: trunk/reactos/base/system/msconfig/msconfig.rbuild ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/base/system/sc/sc.rbuild --- trunk/reactos/base/system/sc/sc.rbuild 2006-01-29 15:59:25 UTC (rev 36) +++ trunk/reactos/base/system/sc/sc.rbuild 2006-01-29 19:03:05 UTC (rev 37) @@ -1,17 +1,17 @@ -<module name="sc" type="win32cui" installbase="system32" installname="sc.exe"> - <define name="__USE_W32API" /> - <define name="DEFINE_GUID" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <library>kernel32</library> - <library>advapi32</library> - <file>sc.c</file> - <file>start.c</file> - <file>query.c</file> - <file>control.c</file> - <file>create.c</file> - <file>delete.c</file> - <file>usage.c</file> - <file>sc.rc</file> - <pch>sc.h</pch> -</module> +<module name="sc" type="win32cui" installbase="system32" installname="sc.exe"> + <define name="__USE_W32API" /> + <define name="DEFINE_GUID" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <library>kernel32</library> + <library>advapi32</library> + <file>sc.c</file> + <file>start.c</file> + <file>query.c</file> + <file>control.c</file> + <file>create.c</file> + <file>delete.c</file> + <file>usage.c</file> + <file>sc.rc</file> + <pch>sc.h</pch> +</module> Property changes on: trunk/reactos/base/system/sc/sc.rbuild ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/base/system/servman/servman.rbuild --- trunk/reactos/base/system/servman/servman.rbuild 2006-01-29 15:59:25 UTC (rev 36) +++ trunk/reactos/base/system/servman/servman.rbuild 2006-01-29 19:03:05 UTC (rev 37) @@ -1,27 +1,27 @@ -<module name="servman" type="win32gui" installbase="system32" installname="servman.exe"> - <include base="servman">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <library>kernel32</library> - <library>user32</library> - <library>advapi32</library> - <library>version</library> - <library>comctl32</library> - <library>shell32</library> - <compilationunit name="unit.c"> - <file>about.c</file> - <file>control.c</file> - <file>geterror.c</file> - <file>progress.c</file> - <file>propsheet.c</file> - <file>query.c</file> - <file>servman.c</file> - <file>start.c</file> - </compilationunit> - <file>servman.rc</file> - <pch>servman.h</pch> -</module> +<module name="servman" type="win32gui" installbase="system32" installname="servman.exe"> + <include base="servman">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>version</library> + <library>comctl32</library> + <library>shell32</library> + <compilationunit name="unit.c"> + <file>about.c</file> + <file>control.c</file> + <file>geterror.c</file> + <file>progress.c</file> + <file>propsheet.c</file> + <file>query.c</file> + <file>servman.c</file> + <file>start.c</file> + </compilationunit> + <file>servman.rc</file> + <pch>servman.h</pch> +</module> Property changes on: trunk/reactos/base/system/servman/servman.rbuild ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/base/system/system.rbuild --- trunk/reactos/base/system/system.rbuild 2006-01-29 15:59:25 UTC (rev 36) +++ trunk/reactos/base/system/system.rbuild 2006-01-29 19:03:05 UTC (rev 37) @@ -1,13 +1,13 @@ -<group> - -</group> +<group> + +</group> Property changes on: trunk/reactos/base/system/system.rbuild ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/baseaddress.rbuild ___________________________________________________________________ Name: svn:executable - * _____ Modified: trunk/reactos/boot/boot.rbuild --- trunk/reactos/boot/boot.rbuild 2006-01-29 15:59:25 UTC (rev 36) +++ trunk/reactos/boot/boot.rbuild 2006-01-29 19:03:05 UTC (rev 37) @@ -1,5 +1,5 @@ -<group> -<directory name="bootcd"> - <xi:include href="bootcd/bootcd.rbuild" /> -</directory> -</group> +<group> +<directory name="bootcd"> + <xi:include href="bootcd/bootcd.rbuild" /> +</directory> +</group> Property changes on: trunk/reactos/boot/boot.rbuild ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/boot/bootcd/bootcd.rbuild --- trunk/reactos/boot/bootcd/bootcd.rbuild 2006-01-29 15:59:25 UTC (rev 36) +++ trunk/reactos/boot/bootcd/bootcd.rbuild 2006-01-29 19:03:05 UTC (rev 37) @@ -1,2 +1,2 @@ -<module name="bootcd" type="iso"> -</module> +<module name="bootcd" type="iso"> +</module> Property changes on: trunk/reactos/boot/bootcd/bootcd.rbuild ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsystems/subsystems.rbuild --- trunk/reactos/subsystems/subsystems.rbuild 2006-01-29 15:59:25 UTC (rev 36) +++ trunk/reactos/subsystems/subsystems.rbuild 2006-01-29 19:03:05 UTC (rev 37) @@ -1,16 +1,16 @@ -<group> - -</group> +<group> + +</group> Property changes on: trunk/reactos/subsystems/subsystems.rbuild ___________________________________________________________________ Name: svn:eol-style + native

1 0

[martinf] 36: Explorer: fix Rebar resizing
by martinf＠svn.reactos.org 29 Jan '06

29 Jan '06

Explorer: fix Rebar resizing Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp _____ Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp --- trunk/reactos/base/shell/explorer/shell/mainframe.cpp 2006-01-29 15:28:15 UTC (rev 35) +++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp 2006-01-29 15:59:25 UTC (rev 36) @@ -304,6 +304,7 @@ MoveWindow(_hwndrebar, 0, 0, LOWORD(lparam), height, TRUE); #else resize_frame(LOWORD(lparam), HIWORD(lparam)); + SendMessage(_hwndrebar, WM_SIZE, 0, 0); #endif break; // do not pass message to DefFrameProc

1 0

[martinf] 35: explorer: add icon cache mapped by shell paths (PIDLs) to fix GDI handle leaks
by martinf＠svn.reactos.org 29 Jan '06

29 Jan '06

explorer: add icon cache mapped by shell paths (PIDLs) to fix GDI handle leaks Modified: trunk/reactos/base/shell/explorer/explorer.cpp Modified: trunk/reactos/base/shell/explorer/globals.h Modified: trunk/reactos/base/shell/explorer/notifyhook/notifyhook.dsp Modified: trunk/reactos/base/shell/explorer/shell/entries.cpp Modified: trunk/reactos/base/shell/explorer/utility/shellclasses.h Modified: trunk/reactos/base/shell/explorer/utility/window.cpp _____ Modified: trunk/reactos/base/shell/explorer/explorer.cpp --- trunk/reactos/base/shell/explorer/explorer.cpp 2006-01-29 15:15:23 UTC (rev 34) +++ trunk/reactos/base/shell/explorer/explorer.cpp 2006-01-29 15:28:15 UTC (rev 35) @@ -95,7 +95,7 @@ if (!_cfg.read(_cfg_path)) { if (_cfg._last_error != XML_ERROR_NO_ELEMENTS) - MessageBox(g_Globals._hwndDesktop, String(_cfg._last_error_msg.c_str()), + MessageBox(_hwndDesktop, String(_cfg._last_error_msg.c_str()), TEXT("ROS Explorer - reading user settings"), MB_OK); _cfg.read(TEXT("explorer-cfg-template.xml")); @@ -540,6 +540,73 @@ return _icons[ICID_NONE]; } +const Icon& IconCache::extract(LPCITEMIDLIST pidl, ICONCACHE_FLAGS flags) +{ + // search for matching icon with unchanged flags in the cache + PidlCacheKey mapkey(pidl, flags); + PidlCacheMap::iterator found = _pidlcache.find(mapkey); + + if (found != _pidlcache.end()) + return _icons[found->second]; + + // search for matching icon with handle + PidlCacheKey mapkey_hicon(pidl, flags|ICF_HICON); + if (flags != mapkey_hicon.second) { + found = _pidlcache.find(mapkey_hicon); + + if (found != _pidlcache.end()) + return _icons[found->second]; + } + + // search for matching icon in the system image list cache + PidlCacheKey mapkey_syscache(pidl, flags|ICF_SYSCACHE); + if (flags != mapkey_syscache.second) { + found = _pidlcache.find(mapkey_syscache); + + if (found != _pidlcache.end()) + return _icons[found->second]; + } + + SHFILEINFO sfi; + + int shgfi_flags = SHGFI_PIDL; + + if (!(flags & (ICF_LARGE|ICF_MIDDLE))) + shgfi_flags |= SHGFI_SMALLICON; + + if (flags & ICF_OPEN) + shgfi_flags |= SHGFI_OPENICON; + + if (flags & ICF_SYSCACHE) { + assert(!(flags&ICF_OVERLAYS)); + + HIMAGELIST himlSys = (HIMAGELIST) SHGetFileInfo((LPCTSTR)pidl, 0, &sfi, sizeof(sfi), SHGFI_SYSICONINDEX|shgfi_flags); + if (himlSys) { + const Icon& icon = add(sfi.iIcon/*, IT_SYSCACHE*/); + + ///@todo limit cache size + _pidlcache[mapkey_syscache] = icon; + + return icon; + } + } else { + if (flags & ICF_OVERLAYS) + shgfi_flags |= SHGFI_ADDOVERLAYS; + + if (SHGetFileInfo((LPCTSTR)pidl, 0, &sfi, sizeof(sfi), SHGFI_ICON|shgfi_flags)) { + const Icon& icon = add(sfi.hIcon, IT_CACHED); + + ///@todo limit cache size + _pidlcache[mapkey_hicon] = icon; + + return icon; + } + } + + return _icons[ICID_NONE]; +} + + const Icon& IconCache::add(HICON hIcon, ICON_TYPE type) { int id = ++s_next_id; _____ Modified: trunk/reactos/base/shell/explorer/globals.h --- trunk/reactos/base/shell/explorer/globals.h 2006-01-29 15:15:23 UTC (rev 34) +++ trunk/reactos/base/shell/explorer/globals.h 2006-01-29 15:28:15 UTC (rev 35) @@ -130,6 +130,7 @@ const Icon& extract(LPCTSTR path, ICONCACHE_FLAGS flags=ICF_NORMAL); const Icon& extract(LPCTSTR path, int icon_idx, ICONCACHE_FLAGS flags=ICF_HICON); const Icon& extract(IExtractIcon* pExtract, LPCTSTR path, int icon_idx, ICONCACHE_FLAGS flags=ICF_HICON); + const Icon& extract(LPCITEMIDLIST pidl, ICONCACHE_FLAGS flags=ICF_NORMAL); const Icon& add(HICON hIcon, ICON_TYPE type=IT_DYNAMIC); const Icon& add(int sys_idx/*, ICON_TYPE type=IT_SYSCACHE*/); @@ -154,6 +155,10 @@ typedef map<IdxCacheKey, ICON_ID> IdxCacheMap; IdxCacheMap _idxCache; + typedef pair<ShellPath,int/*ICONCACHE_FLAGS*/> PidlCacheKey; + typedef map<PidlCacheKey, ICON_ID> PidlCacheMap; + PidlCacheMap _pidlcache; + HIMAGELIST _himlSys_small; }; @@ -165,7 +170,7 @@ #define STARTMENUROOT_ICON_SIZE ICON_SIZE_MIDDLE // ICON_SIZE_LARGE #define ICON_SIZE_FROM_ICF(flags) (flags&ICF_LARGE? ICON_SIZE_LARGE: flags&ICF_MIDDLE? ICON_SIZE_MIDDLE: ICON_SIZE_SMALL) -#define ICF_FROM_ICON_SIZE(size) (size>=ICON_SIZE_LARGE? ICF_LARGE: size>=ICON_SIZE_MIDDLE? ICF_MIDDLE: ICF_NORMAL) +#define ICF_FROM_ICON_SIZE(size) (size>=ICON_SIZE_LARGE? ICF_LARGE: size>=ICON_SIZE_MIDDLE? ICF_MIDDLE: (ICONCACHE_FLAGS)0) /// create a bitmap from an icon _____ Modified: trunk/reactos/base/shell/explorer/notifyhook/notifyhook.dsp --- trunk/reactos/base/shell/explorer/notifyhook/notifyhook.dsp 2006-01-29 15:15:23 UTC (rev 34) +++ trunk/reactos/base/shell/explorer/notifyhook/notifyhook.dsp 2006-01-29 15:28:15 UTC (rev 35) @@ -132,5 +132,9 @@ SOURCE=.\notifyhook.rbuild # End Source File +# Begin Source File + +SOURCE=..\utility\utility.h +# End Source File # End Target # End Project _____ Modified: trunk/reactos/base/shell/explorer/shell/entries.cpp --- trunk/reactos/base/shell/explorer/shell/entries.cpp 2006-01-29 15:15:23 UTC (rev 34) +++ trunk/reactos/base/shell/explorer/shell/entries.cpp 2006-01-29 15:28:15 UTC (rev 35) @@ -413,32 +413,10 @@ } if (icon_id == ICID_NONE) { - SHFILEINFO sfi; - const ShellPath& pidl_abs = create_absolute_pidl(); LPCITEMIDLIST pidl = pidl_abs; - int shgfi_flags = SHGFI_PIDL; - - if (!(flags & (ICF_LARGE|ICF_MIDDLE))) - shgfi_flags |= SHGFI_SMALLICON; - - if (flags & ICF_OPEN) - shgfi_flags |= SHGFI_OPENICON; - - if (flags & ICF_SYSCACHE) { - assert(!(flags&ICF_OVERLAYS)); - - HIMAGELIST himlSys = (HIMAGELIST) SHGetFileInfo((LPCTSTR)pidl, 0, &sfi, sizeof(sfi), SHGFI_SYSICONINDEX|shgfi_flags); - if (himlSys) - icon_id = g_Globals._icon_cache.add(sfi.iIcon); - } else { - if (flags & ICF_OVERLAYS) - shgfi_flags |= SHGFI_ADDOVERLAYS; - - if (SHGetFileInfo((LPCTSTR)pidl, 0, &sfi, sizeof(sfi), SHGFI_ICON|shgfi_flags)) - icon_id = g_Globals._icon_cache.add(sfi.hIcon); - } + icon_id = g_Globals._icon_cache.extract(pidl, flags); } } _____ Modified: trunk/reactos/base/shell/explorer/utility/shellclasses.h --- trunk/reactos/base/shell/explorer/utility/shellclasses.h 2006-01-29 15:15:23 UTC (rev 34) +++ trunk/reactos/base/shell/explorer/utility/shellclasses.h 2006-01-29 15:28:15 UTC (rev 35) @@ -791,6 +791,18 @@ _p = (ITEMIDLIST*)p; } + friend bool operator<(const ShellPath& a, const ShellPath& b) + { + int la = ILGetSize(a._p); + int lb = ILGetSize(b._p); + + int r = memcmp(a._p, b._p, min(la, lb)); + if (r) + return r < 0; + else + return la < lb; + } + void assign(LPCITEMIDLIST pidl, size_t size) { //CONTEXT("ShellPath::assign(LPCITEMIDLIST, size_t)"); _____ Modified: trunk/reactos/base/shell/explorer/utility/window.cpp --- trunk/reactos/base/shell/explorer/utility/window.cpp 2006-01-29 15:15:23 UTC (rev 34) +++ trunk/reactos/base/shell/explorer/utility/window.cpp 2006-01-29 15:28:15 UTC (rev 35) @@ -392,7 +392,7 @@ ClientRect rt(_hwnd); rt.left = _split_pos-SPLIT_WIDTH/2; rt.right = _split_pos+SPLIT_WIDTH/2+1; - HBRUSH lastBrush = SelectBrush(canvas, GetStockBrush(LTGRAY_BRUSH)); + HBRUSH lastBrush = SelectBrush(canvas, GetStockBrush(COLOR_SPLITBAR)); Rectangle(canvas, rt.left, rt.top-1, rt.right, rt.bottom+1); SetRect(&rc, rt.left, rt.top-1, rt.right, rt.bottom+1); DrawEdge(canvas, &rc, EDGE_RAISED, BF_RECT);

1 0

[martinf] 34: import ibrowser into the new repository
by martinf＠svn.reactos.org 29 Jan '06

29 Jan '06

import ibrowser into the new repository Added: trunk/reactos/base/applications/applications.rbuild Added: trunk/reactos/base/applications/ibrowser/ Added: trunk/reactos/base/applications/ibrowser/De.rc Added: trunk/reactos/base/applications/ibrowser/En.rc Added: trunk/reactos/base/applications/ibrowser/Es.rc Added: trunk/reactos/base/applications/ibrowser/Fr.rc Added: trunk/reactos/base/applications/ibrowser/Hu.rc Added: trunk/reactos/base/applications/ibrowser/Ja.rc Added: trunk/reactos/base/applications/ibrowser/Makefile-MinGW Added: trunk/reactos/base/applications/ibrowser/Makefile-precomp Added: trunk/reactos/base/applications/ibrowser/Ro.rc Added: trunk/reactos/base/applications/ibrowser/Sv.rc Added: trunk/reactos/base/applications/ibrowser/expat-license.txt Added: trunk/reactos/base/applications/ibrowser/favorites.cpp Added: trunk/reactos/base/applications/ibrowser/favorites.h Added: trunk/reactos/base/applications/ibrowser/ibrowser.cpp Added: trunk/reactos/base/applications/ibrowser/ibrowser.dsp Added: trunk/reactos/base/applications/ibrowser/ibrowser.dsw Added: trunk/reactos/base/applications/ibrowser/ibrowser.h Added: trunk/reactos/base/applications/ibrowser/ibrowser.rbuild Added: trunk/reactos/base/applications/ibrowser/ibrowser.rc Added: trunk/reactos/base/applications/ibrowser/ibrowser_intres.h Added: trunk/reactos/base/applications/ibrowser/ibrowser_intres.rc Added: trunk/reactos/base/applications/ibrowser/mainframe.cpp Added: trunk/reactos/base/applications/ibrowser/mainframe.h Added: trunk/reactos/base/applications/ibrowser/make_ibrowser.dsp Added: trunk/reactos/base/applications/ibrowser/precomp.cpp Added: trunk/reactos/base/applications/ibrowser/precomp.h Added: trunk/reactos/base/applications/ibrowser/readme.txt Added: trunk/reactos/base/applications/ibrowser/res/ Added: trunk/reactos/base/applications/ibrowser/res/dot.ico Added: trunk/reactos/base/applications/ibrowser/res/dot_red.ico Added: trunk/reactos/base/applications/ibrowser/res/dot_trans.ico Added: trunk/reactos/base/applications/ibrowser/res/favorites.ico Added: trunk/reactos/base/applications/ibrowser/res/ibrowser.ico Added: trunk/reactos/base/applications/ibrowser/res/network.ico Added: trunk/reactos/base/applications/ibrowser/res/reactos.ico Added: trunk/reactos/base/applications/ibrowser/res/toolbar.bmp Added: trunk/reactos/base/applications/ibrowser/utility/ Added: trunk/reactos/base/applications/ibrowser/utility/comutil.h Added: trunk/reactos/base/applications/ibrowser/utility/utility.cpp Added: trunk/reactos/base/applications/ibrowser/utility/utility.h Added: trunk/reactos/base/applications/ibrowser/utility/window.cpp Added: trunk/reactos/base/applications/ibrowser/utility/window.h Added: trunk/reactos/base/applications/ibrowser/utility/xmlstorage.cpp Added: trunk/reactos/base/applications/ibrowser/utility/xmlstorage.h Added: trunk/reactos/base/applications/ibrowser/webchild.cpp Added: trunk/reactos/base/applications/ibrowser/webchild.h Modified: trunk/reactos/base/base.rbuild _____ Added: trunk/reactos/base/applications/applications.rbuild --- trunk/reactos/base/applications/applications.rbuild 2006-01-29 15:13:23 UTC (rev 33) +++ trunk/reactos/base/applications/applications.rbuild 2006-01-29 15:15:23 UTC (rev 34) @@ -0,0 +1,16 @@ +<group> + +</group> Property changes on: trunk/reactos/base/applications/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 *.pch pack.* .gdbinit start-gdb.bat libexpat.dll GNUmakefile *_auto.* Name: tsvn:logminsize + 10 _____ Added: trunk/reactos/base/applications/ibrowser/De.rc --- trunk/reactos/base/applications/ibrowser/De.rc 2006-01-29 15:13:23 UTC (rev 33) +++ trunk/reactos/base/applications/ibrowser/De.rc 2006-01-29 15:15:23 UTC (rev 34) @@ -0,0 +1,148 @@ +//Microsoft Developer Studio generated resource script. +// +#include "ibrowser_intres.h" + +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> +/////////////////////////////////////////////////////////////////////// ////// +#undef APSTUDIO_READONLY_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// +// German (Germany) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) +#ifdef _WIN32 +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "ibrowser_intres.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include <windows.h>\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#ifndef _ROS_\r\n" + "LANGUAGE LANG_GERMAN, SUBLANG_GERMAN\r\n" + "STRINGTABLE DISCARDABLE \r\n" + "BEGIN\r\n" + "#ifdef UNICODE\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser%0s""\r\n" + "#else\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser Ansi%0s""\r\n" + "#endif\r\n" + "END\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_SDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&Datei" + BEGIN + MENUITEM "&Beenden", ID_FILE_EXIT + END + POPUP "&Ansicht" + BEGIN + MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR + MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Status Bar", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Aktualisieren\tF5", ID_REFRESH + MENUITEM "&Vollbild\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + END + POPUP "&Hilfe" + BEGIN + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "&About IBrowser...", ID_ABOUT_IBROWSER + MENUITEM "About &OS...", ID_ABOUT_WINDOWS + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialog +// + +IDD_ABOUT_IBROWSER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About ReactOS Web Browser" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ReactOS Web Browser",IDC_ROS_IBROWSER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "Reactos Internet Web Browser" + IDS_EMPTY "(Empty)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ABOUT_IBROWSER "&?ber..." +END + +#endif // German (Germany) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#ifndef _ROS_ +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +STRINGTABLE DISCARDABLE +BEGIN +#ifdef UNICODE +IDS_IBROWSER_VERSION_STR "ROS IBrowser%0s" +#else +IDS_IBROWSER_VERSION_STR "ROS IBrowser Ansi%0s" +#endif +END +#endif + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + _____ Added: trunk/reactos/base/applications/ibrowser/En.rc --- trunk/reactos/base/applications/ibrowser/En.rc 2006-01-29 15:13:23 UTC (rev 33) +++ trunk/reactos/base/applications/ibrowser/En.rc 2006-01-29 15:15:23 UTC (rev 34) @@ -0,0 +1,161 @@ +//Microsoft Developer Studio generated resource script. +// +#include "ibrowser_intres.h" + +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> +/////////////////////////////////////////////////////////////////////// ////// +#undef APSTUDIO_READONLY_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// +// German (Germany) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) +#ifdef _WIN32 +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "ibrowser_intres.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include <windows.h>\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#ifndef _ROS_\r\n" + "LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US\r\n" + "STRINGTABLE DISCARDABLE \r\n" + "BEGIN\r\n" + "#ifdef UNICODE\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser%0s""\r\n" + "#else\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser Ansi%0s""\r\n" + "#endif\r\n" + "END\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // German (Germany) resources +/////////////////////////////////////////////////////////////////////// ////// + + +/////////////////////////////////////////////////////////////////////// ////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_SDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&Open", ID_FILE_OPEN + MENUITEM "E&xit", ID_FILE_EXIT + END + POPUP "&View" + BEGIN + MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR + MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Status Bar", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Refresh\tF5", ID_REFRESH + MENUITEM "F&ull Screen\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + END + POPUP "&Help" + BEGIN + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "&About IBrowser...", ID_ABOUT_IBROWSER + MENUITEM "About &OS...", ID_ABOUT_WINDOWS + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialog +// + +IDD_ABOUT_IBROWSER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About ReactOS Web Browser" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ReactOS Web Browser",IDC_ROS_IBROWSER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "Reactos Internet Web Browser" + IDS_EMPTY "(Empty)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ABOUT_IBROWSER "&About..." +END + +#endif // English (U.S.) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#ifndef _ROS_ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +STRINGTABLE DISCARDABLE +BEGIN +#ifdef UNICODE +IDS_IBROWSER_VERSION_STR "ROS IBrowser%0s" +#else +IDS_IBROWSER_VERSION_STR "ROS IBrowser Ansi%0s" +#endif +END +#endif + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + _____ Added: trunk/reactos/base/applications/ibrowser/Es.rc --- trunk/reactos/base/applications/ibrowser/Es.rc 2006-01-29 15:13:23 UTC (rev 33) +++ trunk/reactos/base/applications/ibrowser/Es.rc 2006-01-29 15:15:23 UTC (rev 34) @@ -0,0 +1,122 @@ +//Microsoft Developer Studio generated resource script. +// +#include "ibrowser_intres.h" + +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> +/////////////////////////////////////////////////////////////////////// ////// +#undef APSTUDIO_READONLY_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// +// German (Germany) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) +#ifdef _WIN32 +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "ibrowser_intres.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include <windows.h>\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#ifndef _ROS_\r\n" + "LANGUAGE LANG_SPANISH, SUBLANG_SPANISH\r\n" + "STRINGTABLE DISCARDABLE \r\n" + "BEGIN\r\n" + "#ifdef UNICODE\r\n" + "IDS_IBROWSER_VERSION_STR ""Nevegador de Web ReactOS%0s""\r\n" + "#else\r\n" + "IDS_IBROWSER_VERSION_STR ""Nevegador de Web ReactOS Ansi%0s""\r\n" + "#endif\r\n" + "END\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // German (Germany) resources +/////////////////////////////////////////////////////////////////////// ////// + + +/////////////////////////////////////////////////////////////////////// ////// +// Spanish (Castilian) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESP) +#ifdef _WIN32 +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +#pragma code_page(1252) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_SDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "S&alir", ID_FILE_EXIT + END + POPUP "&Ver" + BEGIN + MENUITEM "&Barra de Herramientas", ID_VIEW_TOOL_BAR + MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "Barra de &Estado", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Actualizar\tF5", ID_REFRESH + MENUITEM "P&antalla Completa\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + END + POPUP "&Ayuda" + BEGIN + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "&Acerca de IBrowser...", ID_ABOUT_IBROWSER + MENUITEM "Acerca de &OS...", ID_ABOUT_WINDOWS + END +END + +#endif // Spanish (Castilian) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#ifndef _ROS_ +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +STRINGTABLE DISCARDABLE +BEGIN +#ifdef UNICODE +IDS_IBROWSER_VERSION_STR "Nevegador de Web ReactOS%0s" +#else +IDS_IBROWSER_VERSION_STR "Nevegador de Web ReactOS Ansi%0s" +#endif +END +#endif + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + _____ Added: trunk/reactos/base/applications/ibrowser/Fr.rc --- trunk/reactos/base/applications/ibrowser/Fr.rc 2006-01-29 15:13:23 UTC (rev 33) +++ trunk/reactos/base/applications/ibrowser/Fr.rc 2006-01-29 15:15:23 UTC (rev 34) @@ -0,0 +1,151 @@ +//Microsoft Developer Studio generated resource script. +// +#include "ibrowser_intres.h" + +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> + +/////////////////////////////////////////////////////////////////////// ////// +#undef APSTUDIO_READONLY_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// +// German (Germany) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) +#ifdef _WIN32 +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "ibrowser_intres.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include <windows.h>\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // German (Germany) resources +/////////////////////////////////////////////////////////////////////// ////// + + +/////////////////////////////////////////////////////////////////////// ////// +// French (France) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) +#ifdef _WIN32 +LANGUAGE LANG_FRENCH, SUBLANG_FRENCH +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// TEXTINCLUDE +// + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#ifndef _ROS_\r\n" + "LANGUAGE LANG_FRENCH, SUBLANG_FRENCH\r\n" + "STRINGTABLE DISCARDABLE \r\n" + "BEGIN\r\n" + "#ifdef UNICODE\r\n" + "IDS_IBROWSER_VERSION_STR ""Navigateur Internet de ReactOS%0s""\r\n" + "#else\r\n" + "IDS_IBROWSER_VERSION_STR ""Navigateur Internet de ReactOS Ansi%0s""\r\n" + "#endif\r\n" + "END\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_SDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&Fichier" + BEGIN + MENUITEM "&Ouvrir", ID_FILE_OPEN + MENUITEM "&Quitter", ID_FILE_EXIT + END + POPUP "&Affichage" + BEGIN + MENUITEM "Barre d'ou&tils", ID_VIEW_TOOL_BAR + MENUITEM "Pann&eau lat?al", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Barre d'?at", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "Actualise&r", ID_REFRESH + MENUITEM "&Plein ?ran", ID_VIEW_FULLSCREEN + END + POPUP "&Aide" + BEGIN + MENUITEM "&Rubriques d'aide de iBrowser", ID_IBROWSER_FAQ + MENUITEM "? propos de iBrowser...", ID_ABOUT_IBROWSER + MENUITEM "? propos de ReactOS...", ID_ABOUT_WINDOWS + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "Navigateur internet de Reactos" + IDS_EMPTY "(Vide)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ABOUT_IBROWSER "? propos de iBrowser..." +END + +#endif // French (France) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#ifndef _ROS_ +LANGUAGE LANG_FRENCH, SUBLANG_FRENCH +STRINGTABLE DISCARDABLE +BEGIN +#ifdef UNICODE +IDS_IBROWSER_VERSION_STR "Navigateur Internet de ReactOS%0s" +#else +IDS_IBROWSER_VERSION_STR "Navigateur Internet de ReactOS Ansi%0s" +#endif +END +#endif + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + _____ Added: trunk/reactos/base/applications/ibrowser/Hu.rc --- trunk/reactos/base/applications/ibrowser/Hu.rc 2006-01-29 15:13:23 UTC (rev 33) +++ trunk/reactos/base/applications/ibrowser/Hu.rc 2006-01-29 15:15:23 UTC (rev 34) @@ -0,0 +1,81 @@ +//Microsoft Developer Studio generated resource script. +// +#include "ibrowser_intres.h" + +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> +/////////////////////////////////////////////////////////////////////// ////// +#undef APSTUDIO_READONLY_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// +// German (Germany) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) +#ifdef _WIN32 +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "ibrowser_intres.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include <windows.h>\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#ifndef _ROS_\r\n" + "LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT\r\n" + "STRINGTABLE DISCARDABLE \r\n" + "BEGIN\r\n" + "#ifdef UNICODE\r\n" + "IDS_IBROWSER_VERSION_STR ""A ReactOS %s webb÷ngÚsz§%0s""\r\n" + "#else\r\n" + "IDS_IBROWSER_VERSION_STR ""A ReactOS %s webb÷ngÚsz§ Ansi%0s""\r\n" + "#endif\r\n" + "END\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // German (Germany) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#ifndef _ROS_ +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +BEGIN +#ifdef UNICODE +IDS_IBROWSER_VERSION_STR "A ReactOS %s webb÷ngÚsz§%0s" +#else +IDS_IBROWSER_VERSION_STR "A ReactOS %s webb÷ngÚsz§ Ansi%0s" +#endif +END +#endif + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + _____ Added: trunk/reactos/base/applications/ibrowser/Ja.rc --- trunk/reactos/base/applications/ibrowser/Ja.rc 2006-01-29 15:13:23 UTC (rev 33) +++ trunk/reactos/base/applications/ibrowser/Ja.rc 2006-01-29 15:15:23 UTC (rev 34) @@ -0,0 +1,140 @@ +//Microsoft Developer Studio generated resource script. +// +#include "ibrowser_intres.h" + +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> +/////////////////////////////////////////////////////////////////////// ////// +#undef APSTUDIO_READONLY_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// +// Japanese resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN) +#ifdef _WIN32 +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +#pragma code_page(932) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_SDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "âtâ@âCâï(&F)" + BEGIN + MENUITEM "èJé¡(&O)", ID_FILE_OPEN + MENUITEM "ÅIù?(&X)", ID_FILE_EXIT + END + POPUP "ò\\Äª(&V)" + BEGIN + MENUITEM "âcü[âï âoü[(&T)", ID_VIEW_TOOL_BAR + MENUITEM "âTâCâh âoü[(&I)", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "âXâeü[â^âX âoü[(&S)", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "ì?ÉVé?Å¯ò±é?ìXÉV(&R)\tF5", ID_REFRESH + MENUITEM "æSëµû?ò\\Äª(&I)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + END + POPUP "âwâïâv(&H)" + BEGIN + MENUITEM "IBrowser FAQ (&F)...", ID_IBROWSER_FAQ + MENUITEM "IBrowser é?é?éóé?(&A)...", ID_ABOUT_IBROWSER + MENUITEM "OS é?é?éóé?(&O)...", ID_ABOUT_WINDOWS + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "Reactos Internet Web Browser" + IDS_EMPTY "(Empty)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ABOUT_IBROWSER "âoü[âWâçâôÅ¯ò±(&A)..." +END + +#endif // Japanese resources +/////////////////////////////////////////////////////////////////////// ////// + + +/////////////////////////////////////////////////////////////////////// ////// +// German (Germany) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) +#ifdef _WIN32 +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "ibrowser_intres.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include <windows.h>\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#ifndef _ROS_\r\n" + "LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT\r\n" + "STRINGTABLE DISCARDABLE \r\n" + "BEGIN\r\n" + "#ifdef UNICODE\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser%0s""\r\n" + "#else\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser Ansi%0s""\r\n" + "#endif\r\n" + "END\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // German (Germany) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#ifndef _ROS_ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +BEGIN +#ifdef UNICODE +IDS_IBROWSER_VERSION_STR "ROS IBrowser%0s" +#else +IDS_IBROWSER_VERSION_STR "ROS IBrowser Ansi%0s" +#endif +END +#endif + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + _____ Added: trunk/reactos/base/applications/ibrowser/Makefile-MinGW --- trunk/reactos/base/applications/ibrowser/Makefile-MinGW 2006-01-29 15:13:23 UTC (rev 33) +++ trunk/reactos/base/applications/ibrowser/Makefile-MinGW 2006-01-29 15:15:23 UTC (rev 34) @@ -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 -Wno-unused-value -I. -I$(EXPAT_INC) +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 Property changes on: trunk/reactos/base/applications/ibrowser/Makefile-MinGW ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/base/applications/ibrowser/Makefile-precomp --- trunk/reactos/base/applications/ibrowser/Makefile-precomp 2006-01-29 15:13:23 UTC (rev 33) +++ trunk/reactos/base/applications/ibrowser/Makefile-precomp 2006-01-29 15:15:23 UTC (rev 34) @@ -0,0 +1,72 @@ +# +# ROS Internet Web Browser +# +# Makefile-precomp +# +# 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 -Wno-unused-value -I. -I$(EXPAT_INC) +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 [truncated at 1000 lines; 11623 more skipped]

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs