[ros-diffs] [hbelusca] 63095: [WINVER]: Remove wine'isms and add a resource file.
Author: hbelusca
Date: Thu May 1 17:49:23 2014
New Revision: 63095
URL: http://svn.reactos.org/svn/reactos?rev=63095&view=rev
Log:
[WINVER]: Remove wine'isms and add a resource file.
Added:
trunk/reactos/base/applications/winver/winver.rc (with props)
Modified:
trunk/reactos/base/applications/winver/CMakeLists.txt
trunk/reactos/base/applications/winver/winver.c
Modified: trunk/reactos/base/applications/winver/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winver/CMakeLists.txt?rev=63095&r1=63094&r2=63095&view=diff
==
--- trunk/reactos/base/applications/winver/CMakeLists.txt [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/winver/CMakeLists.txt [iso-8859-1]
Thu May 1 17:49:23 2014
@@ -1,6 +1,5 @@
-
-add_executable(winver winver.c)
+add_executable(winver winver.c winver.rc)
set_module_type(winver win32gui UNICODE)
add_importlibs(winver shell32 msvcrt kernel32)
add_cd_file(TARGET winver DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/base/applications/winver/winver.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winver/winver.c?rev=63095&r1=63094&r2=63095&view=diff
==
--- trunk/reactos/base/applications/winver/winver.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winver/winver.c [iso-8859-1] Thu May 1
17:49:23 2014
@@ -1,3 +1,9 @@
+/*
+ * COPYRIGHT: See COPYING in the top level directory
+ * PROJECT: ReactOS Version Program
+ * FILE:winver.c
+ */
+
#include
#include
#include
@@ -5,11 +11,10 @@
int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR
lpCmdLine, int nCmdShow)
{
- static const WCHAR szROS[] = { 'R','e','a','c','t','O','S',0 };
- UNREFERENCED_PARAMETER(lpCmdLine);
- UNREFERENCED_PARAMETER(nCmdShow);
- UNREFERENCED_PARAMETER(hPrevInstance);
- UNREFERENCED_PARAMETER(hInstance);
- ShellAboutW(0, szROS, 0, 0);
- return 1;
+UNREFERENCED_PARAMETER(hInstance);
+UNREFERENCED_PARAMETER(hPrevInstance);
+UNREFERENCED_PARAMETER(lpCmdLine);
+UNREFERENCED_PARAMETER(nCmdShow);
+
+return ShellAboutW(NULL, L"ReactOS", NULL, NULL);
}
Added: trunk/reactos/base/applications/winver/winver.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winver/winver.rc?rev=63095
==
--- trunk/reactos/base/applications/winver/winver.rc(added)
+++ trunk/reactos/base/applications/winver/winver.rc[iso-8859-1] Thu May 1
17:49:23 2014
@@ -0,0 +1,5 @@
+
+#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Version Program"
+#define REACTOS_STR_INTERNAL_NAME "winver"
+#define REACTOS_STR_ORIGINAL_FILENAME "winver.exe"
+#include
Propchange: trunk/reactos/base/applications/winver/winver.rc
--
svn:eol-style = native
[ros-diffs] [hbelusca] 63101: [MSGINA][SHELL32] - Resize the logon graphics logo to windows standard size: 413x72. - Use this very same logo for ShellAbout. Adapted from a proposition by Lee Schroeder
Author: hbelusca Date: Fri May 2 02:52:15 2014 New Revision: 63101 URL: http://svn.reactos.org/svn/reactos?rev=63101&view=rev Log: [MSGINA][SHELL32] - Resize the logon graphics logo to windows standard size: 413x72. - Use this very same logo for ShellAbout. Adapted from a proposition by Lee Schroeder. The real fix for this would be to do like Windows, that means, since (you can double-check) shell32 takes the picture from msgina.dll . CORE-7940 #resolve #comment Fixed, thanks ;) Added: trunk/reactos/dll/win32/shell32/res/bitmaps/reactos.bmp - copied, changed from r63095, trunk/reactos/dll/win32/msgina/resources/reactos.bmp Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/shell_about_logo_24bpp.bmp Modified: trunk/reactos/dll/win32/msgina/resources/reactos.bmp trunk/reactos/dll/win32/msgina/resources/reactos.svg trunk/reactos/dll/win32/shell32/bitmap_res.rc trunk/reactos/dll/win32/shell32/shell32_main.cpp trunk/reactos/dll/win32/shell32/shresdef.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msgina/resources/reactos.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources/reactos.bmp?rev=63101&r1=63100&r2=63101&view=diff Modified: trunk/reactos/dll/win32/msgina/resources/reactos.svg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources/reactos.svg?rev=63101&r1=63100&r2=63101&view=diff Modified: trunk/reactos/dll/win32/shell32/bitmap_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/bitmap_res.rc?rev=63101&r1=63100&r2=63101&view=diff Copied: trunk/reactos/dll/win32/shell32/res/bitmaps/reactos.bmp (from r63095, trunk/reactos/dll/win32/msgina/resources/reactos.bmp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitmaps/reactos.bmp?p2=trunk/reactos/dll/win32/shell32/res/bitmaps/reactos.bmp&p1=trunk/reactos/dll/win32/msgina/resources/reactos.bmp&r1=63095&r2=63101&rev=63101&view=diff Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/shell_about_logo_24bpp.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitmaps/shell_about_logo_24bpp.bmp?rev=63100 Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_main.cpp?rev=63101&r1=63100&r2=63101&view=diff Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef.h?rev=63101&r1=63100&r2=63101&view=diff
[ros-diffs] [hbelusca] 63104: Create a branch for console restructuration work.
Author: hbelusca Date: Fri May 2 14:13:40 2014 New Revision: 63104 URL: http://svn.reactos.org/svn/reactos?rev=63104&view=rev Log: Create a branch for console restructuration work. Added: branches/condrv_restructure/ (props changed) - copied from r63103, trunk/reactos/ Propchange: branches/condrv_restructure/ -- --- bugtraq:logregex(added) +++ bugtraq:logregexFri May 2 14:13:40 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/condrv_restructure/ -- bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/condrv_restructure/ -- bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/condrv_restructure/ -- --- svn:ignore (added) +++ svn:ignore Fri May 2 14:13:40 2014 @@ -0,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/condrv_restructure/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Fri May 2 14:13:40 2014 @@ -0,0 +1,18 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/header-work:45691-47721 +/branches/kd++:58883-58973 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-4 1547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/ros-branch-0_3_15-lt2013:59059 +/branches/ros-csrss:57561-58762 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 +/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-4,6-55567 +/branches/wlan-bringup:54809-54998 Propchange: branches/condrv_restructure/ -- tsvn:logminsize = 10
[ros-diffs] [hbelusca] 63108: [CONDRV]: Remove compilation warnings.
Author: hbelusca Date: Fri May 2 15:09:26 2014 New Revision: 63108 URL: http://svn.reactos.org/svn/reactos?rev=63108&view=rev Log: [CONDRV]: Remove compilation warnings. Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c?rev=63108&r1=63107&r2=63108&view=diff == --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Fri May 2 15:09:26 2014 @@ -256,7 +256,7 @@ /* Validity checks */ ASSERT(Console == InputBuffer->Header.Console); -ASSERT( (Buffer != NULL && NumCharsToRead >= 0) || +ASSERT( (Buffer != NULL && NumCharsToRead > 0) || (Buffer == NULL && NumCharsToRead == 0) ); /* We haven't read anything (yet) */ @@ -402,7 +402,7 @@ /* Validity checks */ ASSERT(Console == InputBuffer->Header.Console); -ASSERT( (InputRecord != NULL && NumEventsToRead >= 0) || +ASSERT( (InputRecord != NULL && NumEventsToRead > 0) || (InputRecord == NULL && NumEventsToRead == 0) ); // Do NOT do that !! Use the existing number of events already read, if any... @@ -472,7 +472,7 @@ /* Validity checks */ ASSERT(Console == InputBuffer->Header.Console); -ASSERT( (InputRecord != NULL && NumEventsToWrite >= 0) || +ASSERT( (InputRecord != NULL && NumEventsToWrite > 0) || (InputRecord == NULL && NumEventsToWrite == 0) ); // Do NOT do that !! Use the existing number of events already written, if any... Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c?rev=63108&r1=63107&r2=63108&view=diff == --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Fri May 2 15:09:26 2014 @@ -829,7 +829,7 @@ /* Validity checks */ ASSERT(Console == ScreenBuffer->Header.Console); -ASSERT( (StringBuffer != NULL && NumCharsToWrite >= 0) || +ASSERT( (StringBuffer != NULL && NumCharsToWrite > 0) || (StringBuffer == NULL && NumCharsToWrite == 0) ); // if (Console->PauseFlags & (PAUSED_FROM_KEYBOARD | PAUSED_FROM_SCROLLBAR | PAUSED_FROM_SELECTION)) @@ -909,7 +909,7 @@ /* Validity checks */ ASSERT(Console == Buffer->Header.Console); -ASSERT( (StringBuffer != NULL && NumCodesToRead >= 0) || +ASSERT( (StringBuffer != NULL && NumCodesToRead > 0) || (StringBuffer == NULL && NumCodesToRead == 0) ); switch (CodeType) @@ -1033,7 +1033,7 @@ /* Validity checks */ ASSERT(Console == Buffer->Header.Console); -ASSERT( (StringBuffer != NULL && NumCodesToWrite >= 0) || +ASSERT( (StringBuffer != NULL && NumCodesToWrite > 0) || (StringBuffer == NULL && NumCodesToWrite == 0) ); switch (CodeType)
[ros-diffs] [hbelusca] 63113: [KERNEL32] Compare against "NE", not "N" only. Caught by Victor Martinez, thanks ; ) CORE-8159 #resolve
Author: hbelusca
Date: Fri May 2 17:11:13 2014
New Revision: 63113
URL: http://svn.reactos.org/svn/reactos?rev=63113&view=rev
Log:
[KERNEL32]
Compare against "NE", not "N" only. Caught by Victor Martinez, thanks ;)
CORE-8159 #resolve
Modified:
branches/ntvdm/dll/win32/kernel32/client/vdm.c
Modified: branches/ntvdm/dll/win32/kernel32/client/vdm.c
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client/vdm.c?rev=63113&r1=63112&r2=63113&view=diff
==
--- branches/ntvdm/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original)
+++ branches/ntvdm/dll/win32/kernel32/client/vdm.c [iso-8859-1] Fri May 2
17:11:13 2014
@@ -677,7 +677,7 @@
if (!lpEnvironment)
{
/* Nope, create one */
-Status = RtlCreateEnvironment(TRUE, (PWCHAR*)&Environment);
+Status = RtlCreateEnvironment(TRUE, &Environment);
if (!NT_SUCCESS(Status)) goto Quickie;
}
else
@@ -718,6 +718,7 @@
p = NewEnvironment;
/* FIXME: Code here */
+DPRINT1("BaseCreateVDMEnvironment is half-plemented!\n");
/* Terminate it */
*p++ = UNICODE_NULL;
@@ -916,7 +917,7 @@
return BINARY_PE_EXE32;
}
-if(!memcmp(magic, "NE", 1))
+if(!memcmp(magic, "NE", 2))
{
/* This is a Windows executable (NE) header. This can
* mean either a 16-bit OS/2 or a 16-bit Windows or even a
@@ -1603,12 +1604,15 @@
/*
* @unimplemented
*/
-DWORD
-WINAPI
-VDMOperationStarted (
-DWORD Unknown0
-)
-{
-STUB;
-return 0;
-}
+BOOL
+WINAPI
+VDMOperationStarted(IN ULONG Unknown0)
+{
+DPRINT1("VDMOperationStarted(%d)\n", Unknown0);
+
+return
+BaseUpdateVDMEntry(VdmEntryUpdateControlCHandler,
+ NULL,
+ 0,
+ Unknown0);
+}
[ros-diffs] [hbelusca] 63117: [CONSRV] - Move some functions where they belong. - Start to differentiate frontends for consrv terminal, and terminals.
Author: hbelusca
Date: Fri May 2 18:44:26 2014
New Revision: 63117
URL: http://svn.reactos.org/svn/reactos?rev=63117&view=rev
Log:
[CONSRV]
- Move some functions where they belong.
- Start to differentiate frontends for consrv terminal, and terminals.
Added:
branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyterm.c
- copied, changed from r63112,
branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c
- copied, changed from r63112,
branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c
Removed:
branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c
Modified:
branches/condrv_restructure/win32ss/user/winsrv/consrv.cmake
branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c
branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c
branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.h
branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c
branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h
branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/winsrv/consrv.cmake?rev=63117&r1=63116&r2=63117&view=diff
==
--- branches/condrv_restructure/win32ss/user/winsrv/consrv.cmake
[iso-8859-1] (original)
+++ branches/condrv_restructure/win32ss/user/winsrv/consrv.cmake
[iso-8859-1] Fri May 2 18:44:26 2014
@@ -18,10 +18,11 @@
consrv/condrv/coninput.c
consrv/condrv/conoutput.c
consrv/condrv/console.c
-consrv/condrv/dummyfrontend.c
+consrv/condrv/dummyterm.c
consrv/condrv/graphics.c
consrv/condrv/text.c
consrv/frontends/input.c
+consrv/frontends/terminal.c
consrv/frontends/gui/conwnd.c
consrv/frontends/gui/fullscreen.c
consrv/frontends/gui/guiterm.c
Modified:
branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c?rev=63117&r1=63116&r2=63117&view=diff
==
--- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c
[iso-8859-1] (original)
+++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c
[iso-8859-1] Fri May 2 18:44:26 2014
@@ -17,10 +17,10 @@
/* GLOBALS
/
#define ConsoleInputUnicodeCharToAnsiChar(Console, dChar, sWChar) \
-WideCharToMultiByte((Console)->CodePage, 0, (sWChar), 1, (dChar), 1, NULL,
NULL)
+WideCharToMultiByte((Console)->InputCodePage, 0, (sWChar), 1, (dChar), 1,
NULL, NULL)
#define ConsoleInputAnsiCharToUnicodeChar(Console, dWChar, sChar) \
-MultiByteToWideChar((Console)->CodePage, 0, (sChar), 1, (dWChar), 1)
+MultiByteToWideChar((Console)->InputCodePage, 0, (sChar), 1, (dWChar), 1)
typedef struct ConsoleInput_t
{
@@ -142,82 +142,6 @@
}
CloseHandle(Console->InputBuffer.ActiveEvent);
-}
-
-/*
- * This function explicitely references Console->ActiveBuffer
- * (and also makes use of keyboard functions...).
- * It is possible that it will move into frontends...
- */
-VOID NTAPI
-ConDrvProcessKey(IN PCONSOLE Console,
- IN BOOLEAN Down,
- IN UINT VirtualKeyCode,
- IN UINT VirtualScanCode,
- IN WCHAR UnicodeChar,
- IN ULONG ShiftState,
- IN BYTE KeyStateCtrl)
-{
-INPUT_RECORD er;
-
-/* process Ctrl-C and Ctrl-Break */
-if ( Console->InputBuffer.Mode & ENABLE_PROCESSED_INPUT &&
- Down && (VirtualKeyCode == VK_PAUSE || VirtualKeyCode == 'C') &&
- (ShiftState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED) ||
KeyStateCtrl & 0x80) )
-{
-DPRINT1("Console_Api Ctrl-C\n");
-ConSrvConsoleProcessCtrlEvent(Console, 0, CTRL_C_EVENT);
-
-if (Console->LineBuffer && !Console->LineComplete)
-{
-/* Line input is in progress; end it */
-Console->LinePos = Console->LineSize = 0;
-Console->LineComplete = TRUE;
-}
-return;
-}
-
-if ( (ShiftState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED)) != 0 &&
- (VK_UP == VirtualKeyCode || VK_DOWN == VirtualKeyCode) )
-{
-if (!Down) return;
-
-/* scroll up or down */
-if (VK_
[ros-diffs] [hbelusca] 57399: [NTOSKRNL] - Code formatting - It's my first commit \o/ CORE-6687 #comment Committed. #resolve
Author: hbelusca
Date: Thu Sep 27 13:39:14 2012
New Revision: 57399
URL: http://svn.reactos.org/svn/reactos?rev=57399&view=rev
Log:
[NTOSKRNL]
- Code formatting
- It's my first commit \o/
CORE-6687 #comment Committed. #resolve
Modified:
trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c
Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c?rev=57399&r1=57398&r2=57399&view=diff
==
--- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Thu Sep 27 13:39:14
2012
@@ -543,10 +543,8 @@
/* Terminate the string */
SubKeyInfo->Name[SubKeyInfo->NameLength / sizeof(WCHAR)] = 0;
-_snwprintf(
-DevicePath,
-sizeof(DevicePath) / sizeof(WCHAR),
-L"%s\\%s", REGSTR_KEY_ROOTENUM, KeyInfo->Name);
+_snwprintf(DevicePath, sizeof(DevicePath) / sizeof(WCHAR),
+ L"%s\\%s", REGSTR_KEY_ROOTENUM, KeyInfo->Name);
DPRINT("Found device %S\\%s!\n", DevicePath, SubKeyInfo->Name);
if (LocateChildDevice(DeviceExtension, DevicePath,
SubKeyInfo->Name, &Device) == STATUS_NO_SUCH_DEVICE)
{
[ros-diffs] [hbelusca] 57400: [NTOSKRNL] Coverity code defects fixes : - Cache: CID 701441 - Config: CIDs 716570, 716669, 716760 - Dbgk: Kdbg: CIDs 716571, 515128/9, 500432 - Ex: CIDs 500156/7, 515122
Author: hbelusca
Date: Thu Sep 27 17:16:31 2012
New Revision: 57400
URL: http://svn.reactos.org/svn/reactos?rev=57400&view=rev
Log:
[NTOSKRNL]
Coverity code defects fixes :
- Cache: CID 701441
- Config: CIDs 716570, 716669, 716760
- Dbgk: Kdbg: CIDs 716571, 515128/9, 500432
- Ex: CIDs 500156/7, 515122, 716200/67, 701301, 514669
- Fsrtl: Fstub: CIDs 701341/2, 701288, 716770, 701302, and CIDs 716576/7/8 +
514636 + 716805 thanks to Thomas Faber
- Io: CIDs 514576, 514643, 514672/3, 716203, 716269, 716581, 716591, 716713
- Ke: CIDs 515125, 716592
- Ps: CIDs 716603/4, 701422
- Ob: Po: CIDs 514671/680, 701419/420/421, 716763, 716601/2
All the details are given in the different bug reports.
CORE-6677 CORE-6679 CORE-6680 CORE-6683 CORE-6686 CORE-6692 CORE-6693 CORE-6694
CORE-6695 CORE-6696 #comment Committed in rev.57400 #resolve #close
Modified:
trunk/reactos/lib/rtl/atom.c
trunk/reactos/ntoskrnl/cache/section/swapout.c
trunk/reactos/ntoskrnl/config/cminit.c
trunk/reactos/ntoskrnl/config/cmparse.c
trunk/reactos/ntoskrnl/config/cmsysini.c
trunk/reactos/ntoskrnl/dbgk/dbgkobj.c
trunk/reactos/ntoskrnl/ex/init.c
trunk/reactos/ntoskrnl/ex/sysinfo.c
trunk/reactos/ntoskrnl/fsrtl/filelock.c
trunk/reactos/ntoskrnl/fsrtl/notify.c
trunk/reactos/ntoskrnl/fstub/disksup.c
trunk/reactos/ntoskrnl/fstub/fstubex.c
trunk/reactos/ntoskrnl/include/internal/cm.h
trunk/reactos/ntoskrnl/io/iomgr/device.c
trunk/reactos/ntoskrnl/io/iomgr/driver.c
trunk/reactos/ntoskrnl/io/iomgr/ioevent.c
trunk/reactos/ntoskrnl/io/iomgr/iofunc.c
trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c
trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c
trunk/reactos/ntoskrnl/io/iomgr/volume.c
trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c
trunk/reactos/ntoskrnl/kdbg/kdb_cli.c
trunk/reactos/ntoskrnl/ke/i386/cpu.c
trunk/reactos/ntoskrnl/ke/profobj.c
trunk/reactos/ntoskrnl/ob/oblife.c
trunk/reactos/ntoskrnl/ob/oblink.c
trunk/reactos/ntoskrnl/ob/obsdcach.c
trunk/reactos/ntoskrnl/ob/obsecure.c
trunk/reactos/ntoskrnl/po/power.c
trunk/reactos/ntoskrnl/ps/kill.c
trunk/reactos/ntoskrnl/ps/security.c
Modified: trunk/reactos/lib/rtl/atom.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/atom.c?rev=57400&r1=57399&r2=57400&view=diff
==
--- trunk/reactos/lib/rtl/atom.c [iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/atom.c [iso-8859-1] Thu Sep 27 17:16:31 2012
@@ -102,6 +102,12 @@
return TRUE;
}
+
+ /*
+* AtomName cannot be NULL because this
+* case was caught by the previous test.
+*/
+ ASSERT(AtomName != NULL);
if (*AtomName != L'#')
return FALSE;
Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swapout.c?rev=57400&r1=57399&r2=57400&view=diff
==
--- trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] Thu Sep 27
17:16:31 2012
@@ -348,7 +348,7 @@
PMM_SECTION_SEGMENT Segment = NULL;
LARGE_INTEGER FileOffset;
PMEMORY_AREA MemoryArea;
-PMMSUPPORT AddressSpace = MmGetKernelAddressSpace();
+PMMSUPPORT AddressSpace = NULL;
BOOLEAN Dirty = FALSE;
PVOID Address = NULL;
PEPROCESS Process = NULL;
@@ -385,7 +385,6 @@
DPRINT("No segment association for %x\n", Page);
}
-
Dirty = MmIsDirtyPageRmap(Page);
DPRINTC("Trying to unmap all instances of %x\n", Page);
@@ -409,7 +408,8 @@
DPRINTC("Process %x Address %x Page %x\n", Process, Address, Page);
-if (RMAP_IS_SEGMENT(Address)) {
+if (RMAP_IS_SEGMENT(Address))
+{
entry = entry->Next;
continue;
}
@@ -440,10 +440,10 @@
KeBugCheck(MEMORY_MANAGEMENT);
}
-MmLockAddressSpace(AddressSpace);
-
do
{
+MmLockAddressSpace(AddressSpace);
+
MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address);
if (MemoryArea == NULL || MemoryArea->DeleteInProgress)
{
@@ -505,14 +505,13 @@
DPRINT1("bail\n");
goto bail;
}
-else Status = STATUS_MM_RESTART_OPERATION;
+else
+{
+Status = STATUS_MM_RESTART_OPERATION;
+}
}
-
-MmLockAddressSpace(AddressSpace);
}
while (Status == STATUS_MM_RESTART_OPERATION);
-
-MmUnlockAddressSpace(AddressSpace);
if (ProcRef)
{
Modified: trunk/reactos/ntoskrnl/config/cminit.c
URL:
http://svn.reactos.org/svn/
[ros-diffs] [hbelusca] 57401: [BOOTDATA] - Correct the version signature of some inf files. CORE-6549 #comment Committed in rev.57401 #resolved
Author: hbelusca Date: Thu Sep 27 18:18:36 2012 New Revision: 57401 URL: http://svn.reactos.org/svn/reactos?rev=57401&view=rev Log: [BOOTDATA] - Correct the version signature of some inf files. CORE-6549 #comment Committed in rev.57401 #resolved Modified: trunk/reactos/boot/bootdata/hivecls_amd64.inf trunk/reactos/boot/bootdata/hivecls_arm.inf trunk/reactos/boot/bootdata/hivecls_i386.inf trunk/reactos/boot/bootdata/hivedef_amd64.inf trunk/reactos/boot/bootdata/hivedef_arm.inf trunk/reactos/boot/bootdata/hivedef_i386.inf trunk/reactos/boot/bootdata/hivesft_amd64.inf trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf Modified: trunk/reactos/boot/bootdata/hivecls_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_amd64.inf?rev=57401&r1=57400&r2=57401&view=diff == --- trunk/reactos/boot/bootdata/hivecls_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_amd64.inf [iso-8859-1] Thu Sep 27 18:18:36 2012 @@ -1,5 +1,5 @@ [Version] -Signature="$ReactOS$ +Signature="$ReactOS$" [AddReg] HKLM,"SOFTWARE\Classes",,0x0010 Modified: trunk/reactos/boot/bootdata/hivecls_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_arm.inf?rev=57401&r1=57400&r2=57401&view=diff == --- trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] Thu Sep 27 18:18:36 2012 @@ -1,5 +1,5 @@ [Version] -Signature="$ReactOS$ +Signature="$ReactOS$" [AddReg] HKLM,"SOFTWARE\Classes",,0x0010 Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_i386.inf?rev=57401&r1=57400&r2=57401&view=diff == --- trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] Thu Sep 27 18:18:36 2012 @@ -1,5 +1,5 @@ [Version] -Signature="$ReactOS$ +Signature="$ReactOS$" [AddReg] HKLM,"SOFTWARE\Classes",,0x0010 Modified: trunk/reactos/boot/bootdata/hivedef_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_amd64.inf?rev=57401&r1=57400&r2=57401&view=diff == --- trunk/reactos/boot/bootdata/hivedef_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_amd64.inf [iso-8859-1] Thu Sep 27 18:18:36 2012 @@ -1,5 +1,5 @@ [Version] -Signature="$ReactOS$ +Signature="$ReactOS$" [AddReg] Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_arm.inf?rev=57401&r1=57400&r2=57401&view=diff == --- trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] Thu Sep 27 18:18:36 2012 @@ -1,5 +1,5 @@ [Version] -Signature="$ReactOS$ +Signature="$ReactOS$" [AddReg] Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386.inf?rev=57401&r1=57400&r2=57401&view=diff == Binary files - no diff available. Modified: trunk/reactos/boot/bootdata/hivesft_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_amd64.inf?rev=57401&r1=57400&r2=57401&view=diff == --- trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] Thu Sep 27 18:18:36 2012 @@ -1,5 +1,5 @@ [Version] -Signature="$ReactOS$ +Signature="$ReactOS$" [AddReg] Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.inf?rev=57401&r1=57400&r2=57401&view=diff == --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Thu Sep 27 18:18:36 2012 @@ -1,5 +1,5 @@ [Version] -Signature="$ReactOS$ +Signature="$ReactOS$" [AddReg] Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386.inf?rev=57401&r1=57400&r2=57401&view=diff == Binary files - no diff available.
[ros-diffs] [hbelusca] 57402: [CSRSS/CSRSRV] - Do not compile anymore the old CSRSS. - Update some headers and resource files. - Add header guards in srv.h
Author: hbelusca Date: Thu Sep 27 18:44:50 2012 New Revision: 57402 URL: http://svn.reactos.org/svn/reactos?rev=57402&view=rev Log: [CSRSS/CSRSRV] - Do not compile anymore the old CSRSS. - Update some headers and resource files. - Add header guards in srv.h Modified: trunk/reactos/subsystems/CMakeLists.txt trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc trunk/reactos/subsystems/win32/csrss/csrsrv/server.c trunk/reactos/subsystems/win32/csrss/csrsrv/session.c trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c trunk/reactos/subsystems/win32/csrss/csrss.rc Modified: trunk/reactos/subsystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/CMakeLists.txt?rev=57402&r1=57401&r2=57402&view=diff == --- trunk/reactos/subsystems/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/CMakeLists.txt [iso-8859-1] Thu Sep 27 18:44:50 2012 @@ -1,5 +1,4 @@ if(ARCH STREQUAL "i386") add_subdirectory(ntvdm) endif() -add_subdirectory(csr) add_subdirectory(win32) Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc?rev=57402&r1=57401&r2=57402&view=diff == --- trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc [iso-8859-1] Thu Sep 27 18:44:50 2012 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS CSR Core Server\0" +#define REACTOS_STR_FILE_DESCRIPTION "Client/Server Runtime SubSystem Process\0" #define REACTOS_STR_INTERNAL_NAME "csrsrv\0" #define REACTOS_STR_ORIGINAL_FILENAME "csrsrv.dll\0" #include Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrsrv/server.c?rev=57402&r1=57401&r2=57402&view=diff == --- trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] Thu Sep 27 18:44:50 2012 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS CSR Sub System - * FILE:subsys/csr/csrsrv/server.c + * FILE:subsystems/win32/csrss/csrsrv/server.c * PURPOSE: CSR Server DLL Server Functions * PROGRAMMERS: Alex Ionescu (a...@relsoft.net) */ Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrsrv/session.c?rev=57402&r1=57401&r2=57402&view=diff == --- trunk/reactos/subsystems/win32/csrss/csrsrv/session.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/session.c [iso-8859-1] Thu Sep 27 18:44:50 2012 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS CSR Sub System - * FILE:subsys/csr/csrsrv/session.c + * FILE:subsystems/win32/csrss/csrsrv/session.c * PURPOSE: CSR Server DLL Session Implementation * PROGRAMMERS: Alex Ionescu (a...@relsoft.net) */ Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h?rev=57402&r1=57401&r2=57402&view=diff == --- trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h [iso-8859-1] Thu Sep 27 18:44:50 2012 @@ -1,3 +1,6 @@ +#ifndef _SRV_H +#define _SRV_H + /* PSDK/NDK Headers */ #define NTOS_MODE_USER #include @@ -35,3 +38,5 @@ /* Defines */ #define ROUND_UP(n, align) ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) #define ROUND_DOWN(n, align) (((ULONG)n) & ~((align) - 1l)) + +#endif Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c?rev=57402&r1=57401&r2=57402&view=diff == --- trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c [iso-8859-1] Thu Sep 27 18:44:50 2012 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS CSR Sub System - * FILE:
[ros-diffs] [hbelusca] 57411: [NTOSKRNL] - Revert rev.57400 only for this file since CID 701342 was a false-positive from Coverity (because Coverity doesn't know what the aim of the POOL_RAISE_IF_ALLO
Author: hbelusca Date: Fri Sep 28 10:01:00 2012 New Revision: 57411 URL: http://svn.reactos.org/svn/reactos?rev=57411&view=rev Log: [NTOSKRNL] - Revert rev.57400 only for this file since CID 701342 was a false-positive from Coverity (because Coverity doesn't know what the aim of the POOL_RAISE_IF_ALLOCATION_FAILURE is). Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/notify.c?rev=57411&r1=57410&r2=57411&view=diff == --- trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] Fri Sep 28 10:01:00 2012 @@ -586,13 +586,6 @@ /* Allocate new notification */ NotifyChange = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, sizeof(NOTIFY_CHANGE), 'FSrN'); - -/* - * If NotifyChange == NULL then an - * exception was already raised. - */ -ASSERT(NotifyChange != NULL); - RtlZeroMemory(NotifyChange, sizeof(NOTIFY_CHANGE)); /* Set basic information */
[ros-diffs] [hbelusca] 57412: [NTOSKRNL] - ExFreePool --> ExFreePoolWithTag in some places. - Remove dead code (section.c) - Free resource (sysldr.c)
Author: hbelusca
Date: Fri Sep 28 12:17:23 2012
New Revision: 57412
URL: http://svn.reactos.org/svn/reactos?rev=57412&view=rev
Log:
[NTOSKRNL]
- ExFreePool --> ExFreePoolWithTag in some places.
- Remove dead code (section.c)
- Free resource (sysldr.c)
Modified:
trunk/reactos/ntoskrnl/cache/section/data.c
trunk/reactos/ntoskrnl/io/iomgr/iofunc.c
trunk/reactos/ntoskrnl/io/iomgr/irq.c
trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c
trunk/reactos/ntoskrnl/mm/ARM3/expool.c
trunk/reactos/ntoskrnl/mm/ARM3/mminit.c
trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c
trunk/reactos/ntoskrnl/mm/ARM3/procsup.c
trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c
trunk/reactos/ntoskrnl/mm/ARM3/virtual.c
trunk/reactos/ntoskrnl/mm/section.c
Modified: trunk/reactos/ntoskrnl/cache/section/data.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/data.c?rev=57412&r1=57411&r2=57412&view=diff
==
--- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Fri Sep 28
12:17:23 2012
@@ -555,7 +555,7 @@
{
KeReleaseSpinLock(&FileObject->IrpListLock, OldIrql);
DPRINTC("Free Segment %x\n", Segment);
-ExFreePool(Segment);
+ExFreePoolWithTag(Segment, TAG_MM_SECTION_SEGMENT);
DPRINT("Filling out Segment info (previous data section)\n");
Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c?rev=57412&r1=57411&r2=57412&view=diff
==
--- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Fri Sep 28 12:17:23
2012
@@ -1347,7 +1347,7 @@
{
/* Allocating failed, clean up and return the exception code */
IopCleanupAfterException(FileObject, Irp, Event, NULL);
-if (LocalLength) ExFreePool(LocalLength);
+if (LocalLength) ExFreePoolWithTag(LocalLength, TAG_LOCK);
/* Return the exception code */
_SEH2_YIELD(return _SEH2_GetExceptionCode());
@@ -1450,7 +1450,7 @@
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
/* Free buffer and return the exception code */
-if (AuxBuffer) ExFreePool(AuxBuffer);
+if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_SYSB);
_SEH2_YIELD(return _SEH2_GetExceptionCode());
}
_SEH2_END;
@@ -1466,7 +1466,7 @@
if (!NT_SUCCESS(Status))
{
/* Fail */
-if (AuxBuffer) ExFreePool(AuxBuffer);
+if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_SYSB);
return Status;
}
@@ -1539,7 +1539,7 @@
{
/* Allocating failed, clean up and return the exception code */
IopCleanupAfterException(FileObject, Irp, Event, NULL);
-if (AuxBuffer) ExFreePool(AuxBuffer);
+if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_SYSB);
/* Return the exception code */
_SEH2_YIELD(return _SEH2_GetExceptionCode());
@@ -1863,7 +1863,7 @@
_SEH2_END;
/* Free the event */
-ExFreePool(Event);
+ExFreePoolWithTag(Event, TAG_IO);
}
else
{
@@ -2465,7 +2465,7 @@
* Someone else set the completion port in the
* meanwhile, so dereference the port and fail.
*/
-ExFreePool(Context);
+ExFreePoolWithTag(Context, IOC_TAG);
ObDereferenceObject(Queue);
Status = STATUS_INVALID_PARAMETER;
}
@@ -2524,7 +2524,7 @@
_SEH2_END;
/* Free the event */
-ExFreePool(Event);
+ExFreePoolWithTag(Event, TAG_IO);
}
else
{
@@ -2555,7 +2555,7 @@
{
/* Clear it in the IRP for completion */
Irp->UserEvent = NULL;
-ExFreePool(Event);
+ExFreePoolWithTag(Event, TAG_IO);
}
/* Set the caller IOSB */
@@ -2722,7 +2722,7 @@
/* Allocate a buffer */
LocalLength = ExAllocatePoolWithTag(NonPagedPool,
sizeof(LARGE_INTEGER),
-TAG_LOCK);
+TAG_LOCK);
/* Set the length */
*LocalLength = CapturedLength;
@@ -2733,7 +2733,7 @@
{
/* Allocating failed, clean up and return the exception code */
IopCleanupAfterException(FileObject, Irp, NULL, Event);
-if (LocalLength) ExFreePool(LocalLength);
+if (LocalLength) ExFre
[ros-diffs] [hbelusca] 57413: [BOOTDATA] - HACK: Add artificially a symbolic link to the first COM port, because it happens for whatever reason that the serial.sys driver doesn't create it when it cre
Author: hbelusca Date: Fri Sep 28 18:46:46 2012 New Revision: 57413 URL: http://svn.reactos.org/svn/reactos?rev=57413&view=rev Log: [BOOTDATA] - HACK: Add artificially a symbolic link to the first COM port, because it happens for whatever reason that the serial.sys driver doesn't create it when it creates the Serial0 device. When this functionality is repaired, the HACK shall disappear. Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd64.inf?rev=57413&r1=57412&r2=57413&view=diff == --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Fri Sep 28 18:46:46 2012 @@ -1192,6 +1192,10 @@ ; DOS devices HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x,"\DosDevices\COM1" +;; ReactOS specific - add a symbolic link to the first COM port, because it happens for whatever +;; reason that the serial.sys driver doesn't create it when it creates the Serial0 device. +;; When this functionality is repaired, the following line shall disappear. +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","COM1",0x,"\Device\Serial0" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","MAILSLOT",0x,"\Device\MailSlot" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","NUL",0x,"\Device\Null" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PIPE",0x,"\Device\NamedPipe" Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.inf?rev=57413&r1=57412&r2=57413&view=diff == --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Fri Sep 28 18:46:46 2012 @@ -747,6 +747,10 @@ ; DOS devices HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x,"\DosDevices\COM1" +;; ReactOS specific - add a symbolic link to the first COM port, because it happens for whatever +;; reason that the serial.sys driver doesn't create it when it creates the Serial0 device. +;; When this functionality is repaired, the following line shall disappear. +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","COM1",0x,"\Device\Serial0" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","MAILSLOT",0x,"\Device\MailSlot" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","NUL",0x,"\Device\Null" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PIPE",0x,"\Device\NamedPipe" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386.inf?rev=57413&r1=57412&r2=57413&view=diff == --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Fri Sep 28 18:46:46 2012 @@ -1192,6 +1192,10 @@ ; DOS devices HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x,"\DosDevices\COM1" +;; ReactOS specific - add a symbolic link to the first COM port, because it happens for whatever +;; reason that the serial.sys driver doesn't create it when it creates the Serial0 device. +;; When this functionality is repaired, the following line shall disappear. +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","COM1",0x,"\Device\Serial0" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","MAILSLOT",0x,"\Device\MailSlot" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","NUL",0x,"\Device\Null" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PIPE",0x,"\Device\NamedPipe"
[ros-diffs] [hbelusca] 57414: [BOOTDATA] - Revert rev.57413. Indeed, when one boots ReactOS without debugging (selecting the first entry in the boot menu), the COM1 symbolic link (corresponding to \De
Author: hbelusca Date: Fri Sep 28 19:04:37 2012 New Revision: 57414 URL: http://svn.reactos.org/svn/reactos?rev=57414&view=rev Log: [BOOTDATA] - Revert rev.57413. Indeed, when one boots ReactOS without debugging (selecting the first entry in the boot menu), the COM1 symbolic link (corresponding to \Device\Serial0) is created automatically by the serial driver. However, when one boots in debugging mode (selecting the second entry -- ReactOS (Debug) --), then for some reason the COM1 link isn't created (albeit \Device\Serial0 is). Therefore the real problem is elsewhere. Seems that it has something to share with http://jira.reactos.org/browse/CORE-4263 Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd64.inf?rev=57414&r1=57413&r2=57414&view=diff == --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Fri Sep 28 19:04:37 2012 @@ -1192,10 +1192,6 @@ ; DOS devices HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x,"\DosDevices\COM1" -;; ReactOS specific - add a symbolic link to the first COM port, because it happens for whatever -;; reason that the serial.sys driver doesn't create it when it creates the Serial0 device. -;; When this functionality is repaired, the following line shall disappear. -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","COM1",0x,"\Device\Serial0" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","MAILSLOT",0x,"\Device\MailSlot" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","NUL",0x,"\Device\Null" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PIPE",0x,"\Device\NamedPipe" Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.inf?rev=57414&r1=57413&r2=57414&view=diff == --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Fri Sep 28 19:04:37 2012 @@ -747,10 +747,6 @@ ; DOS devices HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x,"\DosDevices\COM1" -;; ReactOS specific - add a symbolic link to the first COM port, because it happens for whatever -;; reason that the serial.sys driver doesn't create it when it creates the Serial0 device. -;; When this functionality is repaired, the following line shall disappear. -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","COM1",0x,"\Device\Serial0" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","MAILSLOT",0x,"\Device\MailSlot" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","NUL",0x,"\Device\Null" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PIPE",0x,"\Device\NamedPipe" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386.inf?rev=57414&r1=57413&r2=57414&view=diff == --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Fri Sep 28 19:04:37 2012 @@ -1192,10 +1192,6 @@ ; DOS devices HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x,"\DosDevices\COM1" -;; ReactOS specific - add a symbolic link to the first COM port, because it happens for whatever -;; reason that the serial.sys driver doesn't create it when it creates the Serial0 device. -;; When this functionality is repaired, the following line shall disappear. -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","COM1",0x,"\Device\Serial0" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","MAILSLOT",0x,"\Device\MailSlot" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","NUL",0x,"\Device\Null" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PIPE",0x,"\Device\NamedPipe"
[ros-diffs] [hbelusca] 57415: [CMD] - Clarify the code, no functional changes.
Author: hbelusca
Date: Fri Sep 28 19:36:49 2012
New Revision: 57415
URL: http://svn.reactos.org/svn/reactos?rev=57415&view=rev
Log:
[CMD]
- Clarify the code, no functional changes.
Modified:
trunk/reactos/base/shell/cmd/cmd.h
trunk/reactos/base/shell/cmd/parser.c
trunk/reactos/base/shell/cmd/readme2.txt
trunk/reactos/base/shell/cmd/redir.c
Modified: trunk/reactos/base/shell/cmd/cmd.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=57415&r1=57414&r2=57415&view=diff
==
--- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Fri Sep 28 19:36:49 2012
@@ -409,13 +409,18 @@
/* Prototypes for REDIR.C */
-enum { REDIR_READ, REDIR_WRITE, REDIR_APPEND };
+typedef enum _REDIR_MODE
+{
+ REDIR_READ = 0,
+ REDIR_WRITE = 1,
+ REDIR_APPEND = 2
+} REDIR_MODE;
typedef struct _REDIRECTION
{
struct _REDIRECTION *Next;
HANDLE OldHandle;
BYTE Number;
- BYTE Type;
+ REDIR_MODE Mode;
TCHAR Filename[];
} REDIRECTION;
BOOL PerformRedirection(REDIRECTION *);
Modified: trunk/reactos/base/shell/cmd/parser.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/parser.c?rev=57415&r1=57414&r2=57415&view=diff
==
--- trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] Fri Sep 28 19:36:49 2012
@@ -214,7 +214,7 @@
{
TCHAR *Tok = CurrentToken;
BYTE Number;
- BYTE RedirType;
+ REDIR_MODE RedirMode;
REDIRECTION *Redir;
if (*Tok >= _T('0') && *Tok <= _T('9'))
@@ -224,16 +224,16 @@
if (*Tok++ == _T('<'))
{
- RedirType = REDIR_READ;
+ RedirMode = REDIR_READ;
if (*Tok == _T('<'))
goto fail;
}
else
{
- RedirType = REDIR_WRITE;
+ RedirMode = REDIR_WRITE;
if (*Tok == _T('>'))
{
- RedirType = REDIR_APPEND;
+ RedirMode = REDIR_APPEND;
Tok++;
}
}
@@ -262,7 +262,7 @@
Redir->Next = NULL;
Redir->OldHandle = INVALID_HANDLE_VALUE;
Redir->Number = Number;
- Redir->Type = RedirType;
+ Redir->Mode = RedirMode;
_tcscpy(Redir->Filename, Tok);
*List = Redir;
return TRUE;
@@ -815,7 +815,7 @@
{
if (SubstituteForVars(Redir->Filename, Buf))
ConOutPrintf(_T(" %c%s%s"), _T('0') + Redir->Number,
- RedirString[Redir->Type], Buf);
+ RedirString[Redir->Mode], Buf);
}
}
@@ -916,7 +916,7 @@
{
if (!SubstituteForVars(Redir->Filename, Buf)) return NULL;
PRINTF(_T(" %c%s%s"), _T('0') + Redir->Number,
- RedirString[Redir->Type], Buf)
+ RedirString[Redir->Mode], Buf)
}
return Out;
}
Modified: trunk/reactos/base/shell/cmd/readme2.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/readme2.txt?rev=57415&r1=57414&r2=57415&view=diff
==
--- trunk/reactos/base/shell/cmd/readme2.txt [iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/readme2.txt [iso-8859-1] Fri Sep 28 19:36:49
2012
@@ -15,7 +15,7 @@
Once there is input taken in from the command line it is sent into
ParseCommandLine().
In here we fist check for aliases and convert if need be.
-THen we look for redirections using GetRedirection() which will remove any
redirection symbols.
+Then we look for redirections using GetRedirection() which will remove any
redirection symbols.
and pass back info about where to redirect.
from this info it will do some switching around with the handles for where
things go and send them as need be.
personally i dont like this code and i tried to chnage it before but failed.
Modified: trunk/reactos/base/shell/cmd/redir.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/redir.c?rev=57415&r1=57414&r2=57415&view=diff
==
--- trunk/reactos/base/shell/cmd/redir.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/redir.c [iso-8859-1] Fri Sep 28 19:36:49 2012
@@ -57,23 +57,21 @@
LPTSTR Filename;
HANDLE hNew;
UINT DupNumber;
+
static SECURITY_ATTRIBUTE
[ros-diffs] [hbelusca] 57453: [REGEDIT] - Update informative messages CORE-6239 Patch by Edijs Kolesnikovičs (1/2)
Author: hbelusca
Date: Mon Oct 1 22:00:38 2012
New Revision: 57453
URL: http://svn.reactos.org/svn/reactos?rev=57453&view=rev
Log:
[REGEDIT]
- Update informative messages
CORE-6239 Patch by Edijs Kolesnikovičs (1/2)
Modified:
trunk/reactos/base/applications/regedit/framewnd.c
trunk/reactos/base/applications/regedit/lang/bg-BG.rc
trunk/reactos/base/applications/regedit/lang/cs-CZ.rc
trunk/reactos/base/applications/regedit/lang/de-DE.rc
trunk/reactos/base/applications/regedit/lang/el-GR.rc
trunk/reactos/base/applications/regedit/lang/en-US.rc
trunk/reactos/base/applications/regedit/lang/es-ES.rc
trunk/reactos/base/applications/regedit/lang/fr-FR.rc
trunk/reactos/base/applications/regedit/lang/hu-HU.rc
trunk/reactos/base/applications/regedit/lang/id-ID.rc
trunk/reactos/base/applications/regedit/lang/it-IT.rc
trunk/reactos/base/applications/regedit/lang/ja-JP.rc
trunk/reactos/base/applications/regedit/lang/ko-KR.rc
trunk/reactos/base/applications/regedit/lang/nl-NL.rc
trunk/reactos/base/applications/regedit/lang/no-NO.rc
trunk/reactos/base/applications/regedit/lang/pl-PL.rc
trunk/reactos/base/applications/regedit/lang/pt-BR.rc
trunk/reactos/base/applications/regedit/lang/pt-PT.rc
trunk/reactos/base/applications/regedit/lang/ro-RO.rc
trunk/reactos/base/applications/regedit/lang/ru-RU.rc
trunk/reactos/base/applications/regedit/lang/sk-SK.rc
trunk/reactos/base/applications/regedit/lang/sl-SI.rc
trunk/reactos/base/applications/regedit/lang/sv-SE.rc
trunk/reactos/base/applications/regedit/lang/th-TH.rc
trunk/reactos/base/applications/regedit/lang/uk-UA.rc
trunk/reactos/base/applications/regedit/lang/zh-CN.rc
trunk/reactos/base/applications/regedit/lang/zh-TW.rc
trunk/reactos/base/applications/regedit/regedit.c
trunk/reactos/base/applications/regedit/resource.h
Modified: trunk/reactos/base/applications/regedit/framewnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/framewnd.c?rev=57453&r1=57452&r2=57453&view=diff
==
--- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Mon Oct 1
22:00:38 2012
@@ -469,7 +469,7 @@
{
/* Show successful import */
LoadString(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle));
-LoadString(hInst, IDS_IMPORTED_OK, szText, COUNT_OF(szText));
+LoadString(hInst, IDS_IMPORT_OK, szText, COUNT_OF(szText));
MessageBox(NULL, szText, szTitle, MB_OK);
bRet = TRUE;
}
Modified: trunk/reactos/base/applications/regedit/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/lang/bg-BG.rc?rev=57453&r1=57452&r2=57453&view=diff
==
--- trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] Mon Oct
1 22:00:38 2012
@@ -449,8 +449,9 @@
STRINGTABLE DISCARDABLE
BEGIN
- IDS_IMPORT_PROMPT "Ðа бÑÐ´Ð°Ñ Ð»Ð¸ добавени
данниÑе в ÑегиÑÑÑÑа?"
- IDS_IMPORTED_OK "СведениÑÑа Ñа добавени в
ÑегиÑÑÑÑа"
+ IDS_IMPORT_PROMPT "Adding information can unintentionally
change or delete values and cause components to stop working correctly. If you
do not trust the source of this information in '%1', do not add it to
registry.\n\nAre you sure you want to continue?"
+ IDS_IMPORT_OK "The keys and values contained in '%1' have
been successfully added to the registry."
+ IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file.
There may be a disk, file system error or file may not exist."
END
STRINGTABLE DISCARDABLE
Modified: trunk/reactos/base/applications/regedit/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/lang/cs-CZ.rc?rev=57453&r1=57452&r2=57453&view=diff
==
--- trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] Mon Oct
1 22:00:38 2012
@@ -434,8 +434,9 @@
STRINGTABLE DISCARDABLE
BEGIN
- IDS_IMPORT_PROMPT "PÅidat data do registru?"
- IDS_IMPORTED_OK "Data pÅidána do registru."
+ IDS_IMPORT_PROMPT "Adding information can unintentionally
change or delete values and cause components to stop working correctly.
[ros-diffs] [hbelusca] 57456: [REGEDIT - Fix comment headers. - Improve error-displaying function and add another one (to be used later on). - Clear a part of code.
Author: hbelusca
Date: Mon Oct 1 23:16:43 2012
New Revision: 57456
URL: http://svn.reactos.org/svn/reactos?rev=57456&view=rev
Log:
[REGEDIT
- Fix comment headers.
- Improve error-displaying function and add another one (to be used later on).
- Clear a part of code.
Modified:
trunk/reactos/base/applications/regedit/error.c
trunk/reactos/base/applications/regedit/main.h
trunk/reactos/base/applications/regedit/regedit.c
trunk/reactos/base/applications/regedit/regproc.c
trunk/reactos/base/applications/regedit/settings.c
Modified: trunk/reactos/base/applications/regedit/error.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/error.c?rev=57456&r1=57455&r2=57456&view=diff
==
--- trunk/reactos/base/applications/regedit/error.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/error.c [iso-8859-1] Mon Oct 1
23:16:43 2012
@@ -1,14 +1,76 @@
+/*
+ * Regedit errors, warnings, informations displaying
+ *
+ * Copyright (C) 2010 Adam Kachwalla
+ * Copyright (C) 2012 Hermès Bélusca - Maïto
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
#include
-void ErrorMessageBox(HWND hWnd, LPCTSTR title, DWORD code)
+
+int ErrorMessageBox(HWND hWnd, LPCTSTR lpTitle, DWORD dwErrorCode, ...)
{
-LPTSTR lpMsgBuf;
-DWORD status;
-static const TCHAR fallback[] = TEXT("Error displaying error message.\n");
-status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM,
- NULL, code, 0, (LPTSTR)&lpMsgBuf, 0, NULL);
-if (!status)
-lpMsgBuf = (LPTSTR)fallback;
-MessageBox(hWnd, lpMsgBuf, title, MB_OK | MB_ICONERROR);
-if (lpMsgBuf != fallback)
-LocalFree(lpMsgBuf);
+int iRet = 0;
+LPTSTR lpMsgBuf = NULL;
+DWORD Status = 0;
+
+va_list args = NULL;
+va_start(args, dwErrorCode);
+
+Status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM,
+ NULL,
+ dwErrorCode,
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ (LPTSTR)&lpMsgBuf,
+ 0,
+ &args);
+
+va_end(args);
+
+iRet = MessageBox(hWnd, (Status && lpMsgBuf ? lpMsgBuf : TEXT("Error
displaying error message.\n")), lpTitle, MB_OK | MB_ICONERROR);
+
+if (lpMsgBuf) LocalFree(lpMsgBuf);
+
+/* Return the MessageBox information */
+return iRet;
}
+
+int InfoMessageBox(HWND hWnd, UINT uType, LPCTSTR lpTitle, LPCTSTR lpMessage,
...)
+{
+int iRet = 0;
+LPTSTR lpMsgBuf = NULL;
+DWORD Status = 0;
+
+va_list args = NULL;
+va_start(args, lpMessage);
+
+Status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_STRING,
+ lpMessage,
+ 0,
+ 0,
+ (LPTSTR)&lpMsgBuf,
+ 0,
+ &args);
+
+va_end(args);
+
+iRet = MessageBox(hWnd, (Status && lpMsgBuf ? lpMsgBuf : TEXT("Error
displaying error message.\n")), lpTitle, uType);
+
+if (lpMsgBuf) LocalFree(lpMsgBuf);
+
+/* Return the MessageBox information */
+return iRet;
+}
Modified: trunk/reactos/base/applications/regedit/main.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/main.h?rev=57456&r1=57455&r2=57456&view=diff
==
--- trunk/reactos/base/applications/regedit/main.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/main.h [iso-8859-1] Mon Oct 1
23:16:43 2012
@@ -94,7 +94,8 @@
extern LPCTSTR get_root_key_name(HKEY hRootKey);
/* error.c */
-extern void ErrorMessageBox(HWND hWnd, LPCTSTR title, DWORD code);
+extern int ErrorMessageBox(HWND hWnd, LPCTSTR lpTitle, DWORD dwErrorCode, ...);
+extern int InfoMessageBox(HWND hWnd, UINT uType, LPCTSTR lpTitle, LPCTSTR
lpMessage, ...);
/* find.c */
extern void FindDialog(HWND hWnd);
Modified: trunk/reactos/b
[ros-diffs] [hbelusca] 57462: [REGEDIT] - WCHAR ==> TCHAR in (before a REALLY conversion of regedit into UNICODE) - Correct some mistakes in displayed strings - Improve informative / warning / error m
Author: hbelusca
Date: Tue Oct 2 23:29:22 2012
New Revision: 57462
URL: http://svn.reactos.org/svn/reactos?rev=57462&view=rev
Log:
[REGEDIT]
- WCHAR ==> TCHAR in (before a REALLY conversion of regedit into UNICODE)
- Correct some mistakes in displayed strings
- Improve informative / warning / error messages when importing registry files
- Now, try to import each registry file specified in the command line and don't
fail miserably when one of them is missing, but continue with the next one (as
Windows' regedit does).
Patch by Edijs Kolesnikovičs (2/2) adapted by me.
CORE-6239 #comment Fixed in r57462 with some adaptations. Thanks ;) #resolve
Modified:
trunk/reactos/base/applications/regedit/regedit.c
Modified: trunk/reactos/base/applications/regedit/regedit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/regedit.c?rev=57462&r1=57461&r2=57462&view=diff
==
--- trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] Tue Oct 2
23:29:22 2012
@@ -23,30 +23,31 @@
static const char *usage =
"Usage:\n"
-"regedit filename\n"
+"regedit filenames\n"
"regedit /E filename [regpath]\n"
"regedit /D regpath\n"
"\n"
-"filename - registry file name\n"
-"regpath - name of the registry key\n"
+"filenames - List of registry files names\n"
+"filename - Registry file name\n"
+"regpath - Name of the registry key\n"
"\n"
"When is called without any switches adds contents of the specified\n"
-"registry file to the registry\n"
+"registry files to the registry.\n"
"\n"
"Switches:\n"
-"/E - exports contents of the specified registry key to the
specified\n"
-" file. Exports the whole registry if no key is specified.\n"
-"/D - deletes specified registry key\n"
-"/S - silent execution, can be used with any other switch.\n"
-" The only existing mode, exists for compatibility with Windows
regedit.\n"
-"/V - advanced mode, can be used with any other switch.\n"
-" Ignored, exists for compatibility with Windows regedit.\n"
-"/L - location of system.dat file. Can be used with any other
switch.\n"
-" Ignored. Exists for compatibility with Windows regedit.\n"
-"/R - location of user.dat file. Can be used with any other switch.\n"
-" Ignored. Exists for compatibility with Windows regedit.\n"
-"/? - print this help. Any other switches are ignored.\n"
-"/C - create registry from. Not implemented.\n"
+"/E - Exports contents of the specified registry key to the
specified\n"
+" file. Exports the whole registry if no key is specified.\n"
+"/D - Deletes specified registry key\n"
+"/S - Silent execution, can be used with any other switch.\n"
+" The only existing mode, exists for compatibility with Windows
regedit.\n"
+"/V - Advanced mode, can be used with any other switch.\n"
+" Ignored, exists for compatibility with Windows regedit.\n"
+"/L - Location of system.dat file. Can be used with any other
switch.\n"
+" Ignored. Exists for compatibility with Windows regedit.\n"
+"/R - Location of user.dat file. Can be used with any other switch.\n"
+" Ignored. Exists for compatibility with Windows regedit.\n"
+"/? - Print this help. Any other switches are ignored.\n"
+"/C - Create registry from. Not implemented.\n"
"\n"
"The switches are case-insensitive, can be prefixed either by '-' or
'/'.\n"
"This program is command-line compatible with Microsoft Windows\n"
@@ -74,10 +75,10 @@
* where *s[0] is the first symbol of the file name.
* file_name - buffer to write the file name to.
*/
-void get_file_name(LPWSTR *command_line, LPWSTR file_name)
-{
-WCHAR *s = *command_line;
-int pos = 0;/* position of pointer "s" in *command_line */
+void get_file_name(LPTSTR *command_line, LPTSTR file_name)
+{
+TCHAR *s = *command_line;
+int pos = 0; /* position of pointer "s" in *command_line */
file_name[0] = 0;
if (!s[0])
@@ -85,11 +86,11 @@
return;
}
-if (s[0] == L'"')
+if (s[0] == _T('"'))
{
[ros-diffs] [hbelusca] 57463: [REGEDIT] - Don't forget to close the file handle.
Author: hbelusca
Date: Tue Oct 2 23:43:55 2012
New Revision: 57463
URL: http://svn.reactos.org/svn/reactos?rev=57463&view=rev
Log:
[REGEDIT]
- Don't forget to close the file handle.
Modified:
trunk/reactos/base/applications/regedit/regedit.c
Modified: trunk/reactos/base/applications/regedit/regedit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/regedit.c?rev=57463&r1=57462&r2=57463&view=diff
==
--- trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] Tue Oct 2
23:43:55 2012
@@ -175,6 +175,8 @@
LoadString(hInst, IDS_IMPORT_OK, szText,
COUNT_OF(szText));
InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION,
szTitle, szText, filename);
}
+
+fclose(fp);
}
else
{
[ros-diffs] [hbelusca] 57470: [CLB] - Code cleaning
Author: hbelusca Date: Wed Oct 3 21:58:28 2012 New Revision: 57470 URL: http://svn.reactos.org/svn/reactos?rev=57470&view=rev Log: [CLB] - Code cleaning Modified: trunk/reactos/base/applications/regedit/clb/CMakeLists.txt trunk/reactos/base/applications/regedit/clb/clb.c Modified: trunk/reactos/base/applications/regedit/clb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/clb/CMakeLists.txt?rev=57470&r1=57469&r2=57470&view=diff == --- trunk/reactos/base/applications/regedit/clb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/clb/CMakeLists.txt [iso-8859-1] Wed Oct 3 21:58:28 2012 @@ -10,4 +10,3 @@ set_module_type(clb win32dll UNICODE) add_importlibs(clb user32 gdi32 comctl32 kernel32 ntdll) - Modified: trunk/reactos/base/applications/regedit/clb/clb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/clb/clb.c?rev=57470&r1=57469&r2=57470&view=diff == --- trunk/reactos/base/applications/regedit/clb/clb.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/clb/clb.c [iso-8859-1] Wed Oct 3 21:58:28 2012 @@ -308,3 +308,4 @@ return Ret; } +/* EOF */
[ros-diffs] [hbelusca] 57471: [REGEDIT] - Convert the application's code to UNICODE - But the regproc.c's code is untouched (apart from the pseudo-error messages issued with fprintf)
Author: hbelusca Date: Wed Oct 3 22:42:34 2012 New Revision: 57471 URL: http://svn.reactos.org/svn/reactos?rev=57471&view=rev Log: [REGEDIT] - Convert the application's code to UNICODE - But the regproc.c's code is untouched (apart from the pseudo-error messages issued with fprintf) Modified: trunk/reactos/base/applications/regedit/about.c trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/edit.c trunk/reactos/base/applications/regedit/error.c trunk/reactos/base/applications/regedit/find.c trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/hexedit.c trunk/reactos/base/applications/regedit/hexedit.h trunk/reactos/base/applications/regedit/listview.c trunk/reactos/base/applications/regedit/main.c trunk/reactos/base/applications/regedit/main.h trunk/reactos/base/applications/regedit/regedit.c trunk/reactos/base/applications/regedit/regedit.h trunk/reactos/base/applications/regedit/regproc.c trunk/reactos/base/applications/regedit/regproc.h trunk/reactos/base/applications/regedit/resource.h trunk/reactos/base/applications/regedit/security.c trunk/reactos/base/applications/regedit/security.h trunk/reactos/base/applications/regedit/settings.c trunk/reactos/base/applications/regedit/treeview.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/regedit/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/about.c?rev=57471&r1=57470&r2=57471&view=diff Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/childwnd.c?rev=57471&r1=57470&r2=57471&view=diff Modified: trunk/reactos/base/applications/regedit/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/edit.c?rev=57471&r1=57470&r2=57471&view=diff Modified: trunk/reactos/base/applications/regedit/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/error.c?rev=57471&r1=57470&r2=57471&view=diff Modified: trunk/reactos/base/applications/regedit/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/find.c?rev=57471&r1=57470&r2=57471&view=diff Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/framewnd.c?rev=57471&r1=57470&r2=57471&view=diff Modified: trunk/reactos/base/applications/regedit/hexedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/hexedit.c?rev=57471&r1=57470&r2=57471&view=diff Modified: trunk/reactos/base/applications/regedit/hexedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/hexedit.h?rev=57471&r1=57470&r2=57471&view=diff Modified: trunk/reactos/base/applications/regedit/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/listview.c?rev=57471&r1=57470&r2=57471&view=diff Modified: trunk/reactos/base/applications/regedit/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/main.c?rev=57471&r1=57470&r2=57471&view=diff Modified: trunk/reactos/base/applications/regedit/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/main.h?rev=57471&r1=57470&r2=57471&view=diff Modified: trunk/reactos/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/regedit.c?rev=57471&r1=57470&r2=57471&view=diff Modified: trunk/reactos/base/applications/regedit/regedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/regedit.h?rev=57471&r1=57470&r2=57471&view=diff Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/regproc.c?rev=57471&r1=57470&r2=57471&view=diff Modified: trunk/reactos/base/applications/regedit/regproc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/regproc.h?rev=57471&r1=57470&r2=57471&view=diff Modified: trunk/reactos/base/applications/regedit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/resource.h?rev=57471&r1=57470&r2=57471&view=diff Modified: trunk/reactos/base/applications/regedit/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/security.c?rev=57471&r1=57470&r2=57471&view=diff Modified: trunk/reactos/base/applications/regedit/security.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/appli
[ros-diffs] [hbelusca] 57472: [REGEDIT] - Forgot to remove a comment
Author: hbelusca Date: Wed Oct 3 22:50:06 2012 New Revision: 57472 URL: http://svn.reactos.org/svn/reactos?rev=57472&view=rev Log: [REGEDIT] - Forgot to remove a comment Modified: trunk/reactos/base/applications/regedit/regedit.h Modified: trunk/reactos/base/applications/regedit/regedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/regedit.h?rev=57472&r1=57471&r2=57472&view=diff == --- trunk/reactos/base/applications/regedit/regedit.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.h [iso-8859-1] Wed Oct 3 22:50:06 2012 @@ -12,7 +12,6 @@ #include #include #include -//#include #include #include #include
[ros-diffs] [hbelusca] 57473: [REGEDIT] ... and this line of code (I'm sorry for the generated noise :-( )
Author: hbelusca
Date: Wed Oct 3 22:51:53 2012
New Revision: 57473
URL: http://svn.reactos.org/svn/reactos?rev=57473&view=rev
Log:
[REGEDIT]
... and this line of code (I'm sorry for the generated noise :-( )
Modified:
trunk/reactos/base/applications/regedit/main.c
Modified: trunk/reactos/base/applications/regedit/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/main.c?rev=57473&r1=57472&r2=57473&view=diff
==
--- trunk/reactos/base/applications/regedit/main.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/main.c [iso-8859-1] Wed Oct 3
22:51:53 2012
@@ -197,7 +197,6 @@
UNREFERENCED_PARAMETER(hPrevInstance);
-InfoMessageBox(NULL, MB_OK | MB_ICONERROR, L"Main", L"Main '%1'",
lpCmdLine);
if (ProcessCmdLine(lpCmdLine))
{
return 0;
[ros-diffs] [hbelusca] 57490: [REGEDIT] - Re-number some resource IDs. - Add key exportation message-box error (thus removing some fwprintf calls). - Use IDS_MY_COMPUTER localized string instead of ha
Author: hbelusca
Date: Fri Oct 5 20:08:16 2012
New Revision: 57490
URL: http://svn.reactos.org/svn/reactos?rev=57490&view=rev
Log:
[REGEDIT]
- Re-number some resource IDs.
- Add key exportation message-box error (thus removing some fwprintf calls).
- Use IDS_MY_COMPUTER localized string instead of hardcoded one.
Modified:
trunk/reactos/base/applications/regedit/childwnd.c
trunk/reactos/base/applications/regedit/framewnd.c
trunk/reactos/base/applications/regedit/lang/bg-BG.rc
trunk/reactos/base/applications/regedit/lang/cs-CZ.rc
trunk/reactos/base/applications/regedit/lang/de-DE.rc
trunk/reactos/base/applications/regedit/lang/el-GR.rc
trunk/reactos/base/applications/regedit/lang/en-US.rc
trunk/reactos/base/applications/regedit/lang/es-ES.rc
trunk/reactos/base/applications/regedit/lang/fr-FR.rc
trunk/reactos/base/applications/regedit/lang/hu-HU.rc
trunk/reactos/base/applications/regedit/lang/id-ID.rc
trunk/reactos/base/applications/regedit/lang/it-IT.rc
trunk/reactos/base/applications/regedit/lang/ja-JP.rc
trunk/reactos/base/applications/regedit/lang/ko-KR.rc
trunk/reactos/base/applications/regedit/lang/nl-NL.rc
trunk/reactos/base/applications/regedit/lang/no-NO.rc
trunk/reactos/base/applications/regedit/lang/pl-PL.rc
trunk/reactos/base/applications/regedit/lang/pt-BR.rc
trunk/reactos/base/applications/regedit/lang/pt-PT.rc
trunk/reactos/base/applications/regedit/lang/ro-RO.rc
trunk/reactos/base/applications/regedit/lang/ru-RU.rc
trunk/reactos/base/applications/regedit/lang/sk-SK.rc
trunk/reactos/base/applications/regedit/lang/sl-SI.rc
trunk/reactos/base/applications/regedit/lang/sv-SE.rc
trunk/reactos/base/applications/regedit/lang/th-TH.rc
trunk/reactos/base/applications/regedit/lang/uk-UA.rc
trunk/reactos/base/applications/regedit/lang/zh-CN.rc
trunk/reactos/base/applications/regedit/lang/zh-TW.rc
trunk/reactos/base/applications/regedit/regedit.c
trunk/reactos/base/applications/regedit/resource.h
trunk/reactos/base/applications/regedit/settings.c
trunk/reactos/base/applications/regedit/treeview.c
Modified: trunk/reactos/base/applications/regedit/childwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/childwnd.c?rev=57490&r1=57489&r2=57490&view=diff
==
--- trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] Fri Oct 5
20:08:16 2012
@@ -325,7 +325,8 @@
WNDPROC oldproc;
HFONT hFont;
WCHAR buffer[MAX_PATH];
-/* load "My Computer" string */
+
+/* Load "My Computer" string */
LoadStringW(hInst, IDS_MY_COMPUTER, buffer, COUNT_OF(buffer));
g_pChildWnd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
sizeof(ChildWnd));
Modified: trunk/reactos/base/applications/regedit/framewnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/framewnd.c?rev=57490&r1=57489&r2=57490&view=diff
==
--- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Fri Oct 5
20:08:16 2012
@@ -85,8 +85,7 @@
}
else
{
-while(RemoveMenu(hMenu, s_nFavoriteMenuSubPos, MF_BYPOSITION))
-;
+while(RemoveMenu(hMenu, s_nFavoriteMenuSubPos, MF_BYPOSITION)) ;
}
lResult = RegOpenKeyW(HKEY_CURRENT_USER, s_szFavoritesRegKey, &hKey);
@@ -436,7 +435,7 @@
{
BOOL bRet = FALSE;
OPENFILENAME ofn;
-WCHAR Caption[128], szTitle[256], szText[256];
+WCHAR Caption[128], szTitle[512], szText[512];
HKEY hKeyRoot;
LPCWSTR pszKeyPath;
@@ -455,14 +454,15 @@
wcsicmp(ofn.lpstrFile + ofn.nFileExtension, L"reg") == 0) /*
REGEDIT4 or Windows Registry Editor Version 5.00 */
{
/* Open the file */
-FILE *fp = _wfopen(ofn.lpstrFile, L"r");
+FILE* fp = _wfopen(ofn.lpstrFile, L"r");
/* Import it */
if (fp == NULL || !import_registry_file(fp))
{
-LPSTR p = GetMultiByteString(ofn.lpstrFile);
-fwprintf(stderr, L"Can't open file \"%s\"\n", p);
-HeapFree(GetProcessHeap(), 0, p);
+/* Error opening the file */
+LoadStringW(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle));
+LoadStringW(hInst, IDS_IMPORT_ERROR, szText, COUNT_OF(szText));
+InfoMessageBox(hWnd, MB_OK | MB_ICONERROR, szTitle, szText,
ofn.lpstrFile);
bRet = FALSE;
}
else
@@ -470,7 +470,7 @@
[ros-diffs] [hbelusca] 57498: [NTDLL_APITEST] Initialize Length to default value.
Author: hbelusca
Date: Sat Oct 6 14:50:18 2012
New Revision: 57498
URL: http://svn.reactos.org/svn/reactos?rev=57498&view=rev
Log:
[NTDLL_APITEST]
Initialize Length to default value.
Modified:
trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c
Modified: trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c?rev=57498&r1=57497&r2=57498&view=diff
==
--- trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c [iso-8859-1] Sat Oct 6
14:50:18 2012
@@ -101,7 +101,7 @@
START_TEST(RtlDosSearchPath_U)
{
NTSTATUS ExceptionStatus;
-ULONG Length;
+ULONG Length = 0;
WCHAR Buffer[MAX_PATH];
PWSTR PartName;
BOOLEAN Okay;
[ros-diffs] [hbelusca] 57499: [NTOSKRNL] Fix Coverity defects : CID 716579, 716580 and 716582.
Author: hbelusca
Date: Sat Oct 6 18:46:13 2012
New Revision: 57499
URL: http://svn.reactos.org/svn/reactos?rev=57499&view=rev
Log:
[NTOSKRNL]
Fix Coverity defects : CID 716579, 716580 and 716582.
Modified:
trunk/reactos/ntoskrnl/fstub/fstubex.c
trunk/reactos/ntoskrnl/io/iomgr/driver.c
trunk/reactos/ntoskrnl/io/iomgr/error.c
Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?rev=57499&r1=57498&r2=57499&view=diff
==
--- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Sat Oct 6 18:46:13 2012
@@ -1605,7 +1605,7 @@
DriveLayout);
/* Free allocated structure and return */
-ExFreePool(DriveLayout);
+ExFreePoolWithTag(DriveLayout, 'BtsF');
return Status;
}
Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c?rev=57499&r1=57498&r2=57499&view=diff
==
--- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sat Oct 6 18:46:13
2012
@@ -1770,7 +1770,7 @@
if (!Inserted)
{
/* Free the entry and fail */
-ExFreePool(NewDriverExtension);
+ExFreePoolWithTag(NewDriverExtension, TAG_DRIVER_EXTENSION);
return STATUS_OBJECT_NAME_COLLISION;
}
Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/error.c?rev=57499&r1=57498&r2=57499&view=diff
==
--- trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] Sat Oct 6 18:46:13
2012
@@ -486,14 +486,33 @@
{
PERROR_LOG_ENTRY LogEntry;
ULONG LogEntrySize;
+PDEVICE_OBJECT DeviceObject;
PDRIVER_OBJECT DriverObject;
-PDEVICE_OBJECT DeviceObject;
/* Make sure we have an object */
if (!IoObject) return NULL;
/* Check if we're past our buffer */
if (IopTotalLogSize > PAGE_SIZE) return NULL;
+
+/* Check if this is a device object or driver object */
+if (((PDEVICE_OBJECT)IoObject)->Type == IO_TYPE_DEVICE)
+{
+/* It's a device, get the driver */
+DeviceObject = (PDEVICE_OBJECT)IoObject;
+DriverObject = DeviceObject->DriverObject;
+}
+else if (((PDEVICE_OBJECT)IoObject)->Type == IO_TYPE_DRIVER)
+{
+/* It's a driver, so we don't have a device */
+DeviceObject = NULL;
+DriverObject = (PDRIVER_OBJECT)IoObject;
+}
+else
+{
+/* Fail */
+return NULL;
+}
/* Calculate the total size and allocate it */
LogEntrySize = sizeof(ERROR_LOG_ENTRY) + EntrySize;
@@ -501,25 +520,6 @@
LogEntrySize,
TAG_ERROR_LOG);
if (!LogEntry) return NULL;
-
-/* Check if this is a device object or driver object */
-if (((PDEVICE_OBJECT)IoObject)->Type == IO_TYPE_DEVICE)
-{
-/* It's a device, get the driver */
-DeviceObject = (PDEVICE_OBJECT)IoObject;
-DriverObject = DeviceObject->DriverObject;
-}
-else if (((PDEVICE_OBJECT)IoObject)->Type == IO_TYPE_DRIVER)
-{
-/* It's a driver, so we don' thave a device */
-DeviceObject = NULL;
-DriverObject = IoObject;
-}
-else
-{
-/* Fail */
-return NULL;
-}
/* Reference the Objects */
if (DeviceObject) ObReferenceObject(DeviceObject);
[ros-diffs] [hbelusca] 57500: [NTOSKRNL] Use TAG_FSTUB instead of 'BtsF'
Author: hbelusca
Date: Sat Oct 6 18:49:23 2012
New Revision: 57500
URL: http://svn.reactos.org/svn/reactos?rev=57500&view=rev
Log:
[NTOSKRNL]
Use TAG_FSTUB instead of 'BtsF'
Modified:
trunk/reactos/ntoskrnl/fstub/fstubex.c
Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?rev=57500&r1=57499&r2=57500&view=diff
==
--- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Sat Oct 6 18:49:23 2012
@@ -269,7 +269,7 @@
DriveLayout = ExAllocatePoolWithTag(NonPagedPool,
FIELD_OFFSET(DRIVE_LAYOUT_INFORMATION,
PartitionEntry) +
LayoutEx->PartitionCount *
sizeof(PARTITION_INFORMATION),
-'BtsF');
+TAG_FSTUB);
if (!DriveLayout)
{
return NULL;
@@ -1605,7 +1605,7 @@
DriveLayout);
/* Free allocated structure and return */
-ExFreePoolWithTag(DriveLayout, 'BtsF');
+ExFreePoolWithTag(DriveLayout, TAG_FSTUB);
return Status;
}
[ros-diffs] [hbelusca] 57504: [NTOSKRNL] Rearrange the NtQuerySystemEnvironmentValue code to have successive logical checks.
Author: hbelusca
Date: Sat Oct 6 19:50:17 2012
New Revision: 57504
URL: http://svn.reactos.org/svn/reactos?rev=57504&view=rev
Log:
[NTOSKRNL]
Rearrange the NtQuerySystemEnvironmentValue code to have successive logical
checks.
Modified:
trunk/reactos/ntoskrnl/ex/sysinfo.c
Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=57504&r1=57503&r2=57504&view=diff
==
--- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sat Oct 6 19:50:17 2012
@@ -235,44 +235,40 @@
_SEH2_YIELD(return _SEH2_GetExceptionCode());
}
_SEH2_END;
-
-}
-
-/* Allocate a buffer for the value */
-AnsiValueBuffer = ExAllocatePoolWithTag(NonPagedPool, ValueBufferLength,
'pmeT');
-if (AnsiValueBuffer == NULL)
-{
-return STATUS_INSUFFICIENT_RESOURCES;
-}
-
-/*
- * Copy the name to kernel space if necessary and convert it to ANSI.
- */
+}
+
+/* According to NTInternals the SeSystemEnvironmentName privilege is
required! */
+if (!SeSinglePrivilegeCheck(SeSystemEnvironmentPrivilege, PreviousMode))
+{
+DPRINT1("NtQuerySystemEnvironmentValue: Caller requires the
SeSystemEnvironmentPrivilege privilege!\n");
+return STATUS_PRIVILEGE_NOT_HELD;
+}
+
+/* Copy the name to kernel space if necessary */
Status = ProbeAndCaptureUnicodeString(&WName, PreviousMode, VariableName);
if (!NT_SUCCESS(Status))
{
return Status;
}
-/*
- * according to ntinternals the SeSystemEnvironmentName privilege is
required!
- */
-if (!SeSinglePrivilegeCheck(SeSystemEnvironmentPrivilege, PreviousMode))
-{
-ReleaseCapturedUnicodeString(&WName, PreviousMode);
-DPRINT1("NtQuerySystemEnvironmentValue: Caller requires the
SeSystemEnvironmentPrivilege privilege!\n");
-return STATUS_PRIVILEGE_NOT_HELD;
-}
-
-/* Convert the value name to ansi and release the captured unicode string
*/
+/* Convert the name to ANSI and release the captured UNICODE string */
Status = RtlUnicodeStringToAnsiString(&AName, &WName, TRUE);
ReleaseCapturedUnicodeString(&WName, PreviousMode);
if (!NT_SUCCESS(Status)) return Status;
-/* Get the environment variable */
+/* Allocate a buffer for the ANSI environment variable */
+AnsiValueBuffer = ExAllocatePoolWithTag(NonPagedPool, ValueBufferLength,
'pmeT');
+if (AnsiValueBuffer == NULL)
+{
+RtlFreeAnsiString(&AName);
+return STATUS_INSUFFICIENT_RESOURCES;
+}
+
+/* Get the environment variable and free the ANSI name */
Result = HalGetEnvironmentVariable(AName.Buffer,
(USHORT)ValueBufferLength,
AnsiValueBuffer);
+RtlFreeAnsiString(&AName);
/* Check if we had success */
if (Result == ESUCCESS)
@@ -280,13 +276,13 @@
/* Copy the result back to the caller. */
_SEH2_TRY
{
-/* Initialize ansi string from the result */
+/* Initialize ANSI string from the result */
RtlInitAnsiString(&AValue, AnsiValueBuffer);
-/* Initialize a unicode string from the callers buffer */
+/* Initialize a UNICODE string from the callers buffer */
RtlInitEmptyUnicodeString(&WValue, ValueBuffer, ValueBufferLength);
-/* Convert the result to unicode */
+/* Convert the result to UNICODE */
Status = RtlAnsiStringToUnicodeString(&WValue, &AValue, FALSE);
if (ReturnLength != NULL)
@@ -305,8 +301,7 @@
Status = STATUS_UNSUCCESSFUL;
}
-/* Cleanup allocated resources. */
-RtlFreeAnsiString(&AName);
+/* Free the allocated ANSI value buffer */
ExFreePoolWithTag(AnsiValueBuffer, 'pmeT');
return Status;
[ros-diffs] [hbelusca] 57506: [NTOSKRNL] Some ExFreePool -> ExFreePoolWithTag CORE-6725 #resolve #comment Committed in r57506.
Author: hbelusca
Date: Sat Oct 6 21:42:19 2012
New Revision: 57506
URL: http://svn.reactos.org/svn/reactos?rev=57506&view=rev
Log:
[NTOSKRNL]
Some ExFreePool -> ExFreePoolWithTag
CORE-6725 #resolve #comment Committed in r57506.
Modified:
trunk/reactos/ntoskrnl/mm/ARM3/ncache.c
trunk/reactos/ntoskrnl/mm/freelist.c
Modified: trunk/reactos/ntoskrnl/mm/ARM3/ncache.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/ncache.c?rev=57506&r1=57505&r2=57506&view=diff
==
--- trunk/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] Sat Oct 6 21:42:19
2012
@@ -71,7 +71,7 @@
//
ASSERT(PageCount > MdlPageCount);
MmFreePagesFromMdl(Mdl);
-ExFreePool(Mdl);
+ExFreePoolWithTag(Mdl, TAG_MDL);
return NULL;
}
@@ -86,7 +86,7 @@
// Out of memory...
//
MmFreePagesFromMdl(Mdl);
-ExFreePool(Mdl);
+ExFreePoolWithTag(Mdl, TAG_MDL);
return NULL;
}
@@ -201,7 +201,7 @@
// Kill the MDL (and underlying pages)
//
MmFreePagesFromMdl(Mdl);
-ExFreePool(Mdl);
+ExFreePoolWithTag(Mdl, TAG_MDL);
//
// Now free the system PTEs for the underlying VA
Modified: trunk/reactos/ntoskrnl/mm/freelist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev=57506&r1=57505&r2=57506&view=diff
==
--- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sat Oct 6 21:42:19 2012
@@ -345,7 +345,7 @@
// If we didn' tfind any pages at all, fail
//
DPRINT1("NO MDL PAGES!\n");
-ExFreePool(Mdl);
+ExFreePoolWithTag(Mdl, TAG_MDL);
return NULL;
}
[ros-diffs] [hbelusca] 57512: [APITEST:NTDLL] Add a test for the NtQuerySystemEnvironmentValue API. Tested successfully under Win2k3 SP1 and Win7.
Author: hbelusca
Date: Sun Oct 7 12:31:13 2012
New Revision: 57512
URL: http://svn.reactos.org/svn/reactos?rev=57512&view=rev
Log:
[APITEST:NTDLL]
Add a test for the NtQuerySystemEnvironmentValue API.
Tested successfully under Win2k3 SP1 and Win7.
Added:
trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c (with props)
Modified:
trunk/rostests/apitests/ntdll/CMakeLists.txt
trunk/rostests/apitests/ntdll/testlist.c
Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists.txt?rev=57512&r1=57511&r2=57512&view=diff
==
--- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sun Oct 7
12:31:13 2012
@@ -2,6 +2,7 @@
list(APPEND SOURCE
NtAllocateVirtualMemory.c
NtFreeVirtualMemory.c
+NtQuerySystemEnvironmentValue.c
RtlBitmap.c
RtlDetermineDosPathNameType.c
RtlDoesFileExists.c
Added: trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c?rev=57512&view=auto
==
--- trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c (added)
+++ trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c [iso-8859-1]
Sun Oct 7 12:31:13 2012
@@ -1,0 +1,119 @@
+/*
+ * PROJECT: ReactOS API Tests
+ * LICENSE: GPLv2+ - See COPYING in the top level directory
+ * PURPOSE: Test for the NtQuerySystemEnvironmentValue.
+ * PROGRAMMER: Hermès BÃLUSCA - MAÃTO
+ */
+
+#define WIN32_NO_STATUS
+#include
+#include
+#include
+
+// Arbitrary-defined constants
+#define MIN_BUFFER_LENGTH 4L
+#define MAX_BUFFER_LENGTH 2048L
+
+#define COUNT_OF(x) (sizeof((x))/sizeof((x)[0]))
+
+static struct TEST_CASES
+{
+NTSTATUSResult;
+UNICODE_STRING VariableName;
+BOOLEAN AdjustPrivileges;
+ULONG ValueBufferLength;
+ULONG MinimalExpectedReturnedLength;
+ULONG MaximalExpectedReturnedLength;
+} TestCases[] =
+{
+//
+// Non-existent variable name.
+//
+{STATUS_PRIVILEGE_NOT_HELD, RTL_CONSTANT_STRING(L"NonExistent"), FALSE,
0, 0, 0},
+{STATUS_PRIVILEGE_NOT_HELD, RTL_CONSTANT_STRING(L"NonExistent"), FALSE,
MIN_BUFFER_LENGTH, 0, 0},
+{STATUS_PRIVILEGE_NOT_HELD, RTL_CONSTANT_STRING(L"NonExistent"), FALSE,
MAX_BUFFER_LENGTH, 0, 0},
+{STATUS_UNSUCCESSFUL , RTL_CONSTANT_STRING(L"NonExistent"), TRUE ,
0, 0, 0},
+{STATUS_UNSUCCESSFUL , RTL_CONSTANT_STRING(L"NonExistent"), TRUE ,
MIN_BUFFER_LENGTH, 0, 0},
+{STATUS_UNSUCCESSFUL , RTL_CONSTANT_STRING(L"NonExistent"), TRUE ,
MAX_BUFFER_LENGTH, 0, 0},
+
+//
+// Existent variable name.
+//
+{STATUS_PRIVILEGE_NOT_HELD, RTL_CONSTANT_STRING(L"LastKnownGood"), FALSE,
0, 0, 0},
+{STATUS_PRIVILEGE_NOT_HELD, RTL_CONSTANT_STRING(L"LastKnownGood"), FALSE,
MIN_BUFFER_LENGTH, 0, 0},
+{STATUS_PRIVILEGE_NOT_HELD, RTL_CONSTANT_STRING(L"LastKnownGood"), FALSE,
MAX_BUFFER_LENGTH, 0, 0},
+{STATUS_BUFFER_OVERFLOW , RTL_CONSTANT_STRING(L"LastKnownGood"), TRUE ,
0, MIN_BUFFER_LENGTH, MAX_BUFFER_LENGTH},
+{STATUS_BUFFER_OVERFLOW , RTL_CONSTANT_STRING(L"LastKnownGood"), TRUE ,
MIN_BUFFER_LENGTH, MIN_BUFFER_LENGTH, MAX_BUFFER_LENGTH},
+{STATUS_SUCCESS , RTL_CONSTANT_STRING(L"LastKnownGood"), TRUE ,
MAX_BUFFER_LENGTH, MIN_BUFFER_LENGTH, MAX_BUFFER_LENGTH},
+};
+
+static NTSTATUS Test_API(IN BOOLEAN AdjustPrivileges,
+ IN PUNICODE_STRING VariableName,
+ OUT PWSTR ValueBuffer,
+ IN ULONG ValueBufferLength,
+ IN OUT PULONG ReturnLength OPTIONAL)
+{
+NTSTATUS Status;
+BOOLEAN WasEnabled;
+
+//
+// Adjust the privileges if asked for (we need to
+// have already administrator privileges to do so).
+//
+if (AdjustPrivileges)
+{
+Status = RtlAdjustPrivilege(SE_SYSTEM_ENVIRONMENT_PRIVILEGE,
+TRUE,
+FALSE,
+&WasEnabled);
+ok(NT_SUCCESS(Status), "RtlAdjustPrivilege failed : 0x%08lx\n",
Status);
+}
+
+//
+// Get the system environment value and set the privilege back.
+//
+Status = NtQuerySystemEnvironmentValue(VariableName,
+ ValueBuffer,
+ ValueBufferLength,
+ ReturnLength);
+
+if (Adjus
[ros-diffs] [hbelusca] 57513: [APITEST:NTDLL] Improve the code.
Author: hbelusca
Date: Sun Oct 7 12:46:44 2012
New Revision: 57513
URL: http://svn.reactos.org/svn/reactos?rev=57513&view=rev
Log:
[APITEST:NTDLL]
Improve the code.
Modified:
trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c
Modified: trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c?rev=57513&r1=57512&r2=57513&view=diff
==
--- trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c [iso-8859-1]
(original)
+++ trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c [iso-8859-1]
Sun Oct 7 12:46:44 2012
@@ -16,7 +16,7 @@
#define COUNT_OF(x) (sizeof((x))/sizeof((x)[0]))
-static struct TEST_CASES
+typedef struct _TEST_CASE
{
NTSTATUSResult;
UNICODE_STRING VariableName;
@@ -24,7 +24,9 @@
ULONG ValueBufferLength;
ULONG MinimalExpectedReturnedLength;
ULONG MaximalExpectedReturnedLength;
-} TestCases[] =
+} TEST_CASE, *PTEST_CASE;
+
+static TEST_CASE TestCases[] =
{
//
// Non-existent variable name.
@@ -47,20 +49,18 @@
{STATUS_SUCCESS , RTL_CONSTANT_STRING(L"LastKnownGood"), TRUE ,
MAX_BUFFER_LENGTH, MIN_BUFFER_LENGTH, MAX_BUFFER_LENGTH},
};
-static NTSTATUS Test_API(IN BOOLEAN AdjustPrivileges,
- IN PUNICODE_STRING VariableName,
- OUT PWSTR ValueBuffer,
- IN ULONG ValueBufferLength,
- IN OUT PULONG ReturnLength OPTIONAL)
+static void Test_API(IN PTEST_CASE TestCase)
{
-NTSTATUS Status;
-BOOLEAN WasEnabled;
+NTSTATUS Status = STATUS_SUCCESS;
+BOOLEAN WasEnabled = FALSE;
+WCHARValueBuffer[MAX_BUFFER_LENGTH / sizeof(WCHAR)];
+ULONGReturnedLength = 0;
//
// Adjust the privileges if asked for (we need to
// have already administrator privileges to do so).
//
-if (AdjustPrivileges)
+if (TestCase->AdjustPrivileges)
{
Status = RtlAdjustPrivilege(SE_SYSTEM_ENVIRONMENT_PRIVILEGE,
TRUE,
@@ -72,12 +72,12 @@
//
// Get the system environment value and set the privilege back.
//
-Status = NtQuerySystemEnvironmentValue(VariableName,
+Status = NtQuerySystemEnvironmentValue(&TestCase->VariableName,
ValueBuffer,
- ValueBufferLength,
- ReturnLength);
+ TestCase->ValueBufferLength,
+ &ReturnedLength);
-if (AdjustPrivileges)
+if (TestCase->AdjustPrivileges)
{
RtlAdjustPrivilege(SE_SYSTEM_ENVIRONMENT_PRIVILEGE,
WasEnabled,
@@ -85,34 +85,28 @@
&WasEnabled);
}
-return Status;
+//
+// Now check the results.
+//
+ok(Status == TestCase->Result,
+ "NtQuerySystemEnvironmentValue failed, returned 0x%08lx, expected
0x%08lx\n",
+ Status,
+ TestCase->Result);
+
+ok( ((TestCase->MinimalExpectedReturnedLength <= ReturnedLength) &&
(ReturnedLength <= TestCase->MaximalExpectedReturnedLength)),
+"Returned length %lu, expected between %lu and %lu\n",
+ReturnedLength,
+TestCase->MinimalExpectedReturnedLength,
+TestCase->MaximalExpectedReturnedLength);
}
START_TEST(NtQuerySystemEnvironmentValue)
{
-NTSTATUS Status;
-WCHAR ValueBuffer[MAX_BUFFER_LENGTH / sizeof(WCHAR)];
-ULONG ReturnedLength = 0;
ULONG i;
for (i = 0 ; i < COUNT_OF(TestCases) ; ++i)
{
-Status = Test_API(TestCases[i].AdjustPrivileges,
- &TestCases[i].VariableName,
- ValueBuffer,
- TestCases[i].ValueBufferLength,
- &ReturnedLength);
-
-ok(Status == TestCases[i].Result,
- "NtQuerySystemEnvironmentValue failed, returned 0x%08lx, expected
0x%08lx\n",
- Status,
- TestCases[i].Result);
-
-ok( ((TestCases[i].MinimalExpectedReturnedLength <= ReturnedLength) &&
(ReturnedLength <= TestCases[i].MaximalExpectedReturnedLength)),
-"Returned length %lu, expected between %lu and %lu\n",
-ReturnedLength,
-TestCases[i].MinimalExpectedReturnedLength,
-TestCases[i].MaximalExpectedReturnedLength);
+Test_API(&TestCases[i]);
}
}
[ros-diffs] [hbelusca] 57514: [NTOSKRNL] In NtQuerySystemEnvironmentValue : - Use a fixed-length buffer size for holding a temporary variable. - Correct the pool TAG.
Author: hbelusca
Date: Sun Oct 7 14:16:13 2012
New Revision: 57514
URL: http://svn.reactos.org/svn/reactos?rev=57514&view=rev
Log:
[NTOSKRNL]
In NtQuerySystemEnvironmentValue :
- Use a fixed-length buffer size for holding a temporary variable.
- Correct the pool TAG.
Modified:
trunk/reactos/ntoskrnl/ex/sysinfo.c
Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=57514&r1=57513&r2=57514&view=diff
==
--- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sun Oct 7 14:16:13 2012
@@ -13,6 +13,9 @@
#include
#define NDEBUG
#include
+
+/* The maximum size of an environment value (in bytes) */
+#define MAX_ENVVAL_SIZE 1024
FAST_MUTEX ExpEnvironmentLock;
ERESOURCE ExpFirmwareTableResource;
@@ -246,10 +249,7 @@
/* Copy the name to kernel space if necessary */
Status = ProbeAndCaptureUnicodeString(&WName, PreviousMode, VariableName);
-if (!NT_SUCCESS(Status))
-{
-return Status;
-}
+if (!NT_SUCCESS(Status)) return Status;
/* Convert the name to ANSI and release the captured UNICODE string */
Status = RtlUnicodeStringToAnsiString(&AName, &WName, TRUE);
@@ -257,7 +257,7 @@
if (!NT_SUCCESS(Status)) return Status;
/* Allocate a buffer for the ANSI environment variable */
-AnsiValueBuffer = ExAllocatePoolWithTag(NonPagedPool, ValueBufferLength,
'pmeT');
+AnsiValueBuffer = ExAllocatePoolWithTag(NonPagedPool, MAX_ENVVAL_SIZE,
'rvnE');
if (AnsiValueBuffer == NULL)
{
RtlFreeAnsiString(&AName);
@@ -266,7 +266,7 @@
/* Get the environment variable and free the ANSI name */
Result = HalGetEnvironmentVariable(AName.Buffer,
- (USHORT)ValueBufferLength,
+ MAX_ENVVAL_SIZE,
AnsiValueBuffer);
RtlFreeAnsiString(&AName);
@@ -286,9 +286,7 @@
Status = RtlAnsiStringToUnicodeString(&WValue, &AValue, FALSE);
if (ReturnLength != NULL)
-{
*ReturnLength = WValue.Length;
-}
}
_SEH2_EXCEPT(ExSystemExceptionFilter())
{
@@ -302,7 +300,7 @@
}
/* Free the allocated ANSI value buffer */
-ExFreePoolWithTag(AnsiValueBuffer, 'pmeT');
+ExFreePoolWithTag(AnsiValueBuffer, 'rvnE');
return Status;
}
[ros-diffs] [hbelusca] 57515: [APITEST:NTDLL] Add a parameter for displaying the current test number when something fails.
Author: hbelusca
Date: Sun Oct 7 14:17:37 2012
New Revision: 57515
URL: http://svn.reactos.org/svn/reactos?rev=57515&view=rev
Log:
[APITEST:NTDLL]
Add a parameter for displaying the current test number when something fails.
Modified:
trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c
Modified: trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c?rev=57515&r1=57514&r2=57515&view=diff
==
--- trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c [iso-8859-1]
(original)
+++ trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c [iso-8859-1]
Sun Oct 7 14:17:37 2012
@@ -49,7 +49,8 @@
{STATUS_SUCCESS , RTL_CONSTANT_STRING(L"LastKnownGood"), TRUE ,
MAX_BUFFER_LENGTH, MIN_BUFFER_LENGTH, MAX_BUFFER_LENGTH},
};
-static void Test_API(IN PTEST_CASE TestCase)
+static void Test_API(IN ULONG TestNumber,
+ IN PTEST_CASE TestCase)
{
NTSTATUS Status = STATUS_SUCCESS;
BOOLEAN WasEnabled = FALSE;
@@ -66,7 +67,7 @@
TRUE,
FALSE,
&WasEnabled);
-ok(NT_SUCCESS(Status), "RtlAdjustPrivilege failed : 0x%08lx\n",
Status);
+ok(NT_SUCCESS(Status), "RtlAdjustPrivilege(%lu) failed : 0x%08lx\n",
TestNumber, Status);
}
//
@@ -89,12 +90,14 @@
// Now check the results.
//
ok(Status == TestCase->Result,
- "NtQuerySystemEnvironmentValue failed, returned 0x%08lx, expected
0x%08lx\n",
+ "NtQuerySystemEnvironmentValue(%lu) failed : returned 0x%08lx, expected
0x%08lx\n",
+ TestNumber,
Status,
TestCase->Result);
ok( ((TestCase->MinimalExpectedReturnedLength <= ReturnedLength) &&
(ReturnedLength <= TestCase->MaximalExpectedReturnedLength)),
-"Returned length %lu, expected between %lu and %lu\n",
+"NtQuerySystemEnvironmentValue(%lu) failed : returned length %lu,
expected between %lu and %lu\n",
+TestNumber,
ReturnedLength,
TestCase->MinimalExpectedReturnedLength,
TestCase->MaximalExpectedReturnedLength);
@@ -106,7 +109,7 @@
for (i = 0 ; i < COUNT_OF(TestCases) ; ++i)
{
-Test_API(&TestCases[i]);
+Test_API(i, &TestCases[i]);
}
}
[ros-diffs] [hbelusca] 57524: [MSVCRT:APITEST] - Add a test which allows testing the command line argument lpCmdLine in WinMain function (GUI programs).
Author: hbelusca
Date: Tue Oct 9 20:56:11 2012
New Revision: 57524
URL: http://svn.reactos.org/svn/reactos?rev=57524&view=rev
Log:
[MSVCRT:APITEST]
- Add a test which allows testing the command line argument lpCmdLine in
WinMain function (GUI programs).
Added:
trunk/rostests/apitests/msvcrt/CommandLine.c (with props)
trunk/rostests/apitests/msvcrt/cmdline_util/ (with props)
trunk/rostests/apitests/msvcrt/cmdline_util/CMakeLists.txt (with props)
trunk/rostests/apitests/msvcrt/cmdline_util/cmdline_util.c (with props)
Modified:
trunk/rostests/apitests/msvcrt/CMakeLists.txt
trunk/rostests/apitests/msvcrt/testlist.c
Modified: trunk/rostests/apitests/msvcrt/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CMakeLists.txt?rev=57524&r1=57523&r2=57524&view=diff
==
--- trunk/rostests/apitests/msvcrt/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/apitests/msvcrt/CMakeLists.txt [iso-8859-1] Tue Oct 9
20:56:11 2012
@@ -1,7 +1,10 @@
+
+add_subdirectory(cmdline_util)
add_definitions(-D_DLL -D__USE_CRTIMP)
list(APPEND SOURCE
+CommandLine.c
ieee.c
splitpath.c
testlist.c)
Added: trunk/rostests/apitests/msvcrt/CommandLine.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CommandLine.c?rev=57524&view=auto
==
--- trunk/rostests/apitests/msvcrt/CommandLine.c (added)
+++ trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] Tue Oct 9
20:56:11 2012
@@ -1,0 +1,280 @@
+/*
+ * PROJECT: ReactOS API Tests
+ * LICENSE: GPLv2+ - See COPYING in the top level directory
+ * PURPOSE: Test for CRT command-line handling.
+ * PROGRAMMER: Hermès BÉLUSCA - MAÏTO
+ */
+
+#define WIN32_NO_STATUS
+#define UNICODE
+#include
+#include
+#include
+
+#define COUNT_OF(x) (sizeof((x))/sizeof((x)[0]))
+
+/*
+ * The path to the data file is hardcoded in cmdline_util.c
+ * Please synchronize it whenever you do a change.
+ */
+#define DATAFILEL"C:\\cmdline.dat"
+
+/**
+ * Extracts the command tail from the command line
+ * (deletes the program's name and keep the rest).
+ **/
+#define SPACECHAR L' '
+#define DQUOTECHAR L'\"'
+
+LPWSTR ExtractCmdLine(IN LPWSTR lpszCommandLine)
+{
+BOOL inDoubleQuote = FALSE;
+
+/*
+ * Skip the program's name (the first token in the command line).
+ * Handle quoted program's name.
+ */
+if (lpszCommandLine)
+{
+while ( (*lpszCommandLine > SPACECHAR) ||
+(*lpszCommandLine && inDoubleQuote) )
+{
+if (*lpszCommandLine == DQUOTECHAR)
+inDoubleQuote = !inDoubleQuote;
+
+++lpszCommandLine;
+}
+
+/* Skip all white spaces preceeding the second token. */
+while (*lpszCommandLine && (*lpszCommandLine <= SPACECHAR))
+++lpszCommandLine;
+}
+
+return lpszCommandLine;
+}
+
+VOID ExtractCmdLine_U(IN OUT PUNICODE_STRING pCommandLine_U)
+{
+BOOL inDoubleQuote = FALSE;
+PWSTR lpszCommandLine;
+
+/*
+ * Skip the program's name (the first token in the command line).
+ * Handle quoted program's name.
+ */
+if (pCommandLine_U && pCommandLine_U->Buffer && (pCommandLine_U->Length !=
0))
+{
+lpszCommandLine = pCommandLine_U->Buffer;
+
+while ( (pCommandLine_U->Length > 0) &&
+( (*lpszCommandLine > SPACECHAR) ||
+ (*lpszCommandLine && inDoubleQuote) ) )
+{
+if (*lpszCommandLine == DQUOTECHAR)
+inDoubleQuote = !inDoubleQuote;
+
+++lpszCommandLine;
+pCommandLine_U->Length -= sizeof(WCHAR);
+}
+
+/* Skip all white spaces preceeding the second token. */
+while ((pCommandLine_U->Length > 0) && *lpszCommandLine &&
(*lpszCommandLine <= SPACECHAR))
+{
+++lpszCommandLine;
+pCommandLine_U->Length -= sizeof(WCHAR);
+}
+
+pCommandLine_U->Buffer = lpszCommandLine;
+}
+
+return;
+}
+
+
+typedef struct _TEST_CASE
+{
+LPWSTR CmdLine;
+} TEST_CASE, *PTEST_CASE;
+
+static TEST_CASE TestCases[] =
+{
+{L"cmdline_util.exe"},
+{L"cmdline_util.exe foo bar"},
+{L"cmdline_util.exe \"foo bar\""},
+{L"cmdline_util.exe foo \"bar John\" Doe"},
+
+{L"\"cmdline_util.exe\""},
+{L"\"cmdline_util.exe\" foo bar"},
+{L"\"cmdline_util.exe\" \"foo bar\""},
+{L"\"cmdline_util.exe\" foo \"bar John\" Doe"},
+
+{L&q
[ros-diffs] [hbelusca] 57526: [BOOTDATA-CMAKE] Add a bin\data directory for holding data files which can be used for tests.
Author: hbelusca Date: Tue Oct 9 22:00:47 2012 New Revision: 57526 URL: http://svn.reactos.org/svn/reactos?rev=57526&view=rev Log: [BOOTDATA-CMAKE] Add a bin\data directory for holding data files which can be used for tests. Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/packages/reactos.dff.in trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd64.inf?rev=57526&r1=57525&r2=57526&view=diff == --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Tue Oct 9 22:00:47 2012 @@ -1200,7 +1200,7 @@ ; System environment settings HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x0002,"%SystemRoot%\system32\cmd.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x0002,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x0002,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x0002,"%SystemRoot%" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x0002,"%SystemDrive%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x0002,"%SystemDrive%\TEMP" Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.inf?rev=57526&r1=57525&r2=57526&view=diff == --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Tue Oct 9 22:00:47 2012 @@ -755,7 +755,7 @@ ; System environment settings HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x0002,"%SystemRoot%\system32\cmd.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x0002,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x0002,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x0002,"%SystemRoot%" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x0002,"%SystemDrive%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x0002,"%SystemDrive%\TEMP" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386.inf?rev=57526&r1=57525&r2=57526&view=diff == --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Tue Oct 9 22:00:47 2012 @@ -1200,7 +1200,7 @@ ; System environment settings HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x0002,"%SystemRoot%\system32\cmd.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x0002,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x0002,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x0002,"%SystemRoot%" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x0002,"%SystemDrive%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x0002,"%SystemDrive%\TEMP" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org
[ros-diffs] [hbelusca] 57527: [MSVCRT:APITEST] Move cmdline_util to CmdLineUtil and locate it in bin/data instead of bin
Author: hbelusca
Date: Tue Oct 9 22:03:50 2012
New Revision: 57527
URL: http://svn.reactos.org/svn/reactos?rev=57527&view=rev
Log:
[MSVCRT:APITEST]
Move cmdline_util to CmdLineUtil and locate it in bin/data instead of bin
Added:
trunk/rostests/apitests/msvcrt/CmdLineUtil/
- copied from r57524, trunk/rostests/apitests/msvcrt/cmdline_util/
trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c (with props)
trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.h (with props)
Removed:
trunk/rostests/apitests/msvcrt/CmdLineUtil/cmdline_util.c
trunk/rostests/apitests/msvcrt/cmdline_util/
Modified:
trunk/rostests/apitests/msvcrt/CMakeLists.txt
trunk/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt
trunk/rostests/apitests/msvcrt/CommandLine.c
Modified: trunk/rostests/apitests/msvcrt/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CMakeLists.txt?rev=57527&r1=57526&r2=57527&view=diff
==
--- trunk/rostests/apitests/msvcrt/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/apitests/msvcrt/CMakeLists.txt [iso-8859-1] Tue Oct 9
22:03:50 2012
@@ -1,7 +1,5 @@
-add_subdirectory(cmdline_util)
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
+add_subdirectory(CmdLineUtil)
list(APPEND SOURCE
CommandLine.c
Modified: trunk/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt?rev=57527&r1=57524&r2=57527&view=diff
==
--- trunk/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt [iso-8859-1]
(original)
+++ trunk/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt [iso-8859-1] Tue
Oct 9 22:03:50 2012
@@ -1,10 +1,8 @@
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
list(APPEND SOURCE
- cmdline_util.c)
+ CmdLineUtil.c)
-add_executable(cmdline_util ${SOURCE})
-set_module_type(cmdline_util win32gui UNICODE)
-add_importlibs(cmdline_util msvcrt kernel32 ntdll)
-add_cd_file(TARGET cmdline_util DESTINATION reactos/bin FOR all)
+add_executable(CmdLineUtil ${SOURCE})
+set_module_type(CmdLineUtil win32gui UNICODE)
+add_importlibs(CmdLineUtil msvcrt kernel32 ntdll)
+add_cd_file(TARGET CmdLineUtil DESTINATION reactos/bin/data FOR all)
Added: trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c?rev=57527&view=auto
==
--- trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c (added)
+++ trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c [iso-8859-1] Tue
Oct 9 22:03:50 2012
@@ -1,0 +1,96 @@
+/*
+ * PROJECT: ReactOS API Tests
+ * LICENSE: GPLv2+ - See COPYING in the top level directory
+ * PURPOSE: Test for CRT command-line handling - Utility GUI program.
+ * PROGRAMMER: Hermès BÉLUSCA - MAÏTO
+ */
+
+#define WIN32_NO_STATUS
+#include
+#include
+#include
+
+#include "CmdLineUtil.h"
+
+int APIENTRY wWinMain(HINSTANCE hInstance,
+ HINSTANCE hPrevInstance,
+ LPWSTRlpCmdLine,
+ int nCmdShow)
+{
+/*
+ * Get the unparsed command line as seen in Win32 mode,
+ * and the NT-native mode one.
+ */
+LPWSTR CmdLine = GetCommandLineW();
+UNICODE_STRING CmdLine_U = NtCurrentPeb()->ProcessParameters->CommandLine;
+
+/* Write the results into a file. */
+HANDLE hFile = CreateFileW(DATAFILE,
+ GENERIC_WRITE,
+ 0, NULL,
+ CREATE_ALWAYS,
+ FILE_ATTRIBUTE_NORMAL,
+ NULL);
+if (hFile != INVALID_HANDLE_VALUE)
+{
+DWORD dwSize, dwStringSize;
+
+/*
+ * Format of the data file :
+ *
+ * [size_of_string 4 bytes][null_terminated_C_string]
+ * [size_of_string 4 bytes][null_terminated_C_string]
+ * [UNICODE_STRING_structure][string_buffer_of_UNICODE_STRING]
+ */
+
+/* 1- Write the WinMain's command line. */
+dwStringSize = (wcslen(lpCmdLine) + 1) * sizeof(WCHAR);
+
+WriteFile(hFile,
+ &dwStringSize,
+ sizeof(dwStringSize),
+ &dwSize,
+ NULL);
+
+WriteFile(hFile,
+ lpCmdLine,
+ dwStringSize,
+ &dwSize,
+ NULL);
+
+/* 2- Write the Win32 mode command line. */
+dwStringSize = (wcslen(CmdLine) + 1) * sizeof(WCHAR);
+
+WriteFile(hFile,
+ &dwStringSize,
+ sizeof(dwStringSize),
+
[ros-diffs] [hbelusca] 57528: [MSVCRT:APITEST] Update encoding, no code changes.
Author: hbelusca Date: Tue Oct 9 22:08:32 2012 New Revision: 57528 URL: http://svn.reactos.org/svn/reactos?rev=57528&view=rev Log: [MSVCRT:APITEST] Update encoding, no code changes. Modified: trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.h trunk/rostests/apitests/msvcrt/CommandLine.c Modified: trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c?rev=57528&r1=57527&r2=57528&view=diff == --- trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c [iso-8859-1] Tue Oct 9 22:08:32 2012 @@ -2,7 +2,7 @@ * PROJECT: ReactOS API Tests * LICENSE: GPLv2+ - See COPYING in the top level directory * PURPOSE: Test for CRT command-line handling - Utility GUI program. - * PROGRAMMER: Hermès BÉLUSCA - MAÏTO + * PROGRAMMER: Hermès BÃLUSCA - MAÃTO */ #define WIN32_NO_STATUS Modified: trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.h?rev=57528&r1=57527&r2=57528&view=diff == --- trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.h [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.h [iso-8859-1] Tue Oct 9 22:08:32 2012 @@ -2,7 +2,7 @@ * PROJECT: ReactOS API Tests * LICENSE: GPLv2+ - See COPYING in the top level directory * PURPOSE: Test for CRT command-line handling - Utility GUI program. - * PROGRAMMER: Hermès BÉLUSCA - MAÏTO + * PROGRAMMER: Hermès BÃLUSCA - MAÃTO */ #pragma once Modified: trunk/rostests/apitests/msvcrt/CommandLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CommandLine.c?rev=57528&r1=57527&r2=57528&view=diff == --- trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] Tue Oct 9 22:08:32 2012 @@ -2,7 +2,7 @@ * PROJECT: ReactOS API Tests * LICENSE: GPLv2+ - See COPYING in the top level directory * PURPOSE: Test for CRT command-line handling. - * PROGRAMMER: Hermès BÉLUSCA - MAÏTO + * PROGRAMMER: Hermès BÃLUSCA - MAÃTO */ #define WIN32_NO_STATUS
[ros-diffs] [hbelusca] 57531: [MSVCRT:APITEST] Update CommandLine test.
Author: hbelusca
Date: Wed Oct 10 21:19:45 2012
New Revision: 57531
URL: http://svn.reactos.org/svn/reactos?rev=57531&view=rev
Log:
[MSVCRT:APITEST]
Update CommandLine test.
Modified:
trunk/rostests/apitests/msvcrt/CommandLine.c
Modified: trunk/rostests/apitests/msvcrt/CommandLine.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CommandLine.c?rev=57531&r1=57530&r2=57531&view=diff
==
--- trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] Wed Oct 10
21:19:45 2012
@@ -86,26 +86,29 @@
return;
}
-
+/**/
+
+/* The path to the utility program run by this test. */
+static WCHAR UtilityProgramDirectory[MAX_PATH];
+
+/* The list of tests. */
typedef struct _TEST_CASE
{
LPWSTR CmdLine;
+BOOL bEncloseProgramNameInQuotes;
} TEST_CASE, *PTEST_CASE;
static TEST_CASE TestCases[] =
{
-{L"CmdLineUtil.exe"},
-{L"CmdLineUtil.exe foo bar"},
-{L"CmdLineUtil.exe \"foo bar\""},
-{L"CmdLineUtil.exe foo \"bar John\" Doe"},
-
-{L"\"CmdLineUtil.exe\""},
-{L"\"CmdLineUtil.exe\" foo bar"},
-{L"\"CmdLineUtil.exe\" \"foo bar\""},
-{L"\"CmdLineUtil.exe\" foo \"bar John\" Doe"},
-
-{L"\"CmdLineUtil.exe\""},
-{L"\"CmdLineUtil.exe \"foo bar\"\""},
+{L"", FALSE},
+{L"foo bar", FALSE},
+{L"\"foo bar\"", FALSE},
+{L"foo \"bar John\" Doe", FALSE},
+
+{L"", TRUE},
+{L"foo bar", TRUE},
+{L"\"foo bar\"", TRUE},
+{L"foo \"bar John\" Doe", TRUE},
};
static void Test_CommandLine(IN ULONG TestNumber,
@@ -113,7 +116,8 @@
{
BOOL bRet;
-WCHAR CmdLine[MAX_PATH];
+BOOL bWasntInQuotes = (UtilityProgramDirectory[0] != L'"');
+WCHAR CmdLine[MAX_PATH] = L"";
STARTUPINFOW si;
PROCESS_INFORMATION pi;
@@ -121,7 +125,19 @@
ZeroMemory(&pi, sizeof(pi));
si.cb = sizeof(si);
-wcscpy(CmdLine, TestCase->CmdLine);
+
+/* Initialize the command line. */
+if (TestCase->bEncloseProgramNameInQuotes && bWasntInQuotes)
+wcscpy(CmdLine, L"\"");
+
+wcscat(CmdLine, UtilityProgramDirectory);
+
+if (TestCase->bEncloseProgramNameInQuotes && bWasntInQuotes)
+wcscat(CmdLine, L"\"");
+
+wcscat(CmdLine, L" ");
+wcscat(CmdLine, TestCase->CmdLine);
+
/*
* Launch the utility program and wait till it's terminated.
@@ -133,7 +149,7 @@
CREATE_UNICODE_ENVIRONMENT,
NULL, NULL,
&si, &pi);
-ok(bRet, "Test %lu - Failed to launch ' %S ', error = %lu.\n", TestNumber,
TestCase->CmdLine, GetLastError());
+ok(bRet, "Test %lu - Failed to launch ' %S ', error = %lu.\n", TestNumber,
CmdLine, GetLastError());
if (bRet)
{
@@ -269,6 +285,34 @@
{
ULONG i;
+DWORD dwError;
+LPWSTR p = NULL;
+
+
+/*
+ * Initialize the UtilityProgramDirectory variable.
+ */
+GetModuleFileNameW(NULL, UtilityProgramDirectory,
COUNT_OF(UtilityProgramDirectory));
+dwError = GetLastError();
+ok(dwError == ERROR_SUCCESS, "ERROR: Cannot retrieve the path to the
current running process, last error %lu\n", dwError);
+if (dwError != ERROR_SUCCESS) return;
+
+/* Path : executable.exe or "executable.exe" or C:\path\executable.exe or
"C:\path\executable.exe" */
+p = wcsrchr(UtilityProgramDirectory, L'\\');
+if (p && *p != 0)
+*++p = 0; /* Null-terminate there : C:\path\ or "C:\path\ */
+else
+UtilityProgramDirectory[0] = 0; /* Suppress the executable.exe name */
+
+wcscat(UtilityProgramDirectory, L"data\\CmdLineUtil.exe");
+
+/* Close the opened quote if needed, and add a separating space */
+if (UtilityProgramDirectory[0] == L'"') wcscat(UtilityProgramDirectory,
L"\"");
+
+
+/*
+ * Now launch the tests.
+ */
for (i = 0 ; i < COUNT_OF(TestCases) ; ++i)
{
Test_CommandLine(i, &TestCases[i]);
[ros-diffs] [hbelusca] 57532: [BOOTDATA] Remove unneeded %SystemRoot%\bin\data value in PATH environment variable.
Author: hbelusca Date: Wed Oct 10 21:20:25 2012 New Revision: 57532 URL: http://svn.reactos.org/svn/reactos?rev=57532&view=rev Log: [BOOTDATA] Remove unneeded %SystemRoot%\bin\data value in PATH environment variable. Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd64.inf?rev=57532&r1=57531&r2=57532&view=diff == --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Wed Oct 10 21:20:25 2012 @@ -1200,7 +1200,7 @@ ; System environment settings HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x0002,"%SystemRoot%\system32\cmd.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x0002,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x0002,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x0002,"%SystemRoot%" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x0002,"%SystemDrive%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x0002,"%SystemDrive%\TEMP" Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.inf?rev=57532&r1=57531&r2=57532&view=diff == --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Wed Oct 10 21:20:25 2012 @@ -755,7 +755,7 @@ ; System environment settings HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x0002,"%SystemRoot%\system32\cmd.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x0002,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x0002,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x0002,"%SystemRoot%" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x0002,"%SystemDrive%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x0002,"%SystemDrive%\TEMP" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386.inf?rev=57532&r1=57531&r2=57532&view=diff == --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Wed Oct 10 21:20:25 2012 @@ -1200,7 +1200,7 @@ ; System environment settings HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x0002,"%SystemRoot%\system32\cmd.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x0002,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x0002,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x0002,"%SystemRoot%" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x0002,"%SystemDrive%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x0002,"%SystemDrive%\TEMP"
[ros-diffs] [hbelusca] 57533: [MSVCRT:APITEST] Update a comment. No code changes.
Author: hbelusca Date: Wed Oct 10 21:23:49 2012 New Revision: 57533 URL: http://svn.reactos.org/svn/reactos?rev=57533&view=rev Log: [MSVCRT:APITEST] Update a comment. No code changes. Modified: trunk/rostests/apitests/msvcrt/CommandLine.c Modified: trunk/rostests/apitests/msvcrt/CommandLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CommandLine.c?rev=57533&r1=57532&r2=57533&view=diff == --- trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] Wed Oct 10 21:23:49 2012 @@ -135,6 +135,7 @@ if (TestCase->bEncloseProgramNameInQuotes && bWasntInQuotes) wcscat(CmdLine, L"\""); +/* Add a separating space and copy the tested command line parameters. */ wcscat(CmdLine, L" "); wcscat(CmdLine, TestCase->CmdLine); @@ -306,7 +307,7 @@ wcscat(UtilityProgramDirectory, L"data\\CmdLineUtil.exe"); -/* Close the opened quote if needed, and add a separating space */ +/* Close the opened quote if needed. */ if (UtilityProgramDirectory[0] == L'"') wcscat(UtilityProgramDirectory, L"\"");
[ros-diffs] [hbelusca] 57534: [MSVCRT:APITEST] Modify the test for GetModuleFileName, should work better now.
Author: hbelusca
Date: Wed Oct 10 21:56:27 2012
New Revision: 57534
URL: http://svn.reactos.org/svn/reactos?rev=57534&view=rev
Log:
[MSVCRT:APITEST]
Modify the test for GetModuleFileName, should work better now.
Modified:
trunk/rostests/apitests/msvcrt/CommandLine.c
Modified: trunk/rostests/apitests/msvcrt/CommandLine.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CommandLine.c?rev=57534&r1=57533&r2=57534&view=diff
==
--- trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] Wed Oct 10
21:56:27 2012
@@ -286,17 +286,16 @@
{
ULONG i;
-DWORD dwError;
+DWORD dwRet;
LPWSTR p = NULL;
/*
* Initialize the UtilityProgramDirectory variable.
*/
-GetModuleFileNameW(NULL, UtilityProgramDirectory,
COUNT_OF(UtilityProgramDirectory));
-dwError = GetLastError();
-ok(dwError == ERROR_SUCCESS, "ERROR: Cannot retrieve the path to the
current running process, last error %lu\n", dwError);
-if (dwError != ERROR_SUCCESS) return;
+dwRet = GetModuleFileNameW(NULL, UtilityProgramDirectory,
COUNT_OF(UtilityProgramDirectory));
+ok(dwRet != 0, "ERROR: Cannot retrieve the path to the current running
process, last error %lu\n", GetLastError());
+if (dwRet == 0) return;
/* Path : executable.exe or "executable.exe" or C:\path\executable.exe or
"C:\path\executable.exe" */
p = wcsrchr(UtilityProgramDirectory, L'\\');
[ros-diffs] [hbelusca] 57536: [CRT] Use a temporary buffer to parse the program's arguments, instead of using (and thus overwriting) the _a/wcmdln variable. Fix msvcrt_apitest:CommandLine test. CORE-6
Author: hbelusca
Date: Thu Oct 11 00:30:57 2012
New Revision: 57536
URL: http://svn.reactos.org/svn/reactos?rev=57536&view=rev
Log:
[CRT]
Use a temporary buffer to parse the program's arguments, instead of using (and
thus overwriting) the _a/wcmdln variable.
Fix msvcrt_apitest:CommandLine test.
CORE-6717 #comment Fixed in revision r57536. #resolve
Modified:
trunk/reactos/lib/sdk/crt/misc/getargs.c
Modified: trunk/reactos/lib/sdk/crt/misc/getargs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/getargs.c?rev=57536&r1=57535&r2=57536&view=diff
==
--- trunk/reactos/lib/sdk/crt/misc/getargs.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/misc/getargs.c [iso-8859-1] Thu Oct 11 00:30:57
2012
@@ -183,6 +183,7 @@
{
int i, afterlastspace, ignorespace, doexpand;
size_t len;
+ char* aNewCmdln;
/* missing threading init */
@@ -203,10 +204,12 @@
len = strlen(_acmdln);
-
- while (_acmdln[i])
- {
- if (_acmdln[i] == '"')
+ /* Allocate a temporary buffer to be used instead of the original _acmdln
parameter. */
+ aNewCmdln = strndup(_acmdln, len);
+
+ while (aNewCmdln[i])
+ {
+ if (aNewCmdln[i] == '"')
{
if(ignorespace)
{
@@ -217,16 +220,16 @@
ignorespace = 1;
doexpand = 0;
}
- memmove(_acmdln + i, _acmdln + i + 1, len - i);
+ memmove(aNewCmdln + i, aNewCmdln + i + 1, len - i);
len--;
continue;
}
- if (_acmdln[i] == ' ' && !ignorespace)
- {
- aexpand(strndup(_acmdln + afterlastspace, i - afterlastspace),
doexpand);
+ if (aNewCmdln[i] == ' ' && !ignorespace)
+ {
+ aexpand(strndup(aNewCmdln + afterlastspace, i - afterlastspace),
doexpand);
i++;
- while (_acmdln[i]==' ')
+ while (aNewCmdln[i] == ' ')
i++;
afterlastspace=i;
doexpand = expand_wildcards;
@@ -237,10 +240,13 @@
}
}
- if (_acmdln[afterlastspace] != 0)
- {
- aexpand(strndup(_acmdln+afterlastspace, i - afterlastspace), doexpand);
- }
+ if (aNewCmdln[afterlastspace] != 0)
+ {
+ aexpand(strndup(aNewCmdln + afterlastspace, i - afterlastspace),
doexpand);
+ }
+
+ /* Free the temporary buffer. */
+ free(aNewCmdln);
HeapValidate(GetProcessHeap(), 0, NULL);
@@ -265,6 +271,7 @@
{
int i, afterlastspace, ignorespace, doexpand;
size_t len;
+ wchar_t* wNewCmdln;
/* missing threading init */
@@ -285,9 +292,12 @@
len = wcslen(_wcmdln);
- while (_wcmdln[i])
- {
- if (_wcmdln[i] == L'"')
+ /* Allocate a temporary buffer to be used instead of the original _wcmdln
parameter. */
+ wNewCmdln = wcsndup(_wcmdln, len);
+
+ while (wNewCmdln[i])
+ {
+ if (wNewCmdln[i] == L'"')
{
if(ignorespace)
{
@@ -298,16 +308,16 @@
ignorespace = 1;
doexpand = 0;
}
- memmove(_wcmdln + i, _wcmdln + i + 1, (len - i) * sizeof(wchar_t));
+ memmove(wNewCmdln + i, wNewCmdln + i + 1, (len - i) *
sizeof(wchar_t));
len--;
continue;
}
- if (_wcmdln[i] == L' ' && !ignorespace)
- {
- wexpand(wcsndup(_wcmdln + afterlastspace, i - afterlastspace),
doexpand);
+ if (wNewCmdln[i] == L' ' && !ignorespace)
+ {
+ wexpand(wcsndup(wNewCmdln + afterlastspace, i - afterlastspace),
doexpand);
i++;
- while (_wcmdln[i]==L' ')
+ while (wNewCmdln[i] == L' ')
i++;
afterlastspace=i;
doexpand = expand_wildcards;
@@ -318,10 +328,13 @@
}
}
- if (_wcmdln[afterlastspace] != 0)
- {
- wexpand(wcsndup(_wcmdln+afterlastspace, i - afterlastspace), doexpand);
- }
+ if (wNewCmdln[afterlastspace] != 0)
+ {
+ wexpand(wcsndup(wNewCmdln + afterlastspace, i - afterlastspace),
doexpand);
+ }
+
+ /* Free the temporary buffer. */
+ free(wNewCmdln);
HeapValidate(GetProcessHeap(), 0, NULL);
[ros-diffs] [hbelusca] 57543: [BOOTDATA] Correct the SP number (==> SP1) we are reporting (currently SP1 of Windows Server 2003). The SP6 thingie was a remainder from our previous target, Windows NT 4
Author: hbelusca Date: Fri Oct 12 20:43:48 2012 New Revision: 57543 URL: http://svn.reactos.org/svn/reactos?rev=57543&view=rev Log: [BOOTDATA] Correct the SP number (==> SP1) we are reporting (currently SP1 of Windows Server 2003). The SP6 thingie was a remainder from our previous target, Windows NT 4 SP6. Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd64.inf?rev=57543&r1=57542&r2=57543&view=diff == --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Fri Oct 12 20:43:48 2012 @@ -1132,12 +1132,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductType",2,"WinNT" HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductSuite",0x00010002,"" +; Some installers check for SP1 +HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x0100 HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders","SecurityProviders",2,"schannel.dll" HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders\SaslProfiles",,0x0012 - -; Some installers check for SP6 -HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x0600 ; Service groups HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x0001, \ Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.inf?rev=57543&r1=57542&r2=57543&view=diff == --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Fri Oct 12 20:43:48 2012 @@ -693,8 +693,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale\Alternate Sorts","00021404",0x,"" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale\Alternate Sorts","00030404",0x,"" -; Some installers check for SP6 -HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x0600 +; Some installers check for SP1 +HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x0100 ; Service groups HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x0001, \ Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386.inf?rev=57543&r1=57542&r2=57543&view=diff == --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Fri Oct 12 20:43:48 2012 @@ -1132,12 +1132,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductType",2,"WinNT" HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductSuite",0x00010002,"" +; Some installers check for SP1 +HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x0100 HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders","SecurityProviders",2,"schannel.dll" HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders\SaslProfiles",,0x0012 - -; Some installers check for SP6 -HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x0600 ; Service groups HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x0001, \
[ros-diffs] [hbelusca] 57546: [ADVAPI32] - Pre-implement InitiateSystemShutdownExW. - Cosmetic formatting code (by me). Patch by Lee Schroeder. See CORE-6613 for more details. CORE-6613 #comment Commi
Author: hbelusca
Date: Fri Oct 12 22:12:44 2012
New Revision: 57546
URL: http://svn.reactos.org/svn/reactos?rev=57546&view=rev
Log:
[ADVAPI32]
- Pre-implement InitiateSystemShutdownExW.
- Cosmetic formatting code (by me).
Patch by Lee Schroeder. See CORE-6613 for more details.
CORE-6613 #comment Committed shutdown.c.
Modified:
trunk/reactos/dll/win32/advapi32/misc/shutdown.c
Modified: trunk/reactos/dll/win32/advapi32/misc/shutdown.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/shutdown.c?rev=57546&r1=57545&r2=57546&view=diff
==
--- trunk/reactos/dll/win32/advapi32/misc/shutdown.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/misc/shutdown.c [iso-8859-1] Fri Oct 12
22:12:44 2012
@@ -10,8 +10,6 @@
#include
WINE_DEFAULT_DEBUG_CHANNEL(advapi);
-#define USZ {0,0,0}
-
/**
* AbortSystemShutdownW
*
@@ -28,7 +26,7 @@
/**
* AbortSystemShutdownA
*
- * @unimplemented
+ * see AbortSystemShutdownW
*/
BOOL WINAPI
AbortSystemShutdownA(LPCSTR lpMachineName)
@@ -42,8 +40,8 @@
Status = RtlAnsiStringToUnicodeString(&MachineNameW, &MachineNameA, TRUE);
if (STATUS_SUCCESS != Status)
{
-SetLastError(RtlNtStatusToDosError(Status));
-return FALSE;
+SetLastError(RtlNtStatusToDosError(Status));
+return FALSE;
}
rv = AbortSystemShutdownW(MachineNameW.Buffer);
@@ -71,7 +69,8 @@
bRebootAfterShutdown,
SHTDN_REASON_MAJOR_OTHER |
SHTDN_REASON_MINOR_OTHER |
- SHTDN_REASON_FLAG_PLANNED);
+ SHTDN_REASON_FLAG_PLANNED
+ /* SHTDN_REASON_MAJOR_LEGACY_API */);
}
/**
@@ -94,7 +93,8 @@
bRebootAfterShutdown,
SHTDN_REASON_MAJOR_OTHER |
SHTDN_REASON_MINOR_OTHER |
- SHTDN_REASON_FLAG_PLANNED);
+ SHTDN_REASON_FLAG_PLANNED
+ /* SHTDN_REASON_MAJOR_LEGACY_API */);
}
/**
@@ -110,23 +110,37 @@
BOOL bRebootAfterShutdown,
DWORD dwReason)
{
-SHUTDOWN_ACTION Action = ShutdownNoReboot;
-NTSTATUS Status;
-
-if (lpMachineName)
-{
-/* FIXME: remote machine shutdown not supported yet */
+SHUTDOWN_ACTION action;
+NTSTATUS Status;
+ULONG Timeout_ms;
+
+/* Convert to milliseconds so we can use the value later on */
+Timeout_ms = dwTimeout * 1000;
+
+if (lpMachineName != NULL)
+{
+/* FIXME: Remote system shutdown not supported yet */
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
-
-if (dwTimeout)
-{
-}
-
-Status = NtShutdownSystem(Action);
+else /* The local system is being used */
+{
+/* FIXME: Right now, only basic shutting down and rebooting
+is supported */
+if(bRebootAfterShutdown == TRUE)
+{
+action = ShutdownReboot;
+}
+else
+{
+action = ShutdownNoReboot;
+}
+
+Status = NtShutdownSystem(action);
+}
+
SetLastError(RtlNtStatusToDosError(Status));
-return FALSE;
+return (Status == STATUS_SUCCESS);
}
/**
@@ -186,6 +200,8 @@
bRebootAfterShutdown,
dwReason);
LastError = GetLastError();
+
+/* Clear the values of both strings */
if (lpMachineName)
RtlFreeUnicodeString(&MachineNameW);
@@ -215,7 +231,7 @@
/**
* InitiateShutdownA [ADVAPI32.@]
*
- * @unimplamented
+ * see InitiateShutdownW
*/
DWORD WINAPI
InitiateShutdownA(LPSTR lpMachineName,
@@ -267,6 +283,8 @@
dwShutdownFlags,
dwReason);
LastError = GetLastError();
+
+/* Clear the values of both strings */
if (lpMachineName)
RtlFreeUnicodeString(&MachineNameW);
[ros-diffs] [hbelusca] 57553: [RAPPS] - Use COM for calling SHBrowseForFolder. - Allow choosing a directory for downloading. - Correct a typo in the name of a function.
Author: hbelusca
Date: Sat Oct 13 13:35:55 2012
New Revision: 57553
URL: http://svn.reactos.org/svn/reactos?rev=57553&view=rev
Log:
[RAPPS]
- Use COM for calling SHBrowseForFolder.
- Allow choosing a directory for downloading.
- Correct a typo in the name of a function.
Modified:
trunk/reactos/base/applications/rapps/CMakeLists.txt
trunk/reactos/base/applications/rapps/rapps.h
trunk/reactos/base/applications/rapps/settingsdlg.c
trunk/reactos/base/applications/rapps/winmain.c
Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/CMakeLists.txt?rev=57553&r1=57552&r2=57553&view=diff
==
--- trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] Sat Oct
13 13:35:55 2012
@@ -29,7 +29,7 @@
set_module_type(rapps win32gui UNICODE)
target_link_libraries(rapps uuid)
-add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi
msvcrt kernel32 ntdll)
+add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi
ole32 msvcrt kernel32 ntdll)
add_dependencies(rapps rappsmsg)
add_message_headers(ANSI rappsmsg.mc)
add_cd_file(TARGET rapps DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/base/applications/rapps/rapps.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rapps.h?rev=57553&r1=57552&r2=57553&view=diff
==
--- trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] Sat Oct 13
13:35:55 2012
@@ -115,7 +115,7 @@
extern INT SelectedEnumType;
extern SETTINGS_INFO SettingsInfo;
VOID SaveSettings(HWND hwnd);
-VOID FillDafaultSettings(PSETTINGS_INFO pSettingsInfo);
+VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo);
/* listview.c */
extern HWND hListView;
Modified: trunk/reactos/base/applications/rapps/settingsdlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/settingsdlg.c?rev=57553&r1=57552&r2=57553&view=diff
==
--- trunk/reactos/base/applications/rapps/settingsdlg.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/settingsdlg.c [iso-8859-1] Sat Oct 13
13:35:55 2012
@@ -6,6 +6,7 @@
* PROGRAMMERS: Dmitry Chapyshev (dmi...@reactos.org)
*/
+#define _WIN32_DCOM // For CoInitializeEx, etc...
#include "rapps.h"
SETTINGS_INFO NewSettingsInfo;
@@ -16,27 +17,35 @@
BOOL
ChooseFolder(HWND hwnd)
{
-BROWSEINFO fi;
-LPCITEMIDLIST lpItemList;
+BOOL bRet = FALSE;
+BROWSEINFO bi;
WCHAR szPath[MAX_PATH], szBuf[MAX_STR_LEN];
LoadStringW(hInst, IDS_CHOOSE_FOLDER_TEXT, szBuf, sizeof(szBuf) /
sizeof(TCHAR));
-ZeroMemory(&fi, sizeof(BROWSEINFO));
-fi.hwndOwner = hwnd;
-fi.lpszTitle = szBuf;
-fi.ulFlags = BIF_DONTGOBELOWDOMAIN | BIF_RETURNONLYFSDIRS |
BIF_BROWSEFORCOMPUTER | BIF_NEWDIALOGSTYLE;
-fi.lpfn = NULL;
-fi.lParam = -1;
-fi.iImage = 0;
+ZeroMemory(&bi, sizeof(bi));
+bi.hwndOwner = hwnd;
+bi.pidlRoot = NULL;
+bi.lpszTitle = szBuf;
+bi.ulFlags = BIF_USENEWUI | BIF_DONTGOBELOWDOMAIN | BIF_RETURNONLYFSDIRS
| /* BIF_BROWSEFILEJUNCTIONS | */ BIF_VALIDATE;
-if (!(lpItemList = SHBrowseForFolder(&fi))) return FALSE;
-SHGetPathFromIDList(lpItemList, szPath);
+if (SUCCEEDED(CoInitializeEx(NULL, COINIT_APARTMENTTHREADED)))
+{
+LPITEMIDLIST lpItemList = SHBrowseForFolder(&bi);
+if (lpItemList && SHGetPathFromIDList(lpItemList, szPath))
+{
+if (szPath[0] != 0)
+{
+SetDlgItemTextW(hwnd, IDC_DOWNLOAD_DIR_EDIT, szPath);
+bRet = TRUE;
+}
+}
-if (wcslen(szPath) == 0) return FALSE;
-SetDlgItemTextW(hwnd, IDC_DOWNLOAD_DIR_EDIT, szPath);
+CoTaskMemFree(lpItemList);
+CoUninitialize();
+}
-return TRUE;
+return bRet;
}
static VOID
@@ -89,7 +98,7 @@
break;
case IDC_DEFAULT_SETTINGS:
-FillDafaultSettings(&NewSettingsInfo);
+FillDefaultSettings(&NewSettingsInfo);
InitSettingsControls(hDlg, NewSettingsInfo);
break;
Modified: trunk/reactos/base/applications/rapps/winmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/winmain.c?rev=57553&r1=57552&r2=57553&view=diff
==
--- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (origin
[ros-diffs] [hbelusca] 57555: [USER32] - Change the French keyboard accelerators of the windows' system menu to match those of Win2k3.
Author: hbelusca Date: Sat Oct 13 18:19:31 2012 New Revision: 57555 URL: http://svn.reactos.org/svn/reactos?rev=57555&view=rev Log: [USER32] - Change the French keyboard accelerators of the windows' system menu to match those of Win2k3. Modified: trunk/reactos/win32ss/user/user32/lang/fr-FR.rc Modified: trunk/reactos/win32ss/user/user32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/fr-FR.rc?rev=57555&r1=57554&r2=57555&view=diff == --- trunk/reactos/win32ss/user/user32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/fr-FR.rc [iso-8859-1] Sat Oct 13 18:19:31 2012 @@ -44,10 +44,10 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE BEGIN MENUITEM "&Restaurer", SC_RESTORE - MENUITEM "&Déplacer", SC_MOVE + MENUITEM "Dép&lacer", SC_MOVE MENUITEM "&Taille", SC_SIZE - MENUITEM "Ré&duire", SC_MINIMIZE - MENUITEM "A&grandir", SC_MAXIMIZE + MENUITEM "Réd&uire", SC_MINIMIZE + MENUITEM "Agra&ndir", SC_MAXIMIZE MENUITEM SEPARATOR MENUITEM "&Fermer\tAlt-F4", SC_CLOSE END
[ros-diffs] [hbelusca] 57556: [CSRSRV] - Remove $Id$ property. - Correct misspellings : "othwerwise" --> "otherwise" and "(de)refence" --> "(de)reference". - Add missing functions' documentation (from
Author: hbelusca
Date: Sat Oct 13 20:32:44 2012
New Revision: 57556
URL: http://svn.reactos.org/svn/reactos?rev=57556&view=rev
Log:
[CSRSRV]
- Remove $Id$ property.
- Correct misspellings : "othwerwise" --> "otherwise" and "(de)refence" -->
"(de)reference".
- Add missing functions' documentation (from the old CSRSRV).
- Add some useful comments.
Modified:
trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c (props changed)
trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c (contents, props
changed)
trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c (contents, props
changed)
trunk/reactos/subsystems/win32/csrss/csrsrv/init.c
trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c
trunk/reactos/subsystems/win32/csrss/csrsrv/server.c (contents, props
changed)
trunk/reactos/subsystems/win32/csrss/csrsrv/session.c (contents, props
changed)
trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c
trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c (contents, props
changed)
trunk/reactos/subsystems/win32/csrss/csrss.c (props changed)
trunk/reactos/subsystems/win32/csrss/csrss.rc (props changed)
trunk/reactos/subsystems/win32/csrss/include/api.h (contents, props
changed)
trunk/reactos/subsystems/win32/csrss/include/csrplugin.h (contents, props
changed)
Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c
--
--- svn:keywords (original)
+++ svn:keywords (removed)
@@ -1,1 +1,0 @@
-author date id revision
Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c?rev=57556&r1=57555&r2=57556&view=diff
==
--- trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c [iso-8859-1] Sat Oct
13 20:32:44 2012
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
* subsystems/win32/csrss/csrsrv/api/user.c
*
* User functions
Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c
--
--- svn:keywords (original)
+++ svn:keywords (removed)
@@ -1,1 +1,0 @@
-author date id revision
Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c?rev=57556&r1=57555&r2=57556&view=diff
==
--- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Sat Oct
13 20:32:44 2012
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
* subsystems/win32/csrss/csrsrv/api/wapi.c
*
* CSRSS port message processing
@@ -206,7 +205,9 @@
/* Return success */
return STATUS_SUCCESS;
+
#else // Hacky reactos code
+
PCSR_PROCESS ProcessData;
/* Get the Process Data */
@@ -249,7 +250,7 @@
* @param None
*
* @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL
- * othwerwise.
+ * otherwise.
*
* @remarks None.
*
@@ -298,8 +299,8 @@
/* Create the Port Object */
Status = NtCreatePort(&CsrApiPort,
&ObjectAttributes,
- LPC_MAX_DATA_LENGTH, // hack
- LPC_MAX_MESSAGE_LENGTH, // hack
+ LPC_MAX_DATA_LENGTH, // hack ;
sizeof(CSR_CONNECTION_INFO),
+ LPC_MAX_MESSAGE_LENGTH, // hack ;
sizeof(CSR_API_MESSAGE),
16 * PAGE_SIZE);
if (NT_SUCCESS(Status))
{
@@ -745,7 +746,7 @@
}
NTSTATUS WINAPI
-CsrpHandleConnectionRequest (PPORT_MESSAGE Request)
+CsrpHandleConnectionRequest(PPORT_MESSAGE Request)
{
NTSTATUS Status;
HANDLE ServerPort = NULL;//, ServerThread = NULL;
@@ -844,6 +845,19 @@
return Status;
}
+/*++
+ * @name CsrConnectToUser
+ * @implemented NT4
+ *
+ * The CsrConnectToUser connects to the User subsystem.
+ *
+ * @param None
+ *
+ * @return A pointer to the CSR Thread
+ *
+ * @remarks None.
+ *
+ *--*/
PCSR_THREAD
NTAPI
CsrConnectToUser(VOID)
Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
--
--- svn:keywords (original)
+++ svn:keywords (removed)
@@ -1,1 +1,0 @@
-author date id revision
Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrsrv/init.c?rev=57556&r1=57555&r2=57556&view=diff
[ros-diffs] [hbelusca] 57558: [CSRSS] Code formatting only.
Author: hbelusca
Date: Sun Oct 14 11:46:22 2012
New Revision: 57558
URL: http://svn.reactos.org/svn/reactos?rev=57558&view=rev
Log:
[CSRSS]
Code formatting only.
Modified:
trunk/reactos/include/reactos/subsys/csrss/csrss.h
trunk/reactos/subsystems/win32/csrss/include/api.h
trunk/reactos/subsystems/win32/csrss/include/csrplugin.h
Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csrss/csrss.h?rev=57558&r1=57557&r2=57558&view=diff
==
--- trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] Sun Oct 14
11:46:22 2012
@@ -92,35 +92,35 @@
typedef struct
{
- HANDLE ConsoleHandle;
- BOOL Unicode;
- ULONG NrCharactersToWrite;
- ULONG NrCharactersWritten;
- HANDLE UnpauseEvent;
- BYTE Buffer[0];
+HANDLE ConsoleHandle;
+BOOL Unicode;
+ULONG NrCharactersToWrite;
+ULONG NrCharactersWritten;
+HANDLE UnpauseEvent;
+BYTE Buffer[0];
} CSRSS_WRITE_CONSOLE, *PCSRSS_WRITE_CONSOLE;
typedef struct
{
- HANDLE ConsoleHandle;
- BOOL Unicode;
- WORD NrCharactersToRead;
- WORD NrCharactersRead;
- HANDLE EventHandle;
- PVOID Buffer;
- UNICODE_STRING ExeName;
- DWORD CtrlWakeupMask;
- DWORD ControlKeyState;
+HANDLE ConsoleHandle;
+BOOL Unicode;
+WORD NrCharactersToRead;
+WORD NrCharactersRead;
+HANDLE EventHandle;
+PVOID Buffer;
+UNICODE_STRING ExeName;
+DWORD CtrlWakeupMask;
+DWORD ControlKeyState;
} CSRSS_READ_CONSOLE, *PCSRSS_READ_CONSOLE;
typedef struct
{
- PCONTROLDISPATCHER CtrlDispatcher;
- BOOLEAN ConsoleNeeded;
- INT ShowCmd;
- HANDLE Console;
- HANDLE InputHandle;
- HANDLE OutputHandle;
+PCONTROLDISPATCHER CtrlDispatcher;
+BOOLEAN ConsoleNeeded;
+INT ShowCmd;
+HANDLE Console;
+HANDLE InputHandle;
+HANDLE OutputHandle;
} CSRSS_ALLOC_CONSOLE, *PCSRSS_ALLOC_CONSOLE;
typedef struct
@@ -130,254 +130,254 @@
typedef struct
{
- HANDLE ConsoleHandle;
- CONSOLE_SCREEN_BUFFER_INFO Info;
+HANDLE ConsoleHandle;
+CONSOLE_SCREEN_BUFFER_INFO Info;
} CSRSS_SCREEN_BUFFER_INFO, *PCSRSS_SCREEN_BUFFER_INFO;
typedef struct
{
- HANDLE ConsoleHandle;
- COORD Position;
+HANDLE ConsoleHandle;
+COORD Position;
} CSRSS_SET_CURSOR, *PCSRSS_SET_CURSOR;
typedef struct
{
- HANDLE ConsoleHandle;
- BOOL Unicode;
- union
- {
- CHAR AsciiChar;
- WCHAR UnicodeChar;
- } Char;
- COORD Position;
- WORD Length;
- ULONG NrCharactersWritten;
+HANDLE ConsoleHandle;
+BOOL Unicode;
+union
+{
+CHAR AsciiChar;
+WCHAR UnicodeChar;
+} Char;
+COORD Position;
+WORD Length;
+ULONG NrCharactersWritten;
} CSRSS_FILL_OUTPUT, *PCSRSS_FILL_OUTPUT;
typedef struct
{
- HANDLE ConsoleHandle;
- CHAR Attribute;
- COORD Coord;
- WORD Length;
+HANDLE ConsoleHandle;
+CHAR Attribute;
+COORD Coord;
+WORD Length;
} CSRSS_FILL_OUTPUT_ATTRIB, *PCSRSS_FILL_OUTPUT_ATTRIB;
typedef struct
{
- HANDLE ConsoleHandle;
- BOOL Unicode;
- INPUT_RECORD Input;
- BOOL MoreEvents;
- HANDLE Event;
+HANDLE ConsoleHandle;
+BOOL Unicode;
+INPUT_RECORD Input;
+BOOL MoreEvents;
+HANDLE Event;
} CSRSS_READ_INPUT, *PCSRSS_READ_INPUT;
typedef struct
{
- HANDLE ConsoleHandle;
- BOOL Unicode;
- WORD Length;
- COORD Coord;
- COORD EndCoord;
- ULONG NrCharactersWritten;
- CHAR String[0];
+HANDLE ConsoleHandle;
+BOOL Unicode;
+WORD Length;
+COORD Coord;
+COORD EndCoord;
+ULONG NrCharactersWritten;
+CHAR String[0];
} CSRSS_WRITE_CONSOLE_OUTPUT_CHAR, *PCSRSS_WRITE_CONSOLE_OUTPUT_CHAR;
typedef struct
{
- HANDLE ConsoleHandle;
- WORD Length;
- COORD Coord;
- COORD EndCoord;
- WORD Attribute[0];
+HANDLE ConsoleHandle;
+WORD Length;
+COORD Coord;
+COORD EndCoord;
+WORD Attribute[0];
} CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB, *PCSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB;
typedef struct
{
- HANDLE ConsoleHandle;
- CONSOLE_CURSOR_INFO Info;
+HANDLE ConsoleHandle;
+CONSOLE_CURSOR_INFO Info;
} CSRSS_GET_CURSOR_INFO, *PCSRSS_GET_CURSOR_INFO;
typedef struct
{
- HANDLE ConsoleHandle;
- CONSOLE_CURSOR_INFO Info;
+HANDLE ConsoleHandle;
+CONSOLE_CURSOR_INFO Info;
} CSRSS_SET_CURSOR_INFO, *PCSRSS_SET_CURSOR_INFO;
typedef struct
{
- HANDLE ConsoleHandle;
- WORD Attrib;
+HANDLE ConsoleHandle;
+WORD Attrib;
} CSRSS_SET_ATTRIB, *PCSRSS_SET_ATTRIB;
typedef struct
{
- HANDLE ConsoleHandle;
- DWORD Mode;
+HANDLE ConsoleHandle;
+DWORD Mode;
} CSRSS_SET_CONSOLE_MODE, *PCSRSS_SET_CONSOLE_MODE;
typedef struct
{
- HANDLE ConsoleHandle;
- DWORD ConsoleMode;
+HANDLE ConsoleHandle;
+DWORD ConsoleMode;
} CSRSS_
[ros-diffs] [hbelusca] 57559: Create a branch for working on csrss and Co.
Author: hbelusca Date: Sun Oct 14 12:46:30 2012 New Revision: 57559 URL: http://svn.reactos.org/svn/reactos?rev=57559&view=rev Log: Create a branch for working on csrss and Co. Added: branches/ros-csrss/ - copied from r57558, trunk/
[ros-diffs] [hbelusca] 57560: This was not the good thing to copy.
Author: hbelusca Date: Sun Oct 14 13:02:55 2012 New Revision: 57560 URL: http://svn.reactos.org/svn/reactos?rev=57560&view=rev Log: This was not the good thing to copy. Removed: branches/ros-csrss/
[ros-diffs] [hbelusca] 57561: Create a branch for working on csrss and co.
Author: hbelusca Date: Sun Oct 14 13:04:31 2012 New Revision: 57561 URL: http://svn.reactos.org/svn/reactos?rev=57561&view=rev Log: Create a branch for working on csrss and co. Added: branches/ros-csrss/ (props changed) - copied from r57560, trunk/reactos/ Propchange: branches/ros-csrss/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Oct 14 13:04:31 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-csrss/ -- bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-csrss/ -- bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-csrss/ -- --- svn:ignore (added) +++ svn:ignore Sun Oct 14 13:04:31 2012 @@ -1,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/ros-csrss/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Oct 14 13:04:31 2012 @@ -1,0 +1,15 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 +/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-4,6-55567 +/branches/wlan-bringup:54809-54998 Propchange: branches/ros-csrss/ -- tsvn:logminsize = 10
[ros-diffs] [hbelusca] 57562: - Use only the cmd.exe as a shell. - Deactivate compilation of the (optional) applications and of explorer(_new).exe
Author: hbelusca Date: Sun Oct 14 13:53:59 2012 New Revision: 57562 URL: http://svn.reactos.org/svn/reactos?rev=57562&view=rev Log: - Use only the cmd.exe as a shell. - Deactivate compilation of the (optional) applications and of explorer(_new).exe Modified: branches/ros-csrss/base/CMakeLists.txt branches/ros-csrss/base/shell/CMakeLists.txt branches/ros-csrss/boot/bootdata/hivedef_amd64.inf branches/ros-csrss/boot/bootdata/hivedef_arm.inf branches/ros-csrss/boot/bootdata/hivedef_i386.inf branches/ros-csrss/boot/bootdata/hivesft_amd64.inf branches/ros-csrss/boot/bootdata/hivesft_arm.inf branches/ros-csrss/boot/bootdata/hivesft_i386.inf Modified: branches/ros-csrss/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/CMakeLists.txt?rev=57562&r1=57561&r2=57562&view=diff == --- branches/ros-csrss/base/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/base/CMakeLists.txt [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -1,5 +1,5 @@ -add_subdirectory(applications) +#add_subdirectory(applications) add_subdirectory(services) add_subdirectory(setup) add_subdirectory(shell) Modified: branches/ros-csrss/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/CMakeLists.txt?rev=57562&r1=57561&r2=57562&view=diff == --- branches/ros-csrss/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/base/shell/CMakeLists.txt [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -1,7 +1,7 @@ add_subdirectory(cmd) -if(NOT MSVC) -add_subdirectory(explorer) -endif() -add_subdirectory(explorer-new) +#if(NOT MSVC) +#add_subdirectory(explorer) +#endif() +#add_subdirectory(explorer-new) Modified: branches/ros-csrss/boot/bootdata/hivedef_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivedef_amd64.inf?rev=57562&r1=57561&r2=57562&view=diff == --- branches/ros-csrss/boot/bootdata/hivedef_amd64.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivedef_amd64.inf [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -1649,7 +1649,7 @@ ; default shell HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x0012 -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x0002,"%SystemRoot%\explorer.exe" +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x0002,"%SystemRoot%\system32\cmd.exe" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies",,0x0012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run",,0x0012 Modified: branches/ros-csrss/boot/bootdata/hivedef_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivedef_arm.inf?rev=57562&r1=57561&r2=57562&view=diff == --- branches/ros-csrss/boot/bootdata/hivedef_arm.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivedef_arm.inf [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -1453,7 +1453,7 @@ ; default shell HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x0012 -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x0002,"%SystemRoot%\explorer.exe" +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x0002,"%SystemRoot%\system32\cmd.exe" HKCU,"SOFTWARE\Microsoft\Windows NT",,0x0012 HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion",,0x0012 Modified: branches/ros-csrss/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivedef_i386.inf?rev=57562&r1=57561&r2=57562&view=diff == --- branches/ros-csrss/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivedef_i386.inf [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -1649,7 +1649,7 @@ ; default shell HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x0012 -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x0002,"%SystemRoot%\explorer.exe" +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x0002,"%SystemRoot%\system32\cmd.exe" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies",,0x0012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run",,0x0012 Modified: branches/ros-csrss/boot/bootdata/hivesft_
[ros-diffs] [hbelusca] 57563: Enable widl to read .idl files when they are in another disk drive. (This enable the ReactOS' source code to be placed e.g. in C:\ros_src, and to be compiled into G:\rosb
Author: hbelusca Date: Sun Oct 14 14:03:51 2012 New Revision: 57563 URL: http://svn.reactos.org/svn/reactos?rev=57563&view=rev Log: Enable widl to read .idl files when they are in another disk drive. (This enable the ReactOS' source code to be placed e.g. in C:\ros_src, and to be compiled into G:\rosbuild) Modified: branches/ros-csrss/tools/wpp/preproc.c Modified: branches/ros-csrss/tools/wpp/preproc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/wpp/preproc.c?rev=57563&r1=57562&r2=57563&view=diff == --- branches/ros-csrss/tools/wpp/preproc.c [iso-8859-1] (original) +++ branches/ros-csrss/tools/wpp/preproc.c [iso-8859-1] Sun Oct 14 14:03:51 2012 @@ -447,7 +447,12 @@ * Include management *- */ -#if defined(_Windows) || defined(__MSDOS__) +#if ( defined(_Windows) || defined(_WINDOWS) || defined(WIN32) || \ + defined(_WIN32) || defined(__WIN32__) || defined(__MSDOS__) ) +/* + * Windows system uses ':' as part of its path. + * Therefore use another separator character. + */ #define INCLUDESEPARATOR ";" #else #define INCLUDESEPARATOR ":"
[ros-diffs] [hbelusca] 57569: [BOOTDATA] Revert r57562; it is better to perform tests...
Author: hbelusca Date: Wed Oct 17 22:19:29 2012 New Revision: 57569 URL: http://svn.reactos.org/svn/reactos?rev=57569&view=rev Log: [BOOTDATA] Revert r57562; it is better to perform tests... Modified: branches/ros-csrss/base/CMakeLists.txt branches/ros-csrss/base/shell/CMakeLists.txt branches/ros-csrss/boot/bootdata/hivedef_amd64.inf branches/ros-csrss/boot/bootdata/hivedef_arm.inf branches/ros-csrss/boot/bootdata/hivedef_i386.inf branches/ros-csrss/boot/bootdata/hivesft_amd64.inf branches/ros-csrss/boot/bootdata/hivesft_arm.inf branches/ros-csrss/boot/bootdata/hivesft_i386.inf Modified: branches/ros-csrss/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/CMakeLists.txt?rev=57569&r1=57568&r2=57569&view=diff == --- branches/ros-csrss/base/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/base/CMakeLists.txt [iso-8859-1] Wed Oct 17 22:19:29 2012 @@ -1,5 +1,5 @@ -#add_subdirectory(applications) +add_subdirectory(applications) add_subdirectory(services) add_subdirectory(setup) add_subdirectory(shell) Modified: branches/ros-csrss/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/CMakeLists.txt?rev=57569&r1=57568&r2=57569&view=diff == --- branches/ros-csrss/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/base/shell/CMakeLists.txt [iso-8859-1] Wed Oct 17 22:19:29 2012 @@ -1,7 +1,7 @@ add_subdirectory(cmd) -#if(NOT MSVC) -#add_subdirectory(explorer) -#endif() -#add_subdirectory(explorer-new) +if(NOT MSVC) +add_subdirectory(explorer) +endif() +add_subdirectory(explorer-new) Modified: branches/ros-csrss/boot/bootdata/hivedef_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivedef_amd64.inf?rev=57569&r1=57568&r2=57569&view=diff == --- branches/ros-csrss/boot/bootdata/hivedef_amd64.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivedef_amd64.inf [iso-8859-1] Wed Oct 17 22:19:29 2012 @@ -1649,7 +1649,7 @@ ; default shell HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x0012 -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x0002,"%SystemRoot%\system32\cmd.exe" +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x0002,"%SystemRoot%\explorer.exe" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies",,0x0012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run",,0x0012 Modified: branches/ros-csrss/boot/bootdata/hivedef_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivedef_arm.inf?rev=57569&r1=57568&r2=57569&view=diff == --- branches/ros-csrss/boot/bootdata/hivedef_arm.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivedef_arm.inf [iso-8859-1] Wed Oct 17 22:19:29 2012 @@ -1453,7 +1453,7 @@ ; default shell HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x0012 -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x0002,"%SystemRoot%\system32\cmd.exe" +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x0002,"%SystemRoot%\explorer.exe" HKCU,"SOFTWARE\Microsoft\Windows NT",,0x0012 HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion",,0x0012 Modified: branches/ros-csrss/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivedef_i386.inf?rev=57569&r1=57568&r2=57569&view=diff == --- branches/ros-csrss/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivedef_i386.inf [iso-8859-1] Wed Oct 17 22:19:29 2012 @@ -1649,7 +1649,7 @@ ; default shell HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x0012 -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x0002,"%SystemRoot%\system32\cmd.exe" +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x0002,"%SystemRoot%\explorer.exe" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies",,0x0012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run",,0x0012 Modified: branches/ros-csrss/boot/bootdata/hivesft_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrs
[ros-diffs] [hbelusca] 57570: [NTDLL/KERNEL32/CSRSRV/WIN32K/USER32/WIN32CSR] - Use the new messaging structures and the new macros, plus the new CSR_API function's signature (--> and rename some varia
Author: hbelusca Date: Wed Oct 17 23:10:40 2012 New Revision: 57570 URL: http://svn.reactos.org/svn/reactos?rev=57570&view=rev Log: [NTDLL/KERNEL32/CSRSRV/WIN32K/USER32/WIN32CSR] - Use the new messaging structures and the new macros, plus the new CSR_API function's signature (--> and rename some variables). - Code cleaning & formatting. [CSRSS/NDK] - Reorganize all the header files in logical units (server.h for server-side of CSR, client.h for client-side, and msg.h for messaging), removing duplicated definitions. - Code cleaning & formatting. The next step would be to activate the code of server-dll loading inside csrsrv, then moving all the console-related APIs from win32csr to winsrv, the latter built with the same structure as csrsrv's. Added: branches/ros-csrss/include/reactos/subsys/csrss/client.h (with props) branches/ros-csrss/include/reactos/subsys/csrss/csrcons.h (with props) branches/ros-csrss/include/reactos/subsys/csrss/msg.h (with props) branches/ros-csrss/include/reactos/subsys/csrss/server.h (contents, props changed) - copied, changed from r57561, branches/ros-csrss/include/reactos/subsys/csr/server.h Removed: branches/ros-csrss/include/reactos/subsys/csr/ Modified: branches/ros-csrss/dll/ntdll/csr/api.c branches/ros-csrss/dll/ntdll/csr/connect.c branches/ros-csrss/dll/ntdll/include/ntdll.h branches/ros-csrss/dll/ntdll/include/ntdllp.h branches/ros-csrss/dll/win32/kernel32/CMakeLists.txt branches/ros-csrss/dll/win32/kernel32/client/dllmain.c branches/ros-csrss/dll/win32/kernel32/client/dosdev.c branches/ros-csrss/dll/win32/kernel32/client/file/console.c branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c branches/ros-csrss/dll/win32/kernel32/client/file/filename.c branches/ros-csrss/dll/win32/kernel32/client/proc.c branches/ros-csrss/dll/win32/kernel32/client/vdm.c branches/ros-csrss/dll/win32/kernel32/client/vista.c branches/ros-csrss/dll/win32/kernel32/k32.h branches/ros-csrss/include/ndk/umfuncs.h branches/ros-csrss/include/ndk/umtypes.h branches/ros-csrss/include/reactos/subsys/csrss/csrss.h (contents, props changed) branches/ros-csrss/subsystems/win32/csrss/csrsrv/api/process.c branches/ros-csrss/subsystems/win32/csrss/csrsrv/api/user.c branches/ros-csrss/subsystems/win32/csrss/csrsrv/api/wapi.c branches/ros-csrss/subsystems/win32/csrss/csrsrv/procsup.c branches/ros-csrss/subsystems/win32/csrss/csrsrv/server.c branches/ros-csrss/subsystems/win32/csrss/csrsrv/thredsup.c branches/ros-csrss/subsystems/win32/csrss/include/api.h branches/ros-csrss/win32ss/pch.h branches/ros-csrss/win32ss/user/ntuser/csr.c branches/ros-csrss/win32ss/user/ntuser/desktop.c branches/ros-csrss/win32ss/user/ntuser/simplecall.c branches/ros-csrss/win32ss/user/user32/include/user32.h branches/ros-csrss/win32ss/user/user32/include/user_x.h branches/ros-csrss/win32ss/user/user32/misc/exit.c branches/ros-csrss/win32ss/user/user32/misc/misc.c branches/ros-csrss/win32ss/user/win32csr/alias.c branches/ros-csrss/win32ss/user/win32csr/coninput.c branches/ros-csrss/win32ss/user/win32csr/conoutput.c branches/ros-csrss/win32ss/user/win32csr/console.c branches/ros-csrss/win32ss/user/win32csr/desktopbg.c branches/ros-csrss/win32ss/user/win32csr/exitros.c branches/ros-csrss/win32ss/user/win32csr/file.c branches/ros-csrss/win32ss/user/win32csr/handle.c branches/ros-csrss/win32ss/user/win32csr/lineinput.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/dll/ntdll/csr/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/api.c?rev=57570&r1=57569&r2=57570&view=diff Modified: branches/ros-csrss/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/connect.c?rev=57570&r1=57569&r2=57570&view=diff Modified: branches/ros-csrss/dll/ntdll/include/ntdll.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/include/ntdll.h?rev=57570&r1=57569&r2=57570&view=diff Modified: branches/ros-csrss/dll/ntdll/include/ntdllp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/include/ntdllp.h?rev=57570&r1=57569&r2=57570&view=diff Modified: branches/ros-csrss/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/CMakeLists.txt?rev=57570&r1=57569&r2=57570&view=diff Modified: branches/ros-csrss/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/client/dllmain.c?rev=57570&r1=57569&r2=57570&view=diff Modified: branches/ros-csrss/dll/win32/kernel32/client/dosdev.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/client/dosde
[ros-diffs] [hbelusca] 57579: [CSR] Remove old csrss.
Author: hbelusca Date: Fri Oct 19 20:14:47 2012 New Revision: 57579 URL: http://svn.reactos.org/svn/reactos?rev=57579&view=rev Log: [CSR] Remove old csrss. Removed: branches/ros-csrss/subsystems/csr/
[ros-diffs] [hbelusca] 57580: [CSRSS/CSRSRV] - Rename ProcessDataLock to CsrProcessLock (as it was in the "old" csrsrv, see r57579). - Merge the APIs from the "old" csrsrv (subsystems/csr , see r57579
Author: hbelusca Date: Sat Oct 20 13:00:41 2012 New Revision: 57580 URL: http://svn.reactos.org/svn/reactos?rev=57580&view=rev Log: [CSRSS/CSRSRV] - Rename ProcessDataLock to CsrProcessLock (as it was in the "old" csrsrv, see r57579). - Merge the APIs from the "old" csrsrv (subsystems/csr , see r57579) with the other ones (subsystems/win32/csrss/csrsrv). - Reorganize the functions into Private & Public functions. - Add temporary comments. - Start removing things which should be present in basesrv instead of in csrsrv. This breaks build of this branch at the moment... Modified: branches/ros-csrss/subsystems/win32/csrss/CMakeLists.txt branches/ros-csrss/subsystems/win32/csrss/csrsrv/api/wapi.c branches/ros-csrss/subsystems/win32/csrss/csrsrv/csrsrv.spec branches/ros-csrss/subsystems/win32/csrss/csrsrv/init.c branches/ros-csrss/subsystems/win32/csrss/csrsrv/procsup.c branches/ros-csrss/subsystems/win32/csrss/csrsrv/session.c branches/ros-csrss/subsystems/win32/csrss/csrsrv/thredsup.c branches/ros-csrss/subsystems/win32/csrss/csrss.c branches/ros-csrss/subsystems/win32/csrss/include/api.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/subsystems/win32/csrss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrss/CMakeLists.txt?rev=57580&r1=57579&r2=57580&view=diff Modified: branches/ros-csrss/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrss/csrsrv/api/wapi.c?rev=57580&r1=57579&r2=57580&view=diff Modified: branches/ros-csrss/subsystems/win32/csrss/csrsrv/csrsrv.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrss/csrsrv/csrsrv.spec?rev=57580&r1=57579&r2=57580&view=diff Modified: branches/ros-csrss/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrss/csrsrv/init.c?rev=57580&r1=57579&r2=57580&view=diff Modified: branches/ros-csrss/subsystems/win32/csrss/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrss/csrsrv/procsup.c?rev=57580&r1=57579&r2=57580&view=diff Modified: branches/ros-csrss/subsystems/win32/csrss/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrss/csrsrv/session.c?rev=57580&r1=57579&r2=57580&view=diff Modified: branches/ros-csrss/subsystems/win32/csrss/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrss/csrsrv/thredsup.c?rev=57580&r1=57579&r2=57580&view=diff Modified: branches/ros-csrss/subsystems/win32/csrss/csrss.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrss/csrss.c?rev=57580&r1=57579&r2=57580&view=diff Modified: branches/ros-csrss/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrss/include/api.h?rev=57580&r1=57579&r2=57580&view=diff
[ros-diffs] [hbelusca] 57582: [CSRSS/CSRSRV] - Reorganize the source code tree. (Branch build still broken)
Author: hbelusca Date: Sat Oct 20 13:28:09 2012 New Revision: 57582 URL: http://svn.reactos.org/svn/reactos?rev=57582&view=rev Log: [CSRSS/CSRSRV] - Reorganize the source code tree. (Branch build still broken) Added: branches/ros-csrss/subsystems/win32/csrsrv/ - copied from r57580, branches/ros-csrss/subsystems/win32/csrss/csrsrv/ branches/ros-csrss/subsystems/win32/csrsrv/include/ - copied from r57580, branches/ros-csrss/subsystems/win32/csrss/include/ Removed: branches/ros-csrss/subsystems/win32/csrss/csrsrv/ branches/ros-csrss/subsystems/win32/csrss/include/ Modified: branches/ros-csrss/subsystems/win32/CMakeLists.txt branches/ros-csrss/subsystems/win32/csrss/CMakeLists.txt Modified: branches/ros-csrss/subsystems/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/CMakeLists.txt?rev=57582&r1=57581&r2=57582&view=diff == --- branches/ros-csrss/subsystems/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/CMakeLists.txt [iso-8859-1] Sat Oct 20 13:28:09 2012 @@ -1,2 +1,3 @@ +add_subdirectory(csrsrv) add_subdirectory(csrss) Modified: branches/ros-csrss/subsystems/win32/csrss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrss/CMakeLists.txt?rev=57582&r1=57581&r2=57582&view=diff == --- branches/ros-csrss/subsystems/win32/csrss/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrss/CMakeLists.txt [iso-8859-1] Sat Oct 20 13:28:09 2012 @@ -10,5 +10,3 @@ add_importlibs(csrss ntdll csrsrv) add_dependencies(csrss psdk bugcodes) add_cd_file(TARGET csrss DESTINATION reactos/system32 FOR all) - -add_subdirectory(csrsrv)
[ros-diffs] [hbelusca] 57583: [CSRSRV] - Start renaming some APIs which should not be present there, but in basesrv instead. Names come from http://j00ru.vexillium.org/csrss_list/api_list.html#Windows
Author: hbelusca
Date: Sat Oct 20 14:07:04 2012
New Revision: 57583
URL: http://svn.reactos.org/svn/reactos?rev=57583&view=rev
Log:
[CSRSRV]
- Start renaming some APIs which should not be present there, but in basesrv
instead.
Names come from http://j00ru.vexillium.org/csrss_list/api_list.html#Windows_2k3
Modified:
branches/ros-csrss/subsystems/win32/csrsrv/api/process.c
branches/ros-csrss/subsystems/win32/csrsrv/api/user.c
branches/ros-csrss/subsystems/win32/csrsrv/include/api.h
branches/ros-csrss/subsystems/win32/csrsrv/init.c
Modified: branches/ros-csrss/subsystems/win32/csrsrv/api/process.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/api/process.c?rev=57583&r1=57582&r2=57583&view=diff
==
--- branches/ros-csrss/subsystems/win32/csrsrv/api/process.c [iso-8859-1]
(original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/api/process.c [iso-8859-1] Sat
Oct 20 14:07:04 2012
@@ -23,7 +23,14 @@
* CSRSS API
*/
-CSR_API(CsrSrvCreateProcess)
+/***
+ *** Some APIs from here will go to basesrv.dll, some others to winsrv.dll.
+ *** Furthermore, this structure uses the old definition of APIs list.
+ *** The new one is in fact three arrays, one of APIs pointers, one other of
+ *** corresponding indexes, and the third one of names (not very efficient...).
+ ***/
+
+CSR_API(BaseSrvCreateProcess)
{
NTSTATUS Status;
HANDLE ProcessHandle, ThreadHandle;
@@ -135,7 +142,7 @@
return Status;
}
-CSR_API(CsrSrvCreateThread)
+CSR_API(BaseSrvCreateThread)
{
PCSR_THREAD CurrentThread;
HANDLE ThreadHandle;
@@ -191,7 +198,7 @@
return Status;
}
-CSR_API(CsrTerminateProcess)
+CSR_API(BaseSrvExitProcess)
{
PCSR_THREAD CsrThread = CsrGetClientThread();
ASSERT(CsrThread != NULL);
@@ -204,12 +211,7 @@
(NTSTATUS)ApiMessage->Data.TerminateProcessRequest.uExitCode);
}
-CSR_API(CsrConnectProcess)
-{
-return STATUS_SUCCESS;
-}
-
-CSR_API(CsrGetShutdownParameters)
+CSR_API(BaseSrvGetProcessShutdownParam)
{
PCSR_THREAD CsrThread = CsrGetClientThread();
ASSERT(CsrThread);
@@ -220,7 +222,7 @@
return STATUS_SUCCESS;
}
-CSR_API(CsrSetShutdownParameters)
+CSR_API(BaseSrvSetProcessShutdownParam)
{
PCSR_THREAD CsrThread = CsrGetClientThread();
ASSERT(CsrThread);
Modified: branches/ros-csrss/subsystems/win32/csrsrv/api/user.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/api/user.c?rev=57583&r1=57582&r2=57583&view=diff
==
--- branches/ros-csrss/subsystems/win32/csrsrv/api/user.c [iso-8859-1]
(original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/api/user.c [iso-8859-1] Sat Oct
20 14:07:04 2012
@@ -23,7 +23,7 @@
/* FUNCTIONS */
-CSR_API(CsrRegisterServicesProcess)
+CSR_API(SrvRegisterServicesProcess)
{
if (ServicesProcessIdValid == TRUE)
{
Modified: branches/ros-csrss/subsystems/win32/csrsrv/include/api.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/include/api.h?rev=57583&r1=57582&r2=57583&view=diff
==
--- branches/ros-csrss/subsystems/win32/csrsrv/include/api.h [iso-8859-1]
(original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/include/api.h [iso-8859-1] Sat
Oct 20 14:07:04 2012
@@ -71,11 +71,11 @@
/* api/process.c */
CSR_API(CsrConnectProcess);
-CSR_API(CsrSrvCreateProcess);
-CSR_API(CsrTerminateProcess);
-CSR_API(CsrSrvCreateThread);
-CSR_API(CsrGetShutdownParameters);
-CSR_API(CsrSetShutdownParameters);
+CSR_API(BaseSrvCreateProcess);
+CSR_API(BaseSrvExitProcess);
+CSR_API(BaseSrvCreateThread);
+CSR_API(BaseSrvGetProcessShutdownParam);
+CSR_API(BaseSrvSetProcessShutdownParam);
VOID
NTAPI
@@ -263,6 +263,6 @@
IN ULONG ServerId);
/* api/user.c */
-CSR_API(CsrRegisterServicesProcess);
+CSR_API(SrvRegisterServicesProcess);
/* EOF */
Modified: branches/ros-csrss/subsystems/win32/csrsrv/init.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/init.c?rev=57583&r1=57582&r2=57583&view=diff
==
--- branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] (original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] Sat Oct 20
14:07:04 2012
@@ -94,13 +94,12 @@
***/
CSRSS_API_DEFINITION NativeDefinitions[] =
{
-CSRSS_DEFINE_API(CREATE_PROCESS, CsrSrvCreateProcess),
-CSRSS_DEFINE_API(CREATE_THREAD,CsrSrvCreateThread),
-CSRSS_DEFINE_API(TERMINATE_PROCESS,
[ros-diffs] [hbelusca] 57584: [NTDLL] - Activate new code (but keep the old one for the moment).
Author: hbelusca
Date: Sat Oct 20 14:10:50 2012
New Revision: 57584
URL: http://svn.reactos.org/svn/reactos?rev=57584&view=rev
Log:
[NTDLL]
- Activate new code (but keep the old one for the moment).
Modified:
branches/ros-csrss/dll/ntdll/csr/connect.c
Modified: branches/ros-csrss/dll/ntdll/csr/connect.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/connect.c?rev=57584&r1=57583&r2=57584&view=diff
==
--- branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] (original)
+++ branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] Sat Oct 20 14:10:50
2012
@@ -431,17 +431,16 @@
*ConnectionInfoSize = ClientConnect->ConnectionInfoSize;
/* Call CSR */
-#if 0
Status = CsrClientCallServer(&ApiMessage,
CaptureBuffer,
CSR_CREATE_API_NUMBER(CSR_SRV_DLL,
CsrpClientConnect),
sizeof(CSR_CLIENT_CONNECT));
-#else
+/*
Status = CsrClientCallServer(&ApiMessage,
CaptureBuffer,
CSR_CREATE_API_NUMBER(CSR_NATIVE,
CONNECT_PROCESS),
sizeof(CSR_API_MESSAGE));
-#endif
+*/
}
else
{
[ros-diffs] [hbelusca] 57587: [NTDLL/KERNEL32] - Use new naming scheme. [CSRSRV] - Continuing headers reorganization. - Activate new code. [CSRSRV/WIN32CSR] - Move some code into basesrv. [BASESRV] -
Author: hbelusca Date: Sat Oct 20 21:03:32 2012 New Revision: 57587 URL: http://svn.reactos.org/svn/reactos?rev=57587&view=rev Log: [NTDLL/KERNEL32] - Use new naming scheme. [CSRSRV] - Continuing headers reorganization. - Activate new code. [CSRSRV/WIN32CSR] - Move some code into basesrv. [BASESRV] - Add basesrv.dll The names of the APIs tables come from http://j00ru.vexillium.org/csrss_list/api_list.html as usual, however I used the NT 4 ones for testing purposes only. After that I will update them to 2k3 version and add function stubs. Also some variable names are deduced from the subsystems/win32/csrss/csrsrv/server.c ones. Added: branches/ros-csrss/include/reactos/subsys/win/console.h (with props) branches/ros-csrss/subsystems/win/basesrv/CMakeLists.txt (with props) branches/ros-csrss/subsystems/win/basesrv/basesrv.spec (with props) Removed: branches/ros-csrss/include/reactos/subsys/csrss/csrcons.h branches/ros-csrss/subsystems/win/basesrv/basesrv.def branches/ros-csrss/subsystems/win/basesrv/main.c branches/ros-csrss/win32ss/user/win32csr/file.c branches/ros-csrss/win32ss/user/win32csr/file.h Modified: branches/ros-csrss/dll/ntdll/csr/api.c branches/ros-csrss/dll/win32/kernel32/client/dosdev.c branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c branches/ros-csrss/dll/win32/kernel32/client/file/filename.c branches/ros-csrss/dll/win32/kernel32/client/proc.c branches/ros-csrss/dll/win32/kernel32/client/vdm.c branches/ros-csrss/include/reactos/subsys/csrss/csrss.h branches/ros-csrss/include/reactos/subsys/win/base.h (contents, props changed) branches/ros-csrss/include/reactos/subsys/win/windows.h (contents, props changed) branches/ros-csrss/subsystems/win/basesrv/basesrv.h (contents, props changed) branches/ros-csrss/subsystems/win/basesrv/basesrv.rc (contents, props changed) branches/ros-csrss/subsystems/win/basesrv/init.c (contents, props changed) branches/ros-csrss/subsystems/win/basesrv/server.c (contents, props changed) branches/ros-csrss/subsystems/win32/csrsrv/api/process.c branches/ros-csrss/subsystems/win32/csrsrv/api/wapi.c branches/ros-csrss/subsystems/win32/csrsrv/init.c branches/ros-csrss/subsystems/win32/csrsrv/procsup.c branches/ros-csrss/subsystems/win32/csrsrv/server.c branches/ros-csrss/win32ss/user/win32csr/CMakeLists.txt branches/ros-csrss/win32ss/user/win32csr/dllmain.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/dll/ntdll/csr/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/api.c?rev=57587&r1=57586&r2=57587&view=diff Modified: branches/ros-csrss/dll/win32/kernel32/client/dosdev.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/client/dosdev.c?rev=57587&r1=57586&r2=57587&view=diff Modified: branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c?rev=57587&r1=57586&r2=57587&view=diff Modified: branches/ros-csrss/dll/win32/kernel32/client/file/filename.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/client/file/filename.c?rev=57587&r1=57586&r2=57587&view=diff Modified: branches/ros-csrss/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/client/proc.c?rev=57587&r1=57586&r2=57587&view=diff Modified: branches/ros-csrss/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/client/vdm.c?rev=57587&r1=57586&r2=57587&view=diff Removed: branches/ros-csrss/include/reactos/subsys/csrss/csrcons.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/csrss/csrcons.h?rev=57586&view=auto Modified: branches/ros-csrss/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/csrss/csrss.h?rev=57587&r1=57586&r2=57587&view=diff Modified: branches/ros-csrss/include/reactos/subsys/win/base.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/win/base.h?rev=57587&r1=57586&r2=57587&view=diff Added: branches/ros-csrss/include/reactos/subsys/win/console.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/win/console.h?rev=57587&view=auto Modified: branches/ros-csrss/include/reactos/subsys/win/windows.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/win/windows.h?rev=57587&r1=57586&r2=57587&view=diff Added: branches/ros-csrss/subsystems/win/basesrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesrv/CMakeLists.txt?rev=
[ros-diffs] [hbelusca] 57588: [BASESRV] Forget two files.
Author: hbelusca Date: Sat Oct 20 21:04:51 2012 New Revision: 57588 URL: http://svn.reactos.org/svn/reactos?rev=57588&view=rev Log: [BASESRV] Forget two files. Added: branches/ros-csrss/subsystems/win/CMakeLists.txt (with props) Modified: branches/ros-csrss/subsystems/CMakeLists.txt Modified: branches/ros-csrss/subsystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/CMakeLists.txt?rev=57588&r1=57587&r2=57588&view=diff == --- branches/ros-csrss/subsystems/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/CMakeLists.txt [iso-8859-1] Sat Oct 20 21:04:51 2012 @@ -1,4 +1,6 @@ + if(ARCH STREQUAL "i386") add_subdirectory(ntvdm) endif() +add_subdirectory(win) add_subdirectory(win32) Added: branches/ros-csrss/subsystems/win/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/CMakeLists.txt?rev=57588&view=auto == --- branches/ros-csrss/subsystems/win/CMakeLists.txt (added) +++ branches/ros-csrss/subsystems/win/CMakeLists.txt [iso-8859-1] Sat Oct 20 21:04:51 2012 @@ -1,0 +1,2 @@ + +add_subdirectory(basesrv) Propchange: branches/ros-csrss/subsystems/win/CMakeLists.txt -- svn:eol-style = native
[ros-diffs] [hbelusca] 57589: [BASESRV] - Compile basesrv and add headers. Some other things are missing yet.
Author: hbelusca
Date: Sun Oct 21 17:18:33 2012
New Revision: 57589
URL: http://svn.reactos.org/svn/reactos?rev=57589&view=rev
Log:
[BASESRV]
- Compile basesrv and add headers.
Some other things are missing yet.
Added:
branches/ros-csrss/include/reactos/subsys/win/basemsg.h (with props)
Modified:
branches/ros-csrss/include/reactos/subsys/win/base.h
branches/ros-csrss/subsystems/win/basesrv/CMakeLists.txt
branches/ros-csrss/subsystems/win/basesrv/basesrv.h
branches/ros-csrss/subsystems/win/basesrv/init.c
branches/ros-csrss/subsystems/win/basesrv/server.c
Modified: branches/ros-csrss/include/reactos/subsys/win/base.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/win/base.h?rev=57589&r1=57588&r2=57589&view=diff
==
--- branches/ros-csrss/include/reactos/subsys/win/base.h [iso-8859-1] (original)
+++ branches/ros-csrss/include/reactos/subsys/win/base.h [iso-8859-1] Sun Oct
21 17:18:33 2012
@@ -1,17 +1,84 @@
-/*** Public header for BASESRV and the rest ***/
-#ifndef __INCLUDE_WIN_BASE_H
-#define __INCLUDE_WIN_BASE_H
+#ifndef __BASE_H__
+#define __BASE_H__
-//#include
-
-/* Base Server */
+#pragma once
typedef VOID (CALLBACK * BASE_PROCESS_CREATE_NOTIFY_ROUTINE)(PVOID);
NTSTATUS WINAPI BaseSetProcessCreateNotify
(BASE_PROCESS_CREATE_NOTIFY_ROUTINE);
CSR_SERVER_DLL_INIT(ServerDllInitialization);
-#endif // __INCLUDE_WIN_BASE_H
+
+
+typedef struct _NLS_USER_INFO
+{
+WCHAR iCountry[80];
+WCHAR sCountry[80];
+WCHAR sList[80];
+WCHAR iMeasure[80];
+WCHAR iPaperSize[80];
+WCHAR sDecimal[80];
+WCHAR sThousand[80];
+WCHAR sGrouping[80];
+WCHAR iDigits[80];
+WCHAR iLZero[80];
+WCHAR iNegNumber[80];
+WCHAR sNativeDigits[80];
+WCHAR iDigitSubstitution[80];
+WCHAR sCurrency[80];
+WCHAR sMonDecSep[80];
+WCHAR sMonThouSep[80];
+WCHAR sMonGrouping[80];
+WCHAR iCurrDigits[80];
+WCHAR iCurrency[80];
+WCHAR iNegCurr[80];
+WCHAR sPosSign[80];
+WCHAR sNegSign[80];
+WCHAR sTimeFormat[80];
+WCHAR s1159[80];
+WCHAR s2359[80];
+WCHAR sShortDate[80];
+WCHAR sYearMonth[80];
+WCHAR sLongDate[80];
+WCHAR iCalType[80];
+WCHAR iFirstDay[80];
+WCHAR iFirstWeek[80];
+WCHAR sLocale[80];
+WCHAR sLocaleName[85];
+LCID UserLocaleId;
+LUID InteractiveUserLuid;
+CHAR InteractiveUserSid[68]; // SECURITY_MAX_SID_SIZE to make ROS happy
+ULONG ulCacheUpdateCount;
+} NLS_USER_INFO, *PNLS_USER_INFO;
+
+
+typedef struct _BASE_STATIC_SERVER_DATA
+{
+UNICODE_STRING WindowsDirectory;
+UNICODE_STRING WindowsSystemDirectory;
+UNICODE_STRING NamedObjectDirectory;
+USHORT WindowsMajorVersion;
+USHORT WindowsMinorVersion;
+USHORT BuildNumber;
+USHORT CSDNumber;
+USHORT RCNumber;
+WCHAR CSDVersion[128];
+SYSTEM_BASIC_INFORMATION SysInfo;
+SYSTEM_TIMEOFDAY_INFORMATION TimeOfDay;
+PVOID IniFileMapping;
+NLS_USER_INFO NlsUserInfo;
+BOOLEAN DefaultSeparateVDM;
+BOOLEAN IsWowTaskReady;
+UNICODE_STRING WindowsSys32x86Directory;
+BOOLEAN fTermsrvAppInstallMode;
+TIME_ZONE_INFORMATION tziTermsrvClientTimeZone;
+KSYSTEM_TIME ktTermsrvClientBias;
+ULONG TermsrvClientTimeZoneId;
+BOOLEAN LUIDDeviceMapsEnabled;
+ULONG TermsrvClientTimeZoneChangeNum;
+} BASE_STATIC_SERVER_DATA, *PBASE_STATIC_SERVER_DATA;
+
+#endif // __BASE_H__
/* EOF */
Added: branches/ros-csrss/include/reactos/subsys/win/basemsg.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/win/basemsg.h?rev=57589&view=auto
==
--- branches/ros-csrss/include/reactos/subsys/win/basemsg.h (added)
+++ branches/ros-csrss/include/reactos/subsys/win/basemsg.h [iso-8859-1] Sun
Oct 21 17:18:33 2012
@@ -1,0 +1,200 @@
+
+#ifndef __BASEMSG_H__
+#define __BASEMSG_H__
+
+#pragma once
+
+#define BASESRV_SERVERDLL_INDEX 1
+#define BASESRV_FIRST_API_NUMBER0
+
+// Windows NT 4 table, adapted from
http://j00ru.vexillium.org/csrss_list/api_list.html#Windows_NT
+// It is for testing purposes. After that I will update it to 2k3 version and
add stubs.
+typedef enum _BASESRV_API_NUMBER
+{
+BasepCreateProcess = BASESRV_FIRST_API_NUMBER,
+BasepCreateThread,
+BasepGetTempFile,
+BasepExitProcess,
+// BasepDebugProcess,
+// BasepCheckVDM,
+// BasepUpdateVDMEntry,
+// BasepGetNextVDMCommand,
+// BasepExitVDM,
+// BasepIsFirstVDM,
+// BasepGetVDMExitCode,
+// BasepSetReenterCount,
+BasepSetProcessShutdownParam,
+BasepGetProcessShutdownParam,
+// BasepNlsSetUserInfo,
+// BasepNlsSetMultipleUserInfo,
+// BasepNlsCreateSortSection,
+// BasepNlsPreserveSection,
+// BasepSetVDMCurDirs,
+// BasepGetVDMCurDirs,
+// BasepBatNotification,
+//
[ros-diffs] [hbelusca] 57591: [NTDLL] - Fix a variable and a header names. [CSR] - Move all the interesting code from the "old" csrsrv (see r57579) to the new one. TODO: finish to reorganize the code.
Author: hbelusca Date: Mon Oct 22 00:09:51 2012 New Revision: 57591 URL: http://svn.reactos.org/svn/reactos?rev=57591&view=rev Log: [NTDLL] - Fix a variable and a header names. [CSR] - Move all the interesting code from the "old" csrsrv (see r57579) to the new one. TODO: finish to reorganize the code. - Rename the headers to a standard naming I will use for the other server dlls. - Remove now unneeded files. (one can sometimes find commented names next to declaration of variables: it is when a variable name doesn't satisfy me because it isn't enough self-explaining for my taste). [CONSOLE] - Add a new header for console working (win32csr --> consrv.dll == the console part of winsrv.dll I separate from it, because I plan a profound reworking on the console after all that). Added: branches/ros-csrss/include/reactos/subsys/csr/ - copied from r57588, branches/ros-csrss/include/reactos/subsys/csrss/ branches/ros-csrss/include/reactos/subsys/csr/csrcl.h - copied, changed from r57588, branches/ros-csrss/include/reactos/subsys/csrss/client.h branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h - copied, changed from r57570, branches/ros-csrss/include/reactos/subsys/csrss/msg.h branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h - copied, changed from r57588, branches/ros-csrss/include/reactos/subsys/csrss/server.h branches/ros-csrss/include/reactos/subsys/win/conmsg.h - copied, changed from r57588, branches/ros-csrss/include/reactos/subsys/win/console.h branches/ros-csrss/include/reactos/subsys/win/winmsg.h - copied, changed from r57588, branches/ros-csrss/include/reactos/subsys/win/windows.h branches/ros-csrss/subsystems/win32/csrsrv/api.c - copied, changed from r57588, branches/ros-csrss/subsystems/win32/csrsrv/api/wapi.c branches/ros-csrss/subsystems/win32/csrsrv/user.c - copied, changed from r57588, branches/ros-csrss/subsystems/win32/csrsrv/api/user.c Removed: branches/ros-csrss/include/reactos/subsys/csr/client.h branches/ros-csrss/include/reactos/subsys/csr/msg.h branches/ros-csrss/include/reactos/subsys/csr/server.h branches/ros-csrss/include/reactos/subsys/csrss/ branches/ros-csrss/include/reactos/subsys/win/console.h branches/ros-csrss/include/reactos/subsys/win/windows.h branches/ros-csrss/subsystems/win32/csrsrv/api/ Modified: branches/ros-csrss/dll/ntdll/csr/connect.c branches/ros-csrss/dll/ntdll/include/ntdll.h branches/ros-csrss/include/reactos/subsys/csr/csrss.h branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt branches/ros-csrss/subsystems/win32/csrsrv/csrsrv.spec branches/ros-csrss/subsystems/win32/csrsrv/include/api.h branches/ros-csrss/subsystems/win32/csrsrv/include/csrplugin.h branches/ros-csrss/subsystems/win32/csrsrv/init.c branches/ros-csrss/subsystems/win32/csrsrv/procsup.c branches/ros-csrss/subsystems/win32/csrsrv/server.c branches/ros-csrss/subsystems/win32/csrsrv/session.c branches/ros-csrss/subsystems/win32/csrsrv/srv.h branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c branches/ros-csrss/subsystems/win32/csrss/CMakeLists.txt branches/ros-csrss/subsystems/win32/csrss/csrss.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/connect.c?rev=57591&r1=57590&r2=57591&view=diff Modified: branches/ros-csrss/dll/ntdll/include/ntdll.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/include/ntdll.h?rev=57591&r1=57590&r2=57591&view=diff Removed: branches/ros-csrss/include/reactos/subsys/csr/client.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/csrss/client.h?rev=57588&view=auto Copied: branches/ros-csrss/include/reactos/subsys/csr/csrcl.h (from r57588, branches/ros-csrss/include/reactos/subsys/csrss/client.h) URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/csr/csrcl.h?p2=branches/ros-csrss/include/reactos/subsys/csr/csrcl.h&p1=branches/ros-csrss/include/reactos/subsys/csrss/client.h&r1=57588&r2=57591&rev=57591&view=diff Copied: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h (from r57570, branches/ros-csrss/include/reactos/subsys/csrss/msg.h) URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h?p2=branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h&p1=branches/ros-csrss/include/reactos/subsys/csrss/msg.h&r1=57570&r2=57591&rev=57591&view=diff Copied: branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h (from r57588, branches/ros-csrss/include/reactos/subsys/csrss/server.h) URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h?p2=branches/ros-csrss/include/r
[ros-diffs] [hbelusca] 57596: [BASESRV] - Remove an unneeded cmake comment. [CSRSRV] - Compile the resource file.
Author: hbelusca
Date: Mon Oct 22 23:37:07 2012
New Revision: 57596
URL: http://svn.reactos.org/svn/reactos?rev=57596&view=rev
Log:
[BASESRV]
- Remove an unneeded cmake comment.
[CSRSRV]
- Compile the resource file.
Modified:
branches/ros-csrss/subsystems/win/basesrv/CMakeLists.txt
branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt
Modified: branches/ros-csrss/subsystems/win/basesrv/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesrv/CMakeLists.txt?rev=57596&r1=57595&r2=57596&view=diff
==
--- branches/ros-csrss/subsystems/win/basesrv/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/ros-csrss/subsystems/win/basesrv/CMakeLists.txt [iso-8859-1] Mon
Oct 22 23:37:07 2012
@@ -17,7 +17,5 @@
add_importlibs(basesrv ntdll csrsrv)
-#add_pch(basesrv w32csr.h)
-
add_dependencies(basesrv bugcodes)
add_cd_file(TARGET basesrv DESTINATION reactos/system32 FOR all)
Modified: branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt?rev=57596&r1=57595&r2=57596&view=diff
==
--- branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt [iso-8859-1] Mon
Oct 22 23:37:07 2012
@@ -13,6 +13,7 @@
thredsup.c
user.c
wait.c
+csrsrv.rc
${CMAKE_CURRENT_BINARY_DIR}/csrsrv.def)
add_library(csrsrv SHARED ${SOURCE})
[ros-diffs] [hbelusca] 57597: [CONSRV/WIN32CSR] - Move all the console subsystem from win32csr to a new server dll called consrv.dll (instead of putting it directly to winsrv.dll). It's because I want
Author: hbelusca Date: Mon Oct 22 23:55:51 2012 New Revision: 57597 URL: http://svn.reactos.org/svn/reactos?rev=57597&view=rev Log: [CONSRV/WIN32CSR] - Move all the console subsystem from win32csr to a new server dll called consrv.dll (instead of putting it directly to winsrv.dll). It's because I want to rework on this later on. Many things must be done in order to achieve the moving (renaming functions, etc...). Tables & symbol names come from http://j00ru.vexillium.org/csrss_list/api_list.html as usual, but here I took the Win 2k3 ones and I added few Win 7 functions which already existed in our codebase. The other table names are guessed based on what originally existed in csrsrv and so on. Many stubs are also missing. Cultural remark: consrv.dll originally existed in Beta releases of Windows NT 3.1 (e.g. the October 1991 one), but was soon merged with winsrv.dll and thus, in subsequent versions of Windows, the console subsystem is also found in winsrv.dll. See http://www.logotypes.se/NT310CSRSS.txt and http://j00ru.vexillium.org/?p=349#comment-1883. One has to wait until Windows 7 to see it moving again to conhost.exe. [CSRSRV] - Add an explanation comment on what the ValidTable member in the CSR_SERVER_DLL structure is for. Added: branches/ros-csrss/win32ss/user/consrv/ (with props) branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt (with props) branches/ros-csrss/win32ss/user/consrv/alias.c - copied, changed from r57593, branches/ros-csrss/win32ss/user/win32csr/alias.c branches/ros-csrss/win32ss/user/consrv/coninput.c (contents, props changed) - copied, changed from r57593, branches/ros-csrss/win32ss/user/win32csr/coninput.c branches/ros-csrss/win32ss/user/consrv/conio.h (contents, props changed) - copied, changed from r57593, branches/ros-csrss/win32ss/user/win32csr/conio.h branches/ros-csrss/win32ss/user/consrv/conoutput.c (contents, props changed) - copied, changed from r57593, branches/ros-csrss/win32ss/user/win32csr/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c (contents, props changed) - copied, changed from r57593, branches/ros-csrss/win32ss/user/win32csr/console.c branches/ros-csrss/win32ss/user/consrv/consrv.h (with props) branches/ros-csrss/win32ss/user/consrv/consrv.rc (with props) branches/ros-csrss/win32ss/user/consrv/consrv.spec (with props) branches/ros-csrss/win32ss/user/consrv/guiconsole.c (contents, props changed) - copied, changed from r57593, branches/ros-csrss/win32ss/user/win32csr/guiconsole.c branches/ros-csrss/win32ss/user/consrv/guiconsole.h (contents, props changed) - copied, changed from r57593, branches/ros-csrss/win32ss/user/win32csr/guiconsole.h branches/ros-csrss/win32ss/user/consrv/handle.c (contents, props changed) - copied, changed from r57593, branches/ros-csrss/win32ss/user/win32csr/handle.c branches/ros-csrss/win32ss/user/consrv/init.c (with props) branches/ros-csrss/win32ss/user/consrv/lang/ - copied from r57593, branches/ros-csrss/win32ss/user/win32csr/lang/ branches/ros-csrss/win32ss/user/consrv/lineinput.c - copied, changed from r57593, branches/ros-csrss/win32ss/user/win32csr/lineinput.c branches/ros-csrss/win32ss/user/consrv/res/ - copied from r57593, branches/ros-csrss/win32ss/user/win32csr/res/ branches/ros-csrss/win32ss/user/consrv/rsrc.rc (with props) branches/ros-csrss/win32ss/user/consrv/server.c (with props) branches/ros-csrss/win32ss/user/consrv/tuiconsole.c (contents, props changed) - copied, changed from r57593, branches/ros-csrss/win32ss/user/win32csr/tuiconsole.c branches/ros-csrss/win32ss/user/consrv/tuiconsole.h (contents, props changed) - copied, changed from r57593, branches/ros-csrss/win32ss/user/win32csr/tuiconsole.h Removed: branches/ros-csrss/win32ss/user/win32csr/alias.c branches/ros-csrss/win32ss/user/win32csr/coninput.c branches/ros-csrss/win32ss/user/win32csr/conio.h branches/ros-csrss/win32ss/user/win32csr/conoutput.c branches/ros-csrss/win32ss/user/win32csr/console.c branches/ros-csrss/win32ss/user/win32csr/guiconsole.c branches/ros-csrss/win32ss/user/win32csr/guiconsole.h branches/ros-csrss/win32ss/user/win32csr/handle.c branches/ros-csrss/win32ss/user/win32csr/lineinput.c branches/ros-csrss/win32ss/user/win32csr/res/ branches/ros-csrss/win32ss/user/win32csr/tuiconsole.c branches/ros-csrss/win32ss/user/win32csr/tuiconsole.h Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h branches/ros-csrss/include/reactos/subsys/win/conmsg.h branches/ros-csrss/win32ss/user/consrv/lang/bg-BG.rc branches/ros-csrss/win32ss/user/consrv/lang/cs-CZ.rc branches/ros-csrss/win32ss/user/consrv/lang/de-DE.rc branches/ros-csrss/win32ss/user/consrv/lang/el-GR.rc
[ros-diffs] [hbelusca] 57600: Synchronize with trunk's revision r57599.
Author: hbelusca Date: Tue Oct 23 19:54:03 2012 New Revision: 57600 URL: http://svn.reactos.org/svn/reactos?rev=57600&view=rev Log: Synchronize with trunk's revision r57599. Added: branches/ros-csrss/dll/win32/lsasrv/lookup.c - copied unchanged from r57599, trunk/reactos/dll/win32/lsasrv/lookup.c Removed: branches/ros-csrss/dll/win32/lsasrv/sids.c Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/boot/bootdata/hivesys_amd64.inf branches/ros-csrss/boot/bootdata/hivesys_arm.inf branches/ros-csrss/boot/bootdata/hivesys_i386.inf branches/ros-csrss/dll/win32/lsasrv/CMakeLists.txt branches/ros-csrss/dll/win32/lsasrv/lsasrv.h branches/ros-csrss/dll/win32/samlib/samlib.c branches/ros-csrss/dll/win32/samlib/samlib.spec branches/ros-csrss/dll/win32/shell32/iconcache.cpp branches/ros-csrss/drivers/hid/hidparse/ (props changed) branches/ros-csrss/drivers/hid/hidparse/hidparse.c branches/ros-csrss/drivers/hid/mouhid/mouhid.c branches/ros-csrss/drivers/hid/mouhid/mouhid.h branches/ros-csrss/drivers/usb/usbd/usbd.c branches/ros-csrss/drivers/usb/usbhub/ (props changed) branches/ros-csrss/drivers/usb/usbhub/fdo.c branches/ros-csrss/drivers/usb/usbhub/pdo.c branches/ros-csrss/drivers/usb/usbhub/usbhub.h branches/ros-csrss/drivers/usb/usbstor/fdo.c branches/ros-csrss/drivers/usb/usbstor/pdo.c branches/ros-csrss/drivers/usb/usbstor/usbstor.h branches/ros-csrss/include/ddk/ntsam.h branches/ros-csrss/include/reactos/idl/sam.idl branches/ros-csrss/include/reactos/wine/unicode.h branches/ros-csrss/lib/drivers/hidparser/api.c branches/ros-csrss/lib/drivers/hidparser/hidparser.c branches/ros-csrss/lib/drivers/hidparser/hidparser.h branches/ros-csrss/lib/drivers/hidparser/parser.h branches/ros-csrss/ntoskrnl/include/internal/po.h branches/ros-csrss/ntoskrnl/io/iomgr/device.c branches/ros-csrss/ntoskrnl/po/povolume.c branches/ros-csrss/tools/widl/header.c branches/ros-csrss/win32ss/gdi/eng/engbrush.c branches/ros-csrss/win32ss/gdi/eng/xlateobj.c branches/ros-csrss/win32ss/gdi/ntgdi/bitblt.c branches/ros-csrss/win32ss/gdi/ntgdi/brush.h branches/ros-csrss/win32ss/gdi/ntgdi/dclife.c branches/ros-csrss/win32ss/gdi/ntgdi/dcobjs.c branches/ros-csrss/win32ss/user/ntuser/cursoricon.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesys_amd64.inf?rev=57600&r1=57599&r2=57600&view=diff Modified: branches/ros-csrss/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesys_arm.inf?rev=57600&r1=57599&r2=57600&view=diff Modified: branches/ros-csrss/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesys_i386.inf?rev=57600&r1=57599&r2=57600&view=diff Modified: branches/ros-csrss/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/CMakeLists.txt?rev=57600&r1=57599&r2=57600&view=diff Modified: branches/ros-csrss/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/lsasrv.h?rev=57600&r1=57599&r2=57600&view=diff Removed: branches/ros-csrss/dll/win32/lsasrv/sids.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/sids.c?rev=57599&view=auto Modified: branches/ros-csrss/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samlib/samlib.c?rev=57600&r1=57599&r2=57600&view=diff Modified: branches/ros-csrss/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samlib/samlib.spec?rev=57600&r1=57599&r2=57600&view=diff Modified: branches/ros-csrss/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/iconcache.cpp?rev=57600&r1=57599&r2=57600&view=diff Modified: branches/ros-csrss/drivers/hid/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/hid/hidparse/hidparse.c?rev=57600&r1=57599&r2=57600&view=diff Modified: branches/ros-csrss/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/hid/mouhid/mouhid.c?rev=57600&r1=57599&r2=57600&view=diff Modified: branches/ros-csrss/drivers/hid/mouhid/mouhid.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/hid/mouhid/mouhid.h?rev=57600&r1=57599&r2=57600&view=diff Modified: branches/ros-csrss/drivers/usb/usbd/usbd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbd/usbd.c?rev=57600&r1=57599&r2=57600&vi
[ros-diffs] [hbelusca] 57602: [CONSRV] - Add consrv to compilation. It compiles now \o/ - Convert the used console-csrss structures to the new ones. [CSR] - Continue to move some structures, and tempo
Author: hbelusca Date: Tue Oct 23 22:31:36 2012 New Revision: 57602 URL: http://svn.reactos.org/svn/reactos?rev=57602&view=rev Log: [CONSRV] - Add consrv to compilation. It compiles now \o/ - Convert the used console-csrss structures to the new ones. [CSR] - Continue to move some structures, and temporary activate a symbol. [WIN32CSR] - Clean a header. Added: branches/ros-csrss/win32ss/user/consrv/resource.h - copied unchanged from r57599, branches/ros-csrss/win32ss/user/win32csr/resource.h Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h branches/ros-csrss/include/reactos/subsys/win/conmsg.h branches/ros-csrss/subsystems/win32/csrsrv/srv.h branches/ros-csrss/win32ss/CMakeLists.txt branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt branches/ros-csrss/win32ss/user/consrv/alias.c branches/ros-csrss/win32ss/user/consrv/coninput.c branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/consrv.h branches/ros-csrss/win32ss/user/consrv/guiconsole.c branches/ros-csrss/win32ss/user/consrv/guiconsole.h branches/ros-csrss/win32ss/user/consrv/handle.c branches/ros-csrss/win32ss/user/consrv/init.c branches/ros-csrss/win32ss/user/consrv/lineinput.c branches/ros-csrss/win32ss/user/consrv/tuiconsole.c branches/ros-csrss/win32ss/user/consrv/tuiconsole.h branches/ros-csrss/win32ss/user/win32csr/win32csr.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h?rev=57602&r1=57601&r2=57602&view=diff Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/win/conmsg.h?rev=57602&r1=57601&r2=57602&view=diff Modified: branches/ros-csrss/subsystems/win32/csrsrv/srv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/srv.h?rev=57602&r1=57601&r2=57602&view=diff Modified: branches/ros-csrss/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/CMakeLists.txt?rev=57602&r1=57601&r2=57602&view=diff Modified: branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt?rev=57602&r1=57601&r2=57602&view=diff Modified: branches/ros-csrss/win32ss/user/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/alias.c?rev=57602&r1=57601&r2=57602&view=diff Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/coninput.c?rev=57602&r1=57601&r2=57602&view=diff Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/conio.h?rev=57602&r1=57601&r2=57602&view=diff Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/conoutput.c?rev=57602&r1=57601&r2=57602&view=diff Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/console.c?rev=57602&r1=57601&r2=57602&view=diff Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/consrv.h?rev=57602&r1=57601&r2=57602&view=diff Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/guiconsole.c?rev=57602&r1=57601&r2=57602&view=diff Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/guiconsole.h?rev=57602&r1=57601&r2=57602&view=diff Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/handle.c?rev=57602&r1=57601&r2=57602&view=diff Modified: branches/ros-csrss/win32ss/user/consrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/init.c?rev=57602&r1=57601&r2=57602&view=diff Modified: branches/ros-csrss/win32ss/user/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/lineinput.c?rev=57602&r1=57601&r2=57602&view=diff Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/cons
[ros-diffs] [hbelusca] 57605: [CSRSRV/BASESRV/CONSRV/WIN32CSR/WINSRV] - Fix resource files strings, headers, delete unuseful files... Nothing interesting. - Add winsrv to build.
Author: hbelusca Date: Wed Oct 24 21:37:22 2012 New Revision: 57605 URL: http://svn.reactos.org/svn/reactos?rev=57605&view=rev Log: [CSRSRV/BASESRV/CONSRV/WIN32CSR/WINSRV] - Fix resource files strings, headers, delete unuseful files... Nothing interesting. - Add winsrv to build. Removed: branches/ros-csrss/win32ss/user/winsrv/dllmain.c branches/ros-csrss/win32ss/user/winsrv/winsrv.def Modified: branches/ros-csrss/subsystems/win/basesrv/basesrv.rc branches/ros-csrss/subsystems/win32/csrsrv/csrsrv.rc branches/ros-csrss/win32ss/CMakeLists.txt branches/ros-csrss/win32ss/user/consrv/init.c branches/ros-csrss/win32ss/user/win32csr/desktopbg.c branches/ros-csrss/win32ss/user/win32csr/desktopbg.h branches/ros-csrss/win32ss/user/win32csr/dllmain.c branches/ros-csrss/win32ss/user/win32csr/exitros.c branches/ros-csrss/win32ss/user/win32csr/harderror.c branches/ros-csrss/win32ss/user/win32csr/lang/bg-BG.rc branches/ros-csrss/win32ss/user/win32csr/lang/cs-CZ.rc branches/ros-csrss/win32ss/user/win32csr/lang/de-DE.rc branches/ros-csrss/win32ss/user/win32csr/lang/el-GR.rc branches/ros-csrss/win32ss/user/win32csr/lang/en-US.rc branches/ros-csrss/win32ss/user/win32csr/lang/es-ES.rc branches/ros-csrss/win32ss/user/win32csr/lang/fr-FR.rc branches/ros-csrss/win32ss/user/win32csr/lang/id-ID.rc branches/ros-csrss/win32ss/user/win32csr/lang/it-IT.rc branches/ros-csrss/win32ss/user/win32csr/lang/ja-JP.rc branches/ros-csrss/win32ss/user/win32csr/lang/no-NO.rc branches/ros-csrss/win32ss/user/win32csr/lang/pl-PL.rc branches/ros-csrss/win32ss/user/win32csr/lang/pt-BR.rc branches/ros-csrss/win32ss/user/win32csr/lang/ro-RO.rc branches/ros-csrss/win32ss/user/win32csr/lang/ru-RU.rc branches/ros-csrss/win32ss/user/win32csr/lang/sk-SK.rc branches/ros-csrss/win32ss/user/win32csr/lang/sv-SE.rc branches/ros-csrss/win32ss/user/win32csr/lang/tr-TR.rc branches/ros-csrss/win32ss/user/win32csr/lang/uk-UA.rc branches/ros-csrss/win32ss/user/win32csr/lang/zh-CN.rc branches/ros-csrss/win32ss/user/win32csr/lang/zh-TW.rc branches/ros-csrss/win32ss/user/win32csr/rsrc.rc branches/ros-csrss/win32ss/user/win32csr/w32csr.h branches/ros-csrss/win32ss/user/win32csr/win32csr.h branches/ros-csrss/win32ss/user/winsrv/winsrv.rc Modified: branches/ros-csrss/subsystems/win/basesrv/basesrv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesrv/basesrv.rc?rev=57605&r1=57604&r2=57605&view=diff == --- branches/ros-csrss/subsystems/win/basesrv/basesrv.rc [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win/basesrv/basesrv.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS BASE API Server DLL\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Base API Server DLL\0" #define REACTOS_STR_INTERNAL_NAME "basesrv\0" #define REACTOS_STR_ORIGINAL_FILENAME "basesrv.dll\0" #include Modified: branches/ros-csrss/subsystems/win32/csrsrv/csrsrv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/csrsrv.rc?rev=57605&r1=57604&r2=57605&view=diff == --- branches/ros-csrss/subsystems/win32/csrsrv/csrsrv.rc [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/csrsrv.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "Client/Server Runtime SubSystem Process\0" +#define REACTOS_STR_FILE_DESCRIPTION "Client/Server Runtime SubSystem Server DLL\0" #define REACTOS_STR_INTERNAL_NAME "csrsrv\0" #define REACTOS_STR_ORIGINAL_FILENAME "csrsrv.dll\0" #include Modified: branches/ros-csrss/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/CMakeLists.txt?rev=57605&r1=57604&r2=57605&view=diff == --- branches/ros-csrss/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/CMakeLists.txt [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -15,6 +15,7 @@ add_subdirectory(user/consrv) add_subdirectory(user/user32) add_subdirectory(user/win32csr) +add_subdirectory(user/winsrv) spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) Modified: branches/ros-csrss/win32ss/user/consrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/init.c?rev=57605&r1=57604&r2=57605&view=diff == --- branches/ros-csrss/win32ss/user/consrv/init.c [iso-8859-1] (original) +
[ros-diffs] [hbelusca] 57610: [CSRSRV/WINSRV] - Move the last User CSR api which was in csrsrv instead of in winsrv. - Remove unneeded file.
Author: hbelusca
Date: Wed Oct 24 22:07:46 2012
New Revision: 57610
URL: http://svn.reactos.org/svn/reactos?rev=57610&view=rev
Log:
[CSRSRV/WINSRV]
- Move the last User CSR api which was in csrsrv instead of in winsrv.
- Remove unneeded file.
Removed:
branches/ros-csrss/subsystems/win32/csrsrv/user.c
Modified:
branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt
branches/ros-csrss/subsystems/win32/csrsrv/include/api.h
branches/ros-csrss/subsystems/win32/csrsrv/init.c
branches/ros-csrss/win32ss/user/winsrv/server.c
branches/ros-csrss/win32ss/user/winsrv/winsrv.h
Modified: branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt?rev=57610&r1=57609&r2=57610&view=diff
==
--- branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt [iso-8859-1] Wed
Oct 24 22:07:46 2012
@@ -11,7 +11,6 @@
server.c
session.c
thredsup.c
-user.c
wait.c
csrsrv.rc
${CMAKE_CURRENT_BINARY_DIR}/csrsrv.def)
Modified: branches/ros-csrss/subsystems/win32/csrsrv/include/api.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/include/api.h?rev=57610&r1=57609&r2=57610&view=diff
==
--- branches/ros-csrss/subsystems/win32/csrsrv/include/api.h [iso-8859-1]
(original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/include/api.h [iso-8859-1] Wed
Oct 24 22:07:46 2012
@@ -104,7 +104,6 @@
CSR_API(CsrSrvUnusedFunction);
CSR_API(CsrSrvIdentifyAlertableThread);
CSR_API(CsrSrvSetPriorityClass);
-CSR_API(SrvRegisterServicesProcess);
/***
@@ -156,7 +155,10 @@
IN PCSR_PROCESS CsrProcess);
+#if 0
NTSTATUS FASTCALL CsrApiRegisterDefinitions(PCSRSS_API_DEFINITION
NewDefinitions);
+#endif
+
VOID FASTCALL CsrApiCallHandler(IN OUT PCSR_API_MESSAGE ApiMessage, OUT PULONG
Reply);
NTSTATUS
Modified: branches/ros-csrss/subsystems/win32/csrsrv/init.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/init.c?rev=57610&r1=57609&r2=57610&view=diff
==
--- branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] (original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] Wed Oct 24
22:07:46 2012
@@ -61,11 +61,6 @@
}
}
-CSRSS_API_DEFINITION NativeDefinitions[] =
-{
-CSRSS_DEFINE_API(REGISTER_SERVICES_PROCESS, SrvRegisterServicesProcess),
// winsrv.dll
-};
-
/* === INIT ROUTINES === */
/*++
@@ -994,14 +989,6 @@
return Status;
}
-#if 0
-Status = CsrApiRegisterDefinitions(NativeDefinitions);
-if (!NT_SUCCESS(Status))
-{
-DPRINT1("CSRSRV failed in %s with status %lx\n",
"CsrApiRegisterDefinitions", Status);
-}
-#endif
-
/* Now initialize our API Port */
Status = CsrApiPortInitialize();
if (!NT_SUCCESS(Status))
Removed: branches/ros-csrss/subsystems/win32/csrsrv/user.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/user.c?rev=57609&view=auto
==
--- branches/ros-csrss/subsystems/win32/csrsrv/user.c [iso-8859-1] (original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/user.c (removed)
@@ -1,41 +1,0 @@
-/*
- * subsystems/win32/csrss/csrsrv/api/user.c
- *
- * User functions
- *
- * ReactOS Operating System
- *
- * PROGRAMMER: Eric Kohl
- */
-
-/* INCLUDES **/
-
-#include
-
-#define NDEBUG
-#include
-
-/* GLOBALS ***/
-
-static BOOLEAN ServicesProcessIdValid = FALSE;
-static ULONG_PTR ServicesProcessId;
-
-
-/* FUNCTIONS */
-
-CSR_API(SrvRegisterServicesProcess)
-{
-if (ServicesProcessIdValid == TRUE)
-{
-/* Only accept a single call */
-return STATUS_INVALID_PARAMETER;
-}
-else
-{
-ServicesProcessId =
(ULONG_PTR)ApiMessage->Data.RegisterServicesProcessRequest.ProcessId;
-ServicesProcessIdValid = TRUE;
-return STATUS_SUCCESS;
-}
-}
-
-/* EOF */
Modified: branches/ros-csrss/win32ss/user/winsrv/server.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/server.c?rev=57610&r1=57609&r2=57610&view=diff
==
--- branches/ros-csrss/win32ss/user/winsrv/server.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/winsrv/server.c [iso-8859-1] Wed Oct 24
22:07:
[ros-diffs] [hbelusca] 57612: [BOOTDATA] - Add winsrv and consrv to the Win32 subsystem command line. Keep win32csr but move it to another Server ID (till it disappears).
Author: hbelusca Date: Wed Oct 24 23:35:35 2012 New Revision: 57612 URL: http://svn.reactos.org/svn/reactos?rev=57612&view=rev Log: [BOOTDATA] - Add winsrv and consrv to the Win32 subsystem command line. Keep win32csr but move it to another Server ID (till it disappears). Modified: branches/ros-csrss/boot/bootdata/hivesys_amd64.inf branches/ros-csrss/boot/bootdata/hivesys_arm.inf branches/ros-csrss/boot/bootdata/hivesys_i386.inf Modified: branches/ros-csrss/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesys_amd64.inf?rev=57612&r1=57611&r2=57612&view=diff == --- branches/ros-csrss/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Wed Oct 24 23:35:35 2012 @@ -1239,7 +1239,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x0001,"Posix" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x0002,"%SystemRoot%\system32\psxss.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x0001,"Debug","Windows" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x0002,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=win32csr:Win32CsrInitialization,2 ProfileControl=Off MaxRequestThreads=16" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x0002,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=winsrv:UserServerDllInitialization,3 ServerDll=consrv:ConServerDllInitialization,2 ServerDll=win32csr:Win32CsrInitialization,4 ProfileControl=Off MaxRequestThreads=16" ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x,"" Modified: branches/ros-csrss/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesys_arm.inf?rev=57612&r1=57611&r2=57612&view=diff == --- branches/ros-csrss/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivesys_arm.inf [iso-8859-1] Wed Oct 24 23:35:35 2012 @@ -794,7 +794,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x0001,"Posix" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x0002,"%SystemRoot%\system32\psxss.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x0001,"Debug","Windows" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x0002,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=win32csr:Win32CsrInitialization,2 ProfileControl=Off MaxRequestThreads=16" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x0002,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=winsrv:UserServerDllInitialization,3 ServerDll=consrv:ConServerDllInitialization,2 ServerDll=win32csr:Win32CsrInitialization,4 ProfileControl=Off MaxRequestThreads=16" ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x,"" Modified: branches/ros-csrss/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesys_i386.inf?rev=57612&r1=57611&r2=57612&view=diff == --- branches/ros-csrss/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivesys_i386.inf [iso-8859-1] Wed Oct 24 23:35:35 2012 @@ -1239,7 +1239,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x0001,"Posix" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x0002,"%SystemRoot%\system32\psxss.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x0001,"Debug","Windows" -HKLM,"SYSTEM\CurrentCont
[ros-diffs] [hbelusca] 57619: [CSR/CONSRV/WINSRV] - Move some structures to better place, fix code.
Author: hbelusca
Date: Thu Oct 25 21:37:52 2012
New Revision: 57619
URL: http://svn.reactos.org/svn/reactos?rev=57619&view=rev
Log:
[CSR/CONSRV/WINSRV]
- Move some structures to better place, fix code.
Modified:
branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h
branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h
branches/ros-csrss/include/reactos/subsys/csr/csrss.h
branches/ros-csrss/include/reactos/subsys/win/base.h
branches/ros-csrss/include/reactos/subsys/win/conmsg.h
branches/ros-csrss/include/reactos/subsys/win/winmsg.h
branches/ros-csrss/win32ss/user/consrv/console.c
branches/ros-csrss/win32ss/user/winsrv/harderror.c
branches/ros-csrss/win32ss/user/winsrv/init.c
branches/ros-csrss/win32ss/user/winsrv/shutdown.c
branches/ros-csrss/win32ss/user/winsrv/winsrv.h
Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h?rev=57619&r1=57618&r2=57619&view=diff
==
--- branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1]
(original)
+++ branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] Thu Oct
25 21:37:52 2012
@@ -75,6 +75,12 @@
ULONG PriorityClass;
} CSR_SET_PRIORITY_CLASS, *PCSR_SET_PRIORITY_CLASS;
+typedef struct
+{
+HANDLE UniqueThread;
+CLIENT_ID Cid;
+} CSRSS_IDENTIFY_ALERTABLE_THREAD, *PCSRSS_IDENTIFY_ALERTABLE_THREAD;
+
typedef struct _CSR_CLIENT_CONNECT
{
ULONG ServerId;
@@ -118,19 +124,13 @@
// ULONG_PTR ApiMessageData[39]; what to do
-/*** Temporary ***/
+/*** win32csr thingies to remove. ***/
#if 1
-CSRSS_REGISTER_SERVICES_PROCESS RegisterServicesProcessRequest;
-CSRSS_EXIT_REACTOS ExitReactosRequest;
-
CSRSS_CREATE_DESKTOP CreateDesktopRequest;
CSRSS_SHOW_DESKTOP ShowDesktopRequest;
CSRSS_HIDE_DESKTOP HideDesktopRequest;
-CSRSS_SET_LOGON_NOTIFY_WINDOW SetLogonNotifyWindowRequest;
-CSRSS_REGISTER_LOGON_PROCESS RegisterLogonProcessRequest;
-CSRSS_GET_PROCESS_LIST GetProcessListRequest;
#endif
-/*/
+//
} Data;
};
};
Modified: branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h?rev=57619&r1=57618&r2=57619&view=diff
==
--- branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1]
(original)
+++ branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Thu Oct
25 21:37:52 2012
@@ -31,6 +31,7 @@
} CSR_NT_SESSION, *PCSR_NT_SESSION;
/*** old thingie, remove it later... (put it in winsrv -- console) ***/
+#include
typedef struct _CSRSS_CON_PROCESS_DATA
{
HANDLE ConsoleEvent;
Modified: branches/ros-csrss/include/reactos/subsys/csr/csrss.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/csr/csrss.h?rev=57619&r1=57618&r2=57619&view=diff
==
--- branches/ros-csrss/include/reactos/subsys/csr/csrss.h [iso-8859-1]
(original)
+++ branches/ros-csrss/include/reactos/subsys/csr/csrss.h [iso-8859-1] Thu Oct
25 21:37:52 2012
@@ -3,58 +3,12 @@
#ifndef __INCLUDE_CSRSS_CSRSS_H
#define __INCLUDE_CSRSS_CSRSS_H
-#define CSR_NATIVE 0x // CSRSRV
-#define CSR_CONSOLE0x0001 // WIN32CSR
-#define CSR_GUI0x0002 // WINSRV
-#define CONSOLE_INPUT_MODE_VALID (0x0f)
-#define CONSOLE_OUTPUT_MODE_VALID (0x03)
+// Used in ntdll/csr/connect.c
+#define CSR_CSRSS_SECTION_SIZE(65536)
-#define CSR_CSRSS_SECTION_SIZE(65536)
-
-typedef VOID (CALLBACK *PCONTROLDISPATCHER)(DWORD);
-
-typedef struct
-{
-USHORT nMaxIds;
-PDWORD ProcessId;
-ULONG nProcessIdsTotal;
-} CSRSS_GET_PROCESS_LIST, *PCSRSS_GET_PROCESS_LIST;
-
-typedef struct
-{
-HANDLE UniqueThread;
-CLIENT_ID Cid;
-} CSRSS_IDENTIFY_ALERTABLE_THREAD, *PCSRSS_IDENTIFY_ALERTABLE_THREAD;
-
-typedef struct
-{
-HANDLE ProcessId;
-} CSRSS_REGISTER_SERVICES_PROCESS, *PCSRSS_REGISTER_SERVICES_PROCESS;
-
-typedef struct
-{
-UINT Flags;
-DWORD Reserved;
-} CSRSS_EXIT_REACTOS, *PCSRSS_EXIT_REACTOS;
-
-typedef struct
-{
-HANDLE Handle;
-} CSRSS_CLOSE_HANDLE, *PCSRSS_CLOSE_HANDLE;
-
-typedef struct
-{
-HANDLE Handle;
-} CSRSS_VERIFY_HANDLE, *PCSRSS_VERIFY_HANDLE;
-
-typedef struct
-{
-HANDLE Handle;
-DWORD Access;
-BOOL Inheritable;
-DWORD Options;
-} CSRSS_DUPLICATE_HANDLE, *PCSRSS_DUPLICATE_HANDLE;
+/*** win32csr thingies to remove. ***/
+#if 1
typedef struct
{
@@
[ros-diffs] [hbelusca] 57620: [CONSRV/WINSRV] - Fix structures usage and headers inclusions. - Make winsrv compile. - Deactivate some code related to processes enumeration (for testing purposes).
Author: hbelusca
Date: Thu Oct 25 22:14:46 2012
New Revision: 57620
URL: http://svn.reactos.org/svn/reactos?rev=57620&view=rev
Log:
[CONSRV/WINSRV]
- Fix structures usage and headers inclusions.
- Make winsrv compile.
- Deactivate some code related to processes enumeration (for testing purposes).
Modified:
branches/ros-csrss/subsystems/win32/csrsrv/procsup.c
branches/ros-csrss/win32ss/user/consrv/consrv.h
branches/ros-csrss/win32ss/user/win32csr/win32csr.h
branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt
branches/ros-csrss/win32ss/user/winsrv/init.c
branches/ros-csrss/win32ss/user/winsrv/server.c
branches/ros-csrss/win32ss/user/winsrv/shutdown.c
branches/ros-csrss/win32ss/user/winsrv/winsrv.h
Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/procsup.c?rev=57620&r1=57619&r2=57620&view=diff
==
--- branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Thu Oct
25 22:14:46 2012
@@ -1365,7 +1365,7 @@
return Status;
}
-/* FIXME: Temporary hack. This is really "CsrShutdownProcess", mostly. Used by
win32csr */
+/* FIXME: Temporary hack. This is really "CsrShutdownProcess", mostly. Used by
winsrv */
#if 0
NTSTATUS
WINAPI
Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/consrv.h?rev=57620&r1=57619&r2=57620&view=diff
==
--- branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] Thu Oct 25
22:14:46 2012
@@ -31,6 +31,7 @@
/* Shared header with console.dll */
#include "console.h"
+
extern HANDLE ConSrvHeap;
// extern HANDLE BaseSrvSharedHeap;
Modified: branches/ros-csrss/win32ss/user/win32csr/win32csr.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/win32csr.h?rev=57620&r1=57619&r2=57620&view=diff
==
--- branches/ros-csrss/win32ss/user/win32csr/win32csr.h [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/win32csr/win32csr.h [iso-8859-1] Thu Oct 25
22:14:46 2012
@@ -13,7 +13,6 @@
#include
#define NTOS_MODE_USER
#include
-#include
/* External Winlogon Header */
#include
Modified: branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt?rev=57620&r1=57619&r2=57620&view=diff
==
--- branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] Thu Oct
25 22:14:46 2012
@@ -15,7 +15,7 @@
add_library(winsrv SHARED ${SOURCE})
-# target_link_libraries(winsrv win32ksys ${PSEH_LIB}) # win32ksys because of
NtUser...()
+target_link_libraries(winsrv win32ksys ${PSEH_LIB}) # win32ksys because of
NtUser...()
set_module_type(winsrv win32dll)
Modified: branches/ros-csrss/win32ss/user/winsrv/init.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/init.c?rev=57620&r1=57619&r2=57620&view=diff
==
--- branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] Thu Oct 25
22:14:46 2012
@@ -8,6 +8,10 @@
*/
#include "winsrv.h"
+
+/* Public Win32K Headers */
+// For calling NtUser...()
+#include
#define NDEBUG
#include
Modified: branches/ros-csrss/win32ss/user/winsrv/server.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/server.c?rev=57620&r1=57619&r2=57620&view=diff
==
--- branches/ros-csrss/win32ss/user/winsrv/server.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/winsrv/server.c [iso-8859-1] Thu Oct 25
22:14:46 2012
@@ -25,6 +25,8 @@
CSR_API(SrvRegisterServicesProcess)
{
+PCSRSS_REGISTER_SERVICES_PROCESS RegisterServicesProcessRequest =
&((PUSER_API_MESSAGE)ApiMessage)->Data.RegisterServicesProcessRequest;
+
if (ServicesProcessIdValid == TRUE)
{
/* Only accept a single call */
@@ -32,7 +34,7 @@
}
else
{
-ServicesProcessId =
(ULONG_PTR)ApiMessage->Data.RegisterServicesProcessRequest.ProcessId;
+ServicesProcessId =
(ULONG_PTR)RegisterServicesProcessRequest->ProcessId;
Servi
[ros-diffs] [hbelusca] 57622: [CSRSRV] Code formatting only.
Author: hbelusca
Date: Sat Oct 27 14:30:32 2012
New Revision: 57622
URL: http://svn.reactos.org/svn/reactos?rev=57622&view=rev
Log:
[CSRSRV]
Code formatting only.
Modified:
branches/ros-csrss/subsystems/win32/csrsrv/api.c
branches/ros-csrss/subsystems/win32/csrsrv/server.c
branches/ros-csrss/subsystems/win32/csrsrv/session.c
branches/ros-csrss/subsystems/win32/csrsrv/wait.c
Modified: branches/ros-csrss/subsystems/win32/csrsrv/api.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/api.c?rev=57622&r1=57621&r2=57622&view=diff
==
--- branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] (original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] Sat Oct 27
14:30:32 2012
@@ -7,14 +7,14 @@
* PROGRAMMERS: Alex Ionescu (a...@relsoft.net)
*/
-/* INCLUDES **/
+/* INCLUDES
***/
#include "srv.h"
#define NDEBUG
#include
-/* GLOBALS ***/
+/* GLOBALS
/
static unsigned ApiDefinitionsCount = 0;
static PCSRSS_API_DEFINITION ApiDefinitions = NULL;
@@ -25,7 +25,7 @@
volatile LONG CsrpDynamicThreadTotal;
extern ULONG CsrMaxApiRequestThreads;
-/* FUNCTIONS */
+/* FUNCTIONS
**/
#if 0
NTSTATUS FASTCALL
Modified: branches/ros-csrss/subsystems/win32/csrsrv/server.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/server.c?rev=57622&r1=57621&r2=57622&view=diff
==
--- branches/ros-csrss/subsystems/win32/csrsrv/server.c [iso-8859-1] (original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/server.c [iso-8859-1] Sat Oct 27
14:30:32 2012
@@ -6,14 +6,14 @@
* PROGRAMMERS: Alex Ionescu (a...@relsoft.net)
*/
-/* INCLUDES **/
+/* INCLUDES
***/
#include "srv.h"
#define NDEBUG
#include
-/* DATA **/
+/* DATA
***/
PCSR_API_ROUTINE CsrServerApiDispatchTable[CsrpMaxApiNumber] =
{
@@ -49,7 +49,7 @@
ULONG CsrSrvSharedSectionSize;
HANDLE CsrSrvSharedSection;
-/* PRIVATE FUNCTIONS**/
+/* PRIVATE FUNCTIONS
**/
/*++
* @name CsrServerDllInitialization
@@ -583,7 +583,7 @@
return STATUS_INVALID_PARAMETER;
}
-/* PUBLIC FUNCTIONS***/
+/* PUBLIC FUNCTIONS
***/
/*++
* @name CsrSetCallingSpooler
Modified: branches/ros-csrss/subsystems/win32/csrsrv/session.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/session.c?rev=57622&r1=57621&r2=57622&view=diff
==
--- branches/ros-csrss/subsystems/win32/csrsrv/session.c [iso-8859-1] (original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/session.c [iso-8859-1] Sat Oct
27 14:30:32 2012
@@ -6,14 +6,14 @@
* PROGRAMMERS: Alex Ionescu (a...@relsoft.net)
*/
-/* INCLUDES **/
+/* INCLUDES
***/
#include "srv.h"
#define NDEBUG
#include
-/* DATA **/
+/* DATA
***/
RTL_CRITICAL_SECTION CsrNtSessionLock;
LIST_ENTRY CsrNtSessionList;
@@ -37,7 +37,7 @@
"Unknown Csr Sb Api Number"
};
-/* PRIVATE FUNCTIONS */
+/* PRIVATE FUNCTIONS
**/
/*++
* @name CsrInitializeNtSessionList
@@ -191,7 +191,7 @@
}
}
-/* SESSION MANAGER FUNCTIONS**/
+/* SESSION MANAGER FUNCTIONS
**/
/*++
* @name CsrSbCreateSession
Modified: branches/ros-csrss/subsystems/win32/csrsrv/wait.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/wait.c?rev=57622&r1=57621&r2=57622&view=diff
==
[ros-diffs] [hbelusca] 57625: [NTDLL] - Code formatting. - Fix CSR message length computation. [CSR] - Remove unneeded comments. - Correct arguments names.
Author: hbelusca
Date: Sat Oct 27 19:05:10 2012
New Revision: 57625
URL: http://svn.reactos.org/svn/reactos?rev=57625&view=rev
Log:
[NTDLL]
- Code formatting.
- Fix CSR message length computation.
[CSR]
- Remove unneeded comments.
- Correct arguments names.
Modified:
branches/ros-csrss/dll/ntdll/csr/api.c
branches/ros-csrss/dll/ntdll/csr/capture.c
branches/ros-csrss/dll/ntdll/csr/connect.c
branches/ros-csrss/include/reactos/subsys/csr/csr.h
branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h
Modified: branches/ros-csrss/dll/ntdll/csr/api.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/api.c?rev=57625&r1=57624&r2=57625&view=diff
==
--- branches/ros-csrss/dll/ntdll/csr/api.c [iso-8859-1] (original)
+++ branches/ros-csrss/dll/ntdll/csr/api.c [iso-8859-1] Sat Oct 27 19:05:10 2012
@@ -6,16 +6,16 @@
* PROGRAMMER: Alex Ionescu (a...@relsoft.net)
*/
-/* INCLUDES */
+/* INCLUDES
***/
#include
#define NDEBUG
#include
-/* GLOBALS ***/
+/* GLOBALS
/
extern HANDLE CsrApiPort;
-/* FUNCTIONS */
+/* FUNCTIONS
**/
/*
* @implemented
@@ -78,7 +78,7 @@
Status = CsrClientCallServer(&ApiMessage,
NULL,
CSR_CREATE_API_NUMBER(CSRSRV_SERVERDLL_INDEX,
CsrpIdentifyAlertable),
- sizeof(CSR_SET_PRIORITY_CLASS));
+ sizeof(CSR_IDENTIFY_ALTERTABLE_THREAD));
/* Return to caller */
return Status;
Modified: branches/ros-csrss/dll/ntdll/csr/capture.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/capture.c?rev=57625&r1=57624&r2=57625&view=diff
==
--- branches/ros-csrss/dll/ntdll/csr/capture.c [iso-8859-1] (original)
+++ branches/ros-csrss/dll/ntdll/csr/capture.c [iso-8859-1] Sat Oct 27 19:05:10
2012
@@ -6,16 +6,16 @@
* PROGRAMMER: Alex Ionescu (a...@relsoft.net)
*/
-/* INCLUDES */
+/* INCLUDES
***/
#include
#define NDEBUG
#include
-/* GLOBALS ***/
+/* GLOBALS
/
extern HANDLE CsrPortHeap;
-/* FUNCTIONS */
+/* FUNCTIONS
**/
/*
* @implemented
Modified: branches/ros-csrss/dll/ntdll/csr/connect.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/connect.c?rev=57625&r1=57624&r2=57625&view=diff
==
--- branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] (original)
+++ branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] Sat Oct 27 19:05:10
2012
@@ -6,13 +6,13 @@
* PROGRAMMER: Alex Ionescu (a...@relsoft.net)
*/
-/* INCLUDES */
+/* INCLUDES
***/
#include
#define NDEBUG
#include
-/* GLOBALS ***/
+/* GLOBALS
/
HANDLE CsrApiPort;
HANDLE CsrProcessId;
@@ -28,7 +28,7 @@
#define UNICODE_PATH_SEP L"\\"
-/* FUNCTIONS */
+/* FUNCTIONS
**/
/*
* @implemented
@@ -45,10 +45,10 @@
*/
NTSTATUS
NTAPI
-CsrClientCallServer(PCSR_API_MESSAGE ApiMessage,
-PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL,
-CSR_API_NUMBER ApiNumber,
-ULONG RequestLength)
+CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage,
+IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL,
+IN CSR_API_NUMBER ApiNumber,
+IN ULONG DataLength)
{
NTSTATUS Status;
ULONG PointerCount;
@@ -58,8 +58,11 @@
/* Fill out the Port Message Header */
ApiMessage->Header.u2.ZeroInit = 0;
-ApiMessage->Header.u1.s1.DataLength = RequestLength - sizeof(PORT_MESSAGE);
-ApiMessage->Header.u
[ros-diffs] [hbelusca] 57627: [BASESRV] Remove unneeded comments.
Author: hbelusca
Date: Sat Oct 27 23:18:49 2012
New Revision: 57627
URL: http://svn.reactos.org/svn/reactos?rev=57627&view=rev
Log:
[BASESRV]
Remove unneeded comments.
Modified:
branches/ros-csrss/include/reactos/subsys/win/basemsg.h
Modified: branches/ros-csrss/include/reactos/subsys/win/basemsg.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/win/basemsg.h?rev=57627&r1=57626&r2=57627&view=diff
==
--- branches/ros-csrss/include/reactos/subsys/win/basemsg.h [iso-8859-1]
(original)
+++ branches/ros-csrss/include/reactos/subsys/win/basemsg.h [iso-8859-1] Sat
Oct 27 23:18:49 2012
@@ -191,13 +191,13 @@
{
BASE_CREATE_PROCESS CreateProcessRequest;
BASE_CREATE_THREAD CreateThreadRequest;
-BASE_EXIT_PROCESS ExitProcessRequest; // CSRSS_TERMINATE_PROCESS
TerminateProcessRequest;
+BASE_EXIT_PROCESS ExitProcessRequest;
BASE_GET_TEMP_FILE GetTempFile;
BASE_CHECK_VDM CheckVdm;
BASE_UPDATE_VDM_ENTRY UpdateVdmEntry;
BASE_GET_VDM_EXIT_CODE GetVdmExitCode;
-BASE_SET_PROCESS_SHUTDOWN_PARAMS SetShutdownParametersRequest; //
CSRSS_SET_SHUTDOWN_PARAMETERS
-BASE_GET_PROCESS_SHUTDOWN_PARAMS GetShutdownParametersRequest; //
CSRSS_GET_SHUTDOWN_PARAMETERS
+BASE_SET_PROCESS_SHUTDOWN_PARAMS SetShutdownParametersRequest;
+BASE_GET_PROCESS_SHUTDOWN_PARAMS GetShutdownParametersRequest;
BASE_SOUND_SENTRY SoundSentryRequest;
BASE_DEFINE_DOS_DEVICE DefineDosDeviceRequest;
} Data;
[ros-diffs] [hbelusca] 57628: [WIN32SS/USER32] - Use the new subsystems header winmsg.h - Use the new USER_API_MESSAGE structure, and adapt co_CsrNotify in consequence. - Code formatting. [KERNEL32] -
Author: hbelusca
Date: Sat Oct 27 23:52:28 2012
New Revision: 57628
URL: http://svn.reactos.org/svn/reactos?rev=57628&view=rev
Log:
[WIN32SS/USER32]
- Use the new subsystems header winmsg.h
- Use the new USER_API_MESSAGE structure, and adapt co_CsrNotify in consequence.
- Code formatting.
[KERNEL32]
- Use the new subsystems headers basemsg.h, conmsg.h, winmsg.h, etc...
[NTDLL]
- Code formatting only.
Modified:
branches/ros-csrss/dll/ntdll/csr/connect.c
branches/ros-csrss/dll/win32/kernel32/k32.h
branches/ros-csrss/win32ss/pch.h
branches/ros-csrss/win32ss/user/ntuser/csr.c
branches/ros-csrss/win32ss/user/ntuser/csr.h
branches/ros-csrss/win32ss/user/ntuser/desktop.c
branches/ros-csrss/win32ss/user/ntuser/simplecall.c
branches/ros-csrss/win32ss/user/user32/include/user32.h
branches/ros-csrss/win32ss/user/user32/misc/exit.c
branches/ros-csrss/win32ss/user/user32/misc/misc.c
Modified: branches/ros-csrss/dll/ntdll/csr/connect.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/connect.c?rev=57628&r1=57627&r2=57628&view=diff
==
--- branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] (original)
+++ branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] Sat Oct 27 23:52:28
2012
@@ -60,7 +60,7 @@
ApiMessage->Header.u2.ZeroInit = 0;
ApiMessage->Header.u1.s1.TotalLength =
FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength;
-/* FIELD_OFFSET(CSR_API_MESSAGE, Data) <= sizeof(CSR_API_MESSAGE) -
sizeof(ApiMessage->Data) */
+/* FIELD_OFFSET(CSR_API_MESSAGE, Data) <= sizeof(CSR_API_MESSAGE) -
sizeof(ApiMessage->Data) */
ApiMessage->Header.u1.s1.DataLength =
ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE);
Modified: branches/ros-csrss/dll/win32/kernel32/k32.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/k32.h?rev=57628&r1=57627&r2=57628&view=diff
==
--- branches/ros-csrss/dll/win32/kernel32/k32.h [iso-8859-1] (original)
+++ branches/ros-csrss/dll/win32/kernel32/k32.h [iso-8859-1] Sat Oct 27
23:52:28 2012
@@ -37,6 +37,10 @@
/* CSRSS Header */
#include
+#include
+#include
+#include
+#include
//#include // FIXME: data header.
/* C Headers */
Modified: branches/ros-csrss/win32ss/pch.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/pch.h?rev=57628&r1=57627&r2=57628&view=diff
==
--- branches/ros-csrss/win32ss/pch.h [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/pch.h [iso-8859-1] Sat Oct 27 23:52:28 2012
@@ -71,8 +71,8 @@
#include
/* CSRSS Header */
-#include
-#include // FIXME: data header.
+#include
+#include // FIXME: data header.
/* Public Win32K headers */
#include
Modified: branches/ros-csrss/win32ss/user/ntuser/csr.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/csr.c?rev=57628&r1=57627&r2=57628&view=diff
==
--- branches/ros-csrss/win32ss/user/ntuser/csr.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/ntuser/csr.c [iso-8859-1] Sat Oct 27
23:52:28 2012
@@ -46,46 +46,51 @@
NTSTATUS FASTCALL
-co_CsrNotify(PCSR_API_MESSAGE Request)
+co_CsrNotify(IN OUT PCSR_API_MESSAGE ApiMessage,
+ IN ULONG DataLength)
{
- NTSTATUS Status;
- PEPROCESS OldProcess;
+NTSTATUS Status;
+PEPROCESS OldProcess;
- if (NULL == CsrProcess)
- {
- return STATUS_INVALID_PORT_HANDLE;
- }
+if (NULL == CsrProcess)
+{
+return STATUS_INVALID_PORT_HANDLE;
+}
- Request->Header.u2.ZeroInit = 0;
- Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) -
sizeof(PORT_MESSAGE);
- Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE);
+/* Fill out the Port Message Header */
+ApiMessage->Header.u2.ZeroInit = 0;
+ApiMessage->Header.u1.s1.TotalLength =
+FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength;
+/* FIELD_OFFSET(CSR_API_MESSAGE, Data) <= sizeof(CSR_API_MESSAGE) -
sizeof(ApiMessage->Data) */
+ApiMessage->Header.u1.s1.DataLength =
+ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE);
- /* Switch to the process in which the WindowsApiPort handle is valid */
- OldProcess = PsGetCurrentProcess();
- if (CsrProcess != OldProcess)
- {
- KeAttachProcess(&CsrProcess->Pcb);
- }
+/* Switch to the process in which the WindowsApiPort handle is valid */
+OldProcess = PsGetCurrentProcess();
+if (CsrProcess != OldProcess)
+{
+KeAttachProcess(&CsrProcess->Pcb);
+}
- UserLeaveCo();
+User
[ros-diffs] [hbelusca] 57630: Synchronize with trunk's revision r57629.
Author: hbelusca
Date: Sun Oct 28 10:05:08 2012
New Revision: 57630
URL: http://svn.reactos.org/svn/reactos?rev=57630&view=rev
Log:
Synchronize with trunk's revision r57629.
Added:
branches/ros-csrss/dll/opengl/glu32/
- copied from r57629, trunk/reactos/dll/opengl/glu32/
Removed:
branches/ros-csrss/dll/opengl/mesa/src/glu/
Modified:
branches/ros-csrss/ (props changed)
branches/ros-csrss/boot/freeldr/freeldr/CMakeLists.txt
branches/ros-csrss/configure.sh
branches/ros-csrss/dll/3rdparty/libjpeg/CMakeLists.txt
branches/ros-csrss/dll/3rdparty/libpng/CMakeLists.txt
branches/ros-csrss/dll/3rdparty/libtiff/CMakeLists.txt
branches/ros-csrss/dll/3rdparty/libxslt/CMakeLists.txt
branches/ros-csrss/dll/opengl/CMakeLists.txt
branches/ros-csrss/dll/opengl/mesa/src/CMakeLists.txt
branches/ros-csrss/dll/win32/advapi32/misc/logon.c
branches/ros-csrss/dll/win32/samsrv/database.c
branches/ros-csrss/dll/win32/samsrv/samrpc.c
branches/ros-csrss/dll/win32/samsrv/setup.c
branches/ros-csrss/dll/win32/shell32/iconcache.cpp
branches/ros-csrss/drivers/hid/mouhid/mouhid.c
branches/ros-csrss/drivers/usb/usbhub/ (props changed)
branches/ros-csrss/drivers/usb/usbhub/fdo.c
branches/ros-csrss/drivers/usb/usbhub/usbhub.c
branches/ros-csrss/drivers/usb/usbhub/usbhub.h
branches/ros-csrss/drivers/usb/usbstor/disk.c
branches/ros-csrss/lib/drivers/hidparser/api.c
branches/ros-csrss/ntoskrnl/po/power.c
branches/ros-csrss/win32ss/include/ntuser.h
branches/ros-csrss/win32ss/user/ntuser/main.c
branches/ros-csrss/win32ss/user/ntuser/ntuser.h
branches/ros-csrss/win32ss/user/ntuser/object.c
branches/ros-csrss/win32ss/user/ntuser/object.h
branches/ros-csrss/win32ss/user/ntuser/win32.h
branches/ros-csrss/win32ss/user/ntuser/win32kdebug.h
Propchange: branches/ros-csrss/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 28 10:05:08 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-4,6-55567
/branches/wlan-bringup:54809-54998
-/trunk/reactos:57561-57599
+/trunk/reactos:57561-57629
Modified: branches/ros-csrss/boot/freeldr/freeldr/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/CMakeLists.txt?rev=57630&r1=57629&r2=57630&view=diff
==
--- branches/ros-csrss/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/ros-csrss/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sun Oct
28 10:05:08 2012
@@ -1,7 +1,8 @@
if(SEPARATE_DBG)
# FIXME: http://sourceware.org/bugzilla/show_bug.cgi?id=11822
-set(CMAKE_C_CREATE_SHARED_LIBRARY "
-o ")
+set(CMAKE_LDR_PE_HELPER_CREATE_SHARED_LIBRARY "
-o ")
+set(CMAKE_LDR_PE_HELPER_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard
C Libraries")
endif()
spec2def(freeldr.sys freeldr.spec)
@@ -171,6 +172,10 @@
if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7))
add_library(freeldr_pe SHARED $
${FREELDR_BASE_SOURCE})
add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL
$ ${FREELDR_BASE_SOURCE})
+if(SEPARATE_DBG)
+set_target_properties(freeldr_pe PROPERTIES LINKER_LANGUAGE
LDR_PE_HELPER)
+set_target_properties(freeldr_pe_dbg PROPERTIES LINKER_LANGUAGE
LDR_PE_HELPER)
+endif()
else()
add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE})
add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE})
@@ -231,6 +236,10 @@
if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7))
add_library(setupldr_pe SHARED $
${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL
$ ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
+if(SEPARATE_DBG)
+set_target_properties(setupldr_pe PROPERTIES LINKER_LANGUAGE
LDR_PE_HELPER)
+set_target_properties(setupldr_pe_dbg PROPERTIES LINKER_LANGUAGE
LDR_PE_HELPER)
+endif()
else()
add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}
${SETUPLDR_SOURCE})
Modified: branches/ros-csrss/configure.sh
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/configure.sh?rev=57630&r1=57629&r2=57630&view=diff
==
--- branches/ros-csrss/configure.sh [iso-8859-1] (original)
+++ branches/ros-csrss/configure.sh [iso-8859-1] Sun
[ros-diffs] [hbelusca] 57631: Try to update properties.
Author: hbelusca Date: Sun Oct 28 10:15:26 2012 New Revision: 57631 URL: http://svn.reactos.org/svn/reactos?rev=57631&view=rev Log: Try to update properties. Modified: branches/ros-csrss/ (props changed) Propchange: branches/ros-csrss/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 28 10:15:26 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-4,6-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:57561-57629 +/trunk/reactos:57561-57630
[ros-diffs] [hbelusca] 57634: Update properties
Author: hbelusca Date: Sun Oct 28 12:00:19 2012 New Revision: 57634 URL: http://svn.reactos.org/svn/reactos?rev=57634&view=rev Log: Update properties Modified: branches/ros-csrss/ (props changed) Propchange: branches/ros-csrss/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 28 12:00:19 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-4,6-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:57561-57630 +/trunk/reactos:57561-57633
[ros-diffs] [hbelusca] 57636: [FREELDR] Really use the 'status' variable.
Author: hbelusca
Date: Sun Oct 28 12:32:31 2012
New Revision: 57636
URL: http://svn.reactos.org/svn/reactos?rev=57636&view=rev
Log:
[FREELDR]
Really use the 'status' variable.
Modified:
trunk/reactos/boot/freeldr/freeldr/fs/fat.c
Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fat.c?rev=57636&r1=57635&r2=57636&view=diff
==
--- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Sun Oct 28
12:32:31 2012
@@ -906,16 +906,16 @@
UINT32 ThisFatEntOffset;
ULONG SectorCount;
PUCHAR ReadBuffer;
- BOOLEAN status = TRUE;;
+ BOOLEAN status = TRUE;
//TRACE("FatGetFatEntry() Retrieving FAT entry for cluster %d.\n",
Cluster);
-// We need a buffer for 2 secors
-ReadBuffer = HeapAllocate(FrLdrTempHeap, 2 * Volume->BytesPerSector,
'xTAF');
-if (!ReadBuffer)
-{
-return FALSE;
-}
+ // We need a buffer for 2 secors
+ ReadBuffer = HeapAllocate(FrLdrTempHeap, 2 * Volume->BytesPerSector,
'xTAF');
+ if (!ReadBuffer)
+ {
+ return FALSE;
+ }
switch(Volume->FatType)
{
@@ -929,7 +929,6 @@
TRACE("ThisFatSecNum: %d\n", ThisFatSecNum);
TRACE("ThisFatEntOffset: %d\n", ThisFatEntOffset);
-
if (ThisFatEntOffset == (Volume->BytesPerSector - 1))
{
SectorCount = 2;
@@ -939,11 +938,11 @@
SectorCount = 1;
}
-if (!FatReadVolumeSectors(Volume, ThisFatSecNum, SectorCount,
ReadBuffer))
-{
-status = FALSE;
-break;
-}
+ if (!FatReadVolumeSectors(Volume, ThisFatSecNum, SectorCount,
ReadBuffer))
+ {
+ status = FALSE;
+ break;
+ }
fat = *((USHORT *) (ReadBuffer + ThisFatEntOffset));
fat = SWAPW(fat);
@@ -963,8 +962,8 @@
if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, ReadBuffer))
{
-status = FALSE;
-break;
+ status = FALSE;
+ break;
}
fat = *((USHORT *) (ReadBuffer + ThisFatEntOffset));
@@ -992,17 +991,17 @@
default:
ERR("Unknown FAT type %d\n", Volume->FatType);
-status = FALSE;
-break;
+ status = FALSE;
+ break;
}
//TRACE("FAT entry is 0x%x.\n", fat);
-HeapFree(FrLdrTempHeap, ReadBuffer, 'xTAF');
+ HeapFree(FrLdrTempHeap, ReadBuffer, 'xTAF');
*ClusterPointer = fat;
- return TRUE;
+ return status;
}
ULONG FatCountClustersInChain(PFAT_VOLUME_INFO Volume, ULONG StartCluster)
[ros-diffs] [hbelusca] 57637: Synchronize with trunk's revision r57636.
Author: hbelusca
Date: Sun Oct 28 12:33:23 2012
New Revision: 57637
URL: http://svn.reactos.org/svn/reactos?rev=57637&view=rev
Log:
Synchronize with trunk's revision r57636.
Modified:
branches/ros-csrss/boot/freeldr/freeldr/fs/fat.c
Modified: branches/ros-csrss/boot/freeldr/freeldr/fs/fat.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/fs/fat.c?rev=57637&r1=57636&r2=57637&view=diff
==
--- branches/ros-csrss/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original)
+++ branches/ros-csrss/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Sun Oct 28
12:33:23 2012
@@ -906,16 +906,16 @@
UINT32 ThisFatEntOffset;
ULONG SectorCount;
PUCHAR ReadBuffer;
- BOOLEAN status = TRUE;;
+ BOOLEAN status = TRUE;
//TRACE("FatGetFatEntry() Retrieving FAT entry for cluster %d.\n",
Cluster);
-// We need a buffer for 2 secors
-ReadBuffer = HeapAllocate(FrLdrTempHeap, 2 * Volume->BytesPerSector,
'xTAF');
-if (!ReadBuffer)
-{
-return FALSE;
-}
+ // We need a buffer for 2 secors
+ ReadBuffer = HeapAllocate(FrLdrTempHeap, 2 * Volume->BytesPerSector,
'xTAF');
+ if (!ReadBuffer)
+ {
+ return FALSE;
+ }
switch(Volume->FatType)
{
@@ -929,7 +929,6 @@
TRACE("ThisFatSecNum: %d\n", ThisFatSecNum);
TRACE("ThisFatEntOffset: %d\n", ThisFatEntOffset);
-
if (ThisFatEntOffset == (Volume->BytesPerSector - 1))
{
SectorCount = 2;
@@ -939,11 +938,11 @@
SectorCount = 1;
}
-if (!FatReadVolumeSectors(Volume, ThisFatSecNum, SectorCount,
ReadBuffer))
-{
-status = FALSE;
-break;
-}
+ if (!FatReadVolumeSectors(Volume, ThisFatSecNum, SectorCount,
ReadBuffer))
+ {
+ status = FALSE;
+ break;
+ }
fat = *((USHORT *) (ReadBuffer + ThisFatEntOffset));
fat = SWAPW(fat);
@@ -963,8 +962,8 @@
if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, ReadBuffer))
{
-status = FALSE;
-break;
+ status = FALSE;
+ break;
}
fat = *((USHORT *) (ReadBuffer + ThisFatEntOffset));
@@ -992,17 +991,17 @@
default:
ERR("Unknown FAT type %d\n", Volume->FatType);
-status = FALSE;
-break;
+ status = FALSE;
+ break;
}
//TRACE("FAT entry is 0x%x.\n", fat);
-HeapFree(FrLdrTempHeap, ReadBuffer, 'xTAF');
+ HeapFree(FrLdrTempHeap, ReadBuffer, 'xTAF');
*ClusterPointer = fat;
- return TRUE;
+ return status;
}
ULONG FatCountClustersInChain(PFAT_VOLUME_INFO Volume, ULONG StartCluster)
[ros-diffs] [hbelusca] 57638: Fix part of build.
Author: hbelusca Date: Sun Oct 28 12:57:03 2012 New Revision: 57638 URL: http://svn.reactos.org/svn/reactos?rev=57638&view=rev Log: Fix part of build. Modified: branches/ros-csrss/win32ss/pch.h Modified: branches/ros-csrss/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/pch.h?rev=57638&r1=57637&r2=57638&view=diff == --- branches/ros-csrss/win32ss/pch.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/pch.h [iso-8859-1] Sun Oct 28 12:57:03 2012 @@ -73,7 +73,7 @@ /* CSRSS Header */ #include -#include // FIXME: data header. +#include /* Public Win32K headers */ #include
[ros-diffs] [hbelusca] 57643: [NTDLL/CSR/SM] - Clean some headers. - Code formatting.
Author: hbelusca
Date: Sun Oct 28 22:56:13 2012
New Revision: 57643
URL: http://svn.reactos.org/svn/reactos?rev=57643&view=rev
Log:
[NTDLL/CSR/SM]
- Clean some headers.
- Code formatting.
Removed:
branches/ros-csrss/include/reactos/subsys/csr/csrss.h
Modified:
branches/ros-csrss/ (props changed)
branches/ros-csrss/dll/ntdll/include/ntdll.h
branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h
branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h
branches/ros-csrss/include/reactos/subsys/sm/api.h (props changed)
branches/ros-csrss/include/reactos/subsys/sm/helper.h (contents, props
changed)
branches/ros-csrss/include/reactos/subsys/sm/ns.h (contents, props
changed)
branches/ros-csrss/include/reactos/subsys/win/base.h
Propchange: branches/ros-csrss/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 28 22:56:13 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-4,6-55567
/branches/wlan-bringup:54809-54998
-/trunk/reactos:57561-57634
+/trunk/reactos:57561-57641
Modified: branches/ros-csrss/dll/ntdll/include/ntdll.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/include/ntdll.h?rev=57643&r1=57642&r2=57643&view=diff
==
--- branches/ros-csrss/dll/ntdll/include/ntdll.h [iso-8859-1] (original)
+++ branches/ros-csrss/dll/ntdll/include/ntdll.h [iso-8859-1] Sun Oct 28
22:56:13 2012
@@ -41,7 +41,8 @@
/* Internal NTDLL */
#include "ntdllp.h"
-/* CSRSS Header */
+/* CSRSS Headers */
+#include
#include
/* PSEH */
Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h?rev=57643&r1=57642&r2=57643&view=diff
==
--- branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1]
(original)
+++ branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] Sun Oct
28 22:56:13 2012
@@ -97,9 +97,6 @@
ULONG_PTR PointerArray[1];
} CSR_CAPTURE_BUFFER, *PCSR_CAPTURE_BUFFER;
-
-#include "csrss.h" // remove it when the data structures are not used anymore.
-
/* Keep in sync with definition below. */
// #define CSRSS_HEADER_SIZE (sizeof(PORT_MESSAGE) + sizeof(ULONG) +
sizeof(NTSTATUS))
@@ -118,17 +115,8 @@
union
{
CSR_CLIENT_CONNECT CsrClientConnect;
-
CSR_SET_PRIORITY_CLASS SetPriorityClass;
CSR_IDENTIFY_ALTERTABLE_THREAD IdentifyAlertableThread;
-
-/*** win32csr thingies to remove. ***/
-#if 1
-CSRSS_CREATE_DESKTOP CreateDesktopRequest;
-CSRSS_SHOW_DESKTOP ShowDesktopRequest;
-CSRSS_HIDE_DESKTOP HideDesktopRequest;
-#endif
-//
} Data;
};
};
Modified: branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h?rev=57643&r1=57642&r2=57643&view=diff
==
--- branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1]
(original)
+++ branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Sun Oct
28 22:56:13 2012
@@ -22,6 +22,9 @@
#include "csrmsg.h"
/* TYPES
**/
+
+// Used in ntdll/csr/connect.c
+#define CSR_CSRSS_SECTION_SIZE(65536)
typedef struct _CSR_NT_SESSION
{
Removed: branches/ros-csrss/include/reactos/subsys/csr/csrss.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/csr/csrss.h?rev=57642&view=auto
==
--- branches/ros-csrss/include/reactos/subsys/csr/csrss.h [iso-8859-1]
(original)
+++ branches/ros-csrss/include/reactos/subsys/csr/csrss.h (removed)
@@ -1,33 +1,0 @@
-/* CSRSS Data
***/
-
-#ifndef __INCLUDE_CSRSS_CSRSS_H
-#define __INCLUDE_CSRSS_CSRSS_H
-
-// Used in ntdll/csr/connect.c
-#define CSR_CSRSS_SECTION_SIZE(65536)
-
-
-/*** win32csr thingies to remove. ***/
-#if 1
-
-typedef struct
-{
-HDESK DesktopHandle;
-} CSRSS_CREATE_DESKTOP, *PCSRSS_CREATE_DESKTOP;
-
-typedef struct
-{
-HWND DesktopWindow;
-ULONG Width;
-UL
[ros-diffs] [hbelusca] 57653: Synchronize with trunk's revision r57652.
Author: hbelusca Date: Wed Oct 31 00:26:38 2012 New Revision: 57653 URL: http://svn.reactos.org/svn/reactos?rev=57653&view=rev Log: Synchronize with trunk's revision r57652. Added: branches/ros-csrss/dll/opengl/glu32/ - copied from r57633, trunk/reactos/dll/opengl/glu32/ branches/ros-csrss/win32ss/user/ntuser/cursoricon_new.c - copied unchanged from r57652, trunk/reactos/win32ss/user/ntuser/cursoricon_new.c branches/ros-csrss/win32ss/user/user32/windows/cursoricon_new.c - copied unchanged from r57652, trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/dll/win32/kernel32/k32.h branches/ros-csrss/drivers/hid/hidparse/ (props changed) branches/ros-csrss/drivers/usb/usbhub/ (props changed) branches/ros-csrss/win32ss/CMakeLists.txt branches/ros-csrss/win32ss/gdi/ntgdi/misc.h branches/ros-csrss/win32ss/include/ntuser.h branches/ros-csrss/win32ss/user/ntuser/callproc.c branches/ros-csrss/win32ss/user/ntuser/clipboard.c branches/ros-csrss/win32ss/user/ntuser/cursoricon.c branches/ros-csrss/win32ss/user/ntuser/cursoricon.h branches/ros-csrss/win32ss/user/ntuser/hook.c branches/ros-csrss/win32ss/user/ntuser/msgqueue.c branches/ros-csrss/win32ss/user/ntuser/object.c branches/ros-csrss/win32ss/user/ntuser/object.h branches/ros-csrss/win32ss/user/ntuser/painting.c branches/ros-csrss/win32ss/user/ntuser/winsta.c branches/ros-csrss/win32ss/user/user32/CMakeLists.txt branches/ros-csrss/win32ss/user/user32/misc/exticon.c branches/ros-csrss/win32ss/user/user32/misc/object.c Propchange: branches/ros-csrss/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 31 00:26:38 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-4,6-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:57561-57641 +/trunk/reactos:57561-57652 Modified: branches/ros-csrss/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/k32.h?rev=57653&r1=57652&r2=57653&view=diff == --- branches/ros-csrss/dll/win32/kernel32/k32.h [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/k32.h [iso-8859-1] Wed Oct 31 00:26:38 2012 @@ -41,7 +41,6 @@ #include #include #include -//#include // FIXME: data header. /* C Headers */ #include Propchange: branches/ros-csrss/drivers/hid/hidparse/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 31 00:26:38 2012 @@ -18,5 +18,5 @@ /branches/usb-bringup/drivers/hid/hidparse: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/drivers/hid/hidparse:55020-55543,55548-4 /branches/wlan-bringup/drivers/hid/hidparse:54809-54998 -/trunk/reactos/drivers/hid/hidparse:57561-57599 +/trunk/reactos/drivers/hid/hidparse:57561-57633 /trunk/reactos/drivers/usb/hidparse:48236-51323 Propchange: branches/ros-csrss/drivers/usb/usbhub/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 31 00:26:38 2012 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbhub:55524-55543,55548-4 /branches/wlan-bringup/drivers/usb/usbhub:54809-54998 /branches/wlan-bringup/drivers/usb/usbhub_new:54809-54998 -/trunk/reactos/drivers/usb/usbhub:57561-57629 +/trunk/reactos/drivers/usb/usbhub:57561-57633 Modified: branches/ros-csrss/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/CMakeLists.txt?rev=57653&r1=57652&r2=57653&view=diff == --- branches/ros-csrss/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/CMakeLists.txt [iso-8859-1] Wed Oct 31 00:26:38 2012 @@ -1,5 +1,6 @@ set(USE_DIBLIB FALSE) +set(USE_NEW_CURSORICON FALSE) # Give WIN32 subsystem its own project. PROJECT(WIN32SS) @@ -103,7 +104,6 @@ user/ntuser/class.c user/ntuser/clipboard.c user/ntuser/csr.c -user/ntuser/cursoricon.c user/ntuser/defwnd.c user/ntuser/desktop.c user/ntuser/display.c @@ -190,6 +190,13 @@
[ros-diffs] [hbelusca] 57654: Forgot two files.
Author: hbelusca
Date: Wed Oct 31 00:41:02 2012
New Revision: 57654
URL: http://svn.reactos.org/svn/reactos?rev=57654&view=rev
Log:
Forgot two files.
Modified:
branches/ros-csrss/ (props changed)
branches/ros-csrss/dll/win32/samsrv/samrpc.c
branches/ros-csrss/win32ss/w32ksvc.h
Propchange: branches/ros-csrss/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 31 00:41:02 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-4,6-55567
/branches/wlan-bringup:54809-54998
-/trunk/reactos:57561-57652
+/trunk/reactos:57561-57653
Modified: branches/ros-csrss/dll/win32/samsrv/samrpc.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/samrpc.c?rev=57654&r1=57653&r2=57654&view=diff
==
--- branches/ros-csrss/dll/win32/samsrv/samrpc.c [iso-8859-1] (original)
+++ branches/ros-csrss/dll/win32/samsrv/samrpc.c [iso-8859-1] Wed Oct 31
00:41:02 2012
@@ -7,18 +7,18 @@
* PROGRAMMERS: Eric Kohl
*/
-/* INCLUDES /
+/* INCLUDES **/
#include "samsrv.h"
WINE_DEFAULT_DEBUG_CHANNEL(samsrv);
-/* GLOBALS
/
+/* GLOBALS ***/
static SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY};
-/* FUNCTIONS ***/
+/* FUNCTIONS */
VOID
SampStartRpcServer(VOID)
@@ -4187,9 +4187,125 @@
SamrRemoveMemberFromAlias(IN SAMPR_HANDLE AliasHandle,
IN PRPC_SID MemberId)
{
-UNIMPLEMENTED;
-return STATUS_NOT_IMPLEMENTED;
-}
+PSAM_DB_OBJECT AliasObject;
+LPWSTR MemberIdString = NULL;
+HANDLE MembersKeyHandle = NULL;
+HANDLE MemberKeyHandle = NULL;
+ULONG ulValueCount;
+NTSTATUS Status;
+
+TRACE("SamrRemoveMemberFromAlias(%p %p)\n",
+ AliasHandle, MemberId);
+
+/* Validate the alias handle */
+Status = SampValidateDbObject(AliasHandle,
+ SamDbAliasObject,
+ ALIAS_REMOVE_MEMBER,
+ &AliasObject);
+if (!NT_SUCCESS(Status))
+{
+TRACE("failed with status 0x%08lx\n", Status);
+return Status;
+}
+
+ConvertSidToStringSidW(MemberId, &MemberIdString);
+TRACE("Member SID: %S\n", MemberIdString);
+
+Status = SampRegOpenKey(AliasObject->MembersKeyHandle,
+MemberIdString,
+KEY_WRITE | KEY_QUERY_VALUE,
+&MemberKeyHandle);
+if (!NT_SUCCESS(Status))
+{
+TRACE("SampRegOpenKey failed with status 0x%08lx\n", Status);
+goto done;
+}
+
+Status = SampRegDeleteValue(MemberKeyHandle,
+AliasObject->Name);
+if (!NT_SUCCESS(Status))
+{
+TRACE("SampRegDeleteValue failed with status 0x%08lx\n", Status);
+goto done;
+}
+
+Status = SampRegQueryKeyInfo(MemberKeyHandle,
+ NULL,
+ &ulValueCount);
+if (!NT_SUCCESS(Status))
+{
+TRACE("SampRegQueryKeyInfo failed with status 0x%08lx\n", Status);
+goto done;
+}
+
+if (ulValueCount == 0)
+{
+SampRegCloseKey(MemberKeyHandle);
+MemberKeyHandle = NULL;
+
+Status = SampRegDeleteKey(AliasObject->MembersKeyHandle,
+ MemberIdString);
+if (!NT_SUCCESS(Status))
+{
+TRACE("SampRegDeleteKey failed with status 0x%08lx\n", Status);
+goto done;
+}
+}
+
+Status = SampRegOpenKey(AliasObject->KeyHandle,
+L"Members",
+KEY_WRITE | KEY_QUERY_VALUE,
+&MembersKeyHandle);
+if (!NT_SUCCESS(Status))
+{
+TRACE("SampRegOpenKey failed with status 0x%08lx\n", Status);
+goto done;
+}
+
+Status = SampRegDeleteValue(MembersKeyHandle,
+MemberIdString);
+if (!NT_SUCCESS(Status))
+{
+TRACE("SampRegDeleteValue failed
[ros-diffs] [hbelusca] 57660: Synchronize with trunk's revision r57659.
Author: hbelusca
Date: Wed Oct 31 19:39:53 2012
New Revision: 57660
URL: http://svn.reactos.org/svn/reactos?rev=57660&view=rev
Log:
Synchronize with trunk's revision r57659.
Modified:
branches/ros-csrss/ (props changed)
branches/ros-csrss/win32ss/include/ntuser.h
branches/ros-csrss/win32ss/user/ntuser/desktop.c
branches/ros-csrss/win32ss/user/ntuser/desktop.h
branches/ros-csrss/win32ss/user/ntuser/simplecall.c
branches/ros-csrss/win32ss/user/user32/include/ntwrapper.h
Propchange: branches/ros-csrss/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 31 19:39:53 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-4,6-55567
/branches/wlan-bringup:54809-54998
-/trunk/reactos:57561-57653
+/trunk/reactos:57561-57659
Modified: branches/ros-csrss/win32ss/include/ntuser.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/include/ntuser.h?rev=57660&r1=57659&r2=57660&view=diff
==
--- branches/ros-csrss/win32ss/include/ntuser.h [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/include/ntuser.h [iso-8859-1] Wed Oct 31
19:39:53 2012
@@ -3251,7 +3251,6 @@
#define ONEPARAM_ROUTINE_SWITCHCARETSHOWING 0xfffe0008
#define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0xfffe000d
#define ONEPARAM_ROUTINE_GETDESKTOPMAPPING0xfffe000e
-#define ONEPARAM_ROUTINE_GETCURSORPOSITION0xfffe0048 // use ONEPARAM_ or
TWOPARAM routine ?
#define TWOPARAM_ROUTINE_SETMENUBARHEIGHT 0xfffd0050
#define TWOPARAM_ROUTINE_SETGUITHRDHANDLE 0xfffd0052
#define MSQ_STATE_CAPTURE0x1
Modified: branches/ros-csrss/win32ss/user/ntuser/desktop.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/desktop.c?rev=57660&r1=57659&r2=57660&view=diff
==
--- branches/ros-csrss/win32ss/user/ntuser/desktop.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/ntuser/desktop.c [iso-8859-1] Wed Oct 31
19:39:53 2012
@@ -26,8 +26,7 @@
/* GLOBALS ***/
/* Currently active desktop */
-PDESKTOP InputDesktop = NULL;
-HDESK InputDesktopHandle = NULL;
+PDESKTOP gpdeskInputDesktop = NULL;
HDC ScreenDeviceContext = NULL;
PTHREADINFO gptiDesktopThread;
HCURSOR gDesktopCursor = NULL;
@@ -420,7 +419,7 @@
PDESKTOP FASTCALL
IntGetActiveDesktop(VOID)
{
- return InputDesktop;
+ return gpdeskInputDesktop;
}
/*
@@ -1464,40 +1463,31 @@
BOOL fInherit,
ACCESS_MASK dwDesiredAccess)
{
- PDESKTOP pdesk;
NTSTATUS Status;
HDESK hdesk = NULL;
+ ULONG HandleAttributes = 0;
UserEnterExclusive();
- TRACE("Enter NtUserOpenInputDesktop InputDesktopHandle
0x%p\n",InputDesktopHandle);
-
- /* Get a pointer to the desktop object */
- Status = IntValidateDesktopHandle(InputDesktopHandle, UserMode, 0, &pdesk);
- if (!NT_SUCCESS(Status))
- {
- ERR("Validation of input desktop handle (0x%p) failed\n",
InputDesktopHandle);
- goto Exit;
- }
+ TRACE("Enter NtUserOpenInputDesktop gpdeskInputDesktop
0x%p\n",gpdeskInputDesktop);
+
+ if(fInherit) HandleAttributes = OBJ_INHERIT;
/* Create a new handle to the object */
Status = ObOpenObjectByPointer(
- pdesk,
- 0,
+ gpdeskInputDesktop,
+ HandleAttributes,
NULL,
dwDesiredAccess,
ExDesktopObjectType,
UserMode,
(PHANDLE)&hdesk);
- ObDereferenceObject(pdesk);
-
if (!NT_SUCCESS(Status))
{
ERR("Failed to open input desktop object\n");
SetLastNtError(Status);
- goto Exit;
- }
-Exit:
+ }
+
TRACE("NtUserOpenInputDesktop returning 0x%p\n",hdesk);
UserLeave();
return hdesk;
@@ -1654,9 +1644,8 @@
InputWindowStation->ActiveDesktop = pdesk;
/* Set the global state. */
- InputDesktop = pdesk;
- InputDesktopHandle = hdesk;
- TRACE("SwitchDesktop InputDesktopHandle 0x%p\n",InputDesktopHandle);
+ gpdeskInputDesktop = pdesk;
+ TRACE("SwitchDesktop gpdeskInputDesktop 0x%p\n",gpdeskInputDesktop);
ObDereferenceObject(pdesk);
RETURN(TRUE);
Modified: branches/ros-csrss/win32ss/user/ntuser/desktop.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/desktop.h?rev=57660&r1=57659&r2=57660&view=diff
[ros-diffs] [hbelusca] 57661: [BOOTDATA] Fix report of OS version: we report us as Windows Server 2003 SP1, in a consistent way, i.e. our product type is ServerNT and not WinNT (workstation). However,
Author: hbelusca Date: Wed Oct 31 23:36:52 2012 New Revision: 57661 URL: http://svn.reactos.org/svn/reactos?rev=57661&view=rev Log: [BOOTDATA] Fix report of OS version: we report us as Windows Server 2003 SP1, in a consistent way, i.e. our product type is ServerNT and not WinNT (workstation). However, for applications which would need to see us as a workstation OS, a workaround exists and can be activated manually by the user (by default it is not). See http://jira.reactos.org/browse/CORE-4620 for a description of the workaround. CORE-6611 #comment In r57661, our version is reported consistently. Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd64.inf?rev=57661&r1=57660&r2=57661&view=diff == --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Wed Oct 31 23:36:52 2012 @@ -1130,8 +1130,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Print\Monitors\Local Port","Driver",2,"localspl.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers",,0x0012 -HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductType",2,"WinNT" -HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductSuite",0x00010002,"" +HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductType",2,"ServerNT" +HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductSuite",0x00010002,"Terminal Server" +; ReactOS specific - by default we report ourselves as Server for the user, +; but we can also report as Workstation if some application needs it. +HKLM,"SYSTEM\CurrentControlSet\Control\ReactOS\Settings\Version","ReportAsWorkstation",0x00010001,0x ; Some installers check for SP1 HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x0100 Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386.inf?rev=57661&r1=57660&r2=57661&view=diff == --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Wed Oct 31 23:36:52 2012 @@ -1130,8 +1130,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Print\Monitors\Local Port","Driver",2,"localspl.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers",,0x0012 -HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductType",2,"WinNT" -HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductSuite",0x00010002,"" +HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductType",2,"ServerNT" +HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductSuite",0x00010002,"Terminal Server" +; ReactOS specific - by default we report ourselves as Server for the user, +; but we can also report as Workstation if some application needs it. +HKLM,"SYSTEM\CurrentControlSet\Control\ReactOS\Settings\Version","ReportAsWorkstation",0x00010001,0x ; Some installers check for SP1 HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x0100
[ros-diffs] [hbelusca] 57662: [KERNEL32/NTDLL] - Move the ReactOS-specific workaround described in http://jira.reactos.org/browse/CORE-6611 and http://jira.reactos.org/browse/CORE-4620 from kernel32 t
Author: hbelusca
Date: Thu Nov 1 12:52:34 2012
New Revision: 57662
URL: http://svn.reactos.org/svn/reactos?rev=57662&view=rev
Log:
[KERNEL32/NTDLL]
- Move the ReactOS-specific workaround described in
http://jira.reactos.org/browse/CORE-6611 and
http://jira.reactos.org/browse/CORE-4620
from kernel32 to ntdll for using it by RtlGetVersion, in order to :
* still having it available in user-mode only,
* and having VerifyVersionInfo (and its Rtl counter-part) working properly.
[RTL/NTOSKRNL]
- Code formatting.
- Use a defined-constant instead of a hard-coded value.
Modified:
trunk/reactos/dll/ntdll/rtl/version.c
trunk/reactos/dll/win32/kernel32/client/version.c
trunk/reactos/lib/rtl/version.c
trunk/reactos/ntoskrnl/mm/ARM3/procsup.c
trunk/reactos/ntoskrnl/rtl/misc.c
Modified: trunk/reactos/dll/ntdll/rtl/version.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/version.c?rev=57662&r1=57661&r2=57662&view=diff
==
--- trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] Thu Nov 1 12:52:34 2012
@@ -8,13 +8,64 @@
* Created 01/11/98
*/
-/* INCLUDES /
+/* INCLUDES
***/
#include
#define NDEBUG
#include
-/* FUNCTIONS /
+/* FUNCTIONS
**/
+
+/* HACK: ReactOS specific changes, see bug-reports CORE-6611 and CORE-4620
(aka. #5003) */
+static VOID NTAPI
+SetRosSpecificInfo(IN OUT PRTL_OSVERSIONINFOEXW VersionInformation)
+{
+CHAR Buffer[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(ULONG)];
+PKEY_VALUE_PARTIAL_INFORMATION kvpInfo = (PVOID)Buffer;
+OBJECT_ATTRIBUTES ObjectAttributes;
+ULONG ReportAsWorkstation = 0;
+HANDLE hKey;
+ULONG Length;
+NTSTATUS Status;
+UNICODE_STRING KeyName =
RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\ReactOS\\Settings\\Version");
+UNICODE_STRING ValName = RTL_CONSTANT_STRING(L"ReportAsWorkstation");
+
+InitializeObjectAttributes(&ObjectAttributes,
+ &KeyName,
+ OBJ_OPENIF | OBJ_CASE_INSENSITIVE,
+ NULL,
+ NULL);
+
+/* Don't change anything if the key doesn't exist */
+Status = NtOpenKey(&hKey, KEY_READ, &ObjectAttributes);
+if (NT_SUCCESS(Status))
+{
+/* Get the value from the registry and make sure it's a 32-bit value */
+Status = NtQueryValueKey(hKey,
+ &ValName,
+ KeyValuePartialInformation,
+ kvpInfo,
+ sizeof(Buffer),
+ &Length);
+if (NT_SUCCESS(Status) &&
+(kvpInfo->Type == REG_DWORD) &&
+(kvpInfo->DataLength == sizeof(ULONG)))
+{
+/* Is the value set? */
+ReportAsWorkstation = *(PULONG)kvpInfo->Data;
+if ((VersionInformation->wProductType == VER_NT_SERVER) &&
+(ReportAsWorkstation != 0))
+{
+/* It is, modify the product type to report a workstation */
+VersionInformation->wProductType = VER_NT_WORKSTATION;
+DPRINT1("We modified the reported OS from NtProductServer to
NtProductWinNt\n");
+}
+}
+
+/* Close the handle */
+NtClose(hKey);
+}
+}
/**
* NAMEEXPORTED
@@ -40,12 +91,11 @@
*
* @implemented
*/
-
BOOLEAN NTAPI
RtlGetNtProductType(PNT_PRODUCT_TYPE ProductType)
{
- *ProductType = SharedUserData->NtProductType;
- return(TRUE);
+*ProductType = SharedUserData->NtProductType;
+return TRUE;
}
/**
@@ -71,7 +121,6 @@
*
* @implemented
*/
-
VOID NTAPI
RtlGetNtVersionNumbers(OUT LPDWORD pdwMajorVersion,
OUT LPDWORD pdwMinorVersion,
@@ -101,49 +150,56 @@
}
/*
-* @implemented
-*/
+ * @implemented
+ * @note User-mode version of RtlGetVersion in ntoskrnl/rtl/misc.c
+ */
NTSTATUS NTAPI
-RtlGetVersion(RTL_OSVERSIONINFOW *Info)
-{
- LONG i, MaxLength;
-
- if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) ||
- Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW))
- {
- PPEB Peb = NtCurrentPeb();
-
- Info->dwMajorVersion = Peb->OSMaj
[ros-diffs] [hbelusca] 57664: [WIN32K/USER32/WINSRV] - Correct an enumeration identificator initialization. - Move the call of CSR for registering the logon application, from kernel-mode win32k to use
Author: hbelusca
Date: Fri Nov 2 11:23:26 2012
New Revision: 57664
URL: http://svn.reactos.org/svn/reactos?rev=57664&view=rev
Log:
[WIN32K/USER32/WINSRV]
- Correct an enumeration identificator initialization.
- Move the call of CSR for registering the logon application, from kernel-mode
win32k to user-mode user32
and therefore remove the unneeded co_CsrNotify function (plus some other
unneeded defines).
- Comment some non-working code (#if 0) in user32/misc/misc.c and
winsrv/shutdown.c.
Modified:
branches/ros-csrss/include/reactos/subsys/win/winmsg.h
branches/ros-csrss/win32ss/user/ntuser/csr.c
branches/ros-csrss/win32ss/user/ntuser/csr.h
branches/ros-csrss/win32ss/user/ntuser/simplecall.c
branches/ros-csrss/win32ss/user/user32/include/user32p.h
branches/ros-csrss/win32ss/user/user32/misc/dllmain.c
branches/ros-csrss/win32ss/user/user32/misc/exit.c
branches/ros-csrss/win32ss/user/user32/misc/misc.c
branches/ros-csrss/win32ss/user/winsrv/init.c
branches/ros-csrss/win32ss/user/winsrv/server.c
branches/ros-csrss/win32ss/user/winsrv/shutdown.c
Modified: branches/ros-csrss/include/reactos/subsys/win/winmsg.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/win/winmsg.h?rev=57664&r1=57663&r2=57664&view=diff
==
--- branches/ros-csrss/include/reactos/subsys/win/winmsg.h [iso-8859-1]
(original)
+++ branches/ros-csrss/include/reactos/subsys/win/winmsg.h [iso-8859-1] Fri Nov
2 11:23:26 2012
@@ -19,7 +19,7 @@
typedef enum _USERSRV_API_NUMBER
{
-UserpExitWindowsEx = USERSRV_SERVERDLL_INDEX,
+UserpExitWindowsEx = USERSRV_FIRST_API_NUMBER,
// UserpEndTask,
// UserpLogon,
UserpRegisterServicesProcess, // Not present in Win7
@@ -45,12 +45,12 @@
typedef struct
{
-HANDLE ProcessId;
+ULONG_PTR ProcessId;
} CSRSS_REGISTER_SERVICES_PROCESS, *PCSRSS_REGISTER_SERVICES_PROCESS;
typedef struct
{
-HANDLE ProcessId;
+ULONG_PTR ProcessId;
BOOL Register;
} CSRSS_REGISTER_LOGON_PROCESS, *PCSRSS_REGISTER_LOGON_PROCESS;
Modified: branches/ros-csrss/win32ss/user/ntuser/csr.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/csr.c?rev=57664&r1=57663&r2=57664&view=diff
==
--- branches/ros-csrss/win32ss/user/ntuser/csr.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/ntuser/csr.c [iso-8859-1] Fri Nov 2
11:23:26 2012
@@ -7,6 +7,7 @@
*/
#include
+DBG_DEFAULT_CHANNEL(UserMisc);
static HANDLE WindowsApiPort = NULL;
PEPROCESS CsrProcess = NULL;
@@ -19,12 +20,17 @@
ULONG ConnectInfoLength;
SECURITY_QUALITY_OF_SERVICE Qos;
+ ERR("CsrInit\n");
+
RtlInitUnicodeString(&PortName, L"\\Windows\\ApiPort");
ConnectInfoLength = 0;
Qos.Length = sizeof(Qos);
Qos.ImpersonationLevel = SecurityDelegation;
Qos.ContextTrackingMode = SECURITY_STATIC_TRACKING;
Qos.EffectiveOnly = FALSE;
+
+ CsrProcess = PsGetCurrentProcess();
+ ERR("CsrInit - CsrProcess = 0x%p\n", CsrProcess);
Status = ZwConnectPort(&WindowsApiPort,
&PortName,
@@ -36,61 +42,11 @@
&ConnectInfoLength);
if (!NT_SUCCESS(Status))
{
+ ERR("CsrInit - Status = 0x%p\n", Status);
return Status;
}
-
- CsrProcess = PsGetCurrentProcess();
return STATUS_SUCCESS;
}
-
-NTSTATUS FASTCALL
-co_CsrNotify(IN OUT PCSR_API_MESSAGE ApiMessage,
- IN ULONG DataLength)
-{
-NTSTATUS Status;
-PEPROCESS OldProcess;
-
-if (NULL == CsrProcess)
-{
-return STATUS_INVALID_PORT_HANDLE;
-}
-
-/* Fill out the Port Message Header */
-ApiMessage->Header.u2.ZeroInit = 0;
-ApiMessage->Header.u1.s1.TotalLength =
-FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength;
-/* FIELD_OFFSET(CSR_API_MESSAGE, Data) <= sizeof(CSR_API_MESSAGE) -
sizeof(ApiMessage->Data) */
-ApiMessage->Header.u1.s1.DataLength =
-ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE);
-
-/* Switch to the process in which the WindowsApiPort handle is valid */
-OldProcess = PsGetCurrentProcess();
-if (CsrProcess != OldProcess)
-{
-KeAttachProcess(&CsrProcess->Pcb);
-}
-
-UserLeaveCo();
-
-Status = ZwRequestWaitReplyPort(WindowsApiPort,
-&ApiMessage->Header,
-&ApiMessage->Header);
-
-UserEnterCo();
-
-if (CsrProcess != OldProcess)
-{
-KeDetachProcess();
-}
-
-if (NT_SUCCESS(Status))
-{
-Status = ApiMessage->Status;
-}
-
-return Status;
-}
-
/* EOF */
Modified: branches/ros-csrss/win32ss/user/ntuser/csr
[ros-diffs] [hbelusca] 57665: [WIN32K] - Remove the now unneeded CSR messaging support. - CsrInit() goes away also and the usage of the CsrProcess is replaced by that of gpepCSRSS. [WINSRV] - Use a DL
Author: hbelusca
Date: Fri Nov 2 13:50:31 2012
New Revision: 57665
URL: http://svn.reactos.org/svn/reactos?rev=57665&view=rev
Log:
[WIN32K]
- Remove the now unneeded CSR messaging support.
- CsrInit() goes away also and the usage of the CsrProcess is replaced by that
of gpepCSRSS.
[WINSRV]
- Use a DLL instance for loading resources, instead of calling GetModuleHandle.
[KERNEL32/NTDLL]
- Remove unneeded variables.
Removed:
branches/ros-csrss/win32ss/user/ntuser/csr.c
branches/ros-csrss/win32ss/user/ntuser/csr.h
Modified:
branches/ros-csrss/dll/ntdll/include/ntdllp.h
branches/ros-csrss/dll/win32/kernel32/include/kernel32.h
branches/ros-csrss/win32ss/CMakeLists.txt
branches/ros-csrss/win32ss/gdi/ntgdi/gdikdbgext.c
branches/ros-csrss/win32ss/user/ntuser/desktop.c
branches/ros-csrss/win32ss/user/ntuser/hook.c
branches/ros-csrss/win32ss/user/ntuser/menu.c
branches/ros-csrss/win32ss/user/ntuser/ntuser.c
branches/ros-csrss/win32ss/user/ntuser/ntuser.h
branches/ros-csrss/win32ss/user/ntuser/simplecall.c
branches/ros-csrss/win32ss/user/winsrv/init.c
branches/ros-csrss/win32ss/user/winsrv/shutdown.c
branches/ros-csrss/win32ss/user/winsrv/winsrv.h
branches/ros-csrss/win32ss/win32kp.h
Modified: branches/ros-csrss/dll/ntdll/include/ntdllp.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/include/ntdllp.h?rev=57665&r1=57664&r2=57665&view=diff
==
--- branches/ros-csrss/dll/ntdll/include/ntdllp.h [iso-8859-1] (original)
+++ branches/ros-csrss/dll/ntdll/include/ntdllp.h [iso-8859-1] Fri Nov 2
13:50:31 2012
@@ -162,7 +162,5 @@
VOID
NTAPI
LdrpFinalizeAndDeallocateDataTableEntry(IN PLDR_DATA_TABLE_ENTRY Entry);
-
-extern HANDLE WindowsApiPort;
/* EOF */
Modified: branches/ros-csrss/dll/win32/kernel32/include/kernel32.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/include/kernel32.h?rev=57665&r1=57664&r2=57665&view=diff
==
--- branches/ros-csrss/dll/win32/kernel32/include/kernel32.h [iso-8859-1]
(original)
+++ branches/ros-csrss/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Fri
Nov 2 13:50:31 2012
@@ -155,7 +155,6 @@
#define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS 2
#define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_CONTINUE 3
-
extern PBASE_STATIC_SERVER_DATA BaseStaticServerData;
typedef
@@ -164,8 +163,6 @@
HANDLE hProcess,
DWORD dwMilliseconds);
-
-extern BOOLEAN InWindows;
extern WaitForInputIdleType UserWaitForInputIdleRoutine;
/* GLOBAL VARIABLES **/
Modified: branches/ros-csrss/win32ss/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/CMakeLists.txt?rev=57665&r1=57664&r2=57665&view=diff
==
--- branches/ros-csrss/win32ss/CMakeLists.txt [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/CMakeLists.txt [iso-8859-1] Fri Nov 2 13:50:31
2012
@@ -103,7 +103,6 @@
user/ntuser/caret.c
user/ntuser/class.c
user/ntuser/clipboard.c
-user/ntuser/csr.c
user/ntuser/defwnd.c
user/ntuser/desktop.c
user/ntuser/display.c
Modified: branches/ros-csrss/win32ss/gdi/ntgdi/gdikdbgext.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/gdikdbgext.c?rev=57665&r1=57664&r2=57665&view=diff
==
--- branches/ros-csrss/win32ss/gdi/ntgdi/gdikdbgext.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/gdi/ntgdi/gdikdbgext.c [iso-8859-1] Fri Nov 2
13:50:31 2012
@@ -14,7 +14,6 @@
extern PENTRY gpentHmgr;
extern PULONG gpaulRefCount;
-extern PEPROCESS gpepCSRSS;
extern ULONG gulFirstUnused;
Removed: branches/ros-csrss/win32ss/user/ntuser/csr.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/csr.c?rev=57664&view=auto
==
--- branches/ros-csrss/win32ss/user/ntuser/csr.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/ntuser/csr.c (removed)
@@ -1,52 +1,0 @@
-/*
- * COPYRIGHT:See COPYING in the top level directory
- * PROJECT: ReactOS kernel
- * PURPOSE: Interface to csrss
- * FILE: subsys/win32k/ntuser/csr.c
- * PROGRAMER:Ge van Geldorp (g...@gse.nl)
- */
-
-#include
-DBG_DEFAULT_CHANNEL(UserMisc);
-
-static HANDLE WindowsApiPort = NULL;
-PEPROCESS CsrProcess = NULL;
-
-NTSTATUS FASTCALL
-CsrInit(void)
-{
- NTSTATUS Status;
- UNICODE_STRING PortName;
- ULONG ConnectInfoLength;
- SECURITY_QUALITY_OF_SERVICE Qos;
-
- ERR("CsrInit\n&
[ros-diffs] [hbelusca] 57666: [KERNEL32] This is the first of a series of commits aiming at making kernel32 using the new CSR messaging structures for communicating with Server Dlls.
Author: hbelusca
Date: Fri Nov 2 18:00:47 2012
New Revision: 57666
URL: http://svn.reactos.org/svn/reactos?rev=57666&view=rev
Log:
[KERNEL32]
This is the first of a series of commits aiming at making kernel32 using the
new CSR messaging structures for communicating with Server Dlls.
Modified:
branches/ros-csrss/dll/win32/kernel32/client/dosdev.c
branches/ros-csrss/dll/win32/kernel32/client/proc.c
branches/ros-csrss/dll/win32/kernel32/client/vdm.c
branches/ros-csrss/dll/win32/kernel32/client/vista.c
Modified: branches/ros-csrss/dll/win32/kernel32/client/dosdev.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/client/dosdev.c?rev=57666&r1=57665&r2=57666&view=diff
==
--- branches/ros-csrss/dll/win32/kernel32/client/dosdev.c [iso-8859-1]
(original)
+++ branches/ros-csrss/dll/win32/kernel32/client/dosdev.c [iso-8859-1] Fri Nov
2 18:00:47 2012
@@ -90,8 +90,9 @@
{
ULONG ArgumentCount;
ULONG BufferSize;
+BASE_API_MESSAGE ApiMessage;
+PBASE_DEFINE_DOS_DEVICE DefineDosDeviceRequest =
&ApiMessage.Data.DefineDosDeviceRequest;
PCSR_CAPTURE_BUFFER CaptureBuffer;
-CSR_API_MESSAGE Request;
NTSTATUS Status;
UNICODE_STRING NtTargetPathU;
UNICODE_STRING DeviceNameU;
@@ -157,16 +158,16 @@
}
else
{
-Request.Data.DefineDosDeviceRequest.dwFlags = dwFlags;
+DefineDosDeviceRequest->dwFlags = dwFlags;
CsrCaptureMessageBuffer(CaptureBuffer,
(PVOID)DeviceUpcaseNameU.Buffer,
DeviceUpcaseNameU.Length,
-
(PVOID*)&Request.Data.DefineDosDeviceRequest.DeviceName.Buffer);
-
-Request.Data.DefineDosDeviceRequest.DeviceName.Length =
+
(PVOID*)&DefineDosDeviceRequest->DeviceName.Buffer);
+
+DefineDosDeviceRequest->DeviceName.Length =
DeviceUpcaseNameU.Length;
-Request.Data.DefineDosDeviceRequest.DeviceName.MaximumLength =
+DefineDosDeviceRequest->DeviceName.MaximumLength =
DeviceUpcaseNameU.Length;
if (NtTargetPathU.Buffer)
@@ -174,21 +175,20 @@
CsrCaptureMessageBuffer(CaptureBuffer,
(PVOID)NtTargetPathU.Buffer,
NtTargetPathU.Length,
-
(PVOID*)&Request.Data.DefineDosDeviceRequest.TargetName.Buffer);
-}
-Request.Data.DefineDosDeviceRequest.TargetName.Length =
+
(PVOID*)&DefineDosDeviceRequest->TargetName.Buffer);
+}
+DefineDosDeviceRequest->TargetName.Length =
NtTargetPathU.Length;
-Request.Data.DefineDosDeviceRequest.TargetName.MaximumLength =
+DefineDosDeviceRequest->TargetName.MaximumLength =
NtTargetPathU.Length;
-Status = CsrClientCallServer(&Request,
+Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
CaptureBuffer,
CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepDefineDosDevice),
- sizeof(CSR_API_MESSAGE));
+ sizeof(BASE_DEFINE_DOS_DEVICE));
CsrFreeCaptureBuffer(CaptureBuffer);
-if (! NT_SUCCESS(Status) ||
-! NT_SUCCESS(Status = Request.Status))
+if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
{
WARN("CsrClientCallServer() failed (Status %lx)\n",
Status);
Modified: branches/ros-csrss/dll/win32/kernel32/client/proc.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/client/proc.c?rev=57666&r1=57665&r2=57666&view=diff
==
--- branches/ros-csrss/dll/win32/kernel32/client/proc.c [iso-8859-1] (original)
+++ branches/ros-csrss/dll/win32/kernel32/client/proc.c [iso-8859-1] Fri Nov 2
18:00:47 2012
@@ -1,10 +1,9 @@
-/* $Id: proc.c 57086 2012-08-16 15:39:40Z akhaldi $
- *
+/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
* FILE:lib/kernel32/proc/proc.c
* PURPOSE: Process functions
- * PROGRAMMER: Ariadne ( aria...@xs4all.nl)
+ * PROGRAMMERS: Ariadne (aria...@xs4all.nl)
* UPDATE HISTORY:
* Created 01/11/98
*/
@@ -13,7 +12,7 @@
#include
-#define NDEBUG
+// #define NDEBUG
#include
/* GLOBALS ***/
@@ -494,25 +493,26 @@
BasepNotifyCsrOfThread(IN HANDLE ThreadHandle,
IN PCLIENT_ID ClientId)
{
-CSR_API_MESSAGE CsrRequest;
-NTSTATUS S
[ros-diffs] [hbelusca] 57667: [KERNEL32] - Use new messaging structures, defined-names instead of hardcoded values. - Enable temporary debugging tracing and add some DPRINTs. - Delete an unused variab
Author: hbelusca
Date: Fri Nov 2 18:28:42 2012
New Revision: 57667
URL: http://svn.reactos.org/svn/reactos?rev=57667&view=rev
Log:
[KERNEL32]
- Use new messaging structures, defined-names instead of hardcoded values.
- Enable temporary debugging tracing and add some DPRINTs.
- Delete an unused variable.
Modified:
branches/ros-csrss/dll/win32/kernel32/client/dllmain.c
Modified: branches/ros-csrss/dll/win32/kernel32/client/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/client/dllmain.c?rev=57667&r1=57666&r2=57667&view=diff
==
--- branches/ros-csrss/dll/win32/kernel32/client/dllmain.c [iso-8859-1]
(original)
+++ branches/ros-csrss/dll/win32/kernel32/client/dllmain.c [iso-8859-1] Fri Nov
2 18:28:42 2012
@@ -1,10 +1,9 @@
-/* $Id: dllmain.c 56414 2012-04-25 10:17:29Z tfaber $
- *
+/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
* FILE:lib/kernel32/misc/dllmain.c
* PURPOSE: Initialization
- * PROGRAMMER: Ariadne ( aria...@xs4all.nl)
+ * PROGRAMMERS: Ariadne (aria...@xs4all.nl)
* Aleksey Bragin (alek...@reactos.org)
* UPDATE HISTORY:
* Created 01/11/98
@@ -14,7 +13,7 @@
#include
-#define NDEBUG
+// #define NDEBUG
#include
/* GLOBALS ***/
@@ -33,24 +32,18 @@
BOOL ConsoleInitialized = FALSE;
static BOOL DllInitialized = FALSE;
-BOOL WINAPI
-DllMain(HANDLE hInst,
- DWORD dwReason,
- LPVOID lpReserved);
-
/* Critical section for various kernel32 data structures */
RTL_CRITICAL_SECTION BaseDllDirectoryLock;
RTL_CRITICAL_SECTION ConsoleLock;
extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event);
-extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD
CodeAndFlag);
+extern DWORD WINAPI ConsoleControlDispatcher(IN LPVOID lpThreadParameter);
extern PHANDLER_ROUTINE InitialHandler[1];
extern PHANDLER_ROUTINE* CtrlHandlers;
extern ULONG NrCtrlHandlers;
extern ULONG NrAllocatedHandlers;
extern BOOL FASTCALL NlsInit(VOID);
extern VOID FASTCALL NlsUninit(VOID);
-BOOLEAN InWindows = FALSE;
#define WIN_OBJ_DIR L"\\Windows"
#define SESSION_DIR L"\\Sessions"
@@ -61,8 +54,9 @@
WINAPI
BasepInitConsole(VOID)
{
-CSR_API_MESSAGE Request;
NTSTATUS Status;
+CONSOLE_API_MESSAGE ApiMessage;
+PCSRSS_ALLOC_CONSOLE AllocConsoleRequest =
&ApiMessage.Data.AllocConsoleRequest;
BOOLEAN NotConsole = FALSE;
PRTL_USER_PROCESS_PARAMETERS Parameters =
NtCurrentPeb()->ProcessParameters;
LPCWSTR ExeName;
@@ -70,7 +64,14 @@
WCHAR SessionDir[256];
ULONG SessionId = NtCurrentPeb()->SessionId;
BOOLEAN InServer;
-
+
+// HACK
+/*
+CSR_CONNECTION_INFO CsrConnectionInfo;
+ULONG ConnectionSize = sizeof(CsrConnectionInfo);
+*/
+// END HACK
+
WCHAR lpTest[MAX_PATH];
GetModuleFileNameW(NULL, lpTest, MAX_PATH);
DPRINT("BasepInitConsole for : %S\n", lpTest);
@@ -84,14 +85,14 @@
{
DPRINT("Image is not a console application\n");
Parameters->ConsoleHandle = NULL;
-Request.Data.AllocConsoleRequest.ConsoleNeeded = FALSE;
+AllocConsoleRequest->ConsoleNeeded = FALSE;
}
else
{
/* Assume one is needed */
GetStartupInfo(&si);
-Request.Data.AllocConsoleRequest.ConsoleNeeded = TRUE;
-Request.Data.AllocConsoleRequest.ShowCmd = si.wShowWindow;
+AllocConsoleRequest->ConsoleNeeded = TRUE;
+AllocConsoleRequest->ShowCmd = si.wShowWindow;
/* Handle the special flags given to us by BasepInitializeEnvironment
*/
if (Parameters->ConsoleHandle == HANDLE_DETACHED_PROCESS)
@@ -99,7 +100,7 @@
/* No console to create */
DPRINT("No console to create\n");
Parameters->ConsoleHandle = NULL;
-Request.Data.AllocConsoleRequest.ConsoleNeeded = FALSE;
+AllocConsoleRequest->ConsoleNeeded = FALSE;
}
else if (Parameters->ConsoleHandle == HANDLE_CREATE_NEW_CONSOLE)
{
@@ -112,7 +113,7 @@
/* We'll get the real one soon */
DPRINT("Creating new invisible console\n");
Parameters->ConsoleHandle = NULL;
-Request.Data.AllocConsoleRequest.ShowCmd = SW_HIDE;
+AllocConsoleRequest->ShowCmd = SW_HIDE;
}
else
{
@@ -137,7 +138,7 @@
SetConsoleInputExeNameW(ExeName + 1);
/* Now use the proper console handle */
-Request.Data.AllocConsoleRequest.Console = Parameters->ConsoleHandle;
+AllocConsoleRequest->Console = Parameters->ConsoleHandle;
/* Setup the right Object Directory
[ros-diffs] [hbelusca] 57668: [KERNEL32] Use the new messaging structures...
Author: hbelusca
Date: Fri Nov 2 18:30:27 2012
New Revision: 57668
URL: http://svn.reactos.org/svn/reactos?rev=57668&view=rev
Log:
[KERNEL32]
Use the new messaging structures...
Modified:
branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c
branches/ros-csrss/dll/win32/kernel32/client/file/filename.c
Modified: branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c?rev=57668&r1=57667&r2=57668&view=diff
==
--- branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c [iso-8859-1]
(original)
+++ branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c [iso-8859-1]
Fri Nov 2 18:30:27 2012
@@ -18,21 +18,22 @@
WINAPI
NotifySoundSentry(VOID)
{
-CSR_API_MESSAGE ApiMessage;
+BASE_API_MESSAGE ApiMessage;
+PBASE_SOUND_SENTRY SoundSentryRequest =
&ApiMessage.Data.SoundSentryRequest;
/* Get the video mode */
-if (!GetConsoleDisplayMode(&ApiMessage.Data.SoundSentryRequest.VideoMode))
-{
-ApiMessage.Data.SoundSentryRequest.VideoMode = 0;
+if (!GetConsoleDisplayMode(&SoundSentryRequest->VideoMode))
+{
+SoundSentryRequest->VideoMode = 0;
}
/* Make sure it's not fullscreen, and send the message if not */
-if (ApiMessage.Data.SoundSentryRequest.VideoMode == 0)
-{
-CsrClientCallServer(&ApiMessage,
+if (SoundSentryRequest->VideoMode == 0)
+{
+CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
NULL,
CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX,
BasepSoundSentryNotification),
-sizeof(CSR_API_MESSAGE));
+sizeof(BASE_SOUND_SENTRY));
}
}
Modified: branches/ros-csrss/dll/win32/kernel32/client/file/filename.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/client/file/filename.c?rev=57668&r1=57667&r2=57668&view=diff
==
--- branches/ros-csrss/dll/win32/kernel32/client/file/filename.c [iso-8859-1]
(original)
+++ branches/ros-csrss/dll/win32/kernel32/client/file/filename.c [iso-8859-1]
Fri Nov 2 18:30:27 2012
@@ -1,10 +1,9 @@
-/* $Id: file.c 54310 2011-11-06 04:13:21Z ion $
- *
+/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
* FILE:lib/kernel32/file/file.c
* PURPOSE: Directory functions
- * PROGRAMMER: Ariadne ( aria...@xs4all.nl)
+ * PROGRAMMERS: Ariadne (aria...@xs4all.nl)
* Pierre Schweitzer (pierre.schweit...@reactos.org)
* UPDATE HISTORY:
* Created 01/11/98
@@ -92,7 +91,8 @@
UINT ID, Num = 0;
CHAR IDString[5];
WCHAR * TempFileName;
-CSR_API_MESSAGE ApiMessage;
+BASE_API_MESSAGE ApiMessage;
+PBASE_GET_TEMP_FILE GetTempFile = &ApiMessage.Data.GetTempFile;
DWORD FileAttributes, LastError;
UNICODE_STRING PathNameString, PrefixString;
static const WCHAR Ext[] = { L'.', 't', 'm', 'p', UNICODE_NULL };
@@ -158,17 +158,17 @@
/* If user didn't gave any ID, ask Csrss to give one */
if (!uUnique)
{
-CsrClientCallServer(&ApiMessage,
+CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
NULL,
CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX,
BasepGetTempFile),
-sizeof(CSR_API_MESSAGE));
-if (ApiMessage.Data.GetTempFile.UniqueID == 0)
+sizeof(BASE_GET_TEMP_FILE));
+if (GetTempFile->UniqueID == 0)
{
Num++;
continue;
}
-ID = ApiMessage.Data.GetTempFile.UniqueID;
+ID = GetTempFile->UniqueID;
}
else
{
[ros-diffs] [hbelusca] 57685: [CONSRV] Add a new header containing per-process console-specific structure CSRSS_CON_PROCESS_DATA (it is stored inside one of the element of the ServerData array inside
Author: hbelusca
Date: Wed Nov 7 21:04:47 2012
New Revision: 57685
URL: http://svn.reactos.org/svn/reactos?rev=57685&view=rev
Log:
[CONSRV]
Add a new header containing per-process console-specific structure
CSRSS_CON_PROCESS_DATA (it is stored inside one of the element of the
ServerData array inside the CSR_PROCESS structure). It was deleted from
csrsrv.h in revision r57673 and reappears here. Also add a macro in order to
facilitate its access inside consrv.
Added:
branches/ros-csrss/include/reactos/subsys/win/console.h (with props)
Added: branches/ros-csrss/include/reactos/subsys/win/console.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys/win/console.h?rev=57685&view=auto
==
--- branches/ros-csrss/include/reactos/subsys/win/console.h (added)
+++ branches/ros-csrss/include/reactos/subsys/win/console.h [iso-8859-1] Wed
Nov 7 21:04:47 2012
@@ -1,0 +1,34 @@
+/*
+ * COPYRIGHT: See COPYING in the top level directory
+ * PROJECT: ReactOS Client/Server Runtime SubSystem
+ * FILE:include/reactos/subsys/win/console.h
+ * PURPOSE: Public definitions for Console API Clients
+ * PROGRAMMERS: Hermes Belusca-Maito (hermes.belu...@sfr.fr)
+ */
+
+#ifndef _CONSOLE_H
+#define _CONSOLE_H
+
+#pragma once
+
+#define ConsoleGetPerProcessData(pcsrprocess) \
+
((PCONSOLE_PROCESS_DATA)((pcsrprocess)->ServerData[CONSRV_SERVERDLL_INDEX]))
+
+
+typedef struct _CONSOLE_PROCESS_DATA
+{
+LIST_ENTRY ConsoleLink;
+PCSR_PROCESS Process; // Parent process.
+HANDLE ConsoleEvent;
+/* PCSRSS_CONSOLE */ struct tagCSRSS_CONSOLE* Console;
+/* PCSRSS_CONSOLE */ struct tagCSRSS_CONSOLE* ParentConsole;
+BOOL bInheritHandles;
+RTL_CRITICAL_SECTION HandleTableLock;
+ULONG HandleTableSize;
+/* PCSRSS_HANDLE */ struct _CSRSS_HANDLE* HandleTable; // Is it a
length-varying table or length-fixed ??
+LPTHREAD_START_ROUTINE CtrlDispatcher;
+} CONSOLE_PROCESS_DATA, *PCONSOLE_PROCESS_DATA;
+
+#endif // _CONSOLE_H
+
+/* EOF */
Propchange: branches/ros-csrss/include/reactos/subsys/win/console.h
--
svn:eol-style = native
[ros-diffs] [hbelusca] 57686: [CONSRV] - Use the new PCONSOLE_PROCESS_DATA type instead of PCSR_PROCESS, for accessing console-specific fields inside a console structure (the code modifications inside
Author: hbelusca
Date: Wed Nov 7 21:10:48 2012
New Revision: 57686
URL: http://svn.reactos.org/svn/reactos?rev=57686&view=rev
Log:
[CONSRV]
- Use the new PCONSOLE_PROCESS_DATA type instead of PCSR_PROCESS, for accessing
console-specific fields inside a console structure (the code modifications
inside these functions will follow in the next commits).
- Remove unneeded included header files in consrv.h.
- Use a DLL instance in order to facilitate the access to win32 resources.
- Activate the declaration of server apis (or rename existing ones to the
Windows scheme from the
http://j00ru.vexillium.org/csrss_list/api_list.html#Windows_2k3 list).
- Comment the Win32CsrValidateBuffer helper (because it should be replaced by
the usage of CsrValidateMessageBuffer).
- Add the list of the old APIs (just for me, to remember at the end to check
that I didn't forget ome of them during the process of moving / renaming).
Modified:
branches/ros-csrss/win32ss/user/consrv/conio.h
branches/ros-csrss/win32ss/user/consrv/consrv.h
branches/ros-csrss/win32ss/user/consrv/init.c
branches/ros-csrss/win32ss/user/consrv/server.c
Modified: branches/ros-csrss/win32ss/user/consrv/conio.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/conio.h?rev=57686&r1=57685&r2=57686&view=diff
==
--- branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] Wed Nov 7
21:10:48 2012
@@ -136,13 +136,15 @@
#define ConioResizeBuffer(Console, Buff, Size)
(Console)->Vtbl->ResizeBuffer(Console, Buff, Size)
/* console.c */
-NTSTATUS FASTCALL ConioConsoleFromProcessData(PCSR_PROCESS ProcessData,
PCSRSS_CONSOLE *Console);
+NTSTATUS FASTCALL ConioConsoleFromProcessData(PCONSOLE_PROCESS_DATA
ProcessData,
+ PCSRSS_CONSOLE *Console);
VOID WINAPI ConioDeleteConsole(Object_t *Object);
VOID WINAPI CsrInitConsoleSupport(VOID);
VOID FASTCALL ConioPause(PCSRSS_CONSOLE Console, UINT Flags);
VOID FASTCALL ConioUnpause(PCSRSS_CONSOLE Console, UINT Flags);
-VOID FASTCALL ConioConsoleCtrlEvent(DWORD Event, PCSR_PROCESS ProcessData);
-VOID FASTCALL ConioConsoleCtrlEventTimeout(DWORD Event, PCSR_PROCESS
ProcessData,
+VOID FASTCALL ConioConsoleCtrlEvent(DWORD Event, PCONSOLE_PROCESS_DATA
ProcessData);
+VOID FASTCALL ConioConsoleCtrlEventTimeout(DWORD Event,
+ PCONSOLE_PROCESS_DATA ProcessData,
DWORD Timeout);
/* coninput.c */
Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/consrv.h?rev=57686&r1=57685&r2=57686&view=diff
==
--- branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] Wed Nov 7
21:10:48 2012
@@ -21,11 +21,8 @@
#include
/* CONSOLE Headers */
+#include
#include
-// #include
-
-//#include "guiconsole.h"
-//#include "tuiconsole.h"
#include "resource.h"
@@ -33,9 +30,12 @@
#include "console.h"
+extern HINSTANCE ConSrvDllInstance;
extern HANDLE ConSrvHeap;
// extern HANDLE BaseSrvSharedHeap;
// extern PBASE_STATIC_SERVER_DATA BaseStaticServerData;
+
+
typedef struct Object_tt
{
@@ -47,6 +47,16 @@
} Object_t;
+typedef struct _CSRSS_HANDLE
+{
+Object_t *Object;
+DWORD Access;
+BOOL Inheritable;
+DWORD ShareMode;
+} CSRSS_HANDLE, *PCSRSS_HANDLE;
+
+
+
/* alias.c */
CSR_API(SrvAddConsoleAlias);
CSR_API(SrvGetConsoleAlias);
@@ -56,34 +66,31 @@
CSR_API(SrvGetConsoleAliasExesLength);
/* coninput.c */
+CSR_API(SrvGetConsoleInput);
+CSR_API(SrvWriteConsoleInput);
CSR_API(SrvReadConsole);
-CSR_API(CsrReadInputEvent);
CSR_API(SrvFlushConsoleInputBuffer);
CSR_API(SrvGetConsoleNumberOfInputEvents);
-CSR_API(SrvGetConsoleInput);
-CSR_API(SrvWriteConsoleInput);
/* conoutput.c */
+CSR_API(SrvReadConsoleOutput);
+CSR_API(SrvWriteConsoleOutput);
+CSR_API(SrvReadConsoleOutputString);
+CSR_API(SrvWriteConsoleOutputString);
+CSR_API(SrvFillConsoleOutput);
CSR_API(SrvWriteConsole);
-CSR_API(SrvGetConsoleScreenBufferInfo);
-CSR_API(SrvSetConsoleCursor);
-CSR_API(CsrWriteConsoleOutputChar);
-CSR_API(CsrFillOutputChar);
-CSR_API(CsrWriteConsoleOutputAttrib);
-CSR_API(CsrFillOutputAttrib);
+CSR_API(SrvSetConsoleCursorPosition);
CSR_API(SrvGetConsoleCursorInfo);
CSR_API(SrvSetConsoleCursorInfo);
-CSR_API(CsrSetTextAttrib);
+CSR_API(SrvSetConsoleTextAttribute);
CSR_API(SrvCreateConsoleScreenBuffer);
+CSR_API(SrvGetConsoleScreenBufferInfo);
CSR_API(SrvSetConsoleActiveScreenBuffer);
-CSR_API(SrvWriteConsoleOutput);
CSR_API(SrvScrollConsoleScreenBuffer);
-CS
[ros-diffs] [hbelusca] 57687: [CONSRV] Code formatting only.
Author: hbelusca
Date: Wed Nov 7 21:16:09 2012
New Revision: 57687
URL: http://svn.reactos.org/svn/reactos?rev=57687&view=rev
Log:
[CONSRV]
Code formatting only.
Modified:
branches/ros-csrss/win32ss/user/consrv/tuiconsole.c
Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/tuiconsole.c?rev=57687&r1=57686&r2=57687&view=diff
==
--- branches/ros-csrss/win32ss/user/consrv/tuiconsole.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/tuiconsole.c [iso-8859-1] Wed Nov 7
21:16:09 2012
@@ -310,7 +310,7 @@
}
DWORD WINAPI
-TuiConsoleThread (PVOID Data)
+TuiConsoleThread(PVOID Data)
{
PCSRSS_CONSOLE Console = (PCSRSS_CONSOLE) Data;
HWND NewWindow;
@@ -384,7 +384,7 @@
Console->ActiveBuffer->MaxX = PhysicalConsoleSize.X;
Console->ActiveBuffer->MaxY = PhysicalConsoleSize.Y;
-ThreadHandle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)
TuiConsoleThread,
+ThreadHandle = CreateThread(NULL, 0,
(LPTHREAD_START_ROUTINE)TuiConsoleThread,
Console, 0, NULL);
if (NULL == ThreadHandle)
{
[ros-diffs] [hbelusca] 57688: [BASESRV] - Comment some code and correct the DllMain prototype. No functional changes though.
Author: hbelusca
Date: Wed Nov 7 22:08:38 2012
New Revision: 57688
URL: http://svn.reactos.org/svn/reactos?rev=57688&view=rev
Log:
[BASESRV]
- Comment some code and correct the DllMain prototype. No functional changes
though.
Modified:
branches/ros-csrss/subsystems/win/basesrv/init.c
Modified: branches/ros-csrss/subsystems/win/basesrv/init.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesrv/init.c?rev=57688&r1=57687&r2=57688&view=diff
==
--- branches/ros-csrss/subsystems/win/basesrv/init.c [iso-8859-1] (original)
+++ branches/ros-csrss/subsystems/win/basesrv/init.c [iso-8859-1] Wed Nov 7
22:08:38 2012
@@ -506,7 +506,7 @@
LoadedServerDll->SharedSection = BaseStaticServerData;
}
-
+/*
VOID WINAPI BaseStaticServerThread(PVOID x)
{
// NTSTATUS Status = STATUS_SUCCESS;
@@ -523,11 +523,11 @@
{
default:
Reply = Request;
-/* Status =*/ NtReplyPort(BaseApiPort, Reply);
+/\* Status =*\/ NtReplyPort(BaseApiPort, Reply);
break;
}
}
-
+*/
CSR_SERVER_DLL_INIT(ServerDllInitialization)
{
@@ -565,7 +565,7 @@
BOOL
NTAPI
-DllMain(IN HANDLE hDll,
+DllMain(IN HINSTANCE hInstanceDll,
IN DWORD dwReason,
IN LPVOID lpReserved)
{
@@ -574,7 +574,7 @@
if (DLL_PROCESS_ATTACH == dwReason)
{
-DllHandle = hDll;
+DllHandle = hInstanceDll;
}
else if (DLL_PROCESS_DETACH == dwReason)
{
[ros-diffs] [hbelusca] 57689: [CONSRV] - Use the DLL instance for getting its win23 resources. - Use the CONSOLE_PROCESS_DATA structure (see r57686) for accessing console-specific fields of the proces
Author: hbelusca
Date: Wed Nov 7 22:23:36 2012
New Revision: 57689
URL: http://svn.reactos.org/svn/reactos?rev=57689&view=rev
Log:
[CONSRV]
- Use the DLL instance for getting its win23 resources.
- Use the CONSOLE_PROCESS_DATA structure (see r57686) for accessing
console-specific fields of the processes (instead of using them implemented in
the CSR_PROCESS structure).
- Win32CsrDuplicateHandleTable --> ConsoleNewProcess since it's the callback
function called when a new process is created, and start to move some hacks
currently present in BaseSrvCreateProcess.
TODO: suppress the starting-application-related hacks in BaseSrvCreateProcess
(in basesrv).
Modified:
branches/ros-csrss/win32ss/user/consrv/guiconsole.c
branches/ros-csrss/win32ss/user/consrv/handle.c
branches/ros-csrss/win32ss/user/consrv/lineinput.c
Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/guiconsole.c?rev=57689&r1=57688&r2=57689&view=diff
==
--- branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] Wed Nov 7
22:23:36 2012
@@ -130,13 +130,12 @@
UINT i = 0;
WCHAR szMenuString[255];
HMENU hSubMenu;
-HINSTANCE hInst = GetModuleHandleW(L"win32csr");
do
{
if (Items[i].uID != (UINT)-1)
{
-if (LoadStringW(hInst,
+if (LoadStringW(ConSrvDllInstance,
Items[i].uID,
szMenuString,
sizeof(szMenuString) / sizeof(szMenuString[0])) >
0)
@@ -406,15 +405,16 @@
GuiConsoleWriteUserSettings(PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData)
{
HKEY hKey;
-PCSR_PROCESS ProcessData;
+PCONSOLE_PROCESS_DATA ProcessData;
if (Console->ProcessList.Flink == &Console->ProcessList)
{
DPRINT("GuiConsoleWriteUserSettings: No Process!!!\n");
return;
}
-ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink, CSR_PROCESS,
ConsoleLink);
-if (!GuiConsoleOpenUserSettings(GuiData,
PtrToUlong(ProcessData->ClientId.UniqueProcess), &hKey, KEY_READ | KEY_WRITE,
TRUE))
+
+ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink,
CONSOLE_PROCESS_DATA, ConsoleLink);
+if (!GuiConsoleOpenUserSettings(GuiData,
PtrToUlong(ProcessData->Process->ClientId.UniqueProcess), &hKey, KEY_READ |
KEY_WRITE, TRUE))
{
return;
}
@@ -703,7 +703,7 @@
HFONT OldFont;
TEXTMETRICW Metrics;
SIZE CharSize;
-PCSR_PROCESS ProcessData;
+PCONSOLE_PROCESS_DATA ProcessData;
HKEY hKey;
Console->hWindow = hWnd;
@@ -717,8 +717,8 @@
GuiConsoleUseDefaults(Console, GuiData, Console->ActiveBuffer);
if (Console->ProcessList.Flink != &Console->ProcessList)
{
-ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink,
CSR_PROCESS, ConsoleLink);
-if (GuiConsoleOpenUserSettings(GuiData,
PtrToUlong(ProcessData->ClientId.UniqueProcess), &hKey, KEY_READ, FALSE))
+ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink,
CONSOLE_PROCESS_DATA, ConsoleLink);
+if (GuiConsoleOpenUserSettings(GuiData,
PtrToUlong(ProcessData->Process->ClientId.UniqueProcess), &hKey, KEY_READ,
FALSE))
{
GuiConsoleReadUserSettings(hKey, Console, GuiData,
Console->ActiveBuffer);
RegCloseKey(hKey);
@@ -801,7 +801,7 @@
SetEvent(GuiData->hGuiInitEvent);
-return (BOOL) DefWindowProcW(hWnd, WM_NCCREATE, 0, (LPARAM) Create);
+return (BOOL)DefWindowProcW(hWnd, WM_NCCREATE, 0, (LPARAM)Create);
}
static VOID
@@ -1276,7 +1276,7 @@
PCSRSS_CONSOLE Console;
PGUI_CONSOLE_DATA GuiData;
PLIST_ENTRY current_entry;
-PCSR_PROCESS current;
+PCONSOLE_PROCESS_DATA current;
GuiConsoleGetDataPointers(hWnd, &Console, &GuiData);
@@ -1285,7 +1285,7 @@
current_entry = Console->ProcessList.Flink;
while (current_entry != &Console->ProcessList)
{
-current = CONTAINING_RECORD(current_entry, CSR_PROCESS, ConsoleLink);
+current = CONTAINING_RECORD(current_entry, CONSOLE_PROCESS_DATA,
ConsoleLink);
current_entry = current_entry->Flink;
/* FIXME: Windows will wait up to 5 seconds for the thread to exit.
@@ -2194,7 +2194,7 @@
wc.lpszClassName = L"Win32CsrCreateNotify";
wc.lpfnWndProc = GuiConsoleNotifyWndProc;
wc.style = 0;
-wc.hInstance = (HINSTANCE) GetModuleHandleW(NULL);
+wc.hInstance = (HINSTANCE)GetModuleHandleW(NULL);
wc.hIcon = NULL;
wc.hCursor = NULL;
wc.hbrBackground = NULL;
@@ -2212,14 +2212,14 @@
wc.lpszClassName = L"C
[ros-diffs] [hbelusca] 57690: Synchronize up to trunk's revision r57689.
Author: hbelusca Date: Wed Nov 7 23:07:18 2012 New Revision: 57690 URL: http://svn.reactos.org/svn/reactos?rev=57690&view=rev Log: Synchronize up to trunk's revision r57689. Added: branches/ros-csrss/dll/win32/netapi32/netapi32.h - copied unchanged from r57689, trunk/reactos/dll/win32/netapi32/netapi32.h Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/Doxyfile branches/ros-csrss/base/shell/explorer/desktop/desktop.cpp branches/ros-csrss/base/shell/explorer/desktop/desktop.h branches/ros-csrss/base/shell/explorer/shell/shellbrowser.cpp branches/ros-csrss/base/shell/explorer/shell/shellbrowser.h branches/ros-csrss/base/shell/explorer/utility/window.cpp branches/ros-csrss/base/shell/explorer/utility/window.h branches/ros-csrss/boot/bootdata/hivesys_amd64.inf branches/ros-csrss/boot/bootdata/hivesys_i386.inf branches/ros-csrss/dll/ntdll/rtl/version.c branches/ros-csrss/dll/win32/advapi32/advapi32.h branches/ros-csrss/dll/win32/advapi32/sec/sid.c branches/ros-csrss/dll/win32/kernel32/client/version.c branches/ros-csrss/dll/win32/netapi32/CMakeLists.txt branches/ros-csrss/dll/win32/netapi32/local_group.c branches/ros-csrss/dll/win32/netapi32/netapi32.c branches/ros-csrss/dll/win32/netapi32/netapi32.spec branches/ros-csrss/dll/win32/samsrv/samrpc.c branches/ros-csrss/lib/rtl/version.c branches/ros-csrss/ntoskrnl/mm/ARM3/procsup.c branches/ros-csrss/ntoskrnl/rtl/misc.c branches/ros-csrss/win32ss/CMakeLists.txt branches/ros-csrss/win32ss/gdi/gdi32/CMakeLists.txt branches/ros-csrss/win32ss/include/ntuser.h branches/ros-csrss/win32ss/include/ntusrtyp.h branches/ros-csrss/win32ss/user/ntuser/class.c branches/ros-csrss/win32ss/user/ntuser/class.h branches/ros-csrss/win32ss/user/ntuser/cursoricon.c branches/ros-csrss/win32ss/user/ntuser/cursoricon.h branches/ros-csrss/win32ss/user/ntuser/cursoricon_new.c branches/ros-csrss/win32ss/user/ntuser/simplecall.c branches/ros-csrss/win32ss/user/user32/CMakeLists.txt branches/ros-csrss/win32ss/user/user32/controls/edit.c branches/ros-csrss/win32ss/user/user32/windows/cursoricon_new.c branches/ros-csrss/win32ss/user/user32/windows/dialog.c branches/ros-csrss/win32ss/user/user32/windows/mdi.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/Doxyfile URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/Doxyfile?rev=57690&r1=57689&r2=57690&view=diff Modified: branches/ros-csrss/base/shell/explorer/desktop/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer/desktop/desktop.cpp?rev=57690&r1=57689&r2=57690&view=diff Modified: branches/ros-csrss/base/shell/explorer/desktop/desktop.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer/desktop/desktop.h?rev=57690&r1=57689&r2=57690&view=diff Modified: branches/ros-csrss/base/shell/explorer/shell/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer/shell/shellbrowser.cpp?rev=57690&r1=57689&r2=57690&view=diff Modified: branches/ros-csrss/base/shell/explorer/shell/shellbrowser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer/shell/shellbrowser.h?rev=57690&r1=57689&r2=57690&view=diff Modified: branches/ros-csrss/base/shell/explorer/utility/window.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer/utility/window.cpp?rev=57690&r1=57689&r2=57690&view=diff Modified: branches/ros-csrss/base/shell/explorer/utility/window.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer/utility/window.h?rev=57690&r1=57689&r2=57690&view=diff Modified: branches/ros-csrss/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesys_amd64.inf?rev=57690&r1=57689&r2=57690&view=diff Modified: branches/ros-csrss/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesys_i386.inf?rev=57690&r1=57689&r2=57690&view=diff Modified: branches/ros-csrss/dll/ntdll/rtl/version.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/rtl/version.c?rev=57690&r1=57689&r2=57690&view=diff Modified: branches/ros-csrss/dll/win32/advapi32/advapi32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/advapi32/advapi32.h?rev=57690&r1=57689&r2=57690&view=diff Modified: branches/ros-csrss/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/advapi32/sec/sid.c?rev=57690&r1=57689&r2=57690&view=diff Modified: branches/ros-csrss/dll/win32/kernel32/client/version.c URL: http://svn.reactos.org/svn/reactos/bra
