Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[hbirr] 19752: Allocate the memory for the search pattern in kernel space if it is necessary (in NtQueryDirectoryFile).

by hbirr＠svn.reactos.com

Allocate the memory for the search pattern in kernel space if it is necessary (in NtQueryDirectoryFile). Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-11-29 13:35:11 UTC (rev 19751) +++ trunk/reactos/ntoskrnl/io/file.c 2005-11-29 19:07:03 UTC (rev 19752) @@ -2399,7 +2399,21 @@ FileInformation); } +static NTSTATUS NTAPI +IopQueryDirectoryFileCompletion(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + ASSERT (Context); + DPRINT("IopQueryDirectoryFileCompletion was called for \'%wZ\'\n", Context); + + ExFreePool(Context); + + return STATUS_SUCCESS; +} + + /* * @implemented * @@ -2450,6 +2464,7 @@ NTSTATUS Status = STATUS_SUCCESS; BOOLEAN LocalEvent = FALSE; PKEVENT Event = NULL; + PUNICODE_STRING SearchPattern = NULL; DPRINT("NtQueryDirectoryFile()\n"); PAGED_CODE(); @@ -2465,6 +2480,24 @@ ProbeForWrite(FileInformation, Length, sizeof(ULONG)); + if (FileName) + { + ProbeForRead(FileName, + sizeof(UNICODE_STRING), + 1); + ProbeForRead(FileName->Buffer, + FileName->MaximumLength, + 1); + SearchPattern = ExAllocatePool(NonPagedPool, FileName->Length + sizeof(WCHAR) + sizeof(UNICODE_STRING)); + if (SearchPattern == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + _SEH_LEAVE; + } + SearchPattern->Buffer = (PWCHAR)((ULONG_PTR)SearchPattern + sizeof(UNICODE_STRING)); + SearchPattern->MaximumLength = FileName->Length + sizeof(WCHAR); + RtlCopyUnicodeString(SearchPattern, FileName); + } } _SEH_HANDLE { @@ -2472,7 +2505,14 @@ } _SEH_END; - if(!NT_SUCCESS(Status)) return Status; + if(!NT_SUCCESS(Status)) + { + if (SearchPattern) + { + ExFreePool(SearchPattern); + } + return Status; + } } /* Get File Object */ @@ -2482,7 +2522,14 @@ PreviousMode, (PVOID *)&FileObject, NULL); - if (Status != STATUS_SUCCESS) return(Status); + if (!NT_SUCCESS(Status)) + { + if (SearchPattern) + { + ExFreePool(SearchPattern); + } + return Status; + } /* Get Event Object */ if (PEvent) @@ -2493,7 +2540,15 @@ PreviousMode, (PVOID *)&Event, NULL); - if (Status != STATUS_SUCCESS) return(Status); + if (NT_SUCCESS(Status)) + { + ObDereferenceObject(FileObject); + if (SearchPattern) + { + ExFreePool(SearchPattern); + } + return(Status); + } KeClearEvent(Event); } @@ -2522,6 +2577,14 @@ if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE))) { ObDereferenceObject(FileObject); + if (PEvent) + { + ObDereferenceObject(Event); + } + if (SearchPattern) + { + ExFreePool(SearchPattern); + } return STATUS_INSUFFICIENT_RESOURCES; } @@ -2543,13 +2606,23 @@ /* Set Parameters */ StackPtr->Parameters.QueryDirectory.FileInformationClass = FileInformationClass; - StackPtr->Parameters.QueryDirectory.FileName = FileName; + StackPtr->Parameters.QueryDirectory.FileName = SearchPattern ? SearchPattern : FileName; StackPtr->Parameters.QueryDirectory.FileIndex = 0; StackPtr->Parameters.QueryDirectory.Length = Length; StackPtr->Flags = 0; if (RestartScan) StackPtr->Flags = SL_RESTART_SCAN; if (ReturnSingleEntry) StackPtr->Flags |= SL_RETURN_SINGLE_ENTRY; + if (SearchPattern) + { + IoSetCompletionRoutine(Irp, + IopQueryDirectoryFileCompletion, + SearchPattern, + TRUE, + TRUE, + TRUE); + } + /* Call the Driver */ Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING)

18 years, 9 months

[mf] 19751: integrate replacement function for SHBindToParent()

by mf＠svn.reactos.com

integrate replacement function for SHBindToParent() Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp --- trunk/reactos/subsys/system/explorer/shell/entries.cpp 2005-11-29 13:34:24 UTC (rev 19750) +++ trunk/reactos/subsys/system/explorer/shell/entries.cpp 2005-11-29 13:35:11 UTC (rev 19751) @@ -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 @@ -334,7 +334,7 @@ unsigned flags; int idx; - if (SUCCEEDED(pExtract->GetIconLocation(GIL_FORSHELL, path, MAX_PATH, &idx, &flags))) { + if (SUCCEEDED(pExtract->GetIconLocation(GIL_FORSHELL, path, COUNTOF(path), &idx, &flags))) { if (flags & GIL_NOTFILENAME) icon_id = g_Globals._icon_cache.extract(pExtract, path, idx, big_icons); else { @@ -403,6 +403,67 @@ } + // local replacement implementation for SHBindToParent() + // (derived from http://www.geocities.com/SiliconValley/2060/articles/shell-helpers.html) +static HRESULT my_SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, VOID** ppv, LPCITEMIDLIST* ppidlLast) +{ + HRESULT hr; + + if (!ppv) + return E_POINTER; + + // There must be at least one item ID. + if (!pidl || !pidl->mkid.cb) + return E_INVALIDARG; + + // Get the desktop folder as root. + ShellFolder desktop; +/* IShellFolderPtr desktop; + hr = SHGetDesktopFolder(&desktop); + if (FAILED(hr)) + return hr; */ + + // Walk to the penultimate item ID. + LPCITEMIDLIST marker = pidl; + for (;;) + { + LPCITEMIDLIST next = reinterpret_cast<LPCITEMIDLIST>( + marker->mkid.abID - sizeof(marker->mkid.cb) + marker->mkid.cb); + if (!next->mkid.cb) + break; + marker = next; + } + + if (marker == pidl) + { + // There was only a single item ID, so bind to the root folder. + hr = desktop->QueryInterface(riid, ppv); + } + else + { + // Copy the ID list, truncating the last item. + int length = marker->mkid.abID - pidl->mkid.abID; + if (LPITEMIDLIST parent_id = reinterpret_cast<LPITEMIDLIST>( + malloc(length + sizeof(pidl->mkid.cb)))) + { + LPBYTE raw_data = reinterpret_cast<LPBYTE>(parent_id); + memcpy(raw_data, pidl, length); + memset(raw_data + length, 0, sizeof(pidl->mkid.cb)); + hr = desktop->BindToObject(parent_id, 0, riid, ppv); + free(parent_id); + } + else + return E_OUTOFMEMORY; + } + + // Return a pointer to the last item ID. + if (ppidlLast) + *ppidlLast = marker; + + return hr; +} +#define USE_MY_SHBINDTOPARENT + HRESULT Entry::do_context_menu(HWND hwnd, const POINT& pos, CtxMenuInterfaces& cm_ifs) { ShellPath shell_path = create_absolute_pidl(); @@ -411,6 +472,21 @@ if (!pidl_abs) return S_FALSE; // no action for registry entries, etc. +#ifdef USE_MY_SHBINDTOPARENT + IShellFolder* parentFolder; + LPCITEMIDLIST pidlLast; + + // get and use the parent folder to display correct context menu in all cases -> correct "Properties" dialog for directories, ... + HRESULT hr = my_SHBindToParent(pidl_abs, IID_IShellFolder, (LPVOID*)&parentFolder, &pidlLast); + + if (SUCCEEDED(hr)) { + hr = ShellFolderContextMenu(parentFolder, hwnd, 1, &pidlLast, pos.x, pos.y, cm_ifs); + + parentFolder->Release(); + } + + return hr; +#else static DynamicFct<HRESULT(WINAPI*)(LPCITEMIDLIST, REFIID, LPVOID*, LPCITEMIDLIST*)> SHBindToParent(TEXT("SHELL32"), "SHBindToParent"); if (SHBindToParent) { @@ -446,6 +522,7 @@ */ return ShellFolderContextMenu(GetDesktopFolder(), hwnd, 1, &pidl_abs, pos.x, pos.y, cm_ifs); } +#endif } @@ -489,7 +566,7 @@ LPWSTR wname = _data.cFileName; #else WCHAR wname[MAX_PATH]; - MultiByteToWideChar(CP_ACP, 0, _data.cFileName, -1, wname, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, _data.cFileName, -1, wname, COUNTOF(wname)); #endif LPITEMIDLIST pidl_last = NULL;

18 years, 9 months

[mf] 19750: Adjust for Visual Studio 2005:

by mf＠svn.reactos.com

Adjust for Visual Studio 2005: - use secure CRT functions where available - use COUNTOF instead of hard coded buffer sizes - project files in new format for manifest integration Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp Modified: trunk/reactos/subsys/system/explorer/doc/changes.txt Modified: trunk/reactos/subsys/system/explorer/explorer-hu.rc Modified: trunk/reactos/subsys/system/explorer/explorer.cpp Modified: trunk/reactos/subsys/system/explorer/explorer.dsp Modified: trunk/reactos/subsys/system/explorer/explorer.exe.manifest Added: trunk/reactos/subsys/system/explorer/explorer.sln Added: trunk/reactos/subsys/system/explorer/explorer.vcproj Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc Modified: trunk/reactos/subsys/system/explorer/i386-stub-win32.c Added: trunk/reactos/subsys/system/explorer/make_explorer.vcproj Modified: trunk/reactos/subsys/system/explorer/notifyhook/notifyhook.c Added: trunk/reactos/subsys/system/explorer/notifyhook/notifyhook.vcproj Modified: trunk/reactos/subsys/system/explorer/resource.h Modified: trunk/reactos/subsys/system/explorer/shell/fatfs.cpp Modified: trunk/reactos/subsys/system/explorer/shell/filechild.cpp Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp Modified: trunk/reactos/subsys/system/explorer/shell/ntobjfs.cpp Modified: trunk/reactos/subsys/system/explorer/shell/pane.cpp Modified: trunk/reactos/subsys/system/explorer/shell/regfs.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.cpp Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.h Modified: trunk/reactos/subsys/system/explorer/utility/utility.cpp Modified: trunk/reactos/subsys/system/explorer/utility/utility.h Property changes on: trunk/reactos/subsys/system/explorer ___________________________________________________________________ Name: svn:ignore - *.coff *.exe *.d *.o *.a *.sym *.map bin Debug Release DRelease UDebug URelease _NO_COMUTIL doxy-doc Win32 WineDll WineRelease *.ncb *.opt *.aps *.ncb *.plg *.suo buildno.h notifyhook.dll *.gch *.h.pch pack.* .gdbinit start-gdb.bat libexpat.dll GNUmakefile *.chm *.lib wine-explorer old + *.coff *.exe *.d *.o *.a *.sym *.map bin Debug Release DRelease UDebug URelease _NO_COMUTIL doxy-doc Win32 WineDll WineRelease *.ncb *.opt *.aps *.ncb *.plg *.suo buildno.h notifyhook.dll *.gch *.h.pch pack.* .gdbinit start-gdb.bat libexpat.dll GNUmakefile *.chm *.lib wine-explorer old *.user _____ Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp --- trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2005-11-29 12:54:54 UTC (rev 19749) +++ trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2005-11-29 13:34:24 UTC (rev 19750) @@ -184,7 +184,7 @@ WIN32_FIND_DATA wfd; TCHAR path[MAX_PATH]; - hr = pShellLink->GetPath(path, MAX_PATH-1, &wfd, SLGP_UNCPRIORITY); + hr = pShellLink->GetPath(path, COUNTOF(path)-1, &wfd, SLGP_UNCPRIORITY); if (SUCCEEDED(hr)) { TCHAR entry_path[MAX_PATH]; _____ Modified: trunk/reactos/subsys/system/explorer/doc/changes.txt --- trunk/reactos/subsys/system/explorer/doc/changes.txt 2005-11-29 12:54:54 UTC (rev 19749) +++ trunk/reactos/subsys/system/explorer/doc/changes.txt 2005-11-29 13:34:24 UTC (rev 19750) @@ -165,3 +165,4 @@ 09.10.2005 m. fuchs Fix for Bugzilla Entry 330: Correctly handle WM_COMMAND messages in web windows without web control m. fuchs replace "search computer" start menu entry by a "not yet implemented" message 01.11.2005 m. fuchs String::str(), String::toLower() to allow conventient and WINE compatible string conversions +29.11.2005 m. fuchs Adjustments for Visual Studio 2005: use new secure CT functions, COUNTOF for buffer sizes _____ Modified: trunk/reactos/subsys/system/explorer/explorer-hu.rc --- trunk/reactos/subsys/system/explorer/explorer-hu.rc 2005-11-29 12:54:54 UTC (rev 19749) +++ trunk/reactos/subsys/system/explorer/explorer-hu.rc 2005-11-29 13:34:24 UTC (rev 19750) @@ -1,3 +1,5 @@ +//Microsoft Developer Studio generated resource script. +// #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS @@ -2,2 +4,5 @@ //////////////////////////////////////////////////////////////////////// ///// +// +// Generated from the TEXTINCLUDE 2 resource. +// #include <windows.h> @@ -8,12 +13,12 @@ #undef APSTUDIO_READONLY_SYMBOLS //////////////////////////////////////////////////////////////////////// ///// -// Hungarian (HU.) resources by Robert Horvath - talley at cubeclub.hu +// Hungarian (unknown sub-lang: 0x0) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HUN) #ifdef _WIN32 -LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL -#pragma code_page(1252) +LANGUAGE LANG_HUNGARIAN, 0x0 +#pragma code_page(1250) #endif //_WIN32 //////////////////////////////////////////////////////////////////////// ///// @@ -25,26 +30,26 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "&Futtatßs...", ID_EXECUTE + MENUITEM "&Futtatßs...", ID_EXECUTE MENUITEM SEPARATOR - MENUITEM "&KilÚpÚs", ID_FILE_EXIT + MENUITEM "&KilÚpÚs", ID_FILE_EXIT END POPUP "&NÚzet" BEGIN - MENUITEM "&Eszk÷ztßr", ID_VIEW_TOOL_BAR + MENUITEM "&Eszk÷ztßr", ID_VIEW_TOOL_BAR MENUITEM "&Extra Bar", ID_VIEW_EXTRA_BAR MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR - MENUITEM "&?llapot sor", ID_VIEW_STATUSBAR + MENUITEM "&?llapot sor", ID_VIEW_STATUSBAR MENUITEM SEPARATOR MENUITEM "&FrissÝt\tF5", ID_REFRESH - MENUITEM "T&eljes kÚperny§\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "T&eljes kÚperny§\tCtrl+Shift+S", ID_VIEW_FULLSCREEN MENUITEM "SDI", ID_VIEW_SDI END POPUP "&Ablak" BEGIN - MENUITEM "?j &Ablak", ID_WINDOW_NEW - MENUITEM "LÚpcs§zetes\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "?j &Ablak", ID_WINDOW_NEW + MENUITEM "LÚpcs§zetes\tShift+F5", ID_WINDOW_CASCADE MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ MENUITEM "Tile &Vertically\tShift+F4", ID_WINDOW_TILE_VERT MENUITEM "Arrange Automatically", ID_WINDOW_AUTOSORT @@ -52,13 +57,13 @@ END POPUP "&Eszk÷z÷k" BEGIN - MENUITEM "&BeßllÝtßsok", ID_TOOLS_OPTIONS + MENUITEM "&BeßllÝtßsok", ID_TOOLS_OPTIONS END - POPUP "&S·g¾" + POPUP "&S·g¾¾" BEGIN - MENUITEM "Explorer &GYIK...", ID_EXPLORER_FAQ - MENUITEM "Explorer &nÚvjegye...", ID_ABOUT_EXPLORER - MENUITEM "Az &OS nÚvjegye...", ID_ABOUT_WINDOWS + MENUITEM "Explorer &GYIK...", ID_EXPLORER_FAQ + MENUITEM "Explorer &nÚvjegye...", ID_ABOUT_EXPLORER + MENUITEM "Az &OS nÚvjegye...", ID_ABOUT_WINDOWS END END @@ -66,10 +71,10 @@ BEGIN POPUP "" BEGIN - MENUITEM "&BeßllÝtßsok...", ID_DESKTOPBAR_SETTINGS - MENUITEM "&Feladatkezel§...", ID_TASKMGR + MENUITEM "&BeßllÝtßsok...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Feladatkezel§...", ID_TASKMGR MENUITEM SEPARATOR - MENUITEM "&Explorer nÚvjegye...", ID_ABOUT_EXPLORER + MENUITEM "&Explorer nÚvjegye...", ID_ABOUT_EXPLORER END END @@ -78,7 +83,7 @@ POPUP "" BEGIN MENUITEM "Hanger§ beßllÝtßsok", ID_TRAY_VOLUME - MENUITEM "Hangrendszer tulajdonsßgai", ID_VOLUME_PROPERTIES + MENUITEM "Hangrendszer tulajdonsßgai", ID_VOLUME_PROPERTIES END END @@ -86,12 +91,12 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Rejtett ikonok megjelenÝtÚse", ID_SHOW_HIDDEN_ICONS + MENUITEM "&Rejtett ikonok megjelenÝtÚse", ID_SHOW_HIDDEN_ICONS MENUITEM "Show Icon &Button", ID_SHOW_ICON_BUTTON MENUITEM "&Configure Notifications...", ID_CONFIG_NOTIFYAREA - MENUITEM "Dßtum Ús id§ beßllÝtßsai...", ID_CONFIG_TIME + MENUITEM "Dßtum Ús id§ beßllÝtßsai...", ID_CONFIG_TIME MENUITEM SEPARATOR - MENUITEM "&Explorer nÚvjegye...", ID_ABOUT_EXPLORER + MENUITEM "&Explorer nÚvjegye...", ID_ABOUT_EXPLORER END END @@ -99,29 +104,29 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "&Futtatßs...", ID_EXECUTE + MENUITEM "&Futtatßs...", ID_EXECUTE MENUITEM SEPARATOR - MENUITEM "&Bezßrßs", ID_FILE_EXIT + MENUITEM "&Bezßrßs", ID_FILE_EXIT END POPUP "&NÚzet" BEGIN - MENUITEM "&Eszk÷ztßr", ID_VIEW_TOOL_BAR + MENUITEM "&Eszk÷ztßr", ID_VIEW_TOOL_BAR MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR, GRAYED - MENUITEM "&?llapot sor", ID_VIEW_STATUSBAR + MENUITEM "&?llapot sor", ID_VIEW_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&FrissÝtÚs\tF5", ID_REFRESH - MENUITEM "T&eljes kÚperny§\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&FrissÝtÚs\tF5", ID_REFRESH + MENUITEM "T&eljes kÚperny§\tCtrl+Shift+S", ID_VIEW_FULLSCREEN MENUITEM "&MDI", ID_VIEW_MDI END POPUP "&Eszk÷z÷k" BEGIN - MENUITEM "&BeßllÝtßsok", ID_TOOLS_OPTIONS + MENUITEM "&BeßllÝtßsok", ID_TOOLS_OPTIONS END - POPUP "&S·g¾" + POPUP "&S·g¾¾" BEGIN - MENUITEM "Explorer &GYIK...", ID_EXPLORER_FAQ - MENUITEM "&Az Explorer nÚvjegye...", ID_ABOUT_EXPLORER - MENUITEM "Az &OS nÚvjegye...", ID_ABOUT_WINDOWS + MENUITEM "Explorer &GYIK...", ID_EXPLORER_FAQ + MENUITEM "&Az Explorer nÚvjegye...", ID_ABOUT_EXPLORER + MENUITEM "Az &OS nÚvjegye...", ID_ABOUT_WINDOWS END END @@ -377,13 +382,18 @@ IDS_TASKBAR "Taskbar" END -#endif // Hungarian (HU.) resources +#endif // Hungarian (unknown sub-lang: 0x0) resources //////////////////////////////////////////////////////////////////////// ///// #ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + //////////////////////////////////////////////////////////////////////// ///// #endif // not APSTUDIO_INVOKED _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2005-11-29 12:54:54 UTC (rev 19749) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2005-11-29 13:34:24 UTC (rev 19750) @@ -901,7 +901,7 @@ // install ROS Explorer into the registry TCHAR path[MAX_PATH]; - int l = GetModuleFileName(0, path, MAX_PATH); + int l = GetModuleFileName(0, path, COUNTOF(path)); if (l) { HKEY hkey; _____ Modified: trunk/reactos/subsys/system/explorer/explorer.dsp --- trunk/reactos/subsys/system/explorer/explorer.dsp 2005-11-29 12:54:54 UTC (rev 19749) +++ trunk/reactos/subsys/system/explorer/explorer.dsp 2005-11-29 13:34:24 UTC (rev 19750) @@ -22,7 +22,6 @@ !MESSAGE "explorer - Win32 Debug Release" (based on "Win32 (x86) Console Application") !MESSAGE "explorer - Win32 Unicode Release" (based on "Win32 (x86) Console Application") !MESSAGE "explorer - Win32 Unicode Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "explorer - Win32 _NO_COMUTIL" (based on "Win32 (x86) Console Application") !MESSAGE "explorer - Win32" (based on "Win32 (x86) Console Application") !MESSAGE "explorer - Win32 WineRelease" (based on "Win32 (x86) Console Application") !MESSAGE "explorer - Win32 WineDll" (based on "Win32 (x86) Console Application") @@ -128,7 +127,7 @@ # 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 /Yu"precomp.h" /FD /c # ADD BASE RSC /l 0x407 /d "NDEBUG" -# ADD RSC /l 0x407 /d "NDEBUG" +# ADD RSC /l 0x407 /d "NDEBUG" /d "UNICODE" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -154,7 +153,7 @@ # 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 /FR /Yu"precomp.h" /FD /GZ /c # ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" /d "UNICODE" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -163,33 +162,6 @@ # 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 -!ELSEIF "$(CFG)" == "explorer - Win32 _NO_COMUTIL" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "explorer___Win32__NO_COMUTIL" -# PROP BASE Intermediate_Dir "explorer___Win32__NO_COMUTIL" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "_NO_COMUTIL" -# PROP Intermediate_Dir "_NO_COMUTIL" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_ROS_" /D _WIN32_IE=0x0501 /D _WIN32_WINNT=0x0501 /FR /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "_DEBUG" /D "_NO_COMUTIL" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /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 ole32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /delayload:oleaut32.dll /delayload:wsock32.dll -# SUBTRACT LINK32 /pdb:none - !ELSEIF "$(CFG)" == "explorer - Win32" # PROP BASE Use_MFC 0 @@ -280,7 +252,6 @@ # Name "explorer - Win32 Debug Release" # Name "explorer - Win32 Unicode Release" # Name "explorer - Win32 Unicode Debug" -# Name "explorer - Win32 _NO_COMUTIL" # Name "explorer - Win32" # Name "explorer - Win32 WineRelease" # Name "explorer - Win32 WineDll" @@ -426,6 +397,11 @@ # End Source File # Begin Source File +SOURCE=".\explorer-hu.rc" +# PROP Exclude_From_Build 1 +# End Source File +# Begin Source File + SOURCE=".\explorer-jp.rc" # PROP Exclude_From_Build 1 # End Source File _____ Modified: trunk/reactos/subsys/system/explorer/explorer.exe.manifest --- trunk/reactos/subsys/system/explorer/explorer.exe.manifest 2005-11-29 12:54:54 UTC (rev 19749) +++ trunk/reactos/subsys/system/explorer/explorer.exe.manifest 2005-11-29 13:34:24 UTC (rev 19750) @@ -6,7 +6,7 @@ name="ReactOS.Explorer" type="win32" /> -<description>ROS Excplorer</description> +<description>ROS Explorer</description> <dependency> <dependentAssembly> <assemblyIdentity _____ Added: trunk/reactos/subsys/system/explorer/explorer.sln --- trunk/reactos/subsys/system/explorer/explorer.sln 2005-11-29 12:54:54 UTC (rev 19749) +++ trunk/reactos/subsys/system/explorer/explorer.sln 2005-11-29 13:34:24 UTC (rev 19750) @@ -0,0 +1,79 @@ +´?? +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual C++ Express 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "explorer", "explorer.vcproj", "{BFBAE588-8C68-4303-9BF6-C830087D8F25}" + ProjectSection(ProjectDependencies) = postProject + {F28B575D-7DBA-44DE-AAEF-FA0D065E5162} = {F28B575D-7DBA-44DE-AAEF-FA0D065E5162} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_explorer", "make_explorer.vcproj", "{E132A04B-8BC6-4D18-81F2-F0156B809871}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "notifyhook", "notifyhook\notifyhook.vcproj", "{F28B575D-7DBA-44DE-AAEF-FA0D065E5162}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + bjam|Win32 = bjam|Win32 + Debug Release|Win32 = Debug Release|Win32 + Debug|Win32 = Debug|Win32 + doxy docu|Win32 = doxy docu|Win32 + Release|Win32 = Release|Win32 + Unicode Debug|Win32 = Unicode Debug|Win32 + Unicode Release|Win32 = Unicode Release|Win32 + WineDll|Win32 = WineDll|Win32 + WineRelease|Win32 = WineRelease|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {BFBAE588-8C68-4303-9BF6-C830087D8F25}.bjam|Win32.ActiveCfg = WineDll|Win32 + {BFBAE588-8C68-4303-9BF6-C830087D8F25}.bjam|Win32.Build.0 = WineDll|Win32 + {BFBAE588-8C68-4303-9BF6-C830087D8F25}.Debug Release|Win32.ActiveCfg = Debug|Win32 + {BFBAE588-8C68-4303-9BF6-C830087D8F25}.Debug Release|Win32.Build.0 = Debug|Win32 + {BFBAE588-8C68-4303-9BF6-C830087D8F25}.Debug|Win32.ActiveCfg = Debug|Win32 + {BFBAE588-8C68-4303-9BF6-C830087D8F25}.Debug|Win32.Build.0 = Debug|Win32 + {BFBAE588-8C68-4303-9BF6-C830087D8F25}.doxy docu|Win32.ActiveCfg = Debug|Win32 + {BFBAE588-8C68-4303-9BF6-C830087D8F25}.doxy docu|Win32.Build.0 = Debug|Win32 + {BFBAE588-8C68-4303-9BF6-C830087D8F25}.Release|Win32.ActiveCfg = Release|Win32 + {BFBAE588-8C68-4303-9BF6-C830087D8F25}.Release|Win32.Build.0 = Release|Win32 + {BFBAE588-8C68-4303-9BF6-C830087D8F25}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32 + {BFBAE588-8C68-4303-9BF6-C830087D8F25}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32 + {BFBAE588-8C68-4303-9BF6-C830087D8F25}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32 + {BFBAE588-8C68-4303-9BF6-C830087D8F25}.Unicode Release|Win32.Build.0 = Unicode Release|Win32 + {BFBAE588-8C68-4303-9BF6-C830087D8F25}.WineDll|Win32.ActiveCfg = WineDll|Win32 + {BFBAE588-8C68-4303-9BF6-C830087D8F25}.WineDll|Win32.Build.0 = WineDll|Win32 + {BFBAE588-8C68-4303-9BF6-C830087D8F25}.WineRelease|Win32.ActiveCfg = WineRelease|Win32 + {BFBAE588-8C68-4303-9BF6-C830087D8F25}.WineRelease|Win32.Build.0 = WineRelease|Win32 + {E132A04B-8BC6-4D18-81F2-F0156B809871}.bjam|Win32.ActiveCfg = bjam|Win32 + {E132A04B-8BC6-4D18-81F2-F0156B809871}.bjam|Win32.Build.0 = bjam|Win32 + {E132A04B-8BC6-4D18-81F2-F0156B809871}.Debug Release|Win32.ActiveCfg = Debug|Win32 + {E132A04B-8BC6-4D18-81F2-F0156B809871}.Debug|Win32.ActiveCfg = Debug|Win32 + {E132A04B-8BC6-4D18-81F2-F0156B809871}.doxy docu|Win32.ActiveCfg = doxy docu|Win32 + {E132A04B-8BC6-4D18-81F2-F0156B809871}.doxy docu|Win32.Build.0 = doxy docu|Win32 + {E132A04B-8BC6-4D18-81F2-F0156B809871}.Release|Win32.ActiveCfg = Release|Win32 + {E132A04B-8BC6-4D18-81F2-F0156B809871}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32 + {E132A04B-8BC6-4D18-81F2-F0156B809871}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32 + {E132A04B-8BC6-4D18-81F2-F0156B809871}.WineDll|Win32.ActiveCfg = Debug|Win32 + {E132A04B-8BC6-4D18-81F2-F0156B809871}.WineDll|Win32.Build.0 = Debug|Win32 + {E132A04B-8BC6-4D18-81F2-F0156B809871}.WineRelease|Win32.ActiveCfg = Release|Win32 + {E132A04B-8BC6-4D18-81F2-F0156B809871}.WineRelease|Win32.Build.0 = Release|Win32 + {F28B575D-7DBA-44DE-AAEF-FA0D065E5162}.bjam|Win32.ActiveCfg = Debug|Win32 + {F28B575D-7DBA-44DE-AAEF-FA0D065E5162}.bjam|Win32.Build.0 = Debug|Win32 + {F28B575D-7DBA-44DE-AAEF-FA0D065E5162}.Debug Release|Win32.ActiveCfg = Debug|Win32 + {F28B575D-7DBA-44DE-AAEF-FA0D065E5162}.Debug Release|Win32.Build.0 = Debug|Win32 + {F28B575D-7DBA-44DE-AAEF-FA0D065E5162}.Debug|Win32.ActiveCfg = Debug|Win32 + {F28B575D-7DBA-44DE-AAEF-FA0D065E5162}.Debug|Win32.Build.0 = Debug|Win32 + {F28B575D-7DBA-44DE-AAEF-FA0D065E5162}.doxy docu|Win32.ActiveCfg = Debug|Win32 + {F28B575D-7DBA-44DE-AAEF-FA0D065E5162}.doxy docu|Win32.Build.0 = Debug|Win32 + {F28B575D-7DBA-44DE-AAEF-FA0D065E5162}.Release|Win32.ActiveCfg = Release|Win32 + {F28B575D-7DBA-44DE-AAEF-FA0D065E5162}.Release|Win32.Build.0 = Release|Win32 + {F28B575D-7DBA-44DE-AAEF-FA0D065E5162}.Unicode Debug|Win32.ActiveCfg = Debug|Win32 + {F28B575D-7DBA-44DE-AAEF-FA0D065E5162}.Unicode Debug|Win32.Build.0 = Debug|Win32 + {F28B575D-7DBA-44DE-AAEF-FA0D065E5162}.Unicode Release|Win32.ActiveCfg = Release|Win32 + {F28B575D-7DBA-44DE-AAEF-FA0D065E5162}.Unicode Release|Win32.Build.0 = Release|Win32 + {F28B575D-7DBA-44DE-AAEF-FA0D065E5162}.WineDll|Win32.ActiveCfg = Debug|Win32 + {F28B575D-7DBA-44DE-AAEF-FA0D065E5162}.WineDll|Win32.Build.0 = Debug|Win32 + {F28B575D-7DBA-44DE-AAEF-FA0D065E5162}.WineRelease|Win32.ActiveCfg = Release|Win32 + {F28B575D-7DBA-44DE-AAEF-FA0D065E5162}.WineRelease|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal _____ Added: trunk/reactos/subsys/system/explorer/explorer.vcproj --- trunk/reactos/subsys/system/explorer/explorer.vcproj 2005-11-29 12:54:54 UTC (rev 19749) +++ trunk/reactos/subsys/system/explorer/explorer.vcproj 2005-11-29 13:34:24 UTC (rev 19750) @@ -0,0 +1,3756 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8,00" + Name="explorer" + ProjectGUID="{BFBAE588-8C68-4303-9BF6-C830087D8F25}" + RootNamespace="explorer" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Unicode Debug|Win32" + OutputDirectory=".\UDebug" + IntermediateDirectory=".\UDebug" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC6 0.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\UDebug/explorer.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="_DEBUG;UNICODE;WIN32;_WIN32_IE=0x0600;_WIN32_WI NNT=0x0501" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + RuntimeTypeInfo="true" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="precomp.h" + PrecompiledHeaderFile=".\UDebug/explorer.pch" + AssemblerListingLocation=".\UDebug/" + ObjectFile=".\UDebug/" + ProgramDataBaseFileName=".\UDebug/" + BrowseInformation="1" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG,UNICODE" + Culture="1031" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="shell32.lib advapi32.lib gdi32.lib user32.lib comctl32.lib" + OutputFile=".\UDebug/explorer.exe" + LinkIncremental="2" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="Debug" + DelayLoadDLLs="oleaut32.dll,wsock32.dll" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\UDebug/explorer.pdb" + SubSystem="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + AdditionalManifestFiles="explorer.exe.manifest" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\UDebug/explorer.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Unicode Release|Win32" + OutputDirectory=".\URelease" + IntermediateDirectory=".\URelease" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC6 0.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\URelease/explorer.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + PreprocessorDefinitions="NDEBUG;UNICODE;WIN32;_WIN32_IE=0x0600;_WIN32_WI NNT=0x0501" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="precomp.h" + PrecompiledHeaderFile=".\URelease/explorer.pch" + AssemblerListingLocation=".\URelease/" + ObjectFile=".\URelease/" + ProgramDataBaseFileName=".\URelease/" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG,UNICODE" + Culture="1031" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="shell32.lib advapi32.lib gdi32.lib user32.lib comctl32.lib" + OutputFile=".\URelease/explorer.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="Release" + DelayLoadDLLs="oleaut32.dll,wsock32.dll" + ProgramDatabaseFile=".\URelease/explorer.pdb" + SubSystem="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + AdditionalManifestFiles="explorer.exe.manifest" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\URelease/explorer.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="WineRelease|Win32" + OutputDirectory=".\WineRelease" + IntermediateDirectory=".\WineRelease" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC6 0.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\WineRelease/explorer.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + PreprocessorDefinitions="NDEBUG;UNICODE;WIN32;_WIN32_IE=0x0600;_WIN32_WI NNT=0x0501" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="precomp.h" + PrecompiledHeaderFile=".\WineRelease/explorer.pch" + AssemblerListingLocation=".\WineRelease/" + ObjectFile=".\WineRelease/" + ProgramDataBaseFileName=".\WineRelease/" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1031" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="shell32.lib advapi32.lib gdi32.lib user32.lib comctl32.lib" + OutputFile="WineRelease/wexplorer.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + DelayLoadDLLs="oleaut32.dll,wsock32.dll" + ProgramDatabaseFile=".\WineRelease/wexplorer.pdb" + SubSystem="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + AdditionalManifestFiles="explorer.exe.manifest" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\WineRelease/explorer.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug Release|Win32" + OutputDirectory=".\DRelease" + IntermediateDirectory=".\DRelease" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC6 0.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\DRelease/explorer.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + PreprocessorDefinitions="NDEBUG;WIN32;_WIN32_IE=0x0600;_WIN32_WINNT=0x05 01" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="precomp.h" + PrecompiledHeaderFile=".\DRelease/explorer.pch" + AssemblerListingLocation=".\DRelease/" + ObjectFile=".\DRelease/" + ProgramDataBaseFileName=".\DRelease/" + BrowseInformation="1" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1031" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="shell32.lib advapi32.lib gdi32.lib user32.lib comctl32.lib" + OutputFile=".\DRelease/explorer.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + DelayLoadDLLs="oleaut32.dll,wsock32.dll" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\DRelease/explorer.pdb" + SubSystem="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + AdditionalManifestFiles="explorer.exe.manifest" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\DRelease/explorer.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\Debug" + IntermediateDirectory=".\Debug" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC6 0.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Debug/explorer.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="_DEBUG;WIN32;_WIN32_IE=0x0600;_WIN32_WINNT=0x05 01" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + RuntimeTypeInfo="true" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="precomp.h" + PrecompiledHeaderFile=".\Debug/explorer.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName=".\Debug/" + BrowseInformation="1" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1031" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="shell32.lib advapi32.lib gdi32.lib user32.lib comctl32.lib" + OutputFile=".\Debug/explorer.exe" + LinkIncremental="2" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="Debug" + DelayLoadDLLs="oleaut32.dll,wsock32.dll" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\Debug/explorer.pdb" + SubSystem="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + AdditionalManifestFiles="explorer.exe.manifest" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Debug/explorer.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory=".\Release" + IntermediateDirectory=".\Release" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC6 0.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool [truncated at 1000 lines; 4359 more skipped]

18 years, 9 months

[mf] 19749: correct _com_ptr usage

by mf＠svn.reactos.com

correct _com_ptr usage Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.h _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-11-29 11:44:04 UTC (rev 19748) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-11-29 12:54:54 UTC (rev 19749) @@ -558,7 +558,7 @@ update_shell_browser(); - if (&*_shellBrowser) + if (_shellBrowser.get()) if (_left_hwnd) _shellBrowser->Init(_himlSmall); else _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.h --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.h 2005-11-29 11:44:04 UTC (rev 19748) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.h 2005-11-29 12:54:54 UTC (rev 19749) @@ -237,7 +237,7 @@ int Notify(int id, NMHDR* pnmh) { - if (&*_shellBrowser) + if (_shellBrowser.get()) switch(pnmh->code) { case TVN_GETDISPINFO: _shellBrowser->OnTreeGetDispInfo(id, pnmh); break; case TVN_SELCHANGED: _shellBrowser->OnTreeItemSelected(id, (LPNMTREEVIEW)pnmh); break;

18 years, 9 months

[weiden] 19748: - fixed the ProbeForWrite prototype

by weiden＠svn.reactos.com

- fixed the ProbeForWrite prototype - some fixes to get ntoskrnl to build with -Wcast-qual and -Wsign-compare - don't touch any memory outside the given range in ProbeForWrite and touch all pages within the range Modified: trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/include/reactos/helper.h Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/io/deviface.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c Modified: trunk/reactos/ntoskrnl/kd/kdmain.c Modified: trunk/reactos/ntoskrnl/lpc/reply.c Modified: trunk/reactos/ntoskrnl/mm/elf.inc.h Modified: trunk/reactos/ntoskrnl/mm/pe.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/include/ndk/mmtypes.h --- trunk/reactos/include/ndk/mmtypes.h 2005-11-29 11:09:42 UTC (rev 19747) +++ trunk/reactos/include/ndk/mmtypes.h 2005-11-29 11:44:04 UTC (rev 19748) @@ -28,9 +28,9 @@ // // Page-Rounding Macros // -#define PAGE_ROUND_DOWN(x) (((ULONG)x)&(~(PAGE_SIZE-1))) +#define PAGE_ROUND_DOWN(x) (((ULONG_PTR)x)&(~(PAGE_SIZE-1))) #define PAGE_ROUND_UP(x) \ - ( (((ULONG)x)%PAGE_SIZE) ? ((((ULONG)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG)x) ) + ( (((ULONG_PTR)x)%PAGE_SIZE) ? ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG_PTR)x) ) // // Macro for generating pool tags _____ Modified: trunk/reactos/include/reactos/helper.h --- trunk/reactos/include/reactos/helper.h 2005-11-29 11:09:42 UTC (rev 19747) +++ trunk/reactos/include/reactos/helper.h 2005-11-29 11:44:04 UTC (rev 19748) @@ -20,11 +20,11 @@ #endif #ifndef PAGE_ROUND_DOWN -#define PAGE_ROUND_DOWN(x) (((ULONG)x)&(~(PAGE_SIZE-1))) +#define PAGE_ROUND_DOWN(x) (((ULONG_PTR)x)&(~(PAGE_SIZE-1))) #endif #ifndef PAGE_ROUND_UP -#define PAGE_ROUND_UP(x) ( (((ULONG)x)%PAGE_SIZE) ? ((((ULONG)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG)x) ) +#define PAGE_ROUND_UP(x) ( (((ULONG_PTR)x)%PAGE_SIZE) ? ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG_PTR)x) ) #endif #define ABS_VALUE(V) (((V) < 0) ? -(V) : (V)) _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-11-29 11:09:42 UTC (rev 19747) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-11-29 11:44:04 UTC (rev 19748) @@ -89,7 +89,7 @@ /* Create local parameter line copy */ ParamBuffer = ExAllocatePool(PagedPool, 256); - strcpy (ParamBuffer, (char *)ParameterLine); + strcpy (ParamBuffer, (const char *)ParameterLine); DPRINT("%s\n", ParamBuffer); /* Cut options off */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-11-29 11:09:42 UTC (rev 19747) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-11-29 11:44:04 UTC (rev 19748) @@ -123,7 +123,7 @@ (((ULONG_PTR)(Ptr) + sizeof(Type) - 1 < (ULONG_PTR)(Ptr) || \ (ULONG_PTR)(Ptr) + sizeof(Type) - 1 >= (ULONG_PTR)MmUserProbeAddress) ? \ ExRaiseStatus (STATUS_ACCESS_VIOLATION), Default : \ - *(Type *)&(*(volatile Type *)(Ptr))) + *(Type *)(Ptr)) #define ProbeForReadBoolean(Ptr) ProbeForReadGenericType(Ptr, BOOLEAN, FALSE) #define ProbeForReadUchar(Ptr) ProbeForReadGenericType(Ptr, UCHAR, 0) _____ Modified: trunk/reactos/ntoskrnl/io/deviface.c --- trunk/reactos/ntoskrnl/io/deviface.c 2005-11-29 11:09:42 UTC (rev 19747) +++ trunk/reactos/ntoskrnl/io/deviface.c 2005-11-29 11:44:04 UTC (rev 19748) @@ -882,6 +882,7 @@ PWCHAR StartPosition; PWCHAR EndPosition; NTSTATUS Status; + GUID EventGuid; if (SymbolicLinkName == NULL) return STATUS_INVALID_PARAMETER_1; @@ -917,10 +918,11 @@ return Status; } + EventGuid = Enable ? GUID_DEVICE_INTERFACE_ARRIVAL : GUID_DEVICE_INTERFACE_REMOVAL; IopNotifyPlugPlayNotification( PhysicalDeviceObject, EventCategoryDeviceInterfaceChange, - Enable ? (LPGUID)&GUID_DEVICE_INTERFACE_ARRIVAL : (LPGUID)&GUID_DEVICE_INTERFACE_REMOVAL, + &EventGuid, &GuidString, (PVOID)SymbolicLinkName); _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-11-29 11:09:42 UTC (rev 19747) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-11-29 11:44:04 UTC (rev 19748) @@ -221,7 +221,7 @@ /* Query the device caps */ Status = IopQueryDeviceCapabilities(DeviceNode, &DeviceCaps); - if (NT_SUCCESS(Status) && (DeviceCaps.Address != -1)) + if (NT_SUCCESS(Status) && (DeviceCaps.Address != (ULONG)-1)) { /* Return length */ *ResultLength = sizeof(ULONG); _____ Modified: trunk/reactos/ntoskrnl/kd/kdmain.c --- trunk/reactos/ntoskrnl/kd/kdmain.c 2005-11-29 11:09:42 UTC (rev 19747) +++ trunk/reactos/ntoskrnl/kd/kdmain.c 2005-11-29 11:44:04 UTC (rev 19748) @@ -217,7 +217,7 @@ NtQueryDebugFilterState(IN ULONG ComponentId, IN ULONG Level) { - int i; + unsigned int i; /* convert Level to mask if it isn't already one */ if ( Level < 32 ) @@ -241,7 +241,7 @@ IN ULONG Level, IN BOOLEAN State) { - int i; + unsigned int i; for ( i = 0; i < KdComponentTableEntries; i++ ) { if ( ComponentId == KdComponentTable[i].ComponentId ) _____ Modified: trunk/reactos/ntoskrnl/lpc/reply.c --- trunk/reactos/ntoskrnl/lpc/reply.c 2005-11-29 11:09:42 UTC (rev 19747) +++ trunk/reactos/ntoskrnl/lpc/reply.c 2005-11-29 11:44:04 UTC (rev 19748) @@ -45,7 +45,7 @@ } Size = sizeof(QUEUEDMESSAGE); - if (LpcReply && LpcReply->u1.s1.TotalLength > sizeof(PORT_MESSAGE)) + if (LpcReply && LpcReply->u1.s1.TotalLength > (CSHORT)sizeof(PORT_MESSAGE)) { Size += LpcReply->u1.s1.TotalLength - sizeof(PORT_MESSAGE); } _____ Modified: trunk/reactos/ntoskrnl/mm/elf.inc.h --- trunk/reactos/ntoskrnl/mm/elf.inc.h 2005-11-29 11:09:42 UTC (rev 19747) +++ trunk/reactos/ntoskrnl/mm/elf.inc.h 2005-11-29 11:44:04 UTC (rev 19748) @@ -139,7 +139,7 @@ #ifndef RTL_CONTAINS_FIELD #define RTL_CONTAINS_FIELD(P_, SIZE_, FIELD_) \ - ((((char *)(P_)) + (SIZE_)) > (((char *)(&((P_)->FIELD_))) + sizeof((P_)->FIELD_))) + ((ULONG_PTR)(P_) + (ULONG_PTR)(SIZE_) > (ULONG_PTR)&((P_)->FIELD_) + sizeof((P_)->FIELD_)) #endif #define ELFFMT_FIELDS_EQUAL(TYPE1_, TYPE2_, FIELD_) \ @@ -266,8 +266,13 @@ { PBYTE p; ULONG nSafeInput; + union + { + CONST ULONG32 *ConstInput; + ULONG32 *Input; + }pInput = {Input}; - RtlRetrieveUlong(&nSafeInput, Input); + RtlRetrieveUlong(&nSafeInput, pInput.Input); if(DataType == ELF_TARG_DATA) return nSafeInput; _____ Modified: trunk/reactos/ntoskrnl/mm/pe.c --- trunk/reactos/ntoskrnl/mm/pe.c 2005-11-29 11:09:42 UTC (rev 19747) +++ trunk/reactos/ntoskrnl/mm/pe.c 2005-11-29 11:44:04 UTC (rev 19748) @@ -97,7 +97,7 @@ #ifndef RTL_CONTAINS_FIELD #define RTL_CONTAINS_FIELD(P_, SIZE_, FIELD_) \ - ((((char *)(P_)) + (SIZE_)) > (((char *)(&((P_)->FIELD_))) + sizeof((P_)->FIELD_))) + ((ULONG_PTR)(P_) + (ULONG_PTR)(SIZE_) > (ULONG_PTR)&((P_)->FIELD_) + sizeof((P_)->FIELD_)) #endif static __inline BOOLEAN IsPowerOf2(IN ULONG Number) _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-11-29 11:09:42 UTC (rev 19747) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-11-29 11:44:04 UTC (rev 19748) @@ -2744,8 +2744,8 @@ MmspCompareSegments(const void * x, const void * y) { - PMM_SECTION_SEGMENT Segment1 = (PMM_SECTION_SEGMENT)x; - PMM_SECTION_SEGMENT Segment2 = (PMM_SECTION_SEGMENT)y; + const MM_SECTION_SEGMENT *Segment1 = (const MM_SECTION_SEGMENT *)x; + const MM_SECTION_SEGMENT *Segment2 = (const MM_SECTION_SEGMENT *)y; return (Segment1->VirtualAddress - Segment2->VirtualAddress) >> _____ Modified: trunk/reactos/ntoskrnl/mm/virtual.c --- trunk/reactos/ntoskrnl/mm/virtual.c 2005-11-29 11:09:42 UTC (rev 19747) +++ trunk/reactos/ntoskrnl/mm/virtual.c 2005-11-29 11:44:04 UTC (rev 19748) @@ -989,20 +989,20 @@ IN ULONG Length, IN ULONG Alignment) { - ASSERT(Alignment == 1 || Alignment == 2 || Alignment == 4 || Alignment == 8); + if (Length != 0) + { + ASSERT(Alignment == 1 || Alignment == 2 || Alignment == 4 || Alignment == 8); - if (Length == 0) - return; - - if (((ULONG_PTR)Address & (Alignment - 1)) != 0) - { - ExRaiseStatus (STATUS_DATATYPE_MISALIGNMENT); - } - else if ((ULONG_PTR)Address + Length - 1 < (ULONG_PTR)Address || - (ULONG_PTR)Address + Length - 1 >= (ULONG_PTR)MmUserProbeAddress) - { - ExRaiseStatus (STATUS_ACCESS_VIOLATION); - } + if (((ULONG_PTR)Address & (Alignment - 1)) != 0) + { + ExRaiseStatus (STATUS_DATATYPE_MISALIGNMENT); + } + else if ((ULONG_PTR)Address + Length - 1 < (ULONG_PTR)Address || + (ULONG_PTR)Address + Length - 1 >= (ULONG_PTR)MmUserProbeAddress) + { + ExRaiseStatus (STATUS_ACCESS_VIOLATION); + } + } } @@ -1010,39 +1010,39 @@ * @implemented */ VOID STDCALL -ProbeForWrite (IN CONST VOID *Address, +ProbeForWrite (IN PVOID Address, IN ULONG Length, IN ULONG Alignment) { - volatile CHAR *Current; - PCHAR Last; + volatile CHAR *Current; + PCHAR Last; - ASSERT(Alignment == 1 || Alignment == 2 || Alignment == 4 || Alignment == 8); + if (Length != 0) + { + ASSERT(Alignment == 1 || Alignment == 2 || Alignment == 4 || Alignment == 8); - if (Length == 0) - return; + if (((ULONG_PTR)Address & (Alignment - 1)) != 0) + { + ExRaiseStatus (STATUS_DATATYPE_MISALIGNMENT); + } - if (((ULONG_PTR)Address & (Alignment - 1)) != 0) - { - ExRaiseStatus (STATUS_DATATYPE_MISALIGNMENT); - } + Last = (PCHAR)((ULONG_PTR)Address + Length - 1); + if ((ULONG_PTR)Last < (ULONG_PTR)Address || + (ULONG_PTR)Last >= (ULONG_PTR)MmUserProbeAddress) + { + ExRaiseStatus (STATUS_ACCESS_VIOLATION); + } - Last = (CHAR*)((ULONG_PTR)Address + Length - 1); - if ((ULONG_PTR)Last < (ULONG_PTR)Address || - (ULONG_PTR)Last >= (ULONG_PTR)MmUserProbeAddress) - { - ExRaiseStatus (STATUS_ACCESS_VIOLATION); - } - - /* Check for accessible pages */ - Current = (CHAR*)Address; - *Current = *Current; - Current = (PCHAR)((ULONG_PTR)PAGE_ROUND_DOWN(Current) + PAGE_SIZE); - while (Current <= Last) - { - *Current = *Current; - Current = (CHAR*)((ULONG_PTR)Current + PAGE_SIZE); - } + /* Check for accessible pages, do *not* touch any memory outside of the + range!*/ + Current = (volatile CHAR*)Address; + Last = (PCHAR)(PAGE_ROUND_DOWN(Last)); + do + { + *Current = *Current; + Current = (volatile CHAR*)(PAGE_ROUND_DOWN(Current) + PAGE_SIZE); + } while (Current <= Last); + } } /* EOF */ _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-11-29 11:09:42 UTC (rev 19747) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-11-29 11:44:04 UTC (rev 19748) @@ -6738,7 +6738,7 @@ VOID DDKAPI ProbeForWrite( - IN CONST VOID *Address, + IN PVOID Address, IN ULONG Length, IN ULONG Alignment);

18 years, 9 months

[weiden] 19747: fix comment in RtlPrefetchMemoryNonTemporal

by weiden＠svn.reactos.com

fix comment in RtlPrefetchMemoryNonTemporal Modified: trunk/reactos/lib/rtl/i386/mem_asm.S _____ Modified: trunk/reactos/lib/rtl/i386/mem_asm.S --- trunk/reactos/lib/rtl/i386/mem_asm.S 2005-11-29 10:09:26 UTC (rev 19746) +++ trunk/reactos/lib/rtl/i386/mem_asm.S 2005-11-29 11:09:42 UTC (rev 19747) @@ -158,6 +158,6 @@ prefetchnta byte ptr [ecx] // prefechnta(address) sub edx, eax // count = count - cache_line_size add ecx, eax // address = address + cache_line_size - cmp edx, 0 // if(count) <= 0 + cmp edx, 0 // if(count) > 0 ja fetch_next_line // goto fetch_next_line ret

18 years, 9 months

[weiden] 19746: fixed registry querying code in Ki386SetProcessorFeatures

by weiden＠svn.reactos.com

fixed registry querying code in Ki386SetProcessorFeatures Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-11-29 09:22:39 UTC (rev 19745) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-11-29 10:09:26 UTC (rev 19746) @@ -496,7 +496,12 @@ UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"FastSystemCallDisable"); HANDLE KeyHandle; ULONG ResultLength; - KEY_VALUE_PARTIAL_INFORMATION ValueData; + struct + { + KEY_VALUE_PARTIAL_INFORMATION Info; + UCHAR Buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, + Data[0]) + sizeof(ULONG)]; + } ValueData; NTSTATUS Status; ULONG FastSystemCallDisable = 0; @@ -525,7 +530,7 @@ *(PCHAR)RtlPrefetchMemoryNonTemporal = 0x90; } - /* Does the CPU Support Fast System Call? */ + /* Does the CPU Support Fast System Call? */ if (Pcr->PrcbData.FeatureBits & X86_FEATURE_SYSCALL) { /* FIXME: Check for Family == 6, Model < 3 and Stepping < 3 and disable */ @@ -536,20 +541,29 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtOpenKey(&KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes); + Status = ZwOpenKey(&KeyHandle, + KEY_QUERY_VALUE, + &ObjectAttributes); if (NT_SUCCESS(Status)) { /* Read the Value then Close the Key */ - Status = NtQueryValueKey(KeyHandle, + Status = ZwQueryValueKey(KeyHandle, &ValueName, KeyValuePartialInformation, &ValueData, sizeof(ValueData), &ResultLength); - RtlMoveMemory(&FastSystemCallDisable, ValueData.Data, sizeof(ULONG)); + if (NT_SUCCESS(Status)) + { + if (ResultLength == sizeof(ValueData) && + ValueData.Info.Type == REG_DWORD) + { + FastSystemCallDisable = *(PULONG)ValueData.Info.Data != 0; + } - NtClose(KeyHandle); + ZwClose(KeyHandle); + } } } else {

18 years, 9 months

[mf] 19745: switch to standard conform CRT function names

by mf＠svn.reactos.com

switch to standard conform CRT function names Modified: trunk/reactos/subsys/system/explorer/explorer.cpp Modified: trunk/reactos/subsys/system/explorer/shell/filechild.cpp Modified: trunk/reactos/subsys/system/explorer/shell/ntobjfs.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2005-11-29 08:23:10 UTC (rev 19744) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2005-11-29 09:22:39 UTC (rev 19745) @@ -985,7 +985,7 @@ _dup2(_open_osfhandle((long)GetStdHandle(STD_OUTPUT_HANDLE), 0), 1); _dup2(_open_osfhandle((long)GetStdHandle(STD_ERROR_HANDLE), 0), 2); - g_Globals._log = fdopen(1, "w"); + g_Globals._log = _fdopen(1, "w"); setvbuf(g_Globals._log, 0, _IONBF, 0); LOG(TEXT("starting explorer debug log\n")); _____ Modified: trunk/reactos/subsys/system/explorer/shell/filechild.cpp --- trunk/reactos/subsys/system/explorer/shell/filechild.cpp 2005-11-29 08:23:10 UTC (rev 19744) +++ trunk/reactos/subsys/system/explorer/shell/filechild.cpp 2005-11-29 09:22:39 UTC (rev 19745) @@ -548,7 +548,7 @@ } -void FileChildWindow::activate_entry(Pane* pane) ///@todo enable using <RETURN> key accelerator +void FileChildWindow::activate_entry(Pane* pane) ///@todo enable using RETURN key accelerator { Entry* entry = pane->_cur; _____ Modified: trunk/reactos/subsys/system/explorer/shell/ntobjfs.cpp --- trunk/reactos/subsys/system/explorer/shell/ntobjfs.cpp 2005-11-29 08:23:10 UTC (rev 19744) +++ trunk/reactos/subsys/system/explorer/shell/ntobjfs.cpp 2005-11-29 09:22:39 UTC (rev 19745) @@ -328,7 +328,7 @@ #else char type_name[32]; WideCharToMultiByte(CP_ACP, 0, info->type.string_ptr, info->type.string_len, type_name, 32, 0, 0); - entry->_type_name = strdup(type_name); + entry->_type_name = _strdup(type_name); #endif if (!first_entry) _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp --- trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp 2005-11-29 08:23:10 UTC (rev 19744) +++ trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp 2005-11-29 09:22:39 UTC (rev 19745) @@ -72,9 +72,9 @@ while(isspace(*cont)) ++cont; - if (!strnicmp(keyword, "URL", 3)) + if (!_strnicmp(keyword, "URL", 3)) _url = DecodeURLString(cont); - else if (!strnicmp(keyword, "IconFile", 8)) + else if (!_strnicmp(keyword, "IconFile", 8)) _icon_path = DecodeURLString(cont); } }

18 years, 9 months

[gvg] 19744: Samuel Serapióega <samcharly@hotmail.com>:

by gvg＠svn.reactos.com

Samuel Serapióega <samcharly(a)hotmail.com>: - Spanish translation update >From bug 1058. Modified: trunk/reactos/subsys/system/regedit/Es.rc _____ Modified: trunk/reactos/subsys/system/regedit/Es.rc --- trunk/reactos/subsys/system/regedit/Es.rc 2005-11-29 06:24:56 UTC (rev 19743) +++ trunk/reactos/subsys/system/regedit/Es.rc 2005-11-29 08:23:10 UTC (rev 19744) @@ -3,6 +3,7 @@ * * Copyright 2003 JosÚ Manuel Ferrer Ortiz * Copyright 2005 Patricio MartÝnez Ros + * Copyright 2005 Samuel Serapi¾n Vega * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -43,7 +44,10 @@ BEGIN MENUITEM "&Importar archivo de registro...", ID_REGISTRY_IMPORTREGISTRYFILE MENUITEM "&Exportar archivo de registro...", ID_REGISTRY_EXPORTREGISTRYFILE - MENUITEM SEPARATOR + + MENUITEM SEPARATOR + MENUITEM "Cargar archivo de registro...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Descargar archivo de registro...", ID_REGISTRY_UNLOADHIVE, GRAYED MENUITEM "&Conectar registro de red...", ID_REGISTRY_CONNECTNETWORKREGISTRY MENUITEM "&Desconectar registro de red...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR @@ -62,9 +66,13 @@ MENUITEM "Valor de c&adena", ID_EDIT_NEW_STRINGVALUE MENUITEM "Valor &binario", ID_EDIT_NEW_BINARYVALUE MENUITEM "Valor &DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Valor de varias lineas", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "&Valor de una linea expandibles", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END - MENUITEM SEPARATOR - MENUITEM "&Eliminar\tDel", ID_EDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "&Permisos...", ID_EDIT_PERMISSIONS + MENUITEM SEPARATOR + MENUITEM "&Eliminar\tDel", ID_EDIT_DELETE MENUITEM "&Renombrar", ID_EDIT_RENAME MENUITEM SEPARATOR MENUITEM "&Copiar valor de la clave", ID_EDIT_COPYKEYNAME @@ -95,7 +103,115 @@ END END +IDR_POPUP_MENUS MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Modificar", ID_EDIT_MODIFY + MENUITEM "Modificar Data Binaria", ID_EDIT_MODIFY_BIN + MENUITEM SEPARATOR + MENUITEM "&Borrar\tDel", ID_EDIT_DELETE + MENUITEM "&Renombrar", ID_EDIT_RENAME + END + POPUP "" + BEGIN + POPUP "&Nuevo" + BEGIN + MENUITEM "&Clave", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "Valores& Linea", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Valores& Binario", ID_EDIT_NEW_BINARYVALUE + MENUITEM "Valores &DWORD", ID_EDIT_NEW_DWORDVALUE + END + END + POPUP "" + BEGIN + MENUITEM "Expandir/Colapsar", ID_TREE_EXPANDBRANCH + POPUP "&Nuevo" + BEGIN + MENUITEM "&Clave", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "Valores& Linea", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Valores& Binario", ID_EDIT_NEW_BINARYVALUE + MENUITEM "Valores &DWORD", ID_EDIT_NEW_DWORDVALUE + END + MENUITEM "&Encuentra", ID_EDIT_FIND + MENUITEM SEPARATOR + MENUITEM "&Borrar", ID_TREE_DELETE + MENUITEM "&Renombrar", ID_TREE_RENAME + MENUITEM SEPARATOR + MENUITEM "&Exportar", ID_TREE_EXPORT + MENUITEM "&Permisos...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Copiar nombre de clave", ID_EDIT_COPYKEYNAME + END +END + + /* + * Dialog + */ + +IDD_EDIT_STRING DIALOG 32, 24, 252, 84 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edit String" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nombre de Valor:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Valor del data:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,12,ES_AUTOHSCROLL + DEFPUSHBUTTON "Aceptar",IDOK,142,64,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,196,64,50,14 +END + +IDD_EDIT_MULTI_STRING DIALOG 32, 24, 252, 174 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edit Multi-String" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nombre de Valor:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Valor del data:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,102,ES_AUTOHSCROLL | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL + DEFPUSHBUTTON "Aceptar",IDOK,142,64,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,196,64,50,14 +END + +IDD_EDIT_BIN_DATA DIALOG 32, 24, 252, 174 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edit Binary Value" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nombre de Valor:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Valor del data:",IDC_STATIC,6,35,161,8 + CONTROL "",IDC_VALUE_DATA,"HexEdit32",WS_VSCROLL | WS_BORDER | WS_TABSTOP,6,46,240,102 + DEFPUSHBUTTON "Aceptar",IDOK,142,154,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,196,154,50,14 +END + + +IDD_EDIT_DWORD DIALOG 32, 24, 252, 104 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edit DWORD" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nombre de Valor:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Valor del data:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,116,12,ES_AUTOHSCROLL + GROUPBOX "Base",IDC_STATIC,130,35,116,39 + AUTORADIOBUTTON "&Hexadecimal",IDC_FORMAT_HEX,141,46,60,10,WS_GROUP + AUTORADIOBUTTON "&Decimal",IDC_FORMAT_DEC,141,59,60,10 + DEFPUSHBUTTON "Aceptar",IDOK,142,82,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,196,82,50,14 +END +/* * String Table */ @@ -157,6 +273,83 @@ ID_EDIT_FINDNEXT "Busca la siguiente ocurrencia del texto especificado en la b·squeda anterior" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ERROR "Error" + IDS_WARNING "Aviso" + IDS_BAD_KEY "No puede averiguar valor clave '%s'" + IDS_BAD_VALUE "No puede averiguar valor '%s'" + IDS_UNSUPPORTED_TYPE "No puede editar claves de este tipo (%ld)" + IDS_TOO_BIG_VALUE "Valor es muy grande (%ld)" + IDS_MULTI_SZ_EMPTY_STRING "Data del tipo REG_MULTI_SZ no puede contener lineas vacias.\nLas lineas vacias han sido removidas." + IDS_QUERY_DELETE_KEY_ONE "Esta seguro que quiere borrar esta clave?" + IDS_QUERY_DELETE_KEY_MORE "Esta seguro que quiere borrar estas claves?" + IDS_QUERY_DELETE_KEY_CONFIRM "Confirme borrar clave" + IDS_QUERY_DELETE_ONE "Esta seguro que quiere borrar este valor?" + IDS_QUERY_DELETE_MORE "Esta seguro que quiere borrar estos valores?" + IDS_QUERY_DELETE_CONFIRM "Confirme borrar valor" + IDS_ERR_DELVAL_CAPTION "Error Borrando Valores" + IDS_ERR_DELETEVALUE "Incapaz de borrar todos los valores especificados!" + IDS_ERR_RENVAL_CAPTION "Error Renombrando Valor" + IDS_ERR_RENVAL_TOEMPTY "No puede renombrar %s. El nombre de valor especificado esta vacio. Trate otro nombre y comienze otra vez." + IDS_NEW_KEY "Nueva Clave #%d" + IDS_NEW_VALUE "Nuevo Valor #%d" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BINARY_EMPTY "(valor binario de longitud zero)" + IDS_DEFAULT_VALUE_NAME "(Default)" + IDS_VALUE_NOT_SET "(valor no entrado)" + IDS_UNKNOWN_TYPE "Tipo desconocido: (0x%lx)" + IDS_MY_COMPUTER "My Computer" + IDS_IMPORT_REG_FILE "Importa Fichero de Registro" + IDS_EXPORT_REG_FILE "Exporta Fichero de Registro" + IDS_INVALID_DWORD "(valor DWORD invalido)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FLT_REGFILES "Fichero de Registro" + IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_REGEDIT4 "Fichero de Registro Win9x/NT4 (REGEDIT4)" + IDS_FLT_REGEDIT4_FLT "*.reg" + IDS_FLT_ALLFILES "Todos los archivos (*.*)" + IDS_FLT_ALLFILES_FLT "*.*" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ACCESS_FULLCONTROL "Control Completo" + IDS_ACCESS_READ "Lectura" + IDS_ACCESS_QUERYVALUE "Pregunta Valor" + IDS_ACCESS_SETVALUE "Modifica Valor" + IDS_ACCESS_CREATESUBKEY "Crear Subclave" + IDS_ACCESS_ENUMERATESUBKEYS "Enumera Subclaves" + IDS_ACCESS_NOTIFY "Notifica" + IDS_ACCESS_CREATELINK "Crear enlace" + IDS_ACCESS_DELETE "Borrar" + IDS_ACCESS_WRITEDAC "Escribir DAC" + IDS_ACCESS_WRITEOWNER "Due±o Escritura" + IDS_ACCESS_READCONTROL "Control de Lectura" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INHERIT_THISKEYONLY "Esta clave solamente" + IDS_INHERIT_THISKEYANDSUBKEYS "Esta clave y sus subclaves" + IDS_INHERIT_SUBKEYSONLY "Subclaves solamente" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_EXPAND "&Expandir" + IDS_COLLAPSE "&Colapsar" + IDS_GOTO_SUGGESTED_KEY "&Ir a '%s'" + IDS_FINISHEDFIND "Finalizado la busqueda del registro." +END + /*****************************************************************/ @@ -164,23 +357,73 @@ * Dialog */ -IDD_DIALOG1 DIALOG DISCARDABLE 50, 50, 268, 98 +IDD_EXPORTRANGE DIALOG DISCARDABLE 50, 50, 370, 50 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER FONT 8, "MS Sans Serif" BEGIN + GROUPBOX "Export Range",IDC_STATIC,2,0,366,48 + CONTROL "&All",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11 + CONTROL "S&elected Branch",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11 + EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12 END -IDD_DIALOG2 DIALOG DISCARDABLE 0, 0, 187, 95 +IDD_ADDFAVORITES DIALOG DISCARDABLE 0, 0, 186, 46 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dißlogo" +CAPTION "A±adir a Favoritos" FONT 8, "MS Sans Serif" BEGIN - DEFPUSHBUTTON "Aceptar",IDOK,130,7,50,14 - PUSHBUTTON "Cancelar",IDCANCEL,130,24,50,14 + DEFPUSHBUTTON "Aceptar",IDOK,129,7,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,129,24,50,14 + LTEXT "Nombre del &Favorito:",IDC_STATIC,7,7,70,10 + EDITTEXT IDC_FAVORITENAME,7,26,110,13,ES_AUTOHSCROLL END +IDD_REMOVEFAVORITES DIALOG DISCARDABLE 0, 0, 164, 135 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Favorites" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "Aceptar",IDOK,107,114,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,7,114,50,14 + CONTROL "Lista1",IDC_FAVORITESLIST,"SysListView32",LVS_LIST | + WS_BORDER | WS_TABSTOP,7,20,150,90 + LTEXT "Select Favorite(s):",IDC_STATIC,7,7,99,12 +END +IDD_FIND DIALOG DISCARDABLE 0, 0, 254, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Encontrar" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "&Encontrar Pr¾ximo",IDOK,197,7,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,197,24,50,14 + GROUPBOX "Mirar a",IDC_STATIC,7,25,63,51 + LTEXT "Encontrar& que:",IDC_STATIC,7,8,37,10 + EDITTEXT IDC_FINDWHAT,47,7,142,13,ES_AUTOHSCROLL + CONTROL "&Claves",IDC_LOOKAT_KEYS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,36,35,8 + CONTROL "&Valores",IDC_LOOKAT_VALUES,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,48,36,8 + CONTROL "&Data",IDC_LOOKAT_DATA,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,60,42,8 + CONTROL "Match &whole string only",IDC_MATCHSTRING,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,83,32,94,13 + CONTROL "Match &case",IDC_MATCHCASE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,83,48,90,12 +END + +IDD_FINDING DIALOGEX 0, 0, 145, 50 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | + WS_CAPTION | WS_SYSMENU +CAPTION "Find" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + ICON IDI_REGEDIT,IDC_STATIC,7,7,20,20 + PUSHBUTTON "&Cancelar",IDCANCEL,93,29,45,14 + LTEXT "Buscando en el registro...",IDC_STATIC,33,12,83,8 +END + /* * TEXTINCLUDE */ @@ -199,8 +442,8 @@ /* *STRINGTABLE DISCARDABLE *BEGIN - * ID_HELP_HELPTOPICS "Opens Registry Editor Help." - * ID_HELP_ABOUT "Displays program information, version number, and copyright." + * ID_HELP_HELPTOPICS "Abre la ayuda de registry editor." + * ID_HELP_ABOUT "Despliega informaci¾n del programa, version y licensia." *END */

18 years, 9 months

[royce] 19743: enhance generated msvc projects - patch by Brezenbak

by royce＠svn.reactos.com

enhance generated msvc projects - patch by Brezenbak Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-29 02:40:18 UTC (rev 19742) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-29 06:24:56 UTC (rev 19743) @@ -56,6 +56,7 @@ bool lib = (module.type == ObjectLibrary) || (module_type == ".lib") || (module_type == ".a"); bool dll = (module_type == ".dll") || (module_type == ".cpl"); bool exe = (module_type == ".exe"); + bool sys = (module_type == ".sys"); // TODO FIXME - need more checks here for 'sys' and possibly 'drv'? bool console = exe && (module.type == Win32CUI); @@ -172,6 +173,7 @@ } string default_cfg = cfgs.back(); + string include_string; fprintf ( OUT, "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>\r\n" ); fprintf ( OUT, "<VisualStudioProject\r\n" ); @@ -232,7 +234,9 @@ { if ( multiple_includes ) fprintf ( OUT, ";" ); + fprintf ( OUT, "%s", include.c_str() ); + include_string += " /I " + include; multiple_includes = true; } } @@ -293,7 +297,7 @@ { fprintf ( OUT, "\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t\tName=\"VCLibrarianTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s%s\"/>\r\n", module.name.c_str(), module_type.c_str() ); + fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s.lib\"/>\r\n", module.name.c_str() ); } else { @@ -316,7 +320,32 @@ if ( debug ) fprintf ( OUT, "\t\t\t\tProgramDatabaseFile=\"$(OutDir)/%s.pdb\"\r\n", module.name.c_str() ); - fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 ); + if ( sys ) + { + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /DRIVER /ALIGN:0x20 /subsystem:NATIVE /SECTION:INIT,D /FORCE:MULTIPLE /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); + fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint == "" ? "DriverEntry" : module.entrypoint.c_str ()); + fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", module.baseaddress == "" ? "0x10000" : module.baseaddress.c_str ()); + } + else if ( exe ) + { + if( module.non_if_data.compilationUnits.size () > 0 ) /* native apps */ + { + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SUBSYSTEM:NATIVE /SECTION:INIT,D /ALIGN:4096 /FORCE:MULTIPLE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + } + else /* non native apps */ + { + fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 ); + } + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint.c_str ()); + fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", module.baseaddress.c_str ()); + } + else if ( dll) + { + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint == "" ? "DllMain" : module.entrypoint.c_str ()); + fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", module.baseaddress == "" ? "0x40000" : module.baseaddress.c_str ()); + } fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 ); } @@ -364,26 +393,33 @@ fprintf ( OUT, "\t\t\tFilter=\"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;S\">\r\n" ); for ( size_t isrcfile = 0; isrcfile < source_files.size(); isrcfile++ ) { - const string& source_file = DosSeparator(source_files[isrcfile]); + string source_file = DosSeparator(source_files[isrcfile]); fprintf ( OUT, "\t\t\t<File\r\n" ); fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", source_file.c_str() ); - if (configuration.VSProjectVersion < "8.00") { - if (source_file.at(source_file.size() - 1) == 'S') { - for ( size_t iconfig = 0; iconfig < cfgs.size(); iconfig++ ) - { - std::string& config = cfgs[iconfig]; - fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" ); - fprintf ( OUT, "\t\t\t\t\tName=\"" ); - fprintf ( OUT, config.c_str()); - fprintf ( OUT, "|Win32\">\r\n" ); - fprintf ( OUT, "\t\t\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"cl /E "$(InputPath)" | as -o "$(OutDir)\\$(InputName).obj"\"\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"/>\r\n" ); - fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" ); - } + source_file.erase(0,2); + source_file = _replace_str(source_file, "\\", "-"); + string src_string = source_file.substr(0, source_file.find(".")); + for ( size_t iconfig = 0; iconfig < cfgs.size(); iconfig++ ) + { + std::string& config = cfgs[iconfig]; + fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" ); + fprintf ( OUT, "\t\t\t\t\tName=\"" ); + fprintf ( OUT, config.c_str() ); + fprintf ( OUT, "|Win32\">\r\n" ); + fprintf ( OUT, "\t\t\t\t\t<Tool\r\n" ); + if (source_file.at(source_file.size() - 1) == 'c' || source_file.find(".cpp") != string::npos) + { + fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCLCompilerTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tObjectFile=\"$(OutDir)\\%s.obj\"/>\r\n", src_string.c_str()); } + else if (configuration.VSProjectVersion < "8.00" && (source_file.find(".asm") != string::npos || tolower(source_file.at(source_file.size() - 1)) == 's')) + { + fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"cl /E "$(InputPath)" %s /D__ASM__ | as -o "$(OutDir)\\%s.obj"\"\r\n",include_string.c_str(), src_string.c_str() ); + fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\%s.obj\"/>\r\n",src_string.c_str() ); + } + fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" ); } fprintf ( OUT, "\t\t\t</File>\r\n" ); }

18 years, 9 months

← Newer
1
2
3
4
5
6
7
8
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005