Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[ion] 14938: Byebye decrepit drivers
by ion＠svn.reactos.com 01 May '05

01 May '05

Byebye decrepit drivers Modified: trunk/reactos/Makefile Modified: trunk/reactos/drivers/input/Makefile Deleted: trunk/reactos/drivers/input/keyboard/ Deleted: trunk/reactos/drivers/input/psaux/ _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-05-01 22:26:55 UTC (rev 14937) +++ trunk/reactos/Makefile 2005-05-01 22:29:18 UTC (rev 14938) @@ -84,7 +84,7 @@ DEVICE_DRIVERS = beep blue debugout null serial bootvid # Kernel mode input drivers -INPUT_DRIVERS = keyboard mouclass psaux sermouse i8042prt kbdclass +INPUT_DRIVERS = mouclass sermouse i8042prt kbdclass # Kernel mode file system drivers # cdfs ext2 fs_rec ms np vfat _____ Modified: trunk/reactos/drivers/input/Makefile --- trunk/reactos/drivers/input/Makefile 2005-05-01 22:26:55 UTC (rev 14937) +++ trunk/reactos/drivers/input/Makefile 2005-05-01 22:29:18 UTC (rev 14938) @@ -6,7 +6,7 @@ include $(PATH_TO_TOP)/rules.mak -DRIVERS = keyboard mouclass psaux sermouse i8042prt kbdclass +DRIVERS = mouclass sermouse i8042prt kbdclass all: $(DRIVERS)

1 0

[mf] 14937: merge mixed case startup menu folders
by mf＠svn.reactos.com 01 May '05

01 May '05

merge mixed case startup menu folders Modified: branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. cpp _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. cpp --- branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. cpp 2005-05-01 22:20:13 UTC (rev 14936) +++ branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. cpp 2005-05-01 22:26:55 UTC (rev 14937) @@ -986,7 +986,7 @@ for(ShellEntryMap::iterator it=_entries.begin(); it!=_entries.end(); ++it) { StartMenuEntry& sme = it->second; - if (sme._title == title) ///@todo speed up by using a map indexed by name + if (!_tcsicmp(sme._title, title)) ///@todo speed up by using a map indexed by name for(ShellEntrySet::iterator it2=sme._entries.begin(); it2!=sme._entries.end(); ++it2) { if ((*it2)->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { // merge the new shell entry with the existing of the same name

1 0

[ion] 14936: Remove incorrect change
by ion＠svn.reactos.com 01 May '05

01 May '05

Remove incorrect change Modified: trunk/reactos/subsys/system/usetup/bootsup.c _____ Modified: trunk/reactos/subsys/system/usetup/bootsup.c --- trunk/reactos/subsys/system/usetup/bootsup.c 2005-05-01 22:06:38 UTC (rev 14935) +++ trunk/reactos/subsys/system/usetup/bootsup.c 2005-05-01 22:20:13 UTC (rev 14936) @@ -1134,19 +1134,15 @@ NULL, NULL); - Status = NtCreateFile(&FileHandle, - FILE_WRITE_ACCESS, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - 0, - FILE_OVERWRITE_IF, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY, - NULL, - 0); + Status = NtOpenFile(&FileHandle, + FILE_WRITE_ACCESS | FILE_WRITE_ATTRIBUTES, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY); if (!NT_SUCCESS(Status)) { + DPRINT1("NtOpenFile() failed (Status %lx)\n", Status); RtlFreeHeap(ProcessHeap, 0, NewBootSector); return(Status); } @@ -1295,19 +1291,15 @@ NULL, NULL); - Status = NtCreateFile(&FileHandle, - FILE_WRITE_ACCESS, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - 0, - FILE_OVERWRITE_IF, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY, - NULL, - 0); + Status = NtOpenFile(&FileHandle, + FILE_WRITE_ACCESS | FILE_WRITE_ATTRIBUTES, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY); if (!NT_SUCCESS(Status)) { + DPRINT1("NtOpenFile() failed (Status %lx)\n", Status); RtlFreeHeap(ProcessHeap, 0, NewBootSector); return(Status); } @@ -2080,7 +2072,7 @@ wcscpy(SrcPath, SourceRootPath->Buffer); wcscat(SrcPath, L"\\loader\\freeldr.sys"); - wcscat(DstPath, L"\\Device\\Floppy0\\freeldr.sys"); + wcscpy(DstPath, L"\\Device\\Floppy0\\freeldr.sys"); DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath); @@ -2091,7 +2083,7 @@ } /* Create new 'freeldr.ini' */ - wcscat(DstPath, L"\\Device\\Floppy0\\freeldr.ini"); + wcscpy(DstPath, L"\\Device\\Floppy0\\freeldr.ini"); DPRINT("Create new 'freeldr.ini'\n"); Status = CreateFreeLoaderIniForReactos(DstPath, @@ -2106,7 +2098,7 @@ wcscpy(SrcPath, SourceRootPath->Buffer); wcscat(SrcPath, L"\\loader\\fat.bin"); - wcscat(DstPath, L"\\Device\\Floppy0"); + wcscpy(DstPath, L"\\Device\\Floppy0"); DPRINT("Install FAT bootcode: %S ==> %S\n", SrcPath, DstPath); Status = InstallFat16BootCodeToDisk(SrcPath,

1 0

[ion] 14935: remove accidental commit
by ion＠svn.reactos.com 01 May '05

01 May '05

remove accidental commit Modified: trunk/reactos/subsys/win32k/eng/device.c _____ Modified: trunk/reactos/subsys/win32k/eng/device.c --- trunk/reactos/subsys/win32k/eng/device.c 2005-05-01 21:57:57 UTC (rev 14934) +++ trunk/reactos/subsys/win32k/eng/device.c 2005-05-01 22:06:38 UTC (rev 14935) @@ -58,7 +58,6 @@ nInBufferSize, lpOutBuffer, nOutBufferSize, FALSE, &Event, &Iosb); - DPRINT1("IRP: %x\n", Irp); Status = IoCallDriver(DeviceObject, Irp);

1 0

[ion] 14934: Remove incorrect change
by ion＠svn.reactos.com 01 May '05

01 May '05

Remove incorrect change Modified: trunk/reactos/subsys/system/usetup/bootsup.c _____ Modified: trunk/reactos/subsys/system/usetup/bootsup.c --- trunk/reactos/subsys/system/usetup/bootsup.c 2005-05-01 21:51:57 UTC (rev 14933) +++ trunk/reactos/subsys/system/usetup/bootsup.c 2005-05-01 21:57:57 UTC (rev 14934) @@ -371,7 +371,7 @@ NULL, INSERT_LAST, L"Options", - L"/DEBUGPORT=COM1 /NOGUIBOOT"); + L"/DEBUGPORT=SCREEN /NOGUIBOOT"); /* Save the ini file */ IniCacheSave(IniCache, IniPath); @@ -1134,15 +1134,19 @@ NULL, NULL); - Status = NtOpenFile(&FileHandle, - FILE_WRITE_ACCESS | FILE_WRITE_ATTRIBUTES, - &ObjectAttributes, - &IoStatusBlock, - 0, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY); + Status = NtCreateFile(&FileHandle, + FILE_WRITE_ACCESS, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + 0, + FILE_OVERWRITE_IF, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY, + NULL, + 0); if (!NT_SUCCESS(Status)) { - DPRINT1("NtOpenFile() failed (Status %lx)\n", Status); RtlFreeHeap(ProcessHeap, 0, NewBootSector); return(Status); } @@ -1291,15 +1295,19 @@ NULL, NULL); - Status = NtOpenFile(&FileHandle, - FILE_WRITE_ACCESS | FILE_WRITE_ATTRIBUTES, - &ObjectAttributes, - &IoStatusBlock, - 0, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY); + Status = NtCreateFile(&FileHandle, + FILE_WRITE_ACCESS, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + 0, + FILE_OVERWRITE_IF, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY, + NULL, + 0); if (!NT_SUCCESS(Status)) { - DPRINT1("NtOpenFile() failed (Status %lx)\n", Status); RtlFreeHeap(ProcessHeap, 0, NewBootSector); return(Status); } @@ -2072,7 +2080,7 @@ wcscpy(SrcPath, SourceRootPath->Buffer); wcscat(SrcPath, L"\\loader\\freeldr.sys"); - wcscpy(DstPath, L"\\Device\\Floppy0\\freeldr.sys"); + wcscat(DstPath, L"\\Device\\Floppy0\\freeldr.sys"); DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath); @@ -2083,7 +2091,7 @@ } /* Create new 'freeldr.ini' */ - wcscpy(DstPath, L"\\Device\\Floppy0\\freeldr.ini"); + wcscat(DstPath, L"\\Device\\Floppy0\\freeldr.ini"); DPRINT("Create new 'freeldr.ini'\n"); Status = CreateFreeLoaderIniForReactos(DstPath, @@ -2098,7 +2106,7 @@ wcscpy(SrcPath, SourceRootPath->Buffer); wcscat(SrcPath, L"\\loader\\fat.bin"); - wcscpy(DstPath, L"\\Device\\Floppy0"); + wcscat(DstPath, L"\\Device\\Floppy0"); DPRINT("Install FAT bootcode: %S ==> %S\n", SrcPath, DstPath); Status = InstallFat16BootCodeToDisk(SrcPath,

1 0

[ion] 14933: Do not signal event twice. Thanks to Gunnar for finding the bug
by ion＠svn.reactos.com 01 May '05

01 May '05

Do not signal event twice. Thanks to Gunnar for finding the bug Modified: trunk/reactos/ntoskrnl/io/irp.c _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-05-01 21:22:13 UTC (rev 14932) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-05-01 21:51:57 UTC (rev 14933) @@ -1279,7 +1279,26 @@ { /* Signal the Event */ KeSetEvent(Irp->UserEvent, 0, FALSE); - + + /* Check if we should signal the File Object Event as well */ + if (FileObject) + { + /* Dereference the Event if this is an ASYNC IRP */ + if (!Irp->Flags & IRP_SYNCHRONOUS_API) + { + ObDereferenceObject(Irp->UserEvent); + } + + /* If the File Object is SYNC, then we need to signal its event too */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Signal Event */ + KeSetEvent(&FileObject->Event, 0, FALSE); + + /* Set the Status */ + FileObject->FinalStatus = Irp->IoStatus.Status; + } + } } else if (FileObject) { @@ -1289,31 +1308,7 @@ /* Set the Status */ FileObject->FinalStatus = Irp->IoStatus.Status; } - - /* Check if there's a File Object */ - if (FileObject) - { - /* Dereference the Event if this is an ASYNC IRP */ - if (!Irp->Flags & IRP_SYNCHRONOUS_API) - { - if (Irp->UserEvent != &FileObject->Event) - { - ObDereferenceObject(Irp->UserEvent); - } - } - - /* If the File Object is SYNC, then we need to signal its event too */ - if (FileObject->Flags & FO_SYNCHRONOUS_IO) - { - /* Signal Event */ - - KeSetEvent(&FileObject->Event, 0, FALSE); - - /* Set the Status */ - FileObject->FinalStatus = Irp->IoStatus.Status; - } - } - + /* Remove the IRP from the list of Thread Pending IRPs */ RemoveEntryList(&Irp->ThreadListEntry); InitializeListHead(&Irp->ThreadListEntry);

1 0

[mf] 14932: merge ROS Shell without integrated explorer part into trunk
by mf＠svn.reactos.com 01 May '05

01 May '05

merge ROS Shell without integrated explorer part into trunk Added: trunk/reactos/subsys/system/explorer/Make-rosshell.MinGW Added: trunk/reactos/subsys/system/explorer/Make-rosshell.mak Modified: trunk/reactos/subsys/system/explorer/Makefile.MinGW Modified: trunk/reactos/subsys/system/explorer/Makefile.PCH Modified: trunk/reactos/subsys/system/explorer/desktop/desktop.cpp Modified: trunk/reactos/subsys/system/explorer/explorer.cpp Modified: trunk/reactos/subsys/system/explorer/explorer.h Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc Modified: trunk/reactos/subsys/system/explorer/globals.h Added: trunk/reactos/subsys/system/explorer/make_rosshell.dsp Added: trunk/reactos/subsys/system/explorer/rosshell.dsp Added: trunk/reactos/subsys/system/explorer/rosshell.dsw Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp Modified: trunk/reactos/subsys/system/explorer/utility/utility.h _____ Copied: trunk/reactos/subsys/system/explorer/Make-rosshell.MinGW (from rev 14923, branches/lean-explorer/reactos/subsys/system/explorer/Make-rosshell.MinG W) --- branches/lean-explorer/reactos/subsys/system/explorer/Make-rosshell.MinG W 2005-05-01 20:12:06 UTC (rev 14923) +++ trunk/reactos/subsys/system/explorer/Make-rosshell.MinGW 2005-05-01 21:22:13 UTC (rev 14932) @@ -0,0 +1,92 @@ +# +# ReactOS shell +# +# Makefile.PCH +# +# 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 _____ Copied: trunk/reactos/subsys/system/explorer/Make-rosshell.mak (from rev 14923, branches/lean-explorer/reactos/subsys/system/explorer/Make-rosshell.mak) --- branches/lean-explorer/reactos/subsys/system/explorer/Make-rosshell.mak 2005-05-01 20:12:06 UTC (rev 14923) +++ trunk/reactos/subsys/system/explorer/Make-rosshell.mak 2005-05-01 21:22:13 UTC (rev 14932) @@ -0,0 +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 _____ Modified: trunk/reactos/subsys/system/explorer/Makefile.MinGW --- trunk/reactos/subsys/system/explorer/Makefile.MinGW 2005-05-01 21:19:04 UTC (rev 14931) +++ trunk/reactos/subsys/system/explorer/Makefile.MinGW 2005-05-01 21:22:13 UTC (rev 14932) @@ -85,7 +85,7 @@ $(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) notifyhook.dll libexpat.dll $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) $(addprefix -l,$(DELAYIMPORTS)) -explorer$(RES_SUFFIX): $(PROGRAM)_intres.rc res/*.bmp res/*.ico +$(PROGRAM)$(RES_SUFFIX): $(PROGRAM)_intres.rc res/*.bmp res/*.ico windres $(RCFLAGS) -o $@ $(PROGRAM)_intres.rc notifyhook.dll: notifyhook/notifyhook.c notifyhook/notifyhook.h _____ Modified: trunk/reactos/subsys/system/explorer/Makefile.PCH --- trunk/reactos/subsys/system/explorer/Makefile.PCH 2005-05-01 21:19:04 UTC (rev 14931) +++ trunk/reactos/subsys/system/explorer/Makefile.PCH 2005-05-01 21:22:13 UTC (rev 14932) @@ -89,8 +89,8 @@ $(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) notifyhook.dll libexpat.dll $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) $(addprefix -l,$(DELAYIMPORTS)) -explorer$(RES_SUFFIX): $(PROGRAM)_intres.rc res/*.bmp res/*.ico - windres $(RCFLAGS) -o $@ $(PROGRAM)_intres.rc +$(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 $@ _____ Modified: trunk/reactos/subsys/system/explorer/desktop/desktop.cpp --- trunk/reactos/subsys/system/explorer/desktop/desktop.cpp 2005-05-01 21:19:04 UTC (rev 14931) +++ trunk/reactos/subsys/system/explorer/desktop/desktop.cpp 2005-05-01 21:22:13 UTC (rev 14932) @@ -467,8 +467,10 @@ HRESULT DesktopWindow::OnDefaultCommand(LPIDA pida) { +#ifndef ROSSHELL // in shell-only-mode fall through and let shell32 handle the command if (MainFrameBase::OpenShellFolders(pida, 0)) return S_OK; +#endif return E_NOTIMPL; } _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2005-05-01 21:19:04 UTC (rev 14931) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2005-05-01 21:22:13 UTC (rev 14932) @@ -56,11 +56,15 @@ ExplorerGlobals::ExplorerGlobals() { _hInstance = 0; + _cfStrFName = 0; + +#ifndef ROSSHELL _hframeClass = 0; - _cfStrFName = 0; _hMainWnd = 0; + _desktop_mode = false; _prescan_nodes = false; - _desktop_mode = false; +#endif + _log = NULL; #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) _SHRestricted = 0; @@ -528,6 +532,8 @@ } +#ifndef ROSSHELL + void explorer_show_frame(int cmdshow, LPTSTR lpCmdLine) { if (g_Globals._hMainWnd) { @@ -553,7 +559,19 @@ MainFrameBase::Create(lpCmdLine, mdi, cmdshow); } +#else +void explorer_show_frame(int cmdshow, LPTSTR lpCmdLine) +{ + if (!lpCmdLine) + lpCmdLine = TEXT("explorer.exe"); + + launch_file(GetDesktopWindow(), lpCmdLine, cmdshow); +} + +#endif + + PopupMenu::PopupMenu(UINT nid) { HMENU hMenu = LoadMenu(g_Globals._hInstance, MAKEINTRESOURCE(nid)); @@ -637,6 +655,7 @@ setlocale(LC_COLLATE, ""); // set collating rules to local settings for compareName +#ifndef ROSSHELL // register frame window class g_Globals._hframeClass = IconWindowClass(CLASSNAME_FRAME,IDI_EXPLORER); @@ -645,6 +664,7 @@ // register tree window class WindowClass(CLASSNAME_WINEFILETREE, CS_CLASSDC|CS_DBLCLKS|CS_VREDRAW).Register(); +#endif g_Globals._cfStrFName = RegisterClipboardFormat(CFSTR_FILENAME); } @@ -664,6 +684,7 @@ return -1; } +#ifndef ROSSHELL if (cmdshow != SW_HIDE) { /* // don't maximize if being called from the ROS desktop if (cmdshow == SW_SHOWNORMAL) @@ -673,6 +694,7 @@ explorer_show_frame(cmdshow, lpCmdLine); } +#endif return Window::MessageLoop(); } @@ -798,12 +820,14 @@ // If there is given the command line option "-desktop", create desktop window anyways if (_tcsstr(lpCmdLine,TEXT("-desktop"))) startup_desktop = TRUE; +#ifndef ROSSHELL else if (_tcsstr(lpCmdLine,TEXT("-nodesktop"))) startup_desktop = FALSE; // Don't display cabinet window in desktop mode if (startup_desktop && !_tcsstr(lpCmdLine,TEXT("-explorer"))) nShowCmd = SW_HIDE; +#endif if (_tcsstr(lpCmdLine,TEXT("-noautostart"))) autostart = false; @@ -832,7 +856,12 @@ if (!SetShellReadyEvent(TEXT("msgina: ShellReadyEvent"))) SetShellReadyEvent(TEXT("Global\\msgina: ShellReadyEvent")); } +#ifdef ROSSHELL + else + return 0; // no shell to launch, so exit immediatelly +#endif + if (!any_desktop_running) { // launch the shell DDE server if (g_SHDOCVW_ShellDDEInit) @@ -882,9 +911,6 @@ #endif } - if (g_Globals._hwndDesktop) - g_Globals._desktop_mode = true; - Thread* pSSOThread = NULL; if (startup_desktop) { @@ -899,12 +925,18 @@ startup(2, argv); } +#ifndef ROSSHELL + if (g_Globals._hwndDesktop) + g_Globals._desktop_mode = true; + /**TODO fix command line handling */ if (*lpCmdLine=='"' && lpCmdLine[_tcslen(lpCmdLine)-1]=='"') { ++lpCmdLine; lpCmdLine[_tcslen(lpCmdLine)-1] = '\0'; } +#endif + int ret = explorer_main(hInstance, lpCmdLine, nShowCmd); // write configuration file _____ Modified: trunk/reactos/subsys/system/explorer/explorer.h --- trunk/reactos/subsys/system/explorer/explorer.h 2005-05-01 21:19:04 UTC (rev 14931) +++ trunk/reactos/subsys/system/explorer/explorer.h 2005-05-01 21:22:13 UTC (rev 14932) @@ -31,9 +31,12 @@ #include "shell/entries.h" #include "shell/winfs.h" -#include "shell/unixfs.h" #include "shell/shellfs.h" +#ifndef ROSSHELL +#include "shell/unixfs.h" +#endif + #include "utility/window.h" @@ -68,4 +71,7 @@ #include "shell/pane.h" #include "shell/filechild.h" #include "shell/shellbrowser.h" + +#ifndef ROSSHELL #include "shell/mainframe.h" +#endif _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-05-01 21:19:04 UTC (rev 14931) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-05-01 21:22:13 UTC (rev 14932) @@ -197,8 +197,6 @@ // Bitmap // -IDB_IMAGES BITMAP DISCARDABLE "res/images.bmp" -IDB_TOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp" IDB_DRIVEBAR BITMAP DISCARDABLE "res/drivebar.bmp" IDB_LOGOV BITMAP DISCARDABLE "res/logov.bmp" IDB_LOGOV256 BITMAP DISCARDABLE "res/logov256.bmp" @@ -494,6 +492,10 @@ 3 TEXTINCLUDE DISCARDABLE BEGIN + "#ifndef ROSSHELL\r\n" + "IDB_IMAGES BITMAP DISCARDABLE ""res/images.bmp""\r\n" + "IDB_TOOLBAR BITMAP DISCARDABLE ""res/toolbar.bmp""\r\n" + "#endif\r\n" "#ifndef _ROS_\r\n" "LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL\r\n" "STRINGTABLE DISCARDABLE \r\n" _____ Modified: trunk/reactos/subsys/system/explorer/globals.h --- trunk/reactos/subsys/system/explorer/globals.h 2005-05-01 21:19:04 UTC (rev 14931) +++ trunk/reactos/subsys/system/explorer/globals.h 2005-05-01 21:22:13 UTC (rev 14932) @@ -239,11 +239,14 @@ XMLPos get_cfg(const char* path); HINSTANCE _hInstance; + UINT _cfStrFName; + +#ifndef ROSSHELL ATOM _hframeClass; - UINT _cfStrFName; HWND _hMainWnd; + bool _desktop_mode; bool _prescan_nodes; - bool _desktop_mode; +#endif FILE* _log; _____ Copied: trunk/reactos/subsys/system/explorer/make_rosshell.dsp (from rev 14923, branches/lean-explorer/reactos/subsys/system/explorer/make_rosshell.dsp) --- branches/lean-explorer/reactos/subsys/system/explorer/make_rosshell.dsp 2005-05-01 20:12:06 UTC (rev 14923) +++ trunk/reactos/subsys/system/explorer/make_rosshell.dsp 2005-05-01 21:22:13 UTC (rev 14932) @@ -0,0 +1,155 @@ +# Microsoft Developer Studio Project File - Name="make_rosshell" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) External Target" 0x0106 + +CFG=make_rosshell - Win32 Release +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "make_rosshell.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "make_rosshell.mak" CFG="make_rosshell - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "make_rosshell - Win32 Release" (based on "Win32 (x86) External Target") +!MESSAGE "make_rosshell - Win32 Debug" (based on "Win32 (x86) External Target") +!MESSAGE "make_rosshell - Win32 Unicode Debug" (based on "Win32 (x86) External Target") +!MESSAGE "make_rosshell - Win32 Unicode Release" (based on "Win32 (x86) External Target") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" + +!IF "$(CFG)" == "make_rosshell - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Cmd_Line "NMAKE /f make_rosshell.mak" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "make_rosshell.exe" +# PROP BASE Bsc_Name "make_rosshell.bsc" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Make-rosshell.MinGW UNICODE=0" +# PROP Rebuild_Opt "clean all" +# PROP Target_File "rosshell.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "make_rosshell - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Cmd_Line "NMAKE /f make_rosshell.mak" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "make_rosshell.exe" +# PROP BASE Bsc_Name "make_rosshell.bsc" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Make-rosshell.MinGW UNICODE=0 DEBUG=1" +# PROP Rebuild_Opt "clean all" +# PROP Target_File "rosshell.exe" +# PROP Bsc_Name "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Makefile.MinGW UNICODE=0 DEBUG=1" +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "make_rosshell - Win32 Unicode Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "UDebug" +# PROP BASE Intermediate_Dir "UDebug" +# PROP BASE Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Makefile.MinGW UNICODE=1 DEBUG=1" +# PROP BASE Rebuild_Opt "clean all" +# PROP BASE Target_File "rosshell.exe" +# PROP BASE Bsc_Name "" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "UDebug" +# PROP Intermediate_Dir "UDebug" +# PROP Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Makefile.MinGW UNICODE=1 DEBUG=1" +# PROP Rebuild_Opt "clean all" +# PROP Target_File "rosshell.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "make_rosshell - Win32 Unicode Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "URelease" +# PROP BASE Intermediate_Dir "URelease" +# PROP BASE Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Makefile.MinGW UNICODE=1" +# PROP BASE Rebuild_Opt "clean all" +# PROP BASE Target_File "rosshell.exe" +# PROP BASE Bsc_Name "" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "URelease" +# PROP Intermediate_Dir "URelease" +# PROP Cmd_Line "msdevfilt -gcc make -f Make-rosshell.MinGW UNICODE=1" +# PROP Rebuild_Opt "clean all" +# PROP Target_File "rosshell.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ENDIF + +# Begin Target + +# Name "make_rosshell - Win32 Release" +# Name "make_rosshell - Win32 Debug" +# Name "make_rosshell - Win32 Unicode Debug" +# Name "make_rosshell - Win32 Unicode Release" + +!IF "$(CFG)" == "make_rosshell - Win32 Release" + +!ELSEIF "$(CFG)" == "make_rosshell - Win32 Debug" + +!ELSEIF "$(CFG)" == "make_rosshell - Win32 Unicode Debug" + +!ELSEIF "$(CFG)" == "make_rosshell - Win32 Unicode Release" + +!ENDIF + +# Begin Source File + +SOURCE=.\Jamfile +# End Source File +# Begin Source File + +SOURCE=".\Make-rosshell.MinGW" +# End Source File +# Begin Source File + +SOURCE=.\Makefile +# End Source File +# Begin Source File + +SOURCE=.\Makefile.MinGW +# End Source File +# Begin Source File + +SOURCE=.\Makefile.Wine +# End Source File +# End Target +# End Project Property changes on: trunk/reactos/subsys/system/explorer/make_rosshell.dsp ___________________________________________________________________ Name: svn:eol-style + CRLF _____ Copied: trunk/reactos/subsys/system/explorer/rosshell.dsp (from rev 14923, branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp) --- branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp 2005-05-01 20:12:06 UTC (rev 14923) +++ trunk/reactos/subsys/system/explorer/rosshell.dsp 2005-05-01 21:22:13 UTC (rev 14932) @@ -0,0 +1,608 @@ +# Microsoft Developer Studio Project File - Name="rosshell" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=rosshell - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "rosshell.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "rosshell.mak" CFG="rosshell - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "rosshell - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "rosshell - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "rosshell - Win32 Debug Release" (based on "Win32 (x86) Console Application") +!MESSAGE "rosshell - Win32 Unicode Release" (based on "Win32 (x86) Console Application") +!MESSAGE "rosshell - Win32 Unicode Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "rosshell - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O1 /D "NDEBUG" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /D "ROSSHELL" /Yu"precomp.h" /FD /c +# ADD BASE RSC /l 0x407 /d "NDEBUG" +# ADD RSC /l 0x407 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /machine:I386 /libpath:"Release" /delayload:oleaut32.dll /delayload:wsock32.dll +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "rosshell - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /D "ROSSHELL" /FR /Yu"precomp.h" /FD /GZ /c +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"Debug" /delayload:oleaut32.dll /delayload:wsock32.dll +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "rosshell - Win32 Debug Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "DRelease" +# PROP BASE Intermediate_Dir "DRelease" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "DRelease" +# PROP Intermediate_Dir "DRelease" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_ROS_" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /D "NDEBUG" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /D "ROSSHELL" /FR /Yu"precomp.h" /FD /c +# ADD BASE RSC /l 0x407 /d "NDEBUG" +# ADD RSC /l 0x407 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /delayload:oleaut32.dll /delayload:wsock32.dll +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "rosshell - Win32 Unicode Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "URelease" +# PROP BASE Intermediate_Dir "URelease" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "URelease" +# PROP Intermediate_Dir "URelease" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "UNICODE" /D "_ROS_" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /D "NDEBUG" /D "UNICODE" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /D "ROSSHELL" /Yu"precomp.h" /FD /c +# ADD BASE RSC /l 0x407 /d "NDEBUG" +# ADD RSC /l 0x407 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /machine:I386 /libpath:"Release" /delayload:oleaut32.dll /delayload:wsock32.dll +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "rosshell - Win32 Unicode Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "UDebug" +# PROP BASE Intermediate_Dir "UDebug" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "UDebug" +# PROP Intermediate_Dir "UDebug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "UNICODE" /D "_ROS_" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "_DEBUG" /D "UNICODE" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /D "ROSSHELL" /FR /Yu"precomp.h" /FD /GZ /c +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"Debug" /delayload:oleaut32.dll /delayload:wsock32.dll +# SUBTRACT LINK32 /pdb:none + +!ENDIF + +# Begin Target + +# Name "rosshell - Win32 Release" +# Name "rosshell - Win32 Debug" +# Name "rosshell - Win32 Debug Release" +# Name "rosshell - Win32 Unicode Release" +# Name "rosshell - Win32 Unicode Debug" +# Begin Group "utility" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\utility\dragdropimpl.cpp +# End Source File +# Begin Source File + +SOURCE=.\utility\dragdropimpl.h +# End Source File +# Begin Source File + +SOURCE=.\utility\shellbrowserimpl.cpp +# End Source File +# Begin Source File + +SOURCE=.\utility\shellbrowserimpl.h +# End Source File +# Begin Source File + +SOURCE=.\utility\shellclasses.cpp +# End Source File +# Begin Source File + +SOURCE=.\utility\shellclasses.h +# End Source File +# Begin Source File + +SOURCE=.\utility\treedroptarget.h +# End Source File +# Begin Source File + +SOURCE=.\utility\utility.cpp +# End Source File +# Begin Source File + +SOURCE=.\utility\utility.h +# End Source File +# Begin Source File + +SOURCE=.\utility\window.cpp +# End Source File +# Begin Source File + +SOURCE=.\utility\window.h +# End Source File +# Begin Source File + +SOURCE=.\utility\xmlstorage.cpp +# End Source File +# Begin Source File + +SOURCE=.\utility\xmlstorage.h +# End Source File +# End Group +# Begin Group "resources" + +# PROP Default_Filter "bmp,ico" +# Begin Source File + +SOURCE=.\res\action.ico +# End Source File +# Begin Source File + +SOURCE=.\res\appicon.ico +# End Source File +# Begin Source File + +SOURCE=.\res\apps.ico +# End Source File +# Begin Source File + +SOURCE=.\res\arrow.ico +# End Source File +# Begin Source File + +SOURCE=.\res\arrow_dwn.ico +# End Source File +# Begin Source File + +SOURCE=.\res\arrow_up.ico +# End Source File +# Begin Source File + +SOURCE=.\res\arrowsel.ico +# End Source File +# Begin Source File + +SOURCE=.\res\computer.ico +# End Source File +# Begin Source File + +SOURCE=.\res\config.ico +# End Source File +# Begin Source File + +SOURCE=.\res\documents.ico +# End Source File +# Begin Source File + +SOURCE=.\res\dot.ico +# End Source File +# Begin Source File + +SOURCE=.\res\dot_red.ico +# End Source File +# Begin Source File + +SOURCE=.\res\dot_trans.ico +# End Source File +# Begin Source File + +SOURCE=.\res\drivebar.bmp +# End Source File +# Begin Source File + +SOURCE=".\explorer-jp.rc" +# PROP Exclude_From_Build 1 +# End Source File +# Begin Source File + +SOURCE=.\res\explorer.ico +# End Source File +# Begin Source File + +SOURCE=.\explorer_intres.h +# End Source File +# Begin Source File + +SOURCE=.\explorer_intres.rc +# End Source File +# Begin Source File + +SOURCE=.\res\favorites.ico +# End Source File +# Begin Source File + +SOURCE=.\res\floating.ico +# End Source File +# Begin Source File + +SOURCE=.\res\folder.ico +# End Source File +# Begin Source File + +SOURCE=.\res\icoali10.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\icoalig0.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\icoalig1.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\icoalig2.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\icoalig3.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\icoalig4.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\icoalig5.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\icoalig6.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\icoalig7.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\icoalig8.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\icoalig9.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\images.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\info.ico +# End Source File +# Begin Source File + +SOURCE=.\res\logoff.ico +# End Source File +# Begin Source File + +SOURCE=.\res\logov.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\logov16.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\logov256.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\network.ico +# End Source File +# Begin Source File + +SOURCE=.\res\notify_l.ico +# End Source File +# Begin Source File + +SOURCE=.\res\notify_r.ico +# End Source File +# Begin Source File + +SOURCE=.\res\printer.ico +# End Source File +# Begin Source File + +SOURCE=.\res\reactos.ico +# End Source File +# Begin Source File + +SOURCE=".\res\ros-big.ico" +# End Source File +# Begin Source File [truncated at 1000 lines; 387 more skipped]

1 0

[weiden] 14931: DeleteFile should create a handle with DELETE access rights
by weiden＠svn.reactos.com 01 May '05

01 May '05

DeleteFile should create a handle with DELETE access rights Modified: trunk/reactos/lib/kernel32/file/delete.c _____ Modified: trunk/reactos/lib/kernel32/file/delete.c --- trunk/reactos/lib/kernel32/file/delete.c 2005-05-01 21:12:50 UTC (rev 14930) +++ trunk/reactos/lib/kernel32/file/delete.c 2005-05-01 21:19:04 UTC (rev 14931) @@ -66,20 +66,19 @@ DPRINT("NtPathU \'%wZ\'\n", &NtPathU); - ObjectAttributes.Length = sizeof(OBJECT_ATTRIBUTES); - ObjectAttributes.RootDirectory = NULL; - ObjectAttributes.ObjectName = &NtPathU; - ObjectAttributes.Attributes = OBJ_CASE_INSENSITIVE| OBJ_INHERIT; - ObjectAttributes.SecurityDescriptor = NULL; - ObjectAttributes.SecurityQualityOfService = NULL; + InitializeObjectAttributes(&ObjectAttributes, + &NtPathU, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); Status = NtCreateFile (&FileHandle, - FILE_WRITE_ATTRIBUTES, + DELETE, &ObjectAttributes, &IoStatusBlock, NULL, FILE_ATTRIBUTE_NORMAL, - 0, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL,

1 0

[mf] 14930: some cleanups in the lean explorer code
by mf＠svn.reactos.com 01 May '05

01 May '05

some cleanups in the lean explorer code Modified: branches/lean-explorer/reactos/subsys/system/explorer/desktop/desktop.cp p Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.h Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer_intres.rc Modified: branches/lean-explorer/reactos/subsys/system/explorer/globals.h Modified: branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/entries.cpp Modified: branches/lean-explorer/reactos/subsys/system/explorer/taskbar/desktopbar .cpp Modified: branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. cpp _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/desktop/desktop.cp p --- branches/lean-explorer/reactos/subsys/system/explorer/desktop/desktop.cp p 2005-05-01 21:03:02 UTC (rev 14929) +++ branches/lean-explorer/reactos/subsys/system/explorer/desktop/desktop.cp p 2005-05-01 21:12:50 UTC (rev 14930) @@ -1,5 +1,5 @@ /* - * Copyright 2003, 2004 Martin Fuchs + * Copyright 2003, 2004, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.h --- branches/lean-explorer/reactos/subsys/system/explorer/explorer.h 2005-05-01 21:03:02 UTC (rev 14929) +++ branches/lean-explorer/reactos/subsys/system/explorer/explorer.h 2005-05-01 21:12:50 UTC (rev 14930) @@ -1,5 +1,5 @@ /* - * Copyright 2003, 2004 Martin Fuchs + * Copyright 2003, 2004, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer_intres.rc --- branches/lean-explorer/reactos/subsys/system/explorer/explorer_intres.rc 2005-05-01 21:03:02 UTC (rev 14929) +++ branches/lean-explorer/reactos/subsys/system/explorer/explorer_intres.rc 2005-05-01 21:12:50 UTC (rev 14930) @@ -258,7 +258,9 @@ 3 TEXTINCLUDE DISCARDABLE BEGIN + "#ifndef ROSSHELL\r\n" "IDB_TOOLBAR BITMAP DISCARDABLE ""res/toolbar.bmp""\r\n" + "#endif\r\n" "#ifndef _ROS_\r\n" "LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL\r\n" "STRINGTABLE DISCARDABLE \r\n" _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/globals.h --- branches/lean-explorer/reactos/subsys/system/explorer/globals.h 2005-05-01 21:03:02 UTC (rev 14929) +++ branches/lean-explorer/reactos/subsys/system/explorer/globals.h 2005-05-01 21:12:50 UTC (rev 14930) @@ -1,5 +1,5 @@ /* - * Copyright 2003, 2004 Martin Fuchs + * Copyright 2003, 2004, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp --- branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp 2005-05-01 21:03:02 UTC (rev 14929) +++ branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp 2005-05-01 21:12:50 UTC (rev 14930) @@ -297,7 +297,7 @@ # End Source File # Begin Source File -SOURCE=".\rosshell-jp.rc" +SOURCE=".\explorer-jp.rc" # PROP Exclude_From_Build 1 # End Source File # Begin Source File _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/entries.cpp --- branches/lean-explorer/reactos/subsys/system/explorer/shell/entries.cpp 2005-05-01 21:03:02 UTC (rev 14929) +++ branches/lean-explorer/reactos/subsys/system/explorer/shell/entries.cpp 2005-05-01 21:12:50 UTC (rev 14930) @@ -1,5 +1,5 @@ /* - * Copyright 2003, 2004 Martin Fuchs + * Copyright 2003, 2004, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/taskbar/desktopbar .cpp --- branches/lean-explorer/reactos/subsys/system/explorer/taskbar/desktopbar .cpp 2005-05-01 21:03:02 UTC (rev 14929) +++ branches/lean-explorer/reactos/subsys/system/explorer/taskbar/desktopbar .cpp 2005-05-01 21:12:50 UTC (rev 14930) @@ -131,9 +131,9 @@ void DesktopBar::ProcessHotKey(int id_hotkey) { switch(id_hotkey) { - case 0: - explorer_show_frame(SW_SHOWNORMAL); + case 0: explorer_show_frame(SW_SHOWNORMAL); break; + ///@todo implement all common hotkeys } } _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. cpp --- branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. cpp 2005-05-01 21:03:02 UTC (rev 14929) +++ branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. cpp 2005-05-01 21:12:50 UTC (rev 14930) @@ -1,5 +1,5 @@ /* - * Copyright 2003, 2004 Martin Fuchs + * Copyright 2003, 2004, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

[hpoussin] 14929: SVN maintenance on new directories/files
by hpoussin＠svn.reactos.com 01 May '05

01 May '05

SVN maintenance on new directories/files Modified: trunk/reactos/drivers/input/i8042prt/makefile Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.rc Modified: trunk/reactos/drivers/input/kbdclass/makefile Property changes on: trunk/reactos/drivers/input/i8042prt ___________________________________________________________________ Name: svn:ignore + *.coff *.o *.a *.sys *.sym *.map Property changes on: trunk/reactos/drivers/input/i8042prt/README.txt ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/input/i8042prt/i8042prt.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/input/i8042prt/i8042prt.h ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/input/i8042prt/i8042prt.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/input/i8042prt/keyboard.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/drivers/input/i8042prt/makefile --- trunk/reactos/drivers/input/i8042prt/makefile 2005-05-01 20:53:29 UTC (rev 14928) +++ trunk/reactos/drivers/input/i8042prt/makefile 2005-05-01 21:03:02 UTC (rev 14929) @@ -1,4 +1,4 @@ -# $Id: makefile 12852 2005-01-06 13:58:04Z mf $ +# $Id$ PATH_TO_TOP = ../../.. Property changes on: trunk/reactos/drivers/input/i8042prt/makefile ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/input/i8042prt/mouse.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/input/i8042prt/ps2pp.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/input/i8042prt/registry.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/input/kbdclass ___________________________________________________________________ Name: svn:ignore + *.coff *.o *.a *.sys *.sym *.map Property changes on: trunk/reactos/drivers/input/kbdclass/kbdclass.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/input/kbdclass/kbdclass.h ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.rc --- trunk/reactos/drivers/input/kbdclass/kbdclass.rc 2005-05-01 20:53:29 UTC (rev 14928) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.rc 2005-05-01 21:03:02 UTC (rev 14929) @@ -1,4 +1,4 @@ -/* $Id: keyboard.rc 12852 2005-01-06 13:58:04Z mf $ */ +/* $Id$ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Keyboard Device Driver\0" Property changes on: trunk/reactos/drivers/input/kbdclass/kbdclass.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/drivers/input/kbdclass/makefile --- trunk/reactos/drivers/input/kbdclass/makefile 2005-05-01 20:53:29 UTC (rev 14928) +++ trunk/reactos/drivers/input/kbdclass/makefile 2005-05-01 21:03:02 UTC (rev 14929) @@ -1,4 +1,4 @@ -# $Id: makefile 12852 2005-01-06 13:58:04Z mf $ +# $Id$ PATH_TO_TOP = ../../.. Property changes on: trunk/reactos/drivers/input/kbdclass/makefile ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native

1 0

← Newer
1
...
75
76
77
78
79
80
81
82
Older →

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 May 2005