Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 20797: minor fixes and use a .spec file
by weiden＠svn.reactos.org 12 Jan '06

12 Jan '06

minor fixes and use a .spec file Modified: trunk/reactos/lib/aclui/aclui.c Deleted: trunk/reactos/lib/aclui/aclui.def Added: trunk/reactos/lib/aclui/aclui.spec Modified: trunk/reactos/lib/aclui/aclui.xml Modified: trunk/reactos/lib/aclui/aclui_Hu.rc Modified: trunk/reactos/lib/aclui/precomp.h Modified: trunk/reactos/lib/aclui/sidcache.c _____ Modified: trunk/reactos/lib/aclui/aclui.c --- trunk/reactos/lib/aclui/aclui.c 2006-01-12 00:13:45 UTC (rev 20796) +++ trunk/reactos/lib/aclui/aclui.c 2006-01-12 00:19:35 UTC (rev 20797) @@ -342,6 +342,27 @@ return lpDisplayString; } +static LPWSTR +GetPrincipalAccountNameString(IN PPRINCIPAL_LISTITEM PrincipalListItem) +{ + LPWSTR lpDisplayString = NULL; + + if (PrincipalListItem->SidReqResult != NULL) + { + LoadAndFormatString(hDllInstance, + IDS_USERFORMAT, + &lpDisplayString, + PrincipalListItem->SidReqResult->AccountName); + } + else + { + ConvertSidToStringSid((PSID)(PrincipalListItem + 1), + &lpDisplayString); + } + + return lpDisplayString; +} + static VOID CreatePrincipalListItem(OUT LVITEM *li, IN PSECURITY_PAGE sp, @@ -543,7 +564,7 @@ LPWSTR szLabel; LPWSTR szDisplayString; - szDisplayString = GetPrincipalDisplayString(Selected); + szDisplayString = GetPrincipalAccountNameString(Selected); if (LoadAndFormatString(hDllInstance, IDS_PERMISSIONS_FOR, &szLabel, _____ Deleted: trunk/reactos/lib/aclui/aclui.def --- trunk/reactos/lib/aclui/aclui.def 2006-01-12 00:13:45 UTC (rev 20796) +++ trunk/reactos/lib/aclui/aclui.def 2006-01-12 00:19:35 UTC (rev 20797) @@ -1,22 +0,0 @@ -LIBRARY aclui.dll - -EXPORTS -CreateSecurityPage@4 @1 -EditSecurity@8 @2 -;ACLUI.3 -;ACLUI.4 -;ACLUI.5 -;ACLUI.6 -;ACLUI.7 -;ACLUI.8 -;ACLUI.9 -;ACLUI.10 -;ACLUI.11 -;ACLUI.12 -;ACLUI.13 -;ACLUI.14 -;ACLUI.15 -IID_ISecurityInformation @16 DATA - - -; EOF _____ Added: trunk/reactos/lib/aclui/aclui.spec --- trunk/reactos/lib/aclui/aclui.spec 2006-01-12 00:13:45 UTC (rev 20796) +++ trunk/reactos/lib/aclui/aclui.spec 2006-01-12 00:19:35 UTC (rev 20797) @@ -0,0 +1,5 @@ +# aclui.dll exports + + 1 stdcall CreateSecurityPage(ptr) + 2 stdcall EditSecurity(ptr ptr) +16 extern IID_ISecurityInformation \ No newline at end of file Property changes on: trunk/reactos/lib/aclui/aclui.spec ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/aclui/aclui.xml --- trunk/reactos/lib/aclui/aclui.xml 2006-01-12 00:13:45 UTC (rev 20796) +++ trunk/reactos/lib/aclui/aclui.xml 2006-01-12 00:19:35 UTC (rev 20797) @@ -1,5 +1,5 @@ <module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}" installbase="system32" installname="aclui.dll"> - <importlibrary definition="aclui.def" /> + <importlibrary definition="aclui.spec.def" /> <include base="aclui">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> @@ -22,5 +22,6 @@ <file>misc.c</file> <file>sidcache.c</file> <file>aclui.rc</file> + <file>aclui.spec</file> <pch>precomp.h</pch> </module> _____ Modified: trunk/reactos/lib/aclui/aclui_Hu.rc --- trunk/reactos/lib/aclui/aclui_Hu.rc 2006-01-12 00:13:45 UTC (rev 20796) +++ trunk/reactos/lib/aclui/aclui_Hu.rc 2006-01-12 00:19:35 UTC (rev 20797) @@ -1,35 +1,35 @@ -/* - * Hungarian resources for aclui - * - * Copyright 2005 Robert Horvath - Hungarian translation - talley at cubeclub.hu -*/ -LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL - -IDD_SECPAGE DIALOGEX 0, 0, 227, 215 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION -CAPTION "Biztonsßg" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "&Csoport vagy felhasznßl¾ nevek:", -1, 7, 7, 105, 8 - CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE - PUSHBUTTON "H&ozzßadßs...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 - PUSHBUTTON "&T÷rlÚs", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 - LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX - LTEXT "EngedÚlyez", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER - LTEXT "Tiltßs", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER - CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE - LTEXT "Tovßbbi beßllÝtßsok megtekintÚsÚhez kattints a Tovßbbi beßllÝtßsok gombra.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT - PUSHBUTTON "&Tovßbbi beßllÝtßsok", IDC_ADVANCED, 165, 194, 55, 14 -END - -STRINGTABLE DISCARDABLE -{ - IDS_PSP_TITLE "%1 engedÚlye" - IDS_UNKNOWN "Ismeretlen" - IDS_SPECIAL_PERMISSIONS "K³l÷nleges engedÚlyek" - IDS_PERMISSIONS_FOR "%1 engedÚlye" - IDS_PERMISSIONS "EngedÚlyek" - IDS_USERDOMAINFORMAT "%1 (%2\\%3)" - IDS_USERFORMAT "%1" -} - +/* + * Hungarian resources for aclui + * + * Copyright 2005 Robert Horvath - Hungarian translation - talley at cubeclub.hu +*/ +LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL + +IDD_SECPAGE DIALOGEX 0, 0, 227, 215 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Biztonsßg" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Csoport vagy felhasznßl¾ nevek:", -1, 7, 7, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + PUSHBUTTON "H&ozzßadßs...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 + PUSHBUTTON "&T÷rlÚs", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 + LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX + LTEXT "EngedÚlyez", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER + LTEXT "Tiltßs", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER + CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE + LTEXT "Tovßbbi beßllÝtßsok megtekintÚsÚhez kattints a Tovßbbi beßllÝtßsok gombra.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + PUSHBUTTON "&Tovßbbi beßllÝtßsok", IDC_ADVANCED, 165, 194, 55, 14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PSP_TITLE "%1 engedÚlye" + IDS_UNKNOWN "Ismeretlen" + IDS_SPECIAL_PERMISSIONS "K³l÷nleges engedÚlyek" + IDS_PERMISSIONS_FOR "%1 engedÚlye" + IDS_PERMISSIONS "EngedÚlyek" + IDS_USERDOMAINFORMAT "%1 (%2\\%3)" + IDS_USERFORMAT "%1" +} + Property changes on: trunk/reactos/lib/aclui/aclui_Hu.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/aclui/precomp.h --- trunk/reactos/lib/aclui/precomp.h 2006-01-12 00:13:45 UTC (rev 20796) +++ trunk/reactos/lib/aclui/precomp.h 2006-01-12 00:19:35 UTC (rev 20797) @@ -62,6 +62,9 @@ SI_ACCESS DefaultAccess; HANDLE SidCacheMgr; + LONG SidLookupsPending; + BOOL Initializing : 1; + LPCWSTR ServerName; } SECURITY_PAGE, *PSECURITY_PAGE; _____ Modified: trunk/reactos/lib/aclui/sidcache.c --- trunk/reactos/lib/aclui/sidcache.c 2006-01-12 00:13:45 UTC (rev 20796) +++ trunk/reactos/lib/aclui/sidcache.c 2006-01-12 00:19:35 UTC (rev 20797) @@ -583,8 +583,7 @@ scm = HeapAlloc(Heap, 0, FIELD_OFFSET(SIDCACHEMGR, - SystemName[0]) + - ((wcslen(SystemName) + 1) * sizeof(WCHAR))); + SystemName[wcslen(SystemName) + 1])); if (scm != NULL) { /* zero the static part of the structure */

1 0

[weiden] 20796: fixed uninitialized variable warning
by weiden＠svn.reactos.org 12 Jan '06

12 Jan '06

fixed uninitialized variable warning Modified: trunk/reactos/ntoskrnl/ke/usercall.c _____ Modified: trunk/reactos/ntoskrnl/ke/usercall.c --- trunk/reactos/ntoskrnl/ke/usercall.c 2006-01-12 00:11:14 UTC (rev 20795) +++ trunk/reactos/ntoskrnl/ke/usercall.c 2006-01-12 00:13:45 UTC (rev 20796) @@ -40,7 +40,7 @@ { ULONG_PTR NewStack, OldStack; PULONG UserEsp; - NTSTATUS CallbackStatus; + NTSTATUS CallbackStatus = STATUS_SUCCESS; PEXCEPTION_REGISTRATION_RECORD ExceptionList; DPRINT("KeUserModeCallback(RoutineIndex %d, Argument %X, ArgumentLength %d)\n", RoutineIndex, Argument, ArgumentLength);

1 0

[weiden] 20795: Fix code assuming that the Reg* functions set the last error code
by weiden＠svn.reactos.org 12 Jan '06

12 Jan '06

Fix code assuming that the Reg* functions set the last error code Modified: trunk/reactos/lib/userenv/desktop.c Modified: trunk/reactos/lib/userenv/environment.c Modified: trunk/reactos/lib/userenv/misc.c Modified: trunk/reactos/lib/userenv/precomp.h Modified: trunk/reactos/lib/userenv/profile.c Modified: trunk/reactos/lib/userenv/registry.c Modified: trunk/reactos/lib/userenv/setup.c Modified: trunk/reactos/lib/userenv/userenv.xml _____ Modified: trunk/reactos/lib/userenv/desktop.c --- trunk/reactos/lib/userenv/desktop.c 2006-01-11 23:54:44 UTC (rev 20794) +++ trunk/reactos/lib/userenv/desktop.c 2006-01-12 00:11:14 UTC (rev 20795) @@ -41,29 +41,34 @@ DWORD dwLength; DWORD dwType; HKEY hKey; + LONG Error; DPRINT ("GetDesktopPath() called\n"); - if (RegOpenKeyExW (HKEY_CURRENT_USER, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", - 0, - KEY_ALL_ACCESS, - &hKey)) + Error = RegOpenKeyExW (HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", + 0, + KEY_ALL_ACCESS, + &hKey); + if (Error != ERROR_SUCCESS) { DPRINT1 ("RegOpenKeyExW() failed\n"); + SetLastError((DWORD)Error); return FALSE; } dwLength = MAX_PATH * sizeof(WCHAR); - if (RegQueryValueExW (hKey, - bCommonPath ? L"Common Desktop" : L"Desktop", - 0, - &dwType, - (LPBYTE)szPath, - &dwLength)) + Error = RegQueryValueExW (hKey, + bCommonPath ? L"Common Desktop" : L"Desktop", + 0, + &dwType, + (LPBYTE)szPath, + &dwLength); + if (Error != ERROR_SUCCESS) { DPRINT1 ("RegQueryValueExW() failed\n"); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -94,29 +99,34 @@ DWORD dwLength; DWORD dwType; HKEY hKey; + LONG Error; DPRINT ("GetProgramsPath() called\n"); - if (RegOpenKeyExW (HKEY_CURRENT_USER, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", - 0, - KEY_ALL_ACCESS, - &hKey)) + Error = RegOpenKeyExW (HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", + 0, + KEY_ALL_ACCESS, + &hKey); + if (Error != ERROR_SUCCESS) { DPRINT1 ("RegOpenKeyExW() failed\n"); + SetLastError((DWORD)Error); return FALSE; } dwLength = MAX_PATH * sizeof(WCHAR); - if (RegQueryValueExW (hKey, - bCommonPath ? L"Common Programs" : L"Programs", - 0, - &dwType, - (LPBYTE)szPath, - &dwLength)) + Error = RegQueryValueExW (hKey, + bCommonPath ? L"Common Programs" : L"Programs", + 0, + &dwType, + (LPBYTE)szPath, + &dwLength); + if (Error != ERROR_SUCCESS) { DPRINT1 ("RegQueryValueExW() failed\n"); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } _____ Modified: trunk/reactos/lib/userenv/environment.c --- trunk/reactos/lib/userenv/environment.c 2006-01-11 23:54:44 UTC (rev 20794) +++ trunk/reactos/lib/userenv/environment.c 2006-01-12 00:11:14 UTC (rev 20795) @@ -169,6 +169,7 @@ { UNICODE_STRING SidString; HKEY hKey; + LONG Error; if (!GetUserSidFromToken (hToken, &SidString)) @@ -177,14 +178,16 @@ return NULL; } - if (RegOpenKeyExW (HKEY_USERS, - SidString.Buffer, - 0, - KEY_ALL_ACCESS, - &hKey)) + Error = RegOpenKeyExW (HKEY_USERS, + SidString.Buffer, + 0, + KEY_ALL_ACCESS, + &hKey); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("RegOpenKeyExW() failed (Error %ld)\n", GetLastError()); + DPRINT1 ("RegOpenKeyExW() failed (Error %ld)\n", Error); RtlFreeUnicodeString (&SidString); + SetLastError((DWORD)Error); return NULL; } @@ -209,32 +212,37 @@ DWORD i; LPWSTR lpValueName; LPWSTR lpValueData; + LONG Error; - if (RegOpenKeyExW (hKey, - lpSubKeyName, - 0, - KEY_ALL_ACCESS, - &hEnvKey)) + Error = RegOpenKeyExW (hKey, + lpSubKeyName, + 0, + KEY_ALL_ACCESS, + &hEnvKey); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("RegOpenKeyExW() failed (Error %ld)\n", GetLastError()); + DPRINT1 ("RegOpenKeyExW() failed (Error %ld)\n", Error); + SetLastError((DWORD)Error); return FALSE; } - if (RegQueryInfoKey (hEnvKey, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - &dwValues, - &dwMaxValueNameLength, - &dwMaxValueDataLength, - NULL, - NULL)) + Error = RegQueryInfoKey (hEnvKey, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &dwValues, + &dwMaxValueNameLength, + &dwMaxValueDataLength, + NULL, + NULL); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("RegQueryInforKey() failed (Error %ld)\n", GetLastError()); + DPRINT1 ("RegQueryInforKey() failed (Error %ld)\n", Error); RegCloseKey (hEnvKey); + SetLastError((DWORD)Error); return FALSE; } @@ -314,13 +322,17 @@ DPRINT("CreateEnvironmentBlock() called\n"); if (lpEnvironment == NULL) - return FALSE; + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } Status = RtlCreateEnvironment ((BOOLEAN)bInherit, (PWSTR*)lpEnvironment); if (!NT_SUCCESS (Status)) { DPRINT1 ("RtlCreateEnvironment() failed (Status %lx)\n", Status); + SetLastError (RtlNtStatusToDosError (Status)); return FALSE; } @@ -390,7 +402,10 @@ DPRINT ("DestroyEnvironmentBlock() called\n"); if (lpEnvironment == NULL) - return FALSE; + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } RtlDestroyEnvironment (lpEnvironment); _____ Modified: trunk/reactos/lib/userenv/misc.c --- trunk/reactos/lib/userenv/misc.c 2006-01-11 23:54:44 UTC (rev 20794) +++ trunk/reactos/lib/userenv/misc.c 2006-01-12 00:11:14 UTC (rev 20795) @@ -91,6 +91,7 @@ if (!NT_SUCCESS (Status)) { LocalFree ((HLOCAL)SidBuffer); + SetLastError (RtlNtStatusToDosError (Status)); return FALSE; } @@ -103,7 +104,10 @@ LocalFree ((HLOCAL)SidBuffer); if (!NT_SUCCESS (Status)) - return FALSE; + { + SetLastError (RtlNtStatusToDosError (Status)); + return FALSE; + } DPRINT ("SidString.Length: %lu\n", SidString->Length); DPRINT ("SidString.MaximumLength: %lu\n", SidString->MaximumLength); _____ Modified: trunk/reactos/lib/userenv/precomp.h --- trunk/reactos/lib/userenv/precomp.h 2006-01-11 23:54:44 UTC (rev 20794) +++ trunk/reactos/lib/userenv/precomp.h 2006-01-12 00:11:14 UTC (rev 20795) @@ -4,6 +4,7 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> #include <userenv.h> +#include <sddl.h> #include <shlobj.h> #include "internal.h" _____ Modified: trunk/reactos/lib/userenv/profile.c --- trunk/reactos/lib/userenv/profile.c 2006-01-11 23:54:44 UTC (rev 20794) +++ trunk/reactos/lib/userenv/profile.c 2006-01-12 00:11:14 UTC (rev 20795) @@ -66,6 +66,7 @@ if (wcslen(lpName) + wcslen(lpszPostfix) >= dwMaxLength) { DPRINT1("Error: buffer overflow\n"); + SetLastError(ERROR_BUFFER_OVERFLOW); return FALSE; } @@ -109,35 +110,39 @@ WCHAR szUserProfilePath[MAX_PATH]; WCHAR szDefaultUserPath[MAX_PATH]; WCHAR szBuffer[MAX_PATH]; - UNICODE_STRING SidString; + LPWSTR SidString; DWORD dwLength; DWORD dwDisposition; HKEY hKey; - NTSTATUS Status; + LONG Error; DPRINT("CreateUserProfileW() called\n"); - if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", - 0, - KEY_ALL_ACCESS, - &hKey)) + Error = RegOpenKeyExW (HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, + KEY_ALL_ACCESS, + &hKey); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); return FALSE; } /* Get profiles path */ dwLength = MAX_PATH * sizeof(WCHAR); - if (RegQueryValueExW (hKey, - L"ProfilesDirectory", - NULL, - NULL, - (LPBYTE)szRawProfilesPath, - &dwLength)) + Error = RegQueryValueExW (hKey, + L"ProfilesDirectory", + NULL, + NULL, + (LPBYTE)szRawProfilesPath, + &dwLength); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -153,15 +158,17 @@ /* Get default user path */ dwLength = MAX_PATH * sizeof(WCHAR); - if (RegQueryValueExW (hKey, - L"DefaultUserProfile", - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength)) + Error = RegQueryValueExW (hKey, + L"DefaultUserProfile", + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -173,7 +180,7 @@ if (!AppendSystemPostfix (szUserProfilePath, MAX_PATH)) { DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); - RtlFreeUnicodeString (&SidString); + LocalFree ((HLOCAL)SidString); RegCloseKey (hKey); return FALSE; } @@ -200,30 +207,32 @@ } /* Add profile to profile list */ - Status = RtlConvertSidToUnicodeString (&SidString, Sid, TRUE); - if (!NT_SUCCESS(Status)) + if (!ConvertSidToStringSidW (Sid, + &SidString)) { - DPRINT1("Status: %lx\n", Status); + DPRINT1("Error: %lu\n", GetLastError()); return FALSE; } wcscpy (szBuffer, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList\\"); - wcscat (szBuffer, SidString.Buffer); + wcscat (szBuffer, SidString); /* Create user profile key */ - if (RegCreateKeyExW (HKEY_LOCAL_MACHINE, - szBuffer, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hKey, - &dwDisposition)) + Error = RegCreateKeyExW (HKEY_LOCAL_MACHINE, + szBuffer, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hKey, + &dwDisposition); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); - RtlFreeUnicodeString (&SidString); + DPRINT1("Error: %lu\n", Error); + LocalFree ((HLOCAL)SidString); + SetLastError((DWORD)Error); return FALSE; } @@ -234,36 +243,40 @@ if (!AppendSystemPostfix (szBuffer, MAX_PATH)) { DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); - RtlFreeUnicodeString (&SidString); + LocalFree ((HLOCAL)SidString); RegCloseKey (hKey); return FALSE; } /* Set 'ProfileImagePath' value (non-expanded) */ - if (RegSetValueExW (hKey, - L"ProfileImagePath", - 0, - REG_EXPAND_SZ, - (LPBYTE)szBuffer, - (wcslen (szBuffer) + 1) * sizeof(WCHAR))) + Error = RegSetValueExW (hKey, + L"ProfileImagePath", + 0, + REG_EXPAND_SZ, + (LPBYTE)szBuffer, + (wcslen (szBuffer) + 1) * sizeof(WCHAR)); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); - RtlFreeUnicodeString (&SidString); + DPRINT1("Error: %lu\n", Error); + LocalFree ((HLOCAL)SidString); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } /* Set 'Sid' value */ - if (RegSetValueExW (hKey, - L"Sid", - 0, - REG_BINARY, - Sid, - RtlLengthSid (Sid))) + Error = RegSetValueExW (hKey, + L"Sid", + 0, + REG_BINARY, + Sid, + GetLengthSid (Sid)); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); - RtlFreeUnicodeString (&SidString); + DPRINT1("Error: %lu\n", Error); + LocalFree ((HLOCAL)SidString); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -274,27 +287,29 @@ wcscat (szBuffer, L"\\ntuser.dat"); /* Create new user hive */ - if (RegLoadKeyW (HKEY_USERS, - SidString.Buffer, - szBuffer)) + Error = RegLoadKeyW (HKEY_USERS, + SidString, + szBuffer); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); - RtlFreeUnicodeString (&SidString); + DPRINT1("Error: %lu\n", Error); + LocalFree ((HLOCAL)SidString); + SetLastError((DWORD)Error); return FALSE; } /* Initialize user hive */ - if (!CreateUserHive (SidString.Buffer, szUserProfilePath)) + if (!CreateUserHive (SidString, szUserProfilePath)) { DPRINT1("Error: %lu\n", GetLastError()); - RtlFreeUnicodeString (&SidString); + LocalFree ((HLOCAL)SidString); return FALSE; } RegUnLoadKeyW (HKEY_USERS, - SidString.Buffer); + SidString); - RtlFreeUnicodeString (&SidString); + LocalFree ((HLOCAL)SidString); DPRINT("CreateUserProfileW() done\n"); @@ -342,28 +357,33 @@ WCHAR szBuffer[MAX_PATH]; DWORD dwLength; HKEY hKey; + LONG Error; - if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", - 0, - KEY_READ, - &hKey)) + Error = RegOpenKeyExW (HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, + KEY_READ, + &hKey); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); return FALSE; } /* Get profiles path */ dwLength = sizeof(szBuffer); - if (RegQueryValueExW (hKey, - L"ProfilesDirectory", - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength)) + Error = RegQueryValueExW (hKey, + L"ProfilesDirectory", + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -379,15 +399,17 @@ /* Get 'AllUsersProfile' name */ dwLength = sizeof(szBuffer); - if (RegQueryValueExW (hKey, - L"AllUsersProfile", - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength)) + Error = RegQueryValueExW (hKey, + L"AllUsersProfile", + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -455,28 +477,33 @@ WCHAR szBuffer[MAX_PATH]; DWORD dwLength; HKEY hKey; + LONG Error; - if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", - 0, - KEY_READ, - &hKey)) + Error = RegOpenKeyExW (HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, + KEY_READ, + &hKey); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); return FALSE; } /* Get profiles path */ dwLength = sizeof(szBuffer); - if (RegQueryValueExW (hKey, - L"ProfilesDirectory", - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength)) + Error = RegQueryValueExW (hKey, + L"ProfilesDirectory", + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -492,15 +519,17 @@ /* Get 'DefaultUserProfile' name */ dwLength = sizeof(szBuffer); - if (RegQueryValueExW (hKey, - L"DefaultUserProfile", - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength)) + Error = RegQueryValueExW (hKey, + L"DefaultUserProfile", + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -568,28 +597,33 @@ WCHAR szBuffer[MAX_PATH]; DWORD dwLength; HKEY hKey; + LONG Error; - if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", - 0, - KEY_READ, - &hKey)) + Error = RegOpenKeyExW (HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, + KEY_READ, + &hKey); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); return FALSE; } /* Get profiles path */ dwLength = sizeof(szBuffer); - if (RegQueryValueExW (hKey, - L"ProfilesDirectory", - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength)) + Error = RegQueryValueExW (hKey, + L"ProfilesDirectory", + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -668,6 +702,7 @@ WCHAR szImagePath[MAX_PATH]; DWORD dwLength; HKEY hKey; + LONG Error; if (!GetUserSidFromToken (hToken, &SidString)) @@ -687,26 +722,30 @@ DPRINT ("KeyName: '%S'\n", szKeyName); - if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, - szKeyName, - 0, - KEY_ALL_ACCESS, - &hKey)) + Error = RegOpenKeyExW (HKEY_LOCAL_MACHINE, + szKeyName, + 0, + KEY_ALL_ACCESS, + &hKey); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("Error: %lu\n", GetLastError()); + DPRINT1 ("Error: %lu\n", Error); + SetLastError((DWORD)Error); return FALSE; } dwLength = sizeof(szRawImagePath); - if (RegQueryValueExW (hKey, - L"ProfileImagePath", - NULL, - NULL, - (LPBYTE)szRawImagePath, - &dwLength)) + Error = RegQueryValueExW (hKey, + L"ProfileImagePath", + NULL, + NULL, + (LPBYTE)szRawImagePath, + &dwLength); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("Error: %lu\n", GetLastError()); + DPRINT1 ("Error: %lu\n", Error); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -792,6 +831,7 @@ { WCHAR szUserHivePath[MAX_PATH]; UNICODE_STRING SidString; + LONG Error; DWORD dwLength = sizeof(szUserHivePath) / sizeof(szUserHivePath[0]); DPRINT ("LoadUserProfileW() called\n"); @@ -842,23 +882,27 @@ DPRINT ("SidString: '%wZ'\n", &SidString); - if (RegLoadKeyW (HKEY_USERS, - SidString.Buffer, - szUserHivePath)) + Error = RegLoadKeyW (HKEY_USERS, + SidString.Buffer, + szUserHivePath); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("RegLoadKeyW() failed (Error %ld)\n", GetLastError()); + DPRINT1 ("RegLoadKeyW() failed (Error %ld)\n", Error); RtlFreeUnicodeString (&SidString); + SetLastError((DWORD)Error); return FALSE; } - if (RegOpenKeyExW (HKEY_USERS, - SidString.Buffer, - 0, - KEY_ALL_ACCESS, - (PHKEY)&lpProfileInfo->hProfile)) + Error = RegOpenKeyExW (HKEY_USERS, + SidString.Buffer, + 0, + KEY_ALL_ACCESS, + (PHKEY)&lpProfileInfo->hProfile); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("RegOpenKeyExW() failed (Error %ld)\n", GetLastError()); + DPRINT1 ("RegOpenKeyExW() failed (Error %ld)\n", Error); RtlFreeUnicodeString (&SidString); + SetLastError((DWORD)Error); return FALSE; } @@ -875,6 +919,7 @@ HANDLE hProfile) { UNICODE_STRING SidString; + LONG Error; DPRINT ("UnloadUserProfile() called\n"); @@ -896,11 +941,13 @@ DPRINT ("SidString: '%wZ'\n", &SidString); - if (RegUnLoadKeyW (HKEY_USERS, - SidString.Buffer)) + Error = RegUnLoadKeyW (HKEY_USERS, + SidString.Buffer); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("RegUnLoadKeyW() failed (Error %ld)\n", GetLastError()); + DPRINT1 ("RegUnLoadKeyW() failed (Error %ld)\n", Error); RtlFreeUnicodeString (&SidString); + SetLastError((DWORD)Error); return FALSE; } _____ Modified: trunk/reactos/lib/userenv/registry.c --- trunk/reactos/lib/userenv/registry.c 2006-01-11 23:54:44 UTC (rev 20794) +++ trunk/reactos/lib/userenv/registry.c 2006-01-12 00:11:14 UTC (rev 20795) @@ -37,6 +37,21 @@ CopyKey (HKEY hDstKey, HKEY hSrcKey) { + LONG Error; + +#if (_WIN32_WINNT >= 0x0600) + Error = RegCopyTreeW(hSrcKey, + NULL, + hDstKey); + if (Error != ERROR_SUCCESS) + { + SetLastError((DWORD)Error); + return FALSE; + } + + return TRUE; + +#else FILETIME LastWrite; DWORD dwSubKeys; DWORD dwValues; @@ -56,20 +71,22 @@ DPRINT ("CopyKey() called \n"); - if (RegQueryInfoKey (hSrcKey, - NULL, - NULL, - NULL, - &dwSubKeys, - &dwMaxSubKeyNameLength, - NULL, - &dwValues, - &dwMaxValueNameLength, - &dwMaxValueLength, - NULL, - NULL)) + Error = RegQueryInfoKey (hSrcKey, + NULL, + NULL, + NULL, + &dwSubKeys, + &dwMaxSubKeyNameLength, + NULL, + &dwValues, + &dwMaxValueNameLength, + &dwMaxValueLength, + NULL, + NULL); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("RegQueryInfoKey() failed (Error %lu)\n", GetLastError ()); + DPRINT1 ("RegQueryInfoKey() failed (Error %lu)\n", Error); + SetLastError((DWORD)Error); return FALSE; } @@ -88,56 +105,63 @@ if (lpNameBuffer == NULL) { DPRINT1("Buffer allocation failed\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } for (i = 0; i < dwSubKeys; i++) { dwSubKeyNameLength = dwMaxSubKeyNameLength; - if (RegEnumKeyExW (hSrcKey, - i, - lpNameBuffer, - &dwSubKeyNameLength, - NULL, - NULL, - NULL, - &LastWrite)) + Error = RegEnumKeyExW (hSrcKey, + i, + lpNameBuffer, + &dwSubKeyNameLength, + NULL, + NULL, + NULL, + &LastWrite); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("Subkey enumeration failed (Error %lu)\n", GetLastError()); + DPRINT1 ("Subkey enumeration failed (Error %lu)\n", Error); HeapFree (GetProcessHeap (), 0, lpNameBuffer); + SetLastError((DWORD)Error); return FALSE; } - if (RegCreateKeyExW (hDstKey, - lpNameBuffer, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_WRITE, - NULL, - &hDstSubKey, - &dwDisposition)) + Error = RegCreateKeyExW (hDstKey, + lpNameBuffer, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hDstSubKey, + &dwDisposition); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("Subkey creation failed (Error %lu)\n", GetLastError()); + DPRINT1 ("Subkey creation failed (Error %lu)\n", Error); HeapFree (GetProcessHeap (), 0, lpNameBuffer); + SetLastError((DWORD)Error); return FALSE; } - if (RegOpenKeyExW (hSrcKey, - lpNameBuffer, - 0, - KEY_READ, - &hSrcSubKey)) + Error = RegOpenKeyExW (hSrcKey, + lpNameBuffer, + 0, + KEY_READ, + &hSrcSubKey); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("Error: %lu\n", GetLastError()); + DPRINT1 ("Error: %lu\n", Error); RegCloseKey (hDstSubKey); HeapFree (GetProcessHeap (), 0, lpNameBuffer); + SetLastError((DWORD)Error); return FALSE; } @@ -171,6 +195,7 @@ if (lpNameBuffer == NULL) { DPRINT1 ("Buffer allocation failed\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -183,6 +208,7 @@ HeapFree (GetProcessHeap (), 0, lpNameBuffer); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -190,39 +216,43 @@ { dwValueNameLength = dwMaxValueNameLength; dwValueLength = dwMaxValueLength; - if (RegEnumValueW (hSrcKey, - i, - lpNameBuffer, - &dwValueNameLength, - NULL, - &dwType, - lpDataBuffer, - &dwValueLength)) + Error = RegEnumValueW (hSrcKey, + i, + lpNameBuffer, + &dwValueNameLength, + NULL, + &dwType, [truncated at 1000 lines; 587 more skipped]

1 0

[ion] 20794: - Rewrite usermode callbacks. These changes should greatly optimize graphic operations. After these changes, my "idle" CPU Usage in taskmgr went from 7-8% to 4-5%, while on the performace page, from 15-18% to 10-13%:
by ion＠svn.reactos.org 11 Jan '06

11 Jan '06

- Rewrite usermode callbacks. These changes should greatly optimize graphic operations. After these changes, my "idle" CPU Usage in taskmgr went from 7-8% to 4-5%, while on the performace page, from 15-18% to 10-13%: * Do not use ugly and messy code to create linked stacks and other such resource-wasting steps. Use our newly implemented 60KB stack support and MmGrowKernelStack when needed. * Write all the low-level code in assembly instead of relying on structures and hodgepodge code. * Add debugging/detection features for invalid calls, such as invalid IRQL, APCs being disabled, invalid previous mode detection (this allowed me to fix the KWAIT_BLOCK bug today). * Finally fix the last (I hope) remaning trap frame bug issue related to V86 mode bias. One of the "hacks" in syscall.S has already been removed and I can now do the promised cleanup. * Allow some failulre cases in callbacks (not all implemented) and extend stack space for future use of SEH in the ntdll dispatcher. * Fix win32k to use callbacks properly: the system fills out *Result and *ResultLength, not the caller. * Use SEH (ProbeForWrite) in callbacks to detect invalid user-mode memory. * Save NPX State and ExceptionList across callbacks (I think this wasn't fully properly done in all cases). Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S Modified: trunk/reactos/ntoskrnl/ke/usercall.c Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/ps/win32.c Modified: trunk/reactos/subsys/win32k/ntuser/callback.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-11 23:22:15 UTC (rev 20793) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-11 23:54:44 UTC (rev 20794) @@ -470,23 +470,14 @@ ja RestoreAll // ==================== END IF FULL RESTORE NEEDED ====================// - /* Skip debug information and unsaved registers */ - //badbadbad - add esp, 0x30 - pop gs - pop es - pop ds - add esp, 0x14 -//badbadbad - /* Restore FS */ RestoreFs: - //lea esp, [ebp+KTRAP_FRAME_FS] <= BUG IN WIN32K CALLBACKS! STACK GETS SMASHED + lea esp, [ebp+KTRAP_FRAME_FS] pop fs CommonStackClean: /* Skip debug information and unsaved registers */ - //lea esp, [ebp+KTRAP_FRAME_EDI] <= BUG IN WIN32K CALLBACKS! STACK GETS SMASHED + lea esp, [ebp+KTRAP_FRAME_EDI] pop edi pop esi pop ebx _____ Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S --- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-11 23:22:15 UTC (rev 20793) +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-11 23:54:44 UTC (rev 20794) @@ -248,9 +248,9 @@ * @remark This call MUST be paired with KeUserModeCallback. * *--*/ -.globl _NtCallbackReturn2@12 -.func NtCallbackReturn2@12 -_NtCallbackReturn2@12: +.globl _NtCallbackReturn@12 +.func NtCallbackReturn@12 +_NtCallbackReturn@12: /* Get the current thread and make sure we have a callback stack */ mov eax, fs:[KPCR_CURRENT_THREAD] _____ Modified: trunk/reactos/ntoskrnl/ke/usercall.c --- trunk/reactos/ntoskrnl/ke/usercall.c 2006-01-11 23:22:15 UTC (rev 20793) +++ trunk/reactos/ntoskrnl/ke/usercall.c 2006-01-11 23:54:44 UTC (rev 20794) @@ -3,7 +3,6 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/usercall.c * PURPOSE: User-Mode callbacks. Portable part. - * * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ @@ -13,149 +12,21 @@ #define NDEBUG #include <internal/debug.h> -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, PsInitialiseW32Call) -#endif - -/* FUNCTIONS *****************************************************************/ - -#if ALEX_CB_REWRITE - NTSTATUS STDCALL -KiSwitchToUserMode(IN PVOID *OutputBuffer, - IN PULONG OutputLength); +KiCallUserMode( + IN PVOID *OutputBuffer, + IN PULONG OutputLength +); -#else +PULONG +STDCALL +KiGetUserModeStackAddress( + VOID +); -typedef struct _NTW32CALL_SAVED_STATE -{ - ULONG_PTR SavedStackLimit; - PVOID SavedStackBase; - PVOID SavedInitialStack; - PVOID CallerResult; - PULONG CallerResultLength; - PNTSTATUS CallbackStatus; - PKTRAP_FRAME SavedTrapFrame; - PVOID SavedCallbackStack; - PVOID SavedExceptionStack; -} NTW32CALL_SAVED_STATE, *PNTW32CALL_SAVED_STATE; +/* FUNCTIONS *****************************************************************/ -typedef struct -{ - PVOID BaseAddress; - LIST_ENTRY ListEntry; -} NTW32CALL_CALLBACK_STACK, *PNTW32CALL_CALLBACK_STACK; - -KSPIN_LOCK CallbackStackListLock; -static LIST_ENTRY CallbackStackListHead; - -VOID -INIT_FUNCTION -NTAPI -PsInitialiseW32Call(VOID) -{ - InitializeListHead(&CallbackStackListHead); - KeInitializeSpinLock(&CallbackStackListLock); -} - -VOID STATIC -PsFreeCallbackStackPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, - PFN_TYPE Page, SWAPENTRY SwapEntry, - BOOLEAN Dirty) -{ - ASSERT(SwapEntry == 0); - if (Page != 0) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Page); - } -} - -VOID STATIC -PsFreeCallbackStack(PVOID StackLimit) -{ - MmLockAddressSpace(MmGetKernelAddressSpace()); - MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), - StackLimit, - PsFreeCallbackStackPage, - NULL); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); -} - -VOID -PsFreeCallbackStacks(VOID) -{ - PLIST_ENTRY CurrentListEntry; - PNTW32CALL_CALLBACK_STACK Current; - - while (!IsListEmpty(&CallbackStackListHead)) - { - CurrentListEntry = RemoveHeadList(&CallbackStackListHead); - Current = CONTAINING_RECORD(CurrentListEntry, NTW32CALL_CALLBACK_STACK, - ListEntry); - PsFreeCallbackStack(Current->BaseAddress); - ExFreePool(Current); - } -} - -PVOID STATIC -PsAllocateCallbackStack(ULONG StackSize) -{ - PVOID KernelStack = NULL; - NTSTATUS Status; - PMEMORY_AREA StackArea; - ULONG i, j; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - PPFN_TYPE Pages = alloca(sizeof(PFN_TYPE) * (StackSize /PAGE_SIZE)); - - - BoundaryAddressMultiple.QuadPart = 0; - StackSize = PAGE_ROUND_UP(StackSize); - MmLockAddressSpace(MmGetKernelAddressSpace()); - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_KERNEL_STACK, - &KernelStack, - StackSize, - PAGE_READWRITE, - &StackArea, - FALSE, - 0, - BoundaryAddressMultiple); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - if (!NT_SUCCESS(Status)) - { - DPRINT("Failed to create thread stack\n"); - return(NULL); - } - for (i = 0; i < (StackSize / PAGE_SIZE); i++) - { - Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Pages[i]); - if (!NT_SUCCESS(Status)) - { - for (j = 0; j < i; j++) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Pages[j]); - } - return(NULL); - } - } - Status = MmCreateVirtualMapping(NULL, - KernelStack, - PAGE_READWRITE, - Pages, - StackSize / PAGE_SIZE); - if (!NT_SUCCESS(Status)) - { - for (i = 0; i < (StackSize / PAGE_SIZE); i++) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Pages[i]); - } - return(NULL); - } - return(KernelStack); -} -#endif - /* * @implemented */ @@ -167,92 +38,63 @@ OUT PVOID *Result, OUT PULONG ResultLength) { - PETHREAD Thread; - PVOID NewStack; - ULONG_PTR StackSize; - PKTRAP_FRAME NewFrame; - PULONG UserEsp; - KIRQL oldIrql; - NTSTATUS CallbackStatus; - NTW32CALL_SAVED_STATE SavedState; - PNTW32CALL_CALLBACK_STACK AssignedStack; + ULONG_PTR NewStack, OldStack; + PULONG UserEsp; + NTSTATUS CallbackStatus; + PEXCEPTION_REGISTRATION_RECORD ExceptionList; + DPRINT("KeUserModeCallback(RoutineIndex %d, Argument %X, ArgumentLength %d)\n", + RoutineIndex, Argument, ArgumentLength); + ASSERT(KeGetCurrentThread()->ApcState.KernelApcInProgress == FALSE); + ASSERT(KeGetPreviousMode() == UserMode); - PAGED_CODE(); + /* Get the current user-mode stack */ + UserEsp = KiGetUserModeStackAddress(); + OldStack = *UserEsp; - DPRINT("KeUserModeCallback(RoutineIndex %d, Argument %X, ArgumentLength %d)\n", - RoutineIndex, Argument, ArgumentLength); + /* Enter a SEH Block */ + _SEH_TRY + { + /* Calculate and align the stack size */ + NewStack = (OldStack - ArgumentLength) & ~3; - Thread = PsGetCurrentThread(); + /* Make sure it's writable */ + ProbeForWrite((PVOID)(NewStack - 6 * sizeof(ULONG_PTR)), + ArgumentLength + 6 * sizeof(ULONG_PTR), + sizeof(CHAR)); - /* Set up the new kernel and user environment. */ - StackSize = (ULONG_PTR)Thread->Tcb.StackBase - Thread->Tcb.StackLimit; - KeAcquireSpinLock(&CallbackStackListLock, &oldIrql); - if (IsListEmpty(&CallbackStackListHead)) - { - KeReleaseSpinLock(&CallbackStackListLock, oldIrql); - NewStack = PsAllocateCallbackStack(StackSize); - AssignedStack = ExAllocatePool(NonPagedPool, - sizeof(NTW32CALL_CALLBACK_STACK)); - AssignedStack->BaseAddress = NewStack; - } - else - { - PLIST_ENTRY StackEntry; + /* Copy the buffer into the stack */ + RtlCopyMemory((PVOID)NewStack, Argument, ArgumentLength); - StackEntry = RemoveHeadList(&CallbackStackListHead); - KeReleaseSpinLock(&CallbackStackListLock, oldIrql); - AssignedStack = CONTAINING_RECORD(StackEntry, NTW32CALL_CALLBACK_STACK, - ListEntry); - NewStack = AssignedStack->BaseAddress; - RtlZeroMemory(NewStack, StackSize); - } - /* FIXME: Need to check whether we were interrupted from v86 mode. */ - RtlCopyMemory((char*)NewStack + StackSize - sizeof(KTRAP_FRAME) - sizeof(FX_SAVE_AREA), - Thread->Tcb.TrapFrame, sizeof(KTRAP_FRAME) - (4 * sizeof(ULONG))); - NewFrame = (PKTRAP_FRAME)((char*)NewStack + StackSize - sizeof(KTRAP_FRAME) - sizeof(FX_SAVE_AREA)); - /* We need the stack pointer to remain 4-byte aligned */ - NewFrame->HardwareEsp -= (((ArgumentLength + 3) & (~ 0x3)) + (4 * sizeof(ULONG))); - NewFrame->Eip = (ULONG)KeUserCallbackDispatcher; - UserEsp = (PULONG)NewFrame->HardwareEsp; - UserEsp[0] = 0; /* Return address. */ - UserEsp[1] = RoutineIndex; - UserEsp[2] = (ULONG)&UserEsp[4]; - UserEsp[3] = ArgumentLength; - RtlCopyMemory((PVOID)&UserEsp[4], Argument, ArgumentLength); + /* Write the arguments */ + NewStack -= 24; + *(PULONG)NewStack = 0; + *(PULONG)(NewStack + 4) = RoutineIndex; + *(PULONG)(NewStack + 8) = (NewStack + 24); + *(PULONG)(NewStack + 12) = ArgumentLength; - /* Switch to the new environment and return to user-mode. */ - KeRaiseIrql(HIGH_LEVEL, &oldIrql); - SavedState.SavedStackLimit = Thread->Tcb.StackLimit; - SavedState.SavedStackBase = Thread->Tcb.StackBase; - SavedState.SavedInitialStack = Thread->Tcb.InitialStack; - SavedState.CallerResult = Result; - SavedState.CallerResultLength = ResultLength; - SavedState.CallbackStatus = &CallbackStatus; - SavedState.SavedTrapFrame = Thread->Tcb.TrapFrame; - SavedState.SavedCallbackStack = Thread->Tcb.CallbackStack; - SavedState.SavedExceptionStack = (PVOID)KeGetCurrentKPCR()->TSS->Esp0; - if ((Thread->Tcb.NpxState & NPX_STATE_VALID) && - &Thread->Tcb != KeGetCurrentPrcb()->NpxThread) + /* Save the exception list */ + ExceptionList = KeGetCurrentThread()->Teb->Tib.ExceptionList; + + /* Jump to user mode */ + *UserEsp = NewStack; + CallbackStatus = KiCallUserMode(Result, ResultLength); + + /* FIXME: Handle user-mode exception status */ + + /* Restore exception list */ + KeGetCurrentThread()->Teb->Tib.ExceptionList = ExceptionList; + } + _SEH_HANDLE { - RtlCopyMemory((char*)NewStack + StackSize - sizeof(FX_SAVE_AREA), - (char*)SavedState.SavedInitialStack - sizeof(FX_SAVE_AREA), - sizeof(FX_SAVE_AREA)); + CallbackStatus = _SEH_GetExceptionCode(); } - Thread->Tcb.InitialStack = Thread->Tcb.StackBase = (char*)NewStack + StackSize; - Thread->Tcb.StackLimit = (ULONG)NewStack; - Thread->Tcb.KernelStack = (char*)NewStack + StackSize - sizeof(KTRAP_FRAME) - sizeof(FX_SAVE_AREA); - KeGetCurrentKPCR()->TSS->Esp0 = (ULONG)Thread->Tcb.InitialStack - sizeof(FX_SAVE_AREA) - 0x10; - KePushAndStackSwitchAndSysRet((ULONG)&SavedState, Thread->Tcb.KernelStack); + _SEH_END; - /* - * The callback return will have already restored most of the state we - * modified. - */ - KeLowerIrql(DISPATCH_LEVEL); - KeAcquireSpinLockAtDpcLevel(&CallbackStackListLock); - InsertTailList(&CallbackStackListHead, &AssignedStack->ListEntry); - KeReleaseSpinLock(&CallbackStackListLock, PASSIVE_LEVEL); - return(CallbackStatus); + /* FIXME: Flush GDI Batch */ + + /* Restore stack and return */ + *UserEsp = OldStack; + return CallbackStatus; } /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2006-01-11 23:22:15 UTC (rev 20793) +++ trunk/reactos/ntoskrnl/ke/wait.c 2006-01-11 23:54:44 UTC (rev 20794) @@ -680,7 +680,7 @@ /* Release & Return */ DPRINT("Returning, %x. Status: %d\n. We did not wait.", - KeGetCurrentThread(), WaitStatus); + KeGetCurrentThread(), WaitStatus); KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); return WaitStatus; } _____ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c --- trunk/reactos/ntoskrnl/ps/psmgr.c 2006-01-11 23:22:15 UTC (rev 20793) +++ trunk/reactos/ntoskrnl/ps/psmgr.c 2006-01-11 23:54:44 UTC (rev 20794) @@ -78,7 +78,6 @@ PsInitProcessManagment(); PsInitThreadManagment(); PsInitIdleThread(); - PsInitialiseW32Call(); } VOID _____ Modified: trunk/reactos/ntoskrnl/ps/win32.c --- trunk/reactos/ntoskrnl/ps/win32.c 2006-01-11 23:22:15 UTC (rev 20793) +++ trunk/reactos/ntoskrnl/ps/win32.c 2006-01-11 23:54:44 UTC (rev 20794) @@ -212,89 +212,4 @@ return(CallbackStatus); } -#ifndef ALEX_CB_REWRITE -NTSTATUS STDCALL -NtCallbackReturn (PVOID Result, - ULONG ResultLength, - NTSTATUS Status) -{ - PULONG OldStack; - PETHREAD Thread; - PNTSTATUS CallbackStatus; - PULONG CallerResultLength; - PVOID* CallerResult; - PVOID InitialStack; - PVOID StackBase; - ULONG_PTR StackLimit; - KIRQL oldIrql; - PNTW32CALL_SAVED_STATE State; - PKTRAP_FRAME SavedTrapFrame; - PVOID SavedCallbackStack; - PVOID SavedExceptionStack; - - PAGED_CODE(); - - Thread = PsGetCurrentThread(); - if (Thread->Tcb.CallbackStack == NULL) - { - return(STATUS_NO_CALLBACK_ACTIVE); - } - - OldStack = (PULONG)Thread->Tcb.CallbackStack; - - /* - * Get the values that NtW32Call left on the inactive stack for us. - */ - State = (PNTW32CALL_SAVED_STATE)OldStack[0]; - CallbackStatus = State->CallbackStatus; - CallerResultLength = State->CallerResultLength; - CallerResult = State->CallerResult; - InitialStack = State->SavedInitialStack; - StackBase = State->SavedStackBase; - StackLimit = State->SavedStackLimit; - SavedTrapFrame = State->SavedTrapFrame; - SavedCallbackStack = State->SavedCallbackStack; - SavedExceptionStack = State->SavedExceptionStack; - - /* - * Copy the callback status and the callback result to NtW32Call - */ - *CallbackStatus = Status; - if (CallerResult != NULL && CallerResultLength != NULL) - { - if (Result == NULL) - { - *CallerResultLength = 0; - } - else - { - *CallerResultLength = min(ResultLength, *CallerResultLength); - RtlCopyMemory(*CallerResult, Result, *CallerResultLength); - } - } - - /* - * Restore the old stack. - */ - KeRaiseIrql(HIGH_LEVEL, &oldIrql); - if ((Thread->Tcb.NpxState & NPX_STATE_VALID) && - &Thread->Tcb != KeGetCurrentPrcb()->NpxThread) - { - RtlCopyMemory((char*)InitialStack - sizeof(FX_SAVE_AREA), - (char*)Thread->Tcb.InitialStack - sizeof(FX_SAVE_AREA), - sizeof(FX_SAVE_AREA)); - } - Thread->Tcb.InitialStack = InitialStack; - Thread->Tcb.StackBase = StackBase; - Thread->Tcb.StackLimit = StackLimit; - Thread->Tcb.TrapFrame = SavedTrapFrame; - Thread->Tcb.CallbackStack = SavedCallbackStack; - KeGetCurrentKPCR()->TSS->Esp0 = (ULONG)SavedExceptionStack; - KeStackSwitchAndRet((PVOID)(OldStack + 1)); - - /* Should never return. */ - KEBUGCHECK(0); - return(STATUS_UNSUCCESSFUL); -} -#endif /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/callback.c --- trunk/reactos/subsys/win32k/ntuser/callback.c 2006-01-11 23:22:15 UTC (rev 20793) +++ trunk/reactos/subsys/win32k/ntuser/callback.c 2006-01-11 23:54:44 UTC (rev 20794) @@ -182,7 +182,7 @@ Arguments->wParam = wParam; Arguments->lParam = lParam; Arguments->lParamBufferSize = lParamBufferSize; - ResultPointer = Arguments; + ResultPointer = NULL; ResultLength = ArgumentLength; UserLeaveCo(); @@ -193,6 +193,9 @@ &ResultPointer, &ResultLength); + /* Simulate old behaviour: copy into our local buffer */ + RtlMoveMemory(Arguments, ResultPointer, ArgumentLength); + UserEnterCo(); if (!NT_SUCCESS(Status)) @@ -224,7 +227,7 @@ PVOID ResultPointer; ULONG ResultLength; - ResultPointer = &Result; + ResultPointer = NULL; ResultLength = sizeof(LRESULT); UserLeaveCo(); @@ -235,6 +238,9 @@ &ResultPointer, &ResultLength); + /* Simulate old behaviour: copy into our local buffer */ + Result = *(LRESULT*)ResultPointer; + UserEnterCo(); if (!NT_SUCCESS(Status)) @@ -253,7 +259,7 @@ ULONG ResultLength; BOOL DefaultCursor = TRUE; - ResultPointer = &Result; + ResultPointer = NULL; ResultLength = sizeof(LRESULT); UserLeaveCo(); @@ -264,6 +270,9 @@ &ResultPointer, &ResultLength); + /* Simulate old behaviour: copy into our local buffer */ + Result = *(LRESULT*)ResultPointer; + UserEnterCo(); if (!NT_SUCCESS(Status)) @@ -384,7 +393,7 @@ break; } - ResultPointer = &Result; + ResultPointer = NULL; ResultLength = sizeof(LRESULT); UserLeaveCo(); @@ -395,6 +404,9 @@ &ResultPointer, &ResultLength); + /* Simulate old behaviour: copy into our local buffer */ + Result = *(LRESULT*)ResultPointer; + UserEnterCo(); IntCbFreeMemory(Argument);

1 0

[hbirr] 20793: - We cannot access the OwnerTable without locking the resource.
by hbirr＠svn.reactos.org 11 Jan '06

11 Jan '06

- We cannot access the OwnerTable without locking the resource. - The shared waiters may wait also on the semaphore. It makes no sense to boost a waiting thread. - The thread header is initialized like KeWaitForSingleObject (?, ?, ?, TRUE, ?). During the boost, possible the dispatcher lock is released but the thread block (WaitNext) isn't changed. Modified: trunk/reactos/ntoskrnl/ex/resource.c _____ Modified: trunk/reactos/ntoskrnl/ex/resource.c --- trunk/reactos/ntoskrnl/ex/resource.c 2006-01-11 22:40:31 UTC (rev 20792) +++ trunk/reactos/ntoskrnl/ex/resource.c 2006-01-11 23:22:15 UTC (rev 20793) @@ -535,6 +535,11 @@ * @remarks None. * *--*/ +#if 0 + +/* + * Disabled, read the comments bellow. + */ VOID FASTCALL ExpBoostOwnerThread(IN PKTHREAD Thread, @@ -570,6 +575,7 @@ } } } +#endif /*++ * @name ExpWaitForResource @@ -596,7 +602,6 @@ ULONG Size, WaitCount = 0; KIRQL OldIrql; POWNER_ENTRY Owner; - PKTHREAD OwnerThread, Thread; NTSTATUS Status; LARGE_INTEGER Timeout; @@ -664,10 +669,20 @@ ExReleaseResourceLock(&Resource->SpinLock, OldIrql); #endif } +#if 0 +/* + * Disabled because: + * - We cannot access the OwnerTable without locking the resource. + * - The shared waiters may wait also on the semaphore. It makes no sense to boost a waiting thread. + * - The thread header is initialized like KeWaitForSingleObject (?, ?, ?, TRUE, ?). + * During the boost, possible the dispatcher lock is released but the thread block (WaitNext) isn't changed. + */ /* Check if we can boost */ if (!(Resource->Flag & ResourceHasDisabledPriorityBoost)) { + PKTHREAD Thread, OwnerThread; + /* Get the current kernel thread and lock the dispatcher */ Thread = KeGetCurrentThread(); Thread->WaitIrql = KeAcquireDispatcherDatabaseLock(); @@ -700,6 +715,7 @@ } } } +#endif } } @@ -881,10 +897,20 @@ Resource, Wait); if (!Resource->ActiveCount) { - /* Nobody owns it, so let's take control */ + if (Resource->NumberOfSharedWaiters == 0) + { + Owner = &Resource->OwnerThreads[1]; + } + else + { + /* Find a free entry */ + Owner = ExpFindFreeEntry(Resource, &OldIrql); + if (!Owner) goto TryAcquire; + } + + Owner->OwnerThread = Thread; + Owner->OwnerCount = 1; Resource->ActiveCount = 1; - Resource->OwnerThreads[1].OwnerThread = Thread; - Resource->OwnerThreads[1].OwnerCount = 1; /* Release the lock and return */ ExReleaseResourceLock(&Resource->SpinLock, OldIrql); @@ -946,7 +972,7 @@ { /* Release the lock and return */ ExReleaseResourceLock(&Resource->SpinLock, OldIrql); - return TRUE; + return FALSE; } /* Check if we have a shared waiters semaphore */ @@ -1769,6 +1795,7 @@ { /* Decrement owner count and check if we're done */ ASSERT(Resource->OwnerThreads[0].OwnerCount > 0); + ASSERT(Resource->ActiveCount == 1); if (--Resource->OwnerThreads[0].OwnerCount) { /* Done, release lock! */ @@ -1779,45 +1806,42 @@ /* Clear the owner */ Resource->OwnerThreads[0].OwnerThread = 0; - /* See if the resource isn't being owned anymore */ - ASSERT(Resource->ActiveCount > 0); - if (!(--Resource->ActiveCount)) + /* Check if there are shared waiters */ + if (IsSharedWaiting(Resource)) { - /* Check if there are shared waiters */ - if (IsSharedWaiting(Resource)) - { - /* Remove the exclusive flag */ - Resource->Flag &= ~ResourceOwnedExclusive; + /* Remove the exclusive flag */ + Resource->Flag &= ~ResourceOwnedExclusive; - /* Give ownage to another thread */ - Count = Resource->NumberOfSharedWaiters; - Resource->ActiveCount = (USHORT)Count; - Resource->NumberOfSharedWaiters = 0; + /* Give ownage to another thread */ + Count = Resource->NumberOfSharedWaiters; + Resource->ActiveCount = (USHORT)Count; + Resource->NumberOfSharedWaiters = 0; - /* Release lock and let someone else have it */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); - KeReleaseSemaphore(Resource->SharedWaiters, 0, Count, FALSE); - return; - } - else if (IsExclusiveWaiting(Resource)) - { - /* Give exclusive access */ - Resource->OwnerThreads[0].OwnerThread = 1; - Resource->OwnerThreads[0].OwnerCount = 1; - Resource->ActiveCount = 1; - Resource->NumberOfExclusiveWaiters--; + /* Release lock and let someone else have it */ + ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + KeReleaseSemaphore(Resource->SharedWaiters, 0, Count, FALSE); + return; + } + else if (IsExclusiveWaiting(Resource)) + { + /* Give exclusive access */ + Resource->OwnerThreads[0].OwnerThread = 1; + Resource->OwnerThreads[0].OwnerCount = 1; + Resource->ActiveCount = 1; + Resource->NumberOfExclusiveWaiters--; - /* Release the lock and give it away */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); - KeSetEventBoostPriority(Resource->ExclusiveWaiters, - (PKTHREAD*) - &Resource->OwnerThreads[0].OwnerThread); - return; - } + /* Release the lock and give it away */ + ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + KeSetEventBoostPriority(Resource->ExclusiveWaiters, + (PKTHREAD*) + &Resource->OwnerThreads[0].OwnerThread); + return; + } - /* Remove the exclusive flag */ - Resource->Flag &= ~ResourceOwnedExclusive; - } + /* Remove the exclusive flag */ + Resource->Flag &= ~ResourceOwnedExclusive; + + Resource->ActiveCount = 0; } else { @@ -1827,11 +1851,6 @@ /* Found it, get owner */ Owner = &Resource->OwnerThreads[1]; } - else if (Resource->OwnerThreads[0].OwnerThread == Thread) - { - /* Found it on the second list, get owner */ - Owner = &Resource->OwnerThreads[0]; - } else { /* Not in the list, do a full table look up */

1 0

[weiden] 20792: - partially implemented RegisterGPNotification() and UnregisterGPNotification() (depends on GetModuleHandleEx which is not yet implemented)
by weiden＠svn.reactos.org 11 Jan '06

11 Jan '06

- partially implemented RegisterGPNotification() and UnregisterGPNotification() (depends on GetModuleHandleEx which is not yet implemented) - use debug.h Modified: trunk/reactos/lib/userenv/desktop.c Modified: trunk/reactos/lib/userenv/directory.c Modified: trunk/reactos/lib/userenv/environment.c Added: trunk/reactos/lib/userenv/gpolicy.c Modified: trunk/reactos/lib/userenv/internal.h Modified: trunk/reactos/lib/userenv/misc.c Modified: trunk/reactos/lib/userenv/profile.c Modified: trunk/reactos/lib/userenv/registry.c Modified: trunk/reactos/lib/userenv/setup.c Modified: trunk/reactos/lib/userenv/userenv.c Modified: trunk/reactos/lib/userenv/userenv.def Modified: trunk/reactos/lib/userenv/userenv.xml _____ Modified: trunk/reactos/lib/userenv/desktop.c --- trunk/reactos/lib/userenv/desktop.c 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/desktop.c 2006-01-11 22:40:31 UTC (rev 20792) @@ -27,7 +27,10 @@ #include <precomp.h> +#define NDEBUG +#include <debug.h> + /* FUNCTIONS ***************************************************************/ static BOOL _____ Modified: trunk/reactos/lib/userenv/directory.c --- trunk/reactos/lib/userenv/directory.c 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/directory.c 2006-01-11 22:40:31 UTC (rev 20792) @@ -27,7 +27,10 @@ #include <precomp.h> +#define NDEBUG +#include <debug.h> + /* FUNCTIONS ***************************************************************/ BOOL STDCALL _____ Modified: trunk/reactos/lib/userenv/environment.c --- trunk/reactos/lib/userenv/environment.c 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/environment.c 2006-01-11 22:40:31 UTC (rev 20792) @@ -27,7 +27,10 @@ #include <precomp.h> +#define NDEBUG +#include <debug.h> + static BOOL SetUserEnvironmentVariable (LPVOID *Environment, LPWSTR lpName, _____ Added: trunk/reactos/lib/userenv/gpolicy.c --- trunk/reactos/lib/userenv/gpolicy.c 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/gpolicy.c 2006-01-11 22:40:31 UTC (rev 20792) @@ -0,0 +1,403 @@ +/* + * ReactOS kernel + * Copyright (C) 2006 ReactOS Team + * + * 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. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/userenv/gpolicy.c + * PURPOSE: Group policy functions + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + */ + +#include <precomp.h> + +#define NDEBUG +#include <debug.h> + + +typedef struct _GP_NOTIFY +{ + struct _GP_NOTIFY *Next; + HANDLE hEvent; + BOOL bMachine; +} GP_NOTIFY, *PGP_NOTIFY; + +typedef enum +{ + gpaUpdate = 0, + gpaTerminate +} GP_ACTION; + +static const WCHAR szLocalGPApplied[] = L"userenv: User Group Policy has been applied"; +static const WCHAR szMachineGPApplied[] = L"Global\\userenv: Machine Group Policy has been applied"; + +static CRITICAL_SECTION GPNotifyLock; +static PGP_NOTIFY NotificationList = NULL; +static GP_ACTION GPNotificationAction = gpaUpdate; +static HANDLE hNotificationThread = NULL; +static HANDLE hNotificationThreadEvent = NULL; +static HANDLE hLocalGPAppliedEvent = NULL; +static HANDLE hMachineGPAppliedEvent = NULL; + +VOID +InitializeGPNotifications(VOID) +{ + InitializeCriticalSection(&GPNotifyLock); +} + +VOID +UninitializeGPNotifications(VOID) +{ + EnterCriticalSection(&GPNotifyLock); + + /* rundown the notification thread */ + if (hNotificationThread != NULL) + { + ASSERT(hNotificationThreadEvent != NULL); + + /* notify the thread */ + GPNotificationAction = gpaTerminate; + SetEvent(hNotificationThreadEvent); + + LeaveCriticalSection(&GPNotifyLock); + + /* wait for the thread to terminate itself */ + WaitForSingleObject(hNotificationThread, + INFINITE); + + EnterCriticalSection(&GPNotifyLock); + + if (hNotificationThread != NULL) + { + /* the handle should be closed by the thread, + just in case that didn't happen for an unknown reason */ + CloseHandle(hNotificationThread); + hNotificationThread = NULL; + } + } + + if (hNotificationThreadEvent != NULL) + { + CloseHandle(hNotificationThreadEvent); + hNotificationThreadEvent = NULL; + } + + LeaveCriticalSection(&GPNotifyLock); + + DeleteCriticalSection(&GPNotifyLock); +} + +static VOID +NotifyGPEvents(IN BOOL bMachine) +{ + PGP_NOTIFY Notify = NotificationList; + + while (Notify != NULL) + { + if (Notify->bMachine == bMachine) + { + SetEvent(Notify->hEvent); + } + + Notify = Notify->Next; + } +} + +static DWORD WINAPI +GPNotificationThreadProc(IN LPVOID lpParameter) +{ + HMODULE hModule; + DWORD WaitResult, WaitCount; + HANDLE WaitHandles[3]; + + /* reference the library so we don't screw up if the application + causes the DLL to unload while this thread is still running */ + if (GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (LPCWSTR)hInstance, + &hModule)) + { + ASSERT(hModule == hInstance); + + EnterCriticalSection(&GPNotifyLock); + + ASSERT(hNotificationThreadEvent != NULL); + WaitHandles[0] = hNotificationThreadEvent; + for (;;) + { + ASSERT(hMachineGPAppliedEvent != NULL); + + if (NotificationList == NULL) + break; + + WaitCount = 2; + WaitHandles[1] = hMachineGPAppliedEvent; + + if (hLocalGPAppliedEvent != NULL) + { + WaitHandles[2] = hLocalGPAppliedEvent; + WaitCount++; + } + + LeaveCriticalSection(&GPNotifyLock); + + WaitResult = WaitForMultipleObjects(WaitCount, + WaitHandles, + FALSE, + INFINITE); + + EnterCriticalSection(&GPNotifyLock); + + if (WaitResult != WAIT_FAILED) + { + if (WaitResult == WAIT_OBJECT_0) + { + ResetEvent(hNotificationThreadEvent); + + if (GPNotificationAction == gpaTerminate) + { + /* terminate the thread */ + break; + } + } + else if (WaitResult == WAIT_OBJECT_0 + 1 || WaitResult == WAIT_OBJECT_0 + 2) + { + /* group policies have been applied */ + if (NotificationList != NULL) + { + NotifyGPEvents((WaitResult == WAIT_OBJECT_0 + 1)); + } + } + else if (WaitResult == WAIT_ABANDONED_0 + 2) + { + /* In case the local group policies event was abandoned, keep watching! + But close the handle as it's no longer of any use. */ + if (hLocalGPAppliedEvent != NULL) + { + CloseHandle(hLocalGPAppliedEvent); + hLocalGPAppliedEvent = NULL; + } + } + else if (WaitResult == WAIT_ABANDONED_0 || WaitResult == WAIT_ABANDONED_0 + 1) + { + /* terminate the thread if the machine group policies event was abandoned + or for some reason the rundown event got abandoned. */ + break; + } + else + { + DPRINT("Unexpected wait result watching the group policy events: 0x%x\n", WaitResult); + ASSERT(FALSE); + break; + } + + if (NotificationList == NULL) + break; + } + else + break; + + } + + /* cleanup handles no longer used */ + ASSERT(hNotificationThread != NULL); + ASSERT(hNotificationThreadEvent != NULL); + + CloseHandle(hNotificationThread); + CloseHandle(hNotificationThreadEvent); + hNotificationThread = NULL; + hNotificationThreadEvent = NULL; + + if (hLocalGPAppliedEvent != NULL) + { + CloseHandle(hLocalGPAppliedEvent); + hLocalGPAppliedEvent = NULL; + } + if (hMachineGPAppliedEvent != NULL) + { + CloseHandle(hMachineGPAppliedEvent); + hMachineGPAppliedEvent = NULL; + } + + LeaveCriticalSection(&GPNotifyLock); + + /* dereference the library and exit */ + FreeLibraryAndExitThread(hModule, + 0); + } + else + { + DPRINT1("Referencing the library failed!\n"); + } + + return 1; +} + +static HANDLE +CreateGPEvent(IN BOOL bMachine, + IN PVOID lpSecurityDescriptor) +{ + HANDLE hEvent; + SECURITY_ATTRIBUTES SecurityAttributes; + + SecurityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES); + SecurityAttributes.lpSecurityDescriptor = lpSecurityDescriptor; + SecurityAttributes.bInheritHandle = FALSE; + + hEvent = CreateEventW((lpSecurityDescriptor != NULL ? &SecurityAttributes : NULL), + TRUE, + FALSE, + (bMachine ? szMachineGPApplied : szLocalGPApplied)); + + return hEvent; +} + +BOOL WINAPI +RegisterGPNotification(IN HANDLE hEvent, + IN BOOL bMachine) +{ + PGP_NOTIFY Notify; + PVOID lpSecurityDescriptor = NULL; + BOOL Ret = FALSE; + + EnterCriticalSection(&GPNotifyLock); + + /* create the thread notification event */ + if (hNotificationThreadEvent == NULL) + { + hNotificationThreadEvent = CreateEvent(NULL, + TRUE, + FALSE, + NULL); + if (hNotificationThreadEvent == NULL) + { + goto Cleanup; + } + } + + /* create or open the machine group policy event */ + if (hMachineGPAppliedEvent == NULL) + { + lpSecurityDescriptor = CreateDefaultSD(); + + hMachineGPAppliedEvent = CreateGPEvent(TRUE, + lpSecurityDescriptor); + if (hMachineGPAppliedEvent == NULL) + { + goto Cleanup; + } + } + + /* create or open the local group policy event only if necessary */ + if (!bMachine && hLocalGPAppliedEvent == NULL) + { + if (lpSecurityDescriptor == NULL) + { + lpSecurityDescriptor = CreateDefaultSD(); + } + + hLocalGPAppliedEvent = CreateGPEvent(FALSE, + lpSecurityDescriptor); + if (hLocalGPAppliedEvent == NULL) + { + goto Cleanup; + } + } + + if (hNotificationThread == NULL) + { + hNotificationThread = CreateThread(NULL, + 0, + GPNotificationThreadProc, + NULL, + 0, + NULL); + } + + if (hNotificationThread != NULL) + { + Notify = (PGP_NOTIFY)LocalAlloc(LMEM_FIXED, + sizeof(GP_NOTIFY)); + if (Notify != NULL) + { + /* add the item to the beginning of the list */ + Notify->Next = NotificationList; + Notify->hEvent = hEvent; + Notify->bMachine = bMachine; + + NotificationList = Notify; + + /* notify the thread */ + GPNotificationAction = gpaUpdate; + SetEvent(hNotificationThreadEvent); + + Ret = TRUE; + } + } + +Cleanup: + LeaveCriticalSection(&GPNotifyLock); + + if (lpSecurityDescriptor != NULL) + { + LocalFree((HLOCAL)lpSecurityDescriptor); + } + + /* NOTE: don't delete the events or close the handles created */ + + return Ret; +} + +BOOL WINAPI +UnregisterGPNotification(IN HANDLE hEvent) +{ + PGP_NOTIFY Notify = NULL, *NotifyLink; + BOOL Ret = FALSE; + + EnterCriticalSection(&GPNotifyLock); + + Notify = NotificationList; + NotifyLink = &NotificationList; + + while (Notify != NULL) + { + if (Notify->hEvent == hEvent) + { + /* remove and free the item */ + *NotifyLink = Notify->Next; + LocalFree((HLOCAL)Notify); + + /* notify the thread */ + if (hNotificationThread != NULL && + hNotificationThreadEvent != NULL) + { + GPNotificationAction = gpaUpdate; + SetEvent(hNotificationThreadEvent); + } + + Ret = TRUE; + break; + } + + NotifyLink = &Notify->Next; + Notify = Notify->Next; + } + + LeaveCriticalSection(&GPNotifyLock); + + return Ret; +} Property changes on: trunk/reactos/lib/userenv/gpolicy.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/userenv/internal.h --- trunk/reactos/lib/userenv/internal.h 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/internal.h 2006-01-11 22:40:31 UTC (rev 20792) @@ -28,20 +28,6 @@ #ifndef _INTERNAL_H #define _INTERNAL_H -/* debug.h */ -void -DebugPrint (char* fmt,...); - -#define DPRINT1 DebugPrint("(%s:%d) ",__FILE__,__LINE__), DebugPrint -#define CHECKPOINT1 do { DebugPrint("%s:%d\n",__FILE__,__LINE__); } while(0); - -#ifdef __GNUC__ -#define DPRINT(args...) -#else -#define DPRINT -#endif /* __GNUC__ */ -#define CHECKPOINT - /* directory.c */ BOOL CopyDirectory (LPCWSTR lpDestinationPath, @@ -91,6 +77,9 @@ GetUserSidFromToken (HANDLE hToken, PUNICODE_STRING SidString); +PVOID +CreateDefaultSD(VOID); + /* profile.c */ BOOL AppendSystemPostfix (LPWSTR lpName, @@ -109,6 +98,14 @@ /* userenv.c */ extern HINSTANCE hInstance; +/* gpolicy.c */ + +VOID +InitializeGPNotifications(VOID); + +VOID +UninitializeGPNotifications(VOID); + #endif /* _INTERNAL_H */ /* EOF */ _____ Modified: trunk/reactos/lib/userenv/misc.c --- trunk/reactos/lib/userenv/misc.c 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/misc.c 2006-01-11 22:40:31 UTC (rev 20792) @@ -27,7 +27,10 @@ #include <precomp.h> +#define NDEBUG +#include <debug.h> + /* FUNCTIONS ***************************************************************/ LPWSTR @@ -109,6 +112,13 @@ return TRUE; } +PVOID +CreateDefaultSD(VOID) +{ + /* FIXME - create a default security descriptor */ + return NULL; +} + /* Dynamic DLL loading interface **********************************************/ /* OLE32.DLL import table */ _____ Modified: trunk/reactos/lib/userenv/profile.c --- trunk/reactos/lib/userenv/profile.c 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/profile.c 2006-01-11 22:40:31 UTC (rev 20792) @@ -27,7 +27,10 @@ #include <precomp.h> +#define NDEBUG +#include <debug.h> + /* FUNCTIONS ***************************************************************/ BOOL _____ Modified: trunk/reactos/lib/userenv/registry.c --- trunk/reactos/lib/userenv/registry.c 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/registry.c 2006-01-11 22:40:31 UTC (rev 20792) @@ -27,7 +27,10 @@ #include <precomp.h> +#define NDEBUG +#include <debug.h> + /* FUNCTIONS ***************************************************************/ static BOOL _____ Modified: trunk/reactos/lib/userenv/setup.c --- trunk/reactos/lib/userenv/setup.c 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/setup.c 2006-01-11 22:40:31 UTC (rev 20792) @@ -27,6 +27,10 @@ #include <precomp.h> +#define NDEBUG +#include <debug.h> + + typedef struct _FOLDERDATA { LPWSTR lpValueName; _____ Modified: trunk/reactos/lib/userenv/userenv.c --- trunk/reactos/lib/userenv/userenv.c 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/userenv.c 2006-01-11 22:40:31 UTC (rev 20792) @@ -27,6 +27,9 @@ #include <precomp.h> +#define NDEBUG +#include <debug.h> + HINSTANCE hInstance = NULL; BOOL WINAPI @@ -37,9 +40,11 @@ if (fdwReason == DLL_PROCESS_ATTACH) { hInstance = hinstDLL; + InitializeGPNotifications(); } else if (fdwReason == DLL_PROCESS_DETACH) { + UninitializeGPNotifications(); } return TRUE; _____ Modified: trunk/reactos/lib/userenv/userenv.def --- trunk/reactos/lib/userenv/userenv.def 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/userenv.def 2006-01-11 22:40:31 UTC (rev 20792) @@ -31,5 +31,7 @@ GetUserProfileDirectoryW@12 LoadUserProfileA@8 LoadUserProfileW@8 +RegisterGPNotification@8 UnloadUserProfile@8 +UnregisterGPNotification@4 ;EOF _____ Modified: trunk/reactos/lib/userenv/userenv.xml --- trunk/reactos/lib/userenv/userenv.xml 2006-01-11 22:13:02 UTC (rev 20791) +++ trunk/reactos/lib/userenv/userenv.xml 2006-01-11 22:40:31 UTC (rev 20792) @@ -13,6 +13,7 @@ <file>desktop.c</file> <file>directory.c</file> <file>environment.c</file> + <file>gpolicy.c</file> <file>misc.c</file> <file>profile.c</file> <file>registry.c</file>

1 0

[hpoussin] 20791: Rewrite IoGetDeviceInterfaces: no more memory leaks, be ready to handle PhysicalDeviceObject and Flags parameters, less stack usage
by hpoussin＠svn.reactos.org 11 Jan '06

11 Jan '06

Rewrite IoGetDeviceInterfaces: no more memory leaks, be ready to handle PhysicalDeviceObject and Flags parameters, less stack usage IoRegisterPlugPlayNotification: notify caller for already registered interfaces Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/io/deviface.c Modified: trunk/reactos/ntoskrnl/io/pnpnotify.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/io.h --- trunk/reactos/ntoskrnl/include/internal/io.h 2006-01-11 21:59:52 UTC (rev 20790) +++ trunk/reactos/ntoskrnl/include/internal/io.h 2006-01-11 22:13:02 UTC (rev 20791) @@ -218,7 +218,7 @@ IopNotifyPlugPlayNotification( IN PDEVICE_OBJECT DeviceObject, IN IO_NOTIFICATION_EVENT_CATEGORY EventCategory, - IN GUID* Event, + IN LPCGUID Event, IN PVOID EventCategoryData1, IN PVOID EventCategoryData2 ); _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2006-01-11 21:59:52 UTC (rev 20790) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2006-01-11 22:13:02 UTC (rev 20791) @@ -17,6 +17,9 @@ #include <ntddk.h> #include <wdmguid.h> #include <ndk/ntndk.h> +#undef TEXT +#define TEXT(s) L##s +#include <regstr.h> /* FIXME: Temporary until CC Ros is gone */ #include <ccros.h> _____ Modified: trunk/reactos/ntoskrnl/io/deviface.c --- trunk/reactos/ntoskrnl/io/deviface.c 2006-01-11 21:59:52 UTC (rev 20790) +++ trunk/reactos/ntoskrnl/io/deviface.c 2006-01-11 22:13:02 UTC (rev 20791) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/io/deviface.c @@ -7,7 +6,7 @@ * * PROGRAMMERS: Filip Navara (xnavara(a)volny.cz) * Matthew Brace (ismarc(a)austin.rr.com) - * HervÚ Poussineau (hpoussin(a)reactos.com) + * HervÚ Poussineau (hpoussin(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -47,6 +46,93 @@ return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS +IopOpenInterfaceKey( + IN CONST GUID *InterfaceClassGuid, + IN ACCESS_MASK DesiredAccess, + OUT HANDLE *pInterfaceKey) +{ + UNICODE_STRING LocalMachine = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\"); + UNICODE_STRING GuidString; + UNICODE_STRING KeyName; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE InterfaceKey = INVALID_HANDLE_VALUE; + NTSTATUS Status; + + GuidString.Buffer = KeyName.Buffer = NULL; + + Status = RtlStringFromGUID(InterfaceClassGuid, &GuidString); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlStringFromGUID() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + KeyName.Length = 0; + KeyName.MaximumLength = LocalMachine.Length + (wcslen(REGSTR_PATH_DEVICE_CLASSES) + 1) * sizeof(WCHAR) + GuidString.Length; + KeyName.Buffer = ExAllocatePool(PagedPool, KeyName.MaximumLength); + if (!KeyName.Buffer) + { + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + + Status = RtlAppendUnicodeStringToString(&KeyName, &LocalMachine); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + Status = RtlAppendUnicodeToString(&KeyName, REGSTR_PATH_DEVICE_CLASSES); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + Status = RtlAppendUnicodeToString(&KeyName, L"\\"); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + Status = RtlAppendUnicodeStringToString(&KeyName, &GuidString); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + InitializeObjectAttributes( + &ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey( + &InterfaceKey, + DesiredAccess, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + *pInterfaceKey = InterfaceKey; + Status = STATUS_SUCCESS; + +cleanup: + if (!NT_SUCCESS(Status)) + { + if (InterfaceKey != INVALID_HANDLE_VALUE) + ZwClose(InterfaceKey); + } + RtlFreeUnicodeString(&GuidString); + RtlFreeUnicodeString(&KeyName); + return Status; +} + /* * IoGetDeviceInterfaces * @@ -81,9 +167,6 @@ * Status * @implemented * - * The parameters PhysicalDeviceObject and Flags aren't correctly - * processed. Rest of the cases was tested under Windows(R) XP and - * the function worked correctly. */ NTSTATUS STDCALL @@ -93,472 +176,341 @@ IN ULONG Flags, OUT PWSTR *SymbolicLinkList) { - PWCHAR BaseInterfaceString = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"; - UNICODE_STRING GuidString; - UNICODE_STRING BaseKeyName; - UNICODE_STRING AliasKeyName; - UNICODE_STRING SymbolicLink; - UNICODE_STRING Control; - UNICODE_STRING SubKeyName; - UNICODE_STRING SymbolicLinkKeyName; - UNICODE_STRING ControlKeyName; - UNICODE_STRING TempString; - HANDLE InterfaceKey; - HANDLE SubKey; - HANDLE SymbolicLinkKey; - PKEY_FULL_INFORMATION fip; - PKEY_FULL_INFORMATION bfip = NULL; - PKEY_BASIC_INFORMATION bip; - PKEY_VALUE_PARTIAL_INFORMATION vpip = NULL; - PWCHAR SymLinkList = NULL; - ULONG SymLinkListSize = 0; - NTSTATUS Status; - ULONG Size = 0; - ULONG i = 0; - ULONG j = 0; + UNICODE_STRING Control = RTL_CONSTANT_STRING(L"Control"); + UNICODE_STRING SymbolicLink = RTL_CONSTANT_STRING(L"SymbolicLink"); + HANDLE InterfaceKey = INVALID_HANDLE_VALUE; + HANDLE DeviceKey = INVALID_HANDLE_VALUE; + HANDLE ReferenceKey = INVALID_HANDLE_VALUE; + HANDLE ControlKey = INVALID_HANDLE_VALUE; + PKEY_BASIC_INFORMATION DeviceBi = NULL; + PKEY_BASIC_INFORMATION ReferenceBi = NULL; + PKEY_VALUE_PARTIAL_INFORMATION bip = NULL; + UNICODE_STRING KeyName; OBJECT_ATTRIBUTES ObjectAttributes; + BOOLEAN FoundRightPDO = FALSE; + ULONG i = 0, j, Size; + UNICODE_STRING ReturnBuffer = {0,}; + NTSTATUS Status; - ASSERT_IRQL(PASSIVE_LEVEL); + PAGED_CODE(); - Status = RtlStringFromGUID(InterfaceClassGuid, &GuidString); + Status = IopOpenInterfaceKey(InterfaceClassGuid, KEY_ENUMERATE_SUB_KEYS, &InterfaceKey); if (!NT_SUCCESS(Status)) { - DPRINT("RtlStringFromGUID() Failed.\n"); - return STATUS_INVALID_HANDLE; + DPRINT("IopOpenInterfaceKey() failed with status 0x%08lx\n", Status); + goto cleanup; } - RtlInitUnicodeString(&AliasKeyName, BaseInterfaceString); - RtlInitUnicodeString(&SymbolicLink, L"SymbolicLink"); - RtlInitUnicodeString(&Control, L"\\Control"); - BaseKeyName.Length = wcslen(BaseKeyString) * sizeof(WCHAR); - BaseKeyName.MaximumLength = BaseKeyName.Length + (38 * sizeof(WCHAR)); - BaseKeyName.Buffer = ExAllocatePool( - PagedPool, - BaseKeyName.MaximumLength); - ASSERT(BaseKeyName.Buffer != NULL); - wcscpy(BaseKeyName.Buffer, BaseKeyString); - RtlAppendUnicodeStringToString(&BaseKeyName, &GuidString); - - if (PhysicalDeviceObject) + /* Enumerate subkeys (ie the different device objets) */ + while (TRUE) { - WCHAR GuidBuffer[40]; - UNICODE_STRING PdoGuidString; - - RtlFreeUnicodeString(&BaseKeyName); - - IoGetDeviceProperty( - PhysicalDeviceObject, - DevicePropertyClassGuid, - sizeof(GuidBuffer), - GuidBuffer, + Status = ZwEnumerateKey( + InterfaceKey, + i, + KeyBasicInformation, + NULL, + 0, &Size); + if (Status == STATUS_NO_MORE_ENTRIES) + break; + else if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) + { + DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } - RtlInitUnicodeString(&PdoGuidString, GuidBuffer); - if (RtlCompareUnicodeString(&GuidString, &PdoGuidString, TRUE)) + DeviceBi = ExAllocatePool(PagedPool, Size); + if (!DeviceBi) { - DPRINT("Inconsistent Guid's asked for in IoGetDeviceInterfaces()\n"); - return STATUS_INVALID_HANDLE; + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; } + Status = ZwEnumerateKey( + InterfaceKey, + i++, + KeyBasicInformation, + DeviceBi, + Size, + &Size); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } - DPRINT("IoGetDeviceInterfaces() called with PDO, not implemented.\n"); - return STATUS_NOT_IMPLEMENTED; - } - else - { + /* Open device key */ + KeyName.Length = KeyName.MaximumLength = DeviceBi->NameLength; + KeyName.Buffer = DeviceBi->Name; InitializeObjectAttributes( &ObjectAttributes, - &BaseKeyName, + &KeyName, OBJ_CASE_INSENSITIVE, - NULL, + InterfaceKey, NULL); - Status = ZwOpenKey( - &InterfaceKey, - KEY_READ, + &DeviceKey, + KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); - if (!NT_SUCCESS(Status)) { - DPRINT("ZwOpenKey() Failed. (0x%X)\n", Status); - RtlFreeUnicodeString(&BaseKeyName); - return Status; + DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + goto cleanup; } - Status = ZwQueryKey( - InterfaceKey, - KeyFullInformation, - NULL, - 0, - &Size); - - if (Status != STATUS_BUFFER_TOO_SMALL) + if (PhysicalDeviceObject) { - DPRINT("ZwQueryKey() Failed. (0x%X)\n", Status); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(InterfaceKey); - return Status; + /* Check if we are on the right physical device object, + * by reading the DeviceInstance string + */ + DPRINT1("PhysicalDeviceObject != NULL. Case not implemented.\n"); + //FoundRightPDO = TRUE; + Status = STATUS_NOT_IMPLEMENTED; + goto cleanup; } - fip = (PKEY_FULL_INFORMATION)ExAllocatePool(PagedPool, Size); - ASSERT(fip != NULL); - - Status = ZwQueryKey( - InterfaceKey, - KeyFullInformation, - fip, - Size, - &Size); - - if (!NT_SUCCESS(Status)) + /* Enumerate subkeys (ie the different reference strings) */ + j = 0; + while (TRUE) { - DPRINT("ZwQueryKey() Failed. (0x%X)\n", Status); - ExFreePool(fip); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(InterfaceKey); - return Status; - } - - for (; i < fip->SubKeys; i++) - { Status = ZwEnumerateKey( - InterfaceKey, - i, + DeviceKey, + j, KeyBasicInformation, NULL, 0, &Size); - - if (Status != STATUS_BUFFER_TOO_SMALL) + if (Status == STATUS_NO_MORE_ENTRIES) + break; + else if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) { - DPRINT("ZwEnumerateKey() Failed.(0x%X)\n", Status); - ExFreePool(fip); - if (SymLinkList != NULL) - ExFreePool(SymLinkList); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(InterfaceKey); - return Status; + DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); + goto cleanup; } - bip = (PKEY_BASIC_INFORMATION)ExAllocatePool(PagedPool, Size); - ASSERT(bip != NULL); - + ReferenceBi = ExAllocatePool(PagedPool, Size); + if (!ReferenceBi) + { + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } Status = ZwEnumerateKey( - InterfaceKey, - i, + DeviceKey, + j++, KeyBasicInformation, - bip, + ReferenceBi, Size, &Size); - if (!NT_SUCCESS(Status)) { - DPRINT("ZwEnumerateKey() Failed.(0x%X)\n", Status); - ExFreePool(fip); - ExFreePool(bip); - if (SymLinkList != NULL) - ExFreePool(SymLinkList); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(InterfaceKey); - return Status; + DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); + goto cleanup; } - SubKeyName.Length = 0; - SubKeyName.MaximumLength = BaseKeyName.Length + bip->NameLength + sizeof(WCHAR); - SubKeyName.Buffer = ExAllocatePool(PagedPool, SubKeyName.MaximumLength); - ASSERT(SubKeyName.Buffer != NULL); - TempString.Length = TempString.MaximumLength = bip->NameLength; - TempString.Buffer = bip->Name; - RtlCopyUnicodeString(&SubKeyName, &BaseKeyName); - RtlAppendUnicodeToString(&SubKeyName, L"\\"); - RtlAppendUnicodeStringToString(&SubKeyName, &TempString); + KeyName.Length = KeyName.MaximumLength = ReferenceBi->NameLength; + KeyName.Buffer = ReferenceBi->Name; + if (RtlEqualUnicodeString(&KeyName, &Control, TRUE)) + { + /* Skip Control subkey */ + goto NextReferenceString; + } - ExFreePool(bip); - + /* Open reference key */ InitializeObjectAttributes( &ObjectAttributes, - &SubKeyName, + &KeyName, OBJ_CASE_INSENSITIVE, - NULL, + DeviceKey, NULL); - Status = ZwOpenKey( - &SubKey, - KEY_READ, + &ReferenceKey, + KEY_QUERY_VALUE, &ObjectAttributes); - if (!NT_SUCCESS(Status)) { - DPRINT("ZwOpenKey() Failed. (0x%X)\n", Status); - ExFreePool(fip); - if (SymLinkList != NULL) - ExFreePool(SymLinkList); - RtlFreeUnicodeString(&SubKeyName); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(InterfaceKey); - return Status; + DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + goto cleanup; } - Status = ZwQueryKey( - SubKey, - KeyFullInformation, - NULL, - 0, - &Size); - - if (Status != STATUS_BUFFER_TOO_SMALL) + if (!(Flags & DEVICE_INTERFACE_INCLUDE_NONACTIVE)) { - DPRINT("ZwQueryKey() Failed. (0x%X)\n", Status); - ExFreePool(fip); - RtlFreeUnicodeString(&BaseKeyName); - RtlFreeUnicodeString(&SubKeyName); - ZwClose(SubKey); - ZwClose(InterfaceKey); - return Status; - } - - bfip = (PKEY_FULL_INFORMATION)ExAllocatePool(PagedPool, Size); - ASSERT(bfip != NULL); - - Status = ZwQueryKey( - SubKey, - KeyFullInformation, - bfip, - Size, - &Size); - - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwQueryKey() Failed. (0x%X)\n", Status); - ExFreePool(fip); - RtlFreeUnicodeString(&SubKeyName); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(SubKey); - ZwClose(InterfaceKey); - return Status; - } - - for(j = 0; j < bfip->SubKeys; j++) - { - Status = ZwEnumerateKey( - SubKey, - j, - KeyBasicInformation, - NULL, - 0, - &Size); - - if (Status == STATUS_NO_MORE_ENTRIES) - continue; - - if (Status != STATUS_BUFFER_TOO_SMALL) - { - DPRINT("ZwEnumerateKey() Failed.(0x%X)\n", Status); - ExFreePool(bfip); - ExFreePool(fip); - if (SymLinkList != NULL) - ExFreePool(SymLinkList); - RtlFreeUnicodeString(&SubKeyName); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(SubKey); - ZwClose(InterfaceKey); - return Status; - } - - bip = (PKEY_BASIC_INFORMATION)ExAllocatePool(PagedPool, Size); - ASSERT(bip != NULL); - - Status = ZwEnumerateKey( - SubKey, - j, - KeyBasicInformation, - bip, - Size, - &Size); - - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwEnumerateKey() Failed.(0x%X)\n", Status); - ExFreePool(fip); - ExFreePool(bfip); - ExFreePool(bip); - if (SymLinkList != NULL) - ExFreePool(SymLinkList); - RtlFreeUnicodeString(&SubKeyName); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(SubKey); - ZwClose(InterfaceKey); - return Status; - } - - if (!wcsncmp(bip->Name, L"Control", bip->NameLength)) - { - continue; - } - - SymbolicLinkKeyName.Length = 0; - SymbolicLinkKeyName.MaximumLength = SubKeyName.Length + bip->NameLength + sizeof(WCHAR); - SymbolicLinkKeyName.Buffer = ExAllocatePool(PagedPool, SymbolicLinkKeyName.MaximumLength); - ASSERT(SymbolicLinkKeyName.Buffer != NULL); - TempString.Length = TempString.MaximumLength = bip->NameLength; - TempString.Buffer = bip->Name; - RtlCopyUnicodeString(&SymbolicLinkKeyName, &SubKeyName); - RtlAppendUnicodeToString(&SymbolicLinkKeyName, L"\\"); - RtlAppendUnicodeStringToString(&SymbolicLinkKeyName, &TempString); - - ControlKeyName.Length = 0; - ControlKeyName.MaximumLength = SymbolicLinkKeyName.Length + Control.Length + sizeof(WCHAR); - ControlKeyName.Buffer = ExAllocatePool(PagedPool, ControlKeyName.MaximumLength); - ASSERT(ControlKeyName.Buffer != NULL); - RtlCopyUnicodeString(&ControlKeyName, &SymbolicLinkKeyName); - RtlAppendUnicodeStringToString(&ControlKeyName, &Control); - - ExFreePool(bip); - + /* We have to check if the interface is enabled, by + * reading the Linked value in the Control subkey + */ InitializeObjectAttributes( &ObjectAttributes, - &SymbolicLinkKeyName, + &Control, OBJ_CASE_INSENSITIVE, - NULL, + ReferenceKey, NULL); - Status = ZwOpenKey( - &SymbolicLinkKey, - KEY_READ, + &ControlKey, + KEY_QUERY_VALUE, &ObjectAttributes); - - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwOpenKey() Failed. (0x%X)\n", Status); - ExFreePool(fip); - ExFreePool(bfip); - if (SymLinkList != NULL) - ExFreePool(SymLinkList); - RtlFreeUnicodeString(&SymbolicLinkKeyName); - RtlFreeUnicodeString(&SubKeyName); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(SubKey); - ZwClose(InterfaceKey); - return Status; - } - - Status = ZwQueryValueKey( - SymbolicLinkKey, - &SymbolicLink, - KeyValuePartialInformation, - NULL, - 0, - &Size); - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - continue; - - if (Status != STATUS_BUFFER_TOO_SMALL) { - DPRINT("ZwQueryValueKey() Failed.(0x%X)\n", Status); - ExFreePool(fip); - ExFreePool(bfip); - if (SymLinkList != NULL) - ExFreePool(SymLinkList); - RtlFreeUnicodeString(&SymbolicLinkKeyName); - RtlFreeUnicodeString(&SubKeyName); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(SymbolicLinkKey); - ZwClose(SubKey); - ZwClose(InterfaceKey); - return Status; + /* That's OK. The key doesn't exist (yet) because + * the interface is not activated. + */ + goto NextReferenceString; } - - vpip = (PKEY_VALUE_PARTIAL_INFORMATION)ExAllocatePool(PagedPool, Size); - ASSERT(vpip != NULL); - - Status = ZwQueryValueKey( - SymbolicLinkKey, - &SymbolicLink, - KeyValuePartialInformation, - vpip, - Size, - &Size); - - if (!NT_SUCCESS(Status)) + else if (!NT_SUCCESS(Status)) { - DPRINT("ZwQueryValueKey() Failed.(0x%X)\n", Status); - ExFreePool(fip); - ExFreePool(bfip); - ExFreePool(vpip); - if (SymLinkList != NULL) - ExFreePool(SymLinkList); - RtlFreeUnicodeString(&SymbolicLinkKeyName); - RtlFreeUnicodeString(&SubKeyName); - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(SymbolicLinkKey); - ZwClose(SubKey); - ZwClose(InterfaceKey); - return Status; + DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + goto cleanup; } + /* FIXME: Read the Linked value + * If it doesn't exist => ERROR + * If it is not a REG_DWORD or Size != sizeof(ULONG) => ERROR + * If its value is 0, go to NextReferenceString + * At the moment, do as if it is active... + */ + DPRINT1("Checking if device is enabled is not implemented yet!\n"); + } - Status = RtlCheckRegistryKey(RTL_REGISTRY_ABSOLUTE, ControlKeyName.Buffer); + /* Read the SymbolicLink string and add it into SymbolicLinkList */ + Status = ZwQueryValueKey( + ReferenceKey, + &SymbolicLink, + KeyValuePartialInformation, + NULL, + 0, + &Size); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) + { + DPRINT("ZwQueryValueKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + bip = ExAllocatePool(PagedPool, Size); + if (!bip) + { + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + Status = ZwQueryValueKey( + ReferenceKey, + &SymbolicLink, + KeyValuePartialInformation, + bip, + Size, + &Size); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwQueryValueKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + else if (bip->Type != REG_SZ) + { + DPRINT("Unexpected registry type 0x%lx (expected 0x%lx)\n", bip->Type, REG_SZ); + Status = STATUS_UNSUCCESSFUL; + goto cleanup; + } + else if (bip->DataLength < 5 * sizeof(WCHAR)) + { + DPRINT("Registry string too short (length %lu, expected %lu at least)\n", bip->DataLength < 5 * sizeof(WCHAR)); + Status = STATUS_UNSUCCESSFUL; + goto cleanup; + } + KeyName.Length = KeyName.MaximumLength = bip->DataLength - 4 * sizeof(WCHAR); + KeyName.Buffer = &((PWSTR)bip->Data)[4]; + if (KeyName.Length && KeyName.Buffer[KeyName.Length / sizeof(WCHAR)] == UNICODE_NULL) + /* Remove trailing NULL */ + KeyName.Length -= sizeof(WCHAR); - if (NT_SUCCESS(Status)) + /* Add new symbolic link to symbolic link list */ + if (ReturnBuffer.Length + KeyName.Length + sizeof(WCHAR) > ReturnBuffer.MaximumLength) + { + PWSTR NewBuffer; + ReturnBuffer.MaximumLength = max(ReturnBuffer.MaximumLength * 2, ReturnBuffer.Length + KeyName.Length + 2 * sizeof(WCHAR)); + NewBuffer = ExAllocatePool(PagedPool, ReturnBuffer.MaximumLength); + if (!NewBuffer) { - /* Put the name in the string here */ - if (SymLinkList == NULL) - { - SymLinkListSize = vpip->DataLength; - SymLinkList = ExAllocatePool(PagedPool, SymLinkListSize + sizeof(WCHAR)); - ASSERT(SymLinkList != NULL); - RtlCopyMemory(SymLinkList, vpip->Data, vpip->DataLength); - SymLinkList[vpip->DataLength / sizeof(WCHAR)] = 0; - SymLinkList[1] = '?'; - } - else - { - PWCHAR OldSymLinkList; - ULONG OldSymLinkListSize; - PWCHAR SymLinkListPtr; - - OldSymLinkList = SymLinkList; - OldSymLinkListSize = SymLinkListSize; - SymLinkListSize += vpip->DataLength; - SymLinkList = ExAllocatePool(PagedPool, SymLinkListSize + sizeof(WCHAR)); - ASSERT(SymLinkList != NULL); - RtlCopyMemory(SymLinkList, OldSymLinkList, OldSymLinkListSize); - ExFreePool(OldSymLinkList); - SymLinkListPtr = SymLinkList + (OldSymLinkListSize / sizeof(WCHAR)); - RtlCopyMemory(SymLinkListPtr, vpip->Data, vpip->DataLength); - SymLinkListPtr[vpip->DataLength / sizeof(WCHAR)] = 0; - SymLinkListPtr[1] = '?'; - } + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; } - - RtlFreeUnicodeString(&SymbolicLinkKeyName); - RtlFreeUnicodeString(&ControlKeyName); - ZwClose(SymbolicLinkKey); + RtlCopyMemory(NewBuffer, ReturnBuffer.Buffer, ReturnBuffer.Length); + ExFreePool(ReturnBuffer.Buffer); + ReturnBuffer.Buffer = NewBuffer; } + DPRINT("Adding symbolic link %wZ\n", &KeyName); + Status = RtlAppendUnicodeStringToString(&ReturnBuffer, &KeyName); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + /* RtlAppendUnicodeStringToString added a NULL at the end of the + * destination string, but didn't increase the Length field. + * Do it for it. + */ + ReturnBuffer.Length += sizeof(WCHAR); - ExFreePool(vpip); - RtlFreeUnicodeString(&SubKeyName); - ZwClose(SubKey); +NextReferenceString: + ExFreePool(ReferenceBi); + ReferenceBi = NULL; + ExFreePool(bip); + bip = NULL; + if (ReferenceKey != INVALID_HANDLE_VALUE) + { + ZwClose(ReferenceKey); + ReferenceKey = INVALID_HANDLE_VALUE; + } + if (ControlKey != INVALID_HANDLE_VALUE) + { + ZwClose(ControlKey); + ControlKey = INVALID_HANDLE_VALUE; + } } - - if (SymLinkList != NULL) + if (FoundRightPDO) { - SymLinkList[SymLinkListSize / sizeof(WCHAR)] = 0; + /* No need to go further, as we already have found what we searched */ + break; } - else - { - SymLinkList = ExAllocatePool(PagedPool, 2 * sizeof(WCHAR)); - SymLinkList[0] = 0; - } - *SymbolicLinkList = SymLinkList; + ExFreePool(DeviceBi); + DeviceBi = NULL; + ZwClose(DeviceKey); + DeviceKey = INVALID_HANDLE_VALUE; + } - RtlFreeUnicodeString(&BaseKeyName); - ZwClose(InterfaceKey); - ExFreePool(bfip); - ExFreePool(fip); + /* Add final NULL to ReturnBuffer */ + if (ReturnBuffer.Length >= ReturnBuffer.MaximumLength) + { + PWSTR NewBuffer; + ReturnBuffer.MaximumLength += sizeof(WCHAR); + NewBuffer = ExAllocatePool(PagedPool, ReturnBuffer.MaximumLength); + if (!NewBuffer) + { + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + RtlCopyMemory(NewBuffer, ReturnBuffer.Buffer, ReturnBuffer.Length); + ExFreePool(ReturnBuffer.Buffer); + ReturnBuffer.Buffer = NewBuffer; } + ReturnBuffer.Buffer[ReturnBuffer.Length / sizeof(WCHAR)] = UNICODE_NULL; + *SymbolicLinkList = ReturnBuffer.Buffer; + Status = STATUS_SUCCESS; - return STATUS_SUCCESS; +cleanup: + if (!NT_SUCCESS(Status)) + ExFreePool(ReturnBuffer.Buffer); + if (InterfaceKey != INVALID_HANDLE_VALUE) + ZwClose(InterfaceKey); + if (DeviceKey != INVALID_HANDLE_VALUE) + ZwClose(DeviceKey); + if (ReferenceKey != INVALID_HANDLE_VALUE) + ZwClose(ReferenceKey); + if (ControlKey != INVALID_HANDLE_VALUE) + ZwClose(ControlKey); + ExFreePool(DeviceBi); + ExFreePool(ReferenceBi); + ExFreePool(bip); + return Status; } /* @@ -882,7 +834,7 @@ PWCHAR StartPosition; PWCHAR EndPosition; NTSTATUS Status; - GUID EventGuid; + LPCGUID EventGuid; if (SymbolicLinkName == NULL) return STATUS_INVALID_PARAMETER_1; @@ -918,11 +870,11 @@ return Status; } - EventGuid = Enable ? GUID_DEVICE_INTERFACE_ARRIVAL : GUID_DEVICE_INTERFACE_REMOVAL; + EventGuid = Enable ? &GUID_DEVICE_INTERFACE_ARRIVAL : &GUID_DEVICE_INTERFACE_REMOVAL; IopNotifyPlugPlayNotification( PhysicalDeviceObject, EventCategoryDeviceInterfaceChange, - &EventGuid, + EventGuid, &GuidString, (PVOID)SymbolicLinkName); _____ Modified: trunk/reactos/ntoskrnl/io/pnpnotify.c --- trunk/reactos/ntoskrnl/io/pnpnotify.c 2006-01-11 21:59:52 UTC (rev 20790) +++ trunk/reactos/ntoskrnl/io/pnpnotify.c 2006-01-11 22:13:02 UTC (rev 20791) @@ -1,12 +1,11 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/io/pnpnotify.c * PURPOSE: Plug & Play notification functions * * PROGRAMMERS: Filip Navara (xnavara(a)volny.cz) - * HervÚ Poussineau (hpoussin(a)reactos.com) + * HervÚ Poussineau (hpoussin(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -92,9 +91,13 @@ return STATUS_INSUFFICIENT_RESOURCES; } - if (EventCategory == EventCategoryTargetDeviceChange + if (EventCategory == EventCategoryDeviceInterfaceChange && EventCategoryFlags & PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES) { + DEVICE_INTERFACE_CHANGE_NOTIFICATION NotificationInfos; + UNICODE_STRING SymbolicLinkU; + PWSTR SymbolicLink; + Status = IoGetDeviceInterfaces( (LPGUID)EventCategoryData, NULL, /* PhysicalDeviceObject OPTIONAL */ @@ -107,8 +110,18 @@ ObDereferenceObject(DriverObject); return Status; } - /* FIXME: enumerate SymbolicLinkList */ - DPRINT1("IoRegisterPlugPlayNotification(): need to send notifications for existing interfaces!\n"); + /* Enumerate SymbolicLinkList */ + NotificationInfos.Version = 1; + NotificationInfos.Size = sizeof(DEVICE_INTERFACE_CHANGE_NOTIFICATION); + RtlCopyMemory(&NotificationInfos.Event, &GUID_DEVICE_INTERFACE_ARRIVAL, sizeof(GUID)); + RtlCopyMemory(&NotificationInfos.InterfaceClassGuid, EventCategoryData, sizeof(GUID)); + NotificationInfos.SymbolicLinkName = &SymbolicLinkU; + for (SymbolicLink = SymbolicLinkList; *SymbolicLink; SymbolicLink += wcslen(SymbolicLink) + 1) + { + RtlInitUnicodeString(&SymbolicLinkU, SymbolicLink); + DPRINT("Calling callback routine for %S\n", SymbolicLink); + (*CallbackRoutine)(&NotificationInfos, Context); + } ExFreePool(SymbolicLinkList); } @@ -184,7 +197,7 @@ IopNotifyPlugPlayNotification( IN PDEVICE_OBJECT DeviceObject, IN IO_NOTIFICATION_EVENT_CATEGORY EventCategory, - IN GUID* Event, + IN LPCGUID Event, IN PVOID EventCategoryData1, IN PVOID EventCategoryData2) { @@ -253,7 +266,7 @@ * list to find those that meet some criteria. */ - LIST_FOR_EACH(ChangeEntry,&PnpNotifyListHead, PNP_NOTIFY_ENTRY, PnpNotifyList) + LIST_FOR_EACH(ChangeEntry,&PnpNotifyListHead, PNP_NOTIFY_ENTRY, PnpNotifyList) { CallCurrentEntry = FALSE;

1 0

[hpoussin] 20790: Add DEVICE_INTERFACE_INCLUDE_NONACTIVE constant
by hpoussin＠svn.reactos.org 11 Jan '06

11 Jan '06

Add DEVICE_INTERFACE_INCLUDE_NONACTIVE constant Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2006-01-11 21:31:25 UTC (rev 20789) +++ trunk/reactos/w32api/include/ddk/winddk.h 2006-01-11 21:59:52 UTC (rev 20790) @@ -7468,6 +7468,8 @@ IN CONST GUID *AliasInterfaceClassGuid, OUT PUNICODE_STRING AliasSymbolicLinkName); +#define DEVICE_INTERFACE_INCLUDE_NONACTIVE 0x00000001 + NTOSAPI NTSTATUS DDKAPI

1 0

[gedmurphy] 20789: redo the toolbar and app icons and a few other minor changes
by gedmurphy＠svn.reactos.org 11 Jan '06

11 Jan '06

redo the toolbar and app icons and a few other minor changes Modified: trunk/reactos/subsys/system/servman/En.rc Modified: trunk/reactos/subsys/system/servman/res/system.ico Modified: trunk/reactos/subsys/system/servman/res/toolbar.bmp Modified: trunk/reactos/subsys/system/servman/resource.h Modified: trunk/reactos/subsys/system/servman/servman.c Modified: trunk/reactos/subsys/system/servman/servman.h _____ Modified: trunk/reactos/subsys/system/servman/En.rc --- trunk/reactos/subsys/system/servman/En.rc 2006-01-11 20:16:29 UTC (rev 20788) +++ trunk/reactos/subsys/system/servman/En.rc 2006-01-11 21:31:25 UTC (rev 20789) @@ -3,27 +3,27 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit",ID_EXIT + MENUITEM "E&xit", ID_EXIT END POPUP "Action" BEGIN - MENUITEM "Start",ID_START - MENUITEM "Stop",ID_STOP - MENUITEM "Pause",ID_PAUSE - MENUITEM "Resume",ID_RESUME - MENUITEM "Restart",ID_RESTART + MENUITEM "Start", ID_START + MENUITEM "Stop", ID_STOP + MENUITEM "Pause", ID_PAUSE + MENUITEM "Resume", ID_RESUME + MENUITEM "Restart", ID_RESTART MENUITEM SEPARATOR - MENUITEM "Refresh",ID_REFRESH + MENUITEM "Refresh", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Properties",ID_PROP + MENUITEM "Properties", ID_PROP END POPUP "View" BEGIN - MENUITEM "Customize",ID_VIEW_CUSTOMIZE + MENUITEM "Customize", ID_VIEW_CUSTOMIZE END POPUP "Help" BEGIN - MENUITEM "About",ID_ABOUT + MENUITEM "About", ID_ABOUT END END @@ -31,28 +31,28 @@ IDR_POPUP MENU BEGIN POPUP "popup" - BEGIN - MENUITEM "Start",ID_START - MENUITEM "Stop",ID_STOP - MENUITEM "Pause",ID_PAUSE - MENUITEM "Resume",ID_RESUME - MENUITEM "Restart",ID_RESTART + BEGIN + MENUITEM "Start", ID_START + MENUITEM "Stop", ID_STOP + MENUITEM "Pause", ID_PAUSE + MENUITEM "Resume", ID_RESUME + MENUITEM "Restart", ID_RESTART MENUITEM SEPARATOR POPUP "All tasks" BEGIN - MENUITEM "Start",ID_START - MENUITEM "Stop",ID_STOP - MENUITEM "Pause",ID_PAUSE - MENUITEM "Resume",ID_RESUME - MENUITEM "Restart",ID_RESTART - MENUITEM "Refresh",ID_REFRESH + MENUITEM "Start", ID_START + MENUITEM "Stop", ID_STOP + MENUITEM "Pause", ID_PAUSE + MENUITEM "Resume", ID_RESUME + MENUITEM "Restart", ID_RESTART + MENUITEM "Refresh", ID_REFRESH END MENUITEM SEPARATOR - MENUITEM "Refresh",ID_REFRESH + MENUITEM "Refresh", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Properties",ID_PROP + MENUITEM "Properties", ID_PROP MENUITEM SEPARATOR - MENUITEM "About",ID_HELP + MENUITEM "Help", ID_HELP END END @@ -119,21 +119,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Num Services: %d" - - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." - /*"This program is free software; you can redistribute it " - "and/or modify it under the terms of the GNU Lesser General " - "Public License as published by the Free Software Foundation; " - "either version 2.1 of the License, or (at your option) any " - "later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU " - "General Public License along with this program; if not, write " - "to the Free Software Foundation, Inc., 59 Temple Place - Suite " - "330, Boston, MA 02111-1307, USA." */ - + IDS_LICENSE "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.\r\n\r\nThis 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.\r\n\r\nYou 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." END STRINGTABLE DISCARDABLE _____ Modified: trunk/reactos/subsys/system/servman/res/system.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/servman/res/toolbar.bmp (Binary files differ) _____ Modified: trunk/reactos/subsys/system/servman/resource.h --- trunk/reactos/subsys/system/servman/resource.h 2006-01-11 20:16:29 UTC (rev 20788) +++ trunk/reactos/subsys/system/servman/resource.h 2006-01-11 21:31:25 UTC (rev 20789) @@ -55,11 +55,11 @@ #define TBICON_PROP 0 #define TBICON_REFRESH 1 #define TBICON_EXPORT 2 -#define TBICON_START 3 -#define TBICON_STOP 4 -#define TBICON_PAUSE 5 -#define TBICON_RESTART 6 -#define TBICON_NEW 7 +#define TBICON_NEW 3 +#define TBICON_START 4 +#define TBICON_STOP 5 +#define TBICON_PAUSE 6 +#define TBICON_RESTART 7 #define TBICON_HELP 8 #define TBICON_EXIT 9 _____ Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-11 20:16:29 UTC (rev 20788) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-11 21:31:25 UTC (rev 20789) @@ -25,8 +25,6 @@ { case WM_CREATE: { - //HFONT hfDefault; - TBADDBITMAP tbab; INT iImageOffset; INT statwidths[] = {110, -1}; /* widths of status bar */ @@ -41,18 +39,21 @@ {TBICON_EXPORT, ID_EXPORT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* export */ /* Note: First item for a seperator is its width in pixels */ - {25, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + {TBICON_NEW, ID_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* create */ + + {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + {TBICON_START, ID_START, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* start */ {TBICON_STOP, ID_STOP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* stop */ {TBICON_PAUSE, ID_PAUSE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* pause */ {TBICON_RESTART, ID_RESTART, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* restart */ - {25, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - {TBICON_NEW, ID_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* start */ - {TBICON_HELP, ID_HELP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* stop */ - {TBICON_EXIT, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* pause */ + {TBICON_HELP, ID_HELP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* help */ + {TBICON_EXIT, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* exit */ }; @@ -74,25 +75,20 @@ /* Send the TB_BUTTONSTRUCTSIZE message, which is required for backward compatibility */ SendMessage(hTool, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - /* Add standard image list */ - tbab.hInst = HINST_COMMCTRL; - tbab.nID = IDB_STD_SMALL_COLOR; - SendMessage(hTool, TB_ADDBITMAP, 0, (LPARAM) &tbab); - /* Add custom images */ tbab.hInst = hInstance; tbab.nID = IDB_BUTTONS; - iImageOffset = (INT)SendMessage(hTool, TB_ADDBITMAP, 11, (LPARAM)&tbab); + iImageOffset = (INT)SendMessage(hTool, TB_ADDBITMAP, NUM_BUTTONS, (LPARAM)&tbab); tbb[0].iBitmap += iImageOffset; /* properties */ tbb[1].iBitmap += iImageOffset; /* refresh */ tbb[2].iBitmap += iImageOffset; /* export */ - tbb[4].iBitmap += iImageOffset; /* start */ - tbb[5].iBitmap += iImageOffset; /* stop */ - tbb[6].iBitmap += iImageOffset; /* pause */ - tbb[7].iBitmap += iImageOffset; /* restart */ - tbb[9].iBitmap += iImageOffset; /* new */ - tbb[10].iBitmap += iImageOffset; /* help */ - tbb[11].iBitmap += iImageOffset; /* exit */ + tbb[4].iBitmap += iImageOffset; /* new */ + tbb[6].iBitmap += iImageOffset; /* start */ + tbb[7].iBitmap += iImageOffset; /* stop */ + tbb[8].iBitmap += iImageOffset; /* pause */ + tbb[9].iBitmap += iImageOffset; /* restart */ + tbb[11].iBitmap += iImageOffset; /* help */ + tbb[12].iBitmap += iImageOffset; /* exit */ /* Add buttons to toolbar */ SendMessage(hTool, TB_ADDBUTTONS, NUM_BUTTONS, (LPARAM) &tbb); @@ -126,21 +122,21 @@ /* name */ lvc.iSubItem = 0; - lvc.cx = 160; + lvc.cx = 150; LoadString(hInstance, IDS_FIRSTCOLUMN, szTemp, 256); lvc.pszText = szTemp; ListView_InsertColumn(hListView, 0, &lvc); /* description */ lvc.iSubItem = 1; - lvc.cx = 260; + lvc.cx = 240; LoadString(hInstance, IDS_SECONDCOLUMN, szTemp, 256); lvc.pszText = szTemp; ListView_InsertColumn(hListView, 1, &lvc); /* status */ lvc.iSubItem = 2; - lvc.cx = 75; + lvc.cx = 55; LoadString(hInstance, IDS_THIRDCOLUMN, szTemp, 256); lvc.pszText = szTemp; ListView_InsertColumn(hListView, 2, &lvc); @@ -232,8 +228,8 @@ case WM_NOTIFY: { LPNMITEMACTIVATE item; - + switch (((LPNMHDR) lParam)->code) { case NM_DBLCLK: @@ -247,10 +243,10 @@ UINT idButton; lpttt = (LPTOOLTIPTEXT) lParam; - lpttt->hinst = hInstance; + //lpttt->hinst = hInstance; - // Specify the resource identifier of the descriptive - // text for the given button. + /* Specify the resource identifier of the descriptive + * text for the given button. */ idButton = (UINT)lpttt->hdr.idFrom; switch (idButton) { @@ -318,10 +314,11 @@ { int xPos, yPos; - xPos = GET_X_LPARAM(lParam); + xPos = GET_X_LPARAM(lParam); yPos = GET_Y_LPARAM(lParam); - TrackPopupMenuEx(hShortcutMenu, TPM_RIGHTBUTTON, xPos, yPos, hwnd, NULL); + TrackPopupMenuEx(hShortcutMenu, TPM_RIGHTBUTTON, + xPos, yPos, hwnd, NULL); } break; @@ -333,8 +330,8 @@ break; case ID_REFRESH: - if (! RefreshServiceList() ) - GetError(0); + RefreshServiceList(); + break; case ID_EXPORT: break; @@ -425,7 +422,7 @@ ClassName, _T("ReactOS Service Manager"), WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, - CW_USEDEFAULT, CW_USEDEFAULT, 700, 500, + CW_USEDEFAULT, CW_USEDEFAULT, 650, 450, NULL, NULL, hInstance, NULL); if(hMainWnd == NULL) _____ Modified: trunk/reactos/subsys/system/servman/servman.h --- trunk/reactos/subsys/system/servman/servman.h 2006-01-11 20:16:29 UTC (rev 20788) +++ trunk/reactos/subsys/system/servman/servman.h 2006-01-11 21:31:25 UTC (rev 20789) @@ -10,7 +10,7 @@ #include "resource.h" #define MAX_KEY_LENGTH 256 -#define NUM_BUTTONS 12 +#define NUM_BUTTONS 13 BOOL RefreshServiceList(VOID);

1 0

[ion] 20788: - Fix probably one of the most devastating hidden ROS bugs currently in trunk. KWAIT_BLOCK's WaitType was defined as USHORT instead of UCHAR, causing a KeWaitForMultipleObjects of 2 or more objects to overwrite the Thread's PreviousMode (an effect of this is that 99% of user-mode callbacks from win32k were being done with the mode set to Kernel-Mode instead of UserMode). A KeWaitForMultipleObjects of 3 or more objects, or the timer object itself in some cases would cause this confli
by ion＠svn.reactos.org 11 Jan '06

11 Jan '06

- Fix probably one of the most devastating hidden ROS bugs currently in trunk. KWAIT_BLOCK's WaitType was defined as USHORT instead of UCHAR, causing a KeWaitForMultipleObjects of 2 or more objects to overwrite the Thread's PreviousMode (an effect of this is that 99% of user-mode callbacks from win32k were being done with the mode set to Kernel-Mode instead of UserMode). A KeWaitForMultipleObjects of 3 or more objects, or the timer object itself in some cases would cause this conflict to occur with the ResourceIndex member, potentially corrupting the ERESOURCE owner table in my updated implementation. Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2006-01-11 20:01:03 UTC (rev 20787) +++ trunk/reactos/w32api/include/ddk/winddk.h 2006-01-11 20:16:29 UTC (rev 20788) @@ -4118,7 +4118,8 @@ PVOID Object; struct _KWAIT_BLOCK * RESTRICTED_POINTER NextWaitBlock; USHORT WaitKey; - USHORT WaitType; + UCHAR WaitType; + UCHAR SpareByte; } KWAIT_BLOCK, *PKWAIT_BLOCK, *RESTRICTED_POINTER PRKWAIT_BLOCK; typedef struct _IO_REMOVE_LOCK_TRACKING_BLOCK * PIO_REMOVE_LOCK_TRACKING_BLOCK;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs