Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[dchapyshev] 38781: - Implement SetSystemPowerState

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Fri Jan 16 00:33:19 2009 New Revision: 38781 URL: http://svn.reactos.org/svn/reactos?rev=38781&view=rev Log: - Implement SetSystemPowerState Modified: trunk/reactos/dll/win32/kernel32/misc/power.c Modified: trunk/reactos/dll/win32/kernel32/misc/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/po… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/power.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/power.c [iso-8859-1] Fri Jan 16 00:33:19 2009 @@ -15,9 +15,6 @@ #define NDEBUG #include <debug.h> -#define STUB \ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); \ - DPRINT1("%s() is UNIMPLEMENTED!\n", __FUNCTION__) NTSYSAPI NTSTATUS @@ -45,6 +42,16 @@ NtSetThreadExecutionState( IN EXECUTION_STATE esFlags, OUT EXECUTION_STATE *PreviousFlags +); + +NTSYSAPI +NTSTATUS +NTAPI +NtInitiatePowerAction( + IN POWER_ACTION SystemAction, + IN SYSTEM_POWER_STATE MinSystemState, + IN ULONG Flags, + IN BOOLEAN Asynchronous ); /* PUBLIC FUNCTIONS ***********************************************************/ @@ -109,13 +116,27 @@ } /* - * @unimplemented + * @implemented */ BOOL WINAPI SetSystemPowerState(BOOL fSuspend, BOOL fForce) { - STUB; - return FALSE; + SYSTEM_POWER_STATE MinSystemState = (!fSuspend ? PowerSystemHibernate : PowerSystemSleeping1); + ULONG Flags = (!fForce ? POWER_ACTION_QUERY_ALLOWED : 0); + NTSTATUS Status; + + Status = NtInitiatePowerAction(PowerActionSleep, + MinSystemState, + Flags, + FALSE); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; } /* @@ -152,7 +173,8 @@ WINAPI RequestDeviceWakeup(HANDLE hDevice) { - STUB; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + DPRINT1("RequestDeviceWakeup is UNIMPLEMENTED!\n"); return 0; } @@ -183,7 +205,8 @@ WINAPI CancelDeviceWakeupRequest(HANDLE hDevice) { - STUB; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + DPRINT1("CancelDeviceWakeupRequest is UNIMPLEMENTED!\n"); return 0; } @@ -205,7 +228,8 @@ SetMessageWaitingIndicator(HANDLE hMsgIndicator, ULONG ulMsgCount) { - STUB; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + DPRINT1("SetMessageWaitingIndicator is UNIMPLEMENTED!\n"); return 0; }

15 years, 8 months

[weiden] 38780: Create band site's rebar control with styles CCS_NORESIZE and CCS_NOPARENTALIGN

by weiden＠svn.reactos.org

Author: weiden Date: Thu Jan 15 21:19:42 2009 New Revision: 38780 URL: http://svn.reactos.org/svn/reactos?rev=38780&view=rev Log: Create band site's rebar control with styles CCS_NORESIZE and CCS_NOPARENTALIGN Modified: trunk/reactos/dll/win32/browseui/bandsite.c Modified: trunk/reactos/dll/win32/browseui/bandsite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandsite.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandsite.c [iso-8859-1] Thu Jan 15 21:19:42 2009 @@ -957,7 +957,8 @@ NULL, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | RBS_VARHEIGHT | - CCS_NODIVIDER | RBS_BANDBORDERS, + RBS_BANDBORDERS | CCS_NODIVIDER | + CCS_NORESIZE | CCS_NOPARENTALIGN, 0, 0, 0,

15 years, 8 months

[jimtabor] 38779: - Rewrite Timers, nothing is using it except a bogus system timer for raw input thread is loaded and running.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jan 15 17:15:31 2009 New Revision: 38779 URL: http://svn.reactos.org/svn/reactos?rev=38779&view=rev Log: - Rewrite Timers, nothing is using it except a bogus system timer for raw input thread is loaded and running. Modified: trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/include/tags.h trunk/reactos/subsystems/win32/win32k/include/timer.h trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] Thu Jan 15 17:15:31 2009 @@ -37,4 +37,6 @@ #define ThreadHasInputAccess(W32Thread) \ (TRUE) +extern PTHREADINFO ptiRawInput; + #endif /* _WIN32K_INPUT_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] Thu Jan 15 17:15:31 2009 @@ -26,6 +26,7 @@ #define TAG_CALLBACK TAG('C', 'B', 'C', 'K') /* callback memory */ #define TAG_WINSTA TAG('W', 'S', 'T', 'A') /* window station */ #define TAG_PDCE TAG('U', 's', 'd', 'c') /* dce */ +#define TAG_INPUT TAG('U', 's', 's', 'y') /* Input */ /* gdi objects from the handle table */ #define TAG_DC TAG('G', 'l', 'a', '1') /* dc */ Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] Thu Jan 15 17:15:31 2009 @@ -4,7 +4,7 @@ typedef struct _TIMER { LIST_ENTRY ptmrList; - PW32THREADINFO pti; + PTHREADINFO pti; PWINDOW_OBJECT pWnd; // hWnd UINT_PTR nID; // Specifies a nonzero timer identifier. INT cmsCountdown; // uElapse @@ -22,13 +22,19 @@ #define TMRF_INIT 0x0008 #define TMRF_ONESHOT 0x0010 #define TMRF_WAITING 0x0020 +#define TMRF_TIFROMWND 0x0040 + +extern PKTIMER MasterTimer; NTSTATUS FASTCALL InitTimerImpl(VOID); BOOL FASTCALL IntKillTimer(HWND Wnd, UINT_PTR IDEvent, BOOL SystemTimer); UINT_PTR FASTCALL IntSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, BOOL SystemTimer); PTIMER FASTCALL FindSystemTimer(PMSG); -BOOL FASTCALL ValidateTimerCallback(PW32THREADINFO,PWINDOW_OBJECT,WPARAM,LPARAM); +BOOL FASTCALL ValidateTimerCallback(PTHREADINFO,PWINDOW_OBJECT,WPARAM,LPARAM); VOID CALLBACK SystemTimerProc(HWND,UINT,UINT_PTR,DWORD); -UINT_PTR FASTCALL SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); +UINT_PTR FASTCALL SetSystemTimer(PWINDOW_OBJECT,UINT_PTR,UINT,TIMERPROC); +BOOL FASTCALL PostTimerMessages(HWND); +VOID FASTCALL ProcessTimers(VOID); +VOID FASTCALL StartTheTimers(VOID); #endif /* _WIN32K_TIMER_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Thu Jan 15 17:15:31 2009 @@ -36,9 +36,12 @@ #include <debug.h> extern BYTE gQueueKeyStateTable[]; +extern NTSTATUS Win32kInitWin32Thread(PETHREAD Thread); /* GLOBALS *******************************************************************/ +PTHREADINFO ptiRawInput; +PKTIMER MasterTimer; static HANDLE MouseDeviceHandle; static HANDLE MouseThreadHandle; @@ -46,6 +49,8 @@ static HANDLE KeyboardThreadHandle; static CLIENT_ID KeyboardThreadId; static HANDLE KeyboardDeviceHandle; +static HANDLE RawInputThreadHandle; +static CLIENT_ID RawInputThreadId; static KEVENT InputThreadsStart; static BOOLEAN InputThreadsRunning = FALSE; @@ -468,7 +473,6 @@ MSG msg; PUSER_MESSAGE_QUEUE FocusQueue; struct _ETHREAD *FocusThread; - extern NTSTATUS Win32kInitWin32Thread(PETHREAD Thread); PKEYBOARD_INDICATOR_TRANSLATION IndicatorTrans = NULL; UINT ModifierState = 0; @@ -832,6 +836,79 @@ } +static PVOID Objects[2]; +/* + Raw Input Thread. + Since this relies on InputThreadsStart, just fake it. + */ +static VOID APIENTRY +RawInputThreadMain(PVOID StartContext) +{ + NTSTATUS Status; + LARGE_INTEGER DueTime; + + DueTime.QuadPart = (LONGLONG)(-10000000); + + do + { + KEVENT Event; + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DueTime); + } while (!NT_SUCCESS(Status)); + + + Objects[0] = &InputThreadsStart; + + MasterTimer = ExAllocatePoolWithTag(NonPagedPool, sizeof(KTIMER), TAG_INPUT); + if (!MasterTimer) + { + DPRINT1("Win32K: Failed making Raw Input thread a win32 thread.\n"); + return; + } + KeInitializeTimer(MasterTimer); + Objects[1] = MasterTimer; + + // This thread requires win32k! + Status = Win32kInitWin32Thread(PsGetCurrentThread()); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Win32K: Failed making Raw Input thread a win32 thread.\n"); + return; //(Status); + } + + ptiRawInput = PsGetCurrentThreadWin32Thread(); + DPRINT1("\nRaw Input Thread 0x%x \n", ptiRawInput); + + + KeSetPriorityThread(&PsGetCurrentThread()->Tcb, + LOW_REALTIME_PRIORITY + 3); + + UserEnterExclusive(); + StartTheTimers(); + UserLeave(); + + // + // ATM, we just have one job to handle, merge the other two later. + // + for(;;) + { + DPRINT( "Raw Input Thread Waiting for start event\n" ); + + Status = KeWaitForMultipleObjects( 2, + Objects, + WaitAll, //WaitAny, + WrUserRequest, + KernelMode, + TRUE, + NULL, + NULL); + DPRINT( "Raw Input Thread Starting...\n" ); + + ProcessTimers(); + } + DPRINT1("Raw Input Thread Exit!\n"); +} + NTSTATUS FASTCALL InitInputImpl(VOID) { @@ -843,6 +920,18 @@ if(!UserInitDefaultKeyboardLayout()) { DPRINT1("Failed to initialize default keyboard layout!\n"); + } + + Status = PsCreateSystemThread(&RawInputThreadHandle, + THREAD_ALL_ACCESS, + NULL, + NULL, + &RawInputThreadId, + RawInputThreadMain, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Win32K: Failed to create raw thread.\n"); } Status = PsCreateSystemThread(&KeyboardThreadHandle, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Thu Jan 15 17:15:31 2009 @@ -360,7 +360,7 @@ { if (pMsg->message == WM_TIMER) { - if (ValidateTimerCallback(GetW32ThreadInfo(),Window,pMsg->wParam,pMsg->lParam)) + if (ValidateTimerCallback(PsGetCurrentThreadWin32Thread(),Window,pMsg->wParam,pMsg->lParam)) { return co_IntCallWindowProc((WNDPROC)pMsg->lParam, TRUE, @@ -829,6 +829,11 @@ goto MsgExit; } + if (ThreadQueue->WakeMask & QS_TIMER) + if (PostTimerMessages(hWnd)) // If there are timers ready, + goto CheckMessages; // go back and process them. + + // LOL! Polling Timer Queue? How much time is spent doing this? /* Check for WM_(SYS)TIMER messages */ Present = MsqGetTimerMessage(ThreadQueue, hWnd, MsgFilterMin, MsgFilterMax, &Msg->Msg, RemoveMessages); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Thu Jan 15 17:15:31 2009 @@ -1117,7 +1117,7 @@ goto Exit; } - Ret = ValidateTimerCallback(GetW32ThreadInfo(), Window, wParam, lParam); + Ret = ValidateTimerCallback(PsGetCurrentThreadWin32Thread(), Window, wParam, lParam); Exit: UserLeave(); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Thu Jan 15 17:15:31 2009 @@ -37,6 +37,9 @@ /* GLOBALS *******************************************************************/ static PTIMER FirstpTmr = NULL; +static LONG TimeLast = 0; + +#define MAX_ELAPSE_TIME 0x7FFFFFFF /* Windows 2000 has room for 32768 window-less timers */ #define NUM_WINDOW_LESS_TIMERS 1024 @@ -54,6 +57,7 @@ ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&Mutex) /* FUNCTIONS *****************************************************************/ +static PTIMER FASTCALL CreateTimer(VOID) @@ -144,7 +148,7 @@ BOOL FASTCALL -ValidateTimerCallback(PW32THREADINFO pti, +ValidateTimerCallback(PTHREADINFO pti, PWINDOW_OBJECT Window, WPARAM wParam, LPARAM lParam) @@ -158,7 +162,7 @@ { if ( (lParam == (LPARAM)pTmr->pfn) && (pTmr->flags & (TMRF_SYSTEM|TMRF_RIT)) && - (pTmr->pti->pi == pti->pi) ) + (pTmr->pti->ThreadInfo->kpi == pti->ThreadInfo->kpi) ) break; pTmr = (PTIMER)pTmr->ptmrList.Flink; @@ -172,13 +176,73 @@ // Rename it to IntSetTimer after move. UINT_PTR FASTCALL -InternalSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, BOOL SystemTimer) -{ - return 0; +InternalSetTimer( PWINDOW_OBJECT Window, + UINT_PTR IDEvent, + UINT Elapse, + TIMERPROC TimerFunc, + INT Type) +{ + PTIMER pTmr; + LARGE_INTEGER DueTime; + DueTime.QuadPart = (LONGLONG)(-10000000); + +#if 0 + /* Windows NT/2k/XP behaviour */ + if (Elapse > MAX_ELAPSE_TIME) + { + DPRINT("Adjusting uElapse\n"); + Elapse = 1; + } +#else + /* Windows XP SP2 and Windows Server 2003 behaviour */ + if (Elapse > MAX_ELAPSE_TIME) + { + DPRINT("Adjusting uElapse\n"); + Elapse = MAX_ELAPSE_TIME; + } +#endif + + /* Windows 2k/XP and Windows Server 2003 SP1 behaviour */ + if (Elapse < 10) + { + DPRINT("Adjusting uElapse\n"); + Elapse = 10; + } + + pTmr = FindTimer(Window, IDEvent, Type, FALSE); + if (!pTmr) + { + pTmr = CreateTimer(); + if (!pTmr) return 0; + + if (Window && (Type & TMRF_TIFROMWND)) + pTmr->pti = Window->OwnerThread->Tcb.Win32Thread; + else + { + if (Type & TMRF_RIT) + pTmr->pti = ptiRawInput; + else + pTmr->pti = PsGetCurrentThreadWin32Thread(); + } + pTmr->pWnd = Window; + pTmr->cmsCountdown = Elapse; + pTmr->cmsRate = Elapse; + pTmr->flags = Type|TMRF_INIT; // Set timer to Init mode. + pTmr->pfn = TimerFunc; + pTmr->nID = IDEvent; + + InsertTailList(&FirstpTmr->ptmrList, &pTmr->ptmrList); + } + + // Start the timer thread! + KeSetTimer(MasterTimer, DueTime, NULL); + + if (!pTmr->nID) return 1; + return pTmr->nID; } // -// Process system timers. +// Process win32k system timers. // VOID CALLBACK @@ -187,18 +251,147 @@ UINT_PTR idEvent, DWORD dwTime) { + DPRINT( "Timer Running!\n" ); +} + +VOID +FASTCALL +StartTheTimers(VOID) +{ + // Need to start gdi syncro timers then start timer with Hang App proc + // that calles Idle process so the screen savers will know to run...... + InternalSetTimer(NULL, 0, 1000, SystemTimerProc, TMRF_RIT); } UINT_PTR FASTCALL -SetSystemTimer( HWND hWnd, +SetSystemTimer( PWINDOW_OBJECT Window, UINT_PTR nIDEvent, UINT uElapse, TIMERPROC lpTimerFunc) { - return 0; -} - + if (Window && Window->OwnerThread->ThreadsProcess != PsGetCurrentProcess()) + { + SetLastWin32Error(ERROR_ACCESS_DENIED); + return 0; + } + return InternalSetTimer( Window, nIDEvent, uElapse, lpTimerFunc, TMRF_SYSTEM); +} + +BOOL +FASTCALL +PostTimerMessages(HWND hWnd) +{ + PUSER_MESSAGE_QUEUE ThreadQueue; + MSG Msg; + PTHREADINFO pti; + PWINDOW_OBJECT pWnd = NULL; + BOOL Hit = FALSE; + PTIMER pTmr = FirstpTmr; + + if (!pTmr) return FALSE; + + if (hWnd) + { + pWnd = UserGetWindowObject(hWnd); + if (!pWnd || !pWnd->Wnd) return FALSE; + } + + pti = PsGetCurrentThreadWin32Thread(); + ThreadQueue = pti->MessageQueue; + + KeEnterCriticalRegion(); + do + { + if ( (pTmr->flags & TMRF_READY) && + (pTmr->pti == pti) && + (pTmr->pWnd == pWnd)) + { + Msg.hwnd = hWnd; + Msg.message = (pTmr->flags & TMRF_SYSTEM) ? WM_SYSTIMER : WM_TIMER; + Msg.wParam = (WPARAM) pTmr->nID; + Msg.lParam = (LPARAM) pTmr->pfn; + MsqPostMessage(ThreadQueue, &Msg, FALSE, QS_POSTMESSAGE); + + pTmr->flags &= ~TMRF_READY; + ThreadQueue->WakeMask = ~QS_TIMER; + Hit = TRUE; + } + + pTmr = (PTIMER)pTmr->ptmrList.Flink; + } while (pTmr != FirstpTmr); + KeLeaveCriticalRegion(); + + return Hit; +} + +VOID +FASTCALL +ProcessTimers(VOID) +{ + LARGE_INTEGER TickCount, DueTime; + LONG Time; + PTIMER pTmr = FirstpTmr; + + if (!pTmr) return; + + UserEnterExclusive(); + + KeQueryTickCount(&TickCount); + Time = MsqCalculateMessageTime(&TickCount); + + DueTime.QuadPart = (LONGLONG)(-10000000); + + do + { + if (pTmr->flags & TMRF_WAITING) + { + pTmr = (PTIMER)pTmr->ptmrList.Flink; + continue; + } + + if (pTmr->flags & TMRF_INIT) + pTmr->flags &= ~TMRF_INIT; // Skip this run. + else + { + if (pTmr->cmsCountdown < 0) + { + if (!(pTmr->flags & TMRF_READY)) + { + if (pTmr->flags & TMRF_ONESHOT) + pTmr->flags |= TMRF_WAITING; + + if (pTmr->flags & TMRF_RIT) + { + // Hard coded call here, inside raw input thread. + pTmr->pfn(NULL, WM_SYSTIMER, pTmr->nID, (LPARAM)pTmr); + } + else + { + pTmr->flags |= TMRF_READY; // Set timer ready to be ran. + // Set thread message queue for this timer. + if (pTmr->pti->MessageQueue) + { // Wakeup thread + pTmr->pti->MessageQueue->WakeMask |= QS_TIMER; + KeSetEvent(pTmr->pti->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); + } + } + } + pTmr->cmsCountdown = pTmr->cmsRate; + } + else + pTmr->cmsCountdown -= Time - TimeLast; + } + pTmr = (PTIMER)pTmr->ptmrList.Flink; + } while (pTmr != FirstpTmr); + + // Restart the timer thread! + KeSetTimer(MasterTimer, DueTime, NULL); + + TimeLast = Time; + + UserLeave(); +} // //

15 years, 8 months

[cfinck] 38778: Maciej Bialas (bjauy@o2.pl) - Polish translation for testman

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Jan 15 14:29:15 2009 New Revision: 38778 URL: http://svn.reactos.org/svn/reactos?rev=38778&view=rev Log: Maciej Bialas (bjauy(a)o2.pl) - Polish translation for testman Added: trunk/web/reactos.org/htdocs/testman/lang/pl.inc.php Modified: trunk/web/reactos.org/htdocs/testman/languages.inc.php Added: trunk/web/reactos.org/htdocs/testman/lang/pl.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/lan… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/lang/pl.inc.php (added) +++ trunk/web/reactos.org/htdocs/testman/lang/pl.inc.php [iso-8859-1] Thu Jan 15 14:29:15 2009 @@ -1,0 +1,62 @@ +<?php +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Translation + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> + TRANSLATOR: Maciej Bialas + + charset=utf-8 without BOM +*/ + + $testman_langres = array( + // Index page + "index_header" => '<a href="http://www.reactos.org/">Strona gÅÃ³wna</a> > MenedÅ¼er testÃ³w ReactOS', + "index_title" => "MenedÅ¼er testÃ³w ReactOS", + "index_intro" => "Ten interfejs pozwala Tobie znaleÅºÄ, zobaczyÄ i porÃ³wnaÄ wyniki przeprowadzanych automatycznie testÃ³w regresji.", + "js_disclaimer" => "Musisz wÅÄczyÄ obsÅugÄ JavaScriptu, aby uÅ¼ywaÄ tego interfejsu!", + + "lastresults_header" => "Ostatnich 10 wynikÃ³w testÃ³w", + "date" => "Data", + "revision" => "Wydanie", + "user" => "UÅ¼ytkownik", + "platform" => "Platforma", + + "search_header" => "Szukaj w wynikach testÃ³w", + "search_revision" => "Wydanie", + "rangeinfo" => "MoÅ¼esz wprowadziÄ numer wydania (np. %s) lub przedziaÅ (np. %s-%s)", + "search_platform" => "Platforma", + "search_button" => "Szukaj", + "searching" => "Trwa szukanie w wynikach testÃ³w", + + "foundresults" => "Znaleziono %s wynikÃ³w!", + "noresults" => "Brak wynikÃ³w wyszukiwania!", + + "status" => "%s testÃ³w zaznaczonych do porÃ³wnania", + "compare_button" => "PorÃ³wnaj", + + "noselection" => "Nie wybraÅeÅ/aÅ Å¼adnych wynikÃ³w!", + "maxselection" => "MoÅ¼esz zaznaczyÄ do porÃ³wnania maksymalnie %d wynikÃ³w!", + + // Compare page + "compare_title" => "PorÃ³wnywanie wynikÃ³w", + "showchanged" => "PokaÅ¼ tylko zmienione wyniki", + + "legend" => "Legenda", + "totaltests" => "Wszystkie testy", + "failedtests" => "Nieudane", + "todotests" => "Oznaczone jako ToDo", + "skippedtests" => "PominiÄte", + "difference" => "RÃ³Å¼nica wzglÄdem poprzedniego wyniku", + + "testsuite" => "Zestaw testÃ³w", + "resulthead" => "Wydanie %d pod %s przez %s %s", + + // Result Details page + "detail_title" => "SzczegÃ³Åy wynikÃ³w", + + "thisresult" => "Informacje o tych wynikach", + "log" => "Dziennik", + "associatedtest" => "Informacja o powiÄzanych testach", + ); +?> Modified: trunk/web/reactos.org/htdocs/testman/languages.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/lan… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/languages.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/testman/languages.inc.php [iso-8859-1] Thu Jan 15 14:29:15 2009 @@ -10,5 +10,6 @@ $supported_languages = array( "en" => "English", "de" => "Deutsch (German)", + "pl" => "Polski (Polish)", ); ?>

15 years, 8 months

[pschweitzer] 38777: Implemented FsRtlIsNotifyOnList, FsRtlNotifyCleanup

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Jan 15 14:19:00 2009 New Revision: 38777 URL: http://svn.reactos.org/svn/reactos?rev=38777&view=rev Log: Implemented FsRtlIsNotifyOnList, FsRtlNotifyCleanup Modified: branches/pierre-fsd/ntoskrnl/fsrtl/notify.c branches/pierre-fsd/ntoskrnl/include/internal/fsrtl.h Modified: branches/pierre-fsd/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/notif… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/notify.c [iso-8859-1] Thu Jan 15 14:19:00 2009 @@ -11,6 +11,95 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +PNOTIFY_CHANGE +FsRtlIsNotifyOnList(IN PLIST_ENTRY NotifyList, + IN PVOID FsContext) +{ + PLIST_ENTRY NextEntry; + PNOTIFY_CHANGE NotifyChange; + + if (!IsListEmpty(NotifyList)) + { + /* Browse the notifications list to find the matching entry */ + for (NextEntry = NotifyList->Flink; + NextEntry != NotifyList; + NextEntry = NextEntry->Flink) + { + NotifyChange = CONTAINING_RECORD(NextEntry, NOTIFY_CHANGE, NotifyList); + /* If the current record matches with the given context, it's the good one */ + if (NotifyChange->FsContext == FsContext) + { + return NotifyChange; + } + } + } + return NULL; +} + +VOID +FORCEINLINE +FsRtlNotifyAcquireFastMutex(IN PREAL_NOTIFY_SYNC RealNotifySync) +{ + /* Only acquire fast mutex if it's not already acquired by the current thread */ + if (RealNotifySync->OwningThread != (ULONG_PTR)KeGetCurrentThread()) + { + ExAcquireFastMutexUnsafe(&(RealNotifySync->FastMutex)); + RealNotifySync->OwningThread = (ULONG_PTR)KeGetCurrentThread(); + } + /* Whatever the case, keep trace of the attempt to acquire fast mutex */ + RealNotifySync->OwnerCount++; +} + +VOID +FsRtlNotifyCompleteIrpList(IN PNOTIFY_CHANGE NotifyChange, + IN NTSTATUS Status) +{ +} + +VOID +FORCEINLINE +FsRtlNotifyReleaseFastMutex(IN PREAL_NOTIFY_SYNC RealNotifySync) +{ + RealNotifySync->OwnerCount--; + /* Release the fast mutex only if no other instance needs it */ + if (!RealNotifySync->OwnerCount) + { + ExReleaseFastMutexUnsafe(&(RealNotifySync->FastMutex)); + RealNotifySync->OwningThread = (ULONG_PTR)0; + } +} + +/* PSEH FUNCTIONS ************************************************************/ + +VOID +FsRtlNotifyCleanupFinal(PREAL_NOTIFY_SYNC RealNotifySync, + PSECURITY_SUBJECT_CONTEXT SubjectContext) +{ + /* Release fast mutex */ + FsRtlNotifyReleaseFastMutex(RealNotifySync); + + /* If the subject security context was captured, release and free it */ + if (SubjectContext) + { + SeReleaseSubjectContext(SubjectContext); + ExFreePool(SubjectContext); + } +} + +_SEH_DEFINE_LOCALS(FsRtlNotifyCleanupFinal) +{ + PREAL_NOTIFY_SYNC RealNotifySync; + PSECURITY_SUBJECT_CONTEXT SubjectContext; +}; + +_SEH_FINALLYFUNC(FsRtlNotifyCleanupFinal_PSEH) +{ + _SEH_ACCESS_LOCALS(FsRtlNotifyCleanupFinal); + FsRtlNotifyCleanupFinal(_SEH_VAR(RealNotifySync), _SEH_VAR(SubjectContext)); +} /* PUBLIC FUNCTIONS **********************************************************/ @@ -72,18 +161,18 @@ /*++ * @name FsRtlNotifyCleanup - * @unimplemented + * @implemented * * Called by FSD when all handles to FileObject (identified by FsContext) are closed * - * @param NotifySync - * FILLME - * - * @param NotifyList - * FILLME + * @param NotifySync + * Synchronization object pointer + * + * @param NotifyList + * Notify list pointer (to head) * * @param FsContext - * FILLME + * Used to identify the notify structure * * @return None * @@ -95,8 +184,60 @@ FsRtlNotifyCleanup(IN PNOTIFY_SYNC NotifySync, IN PLIST_ENTRY NotifyList, IN PVOID FsContext) -{ - KEBUGCHECK(0); +{ + PNOTIFY_CHANGE NotifyChange; + PREAL_NOTIFY_SYNC RealNotifySync; + + /* Get real structure hidden behind the opaque pointer */ + RealNotifySync = (PREAL_NOTIFY_SYNC)NotifySync; + + /* Acquire the fast mutex */ + FsRtlNotifyAcquireFastMutex(RealNotifySync); + + _SEH_TRY + { + _SEH_DECLARE_LOCALS(FsRtlNotifyCleanupFinal); + _SEH_VAR(RealNotifySync) = RealNotifySync; + _SEH_VAR(SubjectContext) = NULL; + + /* Find if there's a matching notification with the FsContext */ + NotifyChange = FsRtlIsNotifyOnList(NotifyList, FsContext); + if (NotifyChange) + { + /* Mark it as to know that cleanup is in process */ + NotifyChange->Flags |= CLEANUP_IN_PROCESS; + + /* If there are pending IRPs, complete them using the STATUS_NOTIFY_CLEANUP status */ + if (!IsListEmpty(NotifyChange->NotifyIrps)) + { + FsRtlNotifyCompleteIrpList(NotifyChange, STATUS_NOTIFY_CLEANUP); + } + /* Remove from the list */ + RemoveEntryList(NotifyChange->NotifyList); + + /* Downcrease reference number and if 0 is reached, it's time to do total cleanup */ + if (!InterlockedDecrement((PLONG)&(NotifyChange->ReferenceCount))) + { + /* In case there was an allocated buffer, free it */ + if (NotifyChange->AllocatedBuffer) + { + PsReturnProcessPagedPoolQuota(NotifyChange->OwningProcess, NotifyChange->ThisBufferLength); + ExFreePool(NotifyChange->AllocatedBuffer); + } + + /* In case there the string was set, get the captured subject security context */ + if (NotifyChange->FullDirectoryName) + { + _SEH_VAR(SubjectContext) = NotifyChange->SubjectContext; + } + + /* Finally, free the notification, as it's not needed anymore */ + ExFreePool(NotifyChange); + } + } + } + _SEH_FINALLY(FsRtlNotifyCleanupFinal_PSEH) + _SEH_END; } /*++ Modified: branches/pierre-fsd/ntoskrnl/include/internal/fsrtl.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/include/int… ============================================================================== --- branches/pierre-fsd/ntoskrnl/include/internal/fsrtl.h [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/include/internal/fsrtl.h [iso-8859-1] Thu Jan 15 14:19:00 2009 @@ -48,6 +48,11 @@ // Number of maximum pair count per MCB // #define MAXIMUM_PAIR_COUNT 15 + +// +// Notifications flags +// +#define CLEANUP_IN_PROCESS 4 // // Internal structure for NOTIFY_SYNC

15 years, 8 months

[fireball] 38776: - Delete npfs_new skeleton. One rewrite less.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jan 15 13:15:26 2009 New Revision: 38776 URL: http://svn.reactos.org/svn/reactos?rev=38776&view=rev Log: - Delete npfs_new skeleton. One rewrite less. Removed: trunk/reactos/drivers/filesystems/npfs_new/

15 years, 8 months

[dreimer] 38775: Fix my stupid mistake. Of course it does not fill stuff into the PS config if I return true directly after it finished the CMD config file and before doing anything in the PS config file. Additionally it did not close a file handle too. Works now for both PS and CMD the same way. Added another error message for the new file if not exitant

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jan 15 12:14:03 2009 New Revision: 38775 URL: http://svn.reactos.org/svn/reactos?rev=38775&view=rev Log: Fix my stupid mistake. Of course it does not fill stuff into the PS config if I return true directly after it finished the CMD config file and before doing anything in the PS config file. Additionally it did not close a file handle too. Works now for both PS and CMD the same way. Added another error message for the new file if not exitant Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/es-ES.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/pl-PL.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc [iso-8859-1] Thu Jan 15 12:14:03 2009 @@ -50,7 +50,8 @@ CLR14, "Gelb" CLR15, "Weiß" MSG_NOGCCFOUND, "Kein MinGW/GCC Compiler gefunden! Bitte überprüfen sie ihren Pfad." - MSG_FILEFAILED, "rosbe-options.cmd konnte nicht erstellt werden!" + MSG_CMDFFAILED, "rosbe-options.cmd konnte nicht erstellt werden!" + MSG_PS1FFAILED, "rosbe-options.ps1 konnte nicht erstellt werden!" MSG_DIREFAILED, "Ordner konnte nicht erstellt werden!" MSG_SETLOADSUC, "Vorherige Einstellungen erfolgreich geladen." MSG_FINDLOGDIR, "Bitte wählen Sie einen Ordner, in dem die Logs gespeichert werden sollen:" Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc [iso-8859-1] Thu Jan 15 12:14:03 2009 @@ -50,7 +50,8 @@ CLR14, "Light Yellow" CLR15, "Bright White" MSG_NOGCCFOUND, "No MinGW/GCC found! Please check your directory." - MSG_FILEFAILED, "Failed to create rosbe-options.cmd!" + MSG_CMDFFAILED, "Failed to create rosbe-options.cmd!" + MSG_PS1FFAILED, "Failed to create rosbe-options.ps1!" MSG_DIREFAILED, "Failed to create directory!" MSG_SETLOADSUC, "Previous settings loaded successfully." MSG_FINDLOGDIR, "Please choose a directory where the the logs should be stored:" Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/es-ES.rc [iso-8859-1] Thu Jan 15 12:14:03 2009 @@ -50,7 +50,8 @@ CLR14, "Amarillo claro" CLR15, "Blanco brillante" MSG_NOGCCFOUND, "¡No se ha encontrado MinGW/GCC! Por favor, comprueba tu directorio." - MSG_FILEFAILED, "¡Fallo al crear rosbe-options.cmd!" + MSG_CMDFFAILED, "¡Fallo al crear rosbe-options.cmd!" + MSG_PS1FFAILED, "¡Fallo al crear rosbe-options.ps1!" MSG_DIREFAILED, "¡Fallo al crear directorio!" MSG_SETLOADSUC, "Opciones cargadas satisfactoriamente." MSG_FINDLOGDIR, "Por favor, seleccione un directorio donde los logs (registros) serán almacenados:" Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc [iso-8859-1] Thu Jan 15 12:14:03 2009 @@ -50,7 +50,8 @@ CLR14, "Jaune Clair" CLR15, "Blanc Brillant" MSG_NOGCCFOUND, "Impossible de trouver MinGW/GCC ! Veuillez vérifier votre répertoire." - MSG_FILEFAILED, "Impossible de créer rosbe-options.cmd !" + MSG_CMDFFAILED, "Impossible de créer rosbe-options.cmd !" + MSG_PS1FFAILED, "Impossible de créer rosbe-options.ps1 !" MSG_DIREFAILED, "Impossible de créer le répertoire !" MSG_SETLOADSUC, "Paramètres précédents chargés avec succès." MSG_FINDLOGDIR, "Veuillez choisir le répertoire où seront stockés les journaux :" Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/pl-PL.rc [iso-8859-1] Thu Jan 15 12:14:03 2009 @@ -50,7 +50,8 @@ CLR14, "Jasno¿ó³ty" CLR15, "Bia³y" MSG_NOGCCFOUND, "Nie znaleziono MinGW/GCC! Sprawd nazwê folderu." - MSG_FILEFAILED, "Nie uda³o siê stworzyæ pliku rosbe-options.cmd!" + MSG_CMDFFAILED, "Nie uda³o siê stworzyæ pliku rosbe-options.cmd!" + MSG_PS1FFAILED, "Nie uda³o siê stworzyæ pliku rosbe-options.ps1!" MSG_DIREFAILED, "Nie powiod³o siê stworzenie folderu!" MSG_SETLOADSUC, "Za³adowano ostatnio zapisane ustawienia." MSG_FINDLOGDIR, "Proszê wybraæ folder, gdzie zostan¹ zapisane dzienniki budowania:" Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc [iso-8859-1] Thu Jan 15 12:14:03 2009 @@ -52,7 +52,8 @@ CLR14, "ßðêî-æ¸ëòûé" CLR15, "ßðêî-áåëûé" MSG_NOGCCFOUND, "Êîìïèëÿòîð GCC íå íàéäåí! Ïðîâåðüòå ïðàâèëüíîñòü óñòàíîâêè." - MSG_FILEFAILED, "Íåâîçìîæíî ñîçäàòü ôàéë rosbe-options.cmd" + MSG_CMDFFAILED, "Íåâîçìîæíî ñîçäàòü ôàéë rosbe-options.cmd" + MSG_PS1FFAILED, "Íåâîçìîæíî ñîçäàòü ôàéë rosbe-options.ps1" MSG_DIREFAILED, "Íå óäàëîñü ñîçäàòü äèðåêòîðèþ!" MSG_SETLOADSUC, "Ðàíåå ñîõðàíåííûå íàñòðîéêè çàãðóæåíû." MSG_FINDLOGDIR, "Óêàæèòå êàòàëîã ñîõðàíåíèÿ ëîã-ôàéëîâ:" Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc [iso-8859-1] Thu Jan 15 12:14:03 2009 @@ -58,7 +58,8 @@ CLR14, "ßñíî-æîâòèé" CLR15, "ßñêðàâî-á³ëèé" MSG_NOGCCFOUND, "Íå çíàéäåíèé MinGW/GCC! Ïåðåâ³ðòå ñâîþ ïàïêó." - MSG_FILEFAILED, "Íåìîæëèâî ñòâîðèòè ôàéë rosbe-options.cmd!" + MSG_CMDFFAILED, "Íåìîæëèâî ñòâîðèòè ôàéë rosbe-options.cmd!" + MSG_PS1FFAILED, "Íåìîæëèâî ñòâîðèòè ôàéë rosbe-options.ps1!" MSG_DIREFAILED, "Íåìîæëèâî ñòâîðèòè ïàïêó!" MSG_SETLOADSUC, "Ïîïåðåäí³ íàñòðîéêè óñï³øíî çàâàíòàæåí³." MSG_FINDLOGDIR, "Âêàæ³òü ïàïêó äëÿ çáåðåæåííÿ ôàéë³â æóðíàëà:" Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c [iso-8859-1] Thu Jan 15 12:14:03 2009 @@ -140,8 +140,6 @@ if (mingwpath[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_MINGWPATH=%s\n", mingwpath); if ((objdir[0] != 0) && objstate) fwprintf(pFilecmd, L"set _ROSBE_OBJPATH=%s\n", objdir); if ((outdir[0] != 0) && outstate) fwprintf(pFilecmd, L"set _ROSBE_OUTPATH=%s\n", outdir); - fclose(pFilecmd); - return TRUE; } if (pFileps1) @@ -150,22 +148,42 @@ fwprintf(pFileps1, L"# This file has been automatically generated by the ReactOS\n"); fwprintf(pFileps1, L"# Build Environment options utility.\n"); fwprintf(pFileps1, L"#\n\n"); - fwprintf(pFileps1, L"# color %X%X\n", background, foreground); - fwprintf(pFileps1, L"$_ROSBE_SHOWTIME=%d\n", showtime); - fwprintf(pFileps1, L"$_ROSBE_USECCACHE=%d\n", useccache); - fwprintf(pFileps1, L"$_ROSBE_STRIP=%d\n", strip); - fwprintf(pFileps1, L"$_ROSBE_NOSTRIP=%d\n", nostrip); - fwprintf(pFileps1, L"$_ROSBE_WRITELOG=%d\n", writelog); - if (logdir[0] != 0) fwprintf(pFileps1, L"$_ROSBE_LOGDIR=%s\n", logdir); - if (mingwpath[0] != 0) fwprintf(pFileps1, L"$_ROSBE_MINGWPATH=%s\n", mingwpath); - if ((objdir[0] != 0) && objstate) fwprintf(pFileps1, L"$_ROSBE_OBJPATH=%s\n", objdir); - if ((outdir[0] != 0) && outstate) fwprintf(pFileps1, L"$_ROSBE_OUTPATH=%s\n", outdir); + fwprintf(pFileps1, L"(Get-Host).UI.RawUI.ForegroundColor = 0x%X\n", foreground); + fwprintf(pFileps1, L"(Get-Host).UI.RawUI.BackgroundColor = 0x%X\n", background); + fwprintf(pFileps1, L"clear-host\n"); + fwprintf(pFileps1, L"$_ROSBE_SHOWTIME = %d\n", showtime); + fwprintf(pFileps1, L"$_ROSBE_USECCACHE = %d\n", useccache); + fwprintf(pFileps1, L"$_ROSBE_STRIP = %d\n", strip); + fwprintf(pFileps1, L"$_ROSBE_NOSTRIP = %d\n", nostrip); + fwprintf(pFileps1, L"$_ROSBE_WRITELOG = %d\n", writelog); + if (logdir[0] != 0) fwprintf(pFileps1, L"$_ROSBE_LOGDIR = \"%s\"\n", logdir); + if (mingwpath[0] != 0) fwprintf(pFileps1, L"$_ROSBE_MINGWPATH = \"%s\"\n", mingwpath); + if ((objdir[0] != 0) && objstate) fwprintf(pFileps1, L"$_ROSBE_OBJPATH = \"%s\"\n", objdir); + if ((outdir[0] != 0) && outstate) fwprintf(pFileps1, L"$_ROSBE_OUTPATH = \"%s\"\n", outdir); + } + + if (pFilecmd && pFileps1) + { + fclose(pFilecmd); fclose(pFileps1); return TRUE; } - LoadString(hInstance, MSG_FILEFAILED, msgerror, 256); - MessageBox(infoPtr->hwndDlg, msgerror, NULL, MB_ICONERROR); + if (!pFilecmd) + { + fclose(pFilecmd); + fclose(pFileps1); + LoadString(hInstance, MSG_CMDFFAILED, msgerror, 256); + MessageBox(infoPtr->hwndDlg, msgerror, NULL, MB_ICONERROR); + } + + if (!pFileps1) + { + fclose(pFilecmd); + fclose(pFileps1); + LoadString(hInstance, MSG_PS1FFAILED, msgerror, 256); + MessageBox(infoPtr->hwndDlg, msgerror, NULL, MB_ICONERROR); + } return FALSE; } Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h [iso-8859-1] Thu Jan 15 12:14:03 2009 @@ -53,29 +53,29 @@ /* Strings */ #define MSG_NOGCCFOUND 0x27 -#define MSG_FILEFAILED 0x28 -#define MSG_DIREFAILED 0x29 -#define MSG_SETLOADSUC 0x2a -#define MSG_FINDLOGDIR 0x2b -#define MSG_FINDMGWDIR 0x2c -#define MSG_FINDOBJDIR 0x2d -#define MSG_FINDOUTDIR 0x2e -#define MSG_WARNINGBOX 0x2f -#define MSG_EXITCHANGE 0x30 -#define MSG_INVALIDDIR 0x31 +#define MSG_CMDFFAILED 0x28 +#define MSG_PS1FFAILED 0x29 +#define MSG_DIREFAILED 0x2a +#define MSG_SETLOADSUC 0x2b +#define MSG_FINDLOGDIR 0x2c +#define MSG_FINDMGWDIR 0x2d +#define MSG_FINDOBJDIR 0x2e +#define MSG_FINDOUTDIR 0x2f +#define MSG_WARNINGBOX 0x30 +#define MSG_EXITCHANGE 0x31 +#define MSG_INVALIDDIR 0x32 /* Help Strings */ -#define HLP_BACKCOLORC 0x32 -#define HLP_FONTCOLORC 0x33 -#define HLP_SBUILDTIME 0x34 -#define HLP_CCACHEUSED 0x35 -#define HLP_STRIPEDEXE 0x36 -#define HLP_FINDMGWDIR 0x37 -#define HLP_FINDLOGDIR 0x38 -#define HLP_FINDOBJDIR 0x39 -#define HLP_FINDOUTDIR 0x3a -#define HLP_SAVEBUTTON 0x3b -#define HLP_QUITBUTTON 0x3c -#define HLP_DEFAULTMSG 0x3d -#define HLP_NOSTRIP 0x3e - +#define HLP_BACKCOLORC 0x33 +#define HLP_FONTCOLORC 0x34 +#define HLP_SBUILDTIME 0x35 +#define HLP_CCACHEUSED 0x36 +#define HLP_STRIPEDEXE 0x37 +#define HLP_FINDMGWDIR 0x38 +#define HLP_FINDLOGDIR 0x39 +#define HLP_FINDOBJDIR 0x3a +#define HLP_FINDOUTDIR 0x3b +#define HLP_SAVEBUTTON 0x3c +#define HLP_QUITBUTTON 0x3d +#define HLP_DEFAULTMSG 0x3e +#define HLP_NOSTRIP 0x3f

15 years, 8 months

[hyperion] 38774: Sync widl, comcat, ole32, oleaut32 and rpcrt4 to wine 1.1.12 widl can now automatically generate boilerplate code for DLLs hosting RPC proxies (and ole32 and oleaut32 now use this feature): invoke the generation automatically from rbuild rules for rpcproxy modules

by hyperion＠svn.reactos.org

Author: hyperion Date: Thu Jan 15 11:52:35 2009 New Revision: 38774 URL: http://svn.reactos.org/svn/reactos?rev=38774&view=rev Log: Sync widl, comcat, ole32, oleaut32 and rpcrt4 to wine 1.1.12 widl can now automatically generate boilerplate code for DLLs hosting RPC proxies (and ole32 and oleaut32 now use this feature): invoke the generation automatically from rbuild rules for rpcproxy modules Added: trunk/reactos/tools/widl/typetree.c (with props) trunk/reactos/tools/widl/typetree.h (with props) Removed: trunk/reactos/dll/win32/comcat/comcat_private.h trunk/reactos/dll/win32/comcat/factory.c trunk/reactos/dll/win32/comcat/information.c trunk/reactos/dll/win32/comcat/manager.c trunk/reactos/dll/win32/comcat/register.c trunk/reactos/dll/win32/comcat/regsvr.c trunk/reactos/dll/win32/ole32/ole32_ros.diff Modified: trunk/reactos/base/services/rpcss/rpcss.rbuild trunk/reactos/dll/win32/comcat/comcat.rbuild trunk/reactos/dll/win32/comcat/comcat.spec trunk/reactos/dll/win32/comcat/comcat_main.c trunk/reactos/dll/win32/ole32/classmoniker.c trunk/reactos/dll/win32/ole32/clipboard.c trunk/reactos/dll/win32/ole32/comcat.c trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/ole32/compobj_private.h trunk/reactos/dll/win32/ole32/defaulthandler.c trunk/reactos/dll/win32/ole32/errorinfo.c trunk/reactos/dll/win32/ole32/filemoniker.c trunk/reactos/dll/win32/ole32/itemmoniker.c trunk/reactos/dll/win32/ole32/memlockbytes16.c trunk/reactos/dll/win32/ole32/moniker.c trunk/reactos/dll/win32/ole32/ole16.c trunk/reactos/dll/win32/ole32/ole2.c trunk/reactos/dll/win32/ole32/ole2_16.c trunk/reactos/dll/win32/ole32/ole32.rbuild trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/ole32/oleproxy.c trunk/reactos/dll/win32/ole32/regsvr.c trunk/reactos/dll/win32/ole32/stg_bigblockfile.c trunk/reactos/dll/win32/ole32/storage.c trunk/reactos/dll/win32/ole32/storage.spec trunk/reactos/dll/win32/ole32/storage32.c trunk/reactos/dll/win32/ole32/stubmanager.c trunk/reactos/dll/win32/ole32/usrmarshal.c trunk/reactos/dll/win32/oleaut32/dispatch.c trunk/reactos/dll/win32/oleaut32/oleaut.c trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild trunk/reactos/dll/win32/oleaut32/oleaut32_Ko.rc trunk/reactos/dll/win32/oleaut32/oleaut32_ocidl.idl trunk/reactos/dll/win32/oleaut32/olefont.c trunk/reactos/dll/win32/oleaut32/olepicture.c trunk/reactos/dll/win32/oleaut32/recinfo.c trunk/reactos/dll/win32/oleaut32/regsvr.c trunk/reactos/dll/win32/oleaut32/safearray.c trunk/reactos/dll/win32/oleaut32/tmarshal.c trunk/reactos/dll/win32/oleaut32/typelib.c trunk/reactos/dll/win32/oleaut32/typelib2.c trunk/reactos/dll/win32/oleaut32/ungif.c trunk/reactos/dll/win32/oleaut32/usrmarshal.c trunk/reactos/dll/win32/oleaut32/varformat.c trunk/reactos/dll/win32/oleaut32/variant.c trunk/reactos/dll/win32/oleaut32/vartype.c trunk/reactos/dll/win32/rpcrt4/cproxy.c trunk/reactos/dll/win32/rpcrt4/cpsf.c trunk/reactos/dll/win32/rpcrt4/ndr_fullpointer.c trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c trunk/reactos/dll/win32/rpcrt4/rpc_server.c trunk/reactos/dll/win32/rpcrt4/rpc_transport.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c trunk/reactos/include/psdk/rpcndr.h trunk/reactos/include/psdk/rpcproxy.h trunk/reactos/include/psdk/stdole2.idl trunk/reactos/include/reactos/wine/irot.idl trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/backend/mingw/rule.cpp trunk/reactos/tools/widl/client.c trunk/reactos/tools/widl/expr.c trunk/reactos/tools/widl/expr.h trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/header.h trunk/reactos/tools/widl/parser.h trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.tab.h trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/parser.yy.c trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/server.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/typegen.h trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/typelib.h trunk/reactos/tools/widl/widl.c trunk/reactos/tools/widl/widl.h trunk/reactos/tools/widl/widl.rbuild trunk/reactos/tools/widl/widltypes.h trunk/reactos/tools/widl/write_msft.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/services/rpcss/rpcss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss.… Modified: trunk/reactos/dll/win32/comcat/comcat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/comcat.rb… Modified: trunk/reactos/dll/win32/comcat/comcat.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/comcat.sp… Modified: trunk/reactos/dll/win32/comcat/comcat_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/comcat_ma… Removed: trunk/reactos/dll/win32/comcat/comcat_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/comcat_pr… Removed: trunk/reactos/dll/win32/comcat/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/factory.c… Removed: trunk/reactos/dll/win32/comcat/information.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/informati… Removed: trunk/reactos/dll/win32/comcat/manager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/manager.c… Removed: trunk/reactos/dll/win32/comcat/register.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/register.… Removed: trunk/reactos/dll/win32/comcat/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/regsvr.c?… Modified: trunk/reactos/dll/win32/ole32/classmoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/classmonik… Modified: trunk/reactos/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.… Modified: trunk/reactos/dll/win32/ole32/comcat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/comcat.c?r… Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… Modified: trunk/reactos/dll/win32/ole32/compobj_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj_pr… Modified: trunk/reactos/dll/win32/ole32/defaulthandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/defaulthan… Modified: trunk/reactos/dll/win32/ole32/errorinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/errorinfo.… Modified: trunk/reactos/dll/win32/ole32/filemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/filemonike… Modified: trunk/reactos/dll/win32/ole32/itemmoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/itemmonike… Modified: trunk/reactos/dll/win32/ole32/memlockbytes16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/memlockbyt… Modified: trunk/reactos/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.c?… Modified: trunk/reactos/dll/win32/ole32/ole16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole16.c?re… Modified: trunk/reactos/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2.c?rev… Modified: trunk/reactos/dll/win32/ole32/ole2_16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2_16.c?… Modified: trunk/reactos/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.rbui… Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… Removed: trunk/reactos/dll/win32/ole32/ole32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32_ros.… Modified: trunk/reactos/dll/win32/ole32/oleproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/oleproxy.c… Modified: trunk/reactos/dll/win32/ole32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/regsvr.c?r… Modified: trunk/reactos/dll/win32/ole32/stg_bigblockfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_bigblo… Modified: trunk/reactos/dll/win32/ole32/storage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage.c?… Modified: trunk/reactos/dll/win32/ole32/storage.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage.sp… Modified: trunk/reactos/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… Modified: trunk/reactos/dll/win32/ole32/stubmanager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stubmanage… Modified: trunk/reactos/dll/win32/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/usrmarshal… Modified: trunk/reactos/dll/win32/oleaut32/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/dispatc… Modified: trunk/reactos/dll/win32/oleaut32/oleaut.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut.… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_ocidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/olefont.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olefont… Modified: trunk/reactos/dll/win32/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olepict… Modified: trunk/reactos/dll/win32/oleaut32/recinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/recinfo… Modified: trunk/reactos/dll/win32/oleaut32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/regsvr.… Modified: trunk/reactos/dll/win32/oleaut32/safearray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/safearr… Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/tmarsha… Modified: trunk/reactos/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… Modified: trunk/reactos/dll/win32/oleaut32/typelib2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… Modified: trunk/reactos/dll/win32/oleaut32/ungif.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/ungif.c… Modified: trunk/reactos/dll/win32/oleaut32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/usrmars… Modified: trunk/reactos/dll/win32/oleaut32/varformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/varform… Modified: trunk/reactos/dll/win32/oleaut32/variant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… Modified: trunk/reactos/dll/win32/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/vartype… Modified: trunk/reactos/dll/win32/rpcrt4/cproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cproxy.c?… Modified: trunk/reactos/dll/win32/rpcrt4/cpsf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cpsf.c?re… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_fullpointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_fullp… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ma… Modified: trunk/reactos/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcndr.h?rev=… Modified: trunk/reactos/include/psdk/rpcproxy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcproxy.h?re… Modified: trunk/reactos/include/psdk/stdole2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/stdole2.idl?r… Modified: trunk/reactos/include/reactos/wine/irot.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/irot.… Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/backend/mingw/rule.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/widl/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/client.c?rev=38… Modified: trunk/reactos/tools/widl/expr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/expr.c?rev=3877… Modified: trunk/reactos/tools/widl/expr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/expr.h?rev=3877… Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=38… Modified: trunk/reactos/tools/widl/header.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.h?rev=38… Modified: trunk/reactos/tools/widl/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.h?rev=38… Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=38… Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.h?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=38… Modified: trunk/reactos/tools/widl/parser.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.yy.c?rev… Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=387… Modified: trunk/reactos/tools/widl/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/server.c?rev=38… Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… Modified: trunk/reactos/tools/widl/typegen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.h?rev=3… Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=3… Modified: trunk/reactos/tools/widl/typelib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.h?rev=3… Added: trunk/reactos/tools/widl/typetree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typetree.c?rev=… Added: trunk/reactos/tools/widl/typetree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typetree.h?rev=… Modified: trunk/reactos/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.c?rev=3877… Modified: trunk/reactos/tools/widl/widl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.h?rev=3877… Modified: trunk/reactos/tools/widl/widl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.rbuild?rev… Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re…

15 years, 8 months

[fireball] 38773: - Move batclass.h to PSDK, since it's a PSDK header. - Remove inclusion of it from DDK's ntpoapi.h.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jan 15 11:22:28 2009 New Revision: 38773 URL: http://svn.reactos.org/svn/reactos?rev=38773&view=rev Log: - Move batclass.h to PSDK, since it's a PSDK header. - Remove inclusion of it from DDK's ntpoapi.h. Added: trunk/reactos/include/psdk/batclass.h - copied unchanged from r38770, trunk/reactos/include/ddk/batclass.h Removed: trunk/reactos/include/ddk/batclass.h Modified: trunk/reactos/include/ddk/ntpoapi.h Removed: trunk/reactos/include/ddk/batclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/batclass.h?rev… ============================================================================== --- trunk/reactos/include/ddk/batclass.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/batclass.h (removed) @@ -1,292 +1,0 @@ -/* - * batclass.h - * - * Battery class driver interface - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __BATCLASS_H -#define __BATCLASS_H - -#ifdef __cplusplus -extern "C" { -#endif - -#if defined(_BATTERYCLASS_) - #define BCLASSAPI DECLSPEC_EXPORT -#else - #define BCLASSAPI DECLSPEC_IMPORT -#endif - - -/* Battery device GUIDs */ - -DEFINE_GUID(GUID_DEVICE_BATTERY, - 0x72631e54L, 0x78A4, 0x11d0, 0xbc, 0xf7, 0x00, 0xaa, 0x00, 0xb7, 0xb3, 0x2a); - -DEFINE_GUID(BATTERY_STATUS_WMI_GUID, - 0xfc4670d1, 0xebbf, 0x416e, 0x87, 0xce, 0x37, 0x4a, 0x4e, 0xbc, 0x11, 0x1a); - -DEFINE_GUID(BATTERY_RUNTIME_WMI_GUID, - 0x535a3767, 0x1ac2, 0x49bc, 0xa0, 0x77, 0x3f, 0x7a, 0x02, 0xe4, 0x0a, 0xec); - -DEFINE_GUID(BATTERY_TEMPERATURE_WMI_GUID, - 0x1a52a14d, 0xadce, 0x4a44, 0x9a, 0x3e, 0xc8, 0xd8, 0xf1, 0x5f, 0xf2, 0xc2); - -DEFINE_GUID(BATTERY_FULL_CHARGED_CAPACITY_WMI_GUID, - 0x40b40565, 0x96f7, 0x4435, 0x86, 0x94, 0x97, 0xe0, 0xe4, 0x39, 0x59, 0x05); - -DEFINE_GUID(BATTERY_CYCLE_COUNT_WMI_GUID, - 0xef98db24, 0x0014, 0x4c25, 0xa5, 0x0b, 0xc7, 0x24, 0xae, 0x5c, 0xd3, 0x71); - -DEFINE_GUID(BATTERY_STATIC_DATA_WMI_GUID, - 0x05e1e463, 0xe4e2, 0x4ea9, 0x80, 0xcb, 0x9b, 0xd4, 0xb3, 0xca, 0x06, 0x55); - -DEFINE_GUID(BATTERY_STATUS_CHANGE_WMI_GUID, - 0xcddfa0c3, 0x7c5b, 0x4e43, 0xa0, 0x34, 0x05, 0x9f, 0xa5, 0xb8, 0x43, 0x64); - -DEFINE_GUID(BATTERY_TAG_CHANGE_WMI_GUID, - 0x5e1f6e19, 0x8786, 0x4d23, 0x94, 0xfc, 0x9e, 0x74, 0x6b, 0xd5, 0xd8, 0x88); - - -/* BATTERY_INFORMATION.Capabilities constants */ -#define BATTERY_SET_CHARGE_SUPPORTED 0x00000001 -#define BATTERY_SET_DISCHARGE_SUPPORTED 0x00000002 -#define BATTERY_SET_RESUME_SUPPORTED 0x00000004 -#define BATTERY_IS_SHORT_TERM 0x20000000 -#define BATTERY_CAPACITY_RELATIVE 0x40000000 -#define BATTERY_SYSTEM_BATTERY 0x80000000 - -typedef struct _BATTERY_INFORMATION { - ULONG Capabilities; - UCHAR Technology; - UCHAR Reserved[3]; - UCHAR Chemistry[4]; - ULONG DesignedCapacity; - ULONG FullChargedCapacity; - ULONG DefaultAlert1; - ULONG DefaultAlert2; - ULONG CriticalBias; - ULONG CycleCount; -} BATTERY_INFORMATION, *PBATTERY_INFORMATION; - -typedef struct _BATTERY_MANUFACTURE_DATE { - UCHAR Day; - UCHAR Month; - USHORT Year; -} BATTERY_MANUFACTURE_DATE, *PBATTERY_MANUFACTURE_DATE; - -typedef struct _BATTERY_NOTIFY { - ULONG PowerState; - ULONG LowCapacity; - ULONG HighCapacity; -} BATTERY_NOTIFY, *PBATTERY_NOTIFY; - -/* BATTERY_STATUS.PowerState flags */ -#define BATTERY_POWER_ON_LINE 0x00000001 -#define BATTERY_DISCHARGING 0x00000002 -#define BATTERY_CHARGING 0x00000004 -#define BATTERY_CRITICAL 0x00000008 - -/* BATTERY_STATUS.Voltage constant */ -#define BATTERY_UNKNOWN_VOLTAGE 0xFFFFFFFF - -/* BATTERY_STATUS.Rate constant */ -#define BATTERY_UNKNOWN_RATE 0x80000000 - -typedef struct _BATTERY_STATUS { - ULONG PowerState; - ULONG Capacity; - ULONG Voltage; - LONG Rate; -} BATTERY_STATUS, *PBATTERY_STATUS; - -/* BATTERY_INFORMATION.Capacity constants */ -#define BATTERY_UNKNOWN_CAPACITY 0xFFFFFFFF - -typedef enum _BATTERY_QUERY_INFORMATION_LEVEL { - BatteryInformation = 0, - BatteryGranularityInformation, - BatteryTemperature, - BatteryEstimatedTime, - BatteryDeviceName, - BatteryManufactureDate, - BatteryManufactureName, - BatteryUniqueID, - BatterySerialNumber -} BATTERY_QUERY_INFORMATION_LEVEL; - -/* BatteryEstimatedTime constant */ -#define BATTERY_UNKNOWN_TIME 0x80000000 - -/* NTSTATUS possibly returned by BCLASS_QUERY_STATUS */ -#define BATTERY_TAG_INVALID 0 - -typedef struct _BATTERY_QUERY_INFORMATION { - ULONG BatteryTag; - BATTERY_QUERY_INFORMATION_LEVEL InformationLevel; - LONG AtRate; -} BATTERY_QUERY_INFORMATION, *PBATTERY_QUERY_INFORMATION; - -typedef enum _BATTERY_SET_INFORMATION_LEVEL { - BatteryCriticalBias = 0, - BatteryCharge, - BatteryDischarge -} BATTERY_SET_INFORMATION_LEVEL; - -#define MAX_BATTERY_STRING_SIZE 128 - -typedef struct _BATTERY_SET_INFORMATION { - ULONG BatteryTag; - BATTERY_SET_INFORMATION_LEVEL InformationLevel; - UCHAR Buffer[1]; -} BATTERY_SET_INFORMATION, *PBATTERY_SET_INFORMATION; - -typedef struct _BATTERY_WAIT_STATUS { - ULONG BatteryTag; - ULONG Timeout; - ULONG PowerState; - ULONG LowCapacity; - ULONG HighCapacity; -} BATTERY_WAIT_STATUS, *PBATTERY_WAIT_STATUS; - - -#define IOCTL_BATTERY_QUERY_TAG \ - CTL_CODE(FILE_DEVICE_BATTERY, 0x10, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_BATTERY_QUERY_INFORMATION \ - CTL_CODE(FILE_DEVICE_BATTERY, 0x11, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_BATTERY_SET_INFORMATION \ - CTL_CODE(FILE_DEVICE_BATTERY, 0x12, METHOD_BUFFERED, FILE_WRITE_ACCESS) - -#define IOCTL_BATTERY_QUERY_STATUS \ - CTL_CODE(FILE_DEVICE_BATTERY, 0x13, METHOD_BUFFERED, FILE_READ_ACCESS) - - -typedef NTSTATUS -(DDKAPI*BCLASS_DISABLE_STATUS_NOTIFY)( - IN PVOID Context); - -typedef NTSTATUS -(DDKAPI*BCLASS_QUERY_INFORMATION)( - IN PVOID Context, - IN ULONG BatteryTag, - IN BATTERY_QUERY_INFORMATION_LEVEL Level, - IN LONG AtRate OPTIONAL, - OUT PVOID Buffer, - IN ULONG BufferLength, - OUT PULONG ReturnedLength); - -typedef NTSTATUS -(DDKAPI*BCLASS_QUERY_STATUS)( - IN PVOID Context, - IN ULONG BatteryTag, - OUT PBATTERY_STATUS BatteryStatus); - -typedef NTSTATUS -(DDKAPI*BCLASS_QUERY_TAG)( - IN PVOID Context, - OUT PULONG BatteryTag); - -typedef NTSTATUS -(DDKAPI*BCLASS_SET_INFORMATION)( - IN PVOID Context, - IN ULONG BatteryTag, - IN BATTERY_SET_INFORMATION_LEVEL Level, - IN PVOID Buffer OPTIONAL); - -typedef NTSTATUS -(DDKAPI*BCLASS_SET_STATUS_NOTIFY)( - IN PVOID Context, - IN ULONG BatteryTag, - IN PBATTERY_NOTIFY BatteryNotify); - - -typedef struct _BATTERY_MINIPORT_INFO { - USHORT MajorVersion; - USHORT MinorVersion; - PVOID Context; - BCLASS_QUERY_TAG QueryTag; - BCLASS_QUERY_INFORMATION QueryInformation; - BCLASS_SET_INFORMATION SetInformation; - BCLASS_QUERY_STATUS QueryStatus; - BCLASS_SET_STATUS_NOTIFY SetStatusNotify; - BCLASS_DISABLE_STATUS_NOTIFY DisableStatusNotify; - PDEVICE_OBJECT Pdo; - PUNICODE_STRING DeviceName; -} BATTERY_MINIPORT_INFO, *PBATTERY_MINIPORT_INFO; - -/* BATTERY_MINIPORT_INFO.XxxVersion */ -#define BATTERY_CLASS_MAJOR_VERSION 0x0001 -#define BATTERY_CLASS_MINOR_VERSION 0x0000 - - -BCLASSAPI -NTSTATUS -DDKAPI -BatteryClassInitializeDevice( - IN PBATTERY_MINIPORT_INFO MiniportInfo, - IN PVOID *ClassData); - -BCLASSAPI -NTSTATUS -DDKAPI -BatteryClassIoctl( - IN PVOID ClassData, - IN PIRP Irp); - -BCLASSAPI -NTSTATUS -DDKAPI -BatteryClassQueryWmiDataBlock( - IN PVOID ClassData, - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN ULONG GuidIndex, - IN OUT PULONG InstanceLengthArray, - IN ULONG OutBufferSize, - OUT PUCHAR Buffer); - -BCLASSAPI -NTSTATUS -DDKAPI -BatteryClassStatusNotify( - IN PVOID ClassData); - -BCLASSAPI -NTSTATUS -DDKAPI -BatteryClassSystemControl( - IN PVOID ClassData, - IN PWMILIB_CONTEXT WmiLibContext, - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - OUT PSYSCTL_IRP_DISPOSITION Disposition); - -BCLASSAPI -NTSTATUS -DDKAPI -BatteryClassUnload( - IN PVOID ClassData); - -#ifdef __cplusplus -} -#endif - -#endif /* __BATCLASS_H */ Modified: trunk/reactos/include/ddk/ntpoapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntpoapi.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntpoapi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntpoapi.h [iso-8859-1] Thu Jan 15 11:22:28 2009 @@ -22,8 +22,6 @@ #ifndef __NTPOAPI_H #define __NTPOAPI_H - -#include "batclass.h" #ifdef __cplusplus extern "C" {

15 years, 8 months

[dchapyshev] 38772: - Move SetThreadExecutionState to power.c - Implement IsSystemResumeAutomatic - Implement SetThreadExecutionState

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Thu Jan 15 11:07:01 2009 New Revision: 38772 URL: http://svn.reactos.org/svn/reactos?rev=38772&view=rev Log: - Move SetThreadExecutionState to power.c - Implement IsSystemResumeAutomatic - Implement SetThreadExecutionState Modified: trunk/reactos/dll/win32/kernel32/misc/power.c trunk/reactos/dll/win32/kernel32/misc/stubs.c Modified: trunk/reactos/dll/win32/kernel32/misc/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/po… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/power.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/power.c [iso-8859-1] Thu Jan 15 11:07:01 2009 @@ -34,6 +34,19 @@ IN LATENCY_TIME latency ); +NTSYSAPI +BOOLEAN +NTAPI +NtIsSystemResumeAutomatic(VOID); + +NTSYSAPI +NTSTATUS +NTAPI +NtSetThreadExecutionState( + IN EXECUTION_STATE esFlags, + OUT EXECUTION_STATE *PreviousFlags +); + /* PUBLIC FUNCTIONS ***********************************************************/ /* @@ -181,8 +194,7 @@ WINAPI IsSystemResumeAutomatic(VOID) { - STUB; - return 0; + return NtIsSystemResumeAutomatic(); } /* @@ -196,3 +208,24 @@ STUB; return 0; } + +/* + * @implemented + */ +EXECUTION_STATE +WINAPI +SetThreadExecutionState(EXECUTION_STATE esFlags) +{ + EXECUTION_STATE OldFlags; + NTSTATUS Status; + + Status = NtSetThreadExecutionState(esFlags, &OldFlags); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return 0; + } + + return OldFlags; +} Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Thu Jan 15 11:07:01 2009 @@ -559,26 +559,6 @@ ) { STUB; -} - -/* - * @unimplemented - */ -EXECUTION_STATE -WINAPI -SetThreadExecutionState( - EXECUTION_STATE esFlags - ) -{ - static EXECUTION_STATE current = - ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_USER_PRESENT; - EXECUTION_STATE old = current; - - DPRINT1("(0x%x): stub, harmless.\n", esFlags); - - if (!(current & ES_CONTINUOUS) || (esFlags & ES_CONTINUOUS)) - current = esFlags; - return old; } /*

15 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009