- Ros-dev - ReactOS.org

Problem drawing the desktop in the updated color
by Timo Kreuzer 10 Aug '06

10 Aug '06

Hi, First, this is going to be a long post, sorry ;-) You might have noticed, that I have been working on the desk.cpl appearance tab, wich is working partly. Here's the first version: http://www.reactos.org/bugzilla/show_bug.cgi?id=1732 Some things still don't work. For example the desktop doesn't get repainted in the new color. > ------- /Comment #5 > <http://www.reactos.org/bugzilla/show_bug.cgi?id=1732#c5> >From > jimtabor 2006-08-05 04:46:36 CET / [reply > <http://www.reactos.org/bugzilla/show_bug.cgi?id=1732#add_comment>] > ------- > Hi, > You can use WM_SYSCOLORCHANGE in the desktop proc if it is used, should be!, > user32/misc/desktop.c; > > static > LRESULT > WINAPI > DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) > { > DPRINT1("Desktop Class Atom!\n"); > switch(message) > { > case WM_NCCREATE: > return TRUE; > > case WM_CREATE: > /* when I spy I see notify */ > SendNotifyMessageW( hwnd, WM_SYSCOLORCHANGE , 0, 0 ); > break; > > case WM_SYSCOLORCHANGE: > /* update everything, well in theory anyway */ > RedrawWindow( hwnd, NULL, 0, RDW_INVALIDATE | RDW_ERASE | > RDW_ALLCHILDREN ); > break; > > default: > return DefWindowProcW(hwnd,message,wParam,lParam); > } > return 0; /* all other messages are ignored */ > } > > Its crude, I'm not sure if it will compile, its off the top of my head ATM. > 8^D > Thanks, > James > Thanks for helping, James. I tried it, but it doesn't work. 1.) Sending WM_SYSCOLORCHANGE on WM_CREATE will probably do nothing, because the desktop has just been created with the initial SysColors, no need to update them. 2.) RedrawWindow calls NtUserRedrawWindow wich calls co_UserRedrawWindow wich calls co_IntPaintWindows wich sends a WM_PAINT message to the desktop window. WM_PAINT is then passed to DefWindowProc and passed on to User32DefWindowProc wich does only repaint the icon as it seems. So WM_PAINT must be evaluated in DesktopWndProc. I tried the following: > case WM_PAINT: > { > PAINTSTRUCT ps; > HDC hdc = BeginPaint(hwnd, &ps); > PaintDesktop(hdc); > EndPaint(hwnd, &ps); > } PaintDesktop calls NtUserPaintDesktop, wich then paints the desktop. I have also replaced DesktopBrush = (HBRUSH)UserGetClassLongPtr(WndDesktop->Class, GCL_HBRBACKGROUND, FALSE); with DesktopBrush = IntGetSysColorBrush(COLOR_BACKGROUND); But the desktop is still painted in the original color, whereas the icon text is in the color I have set in the registry. I played a little around with the code in NtUserPaintDesktop. I added the following code before the desktop background is painted: > if (IntGetSysColor(COLOR_BACKGROUND) == 0) // This is true after > SysColors are loaded from Registry > { > DesktopBrush = IntGetSysColorBrush(COLOR_ACTIVECAPTION); > } And suddenly the desktop is painted in COLOR_ACTIVECAPTION. This is strange, because I also added CreateSysColorObjects(); at the beginning of NtUserPaintDesktop. Anybody any idea?

4 8

Re: [ros-dev] [ros-diffs] [fireball] 23524: Force -fno-sibling-call-optimisation to every module's CFLAGs. This fixes *numerous* bugs (thanks to a bug in GCC itself), even in DBG=1 builds! Just an example, comctl32.dll doesn't crash anymore in LISTVIEW_Callback(). Thanks to Dmitriy Philippov (aka Shedon) for encountering the comctl32 bug and investigating it!
by Alex Ionescu 09 Aug '06

09 Aug '06

"Bugs? There's no bugs in GCC. GCC is perfect." "I've never encountered a bug in GCC that would have real-life effects, except a small one a long time ago" -- Best regards, Alex Ionescu Project Lead, TinyKRNL Kernel-Mode Software Design Engineer, ReactOS

1 0

Re: [ros-dev] [ros-bugs] [Bug 1743] The MOVEFILE_DELAY_UNTIL_REBOOT flag is incorrect processed in the MoveFileWithProgressW function
by Brandon Turner 08 Aug '06

08 Aug '06

ReactOS.Bugzilla(a)reactos.org wrote: > http://www.reactos.org/bugzilla/show_bug.cgi?id=1743 > > > shedon(a)mail.ru changed: > > What |Removed |Added > ---------------------------------------------------------------------------- > AssignedTo|ros-bugs(a)reactos.org |shedon(a)mail.ru > Status|NEW |ASSIGNED > > > > > ------- Comment #1 from shedon(a)mail.ru 2006-08-08 23:55 CET ------- > Created an attachment (id=1015) > --> (http://www.reactos.org/bugzilla/attachment.cgi?id=1015&action=view) > The patch for this bug > > > I just skimmed the patch, but this: - DPRINT("MoveFileWithProgressW()\n"); + DPRINT1("MoveFileWithProgressW()\n"); probably isnt a good idea. -- Brandon Turner turnerb7(a)msu.edu http://www.amateurgramming.com 810-516-6236

1 0

Revision 23521 - Infinite loop in CreateProcessW
by Hervé Poussineau 08 Aug '06

08 Aug '06

Hi, I've an (mostly) infinite loop in CreateProcessW, probably due to a bug in ntdll/loader/utils.c or in kernel APCs. To reproduce: - Download revision >= 23433 - Enable the call to StartService in base/system/winlogon/winlogon.c:StartCustomService This call leads to base/system/services/database.c:ScmStartUserModeService, which calls CreateProcessW The debug log is: (KERNEL32:dll\win32\kernel32\process\create.c:679) CreateProcessW: lpApplicationName: <NULL> lpCommandLine: lsass.exe lp Environment: 00000000 lpCurrentDirectory: <NULL> dwCreationFlags: 8 (ntoskrnl\ps\process.c:692) FIX PS SDs!! (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 00B50000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 00C2B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 00407000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 00C57000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 00C80000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 010C0000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 0119B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 00411000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 011C7000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 011F0000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 01630000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 0170B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 00421000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 01737000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 01760000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 01BA0000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 01C7B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 01CA7000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 01CB0000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 01CD9000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 02120000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 021FB000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 01D04000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 02227000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 02250000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 02690000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 0276B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 02797000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 027A0000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 027C9000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 02C10000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 02CEB000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 027F4000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 02D17000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 02D40000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 03180000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 0325B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 03287000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 03290000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 032B9000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 03700000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 037DB000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 032E4000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 03807000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 03830000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 03C70000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 03D4B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 03D77000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 03D80000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 03DA9000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 041F0000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 042CB000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 03DD4000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 042F7000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 04320000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 04760000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 0483B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 04867000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 04870000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 04899000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 04CE0000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 04DBB000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 048C4000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 04DE7000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 04E10000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 05250000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 0532B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 05357000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 05360000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 05389000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 057D0000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 058AB000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 053B4000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 058D7000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 05900000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 05D40000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 05E1B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 05E47000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 05E50000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 05E79000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 062C0000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 0639B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 05EA4000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 063C7000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 063F0000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 06830000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 0690B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 06937000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 06940000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 06969000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 06DB0000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 06E8B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 06994000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 06EB7000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 06EE0000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 07320000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 073FB000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 07427000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 07430000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 07459000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 078A0000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 0797B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 07484000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 079A7000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 079D0000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 07E10000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 07EEB000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 07F17000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 07F20000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 07F49000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 08390000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 0846B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 07F74000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 08497000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 084C0000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 08900000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 089DB000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 08A07000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 08A10000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 08A39000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 08E80000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 08F5B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 08A64000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 08F87000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 08FB0000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 093F0000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 094CB000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 094F7000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 09500000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 09529000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 09970000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 09A4B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 09554000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 09A77000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 09AA0000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 09EE0000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 09FBB000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 09FE7000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 09FF0000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 0A019000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 0A460000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 0A53B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 0A044000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 0A567000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 0A590000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 0A9D0000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 0AAAB000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 0AAD7000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 0AAE0000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 0AB09000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 0AF50000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 0B02B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 0AB34000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 0B057000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 0B080000) C:\ReactOS\system32\advapi32.dll (ntoskrnl\ps\thread.c:500) FIX PS SDs!! (dll\ntdll\ldr\utils.c:2076) Relocating (7c800000 -> 0B4C0000) C:\ReactOS\system32\KERNEL32.dll (dll\ntdll\ldr\utils.c:2076) Relocating (78000000 -> 0B59B000) C:\ReactOS\System32\msvcrt.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76540000 -> 0B5C7000) C:\ReactOS\System32\lsasrv.dll (dll\ntdll\ldr\utils.c:2076) Relocating (76000000 -> 0B5D0000) C:\ReactOS\System32\rpcrt4.dll (dll\ntdll\ldr\utils.c:2076) Relocating (77dc0000 -> 0B5F9000) C:\ReactOS\system32\advapi32.dll (dll\ntdll\ldr\startup.c:485) Failed to initialize image (ntoskrnl\ke\kthread.c:406) Mutant: 80FD17D8. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 80FD8540. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 80FDF2B8. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 80FE6048. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 80FECE90. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 80FF3C20. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 80FFA980. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 810016F8. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 81008488. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 8100F218. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 81016028. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 8101CDB8. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 81023B80. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 8102A980. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 810317C8. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 810385C8. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 8103F390. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 81046120. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 8104CE98. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 81053C68. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 8105AA28. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 81061820. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 81068610. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 8106F3E8. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 81076190. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 8107CF30. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 81083CF8. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 8108AA80. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 810918A0. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 81098700. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 80FC2B88. Type, Size 2 8 (ntoskrnl\ke\kthread.c:406) Mutant: 80FCA9E8. Type, Size 2 8 See that kernel32.dll and others are loaded multiple times, and each time at a different address. I've no clue how to debug this. Anyone can take a look at it? Thanks in advance, Hervé

1 0

Re: [ros-dev] [ros-diffs] [ekohl] 23521: - Implement ScmStartServiceA and revert the last modification of StartServiceA. - Fix EnumServicesStatusExW.
by Hervé Poussineau 08 Aug '06

08 Aug '06

Hi, > Subject: [ros-diffs] [ekohl] 23521: > - Implement ScmStartServiceA and revert the last modification of StartServiceA. > - Fix EnumServicesStatusExW. We now have an exact code duplication between StartServiceA/StartServiceW (except strlen/wcslen and strcpy/wcscpy) and ScmrStartServiceA/ScmrStartServiceW. I don't think it's a good thing because we will have some problems to keep the code in sync. I did r23519 to prevent this code duplication and because ScmrStartServiceA() was not called except in StartServiceA. By the way, I also implemented argument conversion between ANSI and Unicode in StartServiceA before calling StartServiceW, which meant that arguments were ignored only in ScmrStartServiceW. Now, you have 2 places to take care of them (ScmrStartServiceA/W)... That was just to say my feeling... Hervé

1 0

Registry
by Timo Kreuzer 07 Aug '06

07 Aug '06

> Commit by *fireball* :: r*23508* *reactos*/ntoskrnl/ (cm/regobj.c > ob/obhandle.c): > > Goodbye REGISTRY_ERROR bsod! > > * Change UserMode -> KernelMode in ObReferenceObject*() calls, > because that calls failed > * Remove Cm-specific hack from Ob "advapi32_winetest.exe registry" > shows 0 failures on the first run and 2 failures on further > runs. I suppose there might be a leakage in the CM. To be > investigated further (or wait till complete Cm rewrite in October). > Still regedit crashes when trying to open a key that contains one or more values.

2 1

Re: [ros-dev] [ros-diffs] [fireball] 23508: Goodbye REGISTRY_ERROR bsod! - Change UserMode -> KernelMode in ObReferenceObject*() calls, because that calls failed - Remove Cm-specific hack from Ob "advapi32_winetest.exe registry" shows 0 failures on the first run and 2 failures on further runs. I suppose there might be a leakage in the CM. To be investigated further (or wait till complete Cm rewrite in October).
by Alex Ionescu 06 Aug '06

06 Aug '06

Hi, Alex-from-Texas here. WOW, that was awesome. I forgive you for comitting that satanic LDT "patch" because of this. Best regards, Alex Ionescu fireball(a)svn.reactos.org wrote: >Author: fireball >Date: Mon Aug 7 01:15:55 2006 >New Revision: 23508 > >URL: http://svn.reactos.org/svn/reactos?rev=23508&view=rev >Log: >Goodbye REGISTRY_ERROR bsod! > >- Change UserMode -> KernelMode in ObReferenceObject*() calls, because that calls failed >- Remove Cm-specific hack from Ob > >"advapi32_winetest.exe registry" shows 0 failures on the first run and 2 failures on further runs. >I suppose there might be a leakage in the CM. To be investigated further (or wait till complete Cm rewrite in October). > >Modified: > trunk/reactos/ntoskrnl/cm/regobj.c > trunk/reactos/ntoskrnl/ob/obhandle.c > >Modified: trunk/reactos/ntoskrnl/cm/regobj.c >URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… >============================================================================== >--- trunk/reactos/ntoskrnl/cm/regobj.c (original) >+++ trunk/reactos/ntoskrnl/cm/regobj.c Mon Aug 7 01:15:55 2006 >@@ -148,7 +148,7 @@ > ObReferenceObjectByPointer(FoundObject, > STANDARD_RIGHTS_REQUIRED, > CmiKeyType, >- UserMode); >+ KernelMode); > if (End != NULL) > { > *End = L'\\'; >@@ -790,7 +790,7 @@ > ObReferenceObjectByPointer(ParentKey, > STANDARD_RIGHTS_REQUIRED, > CmiKeyType, >- UserMode); >+ KernelMode); > NewKey->ParentKey = ParentKey; > } > > >Modified: trunk/reactos/ntoskrnl/ob/obhandle.c >URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… >============================================================================== >--- trunk/reactos/ntoskrnl/ob/obhandle.c (original) >+++ trunk/reactos/ntoskrnl/ob/obhandle.c Mon Aug 7 01:15:55 2006 >@@ -239,17 +239,8 @@ > /* Dereference the object as well */ > ASSERT(ObjectHeader->Type); > ASSERT(ObjectHeader->PointerCount != 0xCCCCCCCC); >- if (!wcscmp(ObjectHeader->Type->Name.Buffer, L"Key")) >- { >- // >- // WE DONT CLOSE REGISTRY HANDLES BECAUSE CM IS BRAINDEAD >- // >- DPRINT("NOT CLOSING THE KEY\n"); >- } >- else >- { >- ObDereferenceObject(Body); >- } >+ >+ ObDereferenceObject(Body); > > /* Return to caller */ > OBTRACE(OB_HANDLE_DEBUG, > > > >

1 0

Broken Build
by James Tabor 06 Aug '06

06 Aug '06

From http://reactos.dyndns.org:8010/ [CC] drivers\network\ndis\ndis\control.c drivers\network\ndis\ndis\control.c: In function `NdisAcquireReadWriteLock': drivers\network\ndis\ndis\control.c:63: warning: assignment makes integer from pointer without a cast make: *** [obj-i386\drivers\network\ndis\ndis\control.o] Error 1 program finished with exit code 2 From Linux, [CC] drivers/network/ndis/ndis/control.c drivers/network/ndis/ndis/control.c: In function `NdisAcquireReadWriteLock': drivers/network/ndis/ndis/control.c:63: warning: assignment makes integer from pointer without a cast make[1]: *** [obj-i386/drivers/network/ndis/ndis/control.o] Error 1 make: *** [ndis] Error 2 8^) James

2 1

Re: [ros-dev] [ros-diffs] [fireball] 23491: [AUDIT] Configuration Manager Cm part of the kernel was developed from scratch for a long time ago, and based only on legally clean information sources. After going through the code, it doesn't have any signs of questionable origin. Authorship information will be added during formatting of the code.
by Alex Ionescu 05 Aug '06

05 Aug '06

fireball(a)svn.reactos.org wrote: > Author: fireball > Date: Sun Aug 6 01:39:29 2006 > New Revision: 23491 > > URL: http://svn.reactos.org/svn/reactos?rev=23491&view=rev > Log: > [AUDIT] > Configuration Manager > > After going through the code, it doesn't have any signs of questionable origin. If it did, where are all those REGISTRY_ERROR bugchecks I should be getting in Windows NT? :P -- Best regards, Alex Ionescu Project Lead, TinyKRNL Kernel-Mode Software Design Engineer, ReactOS

1 0

Re: [ros-dev] [ros-diffs] [fireball] 23489: Fix DbgPrint / DbgPrintEx definitions to use PCCHAR instead of PCCH (recent WDK uses PCCHAR). This change fixes compiling.
by Alex Ionescu 05 Aug '06

05 Aug '06

fireball(a)svn.reactos.org wrote: > Author: fireball > Date: Sun Aug 6 00:57:36 2006 > New Revision: 23489 > > URL: http://svn.reactos.org/svn/reactos?rev=23489&view=rev > Log: > Fix DbgPrint / DbgPrintEx definitions to use PCCHAR instead of PCCH (recent WDK uses PCCHAR). > This change fixes compiling. > Um, no, this is the latest definition: ULONG __cdecl DbgPrint ( __in PCCH Format, ... ); Why do you think I had changed it in the first place?! A PCCHAR is *NOT* a const char, it's just typedef char*. So my change correctly changed the definition to use const char (Because dbgprint fails if you're not sending a const char), and also allowed building with the fixed WDKs, and you just reverted that... when you asked on Google Talk if you could fix it, I assumed you know what you were doing :) -- Best regards, Alex Ionescu Project Lead, TinyKRNL Kernel-Mode Software Design Engineer, ReactOS

1 0

WinLogon
by Alex Ionescu 05 Aug '06

05 Aug '06

Hi, I'm really excited by all the recent WinLogon work! Congratulations to Hervé for working on this. Some questions: Will the GINA be 100% compatible with NT WinLogon? I hope so. Also, there is a fully FOSS GINA project out there, I'm sure it can be useful. MSDN also has a lot of information, and I can help with some Winlogon internals, by email only please, I'm not and won't be on IRC for a while. Are we also going to support GUI-on-demand? That was largely the big problem with Winlogon, and both Thomas and I (And others) think GUI On Demand is a big hack that currently screws up more stuff then it helps... If yes, then how's winlogon going to work? As a text-mode login problem as well? Hopefully that won't hack GINA compatibility. Since this was supposed to be an SoC program, I propose that we setup a personal fund (and advertise) on the website for Hervé to get paid. I'll also try talking to Google (since our SoC GINA guy failed) to see if they'd be willing to set up an exchange. Unless Hervé disagrees, of course. Good luck to all. -- Best regards, Alex Ionescu Project Lead, TinyKRNL Kernel-Mode Software Design Engineer, ReactOS

6 7

Registry binary hives -- "problem"
by Aleksey Bragin 04 Aug '06

04 Aug '06

Hello, it looks like it is a common problem that people don't like to read commit messages :-) So I post here - starting from the introduction of cmlib patch into our tree, the binary hives became compatible with Windows XP binary hives, BUT incompatible to ReactOS binary hives made with the previous versions of ReactOS (this includes the current 0.3 release). In order to overcome this problem, simply reinstall your reactos with formatting the harddrive partition during setup. Or manually delete the contents of \system32\config directory, issue a "make install_registry" command, and don't forget to upgrade your freeldr.sys too (in case you install all that manually without bootcd). WBR, Aleksey Bragin.

1 0

Re: [ros-dev] CreateFile, typecasts and PICE loader
by Murphy, Ged (Bolton) 04 Aug '06

04 Aug '06

Felipe Villarroel wrote: > Its ok to typecast the char* to LPCWSTR? as in > file = CreateFile((LPCWSTR) SrcFileNames[i],GENERIC_READ , 0, > NULL, OPEN_EXISTING, 0, 0); ? No. If you wanted to use an ASCI where a Unicode char was expected, you would have to first convert it to Unicode using a function like MiltiByteToWideChar. However, CreateFile actually expects LPCTSTR as it's first parameter. It is then converted to LPCSTR or LPCWSTR dependant on whether you have Unicode defined. (In your case, you must have) If this is the case, and you are using TCHAR within your code, then what is the reason for the char? Maybe it's a value returned from a network read? Could it be a TCHAR? My first approach would be to see why it's a char, and not a TCHAR (or WCHAR), and check whether you can change it in the source (perhaps it's just something the PICE devs missed) Secondly, if it must remain a char, but you still want to have Unicode defined (as we mentioned, not having Unicode defined will call the ASCI version, which will be fine for your char as it's first member is LPSTR), then you could call the ASCI version of CreateFile exclusively by calling CreateFileA. > and also i have another question. Currently in the source > (main.c) we assume in line 368 that sizeof(DWORD) == > sizeof(INT) and the compiler issues a warning. Its ok to > typecast this too? > find_stab_sections(p,IMAGE_FIRST_SECTION(pNTHeaders),pNTHeader > s->FileHeader.NumberOfSections,&pStab,(PINT) > &nStabLen,&pStr,&nStabStrLen); I'm assuming from '(PINT)&nStabLen' that you have a DWORD which you are typecasting to an INT. Whilst a DWORD and an INT are of the same size, a DWORD is an unsigned long, and an INT is signed, which means typecasting from DWORD to INT could result in data loss if nStabLen is a very high value i.e. more than an INT can hold. (check your limits.h for this value, it's 2147483647 for 4 byte ints) Is making nStabLen a DWORD not an option? > Also, i'm a native spanish speaker. I would be happy to help > in anyway i could. Pop into IRC. There is always plenty for people to do ;) Ged.

1 0

CreateFile, typecasts and PICE loader
by Felipe Villarroel 04 Aug '06

04 Aug '06

Hi ReactOS devs!, currently i'm trying to get PICE compiling and working again (and learning something about the ReactOS internals in the process). Currently i have a question related to what i'm doing. To fix some warnings in the compilation of the PICE loader i have to fix the first parameter to CreateFile, because CreateFile expects the first parameter to be a LPCWSTR and its a char* instead. Its ok to typecast the char* to LPCWSTR? as in file = CreateFile((LPCWSTR) SrcFileNames[i],GENERIC_READ , 0, NULL, OPEN_EXISTING, 0, 0); ? and also i have another question. Currently in the source (main.c) we assume in line 368 that sizeof(DWORD) == sizeof(INT) and the compiler issues a warning. Its ok to typecast this too? find_stab_sections(p,IMAGE_FIRST_SECTION(pNTHeaders),pNTHeaders->FileHeader.NumberOfSections,&pStab,(PINT) &nStabLen,&pStr,&nStabStrLen); Well, thats all i have to say. Hmm, i forgot, thanks for all your hard work done in ReactOS!. I'm watching the project and the mailing list from 2000 onwards but i only speak if i need to say anything :). I always try to get people interested in this project, explaining to people what is and what its not. Also, i'm a native spanish speaker. I would be happy to help in anyway i could. thanks again for your great work, Best regards, Logan_V8 -- _______________________________________________ Check out the latest SMS services @ http://www.linuxmail.org This allows you to send and receive SMS through your mailbox. Powered by Outblaze

1 0

Re: [ros-dev] ReactOS presentations
by Murphy, Ged (Bolton) 03 Aug '06

03 Aug '06

Aleksey Bragin wrote: > We have a rather nice presentation done by Steven Edwards, I suggest we use it as a base. I've looked at Stevens in the past, but didn't think there was much in there we can use anymore. Also, whilst the theme was pretty, I think it could be made a little more professional. > Though we need something fresh and reworked too, because the Steven's one is already outdated in some parts > (ReactOS progressed quite a while since presentation were used last time). I agree, plus Stevens was aimed at a Wine audience, which also needs to be changed to a general audience. How about I put together a new base presentation and submit it to SVN once approved? An anyone interested in contributing to the presentation can then work through SVN. Ged.

3 2

ReactOS presentations
by Murphy, Ged (Bolton) 03 Aug '06

03 Aug '06

I have a few large presentations to give on ReactOS in September, and as a group we don't have any previous presentations stored. Although not a weekly event, a few of us do give presentations from time to time, which means we are probably going through the same process of compiling a presentation from scratch. So I was wondering if anyone was interested in putting our heads together and compiling a default presentation which we can use. This first default presentation should cover topics such as what ROS is and what it's goals are, and then move onto a description of the system, finalising with a short demonstration. As ROS grows, requests for us to give these sort of things will obviously grow too, including more detailed discussions on ROS internals. Therefore, as more specialised presentations are given, we could store these too, eventually offering a nice collection of presentations which we can pull out when a need arises. So, any volunteers? Ged.

4 3

Re: [ros-dev] Probelms with ZwOpenKey or RtlFormatCurrentUserKeyP ath?
by Murphy, Ged (Bolton) 02 Aug '06

02 Aug '06

Timo Kreuzer wrote: > This is the code: > > RtlFormatCurrentUserKeyPath(&CurrentUserKeyPath); > > InitializeObjectAttributes(&ObjectAttributes,&CurrentUserKeyPath,OBJ_CASE_IN SENSITIVE,NULL,NULL); > Status = ZwOpenKey(&CurrentUserKeyHandle, KEY_READ, &ObjectAttributes); > > And I always get Status == STATUS_OBJECT_NAME_NOT_FOUND What makes you sure ZwOpenKey is failing, and not one of the functions above it? You should use error checking where nessesary. Ged.

6 10

Re: [ros-dev] ReactOS presentations
by Murphy, Ged (Bolton) 02 Aug '06

02 Aug '06

WaxDragon wrote: > Maybe the first order of business would be picking a file format! Whenever I give presentations, whether it be at work, uni or a company I've never had anything other than MS PowerPoint available. I would say this is a must for a base format, and people can convert from this is need be. Ged.

3 2

Probelms with ZwOpenKey or RtlFormatCurrentUserKeyPath?
by Timo Kreuzer 02 Aug '06

02 Aug '06

Hi, I tried to read the Values of the SysColors from registry in win32k. But I get an error opening the CurrentUserKey. This is the code: RtlFormatCurrentUserKeyPath(&CurrentUserKeyPath); InitializeObjectAttributes(&ObjectAttributes,&CurrentUserKeyPath,OBJ_CASE_INSENSITIVE,NULL,NULL); Status = ZwOpenKey(&CurrentUserKeyHandle, KEY_READ, &ObjectAttributes); And I always get Status == STATUS_OBJECT_NAME_NOT_FOUND This is in trunk. Is there something wrong with my code or is there something wrong with Registry functions? Greetings, Timo

3 2

ReactOS Self Build System Crash
by James Tabor 02 Aug '06

02 Aug '06

http://reactos.dyndns.org:8010/ [PCH] obj-i386\base\applications\ibrowser\precomp.h.gch [CC] base\applications\ibrowser\utility\utility.cpp [CC] base\applications\ibrowser\utility\window.cpp [CC] base\applications\ibrowser\utility\xmlstorage.cpp base\applications\ibrowser\utility\xmlstorage.cpp:52: error: explicit qualification in declaration of `XMLStorage::XS_EMPTY' base\applications\ibrowser\utility\xmlstorage.cpp:53: error: explicit qualification in declaration of `XMLStorage::XS_TRUE' base\applications\ibrowser\utility\xmlstorage.cpp:54: error: explicit qualification in declaration of `XMLStorage::XS_FALSE' base\applications\ibrowser\utility\xmlstorage.cpp:55: error: explicit qualification in declaration of `XMLStorage::XS_INTFMT' base\applications\ibrowser\utility\xmlstorage.cpp:56: error: explicit qualification in declaration of `XMLStorage::XS_FLOATFMT' make: *** [obj-i386\base\applications\ibrowser\utility\xmlstorage.o] Error 1 Thanks, James

1 0

OpenOffice.org 2.0.3
by James Tabor 01 Aug '06

01 Aug '06

Hi, I just tested OOo 2.0.3, I get up to most of files are unzipping, then a pop up! "This package requires a newer version of the Windows Installed. Do you want to update the version of windows Installed on you system?" [Yes] [No] NO! 8^o I thought we had this fixed! BTW, I can install it under wine. James

2 1

[ros-diffs] [ekohl] 23376: Synchronize with current WINE widl 20060729.
by James Tabor 31 Jul '06

31 Jul '06

Hi, build is broken. sorry to find out like this, [CC] tools/widl/write_msft.c In file included from tools/widl/widltypes.h:25, from tools/widl/write_msft.c:48: include/reactos/wine/guiddef.h:48: warning: redefinition of `LPGUID' include/psdk/winnt.h:1545: warning: `LPGUID' previously declared here tools/widl/write_msft.c: In function `ctl2_find_name': tools/widl/write_msft.c:261: warning: implicit declaration of function `_strnicmp' [CC] tools/widl/parser.tab.c In file included from tools/widl/widltypes.h:25, from tools/widl/widl.h:24, from parser.y:36: include/reactos/wine/guiddef.h:48: warning: redefinition of `LPGUID' include/psdk/winnt.h:1545: warning: `LPGUID' previously declared here [CC] tools/widl/port/mkstemps.c [LD] output-i386/tools/widl/widl obj-i386/tools/widl/write_msft.o(.text+0x25c): In function `ctl2_find_name': : undefined reference to `_strnicmp' collect2: ld returned 1 exit status make: *** [output-i386/tools/widl/widl] Error 1 Thanks, James

3 3

Re: [ros-dev] 0.3.0 RC1 is out! (Need a wordcount)
by Murphy, Ged (Bolton) 31 Jul '06

31 Jul '06

Katarzyna Chauca wrote: > Couse MSCoder publishes in Spain, France and Germany but you > can write in english. Sorry, I thought it was an e-mag, I hadn't realise it was hard copy only. > As far as I know you have developers from all over the world > so I hope you will be interested in promote ReactOS in those > countries. As a collective group, we are certainly interested in promoting ROS in every country. > I saw one magazine from France with ReactOS so why you don't > want to cooperate with us? I assume that was written by a 3rd party author, not a ROS dev. I didn't say I don't want to cooperate, but I personally don't want to write a 10 page article for a magazine which I can't read. > I think that such proyects as ReactOS are for developers from > all countries. I agree, which is why I personally wouldn't want to write an article limited to those languages. However, this doesn't mean someone else won't, you've already had an offer from weird_w, who is a native English speaker. Have you ever considered an English release? It would open your magazine up to a much greater audience. As for the current status, you would probably have more success targeting ROS devs who's native language is one of the magazines published languages. If you popped into IRC, I could point out some of the culprits for you ;) > Will you please cooperate with us? Of course, my cooperation was never an issue, hence my replies to your past emails :) Ged.

4 4

Re: [ros-dev] 0.3.0 RC1 is out! (Need a wordcount)
by Murphy, Ged (Bolton) 31 Jul '06

31 Jul '06

Katarzyna Chauca wrote: > > Hi again > I have no confirmation if someone will write an article about > ReactOS for > MSCoder magazine. > Please let me know Is there a reason your website is only available in German, French and Spanish? I wouldn't want write an article for a magazine which followed the same pattern. Ged

2 1

0.3.0 RC1 is out! (Need a wordcount)
by Katarzyna Chauca 31 Jul '06

31 Jul '06

Hi again I have no confirmation if someone will write an article about ReactOS for MSCoder magazine. Please let me know Best Regards -- Katarzyna Chauca Market Manager www.mscoder.org/es www.hakin9.org/es

1 0

Possible NDIS problem?
by James Tabor 29 Jul '06

29 Jul '06

Hi, This could be from 23325 but I started to get this in 23228. Networking is lighting fast! I had the full ReactOS page less than a second! Once in a while I get this fault. Thanks, James (ntoskrnl/mm/mm.c:221) Page fault at high IRQL was 2, address c000009a Entered debugger on last-chance exception (Exception Code: 0xc0000005) (Page Fault) Memory at 0xC000009A could not be read: Page not present. kdb:> bt Eip: <fetnd5.sys:2296> Frames: <fetnd5.sys:2053> <00000002>

1 0

Same old Boot Stalling
by James Tabor 29 Jul '06

29 Jul '06

Real hardware, I think csrss is crashing. I think that was the problem the whole time, anyone have any ideas how to TS this problem? ReactOS 0.4-SVN (Build 20060710-r23002) Used memory 1015744Kb (ntoskrnl/cm/import.c:146) Adding new hive (ntoskrnl/cm/import.c:146) Adding new hive (0,8DBE08C8,36) (0,8DBE0658,36) (ntoskrnl/io/iomgr/driver.c:900) Driver 'buslogic.sys' load failed, status (c0000001) (ntoskrnl/ps/kill.c:815) PspTerminateThreadByPointer(81215748, 0) (ntoskrnl/ps/kill.c:341) PspExitThread(81215748, 0) (ntoskrnl/ps/kill.c:275) PspDeleteThread(Thread 81215748, Process 81005018) (ntoskrnl/ldr/loader.c:267) Could not open module file: \SystemRoot\system32\drivers\sndblst.sys (Status 0xc0000034) (ntoskrnl/ldr/loader.c:267) Could not open module file: \SystemRoot\system32\drivers\mpu401.sys (Status 0xc0000034) (ntoskrnl/ps/kill.c:963) NtTerminateProcess(ProcessHandle ffffffff, ExitStatus 0) (ntoskrnl/ps/kill.c:815) PspTerminateThreadByPointer(81272C68, 0) (ntoskrnl/ps/kill.c:341) PspExitThread(81272C68, 0) (ntoskrnl/ps/kill.c:894) PspExitProcess 813204B0 (ntoskrnl/ps/kill.c:275) PspDeleteThread(Thread 81272C68, Process 813204B0) (ntoskrnl/ps/kill.c:1068) NtTerminateThread: fffffffe 0 (ntoskrnl/ps/kill.c:815) PspTerminateThreadByPointer(81017018, 0) (ntoskrnl/ps/kill.c:341) PspExitThread(81017018, 0) (ntoskrnl/ps/kill.c:275) PspDeleteThread(Thread 81017018, Process 81013300) (ntoskrnl/ps/kill.c:1068) NtTerminateThread: fffffffe 0 (ntoskrnl/ps/kill.c:815) PspTerminateThreadByPointer(813BD100, 0) (ntoskrnl/ps/kill.c:341) PspExitThread(813BD100, 0) (base/system/winlogon/winlogon.c:173) WL: Failed to create lsass notification event (base/system/winlogon/winlogon.c:563) WL: Failed to start LSASS (0xA1) (base/system/winlogon/winlogon.c:764) WL-Status: ReactOS is starting up... (ntoskrnl/ps/kill.c:1068) NtTerminateThread: 0 0 (ntoskrnl/ps/kill.c:815) PspTerminateThreadByPointer(8182E798, 0) (ntoskrnl/ps/kill.c:341) PspExitThread(8182E798, 0) (ntoskrnl/ps/kill.c:275) PspDeleteThread(Thread 8182E798, Process 81810C98) (dll/win32/iphlpapi/ifenum_reactos.c:99) openTcpFile for <\Device\Tcp> failed: 0xc0000034 (dll/win32/iphlpapi/ifenum_reactos.c:99) openTcpFile for <\Device\Tcp> failed: 0xc0000034 (dll/win32/iphlpapi/ifenum_reactos.c:99) openTcpFile for <\Device\Tcp> failed: 0xc0000034 (./subsystems/win32/win32k/ntuser/input.c:219) Keyboard and Mouse TimeOut Starting Screen Saver ... (./subsystems/win32/win32k/ntuser/input.c:220) 18000000 Keyboard Timeout Value (./subsystems/win32/win32k/ntuser/input.c:221) 18000000 Mouse Timeout Value (./subsystems/win32/win32k/ntuser/input.c:222) 18000000 TimeOut (subsystems/win32/csrss/win32csr/conio.c:3356) CsrStartScreenSaver : FAIL J. (ntoskrnl/ps/kill.c:1068) NtTerminateThread: fffffffe 102 (ntoskrnl/ps/kill.c:815) PspTerminateThreadByPointer(813BD688, 102) (ntoskrnl/ps/kill.c:341) PspExitThread(813BD688, 102) (./subsystems/win32/win32k/ntuser/input.c:219) Keyboard and Mouse TimeOut Starting Screen Saver ... (./subsystems/win32/win32k/ntuser/input.c:220) 308400000 Keyboard Timeout Value (./subsystems/win32/win32k/ntuser/input.c:221) 308400000 Mouse Timeout Value (./subsystems/win32/win32k/ntuser/input.c:222) 308400000 TimeOut (subsystems/win32/csrss/win32csr/conio.c:3356) CsrStartScreenSaver : FAIL J.

3 8

desk.cpl appearance tab
by Timo Kreuzer 29 Jul '06

29 Jul '06

Hi, Some time ago, I thought about implementing the appearance tab of the desk.cpl, to allow some basic theming. This is what I've done so far: http://static.flickr.com/76/200954523_5f103460fd_o.png On win XP you can change and apply the colors correctly. Fonts / size is not yet implemented, nor loading of themes from the registry. But it doesn't work on ROS. On 0.3.0 RC1 the ColorPicker dialog doesn't work at all. On trunk you can at least change the color by editing the values. But they are not applied and either not saved to the registry (regedit always crashes) or not loaded from registry at startup. The color button on the background page doesn't work either. 1.) Is loading of syscolors from the registry already implemented? Is someone going to do it in the near future? 2.) How should storage of themes be done on ROS? Exactly the same way XP does it (Control Panel\Appearance\New Schemes\xx\...) or in a ROS specific way? On XP Scheme names are stored in themeui.dll, I think this is pretty complicated and is only needed for systems with users having different languages. Greetings, Timo

3 2

Quake and fun!
by James Tabor 26 Jul '06

26 Jul '06

I manage to get it to boot and play on the net with mozilla and play quake in demo mode and this bug check. Graphics mode was set to 32 bit 1024x7xx. (./subsystems/win32/win32k/ntuser/message.c:1107) Copy message to kernel from t8 (dll/win32/winmm/mci.c:900) Couldn't load driver for type L"CDAUDIO". If you don't have a windows installation accessible from Wine, you perhaps forgot to create a [mci] section in system.ini NPOOL: Low-side redzone overwritten, Block 8124d6c0, Size 4, Tag 656e6f4e(enoN)b KeBugCheck at ntoskrnl/mm/npool.c:1514 (ntoskrnl/mm/mm.c:221) Page fault at high IRQL was 2, address c5b62 (ntoskrnl/mm/mm.c:221) Page fault at high IRQL was 2, address 5c39 Entered debugger on last-chance exception (Exception Code: 0xc0000005) (Page Fa) (Look here, read on) Memory at 0x00005C39 could not be written: Page not present. kdb:> bt Eip: <ntoskrnl.exe:71d92 (ntoskrnl/ke/i386/v86m_sup.S:122 (KiV86Complete))> Frames: <ntoskrnl.exe:6cabe (ntoskrnl/ke/i386/bios.c:70 (Ke386CallBios))> <videoprt.sys:2722 (drivers/video/videoprt/int10.c:181 (IntInt10CallBios))> <vbemp.sys:1ae5 (drivers/video/miniport/vbe/vbemp.c:773 (VBEResetDevice))> <vbemp.sys:1b2f (drivers/video/miniport/vbe/vbemp.c:543 (VBEResetHw))> <videoprt.sys:1f26 (drivers/video/videoprt/dispatch.c:49 (IntVideoPortResetDisp> <8053881c> <ntoskrnl.exe:1bd6 (ntoskrnl/ke/bug.c:311 (KeBugCheckWithTf))> <ntoskrnl.exe:1d50 (ntoskrnl/ke/bug.c:493 (KeBugCheckEx))> <ntoskrnl.exe:1d67 (ntoskrnl/ke/bug.c:514 (KeBugCheck))> <ntoskrnl.exe:46b25 (ntoskrnl/mm/npool.c:1514 (check_redzone_header))> <ntoskrnl.exe:46c24 (ntoskrnl/mm/npool.c:1579 (ExFreeNonPagedPool))> <ntoskrnl.exe:5742b (ntoskrnl/ob/oblife.c:151 (ObpDeleteObject))> <ntoskrnl.exe:12a45 (ntoskrnl/cm/registry.c:296 (CmiWorkerThread))> <ntoskrnl.exe:63cd1 (ntoskrnl/ps/thread.c:126 (PspSystemThreadStartup))> <ntoskrnl.exe:6cb45 (ntoskrnl/ke/i386/ctxswitch.S:82 (KiThreadStartup))> kdb:>

1 0

BSOD during setup
by Christian Wallukat 24 Jul '06

24 Jul '06

Hi NG, first I want to say that it is a great project which I want to join… I develop since 5 years in C++, but I have only used M$ Dev Studio … - Is there anything that can I do for the team ? - Are there documents which describe the coding guidelines ? BTW: I have checked out the trunk and build the boot CD. During the setup I got a BSOD for information check the attached screenshot… The BSOD comes after the setup has copied the last file … Kr Christian -- No virus found in this outgoing message. Checked by AVG Free Edition. Version: 7.1.394 / Virus Database: 268.10.3/395 - Release Date: 21.07.2006

3 4

Re: [ros-dev] Broken RtlMultiByteToUnicodeSize
by Michele Cicciotti [Khamsa S.A.] 24 Jul '06

24 Jul '06

Myria wrote: > I personally think ReactOS should support UTF-8 as a default code page, but I doubt that others agree. This function is one of the many that would have to change... > I should warn you: setting UTF-8 as the default codepage instantly breaks all multibyte-aware code. How so you might wonder? UTF-8 is "multibyte", only not "Windows multibyte": it doesn't have lead bytes/trail bytes. Any code that parses multibyte strings needs a special case for UTF-8 (try it yourself. Set a console's codepage to UTF-8 and try to run a batch file). You can do it for code you write, but for code that has already been written...

1 0

Re: [ros-dev] [ros-diffs] [fireball] 23265: ReactOS Status Report July 2006 . If no major issues will be found, it's going to be published today
by Murphy, Ged (Bolton) 24 Jul '06

24 Jul '06

I've been looking forward to this :) Would you like a native speaker to provide suggestions for text and grammar improvements? -----Original Message----- From: fireball(a)svn.reactos.org [mailto:fireball@svn.reactos.org] Sent: 24 July 2006 14:10 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [fireball] 23265: ReactOS Status Report July 2006. If no major issues will be found, it's going to be published today Author: fireball Date: Mon Jul 24 17:10:18 2006 New Revision: 23265 URL: http://svn.reactos.org/svn/reactos?rev=23265&view=rev Log: ReactOS Status Report July 2006. If no major issues will be found, it's going to be published today Added: trunk/press-media/Status Reports/July 2006/ trunk/press-media/Status Reports/July 2006/ReactOS status report.doc (with props) Added: trunk/press-media/Status Reports/July 2006/ReactOS status report.doc URL: http://svn.reactos.org/svn/reactos/trunk/press-media/Status%20Reports/July%2 02006/ReactOS%20status%20report.doc?rev=23265&view=auto ============================================================================ == Binary file - no diff available. Propchange: trunk/press-media/Status Reports/July 2006/ReactOS status report.doc ---------------------------------------------------------------------------- -- svn:mime-type = application/octet-stream

1 0

Re: [ros-dev] 0.3.0 RC1 is out! (Need a wordcount)
by Wierd_w 24 Jul '06

24 Jul '06

10 pages is quite an order, but I will do my best. Can I get an approximate wordcount that you would be looking for? __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

3 2

Re: [ros-dev] 0.3.0 RC1 is out!
by Murphy, Ged (Bolton) 21 Jul '06

21 Jul '06

Brandon Turner wrote: > http://sourceforge.net/project/showfiles.php?group_id=6553&pac > kage_id=6629 > > I just released 0.3.0 RC1 to sourceforge. Enjoy. I'm going to bring this up again. It's been well over a month now since RC1 was released. What are we waiting for to get the final release out? IMO, we should get 0.3.0 out of the door and immediately branch for 0.3.1. More than enough work has been done to justify it. Ged.

5 7

Re: [ros-dev] 0.3.0 RC1 is out!
by Wierd_w 21 Jul '06

21 Jul '06

How long would you like the article to be? I have nothing better to do, since I finished my Catia class for this class cycle, and will be idleing until mid August. __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

2 1

Re: [ros-dev] [ros-diffs] [winesync] 23203: Autosyncing with Wine HEAD
by Murphy, Ged (Bolton) 21 Jul '06

21 Jul '06

I would prefer it if I could keep comctl32 up to date manually. I don't really trust the synching tool, I can see things it's done wrong with this merge already.... I'll try fixing it later tonight. -----Original Message----- From: winesync(a)svn.reactos.org [mailto:winesync@svn.reactos.org] Sent: 21 July 2006 12:30 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [winesync] 23203: Autosyncing with Wine HEAD Author: winesync Date: Fri Jul 21 15:30:20 2006 New Revision: 23203 URL: http://svn.reactos.org/svn/reactos?rev=23203&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (with props) Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comctl32/comctl_Bg.rc trunk/reactos/dll/win32/comctl32/comctl_Cn.rc trunk/reactos/dll/win32/comctl32/comctl_Cs.rc trunk/reactos/dll/win32/comctl32/comctl_De.rc trunk/reactos/dll/win32/comctl32/comctl_En.rc trunk/reactos/dll/win32/comctl32/comctl_Eo.rc trunk/reactos/dll/win32/comctl32/comctl_Es.rc trunk/reactos/dll/win32/comctl32/comctl_Fr.rc trunk/reactos/dll/win32/comctl32/comctl_Hu.rc trunk/reactos/dll/win32/comctl32/comctl_It.rc trunk/reactos/dll/win32/comctl32/comctl_Ja.rc trunk/reactos/dll/win32/comctl32/comctl_Ko.rc trunk/reactos/dll/win32/comctl32/comctl_Nl.rc trunk/reactos/dll/win32/comctl32/comctl_No.rc trunk/reactos/dll/win32/comctl32/comctl_Pl.rc trunk/reactos/dll/win32/comctl32/comctl_Pt.rc trunk/reactos/dll/win32/comctl32/comctl_Ru.rc trunk/reactos/dll/win32/comctl32/comctl_Si.rc trunk/reactos/dll/win32/comctl32/comctl_Sv.rc trunk/reactos/dll/win32/comctl32/comctl_Th.rc trunk/reactos/dll/win32/comctl32/comctl_Tr.rc trunk/reactos/dll/win32/comctl32/comctl_Uk.rc trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/trackbar.c Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32 .rbuild?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl32.rbuild (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.rbuild Fri Jul 21 15:30:20 2006 @@ -4,18 +4,19 @@ <include base="comctl32">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> + <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> <library>wine</library> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>winmm</library> + <library>uxtheme</library> <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>gdi32</library> - <library>user32</library> - <library>uxtheme</library> - <library>winmm</library> <file>animate.c</file> <file>comboex.c</file> <file>comctl32undoc.c</file> @@ -37,8 +38,8 @@ <file>propsheet.c</file> <file>rebar.c</file> <file>smoothscroll.c</file> + <file>status.c</file> <file>string.c</file> - <file>status.c</file> <file>syslink.c</file> <file>tab.c</file> <file>theme_combo.c</file> Added: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32 _ros.diff?rev=23203&view=auto ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (added) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Fri Jul 21 15:30:20 2006 @@ -1,0 +1,26 @@ +Index: comctl32.rbuild +=================================================================== +--- comctl32.rbuild (revision 23123) ++++ comctl32.rbuild (working copy) +@@ -1,4 +1,5 @@ + <module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true"> ++ <autoregister infsection="OleControlDlls" type="DllInstall" /> + <importlibrary definition="comctl32.spec.def" /> + <include base="comctl32">.</include> + <include base="ReactOS">include/reactos/wine</include> +Index: listview.c +=================================================================== +--- listview.c (revision 23123) ++++ listview.c (working copy) +@@ -3770,9 +3770,8 @@ + if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon)) + { + TRACE("iImage=%d\n", lvItem.iImage); ++ ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, ++ (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); +- ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, +- rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top, infoPtr->clrBk, CLR_DEFAULT, +- (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); + } + + /* Don't bother painting item being edited */ Propchange: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff ---------------------------------------------------------------------------- -- svn:eol-style = native Modified: trunk/reactos/dll/win32/comctl32/comctl_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_B g.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Bg.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Bg.rc Fri Jul 21 15:30:20 2006 @@ -22,7 +22,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ñâîéñòâà íà " +CAPTION "Ñâîéñòâà íà %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_C n.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Cn.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Cn.rc Fri Jul 21 15:30:20 2006 @@ -21,7 +21,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "ÊôÐÔ " +CAPTION "ÊôÐÔ %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "È·¶¨", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_C s.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Cs.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Cs.rc Fri Jul 21 15:30:20 2006 @@ -26,7 +26,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Vlastnosti " +CAPTION "Vlastnosti %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_D e.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_De.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_De.rc Fri Jul 21 15:30:20 2006 @@ -41,7 +41,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Eigenschaften für " +CAPTION "Eigenschaften für %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "&OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_E n.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_En.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_En.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Properties for " +CAPTION "Properties for %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_E o.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Eo.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Eo.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ecoj laý " +CAPTION "Ecoj laý %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Bone", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_E s.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Es.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Es.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propiedades de " +CAPTION "Propiedades de %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Aceptar", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_F r.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Fr.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Fr.rc Fri Jul 21 15:30:20 2006 @@ -24,7 +24,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propriétés pour " +CAPTION "Propriétés pour %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_H u.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Hu.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Hu.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Tulajdonságok: " +CAPTION "Tulajdonságok: %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_I t.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_It.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_It.rc Fri Jul 21 15:30:20 2006 @@ -21,7 +21,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Proprietà per " +CAPTION "Proprietà per %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_J a.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Ja.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Ja.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Properties for " +CAPTION "Properties for %s" FONT 9, "MS UI Gothic" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_K o.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Ko.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Ko.rc Fri Jul 21 15:30:20 2006 @@ -21,7 +21,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "¼Ó¼º" +CAPTION "%s ¼Ó¼º" FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "È®ÀÎ", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP @@ -54,11 +54,11 @@ FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "´Ý±â(&C)", IDCANCEL,308,6,44,14 - PUSHBUTTON "´Ù½Ã(&e)", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "´Ù½Ã(&E)", IDC_RESET_BTN,308,23,44,14 PUSHBUTTON "µµ¿ò¸»(&H)", IDC_HELP_BTN,308,40,44,14 PUSHBUTTON "À§·Î ÀÌµ¿(&U)", IDC_MOVEUP_BTN,308,74,44,14 PUSHBUTTON "¾Æ·¡·Î ÀÌµ¿(&D)", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "°¡´ÉÇÑ ¹öÆ°(&v)", -1,4,5,84,10 + LTEXT "°¡´ÉÇÑ ¹öÆ°(&V)", -1,4,5,84,10 LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "´õÇÏ±â(&A) ->", IDOK, 131, 42, 44, 14 PUSHBUTTON "<- Á¦°ÅÇÏ±â(&R)", IDC_REMOVE_BTN,131,62,44,14 @@ -81,3 +81,8 @@ { IDS_SEPARATOR "ºÐ¸®ÀÚ" } + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "¾øÀ½" +} Modified: trunk/reactos/dll/win32/comctl32/comctl_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_N l.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Nl.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Nl.rc Fri Jul 21 15:30:20 2006 @@ -22,7 +22,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Eigenschappen van " +CAPTION "Eigenschappen van %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_N o.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_No.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_No.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Egenskaper for " +CAPTION "Egenskaper for %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_P l.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Pl.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Pl.rc Fri Jul 21 15:30:20 2006 @@ -21,7 +21,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "W³aœciwoœci " +CAPTION "W³aœciwoœci %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_P t.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Pt.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Pt.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propriedades para " +CAPTION "Propriedades para %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_R u.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Ru.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Ru.rc Fri Jul 21 15:30:20 2006 @@ -22,7 +22,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ñâîéñòâà äëÿ " +CAPTION "Ñâîéñòâà äëÿ %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_S i.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Si.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Si.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Lastnosti" +CAPTION "Lastnosti %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "V redu", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_S v.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Sv.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Sv.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Egenskaper för " +CAPTION "Egenskaper för %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_T h.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Th.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Th.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "¤Ø³ÊÁºÑµÔ¢Í§ " +CAPTION "¤Ø³ÊÁºÑµÔ¢Í§ %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "µ¡Å§", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_T r.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Tr.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Tr.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Özellikler: " +CAPTION "Özellikler: %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Tamam", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_U k.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Uk.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Uk.rc Fri Jul 21 15:30:20 2006 @@ -22,7 +22,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Âëàñòèâîñò³ äëÿ " +CAPTION "Âëàñòèâîñò³ äëÿ %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listview .c?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/listview.c (original) +++ trunk/reactos/dll/win32/comctl32/listview.c Fri Jul 21 15:30:20 2006 @@ -3770,8 +3770,8 @@ if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon)) { TRACE("iImage=%d\n", lvItem.iImage); - ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, - (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); + ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, + (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); } /* Don't bother painting item being edited */ @@ -5617,9 +5617,11 @@ { POINT Position; LVITEMW lvItem; - INT nColumn = lprc->top; + INT nColumn; if (!lprc) return FALSE; + + nColumn = lprc->top; TRACE("(nItem=%d, nSubItem=%ld)\n", nItem, lprc->top); /* On WinNT, a subitem of '0' calls LISTVIEW_GetItemRect */ @@ -6274,7 +6276,13 @@ memcpy(&item, lpLVItem, offsetof( LVITEMW, iIndent )); } item.iItem = nItem; - if (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) item.state &= ~LVIS_STATEIMAGEMASK; + if (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) + { + item.mask |= LVIF_STATE; + item.stateMask |= LVIS_STATEIMAGEMASK; + item.state &= ~LVIS_STATEIMAGEMASK; + item.state |= INDEXTOSTATEIMAGEMASK(1); + } if (!set_main_item(infoPtr, &item, TRUE, isW, &has_changed)) goto undo; /* if we're sorted, sort the list, and update the index */ @@ -6592,6 +6600,7 @@ /* make space for the new column */ LISTVIEW_ScrollColumns(infoPtr, nNewColumn + 1, lpColumnInfo->rcHeader.right - lpColumnInfo->rcHeader.left); + LISTVIEW_UpdateItemSize(infoPtr); return nNewColumn; @@ -6871,7 +6880,15 @@ { HIMAGELIST himl = 0; if(infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) + { + LVITEMW item; + item.mask = LVIF_STATE; + item.stateMask = LVIS_STATEIMAGEMASK; + item.state = INDEXTOSTATEIMAGEMASK(1); + LISTVIEW_SetItemState(infoPtr, -1, &item); + himl = LISTVIEW_CreateCheckBoxIL(infoPtr); + } LISTVIEW_SetImageList(infoPtr, LVSIL_STATE, himl); } Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshee t.c?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/propsheet.c (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c Fri Jul 21 15:30:20 2006 @@ -2151,8 +2151,7 @@ int lenprop = strlenW(psInfo->strPropertiesFor); dest = Alloc( (lentitle + lenprop + 1)*sizeof (WCHAR)); - strcpyW(dest, psInfo->strPropertiesFor); - strcatW(dest, lpszText); + wsprintfW(dest, psInfo->strPropertiesFor, lpszText); SetWindowTextW(hwndDlg, dest); Free(dest); Modified: trunk/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/trackbar .c?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/trackbar.c (original) +++ trunk/reactos/dll/win32/comctl32/trackbar.c Fri Jul 21 15:30:20 2006 @@ -237,7 +237,7 @@ return 0; } -static void inline +inline static void TRACKBAR_PageDown (TRACKBAR_INFO *infoPtr) { if (infoPtr->lPos == infoPtr->lRangeMax) return; @@ -249,7 +249,7 @@ } -static void inline +inline static void TRACKBAR_PageUp (TRACKBAR_INFO *infoPtr) { if (infoPtr->lPos == infoPtr->lRangeMin) return; @@ -260,7 +260,7 @@ notify_with_scroll (infoPtr, TB_PAGEUP); } -static void inline TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr) +inline static void TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr) { if (infoPtr->lPos == infoPtr->lRangeMin) return; infoPtr->lPos -= infoPtr->lLineSize; @@ -269,7 +269,7 @@ notify_with_scroll (infoPtr, TB_LINEUP); } -static void inline TRACKBAR_LineDown(TRACKBAR_INFO *infoPtr) +inline static void TRACKBAR_LineDown(TRACKBAR_INFO *infoPtr) { if (infoPtr->lPos == infoPtr->lRangeMax) return; infoPtr->lPos += infoPtr->lLineSize; @@ -404,7 +404,7 @@ TRACKBAR_InvalidateThumb (infoPtr, newPos); } -static BOOL inline +inline static BOOL TRACKBAR_HasSelection (TRACKBAR_INFO *infoPtr) { return infoPtr->lSelMin != infoPtr->lSelMax; @@ -757,7 +757,7 @@ } -static void inline +inline static void TRACKBAR_ActivateToolTip (TRACKBAR_INFO *infoPtr, BOOL fShow) { TTTOOLINFOW ti; @@ -1022,7 +1022,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_GetChannelRect (TRACKBAR_INFO *infoPtr, LPRECT lprc) { if (lprc == NULL) return 0; @@ -1036,7 +1036,7 @@ } -static LONG inline +inline static LONG TRACKBAR_GetNumTics (TRACKBAR_INFO *infoPtr) { if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_NOTICKS) @@ -1058,7 +1058,7 @@ } -static LONG inline +inline static LONG TRACKBAR_GetTic (TRACKBAR_INFO *infoPtr, INT iTic) { if ((iTic < 0) || (iTic >= infoPtr->uNumTics) || !infoPtr->tics) @@ -1069,7 +1069,7 @@ } -static LONG inline +inline static LONG TRACKBAR_GetTicPos (TRACKBAR_INFO *infoPtr, INT iTic) { LONG range, width, pos, tic; @@ -1111,7 +1111,7 @@ } -static LONG inline +inline static LONG TRACKBAR_SetLineSize (TRACKBAR_INFO *infoPtr, LONG lLineSize) { LONG lTemp = infoPtr->lLineSize; @@ -1122,7 +1122,7 @@ } -static LONG inline +inline static LONG TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize) { LONG lTemp = infoPtr->lPageSize; @@ -1133,7 +1133,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) { LONG oldPos = infoPtr->lPos; @@ -1152,7 +1152,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lRange) { infoPtr->lRangeMin = (SHORT)LOWORD(lRange); @@ -1177,7 +1177,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMax) { infoPtr->lRangeMax = lMax; @@ -1195,7 +1195,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMin) { infoPtr->lRangeMin = lMin; @@ -1213,7 +1213,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetSel (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lSel) { if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE) @@ -1234,7 +1234,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetSelEnd (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lEnd) { if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE) @@ -1252,7 +1252,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetSelStart (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lStart) { if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE) @@ -1270,7 +1270,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetThumbLength (TRACKBAR_INFO *infoPtr, UINT iLength) { if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_FIXEDLENGTH) { @@ -1283,7 +1283,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos) { if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_AUTOTICKS) @@ -1310,7 +1310,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetTicFreq (TRACKBAR_INFO *infoPtr, WORD wFreq) { if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_AUTOTICKS) { @@ -1323,7 +1323,7 @@ } -static INT inline +inline static INT TRACKBAR_SetTipSide (TRACKBAR_INFO *infoPtr, INT fLocation) { INT fTemp = infoPtr->fLocation; @@ -1334,7 +1334,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetToolTips (TRACKBAR_INFO *infoPtr, HWND hwndTT) { infoPtr->hwndToolTip = hwndTT; @@ -1343,7 +1343,7 @@ } -static BOOL inline +inline static BOOL TRACKBAR_SetUnicodeFormat (TRACKBAR_INFO *infoPtr, BOOL fUnicode) { BOOL bTemp = infoPtr->bUnicode; @@ -1702,7 +1702,7 @@ } -static BOOL inline +inline static BOOL TRACKBAR_KeyUp (TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData) { switch (nVirtKey) {

2 1

Broken RtlMultiByteToUnicodeSize
by Myria 20 Jul '06

20 Jul '06

A Taiwanese user of ReactOS came into the IRC channel to report a bug. If you set ReactOS's code page to 936, the function RtlMultiByteToUnicodeSize will crash during startup. I can't code a fix for it, but I can say how. The algorithm should work like this: - If the code page is not DBCS, don't bother, and just set *UnicodeSize to MbSize * sizeof(WCHAR). This is already done. - Begin counting with a length of 0. - While MbSize is not zero: -- Grab a byte and decrement MbSize. -- Determine whether it is a DBCS lead byte for the code page. -- If it is a lead byte: --- If MbSize is now zero, increment length, set *UnicodeSize to your length * sizeof(WCHAR) and return STATUS_SUCCESS. The broken half-character is counted. --- Decrement MbSize and increment your length. Two DBCS bytes just became a single Unicode character. We ignore the value of the second byte. -- If it is not: --- Increment length. - Set *UnicodeSize to length * sizeof(WCHAR) and return STATUS_SUCCESS. Is it possible for a DBCS character's mapping to be a UTF-16 surrogate? If so, the routine becomes more complicated. I personally think ReactOS should support UTF-8 as a default code page, but I doubt that others agree. This function is one of the many that would have to change... Melissa

1 0

Re: [ros-dev] [ros-diffs] [ion] 23175: - Major formatting cleanup and optimizations to NtQueryInformationProcess so that it does not burn the eyes of anyone that might attempt to read it.
by Royce Mitchell III 20 Jul '06

20 Jul '06

ion(a)svn.reactos.org wrote: >DstBuffer = (PWSTR)(DstPath + 1); > > that looks pretty eye-burning itself... perhaps I'm just seeing things but, 1) you're incrementing a pointer without checking if it's null ( I realize this might be safe if we can trust our caller ). 2) do we really want the address: DstPath + sizeof(PUNICODE_STRING)? I realize this too might work, but do we want to assume that sizeof(PUNICODE_STRING) == 2*sizeof(USHORT) ???

2 1

NtUserDrawCaption implementation, please review.
by Saveliy Tretiakov 18 Jul '06

18 Jul '06

Hi. This is my first attempt to implement something in win32k. Please review and point out mistakes, if any. I commited testapps to trunk. From testcode I found that our current implementation has bugs and fixed them. You can see them on screenshot: http://i1.tinypic.com/20a9te1.jpg In windows: http://i1.tinypic.com/20a9thf.jpg With my patch: http://i1.tinypic.com/20a9to2.jpg And now I'll ask some questions :) 1) Internal functions naming. Some functions have prefix like Int*, User*, co_* etc., some don't have any prefix. Is there any standart? 2) Is there any difference between shared and exclusive lock? When should I use shared lock, and when exlusive? In ntuser.h I saw this: #define UserEnterShared() UserEnterExclusive() I guess this is temporary hack, isn't it? Index: subsystems/win32/win32k/ntuser/painting.c =================================================================== --- subsystems/win32/win32k/ntuser/painting.c (revision 23134) +++ subsystems/win32/win32k/ntuser/painting.c (working copy) @@ -32,7 +32,7 @@ #include <w32k.h> -#define NDEBUG +#undef NDEBUG #include <debug.h> /* PRIVATE FUNCTIONS **********************************************************/ @@ -1372,4 +1372,392 @@ END_CLEANUP; } +/* Don't know where to put this */ +BOOL FASTCALL IntGdiGradientFill(DC *dc, PTRIVERTEX pVertex, ULONG uVertex, PVOID pMesh, ULONG uMesh, ULONG ulMode); +ULONG FASTCALL IntSystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni); +BOOL UserDrawIconEx(HDC hDc, INT xLeft, INT yTop, PCURICON_OBJECT pIcon, INT cxWidth, + INT cyHeight, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags); +PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon); + +BOOL +IntDrawSysMenuButton( + PWINDOW_OBJECT pWnd, + HDC hDc, + LPRECT lpRc, + BOOL Down) +{ + HICON hIcon; + PCURICON_OBJECT pIcon; + + ASSERT(pWnd && lpRc); + + /* Get the icon to draw. We don't care about WM_GETICON here. */ + + hIcon = pWnd->Class->hIconSm; + + if(!hIcon) + { + DPRINT("Wnd class has no small icon.\n"); + hIcon = pWnd->Class->hIcon; + } + + if(!hIcon) + { + DPRINT("Wnd class hasn't any icon.\n"); + //FIXME: Draw "winlogo" icon. + return FALSE; + } + + if(!(pIcon = UserGetCurIconObject(hIcon))) + { + DPRINT1("UserGetCurIconObject() failed!\n"); + return FALSE; + } + + return UserDrawIconEx(hDc, lpRc->left, lpRc->top, pIcon, + UserGetSystemMetrics(SM_CXSMICON), + UserGetSystemMetrics(SM_CYSMICON), + 0, NULL, DI_NORMAL); +} + +BOOL +IntDrawCaptionText(HDC hDc, + const PUNICODE_STRING Text, + const LPRECT lpRc, + UINT uFlags) +{ + HFONT hOldFont = NULL, hFont = NULL; + COLORREF OldTextColor; + NONCLIENTMETRICS nclm; + NTSTATUS Status; + INT i; + + #ifndef NDEBUG + DPRINT("%s:", __FUNCTION__); + for(i = 0; i < Text->Length/sizeof(WCHAR); i++) + DbgPrint("%C", Text->Buffer[i]); + DbgPrint(", %d\n", Text->Length/sizeof(WCHAR)); + #endif + + nclm.cbSize = sizeof(nclm); + if(!IntSystemParametersInfo(SPI_GETNONCLIENTMETRICS, + sizeof(NONCLIENTMETRICS), &nclm, 0)) + { + DPRINT1("%s: IntSystemParametersInfo() failed!\n", __FUNCTION__); + return FALSE; + } + + NtGdiSetBkMode(hDc, TRANSPARENT); + + if(uFlags & DC_SMALLCAP) + Status = TextIntCreateFontIndirect(&nclm.lfSmCaptionFont, &hFont); + else Status = TextIntCreateFontIndirect(&nclm.lfCaptionFont, &hFont); + + if(!NT_SUCCESS(Status)) + { + DPRINT1("%s: TextIntCreateFontIndirect() failed! Status: 0x%x\n", + __FUNCTION__, Status); + return FALSE; + } + + hOldFont = NtGdiSelectObject(hDc, hFont); + if(!hOldFont) + { + DPRINT1("%s: SelectObject() failed!\n", __FUNCTION__); + NtGdiDeleteObject(hFont); + return FALSE; + } + + if(uFlags & DC_INBUTTON) + OldTextColor = NtGdiSetTextColor(hDc, IntGetSysColor(COLOR_BTNTEXT)); + else OldTextColor = NtGdiSetTextColor(hDc, IntGetSysColor(uFlags & DC_ACTIVE + ? COLOR_CAPTIONTEXT : COLOR_INACTIVECAPTIONTEXT)); + + //FIXME: If string doesn't fit to rc, truncate it and add ellipsis. + + NtGdiTextOut(hDc, lpRc->left, + lpRc->top, Text->Buffer, + Text->Length/sizeof(WCHAR)); + + NtGdiSetTextColor(hDc, OldTextColor); + NtGdiSelectObject(hDc, hOldFont); + NtGdiDeleteObject(hFont); + + return TRUE; +} + +BOOL UserDrawCaption( + PWINDOW_OBJECT pWnd, + HDC hDc, + LPCRECT lpRc, + UINT uFlags) +{ + BOOL Ret = FALSE; + HBITMAP hMemBmp = NULL, hOldBmp = NULL; + HBRUSH hOldBrush = NULL; + HDC hMemDc = NULL; + ULONG Height; + UINT VCenter = 0, Padding = 0; + RECT r = *lpRc; + LONG ButtonWidth, IconWidth; + BOOL HasIcon; + + ASSERT(pWnd != NULL); + + hMemBmp = NtGdiCreateCompatibleBitmap(hDc, + lpRc->right - lpRc->left, + lpRc->bottom - lpRc->top); + + if(!hMemBmp) + { + DPRINT1("%s: NtGdiCreateCompatibleBitmap() failed!\n", __FUNCTION__); + return FALSE; + } + + hMemDc = NtGdiCreateCompatibleDC(hDc); + if(!hMemDc) + { + DPRINT1("%s: NtGdiCreateCompatibleDC() failed!\n", __FUNCTION__); + goto cleanup; + } + + hOldBmp = NtGdiSelectObject(hMemDc, hMemBmp); + if(!hOldBmp) + { + DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + goto cleanup; + } + + Height = UserGetSystemMetrics(SM_CYCAPTION) - 1; + VCenter = (lpRc->bottom - lpRc->top) / 2; + Padding = VCenter - (Height / 2); + HasIcon = (uFlags & DC_ICON) && (pWnd->Style & WS_SYSMENU) + && !(uFlags & DC_SMALLCAP); + IconWidth = UserGetSystemMetrics(SM_CXSIZE) + Padding; + + r.left = Padding; + r.right = r.left + (lpRc->right - lpRc->left); + r.top = Padding; + r.bottom = r.top + (Height / 2); + + // Draw the caption background + if(uFlags & DC_INBUTTON) + { + hOldBrush = NtGdiSelectObject(hMemDc, + IntGetSysColorBrush(uFlags & DC_ACTIVE ? + COLOR_BTNFACE : COLOR_BTNSHADOW)); + + if(!hOldBrush) + { + DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + goto cleanup; + } + + if(!NtGdiPatBlt(hMemDc, 0, 0, + lpRc->right - lpRc->left, + lpRc->bottom - lpRc->top, + PATCOPY)) + { + DPRINT1("%s: NtGdiPatBlt() failed!\n", __FUNCTION__); + goto cleanup; + } + + if(HasIcon) r.left+=IconWidth; + } + else + { + r.right = (lpRc->right - lpRc->left); + if(uFlags & DC_SMALLCAP) + ButtonWidth = UserGetSystemMetrics(SM_CXSMSIZE) - 2; + else ButtonWidth = UserGetSystemMetrics(SM_CXSIZE) - 2; + + hOldBrush = NtGdiSelectObject(hMemDc, + IntGetSysColorBrush(uFlags & DC_ACTIVE ? + COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION)); + + if(!hOldBrush) + { + DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + goto cleanup; + } + + if(HasIcon && (uFlags & DC_GRADIENT)) + { + NtGdiPatBlt(hMemDc, 0, 0, + IconWidth+1, + lpRc->bottom - lpRc->top, + PATCOPY); + r.left+=IconWidth; + } + else + { + NtGdiPatBlt(hMemDc, 0, 0, + lpRc->right - lpRc->left, + lpRc->bottom - lpRc->top, + PATCOPY); + } + + if(uFlags & DC_GRADIENT) + { + static GRADIENT_RECT gcap = {0, 1}; + TRIVERTEX vert[2]; + COLORREF Colors[2]; + PDC pMemDc; + + if(pWnd->Style & WS_SYSMENU) + { + r.right -= 3 + ButtonWidth; + if(!(uFlags & DC_SMALLCAP)) + { + if(pWnd->Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) + r.right -= 2 + 2 * ButtonWidth; + else r.right -= 2; + r.right -= 2; + } + + //Draw buttons background + if(!NtGdiSelectObject(hMemDc, + IntGetSysColorBrush(uFlags & DC_ACTIVE ? + COLOR_GRADIENTACTIVECAPTION:COLOR_GRADIENTINACTIVECAPTION))) + { + DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + goto cleanup; + } + + NtGdiPatBlt(hMemDc, + r.right, + 0, + lpRc->right - lpRc->left - r.right, + lpRc->bottom - lpRc->top, + PATCOPY); + } + + Colors[0] = IntGetSysColor((uFlags & DC_ACTIVE) ? + COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION); + + Colors[1] = IntGetSysColor((uFlags & DC_ACTIVE) ? + COLOR_GRADIENTACTIVECAPTION : COLOR_GRADIENTINACTIVECAPTION); + + vert[0].x = r.left; + vert[0].y = 0; + vert[0].Red = (WORD)Colors[0]<<8; + vert[0].Green = (WORD)Colors[0] & 0xFF00; + vert[0].Blue = (WORD)(Colors[0]>>8) & 0xFF00; + vert[0].Alpha = 0; + + vert[1].x = r.right; + vert[1].y = lpRc->bottom - lpRc->top; + vert[1].Red = (WORD)Colors[1]<<8; + vert[1].Green = (WORD)Colors[1] & 0xFF00; + vert[1].Blue = (WORD)(Colors[1]>>8) & 0xFF00; + vert[1].Alpha = 0; + + pMemDc = DC_LockDc(hMemDc); + if(!pMemDc) + { + DPRINT1("%s: Can't lock dc!\n", __FUNCTION__); + goto cleanup; + } + + if(!IntGdiGradientFill(pMemDc, vert, 2, &gcap, + 1, GRADIENT_FILL_RECT_H)) + { + DPRINT1("%s: IntGdiGradientFill() failed!\n", __FUNCTION__); + } + + DC_UnlockDc(pMemDc); + } //if(uFlags & DC_GRADIENT) + } + + if(HasIcon) + { + r.top ++; + r.left -= --IconWidth; + IntDrawSysMenuButton(pWnd, hMemDc, &r, FALSE); + r.left += IconWidth; + r.top --; + } + + r.top ++; + r.left += 2; + + r.bottom = r.top + Height; + + if((uFlags & DC_TEXT) && pWnd->WindowName.Length) + { + if(!(uFlags & DC_GRADIENT)) + { + r.right = (lpRc->right - lpRc->left); + + if(uFlags & DC_SMALLCAP) + ButtonWidth = UserGetSystemMetrics(SM_CXSMSIZE) - 2; + else ButtonWidth = UserGetSystemMetrics(SM_CXSIZE) - 2; + + if(pWnd->Style & WS_SYSMENU) + { + r.right -= 3 + ButtonWidth; + if(! (uFlags & DC_SMALLCAP)) + { + if(pWnd->Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) + r.right -= 2 + 2 * ButtonWidth; + else r.right -= 2; + r.right -= 2; + } + } + } + + IntDrawCaptionText(hMemDc, &pWnd->WindowName, &r, uFlags); + } + + if(!NtGdiBitBlt(hDc, lpRc->left, lpRc->top, + lpRc->right - lpRc->left, lpRc->bottom - lpRc->top, + hMemDc, 0, 0, SRCCOPY, 0, 0)) + { + DPRINT1("%s: NtGdiBitBlt() failed!\n", __FUNCTION__); + goto cleanup; + } + + Ret = TRUE; + +cleanup: + if (hOldBrush) NtGdiSelectObject(hMemDc, hOldBrush); + if (hOldBmp) NtGdiSelectObject(hMemDc, hOldBmp); + if (hMemBmp) NtGdiDeleteObject(hMemBmp); + if (hMemDc) NtGdiDeleteObjectApp(hMemDc); + + return Ret; +} + + +BOOL +STDCALL +NtUserDrawCaption(HWND hWnd, + HDC hDc, + LPCRECT lpRc, + UINT uFlags) +{ + PWINDOW_OBJECT pWnd; + RECT SafeRect; + BOOL Ret; + + if(!NT_SUCCESS(MmCopyFromCaller(&SafeRect, lpRc, sizeof(RECT)))) + { + DPRINT1("%s: MmCopyFromCaller failed!", __FUNCTION__); + return FALSE; + } + + UserEnterExclusive(); + + if(!(pWnd = UserGetWindowObject(hWnd))) + { + UserLeave(); + return FALSE; + } + + Ret = UserDrawCaption(pWnd, hDc, &SafeRect, uFlags); + + UserLeave(); + return Ret; +} + /* EOF */ Index: subsystems/win32/win32k/ntuser/cursoricon.c =================================================================== --- subsystems/win32/win32k/ntuser/cursoricon.c (revision 23134) +++ subsystems/win32/win32k/ntuser/cursoricon.c (working copy) @@ -72,7 +72,6 @@ } -static PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon) { PCURICON_OBJECT CurIcon; @@ -1346,66 +1345,49 @@ (Rop3), 0) #endif /* STRETCH_CAN_SRCCOPY_ONLY */ -/* - * @implemented - */ -BOOL -STDCALL -NtUserDrawIconEx( - HDC hdc, - int xLeft, - int yTop, - HICON hIcon, - int cxWidth, - int cyHeight, +BOOL +UserDrawIconEx( + HDC hDc, + INT xLeft, + INT yTop, + PCURICON_OBJECT pIcon, + INT cxWidth, + INT cyHeight, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, - UINT diFlags, - DWORD Unknown0, - DWORD Unknown1) + UINT diFlags) { - PCURICON_OBJECT CurIcon; - PWINSTATION_OBJECT WinSta; + BOOL Ret = FALSE; HBITMAP hbmMask, hbmColor; BITMAP bmpMask, bmpColor; + COLORREF oldFg, oldBg; BOOL DoFlickerFree; + INT nStretchMode; SIZE IconSize; - COLORREF oldFg, oldBg; - HDC hdcMem, hdcOff = (HDC)0; - HBITMAP hbmOff = (HBITMAP)0; - HGDIOBJ hOldOffBrush = 0, hOldOffBmp = 0, hOldMem; - BOOL Ret = FALSE; - INT nStretchMode; + + HDC hdcOff; + HGDIOBJ hOldOffBrush = 0; + HGDIOBJ hOldOffBmp = 0; + HBITMAP hbmOff = 0; + HDC hdcMem = 0; + HGDIOBJ hOldMem; + + hbmMask = pIcon->IconInfo.hbmMask; + hbmColor = pIcon->IconInfo.hbmColor; - DECLARE_RETURN(BOOL); + if(istepIfAniCur) + DPRINT1("NtUserDrawIconEx: istepIfAniCur is not supported!\n"); - DPRINT("Enter NtUserDrawIconEx\n"); - UserEnterExclusive(); - - WinSta = IntGetWinStaObj(); - if(WinSta == NULL) + if(!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), &bmpMask)) { - RETURN( FALSE); + return FALSE; } - if (!(CurIcon = UserGetCurIconObject(hIcon))) + if(hbmColor && !IntGdiGetObject(hbmColor, sizeof(BITMAP), &bmpColor)) { - ObDereferenceObject(WinSta); - RETURN(FALSE); + return FALSE; } - hbmMask = CurIcon->IconInfo.hbmMask; - hbmColor = CurIcon->IconInfo.hbmColor; - - if(istepIfAniCur) - DPRINT1("NtUserDrawIconEx: istepIfAniCur is not supported!\n"); - - if(!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), &bmpMask)) - goto done; - - if(hbmColor && !IntGdiGetObject(hbmColor, sizeof(BITMAP), &bmpColor)) - goto done; - if(hbmColor) { IconSize.cx = bmpColor.bmWidth; @@ -1421,11 +1403,15 @@ diFlags = DI_NORMAL; if(!cxWidth) - cxWidth = ((diFlags & DI_DEFAULTSIZE) ? UserGetSystemMetrics(SM_CXICON) : IconSize.cx); + cxWidth = ((diFlags & DI_DEFAULTSIZE) ? + UserGetSystemMetrics(SM_CXICON) : IconSize.cx); + if(!cyHeight) - cyHeight = ((diFlags & DI_DEFAULTSIZE) ? UserGetSystemMetrics(SM_CYICON) : IconSize.cy); + cyHeight = ((diFlags & DI_DEFAULTSIZE) ? + UserGetSystemMetrics(SM_CYICON) : IconSize.cy); - DoFlickerFree = (hbrFlickerFreeDraw && (NtGdiGetObjectType(hbrFlickerFreeDraw) == OBJ_BRUSH)); + DoFlickerFree = (hbrFlickerFreeDraw && + (NtGdiGetObjectType(hbrFlickerFreeDraw) == OBJ_BRUSH)); if(DoFlickerFree) { @@ -1433,29 +1419,45 @@ r.right = cxWidth; r.bottom = cyHeight; - hdcOff = NtGdiCreateCompatibleDC(hdc); + hdcOff = NtGdiCreateCompatibleDC(hDc); if(!hdcOff) - goto done; + { + DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); + return FALSE; + } - hbmOff = NtGdiCreateCompatibleBitmap(hdc, cxWidth, cyHeight); + hbmOff = NtGdiCreateCompatibleBitmap(hDc, cxWidth, cyHeight); if(!hbmOff) { - NtGdiDeleteObjectApp(hdcOff); - goto done; + DPRINT1("NtGdiCreateCompatibleBitmap() failed!\n"); + goto cleanup; } + hOldOffBrush = NtGdiSelectObject(hdcOff, hbrFlickerFreeDraw); + if(!hOldOffBrush) + { + DPRINT1("NtGdiSelectObject() failed!\n"); + goto cleanup; + } + hOldOffBmp = NtGdiSelectObject(hdcOff, hbmOff); + if(!hOldOffBmp) + { + DPRINT1("NtGdiSelectObject() failed!\n"); + goto cleanup; + } + NtGdiPatBlt(hdcOff, 0, 0, r.right, r.bottom, PATCOPY); - NtGdiSelectObject(hdcOff, hbmOff); } - - hdcMem = NtGdiCreateCompatibleDC(hdc); + else hdcOff = hDc; + + hdcMem = NtGdiCreateCompatibleDC(hDc); if(!hdcMem) + { + DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); goto cleanup; + } - if(!DoFlickerFree) - hdcOff = hdc; - nStretchMode = NtGdiSetStretchBltMode(hdcOff, STRETCH_DELETESCANS); oldFg = NtGdiSetTextColor(hdcOff, RGB(0, 0, 0)); @@ -1464,13 +1466,19 @@ if(diFlags & DI_MASK) { hOldMem = NtGdiSelectObject(hdcMem, hbmMask); + if(!hOldMem) + { + DPRINT("NtGdiSelectObject() failed!\n"); + goto cleanup; + } DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, 0, 0, IconSize.cx, IconSize.cy, ((diFlags & DI_IMAGE) ? SRCAND : SRCCOPY), FALSE); - if(!hbmColor && (bmpMask.bmHeight == 2 * bmpMask.bmWidth) && (diFlags & DI_IMAGE)) + if(!hbmColor && (bmpMask.bmHeight == 2 * bmpMask.bmWidth) + && (diFlags & DI_IMAGE)) { DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, @@ -1479,9 +1487,10 @@ diFlags &= ~DI_IMAGE; } + NtGdiSelectObject(hdcMem, hOldMem); } - + if(diFlags & DI_IMAGE) { hOldMem = NtGdiSelectObject(hdcMem, (hbmColor ? hbmColor : hbmMask)); @@ -1496,35 +1505,72 @@ } if(DoFlickerFree) - NtGdiBitBlt(hdc, xLeft, yTop, cxWidth, cyHeight, hdcOff, 0, 0, SRCCOPY, 0, 0); - + { + NtGdiBitBlt(hDc, xLeft, yTop, cxWidth, + cyHeight, hdcOff, 0, 0, SRCCOPY, 0, 0); + } + NtGdiSetTextColor(hdcOff, oldFg); NtGdiSetBkColor(hdcOff, oldBg); - NtGdiSetStretchBltMode(hdcOff, nStretchMode); - + Ret = TRUE; - + cleanup: if(DoFlickerFree) { - NtGdiSelectObject(hdcOff, hOldOffBmp); - NtGdiSelectObject(hdcOff, hOldOffBrush); - NtGdiDeleteObject(hbmOff); - NtGdiDeleteObjectApp(hdcOff); + if(hOldOffBmp) NtGdiSelectObject(hdcOff, hOldOffBmp); + if(hOldOffBrush) NtGdiSelectObject(hdcOff, hOldOffBrush); + if(hbmOff) NtGdiDeleteObject(hbmOff); + if(hdcOff) NtGdiDeleteObjectApp(hdcOff); } - if(hdcMem) - NtGdiDeleteObjectApp(hdcMem); + + if(hdcMem) NtGdiDeleteObjectApp(hdcMem); + return Ret; +} -done: - ObDereferenceObject(WinSta); +/* + * @implemented + */ +BOOL +STDCALL +NtUserDrawIconEx( + HDC hdc, + int xLeft, + int yTop, + HICON hIcon, + int cxWidth, + int cyHeight, + UINT istepIfAniCur, + HBRUSH hbrFlickerFreeDraw, + UINT diFlags, + DWORD Unknown0, + DWORD Unknown1) +{ + PCURICON_OBJECT pIcon; + BOOL Ret; - RETURN( Ret); + DPRINT("Enter NtUserDrawIconEx\n"); + UserEnterExclusive(); + + if(!(pIcon = UserGetCurIconObject(hIcon))) + { + DPRINT1("UserGetCurIconObject() failed!\n"); + UserLeave(); + return FALSE; + } + + Ret = UserDrawIconEx(hdc, + xLeft, + yTop, + pIcon, + cxWidth, + cyHeight, + istepIfAniCur, + hbrFlickerFreeDraw, + diFlags); -CLEANUP: - DPRINT("Leave NtUserDrawIconEx, ret=%i\n",_ret_); UserLeave(); - END_CLEANUP; + return Ret; } - Index: subsystems/win32/win32k/ntuser/ntstubs.c =================================================================== --- subsystems/win32/win32k/ntuser/ntstubs.c (revision 23134) +++ subsystems/win32/win32k/ntuser/ntstubs.c (working copy) @@ -193,19 +193,6 @@ DWORD STDCALL -NtUserDrawCaption( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL NtUserDrawCaptionTemp( DWORD Unknown0, DWORD Unknown1, Index: subsystems/win32/win32k/include/intgdi.h =================================================================== --- subsystems/win32/win32k/include/intgdi.h (revision 23134) +++ subsystems/win32/win32k/include/intgdi.h (working copy) @@ -188,12 +188,18 @@ BOOL FASTCALL IntGetSysColorBrushes(HBRUSH *Brushes, UINT nBrushes); +HGDIOBJ FASTCALL +IntGetSysColorBrush(INT Object); + BOOL FASTCALL IntGetSysColorPens(HPEN *Pens, UINT nPens); BOOL FASTCALL IntGetSysColors(COLORREF *Colors, UINT nColors); +DWORD FASTCALL +IntGetSysColor(INT nIndex); + /* Other Stuff */ INT FASTCALL Index: subsystems/win32/win32k/objects/stockobj.c =================================================================== --- subsystems/win32/win32k/objects/stockobj.c (revision 23134) +++ subsystems/win32/win32k/objects/stockobj.c (working copy) @@ -210,6 +210,12 @@ return nBrushes > 0; } +HGDIOBJ FASTCALL +IntGetSysColorBrush(INT Object) +{ + return ((Object < 0) || (NUM_SYSCOLORS <= Object)) ? NULL : SysColorBrushes[Object]; +} + BOOL FASTCALL IntGetSysColorPens(HPEN *Pens, UINT nPens) { @@ -254,6 +260,12 @@ return nColors > 0; } +DWORD FASTCALL +IntGetSysColor(INT nIndex) +{ + return ((nIndex < 0) || (NUM_SYSCOLORS <= nIndex)) ? 0 : SysColors[nIndex]; +} + VOID FASTCALL CreateSysColorObjects(VOID) { Index: include/reactos/win32k/ntuser.h =================================================================== --- include/reactos/win32k/ntuser.h (revision 23134) +++ include/reactos/win32k/ntuser.h (working copy) @@ -687,12 +687,11 @@ DWORD NTAPI NtUserDragObject( - HWND hwnd1, - HWND hwnd2, - UINT u1, - DWORD dw1, - HCURSOR hc1 - ); + HWND hwnd1, + HWND hwnd2, + UINT u1, + DWORD dw1, + HCURSOR hc1); DWORD NTAPI @@ -702,24 +701,24 @@ DWORD Unknown2, DWORD Unknown3); -DWORD +BOOL NTAPI NtUserDrawCaption( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3); + HWND hWnd, + HDC hDc, + LPCRECT lpRc, + UINT uFlags); DWORD -NTAPI +STDCALL NtUserDrawCaptionTemp( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6); + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3, + DWORD Unknown4, + DWORD Unknown5, + DWORD Unknown6); BOOL NTAPI Index: dll/win32/user32/windows/nonclient.c =================================================================== --- dll/win32/user32/windows/nonclient.c (revision 23134) +++ dll/win32/user32/windows/nonclient.c (working copy) @@ -1097,231 +1097,9 @@ BOOL WINAPI DrawCaption(HWND hWnd, HDC hDC, LPCRECT lprc, UINT uFlags) { - NONCLIENTMETRICSW nclm; - BOOL result = FALSE; - RECT r = *lprc; - UINT VCenter = 0, Padding = 0, Height; - ULONG Style; - WCHAR buffer[256]; - HFONT hFont = NULL; - HFONT hOldFont = NULL; - HBRUSH OldBrush = NULL; - HDC MemDC = NULL; - int ButtonWidth; - COLORREF OldTextColor; - -#ifdef DOUBLE_BUFFER_CAPTION - HBITMAP MemBMP = NULL, OldBMP = NULL; - - MemDC = CreateCompatibleDC(hDC); - if (! MemDC) goto cleanup; - MemBMP = CreateCompatibleBitmap(hDC, lprc->right - lprc->left, lprc->bottom - lprc->top); - if (! MemBMP) goto cleanup; - OldBMP = SelectObject(MemDC, MemBMP); - if (! OldBMP) goto cleanup; -#else - MemDC = hDC; - - OffsetViewportOrgEx(MemDC, lprc->left, lprc->top, NULL); -#endif - - Style = GetWindowLongW(hWnd, GWL_STYLE); - - /* Windows behaves like this */ - Height = GetSystemMetrics(SM_CYCAPTION) - 1; - - VCenter = (lprc->bottom - lprc->top) / 2; - Padding = VCenter - (Height / 2); - - r.left = Padding; - r.right = r.left + (lprc->right - lprc->left); - r.top = Padding; - r.bottom = r.top + (Height / 2); - - // Draw the caption background - if (uFlags & DC_INBUTTON) - { - OldBrush = SelectObject(MemDC, GetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_BTNFACE : COLOR_BTNSHADOW) ); - if (! OldBrush) goto cleanup; - if (! PatBlt(MemDC, 0, 0, lprc->right - lprc->left, lprc->bottom - lprc->top, PATCOPY )) goto cleanup; - } - else - { - if (uFlags & DC_GRADIENT) - { - static GRADIENT_RECT gcap = {0, 1}; - TRIVERTEX vert[2]; - COLORREF Colors[2]; - LONG xx; - - r.right = (lprc->right - lprc->left); - if (uFlags & DC_SMALLCAP) - ButtonWidth = GetSystemMetrics(SM_CXSMSIZE) - 2; - else - ButtonWidth = GetSystemMetrics(SM_CXSIZE) - 2; - - //if (Style & WS_SYSMENU) - //{ - // r.right -= 3 + ButtonWidth; - // if (! (uFlags & DC_SMALLCAP)) - // { - // if(Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) - // r.right -= 2 + 2 * ButtonWidth; - // else - // r.right -= 2; - // r.right -= 2; - // } - //} - - Colors[0] = GetSysColor((uFlags & DC_ACTIVE) ? COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION); - Colors[1] = GetSysColor((uFlags & DC_ACTIVE) ? COLOR_GRADIENTACTIVECAPTION : COLOR_GRADIENTINACTIVECAPTION); - - vert[0].x = r.left; - vert[0].y = 0; - vert[0].Red = GetRValue(Colors[0]) << 8; - vert[0].Green = GetGValue(Colors[0]) << 8; - vert[0].Blue = GetBValue(Colors[0]) << 8; - vert[0].Alpha = 0; - - vert[1].x = r.right; - vert[1].y = lprc->bottom - lprc->top; - vert[1].Red = GetRValue(Colors[1]) << 8; - vert[1].Green = GetGValue(Colors[1]) << 8; - vert[1].Blue = GetBValue(Colors[1]) << 8; - vert[1].Alpha = 0; - - GdiGradientFill(MemDC, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_V); - - if ((uFlags & DC_ICON) && (Style & WS_SYSMENU) && !(uFlags & DC_SMALLCAP)) - { - r.top --; - SetBkMode( MemDC, TRANSPARENT ); - xx = GetSystemMetrics(SM_CXSIZE) + Padding; - if (UserDrawSysMenuButton(hWnd, MemDC, &r, FALSE)) - r.left += xx; - r.top ++; - } - - if(OldBrush) - { - SelectObject(MemDC, OldBrush); - OldBrush = NULL; - } - //xx = lprc->right - lprc->left - r.right; - //if(xx > 0) - //{ - // OldBrush = SelectObject(MemDC, GetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_GRADIENTACTIVECAPTION : COLOR_GRADIENTINACTIVECAPTION)); - // if (!OldBrush) goto cleanup; - // PatBlt(MemDC, r.right, 0, xx, lprc->bottom - lprc->top, PATCOPY); - //} - } - else - { - OldBrush = SelectObject(MemDC, GetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION) ); - if (! OldBrush) goto cleanup; - if (! PatBlt(MemDC, 0, 0, lprc->right - lprc->left, lprc->bottom - lprc->top, PATCOPY )) goto cleanup; - } - } - - if ((uFlags & DC_ICON) && !(uFlags & DC_GRADIENT) && (Style & WS_SYSMENU) && !(uFlags & DC_SMALLCAP)) - { - /* For some reason the icon isn't centered correctly... */ - r.top --; - if (UserDrawSysMenuButton(hWnd, MemDC, &r, FALSE)) - r.left += GetSystemMetrics(SM_CXSIZE) + Padding; - r.top ++; - } - r.top ++; - r.left += 2; - - r.bottom = r.top + Height; - - if ((uFlags & DC_TEXT) && (NtUserInternalGetWindowText( hWnd, buffer, sizeof(buffer)/sizeof(buffer[0]) ))) - { - if(!(uFlags & DC_GRADIENT)) - { - r.right = (lprc->right - lprc->left); - if (uFlags & DC_SMALLCAP) - ButtonWidth = GetSystemMetrics(SM_CXSMSIZE) - 2; - else - ButtonWidth = GetSystemMetrics(SM_CXSIZE) - 2; - - if (Style & WS_SYSMENU) - { - r.right -= 3 + ButtonWidth; - if (! (uFlags & DC_SMALLCAP)) - { - if(Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) - r.right -= 2 + 2 * ButtonWidth; - else - r.right -= 2; - r.right -= 2; - } - } - } - - nclm.cbSize = sizeof(nclm); - if (! SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &nclm, 0)) goto cleanup; - - SetBkMode( MemDC, TRANSPARENT ); - if (uFlags & DC_SMALLCAP) - hFont = CreateFontIndirectW(&nclm.lfSmCaptionFont); - else - hFont = CreateFontIndirectW(&nclm.lfCaptionFont); - - if (! hFont) goto cleanup; - - hOldFont = SelectObject(MemDC, hFont); - if (! hOldFont) goto cleanup; - - if (uFlags & DC_INBUTTON) - OldTextColor = SetTextColor(MemDC, GetSysColor(uFlags & DC_ACTIVE ? COLOR_BTNTEXT : COLOR_GRAYTEXT)); - else - OldTextColor = SetTextColor(MemDC, GetSysColor(uFlags & DC_ACTIVE ? COLOR_CAPTIONTEXT : COLOR_INACTIVECAPTIONTEXT)); - - DrawTextW(MemDC, buffer, wcslen(buffer), &r, DT_VCENTER | DT_END_ELLIPSIS); - - SetTextColor(MemDC, OldTextColor); - } - -#if 0 - if (uFlags & DC_BUTTONS) - { - // Windows XP draws the caption buttons with DC_BUTTONS -// r.left += GetSystemMetrics(SM_CXSIZE) + 1; -// UserDrawCaptionButton( hWnd, hDC, FALSE, DFCS_CAPTIONCLOSE); -// r.right -= GetSystemMetrics(SM_CXSMSIZE) + 1; -// UserDrawCaptionButton( hWnd, hDC, FALSE, DFCS_CAPTIONMIN); -// UserDrawCaptionButton( hWnd, hDC, FALSE, DFCS_CAPTIONMAX); - } -#endif - -#ifdef DOUBLE_BUFFER_CAPTION - if (! BitBlt(hDC, lprc->left, lprc->top, lprc->right - lprc->left, lprc->bottom - lprc->top, - MemDC, 0, 0, SRCCOPY)) goto cleanup; -#endif - - result = TRUE; - - cleanup : - if (MemDC) - { - if (OldBrush) SelectObject(MemDC, OldBrush); - if (hOldFont) SelectObject(MemDC, hOldFont); - if (hFont) DeleteObject(hFont); -#ifdef DOUBLE_BUFFER_CAPTION - if (OldBMP) SelectObject(MemDC, OldBMP); - if (MemBMP) DeleteObject(MemBMP); - DeleteDC(MemDC); -#else - OffsetViewportOrgEx(MemDC, -lprc->left, -lprc->top, NULL); -#endif - } - - return result; + return NtUserDrawCaption(hWnd, hDC, lprc, uFlags); } - /* * @unimplemented */

1 0

Changes to Menu Set Masking
by James Tabor 18 Jul '06

18 Jul '06

Hi, Okay~ I am finishing up rewriting menu mask setting in win32 and use32. The reason for so much junk in the menus was due to doing a full mask set for setting nothing other than "Rect" so if the structure was packed with S$@%! it would keep it and think it was valid data. MenuGetRosMenuItemInfo was naughty too. It set a full mask and it was passed to MenuSetRosMenuItemInfo and saved! Until I figured this out it was two weeks later! So I'm fixing this, Set will be selective and create errors if the wrong combination is used. Strings may have; MIIM_TYPE & MFT_STRING == good MIIM_STRING & MFT_STRING == good MIIM_STRING == good so you might have this -> if ((miiW.fMask & MIIM_STRING) || (IS_STRING_ITEM(miiW.fType))) and this is good due to there might be one of them. You can not have. MIIM_TYPE & MIIM_STRING == bad MIIM_TYPE & MIIM_FTYPE == bad MIIM_TYPE & MIIM_BITMAP == bad MIIM_FTYPE & MFT_BITMAP == bad just read msdn doc on MENUITEMINFO structure, once you decode their logic it starts to make sense. Remember one supersedes another. What a mess, James

1 0

Reactos became closed?
by wac 17 Jul '06

17 Jul '06

Hi Folks: I don't see mails here since some time. Have ROS discusions moved to somewhere else or is just the sources revision process? Regards Waldo

4 4

Re: [ros-dev] 0.3.0 RC1 Update
by Murphy, Ged (Bolton) 13 Jul '06

13 Jul '06

WaxDragon wrote: > The only bug > I'm concerned about right now is the broken links in the start menu, > which I think is even fixed in trunk. Nothing else can really be > addressed at this point. That is easily fixed with a small hack in the explorer code. It's certainly not a correct fix, but it will ensure the links work for this release and allow us to move on. If you agree, I'll change it tonight. Ged.

2 2

Grievous and unwarranted mistreatment by a senior operator of the IRC channel
by Steven Maddox (Cyorxamp) 11 Jul '06

11 Jul '06

Dear ReactOS Developers, I apologize for taking these extra ordinary steps in this matter but I could not locate another way of bringing this issue to attention on your site. I was in the IRC channel on the 11th July '06 from about 3am to 5am GMT... I was posing some very interesting and fundamental questions about how the project began, it's direction. I was pleased that after a few minutes most of the users had agreed that ReactOS is intending to be much more than just NT compatible but in a sense 'Windows + Better'. After this there was many hours of discussion of how to make it more than just a windows clone, many of such involving the idea of ReactOS being similar to Linux in some senses and how to get a Linux feel while maintaining windows compatibility. Near the end of the log (I hope these are saved, I have no copies myself) an 'Alex_Ionescu' joined in on the conversation. He had many interesting views that greatly heightened the debate to whether ReactOS should intend to be more than windows now, or at a later date. I was for the view that in order to gain a user base quicker that it must at least intent to be more than a clone and was trying to illustrate why. I first tried to illustrate this and got shot down due to my poor phrasing of what I meant. I tried to rephrase my point, and I began with a sentence talking about firefox as a metaphor of another great piece of floss software. I was interrupted by Alex_Ionescu (whom is an op in that channel) who told me i 'must' state my reason using a single statement only and began quoting regulations of the English language and structuring a proper argument... so many regulations in fact i feel even if I did comply it would be difficult to fit it in one statement. I decided to wait until Alex_Ionescu had given up on such a silly and clear attempt at limiting my free speech in this matter. However he persisted to want to know what my point was on this matter, when trying again... he shut me down. Eventually he set the entire channel to moderated status only so only those he selected could discuss the matter. Apparently this was until I could phrase my argument using just one statement. I waited until this was lifted and it was not, eventually I came back... spoke Spanish and under another nick! Granted this was to yet again give my point across... instead of this they knew who I was and quickly identified me. A silly tactic I know, but having done this I was quickly misquoted in the channel from my conversation with Alex_Ionescu about things I was trying to explain to him as well as very childish remarks as tho I had said "I love cock". I have high hopes for this project and wish it every success, I had a very enlightened experience up until meeting this person with the arguments put and listened and responded to them well. Alex_Ionescu on the other hand obviously has no understanding of what it means to express oneself freely, and it would seem has a childish nature too. I ask that the decision to give this person power of the level of communication about the project in the channel be reviewed as quickly as possible in light of these or other past events. Thank you, -- Steven Maddox (Cyorxamp) Cyorxamp http://www.cyorxamp.info

8 12

Re: [ros-dev] Status of xen port?
by Dmitriy Budko 11 Jul '06

11 Jul '06

Reactos can be ported to VMI instead: http://www.vmware.com/interfaces/vmi_specs.html http://www.vmware.com/pdf/vmi_specs.pdf It will allow reactos to switch between VMI and native HW on the fly. Dmitriy Budko VMware ________________________________ From: ros-dev-bounces(a)reactos.org [mailto:ros-dev-bounces@reactos.org] On Behalf Of Jerry Sent: Saturday, July 08, 2006 11:54 AM To: ReactOS Development List Subject: Re: [ros-dev] Status of xen port? Can reactos be made to run on Xen or native hardware by detecting either one on the fly? Steven Edwards wrote: On 7/7/06, Pablo Menichini <pablo(a)menichini.com.ar> <mailto:pablo@menichini.com.ar> wrote: I look at xen port and it hasn't been touch in a year. Is it possible to port reactos to xen or is the kernel not mature enought? If it's possible, how long can it take to have a bare minimum port? Its possible there has just been a lack of developer resources. One of the developers had the boot loader ported however those changes were not merged in to the trunk.

1 0

Re: [ros-dev] [ros-diffs] [fireball] 23005: [FORMATTING] / [AUDIT] - Cleanup a big coding-style mess - Add UNIMPLEMENTED macro in empty functions (otherwise we will never know if they are being called by a 3rd-party driver) - Add proper debug headers inclusion in every file - Add documentation headers into almost every file (except mcb.c and context.c - will be added later) - Standardize per-file headers (some files still lack contributors names, they will be added later too) No code change except for addin
by Alex Ionescu 10 Jul '06

10 Jul '06

fireball(a)svn.reactos.org wrote: > Author: fireball > Date: Tue Jul 11 01:03:26 2006 > New Revision: 23005 > > URL: http://svn.reactos.org/svn/reactos?rev=23005&view=rev > Log: > [FORMATTING] / [AUDIT] > - Cleanup a big coding-style mess > - Add UNIMPLEMENTED macro in empty functions (otherwise we will never know if they are being called by a 3rd-party driver) > - Add proper debug headers inclusion in every file > - Add documentation headers into almost every file (except mcb.c and context.c - will be added later) > - Standardize per-file headers (some files still lack contributors names, they will be added later too) > > No code change except for adding UNIMPLEMENTED macros in the code. Name.c unlocked because the implementations of functions are trivial and in fact could be derived from their names. Not documented functions will be further reviewed. > Good work... two things: 1) I think Brandon wrote a tool which does documentation headers using TinyKRNL syntax. Since ROS's is the same (afaik), maybe you could talk to him about it instead of doing everything by hand :). 2) Most of the functions are documented in te IFS, I'm not aware of any undocumented FsRtl stuff... Captive also has implementations for nearly all of them, and Captive was clean-roomed. Best regards, Alex Ionescu

1 0

Re: [ros-dev] 0.3.0 RC1 Update
by Murphy, Ged (Bolton) 10 Jul '06

10 Jul '06

Brandon Turner wrote: > I have added a debug bootcd build of RC1 to sourceforge. > So anyone out there looking to get there hands one for > troubleshooting 0.3.0 can hop on there and grab it. We've had this up for 3 weeks now. Changes to trunk have been so heavy since we branched 0.3, we effectively now have two _very_ different versions of ReactOS .... heh Maybe our release process needs reviewing slightly ;) Ged.

7 9

Re: [ros-dev] 0.3.0 RC1 Update
by Murphy, Ged (Bolton) 10 Jul '06

10 Jul '06

Brandon Turner wrote: > Perhaps I am > mistaken on the process and missed the time I should have > made another > release. If this is the case please feel free to let me know > what I can > do to resolve the the problem. > > Brandon No no, nothing has gone wrong, I was just making an observation and putting some traffic on ros-dev ;) IIRC, a 2 month release cycle has been mentioned in the past. Going off our recent release speed, we'd struggle to hit 1 per year ;) At least we know ROS development is moving fast internally, even if releases aren't. Ged.

1 0

Status report on Remote Desktop client - with screenshots!
by Michele Cicciotti 10 Jul '06

10 Jul '06

I opted for a different porting strategy than I originally thought. I simply couldn't work effectively outside of Visual Studio, so I decided to create a test application (rdesktop-core-tester), and turn the smallest subset possible of rdesktop into a statically-linked library (rdesktop-core). It needs a lot more work, but the results are very encouraging Here is the first screenshot *ever* of rdesktop running on pure Win32: <http://img209.imageshack.us/my.php?image=whohoo3ts.png> What's wrong with this picture, and why? All text is missing: text output in RDP is tedious. I'll rip the code off from the X11 version, but it's not vital for now. All bitmaps are black: this is a bug, or rather a peculiarity, of rdesktop, which passes only part of raster operation codes (specifically, the "source" mask), forcing me to do some bit-juggling to turn them back into valid GDI raster operation codes - just passing the "mutilated" code resulted in the code for the BLACKNESS operation every time, and I think it shows. "Shut down..." is upside down: this is a bitmap painted directly to the screen, without a raster operation, so it worked out of the box, unlike the Windows logo in the upper half of the dialog. It turns out RDP bitmaps are top-down, like the framebuffer but unlike regular bitmaps. Easily solved by creating all bitmaps with negative heights! Also, I could not go further than this point at the time, because keyboard input wasn't hooked up yet! I whipped up some quick support (very easy, just pass the scancodes on the wire), and of course fixed the aforementioned issues, tweaked a couple more things, blind-typed the password (no text output) and... <http://img62.imageshack.us/my.php?image=meh9ct.png> ... eh. I expected a lot better. So many bugs. And I really don't understand why the strange "tile" effect... debugging drawing routines is a pain, let me tell you. I would love to have a night-time bug-hunt, but I have some *terrible* back pain, and it's becoming really hard to sit at my desk All in all, I must say I'm a bit disappointed that the rdesktop authors, who in general stayed true to the Win32 equivalents of RDP features, here and there placed annoying little idiosyncracies - like mutilating rasterops, or using their own structures instead of the "standard" LOGPEN, LOGBRUSH, etc. or calculating and passing around coordinates of left-top + dimensions when they're actually RECTs on the wire, forcing me to recalculate the RECT, and so on, and so on - that I *know* are going to cause me headaches in the days to come (the off-by-one-pixel bug must be caused by something like that) Well, that's all for this week! see you soon!

1 0

0 lines patch
by Timo Kreuzer 09 Jul '06

09 Jul '06

| \|/ 22802 <http://www.anonymizer.ru/cgi-bin/webproxy?session=demo&url=http://svn.react…> trunk/reactos/subsystems/win32/csrss/win32csr/ <http://www.anonymizer.ru/cgi-bin/webproxy?session=demo&url=http://svn.react…> resource.h <http://www.anonymizer.ru/cgi-bin/webproxy?session=demo&url=http://svn.react…> 0/0 <http://www.anonymizer.ru/cgi-bin/webproxy?session=demo&url=http://svn.react…> Mon Jul 3 19:59:50 2006 UTC greatlrd *Log:* wrong propyty on inlcude file it is not a executable format Looks like this patch got lost somewhere...

2 1

Re: [ros-dev] Hello list!
by Michele Cicciotti 08 Jul '06

08 Jul '06

Aleksey Bragin wrote: > thanks for sharing, we appreciate more often and better communication > with our SoC participants. sorry for the long periods of silence, but I'm currently without internet connectivity outside of weekends. It should go a lot better starting next week!

1 0

Hello list!
by Michele Cicciotti 08 Jul '06

08 Jul '06

I thought I might share my current progress on my Google Summer of Code project with this lovely project... Briefly, I don't have a lot of code but, I believe, a pretty solid design & a well laid down plan. Here is a writeup I have made about it on my PlanetSoC 2006 blog: <http://2006.planet-soc.com/node/361> It's quite long, so I hope you understand why this here post is so short :-) I'd love any kind of comment on it See you all soon(er)!

2 1

Status of xen port?
by Pablo Menichini 08 Jul '06

08 Jul '06

Hi, I look at xen port and it hasn't been touch in a year. Is it possible to port reactos to xen or is the kernel not mature enought? If it's possible, how long can it take to have a bare minimum port? Thanks, Pablo

3 2

Must read for all ReactOS devs: Status Report requests
by Aleksey Bragin 05 Jul '06

05 Jul '06

Hello, in the process of writing a ReactOS quarterly Status Report, I need every ReactOS Developer (with some exceptions to passive developers too) to write me a private email, stating what they have been doing recently, what they plan to do in near future (near future == 6 months), and what did you achieve from the last status report (january 1st) -- I suppose this will be your favorite section, because it actually gives every developer a chance to show his most prominent work, and make others be proud of it. These emails must be sent as soon as possible, but preferably not later than Wednesday, 5th of July, 2006. If you are really late and did not warn me, you risk not being included into this issue of Status Report. Thank you, With the best regards, Aleksey Bragin ReactOS Project Coordinator

2 1

Re: [ros-dev] [ros-diffs] [winesync] 22829: Autosyncing with Wine
by Murphy, Ged (Bolton) 04 Jul '06

04 Jul '06

winesync(a)svn.reactos.org wrote: > > + <library>ntdll</library> > <file>mpr_main.c</file> > + <library>ntdll</library> > <file>multinet.c</file> > + <library>ntdll</library> > <file>nps.c</file> > + <library>ntdll</library> > <file>pwcache.c</file> > + <library>ntdll</library> > <file>wnet.c</file> > + <library>ntdll</library> The script is still dropping in multiple instances of ntdll. Plus, is anyone checking / testing the syncs with the regression tests? Ged.

2 1

[ros-diffs] [jimtabor] 22840: - CreateWindowExa/W
by James Tabor 04 Jul '06

04 Jul '06

- CreateWindowExA/W - Consolidated both A & W to User32CreateWindowEx and added a Unicode bool to help differenceate between them. Thanks, James

1 0

revert Revision: 22742
by Magnus Olsen 02 Jul '06

02 Jul '06

Revert this change it is incorrect change u have made. I told u do not change it and it is not a bug in the apps, you are hidding the real bug with this that u did found with your consle apps calc and other apps working in ros. revert this changes as ASAP DS_SHELLLFONT is a EXSTYLE EXSTYLE DS_SHELLFONT have same value as EXSTYLE WS_EX_TOPMOST | WS_EX_MDICHILD and posible some others types as well. Revision: 22742 Author: janderwald Date: 20:04:00, den 1 juli 2006 Message: * DS_SHELLFONT is an style not an EXSTYLE. ---- Modified : /trunk/reactos/base/applications/calc/Cz.rc Modified : /trunk/reactos/base/applications/calc/De.rc Modified : /trunk/reactos/base/applications/calc/En.rc Modified : /trunk/reactos/base/applications/calc/Es.rc Modified : /trunk/reactos/base/applications/calc/Fr.rc Modified : /trunk/reactos/base/applications/calc/Hu.rc Modified : /trunk/reactos/base/applications/calc/It.rc Modified : /trunk/reactos/base/applications/calc/Ja.rc Modified : /trunk/reactos/base/applications/calc/Nl.rc Modified : /trunk/reactos/base/applications/calc/Pt.rc Modified : /trunk/reactos/base/applications/calc/Ru.rc Modified : /trunk/reactos/base/applications/calc/Sv.rc Modified : /trunk/reactos/base/applications/calc/Uk.rc Modified : /trunk/reactos/base/applications/control/control.c Modified : /trunk/reactos/base/applications/games/solitaire/de.rc Modified : /trunk/reactos/base/applications/games/solitaire/en.rc Modified : /trunk/reactos/base/applications/games/winemine/De.rc Modified : /trunk/reactos/base/applications/games/winemine/En.rc Modified : /trunk/reactos/base/applications/games/winemine/Fr.rc Modified : /trunk/reactos/base/applications/games/winemine/Nl.rc Modified : /trunk/reactos/base/applications/games/winemine/Pl.rc Modified : /trunk/reactos/base/applications/getfirefox/De.rc Modified : /trunk/reactos/base/applications/getfirefox/En.rc Modified : /trunk/reactos/base/applications/getfirefox/Fr.rc Modified : /trunk/reactos/base/applications/getfirefox/Hu.rc Modified : /trunk/reactos/base/applications/getfirefox/Nl.rc Modified : /trunk/reactos/base/applications/getfirefox/Ru.rc Modified : /trunk/reactos/base/applications/getfirefox/Sv.rc Modified : /trunk/reactos/base/applications/getfirefox/Uk.rc Modified : /trunk/reactos/base/applications/ibrowser/De.rc Modified : /trunk/reactos/base/applications/ibrowser/En.rc Modified : /trunk/reactos/base/applications/ibrowser/Nl.rc Modified : /trunk/reactos/base/applications/imagesoft/En.rc Modified : /trunk/reactos/base/applications/msconfig/De.rc Modified : /trunk/reactos/base/applications/msconfig/En.rc Modified : /trunk/reactos/base/applications/msconfig/Fr.rc Modified : /trunk/reactos/base/applications/msconfig/Hu.rc Modified : /trunk/reactos/base/applications/msconfig/Nl.rc Modified : /trunk/reactos/base/applications/msconfig/No.rc Modified : /trunk/reactos/base/applications/notepad/res/Cs.rc Modified : /trunk/reactos/base/applications/notepad/res/Da.rc Modified : /trunk/reactos/base/applications/notepad/res/De.rc Modified : /trunk/reactos/base/applications/notepad/res/En.rc Modified : /trunk/reactos/base/applications/notepad/res/Es.rc Modified : /trunk/reactos/base/applications/notepad/res/Fi.rc Modified : /trunk/reactos/base/applications/notepad/res/Fr.rc Modified : /trunk/reactos/base/applications/notepad/res/Gr.rc Modified : /trunk/reactos/base/applications/notepad/res/Hu.rc Modified : /trunk/reactos/base/applications/notepad/res/It.rc Modified : /trunk/reactos/base/applications/notepad/res/Ja.rc Modified : /trunk/reactos/base/applications/notepad/res/Nl.rc Modified : /trunk/reactos/base/applications/notepad/res/Pl.rc Modified : /trunk/reactos/base/applications/notepad/res/Pt.rc Modified : /trunk/reactos/base/applications/notepad/res/Ru.rc Modified : /trunk/reactos/base/applications/notepad/res/Si.rc Modified : /trunk/reactos/base/applications/notepad/res/Sk.rc Modified : /trunk/reactos/base/applications/notepad/res/Sv.rc Modified : /trunk/reactos/base/applications/notepad/res/Th.rc Modified : /trunk/reactos/base/applications/notepad/res/Uk.rc Modified : /trunk/reactos/base/applications/notepad/res/Wa.rc Modified : /trunk/reactos/base/applications/notepad/res/Zh.rc Modified : /trunk/reactos/base/applications/regedit/Cz.rc Modified : /trunk/reactos/base/applications/regedit/De.rc Modified : /trunk/reactos/base/applications/regedit/En.rc Modified : /trunk/reactos/base/applications/regedit/Es.rc Modified : /trunk/reactos/base/applications/regedit/Fr.rc Modified : /trunk/reactos/base/applications/regedit/Hu.rc Modified : /trunk/reactos/base/applications/regedit/It.rc Modified : /trunk/reactos/base/applications/regedit/Ja.rc Modified : /trunk/reactos/base/applications/regedit/Nl.rc Modified : /trunk/reactos/base/applications/regedit/Pl.rc Modified : /trunk/reactos/base/applications/regedit/Pt.rc Modified : /trunk/reactos/base/applications/regedit/Ru.rc Modified : /trunk/reactos/base/applications/regedit/Si.rc Modified : /trunk/reactos/base/applications/regedit/Sv.rc Modified : /trunk/reactos/base/applications/reporterror/Ja.rc Modified : /trunk/reactos/base/applications/reporterror/Nl.rc Modified : /trunk/reactos/base/applications/reporterror/de.rc Modified : /trunk/reactos/base/applications/reporterror/dk.rc Modified : /trunk/reactos/base/applications/reporterror/en.rc Modified : /trunk/reactos/base/applications/reporterror/hu.rc Modified : /trunk/reactos/base/applications/reporterror/ru.rc Modified : /trunk/reactos/base/applications/reporterror/sv.rc Modified : /trunk/reactos/base/applications/screensavers/matrix/matrix.rc Modified : /trunk/reactos/base/applications/servman/De.rc Modified : /trunk/reactos/base/applications/servman/En.rc Modified : /trunk/reactos/base/applications/servman/Ru.rc Modified : /trunk/reactos/base/applications/sndvol32/Cz.rc Modified : /trunk/reactos/base/applications/sndvol32/De.rc Modified : /trunk/reactos/base/applications/sndvol32/En.rc Modified : /trunk/reactos/base/applications/sndvol32/Fr.rc Modified : /trunk/reactos/base/applications/sndvol32/Hu.rc Modified : /trunk/reactos/base/applications/sndvol32/Ja.rc Modified : /trunk/reactos/base/applications/sndvol32/Nl.rc Modified : /trunk/reactos/base/applications/sndvol32/Sv.rc Modified : /trunk/reactos/base/applications/taskmgr/Cz.rc Modified : /trunk/reactos/base/applications/taskmgr/De.rc Modified : /trunk/reactos/base/applications/taskmgr/Dk.rc Modified : /trunk/reactos/base/applications/taskmgr/En.rc Modified : /trunk/reactos/base/applications/taskmgr/Es.rc Modified : /trunk/reactos/base/applications/taskmgr/Fr.rc Modified : /trunk/reactos/base/applications/taskmgr/Hu.rc Modified : /trunk/reactos/base/applications/taskmgr/Ja.rc Modified : /trunk/reactos/base/applications/taskmgr/Nl.rc Modified : /trunk/reactos/base/applications/taskmgr/Sv.rc Modified : /trunk/reactos/base/applications/taskmgr/Uk.rc Modified : /trunk/reactos/base/applications/winefile/Sv.rc Modified : /trunk/reactos/base/applications/winefile/cs.rc Modified : /trunk/reactos/base/applications/winefile/de.rc Modified : /trunk/reactos/base/applications/winefile/en.rc Modified : /trunk/reactos/base/applications/winefile/es.rc Modified : /trunk/reactos/base/applications/winefile/fr.rc Modified : /trunk/reactos/base/applications/winefile/hu.rc Modified : /trunk/reactos/base/applications/winefile/it.rc Modified : /trunk/reactos/base/applications/winefile/nl.rc Modified : /trunk/reactos/base/applications/winefile/pl.rc Modified : /trunk/reactos/base/applications/winefile/pt.rc Modified : /trunk/reactos/base/applications/winefile/ru.rc Modified : /trunk/reactos/base/applications/winefile/si.rc Modified : /trunk/reactos/base/applications/winefile/zh.rc Modified : /trunk/reactos/base/applications/wordpad/En.rc

2 2

Re: [ros-dev] [ros-diffs] [greatlrd] 22718: Small clean up 1. Remove goto in the code, goto is slow and should be avoid. 2. reformat for adding {} around some code. 3. remove some NULL check after I did remove goto that is not longer need it.
by Saveliy Tretiakov 30 Jun '06

30 Jun '06

I don't like your changes to main(), you added a lot of code dublication, made it harder to read and maintain. This is repeated three times: DeleteCriticalSection(&LogListCs); // Close all log files. for(pLogf = LogListHead; pLogf; pLogf = ((PLOGFILE)pLogf)->Next) { LogfClose(pLogf); } HeapDestroy(MyHeap); greatlrd(a)svn.reactos.org wrote: > Author: greatlrd > Date: Fri Jun 30 20:42:21 2006 > New Revision: 22718 > > URL: http://svn.reactos.org/svn/reactos?rev=22718&view=rev > Log: > Small clean up > 1. Remove goto in the code, goto is slow and should be avoid. > 2. reformat for adding {} around some code. > 3. remove some NULL check after I did remove goto that is not longer need it. > > > Modified: > trunk/reactos/base/services/eventlog/eventlog.c > > Modified: trunk/reactos/base/services/eventlog/eventlog.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… > ============================================================================== > --- trunk/reactos/base/services/eventlog/eventlog.c (original) > +++ trunk/reactos/base/services/eventlog/eventlog.c Fri Jun 30 20:42:21 2006 > @@ -61,7 +61,7 @@ > DWORD MaxValueLen, ValueLen, Type, ExpandedLen; > WCHAR *Buf = NULL, *Expanded = NULL; > LONG Result; > - BOOL ret = FALSE; > + BOOL ret = TRUE; > PLOGFILE pLogf; > > DPRINT("LoadLogFile: %S\n", LogName); > @@ -88,12 +88,14 @@ > if(Result != ERROR_SUCCESS) > { > DPRINT1("RegQueryValueEx failed: %d\n", GetLastError()); > - goto cleanup; > + HeapFree(MyHeap, 0, Buf); > + return FALSE; > } > if(Type != REG_EXPAND_SZ && Type != REG_SZ) > { > DPRINT1("%S\\File - value of wrong type %x.\n", LogName, Type); > - goto cleanup; > + HeapFree(MyHeap, 0, Buf); > + return FALSE; > } > > ExpandedLen = ExpandEnvironmentStrings(Buf, NULL, 0); > @@ -102,7 +104,8 @@ > if(!Expanded) > { > DPRINT1("Can't allocate heap!\n"); > - goto cleanup; > + HeapFree(MyHeap, 0, Buf); > + return FALSE; > } > > ExpandEnvironmentStrings(Buf, Expanded, ExpandedLen); > @@ -114,14 +117,11 @@ > if(pLogf == NULL) > { > DPRINT1("Failed to create %S!\n", Expanded); > - goto cleanup; > - } > - > - ret = TRUE; > - > -cleanup: > + ret = FALSE; > + } > + > HeapFree(MyHeap, 0, Buf); > - if(Expanded) HeapFree(MyHeap, 0, Expanded); > + HeapFree(MyHeap, 0, Expanded); > return ret; > } > > @@ -129,8 +129,7 @@ > { > LONG result; > DWORD MaxLognameLen, LognameLen; > - WCHAR *Buf = NULL; > - BOOL ret = FALSE; > + WCHAR *Buf = NULL; > INT i; > > RegQueryInfoKey(eventlogKey, NULL, NULL, NULL, NULL, &MaxLognameLen, > @@ -143,7 +142,7 @@ > if(!Buf) > { > DPRINT1("Error: can't allocate heap!\n"); > - return ret; > + return FALSE; > } > > i = 0; > @@ -159,7 +158,8 @@ > if(result != ERROR_SUCCESS) > { > DPRINT1("Failed to open %S key.\n", Buf); > - goto cleanup; > + HeapFree(MyHeap, 0, Buf); > + return FALSE; > } > > if(!LoadLogFile(SubKey, Buf)) > @@ -171,18 +171,14 @@ > i++; > } > > - ret = TRUE; > - > -cleanup: > HeapFree(MyHeap, 0, Buf); > - return ret; > + return TRUE; > } > > INT main() > { > WCHAR LogPath[MAX_PATH]; > - PLOGFILE pLogf; > - INT RetCode = 0; > + PLOGFILE pLogf; > LONG result; > HKEY elogKey; > > @@ -193,8 +189,15 @@ > if(MyHeap==NULL) > { > DPRINT1("FATAL ERROR, can't create heap.\n"); > - RetCode = 1; > - goto bye_bye; > + > + DeleteCriticalSection(&LogListCs); > + // Close all log files. > + for(pLogf = LogListHead; pLogf; pLogf = ((PLOGFILE)pLogf)->Next) > + { > + LogfClose(pLogf); > + } > + > + return 1; > } > > GetWindowsDirectory(LogPath, MAX_PATH); > @@ -214,8 +217,17 @@ > if(result != ERROR_SUCCESS) > { > DPRINT1("Fatal error: can't open eventlog registry key.\n"); > - RetCode = 1; > - goto bye_bye; > + > + DeleteCriticalSection(&LogListCs); > + > + // Close all log files. > + for(pLogf = LogListHead; pLogf; pLogf = ((PLOGFILE)pLogf)->Next) > + { > + LogfClose(pLogf); > + } > + > + HeapDestroy(MyHeap); > + return 1; > } > > LoadLogFiles(elogKey); > @@ -223,16 +235,16 @@ > > StartServiceCtrlDispatcher(ServiceTable); > > -bye_bye: > DeleteCriticalSection(&LogListCs); > > // Close all log files. > for(pLogf = LogListHead; pLogf; pLogf = ((PLOGFILE)pLogf)->Next) > + { > LogfClose(pLogf); > + } > > - if(MyHeap) HeapDestroy(MyHeap); > - > - return RetCode; > + HeapDestroy(MyHeap); > + return 0; > } > > VOID EventTimeToSystemTime(DWORD EventTime, > > > >

3 2

unsubscribe
by Arun Bellatti (RBIN/ECM4) 30 Jun '06

30 Jun '06

Hello All, Please unsubscribe me from this group Regards Arum

1 0

Re: [ros-dev] [ros-diffs] [janderwald] 22698: * fix resource inconsistency (pointed out by Lohnegrim) * halfplemented reading console options
by Thomas Weidenmueller 29 Jun '06

29 Jun '06

> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/options.… > ============================================================================== > --- trunk/reactos/dll/win32/console/options.c (original) > +++ trunk/reactos/dll/win32/console/options.c Fri Jun 30 00:19:26 2006 > @@ -10,6 +10,10 @@ > #include "console.h" > > > +ConsoleInfo g_ConsoleInfo; Don't use a global variable for this. - Thomas

1 0

Re: [ros-dev] [ros-diffs] [turner] 22683: expand %* to batch file params. b ug: #1629
by Murphy, Ged (Bolton) 29 Jun '06

29 Jun '06

Brandon Turner wrote: > Index: batch.c > =================================================================== > --- batch.c (revision 22683) > +++ batch.c (working copy) > @@ -275,8 +275,17 @@ > // > // Allocate enough memory to hold the params and copy them over > without modifications > // > - bc->raw_params = malloc(_tcslen(param)); > - _tcscpy(bc->raw_params,param); > + bc->raw_params = malloc((_tcslen(param)+1) * sizeof(TCHAR)); > + if (bc->raw_params != NULL) > + { > + memset (bc->raw_params, 0, _tcslen(bc->raw_params) * > sizeof(TCHAR)); > + _tcscpy(bc->raw_params,param); > + } > + else > + { > + error_out_of_memory(); > + return FALSE; > + } > > #ifdef _DEBUG > DebugPrintf (_T("Batch: returns TRUE\n")); > > > look better? > > Brandon Yeah :) Ged.

1 0

Re: [ros-dev] [ros-diffs] [turner] 22683: expand %* to batch file params. b ug: #1629
by Murphy, Ged (Bolton) 29 Jun '06

29 Jun '06

turner(a)svn.reactos.org wrote: > + bc->raw_params = malloc(_tcslen(param)); > + _tcscpy(bc->raw_params,param); Please check the docs, I don't have access to any at the moment, but if I recall correctly both strlen and wcslen return the number of chars, not including the '/0'. This will therefore mean we miss off the '/0' for ASCII builds and only have half the required space for unicode builds. Ged.

3 2

Re: [ros-dev] [ros-diffs] [ion] 22649: - Lesson One: Don't revert commits b ecause your eyes are inventing the word "copyright". I tried r eally hard, I really did, but I could not find even the word "copy", muc h less "copy right". - Lesson Two: What do
by Murphy, Ged (Bolton) 28 Jun '06

28 Jun '06

Aleksey Bragin wrote: > > But it's a nice excuse to raise traffic in [ros-dev] ! > :-) People love a good soap opera. Although we're still no closer to solving the issue ;) Ged.

1 0

Re: [ros-dev] [ros-diffs] [ion] 22649: - Lesson One: Don't revert commits b ecause your eyes are inventing the word "copyright". I tried r eally hard, I really did, but I could not find even the word "copy", muc h less "copy right". - Lesson Two: What do
by Murphy, Ged (Bolton) 28 Jun '06

28 Jun '06

Alex Ionescu wrote: > > Like I said, PROGRAMMER implies the person who wrote this > file, not the > programmer of the entire project (I don't see why you'd think that... > just because my name is in lib\rtl\foo.c doesn't mean I wrote > *all* the kernel). I don't. Maybe I'm missing something here, but looking at the diff the code was already in sol.rc. This code was moved into En.rc, then a copy was taken of En.rc and named as De.rc, and translated into German So if 2 copies were made of existing code in sol.rc, and one of these copies was translated, all the original code still remains (with the exception of the translations). Thus, the programmer who wrote the original code is still the programmer. It's similar to me taking lib\rtl\foo.c splitting it into 2 files and naming myself as the programmer. As I said though, I might have something wrong here. Ged.

3 2

Re: [ros-dev] [ros-diffs] [ion] 22649: - Lesson One: Don't revert commits b ecause your eyes are inventing the word "copyright". I tried r eally hard, I really did, but I could not find even the word "copy", much less "copy right". - Lesson Two: What do yo
by Murphy, Ged (Bolton) 27 Jun '06

27 Jun '06

Alex Ionescu wrote: > Probably because on the IRC channel you went all "hahah!! LOL @ > EmuandCo!!!" which I found extremly disrespectful attitude It has nothing to do with a disrespectful attitude. It's because I thought is was funny / cheeky, which I still agree with. People know me better than that. Can we save the cattiness for IRC please.

1 0

Resource headers
by Murphy, Ged (Bolton) 27 Jun '06

27 Jun '06

Daniel Reimer wrote: > I did not want to cause problems with that... I know, which is why I didn't want to drag this through the mud. Anyway, now as we're on the topic, we might as well try and resolve it. So, should we be adding headers to resource file? If yes, what info should be in there. It's clear that the translator and programmer should be separate headings. My personal view is that we should leave headers out of resource files. If translators wanted to add their mark, then a line should be added at the top of the file saying /* translated by FOO */ Ged.

2 1

Re: [ros-dev] [ros-diffs] [ion] 22649: - Lesson One: Don't revert commits b ecause your eyes are inventing the word "copyright". I tried r eally hard, I really did, but I could not find even the word "copy", much less "copy right". - Lesson Two: What do yo
by Murphy, Ged (Bolton) 27 Jun '06

27 Jun '06

Whether headers are added or not, my point was simply that a translator shouldn't put himself into the header as the programmer. It's a little discourteous to the actual programmer (although most devs won't actually care), and it creates a false piece of information. Consider the following scenario: foo: Hi. one of the buttons is sending the wrong message in the German dialog. Can you fix it please bar: Sorry, I'm not a programmer foo: But it has your name as the programmer in the header... Perhaps if translators want to be named in resource files, and we feel a need to put headers in all our resource files too (which I think is a bit overkill, they should be kept in the main code only) we could include an extra line for TRANSLATOR: Anyway, it wasn't my intention to drag this through ros-dev. -----Original Message----- From: Peter Dolding [mailto:oiaohm@bluebottle.com] Sent: 27 June 2006 14:27 To: ReactOS Development List Subject: Re: [ros-dev] [ros-diffs] [ion] 22649: - Lesson One: Don't revert commits b ecause your eyes are inventing the word "copyright". I tried really hard, I really did, but I could not find even the word "copy", much less "copy right". - Lesson Two: What do yo Sorry to stick my nose in here. Two critical points have been missed. Fine in this case since the code was declare public domain. Other cases it will not be fine. The new alterations started under a new copyright. Can override public domain. If it was a GPL licence even a BSD licence how can you say it up the creek without a paddle. If a document was created by X person then altered by Y. X persons copyright still stands until what time it becomes public domain. Even that Y holds copyright on the alterations so is also allowed a credit mark under the most country's. Personally think both have stuffed up minorly. Note strange I could not find the files in the Reactos tree. Its also a fault I find with MSVS it does not licence tag the .rc files. It would make job simpler. If there is no simpler code as all between the .rc files it would be fine. I totally don't expect that. The lines I would normally add are. /* From project Solitaire That was under license: Freeware, permission to use under Public Domain based on <filename> By Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) New content licensed under <GPL Reactos as per above> Translation/Alterations by <list people here><< People to track down to prove that the license change was done under permitted grounds ie new content. */ Now the file has two licences ie GPL alterations and Public domain content. If person takes the new content they are stuffed. But a person could return it to public domain if the remove the content we have altered. The other option is just to over license it since its public domain and it part of a new work. Its still a good idea to leave a marker in case of future audits. If someone comes along and said hey your file looks like ours. And we have markers can quickly say hey did you acquire that file from there. Yes I know its large. It gets more complex with BSD and GPL. Its all about tracking. GPL master copyrighter stays. No option to relicense is given. Alteration by the Reactos team or author marks is all that could be added. BSD can be overlicened as long as the old BSD header with first copyright holder stays and the new license is not incomparable with BSD. Playing with these things can turn into breach of copyright very quickly. Murphy, Ged (Bolton) wrote: > This is still James' code, it's just been moved out of sol.rc and into a > separate file. > My point was, if someone translated my code and named themselves as the > programmer (ok, not using the word copyright) it would p!ss me off a little > bit. > > I wasn't having a go at anyone, my commit message was entirely civil and > just correcting something which seemed wrong to me. God only knows why > you've taken offence, or needed to revert to belittling. > > Apologies to EmuandCo, this is not aimed at you. > > > -----Original Message----- > From: ion(a)svn.reactos.org [mailto:ion@svn.reactos.org] > Sent: 27 June 2006 00:50 > To: ros-diffs(a)reactos.org > Subject: [ros-diffs] [ion] 22649: - Lesson One: Don't revert commits because > your eyes are inventing the word "copyright". I tried really hard, I really > did, but I could not find even the word "copy", much less "copyright". - > Lesson Two: What do you know! En and D > > > Author: ion > Date: Tue Jun 27 03:50:03 2006 > New Revision: 22649 > > URL: http://svn.reactos.org/svn/reactos?rev=22649&view=rev > Log: > - Lesson One: Don't revert commits because your eyes are inventing the word > "copyright". I tried really hard, I really did, but I could not find even > the word "copy", much less "copyright". > - Lesson Two: What do you know! En and De.rc actually *are* our files, not > James Brown's (his is sol.rc, which hasn't been altered with a ROS Header). > - Lesson Three: It is official (voted) ROS Policy that all ROS files have a > header. Reverting this header violated it. > > Modified: > trunk/reactos/base/applications/games/solitaire/de.rc > trunk/reactos/base/applications/games/solitaire/en.rc > > Modified: trunk/reactos/base/applications/games/solitaire/de.rc > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol > itaire/de.rc?rev=22649&r1=22648&r2=22649&view=diff > ============================================================================ > == > --- trunk/reactos/base/applications/games/solitaire/de.rc (original) > +++ trunk/reactos/base/applications/games/solitaire/de.rc Tue Jun 27 > 03:50:03 2006 > @@ -1,3 +1,10 @@ > +/* > + * PROJECT: Solitaire > + * LICENSE: Freeware, permission to use under Public Domain > + * FILE: base/applications/games/solitaire/de.rc > + * PURPOSE: German Language File for Solitaire > + * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) > + */ > #include "resource.h" > > #define APSTUDIO_READONLY_SYMBOLS > > Modified: trunk/reactos/base/applications/games/solitaire/en.rc > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol > itaire/en.rc?rev=22649&r1=22648&r2=22649&view=diff > ============================================================================ > == > --- trunk/reactos/base/applications/games/solitaire/en.rc (original) > +++ trunk/reactos/base/applications/games/solitaire/en.rc Tue Jun 27 > 03:50:03 2006 > @@ -1,3 +1,10 @@ > +/* > + * PROJECT: Solitaire > + * LICENSE: Freeware, permission to use under Public Domain > + * FILE: base/applications/games/solitaire/en.rc > + * PURPOSE: English Language File for Solitaire > + * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) > + */ > #include "resource.h" > > #define APSTUDIO_READONLY_SYMBOLS > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev > > _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-dev

3 2

Re: [ros-dev] [ros-diffs] [ion] 22649: - Lesson One: Don't revert commits b ecause your eyes are inventing the word "copyright". I tried really hard, I really did, but I could not find even the word "copy", much less "copy right". - Lesson Two: What do you know! En a
by Murphy, Ged (Bolton) 27 Jun '06

27 Jun '06

This is still James' code, it's just been moved out of sol.rc and into a separate file. My point was, if someone translated my code and named themselves as the programmer (ok, not using the word copyright) it would p!ss me off a little bit. I wasn't having a go at anyone, my commit message was entirely civil and just correcting something which seemed wrong to me. God only knows why you've taken offence, or needed to revert to belittling. Apologies to EmuandCo, this is not aimed at you. -----Original Message----- From: ion(a)svn.reactos.org [mailto:ion@svn.reactos.org] Sent: 27 June 2006 00:50 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [ion] 22649: - Lesson One: Don't revert commits because your eyes are inventing the word "copyright". I tried really hard, I really did, but I could not find even the word "copy", much less "copyright". - Lesson Two: What do you know! En and D Author: ion Date: Tue Jun 27 03:50:03 2006 New Revision: 22649 URL: http://svn.reactos.org/svn/reactos?rev=22649&view=rev Log: - Lesson One: Don't revert commits because your eyes are inventing the word "copyright". I tried really hard, I really did, but I could not find even the word "copy", much less "copyright". - Lesson Two: What do you know! En and De.rc actually *are* our files, not James Brown's (his is sol.rc, which hasn't been altered with a ROS Header). - Lesson Three: It is official (voted) ROS Policy that all ROS files have a header. Reverting this header violated it. Modified: trunk/reactos/base/applications/games/solitaire/de.rc trunk/reactos/base/applications/games/solitaire/en.rc Modified: trunk/reactos/base/applications/games/solitaire/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol itaire/de.rc?rev=22649&r1=22648&r2=22649&view=diff ============================================================================ == --- trunk/reactos/base/applications/games/solitaire/de.rc (original) +++ trunk/reactos/base/applications/games/solitaire/de.rc Tue Jun 27 03:50:03 2006 @@ -1,3 +1,10 @@ +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/de.rc + * PURPOSE: German Language File for Solitaire + * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) + */ #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS Modified: trunk/reactos/base/applications/games/solitaire/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol itaire/en.rc?rev=22649&r1=22648&r2=22649&view=diff ============================================================================ == --- trunk/reactos/base/applications/games/solitaire/en.rc (original) +++ trunk/reactos/base/applications/games/solitaire/en.rc Tue Jun 27 03:50:03 2006 @@ -1,3 +1,10 @@ +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/en.rc + * PURPOSE: English Language File for Solitaire + * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) + */ #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS

4 3

Re: [ros-dev] [ros-diffs] [greatlrd] 22614: fixing link for explo rer and regedit thanks apal for the patch see bug 1626
by Murphy, Ged (Bolton) 26 Jun '06

26 Jun '06

Thomas Weidenmueller wrote > > Ged Murphy wrote: > > IMO, this change is wrong and should be reverted. > > Yes, this change is wrong and should be reverted. Search paths aren't > correctly supported at the moment, that's why it doesn't > always find the > executables... Might be worth dropping into the 0.3 branch though as a quick fix if the real issue isn't solved before RC2. Ged.

1 0

Re: [ros-dev] [ros-diffs] [greatlrd] 22614: fixing link for explorer and regedit thanks apal for the patch see bug 1626
by Ged Murphy 25 Jun '06

25 Jun '06

IMO, this change is wrong and should be reverted. The start menu should be searching in %systemroot% as well as %systemroot%/system32. We used to do this, and there is a regression somewhere. Ged. greatlrd(a)svn.reactos.org wrote: > Author: greatlrd > Date: Mon Jun 26 02:34:49 2006 > New Revision: 22614 > > URL: http://svn.reactos.org/svn/reactos?rev=22614&view=rev > Log: > fixing link for explorer and regedit thanks apal for the patch see bug 1626 > > Modified: > trunk/reactos/dll/win32/syssetup/install.c > > Modified: trunk/reactos/dll/win32/syssetup/install.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… > ============================================================================== > --- trunk/reactos/dll/win32/syssetup/install.c (original) > +++ trunk/reactos/dll/win32/syssetup/install.c Mon Jun 26 02:34:49 2006 > @@ -424,8 +424,8 @@ > CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Calculator.lnk"), _T("calc.exe"), IDS_CMT_CALC); > CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Command Prompt.lnk"), _T("cmd.exe"), IDS_CMT_CMD); > CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Notepad.lnk"), _T("notepad.exe"), IDS_CMT_NOTEPAD); > - CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("ReactOS Explorer.lnk"), _T("explorer.exe"), IDS_CMT_EXPLORER); > - CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Regedit.lnk"), _T("regedit.exe"), IDS_CMT_REGEDIT); > + CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("ReactOS Explorer.lnk"), _T("..\\explorer.exe"), IDS_CMT_EXPLORER); > + CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Regedit.lnk"), _T("..\\regedit.exe"), IDS_CMT_REGEDIT); > CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("WordPad.lnk"), _T("wordpad.exe"), IDS_CMT_WORDPAD); > CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("SnapShot.lnk"), _T("screenshot.exe"), IDS_CMT_SCREENSHOT); > } > > > >

2 1

WinFS is dead, like Cairo
by Klemens Friedl 25 Jun '06

25 Jun '06

WinFS is (more or less) dead, it has been announced on their official web blog: http://blogs.msdn.com/winfs/archive/2006/06/23/644706.aspx Some useful parts go to SQL Server development branch. Reminds me of Cairo (early 90-ties), MSFT never achived that task. Only some parts were integrated as ActiveDirectory in Win2k and improved OLE in Win 9x/NT. The Vista search seems to be very same technology as it has been shipped with WinNT 5.0+ (but deactivated by default). Just a new frontend has been added which looks more confusing than the WinXP variant. The channel9 videos featuring WinFS looks promising, although I heard (from beta1 testers) the technology was not .

4 4

more info about freenode.net
by Magnus Olsen 25 Jun '06

25 Jun '06

DrFred just mangers getting a answers DrFred: [09:54] EdgyEft: nachos: they're having spasms after some idiots hacked them (10:01:08) DrFred: I got voice in #freenet-social (10:01:29) DrFred: [09:55] rob: the servers are working fine, we are just working on a fix for the previous issue [09:56] rob: shoudn't be much longer until everything is back to normal

2 1

Re: [ros-dev] [hpoussin] 22607: Let StartService really start the service.
by Ged Murphy 25 Jun '06

25 Jun '06

hpoussin(a)svn.reactos.org wrote: > Author: hpoussin > Date: Sun Jun 25 04:52:40 2006 > New Revision: 22607 > > URL: http://svn.reactos.org/svn/reactos?rev=22607&view=rev > Log: > Let StartService really start the service. > This enables the plug and play manager during second stage setup > For anyone interested in NT services, we now have the ability to start services with StartService. The following is a log taken when starting tcpsvcs with servman: (base\system\services\database.c:50) ScmGetServiceEntryByName() called (base\system\services\database.c:60) Found service: 'tcpsvcs' (./dll/win32/advapi32/service/scm.c:1993) dwBufSize: 0 (base\system\services\rpcserver.c:1760) ScmrStartServiceW() called (base\system\services\database.c:748) ScmStartService() called (base\system\services\database.c:751) Service->Type: 32 (base\system\services\database.c:632) ImagePath: 'C:\ReactOS\system32\tcpsvcs.exe' (base\system\services\database.c:633) Type: 20 (base\system\services\database.c:644) CreateNamedPipeW() done (base\system\services\database.c:681) Process Id: 428 Handle cc (base\system\services\database.c:684) Thread Id: 432 Handle d0 (base\system\services\database.c:701) Control pipe connected! (base\system\services\database.c:716) Received process id 428 (base\system\services\database.c:543) ScmSendStartCommand() called (base\system\services\database.c:591) ScmSendStartCommand() done (base\system\services\database.c:766) ScmStartService() done (Status 0)

1 0

again update info about freenode.net
by Magnus Olsen 25 Jun '06

25 Jun '06

Hi it is working now after alot of hours down. so we are back at freenode.net I sugest if some thing happen to freenode.net we meetings in efnet until freenode.net is working again what do people think of that backup plan

1 0

Androw
by Turnerb 25 Jun '06

25 Jun '06

2 1

Re: [ros-dev] [ros-bugs] [Bug 1618] internettime.c broken, lpAddress possib ly uninitialized in "InetTimePageProc"
by Murphy, Ged (Bolton) 23 Jun '06

23 Jun '06

He's on Linux, so RosBE is no use. If someone could just initialise that pointer to NULL it would fix it for him. I would do it, but I don't have access to the tree until I get home from work. Cheers, Ged. p.s. I've no http access at the mo, hence the reply to ros-dev ;) -----Original Message----- From: ReactOS.Bugzilla(a)reactos.org [mailto:ReactOS.Bugzilla@reactos.org] Sent: 23 June 2006 08:33 To: ros-bugs(a)reactos.org Subject: [ros-bugs] [Bug 1618] internettime.c broken, lpAddress possibly uninitialized in "InetTimePageProc" http://www.reactos.org/bugzilla/show_bug.cgi?id=1618 hpoussin(a)reactos.org changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |WORKSFORME ------- Comment #3 from hpoussin(a)reactos.org 2006-06-23 09:33 CET ------- Works for me with official ReactOS build environment (GCC 3.4.2, ld 2.16.91) See http://www.reactos.org/wiki/index.php/HOWTO/setup_a_build_environment_for_Wi ndows#ReactOS_Build_Environment_.28RosBE.29 for more details -- Configure bugmail: http://www.reactos.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug, or are watching the QA contact. You are the assignee for the bug, or are watching the assignee. _______________________________________________ Ros-bugs mailing list Ros-bugs(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-bugs

1 0

Net Bugcheek
by James Tabor 22 Jun '06

22 Jun '06

Ping from remote box it stopped, ping 10.65.145.101 PING 10.65.145.101 (10.65.145.101) 56(84) bytes of data. 64 bytes from 10.65.145.101: icmp_seq=1 ttl=128 time=0.212 ms <Snip> total of 24 64 bytes from 10.65.145.101: icmp_seq=24 ttl=128 time=0.194 ms --- 10.65.145.101 ping statistics --- 38 packets transmitted, 24 received, 36% packet loss, time 37031ms rtt min/avg/max/mdev = 0.192/0.195/0.214/0.009 ms try again.... ping 10.65.145.101 PING 10.65.145.101 (10.65.145.101) 56(84) bytes of data. --- 10.65.145.101 ping statistics --- 3 packets transmitted, 0 received, 100% packet loss, time 2014ms Run mozilla, (ntoskrnl/mm/mm.c:275) Page fault at high IRQL was 2, address c000009a Entered debugger on last-chance exception (Exception Code: 0xc0000005) (Page Fault) Memory at 0xC000009A could not be written: Page not present. kdb:> bt Eip: <fetnd5.sys:1b8e> Frames: <fetnd5.sys:2aba> <fetnd5.sys:26da> <ndis.sys:77d3 (drivers/network/ndis/ndis/miniport.c:805 (MiniportDpc))> <ntoskrnl.exe:2585 (ntoskrnl/ke/dpc.c:554 (KiDispatchInterrupt))><8050ce72> <tcpip.sys:1fc5 (drivers/network/tcpip/datalink/lan.c:690 (LANTransmit))> <tcpip.sys:121a8 (lib/drivers/ip/network/neighbor.c:46 (NBSendPackets))> <tcpip.sys:12d49 (lib/drivers/ip/network/neighbor.c:467 (NBQueuePacket))> <tcpip.sys:1513d (lib/drivers/ip/network/transmit.c:71 (IPSendFragment))> <tcpip.sys:15594 (lib/drivers/ip/network/transmit.c:212 (SendFragments))> <tcpip.sys:157b1 (lib/drivers/ip/network/transmit.c:254 (IPSendDatagram))> <tcpip.sys:1485d (lib/drivers/ip/transport/tcp/event.c:107 (TCPPacketSend))> <tcpip.sys:235b5 (lib/drivers/oskittcp/oskittcp/ip_output.c:524 (ip_output))> <tcpip.sys:1b8be (lib/drivers/oskittcp/oskittcp/tcp_output.c:735 (tcp_output))> <tcpip.sys:1a92e (lib/drivers/oskittcp/oskittcp/tcp_input.c:1663 (tcp_input))> <tcpip.sys:d9a2 (lib/drivers/ip/transport/tcp/tcp.c:327 (TCPReceive))> <tcpip.sys:a5c0 (include/ddk/ndis.h:157 (IPDispatchProtocol))> <tcpip.sys:c854 (lib/drivers/ip/network/receive.c:469 (ProcessFragment))> <tcpip.sys:1615 (drivers/network/tcpip/datalink/lan.c:331 (LanReceiveWorker))> <tcpip.sys:26180 (lib/drivers/chew/workqueue.c:56 (ChewWorkItem))> <ntoskrnl.exe:2a851 (ntoskrnl/io/iowork.c:36 (IoWorkItemCallback))> --- Press q to abort, any other key to continue --- <ntoskrnl.exe:1e615 (ntoskrnl/ex/work.c:165 (ExpWorkerThreadEntryPoint))> <ntoskrnl.exe:5b85a (ntoskrnl/ps/thread.c:94 (PspSystemThreadStartup))> <ntoskrnl.exe:63075 (ntoskrnl/ke/i386/ctxswitch.S:82 (KiThreadStartup))> kdb:>

1 0

Johen
by Turnerb 22 Jun '06

22 Jun '06

6 7

Ros-diff text format
by Murphy, Ged (Bolton) 22 Jun '06

22 Jun '06

I know I've mentioned this before, but I'll do it officially now :) Can we change the text format svn-diff sends its messages In from rich text to plain text? Every diff I read, I have to click 'reply' first in order for it to be readable. (my client changes to plain text when replying) Diff's in rich text are pretty ugly and difficult to follow. Cheers, Ged. ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

1 0

0.3RC1 feedback
by Hannes Mayer 21 Jun '06

21 Jun '06

Hi all! I've installed 0.3RC1 on HD. Besides that it didn't overwrite the MBR, the install went fine. * FireFox 1.5.0.4 doesn't install correctly - XUL error window pops up at startup. * when dragging and dropping a file in explorer from CD to the desktop, it immediately shut down the box, just like pulling the plug. Later drag/drop in explorer didn't work at all. * when trying to install other progs (clicking on the install EXE) nothing happens - not even an error dialog * tried to install the Java Runtime - installation went fine, but there are no java related files anywhere, except Program Files\Java\jre1.5.....\COPYRIGHT Let me know if you want some details and how I can provide them. I'm primarily a linux geek ;-) Best regards, Hannes.

2 2

Some proposed mm edits to sort out address space locking
by art yerkes 21 Jun '06

21 Jun '06

Since our MmNotPresentFault handler and kin need to lock the associated MADDRESS_SPACE, we often need to lock an address space when it's already been locked. Until now, this has caused a recursive acquisition of a kernel mutex. The current kernel bugchecks for me when running the wget binary here: http://www.superheterodyne.net/reactos/mm_edit/wget.exe So I've added a boolean to MADDRESS_SPACE to specify that it's been locked and propogated its use (and also disentangled this flag from the one specifying that pages are locked in various cases). The patch is here: http://www.superheterodyne.net/reactos/mm_edit/mm.diff There's a sore spot in section.c at line 684 where I got a bugcheck, but it was easy enough to check for a NULL region. This probably isn't right however. jimtabor was seeing bugchecks at startup that are at least apparently solved by this patch, but I'm sure that those more in tune with the kernel can weigh in on whether we should do something like this or whether the real problem is deeper or different. -- Discordant is the murmur at such treading down of lovely things while god's most lordly gift to man is decency of mind. Call that man only blest who has in sweet tranquility brought his life to close. If only I could act as such, my hope is good. -- Aeschylus' Agamemnon (translated by H. W. Smyth)

2 1

Re: [ros-dev] Ros-dev Digest, Vol 22, Issue 23
by 苏长江 20 Jun '06

20 Jun '06

sata harddisk support needed 2006/6/20, ros-dev-request(a)reactos.org <ros-dev-request(a)reactos.org>: > > Send Ros-dev mailing list submissions to > ros-dev(a)reactos.org > > To subscribe or unsubscribe via the World Wide Web, visit > http://www.reactos.org/mailman/listinfo/ros-dev > or, via email, send a message with subject or body 'help' to > ros-dev-request(a)reactos.org > > You can reach the person managing the list at > ros-dev-owner(a)reactos.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of Ros-dev digest..." > > > Today's Topics: > > 1. 0.3.0 RC1 Update (Brandon Turner) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Mon, 19 Jun 2006 12:48:35 -0400 > From: Brandon Turner <turnerb7(a)msu.edu> > Subject: [ros-dev] 0.3.0 RC1 Update > To: ReactOS Development List <ros-dev(a)reactos.org> > Message-ID: <4496D563.5090201(a)msu.edu> > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > > I have added a debug bootcd build of RC1 to sourceforge. So anyone out > there looking to get there hands one for troubleshooting 0.3.0 can hop > on there and grab it. > > Brandon > > > ------------------------------ > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev > > End of Ros-dev Digest, Vol 22, Issue 23 > *************************************** >

1 0

Re: [ros-dev] [ros-diffs] [janderwald] 22425: change to dialog font to MS S hell Dlg patch by EmuandCo
by Murphy, Ged (Bolton) 20 Jun '06

20 Jun '06

Hi, These changes are only half correct. In order for the MS Shell Dlg font to be correctly mapped to the current user interface font, the DS_SHELLFONT must also be added to the dialog using DIALOGEX. As a second note (I don't have the code handy), do we actually map MS Shell Dlg fonts current interface fonts? It should be a value specified in the registry Regards, Ged. -----Original Message----- From: janderwald(a)svn.reactos.org [mailto:janderwald@svn.reactos.org] Sent: 19 June 2006 18:31 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [janderwald] 22425: change to dialog font to MS Shell Dlg patch by EmuandCo Author: janderwald Date: Mon Jun 19 21:31:18 2006 New Revision: 22425 URL: http://svn.reactos.ru/svn/reactos?rev=22425&view=rev Log: change to dialog font to MS Shell Dlg patch by EmuandCo Added: trunk/reactos/base/applications/sm/De.rc Modified: trunk/reactos/base/applications/screensavers/matrix/matrix.rc trunk/reactos/base/applications/servman/De.rc trunk/reactos/base/applications/servman/En.rc trunk/reactos/base/applications/servman/Ru.rc trunk/reactos/base/applications/sm/sm.rc trunk/reactos/base/applications/sndvol32/De.rc trunk/reactos/base/applications/taskmgr/Cz.rc trunk/reactos/base/applications/taskmgr/De.rc trunk/reactos/base/applications/taskmgr/Dk.rc trunk/reactos/base/applications/taskmgr/En.rc trunk/reactos/base/applications/taskmgr/Es.rc trunk/reactos/base/applications/taskmgr/Fr.rc trunk/reactos/base/applications/taskmgr/Hu.rc trunk/reactos/base/applications/taskmgr/Nl.rc trunk/reactos/base/applications/taskmgr/Sv.rc trunk/reactos/base/applications/taskmgr/Uk.rc trunk/reactos/base/applications/winefile/de.rc trunk/reactos/base/applications/winefile/en.rc trunk/reactos/base/applications/winefile/es.rc trunk/reactos/base/applications/winefile/fr.rc trunk/reactos/base/applications/wordpad/En.rc Modified: trunk/reactos/base/applications/screensavers/matrix/matrix.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensave rs/matrix/matrix.rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/screensavers/matrix/matrix.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/matrix.rc Mon Jun 19 21:31:18 2006 @@ -29,7 +29,7 @@ IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Matrix ScreenSaver Configuration" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Decode &Speed",IDC_STATIC,7,7,128,36 LTEXT "Slower",IDC_STATIC,13,24,22,8 Modified: trunk/reactos/base/applications/servman/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/De .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/servman/De.rc (original) +++ trunk/reactos/base/applications/servman/De.rc Mon Jun 19 21:31:18 2006 @@ -31,7 +31,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,190,182 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Über den Service Manager" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Service Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,48,7,130,26 @@ -44,7 +44,7 @@ IDD_DLG_GENERAL DIALOGEX 6,6,253,225 CAPTION "Allgemein" -FONT 8,"MS Sans Serif",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE 0x10CF0000 BEGIN CONTROL "Dienstname:",IDC_STATIC,"Static",0x50000000,4,11,53,11 Modified: trunk/reactos/base/applications/servman/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/En .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/servman/En.rc (original) +++ trunk/reactos/base/applications/servman/En.rc Mon Jun 19 21:31:18 2006 @@ -63,7 +63,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,190,182 CAPTION "About Service Manager" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 @@ -74,7 +74,7 @@ IDD_DLG_GENERAL DIALOGEX 6,6,253,225 CAPTION "General" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP BEGIN LTEXT "", IDC_SERV_NAME, 70,11,176,11, WS_CHILD | WS_VISIBLE @@ -100,7 +100,7 @@ IDD_DLG_DEPEND DIALOGEX 6,6,253,225 CAPTION "Dependencies" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP BEGIN CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200 @@ -112,7 +112,7 @@ IDD_DLG_CREATE DIALOGEX 6,6,225,209 CAPTION "Create a service" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP BEGIN EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE @@ -132,7 +132,7 @@ IDD_DLG_DELETE DIALOGEX 6,6,185,148 CAPTION "Delete a service" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME BEGIN ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 @@ -146,7 +146,7 @@ IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 CAPTION "Options" -FONT 8,"MS Sans Serif",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE 0x10CF0000 BEGIN LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150 @@ -155,7 +155,7 @@ IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 CAPTION "Service Control" -FONT 8,"MS Sans Serif",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME EXSTYLE WS_EX_TOOLWINDOW BEGIN Modified: trunk/reactos/base/applications/servman/Ru.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/Ru .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/servman/Ru.rc (original) +++ trunk/reactos/base/applications/servman/Ru.rc Mon Jun 19 21:31:18 2006 @@ -63,7 +63,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,190,182 CAPTION "Î Service Manager" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Service Manager v0.5\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 @@ -74,7 +74,7 @@ IDD_DLG_GENERAL DIALOGEX 6,6,253,225 CAPTION "Îáùèå" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP BEGIN LTEXT "", IDC_SERV_NAME, 70,11,176,11, WS_CHILD | WS_VISIBLE @@ -100,7 +100,7 @@ IDD_DLG_DEPEND DIALOGEX 6,6,253,225 CAPTION "Çàâèñèìîñòè" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP BEGIN CONTROL "",IDC_DEPEND_TREE1,"SysTreeView32",0x50010007,8,70,236,68,0x00000200 @@ -112,7 +112,7 @@ IDD_DLG_CREATE DIALOGEX 6,6,225,209 CAPTION "Ñîçäàòü ñëóæáó" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP BEGIN CONTROL "",IDC_CREATE_SERVNAME,"Edit",0x50010000,72,12,150,11,0x00000200 @@ -132,7 +132,7 @@ IDD_DLG_DELETE DIALOGEX 6,6,185,148 CAPTION "Óäàëèòü ñëóæáó" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME BEGIN ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 @@ -146,7 +146,7 @@ IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 CAPTION "Íàñòðîéêè" -FONT 8,"MS Sans Serif",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE 0x10CF0000 BEGIN LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150 @@ -155,7 +155,7 @@ IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 CAPTION "Service Control" -FONT 8,"MS Sans Serif",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME EXSTYLE WS_EX_TOOLWINDOW BEGIN Added: trunk/reactos/base/applications/sm/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/sm/De.rc?r ev=22425&view=auto ============================================================================ == --- trunk/reactos/base/applications/sm/De.rc (added) +++ trunk/reactos/base/applications/sm/De.rc Mon Jun 19 21:31:18 2006 @@ -1,0 +1,56 @@ +#include "resource.h" +/* + * German language file by Daniel Reimer <EmuandCo> 2006-06-15 + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com + */ + +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +STRINGTABLE DISCARDABLE +{ +IDS_boot, "boot subsystem_name" + +IDS_help, "help [command]" + +IDS_info, "info [subsystem_id]" + +IDS_reboot, "reboot subsystem_id" + +IDS_shutdown,"shutdown subsystem_id" + + + +IDS_boot_msg, "bootstrap an optional environment subsystem;" + +IDS_help_msg, "print help for command;" + +IDS_info_msg, "print information about a booted subsystem\n\ +if subsystem_id is omitted, a list of booted\n\ +environment subsystems is printed." + +IDS_reboot_msg, "reboot an optional environment subsystem;" +IDS_shutdown_msg, "shutdown an optional environment subsystem;" + +IDS_Unknown, "Unknown command '%s'.\n" + +IDS_SM1, "SM SubSystem Directory\n\n\ +SSID PID Flags\n\ +---- -------- ------------\n" + +IDS_SM2, "%04x %08lx %04x\n" + +IDS_ID, "SubSystem ID: %d\n\ + Flags: %04x\n\ + Process ID: %ld\n" + +IDS_Not_Imp, "not implemented\n" + +IDS_Mangers, "ReactOS/Win32 - Session Manager Control Tool\n\n" + +IDS_USING, "Usage:\n\ +\tsm\n\ +\tsm help [command]\n\ +\tsm command [arguments]\n\n'sm help' will print the list of valid commands.\n" + +IDS_FAILS_MNG, "Failed to connect to the Session Manager! (Status=0x%08lx)\n" +} Modified: trunk/reactos/base/applications/sm/sm.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/sm/sm.rc?r ev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/sm/sm.rc (original) +++ trunk/reactos/base/applications/sm/sm.rc Mon Jun 19 21:31:18 2006 @@ -5,6 +5,7 @@ #include <reactos/version.rc> #include "En.rc" +#include "De.rc" #include "Ja.rc" #include "Hu.rc" #include "Ru.rc" Modified: trunk/reactos/base/applications/sndvol32/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/sndvol32/D e.rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/sndvol32/De.rc (original) +++ trunk/reactos/base/applications/sndvol32/De.rc Mon Jun 19 21:31:18 2006 @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN IDM_MAINMENU MENU DISCARDABLE BEGIN @@ -31,8 +31,8 @@ LTEXT "&Mixer:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Lautstärke regeln für:", -1, 7,25,211,77 - PUSHBUTTON "Wie&dergabe", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Aufnahme", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "Wie&dergabe", IDC_PLAYBACK, 13,43,50,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Aufnahme", IDC_RECORDING, 13,61,50,8, BS_AUTORADIOBUTTON PUSHBUTTON "A&ndere:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Show the following volume controls:", IDC_LABELCONTROLS, 7, 109, 162, 8 Modified: trunk/reactos/base/applications/taskmgr/Cz.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/Cz .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/Cz.rc (original) +++ trunk/reactos/base/applications/taskmgr/Cz.rc Mon Jun 19 21:31:18 2006 @@ -164,7 +164,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "O správci úloh" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Správce úloh v1.0\nCopyright (C) 1999 - 2001\n Brian Palmer (brianp(a)reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -181,14 +181,14 @@ WS_THICKFRAME CAPTION "Správce úloh" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 END IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 @@ -199,7 +199,7 @@ IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | @@ -212,7 +212,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Využití CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "Využití RAM",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -271,7 +271,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Kanály ladìní" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | @@ -282,7 +282,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Afinita procesoru" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Storno",IDCANCEL,174,133,50,14 @@ -357,7 +357,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Vyberte sloupce" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "Storno",IDCANCEL,138,178,50,14 Modified: trunk/reactos/base/applications/taskmgr/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/De .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/De.rc (original) +++ trunk/reactos/base/applications/taskmgr/De.rc Mon Jun 19 21:31:18 2006 @@ -164,7 +164,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Info über Task-Manager" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Task Manager v1.0\nCopyright (C) 1999 - 2001\nvon Brian Palmer (brianp(a)reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -181,7 +181,7 @@ WS_THICKFRAME CAPTION "Task-Manager" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 @@ -189,7 +189,7 @@ IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | @@ -201,7 +201,7 @@ IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | @@ -215,7 +215,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "CPU-Auslastung",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "Auslagerungsdatei",IDC_MEM_USAGE_FRAME,0,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT //5,63,60,54 @@ -275,7 +275,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Debug-Kanäle" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | @@ -287,7 +287,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Prozessorzugehörigkeit" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,174,133,50,14 @@ -362,7 +362,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 240, 199 //0, 0, 195, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Spalten auswählen" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,124,178,50,14 //84 PUSHBUTTON "Abbrechen",IDCANCEL,178,178,50,14 //138 Modified: trunk/reactos/base/applications/taskmgr/Dk.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/Dk .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/Dk.rc (original) +++ trunk/reactos/base/applications/taskmgr/Dk.rc Mon Jun 19 21:31:18 2006 @@ -163,7 +163,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Omkring Opgavestyring" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Opgavestyring v1.0\nKopibeskyttet (C) 1999 - 2001\naf Brian Palmer (brianp(a)reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -180,14 +180,14 @@ WS_THICKFRAME CAPTION "Opgavestyring" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 END IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 @@ -199,7 +199,7 @@ IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN CAPTION "KMK" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | @@ -212,7 +212,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "CPU Forbrug",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "Hukommelse Forbrug",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -271,7 +271,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Debug Kanaler" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | @@ -282,7 +282,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Processor Affinitet" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Fortryd",IDCANCEL,174,133,50,14 @@ -357,7 +357,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Vælg Kolonner" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "Fortryd",IDCANCEL,138,178,50,14 Modified: trunk/reactos/base/applications/taskmgr/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/En .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/En.rc (original) +++ trunk/reactos/base/applications/taskmgr/En.rc Mon Jun 19 21:31:18 2006 @@ -164,7 +164,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "About Task Manager" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Task Manager v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp(a)reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -181,14 +181,14 @@ WS_THICKFRAME CAPTION "Task Manager" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 END IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 @@ -199,7 +199,7 @@ IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | @@ -212,7 +212,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "CPU Usage",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "MEM Usage",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -271,7 +271,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Debug Channels" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | @@ -282,7 +282,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Processor Affinity" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Cancel",IDCANCEL,174,133,50,14 @@ -357,7 +357,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select Columns" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "Cancel",IDCANCEL,138,178,50,14 Modified: trunk/reactos/base/applications/taskmgr/Es.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/Es .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/Es.rc (original) +++ trunk/reactos/base/applications/taskmgr/Es.rc Mon Jun 19 21:31:18 2006 @@ -181,7 +181,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Acerca del Administrador de Tareas" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Task Manager v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp(a)reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -198,7 +198,7 @@ WS_THICKFRAME CAPTION "Administrador de Tareas" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 @@ -206,7 +206,7 @@ IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | @@ -218,7 +218,7 @@ IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | @@ -232,7 +232,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Uso de la CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "Uso de la MEMORIA",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -293,7 +293,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Canales de Depuracion" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | @@ -305,7 +305,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Afinidad del Procesador" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Aceptar",IDOK,120,133,50,14 PUSHBUTTON "Cancelar",IDCANCEL,174,133,50,14 @@ -380,7 +380,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Seleccionar Columnas" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Aceptar",IDOK,84,178,50,14 PUSHBUTTON "Cancelar",IDCANCEL,138,178,50,14 Modified: trunk/reactos/base/applications/taskmgr/Fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/Fr .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/Fr.rc (original) +++ trunk/reactos/base/applications/taskmgr/Fr.rc Mon Jun 19 21:31:18 2006 @@ -164,7 +164,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "à propos du Gestionnaire des tâches" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Gestionnaire des tâches v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp(a)reactos.org)\nTraduit par Benoit Plante - 2005", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -181,14 +181,14 @@ WS_THICKFRAME CAPTION "Gestionnaire des tâches" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 END IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 @@ -199,7 +199,7 @@ IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | @@ -212,7 +212,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Util. de l'UC",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "Util. du fichier",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -271,7 +271,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Cannaux de débogage" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | @@ -282,7 +282,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Affinité du processeur" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Annuler",IDCANCEL,174,133,50,14 @@ -357,7 +357,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Sélection de colonnes" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "Annuler",IDCANCEL,138,178,50,14 Modified: trunk/reactos/base/applications/taskmgr/Hu.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/Hu .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/Hu.rc (original) +++ trunk/reactos/base/applications/taskmgr/Hu.rc Mon Jun 19 21:31:18 2006 @@ -165,7 +165,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Feladatkezelõ" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Feladatkezelõ /Task Manager/ v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp(a)reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -182,14 +182,14 @@ WS_THICKFRAME CAPTION "Feladatkezelõ" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 END IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 @@ -200,7 +200,7 @@ IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | @@ -213,7 +213,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "CPU használat",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "Memória használat",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -272,7 +272,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Hibakeresõ csatornák" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | @@ -283,7 +283,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Processor Affinity" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Mégse",IDCANCEL,174,133,50,14 @@ -358,7 +358,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Oszlopok kiválasztása" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "Mégse",IDCANCEL,138,178,50,14 Modified: trunk/reactos/base/applications/taskmgr/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/Nl .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/Nl.rc (original) +++ trunk/reactos/base/applications/taskmgr/Nl.rc Mon Jun 19 21:31:18 2006 @@ -164,7 +164,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Over Taak Beheer" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Taak Beheer v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp(a)reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -181,14 +181,14 @@ WS_THICKFRAME CAPTION "Taak Beheer" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 END IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 @@ -199,7 +199,7 @@ IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | @@ -212,7 +212,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Weergave van CPU-gebruik",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "Weergave van geheugengebruik",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -271,7 +271,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Debug kanalen" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | @@ -282,7 +282,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Processoraffiniteit" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Annuleren",IDCANCEL,174,133,50,14 @@ -357,7 +357,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Kolommen selecteren" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "Annuleren",IDCANCEL,138,178,50,14 Modified: trunk/reactos/base/applications/taskmgr/Sv.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/Sv .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/Sv.rc (original) +++ trunk/reactos/base/applications/taskmgr/Sv.rc Mon Jun 19 21:31:18 2006 @@ -181,7 +181,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Om Aktivitetshanteraren" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Aktivitetshanteraren v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp(a)reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -198,14 +198,14 @@ WS_THICKFRAME CAPTION "Aktivitetshanteraren" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 END IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 @@ -216,7 +216,7 @@ IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | @@ -229,7 +229,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Processoranv.",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "Minnesanv.",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -288,7 +288,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Felsökningskanaler" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | @@ -299,7 +299,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Processorsamhörighet" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Avbryt",IDCANCEL,174,133,50,14 @@ -374,7 +374,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 275, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Välj kolumner" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "Avbryt",IDCANCEL,138,178,50,14 Modified: trunk/reactos/base/applications/taskmgr/Uk.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/Uk .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/Uk.rc (original) +++ trunk/reactos/base/applications/taskmgr/Uk.rc Mon Jun 19 21:31:18 2006 @@ -164,7 +164,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Ïðî Äèñïåò÷åð çàâäàíü" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Äèñïåò÷åð çàâäàíü v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp(a)reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -181,14 +181,14 @@ WS_THICKFRAME CAPTION "Äèñïåò÷åð çàâäàíü" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 END IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 @@ -199,7 +199,7 @@ IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | @@ -212,7 +212,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Âèêîðèñòàííÿ ÖÏ",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "Âèêîðèñòàííÿ ïàì'ÿò³",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -271,7 +271,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Íàëàãîäæåííÿ êàíàë³â" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | @@ -282,7 +282,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Â³äïîâ³äí³ñòü ïðîöåñîð³â" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,174,133,50,14 @@ -357,7 +357,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Âèá³ð ñòîâïö³â" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,138,178,50,14 Modified: trunk/reactos/base/applications/winefile/de.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/winefile/d e.rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/winefile/de.rc (original) +++ trunk/reactos/base/applications/winefile/de.rc Mon Jun 19 21:31:18 2006 @@ -176,7 +176,7 @@ IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Angaben auswählen" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Name:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL @@ -198,7 +198,7 @@ IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Eigenschaften für %s" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,191,29,50,14 Modified: trunk/reactos/base/applications/winefile/en.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/winefile/e n.rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/winefile/en.rc (original) +++ trunk/reactos/base/applications/winefile/en.rc Mon Jun 19 21:31:18 2006 @@ -180,7 +180,7 @@ IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "By File Type" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Name:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL @@ -202,7 +202,7 @@ IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Properties for %s" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 PUSHBUTTON "Cancel",IDCANCEL,191,29,50,14 Modified: trunk/reactos/base/applications/winefile/es.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/winefile/e s.rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/winefile/es.rc (original) +++ trunk/reactos/base/applications/winefile/es.rc Mon Jun 19 21:31:18 2006 @@ -175,7 +175,7 @@ IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "By File Type" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Nombre:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL @@ -197,7 +197,7 @@ IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Properties for %s" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Aceptar",IDOK,191,7,50,14 PUSHBUTTON "Cancelar",IDCANCEL,191,29,50,14 Modified: trunk/reactos/base/applications/winefile/fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/winefile/f r.rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/winefile/fr.rc (original) +++ trunk/reactos/base/applications/winefile/fr.rc Mon Jun 19 21:31:18 2006 @@ -180,7 +180,7 @@ IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Par type de fichier" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Name:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL @@ -202,7 +202,7 @@ IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Propriétés de %s" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 PUSHBUTTON "Annuler",IDCANCEL,191,29,50,14 Modified: trunk/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/wordpad/En .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/wordpad/En.rc (original) +++ trunk/reactos/base/applications/wordpad/En.rc Mon Jun 19 21:31:18 2006 @@ -84,7 +84,7 @@ IDD_NEWDOCSEL DIALOGEX 6,6,159,67 CAPTION "New" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME BEGIN LTEXT "New document Type:", IDC_STATIC, 4, 3, 72, 9 @@ -96,7 +96,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,190,182 CAPTION "About WordPad" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "WordPad II v0.1\nCopyright (C) 2006\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

4 4

0.3.0 RC1 Update
by Brandon Turner 19 Jun '06

19 Jun '06

I have added a debug bootcd build of RC1 to sourceforge. So anyone out there looking to get there hands one for troubleshooting 0.3.0 can hop on there and grab it. Brandon

1 0

Setting a Standard for Fonts used in Apps
by Daniel Reimer 18 Jun '06

18 Jun '06

After I made some german translation updates and new translations, I spotted a small problem. I dont know if you see a problem here, but thats why I post it here. While looking through the .rc Files I found out that most apps use one font (Most use MS Shell Dlg which I think is the best one) but not all. Some use Tahoma, others use MS Sans Serif and one even uses Bitstream Verdana. I think this way it does not look like a professional work. It more looks like a thrown together bunch of work, which does not fit together. Especially if a app uses different fonts in some parts than in others. Thats why I made some patches to set the Font to MS Shell Dlg Size 8 except for Asian Languages (Like XP uses it and we should do, too for compatibility) and talked to frik85 about it. He said I should ask you all and that's what I do here. How do you think about it? Daniel "EmuandCo" Reimer

3 3

0.3.0
by Murphy, Ged (Bolton) 15 Jun '06

15 Jun '06

What are we waiting on for this now? I see RC1 still isn't on sourceforge, I thought this was meant to be out a few weeks ago?? Can someone list the requirements and any potential blockers to try and prompt some action Cheers, Ged. ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

3 2

0.3.0 RC1 is out!
by Brandon Turner 15 Jun '06

15 Jun '06

http://sourceforge.net/project/showfiles.php?group_id=6553&package_id=6629 I just released 0.3.0 RC1 to sourceforge. Enjoy. Brandon

1 0

synching riched20
by Ged Murphy 14 Jun '06

14 Jun '06

I've been trying to sync riched20 for the past hour but am not getting anywhere. Our last sync was 0.9.5, but since then quite a bit more code has been added. The 2 problematic lines are in 0.9.15, editor.c, lines 1093 and 1912. They refer to IRichEditOleCallback callbacks in richole.idl, which is new for us. I'm not familiar with idl files, but we seem to implement them in /include/reactos/idl. I've tried dropping the idl in there, creating the respective .acf and modding the rbuild file. However I'm still having problems. Can anyone shed any light on this? I've dropped 0.9.15 into our vendor dir, if anyone wants to sync it for us. It's a straight sync, we have no ROS specific code in this lib. Ged

1 0

Bug Check with IOMega Zip Drives
by James Tabor 14 Jun '06

14 Jun '06

Hi all I can read from both 750 & 100 zip drives, but when I replaced the 100 zip with a new one to read it bug checked. Just haven teething problems. 8^) Thanks, James (drivers/storage/disk/disk.c:945) Partition 00: nr: 1 boot: 1 type: 6 offset: 32 size: 489440 (drivers/storage/disk/disk.c:945) Partition 00: nr: 1 boot: 1 type: 6 offset: 32 size: 489440 (drivers/storage/disk/disk.c:945) Partition 00: nr: 1 boot: 1 type: 6 offset: 32 size: 196576 (drivers/storage/disk/disk.c:945) Partition 00: nr: 1 boot: 1 type: 6 offset: 32 size: 196576 (drivers/storage/disk/disk.c:945) Partition 00: nr: 1 boot: 1 type: 6 offset: 32 size: 196576 (drivers/storage/disk/disk.c:945) Partition 00: nr: 1 boot: 1 type: 6 offset: 32 size: 196576 (drivers/storage/disk/disk.c:945) Partition 00: nr: 1 boot: 1 type: 6 offset: 32 size: 196576 Assertion '(Thread == NULL) || (FastMutex->Owner != Thread)' failed at ntoskrnl/ex/fmutex.c line 42 Entered debugger on embedded INT3 at 0x0008:0x800762d0. kdb:> bt Eip: <ntoskrnl.exe:762d1 (lib/rtl/i386/debug_asm.S:23 (DbgBreakPoint))> Frames: <ntoskrnl.exe:153a0 (ntoskrnl/ex/fmutex.c:45 (ExEnterCriticalRegionAndAcquireFastMutexUnsafe))> <ntoskrnl.exe:3d416 (ntoskrnl/mm/aspace.c:48 (MmLockAddressSpace))> <ntoskrnl.exe:4108b (ntoskrnl/mm/mm.c:312 (MmNotPresentFault))> <ntoskrnl.exe:75738 (ntoskrnl/mm/i386/pfault.c:75 (KiPageFaultHandler))> <ntoskrnl.exe:671e3 (ntoskrnl/ke/i386/trap.s:943 (KiTrap8))> <ntoskrnl.exe:3f797 (ntoskrnl/mm/marea.c:90 (MmIterateNextNode))> <ntoskrnl.exe:3fd31 (ntoskrnl/mm/marea.c:961 (MmCreateMemoryArea))> <ntoskrnl.exe:8a8d (ntoskrnl/cc/view.c:694 (CcRosCreateCacheSegment))> <ntoskrnl.exe:8d14 (ntoskrnl/cc/view.c:820 (CcRosGetCacheSegment))> <ntoskrnl.exe:8dcb (ntoskrnl/cc/view.c:863 (CcRosRequestCacheSegment))> <ntoskrnl.exe:7a8e (ntoskrnl/cc/pin.c:66 (CcMapData))> <vfatfs.sys:18a4 (drivers/filesystems/vfat/create.c:128 (ReadVolumeLabel))> <vfatfs.sys:921f (drivers/filesystems/vfat/fsctl.c:585 (VfatFileSystemControl))> <vfatfs.sys:977f (drivers/filesystems/vfat/misc.c:113 (VfatDispatchRequest))> <vfatfs.sys:9ade (drivers/filesystems/vfat/misc.c:167 (VfatBuildRequest))> <ntoskrnl.exe:2aef0 (ntoskrnl/io/irp.c:1076 (IofCallDriver))> <ntoskrnl.exe:297fe (ntoskrnl/io/fs.c:159 (IoMountVolume))> <ntoskrnl.exe:29abf (ntoskrnl/io/fs.c:417 (IoVerifyVolume))> <vfatfs.sys:224d (drivers/filesystems/vfat/create.c:389 (VfatCreate))> <vfatfs.sys:96ed (drivers/filesystems/vfat/misc.c:107 (VfatDispatchRequest))> <vfatfs.sys:9ade (drivers/filesystems/vfat/misc.c:167 (VfatBuildRequest))> --- Press q to abort, any other key to continue --- <ntoskrnl.exe:2aef0 (ntoskrnl/io/irp.c:1076 (IofCallDriver))> <ntoskrnl.exe:33da4 (ntoskrnl/io/file.c:1051 (IoCreateFile))> <ntoskrnl.exe:3509e (ntoskrnl/io/file.c:2272 (NtOpenFile))> <ntoskrnl.exe:665f7 (ntoskrnl/ke/i386/trap.s:306 (KiFastCallEntry))> <ntdll.dll:154b8 (lib/rtl/path.c:276 (RtlSetCurrentDirectory_U))> <KERNEL32.dll:3044 (dll/win32/kernel32/file/curdir.c:124 (SetCurrentDirectoryW))> <cmd.exe:8dcf (./base/shell/cmd/dir.c:697 (CommandDir))> <cmd.exe:10f06 (./base/shell/cmd/cmd.c:694 (DoCommand))> <cmd.exe:119aa (./base/shell/cmd/cmd.c:1028 (ParseCommandLine))> <cmd.exe:128bd (./base/shell/cmd/cmd.c:1469 (ProcessInput))> <cmd.exe:12abb (./base/shell/cmd/cmd.c:1772 (_main))> <cmd.exe:1333 (base/shell/cmd/main.c:22 (main))> <cmd.exe:1237> <cmd.exe:1288> <KERNEL32.dll:19dfd (dll/win32/kernel32/process/create.c:68 (BaseProcessStartup))> <00000000> kdb:> cont

1 0

Via Vt6102 Net card
by James Tabor 14 Jun '06

14 Jun '06

Hi all! This is the hivesys.inf PCNet section. I copied fetnd5a.sys to pcnet.sys. I can query network properties w/o a crash! All I get is IPHLPAPI.dll need more work and GetAdapterInfo did not return the expected data. Bus 0, device 18, function 0, Ven 1106/Dev 3065/class 0200. Start->Settings->Settings Menu->Network Properties Select VT6102->Properties, get the VIA PCNet Status Menu, select Properties, get the VIA PCNet Pro~ Menu, select Internet Protocol (TCP/IP), select Properties, get the Error menu. Wow! Did not crash! Need to check if I'm on the right track here! Thanks, James ; ReactOS PCNet NIC driver ; To use the AMD supplied driver change the driver name to pcntn5m.sys ; HKLM,"SYSTEM\CurrentControlSet\Services\PCNet","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\PCNet","Group",0x00000000,"NDIS" HKLM,"SYSTEM\CurrentControlSet\Services\PCNet","ImagePath",0x00020000,"system32\drivers\pcnet.sys" HKLM,"SYSTEM\CurrentControlSet\Services\PCNet","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\PCNet","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\PCNet\Enum","0",0x00000000,"PCI\VEN_1106&DEV_3065\0000" HKLM,"SYSTEM\CurrentControlSet\Services\PCNet\Enum","Count",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\PCNet\Enum","NextInstance",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1106&DEV_3065&SUBSYS_01021106&REV_10\0000","Service",0x00000000,"PCNet" HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1106&DEV_3065&SUBSYS_01021106&REV_10\0000","Class",0x00000000,"Net" HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1106&DEV_3065&SUBSYS_01021106&REV_10\0000","ClassGUID",0x00000000,"{4D36E972-E325-11CE-BFC1-08002BE10318}" HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1106&DEV_3065&SUBSYS_01021106&REV_10\0000","Driver",0x00000000,"{4D36E972-E325-11CE-BFC1-08002BE10318}\0000" ; Configuration Entries for the PCNet Adapter HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","Characteristics",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","DriverDesc",0x00000000,"VT6102" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","ProviderName",0x00000000,"VIA Tech" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","NetCfgInstanceId",0x00000000,"{RANDOMCFGGUIDFOR_PCNET1}" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000\Linkage","Export",0x00000000,"\Device\PCNet1" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000\Linkage","RootDevice",0x00000000,"PCNet1" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000\Linkage","UpperBind",0x00000000,"Tcpip" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","BUS_TO_SCAN",0x00000000,"ALL" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","BUSTIMER",0x00000000,"0" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","BUSTYPE",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","EXTPHY",0x00000000,"0" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","FDUP",0x00000000,"0" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","LED0",0x00000000,"10000" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","LED1",0x00000000,"10000" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","LED2",0x00000000,"10000" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","LED3",0x00000000,"10000" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","MPMODE",0x00000000,"0" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","TP",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","AdapterCFID",0x00000000,"811929862" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","AdapterType",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","SlotNumber",0x00000000,"8" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","BusNumber",0x00000000,"0" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","FunctionNumber",0x00000000,"0" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","EarlyReceive",0x00000000,"0" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","EarlyTransmit",0x00000000,"0" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","BurstLength",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","ReceiveBurstIndicate",0x00000000,"64" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","ReceiveBuffers",0x00000000,"64" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","TransmitBuffers",0x00000000,"32" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","ReceiveThreshold",0x00000000,"0" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","TransmitThreshold",0x00000000,"0" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","MapRegisters",0x00000000,"32" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","ConnectionType",0x00000000,"0" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","ValidatePacketLen",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","IPXSPXAutoFrame",0x00000000,"0" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}\{RANDOMCFGGUIDFOR_PCNET1}",,0x00000000,"Network Adapters" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}\{RANDOMCFGGUIDFOR_PCNET1}\Connection","Name",0x00000000,"VIA PCNet" HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","DefaultGateway",0x00010000,"10.65.145.1" HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","IPAddress",0x00010000,"10.65.145.79" HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","SubnetMask",0x00010000,"255.255.255.0"

2 3

Hang During Installation
by James Tabor 14 Jun '06

14 Jun '06

Hi all! New full system copied to the RosBox via net using Linux. For me SSDD. (ntoskrnl/ldr/loader.c:334) Driver Load Success: \SystemRoot\System32\kbdus.dll (base/system/winlogon/winlogon.c:173) WL: Failed to create lsass notification event (base/system/winlogon/winlogon.c:563) WL: Failed to start LSASS (0xA1) (base/system/winlogon/winlogon.c:764) WL-Status: ReactOS is starting up... (dll/win32/iphlpapi/ifenum_reactos.c:99) openTcpFile for <\Device\Tcp> failed: 0xc0000034 (dll/win32/iphlpapi/ifenum_reactos.c:99) openTcpFile for <\Device\Tcp> failed: 0xc0000034 (dll/win32/iphlpapi/ifenum_reactos.c:99) openTcpFile for <\Device\Tcp> failed: 0xc0000034 Hangs! after 10 min forced reboot (ntoskrnl/ldr/loader.c:334) Driver Load Success: \SystemRoot\System32\kbdus.dll (base/system/winlogon/winlogon.c:173) WL: Failed to create lsass notification event (base/system/winlogon/winlogon.c:563) WL: Failed to start LSASS (0xA1) (base/system/winlogon/winlogon.c:764) WL-Status: ReactOS is starting up... (dll/win32/iphlpapi/ifenum_reactos.c:99) openTcpFile for <\Device\Tcp> failed: 0xc0000034 (dll/win32/iphlpapi/ifenum_reactos.c:99) openTcpFile for <\Device\Tcp> failed: 0xc0000034 (dll/win32/iphlpapi/ifenum_reactos.c:99) openTcpFile for <\Device\Tcp> failed: 0xc0000034 (ntoskrnl/ldr/loader.c:334) Driver Load Success: \SystemRoot\System32\framebuf.DLL Second boot passed, first boot wiz worked Wiz reboot (ntoskrnl/ldr/loader.c:334) Driver Load Success: \SystemRoot\System32\kbdus.dll (base/system/winlogon/winlogon.c:173) WL: Failed to create lsass notification event (base/system/winlogon/winlogon.c:563) WL: Failed to start LSASS (0xA1) (base/system/winlogon/winlogon.c:764) WL-Status: ReactOS is starting up... (dll/win32/iphlpapi/ifenum_reactos.c:99) openTcpFile for <\Device\Tcp> failed: 0xc0000034 (dll/win32/iphlpapi/ifenum_reactos.c:99) openTcpFile for <\Device\Tcp> failed: 0xc0000034 (dll/win32/iphlpapi/ifenum_reactos.c:99) openTcpFile for <\Device\Tcp> failed: 0xc0000034 (dll/ntdll/ldr/utils.c:2076) Relocating (10000000 -> 00411000) C:\ReactOS\system32\dhcpcsvc.dll Hangs after 5 min forced reboot Hang again,,, forced reboot to Linux, sync than reboot Linux... (ntoskrnl/ldr/loader.c:334) Driver Load Success: \SystemRoot\System32\kbdus.dll (base/system/winlogon/winlogon.c:173) WL: Failed to create lsass notification event (base/system/winlogon/winlogon.c:563) WL: Failed to start LSASS (0xA1) (base/system/winlogon/winlogon.c:764) WL-Status: ReactOS is starting up... (dll/win32/iphlpapi/ifenum_reactos.c:99) openTcpFile for <\Device\Tcp> failed: 0xc0000034 (dll/win32/iphlpapi/ifenum_reactos.c:99) openTcpFile for <\Device\Tcp> failed: 0xc0000034 (dll/win32/iphlpapi/ifenum_reactos.c:99) openTcpFile for <\Device\Tcp> failed: 0xc0000034 (dll/ntdll/ldr/utils.c:2076) Relocating (10000000 -> 00411000) C:\ReactOS\system32\dhcpcsvc.dll (ntoskrnl/ldr/loader.c:334) Driver Load Success: \SystemRoot\System32\framebuf.DLL (dll/win32/shell32/shellpath.c:1688) Failed to create directory 'L".\\Local Settings\\Temporary Internet Files"'. (dll/win32/shell32/shellpath.c:1688) Failed to create directory 'L".\\Local Settings\\History"'. (dll/win32/shell32/shellpath.c:1688) Failed to create directory 'L".\\Cookies"'. Now I have the Gui and passed all install Wiz's Reboot so I can have networking. Yeah! Past! I have networking! I opened a cmd console to look at ipconfig, worked! I hit the "X" at the upper right hand corner. Assertion 'HandleTable' failed at ntoskrnl/ex/handle.c line 791 Entered debugger on embedded INT3 at 0x0008:0x800762d0. kdb:> bt Eip: <ntoskrnl.exe:762d1 (lib/rtl/i386/debug_asm.S:23 (DbgBreakPoint))> Frames: <ntoskrnl.exe:163b9 (ntoskrnl/ex/handle.c:791 (ExCreateHandle))> <ntoskrnl.exe:50d6a (ntoskrnl/ob/obhandle.c:595 (ObpCreateUnnamedHandle))> <ntoskrnl.exe:51aa3 (ntoskrnl/ob/obhandle.c:1713 (ObInsertObject))> <ntoskrnl.exe:14504 (ntoskrnl/ex/event.c:156 (NtCreateEvent))> <ntoskrnl.exe:665f7 (ntoskrnl/ke/i386/trap.s:306 (KiFastCallEntry))> <ntdll.dll:13eb3 (lib/rtl/critical.c:54 (RtlpCreateCriticalSectionSem))> <ntdll.dll:13f5a (lib/rtl/critical.c:113 (RtlpWaitForCriticalSection))> <ntdll.dll:1413d (lib/rtl/critical.c:459 (RtlEnterCriticalSection))> <KERNEL32.dll:e226 (dll/win32/kernel32/misc/console.c:116 (ConsoleControlDispatcher))> <KERNEL32.dll:1dfc3 (dll/win32/kernel32/thread/thread.c:55 (BaseThreadStartup))><00000000> kdb:> cont Entered debugger on last-chance exception (Exception Code: 0xc0000005) (Page Fault) Memory at 0x0000001A could not be read: Page not present. kdb:> cont KeBugCheckWithTf at ntoskrnl/ke/i386/exp.c:1241 A problem has been detected and ReactOS has been shut down to prevent damage to your computer. The problem seems to be caused by the following file: ntoskrnl.exe Technical information: *** STOP: 0x0000001E (0xC0000005,0x800191ED,0x00000000,0x0000001A) *** ntoskrnl.exe - Address 0x800191ED base at 0x80000000, DateStamp 0x0 Page Fault Exception: 14(0) Processor: 0 CS:EIP 8:800191ed <ntoskrnl.exe:191ed (ntoskrnl/ex/resource.c:778 (ExAcquireResourceExclusiveLite))> cr2 1a cr3 3a35b000 Proc: 81fa3620 Pid: 164 <ipconfig.EXE> Thrd: 81fc3ce0 Tid: 170 DS 23 ES 23 FS 30 GS 0 EAX: 00000001 EBX: 0000000c ECX: 00000037 EDX: 81fc3ce0 EBP: a03ddb34 ESI: 00000001 ESP: a03ddab4 EDI: 81fc3f78 EFLAGS: 00010206 kESP a03ddab4 kernel stack base a03db000 Frames: <ntoskrnl.exe:16247 (ntoskrnl/ex/handle.c:472 (ExCreateHandle))> <ntoskrnl.exe:50d6a (ntoskrnl/ob/obhandle.c:595 (ObpCreateUnnamedHandle))> <ntoskrnl.exe:51aa3 (ntoskrnl/ob/obhandle.c:1713 (ObInsertObject))> <ntoskrnl.exe:14504 (ntoskrnl/ex/event.c:156 (NtCreateEvent))> <ntoskrnl.exe:665f7 (ntoskrnl/ke/i386/trap.s:306 (KiFastCallEntry))> <ntdll.dll:13eb3 (lib/rtl/critical.c:54 (RtlpCreateCriticalSectionSem))> forced reboot (ntoskrnl/ldr/loader.c:334) Driver Load Success: \SystemRoot\System32\kbdus.dll (base/system/winlogon/winlogon.c:173) WL: Failed to create lsass notification event (base/system/winlogon/winlogon.c:563) WL: Failed to start LSASS (0xA1) (base/system/winlogon/winlogon.c:764) WL-Status: ReactOS is starting up... NDIS completed the same send packet twice (Adapter 81355f38 Packet 81354058)!! (dll/ntdll/ldr/utils.c:2076) Relocating (10000000 -> 00411000) C:\ReactOS\system32\dhcpcsvc.dll (ntoskrnl/ke/queue.c:420) Unwaiting Thread: 5 Hang again! 20 min no bug check. same thing hang 4 times, forced boot to Linux. Well it booted okay and run mozilla, I get the reactos web page and it asks me if I want it to be my default browser, I select *Yes*, than~~~ (dll/win32/gdi32/objects/font.c:647) GetGlyphOutlineW uChar 78 (./subsystems/win32/win32k/objects/text.c:2326) 03010120, 120, 00000000, 0053D9E 8, 00000000, 00000000, 613407F0 (./subsystems/win32/win32k/objects/text.c:2433) Advance = 8, lsb = 0, bbx = 8 (./subsystems/win32/win32k/objects/text.c:2483) MAT2 Matrix Trans! (./subsystems/win32/win32k/objects/text.c:2515) Vec 0,448 (./subsystems/win32/win32k/objects/text.c:2515) Vec 0,0 (./subsystems/win32/win32k/objects/text.c:2515) Vec 512,448 (./subsystems/win32/win32k/objects/text.c:2515) Vec 512,0 (./subsystems/win32/win32k/objects/text.c:2536) transformed box: (0,448 - 512,0) (./subsystems/win32/win32k/objects/text.c:2548) CX 8 CY 0 BBX 8 BBY 7 GOX 0 GOY 7 (./subsystems/win32/win32k/objects/text.c:2563) Copied GLYPHMETRICS to User! (./subsystems/win32/win32k/objects/text.c:2568) GGO_METRICS Exit! (ntoskrnl/ke/queue.c:420) Unwaiting Thread: 5 (ntoskrnl/ke/queue.c:420) Unwaiting Thread: 5 (ntoskrnl/ke/queue.c:420) Unwaiting Thread: 5 (ntoskrnl/ke/queue.c:420) Unwaiting Thread: 5 (ntoskrnl/ke/queue.c:420) Unwaiting Thread: 5 Assertion '(Thread == NULL) || (FastMutex->Owner != Thread)' failed at ntoskrnl/ex/fmutex.c line 42 Entered debugger on embedded INT3 at 0x0008:0x800762d0. kdb:> bt Eip: <ntoskrnl.exe:762d1 (lib/rtl/i386/debug_asm.S:23 (DbgBreakPoint))> Frames: <ntoskrnl.exe:153a0 (ntoskrnl/ex/fmutex.c:45 (ExEnterCriticalRegionAndAcquireFastMutexUnsafe))> <ntoskrnl.exe:3d416 (ntoskrnl/mm/aspace.c:48 (MmLockAddressSpace))> <ntoskrnl.exe:4108b (ntoskrnl/mm/mm.c:312 (MmNotPresentFault))> <ntoskrnl.exe:75738 (ntoskrnl/mm/i386/pfault.c:75 (KiPageFaultHandler))> <ntoskrnl.exe:671e3 (ntoskrnl/ke/i386/trap.s:943 (KiTrap8))> <ntoskrnl.exe:3f797 (ntoskrnl/mm/marea.c:90 (MmIterateNextNode))> <ntoskrnl.exe:3fd31 (ntoskrnl/mm/marea.c:961 (MmCreateMemoryArea))> <ntoskrnl.exe:8a8d (ntoskrnl/cc/view.c:694 (CcRosCreateCacheSegment))> <ntoskrnl.exe:8c57 (ntoskrnl/cc/view.c:772 (CcRosGetCacheSegmentChain))> <ntoskrnl.exe:6960 (ntoskrnl/cc/copy.c:79 (ReadCacheSegmentChain))> <ntoskrnl.exe:7024 (ntoskrnl/cc/copy.c:385 (CcCopyRead))> <vfatfs.sys:a7c0 (drivers/filesystems/vfat/rw.c:688 (VfatRead))> <vfatfs.sys:9769 (drivers/filesystems/vfat/misc.c:109 (VfatDispatchRequest))> <vfatfs.sys:9ade (drivers/filesystems/vfat/misc.c:167 (VfatBuildRequest))> <ntoskrnl.exe:2aef0 (ntoskrnl/io/irp.c:1076 (IofCallDriver))> <ntoskrnl.exe:35d06 (ntoskrnl/io/file.c:3080 (NtReadFile))> <ntoskrnl.exe:665f7 (ntoskrnl/ke/i386/trap.s:306 (KiFastCallEntry))> <ntdll.dll:3559 (dll/ntdll/ldr/utils.c:661 (LdrpLoadModule))> <ntdll.dll:38ba (dll/ntdll/ldr/utils.c:751 (LdrLoadDll))> <KERNEL32.dll:1429f (dll/win32/kernel32/misc/ldr.c:206 (LoadLibraryExW))> <KERNEL32.dll:14333 (dll/win32/kernel32/misc/ldr.c:121 (LoadLibraryA))> --- Press q to abort, any other key to continue --- <nspr4.dll:5e6a> kdb:> cont (KERNEL32:dll/win32/kernel32/mem/global.c:417) Memory Load: 10% (KERNEL32:dll/win32/kernel32/mem/global.c:417) Memory Load: 10% (KERNEL32:dll/win32/kernel32/mem/global.c:417) Memory Load: 10% (KERNEL32:dll/win32/kernel32/mem/global.c:417) Memory Load: 10% (KERNEL32:dll/win32/kernel32/mem/global.c:417) Memory Load: 10% (KERNEL32:dll/win32/kernel32/mem/global.c:417) Memory Load: 10% (KERNEL32:dll/win32/kernel32/mem/global.c:417) Memory Load: 10% (KERNEL32:dll/win32/kernel32/mem/global.c:417) Memory Load: 10% (KERNEL32:dll/win32/kernel32/mem/global.c:417) Memory Load: 10% (KERNEL32:dll/win32/kernel32/mem/global.c:417) Memory Load: 10% Funny I can still ping the RosBox from my Linux desktop. Also notice the memory load. The system is locked up but mozilla is still running! Oh Well! Here is the one time I did get a bug check with the hang. (ntoskrnl/ldr/loader.c:334) Driver Load Success: \??\C:\ReactOS\system32\win32k.sys (ntoskrnl/ldr/loader.c:334) Driver Load Success: \SystemRoot\System32\kbdus.dll (base/system/winlogon/winlogon.c:173) WL: Failed to create lsass notification event (base/system/winlogon/winlogon.c:563) WL: Failed to start LSASS (0xA1) (base/system/winlogon/winlogon.c:764) WL-Status: ReactOS is starting up... NDIS completed the same send packet twice (Adapter 81357f38 Packet 81356010)!! (dll/ntdll/ldr/utils.c:2076) Relocating (10000000 -> 00411000) C:\ReactOS\system32\dhcpcsvc.dll (ntoskrnl/ke/queue.c:420) Unwaiting Thread: 5 right here it would hang! For over 3 min! (ntoskrnl/mm/mm.c:275) Page fault at high IRQL was 2, address c00000b2 Entered debugger on last-chance exception (Exception Code: 0xc0000005) (Page Fault) Memory at 0xC00000B2 could not be read: Page not present. kdb:> bt Eip: <ntoskrnl.exe:544e (ntoskrnl/ke/queue.c:391 (KiWakeQueue))> Frames: <ntoskrnl.exe:679e (ntoskrnl/ke/wait.c:168 (KeDelayExecutionThread))> <usbport.sys:4153 (drivers/usb/usbport/hub.c:1255 (hub_thread))> <ntoskrnl.exe:5b78a (ntoskrnl/ps/thread.c:94 (PspSystemThreadStartup))> <ntoskrnl.exe:62fa5 (ntoskrnl/ke/i386/ctxswitch.S:82 (KiThreadStartup))> kdb:>

1 0

Search author for ReactOS Weekly Newsletter
by Klemens Friedl 14 Jun '06

14 Jun '06

We search an author for our "ReactOS Weekly Newsletter". History: Jason Filby had established the ReactOS Weekly Newsletter (called "ReactOS Weekly") in 1999 as a useful weekly news summary located on www.reactos.com. In 2000 the newsletter had been discontinued. With the website redesign in summer 2005, the newsletter came back with Stuart "TwoTailedFox" Robbins as author. Requirements: Here are requirements for an author: 1. Have enough time once a week to write the newsletter text (e.g. every sunday) 2. Be good in english language 3. Understand our technlogy (svn, reactos, windows nt, win32, kernel, drivers, apps, etc.) 4. Be in frequent contact with the ReactOS developer, and come in our IRC channels too (because mailing list traffic may be sometimes slow) 5. HTML knowledge is not required but an advantage Goal: The "ReactOS Weekly Newsletter" should be weekly (as the name implies) and sum up the ongoing mailing list discussions as well as irc conversations. Additionally it should contain ReactOS news, like new releases. >From time to time interviews, reviews (of apps compatibility and reactos functions and releases) and maybe audio-podcasts, etc. would be great too. The layout of the newsletter issue page can be the same as the latest one (e.g. http://www.reactos.org/xhtml/en/newsletter_11.html), similar as WineHQ's one, or different. Previous newsletters - links: 10/2005 - 02/2005: http://www.reactos.org/?page=newsletters 1999 - 2000: http://web.archive.org/web/20000522174140/reactos.com/public/weekly.html WineHQ'S newsletters: http://www.winehq.com/?issue=back Mailing List Information: http://www.reactos.org/?page=community_mailinglists IRC Channel Information: http://www.reactos.org/?page=community_irc So... if this sounds like something you would like to do, please reply to this mailing list email explaining why you you think you would be a good newsletter author. Klemens Friedl

7 8

Re: [ros-dev] SUSPICIOUS: SESSION_5 BSOD
by Murphy, Ged (Bolton) 14 Jun '06

14 Jun '06

Alex Ionescu wrote: > In defense to Hervé, you actually need to clean *TWICE*. That's right, > you must write: > make intrlck_clean && make intrlck_clean & make ntdll_clean & make > ntdll_install. What does running 'make intrlck_clean' do the second time which it doesn't do the first time round? ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

1 0

Disk Controller Install Failure
by James Tabor 14 Jun '06

14 Jun '06

Hi all! When the install popup for the disk controller is displayed. I can install from and select everything but NEXT! Select *Next* this will happen, (tested this 4 times now, same thing) (dll/win32/newdev/newdev.c:745) Installing Other ACPI device (ACPI\PNP0C04\1&7313ac9&0000) (dll/win32/newdev/newdev.c:466) Include removable devices: no (dll/win32/newdev/newdev.c:467) Include custom path : no (dll/win32/newdev/newdev.c:534) Installing driver (Generic system devices): Math coprocessor (dll/win32/newdev/newdev.c:745) Installing Disk controller (ACPI\PNP0700\1&7313ac9&0000) (dll/win32/newdev/newdev.c:466) Include removable devices: no (dll/win32/newdev/newdev.c:467) Include custom path : no (dll/win32/shell32/classes.c:381) HCR_GetFolderAttributes should be called for simple PIDL's only! (dll/win32/shell32/shellpath.c:1688) Failed to create directory 'L".\\Desktop"'. (dll/win32/newdev/newdev.c:466) Include removable devices: yes (dll/win32/newdev/newdev.c:467) Include custom path : no KeBugCheckWithTf at ntoskrnl/ke/i386/exp.c:1241 A problem has been detected and ReactOS has been shut down to prevent damage to your computer. The problem seems to be caused by the following file: ntoskrnl.exe Technical information: *** STOP: 0x0000001E (0xC0000005,0x80033CF6,0x00000000,0x00000030) *** ntoskrnl.exe - Address 0x80033CF6 base at 0x80000000, DateStamp 0x0 Page Fault Exception: 14(0) Processor: 0 CS:EIP 8:80033cf6 <ntoskrnl.exe:33cf6 (ntoskrnl/io/file.c:970 (IoCreateFile))> cr2 30 cr3 3be68000 Proc: 8178f328 Pid: d8 <umpnpmgr.exe> Thrd: 817a4558 Tid: e8 DS 23 ES 23 FS 30 GS 0 EAX: 00000000 EBX: 9fa43c34 ECX: 000023be EDX: 81f5d6e4 EBP: 9fa43cf0 ESI: 00000000 ESP: 9fa43b50 EDI: 00000000 EFLAGS: 00010296 kESP 9fa43b50 kernel stack base 9fa3e000 Frames: <ntoskrnl.exe:3459a (ntoskrnl/io/file.c:1527 (NtCreateFile))> <ntoskrnl.exe:66657 (ntoskrnl/ke/i386/trap.s:306 (KiFastCallEntry))> <KERNEL32.dll:9c6f (dll/win32/kernel32/file/volume.c:57 (InternalOpenDirW))> I think my hardware is not ReactOS compatible. Thanks, James

1 1

SESSION_5 BSOD
by Alex Ionescu 14 Jun '06

14 Jun '06

Hi, Annoyed by the ever-growing blame on my patches as well as the continuing lack of attention regarding the SESSION_5 BSOD, I've taken the liberty to momentarily put on hold my current paid work and take a look at the issue (which thankfully only took 30 minutes). As I suspected, it has absolutely nothing to do with any Ob stuff and is the result of ntdll being messed up after the recent changes to lib\intrlck. Revert them, clean interlck/ntdll, rebuild, and voila, you're back to a working ROS. In defense to Hervé, you actually need to clean *TWICE*. That's right, you must write: make intrlck_clean && make intrlck_clean & make ntdll_clean & make ntdll_install. It is *NOT* enough to merely write ntdll_clean, either. I'm going to assume that Hervé only cleaned interlck once (as anyone would normally do) and kept using the "correct" library. As soon as he (and others) built a new copy of the tree (probably around one of my patches), the interlck lib now got cleaned twice and the broken one started coming into use. Score one for my complaints against rbuild. If I could give some advice, next time, spend less time assigning blame on me, and actually try to find the bug (yes, this sounds arrogant, but it DOES get annoying to be the poster boy for boot BSODs. The last one I caused was over 12 months ago). Best regards, Alex Ionescu

2 2

ROS A memory hog? Rubbish!
by Alex Ionescu 13 Jun '06

13 Jun '06

Hi, With ROS_LEAN_AND_MEAN and DBG = 1, with all drivers and the bells and whistles, a boot to NCLI with 8MB gave me a working system with still 2MB to spare (perhaps for a native FTP server or other application). If I remove the network layer, I can boot with 6MB, and I still have 1MB free. I'm trying with DBG = 0 now. Maybe I can boot with 4MB :D. Best regards, Alex Ionescu

4 4

Re: [ros-dev] Wine libs vendor import
by Murphy, Ged (Bolton) 13 Jun '06

13 Jun '06

> > I spoke with Gé and he explained me the vendor import process in > > short. As soon as I find some time I will try out it myself and update > > the Wine libs in our SVN tree, if you don't mind. I have just updated comctl32 to 0.9.15, and will continue to keep this lib updated at every Wine release. Although r22329 was not mailed out via svn-diff (any ideas Aleksey??) I may also look after one or two other libs along with this. ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

1 0

Wine libs vendor import
by Aleksey Bragin 13 Jun '06

13 Jun '06

I'm answering to ros-dev so all developers could share their point of view (Klemens' original email is attached below). As I basically outlined in an irc conversation, there are 3 possible ways for us to sync with the Wine project: 1) Do manual syncs (the current way), keeping their code in our tree, building with our build system 2) Do auto-import of their source code into our tree, plus automatically detect changes in their build files and propogate them to our .rbuild files 3) Do binary-syncing of the dlls which are free from reactos and wine hacks, and do manual syncs for dlls which are forked (like setupapi which is better implemented, directx dlls which are partly shared and partly implemented differently, etc). However, it was not possible to easily come to a solution what to do. I will give a small overview of all ways: 1) We lag behind, providing outdated, featureless and buggy version of dlls. And even more, we depend on dlls bugs, reactos hacks in them. Syncing them requires time and constant efforts. From the good side we have absolute control over the libraries - we can enable/disable debug messages, build them for different architectures, optimize for different CPUs etc 2) This could sound like an ideal way, because it keeps advantages of 1. plus removing disadvantages of having to waste time doing syncs. However conversion from Wine's build system makefiles to ReactOS's build system .rbuild isn't trivial. Plus developing an auto-syncer between Cvs/Git and our SVN doesn't look like an easy task too. 3) Reduces compilation time, however wine dlls are built on another server, and just downloaded during build process (or kept in SVN server in binary form). It'd be needed to adjust building mechanism to be able to produce other platform binaries. Updates will be "heavy" (but initial download smaller). I'm listening to your (all ReactOS and Wine devs) comments, and probably I will write answers to Klemens' email later. WBR, Aleksey Bragin. On Jun 12, 2006, at 2:35 PM, Klemens Friedl wrote: > Hi Aleksey, > > I spoke with Gé and he explained me the vendor import process in > short. As soon as I find some time I will try out it myself and update > the Wine libs in our SVN tree, if you don't mind. > > Or do you want to switch to a binary wine files in trunk anyway? > > I will try to update Wine files about every months after the first > time, if that is okay. The changes of wine 0.9.x of every two week are > minor things so, every months should be fine. sdwards mentioned that > timeframe too, as we discussed about that topic about one week ago on > #winehackers and #reactos (the first time). > > btw. Gé mentioned there ARE reasons why our Wine libs DO differ from > WineHQ's one. Well Gé is not a ros dev anymore but he had not done the > vendor import work and maintain all the changes for fun, it's > important to have our adjustments in there. > Imagine for example all icons would got lost. > > Wine does use Unix specific functions like "unixfs" in several libs, > the sound libs will get a lot different in near future too > (silverblade is working in this area) and several directx libs. So a > quick auto vendor import won't work anyway. > > > In my opinion, the binary idea is not worth any efford: > > In my opinion, binary files on in a svn dir is a very bad solution. > You cannot view the source and commit the changes, you have to > download all binary files every time (every 2 weeks), binary files are > not portable, etc. > The advantages of source code is in addition to the oposite of the > facts above that you have to download only the diffs of the file > changes (svn client does that for you) and that have everything > (source) on your local hdd. > Sure the build-time would decrease about 10-15% if we use binary > files, but i don't bother about 15% time. > > And please shift the wine lib conversation to ros-dev(a)reactos.org. > The irc chat is not suitable for such a discussion where more than 3-4 > devs are involved. It is not possible to answer to more then one msg > the same time. And while you write, several other persons post other > msg's. > Mailing lists does have a purpose and does make sense here! > E-Mail's are written in a better english, no short abbreviations, etc. > and the devs does think a bit longer about what the write (no offence > here!). > > > Best regards, > Klemens

3 2

Kernel-mode COM: PORTCLS.SYS and sound
by Andrew "Silver Blade" Greenwood 09 Jun '06

09 Jun '06

Someone on this mailing list gave me a crash-course on using COM (possibly KJK, but it was a while ago so I'm not sure.) Anyway, I'm fairly comfortable with the various macros and sort of understand how it works now. == SOUND ARCHITECTURE == I've been told that Windows Vista has a new user-mode set of audio/multimedia APIs, which replace kernel-mode streaming. Evidently most of the kernel-mode components for this no longer exist in Vista. Instead, communication goes via user-mode components until PORTCLS.SYS, the only remaining kernel-streaming related component. PORTCLS.SYS interacts with WDM audio drivers. WDMAUD.DRV interacts with the MME API (winmm.dll). So the path from the MME API to the WDM driver may be different, but older applications and drivers should see no difference there. I think implementing the audio system used in Vista would be a good thing to do - since the kernel streaming components have been completely removed from Vista, there is no point in implementing them in ReactOS. There should be no reason why an NT4 audio driver wouldn't work even on Vista, and XP drivers should work too. Obviously this won't be the case, though, as all drivers will probably need to be designed specifically for Vista. My point however, is that the MME API has changed slightly, but will still work with older drivers. (As a side-note, I recall that our implementation of WINMM.DLL - as copied over from WINE - doesn't appear to deal with Plug and Play at all. This is something that will need to be remedied.) == PORTCLS.SYS : COM IN THE KERNEL == This took a while for me to get my head around, and I'm at the stage now where I can happily declare a COM interface or class. But I'm having difficulty figuring out how I should actually create an instance of one in the kernel. Apparently, there exists some kernel equivalent of CoCreateInstance. In any case, I'd prefer to work with classes using C++, which I believe can be done with COM. So I just need to know how to implement a COM class using C++. Up until now I've guessed it as being: class IBlahBlah_Impl : public IBlahBlah Is this right? I'm working on the IPort code at the moment, and am wondering how to implement this: PORTCLASSAPI NTSTATUS NTAPI PcNewPort( OUT PPORT *OutPort, IN REFCLSID ClassId) { /* ClassId must be one of: CLSID_PortDMus (IPortDMus) defined in dmusicks.h CLSID_PortMidi (IPortMidi) CLSID_PortTopology (IPortTopology) CLSID_PortWaveCyclic (IPortWaveCyclic) CLSID_PortWavePci (IPortWavePci) */ } Yes, it's just a commented function. From the documentation, the caller passes one of the CLSID's from the above list, and receives a pointer to an IPort. Question is, how do I compare the parameter with one of the CLSIDs? And again, how do I create an instance of the class in kernel-mode? If anyone can shed a little light on this, I'd appreciate it. -Andrew

1 0

CD Logo
by David Johnson 07 Jun '06

07 Jun '06

Any thoughts? -- Dave Johnson http://www.davefilms.us DaveFILMS(r) http://thevoicezone.us The Voice Zone™ Voice Talent Writer, Producer, Director Independent Audio Theater Producer http://www.perditioncity.us voiceoverjobs(a)gmail.com Member of the Darker Projects team. http://www.darkerprojects.com ShadoeWorld.com Correspondent ---------------------------------------------------------- Tired of a proprietary Windows on your computer ? Use free ReactOS instead ( http://www.reactos.org )

5 9

Target Hardware
by David Johnson 06 Jun '06

06 Jun '06

I would like to propose a target hardware list. Like a type of motherboard that should be used. Sound card and video card. Thoughts? -- Dave Johnson http://www.davefilms.us DaveFILMS(r) http://thevoicezone.us The Voice Zone™ Voice Talent Writer, Producer, Director Independent Audio Theater Producer http://www.perditioncity.us voiceoverjobs(a)gmail.com Member of the Darker Projects team. http://www.darkerprojects.com ShadoeWorld.com Correspondent ---------------------------------------------------------- Tired of a proprietary Windows on your computer ? Use free ReactOS instead ( http://www.reactos.org )

3 2

Trunk Foobared
by Alex Ionescu 06 Jun '06

06 Jun '06

Hi, I am aware that I broke trunk. This is because I've removed the code in ObReferenceObjectByHandle which allowed GENERIC access masks to be converted. This API does NOT support GENERIC access masks and converting to them was incorrect, however, as always, plenty of code in ROS abused the system and calls this API incorrectly. Although ObOpenObjectByName should return a handle and IoCreateFile should be done with it, because parsing is broken (so it creeps up again!), we try to re-reference it by handle to get its pointer... however, this attempt is made with the current AccessMode, which happens to be User, and if the AccessMask was GENERIC... we fail. ObOpenObjectByName is made to be used with GENERIC access masks so that's really not a problem. Hopefully the I/O File stuff is the only place where this happens, so I will implement a simple hack - call ObReferenceObjectByHandle with a KernelMode parameter so that access checks are skipped (we've already done them in ObOpenObjectByName anyways!). Best regards, Alex Ionescu

1 1

Policy question
by Myria 06 Jun '06

06 Jun '06

Should ReactOS copy unnecessary restrictions that Windows has? The example I'm thinking of is NtSetLdtEntries. In Windows NT (and currently ReactOS as well), this function will not let you create an LDT entry whose limit is above the user/kernel barrier. This restriction sounds like it was made with security in mind, but it doesn't affect security. The processor's page table will already block access to kernel memory no matter what selector you use. After all, the default user CS and DS already have a limit of FFFFFFFF. Should such a problem be fixed? Fireball said "no, unless some 3rd party app or driver depends on them" when I asked about whether such restrictions should be copied. Pretty much the only thing using NtSetLdtEntries is NTVDM, and this restriction already causes some DOS programs to break that would otherwise work. (Such programs are usually setting selectors that wrap the address space.) Melissa

3 5

ULONG vs. SIZE_T
by Myria 05 Jun '06

05 Jun '06

I've noticed that in the ReactOS source code, there are many places where a parameter or structure is ULONG when it should really be SIZE_T. Using ULONG instead of SIZE_T is not portable. It will be difficult to port ReactOS to x64 and Itanium in the future because of this. I think the project should stop the bleeding by requiring all new code to make proper use of ULONG versus SIZE_T. This does mean going against the documentation of native syscalls on the Internet, but it must be done sometime. Of course, I'm not really part of the project... Melissa

3 2

X-Chat 2
by James Tabor 05 Jun '06

05 Jun '06

Hi all Could be all based on wine patches, I can no longer get xchat 2 and the new one to run. I noticed it can not find the lib directory in the launch directory. Wine has this problem too. Also when installing the new X-Chat 2 from http://www.silverex.org/download/xchat-2.6.2-1.exe, It installs the Font to C:\ReactOS\Fonts not C:\ReactOS\media\fonts. I had to create C:\ReactOS\Fonts so I can have a clean install. I tested my GGO patch and the SVN and the result are the same. Okay, wine does this too, I tested it. (dll/ntdll/ldr/utils.c:2019) Failed to create or open dll section of 'libgtk-win 32-2.0-0.dll' (Status c0000135) (dll/ntdll/ldr/utils.c:1347) failed to load libgtk-win32-2.0-0.dll (dll/ntdll/ldr/utils.c:1812) failed to load libgtk-win32-2.0-0.dll (dll/ntdll/ldr/utils.c:1934) LdrFixupImports() failed for xchat.EXE (dll/ntdll/ldr/startup.c:485) Failed to initialize image Then do it from lib, "..\xchat" (dll/ntdll/ldr/utils.c:2019) Failed to create or open dll section of 'pango-1.8.2/lib/pango/1.4.0/modules/pango-basic-win32.dll"' (Status c0000135) You will get a popup. This has been a problem for years! Thanks, James

1 0

Break in 22232
by James Tabor 05 Jun '06

05 Jun '06

Hi, I'm getting this with Mozilla, Firefox and SeaMonkey. KeBugCheck at ntoskrnl/cm/regobj.c:528 A problem has been detected and ReactOS has been shut down to prevent damage to your computer. Technical information: *** STOP: 0x00000051 (0x00000000,0x00000000,0x00000000,0x00000000) Frames: <ntoskrnl.exe:1d50 (ntoskrnl/ke/bug.c:493 (KeBugCheckEx))> <ntoskrnl.exe:1d67 (ntoskrnl/ke/bug.c:514 (KeBugCheck))> <ntoskrnl.exe:129c6 (ntoskrnl/cm/regobj.c:528 (CmiObjectDelete))> <ntoskrnl.exe:52c6b (ntoskrnl/ob/oblife.c:151 (ObpDeleteObject))> <ntoskrnl.exe:1290c (ntoskrnl/cm/regobj.c:523 (CmiObjectDelete))> <ntoskrnl.exe:52c6b (ntoskrnl/ob/oblife.c:151 (ObpDeleteObject))> <ntoskrnl.exe:50f4c (ntoskrnl/ob/obhandle.c:153 (ObpDecrementHandleCount))> <ntoskrnl.exe:510b0 (ntoskrnl/ob/obhandle.c:244 (ObpDeleteHandle))> <ntoskrnl.exe:52166 (ntoskrnl/ob/obhandle.c:1125 (NtClose))> <ntoskrnl.exe:66527 (ntoskrnl/ke/i386/trap.s:306 (KiFastCallEntry))> <ADVAPI32.dll:7dd9 (dll/win32/advapi32/reg/reg.c:1178 (RegDeleteKeyA))> All three are the same, James

1 0

0.3.0 RC1 problems
by Brandon Turner 05 Jun '06

05 Jun '06

I cant seem to make a stable qemu install for the release, wmare works fine though. On the first boot to the installed desktop, it just shuts down after about 1 sec. I usually see the device wizard pop up for a sec and then it just turns off. Anyone else having thse problems? Any hints? Brandon

2 1

Patches: A couple of Spelling Fixes
by Neil Blackburn 04 Jun '06

04 Jun '06

Hi! I submitted a couple of patches to Bugzilla Bug 1555. Can someone please commit the patches for me. Thanks.

2 1

Re: [ros-dev] [ros-diffs] [greatlrd] 22195: make malloc, calloc and some other function return NULL if size is 0
by Royce Mitchell III 04 Jun '06

04 Jun '06

greatlrd(a)svn.reactos.org wrote: >@@ -52,6 +55,9 @@ > */ > void* calloc(size_t _nmemb, size_t _size) > { >+ if ( _size == 0) >+ return NULL; >+ > return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, ROUND_SIZE(_nmemb*_size) ); > } > > What if _nmemb is zero? > >@@ -60,6 +66,9 @@ > */ > void* realloc(void* _ptr, size_t _size) > { >+ if ( _size == 0) >+ return NULL; >+ > if (!_ptr) return malloc(_size); > if (_size) return HeapReAlloc(hHeap, 0, _ptr, ROUND_SIZE(_size)); > free(_ptr); >@@ -71,6 +80,9 @@ > */ > > umm... shouldn't we call free() if we're going to return NULL because size is 0? Also, the free() at the bottom is never called now. > void* _expand(void* _ptr, size_t _size) > { >+ if ( _size == 0) >+ return NULL; >+ > return HeapReAlloc(hHeap, HEAP_REALLOC_IN_PLACE_ONLY, _ptr, ROUND_SIZE(_size)); > } > > Again, shouldn't we free the existing buffer if we're returning NULL because size is 0?

7 11

Screenshot of 22170
by James Tabor 03 Jun '06

03 Jun '06

Hi, I only installed win32k.sys not the rest. Here is a funny pic. Thanks, James

5 6

ROS harware
by David Johnson 03 Jun '06

03 Jun '06

Do we have a target harware spec? Or will ROS be for general harware like regular Windows? -- Dave Johnson http://www.davefilms.us DaveFILMS(r) http://thevoicezone.us The Voice Zone™ Voice Talent Writer, Producer, Director Independent Audio Theater Producer http://www.perditioncity.us voiceoverjobs(a)gmail.com Member of the Darker Projects team. http://www.darkerprojects.com ShadoeWorld.com Correspondent ---------------------------------------------------------- Tired of a proprietary Windows on your computer ? Use free ReactOS instead ( http://www.reactos.org )

2 1

0.3.0 RC1
by WaxDragon 02 Jun '06

02 Jun '06

0.3.0 is now RC1. Hopefully Brandon will have time to put up RC1 on SF soon, but those inclined can check out a copy now. While I will allow a wallpaper to be added before release, anything else needs to be a bugfix against a bug in Bugzilla. WD -- ReactOS is a hub, follow the spokes and you'll immediately find absolutely everything you need to know about Windows. ReactOS is not just software, it's people. kjk_hyperion

3 4

MSCoder magazine proposal
by Katarzyna Chauca 01 Jun '06

01 Jun '06

My name is Kate Chauca and I represent MSCoder Independent magazine for developers using Microsoft platforms (www.mscoder.eu/es). We would like to invite all of you to help us to promote ReactOS. We are looking for people who will write articles about ReactOS for our magazine. We would like to place live ReactOS on the CD of our magazine. If you find it interesting please let me know. Every one can cooperate with us. Best Regards Kate Chauca katarzyna.chauca(a)software.com.pl www.mscoder.eu/es

3 4

SoC 2006 (Login Framework)
by Justin Haygood 31 May '06

31 May '06

There are three integrated systems needed for authentication in ReactOS: 1. Winlogin 2. MSGINA (ROSGINA would work better, no?) 3. Some sort of Identity Management system with support for local and remote authentication (remote can come with SMB support later) Tiers 2 & 3 can be developed and tested on a non ReactOS system (aka a real Windows system) initially (tho with the code staying in the ROS Subversion tree), while Tier 1 is ReactOS specific. I thus see three stages (aligned with the systems mentioned above): 1. Identity Management System with basic tools (get Setup to use it, at least some basic command line tools to add and remove users and change passwords, no need for a UI yet) 2. A ROSGINA that uses the Identity Management System 3. Get Winlogin back up and running and using the ROSGINA for authentication. Since its stage 1: The identity management system's sole purpose is to create a cross-subsystem, ReactOS-wide way to authenticate users. How each subsystem uses the information provided is up to the individual subsystem. As such, I see a database (Berkerly DB or Sqlite) of users (and possibly a separate one with groups) with some basic metadata describing the user: 1. Username 1. Real Name / Nickname 2. Encrypted Password (encrypted with a choice of algorithms, AES, Blowfish, etc..) 4. Groups user belongs in (by name) Any other metadata that should be stored in the authentication database? The identity management system's API can be quite simple: BOOL AuthenticateUserA( LPCSTR username, LPCSTR password ); BOOL AuthenticateUserW( LPCWSTR username, LPCWSTR password ); Basically, returning a TRUE if the particular user is valid and FALSE otherwise. Other APIs to get other metadata can come later? Any other ideas? --Justin Haygood justin.haygood(a)gmail.com

3 3

0.3.0 Features last call.
by WaxDragon 31 May '06

31 May '06

There has been very little activity in 0.3.0, so I am putting out a last call before feature freeze. If no one comes forward, we will feature freeze during the weekend so we can start bughunting. I've also bumped trunk to 0.4.0-SVN, and created an 0.3.0 entry in Bugzilla. WD -- ReactOS is a hub, follow the spokes and you'll immediately find absolutely everything you need to know about Windows. ReactOS is not just software, it's people. kjk_hyperion

6 7

Translate...
by :: Sandro :: 31 May '06

31 May '06

I'm interested in translate any article about ReactOs or the ReacOs to Portuguese. What article is interesting to Brazilian comunity? How can I help to translate the ReactOs to Portuguese? Thanks, Sandro.

1 0

r22100 breaks build (?)
by Timo Kreuzer 30 May '06

30 May '06

Looks like r22100 breaks the build (at least for me): [CC] ntoskrnl\cm\ntfunc.c ntoskrnl\cm\ntfunc.c: In function `NtCreateKey': ntoskrnl\cm\ntfunc.c:474: warning: implicit declaration of function `ObpReleaseCapturedName' make: *** [obj-i386\ntoskrnl\cm\ntfunc.o] Error 1

4 4

ReactOS Website Frontpage - Text review/rewrite
by Klemens Friedl 30 May '06

30 May '06

The ReactOS website frontpage content has remained the same for several months and it has lead to some confused visitors who has asked a lot questions in the forums. We need a high quality text for the frontpage which need to be reviewed by native speekers. The current text is good, but not brilliant. There is for example no single line where it states that ReactOS not using the linux kernel. Or the following sentense is not optimal: "Finally, a FOSS operating system for everyone!". End-User does not need to know what "FOSS" is nor any other technical slang. This are just a few example which shows some downsides of the current frontpage content. I am talking about the following page: http://www.reactos.org/xhtml/en/index.html ... to be exactly, the main part, starting with "ReactOS Project" and ending with the "W3C" icons. Please take some time and review the text and post your suggestions here (ReactOS Mailing List). The text does not have to have the same length or same structure/layout. It would be great to have a longer text splitted up into several sub-topics suitable for a website frontpage. Visit other website's and compare the content. To sum up, we need a lot of volunteers (with good english language and grammar knowledge) who want to help ito improve the ReactOS website. Even if you are not a native speaker and/or not good in english, you are welcome to post your suggestions/ideas/etc. I hope this email will get a lot of response and I am looking forward to an efficient conversation. Klemens Friedl ReactOS Dev & Website Admin http://www.reactos.org

2 2

Re: [ros-diffs] [amunger] 22052: Bump trunk to 0.4.0, no turning back now.
by Maarten Bosma 30 May '06

30 May '06

amunger(a)svn.reactos.org schrieb: > Author: amunger > Date: Fri May 26 19:14:13 2006 > New Revision: 22052 > > URL: http://svn.reactos.ru/svn/reactos?rev=22052&view=rev > Log: > Bump trunk to 0.4.0, no turning back now. Wouldn't it be smater set it to 0.3.1 ? I mean the next version is 0.4.0 actually very unlikely. Maarten Bosma

2 2

NtGdiGetGlyphOutline patch
by James Tabor 29 May '06

29 May '06

Hi, It is based on Wine implementation. It has other hax with it mostly tests. There is a hax for NtGdiGetCharABCWidths to allow it to pass one of the "gdi32_crosstest font" tests. Over all, it is truly Ugly and going to change. WYSIWUG ATM. Thanks, James

1 0

Graphics Engine
by Rick Langschultz 29 May '06

29 May '06

I was just looking at the graphics system at many open source operating systems. Seems to be most of them rely on other engines to take care of their GUI system. I was thinking what about creating a GUI or Window Server that draws MPEG2 or MPEG4 compliant graphics.

2 1

Re: [ros-svn] [jimtabor] 20958: Port Wine GetCharWidth32A.
by Magnus Olsen 29 May '06

29 May '06

This implention is wrong please revert it it shall and must be implement in win32k not direcly to gdi32 NtGdiGetCharWidth ----- Original Message ----- From: <jimtabor(a)svn.reactos.org> To: <ros-svn(a)reactos.org> Sent: den 21 January 2006 01:52 Subject: [ros-svn] [jimtabor] 20958: Port Wine GetCharWidth32A. > Port Wine GetCharWidth32A. > > > Updated files: > trunk/reactos/lib/gdi32/objects/font.c > > _______________________________________________ > Ros-svn mailing list > Ros-svn(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-svn

2 2

Theming idea
by Timo Kreuzer 28 May '06

28 May '06

I think few of the devs ever read the Design forum (???) There are a some nice GUI designs, mostly done with a drawing program. So I thought it would be great to make those designs available inside ROS. Some of them (I think kokodin made a good and quite good programmable design) could be done by changing the user32 code, but it's not a good idea to make theming by changing user32 code. So I had the following idea: all code really needed to draw the GUI elements could be exported into an external dll (gui.dll or something like that) so some basic theming would be pretty easy and still fast. We would only need a kind of GUI API that would allow changing most things, but would not be too complex. What do you think of this? If you think it's a good idea, I would try to outsource the gui code out of user32 and try to develop a basic and a secondary (based on kokodin's design) dll.

5 4

Re: [ros-diffs] [greatlrd] 22062: replace djgpp hell bugs fcvtbuf with project http://www.jbox.dk/sanos/source/lib/fcvt.c.html with small modification's to match ReactOS arch. Floating point to string conversion routines Copyright (C) 2002 Michael Ringgaard. All rights reserved. Make wine test for fcvt shut up we are failing 64 of wine test in msvrt printf, but we pass all fcvt test. before we did fail 75 test in wine test of msvrt printf test. Before we did fail almost all test case for fcvt in w
by Alex Ionescu 27 May '06

27 May '06

greatlrd(a)svn.reactos.org wrote: > Author: greatlrd > Date: Fri May 26 23:23:34 2006 > New Revision: 22062 > > URL: http://svn.reactos.ru/svn/reactos?rev=22062&view=rev > Log: > replace djgpp hell bugs fcvtbuf with project http://www.jbox.dk/sanos/source/lib/fcvt.c.html with small modification's to match ReactOS arch. Floating point to string conversion routines Copyright (C) 2002 Michael Ringgaard. All rights reserved. > > Make wine test for fcvt shut up we are failing 64 of wine test in msvrt printf, but we pass all fcvt test. before we did fail 75 test in wine test of msvrt printf test. Before we did fail almost all test case for fcvt in wine test > I've been actually importing a LOT of the SanOS code into rtl back when I was working on fixing many of the broken inlined GAS routines, and his code REALLY kicks ass. I strongly recommend using the SanOS CRT functions when possible. Best regards, Alex Ionescu

2 1

RE: [ros-dev] RE: [ros-diffs] [amunger] 22052: Bump trunk to 0.4. 0, no turning back now.
by Murphy, Ged (Bolton) 26 May '06

26 May '06

Murphy, Ged (Bolton) wrote: > > > amunger(a)svn.reactos.org wrote: > > > > URL: http://svn.reactos.ru/svn/reactos?rev=22052&view=rev > > Log: > > Bump trunk to 0.4.0, no turning back now. > > > > Ehh??? Oh I see, nevermind. I read it wrong initially. ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

1 0

RE: [ros-diffs] [amunger] 22052: Bump trunk to 0.4.0, no turning back now.
by Murphy, Ged (Bolton) 26 May '06

26 May '06

amunger(a)svn.reactos.org wrote: > > URL: http://svn.reactos.ru/svn/reactos?rev=22052&view=rev > Log: > Bump trunk to 0.4.0, no turning back now. > Ehh??? ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

1 0

Re: [ros-bugs] [Bug 1172] VIA Rhine II net driver doesn't detect miniport
by James Tabor 23 May '06

23 May '06

Hi! ReactOS.Bugzilla(a)reactos.org wrote: > http://www.reactos.org/bugzilla/show_bug.cgi?id=1172 > > > hpoussin(a)reactos.org changed: > > What |Removed |Added > ---------------------------------------------------------------------------- > CC|hpoussin(a)reactos.org | > Summary|Network driver will not |VIA Rhine II net driver > |install. |doesn't detect miniport > > > > > ------- Comment #9 from hpoussin(a)reactos.org 2006-05-23 22:18 CET ------- > Changing title, as it is no more a installation problem. > (btw, the wrong name in ncpa control panel is due to a missing entry in > [Strings] section) > > Funny, it once worked. [MANUF] %PCI\VEN_1106&VT3065.DeviceDesc% = VT3065_ndi,PCI\VEN_1106&DEV_3065 ;%PCI\VEN_1106&VT3065.DeviceDesc% = VT3065_ndi,PCI\VEN_1106&DEV_3065&SUBSYS_734C1462 <snip > Manuf = "VIA Technologies, Inc." VT3106S.DeviceDesc = "VIA Rhine III Management Adapter" VT3106J.DeviceDesc = "VIA Rhine III Fast Ethernet Adapter" VT3065.DeviceDesc = "VIA Rhine II Fast Ethernet Adapter" VT3043.DeviceDesc = "VIA VT86C100A Rhine Fast Ethernet Adapter" FET.Service.DispName = "VIA Rhine Family Fast Ethernet Adapter Driver Service"

1 0

Re: Radio buttons...
by David Eckert 23 May '06

23 May '06

Not that I am aware of... but I could be wrong too because I never hang around the bugzilla site lol >> Can someone actually fix the radio buttons? It's getting annoying to >> see it with no outlining on it, not sure why whoever wrote the code >> for it left the outline of it out... >> >Hi, >Is there a bug report for it already? I think we never finished it. >Thanks, >James -- -David W. Eckert

2 1

Secure Programming
by M Bealby 23 May '06

23 May '06

Hey all, Well, since time has been very restricted for me I have not done as much code auditing as I would have liked. However, I did add a page to the wiki about writing secure code (Secure_Programming). I hope people find it useful and will add ReactOS specific items to it. I decided to use another page rather than add to Programming_Guidelines as it could grow quite big on its own. It is not linked from any other pages as I didn't want to tread on anyones toes or get in the way of someone else. Hope this helps people write a bit more securely :) Martin

2 1

Radio buttons...
by David Eckert 22 May '06

22 May '06

Can someone actually fix the radio buttons? It's getting annoying to see it with no outlining on it, not sure why whoever wrote the code for it left the outline of it out... -- -David W. Eckert

2 1

Re: The new look of ReactOS 21942
by mf 22 May '06

22 May '06

WaxDragon wrote: > I have the UIC's approval. I never approved it to be non-user-selectable in the first place. IRC log (18 Apr 2006): 22:27 -!- Irssi: Starting query in FreeNode with Christoph_vW 22:27 <Christoph_vW> http://www.ApiViewer.de/downloads/test.png 22:29 <mf> nice 22:29 <Christoph_vW> ok 22:30 <Christoph_vW> that is what I wanted to hear :-) 22:31 <mf> yeah i saw someone on the forum do that too 22:31 <Christoph_vW> I thought we should differ from windows in some way 22:31 <mf> now make a corner-to-corner gradient :) 22:31 <mf> a-la openstep 22:34 <mf> left-top to right-bottom 22:34 <Christoph_vW> not yet 22:49 <mf> it IS optional though, right? 22:49 <Christoph_vW> no... 22:49 <Christoph_vW> I replaced the old gradient 22:49 <mf> ... 22:50 <mf> please revert it until you can turn it on/off 22:50 <mf> or else there'll be a lot of complaints from devs and useres 22:50 <mf> users* 23:02 <Christoph_vW> http://www.ApiViewer.de/downloads/test2.png 23:05 <mf> slightly better ;) 23:05 <Christoph_vW> good Not that anyone ever listens to what I have to say, though.

5 5

Re: The new look of ReactOS 21942
by mf 22 May '06

22 May '06

David Hinz wrote: > What about a vote on this "problem"? There is no vote necessary. The only thing that needs to be done is an interface so people can turn it on/off to their own tastes.

3 2

The new look of ReactOS 21942
by theUser BL 22 May '06

22 May '06

Last week I have tested ReactOS build 21942. And I wondern about the ugly changes: - wrong gradient on the top of the windows. - the symbols which say, which icon on the desktop is a link and which not, is now on the right bottom, instead of the left bottom But some icon-designer have the icons so designed, that its ok, if there is something on the left bottom of the icon lost. But the icons are not so designed, that it is lost on any other place. It seems, there are now some ReactOS-developer, who don't like Windows. I would prefering it, if ReactOS looks most as possible like Windows. And if anybody wants to have its own look, that then existing options to change the look of ReactOS. Greatings theuserbl

5 7

Re: [ros-bugs] [Bug 1514] New: Edit control: Ctrl+Backspace/Delete doesn't work (correctly)
by Brandon Turner 22 May '06

22 May '06

There is a hotkey meta bug please mark that bug as "depending on" the last two you file. Brandon ReactOS.Bugzilla(a)reactos.org wrote >http://www.reactos.org/bugzilla/show_bug.cgi?id=1514 > > Summary: Edit control: Ctrl+Backspace/Delete doesn't work > (correctly) > Product: ReactOS > Version: TRUNK > Platform: VMWare 5 > OS/Version: ReactOS > Status: NEW > Severity: minor > Priority: P3 > Component: Win32 > AssignedTo: ros-bugs(a)reactos.org > ReportedBy: trondsg(a)gmail.com > QAContact: ros-bugs(a)reactos.org > > >In all edit controls, like the one you get when go to Start -> Run, Ctrl + >Backspace does not work at all. It is supposed to delete the previous >word.Ctrl+Delete deletes the rest of the contents (after the caret) instead of >deleting the next word. > > > >

1 0

Re: [ros-dev] The new look of ReactOS 21942
by theUser BL 22 May '06

22 May '06

>I would prefering it, if ReactOS looks most as possible like Windows. I mean that it looks AS DEFAULT like Windows. Greatings theuserbl

1 0

ReactOS Compatibility Database - Beta Test
by Klemens Friedl 21 May '06

21 May '06

Exactly one months ago, I annouced the beta test for the ReactOS Compatibility Database: http://www.reactos.org/xhtml/en/news_page_18.html http://www.reactos.org/support/ We have currently 71 categories and 99 applications/drivers in the database. I got some feedback from users. This lead to several interface improvements. For example, some user commented that the submit process is to confusing. It was confusing, well let say the submit pages were too overloaded. I tried with several updates to improve th interface and especially the submit pages step by step. As of today, the latest update bring a complete redesigned submit process, a wizard like look&feel which looks and interact similar to Wizard '97 / Vista (from the Win32 world) and has a lot of usability improvements. It has many user interacting feedback included so that the user will see instantly if he e.g. inputted an invalid value. The submit pages are using ajax, dhtml (=> javascript). I want to invite you to visit the ReactOS Compatibility Database: http://www.reactos.org/support/ Feedback is welcome, please use the mailing list and/or the website sub-forum (http://www.reactos.org/forum/viewforum.php?f=18) to write replies. Klemens Friedl ReactOS Dev & Website Admin http://www.reactos.org/support/

1 0

RE: [ros-diffs] [mflyer] 21918: Sorry Ged, but that's not the Rea ctOS logo.
by mf 21 May '06

21 May '06

> Nobody (ok, many didn't) objected to attacking Iraq at first either. > Nor did they to the beginnings of the Holocaust. > > Best regards, > Alex Ionescu Whatever. I've had it having to justify my every breath in here. I'm stepping down as UIC and icon designer. Fireball, you can close my SVN account. It seems some people are thinking we didn't lose enough developers from the Hartmut drama. I am officially fed up with everyone's fucking around and bitching. The person I expected it from the least is GreatLord.

5 4

RE: [ros-diffs] [mflyer] 21918: Sorry Ged, but that's not the Rea ctOS logo.
by mf 19 May '06

19 May '06

> Why I wanted a UI coordinator, is because HE should solve SUCH > questions [in a more or less diplomatic way :) ]. How am I supposed to impartially solve an issue I am personally involved in? If people aren't willing to accept my condition of "discuss with me first", then I don't know what I should do.

2 1

RE: [ros-diffs] [mflyer] 21918: Sorry Ged, but that's not the Rea ctOS logo.
by mf 19 May '06

19 May '06

(sorry for initially having accidentally sent this mail to ros-general instead of ros-dev) > The ReactOS logo is an ugly design. Until you manage to get that wonky off-balance thing you prefer to be accepted as the official logo, whether it is ugly or not is not relevant. There is a procedure for changing established things. Your method of just going ahead and changing things without asking is not only rude but wrong. If you want to change things, you will have to go through me first. If you have a problem with me, you have a problem with changing things. So I suggest you consider your options. > Also, it's far too complex to be used as a start button image and looks out of place. It's a bloody orb with wisps (rings) around it. Complex my eye. > The official Windows logo isn't used on the start button. A neater version is used in the same way. A "neater version". You mean the shadow? I have employed a similar way to make the icon clear at 16x16: http://img55.imageshack.us/img55/4972/startthingie3yn.png As you can see, both with Windows and with ReactOS, it's practically the same thing. I'm beginning to get the idea you are making arguments up for the sake of having arguments in your offence. > This logo is the original ReactOS start menu logo and should be kept IMO. It's as much a placeholder as the "original" Everaldo icons were. mf

2 1

RE: [ros-diffs] [mflyer] 21918: Sorry Ged, but that's not the Rea ctOS logo.
by mf 19 May '06

19 May '06

> I know it is alot people reactos user and > devloper dislike the new logo. > if u do not revert it, (restore to the old one) > I will do it this weekend. GreatLord, there *IS* no new logo. The icon I re-committed has been in ReactOS since r14357. That's March 27th 2005. Nobody objected back then, yet now there's a fuss? Please mind your own business if you don't know exactly what's going on. Thanks. mf

2 1

Re: Sorry Ged, but that's not the ReactOS logo.
by Ged Murphy 19 May '06

19 May '06

mf wrote: > Until you manage to get that wonky off-balance thing you prefer to be > accepted as the official logo, whether it is ugly or not is not > relevant. There is a procedure for changing established things. Your > method of just going ahead and changing things without asking is not > only rude but wrong. I highly disagree with the fact that everyone must go through you. If we initiated a kernel coordinator, do you also suggest that all kernel work must be approved by them too? Taking into account the smarmy comment which went along with the change, it was my impression you changed it back just to try and annoy me. Many of the developers I have spoken to agree that the original icon is better. Nobody seems to want to say anything to you for fear of upsetting you though. Great! > If you want to change things, you will have to go > through me first. If you have a problem with me, you have a problem > with changing things. So I suggest you consider your options. > I have just considered my options. I choose to stop work on the UI as of now. The fact that you've tried to alienate me many times, and now in public seals the fact that we can't work together. I was the only person interested in working on the UI, and you managed to take the fun out of it for me, are you sure you are the right man for the job? I tend to think not. Ged.

4 3

0.3.0
by Maarten Bosma 19 May '06

19 May '06

When do we want feature freeze for 0.3.0 ? Or asked the other way around which features do you want to implement for 0.3.0 ? Maarten Bosma

3 2

Re: [ros-general] RE: [ros-diffs] [mflyer] 21918: Sorry Ged, but that's not the Rea ctOS logo.
by Magnus Olsen 18 May '06

18 May '06

Hi The new logo se does not look like reactos any longer it is to dark and pixel, the balas and constrast in the new logo is bad, it does not match at all, and it look not prof have made it. more like a childer. So please revert the new logo and keep, the old one. If u look in ros it does not match the constrast or any think. A logo should not be pixel or constat does not match. That is exacly in the new logo u have done MF. I know it is alot people reactos user and devloper dislike the new logo. if u do not revert it, (restore to the old one) I will do it this weekend. Magnus Olsen (GreatLord) ReactOS Devloper ----- Original Message ----- From: "mf" <mf(a)mufunyo.net> To: <ros-general(a)reactos.org> Sent: Thursday, May 18, 2006 11:53 PM Subject: [ros-general] RE: [ros-diffs] [mflyer] 21918: Sorry Ged,but that's not the Rea ctOS logo. > > The ReactOS logo is an ugly design. > Until you manage to get that wonky off-balance thing you prefer to be > accepted as the official logo, whether it is ugly or not is not > relevant. There is a procedure for changing established things. Your > method of just going ahead and changing things without asking is not > only rude but wrong. If you want to change things, you will have to go > through me first. If you have a problem with me, you have a problem > with changing things. So I suggest you consider your options. > > > Also, it's far too complex to be used as a start button image and looks out > of place. > It's a bloody orb with wisps (rings) around it. Complex my eye. > > > The official Windows logo isn't used on the start button. A neater version > is used in the same way. > > A "neater version". You mean the shadow? I have employed a similar way > to make the icon clear at 16x16: > > http://img55.imageshack.us/img55/4972/startthingie3yn.png > > As you can see, both with Windows and with ReactOS, it's practically > the same thing. I'm beginning to get the idea you are making arguments > up for the sake of having arguments in your offence. > > > This logo is the original ReactOS start menu logo and should be kept IMO. > It's as much a placeholder as the "original" Everaldo icons were. > > mf > > _______________________________________________ > Ros-general mailing list > Ros-general(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-general

1 0

Process Names
by James Tabor 18 May '06

18 May '06

Hi, Here is a screen shot of taskmgr with the process names displayed. Or lack of? Thanks, James

1 0

To end all rumours...
by Alex Ionescu 18 May '06

18 May '06

Aleksey and I thought it would be a good idea to end rumours and write up an official stance on the topic, so here is a paste from the website, for those of you that don't read it: -- The official letter written by project coordinators of these projects by fireball on 2006-05-18 ReactOS and TinyKRNL projects' official relationship Prepared by Aleksey Bragin and Alex Ionescu, Project Coordinators. There is a little information posted officially about TinyKRNL project and this provides a base for gossip to appear. This short article is intended to clear up official relations between these two projects. TinyKRNL is an educational and documentation project which creates plug-in replacements for various modules of Windows 2003 SP 1 (ultimately replacing the kernel too) and a series of papers ultimately combined into a book. The methods used for development of TinyKRNL’s modules source code involve all possible methods of achieving the end result of having a 100% compatible (or even identical) result. Reverse engineering is one of them (mainly so-called ‘dirty’ way, for further reference see Wikipedia’s article about clean room reverse engineering vs. dirty room reversing). Unfortunately, due to copyright laws and other law-related stuff, ReactOS (which aims at commercial usage too) can not directly utilize methods of development like dirty reverse engineering, and thus ReactOS can not share all code with the TinyKRNL project like we are sharing code with WINE. However, there are some very useful exceptions: * Firstly, all interfaces are shared. This gives ReactOS project an unbeatable level of compatibility and legal freedom too (interfaces can not be copyrighted). * Secondly, the great thing is that TinyKRNL will provide the most complete documentation of the most recent and technically advanced version of a released NT-famility operating system – Windows 2003 SP1. ReactOS developers can use this documentation for reference when creating a clean implementation of functions or improving already developed code. * Thirdly, any code in TinyKRNL which respects the ReactOS policies regarding development can directly be added into ReactOS, as well as any build tools or 3rd-party files. For more detailed information regarding TinyKRNL project, please look at http://www.tinykrnl.org. We also encourage you to signup on the TinyKRNL . We also encourage you to signup on the TinyKRNL development Mailing List by sending a blank email to devel-subscribe(a)tinykrnl.org as well as joining the #tinykrnl channel on the same IRC server as #reactos; many of the ReactOS developers and users are usually present and discuss interesting and challenging kernel issues as well as general off-topic chat. --

1 0

RE: [ros-diffs] [mflyer] 21918: Sorry Ged, but that's not the Rea ctOS logo.
by Murphy, Ged (Bolton) 17 May '06

17 May '06

mflyer(a)svn.reactos.org wrote: > Sorry Ged, but that's not the ReactOS logo. The ReactOS logo is an ugly design. Also, it's far too complex to be used as a start button image and looks out of place. The official Windows logo isn't used on the start button. A neater version is used in the same way. This logo is the original ReactOS start menu logo and should be kept IMO. ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

1 0

David Welch - ping
by Brandon Turner 12 May '06

12 May '06

Will the real David Welch please stand up?

3 2

0.3.1
by Maarten Bosma 12 May '06

12 May '06

Can we agree on the following goals for 0.3.1 ? - NDK - Cache Manager Rewrite - VMware Tools - Ext2 It would mean that we would release 0.3.1 very closely after 0.3.0. Maarten Bosma

8 13

NDK Patches
by Alex Ionescu 12 May '06

12 May '06

After about two months of work and constant reminders by Aleksey (wink wink nudge nudge), I've finally been able to finalize the NDK updates I've been working on as well as fix our source code to use it. The changes have taken weeks, so I can't remember all of them by heart (the NDK changes have been SVN logged on the TinyKRNL part of the SVN), but mostly: 1) The NDK was made "versionned", although this isn't complete yet. This means that it can now be used to make NT 5, XP, 2003 and Vista undocumented code. The current priority is xp/2003/vista, but later on I plan to add Win2000 support as well. 2) Many structures were added, fixed, or updated, as well as necessary functions. This was the direct result of TinyKRNL's needs. Some stuff was also better organized. 3) The ROS Tree was updated so that modules do not blindly include the entire NDK, but only the files they need (however if a module needs more then 4 NDK headers, it's better to include the entire kit... it won't make a speed difference when compiling anymore, and will be cleaner to the viewer). 4) Source code was updated to use the name names, definitions and constants. 5) Still hoping and working for a public, separate release, the NDK now does away with all React-OS Specific hacks. As such, ROS_EPROCESS and ROS_SECTION_OBJECT, as well as ROS_OBJECT_HEADER have been added to internal ntoskrnl headers, instead of hacking the ones in the NDK. The Win32K Callout stuff was also changed and moved away. Therefore, these patches change a lot of names, and this always creates the risk that I've mis-renamed some things. Also because new types were created (the ROS_ types), it's possible that this could create some problems that I might've unforseen. I haven't test-booted with the patches applied yet (note: they must all be applied at once, they are not standalone, I've merely separated them for readability in a diff-viewer), since I'm hoping to catch the bugs first by peer-reviewing. I'm hoping for everyone to look at them and try to identify any potential bugs. I personally have NDK_Headers.diff opened at all times, then use NDK_whatever.diff and check each name change to correspond to the member that was there before. But there are also risky typedefs and maybe broken assumptions... I've been playing with this code for so long that I don't see them anymore! Thanks again for your help.. Best regards, Alex Ionescu Index: base/services/umpnpmgr/umpnpmgr.c =================================================================== --- base/services/umpnpmgr/umpnpmgr.c (revision 21759) +++ base/services/umpnpmgr/umpnpmgr.c (working copy) @@ -298,9 +298,8 @@ PlugPlayData.Relation = Relationship; - PlugPlayData.RelatedDeviceInstance.Length = 0; - PlugPlayData.RelatedDeviceInstance.MaximumLength = Length; - PlugPlayData.RelatedDeviceInstance.Buffer = RelatedDeviceId; + PlugPlayData.RelatedDeviceInstanceLength = Length; + PlugPlayData.RelatedDeviceInstance = RelatedDeviceId; Status = NtPlugPlayControl(PlugPlayControlGetRelatedDevice, (PVOID)&PlugPlayData, Index: base/applications/taskmgr/perfdata.c =================================================================== --- base/applications/taskmgr/perfdata.c (revision 21759) +++ base/applications/taskmgr/perfdata.c (working copy) @@ -35,7 +35,7 @@ LARGE_INTEGER liOldSystemTime = {{0,0}}; SYSTEM_PERFORMANCE_INFORMATION SystemPerfInfo; SYSTEM_BASIC_INFORMATION SystemBasicInfo; -SYSTEM_CACHE_INFORMATION SystemCacheInfo; +SYSTEM_FILECACHE_INFORMATION SystemCacheInfo; SYSTEM_HANDLE_INFORMATION SystemHandleInfo; PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION SystemProcessorTimeInfo = NULL; PSID SystemUserSid = NULL; @@ -95,7 +95,7 @@ HANDLE hProcessToken; SYSTEM_PERFORMANCE_INFORMATION SysPerfInfo; SYSTEM_TIMEOFDAY_INFORMATION SysTimeInfo; - SYSTEM_CACHE_INFORMATION SysCacheInfo; + SYSTEM_FILECACHE_INFORMATION SysCacheInfo; LPBYTE SysHandleInfoData; PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION SysProcessorTimeInfo; double CurrentKernelTime; @@ -170,7 +170,7 @@ /* * Save system cache info */ - memcpy(&SystemCacheInfo, &SysCacheInfo, sizeof(SYSTEM_CACHE_INFORMATION)); + memcpy(&SystemCacheInfo, &SysCacheInfo, sizeof(SYSTEM_FILECACHE_INFORMATION)); /* * Save system processor time info Index: boot/freeldr/freeldr/reactos/reactos.c =================================================================== --- boot/freeldr/freeldr/reactos/reactos.c (revision 21759) +++ boot/freeldr/freeldr/reactos/reactos.c (working copy) @@ -24,7 +24,7 @@ #define NDEBUG #include <debug.h> -LOADER_PARAMETER_BLOCK LoaderBlock; +ROS_LOADER_PARAMETER_BLOCK LoaderBlock; char reactos_kernel_cmdline[255]; // Command line passed to kernel LOADER_MODULE reactos_modules[64]; // Array to hold boot module info loaded for the kernel char reactos_module_strings[64][256]; // Array to hold module names Index: boot/freeldr/freeldr/reactos/setupldr.c =================================================================== --- boot/freeldr/freeldr/reactos/setupldr.c (revision 21759) +++ boot/freeldr/freeldr/reactos/setupldr.c (working copy) @@ -20,7 +20,7 @@ #include <freeldr.h> -LOADER_PARAMETER_BLOCK LoaderBlock; +ROS_LOADER_PARAMETER_BLOCK LoaderBlock; char reactos_kernel_cmdline[255]; // Command line passed to kernel LOADER_MODULE reactos_modules[64]; // Array to hold boot module info loaded for the kernel char reactos_module_strings[64][256]; // Array to hold module names Index: boot/freeldr/freeldr/arch/i386/loader.c =================================================================== --- boot/freeldr/freeldr/arch/i386/loader.c (revision 21759) +++ boot/freeldr/freeldr/arch/i386/loader.c (working copy) @@ -101,7 +101,7 @@ } HARDWARE_PTE_X64, *PHARDWARE_PTE_X64; typedef struct _PAGE_DIRECTORY_X86 { - HARDWARE_PTE_X86 Pde[1024]; + HARDWARE_PTE Pde[1024]; } PAGE_DIRECTORY_X86, *PPAGE_DIRECTORY_X86; typedef struct _PAGE_DIRECTORY_X64 { Index: boot/freeldr/freeldr/include/freeldr.h =================================================================== --- boot/freeldr/freeldr/include/freeldr.h (revision 21759) +++ boot/freeldr/freeldr/include/freeldr.h (working copy) @@ -26,7 +26,10 @@ #include <stdio.h> #include <ctype.h> #include <ntddk.h> -#include <ndk/ntndk.h> +#include <arc/arc.h> +#include <ketypes.h> +#include <mmtypes.h> +#include <rosldr.h> #include <arch.h> #include <rtl.h> #include <disk.h> Index: boot/freeldr/freeldr/include/reactos.h =================================================================== --- boot/freeldr/freeldr/include/reactos.h (revision 21759) +++ boot/freeldr/freeldr/include/reactos.h (working copy) @@ -49,8 +49,7 @@ // Loader Functions And Definitions // /////////////////////////////////////////////////////////////////////////////////////// - -extern LOADER_PARAMETER_BLOCK LoaderBlock; /* Multiboot info structure passed to kernel */ +extern ROS_LOADER_PARAMETER_BLOCK LoaderBlock; /* Multiboot info structure passed to kernel */ extern char reactos_kernel_cmdline[255]; // Command line passed to kernel extern LOADER_MODULE reactos_modules[64]; // Array to hold boot module info loaded for the kernel extern char reactos_module_strings[64][256]; // Array to hold module names @@ -65,6 +64,6 @@ ULONG_PTR STDCALL FrLdrLoadModule(FILE *ModuleImage, LPCSTR ModuleName, PULONG ModuleSize); BOOL STDCALL FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG dwModuleSize); VOID STDCALL FrLdrStartup(ULONG Magic); -typedef VOID (FASTCALL *ASMCODE)(ULONG Magic, PLOADER_PARAMETER_BLOCK LoaderBlock); +typedef VOID (FASTCALL *ASMCODE)(ULONG Magic, PROS_LOADER_PARAMETER_BLOCK LoaderBlock); #endif // defined __REACTOS_H Index: dll/win32/advapi32/sec/ac.c =================================================================== --- dll/win32/advapi32/sec/ac.c (revision 21759) +++ dll/win32/advapi32/sec/ac.c (working copy) @@ -578,8 +578,6 @@ { /* directly copy the array, this works as the size of the EXPLICIT_ACCESS_A structure matches the size of the EXPLICIT_ACCESS_W version */ - ASSERT(sizeof(EXPLICIT_ACCESS_A) == sizeof(EXPLICIT_ACCESS_W)); - RtlCopyMemory(ListOfExplicitEntriesW, pListOfExplicitEntries, cCountOfExplicitEntries * sizeof(EXPLICIT_ACCESS_W)); Index: dll/win32/kernel32/file/create.c =================================================================== --- dll/win32/kernel32/file/create.c (revision 21759) +++ dll/win32/kernel32/file/create.c (working copy) @@ -14,6 +14,10 @@ /* INCLUDES *****************************************************************/ +/* File contains Vista Semantics */ +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 + #include <k32.h> #define NDEBUG @@ -399,14 +403,14 @@ switch(RtlDetermineDosPathNameType_U(lpTargetFileName)) { - case INVALID_PATH: - case ABSOLUTE_PATH: - case RELATIVE_PATH: + case RtlPathTypeUnknown: + case RtlPathTypeRooted: + case RtlPathTypeRelative: bRelativePath = TRUE; RtlInitUnicodeString(&TargetFileName, lpTargetFileName); break; - case RELATIVE_DRIVE_PATH: + case RtlPathTypeDriveRelative: { LPWSTR FilePart; SIZE_T cchTargetFullFileName; @@ -438,10 +442,10 @@ // fallthrough - case UNC_PATH: - case ABSOLUTE_DRIVE_PATH: - case DEVICE_PATH: - case UNC_DOT_PATH: + case RtlPathTypeUncAbsolute: + case RtlPathTypeDriveAbsolute: + case RtlPathTypeLocalDevice: + case RtlPathTypeRootLocalDevice: default: if(!RtlDosPathNameToNtPathName_U(lpTargetFileName, &TargetFileName, NULL, NULL)) { Index: dll/win32/kernel32/file/file.c =================================================================== --- dll/win32/kernel32/file/file.c (revision 21759) +++ dll/win32/kernel32/file/file.c (working copy) @@ -12,6 +12,10 @@ /* INCLUDES *****************************************************************/ +/* File contains Vista Semantics */ +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 + #include <k32.h> #define NDEBUG Index: dll/win32/kernel32/misc/recovery.c =================================================================== --- dll/win32/kernel32/misc/recovery.c (revision 21759) +++ dll/win32/kernel32/misc/recovery.c (working copy) @@ -30,6 +30,10 @@ * 10/28/2005 Created stubs (w3) */ +/* File contains Vista Semantics */ +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 + #include <k32.h> #define NDEBUG Index: dll/win32/kernel32/misc/utils.c =================================================================== --- dll/win32/kernel32/misc/utils.c (revision 21759) +++ dll/win32/kernel32/misc/utils.c (working copy) @@ -9,6 +9,7 @@ /* INCLUDES ****************************************************************/ #include <k32.h> +#include "i386/ketypes.h" #define NDEBUG #include "../include/debug.h" Index: dll/win32/kernel32/misc/profile.c =================================================================== --- dll/win32/kernel32/misc/profile.c (revision 21759) +++ dll/win32/kernel32/misc/profile.c (working copy) @@ -756,7 +756,7 @@ GetWindowsDirectoryW( windirW, MAX_PATH ); - if ((RtlDetermineDosPathNameType_U(filename) == RELATIVE_PATH) && + if ((RtlDetermineDosPathNameType_U(filename) == RtlPathTypeRelative) && !wcschr(filename, '\\') && !wcschr(filename, '/')) { static const WCHAR wszSeparator[] = {'\\', 0}; Index: dll/win32/kernel32/misc/console.c =================================================================== --- dll/win32/kernel32/misc/console.c (revision 21759) +++ dll/win32/kernel32/misc/console.c (working copy) @@ -14,6 +14,10 @@ /* INCLUDES ******************************************************************/ +/* File contains Vista Semantics */ +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 + #include <k32.h> #define NDEBUG Index: dll/win32/kernel32/misc/ldr.c =================================================================== --- dll/win32/kernel32/misc/ldr.c (revision 21759) +++ dll/win32/kernel32/misc/ldr.c (working copy) @@ -196,14 +196,14 @@ { /* Call the API Properly */ Status = LdrLoadDll(SearchPath, - (ULONG)&DllCharacteristics, // Silence compiler + &DllCharacteristics, &DllName, (PVOID*)&hInst); } else { /* Call the ROS API. NOTE: Don't fix this, I have a patch to merge later. */ - Status = LdrLoadDll(SearchPath, dwFlags, &DllName, (PVOID*)&hInst); + Status = LdrLoadDll(SearchPath, &dwFlags, &DllName, (PVOID*)&hInst); } RtlFreeHeap(RtlGetProcessHeap(), 0, SearchPath); if ( !NT_SUCCESS(Status)) @@ -305,7 +305,7 @@ while (Entry != ModuleListHead) { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); if (Module->DllBase == (PVOID)hModule) { if (nSize * sizeof(WCHAR) < Module->FullDllName.Length) @@ -372,7 +372,7 @@ Entry = ModuleListHead->Flink; while (Entry != ModuleListHead) { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); if (Module->DllBase == (PVOID)hModule) { Index: dll/win32/kernel32/misc/toolhelp.c =================================================================== --- dll/win32/kernel32/misc/toolhelp.c (revision 21759) +++ dll/win32/kernel32/misc/toolhelp.c (working copy) @@ -92,8 +92,8 @@ /* INTERNAL FUNCTIONS *********************************************************/ static VOID -TH32FreeAllocatedResources(PRTL_DEBUG_BUFFER HeapDebug, - PRTL_DEBUG_BUFFER ModuleDebug, +TH32FreeAllocatedResources(PRTL_DEBUG_INFORMATION HeapDebug, + PRTL_DEBUG_INFORMATION ModuleDebug, PVOID ProcThrdInfo, SIZE_T ProcThrdInfoSize) { @@ -118,8 +118,8 @@ static NTSTATUS TH32CreateSnapshot(DWORD dwFlags, DWORD th32ProcessID, - PRTL_DEBUG_BUFFER *HeapDebug, - PRTL_DEBUG_BUFFER *ModuleDebug, + PRTL_DEBUG_INFORMATION *HeapDebug, + PRTL_DEBUG_INFORMATION *ModuleDebug, PVOID *ProcThrdInfo, SIZE_T *ProcThrdInfoSize) { @@ -221,8 +221,8 @@ static NTSTATUS TH32CreateSnapshotSectionInitialize(DWORD dwFlags, DWORD th32ProcessID, - PRTL_DEBUG_BUFFER HeapDebug, - PRTL_DEBUG_BUFFER ModuleDebug, + PRTL_DEBUG_INFORMATION HeapDebug, + PRTL_DEBUG_INFORMATION ModuleDebug, PVOID ProcThrdInfo, HANDLE *SectionHandle) { @@ -248,8 +248,8 @@ */ if(dwFlags & TH32CS_SNAPHEAPLIST) { - hi = (PRTL_PROCESS_HEAPS)HeapDebug->HeapInformation; - nHeaps = hi->HeapCount; + hi = (PRTL_PROCESS_HEAPS)HeapDebug->Heaps; + nHeaps = hi->NumberOfHeaps; RequiredSnapshotSize += nHeaps * sizeof(HEAPLIST32); } @@ -258,8 +258,8 @@ */ if(dwFlags & TH32CS_SNAPMODULE) { - mi = (PRTL_PROCESS_MODULES)ModuleDebug->ModuleInformation; - nModules = mi->ModuleCount; + mi = (PRTL_PROCESS_MODULES)ModuleDebug->Modules; + nModules = mi->NumberOfModules; RequiredSnapshotSize += nModules * sizeof(MODULEENTRY32W); } @@ -350,13 +350,13 @@ { HeapListEntry->dwSize = sizeof(HEAPLIST32); HeapListEntry->th32ProcessID = th32ProcessID; - HeapListEntry->th32HeapID = (ULONG_PTR)hi->HeapEntry[i].Base; - HeapListEntry->dwFlags = hi->HeapEntry[i].Flags; + HeapListEntry->th32HeapID = (ULONG_PTR)hi->Heaps[i].BaseAddress; + HeapListEntry->dwFlags = hi->Heaps[i].Flags; HeapListEntry++; } - DataOffset += hi->HeapCount * sizeof(HEAPLIST32); + DataOffset += hi->NumberOfHeaps * sizeof(HEAPLIST32); } /* initialize the module list */ @@ -370,22 +370,22 @@ ModuleListEntry->dwSize = sizeof(MODULEENTRY32W); ModuleListEntry->th32ModuleID = 1; /* no longer used, always set to one! */ ModuleListEntry->th32ProcessID = th32ProcessID; - ModuleListEntry->GlblcntUsage = mi->ModuleEntry[i].LoadCount; - ModuleListEntry->ProccntUsage = mi->ModuleEntry[i].LoadCount; - ModuleListEntry->modBaseAddr = (BYTE*)mi->ModuleEntry[i].Base; - ModuleListEntry->modBaseSize = mi->ModuleEntry[i].Size; - ModuleListEntry->hModule = (HMODULE)mi->ModuleEntry[i].Base; + ModuleListEntry->GlblcntUsage = mi->Modules[i].LoadCount; + ModuleListEntry->ProccntUsage = mi->Modules[i].LoadCount; + ModuleListEntry->modBaseAddr = (BYTE*)mi->Modules[i].ImageBase; + ModuleListEntry->modBaseSize = mi->Modules[i].ImageSize; + ModuleListEntry->hModule = (HMODULE)mi->Modules[i].ImageBase; MultiByteToWideChar(CP_ACP, 0, - &mi->ModuleEntry[i].ImageName[mi->ModuleEntry[i].ModuleNameOffset], + &mi->Modules[i].FullPathName[mi->Modules[i].OffsetToFileName], -1, ModuleListEntry->szModule, sizeof(ModuleListEntry->szModule) / sizeof(ModuleListEntry->szModule[0])); MultiByteToWideChar(CP_ACP, 0, - mi->ModuleEntry[i].ImageName, + mi->Modules[i].FullPathName, -1, ModuleListEntry->szExePath, sizeof(ModuleListEntry->szExePath) / sizeof(ModuleListEntry->szExePath[0])); @@ -393,7 +393,7 @@ ModuleListEntry++; } - DataOffset += mi->ModuleCount * sizeof(MODULEENTRY32W); + DataOffset += mi->NumberOfModules * sizeof(MODULEENTRY32W); } /* initialize the process list */ @@ -1113,7 +1113,7 @@ STDCALL CreateToolhelp32Snapshot(DWORD dwFlags, DWORD th32ProcessID) { - PRTL_DEBUG_BUFFER HeapDebug, ModuleDebug; + PRTL_DEBUG_INFORMATION HeapDebug, ModuleDebug; PVOID ProcThrdInfo; SIZE_T ProcThrdInfoSize; NTSTATUS Status; Index: dll/win32/kernel32/kernel32.rbuild =================================================================== --- dll/win32/kernel32/kernel32.rbuild (revision 21759) +++ dll/win32/kernel32/kernel32.rbuild (working copy) @@ -5,11 +5,10 @@ <define name="_DISABLE_TIDENTS" /> <define name="_SEH_NO_NATIVE_NLG" /> <define name="__USE_W32API" /> - <define name="_WIN32_WINNT">0x0600</define> + <define name="_WIN32_WINNT">0x0502</define> <define name="__NO_CTYPE_INLINES" /> - <define name="WINVER">0x0600</define> + <define name="WINVER">0x502</define> <pch>k32.h</pch> - <compilationunit name="unit.c"> <directory name="debug"> <file>break.c</file> <file>debugger.c</file> @@ -104,7 +103,6 @@ <file>thread.c</file> <file>tls.c</file> </directory> - </compilationunit> <directory name="misc"> <file>lcformat.c</file> <file>profile.c</file> Index: dll/win32/kernel32/thread/tls.c =================================================================== --- dll/win32/kernel32/thread/tls.c (revision 21759) +++ dll/win32/kernel32/thread/tls.c (working copy) @@ -17,8 +17,6 @@ #define NDEBUG #include "../include/debug.h" -#define TLS_EXPANSION_SLOTS (8 * sizeof(((PPEB)NULL)->TlsExpansionBitmapBits)) - /* FUNCTIONS *****************************************************************/ /* Index: dll/win32/kernel32/process/create.c =================================================================== --- dll/win32/kernel32/process/create.c (revision 21759) +++ dll/win32/kernel32/process/create.c (working copy) @@ -883,7 +883,7 @@ PathType = RtlDetermineDosPathNameType_U(lpApplicationName); /* If it's not relative, try to get the error */ - if (PathType != RELATIVE_PATH) + if (PathType != RtlPathTypeRelative) { /* This should fail, and give us a detailed LastError */ hFile = CreateFileW(lpApplicationName, Index: dll/win32/psapi/psapi.c =================================================================== --- dll/win32/psapi/psapi.c (revision 21759) +++ dll/win32/psapi/psapi.c (working copy) @@ -42,7 +42,7 @@ } ENUM_DEVICE_DRIVERS_CONTEXT, *PENUM_DEVICE_DRIVERS_CONTEXT; NTSTATUS STDCALL -EnumDeviceDriversCallback(IN PSYSTEM_MODULE_INFORMATION_ENTRY CurrentModule, +EnumDeviceDriversCallback(IN PRTL_PROCESS_MODULE_INFORMATION CurrentModule, IN OUT PVOID CallbackContext) { PENUM_DEVICE_DRIVERS_CONTEXT Context = (PENUM_DEVICE_DRIVERS_CONTEXT)CallbackContext; @@ -54,7 +54,7 @@ } /* return current module */ - *Context->lpImageBase = CurrentModule->Base; + *Context->lpImageBase = CurrentModule->ImageBase; /* go to next array slot */ Context->lpImageBase++; @@ -141,22 +141,22 @@ } GET_DEVICE_DRIVER_NAME_CONTEXT, *PGET_DEVICE_DRIVER_NAME_CONTEXT; NTSTATUS STDCALL -GetDeviceDriverNameCallback(IN PSYSTEM_MODULE_INFORMATION_ENTRY CurrentModule, +GetDeviceDriverNameCallback(IN PRTL_PROCESS_MODULE_INFORMATION CurrentModule, IN OUT PVOID CallbackContext) { PGET_DEVICE_DRIVER_NAME_CONTEXT Context = (PGET_DEVICE_DRIVER_NAME_CONTEXT)CallbackContext; /* module found */ - if(Context->ImageBase == CurrentModule->Base) + if(Context->ImageBase == CurrentModule->ImageBase) { PCHAR pcModuleName; ULONG l; /* get the full name or just the filename part */ if(Context->bFullName) - pcModuleName = &CurrentModule->ImageName[0]; + pcModuleName = &CurrentModule->FullPathName[0]; else - pcModuleName = &CurrentModule->ImageName[CurrentModule->PathLength]; + pcModuleName = &CurrentModule->FullPathName[CurrentModule->OffsetToFileName]; /* get the length of the name */ l = strlen(pcModuleName); Index: drivers/storage/diskdump/diskdump.c =================================================================== --- drivers/storage/diskdump/diskdump.c (revision 21759) +++ drivers/storage/diskdump/diskdump.c (working copy) @@ -33,9 +33,8 @@ #include <ntddscsi.h> #include <include/class2.h> #include <diskdump/diskdump.h> - -#include <ndk/extypes.h> #include <ndk/rtlfuncs.h> + #include "../scsiport/scsiport_int.h" #define NDEBUG Index: drivers/video/videoprt/videoprt.h =================================================================== --- drivers/video/videoprt/videoprt.h (revision 21759) +++ drivers/video/videoprt/videoprt.h (working copy) @@ -41,6 +41,14 @@ #define DPFLTR_IHVVIDEO_ID 0 /* FIXME */ +/* ROS Internal. Please deprecate */ +NTHALAPI +VOID +NTAPI +HalReleaseDisplayOwnership( + VOID +); + typedef struct _VIDEO_PORT_ADDRESS_MAPPING { LIST_ENTRY List; Index: drivers/video/videoprt/int10.c =================================================================== --- drivers/video/videoprt/int10.c (revision 21759) +++ drivers/video/videoprt/int10.c (working copy) @@ -22,7 +22,7 @@ */ #include "videoprt.h" -#include "internal/ke.h" +#include "internal/i386/v86m.h" /* PRIVATE FUNCTIONS **********************************************************/ @@ -178,7 +178,7 @@ Regs.Ds = BiosArguments->SegDs; DPRINT("- Input register SegEs: %x\n", BiosArguments->SegEs); Regs.Es = BiosArguments->SegEs; - Status = Ke386CallBios(0x10, &Regs); + Status = Ke386CallBios(0x10, (PCONTEXT)&Regs); BiosArguments->Eax = Regs.Eax; BiosArguments->Ebx = Regs.Ebx; BiosArguments->Ecx = Regs.Ecx; @@ -234,7 +234,7 @@ Regs.Edi = BiosArguments->Edi; DPRINT("- Input register Ebp: %x\n", BiosArguments->Ebp); Regs.Ebp = BiosArguments->Ebp; - Status = Ke386CallBios(0x10, &Regs); + Status = Ke386CallBios(0x10, (PCONTEXT)&Regs); BiosArguments->Eax = Regs.Eax; BiosArguments->Ebx = Regs.Ebx; BiosArguments->Ecx = Regs.Ecx; Index: drivers/filesystems/ms/msfs.h =================================================================== --- drivers/filesystems/ms/msfs.h (revision 21759) +++ drivers/filesystems/ms/msfs.h (working copy) @@ -2,7 +2,7 @@ #define __SERVICES_FS_MS_MSFS_H #include <ntifs.h> -#include <ndk/ntndk.h> +#include <iotypes.h> /* * FIXME: GCC doesn't have a working option for defaulting to a calling Index: drivers/filesystems/vfat/vfat.h =================================================================== --- drivers/filesystems/vfat/vfat.h (revision 21759) +++ drivers/filesystems/vfat/vfat.h (working copy) @@ -4,7 +4,6 @@ #include <reactos/helper.h> #ifdef __GNUC__ -#include <ndk/ntndk.h> #include <ccros.h> #define USE_ROS_CC_AND_FS Index: drivers/network/tcpip/include/precomp.h =================================================================== --- drivers/network/tcpip/include/precomp.h (revision 21759) +++ drivers/network/tcpip/include/precomp.h (working copy) @@ -1,6 +1,7 @@ #include <roscfg.h> #include <limits.h> #include <ntddk.h> +#include <ntifs.h> #include <tdi.h> #include <tdistat.h> #include <../recmutex/recmutex.h> @@ -37,5 +38,4 @@ #include <interface.h> #include <ports.h> #include <ipifcons.h> -#include <ndk/ntndk.h> #include <chew/chew.h> Index: drivers/base/blue/blue.c =================================================================== --- drivers/base/blue/blue.c (revision 21759) +++ drivers/base/blue/blue.c (working copy) @@ -18,11 +18,18 @@ #include <wincon.h> #include <blue/ntddblue.h> -#include <ndk/halfuncs.h> #define NDEBUG #include <debug.h> +// ROS Internal. Please deprecate. +NTHALAPI +BOOLEAN +NTAPI +HalQueryDisplayOwnership( + VOID +); + /* DEFINITIONS ***************************************************************/ #define VIDMEM_BASE 0xb8000 Index: drivers/multimedia/audio/sound/wave.c =================================================================== --- drivers/multimedia/audio/sound/wave.c (revision 21759) +++ drivers/multimedia/audio/sound/wave.c (working copy) @@ -13,7 +13,6 @@ /* FUNCTIONS **************************************************************/ #include <ntddk.h> -#include <halfuncs.h> #include <string.h> #include <devices.h> Index: hal/hal/hal.c =================================================================== --- hal/hal/hal.c (revision 21759) +++ hal/hal/hal.c (working copy) @@ -14,6 +14,8 @@ #include <ntddk.h> #include <ndk/halfuncs.h> #include <ndk/kdfuncs.h> +#include <rosldr.h> +#include <internal/kd.h> #define NDEBUG #include <debug.h> @@ -333,7 +335,7 @@ NTAPI HalInitSystem( ULONG BootPhase, - PLOADER_PARAMETER_BLOCK LoaderBlock) + PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { UNIMPLEMENTED; @@ -344,7 +346,7 @@ VOID NTAPI HalInitializeProcessor(ULONG ProcessorNumber, - PLOADER_PARAMETER_BLOCK LoaderBlock) + PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { UNIMPLEMENTED; } @@ -558,7 +560,7 @@ VOID NTAPI IoAssignDriveLetters( - PLOADER_PARAMETER_BLOCK LoaderBlock, + PROS_LOADER_PARAMETER_BLOCK LoaderBlock, PSTRING NtDeviceName, PUCHAR NtSystemPath, PSTRING NtSystemPathString) Index: hal/halx86/xbox/display_xbox.c =================================================================== --- hal/halx86/xbox/display_xbox.c (revision 21759) +++ hal/halx86/xbox/display_xbox.c (working copy) @@ -284,7 +284,7 @@ } VOID FASTCALL -HalInitializeDisplay (PLOADER_PARAMETER_BLOCK LoaderBlock) +HalInitializeDisplay (PROS_LOADER_PARAMETER_BLOCK LoaderBlock) /* * FUNCTION: Initalize the display * ARGUMENTS: Index: hal/halx86/xbox/halinit_xbox.c =================================================================== --- hal/halx86/xbox/halinit_xbox.c (revision 21759) +++ hal/halx86/xbox/halinit_xbox.c (working copy) @@ -19,7 +19,7 @@ /* FUNCTIONS ***************************************************************/ VOID -HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) +HalpInitPhase0(PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { HalpHooks.InitPciBus = HalpXboxInitPciBus; Index: hal/halx86/include/mps.h =================================================================== --- hal/halx86/include/mps.h (revision 21759) +++ hal/halx86/include/mps.h (working copy) @@ -9,6 +9,25 @@ #define IRQL2TPR(irql) ((irql) >= IPI_LEVEL ? IPI_VECTOR : ((irql) >= PROFILE_LEVEL ? LOCAL_TIMER_VECTOR : ((irql) > DISPATCH_LEVEL ? IRQL2VECTOR(irql) : 0))) +typedef struct _KIRQ_TRAPFRAME +{ + ULONG Magic; + ULONG Gs; + ULONG Fs; + ULONG Es; + ULONG Ds; + ULONG Eax; + ULONG Ecx; + ULONG Edx; + ULONG Ebx; + ULONG Esp; + ULONG Ebp; + ULONG Esi; + ULONG Edi; + ULONG Eip; + ULONG Cs; + ULONG Eflags; +} KIRQ_TRAPFRAME, *PKIRQ_TRAPFRAME; #if 0 /* This values are defined in halirql.h */ Index: hal/halx86/include/hal.h =================================================================== --- hal/halx86/include/hal.h (revision 21759) +++ hal/halx86/include/hal.h (working copy) @@ -14,12 +14,11 @@ /* IFS/DDK/NDK Headers */ #include <ntifs.h> #include <ntddk.h> -#include <ndk/ntndk.h> +#include <arc/arc.h> +#include <iotypes.h> +#include <kefuncs.h> +#include <rosldr.h> -/* Internal Kernel Headers */ -#include <internal/mm.h> -#include <internal/ke.h> - #define KPCR_BASE 0xFF000000 // HACK! /* Internal HAL Headers */ Index: hal/halx86/include/halp.h =================================================================== --- hal/halx86/include/halp.h (revision 21759) +++ hal/halx86/include/halp.h (working copy) @@ -8,9 +8,18 @@ #define HAL_APC_REQUEST 0 #define HAL_DPC_REQUEST 1 +// +// Kernel Debugger Port Definition +// +typedef struct _KD_PORT_INFORMATION +{ + ULONG ComPort; + ULONG BaudRate; + ULONG BaseAddress; +} KD_PORT_INFORMATION, *PKD_PORT_INFORMATION; + /* display.c */ -struct _LOADER_PARAMETER_BLOCK; -VOID FASTCALL HalInitializeDisplay (struct _LOADER_PARAMETER_BLOCK *LoaderBlock); +VOID FASTCALL HalInitializeDisplay (struct _ROS_LOADER_PARAMETER_BLOCK *LoaderBlock); VOID FASTCALL HalClearDisplay (UCHAR CharAttribute); /* adapter.c */ @@ -38,7 +47,7 @@ PVOID HalpMapPhysMemory(ULONG PhysAddr, ULONG Size); /* Non-generic initialization */ -VOID HalpInitPhase0 (PLOADER_PARAMETER_BLOCK LoaderBlock); +VOID HalpInitPhase0 (PROS_LOADER_PARAMETER_BLOCK LoaderBlock); /* sysinfo.c */ NTSTATUS STDCALL Index: hal/halx86/up/halinit_up.c =================================================================== --- hal/halx86/up/halinit_up.c (revision 21759) +++ hal/halx86/up/halinit_up.c (working copy) @@ -18,7 +18,7 @@ /* FUNCTIONS ***************************************************************/ VOID -HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) +HalpInitPhase0(PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { HalpInitPICs(); Index: hal/halx86/generic/display.c =================================================================== --- hal/halx86/generic/display.c (revision 21759) +++ hal/halx86/generic/display.c (working copy) @@ -571,7 +571,7 @@ /* PRIVATE FUNCTIONS ********************************************************/ VOID FASTCALL -HalInitializeDisplay (PLOADER_PARAMETER_BLOCK LoaderBlock) +HalInitializeDisplay (PROS_LOADER_PARAMETER_BLOCK LoaderBlock) /* * FUNCTION: Initalize the display * ARGUMENTS: Index: hal/halx86/generic/irql.c =================================================================== --- hal/halx86/generic/irql.c (revision 21759) +++ hal/halx86/generic/irql.c (working copy) @@ -67,7 +67,7 @@ * RETURNS: The current irq level */ { - return(KeGetCurrentKPCR()->Irql); + return(KeGetPcr()->Irql); } VOID HalpInitPICs(VOID) @@ -136,7 +136,7 @@ { if (HalpPendingInterruptCount[i] > 0) { - KeGetCurrentKPCR()->Irql = (KIRQL)IRQ_TO_DIRQL(i); + KeGetPcr()->Irql = (KIRQL)IRQ_TO_DIRQL(i); while (HalpPendingInterruptCount[i] > 0) { @@ -146,8 +146,8 @@ HalpPendingInterruptCount[i]--; KiInterruptDispatch2(i + IRQ_BASE, NewIrql); } - KeGetCurrentKPCR()->Irql--; - HalpEndSystemInterrupt(KeGetCurrentKPCR()->Irql); + KeGetPcr()->Irql--; + HalpEndSystemInterrupt(KeGetPcr()->Irql); } } @@ -158,22 +158,22 @@ { if (NewIrql >= PROFILE_LEVEL) { - KeGetCurrentKPCR()->Irql = NewIrql; + KeGetPcr()->Irql = NewIrql; return; } HalpExecuteIrqs(NewIrql); if (NewIrql >= DISPATCH_LEVEL) { - KeGetCurrentKPCR()->Irql = NewIrql; + KeGetPcr()->Irql = NewIrql; return; } - KeGetCurrentKPCR()->Irql = DISPATCH_LEVEL; - if (((PKIPCR)KeGetCurrentKPCR())->HalReserved[HAL_DPC_REQUEST]) + KeGetPcr()->Irql = DISPATCH_LEVEL; + if (((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST]) { - ((PKIPCR)KeGetCurrentKPCR())->HalReserved[HAL_DPC_REQUEST] = FALSE; + ((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST] = FALSE; KiDispatchInterrupt(); } - KeGetCurrentKPCR()->Irql = APC_LEVEL; + KeGetPcr()->Irql = APC_LEVEL; if (NewIrql == APC_LEVEL) { return; @@ -183,7 +183,7 @@ { KiDeliverApc(KernelMode, NULL, NULL); } - KeGetCurrentKPCR()->Irql = PASSIVE_LEVEL; + KeGetPcr()->Irql = PASSIVE_LEVEL; } /********************************************************************** @@ -207,10 +207,10 @@ { DPRINT("KfLowerIrql(NewIrql %d)\n", NewIrql); - if (NewIrql > KeGetCurrentKPCR()->Irql) + if (NewIrql > KeGetPcr()->Irql) { DbgPrint ("(%s:%d) NewIrql %x CurrentIrql %x\n", - __FILE__, __LINE__, NewIrql, KeGetCurrentKPCR()->Irql); + __FILE__, __LINE__, NewIrql, KeGetPcr()->Irql); KEBUGCHECK(0); for(;;); } @@ -266,16 +266,16 @@ DPRINT("KfRaiseIrql(NewIrql %d)\n", NewIrql); - if (NewIrql < KeGetCurrentKPCR()->Irql) + if (NewIrql < KeGetPcr()->Irql) { DbgPrint ("%s:%d CurrentIrql %x NewIrql %x\n", - __FILE__,__LINE__,KeGetCurrentKPCR()->Irql,NewIrql); + __FILE__,__LINE__,KeGetPcr()->Irql,NewIrql); KEBUGCHECK (0); for(;;); } - OldIrql = KeGetCurrentKPCR()->Irql; - KeGetCurrentKPCR()->Irql = NewIrql; + OldIrql = KeGetPcr()->Irql; + KeGetPcr()->Irql = NewIrql; return OldIrql; } @@ -380,13 +380,13 @@ WRITE_PORT_UCHAR((PUCHAR)0xa0,0x20); } - if (KeGetCurrentKPCR()->Irql >= Irql) + if (KeGetPcr()->Irql >= Irql) { HalpPendingInterruptCount[irq]++; return(FALSE); } - *OldIrql = KeGetCurrentKPCR()->Irql; - KeGetCurrentKPCR()->Irql = Irql; + *OldIrql = KeGetPcr()->Irql; + KeGetPcr()->Irql = Irql; return(TRUE); } @@ -461,11 +461,11 @@ switch (Request) { case APC_LEVEL: - ((PKIPCR)KeGetCurrentKPCR())->HalReserved[HAL_APC_REQUEST] = TRUE; + ((PKIPCR)KeGetPcr())->HalReserved[HAL_APC_REQUEST] = TRUE; break; case DISPATCH_LEVEL: - ((PKIPCR)KeGetCurrentKPCR())->HalReserved[HAL_DPC_REQUEST] = TRUE; + ((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST] = TRUE; break; default: Index: hal/halx86/generic/timer.c =================================================================== --- hal/halx86/generic/timer.c (revision 21759) +++ hal/halx86/generic/timer.c (working copy) @@ -125,9 +125,9 @@ STDCALL KeStallExecutionProcessor(ULONG Microseconds) { - PKIPCR Pcr = (PKIPCR)KeGetCurrentKPCR(); + PKIPCR Pcr = (PKIPCR)KeGetPcr(); - if (Pcr->PrcbData.FeatureBits & X86_FEATURE_TSC) + if (Pcr->PrcbData.FeatureBits & KF_RDTSC) { LARGE_INTEGER EndCount, CurrentCount; Ki386RdTSC(EndCount); @@ -201,14 +201,14 @@ } UdelayCalibrated = TRUE; - Pcr = (PKIPCR)KeGetCurrentKPCR(); + Pcr = (PKIPCR)KeGetPcr(); /* Initialise timer interrupt with MILLISEC ms interval */ WRITE_PORT_UCHAR((PUCHAR) TMR_CTRL, TMR_SC0 | TMR_BOTH | TMR_MD2); /* binary, mode 2, LSB/MSB, ch 0 */ WRITE_PORT_UCHAR((PUCHAR) TMR_CNT0, LATCH & 0xff); /* LSB */ WRITE_PORT_UCHAR((PUCHAR) TMR_CNT0, LATCH >> 8); /* MSB */ - if (Pcr->PrcbData.FeatureBits & X86_FEATURE_TSC) + if (Pcr->PrcbData.FeatureBits & KF_RDTSC) { WaitFor8254Wraparound(); @@ -325,9 +325,9 @@ Ki386SaveFlags(Flags); Ki386DisableInterrupts(); - Pcr = (PKIPCR)KeGetCurrentKPCR(); + Pcr = (PKIPCR)KeGetPcr(); - if (Pcr->PrcbData.FeatureBits & X86_FEATURE_TSC) + if (Pcr->PrcbData.FeatureBits & KF_RDTSC) { Ki386RestoreFlags(Flags); if (NULL != PerformanceFreq) Index: hal/halx86/generic/spinlock.c =================================================================== --- hal/halx86/generic/spinlock.c (revision 21759) +++ hal/halx86/generic/spinlock.c (working copy) @@ -91,7 +91,7 @@ */ KIRQL FASTCALL -KeAcquireQueuedSpinLockRaiseToSynch(IN PKLOCK_QUEUE_HANDLE LockHandle) +KeAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) { /* Simply raise to dispatch */ return KfRaiseIrql(DISPATCH_LEVEL); Index: hal/halx86/generic/halinit.c =================================================================== --- hal/halx86/generic/halinit.c (revision 21759) +++ hal/halx86/generic/halinit.c (working copy) @@ -38,12 +38,12 @@ if (BootPhase == 0) { RtlZeroMemory(&HalpHooks, sizeof(HALP_HOOKS)); - HalpInitPhase0(LoaderBlock); + HalpInitPhase0((PROS_LOADER_PARAMETER_BLOCK)LoaderBlock); } else if (BootPhase == 1) { /* Initialize display and make the screen black */ - HalInitializeDisplay (LoaderBlock); + HalInitializeDisplay ((PROS_LOADER_PARAMETER_BLOCK)LoaderBlock); HalpInitBusHandlers(); HalpInitDma(); Index: hal/halx86/mp/halinit_mp.c =================================================================== --- hal/halx86/mp/halinit_mp.c (revision 21759) +++ hal/halx86/mp/halinit_mp.c (working copy) @@ -22,7 +22,7 @@ /***************************************************************************/ VOID -HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) +HalpInitPhase0(PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { static BOOLEAN MPSInitialized = FALSE; Index: hal/halx86/mp/mpsirql.c =================================================================== --- hal/halx86/mp/mpsirql.c (revision 21759) +++ hal/halx86/mp/mpsirql.c (working copy) @@ -39,7 +39,7 @@ DPRINT1 ("CurrentIrql %x\n", irql); KEBUGCHECK (0); } - if (Flags & X86_EFLAGS_IF) + if (Flags & EFLAGS_INTERRUPT_MASK) { Ki386EnableInterrupts(); } @@ -62,7 +62,7 @@ Ki386SaveFlags(Flags); Ki386DisableInterrupts(); Ki386WriteFsByte(FIELD_OFFSET(KPCR, Irql), NewIrql); - if (Flags & X86_EFLAGS_IF) + if (Flags & EFLAGS_INTERRUPT_MASK) { Ki386EnableInterrupts(); } @@ -90,7 +90,7 @@ Ki386WriteFsByte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST]), 0); Ki386EnableInterrupts(); KiDispatchInterrupt(); - if (!(Flags & X86_EFLAGS_IF)) + if (!(Flags & EFLAGS_INTERRUPT_MASK)) { Ki386DisableInterrupts(); } @@ -106,7 +106,7 @@ { Ki386EnableInterrupts(); KiDeliverApc(KernelMode, NULL, NULL); - if (!(Flags & X86_EFLAGS_IF)) + if (!(Flags & EFLAGS_INTERRUPT_MASK)) { Ki386DisableInterrupts(); } @@ -207,7 +207,7 @@ APICWrite (APIC_TPR, IRQL2TPR(NewIrql) & APIC_TPR_PRI); } KeSetCurrentIrql (NewIrql); - if (Flags & X86_EFLAGS_IF) + if (Flags & EFLAGS_INTERRUPT_MASK) { Ki386EnableInterrupts(); } @@ -305,7 +305,7 @@ } Ki386SaveFlags(Flags); - if (Flags & X86_EFLAGS_IF) + if (Flags & EFLAGS_INTERRUPT_MASK) { DPRINT1("HalBeginSystemInterrupt was called with interrupt's enabled\n"); KEBUGCHECK(0); @@ -327,7 +327,7 @@ ULONG Flags; Ki386SaveFlags(Flags); - if (Flags & X86_EFLAGS_IF) + if (Flags & EFLAGS_INTERRUPT_MASK) { DPRINT1("HalEndSystemInterrupt was called with interrupt's enabled\n"); KEBUGCHECK(0); Index: hal/halx86/mp/apic.c =================================================================== --- hal/halx86/mp/apic.c (revision 21759) +++ hal/halx86/mp/apic.c (working copy) @@ -28,9 +28,10 @@ /* INCLUDE ***********************************************************************/ #include <hal.h> +#include <halfuncs.h> /* Not in PCH because only used for MP HAL */ +#include <rtlfuncs.h> /* Not in PCH because only used for MP HAL */ #define NDEBUG #include <debug.h> -#include <internal/ntoskrnl.h> /* GLOBALS ***********************************************************************/ @@ -809,7 +810,7 @@ CPU = ThisCPU(); if ((Count[CPU] % 100) == 0) { - DbgPrint("(%s:%d) MpsTimerHandler on CPU%d, irql = %d, epi = %x, KPCR = %x\n", __FILE__, __LINE__, CPU, oldIrql,Trapframe->Eip, KeGetCurrentKPCR()); + DbgPrint("(%s:%d) MpsTimerHandler on CPU%d, irql = %d, epi = %x, KPCR = %x\n", __FILE__, __LINE__, CPU, oldIrql,Trapframe->Eip, KeGetPcr()); } Count[CPU]++; #endif @@ -862,7 +863,7 @@ APICSetupLVTT(1000000000); - TSCPresent = ((PKIPCR)KeGetCurrentKPCR())->PrcbData.FeatureBits & X86_FEATURE_TSC ? TRUE : FALSE; + TSCPresent = ((PKIPCR)KeGetPcr())->PrcbData.FeatureBits & KF_RDTSC ? TRUE : FALSE; /* * The timer chip counts down to zero. Let's wait @@ -891,7 +892,7 @@ DPRINT("CPU clock speed is %ld.%04ld MHz.\n", CPUMap[CPU].CoreSpeed/1000000, CPUMap[CPU].CoreSpeed%1000000); - ((PKIPCR)KeGetCurrentKPCR())->PrcbData.MHz = CPUMap[CPU].CoreSpeed/1000000; + ((PKIPCR)KeGetPcr())->PrcbData.MHz = CPUMap[CPU].CoreSpeed/1000000; } CPUMap[CPU].BusSpeed = (HZ * (long)(tt1 - tt2) * APIC_DIVISOR); @@ -919,7 +920,7 @@ Access.SystemSegmentFlag = 0; Access.SegmentType = I386_INTERRUPT_GATE; - idt = (KIDTENTRY*)((ULONG)KeGetCurrentKPCR()->IDT + index * sizeof(KIDTENTRY)); + idt = (KIDTENTRY*)((ULONG)KeGetPcr()->IDT + index * sizeof(KIDTENTRY)); idt->Offset = address & 0xffff; idt->Selector = KGDT_R0_CODE; idt->Access = Access.Value; @@ -1037,11 +1038,11 @@ /* Write the location of the AP stack */ Common->Stack = (ULONG)Stack; /* Write the page directory page */ - Ke386GetPageTableDirectory(Common->PageDirectory); + Common->PageDirectory = __readcr3(); /* Write the kernel entry point */ Common->NtProcessStartup = (ULONG_PTR)RtlImageNtHeader((PVOID)KernelBase)->OptionalHeader.AddressOfEntryPoint + KernelBase; /* Write the state of the mae mode */ - Common->PaeModeEnabled = Ke386GetCr4() & X86_CR4_PAE ? 1 : 0; + Common->PaeModeEnabled = __readcr4() & CR4_PAE ? 1 : 0; DPRINT1("%x %x %x %x\n", Common->Stack, Common->PageDirectory, Common->NtProcessStartup, Common->PaeModeEnabled); Index: include/reactos/libs/epsapi/epsapi.h =================================================================== --- include/reactos/libs/epsapi/epsapi.h (revision 21759) +++ include/reactos/libs/epsapi/epsapi.h (working copy) @@ -32,7 +32,7 @@ typedef NTSTATUS (NTAPI *PTHREAD_ENUM_ROUTINE)(IN PSYSTEM_THREAD_INFORMATION CurrentThread, IN OUT PVOID CallbackContext); -typedef NTSTATUS (NTAPI *PSYSMOD_ENUM_ROUTINE)(IN PSYSTEM_MODULE_INFORMATION_ENTRY CurrentModule, +typedef NTSTATUS (NTAPI *PSYSMOD_ENUM_ROUTINE)(IN PRTL_PROCESS_MODULE_INFORMATION CurrentModule, IN OUT PVOID CallbackContext); typedef NTSTATUS (NTAPI *PPROCMOD_ENUM_ROUTINE)(IN HANDLE ProcessHandle, @@ -100,18 +100,18 @@ /* capturing & walking */ NTSTATUS NTAPI -PsaCaptureSystemModules(OUT PSYSTEM_MODULE_INFORMATION * SystemModules); +PsaCaptureSystemModules(OUT PRTL_PROCESS_MODULES * SystemModules); NTSTATUS NTAPI -PsaWalkSystemModules(IN PSYSTEM_MODULE_INFORMATION SystemModules, +PsaWalkSystemModules(IN PRTL_PROCESS_MODULES SystemModules, IN PSYSMOD_ENUM_ROUTINE Callback, IN OUT PVOID CallbackContext); -PSYSTEM_MODULE_INFORMATION_ENTRY FASTCALL -PsaWalkFirstSystemModule(IN PSYSTEM_MODULE_INFORMATION SystemModules); +PRTL_PROCESS_MODULE_INFORMATION FASTCALL +PsaWalkFirstSystemModule(IN PRTL_PROCESS_MODULES SystemModules); -PSYSTEM_MODULE_INFORMATION_ENTRY FASTCALL -PsaWalkNextSystemModule(IN PSYSTEM_MODULE_INFORMATION CurrentSystemModule); +PRTL_PROCESS_MODULE_INFORMATION FASTCALL +PsaWalkNextSystemModule(IN PRTL_PROCESS_MODULES CurrentSystemModule); /* Process modules */ NTSTATUS NTAPI Index: include/reactos/arc/arc.h =================================================================== --- include/reactos/arc/arc.h (revision 21759) +++ include/reactos/arc/arc.h (working copy) @@ -1,10 +1,6 @@ -/* ARC LOADER TYPES *********************************************************/ +#ifndef _ARC_ +#define _ARC_ -#ifndef __INCLUDE_ARC_H -#define __INCLUDE_ARC_H - -/* Types */ - typedef enum _IDENTIFIER_FLAG { Failed = 0x01, @@ -28,6 +24,20 @@ MaximumClass } CONFIGURATION_CLASS; +typedef enum +{ + HwFileDriver, + HwFilePort, + HwFileClass, + HwFileInf, + HwFileDll, + HwFileDetect, + HwFileHal, + HwFileCatalog, + HwFileMax, + HwFileDynUpdt = 31, +} HwFileType; + typedef struct _CONFIGURATION_COMPONENT { CONFIGURATION_CLASS Class; @@ -47,7 +57,8 @@ struct _CONFIGURATION_COMPONENT_DATA *Parent; struct _CONFIGURATION_COMPONENT_DATA *Child; struct _CONFIGURATION_COMPONENT_DATA *Sibling; - CONFIGURATION_COMPONENT Component; + CONFIGURATION_COMPONENT ComponentEntry; + PVOID ConfigurationData; } CONFIGURATION_COMPONENT_DATA, *PCONFIGURATION_COMPONENT_DATA; typedef struct _ARC_DISK_INFORMATION @@ -55,4 +66,202 @@ LIST_ENTRY DiskSignatureListHead; } ARC_DISK_INFORMATION, *PARC_DISK_INFORMATION; +typedef struct _MONITOR_CONFIGURATION_DATA +{ + USHORT Version; + USHORT Revision; + USHORT HorizontalResolution; + USHORT HorizontalDisplayTime; + USHORT HorizontalBackPorch; + USHORT HorizontalFrontPorch; + USHORT HorizontalSync; + USHORT VerticalResolution; + USHORT VerticalBackPorch; + USHORT VerticalFrontPorch; + USHORT VerticalSync; + USHORT HorizontalScreenSize; + USHORT VerticalScreenSize; +} MONITOR_CONFIGURATION_DATA, *PMONITOR_CONFIGURATION_DATA; + +typedef struct _FLOPPY_CONFIGURATION_DATA +{ + USHORT Version; + USHORT Revision; + CHAR Size[8]; + ULONG MaxDensity; + ULONG MountDensity; +} FLOPPY_CONFIGURATION_DATA, *PFLOPPY_CONFIGURATION_DATA; + +// +// SMBIOS Table Header (FIXME: maybe move to smbios.h?) +// +typedef struct _SMBIOS_TABLE_HEADER +{ + CHAR Signature[4]; + UCHAR Checksum; + UCHAR Length; + UCHAR MajorVersion; + UCHAR MinorVersion; + USHORT MaximumStructureSize; + UCHAR EntryPointRevision; + UCHAR Reserved[5]; + CHAR Signature2[5]; + UCHAR IntermediateChecksum; + USHORT StructureTableLength; + ULONG StructureTableAddress; + USHORT NumberStructures; + UCHAR Revision; +} SMBIOS_TABLE_HEADER, *PSMBIOS_TABLE_HEADER; + +// +// NLS Data Block +// +typedef struct _NLS_DATA_BLOCK +{ + PVOID AnsiCodePageData; + PVOID OemCodePageData; + PVOID UnicodeCodePageData; +} NLS_DATA_BLOCK, *PNLS_DATA_BLOCK; + +// +// Subsystem Specific Loader Blocks +// +typedef struct _PROFILE_PARAMETER_BLOCK +{ + USHORT Status; + USHORT Reserved; + USHORT DockingState; + USHORT Capabilities; + ULONG DockID; + ULONG SerialNumber; +} PROFILE_PARAMETER_BLOCK, *PPROFILE_PARAMETER_BLOCK; + +typedef struct _HEADLESS_LOADER_BLOCK +{ + UCHAR UsedBiosSettings; + UCHAR DataBits; + UCHAR StopBits; + UCHAR Parity; + ULONG BaudRate; + ULONG PortNumber; + PUCHAR PortAddress; + USHORT PciDeviceId; + USHORT PciVendorId; + UCHAR PciBusNumber; + UCHAR PciSlotNumber; + UCHAR PciFunctionNumber; + ULONG PciFlags; + GUID SystemGUID; + UCHAR IsMMIODevice; + UCHAR TerminalType; +} HEADLESS_LOADER_BLOCK, *PHEADLESS_LOADER_BLOCK; + +typedef struct _NETWORK_LOADER_BLOCK +{ + PCHAR DHCPServerACK; + ULONG DHCPServerACKLength; + PCHAR BootServerReplyPacket; + ULONG BootServerReplyPacketLength; +} NETWORK_LOADER_BLOCK, *PNETWORK_LOADER_BLOCK; + +typedef struct _LOADER_PERFORMANCE_DATA +{ + ULONGLONG StartTime; + ULONGLONG EndTime; +} LOADER_PERFORMANCE_DATA, *PLOADER_PERFORMANCE_DATA; + +// +// Extended Loader Parameter Block +// +typedef struct _LOADER_PARAMETER_EXTENSION +{ + ULONG Size; + PROFILE_PARAMETER_BLOCK Profile; + ULONG MajorVersion; + ULONG MinorVersion; + PVOID EmInfFileImage; + ULONG EmInfFileSize; + PVOID TriageDumpBlock; + // + // NT 5.1 + // + ULONG LoaderPagesSpanned; + PHEADLESS_LOADER_BLOCK HeadlessLoaderBlock; + PSMBIOS_TABLE_HEADER SMBiosEPSHeader; + PVOID DrvDBImage; + ULONG DrvDBSize; + PNETWORK_LOADER_BLOCK NetworkLoaderBlock; + // + // NT 5.2+ + // + PCHAR HalpIRQLToTPR; + PCHAR HalpVectorToIRQL; + LIST_ENTRY FirmwareDescriptorListHead; + PVOID AcpiTable; + ULONG AcpiTableSize; + // + // NT 5.2 SP1+ + // + ULONG BootViaWinload:1; + ULONG BootViaEFI:1; + ULONG Reserved:30; + LOADER_PERFORMANCE_DATA LoaderPerformanceData; + LIST_ENTRY BootApplicationPersistentData; + PVOID WmdTestResult; + GUID BootIdentifier; +} LOADER_PARAMETER_EXTENSION, *PLOADER_PARAMETER_EXTENSION; + +// +// Architecture specific Loader Parameter Blocks +// +typedef struct _IA64_LOADER_BLOCK +{ + ULONG PlaceHolder; +} IA64_LOADER_BLOCK, *PIA64_LOADER_BLOCK; + +typedef struct _ALPHA_LOADER_BLOCK +{ + ULONG PlaceHolder; +} ALPHA_LOADER_BLOCK, *PALPHA_LOADER_BLOCK; + +typedef struct _I386_LOADER_BLOCK +{ + PVOID CommonDataArea; + ULONG MachineType; + ULONG Reserved; +} I386_LOADER_BLOCK, *PI386_LOADER_BLOCK; + +// +// Loader Parameter Block +// +typedef struct _LOADER_PARAMETER_BLOCK +{ + LIST_ENTRY LoadOrderListHead; + LIST_ENTRY MemoryDescriptorListHead; + LIST_ENTRY BootDriverListHead; + ULONG_PTR KernelStack; + ULONG_PTR Prcb; + ULONG_PTR Process; + ULONG_PTR Thread; + ULONG RegistryLength; + PVOID RegistryBase; + PCONFIGURATION_COMPONENT_DATA ConfigurationRoot; + LPSTR ArcBootDeviceName; + LPSTR ArcHalDeviceName; + LPSTR NtBootPathName; + LPSTR NtHalPathName; + LPSTR LoadOptions; + PNLS_DATA_BLOCK NlsData; + PARC_DISK_INFORMATION ArcDiskInformation; + PVOID OemFontFile; + struct _SETUP_LOADER_BLOCK *SetupLdrBlock; + PLOADER_PARAMETER_EXTENSION Extension; + union + { + I386_LOADER_BLOCK I386; + ALPHA_LOADER_BLOCK Alpha; + IA64_LOADER_BLOCK Ia64; + } u; +} LOADER_PARAMETER_BLOCK, *PLOADER_PARAMETER_BLOCK; + #endif Index: include/reactos/win32k/callout.h =================================================================== --- include/reactos/win32k/callout.h (revision 0) +++ include/reactos/win32k/callout.h (revision 0) @@ -0,0 +1,19 @@ +#ifndef _CALLOUT_ +#define _CALLOUT_ + +#include <internal/ob.h> + +typedef struct _W32_CALLOUT_DATA +{ + PKWIN32_PROCESS_CALLOUT W32ProcessCallout; + PKWIN32_THREAD_CALLOUT W32ThreadCallout; + OB_OPEN_METHOD DesktopOpen; + OB_DELETE_METHOD DesktopDelete; + OB_DELETE_METHOD WinStaDelete; + OB_ROS_PARSE_METHOD WinStaParse; + OB_OPEN_METHOD WinStaOpen; + OB_ROS_FIND_METHOD WinStaFind; + OB_ROS_CREATE_METHOD DesktopCreate; +} W32_CALLOUT_DATA, *PW32_CALLOUT_DATA; + +#endif Index: include/reactos/drivers/diskdump/diskdump.h =================================================================== --- include/reactos/drivers/diskdump/diskdump.h (revision 21759) +++ include/reactos/drivers/diskdump/diskdump.h (working copy) @@ -2,7 +2,7 @@ #define __DISKDUMP_H #include <ntddscsi.h> -#include <ndk/ntndk.h> +#include <ketypes.h> #define MM_CORE_DUMP_HEADER_MAGIC (0xdeafbead) #define MM_CORE_DUMP_HEADER_VERSION (0x1) Index: include/winsock2.h =================================================================== --- include/winsock2.h (revision 21759) +++ include/winsock2.h (working copy) @@ -214,7 +214,8 @@ #define IMPLINK_IP 155 #define IMPLINK_LOWEXPER 156 #define IMPLINK_HIGHEXPER 158 -struct in_addr { +#ifndef s_addr +typedef struct in_addr { union { struct { u_char s_b1,s_b2,s_b3,s_b4; } S_un_b; struct { u_short s_w1,s_w2; } S_un_w; @@ -226,7 +227,8 @@ #define s_imp S_un.S_un_w.s_w2 #define s_impno S_un.S_un_b.s_b4 #define s_lh S_un.S_un_b.s_b3 -}; +} IN_ADDR, *PIN_ADDR; +#endif #define IN_CLASSA(i) ((long)(i)&0x80000000) #define IN_CLASSA_NET 0xff000000 #define IN_CLASSA_NSHIFT 24 @@ -589,8 +591,6 @@ typedef struct linger LINGER; typedef struct linger *PLINGER; typedef struct linger *LPLINGER; -typedef struct in_addr IN_ADDR; -typedef struct in_addr *PIN_ADDR; typedef struct in_addr *LPIN_ADDR; typedef struct fd_set FD_SET; typedef struct fd_set *PFD_SET; Index: include/ws2tcpip.h =================================================================== --- include/ws2tcpip.h (revision 21759) +++ include/ws2tcpip.h (working copy) @@ -144,13 +144,7 @@ (sizeof(struct ip_msfilter) - sizeof(struct in_addr) \ + (numsrc) * sizeof(struct in_addr)) -struct in_pktinfo { - IN_ADDR ipi_addr; - UINT ipi_ifindex; -}; -typedef struct in_pktinfo IN_PKTINFO; - /* ipv6 */ /* These require XP or .NET Server or use of add-on IPv6 stacks on NT 4 or higher */ Index: include/winnt.h =================================================================== --- include/winnt.h (revision 21759) +++ include/winnt.h (working copy) @@ -968,7 +968,9 @@ #define SECTION_QUERY 1 #define SECTION_MAP_EXECUTE 8 #define SECTION_ALL_ACCESS 0xf001f +#ifndef __NTDDK_H #define MESSAGE_RESOURCE_UNICODE 1 +#endif #define RTL_CRITSECT_TYPE 0 #define RTL_RESOURCE_TYPE 1 /* Also in winddk.h */ @@ -2500,7 +2502,6 @@ DWORD Protect; DWORD Type; } MEMORY_BASIC_INFORMATION,*PMEMORY_BASIC_INFORMATION; -#endif typedef struct _MESSAGE_RESOURCE_ENTRY { WORD Length; WORD Flags; @@ -2515,6 +2516,7 @@ DWORD NumberOfBlocks; MESSAGE_RESOURCE_BLOCK Blocks[1]; } MESSAGE_RESOURCE_DATA,*PMESSAGE_RESOURCE_DATA; +#endif typedef struct _LIST_ENTRY { struct _LIST_ENTRY *Flink; struct _LIST_ENTRY *Blink; Index: include/ddk/winddk.h =================================================================== --- include/ddk/winddk.h (revision 21759) +++ include/ddk/winddk.h (working copy) @@ -231,6 +231,8 @@ #define HIGH_PRIORITY 31 #define MAXIMUM_PRIORITY 32 +#define MAXIMUM_SUSPEND_COUNT MAXCHAR + #define FILE_SUPERSEDED 0x00000000 #define FILE_OPENED 0x00000001 #define FILE_CREATED 0x00000002 @@ -407,6 +409,8 @@ LONG High2Time; } KSYSTEM_TIME, *PKSYSTEM_TIME; +extern volatile KSYSTEM_TIME KeTickCount; + typedef struct _KUSER_SHARED_DATA { ULONG TickCountLowDeprecated; Index: include/ndk/haltypes.h =================================================================== --- include/ndk/haltypes.h (revision 21759) +++ include/ndk/haltypes.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -27,28 +27,9 @@ #ifndef NTOS_MODE_USER // -// Multi-Boot Flags (REMOVE ME) -// -#ifdef _REACTOS_ -#define MB_FLAGS_MEM_INFO (0x1) -#define MB_FLAGS_BOOT_DEVICE (0x2) -#define MB_FLAGS_COMMAND_LINE (0x4) -#define MB_FLAGS_MODULE_INFO (0x8) -#define MB_FLAGS_AOUT_SYMS (0x10) -#define MB_FLAGS_ELF_SYMS (0x20) -#define MB_FLAGS_MMAP_INFO (0x40) -#define MB_FLAGS_DRIVES_INFO (0x80) -#define MB_FLAGS_CONFIG_TABLE (0x100) -#define MB_FLAGS_BOOT_LOADER_NAME (0x200) -#define MB_FLAGS_APM_TABLE (0x400) -#define MB_FLAGS_GRAPHICS_TABLE (0x800) -#define MB_FLAGS_ACPI_TABLE (0x1000) -#endif - -// // HalShutdownSystem Types // -typedef enum _FIRMWARE_ENTRY +typedef enum _FIRMWARE_REENTRY { HalHaltRoutine, HalPowerDownRoutine, @@ -59,190 +40,112 @@ } FIRMWARE_REENTRY, *PFIRMWARE_REENTRY; // -// Hal Private dispatch Table +// HAL Private function Types // -#define HAL_PRIVATE_DISPATCH_VERSION 2 -typedef struct _HAL_PRIVATE_DISPATCH -{ - ULONG Version; - PVOID HalHandlerForBus; - PVOID HalHandlerForBus2; - PVOID HalLocateHiberRanges; - PVOID HalRegisterBusHandler; - PVOID HalSetWakeEnable; - PVOID HalSetWakeAlarm; - PVOID HalTranslateBusAddress; - PVOID HalTranslateBusAddress2; - PVOID HalHaltSystem; - PVOID Null; - PVOID Null2; - PVOID HalAllocateMapRegisters; - PVOID KdSetupPciDeviceForDebugging; - PVOID KdReleasePciDeviceforDebugging; - PVOID KdGetAcpiTablePhase0; - PVOID HalReferenceHandler; - PVOID HalVectorToIDTEntry; - PVOID MatchAll; - PVOID KdUnmapVirtualAddress; -} HAL_PRIVATE_DISPATCH, *PHAL_PRIVATE_DISPATCH; +typedef +PBUS_HANDLER +(*pHalHandlerForConfigSpace)( + IN BUS_DATA_TYPE ConfigSpace, + IN ULONG BusNumber +); -#ifndef _REACTOS_ -// -// NLS Data Block -// -typedef struct _NLS_TABLE_DATA -{ - PVOID AnsiCodePageData; - PVOID OemCodePageData; - PVOID UnicodeCodePageData; -} NLS_TABLE_DATA, *PNLS_TABLE_DATA; +typedef +NTSTATUS +(*PINSTALL_BUS_HANDLER)( + IN PBUS_HANDLER Bus +); -// -// Subsystem Specific Loader Blocks -// -typedef struct _PROFILE_PARAMETER_BLOCK -{ - USHORT DockData0; - USHORT DockData1; - USHORT DockData2; - USHORT DockData3; - ULONG DockData4; - ULONG DockData5; -} PROFILE_PARAMETER_BLOCK, *PPROFILE_PARAMETER_BLOCK; +typedef +NTSTATUS +(*pHalRegisterBusHandler)( + IN INTERFACE_TYPE InterfaceType, + IN BUS_DATA_TYPE ConfigSpace, + IN ULONG BusNumber, + IN INTERFACE_TYPE ParentInterfaceType, + IN ULONG ParentBusNumber, + IN ULONG ContextSize, + IN PINSTALL_BUS_HANDLER InstallCallback, + OUT PBUS_HANDLER *BusHandler +); -typedef struct _HEADLESS_LOADER_BLOCK -{ - UCHAR Unknown[0xC]; -} HEADLESS_LOADER_BLOCK, *PHEADLESS_LOADER_BLOCK; +typedef +VOID +(*pHalSetWakeEnable)( + IN BOOLEAN Enable +); -typedef struct _NETWORK_LOADER_BLOCK -{ - UCHAR Unknown[0xC]; -} NETWORK_LOADER_BLOCK, *PNETWORK_LOADER_BLOCK; -// -// Extended Loader Parameter Block -// -typedef struct _LOADER_PARAMETER_EXTENSION -{ - ULONG Size; - PROFILE_PARAMETER_BLOCK ProfileParameterBlock; - ULONG MajorVersion; - ULONG MinorVersion; - PVOID SpecialConfigInfFile; - ULONG SpecialConfigInfSize; - PVOID TriageDumpData; - // - // NT 5.1 - // - ULONG NumberOfPages; - PHEADLESS_LOADER_BLOCK HeadlessLoaderBlock; - PVOID Unknown1; - PVOID PrefetchDatabaseBase; - ULONG PrefetchDatabaseSize; - PNETWORK_LOADER_BLOCK NetworkLoaderBlock; - // - // NT 5.2+ - // - PVOID Reserved[2]; - LIST_ENTRY FirmwareListEntry; - PVOID AcpiTableBase; - ULONG AcpiTableSize; -} LOADER_PARAMETER_EXTENSION, *PLOADER_PARAMETER_EXTENSION; +typedef +VOID +(*pHalSetWakeAlarm)( + IN ULONGLONG AlartTime, + IN PTIME_FIELDS TimeFields +); -// -// Architecture specific Loader Parameter Blocks -// -typedef struct _I386_LOADER_BLOCK -{ - PVOID CommonDataArea; - ULONG MachineType; - ULONG Reserved; -} I386_LOADER_BLOCK, *PI386_LOADER_BLOCK; +typedef +VOID +(*pHalLocateHiberRanges)( + IN PVOID MemoryMap +); -// -// Setup Loader Parameter Block -// -typedef struct _SETUP_LOADER_BLOCK -{ - ULONG Unknown[139]; - ULONG Flags; -} SETUP_LOADER_BLOCK, *PSETUP_LOADER_BLOCK; +typedef +BOOLEAN +(*pHalAllocateMapRegisters)( + IN PADAPTER_OBJECT AdapterObject, + IN ULONG Unknown, + IN ULONG Unknown2, + PMAP_REGISTER_ENTRY Registers +); // -// Loader Parameter Block +// Hal Private dispatch Table // -typedef struct _LOADER_PARAMETER_BLOCK +#define HAL_PRIVATE_DISPATCH_VERSION 2 +typedef struct _HAL_PRIVATE_DISPATCH { - LIST_ENTRY LoadOrderListHead; - LIST_ENTRY MemoryDescriptorListHead; - LIST_ENTRY DriverList; - PVOID KernelStack; - PVOID Prcb; - PVOID Process; - PVOID Thread; - ULONG RegistryLength; - PVOID RegistryBase; - PCONFIGURATION_COMPONENT_DATA ConfigurationRoot; - LPSTR ArcBootDeviceName; - LPSTR ArcHalDeviceName; - LPSTR SystemRoot; - LPSTR BootRoot; - LPSTR CommandLine; - PNLS_TABLE_DATA NlsTables; - PARC_DISK_INFORMATION ArcDevices; - PVOID OEMFont; - PSETUP_LOADER_BLOCK SetupLdrBlock; - PLOADER_PARAMETER_EXTENSION LpbExtension; - union - { - I386_LOADER_BLOCK I386; - } u; -} LOADER_PARAMETER_BLOCK, *PLOADER_PARAMETER_BLOCK; + ULONG Version; + pHalHandlerForBus HalHandlerForBus; + pHalHandlerForConfigSpace HalHandlerForConfigSpace; + pHalLocateHiberRanges HalLocateHiberRanges; + pHalRegisterBusHandler HalRegisterBusHandler; + pHalSetWakeEnable HalSetWakeEnable; + pHalSetWakeAlarm HalSetWakeAlarm; + pHalTranslateBusAddress HalPciTranslateBusAddress; + pHalAssignSlotResources HalPciAssignSlotResources; + pHalHaltSystem HalHaltSystem; + pHalFindBusAddressTranslation HalFindBusAddressTranslation; + pHalResetDisplay HalResetDisplay; + pHalAllocateMapRegisters HalAllocateMapRegisters; + pKdSetupPciDeviceForDebugging KdSetupPciDeviceForDebugging; + pKdReleasePciDeviceForDebugging KdReleasePciDeviceforDebugging; + pKdGetAcpiTablePhase0 KdGetAcpiTablePhase0; + pKdCheckPowerButton KdCheckPowerButton; + pHalVectorToIDTEntry HalVectorToIDTEntry; + pKdMapPhysicalMemory64 KdMapPhysicalMemory64; + pKdUnmapVirtualAddress KdUnmapVirtualAddress; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + pKdGetPciDataByOffset KdGetPciDataByOffset; + pKdSetPciDataByOffset KdSetPciDataByOffset; + PVOID HalGetInterruptVectorOverride; + PVOID HalGetVectorInputOverride; +#endif +} HAL_PRIVATE_DISPATCH, *PHAL_PRIVATE_DISPATCH; -#else - // -// FIXME: ReactOS ONLY +// Kernel Exports // -typedef struct _LOADER_MODULE -{ - ULONG ModStart; - ULONG ModEnd; - ULONG String; - ULONG Reserved; -} LOADER_MODULE, *PLOADER_MODULE; -typedef struct _LOADER_PARAMETER_BLOCK -{ - ULONG Flags; - ULONG MemLower; - ULONG MemHigher; - ULONG BootDevice; - ULONG CommandLine; - ULONG ModsCount; - ULONG ModsAddr; - UCHAR Syms[12]; - ULONG MmapLength; - ULONG MmapAddr; - ULONG DrivesCount; - ULONG DrivesAddr; - ULONG ConfigTable; - ULONG BootLoaderName; - ULONG PageDirectoryStart; - ULONG PageDirectoryEnd; - ULONG KernelBase; -} LOADER_PARAMETER_BLOCK, *PLOADER_PARAMETER_BLOCK; +#ifndef _NTOSKRNL_ +extern PHAL_PRIVATE_DISPATCH HalPrivateDispatchTable; +#else +extern HAL_PRIVATE_DISPATCH HalPrivateDispatchTable; #endif // -// Kernel Exports +// HAL Exports // -#ifdef __NTOSKRNL__ -extern HAL_PRIVATE_DISPATCH HalPrivateDispatchTable; -#else -extern PHAL_PRIVATE_DISPATCH HalPrivateDispatchTable; +#ifndef _NTHAL_ +extern PUCHAR *KdComPortInUse; #endif -extern ULONG KdComPortInUse; #endif #endif Index: include/ndk/ifssupp.h =================================================================== --- include/ndk/ifssupp.h (revision 21759) +++ include/ndk/ifssupp.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ #ifndef _NTIFS_ Index: include/ndk/iotypes.h =================================================================== --- include/ndk/iotypes.h (revision 21759) +++ include/ndk/iotypes.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -167,6 +167,14 @@ #define DNUF_NOT_DISABLEABLE 0x0008 // +// Undocumented WMI Registration Flags +// +#define WMIREG_FLAG_TRACE_PROVIDER 0x00010000 +#define WMIREG_FLAG_TRACE_NOTIFY_MASK 0x00F00000 +#define WMIREG_NOTIFY_DISK_IO 0x00100000 +#define WMIREG_NOTIFY_TDI_IO 0x00200000 + +// // I/O Completion Information Class for NtQueryIoCompletionInformation // typedef enum _IO_COMPLETION_INFORMATION_CLASS @@ -201,6 +209,24 @@ MaximumInterfaceType }INTERFACE_TYPE, *PINTERFACE_TYPE; +typedef enum _BUS_DATA_TYPE +{ + ConfigurationSpaceUndefined = -1, + Cmos, + EisaConfiguration, + Pos, + CbusConfiguration, + PCIConfiguration, + VMEConfiguration, + NuBusConfiguration, + PCMCIAConfiguration, + MPIConfiguration, + MPSAConfiguration, + PNPISAConfiguration, + SgiInternalConfiguration, + MaximumBusDataType +} BUS_DATA_TYPE, *PBUS_DATA_TYPE; + // // File Information Classes for NtQueryInformationFile // @@ -491,6 +517,21 @@ LARGE_INTEGER ValidDataLength; } FILE_VALID_DATA_LENGTH_INFORMATION, *PFILE_VALID_DATA_LENGTH_INFORMATION; +typedef struct _FILE_DIRECTORY_INFORMATION +{ + ULONG NextEntryOffset; + ULONG FileIndex; + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER EndOfFile; + LARGE_INTEGER AllocationSize; + ULONG FileAttributes; + ULONG FileNameLength; + WCHAR FileName[1]; +} FILE_DIRECTORY_INFORMATION, *PFILE_DIRECTORY_INFORMATION; + // // File System Information structures for NtQueryInformationFile // @@ -997,6 +1038,30 @@ #endif // +// Firmware Boot File Path +// +typedef struct _FILE_PATH +{ + ULONG Version; + ULONG Length; + ULONG Type; + CHAR FilePath[1]; +} FILE_PATH, *PFILE_PATH; + +// +// Firmware Boot Options +// +typedef struct _BOOT_OPTIONS +{ + ULONG Version; + ULONG Length; + ULONG Timeout; + ULONG CurrentBootEntryId; + ULONG NextBootEntryId; + WCHAR HeadlessRedirection[1]; +} BOOT_OPTIONS, *PBOOT_OPTIONS; + +// // APC Callback for NtCreateFile // typedef VOID Index: include/ndk/dbgktypes.h =================================================================== --- include/ndk/dbgktypes.h (revision 21759) +++ include/ndk/dbgktypes.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ Index: include/ndk/setypes.h =================================================================== --- include/ndk/setypes.h (revision 21759) +++ include/ndk/setypes.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ Index: include/ndk/kdfuncs.h =================================================================== --- include/ndk/kdfuncs.h (revision 21759) +++ include/ndk/kdfuncs.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -34,91 +34,37 @@ NTAPI KdPollBreakIn(VOID); -BOOLEAN +NTSTATUS NTAPI -KdPortInitialize( - PKD_PORT_INFORMATION PortInformation, - ULONG Unknown1, - ULONG Unknown2 -); +KdRestore(IN BOOLEAN DisableDbgPorts); -BOOLEAN +NTSTATUS NTAPI -KdPortInitializeEx( - PKD_PORT_INFORMATION PortInformation, - ULONG Unknown1, - ULONG Unknown2 -); +KdSave(IN ULONG Unknown); -BOOLEAN +#ifdef _ARC_ +NTSTATUS NTAPI -KdPortGetByte( - PUCHAR ByteRecieved +KdDebuggerInitialize0( + IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock ); +#endif -BOOLEAN +// +// Debugger API +// +NTSTATUS NTAPI -KdPortGetByteEx( - PKD_PORT_INFORMATION PortInformation, - PUCHAR ByteRecieved +KdSystemDebugControl( + SYSDBG_COMMAND Command, + PVOID InputBuffer, + ULONG InputBufferLength, + PVOID OutputBuffer, + ULONG OutputBufferLength, + PULONG ReturnLength, + KPROCESSOR_MODE PreviousMode ); -BOOLEAN -NTAPI -KdPortPollByte( - PUCHAR ByteRecieved -); - -BOOLEAN -NTAPI -KdPortPollByteEx( - PKD_PORT_INFORMATION PortInformation, - PUCHAR ByteRecieved -); - -VOID -NTAPI -KdPortPutByte( - UCHAR ByteToSend -); - -VOID -NTAPI -KdPortPutByteEx( - PKD_PORT_INFORMATION PortInformation, - UCHAR ByteToSend -); - -VOID -NTAPI -KdPortRestore(VOID); - -VOID -NTAPI -KdPortSave (VOID); - -VOID -NTAPI -KdRestore(VOID); - -VOID -NTAPI -KdSave (VOID); - -BOOLEAN -NTAPI -KdPortDisableInterrupts(VOID); - -BOOLEAN -NTAPI -KdPortEnableInterrupts(VOID); - -BOOLEAN -NTAPI -KdDebuggerInitialize0( - IN PLOADER_PARAMETER_BLOCK LoaderBlock -); - #endif // @@ -132,7 +78,7 @@ ULONG Level ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI NtSetDebugFilterState( @@ -141,11 +87,10 @@ BOOLEAN State ); -NTSYSCALLAPI NTSTATUS NTAPI NtSystemDebugControl( - DEBUG_CONTROL_CODE ControlCode, + SYSDBG_COMMAND ControlCode, PVOID InputBuffer, ULONG InputBufferLength, PVOID OutputBuffer, @@ -153,7 +98,7 @@ PULONG ReturnLength ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwQueryDebugFilterState( @@ -170,11 +115,10 @@ BOOLEAN State ); -NTSYSAPI NTSTATUS NTAPI ZwSystemDebugControl( - DEBUG_CONTROL_CODE ControlCode, + SYSDBG_COMMAND ControlCode, PVOID InputBuffer, ULONG InputBufferLength, PVOID OutputBuffer, Index: include/ndk/mmtypes.h =================================================================== --- include/ndk/mmtypes.h (revision 21759) +++ include/ndk/mmtypes.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -200,21 +200,242 @@ #ifndef NTOS_MODE_USER // -// FIXME: REACTOS SPECIFIC HACK IN EPROCESS +// PTE Structures // -#ifdef _REACTOS_ -typedef struct _MADDRESS_SPACE +typedef struct _MMPTE { - struct _MEMORY_AREA *MemoryAreaRoot; - FAST_MUTEX Lock; - PVOID LowestAddress; - struct _EPROCESS* Process; - PUSHORT PageTableRefCountTable; - ULONG PageTableRefCountTableSize; -} MADDRESS_SPACE, *PMADDRESS_SPACE; -#endif + union + { + ULONG Long; + HARDWARE_PTE Flush; + MMPTE_HARDWARE Hard; + MMPTE_PROTOTYPE Proto; + MMPTE_SOFTWARE Soft; + MMPTE_TRANSITION Trans; + MMPTE_SUBSECTION Subsect; + MMPTE_LIST List; + }; +} MMPTE, *PMMPTE; // +// Section Information structure +// +typedef struct _MI_EXTRA_IMAGE_INFORMATION +{ + ULONG SizeOfHeaders; +} MI_EXTRA_IMAGE_INFORMATION, *PMI_EXTRA_IMAGE_INFORMATION; + +typedef struct _MI_SECTION_IMAGE_INFORMATION +{ + SECTION_IMAGE_INFORMATION ExportedImageInformation; + MI_EXTRA_IMAGE_INFORMATION InternalImageInformation; +} MI_SECTION_IMAGE_INFORMATION, *PMI_SECTION_IMAGE_INFORMATION; + +// +// Section Extension Information +// +typedef struct _MMEXTEND_INFO +{ + ULONGLONG CommittedSize; + ULONG ReferenceCount; +} MMEXTEND_INFO, *PMMEXTEND_INFO; + +// +// Segment and Segment Flags +// +typedef struct _SEGMENT_FLAGS +{ + ULONG TotalNumberOfPtes4132:10; + ULONG ExtraSharedWowSubsections:1; + ULONG LargePages:1; + ULONG Spare:20; +} SEGMENT_FLAGS, *PSEGMENT_FLAGS; + +typedef struct _SEGMENT +{ + struct _CONTROL_AREA *ControlArea; + ULONG TotalNumberOfPtes; + ULONG NonExtendedPtes; + ULONG Spare0; + ULONGLONG SizeOfSegment; + MMPTE SegmentPteTemplate; + ULONG NumberOfCommittedPages; + PMMEXTEND_INFO ExtendInfo; + SEGMENT_FLAGS SegmentFlags; + PVOID BaseAddress; + union + { + ULONG ImageCommitment; + PEPROCESS CreatingProcess; + } u1; + union + { + PMI_SECTION_IMAGE_INFORMATION ImageInformation; + PVOID FirstMappedVa; + } u2; + PMMPTE PrototypePte; + MMPTE ThePtes[1]; +} SEGMENT, *PSEGMENT; + +// +// Event Counter Structure +// +typedef struct _EVENT_COUNTER +{ + ULONG RefCount; + KEVENT Event; + LIST_ENTRY ListEntry; +} EVENT_COUNTER, *PEVENT_COUNTER; + +// +// Flags +// +typedef struct _MMSECTION_FLAGS +{ + ULONG BeingDeleted:1; + ULONG BeingCreated:1; + ULONG BeingPurged:1; + ULONG NoModifiedWriting:1; + ULONG FailAllIo:1; + ULONG Image:1; + ULONG Based:1; + ULONG File:1; + ULONG Networked:1; + ULONG NoCache:1; + ULONG PhysicalMemory:1; + ULONG CopyOnWrite:1; + ULONG Reserve:1; + ULONG Commit:1; + ULONG FloppyMedia:1; + ULONG WasPurged:1; + ULONG UserReference:1; + ULONG GlobalMemory:1; + ULONG DeleteOnClose:1; + ULONG FilePointerNull:1; + ULONG DebugSymbolsLoaded:1; + ULONG SetMappedFileIoComplete:1; + ULONG CollidedFlush:1; + ULONG NoChange:1; + ULONG filler0:1; + ULONG ImageMappedInSystemSpace:1; + ULONG UserWritable:1; + ULONG Accessed:1; + ULONG GlobalOnlyPerSession:1; + ULONG Rom:1; + ULONG WriteCombined:1; + ULONG filler:1; +} MMSECTION_FLAGS, *PMMSECTION_FLAGS; + +typedef struct _MMSUBSECTION_FLAGS +{ + ULONG ReadOnly:1; + ULONG ReadWrite:1; + ULONG SubsectionStatic:1; + ULONG GlobalMemory:1; + ULONG Protection:5; + ULONG Spare:1; + ULONG StartingSector4132:10; + ULONG SectorEndOffset:12; +} MMSUBSECTION_FLAGS, *PMMSUBSECTION_FLAGS; + +// +// Control Area Structures +// +typedef struct _CONTROL_AREA +{ + PSEGMENT Segment; + LIST_ENTRY DereferenceList; + ULONG NumberOfSectionReferences; + ULONG NumberOfPfnReferences; + ULONG NumberOfMappedViews; + ULONG NumberOfSystemCacheViews; + ULONG NumberOfUserReferences; + union + { + ULONG LongFlags; + MMSECTION_FLAGS Flags; + } u; + PFILE_OBJECT FilePointer; + PEVENT_COUNTER WaitingForDeletion; + USHORT ModifiedWriteCount; + USHORT FlushInProgressCount; + ULONG WritableUserReferences; + ULONG QuadwordPad; +} CONTROL_AREA, *PCONTROL_AREA; + +typedef struct _LARGE_CONTROL_AREA +{ + PSEGMENT Segment; + LIST_ENTRY DereferenceList; + ULONG NumberOfSectionReferences; + ULONG NumberOfPfnReferences; + ULONG NumberOfMappedViews; + ULONG NumberOfSystemCacheViews; + ULONG NumberOfUserReferences; + union + { + ULONG LongFlags; + MMSECTION_FLAGS Flags; + } u; + PFILE_OBJECT FilePointer; + PEVENT_COUNTER WaitingForDeletion; + USHORT ModifiedWriteCount; + USHORT FlushInProgressCount; + ULONG WritableUserReferences; + ULONG QuadwordPad; + ULONG StartingFrame; + LIST_ENTRY UserGlobalList; + ULONG SessionId; +} LARGE_CONTROL_AREA, *PLARGE_CONTROL_AREA; + +// +// Subsection +// +typedef struct _SUBSECTION +{ + PCONTROL_AREA ControlArea; + union + { + ULONG LongFlags; + MMSUBSECTION_FLAGS SubsectionFlags; + } u; + ULONG StartingSector; + PMMPTE SubsectionBase; + ULONG UnusedPtes; + ULONG PtesInSubsection; + struct _SUBSECTION *NextSubSection; +} SUBSECTION, *PSUBSECTION; + +// +// Segment Object +// +typedef struct _SEGMENT_OBJECT +{ + PVOID BaseAddress; + ULONG TotalNumberOfPtes; + LARGE_INTEGER SizeOfSegment; + ULONG NonExtendedPtes; + ULONG ImageCommitment; + PCONTROL_AREA ControlArea; + PSUBSECTION Subsection; + PLARGE_CONTROL_AREA LargeControlArea; + PMMSECTION_FLAGS MmSectionFlags; + PMMSUBSECTION_FLAGS MmSubSectionFlags; +} SEGMENT_OBJECT, *PSEGMENT_OBJECT; + +// +// Section Object +// +typedef struct _SECTION_OBJECT +{ + PVOID StartingVa; + PVOID EndingVa; + PVOID LeftChild; + PVOID RightChild; + PSEGMENT_OBJECT Segment; +} SECTION_OBJECT, *PSECTION_OBJECT; + +// // Generic Address Range Structure // typedef struct _ADDRESS_RANGE Index: include/ndk/obfuncs.h =================================================================== --- include/ndk/obfuncs.h (revision 21759) +++ include/ndk/obfuncs.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -29,7 +29,6 @@ // // Object Functions // -NTKERNELAPI NTSTATUS NTAPI ObCreateObject( @@ -44,14 +43,12 @@ OUT PVOID *Object ); -NTKERNELAPI ULONG NTAPI ObGetObjectPointerCount( IN PVOID Object ); -NTKERNELAPI NTSTATUS NTAPI ObReferenceObjectByName( @@ -65,7 +62,6 @@ OUT PVOID *Object ); -NTKERNELAPI NTSTATUS NTAPI ObFindHandleForObject( @@ -97,7 +93,6 @@ IN BOOLEAN GenerateOnClose ); -NTSYSCALLAPI NTSTATUS NTAPI NtCreateDirectoryObject( @@ -106,7 +101,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSCALLAPI NTSTATUS NTAPI NtCreateSymbolicLinkObject( @@ -116,7 +110,7 @@ IN PUNICODE_STRING Name ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI NtDeleteObjectAuditAlarm( @@ -125,7 +119,6 @@ IN BOOLEAN GenerateOnClose ); -NTSYSCALLAPI NTSTATUS NTAPI NtDuplicateObject( @@ -138,21 +131,18 @@ IN ULONG Options ); -NTSYSCALLAPI NTSTATUS NTAPI NtMakePermanentObject( IN HANDLE Object ); -NTSYSCALLAPI NTSTATUS NTAPI NtMakeTemporaryObject( IN HANDLE Handle ); -NTSYSCALLAPI NTSTATUS NTAPI NtOpenDirectoryObject( @@ -161,7 +151,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSCALLAPI NTSTATUS NTAPI NtOpenJobObject( @@ -170,7 +159,6 @@ POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSCALLAPI NTSTATUS NTAPI NtOpenSymbolicLinkObject( @@ -179,7 +167,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryDirectoryObject( @@ -192,7 +179,6 @@ OUT PULONG ReturnLength OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryObject( @@ -214,7 +200,6 @@ OUT PULONG ResultLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtQuerySymbolicLinkObject( @@ -223,7 +208,6 @@ OUT PULONG DataWritten OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetInformationObject( @@ -242,7 +226,6 @@ IN PSECURITY_DESCRIPTOR SecurityDescriptor ); -NTSYSCALLAPI NTSTATUS NTAPI NtSignalAndWaitForSingleObject( @@ -252,7 +235,6 @@ IN PLARGE_INTEGER Time ); -NTSYSCALLAPI NTSTATUS NTAPI NtWaitForMultipleObjects( @@ -263,7 +245,6 @@ IN PLARGE_INTEGER Time ); -NTSYSCALLAPI NTSTATUS NTAPI NtWaitForSingleObject( @@ -272,14 +253,14 @@ IN PLARGE_INTEGER Time ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwClose( IN HANDLE Handle ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwCloseObjectAuditAlarm( @@ -297,7 +278,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSAPI NTSTATUS NTAPI ZwCreateSymbolicLinkObject( @@ -329,7 +309,6 @@ IN ULONG Options ); -NTSYSAPI NTSTATUS NTAPI ZwMakePermanentObject( @@ -352,7 +331,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSAPI NTSTATUS NTAPI ZwOpenJobObject( @@ -370,7 +348,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSAPI NTSTATUS NTAPI ZwQueryDirectoryObject( @@ -383,7 +360,6 @@ OUT PULONG ReturnLength OPTIONAL ); -NTSYSAPI NTSTATUS NTAPI ZwQueryObject( @@ -394,7 +370,7 @@ OUT PULONG ResultLength OPTIONAL ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwQuerySecurityObject( @@ -414,7 +390,6 @@ OUT PULONG DataWritten OPTIONAL ); -NTSYSAPI NTSTATUS NTAPI ZwSetInformationObject( @@ -424,7 +399,7 @@ IN ULONG Length ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwSetSecurityObject( @@ -433,7 +408,6 @@ IN PSECURITY_DESCRIPTOR SecurityDescriptor ); -NTSYSAPI NTSTATUS NTAPI ZwSignalAndWaitForSingleObject( @@ -443,7 +417,6 @@ IN PLARGE_INTEGER Time ); -NTSYSAPI NTSTATUS NTAPI ZwWaitForMultipleObjects( Index: include/ndk/rtlfuncs.h =================================================================== --- include/ndk/rtlfuncs.h (revision 21759) +++ include/ndk/rtlfuncs.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -24,9 +24,15 @@ // #include <umtypes.h> #include <ntnls.h> +#include <rtltypes.h> #include <extypes.h> -#include <rtltypes.h> +#include "in6addr.h" +#include "inaddr.h" +#ifdef __cplusplus +extern "C" { +#endif + #ifdef NTOS_MODE_USER // @@ -109,7 +115,7 @@ FORCEINLINE BOOLEAN RemoveEntryList( - IN PLIST_ENTRY Entry) + IN PLIST_ENTRY Entry) { PLIST_ENTRY OldFlink; PLIST_ENTRY OldBlink; @@ -124,7 +130,7 @@ FORCEINLINE PLIST_ENTRY RemoveHeadList( - IN PLIST_ENTRY ListHead) + IN PLIST_ENTRY ListHead) { PLIST_ENTRY Flink; PLIST_ENTRY Entry; @@ -139,7 +145,7 @@ FORCEINLINE PLIST_ENTRY RemoveTailList( - IN PLIST_ENTRY ListHead) + IN PLIST_ENTRY ListHead) { PLIST_ENTRY Blink; PLIST_ENTRY Entry; @@ -152,12 +158,61 @@ } // +// Unicode string macros +// +FORCEINLINE +VOID +RtlInitEmptyUnicodeString(OUT PUNICODE_STRING UnicodeString, + IN PWSTR Buffer, + IN USHORT BufferSize) +{ + UnicodeString->Length = 0; + UnicodeString->MaximumLength = BufferSize; + UnicodeString->Buffer = Buffer; +} + +// // LUID Macros // #define RtlEqualLuid(L1, L2) (((L1)->HighPart == (L2)->HighPart) && \ ((L1)->LowPart == (L2)->LowPart)) +FORCEINLINE +LUID +NTAPI_INLINE +RtlConvertUlongToLuid(ULONG Ulong) +{ + LUID TempLuid; + TempLuid.LowPart = Ulong; + TempLuid.HighPart = 0; + return TempLuid; +} + // +// ASSERT Macros +// +#ifndef ASSERT +#if DBG + +#define ASSERT( exp ) \ + ((!(exp)) ? \ + (RtlAssert( #exp, __FILE__, __LINE__, NULL ),FALSE) : \ + TRUE) + +#define ASSERTMSG( msg, exp ) \ + ((!(exp)) ? \ + (RtlAssert( #exp, __FILE__, __LINE__, msg ),FALSE) : \ + TRUE) + +#else + +#define ASSERT( exp ) ((void) 0) +#define ASSERTMSG( msg, exp ) ((void) 0) + +#endif +#endif + +// // RTL Splay Tree Functions // NTSYSAPI @@ -268,17 +323,16 @@ ); NTSYSAPI -VOID +PVOID NTAPI -RtlCaptureContext(OUT PCONTEXT ContextRecord); +RtlSetUnhandledExceptionFilter( + IN PVOID TopLevelExceptionFilter +); NTSYSAPI -ULONG +VOID NTAPI -RtlComputeCrc32( - IN ULONG Initial, - IN PUCHAR Data, - IN ULONG Length); +RtlCaptureContext(OUT PCONTEXT ContextRecord); NTSYSAPI PVOID @@ -291,6 +345,16 @@ RtlDecodePointer(IN PVOID Pointer); NTSYSAPI +PVOID +NTAPI +RtlEncodeSystemPointer(IN PVOID Pointer); + +NTSYSAPI +PVOID +NTAPI +RtlDecodeSystemPointer(IN PVOID Pointer); + +NTSYSAPI BOOLEAN NTAPI RtlDispatchException( @@ -329,6 +393,14 @@ ); // +// Tracing Functions +// +NTSYSAPI +USHORT +NTAPI +RtlLogStackBackTrace(VOID); + +// // Heap Functions // NTSYSAPI @@ -355,6 +427,15 @@ NTSYSAPI ULONG NTAPI +RtlCreateTagHeap( + IN HANDLE HeapHandle, + IN ULONG Flags, + IN PWSTR TagName, + IN PWSTR TagSubName +); + +ULONG +NTAPI RtlCompactHeap( HANDLE heap, ULONG flags @@ -374,7 +455,6 @@ IN PVOID P ); -NTSYSAPI ULONG NTAPI RtlGetProcessHeaps( @@ -382,7 +462,6 @@ HANDLE *HeapArray ); -NTSYSAPI PVOID NTAPI RtlReAllocateHeap( @@ -392,17 +471,14 @@ ULONG Size ); -NTSYSAPI BOOLEAN NTAPI RtlLockHeap(IN HANDLE Heap); -NTSYSAPI BOOLEAN NTAPI RtlUnlockHeap(IN HANDLE Heap); -NTSYSAPI ULONG NTAPI RtlSizeHeap( @@ -411,7 +487,6 @@ IN PVOID MemoryPointer ); -NTSYSAPI BOOLEAN NTAPI RtlValidateHeap( @@ -444,7 +519,6 @@ PSID Sid ); -NTSYSAPI NTSTATUS NTAPI RtlAddAccessAllowedAceEx( @@ -455,7 +529,6 @@ IN PSID pSid ); -NTSYSAPI NTSTATUS NTAPI RtlAddAccessDeniedAce( @@ -465,7 +538,6 @@ PSID Sid ); -NTSYSAPI NTSTATUS NTAPI RtlAddAccessDeniedAceEx( @@ -476,7 +548,6 @@ IN PSID Sid ); -NTSYSAPI NTSTATUS NTAPI RtlAddAuditAccessAceEx( @@ -500,7 +571,6 @@ ULONG AceListLength ); -NTSYSAPI NTSTATUS NTAPI RtlAddAuditAccessAce( @@ -512,9 +582,17 @@ BOOLEAN Failure ); -NTSYSAPI NTSTATUS NTAPI +RtlAcquirePrivilege( + IN PULONG Privilege, + IN ULONG NumPriv, + IN ULONG Flags, + OUT PVOID *ReturnedState +); + +NTSTATUS +NTAPI RtlAdjustPrivilege( IN ULONG Privilege, IN BOOLEAN NewValue, @@ -539,7 +617,6 @@ OUT PSID *Sid ); -NTSYSAPI BOOLEAN NTAPI RtlAreAllAccessesGranted( @@ -547,7 +624,6 @@ ACCESS_MASK DesiredAccess ); -NTSYSAPI BOOLEAN NTAPI RtlAreAnyAccessesGranted( @@ -563,7 +639,6 @@ IN PLUID LuidSrc ); -NTSYSAPI VOID NTAPI RtlCopyLuidAndAttributesArray( @@ -572,7 +647,6 @@ PLUID_AND_ATTRIBUTES Dest ); -NTSYSAPI NTSTATUS NTAPI RtlCopySidAndAttributesArray( @@ -585,7 +659,6 @@ PULONG RemainingSidAreaSize ); -NTSYSAPI NTSTATUS NTAPI RtlConvertSidToUnicodeString( @@ -652,7 +725,6 @@ IN PSID Sid2 ); -NTSYSAPI BOOLEAN NTAPI RtlFirstFreeAce( @@ -676,7 +748,6 @@ PVOID *Ace ); -NTSYSAPI NTSTATUS NTAPI RtlGetControlSecurityDescriptor( @@ -786,6 +857,12 @@ ACL_INFORMATION_CLASS InformationClass ); +VOID +NTAPI +RtlReleasePrivilege( + IN PVOID ReturnedState +); + NTSYSAPI NTSTATUS NTAPI @@ -1351,6 +1428,16 @@ ); NTSYSAPI +NTSTATUS +NTAPI +RtlFindCharInUnicodeString( + IN ULONG Flags, + IN PUNICODE_STRING SearchString, + IN PCUNICODE_STRING MatchString, + OUT PUSHORT Position +); + +NTSYSAPI VOID NTAPI RtlFreeUnicodeString(IN PUNICODE_STRING UnicodeString); @@ -1369,10 +1456,19 @@ VOID NTAPI RtlInitUnicodeString( - IN OUT PUNICODE_STRING DestinationString, - IN PCWSTR SourceString); + IN OUT PUNICODE_STRING DestinationString, + IN PCWSTR SourceString +); NTSYSAPI +NTSTATUS +NTAPI +RtlInitUnicodeStringEx( + OUT PUNICODE_STRING DestinationString, + IN PCWSTR SourceString OPTIONAL +); + +NTSYSAPI ULONG NTAPI RtlIsTextUnicode( @@ -1417,6 +1513,14 @@ PULONG Value ); +NTSYSAPI +NTSTATUS +NTAPI +RtlValidateUnicodeString( + IN ULONG Flags, + IN PCUNICODE_STRING String +); + // // Ansi String Functions // @@ -1653,30 +1757,60 @@ ); NTSYSAPI +NTSTATUS +NTAPI +RtlComputePrivatizedDllName_U( + IN PUNICODE_STRING DllName, + OUT PUNICODE_STRING RealName, + OUT PUNICODE_STRING LocalName +); + +NTSYSAPI VOID NTAPI -RtlDestroyEnvironment(PWSTR Environment); +RtlDestroyEnvironment( + IN PWSTR Environment +); NTSYSAPI BOOLEAN NTAPI -RtlDoesFileExists_U(PWSTR FileName); +RtlDoesFileExists_U( + IN PCWSTR FileName +); NTSYSAPI +BOOLEAN +NTAPI +RtlDoesFileExists_UstrEx( + IN PCUNICODE_STRING FileName, + IN BOOLEAN SucceedIfBusy +); + +NTSYSAPI ULONG NTAPI -RtlDetermineDosPathNameType_U(PCWSTR Path); +RtlDetermineDosPathNameType_U( + IN PCWSTR Path +); NTSYSAPI ULONG NTAPI +RtlDetermineDosPathNameType_Ustr( + IN PCUNICODE_STRING Path +); + +NTSYSAPI +ULONG +NTAPI RtlDosSearchPath_U( - WCHAR *sp, - WCHAR *name, - WCHAR *ext, - ULONG buf_sz, - WCHAR *buffer, - WCHAR **shortname + IN PCWSTR Path, + IN PCWSTR FileName, + IN PCWSTR Extension, + IN ULONG BufferSize, + OUT PWSTR Buffer, + OUT PWSTR *PartName ); NTSYSAPI @@ -1711,13 +1845,40 @@ ULONG NTAPI RtlGetFullPathName_U( - const WCHAR *dosname, - ULONG size, - WCHAR *buf, - WCHAR **shortname + IN PCWSTR FileName, + IN ULONG Size, + IN PWSTR Buffer, + OUT PWSTR *ShortName ); NTSYSAPI +ULONG +NTAPI +RtlGetFullPathName_Ustr( + IN PUNICODE_STRING FileName, + IN ULONG Size, + IN PWSTR Buffer, + OUT PWSTR *ShortName, + OUT PBOOLEAN InvalidName, + OUT RTL_PATH_TYPE *PathType +); + +NTSYSAPI +ULONG +NTAPI +RtlIsDosDeviceName_U( + IN PWSTR Name +); + +NTSYSAPI +ULONG +NTAPI +RtlIsDosDeviceName_Ustr( + IN PUNICODE_STRING Name +); + + +NTSYSAPI BOOLEAN NTAPI RtlIsNameLegalDOS8Dot3( @@ -1738,7 +1899,9 @@ NTSYSAPI NTSTATUS NTAPI -RtlSetCurrentDirectory_U(PUNICODE_STRING name); +RtlSetCurrentDirectory_U( + IN PUNICODE_STRING name +); NTSYSAPI NTSTATUS @@ -1789,6 +1952,13 @@ ); NTSYSAPI +BOOLEAN +NTAPI +RtlTryEnterCriticalSection( + IN PRTL_CRITICAL_SECTION CriticalSection +); + +NTSYSAPI VOID NTAPI RtlpUnWaitCriticalSection( @@ -1902,7 +2072,7 @@ // Debug Info Functions // NTSYSAPI -PRTL_DEBUG_BUFFER +PRTL_DEBUG_INFORMATION NTAPI RtlCreateQueryDebugBuffer( IN ULONG Size, @@ -1912,7 +2082,7 @@ NTSYSAPI NTSTATUS NTAPI -RtlDestroyQueryDebugBuffer(IN PRTL_DEBUG_BUFFER DebugBuffer); +RtlDestroyQueryDebugBuffer(IN PRTL_DEBUG_INFORMATION DebugBuffer); NTSYSAPI NTSTATUS @@ -1920,7 +2090,7 @@ RtlQueryProcessDebugInformation( IN ULONG ProcessId, IN ULONG DebugInfoClassMask, - IN OUT PRTL_DEBUG_BUFFER DebugBuffer + IN OUT PRTL_DEBUG_INFORMATION DebugBuffer ); // @@ -1983,7 +2153,15 @@ NTSYSAPI VOID NTAPI -RtlSetBits ( +RtlSetBit( + PRTL_BITMAP BitMapHeader, + ULONG BitNumber +); + +NTSYSAPI +VOID +NTAPI +RtlSetBits( IN PRTL_BITMAP BitMapHeader, IN ULONG StartingIndex, IN ULONG NumberToSet @@ -2043,6 +2221,26 @@ RtlDeleteTimerQueue(HANDLE TimerQueue); // +// SList functions +// +PSLIST_ENTRY +FASTCALL +InterlockedPushListSList( + IN PSLIST_HEADER ListHead, + IN PSLIST_ENTRY List, + IN PSLIST_ENTRY ListEnd, + IN ULONG Count +); + +// +// Range List functions +// +NTSYSAPI +VOID +NTAPI +RtlFreeRangeList(IN PRTL_RANGE_LIST RangeList); + +// // Debug Functions // ULONG @@ -2052,6 +2250,24 @@ IN ... ); +ULONG +NTSYSAPI +__cdecl +DbgPrintEx( + IN ULONG ComponentId, + IN ULONG Level, + IN PCH Format, + IN ... +); + +ULONG +NTAPI +DbgPrompt( + IN PCH PromptString, + OUT PCH OutputString, + IN ULONG OutputSize +); + VOID NTAPI DbgBreakPoint(VOID); @@ -2129,9 +2345,9 @@ PVOID NTAPI RtlImageDirectoryEntryToData( - PVOID BaseAddress, - BOOLEAN bFlag, - ULONG Directory, + PVOID BaseAddress, + BOOLEAN MappedAsImage, + USHORT Directory, PULONG Size ); @@ -2151,6 +2367,16 @@ RtlImageNtHeader(IN PVOID BaseAddress); NTSYSAPI +NTSTATUS +NTAPI +RtlImageNtHeaderEx( + IN ULONG Flags, + IN PVOID BaseAddress, + IN ULONGLONG Size, + IN PIMAGE_NT_HEADERS *NtHeader +); + +NTSYSAPI PIMAGE_SECTION_HEADER NTAPI RtlImageRvaToSection( @@ -2160,6 +2386,73 @@ ); // +// Activation Context Functions +// +#ifdef NTOS_MODE_USER +NTSYSAPI +NTSTATUS +NTAPI +RtlActivateActivationContextUnsafeFast( + IN PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED Frame, + IN PVOID Context +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlAllocateActivationContextStack( + IN PVOID *Context +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlGetActiveActivationContext( + IN PVOID *Context +); + +NTSYSAPI +VOID +NTAPI +RtlReleaseActivationContext( + IN PVOID *Context +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlDeactivateActivationContextUnsafeFast( + IN PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED Frame +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlDosApplyFileIsolationRedirection_Ustr( + IN BOOLEAN Unknown, + IN PUNICODE_STRING OriginalName, + IN PUNICODE_STRING Extension, + IN OUT PUNICODE_STRING RedirectedName, + IN OUT PUNICODE_STRING RedirectedName2, + IN OUT PUNICODE_STRING *OriginalName2, + IN PVOID Unknown1, + IN PVOID Unknown2, + IN PVOID Unknown3 +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlFindActivationContextSectionString( + IN PVOID Unknown0, + IN PVOID Unknown1, + IN ULONG SectionType, + IN PUNICODE_STRING SectionName, + IN PVOID Unknown2 +); +#endif + +// // Registry Functions // NTSYSAPI @@ -2311,8 +2604,19 @@ NTSYSAPI ULONG NTAPI -RtlUniform(PULONG Seed); +RtlUniform( + IN PULONG Seed +); +NTSYSAPI +ULONG +NTAPI +RtlComputeCrc32( + IN UINT PartialCrc, + IN PUCHAR Buffer, + IN ULONG Length +); + // // Network Functions // @@ -2320,36 +2624,36 @@ NTSTATUS NTAPI RtlIpv4StringToAddressW( - IN LPWSTR IpString, - IN ULONG Base, - OUT PULONG PtrToIpAddr, - OUT PULONG IpAddr + IN PWCHAR String, + IN UCHAR Strict, + OUT PWCHAR Terminator, + OUT struct in_addr *Addr ); NTSYSAPI NTSTATUS NTAPI RtlIpv6StringToAddressA( - IN LPSTR Name, - OUT PULONG Unknown, - OUT PVOID IpAddr + IN PCHAR Name, + OUT PCHAR *Terminator, + OUT struct in6_addr *Addr ); NTSYSAPI NTSTATUS NTAPI RtlIpv6StringToAddressW( - IN LPWSTR Name, - OUT PULONG Unknown, - OUT PVOID IpAddr + IN PWCHAR Name, + OUT PCHAR *Terminator, + OUT struct in6_addr *Addr ); NTSYSAPI NTSTATUS NTAPI RtlIpv6StringToAddressExA( - IN LPSTR AddressName, - IN PVOID Address, + IN PCHAR AddressString, + IN struct in6_addr *Address, IN PULONG ScopeId, IN PUSHORT Port ); @@ -2358,8 +2662,8 @@ NTSTATUS NTAPI RtlIpv6StringToAddressExW( - IN LPWSTR AddressName, - IN PVOID Address, + IN PWCHAR AddressName, + IN struct in6_addr *Address, IN PULONG ScopeId, IN PUSHORT Port ); @@ -2368,6 +2672,7 @@ // // Time Functions // +struct _RTL_TIME_ZONE_INFORMATION; NTSYSAPI NTSTATUS NTAPI @@ -2402,6 +2707,14 @@ PTIME_FIELDS TimeFields ); +NTSYSAPI +NTSTATUS +NTAPI +RtlSystemTimeToLocalTime( + IN PLARGE_INTEGER SystemTime, + OUT PLARGE_INTEGER LocalTime +); + // // Version Functions // @@ -2424,4 +2737,8 @@ NTAPI RtlGetNtProductType(OUT PNT_PRODUCT_TYPE ProductType); +#ifdef __cplusplus +} #endif + +#endif Index: include/ndk/potypes.h =================================================================== --- include/ndk/potypes.h (revision 21759) +++ include/ndk/potypes.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ Index: include/ndk/ldrtypes.h =================================================================== --- include/ndk/ldrtypes.h (revision 21759) +++ include/ndk/ldrtypes.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -27,31 +27,47 @@ // // Resource Type Levels // -#define RESOURCE_TYPE_LEVEL 0 -#define RESOURCE_NAME_LEVEL 1 -#define RESOURCE_LANGUAGE_LEVEL 2 -#define RESOURCE_DATA_LEVEL 3 +#define RESOURCE_TYPE_LEVEL 0 +#define RESOURCE_NAME_LEVEL 1 +#define RESOURCE_LANGUAGE_LEVEL 2 +#define RESOURCE_DATA_LEVEL 3 // // Loader Data Table Entry Flags // -#define LDRP_STATIC_LINK 0x00000002 -#define LDRP_IMAGE_DLL 0x00000004 -#define LDRP_LOAD_IN_PROGRESS 0x00001000 -#define LDRP_UNLOAD_IN_PROGRESS 0x00002000 -#define LDRP_ENTRY_PROCESSED 0x00004000 -#define LDRP_ENTRY_INSERTED 0x00008000 -#define LDRP_CURRENT_LOAD 0x00010000 -#define LDRP_FAILED_BUILTIN_LOAD 0x00020000 -#define LDRP_DONT_CALL_FOR_THREADS 0x00040000 -#define LDRP_PROCESS_ATTACH_CALLED 0x00080000 -#define LDRP_DEBUG_SYMBOLS_LOADED 0x00100000 -#define LDRP_IMAGE_NOT_AT_BASE 0x00200000 -#define LDRP_COR_IMAGE 0x00400000 -#define LDR_COR_OWNS_UNMAP 0x00800000 -#define LDRP_REDIRECTED 0x10000000 +#define LDRP_STATIC_LINK 0x00000002 +#define LDRP_IMAGE_DLL 0x00000004 +#define LDRP_LOAD_IN_PROGRESS 0x00001000 +#define LDRP_UNLOAD_IN_PROGRESS 0x00002000 +#define LDRP_ENTRY_PROCESSED 0x00004000 +#define LDRP_ENTRY_INSERTED 0x00008000 +#define LDRP_CURRENT_LOAD 0x00010000 +#define LDRP_FAILED_BUILTIN_LOAD 0x00020000 +#define LDRP_DONT_CALL_FOR_THREADS 0x00040000 +#define LDRP_PROCESS_ATTACH_CALLED 0x00080000 +#define LDRP_DEBUG_SYMBOLS_LOADED 0x00100000 +#define LDRP_IMAGE_NOT_AT_BASE 0x00200000 +#define LDRP_COR_IMAGE 0x00400000 +#define LDR_COR_OWNS_UNMAP 0x00800000 +#define LDRP_REDIRECTED 0x10000000 // +// Dll Characteristics for LdrLoadDll +// +#define LDR_IGNORE_CODE_AUTHZ_LEVEL 0x00001000 + +// +// LdrAddRef Flags +// +#define LDR_PIN_MODULE 0x00000001 + +// +// LdrLockLoaderLock Flags +// +#define LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS 0x00000001 +#define LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY 0x00000002 + +// // Loader Data stored in the PEB // typedef struct _PEB_LDR_DATA @@ -70,7 +86,7 @@ // typedef struct _LDR_DATA_TABLE_ENTRY { - LIST_ENTRY InLoadOrderModuleList; + LIST_ENTRY InLoadOrderLinks; LIST_ENTRY InMemoryOrderModuleList; LIST_ENTRY InInitializationOrderModuleList; PVOID DllBase; @@ -107,8 +123,45 @@ } LDR_RESOURCE_INFO, *PLDR_RESOURCE_INFO; // -// LdrAddRef Flags +// DLL Notifications // -#define LDR_PIN_MODULE 0x00000001 +typedef struct _LDR_DLL_LOADED_NOTIFICATION_DATA +{ + ULONG Flags; + PUNICODE_STRING FullDllName; + PUNICODE_STRING BaseDllName; + PVOID DllBase; + ULONG SizeOfImage; +} LDR_DLL_LOADED_NOTIFICATION_DATA, *PLDR_DLL_LOADED_NOTIFICATION_DATA; +typedef VOID +(*PLDR_DLL_LOADED_NOTIFICATION_CALLBACK)( + IN BOOLEAN Type, + IN struct _LDR_DLL_LOADED_NOTIFICATION_DATA *Data +); + +typedef struct _LDR_DLL_LOADED_NOTIFICATION_ENTRY +{ + LIST_ENTRY NotificationListEntry; + PLDR_DLL_LOADED_NOTIFICATION_CALLBACK Callback; +} LDR_DLL_LOADED_NOTIFICATION_ENTRY, *PLDR_DLL_LOADED_NOTIFICATION_ENTRY; + +// +// Alternate Resources Support +// +typedef struct _ALT_RESOURCE_MODULE +{ + LANGID LangId; + PVOID ModuleBase; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PVOID ModuleManifest; #endif + PVOID AlternateModule; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + HANDLE AlternateFileHandle; + ULONG ModuleCheckSum; + ULONG ErrorCode; +#endif +} ALT_RESOURCE_MODULE, *PALT_RESOURCE_MODULE; + +#endif Index: include/ndk/pstypes.h =================================================================== --- include/ndk/pstypes.h (revision 21759) +++ include/ndk/pstypes.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -76,6 +76,7 @@ #define FLG_ENABLE_HANDLE_TYPE_TAGGING 0x01000000 #define FLG_HEAP_PAGE_ALLOCS 0x02000000 #define FLG_DEBUG_INITIAL_COMMAND_EX 0x04000000 +#define FLG_VALID_BITS 0x07FFFFFF // // Process priority classes @@ -108,6 +109,11 @@ #define PROCESS_PRIORITY_NORMAL_FOREGROUND 9 // +// Number of TLS expansion slots +// +#define TLS_EXPANSION_SLOTS 64 + +// // Process Access Types // #ifndef NTOS_MODE_USER @@ -123,7 +129,15 @@ #define PROCESS_QUERY_INFORMATION 0x0400 #define PROCESS_SUSPEND_RESUME 0x0800 #define PROCESS_QUERY_LIMITED_INFORMATION 0x1000 -#define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xFFFF) +#if (NTDDI_VERSION >= NTDDI_LONGHORN) +#define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \ + SYNCHRONIZE | \ + 0xFFFF) +#else +#define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \ + SYNCHRONIZE | \ + 0xFFF) +#endif // @@ -134,7 +148,9 @@ #define JOB_OBJECT_QUERY 0x4 #define JOB_OBJECT_TERMINATE 0x8 #define JOB_OBJECT_SET_SECURITY_ATTRIBUTES 0x10 -#define JOB_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 31) +#define JOB_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \ + SYNCHRONIZE | \ + 31) #endif #ifdef NTOS_MODE_USER @@ -223,6 +239,8 @@ ThreadCycleTime, ThreadPagePriority, ThreadActualBasePriority, + ThreadTebInformation, + ThreadCSwitchMon, MaxThreadInfoClass } THREADINFOCLASS; @@ -244,30 +262,162 @@ } JOBOBJECTINFOCLASS; // +// Power Event Events for Win32K Power Event Callback +// +typedef enum _PSPOWEREVENTTYPE +{ + PsW32FullWake = 0, + PsW32EventCode = 1, + PsW32PowerPolicyChanged = 2, + PsW32SystemPowerState = 3, + PsW32SystemTime = 4, + PsW32DisplayState = 5, + PsW32CapabilitiesChanged = 6, + PsW32SetStateFailed = 7, + PsW32GdiOff = 8, + PsW32GdiOn = 9, + PsW32GdiPrepareResumeUI = 10, + PsW32GdiOffRequest = 11, + PsW32MonitorOff = 12, +} PSPOWEREVENTTYPE; + +// +// Power State Tasks for Win32K Power State Callback +// +typedef enum _POWERSTATETASK +{ + PowerState_BlockSessionSwitch = 0, + PowerState_Init = 1, + PowerState_QueryApps = 2, + PowerState_QueryServices = 3, + PowerState_QueryAppsFailed = 4, + PowerState_QueryServicesFailed = 5, + PowerState_SuspendApps = 6, + PowerState_SuspendServices = 7, + PowerState_ShowUI = 8, + PowerState_NotifyWL = 9, + PowerState_ResumeApps = 10, + PowerState_ResumeServices = 11, + PowerState_UnBlockSessionSwitch = 12, + PowerState_End = 13, + PowerState_BlockInput = 14, + PowerState_UnblockInput = 15, +} POWERSTATETASK; + +// +// Win32K Job Callback Types +// +typedef enum _PSW32JOBCALLOUTTYPE +{ + PsW32JobCalloutSetInformation = 0, + PsW32JobCalloutAddProcess = 1, + PsW32JobCalloutTerminate = 2, +} PSW32JOBCALLOUTTYPE; + +// +// Win32K Thread Callback Types +// +typedef enum _PSW32THREADCALLOUTTYPE +{ + PsW32ThreadCalloutInitialize, + PsW32ThreadCalloutExit, +} PSW32THREADCALLOUTTYPE; + +// // Declare empty structure definitions so that they may be referenced by // routines before they are defined // struct _W32THREAD; struct _W32PROCESS; struct _ETHREAD; +struct _WIN32_POWEREVENT_PARAMETERS; +struct _WIN32_POWERSTATE_PARAMETERS; +struct _WIN32_JOBCALLOUT_PARAMETERS; +struct _WIN32_OPENMETHOD_PARAMETERS; +struct _WIN32_OKTOCLOSEMETHOD_PARAMETERS; +struct _WIN32_CLOSEMETHOD_PARAMETERS; +struct _WIN32_DELETEMETHOD_PARAMETERS; +struct _WIN32_PARSEMETHOD_PARAMETERS; // // Win32K Process and Thread Callbacks // typedef NTSTATUS -(NTAPI *PW32_PROCESS_CALLBACK)( +(NTAPI *PKWIN32_PROCESS_CALLOUT)( struct _EPROCESS *Process, BOOLEAN Create ); typedef NTSTATUS -(NTAPI *PW32_THREAD_CALLBACK)( +(NTAPI *PKWIN32_THREAD_CALLOUT)( struct _ETHREAD *Thread, - BOOLEAN Create + PSW32THREADCALLOUTTYPE Type ); +typedef NTSTATUS +(NTAPI *PKWIN32_GLOBALATOMTABLE_CALLOUT)( + VOID +); + +typedef NTSTATUS +(NTAPI *PKWIN32_POWEREVENT_CALLOUT)( + struct _WIN32_POWEREVENT_PARAMETERS *Parameters +); + +typedef NTSTATUS +(NTAPI *PKWIN32_POWERSTATE_CALLOUT)( + struct _WIN32_POWERSTATE_PARAMETERS *Parameters +); + +typedef NTSTATUS +(NTAPI *PKWIN32_JOB_CALLOUT)( + struct _WIN32_JOBCALLOUT_PARAMETERS *Parameters +); + +typedef NTSTATUS +(NTAPI *PGDI_BATCHFLUSH_ROUTINE)( + VOID +); + +typedef NTSTATUS +(NTAPI *PKWIN32_OPENMETHOD_CALLOUT)( + struct _WIN32_OPENMETHOD_PARAMETERS *Parameters +); + +typedef NTSTATUS +(NTAPI *PKWIN32_OKTOCLOSEMETHOD_CALLOUT)( + struct _WIN32_OKTOCLOSEMETHOD_PARAMETERS *Parameters +); + +typedef NTSTATUS +(NTAPI *PKWIN32_CLOSEMETHOD_CALLOUT)( + struct _WIN32_CLOSEMETHOD_PARAMETERS *Parameters +); + +typedef NTSTATUS +(NTAPI *PKWIN32_DELETEMETHOD_CALLOUT)( + struct _WIN32_DELETEMETHOD_PARAMETERS *Parameters +); + +typedef NTSTATUS +(NTAPI *PKWIN32_PARSEMETHOD_CALLOUT)( + struct _WIN32_PARSEMETHOD_PARAMETERS *Parameters +); + +typedef NTSTATUS +(NTAPI *PKWIN32_WIN32DATACOLLECTION_CALLOUT)( + struct _EPROCESS *Process, + PVOID Callback, + PVOID Context +); + #endif +typedef NTSTATUS +(NTAPI *PPOST_PROCESS_INIT_ROUTINE)( + VOID +); + #ifdef NTOS_MODE_USER // @@ -313,63 +463,112 @@ // typedef struct _PEB { - UCHAR InheritedAddressSpace; /* 00h */ - UCHAR ReadImageFileExecOptions; /* 01h */ - UCHAR BeingDebugged; /* 02h */ - BOOLEAN SpareBool; /* 03h */ - HANDLE Mutant; /* 04h */ - PVOID ImageBaseAddress; /* 08h */ - PPEB_LDR_DATA Ldr; /* 0Ch */ - struct _RTL_USER_PROCESS_PARAMETERS *ProcessParameters; /* 10h */ - PVOID SubSystemData; /* 14h */ - PVOID ProcessHeap; /* 18h */ - PVOID FastPebLock; /* 1Ch */ - PPEBLOCKROUTINE FastPebLockRoutine; /* 20h */ - PPEBLOCKROUTINE FastPebUnlockRoutine; /* 24h */ - ULONG EnvironmentUpdateCount; /* 28h */ - PVOID* KernelCallbackTable; /* 2Ch */ - PVOID EventLogSection; /* 30h */ - PVOID EventLog; /* 34h */ - PPEB_FREE_BLOCK FreeList; /* 38h */ - ULONG TlsExpansionCounter; /* 3Ch */ - PVOID TlsBitmap; /* 40h */ - ULONG TlsBitmapBits[0x2]; /* 44h */ - PVOID ReadOnlySharedMemoryBase; /* 4Ch */ - PVOID ReadOnlySharedMemoryHeap; /* 50h */ - PVOID* ReadOnlyStaticServerData; /* 54h */ - PVOID AnsiCodePageData; /* 58h */ - PVOID OemCodePageData; /* 5Ch */ - PVOID UnicodeCaseTableData; /* 60h */ - ULONG NumberOfProcessors; /* 64h */ - ULONG NtGlobalFlag; /* 68h */ - LARGE_INTEGER CriticalSectionTimeout; /* 70h */ - ULONG HeapSegmentReserve; /* 78h */ - ULONG HeapSegmentCommit; /* 7Ch */ - ULONG HeapDeCommitTotalFreeThreshold; /* 80h */ - ULONG HeapDeCommitFreeBlockThreshold; /* 84h */ - ULONG NumberOfHeaps; /* 88h */ - ULONG MaximumNumberOfHeaps; /* 8Ch */ - PVOID* ProcessHeaps; /* 90h */ - PVOID GdiSharedHandleTable; /* 94h */ - PVOID ProcessStarterHelper; /* 98h */ - PVOID GdiDCAttributeList; /* 9Ch */ - PVOID LoaderLock; /* A0h */ - ULONG OSMajorVersion; /* A4h */ - ULONG OSMinorVersion; /* A8h */ - USHORT OSBuildNumber; /* ACh */ - USHORT OSCSDVersion; /* AEh */ - ULONG OSPlatformId; /* B0h */ - ULONG ImageSubSystem; /* B4h */ - ULONG ImageSubSystemMajorVersion; /* B8h */ - ULONG ImageSubSystemMinorVersion; /* BCh */ - ULONG ImageProcessAffinityMask; /* C0h */ - ULONG GdiHandleBuffer[0x22]; /* C4h */ - PVOID PostProcessInitRoutine; /* 14Ch */ - struct _RTL_BITMAP *TlsExpansionBitmap; /* 150h */ - ULONG TlsExpansionBitmapBits[0x20]; /* 154h */ - ULONG SessionId; /* 1D4h */ - PVOID AppCompatInfo; /* 1D8h */ - UNICODE_STRING CSDVersion; /* 1DCh */ + UCHAR InheritedAddressSpace; + UCHAR ReadImageFileExecOptions; + UCHAR BeingDebugged; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + struct + { + UCHAR ImageUsesLargePages:1; + UCHAR IsProtectedProcess:1; + UCHAR IsLegacyProcess:1; + UCHAR SpareBits:5; + }; +#else + BOOLEAN SpareBool; +#endif + HANDLE Mutant; + PVOID ImageBaseAddress; + PPEB_LDR_DATA Ldr; + struct _RTL_USER_PROCESS_PARAMETERS *ProcessParameters; + PVOID SubSystemData; + PVOID ProcessHeap; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + struct _RTL_CRITICAL_SECTION *FastPebLock; + PVOID AltThunkSListPtr; + PVOID IFEOKey; + ULONG Spare; + union + { + PVOID* KernelCallbackTable; + PVOID UserSharedInfoPtr; + }; + ULONG SystemReserved[1]; + ULONG SpareUlong; +#else + PVOID FastPebLock; + PPEBLOCKROUTINE FastPebLockRoutine; + PPEBLOCKROUTINE FastPebUnlockRoutine; + ULONG EnvironmentUpdateCount; + PVOID* KernelCallbackTable; + PVOID EventLogSection; + PVOID EventLog; +#endif + PPEB_FREE_BLOCK FreeList; + ULONG TlsExpansionCounter; + PVOID TlsBitmap; + ULONG TlsBitmapBits[0x2]; + PVOID ReadOnlySharedMemoryBase; + PVOID ReadOnlySharedMemoryHeap; + PVOID* ReadOnlyStaticServerData; + PVOID AnsiCodePageData; + PVOID OemCodePageData; + PVOID UnicodeCaseTableData; + ULONG NumberOfProcessors; + ULONG NtGlobalFlag; + LARGE_INTEGER CriticalSectionTimeout; + ULONG HeapSegmentReserve; + ULONG HeapSegmentCommit; + ULONG HeapDeCommitTotalFreeThreshold; + ULONG HeapDeCommitFreeBlockThreshold; + ULONG NumberOfHeaps; + ULONG MaximumNumberOfHeaps; + PVOID* ProcessHeaps; + PVOID GdiSharedHandleTable; + PVOID ProcessStarterHelper; + PVOID GdiDCAttributeList; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + struct _RTL_CRITICAL_SECTION *LoaderLock; +#else + PVOID LoaderLock; +#endif + ULONG OSMajorVersion; + ULONG OSMinorVersion; + USHORT OSBuildNumber; + USHORT OSCSDVersion; + ULONG OSPlatformId; + ULONG ImageSubSystem; + ULONG ImageSubSystemMajorVersion; + ULONG ImageSubSystemMinorVersion; + ULONG ImageProcessAffinityMask; + ULONG GdiHandleBuffer[0x22]; + PPOST_PROCESS_INIT_ROUTINE PostProcessInitRoutine; + struct _RTL_BITMAP *TlsExpansionBitmap; + ULONG TlsExpansionBitmapBits[0x20]; + ULONG SessionId; +#if (NTDDI_VERSION >= NTDDI_WINXP) + ULARGE_INTEGER AppCompatFlags; + ULARGE_INTEGER AppCompatFlagsUser; + PVOID pShimData; + PVOID AppCompatInfo; + UNICODE_STRING CSDVersion; + struct _ACTIVATION_CONTEXT_DATA *ActivationContextData; + struct _ASSEMBLY_STORAGE_MAP *ProcessAssemblyStorageMap; + struct _ACTIVATION_CONTEXT_DATA *SystemDefaultActivationContextData; + struct _ASSEMBLY_STORAGE_MAP *SystemAssemblyStorageMap; + ULONG MinimumStackCommit; +#endif +#if (NTDDI_VERSION >= NTDDI_WS03) + PVOID *FlsCallback; + LIST_ENTRY FlsListHead; + struct _RTL_BITMAP *FlsBitmap; + ULONG FlsBitmapBits[4]; + ULONG FlsHighIndex; +#endif +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PVOID WerRegistrationData; + PVOID WerShipAssertPtr; +#endif } PEB, *PPEB; // @@ -415,77 +614,129 @@ // typedef struct _TEB { - NT_TIB Tib; /* 00h */ - PVOID EnvironmentPointer; /* 1Ch */ - CLIENT_ID Cid; /* 20h */ - PVOID ActiveRpcHandle; /* 28h */ - PVOID ThreadLocalStoragePointer; /* 2Ch */ - struct _PEB *ProcessEnvironmentBlock; /* 30h */ - ULONG LastErrorValue; /* 34h */ - ULONG CountOfOwnedCriticalSections; /* 38h */ - PVOID CsrClientThread; /* 3Ch */ - PVOID Win32ThreadInfo; /* 40h */ - ULONG User32Reserved[0x1A]; /* 44h */ - ULONG UserReserved[5]; /* ACh */ - PVOID WOW32Reserved; /* C0h */ - LCID CurrentLocale; /* C4h */ - ULONG FpSoftwareStatusRegister; /* C8h */ - PVOID SystemReserved1[0x36]; /* CCh */ - LONG ExceptionCode; /* 1A4h */ - struct _ACTIVATION_CONTEXT_STACK *ActivationContextStackPointer; /* 1A8h */ - UCHAR SpareBytes1[0x28]; /* 1ACh */ - GDI_TEB_BATCH GdiTebBatch; /* 1D4h */ - CLIENT_ID RealClientId; /* 6B4h */ - PVOID GdiCachedProcessHandle; /* 6BCh */ - ULONG GdiClientPID; /* 6C0h */ - ULONG GdiClientTID; /* 6C4h */ - PVOID GdiThreadLocalInfo; /* 6C8h */ - ULONG Win32ClientInfo[62]; /* 6CCh */ - PVOID glDispatchTable[0xE9]; /* 7C4h */ - ULONG glReserved1[0x1D]; /* B68h */ - PVOID glReserved2; /* BDCh */ - PVOID glSectionInfo; /* BE0h */ - PVOID glSection; /* BE4h */ - PVOID glTable; /* BE8h */ - PVOID glCurrentRC; /* BECh */ - PVOID glContext; /* BF0h */ - NTSTATUS LastStatusValue; /* BF4h */ - UNICODE_STRING StaticUnicodeString; /* BF8h */ - WCHAR StaticUnicodeBuffer[0x105]; /* C00h */ - PVOID DeallocationStack; /* E0Ch */ - PVOID TlsSlots[0x40]; /* E10h */ - LIST_ENTRY TlsLinks; /* F10h */ - PVOID Vdm; /* F18h */ - PVOID ReservedForNtRpc; /* F1Ch */ - PVOID DbgSsReserved[0x2]; /* F20h */ - ULONG HardErrorDisabled; /* F28h */ - PVOID Instrumentation[14]; /* F2Ch */ - PVOID SubProcessTag; /* F64h */ - PVOID EtwTraceData; /* F68h */ - PVOID WinSockData; /* F6Ch */ - ULONG GdiBatchCount; /* F70h */ - BOOLEAN InDbgPrint; /* F74h */ - BOOLEAN FreeStackOnTermination; /* F75h */ - BOOLEAN HasFiberData; /* F76h */ - UCHAR IdealProcessor; /* F77h */ - ULONG GuaranteedStackBytes; /* F78h */ - PVOID ReservedForPerf; /* F7Ch */ - PVOID ReservedForOle; /* F80h */ - ULONG WaitingOnLoaderLock; /* F84h */ - ULONG SparePointer1; /* F88h */ - ULONG SoftPatchPtr1; /* F8Ch */ - ULONG SoftPatchPtr2; /* F90h */ - PVOID *TlsExpansionSlots; /* F94h */ - ULONG ImpersionationLocale; /* F98h */ - ULONG IsImpersonating; /* F9Ch */ - PVOID NlsCache; /* FA0h */ - PVOID pShimData; /* FA4h */ - ULONG HeapVirualAffinity; /* FA8h */ - PVOID CurrentTransactionHandle; /* FACh */ - PTEB_ACTIVE_FRAME ActiveFrame; /* FB0h */ - PVOID FlsData; /* FB4h */ - UCHAR SafeThunkCall; /* FB8h */ - UCHAR BooleanSpare[3]; /* FB9h */ + NT_TIB Tib; + PVOID EnvironmentPointer; + CLIENT_ID Cid; + PVOID ActiveRpcHandle; + PVOID ThreadLocalStoragePointer; + struct _PEB *ProcessEnvironmentBlock; + ULONG LastErrorValue; + ULONG CountOfOwnedCriticalSections; + PVOID CsrClientThread; + struct _W32THREAD* Win32ThreadInfo; + ULONG User32Reserved[0x1A]; + ULONG UserReserved[5]; + PVOID WOW32Reserved; + LCID CurrentLocale; + ULONG FpSoftwareStatusRegister; + PVOID SystemReserved1[0x36]; + LONG ExceptionCode; + struct _ACTIVATION_CONTEXT_STACK *ActivationContextStackPointer; + UCHAR SpareBytes1[0x24]; + ULONG TxFsContext; + GDI_TEB_BATCH GdiTebBatch; + CLIENT_ID RealClientId; + PVOID GdiCachedProcessHandle; + ULONG GdiClientPID; + ULONG GdiClientTID; + PVOID GdiThreadLocalInfo; + ULONG Win32ClientInfo[62]; + PVOID glDispatchTable[0xE9]; + ULONG glReserved1[0x1D]; + PVOID glReserved2; + PVOID glSectionInfo; + PVOID glSection; + PVOID glTable; + PVOID glCurrentRC; + PVOID glContext; + NTSTATUS LastStatusValue; + UNICODE_STRING StaticUnicodeString; + WCHAR StaticUnicodeBuffer[0x105]; + PVOID DeallocationStack; + PVOID TlsSlots[0x40]; + LIST_ENTRY TlsLinks; + PVOID Vdm; + PVOID ReservedForNtRpc; + PVOID DbgSsReserved[0x2]; + ULONG HardErrorDisabled; + PVOID Instrumentation[9]; + GUID ActivityId; + PVOID SubProcessTag; + PVOID EtwTraceData; + PVOID WinSockData; + ULONG GdiBatchCount; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + BOOLEAN SpareBool0; + BOOLEAN SpareBool1; + BOOLEAN SpareBool2; +#else + BOOLEAN InDbgPrint; + BOOLEAN FreeStackOnTermination; + BOOLEAN HasFiberData; +#endif + UCHAR IdealProcessor; + ULONG GuaranteedStackBytes; + PVOID ReservedForPerf; + PVOID ReservedForOle; + ULONG WaitingOnLoaderLock; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PVOID SavedPriorityState; +#else + ULONG SparePointer1; +#endif + ULONG SoftPatchPtr1; + ULONG SoftPatchPtr2; + PVOID *TlsExpansionSlots; + ULONG ImpersionationLocale; + ULONG IsImpersonating; + PVOID NlsCache; + PVOID pShimData; + ULONG HeapVirualAffinity; + PVOID CurrentTransactionHandle; + PTEB_ACTIVE_FRAME ActiveFrame; +#if (NTDDI_VERSION >= NTDDI_WS03) + PVOID FlsData; +#endif +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PVOID PreferredLangauges; + PVOID UserPrefLanguages; + PVOID MergedPrefLanguages; + ULONG MuiImpersonation; + union + { + struct + { + USHORT SpareCrossTebFlags:16; + }; + USHORT CrossTebFlags; + }; + union + { + struct + { + USHORT DbgSafeThunkCall:1; + USHORT DbgInDebugPrint:1; + USHORT DbgHasFiberData:1; + USHORT DbgSkipThreadAttach:1; + USHORT DbgWerInShipAssertCode:1; + USHORT DbgIssuedInitialBp:1; + USHORT DbgClonedThread:1; + USHORT SpareSameTebBits:9; + }; + USHORT SameTebFlags; + }; + PVOID TxnScopeEntercallback; + PVOID TxnScopeExitCAllback; + PVOID TxnScopeContext; + ULONG LockCount; + ULONG ProcessRundown; + ULONGLONG LastSwitchTime; + ULONGLONG TotalSwitchOutTime; + LARGE_INTEGER WaitReasonBitMap; +#else + UCHAR SafeThunkCall; + UCHAR BooleanSpare[3]; +#endif } TEB, *PTEB; #ifdef NTOS_MODE_USER @@ -543,7 +794,7 @@ typedef struct _PROCESS_PRIORITY_CLASS { BOOLEAN Foreground; - UCHAR PriorityClass; + UCHAR PriorityClass; } PROCESS_PRIORITY_CLASS, *PPROCESS_PRIORITY_CLASS; // @@ -581,7 +832,7 @@ } EPROCESS_QUOTA_BLOCK, *PEPROCESS_QUOTA_BLOCK; // -// FIXME: This really belongs in mmtypes.h +// Process Pagefault History // typedef struct _PAGEFAULT_HISTORY { @@ -613,252 +864,371 @@ } TERMINATION_PORT, *PTERMINATION_PORT; // +// Per-Process APC Rate Limiting +// +typedef struct _PSP_RATE_APC +{ + union + { + SINGLE_LIST_ENTRY NextApc; + ULONGLONG ExcessCycles; + }; + ULONGLONG TargetGEneration; + KAPC RateApc; +} PSP_RATE_APC, *PPSP_RATE_APC; + +// // Executive Thread (ETHREAD) // #include <pshpack4.h> typedef struct _ETHREAD { - KTHREAD Tcb; /* 000 */ - PVOID Padding; /* 1B4 */ - LARGE_INTEGER CreateTime; /* 1B8 */ + KTHREAD Tcb; + PVOID Padding; + LARGE_INTEGER CreateTime; union { - LARGE_INTEGER ExitTime; /* 1C0 */ - LIST_ENTRY LpcReplyChain; /* 1C0 */ - LIST_ENTRY KeyedWaitChain; /* 1C0 */ + LARGE_INTEGER ExitTime; + LIST_ENTRY LpcReplyChain; + LIST_ENTRY KeyedWaitChain; }; union { - NTSTATUS ExitStatus; /* 1C8 */ - PVOID OfsChain; /* 1C8 */ + NTSTATUS ExitStatus; + PVOID OfsChain; }; - LIST_ENTRY PostBlockList; /* 1CC */ + LIST_ENTRY PostBlockList; union { - struct _TERMINATION_PORT *TerminationPort; /* 1D4 */ - struct _ETHREAD *ReaperLink; /* 1D4 */ - PVOID KeyedWaitValue; /* 1D4 */ + struct _TERMINATION_PORT *TerminationPort; + struct _ETHREAD *ReaperLink; + PVOID KeyedWaitValue; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PVOID Win32StartParameter; +#endif }; - KSPIN_LOCK ActiveTimerListLock; /* 1D8 */ - LIST_ENTRY ActiveTimerListHead; /* 1DC */ - CLIENT_ID Cid; /* 1E4 */ + KSPIN_LOCK ActiveTimerListLock; + LIST_ENTRY ActiveTimerListHead; + CLIENT_ID Cid; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + KSEMAPHORE KeyedWaitSemaphore; +#else union { - KSEMAPHORE LpcReplySemaphore; /* 1EC */ - KSEMAPHORE KeyedReplySemaphore; /* 1EC */ + KSEMAPHORE LpcReplySemaphore; + KSEMAPHORE KeyedReplySemaphore; }; union { - PVOID LpcReplyMessage; /* 200 */ - PVOID LpcWaitingOnPort; /* 200 */ + PVOID LpcReplyMessage; + PVOID LpcWaitingOnPort; }; - PPS_IMPERSONATION_INFORMATION ImpersonationInfo; /* 204 */ - LIST_ENTRY IrpList; /* 208 */ - ULONG TopLevelIrp; /* 210 */ - PDEVICE_OBJECT DeviceToVerify; /* 214 */ - struct _EPROCESS *ThreadsProcess; /* 218 */ - PKSTART_ROUTINE StartAddress; /* 21C */ +#endif + PPS_IMPERSONATION_INFORMATION ImpersonationInfo; + LIST_ENTRY IrpList; + ULONG TopLevelIrp; + PDEVICE_OBJECT DeviceToVerify; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PPSP_RATE_APC RateControlApc; +#else + struct _EPROCESS *ThreadsProcess; +#endif + PVOID Win32StartAddress; union { - PVOID Win32StartAddress; /* 220 */ - ULONG LpcReceivedMessageId; /* 220 */ + PKSTART_ROUTINE StartAddress; + ULONG LpcReceivedMessageId; }; - LIST_ENTRY ThreadListEntry; /* 224 */ - EX_RUNDOWN_REF RundownProtect; /* 22C */ - EX_PUSH_LOCK ThreadLock; /* 230 */ - ULONG LpcReplyMessageId; /* 234 */ - ULONG ReadClusterSize; /* 238 */ - ACCESS_MASK GrantedAccess; /* 23C */ + LIST_ENTRY ThreadListEntry; + EX_RUNDOWN_REF RundownProtect; + EX_PUSH_LOCK ThreadLock; +#if (NTDDI_VERSION < NTDDI_LONGHORN) + ULONG LpcReplyMessageId; +#endif + ULONG ReadClusterSize; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG SpareUlong0; +#else + ACCESS_MASK GrantedAccess; +#endif union { struct { - ULONG Terminated:1; - ULONG DeadThread:1; - ULONG HideFromDebugger:1; - ULONG ActiveImpersonationInfo:1; - ULONG SystemThread:1; - ULONG HardErrorsAreDisabled:1; - ULONG BreakOnTermination:1; - ULONG SkipCreationMsg:1; - ULONG SkipTerminationMsg:1; + ULONG Terminated:1; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG ThreadInserted:1; +#else + ULONG DeadThread:1; +#endif + ULONG HideFromDebugger:1; + ULONG ActiveImpersonationInfo:1; + ULONG SystemThread:1; + ULONG HardErrorsAreDisabled:1; + ULONG BreakOnTermination:1; + ULONG SkipCreationMsg:1; + ULONG SkipTerminationMsg:1; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG CreateMsgSent:1; + ULONG ThreadIoPriority:3; + ULONG ThreadPagePriority:3; + ULONG PendingRatecontrol:1; +#endif }; - ULONG CrossThreadFlags; /* 240 */ + ULONG CrossThreadFlags; }; union { struct { - ULONG ActiveExWorker:1; - ULONG ExWorkerCanWaitUser:1; - ULONG MemoryMaker:1; - ULONG KeyedEventInUse:1; + ULONG ActiveExWorker:1; + ULONG ExWorkerCanWaitUser:1; + ULONG MemoryMaker:1; + ULONG KeyedEventInUse:1; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG RateApcState:2; +#endif }; - ULONG SameThreadPassiveFlags; /* 244 */ + ULONG SameThreadPassiveFlags; }; union { struct { - ULONG LpcReceivedMsgIdValid:1; - ULONG LpcExitThreadCalled:1; - ULONG AddressSpaceOwner:1; - ULONG OwnsProcessWorkingSetExclusive:1; - ULONG OwnsProcessWorkingSetShared:1; - ULONG OwnsSystemWorkingSetExclusive:1; - ULONG OwnsSystemWorkingSetShared:1; - ULONG OwnsSessionWorkingSetExclusive:1; - ULONG OwnsSessionWorkingSetShared:1; - ULONG ApcNeeded:1; + ULONG LpcReceivedMsgIdValid:1; + ULONG LpcExitThreadCalled:1; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG Spare:1; +#else + ULONG AddressSpaceOwner:1; +#endif + ULONG OwnsProcessWorkingSetExclusive:1; + ULONG OwnsProcessWorkingSetShared:1; + ULONG OwnsSystemWorkingSetExclusive:1; + ULONG OwnsSystemWorkingSetShared:1; + ULONG OwnsSessionWorkingSetExclusive:1; + ULONG OwnsSessionWorkingSetShared:1; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG SupressSymbolLoad:1; + ULONG Spare1:3; + ULONG PriorityRegionActive:4; +#else + ULONG ApcNeeded:1; +#endif }; - ULONG SameThreadApcFlags; /* 248 */ + ULONG SameThreadApcFlags; }; - UCHAR ForwardClusterOnly; /* 24C */ - UCHAR DisablePageFaultClustering; /* 24D */ - UCHAR ActiveFaultCount; /* 24E */ +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + UCHAR CacheManagerActive; +#else + UCHAR ForwardClusterOnly; +#endif + UCHAR DisablePageFaultClustering; + UCHAR ActiveFaultCount; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG AlpcMessageId; + union + { + PVOID AlpcMessage; + ULONG AlpcReceiveAttributeSet; + }; + LIST_ENTRY AlpcWaitListEntry; + KSEMAPHORE AlpcWaitSemaphore; + ULONG CacheManagerCount; +#endif } ETHREAD; -#if defined(_NTOSKRNL_) - #include <internal/mm.h> -#endif - // // Executive Process (EPROCESS) // typedef struct _EPROCESS { - KPROCESS Pcb; /* 000 */ - EX_PUSH_LOCK ProcessLock; /* 078 */ - LARGE_INTEGER CreateTime; /* 080 */ - LARGE_INTEGER ExitTime; /* 088 */ - EX_RUNDOWN_REF RundownProtect; /* 090 */ - HANDLE UniqueProcessId; /* 094 */ - LIST_ENTRY ActiveProcessLinks; /* 098 */ - ULONG QuotaUsage[3]; /* 0A0 */ - ULONG QuotaPeak[3]; /* 0AC */ - ULONG CommitCharge; /* 0B8 */ - ULONG PeakVirtualSize; /* 0BC */ - ULONG VirtualSize; /* 0C0 */ - LIST_ENTRY SessionProcessLinks; /* 0C4 */ - PVOID DebugPort; /* 0CC */ - PVOID ExceptionPort; /* 0D0 */ - PHANDLE_TABLE ObjectTable; /* 0D4 */ - EX_FAST_REF Token; /* 0D8 */ - ULONG WorkingSetPage; /* 0DC */ - KGUARDED_MUTEX AddressCreationLock; /* 0E0 */ - KSPIN_LOCK HyperSpaceLock; /* 100 */ - PETHREAD ForkInProgress; /* 104 */ - ULONG HardwareTrigger; /* 108 */ - MM_AVL_TABLE PhysicalVadroot; /* 10C */ - PVOID CloneRoot; /* 110 */ - ULONG NumberOfPrivatePages; /* 114 */ - ULONG NumberOfLockedPages; /* 118 */ - PVOID *Win32Process; /* 11C */ - struct _EJOB *Job; /* 120 */ - PVOID SectionObject; /* 124 */ - PVOID SectionBaseAddress; /* 128 */ - PEPROCESS_QUOTA_BLOCK QuotaBlock; /* 12C */ - PPAGEFAULT_HISTORY WorkingSetWatch; /* 130 */ - PVOID Win32WindowStation; /* 134 */ - HANDLE InheritedFromUniqueProcessId; /* 138 */ - PVOID LdtInformation; /* 13C */ - PVOID VadFreeHint; /* 140 */ - PVOID VdmObjects; /* 144 */ - PVOID DeviceMap; /* 148 */ - PVOID Spare0[3]; /* 14C */ + KPROCESS Pcb; + EX_PUSH_LOCK ProcessLock; + LARGE_INTEGER CreateTime; + LARGE_INTEGER ExitTime; + EX_RUNDOWN_REF RundownProtect; + HANDLE UniqueProcessId; + LIST_ENTRY ActiveProcessLinks; + ULONG QuotaUsage[3]; + ULONG QuotaPeak[3]; + ULONG CommitCharge; + ULONG PeakVirtualSize; + ULONG VirtualSize; + LIST_ENTRY SessionProcessLinks; + PVOID DebugPort; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) union { - HARDWARE_PTE_X86 PagedirectoryPte; /* 158 */ - ULONGLONG Filler; /* 158 */ + PVOID ExceptionPortData; + ULONG ExceptionPortValue; + UCHAR ExceptionPortState:3; }; - ULONG Session; /* 160 */ - CHAR ImageFileName[16]; /* 164 */ - LIST_ENTRY JobLinks; /* 174 */ - PVOID LockedPagesList; /* 17C */ - LIST_ENTRY ThreadListHead; /* 184 */ - PVOID SecurityPort; /* 188 */ - PVOID PaeTop; /* 18C */ - ULONG ActiveThreads; /* 190 */ - ACCESS_MASK GrantedAccess; /* 194 */ - ULONG DefaultHardErrorProcessing; /* 198 */ - NTSTATUS LastThreadExitStatus; /* 19C */ - struct _PEB* Peb; /* 1A0 */ - EX_FAST_REF PrefetchTrace; /* 1A4 */ - LARGE_INTEGER ReadOperationCount; /* 1A8 */ - LARGE_INTEGER WriteOperationCount; /* 1B0 */ - LARGE_INTEGER OtherOperationCount; /* 1B8 */ - LARGE_INTEGER ReadTransferCount; /* 1C0 */ - LARGE_INTEGER WriteTransferCount; /* 1C8 */ - LARGE_INTEGER OtherTransferCount; /* 1D0 */ - ULONG CommitChargeLimit; /* 1D8 */ - ULONG CommitChargePeak; /* 1DC */ - PVOID AweInfo; /* 1E0 */ - SE_AUDIT_PROCESS_CREATION_INFO SeAuditProcessCreationInfo; /* 1E4 */ - MMSUPPORT Vm; /* 1E8 */ - LIST_ENTRY MmProcessLinks; /* 230 */ - ULONG ModifiedPageCount; /* 238 */ - ULONG JobStatus; /* 23C */ +#else + PVOID ExceptionPort; +#endif + PHANDLE_TABLE ObjectTable; + EX_FAST_REF Token; + ULONG WorkingSetPage; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + EX_PUSH_LOCK AddressCreationLock; + PETHREAD RotateInProgress; +#else + KGUARDED_MUTEX AddressCreationLock; + KSPIN_LOCK HyperSpaceLock; +#endif + PETHREAD ForkInProgress; + ULONG HardwareTrigger; + MM_AVL_TABLE PhysicalVadroot; + PVOID CloneRoot; + ULONG NumberOfPrivatePages; + ULONG NumberOfLockedPages; + PVOID *Win32Process; + struct _EJOB *Job; + PVOID SectionObject; + PVOID SectionBaseAddress; + PEPROCESS_QUOTA_BLOCK QuotaBlock; + PPAGEFAULT_HISTORY WorkingSetWatch; + PVOID Win32WindowStation; + HANDLE InheritedFromUniqueProcessId; + PVOID LdtInformation; + PVOID VadFreeHint; + PVOID VdmObjects; + PVOID DeviceMap; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG AlpcPagedPoolQuotaCache; + PVOID EtwDataSource; + PVOID FreeTebHint; +#else + PVOID Spare0[3]; +#endif union { + HARDWARE_PTE_X86 PagedirectoryPte; + ULONGLONG Filler; + }; + ULONG Session; + CHAR ImageFileName[16]; + LIST_ENTRY JobLinks; + PVOID LockedPagesList; + LIST_ENTRY ThreadListHead; + PVOID SecurityPort; + PVOID PaeTop; + ULONG ActiveThreads; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG ImagePathHash; +#else + ACCESS_MASK GrantedAccess; +#endif + ULONG DefaultHardErrorProcessing; + NTSTATUS LastThreadExitStatus; + struct _PEB* Peb; + EX_FAST_REF PrefetchTrace; + LARGE_INTEGER ReadOperationCount; + LARGE_INTEGER WriteOperationCount; + LARGE_INTEGER OtherOperationCount; + LARGE_INTEGER ReadTransferCount; + LARGE_INTEGER WriteTransferCount; + LARGE_INTEGER OtherTransferCount; + ULONG CommitChargeLimit; + ULONG CommitChargePeak; + PVOID AweInfo; + SE_AUDIT_PROCESS_CREATION_INFO SeAuditProcessCreationInfo; + MMSUPPORT Vm; + LIST_ENTRY MmProcessLinks; + ULONG ModifiedPageCount; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + union + { struct { - ULONG CreateReported:1; - ULONG NoDebugInherit:1; - ULONG ProcessExiting:1; - ULONG ProcessDelete:1; - ULONG Wow64SplitPages:1; - ULONG VmDeleted:1; - ULONG OutswapEnabled:1; - ULONG Outswapped:1; - ULONG ForkFailed:1; - ULONG Wow64VaSpace4Gb:1; - ULONG AddressSpaceInitialized:2; - ULONG SetTimerResolution:1; - ULONG BreakOnTermination:1; - ULONG SessionCreationUnderway:1; - ULONG WriteWatch:1; - ULONG ProcessInSession:1; - ULONG OverrideAddressSpace:1; - ULONG HasAddressSpace:1; - ULONG LaunchPrefetched:1; - ULONG InjectInpageErrors:1; - ULONG VmTopDown:1; - ULONG ImageNotifyDone:1; - ULONG PdeUpdateNeeded:1; - ULONG VdmAllowed:1; - ULONG SmapAllowed:1; - ULONG CreateFailed:1; - ULONG DefaultIoPriority:3; - ULONG Spare1:1; - ULONG Spare2:1; + ULONG JobNotReallyActive:1; + ULONG AccountingFolded:1; + ULONG NewProcessReported:1; + ULONG ExitProcessReported:1; + ULONG ReportCommitChanges:1; + ULONG LastReportMemory:1; + ULONG ReportPhysicalPageChanges:1; + ULONG HandleTableRundown:1; + ULONG NeedsHandleRundown:1; + ULONG RefTraceEnabled:1; + ULONG NumaAware:1; + ULONG ProtectedProcess:1; + ULONG DefaultPagePriority:3; + ULONG ProcessDeleteSelf:1; + ULONG ProcessVerifierTarget:1; }; - ULONG Flags; /* 240 */ + ULONG Flags2; }; - - NTSTATUS ExitStatus; /* 244 */ - USHORT NextPageColor; /* 248 */ +#else + ULONG JobStatus; +#endif union { struct { - UCHAR SubSystemMinorVersion; /* 24A */ - UCHAR SubSystemMajorVersion; /* 24B */ + ULONG CreateReported:1; + ULONG NoDebugInherit:1; + ULONG ProcessExiting:1; + ULONG ProcessDelete:1; + ULONG Wow64SplitPages:1; + ULONG VmDeleted:1; + ULONG OutswapEnabled:1; + ULONG Outswapped:1; + ULONG ForkFailed:1; + ULONG Wow64VaSpace4Gb:1; + ULONG AddressSpaceInitialized:2; + ULONG SetTimerResolution:1; + ULONG BreakOnTermination:1; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG DeprioritizeViews:1; +#else + ULONG SessionCreationUnderway:1; +#endif + ULONG WriteWatch:1; + ULONG ProcessInSession:1; + ULONG OverrideAddressSpace:1; + ULONG HasAddressSpace:1; + ULONG LaunchPrefetched:1; + ULONG InjectInpageErrors:1; + ULONG VmTopDown:1; + ULONG ImageNotifyDone:1; + ULONG PdeUpdateNeeded:1; + ULONG VdmAllowed:1; + ULONG SmapAllowed:1; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG ProcessInserted:1; +#else + ULONG CreateFailed:1; +#endif + ULONG DefaultIoPriority:3; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG SparePsFlags1:2; +#else + ULONG Spare1:1; + ULONG Spare2:1; +#endif }; - USHORT SubSystemVersion; /* 24A */ + ULONG Flags; }; - UCHAR PriorityClass; /* 24C */ - MM_AVL_TABLE VadRoot; /* 250 */ - ULONG Cookie; /* 270 */ - -#ifdef _REACTOS_ - /* FIXME: WILL BE DEPRECATED WITH PUSHLOCK SUPPORT IN 0.3.0*/ - KEVENT LockEvent; /* 274 */ - ULONG LockCount; /* 284 */ - struct _KTHREAD *LockOwner; /* 288 */ - - /* FIXME: MOVE TO AVL TREES */ - MADDRESS_SPACE AddressSpace; /* 28C */ + NTSTATUS ExitStatus; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + USHORT Spare7; +#else + USHORT NextPageColor; #endif + union + { + struct + { + UCHAR SubSystemMinorVersion; + UCHAR SubSystemMajorVersion; + }; + USHORT SubSystemVersion; + }; + UCHAR PriorityClass; + MM_AVL_TABLE VadRoot; + ULONG Cookie; } EPROCESS; #include <poppack.h> @@ -925,7 +1295,14 @@ ULONG PeakProcessMemoryUsed; ULONG PeakJobMemoryUsed; ULONG CurrentJobMemoryUsed; +#if (NTDDI_VERSION == NTDDI_WINXP) + FAST_MUTEX MemoryLimitsLock; +#elif (NTDDI_VERSION == NTDDI_WS03) KGUARDED_MUTEX MemoryLimitsLock; +#elif (NTDDI_VERSION >= NTDDI_LONGHORN) + EX_PUSH_LOCK MemoryLimitsLock; +#endif + LIST_ENTRY JobSetLinks; ULONG MemberLevel; ULONG JobFlags; } EJOB, *PEJOB; @@ -934,30 +1311,94 @@ // // Win32K Callback Registration Data // -typedef struct _W32_CALLOUT_DATA +typedef struct _WIN32_POWEREVENT_PARAMETERS { - PW32_PROCESS_CALLBACK W32ProcessCallout; - PW32_THREAD_CALLBACK W32ThreadCallout; - PVOID UserGlobalAtomTableCallout; - PVOID UserPowerEventCallout; - PVOID UserPowerStateCallout; - PVOID UserJobCallout; - PVOID NtGdiUserFlushUserBatch; - OB_OPEN_METHOD DesktopOpen; - PVOID DesktopUnmap; - OB_DELETE_METHOD DesktopDelete; - OB_OKAYTOCLOSE_METHOD WinstaOkayToClose; - OB_DELETE_METHOD WinStaDelete; - OB_PARSE_METHOD WinStaParse; - OB_OPEN_METHOD WinStaOpen; -#ifdef _REACTOS_ - /* FIXME: REACTOS ONLY */ - OB_FIND_METHOD WinStaFind; - OB_OPEN_METHOD WinStaCreate; - OB_CREATE_METHOD DesktopCreate; -#endif -} W32_CALLOUT_DATA, *PW32_CALLOUT_DATA; + PSPOWEREVENTTYPE EventNumber; + ULONG Code; +} WIN32_POWEREVENT_PARAMETERS, *PWIN32_POWEREVENT_PARAMETERS; +typedef struct _WIN32_POWERSTATE_PARAMETERS +{ + UCHAR Promotion; + POWER_ACTION SystemAction; + SYSTEM_POWER_STATE MinSystemState; + ULONG Flags; + POWERSTATETASK PowerStateTask; +} WIN32_POWERSTATE_PARAMETERS, *PWIN32_POWERSTATE_PARAMETERS; + +typedef struct _WIN32_JOBCALLOUT_PARAMETERS +{ + PVOID Job; + PSW32JOBCALLOUTTYPE CalloutType; + PVOID Data; +} WIN32_JOBCALLOUT_PARAMETERS, *PWIN32_JOBCALLOUT_PARAMETERS; + +typedef struct _WIN32_OPENMETHOD_PARAMETERS +{ + OB_OPEN_REASON OpenReason; + PEPROCESS Process; + PVOID Object; + ULONG GrantedAccess; + ULONG HandleCount; +} WIN32_OPENMETHOD_PARAMETERS, *PWIN32_OPENMETHOD_PARAMETERS; + +typedef struct _WIN32_OKAYTOCLOSEMETHOD_PARAMETERS +{ + PEPROCESS Process; + PVOID Object; + HANDLE Handle; + KPROCESSOR_MODE PreviousMode; +} WIN32_OKAYTOCLOSEMETHOD_PARAMETERS, *PWIN32_OKAYTOCLOSEMETHOD_PARAMETERS; + +typedef struct _WIN32_CLOSEMETHOD_PARAMETERS +{ + PEPROCESS Process; + PVOID Object; + ACCESS_MASK AccessMask; + ULONG ProcessHandleCount; + ULONG SystemHandleCount; +} WIN32_CLOSEMETHOD_PARAMETERS, *PWIN32_CLOSEMETHOD_PARAMETERS; + +typedef struct _WIN32_DELETEMETHOD_PARAMETERS +{ + PVOID Object; +} WIN32_DELETEMETHOD_PARAMETERS, *PWIN32_DELETEMETHOD_PARAMETERS; + +typedef struct _WIN32_PARSEMETHOD_PARAMETERS +{ + PVOID ParseObject; + PVOID ObjectType; + PACCESS_STATE AccessState; + KPROCESSOR_MODE AccessMode; + ULONG Attributes; + OUT PUNICODE_STRING CompleteName; + PUNICODE_STRING RemainingName; + PVOID Context; + PSECURITY_QUALITY_OF_SERVICE SecurityQos; + PVOID *Object; +} WIN32_PARSEMETHOD_PARAMETERS, *PWIN32_PARSEMETHOD_PARAMETERS; + +typedef struct _WIN32_CALLOUTS_FPNS +{ + PKWIN32_PROCESS_CALLOUT ProcessCallout; + PKWIN32_THREAD_CALLOUT ThreadCallout; + PKWIN32_GLOBALATOMTABLE_CALLOUT GlobalAtomTableCallout; + PKWIN32_POWEREVENT_CALLOUT PowerEventCallout; + PKWIN32_POWERSTATE_CALLOUT PowerStateCallout; + PKWIN32_JOB_CALLOUT JobCallout; + PGDI_BATCHFLUSH_ROUTINE BatchFlushRoutine; + PKWIN32_OPENMETHOD_CALLOUT DesktopOpenProcedure; + PKWIN32_OKTOCLOSEMETHOD_CALLOUT DesktopOkToCloseProcedure; + PKWIN32_CLOSEMETHOD_CALLOUT DesktopCloseProcedure; + PKWIN32_DELETEMETHOD_CALLOUT DesktopDeleteProcedure; + PKWIN32_OKTOCLOSEMETHOD_CALLOUT WindowStationOkToCloseProcedure; + PKWIN32_CLOSEMETHOD_CALLOUT WindowStationCloseProcedure; + PKWIN32_DELETEMETHOD_CALLOUT WindowStationDeleteProcedure; + PKWIN32_PARSEMETHOD_CALLOUT WindowStationParseProcedure; + PKWIN32_OPENMETHOD_CALLOUT WindowStationOpenProcedure; + PKWIN32_WIN32DATACOLLECTION_CALLOUT Win32DataCollectionProcedure; +} WIN32_CALLOUTS_FPNS, *PWIN32_CALLOUTS_FPNS; + #endif // !NTOS_MODE_USER #endif // _PSTYPES_H Index: include/ndk/exfuncs.h =================================================================== --- include/ndk/exfuncs.h (revision 21759) +++ include/ndk/exfuncs.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -98,7 +98,6 @@ // // Native Calls // -NTSYSCALLAPI NTSTATUS NTAPI NtAddAtom( @@ -107,7 +106,6 @@ IN OUT PRTL_ATOM Atom ); -NTSYSCALLAPI NTSTATUS NTAPI NtCancelTimer( @@ -115,14 +113,12 @@ OUT PBOOLEAN CurrentState OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI NtClearEvent( IN HANDLE EventHandle ); -NTSYSCALLAPI NTSTATUS NTAPI NtCreateEvent( @@ -133,7 +129,6 @@ IN BOOLEAN InitialState ); -NTSYSCALLAPI NTSTATUS NTAPI NtCreateEventPair( @@ -142,7 +137,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSCALLAPI NTSTATUS NTAPI NtCreateMutant( @@ -152,7 +146,6 @@ IN BOOLEAN InitialOwner ); -NTSYSCALLAPI NTSTATUS NTAPI NtCreateSemaphore( @@ -163,7 +156,6 @@ IN LONG MaximumCount ); -NTSYSCALLAPI NTSTATUS NTAPI NtCreateTimer( @@ -173,21 +165,18 @@ IN TIMER_TYPE TimerType ); -NTSYSCALLAPI NTSTATUS NTAPI NtDeleteAtom( IN RTL_ATOM Atom ); -NTSYSCALLAPI NTSTATUS NTAPI NtDisplayString( IN PUNICODE_STRING DisplayString ); -NTSYSCALLAPI NTSTATUS NTAPI NtFindAtom( @@ -196,7 +185,6 @@ OUT PRTL_ATOM Atom OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI NtOpenEvent( @@ -205,16 +193,22 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSCALLAPI NTSTATUS NTAPI +NtOpenKeyedEvent( + OUT PHANDLE EventHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes +); + +NTSTATUS +NTAPI NtOpenEventPair( OUT PHANDLE EventPairHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSCALLAPI NTSTATUS NTAPI NtOpenMutant( @@ -223,7 +217,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSCALLAPI NTSTATUS NTAPI NtOpenSemaphore( @@ -232,7 +225,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSCALLAPI NTSTATUS NTAPI NtOpenTimer( @@ -241,7 +233,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSCALLAPI NTSTATUS NTAPI NtPulseEvent( @@ -249,7 +240,6 @@ IN PLONG PulseCount OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryDefaultLocale( @@ -257,14 +247,12 @@ OUT PLCID DefaultLocaleId ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryDefaultUILanguage( PLANGID LanguageId ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryEvent( @@ -275,7 +263,6 @@ OUT PULONG ReturnLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryInformationAtom( @@ -286,14 +273,12 @@ OUT PULONG ReturnLength OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryInstallUILanguage( PLANGID LanguageId ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryMutant( @@ -304,7 +289,6 @@ OUT PULONG ResultLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtQuerySemaphore( @@ -315,7 +299,6 @@ OUT PULONG ReturnLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtQuerySystemEnvironmentValue( @@ -325,7 +308,6 @@ PULONG ReturnLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtQuerySystemInformation( @@ -335,7 +317,6 @@ OUT PULONG ResultLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryTimer( @@ -346,7 +327,6 @@ OUT PULONG ResultLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtRaiseHardError( @@ -358,7 +338,6 @@ OUT PULONG Response ); -NTSYSCALLAPI NTSTATUS NTAPI NtReleaseMutant( @@ -366,16 +345,23 @@ IN PLONG ReleaseCount OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI +NtReleaseKeyedEvent( + IN HANDLE EventHandle, + IN PVOID Key, + IN BOOLEAN Alertable, + IN PLARGE_INTEGER Timeout OPTIONAL +); + +NTSTATUS +NTAPI NtReleaseSemaphore( IN HANDLE SemaphoreHandle, IN LONG ReleaseCount, OUT PLONG PreviousCount ); -NTSYSCALLAPI NTSTATUS NTAPI NtResetEvent( @@ -383,7 +369,6 @@ OUT PLONG NumberOfWaitingThreads OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetDefaultLocale( @@ -391,21 +376,18 @@ IN LCID DefaultLocaleId ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetDefaultUILanguage( LANGID LanguageId ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetDefaultHardErrorPort( IN HANDLE PortHandle ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetEvent( @@ -413,35 +395,36 @@ OUT PLONG PreviousState OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI +NtSetEventBoostPriority( + IN HANDLE EventHandle +); + +NTSTATUS +NTAPI NtSetHighEventPair( IN HANDLE EventPairHandle ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetHighWaitLowEventPair( IN HANDLE EventPairHandle ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetLowEventPair( HANDLE EventPair ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetLowWaitHighEventPair( HANDLE EventPair ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetSystemEnvironmentValue( @@ -449,7 +432,6 @@ IN PUNICODE_STRING Value ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetSystemInformation( @@ -458,7 +440,6 @@ IN ULONG SystemInformationLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetTimer( @@ -471,35 +452,39 @@ OUT PBOOLEAN PreviousState OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetUuidSeed( IN PUCHAR UuidSeed ); -NTSYSCALLAPI NTSTATUS NTAPI NtShutdownSystem( IN SHUTDOWN_ACTION Action ); -NTSYSCALLAPI NTSTATUS NTAPI +NtWaitForKeyedEvent( + IN HANDLE EventHandle, + IN PVOID Key, + IN BOOLEAN Alertable, + IN PLARGE_INTEGER Timeout OPTIONAL +); + +NTSTATUS +NTAPI NtWaitHighEventPair( IN HANDLE EventPairHandle ); -NTSYSCALLAPI NTSTATUS NTAPI NtWaitLowEventPair( IN HANDLE EventPairHandle ); -NTSYSCALLAPI NTSTATUS NTAPI NtTraceEvent( @@ -509,7 +494,6 @@ IN PEVENT_TRACE_HEADER TraceHeader ); -NTSYSAPI NTSTATUS NTAPI ZwAddAtom( @@ -519,7 +503,6 @@ ); #ifdef NTOS_MODE_USER -NTSYSAPI NTSTATUS NTAPI ZwCancelTimer( @@ -528,7 +511,6 @@ ); #endif -NTSYSAPI NTSTATUS NTAPI ZwClearEvent( @@ -536,7 +518,6 @@ ); NTSYSAPI -NTSYSAPI NTSTATUS NTAPI ZwCreateEvent( @@ -547,7 +528,6 @@ IN BOOLEAN InitialState ); -NTSYSAPI NTSTATUS NTAPI ZwCreateEventPair( @@ -556,7 +536,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSAPI NTSTATUS NTAPI ZwCreateMutant( @@ -566,7 +545,6 @@ IN BOOLEAN InitialOwner ); -NTSYSAPI NTSTATUS NTAPI ZwCreateSemaphore( @@ -578,7 +556,6 @@ ); #ifdef NTOS_MODE_USER -NTSYSAPI NTSTATUS NTAPI ZwCreateTimer( @@ -589,21 +566,18 @@ ); #endif -NTSYSAPI NTSTATUS NTAPI ZwDeleteAtom( IN RTL_ATOM Atom ); -NTSYSAPI NTSTATUS NTAPI ZwDisplayString( IN PUNICODE_STRING DisplayString ); -NTSYSAPI NTSTATUS NTAPI ZwFindAtom( @@ -612,7 +586,6 @@ OUT PRTL_ATOM Atom OPTIONAL ); -NTSYSAPI NTSTATUS NTAPI ZwOpenEvent( @@ -621,7 +594,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSAPI NTSTATUS NTAPI ZwOpenEventPair( @@ -630,7 +602,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSAPI NTSTATUS NTAPI ZwOpenMutant( @@ -639,7 +610,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSAPI NTSTATUS NTAPI ZwOpenSemaphore( @@ -649,7 +619,6 @@ ); #ifdef NTOS_MODE_USER -NTSYSAPI NTSTATUS NTAPI ZwOpenTimer( @@ -659,7 +628,6 @@ ); #endif -NTSYSAPI NTSTATUS NTAPI ZwPulseEvent( @@ -667,7 +635,6 @@ IN PLONG PulseCount OPTIONAL ); -NTSYSAPI NTSTATUS NTAPI ZwQueryDefaultLocale( @@ -675,14 +642,12 @@ OUT PLCID DefaultLocaleId ); -NTSYSAPI NTSTATUS NTAPI ZwQueryDefaultUILanguage( PLANGID LanguageId ); -NTSYSAPI NTSTATUS NTAPI ZwQueryEvent( @@ -693,7 +658,6 @@ OUT PULONG ReturnLength ); -NTSYSAPI NTSTATUS NTAPI ZwQueryInformationAtom( @@ -704,14 +668,12 @@ OUT PULONG ReturnLength OPTIONAL ); -NTSYSAPI NTSTATUS NTAPI ZwQueryInstallUILanguage( PLANGID LanguageId ); -NTSYSAPI NTSTATUS NTAPI ZwQueryMutant( @@ -722,7 +684,6 @@ OUT PULONG ResultLength ); -NTSYSAPI NTSTATUS NTAPI ZwQuerySemaphore( @@ -733,7 +694,6 @@ OUT PULONG ReturnLength ); -NTSYSAPI NTSTATUS NTAPI ZwQuerySystemEnvironmentValue( @@ -743,7 +703,6 @@ PULONG ReturnLength ); -NTSYSAPI NTSTATUS NTAPI ZwQuerySystemInformation( @@ -753,7 +712,6 @@ OUT PULONG ResultLength ); -NTSYSAPI NTSTATUS NTAPI ZwQueryTimer( @@ -764,7 +722,6 @@ OUT PULONG ResultLength ); -NTSYSAPI NTSTATUS NTAPI ZwRaiseHardError( @@ -776,7 +733,6 @@ OUT PULONG Response ); -NTSYSAPI NTSTATUS NTAPI ZwReleaseMutant( @@ -784,7 +740,6 @@ IN PLONG ReleaseCount OPTIONAL ); -NTSYSAPI NTSTATUS NTAPI ZwReleaseSemaphore( @@ -793,7 +748,6 @@ OUT PLONG PreviousCount ); -NTSYSAPI NTSTATUS NTAPI ZwResetEvent( @@ -801,7 +755,6 @@ OUT PLONG NumberOfWaitingThreads OPTIONAL ); -NTSYSAPI NTSTATUS NTAPI ZwSetDefaultLocale( @@ -809,14 +762,12 @@ IN LCID DefaultLocaleId ); -NTSYSAPI NTSTATUS NTAPI ZwSetDefaultUILanguage( LANGID LanguageId ); -NTSYSAPI NTSTATUS NTAPI ZwSetDefaultHardErrorPort( @@ -831,35 +782,30 @@ OUT PLONG PreviousState OPTIONAL ); -NTSYSAPI NTSTATUS NTAPI ZwSetHighEventPair( IN HANDLE EventPairHandle ); -NTSYSAPI NTSTATUS NTAPI ZwSetHighWaitLowEventPair( IN HANDLE EventPairHandle ); -NTSYSAPI NTSTATUS NTAPI ZwSetLowEventPair( HANDLE EventPair ); -NTSYSAPI NTSTATUS NTAPI ZwSetLowWaitHighEventPair( HANDLE EventPair ); -NTSYSAPI NTSTATUS NTAPI ZwSetSystemEnvironmentValue( @@ -867,7 +813,6 @@ IN PUNICODE_STRING Value ); -NTSYSAPI NTSTATUS NTAPI ZwSetSystemInformation( @@ -877,7 +822,6 @@ ); #ifdef NTOS_MODE_USER -NTSYSAPI NTSTATUS NTAPI ZwSetTimer( @@ -891,35 +835,30 @@ ); #endif -NTSYSAPI NTSTATUS NTAPI ZwSetUuidSeed( IN PUCHAR UuidSeed ); -NTSYSAPI NTSTATUS NTAPI ZwShutdownSystem( IN SHUTDOWN_ACTION Action ); -NTSYSAPI NTSTATUS NTAPI ZwWaitHighEventPair( IN HANDLE EventPairHandle ); -NTSYSAPI NTSTATUS NTAPI ZwWaitLowEventPair( IN HANDLE EventPairHandle ); -NTSYSAPI NTSTATUS NTAPI ZwTraceEvent( Index: include/ndk/lpcfuncs.h =================================================================== --- include/ndk/lpcfuncs.h (revision 21759) +++ include/ndk/lpcfuncs.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ Index: include/ndk/kdtypes.h =================================================================== --- include/ndk/kdtypes.h (revision 21759) +++ include/ndk/kdtypes.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -47,6 +47,7 @@ // // DebugService Control Types // +#define BREAKPOINT_BREAK 0 #define BREAKPOINT_PRINT 1 #define BREAKPOINT_PROMPT 2 #define BREAKPOINT_LOAD_SYMBOLS 3 @@ -55,25 +56,109 @@ // // Debug Control Codes for NtSystemDebugcontrol // -typedef enum _DEBUG_CONTROL_CODE +typedef enum _SYSDBG_COMMAND { - DebugGetTraceInformation = 1, - DebugSetInternalBreakpoint, - DebugSetSpecialCall, - DebugClearSpecialCalls, - DebugQuerySpecialCalls, - DebugDbgBreakPoint, - DebugDbgLoadSymbols -} DEBUG_CONTROL_CODE; + SysDbgQueryModuleInformation = 0, + SysDbgQueryTraceInformation = 1, + SysDbgSetTracepoint = 2, + SysDbgSetSpecialCall = 3, + SysDbgClearSpecialCalls = 4, + SysDbgQuerySpecialCalls = 5, + SysDbgBreakPoint = 6, + SysDbgQueryVersion = 7, + SysDbgReadVirtual = 8, + SysDbgWriteVirtual = 9, + SysDbgReadPhysical = 10, + SysDbgWritePhysical = 11, + SysDbgReadControlSpace = 12, + SysDbgWriteControlSpace = 13, + SysDbgReadIoSpace = 14, + SysDbgWriteIoSpace = 15, + SysDbgReadMsr = 16, + SysDbgWriteMsr = 17, + SysDbgReadBusData = 18, + SysDbgWriteBusData = 19, + SysDbgCheckLowMemory = 20, + SysDbgEnableKernelDebugger = 21, + SysDbgDisableKernelDebugger = 22, + SysDbgGetAutoKdEnable = 23, + SysDbgSetAutoKdEnable = 24, + SysDbgGetPrintBufferSize = 25, + SysDbgSetPrintBufferSize = 26, + SysDbgGetKdUmExceptionEnable = 27, + SysDbgSetKdUmExceptionEnable = 28, + SysDbgGetTriageDump = 29, + SysDbgGetKdBlockEnable = 30, + SysDbgSetKdBlockEnable = 31, + SysDbgRegisterForUmBreakInfo = 32, + SysDbgGetUmBreakPid = 33, + SysDbgClearUmBreakPid = 34, + SysDbgGetUmAttachPid = 35, + SysDbgClearUmAttachPid = 36, +} SYSDBG_COMMAND; // -// Kernel Debugger Port Definition +// System Debugger Types // -typedef struct _KD_PORT_INFORMATION +typedef struct _SYSDBG_PHYSICAL { - ULONG ComPort; - ULONG BaudRate; - ULONG BaseAddress; -} KD_PORT_INFORMATION, *PKD_PORT_INFORMATION; + PHYSICAL_ADDRESS Address; + PVOID Buffer; + ULONG Request; +} SYSDBG_PHYSICAL, *PSYSDBG_PHYSICAL; +typedef struct _SYSDBG_VIRTUAL +{ + PVOID Address; + PVOID Buffer; + ULONG Request; +} SYSDBG_VIRTUAL, *PSYSDBG_VIRTUAL; + +typedef struct _SYSDBG_CONTROL_SPACE +{ + ULONGLONG Address; + PVOID Buffer; + ULONG Request; + ULONG Processor; +} SYSDBG_CONTROL_SPACE, *PSYSDBG_CONTROL_SPACE; + +typedef struct _SYSDBG_IO_SPACE +{ + ULONGLONG Address; + PVOID Buffer; + ULONG Request; + INTERFACE_TYPE InterfaceType; + ULONG BusNumber; + ULONG AddressSpace; +} SYSDBG_IO_SPACE, *PSYSDBG_IO_SPACE; + +typedef struct _SYSDBG_BUS_DATA +{ + ULONG Address; + PVOID Buffer; + ULONG Request; + BUS_DATA_TYPE BusDataType; + ULONG BusNumber; + ULONG SlotNumber; +} SYSDBG_BUS_DATA, *PSYSDBG_BUS_DATA; + +typedef struct _SYSDBG_MSR +{ + ULONG Address; + ULONGLONG Data; +} SYSDBG_MSR, *PSYSDBG_MSR; + +typedef struct _SYSDBG_TRIAGE_DUMP +{ + ULONG Flags; + ULONG BugCheckCode; + ULONG_PTR BugCheckParam1; + ULONG_PTR BugCheckParam2; + ULONG_PTR BugCheckParam3; + ULONG_PTR BugCheckParam4; + ULONG ProcessHandles; + ULONG ThreadHandles; + PHANDLE Handles; +} SYSDBG_TRIAGE_DUMP, *PSYSDBG_TRIAGE_DUMP; + #endif // _KDTYPES_H Index: include/ndk/obtypes.h =================================================================== --- include/ndk/obtypes.h (revision 21759) +++ include/ndk/obtypes.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -49,6 +49,11 @@ } // +// Number of custom-defined bits that can be attached to a handle +// +#define OBJ_HANDLE_TAGBITS 0x3 + +// // Directory Object Access Rights // #define DIRECTORY_QUERY 0x0001 @@ -57,6 +62,11 @@ #define DIRECTORY_CREATE_SUBDIRECTORY 0x0008 #define DIRECTORY_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0xF) +// +// Slash separator used in the OB Namespace (and Registry) +// +#define OBJ_NAME_PATH_SEPARATOR L'\\' + #else // @@ -127,7 +137,6 @@ } OB_DUMP_CONTROL, *POB_DUMP_CONTROL; #ifndef NTOS_MODE_USER -#ifndef _REACTOS_ // // Object Type Callbacks @@ -204,87 +213,6 @@ #else // -// FIXME: ReactOS ONLY Object Callbacks -// -typedef NTSTATUS -(NTAPI *OB_OPEN_METHOD)( - OB_OPEN_REASON Reason, - PVOID ObjectBody, - PEPROCESS Process, - ULONG HandleCount, - ACCESS_MASK GrantedAccess -); - -typedef NTSTATUS -(NTAPI *OB_PARSE_METHOD)( - PVOID Object, - PVOID *NextObject, - PUNICODE_STRING FullPath, - PWSTR *Path, - ULONG Attributes -); - -typedef VOID -(NTAPI *OB_DELETE_METHOD)( - PVOID DeletedObject -); - -typedef VOID -(NTAPI *OB_CLOSE_METHOD)( - PVOID ClosedObject, - ULONG HandleCount -); - -typedef VOID -(NTAPI *OB_DUMP_METHOD)( - VOID -); - -typedef NTSTATUS -(NTAPI *OB_OKAYTOCLOSE_METHOD)( - VOID -); - -typedef NTSTATUS -(NTAPI *OB_QUERYNAME_METHOD)( - PVOID ObjectBody, - POBJECT_NAME_INFORMATION ObjectNameInfo, - ULONG Length, - PULONG ReturnLength -); - -typedef PVOID -(NTAPI *OB_FIND_METHOD)( - PVOID WinStaObject, - PWSTR Name, - ULONG Attributes -); - -typedef NTSTATUS -(NTAPI *OB_SECURITY_METHOD)( - PVOID Object, - SECURITY_OPERATION_CODE OperationType, - SECURITY_INFORMATION SecurityInformation, - PSECURITY_DESCRIPTOR NewSecurityDescriptor, - PULONG ReturnLength, - PSECURITY_DESCRIPTOR *OldSecurityDescriptor, - POOL_TYPE PoolType, - PGENERIC_MAPPING GenericMapping -); - -typedef NTSTATUS -(NTAPI *OB_CREATE_METHOD)( - PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - struct _OBJECT_ATTRIBUTES* ObjectAttributes -); - -#endif - -#else - -// // Object Information Types for NtQueryInformationObject // typedef struct _OBJECT_NAME_INFORMATION @@ -429,9 +357,6 @@ // typedef struct _OBJECT_HEADER { -#ifdef _REACTOS_ - LIST_ENTRY Entry; // FIXME: REACTOS ONLY -#endif LONG PointerCount; union { Index: include/ndk/rtltypes.h =================================================================== --- include/ndk/rtltypes.h (revision 21759) +++ include/ndk/rtltypes.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -42,6 +42,9 @@ #define RTL_USER_PROCESS_PARAMETERS_DISABLE_HEAP_CHECKS 0x100 #define RTL_USER_PROCESS_PARAMETERS_PROCESS_OR_1 0x200 #define RTL_USER_PROCESS_PARAMETERS_PROCESS_OR_2 0x400 +#define RTL_USER_PROCESS_PARAMETERS_PRIVATE_DLL_PATH 0x1000 +#define RTL_USER_PROCESS_PARAMETERS_LOCAL_DLL_PATH 0x2000 +#define RTL_USER_PROCESS_PARAMETERS_NX 0x20000 // // Exception Flags @@ -50,6 +53,7 @@ #define EXCEPTION_UNWINDING 0x02 #define EXCEPTION_EXIT_UNWIND 0x04 #define EXCEPTION_STACK_INVALID 0x08 +#define EXCEPTION_UNWIND (EXCEPTION_UNWINDING + EXCEPTION_EXIT_UNWIND) #define EXCEPTION_NESTED_CALL 0x10 #define EXCEPTION_TARGET_UNWIND 0x20 #define EXCEPTION_COLLIDED_UNWIND 0x20 @@ -64,6 +68,26 @@ #define RTL_RANGE_CONFLICT 0x02 // +// Activation Context Frame Flags +// +#define RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_FORMAT_WHISTLER \ + 0x1 + +// +// Heap Flags +// +#define HEAP_CLASS_0 0x00000000 +#define HEAP_CLASS_1 0x00001000 +#define HEAP_CLASS_2 0x00002000 +#define HEAP_CLASS_3 0x00003000 +#define HEAP_CLASS_4 0x00004000 +#define HEAP_CLASS_5 0x00005000 +#define HEAP_CLASS_6 0x00006000 +#define HEAP_CLASS_7 0x00007000 +#define HEAP_CLASS_8 0x00008000 +#define HEAP_CLASS_MASK 0x0000F000 + +// // Registry Keys // #define RTL_REGISTRY_ABSOLUTE 0 @@ -120,6 +144,12 @@ #define RTL_CRITSECT_TYPE 0 #define RTL_RESOURCE_TYPE 1 +// +// RtlAcquirePrivileges Flags +// +#define RTL_ACQUIRE_PRIVILEGE_IMPERSONATE 1 +#define RTL_ACQUIRE_PRIVILEGE_PROCESS 2 + #ifdef NTOS_MODE_USER // @@ -141,6 +171,12 @@ #define NLS_MB_CODE_PAGE_TAG NlsMbCodePageTag #define NLS_MB_OEM_CODE_PAGE_TAG NlsMbOemCodePageTag #define NLS_OEM_LEAD_BYTE_INFO NlsOemLeadByteInfo +#else +// +// Message Resource Flag +// +#define MESSAGE_RESOURCE_UNICODE 0x0001 + #endif #define MAXIMUM_LEADBYTES 12 @@ -165,6 +201,14 @@ #define RTL_ATOM_IS_PINNED 0x1 // +// Critical section lock bits +// +#define CS_LOCK_BIT 0x1 +#define CS_LOCK_BIT_V 0x0 +#define CS_LOCK_WAITER_WOKEN 0x2 +#define CS_LOCK_WAITER_INC 0x4 + +// // Codepage Tags // #ifdef NTOS_MODE_USER @@ -221,14 +265,14 @@ // typedef enum _RTL_PATH_TYPE { - INVALID_PATH = 0, - UNC_PATH, // "//foo" - ABSOLUTE_DRIVE_PATH, // "c:/foo" - RELATIVE_DRIVE_PATH, // "c:foo" - ABSOLUTE_PATH, // "/foo" - RELATIVE_PATH, // "foo" - DEVICE_PATH, // "//./foo" - UNC_DOT_PATH // "//." + RtlPathTypeUnknown, + RtlPathTypeUncAbsolute, + RtlPathTypeDriveAbsolute, + RtlPathTypeDriveRelative, + RtlPathTypeRooted, + RtlPathTypeRelative, + RtlPathTypeLocalDevice, + RtlPathTypeRootLocalDevice, } RTL_PATH_TYPE; #ifndef NTOS_MODE_USER @@ -263,6 +307,30 @@ IN OUT PVOID DispatcherContext ); +// +// RTL Library Allocation/Free Routines +// +typedef PVOID +(NTAPI *PRTL_ALLOCATE_STRING_ROUTINE)( + SIZE_T NumberOfBytes +); + +typedef PVOID +(NTAPI *PRTL_REALLOCATE_STRING_ROUTINE)( + SIZE_T NumberOfBytes, + PVOID Buffer +); + +typedef +VOID +(NTAPI *PRTL_FREE_STRING_ROUTINE)( + PVOID Buffer +); + +extern const PRTL_ALLOCATE_STRING_ROUTINE RtlAllocateStringRoutine; +extern const PRTL_FREE_STRING_ROUTINE RtlFreeStringRoutine; +extern const PRTL_REALLOCATE_STRING_ROUTINE RtlReallocateStringRoutine; + #endif // @@ -538,7 +606,39 @@ CSHORT Weekday; } TIME_FIELDS, *PTIME_FIELDS; +// +// Activation Context +// +typedef PVOID PACTIVATION_CONTEXT; + +// +// Activation Context Frame +// +typedef struct _RTL_ACTIVATION_CONTEXT_STACK_FRAME +{ + struct __RTL_ACTIVATION_CONTEXT_STACK_FRAME *Previous; + PACTIVATION_CONTEXT ActivationContext; + ULONG Flags; +} RTL_ACTIVATION_CONTEXT_STACK_FRAME, + *PRTL_ACTIVATION_CONTEXT_STACK_FRAME; + +typedef struct _RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED +{ + ULONG Size; + ULONG Format; + RTL_ACTIVATION_CONTEXT_STACK_FRAME Frame; + PVOID Extra1; + PVOID Extra2; + PVOID Extra3; + PVOID Extra4; +} RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED, + *PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED; + #endif + +// +// ACE Structure +// typedef struct _ACE { ACE_HEADER Header; @@ -550,42 +650,54 @@ // typedef struct _RTL_PROCESS_MODULE_INFORMATION { - ULONG Reserved[2]; - PVOID Base; - ULONG Size; + ULONG Section; + PVOID MappedBase; + PVOID ImageBase; + ULONG ImageSize; ULONG Flags; - USHORT Index; - USHORT Unknown; + USHORT LoadOrderIndex; + USHORT InitOrderIndex; USHORT LoadCount; - USHORT ModuleNameOffset; - CHAR ImageName[256]; + USHORT OffsetToFileName; + CHAR FullPathName[256]; } RTL_PROCESS_MODULE_INFORMATION, *PRTL_PROCESS_MODULE_INFORMATION; typedef struct _RTL_PROCESS_MODULES { - ULONG ModuleCount; - RTL_PROCESS_MODULE_INFORMATION ModuleEntry[1]; + ULONG NumberOfModules; + RTL_PROCESS_MODULE_INFORMATION Modules[1]; } RTL_PROCESS_MODULES, *PRTL_PROCESS_MODULES; -typedef struct _RTL_PROCESS_HEAP_INFORMATION +typedef struct _RTL_PROCESS_MODULE_INFORMATION_EX { - PVOID Base; + ULONG NextOffset; + RTL_PROCESS_MODULE_INFORMATION BaseInfo; + ULONG ImageCheckSum; + ULONG TimeDateStamp; + PVOID DefaultBase; +} RTL_PROCESS_MODULE_INFORMATION_EX, *PRTL_PROCESS_MODULE_INFORMATION_EX; + +typedef struct _RTL_HEAP_INFORMATION +{ + PVOID BaseAddress; ULONG Flags; - USHORT Granularity; - USHORT Unknown; - ULONG Allocated; - ULONG Committed; - ULONG TagCount; - ULONG BlockCount; - ULONG Reserved[7]; + USHORT EntryOverhead; + USHORT CreatorBackTraceIndex; + ULONG BytesAllocated; + ULONG BytesCommitted; + ULONG NumberOfTags; + ULONG NumberOfEntries; + ULONG NumberOfPseudoTags; + ULONG PseudoTagGranularity; + ULONG Reserved[4]; PVOID Tags; - PVOID Blocks; -} RTL_PROCESS_HEAP_INFORMATION, *PRTL_PROCESS_HEAP_INFORMATION; + PVOID Entries; +} RTL_HEAP_INFORMATION, *PRTL_HEAP_INFORMATION; typedef struct _RTL_PROCESS_HEAPS { - ULONG HeapCount; - RTL_PROCESS_HEAP_INFORMATION HeapEntry[1]; + ULONG NumberOfHeaps; + RTL_HEAP_INFORMATION Heaps[1]; } RTL_PROCESS_HEAPS, *PRTL_PROCESS_HEAPS; typedef struct _RTL_PROCESS_LOCK_INFORMATION @@ -604,8 +716,8 @@ typedef struct _RTL_PROCESS_LOCKS { - ULONG LockCount; - RTL_PROCESS_LOCK_INFORMATION LockEntry[1]; + ULONG NumberOfLocks; + RTL_PROCESS_LOCK_INFORMATION Locks[1]; } RTL_PROCESS_LOCKS, *PRTL_PROCESS_LOCKS; typedef struct _RTL_PROCESS_BACKTRACE_INFORMATION @@ -626,27 +738,61 @@ RTL_PROCESS_BACKTRACE_INFORMATION BackTraces[1]; } RTL_PROCESS_BACKTRACES, *PRTL_PROCESS_BACKTRACES; -typedef struct _RTL_DEBUG_BUFFER +typedef struct _RTL_PROCESS_VERIFIER_OPTIONS { - HANDLE SectionHandle; - PVOID SectionBase; - PVOID RemoteSectionBase; - ULONG SectionBaseDelta; - HANDLE EventPairHandle; - ULONG Unknown[2]; - HANDLE RemoteThreadHandle; - ULONG InfoClassMask; - ULONG SizeOfInfo; - ULONG AllocatedSize; - ULONG SectionSize; - PRTL_PROCESS_MODULES ModuleInformation; - PRTL_PROCESS_BACKTRACES BackTraceInformation; - PRTL_PROCESS_HEAPS HeapInformation; - PRTL_PROCESS_LOCKS LockInformation; - PVOID Reserved[8]; -} RTL_DEBUG_BUFFER, *PRTL_DEBUG_BUFFER; + ULONG SizeStruct; + ULONG Option; + UCHAR OptionData[1]; + // + // Option array continues below + // +} RTL_PROCESS_VERIFIER_OPTIONS, *PRTL_PROCESS_VERIFIER_OPTIONS; +typedef struct _RTL_DEBUG_INFORMATION +{ + HANDLE SectionHandleClient; + PVOID ViewBaseClient; + PVOID ViewBaseTarget; + ULONG ViewBaseDelta; + HANDLE EventPairClient; + PVOID EventPairTarget; + HANDLE TargetProcessId; + HANDLE TargetThreadHandle; + ULONG Flags; + ULONG OffsetFree; + ULONG CommitSize; + ULONG ViewSize; + union + { + PRTL_PROCESS_MODULES Modules; + PRTL_PROCESS_MODULE_INFORMATION_EX ModulesEx; + }; + PRTL_PROCESS_BACKTRACES BackTraces; + PRTL_PROCESS_HEAPS Heaps; + PRTL_PROCESS_LOCKS Locks; + HANDLE SpecificHeap; + HANDLE TargetProcessHandle; + RTL_PROCESS_VERIFIER_OPTIONS VerifierOptions; + HANDLE ProcessHeap; + HANDLE CriticalSectionHandle; + HANDLE CriticalSectionOwnerThread; + PVOID Reserved[4]; +} RTL_DEBUG_INFORMATION, *PRTL_DEBUG_INFORMATION; + // +// Unload Event Trace Structure for RtlGetUnloadEventTrace +// +typedef struct _RTL_UNLOAD_EVENT_TRACE +{ + PVOID BaseAddress; + ULONG SizeOfImage; + ULONG Sequence; + ULONG TimeDateStamp; + ULONG CheckSum; + WCHAR ImageName[32]; +} RTL_UNLOAD_EVENT_TRACE, *PRTL_UNLOAD_EVENT_TRACE; + +// // RTL Handle Structures // typedef struct _RTL_HANDLE_TABLE_ENTRY @@ -692,6 +838,19 @@ UNICODE_STRING DosPath; } RTL_DRIVE_LETTER_CURDIR, *PRTL_DRIVE_LETTER_CURDIR; +// +// Private State structure for RtlAcquirePrivilege/RtlReleasePrivilege +// +typedef struct _RTL_ACQUIRE_STATE +{ + HANDLE Token; + HANDLE OldImpersonationToken; + PTOKEN_PRIVILEGES OldPrivileges; + PTOKEN_PRIVILEGES NewPrivileges; + ULONG Flags; + UCHAR OldPrivBuffer[1024]; +} RTL_ACQUIRE_STATE, *PRTL_ACQUIRE_STATE; + #ifndef NTOS_MODE_USER // @@ -718,7 +877,7 @@ ULONG_PTR SpinCount; } RTL_CRITICAL_SECTION, *PRTL_CRITICAL_SECTION; -#else +#endif // // RTL Range List Structures @@ -749,8 +908,6 @@ ULONG Stamp; } RTL_RANGE_LIST_ITERATOR, *PRTL_RANGE_LIST_ITERATOR; -#endif - // // RTL Resource // @@ -902,6 +1059,24 @@ #endif // +// Hotpatch Header +// +typedef struct _RTL_PATCH_HEADER +{ + LIST_ENTRY PatchList; + PVOID PatchImageBase; + struct _RTL_PATCH_HEADER *NextPath; + ULONG PatchFlags; + LONG PatchRefCount; + struct _HOTPATCH_HEADER *HotpatchHeader; + UNICODE_STRING TargetDllName; + PVOID TargetDllBase; + PLDR_DATA_TABLE_ENTRY TargetLdrDataTableEntry; + PLDR_DATA_TABLE_ENTRY PatchLdrDataTableEntry; + struct _SYSTEM_HOTPATCH_CODE_INFORMATION *CodeInfo; +} RTL_PATCH_HEADER, *PRTL_PATCH_HEADER; + +// // Header for NLS Files // typedef struct _NLS_FILE_HEADER @@ -917,4 +1092,47 @@ UCHAR LeadByte[MAXIMUM_LEADBYTES]; } NLS_FILE_HEADER, *PNLS_FILE_HEADER; +// +// Stack Traces +// +typedef struct _RTL_STACK_TRACE_ENTRY +{ + struct _RTL_STACK_TRACE_ENTRY *HashChain; + ULONG TraceCount; + USHORT Index; + USHORT Depth; + PVOID BackTrace[32]; +} RTL_STACK_TRACE_ENTRY, *PRTL_STACK_TRACE_ENTRY; + +typedef struct _STACK_TRACE_DATABASE +{ + RTL_CRITICAL_SECTION CriticalSection; +} STACK_TRACE_DATABASE, *PSTACK_TRACE_DATABASE; + +#ifndef NTOS_MODE_USER + +// +// Message Resource Entry, Block and Data +// +typedef struct _MESSAGE_RESOURCE_ENTRY +{ + USHORT Length; + USHORT Flags; + UCHAR Text[ANYSIZE_ARRAY]; +} MESSAGE_RESOURCE_ENTRY, *PMESSAGE_RESOURCE_ENTRY; + +typedef struct _MESSAGE_RESOURCE_BLOCK +{ + ULONG LowId; + ULONG HighId; + ULONG OffsetToEntries; +} MESSAGE_RESOURCE_BLOCK, *PMESSAGE_RESOURCE_BLOCK; + +typedef struct _MESSAGE_RESOURCE_DATA +{ + ULONG NumberOfBlocks; + MESSAGE_RESOURCE_BLOCK Blocks[ANYSIZE_ARRAY]; +} MESSAGE_RESOURCE_DATA, *PMESSAGE_RESOURCE_DATA; + #endif +#endif Index: include/ndk/inbvfuncs.h =================================================================== --- include/ndk/inbvfuncs.h (revision 21759) +++ include/ndk/inbvfuncs.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -54,7 +54,7 @@ VOID NTAPI InbvInstallDisplayStringFilter( - IN PVOID Unknown + IN PVOID DisplayFilter ); BOOLEAN Index: include/ndk/kefuncs.h =================================================================== --- include/ndk/kefuncs.h (revision 21759) +++ include/ndk/kefuncs.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -111,6 +111,20 @@ PKSPIN_LOCK SpinLock ); +KIRQL +FASTCALL +KeAcquireQueuedSpinLockRaiseToSynch( + IN KSPIN_LOCK_QUEUE_NUMBER LockNumber +); + +KIRQL +FASTCALL +KeAcquireInStackQueuedSpinLockRaiseToSynch( + IN PKSPIN_LOCK SpinLock, + IN PKLOCK_QUEUE_HANDLE LockHandle +); + + // // Interrupt Functions // @@ -172,9 +186,17 @@ VOID ); +BOOLEAN +NTAPI +KiIpiServiceRoutine( + IN PKTRAP_FRAME TrapFrame, + IN PVOID ExceptionFrame +); + // -// ARC Configuration Functions +// ARC Configuration Functions. Only enabled if you have ARC Support // +#ifdef _ARC_ PCONFIGURATION_COMPONENT_DATA NTAPI KeFindConfigurationNextEntry( @@ -193,6 +215,7 @@ IN CONFIGURATION_TYPE Type, IN PULONG ComponentKey OPTIONAL ); +#endif // // Low-level Hardware/CPU Control Functions @@ -200,12 +223,26 @@ VOID NTAPI KeFlushEntireTb( - IN BOOLEAN Unknown, - IN BOOLEAN CurrentCpuOnly + IN BOOLEAN Invalid, + IN BOOLEAN AllProcessors ); VOID NTAPI +KeUpdateSystemTime( + PKTRAP_FRAME TrapFrame, + KIRQL Irql +); + +VOID +NTAPI +KeUpdateRunTime( + PKTRAP_FRAME TrapFrame, + KIRQL Irql +); + +VOID +NTAPI KeSetDmaIoCoherency( IN ULONG Coherency ); @@ -230,6 +267,13 @@ IN ULONG MinIncrement ); +NTSTATUS +NTAPI +Ke386CallBios( + IN ULONG BiosCommand, + IN OUT PCONTEXT BiosArguments +); + // // Misc. Functions // @@ -254,7 +298,6 @@ // // Native Calls // -NTSYSCALLAPI NTSTATUS NTAPI NtContinue( @@ -262,7 +305,6 @@ IN BOOLEAN TestAlert ); -NTSYSCALLAPI NTSTATUS NTAPI NtCallbackReturn( @@ -271,7 +313,6 @@ NTSTATUS Status ); -NTSYSCALLAPI NTSTATUS NTAPI NtCreateProfile( @@ -286,7 +327,6 @@ IN KAFFINITY ProcessorMask ); -NTSYSCALLAPI NTSTATUS NTAPI NtDelayExecution( @@ -294,7 +334,6 @@ IN LARGE_INTEGER *Interval ); -NTSYSCALLAPI NTSTATUS NTAPI NtFlushInstructionCache( @@ -303,7 +342,6 @@ IN ULONG NumberOfBytesToFlush ); -NTSYSCALLAPI NTSTATUS NTAPI NtGetContextThread( @@ -311,14 +349,12 @@ OUT PCONTEXT Context ); -NTSYSCALLAPI ULONG NTAPI NtGetTickCount( VOID ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryIntervalProfile( @@ -326,7 +362,6 @@ OUT PULONG Interval ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryPerformanceCounter( @@ -334,14 +369,12 @@ IN PLARGE_INTEGER Frequency ); -NTSYSCALLAPI NTSTATUS NTAPI NtQuerySystemTime( OUT PLARGE_INTEGER CurrentTime ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryTimerResolution( @@ -350,7 +383,6 @@ OUT PULONG ActualResolution ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueueApcThread( @@ -361,7 +393,6 @@ PVOID SystemArgument2 ); -NTSYSCALLAPI NTSTATUS NTAPI NtRaiseException( @@ -370,7 +401,6 @@ IN BOOLEAN SearchFrames ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetContextThread( @@ -378,7 +408,6 @@ IN PCONTEXT Context ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetIntervalProfile( @@ -386,7 +415,6 @@ KPROFILE_SOURCE ClockSource ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetLdtEntries( @@ -396,7 +424,6 @@ LDT_ENTRY LdtEntry2 ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetSystemTime( @@ -404,7 +431,6 @@ IN PLARGE_INTEGER NewSystemTime OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetTimerResolution( @@ -413,28 +439,24 @@ OUT PULONG ActualResolution ); -NTSYSCALLAPI NTSTATUS NTAPI NtStartProfile( IN HANDLE ProfileHandle ); -NTSYSCALLAPI NTSTATUS NTAPI NtStopProfile( IN HANDLE ProfileHandle ); -NTSYSCALLAPI NTSTATUS NTAPI NtTestAlert( VOID ); -NTSYSCALLAPI NTSTATUS NTAPI NtVdmControl( @@ -442,25 +464,22 @@ PVOID ControlData ); -NTSYSCALLAPI NTSTATUS NTAPI NtW32Call( IN ULONG RoutineIndex, IN PVOID Argument, IN ULONG ArgumentLength, - OUT PVOID* Result, - OUT PULONG ResultLength + OUT PVOID* Result OPTIONAL, + OUT PULONG ResultLength OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI NtYieldExecution( VOID ); -NTSYSAPI NTSTATUS NTAPI ZwContinue( @@ -468,7 +487,6 @@ IN BOOLEAN TestAlert ); -NTSYSAPI NTSTATUS NTAPI ZwCallbackReturn( @@ -477,7 +495,6 @@ NTSTATUS Status ); -NTSYSAPI NTSTATUS NTAPI ZwCreateProfile( @@ -492,7 +509,6 @@ IN KAFFINITY ProcessorMask ); -NTSYSAPI NTSTATUS NTAPI ZwDelayExecution( @@ -500,7 +516,6 @@ IN LARGE_INTEGER *Interval ); -NTSYSAPI NTSTATUS NTAPI ZwFlushInstructionCache( @@ -509,7 +524,6 @@ IN ULONG NumberOfBytesToFlush ); -NTSYSAPI NTSTATUS NTAPI ZwGetContextThread( @@ -517,14 +531,12 @@ OUT PCONTEXT Context ); -NTSYSAPI ULONG NTAPI ZwGetTickCount( VOID ); -NTSYSAPI NTSTATUS NTAPI ZwQueryIntervalProfile( @@ -532,7 +544,6 @@ OUT PULONG Interval ); -NTSYSAPI NTSTATUS NTAPI ZwQueryPerformanceCounter( @@ -540,14 +551,12 @@ IN PLARGE_INTEGER Frequency ); -NTSYSAPI NTSTATUS NTAPI ZwQuerySystemTime( OUT PLARGE_INTEGER CurrentTime ); -NTSYSAPI NTSTATUS NTAPI ZwQueryTimerResolution( @@ -556,7 +565,6 @@ OUT PULONG ActualResolution ); -NTSYSAPI NTSTATUS NTAPI ZwQueueApcThread( @@ -567,7 +575,6 @@ PVOID SystemArgument2 ); -NTSYSAPI NTSTATUS NTAPI ZwRaiseException( @@ -576,7 +583,6 @@ IN BOOLEAN SearchFrames ); -NTSYSAPI NTSTATUS NTAPI ZwSetContextThread( @@ -584,7 +590,6 @@ IN PCONTEXT Context ); -NTSYSAPI NTSTATUS NTAPI ZwSetIntervalProfile( @@ -592,7 +597,6 @@ KPROFILE_SOURCE ClockSource ); -NTSYSAPI NTSTATUS NTAPI ZwSetLdtEntries( @@ -602,7 +606,6 @@ LDT_ENTRY LdtEntry2 ); -NTSYSAPI NTSTATUS NTAPI ZwSetSystemTime( @@ -610,7 +613,6 @@ IN PLARGE_INTEGER NewSystemTime OPTIONAL ); -NTSYSAPI NTSTATUS NTAPI ZwSetTimerResolution( @@ -619,28 +621,24 @@ OUT PULONG ActualResolution ); -NTSYSAPI NTSTATUS NTAPI ZwStartProfile( IN HANDLE ProfileHandle ); -NTSYSAPI NTSTATUS NTAPI ZwStopProfile( IN HANDLE ProfileHandle ); -NTSYSAPI NTSTATUS NTAPI ZwTestAlert( VOID ); -NTSYSAPI NTSTATUS NTAPI ZwVdmControl( @@ -648,7 +646,6 @@ PVOID ControlData ); -NTSYSAPI NTSTATUS NTAPI ZwW32Call( @@ -659,7 +656,6 @@ OUT PULONG ResultLength OPTIONAL ); -NTSYSAPI NTSTATUS NTAPI ZwYieldExecution( Index: include/ndk/cmfuncs.h =================================================================== --- include/ndk/cmfuncs.h (revision 21759) +++ include/ndk/cmfuncs.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -27,7 +27,6 @@ // // Native calls // -NTSYSCALLAPI NTSTATUS NTAPI NtCreateKey( @@ -40,14 +39,12 @@ IN PULONG Disposition OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI NtDeleteKey( IN HANDLE KeyHandle ); -NTSYSCALLAPI NTSTATUS NTAPI NtDeleteValueKey( @@ -55,7 +52,6 @@ IN PUNICODE_STRING ValueName ); -NTSYSCALLAPI NTSTATUS NTAPI NtEnumerateKey( @@ -67,7 +63,6 @@ OUT PULONG ResultLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtEnumerateValueKey( @@ -79,14 +74,12 @@ OUT PULONG ResultLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtFlushKey( IN HANDLE KeyHandle ); -NTSYSCALLAPI NTSTATUS NTAPI NtGetPlugPlayEvent( @@ -96,14 +89,12 @@ IN ULONG BufferSize ); -NTSYSCALLAPI NTSTATUS NTAPI NtInitializeRegistry( BOOLEAN SetUpBoot ); -NTSYSCALLAPI NTSTATUS NTAPI NtLoadKey( @@ -111,7 +102,6 @@ IN POBJECT_ATTRIBUTES FileObjectAttributes ); -NTSYSCALLAPI NTSTATUS NTAPI NtLoadKey2( @@ -120,7 +110,6 @@ IN ULONG Flags ); -NTSYSCALLAPI NTSTATUS NTAPI NtNotifyChangeKey( @@ -136,7 +125,6 @@ IN BOOLEAN WatchSubtree ); -NTSYSCALLAPI NTSTATUS NTAPI NtOpenKey( @@ -145,7 +133,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSCALLAPI NTSTATUS NTAPI NtPlugPlayControl( @@ -154,7 +141,6 @@ IN ULONG BufferSize ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryKey( @@ -165,7 +151,6 @@ OUT PULONG ResultLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryMultipleValueKey( @@ -177,7 +162,6 @@ OUT PULONG ReturnLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryValueKey( @@ -189,7 +173,6 @@ OUT PULONG ResultLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtReplaceKey( @@ -198,7 +181,6 @@ IN POBJECT_ATTRIBUTES ReplacedObjectAttributes ); -NTSYSCALLAPI NTSTATUS NTAPI NtRestoreKey( @@ -207,7 +189,6 @@ IN ULONG RestoreFlags ); -NTSYSCALLAPI NTSTATUS NTAPI NtSaveKey( @@ -215,7 +196,6 @@ IN HANDLE FileHandle ); -NTSYSCALLAPI NTSTATUS NTAPI NtSaveKeyEx( @@ -224,7 +204,6 @@ IN ULONG Flags ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetInformationKey( @@ -234,7 +213,6 @@ IN ULONG KeyInformationLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetValueKey( @@ -246,7 +224,6 @@ IN ULONG DataSize ); -NTSYSCALLAPI NTSTATUS NTAPI NtUnloadKey( @@ -254,7 +231,6 @@ ); #ifdef NTOS_MODE_USER -NTSYSAPI NTSTATUS NTAPI ZwCreateKey( @@ -267,14 +243,13 @@ IN PULONG Disposition OPTIONAL ); -NTSYSAPI + NTSTATUS NTAPI ZwDeleteKey( IN HANDLE KeyHandle ); -NTSYSAPI NTSTATUS NTAPI ZwDeleteValueKey( @@ -282,7 +257,6 @@ IN PUNICODE_STRING ValueName ); -NTSYSAPI NTSTATUS NTAPI ZwEnumerateKey( @@ -294,7 +268,6 @@ OUT PULONG ResultLength ); -NTSYSAPI NTSTATUS NTAPI ZwEnumerateValueKey( @@ -306,14 +279,12 @@ OUT PULONG ResultLength ); -NTSYSAPI NTSTATUS NTAPI ZwFlushKey( IN HANDLE KeyHandle ); -NTSYSAPI NTSTATUS NTAPI ZwGetPlugPlayEvent( @@ -323,14 +294,12 @@ IN ULONG BufferSize ); -NTSYSAPI NTSTATUS NTAPI ZwInitializeRegistry( BOOLEAN SetUpBoot ); -NTSYSAPI NTSTATUS NTAPI ZwLoadKey( @@ -338,7 +307,6 @@ IN POBJECT_ATTRIBUTES FileObjectAttributes ); -NTSYSAPI NTSTATUS NTAPI ZwLoadKey2( @@ -347,7 +315,6 @@ IN ULONG Flags ); -NTSYSAPI NTSTATUS NTAPI ZwNotifyChangeKey( @@ -363,7 +330,6 @@ IN BOOLEAN WatchSubtree ); -NTSYSAPI NTSTATUS NTAPI ZwOpenKey( @@ -372,7 +338,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSAPI NTSTATUS NTAPI ZwPlugPlayControl( @@ -381,7 +346,6 @@ IN ULONG BufferSize ); -NTSYSAPI NTSTATUS NTAPI ZwQueryKey( @@ -392,7 +356,6 @@ OUT PULONG ResultLength ); -NTSYSAPI NTSTATUS NTAPI ZwQueryMultipleValueKey( @@ -404,7 +367,6 @@ OUT PULONG ReturnLength ); -NTSYSAPI NTSTATUS NTAPI ZwQueryValueKey( @@ -416,7 +378,6 @@ OUT PULONG ResultLength ); -NTSYSAPI NTSTATUS NTAPI ZwReplaceKey( @@ -425,7 +386,6 @@ IN POBJECT_ATTRIBUTES ReplacedObjectAttributes ); -NTSYSAPI NTSTATUS NTAPI ZwRestoreKey( @@ -434,7 +394,6 @@ IN ULONG RestoreFlags ); -NTSYSAPI NTSTATUS NTAPI ZwSaveKey( @@ -442,7 +401,6 @@ IN HANDLE FileHandle ); -NTSYSAPI NTSTATUS NTAPI ZwSaveKeyEx( @@ -451,7 +409,6 @@ IN ULONG Flags ); -NTSYSAPI NTSTATUS NTAPI ZwSetInformationKey( @@ -461,7 +418,6 @@ IN ULONG KeyInformationLength ); -NTSYSAPI NTSTATUS NTAPI ZwSetValueKey( @@ -474,7 +430,6 @@ ); #endif -NTSYSAPI NTSTATUS NTAPI ZwUnloadKey( Index: include/ndk/extypes.h =================================================================== --- include/ndk/extypes.h (revision 21759) +++ include/ndk/extypes.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -196,9 +196,9 @@ SystemUnloadGdiDriverInformation, SystemTimeAdjustmentInformation, SystemSummaryMemoryInformation, - SystemNextEventIdInformation, - SystemEventIdsInformation, - SystemCrashDumpInformation, + SystemMirrorMemoryInformation, + SystemPerformanceTraceInformation, + SystemObsolete0, SystemExceptionInformation, SystemCrashDumpStateInformation, SystemKernelDebuggerInformation, @@ -220,7 +220,51 @@ SystemVerifierInformation, SystemAddVerifier, SystemSessionProcessesInformation, - SystemInformationClassMax + SystemLoadGdiDriverInSystemSpaceInformation, + SystemNumaProcessorMap, + SystemPrefetcherInformation, + SystemExtendedProcessInformation, + SystemRecommendedSharedDataAlignment, + SystemComPlusPackage, + SystemNumaAvailableMemory, + SystemProcessorPowerInformation, + SystemEmulationBasicInformation, + SystemEmulationProcessorInformation, + SystemExtendedHanfleInformation, + SystemLostDelayedWriteInformation, + SystemBigPoolInformation, + SystemSessionPoolTagInformation, + SystemSessionMappedViewInformation, + SystemHotpatchInformation, + SystemObjectSecurityMode, + SystemWatchDogTimerHandler, + SystemWatchDogTimerInformation, + SystemLogicalProcessorInformation, + SystemWo64SharedInformationObosolete, + SystemRegisterFirmwareTableInformationHandler, + SystemFirmwareTableInformation, + SystemModuleInformationEx, + SystemVerifierTriageInformation, + SystemSuperfetchInformation, + SystemMemoryListInformation, + SystemFileCacheInformationEx, + SystemThreadPriorityClientIdInformation, + SystemProcessorIdleCycleTimeInformation, + SystemVerifierCancellationInformation, + SystemProcessorPowerInformationEx, + SystemRefTraceInformation, + SystemSpecialPoolInformation, + SystemProcessIdInformation, + SystemErrorPortInformation, + SystemBootEnvironmentInformation, + SystemHypervisorInformation, + SystemVerifierInformationEx, + SystemTimeZoneInformation, + SystemImageFileExecutionOptionsInformation, + SystemCoverageInformation, + SystemPrefetchPathInformation, + SystemVerifierFaultsInformation, + MaxSystemInfoClass, } SYSTEM_INFORMATION_CLASS; // @@ -228,7 +272,8 @@ // typedef enum _MUTANT_INFORMATION_CLASS { - MutantBasicInformation + MutantBasicInformation, + MutantOwnerInformation } MUTANT_INFORMATION_CLASS; // @@ -264,9 +309,30 @@ EventBasicInformation } EVENT_INFORMATION_CLASS; -#ifndef NTOS_MODE_USER +#ifdef NTOS_MODE_USER // +// Firmware Table Actions for SystemFirmwareTableInformation +// +typedef enum _SYSTEM_FIRMWARE_TABLE_ACTION +{ + SystemFirmwareTable_Enumerate = 0, + SystemFirmwareTable_Get = 1, +} SYSTEM_FIRMWARE_TABLE_ACTION, *PSYSTEM_FIRMWARE_TABLE_ACTION; + +// +// Firmware Handler Callback +// +struct _SYSTEM_FIRMWARE_TABLE_INFORMATION; +typedef +NTSTATUS +(__cdecl *PFNFTH)( + IN struct _SYSTEM_FIRMWARE_TABLE_INFORMATION *FirmwareTableInformation +); + +#else + +// // Executive Work Queue Structures // typedef struct _EX_QUEUE_WORKER_INFO @@ -305,12 +371,10 @@ // typedef struct _EX_RUNDOWN_REF_CACHE_AWARE { - union - { - ULONG_PTR Count; - PVOID Ptr; - }; + PEX_RUNDOWN_REF RunRefs; PVOID PoolToFree; + ULONG RunRefSize; + ULONG Number; } EX_RUNDOWN_REF_CACHE_AWARE, *PEX_RUNDOWN_REF_CACHE_AWARE; // @@ -319,7 +383,7 @@ typedef struct _EX_RUNDOWN_WAIT_BLOCK { ULONG_PTR Count; - KEVENT RundownEvent; + KEVENT WakeEvent; } EX_RUNDOWN_WAIT_BLOCK, *PEX_RUNDOWN_WAIT_BLOCK; // @@ -382,18 +446,18 @@ } CALLBACK_OBJECT , *PCALLBACK_OBJECT; // -// Profile OBject +// Profile Object // typedef struct _EPROFILE { PEPROCESS Process; - PVOID ImageBase; - SIZE_T ImageSize; + PVOID RangeBase; + SIZE_T RangeSize; PVOID Buffer; ULONG BufferSize; ULONG BucketSize; - PKPROFILE KeProfile; - PVOID LockedBuffer; + PKPROFILE ProfileObject; + PVOID LockedBufferAddress; PMDL Mdl; ULONG Segment; KPROFILE_SOURCE ProfileSource; @@ -403,6 +467,24 @@ // // Handle Table Structures // +typedef struct _HANDLE_TRACE_DB_ENTRY +{ + CLIENT_ID ClientId; + HANDLE Handle; + ULONG Type; + PVOID StackTrace[16]; +} HANDLE_TRACE_DB_ENTRY, *PHANDLE_TRACE_DB_ENTRY; + +typedef struct _HANDLE_TRACE_DEBUG_INFO +{ + LONG RefCount; + ULONG TableSize; + ULONG BitMaskFlags; + FAST_MUTEX CloseCompatcionLock; + ULONG CurrentStackIndex; + HANDLE_TRACE_DB_ENTRY TraceDb[1]; +} HANDLE_TRACE_DEBUG_INFO, *PHANDLE_TRACE_DEBUG_INFO; + typedef struct _HANDLE_TABLE_ENTRY_INFO { ULONG AuditMask; @@ -416,17 +498,52 @@ ULONG_PTR ObAttributes; PHANDLE_TABLE_ENTRY_INFO InfoTable; ULONG_PTR Value; - } u1; + }; union { ULONG GrantedAccess; - USHORT GrantedAccessIndex; + struct + { + USHORT GrantedAccessIndex; + USHORT CreatorBackTraceIndex; + }; LONG NextFreeTableEntry; - } u2; + }; } HANDLE_TABLE_ENTRY, *PHANDLE_TABLE_ENTRY; typedef struct _HANDLE_TABLE { +#if 0 + ULONG TableCode; + PEPROCESS QuotaProcess; + PVOID UniqueProcessId; + EX_PUSH_LOCK HandleLock; + LIST_ENTRY HandleTableList; + EX_PUSH_LOCK HandleContentionEvent; + PHANDLE_TRACE_DEBUG_INFO DebugInfo; + LONG ExtraInfoPages; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + union + { + ULONG Flags; + UCHAR StrictFIFO:1; + }; + LONG FirstFreeHandle; + PHANDLE_TABLE_ENTRY LastFreeHandleEntry; + LONG HandleCount; + ULONG NextHandleNeedingPool; +#else + ULONG FirstFree; + ULONG LastFree; + ULONG NextHandleNeedingPool; + LONG HandleCount; + union + { + ULONG Flags; + UCHAR StrictFIFO:1; + }; +#endif +#else ULONG Flags; LONG HandleCount; PHANDLE_TABLE_ENTRY **Table; @@ -437,6 +554,7 @@ ERESOURCE HandleTableLock; LIST_ENTRY HandleTableList; KEVENT HandleContentionEvent; +#endif } HANDLE_TABLE, *PHANDLE_TABLE; #endif @@ -466,6 +584,11 @@ BOOLEAN AbandonedState; } MUTANT_BASIC_INFORMATION, *PMUTANT_BASIC_INFORMATION; +typedef struct _MUTANT_OWNER_INFORMATION +{ + CLIENT_ID ClientId; +} MUTANT_OWNER_INFORMATION, *PMUTANT_OWNER_INFORMATION; + // // Information Structures for NtQueryAtom // @@ -662,7 +785,7 @@ HANDLE InheritedFromUniqueProcessId; ULONG HandleCount; ULONG SessionId; - ULONG PageDirectoryFrame; + ULONG UniqueProcessKey; // // This part corresponds to VM_COUNTERS_EX. @@ -679,7 +802,7 @@ ULONG QuotaNonPagedPoolUsage; ULONG PagefileUsage; ULONG PeakPagefileUsage; - ULONG PrivateUsage; + ULONG PrivatePageCount; // // This part corresponds to IO_COUNTERS @@ -691,7 +814,7 @@ LARGE_INTEGER WriteTransferCount; LARGE_INTEGER OtherTransferCount; - SYSTEM_THREAD_INFORMATION TH[1]; + //SYSTEM_THREAD_INFORMATION TH[1]; } SYSTEM_PROCESS_INFORMATION, *PSYSTEM_PROCESS_INFORMATION; // Class 6 @@ -737,58 +860,12 @@ LARGE_INTEGER TimeOfCalls[1]; } SYSTEM_CALL_TIME_INFORMATION, *PSYSTEM_CALL_TIME_INFORMATION; -// Class 11 -typedef struct _SYSTEM_MODULE_INFORMATION_ENTRY -{ - ULONG Unknown1; - ULONG Unknown2; - PVOID Base; - ULONG Size; - ULONG Flags; - USHORT Index; - USHORT NameLength; - USHORT LoadCount; - USHORT PathLength; - CHAR ImageName[256]; -} SYSTEM_MODULE_INFORMATION_ENTRY, *PSYSTEM_MODULE_INFORMATION_ENTRY; -typedef struct _SYSTEM_MODULE_INFORMATION -{ - ULONG Count; - SYSTEM_MODULE_INFORMATION_ENTRY Module[1]; -} SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION; +// Class 11 - See RTL_PROCESS_MODULES -// Class 12 -typedef struct _SYSTEM_RESOURCE_LOCK_ENTRY -{ - ULONG ResourceAddress; - ULONG Always1; - ULONG Unknown; - ULONG ActiveCount; - ULONG ContentionCount; - ULONG Unused[2]; - ULONG NumberOfSharedWaiters; - ULONG NumberOfExclusiveWaiters; -} SYSTEM_RESOURCE_LOCK_ENTRY, *PSYSTEM_RESOURCE_LOCK_ENTRY; +// Class 12 - See RTL_PROCESS_LOCKS -typedef struct _SYSTEM_RESOURCE_LOCK_INFO -{ - ULONG Count; - SYSTEM_RESOURCE_LOCK_ENTRY Lock[1]; -} SYSTEM_RESOURCE_LOCK_INFO, *PSYSTEM_RESOURCE_LOCK_INFO; +// Class 13 - See RTL_PROCESS_BACKTRACES -// FIXME: Class 13 -typedef struct _SYSTEM_BACKTRACE_INFORMATION_ENTRY -{ - ULONG Dummy; -} SYSTEM_BACKTRACE_INFORMATION_ENTRY, *PSYSTEM_BACKTRACE_INFORMATION_ENTRY; - -typedef struct _SYSTEM_BACKTRACE_INFORMATION -{ - ULONG Unknown[4]; - ULONG Count; - SYSTEM_BACKTRACE_INFORMATION_ENTRY Trace[1]; -} SYSTEM_BACKTRACE_INFORMATION, *PSYSTEM_BACKTRACE_INFORMATION; - // Class 14 - 15 typedef struct _SYSTEM_POOL_ENTRY { @@ -914,14 +991,10 @@ ULONG BopCount; } SYSTEM_VDM_INSTEMUL_INFO, *PSYSTEM_VDM_INSTEMUL_INFO; -// FIXME: Class 20 -typedef struct _SYSTEM_VDM_BOP_INFO -{ - PVOID Dummy; -} SYSTEM_VDM_BOP_INFO, *PSYSTEM_VDM_BOP_INFO; +// Class 20 - ULONG VDMBOPINFO // Class 21 -typedef struct _SYSTEM_CACHE_INFORMATION +typedef struct _SYSTEM_FILECACHE_INFORMATION { ULONG CurrentSize; ULONG PeakSize; @@ -930,8 +1003,9 @@ ULONG MaximumWorkingSet; ULONG CurrentSizeIncludingTransitionInPages; ULONG PeakSizeIncludingTransitionInPages; - ULONG Unused[2]; -} SYSTEM_CACHE_INFORMATION, *PSYSTEM_CACHE_INFORMATION; + ULONG TransitionRePurposeCount; + ULONG Flags; +} SYSTEM_FILECACHE_INFORMATION, *PSYSTEM_FILECACHE_INFORMATION; // Class 22 typedef struct _SYSTEM_POOLTAG @@ -984,6 +1058,7 @@ USHORT ModifiedCount; USHORT PageTableCount; } SYSTEM_MEMORY_INFO, *PSYSTEM_MEMORY_INFO; + typedef struct _SYSTEM_MEMORY_INFORMATION { ULONG InfoSize; @@ -999,6 +1074,7 @@ PVOID SectionPointer; PVOID EntryPoint; PIMAGE_EXPORT_DIRECTORY ExportSectionPointer; + ULONG ImageLength; } SYSTEM_GDI_DRIVER_INFORMATION, *PSYSTEM_GDI_DRIVER_INFORMATION; // Class 27 @@ -1020,14 +1096,19 @@ // Class 29 - Same as 25 -// FIXME: Class 30 - 31 +// FIXME: Class 30 -// Class 32 -typedef struct _SYSTEM_CRASH_DUMP_INFORMATION +// Class 31 +typedef struct _SYSTEM_REF_TRACE_INFORMATION { - HANDLE CrashDumpSection; -} SYSTEM_CRASH_DUMP_INFORMATION, *PSYSTEM_CRASH_DUMP_INFORMATION; + UCHAR TraceEnable; + UCHAR TracePermanent; + UNICODE_STRING TraceProcessName; + UNICODE_STRING TracePoolTags; +} SYSTEM_REF_TRACE_INFORMATION, *PSYSTEM_REF_TRACE_INFORMATION; +// Class 32 - OBSOLETE + // Class 33 typedef struct _SYSTEM_EXCEPTION_INFORMATION { @@ -1151,16 +1232,135 @@ // Class 50 // Not a structure. Only a ULONG_PTR for the SystemRangeStart -// FIXME: Class 51 (Based on MM_DRIVER_VERIFIER_DATA) +// Class 51 +typedef struct _SYSTEM_VERIFIER_INFORMATION +{ + ULONG NextEntryOffset; + ULONG Level; + UNICODE_STRING DriverName; + ULONG RaiseIrqls; + ULONG AcquireSpinLocks; + ULONG SynchronizeExecutions; + ULONG AllocationsAttempted; + ULONG AllocationsSucceeded; + ULONG AllocationsSucceededSpecialPool; + ULONG AllocationsWithNoTag; + ULONG TrimRequests; + ULONG Trims; + ULONG AllocationsFailed; + ULONG AllocationsFailedDeliberately; + ULONG Loads; + ULONG Unloads; + ULONG UnTrackedPool; + ULONG CurrentPagedPoolAllocations; + ULONG CurrentNonPagedPoolAllocations; + ULONG PeakPagedPoolAllocations; + ULONG PeakNonPagedPoolAllocations; + ULONG PagedPoolUsageInBytes; + ULONG NonPagedPoolUsageInBytes; + ULONG PeakPagedPoolUsageInBytes; + ULONG PeakNonPagedPoolUsageInBytes; +} SYSTEM_VERIFIER_INFORMATION, *PSYSTEM_VERIFIER_INFORMATION; // FIXME: Class 52 // Class 53 -typedef struct _SYSTEM_SESSION_PROCESSES_INFORMATION +typedef struct _SYSTEM_SESSION_PROCESS_INFORMATION { ULONG SessionId; - ULONG BufferSize; + ULONG SizeOfBuf; PVOID Buffer; // Same format as in SystemProcessInformation -} SYSTEM_SESSION_PROCESSES_INFORMATION, *PSYSTEM_SESSION_PROCESSES_INFORMATION; +} SYSTEM_SESSION_PROCESS_INFORMATION, *PSYSTEM_SESSION_PROCESS_INFORMATION; +// FIXME: Class 54-97 + +// +// Hotpatch flags +// +#define RTL_HOTPATCH_SUPPORTED_FLAG 0x01 +#define RTL_HOTPATCH_SWAP_OBJECT_NAMES 0x08 << 24 +#define RTL_HOTPATCH_SYNC_RENAME_FILES 0x10 << 24 +#define RTL_HOTPATCH_PATCH_USER_MODE 0x20 << 24 +#define RTL_HOTPATCH_REMAP_SYSTEM_DLL 0x40 << 24 +#define RTL_HOTPATCH_PATCH_KERNEL_MODE 0x80 << 24 + + +// Class 69 +typedef struct _SYSTEM_HOTPATCH_CODE_INFORMATION +{ + ULONG Flags; + ULONG InfoSize; + union + { + struct + { + ULONG Foo; + } CodeInfo; + struct + { + USHORT NameOffset; + USHORT NameLength; + } KernelInfo; + struct + { + USHORT NameOffset; + USHORT NameLength; + USHORT TargetNameOffset; + USHORT TargetNameLength; + UCHAR PatchingFinished; + } UserModeInfo; + struct + { + USHORT NameOffset; + USHORT NameLength; + USHORT TargetNameOffset; + USHORT TargetNameLength; + UCHAR PatchingFinished; + NTSTATUS ReturnCode; + HANDLE TargetProcess; + } InjectionInfo; + struct + { + HANDLE FileHandle1; + PIO_STATUS_BLOCK IoStatusBlock1; + PVOID RenameInformation1; + PVOID RenameInformationLength1; + HANDLE FileHandle2; + PIO_STATUS_BLOCK IoStatusBlock2; + PVOID RenameInformation2; + PVOID RenameInformationLength2; + } RenameInfo; + struct + { + HANDLE ParentDirectory; + HANDLE ObjectHandle1; + HANDLE ObjectHandle2; + } AtomicSwap; + }; +} SYSTEM_HOTPATCH_CODE_INFORMATION, *PSYSTEM_HOTPATCH_CODE_INFORMATION; + +// +// Class 75 +// +#ifdef NTOS_MODE_USER +typedef struct _SYSTEM_FIRMWARE_TABLE_HANDLER +{ + ULONG ProviderSignature; + BOOLEAN Register; + PFNFTH FirmwareTableHandler; + PVOID DriverObject; +} SYSTEM_FIRMWARE_TABLE_HANDLER, *PSYSTEM_FIRMWARE_TABLE_HANDLER; + +// +// Class 76 +// +typedef struct _SYSTEM_FIRMWARE_TABLE_INFORMATION +{ + ULONG ProviderSignature; + SYSTEM_FIRMWARE_TABLE_ACTION Action; + ULONG TableID; + ULONG TableBufferLength; + UCHAR TableBuffer[1]; +} SYSTEM_FIRMWARE_TABLE_INFORMATION, *PSYSTEM_FIRMWARE_TABLE_INFORMATION; #endif +#endif Index: include/ndk/i386/mmtypes.h =================================================================== --- include/ndk/i386/mmtypes.h (revision 21759) +++ include/ndk/i386/mmtypes.h (working copy) @@ -29,4 +29,121 @@ #define PAGE_SIZE 0x1000 #define PAGE_SHIFT 12L +// +// Page Table Entry Definitions +// +typedef struct _HARDWARE_PTE_X86 +{ + ULONG Valid:1; + ULONG Write:1; + ULONG Owner:1; + ULONG WriteThrough:1; + ULONG CacheDisable:1; + ULONG Accessed:1; + ULONG Dirty:1; + ULONG LargePage:1; + ULONG Global:1; + ULONG CopyOnWrite:1; + ULONG Prototype: 1; + ULONG reserved: 1; + ULONG PageFrameNumber:20; +} HARDWARE_PTE_X86, *PHARDWARE_PTE_X86; + +typedef struct _MMPTE_SOFTWARE +{ + ULONG Valid:1; + ULONG PageFileLow:4; + ULONG Protection:5; + ULONG Prototype:1; + ULONG Transition:1; + ULONG PageFileHigh:20; +} MMPTE_SOFTWARE; + +typedef struct _MMPTE_TRANSITION +{ + ULONG Valid:1; + ULONG Write:1; + ULONG Owner:1; + ULONG WriteThrough:1; + ULONG CacheDisable:1; + ULONG Protection:5; + ULONG Prototype:1; + ULONG Transition:1; + ULONG PageFrameNumber:20; +} MMPTE_TRANSITION; + +typedef struct _MMPTE_PROTOTYPE +{ + ULONG Valid:1; + ULONG ProtoAddressLow:7; + ULONG ReadOnly:1; + ULONG WhichPool:1; + ULONG Prototype:1; + ULONG ProtoAddressHigh:21; +} MMPTE_PROTOTYPE; + +typedef struct _MMPTE_SUBSECTION +{ + ULONG Valid:1; + ULONG SubsectionAddressLow:4; + ULONG Protection:5; + ULONG Prototype:1; + ULONG SubsectionAddressHigh:20; + ULONG WhichPool:1; +} MMPTE_SUBSECTION; + +typedef struct _MMPTE_LIST +{ + ULONG Valid:1; + ULONG OneEntry:1; + ULONG filler10:10; + ULONG NextEntry:20; +} MMPTE_LIST; + +#ifndef CONFIG_SMP + +typedef struct _MMPTE_HARDWARE +{ + ULONG Valid:1; + ULONG Write:1; + ULONG Owner:1; + ULONG WriteThrough:1; + ULONG CacheDisable:1; + ULONG Accessed:1; + ULONG Dirty:1; + ULONG LargePage:1; + ULONG Global:1; + ULONG CopyOnWrite:1; + ULONG Prototype:1; + ULONG reserved:1; + ULONG PageFrameNumber:20; +} MMPTE_HARDWARE, *PMMPTE_HARDWARE; + +#else + +typedef struct _MMPTE_HARDWARE +{ + ULONG Valid:1; + ULONG Writable:1; + ULONG Owner:1; + ULONG WriteThrough:1; + ULONG CacheDisable:1; + ULONG Accessed:1; + ULONG Dirty:1; + ULONG LargePage:1; + ULONG Global:1; + ULONG CopyOnWrite:1; + ULONG Prototype:1; + ULONG Write:1; + ULONG PageFrameNumber:20; +} MMPTE_HARDWARE, *PMMPTE_HARDWARE; + #endif + +// +// Use the right PTE structure +// +#define HARDWARE_PTE HARDWARE_PTE_X86 +#define PHARDWARE_PTE PHARDWARE_PTE_X86 + +#endif Index: include/ndk/i386/ketypes.h =================================================================== --- include/ndk/i386/ketypes.h (revision 21759) +++ include/ndk/i386/ketypes.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -34,13 +34,57 @@ #define I386_TRAP_GATE 0xF // +// Selector Names +// +#define RPL_MASK 0x0003 +#define MODE_MASK 0x0001 +#define KGDT_R0_CODE (0x8) +#define KGDT_R0_DATA (0x10) +#define KGDT_R3_CODE (0x18) +#define KGDT_R3_DATA (0x20) +#define KGDT_TSS (0x28) +#define KGDT_R0_PCR (0x30) +#define KGDT_R3_TEB (0x38) +#define KGDT_LDT (0x48) +#define KGDT_DF_TSS (0x50) +#define KGDT_NMI_TSS (0x58) + +// +// CR4 +// +#define CR4_VME 0x1 +#define CR4_PVI 0x2 +#define CR4_TSD 0x4 +#define CR4_DE 0x8 +#define CR4_PSE 0x10 +#define CR4_PAE 0x20 +#define CR4_MCE 0x40 +#define CR4_PGE 0x80 +#define CR4_FXSR 0x200 +#define CR4_XMMEXCPT 0x400 + +// +// EFlags +// +#define EFLAGS_TF 0x100 +#define EFLAGS_INTERRUPT_MASK 0x200 +#define EFLAGS_NESTED_TASK 0x4000 +#define EFLAGS_V86_MASK 0x20000 +#define EFLAGS_ALIGN_CHECK 0x40000 +#define EFLAGS_VIF 0x80000 +#define EFLAGS_VIP 0x100000 +#define EFLAG_SIGN 0x8000 +#define EFLAG_ZERO 0x4000 + +#ifndef NTOS_MODE_USER +// // IPI Types // #define IPI_APC 1 #define IPI_DPC 2 -#define IPI_FREEZE 3 -#define IPI_PACKET_READY 4 -#define IPI_SYNCH_REQUEST 10 +#define IPI_FREEZE 4 +#define IPI_PACKET_READY 8 +#define IPI_SYNCH_REQUEST 16 // // FN/FX (FPU) Save Area Structures @@ -146,16 +190,16 @@ } Bytes; struct { - ULONG BaseMid : 8; - ULONG Type : 5; - ULONG Dpl : 2; - ULONG Pres : 1; - ULONG LimitHi : 4; - ULONG Sys : 1; - ULONG Reserved_0 : 1; - ULONG Default_Big : 1; - ULONG Granularity : 1; - ULONG BaseHi : 8; + ULONG BaseMid:8; + ULONG Type:5; + ULONG Dpl:2; + ULONG Pres:1; + ULONG LimitHi:4; + ULONG Sys:1; + ULONG Reserved_0:1; + ULONG Default_Big:1; + ULONG Granularity:1; + ULONG BaseHi:8; } Bits; } HighWord; } LDT_ENTRY, *PLDT_ENTRY, *LPLDT_ENTRY; @@ -178,16 +222,16 @@ } Bytes; struct { - ULONG BaseMid : 8; - ULONG Type : 5; - ULONG Dpl : 2; - ULONG Pres : 1; - ULONG LimitHi : 4; - ULONG Sys : 1; - ULONG Reserved_0 : 1; - ULONG Default_Big : 1; - ULONG Granularity : 1; - ULONG BaseHi : 8; + ULONG BaseMid:8; + ULONG Type:5; + ULONG Dpl:2; + ULONG Pres:1; + ULONG LimitHi:4; + ULONG Sys:1; + ULONG Reserved_0:1; + ULONG Default_Big:1; + ULONG Granularity:1; + ULONG BaseHi:8; } Bits; } HighWord; } KGDTENTRY, *PKGDTENTRY; @@ -222,26 +266,6 @@ USHORT ExtendedOffset; } KIDTENTRY, *PKIDTENTRY; -// -// Page Table Entry Definition -// -typedef struct _HARDWARE_PTE_X86 -{ - ULONG Valid : 1; - ULONG Write : 1; - ULONG Owner : 1; - ULONG WriteThrough : 1; - ULONG CacheDisable : 1; - ULONG Accessed : 1; - ULONG Dirty : 1; - ULONG LargePage : 1; - ULONG Global : 1; - ULONG CopyOnWrite : 1; - ULONG Prototype : 1; - ULONG reserved : 1; - ULONG PageFrameNumber : 20; -} HARDWARE_PTE_X86, *PHARDWARE_PTE_X86; - typedef struct _DESCRIPTOR { USHORT Pad; @@ -277,9 +301,9 @@ #pragma pack(push,4) typedef struct _KPROCESSOR_STATE { - PCONTEXT ContextFrame; + CONTEXT ContextFrame; KSPECIAL_REGISTERS SpecialRegisters; -} KPROCESSOR_STATE; +} KPROCESSOR_STATE, *PKPROCESSOR_STATE; // // Processor Region Control Block @@ -301,8 +325,14 @@ KPROCESSOR_STATE ProcessorState; ULONG KernelReserved[16]; ULONG HalReserved[16]; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG CFlushSize; + UCHAR PrcbPad0[88]; +#else + ULONG CFlushSize; UCHAR PrcbPad0[92]; - PVOID LockQueue[33]; // Used for Queued Spinlocks +#endif + KSPIN_LOCK_QUEUE LockQueue[LockQueueMaximumLock]; struct _KTHREAD *NpxThread; ULONG InterruptCount; ULONG KernelTime; @@ -314,18 +344,41 @@ ULONG PageColor; UCHAR SkipTick; UCHAR DebuggerSavedIRQL; +#if (NTDDI_VERSION >= NTDDI_WS03) + UCHAR NodeColor; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + UCHAR PollSlot; +#else + UCHAR Spare1; +#endif + ULONG NodeShiftedColor; +#else UCHAR Spare1[6]; +#endif struct _KNODE *ParentNode; ULONG MultiThreadProcessorSet; struct _KPRCB *MultiThreadSetMaster; +#if (NTDDI_VERSION >= NTDDI_WS03) + ULONG SecondaryColorMask; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG DpcTimeLimit; +#else + LONG Sleeping; +#endif +#else ULONG ThreadStartCount[2]; +#endif ULONG CcFastReadNoWait; ULONG CcFastReadWait; ULONG CcFastReadNotPossible; ULONG CcCopyReadNoWait; ULONG CcCopyReadWait; ULONG CcCopyReadNoWaitMiss; +#if (NTDDI_VERSION < NTDDI_LONGHORN) ULONG KeAlignmentFixupCount; +#endif + ULONG SpareCounter0; +#if (NTDDI_VERSION < NTDDI_LONGHORN) ULONG KeContextSwitches; ULONG KeDcacheFlushCount; ULONG KeExceptionDispatchCount; @@ -334,13 +387,47 @@ ULONG KeIcacheFlushCount; ULONG KeSecondLevelTbFills; ULONG KeSystemCalls; +#endif ULONG IoReadOperationCount; ULONG IoWriteOperationCount; ULONG IoOtherOperationCount; LARGE_INTEGER IoReadTransferCount; LARGE_INTEGER IoWriteTransferCount; LARGE_INTEGER IoOtherTransferCount; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG CcFastMdlReadNoWait; + ULONG CcFastMdlReadWait; + ULONG CcFastMdlReadNotPossible; + ULONG CcMapDataNoWait; + ULONG CcMapDataWait; + ULONG CcPinMappedDataCount; + ULONG CcPinReadNoWait; + ULONG CcPinReadWait; + ULONG CcMdlReadNoWait; + ULONG CcMdlReadWait; + ULONG CcLazyWriteHotSpots; + ULONG CcLazyWriteIos; + ULONG CcLazyWritePages; + ULONG CcDataFlushes; + ULONG CcDataPages; + ULONG CcLostDelayedWrites; + ULONG CcFastReadResourceMiss; + ULONG CcCopyReadWaitMiss; + ULONG CcFastMdlReadResourceMiss; + ULONG CcMapDataNoWaitMiss; + ULONG CcMapDataWaitMiss; + ULONG CcPinReadNoWaitMiss; + ULONG CcPinReadWaitMiss; + ULONG CcMdlReadNoWaitMiss; + ULONG CcMdlReadWaitMiss; + ULONG CcReadAheadIos; + ULONG KeAlignmentFixupCount; + ULONG KeExceptionDispatchCount; + ULONG KeSystemCalls; + ULONG PrcbPad1[3]; +#else ULONG SpareCounter1[8]; +#endif PP_LOOKASIDE_LIST PPLookasideList[16]; PP_LOOKASIDE_LIST PPNPagedLookasideList[32]; PP_LOOKASIDE_LIST PPPagedLookasideList[32]; @@ -350,7 +437,7 @@ UCHAR PrcbPad2[52]; PVOID CurrentPacket[3]; ULONG TargetSet; - ULONG_PTR WorkerRoutine; + PKIPI_WORKER WorkerRoutine; ULONG IpiFrozen; UCHAR PrcbPad3[40]; ULONG RequestSummary; @@ -370,22 +457,49 @@ ULONG TimerHand; ULONG TimerRequest; PVOID DpcThread; - struct _KEVENT *DpcEvent; + KEVENT DpcEvent; UCHAR ThreadDpcEnable; BOOLEAN QuantumEnd; UCHAR PrcbPad50; UCHAR IdleSchedule; - ULONG DpcSetEventRequest; + LONG DpcSetEventRequest; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + LONG Sleeping; + ULONG PeriodicCount; + ULONG PeriodicBias; + UCHAR PrcbPad5[6]; +#else UCHAR PrcbPad5[18]; +#endif LONG TickOffset; - struct _KDPC* CallDpc; + KDPC CallDpc; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + LONG ClockKeepAlive; + UCHAR ClockCheckSlot; + UCHAR ClockPollCycle; + UCHAR PrcbPad6[2]; + LONG DpcWatchdogPeriod; + LONG DpcWatchDogCount; + LONG ThreadWatchdogPeriod; + LONG ThreadWatchDogCount; + ULONG PrcbPad70[2]; +#else ULONG PrcbPad7[8]; +#endif LIST_ENTRY WaitListHead; ULONG ReadySummary; - ULONG SelectNextLast; + ULONG QueueIndex; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + SINGLE_LIST_ENTRY DeferredReadyListHead; + ULONGLONG StartCycles; + ULONGLONG CycleTime; + ULONGLONG PrcbPad71[3]; LIST_ENTRY DispatcherReadyListHead[32]; +#else + LIST_ENTRY DispatcherReadyListHead[32]; SINGLE_LIST_ENTRY DeferredReadyListHead; ULONG PrcbPad72[11]; +#endif PVOID ChainedInterruptList; LONG LookasideIrpFloat; LONG MmPageFaultCount; @@ -401,7 +515,15 @@ LONG MmDirtyWriteIoCount; LONG MmMappedPagesWriteCount; LONG MmMappedWriteIoCount; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG CachedCommit; + ULONG CachedResidentAvailable; + PVOID HyperPte; + UCHAR CpuVendor; + UCHAR PrcbPad9[3]; +#else ULONG SpareFields0[1]; +#endif CHAR VendorString[13]; UCHAR InitialApicId; UCHAR LogicalProcessorsPerPhysicalProcessor; @@ -412,6 +534,23 @@ LARGE_INTEGER SpareField1; FX_SAVE_AREA NpxSaveArea; PROCESSOR_POWER_STATE PowerState; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + KDPC DpcWatchdogDoc; + KTIMER DpcWatchdogTimer; + PVOID WheaInfo; + PVOID EtwSupport; + SLIST_HEADER InterruptObjectPool; + LARGE_INTEGER HyperCallPagePhysical; + LARGE_INTEGER HyperCallPageVirtual; + PVOID RateControl; + CACHE_DESCRIPTOR Cache[5]; + ULONG CacheCount; + ULONG CacheProcessorMask[5]; + UCHAR LogicalProcessorsPerCore; + UCHAR PrcbPad8[3]; + ULONG PackageProcessorSet; + ULONG CoreProcessorSet; +#endif } KPRCB, *PKPRCB; // @@ -433,35 +572,36 @@ PVOID Used_Self; }; }; - struct _KPCR *Self; /* 1C */ - struct _KPRCB *Prcb; /* 20 */ - KIRQL Irql; /* 24 */ - ULONG IRR; /* 28 */ - ULONG IrrActive; /* 2C */ - ULONG IDR; /* 30 */ - PVOID KdVersionBlock; /* 34 */ - PKIDTENTRY IDT; /* 38 */ + struct _KPCR *Self; + struct _KPRCB *Prcb; + KIRQL Irql; + ULONG IRR; + ULONG IrrActive; + ULONG IDR; + PVOID KdVersionBlock; + PKIDTENTRY IDT; #ifdef _REACTOS_ - PUSHORT GDT; /* 3C */ + PUSHORT GDT; #else - PKGDTENTRY GDT; /* 3C */ + PKGDTENTRY GDT; #endif - struct _KTSS *TSS; /* 40 */ - USHORT MajorVersion; /* 44 */ - USHORT MinorVersion; /* 46 */ - KAFFINITY SetMember; /* 48 */ - ULONG StallScaleFactor; /* 4C */ - UCHAR SparedUnused; /* 50 */ - UCHAR Number; /* 51 */ - UCHAR Reserved; /* 52 */ - UCHAR L2CacheAssociativity; /* 53 */ - ULONG VdmAlert; /* 54 */ - ULONG KernelReserved[14]; /* 58 */ - ULONG L2CacheSize; /* 90 */ - ULONG HalReserved[16]; /* 94 */ - ULONG InterruptMode; /* D4 */ - UCHAR KernelReserved2[0x48]; /* D8 */ - KPRCB PrcbData; /* 120 */ + struct _KTSS *TSS; + USHORT MajorVersion; + USHORT MinorVersion; + KAFFINITY SetMember; + ULONG StallScaleFactor; + UCHAR SparedUnused; + UCHAR Number; + UCHAR Reserved; + UCHAR L2CacheAssociativity; + ULONG VdmAlert; + ULONG KernelReserved[14]; + ULONG SecondLevelCacheSize; + ULONG HalReserved[16]; + ULONG InterruptMode; + UCHAR Spare1; + ULONG KernelReserved2[17]; + KPRCB PrcbData; } KIPCR, *PKIPCR; #pragma pack(pop) @@ -511,5 +651,5 @@ // i386 CPUs don't have exception frames // typedef struct _KEXCEPTION_FRAME KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; - #endif +#endif Index: include/ndk/lpctypes.h =================================================================== --- include/ndk/lpctypes.h (revision 21759) +++ include/ndk/lpctypes.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -228,7 +228,7 @@ #endif // -// Client Died LPC Message (FIXME: should go in pstypes.h?) +// Client Died LPC Message // typedef struct _CLIENT_DIED_MSG { Index: include/ndk/halfuncs.h =================================================================== --- include/ndk/halfuncs.h (revision 21759) +++ include/ndk/halfuncs.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -30,14 +30,6 @@ // // The DDK steals these away from you. // -VOID -_enable( - VOID -); -VOID -_disable( - VOID -); #ifdef _MSC_VER #pragma intrinsic(_enable) #pragma intrinsic(_disable) @@ -47,33 +39,12 @@ // Display Functions // NTHALAPI -BOOLEAN -NTAPI -HalQueryDisplayOwnership( - VOID -); - -NTHALAPI VOID NTAPI HalDisplayString( IN PCHAR String ); -NTHALAPI -BOOLEAN -NTAPI -HalQueryDisplayOwnership( - VOID -); - -NTHALAPI -VOID -NTAPI -HalReleaseDisplayOwnership( - VOID -); - // // Initialization Functions // @@ -84,12 +55,13 @@ VOID ); +#ifdef _ARC_ NTHALAPI VOID NTAPI HalInitializeProcessor( ULONG ProcessorNumber, - PLOADER_PARAMETER_BLOCK LoaderBlock + struct _LOADER_PARAMETER_BLOCK *LoaderBlock ); NTHALAPI @@ -97,8 +69,9 @@ NTAPI HalInitSystem( ULONG BootPhase, - PLOADER_PARAMETER_BLOCK LoaderBlock + struct _LOADER_PARAMETER_BLOCK *LoaderBlock ); +#endif NTHALAPI VOID @@ -179,7 +152,7 @@ VOID NTAPI HalRequestIpi( - ULONG Unknown + KAFFINITY TargetSet ); NTHALAPI @@ -192,6 +165,7 @@ // // I/O Functions // +#ifdef _ARC_ NTHALAPI VOID NTAPI @@ -201,6 +175,7 @@ PUCHAR NtSystemPath, PSTRING NtSystemPathString ); +#endif // // Environment Functions @@ -213,5 +188,15 @@ IN PCH Value ); +// +// Time Functions +// +NTHALAPI +VOID +NTAPI +HalQueryRealTimeClock( + IN PTIME_FIELDS RtcTime +); + #endif #endif Index: include/ndk/dbgkfuncs.h =================================================================== --- include/ndk/dbgkfuncs.h (revision 21759) +++ include/ndk/dbgkfuncs.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ Index: include/ndk/iofuncs.h =================================================================== --- include/ndk/iofuncs.h (revision 21759) +++ include/ndk/iofuncs.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -28,7 +28,6 @@ // // Native calls // -NTSYSCALLAPI NTSTATUS NTAPI NtAddBootEntry( @@ -36,7 +35,6 @@ IN PUNICODE_STRING EntryValue ); -NTSYSCALLAPI NTSTATUS NTAPI NtCancelIoFile( @@ -61,7 +59,6 @@ IN ULONG EaLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtCreateIoCompletion( @@ -71,7 +68,6 @@ IN ULONG NumberOfConcurrentThreads ); -NTSYSCALLAPI NTSTATUS NTAPI NtCreateMailslotFile( @@ -85,7 +81,6 @@ IN PLARGE_INTEGER TimeOut ); -NTSYSCALLAPI NTSTATUS NTAPI NtCreateNamedPipeFile( @@ -105,7 +100,6 @@ IN PLARGE_INTEGER DefaultTimeOut ); -NTSYSCALLAPI NTSTATUS NTAPI NtDeleteBootEntry( @@ -113,7 +107,6 @@ IN PUNICODE_STRING EntryValue ); -NTSYSCALLAPI NTSTATUS NTAPI NtDeleteFile( @@ -136,15 +129,13 @@ IN ULONG OutputBufferSize ); -NTSYSCALLAPI NTSTATUS NTAPI NtEnumerateBootEntries( - IN ULONG Unknown1, - IN ULONG Unknown2 + IN PVOID Buffer, + IN PULONG BufferLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtFlushBuffersFile( @@ -152,7 +143,6 @@ OUT PIO_STATUS_BLOCK IoStatusBlock ); -NTSYSCALLAPI NTSTATUS NTAPI NtFlushWriteBuffer(VOID); @@ -173,7 +163,6 @@ IN ULONG OutputBufferSize ); -NTSYSCALLAPI NTSTATUS NTAPI NtLoadDriver( @@ -196,7 +185,6 @@ IN BOOLEAN ExclusiveLock ); -NTSYSCALLAPI NTSTATUS NTAPI NtNotifyChangeDirectoryFile( @@ -223,7 +211,6 @@ IN ULONG OpenOptions ); -NTSYSCALLAPI NTSTATUS NTAPI NtOpenIoCompletion( @@ -232,7 +219,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryAttributesFile( @@ -240,20 +226,18 @@ OUT PFILE_BASIC_INFORMATION FileInformation ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryBootEntryOrder( - IN ULONG Unknown1, - IN ULONG Unknown2 + IN PULONG Ids, + IN PULONG Count ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryBootOptions( - IN ULONG Unknown1, - IN ULONG Unknown2 + IN PBOOT_OPTIONS BootOptions, + IN PULONG BootOptionsLength ); NTSYSCALLAPI @@ -273,7 +257,6 @@ IN BOOLEAN RestartScan ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryEaFile( @@ -288,7 +271,6 @@ IN BOOLEAN RestartScan ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryFullAttributesFile( @@ -307,7 +289,6 @@ IN FILE_INFORMATION_CLASS FileInformationClass ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryIoCompletion( @@ -359,7 +340,6 @@ IN PULONG Key OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI NtReadFileScatter( @@ -374,7 +354,6 @@ IN PULONG Key OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI NtRemoveIoCompletion( @@ -385,23 +364,20 @@ IN PLARGE_INTEGER Timeout OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetBootEntryOrder( - IN ULONG Unknown1, - IN ULONG Unknown2 + IN PULONG Ids, + IN PULONG Count ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetBootOptions( - ULONG Unknown1, - ULONG Unknown2 + IN PBOOT_OPTIONS BootOptions, + IN ULONG FieldsToChange ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetEaFile( @@ -422,7 +398,6 @@ IN FILE_INFORMATION_CLASS FileInformationClass ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetIoCompletion( @@ -454,16 +429,15 @@ IN FS_INFORMATION_CLASS FsInformationClass ); -NTSYSCALLAPI NTSTATUS NTAPI NtTranslateFilePath( - ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3 + PFILE_PATH InputFilePath, + ULONG OutputType, + PFILE_PATH OutputFilePath, + ULONG OutputFilePathLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtUnloadDriver( @@ -496,7 +470,6 @@ IN PULONG Key OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI NtWriteFileGather( @@ -511,7 +484,6 @@ IN PULONG Key OPTIONAL ); -NTSYSAPI NTSTATUS NTAPI ZwAddBootEntry( @@ -519,7 +491,6 @@ IN PUNICODE_STRING EntryValue ); -NTSYSAPI NTSTATUS NTAPI ZwCancelIoFile( @@ -527,7 +498,7 @@ OUT PIO_STATUS_BLOCK IoStatusBlock ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwCreateFile( @@ -544,7 +515,6 @@ IN ULONG EaLength ); -NTSYSAPI NTSTATUS NTAPI ZwCreateIoCompletion( @@ -554,7 +524,6 @@ IN ULONG NumberOfConcurrentThreads ); -NTSYSAPI NTSTATUS NTAPI ZwCreateMailslotFile( @@ -568,7 +537,6 @@ IN PLARGE_INTEGER TimeOut ); -NTSYSAPI NTSTATUS NTAPI ZwCreateNamedPipeFile( @@ -588,7 +556,6 @@ IN PLARGE_INTEGER DefaultTimeOut ); -NTSYSAPI NTSTATUS NTAPI ZwDeleteBootEntry( @@ -603,7 +570,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwDeviceIoControlFile( @@ -619,14 +586,6 @@ IN ULONG OutputBufferSize ); -NTSYSAPI -NTSTATUS -NTAPI -ZwEnumerateBootEntries( - IN ULONG Unknown1, - IN ULONG Unknown2 -); - #ifdef NTOS_MODE_USER NTSYSAPI NTSTATUS @@ -637,12 +596,11 @@ ); #endif -NTSYSAPI NTSTATUS NTAPI ZwFlushWriteBuffer(VOID); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwFsControlFile( @@ -659,7 +617,6 @@ ); #ifdef NTOS_MODE_USER -NTSYSAPI NTSTATUS NTAPI ZwLoadDriver( @@ -667,7 +624,7 @@ ); #endif -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwLockFile( @@ -683,7 +640,6 @@ IN BOOLEAN ExclusiveLock ); -NTSYSAPI NTSTATUS NTAPI ZwNotifyChangeDirectoryFile( @@ -698,7 +654,7 @@ IN BOOLEAN WatchTree ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwOpenFile( @@ -710,7 +666,6 @@ IN ULONG OpenOptions ); -NTSYSAPI NTSTATUS NTAPI ZwOpenIoCompletion( @@ -719,7 +674,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSAPI NTSTATUS NTAPI ZwQueryAttributesFile( @@ -727,25 +681,9 @@ OUT PFILE_BASIC_INFORMATION FileInformation ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI -ZwQueryBootEntryOrder( - IN ULONG Unknown1, - IN ULONG Unknown2 -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwQueryBootOptions( - IN ULONG Unknown1, - IN ULONG Unknown2 -); - -NTSYSAPI -NTSTATUS -NTAPI ZwQueryDirectoryFile( IN HANDLE FileHandle, IN HANDLE Event OPTIONAL, @@ -761,7 +699,6 @@ ); #ifdef NTOS_MODE_USER -NTSYSAPI NTSTATUS NTAPI ZwQueryEaFile( @@ -777,7 +714,6 @@ ); #endif -NTSYSAPI NTSTATUS NTAPI ZwQueryFullAttributesFile( @@ -785,7 +721,7 @@ OUT PFILE_NETWORK_OPEN_INFORMATION FileInformation ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwQueryInformationFile( @@ -796,7 +732,6 @@ IN FILE_INFORMATION_CLASS FileInformationClass ); -NTSYSAPI NTSTATUS NTAPI ZwQueryIoCompletion( @@ -807,7 +742,7 @@ OUT PULONG ResultLength OPTIONAL ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwQueryQuotaInformationFile( @@ -822,7 +757,7 @@ IN BOOLEAN RestartScan ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwQueryVolumeInformationFile( @@ -833,7 +768,7 @@ IN FS_INFORMATION_CLASS FsInformationClass ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwReadFile( @@ -848,7 +783,6 @@ IN PULONG Key OPTIONAL ); -NTSYSAPI NTSTATUS NTAPI ZwReadFileScatter( @@ -863,7 +797,6 @@ IN PULONG Key OPTIONAL ); -NTSYSAPI NTSTATUS NTAPI ZwRemoveIoCompletion( @@ -874,24 +807,7 @@ IN PLARGE_INTEGER Timeout OPTIONAL ); -NTSYSAPI -NTSTATUS -NTAPI -ZwSetBootEntryOrder( - IN ULONG Unknown1, - IN ULONG Unknown2 -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwSetBootOptions( - ULONG Unknown1, - ULONG Unknown2 -); - #ifdef NTOS_MODE_USER -NTSYSAPI NTSTATUS NTAPI ZwSetEaFile( @@ -902,7 +818,7 @@ ); #endif -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwSetInformationFile( @@ -913,7 +829,6 @@ IN FILE_INFORMATION_CLASS FileInformationClass ); -NTSYSAPI NTSTATUS NTAPI ZwSetIoCompletion( @@ -924,7 +839,7 @@ IN ULONG CompletionInformation ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwSetQuotaInformationFile( @@ -934,7 +849,7 @@ ULONG BufferLength ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwSetVolumeInformationFile( @@ -948,20 +863,11 @@ NTSYSAPI NTSTATUS NTAPI -ZwTranslateFilePath( - ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3 -); - -NTSYSAPI -NTSTATUS -NTAPI ZwUnloadDriver( IN PUNICODE_STRING DriverServiceName ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwUnlockFile( @@ -972,7 +878,7 @@ OUT ULONG Key OPTIONAL ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwWriteFile( @@ -987,7 +893,6 @@ IN PULONG Key OPTIONAL ); -NTSYSAPI NTSTATUS NTAPI ZwWriteFileGather( Index: include/ndk/sefuncs.h =================================================================== --- include/ndk/sefuncs.h (revision 21759) +++ include/ndk/sefuncs.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -29,7 +29,6 @@ // // Security Descriptors // -NTKERNELAPI NTSTATUS NTAPI SeCaptureSecurityDescriptor( @@ -40,7 +39,6 @@ OUT PSECURITY_DESCRIPTOR *CapturedSecurityDescriptor ); -NTKERNELAPI NTSTATUS NTAPI SeReleaseSecurityDescriptor( @@ -52,7 +50,6 @@ // // Access States // -NTKERNELAPI NTSTATUS NTAPI SeCreateAccessState( @@ -62,7 +59,6 @@ PGENERIC_MAPPING GenericMapping ); -NTKERNELAPI VOID NTAPI SeDeleteAccessState( @@ -72,7 +68,6 @@ // // Impersonation // -NTKERNELAPI SECURITY_IMPERSONATION_LEVEL NTAPI SeTokenImpersonationLevel( @@ -84,7 +79,6 @@ // // Native Calls // -NTSYSCALLAPI NTSTATUS NTAPI NtAccessCheck( @@ -139,14 +133,12 @@ OUT PULONG ReturnLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtAllocateLocallyUniqueId( OUT LUID *LocallyUniqueId ); -NTSYSCALLAPI NTSTATUS NTAPI NtAllocateUuids( @@ -156,7 +148,6 @@ PUCHAR Seed ); -NTSYSCALLAPI NTSTATUS NTAPI NtCreateToken( @@ -274,7 +265,7 @@ OUT PULONG ReturnLength ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI NtSetInformationToken( @@ -284,7 +275,6 @@ IN ULONG TokenInformationLength ); -NTSYSAPI NTSTATUS NTAPI ZwAccessCheck( @@ -298,7 +288,7 @@ OUT PNTSTATUS AccessStatus ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwAdjustGroupsToken( @@ -310,7 +300,7 @@ OUT PULONG ReturnLength ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwAdjustPrivilegesToken( @@ -322,14 +312,12 @@ OUT PULONG ReturnLength ); -NTSYSAPI NTSTATUS NTAPI ZwAllocateLocallyUniqueId( OUT LUID *LocallyUniqueId ); -NTSYSAPI NTSTATUS NTAPI ZwAllocateUuids( @@ -339,7 +327,6 @@ PUCHAR Seed ); -NTSYSAPI NTSTATUS NTAPI ZwCreateToken( @@ -358,7 +345,7 @@ IN PTOKEN_SOURCE TokenSource ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwDuplicateToken( @@ -370,14 +357,14 @@ OUT PHANDLE NewTokenHandle ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwImpersonateAnonymousToken( IN HANDLE Thread ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwOpenObjectAuditAlarm( @@ -395,7 +382,7 @@ OUT PBOOLEAN GenerateOnClose ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwOpenProcessToken( @@ -404,7 +391,7 @@ OUT PHANDLE TokenHandle ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwOpenProcessTokenEx( @@ -414,7 +401,7 @@ OUT PHANDLE TokenHandle ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwPrivilegeCheck( @@ -423,7 +410,7 @@ IN PBOOLEAN Result ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwPrivilegedServiceAuditAlarm( @@ -434,7 +421,7 @@ IN BOOLEAN AccessGranted ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwPrivilegeObjectAuditAlarm( @@ -446,7 +433,7 @@ IN BOOLEAN AccessGranted ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwQueryInformationToken( @@ -457,7 +444,7 @@ OUT PULONG ReturnLength ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwSetInformationToken( Index: include/ndk/mmfuncs.h =================================================================== --- include/ndk/mmfuncs.h (revision 21759) +++ include/ndk/mmfuncs.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -31,6 +31,21 @@ // NTSTATUS NTAPI +MmMapViewOfSection( + IN PVOID SectionObject, + IN PEPROCESS Process, + IN OUT PVOID *BaseAddress, + IN ULONG ZeroBits, + IN ULONG CommitSize, + IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, + IN OUT PULONG ViewSize, + IN SECTION_INHERIT InheritDisposition, + IN ULONG AllocationType, + IN ULONG Protect +); + +NTSTATUS +NTAPI MmUnmapViewOfSection( struct _EPROCESS* Process, PVOID BaseAddress @@ -44,6 +59,14 @@ NTSYSCALLAPI NTSTATUS NTAPI +NtAreMappedFilesTheSame( + IN PVOID File1MappedAsAnImage, + IN PVOID File2MappedAsFile +); + +NTSYSCALLAPI +NTSTATUS +NTAPI NtAllocateVirtualMemory( IN HANDLE ProcessHandle, IN OUT PVOID *BaseAddress, @@ -53,7 +76,6 @@ IN ULONG Protect ); -NTSYSCALLAPI NTSTATUS NTAPI NtCreatePagingFile( @@ -76,7 +98,6 @@ IN HANDLE FileHandle OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI NtExtendSection( @@ -84,7 +105,6 @@ IN PLARGE_INTEGER NewMaximumSize ); -NTSYSCALLAPI NTSTATUS NTAPI NtFlushVirtualMemory( @@ -104,7 +124,6 @@ IN ULONG FreeType ); -NTSYSCALLAPI NTSTATUS NTAPI NtLockVirtualMemory( @@ -114,7 +133,6 @@ PULONG NumberOfBytesLocked ); -NTSYSCALLAPI NTSTATUS NTAPI NtMapViewOfSection( @@ -130,7 +148,6 @@ IN ULONG AccessProtection ); -NTSYSCALLAPI NTSTATUS NTAPI NtOpenSection( @@ -139,7 +156,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSCALLAPI NTSTATUS NTAPI NtProtectVirtualMemory( @@ -150,7 +166,6 @@ OUT PULONG OldAccessProtection ); -NTSYSCALLAPI NTSTATUS NTAPI NtQuerySection( @@ -161,7 +176,6 @@ OUT PULONG ResultLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryVirtualMemory( @@ -173,7 +187,6 @@ OUT PULONG ResultLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtReadVirtualMemory( @@ -184,7 +197,6 @@ OUT PULONG NumberOfBytesRead ); -NTSYSCALLAPI NTSTATUS NTAPI NtUnlockVirtualMemory( @@ -194,7 +206,6 @@ OUT PULONG NumberOfBytesUnlocked OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI NtUnmapViewOfSection( @@ -202,7 +213,6 @@ IN PVOID BaseAddress ); -NTSYSCALLAPI NTSTATUS NTAPI NtWriteVirtualMemory( @@ -213,9 +223,17 @@ OUT PULONG NumberOfBytesWritten ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI +ZwAreMappedFilesTheSame( + IN PVOID File1MappedAsAnImage, + IN PVOID File2MappedAsFile +); + +NTSYSCALLAPI +NTSTATUS +NTAPI ZwAllocateVirtualMemory( IN HANDLE ProcessHandle, IN OUT PVOID *BaseAddress, @@ -225,7 +243,6 @@ IN ULONG Protect ); -NTSYSAPI NTSTATUS NTAPI ZwCreatePagingFile( @@ -235,7 +252,7 @@ IN ULONG Reserved ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwCreateSection( @@ -248,7 +265,6 @@ IN HANDLE FileHandle OPTIONAL ); -NTSYSAPI NTSTATUS NTAPI ZwExtendSection( @@ -256,7 +272,7 @@ IN PLARGE_INTEGER NewMaximumSize ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwFreeVirtualMemory( @@ -266,7 +282,6 @@ IN ULONG FreeType ); -NTSYSAPI NTSTATUS NTAPI ZwLockVirtualMemory( @@ -301,7 +316,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSAPI NTSTATUS NTAPI ZwProtectVirtualMemory( @@ -312,7 +326,6 @@ OUT PULONG OldAccessProtection ); -NTSYSAPI NTSTATUS NTAPI ZwQuerySection( @@ -323,7 +336,6 @@ OUT PULONG ResultLength ); -NTSYSAPI NTSTATUS NTAPI ZwQueryVirtualMemory( @@ -335,7 +347,6 @@ OUT PULONG ResultLength ); -NTSYSAPI NTSTATUS NTAPI ZwReadVirtualMemory( @@ -346,7 +357,6 @@ OUT PULONG NumberOfBytesRead ); -NTSYSAPI NTSTATUS NTAPI ZwUnlockVirtualMemory( @@ -364,7 +374,6 @@ IN PVOID BaseAddress ); -NTSYSAPI NTSTATUS NTAPI ZwWriteVirtualMemory( Index: include/ndk/cctypes.h =================================================================== --- include/ndk/cctypes.h (revision 21759) +++ include/ndk/cctypes.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ Index: include/ndk/pofuncs.h =================================================================== --- include/ndk/pofuncs.h (revision 21759) +++ include/ndk/pofuncs.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -57,7 +57,7 @@ IN ULONG Flags ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwInitiatePowerAction( @@ -67,7 +67,7 @@ BOOLEAN Asynchronous ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwPowerInformation( @@ -78,7 +78,7 @@ ULONG OutputBufferLength ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwSetSystemPowerState( Index: include/ndk/ntndk.h =================================================================== --- include/ndk/ntndk.h (revision 21759) +++ include/ndk/ntndk.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,16 +12,34 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ #ifndef _NTNDK_ #define _NTNDK_ +// +// Disable some warnings that we'd get on /W4. +// Only active for compilers which support this feature. +// +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4001) +#pragma warning(disable:4201) +#pragma warning(disable:4115) +#pragma warning(disable:4214) +#endif + +// +// Headers needed for NDK +// #include <stdarg.h> // C Standard Header #include <umtypes.h> // General Definitions +// +// Type Headers +// #include <cctypes.h> // Cache Manager Types #include <cmtypes.h> // Configuration Manager Types #include <dbgktypes.h> // User-Mode Kernel Debugging Types @@ -40,6 +58,9 @@ #include <rtltypes.h> // Runtime Library Types #include <setypes.h> // Security Subsystem Types +// +// Function Headers +// #include <cmfuncs.h> // Configuration Manager Functions #include <dbgkfuncs.h> // User-Mode Kernel Debugging Functions #include <kdfuncs.h> // Kernel Debugger Functions @@ -60,4 +81,7 @@ #include <asm.h> // Assembly Offsets +#ifdef _MSC_VER +#pragma warning(pop) +#endif #endif // _NTNDK_ Index: include/ndk/ldrfuncs.h =================================================================== --- include/ndk/ldrfuncs.h (revision 21759) +++ include/ndk/ldrfuncs.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -58,6 +58,11 @@ OUT PIMAGE_RESOURCE_DIRECTORY *ResourceDirectory ); +BOOLEAN +LdrUnloadAlternateResourceModule( + IN PVOID BaseAddress +); + // // Misc. Functions // @@ -70,4 +75,28 @@ OUT PVOID *ProcedureAddress ); +ULONG +NTAPI +LdrRelocateImage( + IN PVOID NewBase, + IN PUCHAR LoaderName, + IN ULONG Success, + IN ULONG Conflict, + IN ULONG Invalid +); + +NTSTATUS +LdrLockLoaderLock( + IN ULONG Flags, + OUT PULONG Disposition OPTIONAL, + OUT PULONG Cookie OPTIONAL +); + +NTSTATUS +NTAPI +LdrUnlockLoaderLock( + IN ULONG Flags, + IN ULONG Cookie OPTIONAL +); + #endif Index: include/ndk/asm.h =================================================================== --- include/ndk/asm.h (revision 21759) +++ include/ndk/asm.h (working copy) @@ -27,8 +27,15 @@ #define UserMode 0x1 // +// CPU Types +// +#define CPU_INTEL 0x1 +#define CPU_AMD 0x2 + +// // Selector Names // +#ifdef __ASM__ #define RPL_MASK 0x0003 #define MODE_MASK 0x0001 #define KGDT_R0_CODE (0x8) @@ -41,6 +48,7 @@ #define KGDT_LDT (0x48) #define KGDT_DF_TSS (0x50) #define KGDT_NMI_TSS (0x58) +#endif // // KV86M_REGISTERS Offsets @@ -302,6 +310,7 @@ // // EFLAGS // +#ifdef __ASM__ #define EFLAGS_TF 0x100 #define EFLAGS_INTERRUPT_MASK 0x200 #define EFLAGS_NESTED_TASK 0x4000 @@ -311,7 +320,6 @@ #define EFLAGS_VIP 0x100000 #define EFLAG_SIGN 0x8000 #define EFLAG_ZERO 0x4000 -#ifndef EFLAG_SELECT #define EFLAG_SELECT (EFLAG_SIGN + EFLAG_ZERO) #endif @@ -333,6 +341,7 @@ // // CR4 // +#ifdef __ASM__ #define CR4_VME 0x1 #define CR4_PVI 0x2 #define CR4_TSD 0x4 @@ -343,6 +352,7 @@ #define CR4_PGE 0x80 #define CR4_FXSR 0x200 #define CR4_XMMEXCPT 0x400 +#endif // // Usermode callout frame definitions @@ -380,6 +390,19 @@ #define SERVICE_DESCRIPTOR_LENGTH 0x0010 // +// Machine types +// +#ifdef __ASM__ +#define MACHINE_TYPE_ISA 0x0000 +#define MACHINE_TYPE_EISA 0x0001 +#define MACHINE_TYPE_MCA 0x0002 + +// +// Kernel Feature Bits +// +#define KF_RDTSC 0x00000002 +#endif +// // Generic Definitions // #define MAXIMUM_IDTVECTOR 0xFF Index: include/ndk/umfuncs.h =================================================================== --- include/ndk/umfuncs.h (revision 21759) +++ include/ndk/umfuncs.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -213,7 +213,7 @@ NTAPI LdrLoadDll( IN PWSTR SearchPath OPTIONAL, - IN ULONG LoadFlags, + IN PULONG LoadFlags OPTIONAL, IN PUNICODE_STRING Name, OUT PVOID *BaseAddress OPTIONAL ); @@ -228,10 +228,10 @@ PIMAGE_BASE_RELOCATION NTAPI LdrProcessRelocationBlock( - IN PVOID Address, - IN USHORT Count, + IN ULONG_PTR Address, + IN ULONG Count, IN PUSHORT TypeOffset, - IN ULONG_PTR Delta + IN LONG_PTR Delta ); NTSTATUS Index: include/ndk/psfuncs.h =================================================================== --- include/ndk/psfuncs.h (revision 21759) +++ include/ndk/psfuncs.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -71,7 +71,7 @@ VOID NTAPI PsEstablishWin32Callouts( - PW32_CALLOUT_DATA CalloutData + PWIN32_CALLOUTS_FPNS CalloutData ); VOID @@ -102,7 +102,6 @@ // // Native Calls // -NTSYSCALLAPI NTSTATUS NTAPI NtAlertResumeThread( @@ -110,14 +109,12 @@ OUT PULONG SuspendCount ); -NTSYSCALLAPI NTSTATUS NTAPI NtAlertThread( IN HANDLE ThreadHandle ); -NTSYSCALLAPI NTSTATUS NTAPI NtAssignProcessToJobObject( @@ -125,7 +122,6 @@ HANDLE ProcessHandle ); -NTSYSCALLAPI NTSTATUS NTAPI NtCreateJobObject( @@ -134,7 +130,6 @@ POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSCALLAPI NTSTATUS NTAPI NtCreateProcess( @@ -148,7 +143,6 @@ IN HANDLE ExceptionPort OPTIONAL ); -NTSYSCALLAPI NTSTATUS NTAPI NtCreateThread( @@ -162,7 +156,6 @@ IN BOOLEAN CreateSuspended ); -NTSYSCALLAPI NTSTATUS NTAPI NtImpersonateThread( @@ -171,7 +164,6 @@ IN PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService ); -NTSYSCALLAPI NTSTATUS NTAPI NtIsProcessInJob( @@ -189,7 +181,6 @@ IN PCLIENT_ID ClientId ); -NTSYSCALLAPI NTSTATUS NTAPI NtOpenThread( @@ -220,7 +211,6 @@ OUT PHANDLE TokenHandle ); -NTSYSCALLAPI NTSTATUS NTAPI NtQueryInformationJobObject( @@ -232,7 +222,6 @@ ); #ifndef _NTDDK_ -NTSYSCALLAPI NTSTATUS NTAPI NtQueryInformationProcess( @@ -244,7 +233,6 @@ ); #endif -NTSYSCALLAPI NTSTATUS NTAPI NtQueryInformationThread( @@ -255,14 +243,12 @@ OUT PULONG ReturnLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtRegisterThreadTerminatePort( HANDLE TerminationPort ); -NTSYSCALLAPI NTSTATUS NTAPI NtResumeThread( @@ -270,14 +256,12 @@ OUT PULONG SuspendCount ); -NTSYSCALLAPI NTSTATUS NTAPI NtResumeProcess( IN HANDLE ProcessHandle ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetInformationJobObject( @@ -287,7 +271,6 @@ ULONG JobInformationLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtSetInformationProcess( @@ -307,7 +290,6 @@ IN ULONG ThreadInformationLength ); -NTSYSCALLAPI NTSTATUS NTAPI NtSuspendProcess( @@ -321,7 +303,6 @@ IN PULONG PreviousSuspendCount ); -NTSYSCALLAPI NTSTATUS NTAPI NtTerminateProcess( @@ -329,7 +310,6 @@ IN NTSTATUS ExitStatus ); -NTSYSCALLAPI NTSTATUS NTAPI NtTerminateThread( @@ -337,7 +317,6 @@ IN NTSTATUS ExitStatus ); -NTSYSCALLAPI NTSTATUS NTAPI NtTerminateJobObject( @@ -345,7 +324,6 @@ NTSTATUS ExitStatus ); -NTSYSAPI NTSTATUS NTAPI ZwAlertResumeThread( @@ -353,14 +331,12 @@ OUT PULONG SuspendCount ); -NTSYSAPI NTSTATUS NTAPI ZwAlertThread( IN HANDLE ThreadHandle ); -NTSYSAPI NTSTATUS NTAPI ZwAssignProcessToJobObject( @@ -368,7 +344,6 @@ HANDLE ProcessHandle ); -NTSYSAPI NTSTATUS NTAPI ZwCreateJobObject( @@ -377,7 +352,6 @@ POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSAPI NTSTATUS NTAPI ZwCreateProcess( @@ -391,7 +365,6 @@ IN HANDLE ExceptionPort OPTIONAL ); -NTSYSAPI NTSTATUS NTAPI ZwCreateThread( @@ -405,7 +378,6 @@ IN BOOLEAN CreateSuspended ); -NTSYSAPI NTSTATUS NTAPI ZwImpersonateThread( @@ -414,7 +386,6 @@ IN PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService ); -NTSYSAPI NTSTATUS NTAPI ZwIsProcessInJob( @@ -422,7 +393,7 @@ IN HANDLE JobHandle OPTIONAL ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwOpenProcess( @@ -432,7 +403,6 @@ IN PCLIENT_ID ClientId ); -NTSYSAPI NTSTATUS NTAPI ZwOpenThread( @@ -442,7 +412,7 @@ IN PCLIENT_ID ClientId ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwOpenThreadToken( @@ -452,7 +422,7 @@ OUT PHANDLE TokenHandle ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwOpenThreadTokenEx( @@ -463,7 +433,6 @@ OUT PHANDLE TokenHandle ); -NTSYSAPI NTSTATUS NTAPI ZwQueryInformationJobObject( @@ -475,7 +444,6 @@ ); #ifndef _NTDDK_ -NTSYSAPI NTSTATUS NTAPI ZwQueryInformationProcess( @@ -487,7 +455,6 @@ ); #endif -NTSYSAPI NTSTATUS NTAPI ZwQueryInformationThread( @@ -498,14 +465,12 @@ OUT PULONG ReturnLength ); -NTSYSAPI NTSTATUS NTAPI ZwRegisterThreadTerminatePort( HANDLE TerminationPort ); -NTSYSAPI NTSTATUS NTAPI ZwResumeThread( @@ -513,14 +478,12 @@ OUT PULONG SuspendCount ); -NTSYSAPI NTSTATUS NTAPI ZwResumeProcess( IN HANDLE ProcessHandle ); -NTSYSAPI NTSTATUS NTAPI ZwSetInformationJobObject( @@ -530,7 +493,6 @@ ULONG JobInformationLength ); -NTSYSAPI NTSTATUS NTAPI ZwSetInformationProcess( @@ -540,7 +502,7 @@ IN ULONG ProcessInformationLength ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwSetInformationThread( @@ -550,14 +512,12 @@ IN ULONG ThreadInformationLength ); -NTSYSAPI NTSTATUS NTAPI ZwSuspendProcess( IN HANDLE ProcessHandle ); -NTSYSAPI NTSTATUS NTAPI ZwSuspendThread( @@ -565,7 +525,6 @@ IN PULONG PreviousSuspendCount ); -NTSYSAPI NTSTATUS NTAPI ZwTerminateProcess( @@ -573,7 +532,6 @@ IN NTSTATUS ExitStatus ); -NTSYSAPI NTSTATUS NTAPI ZwTerminateThread( @@ -581,7 +539,6 @@ IN NTSTATUS ExitStatus ); -NTSYSAPI NTSTATUS NTAPI ZwTerminateJobObject( Index: include/ndk/fixmes.txt =================================================================== --- include/ndk/fixmes.txt (revision 21759) +++ include/ndk/fixmes.txt (working copy) @@ -1,88 +0,0 @@ -List of ReactOS Applications compiling with the NDK -(verify, fix, and optimize their usage) --------------------------------------------------------------- - -apps\utils\ps\ps.c: #include <ndk/ntndk.h> -drivers\dd\blue\blue.c: #include <ndk/halfuncs.h> -drivers\dd\bootvid\bootvid.c: #include <ndk/ldrfuncs.h> -drivers\storage\diskdump\diskdump.c: #include <ndk/extypes.h> -drivers\storage\diskdump\diskdump.c: #include <ndk/rtlfuncs.h> -hal\hal\hal.c: #include <ndk/halfuncs.h> -hal\hal\hal.c: #include <ndk/kdfuncs.h> -lib\crt\except\unwind.c: #include <ndk/umtypes.h> -lib\crt\except\unwind.c: #include <ndk/extypes.h> -lib\crt\except\unwind.c: #include <ndk/rtlfuncs.h> -lib\dnsapi\dnsapi\stubs.c: #include <ndk/ntndk.h> -lib\epsapi\enum\drivers.c: #include <ndk/ntndk.h> -lib\epsapi\enum\modules.c: #include <ndk/ntndk.h> -lib\epsapi\enum\processes.c: #include <ndk/ntndk.h> -lib\lsasrv\lsaport.c: #include <ndk/ntndk.h> -lib\lsasrv\lsasrv.c: #include <ndk/ntndk.h> -lib\nt\entry_point.c: #include <ndk/ntndk.h> -lib\samlib\samlib.c: #include <ndk/ntndk.h> -lib\samsrv\samsrv.c: #include <ndk/ntndk.h> -lib\smdll\query.c: #include <ndk/ntndk.h> -lib\string\mbstowcs.c: #include <ndk/umtypes.h> -lib\string\mbstowcs.c: #include <ndk/rtlfuncs.h> -lib\string\sscanf.c: #include <ndk/umtypes.h> -lib\string\sscanf.c: #include <ndk/rtlfuncs.h> -lib\string\wcstombs.c: #include <ndk/umtypes.h> -lib\string\wcstombs.c: #include <ndk/rtlfuncs.h> -lib\syssetup\install.c: #include <ndk/ntndk.h> -lib\syssetup\logfile.c: #include <ndk/ntndk.h> -lib\wdmguid\wdmguid.c: #include <ndk/sysguid.h> -regtests\shared\regtests.c: #include <ndk/ntndk.h> -services\umpnpmgr\umpnpmgr.c: #include <ndk/ntndk.h> -subsys\ntvdm\ntvdm.c: #include <ndk/ntndk.h> -subsys\system\autochk\autochk.c: #include <ndk/ntndk.h> -subsys\system\lsass\lsass.c: #include <ndk/ntndk.h> -subsys\system\setup\setup.c: #include <ndk/ntndk.h> -subsys\system\sm\sm.c: #include <ndk/ntndk.h> -boot\freeldr\freeldr\include\freeldr.h: #include <ndk/ntndk.h> -drivers\fs\ms\msfs.h: #include <ndk/ntndk.h> -drivers\fs\np\npfs.h: #include <ndk/iotypes.h> -drivers\fs\vfat\vfat.h: #include <ndk/ntndk.h> -drivers\net\ndis\include\ndissys.h: #include <ndk/ntndk.h> -drivers\net\tcpip\include\precomp.h: #include <ndk/ntndk.h> -drivers\video\miniport\xboxvmp\xboxvmp.h: #include <ndk/ntndk.h> -drivers\video\videoprt\videoprt.h: #include <ndk/ntndk.h> -hal\halx86\include\hal.h: #include <ndk/ntndk.h> -include\drivers\diskdump\diskdump.h: #include <ndk/ntndk.h> -lib\advapi32\advapi32.h: #include <ndk/ntndk.h> -lib\crt\precomp.h: #include <ndk/ntndk.h> -lib\dbghelp\stackframe.h: #include <ndk/umtypes.h> -lib\dbghelp\stackframe.h: #include <ndk/extypes.h> -lib\dbghelp\stackframe.h: #include <ndk/rtlfuncs.h> -lib\dnsapi\dnsapi\precomp.h: #include <ndk/ntndk.h> -lib\fmifs\precomp.h: #include <ndk/ntndk.h> -lib\fslib\vfatlib\vfatlib.h: #include <ndk/ntndk.h> -lib\fslib\vfatxlib\vfatxlib.h: #include <ndk/ntndk.h> -lib\gdi32\include\precomp.h: #include <ndk/ntndk.h> -lib\imagehlp\precomp.h: #include <ndk/umtypes.h> -lib\imagehlp\precomp.h: #include <ndk/rtlfuncs.h> -lib\iphlpapi\iphlpapi_private.h: #include <ndk/ntndk.h> -lib\kernel32\k32.h: #include <ndk/ntndk.h> -lib\msafd\msafd.h: #include <ndk/ntndk.h> -lib\ntdll\inc\ntdll.h: #include <ndk/ntndk.h> -lib\opengl32\teb.h: #include <ndk/ntndk.h> -lib\psapi\precomp.h: #include <ndk/ntndk.h> -lib\rtl\rtl.h: #include <ndk/ntndk.h> -lib\secur32\precomp.h: #include <ndk/ntndk.h> -lib\setupapi\setupapi_private.h: #include <ndk/ntndk.h> -lib\smlib\precomp.h: #include <ndk/ntndk.h> -lib\user32\include\user32.h: #include <ndk/ntndk.h> -lib\userenv\precomp.h: #include <ndk/ntndk.h> -lib\wshirda\wshirda.h: #include <ndk/ntndk.h> -ntoskrnl\include\ntoskrnl.h: #include <ndk/ntndk.h> -ntoskrnl\include\internal\napi.h: #include <ndk/asm.h> -services\dhcp\include\rosdhcp.h: #include <ndk/ntndk.h> -services\eventlog\eventlog.h: #include <ndk/ntndk.h> -services\rpcss\rpcss.h: #include <ndk/ntndk.h> -subsys\csrss\csrss.h: #include <ndk/ntndk.h> -subsys\csrss\include\api.h: #include <ndk/ntndk.h> -subsys\csrss\win32csr\w32csr.h: #include <ndk/ntndk.h> -subsys\smss\smss.h: #include <ndk/ntndk.h> -subsys\system\cmd\precomp.h: #include <ndk/ntndk.h> -subsys\system\services\services.h: #include <ndk/ntndk.h> -subsys\system\taskmgr\precomp.h: #include <ndk/ntndk.h> -subsys\system\usetup\usetup.h: #include <ndk/ntndk.h> Index: include/ndk/ketypes.h =================================================================== --- include/ndk/ketypes.h (revision 21759) +++ include/ndk/ketypes.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -24,7 +24,6 @@ // #include <umtypes.h> #ifndef NTOS_MODE_USER -#include <arc/arc.h> #include <haltypes.h> #include <potypes.h> #include <ifssupp.h> @@ -38,18 +37,44 @@ // // Maximum System Descriptor Table Entries // -#define SSDT_MAX_ENTRIES 4 +#define SSDT_MAX_ENTRIES 2 // -// Maximum number of times a thread can be suspended +// Dispatcher Priority increments // -#define MAXIMUM_SUSPEND_COUNT 0x7F +#define THREAD_ALERT_INCREMENT 2 // -// Dispatcher Priority increments +// User Shared Data in Kernel-Mode // -#define THREAD_ALERT_INCREMENT 2 +#define KI_USER_SHARED_DATA 0xffdf0000 +// +// Physical memory offset of KUSER_SHARED_DATA +// +#define KI_USER_SHARED_DATA_PHYSICAL 0x41000 + +// +// Kernel Feature Bits +// +#define KF_RDTSC 0x00000002 + +// +// KPCR Access for non-IA64 builds +// +#define K0IPCR ((ULONG_PTR)(KIP0PCRADDRESS)) +#define PCR ((volatile KPCR * const)K0IPCR) +#define KeGetPcr() PCR + +// +// Number of dispatch codes supported by KINTERRUPT +// +#if (NTDDI_VERSION >= NTDDI_LONGHORN) +#define KINTERRUPT_DISPATCH_CODES 135 +#else +#define KINTERRUPT_DISPATCH_CODES 106 +#endif + #ifdef NTOS_MODE_USER // @@ -215,6 +240,9 @@ Waiting, Transition, DeferredReady, +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + GateWait, +#endif } KTHREAD_STATE, *PKTHREAD_STATE; // @@ -225,8 +253,32 @@ ProcessInMemory, ProcessOutOfMemory, ProcessInTransition, + ProcessInSwap, + ProcessOutSwap, } KPROCESS_STATE, *PKPROCESS_STATE; +// +// NtVdmControl Classes +// +typedef enum _VDMSERVICECLASS +{ + VdmStartExecution = 0, + VdmQueueInterrupt = 1, + VdmDelayInterrupt = 2, + VdmInitialize = 3, + VdmFeatures = 4, + VdmSetInt21Handler = 5, + VdmQueryDir = 6, + VdmPrinterDirectIoOpen = 7, + VdmPrinterDirectIoClose = 8, + VdmPrinterInitialize = 9, + VdmSetLdtEntries = 10, + VdmSetProcessLdtInfo = 11, + VdmAdlibEmulation = 12, + VdmPMCliControl = 13, + VdmQueryVdmProcess = 14, +} VDMSERVICECLASS; + #ifdef NTOS_MODE_USER // @@ -289,6 +341,9 @@ LARGE_INTEGER SystemExpirationDate; ULONG SuiteMask; BOOLEAN KdDebuggerEnabled; +#if (NTDDI_VERSION >= NTDDI_WINXPSP2) + UCHAR NXSupportPolicy; +#endif volatile ULONG ActiveConsoleId; volatile ULONG DismountCount; ULONG ComPlusPackage; @@ -306,14 +361,85 @@ volatile ULONG64 TickCountQuad; }; ULONG Cookie; +#if (NTDDI_VERSION >= NTDDI_WS03) LONGLONG ConsoleSessionForegroundProcessId; ULONG Wow64SharedInformation[MAX_WOW64_SHARED_ENTRIES]; - ULONG UserModeGlobalLogging; +#endif +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + USHORT UserModeGlobalLogger[8]; + ULONG HeapTracingPid[2]; + ULONG CritSecTracingPid[2]; + union + { + ULONG SharedDataFlags; + struct + { + ULONG DbgErrorPortPresent:1; + ULONG DbgElevationEnabled:1; + ULONG DbgVirtEnabled:1; + ULONG DbgInstallerDetectEnabled:1; + ULONG SpareBits:28; + }; + }; + ULONG ImageFileExecutionOptions; + KAFFINITY ActiveProcessorAffinity; +#endif } KUSER_SHARED_DATA, *PKUSER_SHARED_DATA; +// +// VDM Structures +// +#include "pshpack1.h" +typedef struct _VdmVirtualIca +{ + LONG ica_count[8]; + LONG ica_int_line; + LONG ica_cpu_int; + USHORT ica_base; + USHORT ica_hipiri; + USHORT ica_mode; + UCHAR ica_master; + UCHAR ica_irr; + UCHAR ica_isr; + UCHAR ica_imr; + UCHAR ica_ssr; +} VDMVIRTUALICA, *PVDMVIRTUALICA; +#include "poppack.h" + +typedef struct _VdmIcaUserData +{ + PVOID pIcaLock; + PVDMVIRTUALICA pIcaMaster; + PVDMVIRTUALICA pIcaSlave; + PULONG pDelayIrq; + PULONG pUndelayIrq; + PULONG pDelayIret; + PULONG pIretHooked; + PULONG pAddrIretBopTable; + PHANDLE phWowIdleEvent; + PLARGE_INTEGER pIcaTimeout; + PHANDLE phMainThreadSuspended; +} VDMICAUSERDATA, *PVDMICAUSERDATA; + +typedef struct _VDM_INITIALIZE_DATA +{ + PVOID TrapcHandler; + PVDMICAUSERDATA IcaUserData; +} VDM_INITIALIZE_DATA, *PVDM_INITIALIZE_DATA; + #else // +// System Thread Start Routine +// +typedef +VOID +(NTAPI *PKSYSTEM_ROUTINE)( + PKSTART_ROUTINE StartRoutine, + PVOID StartContext +); + +// // APC Environment Types // typedef enum _KAPC_ENVIRONMENT @@ -324,6 +450,17 @@ } KAPC_ENVIRONMENT; // +// CPU Cache Types +// +typedef enum _PROCESSOR_CACHE_TYPE +{ + CacheUnified, + CacheInstruction, + CacheData, + CacheTrace, +} PROCESSOR_CACHE_TYPE; + +// // PRCB DPC Data // typedef struct _KDPC_DATA @@ -344,6 +481,18 @@ } PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST; // +// CPU Cache Descriptor +// +typedef struct _CACHE_DESCRIPTOR +{ + UCHAR Level; + UCHAR Associativity; + USHORT LineSize; + ULONG Size; + PROCESSOR_CACHE_TYPE Type; +} CACHE_DESCRIPTOR, *PCACHE_DESCRIPTOR; + +// // Architectural Types // #include <arch/ketypes.h> @@ -351,11 +500,12 @@ // // Kernel Memory Node // +#include <pshpack1.h> typedef struct _KNODE { SLIST_HEADER DeadStackList; SLIST_HEADER PfnDereferenceSListHead; - ULONG ProcessorMask; + KAFFINITY ProcessorMask; ULONG Color; UCHAR Seed; UCHAR NodeNumber; @@ -364,6 +514,7 @@ ULONG FreeCount[2]; struct _SINGLE_LIST_ENTRY *PfnDeferredList; } KNODE, *PKNODE; +#include <poppack.h> // // Kernel Profile Object @@ -393,6 +544,10 @@ CSHORT Size; LIST_ENTRY InterruptListEntry; PKSERVICE_ROUTINE ServiceRoutine; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PKSERVICE_ROUTINE MessageServiceRoutine; + ULONG MessageIndex; +#endif PVOID ServiceContext; KSPIN_LOCK SpinLock; ULONG TickCount; @@ -406,9 +561,15 @@ CHAR Number; UCHAR ShareVector; KINTERRUPT_MODE Mode; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + KINTERRUPT_POLARITY Polarity; +#endif ULONG ServiceCount; ULONG DispatchCount; - ULONG DispatchCode[106]; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONGLONG Rsvd1; +#endif + ULONG DispatchCode[KINTERRUPT_DISPATCH_CODES]; } KINTERRUPT, *PKINTERRUPT; // @@ -475,179 +636,236 @@ #include <pshpack1.h> typedef struct _KTHREAD { - DISPATCHER_HEADER DispatcherHeader; /* 00 */ - LIST_ENTRY MutantListHead; /* 10 */ - PVOID InitialStack; /* 18 */ - ULONG_PTR StackLimit; /* 1C */ - PVOID KernelStack; /* 20 */ - KSPIN_LOCK ThreadLock; /* 24 */ - union /* 28 */ - { /* 28 */ - KAPC_STATE ApcState; /* 34 */ - struct /* 28 */ - { /* 28 */ - UCHAR ApcStateFill[23]; /* 34 */ - UCHAR ApcQueueable; /* 3F */ - }; /* 3F */ - }; /* 3F */ - UCHAR NextProcessor; /* 40 */ - UCHAR DeferredProcessor; /* 41 */ - UCHAR AdjustReason; /* 42 */ - UCHAR AdjustIncrement; /* 43 */ - KSPIN_LOCK ApcQueueLock; /* 44 */ - ULONG ContextSwitches; /* 48 */ - UCHAR State; /* 4C */ - UCHAR NpxState; /* 4D */ - UCHAR WaitIrql; /* 4E */ - UCHAR WaitMode; /* 4F */ - LONG WaitStatus; /* 50 */ - union /* 54 */ - { /* 54 */ - PKWAIT_BLOCK WaitBlockList; /* 54 */ - PKGATE GateObject; /* 54 */ - }; /* 54 */ - UCHAR Alertable; /* 58 */ - UCHAR WaitNext; /* 59 */ - UCHAR WaitReason; /* 5A */ - UCHAR Priority; /* 5B */ - UCHAR EnableStackSwap; /* 5C */ - UCHAR SwapBusy; /* 5D */ - UCHAR Alerted[2]; /* 5E */ - union /* 60 */ - { /* 60 */ - LIST_ENTRY WaitListEntry; /* 60 */ - SINGLE_LIST_ENTRY SwapListEntry; /* 60 */ - }; /* 68 */ - PKQUEUE Queue; /* 68 */ - ULONG WaitTime; /* 6C */ - union /* 70 */ - { /* 70 */ - struct /* 70 */ - { /* 70 */ - USHORT KernelApcDisable; /* 70 */ - USHORT SpecialApcDisable; /* 72 */ - }; /* 70 */ - ULONG CombinedApcDisable; /* 70 */ - }; /* 74 */ - struct _TEB *Teb; /* 74 */ - union /* 78 */ - { /* 78 */ - KTIMER Timer; /* 78 */ - UCHAR TimerFill[40]; /* 78 */ - }; /* 78 */ - union /* A0 */ - { /* A0 */ - struct /* A0 */ - { /* A0 */ - LONG AutoAlignment:1; /* A0 */ - LONG DisableBoost:1; /* A0 */ - LONG ReservedFlags:30; /* A0 */ - }; /* A0 */ - LONG ThreadFlags; /* A0 */ - }; /* A0 */ - PVOID Padding; /* A4 */ - union /* A8 */ - { /* A8 */ - KWAIT_BLOCK WaitBlock[4]; /* A8 */ - union /* A8 */ - { /* A8 */ - struct /* A8 */ - { /* A8 */ - UCHAR WaitBlockFill0[23]; /* A8 */ - UCHAR SystemAffinityActive; /* BF */ - }; /* A8 */ - struct /* A8 */ - { /* A8 */ - UCHAR WaitBlockFill1[47]; /* A8 */ - UCHAR PreviousMode; /* D7 */ - }; /* A8 */ - struct /* A8 */ - { /* A8 */ - UCHAR WaitBlockFill2[71]; /* A8 */ - UCHAR ResourceIndex; /* EF */ - }; /* A8 */ - struct /* A8 */ - { /* A8 */ - UCHAR WaitBlockFill3[95]; /* A8 */ - UCHAR LargeStack; /* 107 */ - }; /* A8 */ - }; /* A8 */ - }; /* A8 */ - LIST_ENTRY QueueListEntry; /* 108 */ - PKTRAP_FRAME TrapFrame; /* 110 */ - PVOID CallbackStack; /* 114 */ - PVOID ServiceTable; /* 118 */ - UCHAR ApcStateIndex; /* 11C */ - UCHAR IdealProcessor; /* 11D */ - UCHAR Preempted; /* 11E */ - UCHAR ProcessReadyQueue; /* 11F */ - UCHAR KernelStackResident; /* 120 */ - CHAR BasePriority; /* 121 */ - CHAR PriorityDecrement; /* 122 */ - CHAR Saturation; /* 123 */ - KAFFINITY UserAffinity; /* 124 */ - struct _KPROCESS *Process; /* 128 */ - KAFFINITY Affinity; /* 12C */ - PKAPC_STATE ApcStatePointer[2]; /* 130 */ - union /* 138 */ - { /* 138 */ - KAPC_STATE SavedApcState; /* 138 */ - union /* 138 */ - { /* 138 */ - UCHAR SavedApcStateFill[23]; /* 138 */ - CHAR FreezeCount; /* 14F */ - }; /* 138 */ - }; /* 138 */ - CHAR SuspendCount; /* 150 */ - UCHAR UserIdealProcessor; /* 151 */ - UCHAR CalloutActive; /* 152 */ - UCHAR Iopl; /* 153 */ - PVOID Win32Thread; /* 154 */ - PVOID StackBase; /* 158 */ - union /* 15C */ - { /* 15C */ - KAPC SuspendApc; /* 15C */ - union /* 15C */ - { /* 15C */ - UCHAR SuspendApcFill0[1]; /* 15C */ - CHAR Quantum; /* 15D */ - }; /* 15C */ - union /* 15C */ - { /* 15C */ - UCHAR SuspendApcFill1[3]; /* 15C */ - UCHAR QuantumReset; /* 15F */ - }; /* 15C */ - union /* 15C */ - { /* 15C */ - UCHAR SuspendApcFill2[4]; /* 15C */ - ULONG KernelTime; /* 160 */ - }; /* 15C */ - union /* 15C */ - { /* 15C */ - UCHAR SuspendApcFill3[36]; /* 15C */ - PVOID TlsArray; /* 180 */ - }; /* 15C */ - union /* 15C */ - { /* 15C */ - UCHAR SuspendApcFill4[40]; /* 15C */ - PVOID LegoData; /* 184 */ - }; /* 15C */ - union /* 15C */ - { /* 15C */ - UCHAR SuspendApcFill5[47]; /* 15C */ - UCHAR PowerState; /* 18B */ - }; /* 15C */ - }; /* 15C */ - ULONG UserTime; /* 18C */ - union /* 190 */ - { /* 190 */ - KSEMAPHORE SuspendSemaphore; /* 190 */ - UCHAR SuspendSemaphorefill[20]; /* 190 */ - }; /* 190 */ - ULONG SListFaultCount; /* 1A4 */ - LIST_ENTRY ThreadListEntry; /* 1A8 */ - PVOID SListFaultAddress; /* 1B0 */ -} KTHREAD; /* sizeof: 1B4 */ + DISPATCHER_HEADER DispatcherHeader; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONGLONG CycleTime; + ULONG HighCycleTime; +#else + LIST_ENTRY MutantListHead; +#endif + PVOID InitialStack; + ULONG_PTR StackLimit; + PVOID KernelStack; + KSPIN_LOCK ThreadLock; + union + { + KAPC_STATE ApcState; + struct + { + UCHAR ApcStateFill[23]; + UCHAR ApcQueueable; + }; + }; + UCHAR NextProcessor; + UCHAR DeferredProcessor; + UCHAR AdjustReason; + UCHAR AdjustIncrement; + KSPIN_LOCK ApcQueueLock; + ULONG ContextSwitches; + UCHAR State; + UCHAR NpxState; + UCHAR WaitIrql; + UCHAR WaitMode; + LONG WaitStatus; + union + { + PKWAIT_BLOCK WaitBlockList; + PKGATE GateObject; + }; + UCHAR Alertable; + UCHAR WaitNext; + UCHAR WaitReason; + UCHAR Priority; + UCHAR EnableStackSwap; + UCHAR SwapBusy; + UCHAR Alerted[2]; + union + { + LIST_ENTRY WaitListEntry; + SINGLE_LIST_ENTRY SwapListEntry; + }; + PKQUEUE Queue; + ULONG WaitTime; + union + { + struct + { + USHORT KernelApcDisable; + USHORT SpecialApcDisable; + }; + ULONG CombinedApcDisable; + }; + struct _TEB *Teb; + union + { + KTIMER Timer; + UCHAR TimerFill[40]; + }; + union + { + struct + { + LONG AutoAlignment:1; + LONG DisableBoost:1; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + LONG EtwStackTrace1ApcInserted:1; + LONG EtwStackTrace2ApcInserted:1; + LONG CycleChargePending:1; + LONG ReservedFlags:27; +#else + LONG ReservedFlags:30; +#endif + }; + LONG ThreadFlags; + }; + PVOID Padding; + union + { + KWAIT_BLOCK WaitBlock[4]; + union + { + struct + { + UCHAR WaitBlockFill0[23]; + UCHAR SystemAffinityActive; + }; + struct + { + UCHAR WaitBlockFill1[47]; + UCHAR PreviousMode; + }; + struct + { + UCHAR WaitBlockFill2[71]; + UCHAR ResourceIndex; + }; + struct + { + UCHAR WaitBlockFill3[95]; + UCHAR LargeStack; + }; + }; + }; + LIST_ENTRY QueueListEntry; + PKTRAP_FRAME TrapFrame; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PVOID FirstArgument; +#endif + PVOID CallbackStack; + PVOID ServiceTable; + UCHAR ApcStateIndex; + UCHAR IdealProcessor; + UCHAR Preempted; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + UCHAR CalloutActive; +#else + UCHAR ProcessReadyQueue; +#endif + UCHAR KernelStackResident; + CHAR BasePriority; + CHAR PriorityDecrement; + CHAR Saturation; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG SystemCallNumber; + union + { + struct + { + ULONG Reserved0:1; + ULONG ReadyTransition:1; + ULONG ProcessReadyQueue:1; + ULONG Reserved2:1; + ULONG Reserved3:28; + }; + LONG MiscFlags; + }; +#endif + KAFFINITY UserAffinity; + struct _KPROCESS *Process; + KAFFINITY Affinity; + PKAPC_STATE ApcStatePointer[2]; + union + { + KAPC_STATE SavedApcState; + union + { + UCHAR SavedApcStateFill[23]; + CHAR FreezeCount; + }; + }; + CHAR SuspendCount; + UCHAR UserIdealProcessor; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + union + { + struct + { + UCHAR ReservedBits0:1; + UCHAR SegmentsPresent:1; + UCHAR Reservedbits1:1; + }; + UCHAR NestedStateFlags; + }; +#else + UCHAR CalloutActive; +#endif + UCHAR Iopl; + PVOID Win32Thread; + PVOID StackBase; + union + { + KAPC SuspendApc; + struct + { + UCHAR SuspendApcFill0[1]; + CHAR Quantum; + }; + struct + { + UCHAR SuspendApcFill1[3]; + UCHAR QuantumReset; + }; + struct + { + UCHAR SuspendApcFill2[4]; + ULONG KernelTime; + }; + struct + { + UCHAR SuspendApcFill3[36]; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PKPRCB WaitPrcb; +#else + PVOID TlsArray; +#endif + }; + struct + { + UCHAR SuspendApcFill4[40]; + PVOID LegoData; + }; + struct + { + UCHAR SuspendApcFill5[47]; + UCHAR PowerState; + }; + }; + ULONG UserTime; + union + { + KSEMAPHORE SuspendSemaphore; + UCHAR SuspendSemaphorefill[20]; + }; + ULONG SListFaultCount; + LIST_ENTRY ThreadListEntry; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + LIST_ENTRY MutantListHead; +#endif + PVOID SListFaultAddress; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PVOID MdlForLockedteb; +#endif +} KTHREAD; #include <poppack.h> // @@ -655,46 +873,55 @@ // typedef struct _KPROCESS { - DISPATCHER_HEADER Header; /* 000 */ - LIST_ENTRY ProfileListHead; /* 010 */ - PHYSICAL_ADDRESS DirectoryTableBase; /* 018 */ + DISPATCHER_HEADER Header; + LIST_ENTRY ProfileListHead; + PHYSICAL_ADDRESS DirectoryTableBase; #if defined(_M_IX86) - KGDTENTRY LdtDescriptor; /* 020 */ - KIDTENTRY Int21Descriptor; /* 028 */ - USHORT IopmOffset; /* 030 */ - UCHAR Iopl; /* 032 */ - UCHAR Unused; /* 033 */ + KGDTENTRY LdtDescriptor; + KIDTENTRY Int21Descriptor; + USHORT IopmOffset; + UCHAR Iopl; + UCHAR Unused; #endif - ULONG ActiveProcessors; /* 034 */ - ULONG KernelTime; /* 038 */ - ULONG UserTime; /* 03C */ - LIST_ENTRY ReadyListHead; /* 040 */ - LIST_ENTRY SwapListEntry; /* 048 */ - PVOID VdmTrapcHandler; /* 04C */ - LIST_ENTRY ThreadListHead; /* 050 */ - KSPIN_LOCK ProcessLock; /* 058 */ - KAFFINITY Affinity; /* 05C */ + ULONG ActiveProcessors; + ULONG KernelTime; + ULONG UserTime; + LIST_ENTRY ReadyListHead; + SINGLE_LIST_ENTRY SwapListEntry; + PVOID VdmTrapcHandler; + LIST_ENTRY ThreadListHead; + KSPIN_LOCK ProcessLock; + KAFFINITY Affinity; union { struct { - ULONG AutoAlignment:1; /* 060.0 */ - ULONG DisableBoost:1; /* 060.1 */ - ULONG DisableQuantum:1; /* 060.2 */ - ULONG ReservedFlags:29; /* 060.3 */ + ULONG AutoAlignment:1; + ULONG DisableBoost:1; + ULONG DisableQuantum:1; + ULONG ReservedFlags:29; }; - ULONG ProcessFlags; /* 060 */ + ULONG ProcessFlags; }; - CHAR BasePriority; /* 064 */ - CHAR QuantumReset; /* 065 */ - UCHAR State; /* 066 */ - UCHAR ThreadSeed; /* 067 */ - UCHAR PowerState; /* 068 */ - UCHAR IdealNode; /* 069 */ - UCHAR Visited; /* 06A */ - KEXECUTE_OPTIONS Flags; /* 06B */ - ULONG StackCount; /* 06C */ - LIST_ENTRY ProcessListEntry; /* 070 */ + CHAR BasePriority; + CHAR QuantumReset; + UCHAR State; + UCHAR ThreadSeed; + UCHAR PowerState; + UCHAR IdealNode; + UCHAR Visited; + union + { + KEXECUTE_OPTIONS Flags; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + UCHAR ExecuteOptions; +#endif + }; + ULONG StackCount; + LIST_ENTRY ProcessListEntry; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONGLONG CycleTime; +#endif } KPROCESS, *PKPROCESS; // @@ -714,10 +941,10 @@ // // Exported Loader Parameter Block // -#ifdef _REACTOS_ -extern LOADER_PARAMETER_BLOCK NTSYSAPI KeLoaderBlock; +#ifndef _REACTOS_ +extern struct _LOADER_PARAMETER_BLOCK NTSYSAPI *KeLoaderBlock; #else -extern PLOADER_PARAMETER_BLOCK NTSYSAPI KeLoaderBlock; +extern struct _ROS_LOADER_PARAMETER_BLOCK NTSYSAPI KeLoaderBlock; #endif // Index: include/ndk/cmtypes.h =================================================================== --- include/ndk/cmtypes.h (revision 21759) +++ include/ndk/cmtypes.h (working copy) @@ -1,4 +1,4 @@ -/*++ NDK Version: 0095 +/*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. @@ -12,7 +12,7 @@ Author: - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 --*/ @@ -42,6 +42,8 @@ #define PNP_SET_DEVICE_STATUS 1 #define PNP_CLEAR_DEVICE_STATUS 2 +#ifdef NTOS_MODE_USER + // // Resource Type // @@ -59,7 +61,6 @@ #define CmResourceTypePcCardConfig 130 #define CmResourceTypeMfCardConfig 131 -#ifdef NTOS_MODE_USER // // Resource Descriptor Share Dispositions @@ -342,7 +343,8 @@ { UNICODE_STRING TargetDeviceInstance; ULONG Relation; - UNICODE_STRING RelatedDeviceInstance; + PWCHAR RelatedDeviceInstance; + ULONG RelatedDeviceInstanceLength; } PLUGPLAY_CONTROL_RELATED_DEVICE_DATA, *PPLUGPLAY_CONTROL_RELATED_DEVICE_DATA; // Class 0x0E @@ -474,6 +476,15 @@ } CM_RESOURCE_LIST, *PCM_RESOURCE_LIST; // +// ROM Block Structure +// +typedef struct _CM_ROM_BLOCK +{ + ULONG Address; + ULONG Size; +} CM_ROM_BLOCK, *PCM_ROM_BLOCK; + +// // Disk/INT13 Structures // typedef struct _CM_INT13_DRIVE_PARAMETER Index: include/ndk/readme.txt =================================================================== --- include/ndk/readme.txt (revision 21759) +++ include/ndk/readme.txt (working copy) @@ -12,7 +12,7 @@ The author, Alex Ionescu, may be reached through the following means: -Email: alex.ionescu(a)reactos.com +Email: alexi(a)tinykrnl.org Mail: 2246, Duvernay. H3J 2Y3. Montreal, QC. CANADA. Phone: (514)581-7156 @@ -68,6 +68,7 @@ - GNU NTIFS.H, Revision 43 - W32API, Version 2.5 +- Microsoft Windows Driver Kit - Microsoft Driver Development Kit 2003 SP1 - Microsoft Driver Development Kit 2000 - Microsoft Driver Development Kit NT 4 @@ -140,24 +141,24 @@ * User Mode Application requiring Native Types: #define WIN32_NO_STATUS /* Tell Windows headers you'll use ntstatus.s from NDK */ - #include <windows.h> /* Declare Windows Headers like you normally would */ - #include <ntndk.h> /* Declare the NDK Headers */ + #include "windows.h" /* Declare Windows Headers like you normally would */ + #include "ntndk.h" /* Declare the NDK Headers */ * Native Mode Application: - #include <windows.h> /* Declare Windows Headers for basic types. NEEDED UNTIL NDK 1.5 */ - #include <ntndk.h> /* Declare the NDK Headers */ + #include "windows.h" /* Declare Windows Headers for basic types. NEEDED UNTIL NDK 1.5 */ + #include "ntndk.h" /* Declare the NDK Headers */ * Kernel Mode Driver: - #include <ntddk.h> /* Declare DDK Headers like you normally would */ - #include <ntndk.h> /* Declare the NDK Headers */ + #include "ntddk.h" /* Declare DDK Headers like you normally would */ + #include "ntndk.h" /* Declare the NDK Headers */ * You may also include only the files you need (example for User-Mode application): #define WIN32_NO_STATUS /* Tell Windows headers you'll use ntstatus.s from NDK */ - #include <windows.h> /* Declare Windows Headers like you normally would */ - #include <rtlfuncs.h> /* Declare the Rtl* Functions */ + #include "windows.h" /* Declare Windows Headers like you normally would */ + #include "rtlfuncs.h" /* Declare the Rtl* Functions */ 3.3 CAVEATS @@ -167,5 +168,5 @@ ones. As such, you 'cannot include winternl.h in any project that uses the NDK. Note however, that the NDK fully replaces it and retains compatibility with any project that used it. * Native programs: Native programs must include "windows.h" until the next release of the NDK (1.5). The upcoming - version will automatically detect the lack of missing types and include them. Note however that you will still need - to have the PSDK installed. + version will automatically detect the lack of missing types and include them. Note however that you will still + need to have the PSDK installed. Index: ntoskrnl/ldr/loader.c =================================================================== --- ntoskrnl/ldr/loader.c (revision 21759) +++ ntoskrnl/ldr/loader.c (working copy) @@ -131,7 +131,7 @@ DPRINT("ModuleObject:%08x entrypoint at %x\n", &NtoskrnlModuleObject, NtoskrnlModuleObject.EntryPoint); NtoskrnlModuleObject.SizeOfImage = NtHeader->OptionalHeader.SizeOfImage; - InsertTailList(&ModuleListHead, &NtoskrnlModuleObject.InLoadOrderModuleList); + InsertTailList(&ModuleListHead, &NtoskrnlModuleObject.InLoadOrderLinks); /* Initialize ModuleObject for HAL */ RtlZeroMemory(&HalModuleObject, sizeof(LDR_DATA_TABLE_ENTRY)); @@ -145,7 +145,7 @@ DPRINT("ModuleObject:%08x entrypoint at %x\n", &HalModuleObject, HalModuleObject.EntryPoint); HalModuleObject.SizeOfImage = NtHeader->OptionalHeader.SizeOfImage; - InsertTailList(&ModuleListHead, &HalModuleObject.InLoadOrderModuleList); + InsertTailList(&ModuleListHead, &HalModuleObject.InLoadOrderLinks); } NTSTATUS @@ -343,7 +343,7 @@ /* Remove the module from the module list */ KeAcquireSpinLock(&ModuleListLock,&Irql); - RemoveEntryList(&ModuleObject->InLoadOrderModuleList); + RemoveEntryList(&ModuleObject->InLoadOrderLinks); KeReleaseSpinLock(&ModuleListLock, Irql); /* Hook for KDB on unloading a driver. */ @@ -390,7 +390,7 @@ PLIST_ENTRY current_entry; PLDR_DATA_TABLE_ENTRY current; ULONG ModuleCount = 0; - PSYSTEM_MODULE_INFORMATION Smi; + PRTL_PROCESS_MODULES Smi; ANSI_STRING AnsiName; PCHAR p; KIRQL Irql; @@ -405,13 +405,13 @@ while (current_entry != (&ModuleListHead)) { ModuleCount++; - current = CONTAINING_RECORD(current_entry,LDR_DATA_TABLE_ENTRY,InLoadOrderModuleList); + current = CONTAINING_RECORD(current_entry,LDR_DATA_TABLE_ENTRY,InLoadOrderLinks); tmpBufferSize += current->FullDllName.Length + sizeof(WCHAR) + sizeof(UNICODE_STRING); current_entry = current_entry->Flink; } - *ReqSize = sizeof(SYSTEM_MODULE_INFORMATION)+ - (ModuleCount - 1) * sizeof(SYSTEM_MODULE_INFORMATION_ENTRY); + *ReqSize = sizeof(RTL_PROCESS_MODULES)+ + (ModuleCount - 1) * sizeof(RTL_PROCESS_MODULE_INFORMATION); if (Size < *ReqSize) { @@ -431,23 +431,23 @@ /* fill the buffer */ memset(Buffer, '=', Size); - Smi = (PSYSTEM_MODULE_INFORMATION)Buffer; - Smi->Count = ModuleCount; + Smi = (PRTL_PROCESS_MODULES)Buffer; + Smi->NumberOfModules = ModuleCount; ModuleCount = 0; current_entry = ModuleListHead.Flink; while (current_entry != (&ModuleListHead)) { - current = CONTAINING_RECORD(current_entry,LDR_DATA_TABLE_ENTRY,InLoadOrderModuleList); + current = CONTAINING_RECORD(current_entry,LDR_DATA_TABLE_ENTRY,InLoadOrderLinks); - Smi->Module[ModuleCount].Unknown1 = 0; /* Always 0 */ - Smi->Module[ModuleCount].Unknown2 = 0; /* Always 0 */ - Smi->Module[ModuleCount].Base = current->DllBase; - Smi->Module[ModuleCount].Size = current->SizeOfImage; - Smi->Module[ModuleCount].Flags = 0; /* Flags ??? (GN) */ - Smi->Module[ModuleCount].Index = (USHORT)ModuleCount; - Smi->Module[ModuleCount].NameLength = 0; - Smi->Module[ModuleCount].LoadCount = 0; /* FIXME */ + Smi->Modules[ModuleCount].Section = 0; /* Always 0 */ + Smi->Modules[ModuleCount].MappedBase = 0; /* Always 0 */ + Smi->Modules[ModuleCount].ImageBase = current->DllBase; + Smi->Modules[ModuleCount].ImageSize = current->SizeOfImage; + Smi->Modules[ModuleCount].Flags = 0; /* Flags ??? (GN) */ + Smi->Modules[ModuleCount].LoadOrderIndex = (USHORT)ModuleCount; + Smi->Modules[ModuleCount].InitOrderIndex = 0; + Smi->Modules[ModuleCount].LoadCount = 0; /* FIXME */ UnicodeName[ModuleCount].Buffer = tmpNameBuffer; UnicodeName[ModuleCount].MaximumLength = current->FullDllName.Length + sizeof(WCHAR); tmpNameBuffer += UnicodeName[ModuleCount].MaximumLength / sizeof(WCHAR); @@ -459,24 +459,24 @@ KeReleaseSpinLock(&ModuleListLock, Irql); - for (ModuleCount = 0; ModuleCount < Smi->Count; ModuleCount++) + for (ModuleCount = 0; ModuleCount < Smi->NumberOfModules; ModuleCount++) { AnsiName.Length = 0; AnsiName.MaximumLength = 255; - AnsiName.Buffer = Smi->Module[ModuleCount].ImageName; + AnsiName.Buffer = Smi->Modules[ModuleCount].FullPathName; RtlUnicodeStringToAnsiString(&AnsiName, &UnicodeName[ModuleCount], FALSE); AnsiName.Buffer[AnsiName.Length] = 0; - Smi->Module[ModuleCount].NameLength = AnsiName.Length; + Smi->Modules[ModuleCount].InitOrderIndex = AnsiName.Length; p = strrchr(AnsiName.Buffer, '\\'); if (p == NULL) { - Smi->Module[ModuleCount].PathLength = 0; + Smi->Modules[ModuleCount].OffsetToFileName = 0; } else { p++; - Smi->Module[ModuleCount].PathLength = p - AnsiName.Buffer; + Smi->Modules[ModuleCount].OffsetToFileName = p - AnsiName.Buffer; } } @@ -596,7 +596,7 @@ Entry = ModuleListHead.Flink; while (Entry != &ModuleListHead) { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); DPRINT("Comparing %wZ and %wZ\n", &Module->BaseDllName, @@ -897,7 +897,7 @@ /* Insert module */ KeAcquireSpinLock(&ModuleListLock, &Irql); InsertTailList(&ModuleListHead, - &CreatedModuleObject->InLoadOrderModuleList); + &CreatedModuleObject->InLoadOrderLinks); KeReleaseSpinLock(&ModuleListLock, Irql); *ModuleObject = CreatedModuleObject; Index: ntoskrnl/ps/process.c =================================================================== --- ntoskrnl/ps/process.c (revision 21759) +++ ntoskrnl/ps/process.c (working copy) @@ -31,7 +31,7 @@ NTSTATUS NTAPI -PsLockProcess(PEPROCESS Process, BOOLEAN Timeout) +PsLockProcess(PROS_EPROCESS Process, BOOLEAN Timeout) { ULONG Attempts = 0; PKTHREAD PrevLockOwner; @@ -90,7 +90,7 @@ VOID NTAPI -PsUnlockProcess(PEPROCESS Process) +PsUnlockProcess(PROS_EPROCESS Process) { PAGED_CODE(); @@ -325,7 +325,7 @@ /* Setup the Lock Event */ DPRINT("Initialzing Process Lock\n"); - KeInitializeEvent(&Process->LockEvent, SynchronizationEvent, FALSE); + KeInitializeEvent(&((PROS_EPROCESS)Process)->LockEvent, SynchronizationEvent, FALSE); /* Setup the Thread List Head */ DPRINT("Initialzing Process ThreadListHead\n"); @@ -338,8 +338,8 @@ /* Set Process's Directory Base */ DPRINT("Initialzing Process Directory Base\n"); - MmCopyMmInfo(pParentProcess ? pParentProcess : PsInitialSystemProcess, - Process, + MmCopyMmInfo((PROS_EPROCESS)(pParentProcess ? pParentProcess : PsInitialSystemProcess), + (PROS_EPROCESS)Process, &DirectoryTableBase); /* Now initialize the Kernel Process */ @@ -360,7 +360,7 @@ /* Create the Process' Address Space */ DPRINT("Initialzing Process Address Space\n"); - Status = MmCreateProcessAddressSpace(Process, SectionObject); + Status = MmCreateProcessAddressSpace((PROS_EPROCESS)Process, (PROS_SECTION_OBJECT)SectionObject); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create Address Space\n"); @@ -376,8 +376,8 @@ /* Create a handle for the Process */ DPRINT("Initialzing Process CID Handle\n"); - CidEntry.u1.Object = Process; - CidEntry.u2.GrantedAccess = 0; + CidEntry.Object = Process; + CidEntry.GrantedAccess = 0; Process->UniqueProcessId = ExCreateHandle(PspCidTable, &CidEntry); DPRINT("Created CID: %d\n", Process->UniqueProcessId); if(!Process->UniqueProcessId) @@ -393,7 +393,7 @@ if (pParentProcess) { DPRINT("Creating PEB\n"); - Status = MmCreatePeb(Process); + Status = MmCreatePeb((PROS_EPROCESS)Process); if (!NT_SUCCESS(Status)) { DbgPrint("NtCreateProcess() Peb creation failed: Status %x\n",Status); @@ -492,7 +492,7 @@ ProcessId))) { /* Get the Process */ - FoundProcess = CidEntry->u1.Object; + FoundProcess = CidEntry->Object; /* Make sure it's really a process */ if (FoundProcess->Pcb.Header.Type == ProcessObject) @@ -534,7 +534,7 @@ Cid->UniqueThread))) { /* Get the Process */ - FoundThread = CidEntry->u1.Object; + FoundThread = CidEntry->Object; /* Make sure it's really a thread and this process' */ if ((FoundThread->Tcb.DispatcherHeader.Type == ThreadObject) && Index: ntoskrnl/ps/win32.c =================================================================== --- ntoskrnl/ps/win32.c (revision 21759) +++ ntoskrnl/ps/win32.c (working copy) @@ -13,17 +13,18 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> +#include <win32k/callout.h> /* GLOBALS ******************************************************************/ -static PW32_PROCESS_CALLBACK PspWin32ProcessCallback = NULL; -static PW32_THREAD_CALLBACK PspWin32ThreadCallback = NULL; +static PKWIN32_PROCESS_CALLOUT PspWin32ProcessCallback = NULL; +static PKWIN32_THREAD_CALLOUT PspWin32ThreadCallback = NULL; extern OB_OPEN_METHOD ExpWindowStationObjectOpen; -extern OB_PARSE_METHOD ExpWindowStationObjectParse; +extern OB_ROS_PARSE_METHOD ExpWindowStationObjectParse; extern OB_DELETE_METHOD ExpWindowStationObjectDelete; -extern OB_FIND_METHOD ExpWindowStationObjectFind; -extern OB_CREATE_METHOD ExpDesktopObjectCreate; +extern OB_ROS_FIND_METHOD ExpWindowStationObjectFind; +extern OB_ROS_CREATE_METHOD ExpDesktopObjectCreate; extern OB_DELETE_METHOD ExpDesktopObjectDelete; #ifndef ALEX_CB_REWRITE @@ -55,11 +56,12 @@ */ VOID STDCALL -PsEstablishWin32Callouts(PW32_CALLOUT_DATA CalloutData) +PsEstablishWin32Callouts(PWIN32_CALLOUTS_FPNS calloutData) { + PW32_CALLOUT_DATA CalloutData = (PW32_CALLOUT_DATA)calloutData; PspWin32ProcessCallback = CalloutData->W32ProcessCallout; PspWin32ThreadCallback = CalloutData->W32ThreadCallout; - ExpWindowStationObjectOpen = CalloutData->WinStaCreate; + ExpWindowStationObjectOpen = CalloutData->WinStaOpen; ExpWindowStationObjectParse = CalloutData->WinStaParse; ExpWindowStationObjectDelete = CalloutData->WinStaDelete; ExpWindowStationObjectFind = CalloutData->WinStaFind; Index: ntoskrnl/ps/query.c =================================================================== --- ntoskrnl/ps/query.c (revision 21759) +++ ntoskrnl/ps/query.c (working copy) @@ -428,11 +428,11 @@ case ProcessImageFileName: { ULONG ImagePathLen = 0; - PSECTION_OBJECT Section; + PROS_SECTION_OBJECT Section; PUNICODE_STRING DstPath = (PUNICODE_STRING)ProcessInformation; PWSTR SrcBuffer = NULL, DstBuffer = (PWSTR)(DstPath + 1); - Section = (PSECTION_OBJECT)Process->SectionObject; + Section = (PROS_SECTION_OBJECT)Process->SectionObject; if (Section != NULL && Section->FileObject != NULL) { @@ -653,7 +653,7 @@ { /* lock the process to be thread-safe! */ - Status = PsLockProcess(Process, FALSE); + Status = PsLockProcess((PROS_EPROCESS)Process, FALSE); if(NT_SUCCESS(Status)) { /* @@ -671,7 +671,7 @@ ObDereferenceObject(ExceptionPort); Status = STATUS_PORT_ALREADY_SET; } - PsUnlockProcess(Process); + PsUnlockProcess((PROS_EPROCESS)Process); } else { @@ -758,7 +758,7 @@ /* FIXME - update the session id for the process token */ - Status = PsLockProcess(Process, FALSE); + Status = PsLockProcess((PROS_EPROCESS)Process, FALSE); if(NT_SUCCESS(Status)) { Process->Session = SessionInfo.SessionId; @@ -785,7 +785,7 @@ KeDetachProcess(); } - PsUnlockProcess(Process); + PsUnlockProcess((PROS_EPROCESS)Process); } } break; Index: ntoskrnl/ps/thread.c =================================================================== --- ntoskrnl/ps/thread.c (revision 21759) +++ ntoskrnl/ps/thread.c (working copy) @@ -182,8 +182,8 @@ /* Create Cid Handle */ DPRINT("Creating Thread Handle (CID)\n"); - CidEntry.u1.Object = Thread; - CidEntry.u2.GrantedAccess = 0; + CidEntry.Object = Thread; + CidEntry.GrantedAccess = 0; Thread->Cid.UniqueThread = ExCreateHandle(PspCidTable, &CidEntry); if (!Thread->Cid.UniqueThread) { @@ -220,7 +220,7 @@ /* Create Teb */ DPRINT("Initialliazing Thread PEB\n"); - TebBase = MmCreateTeb(Process, &Thread->Cid, InitialTeb); + TebBase = MmCreateTeb((PROS_EPROCESS)Process, &Thread->Cid, InitialTeb); /* Set the Start Addresses */ DPRINT("Initialliazing Thread Start Addresses :%x, %x\n", ThreadContext->Eip, ThreadContext->Eax); @@ -378,7 +378,7 @@ ThreadId))) { /* Get the Process */ - FoundThread = CidEntry->u1.Object; + FoundThread = CidEntry->Object; /* Make sure it's really a process */ if (FoundThread->Tcb.DispatcherHeader.Type == ThreadObject) Index: ntoskrnl/ps/psmgr.c =================================================================== --- ntoskrnl/ps/psmgr.c (revision 21759) +++ ntoskrnl/ps/psmgr.c (working copy) @@ -250,10 +250,10 @@ KProcess = &PsInitialSystemProcess->Pcb; PspInheritQuota(PsInitialSystemProcess, NULL); - MmInitializeAddressSpace(PsInitialSystemProcess, - &PsInitialSystemProcess->AddressSpace); + MmInitializeAddressSpace((PROS_EPROCESS)PsInitialSystemProcess, + &((PROS_EPROCESS)PsInitialSystemProcess)->AddressSpace); - KeInitializeEvent(&PsInitialSystemProcess->LockEvent, SynchronizationEvent, FALSE); + KeInitializeEvent(&((PROS_EPROCESS)PsInitialSystemProcess)->LockEvent, SynchronizationEvent, FALSE); #if defined(__GNUC__) KProcess->DirectoryTableBase = @@ -300,8 +300,8 @@ ObCreateHandleTable(NULL, FALSE, PsInitialSystemProcess); ObpKernelHandleTable = PsInitialSystemProcess->ObjectTable; - CidEntry.u1.Object = PsInitialSystemProcess; - CidEntry.u2.GrantedAccess = 0; + CidEntry.Object = PsInitialSystemProcess; + CidEntry.GrantedAccess = 0; PsInitialSystemProcess->UniqueProcessId = ExCreateHandle(PspCidTable, &CidEntry); if(!PsInitialSystemProcess->UniqueProcessId) Index: ntoskrnl/ps/job.c =================================================================== --- ntoskrnl/ps/job.c (revision 21759) +++ ntoskrnl/ps/job.c (working copy) @@ -157,7 +157,7 @@ /* lock the process so we can safely assign the process. Note that in the meanwhile another thread could have assigned this process to a job! */ - Status = PsLockProcess(Process, FALSE); + Status = PsLockProcess((PROS_EPROCESS)Process, FALSE); if(NT_SUCCESS(Status)) { if(Process->Job == NULL && Process->Session == Job->SessionId) @@ -173,7 +173,7 @@ /* process is already assigned to a job or session id differs! */ Status = STATUS_ACCESS_DENIED; } - PsUnlockProcess(Process); + PsUnlockProcess((PROS_EPROCESS)Process); if(NT_SUCCESS(Status)) { Index: ntoskrnl/ps/kill.c =================================================================== --- ntoskrnl/ps/kill.c (revision 21759) +++ ntoskrnl/ps/kill.c (working copy) @@ -166,7 +166,7 @@ SeDeassignPrimaryToken(Process); /* Release Memory Information */ - MmReleaseMmInfo(Process); + MmReleaseMmInfo((PROS_EPROCESS)Process); /* Delete the W32PROCESS structure if there's one associated */ if(Process->Win32Process != NULL) ExFreePool(Process->Win32Process); @@ -240,7 +240,7 @@ KeLowerIrql(PASSIVE_LEVEL); /* Lock the Process before we modify its thread entries */ - PsLockProcess(CurrentProcess, FALSE); + PsLockProcess((PROS_EPROCESS)CurrentProcess, FALSE); /* wake up the thread so we don't deadlock on PsLockProcess */ KeForceResumeThread(&CurrentThread->Tcb); @@ -308,7 +308,7 @@ } DPRINT("Decommit teb at %p\n", Teb); - MmDeleteTeb(CurrentProcess, Teb); + MmDeleteTeb((PROS_EPROCESS)CurrentProcess, Teb); CurrentThread->Tcb.Teb = NULL; } @@ -316,7 +316,7 @@ if (Last) PspExitProcess(CurrentProcess); /* Unlock the Process */ - PsUnlockProcess(CurrentProcess); + PsUnlockProcess((PROS_EPROCESS)CurrentProcess); /* Cancel I/O for the thread. */ IoCancelThreadIo(CurrentThread); @@ -563,11 +563,11 @@ CurrentThread = PsGetCurrentThread(); - PsLockProcess(Process, FALSE); + PsLockProcess((PROS_EPROCESS)Process, FALSE); if(Process->ExitTime.QuadPart != 0) { - PsUnlockProcess(Process); + PsUnlockProcess((PROS_EPROCESS)Process); ObDereferenceObject(Process); return STATUS_PROCESS_IS_TERMINATING; } @@ -592,7 +592,7 @@ unlocking the process, fail */ CurrentThread->Terminated = TRUE; - PsUnlockProcess(Process); + PsUnlockProcess((PROS_EPROCESS)Process); /* we can safely dereference the process because the current thread holds a reference to it until it gets reaped */ @@ -610,7 +610,7 @@ } /* unlock and dereference the process so the threads can kill themselves */ - PsUnlockProcess(Process); + PsUnlockProcess((PROS_EPROCESS)Process); ObDereferenceObject(Process); return(STATUS_SUCCESS); @@ -668,7 +668,7 @@ if (Thread != PsGetCurrentThread()) { /* we need to lock the process to make sure it's not already terminating */ - PsLockProcess(Thread->ThreadsProcess, FALSE); + PsLockProcess((PROS_EPROCESS)Thread->ThreadsProcess, FALSE); /* This isn't our thread, terminate it if not already done */ if (!Thread->Terminated) { @@ -679,7 +679,7 @@ PspTerminateThreadByPointer(Thread, ExitStatus); } - PsUnlockProcess(Thread->ThreadsProcess); + PsUnlockProcess((PROS_EPROCESS)Thread->ThreadsProcess); /* Dereference the Thread and return */ ObDereferenceObject(Thread); Index: ntoskrnl/include/ntoskrnl.h =================================================================== --- ntoskrnl/include/ntoskrnl.h (revision 21759) +++ ntoskrnl/include/ntoskrnl.h (working copy) @@ -16,6 +16,7 @@ #include <ntddk.h> #include <ntifs.h> #include <wdmguid.h> +#include <arc/arc.h> #include <ndk/ntndk.h> #undef TEXT #define TEXT(s) L##s @@ -23,6 +24,7 @@ /* FIXME: Temporary until CC Ros is gone */ #include <ccros.h> +#include <rosldr.h> /* Disk Dump Driver Header */ #include <diskdump/diskdump.h> Index: ntoskrnl/include/internal/kd.h =================================================================== --- ntoskrnl/include/internal/kd.h (revision 21759) +++ ntoskrnl/include/internal/kd.h (working copy) @@ -1,10 +1,61 @@ #ifndef __INCLUDE_INTERNAL_KERNEL_DEBUGGER_H #define __INCLUDE_INTERNAL_KERNEL_DEBUGGER_H +// +// Kernel Debugger Port Definition +// +typedef struct _KD_PORT_INFORMATION +{ + ULONG ComPort; + ULONG BaudRate; + ULONG BaseAddress; +} KD_PORT_INFORMATION, *PKD_PORT_INFORMATION; + struct _KD_DISPATCH_TABLE; extern KD_PORT_INFORMATION GdbPortInfo; +BOOLEAN +NTAPI +KdPortInitialize( + PKD_PORT_INFORMATION PortInformation, + ULONG Unknown1, + ULONG Unknown2 +); + +BOOLEAN +NTAPI +KdPortInitializeEx( + PKD_PORT_INFORMATION PortInformation, + ULONG Unknown1, + ULONG Unknown2 +); + +BOOLEAN +NTAPI +KdPortGetByte( + PUCHAR ByteRecieved); + +BOOLEAN +NTAPI +KdPortGetByteEx( + PKD_PORT_INFORMATION PortInformation, + PUCHAR ByteRecieved); + +VOID +NTAPI +KdPortPutByte( + UCHAR ByteToSend +); + +VOID +NTAPI +KdPortPutByteEx( + PKD_PORT_INFORMATION PortInformation, + UCHAR ByteToSend +); + /* SYMBOL ROUTINES **********************************************************/ +#ifdef __NTOSKRNL__ #if defined(KDBG) || defined(DBG) @@ -284,4 +335,5 @@ /* Whether to enter KDB as early as possible or not */ extern BOOLEAN KdpEarlyBreak; +#endif #endif /* __INCLUDE_INTERNAL_KERNEL_DEBUGGER_H */ Index: ntoskrnl/include/internal/ke.h =================================================================== --- ntoskrnl/include/internal/ke.h (revision 21759) +++ ntoskrnl/include/internal/ke.h (working copy) @@ -277,13 +277,6 @@ /* ipi.c ********************************************************************/ -BOOLEAN -STDCALL -KiIpiServiceRoutine( - IN PKTRAP_FRAME TrapFrame, - IN struct _KEXCEPTION_FRAME* ExceptionFrame -); - VOID NTAPI KiIpiSendRequest( @@ -291,13 +284,6 @@ ULONG IpiRequest ); -VOID -NTAPI -KeIpiGenericCall( - VOID (STDCALL *WorkerRoutine)(PVOID), - PVOID Argument -); - /* next file ***************************************************************/ VOID @@ -714,13 +700,6 @@ NTAPI KiSetSystemTime(PLARGE_INTEGER NewSystemTime); -NTSTATUS -STDCALL -Ke386CallBios( - UCHAR Int, - PKV86M_REGISTERS Regs -); - ULONG NTAPI KeV86Exception( Index: ntoskrnl/include/internal/ob.h =================================================================== --- ntoskrnl/include/internal/ob.h (revision 21759) +++ ntoskrnl/include/internal/ob.h (working copy) @@ -31,6 +31,29 @@ LARGE_INTEGER CreateTime; } SYMLINK_OBJECT, *PSYMLINK_OBJECT; +typedef struct _ROS_OBJECT_HEADER +{ + LIST_ENTRY Entry; + LONG PointerCount; + union + { + LONG HandleCount; + PVOID NextToFree; + }; + POBJECT_TYPE Type; + UCHAR NameInfoOffset; + UCHAR HandleInfoOffset; + UCHAR QuotaInfoOffset; + UCHAR Flags; + union + { + POBJECT_CREATE_INFORMATION ObjectCreateInfo; + PVOID QuotaBlockCharged; + }; + PSECURITY_DESCRIPTOR SecurityDescriptor; + QUAD Body; +} ROS_OBJECT_HEADER, *PROS_OBJECT_HEADER; + #define BODY_TO_HEADER(objbdy) \ CONTAINING_RECORD((objbdy), OBJECT_HEADER, Body) @@ -43,7 +66,7 @@ #define HEADER_TO_CREATOR_INFO(objhdr) ((POBJECT_HEADER_CREATOR_INFO) \ (!((objhdr)->Flags & OB_FLAG_CREATOR_INFO) ? NULL: ((PCHAR)(objhdr) - sizeof(OBJECT_HEADER_CREATOR_INFO)))) -#define OBJECT_ALLOC_SIZE(ObjectSize) ((ObjectSize)+sizeof(OBJECT_HEADER)) +#define OBJECT_ALLOC_SIZE(ObjectSize) ((ObjectSize)+sizeof(ROS_OBJECT_HEADER)) #define KERNEL_HANDLE_FLAG (1 << ((sizeof(HANDLE) * 8) - 1)) #define ObIsKernelHandle(Handle, ProcessorMode) \ @@ -58,17 +81,41 @@ extern POBJECT_TYPE ObSymbolicLinkType; extern PHANDLE_TABLE ObpKernelHandleTable; +typedef NTSTATUS +(NTAPI *OB_ROS_CREATE_METHOD)( + PVOID ObjectBody, + PVOID Parent, + PWSTR RemainingPath, + struct _OBJECT_ATTRIBUTES* ObjectAttributes +); + +typedef PVOID +(NTAPI *OB_ROS_FIND_METHOD)( + PVOID WinStaObject, + PWSTR Name, + ULONG Attributes +); + +typedef NTSTATUS +(NTAPI *OB_ROS_PARSE_METHOD)( + PVOID Object, + PVOID *NextObject, + PUNICODE_STRING FullPath, + PWSTR *Path, + ULONG Attributes +); + VOID NTAPI ObpAddEntryDirectory( PDIRECTORY_OBJECT Parent, - POBJECT_HEADER Header, + PROS_OBJECT_HEADER Header, PWSTR Name ); VOID NTAPI -ObpRemoveEntryDirectory(POBJECT_HEADER Header); +ObpRemoveEntryDirectory(PROS_OBJECT_HEADER Header); VOID NTAPI Index: ntoskrnl/include/internal/i386/ke.h =================================================================== --- ntoskrnl/include/internal/i386/ke.h (revision 21759) +++ ntoskrnl/include/internal/i386/ke.h (working copy) @@ -26,7 +26,7 @@ #define X86_CR4_OSFXSR 0x00000200 /* enable FXSAVE/FXRSTOR instructions */ #define X86_CR4_OSXMMEXCPT 0x00000400 /* enable #XF exception */ -#define X86_FEATURE_TSC 0x00000010 /* time stamp counters are present */ +#define KF_RDTSC 0x00000002 /* time stamp counters are present */ #define X86_FEATURE_PAE 0x00000040 /* physical address extension is present */ #define X86_FEATURE_CX8 0x00000100 /* CMPXCHG8B instruction present */ #define X86_FEATURE_SYSCALL 0x00000800 /* SYSCALL/SYSRET support present */ @@ -51,81 +51,6 @@ #ifndef __ASM__ -typedef struct _KIRQ_TRAPFRAME -{ - ULONG Magic; - ULONG Gs; - ULONG Fs; - ULONG Es; - ULONG Ds; - ULONG Eax; - ULONG Ecx; - ULONG Edx; - ULONG Ebx; - ULONG Esp; - ULONG Ebp; - ULONG Esi; - ULONG Edi; - ULONG Eip; - ULONG Cs; - ULONG Eflags; -} KIRQ_TRAPFRAME, *PKIRQ_TRAPFRAME; - -/* Emulate cli/sti instructions */ -#define KV86M_EMULATE_CLI_STI (0x1) -/* Allow the v86 mode code to access i/o ports */ -#define KV86M_ALLOW_IO_PORT_ACCESS (0x2) - -typedef struct _KV86M_REGISTERS -{ - /* - * General purpose registers - */ - ULONG Ebp; - ULONG Edi; - ULONG Esi; - ULONG Edx; - ULONG Ecx; - ULONG Ebx; - ULONG Eax; - ULONG Ds; - ULONG Es; - ULONG Fs; - ULONG Gs; - - /* - * Control registers - */ - ULONG Eip; - ULONG Cs; - ULONG Eflags; - ULONG Esp; - ULONG Ss; - - /* - * Control structures - */ - ULONG RecoveryAddress; - UCHAR RecoveryInstruction[4]; - ULONG Vif; - ULONG Flags; - PNTSTATUS PStatus; -} KV86M_REGISTERS, *PKV86M_REGISTERS; - -typedef struct _KV86M_TRAP_FRAME -{ - KTRAP_FRAME Tf; - - ULONG SavedExceptionStack; - - /* - * These are put on the top of the stack by the routine that entered - * v86 mode so the exception handlers can find the control information - */ - struct _KV86M_REGISTERS* regs; - ULONG orig_ebp; -} KV86M_TRAP_FRAME, *PKV86M_TRAP_FRAME; - extern ULONG Ke386CacheAlignment; struct _KPCR; Index: ntoskrnl/include/internal/i386/v86m.h =================================================================== --- ntoskrnl/include/internal/i386/v86m.h (revision 0) +++ ntoskrnl/include/internal/i386/v86m.h (revision 0) @@ -0,0 +1,63 @@ +#ifndef __V86M_ +#define __V86M_ + +#include "ketypes.h" + +/* Emulate cli/sti instructions */ +#define KV86M_EMULATE_CLI_STI (0x1) +/* Allow the v86 mode code to access i/o ports */ +#define KV86M_ALLOW_IO_PORT_ACCESS (0x2) + +typedef struct _KV86M_REGISTERS +{ + /* + * General purpose registers + */ + ULONG Ebp; + ULONG Edi; + ULONG Esi; + ULONG Edx; + ULONG Ecx; + ULONG Ebx; + ULONG Eax; + ULONG Ds; + ULONG Es; + ULONG Fs; + ULONG Gs; + + /* + * Control registers + */ + ULONG Eip; + ULONG Cs; + ULONG Eflags; + ULONG Esp; + ULONG Ss; + + /* + * Control structures + */ + ULONG RecoveryAddress; + UCHAR RecoveryInstruction[4]; + ULONG Vif; + ULONG Flags; + PNTSTATUS PStatus; +} KV86M_REGISTERS, *PKV86M_REGISTERS; + +typedef struct _KV86M_TRAP_FRAME +{ + KTRAP_FRAME Tf; + + ULONG SavedExceptionStack; + + /* + * These are put on the top of the stack by the routine that entered + * v86 mode so the exception handlers can find the control information + */ + struct _KV86M_REGISTERS* regs; + ULONG orig_ebp; +} KV86M_TRAP_FRAME, *PKV86M_TRAP_FRAME; + +#endif + +/* EOF */ Index: ntoskrnl/include/internal/io.h =================================================================== --- ntoskrnl/include/internal/io.h (revision 21759) +++ ntoskrnl/include/internal/io.h (working copy) @@ -477,6 +477,7 @@ STDCALL IopQueryNameFile( PVOID ObjectBody, + IN BOOLEAN HasName, POBJECT_NAME_INFORMATION ObjectNameInfo, ULONG Length, PULONG ReturnLength @@ -485,8 +486,11 @@ VOID STDCALL IopCloseFile( - PVOID ObjectBody, - ULONG HandleCount + IN PEPROCESS Process OPTIONAL, + IN PVOID Object, + IN ACCESS_MASK GrantedAccess, + IN ULONG ProcessHandleCount, + IN ULONG SystemHandleCount ); /* plugplay.c */ @@ -557,7 +561,7 @@ VOID FASTCALL xHalIoAssignDriveLetters( - IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock, IN PSTRING NtDeviceName, OUT PUCHAR NtSystemPath, OUT PSTRING NtSystemPathString Index: ntoskrnl/include/internal/mm.h =================================================================== --- ntoskrnl/include/internal/mm.h (revision 21759) +++ ntoskrnl/include/internal/mm.h (working copy) @@ -5,6 +5,8 @@ /* TYPES *********************************************************************/ +struct _ROS_EPROCESS; + extern ULONG MiFreeSwapPages; extern ULONG MiUsedSwapPages; extern ULONG MmPagedPoolSize; @@ -192,7 +194,7 @@ PMM_SECTION_SEGMENT Segments; } MM_IMAGE_SECTION_OBJECT, *PMM_IMAGE_SECTION_OBJECT; -typedef struct _SECTION_OBJECT +typedef struct _ROS_SECTION_OBJECT { CSHORT Type; CSHORT Size; @@ -205,7 +207,7 @@ PMM_IMAGE_SECTION_OBJECT ImageSection; PMM_SECTION_SEGMENT Segment; }; -} SECTION_OBJECT, *PSECTION_OBJECT; +} ROS_SECTION_OBJECT, *PROS_SECTION_OBJECT; typedef struct _MEMORY_AREA { @@ -224,7 +226,7 @@ { struct { - SECTION_OBJECT* Section; + ROS_SECTION_OBJECT* Section; ULONG ViewOffset; PMM_SECTION_SEGMENT Segment; BOOLEAN WriteCopyView; @@ -237,17 +239,15 @@ } Data; } MEMORY_AREA, *PMEMORY_AREA; -#ifndef _MMTYPES_H typedef struct _MADDRESS_SPACE { PMEMORY_AREA MemoryAreaRoot; FAST_MUTEX Lock; PVOID LowestAddress; - struct _EPROCESS* Process; + struct _ROS_EPROCESS* Process; PUSHORT PageTableRefCountTable; ULONG PageTableRefCountTableSize; } MADDRESS_SPACE, *PMADDRESS_SPACE; -#endif typedef struct { @@ -362,7 +362,7 @@ NTSTATUS NTAPI MmInitializeAddressSpace( - struct _EPROCESS* Process, + struct _ROS_EPROCESS* Process, PMADDRESS_SPACE AddressSpace); NTSTATUS @@ -445,7 +445,7 @@ VOID STDCALL MmReleaseMemoryAreaIfDecommitted( - PEPROCESS Process, + struct _ROS_EPROCESS *Process, PMADDRESS_SPACE AddressSpace, PVOID BaseAddress ); @@ -621,18 +621,18 @@ NTSTATUS STDCALL MmCreateProcessAddressSpace( - IN struct _EPROCESS* Process, - IN PSECTION_OBJECT Section OPTIONAL + IN struct _ROS_EPROCESS* Process, + IN PROS_SECTION_OBJECT Section OPTIONAL ); NTSTATUS STDCALL -MmCreatePeb(PEPROCESS Process); +MmCreatePeb(struct _ROS_EPROCESS *Process); struct _TEB* STDCALL MmCreateTeb( - PEPROCESS Process, + struct _ROS_EPROCESS *Process, PCLIENT_ID ClientId, PINITIAL_TEB InitialTeb ); @@ -640,7 +640,7 @@ VOID STDCALL MmDeleteTeb( - PEPROCESS Process, + struct _ROS_EPROCESS *Process, struct _TEB* Teb ); @@ -706,7 +706,7 @@ VOID NTAPI MmFreeVirtualMemory( - struct _EPROCESS* Process, + struct _ROS_EPROCESS* Process, PMEMORY_AREA MemoryArea ); @@ -860,7 +860,7 @@ NTAPI MmInsertRmap( PFN_TYPE Page, - PEPROCESS Process, + struct _ROS_EPROCESS *Process, PVOID Address ); @@ -869,14 +869,14 @@ MmDeleteAllRmaps( PFN_TYPE Page, PVOID Context, - VOID (*DeleteMapping)(PVOID Context, PEPROCESS Process, PVOID Address) + VOID (*DeleteMapping)(PVOID Context, struct _ROS_EPROCESS *Process, PVOID Address) ); VOID NTAPI MmDeleteRmap( PFN_TYPE Page, - PEPROCESS Process, + struct _ROS_EPROCESS *Process, PVOID Address ); @@ -994,7 +994,7 @@ NTSTATUS NTAPI MmCreateVirtualMapping( - struct _EPROCESS* Process, + struct _ROS_EPROCESS* Process, PVOID Address, ULONG flProtect, PPFN_TYPE Pages, @@ -1004,7 +1004,7 @@ NTSTATUS NTAPI MmCreateVirtualMappingUnsafe( - struct _EPROCESS* Process, + struct _ROS_EPROCESS* Process, PVOID Address, ULONG flProtect, PPFN_TYPE Pages, @@ -1014,13 +1014,13 @@ ULONG NTAPI MmGetPageProtect( - struct _EPROCESS* Process, + struct _ROS_EPROCESS* Process, PVOID Address); VOID NTAPI MmSetPageProtect( - struct _EPROCESS* Process, + struct _ROS_EPROCESS* Process, PVOID Address, ULONG flProtect ); @@ -1028,7 +1028,7 @@ BOOLEAN NTAPI MmIsPagePresent( - struct _EPROCESS* Process, + struct _ROS_EPROCESS* Process, PVOID Address ); @@ -1039,7 +1039,7 @@ VOID NTAPI MmDisableVirtualMapping( - PEPROCESS Process, + struct _ROS_EPROCESS *Process, PVOID Address, BOOLEAN* WasDirty, PPFN_TYPE Page @@ -1048,7 +1048,7 @@ VOID NTAPI MmEnableVirtualMapping( - PEPROCESS Process, + struct _ROS_EPROCESS *Process, PVOID Address ); @@ -1059,7 +1059,7 @@ VOID NTAPI MmDeletePageFileMapping( - PEPROCESS Process, + struct _ROS_EPROCESS *Process, PVOID Address, SWAPENTRY* SwapEntry ); @@ -1067,7 +1067,7 @@ NTSTATUS NTAPI MmCreatePageFileMapping( - PEPROCESS Process, + struct _ROS_EPROCESS *Process, PVOID Address, SWAPENTRY SwapEntry ); @@ -1075,7 +1075,7 @@ BOOLEAN NTAPI MmIsPageSwapEntry( - PEPROCESS Process, + struct _ROS_EPROCESS *Process, PVOID Address ); @@ -1089,7 +1089,7 @@ VOID NTAPI MmSetDirtyPage( - PEPROCESS Process, + struct _ROS_EPROCESS *Process, PVOID Address ); @@ -1125,7 +1125,7 @@ BOOLEAN NTAPI MmIsAccessedAndResetAccessPage( - PEPROCESS Process, + struct _ROS_EPROCESS *Process, PVOID Address ); @@ -1160,7 +1160,7 @@ VOID NTAPI MmSetCleanPage( - PEPROCESS Process, + struct _ROS_EPROCESS *Process, PVOID Address ); @@ -1171,37 +1171,37 @@ VOID NTAPI MmDeletePageTable( - PEPROCESS Process, + struct _ROS_EPROCESS *Process, PVOID Address ); PFN_TYPE NTAPI MmGetPfnForProcess( - PEPROCESS Process, + struct _ROS_EPROCESS *Process, PVOID Address ); NTSTATUS STDCALL MmCopyMmInfo( - PEPROCESS Src, - PEPROCESS Dest, + struct _ROS_EPROCESS *Src, + struct _ROS_EPROCESS *Dest, PPHYSICAL_ADDRESS DirectoryTableBase ); NTSTATUS NTAPI -MmReleaseMmInfo(PEPROCESS Process); +MmReleaseMmInfo(struct _ROS_EPROCESS *Process); NTSTATUS NTAPI -Mmi386ReleaseMmInfo(PEPROCESS Process); +Mmi386ReleaseMmInfo(struct _ROS_EPROCESS *Process); VOID NTAPI MmDeleteVirtualMapping( - PEPROCESS Process, + struct _ROS_EPROCESS *Process, PVOID Address, BOOLEAN FreePage, BOOLEAN* WasDirty, @@ -1211,7 +1211,7 @@ BOOLEAN NTAPI MmIsDirtyPage( - PEPROCESS Process, + struct _ROS_EPROCESS *Process, PVOID Address ); @@ -1226,7 +1226,7 @@ VOID NTAPI MmUpdatePageDir( - PEPROCESS Process, + struct _ROS_EPROCESS *Process, PVOID Address, ULONG Size ); @@ -1301,21 +1301,6 @@ NTSTATUS NTAPI -MmMapViewOfSection( - IN PVOID SectionObject, - IN PEPROCESS Process, - IN OUT PVOID *BaseAddress, - IN ULONG ZeroBits, - IN ULONG CommitSize, - IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, - IN OUT PULONG ViewSize, - IN SECTION_INHERIT InheritDisposition, - IN ULONG AllocationType, - IN ULONG Protect -); - -NTSTATUS -NTAPI MmProtectSectionView( PMADDRESS_SPACE AddressSpace, PMEMORY_AREA MemoryArea, Index: ntoskrnl/include/internal/ntoskrnl.h =================================================================== --- ntoskrnl/include/internal/ntoskrnl.h (revision 21759) +++ ntoskrnl/include/internal/ntoskrnl.h (working copy) @@ -14,6 +14,7 @@ #include "ke.h" #include "i386/mm.h" #include "i386/fpu.h" +#include "i386/v86m.h" #include "ob.h" #include "mm.h" #include "ps.h" @@ -51,7 +52,7 @@ /* * Initalization functions (called once by main()) */ -VOID MmInitSystem(ULONG Phase, PLOADER_PARAMETER_BLOCK LoaderBlock, ULONG LastKernelAddress); +VOID MmInitSystem(ULONG Phase, PROS_LOADER_PARAMETER_BLOCK LoaderBlock, ULONG LastKernelAddress); VOID IoInit(VOID); VOID IoInit2(BOOLEAN BootLog); VOID STDCALL IoInit3(VOID); @@ -63,7 +64,7 @@ VOID CmShutdownRegistry(VOID); BOOLEAN CmImportSystemHive(PCHAR ChunkBase, ULONG ChunkSize); BOOLEAN CmImportHardwareHive(PCHAR ChunkBase, ULONG ChunkSize); -VOID KdInitSystem(ULONG Reserved, PLOADER_PARAMETER_BLOCK LoaderBlock); +VOID KdInitSystem(ULONG Reserved, PROS_LOADER_PARAMETER_BLOCK LoaderBlock); /* FIXME - RtlpCreateUnicodeString is obsolete and should be removed ASAP! */ BOOLEAN FASTCALL Index: ntoskrnl/include/internal/ex.h =================================================================== --- ntoskrnl/include/internal/ex.h (revision 21759) +++ ntoskrnl/include/internal/ex.h (working copy) @@ -11,7 +11,7 @@ #define EX_OBJ_TO_HDR(eob) ((POBJECT_HEADER)((ULONG_PTR)(eob) & \ ~(EX_HANDLE_ENTRY_PROTECTFROMCLOSE | EX_HANDLE_ENTRY_INHERITABLE | \ EX_HANDLE_ENTRY_AUDITONCLOSE))) -#define EX_HTE_TO_HDR(hte) ((POBJECT_HEADER)((ULONG_PTR)((hte)->u1.Object) & \ +#define EX_HTE_TO_HDR(hte) ((POBJECT_HEADER)((ULONG_PTR)((hte)->Object) & \ ~(EX_HANDLE_ENTRY_PROTECTFROMCLOSE | EX_HANDLE_ENTRY_INHERITABLE | \ EX_HANDLE_ENTRY_AUDITONCLOSE))) Index: ntoskrnl/include/internal/lpc.h =================================================================== --- ntoskrnl/include/internal/lpc.h (revision 21759) +++ ntoskrnl/include/internal/lpc.h (working copy) @@ -93,8 +93,11 @@ VOID STDCALL LpcpClosePort( - PVOID ObjectBody, - ULONG HandleCount + IN PEPROCESS Process OPTIONAL, + IN PVOID Object, + IN ACCESS_MASK GrantedAccess, + IN ULONG ProcessHandleCount, + IN ULONG SystemHandleCount ); VOID Index: ntoskrnl/include/internal/po.h =================================================================== --- ntoskrnl/include/internal/po.h (revision 21759) +++ ntoskrnl/include/internal/po.h (working copy) @@ -6,7 +6,7 @@ VOID NTAPI PoInit( - PLOADER_PARAMETER_BLOCK LoaderBlock, + PROS_LOADER_PARAMETER_BLOCK LoaderBlock, BOOLEAN ForceAcpiDisable ); Index: ntoskrnl/include/internal/ps.h =================================================================== --- ntoskrnl/include/internal/ps.h (revision 21759) +++ ntoskrnl/include/internal/ps.h (working copy) @@ -8,6 +8,203 @@ #include <internal/arch/ps.h> +// +// ROS Process +// +typedef struct _ROS_EPROCESS +{ + KPROCESS Pcb; + EX_PUSH_LOCK ProcessLock; + LARGE_INTEGER CreateTime; + LARGE_INTEGER ExitTime; + EX_RUNDOWN_REF RundownProtect; + HANDLE UniqueProcessId; + LIST_ENTRY ActiveProcessLinks; + ULONG QuotaUsage[3]; + ULONG QuotaPeak[3]; + ULONG CommitCharge; + ULONG PeakVirtualSize; + ULONG VirtualSize; + LIST_ENTRY SessionProcessLinks; + PVOID DebugPort; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + union + { + PVOID ExceptionPortData; + ULONG ExceptionPortValue; + UCHAR ExceptionPortState:3; + }; +#else + PVOID ExceptionPort; +#endif + PHANDLE_TABLE ObjectTable; + EX_FAST_REF Token; + ULONG WorkingSetPage; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + EX_PUSH_LOCK AddressCreationLock; + PETHREAD RotateInProgress; +#else + KGUARDED_MUTEX AddressCreationLock; + KSPIN_LOCK HyperSpaceLock; +#endif + PETHREAD ForkInProgress; + ULONG HardwareTrigger; + MM_AVL_TABLE PhysicalVadroot; + PVOID CloneRoot; + ULONG NumberOfPrivatePages; + ULONG NumberOfLockedPages; + PVOID *Win32Process; + struct _EJOB *Job; + PVOID SectionObject; + PVOID SectionBaseAddress; + PEPROCESS_QUOTA_BLOCK QuotaBlock; + PPAGEFAULT_HISTORY WorkingSetWatch; + PVOID Win32WindowStation; + HANDLE InheritedFromUniqueProcessId; + PVOID LdtInformation; + PVOID VadFreeHint; + PVOID VdmObjects; + PVOID DeviceMap; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG AlpcPagedPoolQuotaCache; + PVOID EtwDataSource; + PVOID FreeTebHint; +#else + PVOID Spare0[3]; +#endif + union + { + HARDWARE_PTE_X86 PagedirectoryPte; + ULONGLONG Filler; + }; + ULONG Session; + CHAR ImageFileName[16]; + LIST_ENTRY JobLinks; + PVOID LockedPagesList; + LIST_ENTRY ThreadListHead; + PVOID SecurityPort; + PVOID PaeTop; + ULONG ActiveThreads; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG ImagePathHash; +#else + ACCESS_MASK GrantedAccess; +#endif + ULONG DefaultHardErrorProcessing; + NTSTATUS LastThreadExitStatus; + struct _PEB* Peb; + EX_FAST_REF PrefetchTrace; + LARGE_INTEGER ReadOperationCount; + LARGE_INTEGER WriteOperationCount; + LARGE_INTEGER OtherOperationCount; + LARGE_INTEGER ReadTransferCount; + LARGE_INTEGER WriteTransferCount; + LARGE_INTEGER OtherTransferCount; + ULONG CommitChargeLimit; + ULONG CommitChargePeak; + PVOID AweInfo; + SE_AUDIT_PROCESS_CREATION_INFO SeAuditProcessCreationInfo; + MMSUPPORT Vm; + LIST_ENTRY MmProcessLinks; + ULONG ModifiedPageCount; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + union + { + struct + { + ULONG JobNotReallyActive:1; + ULONG AccountingFolded:1; + ULONG NewProcessReported:1; + ULONG ExitProcessReported:1; + ULONG ReportCommitChanges:1; + ULONG LastReportMemory:1; + ULONG ReportPhysicalPageChanges:1; + ULONG HandleTableRundown:1; + ULONG NeedsHandleRundown:1; + ULONG RefTraceEnabled:1; + ULONG NumaAware:1; + ULONG ProtectedProcess:1; + ULONG DefaultPagePriority:3; + ULONG ProcessDeleteSelf:1; + ULONG ProcessVerifierTarget:1; + }; + ULONG Flags2; + }; +#else + ULONG JobStatus; +#endif + union + { + struct + { + ULONG CreateReported:1; + ULONG NoDebugInherit:1; + ULONG ProcessExiting:1; + ULONG ProcessDelete:1; + ULONG Wow64SplitPages:1; + ULONG VmDeleted:1; + ULONG OutswapEnabled:1; + ULONG Outswapped:1; + ULONG ForkFailed:1; + ULONG Wow64VaSpace4Gb:1; + ULONG AddressSpaceInitialized:2; + ULONG SetTimerResolution:1; + ULONG BreakOnTermination:1; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG DeprioritizeViews:1; +#else + ULONG SessionCreationUnderway:1; +#endif + ULONG WriteWatch:1; + ULONG ProcessInSession:1; + ULONG OverrideAddressSpace:1; + ULONG HasAddressSpace:1; + ULONG LaunchPrefetched:1; + ULONG InjectInpageErrors:1; + ULONG VmTopDown:1; + ULONG ImageNotifyDone:1; + ULONG PdeUpdateNeeded:1; + ULONG VdmAllowed:1; + ULONG SmapAllowed:1; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG ProcessInserted:1; +#else + ULONG CreateFailed:1; +#endif + ULONG DefaultIoPriority:3; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG SparePsFlags1:2; +#else + ULONG Spare1:1; + ULONG Spare2:1; +#endif + }; + ULONG Flags; + }; + NTSTATUS ExitStatus; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + USHORT Spare7; +#else + USHORT NextPageColor; +#endif + union + { + struct + { + UCHAR SubSystemMinorVersion; + UCHAR SubSystemMajorVersion; + }; + USHORT SubSystemVersion; + }; + UCHAR PriorityClass; + MM_AVL_TABLE VadRoot; + ULONG Cookie; + KEVENT LockEvent; + ULONG LockCount; + struct _KTHREAD *LockOwner; + MADDRESS_SPACE AddressSpace; +} ROS_EPROCESS, *PROS_EPROCESS; + extern LCID PsDefaultThreadLocaleId; extern LCID PsDefaultSystemLocaleId; extern LIST_ENTRY PspReaperListHead; @@ -368,12 +565,12 @@ NTSTATUS NTAPI PsLockProcess( - PEPROCESS Process, + PROS_EPROCESS Process, BOOLEAN Timeout ); VOID NTAPI -PsUnlockProcess(PEPROCESS Process); +PsUnlockProcess(PROS_EPROCESS Process); #endif /* __INCLUDE_INTERNAL_PS_H */ Index: ntoskrnl/ntoskrnl.rbuild =================================================================== --- ntoskrnl/ntoskrnl.rbuild (revision 21759) +++ ntoskrnl/ntoskrnl.rbuild (working copy) @@ -45,7 +45,6 @@ <file>vdm.c</file> </directory> </if> - <compilationunit name="ke.c"> <file>apc.c</file> <file>bug.c</file> <file>clock.c</file> @@ -68,26 +67,21 @@ <file>timer.c</file> <file>usercall.c</file> <file>wait.c</file> - </compilationunit> </directory> <directory name="cc"> - <compilationunit name="cc.c"> <file>cacheman.c</file> <file>copy.c</file> <file>fs.c</file> <file>mdl.c</file> <file>pin.c</file> <file>view.c</file> - </compilationunit> </directory> <directory name="cm"> - <compilationunit name="cm.c"> <file>import.c</file> <file>ntfunc.c</file> <file>regfile.c</file> <file>registry.c</file> <file>regobj.c</file> - </compilationunit> </directory> <directory name="kdbg"> <if property="ARCH" value="i386"> @@ -125,7 +119,6 @@ <file>fastinterlck_asm.S</file> </directory> </if> - <compilationunit name="ex.c"> <file>atom.c</file> <file>callback.c</file> <file>dbgctrl.c</file> @@ -150,11 +143,9 @@ <file>win32k.c</file> <file>work.c</file> <file>zone.c</file> - </compilationunit> <file>zw.S</file> </directory> <directory name="fs"> - <compilationunit name="fs.c"> <file>context.c</file> <file>fastio.c</file> <file>filelock.c</file> @@ -166,13 +157,11 @@ <file>tunnel.c</file> <file>unc.c</file> <file>util.c</file> - </compilationunit> </directory> <directory name="inbv"> <file>inbv.c</file> </directory> <directory name="io"> - <compilationunit name="io.c"> <file>adapter.c</file> <file>arcname.c</file> <file>bootlog.c</file> @@ -205,11 +194,9 @@ <file>timer.c</file> <file>vpb.c</file> <file>wmi.c</file> - </compilationunit> <file>file.c</file> </directory> <directory name="kd"> - <compilationunit name="kd.c"> <directory name="wrappers"> <file>bochs.c</file> <file>gdbstub.c</file> @@ -217,16 +204,12 @@ <file>kdinit.c</file> <file>kdio.c</file> <file>kdmain.c</file> - </compilationunit> </directory> <directory name="ldr"> - <compilationunit name="ldr.c"> <file>loader.c</file> <file>rtl.c</file> - </compilationunit> </directory> <directory name="lpc"> - <compilationunit name="lpc.c"> <file>close.c</file> <file>complete.c</file> <file>connect.c</file> @@ -238,7 +221,6 @@ <file>receive.c</file> <file>reply.c</file> <file>send.c</file> - </compilationunit> </directory> <directory name="mm"> <if property="ARCH" value="i386"> @@ -248,7 +230,6 @@ <file>pfault.c</file> </directory> </if> - <compilationunit name="mm.c"> <file>anonmem.c</file> <file>aspace.c</file> <file>balance.c</file> @@ -280,12 +261,10 @@ <file>verifier.c</file> <file>virtual.c</file> <file>wset.c</file> - </compilationunit> <file>elf32.c</file> <file>elf64.c</file> </directory> <directory name="ob"> - <compilationunit name="ob.c"> <file>dirobj.c</file> <file>handle.c</file> <file>namespc.c</file> @@ -295,13 +274,11 @@ <file>security.c</file> <file>symlink.c</file> <file>wait.c</file> - </compilationunit> </directory> <directory name="po"> <file>power.c</file> </directory> <directory name="ps"> - <compilationunit name="ps.c"> <file>debug.c</file> <file>idle.c</file> <file>job.c</file> @@ -316,7 +293,6 @@ <file>suspend.c</file> <file>thread.c</file> <file>win32.c</file> - </compilationunit> </directory> <directory name="rtl"> <if property="ARCH" value="i386"> @@ -325,16 +301,13 @@ <file>seh.s</file> </directory> </if> - <compilationunit name="rtl.c"> <file>libsupp.c</file> <file>misc.c</file> <file>nls.c</file> <file>regio.c</file> <file>strtok.c</file> - </compilationunit> </directory> <directory name="se"> - <compilationunit name="se.c"> <file>access.c</file> <file>acl.c</file> <file>audit.c</file> @@ -345,7 +318,6 @@ <file>semgr.c</file> <file>sid.c</file> <file>token.c</file> - </compilationunit> </directory> <file>ntoskrnl.rc</file> <linkerflag>-nostartfiles</linkerflag> Index: ntoskrnl/inbv/inbv.c =================================================================== --- ntoskrnl/inbv/inbv.c (revision 21759) +++ ntoskrnl/inbv/inbv.c (working copy) @@ -19,6 +19,13 @@ #pragma alloc_text(INIT, InbvEnableBootDriver) #endif +/* ROS Internal. Please deprecate */ +NTHALAPI +VOID +NTAPI +HalReleaseDisplayOwnership( + VOID +); /* GLOBALS *******************************************************************/ Index: ntoskrnl/kd/kdinit.c =================================================================== --- ntoskrnl/kd/kdinit.c (revision 21759) +++ ntoskrnl/kd/kdinit.c (working copy) @@ -44,7 +44,7 @@ PCHAR STDCALL KdpGetWrapperDebugMode(PCHAR Currentp2, - PLOADER_PARAMETER_BLOCK LoaderBlock) + PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { PCHAR p2 = Currentp2; @@ -160,7 +160,7 @@ VOID INIT_FUNCTION KdInitSystem(ULONG BootPhase, - PLOADER_PARAMETER_BLOCK LoaderBlock) + PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { ULONG Value; ULONG i; Index: ntoskrnl/cm/cm.h =================================================================== --- ntoskrnl/cm/cm.h (revision 21759) +++ ntoskrnl/cm/cm.h (working copy) @@ -459,6 +459,7 @@ NTSTATUS STDCALL CmiObjectQueryName (PVOID ObjectBody, + IN BOOLEAN HasObjectName, POBJECT_NAME_INFORMATION ObjectNameInfo, ULONG Length, PULONG ReturnLength); Index: ntoskrnl/cm/registry.c =================================================================== --- ntoskrnl/cm/registry.c (revision 21759) +++ ntoskrnl/cm/registry.c (working copy) @@ -369,7 +369,7 @@ ObjectTypeInitializer.ValidAccessMask = KEY_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.DeleteProcedure = CmiObjectDelete; - ObjectTypeInitializer.ParseProcedure = CmiObjectParse; + ObjectTypeInitializer.ParseProcedure = (PVOID)CmiObjectParse; ObjectTypeInitializer.SecurityProcedure = CmiObjectSecurity; ObjectTypeInitializer.QueryNameProcedure = CmiObjectQueryName; Index: ntoskrnl/cm/regobj.c =================================================================== --- ntoskrnl/cm/regobj.c (revision 21759) +++ ntoskrnl/cm/regobj.c (working copy) @@ -486,6 +486,7 @@ NTSTATUS STDCALL CmiObjectQueryName (PVOID ObjectBody, + IN BOOLEAN HasName, POBJECT_NAME_INFORMATION ObjectNameInfo, ULONG Length, PULONG ReturnLength) Index: ntoskrnl/ke/device.c =================================================================== --- ntoskrnl/ke/device.c (revision 21759) +++ ntoskrnl/ke/device.c (working copy) @@ -71,9 +71,9 @@ else { /* Try to get a match */ - if (Child->Component.Class == Class && - Child->Component.Type == Type && - (Child->Component.Key & Mask) == Key) + if (Child->ComponentEntry.Class == Class && + Child->ComponentEntry.Type == Type && + (Child->ComponentEntry.Key & Mask) == Key) { /* Match found */ return Child; @@ -93,9 +93,9 @@ else { /* Try to get a match */ - if (Sibling->Component.Class == Class && - Sibling->Component.Type == Type && - (Sibling->Component.Key & Mask) == Key) + if (Sibling->ComponentEntry.Class == Class && + Sibling->ComponentEntry.Type == Type && + (Sibling->ComponentEntry.Key & Mask) == Key) { /* Match found */ return Sibling; Index: ntoskrnl/ke/dpc.c =================================================================== --- ntoskrnl/ke/dpc.c (revision 21759) +++ ntoskrnl/ke/dpc.c (working copy) @@ -439,13 +439,9 @@ Process = CurrentThread->ApcState.Process; /* Set DPC Event if requested */ - if (Prcb->DpcSetEventRequest) { - /* - * FIXME: - * Prcb->DpcEvent is not initialized. - */ - KEBUGCHECK(0); - KeSetEvent(Prcb->DpcEvent, 0, 0); + if (Prcb->DpcSetEventRequest) + { + KeSetEvent(&Prcb->DpcEvent, 0, 0); } /* Check if Quantum expired */ Index: ntoskrnl/ke/i386/usertrap.c =================================================================== --- ntoskrnl/ke/i386/usertrap.c (revision 21759) +++ ntoskrnl/ke/i386/usertrap.c (working copy) @@ -61,7 +61,7 @@ current_entry != NULL) { current = - CONTAINING_RECORD(current_entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + CONTAINING_RECORD(current_entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); if (address >= (PVOID)current->DllBase && address < (PVOID)((char*)current->DllBase + current->SizeOfImage)) Index: ntoskrnl/ke/i386/kernel.c =================================================================== --- ntoskrnl/ke/i386/kernel.c (revision 21759) +++ ntoskrnl/ke/i386/kernel.c (working copy) @@ -139,7 +139,7 @@ if (MaxCpuidLevel >= 0x80000006) { Ki386Cpuid(0x80000006, &Dummy, &Dummy, &Ecx, &Dummy); - Pcr->L2CacheSize = Ecx >> 16; + Pcr->SecondLevelCacheSize = Ecx >> 16; } } @@ -494,9 +494,9 @@ DPRINT("Ke386L1CacheSize: %dkB\n", Ke386L1CacheSize); } - if (Pcr->L2CacheSize) + if (Pcr->SecondLevelCacheSize) { - DPRINT("Ke386L2CacheSize: %dkB\n", Pcr->L2CacheSize); + DPRINT("Ke386L2CacheSize: %dkB\n", Pcr->SecondLevelCacheSize); } } @@ -532,7 +532,7 @@ SharedUserData->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = (Ke386CpuidExFlags & X86_EXT_FEATURE_3DNOW) ? TRUE : FALSE; SharedUserData->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = - (Pcr->PrcbData.FeatureBits & X86_FEATURE_TSC) ? TRUE : FALSE; + (Pcr->PrcbData.FeatureBits & KF_RDTSC) ? TRUE : FALSE; SharedUserData->ProcessorFeatures[PF_PAE_ENABLED] = Ke386Pae; SharedUserData->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = (Pcr->PrcbData.FeatureBits & X86_FEATURE_SSE2) ? TRUE : FALSE; Index: ntoskrnl/ke/i386/irq.c =================================================================== --- ntoskrnl/ke/i386/irq.c (revision 21759) +++ ntoskrnl/ke/i386/irq.c (working copy) @@ -19,6 +19,7 @@ #include <ntoskrnl.h> #include <../hal/halx86/include/halirq.h> +#include <../hal/halx86/include/mps.h> #define NDEBUG #include <internal/debug.h> Index: ntoskrnl/ke/i386/exp.c =================================================================== --- ntoskrnl/ke/i386/exp.c (revision 21759) +++ ntoskrnl/ke/i386/exp.c (working copy) @@ -118,7 +118,7 @@ while (current_entry != &ModuleListHead) { current = - CONTAINING_RECORD(current_entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + CONTAINING_RECORD(current_entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); if (address >= (PVOID)current->DllBase && address < (PVOID)((ULONG_PTR)current->DllBase + current->SizeOfImage)) Index: ntoskrnl/ke/i386/bios.c =================================================================== --- ntoskrnl/ke/i386/bios.c (revision 21759) +++ ntoskrnl/ke/i386/bios.c (working copy) @@ -24,11 +24,12 @@ /* FUNCTIONS *****************************************************************/ NTSTATUS STDCALL -Ke386CallBios(UCHAR Int, PKV86M_REGISTERS Regs) +Ke386CallBios(ULONG Int, PCONTEXT regs) { PUCHAR Ip; KV86M_REGISTERS ORegs; NTSTATUS Status; + PKV86M_REGISTERS Regs = (PKV86M_REGISTERS)regs; /* * Set up a trampoline for executing the BIOS interrupt Index: ntoskrnl/ke/bug.c =================================================================== --- ntoskrnl/ke/bug.c (revision 21759) +++ ntoskrnl/ke/bug.c (working copy) @@ -19,6 +19,14 @@ #pragma alloc_text(INIT, KiInitializeBugCheck) #endif +/* ROS Internal. Please deprecate */ +NTHALAPI +VOID +NTAPI +HalReleaseDisplayOwnership( + VOID +); + /* GLOBALS ******************************************************************/ static LIST_ENTRY BugcheckCallbackListHead = {NULL,NULL}; @@ -315,7 +323,7 @@ Address = (PVOID)Tf->Eip; /* Try to get information on the module */ - LIST_FOR_EACH(CurrentModule, &ModuleListHead, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList) + LIST_FOR_EACH(CurrentModule, &ModuleListHead, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks) { /* Check if this is the right one */ if ((Address != NULL && (Address >= (PVOID)CurrentModule->DllBase && Index: ntoskrnl/ke/process.c =================================================================== --- ntoskrnl/ke/process.c (revision 21759) +++ ntoskrnl/ke/process.c (working copy) @@ -22,8 +22,6 @@ { { MainSSDT, NULL, NUMBER_OF_SYSCALLS, MainSSPT }, { NULL, NULL, 0, NULL }, - { NULL, NULL, 0, NULL }, - { NULL, NULL, 0, NULL } }; KSERVICE_TABLE_DESCRIPTOR @@ -31,8 +29,6 @@ { { MainSSDT, NULL, NUMBER_OF_SYSCALLS, MainSSPT }, { NULL, NULL, 0, NULL }, - { NULL, NULL, 0, NULL }, - { NULL, NULL, 0, NULL } }; /* FUNCTIONS *****************************************************************/ @@ -60,8 +56,8 @@ * To prevent this, make sure the page directory of the process we're * attaching to is up-to-date. */ - MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread->StackLimit, KERNEL_STACK_SIZE); - MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); + MmUpdatePageDir((PROS_EPROCESS)Process, (PVOID)Thread->StackLimit, KERNEL_STACK_SIZE); + MmUpdatePageDir((PROS_EPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); } VOID Index: ntoskrnl/ke/ipi.c =================================================================== --- ntoskrnl/ke/ipi.c (revision 21759) +++ ntoskrnl/ke/ipi.c (working copy) @@ -43,9 +43,9 @@ * @implemented */ BOOLEAN -STDCALL +NTAPI KiIpiServiceRoutine(IN PKTRAP_FRAME TrapFrame, - IN PKEXCEPTION_FRAME ExceptionFrame) + IN PVOID ExceptionFrame) { #ifdef DBG LARGE_INTEGER StartTime, CurrentTime, Frequency; Index: ntoskrnl/ke/kthread.c =================================================================== --- ntoskrnl/ke/kthread.c (revision 21759) +++ ntoskrnl/ke/kthread.c (working copy) @@ -154,7 +154,7 @@ IdleProcessorMask |= Affinity; } - MmUpdatePageDir(PsGetCurrentProcess(),((PETHREAD)CurrentThread)->ThreadsProcess, sizeof(EPROCESS)); + MmUpdatePageDir((PROS_EPROCESS)PsGetCurrentProcess(),((PETHREAD)CurrentThread)->ThreadsProcess, sizeof(EPROCESS)); /* Special note for Filip: This will release the Dispatcher DB Lock ;-) -- Alex */ DPRINT("You are : %x, swapping to: %x\n", OldThread, CurrentThread); @@ -864,8 +864,8 @@ * while handling page faults. At this point it isn't possible to call the * page fault handler for the missing pde's. */ - MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread->StackLimit, KERNEL_STACK_SIZE); - MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); + MmUpdatePageDir((PROS_EPROCESS)Process, (PVOID)Thread->StackLimit, KERNEL_STACK_SIZE); + MmUpdatePageDir((PROS_EPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); /* Initalize the Thread Context */ DPRINT("Initializing the Context for the thread: %x\n", Thread); Index: ntoskrnl/ke/main.c =================================================================== --- ntoskrnl/ke/main.c (revision 21759) +++ ntoskrnl/ke/main.c (working copy) @@ -26,7 +26,7 @@ ULONG NtGlobalFlag = 0; CHAR KeNumberProcessors; KAFFINITY KeActiveProcessors = 1; -LOADER_PARAMETER_BLOCK KeLoaderBlock; +ROS_LOADER_PARAMETER_BLOCK KeLoaderBlock; ULONG KeDcacheFlushCount = 0; ULONG KeIcacheFlushCount = 0; ULONG KiDmaIoCoherency = 0; /* RISC Architectures only */ @@ -66,7 +66,7 @@ extern unsigned int _image_base__; ULONG_PTR KERNEL_BASE = (ULONG_PTR)&_image_base__; -VOID INIT_FUNCTION _main(ULONG MultiBootMagic, PLOADER_PARAMETER_BLOCK _LoaderBlock); +VOID INIT_FUNCTION _main(ULONG MultiBootMagic, PROS_LOADER_PARAMETER_BLOCK _LoaderBlock); #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, _main) @@ -146,7 +146,7 @@ VOID INIT_FUNCTION _main(ULONG MultiBootMagic, - PLOADER_PARAMETER_BLOCK _LoaderBlock) + PROS_LOADER_PARAMETER_BLOCK _LoaderBlock) { ULONG i; ULONG size; @@ -282,7 +282,7 @@ } /* Initialize the Debugger */ - KdInitSystem (0, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); + KdInitSystem (0, &KeLoaderBlock); /* Initialize HAL */ HalInitSystem (0, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); Index: ntoskrnl/ke/clock.c =================================================================== --- ntoskrnl/ke/clock.c (revision 21759) +++ ntoskrnl/ke/clock.c (working copy) @@ -42,7 +42,7 @@ /* * Number of timer interrupts since initialisation */ -volatile ULONGLONG KeTickCount = 0; +volatile KSYSTEM_TIME KeTickCount = {0}; volatile ULONG KiRawTicks = 0; extern LIST_ENTRY KiTimerListHead; @@ -165,7 +165,7 @@ * TickCount (OUT) = Points to storage for the number of ticks */ { - TickCount->QuadPart = KeTickCount; + TickCount->QuadPart = *(PULONGLONG)&KeTickCount; } /* @@ -352,7 +352,7 @@ /* * Increment the number of timers ticks */ - KeTickCount++; + (*(PULONGLONG)&KeTickCount)++; SharedUserData->TickCountLowDeprecated++; Time.u.LowPart = SharedUserData->InterruptTime.LowPart; Index: ntoskrnl/ob/wait.c =================================================================== --- ntoskrnl/ob/wait.c (revision 21759) +++ ntoskrnl/ob/wait.c (working copy) @@ -132,7 +132,7 @@ } /* Check for synchronize access */ - GrantedAccess = HandleEntry->u2.GrantedAccess; + GrantedAccess = HandleEntry->GrantedAccess; if ((PreviousMode != KernelMode) && (!(GrantedAccess & SYNCHRONIZE))) { /* Unlock the entry and fail */ Index: ntoskrnl/ob/namespc.c =================================================================== --- ntoskrnl/ob/namespc.c (revision 21759) +++ ntoskrnl/ob/namespc.c (working copy) @@ -247,7 +247,7 @@ VOID NTAPI ObpAddEntryDirectory(PDIRECTORY_OBJECT Parent, - POBJECT_HEADER Header, + PROS_OBJECT_HEADER Header, PWSTR Name) /* * FUNCTION: Add an entry to a namespace directory @@ -270,7 +270,7 @@ VOID NTAPI -ObpRemoveEntryDirectory(POBJECT_HEADER Header) +ObpRemoveEntryDirectory(PROS_OBJECT_HEADER Header) /* * FUNCTION: Remove an entry from a namespace directory * ARGUMENTS: @@ -293,10 +293,10 @@ NTSTATUS STDCALL ObpCreateDirectory(OB_OPEN_REASON Reason, + PEPROCESS Process, PVOID ObjectBody, - PEPROCESS Process, - ULONG HandleCount, - ACCESS_MASK GrantedAccess) + ACCESS_MASK GrantedAccess, + ULONG HandleCount) { PDIRECTORY_OBJECT Directory = ObjectBody; @@ -315,7 +315,7 @@ ULONG Attributes) { PLIST_ENTRY current = DirectoryObject->head.Flink; - POBJECT_HEADER current_obj; + PROS_OBJECT_HEADER current_obj; DPRINT("ObFindEntryDirectory(dir %x, name %S)\n",DirectoryObject, Name); @@ -333,7 +333,7 @@ } while (current!=(&(DirectoryObject->head))) { - current_obj = CONTAINING_RECORD(current,OBJECT_HEADER,Entry); + current_obj = CONTAINING_RECORD(current,ROS_OBJECT_HEADER,Entry); DPRINT(" Scanning: %S for: %S\n",HEADER_TO_OBJECT_NAME(current_obj)->Name.Buffer, Name); if (Attributes & OBJ_CASE_INSENSITIVE) { @@ -458,7 +458,7 @@ ObjectTypeInitializer.ValidAccessMask = DIRECTORY_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = FALSE; ObjectTypeInitializer.OpenProcedure = ObpCreateDirectory; - ObjectTypeInitializer.ParseProcedure = ObpParseDirectory; + ObjectTypeInitializer.ParseProcedure = (OB_PARSE_METHOD)ObpParseDirectory; ObjectTypeInitializer.MaintainTypeList = FALSE; ObjectTypeInitializer.GenericMapping = ObpDirectoryMapping; ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(DIRECTORY_OBJECT); @@ -526,8 +526,8 @@ /* Insert the two objects we already created but couldn't add */ /* NOTE: Uses TypeList & Creator Info in OB 2.0 */ - ObpAddEntryDirectory(ObpTypeDirectoryObject, BODY_TO_HEADER(ObTypeObjectType), NULL); - ObpAddEntryDirectory(ObpTypeDirectoryObject, BODY_TO_HEADER(ObDirectoryType), NULL); + ObpAddEntryDirectory(ObpTypeDirectoryObject, (PROS_OBJECT_HEADER)BODY_TO_HEADER(ObTypeObjectType), NULL); + ObpAddEntryDirectory(ObpTypeDirectoryObject, (PROS_OBJECT_HEADER)BODY_TO_HEADER(ObDirectoryType), NULL); /* Create 'symbolic link' object type */ ObInitSymbolicLinkImplementation(); @@ -543,7 +543,7 @@ PUNICODE_STRING TypeName, POBJECT_TYPE *ObjectType) { - POBJECT_HEADER Header; + PROS_OBJECT_HEADER Header; POBJECT_TYPE LocalObjectType; ULONG HeaderSize; NTSTATUS Status; @@ -555,7 +555,7 @@ TypeName, ObTypeObjectType, OBJECT_ALLOC_SIZE(sizeof(OBJECT_TYPE)), - &Header); + (POBJECT_HEADER*)&Header); if (!NT_SUCCESS(Status)) { DPRINT1("ObpAllocateObject failed!\n"); Index: ntoskrnl/ob/object.c =================================================================== --- ntoskrnl/ob/object.c (revision 21759) +++ ntoskrnl/ob/object.c (working copy) @@ -384,7 +384,7 @@ DPRINT("Current object can't parse\n"); break; } - Status = CurrentHeader->Type->TypeInfo.ParseProcedure(CurrentObject, + Status = ((OB_ROS_PARSE_METHOD)CurrentHeader->Type->TypeInfo.ParseProcedure)(CurrentObject, &NextObject, &PathString, &current, @@ -459,6 +459,7 @@ /* Call the procedure */ DPRINT("Calling Object's Procedure\n"); Status = ObjectHeader->Type->TypeInfo.QueryNameProcedure(Object, + TRUE, //fixme ObjectNameInfo, Length, ReturnLength); Index: ntoskrnl/ob/symlink.c =================================================================== --- ntoskrnl/ob/symlink.c (revision 21759) +++ ntoskrnl/ob/symlink.c (working copy) @@ -152,7 +152,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = SYMBOLIC_LINK_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; - ObjectTypeInitializer.ParseProcedure = ObpParseSymbolicLink; + ObjectTypeInitializer.ParseProcedure = (OB_PARSE_METHOD)ObpParseSymbolicLink; ObjectTypeInitializer.DeleteProcedure = ObpDeleteSymbolicLink; ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ObSymbolicLinkType); } Index: ntoskrnl/ob/dirobj.c =================================================================== --- ntoskrnl/ob/dirobj.c (revision 21759) +++ ntoskrnl/ob/dirobj.c (working copy) @@ -223,7 +223,7 @@ BufferLength); if(TemporaryBuffer != NULL) { - POBJECT_HEADER EntryHeader; + PROS_OBJECT_HEADER EntryHeader; PLIST_ENTRY ListEntry; KIRQL OldLevel; ULONG RequiredSize = sizeof(OBJECT_DIRECTORY_INFORMATION); @@ -244,7 +244,7 @@ PUNICODE_STRING Name, Type; ULONG EntrySize; - EntryHeader = CONTAINING_RECORD(ListEntry, OBJECT_HEADER, Entry); + EntryHeader = CONTAINING_RECORD(ListEntry, ROS_OBJECT_HEADER, Entry); /* calculate the size of the required buffer space for this entry */ Name = (HEADER_TO_OBJECT_NAME(EntryHeader)->Name.Length != 0 ? &HEADER_TO_OBJECT_NAME(EntryHeader)->Name : NULL); Index: ntoskrnl/ob/handle.c =================================================================== --- ntoskrnl/ob/handle.c (revision 21759) +++ ntoskrnl/ob/handle.c (working copy) @@ -63,7 +63,7 @@ { /* the handle count should be decremented but we pass the previous value to the callback */ - ObjectHeader->Type->TypeInfo.CloseProcedure(ObjectBody, NewHandleCount + 1); + ObjectHeader->Type->TypeInfo.CloseProcedure(NULL, ObjectBody, 0, NewHandleCount + 1, NewHandleCount + 1); } if(NewHandleCount == 0) @@ -75,7 +75,7 @@ /* delete the object from the namespace when the last handle got closed. Only do this if it's actually been inserted into the namespace and if it's not a permanent object. */ - ObpRemoveEntryDirectory(ObjectHeader); + ObpRemoveEntryDirectory((PROS_OBJECT_HEADER)ObjectHeader); } /* remove the keep-alive reference */ @@ -123,8 +123,8 @@ Handle); if (HandleTableEntry != NULL) { - HandleInfo->Inherit = (HandleTableEntry->u1.ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; - HandleInfo->ProtectFromClose = (HandleTableEntry->u1.ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) != 0; + HandleInfo->Inherit = (HandleTableEntry->ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; + HandleInfo->ProtectFromClose = (HandleTableEntry->ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) != 0; ExUnlockHandleTableEntry(Process->ObjectTable, HandleTableEntry); @@ -183,14 +183,14 @@ if (HandleTableEntry != NULL) { if (HandleInfo->Inherit) - HandleTableEntry->u1.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; + HandleTableEntry->ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; else - HandleTableEntry->u1.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; + HandleTableEntry->ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; if (HandleInfo->ProtectFromClose) - HandleTableEntry->u1.ObAttributes |= EX_HANDLE_ENTRY_PROTECTFROMCLOSE; + HandleTableEntry->ObAttributes |= EX_HANDLE_ENTRY_PROTECTFROMCLOSE; else - HandleTableEntry->u1.ObAttributes &= ~EX_HANDLE_ENTRY_PROTECTFROMCLOSE; + HandleTableEntry->ObAttributes &= ~EX_HANDLE_ENTRY_PROTECTFROMCLOSE; /* FIXME: Do we need to set anything in the object header??? */ @@ -231,7 +231,7 @@ Handle); if(HandleEntry != NULL) { - if(HandleEntry->u1.ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) + if(HandleEntry->ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) { ExUnlockHandleTableEntry(ObjectTable, HandleEntry); @@ -316,17 +316,17 @@ ObjectHeader = EX_HTE_TO_HDR(SourceHandleEntry); ObjectBody = &ObjectHeader->Body; - NewHandleEntry.u1.Object = SourceHandleEntry->u1.Object; + NewHandleEntry.Object = SourceHandleEntry->Object; if(HandleAttributes & OBJ_INHERIT) - NewHandleEntry.u1.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; + NewHandleEntry.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; else - NewHandleEntry.u1.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; - NewHandleEntry.u2.GrantedAccess = ((Options & DUPLICATE_SAME_ACCESS) ? - SourceHandleEntry->u2.GrantedAccess : + NewHandleEntry.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; + NewHandleEntry.GrantedAccess = ((Options & DUPLICATE_SAME_ACCESS) ? + SourceHandleEntry->GrantedAccess : DesiredAccess); if (Options & DUPLICATE_SAME_ACCESS) { - NewHandleEntry.u2.GrantedAccess = SourceHandleEntry->u2.GrantedAccess; + NewHandleEntry.GrantedAccess = SourceHandleEntry->GrantedAccess; } else { @@ -335,7 +335,7 @@ RtlMapGenericMask(&DesiredAccess, &ObjectHeader->Type->TypeInfo.GenericMapping); } - NewHandleEntry.u2.GrantedAccess = DesiredAccess; + NewHandleEntry.GrantedAccess = DesiredAccess; } /* reference the object so it doesn't get deleted after releasing the lock @@ -634,7 +634,7 @@ PAGED_CODE(); - Ret = (HandleTableEntry->u1.ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; + Ret = (HandleTableEntry->ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; if(Ret) { ObjectHeader = EX_HTE_TO_HDR(HandleTableEntry); @@ -739,12 +739,12 @@ &ObjectHeader->Type->TypeInfo.GenericMapping); } - NewEntry.u1.Object = ObjectHeader; + NewEntry.Object = ObjectHeader; if(HandleAttributes & OBJ_INHERIT) - NewEntry.u1.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; + NewEntry.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; else - NewEntry.u1.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; - NewEntry.u2.GrantedAccess = GrantedAccess; + NewEntry.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; + NewEntry.GrantedAccess = GrantedAccess; if ((HandleAttributes & OBJ_KERNEL_HANDLE) && ExGetPreviousMode == KernelMode) @@ -834,7 +834,7 @@ Handle); if(HandleEntry != NULL) { - *GenerateOnClose = (HandleEntry->u1.ObAttributes & EX_HANDLE_ENTRY_AUDITONCLOSE) != 0; + *GenerateOnClose = (HandleEntry->ObAttributes & EX_HANDLE_ENTRY_AUDITONCLOSE) != 0; ExUnlockHandleTableEntry(Process->ObjectTable, HandleEntry); @@ -1013,7 +1013,7 @@ &BODY_TO_HEADER(ObjectBody)->Type->TypeInfo.GenericMapping); } - GrantedAccess = HandleEntry->u2.GrantedAccess; + GrantedAccess = HandleEntry->GrantedAccess; /* Unless running as KernelMode, deny access if caller desires more access rights than the handle can grant */ @@ -1036,7 +1036,7 @@ ObReferenceObject(ObjectBody); - Attributes = HandleEntry->u1.ObAttributes & (EX_HANDLE_ENTRY_PROTECTFROMCLOSE | + Attributes = HandleEntry->ObAttributes & (EX_HANDLE_ENTRY_PROTECTFROMCLOSE | EX_HANDLE_ENTRY_INHERITABLE | EX_HANDLE_ENTRY_AUDITONCLOSE); @@ -1203,7 +1203,7 @@ PWSTR BufferPos = RemainingPath.Buffer; ULONG Delta = 0; - ObpAddEntryDirectory(FoundObject, Header, NULL); + ObpAddEntryDirectory(FoundObject, (PROS_OBJECT_HEADER)Header, NULL); ObjectAttached = TRUE; ObjectNameInfo = HEADER_TO_OBJECT_NAME(Header); @@ -1251,8 +1251,8 @@ { DPRINT("Calling %x\n", Header->Type->TypeInfo.OpenProcedure); Status = Header->Type->TypeInfo.OpenProcedure(ObCreateHandle, + NULL, &Header->Body, - NULL, 0, 0); } @@ -1262,7 +1262,7 @@ DPRINT("Create Failed\n"); if (ObjectAttached == TRUE) { - ObpRemoveEntryDirectory(Header); + ObpRemoveEntryDirectory((PROS_OBJECT_HEADER)Header); } if (FoundObject) { Index: ntoskrnl/ob/ntobj.c =================================================================== --- ntoskrnl/ob/ntobj.c (revision 21759) +++ ntoskrnl/ob/ntobj.c (working copy) @@ -234,7 +234,7 @@ if (ObjectHeader->HandleCount == 0 && HEADER_TO_OBJECT_NAME(ObjectHeader)->Directory) { /* Remove the object from the namespace */ - ObpRemoveEntryDirectory(ObjectHeader); + ObpRemoveEntryDirectory((PROS_OBJECT_HEADER)ObjectHeader); } } } Index: ntoskrnl/rtl/libsupp.c =================================================================== --- ntoskrnl/rtl/libsupp.c (revision 21759) +++ ntoskrnl/rtl/libsupp.c (working copy) @@ -292,8 +292,8 @@ HANDLE Handle; USHORT HandleIndex; - ExEntry.u1.Object = Entry; - ExEntry.u2.GrantedAccess = 0x1; /* FIXME - valid handle */ + ExEntry.Object = Entry; + ExEntry.GrantedAccess = 0x1; /* FIXME - valid handle */ Handle = ExCreateHandle(AtomTable->ExHandleTable, &ExEntry); @@ -330,7 +330,7 @@ (HANDLE)((ULONG_PTR)Index << 2)); if (ExEntry != NULL) { - Entry = ExEntry->u1.Object; + Entry = ExEntry->Object; ExUnlockHandleTableEntry(AtomTable->ExHandleTable, ExEntry); Index: ntoskrnl/io/efi.c =================================================================== --- ntoskrnl/io/efi.c (revision 21759) +++ ntoskrnl/io/efi.c (working copy) @@ -39,8 +39,8 @@ NTSTATUS STDCALL NtEnumerateBootEntries( - IN ULONG Unknown1, - IN ULONG Unknown2 + IN PVOID Buffer, + IN PULONG BufferLength ) { UNIMPLEMENTED; @@ -50,8 +50,8 @@ NTSTATUS STDCALL NtQueryBootEntryOrder( - IN ULONG Unknown1, - IN ULONG Unknown2 + IN PULONG Ids, + IN PULONG Count ) { UNIMPLEMENTED; @@ -61,8 +61,8 @@ NTSTATUS STDCALL NtQueryBootOptions( - IN ULONG Unknown1, - IN ULONG Unknown2 + IN PBOOT_OPTIONS BootOptions, + IN PULONG BootOptionsLength ) { UNIMPLEMENTED; @@ -72,8 +72,8 @@ NTSTATUS STDCALL NtSetBootEntryOrder( - IN ULONG Unknown1, - IN ULONG Unknown2 + IN PULONG Ids, + IN PULONG Count ) { UNIMPLEMENTED; @@ -83,8 +83,8 @@ NTSTATUS STDCALL NtSetBootOptions( - ULONG Unknown1, - ULONG Unknown2 + IN PBOOT_OPTIONS BootOptions, + IN ULONG FieldsToChange ) { UNIMPLEMENTED; @@ -94,9 +94,10 @@ NTSTATUS STDCALL NtTranslateFilePath( - ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3 + PFILE_PATH InputFilePath, + ULONG OutputType, + PFILE_PATH OutputFilePath, + ULONG OutputFilePathLength ) { UNIMPLEMENTED; Index: ntoskrnl/io/disk.c =================================================================== --- ntoskrnl/io/disk.c (revision 21759) +++ ntoskrnl/io/disk.c (working copy) @@ -65,7 +65,26 @@ HAL_PRIVATE_DISPATCH HalPrivateDispatchTable = { - HAL_PRIVATE_DISPATCH_VERSION + HAL_PRIVATE_DISPATCH_VERSION, + (pHalHandlerForBus) NULL, + (pHalHandlerForConfigSpace) NULL, + (pHalLocateHiberRanges) NULL, + (pHalRegisterBusHandler) NULL, + (pHalSetWakeEnable) NULL, + (pHalSetWakeAlarm) NULL, + (pHalTranslateBusAddress) NULL, + (pHalAssignSlotResources) NULL, + (pHalHaltSystem) NULL, + (pHalFindBusAddressTranslation) NULL, + (pHalResetDisplay) NULL, + (pHalAllocateMapRegisters) NULL, + (pKdSetupPciDeviceForDebugging) NULL, + (pKdReleasePciDeviceForDebugging) NULL, + (pKdGetAcpiTablePhase0) NULL, + (pKdCheckPowerButton) NULL, + (pHalVectorToIDTEntry) NULL, + (pKdMapPhysicalMemory64) NULL, + (pKdUnmapVirtualAddress) NULL }; const WCHAR DiskMountString[] = L"\\DosDevices\\%C:"; @@ -597,7 +616,7 @@ VOID FASTCALL -xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock, +xHalIoAssignDriveLetters(IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock, IN PSTRING NtDeviceName, OUT PUCHAR NtSystemPath, OUT PSTRING NtSystemPathString) Index: ntoskrnl/io/driver.c =================================================================== --- ntoskrnl/io/driver.c (revision 21759) +++ ntoskrnl/io/driver.c (working copy) @@ -15,8 +15,6 @@ #include <internal/debug.h> /* ke/main.c */ -extern LOADER_PARAMETER_BLOCK KeLoaderBlock; -extern ULONG KeTickCount; extern BOOLEAN SetupMode; extern BOOLEAN NoGuiBoot; Index: ntoskrnl/io/iomgr.c =================================================================== --- ntoskrnl/io/iomgr.c (revision 21759) +++ ntoskrnl/io/iomgr.c (working copy) @@ -424,7 +424,7 @@ KdbInit(); /* I/O is now setup for disk access, so phase 3 */ - KdInitSystem(3, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); + KdInitSystem(3, (PROS_LOADER_PARAMETER_BLOCK)&KeLoaderBlock); /* Load services for devices found by PnP manager */ IopInitializePnpServices(IopRootDeviceNode, FALSE); Index: ntoskrnl/io/file.c =================================================================== --- ntoskrnl/io/file.c (revision 21759) +++ ntoskrnl/io/file.c (working copy) @@ -397,6 +397,7 @@ NTSTATUS STDCALL IopQueryNameFile(PVOID ObjectBody, + IN BOOLEAN HasName, POBJECT_NAME_INFORMATION ObjectNameInfo, ULONG Length, PULONG ReturnLength) @@ -456,8 +457,11 @@ VOID STDCALL -IopCloseFile(PVOID ObjectBody, - ULONG HandleCount) +IopCloseFile(IN PEPROCESS Process OPTIONAL, + IN PVOID ObjectBody, + IN ACCESS_MASK GrantedAccess, + IN ULONG HandleCount, + IN ULONG SystemHandleCount) { PFILE_OBJECT FileObject = (PFILE_OBJECT)ObjectBody; KEVENT Event; Index: ntoskrnl/io/plugplay.c =================================================================== --- ntoskrnl/io/plugplay.c (revision 21759) +++ ntoskrnl/io/plugplay.c (working copy) @@ -539,8 +539,8 @@ _SEH_TRY { Relation = RelatedDeviceData->Relation; - MaximumLength = RelatedDeviceData->RelatedDeviceInstance.MaximumLength; - ProbeForWrite(RelatedDeviceData->RelatedDeviceInstance.Buffer, + MaximumLength = RelatedDeviceData->RelatedDeviceInstanceLength; + ProbeForWrite(RelatedDeviceData->RelatedDeviceInstance, MaximumLength, sizeof(WCHAR)); } @@ -622,10 +622,10 @@ /* Copy related device instance name */ _SEH_TRY { - RtlCopyMemory(RelatedDeviceData->RelatedDeviceInstance.Buffer, + RtlCopyMemory(RelatedDeviceData->RelatedDeviceInstance, RelatedDeviceNode->InstancePath.Buffer, RelatedDeviceNode->InstancePath.Length); - RelatedDeviceData->RelatedDeviceInstance.Length = RelatedDeviceNode->InstancePath.Length; + RelatedDeviceData->RelatedDeviceInstanceLength = RelatedDeviceNode->InstancePath.Length; } _SEH_HANDLE { Index: ntoskrnl/kdbg/kdb_symbols.c =================================================================== --- ntoskrnl/kdbg/kdb_symbols.c (revision 21759) +++ ntoskrnl/kdbg/kdb_symbols.c (working copy) @@ -73,7 +73,7 @@ while (current_entry != &Peb->Ldr->InLoadOrderModuleList && current_entry != NULL) { - current = CONTAINING_RECORD(current_entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + current = CONTAINING_RECORD(current_entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); Length = min(current->BaseDllName.Length / sizeof(WCHAR), 255); if ((Address != NULL && (Address >= (PVOID)current->DllBase && Address < (PVOID)((char *)current->DllBase + current->SizeOfImage))) || @@ -115,7 +115,7 @@ while (current_entry != &ModuleListHead) { - current = CONTAINING_RECORD(current_entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + current = CONTAINING_RECORD(current_entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); Length = min(current->BaseDllName.Length / sizeof(WCHAR), 255); if ((Address != NULL && (Address >= (PVOID)current->DllBase && @@ -537,7 +537,7 @@ while (CurrentEntry != &Peb->Ldr->InLoadOrderModuleList && CurrentEntry != NULL) { - Current = CONTAINING_RECORD(CurrentEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + Current = CONTAINING_RECORD(CurrentEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); KdbpSymUnloadModuleSymbols(Current->PatchInformation); Index: ntoskrnl/ntoskrnl.def =================================================================== --- ntoskrnl/ntoskrnl.def (revision 21759) +++ ntoskrnl/ntoskrnl.def (working copy) @@ -1116,8 +1116,8 @@ RtlIpv4StringToAddressExW@16 RtlIpv4StringToAddressW@16 RtlIpv6AddressToStringA@8 -RtlIpv6AddressToStringExA@16 -RtlIpv6AddressToStringExW@16 +RtlIpv6AddressToStringExA@20 +RtlIpv6AddressToStringExW@20 RtlIpv6AddressToStringW@8 RtlIpv6StringToAddressA@12 RtlIpv6StringToAddressExA@16 Index: ntoskrnl/mm/section.c =================================================================== --- ntoskrnl/mm/section.c (revision 21759) +++ ntoskrnl/mm/section.c (working copy) @@ -60,7 +60,7 @@ typedef struct { - PSECTION_OBJECT Section; + PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; ULONG Offset; BOOLEAN WasDirty; @@ -316,7 +316,7 @@ BOOLEAN NTAPI -MmUnsharePageEntrySectionSegment(PSECTION_OBJECT Section, +MmUnsharePageEntrySectionSegment(PROS_SECTION_OBJECT Section, PMM_SECTION_SEGMENT Segment, ULONG Offset, BOOLEAN Dirty, @@ -646,7 +646,7 @@ PFN_TYPE Page; NTSTATUS Status; PVOID PAddress; - PSECTION_OBJECT Section; + PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; ULONG Entry; ULONG Entry1; @@ -1162,7 +1162,7 @@ BOOLEAN Locked) { PMM_SECTION_SEGMENT Segment; - PSECTION_OBJECT Section; + PROS_SECTION_OBJECT Section; PFN_TYPE OldPage; PFN_TYPE NewPage; NTSTATUS Status; @@ -1329,7 +1329,7 @@ } VOID -MmPageOutDeleteMapping(PVOID Context, PEPROCESS Process, PVOID Address) +MmPageOutDeleteMapping(PVOID Context, PROS_EPROCESS Process, PVOID Address) { MM_SECTION_PAGEOUT_CONTEXT* PageOutContext; BOOLEAN WasDirty; @@ -1353,7 +1353,7 @@ if (!PageOutContext->Private) { MmLockSectionSegment(PageOutContext->Segment); - MmUnsharePageEntrySectionSegment(PageOutContext->Section, + MmUnsharePageEntrySectionSegment((PROS_SECTION_OBJECT)PageOutContext->Section, PageOutContext->Segment, PageOutContext->Offset, PageOutContext->WasDirty, @@ -1734,7 +1734,7 @@ PMM_PAGEOP PageOp) { ULONG Offset; - PSECTION_OBJECT Section; + PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; PFN_TYPE Page; SWAPENTRY SwapEntry; @@ -1980,7 +1980,7 @@ { PMM_REGION Region; PVOID RegionBaseAddress; - PSECTION_OBJECT Section; + PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; Region = MmFindRegion((PVOID)MemoryArea->StartingAddress, @@ -2054,7 +2054,7 @@ VOID STDCALL MmpDeleteSection(PVOID ObjectBody) { - PSECTION_OBJECT Section = (PSECTION_OBJECT)ObjectBody; + PROS_SECTION_OBJECT Section = (PROS_SECTION_OBJECT)ObjectBody; DPRINT("MmpDeleteSection(ObjectBody %x)\n", ObjectBody); if (Section->AllocationAttributes & SEC_IMAGE) @@ -2123,11 +2123,14 @@ } VOID STDCALL -MmpCloseSection(PVOID ObjectBody, - ULONG HandleCount) +MmpCloseSection(IN PEPROCESS Process OPTIONAL, + IN PVOID Object, + IN ACCESS_MASK GrantedAccess, + IN ULONG ProcessHandleCount, + IN ULONG SystemHandleCount) { DPRINT("MmpCloseSection(OB %x, HC %d) RC %d\n", - ObjectBody, HandleCount, ObGetObjectPointerCount(ObjectBody)); + Object, ProcessHandleCount, ObGetObjectPointerCount(Object)); } NTSTATUS @@ -2135,7 +2138,7 @@ NTAPI MmCreatePhysicalMemorySection(VOID) { - PSECTION_OBJECT PhysSection; + PROS_SECTION_OBJECT PhysSection; NTSTATUS Status; OBJECT_ATTRIBUTES Obj; UNICODE_STRING Name = RTL_CONSTANT_STRING(L"\\Device\\PhysicalMemory"); @@ -2206,7 +2209,7 @@ NTSTATUS NTAPI -MmCreatePageFileSection(PSECTION_OBJECT *SectionObject, +MmCreatePageFileSection(PROS_SECTION_OBJECT *SectionObject, ACCESS_MASK DesiredAccess, POBJECT_ATTRIBUTES ObjectAttributes, PLARGE_INTEGER UMaximumSize, @@ -2217,7 +2220,7 @@ */ { LARGE_INTEGER MaximumSize; - PSECTION_OBJECT Section; + PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; NTSTATUS Status; @@ -2278,7 +2281,7 @@ NTSTATUS NTAPI -MmCreateDataFileSection(PSECTION_OBJECT *SectionObject, +MmCreateDataFileSection(PROS_SECTION_OBJECT *SectionObject, ACCESS_MASK DesiredAccess, POBJECT_ATTRIBUTES ObjectAttributes, PLARGE_INTEGER UMaximumSize, @@ -2289,7 +2292,7 @@ * Create a section backed by a data file */ { - PSECTION_OBJECT Section; + PROS_SECTION_OBJECT Section; NTSTATUS Status; LARGE_INTEGER MaximumSize; PFILE_OBJECT FileObject; @@ -3170,7 +3173,7 @@ } NTSTATUS -MmCreateImageSection(PSECTION_OBJECT *SectionObject, +MmCreateImageSection(PROS_SECTION_OBJECT *SectionObject, ACCESS_MASK DesiredAccess, POBJECT_ATTRIBUTES ObjectAttributes, PLARGE_INTEGER UMaximumSize, @@ -3178,7 +3181,7 @@ ULONG AllocationAttributes, HANDLE FileHandle) { - PSECTION_OBJECT Section; + PROS_SECTION_OBJECT Section; NTSTATUS Status; PFILE_OBJECT FileObject; PMM_SECTION_SEGMENT SectionSegments; @@ -3484,7 +3487,7 @@ NTSTATUS STATIC MmMapViewOfSegment(PMADDRESS_SPACE AddressSpace, - PSECTION_OBJECT Section, + PROS_SECTION_OBJECT Section, PMM_SECTION_SEGMENT Segment, PVOID* BaseAddress, SIZE_T ViewSize, @@ -3591,8 +3594,8 @@ PVOID SafeBaseAddress; LARGE_INTEGER SafeSectionOffset; SIZE_T SafeViewSize; - PSECTION_OBJECT Section; - PEPROCESS Process; + PROS_SECTION_OBJECT Section; + PROS_EPROCESS Process; KPROCESSOR_MODE PreviousMode; PMADDRESS_SPACE AddressSpace; NTSTATUS Status = STATUS_SUCCESS; @@ -3689,7 +3692,7 @@ } Status = MmMapViewOfSection(Section, - Process, + (PEPROCESS)Process, (BaseAddress != NULL ? &SafeBaseAddress : NULL), ZeroBits, CommitSize, @@ -3741,7 +3744,7 @@ SWAPENTRY SavedSwapEntry; PMM_PAGEOP PageOp; NTSTATUS Status; - PSECTION_OBJECT Section; + PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; PMADDRESS_SPACE AddressSpace; @@ -3843,7 +3846,7 @@ { NTSTATUS Status; PMEMORY_AREA MemoryArea; - PSECTION_OBJECT Section; + PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; PLIST_ENTRY CurrentEntry; PMM_REGION CurrentRegion; @@ -3899,7 +3902,7 @@ NTSTATUS Status; PMEMORY_AREA MemoryArea; PMADDRESS_SPACE AddressSpace; - PSECTION_OBJECT Section; + PROS_SECTION_OBJECT Section; PMM_PAGEOP PageOp; ULONG_PTR Offset; @@ -3908,7 +3911,7 @@ ASSERT(Process); - AddressSpace = &Process->AddressSpace; + AddressSpace = &((PROS_EPROCESS)Process)->AddressSpace; MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, @@ -4088,7 +4091,7 @@ IN ULONG SectionInformationLength, OUT PULONG ResultLength OPTIONAL) { - PSECTION_OBJECT Section; + PROS_SECTION_OBJECT Section; KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; @@ -4216,7 +4219,7 @@ IN PLARGE_INTEGER NewMaximumSize) { LARGE_INTEGER SafeNewMaximumSize; - PSECTION_OBJECT Section; + PROS_SECTION_OBJECT Section; KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; @@ -4408,7 +4411,7 @@ IN ULONG AllocationType, IN ULONG Protect) { - PSECTION_OBJECT Section; + PROS_SECTION_OBJECT Section; PMADDRESS_SPACE AddressSpace; ULONG ViewOffset; NTSTATUS Status = STATUS_SUCCESS; @@ -4428,8 +4431,8 @@ } - Section = (PSECTION_OBJECT)SectionObject; - AddressSpace = &Process->AddressSpace; + Section = (PROS_SECTION_OBJECT)SectionObject; + AddressSpace = &((PROS_EPROCESS)Process)->AddressSpace; AllocationType |= (Section->AllocationAttributes & SEC_NO_CHANGE); @@ -4655,13 +4658,13 @@ OUT PVOID * MappedBase, IN OUT PULONG ViewSize) { - PSECTION_OBJECT Section; + PROS_SECTION_OBJECT Section; PMADDRESS_SPACE AddressSpace; NTSTATUS Status; DPRINT("MmMapViewInSystemSpace() called\n"); - Section = (PSECTION_OBJECT)SectionObject; + Section = (PROS_SECTION_OBJECT)SectionObject; AddressSpace = MmGetKernelAddressSpace(); MmLockAddressSpace(AddressSpace); @@ -4823,7 +4826,7 @@ IN PFILE_OBJECT File OPTIONAL) { ULONG Protection; - PSECTION_OBJECT *SectionObject = (PSECTION_OBJECT *)Section; + PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section; /* * Check the protection Index: ntoskrnl/mm/mm.c =================================================================== --- ntoskrnl/mm/mm.c (revision 21759) +++ ntoskrnl/mm/mm.c (working copy) @@ -30,7 +30,7 @@ NTSTATUS NTAPI -MmReleaseMmInfo(PEPROCESS Process) +MmReleaseMmInfo(PROS_EPROCESS Process) { PVOID Address; PMEMORY_AREA MemoryArea; @@ -47,7 +47,7 @@ case MEMORY_AREA_SECTION_VIEW: Address = (PVOID)MemoryArea->StartingAddress; MmUnlockAddressSpace(&Process->AddressSpace); - MmUnmapViewOfSection(Process, Address); + MmUnmapViewOfSection((PEPROCESS)Process, Address); MmLockAddressSpace(&Process->AddressSpace); break; @@ -114,7 +114,7 @@ } else { - AddressSpace = &PsGetCurrentProcess()->AddressSpace; + AddressSpace = &((PROS_EPROCESS)PsGetCurrentProcess())->AddressSpace; } MmLockAddressSpace(AddressSpace); @@ -171,7 +171,7 @@ } else { - AddressSpace = &PsGetCurrentProcess()->AddressSpace; + AddressSpace = &((PROS_EPROCESS)PsGetCurrentProcess())->AddressSpace; } if (!FromMdl) @@ -304,7 +304,7 @@ } else { - AddressSpace = &PsGetCurrentProcess()->AddressSpace; + AddressSpace = &((PROS_EPROCESS)PsGetCurrentProcess())->AddressSpace; } if (!FromMdl) @@ -357,7 +357,7 @@ case MEMORY_AREA_SHARED_DATA: Pfn = MmSharedDataPagePhysicalAddress.QuadPart >> PAGE_SHIFT; Status = - MmCreateVirtualMapping(PsGetCurrentProcess(), + MmCreateVirtualMapping((PROS_EPROCESS)PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Address), PAGE_READONLY, &Pfn, Index: ntoskrnl/mm/mdl.c =================================================================== --- ntoskrnl/mm/mdl.c (revision 21759) +++ ntoskrnl/mm/mdl.c (working copy) @@ -241,7 +241,7 @@ /* Unmap all the pages. */ for (i = 0; i < PageCount; i++) { - MmDeleteVirtualMapping(Mdl->Process, + MmDeleteVirtualMapping((PROS_EPROCESS)Mdl->Process, (char*)BaseAddress + (i * PAGE_SIZE), FALSE, NULL, @@ -273,14 +273,14 @@ ASSERT(Mdl->Process == PsGetCurrentProcess()); - Marea = MmLocateMemoryAreaByAddress( &Mdl->Process->AddressSpace, BaseAddress ); + Marea = MmLocateMemoryAreaByAddress( &((PROS_EPROCESS)Mdl->Process)->AddressSpace, BaseAddress ); if (Marea == NULL) { DPRINT1( "Couldn't open memory area when unmapping user-space pages!\n" ); KEBUGCHECK(0); } - MmFreeMemoryArea( &Mdl->Process->AddressSpace, Marea, NULL, NULL ); + MmFreeMemoryArea( &((PROS_EPROCESS)Mdl->Process)->AddressSpace, Marea, NULL, NULL ); Mdl->Process = NULL; } @@ -411,7 +411,7 @@ /* FIXME: why isn't AccessMode used? */ Mode = UserMode; Mdl->Process = CurrentProcess; - AddressSpace = &CurrentProcess->AddressSpace; + AddressSpace = &((PROS_EPROCESS)CurrentProcess)->AddressSpace; } @@ -771,7 +771,7 @@ KIRQL oldIrql; ULONG PageCount; ULONG StartingOffset; - PEPROCESS CurrentProcess; + PROS_EPROCESS CurrentProcess; NTSTATUS Status; ULONG Protect; @@ -803,7 +803,7 @@ BoundaryAddressMultiple.QuadPart = 0; Base = BaseAddress; - CurrentProcess = PsGetCurrentProcess(); + CurrentProcess = (PROS_EPROCESS)PsGetCurrentProcess(); MmLockAddressSpace(&CurrentProcess->AddressSpace); Status = MmCreateMemoryArea(&CurrentProcess->AddressSpace, @@ -828,7 +828,7 @@ ASSERT(0); } - Mdl->Process = CurrentProcess; + Mdl->Process = (PEPROCESS)CurrentProcess; } else /* if (AccessMode == KernelMode) */ { Index: ntoskrnl/mm/process.c =================================================================== --- ntoskrnl/mm/process.c (revision 21759) +++ ntoskrnl/mm/process.c (working copy) @@ -25,7 +25,7 @@ PVOID STDCALL -MiCreatePebOrTeb(PEPROCESS Process, +MiCreatePebOrTeb(PROS_EPROCESS Process, PVOID BaseAddress) { NTSTATUS Status; @@ -107,7 +107,7 @@ VOID STDCALL -MmDeleteTeb(PEPROCESS Process, +MmDeleteTeb(PROS_EPROCESS Process, PTEB Teb) { PMADDRESS_SPACE ProcessAddressSpace = &Process->AddressSpace; @@ -220,7 +220,7 @@ NTSTATUS STDCALL -MmCreatePeb(PEPROCESS Process) +MmCreatePeb(PROS_EPROCESS Process) { PPEB Peb = NULL; LARGE_INTEGER SectionOffset; @@ -241,7 +241,7 @@ /* Map NLS Tables */ DPRINT("Mapping NLS\n"); Status = MmMapViewOfSection(NlsSectionObject, - Process, + (PEPROCESS)Process, &TableBase, 0, 0, @@ -357,7 +357,7 @@ PTEB STDCALL -MmCreateTeb(PEPROCESS Process, +MmCreateTeb(PROS_EPROCESS Process, PCLIENT_ID ClientId, PINITIAL_TEB InitialTeb) { @@ -366,7 +366,7 @@ /* Attach to the process */ DPRINT("MmCreateTeb\n"); - if (Process != PsGetCurrentProcess()) + if (Process != (PROS_EPROCESS)PsGetCurrentProcess()) { /* Attach to Target */ KeAttachProcess(&Process->Pcb); @@ -407,8 +407,8 @@ NTSTATUS STDCALL -MmCreateProcessAddressSpace(IN PEPROCESS Process, - IN PSECTION_OBJECT Section OPTIONAL) +MmCreateProcessAddressSpace(IN PROS_EPROCESS Process, + IN PROS_SECTION_OBJECT Section OPTIONAL) { NTSTATUS Status; PMADDRESS_SPACE ProcessAddressSpace = &Process->AddressSpace; @@ -491,7 +491,7 @@ DPRINT("Mapping process image. Section: %p, Process: %p, ImageBase: %p\n", Section, Process, &ImageBase); Status = MmMapViewOfSection(Section, - Process, + (PEPROCESS)Process, (PVOID*)&ImageBase, 0, 0, Index: ntoskrnl/mm/marea.c =================================================================== --- ntoskrnl/mm/marea.c (revision 21759) +++ ntoskrnl/mm/marea.c (working copy) @@ -747,7 +747,7 @@ PMEMORY_AREA *ParentReplace; ULONG_PTR Address; PVOID EndAddress; - PEPROCESS CurrentProcess = PsGetCurrentProcess(); + PROS_EPROCESS CurrentProcess = (PROS_EPROCESS)PsGetCurrentProcess(); if (AddressSpace->Process != NULL && AddressSpace->Process != CurrentProcess) @@ -1025,7 +1025,7 @@ VOID STDCALL -MmReleaseMemoryAreaIfDecommitted(PEPROCESS Process, +MmReleaseMemoryAreaIfDecommitted(PROS_EPROCESS Process, PMADDRESS_SPACE AddressSpace, PVOID BaseAddress) { Index: ntoskrnl/mm/virtual.c =================================================================== --- ntoskrnl/mm/virtual.c (revision 21759) +++ ntoskrnl/mm/virtual.c (working copy) @@ -119,7 +119,7 @@ OUT PULONG ResultLength) { NTSTATUS Status; - PEPROCESS Process; + PROS_EPROCESS Process; MEMORY_AREA* MemoryArea; PMADDRESS_SPACE AddressSpace; @@ -393,7 +393,7 @@ PAGE_ROUND_DOWN(*BaseAddress); *BaseAddress = (PVOID)PAGE_ROUND_DOWN(*BaseAddress); - AddressSpace = &Process->AddressSpace; + AddressSpace = &((PROS_EPROCESS)Process)->AddressSpace; MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, *BaseAddress); Index: ntoskrnl/mm/anonmem.c =================================================================== --- ntoskrnl/mm/anonmem.c (revision 21759) +++ ntoskrnl/mm/anonmem.c (working copy) @@ -544,7 +544,7 @@ * RETURNS: Status */ { - PEPROCESS Process; + PROS_EPROCESS Process; MEMORY_AREA* MemoryArea; ULONG_PTR MemoryAreaLength; ULONG Type; @@ -784,7 +784,7 @@ MmFreeSwapPage(SavedSwapEntry); MmSetSavedSwapEntryPage(Page, 0); } - MmDeleteRmap(Page, Process, Address); + MmDeleteRmap(Page, (PROS_EPROCESS)Process, Address); MmReleasePageMemoryConsumer(MC_USER, Page); } else if (SwapEntry != 0) @@ -795,7 +795,7 @@ VOID NTAPI -MmFreeVirtualMemory(PEPROCESS Process, +MmFreeVirtualMemory(PROS_EPROCESS Process, PMEMORY_AREA MemoryArea) { PLIST_ENTRY current_entry; @@ -889,7 +889,7 @@ { MEMORY_AREA* MemoryArea; NTSTATUS Status; - PEPROCESS Process; + PROS_EPROCESS Process; PMADDRESS_SPACE AddressSpace; PVOID BaseAddress; ULONG RegionSize; Index: ntoskrnl/mm/rmap.c =================================================================== --- ntoskrnl/mm/rmap.c (revision 21759) +++ ntoskrnl/mm/rmap.c (working copy) @@ -62,7 +62,7 @@ PMADDRESS_SPACE AddressSpace; ULONG Type; PVOID Address; - PEPROCESS Process; + PROS_EPROCESS Process; PMM_PAGEOP PageOp; ULONG Offset; NTSTATUS Status = STATUS_SUCCESS; @@ -78,7 +78,7 @@ ExReleaseFastMutex(&RmapListLock); return(STATUS_UNSUCCESSFUL); } - Process = entry->Process; + Process = (PROS_EPROCESS)entry->Process; Address = entry->Address; if ((((ULONG_PTR)Address) & 0xFFF) != 0) { @@ -196,7 +196,7 @@ PMADDRESS_SPACE AddressSpace; ULONG Type; PVOID Address; - PEPROCESS Process; + PROS_EPROCESS Process; PMM_PAGEOP PageOp; ULONG Offset; NTSTATUS Status = STATUS_SUCCESS; @@ -208,7 +208,7 @@ ExReleaseFastMutex(&RmapListLock); return(STATUS_UNSUCCESSFUL); } - Process = entry->Process; + Process = (PROS_EPROCESS)entry->Process; Address = entry->Address; if ((((ULONG_PTR)Address) & 0xFFF) != 0) { @@ -326,7 +326,7 @@ } while (current_entry != NULL) { - MmSetCleanPage(current_entry->Process, current_entry->Address); + MmSetCleanPage((PROS_EPROCESS)current_entry->Process, current_entry->Address); current_entry = current_entry->Next; } ExReleaseFastMutex(&RmapListLock); @@ -347,7 +347,7 @@ } while (current_entry != NULL) { - MmSetDirtyPage(current_entry->Process, current_entry->Address); + MmSetDirtyPage((PROS_EPROCESS)current_entry->Process, current_entry->Address); current_entry = current_entry->Next; } ExReleaseFastMutex(&RmapListLock); @@ -368,7 +368,7 @@ } while (current_entry != NULL) { - if (MmIsDirtyPage(current_entry->Process, current_entry->Address)) + if (MmIsDirtyPage((PROS_EPROCESS)current_entry->Process, current_entry->Address)) { ExReleaseFastMutex(&RmapListLock); return(TRUE); @@ -381,7 +381,7 @@ VOID NTAPI -MmInsertRmap(PFN_TYPE Page, PEPROCESS Process, +MmInsertRmap(PFN_TYPE Page, PROS_EPROCESS Process, PVOID Address) { PMM_RMAP_ENTRY current_entry; @@ -396,7 +396,7 @@ KEBUGCHECK(0); } new_entry->Address = Address; - new_entry->Process = Process; + new_entry->Process = (PEPROCESS)Process; #ifdef DBG new_entry->Caller = __builtin_return_address(0); #endif @@ -433,7 +433,7 @@ ExReleaseFastMutex(&RmapListLock); if (Process == NULL) { - Process = PsInitialSystemProcess; + Process = (PROS_EPROCESS)PsInitialSystemProcess; } if (Process) { @@ -448,7 +448,7 @@ VOID NTAPI MmDeleteAllRmaps(PFN_TYPE Page, PVOID Context, - VOID (*DeleteMapping)(PVOID Context, PEPROCESS Process, + VOID (*DeleteMapping)(PVOID Context, PROS_EPROCESS Process, PVOID Address)) { PMM_RMAP_ENTRY current_entry; @@ -470,7 +470,7 @@ current_entry = current_entry->Next; if (DeleteMapping) { - DeleteMapping(Context, previous_entry->Process, + DeleteMapping(Context, (PROS_EPROCESS)previous_entry->Process, previous_entry->Address); } Process = previous_entry->Process; @@ -488,7 +488,7 @@ VOID NTAPI -MmDeleteRmap(PFN_TYPE Page, PEPROCESS Process, +MmDeleteRmap(PFN_TYPE Page, PROS_EPROCESS Process, PVOID Address) { PMM_RMAP_ENTRY current_entry, previous_entry; @@ -498,7 +498,7 @@ current_entry = MmGetRmapListHeadPage(Page); while (current_entry != NULL) { - if (current_entry->Process == Process && + if (current_entry->Process == (PEPROCESS)Process && current_entry->Address == Address) { if (previous_entry == NULL) @@ -513,7 +513,7 @@ ExFreeToNPagedLookasideList(&RmapLookasideList, current_entry); if (Process == NULL) { - Process = PsInitialSystemProcess; + Process = (PROS_EPROCESS)PsInitialSystemProcess; } if (Process) { Index: ntoskrnl/mm/i386/page.c =================================================================== --- ntoskrnl/mm/i386/page.c (revision 21759) +++ ntoskrnl/mm/i386/page.c (working copy) @@ -203,7 +203,7 @@ NTSTATUS NTAPI -Mmi386ReleaseMmInfo(PEPROCESS Process) +Mmi386ReleaseMmInfo(PROS_EPROCESS Process) { PUSHORT LdtDescriptor; ULONG LdtBase; @@ -329,8 +329,8 @@ NTSTATUS STDCALL -MmCopyMmInfo(PEPROCESS Src, - PEPROCESS Dest, +MmCopyMmInfo(PROS_EPROCESS Src, + PROS_EPROCESS Dest, PPHYSICAL_ADDRESS DirectoryTableBase) { NTSTATUS Status; @@ -408,9 +408,9 @@ VOID NTAPI -MmDeletePageTable(PEPROCESS Process, PVOID Address) +MmDeletePageTable(PROS_EPROCESS Process, PVOID Address) { - PEPROCESS CurrentProcess = PsGetCurrentProcess(); + PROS_EPROCESS CurrentProcess = (PROS_EPROCESS)PsGetCurrentProcess(); if (Process != NULL && Process != CurrentProcess) { @@ -441,9 +441,9 @@ VOID NTAPI -MmFreePageTable(PEPROCESS Process, PVOID Address) +MmFreePageTable(PROS_EPROCESS Process, PVOID Address) { - PEPROCESS CurrentProcess = PsGetCurrentProcess(); + PROS_EPROCESS CurrentProcess = (PROS_EPROCESS)PsGetCurrentProcess(); ULONG i; PFN_TYPE Pfn; @@ -504,7 +504,7 @@ } static PULONGLONG -MmGetPageTableForProcessForPAE(PEPROCESS Process, PVOID Address, BOOLEAN Create) +MmGetPageTableForProcessForPAE(PROS_EPROCESS Process, PVOID Address, BOOLEAN Create) { NTSTATUS Status; PFN_TYPE Pfn; @@ -520,7 +520,7 @@ { KEBUGCHECK(0); } - if (Address < MmSystemRangeStart && Process && Process != PsGetCurrentProcess()) + if (Address < MmSystemRangeStart && Process && Process != (PROS_EPROCESS)PsGetCurrentProcess()) { PageDirTable = MmCreateHyperspaceMapping(PAE_PTE_TO_PFN(Process->Pcb.DirectoryTableBase.QuadPart)); if (PageDirTable == NULL) @@ -618,7 +618,7 @@ } static PULONG -MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) +MmGetPageTableForProcess(PROS_EPROCESS Process, PVOID Address, BOOLEAN Create) { ULONG PdeOffset = ADDR_TO_PDE_OFFSET(Address); NTSTATUS Status; @@ -626,7 +626,7 @@ ULONG Entry; PULONG Pt, PageDir; - if (Address < MmSystemRangeStart && Process && Process != PsGetCurrentProcess()) + if (Address < MmSystemRangeStart && Process && Process != (PROS_EPROCESS)PsGetCurrentProcess()) { PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase.QuadPart)); if (PageDir == NULL) @@ -736,7 +736,7 @@ return FALSE; } -static ULONGLONG MmGetPageEntryForProcessForPAE(PEPROCESS Process, PVOID Address) +static ULONGLONG MmGetPageEntryForProcessForPAE(PROS_EPROCESS Process, PVOID Address) { ULONGLONG Pte; PULONGLONG Pt; @@ -751,7 +751,7 @@ return 0; } -static ULONG MmGetPageEntryForProcess(PEPROCESS Process, PVOID Address) +static ULONG MmGetPageEntryForProcess(PROS_EPROCESS Process, PVOID Address) { ULONG Pte; PULONG Pt; @@ -768,7 +768,7 @@ PFN_TYPE NTAPI -MmGetPfnForProcess(PEPROCESS Process, +MmGetPfnForProcess(PROS_EPROCESS Process, PVOID Address) { @@ -796,7 +796,7 @@ VOID NTAPI -MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_TYPE Page) +MmDisableVirtualMapping(PROS_EPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_TYPE Page) /* * FUNCTION: Delete a virtual mapping */ @@ -916,7 +916,7 @@ VOID NTAPI -MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, +MmDeleteVirtualMapping(PROS_EPROCESS Process, PVOID Address, BOOLEAN FreePage, BOOLEAN* WasDirty, PPFN_TYPE Page) /* * FUNCTION: Delete a virtual mapping @@ -1060,7 +1060,7 @@ VOID NTAPI -MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, +MmDeletePageFileMapping(PROS_EPROCESS Process, PVOID Address, SWAPENTRY* SwapEntry) /* * FUNCTION: Delete a virtual mapping @@ -1199,7 +1199,7 @@ BOOLEAN NTAPI -MmIsDirtyPage(PEPROCESS Process, PVOID Address) +MmIsDirtyPage(PROS_EPROCESS Process, PVOID Address) { if (Ke386Pae) { @@ -1213,7 +1213,7 @@ BOOLEAN NTAPI -MmIsAccessedAndResetAccessPage(PEPROCESS Process, PVOID Address) +MmIsAccessedAndResetAccessPage(PROS_EPROCESS Process, PVOID Address) { if (Address < MmSystemRangeStart && Process == NULL) { @@ -1280,7 +1280,7 @@ VOID NTAPI -MmSetCleanPage(PEPROCESS Process, PVOID Address) +MmSetCleanPage(PROS_EPROCESS Process, PVOID Address) { if (Address < MmSystemRangeStart && Process == NULL) { @@ -1345,7 +1345,7 @@ VOID NTAPI -MmSetDirtyPage(PEPROCESS Process, PVOID Address) +MmSetDirtyPage(PROS_EPROCESS Process, PVOID Address) { if (Address < MmSystemRangeStart && Process == NULL) { @@ -1406,7 +1406,7 @@ VOID NTAPI -MmEnableVirtualMapping(PEPROCESS Process, PVOID Address) +MmEnableVirtualMapping(PROS_EPROCESS Process, PVOID Address) { if (Ke386Pae) { @@ -1462,7 +1462,7 @@ BOOLEAN NTAPI -MmIsPagePresent(PEPROCESS Process, PVOID Address) +MmIsPagePresent(PROS_EPROCESS Process, PVOID Address) { if (Ke386Pae) { @@ -1476,7 +1476,7 @@ BOOLEAN NTAPI -MmIsPageSwapEntry(PEPROCESS Process, PVOID Address) +MmIsPageSwapEntry(PROS_EPROCESS Process, PVOID Address) { if (Ke386Pae) { @@ -1622,7 +1622,7 @@ NTSTATUS NTAPI -MmCreatePageFileMapping(PEPROCESS Process, +MmCreatePageFileMapping(PROS_EPROCESS Process, PVOID Address, SWAPENTRY SwapEntry) { @@ -1710,7 +1710,7 @@ NTSTATUS NTAPI -MmCreateVirtualMappingUnsafe(PEPROCESS Process, +MmCreateVirtualMappingUnsafe(PROS_EPROCESS Process, PVOID Address, ULONG flProtect, PPFN_TYPE Pages, @@ -1916,7 +1916,7 @@ NTSTATUS NTAPI -MmCreateVirtualMapping(PEPROCESS Process, +MmCreateVirtualMapping(PROS_EPROCESS Process, PVOID Address, ULONG flProtect, PPFN_TYPE Pages, @@ -1942,7 +1942,7 @@ ULONG NTAPI -MmGetPageProtect(PEPROCESS Process, PVOID Address) +MmGetPageProtect(PROS_EPROCESS Process, PVOID Address) { ULONG Entry; ULONG Protect; @@ -1988,7 +1988,7 @@ VOID NTAPI -MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) +MmSetPageProtect(PROS_EPROCESS Process, PVOID Address, ULONG flProtect) { ULONG Attributes = 0; BOOLEAN NoExecute = FALSE; @@ -2273,7 +2273,7 @@ VOID NTAPI -MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size) +MmUpdatePageDir(PROS_EPROCESS Process, PVOID Address, ULONG Size) { ULONG StartOffset, EndOffset, Offset; @@ -2307,7 +2307,7 @@ EndOffset = 511; } - if (Process != NULL && Process != PsGetCurrentProcess()) + if (Process != NULL && Process != (PROS_EPROCESS)PsGetCurrentProcess()) { PageDirTable = MmCreateHyperspaceMapping(PAE_PTE_TO_PFN(Process->Pcb.DirectoryTableBase.QuadPart)); Pde = (PULONGLONG)MmCreateHyperspaceMapping(PTE_TO_PFN(PageDirTable[i])); @@ -2334,7 +2334,7 @@ StartOffset = ADDR_TO_PDE_OFFSET(Address); EndOffset = ADDR_TO_PDE_OFFSET((PVOID)((ULONG_PTR)Address + Size)); - if (Process != NULL && Process != PsGetCurrentProcess()) + if (Process != NULL && Process != (PROS_EPROCESS)PsGetCurrentProcess()) { Pde = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase.u.LowPart)); } Index: ntoskrnl/mm/aspace.c =================================================================== --- ntoskrnl/mm/aspace.c (revision 21759) +++ ntoskrnl/mm/aspace.c (working copy) @@ -64,7 +64,7 @@ NTAPI MmGetCurrentAddressSpace(VOID) { - return(&PsGetCurrentProcess()->AddressSpace); + return(&((PROS_EPROCESS)PsGetCurrentProcess())->AddressSpace); } PMADDRESS_SPACE @@ -76,7 +76,7 @@ NTSTATUS NTAPI -MmInitializeAddressSpace(PEPROCESS Process, +MmInitializeAddressSpace(PROS_EPROCESS Process, PMADDRESS_SPACE AddressSpace) { AddressSpace->MemoryAreaRoot = NULL; Index: ntoskrnl/ex/profile.c =================================================================== --- ntoskrnl/ex/profile.c (revision 21759) +++ ntoskrnl/ex/profile.c (working copy) @@ -45,14 +45,14 @@ Profile = (PEPROFILE)ObjectBody; /* Check if there if the Profile was started */ - if (Profile->LockedBuffer) + if (Profile->LockedBufferAddress) { /* Stop the Profile */ - State = KeStopProfile(Profile->KeProfile); + State = KeStopProfile(Profile->ProfileObject); ASSERT(State != FALSE); /* Unmap the Locked Buffer */ - MmUnmapLockedPages(Profile->LockedBuffer, Profile->Mdl); + MmUnmapLockedPages(Profile->LockedBufferAddress, Profile->Mdl); MmUnlockPages(Profile->Mdl); ExFreePool(Profile->Mdl); } @@ -89,8 +89,8 @@ NTAPI NtCreateProfile(OUT PHANDLE ProfileHandle, IN HANDLE Process OPTIONAL, - IN PVOID ImageBase, - IN ULONG ImageSize, + IN PVOID RangeBase, + IN ULONG RangeSize, IN ULONG BucketSize, IN PVOID Buffer, IN ULONG BufferSize, @@ -110,17 +110,17 @@ if(!BufferSize) return STATUS_INVALID_PARAMETER_7; /* Check if this is a low-memory profile */ - if ((!BucketSize) && (ImageBase < (PVOID)(0x10000))) + if ((!BucketSize) && (RangeBase < (PVOID)(0x10000))) { /* Validate size */ if (BufferSize < sizeof(ULONG)) return STATUS_INVALID_PARAMETER_7; /* This will become a segmented profile object */ - Segment = (ULONG)ImageBase; - ImageBase = 0; + Segment = (ULONG)RangeBase; + RangeBase = 0; /* Recalculate the bucket size */ - BucketSize = ImageSize / (BufferSize / sizeof(ULONG)); + BucketSize = RangeSize / (BufferSize / sizeof(ULONG)); /* Convert it to log2 */ BucketSize--; @@ -136,14 +136,14 @@ } /* Make sure that the buckets can map the range */ - if ((ImageSize >> (BucketSize - 2)) > BufferSize) + if ((RangeSize >> (BucketSize - 2)) > BufferSize) { DPRINT1("Bucket size too small\n"); return STATUS_BUFFER_TOO_SMALL; } /* Make sure that the range isn't too gigantic */ - if (((ULONG_PTR)ImageBase + ImageSize) < ImageSize) + if (((ULONG_PTR)RangeBase + RangeSize) < RangeSize) { DPRINT1("Range too big\n"); return STATUS_BUFFER_OVERFLOW; @@ -219,12 +219,12 @@ if (!NT_SUCCESS(Status)) return(Status); /* Initialize it */ - Profile->ImageBase = ImageBase; - Profile->ImageSize = ImageSize; + Profile->RangeBase = RangeBase; + Profile->RangeSize = RangeSize; Profile->Buffer = Buffer; Profile->BufferSize = BufferSize; Profile->BucketSize = BucketSize; - Profile->LockedBuffer = NULL; + Profile->LockedBufferAddress = NULL; Profile->Segment = Segment; Profile->ProfileSource = ProfileSource; Profile->Affinity = Affinity; @@ -319,9 +319,9 @@ NtStartProfile(IN HANDLE ProfileHandle) { PEPROFILE Profile; - PKPROFILE KeProfile; + PKPROFILE ProfileObject; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PVOID TempLockedBuffer; + PVOID TempLockedBufferAddress; NTSTATUS Status; PAGED_CODE(); @@ -342,7 +342,7 @@ NULL); /* The Profile can still be enabled though, so handle that */ - if (Profile->LockedBuffer) + if (Profile->LockedBufferAddress) { /* Release our lock, dereference and return */ KeReleaseMutex(&ExpProfileMutex, FALSE); @@ -351,7 +351,7 @@ } /* Allocate a Kernel Profile Object. */ - KeProfile = ExAllocatePoolWithTag(NonPagedPool, + ProfileObject = ExAllocatePoolWithTag(NonPagedPool, sizeof(EPROFILE), TAG_PROFILE); @@ -362,23 +362,23 @@ MmProbeAndLockPages(Profile->Mdl, PreviousMode, IoWriteAccess); /* Map the pages */ - TempLockedBuffer = MmMapLockedPages(Profile->Mdl, KernelMode); + TempLockedBufferAddress = MmMapLockedPages(Profile->Mdl, KernelMode); /* Initialize the Kernel Profile Object */ - Profile->KeProfile = KeProfile; - KeInitializeProfile(KeProfile, + Profile->ProfileObject = ProfileObject; + KeInitializeProfile(ProfileObject, (PKPROCESS)Profile->Process, - Profile->ImageBase, - Profile->ImageSize, + Profile->RangeBase, + Profile->RangeSize, Profile->BucketSize, Profile->ProfileSource, Profile->Affinity); /* Start the Profiling */ - KeStartProfile(KeProfile, TempLockedBuffer); + KeStartProfile(ProfileObject, TempLockedBufferAddress); /* Now it's safe to save this */ - Profile->LockedBuffer = TempLockedBuffer; + Profile->LockedBufferAddress = TempLockedBufferAddress; /* Release mutex, dereference and return */ KeReleaseMutex(&ExpProfileMutex, FALSE); @@ -412,22 +412,22 @@ NULL); /* Make sure the Profile Object is really Started */ - if (!Profile->LockedBuffer) + if (!Profile->LockedBufferAddress) { Status = STATUS_PROFILING_NOT_STARTED; goto Exit; } /* Stop the Profile */ - KeStopProfile(Profile->KeProfile); + KeStopProfile(Profile->ProfileObject); /* Unlock the Buffer */ - MmUnmapLockedPages(Profile->LockedBuffer, Profile->Mdl); + MmUnmapLockedPages(Profile->LockedBufferAddress, Profile->Mdl); MmUnlockPages(Profile->Mdl); - ExFreePool(Profile->KeProfile); + ExFreePool(Profile->ProfileObject); /* Clear the Locked Buffer pointer, meaning the Object is Stopped */ - Profile->LockedBuffer = NULL; + Profile->LockedBufferAddress = NULL; Exit: /* Release Mutex, Dereference and Return */ Index: ntoskrnl/ex/init.c =================================================================== --- ntoskrnl/ex/init.c (revision 21759) +++ ntoskrnl/ex/init.c (working copy) @@ -610,13 +610,13 @@ ExpInitializeCallbacks(); /* Call KD Providers at Phase 1 */ - KdInitSystem(1, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); + KdInitSystem(1, (PROS_LOADER_PARAMETER_BLOCK)&KeLoaderBlock); /* Initialize I/O Objects, Filesystems, Error Logging and Shutdown */ IoInit(); /* TBD */ - PoInit((PLOADER_PARAMETER_BLOCK)&KeLoaderBlock, ForceAcpiDisable); + PoInit((PROS_LOADER_PARAMETER_BLOCK)&KeLoaderBlock, ForceAcpiDisable); /* Initialize the Registry (Hives are NOT yet loaded!) */ CmInitializeRegistry(); @@ -640,7 +640,7 @@ if (NoGuiBoot) ExpDisplayNotice(); /* Call KD Providers at Phase 2 */ - KdInitSystem(2, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); + KdInitSystem(2, (PROS_LOADER_PARAMETER_BLOCK)&KeLoaderBlock); /* Import and create NLS Data and Sections */ RtlpInitNls(); Index: ntoskrnl/ex/win32k.c =================================================================== --- ntoskrnl/ex/win32k.c (revision 21759) +++ ntoskrnl/ex/win32k.c (working copy) @@ -36,10 +36,10 @@ }; OB_OPEN_METHOD ExpWindowStationObjectOpen = NULL; -OB_PARSE_METHOD ExpWindowStationObjectParse = NULL; +OB_ROS_PARSE_METHOD ExpWindowStationObjectParse = NULL; OB_DELETE_METHOD ExpWindowStationObjectDelete = NULL; -OB_FIND_METHOD ExpWindowStationObjectFind = NULL; -OB_CREATE_METHOD ExpDesktopObjectCreate = NULL; +OB_ROS_FIND_METHOD ExpWindowStationObjectFind = NULL; +OB_ROS_CREATE_METHOD ExpDesktopObjectCreate = NULL; OB_DELETE_METHOD ExpDesktopObjectDelete = NULL; /* FUNCTIONS ****************************************************************/ @@ -133,9 +133,9 @@ ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); ObjectTypeInitializer.GenericMapping = ExpWindowStationMapping; ObjectTypeInitializer.PoolType = NonPagedPool; - ObjectTypeInitializer.OpenProcedure = ExpWinStaObjectOpen; + ObjectTypeInitializer.OpenProcedure = (OB_OPEN_METHOD)ExpWinStaObjectOpen; ObjectTypeInitializer.DeleteProcedure = ExpWinStaObjectDelete; - ObjectTypeInitializer.ParseProcedure = ExpWinStaObjectParse; + ObjectTypeInitializer.ParseProcedure = (OB_PARSE_METHOD)ExpWinStaObjectParse; ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExWindowStationObjectType); Index: ntoskrnl/ex/dbgctrl.c =================================================================== --- ntoskrnl/ex/dbgctrl.c (revision 21759) +++ ntoskrnl/ex/dbgctrl.c (working copy) @@ -17,7 +17,7 @@ NTSTATUS STDCALL -NtSystemDebugControl(DEBUG_CONTROL_CODE ControlCode, +NtSystemDebugControl(SYSDBG_COMMAND ControlCode, PVOID InputBuffer, ULONG InputBufferLength, PVOID OutputBuffer, @@ -26,15 +26,15 @@ { switch (ControlCode) { - case DebugGetTraceInformation: - case DebugSetInternalBreakpoint: - case DebugSetSpecialCall: - case DebugClearSpecialCalls: - case DebugQuerySpecialCalls: - case DebugDbgBreakPoint: + case SysDbgQueryTraceInformation: + case SysDbgSetTracepoint: + case SysDbgSetSpecialCall: + case SysDbgClearSpecialCalls: + case SysDbgQuerySpecialCalls: + case SysDbgBreakPoint: break; - case DebugDbgLoadSymbols: + case SysDbgQueryVersion: KDB_LOADUSERMODULE_HOOK((PLDR_DATA_TABLE_ENTRY) InputBuffer); break; Index: ntoskrnl/ex/sysinfo.c =================================================================== --- ntoskrnl/ex/sysinfo.c (revision 21759) +++ ntoskrnl/ex/sysinfo.c (working copy) @@ -581,11 +581,12 @@ do { PSYSTEM_PROCESS_INFORMATION SpiCur; - int curSize, i = 0; + int curSize; ANSI_STRING imgName; int inLen=32; // image name len in bytes PLIST_ENTRY current_entry; PETHREAD current; + PSYSTEM_THREAD_INFORMATION ThreadInfo; SpiCur = (PSYSTEM_PROCESS_INFORMATION)pCur; @@ -645,7 +646,8 @@ SpiCur->QuotaNonPagedPoolUsage = pr->QuotaUsage[1]; SpiCur->PagefileUsage = pr->QuotaUsage[3]; SpiCur->PeakPagefileUsage = pr->QuotaPeak[3]; - SpiCur->PrivateUsage = pr->CommitCharge; + SpiCur->PrivatePageCount = pr->CommitCharge; + ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(SpiCur + 1); current_entry = pr->ThreadListHead.Flink; while (current_entry != &pr->ThreadListHead) @@ -653,18 +655,19 @@ current = CONTAINING_RECORD(current_entry, ETHREAD, ThreadListEntry); - SpiCur->TH[i].KernelTime.QuadPart = current->Tcb.KernelTime * 100000LL; - SpiCur->TH[i].UserTime.QuadPart = current->Tcb.UserTime * 100000LL; + + ThreadInfo->KernelTime.QuadPart = current->Tcb.KernelTime * 100000LL; + ThreadInfo->UserTime.QuadPart = current->Tcb.UserTime * 100000LL; // SpiCur->TH[i].CreateTime = current->CreateTime; - SpiCur->TH[i].WaitTime = current->Tcb.WaitTime; - SpiCur->TH[i].StartAddress = (PVOID) current->StartAddress; - SpiCur->TH[i].ClientId = current->Cid; - SpiCur->TH[i].Priority = current->Tcb.Priority; - SpiCur->TH[i].BasePriority = current->Tcb.BasePriority; - SpiCur->TH[i].ContextSwitches = current->Tcb.ContextSwitches; - SpiCur->TH[i].ThreadState = current->Tcb.State; - SpiCur->TH[i].WaitReason = current->Tcb.WaitReason; - i++; + ThreadInfo->WaitTime = current->Tcb.WaitTime; + ThreadInfo->StartAddress = (PVOID) current->StartAddress; + ThreadInfo->ClientId = current->Cid; + ThreadInfo->Priority = current->Tcb.Priority; + ThreadInfo->BasePriority = current->Tcb.BasePriority; + ThreadInfo->ContextSwitches = current->Tcb.ContextSwitches; + ThreadInfo->ThreadState = current->Tcb.State; + ThreadInfo->WaitReason = current->Tcb.WaitReason; + ThreadInfo++; current_entry = current_entry->Flink; } @@ -986,15 +989,15 @@ /* Class 21 - File Cache Information */ QSI_DEF(SystemFileCacheInformation) { - SYSTEM_CACHE_INFORMATION *Sci = (SYSTEM_CACHE_INFORMATION *) Buffer; + SYSTEM_FILECACHE_INFORMATION *Sci = (SYSTEM_FILECACHE_INFORMATION *) Buffer; - if (Size < sizeof (SYSTEM_CACHE_INFORMATION)) + if (Size < sizeof (SYSTEM_FILECACHE_INFORMATION)) { - * ReqSize = sizeof (SYSTEM_CACHE_INFORMATION); + * ReqSize = sizeof (SYSTEM_FILECACHE_INFORMATION); return (STATUS_INFO_LENGTH_MISMATCH); } - RtlZeroMemory(Sci, sizeof(SYSTEM_CACHE_INFORMATION)); + RtlZeroMemory(Sci, sizeof(SYSTEM_FILECACHE_INFORMATION)); /* Return the Byte size not the page size. */ Sci->CurrentSize = @@ -1011,7 +1014,7 @@ SSI_DEF(SystemFileCacheInformation) { - if (Size < sizeof (SYSTEM_CACHE_INFORMATION)) + if (Size < sizeof (SYSTEM_FILECACHE_INFORMATION)) { return (STATUS_INFO_LENGTH_MISMATCH); } @@ -1545,7 +1548,7 @@ /* * Check the request is valid. */ - if (SystemInformationClass >= SystemInformationClassMax) + if (SystemInformationClass >= MaxSystemInfoClass) { return (STATUS_INVALID_INFO_CLASS); } @@ -1621,7 +1624,7 @@ * Check the request is valid. */ if ( (SystemInformationClass >= SystemBasicInformation) - && (SystemInformationClass < SystemInformationClassMax) + && (SystemInformationClass < MaxSystemInfoClass) ) { if (NULL != CallQS [SystemInformationClass].Set) Index: ntoskrnl/ex/handle.c =================================================================== --- ntoskrnl/ex/handle.c (revision 21759) +++ ntoskrnl/ex/handle.c (working copy) @@ -18,6 +18,11 @@ /* INCLUDES *****************************************************************/ +// +// Uses Win2K semantics +// +#define NTDDI_VERSION 0x50000000 + #include <ntoskrnl.h> #define NDEBUG @@ -206,10 +211,10 @@ curee != laste; curee++) { - if(curee->u1.Object != NULL && SweepHandleCallback != NULL) + if(curee->Object != NULL && SweepHandleCallback != NULL) { - curee->u1.ObAttributes |= EX_HANDLE_ENTRY_LOCKED; - SweepHandleCallback(HandleTable, curee->u1.Object, curee->u2.GrantedAccess, Context); + curee->ObAttributes |= EX_HANDLE_ENTRY_LOCKED; + SweepHandleCallback(HandleTable, curee->Object, curee->GrantedAccess, Context); } } } @@ -414,7 +419,7 @@ srcstbl++, stbl++, eli++) { /* try to duplicate the source handle */ - if(srcstbl->u1.Object != NULL && + if(srcstbl->Object != NULL && ExLockHandleTableEntry(SourceHandleTable, srcstbl)) { @@ -426,15 +431,15 @@ { /* free the entry and chain it into the free list */ HandleTable->HandleCount--; - stbl->u1.Object = NULL; - stbl->u2.NextFreeTableEntry = HandleTable->FirstFreeTableEntry; + stbl->Object = NULL; + stbl->NextFreeTableEntry = HandleTable->FirstFreeTableEntry; HandleTable->FirstFreeTableEntry = BUILD_HANDLE(tli, mli, eli); } else { /* duplicate the handle and unlock it */ - stbl->u2.GrantedAccess = srcstbl->u2.GrantedAccess; - stbl->u1.ObAttributes = srcstbl->u1.ObAttributes & ~EX_HANDLE_ENTRY_LOCKED; + stbl->GrantedAccess = srcstbl->GrantedAccess; + stbl->ObAttributes = srcstbl->ObAttributes & ~EX_HANDLE_ENTRY_LOCKED; } ExUnlockHandleTableEntry(SourceHandleTable, srcstbl); @@ -492,9 +497,9 @@ *Handle = EX_HANDLE_TO_HANDLE(HandleTable->FirstFreeTableEntry); /* save the index to the next free handle (if available) */ - HandleTable->FirstFreeTableEntry = Entry->u2.NextFreeTableEntry; - Entry->u2.NextFreeTableEntry = 0; - Entry->u1.Object = NULL; + HandleTable->FirstFreeTableEntry = Entry->NextFreeTableEntry; + Entry->NextFreeTableEntry = 0; + Entry->Object = NULL; HandleTable->HandleCount++; } @@ -595,8 +600,8 @@ /* let's just use the very first entry */ Entry = ntbl; - Entry->u1.ObAttributes = EX_HANDLE_ENTRY_LOCKED; - Entry->u2.NextFreeTableEntry = 0; + Entry->ObAttributes = EX_HANDLE_ENTRY_LOCKED; + Entry->NextFreeTableEntry = 0; *Handle = EX_HANDLE_TO_HANDLE(HandleTable->NextIndexNeedingPool); @@ -609,11 +614,11 @@ cure != laste; cure++, i++) { - cure->u1.Object = NULL; - cure->u2.NextFreeTableEntry = i; + cure->Object = NULL; + cure->NextFreeTableEntry = i; } /* truncate the free entry list */ - (cure - 1)->u2.NextFreeTableEntry = -1; + (cure - 1)->NextFreeTableEntry = -1; /* save the pointers to the allocated list(s) */ (void)InterlockedExchangePointer(&nmtbl[mli], ntbl); @@ -651,8 +656,8 @@ /* automatically unlock the entry if currently locked. We however don't notify anyone who waited on the handle because we're holding an exclusive lock after all and these locks will fail then */ - (void)InterlockedExchangePointer(&Entry->u1.Object, NULL); - Entry->u2.NextFreeTableEntry = HandleTable->FirstFreeTableEntry; + (void)InterlockedExchangePointer(&Entry->Object, NULL); + Entry->NextFreeTableEntry = HandleTable->FirstFreeTableEntry; HandleTable->FirstFreeTableEntry = Handle; HandleTable->HandleCount--; @@ -679,10 +684,10 @@ mlp = HandleTable->Table[tli]; if(Handle < HandleTable->NextIndexNeedingPool && - mlp != NULL && mlp[mli] != NULL && mlp[mli][eli].u1.Object != NULL) + mlp != NULL && mlp[mli] != NULL && mlp[mli][eli].Object != NULL) { Entry = &mlp[mli][eli]; - DPRINT("handle lookup 0x%x -> entry 0x%p [HT:0x%p] ptr: 0x%p\n", Handle, Entry, HandleTable, mlp[mli][eli].u1.Object); + DPRINT("handle lookup 0x%x -> entry 0x%p [HT:0x%p] ptr: 0x%p\n", Handle, Entry, HandleTable, mlp[mli][eli].Object); } } else @@ -708,7 +713,7 @@ for(;;) { - Current = (volatile ULONG_PTR)Entry->u1.Object; + Current = (volatile ULONG_PTR)Entry->Object; if(!Current || (HandleTable->Flags & EX_HANDLE_TABLE_CLOSING)) { @@ -719,7 +724,7 @@ if(!(Current & EX_HANDLE_ENTRY_LOCKED)) { New = Current | EX_HANDLE_ENTRY_LOCKED; - if(InterlockedCompareExchangePointer(&Entry->u1.Object, + if(InterlockedCompareExchangePointer(&Entry->Object, (PVOID)New, (PVOID)Current) == (PVOID)Current) { @@ -756,13 +761,13 @@ DPRINT("ExUnlockHandleTableEntry HT:0x%p Entry:0x%p\n", HandleTable, Entry); - Current = (volatile ULONG_PTR)Entry->u1.Object; + Current = (volatile ULONG_PTR)Entry->Object; ASSERT(Current & EX_HANDLE_ENTRY_LOCKED); New = Current & ~EX_HANDLE_ENTRY_LOCKED; - (void)InterlockedExchangePointer(&Entry->u1.Object, + (void)InterlockedExchangePointer(&Entry->Object, (PVOID)New); /* we unlocked the entry, pulse the contention event so threads who're waiting @@ -784,10 +789,10 @@ ASSERT(HandleTable); ASSERT(Entry); - /* The highest bit in Entry->u1.Object has to be 1 so we make sure it's a + /* The highest bit in Entry->Object has to be 1 so we make sure it's a pointer to kmode memory. It will cleared though because it also indicates the lock */ - ASSERT((ULONG_PTR)Entry->u1.Object & EX_HANDLE_ENTRY_LOCKED); + ASSERT((ULONG_PTR)Entry->Object & EX_HANDLE_ENTRY_LOCKED); KeEnterCriticalRegion(); ExAcquireHandleTableLockExclusive(HandleTable); @@ -855,7 +860,7 @@ ASSERT(Entry); /* This routine requires the entry to be locked */ - ASSERT((ULONG_PTR)Entry->u1.Object & EX_HANDLE_ENTRY_LOCKED); + ASSERT((ULONG_PTR)Entry->Object & EX_HANDLE_ENTRY_LOCKED); DPRINT("DestroyHandleByEntry HT:0x%p Entry:0x%p\n", HandleTable, Entry); Index: ntoskrnl/ex/power.c =================================================================== --- ntoskrnl/ex/power.c (revision 21759) +++ ntoskrnl/ex/power.c (working copy) @@ -15,9 +15,13 @@ /* FUNCTIONS *****************************************************************/ -VOID STDCALL -KeSetTargetProcessorDpc (IN PKDPC Dpc, - IN CCHAR Number); +/* ROS Internal. Please deprecate */ +NTHALAPI +VOID +NTAPI +HalReleaseDisplayOwnership( + VOID +); VOID STDCALL KiHaltProcessorDpcRoutine(IN PKDPC Dpc, Index: ntoskrnl/ex/rundown.c =================================================================== --- ntoskrnl/ex/rundown.c (revision 21759) +++ ntoskrnl/ex/rundown.c (working copy) @@ -230,7 +230,7 @@ if (InterlockedExchangeAddSizeT(&WaitBlock->Count, -1)) { /* We're down to 0 now, so signal the event */ - KeSetEvent(&WaitBlock->RundownEvent, IO_NO_INCREMENT, FALSE); + KeSetEvent(&WaitBlock->WakeEvent, IO_NO_INCREMENT, FALSE); } } @@ -290,7 +290,7 @@ (LONG)Count) { /* We're down to 0 now, so signal the event */ - KeSetEvent(&WaitBlock->RundownEvent, IO_NO_INCREMENT, FALSE); + KeSetEvent(&WaitBlock->WakeEvent, IO_NO_INCREMENT, FALSE); } } @@ -339,12 +339,12 @@ if (Count || !Event) { /* Initialize the event */ - KeInitializeEvent(&WaitBlock.RundownEvent, + KeInitializeEvent(&WaitBlock.WakeEvent, NotificationEvent, FALSE); /* Set the pointer */ - Event = &WaitBlock.RundownEvent; + Event = &WaitBlock.WakeEvent; } /* Set the count */ Index: ntoskrnl/lpc/close.c =================================================================== --- ntoskrnl/lpc/close.c (revision 21759) +++ ntoskrnl/lpc/close.c (working copy) @@ -28,7 +28,11 @@ * REVISIONS */ VOID STDCALL -LpcpClosePort (PVOID ObjectBody, ULONG HandleCount) +LpcpClosePort (IN PEPROCESS Process OPTIONAL, + IN PVOID ObjectBody, + IN ACCESS_MASK GrantedAccess, + IN ULONG HandleCount, + IN ULONG SystemHandleCount) { PEPORT Port = (PEPORT)ObjectBody; PORT_MESSAGE Message; Index: ntoskrnl/po/power.c =================================================================== --- ntoskrnl/po/power.c (revision 21759) +++ ntoskrnl/po/power.c (working copy) @@ -298,7 +298,7 @@ VOID INIT_FUNCTION NTAPI -PoInit(PLOADER_PARAMETER_BLOCK LoaderBlock, +PoInit(PROS_LOADER_PARAMETER_BLOCK LoaderBlock, BOOLEAN ForceAcpiDisable) { if (ForceAcpiDisable) Index: dll/ntdll/ldr/utils.c =================================================================== --- dll/ntdll/ldr/utils.c (revision 21759) +++ dll/ntdll/ldr/utils.c (working copy) @@ -73,7 +73,7 @@ LdrpLoadUserModuleSymbols(PLDR_DATA_TABLE_ENTRY LdrModule) { NtSystemDebugControl( - DebugDbgLoadSymbols, + SysDbgQueryVersion, (PVOID)LdrModule, 0, NULL, @@ -255,7 +255,7 @@ Entry = ModuleListHead->Flink; while (Entry != ModuleListHead) { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); if (Module->LoadCount == 0xFFFF && Module->TlsIndex != 0xFFFF) { @@ -498,7 +498,7 @@ RtlEnterCriticalSection (NtCurrentPeb()->LoaderLock); InsertTailList(&NtCurrentPeb()->Ldr->InLoadOrderModuleList, - &Module->InLoadOrderModuleList); + &Module->InLoadOrderLinks); RtlLeaveCriticalSection(NtCurrentPeb()->LoaderLock); return(Module); @@ -727,7 +727,7 @@ */ NTSTATUS NTAPI LdrLoadDll (IN PWSTR SearchPath OPTIONAL, - IN ULONG LoadFlags, + IN PULONG LoadFlags, IN PUNICODE_STRING Name, OUT PVOID *BaseAddress OPTIONAL) { @@ -747,8 +747,8 @@ *BaseAddress = NULL; - Status = LdrpLoadModule(SearchPath, LoadFlags, Name, &Module, BaseAddress); - if (NT_SUCCESS(Status) && 0 == (LoadFlags & LOAD_LIBRARY_AS_DATAFILE)) + Status = LdrpLoadModule(SearchPath, *LoadFlags, Name, &Module, BaseAddress); + if (NT_SUCCESS(Status) && 0 == (*LoadFlags & LOAD_LIBRARY_AS_DATAFILE)) { RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock); Status = LdrpAttachProcess(); @@ -802,7 +802,7 @@ while (Entry != ModuleListHead) { - ModulePtr = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + ModulePtr = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); DPRINT("Scanning %wZ at %p\n", &ModulePtr->BaseDllName, ModulePtr->DllBase); @@ -901,7 +901,7 @@ } while (Entry != ModuleListHead) { - ModulePtr = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + ModulePtr = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); DPRINT("Scanning %wZ %wZ\n", &ModulePtr->BaseDllName, &AdjustedName); @@ -970,8 +970,9 @@ */ if (!NT_SUCCESS(Status)) { + ULONG Flags = LDRP_PROCESS_CREATION_TIME; Status = LdrLoadDll(NULL, - LDRP_PROCESS_CREATION_TIME, + &Flags, &DllName, &BaseAddress); if (NT_SUCCESS(Status)) @@ -2269,7 +2270,7 @@ Entry = ModuleListHead->Flink; while (Entry != ModuleListHead) { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); DPRINT("BaseDllName %wZ BaseAddress %p\n", &Module->BaseDllName, Module->DllBase); @@ -2346,7 +2347,7 @@ Entry = ModuleListHead->Flink; while (Entry != ModuleListHead) { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); if (Module->DllBase == BaseAddress) { @@ -2385,7 +2386,7 @@ Entry = ModuleListHead->Flink; while (Entry != ModuleListHead) { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); if ((ULONG_PTR)PcValue >= (ULONG_PTR)Module->DllBase && (ULONG_PTR)PcValue < (ULONG_PTR)Module->DllBase + Module->SizeOfImage) @@ -2520,7 +2521,7 @@ ((UnloadAll && Module->LoadCount != 0xFFFF) || Module->LoadCount == 0)) { /* remove the module entry from the list */ - RemoveEntryList (&Module->InLoadOrderModuleList); + RemoveEntryList (&Module->InLoadOrderLinks); RemoveEntryList (&Module->InInitializationOrderModuleList); NtUnmapViewOfSection (NtCurrentProcess (), Module->DllBase); @@ -2653,7 +2654,7 @@ } Entry = NtCurrentPeb()->Ldr->InLoadOrderModuleList.Flink; - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); LdrpTlsCallback(Module, DLL_THREAD_ATTACH); } @@ -2741,7 +2742,7 @@ PCHAR p; DPRINT("LdrQueryProcessModuleInformation() called\n"); - + // FIXME: This code is ultra-duplicated. see lib\rtl\dbgbuffer.c RtlEnterCriticalSection (NtCurrentPeb()->LoaderLock); if (ModuleInformation == NULL || Size == 0) @@ -2750,8 +2751,8 @@ } else { - ModuleInformation->ModuleCount = 0; - ModulePtr = &ModuleInformation->ModuleEntry[0]; + ModuleInformation->NumberOfModules = 0; + ModulePtr = &ModuleInformation->Modules[0]; Status = STATUS_SUCCESS; } @@ -2760,7 +2761,7 @@ while (Entry != ModuleListHead) { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); DPRINT(" Module %wZ\n", &Module->FullDllName); @@ -2771,28 +2772,30 @@ } else if (ModuleInformation != NULL) { - ModulePtr->Reserved[0] = ModulePtr->Reserved[1] = 0; // FIXME: ?? - ModulePtr->Base = Module->DllBase; - ModulePtr->Size = Module->SizeOfImage; - ModulePtr->Flags = Module->Flags; - ModulePtr->Index = 0; // FIXME: index ?? - ModulePtr->Unknown = 0; // FIXME: ?? - ModulePtr->LoadCount = Module->LoadCount; + ModulePtr->Section = 0; + ModulePtr->MappedBase = NULL; // FIXME: ?? + ModulePtr->ImageBase = Module->DllBase; + ModulePtr->ImageSize = Module->SizeOfImage; + ModulePtr->Flags = Module->Flags; + ModulePtr->LoadOrderIndex = 0; // FIXME: ?? + ModulePtr->InitOrderIndex = 0; // FIXME: ?? + ModulePtr->LoadCount = Module->LoadCount; - AnsiString.Length = 0; + AnsiString.Length = 0; AnsiString.MaximumLength = 256; - AnsiString.Buffer = ModulePtr->ImageName; + AnsiString.Buffer = ModulePtr->FullPathName; RtlUnicodeStringToAnsiString(&AnsiString, &Module->FullDllName, FALSE); - p = strrchr(ModulePtr->ImageName, '\\'); + + p = strrchr(ModulePtr->FullPathName, '\\'); if (p != NULL) - ModulePtr->ModuleNameOffset = p - ModulePtr->ImageName + 1; + ModulePtr->OffsetToFileName = p - ModulePtr->FullPathName + 1; else - ModulePtr->ModuleNameOffset = 0; + ModulePtr->OffsetToFileName = 0; ModulePtr++; - ModuleInformation->ModuleCount++; + ModuleInformation->NumberOfModules++; } UsedSize += sizeof(RTL_PROCESS_MODULE_INFORMATION); Index: dll/ntdll/ldr/startup.c =================================================================== --- dll/ntdll/ldr/startup.c (revision 21759) +++ dll/ntdll/ldr/startup.c (working copy) @@ -415,7 +415,7 @@ NtModule->TimeDateStamp = NTHeaders->FileHeader.TimeDateStamp; InsertTailList(&Peb->Ldr->InLoadOrderModuleList, - &NtModule->InLoadOrderModuleList); + &NtModule->InLoadOrderLinks); InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, &NtModule->InInitializationOrderModuleList); @@ -463,7 +463,7 @@ ExeModule->TimeDateStamp = NTHeaders->FileHeader.TimeDateStamp; InsertHeadList(&Peb->Ldr->InLoadOrderModuleList, - &ExeModule->InLoadOrderModuleList); + &ExeModule->InLoadOrderLinks); LdrpInitLoader(); Index: dll/ntdll/ntdll.rbuild =================================================================== --- dll/ntdll/ntdll.rbuild (revision 21759) +++ dll/ntdll/ntdll.rbuild (working copy) @@ -6,7 +6,7 @@ <define name="__NTDLL__" /> <define name="_DISABLE_TIDENTS" /> <define name="__USE_W32API" /> - <define name="_WIN32_WINNT">0x0600</define> + <define name="_WIN32_WINNT">0x0502</define> <define name="_NTOSKRNL_" /> <define name="__NO_CTYPE_INLINES" /> <library>rtl</library> Index: dll/ntdll/def/ntdll.def =================================================================== --- dll/ntdll/def/ntdll.def (revision 21759) +++ dll/ntdll/def/ntdll.def (working copy) @@ -522,8 +522,8 @@ RtlIpv4StringToAddressExW@16 RtlIpv4StringToAddressW@16 RtlIpv6AddressToStringA@8 -RtlIpv6AddressToStringExA@16 -RtlIpv6AddressToStringExW@16 +RtlIpv6AddressToStringExA@20 +RtlIpv6AddressToStringExW@20 RtlIpv6AddressToStringW@8 RtlIpv6StringToAddressA@12 RtlIpv6StringToAddressExA@16 Index: lib/epsapi/enum/drivers.c =================================================================== --- lib/epsapi/enum/drivers.c (revision 21759) +++ lib/epsapi/enum/drivers.c (working copy) @@ -28,7 +28,7 @@ PsaEnumerateSystemModules(IN PSYSMOD_ENUM_ROUTINE Callback, IN OUT PVOID CallbackContext) { - PSYSTEM_MODULE_INFORMATION psmModules; + PRTL_PROCESS_MODULES psmModules; NTSTATUS Status = STATUS_SUCCESS; #if 0 @@ -65,10 +65,10 @@ } NTSTATUS NTAPI -PsaCaptureSystemModules(OUT PSYSTEM_MODULE_INFORMATION *SystemModules) +PsaCaptureSystemModules(OUT PRTL_PROCESS_MODULES *SystemModules) { SIZE_T nSize = 0; - PSYSTEM_MODULE_INFORMATION psmModules = NULL; + PRTL_PROCESS_MODULES psmModules = NULL; NTSTATUS Status; #if 0 @@ -94,8 +94,8 @@ minimize memory operations that could be expensive, or fragment the pool/heap, we try to determine the buffer size in advance, knowing that the number of elements is unlikely to change */ - nSize = sizeof(SYSTEM_MODULE_INFORMATION) + - (nSize * sizeof(SYSTEM_MODULE_INFORMATION)); + nSize = sizeof(RTL_PROCESS_MODULES) + + (nSize * sizeof(RTL_PROCESS_MODULES)); psmModules = NULL; @@ -157,7 +157,7 @@ } NTSTATUS NTAPI -PsaWalkSystemModules(IN PSYSTEM_MODULE_INFORMATION SystemModules, +PsaWalkSystemModules(IN PRTL_PROCESS_MODULES SystemModules, IN PSYSMOD_ENUM_ROUTINE Callback, IN OUT PVOID CallbackContext) { @@ -165,10 +165,10 @@ NTSTATUS Status; /* repeat until all modules have been returned */ - for(i = 0; i < SystemModules->Count; i++) + for(i = 0; i < SystemModules->NumberOfModules; i++) { /* return current module to the callback */ - Status = Callback(&(SystemModules->Module[i]), CallbackContext); + Status = Callback(&(SystemModules->Modules[i]), CallbackContext); if(!NT_SUCCESS(Status)) { @@ -179,18 +179,18 @@ return STATUS_SUCCESS; } -PSYSTEM_MODULE_INFORMATION_ENTRY FASTCALL -PsaWalkFirstSystemModule(IN PSYSTEM_MODULE_INFORMATION SystemModules) +PRTL_PROCESS_MODULE_INFORMATION FASTCALL +PsaWalkFirstSystemModule(IN PRTL_PROCESS_MODULES SystemModules) { - return &(SystemModules->Module[0]); + return &(SystemModules->Modules[0]); } -PSYSTEM_MODULE_INFORMATION_ENTRY FASTCALL -PsaWalkNextSystemModule(IN PSYSTEM_MODULE_INFORMATION CurrentSystemModule) +PRTL_PROCESS_MODULE_INFORMATION FASTCALL +PsaWalkNextSystemModule(IN PRTL_PROCESS_MODULES CurrentSystemModule) { - return (PSYSTEM_MODULE_INFORMATION_ENTRY)((ULONG_PTR)CurrentSystemModule + - (FIELD_OFFSET(SYSTEM_MODULE_INFORMATION, Module[1]) - - FIELD_OFFSET(SYSTEM_MODULE_INFORMATION, Module[0]))); + return (PRTL_PROCESS_MODULE_INFORMATION)((ULONG_PTR)CurrentSystemModule + + (FIELD_OFFSET(RTL_PROCESS_MODULES, Modules[1]) - + FIELD_OFFSET(RTL_PROCESS_MODULES, Modules[0]))); } /* EOF */ Index: lib/epsapi/enum/processes.c =================================================================== --- lib/epsapi/enum/processes.c (revision 21759) +++ lib/epsapi/enum/processes.c (working copy) @@ -265,7 +265,7 @@ static SIZE_T nOffsetOfThreads = 0; /* get the offset of the Threads field */ - nOffsetOfThreads = FIELD_OFFSET(SYSTEM_PROCESS_INFORMATION, TH); + nOffsetOfThreads = sizeof(SYSTEM_PROCESS_INFORMATION); return (PSYSTEM_THREAD_INFORMATION)((ULONG_PTR)CurrentProcess + nOffsetOfThreads); } @@ -274,8 +274,8 @@ PsaWalkNextThread(IN PSYSTEM_THREAD_INFORMATION CurrentThread) { return (PSYSTEM_THREAD_INFORMATION)((ULONG_PTR)CurrentThread + - (FIELD_OFFSET(SYSTEM_PROCESS_INFORMATION, TH[1]) - - FIELD_OFFSET(SYSTEM_PROCESS_INFORMATION, TH[0]))); + ((sizeof(SYSTEM_PROCESS_INFORMATION) + sizeof(SYSTEM_THREAD_INFORMATION)) - + sizeof(SYSTEM_PROCESS_INFORMATION))); } /* EOF */ Index: lib/epsapi/enum/modules.c =================================================================== --- lib/epsapi/enum/modules.c (revision 21759) +++ lib/epsapi/enum/modules.c (working copy) @@ -50,7 +50,7 @@ while(Current != ListHead) { - PLDR_DATA_TABLE_ENTRY LoaderModule = CONTAINING_RECORD(Current, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + PLDR_DATA_TABLE_ENTRY LoaderModule = CONTAINING_RECORD(Current, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); /* return the current module to the callback */ Status = Callback(ProcessHandle, LoaderModule, CallbackContext); @@ -60,7 +60,7 @@ goto Failure; } - Current = LoaderModule->InLoadOrderModuleList.Flink; + Current = LoaderModule->InLoadOrderLinks.Flink; } #if 0 } @@ -117,7 +117,7 @@ { /* read the current module */ Status = NtReadVirtualMemory(ProcessHandle, - CONTAINING_RECORD(Current, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList), + CONTAINING_RECORD(Current, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks), &LoaderModule, sizeof(LoaderModule), NULL); @@ -137,7 +137,7 @@ } /* address of the next module in the list */ - Current = LoaderModule.InLoadOrderModuleList.Flink; + Current = LoaderModule.InLoadOrderLinks.Flink; } } Index: lib/rtl/sd.c =================================================================== --- lib/rtl/sd.c (revision 21759) +++ lib/rtl/sd.c (working copy) @@ -800,9 +800,6 @@ return STATUS_BAD_DESCRIPTOR_FORMAT; } - ASSERT(FIELD_OFFSET(SECURITY_DESCRIPTOR, Owner) == - FIELD_OFFSET(SECURITY_DESCRIPTOR_RELATIVE, Owner)); - #ifdef _WIN64 RtlpQuerySecurityDescriptor((PISECURITY_DESCRIPTOR)pRelSD, @@ -915,8 +912,6 @@ &pSacl, &pDacl); - ASSERT(sizeof(SECURITY_DESCRIPTOR) == sizeof(SECURITY_DESCRIPTOR_RELATIVE)); - /* clear the self-relative flag and simply convert the offsets to pointers */ pAbsSD->Control &= ~SE_SELF_RELATIVE; pAbsSD->Owner = pOwner; Index: lib/rtl/crc32.c =================================================================== --- lib/rtl/crc32.c (revision 21759) +++ lib/rtl/crc32.c (working copy) @@ -85,7 +85,7 @@ * @implemented */ ULONG NTAPI -RtlComputeCrc32 (IN ULONG Initial, +RtlComputeCrc32 (IN UINT Initial, IN PUCHAR Data, IN ULONG Length) { Index: lib/rtl/image.c =================================================================== --- lib/rtl/image.c (revision 21759) +++ lib/rtl/image.c (working copy) @@ -45,12 +45,10 @@ */ PVOID NTAPI -RtlImageDirectoryEntryToData ( - PVOID BaseAddress, - BOOLEAN bMappedAsImage, - ULONG Directory, - PULONG Size - ) +RtlImageDirectoryEntryToData(PVOID BaseAddress, + BOOLEAN MappedAsImage, + USHORT Directory, + PULONG Size) { PIMAGE_NT_HEADERS NtHeader; ULONG Va; @@ -59,7 +57,7 @@ if ((ULONG_PTR)BaseAddress & 1) { BaseAddress = (PVOID)((ULONG_PTR)BaseAddress & ~1); - bMappedAsImage = FALSE; + MappedAsImage = FALSE; } @@ -76,7 +74,7 @@ *Size = NtHeader->OptionalHeader.DataDirectory[Directory].Size; - if (bMappedAsImage || Va < NtHeader->OptionalHeader.SizeOfHeaders) + if (MappedAsImage || Va < NtHeader->OptionalHeader.SizeOfHeaders) return (PVOID)((ULONG_PTR)BaseAddress + Va); /* image mapped as ordinary file, we must find raw pointer */ Index: lib/rtl/debug.c =================================================================== --- lib/rtl/debug.c (revision 21759) +++ lib/rtl/debug.c (working copy) @@ -272,7 +272,7 @@ NTAPI DbgPrompt(PCH OutputString, PCH InputString, - USHORT InputSize) + ULONG InputSize) { ANSI_STRING Output; ANSI_STRING Input; Index: lib/rtl/dbgbuffer.c =================================================================== --- lib/rtl/dbgbuffer.c (revision 21759) +++ lib/rtl/dbgbuffer.c (working copy) @@ -16,18 +16,18 @@ /* * @unimplemented */ -PRTL_DEBUG_BUFFER NTAPI +PRTL_DEBUG_INFORMATION NTAPI RtlCreateQueryDebugBuffer(IN ULONG Size, IN BOOLEAN EventPair) { NTSTATUS Status; - PRTL_DEBUG_BUFFER Buf = NULL; - SIZE_T SectionSize = 100 * PAGE_SIZE; + PRTL_DEBUG_INFORMATION Buf = NULL; + SIZE_T ViewSize = 100 * PAGE_SIZE; Status = NtAllocateVirtualMemory( NtCurrentProcess(), (PVOID*)&Buf, 0, - &SectionSize, + &ViewSize, MEM_COMMIT, PAGE_READWRITE); if (!NT_SUCCESS(Status)) @@ -35,10 +35,10 @@ return NULL; } - Buf->SectionBase = Buf; - Buf->SectionSize = SectionSize; + Buf->ViewBaseClient = Buf; + Buf->ViewSize = ViewSize; - DPRINT("RtlCQDB: BA: %p BS: 0x%lx\n", Buf->SectionBase, Buf->SectionSize); + DPRINT("RtlCQDB: BA: %p BS: 0x%lx\n", Buf->ViewBaseClient, Buf->ViewSize); return Buf; } @@ -47,7 +47,7 @@ * @unimplemented */ NTSTATUS NTAPI -RtlDestroyQueryDebugBuffer(IN PRTL_DEBUG_BUFFER Buf) +RtlDestroyQueryDebugBuffer(IN PRTL_DEBUG_INFORMATION Buf) { NTSTATUS Status = STATUS_SUCCESS; @@ -55,7 +55,7 @@ { Status = NtFreeVirtualMemory( NtCurrentProcess(), (PVOID)&Buf, - &Buf->SectionSize, + &Buf->ViewSize, MEM_RELEASE); } if (!NT_SUCCESS(Status)) @@ -71,7 +71,7 @@ */ NTSTATUS NTAPI RtlpQueryRemoteProcessModules(HANDLE ProcessHandle, - IN PRTL_PROCESS_MODULES ModuleInformation OPTIONAL, + IN PRTL_PROCESS_MODULES Modules OPTIONAL, IN ULONG Size OPTIONAL, OUT PULONG ReturnedSize) { @@ -103,14 +103,14 @@ return Status; } - if (ModuleInformation == NULL || Size == 0) + if (Modules == NULL || Size == 0) { Status = STATUS_INFO_LENGTH_MISMATCH; } else { - ModuleInformation->ModuleCount = 0; - ModulePtr = &ModuleInformation->ModuleEntry[0]; + Modules->NumberOfModules = 0; + ModulePtr = &Modules->Modules[0]; Status = STATUS_SUCCESS; } @@ -154,7 +154,7 @@ /* read the current module */ Status = NtReadVirtualMemory ( ProcessHandle, - CONTAINING_RECORD(pleCurEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList), + CONTAINING_RECORD(pleCurEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks), &lmModule, sizeof(LDR_DATA_TABLE_ENTRY), NULL ); @@ -183,36 +183,37 @@ { Status = STATUS_INFO_LENGTH_MISMATCH; } - else if (ModuleInformation != NULL) + else if (Modules != NULL) { - ModulePtr->Reserved[0] = ModulePtr->Reserved[1] = 0; // FIXME: ?? - ModulePtr->Base = lmModule.DllBase; - ModulePtr->Size = lmModule.SizeOfImage; + ModulePtr->Section = 0; + ModulePtr->MappedBase = NULL; // FIXME: ?? + ModulePtr->ImageBase = lmModule.DllBase; + ModulePtr->ImageSize = lmModule.SizeOfImage; ModulePtr->Flags = lmModule.Flags; - ModulePtr->Index = 0; // FIXME: ?? - ModulePtr->Unknown = 0; // FIXME: ?? + ModulePtr->LoadOrderIndex = 0; // FIXME: ?? + ModulePtr->InitOrderIndex = 0; // FIXME: ?? ModulePtr->LoadCount = lmModule.LoadCount; AnsiString.Length = 0; AnsiString.MaximumLength = 256; - AnsiString.Buffer = ModulePtr->ImageName; + AnsiString.Buffer = ModulePtr->FullPathName; RtlUnicodeStringToAnsiString(&AnsiString, &Unicode, FALSE); - p = strrchr(ModulePtr->ImageName, '\\'); + p = strrchr(ModulePtr->FullPathName, '\\'); if (p != NULL) - ModulePtr->ModuleNameOffset = p - ModulePtr->ImageName + 1; + ModulePtr->OffsetToFileName = p - ModulePtr->FullPathName + 1; else - ModulePtr->ModuleNameOffset = 0; + ModulePtr->OffsetToFileName = 0; ModulePtr++; - ModuleInformation->ModuleCount++; + Modules->NumberOfModules++; } UsedSize += sizeof(RTL_PROCESS_MODULE_INFORMATION); /* address of the next module in the list */ - pleCurEntry = lmModule.InLoadOrderModuleList.Flink; + pleCurEntry = lmModule.InLoadOrderLinks.Flink; } if (ReturnedSize != 0) @@ -230,13 +231,13 @@ NTSTATUS NTAPI RtlQueryProcessDebugInformation(IN ULONG ProcessId, IN ULONG DebugInfoMask, - IN OUT PRTL_DEBUG_BUFFER Buf) + IN OUT PRTL_DEBUG_INFORMATION Buf) { NTSTATUS Status = STATUS_SUCCESS; ULONG Pid = (ULONG) NtCurrentTeb()->Cid.UniqueProcess; - Buf->InfoClassMask = DebugInfoMask; - Buf->SizeOfInfo = sizeof(RTL_DEBUG_BUFFER); + Buf->Flags = DebugInfoMask; + Buf->OffsetFree = sizeof(RTL_DEBUG_INFORMATION); DPRINT("QueryProcessDebugInformation Start\n"); @@ -258,7 +259,7 @@ ULONG ReturnSize = 0; ULONG MSize; - Mp = (PRTL_PROCESS_MODULES)(Buf + Buf->SizeOfInfo); + Mp = (PRTL_PROCESS_MODULES)(Buf + Buf->OffsetFree); /* I like this better than the do & while loop. */ Status = LdrQueryProcessModuleInformation( NULL, @@ -272,9 +273,9 @@ return Status; } - MSize = Mp->ModuleCount * (sizeof(RTL_PROCESS_MODULES) + 8); - Buf->ModuleInformation = Mp; - Buf->SizeOfInfo = Buf->SizeOfInfo + MSize; + MSize = Mp->NumberOfModules * (sizeof(RTL_PROCESS_MODULES) + 8); + Buf->Modules = Mp; + Buf->OffsetFree = Buf->OffsetFree + MSize; } if (DebugInfoMask & RTL_DEBUG_QUERY_HEAPS) @@ -282,7 +283,7 @@ PRTL_PROCESS_HEAPS Hp; ULONG HSize; - Hp = (PRTL_PROCESS_HEAPS)(Buf + Buf->SizeOfInfo); + Hp = (PRTL_PROCESS_HEAPS)(Buf + Buf->OffsetFree); HSize = sizeof(RTL_PROCESS_HEAPS); if (DebugInfoMask & RTL_DEBUG_QUERY_HEAP_TAGS) { @@ -290,8 +291,8 @@ if (DebugInfoMask & RTL_DEBUG_QUERY_HEAP_BLOCKS) { } - Buf->HeapInformation = Hp; - Buf->SizeOfInfo = Buf->SizeOfInfo + HSize; + Buf->Heaps = Hp; + Buf->OffsetFree = Buf->OffsetFree + HSize; } @@ -300,14 +301,14 @@ PRTL_PROCESS_LOCKS Lp; ULONG LSize; - Lp = (PRTL_PROCESS_LOCKS)(Buf + Buf->SizeOfInfo); + Lp = (PRTL_PROCESS_LOCKS)(Buf + Buf->OffsetFree); LSize = sizeof(RTL_PROCESS_LOCKS); - Buf->LockInformation = Lp; - Buf->SizeOfInfo = Buf->SizeOfInfo + LSize; + Buf->Locks = Lp; + Buf->OffsetFree = Buf->OffsetFree + LSize; } DPRINT("QueryProcessDebugInformation end \n"); - DPRINT("QueryDebugInfo : 0x%lx\n", Buf->SizeOfInfo); + DPRINT("QueryDebugInfo : 0x%lx\n", Buf->OffsetFree); } else { @@ -315,7 +316,7 @@ CLIENT_ID ClientId; OBJECT_ATTRIBUTES ObjectAttributes; - Buf->Unknown[0] = (ULONG)NtCurrentProcess(); + Buf->TargetProcessHandle = NtCurrentProcess(); ClientId.UniqueThread = 0; ClientId.UniqueProcess = (HANDLE)ProcessId; @@ -340,7 +341,7 @@ ULONG ReturnSize = 0; ULONG MSize; - Mp = (PRTL_PROCESS_MODULES)(Buf + Buf->SizeOfInfo); + Mp = (PRTL_PROCESS_MODULES)(Buf + Buf->OffsetFree); Status = RtlpQueryRemoteProcessModules( hProcess, NULL, @@ -356,9 +357,9 @@ return Status; } - MSize = Mp->ModuleCount * (sizeof(RTL_PROCESS_MODULES) + 8); - Buf->ModuleInformation = Mp; - Buf->SizeOfInfo = Buf->SizeOfInfo + MSize; + MSize = Mp->NumberOfModules * (sizeof(RTL_PROCESS_MODULES) + 8); + Buf->Modules = Mp; + Buf->OffsetFree = Buf->OffsetFree + MSize; } if (DebugInfoMask & RTL_DEBUG_QUERY_HEAPS) @@ -366,7 +367,7 @@ PRTL_PROCESS_HEAPS Hp; ULONG HSize; - Hp = (PRTL_PROCESS_HEAPS)(Buf + Buf->SizeOfInfo); + Hp = (PRTL_PROCESS_HEAPS)(Buf + Buf->OffsetFree); HSize = sizeof(RTL_PROCESS_HEAPS); if (DebugInfoMask & RTL_DEBUG_QUERY_HEAP_TAGS) { @@ -374,8 +375,8 @@ if (DebugInfoMask & RTL_DEBUG_QUERY_HEAP_BLOCKS) { } - Buf->HeapInformation = Hp; - Buf->SizeOfInfo = Buf->SizeOfInfo + HSize; + Buf->Heaps = Hp; + Buf->OffsetFree = Buf->OffsetFree + HSize; } @@ -384,14 +385,14 @@ PRTL_PROCESS_LOCKS Lp; ULONG LSize; - Lp = (PRTL_PROCESS_LOCKS)(Buf + Buf->SizeOfInfo); + Lp = (PRTL_PROCESS_LOCKS)(Buf + Buf->OffsetFree); LSize = sizeof(RTL_PROCESS_LOCKS); - Buf->LockInformation = Lp; - Buf->SizeOfInfo = Buf->SizeOfInfo + LSize; + Buf->Locks = Lp; + Buf->OffsetFree = Buf->OffsetFree + LSize; } DPRINT("QueryProcessDebugInformation end \n"); - DPRINT("QueryDebugInfo : 0x%lx\n", Buf->SizeOfInfo); + DPRINT("QueryDebugInfo : 0x%lx\n", Buf->OffsetFree); } return Status; Index: lib/rtl/unicode.c =================================================================== --- lib/rtl/unicode.c (revision 21759) +++ lib/rtl/unicode.c (working copy) @@ -2185,7 +2185,7 @@ */ NTSTATUS NTAPI RtlValidateUnicodeString(IN ULONG Flags, - IN PUNICODE_STRING UnicodeString) + IN PCUNICODE_STRING UnicodeString) { /* currently no flags are supported! */ ASSERT(Flags == 0); Index: lib/rtl/network.c =================================================================== --- lib/rtl/network.c (revision 21759) +++ lib/rtl/network.c (working copy) @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * PROJECT: ReactOS Runtime Library * PURPOSE: Network Address Translation implementation - * PROGRAMMER: + * PROGRAMMER: Alex Ionescu (alexi(a)tinykrnl.org) */ /* INCLUDES *****************************************************************/ @@ -14,110 +14,74 @@ /* FUNCTIONS ***************************************************************/ -/* Borrow this from some headers... */ -typedef struct -{ - union - { - struct { UCHAR s_b1,s_b2,s_b3,s_b4; } S_un_b; - struct { USHORT s_w1,s_w2; } S_un_w; - ULONG S_addr; - } S_un; -} in_addr; - -typedef struct -{ - union - { - UCHAR _S6_u8[16]; - USHORT _S6_u16[8]; - ULONG _S6_u32[4]; - } S6_un; -} in6_addr; - - /* -* @implemented -*/ + * @implemented + */ LPSTR NTAPI -RtlIpv4AddressToStringA( - PULONG IP, - LPSTR Buffer - ) +RtlIpv4AddressToStringA(IN struct in_addr *Addr, + OUT PCHAR S) { - in_addr addr; - addr.S_un.S_addr = *IP; - return Buffer + sprintf(Buffer, "%u.%u.%u.%u", addr.S_un.S_un_b.s_b1, - addr.S_un.S_un_b.s_b2, - addr.S_un.S_un_b.s_b3, - addr.S_un.S_un_b.s_b4); + return S + sprintf(S, "%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, + Addr->S_un.S_un_b.s_b2, + Addr->S_un.S_un_b.s_b3, + Addr->S_un.S_un_b.s_b4); } /* -* @unimplemented -*/ + * @unimplemented + */ NTSTATUS NTAPI -RtlIpv4AddressToStringExA( - PULONG IP, - PULONG Port, - LPSTR Buffer, - PULONG MaxSize - ) +RtlIpv4AddressToStringExA(IN struct in_addr *Address, + IN USHORT Port, + OUT PCHAR AddressString, + IN OUT PULONG AddressStringLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* -* @implemented -*/ + * @implemented + */ LPWSTR NTAPI -RtlIpv4AddressToStringW( - PULONG IP, - LPWSTR Buffer - ) +RtlIpv4AddressToStringW(IN struct in_addr *Addr, + OUT PWCHAR S) { - in_addr addr; - addr.S_un.S_addr = *IP; - return Buffer + swprintf(Buffer, L"%u.%u.%u.%u", addr.S_un.S_un_b.s_b1, - addr.S_un.S_un_b.s_b2, - addr.S_un.S_un_b.s_b3, - addr.S_un.S_un_b.s_b4); + return S + swprintf(S, L"%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, + Addr->S_un.S_un_b.s_b2, + Addr->S_un.S_un_b.s_b3, + Addr->S_un.S_un_b.s_b4); } /* -* @unimplemented -*/ + * @unimplemented + */ NTSTATUS NTAPI -RtlIpv4AddressToStringExW( - PULONG IP, - PULONG Port, - LPWSTR Buffer, - PULONG MaxSize - ) +RtlIpv4AddressToStringExW(IN struct in_addr *Address, + IN USHORT Port, + OUT PWCHAR AddressString, + IN OUT PULONG AddressStringLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* -* @unimplemented -*/ + * @unimplemented + */ NTSTATUS NTAPI -RtlIpv4StringToAddressA( - IN LPSTR IpString, - IN ULONG Base, - OUT PVOID PtrToIpAddr, - OUT ULONG IpAddr - ) +RtlIpv4StringToAddressA(IN PCHAR String, + IN BOOLEAN Strict, + OUT PCHAR *Terminator, + OUT struct in_addr *Addr) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -125,15 +89,13 @@ */ NTSTATUS NTAPI -RtlIpv4StringToAddressExA( - IN LPSTR IpString, - IN ULONG Base, - OUT PULONG IpAddr, - OUT PULONG Port - ) +RtlIpv4StringToAddressExA(IN PCHAR AddressString, + IN BOOLEAN Strict, + OUT struct in_addr *Address, + IN PUSHORT Port) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -141,15 +103,13 @@ */ NTSTATUS NTAPI -RtlIpv4StringToAddressW( - IN LPWSTR IpString, - IN ULONG Base, - OUT PULONG PtrToIpAddr, - OUT PULONG IpAddr - ) +RtlIpv4StringToAddressW(IN PWCHAR String, + IN UCHAR Strict, + OUT PWCHAR Terminator, + OUT struct in_addr *Addr) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -157,15 +117,13 @@ */ NTSTATUS NTAPI -RtlIpv4StringToAddressExW( - IN LPWSTR IpString, - IN ULONG Base, - OUT PULONG IpAddr, - OUT PULONG Port - ) +RtlIpv4StringToAddressExW(IN PWCHAR AddressString, + IN BOOLEAN Strict, + OUT struct in_addr *Address, + OUT PUSHORT Port) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -173,13 +131,11 @@ */ NTSTATUS NTAPI -RtlIpv6AddressToStringA( - PULONG IP, - LPSTR Buffer - ) +RtlIpv6AddressToStringA(IN struct in6_addr *Addr, + OUT PCHAR S) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -187,15 +143,14 @@ */ NTSTATUS NTAPI -RtlIpv6AddressToStringExA( - PULONG IP, - PULONG Port, - LPSTR Buffer, - PULONG MaxSize - ) +RtlIpv6AddressToStringExA(IN struct in6_addr *Address, + IN ULONG ScopeId, + IN ULONG Port, + OUT PCHAR AddressString, + IN OUT PULONG AddressStringLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -203,13 +158,11 @@ */ NTSTATUS NTAPI -RtlIpv6AddressToStringW( - PULONG IP, - LPWSTR Buffer - ) +RtlIpv6AddressToStringW(IN struct in6_addr *Addr, + OUT PWCHAR S) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -217,15 +170,14 @@ */ NTSTATUS NTAPI -RtlIpv6AddressToStringExW( - PULONG IP, - PULONG Port, - LPWSTR Buffer, - PULONG MaxSize - ) +RtlIpv6AddressToStringExW(IN struct in6_addr *Address, + IN ULONG ScopeId, + IN USHORT Port, + IN OUT PWCHAR AddressString, + IN OUT PULONG AddressStringLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -233,9 +185,9 @@ */ NTSTATUS NTAPI -RtlIpv6StringToAddressA(IN LPSTR Name, - OUT PULONG Unknown, - OUT PVOID IpAddr) +RtlIpv6StringToAddressA(IN PCHAR Name, + OUT PCHAR *Terminator, + OUT struct in6_addr *Addr) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -246,10 +198,10 @@ */ NTSTATUS NTAPI -RtlIpv6StringToAddressExA(IN LPSTR AddressName, - IN PVOID Address, - IN PULONG ScopeId, - IN PUSHORT Port) +RtlIpv6StringToAddressExA(IN PCHAR AddressString, + OUT struct in6_addr *Address, + OUT PULONG ScopeId, + OUT PUSHORT Port) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -260,9 +212,9 @@ */ NTSTATUS NTAPI -RtlIpv6StringToAddressW(IN LPWSTR Name, - OUT PULONG Unknown, - OUT PVOID IpAddr) +RtlIpv6StringToAddressW(IN PWCHAR Name, + OUT PCHAR *Terminator, + OUT struct in6_addr *Addr) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -273,10 +225,10 @@ */ NTSTATUS NTAPI -RtlIpv6StringToAddressExW(IN LPWSTR AddressName, - IN PVOID Address, - IN PULONG ScopeId, - IN PUSHORT Port) +RtlIpv6StringToAddressExW(IN PWCHAR AddressName, + OUT struct in6_addr *Address, + OUT PULONG ScopeId, + OUT PUSHORT Port) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; Index: lib/rtl/thread.c =================================================================== --- lib/rtl/thread.c (revision 21759) +++ lib/rtl/thread.c (working copy) @@ -12,6 +12,7 @@ /* INCLUDES *****************************************************************/ #include <rtl.h> +#include "i386/ketypes.h" #define NDEBUG #include <debug.h> Index: lib/rtl/path.c =================================================================== --- lib/rtl/path.c (revision 21759) +++ lib/rtl/path.c (working copy) @@ -61,29 +61,29 @@ if (Path == NULL) { - return INVALID_PATH; + return RtlPathTypeUnknown; } if (IS_PATH_SEPARATOR(Path[0])) { - if (!IS_PATH_SEPARATOR(Path[1])) return ABSOLUTE_PATH; /* \xxx */ - if (Path[2] != L'.') return UNC_PATH; /* \\xxx */ - if (IS_PATH_SEPARATOR(Path[3])) return DEVICE_PATH; /* \\.\xxx */ - if (Path[3]) return UNC_PATH; /* \\.xxxx */ + if (!IS_PATH_SEPARATOR(Path[1])) return RtlPathTypeRooted; /* \xxx */ + if (Path[2] != L'.') return RtlPathTypeUncAbsolute; /* \\xxx */ + if (IS_PATH_SEPARATOR(Path[3])) return RtlPathTypeLocalDevice; /* \\.\xxx */ + if (Path[3]) return RtlPathTypeUncAbsolute; /* \\.xxxx */ - return UNC_DOT_PATH; /* \\. */ + return RtlPathTypeRootLocalDevice; /* \\. */ } else { /* FIXME: the Wine version of this line reads: - * if (!Path[1] || Path[1] != L':') return RELATIVE_PATH + * if (!Path[1] || Path[1] != L':') return RtlPathTypeRelative * Should we do this too? * -Gunnar */ - if (Path[1] != L':') return RELATIVE_PATH; /* xxx */ - if (IS_PATH_SEPARATOR(Path[2])) return ABSOLUTE_DRIVE_PATH; /* x:\xxx */ + if (Path[1] != L':') return RtlPathTypeRelative; /* xxx */ + if (IS_PATH_SEPARATOR(Path[2])) return RtlPathTypeDriveAbsolute; /* x:\xxx */ - return RELATIVE_DRIVE_PATH; /* x:xxx */ + return RtlPathTypeDriveRelative; /* x:xxx */ } } @@ -448,16 +448,16 @@ switch (type = RtlDetermineDosPathNameType_U(name)) { - case UNC_PATH: /* \\foo */ + case RtlPathTypeUncAbsolute: /* \\foo */ ptr = skip_unc_prefix( name ); mark = (ptr - name); break; - case DEVICE_PATH: /* \\.\foo */ + case RtlPathTypeLocalDevice: /* \\.\foo */ mark = 4; break; - case ABSOLUTE_DRIVE_PATH: /* c:\foo */ + case RtlPathTypeDriveAbsolute: /* c:\foo */ reqsize = sizeof(WCHAR); tmp[0] = towupper(name[0]); ins_str = tmp; @@ -465,7 +465,7 @@ mark = 3; break; - case RELATIVE_DRIVE_PATH: /* c:foo */ + case RtlPathTypeDriveRelative: /* c:foo */ dep = 2; if (towupper(name[0]) != towupper(cd->Buffer[0]) || cd->Buffer[1] != ':') { @@ -517,7 +517,7 @@ } /* fall through */ - case RELATIVE_PATH: /* foo */ + case RtlPathTypeRelative: /* foo */ reqsize = cd->Length; ins_str = cd->Buffer; if (cd->Buffer[1] != ':') @@ -528,7 +528,7 @@ else mark = 3; break; - case ABSOLUTE_PATH: /* \xxx */ + case RtlPathTypeRooted: /* \xxx */ #ifdef __WINE__ if (name[0] == '/') /* may be a Unix path */ { @@ -564,7 +564,7 @@ } break; - case UNC_DOT_PATH: /* \\. */ + case RtlPathTypeRootLocalDevice: /* \\. */ reqsize = 4 * sizeof(WCHAR); dep = 3; tmp[0] = '\\'; @@ -575,7 +575,7 @@ mark = 4; break; - case INVALID_PATH: + case RtlPathTypeUnknown: goto done; } @@ -794,8 +794,8 @@ Length = wcslen(fullname + Offset); memcpy (Buffer + tmpLength, fullname + Offset, (Length + 1) * sizeof(WCHAR)); Length += tmpLength; - if (Type == ABSOLUTE_DRIVE_PATH || - Type == RELATIVE_DRIVE_PATH) + if (Type == RtlPathTypeDriveAbsolute || + Type == RtlPathTypeDriveRelative) { /* make the drive letter to uppercase */ Buffer[tmpLength] = towupper(Buffer[tmpLength]); @@ -840,9 +840,9 @@ ULONG NTAPI RtlDosSearchPath_U ( - WCHAR *sp, - WCHAR *name, - WCHAR *ext, + PCWSTR sp, + PCWSTR name, + PCWSTR ext, ULONG buf_sz, WCHAR *buffer, PWSTR *FilePart @@ -852,7 +852,7 @@ ULONG Length = 0; PWSTR full_name; PWSTR wcs; - PWSTR path; + PCWSTR path; Type = RtlDetermineDosPathNameType_U (name); @@ -915,7 +915,7 @@ * @implemented */ BOOLEAN NTAPI -RtlDoesFileExists_U(IN PWSTR FileName) +RtlDoesFileExists_U(IN PCWSTR FileName) { UNICODE_STRING NtFileName; OBJECT_ATTRIBUTES Attr; Index: lib/rtl/bootdata.c =================================================================== --- lib/rtl/bootdata.c (revision 21759) +++ lib/rtl/bootdata.c (working copy) @@ -657,7 +657,7 @@ /* free allocated memory */ ASSERT(SecurityDescriptor != NULL); - ASSERT(SecurityDescriptor->Dacl != NULL) + ASSERT(SecurityDescriptor->Dacl != NULL); RtlpFreeMemory(SecurityDescriptor->Dacl, TAG('S', 'e', 'A', 'c')); Index: subsystems/win32/win32k/ntuser/winsta.c =================================================================== --- subsystems/win32/win32k/ntuser/winsta.c (revision 21759) +++ subsystems/win32/win32k/ntuser/winsta.c (working copy) @@ -97,10 +97,10 @@ NTSTATUS STDCALL IntWinStaObjectOpen(OB_OPEN_REASON Reason, + PEPROCESS Process, PVOID ObjectBody, - PEPROCESS Process, - ULONG HandleCount, - ACCESS_MASK GrantedAccess) + ACCESS_MASK GrantedAccess, + ULONG HandleCount) { PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)ObjectBody; NTSTATUS Status; Index: subsystems/win32/win32k/include/winsta.h =================================================================== --- subsystems/win32/win32k/include/winsta.h (revision 21759) +++ subsystems/win32/win32k/include/winsta.h (working copy) @@ -54,11 +54,11 @@ NTSTATUS STDCALL -IntWinStaObjectOpen(OB_OPEN_REASON Reason, - PVOID ObjectBody, - PEPROCESS Process, - ULONG HandleCount, - ACCESS_MASK GrantedAccess); +IntWinStaObjectOpen(IN OB_OPEN_REASON Reason, + IN PEPROCESS Process OPTIONAL, + IN PVOID ObjectBody, + IN ACCESS_MASK GrantedAccess, + IN ULONG HandleCount); VOID STDCALL IntWinStaObjectDelete(PVOID DeletedObject); Index: subsystems/win32/win32k/main/dllmain.c =================================================================== --- subsystems/win32/win32k/main/dllmain.c (revision 21759) +++ subsystems/win32/win32k/main/dllmain.c (working copy) @@ -23,6 +23,7 @@ #include <w32k.h> #include <include/napi.h> +#include <win32k/callout.h> #define NDEBUG #include <debug.h> @@ -164,7 +165,7 @@ NTSTATUS STDCALL Win32kThreadCallback(struct _ETHREAD *Thread, - BOOLEAN Create) + PSW32THREADCALLOUTTYPE Type) { struct _EPROCESS *Process; PW32THREAD Win32Thread; @@ -193,7 +194,7 @@ PsSetThreadWin32Thread(Thread, Win32Thread); /* FIXME - unlock the process */ } - if (Create) + if (Type == PsW32ThreadCalloutInitialize) { HWINSTA hWinSta = NULL; HDESK hDesk = NULL; @@ -380,7 +381,7 @@ /* * Register Object Manager Callbacks */ - CalloutData.WinStaCreate = IntWinStaObjectOpen; + CalloutData.WinStaOpen = IntWinStaObjectOpen; CalloutData.WinStaParse = IntWinStaObjectParse; CalloutData.WinStaDelete = IntWinStaObjectDelete; CalloutData.WinStaFind = IntWinStaObjectFind; @@ -392,7 +393,7 @@ /* * Register our per-process and per-thread structures. */ - PsEstablishWin32Callouts(&CalloutData); + PsEstablishWin32Callouts((PWIN32_CALLOUTS_FPNS)&CalloutData); GlobalUserHeap = UserCreateHeap(&GlobalUserHeapSection, &GlobalUserHeapBase, Index: subsystems/win32/win32k/objects/dc.c =================================================================== --- subsystems/win32/win32k/objects/dc.c (revision 21759) +++ subsystems/win32/win32k/objects/dc.c (working copy) @@ -28,6 +28,14 @@ #define NDEBUG #include <debug.h> +/* ROS Internal. Please deprecate */ +NTHALAPI +BOOLEAN +NTAPI +HalQueryDisplayOwnership( + VOID +); + #ifndef OBJ_COLORSPACE #define OBJ_COLORSPACE (14) #endif Index: subsystems/win32/win32k/w32k.h =================================================================== --- subsystems/win32/win32k/w32k.h (revision 21759) +++ subsystems/win32/win32k/w32k.h (working copy) @@ -17,6 +17,7 @@ #include <ntddk.h> #include <ntddmou.h> #include <ntndk.h> +//#include <rtltypes.h> /* Win32 Headers */ /* FIXME: Defines in winbase.h that we need... */ @@ -56,9 +57,6 @@ #include <win32k/ntgdibad.h> #include <ntgdi.h> -/* For access to SECTION_OBJECT. FIXME: Once compatible with NT, use NDK! */ -#include <internal/mm.h> - /* Internal Win32K Header */ #include "include/win32k.h"

9 18

RE: [ros-dev] 0.3.0 has been branched.
by Murphy, Ged (Bolton) 12 May '06

12 May '06

Steven Edwards wrote: > On 5/11/06, Murphy, Ged (Bolton) <MurphyG(a)cmpbatteries.co.uk> wrote: > > The Wine syncs aren't quite as simple as Gé made them look. > I think we took > > them for granted back when Gé was doing them. > > IIRC, comctl32 still needs doing. Last time it introduced > regressions and > > was reverted. > > I have offered to sync up a bunch of changes for the 0.3 cycle. I'm > going to start doing this Friday evening for the dlls that are a 100% > drop-in. There are a few other things that could be updated as well in > advapi32, kernel32, etc as well as new regression tests. I expect its > going to take me a while to do it all and make sure there is no > regression. Gé has a great awk script which automates a vast majority of the process, including the laborious task of generating the logs/credits. If he isn't around today, I can forward a copy on to you later. Ged. ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

2 1

0.3.0 has been branched.
by WaxDragon 12 May '06

12 May '06

Alex committed the NDK today, so I went ahead and branched 0.3.0 at the previous revision. Aleskey and I decided that the NDK and CC patches can go in trunk whenever they are ready, for inclusion into 0.3.1. 0.3.0 is still in need of bugfixing and regression testing. Therefore, we are going to leave the 0.3.0 branch open to development for a bit before we release RC1. Please discuss any large changes on the list before commiting to the branch. I don't care of the branch stays open for a month, as long as it's a good release in the end. Thanks for all your hard work, WD -- ReactOS is a hub, follow the spokes and you'll immediately find absolutely everything you need to know about Windows. ReactOS is not just software, it's people. kjk_hyperion

4 5

RE: [ros-dev] 0.3.0 has been branched.
by Murphy, Ged (Bolton) 11 May '06

11 May '06

Aleksey Bragin wrote: > If some of you wants to merge components which are left - please go > ahead. Wine vendor import was done (some 10, some 12), so it's just > the merge which is left. And main problem is merging 0.9.5->0.9.10, > while 0.9.10-0.9.12 is quite easy due to not so big amount of changes. The Wine syncs aren't quite as simple as Gé made them look. I think we took them for granted back when Gé was doing them. IIRC, comctl32 still needs doing. Last time it introduced regressions and was reverted. Ged. ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

2 1

Re: [ros-diffs] [mbosma] 21894: [AUDIT] Unlock the Cache Manager - It is not even compatible to windows - Alex assures his code is clean
by Maarten Bosma 11 May '06

11 May '06

Here is the list from Alex. > (Nagar refers to Rajeev's book) > > ntoskrnl/cc/fs.c > > CcGetDirtyPages => STUB > CcGetFileObjectFromBcb => Nagar (not even sure i wrote it). > CcGetLsnForFileObject => STUB > CcInitializeCacheMap => Did not code. (calls CcRos) > CcIsThereDirtyData => STUB > CcPurgeCacheSection => STUB > CcSetFileSizes => Did not code. > CcSetLogHandleForFile => STUB > CcUninitializeCacheMap => Stub/Calls Ccros > > ntoskrnl/cc/view.c > > CcTryToAcquireBrokenMutex => Did not code (copy-pasted implementation of old mutext impl, renamed). > > ntoskrnl/cc/copy.c > > CcDeferWrite => STUB > CcFastCopyRead => STUB > CcFastCopyWrite => STUB > CcWaitForCurrentLazyWriterActivity => STUB > > ntoskrnl/cc/pin.c > > CcPinMappedData => STUB > CcPinRead => Did not code. > CcSetDirtyPinnedData => Did not code. > > ntoskrnl/cc/mdl.c > > CcMdlRead => STUB > CcMdlReadCompleteDev => Nagar/Trivial implementation. > CcMdlReadComplete => Nagar/Trivial implementation. > CcMdlWriteComplete => Same as read complete, just renamed to *write* > CcMdlWriteCompleteDev => STUB > CcMdlWriteAbort => STUB > CcPrepareMdlWrite => STUB > > ntoskrnl/cc/cacheman.c > > CcGetFlushedValidData => STUB > CcRemapBcb => STUB > CcScheduleReadAhead => STUB > CcSetAdditionalCacheAttributes => STUB > CcSetBcbOwnerPointer => STUB > CcSetDirtyPageThreshold => STUB > CcSetReadAheadGranularity => STUB mbosma(a)svn.reactos.org wrote: > Author: mbosma > Date: Fri May 12 02:40:37 2006 > New Revision: 21894 > > URL: http://svn.reactos.ru/svn/reactos?rev=21894&view=rev > Log: > [AUDIT] > Unlock the Cache Manager > - It is not even compatible to windows > - Alex assures his code is clean > > Modified: > trunk/reactos/ntoskrnl/cc/cacheman.c (props changed) > trunk/reactos/ntoskrnl/cc/copy.c (props changed) > trunk/reactos/ntoskrnl/cc/fs.c (props changed) > trunk/reactos/ntoskrnl/cc/mdl.c (props changed) > trunk/reactos/ntoskrnl/cc/pin.c (props changed) > trunk/reactos/ntoskrnl/cc/view.c (props changed) >

1 0

Re: [ros-bugs] [Bug 1473] Function definition fixes
by Magnus Olsen 11 May '06

11 May '06

----- Original Message ----- From: <ReactOS.Bugzilla(a)reactos.org> To: <ros-bugs(a)reactos.org> Sent: Thursday, May 11, 2006 9:41 AM Subject: [ros-bugs] [Bug 1473] Function definition fixes > http://www.reactos.org/bugzilla/show_bug.cgi?id=1473 > > > > > > ------- Comment #1 from w3seek(a)reactos.com 2006-05-11 09:41 CET ------- > Created an attachment (id=804) > --> (http://www.reactos.org/bugzilla/attachment.cgi?id=804&action=view) > The patch > > > -- > Configure bugmail: http://www.reactos.org/bugzilla/userprefs.cgi?tab=email > ------- You are receiving this mail because: ------- > You are the QA contact for the bug, or are watching the QA contact. > You are the assignee for the bug, or are watching the assignee. > _______________________________________________ > Ros-bugs mailing list > Ros-bugs(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-bugs

1 0

RE: Ros-dev Digest, Vol 14, Issue 25
by Lucio Diaz 10 May '06

10 May '06

David Hinz wrote: Hey guys, when I just translated format, I stunbled over one thing: What if somebody changed the content of a string after I translated it? After some minutes, I had a easy solution for that problem: The En.rc gets a little line in it's head-comment with a revision number. Each time somebody changes or adds a string in the En.rc, he sets the revision number +1 and so all translators have an easy to control indicator, if they need to translate something or not. But I think one thing should be clear, if there just has been corrected a spelling mistake and not something important, the revision number won't be touched. Now some example headers: in the EN.rc: /* * Moved all hardcoded strings to En.rc. * By Magnus Olsen 2005 * * Revision: 1 */ in my De.rc: /* * Moved all hardcoded strings to En.rc. * By Magnus Olsen 2005 * First German Translation by David Hinz 20051010 * * Translated Revision 1 of En.rc */ This is just an idea, but I think this could save a lot of work on bigger applications than format... Greets, David Hinz --------------------------------------- I agree, in fact i am working in a program to manage translation in reactos, i am using Delphi 2.0 but as i am not much skilled (long time since i used pascal) and my time is on the limit it is going slowly but it should work as follow: Part 1: - You select your language - You select the working directory of reactos source. - The program scans all files for en.rc files and list their directories (as their names are all the same). - With each file the program check a text file with a list of en.rc files, and if it is not there it adds it, and it is shown in the GUI as highlighted (pending translation). - If the file is found in the list, it check if translating language file is current--> if it is not current then the file is highlighted (pending translation). - If the file is found in the list, and found a translation file current--> the file is listed but not highlighted. - It does with all rc files till no more rc files in the directory. Part 2: - On clicking in a file in the listbox (highlighted or not) it will be shown in an Richtext edit panel and besides another panel with the material already translated (if there is any language related file already done), if not, the english text will be shown with the "probable translatable" areas highligthed (those between ""). -A save button, that will save the changes in the second panel automatically into the right directory in a language working copy. What do you think? ______________________________________________ Renovamos el Correo Yahoo! Nuevos servicios, más seguridad http://correo.yahoo.es

11 18

[Fwd: Re: [ros-dev] NDK Patches]
by Alex Ionescu 09 May '06

09 May '06

1 0

Re: [ros-bugs] [Bug 1460] Extended DOS Partition
by Royce Mitchell III 08 May '06

08 May '06

ReactOS.Bugzilla(a)reactos.org wrote: >http://www.reactos.org/bugzilla/show_bug.cgi?id=1460 > > >greatlord(a)reactos.com changed: > > What |Removed |Added >---------------------------------------------------------------------------- > Status|NEW |RESOLVED > Resolution| |WONTFIX > > > > >------- Comment #2 from greatlord(a)reactos.com 2006-05-08 21:13 CET ------- >you can not install any os on exstions partions >what I know, a OS need be on primary partions > >This bug report is invaild in my eyes > > Umm... this is not strictly true. You *can* install an OS on an extended partition. You just can't put the boot strap on an extended partition. Note that this is not a discussion about how *wise* such a thing would be...

2 1

RE: [ros-diffs] [greatlrd] 21849: if u update En.rc please update all other langues files, use the english text if no translatesion is no t availbal, other wise it will bsd in windows or in reactos and we get di ffent functions on each langues. DO NOT DO T
by Murphy, Ged (Bolton) 08 May '06

08 May '06

greatlrd(a)svn.reactos.org wrote: > if u update En.rc please update all other langues files, use > the english text if no translatesion is not availbal, other > wise it will bsd in windows or in reactos and we get diffent > functions on each langues. DO NOT DO THIS MISTAKE If it's just 1 or 2 lines, it generally not a big deal to alter all the files. However when the changes are large, and considering programmers are generally lazy ;) it can be a real pain to change all the resources. This problem is only going to get worse as more languages are added. I think it could be worthwhile setting up official translation teams who are contacted when a resource file changes. It'd be relatively easy to script. It would benefit both ReactOS, and people who want to get involved but aren't programmers. Our translation teams are a bit of a grey area at the moment. Our website is much better organised in this department than our actual operating system. Ged. ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

2 1

RE: [greatlrd] 21849: if u update En.rc please update all other langues files, use the english text if no translatesion is not availbal, other wise it will bsd in windows or in reactos and we get diffent functions on each langues. DO NOT DO T
by Ge van Geldorp 08 May '06

08 May '06

> From: greatlrd(a)svn.reactos.org > > Log: > if u update En.rc please update all other langues files, use > the english text if no translatesion is not availbal, other > wise it will bsd in windows or in reactos and we get diffent > functions on each langues. DO NOT DO THIS MISTAKE The resource loader will load the English text if the text is not available in the selected language (at least that's what is supposed to happen, if it doesn't there's a bug in the resource loader). GvG

2 2

Re: [ros-dev] RE: [greatlrd] 21849: if u update En.rc please update all other langues files, use the english text if no translatesion is not availbal, other wise it will bsd in windows or in reactos and we get diffent functions on each langues. DO NO
by Martin Fuchs 08 May '06

08 May '06

> > Log: > > if u update En.rc please update all other langues files, use > > the english text if no translatesion is not availbal, other > > wise it will bsd in windows or in reactos and we get diffent > > functions on each langues. DO NOT DO THIS MISTAKE > > The resource loader will load the English text if the text is not available in the > selected language (at least that's what is supposed to happen, if it doesn't > there's a bug in the resource loader). Correct with one small exception: String table resources are loaded in chunks of 16 strings, so strings should be updates with great care: If one inserts new strings into the string table only in English, the resource IDs of this new strings should be aligned to a boundary of 16. Regards, Martin

1 0

Third Boot Blue Screen
by James Tabor 04 May '06

04 May '06

Hi! Reporting a third boot hard fault. After install and reboot with driver wizard. On the third reboot after setting the display to 32 bit 1024x768 with background this happens. I repeated it three times to make sure this was not bogus. Revision is 21795. Thanks, James <Snip > (drivers/usb/miniport/sys/linuxwrapper.c:252) schedule_timeout: 5 ms (drivers/usb/usbport/hub.c:1230) hub_thread starting(drivers/usb/miniport/sys/linuxwrapper.c:286) schedule DONE!!!!!! (drivers/usb/miniport/sys/linuxwrapper.c:252) schedule_timeout: 1 ms (drivers/usb/miniport/sys/linuxwrapper.c:286) schedule DONE!!!!!! (drivers/usb/miniport/sys/linuxwrapper.c:793) pci_alloc_consistent() size=8196 (drivers/usb/miniport/sys/linuxwrapper.c:639) pci_pool_create(): UHCD PCI Slot/uhci_td size 48, 85/page (4096 alloc) (drivers/usb/miniport/sys/linuxwrapper.c:639) pci_pool_create(): UHCD PCI Slot/uhci_qh size 48, 85/page (4096 alloc) (drivers/usb/miniport/sys/ros_wrapper.c:8) wait_ms(10) (drivers/usb/miniport/sys/linuxwrapper.c:167) drv_num 2 80ef9423 80ef9320 (drivers/usb/usbport/usb.c:1255) .........................usb_new_device: usb-UHCD PCI Slot-0 interface 0 (drivers/usb/miniport/sys/linuxwrapper.c:167) drv_num 2 80ef9423 80ef9320 (drivers/usb/miniport/sys/linuxwrapper.c:181) probe0 80ef9423 (drivers/usb/usbport/hub.c:521) hub_thread should woke up (drivers/usb/miniport/sys/ros_wrapper.c:8) wait_ms(0) (drivers/usb/miniport/sys/ros_wrapper.c:8) wait_ms(0) (drivers/usb/miniport/sys/ros_wrapper.c:8) wait_ms(6) (drivers/usb/miniport/sys/linuxwrapper.c:181) probe1 80ef9320 (drivers/usb/miniport/sys/linuxwrapper.c:201) driver_register 2: 80efe148 80ef9423(drivers/usb/miniport/sys/linuxwrapper.c:201) driver_register 3: 80efe328 80ef9423(drivers/usb/miniport/common/fdo.c:270) USBMP: IRP_MJ_PNP / unknown minor function 0x9 (drivers/usb/miniport/common/pdo.c:333) USBMP: IRP_MJ_PNP / unknown minor function 0x15 (./ntoskrnl/ldr/loader.c:334) Driver Load Success: \SystemRoot\System32\drivers\usbhub.sys (./ntoskrnl/io/device.c:576) Cannot insert Device Object '\Device\USBFDO-0' into Handle Table (status 0xc0000035) (drivers/usb/miniport/common/fdo.c:270) USBMP: IRP_MJ_PNP / unknown minor function 0x8 (drivers/usb/miniport/sys/linuxwrapper.c:479) IoGetDmaAdapter done 0x81213888, mapRegisterCount=2 (drivers/usb/usbport/hcd-pci.c:74) usbcore: usb_hcd_pci_probe() called (drivers/usb/miniport/sys/linuxwrapper.c:201) driver_register 4: 80efe0b8 80ef9423(drivers/usb/miniport/sys/linuxwrapper.c:137) usbcor(drivers/usb/usbport/hub.c:1230) hub_thread startinge: Created system thread 80 (drivers/usb/miniport/sys/linuxwrapper.c:201) driver_register 5: 80efe114 80ef9320(drivers/usb/usbport/hcd-pci.c:74) usbcore: usb_hcd_pci_probe() called (drivers/usb/usbport/../miniport/linux/pci_hal.c:13) pci_enable_device() called. .. (drivers/usb/usbport/../miniport/linux/pci_hal.c:44) pci_resource_flags() called, x=0x0 (drivers/usb/usbport/../miniport/linux/pci_hal.c:21) pci_resource_start() called, x=0x0 (drivers/usb/usbport/../miniport/linux/pci_hal.c:33) pci_resource_len() called,x=0x0 (drivers/usb/usbport/../miniport/linux/pci_hal.c:86) request_region(): addr=0xd400, len=0x20 (drivers/usb/usbport/../miniport/linux/pci_hal.c:58) pci_set_drvdata() called... (drivers/usb/miniport/usbuhci/../linux/pci_hal.c:33) pci_resource_len() called,x=0x0 (drivers/usb/miniport/sys/linuxwrapper.c:252) schedule_timeout: 5 ms (drivers/usb/miniport/sys/linuxwrapper.c:286) schedule DONE!!!!!! (drivers/usb/miniport/sys/linuxwrapper.c:252) schedule_timeout: 1 ms (drivers/usb/miniport/sys/linuxwrapper.c:286) schedule DONE!!!!!! (drivers/usb/miniport/sys/linuxwrapper.c:793) pci_alloc_consistent() size=8196 (drivers/usb/miniport/sys/linuxwrapper.c:639) pci_pool_create(): UHCD PCI Slot/uhci_td size 48, 85/page (4096 alloc) (drivers/usb/miniport/sys/linuxwrapper.c:639) pci_pool_create(): UHCD PCI Slot/uhci_qh size 48, 85/page (4096 alloc) (drivers/usb/miniport/sys/ros_wrapper.c:8) wait_ms(10) (drivers/usb/miniport/sys/linuxwrapper.c:167) drv_num 6 80ef9423 80ef9320 (drivers/usb/usbport/usb.c:1255) .........................usb_new_device: usb-UHCD PCI Slot-0 interface 0 (drivers/usb/miniport/sys/linuxwrapper.c:167) drv_num 6 80ef9423 80ef9320 (drivers/usb/miniport/sys/linuxwrapper.c:181) probe0 80ef9423 (drivers/usb/usbport/hub.c:521) hub_thread should woke up (drivers/usb/miniport/sys/ros_wrapper.c:8) wait_ms(0) (drivers/usb/miniport/sys/ros_wrapper.c:8) wait_ms(0) (drivers/usb/miniport/sys/ros_wrapper.c:8) wait_ms(6) (drivers/usb/miniport/sys/linuxwrapper.c:181) probe1 80ef9320 (drivers/usb/miniport/sys/linuxwrapper.c:181) probe2 80ef9423 (drivers/usb/miniport/sys/linuxwrapper.c:181) probe3 80ef9423 (drivers/usb/miniport/sys/linuxwrapper.c:181) probe4 80ef9423 (drivers/usb/miniport/sys/linuxwrapper.c:181) probe5 80ef9320 (drivers/usb/miniport/sys/linuxwrapper.c:201) driver_register 6: 80efe148 80ef9423(drivers/usb/miniport/sys/linuxwrapper.c:201) driver_register 7: 80efe328 80ef9423(drivers/usb/miniport/common/fdo.c:270) USBMP: IRP_MJ_PNP / unknown minor function 0x9 (drivers/usb/miniport/common/pdo.c:333) USBMP: IRP_MJ_PNP / unknown minor function 0x15 (./ntoskrnl/io/device.c:576) Cannot insert Device Object '\Device\USBFDO-1' into Handle Table (status 0xc0000035) (drivers/usb/miniport/common/fdo.c:270) USBMP: IRP_MJ_PNP / unknown minor function 0x8 (drivers/usb/miniport/sys/linuxwrapper.c:479) IoGetDmaAdapter done 0x81216848, mapRegisterCount=2 (drivers/usb/usbport/hcd-pci.c:74) usbcore: usb_hcd_pci_probe() called (drivers/usb/usbport/hcd-pci.c:74) usbcore: usb_hcd_pci_probe() called (drivers/usb/usbport/../miniport/linux/pci_hal.c:13) pci_enable_device() called... (drivers/usb/usbport/../miniport/linux/pci_hal.c:44) pci_resource_flags() called, x=0x0 (drivers/usb/usbport/../miniport/linux/pci_hal.c:21) pci_resource_start() called, x=0x0 (drivers/usb/usbport/../miniport/linux/pci_hal.c:33) pci_resource_len() called,x=0x0 (drivers/usb/usbport/../miniport/linux/pci_hal.c:86) request_region(): addr=0xd000, len=0x20 (drivers/usb/usbport/../miniport/linux/pci_hal.c:58) pci_set_drvdata() called... (drivers/usb/miniport/usbuhci/../linux/pci_hal.c:33) pci_resource_len() called,x=0x0 (drivers/usb/miniport/sys/linuxwrapper.c:252) schedule_timeout: 5 ms (drivers/usb/miniport/sys/linuxwrapper.c:286) schedule DONE!!!!!! (drivers/usb/miniport/sys/linuxwrapper.c:252) schedule_timeout: 1 ms (drivers/usb/miniport/sys/linuxwrapper.c:286) schedule DONE!!!!!! (drivers/usb/miniport/sys/linuxwrapper.c:793) pci_alloc_consistent() size=8196 (drivers/usb/miniport/sys/linuxwrapper.c:639) pci_pool_create(): UHCD PCI Slot/uhci_td size 48, 85/page (4096 alloc) (drivers/usb/miniport/sys/linuxwrapper.c:639) pci_pool_create(): UHCD PCI Slot/uhci_qh size 48, 85/page (4096 alloc) (drivers/usb/miniport/sys/ros_wrapper.c:8) wait_ms(10) (drivers/usb/miniport/sys/linuxwrapper.c:167) drv_num 8 80ef9423 80ef9320 (drivers/usb/usbport/usb.c:1255) .........................usb_new_device: usb-UHCD PCI Slot-0 interface 0 (drivers/usb/miniport/sys/linuxwrapper.c:167) drv_num 8 80ef9423 80ef9320 (drivers/usb/miniport/sys/linuxwrapper.c:181) probe0 80ef9423 (drivers/usb/usbport/hub.c:521) hub_thread should woke up (drivers/usb/miniport/sys/ros_wrapper.c:8) wait_ms(0) (drivers/usb/miniport/sys/ros_wrapper.c:8) wait_ms(0) (drivers/usb/miniport/sys/ros_wrapper.c:8) wait_ms(6) (drivers/usb/miniport/sys/linuxwrapper.c:181) probe1 80ef9320 (drivers/usb/miniport/sys/linuxwrapper.c:181) probe2 80ef9423 (drivers/usb/miniport/sys/linuxwrapper.c:181) probe3 80ef9423 (drivers/usb/miniport/sys/linuxwrapper.c:181) probe4 80ef9423 (drivers/usb/miniport/sys/linuxwrapper.c:181) probe5 80ef9320 (drivers/usb/miniport/sys/linuxwrapper.c:181) probe6 80ef9423 (drivers/usb/miniport/sys/linuxwrapper.c:181) probe7 80ef9423 (drivers/usb/miniport/common/fdo.c:270) USBMP: IRP_MJ_PNP / unknown minor function 0x9 (drivers/usb/miniport/common/pdo.c:333) USBMP: IRP_MJ_PNP / unknown minor function 0x15 (./ntoskrnl/ldr/loader.c:334) Driver Load Success: \SystemRoot\system32\drivers\floppy.sys <Snip > (./ntoskrnl/ldr/loader.c:334) Driver Load Success: \SystemRoot\system32\drivers\i8042prt.sys (./ntoskrnl/ldr/loader.c:334) Driver Load Success: \SystemRoot\system32\drivers\mouclass.sys (./ntoskrnl/ldr/loader.c:334) Driver Load Success: \SystemRoot\system32\drivers\kbdclass.sys (drivers/usb/miniport/common/main.c:333) USBMP: PDO stub for major function 0x0 Assertion 'FALSE' failed at drivers/usb/miniport/common/main.c line 335 KeBugCheckWithTf at ntoskrnl/ke/i386/exp.c:1241 A problem has been detected and ReactOS has been shut down to prevent damage to your computer. The problem seems to be caused by the following file: ntoskrnl.exe Technical information: *** STOP: 0x0000001E (0x80000003,0x8006bcb1,0x8005e4da,0x878000fc) *** ntoskrnl.exe - Address 0x8006bcb1 base at 0x80000000, DateStamp 0x0 Exception: -1160049408(0) Processor: 0 CS:EIP 8:8006bcb1 <ntoskrnl.exe:6bcb1 (lib/rtl/i386/debug_asm.S:23 (DbgBreakPoint))> cr2 8db6a000 cr3 26000 Proc: 81004c20 Pid: 4 <System> Thrd: 81005660 Tid: 0 DS 23 ES 23 FS 30 GS 0 EAX: 00000000 EBX: 80ec6cc7 ECX: 00000000 EDX: 00000000 EBP: 800b1730 ESI: 810195e0 ESP: 800b16b4 EDI: 01000040 EFLAGS: 00200282 kESP 800b16b4 kernel stack base 800af000 Frames: <usbuhci.sys:5be5 (drivers/usb/miniport/common/main.c:338 (IrpStub))> <ntoskrnl.exe:22044 (./ntoskrnl/io/irp.c:1076 (IofCallDriver))> <ntoskrnl.exe:330de (ntoskrnl/io/file.c:1139 (IoCreateFile))> <ntoskrnl.exe:34534 (ntoskrnl/io/file.c:2360 (NtOpenFile))> <ntoskrnl.exe:652b7 (ntoskrnl/ke/i386/trap.s:306 (KiFastCallEntry))> <ntoskrnl.exe:22919 (./ntoskrnl/io/device.c:204 (IopGetDeviceObjectPointer))> <ntoskrnl.exe:2299f (./ntoskrnl/io/device.c:786 (IoGetDeviceObjectPointer))> <kbdclass.sys:1b5e (drivers/input/kbdclass/kbdclass.c:833 (ClassAddDevice))> <ntoskrnl.exe:22b5a (./ntoskrnl/io/device.c:91 (IopInitializeDevice))> <ntoskrnl.exe:2b8c6 (./ntoskrnl/io/driver.c:2027 (NtLoadDriver))> <ntoskrnl.exe:652b7 (ntoskrnl/ke/i386/trap.s:306 (KiFastCallEntry))> <ntoskrnl.exe:820f9 (./ntoskrnl/io/driver.c:1398 (IopLoadDriver))> <ntoskrnl.exe:24bc6 (./ntoskrnl/io/driver.c:1469 (IopInitializeSystemDrivers))> <ntoskrnl.exe:836cc (./ntoskrnl/io/iomgr.c:434 (IoInit3))> <ntoskrnl.exe:8128c (./ntoskrnl/ex/init.c:668 (ExpInitializeExecutive))> <ntoskrnl.exe:4e75 (./ntoskrnl/ke/main.c:108 (KiSystemStartup))> <ntoskrnl.exe:7f53e (./ntoskrnl/ke/main.c:295 (_main))> <0>

1 0

Missing validation in MmMapViewOfSection
by Myria 04 May '06

04 May '06

If the ImageBase for a given executable is in the kernel range (above 0x7FFE1000 or whatever), from reading the code it seems like no validation will stop it from going above that address. I have no way to try it out because I don't have reactos installed. Interestingly, in Windows XP SP2, the only illegal ImageBase values are: 7C800000 - Causes a dialog box to appear during the ntdll process initialization APC saying that the program can't run because kernel32.dll was relocated. 7C900000 - Causes PspMapSystemDll to fail. As a result, the process is never created and NtCreateProcessEx returns an error. These errors occur even when /fixed:no is used. Every other address is allowed by Windows as long as /fixed:no is specified, even above the user-kernel barrier. Personally I think reactos should allow user mode programs to shove ntdll and kernel32 out of the way, but that's just me =) Finally, 04477 MmUnlockAddressSpace(AddressSpace); 04478 return(STATUS_UNSUCCESSFUL); and the one below it should return STATUS_CONFLICTING_ADDRESSES, determined by attempting to load an image based at a kernel address without a relocation section. MmCreatePeb has an invalid assertion: ASSERT(Peb == (PVOID)0x7FFDF000); If the process's .exe already is at that address, the PEB will be at the wrong address. There's also a nice way for a user-mode program to bugcheck the kernel or leak a small amount of information in MmCreatePeb: ImageConfigData = RtlImageDirectoryEntryToData(Peb->ImageBaseAddress, To crash the kernel, put a bogus load config directory entry pointer in your .exe. To read an arbitrary dword or two, set up the load config pointer such that it aims at your desired memory address, then read the PEB's OSCSDVersion and ImageProcessAffinityMask values once your process starts. Melissa

2 1

IsPowerOf2 is inefficient
by Myria 04 May '06

04 May '06

IsPowerOf2 in the kernel is badly inefficient. It should be this: __inline BOOLEAN IsPowerOf2(IN ULONG Number) { if (Number == 0) return FALSE; return (Number & (Number - 1)) == 0; } Not that this function is called frequently, shrug. Melissa

2 1

Re: [Freedce-devel] pthread_clear_exit_np()
by Luke Kenneth Casson Leighton 04 May '06

04 May '06

okay, so these are the options: 1) forget redhat and forget them ever being helpful and supporting strategically important free software projects, and go back to using dcethreads posix draft 4 "emulation". 2) forget redhat and forget them ever being helpful and supporting strategically important free software projects, and put the cancellation "wrapper" side back into the dcethreads library - just keep the same posix "final draft" API. lord only knows what would happen on pthreads-win32 when compiling freedce with mingw32, with the "wrapper" stuff back in, but i'd be fascinated to find out. 3) think of ways to persuade the developers of glibc to enter into reasonable conversations and dialog to help support a strategically important free software project. how does any other project manage this (and what in hell's name prompted ulrich to be so dismissive?) On Fri, Apr 21, 2006 at 05:26:44PM +0200, thomas.schuetzkowski(a)web.de wrote: > Hi Luke, > > > > To make this work with libc we need to "un-cancel" a thread. > > ... > > Of course, using this in a third-party application is problematic as it > > depends on internal glibc structures. > > > > I know the chances of such an API being added to glibc are about nil, but > > I thought I'd mention this anyway! :-) > > We thought about adding a detection of the glibc version to autoconf stuff and choose the right version of the function. (see Loic's patch) > Then of course someone has to maintain this for every new version of glibc. :-( > > This idea was skipped, because no one had the time to do this. > > regards, > Thomas > _______________________________________________________________ > SMS schreiben mit WEB.DE FreeMail - einfach, schnell und > kostenguenstig. Jetzt gleich testen! http://f.web.de/?mc=021192 > -- -- lkcl.net - mad free software computer person, visionary and poet. --

8 12

How does NTVDM allocate the zero page?
by Myria 04 May '06

04 May '06

How does NTVDM allocate memory at address 0 for the V86 IDT? Is it different in reactos vs. Windows? NtAllocateVirtualMemory won't allow that. Melissa

2 1

Log off Crash
by James Tabor 04 May '06

04 May '06

Hi! Running at revision 21793, is this bug known to anyone? Doesn't happen often. Thanks, James (dll/ntdll/ldr/utils.c:1193) LdrGetExportByName(): failed to find mxdMessage (dll/ntdll/ldr/utils.c:2018) Failed to create or open dll section of 'msacm.drv' (Status c0000135) (dll/ntdll/ldr/utils.c:2018) Failed to create or open dll section of 'midimap.drv' (Status c0000135) (./subsystems/win32/win32k/objects/gdiobj.c:600) Attempted to free global gdi handle 0xe0500c1, caller needs to get ownership first!!! (./subsystems/win32/win32k/objects/gdiobj.c:600) Attempted to free global gdi handle 0x3e050301, caller needs to get ownership first!!! (lib/rtl/exception.c:75) RtlRaiseStatus(Status 0xc0000005) (./subsystems/win32/win32k/ntuser/message.c:1109) Failed to copy message to kernel: invalid usermode buffer (dll/win32/shell32/dialogs.c:420) LogoffWindowsDialog is UNIMPLEMENTED (./subsystems/win32/win32k/ntuser/window.c:648) thread cleanup: while destroy wnds, wnd=0x9e1bedac (./subsystems/win32/win32k/ntuser/window.c:648) thread cleanup: while destroy wnds, wnd=0x9e1bee9c (./subsystems/win32/win32k/ntuser/window.c:648) thread cleanup: while destroy wnds, wnd=0x9e1bef94 (./subsystems/win32/win32k/ntuser/window.c:648) thread cleanup: while destroy wnds, wnd=0x9e1bf08c (./subsystems/win32/win32k/ntuser/window.c:648) thread cleanup: while destroy wnds, wnd=0x9e1bf914 (./subsystems/win32/win32k/ntuser/window.c:648) thread cleanup: while destroy wnds, wnd=0x9e1bfb0c (./subsystems/win32/win32k/ntuser/window.c:648) thread cleanup: while destroy wnds, wnd=0x9e1c00ec (./subsystems/win32/win32k/objects/gdiobj.c:805) Attempted to lock object 0x80063 that is deleted! KeBugCheckWithTf at ntoskrnl/ke/i386/exp.c:1241 A problem has been detected and ReactOS has been shut down to prevent damage to your computer. The problem seems to be caused by the following file: ntoskrnl.exe Technical information: *** STOP: 0x0000001E (0xc0000005,0x80067d3a,0x00000000,0xfffffffc) *** ntoskrnl.exe - Address 0x80067d3a base at 0x80000000, DateStamp 0x0 Page Fault Exception: 14(2) Processor: 0 CS:EIP 8:80067d3a <ntoskrnl.exe:67d3a (ntoskrnl/ex/i386/fastinterlck_asm.S:580 (InterlockedDecrement))> cr2 fffffffc cr3 3cb2e000 Proc: 813df968 Pid: 70 <csrss.exe> Thrd: 817b0158 Tid: a4 DS 23 ES 23 FS 30 GS 0 EAX: ffffffff EBX: 00000001 ECX: fffffffc EDX: 00000001 EBP: 9ed9ebb4 ESI: 8d6d8328 ESP: 9ed9eb3c EDI: 00000003 EFLAGS: 00010297 kESP 9ed9eb3c kernel stack base 9ed99000 Frames: <win32k.sys:3dd22 (./subsystems/win32/win32k/eng/xlate.c:280 (IntEngCreateXlate))> <win32k.sys:71df3 (./subsystems/win32/win32k/objects/brush.c:64 (IntGdiCreateBrushXlate))> <win32k.sys:8bec8 (./subsystems/win32/win32k/objects/dc.c:2126 (NtGdiSelectObject))> <win32k.sys:8c1a1 (./subsystems/win32/win32k/objects/dc.c:2327 (DC_InitDC))> <win32k.sys:8ca37 (./subsystems/win32/win32k/objects/dc.c:923 (IntGdiCreateDC))> <win32k.sys:4ff56 (./subsystems/win32/win32k/ntuser/windc.c:121 (DceAllocDCE))> <win32k.sys:54678 (./subsystems/win32/win32k/ntuser/windc.c:441 (UserGetDCEx))> <win32k.sys:6498f (./subsystems/win32/win32k/ntuser/painting.c:770 (NtUserBeginPaint))> <ntoskrnl.exe:652b7 (ntoskrnl/ke/i386/trap.s:306 (KiFastCallEntry))> <win32csr.dll:5779 (subsystems/win32/csrss/win32csr/desktopbg.c:57 (DtbgWindowProc))>

1 0

[ros-diffs] [janderwald] 21793: implement notepad view status bar - TODO: update caret position on arrow key/mouse scroll events
by James Tabor 03 May '06

03 May '06

Hi! --- trunk/reactos/base/applications/notepad/notepad.h (original) +++ trunk/reactos/base/applications/notepad/notepad.h Wed May 3 20:17:12 2006 @@ -5,7 +5,9 @@ #include <stdio.h> #include <windows.h> #include <commdlg.h> +#include <commctrl.h> #include <tchar.h> +#include <Richedit.h> #include "main.h" #include "dialog.h" [PCH] obj-i386/base/applications/notepad/notepad.h.gch base/applications/notepad/notepad.h:10:22: Richedit.h: No such file or directory make[1]: *** [obj-i386/base/applications/notepad/notepad.h.gch] Error 1 make[1]: Leaving directory `/home/ros/reactos' This patch breaks compile on a linux box! Please fix and remember!, This is a multi compiled platform operating system! So DoN't uSe CaSe! 8^D Thanks, James

1 0

[lukeh@padl.com: NPTL and FreeDCE]
by Luke Kenneth Casson Leighton 03 May '06

03 May '06

guys, hi, am on the mailing list (subscribed) but am not receiving posts: please cc me if this would be an issue. for win32, i am using pthreads-win32: will reactos be able to support the trick that luke howard is referring to? l. ----- Forwarded message from Luke Howard <lukeh(a)padl.com> ----- Envelope-to: lkcl@localhost Delivery-date: Mon, 24 Apr 2006 12:51:50 +0100 X-Original-To: lkcl(a)lkcl.net Resent-Date: 24 Apr 2006 10:22:43 -0000 From: Luke Howard <lukeh(a)padl.com> Organization: PADL Software Pty Ltd To: freedce-devel(a)lists.sourceforge.net Subject: NPTL and FreeDCE Cc: opendce(a)opengroup.org Reply-To: lukeh(a)padl.com Versions: dmail (bsd44) 2.6d/makemail 2.10 X-Spam-Status: NO, hits=-5.60 required=5.00 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on au.padl.com X-Spam-Flag: NO X-Spam-Level: Resent-Message-ID: <UQB5HC.A.7PG.ubKTEB@mailman> Resent-To: opendce(a)opengroup.org Resent-From: opendce(a)opengroup.org X-Mailing-List: opendce:archive/latest/626 Resent-Sender: opendce-request(a)opengroup.org X-hands-com-MailScanner: Found to be clean X-MailScanner-From: opendce-request(a)opengroup.org Resent-Date: Mon, 24 Apr 2006 12:51:50 +0100 It may be possible to integrate DCE exception handling and NPTL so that longjmp() is never explicitly called from a cancellation cleanup handler. In fact, cleanup handlers need not be used at all. This approach requires the NPTL r ather than the LinuxThreads, API and is orthogonal to the previous issue about removing thread cancellation (that was a runtime issue present with NPTL regardless of which header one compiles against). Instead of calling _pthread_cleanup_push_defer(), we can store a __pthread_unwind_buf_t in the exception context and call __sigsetjmp() and __pthread_register_cancel_defer(). If __sigsetjmp() returns from a longjmp(), then we call dce_pthread_test_exit_np() to test whether the thread was cancelled, and set the current exception to pthread_cancel_e if necessary. No cleanup handler is necessary. The trick is that the code that raises an exception needs to call the internal API __pthread_unwind(), rather than longjmp(). Of course this ends up calling longjmp() anyway but hopefully does the right thing with respect to any other cleanup handlers that are registered. Another idea is to use the _Unwind_XXX API, but this strikes me as a little ambitious for now and I don't have any desire to interleave C++ and DCE exceptions. /* * For the NPTL API we share a setjmp/longjmp buffer between the * pthreads cancellation and DCE exception handling APIs. * * Note that we never actually call the cancellation function, we * just change the current exception context directly; this is the * same as calling dce_ptdexc_raise(&pthread_cancel_e) except that * __pthread_unwind() is not called. */ #define dce_exc_cleanup_push(cu, routine, arg) do \ { \ __exc_occured = __sigsetjmp((struct __jmp_buf_tag *)(cu)->__cancel_buf.__cancel_jmp_buf, 0); \ if (__exc_occured) \ { \ void *__status; \ \ if (dce_pthread_test_exit_np(&__status) == PTHREAD_STATUS_EXIT_NP \ && __status == PTHREAD_CANCELED) \ __exc_ctxt.exc = &pthread_cancel_e; \ } \ else \ { \ __pthread_register_cancel_defer(&(cu)->__cancel_buf); \ } \ } while (0) #define dce_exc_cleanup_pop(cu, execute) do \ { \ __pthread_unregister_cancel_restore(&(cu)->__cancel_buf); \ } while (0) /* make this a NOOP because we called it above */ #define dce_exc_setjmp(jmpbuf, val) /* we call __pthread_unwind() directly from dce_ptdexc_raise() */ #undef dce_exc_longjmp -- Luke -- ----- End forwarded message ----- -- -- lkcl.net - mad free software computer person, visionary and poet. --

5 6

Re: [ros-bugs] [Bug 1185] OOo2 fails to install with an msi error.
by Magnus Olsen 02 May '06

02 May '06

This bug is on our side we can not test oo2 installer current in trunk. lest last time I try 1-2 Month back. for Reactos was to unstable to confrim if this bug still exists or not. It should not exits any longer. ----- Original Message ----- From: <ReactOS.Bugzilla(a)reactos.org> To: <ros-bugs(a)reactos.org> Sent: Tuesday, May 02, 2006 5:43 PM Subject: [ros-bugs] [Bug 1185] OOo2 fails to install with an msi error. > http://www.reactos.org/bugzilla/show_bug.cgi?id=1185 > > > > > > ------- Comment #7 from w3seek(a)reactos.com 2006-05-02 17:43 CET ------- > What's the status on this bug? Has the missing feature been implemented in > WINE? > > > -- > Configure bugmail: http://www.reactos.org/bugzilla/userprefs.cgi?tab=email > ------- You are receiving this mail because: ------- > You are the QA contact for the bug, or are watching the QA contact. > You are the assignee for the bug, or are watching the assignee. > _______________________________________________ > Ros-bugs mailing list > Ros-bugs(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-bugs

1 0

Summer of Code
by Nate DeSimone 30 Apr '06

30 Apr '06

Hello Everyone, I've been lurking on this list for a few years and I'm considering applying for the Google Summer of Code 2006. I am a Computer Systems Engineer at Rensselaer Polytechnic Institute, just finishing up my junior year. My GPA is 3.06, and I have taken a good amount of computer science courses including Data Structures and Algorithms and Database Systems. I have programmed in C, C++, C#, VB, Perl, PHP, Java and Javascript before. I'm also familiar with Sybase and MySQL and HTML design. I have also done some Win32 programming on my spare time, you can look at some of my projects at: http://www.rpi.edu/~desimn <http://www.rpi.edu/%7Edesimn> I have never done kernel mode programming before and I'm not certain if I'm quite ready for it yet, so if possible I would like to stay in the user mode space. The enhance explorer and add "wow factor" sounds interesting to me. Is there anything else that would involve at least almost all user mode work? Also I was wondering, approximately how many hours would you expect me to put forth every week should I be accepted? Thank You, Nate DeSimone

2 1

need help debugging
by Peter Quiring 30 Apr '06

30 Apr '06

Hi all, I'm new to ROS but I've had a few patches accepted to Wine. I'm having difficulty with the website and I can't seem to login (even after enabling multisession) so I can't use bugzilla or the forums. So anyways, I've got ROS to compile (RosBE is great!)/build/install on two systems but I'm getting the following problems on one system (Dell Inspiron 5150 Laptop): During install it shows a 17592185991168 MB unused space partition after my 60 GB FAT32 partition. But install still works okay. During 1st boot I get a bsod, I don't have a COM port (USB only) so I tried to use the SCREEN output option but it's too fast to read. I've try to use the FILE option but only 600+ bytes are written to the debug.log file. I know the cache_manager isn't being flushed because everytime it crashes the contents of the folders in "Documents & settings" folder are corrupt (ie: "All Users.Reactos", etc.) So my question is : How can I disable the cache_manager? Or can I place sync() commands somewhere in the source for testing. (is there such a function available?). The bsod seems to be related to gdi issues during creating the primary surface. Somewhere the DeviceObject for the screen is NULL and is not caught till it causes a GPE much later. I'll give a little info that I've written down. /ntoskrnl/io/irp.c:570 - GPE /ntoskrnl/io/irp.c:911 /subsystems/win32/win32k/objects/dc.c:693 /subsystems/win32/win32k/ntuser/winsta.c:348 /subsystems/win32/win32k/ntuser/guicheck.c:57 /subsystems/win32/win32k/objects/dc.c:853 /subsystems/win32/win32k/ntuser/windc.c:121 /subsystems/win32/win32k/ntuser/windc.c:441 /subsystems/win32/win32k/ntuser/windc.c:529 /subsystems/win32/win32k/ntuser/windc.c:101 /ntoskrnl/ke/traps.c:306 /dll/win32/user32/windows/dialog.c:696 Hope this helps. I was using the lastest SVN at the time (21738 I think). Thanks. Peter Quiring

4 4

two new bugs in newer ROS
by theUser BL 29 Apr '06

29 Apr '06

Hi! There existing two bugs from which I know, which existing not in older SVN/CVS-Snapshot ROS versions. Windows Tetris don't show the Highscore correct. With build 21549 there was still all ok. But with 21639 and all above the Highscore shows only curios symbols as text. AbiWord no longer runs. On build 21323 still all runs correct. But with 21549 the complete ROS hangs up. It ends with "A problem has been detected and ReactOS has been shut down to prevent damage to your computer APC_INDEX_MISMATCH" And so on. Don't know if in the current CVS/SVN-Version the bugs are already fixed. But they existing for some days/weeks. Greatings theuserbl

2 1

RE: [ros-dev] RE: ncpa
by Murphy, Ged (Bolton) 28 Apr '06

28 Apr '06

Ge van Geldorp wrote: > > The status of the applet when I worked on it was that the UI > was complete > and I was starting to work on transfering the data from the > dialog to the > TCP/IP driver (via the DHCP client). That part simply isn't > implemented yet. Is there a particular reason you were doing this via the DHCP client and not just using functions provided by iphlpapi? Ged. ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

3 2

Oh, and then the ROS-Explorer bug with the Folder-Icons
by theUser BL 28 Apr '06

28 Apr '06

Oh, I have fogotten to mention, that there is also a bug in the ROS-Explorer, that the icon for folders is the same like that for files.

3 2

RE: [ros-dev] Re: Oh, and then the ROS-Explorer bug with the Fold er-Icons
by Murphy, Ged (Bolton) 28 Apr '06

28 Apr '06

There are still lots of little bugs in the explorer resources, but they will be ironed out as we go along. Ged. -----Original Message----- From: theUser BL [mailto:theuserbl@hotmail.com] Sent: 28 April 2006 13:28 To: ros-dev(a)reactos.org Subject: [ros-dev] Re: Oh, and then the ROS-Explorer bug with the Folder-Icons >What do you mean by "files" ? >If "files" refer to unknown type, Yes, that is what I mean. Thats when I go over "My Computer" in "C:\". Then all directories and unknown files looks like the same. >I can confirm they have different icons that folders in r21750. Oh, thanks for information. Then the bug was fixed. I will later at home first testing r21747, because I take my snapshots from http://svn.reactos.ru/iso/ and 21747 is the latest which is there published. But the snapshot from yesterday have had the still the problem, that the icons for directories is an empty letter. And thats the same icon like for unknown files. Greatings theuserbl _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-dev ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

1 0

Re: Oh, and then the ROS-Explorer bug with the Folder-Icons
by theUser BL 28 Apr '06

28 Apr '06

>What do you mean by "files" ? >If "files" refer to unknown type, Yes, that is what I mean. Thats when I go over "My Computer" in "C:\". Then all directories and unknown files looks like the same. >I can confirm they have different icons that folders in r21750. Oh, thanks for information. Then the bug was fixed. I will later at home first testing r21747, because I take my snapshots from http://svn.reactos.ru/iso/ and 21747 is the latest which is there published. But the snapshot from yesterday have had the still the problem, that the icons for directories is an empty letter. And thats the same icon like for unknown files. Greatings theuserbl

1 0

wineconf update....if your comming please check this
by Steven Edwards 27 Apr '06

27 Apr '06

>From Wine-devel and jwhite Jeremy White to wine-devel, wineconf More options 11:33 am (53 minutes ago) Hi folks, I am pleased to announce that Rob Shearman has arranged for us to have Wineconf in his home town, Reading, in the UK. It will be held at the University of Reading: http://www.fmd.rdg.ac.uk/res/CommercialAccommodation.asp It will be on the weekend of September 16 and 17. We have a wrinkle we need your help on. That is, as we make our deposit (which we need to do quickly), we have to tell them how many rooms we want to reserve. The have a good deal on rooms (40 pounds/night, which is quite good, afaict). The trick is that we have to pay for all the rooms we reserve ahead of time; we can't ask for 50 rooms and then only use 43. We have to pay for all 50. We may be able to ask for 50 rooms, and then get another 3 or 4, although that's not guaranteed. So, *if you want a room at Wineconf*, please fill in this form ASAP: http://www.winehq.org/site/wineconf/survey06 If you're not sure you'll make it, but think you might, we have a choice for that too <grin>. Act now or you'll be sleeping in Swindon... Cheers, Jeremy -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 0

RE: [ros-dev] need help debugging
by Murphy, Ged (Bolton) 27 Apr '06

27 Apr '06

Are you not able to use a VM? It' makes life much easier, and IMO, it's essential for development work. ROS does have one or two problems with real hardware at the moment, and it's hard to pinpoint without a debugger. If you can get a photo of the BSOD, it would help. -----Original Message----- From: Peter Quiring [mailto:pquiring@gmail.com] Sent: 26 April 2006 17:23 To: ros-dev(a)reactos.org Subject: [ros-dev] need help debugging Hi all, I'm new to ROS but I've had a few patches accepted to Wine. I'm having difficulty with the website and I can't seem to login (even after enabling multisession) so I can't use bugzilla or the forums. So anyways, I've got ROS to compile (RosBE is great!)/build/install on two systems but I'm getting the following problems on one system (Dell Inspiron 5150 Laptop): During install it shows a 17592185991168 MB unused space partition after my 60 GB FAT32 partition. But install still works okay. During 1st boot I get a bsod, I don't have a COM port (USB only) so I tried to use the SCREEN output option but it's too fast to read. I've try to use the FILE option but only 600+ bytes are written to the debug.log file. I know the cache_manager isn't being flushed because everytime it crashes the contents of the folders in "Documents & settings" folder are corrupt (ie: "All Users.Reactos", etc.) So my question is : How can I disable the cache_manager? Or can I place sync() commands somewhere in the source for testing. (is there such a function available?). The bsod seems to be related to gdi issues during creating the primary surface. Somewhere the DeviceObject for the screen is NULL and is not caught till it causes a GPE much later. I'll give a little info that I've written down. /ntoskrnl/io/irp.c:570 - GPE /ntoskrnl/io/irp.c:911 /subsystems/win32/win32k/objects/dc.c:693 /subsystems/win32/win32k/ntuser/winsta.c:348 /subsystems/win32/win32k/ntuser/guicheck.c:57 /subsystems/win32/win32k/objects/dc.c:853 /subsystems/win32/win32k/ntuser/windc.c:121 /subsystems/win32/win32k/ntuser/windc.c:441 /subsystems/win32/win32k/ntuser/windc.c:529 /subsystems/win32/win32k/ntuser/windc.c:101 /ntoskrnl/ke/traps.c:306 /dll/win32/user32/windows/dialog.c:696 Hope this helps. I was using the lastest SVN at the time (21738 I think). Thanks. Peter Quiring _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-dev ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

1 0

RE: [ros-dev] RE: ncpa
by Murphy, Ged (Bolton) 26 Apr '06

26 Apr '06

Ge van Geldorp wrote: > > > From: Murphy, Ged (Bolton) > > > > I was thinking along the lines of stopping the DHCP service > > and calling AddIPAddress, which should be the same as > > inserting the address manually in the registry. I haven't > > looked into this though, so might not work. > > I kind of like the Windows design: the DHCP client service is actually > implemented in dhcpcsvc.dll (you can see the "ServiceMain" > export). This > allows concentration of all usermode IP address/registry > stuff in one DLL. > AddIPAddress would then call into dhcpcsvc. Do you know how much work would be involved in moving our DHCP client into dhcpcsvc and implementing everything around this? If it's quite a lot of work it might be worth me trying out what I mentioned, just has a hack until we have time to do things the Windows way. If your ReactOS work is going to concentrate solely on the kernel now, we might be waiting a long time to get this implemented as nobody seems to want to pick ncpa up. It's become the ReactOS forbidden fruit ;) Any method would be good at this stage to get ncpa working, as it's our only missing feature for the 0.3 release. Ged. ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

2 1

RE: [ros-dev] RE: ncpa
by Murphy, Ged (Bolton) 26 Apr '06

26 Apr '06

Ge van Geldorp wrote: > > > From: Murphy, Ged (Bolton) > > > > Is there a particular reason you were doing this via the DHCP > > client and not just using functions provided by iphlpapi? > > I couldn't find iphlpapi functions to do this. But even if > they're there, > iphlpapi will need to inform the DHCP client about the change > to static IP > address (basically telling the DHCP client to shut up and go > to sleep). I was thinking along the lines of stopping the DHCP service and calling AddIPAddress, which should be the same as inserting the address manually in the registry. I haven't looked into this though, so might not work. (stopping the service would need a temporary hack, as it's not been converted to an NT service yet, plus we don't have StartService to restart it) Ged. ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

2 1

Non-fatal filesystem corruption?
by WaxDragon 26 Apr '06

26 Apr '06

After I had linux complain at me during a file copy onto a ReactOS partition, I checked it with dosfsck, and found all some issues. Since then I have been checking the partition I use for vmware after installs. dosfsck has been finding errors every time. I ran a quick regression test and it seems the was introduced between 0.2.8 and 0.2.9. It seems that most of these errors are non fatal, as myself and others have not noticed this causing any problems. Still, it bothers me, since it could be causing a problem somewhere. GreyGhost claimed Windows was not finding any issues with his ros partition, can anyone confirm? I'm using flat disk images under vmware and qemu, and I'm seeing this issue under both. I'm using both IDE and SCSI drives under vmware, and see the issues with both types. Anyone who is more famliar with filesystems care to comment? dosfsck of a 0.2.9(and HEAD) install: root@phoenix:/home/ford/public/virtuals/vmware/ReactOS# dosfsck -v /dev/loop0 dosfsck 2.10 (22 Sep 2003) dosfsck 2.10, 22 Sep 2003, FAT32, LFN Checking we can access the last sector of the filesystem Boot sector contents: System ID "MSWIN4.1" Media byte 0xf8 (hard disk) 512 bytes per logical sector 8192 bytes per cluster 1 reserved sector First FAT starts at byte 512 (sector 1) 2 FATs, 16 bit entries 102400 bytes per FAT (= 200 sectors) Root directory starts at byte 205312 (sector 401) 512 root directory entries Data area starts at byte 221696 (sector 433) 51125 data clusters (418816000 bytes) 63 sectors/track, 16 heads 63 hidden sectors 818433 sectors total /ReactOS/SYSTEM32/CONFIG/SYSTEM File size is 61440 bytes, cluster chain length is > 65536 bytes. Truncating file to 61440 bytes. /ReactOS/SYSTEM32/CONFIG/SOFTWARE File size is 122880 bytes, cluster chain length is > 122880 bytes. Truncating file to 122880 bytes. Checking for unused clusters. Leaving file system unchanged. /dev/loop0: 361 files, 6907/51125 clusters dosfsck of a 0.2.8 install: root@phoenix:/home/ford/public/virtuals/vmware/ReactOS# dosfsck -v /dev/loop0 dosfsck 2.10 (22 Sep 2003) dosfsck 2.10, 22 Sep 2003, FAT32, LFN Checking we can access the last sector of the filesystem Boot sector contents: System ID "MSWIN4.1" Media byte 0xf8 (hard disk) 512 bytes per logical sector 8192 bytes per cluster 1 reserved sector First FAT starts at byte 512 (sector 1) 2 FATs, 16 bit entries 102400 bytes per FAT (= 200 sectors) Root directory starts at byte 205312 (sector 401) 512 root directory entries Data area starts at byte 221696 (sector 433) 51125 data clusters (418816000 bytes) 63 sectors/track, 16 heads 63 hidden sectors 818433 sectors total Checking for unused clusters. /dev/loop0: 324 files, 5501/51125 clusters Here is a dosfsck of the scsi build disk I use under vmware, after a partial build: root@phoenix:/home/ford/public/virtuals/vmware/ReactOS# losetup -o 32256 /dev/loop0 build-scsi-flat.vmdk root@phoenix:/home/ford/public/virtuals/vmware/ReactOS# dosfsck -v /dev/loop0 dosfsck 2.10 (22 Sep 2003) dosfsck 2.10, 22 Sep 2003, FAT32, LFN Checking we can access the last sector of the filesystem Boot sector contents: System ID "MSWIN4.1" Media byte 0xf8 (hard disk) 512 bytes per logical sector 4096 bytes per cluster 32 reserved sectors First FAT starts at byte 16384 (sector 32) 2 FATs, 32 bit entries 4185088 bytes per FAT (= 8174 sectors) Root directory start at cluster 2 (arbitrary size) Data area starts at byte 8386560 (sector 16380) 1046185 data clusters (4285173760 bytes) 63 sectors/track, 255 heads 63 hidden sectors 8385867 sectors total /REACTOS/makefile.auto File size is 2274845 bytes, cluster chain length is > 2277376 bytes. Truncating file to 2274845 bytes. /REACTOS/MEDIA/FONTS/COUR.TTF File size is 144456 bytes, cluster chain length is > 147456 bytes. Truncating file to 144456 bytes. /REACTOS/MEDIA/FONTS/.svn/text-base/cour.ttf.svn-base File size is 144456 bytes, cluster chain length is > 147456 bytes. Truncating file to 144456 bytes. /REACTOS/MEDIA/NLS/C_949.NLS File size is 196642 bytes, cluster chain length is > 200704 bytes. Truncating file to 196642 bytes. /REACTOS/MEDIA/NLS/C_932.NLS File size is 162850 bytes, cluster chain length is > 163840 bytes. Truncating file to 162850 bytes. /REACTOS/MEDIA/NLS/C_950.NLS File size is 196642 bytes, cluster chain length is > 200704 bytes. Truncating file to 196642 bytes. /REACTOS/MEDIA/NLS/C_936.NLS File size is 196642 bytes, cluster chain length is > 200704 bytes. Truncating file to 196642 bytes. /REACTOS/MEDIA/NLS/.svn/text-base/c_949.nls.svn-base File size is 196642 bytes, cluster chain length is > 200704 bytes. Truncating file to 196642 bytes. /REACTOS/MEDIA/NLS/.svn/text-base/c_932.nls.svn-base File size is 162850 bytes, cluster chain length is > 163840 bytes. Truncating file to 162850 bytes. /REACTOS/MEDIA/NLS/.svn/text-base/c_950.nls.svn-base File size is 196642 bytes, cluster chain length is > 200704 bytes. Truncating file to 196642 bytes. /REACTOS/MEDIA/NLS/.svn/text-base/c_936.nls.svn-base File size is 196642 bytes, cluster chain length is > 200704 bytes. Truncating file to 196642 bytes. /REACTOS/MEDIA/DRIVERS/ETC/SERVICES File size is 398472 bytes, cluster chain length is > 401408 bytes. Truncating file to 398472 bytes. /REACTOS/MEDIA/DRIVERS/ETC/.svn/text-base/services.svn-base File size is 390238 bytes, cluster chain length is > 393216 bytes. Truncating file to 390238 bytes. /REACTOS/subsystems/WIN32/WIN32K/INCLUDE/NAPI.H File size is 34990 bytes, cluster chain length is > 36864 bytes. Truncating file to 34990 bytes. /REACTOS/subsystems/WIN32/WIN32K/DIB/DIB8GEN.C File size is 678744 bytes, cluster chain length is > 679936 bytes. Truncating file to 678744 bytes. /REACTOS/subsystems/WIN32/WIN32K/DIB/DIB16GEN.C File size is 527182 bytes, cluster chain length is > 528384 bytes. Truncating file to 527182 bytes. /REACTOS/subsystems/WIN32/WIN32K/DIB/DIB32GEN.C File size is 254584 bytes, cluster chain length is > 258048 bytes. Truncating file to 254584 bytes. /REACTOS/INCLUDE/DDRAW.H File size is 155097 bytes, cluster chain length is > 155648 bytes. Truncating file to 155097 bytes. /REACTOS/INCLUDE/STRMIF.H File size is 271851 bytes, cluster chain length is > 274432 bytes. Truncating file to 271851 bytes. /REACTOS/INCLUDE/WINUSER.H File size is 137624 bytes, cluster chain length is > 139264 bytes. Truncating file to 137624 bytes. /REACTOS/INCLUDE/.svn Has a large number of bad entries. (37/61) Drop directory ? (y/n) some more /REACTOS/LIB/3RDPARTY/LIBXML2/.svn/PROPS/ormation.s f Start cluster beyond limit (1952542496 > 1046186). Truncating file. /REACTOS/LIB/3RDPARTY/LIBXML2/.svn/PROPS/ormation.s f File size is 1634887024 bytes, cluster chain length is 0 bytes. Truncating file to 0 bytes. /REACTOS/LIB/3RDPARTY/LIBXML2/.svn/PROPS/FSCK0004.REN Start cluster beyond limit (1882144357 > 1046186). Truncating file. /REACTOS/LIB/3RDPARTY/LIBXML2/.svn/PROPS/FSCK0004.REN File size is 1751347823 bytes, cluster chain length is 0 bytes. Truncating file to 0 bytes. /REACTOS/LIB/3RDPARTY/LIBXML2/.svn/PROPS/FSCK0005.REN Start cluster beyond limit (1953394021 > 1046186). Truncating file. /REACTOS/LIB/3RDPARTY/LIBXML2/.svn/PROPS/FSCK0005.REN File size is 544830063 bytes, cluster chain length is 0 bytes. Truncating file to 0 bytes. /REACTOS/LIB/3RDPARTY/LIBXML2/.svn/PROPS/--noout.tes Directory has non-zero size. Fixing it. /REACTOS/LIB/3RDPARTY/LIBXML2/.svn/PROPS/--noout.tes Start cluster beyond limit (1852991008 > 1046186). Truncating file. /REACTOS/LIB/3RDPARTY/LIBXML2/.svn/PROPS/d to loa.d e Directory has non-zero size. Fixing it. /REACTOS/LIB/3RDPARTY/LIBXML2/.svn/PROPS/d to loa.d e Start cluster beyond limit (1953395746 > 1046186). Truncating file. /REACTOS/LIB/3RDPARTY/LIBXML2/WIN32/WINCE/LIBXML2.VCP File size is 150203 bytes, cluster chain length is > 151552 bytes. Truncating file to 150203 bytes. /REACTOS/LIB/3RDPARTY/LIBXML2/WIN32/WINCE/.svn/text-base/libxml2.vcp.svn-base File size is 144930 bytes, cluster chain length is > 147456 bytes. Truncating file to 144930 bytes. /REACTOS/NTOSKRNL/BUGCODES.RC File size is 12664 bytes, cluster chain length is > 16384 bytes. Truncating file to 12664 bytes. /REACTOS/NTOSKRNL/INCLUDE/INTERNAL/NAPI.H File size is 13786 bytes, cluster chain length is > 16384 bytes. Truncating file to 13786 bytes. /REACTOS/NTOSKRNL/MM/SECTION.C File size is 145682 bytes, cluster chain length is > 147456 bytes. Truncating file to 145682 bytes. /REACTOS/NTOSKRNL/MM/.svn/text-base/section.c.svn-base File size is 140762 bytes, cluster chain length is > 143360 bytes. Truncating file to 140762 bytes. /REACTOS/NTOSKRNL/EX/ZW.S File size is 42498 bytes, cluster chain length is > 45056 bytes. Truncating file to 42498 bytes. /REACTOS/DLL/DIRECTX/DPLAYX/DPLAY.C File size is 175774 bytes, cluster chain length is > 176128 bytes. Truncating file to 175774 bytes. /REACTOS/DLL/DIRECTX/DPLAYX/.svn/text-base/dplay.c.svn-base File size is 170323 bytes, cluster chain length is > 172032 bytes. Truncating file to 170323 bytes. WD -- ReactOS is a hub, follow the spokes and you'll immediately find absolutely everything you need to know about Windows. ReactOS is not just software, it's people. kjk_hyperion

2 1

Re: [Freedce-devel] pthread_clear_exit_np()
by Luke Kenneth Casson Leighton 26 Apr '06

26 Apr '06

christoph, christoph, why are you trying to insult someone who is looking to further the long-term aims and goals of free software, by putting people in touch on perceived unrelated projects and explaining to them the relevance? you have a specific area of expertise (according to your 2005 ukuug bio) - kernel development. i would welcome an opportunity for you to explain why my life, which happens to be quite poignantly sad and unfulfilling in many ways, has any relevance to the discussion at hand - and, also, if you could possibly elaborate on why i am "beeeing an asshole" likewise has any relevance. also: i would strongly advise you to consider objectively what i am trying to do - and forget what you do not know about me [you know nothing about me]. forget that i am involved in this discussion, because it is clearly affecting your (and evidently other people's) objective judgement. freedce is an important and under-recognised project that can save literally man-decades of development time currently being wasted by key free software projects, and lack of recognition for it is also stopping several interoperability projects from even _happening_. you want to know how many incompatible free software implementations there are of MSRPC around? i count FOUR, all written in c. EACH of those projects has had at least two full-time members working on them for AT LEAST three years, and each of those projects will require those full-time members to continue working on those incompatible and fundamentally non-interoperable development environments for another three to five years, to make them useful - as development environments, rather than to "fill one project's needs". [whereas, if one of the fat cat free software "supporting" companies would actually get off their backsides and fund freedce, it would save everybody several decades worth of money] you see - until such time as those non-interoperable MSRPC projects are completed, microsoft still dominates the market. MSRPC is the key infrastructure which binds everything together in the microsoft world: it's what the European Union is trying to get out of microsoft in the anti-trust case: information on how they use MSRPC; how they do their authentication; the IDL files; specifications on the nt domain services; etc. etc. you indicated in an earlier email that (please correct me if my impressions are wrong) that freedce is archaic and therefore irrelevant. nothing could be further from the truth, and your distaste for freedce is very short-sighted. mark, from ibm: you should be advocating to ibm's free software departments to back freedce and to KEEP the employees who worked on DCE 3.0 and move them to freedce and MSRPC interoperability. get some of that multi-hundred-million-dollar free software advertising budget and put a fractional percentage of it behind freedce. you don't have to _like_ freedce. you don't have to like its history. you don't have to like that it is me that is advocating its use. but don't you _dare_ insult me and think it doesn't have any effect. so. i look forward to receiving an apology from you - not for my benefit, but because it will mean that you are willing to demonstrate to the hundreds of people to whom your message has been distributed, and to the thousands of people who will encounter it in the future, that you can be trusted to make objective and important decisions. and that you don't deliberately go out of your way to belittle and bully other people. if you are unable to apologise, then you demonstrate, to me and to others, that you do not deserve any position of responsibility. am i making myself clear? l. On Tue, Apr 25, 2006 at 07:22:16PM +0200, Christoph Hellwig wrote: > luke, please get a life and stop beeing an asshole, thanks. > -- -- lkcl.net - mad free software computer person, visionary and poet. --

4 5

ReactOS Compatibility Database (beta status)
by Klemens Friedl 25 Apr '06

25 Apr '06

The ReactOS Compatibility Database has reached beta status. URL: http://www.reactos.org/support/ The compatibility database has been designed to store application and driver data. Simply click on one of the 5 green start buttons on the frontpage to begin to browse through the database. To submit an application/driver, click on "Submit Application" (menu bar). Please have a look at the help and faq section for more information. The goal of the whole compatibility database is to provide one single unified place where a lot of compatibility data can be found. This has several advantages: For user it is easy to find out which software does already work in ReactOS and how good it work. Everyone (with a myReactOS account) can submit applications/drivers, additional information, vendor data, compatbility test reports, screenshots and post "compatibility forum" entries. In the last few months, several people asked how they could help in the ReactOS project. Now there is a way for people who don't know programming languages, etc., they can now submit their testing results to one place, the compatibility database. Note, in the compatibility database there is a link to the bugzilla related page. >From now on it will be easier for developers to check regression data, etc. There might be some glitches and bugs, if you find some please post a bugzilla bug entry, write a forum entry or write a reply here (mailing list). If someone has suggestions and/or ideas how to improve the compatibility database please write a reply, thx. Klemens Friedl

3 3

Re: [Freedce-devel] pthread_clear_exit_np()
by Luke Kenneth Casson Leighton 25 Apr '06

25 Apr '06

On Mon, Apr 24, 2006 at 10:42:43AM -0500, Mark Brown wrote: > BTW: IBM stopped selling DCE/DFS years ago. The end of support > for the product is this month. yeh. there are universities (e.g. the authors of eLion) now hunting around to find ways to keep their systems going. ah well.

1 0

Re: [ros-bugs] [Bug 1431] New: Regression of setup
by James Tabor 25 Apr '06

25 Apr '06

ReactOS.Bugzilla(a)reactos.org wrote: > http://www.reactos.org/bugzilla/show_bug.cgi?id=1431 > > Summary: Regression of setup > Product: ReactOS > Version: unspecified > Platform: VMWare 5 > OS/Version: ReactOS > Status: NEW > Severity: normal > Priority: P3 > Component: Win32 > AssignedTo: ros-bugs(a)reactos.org > ReportedBy: email1562000(a)yahoo.com > QAContact: ros-bugs(a)reactos.org > > > filezilla FTP server setup works properly in build 21454(apr-8-2006) but in > build 21725(apr-25-2006) all the drop down lists just show a series of squares > where text should be displayed. > > Could you post pics to the bug list? Thanks, James

1 0

Re: [Freedce-devel] pthread_clear_exit_np()
by Luke Kenneth Casson Leighton 21 Apr '06

21 Apr '06

On Fri, Apr 21, 2006 at 01:52:58PM -0700, Roland McGrath wrote: > Have you considered instead using standard features as specified in POSIX > since around 1996? dce predates the posix standards - that's why all dce projects, some of them multi-hundred-million-dollar projects by ibm, fujitsu, EDS etc - have had to use posix draft 4 threading. the opengroup developers had to make a decision: they couldn't wait around for a few years while the POSIX committee made up their minds. so all the companies who were running dce/rpc applications had to write POSIX Draft 4 threading libraries for their operating systems. ibm did it. sun microsystems did it. microsoft did it (Win32 threads) when they ported the BSD-compatible OSF/1.0 licensed DCE 1.1 reference implementation to win32, as the basis of MSRPC. > What's your plan for other POSIX systems, such as Solaris? forget solaris: sun microsystems can deal with solaris. linux is the innovation leader, now, not solaris. > If you don't want to cancel threads as cancellation is defined by POSIX, > then why use cancellation instead of another mechanism that matches your needs? [long answers first, short one at end] because, despite being an absolutely critical strategic project that could save key strategic free software projects who are _not_ using it about a man-decade of development effort _each_, there is absolutely zero recognition of this and therefore absolutely zero funding of the project. luke howard uses freedce for his XAD project, which is a (proprietary) Active Directory replacement that he released THREE YEARS ago (and the samba team _still_ haven't got an active directory server replacement yet). XAD is capable of running on IBM z390 mainframes, and luke howard has won business awards for his work. because, as it is "old" code, with a very archaic and interesting development history, it needs work to be brought up-to-date. and because it needs work, and _because_ it is so very comprehensive in what it does, people misunderstand and do not appreciate its complexity, and therefore think, "i can do better than this", and fail miserably, and so it gets ignored. the gist is this: the use of cancellation is embedded very deeply into the design of this code. and there isn't anyone with the time, money, resources or immediately-available knowledge to rip a quarter of a million lines of code apart looking for a way to shoe-horn some very complex and subtle interaction _out_ of freedce so that it fits nicely with POSIX. anyone think i should try to put the "emulation" bit back into dcethreads (to re-wrap the cancellation rules of posix draft 4 but to keep the new API) and write redhat off (just like charles advised right at the beginning of this thread), let me know. l.

1 0

RE: [ros-bugs] [Bug 1300] More deflaut icons for different file t ypes
by Murphy, Ged (Bolton) 20 Apr '06

20 Apr '06

> http://www.reactos.org/bugzilla/show_bug.cgi?id=1300 > > > greatlord(a)reactos.com changed: > > What |Removed |Added > -------------------------------------------------------------- > -------------- > Status|REOPENED |RESOLVED > Resolution| |INVALID > > > > > ------- Additional Comments From greatlord(a)reactos.com > 2006-04-20 16:45 CET ------- > This is not a vaild bug report, each program is response for > the icon for the > file format > Sorry to reply directly to this, but I don't have web access at the moment. The above is not true. Some default file icons are controled by the operating system, like .txt, .jpg, or .bmp for example. They can be over-ridden by 3rd party apps. This is a valid bug report. Ged. ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

1 0

Re: Race in rpc__cn_network_receiver()?
by Luke Kenneth Casson Leighton 20 Apr '06

20 Apr '06

On Thu, Apr 20, 2006 at 03:04:21PM +1000, Luke Howard wrote: luke, you are a star: thank you for helping out with this. just for people's information (in case it's not been mentioned here - i must admit i forgot to notify opendce(a)opengroup.org!) about 6-8 months ago i did a coding-spree on freedce, with a view to achieving two, maybe three, major things: 1) porting to win32 (if you use pthreads-win32) 2) using posix final draft (7?) threads not posix draft 4. 3) proving to the people on wine and reactos that they have a hell of a lot of work to do (measured in man-decades) by not using the open group's DCE/RPC reference implementation. here's the gotchas that i encountered, and had to give up: - udp worked, but tcp did not - reactos had some problems at the time with the code behind ipconfig.exe (NetTransportEnum i think it was) - pthreads-win32 was too strictly posix compliant (!) and there is a cancellation exception or something which makes it fail in the dcethreads exception library tests, where linux does not fail (!) maybe this is related to what lukeh is talking about. *shrug*. anyway, the upshot is that freedce/latest-cvs also doesn't work on TCP, and thank you so much people for helping track down why. it's only been ten years so far: hopefully some time within the next decade, freedce will be used for some real MSRPC-related free software projects. l > >In rpc__cn_network_receiver(), rpc__socket_close() is called without an > >exception handler in place. According to IEEE Std 1003.1 (2004), close() > >is a cancellation point, see: > > > >http://www.opengroup.org/onlinepubs/009695399/functions/xsh_chap02_09.html > > > >Given this, a receiver thread could receive a cancel whilst closing the > >socket, which will cause to entire program to abort. (We have seen this > >occur when the RPC server is under load.) > > > >A suggested fix is to move the call to rpc__socket_close() inside the > >TRY/CATCH_ALL block that removes any pending cancels. > > It seems like the real fix is to disable cancellation within > rpc__socket_close(), because in other places the OSF code appears to > assume that this is not a cancellation point. > > Ditto for open(), socket(), etc (but not I/O routines that may block). > > I should note that the Linux dcethreads library does actually disable > cancellation for these calls, however in our own DCE thread library > we opted not to override any system calls to avoid changing semantics > when used by non-DCE code. > > -- Luke > > -- > -- -- lkcl.net - mad free software computer person, visionary and poet. --

1 0

Re: [Qemu-devel] Reactos SVN + Kqemu fails
by WaxDragon 18 Apr '06

18 Apr '06

I just did some digging around, and this issue was introduced somewhere between 20902 and 20911. Alex was working on the kernel heavily at the time, and there are several intertwined commmits IIRC. I just tested 20902 with both kqemu (and -kernel-kqemu) and it installed fine, and ran as well as I remember it did. It was noticably faster. On 4/17/06, WaxDragon <waxdragon(a)gmail.com> wrote: > This bug has been around for a while. > > On 4/17/06, Víctor Córcoles López <vcorcoles25(a)hotmail.com> wrote: > > Reactos 0.3.0 SVN + kqemu fails as guest O.S. It fails in both systems, > > Linux host and Windows Host. Without kqemu the reactos 0.3.0 SVN runs with > > less bugs. > > > > In VMWARE host, this bug not apear. > > > > I Send a screenshot of failure. > > WD -- ReactOS is a hub, follow the spokes and you'll immediately find absolutely everything you need to know about Windows. ReactOS is not just software, it's people. kjk_hyperion

2 1

Re: [ros-diffs] [greatlrd] 21611: kjk_hyperion : "Breaking auditing lock for a temporary fix: allow ExEnterCriticalRegionAndAcquireFastMutexUnsafe and ExReleaseFastMutexUnsafeAndLeaveCriticalRegion to be called from any thread; fixes UserEnterShared, UserEnterExclusive and UserLeave in win32k"
by Alex Ionescu 18 Apr '06

18 Apr '06

greatlrd(a)svn.reactos.org wrote: > Author: greatlrd > Date: Sun Apr 16 20:04:28 2006 > New Revision: 21611 > > URL: http://svn.reactos.ru/svn/reactos?rev=21611&view=rev > Log: > kjk_hyperion : "Breaking auditing lock for a temporary fix: allow ExEnterCriticalRegionAndAcquireFastMutexUnsafe and ExReleaseFastMutexUnsafeAndLeaveCriticalRegion to be called from any thread; fixes UserEnterShared, UserEnterExclusive and UserLeave in win32k" > > Modified: > trunk/reactos/ntoskrnl/ex/fmutex.c > > Modified: trunk/reactos/ntoskrnl/ex/fmutex.c > URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/fmutex.c?rev=21… This fix is broken. The real problem is win32k, you should fix that instead. Best regards, Alex Ionescu

2 2

RE: [greatlrd] 21644: fix 16 to 16 soyrce dest why the hell does th 16bitmap surface calls into this
by Ge van Geldorp 17 Apr '06

17 Apr '06

> From: greatlrd(a)svn.reactos.org > > Log: > fix 16 to 16 soyrce dest why the hell does th 16bitmap surface calls > into this The "16 -> 16 copy" in the DPRINT1 is a copy/paste mistake, it should read "24 -> 24 copy". Your fix is incorrect. What needs to be done in this case is process one pixel at a time, calling XLATEOBJ_iXlate on each one. GvG

2 1

gdb question
by Saveliy Tretiakov 17 Apr '06

17 Apr '06

Hi. I'm trying to debug ros with gdb (according to GvG's tutorial) and I have a problem. After I attach gdb, reactos boots into desktop and then freezes with endless sigservs. Mouse cursor is not moving. Any ideas? (gdb) target remote localhost:567 Remote debugging using localhost:567 0x800a8297 in ?? () (gdb) continue Continuing. *** Now ros boots into desktop. *** Program received signal SIGSEGV, Segmentation fault. 0x0040aa12 in ?? () (gdb) continue Continuing. Can't send signals to this remote system. SIGSEGV not sent. Program received signal SIGSEGV, Segmentation fault. 0x0040aa12 in ?? () (gdb) continue Continuing. Can't send signals to this remote system. SIGSEGV not sent. Program received signal SIGSEGV, Segmentation fault. 0x0040aa12 in ?? () ......

2 1

compiler error
by Reuben Perelman 17 Apr '06

17 Apr '06

> [CC] dll/win32/wininet/cookie.c > [CC] dll/win32/wininet/dialogs.c > [CC] dll/win32/wininet/ftp.c > [CC] dll/win32/wininet/gopher.c > [CC] dll/win32/wininet/http.c > dll/win32/wininet/http.c:62:23: inet_ntop.c: No such file or directory > dll/win32/wininet/http.c: In function `HTTP_HttpOpenRequestW': > dll/win32/wininet/http.c:1154: warning: implicit declaration of > function `inet_ntop' > make: *** [obj-i386/dll/win32/wininet/http.o] Error 1 It looks like it's trying to include a file that doesn't exist. Maybe somebody forgot to run "svn add inet_ntop.c" before they committed their changes?

3 3

FW: React OS
by Ge van Geldorp 15 Apr '06

15 Apr '06

> From: Gunnar Modin <gunnar.modin(a)telia.com> > Sent: Saturday, April 15, 2006 21:31 > To: ros-dev-owner(a)reactos.org > Subject: React OS > > I just woder if there is any way I can perticipate in the > development of the OS. > > I have an masterthesis to do on my education at the Mid > Sweden university. > The project shell due for about four mounth on full time. The > plan is to do it on half time the coming winter. > > The topics that I have studied are Distributed Systems and > Networkning. > I have jused both C++ and Java as programming laguage. I also > did an projekt in Distrubuted system regarding XML and acess. > In Networking I studied IPv6 in more detail. > > Best regards > > Gunnar Modin >

2 1

Cache manager rewrite branch
by Maarten Bosma 15 Apr '06

15 Apr '06

Hi, I'd like to give you a little report on the status of the cache manager rewrite branch. Since Filip and Hartmut are gone no one worked on it, though the actual functionality is already completed since the first commit in February 2005 and the code just needs to debugged. So decided to give it a try and merged the changes from trunk in there. I had to recreated the branch, from the last unlocked revision because of all the directory movements and tortoise merge having problems with them. I also did some debugging work on it. I have stored my results in the bugzilla bugs 942, 1360 and 1362. These are the only bugs I know of which hinder the branch from being merged to trunk. I am going on holiday tomorrow, so it would be nice if anyone else could continue working on fixing them. You can also help testing because we should do a lot of testing before merging. Especially file IO intensive applications, like installers need testing. Also the ext2fs branch, Microsoft's ntfs.sys and Vmware tools could work. But I haven't tested any of them. I will provide a patch to trunk so you do not have to check out or switch to the branch which is quite annoying, because all the locked entries are checked out again. Hopefully the new cache manager will be in place when I am back. Best Regards Maarten Bosma

2 4

[ros-diffs] [gedmurphy] 21550: revert comctl32 Wine sync. There are some issues with it and I don't have time to fix it at the moment.
by James Tabor 11 Apr '06

11 Apr '06

Hi! URL: http://svn.reactos.ru/svn/reactos?rev=21550&view=rev Log: revert comctl32 Wine sync. There are some issues with it and I don't have time to fix it at the moment. Tonight, I will have time to check and see what we need to make this work. Thanks, James

3 2

Re: [ros-bugs] [Bug 1358] Metabug for w3seek's patches
by James Tabor 11 Apr '06

11 Apr '06

ReactOS.Bugzilla(a)reactos.org wrote: > http://www.reactos.org/bugzilla/show_bug.cgi?id=1358 > > > tomasgroth(a)yahoo.dk changed: > > What |Removed |Added > ---------------------------------------------------------------------------- > BugsThisDependsOn|1342 | > > > > Hi! What is the status of these bugs? Have all of them been added to the tree yet? Thanks, James

2 2

Re: [ros-bugs] [Bug 1363] NdisWriteConfiguration has a bug when writing integers.
by Jerry 10 Apr '06

10 Apr '06

I complied and tested this patch on Qemu, and it seems to work. Any comments? ReactOS.Bugzilla(a)reactos.org wrote: > http://www.reactos.org/bugzilla/show_bug.cgi?id=1363 > > > crashfourit(a)gmail.com changed: > > What |Removed |Added > ---------------------------------------------------------------------------- > Attachment #718 is|0 |1 > obsolete| | > > > > > ------- Additional Comments From crashfourit(a)gmail.com 2006-04-09 23:33 CET ------- > Created an attachment (id=731) > --> (http://www.reactos.org/bugzilla/attachment.cgi?id=731&action=view) > NdisWriteConfiguration write integer bug fix. (v. 2) > > >

2 1

RE: [ros-dev] ncpa
by Murphy, Ged (Bolton) 07 Apr '06

07 Apr '06

Aleksey Bragin wrote: > 'I read this code and it looked clean to me' line means that > the commiter > read the code, and assures all or some parts of the following: > 1. The code doesn't match any reverse-engineered rules (as on > wiki page regarding Audit) > 2. The code is publically documented > 3. The code has nothing to do with reverse engineering (has either > completely different implementation from the windows one - > example freeldr > vs. ntldr/osloader, or doesn't have any counterpart in > windows at all). Then why not describe it using one of the above reasons? A note such as 'This code uses MSDN documented functions only' is clear and useful. A note saying 'I read this code and it looked clean to me' isn't and could mean anything. > > It gives a good base point for us to start our defence from. > We are not under attack. We are just doing some preventive measures. I know. I said 'if the cleanliness of the code is ever questioned again'. If that does happen, it could be in the form of an attack from an outside company. Having a better analysis as to why something was unlocked would be advantageous if this situation ever arose. > > This was all decided when we originally locked the code, > > but no one has been following it. > arty, w3seek, me have been following this rules on the > possibly dirty code, so please don't speak for everyone. I don't mean the auditing methods, I mean the lack of useful message. I'm not accusing or judging anyone, I'm just trying to get a better unlocking system in place. As the code we audit gets closer to the border line of clean and dirty, we're gonna need to ensure we don't leave messages like 'yep, looks ok to me' I hope mail this isn't coming across to anyone as argumentative. It's difficult to have a conversation over email without it sounding hostile. It isn't meant that way :) Ged. ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

1 0

RE: [ros-dev] ncpa
by Murphy, Ged (Bolton) 07 Apr '06

07 Apr '06

If the author has been contacted, it should be noted in the commit log. That alone is enough reason to squash any doubts anyone had. The authors word is always trusted. If the author couldn't be contacted, then the code should go through the audit procedure Art put forward. Whichever part of that procedure was passed should be noted in the commit log. Even if it's just something as simple as 'this code uses is fully documented on XYZ: http://..' Doing things this way ensures we can look back at the code if the cleanliness of the reversing methods is ever questioned again. It gives a good base point for us to start our defence from. This was all decided when we originally locked the code, but no one has been following it. Thus we have terms like 'I read this code and it looked clean to me'. IMO, that isn't worth anything. I could read parts of the kernel and it appear to be clean to me. Contacting Alex or correctly auditing the code would prove otherwise. In light of this, I think some of the audit measures we went to were a bit of an over reaction. Perhaps we should have only decided to audit kernel mode code, or subsections of it. However we choose to do everything and I'm a firm believer in the phrase 'If you going to do something, do it right' Ged. -----Original Message----- From: Saveliy Tretiakov [mailto:saveliyt@mail.ru] Sent: 07 April 2006 13:52 To: ReactOS Development List Subject: Re: [ros-dev] ncpa I always contact authors when it is possible. Some authors have left project years ago and are unreachable. Murphy, Ged (Bolton) wrote: >The authors of the code should always be contacted before unlocking unless >the app it produces isn't a part of Windows. > >Not doing so undermines the audit process and commit lines like 'I looked at >this code and it appears clean' is doing just that. > >Ged. > >-----Original Message----- >From: Saveliy Tretiakov [mailto:saveliyt@mail.ru] >Sent: 07 April 2006 13:11 >To: ReactOS Development List >Subject: Re: [ros-dev] ncpa > > >Do we need to audit ncpa? > >_______________________________________________ >Ros-dev mailing list >Ros-dev(a)reactos.org >http://www.reactos.org/mailman/listinfo/ros-dev >************************************************************************ >The information contained in this message or any of its >attachments is confidential and is intended for the exclusive >use of the addressee. The information may also be legally >privileged. The views expressed may not be company policy, >but the personal views of the originator. If you are not the >addressee, any disclosure, reproduction, distribution or other >dissemination or use of this communication is strictly prohibited. >If you have received this message in error, please contact >postmaster(a)exideuk.co.uk ><mailto:postmaster@exideuk.co.uk> and then delete this message. > >Exide Technologies is an industrial and transportation battery >producer and recycler with operations in 89 countries. >Further information can be found at www.exide.com > > >_______________________________________________ >Ros-dev mailing list >Ros-dev(a)reactos.org >http://www.reactos.org/mailman/listinfo/ros-dev > > > > _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-dev ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

2 1

RE: [ros-dev] ncpa
by Murphy, Ged (Bolton) 07 Apr '06

07 Apr '06

The authors of the code should always be contacted before unlocking unless the app it produces isn't a part of Windows. Not doing so undermines the audit process and commit lines like 'I looked at this code and it appears clean' is doing just that. Ged. -----Original Message----- From: Saveliy Tretiakov [mailto:saveliyt@mail.ru] Sent: 07 April 2006 13:11 To: ReactOS Development List Subject: Re: [ros-dev] ncpa Do we need to audit ncpa? _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-dev ************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster(a)exideuk.co.uk <mailto:postmaster@exideuk.co.uk> and then delete this message. Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com

2 1

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev