[greatlrd] 28057: adding win32ksys the syscall lib for win32k waring type make clean, delete makefile.auto make clean does not delete the gdi32/misc/i386 delete that folder and need delete it u self make clean does not delete the user32/misc/i386 delete that folder and need delete it u self
31 Jul
2007
31 Jul
'07
9:38 p.m.
Author: greatlrd
Date: Wed Aug 1 01:38:52 2007
New Revision: 28057
URL: http://svn.reactos.org/svn/reactos?rev=28057&view=rev
Log:
adding win32ksys the syscall lib for win32k
waring
type make clean,
delete makefile.auto
make clean does not delete the gdi32/misc/i386 delete that folder and need delete it u
self
make clean does not delete the user32/misc/i386 delete that folder and need delete it u
self
Added:
trunk/reactos/lib/win32ksys/
trunk/reactos/lib/win32ksys/win32ksys.rbuild (with props)
Modified:
trunk/reactos/dll/win32/gdi32/gdi32.rbuild
trunk/reactos/dll/win32/user32/user32.rbuild
trunk/reactos/lib/lib.rbuild
trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c
trunk/reactos/tools/nci/nci.mak
Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original)
+++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Wed Aug 1 01:38:52 2007
@@ -9,6 +9,8 @@
<library>ntdll</library>
<library>kernel32</library>
<library>advapi32</library>
+ <library>win32ksys</library>
+
<directory name="include">
<pch>precomp.h</pch>
</directory>
@@ -22,22 +24,7 @@
<file>stubs.c</file>
<file>stubsa.c</file>
<file>stubsw.c</file>
- <file>wingl.c</file>
- <if property="ARCH" value="i386">
- <directory name="i386">
- <file>win32k.S</file>
- </directory>
- </if>
- <if property="ARCH" value="powerpc">
- <directory name="powerpc">
- <file>win32k.S</file>
- </directory>
- </if>
- <if property="ARCH" value="mips">
- <directory name="mips">
- <file>win32k.S</file>
- </directory>
- </if>
+ <file>wingl.c</file>
</directory>
<directory name="objects">
<file>bitmap.c</file>
Modified: trunk/reactos/dll/win32/user32/user32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb…
==============================================================================
--- trunk/reactos/dll/win32/user32/user32.rbuild (original)
+++ trunk/reactos/dll/win32/user32/user32.rbuild Wed Aug 1 01:38:52 2007
@@ -15,6 +15,8 @@
<library>kernel32</library>
<library>advapi32</library>
<library>imm32</library>
+ <library>win32ksys</library>
+
<directory name="include">
<pch>user32.h</pch>
</directory>
@@ -46,21 +48,6 @@
<file>winhelp.c</file>
<file>winsta.c</file>
<file>wsprintf.c</file>
- <if property="ARCH" value="i386">
- <directory name="i386">
- <file>win32k.S</file>
- </directory>
- </if>
- <if property="ARCH" value="powerpc">
- <directory name="powerpc">
- <file>win32k.S</file>
- </directory>
- </if>
- <if property="ARCH" value="mips">
- <directory name="mips">
- <file>win32k.S</file>
- </directory>
- </if>
</directory>
<directory name="windows">
<file>accel.c</file>
Modified: trunk/reactos/lib/lib.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.rbuild?rev=28057&a…
==============================================================================
--- trunk/reactos/lib/lib.rbuild (original)
+++ trunk/reactos/lib/lib.rbuild Wed Aug 1 01:38:52 2007
@@ -40,5 +40,9 @@
<directory name="smlib">
<xi:include href="smlib/smlib.rbuild" />
</directory>
+ <directory name="win32ksys">
+ <xi:include href="win32ksys/win32ksys.rbuild" />
+ </directory>
+
</group>
Added: trunk/reactos/lib/win32ksys/win32ksys.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/win32ksys/win32ksys.rb…
==============================================================================
--- trunk/reactos/lib/win32ksys/win32ksys.rbuild (added)
+++ trunk/reactos/lib/win32ksys/win32ksys.rbuild Wed Aug 1 01:38:52 2007
@@ -1,0 +1,22 @@
+<module name="win32ksys" type="staticlibrary">
+ <define name="_DISABLE_TIDENTS" />
+ <define name="__REACTOS__" />
+ <define name="__USE_W32API" />
+
+ <if property="ARCH" value="i386">
+ <directory name="i386">
+ <file>win32k.S</file>
+ </directory>
+ </if>
+ <if property="ARCH" value="powerpc">
+ <directory name="powerpc">
+ <file>win32k.S</file>
+ </directory>
+ </if>
+ <if property="ARCH" value="mips">
+ <directory name="mips">
+ <file>win32k.S</file>
+ </directory>
+ </if>
+
+</module>
Propchange: trunk/reactos/lib/win32ksys/win32ksys.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win…
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Wed Aug 1 01:38:52 2007
@@ -139,8 +139,8 @@
hSubMenu = CreatePopupMenu();
if (hSubMenu != NULL)
{
- GuiConsoleAppendMenuItems(hSubMenu,
- Items[i].SubMenu);
+ /*GuiConsoleAppendMenuItems(hSubMenu,
+ Items[i].SubMenu);*/
if (!AppendMenuW(hMenu,
MF_STRING | MF_POPUP,
@@ -148,6 +148,7 @@
szMenuString))
{
DestroyMenu(hSubMenu);
+ DPRINT1("DestroyMenu \n");
}
}
}
@@ -179,8 +180,13 @@
FALSE);
if (hMenu != NULL)
{
+ DPRINT1("adding menu\n");
GuiConsoleAppendMenuItems(hMenu,
GuiConsoleMainMenuItems);
+ }
+ else
+ {
+ DPRINT1("This should never happen, GetSystemMenu == NULL \n");
}
}
@@ -236,10 +242,12 @@
RtlFreeUnicodeString(&SidName);
CloseHandle(hProcessToken);
- if (hProcHandle)
- *hProcHandle = hProcess;
- else
- CloseHandle(hProcess);
+ CloseHandle(hProcess);
+
+ //if (hProcHandle)
+ // *hProcHandle = hProcess;
+ //else
+ // CloseHandle(hProcess);
if (res != ERROR_SUCCESS)
return FALSE;
@@ -276,21 +284,26 @@
DPRINT("GuiConsoleOpenUserSettings entered\n");
+ DPRINT1("ProcessId %d\n",ProcessId);
+
if (!GuiConsoleOpenUserRegistryPathPerProcessId(ProcessId, &hProcess, &hKey,
samDesired))
{
- DPRINT("GuiConsoleOpenUserRegistryPathPerProcessId failed\n");
+ DPRINT1("GuiConsoleOpenUserRegistryPathPerProcessId failed\n");
return FALSE;
}
+
+ hProcess = OpenProcess( PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, ProcessId
);
+
/* FIXME we do not getting the process name so no menu will be loading, why ?*/
fLength = GetProcessImageFileNameW(hProcess, szProcessName,
sizeof(GuiData->szProcessName) / sizeof(WCHAR));
CloseHandle(hProcess);
- //DPRINT1("szProcessName3 : %S\n",szProcessName);
+ DPRINT1("szProcessName3 : %S\n",szProcessName);
if (!fLength)
{
- DPRINT("GetProcessImageFileNameW failed(0x%x)ProcessId %d\n",
GetLastError(),hProcess);
+ DPRINT1("GetProcessImageFileNameW failed(0x%x)ProcessId %d\n",
GetLastError(),hProcess);
return FALSE;
}
/*
@@ -658,6 +671,8 @@
if (Console->ProcessList.Flink != &Console->ProcessList)
{
ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink, CSRSS_PROCESS_DATA,
ProcessEntry);
+ DPRINT1("PtrToUlong(ProcessData->ProcessId) ==
%d",PtrToUlong(ProcessData->ProcessId));
+
if (GuiConsoleOpenUserSettings(GuiData, PtrToUlong(ProcessData->ProcessId),
&hKey, KEY_READ, FALSE))
{
GuiConsoleReadUserSettings(hKey, Console, GuiData, Console->ActiveBuffer);
@@ -1263,13 +1278,20 @@
{
PCSRSS_CONSOLE Console;
PGUI_CONSOLE_DATA GuiData;
+ HMENU menu;
GuiConsoleGetDataPointers(hWnd, &Console, &GuiData);
KillTimer(hWnd, 1);
Console->PrivateData = NULL;
DeleteCriticalSection(&GuiData->Lock);
- GetSystemMenu(hWnd, TRUE);
+
+ menu = GetSystemMenu(hWnd, TRUE);
+ if (menu == NULL)
+ {
+ DPRINT1("This should never happen, GetSystemMenu == NULL \n");
+ }
+
if (GuiData->ConsoleLibrary)
FreeLibrary(GuiData->ConsoleLibrary);
Modified: trunk/reactos/tools/nci/nci.mak
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/nci.mak?rev=2805…
==============================================================================
--- trunk/reactos/tools/nci/nci.mak (original)
+++ trunk/reactos/tools/nci/nci.mak Wed Aug 1 01:38:52 2007
@@ -44,8 +44,9 @@
# WIN32K.SYS
WIN32K_SVC_DB = subsystems$(SEP)win32$(SEP)win32k$(SEP)w32ksvc.db
WIN32K_SERVICE_TABLE = subsystems$(SEP)win32$(SEP)win32k$(SEP)include$(SEP)napi.h
-WIN32K_GDI_STUBS = dll$(SEP)win32$(SEP)gdi32$(SEP)misc$(SEP)$(ARCH)$(SEP)win32k.S
-WIN32K_USER_STUBS = dll$(SEP)win32$(SEP)user32$(SEP)misc$(SEP)$(ARCH)$(SEP)win32k.S
+WIN32K_GDI_STUBS = lib$(SEP)win32ksys$(SEP)$(ARCH)$(SEP)win32k.S
+WIN32K_USER_STUBS = lib$(SEP)win32ksys$(SEP)$(ARCH)$(SEP)win32k.S
+
# NTOSKRNL.EXE
@@ -69,6 +70,7 @@
${mkdir} dll$(SEP)win32$(SEP)gdi32$(SEP)misc$(SEP)$(ARCH) 2>$(NUL)
${mkdir} dll$(SEP)win32$(SEP)user32$(SEP)misc$(SEP)$(ARCH) 2>$(NUL)
${mkdir} lib$(SEP)win32ksys$(SEP)$(ARCH) 2>$(NUL)
+
$(Q)$(NCI_TARGET) -arch $(ARCH) \
$(KERNEL_SVC_DB) \
$(WIN32K_SVC_DB) \
6257
days inactive
6257
days old
0 comments
1 participants
participants (1)
-
greatlrd＠svn.reactos.org