Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[mf] 18228: a bit of Makefile and string constants cleanup
by mf＠svn.reactos.com 02 Oct '05

02 Oct '05

a bit of Makefile and string constants cleanup Modified: trunk/reactos/subsys/system/explorer/Makefile.MinGW Modified: trunk/reactos/subsys/system/explorer/Makefile.PCH Modified: trunk/reactos/subsys/system/explorer/Makefile.Wine Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.h _____ Modified: trunk/reactos/subsys/system/explorer/Makefile.MinGW --- trunk/reactos/subsys/system/explorer/Makefile.MinGW 2005-10-02 18:28:36 UTC (rev 18227) +++ trunk/reactos/subsys/system/explorer/Makefile.MinGW 2005-10-02 18:31:50 UTC (rev 18228) @@ -9,7 +9,7 @@ LINK = g++ # -D_NO_ALPHABLEND for builds without msimg32.dll dependency -CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -Wno-unused-value -I. -I$(EXPAT_INC) +CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. -I$(EXPAT_INC) RCFLAGS = -DWIN32 -D__WINDRES__ LFLAGS = -Wl,--subsystem,windows _____ Modified: trunk/reactos/subsys/system/explorer/Makefile.PCH --- trunk/reactos/subsys/system/explorer/Makefile.PCH 2005-10-02 18:28:36 UTC (rev 18227) +++ trunk/reactos/subsys/system/explorer/Makefile.PCH 2005-10-02 18:31:50 UTC (rev 18228) @@ -10,7 +10,7 @@ CXX = g++ LINK = g++ -CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -Wno-unused-value -I. -I$(EXPAT_INC) +CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. -I$(EXPAT_INC) RCFLAGS = -DWIN32 -D__WINDRES__ LFLAGS = -Wl,--subsystem,windows @@ -52,6 +52,7 @@ window.o \ dragdropimpl.o \ shellbrowserimpl.o \ + shellservices.o \ explorer.o \ entries.o \ winfs.o \ @@ -69,7 +70,6 @@ desktopbar.o \ taskbar.o \ startmenu.o \ - shellservices.o \ traynotify.o \ quicklaunch.o \ favorites.o \ _____ Modified: trunk/reactos/subsys/system/explorer/Makefile.Wine --- trunk/reactos/subsys/system/explorer/Makefile.Wine 2005-10-02 18:28:36 UTC (rev 18227) +++ trunk/reactos/subsys/system/explorer/Makefile.Wine 2005-10-02 18:31:50 UTC (rev 18228) @@ -126,7 +126,7 @@ LINT = LINTFLAGS = INCLUDES = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL) -EXTRACFLAGS = -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -Wno-unused-value +EXTRACFLAGS = -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith ALLCFLAGS = $(INCLUDES) $(DEFS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS) MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755 _____ Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp --- trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp 2005-10-02 18:28:36 UTC (rev 18227) +++ trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp 2005-10-02 18:31:50 UTC (rev 18228) @@ -46,9 +46,9 @@ // work around GCC's wide string constant bug #ifdef __GNUC__ -const LPCXSSTR XMLStorage::XS_TRUE = XS_TEXT("true"); -const LPCXSSTR XMLStorage::XS_FALSE = XS_TEXT("false"); -const LPCXSSTR XMLStorage::XS_NUMBERFMT = XS_TEXT("%d"); +const LPCXSSTR XMLStorage::XS_TRUE = XS_TRUE_STR; +const LPCXSSTR XMLStorage::XS_FALSE = XS_FALSE_STR; +const LPCXSSTR XMLStorage::XS_NUMBERFMT = XS_NUMBERFMT_STR; #endif _____ Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.h --- trunk/reactos/subsys/system/explorer/utility/xmlstorage.h 2005-10-02 18:28:36 UTC (rev 18227) +++ trunk/reactos/subsys/system/explorer/utility/xmlstorage.h 2005-10-02 18:31:50 UTC (rev 18228) @@ -1228,15 +1228,19 @@ }; +#define XS_TRUE_STR XS_TEXT("true") +#define XS_FALSE_STR XS_TEXT("false") +#define XS_NUMBERFMT_STR XS_TEXT("%d") + // work around GCC's wide string constant bug #ifdef __GNUC__ extern const LPCXSSTR XS_TRUE; extern const LPCXSSTR XS_FALSE; extern const LPCXSSTR XS_NUMBERFMT; #else -#define XS_TRUE XS_TEXT("true") -#define XS_FALSE XS_TEXT("false") -#define XS_NUMBERFMT XS_TEXT("%d") +#define XS_TRUE XS_TRUE_STR +#define XS_FALSE XS_FALSE_STR +#define XS_NUMBERFMT XS_NUMBERFMT_STR #endif

1 0

[mf] 18227: work around GCC's wide string constant bug to fix tree list image loading
by mf＠svn.reactos.com 02 Oct '05

02 Oct '05

work around GCC's wide string constant bug to fix tree list image loading Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.h 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/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-10-02 18:00:04 UTC (rev 18226) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-10-02 18:28:36 UTC (rev 18227) @@ -224,7 +224,7 @@ WS_CHILD|WS_TABSTOP|WS_BORDER|/*WS_VISIBLE|*/WS_CHILD|TVS_HASLINES|TVS_H ASBUTTONS|TVS_SHOWSELALWAYS|TVS_INFOTIP, -1, -1, 200, 0, _hwnd, (HMENU)IDW_SIDEBAR, g_Globals._hInstance, 0); - (void)TreeView_SetImageList(_hsidebar, _himl, TVSIL_NORMAL); + _himl_old = TreeView_SetImageList(_hsidebar, _himl, TVSIL_NORMAL); CheckMenuItem(_menu_info._hMenuView, ID_VIEW_SIDE_BAR, MF_BYCOMMAND|MF_UNCHECKED/*MF_CHECKED*/); @@ -266,6 +266,7 @@ MainFrameBase::~MainFrameBase() { + (void)TreeView_SetImageList(_hsidebar, _himl_old, TVSIL_NORMAL); ImageList_Destroy(_himl); // don't exit desktop when closing file manager window @@ -914,13 +915,13 @@ TCHAR buffer[MAX_PATH]; LPCTSTR path; - ShellPath shell_path = DesktopFolderPath(); + ShellPath root_path = DesktopFolderPath(); if (lparam) { if (wparam & OWM_PIDL) { // take over PIDL from lparam - shell_path.assign((LPCITEMIDLIST)lparam); // create as "rooted" window - FileSysShellPath fsp(shell_path); + root_path.assign((LPCITEMIDLIST)lparam); // create as "rooted" window + FileSysShellPath fsp(root_path); path = fsp; if (path) { @@ -931,7 +932,7 @@ } else { // take over path from lparam path = (LPCTSTR)lparam; - shell_path = path; // create as "rooted" window + root_path = path; // create as "rooted" window } } else { ///@todo read paths and window placements from registry @@ -949,7 +950,7 @@ OBJ_CONTEXT("create ShellChildWndInfo", path); // Shell Namespace as default view - ShellChildWndInfo create_info(_hmdiclient, path, shell_path); + ShellChildWndInfo create_info(_hmdiclient, path, root_path); create_info._pos.showCmd = wparam&OWM_SEPARATE? SW_SHOWNORMAL: SW_SHOWMAXIMIZED; create_info._pos.rcNormalPosition.left = CW_USEDEFAULT; @@ -1442,13 +1443,13 @@ TCHAR buffer[MAX_PATH]; LPCTSTR path; - ShellPath shell_path = DesktopFolderPath(); + ShellPath root_path = DesktopFolderPath(); if (lparam) { if (wparam & OWM_PIDL) { // take over PIDL from lparam - shell_path.assign((LPCITEMIDLIST)lparam); // create as "rooted" window - FileSysShellPath fsp(shell_path); + root_path.assign((LPCITEMIDLIST)lparam); // create as "rooted" window + FileSysShellPath fsp(root_path); path = fsp; if (path) { @@ -1459,7 +1460,7 @@ } else { // take over path from lparam path = (LPCTSTR)lparam; - shell_path = path; // create as "rooted" window + root_path = path; // create as "rooted" window } } else { ///@todo read paths and window placements from registry @@ -1467,10 +1468,10 @@ *buffer = '\0'; path = buffer; - shell_path = path; + root_path = path; } - jump_to(shell_path, (OPEN_WINDOW_MODE)wparam); //@todo content of 'path' not used any more + jump_to(root_path, (OPEN_WINDOW_MODE)wparam); //@todo content of 'path' not used any more return TRUE;} // success default: def: _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.h --- trunk/reactos/subsys/system/explorer/shell/mainframe.h 2005-10-02 18:00:04 UTC (rev 18226) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.h 2005-10-02 18:28:36 UTC (rev 18227) @@ -52,15 +52,16 @@ WindowHandle _hsidebar; HIMAGELIST _himl; - HMENU _hMenuFrame; - HMENU _hMenuWindow; + HMENU _hMenuFrame; + HMENU _hMenuWindow; - MenuInfo _menu_info; + MenuInfo _menu_info; protected: FullScreenParameters _fullscreen; - HACCEL _hAccel; + HACCEL _hAccel; + HIMAGELIST _himl_old; LRESULT WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam); bool ProcessMessage(UINT nmsg, WPARAM wparam, LPARAM lparam, LRESULT* pres); _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-10-02 18:00:04 UTC (rev 18226) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-10-02 18:28:36 UTC (rev 18227) @@ -31,6 +31,12 @@ #include "../resource.h" + // work around GCC's wide string constant bug +#ifdef __GNUC__ +const LPCTSTR C_DRIVE = C_DRIVE_STR; +#endif + + ShellBrowser::ShellBrowser(HWND hwnd, HWND left_hwnd, WindowHandle& right_hwnd, ShellPathInfo& create_info, HIMAGELIST himl, BrowserCallback* cb, CtxMenuInterfaces& cm_ifs) #ifndef __MINGW32__ // IShellFolderViewCB missing in MinGW (as of 25.09.2005) @@ -55,7 +61,7 @@ ShellBrowser::~ShellBrowser() { - (void)TreeView_SetImageList(_left_hwnd, 0, TVSIL_NORMAL); + (void)TreeView_SetImageList(_left_hwnd, _himl_old, TVSIL_NORMAL); if (_pShellView) _pShellView->Release(); @@ -146,7 +152,7 @@ { CONTEXT("ShellBrowserChild::InitializeTree()"); - (void)TreeView_SetImageList(_left_hwnd, himl, TVSIL_NORMAL); + _himl_old = TreeView_SetImageList(_left_hwnd, himl, TVSIL_NORMAL); TreeView_SetScrollTime(_left_hwnd, 100); TV_INSERTSTRUCT tvInsert; _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.h --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.h 2005-10-02 18:00:04 UTC (rev 18226) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.h 2005-10-02 18:28:36 UTC (rev 18227) @@ -148,6 +148,7 @@ WindowHandle& _right_hwnd; ShellPathInfo& _create_info; HIMAGELIST _himl; + HIMAGELIST _himl_old; BrowserCallback* _callback; WindowHandle _hWndFrame; @@ -175,6 +176,15 @@ }; +#define C_DRIVE_STR TEXT("C:\\") + + // work around GCC's wide string constant bug +#ifdef __GNUC__ +extern const LPCTSTR C_DRIVE; +#else +#define C_DRIVE C_DRIVE_STR +#endif + template<typename BASE> struct ShellBrowserChildT : public BASE, public BrowserCallback { @@ -198,8 +208,8 @@ { SHFILEINFO sfi; - _himlSmall = (HIMAGELIST)SHGetFileInfo(TEXT("C:\\"), 0, &sfi, sizeof(SHFILEINFO), SHGFI_SYSICONINDEX|SHGFI_SMALLICON); -// _himlLarge = (HIMAGELIST)SHGetFileInfo(TEXT("C:\\"), 0, &sfi, sizeof(SHFILEINFO), SHGFI_SYSICONINDEX|SHGFI_LARGEICON); + _himlSmall = (HIMAGELIST)SHGetFileInfo(C_DRIVE, 0, &sfi, sizeof(SHFILEINFO), SHGFI_SYSICONINDEX|SHGFI_SMALLICON); +// _himlLarge = (HIMAGELIST)SHGetFileInfo(C_DRIVE, 0, &sfi, sizeof(SHFILEINFO), SHGFI_SYSICONINDEX|SHGFI_LARGEICON); } protected:

1 0

[ea] 18226: Fix compilation.
by ea＠svn.reactos.com 02 Oct '05

02 Oct '05

Fix compilation. Modified: trunk/reactos/subsys/csr/csrsrv/api.c _____ Modified: trunk/reactos/subsys/csr/csrsrv/api.c --- trunk/reactos/subsys/csr/csrsrv/api.c 2005-10-02 17:54:56 UTC (rev 18225) +++ trunk/reactos/subsys/csr/csrsrv/api.c 2005-10-02 18:00:04 UTC (rev 18226) @@ -685,9 +685,9 @@ NTAPI CsrApiHandleConnectionRequest(IN PCSR_API_MESSAGE ApiMessage) { - PCSR_THREAD CsrThread; - PCSR_PROCESS CsrProcess; - NTSTATUS Status; + PCSR_THREAD CsrThread = NULL; + PCSR_PROCESS CsrProcess = NULL; + NTSTATUS Status = STATUS_SUCCESS; PCSR_CONNECTION_INFO ConnectInfo = &ApiMessage->ConnectionInfo; BOOLEAN AllowConnection = FALSE; REMOTE_PORT_VIEW RemotePortView;

1 0

[ea] 18225: Support all optional modules and possibly a 'windows' one where every piece of code related to the Win32 subsystem will be stored (eventually to be voted on, I suppose).
by ea＠svn.reactos.com 02 Oct '05

02 Oct '05

Support all optional modules and possibly a 'windows' one where every piece of code related to the Win32 subsystem will be stored (eventually to be voted on, I suppose). The idea of moving the Win32 emulation out of the main ros tree popped up days ago in a chat session with Filip (cleaning it would help those who want an embeddable ros or a native only ros). Modified: trunk/reactos/modules/directory.xml _____ Modified: trunk/reactos/modules/directory.xml --- trunk/reactos/modules/directory.xml 2005-10-02 17:41:30 UTC (rev 18224) +++ trunk/reactos/modules/directory.xml 2005-10-02 17:54:56 UTC (rev 18225) @@ -1,37 +1,44 @@ <group> -<directory name="posix"> - <xi:include href="posix/directory.xml"> - <xi:fallback> - <xi:include href="empty.xml" /> - </xi:fallback> - </xi:include> -</directory> -<directory name="os2"> - <xi:include href="os2/directory.xml"> - <xi:fallback> - <xi:include href="empty.xml" /> - </xi:fallback> - </xi:include> -</directory> -<directory name="rosapps"> - <xi:include href="rosapps/directory.xml"> - <xi:fallback> - <xi:include href="empty.xml" /> - </xi:fallback> - </xi:include> -</directory> -<directory name="rosky"> - <xi:include href="rosky/directory.xml"> - <xi:fallback> - <xi:include href="empty.xml" /> - </xi:fallback> - </xi:include> -</directory> -<directory name="vms"> - <xi:include href="vms/directory.xml"> - <xi:fallback> - <xi:include href="empty.xml" /> - </xi:fallback> - </xi:include> -</directory> + <directory name="os2"> + <xi:include href="os2/directory.xml"> + <xi:fallback> + <xi:include href="empty.xml" /> + </xi:fallback> + </xi:include> + </directory> + <directory name="posix"> + <xi:include href="posix/directory.xml"> + <xi:fallback> + <xi:include href="empty.xml" /> + </xi:fallback> + </xi:include> + </directory> + <directory name="rosapps"> + <xi:include href="rosapps/directory.xml"> + <xi:fallback> + <xi:include href="empty.xml" /> + </xi:fallback> + </xi:include> + </directory> + <directory name="rosky"> + <xi:include href="rosky/directory.xml"> + <xi:fallback> + <xi:include href="empty.xml" /> + </xi:fallback> + </xi:include> + </directory> + <directory name="vms"> + <xi:include href="vms/directory.xml"> + <xi:fallback> + <xi:include href="empty.xml" /> + </xi:fallback> + </xi:include> + </directory> + <directory name="windows"> + <xi:include href="windows/directory.xml"> + <xi:fallback> + <xi:include href="empty.xml" /> + </xi:fallback> + </xi:include> + </directory> </group>

1 0

[ea] 18224: csr.exe uses nt startup library.
by ea＠svn.reactos.com 02 Oct '05

02 Oct '05

csr.exe uses nt startup library. Modified: trunk/reactos/subsys/csr/csr.xml _____ Modified: trunk/reactos/subsys/csr/csr.xml --- trunk/reactos/subsys/csr/csr.xml 2005-10-02 17:39:54 UTC (rev 18223) +++ trunk/reactos/subsys/csr/csr.xml 2005-10-02 17:41:30 UTC (rev 18224) @@ -3,7 +3,7 @@ <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0501</define> - <library>ntrt0lib</library> + <library>nt</library> <library>ntdll</library> <library>csrsrv</library> <file>main.c</file>

1 0

[ea] 18223: Rename the XML chunk too.
by ea＠svn.reactos.com 02 Oct '05

02 Oct '05

Rename the XML chunk too. Added: trunk/reactos/lib/nt/nt.xml Deleted: trunk/reactos/lib/nt/ntrt0lib.xml _____ Copied: trunk/reactos/lib/nt/nt.xml (from rev 18222, trunk/reactos/lib/nt/ntrt0lib.xml) _____ Deleted: trunk/reactos/lib/nt/ntrt0lib.xml --- trunk/reactos/lib/nt/ntrt0lib.xml 2005-10-02 17:38:28 UTC (rev 18222) +++ trunk/reactos/lib/nt/ntrt0lib.xml 2005-10-02 17:39:54 UTC (rev 18223) @@ -1,4 +0,0 @@ -<module name="nt" type="staticlibrary"> - <define name="_DISABLE_TIDENTS" /> - <file>entry_point.c</file> -</module>

1 0

[ea] 18222: Give ntrt0lib its public name.
by ea＠svn.reactos.com 02 Oct '05

02 Oct '05

Give ntrt0lib its public name. Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/lib/nt/ Modified: trunk/reactos/lib/nt/ntrt0lib.xml Deleted: trunk/reactos/lib/ntrt0lib/ _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-10-02 16:58:35 UTC (rev 18221) +++ trunk/reactos/lib/directory.xml 2005-10-02 17:38:28 UTC (rev 18222) @@ -170,8 +170,8 @@ <directory name="newdev"> <xi:include href="newdev/newdev.xml" /> </directory> -<directory name="ntrt0lib"> - <xi:include href="ntrt0lib/ntrt0lib.xml" /> +<directory name="nt"> + <xi:include href="nt/nt.xml" /> </directory> <directory name="ntdll"> <xi:include href="ntdll/ntdll.xml" /> _____ Copied: trunk/reactos/lib/nt (from rev 18221, trunk/reactos/lib/ntrt0lib) _____ Modified: trunk/reactos/lib/nt/ntrt0lib.xml --- trunk/reactos/lib/ntrt0lib/ntrt0lib.xml 2005-10-02 16:58:35 UTC (rev 18221) +++ trunk/reactos/lib/nt/ntrt0lib.xml 2005-10-02 17:38:28 UTC (rev 18222) @@ -1,4 +1,4 @@ -<module name="ntrt0lib" type="staticlibrary"> +<module name="nt" type="staticlibrary"> <define name="_DISABLE_TIDENTS" /> <file>entry_point.c</file> </module>

1 0

[ion] 18221: - Implement Native Entrypoint for our NT.LIB
by ion＠svn.reactos.com 02 Oct '05

02 Oct '05

- Implement Native Entrypoint for our NT.LIB Deleted: trunk/reactos/lib/ntrt0lib/args.c Modified: trunk/reactos/lib/ntrt0lib/entry_point.c Deleted: trunk/reactos/lib/ntrt0lib/ntrt0.h Modified: trunk/reactos/lib/ntrt0lib/ntrt0lib.xml _____ Deleted: trunk/reactos/lib/ntrt0lib/args.c --- trunk/reactos/lib/ntrt0lib/args.c 2005-10-02 16:23:26 UTC (rev 18220) +++ trunk/reactos/lib/ntrt0lib/args.c 2005-10-02 16:58:35 UTC (rev 18221) @@ -1,21 +0,0 @@ -/* $Id$ - * - * ReactOS Operating System - */ -#include "ntrt0.h" - -#define NDEBUG -#include <debug.h> - -/********************************************************************** - * NAME - * NtRtParseCommandLine/2 - */ -NTSTATUS STDCALL NtRtParseCommandLine (PPEB Peb, int * argc, char ** argv) -{ - *argc=0; - argv[0]=NULL; - //TODO - return STATUS_SUCCESS; -} -/* EOF */ _____ Modified: trunk/reactos/lib/ntrt0lib/entry_point.c --- trunk/reactos/lib/ntrt0lib/entry_point.c 2005-10-02 16:23:26 UTC (rev 18220) +++ trunk/reactos/lib/ntrt0lib/entry_point.c 2005-10-02 16:58:35 UTC (rev 18221) @@ -1,40 +1,144 @@ -/* $Id$ - * - * ReactOS Operating System +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: lib/nt/entry_point.c + * PURPOSE: Native NT Runtime Library + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ -#include "ntrt0.h" +/* INCLUDES ******************************************************************/ + +/* PSDK/NDK Headers */ +#include <stdio.h> +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + +NTSTATUS +__cdecl +_main( + int argc, + char *argv[], + char *envp[], + ULONG DebugFlag +); + #define NDEBUG #include <debug.h> -#ifdef NDEBUG -#define NTRT_DEBUG_FLAG 0 -#else -#define NTRT_DEBUG_FLAG 1 -#endif +/* FUNCTIONSS ****************************************************************/ -int argc = 0; -char * argv [32] = {NULL}; -char * envp = NULL; +VOID +STDCALL +NtProcessStartup(PPEB Peb) +{ + NTSTATUS Status; + PRTL_USER_PROCESS_PARAMETERS ProcessParameters; + PUNICODE_STRING CmdLineString; + ANSI_STRING AnsiCmdLine; + PCHAR NullPointer = NULL; + INT argc = 0; + PCHAR *argv; + PCHAR *envp; + PCHAR *ArgumentList; + PCHAR Source, Destination; + ULONG Length; + ASSERT(Peb); -/* Native process' entry point */ + /* Normalize and get the Process Parameters */ + ProcessParameters = RtlNormalizeProcessParams(Peb->ProcessParameters); + ASSERT(ProcessParameters); -VOID STDCALL NtProcessStartup (PPEB Peb) -{ - NTSTATUS Status = STATUS_SUCCESS; + /* Allocate memory for the argument list, enough for 512 tokens */ + ArgumentList = RtlAllocateHeap(Peb->ProcessHeap, 0, 512 * sizeof(PCHAR)); - /* - * Parse the command line. - */ - Status = NtRtParseCommandLine (Peb, & argc, argv); - if (STATUS_SUCCESS != Status) - { - DPRINT1("NT: %s: NtRtParseCommandLine failed (Status=0x%08lx)\n", - __FUNCTION__, Status); - } - /* - * Call the user main - */ - (void) _main (argc, argv, & envp, NTRT_DEBUG_FLAG); + /* Use a null pointer as default */ + argv = &NullPointer; + envp = &NullPointer; + + /* Set the first pointer to NULL, and set the argument array to the buffer */ + *ArgumentList = NULL; + argv = ArgumentList; + + /* Get the pointer to the Command Line */ + CmdLineString = &ProcessParameters->CommandLine; + + /* If we don't have a command line, use the image path instead */ + if (!CmdLineString->Buffer || !CmdLineString->Length) + { + CmdLineString = &ProcessParameters->ImagePathName; + } + + /* Convert it to an ANSI string */ + RtlUnicodeStringToAnsiString(&AnsiCmdLine, CmdLineString, TRUE); + + /* Save parameters for parsing */ + Source = AnsiCmdLine.Buffer; + Length = AnsiCmdLine.Length; + + /* Ensure it's valid */ + if (Source) + { + /* Allocate a buffer for the destination */ + Destination = RtlAllocateHeap(Peb->ProcessHeap, 0, Length + sizeof(WCHAR)); + + /* Start parsing */ + while (*Source) + { + /* Skip the white space. */ + while (*Source && *Source <= ' ') Source++; + + /* Copy until the next white space is reached */ + if (*Source) + { + /* Save one token pointer */ + *ArgumentList++ = Destination; + + /* Increase one token count */ + argc++; + + /* Copy token until white space */ + while (*Source > ' ') *Destination++ = *Source++; + + /* Null terminate it */ + *Destination++ = '\0'; + } + } + } + + /* Null terminate the token pointer list */ + *ArgumentList++ = NULL; + + /* Now handle the enviornment, point the envp at our current list location. */ + envp = ArgumentList; + + /* Change our source to the enviroment pointer */ + Source = (PCHAR)ProcessParameters->Environment; + + /* Simply do a direct copy */ + if (Source) + { + while (*Source) + { + /* Save a pointer to this token */ + *ArgumentList++ = Source; + + /* Keep looking for another variable */ + while (*Source++); + } + } + + /* Null terminate the list again */ + *ArgumentList++ = NULL; + + /* Breakpoint if we were requested to do so */ + if (ProcessParameters->DebugFlags) DbgBreakPoint(); + + /* Call the Main Function */ + Status = _main(argc, argv, envp, ProcessParameters->DebugFlags); + + /* We're done here */ + NtTerminateProcess(NtCurrentProcess(), Status); } + /* EOF */ _____ Deleted: trunk/reactos/lib/ntrt0lib/ntrt0.h --- trunk/reactos/lib/ntrt0lib/ntrt0.h 2005-10-02 16:23:26 UTC (rev 18220) +++ trunk/reactos/lib/ntrt0lib/ntrt0.h 2005-10-02 16:58:35 UTC (rev 18221) @@ -1,16 +0,0 @@ -#if !defined(_NTRT0_H) -#define _NTRT0_H - -/* PSDK/NDK Headers */ -#include <stdio.h> -#include <windows.h> - -#define NTOS_MODE_USER -#include <ndk/ntndk.h> - -extern int _cdecl _main(int,char**,char**,int); - -NTSTATUS STDCALL NtRtParseCommandLine (PPEB,int*,char**); - -#endif /* !def _NTRT0_H */ - _____ Modified: trunk/reactos/lib/ntrt0lib/ntrt0lib.xml --- trunk/reactos/lib/ntrt0lib/ntrt0lib.xml 2005-10-02 16:23:26 UTC (rev 18220) +++ trunk/reactos/lib/ntrt0lib/ntrt0lib.xml 2005-10-02 16:58:35 UTC (rev 18221) @@ -1,5 +1,4 @@ <module name="ntrt0lib" type="staticlibrary"> <define name="_DISABLE_TIDENTS" /> - <file>args.c</file> <file>entry_point.c</file> </module>

1 0

[ea] 18220: csr.exe is built using ntrt0lib.
by ea＠svn.reactos.com 02 Oct '05

02 Oct '05

csr.exe is built using ntrt0lib. Modified: trunk/reactos/subsys/csr/csr.xml _____ Modified: trunk/reactos/subsys/csr/csr.xml --- trunk/reactos/subsys/csr/csr.xml 2005-10-02 16:09:30 UTC (rev 18219) +++ trunk/reactos/subsys/csr/csr.xml 2005-10-02 16:23:26 UTC (rev 18220) @@ -3,6 +3,7 @@ <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0501</define> + <library>ntrt0lib</library> <library>ntdll</library> <library>csrsrv</library> <file>main.c</file>

1 0

[ea] 18219: A do-nothing crt0 for native NT processes.
by ea＠svn.reactos.com 02 Oct '05

02 Oct '05

A do-nothing crt0 for native NT processes. (see note by A.Ionescu in reactos/subsys/crt/main.c) Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/lib/ntrt0lib/ Added: trunk/reactos/lib/ntrt0lib/args.c Added: trunk/reactos/lib/ntrt0lib/entry_point.c Added: trunk/reactos/lib/ntrt0lib/ntrt0.h Added: trunk/reactos/lib/ntrt0lib/ntrt0lib.xml _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-10-02 15:59:15 UTC (rev 18218) +++ trunk/reactos/lib/directory.xml 2005-10-02 16:09:30 UTC (rev 18219) @@ -170,6 +170,9 @@ <directory name="newdev"> <xi:include href="newdev/newdev.xml" /> </directory> +<directory name="ntrt0lib"> + <xi:include href="ntrt0lib/ntrt0lib.xml" /> +</directory> <directory name="ntdll"> <xi:include href="ntdll/ntdll.xml" /> </directory> _____ Added: trunk/reactos/lib/ntrt0lib/args.c --- trunk/reactos/lib/ntrt0lib/args.c 2005-10-02 15:59:15 UTC (rev 18218) +++ trunk/reactos/lib/ntrt0lib/args.c 2005-10-02 16:09:30 UTC (rev 18219) @@ -0,0 +1,21 @@ +/* $Id$ + * + * ReactOS Operating System + */ +#include "ntrt0.h" + +#define NDEBUG +#include <debug.h> + +/********************************************************************** + * NAME + * NtRtParseCommandLine/2 + */ +NTSTATUS STDCALL NtRtParseCommandLine (PPEB Peb, int * argc, char ** argv) +{ + *argc=0; + argv[0]=NULL; + //TODO + return STATUS_SUCCESS; +} +/* EOF */ Property changes on: trunk/reactos/lib/ntrt0lib/args.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/ntrt0lib/entry_point.c --- trunk/reactos/lib/ntrt0lib/entry_point.c 2005-10-02 15:59:15 UTC (rev 18218) +++ trunk/reactos/lib/ntrt0lib/entry_point.c 2005-10-02 16:09:30 UTC (rev 18219) @@ -0,0 +1,40 @@ +/* $Id$ + * + * ReactOS Operating System + */ +#include "ntrt0.h" + +#define NDEBUG +#include <debug.h> + +#ifdef NDEBUG +#define NTRT_DEBUG_FLAG 0 +#else +#define NTRT_DEBUG_FLAG 1 +#endif + +int argc = 0; +char * argv [32] = {NULL}; +char * envp = NULL; + +/* Native process' entry point */ + +VOID STDCALL NtProcessStartup (PPEB Peb) +{ + NTSTATUS Status = STATUS_SUCCESS; + + /* + * Parse the command line. + */ + Status = NtRtParseCommandLine (Peb, & argc, argv); + if (STATUS_SUCCESS != Status) + { + DPRINT1("NT: %s: NtRtParseCommandLine failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + } + /* + * Call the user main + */ + (void) _main (argc, argv, & envp, NTRT_DEBUG_FLAG); +} +/* EOF */ Property changes on: trunk/reactos/lib/ntrt0lib/entry_point.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/ntrt0lib/ntrt0.h --- trunk/reactos/lib/ntrt0lib/ntrt0.h 2005-10-02 15:59:15 UTC (rev 18218) +++ trunk/reactos/lib/ntrt0lib/ntrt0.h 2005-10-02 16:09:30 UTC (rev 18219) @@ -0,0 +1,16 @@ +#if !defined(_NTRT0_H) +#define _NTRT0_H + +/* PSDK/NDK Headers */ +#include <stdio.h> +#include <windows.h> + +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + +extern int _cdecl _main(int,char**,char**,int); + +NTSTATUS STDCALL NtRtParseCommandLine (PPEB,int*,char**); + +#endif /* !def _NTRT0_H */ + Property changes on: trunk/reactos/lib/ntrt0lib/ntrt0.h ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/ntrt0lib/ntrt0lib.xml --- trunk/reactos/lib/ntrt0lib/ntrt0lib.xml 2005-10-02 15:59:15 UTC (rev 18218) +++ trunk/reactos/lib/ntrt0lib/ntrt0lib.xml 2005-10-02 16:09:30 UTC (rev 18219) @@ -0,0 +1,5 @@ +<module name="ntrt0lib" type="staticlibrary"> + <define name="_DISABLE_TIDENTS" /> + <file>args.c</file> + <file>entry_point.c</file> +</module> Property changes on: trunk/reactos/lib/ntrt0lib/ntrt0lib.xml ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native

1 0

← Newer
1
...
67
68
69
70
71
72
73
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005