Author: akhaldi Date: Sat Feb 18 23:01:24 2012 New Revision: 55686
URL: http://svn.reactos.org/svn/reactos?rev=55686&view=rev Log: * Sync up to trunk r55685.
Modified: branches/arty-newcc/ (props changed) branches/arty-newcc/base/applications/cmdutils/find/find.rc (contents, props changed) branches/arty-newcc/base/setup/reactos/lang/en-US.rc (contents, props changed) branches/arty-newcc/base/setup/welcome/welcome.rc (contents, props changed) branches/arty-newcc/dll/cpl/main/main.rc (contents, props changed) branches/arty-newcc/dll/win32/devmgr/devmgr.rc (contents, props changed) branches/arty-newcc/dll/win32/kernel32/client/dllmain.c branches/arty-newcc/dll/win32/syssetup/syssetup.rc (contents, props changed) branches/arty-newcc/dll/win32/user32/user32.rc (contents, props changed) branches/arty-newcc/dll/win32/userenv/userenv.rc (contents, props changed) branches/arty-newcc/hal/halx86/mp/mps.S (contents, props changed) branches/arty-newcc/include/reactos/version.rc (contents, props changed) branches/arty-newcc/tools/cabman/makefile.win32 (contents, props changed)
Propchange: branches/arty-newcc/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 18 23:01:24 2012 @@ -13,4 +13,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:50808-55680 +/trunk/reactos:50808-55685
Modified: branches/arty-newcc/base/applications/cmdutils/find/find.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/applications/cmd... ============================================================================== --- branches/arty-newcc/base/applications/cmdutils/find/find.rc [iso-8859-1] (original) +++ branches/arty-newcc/base/applications/cmdutils/find/find.rc [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,4 +1,3 @@ -/* $Id$ */ #define REACTOS_STR_FILE_DESCRIPTION "W32 find command\0" #define REACTOS_STR_INTERNAL_NAME "find\0" #define REACTOS_STR_ORIGINAL_FILENAME "find.exe\0"
Propchange: branches/arty-newcc/base/applications/cmdutils/find/find.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision
Modified: branches/arty-newcc/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/setup/reactos/la... ============================================================================== --- branches/arty-newcc/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ branches/arty-newcc/base/setup/reactos/lang/en-US.rc [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,5 +1,3 @@ -/* $Id$ */ - LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
IDD_STARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193
Propchange: branches/arty-newcc/base/setup/reactos/lang/en-US.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision
Modified: branches/arty-newcc/base/setup/welcome/welcome.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/setup/welcome/we... ============================================================================== --- branches/arty-newcc/base/setup/welcome/welcome.rc [iso-8859-1] (original) +++ branches/arty-newcc/base/setup/welcome/welcome.rc [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,5 +1,3 @@ -/* $Id$ */ - #include <windows.h> #include "resource.h"
Propchange: branches/arty-newcc/base/setup/welcome/welcome.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision
Modified: branches/arty-newcc/dll/cpl/main/main.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/cpl/main/main.rc?... ============================================================================== --- branches/arty-newcc/dll/cpl/main/main.rc [iso-8859-1] (original) +++ branches/arty-newcc/dll/cpl/main/main.rc [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,5 +1,3 @@ -/* $Id$ */ - #include <windows.h> #include "resource.h"
Propchange: branches/arty-newcc/dll/cpl/main/main.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision
Modified: branches/arty-newcc/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/devmgr/devm... ============================================================================== --- branches/arty-newcc/dll/win32/devmgr/devmgr.rc [iso-8859-1] (original) +++ branches/arty-newcc/dll/win32/devmgr/devmgr.rc [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,5 +1,3 @@ -/* $Id$ */ - #include <windows.h> #include "resource.h"
Propchange: branches/arty-newcc/dll/win32/devmgr/devmgr.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision
Modified: branches/arty-newcc/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/kernel32/cl... ============================================================================== --- branches/arty-newcc/dll/win32/kernel32/client/dllmain.c [iso-8859-1] (original) +++ branches/arty-newcc/dll/win32/kernel32/client/dllmain.c [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -68,7 +68,10 @@ PRTL_USER_PROCESS_PARAMETERS Parameters = NtCurrentPeb()->ProcessParameters; LPCWSTR ExeName; STARTUPINFO si; - + WCHAR SessionDir[256]; + ULONG SessionId = NtCurrentPeb()->SessionId; + BOOLEAN InServer; + WCHAR lpTest[MAX_PATH]; GetModuleFileNameW(NULL, lpTest, MAX_PATH); DPRINT("BasepInitConsole for : %S\n", lpTest); @@ -136,6 +139,38 @@
/* Now use the proper console handle */ Request.Data.AllocConsoleRequest.Console = Parameters->ConsoleHandle; + + /* Setup the right Object Directory path */ + if (!SessionId) + { + /* Use the raw path */ + wcscpy(SessionDir, WIN_OBJ_DIR); + } + else + { + /* Use the session path */ + swprintf(SessionDir, + L"%ws\%ld%ws", + SESSION_DIR, + SessionId, + WIN_OBJ_DIR); + } + + /* Connect to the base server */ + DPRINT("Connecting to CSR...\n"); + Status = CsrClientConnectToServer(SessionDir, + 2, + NULL, + NULL, + &InServer); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to connect to CSR (Status %lx)\n", Status); + return FALSE; + } + + /* Nothing to do for server-to-server */ + if (InServer) return TRUE;
/* * Normally, we should be connecting to the Console CSR Server... @@ -156,6 +191,7 @@ return TRUE; }
+ /* Nothing to do if not a console app */ if (NotConsole) return TRUE;
/* We got the handles, let's set them */
Modified: branches/arty-newcc/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/syssetup/sy... ============================================================================== --- branches/arty-newcc/dll/win32/syssetup/syssetup.rc [iso-8859-1] (original) +++ branches/arty-newcc/dll/win32/syssetup/syssetup.rc [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,5 +1,3 @@ -/* $Id$ */ - #include <windows.h> #include "resource.h"
Propchange: branches/arty-newcc/dll/win32/syssetup/syssetup.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision
Modified: branches/arty-newcc/dll/win32/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/user32/user... ============================================================================== --- branches/arty-newcc/dll/win32/user32/user32.rc [iso-8859-1] (original) +++ branches/arty-newcc/dll/win32/user32/user32.rc [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,5 +1,3 @@ -/* $Id$ */ - #include <windows.h> #include "include/resource.h"
Propchange: branches/arty-newcc/dll/win32/user32/user32.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision
Modified: branches/arty-newcc/dll/win32/userenv/userenv.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/userenv/use... ============================================================================== --- branches/arty-newcc/dll/win32/userenv/userenv.rc [iso-8859-1] (original) +++ branches/arty-newcc/dll/win32/userenv/userenv.rc [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,6 +1,4 @@ -/* $Id$ - * - * Copyright (C) 2004 Eric Kohl +/* Copyright (C) 2004 Eric Kohl * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by
Propchange: branches/arty-newcc/dll/win32/userenv/userenv.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision
Modified: branches/arty-newcc/hal/halx86/mp/mps.S URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/mp/mps.S?r... ============================================================================== --- branches/arty-newcc/hal/halx86/mp/mps.S [iso-8859-1] (original) +++ branches/arty-newcc/hal/halx86/mp/mps.S [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: hal/halx86/mp/mps.S
Propchange: branches/arty-newcc/hal/halx86/mp/mps.S ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision
Modified: branches/arty-newcc/include/reactos/version.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/reactos/versi... ============================================================================== --- branches/arty-newcc/include/reactos/version.rc [iso-8859-1] (original) +++ branches/arty-newcc/include/reactos/version.rc [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * Inspired by Wine file include/wine_common_ver.rc * Copyright 2001 Dmitry Timoshkov *
Propchange: branches/arty-newcc/include/reactos/version.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision
Modified: branches/arty-newcc/tools/cabman/makefile.win32 URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/cabman/makefile... ============================================================================== --- branches/arty-newcc/tools/cabman/makefile.win32 [iso-8859-1] (original) +++ branches/arty-newcc/tools/cabman/makefile.win32 [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,5 +1,3 @@ -# $Id$ - PATH_TO_TOP = ../..
TARGET_TYPE = program
Propchange: branches/arty-newcc/tools/cabman/makefile.win32 ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision