Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[jimtabor] 22262: Cleanup coding of IntGdiPolyPolygon and IntGdiPolygon.
by jimtabor＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: jimtabor Date: Wed Jun 7 05:28:44 2006 New Revision: 22262 URL: http://svn.reactos.ru/svn/reactos?rev=22262&view=rev Log: Cleanup coding of IntGdiPolyPolygon and IntGdiPolygon. Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Wed Jun 7 05:28:44 2006 @@ -94,7 +94,7 @@ if (FillBrushObj && !(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) { IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); - ret = FillPolygon ( dc, BitmapObj, &FillBrushInst.BrushObject, ROP2_TO_MIX(dc->w.ROPmode), UnsafePoints, Count, DestRect ); + ret = FillPolygon ( dc, BitmapObj, &FillBrushInst.BrushObject, ROP2_TO_MIX(dc->w.ROPmode), UnsafePoints, Count, DestRect ); } BRUSHOBJ_UnlockBrush(FillBrushObj); @@ -104,35 +104,29 @@ if (PenBrushObj && !(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL)) { IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); - for ( CurrentPoint = 0; CurrentPoint < Count; ++CurrentPoint ) - { - POINT To, From; //, Next; - - /* Let CurrentPoint be i - * if i+1 > Count, Draw a line from Points[i] to Points[0] - * Draw a line from Points[i] to Points[i+1] - */ - From = UnsafePoints[CurrentPoint]; - if (Count <= CurrentPoint + 1) - To = UnsafePoints[0]; - else - To = UnsafePoints[CurrentPoint + 1]; - - //DPRINT("Polygon Making line from (%d,%d) to (%d,%d)\n", From.x, From.y, To.x, To.y ); - ret = IntEngLineTo(&BitmapObj->SurfObj, + + while(Count-- >1) + { + +// DPRINT1("Polygon Making line from (%d,%d) to (%d,%d)\n", +// UnsafePoints[0].x, UnsafePoints[0].y, +// UnsafePoints[1].x, UnsafePoints[1].y ); + + ret = IntEngLineTo(&BitmapObj->SurfObj, dc->CombinedClip, &PenBrushInst.BrushObject, - From.x, - From.y, - To.x, - To.y, + UnsafePoints[0].x, /* From */ + UnsafePoints[0].y, + UnsafePoints[1].x, /* To */ + UnsafePoints[1].y, &DestRect, ROP2_TO_MIX(dc->w.ROPmode)); /* MIX */ + if(!ret) break; + UnsafePoints++; } } PENOBJ_UnlockPen(PenBrushObj); } - BITMAPOBJ_UnlockBitmap(BitmapObj); return ret; @@ -144,25 +138,12 @@ LPINT PolyCounts, int Count) { - int i; - LPPOINT pt; - LPINT pc; - BOOL ret = FALSE; // default to failure - - pt = Points; - pc = PolyCounts; - - for (i=0;i<Count;i++) - { - ret = IntGdiPolygon ( dc, pt, *pc ); - if (ret == FALSE) - { - return ret; - } - pt+=*pc++; - } - - return ret; + while(--Count >=0) + { + if(!IntGdiPolygon ( dc, Points, *PolyCounts )) return FALSE; + Points+=*PolyCounts++; + } + return TRUE; } /******************************************************************************/

1 0

[jimtabor] 22261: Implement Get & SetTextCharacterExtra. Does nothing ATM.
by jimtabor＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: jimtabor Date: Wed Jun 7 05:22:47 2006 New Revision: 22261 URL: http://svn.reactos.ru/svn/reactos?rev=22261&view=rev Log: Implement Get & SetTextCharacterExtra. Does nothing ATM. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Wed Jun 7 05:22:47 2006 @@ -251,9 +251,7 @@ HDC hDc ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return NtGdiGetSetTextCharExtra( hDc, 0, FALSE); } @@ -390,13 +388,11 @@ int STDCALL SetTextCharacterExtra( - HDC a0, - int a1 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + HDC hDC, + int CharExtra + ) +{ + return NtGdiGetSetTextCharExtra( hDC, CharExtra, TRUE); } Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/reactos/win32k/ntgd… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Wed Jun 7 05:22:47 2006 @@ -680,6 +680,11 @@ INT STDCALL NtGdiGetRelAbs(HDC hDC); /* Should be done in user-mode using shared GDI Objects. */ +INT +STDCALL +NtGdiGetSetTextCharExtra( HDC hDC, INT CharExtra, BOOL Set); + +/* Should be done in user-mode using shared GDI Objects. */ INT STDCALL NtGdiGetStretchBltMode(HDC hDC); /* Use NtGdiDoPalette with GdiPalSetSystemEntries. */ Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Wed Jun 7 05:22:47 2006 @@ -3267,4 +3267,26 @@ return sizeof(LOGFONTW); } + +/* Remove this HAX! after the below function is done in GDI32.DLL! */ +INT +STDCALL +NtGdiGetSetTextCharExtra( HDC hDC, INT CharExtra, BOOL Set) +{ + /* Ulta-Ugly Hax! */ + INT Ret = 0x80000000; + DPRINT("TextCharacterExtra %d", CharExtra); + PDC dc = DC_LockDc ( hDC ); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + } + else + { + Ret = dc->w.charExtra; + if( Set ) dc->w.charExtra = CharExtra; + } + return (Ret); +} + /* EOF */ Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=22… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Wed Jun 7 05:22:47 2006 @@ -150,6 +150,7 @@ NtGdiGetRelAbs 1 NtGdiGetRegionData 3 NtGdiGetRgnBox 2 +NtGdiGetSetTextCharExtra 3 NtGdiGetStockObject 1 NtGdiGetStretchBltMode 1 NtGdiGetSystemPaletteEntries 4

1 0

[greatlrd] 22260: Implement %Fp now we have 25 fails with wine test for string version of *printf api
by greatlrd＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: greatlrd Date: Wed Jun 7 04:04:51 2006 New Revision: 22260 URL: http://svn.reactos.ru/svn/reactos?rev=22260&view=rev Log: Implement %Fp now we have 25 fails with wine test for string version of *printf api 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=22260… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c (original) +++ trunk/reactos/lib/rtl/sprintf.c Wed Jun 7 04:04:51 2006 @@ -26,7 +26,7 @@ #define LEFT 16 /* left justified */ #define SPECIAL 32 /* 0x */ #define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ - +#define REMOVEHEX 256 /* use 256 as remve 0x frim BASE 16 */ typedef struct { unsigned int mantissal:32; unsigned int mantissah:20; @@ -116,7 +116,7 @@ } } - if (type & SPECIAL) { + if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) { if (base == 16) size -= 2; @@ -142,7 +142,7 @@ ++buf; } - if (type & SPECIAL) { + if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) { if (base==16) { if (buf <= end) *buf = '0'; @@ -213,7 +213,7 @@ size--; } } - if (type & SPECIAL) { + if (type & SPECIAL) { if (base == 16) size -= 2; else if (base == 8) @@ -470,7 +470,10 @@ } else if (*fmt == 'I' && *(fmt+1) == '3' && *(fmt+2) == '2') { qualifier = 'l'; fmt += 3; - } + } else if (*fmt == 'F' && *(fmt+1) == 'p') { + fmt += 1; + flags |= REMOVEHEX; + } /* 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=2226… ============================================================================== --- trunk/reactos/lib/rtl/swprintf.c (original) +++ trunk/reactos/lib/rtl/swprintf.c Wed Jun 7 04:04:51 2006 @@ -26,7 +26,7 @@ #define LEFT 16 /* left justified */ #define SPECIAL 32 /* 0x */ #define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ - +#define REMOVEHEX 256 /* use 256 as remve 0x frim BASE 16 */ typedef struct { unsigned int mantissal:32; unsigned int mantissah:20; @@ -116,7 +116,7 @@ } } - if (type & SPECIAL) { + if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) { if (base == 16) size -= 2; } @@ -141,7 +141,7 @@ ++buf; } - if (type & SPECIAL) { + if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) { if (base==16) { if (buf <= end) *buf = L'0'; @@ -468,7 +468,10 @@ } else if (*fmt == L'I' && *(fmt+1) == L'3' && *(fmt+2) == L'2') { qualifier = L'l'; fmt += 3; - } + } else if (*fmt == L'F' && *(fmt+1) == L'p') { + fmt += 1; + flags |= REMOVEHEX; + } /* default base */ base = 10; @@ -566,8 +569,7 @@ case L'p': if ((flags & LARGE) == 0) - flags |= LARGE; - + flags |= LARGE; if (field_width == -1) { field_width = 2*sizeof(void *); flags |= ZEROPAD;

1 0

[greatlrd] 22259: using uppercaps for %p instead lowercaps when it format the string, that make passing one more of wine test 27 fails now
by greatlrd＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: greatlrd Date: Wed Jun 7 03:22:11 2006 New Revision: 22259 URL: http://svn.reactos.ru/svn/reactos?rev=22259&view=rev Log: using uppercaps for %p instead lowercaps when it format the string, that make passing one more of wine test 27 fails now 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=22259… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c (original) +++ trunk/reactos/lib/rtl/sprintf.c Wed Jun 7 03:22:11 2006 @@ -566,6 +566,9 @@ continue; case 'p': + if ((flags & LARGE) == 0) + flags |= LARGE; + if (field_width == -1) { field_width = 2 * sizeof(void *); flags |= ZEROPAD; 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:22:11 2006 @@ -565,6 +565,9 @@ continue; case L'p': + if ((flags & LARGE) == 0) + flags |= LARGE; + if (field_width == -1) { field_width = 2*sizeof(void *); flags |= ZEROPAD;

1 0

[janderwald] 22258: add Wine's powrprof to build
by janderwald＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: janderwald Date: Wed Jun 7 03:14:09 2006 New Revision: 22258 URL: http://svn.reactos.ru/svn/reactos?rev=22258&view=rev Log: add Wine's powrprof to build Added: trunk/reactos/dll/win32/powrprof/powrprof.rbuild (with props) trunk/reactos/dll/win32/powrprof/powrprof.rc (with props) trunk/reactos/dll/win32/powrprof/powrprof_gcc.def (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/dll/win32/powrprof/powrprof.c (contents, props changed) trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=2225… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Wed Jun 7 03:14:09 2006 @@ -62,6 +62,7 @@ <property name="BASEADDRESS_ICMP" value="0x741F0000" /> <property name="BASEADDRESS_USERENV" value="0x74850000" /> <property name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> + <property name="BASEADDRESS_POWRPROF" value="0x74ad0000" /> <property name="BASEADDRESS_OLEDLG" value="0x74d00000" /> <property name="BASEADDRESS_SAMSRV" value="0x74f30000" /> <property name="BASEADDRESS_SAMLIB" value="0x750C0000" /> Modified: trunk/reactos/dll/win32/powrprof/powrprof.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/powrprof/powrprof… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.c (original) +++ trunk/reactos/dll/win32/powrprof/powrprof.c Wed Jun 7 03:14:09 2006 @@ -1,344 +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; -} +/* + * 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; +} Propchange: trunk/reactos/dll/win32/powrprof/powrprof.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/powrprof/powrprof.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/powrprof/powrprof… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.rbuild (added) +++ trunk/reactos/dll/win32/powrprof/powrprof.rbuild Wed Jun 7 03:14:09 2006 @@ -1,0 +1,19 @@ +<module name="powrprof" type="win32dll" baseaddress="${BASEADDRESS_POWRPROF}" installbase="system32" installname="powrprof.dll" allowwarnings="true"> + <importlibrary definition="powrprof_gcc.def" /> + <include base="ReactOS">include/wine</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ntdll</library> + <library>rtl</library> + <library>kernel32</library> + <library>ntoskrnl</library> + <file>powrprof.c</file> + <file>powrprof.rc</file> +</module> Propchange: trunk/reactos/dll/win32/powrprof/powrprof.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/powrprof/powrprof.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/powrprof/powrprof… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.rc (added) +++ trunk/reactos/dll/win32/powrprof/powrprof.rc Wed Jun 7 03:14:09 2006 @@ -1,0 +1,10 @@ +/* $Id: version.rc 12852 2005-01-06 13:58:04Z mf $ */ + +#include "powrprof.h" +//#include "misc.h" +//#include "type.h" +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Power Profile Helper DLL\0" +#define REACTOS_STR_INTERNAL_NAME "powerprof\0" +#define REACTOS_STR_ORIGINAL_FILENAME "powerprof.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/powrprof/powrprof.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/powrprof/powrprof_gcc.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/powrprof/powrprof… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof_gcc.def (added) +++ trunk/reactos/dll/win32/powrprof/powrprof_gcc.def Wed Jun 7 03:14:09 2006 @@ -1,0 +1,36 @@ + +; $Id: version.def 12852 2005-01-06 13:58:04Z mf $ +; ReactOS Operating System +; +LIBRARY powrprof.dll +EXPORTS +CallNtPowerInformation@20 +;NtPowerInformation@20=ntokrnl._NtPowerInformation@20 +CanUserWritePwrScheme@0 +;DebugPrintA +;DllInitialize +DeletePwrScheme@4 +;DevicePowerClose +;DevicePowerEnumDevices +;DevicePowerOpen +;DevicePowerSetDeviceState +EnumPwrSchemes@8 +GetActivePwrScheme@4 +GetCurrentPowerPolicies@8 +GetPwrCapabilities@4 +GetPwrDiskSpindownRange@8 +IsAdminOverrideActive@4 +IsPwrHibernateAllowed@0 +IsPwrShutdownAllowed@0 +IsPwrSuspendAllowed@0 +;LoadCurrentPwrScheme +;MergeLegacyPwrScheme +ReadGlobalPwrPolicy@4 +ReadProcessorPwrScheme@8 +ReadPwrScheme@8 +SetActivePwrScheme@12 +SetSuspendState@12 +;ValidatePowerPolicies@8 +WriteGlobalPwrPolicy@4 +WriteProcessorPwrScheme@8 +WritePwrScheme@16 Propchange: trunk/reactos/dll/win32/powrprof/powrprof_gcc.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev=… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Wed Jun 7 03:14:09 2006 @@ -160,6 +160,9 @@ <directory name="opengl32"> <xi:include href="opengl32/opengl32.rbuild" /> </directory> +<directory name="powrprof"> + <xi:include href="powrprof/powrprof.rbuild" /> +</directory> <directory name="psapi"> <xi:include href="psapi/psapi.rbuild" /> </directory> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=2… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Wed Jun 7 03:14:09 2006 @@ -62,6 +62,7 @@ reactos/dll/win32/oleaut32 # Synced to Wine-0_9_10 reactos/dll/win32/oledlg # Synced to Wine-0_9_5 reactos/dll/win32/olepro32 # Synced to Wine-0_9_10 +reactos/dll/win32/powrprof # Synced to Wine-0_9_14 reactos/dll/win32/riched20 # Synced to Wine-0_9_5 reactos/dll/win32/richedit # Synced to Wine-0_9_10 reactos/dll/win32/rpcrt4 # Synced to Wine-0_9_10

1 0

[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

← Newer
1
...
45
46
47
48
49
50
51
...
60
Older →

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 June 2006