Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 22257: fixing some bugs for %c in the string version of printf
by greatlrd＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: greatlrd Date: Wed Jun 7 03:01:44 2006 New Revision: 22257 URL: http://svn.reactos.ru/svn/reactos?rev=22257&view=rev Log: fixing some bugs for %c in the string version of printf Modified: trunk/reactos/lib/rtl/sprintf.c trunk/reactos/lib/rtl/swprintf.c Modified: trunk/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/sprintf.c?rev=22257… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c (original) +++ trunk/reactos/lib/rtl/sprintf.c Wed Jun 7 03:01:44 2006 @@ -477,27 +477,20 @@ switch (*fmt) { case 'c': /* finished */ - if (!(flags & LEFT)) - while (--field_width > 0) { - if (str <= end) - *str = ' '; - ++str; - } - if (qualifier == 'l' || qualifier == 'w') { - if (str <= end) - *str = (unsigned char)(wchar_t) va_arg(args, int); - ++str; + if (qualifier == 'l' || qualifier == 'w') { + wchar_t sw1[2]; + /* print unicode string */ + sw1[0] = (wchar_t) va_arg(args, int); + sw1[1] = 0; + str = stringw(str, end, (wchar_t *)&sw1, -1, field_width, precision, flags); } else { - if (str <= end) - *str = (unsigned char) va_arg(args, int); - ++str; - } - while (--field_width > 0) { - if (str <= end) - *str = ' '; - ++str; - } - continue; + char s1[2]; + /* print ascii string */ + s1[0] = ( unsigned char) va_arg(args, int); + s1[1] = 0; + str = string(str, end, (char *)&s1, -1, field_width, precision, flags); + } + continue; case 'C': /* finished */ if (!(flags & LEFT)) Modified: trunk/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/swprintf.c?rev=2225… ============================================================================== --- trunk/reactos/lib/rtl/swprintf.c (original) +++ trunk/reactos/lib/rtl/swprintf.c Wed Jun 7 03:01:44 2006 @@ -475,26 +475,20 @@ switch (*fmt) { case L'c': - if (!(flags & LEFT)) - while (--field_width > 0) { - if (str <= end) - *str = L' '; - ++str; - } - if (qualifier == 'h') { - if (str <= end) - *str = (wchar_t) va_arg(args, int); - ++str; + if (qualifier == 'h' || qualifier == 'w') { + wchar_t sw1[2]; + /* print unicode string */ + sw1[0] = (wchar_t) va_arg(args, int); + sw1[1] = 0; + str = stringw(str, end, (wchar_t *)&sw1, -1, field_width, precision, flags); } else { - if (str <= end) - *str = (wchar_t) va_arg(args, int); - ++str; - } - while (--field_width > 0) { - if (str <= end) - *str = L' '; - ++str; - } + char s1[2]; + /* print ascii string */ + s1[0] = ( unsigned char) va_arg(args, int); + s1[1] = 0; + str = string(str, end, (char *)&s1, -1, field_width, precision, flags); + } + continue; case L'C':

1 0

[janderwald] 22256: small compilation fix
by janderwald＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: janderwald Date: Wed Jun 7 02:54:18 2006 New Revision: 22256 URL: http://svn.reactos.ru/svn/reactos?rev=22256&view=rev Log: small compilation fix Modified: trunk/reactos/include/powrprof.h Modified: trunk/reactos/include/powrprof.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/powrprof.h?rev=2225… ============================================================================== --- trunk/reactos/include/powrprof.h (original) +++ trunk/reactos/include/powrprof.h Wed Jun 7 02:54:18 2006 @@ -16,7 +16,10 @@ #define NEWSCHEME (UINT)-1 #ifndef RC_INVOKED -#include <ntdef.h> /* for NTSTATUS */ +#ifndef NTSTATUS +typedef LONG NTSTATUS, *PNTSTATUS; +#endif + typedef struct _GLOBAL_MACHINE_POWER_POLICY{ ULONG Revision; SYSTEM_POWER_STATE LidOpenWakeAc;

1 0

[greatlrd] 22255: fixing two more bugs in *printf strings version. this make we pass one more of wine test
by greatlrd＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: greatlrd Date: Wed Jun 7 02:43:41 2006 New Revision: 22255 URL: http://svn.reactos.ru/svn/reactos?rev=22255&view=rev Log: fixing two more bugs in *printf strings version. this make we pass one more of wine test Modified: trunk/reactos/lib/rtl/sprintf.c trunk/reactos/lib/rtl/swprintf.c Modified: trunk/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/sprintf.c?rev=22255… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c (original) +++ trunk/reactos/lib/rtl/sprintf.c Wed Jun 7 02:43:41 2006 @@ -286,6 +286,10 @@ string(char* buf, char* end, const char* s, int len, int field_width, int precision, int flags) { int i; + char c; + + c = (flags & ZEROPAD) ? '0' : ' '; + if (s == NULL) { s = "<NULL>"; @@ -309,7 +313,7 @@ while (len < field_width--) { if (buf <= end) - *buf = ' '; + *buf = c; ++buf; } for (i = 0; i < len; ++i) @@ -331,6 +335,10 @@ stringw(char* buf, char* end, const wchar_t* sw, int len, int field_width, int precision, int flags) { int i; + char c; + + c = (flags & ZEROPAD) ? '0' : ' '; + if (sw == NULL) { sw = L"<NULL>"; @@ -354,7 +362,7 @@ while (len < field_width--) { if (buf <= end) - *buf = ' '; + *buf = c; buf++; } for (i = 0; i < len; ++i) Modified: trunk/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/swprintf.c?rev=2225… ============================================================================== --- trunk/reactos/lib/rtl/swprintf.c (original) +++ trunk/reactos/lib/rtl/swprintf.c Wed Jun 7 02:43:41 2006 @@ -286,6 +286,10 @@ string(wchar_t* buf, wchar_t* end, const char* s, int len, int field_width, int precision, int flags) { int i; + wchar_t c; + + c = (flags & ZEROPAD) ? L'0' : L' '; + if (s == NULL) { s = "<NULL>"; @@ -309,7 +313,7 @@ while (len < field_width--) { if (buf <= end) - *buf = L' '; + *buf = c; ++buf; } for (i = 0; i < len; ++i) @@ -331,6 +335,10 @@ stringw(wchar_t* buf, wchar_t* end, const wchar_t* sw, int len, int field_width, int precision, int flags) { int i; + wchar_t c; + + c = (flags & ZEROPAD) ? L'0' : L' '; + if (sw == NULL) { sw = L"<NULL>"; @@ -354,7 +362,7 @@ while (len < field_width--) { if (buf <= end) - *buf = L' '; + *buf = c; buf++; } for (i = 0; i < len; ++i)

1 0

[janderwald] 22254: import Wine 0.9.14 powrprof
by janderwald＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: janderwald Date: Wed Jun 7 01:54:39 2006 New Revision: 22254 URL: http://svn.reactos.ru/svn/reactos?rev=22254&view=rev Log: import Wine 0.9.14 powrprof Added: trunk/reactos/dll/win32/powrprof/powrprof.c - copied unchanged from r22253, vendor/wine/dlls/powrprof/current/dlls/powrprof/powrprof.c

1 0

[janderwald] 22253: prepare wine 0.9.14. powrprof import
by janderwald＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: janderwald Date: Wed Jun 7 01:51:40 2006 New Revision: 22253 URL: http://svn.reactos.ru/svn/reactos?rev=22253&view=rev Log: prepare wine 0.9.14. powrprof import Added: trunk/reactos/dll/win32/powrprof/

1 0

[greatlrd] 22252: implement datatype I32 for *printf string version we have a *printf for files as well now 29 fails in wine test msvcrt printf
by greatlrd＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: greatlrd Date: Wed Jun 7 01:42:42 2006 New Revision: 22252 URL: http://svn.reactos.ru/svn/reactos?rev=22252&view=rev Log: implement datatype I32 for *printf string version we have a *printf for files as well now 29 fails in wine test msvcrt printf Modified: trunk/reactos/lib/rtl/sprintf.c trunk/reactos/lib/rtl/swprintf.c Modified: trunk/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/sprintf.c?rev=22252… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c (original) +++ trunk/reactos/lib/rtl/sprintf.c Wed Jun 7 01:42:42 2006 @@ -459,7 +459,10 @@ } else if (*fmt == 'I' && *(fmt+1) == '6' && *(fmt+2) == '4') { qualifier = *fmt; fmt += 3; - } + } else if (*fmt == 'I' && *(fmt+1) == '3' && *(fmt+2) == '2') { + qualifier = 'l'; + fmt += 3; + } /* default base */ base = 10; Modified: trunk/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/swprintf.c?rev=2225… ============================================================================== --- trunk/reactos/lib/rtl/swprintf.c (original) +++ trunk/reactos/lib/rtl/swprintf.c Wed Jun 7 01:42:42 2006 @@ -457,7 +457,10 @@ } else if (*fmt == L'I' && *(fmt+1) == L'6' && *(fmt+2) == L'4') { qualifier = *fmt; fmt += 3; - } + } else if (*fmt == L'I' && *(fmt+1) == L'3' && *(fmt+2) == L'2') { + qualifier = L'l'; + fmt += 3; + } /* default base */ base = 10;

1 0

[janderwald] 22251: tag wine 0.9.14. powrprof
by janderwald＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: janderwald Date: Wed Jun 7 01:39:16 2006 New Revision: 22251 URL: http://svn.reactos.ru/svn/reactos?rev=22251&view=rev Log: tag wine 0.9.14. powrprof Added: vendor/wine/dlls/powrprof/Wine_0_9_14/ - copied from r22250, vendor/wine/dlls/powrprof/current/

1 0

[janderwald] 22250:
by janderwald＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: janderwald Date: Wed Jun 7 01:32:43 2006 New Revision: 22250 URL: http://svn.reactos.ru/svn/reactos?rev=22250&view=rev Log: (empty) Added: vendor/wine/dlls/powrprof/ vendor/wine/dlls/powrprof/current/ vendor/wine/dlls/powrprof/current/dlls/ vendor/wine/dlls/powrprof/current/dlls/powrprof/ vendor/wine/dlls/powrprof/current/dlls/powrprof/powrprof.c vendor/wine/dlls/powrprof/current/dlls/powrprof/powrprof.spec Added: vendor/wine/dlls/powrprof/current/dlls/powrprof/powrprof.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/powrprof/current/dlls/po… ============================================================================== --- vendor/wine/dlls/powrprof/current/dlls/powrprof/powrprof.c (added) +++ vendor/wine/dlls/powrprof/current/dlls/powrprof/powrprof.c Wed Jun 7 01:32:43 2006 @@ -1,0 +1,344 @@ +/* + * Copyright (C) 2005 Benjamin Cutler + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winreg.h" +#include "winternl.h" +#include "powrprof.h" +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(powrprof); + +/* Notes to implementors: + * #1: The native implementation of these functions attempted to read in + * registry entries that I was unable to locate on any of the Windows + * machines I checked, but I only had desktops available, so maybe + * laptop users will have better luck. They return FNF errors because + * that's what the native DLL was returning during my tests. + * #2: These functions call NtPowerInformation but I don't know what they + * do with the results, and NtPowerInformation doesn't do much in WINE yet + * anyway. + * #3: Since I can't get several other functions working (see note #1), + * implementing these functions is going to have to wait until somebody can + * cobble together some sane test input. */ + +static const WCHAR szPowerCfgSubKey[] = { 'S', 'o', 'f', 't', 'w', 'a', 'r', 'e', + '\\', 'M', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', '\\', 'W', 'i', + 'n', 'd', 'o', 'w', 's', '\\', 'C', 'u', 'r', 'r', 'e', 'n', 't', + 'V', 'e', 'r', 's', 'i', 'o', 'n', '\\', 'C', 'o', 'n', 't', 'r', + 'o', 'l', 's', ' ', 'F', 'o', 'l', 'd', 'e', 'r', '\\', 'P', 'o', + 'w', 'e', 'r', 'C', 'f', 'g', 0 }; +static const WCHAR szSemaphoreName[] = { 'P', 'o', 'w', 'e', 'r', 'P', 'r', 'o', + 'f', 'i', 'l', 'e', 'R', 'e', 'g', 'i', 's', 't', 'r', 'y', 'S', + 'e', 'm', 'a', 'p', 'h', 'o', 'r', 'e', 0 }; +static const WCHAR szDiskMax[] = { 'D', 'i', 's', 'k', 'S', 'p', 'i', 'n', 'd', + 'o', 'w', 'n', 'M', 'a', 'x', 0 }; +static const WCHAR szDiskMin[] = { 'D', 'i', 's', 'k', 'S', 'p', 'i', 'n', 'd', + 'o', 'w', 'n', 'M', 'i', 'n', 0 }; +static const WCHAR szLastID[] = { 'L', 'a', 's', 't', 'I', 'D', 0 }; +static HANDLE PPRegSemaphore = NULL; + +NTSTATUS WINAPI CallNtPowerInformation( + POWER_INFORMATION_LEVEL InformationLevel, + PVOID lpInputBuffer, ULONG nInputBufferSize, + PVOID lpOutputBuffer, ULONG nOutputBufferSize) +{ + return NtPowerInformation(InformationLevel, lpInputBuffer, + nInputBufferSize, lpOutputBuffer, nOutputBufferSize); +} + +BOOLEAN WINAPI CanUserWritePwrScheme(VOID) +{ + HKEY hKey = NULL; + LONG r; + BOOLEAN bSuccess = TRUE; + + TRACE("()\n"); + + r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ | KEY_WRITE, &hKey); + + if (r != ERROR_SUCCESS) { + TRACE("RegOpenKeyEx failed: %ld\n", r); + bSuccess = FALSE; + } + + SetLastError(r); + RegCloseKey(hKey); + return bSuccess; +} + +BOOLEAN WINAPI DeletePwrScheme(UINT uiIndex) +{ + /* FIXME: See note #1 */ + FIXME("(%d) stub!\n", uiIndex); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + +BOOLEAN WINAPI EnumPwrSchemes(PWRSCHEMESENUMPROC lpfnPwrSchemesEnumProc, + LPARAM lParam) +{ + /* FIXME: See note #1 */ + FIXME("(%p, %ld) stub!\n", lpfnPwrSchemesEnumProc, lParam); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + +BOOLEAN WINAPI GetActivePwrScheme(PUINT puiID) +{ + /* FIXME: See note #1 */ + FIXME("(%p) stub!\n", puiID); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + +BOOLEAN WINAPI GetCurrentPowerPolicies( + PGLOBAL_POWER_POLICY pGlobalPowerPolicy, + PPOWER_POLICY pPowerPolicy) +{ + /* FIXME: See note #2 */ + SYSTEM_POWER_POLICY ACPower, DCPower; + + FIXME("(%p, %p) stub!\n", pGlobalPowerPolicy, pPowerPolicy); + + NtPowerInformation(SystemPowerPolicyAc, 0, 0, &ACPower, sizeof(SYSTEM_POWER_POLICY)); + NtPowerInformation(SystemPowerPolicyDc, 0, 0, &DCPower, sizeof(SYSTEM_POWER_POLICY)); + + return FALSE; +} + +BOOLEAN WINAPI GetPwrCapabilities( + PSYSTEM_POWER_CAPABILITIES lpSystemPowerCapabilities) +{ + NTSTATUS r; + + TRACE("(%p)\n", lpSystemPowerCapabilities); + + r = NtPowerInformation(SystemPowerCapabilities, 0, 0, lpSystemPowerCapabilities, sizeof(SYSTEM_POWER_CAPABILITIES)); + + SetLastError(RtlNtStatusToDosError(r)); + + return r == STATUS_SUCCESS; +} + +BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) +{ + HKEY hKey; + BYTE lpValue[40]; + LONG r; + DWORD cbValue = sizeof(lpValue); + + TRACE("(%p, %p)\n", RangeMax, RangeMin); + + if (RangeMax == NULL || RangeMin == NULL) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + SetLastError(ERROR_SUCCESS); + + WaitForSingleObject(PPRegSemaphore, INFINITE); + + r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ, &hKey); + if (r != ERROR_SUCCESS) { + TRACE("RegOpenKeyEx failed: %ld\n", r); + TRACE("Using defaults: 3600, 3\n"); + *RangeMax = 3600; + *RangeMin = 3; + ReleaseSemaphore(PPRegSemaphore, 1, NULL); + return TRUE; + } + + r = RegQueryValueExW(hKey, szDiskMax, 0, 0, lpValue, &cbValue); + if (r != ERROR_SUCCESS) { + TRACE("Couldn't open DiskSpinDownMax: %ld\n", r); + TRACE("Using default: 3600\n"); + *RangeMax = 3600; + } else { + *RangeMax = atoiW((LPCWSTR)lpValue); + } + + cbValue = sizeof(lpValue); + + r = RegQueryValueExW(hKey, szDiskMin, 0, 0, lpValue, &cbValue); + if (r != ERROR_SUCCESS) { + TRACE("Couldn't open DiskSpinDownMin: %ld\n", r); + TRACE("Using default: 3\n"); + *RangeMin = 3; + } else { + *RangeMin = atoiW((LPCWSTR)lpValue); + } + + RegCloseKey(hKey); + + ReleaseSemaphore(PPRegSemaphore, 1, NULL); + + return TRUE; +} + +BOOLEAN WINAPI IsAdminOverrideActive(PADMINISTRATOR_POWER_POLICY p) +{ + FIXME("( %p) stub!\n", p); + return FALSE; +} + +BOOLEAN WINAPI IsPwrHibernateAllowed(VOID) +{ + /* FIXME: See note #2 */ + SYSTEM_POWER_CAPABILITIES PowerCaps; + FIXME("() stub!\n"); + NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + return FALSE; +} + +BOOLEAN WINAPI IsPwrShutdownAllowed(VOID) +{ + /* FIXME: See note #2 */ + SYSTEM_POWER_CAPABILITIES PowerCaps; + FIXME("() stub!\n"); + NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + return FALSE; +} + +BOOLEAN WINAPI IsPwrSuspendAllowed(VOID) +{ + /* FIXME: See note #2 */ + SYSTEM_POWER_CAPABILITIES PowerCaps; + FIXME("() stub!\n"); + NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + return FALSE; +} + +BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY pGlobalPowerPolicy) +{ + /* FIXME: See note #1 */ + FIXME("(%p) stub!\n", pGlobalPowerPolicy); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + +BOOLEAN WINAPI ReadProcessorPwrScheme(UINT uiID, + PMACHINE_PROCESSOR_POWER_POLICY pMachineProcessorPowerPolicy) +{ + /* FIXME: See note #1 */ + FIXME("(%d, %p) stub!\n", uiID, pMachineProcessorPowerPolicy); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + +BOOLEAN WINAPI ReadPwrScheme(UINT uiID, + PPOWER_POLICY pPowerPolicy) +{ + /* FIXME: See note #1 */ + FIXME("(%d, %p) stub!\n", uiID, pPowerPolicy); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + +BOOLEAN WINAPI SetActivePwrScheme(UINT uiID, + PGLOBAL_POWER_POLICY lpGlobalPowerPolicy, + PPOWER_POLICY lpPowerPolicy) +{ + /* FIXME: See note #1 */ + FIXME("(%d, %p, %p) stub!\n", uiID, lpGlobalPowerPolicy, lpPowerPolicy); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + +BOOLEAN WINAPI SetSuspendState(BOOLEAN Hibernate, BOOLEAN ForceCritical, + BOOLEAN DisableWakeEvent) +{ + /* FIXME: I have NO idea how you're supposed to call NtInitiatePowerAction + * here, because it's not a documented function that I can find */ + FIXME("(%d, %d, %d) stub!\n", Hibernate, ForceCritical, DisableWakeEvent); + return TRUE; +} + +BOOLEAN WINAPI WriteGlobalPwrPolicy(PGLOBAL_POWER_POLICY pGlobalPowerPolicy) +{ + /* FIXME: See note #3 */ + FIXME("(%p) stub!\n", pGlobalPowerPolicy); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOLEAN WINAPI WriteProcessorPwrScheme(UINT ID, + PMACHINE_PROCESSOR_POWER_POLICY pMachineProcessorPowerPolicy) +{ + /* FIXME: See note #3 */ + FIXME("(%d, %p) stub!\n", ID, pMachineProcessorPowerPolicy); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOLEAN WINAPI WritePwrScheme(PUINT puiID, LPWSTR lpszName, LPWSTR lpszDescription, + PPOWER_POLICY pPowerPolicy) +{ + /* FIXME: See note #3 */ + FIXME("(%p, %s, %s, %p) stub!\n", puiID, debugstr_w(lpszName), debugstr_w(lpszDescription), pPowerPolicy); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + FIXME("(%p, %ld, %p) not fully implemented\n", hinstDLL, fdwReason, lpvReserved); + + switch(fdwReason) { + case DLL_PROCESS_ATTACH: { + + HKEY hKey; + LONG r; + + DisableThreadLibraryCalls(hinstDLL); + + r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ | KEY_WRITE, &hKey); + + if (r != ERROR_SUCCESS) { + TRACE("Couldn't open registry key HKLM\\%s, using some sane(?) defaults\n", debugstr_w(szPowerCfgSubKey)); + } else { + BYTE lpValue[40]; + DWORD cbValue = sizeof(lpValue); + r = RegQueryValueExW(hKey, szLastID, 0, 0, lpValue, &cbValue); + if (r != ERROR_SUCCESS) { + TRACE("Couldn't open registry entry HKLM\\%s\\LastID, using some sane(?) defaults\n", debugstr_w(szPowerCfgSubKey)); + } + RegCloseKey(hKey); + } + + PPRegSemaphore = CreateSemaphoreW(NULL, 1, 1, szSemaphoreName); + if (PPRegSemaphore == NULL) { + ERR("Couldn't create Semaphore: %ld\n", GetLastError()); + return FALSE; + } + break; + } + case DLL_PROCESS_DETACH: + CloseHandle(PPRegSemaphore); + break; + } + return TRUE; +} Added: vendor/wine/dlls/powrprof/current/dlls/powrprof/powrprof.spec URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/powrprof/current/dlls/po… ============================================================================== --- vendor/wine/dlls/powrprof/current/dlls/powrprof/powrprof.spec (added) +++ vendor/wine/dlls/powrprof/current/dlls/powrprof/powrprof.spec Wed Jun 7 01:32:43 2006 @@ -1,0 +1,20 @@ +@ stdcall CallNtPowerInformation (long ptr long ptr long) +@ stdcall CanUserWritePwrScheme () +@ stdcall DeletePwrScheme (long) +@ stdcall EnumPwrSchemes (ptr long) +@ stdcall GetActivePwrScheme (ptr) +@ stdcall GetCurrentPowerPolicies (ptr ptr) +@ stdcall GetPwrCapabilities (ptr) +@ stdcall GetPwrDiskSpindownRange (ptr ptr) +@ stdcall IsAdminOverrideActive (ptr) +@ stdcall IsPwrHibernateAllowed () +@ stdcall IsPwrShutdownAllowed () +@ stdcall IsPwrSuspendAllowed () +@ stdcall ReadGlobalPwrPolicy (ptr) +@ stdcall ReadProcessorPwrScheme (long ptr) +@ stdcall ReadPwrScheme (long ptr) +@ stdcall SetActivePwrScheme (long ptr ptr) +@ stdcall SetSuspendState (long long long) +@ stdcall WriteGlobalPwrPolicy (ptr) +@ stdcall WriteProcessorPwrScheme (long ptr) +@ stdcall WritePwrScheme (ptr str str ptr)

1 0

[ion] 22249: - Formatting/name/comment/declaration/calling convention changes. - Make ObpCreateHandleTable return NTSTATUS instead of VOID, so that it can return STATUS_INSUFFIENT_RESOURCES if the handle table couldn't be allocated.
by ion＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: ion Date: Wed Jun 7 01:02:55 2006 New Revision: 22249 URL: http://svn.reactos.ru/svn/reactos?rev=22249&view=rev Log: - Formatting/name/comment/declaration/calling convention changes. - Make ObpCreateHandleTable return NTSTATUS instead of VOID, so that it can return STATUS_INSUFFIENT_RESOURCES if the handle table couldn't be allocated. Modified: trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/o… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Wed Jun 7 01:02:55 2006 @@ -42,25 +42,33 @@ BOOLEAN NTAPI -ObpDeleteEntryDirectory(POBP_LOOKUP_CONTEXT Context); +ObpDeleteEntryDirectory( + IN POBP_LOOKUP_CONTEXT Context +); BOOLEAN NTAPI -ObpInsertEntryDirectory(IN POBJECT_DIRECTORY Parent, - IN POBP_LOOKUP_CONTEXT Context, - IN POBJECT_HEADER ObjectHeader); +ObpInsertEntryDirectory( + IN POBJECT_DIRECTORY Parent, + IN POBP_LOOKUP_CONTEXT Context, + IN POBJECT_HEADER ObjectHeader +); PVOID NTAPI -ObpLookupEntryDirectory(IN POBJECT_DIRECTORY Directory, - IN PUNICODE_STRING Name, - IN ULONG Attributes, - IN UCHAR SearchShadow, - IN POBP_LOOKUP_CONTEXT Context); - -VOID -NTAPI -ObInitSymbolicLinkImplementation(VOID); +ObpLookupEntryDirectory( + IN POBJECT_DIRECTORY Directory, + IN PUNICODE_STRING Name, + IN ULONG Attributes, + IN UCHAR SearchShadow, + IN POBP_LOOKUP_CONTEXT Context +); + +VOID +NTAPI +ObInitSymbolicLinkImplementation( + VOID +); NTSTATUS NTAPI @@ -73,21 +81,15 @@ NTSTATUS NTAPI -ObpParseDirectory( - PVOID Object, - PVOID * NextObject, - PUNICODE_STRING FullPath, - PWSTR * Path, - ULONG Attributes, - POBP_LOOKUP_CONTEXT Context -); - -VOID -NTAPI -ObCreateHandleTable( - struct _EPROCESS* Parent, - BOOLEAN Inherit, - struct _EPROCESS* Process +ObpCreateHandleTable( + IN PEPROCESS Parent, + IN PEPROCESS Process +); + +VOID +NTAPI +ObKillProcess( + IN PEPROCESS Process ); NTSTATUS @@ -137,10 +139,10 @@ ObpGetHandleCountByHandleTable(PHANDLE_TABLE HandleTable); VOID -STDCALL +NTAPI ObQueryDeviceMapInformation( - PEPROCESS Process, - PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo + IN PEPROCESS Process, + OUT PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo ); VOID @@ -149,10 +151,6 @@ IN PVOID ObjectBody, IN BOOLEAN Permanent ); - -VOID -STDCALL -ObKillProcess(PEPROCESS Process); VOID FASTCALL Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Wed Jun 7 01:02:55 2006 @@ -323,315 +323,6 @@ return Status; } -/*++ -* @name ObpSetHandleAttributes -* -* The ObpSetHandleAttributes routine <FILLMEIN> -* -* @param HandleTable -* <FILLMEIN>. -* -* @param HandleTableEntry -* <FILLMEIN>. -* -* @param Context -* <FILLMEIN>. -* -* @return <FILLMEIN>. -* -* @remarks None. -* -*--*/ -BOOLEAN -NTAPI -ObpSetHandleAttributes(IN PHANDLE_TABLE HandleTable, - IN OUT PHANDLE_TABLE_ENTRY HandleTableEntry, - IN PVOID Context) -{ - POBP_SET_HANDLE_ATTRIBUTES_CONTEXT SetHandleInfo = - (POBP_SET_HANDLE_ATTRIBUTES_CONTEXT)Context; - POBJECT_HEADER ObjectHeader = EX_HTE_TO_HDR(HandleTableEntry); - PAGED_CODE(); - - /* Don't allow operations on kernel objects */ - if ((ObjectHeader->Flags & OB_FLAG_KERNEL_MODE) && - (SetHandleInfo->PreviousMode != KernelMode)) - { - /* Fail */ - return FALSE; - } - - /* Check if making the handle inheritable */ - if (SetHandleInfo->Information.Inherit) - { - /* Set the flag. FIXME: Need to check if this is allowed */ - HandleTableEntry->ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; - } - else - { - /* Otherwise this implies we're removing the flag */ - HandleTableEntry->ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; - } - - /* Check if making the handle protected */ - if (SetHandleInfo->Information.ProtectFromClose) - { - /* Set the flag */ - HandleTableEntry->ObAttributes |= EX_HANDLE_ENTRY_PROTECTFROMCLOSE; - } - else - { - /* Otherwise, remove it */ - HandleTableEntry->ObAttributes &= ~EX_HANDLE_ENTRY_PROTECTFROMCLOSE; - } - - /* Return success */ - return TRUE; -} - -NTSTATUS -NTAPI -ObDuplicateObject(PEPROCESS SourceProcess, - PEPROCESS TargetProcess, - HANDLE SourceHandle, - PHANDLE TargetHandle, - ACCESS_MASK DesiredAccess, - ULONG HandleAttributes, - ULONG Options) -{ - PHANDLE_TABLE_ENTRY SourceHandleEntry; - HANDLE_TABLE_ENTRY NewHandleEntry; - BOOLEAN AttachedToProcess = FALSE; - PVOID ObjectBody; - POBJECT_HEADER ObjectHeader; - ULONG NewHandleCount; - HANDLE NewTargetHandle; - PEPROCESS CurrentProcess; - KAPC_STATE ApcState; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - if(SourceProcess == NULL || - ObIsKernelHandle(SourceHandle, ExGetPreviousMode())) - { - SourceProcess = PsInitialSystemProcess; - SourceHandle = ObKernelHandleToHandle(SourceHandle); - } - - CurrentProcess = PsGetCurrentProcess(); - - KeEnterCriticalRegion(); - - if (SourceProcess != CurrentProcess) - { - KeStackAttachProcess(&SourceProcess->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - SourceHandleEntry = ExMapHandleToPointer(SourceProcess->ObjectTable, - SourceHandle); - if (SourceHandleEntry == NULL) - { - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - - KeLeaveCriticalRegion(); - return STATUS_INVALID_HANDLE; - } - - ObjectHeader = EX_HTE_TO_HDR(SourceHandleEntry); - ObjectBody = &ObjectHeader->Body; - - NewHandleEntry.Object = SourceHandleEntry->Object; - if(HandleAttributes & OBJ_INHERIT) - NewHandleEntry.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; - else - NewHandleEntry.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; - NewHandleEntry.GrantedAccess = ((Options & DUPLICATE_SAME_ACCESS) ? - SourceHandleEntry->GrantedAccess : - DesiredAccess); - if (Options & DUPLICATE_SAME_ACCESS) - { - NewHandleEntry.GrantedAccess = SourceHandleEntry->GrantedAccess; - } - else - { - if (DesiredAccess & GENERIC_ACCESS) - { - RtlMapGenericMask(&DesiredAccess, - &ObjectHeader->Type->TypeInfo.GenericMapping); - } - NewHandleEntry.GrantedAccess = DesiredAccess; - } - - /* reference the object so it doesn't get deleted after releasing the lock - and before creating a new handle for it */ - ObReferenceObject(ObjectBody); - - /* increment the handle count of the object, it should always be >= 2 because - we're holding a handle lock to this object! if the new handle count was - 1 here, we're in big trouble... it would've been safe to increment and - check the handle count without using interlocked functions because the - entry is locked, which means the handle count can't change. */ - NewHandleCount = InterlockedIncrement(&ObjectHeader->HandleCount); - ASSERT(NewHandleCount >= 2); - - ExUnlockHandleTableEntry(SourceProcess->ObjectTable, - SourceHandleEntry); - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - AttachedToProcess = FALSE; - } - - if (TargetProcess != CurrentProcess) - { - KeStackAttachProcess(&TargetProcess->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - - /* attempt to create the new handle */ - NewTargetHandle = ExCreateHandle(TargetProcess->ObjectTable, - &NewHandleEntry); - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - AttachedToProcess = FALSE; - } - - if (NewTargetHandle != NULL) - { - if (Options & DUPLICATE_CLOSE_SOURCE) - { - if (SourceProcess != CurrentProcess) - { - KeStackAttachProcess(&SourceProcess->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - - /* delete the source handle */ - ObpDeleteHandle(SourceHandle); - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - } - - ObDereferenceObject(ObjectBody); - - *TargetHandle = NewTargetHandle; - } - else - { - /* decrement the handle count we previously incremented, but don't call the - closing procedure because we're not closing a handle! */ - if(InterlockedDecrement(&ObjectHeader->HandleCount) == 0) - { - ObDereferenceObject(ObjectBody); - } - - ObDereferenceObject(ObjectBody); - Status = STATUS_UNSUCCESSFUL; - } - - KeLeaveCriticalRegion(); - - return Status; -} - -static VOID STDCALL -SweepHandleCallback(PHANDLE_TABLE HandleTable, - PVOID Object, - ULONG GrantedAccess, - PVOID Context) -{ - POBJECT_HEADER ObjectHeader; - PVOID ObjectBody; - - PAGED_CODE(); - - ObjectHeader = EX_OBJ_TO_HDR(Object); - ObjectBody = &ObjectHeader->Body; - - ObpDecrementHandleCount(ObjectBody, PsGetCurrentProcess(), GrantedAccess); -} - -static BOOLEAN STDCALL -DuplicateHandleCallback(PHANDLE_TABLE HandleTable, - PHANDLE_TABLE_ENTRY HandleTableEntry, - PVOID Context) -{ - POBJECT_HEADER ObjectHeader; - BOOLEAN Ret = FALSE; - - PAGED_CODE(); - - Ret = (HandleTableEntry->ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; - if(Ret) - { - ObjectHeader = EX_HTE_TO_HDR(HandleTableEntry); - if(InterlockedIncrement(&ObjectHeader->HandleCount) == 1) - { - ObReferenceObject(&ObjectHeader->Body); - } - } - - return Ret; -} - -VOID -NTAPI -ObCreateHandleTable(PEPROCESS Parent, - BOOLEAN Inherit, - PEPROCESS Process) - /* - * FUNCTION: Creates a handle table for a process - * ARGUMENTS: - * Parent = Parent process (or NULL if this is the first process) - * Inherit = True if the process should inherit its parent's handles - * Process = Process whose handle table is to be created - */ -{ - PAGED_CODE(); - - DPRINT("ObCreateHandleTable(Parent %x, Inherit %d, Process %x)\n", - Parent,Inherit,Process); - if(Parent != NULL) - { - Process->ObjectTable = ExDupHandleTable(Process, - DuplicateHandleCallback, - NULL, - Parent->ObjectTable); - } - else - { - Process->ObjectTable = ExCreateHandleTable(Process); - } -} - - -VOID -STDCALL -ObKillProcess(PEPROCESS Process) -{ - PAGED_CODE(); - - /* FIXME - Temporary hack: sweep and destroy here, needs to be fixed!!! */ - ExSweepHandleTable(Process->ObjectTable, - SweepHandleCallback, - Process); - ExDestroyHandleTable(Process->ObjectTable); - Process->ObjectTable = NULL; -} - - NTSTATUS NTAPI ObpCreateHandle(PVOID ObjectBody, @@ -730,6 +421,321 @@ } return STATUS_UNSUCCESSFUL; +} + +/*++ +* @name ObpSetHandleAttributes +* +* The ObpSetHandleAttributes routine <FILLMEIN> +* +* @param HandleTable +* <FILLMEIN>. +* +* @param HandleTableEntry +* <FILLMEIN>. +* +* @param Context +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ +BOOLEAN +NTAPI +ObpSetHandleAttributes(IN PHANDLE_TABLE HandleTable, + IN OUT PHANDLE_TABLE_ENTRY HandleTableEntry, + IN PVOID Context) +{ + POBP_SET_HANDLE_ATTRIBUTES_CONTEXT SetHandleInfo = + (POBP_SET_HANDLE_ATTRIBUTES_CONTEXT)Context; + POBJECT_HEADER ObjectHeader = EX_HTE_TO_HDR(HandleTableEntry); + PAGED_CODE(); + + /* Don't allow operations on kernel objects */ + if ((ObjectHeader->Flags & OB_FLAG_KERNEL_MODE) && + (SetHandleInfo->PreviousMode != KernelMode)) + { + /* Fail */ + return FALSE; + } + + /* Check if making the handle inheritable */ + if (SetHandleInfo->Information.Inherit) + { + /* Set the flag. FIXME: Need to check if this is allowed */ + HandleTableEntry->ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; + } + else + { + /* Otherwise this implies we're removing the flag */ + HandleTableEntry->ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; + } + + /* Check if making the handle protected */ + if (SetHandleInfo->Information.ProtectFromClose) + { + /* Set the flag */ + HandleTableEntry->ObAttributes |= EX_HANDLE_ENTRY_PROTECTFROMCLOSE; + } + else + { + /* Otherwise, remove it */ + HandleTableEntry->ObAttributes &= ~EX_HANDLE_ENTRY_PROTECTFROMCLOSE; + } + + /* Return success */ + return TRUE; +} + +VOID +NTAPI +ObpCloseHandleCallback(IN PHANDLE_TABLE HandleTable, + IN PVOID Object, + IN ULONG GrantedAccess, + IN PVOID Context) +{ + PAGED_CODE(); + + /* Simply decrement the handle count */ + ObpDecrementHandleCount(&EX_OBJ_TO_HDR(Object)->Body, + PsGetCurrentProcess(), + GrantedAccess); +} + +BOOLEAN +NTAPI +ObpDuplicateHandleCallback(IN PHANDLE_TABLE HandleTable, + IN PHANDLE_TABLE_ENTRY HandleTableEntry, + IN PVOID Context) +{ + POBJECT_HEADER ObjectHeader; + BOOLEAN Ret = FALSE; + PAGED_CODE(); + + /* Make sure that the handle is inheritable */ + Ret = (HandleTableEntry->ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; + if(Ret) + { + /* Get the object header and increment the handle and pointer counts */ + ObjectHeader = EX_HTE_TO_HDR(HandleTableEntry); + InterlockedIncrement(&ObjectHeader->HandleCount); + InterlockedIncrement(&ObjectHeader->PointerCount); + } + + /* Return duplication result */ + return Ret; +} + +NTSTATUS +NTAPI +ObpCreateHandleTable(IN PEPROCESS Parent, + IN PEPROCESS Process) +{ + PHANDLE_TABLE HandleTable; + PAGED_CODE(); + + /* Check if we have a parent */ + if (Parent) + { + /* Duplicate the parent's */ + HandleTable = ExDupHandleTable(Process, + ObpDuplicateHandleCallback, + NULL, + Parent->ObjectTable); + } + else + { + /* Create a new one */ + HandleTable = ExCreateHandleTable(Process); + } + + /* Now write it and make sure we got one */ + Process->ObjectTable = HandleTable; + if (!HandleTable) return STATUS_INSUFFICIENT_RESOURCES; + + /* If we got here then the table was created OK */ + return STATUS_SUCCESS; +} + +VOID +NTAPI +ObKillProcess(IN PEPROCESS Process) +{ + PAGED_CODE(); + + /* Enter a critical region */ + KeEnterCriticalRegion(); + + /* Sweep the handle table to close all handles */ + ExSweepHandleTable(Process->ObjectTable, + ObpCloseHandleCallback, + Process); + + /* Destroy the table and leave the critical region */ + ExDestroyHandleTable(Process->ObjectTable); + KeLeaveCriticalRegion(); + + /* Clear the object table */ + Process->ObjectTable = NULL; +} + +NTSTATUS +NTAPI +ObDuplicateObject(PEPROCESS SourceProcess, + PEPROCESS TargetProcess, + HANDLE SourceHandle, + PHANDLE TargetHandle, + ACCESS_MASK DesiredAccess, + ULONG HandleAttributes, + ULONG Options) +{ + PHANDLE_TABLE_ENTRY SourceHandleEntry; + HANDLE_TABLE_ENTRY NewHandleEntry; + BOOLEAN AttachedToProcess = FALSE; + PVOID ObjectBody; + POBJECT_HEADER ObjectHeader; + ULONG NewHandleCount; + HANDLE NewTargetHandle; + PEPROCESS CurrentProcess; + KAPC_STATE ApcState; + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + if(SourceProcess == NULL || + ObIsKernelHandle(SourceHandle, ExGetPreviousMode())) + { + SourceProcess = PsInitialSystemProcess; + SourceHandle = ObKernelHandleToHandle(SourceHandle); + } + + CurrentProcess = PsGetCurrentProcess(); + + KeEnterCriticalRegion(); + + if (SourceProcess != CurrentProcess) + { + KeStackAttachProcess(&SourceProcess->Pcb, + &ApcState); + AttachedToProcess = TRUE; + } + SourceHandleEntry = ExMapHandleToPointer(SourceProcess->ObjectTable, + SourceHandle); + if (SourceHandleEntry == NULL) + { + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + } + + KeLeaveCriticalRegion(); + return STATUS_INVALID_HANDLE; + } + + ObjectHeader = EX_HTE_TO_HDR(SourceHandleEntry); + ObjectBody = &ObjectHeader->Body; + + NewHandleEntry.Object = SourceHandleEntry->Object; + if(HandleAttributes & OBJ_INHERIT) + NewHandleEntry.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; + else + NewHandleEntry.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; + NewHandleEntry.GrantedAccess = ((Options & DUPLICATE_SAME_ACCESS) ? + SourceHandleEntry->GrantedAccess : + DesiredAccess); + if (Options & DUPLICATE_SAME_ACCESS) + { + NewHandleEntry.GrantedAccess = SourceHandleEntry->GrantedAccess; + } + else + { + if (DesiredAccess & GENERIC_ACCESS) + { + RtlMapGenericMask(&DesiredAccess, + &ObjectHeader->Type->TypeInfo.GenericMapping); + } + NewHandleEntry.GrantedAccess = DesiredAccess; + } + + /* reference the object so it doesn't get deleted after releasing the lock + and before creating a new handle for it */ + ObReferenceObject(ObjectBody); + + /* increment the handle count of the object, it should always be >= 2 because + we're holding a handle lock to this object! if the new handle count was + 1 here, we're in big trouble... it would've been safe to increment and + check the handle count without using interlocked functions because the + entry is locked, which means the handle count can't change. */ + NewHandleCount = InterlockedIncrement(&ObjectHeader->HandleCount); + ASSERT(NewHandleCount >= 2); + + ExUnlockHandleTableEntry(SourceProcess->ObjectTable, + SourceHandleEntry); + + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + AttachedToProcess = FALSE; + } + + if (TargetProcess != CurrentProcess) + { + KeStackAttachProcess(&TargetProcess->Pcb, + &ApcState); + AttachedToProcess = TRUE; + } + + /* attempt to create the new handle */ + NewTargetHandle = ExCreateHandle(TargetProcess->ObjectTable, + &NewHandleEntry); + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + AttachedToProcess = FALSE; + } + + if (NewTargetHandle != NULL) + { + if (Options & DUPLICATE_CLOSE_SOURCE) + { + if (SourceProcess != CurrentProcess) + { + KeStackAttachProcess(&SourceProcess->Pcb, + &ApcState); + AttachedToProcess = TRUE; + } + + /* delete the source handle */ + ObpDeleteHandle(SourceHandle); + + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + } + } + + ObDereferenceObject(ObjectBody); + + *TargetHandle = NewTargetHandle; + } + else + { + /* decrement the handle count we previously incremented, but don't call the + closing procedure because we're not closing a handle! */ + if(InterlockedDecrement(&ObjectHeader->HandleCount) == 0) + { + ObDereferenceObject(ObjectBody); + } + + ObDereferenceObject(ObjectBody); + Status = STATUS_UNSUCCESSFUL; + } + + KeLeaveCriticalRegion(); + + return Status; } /* PUBLIC FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Wed Jun 7 01:02:55 2006 @@ -340,7 +340,7 @@ /* Create or Clone the Handle Table */ DPRINT("Initialzing Process Handle Table\n"); - ObCreateHandleTable(pParentProcess, InheritObjectTable, Process); + ObpCreateHandleTable(pParentProcess, Process); DPRINT("Handle Table: %x\n", Process->ObjectTable); /* Set Process's Directory Base */ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c Wed Jun 7 01:02:55 2006 @@ -303,7 +303,7 @@ process a PID */ PsInitClientIDManagment(); - ObCreateHandleTable(NULL, FALSE, PsInitialSystemProcess); + ObpCreateHandleTable(NULL, PsInitialSystemProcess); ObpKernelHandleTable = PsInitialSystemProcess->ObjectTable; CidEntry.Object = PsInitialSystemProcess;

1 0

[janderwald] 22248: add missing NtPowerInformation to def
by janderwald＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: janderwald Date: Wed Jun 7 01:02:30 2006 New Revision: 22248 URL: http://svn.reactos.ru/svn/reactos?rev=22248&view=rev Log: add missing NtPowerInformation to def Modified: trunk/reactos/dll/ntdll/def/ntdll.def Modified: trunk/reactos/dll/ntdll/def/ntdll.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.def?rev… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.def (original) +++ trunk/reactos/dll/ntdll/def/ntdll.def Wed Jun 7 01:02:30 2006 @@ -155,6 +155,7 @@ NtOpenThreadToken@16 NtOpenTimer@12 NtPlugPlayControl@12 +NtPowerInformation@20 NtPrivilegeCheck@12 NtPrivilegedServiceAuditAlarm@20 NtPrivilegeObjectAuditAlarm@24

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