Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[tretiakov] 23138: Add missing return value checks. Finally fix bug #1526

by tretiakov＠svn.reactos.org

Author: tretiakov Date: Tue Jul 18 16:19:07 2006 New Revision: 23138 URL: http://svn.reactos.org/svn/reactos?rev=23138&view=rev Log: Add missing return value checks. Finally fix bug #1526 Modified: trunk/reactos/base/services/eventlog/file.c Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c (original) +++ trunk/reactos/base/services/eventlog/file.c Tue Jul 18 16:19:07 2006 @@ -30,11 +30,15 @@ LogFile->Header.NextRecord = 1; LogFile->Header.Signature = LOGFILE_SIGNATURE; - WriteFile(LogFile->hFile, + if(!WriteFile(LogFile->hFile, &LogFile->Header, sizeof(FILE_HEADER), &dwWritten, - NULL); + NULL)) + { + DPRINT1("WriteFile failed:%d!\n", GetLastError()); + return FALSE; + } EofRec.Ones = 0x11111111; EofRec.Twos = 0x22222222; @@ -47,9 +51,21 @@ EofRec.StartOffset = LogFile->Header.FirstRecordOffset; EofRec.EndOffset = LogFile->Header.EofOffset; - WriteFile(LogFile->hFile, &EofRec, sizeof(EOF_RECORD), &dwWritten, NULL); - - FlushFileBuffers(LogFile->hFile); + if(!WriteFile(LogFile->hFile, + &EofRec, + sizeof(EOF_RECORD), + &dwWritten, + NULL)) + { + DPRINT1("WriteFile failed:%d!\n", GetLastError()); + return FALSE; + } + + if(!FlushFileBuffers(LogFile->hFile)) + { + DPRINT1("FlushFileBuffers failed:%d!\n", GetLastError()); + return FALSE; + } return TRUE; } @@ -62,11 +78,21 @@ PDWORD pdwRecSize2; PEVENTLOGRECORD RecBuf; - SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN); - ReadFile(LogFile->hFile, + if(SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN) == + INVALID_SET_FILE_POINTER) + { + DPRINT1("SetFilePointer failed! %d\n", GetLastError()); + return FALSE; + } + + if(!ReadFile(LogFile->hFile, &LogFile->Header, sizeof(FILE_HEADER), - &dwRead, NULL); + &dwRead, NULL)) + { + DPRINT1("ReadFile failed! %d\n", GetLastError()); + return FALSE; + } if(dwRead != sizeof(FILE_HEADER)) { @@ -103,21 +129,35 @@ 0, NULL, FILE_CURRENT); - - ReadFile(LogFile->hFile, + + if(dwFilePointer == INVALID_SET_FILE_POINTER) + { + DPRINT1("SetFilePointer failed! %d\n", GetLastError()); + return FALSE; + } + + if(!ReadFile(LogFile->hFile, &dwRecSize, sizeof(dwRecSize), &dwRead, - NULL); + NULL)) + { + DPRINT1("ReadFile failed! %d\n", GetLastError()); + return FALSE; + } if(dwRead != sizeof(dwRecSize)) break; - ReadFile(LogFile->hFile, + if(!ReadFile(LogFile->hFile, &dwRecSign, sizeof(dwRecSign), &dwRead, - NULL); + NULL)) + { + DPRINT1("ReadFile() failed! %d\n", GetLastError()); + return FALSE; + } if(dwRead != sizeof(dwRecSize)) break; @@ -129,13 +169,33 @@ break; } - SetFilePointer(LogFile->hFile, -((LONG)sizeof(DWORD)*2), NULL, FILE_CURRENT); + if(SetFilePointer(LogFile->hFile, + -((LONG)sizeof(DWORD)*2), + NULL, + FILE_CURRENT) == INVALID_SET_FILE_POINTER) + { + DPRINT1("SetFilePointer() failed! %d", GetLastError()); + return FALSE; + } + RecBuf = (PEVENTLOGRECORD) HeapAlloc(MyHeap, 0, dwRecSize); - ReadFile(LogFile->hFile, + + if(!RecBuf) + { + DPRINT1("Can't allocate heap!\n"); + return FALSE; + } + + if(!ReadFile(LogFile->hFile, RecBuf, dwRecSize, &dwRead, - NULL); + NULL)) + { + DPRINT1("ReadFile() failed! %d\n", GetLastError()); + HeapFree(MyHeap, 0, RecBuf); + return FALSE; + } if(dwRead != dwRecSize) { @@ -146,7 +206,7 @@ pdwRecSize2 = (PDWORD)(((PBYTE)RecBuf)+dwRecSize-4); if(*pdwRecSize2 != dwRecSize) { - DPRINT("EventLog: Invalid size2 of record %d (%x) in %s\n", + DPRINT1("Invalid size2 of record %d (%x) in %s\n", dwRecordsNumber, *pdwRecSize2, LogFile->LogName); @@ -158,6 +218,7 @@ if(!LogfAddOffsetInformation(LogFile, RecBuf->RecordNumber, dwFilePointer)) { + DPRINT1("LogfAddOffsetInformation() failed!\n"); HeapFree(MyHeap, 0, RecBuf); return FALSE; } @@ -168,13 +229,28 @@ LogFile->Header.NextRecord = dwRecordsNumber+1; LogFile->Header.OldestRecord = dwRecordsNumber ? 1 : 0; //FIXME - SetFilePointer(LogFile->hFile, 0, 0, FILE_CURRENT); - WriteFile(LogFile->hFile, + if(!SetFilePointer(LogFile->hFile, 0, NULL, FILE_CURRENT) == + INVALID_SET_FILE_POINTER) + { + DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); + return FALSE; + } + + if(!WriteFile(LogFile->hFile, &LogFile->Header, sizeof(FILE_HEADER), &dwRead, - NULL); - FlushFileBuffers(LogFile->hFile); + NULL)) + { + DPRINT1("WriteFile failed! %d\n", GetLastError()); + return FALSE; + } + + if(!FlushFileBuffers(LogFile->hFile)) + { + DPRINT1("FlushFileBuffers failed! %d\n", GetLastError()); + return FALSE; + } return TRUE; } @@ -190,7 +266,7 @@ sizeof(LOGFILE)); if(!LogFile) { - DbgPrint("EventLog: Can't allocate heap\n"); + DPRINT1("Can't allocate heap!\n"); return NULL; } @@ -205,51 +281,43 @@ if(LogFile->hFile == INVALID_HANDLE_VALUE) { - DPRINT("Can't create file %S.\n", FileName); + DPRINT1("Can't create file %S.\n", FileName); HeapFree(MyHeap, 0, LogFile); return NULL; } - bCreateNew = GetLastError() == ERROR_ALREADY_EXISTS ? FALSE : TRUE; + bCreateNew = (GetLastError() == ERROR_ALREADY_EXISTS) ? FALSE : TRUE; LogFile->LogName = HeapAlloc(MyHeap, - HEAP_ZERO_MEMORY, - (lstrlenW(LogName)+1)*sizeof(WCHAR)); - if(LogFile->LogName) - lstrcpyW(LogFile->LogName, LogName); + HEAP_ZERO_MEMORY, + (lstrlenW(LogName)+1)*sizeof(WCHAR)); + + if(LogFile->LogName) lstrcpyW(LogFile->LogName, LogName); else { - DPRINT("EventLog: Can't allocate heap\n"); + DPRINT1("Can't allocate heap\n"); HeapFree(MyHeap, 0, LogFile); return NULL; } LogFile->FileName = HeapAlloc(MyHeap, - HEAP_ZERO_MEMORY, - (lstrlenW(FileName)+1)*sizeof(WCHAR)); - if(LogFile->FileName) - lstrcpyW(LogFile->FileName, FileName); + HEAP_ZERO_MEMORY, + (lstrlenW(FileName)+1)*sizeof(WCHAR)); + + if(LogFile->FileName) lstrcpyW(LogFile->FileName, FileName); else { - DPRINT("EventLog: Can't allocate heap\n"); - HeapFree(MyHeap, 0, LogFile->LogName); - HeapFree(MyHeap, 0, LogFile); - return NULL; - } - + DPRINT1("Can't allocate heap\n"); + goto fail; + } LogFile->OffsetInfo = (PEVENT_OFFSET_INFO) - HeapAlloc(MyHeap, - HEAP_ZERO_MEMORY, - sizeof(EVENT_OFFSET_INFO)*64); + HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, sizeof(EVENT_OFFSET_INFO)*64); if(!LogFile->OffsetInfo) { - DPRINT("EventLog: Can't allocate heap\n"); - HeapFree(MyHeap, 0, LogFile->FileName); - HeapFree(MyHeap, 0, LogFile->LogName); - HeapFree(MyHeap, 0, LogFile); - return NULL; + DPRINT1("Can't allocate heap\n"); + goto fail; } LogFile->OffsetInfoSize = 64; @@ -258,18 +326,21 @@ bResult = LogfInitializeNew(LogFile); else bResult = LogfInitializeExisting(LogFile); - if(!bResult) - { - HeapFree(MyHeap, 0, LogFile->OffsetInfo); - HeapFree(MyHeap, 0, LogFile->FileName); - HeapFree(MyHeap, 0, LogFile->LogName); - HeapFree(MyHeap, 0, LogFile); - return NULL; - } + if(!bResult) goto fail; InitializeCriticalSection(&LogFile->cs); LogfListAddItem(LogFile); return LogFile; + +fail: + if(LogFile) + { + if(LogFile->OffsetInfo) HeapFree(MyHeap, 0, LogFile->OffsetInfo); + if(LogFile->FileName) HeapFree(MyHeap, 0, LogFile->FileName); + if(LogFile->LogName) HeapFree(MyHeap, 0, LogFile->LogName); + HeapFree(MyHeap, 0, LogFile); + } + return NULL; } VOID LogfClose(PLOGFILE LogFile) @@ -445,8 +516,21 @@ return FALSE; } - SetFilePointer(LogFile->hFile, dwOffset, NULL, FILE_BEGIN); - ReadFile(LogFile->hFile, &dwRecSize, sizeof(DWORD), &dwRead, NULL); + if(SetFilePointer(LogFile->hFile, dwOffset, NULL, FILE_BEGIN) + == INVALID_SET_FILE_POINTER) + { + DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } + + if(!ReadFile(LogFile->hFile, &dwRecSize, sizeof(DWORD), &dwRead, NULL)) + { + DPRINT1("ReadFile() failed! %d\n", GetLastError()); + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } + if(dwRecSize > BufSize) { *BytesRead = 0; @@ -456,12 +540,23 @@ return FALSE; } - SetFilePointer(LogFile->hFile, + if(SetFilePointer(LogFile->hFile, -((LONG)sizeof(DWORD)), NULL, - FILE_CURRENT); - - ReadFile(LogFile->hFile, Buffer, dwRecSize, &dwRead, NULL); + FILE_CURRENT) == INVALID_SET_FILE_POINTER) + { + DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } + + if(!ReadFile(LogFile->hFile, Buffer, dwRecSize, &dwRead, NULL)) + { + DPRINT1("ReadFile() failed! %d\n", GetLastError()); + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } + dwBufferUsage+=dwRead; while(dwBufferUsage<BufSize) @@ -473,20 +568,43 @@ dwOffset = LogfOffsetByNumber(LogFile, dwRecNum); if(!dwOffset) break; - SetFilePointer(LogFile->hFile, dwOffset, NULL, FILE_BEGIN); - ReadFile(LogFile->hFile, &dwRecSize, sizeof(DWORD), &dwRead, NULL); + if(SetFilePointer(LogFile->hFile, dwOffset, NULL, FILE_BEGIN) + == INVALID_SET_FILE_POINTER) + { + DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } + + if(!ReadFile(LogFile->hFile, &dwRecSize, sizeof(DWORD), &dwRead, NULL)) + { + DPRINT1("ReadFile() failed! %d\n", GetLastError()); + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } + if(dwBufferUsage+dwRecSize>BufSize)break; - SetFilePointer(LogFile->hFile, + if(SetFilePointer(LogFile->hFile, -((LONG)sizeof(DWORD)), NULL, - FILE_CURRENT); - - ReadFile(LogFile->hFile, + FILE_CURRENT) == INVALID_SET_FILE_POINTER) + { + DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } + + if(!ReadFile(LogFile->hFile, Buffer+dwBufferUsage, dwRecSize, &dwRead, - NULL); + NULL)) + { + DPRINT1("ReadFile() failed! %d\n", GetLastError()); + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } dwBufferUsage+=dwRead; } @@ -503,7 +621,6 @@ DWORD dwWritten; SYSTEMTIME st; EOF_RECORD EofRec; - BOOL bResult; if(!Buffer) { @@ -515,11 +632,18 @@ EnterCriticalSection(&LogFile->cs); - SetFilePointer(LogFile->hFile, LogFile->Header.EofOffset, NULL, FILE_BEGIN); - WriteFile(LogFile->hFile, Buffer, BufSize, &dwWritten, NULL); - - if(BufSize != dwWritten) - { + if(SetFilePointer(LogFile->hFile, + LogFile->Header.EofOffset, + NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + { + DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } + + if(!WriteFile(LogFile->hFile, Buffer, BufSize, &dwWritten, NULL)) + { + DPRINT1("WriteFile() failed! %d\n", GetLastError()); LeaveCriticalSection(&LogFile->cs); return FALSE; } @@ -549,24 +673,41 @@ EofRec.StartOffset = LogFile->Header.FirstRecordOffset; EofRec.EndOffset = LogFile->Header.EofOffset; - WriteFile(LogFile->hFile, &EofRec, sizeof(EOF_RECORD), &dwWritten, NULL); - - SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN); - bResult = WriteFile(LogFile->hFile, + if(!WriteFile(LogFile->hFile, + &EofRec, + sizeof(EOF_RECORD), + &dwWritten, NULL)) + { + DPRINT1("WriteFile() failed! %d\n", GetLastError()); + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } + + if(SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN) + == INVALID_SET_FILE_POINTER) + { + DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } + + if(!WriteFile(LogFile->hFile, &LogFile->Header, sizeof(FILE_HEADER), &dwWritten, - NULL); - - if(!bResult) - { - DPRINT("WriteFile failed! LastError = %d\n", GetLastError()); + NULL)) + { + DPRINT1("WriteFile failed! LastError = %d\n", GetLastError()); LeaveCriticalSection(&LogFile->cs); return FALSE; } if(!FlushFileBuffers(LogFile->hFile)) - DPRINT("FlushFileBuffers() failed!\n"); + { + LeaveCriticalSection(&LogFile->cs); + DPRINT1("FlushFileBuffers() failed! %d\n", GetLastError()); + return FALSE; + } LeaveCriticalSection(&LogFile->cs); return TRUE; @@ -603,7 +744,7 @@ sizeof(EVENT_OFFSET_INFO)); if(!NewOffsetInfo) { - DbgPrint("EventLog: Can't reallocate heap.\n"); + DPRINT1("Can't reallocate heap.\n"); return FALSE; }

18 years, 2 months

[tretiakov] 23137: Testapps for NtUserDrawCaption. (I sent the patch to ros-dev for review)

by tretiakov＠svn.reactos.org

Author: tretiakov Date: Tue Jul 18 15:59:22 2006 New Revision: 23137 URL: http://svn.reactos.org/svn/reactos?rev=23137&view=rev Log: Testapps for NtUserDrawCaption. (I sent the patch to ros-dev for review) Added: trunk/reactos/base/applications/testsets/testsets.rbuild trunk/reactos/base/applications/testsets/user32/ trunk/reactos/base/applications/testsets/user32/drawcaption/ trunk/reactos/base/applications/testsets/user32/drawcaption/capicon.c trunk/reactos/base/applications/testsets/user32/drawcaption/capicon.rc trunk/reactos/base/applications/testsets/user32/drawcaption/drawcap.c trunk/reactos/base/applications/testsets/user32/drawcaption/drawcap.rc trunk/reactos/base/applications/testsets/user32/drawcaption/drawcaption.rbuild trunk/reactos/base/applications/testsets/user32/drawcaption/res/ trunk/reactos/base/applications/testsets/user32/drawcaption/res/icon1big.ico (with props) trunk/reactos/base/applications/testsets/user32/drawcaption/res/icon1sm.ico (with props) trunk/reactos/base/applications/testsets/user32/drawcaption/res/icon2big.ico (with props) trunk/reactos/base/applications/testsets/user32/drawcaption/res/icon2sm.ico (with props) trunk/reactos/base/applications/testsets/user32/drawcaption/resource.h trunk/reactos/base/applications/testsets/user32/user32.rbuild Added: trunk/reactos/base/applications/testsets/testsets.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/testsets.rbuild (added) +++ trunk/reactos/base/applications/testsets/testsets.rbuild Tue Jul 18 15:59:22 2006 @@ -1,0 +1,7 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<group> +<directory name="user32"> + <xi:include href="user32/user32.rbuild" /> +</directory> +</group> Added: trunk/reactos/base/applications/testsets/user32/drawcaption/capicon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/drawcaption/capicon.c (added) +++ trunk/reactos/base/applications/testsets/user32/drawcaption/capicon.c Tue Jul 18 15:59:22 2006 @@ -1,0 +1,145 @@ +/* + * Copyright 2006 Saveliy Tretiakov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include "windows.h" +#include "stdio.h" +#include "resource.h" + +WCHAR WndClass[] = L"capicon_class"; + +HINSTANCE hInst; +INT testnum = 0; + + +LRESULT CALLBACK WndProc(HWND hWnd, + UINT msg, + WPARAM wParam, + LPARAM lParam) +{ + HICON hIcon; + + switch (msg) + { + case WM_GETICON: + if(testnum>2) + { + if(wParam == ICON_SMALL) + hIcon = LoadIcon(hInst, MAKEINTRESOURCE(ID_ICON2SM)); + else if(wParam == ICON_BIG) + hIcon = LoadIcon(hInst, MAKEINTRESOURCE(ID_ICON2BIG)); + else hIcon = (HICON)1; + + if(!hIcon) + { + printf("LoadIcon() failed: %d\n", (INT)GetLastError()); + break; + } + + return (LRESULT)hIcon; + } + break; + + case WM_DESTROY: + PostQuitMessage(0); + return 0; + } + + return DefWindowProc(hWnd, msg, wParam, lParam); +} + + +INT main(INT argc, CHAR **argv) +{ + HWND hWnd; + MSG msg; + WNDCLASSEX wcx; + UINT result; + + if(argc<2) + { + printf("DrawCaption icon test.\n"); + printf("USAGE: drawcap.exe <testnumber>\n\n"); + printf("Available tests:\n" + "1. Class small icon\n" + "2. Class big icon\n" + "3. Class small icon + WM_GETICON\n" + "4. Class big icon + WM_GETICON\n" + "5. WM_GETICON only\n\n"); + return 0; + } + + testnum = atoi(argv[1]); + if(testnum < 1 || testnum > 5) + { + printf("Unknown test %d\n", testnum); + return 1; + } + + hInst = GetModuleHandle(NULL); + + memset(&wcx, 0, sizeof(wcx)); + wcx.cbSize = sizeof(wcx); + wcx.style = CS_HREDRAW | CS_VREDRAW; + wcx.lpfnWndProc = (WNDPROC) WndProc; + wcx.hInstance = hInst; + wcx.hbrBackground = (HBRUSH)COLOR_WINDOW; + wcx.lpszClassName = WndClass; + if(testnum<5)wcx.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(ID_ICON1BIG)); + if(testnum == 1 || testnum == 3) + wcx.hIconSm = LoadIcon(hInst, MAKEINTRESOURCE(ID_ICON1SM)); + + if(!(result = RegisterClassEx(&wcx))) + { + printf("Shit! RegisterClassEx failed: %d\n", + (int)GetLastError()); + return 1; + } + + hWnd = CreateWindowEx(0, + WndClass, + L"DrawCaption icon test", + WS_OVERLAPPED|WS_THICKFRAME|WS_SYSMENU, + CW_USEDEFAULT, + CW_USEDEFAULT, + 250, + 100, + NULL, + 0, + hInst, + NULL); + + if(!hWnd) + { + printf("Shit! Can't create wnd!\n"); + UnregisterClass(WndClass, hInst); + return 1; + } + + + ShowWindow(hWnd, SW_SHOW); + UpdateWindow(hWnd); + + while(GetMessage(&msg, NULL, 0, 0 )) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + UnregisterClass(WndClass, hInst); + return 0; +} Added: trunk/reactos/base/applications/testsets/user32/drawcaption/capicon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/drawcaption/capicon.rc (added) +++ trunk/reactos/base/applications/testsets/user32/drawcaption/capicon.rc Tue Jul 18 15:59:22 2006 @@ -1,0 +1,13 @@ +#include <windows.h> +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS DrawCaption icon test\0" +#define REACTOS_STR_INTERNAL_NAME "capicon\0" +#define REACTOS_STR_ORIGINAL_FILENAME "capicon.exe\0" +#include <reactos/version.rc> + +ID_ICON1BIG ICON res\icon1big.ico +ID_ICON1SM ICON res\icon1sm.ico +ID_ICON2BIG ICON res\icon2big.ico +ID_ICON2SM ICON res\icon2sm.ico + Added: trunk/reactos/base/applications/testsets/user32/drawcaption/drawcap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/drawcaption/drawcap.c (added) +++ trunk/reactos/base/applications/testsets/user32/drawcaption/drawcap.c Tue Jul 18 15:59:22 2006 @@ -1,0 +1,289 @@ +/* + * Copyright 2006 Saveliy Tretiakov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include "windows.h" +#include "resource.h" +#include "stdio.h" + +WCHAR CaptWndClass[] = L"captwnd_class"; + +HINSTANCE hInst; +INT testnum = 0; + +//BOOL STDCALL (*DrawCaptionTemp) ( +// HWND hwnd, +// HDC hdc, +// const RECT *rect, +// HFONT hFont, +// HICON hIcon, +// LPCWSTR str, +// UINT uFlags); + +VOID CapTest(HWND hWnd, + HDC hDc, + LPRECT pR, + WCHAR *Text, + DWORD Flags, + WCHAR *AddonStr, + DWORD Addon) +{ + WCHAR Buf[512]; + + lstrcpy(Buf, AddonStr); + if(lstrlen(Buf))lstrcat(Buf, L" | "); + lstrcat(Buf, Text); + + DrawText( hDc, Buf, lstrlen(Buf), pR, DT_LEFT ); + + pR->top+=20; + pR->bottom+=20; + + if(!DrawCaption(hWnd, hDc, pR, Flags | Addon)) + { + printf("PAINT: DrawCaption failed: %d\n", (int)GetLastError()); + } + + pR->top+=30; + pR->bottom+=30; +} + +VOID DrawCaptionTest(HWND hWnd, HDC hDc, WCHAR *AddonStr, DWORD Addon) +{ + RECT Rect; + GetClientRect(hWnd, &Rect); + Rect.bottom = 30; + Rect.left = 10; + Rect.right-=10; + Rect.top = 10; + + CapTest(hWnd, hDc, &Rect, L"DC_TEXT:", DC_TEXT, AddonStr, Addon); + + CapTest(hWnd, hDc, &Rect, + L"DC_TEXT | DC_ACTIVE:", + DC_TEXT | DC_ACTIVE, + AddonStr, Addon); + + CapTest(hWnd, hDc, &Rect, + L"DC_TEXT | DC_ICON:" , + DC_TEXT | DC_ICON, + AddonStr, Addon); + + CapTest(hWnd, hDc, &Rect, + L"DC_TEXT | DC_ACTIVE | DC_ICON:" , + DC_TEXT | DC_ACTIVE | DC_ICON, + AddonStr, Addon); + + CapTest(hWnd, hDc, &Rect, + L"DC_TEXT | DC_INBUTTON:" , + DC_TEXT | DC_INBUTTON, + AddonStr, Addon); + + CapTest(hWnd, hDc, &Rect, + L"DC_TEXT | DC_ACTIVE | DC_INBUTTON:" , + DC_TEXT | DC_ACTIVE | DC_INBUTTON, + AddonStr, Addon); + + CapTest(hWnd, hDc, &Rect, + L"DC_TEXT | DC_ICON | DC_INBUTTON:" , + DC_TEXT | DC_ICON | DC_INBUTTON, + AddonStr, Addon); + + CapTest(hWnd, hDc, &Rect, + L"DC_TEXT | DC_ACTIVE | DC_ICON | DC_INBUTTON:" , + DC_TEXT | DC_ACTIVE | DC_ICON | DC_INBUTTON, + AddonStr, Addon); + +} + +LRESULT CALLBACK CaptWndProc(HWND hWnd, + UINT msg, + WPARAM wParam, + LPARAM lParam) +{ + + + switch (msg) + { + + case WM_PAINT: + { + HDC hDc; + PAINTSTRUCT Ps; + + hDc = BeginPaint(hWnd, &Ps); + SetBkMode( hDc, TRANSPARENT ); + + switch(testnum) + { + case 1: + DrawCaptionTest(hWnd, hDc, L"", 0); + break; + case 2: + DrawCaptionTest(hWnd, hDc, L"DC_GRADIENT", DC_GRADIENT); + break; + case 3: + DrawCaptionTest(hWnd, hDc, L"DC_SMALLCAP", DC_SMALLCAP); + break; + case 4: + DrawCaptionTest(hWnd, hDc, L"DC_BUTTONS", DC_BUTTONS); + break; + case 5: + DrawCaptionTest(hWnd, hDc, + L"DC_GRADIENT | DC_SMALLCAP", + DC_GRADIENT | DC_SMALLCAP); + break; + case 6: + DrawCaptionTest(hWnd, hDc, + L"DC_GRADIENT | DC_BUTTONS", + DC_GRADIENT | DC_BUTTONS); + break; + case 7: + DrawCaptionTest(hWnd, hDc, + L"DC_BUTTONS | DC_SMALLCAP", + DC_BUTTONS | DC_SMALLCAP); + break; + case 8: + DrawCaptionTest(hWnd, hDc, + L"DC_BUTTONS | DC_SMALLCAP | DC_GRADIENT", + DC_BUTTONS | DC_SMALLCAP | DC_GRADIENT); + break; + } + + EndPaint(hWnd, &Ps); + + return 0; + } + + case WM_DESTROY: + { + PostQuitMessage(0); + return 0; + } + } + + return DefWindowProc(hWnd, msg, wParam, lParam); +} + + +INT main(INT argc, CHAR **argv) +{ + HWND hWnd; + MSG msg; + WNDCLASSEX wcx; + UINT result; + HBRUSH hBr; + //HMODULE hLib; + + if(argc<2) + { + printf("DrawCaption testcode.\n"); + printf("USAGE: drawcap.exe <testnumber> [useicon]\n\n"); + printf("Available tests:\n" + "1. DrawCaption test\n" + "2. DrawCaption test + DC_GRADIENT\n" + "3. DrawCaption test + DC_SMALLCAP\n" + "4. DrawCaption test + DC_BUTTONS\n" + "5. DrawCaption test + DC_GRADIENT | DC_SMALLCAP\n" + "6. DrawCaption test + DC_GRADIENT | DC_BUTTONS\n" + "7. DrawCaption test + DC_BUTTONS | DC_SMALLCAP\n" + "8. DrawCaption test + DC_BUTTONS | DC_SMALLCAP | DC_GRADIENT\n\n"); + return 0; + } + + testnum = atoi(argv[1]); + if(testnum < 1 || testnum > 8) + { + printf("Unknown test %d\n", testnum); + return 1; + } + + hInst = GetModuleHandle(NULL); + + //hLib = LoadLibrary(L"user32"); + //if(!hLib) + //{ + // printf("Shit! Can't load user32.dll\n"); + // return 1; + //} + + //DrawCaptionTemp = GetProcAddress(hLib, "DrawCaptionTempW"); + //if(!DrawCaptionTemp) + //{ + // printf("Shit! Can't get DrawCaptionTemp address\n"); + // return 1; + //} + + hBr = CreateSolidBrush(RGB(255, 255, 255)); + if(!hBr) + { + printf("Shit! Can't create brush."); + return 1; + } + + memset(&wcx, 0, sizeof(wcx)); + wcx.cbSize = sizeof(wcx); + wcx.style = CS_HREDRAW | CS_VREDRAW; + wcx.lpfnWndProc = (WNDPROC) CaptWndProc; + wcx.hInstance = hInst; + wcx.hbrBackground = hBr; + wcx.lpszClassName = CaptWndClass; + if(argc > 2) wcx.hIconSm = LoadIcon(hInst, MAKEINTRESOURCE(ID_ICON1SM)); + + if(!(result = RegisterClassEx(&wcx))) + { + printf("Shit! RegisterClassEx failed: %d\n", + (int)GetLastError()); + DeleteObject(hBr); + return 1; + } + + hWnd = CreateWindowEx(0, + CaptWndClass, + L"DrawCaption test", + WS_OVERLAPPED|WS_THICKFRAME|WS_SYSMENU, + CW_USEDEFAULT, + CW_USEDEFAULT, + 600, + 470, + NULL, + 0, + hInst, + NULL); + + if(!hWnd) + { + printf("Shit! Can't create wnd!\n"); + UnregisterClass(CaptWndClass, hInst); + DeleteObject(hBr); + return 1; + } + + + ShowWindow(hWnd, SW_SHOW); + UpdateWindow(hWnd); + + while(GetMessage(&msg, NULL, 0, 0 )) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + DeleteObject(hBr); + UnregisterClass(CaptWndClass, hInst); + return 0; +} Added: trunk/reactos/base/applications/testsets/user32/drawcaption/drawcap.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/drawcaption/drawcap.rc (added) +++ trunk/reactos/base/applications/testsets/user32/drawcaption/drawcap.rc Tue Jul 18 15:59:22 2006 @@ -1,0 +1,11 @@ +#include <windows.h> +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS DrawCaption test\0" +#define REACTOS_STR_INTERNAL_NAME "drawcap\0" +#define REACTOS_STR_ORIGINAL_FILENAME "drawcap.exe\0" +#include <reactos/version.rc> + +ID_ICON1SM ICON res\icon1sm.ico + + Added: trunk/reactos/base/applications/testsets/user32/drawcaption/drawcaption.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/drawcaption/drawcaption.rbuild (added) +++ trunk/reactos/base/applications/testsets/user32/drawcaption/drawcaption.rbuild Tue Jul 18 15:59:22 2006 @@ -1,0 +1,29 @@ +<module name="drawcap" type="win32cui" installbase="system32" installname="drawcap.exe"> + <include base="drawcap">.</include> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="_WIN32_IE">0x0500</define> + <define name="_WIN32_WINNT">0x0600</define> + <define name="WINVER">0x0600</define> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>drawcap.c</file> + <file>drawcap.rc</file> +</module> + +<module name="capicon" type="win32cui" installbase="system32" installname="capicon.exe"> + <include base="capicon">.</include> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="_WIN32_IE">0x0500</define> + <define name="_WIN32_WINNT">0x0600</define> + <define name="WINVER">0x0600</define> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>capicon.c</file> + <file>capicon.rc</file> +</module> Added: trunk/reactos/base/applications/testsets/user32/drawcaption/res/icon1big.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/testsets/user32/drawcaption/res/icon1big.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/testsets/user32/drawcaption/res/icon1sm.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/testsets/user32/drawcaption/res/icon1sm.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/testsets/user32/drawcaption/res/icon2big.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/testsets/user32/drawcaption/res/icon2big.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/testsets/user32/drawcaption/res/icon2sm.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/testsets/user32/drawcaption/res/icon2sm.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/testsets/user32/drawcaption/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/drawcaption/resource.h (added) +++ trunk/reactos/base/applications/testsets/user32/drawcaption/resource.h Tue Jul 18 15:59:22 2006 @@ -1,0 +1,10 @@ +#ifndef _CAPICON_RESOURCE_H +#define _CAPICON_RESOURCE_H + +#define ID_ICON1BIG 101 +#define ID_ICON1SM 102 +#define ID_ICON2BIG 103 +#define ID_ICON2SM 104 + + +#endif /* _CAPICON_RESOURCE_H */ Added: trunk/reactos/base/applications/testsets/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/user32.rbuild (added) +++ trunk/reactos/base/applications/testsets/user32/user32.rbuild Tue Jul 18 15:59:22 2006 @@ -1,0 +1,7 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<group> +<directory name="drawcaption"> + <xi:include href="drawcaption/drawcaption.rbuild" /> +</directory> +</group>

18 years, 2 months

[hpoussin] 23136: Correctly return information to caller

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Jul 18 15:55:40 2006 New Revision: 23136 URL: http://svn.reactos.org/svn/reactos?rev=23136&view=rev Log: Correctly return information to caller Modified: trunk/reactos/drivers/base/serial/devctrl.c Modified: trunk/reactos/drivers/base/serial/devctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/devctr… ============================================================================== --- trunk/reactos/drivers/base/serial/devctrl.c (original) +++ trunk/reactos/drivers/base/serial/devctrl.c Tue Jul 18 15:55:40 2006 @@ -349,6 +349,7 @@ { pConfigSize = (PULONG)BufferOut; *pConfigSize = 0; + Information = sizeof(ULONG); Status = STATUS_SUCCESS; } break; @@ -409,6 +410,7 @@ *pDtrRts |= SERIAL_DTR_STATE; if (DeviceExtension->MCR & SR_MCR_RTS) *pDtrRts |= SERIAL_RTS_STATE; + Information = sizeof(ULONG); Status = STATUS_SUCCESS; } break; @@ -445,6 +447,7 @@ { pMCR = (PULONG)BufferOut; *pMCR = DeviceExtension->MCR; + Information = sizeof(ULONG); Status = STATUS_SUCCESS; } break; @@ -459,6 +462,7 @@ { pMSR = (PULONG)BufferOut; *pMSR = DeviceExtension->MSR; + Information = sizeof(ULONG); Status = STATUS_SUCCESS; } break; @@ -500,8 +504,8 @@ { KeSynchronizeExecution(DeviceExtension->Interrupt, (PKSYNCHRONIZE_ROUTINE)SerialGetPerfStats, Irp); - Status = STATUS_SUCCESS; Information = sizeof(SERIALPERF_STATS); + Status = STATUS_SUCCESS; } break; } @@ -513,6 +517,7 @@ else { *(PSERIAL_TIMEOUTS)BufferOut = DeviceExtension->SerialTimeOuts; + Information = sizeof(SERIAL_TIMEOUTS); Status = STATUS_SUCCESS; } break; @@ -527,6 +532,7 @@ { pWaitMask = (PULONG)BufferOut; *pWaitMask = DeviceExtension->WaitMask; + Information = sizeof(ULONG); Status = STATUS_SUCCESS; } break;

18 years, 2 months

[tretiakov] 23135: Make guiconsole window movable and respond to minimize and close buttons (regression caused by r22822)

by tretiakov＠svn.reactos.org

Author: tretiakov Date: Tue Jul 18 15:45:28 2006 New Revision: 23135 URL: http://svn.reactos.org/svn/reactos?rev=23135&view=rev Log: Make guiconsole window movable and respond to minimize and close buttons (regression caused by r22822) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Tue Jul 18 15:45:28 2006 @@ -1138,7 +1138,7 @@ // some private way } static LRESULT FASTCALL -GuiConsoleHandleSysMenuCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) +GuiConsoleHandleSysMenuCommand(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { DPRINT1("GuiConsoleHandleSysMenuCommand entered %d\n", wParam); @@ -1159,7 +1159,7 @@ GuiConsoleShowConsoleProperties(hWnd, FALSE); break; default: - break; + return DefWindowProcW(hWnd, Msg, wParam, lParam); } return 0; @@ -1272,7 +1272,7 @@ GuiConsoleMouseMove(hWnd, wParam, lParam); break; case WM_SYSCOMMAND: - return GuiConsoleHandleSysMenuCommand(hWnd, wParam, lParam); + return GuiConsoleHandleSysMenuCommand(hWnd, msg, wParam, lParam); default: Result = DefWindowProcW(hWnd, msg, wParam, lParam); break;

18 years, 2 months

[greatlrd] 23134: adding NULL pointer check for ppdev, pHalInfo, pdwNumHeaps, pdwNumFourCCCodes fill in more info for DDHALINFO it is not complete yet.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jul 18 12:54:32 2006 New Revision: 23134 URL: http://svn.reactos.org/svn/reactos?rev=23134&view=rev Log: adding NULL pointer check for ppdev, pHalInfo, pdwNumHeaps, pdwNumFourCCCodes fill in more info for DDHALINFO it is not complete yet. Modified: trunk/reactos/drivers/video/displays/framebuf/ddenable.c Modified: trunk/reactos/drivers/video/displays/framebuf/ddenable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/ddenable.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/ddenable.c Tue Jul 18 12:54:32 2006 @@ -136,19 +136,41 @@ { PPDEV ppdev = (PPDEV)dhpdev; + if (ppdev == NULL) + return FALSE; + + /* check so pHalInfo, pdwNumHeaps, pdwNumFourCCCodes is not NULL + pdwFourCC and pvmList can be null + */ + + if (pHalInfo == NULL) + return FALSE; + + if (pdwNumHeaps == NULL) + return FALSE; + + if (pdwNumFourCCCodes == NULL) + return FALSE; + /* rest some data */ *pdwNumFourCCCodes = 0; *pdwNumHeaps = 0; - - /* - check see if pvmList and pdwFourCC are second call + check see if pvmList and pdwFourCC are frist call or frist. Secon call we fill in pHalInfo info */ if(!(pvmList && pdwFourCC)) - { + { + RtlZeroMemory(pHalInfo, sizeof(DDHALINFO)); + pHalInfo->dwSize = sizeof(DDHALINFO); + + pHalInfo->ddCaps.dwCaps = DDCAPS_BLT | DDCAPS_BLTQUEUE | DDCAPS_BLTCOLORFILL | DDCAPS_READSCANLINE | + DDCAPS_BLTSTRETCH | DDCAPS_COLORKEY | DDCAPS_CANBLTSYSMEM; + + pHalInfo->ddCaps.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_PRIMARYSURFACE | DDSCAPS_FLIP; + /* Calc how much memmory is left on the video cards memmory */ pHalInfo->ddCaps.dwVidMemTotal = (ppdev->MemHeight - ppdev->ScreenHeight) * ppdev->ScreenDelta; @@ -172,12 +194,7 @@ if ( ppdev->BitsPerPixel == 8 ) { pHalInfo->vmiData.ddpfDisplay.dwFlags |= DDPF_PALETTEINDEXED8; - } - - - - - + } } return TRUE;

18 years, 2 months

[ion] 23133: - Move ps/locale.c to ex/locale.c, since it has nothing to do with Process/Thread management (locale settings are part of the executive). - Cleanup formatting in the file and add proper credits (Thomas and Eric). - Create internal Exp* functions for Setting/Getting the user langid, since they need to be called 2, 3 times by other code and thus shared. - Remove some deprecated code, make the functions themselves initialize the default ID when called for the first time (which should b

by ion＠svn.reactos.org

Author: ion Date: Tue Jul 18 05:58:10 2006 New Revision: 23133 URL: http://svn.reactos.org/svn/reactos?rev=23133&view=rev Log: - Move ps/locale.c to ex/locale.c, since it has nothing to do with Process/Thread management (locale settings are part of the executive). - Cleanup formatting in the file and add proper credits (Thomas and Eric). - Create internal Exp* functions for Setting/Getting the user langid, since they need to be called 2, 3 times by other code and thus shared. - Remove some deprecated code, make the functions themselves initialize the default ID when called for the first time (which should be done by winlogon --> it seems this isn't done yet?). - Set default locale to 0x409 instead of 0x0. Added: trunk/reactos/ntoskrnl/ex/locale.c - copied, changed from r23131, trunk/reactos/ntoskrnl/ps/locale.c Removed: trunk/reactos/ntoskrnl/ps/locale.c Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=231… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Tue Jul 18 05:58:10 2006 @@ -653,9 +653,6 @@ /* Load the System DLL and its Entrypoints */ PsLocateSystemDll(); - /* Initialize the Default Locale */ - PiInitDefaultLocale(); - /* Initialize shared user page. Set dos system path, dos device map, etc. */ InitSystemSharedUserPage ((PCHAR)KeLoaderBlock.CommandLine); Copied: trunk/reactos/ntoskrnl/ex/locale.c (from r23131, trunk/reactos/ntoskrnl/ps/locale.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/locale.c?p2=tr… ============================================================================== --- trunk/reactos/ntoskrnl/ps/locale.c (original) +++ trunk/reactos/ntoskrnl/ex/locale.c Tue Jul 18 05:58:10 2006 @@ -1,555 +1,405 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ps/locale.c - * PURPOSE: Locale support - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ex/locale.c + * PURPOSE: Locale (Language) Support for the Executive + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl + * Thomas Weidenmueller (w3seek(a)reactos.org */ -/* INCLUDES *****************************************************************/ +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> - #define NDEBUG #include <internal/debug.h> -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, PiInitDefaultLocale) -#endif - - /* GLOBALS *******************************************************************/ -/* - * Default setting: LANG_NEUTRAL, SUBLANG_NEUTRAL, SORT_DEFAULT - */ -LCID PsDefaultThreadLocaleId = 0; -LCID PsDefaultSystemLocaleId = 0; -BOOL PsDefaultThreadLocaleInitialized = FALSE; - -static LANGID PsInstallUILanguageId = 0; - -#define VALUE_BUFFER_SIZE 256 - -/* FUNCTIONS *****************************************************************/ - -/* - * FUNCTION: - * Initializes the default locale. - * Reads default locale from registry, if available - * ARGUMENTS: - * None. - * Returns: - * None. - */ -VOID -INIT_FUNCTION -NTAPI -PiInitDefaultLocale(VOID) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Nls\\Language"); - UNICODE_STRING ValueName; - HANDLE KeyHandle; - ULONG ValueLength; - UCHAR ValueBuffer[VALUE_BUFFER_SIZE]; - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - UNICODE_STRING ValueString; - ULONG Value; - NTSTATUS Status; - - ValueInfo = (PKEY_VALUE_PARTIAL_INFORMATION)ValueBuffer; - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(&KeyHandle, - KEY_QUERY_VALUE, - &ObjectAttributes); - if (NT_SUCCESS(Status)) - { - /* Read system locale */ - RtlInitUnicodeString(&ValueName, - L"Default"); - Status = ZwQueryValueKey(KeyHandle, - &ValueName, - KeyValuePartialInformation, - ValueBuffer, - VALUE_BUFFER_SIZE, - &ValueLength); - if ((NT_SUCCESS(Status)) && (ValueInfo->Type == REG_SZ)) - { - ValueString.Length = ValueInfo->DataLength; - ValueString.MaximumLength = ValueInfo->DataLength; - ValueString.Buffer = (PWSTR)ValueInfo->Data; - - Status = RtlUnicodeStringToInteger(&ValueString, - 16, - &Value); - if (NT_SUCCESS(Status)) - { - DPRINT("System locale: %08lx\n", Value); - PsDefaultSystemLocaleId = (LCID)Value; - } - } - - /* Read install language id */ - RtlInitUnicodeString(&ValueName, - L"InstallLanguage"); - Status = ZwQueryValueKey(KeyHandle, - &ValueName, - KeyValuePartialInformation, - ValueBuffer, - VALUE_BUFFER_SIZE, - &ValueLength); - if ((NT_SUCCESS(Status)) && (ValueInfo->Type == REG_SZ)) - { - ValueString.Length = ValueInfo->DataLength; - ValueString.MaximumLength = ValueInfo->DataLength; - ValueString.Buffer = (PWSTR)ValueInfo->Data; - - Status = RtlUnicodeStringToInteger(&ValueString, - 16, - &Value); - if (NT_SUCCESS(Status)) - { - DPRINT("Install language id: %04lx\n", Value); - PsInstallUILanguageId = (LANGID)Value; - } - } - - ZwClose(KeyHandle); - } -} - - -/* - * FUNCTION: - * Initializes the default thread locale. - * Reads default locale from registry, if available - * ARGUMENTS: - * None. - * Returns: - * None. - */ -VOID STDCALL -PiInitThreadLocale(VOID) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\User\\.Default\\Control Panel\\International"); - UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"Locale"); - HANDLE KeyHandle; - ULONG ValueLength; - UCHAR ValueBuffer[VALUE_BUFFER_SIZE]; - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - UNICODE_STRING ValueString; - ULONG LocaleValue; - NTSTATUS Status; - - ValueInfo = (PKEY_VALUE_PARTIAL_INFORMATION)ValueBuffer; - - /* read default thread locale */ - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(&KeyHandle, - KEY_QUERY_VALUE, - &ObjectAttributes); - if (NT_SUCCESS(Status)) - { - Status = ZwQueryValueKey(KeyHandle, - &ValueName, - KeyValuePartialInformation, - ValueBuffer, - VALUE_BUFFER_SIZE, - &ValueLength); - if ((NT_SUCCESS(Status)) && (ValueInfo->Type == REG_SZ)) - { - ValueString.Length = ValueInfo->DataLength; - ValueString.MaximumLength = ValueInfo->DataLength; - ValueString.Buffer = (PWSTR)ValueInfo->Data; - - Status = RtlUnicodeStringToInteger(&ValueString, - 16, - &LocaleValue); - if (NT_SUCCESS(Status)) - { - DPRINT("Thread locale: %08lu\n", LocaleValue); - PsDefaultThreadLocaleId = (LCID)LocaleValue; - } - } - ZwClose(KeyHandle); - } - - PsDefaultThreadLocaleInitialized = TRUE; -} - - -/* - * FUNCTION: - * Returns the default locale. - * ARGUMENTS: - * UserProfile = If TRUE then the locale for this thread is returned, - * otherwise the locale for the system is returned. - * DefaultLocaleId = Points to a variable that receives the locale id. - * Returns: - * Status. - */ -NTSTATUS STDCALL +/* System IDs: EN_US */ +LCID PsDefaultSystemLocaleId = 0x00000409; +LANGID PsInstallUILanguageId = LANGIDFROMLCID(0x00000409); + +/* UI/Thread IDs: Same as system */ +LANGID PsDefaultUILanguageId = 0x00000409; +LCID PsDefaultThreadLocaleId = LANGIDFROMLCID(0x00000409); + +/* PRIVATE FUNCTIONS *********************************************************/ + +NTSTATUS +NTAPI +ExpGetCurrentUserUILanguage(IN PWSTR MuiName, + OUT PLANGID LanguageId) +{ + UCHAR ValueBuffer[256]; + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName = + RTL_CONSTANT_STRING(L"Control Panel\\International"); + UNICODE_STRING ValueName; + UNICODE_STRING ValueString; + ULONG ValueLength; + ULONG Value; + HANDLE UserKey; + HANDLE KeyHandle; + NTSTATUS Status; + PAGED_CODE(); + + /* Setup the key name */ + RtlInitUnicodeString(&ValueName, MuiName); + + /* Open the use key */ + Status = RtlOpenCurrentUser(KEY_READ, &UserKey); + if (!NT_SUCCESS(Status)) return Status; + + /* Initialize the attributes and open the key */ + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + UserKey, + NULL); + Status = ZwOpenKey(&KeyHandle, KEY_QUERY_VALUE,&ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Set buffer and query the current value */ + ValueInfo = (PKEY_VALUE_PARTIAL_INFORMATION)ValueBuffer; + Status = ZwQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformation, + ValueBuffer, + sizeof(ValueBuffer), + &ValueLength); + if (NT_SUCCESS(Status)) + { + /* Success, is the value the right type? */ + if (ValueInfo->Type == REG_SZ) + { + /* It is. Initailize the data and convert it */ + RtlInitUnicodeString(&ValueString, (PWSTR)ValueInfo->Data); + Status = RtlUnicodeStringToInteger(&ValueString, 16, &Value); + if (NT_SUCCESS(Status)) + { + /* Return the language */ + *LanguageId = Value; + } + } + else + { + /* Fail */ + Status = STATUS_UNSUCCESSFUL; + } + + /* Close the key */ + ZwClose(KeyHandle); + } + } + + /* Close the user key and return */ + ZwClose(UserKey); + return Status; +} + +NTSTATUS +NTAPI +ExpSetCurrentUserUILanguage(IN PWSTR MuiName, + IN LANGID LanguageId) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"Control Panel\\Desktop"); + UNICODE_STRING ValueName; + WCHAR ValueBuffer[8]; + ULONG ValueLength; + HANDLE UserHandle; + HANDLE KeyHandle; + NTSTATUS Status; + PAGED_CODE(); + + /* Setup the key name */ + RtlInitUnicodeString(&ValueName, MuiName); + + /* Open the use key */ + Status = RtlOpenCurrentUser(KEY_WRITE, &UserHandle); + if (!NT_SUCCESS(Status)) return Status; + + /* Initialize the attributes */ + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + UserHandle, + NULL); + + /* Open the key */ + Status = ZwOpenKey(&KeyHandle, KEY_SET_VALUE, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Setup the value name */ + ValueLength = swprintf(ValueBuffer, + L"%04lX", + (ULONG)LanguageId); + + /* Set the length for the call and set the value */ + ValueLength = (ValueLength + 1) * sizeof(WCHAR); + Status = ZwSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ValueBuffer, + ValueLength); + + /* Close the handle for this key */ + ZwClose(KeyHandle); + } + + /* Close the user key and return status */ + ZwClose(UserHandle); + return Status; +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +NTSTATUS +NTAPI NtQueryDefaultLocale(IN BOOLEAN UserProfile, - OUT PLCID DefaultLocaleId) + OUT PLCID DefaultLocaleId) { NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - + PAGED_CODE(); + + /* Enter SEH for probing */ _SEH_TRY { + /* Check if we came from user mode */ if (KeGetPreviousMode() != KernelMode) { + /* Probe the language ID */ ProbeForWriteLangid(DefaultLocaleId); } - + + /* Check if we have a user profile */ if (UserProfile) { - if (!PsDefaultThreadLocaleInitialized) - { - PiInitThreadLocale(); - } - - /* set thread locale */ - *DefaultLocaleId = PsDefaultThreadLocaleId; + /* Return thread locale */ + *DefaultLocaleId = PsDefaultThreadLocaleId; } else { - /* set system locale */ + /* Return system locale */ *DefaultLocaleId = PsDefaultSystemLocaleId; } } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { + /* Get exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; - return Status; -} - - -/* - * FUNCTION: - * Sets the default locale. - * ARGUMENTS: - * ThreadOrSystem = If TRUE then the locale for this thread is set, - * otherwise the locale for the system is set. - * DefaultLocaleId = The locale id to be set. - * Returns: - * Status. - */ -NTSTATUS STDCALL + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI NtSetDefaultLocale(IN BOOLEAN UserProfile, - IN LCID DefaultLocaleId) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - HANDLE KeyHandle; - ULONG ValueLength; - WCHAR ValueBuffer[20]; - HANDLE UserKey = NULL; - NTSTATUS Status; - - PAGED_CODE(); - - if (UserProfile) - { - /* thread locale */ - Status = RtlOpenCurrentUser(KEY_WRITE, - &UserKey); - if (!NT_SUCCESS(Status)) - return(Status); - RtlInitUnicodeString(&KeyName, - L"Control Panel\\International"); - RtlInitUnicodeString(&ValueName, - L"Locale"); - } - else - { - /* system locale */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Nls\\Language"); - RtlInitUnicodeString(&ValueName, - L"Default"); - } - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - UserKey, - NULL); - Status = ZwOpenKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - if (UserKey != NULL) - { - ZwClose(UserKey); - } - return(Status); - } - - if (UserProfile) - { - ValueLength = swprintf(ValueBuffer, - L"%08lx", - (ULONG)DefaultLocaleId); - } - else - { - ValueLength = swprintf(ValueBuffer, - L"%04lx", - (ULONG)DefaultLocaleId & 0xFFFF); - } - ValueLength = (ValueLength + 1) * sizeof(WCHAR); - - Status = ZwSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - ValueBuffer, - ValueLength); - - ZwClose(KeyHandle); - if (UserKey != NULL) - { - ZwClose(UserKey); - } - - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - if (UserProfile) - { - /* set thread locale */ - DPRINT("Thread locale: %08lu\n", DefaultLocaleId); - PsDefaultThreadLocaleId = DefaultLocaleId; - PsDefaultThreadLocaleInitialized = TRUE; - } - else - { - /* set system locale */ - DPRINT("System locale: %08lu\n", DefaultLocaleId); - PsDefaultSystemLocaleId = DefaultLocaleId; - } - - return STATUS_SUCCESS; -} - + IN LCID DefaultLocaleId) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + HANDLE KeyHandle; + ULONG ValueLength; + WCHAR ValueBuffer[20]; + HANDLE UserKey = NULL; + NTSTATUS Status; + PAGED_CODE(); + + /* Check if we have a profile */ + if (UserProfile) + { + /* Open the user's key */ + Status = RtlOpenCurrentUser(KEY_WRITE, &UserKey); + if (!NT_SUCCESS(Status)) return(Status); + + /* Initialize the registry location */ + RtlInitUnicodeString(&KeyName, L"Control Panel\\International"); + RtlInitUnicodeString(&ValueName, L"Locale"); + } + else + { + /* Initialize the system registry location */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\System\\CurrentControlSet" + "\\Control\\Nls\\Language"); + RtlInitUnicodeString(&ValueName, L"Default"); + } + + /* Initailize the object attributes */ + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + UserKey, + NULL); + + /* Check if we don' thave a default locale yet */ + if (!DefaultLocaleId) + { + DPRINT1("TODO\n"); + Status = STATUS_SUCCESS; + KEBUGCHECK(0); + } + else + { + /* Otherwise, open the key */ + Status = ZwOpenKey(&KeyHandle, KEY_SET_VALUE, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Check if we had a profile */ + if (UserProfile) + { + /* Fill in the buffer */ + ValueLength = swprintf(ValueBuffer, + L"%08lx", + (ULONG)DefaultLocaleId); + } + else + { + /* Fill in the buffer */ + ValueLength = swprintf(ValueBuffer, + L"%04lx", + (ULONG)DefaultLocaleId & 0xFFFF); + } + + /* Set the length for the registry call */ + ValueLength = (ValueLength + 1) * sizeof(WCHAR); + + /* Now write the actual value */ + Status = ZwSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ValueBuffer, + ValueLength); + + /* And close the key */ + ZwClose(KeyHandle); + } + } + + /* Close the user key */ + ZwClose(UserKey); + + /* Check for success */ + if (NT_SUCCESS(Status)) + { + /* Check if it was for a user */ + if (UserProfile) + { + /* Set thread locale */ + PsDefaultThreadLocaleId = DefaultLocaleId; + } + else + { + /* Set system locale */ + PsDefaultSystemLocaleId = DefaultLocaleId; + } + } + + /* Return status */ + return Status; +} /* * @implemented */ -NTSTATUS STDCALL -NtQueryDefaultUILanguage(OUT PLANGID LanguageId) -{ - UCHAR ValueBuffer[VALUE_BUFFER_SIZE]; - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"Control Panel\\International"); - UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"MultiUILanguageId"); - UNICODE_STRING ValueString; - ULONG ValueLength; - ULONG Value; - HANDLE UserKey; - HANDLE KeyHandle; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - _SEH_TRY - { - if (KeGetPreviousMode() != KernelMode) - { - ProbeForWriteLangid(LanguageId); - } - - *LanguageId = PsInstallUILanguageId; - } - _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } - - Status = RtlOpenCurrentUser(KEY_READ, - &UserKey); - if (!NT_SUCCESS(Status)) - { - Value = PsInstallUILanguageId; - goto ReturnSuccess; - } - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - UserKey, - NULL); - Status = ZwOpenKey(&KeyHandle, - KEY_QUERY_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - Value = PsInstallUILanguageId; - goto ReturnSuccess; - } - - ValueInfo = (PKEY_VALUE_PARTIAL_INFORMATION)ValueBuffer; - - Status = ZwQueryValueKey(KeyHandle, - &ValueName, - KeyValuePartialInformation, - ValueBuffer, - VALUE_BUFFER_SIZE, - &ValueLength); - - ZwClose(KeyHandle); - ZwClose(UserKey); - - if (!NT_SUCCESS(Status) || ValueInfo->Type != REG_SZ) - { - Value = PsInstallUILanguageId; - goto ReturnSuccess; - } - - ValueString.Length = ValueInfo->DataLength; - ValueString.MaximumLength = ValueInfo->DataLength; - ValueString.Buffer = (PWSTR)ValueInfo->Data; - - Status = RtlUnicodeStringToInteger(&ValueString, - 16, - &Value); - if (!NT_SUCCESS(Status)) - { - Value = PsInstallUILanguageId; - goto ReturnSuccess; - } - - DPRINT("Default language id: %04lx\n", Value); - -ReturnSuccess: - _SEH_TRY - { - *LanguageId = Value; - Status = STATUS_SUCCESS; - } - _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - return Status; -} - +NTSTATUS +NTAPI +NtQueryInstallUILanguage(OUT PLANGID LanguageId) +{ + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + /* Enter SEH for probing */ + _SEH_TRY + { + /* Check if we came from user mode */ + if (KeGetPreviousMode() != KernelMode) + { + /* Probe the Language ID */ + ProbeForWriteLangid(LanguageId); + } + + /* Return it */ + *LanguageId = PsInstallUILanguageId; + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Return status */ + return Status; +} /* * @implemented */ -NTSTATUS STDCALL -NtQueryInstallUILanguage(OUT PLANGID LanguageId) +NTSTATUS +NTAPI +NtQueryDefaultUILanguage(OUT PLANGID LanguageId) { NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - + PAGED_CODE(); + + /* Enter SEH for probing */ _SEH_TRY { + /* Check if we came from user mode */ if (KeGetPreviousMode() != KernelMode) { + /* Probe the Language ID */ ProbeForWriteLangid(LanguageId); } - *LanguageId = PsInstallUILanguageId; + /* Call the executive helper routine */ + Status = ExpGetCurrentUserUILanguage(L"MultiUILanguageId", LanguageId); + if (NT_SUCCESS(Status)) + { + /* Success, return the language */ + *LanguageId = PsInstallUILanguageId; + } } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { + /* Get exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; - return Status; -} - + /* Return status */ + return Status; +} /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +NTAPI NtSetDefaultUILanguage(IN LANGID LanguageId) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"Control Panel\\Desktop"); - UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"MultiUILanguageId"); - WCHAR ValueBuffer[8]; - ULONG ValueLength; - HANDLE UserHandle; - HANDLE KeyHandle; - NTSTATUS Status; - - PAGED_CODE(); - - Status = RtlOpenCurrentUser(KEY_WRITE, - &UserHandle); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - UserHandle, - NULL); - - Status = ZwOpenKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - ZwClose(UserHandle); - return Status; - } - - ValueLength = swprintf(ValueBuffer, - L"%04lX", - (ULONG)LanguageId); - ValueLength = (ValueLength + 1) * sizeof(WCHAR); - - Status = ZwSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - ValueBuffer, - ValueLength); - - ZwClose(KeyHandle); - ZwClose(UserHandle); - - return Status; + PAGED_CODE(); + + /* Check if we don't have a default yet */ + if (!LanguageId) + { + /* FIXME */ + DPRINT1("TODO\n"); + KEBUGCHECK(0); + } + + /* Otherwise, call the internal routine */ + return ExpSetCurrentUserUILanguage(L"MUILanguagePending", LanguageId); } /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Tue Jul 18 05:58:10 2006 @@ -18,10 +18,6 @@ #define PSP_MAX_CREATE_THREAD_NOTIFY 8 #define PSP_MAX_LOAD_IMAGE_NOTIFY 8 #define PSP_MAX_CREATE_PROCESS_NOTIFY 8 - -VOID -NTAPI -PiInitDefaultLocale(VOID); VOID NTAPI Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Tue Jul 18 05:58:10 2006 @@ -129,6 +129,7 @@ <file>fmutex.c</file> <file>handle.c</file> <file>init.c</file> + <file>locale.c</file> <file>lookas.c</file> <file>mutant.c</file> <file>power.c</file> @@ -288,7 +289,6 @@ <file>idle.c</file> <file>job.c</file> <file>kill.c</file> - <file>locale.c</file> <file>notify.c</file> <file>process.c</file> <file>psmgr.c</file> Removed: trunk/reactos/ntoskrnl/ps/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/locale.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/locale.c (original) +++ trunk/reactos/ntoskrnl/ps/locale.c (removed) @@ -1,555 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ps/locale.c - * PURPOSE: Locale support - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> - -#define NDEBUG -#include <internal/debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, PiInitDefaultLocale) -#endif - - -/* GLOBALS *******************************************************************/ - -/* - * Default setting: LANG_NEUTRAL, SUBLANG_NEUTRAL, SORT_DEFAULT - */ -LCID PsDefaultThreadLocaleId = 0; -LCID PsDefaultSystemLocaleId = 0; -BOOL PsDefaultThreadLocaleInitialized = FALSE; - -static LANGID PsInstallUILanguageId = 0; - -#define VALUE_BUFFER_SIZE 256 - -/* FUNCTIONS *****************************************************************/ - -/* - * FUNCTION: - * Initializes the default locale. - * Reads default locale from registry, if available - * ARGUMENTS: - * None. - * Returns: - * None. - */ -VOID -INIT_FUNCTION -NTAPI -PiInitDefaultLocale(VOID) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Nls\\Language"); - UNICODE_STRING ValueName; - HANDLE KeyHandle; - ULONG ValueLength; - UCHAR ValueBuffer[VALUE_BUFFER_SIZE]; - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - UNICODE_STRING ValueString; - ULONG Value; - NTSTATUS Status; - - ValueInfo = (PKEY_VALUE_PARTIAL_INFORMATION)ValueBuffer; - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(&KeyHandle, - KEY_QUERY_VALUE, - &ObjectAttributes); - if (NT_SUCCESS(Status)) - { - /* Read system locale */ - RtlInitUnicodeString(&ValueName, - L"Default"); - Status = ZwQueryValueKey(KeyHandle, - &ValueName, - KeyValuePartialInformation, - ValueBuffer, - VALUE_BUFFER_SIZE, - &ValueLength); - if ((NT_SUCCESS(Status)) && (ValueInfo->Type == REG_SZ)) - { - ValueString.Length = ValueInfo->DataLength; - ValueString.MaximumLength = ValueInfo->DataLength; - ValueString.Buffer = (PWSTR)ValueInfo->Data; - - Status = RtlUnicodeStringToInteger(&ValueString, - 16, - &Value); - if (NT_SUCCESS(Status)) - { - DPRINT("System locale: %08lx\n", Value); - PsDefaultSystemLocaleId = (LCID)Value; - } - } - - /* Read install language id */ - RtlInitUnicodeString(&ValueName, - L"InstallLanguage"); - Status = ZwQueryValueKey(KeyHandle, - &ValueName, - KeyValuePartialInformation, - ValueBuffer, - VALUE_BUFFER_SIZE, - &ValueLength); - if ((NT_SUCCESS(Status)) && (ValueInfo->Type == REG_SZ)) - { - ValueString.Length = ValueInfo->DataLength; - ValueString.MaximumLength = ValueInfo->DataLength; - ValueString.Buffer = (PWSTR)ValueInfo->Data; - - Status = RtlUnicodeStringToInteger(&ValueString, - 16, - &Value); - if (NT_SUCCESS(Status)) - { - DPRINT("Install language id: %04lx\n", Value); - PsInstallUILanguageId = (LANGID)Value; - } - } - - ZwClose(KeyHandle); - } -} - - -/* - * FUNCTION: - * Initializes the default thread locale. - * Reads default locale from registry, if available - * ARGUMENTS: - * None. - * Returns: - * None. - */ -VOID STDCALL -PiInitThreadLocale(VOID) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\User\\.Default\\Control Panel\\International"); - UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"Locale"); - HANDLE KeyHandle; - ULONG ValueLength; - UCHAR ValueBuffer[VALUE_BUFFER_SIZE]; - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - UNICODE_STRING ValueString; - ULONG LocaleValue; - NTSTATUS Status; - - ValueInfo = (PKEY_VALUE_PARTIAL_INFORMATION)ValueBuffer; - - /* read default thread locale */ - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(&KeyHandle, - KEY_QUERY_VALUE, - &ObjectAttributes); - if (NT_SUCCESS(Status)) - { - Status = ZwQueryValueKey(KeyHandle, - &ValueName, - KeyValuePartialInformation, - ValueBuffer, - VALUE_BUFFER_SIZE, - &ValueLength); - if ((NT_SUCCESS(Status)) && (ValueInfo->Type == REG_SZ)) - { - ValueString.Length = ValueInfo->DataLength; - ValueString.MaximumLength = ValueInfo->DataLength; - ValueString.Buffer = (PWSTR)ValueInfo->Data; - - Status = RtlUnicodeStringToInteger(&ValueString, - 16, - &LocaleValue); - if (NT_SUCCESS(Status)) - { - DPRINT("Thread locale: %08lu\n", LocaleValue); - PsDefaultThreadLocaleId = (LCID)LocaleValue; - } - } - ZwClose(KeyHandle); - } - - PsDefaultThreadLocaleInitialized = TRUE; -} - - -/* - * FUNCTION: - * Returns the default locale. - * ARGUMENTS: - * UserProfile = If TRUE then the locale for this thread is returned, - * otherwise the locale for the system is returned. - * DefaultLocaleId = Points to a variable that receives the locale id. - * Returns: - * Status. - */ -NTSTATUS STDCALL -NtQueryDefaultLocale(IN BOOLEAN UserProfile, - OUT PLCID DefaultLocaleId) -{ - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - _SEH_TRY - { - if (KeGetPreviousMode() != KernelMode) - { - ProbeForWriteLangid(DefaultLocaleId); - } - - if (UserProfile) - { - if (!PsDefaultThreadLocaleInitialized) - { - PiInitThreadLocale(); - } - - /* set thread locale */ - *DefaultLocaleId = PsDefaultThreadLocaleId; - } - else - { - /* set system locale */ - *DefaultLocaleId = PsDefaultSystemLocaleId; - } - } - _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - return Status; -} - - -/* - * FUNCTION: - * Sets the default locale. - * ARGUMENTS: - * ThreadOrSystem = If TRUE then the locale for this thread is set, - * otherwise the locale for the system is set. - * DefaultLocaleId = The locale id to be set. - * Returns: - * Status. - */ -NTSTATUS STDCALL -NtSetDefaultLocale(IN BOOLEAN UserProfile, - IN LCID DefaultLocaleId) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - HANDLE KeyHandle; - ULONG ValueLength; - WCHAR ValueBuffer[20]; - HANDLE UserKey = NULL; - NTSTATUS Status; - - PAGED_CODE(); - - if (UserProfile) - { - /* thread locale */ - Status = RtlOpenCurrentUser(KEY_WRITE, - &UserKey); - if (!NT_SUCCESS(Status)) - return(Status); - RtlInitUnicodeString(&KeyName, - L"Control Panel\\International"); - RtlInitUnicodeString(&ValueName, - L"Locale"); - } - else - { - /* system locale */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Nls\\Language"); - RtlInitUnicodeString(&ValueName, - L"Default"); - } - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - UserKey, - NULL); - Status = ZwOpenKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - if (UserKey != NULL) - { - ZwClose(UserKey); - } - return(Status); - } - - if (UserProfile) - { - ValueLength = swprintf(ValueBuffer, - L"%08lx", - (ULONG)DefaultLocaleId); - } - else - { - ValueLength = swprintf(ValueBuffer, - L"%04lx", - (ULONG)DefaultLocaleId & 0xFFFF); - } - ValueLength = (ValueLength + 1) * sizeof(WCHAR); - - Status = ZwSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - ValueBuffer, - ValueLength); - - ZwClose(KeyHandle); - if (UserKey != NULL) - { - ZwClose(UserKey); - } - - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - if (UserProfile) - { - /* set thread locale */ - DPRINT("Thread locale: %08lu\n", DefaultLocaleId); - PsDefaultThreadLocaleId = DefaultLocaleId; - PsDefaultThreadLocaleInitialized = TRUE; - } - else - { - /* set system locale */ - DPRINT("System locale: %08lu\n", DefaultLocaleId); - PsDefaultSystemLocaleId = DefaultLocaleId; - } - - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -NtQueryDefaultUILanguage(OUT PLANGID LanguageId) -{ - UCHAR ValueBuffer[VALUE_BUFFER_SIZE]; - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"Control Panel\\International"); - UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"MultiUILanguageId"); - UNICODE_STRING ValueString; - ULONG ValueLength; - ULONG Value; - HANDLE UserKey; - HANDLE KeyHandle; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - _SEH_TRY - { - if (KeGetPreviousMode() != KernelMode) - { - ProbeForWriteLangid(LanguageId); - } - - *LanguageId = PsInstallUILanguageId; - } - _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } - - Status = RtlOpenCurrentUser(KEY_READ, - &UserKey); - if (!NT_SUCCESS(Status)) - { - Value = PsInstallUILanguageId; - goto ReturnSuccess; - } - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - UserKey, - NULL); - Status = ZwOpenKey(&KeyHandle, - KEY_QUERY_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - Value = PsInstallUILanguageId; - goto ReturnSuccess; - } - - ValueInfo = (PKEY_VALUE_PARTIAL_INFORMATION)ValueBuffer; - - Status = ZwQueryValueKey(KeyHandle, - &ValueName, - KeyValuePartialInformation, - ValueBuffer, - VALUE_BUFFER_SIZE, - &ValueLength); - - ZwClose(KeyHandle); - ZwClose(UserKey); - - if (!NT_SUCCESS(Status) || ValueInfo->Type != REG_SZ) - { - Value = PsInstallUILanguageId; - goto ReturnSuccess; - } - - ValueString.Length = ValueInfo->DataLength; - ValueString.MaximumLength = ValueInfo->DataLength; - ValueString.Buffer = (PWSTR)ValueInfo->Data; - - Status = RtlUnicodeStringToInteger(&ValueString, - 16, - &Value); - if (!NT_SUCCESS(Status)) - { - Value = PsInstallUILanguageId; - goto ReturnSuccess; - } - - DPRINT("Default language id: %04lx\n", Value); - -ReturnSuccess: - _SEH_TRY - { - *LanguageId = Value; - Status = STATUS_SUCCESS; - } - _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - return Status; -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -NtQueryInstallUILanguage(OUT PLANGID LanguageId) -{ - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - _SEH_TRY - { - if (KeGetPreviousMode() != KernelMode) - { - ProbeForWriteLangid(LanguageId); - } - - *LanguageId = PsInstallUILanguageId; - } - _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - return Status; -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -NtSetDefaultUILanguage(IN LANGID LanguageId) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"Control Panel\\Desktop"); - UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"MultiUILanguageId"); - WCHAR ValueBuffer[8]; - ULONG ValueLength; - HANDLE UserHandle; - HANDLE KeyHandle; - NTSTATUS Status; - - PAGED_CODE(); - - Status = RtlOpenCurrentUser(KEY_WRITE, - &UserHandle); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - UserHandle, - NULL); - - Status = ZwOpenKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - ZwClose(UserHandle); - return Status; - } - - ValueLength = swprintf(ValueBuffer, - L"%04lX", - (ULONG)LanguageId); - ValueLength = (ValueLength + 1) * sizeof(WCHAR); - - Status = ZwSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - ValueBuffer, - ValueLength); - - ZwClose(KeyHandle); - ZwClose(UserHandle); - - return Status; -} - -/* EOF */

18 years, 2 months

[ion] 23132: - Kernel Fun

by ion＠svn.reactos.org

Author: ion Date: Tue Jul 18 04:51:09 2006 New Revision: 23132 URL: http://svn.reactos.org/svn/reactos?rev=23132&view=rev Log: - Kernel Fun Added: trunk/reactos/ntoskrnl/KrnlFun.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/ps/thread.c Added: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=231… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (added) +++ trunk/reactos/ntoskrnl/KrnlFun.c Tue Jul 18 04:51:09 2006 @@ -1,0 +1,47 @@ +/////////////////////////////////////////////////////////////////////////////// +// +// Alex's Big Ol' List of FIXMEs, bugs and regressions +// If you see something here, Alex *KNOWS ABOUT IT*. +// Do NOT bug him about it. +// Do NOT ask if he knows about it. +// Do NOT complain about it. +// Do NOT ask when it will be fixed. +// Failure to respect this will *ACHIEVE NOTHING*. +// +// Io: +// - Add support for Fast Dispatch I/O. +// - Verify ShareAccess APIs, XP added some new semantics. +// - Add Access Checks in IopParseDevice. +// - Add validation checks in IoCreateFile. +// - Fix double-reference in IopCreateFile. +// - Add tracing to file.c +// - See why queueing IRPs and cancelling them causes crashes +// - Add SEH to some places where it's missing (MDLs, etc) (iofunc). +// - Add a generic Cleanup/Exception Routine (iofunc). +// - Add probe/alignment checks for Query/Set routines. +// - Add another parameter to IopCleanupFailedIrp. +// - Add support for Fast Dispatch I/O. +// - Add support for some fast-paths when querying/setting data. +// - Add tracing to iofunc.c +// +// Ps: +// - Use Process Rundown. +// - Use Process Pushlock Locks. +// - Use Safe Referencing in PsGetNextProcess/Thread. +// - Use Guarded Mutex instead of Fast Mutex for Active Process Locks. +// - Fix referencing problem. +// - Generate process cookie for user-more thread. +// - Add security calls where necessary. +// - Add tracing. +// +// Ob: +// - Add Directory Lock. +// - Use Object Type Mutex/Lock. +// - Implement handle database if anyone needs it. +// - Figure out why cmd.exe won't close anymore. +// +// Ex: +// - Use pushlocks for handle implementation. +// - Figure out why cmd.exe won't close anymore. +// +/////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Tue Jul 18 04:51:09 2006 @@ -21,18 +21,6 @@ __FUNCTION__, Irp); #endif - -/// -// -// TODO: -// - Add support for Fast Dispatch I/O. -// - Verify ShareAccess APIs, XP added some new semantics. -// - Add Access Checks in IopParseDevice. -// - Add validation checks in IoCreateFile. -// - Add tracing. -// - See why queueing IRPs and cancelling them causes crashes -// -/// /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Tue Jul 18 04:51:09 2006 @@ -20,19 +20,6 @@ __FUNCTION__, Irp); #endif - -/// -// -// TODO: -// - Add SEH to some places where it's missing (MDLs, etc). -// - Add a generic Cleanup/Exception Routine. -// - Add probe/alignment checks for Query/Set routines. -// - Add another parameter to IopCleanupFailedIrp. -// - Add support for Fast Dispatch I/O. -// - Add support for some fast-paths when querying/setting data. -// - Add tracing. -// -/// /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Tue Jul 18 04:51:09 2006 @@ -5,16 +5,6 @@ * PURPOSE: Process Manager: Thread Management * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Thomas Weidenmueller (w3seek(a)reactos.org) - */ - -/* - * Alex FIXMEs: - * - MAJOR: Use Process Rundown - * - MAJOR: Use Process Pushlock Locks - * - MAJOR: Use Safe Referencing in PsGetNextProcess/Thread. - * - MAJOR: Use Guarded Mutex instead of Fast Mutex for Active Process Locks. - * - Generate process cookie for user-more thread. - * - Add security calls where necessary. */ /* INCLUDES ****************************************************************/

18 years, 2 months

[ion] 23131: [AUDIT] - notify.c contains trivial (3 or 4 lines of code) implementations of adding a pointer to an array, and then looping said array and calling a pointer. Your grandmother could code this. - Cleanup notify.c and fix the return value of PsSetCreateProcessNotifyRoutine. - Create ps_x.h for inlined Ps routines and put the internal routines which call the registered callbacks in it.

by ion＠svn.reactos.org

Author: ion Date: Tue Jul 18 02:18:44 2006 New Revision: 23131 URL: http://svn.reactos.org/svn/reactos?rev=23131&view=rev Log: [AUDIT] - notify.c contains trivial (3 or 4 lines of code) implementations of adding a pointer to an array, and then looping said array and calling a pointer. Your grandmother could code this. - Cleanup notify.c and fix the return value of PsSetCreateProcessNotifyRoutine. - Create ps_x.h for inlined Ps routines and put the internal routines which call the registered callbacks in it. Added: trunk/reactos/ntoskrnl/include/internal/ps_x.h Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ps/notify.c (contents, props changed) Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Tue Jul 18 02:18:44 2006 @@ -449,6 +449,15 @@ struct _EPROCESS *Process, PVOID Callback, PVOID Context +); + +// +// Lego Callback +// +typedef +VOID +(NTAPI *PLEGO_NOTIFY_ROUTINE)( + IN PKTHREAD Thread ); #endif Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Tue Jul 18 02:18:44 2006 @@ -7,6 +7,384 @@ struct _EJOB; #include <internal/arch/ps.h> + +/* Top level irp definitions. */ +#define FSRTL_FSP_TOP_LEVEL_IRP (0x01) +#define FSRTL_CACHE_TOP_LEVEL_IRP (0x02) +#define FSRTL_MOD_WRITE_TOP_LEVEL_IRP (0x03) +#define FSRTL_FAST_IO_TOP_LEVEL_IRP (0x04) +#define FSRTL_MAX_TOP_LEVEL_IRP_FLAG (0x04) + +#define PSP_MAX_CREATE_THREAD_NOTIFY 8 +#define PSP_MAX_LOAD_IMAGE_NOTIFY 8 +#define PSP_MAX_CREATE_PROCESS_NOTIFY 8 + +VOID +NTAPI +PiInitDefaultLocale(VOID); + +VOID +NTAPI +PiInitProcessManager(VOID); + +VOID +NTAPI +PspShutdownProcessManager(VOID); + +VOID +NTAPI +PsInitThreadManagment(VOID); + +VOID +NTAPI +PsInitProcessManagment(VOID); + +VOID +NTAPI +PsInitIdleThread(VOID); + +VOID +NTAPI +PiTerminateProcessThreads( + PEPROCESS Process, + NTSTATUS ExitStatus +); + +VOID +NTAPI +PsTerminateCurrentThread(NTSTATUS ExitStatus); + +VOID +NTAPI +PsTerminateOtherThread( + PETHREAD Thread, + NTSTATUS ExitStatus +); + +VOID +NTAPI +PsReleaseThread(PETHREAD Thread); + +VOID +NTAPI +PsBeginThread( + PKSTART_ROUTINE StartRoutine, + PVOID StartContext +); + +VOID +NTAPI +PsBeginThreadWithContextInternal(VOID); + +VOID +NTAPI +PiKillMostProcesses(VOID); + +NTSTATUS +STDCALL +PiTerminateProcess( + PEPROCESS Process, + NTSTATUS ExitStatus +); + +VOID +NTAPI +PiInitApcManagement(VOID); + +VOID +STDCALL +PiDeleteThread(PVOID ObjectBody); + +VOID +NTAPI +PsReapThreads(VOID); + +VOID +NTAPI +PsInitializeThreadReaper(VOID); + +VOID +NTAPI +PsQueueThreadReap(PETHREAD Thread); + +NTSTATUS +NTAPI +PsInitializeThread( + PEPROCESS Process, + PETHREAD* ThreadPtr, + POBJECT_ATTRIBUTES ObjectAttributes, + KPROCESSOR_MODE AccessMode, + BOOLEAN First +); + +PACCESS_TOKEN +STDCALL +PsReferenceEffectiveToken( + PETHREAD Thread, + PTOKEN_TYPE TokenType, + PUCHAR b, + PSECURITY_IMPERSONATION_LEVEL Level +); + +NTSTATUS +STDCALL +PsOpenTokenOfProcess( + HANDLE ProcessHandle, + PACCESS_TOKEN* Token +); + +VOID +STDCALL +PspTerminateProcessThreads( + PEPROCESS Process, + NTSTATUS ExitStatus +); + +NTSTATUS +NTAPI +PsSuspendThread( + PETHREAD Thread, + PULONG PreviousCount +); + +NTSTATUS +NTAPI +PsResumeThread( + PETHREAD Thread, + PULONG PreviousCount +); + +NTSTATUS +STDCALL +PspAssignPrimaryToken( + PEPROCESS Process, + HANDLE TokenHandle +); + +PETHREAD +NTAPI +PsGetNextProcessThread( + IN PEPROCESS Process, + IN PETHREAD Thread OPTIONAL +); + +VOID +STDCALL +PsExitSpecialApc( + PKAPC Apc, + PKNORMAL_ROUTINE *NormalRoutine, + PVOID *NormalContext, + PVOID *SystemArgument1, + PVOID *SystemArgument2 +); + +NTSTATUS +STDCALL +PspInitializeProcessSecurity( + PEPROCESS Process, + PEPROCESS Parent OPTIONAL +); + +VOID +STDCALL +PspSystemThreadStartup( + PKSTART_ROUTINE StartRoutine, + PVOID StartContext +); + +NTSTATUS +NTAPI +PsInitializeIdleOrFirstThread( + PEPROCESS Process, + PETHREAD* ThreadPtr, + PKSTART_ROUTINE StartRoutine, + KPROCESSOR_MODE AccessMode, + BOOLEAN First +); + +VOID +STDCALL +PiDeleteProcess(PVOID ObjectBody); + +VOID +STDCALL +PspReapRoutine(PVOID Context); + +VOID +STDCALL +PspExitThread(NTSTATUS ExitStatus); + +NTSTATUS +STDCALL +PspTerminateThreadByPointer( + PETHREAD Thread, + NTSTATUS ExitStatus, + BOOLEAN bSelf +); + +NTSTATUS +NTAPI +PsUnfreezeOtherThread(PETHREAD Thread); + +VOID +NTAPI +PsFreezeOtherThread(PETHREAD Thread); + +VOID +NTAPI +PsFreezeProcessThreads(PEPROCESS Process); + +VOID +NTAPI +PsUnfreezeProcessThreads(PEPROCESS Process); + +ULONG +NTAPI +PsEnumThreadsByProcess(PEPROCESS Process); + +PEPROCESS +STDCALL +PsGetNextProcess(PEPROCESS OldProcess); + +VOID +NTAPI +PsApplicationProcessorInit(VOID); + +VOID +NTAPI +PsPrepareForApplicationProcessorInit(ULONG Id); + +VOID +STDCALL +PsIdleThreadMain(PVOID Context); + +VOID +STDCALL +PiSuspendThreadRundownRoutine(PKAPC Apc); + +VOID +STDCALL +PiSuspendThreadKernelRoutine( + PKAPC Apc, + PKNORMAL_ROUTINE* NormalRoutine, + PVOID* NormalContext, + PVOID* SystemArgument1, + PVOID* SystemArguemnt2 +); + +VOID +STDCALL +PiSuspendThreadNormalRoutine( + PVOID NormalContext, + PVOID SystemArgument1, + PVOID SystemArgument2 +); + +VOID +NTAPI +PsInitialiseSuspendImplementation(VOID); + +VOID +STDCALL +PspExitProcess(BOOLEAN LastThread, + PEPROCESS Process); + +VOID +STDCALL +PspDeleteProcess(PVOID ObjectBody); + +VOID +STDCALL +PspDeleteThread(PVOID ObjectBody); + + +NTSTATUS +NTAPI +PsInitWin32Thread(PETHREAD Thread); + +VOID +NTAPI +PsTerminateWin32Process(PEPROCESS Process); + +VOID +NTAPI +PsTerminateWin32Thread(PETHREAD Thread); + +VOID +NTAPI +PsInitialiseW32Call(VOID); + +VOID +NTAPI +INIT_FUNCTION +PsInitJobManagment(VOID); + +VOID +STDCALL +PspInheritQuota( + PEPROCESS Process, + PEPROCESS ParentProcess +); + +VOID +STDCALL +PspDestroyQuotaBlock(PEPROCESS Process); + +NTSTATUS +STDCALL +PspMapSystemDll( + PEPROCESS Process, + PVOID *DllBase +); + +NTSTATUS +STDCALL +PsLocateSystemDll(VOID); + +NTSTATUS +STDCALL +PspGetSystemDllEntryPoints(VOID); + +NTSTATUS +NTAPI +PsLockProcess( + PEPROCESS Process, + BOOLEAN Timeout +); + +VOID +NTAPI +PsUnlockProcess(PEPROCESS Process); + +VOID +NTAPI +PspRemoveProcessFromJob( + IN PEPROCESS Process, + IN PEJOB Job +); + +NTSTATUS +NTAPI +PspDeleteLdt(IN PEPROCESS Process); + +NTSTATUS +NTAPI +PspDeleteVdmObjects(IN PEPROCESS Process); + +VOID +NTAPI +PspDeleteProcessSecurity(IN PEPROCESS Process); + +VOID +NTAPI +PspDeleteThreadSecurity(IN PETHREAD Thread); + +VOID +NTAPI +PspExitProcessFromJob( + IN PEJOB Job, + IN PEPROCESS Process +); extern LCID PsDefaultThreadLocaleId; extern LCID PsDefaultSystemLocaleId; @@ -19,400 +397,15 @@ extern FAST_MUTEX PspActiveProcessMutex; extern LARGE_INTEGER ShortPsLockDelay, PsLockTimeout; extern EPROCESS_QUOTA_BLOCK PspDefaultQuotaBlock; - -/* Top level irp definitions. */ -#define FSRTL_FSP_TOP_LEVEL_IRP (0x01) -#define FSRTL_CACHE_TOP_LEVEL_IRP (0x02) -#define FSRTL_MOD_WRITE_TOP_LEVEL_IRP (0x03) -#define FSRTL_FAST_IO_TOP_LEVEL_IRP (0x04) -#define FSRTL_MAX_TOP_LEVEL_IRP_FLAG (0x04) - -#define MAX_PROCESS_NOTIFY_ROUTINE_COUNT 8 -#define MAX_LOAD_IMAGE_NOTIFY_ROUTINE_COUNT 8 - -VOID -NTAPI -PiInitDefaultLocale(VOID); - -VOID -NTAPI -PiInitProcessManager(VOID); - -VOID -NTAPI -PspShutdownProcessManager(VOID); - -VOID -NTAPI -PsInitThreadManagment(VOID); - -VOID -NTAPI -PsInitProcessManagment(VOID); - -VOID -NTAPI -PsInitIdleThread(VOID); - -VOID -NTAPI -PiTerminateProcessThreads( - PEPROCESS Process, - NTSTATUS ExitStatus -); - -VOID -NTAPI -PsTerminateCurrentThread(NTSTATUS ExitStatus); - -VOID -NTAPI -PsTerminateOtherThread( - PETHREAD Thread, - NTSTATUS ExitStatus -); - -VOID -NTAPI -PsReleaseThread(PETHREAD Thread); - -VOID -NTAPI -PsBeginThread( - PKSTART_ROUTINE StartRoutine, - PVOID StartContext -); - -VOID -NTAPI -PsBeginThreadWithContextInternal(VOID); - -VOID -NTAPI -PiKillMostProcesses(VOID); - -NTSTATUS -STDCALL -PiTerminateProcess( - PEPROCESS Process, - NTSTATUS ExitStatus -); - -VOID -NTAPI -PiInitApcManagement(VOID); - -VOID -STDCALL -PiDeleteThread(PVOID ObjectBody); - -VOID -NTAPI -PsReapThreads(VOID); - -VOID -NTAPI -PsInitializeThreadReaper(VOID); - -VOID -NTAPI -PsQueueThreadReap(PETHREAD Thread); - -NTSTATUS -NTAPI -PsInitializeThread( - PEPROCESS Process, - PETHREAD* ThreadPtr, - POBJECT_ATTRIBUTES ObjectAttributes, - KPROCESSOR_MODE AccessMode, - BOOLEAN First -); - -PACCESS_TOKEN -STDCALL -PsReferenceEffectiveToken( - PETHREAD Thread, - PTOKEN_TYPE TokenType, - PUCHAR b, - PSECURITY_IMPERSONATION_LEVEL Level -); - -NTSTATUS -STDCALL -PsOpenTokenOfProcess( - HANDLE ProcessHandle, - PACCESS_TOKEN* Token -); - -VOID -STDCALL -PspTerminateProcessThreads( - PEPROCESS Process, - NTSTATUS ExitStatus -); - -NTSTATUS -NTAPI -PsSuspendThread( - PETHREAD Thread, - PULONG PreviousCount -); - -NTSTATUS -NTAPI -PsResumeThread( - PETHREAD Thread, - PULONG PreviousCount -); - -NTSTATUS -STDCALL -PspAssignPrimaryToken( - PEPROCESS Process, - HANDLE TokenHandle -); - -PETHREAD -NTAPI -PsGetNextProcessThread( - IN PEPROCESS Process, - IN PETHREAD Thread OPTIONAL -); - -VOID -STDCALL -PsExitSpecialApc( - PKAPC Apc, - PKNORMAL_ROUTINE *NormalRoutine, - PVOID *NormalContext, - PVOID *SystemArgument1, - PVOID *SystemArgument2 -); - -NTSTATUS -STDCALL -PspInitializeProcessSecurity( - PEPROCESS Process, - PEPROCESS Parent OPTIONAL -); - -VOID -STDCALL -PspSystemThreadStartup( - PKSTART_ROUTINE StartRoutine, - PVOID StartContext -); - -NTSTATUS -NTAPI -PsInitializeIdleOrFirstThread( - PEPROCESS Process, - PETHREAD* ThreadPtr, - PKSTART_ROUTINE StartRoutine, - KPROCESSOR_MODE AccessMode, - BOOLEAN First -); - -VOID -STDCALL -PiDeleteProcess(PVOID ObjectBody); - -VOID -STDCALL -PspReapRoutine(PVOID Context); - -VOID -STDCALL -PspExitThread(NTSTATUS ExitStatus); - -NTSTATUS -STDCALL -PspTerminateThreadByPointer( - PETHREAD Thread, - NTSTATUS ExitStatus, - BOOLEAN bSelf -); - -NTSTATUS -NTAPI -PsUnfreezeOtherThread(PETHREAD Thread); - -VOID -NTAPI -PsFreezeOtherThread(PETHREAD Thread); - -VOID -NTAPI -PsFreezeProcessThreads(PEPROCESS Process); - -VOID -NTAPI -PsUnfreezeProcessThreads(PEPROCESS Process); - -ULONG -NTAPI -PsEnumThreadsByProcess(PEPROCESS Process); - -PEPROCESS -STDCALL -PsGetNextProcess(PEPROCESS OldProcess); - -VOID -NTAPI -PsApplicationProcessorInit(VOID); - -VOID -NTAPI -PsPrepareForApplicationProcessorInit(ULONG Id); - -VOID -STDCALL -PsIdleThreadMain(PVOID Context); - -VOID -STDCALL -PiSuspendThreadRundownRoutine(PKAPC Apc); - -VOID -STDCALL -PiSuspendThreadKernelRoutine( - PKAPC Apc, - PKNORMAL_ROUTINE* NormalRoutine, - PVOID* NormalContext, - PVOID* SystemArgument1, - PVOID* SystemArguemnt2 -); - -VOID -STDCALL -PiSuspendThreadNormalRoutine( - PVOID NormalContext, - PVOID SystemArgument1, - PVOID SystemArgument2 -); - -VOID -NTAPI -PsInitialiseSuspendImplementation(VOID); - -VOID -STDCALL -PspExitProcess(BOOLEAN LastThread, - PEPROCESS Process); - -VOID -STDCALL -PspDeleteProcess(PVOID ObjectBody); - -VOID -STDCALL -PspDeleteThread(PVOID ObjectBody); - - -NTSTATUS -NTAPI -PsInitWin32Thread(PETHREAD Thread); - -VOID -NTAPI -PsTerminateWin32Process(PEPROCESS Process); - -VOID -NTAPI -PsTerminateWin32Thread(PETHREAD Thread); - -VOID -NTAPI -PsInitialiseW32Call(VOID); - -VOID -STDCALL -PspRunCreateThreadNotifyRoutines( - PETHREAD, - BOOLEAN -); - -VOID -STDCALL -PspRunCreateProcessNotifyRoutines( - PEPROCESS, - BOOLEAN -); - -VOID -STDCALL -PspRunLegoRoutine(IN PKTHREAD Thread); - -VOID -NTAPI -INIT_FUNCTION -PsInitJobManagment(VOID); - -VOID -STDCALL -PspInheritQuota( - PEPROCESS Process, - PEPROCESS ParentProcess -); - -VOID -STDCALL -PspDestroyQuotaBlock(PEPROCESS Process); - -NTSTATUS -STDCALL -PspMapSystemDll( - PEPROCESS Process, - PVOID *DllBase -); - -NTSTATUS -STDCALL -PsLocateSystemDll(VOID); - -NTSTATUS -STDCALL -PspGetSystemDllEntryPoints(VOID); - -NTSTATUS -NTAPI -PsLockProcess( - PEPROCESS Process, - BOOLEAN Timeout -); - -VOID -NTAPI -PsUnlockProcess(PEPROCESS Process); - -VOID -NTAPI -PspRemoveProcessFromJob( - IN PEPROCESS Process, - IN PEJOB Job -); - -NTSTATUS -NTAPI -PspDeleteLdt(IN PEPROCESS Process); - -NTSTATUS -NTAPI -PspDeleteVdmObjects(IN PEPROCESS Process); - -VOID -NTAPI -PspDeleteProcessSecurity(IN PEPROCESS Process); - -VOID -NTAPI -PspDeleteThreadSecurity(IN PETHREAD Thread); - -VOID -NTAPI -PspExitProcessFromJob( - IN PEJOB Job, - IN PEPROCESS Process -); +extern PCREATE_THREAD_NOTIFY_ROUTINE +PspThreadNotifyRoutine[PSP_MAX_CREATE_THREAD_NOTIFY]; +extern PCREATE_PROCESS_NOTIFY_ROUTINE +PspProcessNotifyRoutine[PSP_MAX_CREATE_PROCESS_NOTIFY]; +extern PLOAD_IMAGE_NOTIFY_ROUTINE +PspLoadImageNotifyRoutine[PSP_MAX_LOAD_IMAGE_NOTIFY]; +extern PLEGO_NOTIFY_ROUTINE PspLegoNotifyRoutine; +extern ULONG PspThreadNotifyRoutineCount; + +#include "ps_x.h" #endif /* __INCLUDE_INTERNAL_PS_H */ Added: trunk/reactos/ntoskrnl/include/internal/ps_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps_x.h (added) +++ trunk/reactos/ntoskrnl/include/internal/ps_x.h Tue Jul 18 02:18:44 2006 @@ -1,0 +1,74 @@ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/include/ps_x.h +* PURPOSE: Intenral Inlined Functions for the Process Manager +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +* Thomas Weidenmueller (w3seek(a)reactos.org) +*/ + +VOID +FORCEINLINE +PspRunCreateThreadNotifyRoutines(IN PETHREAD CurrentThread, + IN BOOLEAN Create) +{ + ULONG i; + CLIENT_ID Cid = CurrentThread->Cid; + + /* Loop the notify routines */ + for (i = 0; i < PspThreadNotifyRoutineCount; i++) + { + /* Call it */ + PspThreadNotifyRoutine[i](Cid.UniqueProcess, Cid.UniqueThread, Create); + } +} + +VOID +FORCEINLINE +PspRunCreateProcessNotifyRoutines(IN PEPROCESS CurrentProcess, + IN BOOLEAN Create) +{ + ULONG i; + HANDLE ProcessId = (HANDLE)CurrentProcess->UniqueProcessId; + HANDLE ParentId = CurrentProcess->InheritedFromUniqueProcessId; + + /* Loop the notify routines */ + for(i = 0; i < PSP_MAX_CREATE_PROCESS_NOTIFY; ++i) + { + /* Make sure it exists */ + if(PspProcessNotifyRoutine[i]) + { + /* Call it */ + PspProcessNotifyRoutine[i](ParentId, ProcessId, Create); + } + } +} + +VOID +FORCEINLINE +PspRunLoadImageNotifyRoutines(PUNICODE_STRING FullImageName, + HANDLE ProcessId, + PIMAGE_INFO ImageInfo) +{ + ULONG i; + + /* Loop the notify routines */ + for (i = 0; i < PSP_MAX_LOAD_IMAGE_NOTIFY; ++ i) + { + /* Make sure it exists */ + if (PspLoadImageNotifyRoutine[i]) + { + /* Call it */ + PspLoadImageNotifyRoutine[i](FullImageName, ProcessId, ImageInfo); + } + } +} + +VOID +FORCEINLINE +PspRunLegoRoutine(IN PKTHREAD Thread) +{ + /* Call it */ + if (PspLegoNotifyRoutine) PspLegoNotifyRoutine(Thread); +} + Modified: trunk/reactos/ntoskrnl/ps/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/notify.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/notify.c (original) +++ trunk/reactos/ntoskrnl/ps/notify.c Tue Jul 18 02:18:44 2006 @@ -1,42 +1,36 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/ps/notify.c - * PURPOSE: Notifications - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PURPOSE: Process Manager: Callbacks to Registered Clients (Drivers) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Thomas Weidenmueller (w3seek(a)reactos.org) */ -/* INCLUDES ****************************************************************/ +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> -/* GLOBAL *******************************************************************/ +/* GLOBALS *******************************************************************/ -#define MAX_THREAD_NOTIFY_ROUTINE_COUNT 8 +ULONG PspThreadNotifyRoutineCount; +PCREATE_THREAD_NOTIFY_ROUTINE +PspThreadNotifyRoutine[PSP_MAX_CREATE_THREAD_NOTIFY]; +PCREATE_PROCESS_NOTIFY_ROUTINE +PspProcessNotifyRoutine[PSP_MAX_CREATE_PROCESS_NOTIFY]; +PLOAD_IMAGE_NOTIFY_ROUTINE +PspLoadImageNotifyRoutine[PSP_MAX_LOAD_IMAGE_NOTIFY]; +PLEGO_NOTIFY_ROUTINE PspLegoNotifyRoutine; -static ULONG PspThreadNotifyRoutineCount = 0; -static PCREATE_THREAD_NOTIFY_ROUTINE -PspThreadNotifyRoutine[MAX_THREAD_NOTIFY_ROUTINE_COUNT]; - -static PCREATE_PROCESS_NOTIFY_ROUTINE -PspProcessNotifyRoutine[MAX_PROCESS_NOTIFY_ROUTINE_COUNT]; - -static PLOAD_IMAGE_NOTIFY_ROUTINE -PspLoadImageNotifyRoutine[MAX_LOAD_IMAGE_NOTIFY_ROUTINE_COUNT]; - -typedef VOID (STDCALL *PLEGO_NOTIFY_ROUTINE)(IN PKTHREAD Thread); -static PLEGO_NOTIFY_ROUTINE PspLegoNotifyRoutine; - -/* FUNCTIONS ***************************************************************/ +/* PUBLIC FUNCTIONS **********************************************************/ /* * @implemented */ NTSTATUS -STDCALL +NTAPI PsSetCreateProcessNotifyRoutine(IN PCREATE_PROCESS_NOTIFY_ROUTINE NotifyRoutine, IN BOOLEAN Remove) { @@ -46,24 +40,24 @@ if (Remove) { /* Loop the routines */ - for(i=0;i<MAX_PROCESS_NOTIFY_ROUTINE_COUNT;i++) + for(i = 0; i < PSP_MAX_CREATE_PROCESS_NOTIFY; i++) { /* Check for a match */ - if ((PVOID)PspProcessNotifyRoutine[i] == (PVOID)NotifyRoutine) + if (PspProcessNotifyRoutine[i] == NotifyRoutine) { /* Remove and return */ PspProcessNotifyRoutine[i] = NULL; - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } } } else { /* Loop the routines */ - for(i=0;i<MAX_PROCESS_NOTIFY_ROUTINE_COUNT;i++) + for(i = 0; i < PSP_MAX_CREATE_PROCESS_NOTIFY; i++) { /* Find an empty one */ - if (PspProcessNotifyRoutine[i] == NULL) + if (!PspProcessNotifyRoutine[i]) { /* Add it */ PspProcessNotifyRoutine[i] = NotifyRoutine; @@ -73,14 +67,14 @@ } /* Nothing found */ - return STATUS_INVALID_PARAMETER; + return Remove ? STATUS_PROCEDURE_NOT_FOUND : STATUS_INVALID_PARAMETER; } /* * @implemented */ ULONG -STDCALL +NTAPI PsSetLegoNotifyRoutine(PVOID LegoNotifyRoutine) { /* Set the System-Wide Lego Routine */ @@ -94,20 +88,20 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI PsRemoveLoadImageNotifyRoutine(IN PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine) { ULONG i; /* Loop the routines */ - for(i=0;i<MAX_LOAD_IMAGE_NOTIFY_ROUTINE_COUNT;i++) + for(i = 0; i < PSP_MAX_LOAD_IMAGE_NOTIFY; i++) { /* Check for a match */ - if ((PVOID)PspLoadImageNotifyRoutine[i] == (PVOID)NotifyRoutine) + if (PspLoadImageNotifyRoutine[i] == NotifyRoutine) { /* Remove and return */ PspLoadImageNotifyRoutine[i] = NULL; - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } } @@ -119,16 +113,16 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI PsSetLoadImageNotifyRoutine(IN PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine) { ULONG i; /* Loop the routines */ - for (i = 0; i < MAX_LOAD_IMAGE_NOTIFY_ROUTINE_COUNT; i++) + for (i = 0; i < PSP_MAX_LOAD_IMAGE_NOTIFY; i++) { /* Find an empty one */ - if (PspLoadImageNotifyRoutine[i] == NULL) + if (!PspLoadImageNotifyRoutine[i]) { /* Add it */ PspLoadImageNotifyRoutine[i] = NotifyRoutine; @@ -144,20 +138,20 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI PsRemoveCreateThreadNotifyRoutine(IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine) { ULONG i; /* Loop the routines */ - for(i=0;i<MAX_THREAD_NOTIFY_ROUTINE_COUNT;i++) + for(i = 0; i < PSP_MAX_CREATE_THREAD_NOTIFY; i++) { /* Check for a match */ - if ((PVOID)PspThreadNotifyRoutine[i] == (PVOID)NotifyRoutine) + if (PspThreadNotifyRoutine[i] == NotifyRoutine) { /* Remove and return */ PspThreadNotifyRoutine[i] = NULL; - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } } @@ -169,75 +163,19 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI PsSetCreateThreadNotifyRoutine(IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine) { - if (PspThreadNotifyRoutineCount >= MAX_THREAD_NOTIFY_ROUTINE_COUNT) + /* Make sure we didn't register too many */ + if (PspThreadNotifyRoutineCount >= PSP_MAX_CREATE_THREAD_NOTIFY) { - return(STATUS_INSUFFICIENT_RESOURCES); + /* Fail */ + return STATUS_INSUFFICIENT_RESOURCES; } - PspThreadNotifyRoutine[PspThreadNotifyRoutineCount] = NotifyRoutine; - PspThreadNotifyRoutineCount++; - - return(STATUS_SUCCESS); -} - -VOID -STDCALL -PspRunCreateThreadNotifyRoutines(PETHREAD CurrentThread, - BOOLEAN Create) -{ - ULONG i; - CLIENT_ID Cid = CurrentThread->Cid; - - for (i = 0; i < PspThreadNotifyRoutineCount; i++) - { - PspThreadNotifyRoutine[i](Cid.UniqueProcess, Cid.UniqueThread, Create); - } -} - -VOID -STDCALL -PspRunCreateProcessNotifyRoutines(PEPROCESS CurrentProcess, - BOOLEAN Create) -{ - ULONG i; - HANDLE ProcessId = (HANDLE)CurrentProcess->UniqueProcessId; - HANDLE ParentId = CurrentProcess->InheritedFromUniqueProcessId; - - for(i = 0; i < MAX_PROCESS_NOTIFY_ROUTINE_COUNT; ++i) - { - if(PspProcessNotifyRoutine[i]) - { - PspProcessNotifyRoutine[i](ParentId, ProcessId, Create); - } - } -} - -VOID -STDCALL -PspRunLoadImageNotifyRoutines(PUNICODE_STRING FullImageName, - HANDLE ProcessId, - PIMAGE_INFO ImageInfo) -{ - ULONG i; - - for (i = 0; i < MAX_PROCESS_NOTIFY_ROUTINE_COUNT; ++ i) - { - if (PspLoadImageNotifyRoutine[i]) - { - PspLoadImageNotifyRoutine[i](FullImageName, ProcessId, ImageInfo); - } - } -} - -VOID -STDCALL -PspRunLegoRoutine(IN PKTHREAD Thread) -{ - /* Call it */ - if (PspLegoNotifyRoutine) (PspLegoNotifyRoutine)(Thread); + /* Register this one */ + PspThreadNotifyRoutine[PspThreadNotifyRoutineCount++] = NotifyRoutine; + return STATUS_SUCCESS; } /* EOF */ Propchange: trunk/reactos/ntoskrnl/ps/notify.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 2 months

[greatlrd] 23130: start implement DrvGetDirectDrawInfo it is not complete only around 1/3 is done

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jul 18 02:14:58 2006 New Revision: 23130 URL: http://svn.reactos.org/svn/reactos?rev=23130&view=rev Log: start implement DrvGetDirectDrawInfo it is not complete only around 1/3 is done Modified: trunk/reactos/drivers/video/displays/framebuf/ddenable.c trunk/reactos/drivers/video/displays/framebuf/framebuf.h trunk/reactos/drivers/video/displays/framebuf/screen.c trunk/reactos/drivers/video/displays/framebuf/surface.c Modified: trunk/reactos/drivers/video/displays/framebuf/ddenable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/ddenable.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/ddenable.c Tue Jul 18 02:14:58 2006 @@ -51,16 +51,17 @@ ppdev->ddpfDisplay.dwGBitMask = ppdev->GreenMask; ppdev->ddpfDisplay.dwBBitMask = ppdev->BlueMask; - switch(ppdev->BitsPerPixel) + ppdev->ddpfDisplay.dwRGBBitCount=ppdev->BitsPerPixel; + ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0; + ppdev->ddpfDisplay.dwFlags = DDPF_RGB; + + switch(ppdev->iDitherFormat) { - case BMF_8BPP: - ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0; - ppdev->ddpfDisplay.dwRGBBitCount=8; - ppdev->ddpfDisplay.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8; + case BMF_8BPP: + ppdev->ddpfDisplay.dwFlags |= DDPF_PALETTEINDEXED8; break; - case BMF_16BPP: - ppdev->ddpfDisplay.dwRGBBitCount=16; + case BMF_16BPP: switch(ppdev->RedMask) { case 0x7C00: @@ -68,28 +69,23 @@ break; default: - ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0; + break; } break; - case BMF_24BPP: - ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0; - ppdev->ddpfDisplay.dwRGBBitCount=24; + case BMF_24BPP: break; case BMF_32BPP: - ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0xff000000; - ppdev->ddpfDisplay.dwRGBBitCount=32; + ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0xff000000; break; + default: - /* FIXME unknown pixelformat */ + /* FIXME unknown pixel bits */ + ppdev->ddpfDisplay.dwRGBBitCount=0; break; } - - - //InitDDHAL(ppdev); - - + if (pCallBacks !=NULL) { memset(pCallBacks,0,sizeof(DD_CALLBACKS)); @@ -138,6 +134,52 @@ OUT DWORD *pdwNumFourCCCodes, OUT DWORD *pdwFourCC) { - return FALSE; + PPDEV ppdev = (PPDEV)dhpdev; + + /* rest some data */ + *pdwNumFourCCCodes = 0; + *pdwNumHeaps = 0; + + + + /* + check see if pvmList and pdwFourCC are second call + or frist. Secon call we fill in pHalInfo info + */ + + if(!(pvmList && pdwFourCC)) + { + + /* Calc how much memmory is left on the video cards memmory */ + pHalInfo->ddCaps.dwVidMemTotal = (ppdev->MemHeight - ppdev->ScreenHeight) * ppdev->ScreenDelta; + + /* fill in some basic info that we need */ + pHalInfo->vmiData.pvPrimary = ppdev->ScreenPtr; + pHalInfo->vmiData.fpPrimary = 0; + pHalInfo->vmiData.dwDisplayWidth = ppdev->ScreenWidth; + pHalInfo->vmiData.dwDisplayHeight = ppdev->ScreenHeight; + pHalInfo->vmiData.lDisplayPitch = ppdev->ScreenDelta; + pHalInfo->vmiData.ddpfDisplay.dwSize = sizeof(DDPIXELFORMAT); + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_RGB; + pHalInfo->vmiData.ddpfDisplay.dwRGBBitCount = ppdev->BitsPerPixel; + pHalInfo->vmiData.ddpfDisplay.dwRBitMask = ppdev->RedMask; + pHalInfo->vmiData.ddpfDisplay.dwGBitMask = ppdev->GreenMask; + pHalInfo->vmiData.ddpfDisplay.dwBBitMask = ppdev->BlueMask; + pHalInfo->vmiData.dwOffscreenAlign = 4; + pHalInfo->vmiData.dwZBufferAlign = 4; + pHalInfo->vmiData.dwTextureAlign = 4; + + if ( ppdev->BitsPerPixel == 8 ) + { + pHalInfo->vmiData.ddpfDisplay.dwFlags |= DDPF_PALETTEINDEXED8; + } + + + + + + } + + return TRUE; } Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/framebuf.h (original) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.h Tue Jul 18 02:14:58 2006 @@ -63,6 +63,8 @@ #endif /* DirectX Support */ + DWORD iDitherFormat; + ULONG MemHeight; BOOL bDDInitialized; DDPIXELFORMAT ddpfDisplay; DDHALINFO dxHalInfo; Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/screen.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/screen.c Tue Jul 18 02:14:58 2006 @@ -190,6 +190,8 @@ ppdev->ScreenHeight = SelectedMode->VisScreenHeight; ppdev->ScreenDelta = SelectedMode->ScreenStride; ppdev->BitsPerPixel = SelectedMode->BitsPerPlane * SelectedMode->NumberOfPlanes; + + ppdev->MemHeight = SelectedMode->VideoMemoryBitmapHeight; ppdev->RedMask = SelectedMode->RedMask; ppdev->GreenMask = SelectedMode->GreenMask; Modified: trunk/reactos/drivers/video/displays/framebuf/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/surface.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/surface.c Tue Jul 18 02:14:58 2006 @@ -91,6 +91,8 @@ return FALSE; } + ppdev->iDitherFormat = BitmapType; + ScreenSize.cx = ppdev->ScreenWidth; ScreenSize.cy = ppdev->ScreenHeight; @@ -181,8 +183,9 @@ &ulTemp); if (ppdev->BitsPerPixel == 8) { - IntSetPalette(dhpdev, ppdev->PaletteEntries, 0, 256); + IntSetPalette(dhpdev, ppdev->PaletteEntries, 0, 256); } + return Result; }

18 years, 2 months

[hpoussin] 23129: - kbdclass/mouclass should be able to return more than one keystroke/mouse move during a IRP_MJ_READ. - Better cleanup in case of error in ClassAddDevice - Registering the interface is optional. Don't fail in case of error.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Jul 18 02:13:40 2006 New Revision: 23129 URL: http://svn.reactos.org/svn/reactos?rev=23129&view=rev Log: - kbdclass/mouclass should be able to return more than one keystroke/mouse move during a IRP_MJ_READ. - Better cleanup in case of error in ClassAddDevice - Registering the interface is optional. Don't fail in case of error. Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/kbdclass/kbdclass.h trunk/reactos/drivers/input/mouclass/mouclass.c trunk/reactos/drivers/input/mouclass/mouclass.h Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c Tue Jul 18 02:13:40 2006 @@ -126,7 +126,7 @@ PLIST_ENTRY Head = &((PCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->ListHead; if (Head->Flink != Head) { - /* We have at least one keyboard */ + /* We have at least one device */ PPORT_DEVICE_EXTENSION DevExt = CONTAINING_RECORD(Head->Flink, PORT_DEVICE_EXTENSION, ListEntry); IoGetCurrentIrpStackLocation(Irp)->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; IoSkipCurrentIrpStackLocation(Irp); @@ -375,6 +375,7 @@ ExFreePool(DeviceNameU.Buffer); return STATUS_INSUFFICIENT_RESOURCES; } + DeviceExtension->DeviceName = DeviceNameU.Buffer; Fdo->Flags |= DO_POWER_PAGABLE; Fdo->Flags |= DO_BUFFERED_IO; /* FIXME: Why is it needed for 1st stage setup? */ Fdo->Flags &= ~DO_DEVICE_INITIALIZING; @@ -383,13 +384,11 @@ RtlWriteRegistryValue( RTL_REGISTRY_DEVICEMAP, DriverExtension->DeviceBaseName.Buffer, - DeviceNameU.Buffer, + DeviceExtension->DeviceName, REG_SZ, DriverExtension->RegistryPath.Buffer, DriverExtension->RegistryPath.MaximumLength); - ExFreePool(DeviceNameU.Buffer); - if (ClassDO) *ClassDO = Fdo; @@ -397,10 +396,11 @@ } static NTSTATUS -FillOneEntry( +FillEntries( IN PDEVICE_OBJECT ClassDeviceObject, IN PIRP Irp, - IN PKEYBOARD_INPUT_DATA DataStart) + IN PKEYBOARD_INPUT_DATA DataStart, + IN SIZE_T NumberOfEntries) { NTSTATUS Status = STATUS_SUCCESS; @@ -409,7 +409,7 @@ RtlCopyMemory( Irp->AssociatedIrp.SystemBuffer, DataStart, - sizeof(KEYBOARD_INPUT_DATA)); + NumberOfEntries * sizeof(KEYBOARD_INPUT_DATA)); } else if (ClassDeviceObject->Flags & DO_DIRECT_IO) { @@ -419,7 +419,7 @@ RtlCopyMemory( DestAddress, DataStart, - sizeof(KEYBOARD_INPUT_DATA)); + NumberOfEntries * sizeof(KEYBOARD_INPUT_DATA)); } else Status = STATUS_UNSUCCESSFUL; @@ -431,7 +431,7 @@ RtlCopyMemory( Irp->UserBuffer, DataStart, - sizeof(KEYBOARD_INPUT_DATA)); + NumberOfEntries * sizeof(KEYBOARD_INPUT_DATA)); } _SEH_HANDLE { @@ -453,7 +453,6 @@ PCLASS_DEVICE_EXTENSION ClassDeviceExtension = ClassDeviceObject->DeviceExtension; PIRP Irp = NULL; KIRQL OldIrql; - PIO_STACK_LOCATION Stack; ULONG InputCount = DataEnd - DataStart; ULONG ReadSize; @@ -468,31 +467,35 @@ */ if (ClassDeviceExtension->ReadIsPending == TRUE && InputCount) { + /* A read request is waiting for input, so go straight to it */ NTSTATUS Status; + SIZE_T NumberOfEntries; Irp = ClassDeviceObject->CurrentIrp; ClassDeviceObject->CurrentIrp = NULL; - Stack = IoGetCurrentIrpStackLocation(Irp); - - /* A read request is waiting for input, so go straight to it */ - Status = FillOneEntry( + + NumberOfEntries = MIN( + InputCount, + IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length / sizeof(KEYBOARD_INPUT_DATA)); + + Status = FillEntries( ClassDeviceObject, Irp, - DataStart); + DataStart, + NumberOfEntries); if (NT_SUCCESS(Status)) { /* Go to next packet and complete this request with STATUS_SUCCESS */ Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(KEYBOARD_INPUT_DATA); - Stack->Parameters.Read.Length = sizeof(KEYBOARD_INPUT_DATA); + Irp->IoStatus.Information = NumberOfEntries * sizeof(KEYBOARD_INPUT_DATA); ClassDeviceExtension->ReadIsPending = FALSE; /* Skip the packet we just sent away */ - DataStart++; - (*ConsumedCount)++; - InputCount--; + DataStart += NumberOfEntries; + (*ConsumedCount) += NumberOfEntries; + InputCount -= NumberOfEntries; } } @@ -561,11 +564,14 @@ ConnectData.ClassDeviceObject = ClassDO; ConnectData.ClassService = ClassCallback; - Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_KEYBOARD_CONNECT, + Irp = IoBuildDeviceIoControlRequest( + IOCTL_INTERNAL_KEYBOARD_CONNECT, PortDO, &ConnectData, sizeof(CONNECT_DATA), NULL, 0, TRUE, &Event, &IoStatus); + if (!Irp) + return STATUS_INSUFFICIENT_RESOURCES; Status = IoCallDriver(PortDO, Irp); @@ -593,16 +599,65 @@ return IoStatus.Status; } -/* Send IOCTL_INTERNAL_*_DISCONNECT to port */ -static NTSTATUS -DisconnectPortDriver( +/* Send IOCTL_INTERNAL_*_DISCONNECT to port + destroy the Port DO */ +static VOID +DestroyPortDriver( IN PDEVICE_OBJECT PortDO) { - DPRINT("Disconnecting PortDO %p [%wZ]\n", + PPORT_DEVICE_EXTENSION DeviceExtension; + PCLASS_DEVICE_EXTENSION ClassDeviceExtension; + PCLASS_DRIVER_EXTENSION DriverExtension; + KEVENT Event; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + KIRQL OldIrql; + NTSTATUS Status; + + DPRINT("Destroying PortDO %p [%wZ]\n", PortDO, &PortDO->DriverObject->DriverName); - DPRINT1("FIXME: Need to send IOCTL_INTERNAL_*_DISCONNECT\n"); - return STATUS_NOT_IMPLEMENTED; + DeviceExtension = (PPORT_DEVICE_EXTENSION)PortDO->DeviceExtension; + ClassDeviceExtension = DeviceExtension->ClassDO->DeviceExtension; + DriverExtension = IoGetDriverObjectExtension(PortDO->DriverObject, PortDO->DriverObject); + + /* Send IOCTL_INTERNAL_*_DISCONNECT */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest( + IOCTL_INTERNAL_KEYBOARD_DISCONNECT, + PortDO, + NULL, 0, + NULL, 0, + TRUE, &Event, &IoStatus); + if (Irp) + { + Status = IoCallDriver(PortDO, Irp); + if (Status == STATUS_PENDING) + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + } + + /* Remove from ClassDeviceExtension->ListHead list */ + KeAcquireSpinLock(&ClassDeviceExtension->ListSpinLock, &OldIrql); + RemoveHeadList(DeviceExtension->ListEntry.Blink); + KeReleaseSpinLock(&ClassDeviceExtension->ListSpinLock, OldIrql); + + /* Remove entry from HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP\[DeviceBaseName] */ + RtlDeleteRegistryValue( + RTL_REGISTRY_DEVICEMAP, + DriverExtension->DeviceBaseName.Buffer, + ClassDeviceExtension->DeviceName); + + if (DeviceExtension->LowerDevice) + IoDetachDevice(DeviceExtension->LowerDevice); + ObDereferenceObject(PortDO); + + if (!DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) + { + ExFreePool(ClassDeviceExtension->PortData); + ExFreePool((PVOID)ClassDeviceExtension->DeviceName); + IoDeleteDevice(DeviceExtension->ClassDO); + } + + IoDeleteDevice(PortDO); } static NTSTATUS NTAPI @@ -679,44 +734,21 @@ } Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - /* Register interface */ + /* Register interface ; ignore the error (if any) as having + * a registred interface is not so important... */ Status = IoRegisterDeviceInterface( Pdo, &GUID_DEVINTERFACE_KEYBOARD, NULL, &DeviceExtension->InterfaceName); - if (Status == STATUS_INVALID_PARAMETER_1) - { - /* The Pdo was a strange one ; maybe it is a legacy device. - * Ignore the error. */ - return STATUS_SUCCESS; - } - else if (!NT_SUCCESS(Status)) - { - DPRINT("IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); - goto cleanup; - } + if (!NT_SUCCESS(Status)) + DeviceExtension->InterfaceName.Length = 0; return STATUS_SUCCESS; cleanup: - if (!(Fdo->Flags & DO_DEVICE_INITIALIZING)) - DisconnectPortDriver(Fdo); - if (DeviceExtension) - { - if (DeviceExtension->LowerDevice) - IoDetachDevice(DeviceExtension->LowerDevice); - if (!DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) - { - PCLASS_DEVICE_EXTENSION ClassDeviceExtension; - ClassDeviceExtension = (PCLASS_DEVICE_EXTENSION)DeviceExtension->ClassDO->DeviceExtension; - ExFreePool(ClassDeviceExtension->PortData); - /* FIXME BSOD for second boot when u press on finsih buttom or wait timeout */ - //IoDeleteDevice(DeviceExtension->ClassDO); - } - } if (Fdo) - IoDeleteDevice(Fdo); + DestroyPortDriver(Fdo); return Status; } @@ -726,7 +758,6 @@ IN PIRP Irp) { PCLASS_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; - PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); ASSERT(DeviceExtension->Common.IsClassDO); @@ -734,29 +765,34 @@ { KIRQL oldIrql; NTSTATUS Status; + SIZE_T NumberOfEntries; + + NumberOfEntries = MIN( + DeviceExtension->InputCount, + IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length / sizeof(KEYBOARD_INPUT_DATA)); KeAcquireSpinLock(&DeviceExtension->SpinLock, &oldIrql); - Status = FillOneEntry( + Status = FillEntries( DeviceObject, Irp, - &DeviceExtension->PortData[DeviceExtension->InputCount - 1]); + DeviceExtension->PortData, + NumberOfEntries); if (NT_SUCCESS(Status)) { - if (DeviceExtension->InputCount > 1) + if (DeviceExtension->InputCount > NumberOfEntries) { RtlMoveMemory( - &DeviceExtension->PortData[1], &DeviceExtension->PortData[0], - (DeviceExtension->InputCount - 1) * sizeof(KEYBOARD_INPUT_DATA)); + &DeviceExtension->PortData[NumberOfEntries], + (DeviceExtension->InputCount - NumberOfEntries) * sizeof(KEYBOARD_INPUT_DATA)); } - DeviceExtension->InputCount--; + DeviceExtension->InputCount -= NumberOfEntries; DeviceExtension->ReadIsPending = FALSE; - Irp->IoStatus.Information = sizeof(KEYBOARD_INPUT_DATA); - Stack->Parameters.Read.Length = sizeof(KEYBOARD_INPUT_DATA); + Irp->IoStatus.Information = NumberOfEntries * sizeof(KEYBOARD_INPUT_DATA); } /* Go to next packet and complete this request */ Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.h (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.h Tue Jul 18 02:13:40 2006 @@ -5,6 +5,8 @@ #include <stdio.h> #define MAX_PATH 260 + +#define MIN(a, b) ((a) < (b) ? (a) : (b)) typedef enum { @@ -56,6 +58,7 @@ BOOLEAN ReadIsPending; ULONG InputCount; PKEYBOARD_INPUT_DATA PortData; + LPCWSTR DeviceName; } CLASS_DEVICE_EXTENSION, *PCLASS_DEVICE_EXTENSION; /* misc.c */ Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c Tue Jul 18 02:13:40 2006 @@ -123,7 +123,7 @@ PLIST_ENTRY Head = &((PCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->ListHead; if (Head->Flink != Head) { - /* We have at least one mouse */ + /* We have at least one device */ PPORT_DEVICE_EXTENSION DevExt = CONTAINING_RECORD(Head->Flink, PORT_DEVICE_EXTENSION, ListEntry); IoGetCurrentIrpStackLocation(Irp)->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; IoSkipCurrentIrpStackLocation(Irp); @@ -352,6 +352,7 @@ ExFreePool(DeviceNameU.Buffer); return STATUS_INSUFFICIENT_RESOURCES; } + DeviceExtension->DeviceName = DeviceNameU.Buffer; Fdo->Flags |= DO_POWER_PAGABLE; Fdo->Flags &= ~DO_DEVICE_INITIALIZING; @@ -359,13 +360,11 @@ RtlWriteRegistryValue( RTL_REGISTRY_DEVICEMAP, DriverExtension->DeviceBaseName.Buffer, - DeviceNameU.Buffer, + DeviceExtension->DeviceName, REG_SZ, DriverExtension->RegistryPath.Buffer, DriverExtension->RegistryPath.MaximumLength); - ExFreePool(DeviceNameU.Buffer); - if (ClassDO) *ClassDO = Fdo; @@ -373,10 +372,11 @@ } static NTSTATUS -FillOneEntry( +FillEntries( IN PDEVICE_OBJECT ClassDeviceObject, IN PIRP Irp, - IN PMOUSE_INPUT_DATA DataStart) + IN PMOUSE_INPUT_DATA DataStart, + IN SIZE_T NumberOfEntries) { NTSTATUS Status = STATUS_SUCCESS; @@ -385,7 +385,7 @@ RtlCopyMemory( Irp->AssociatedIrp.SystemBuffer, DataStart, - sizeof(MOUSE_INPUT_DATA)); + NumberOfEntries * sizeof(MOUSE_INPUT_DATA)); } else if (ClassDeviceObject->Flags & DO_DIRECT_IO) { @@ -395,7 +395,7 @@ RtlCopyMemory( DestAddress, DataStart, - sizeof(MOUSE_INPUT_DATA)); + NumberOfEntries * sizeof(MOUSE_INPUT_DATA)); } else Status = STATUS_UNSUCCESSFUL; @@ -407,7 +407,7 @@ RtlCopyMemory( Irp->UserBuffer, DataStart, - sizeof(MOUSE_INPUT_DATA)); + NumberOfEntries * sizeof(MOUSE_INPUT_DATA)); } _SEH_HANDLE { @@ -429,7 +429,6 @@ PCLASS_DEVICE_EXTENSION ClassDeviceExtension = ClassDeviceObject->DeviceExtension; PIRP Irp = NULL; KIRQL OldIrql; - PIO_STACK_LOCATION Stack; ULONG InputCount = DataEnd - DataStart; ULONG ReadSize; @@ -444,31 +443,35 @@ */ if (ClassDeviceExtension->ReadIsPending == TRUE && InputCount) { + /* A read request is waiting for input, so go straight to it */ NTSTATUS Status; + SIZE_T NumberOfEntries; Irp = ClassDeviceObject->CurrentIrp; ClassDeviceObject->CurrentIrp = NULL; - Stack = IoGetCurrentIrpStackLocation(Irp); - - /* A read request is waiting for input, so go straight to it */ - Status = FillOneEntry( + + NumberOfEntries = MIN( + InputCount, + IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length / sizeof(MOUSE_INPUT_DATA)); + + Status = FillEntries( ClassDeviceObject, Irp, - DataStart); + DataStart, + NumberOfEntries); if (NT_SUCCESS(Status)) { /* Go to next packet and complete this request with STATUS_SUCCESS */ Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(MOUSE_INPUT_DATA); - Stack->Parameters.Read.Length = sizeof(MOUSE_INPUT_DATA); + Irp->IoStatus.Information = NumberOfEntries * sizeof(MOUSE_INPUT_DATA); ClassDeviceExtension->ReadIsPending = FALSE; /* Skip the packet we just sent away */ - DataStart++; - (*ConsumedCount)++; - InputCount--; + DataStart += NumberOfEntries; + (*ConsumedCount) += NumberOfEntries; + InputCount -= NumberOfEntries; } } @@ -537,11 +540,14 @@ ConnectData.ClassDeviceObject = ClassDO; ConnectData.ClassService = ClassCallback; - Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_MOUSE_CONNECT, + Irp = IoBuildDeviceIoControlRequest( + IOCTL_INTERNAL_MOUSE_CONNECT, PortDO, &ConnectData, sizeof(CONNECT_DATA), NULL, 0, TRUE, &Event, &IoStatus); + if (!Irp) + return STATUS_INSUFFICIENT_RESOURCES; Status = IoCallDriver(PortDO, Irp); @@ -569,16 +575,65 @@ return IoStatus.Status; } -/* Send IOCTL_INTERNAL_*_DISCONNECT to port */ -static NTSTATUS -DisconnectPortDriver( +/* Send IOCTL_INTERNAL_*_DISCONNECT to port + destroy the Port DO */ +static VOID +DestroyPortDriver( IN PDEVICE_OBJECT PortDO) { - DPRINT("Disconnecting PortDO %p [%wZ]\n", + PPORT_DEVICE_EXTENSION DeviceExtension; + PCLASS_DEVICE_EXTENSION ClassDeviceExtension; + PCLASS_DRIVER_EXTENSION DriverExtension; + KEVENT Event; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + KIRQL OldIrql; + NTSTATUS Status; + + DPRINT("Destroying PortDO %p [%wZ]\n", PortDO, &PortDO->DriverObject->DriverName); - DPRINT1("FIXME: Need to send IOCTL_INTERNAL_*_DISCONNECT\n"); - return STATUS_NOT_IMPLEMENTED; + DeviceExtension = (PPORT_DEVICE_EXTENSION)PortDO->DeviceExtension; + ClassDeviceExtension = DeviceExtension->ClassDO->DeviceExtension; + DriverExtension = IoGetDriverObjectExtension(PortDO->DriverObject, PortDO->DriverObject); + + /* Send IOCTL_INTERNAL_*_DISCONNECT */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest( + IOCTL_INTERNAL_MOUSE_DISCONNECT, + PortDO, + NULL, 0, + NULL, 0, + TRUE, &Event, &IoStatus); + if (Irp) + { + Status = IoCallDriver(PortDO, Irp); + if (Status == STATUS_PENDING) + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + } + + /* Remove from ClassDeviceExtension->ListHead list */ + KeAcquireSpinLock(&ClassDeviceExtension->ListSpinLock, &OldIrql); + RemoveHeadList(DeviceExtension->ListEntry.Blink); + KeReleaseSpinLock(&ClassDeviceExtension->ListSpinLock, OldIrql); + + /* Remove entry from HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP\[DeviceBaseName] */ + RtlDeleteRegistryValue( + RTL_REGISTRY_DEVICEMAP, + DriverExtension->DeviceBaseName.Buffer, + ClassDeviceExtension->DeviceName); + + if (DeviceExtension->LowerDevice) + IoDetachDevice(DeviceExtension->LowerDevice); + ObDereferenceObject(PortDO); + + if (!DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) + { + ExFreePool(ClassDeviceExtension->PortData); + ExFreePool((PVOID)ClassDeviceExtension->DeviceName); + IoDeleteDevice(DeviceExtension->ClassDO); + } + + IoDeleteDevice(PortDO); } static NTSTATUS NTAPI @@ -655,44 +710,21 @@ } Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - /* Register interface */ - Status = IoRegisterDeviceInterface( + /* Register interface ; ignore the error (if any) as having + * a registred interface is not so important... */ + IoRegisterDeviceInterface( Pdo, &GUID_DEVINTERFACE_MOUSE, NULL, &DeviceExtension->InterfaceName); - if (Status == STATUS_INVALID_PARAMETER_1) - { - /* The Pdo was a strange one ; maybe it is a legacy device. - * Ignore the error. */ - return STATUS_SUCCESS; - } - else if (!NT_SUCCESS(Status)) - { - DPRINT("IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); - goto cleanup; - } + if (!NT_SUCCESS(Status)) + DeviceExtension->InterfaceName.Length = 0; return STATUS_SUCCESS; cleanup: - if (!(Fdo->Flags & DO_DEVICE_INITIALIZING)) - DisconnectPortDriver(Fdo); - if (DeviceExtension) - { - if (DeviceExtension->LowerDevice) - IoDetachDevice(DeviceExtension->LowerDevice); - if (!DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) - { - PCLASS_DEVICE_EXTENSION ClassDeviceExtension; - ClassDeviceExtension = (PCLASS_DEVICE_EXTENSION)DeviceExtension->ClassDO->DeviceExtension; - ExFreePool(ClassDeviceExtension->PortData); - /* FIXME BSOD for second boot when u press on finsih buttom or wait timeout */ - // IoDeleteDevice(DeviceExtension->ClassDO); - } - } if (Fdo) - IoDeleteDevice(Fdo); + DestroyPortDriver(Fdo); return Status; } @@ -702,7 +734,6 @@ IN PIRP Irp) { PCLASS_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; - PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); ASSERT(DeviceExtension->Common.IsClassDO); @@ -710,29 +741,34 @@ { KIRQL oldIrql; NTSTATUS Status; + SIZE_T NumberOfEntries; + + NumberOfEntries = MIN( + DeviceExtension->InputCount, + IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length / sizeof(MOUSE_INPUT_DATA)); KeAcquireSpinLock(&DeviceExtension->SpinLock, &oldIrql); - Status = FillOneEntry( + Status = FillEntries( DeviceObject, Irp, - &DeviceExtension->PortData[DeviceExtension->InputCount - 1]); + DeviceExtension->PortData, + NumberOfEntries); if (NT_SUCCESS(Status)) { - if (DeviceExtension->InputCount > 1) + if (DeviceExtension->InputCount > NumberOfEntries) { RtlMoveMemory( - &DeviceExtension->PortData[1], &DeviceExtension->PortData[0], - (DeviceExtension->InputCount - 1) * sizeof(MOUSE_INPUT_DATA)); + &DeviceExtension->PortData[NumberOfEntries], + (DeviceExtension->InputCount - NumberOfEntries) * sizeof(MOUSE_INPUT_DATA)); } - DeviceExtension->InputCount--; + DeviceExtension->InputCount -= NumberOfEntries; DeviceExtension->ReadIsPending = FALSE; - Irp->IoStatus.Information = sizeof(MOUSE_INPUT_DATA); - Stack->Parameters.Read.Length = sizeof(MOUSE_INPUT_DATA); + Irp->IoStatus.Information = NumberOfEntries * sizeof(MOUSE_INPUT_DATA); } /* Go to next packet and complete this request */ Modified: trunk/reactos/drivers/input/mouclass/mouclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.h (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.h Tue Jul 18 02:13:40 2006 @@ -5,6 +5,8 @@ #include <stdio.h> #define MAX_PATH 260 + +#define MIN(a, b) ((a) < (b) ? (a) : (b)) typedef enum { @@ -56,6 +58,7 @@ BOOLEAN ReadIsPending; ULONG InputCount; PMOUSE_INPUT_DATA PortData; + LPCWSTR DeviceName; } CLASS_DEVICE_EXTENSION, *PCLASS_DEVICE_EXTENSION; /* misc.c */

18 years, 2 months

← Newer
1
...
24
25
26
27
28
29
30
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006