Ros-diffs January 2013

ros-diffs@reactos.org

11 participants
185 discussions

[akhaldi] 58207: [LIB/ATL] * Fix a typo. * Remove a redundant assign.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 23 19:09:52 2013 New Revision: 58207 URL: http://svn.reactos.org/svn/reactos?rev=58207&view=rev Log: [LIB/ATL] * Fix a typo. * Remove a redundant assign. Modified: trunk/reactos/lib/atl/statreg.h Modified: trunk/reactos/lib/atl/statreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/statreg.h?rev=5820… ============================================================================== --- trunk/reactos/lib/atl/statreg.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/statreg.h [iso-8859-1] Wed Jan 23 19:09:52 2013 @@ -173,7 +173,7 @@ HRESULT STDMETHODCALLTYPE ResourceUnregister(LPCOLESTR resFileName, UINT nID, LPCOLESTR szType) { - return ResourceRegisterSz(resFileName, MAKEINTRESOURCEW(nID), szType); + return ResourceUnregisterSz(resFileName, MAKEINTRESOURCEW(nID), szType); } protected: @@ -505,7 +505,6 @@ iter = *pstr; hkey = NULL; - iter = *pstr; hres = get_word(&iter, buf); if (FAILED(hres)) return hres;

11 years, 8 months

[dgorbachev] 58206: Fix MSVC build.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Tue Jan 22 23:50:02 2013 New Revision: 58206 URL: http://svn.reactos.org/svn/reactos?rev=58206&view=rev Log: Fix MSVC build. Modified: trunk/reactos/base/applications/wordpad/He.rc Modified: trunk/reactos/base/applications/wordpad/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/He.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/He.rc [iso-8859-1] Tue Jan 22 23:50:02 2013 @@ -19,6 +19,9 @@ */ #include "wordpad.h" + +/* UTF-8 */ +#pragma code_page(65001) LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT @@ -263,12 +266,3 @@ STRING_PRINTING_NOT_IMPLEMENTED, "Printing not implemented" STRING_MAX_TAB_STOPS, "Cannot add more than 32 tab stops." END - -LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT - -STRINGTABLE -BEGIN - STRING_ALIGN_LEFT, "×©×××" - STRING_ALIGN_RIGHT, "××××" - STRING_ALIGN_CENTER, "××¨××" -END

11 years, 8 months

[hbelusca] 58205: [CONSRV] - Start to uniformize some helpers' names : ConioLockConsole --> ConioGetConsole and ConioUnlockConsole --> ConioReleaseConsole ConioLockInputBuffer --> ConioGetInputBuff...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Jan 22 23:28:51 2013 New Revision: 58205 URL: http://svn.reactos.org/svn/reactos?rev=58205&view=rev Log: [CONSRV] - Start to uniformize some helpers' names : ConioLockConsole --> ConioGetConsole and ConioUnlockConsole --> ConioReleaseConsole ConioLockInputBuffer --> ConioGetInputBuffer and ConioUnlockInputBuffer --> ConioReleaseInputBuffer ConioLockScreenBuffer --> ConioGetScreenBuffer and ConioUnlockScreenBuffer --> ConioReleaseScreenBuffer but the overall naming must be revamped. - Add them a boolean parameter to determine whether or not we should lock the console. It is useful to not lock an already locked console when input / output waiting threads are called, because these are called from functions which lock the console. - In the GUI console window message loop, after retrieving a pointer to the corresponding console, lock it before calling funtions in the message dispatcher (and unlock the console at the end). - Use PostMessage instead of SendMessage for "sending" GUI messages to console windows, to avoid possible deadlocks (because of console locking). - Add temporary /// LOCK /// comments to easily localize where I deactivated extra console (un)locking code (this remains to be analyzed further). Modified: branches/ros-csrss/win32ss/user/consrv/alias.c branches/ros-csrss/win32ss/user/consrv/coninput.c branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/consrv.h branches/ros-csrss/win32ss/user/consrv/guiconsole.c branches/ros-csrss/win32ss/user/consrv/handle.c branches/ros-csrss/win32ss/user/consrv/lineinput.c Modified: branches/ros-csrss/win32ss/user/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/a… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/alias.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/alias.c [iso-8859-1] Tue Jan 22 23:28:51 2013 @@ -324,7 +324,7 @@ return STATUS_INVALID_PARAMETER; } - ApiMessage->Status = ConioLockConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); + ApiMessage->Status = ConioGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(ApiMessage->Status)) { return ApiMessage->Status; @@ -336,7 +336,7 @@ Header = IntCreateAliasHeader(lpExeName); if (!Header) { - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_INSUFFICIENT_RESOURCES; } IntInsertAliasHeader(&Console->Aliases, Header); @@ -354,7 +354,7 @@ { ApiMessage->Status = STATUS_INVALID_PARAMETER; } - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return ApiMessage->Status; } @@ -362,12 +362,12 @@ if (!Entry) { - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_INSUFFICIENT_RESOURCES; } IntInsertAliasEntry(Header, Entry); - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_SUCCESS; } @@ -411,7 +411,7 @@ return STATUS_INVALID_PARAMETER; } - ApiMessage->Status = ConioLockConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); + ApiMessage->Status = ConioGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(ApiMessage->Status)) { return ApiMessage->Status; @@ -420,27 +420,27 @@ Header = IntFindAliasHeader(Console->Aliases, lpExeName); if (!Header) { - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_INVALID_PARAMETER; } Entry = IntGetAliasEntry(Header, lpSource); if (!Entry) { - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_INVALID_PARAMETER; } Length = (wcslen(Entry->lpTarget) + 1) * sizeof(WCHAR); if (Length > ConsoleAliasRequest->TargetLength) { - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_BUFFER_TOO_SMALL; } wcscpy(lpTarget, Entry->lpTarget); ConsoleAliasRequest->TargetLength = Length; - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_SUCCESS; } @@ -468,7 +468,7 @@ return STATUS_INVALID_PARAMETER; } - ApiMessage->Status = ConioLockConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); + ApiMessage->Status = ConioGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(ApiMessage->Status)) { return ApiMessage->Status; @@ -477,13 +477,13 @@ Header = IntFindAliasHeader(Console->Aliases, GetAllAliasesRequest->ExeName); if (!Header) { - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_INVALID_PARAMETER; } if (IntGetAllConsoleAliasesLength(Header) > GetAllAliasesRequest->AliasesBufferLength) { - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_BUFFER_OVERFLOW; } @@ -492,7 +492,7 @@ GetAllAliasesRequest->AliasesBufferLength); GetAllAliasesRequest->AliasesBufferLength = BytesWritten; - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_SUCCESS; } @@ -516,7 +516,7 @@ return STATUS_INVALID_PARAMETER; } - ApiMessage->Status = ConioLockConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); + ApiMessage->Status = ConioGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(ApiMessage->Status)) { return ApiMessage->Status; @@ -525,13 +525,13 @@ Header = IntFindAliasHeader(Console->Aliases, GetAllAliasesLengthRequest->ExeName); if (!Header) { - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_INVALID_PARAMETER; } Length = IntGetAllConsoleAliasesLength(Header); GetAllAliasesLengthRequest->Length = Length; - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_SUCCESS; } @@ -552,7 +552,7 @@ return STATUS_INVALID_PARAMETER; } - ApiMessage->Status = ConioLockConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); + ApiMessage->Status = ConioGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(ApiMessage->Status)) { return ApiMessage->Status; @@ -562,13 +562,13 @@ if (ExesLength > GetAliasesExesRequest->Length) { - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_BUFFER_OVERFLOW; } if (GetAliasesExesRequest->ExeNames == NULL) { - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_INVALID_PARAMETER; } @@ -577,7 +577,7 @@ GetAliasesExesRequest->Length); GetAliasesExesRequest->Length = BytesWritten; - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_SUCCESS; } @@ -587,11 +587,11 @@ PCONSOLE Console; DPRINT("SrvGetConsoleAliasExesLength entered\n"); - ApiMessage->Status = ConioLockConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); + ApiMessage->Status = ConioGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (NT_SUCCESS(ApiMessage->Status)) { GetAliasesExesLengthRequest->Length = IntGetConsoleAliasesExesLength(Console->Aliases); - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); } return ApiMessage->Status; } Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] Tue Jan 22 23:28:51 2013 @@ -639,12 +639,12 @@ return STATUS_INVALID_PARAMETER; } - Status = ConioLockInputBuffer(ProcessData, GetInputRequest->InputHandle, &InputBuffer, GENERIC_READ); + GetInputRequest->InputsRead = 0; + + Status = ConioGetInputBuffer(ProcessData, GetInputRequest->InputHandle, &InputBuffer, GENERIC_READ, TRUE); if(!NT_SUCCESS(Status)) return Status; - GetInputRequest->InputsRead = 0; - - InputInfo.ProcessData = ProcessData; // ConsoleGetPerProcessData(CsrGetClientThread()->Process); + InputInfo.ProcessData = ProcessData; InputInfo.Console = InputBuffer->Header.Console; Status = ReadInputBuffer(&InputInfo, @@ -652,7 +652,7 @@ ApiMessage, TRUE); - ConioUnlockInputBuffer(InputBuffer); + ConioReleaseInputBuffer(InputBuffer, TRUE); if (Status == STATUS_PENDING) *ReplyCode = CsrReplyPending; @@ -681,7 +681,7 @@ return STATUS_INVALID_PARAMETER; } - Status = ConioLockInputBuffer(ProcessData, WriteInputRequest->InputHandle, &InputBuffer, GENERIC_WRITE); + Status = ConioGetInputBuffer(ProcessData, WriteInputRequest->InputHandle, &InputBuffer, GENERIC_WRITE, TRUE); if (!NT_SUCCESS(Status)) return Status; Console = InputBuffer->Header.Console; @@ -702,7 +702,7 @@ Status = ConioProcessChar(Console, InputRecord++); } - ConioUnlockInputBuffer(InputBuffer); + ConioReleaseInputBuffer(InputBuffer, TRUE); WriteInputRequest->Length = i; @@ -733,7 +733,7 @@ return STATUS_INVALID_PARAMETER; } - Status = ConioLockInputBuffer(ProcessData, ReadConsoleRequest->InputHandle, &InputBuffer, GENERIC_READ); + Status = ConioGetInputBuffer(ProcessData, ReadConsoleRequest->InputHandle, &InputBuffer, GENERIC_READ, TRUE); if (!NT_SUCCESS(Status)) return Status; ReadConsoleRequest->NrCharactersRead = 0; @@ -745,7 +745,7 @@ ApiMessage, TRUE); - ConioUnlockInputBuffer(InputBuffer); + ConioReleaseInputBuffer(InputBuffer, TRUE); if (Status == STATUS_PENDING) *ReplyCode = CsrReplyPending; @@ -763,10 +763,11 @@ DPRINT("SrvFlushConsoleInputBuffer\n"); - Status = ConioLockInputBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), - FlushInputBufferRequest->InputHandle, - &InputBuffer, - GENERIC_WRITE); + Status = ConioGetInputBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + FlushInputBufferRequest->InputHandle, + &InputBuffer, + GENERIC_WRITE, + TRUE); if(!NT_SUCCESS(Status)) return Status; /* Discard all entries in the input event queue */ @@ -779,7 +780,7 @@ } ResetEvent(InputBuffer->ActiveEvent); - ConioUnlockInputBuffer(InputBuffer); + ConioReleaseInputBuffer(InputBuffer, TRUE); return STATUS_SUCCESS; } @@ -794,7 +795,7 @@ DPRINT("SrvGetConsoleNumberOfInputEvents\n"); - Status = ConioLockInputBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), GetNumInputEventsRequest->InputHandle, &InputBuffer, GENERIC_READ); + Status = ConioGetInputBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), GetNumInputEventsRequest->InputHandle, &InputBuffer, GENERIC_READ, TRUE); if (!NT_SUCCESS(Status)) return Status; CurrentInput = InputBuffer->InputEvents.Flink; @@ -807,7 +808,7 @@ NumEvents++; } - ConioUnlockInputBuffer(InputBuffer); + ConioReleaseInputBuffer(InputBuffer, TRUE); GetNumInputEventsRequest->NumInputEvents = NumEvents; Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] Tue Jan 22 23:28:51 2013 @@ -169,10 +169,10 @@ #define ConioResizeBuffer(Console, Buff, Size) (Console)->Vtbl->ResizeBuffer((Console), (Buff), (Size)) /* console.c */ -#define ConioLockConsole(ProcessData, Console) \ - ConioConsoleFromProcessData((ProcessData), (Console)) -#define ConioUnlockConsole(Console) \ - Win32CsrUnlockConsole(Console) +#define ConioGetConsole(ProcessData, Console, LockConsole) \ + ConioConsoleFromProcessData((ProcessData), (Console), (LockConsole)) +#define ConioReleaseConsole(Console, ConsoleLocked) \ + Win32CsrUnlockConsole((Console), (ConsoleLocked)) VOID WINAPI ConioDeleteConsole(PCONSOLE Console); VOID WINAPI CsrInitConsoleSupport(VOID); NTSTATUS WINAPI CsrInitConsole(PCONSOLE* NewConsole, int ShowCmd, PCSR_PROCESS ConsoleLeaderProcess); @@ -184,10 +184,10 @@ DWORD Timeout); /* coninput.c */ -#define ConioLockInputBuffer(ProcessData, Handle, Ptr, Access) \ - Win32CsrLockObject((ProcessData), (Handle), (Object_t **)(Ptr), (Access), CONIO_INPUT_BUFFER_MAGIC) -#define ConioUnlockInputBuffer(Buff) \ - Win32CsrUnlockObject(&(Buff)->Header) +#define ConioGetInputBuffer(ProcessData, Handle, Ptr, Access, LockConsole) \ + Win32CsrLockObject((ProcessData), (Handle), (Object_t **)(Ptr), (Access), (LockConsole), CONIO_INPUT_BUFFER_MAGIC) +#define ConioReleaseInputBuffer(Buff, IsConsoleLocked) \ + Win32CsrUnlockObject(&(Buff)->Header, (IsConsoleLocked)) void WINAPI ConioProcessKey(MSG *msg, PCONSOLE Console, BOOL TextMode); /* conoutput.c */ @@ -195,10 +195,10 @@ (((Rect)->Top) > ((Rect)->Bottom) ? 0 : ((Rect)->Bottom) - ((Rect)->Top) + 1) #define ConioRectWidth(Rect) \ (((Rect)->Left) > ((Rect)->Right) ? 0 : ((Rect)->Right) - ((Rect)->Left) + 1) -#define ConioLockScreenBuffer(ProcessData, Handle, Ptr, Access) \ - Win32CsrLockObject((ProcessData), (Handle), (Object_t **)(Ptr), (Access), CONIO_SCREEN_BUFFER_MAGIC) -#define ConioUnlockScreenBuffer(Buff) \ - Win32CsrUnlockObject(&(Buff)->Header) +#define ConioGetScreenBuffer(ProcessData, Handle, Ptr, Access, LockConsole) \ + Win32CsrLockObject((ProcessData), (Handle), (Object_t **)(Ptr), (Access), (LockConsole), CONIO_SCREEN_BUFFER_MAGIC) +#define ConioReleaseScreenBuffer(Buff, IsConsoleLocked) \ + Win32CsrUnlockObject(&(Buff)->Header, (IsConsoleLocked)) PBYTE FASTCALL ConioCoordToPointer(PCONSOLE_SCREEN_BUFFER Buf, ULONG X, ULONG Y); VOID FASTCALL ConioDrawConsole(PCONSOLE Console); NTSTATUS FASTCALL ConioWriteConsole(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff, Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] Tue Jan 22 23:28:51 2013 @@ -472,7 +472,7 @@ DWORD Written = 0; ULONG Length; - Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(ClientThread->Process), WriteConsoleRequest->OutputHandle, &Buff, GENERIC_WRITE); + Status = ConioGetScreenBuffer(ConsoleGetPerProcessData(ClientThread->Process), WriteConsoleRequest->OutputHandle, &Buff, GENERIC_WRITE, FALSE); if (!NT_SUCCESS(Status)) return Status; Console = Buff->Header.Console; @@ -490,7 +490,7 @@ NULL)) { /* Fail */ - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, FALSE); return STATUS_NO_MEMORY; } } @@ -500,7 +500,7 @@ } else { - if(WriteConsoleRequest->Unicode) + if (WriteConsoleRequest->Unicode) { Length = WideCharToMultiByte(Console->OutputCodePage, 0, (PWCHAR)WriteConsoleRequest->Buffer, @@ -544,7 +544,7 @@ WriteConsoleRequest->NrCharactersWritten = Written; } - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, FALSE); return Status; } @@ -584,7 +584,7 @@ return STATUS_INVALID_PARAMETER; } - Status = ConioLockScreenBuffer(ProcessData, ReadOutputRequest->OutputHandle, &Buff, GENERIC_READ); + Status = ConioGetScreenBuffer(ProcessData, ReadOutputRequest->OutputHandle, &Buff, GENERIC_READ, TRUE); if (!NT_SUCCESS(Status)) return Status; /* FIXME: Is this correct? */ @@ -598,7 +598,7 @@ ConioInitRect(&ScreenRect, 0, 0, Buff->MaxY, Buff->MaxX); if (!ConioGetIntersection(&ReadRegion, &ScreenRect, &ReadRegion)) { - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); return STATUS_SUCCESS; } @@ -625,7 +625,7 @@ } } - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); ReadOutputRequest->ReadRegion.Right = ReadRegion.Left + SizeX - 1; ReadOutputRequest->ReadRegion.Bottom = ReadRegion.Top + SizeY - 1; @@ -690,10 +690,11 @@ return STATUS_INVALID_PARAMETER; } - Status = ConioLockScreenBuffer(ProcessData, - WriteOutputRequest->OutputHandle, - &Buff, - GENERIC_WRITE); + Status = ConioGetScreenBuffer(ProcessData, + WriteOutputRequest->OutputHandle, + &Buff, + GENERIC_WRITE, + TRUE); if (!NT_SUCCESS(Status)) return Status; Console = Buff->Header.Console; @@ -709,7 +710,7 @@ ConioInitRect(&ScreenBuffer, 0, 0, Buff->MaxY - 1, Buff->MaxX - 1); if (!ConioGetIntersection(&WriteRegion, &ScreenBuffer, &WriteRegion)) { - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); /* It is okay to have a WriteRegion completely outside the screen buffer. No data is written then. */ @@ -739,7 +740,7 @@ ConioDrawRegion(Console, &WriteRegion); - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); WriteOutputRequest->WriteRegion.Right = WriteRegion.Left + SizeX - 1; WriteOutputRequest->WriteRegion.Bottom = WriteRegion.Top + SizeY - 1; @@ -791,7 +792,7 @@ return STATUS_INVALID_PARAMETER; } - Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), ReadOutputCodeRequest->OutputHandle, &Buff, GENERIC_READ); + Status = ConioGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), ReadOutputCodeRequest->OutputHandle, &Buff, GENERIC_READ, TRUE); if (!NT_SUCCESS(Status)) return Status; Console = Buff->Header.Console; @@ -865,7 +866,7 @@ ReadOutputCodeRequest->EndCoord.X = Xpos; ReadOutputCodeRequest->EndCoord.Y = (Ypos - Buff->VirtualY + Buff->MaxY) % Buff->MaxY; - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); ReadOutputCodeRequest->CodesRead = (DWORD)((ULONG_PTR)ReadBuffer - (ULONG_PTR)ReadOutputCodeRequest->pCode.pCode) / CodeSize; // <= ReadOutputCodeRequest->NumCodesToRead @@ -915,10 +916,11 @@ return STATUS_INVALID_PARAMETER; } - Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), - WriteOutputCodeRequest->OutputHandle, - &Buff, - GENERIC_WRITE); + Status = ConioGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + WriteOutputCodeRequest->OutputHandle, + &Buff, + GENERIC_WRITE, + TRUE); if (!NT_SUCCESS(Status)) return Status; Console = Buff->Header.Console; @@ -999,7 +1001,7 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, tmpString); } - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); // WriteOutputCodeRequest->NrCharactersWritten = Written; return Status; @@ -1019,7 +1021,7 @@ DPRINT("SrvFillConsoleOutput\n"); - Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), FillOutputRequest->OutputHandle, &Buff, GENERIC_WRITE); + Status = ConioGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), FillOutputRequest->OutputHandle, &Buff, GENERIC_WRITE, TRUE); if (!NT_SUCCESS(Status)) return Status; Console = Buff->Header.Console; @@ -1046,7 +1048,7 @@ break; default: - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); return STATUS_INVALID_PARAMETER; } @@ -1073,7 +1075,7 @@ ConioDrawRegion(Console, &UpdateRect); } - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); /* Length = FillOutputRequest->Length; FillOutputRequest->NrCharactersWritten = Length; @@ -1089,12 +1091,12 @@ DPRINT("SrvGetConsoleCursorInfo\n"); - Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), CursorInfoRequest->OutputHandle, &Buff, GENERIC_READ); + Status = ConioGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), CursorInfoRequest->OutputHandle, &Buff, GENERIC_READ, TRUE); if (!NT_SUCCESS(Status)) return Status; CursorInfoRequest->Info.bVisible = Buff->CursorInfo.bVisible; CursorInfoRequest->Info.dwSize = Buff->CursorInfo.dwSize; - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); return STATUS_SUCCESS; } @@ -1110,7 +1112,7 @@ DPRINT("SrvSetConsoleCursorInfo\n"); - Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), CursorInfoRequest->OutputHandle, &Buff, GENERIC_WRITE); + Status = ConioGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), CursorInfoRequest->OutputHandle, &Buff, GENERIC_WRITE, TRUE); if (!NT_SUCCESS(Status)) return Status; Console = Buff->Header.Console; @@ -1135,12 +1137,12 @@ if (!ConioSetCursorInfo(Console, Buff)) { - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); return STATUS_UNSUCCESSFUL; } } - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); return STATUS_SUCCESS; } @@ -1156,7 +1158,7 @@ DPRINT("SrvSetConsoleCursorPosition\n"); - Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetCursorPositionRequest->OutputHandle, &Buff, GENERIC_WRITE); + Status = ConioGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetCursorPositionRequest->OutputHandle, &Buff, GENERIC_WRITE, TRUE); if (!NT_SUCCESS(Status)) return Status; Console = Buff->Header.Console; @@ -1166,7 +1168,7 @@ if ( NewCursorX < 0 || NewCursorX >= Buff->MaxX || NewCursorY < 0 || NewCursorY >= Buff->MaxY ) { - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); return STATUS_INVALID_PARAMETER; } OldCursorX = Buff->CurrentX; @@ -1175,14 +1177,14 @@ Buff->CurrentY = NewCursorY; if (Buff == Console->ActiveBuffer) { - if (! ConioSetScreenInfo(Console, Buff, OldCursorX, OldCursorY)) - { - ConioUnlockScreenBuffer(Buff); + if (!ConioSetScreenInfo(Console, Buff, OldCursorX, OldCursorY)) + { + ConioReleaseScreenBuffer(Buff, TRUE); return STATUS_UNSUCCESSFUL; } } - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); return STATUS_SUCCESS; } @@ -1196,7 +1198,7 @@ DPRINT("SrvSetConsoleTextAttribute\n"); - Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetTextAttribRequest->OutputHandle, &Buff, GENERIC_WRITE); + Status = ConioGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetTextAttribRequest->OutputHandle, &Buff, GENERIC_WRITE, TRUE); if (!NT_SUCCESS(Status)) return Status; Console = Buff->Header.Console; @@ -1206,12 +1208,12 @@ { if (!ConioUpdateScreenInfo(Console, Buff)) { - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); return STATUS_UNSUCCESSFUL; } } - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); return STATUS_SUCCESS; } @@ -1228,7 +1230,7 @@ RtlEnterCriticalSection(&ProcessData->HandleTableLock); - Status = ConioLockConsole(ProcessData, &Console); + Status = ConioGetConsole(ProcessData, &Console, TRUE); if (!NT_SUCCESS(Status)) { RtlLeaveCriticalSection(&ProcessData->HandleTableLock); @@ -1277,7 +1279,7 @@ Status = STATUS_INSUFFICIENT_RESOURCES; } - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); RtlLeaveCriticalSection(&ProcessData->HandleTableLock); @@ -1294,7 +1296,7 @@ DPRINT("SrvGetConsoleScreenBufferInfo\n"); - Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), ScreenBufferInfoRequest->OutputHandle, &Buff, GENERIC_READ); + Status = ConioGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), ScreenBufferInfoRequest->OutputHandle, &Buff, GENERIC_READ, TRUE); if (!NT_SUCCESS(Status)) return Status; Console = Buff->Header.Console; @@ -1311,7 +1313,7 @@ pInfo->dwMaximumWindowSize.X = Buff->MaxX; pInfo->dwMaximumWindowSize.Y = Buff->MaxY; - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); return STATUS_SUCCESS; } @@ -1325,14 +1327,14 @@ DPRINT("SrvSetConsoleActiveScreenBuffer\n"); - Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetScreenBufferRequest->OutputHandle, &Buff, GENERIC_WRITE); + Status = ConioGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetScreenBufferRequest->OutputHandle, &Buff, GENERIC_WRITE, TRUE); if (!NT_SUCCESS(Status)) return Status; Console = Buff->Header.Console; if (Buff == Console->ActiveBuffer) { - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); return STATUS_SUCCESS; } @@ -1348,7 +1350,7 @@ /* Redraw the console */ ConioDrawConsole(Console); - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); return STATUS_SUCCESS; } @@ -1378,7 +1380,7 @@ DestinationOrigin = ScrollScreenBufferRequest->DestinationOrigin; Fill = ScrollScreenBufferRequest->Fill; - Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), OutputHandle, &Buff, GENERIC_WRITE); + Status = ConioGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), OutputHandle, &Buff, GENERIC_WRITE, TRUE); if (!NT_SUCCESS(Status)) return Status; Console = Buff->Header.Console; @@ -1387,9 +1389,9 @@ /* Make sure source rectangle is inside the screen buffer */ ConioInitRect(&ScreenBuffer, 0, 0, Buff->MaxY - 1, Buff->MaxX - 1); - if (! ConioGetIntersection(&SrcRegion, &ScreenBuffer, &ScrollRectangle)) - { - ConioUnlockScreenBuffer(Buff); + if (!ConioGetIntersection(&SrcRegion, &ScreenBuffer, &ScrollRectangle)) + { + ConioReleaseScreenBuffer(Buff, TRUE); return STATUS_SUCCESS; } @@ -1408,7 +1410,7 @@ ClipRectangle = ScrollScreenBufferRequest->ClipRectangle; if (!ConioGetIntersection(&ClipRectangle, &ClipRectangle, &ScreenBuffer)) { - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); return STATUS_SUCCESS; } } @@ -1440,7 +1442,7 @@ } } - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); return STATUS_SUCCESS; } @@ -1451,11 +1453,11 @@ PCONSOLE_SETSCREENBUFFERSIZE SetScreenBufferSizeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetScreenBufferSizeRequest; PCONSOLE_SCREEN_BUFFER Buff; - Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetScreenBufferSizeRequest->OutputHandle, &Buff, GENERIC_WRITE); + Status = ConioGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetScreenBufferSizeRequest->OutputHandle, &Buff, GENERIC_WRITE, TRUE); if (!NT_SUCCESS(Status)) return Status; Status = ConioResizeBuffer(Buff->Header.Console, Buff, SetScreenBufferSizeRequest->Size); - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); return Status; } Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Tue Jan 22 23:28:51 2013 @@ -581,7 +581,7 @@ Status = Win32CsrLockObject(ConsoleGetPerProcessData(CsrGetClientThread()->Process), ConsoleModeRequest->ConsoleHandle, - &Object, GENERIC_WRITE, 0); + &Object, GENERIC_WRITE, TRUE, 0); if (!NT_SUCCESS(Status)) return Status; Status = STATUS_SUCCESS; @@ -601,7 +601,7 @@ Status = STATUS_INVALID_HANDLE; } - Win32CsrUnlockObject(Object); + Win32CsrUnlockObject(Object, TRUE); return Status; } @@ -616,7 +616,7 @@ Status = Win32CsrLockObject(ConsoleGetPerProcessData(CsrGetClientThread()->Process), ConsoleModeRequest->ConsoleHandle, - &Object, GENERIC_READ, 0); + &Object, GENERIC_READ, TRUE, 0); if (!NT_SUCCESS(Status)) return Status; Status = STATUS_SUCCESS; @@ -636,7 +636,7 @@ Status = STATUS_INVALID_HANDLE; } - Win32CsrUnlockObject(Object); + Win32CsrUnlockObject(Object, TRUE); return Status; } @@ -659,7 +659,7 @@ return STATUS_INVALID_PARAMETER; } - Status = ConioLockConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); + Status = ConioGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if(NT_SUCCESS(Status)) { Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, TitleRequest->Length); @@ -685,7 +685,7 @@ Status = STATUS_NO_MEMORY; } - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); } return Status; @@ -709,7 +709,7 @@ return STATUS_INVALID_PARAMETER; } - Status = ConioLockConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); + Status = ConioGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) { DPRINT1("Can't get console\n"); @@ -726,7 +726,7 @@ TitleRequest->Length = Console->Title.Length; - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_SUCCESS; } @@ -774,10 +774,11 @@ DPRINT("SrvGetConsoleHardwareState\n"); - Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), - HardwareStateRequest->OutputHandle, - &Buff, - GENERIC_READ); + Status = ConioGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + HardwareStateRequest->OutputHandle, + &Buff, + GENERIC_READ, + TRUE); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to get console handle in SrvGetConsoleHardwareState\n"); @@ -787,7 +788,7 @@ Console = Buff->Header.Console; HardwareStateRequest->State = Console->HardwareState; - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); return Status; } @@ -801,10 +802,11 @@ DPRINT("SrvSetConsoleHardwareState\n"); - Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), - HardwareStateRequest->OutputHandle, - &Buff, - GENERIC_READ); + Status = ConioGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + HardwareStateRequest->OutputHandle, + &Buff, + GENERIC_READ, + TRUE); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to get console handle in SrvSetConsoleHardwareState\n"); @@ -815,7 +817,7 @@ Console = Buff->Header.Console; Status = SetConsoleHardwareState(Console, HardwareStateRequest->State); - ConioUnlockScreenBuffer(Buff); + ConioReleaseScreenBuffer(Buff, TRUE); return Status; } @@ -828,11 +830,11 @@ DPRINT("SrvGetConsoleWindow\n"); - Status = ConioLockConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); + Status = ConioGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; GetWindowRequest->WindowHandle = Console->hWindow; - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_SUCCESS; } @@ -845,14 +847,14 @@ DPRINT("SrvSetConsoleIcon\n"); - Status = ConioLockConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); + Status = ConioGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; Status = (ConioChangeIcon(Console, SetIconRequest->WindowIcon) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return Status; } @@ -866,12 +868,12 @@ DPRINT("SrvGetConsoleCP, getting %s Code Page\n", ConsoleCPRequest->InputCP ? "Input" : "Output"); - Status = ConioLockConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); + Status = ConioGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; ConsoleCPRequest->CodePage = (ConsoleCPRequest->InputCP ? Console->CodePage : Console->OutputCodePage); - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_SUCCESS; } @@ -884,7 +886,7 @@ DPRINT("SrvSetConsoleCP, setting %s Code Page\n", ConsoleCPRequest->InputCP ? "Input" : "Output"); - Status = ConioLockConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); + Status = ConioGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; if (IsValidCodePage(ConsoleCPRequest->CodePage)) @@ -894,11 +896,11 @@ else Console->OutputCodePage = ConsoleCPRequest->CodePage; - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_SUCCESS; } - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return STATUS_INVALID_PARAMETER; } @@ -925,7 +927,7 @@ Buffer = GetProcessListRequest->pProcessIds; - Status = ConioLockConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); + Status = ConioGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; for (current_entry = Console->ProcessList.Flink; @@ -939,7 +941,7 @@ } } - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); GetProcessListRequest->nProcessIdsTotal = nItems; return STATUS_SUCCESS; @@ -954,7 +956,7 @@ PLIST_ENTRY current_entry; DWORD Group; - Status = ConioLockConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); + Status = ConioGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; Group = GenerateCtrlEventRequest->ProcessGroup; @@ -971,7 +973,7 @@ } } - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); return Status; } @@ -982,13 +984,13 @@ PCONSOLE_GETSELECTIONINFO GetSelectionInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetSelectionInfoRequest; PCONSOLE Console; - Status = ConioLockConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); + Status = ConioGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (NT_SUCCESS(Status)) { memset(&GetSelectionInfoRequest->Info, 0, sizeof(CONSOLE_SELECTION_INFO)); if (Console->Selection.dwFlags != 0) GetSelectionInfoRequest->Info = Console->Selection; - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); } return Status; Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] Tue Jan 22 23:28:51 2013 @@ -157,9 +157,12 @@ HANDLE Handle, Object_t **Object, DWORD Access, + BOOL LockConsole, ULONG Type); -VOID FASTCALL Win32CsrUnlockObject(Object_t *Object); -VOID FASTCALL Win32CsrUnlockConsole(struct _CONSOLE* Console); +VOID FASTCALL Win32CsrUnlockObject(Object_t *Object, + BOOL IsConsoleLocked); +VOID FASTCALL Win32CsrUnlockConsole(struct _CONSOLE* Console, + BOOL IsConsoleLocked); NTSTATUS FASTCALL Win32CsrReleaseObject(PCONSOLE_PROCESS_DATA ProcessData, HANDLE Handle); @@ -171,7 +174,8 @@ PCSR_PROCESS CsrProcess); VOID FASTCALL Win32CsrReleaseConsole(PCONSOLE_PROCESS_DATA ProcessData); NTSTATUS FASTCALL ConioConsoleFromProcessData(PCONSOLE_PROCESS_DATA ProcessData, - struct _CONSOLE** Console); + struct _CONSOLE** Console, + BOOL LockConsole); NTSTATUS NTAPI ConsoleNewProcess(PCSR_PROCESS SourceProcess, PCSR_PROCESS TargetProcess); Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] Tue Jan 22 23:28:51 2013 @@ -900,7 +900,7 @@ Buff = Console->ActiveBuffer; - EnterCriticalSection(&Buff->Header.Console->Lock); + /// LOCK /// EnterCriticalSection(&Buff->Header.Console->Lock); TopLine = rc->top / GuiData->CharHeight + Buff->ShowY; BottomLine = (rc->bottom + (GuiData->CharHeight - 1)) / GuiData->CharHeight - 1 + Buff->ShowY; @@ -995,7 +995,7 @@ } } - LeaveCriticalSection(&Buff->Header.Console->Lock); + /// LOCK /// LeaveCriticalSection(&Buff->Header.Console->Lock); SelectObject(hDC, OldFont); @@ -1274,7 +1274,7 @@ PLIST_ENTRY current_entry; PCONSOLE_PROCESS_DATA current; - EnterCriticalSection(&Console->Lock); + /// LOCK /// EnterCriticalSection(&Console->Lock); current_entry = Console->ProcessList.Flink; while (current_entry != &Console->ProcessList) @@ -1288,7 +1288,7 @@ ConioConsoleCtrlEvent(CTRL_CLOSE_EVENT, current); } - LeaveCriticalSection(&Console->Lock); + /// LOCK /// LeaveCriticalSection(&Console->Lock); } static VOID @@ -1792,7 +1792,7 @@ #endif } - (void)InterlockedExchangePointer((PVOID volatile *)&ScreenBuffer->Buffer, Buffer); + (void)InterlockedExchangePointer((PVOID volatile*)&ScreenBuffer->Buffer, Buffer); RtlFreeHeap(ConSrvHeap, 0, OldBuffer); ScreenBuffer->MaxX = Size.X; ScreenBuffer->MaxY = Size.Y; @@ -1809,7 +1809,7 @@ ScreenBuffer->ShowY = Size.Y - Console->Size.Y; /* TODO: Should update scrollbar, but can't use anything that - * calls SendMessage or it could cause deadlock */ + * calls SendMessage or it could cause deadlock --> Use PostMessage */ return STATUS_SUCCESS; } @@ -1824,7 +1824,7 @@ COORD BufSize; BOOL SizeChanged = FALSE; - EnterCriticalSection(&Console->Lock); + /// LOCK /// EnterCriticalSection(&Console->Lock); /* apply text / background color */ GuiData->ScreenText = pConInfo->ScreenText; @@ -1859,7 +1859,7 @@ GuiData->WindowSizeLock = FALSE; } - LeaveCriticalSection(&Console->Lock); + /// LOCK /// LeaveCriticalSection(&Console->Lock); InvalidateRect(pConInfo->hConsoleWindow, NULL, TRUE); } @@ -1994,9 +1994,20 @@ Console = GuiGetWindowConsole(hWnd); if (Console == NULL) return 0; + /* Lock the console */ + EnterCriticalSection(&Console->Lock); + /* We have a console, start message dispatching. */ switch (msg) { + case WM_CLOSE: + GuiConsoleHandleClose(Console, hWnd); + break; + + case WM_NCDESTROY: + GuiConsoleHandleNcDestroy(Console, hWnd); + break; + case WM_PAINT: GuiConsoleHandlePaint(Console, hWnd, (HDC)wParam); break; @@ -2013,14 +2024,6 @@ GuiConsoleHandleTimer(Console, hWnd); break; - case WM_CLOSE: - GuiConsoleHandleClose(Console, hWnd); - break; - - case WM_NCDESTROY: - GuiConsoleHandleNcDestroy(Console, hWnd); - break; - case WM_LBUTTONDOWN: GuiConsoleLeftMouseDown(Console, hWnd, lParam); break; @@ -2066,6 +2069,9 @@ Result = DefWindowProcW(hWnd, msg, wParam, lParam); break; } + + /* Unlock the console */ + LeaveCriticalSection(&Console->Lock); return Result; } @@ -2264,7 +2270,7 @@ Title = L""; } - SendMessageW(Console->hWindow, WM_SETTEXT, 0, (LPARAM)Title); + PostMessageW(Console->hWindow, WM_SETTEXT, 0, (LPARAM)Title); if (NULL != Buffer) { @@ -2277,8 +2283,8 @@ static BOOL WINAPI GuiChangeIcon(PCONSOLE Console, HICON hWindowIcon) { - SendMessageW(Console->hWindow, WM_SETICON, ICON_BIG, (LPARAM)hWindowIcon); - SendMessageW(Console->hWindow, WM_SETICON, ICON_SMALL, (LPARAM)hWindowIcon); + PostMessageW(Console->hWindow, WM_SETICON, ICON_BIG, (LPARAM)hWindowIcon); + PostMessageW(Console->hWindow, WM_SETICON, ICON_SMALL, (LPARAM)hWindowIcon); return TRUE; } Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Tue Jan 22 23:28:51 2013 @@ -37,10 +37,10 @@ static VOID Win32CsrCreateHandleEntry(PCONSOLE_IO_HANDLE Entry) { - Object_t *Object = Entry->Object; - EnterCriticalSection(&Object->Console->Lock); + /// LOCK /// Object_t *Object = Entry->Object; + /// LOCK /// EnterCriticalSection(&Object->Console->Lock); AdjustHandleCounts(Entry, +1); - LeaveCriticalSection(&Object->Console->Lock); + /// LOCK /// LeaveCriticalSection(&Object->Console->Lock); } static VOID @@ -49,8 +49,10 @@ Object_t *Object = Entry->Object; if (Object != NULL) { - PCONSOLE Console = Object->Console; - EnterCriticalSection(&Console->Lock); + /// LOCK /// PCONSOLE Console = Object->Console; + /// LOCK /// EnterCriticalSection(&Console->Lock); + + /// TODO: HERE, trigger input waiting threads. /* If the last handle to a screen buffer is closed, delete it... */ if (AdjustHandleCounts(Entry, -1) == 0) @@ -70,7 +72,7 @@ } } - LeaveCriticalSection(&Console->Lock); + /// LOCK /// LeaveCriticalSection(&Console->Lock); Entry->Object = NULL; } } @@ -318,6 +320,7 @@ HANDLE Handle, Object_t **Object, DWORD Access, + BOOL LockConsole, ULONG Type) { ULONG_PTR h = (ULONG_PTR)Handle >> 2; @@ -330,7 +333,7 @@ if ( !IsConsoleHandle(Handle) || h >= ProcessData->HandleTableSize || (*Object = ProcessData->HandleTable[h].Object) == NULL || - ~ProcessData->HandleTable[h].Access & Access || + (ProcessData->HandleTable[h].Access & Access) == 0 || (Type != 0 && (*Object)->Type != Type) ) { DPRINT1("CsrGetObject returning invalid handle (%x) of type %lu with access %lu\n", Handle, Type, Access); @@ -341,14 +344,16 @@ _InterlockedIncrement(&(*Object)->Console->ReferenceCount); RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - EnterCriticalSection(&(*Object)->Console->Lock); + if (LockConsole) EnterCriticalSection(&(*Object)->Console->Lock); + return STATUS_SUCCESS; } VOID FASTCALL -Win32CsrUnlockConsole(PCONSOLE Console) -{ - LeaveCriticalSection(&Console->Lock); +Win32CsrUnlockConsole(PCONSOLE Console, + BOOL IsConsoleLocked) +{ + if (IsConsoleLocked) LeaveCriticalSection(&Console->Lock); /* Decrement reference count */ if (_InterlockedDecrement(&Console->ReferenceCount) == 0) @@ -357,9 +362,10 @@ VOID FASTCALL -Win32CsrUnlockObject(Object_t *Object) -{ - Win32CsrUnlockConsole(Object->Console); +Win32CsrUnlockObject(Object_t *Object, + BOOL IsConsoleLocked) +{ + Win32CsrUnlockConsole(Object->Console, IsConsoleLocked); } NTSTATUS @@ -418,8 +424,9 @@ DPRINT1("Win32CsrReleaseConsole - Console->ReferenceCount = %lu - We are going to decrement it !\n", Console->ReferenceCount); ProcessData->Console = NULL; EnterCriticalSection(&Console->Lock); + DPRINT1("Win32CsrReleaseConsole - Locking OK\n"); RemoveEntryList(&ProcessData->ConsoleLink); - Win32CsrUnlockConsole(Console); + Win32CsrUnlockConsole(Console, TRUE); //CloseHandle(ProcessData->ConsoleEvent); //ProcessData->ConsoleEvent = NULL; } @@ -428,7 +435,8 @@ NTSTATUS FASTCALL ConioConsoleFromProcessData(PCONSOLE_PROCESS_DATA ProcessData, - PCONSOLE* Console) + PCONSOLE* Console, + BOOL LockConsole) { PCONSOLE ProcessConsole; @@ -444,7 +452,9 @@ InterlockedIncrement(&ProcessConsole->ReferenceCount); RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - EnterCriticalSection(&(ProcessConsole->Lock)); + + if (LockConsole) EnterCriticalSection(&ProcessConsole->Lock); + *Console = ProcessConsole; return STATUS_SUCCESS; @@ -716,7 +726,7 @@ { DesiredAccess = DuplicateHandleRequest->Access; /* Make sure the source handle has all the desired flags */ - if (~Entry->Access & DesiredAccess) + if ((Entry->Access & DesiredAccess) == 0) { DPRINT1("Handle %p only has access %X; requested %X\n", ConsoleHandle, Entry->Access, DesiredAccess); Modified: branches/ros-csrss/win32ss/user/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lineinput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lineinput.c [iso-8859-1] Tue Jan 22 23:28:51 2013 @@ -167,7 +167,7 @@ return STATUS_INVALID_PARAMETER; } - Status = ConioLockConsole(ProcessData, &Console); + Status = ConioGetConsole(ProcessData, &Console, TRUE); if (NT_SUCCESS(Status)) { Hist = HistoryFindBuffer(Console, &GetCommandHistoryLengthRequest->ExeName); @@ -177,7 +177,7 @@ Length += Hist->Entries[i].Length + sizeof(WCHAR); } GetCommandHistoryLengthRequest->Length = Length; - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); } return Status; } @@ -205,7 +205,7 @@ return STATUS_INVALID_PARAMETER; } - Status = ConioLockConsole(ProcessData, &Console); + Status = ConioGetConsole(ProcessData, &Console, TRUE); if (NT_SUCCESS(Status)) { Hist = HistoryFindBuffer(Console, &GetCommandHistoryRequest->ExeName); @@ -225,7 +225,7 @@ } } GetCommandHistoryRequest->Length = Buffer - (PBYTE)GetCommandHistoryRequest->History; - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); } return Status; } @@ -246,12 +246,12 @@ return STATUS_INVALID_PARAMETER; } - Status = ConioLockConsole(ProcessData, &Console); + Status = ConioGetConsole(ProcessData, &Console, TRUE); if (NT_SUCCESS(Status)) { Hist = HistoryFindBuffer(Console, &ExpungeCommandHistoryRequest->ExeName); HistoryDeleteBuffer(Hist); - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); } return Status; } @@ -274,7 +274,7 @@ return STATUS_INVALID_PARAMETER; } - Status = ConioLockConsole(ProcessData, &Console); + Status = ConioGetConsole(ProcessData, &Console, TRUE); if (NT_SUCCESS(Status)) { Hist = HistoryFindBuffer(Console, &SetHistoryNumberCommandsRequest->ExeName); @@ -302,7 +302,7 @@ RtlFreeHeap(ConSrvHeap, 0, OldEntryList); } } - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); } return Status; } @@ -311,13 +311,13 @@ { PCONSOLE_GETSETHISTORYINFO HistoryInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.HistoryInfoRequest; PCONSOLE Console; - NTSTATUS Status = ConioLockConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); + NTSTATUS Status = ConioGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (NT_SUCCESS(Status)) { HistoryInfoRequest->HistoryBufferSize = Console->HistoryBufferSize; HistoryInfoRequest->NumberOfHistoryBuffers = Console->NumberOfHistoryBuffers; HistoryInfoRequest->dwFlags = Console->HistoryNoDup; - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); } return Status; } @@ -326,13 +326,13 @@ { PCONSOLE_GETSETHISTORYINFO HistoryInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.HistoryInfoRequest; PCONSOLE Console; - NTSTATUS Status = ConioLockConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); + NTSTATUS Status = ConioGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (NT_SUCCESS(Status)) { Console->HistoryBufferSize = HistoryInfoRequest->HistoryBufferSize; Console->NumberOfHistoryBuffers = HistoryInfoRequest->NumberOfHistoryBuffers; Console->HistoryNoDup = HistoryInfoRequest->dwFlags & HISTORY_NO_DUP_FLAG; - ConioUnlockConsole(Console); + ConioReleaseConsole(Console, TRUE); } return Status; }

11 years, 8 months

[tkreuzer] 58204: [INCLUDE] - Remove duplicate dllimport attributes CORE-6917 #resolve - Add annotations for wcslen - Add kernelspecs.h (complete) - Add some more entries in driverspecs.h - Fix a n...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 22 22:51:51 2013 New Revision: 58204 URL: http://svn.reactos.org/svn/reactos?rev=58204&view=rev Log: [INCLUDE] - Remove duplicate dllimport attributes CORE-6917 #resolve - Add annotations for wcslen - Add kernelspecs.h (complete) - Add some more entries in driverspecs.h - Fix a number of annotations Added: trunk/reactos/include/ddk/kernelspecs.h (with props) Modified: trunk/reactos/include/crt/string.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ndk/cmfuncs.h trunk/reactos/include/ndk/exfuncs.h trunk/reactos/include/ndk/iofuncs.h trunk/reactos/include/ndk/kefuncs.h trunk/reactos/include/ndk/ldrfuncs.h trunk/reactos/include/ndk/mmfuncs.h trunk/reactos/include/ndk/psfuncs.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/psdk/driverspecs.h trunk/reactos/include/psdk/sal.h trunk/reactos/include/xdk/rtlfuncs.h trunk/reactos/include/xdk/wdm.template.h trunk/reactos/include/xdk/zwfuncs.h Modified: trunk/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/string.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/string.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/string.h [iso-8859-1] Tue Jan 22 22:51:51 2013 @@ -118,7 +118,14 @@ _CRTIMP _CRT_INSECURE_DEPRECATE(wcscpy_s) wchar_t *__cdecl wcscpy(wchar_t *_Dest,const wchar_t *_Source); _CRTIMP size_t __cdecl wcscspn(const wchar_t *_Str,const wchar_t *_Control); _CRTIMP wchar_t *wcsncat(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); - _CRTIMP size_t __cdecl wcslen(const wchar_t *_Str); + +_Ret_range_(==,_String_length_(_Str)) +_CRTIMP +size_t +__cdecl +wcslen( + _In_z_ const wchar_t *_Str); + _CRTIMP _CRT_INSECURE_DEPRECATE(wcsnlen_s) size_t __cdecl wcsnlen(const wchar_t *_Src,size_t _MaxCount); _CRTIMP int __cdecl wcsncmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); _CRTIMP _CRT_INSECURE_DEPRECATE(wcsncpy_s) wchar_t *wcsncpy(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); Added: trunk/reactos/include/ddk/kernelspecs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/kernelspecs.h?… ============================================================================== --- trunk/reactos/include/ddk/kernelspecs.h (added) +++ trunk/reactos/include/ddk/kernelspecs.h [iso-8859-1] Tue Jan 22 22:51:51 2013 @@ -1,0 +1,109 @@ +/* + * kernelspecs.h + * + * SAL 2 annotations for kernel mode drivers + * + * This file is part of the ReactOS DDK package. + * + * Contributor: + * Timo Kreuzer (timo.kreuzer(a)reactos.org) + * + * 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. + * + */ +#pragma once + +#define KERNELSPECS_H + +#include "driverspecs.h" + +#ifdef _PREFAST_ + +#undef _IRQL_always_function_max_ +#undef _IRQL_always_function_min_ +#undef _IRQL_raises_ +#undef _IRQL_requires_ +#undef _IRQL_requires_max_ +#undef _IRQL_requires_min_ +#undef _IRQL_requires_same_ +#undef _IRQL_restores_ +#undef _IRQL_restores_global_ +#undef _IRQL_saves_ +#undef _IRQL_saves_global_ +#undef _IRQL_uses_cancel_ +#undef _IRQL_is_cancel_ +#undef __drv_setsIRQL +#undef __drv_raisesIRQL +#undef __drv_requiresIRQL +#undef __drv_maxIRQL +#undef __drv_minIRQL +#undef __drv_savesIRQL +#undef __drv_savesIRQLGlobal +#undef __drv_restoresIRQL +#undef __drv_restoresIRQLGlobal +#undef __drv_minFunctionIRQL +#undef __drv_maxFunctionIRQL +#undef __drv_sameIRQL +#undef __drv_useCancelIRQL +#undef __drv_isCancelIRQL + +#define _IRQL_always_function_max_(irql) _Pre_ _SA_annotes1(SAL_maxFunctionIrql,irql) +#define _IRQL_always_function_min_(irql) _Pre_ _SA_annotes1(SAL_minFunctionIrql,irql) +#define _IRQL_raises_(irql) _Post_ _SA_annotes1(SAL_raiseIRQL,irql) +#define _IRQL_requires_(irql) _Pre_ _SA_annotes1(SAL_IRQL,irql) +#define _IRQL_requires_max_(irql) _Pre_ _SA_annotes1(SAL_maxIRQL,irql) +#define _IRQL_requires_min_(irql) _Pre_ _SA_annotes1(SAL_minIRQL,irql) +#define _IRQL_requires_same_ _Post_ _SA_annotes0(SAL_sameIRQL) +#define _IRQL_restores_ _Post_ _SA_annotes0(SAL_restoreIRQL) +#define _IRQL_restores_global_(kind,param) _Post_ _SA_annotes2(SAL_restoreIRQLGlobal, #kind, param\t) +#define _IRQL_saves_ _Post_ _SA_annotes0(SAL_saveIRQL) +#define _IRQL_saves_global_(kind,param) _Post_ _SA_annotes2(SAL_saveIRQLGlobal,#kind, param\t) +#define _IRQL_uses_cancel_ _Post_ _SA_annotes0(SAL_UseCancelIrql) +#define _IRQL_is_cancel_ _IRQL_uses_cancel_ _Releases_nonreentrant_lock_(_Global_cancel_spin_lock_) \ + _At_(return, _IRQL_always_function_min_(2 /*DISPATCH_LEVEL*/) _IRQL_requires_(2 /*DISPATCH_LEVEL*/)) +#define __drv_setsIRQL(irql) _Post_ _SA_annotes1(SAL_IRQL,irql) +#define __drv_raisesIRQL _IRQL_raises_ +#define __drv_requiresIRQL _IRQL_requires_ +#define __drv_maxIRQL _IRQL_requires_max_ +#define __drv_minIRQL _IRQL_requires_min_ +#define __drv_savesIRQL _IRQL_saves_ +#define __drv_savesIRQLGlobal _IRQL_saves_global_ +#define __drv_restoresIRQL _IRQL_restores_ +#define __drv_restoresIRQLGlobal _IRQL_restores_global_ +#define __drv_minFunctionIRQL _IRQL_always_function_min_ +#define __drv_maxFunctionIRQL _IRQL_always_function_max_ +#define __drv_sameIRQL _IRQL_requires_same_ +#define __drv_useCancelIRQL _IRQL_uses_cancel_ +#define __drv_isCancelIRQL _IRQL_is_cancel_ + +#ifdef __cplusplus +extern "C" { +#endif + +__ANNOTATION(SAL_IRQL(__int64);) +__ANNOTATION(SAL_raiseIRQL(__int64);) +__ANNOTATION(SAL_IRQL(__int64);) +__ANNOTATION(SAL_maxIRQL(__int64);) +__ANNOTATION(SAL_minIRQL(__int64);) +__ANNOTATION(SAL_saveIRQL(void);) +__ANNOTATION(SAL_saveIRQLGlobal(_In_ char *, ...);) +__ANNOTATION(SAL_restoreIRQL(void);) +__ANNOTATION(SAL_restoreIRQLGlobal(_In_ char *, ...);) +__ANNOTATION(SAL_minFunctionIrql(__int64);) +__ANNOTATION(SAL_maxFunctionIrql(__int64);) +__ANNOTATION(SAL_sameIRQL(void);) +__ANNOTATION(SAL_UseCancelIrql(void);) + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif /* _PREFAST_ */ Propchange: trunk/reactos/include/ddk/kernelspecs.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=58… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Tue Jan 22 22:51:51 2013 @@ -1344,12 +1344,13 @@ _Out_ PLARGE_INTEGER Time); _Success_(return != 0) +_Must_inspect_result_ NTSYSAPI BOOLEAN NTAPI RtlTimeToSecondsSince1970( - _In_ PLARGE_INTEGER Time, - _Out_ PULONG ElapsedSeconds); + _In_ PLARGE_INTEGER Time, + _Out_ PULONG ElapsedSeconds); NTSYSAPI VOID @@ -9165,7 +9166,7 @@ _Must_inspect_result_ _At_(*BaseAddress, __drv_allocatesMem(Mem)) -__kernel_entry NTSYSCALLAPI +__kernel_entry NTSYSAPI NTSTATUS NTAPI Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5820… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Tue Jan 22 22:51:51 2013 @@ -41,6 +41,7 @@ #include <excpt.h> #include <ntdef.h> #include <ntstatus.h> +#include <kernelspecs.h> #include <ntiologc.h> #ifndef GUID_DEFINED @@ -8742,14 +8743,18 @@ _IRQL_requires_max_(DISPATCH_LEVEL) _At_(DestinationString->Buffer, _Post_equal_to_(SourceString)) +_When_(SourceString != NULL, _At_(DestinationString->Length, _Post_equal_to_(_String_length_(SourceString) * sizeof(WCHAR))) -_At_(DestinationString->MaximumLength, _Post_equal_to_((_String_length_(SourceString)+1) * sizeof(WCHAR))) +_At_(DestinationString->MaximumLength, _Post_equal_to_(DestinationString->Length + sizeof(WCHAR)))) +_When_(SourceString == NULL, +_At_(DestinationString->Length, _Post_equal_to_(0)) +_At_(DestinationString->MaximumLength, _Post_equal_to_(0))) NTSYSAPI VOID NTAPI RtlInitUnicodeString( - _Out_ PUNICODE_STRING DestinationString, - _In_opt_z_ __drv_aliasesMem PCWSTR SourceString); + _Out_ PUNICODE_STRING DestinationString, + _In_opt_z_ __drv_aliasesMem PCWSTR SourceString); /* VOID * RtlMoveMemory( @@ -9328,13 +9333,14 @@ #define RtlStoreUlongPtr(Address,Value) RtlStoreUlong(Address,Value) #endif /* _WIN64 */ -_Success_(return != 0) +_Success_(return!=FALSE) +_Must_inspect_result_ NTSYSAPI BOOLEAN NTAPI RtlTimeFieldsToTime( - _In_ PTIME_FIELDS TimeFields, - _Out_ PLARGE_INTEGER Time); + _In_ PTIME_FIELDS TimeFields, + _Out_ PLARGE_INTEGER Time); NTSYSAPI VOID @@ -16669,17 +16675,18 @@ NTSTATUS NTAPI ZwCreateFile( - _Out_ PHANDLE FileHandle, - _In_ ACCESS_MASK DesiredAccess, - _In_ POBJECT_ATTRIBUTES ObjectAttributes, - _Out_ PIO_STATUS_BLOCK IoStatusBlock, - _In_opt_ PLARGE_INTEGER AllocationSize, - _In_ ULONG FileAttributes, - _In_ ULONG ShareAccess, - _In_ ULONG CreateDisposition, - _In_ ULONG CreateOptions, - _In_reads_bytes_opt_(EaLength) PVOID EaBuffer, - _In_ ULONG EaLength); + _Out_ PHANDLE FileHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_opt_ PLARGE_INTEGER AllocationSize, + _In_ ULONG FileAttributes, + _In_ ULONG ShareAccess, + _In_ ULONG CreateDisposition, + _In_ ULONG CreateOptions, + _In_reads_bytes_opt_(EaLength) PVOID EaBuffer, + _In_ ULONG EaLength +); _IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI @@ -17310,8 +17317,8 @@ NTSTATUS NTAPI ZwRollbackComplete( - IN HANDLE EnlistmentHandle, - IN PLARGE_INTEGER TmVirtualClock OPTIONAL); + _In_ HANDLE EnlistmentHandle, + _In_opt_ PLARGE_INTEGER TmVirtualClock); NTSYSCALLAPI NTSTATUS @@ -17347,29 +17354,29 @@ NTSTATUS NTAPI ZwNotifyChangeMultipleKeys( - IN HANDLE MasterKeyHandle, - IN ULONG Count OPTIONAL, - IN OBJECT_ATTRIBUTES SubordinateObjects[] OPTIONAL, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG CompletionFilter, - IN BOOLEAN WatchTree, - OUT PVOID Buffer OPTIONAL, - IN ULONG BufferSize, - IN BOOLEAN Asynchronous); + _In_ HANDLE MasterKeyHandle, + _In_opt_ ULONG Count, + _In_opt_ OBJECT_ATTRIBUTES SubordinateObjects[], + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG CompletionFilter, + _In_ BOOLEAN WatchTree, + _Out_opt_ PVOID Buffer, + _In_ ULONG BufferSize, + _In_ BOOLEAN Asynchronous); NTSYSAPI NTSTATUS NTAPI ZwQueryMultipleValueKey( - IN HANDLE KeyHandle, - IN OUT PKEY_VALUE_ENTRY ValueEntries, - IN ULONG EntryCount, - OUT PVOID ValueBuffer, - IN OUT PULONG BufferLength, - OUT PULONG RequiredBufferLength OPTIONAL); + _In_ HANDLE KeyHandle, + _Inout_ PKEY_VALUE_ENTRY ValueEntries, + _In_ ULONG EntryCount, + _Out_ PVOID ValueBuffer, + _Inout_ PULONG BufferLength, + _Out_opt_ PULONG RequiredBufferLength); _IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI Modified: trunk/reactos/include/ndk/cmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cmfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/cmfuncs.h [iso-8859-1] Tue Jan 22 22:51:51 2013 @@ -41,17 +41,18 @@ _In_ HANDLE Key ); -NTSYSCALLAPI +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSYSAPI NTSTATUS NTAPI NtCreateKey( _Out_ PHANDLE KeyHandle, _In_ ACCESS_MASK DesiredAccess, _In_ POBJECT_ATTRIBUTES ObjectAttributes, - _In_ ULONG TitleIndex, + _Reserved_ ULONG TitleIndex, _In_opt_ PUNICODE_STRING Class, _In_ ULONG CreateOptions, - _In_opt_ PULONG Disposition + _Out_opt_ PULONG Disposition ); NTSYSCALLAPI @@ -81,14 +82,17 @@ _Out_ PULONG ResultLength ); -NTSYSCALLAPI +_IRQL_requires_max_(PASSIVE_LEVEL) +_When_(Length == 0, _Post_satisfies_(return < 0)) +_When_(Length > 0, _Post_satisfies_(return <= 0)) +NTSYSAPI NTSTATUS NTAPI NtEnumerateValueKey( _In_ HANDLE KeyHandle, _In_ ULONG Index, _In_ KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - _Out_bytecap_(Length) PVOID KeyValueInformation, + _Out_writes_bytes_opt_(Length) PVOID KeyValueInformation, _In_ ULONG Length, _Out_ PULONG ResultLength ); @@ -246,14 +250,17 @@ _In_ PULONG RequiredSize ); -NTSYSCALLAPI +_IRQL_requires_max_(PASSIVE_LEVEL) +_When_(Length == 0, _Post_satisfies_(return < 0)) +_When_(Length > 0, _Post_satisfies_(return <= 0)) +NTSYSAPI NTSTATUS NTAPI NtQueryValueKey( _In_ HANDLE KeyHandle, _In_ PUNICODE_STRING ValueName, _In_ KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - _Out_bytecap_(Length) PVOID KeyValueInformation, + _Out_writes_bytes_opt_(Length) PVOID KeyValueInformation, _In_ ULONG Length, _Out_ PULONG ResultLength ); @@ -354,6 +361,7 @@ ); #ifdef NTOS_MODE_USER +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI @@ -361,10 +369,10 @@ _Out_ PHANDLE KeyHandle, _In_ ACCESS_MASK DesiredAccess, _In_ POBJECT_ATTRIBUTES ObjectAttributes, - _In_ ULONG TitleIndex, + _Reserved_ ULONG TitleIndex, _In_opt_ PUNICODE_STRING Class, _In_ ULONG CreateOptions, - _In_opt_ PULONG Disposition + _Out_opt_ PULONG Disposition ); NTSYSAPI @@ -394,6 +402,9 @@ _Out_ PULONG ResultLength ); +_IRQL_requires_max_(PASSIVE_LEVEL) +_When_(Length == 0, _Post_satisfies_(return < 0)) +_When_(Length > 0, _Post_satisfies_(return <= 0)) NTSYSAPI NTSTATUS NTAPI @@ -401,7 +412,7 @@ _In_ HANDLE KeyHandle, _In_ ULONG Index, _In_ KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - _Out_bytecap_(Length) PVOID KeyValueInformation, + _Out_writes_bytes_opt_(Length) PVOID KeyValueInformation, _In_ ULONG Length, _Out_ PULONG ResultLength ); @@ -497,6 +508,9 @@ _Out_ PULONG ReturnLength ); +_IRQL_requires_max_(PASSIVE_LEVEL) +_When_(Length == 0, _Post_satisfies_(return < 0)) +_When_(Length > 0, _Post_satisfies_(return <= 0)) NTSYSAPI NTSTATUS NTAPI @@ -504,7 +518,7 @@ _In_ HANDLE KeyHandle, _In_ PUNICODE_STRING ValueName, _In_ KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - _Out_bytecap_(Length) PVOID KeyValueInformation, + _Out_writes_bytes_opt_(Length) PVOID KeyValueInformation, _In_ ULONG Length, _Out_ PULONG ResultLength ); Modified: trunk/reactos/include/ndk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] Tue Jan 22 22:51:51 2013 @@ -459,7 +459,7 @@ NtReleaseSemaphore( _In_ HANDLE SemaphoreHandle, _In_ LONG ReleaseCount, - _Out_ PLONG PreviousCount + _Out_opt_ PLONG PreviousCount ); NTSYSCALLAPI @@ -903,7 +903,7 @@ ZwReleaseSemaphore( _In_ HANDLE SemaphoreHandle, _In_ LONG ReleaseCount, - _Out_ PLONG PreviousCount + _Out_opt_ PLONG PreviousCount ); NTSYSAPI Modified: trunk/reactos/include/ndk/iofuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iofuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iofuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/iofuncs.h [iso-8859-1] Tue Jan 22 22:51:51 2013 @@ -113,7 +113,7 @@ NtCreateIoCompletion( _Out_ PHANDLE IoCompletionHandle, _In_ ACCESS_MASK DesiredAccess, - _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, _In_ ULONG NumberOfConcurrentThreads ); @@ -653,7 +653,7 @@ ZwCreateIoCompletion( _Out_ PHANDLE IoCompletionHandle, _In_ ACCESS_MASK DesiredAccess, - _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, _In_ ULONG NumberOfConcurrentThreads ); Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] Tue Jan 22 22:51:51 2013 @@ -437,9 +437,9 @@ NtQueueApcThread( _In_ HANDLE ThreadHandle, _In_ PKNORMAL_ROUTINE ApcRoutine, - _In_ PVOID NormalContext, - _In_ PVOID SystemArgument1, - _In_ PVOID SystemArgument2 + _In_opt_ PVOID NormalContext, + _In_opt_ PVOID SystemArgument1, + _In_opt_ PVOID SystemArgument2 ); NTSYSCALLAPI @@ -643,9 +643,9 @@ ZwQueueApcThread( _In_ HANDLE ThreadHandle, _In_ PKNORMAL_ROUTINE ApcRoutine, - _In_ PVOID NormalContext, - _In_ PVOID SystemArgument1, - _In_ PVOID SystemArgument2 + _In_opt_ PVOID NormalContext, + _In_opt_ PVOID SystemArgument1, + _In_opt_ PVOID SystemArgument2 ); NTSYSAPI Modified: trunk/reactos/include/ndk/ldrfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] Tue Jan 22 22:51:51 2013 @@ -56,7 +56,7 @@ _In_ PLDR_RESOURCE_INFO ResourceInfo, _In_ ULONG Level, _Inout_ ULONG *ResourceCount, - _Out_opt_ PLDR_ENUM_RESOURCE_INFO Resources + _Out_writes_to_(*ResourceCount,*ResourceCount) LDR_ENUM_RESOURCE_INFO *Resources ); Modified: trunk/reactos/include/ndk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmfuncs.h [iso-8859-1] Tue Jan 22 22:51:51 2013 @@ -319,7 +319,7 @@ _Must_inspect_result_ _At_(*BaseAddress, __drv_allocatesMem(Mem)) -__kernel_entry NTSYSCALLAPI +__kernel_entry NTSYSAPI NTSTATUS NTAPI Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Tue Jan 22 22:51:51 2013 @@ -284,7 +284,7 @@ NTAPI NtAlertResumeThread( _In_ HANDLE ThreadHandle, - _Out_ PULONG SuspendCount + _Out_opt_ PULONG SuspendCount ); typedef ULONG APPHELPCACHESERVICECLASS; @@ -488,7 +488,7 @@ _In_ THREADINFOCLASS ThreadInformationClass, _Out_ PVOID ThreadInformation, _In_ ULONG ThreadInformationLength, - _Out_ PULONG ReturnLength + _Out_opt_ PULONG ReturnLength ); NTSYSCALLAPI @@ -503,7 +503,7 @@ NTAPI NtResumeThread( _In_ HANDLE ThreadHandle, - _Out_ PULONG SuspendCount + _Out_opt_ PULONG SuspendCount ); NTSYSCALLAPI @@ -588,7 +588,7 @@ NTAPI ZwAlertResumeThread( _In_ HANDLE ThreadHandle, - _Out_ PULONG SuspendCount + _Out_opt_ PULONG SuspendCount ); NTSYSAPI @@ -734,7 +734,7 @@ _In_ THREADINFOCLASS ThreadInformationClass, _Out_ PVOID ThreadInformation, _In_ ULONG ThreadInformationLength, - _Out_ PULONG ReturnLength + _Out_opt_ PULONG ReturnLength ); NTSYSAPI @@ -749,7 +749,7 @@ NTAPI ZwResumeThread( _In_ HANDLE ThreadHandle, - _Out_ PULONG SuspendCount + _Out_opt_ PULONG SuspendCount ); NTSYSAPI Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Tue Jan 22 22:51:51 2013 @@ -1667,7 +1667,7 @@ _In_ PLARGE_INTEGER Value, _In_ ULONG Base, _In_ ULONG Length, - _Inout_ PCHAR String + _Out_ PCHAR String ); NTSYSAPI @@ -2129,8 +2129,12 @@ _IRQL_requires_max_(DISPATCH_LEVEL) _At_(DestinationString->Buffer, _Post_equal_to_(SourceString)) +_When_(SourceString != NULL, _At_(DestinationString->Length, _Post_equal_to_(_String_length_(SourceString) * sizeof(WCHAR))) -_At_(DestinationString->MaximumLength, _Post_equal_to_((_String_length_(SourceString)+1) * sizeof(WCHAR))) +_At_(DestinationString->MaximumLength, _Post_equal_to_(DestinationString->Length + sizeof(WCHAR)))) +_When_(SourceString == NULL, +_At_(DestinationString->Length, _Post_equal_to_(0)) +_At_(DestinationString->MaximumLength, _Post_equal_to_(0))) NTSYSAPI VOID NTAPI @@ -2411,8 +2415,8 @@ _In_ SIZE_T StackCommit, _In_ PTHREAD_START_ROUTINE StartAddress, _In_ PVOID Parameter, - _Inout_ PHANDLE ThreadHandle, - _Inout_ PCLIENT_ID ClientId + _Out_opt_ PHANDLE ThreadHandle, + _Out_opt_ PCLIENT_ID ClientId ); #endif @@ -2538,7 +2542,7 @@ NTAPI RtlDeregisterWaitEx( _In_ HANDLE hWaitHandle, - _In_ HANDLE hCompletionEvent + _In_opt_ HANDLE hCompletionEvent ); NTSYSAPI @@ -2682,7 +2686,7 @@ NTAPI RtlGetCurrentDirectory_U( _In_ ULONG MaximumLength, - _Out_z_bytecap_(MaximumLength) PWSTR Buffer + _Out_bytecap_(MaximumLength) PWSTR Buffer ); NTSYSAPI @@ -3176,7 +3180,7 @@ NTAPI RtlDeleteTimerQueueEx( _In_ HANDLE TimerQueue, - _In_ HANDLE CompletionEvent + _In_opt_ HANDLE CompletionEvent ); NTSYSAPI @@ -3645,7 +3649,8 @@ NTSTATUS NTAPI RtlFormatCurrentUserKeyPath( - _Inout_ PUNICODE_STRING KeyPath + _Out_ _At_(KeyPath->Buffer, __drv_allocatesMem(Mem) _Post_bytecap_(KeyPath->MaximumLength) _Post_bytecount_(KeyPath->Length)) + PUNICODE_STRING KeyPath ); NTSYSAPI @@ -3700,7 +3705,7 @@ NTAPI RtlpNtEnumerateSubKey( _In_ HANDLE KeyHandle, - _Out_ PUNICODE_STRING SubKeyName, + _Inout_ PUNICODE_STRING SubKeyName, _In_ ULONG Index, _In_ ULONG Unused ); @@ -3974,6 +3979,8 @@ RtlSetTimeZoneInformation( _In_ PRTL_TIME_ZONE_INFORMATION TimeZoneInformation); +_Success_(return!=FALSE) +_Must_inspect_result_ NTSYSAPI BOOLEAN NTAPI @@ -3982,12 +3989,14 @@ _Out_ PLARGE_INTEGER Time ); +_Success_(return != 0) +_Must_inspect_result_ NTSYSAPI BOOLEAN NTAPI RtlTimeToSecondsSince1970( - PLARGE_INTEGER Time, - _Out_ PULONG SecondsSince1970 + _In_ PLARGE_INTEGER Time, + _Out_ PULONG ElapsedSeconds ); NTSYSAPI Modified: trunk/reactos/include/psdk/driverspecs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/driverspecs.h… ============================================================================== --- trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] Tue Jan 22 22:51:51 2013 @@ -17,12 +17,34 @@ #ifdef _PREFAST_ -// Stubs -#define ___drv_unit_internal_kernel_driver -#define ___drv_unit_kernel_code -#define ___drv_unit_kernel_driver -#define ___drv_unit_user_code -#define ___drv_unit_user_driver +/* IRQL annotations are only valid when included from kernelspecs.h */ +#define _IRQL_always_function_max_(irql) +#define _IRQL_always_function_min_(irql) +#define _IRQL_is_cancel_ +#define _IRQL_raises_(irql) +#define _IRQL_requires_(irql) +#define _IRQL_requires_max_(irql) +#define _IRQL_requires_max_defined +#define _IRQL_requires_min_(irql) +#define _IRQL_requires_same_ +#define _IRQL_restores_ +#define _IRQL_restores_global_(kind,param) +#define _IRQL_saves_ +#define _IRQL_saves_global_(kind,param) +#define _IRQL_uses_cancel_ +#define __drv_setsIRQL(irql) + +#define _Dispatch_type_ _Function_class_ +#define _Kernel_clear_do_init_(yesNo) _Post_ _SA_annotes1(SAL_clearDoInit,yesNo) +#define _Kernel_float_restored_ _Post_ _SA_annotes0(SAL_floatRestored) +#define _Kernel_float_saved_ _Post_ _SA_annotes0(SAL_floatSaved) +#define _Kernel_float_used_ _Post_ _SA_annotes0(SAL_floatUsed) +#define _Kernel_IoGetDmaAdapter_ _Post_ _SA_annotes0(SAL_IoGetDmaAdapter) +#define _Kernel_releases_resource_(kind) _Post_ _SA_annotes1(SAL_release, #kind) +#define _Kernel_requires_resource_held_(kind) _Pre_ _SA_annotes1(SAL_mustHold, #kind) +#define _Kernel_requires_resource_not_held_(kind) _Pre_ _SA_annotes1(SAL_neverHold, #kind) +#define _Kernel_acquires_resource_(kind) _Post_ _SA_annotes1(SAL_acquire, #kind) + #define __drv_acquiresCancelSpinLock #define __drv_acquiresCriticalRegion #define __drv_acquiresExclusiveResource(kind) @@ -30,11 +52,11 @@ #define __drv_acquiresPriorityRegion #define __drv_acquiresResource(kind) #define __drv_acquiresResourceGlobal(kind,param) -#define __drv_aliasesMem _Post_ _SA_annotes0(SAL_IsAliased) -#define __drv_allocatesMem(kind) _Post_ _SA_annotes1(SAL_NeedsRelease,__yes) -#define __drv_arg(expr,annotes) -#define __drv_at(expr,annotes) -#define __drv_callbackType(kind) +#define __drv_aliasesMem _Post_ _SA_annotes0(SAL_IsAliased) +#define __drv_allocatesMem(kind) _Post_ _SA_annotes1(SAL_NeedsRelease,__yes) +#define __drv_arg(expr,annotes) _At_(expr,annotes) +#define __drv_at(expr,annotes) _At_(expr,annotes) +#define __drv_callbackType(kind) _SA_annotes1(SAL_callbackType, #kind) #define __drv_clearDoInit #define __drv_completionType(kindlist) #define __drv_constant @@ -46,12 +68,12 @@ #define __drv_floatSaved #define __drv_floatUsed #define __drv_formatString(kind) -#define __drv_freesMem(kind) _Post_ _SA_annotes1(SAL_NeedsRelease,__no) +#define __drv_freesMem(kind) _Post_ _SA_annotes1(SAL_NeedsRelease,__no) #define __drv_fun(annotes) #define __drv_functionClass -#define __drv_holdsCancelSpinLock() -#define __drv_holdsCriticalRegion() -#define __drv_holdsPriorityRegion() +#define __drv_holdsCancelSpinLock() _Holds_resource_global_("CancelSpinLock",) +#define __drv_holdsCriticalRegion() _Holds_resource_global_("CriticalRegion",) +#define __drv_holdsPriorityRegion() _Holds_resource_global_("PriorityRegion",) #define __drv_in_deref(annotes) #define __drv_in(annotes) #define __drv_innerAcquiresGlobal(kind,param) @@ -60,7 +82,7 @@ #define __drv_innerReleasesGlobal(kind,param) #define __drv_interlocked #define __drv_IoGetDmaAdapter -#define __drv_isCancelIRQL +#define __drv_isCancelIRQL _IRQL_is_cancel_ #define __drv_isObjectPointer #define __drv_KMDF #define __drv_maxFunctionIRQL @@ -101,7 +123,6 @@ #define __drv_sameIRQL #define __drv_savesIRQL #define __drv_savesIRQLGlobal -#define __drv_setsIRQL(irql) #define __drv_strictType(typename,mode) #define __drv_strictTypeMatch(mode) #define __drv_unit(p) @@ -116,14 +137,35 @@ #define __prefast_operator_new_throws #define __user_code #define __user_driver +#define ___drv_unit_internal_kernel_driver +#define ___drv_unit_kernel_code +#define ___drv_unit_kernel_driver +#define ___drv_unit_user_code +#define ___drv_unit_user_driver + +__ANNOTATION(SAL_neverHold(_In_ char *);) +__ANNOTATION(SAL_acquire(_In_ char *);) +__ANNOTATION(SAL_floatUsed(void);) +__ANNOTATION(SAL_floatSaved(void);) +__ANNOTATION(SAL_floatRestored(void);) +__ANNOTATION(SAL_clearDoInit(enum __SAL_YesNo);) +__ANNOTATION(SAL_maxIRQL(__int64);) +__ANNOTATION(SAL_IsAliased(void);) +__ANNOTATION(SAL_NeedsRelease(enum __SAL_YesNo);) +__ANNOTATION(SAL_mustHold(_In_ char *);) +__ANNOTATION(SAL_release(_In_ char *);) +__ANNOTATION(SAL_IoGetDmaAdapter(void);) + +#else + +/* Dummys */ #define _Dispatch_type_ #define _IRQL_always_function_max_(irql) #define _IRQL_always_function_min_(irql) #define _IRQL_is_cancel_ #define _IRQL_raises_(irql) #define _IRQL_requires_(irql) -#define _IRQL_requires_max_(irql) _Pre_ _SA_annotes1(SAL_maxIRQL,irql) -#define _IRQL_requires_max_defined +#define _IRQL_requires_max_(irql) #define _IRQL_requires_min_(irql) #define _IRQL_requires_same_ #define _IRQL_restores_ @@ -138,23 +180,8 @@ #define _Kernel_IoGetDmaAdapter_ #define _Kernel_releases_resource_(kind) #define _Kernel_requires_resource_held_(kind) -#define _Kernel_requires_resource_not_held_(kind) _Pre_ _SA_annotes1(SAL_neverHold, #kind) -#define _Kernel_acquires_resource_(kind) _Post_ _SA_annotes1(SAL_acquire, #kind) - -__ANNOTATION(SAL_maxIRQL(__int64);) -__ANNOTATION(SAL_IsAliased(void);) -__ANNOTATION(SAL_NeedsRelease(enum __SAL_YesNo);) -__ANNOTATION(SAL_neverHold(__In_impl_ char *);) -__ANNOTATION(SAL_acquire(__In_impl_ char *);) - -#else - -/* Dummys */ -#define ___drv_unit_internal_kernel_driver -#define ___drv_unit_kernel_code -#define ___drv_unit_kernel_driver -#define ___drv_unit_user_code -#define ___drv_unit_user_driver +#define _Kernel_requires_resource_not_held_(kind) +#define _Kernel_acquires_resource_(kind) #define __drv_acquiresCancelSpinLock #define __drv_acquiresCriticalRegion #define __drv_acquiresExclusiveResource(kind) @@ -248,29 +275,11 @@ #define __prefast_operator_new_throws #define __user_code #define __user_driver -#define _Dispatch_type_ -#define _IRQL_always_function_max_(irql) -#define _IRQL_always_function_min_(irql) -#define _IRQL_is_cancel_ -#define _IRQL_raises_(irql) -#define _IRQL_requires_(irql) -#define _IRQL_requires_max_(irql) -#define _IRQL_requires_min_(irql) -#define _IRQL_requires_same_ -#define _IRQL_restores_ -#define _IRQL_restores_global_(kind,param) -#define _IRQL_saves_ -#define _IRQL_saves_global_(kind,param) -#define _IRQL_uses_cancel_ -#define _Kernel_clear_do_init_(yesNo) -#define _Kernel_float_restored_ -#define _Kernel_float_saved_ -#define _Kernel_float_used_ -#define _Kernel_IoGetDmaAdapter_ -#define _Kernel_releases_resource_(kind) -#define _Kernel_requires_resource_held_(kind) -#define _Kernel_requires_resource_not_held_(kind) -#define _Kernel_acquires_resource_(kind) +#define ___drv_unit_internal_kernel_driver +#define ___drv_unit_kernel_code +#define ___drv_unit_kernel_driver +#define ___drv_unit_user_code +#define ___drv_unit_user_driver #endif Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=582… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Tue Jan 22 22:51:51 2013 @@ -855,7 +855,7 @@ //#define _Outref_result_maybenull_ //#define _Outref_result_nullonfailure_ #define _Points_to_data_ _SAL2_NAME(_Points_to_data_) _Group_([SAL_pre] [SAL_at(p1="*_Curr_")] _Group_([SAL_annotes(Name="SAL_mayBePointer", p1="__no")]) ) -//#define _Post_bytecap_(size) +#define _Post_bytecap_(size) _SAL11_NAME(_Post_bytecap_) _Group_([SA_Post(WritableBytes="\n" _SA_SPECSTRIZE(size))]) #define _Post_bytecount_(size) _SAL11_NAME(_Post_bytecount_) _Group_([SA_Post(ValidBytes="\n" _SA_SPECSTRIZE(size))] [SA_Post(Valid=SA_Yes)]) //#define _Post_bytecount_c_(size) //#define _Post_bytecount_x_(size) Modified: trunk/reactos/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] Tue Jan 22 22:51:51 2013 @@ -217,14 +217,18 @@ _IRQL_requires_max_(DISPATCH_LEVEL) _At_(DestinationString->Buffer, _Post_equal_to_(SourceString)) +_When_(SourceString != NULL, _At_(DestinationString->Length, _Post_equal_to_(_String_length_(SourceString) * sizeof(WCHAR))) -_At_(DestinationString->MaximumLength, _Post_equal_to_((_String_length_(SourceString)+1) * sizeof(WCHAR))) +_At_(DestinationString->MaximumLength, _Post_equal_to_(DestinationString->Length + sizeof(WCHAR)))) +_When_(SourceString == NULL, +_At_(DestinationString->Length, _Post_equal_to_(0)) +_At_(DestinationString->MaximumLength, _Post_equal_to_(0))) NTSYSAPI VOID NTAPI RtlInitUnicodeString( - _Out_ PUNICODE_STRING DestinationString, - _In_opt_z_ __drv_aliasesMem PCWSTR SourceString); + _Out_ PUNICODE_STRING DestinationString, + _In_opt_z_ __drv_aliasesMem PCWSTR SourceString); /* VOID * RtlMoveMemory( @@ -805,13 +809,14 @@ #define RtlStoreUlongPtr(Address,Value) RtlStoreUlong(Address,Value) #endif /* _WIN64 */ -_Success_(return != 0) +_Success_(return!=FALSE) +_Must_inspect_result_ NTSYSAPI BOOLEAN NTAPI RtlTimeFieldsToTime( - _In_ PTIME_FIELDS TimeFields, - _Out_ PLARGE_INTEGER Time); + _In_ PTIME_FIELDS TimeFields, + _Out_ PLARGE_INTEGER Time); NTSYSAPI VOID @@ -1566,12 +1571,13 @@ _Out_ PLARGE_INTEGER Time); _Success_(return != 0) +_Must_inspect_result_ NTSYSAPI BOOLEAN NTAPI RtlTimeToSecondsSince1970( - _In_ PLARGE_INTEGER Time, - _Out_ PULONG ElapsedSeconds); + _In_ PLARGE_INTEGER Time, + _Out_ PULONG ElapsedSeconds); NTSYSAPI VOID Modified: trunk/reactos/include/xdk/wdm.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/wdm.template.h… ============================================================================== --- trunk/reactos/include/xdk/wdm.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/wdm.template.h [iso-8859-1] Tue Jan 22 22:51:51 2013 @@ -41,6 +41,7 @@ #include <excpt.h> #include <ntdef.h> #include <ntstatus.h> +#include <kernelspecs.h> #include <ntiologc.h> #ifndef GUID_DEFINED Modified: trunk/reactos/include/xdk/zwfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/zwfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/zwfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/zwfuncs.h [iso-8859-1] Tue Jan 22 22:51:51 2013 @@ -593,7 +593,7 @@ _Must_inspect_result_ _At_(*BaseAddress, __drv_allocatesMem(Mem)) -__kernel_entry NTSYSCALLAPI +__kernel_entry NTSYSAPI NTSTATUS NTAPI

11 years, 8 months

[dgorbachev] 58203: [TRANSLATION] Hebrew translations by Baruch Rutman. CORE-6904.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Tue Jan 22 22:46:45 2013 New Revision: 58203 URL: http://svn.reactos.org/svn/reactos?rev=58203&view=rev Log: [TRANSLATION] Hebrew translations by Baruch Rutman. CORE-6904. Added: trunk/reactos/base/applications/calc/lang/he-IL.rc (with props) trunk/reactos/base/applications/charmap/lang/he-IL.rc (with props) trunk/reactos/base/applications/dxdiag/lang/he-IL.rc (with props) trunk/reactos/base/applications/fontview/lang/he-IL.rc (with props) trunk/reactos/base/applications/games/solitaire/lang/he-IL.rc (with props) trunk/reactos/base/applications/games/spider/lang/he-IL.rc (with props) trunk/reactos/base/applications/games/winmine/lang/he-IL.rc (with props) trunk/reactos/base/applications/kbswitch/lang/he-IL.rc (with props) trunk/reactos/base/applications/magnify/lang/he-IL.rc (with props) trunk/reactos/base/applications/mmc/lang/he-IL.rc (with props) trunk/reactos/base/applications/mplay32/lang/he-IL.rc (with props) trunk/reactos/base/applications/msconfig/lang/he-IL.rc (with props) trunk/reactos/base/applications/mscutils/devmgmt/lang/he-IL.rc (with props) trunk/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc (with props) trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc (with props) trunk/reactos/base/applications/mscutils/servman/lang/he-IL.rc (with props) trunk/reactos/base/applications/mspaint/lang/he-IL.rc (with props) trunk/reactos/base/applications/mstsc/lang/he-IL.rc (with props) trunk/reactos/base/applications/notepad/lang/he-IL.rc (with props) trunk/reactos/base/applications/rapps/lang/he-IL.rc (with props) trunk/reactos/base/applications/regedit/lang/he-IL.rc (with props) trunk/reactos/base/applications/screensavers/3dtext/lang/he-IL.rc (with props) trunk/reactos/base/applications/screensavers/logon/lang/he-IL.rc (with props) trunk/reactos/base/applications/shutdown/lang/he-IL.rc (with props) trunk/reactos/base/applications/sndrec32/lang/he-IL.rc (with props) trunk/reactos/base/applications/sndvol32/lang/he-IL.rc (with props) trunk/reactos/base/applications/taskmgr/lang/he-IL.rc (with props) trunk/reactos/base/applications/wordpad/He.rc (with props) trunk/reactos/base/applications/write/He.rc (with props) trunk/reactos/base/setup/reactos/lang/he-IL.rc (with props) trunk/reactos/base/setup/vmwinst/lang/he-IL.rc (with props) trunk/reactos/base/setup/welcome/lang/he-IL.rc (with props) trunk/reactos/base/shell/explorer-new/lang/he-IL.rc (with props) trunk/reactos/base/system/rundll32/lang/he-IL.rc (with props) trunk/reactos/base/system/runonce/lang/he-IL.rc (with props) trunk/reactos/base/system/userinit/lang/he-IL.rc (with props) trunk/reactos/base/system/winlogon/lang/he-IL.rc (with props) trunk/reactos/dll/cpl/access/lang/he-IL.rc (with props) trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc (with props) trunk/reactos/dll/cpl/console/lang/he-IL.rc (with props) trunk/reactos/dll/cpl/desk/lang/he-IL.rc (with props) trunk/reactos/dll/cpl/hdwwiz/lang/he-IL.rc (with props) trunk/reactos/dll/cpl/input/lang/he-IL.rc (with props) trunk/reactos/dll/cpl/intl/lang/he-IL.rc (with props) trunk/reactos/dll/cpl/joy/lang/he-IL.rc (with props) trunk/reactos/dll/cpl/liccpa/lang/he-IL.rc (with props) trunk/reactos/dll/cpl/main/lang/he-IL.rc (with props) trunk/reactos/dll/cpl/mmsys/lang/he-IL.rc (with props) trunk/reactos/dll/cpl/powercfg/lang/he-IL.rc (with props) trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc (with props) trunk/reactos/dll/cpl/telephon/lang/he-IL.rc (with props) trunk/reactos/dll/cpl/timedate/lang/he-IL.rc (with props) trunk/reactos/dll/cpl/usrmgr/lang/he-IL.rc (with props) trunk/reactos/dll/cpl/wined3dcfg/lang/he-IL.rc (with props) trunk/reactos/dll/shellext/deskadp/lang/he-IL.rc (with props) trunk/reactos/dll/shellext/deskmon/lang/he-IL.rc (with props) trunk/reactos/dll/shellext/slayer/lang/he-IL.rc (with props) trunk/reactos/dll/win32/aclui/lang/he-IL.rc (with props) trunk/reactos/dll/win32/avifil32/avifile_He.rc (with props) trunk/reactos/dll/win32/browseui/lang/he-IL.rc (with props) trunk/reactos/dll/win32/credui/credui_He.rc (with props) trunk/reactos/dll/win32/crypt32/crypt32_He.rc (with props) trunk/reactos/dll/win32/cryptdlg/cryptdlg_He.rc (with props) trunk/reactos/dll/win32/cryptui/cryptui_He.rc (with props) trunk/reactos/dll/win32/devmgr/lang/he-IL.rc (with props) trunk/reactos/dll/win32/hhctrl.ocx/He.rc (with props) trunk/reactos/dll/win32/iccvid/iccvid_He.rc (with props) trunk/reactos/dll/win32/jscript/jscript_He.rc (with props) trunk/reactos/dll/win32/localspl/spl_He.rc (with props) trunk/reactos/dll/win32/localui/ui_He.rc (with props) trunk/reactos/dll/win32/mapi32/He.rc (with props) trunk/reactos/dll/win32/modemui/lang/he-IL.rc (with props) trunk/reactos/dll/win32/mpr/mpr_He.rc (with props) trunk/reactos/dll/win32/msacm32/msacm_He.rc (with props) trunk/reactos/dll/win32/msgina/lang/he-IL.rc (with props) trunk/reactos/dll/win32/mshtml/He.rc (with props) trunk/reactos/dll/win32/msi/msi_He.rc (with props) trunk/reactos/dll/win32/msports/lang/he-IL.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_He.rc (with props) trunk/reactos/dll/win32/msvfw32/msvfw32_He.rc (with props) trunk/reactos/dll/win32/netcfgx/lang/he-IL.rc (with props) trunk/reactos/dll/win32/netid/lang/he-IL.rc (with props) trunk/reactos/dll/win32/netshell/lang/he-IL.rc (with props) trunk/reactos/dll/win32/newdev/lang/he-IL.rc (with props) trunk/reactos/dll/win32/oleacc/oleacc_He.rc (with props) trunk/reactos/dll/win32/oleaut32/oleaut32_He.rc (with props) Modified: trunk/reactos/base/applications/calc/resource.rc trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/dxdiag/rsrc.rc trunk/reactos/base/applications/fontview/fontview.rc trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/base/applications/games/spider/rsrc.rc trunk/reactos/base/applications/games/winmine/rsrc.rc trunk/reactos/base/applications/kbswitch/rsrc.rc trunk/reactos/base/applications/magnify/rsrc.rc trunk/reactos/base/applications/mmc/rsrc.rc trunk/reactos/base/applications/mplay32/rsrc.rc trunk/reactos/base/applications/msconfig/rsrc.rc trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc trunk/reactos/base/applications/mscutils/servman/rsrc.rc trunk/reactos/base/applications/mspaint/rsrc.rc trunk/reactos/base/applications/mstsc/rsrc.rc trunk/reactos/base/applications/notepad/rsrc.rc trunk/reactos/base/applications/rapps/rsrc.rc trunk/reactos/base/applications/regedit/rsrc.rc trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/shutdown/rsrc.rc trunk/reactos/base/applications/sndrec32/rsrc.rc trunk/reactos/base/applications/sndvol32/rsrc.rc trunk/reactos/base/applications/taskmgr/rsrc.rc trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/applications/write/rsrc.rc trunk/reactos/base/setup/reactos/rsrc.rc trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/muilanguages.h trunk/reactos/base/setup/vmwinst/rsrc.rc trunk/reactos/base/setup/welcome/rsrc.rc trunk/reactos/base/shell/explorer-new/explorer.rc trunk/reactos/base/system/rundll32/rsrc.rc trunk/reactos/base/system/runonce/rsrc.rc trunk/reactos/base/system/userinit/rsrc.rc trunk/reactos/base/system/winlogon/rsrc.rc trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/dll/cpl/access/rsrc.rc trunk/reactos/dll/cpl/appwiz/rsrc.rc trunk/reactos/dll/cpl/console/rsrc.rc trunk/reactos/dll/cpl/desk/rsrc.rc trunk/reactos/dll/cpl/hdwwiz/rsrc.rc trunk/reactos/dll/cpl/inetcpl/lang/He.rc trunk/reactos/dll/cpl/input/rsrc.rc trunk/reactos/dll/cpl/intl/rsrc.rc trunk/reactos/dll/cpl/joy/rsrc.rc trunk/reactos/dll/cpl/liccpa/rsrc.rc trunk/reactos/dll/cpl/main/rsrc.rc trunk/reactos/dll/cpl/mmsys/rsrc.rc trunk/reactos/dll/cpl/powercfg/rsrc.rc trunk/reactos/dll/cpl/sysdm/rsrc.rc trunk/reactos/dll/cpl/telephon/rsrc.rc trunk/reactos/dll/cpl/timedate/rsrc.rc trunk/reactos/dll/cpl/usrmgr/rsrc.rc trunk/reactos/dll/cpl/wined3dcfg/rsrc.rc trunk/reactos/dll/shellext/deskadp/rsrc.rc trunk/reactos/dll/shellext/deskmon/rsrc.rc trunk/reactos/dll/shellext/slayer/rsrc.rc trunk/reactos/dll/win32/aclui/rsrc.rc trunk/reactos/dll/win32/avifil32/rsrc.rc trunk/reactos/dll/win32/browseui/browseui.rc trunk/reactos/dll/win32/comctl32/comctl_He.rc trunk/reactos/dll/win32/credui/credui.rc trunk/reactos/dll/win32/crypt32/crypt32.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc trunk/reactos/dll/win32/cryptui/cryptui.rc trunk/reactos/dll/win32/devmgr/devmgr.rc trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc trunk/reactos/dll/win32/iccvid/rsrc.rc trunk/reactos/dll/win32/jscript/rsrc.rc trunk/reactos/dll/win32/localspl/localspl.rc trunk/reactos/dll/win32/localui/localui.rc trunk/reactos/dll/win32/mapi32/version.rc trunk/reactos/dll/win32/modemui/modemui.rc trunk/reactos/dll/win32/mpr/mpr.rc trunk/reactos/dll/win32/msacm32/msacm.rc trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/mshtml/rsrc.rc trunk/reactos/dll/win32/msports/msports.rc trunk/reactos/dll/win32/msrle32/rsrc.rc trunk/reactos/dll/win32/msvfw32/rsrc.rc trunk/reactos/dll/win32/netcfgx/netcfgx.rc trunk/reactos/dll/win32/netid/rsrc.rc trunk/reactos/dll/win32/netshell/netshell.rc trunk/reactos/dll/win32/newdev/rsrc.rc trunk/reactos/dll/win32/oleacc/oleacc.rc trunk/reactos/dll/win32/oleaut32/oleaut32.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/applications/calc/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… Added: trunk/reactos/base/applications/charmap/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Added: trunk/reactos/base/applications/dxdiag/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r… Modified: trunk/reactos/base/applications/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Added: trunk/reactos/base/applications/fontview/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Added: trunk/reactos/base/applications/games/solitaire/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Added: trunk/reactos/base/applications/games/spider/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/games/winmine/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/kbswitch/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Added: trunk/reactos/base/applications/magnify/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/magnify/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Added: trunk/reactos/base/applications/mmc/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… Modified: trunk/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/rsrc… Added: trunk/reactos/base/applications/mplay32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/mplay32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Added: trunk/reactos/base/applications/msconfig/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Added: trunk/reactos/base/applications/mscutils/devmgmt/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/servman/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mspaint/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Added: trunk/reactos/base/applications/mstsc/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… Added: trunk/reactos/base/applications/notepad/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Added: trunk/reactos/base/applications/rapps/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rs… Added: trunk/reactos/base/applications/regedit/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Added: trunk/reactos/base/applications/screensavers/3dtext/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Added: trunk/reactos/base/applications/screensavers/logon/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Added: trunk/reactos/base/applications/shutdown/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/applications/shutdown/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Added: trunk/reactos/base/applications/sndrec32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndvol32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Added: trunk/reactos/base/applications/taskmgr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Added: trunk/reactos/base/applications/wordpad/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Added: trunk/reactos/base/applications/write/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/He… Modified: trunk/reactos/base/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/rs… Added: trunk/reactos/base/setup/reactos/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/he… Modified: trunk/reactos/base/setup/reactos/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/rsrc.rc… Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… Added: trunk/reactos/base/setup/vmwinst/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/he… Modified: trunk/reactos/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/rsrc.rc… Added: trunk/reactos/base/setup/welcome/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/he… Modified: trunk/reactos/base/setup/welcome/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/rsrc.rc… Modified: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… Added: trunk/reactos/base/shell/explorer-new/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Added: trunk/reactos/base/system/rundll32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rsrc.… Added: trunk/reactos/base/system/runonce/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/lang/h… Modified: trunk/reactos/base/system/runonce/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/rsrc.r… Added: trunk/reactos/base/system/userinit/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/rsrc.… Added: trunk/reactos/base/system/winlogon/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/rsrc.… Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… Added: trunk/reactos/dll/cpl/access/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/he-IL.… Modified: trunk/reactos/dll/cpl/access/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/rsrc.rc?rev… Added: trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/he-IL.… Modified: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev… Added: trunk/reactos/dll/cpl/console/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/he-IL… Modified: trunk/reactos/dll/cpl/console/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/rsrc.rc?re… Added: trunk/reactos/dll/cpl/desk/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/he-IL.rc… Modified: trunk/reactos/dll/cpl/desk/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/rsrc.rc?rev=5… Added: trunk/reactos/dll/cpl/hdwwiz/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/he-IL.… Modified: trunk/reactos/dll/cpl/hdwwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/rsrc.rc?rev… Modified: trunk/reactos/dll/cpl/inetcpl/lang/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/He.rc… Added: trunk/reactos/dll/cpl/input/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/he-IL.r… Modified: trunk/reactos/dll/cpl/input/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/rsrc.rc?rev=… Added: trunk/reactos/dll/cpl/intl/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/he-IL.rc… Modified: trunk/reactos/dll/cpl/intl/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/rsrc.rc?rev=5… Added: trunk/reactos/dll/cpl/joy/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/he-IL.rc?… Modified: trunk/reactos/dll/cpl/joy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/rsrc.rc?rev=58… Added: trunk/reactos/dll/cpl/liccpa/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/lang/he-IL.… Modified: trunk/reactos/dll/cpl/liccpa/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/rsrc.rc?rev… Added: trunk/reactos/dll/cpl/main/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/he-IL.rc… Modified: trunk/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/rsrc.rc?rev=5… Added: trunk/reactos/dll/cpl/mmsys/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/he-IL.r… Modified: trunk/reactos/dll/cpl/mmsys/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/rsrc.rc?rev=… Added: trunk/reactos/dll/cpl/powercfg/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/he-I… Modified: trunk/reactos/dll/cpl/powercfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/rsrc.rc?r… Added: trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/he-IL.r… Modified: trunk/reactos/dll/cpl/sysdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/rsrc.rc?rev=… Added: trunk/reactos/dll/cpl/telephon/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/he-I… Modified: trunk/reactos/dll/cpl/telephon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/rsrc.rc?r… Added: trunk/reactos/dll/cpl/timedate/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/he-I… Modified: trunk/reactos/dll/cpl/timedate/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/rsrc.rc?r… Added: trunk/reactos/dll/cpl/usrmgr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/he-IL.… Modified: trunk/reactos/dll/cpl/usrmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/rsrc.rc?rev… Added: trunk/reactos/dll/cpl/wined3dcfg/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/he… Modified: trunk/reactos/dll/cpl/wined3dcfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/rsrc.rc… Added: trunk/reactos/dll/shellext/deskadp/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/shellext/deskadp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/rsrc.… Added: trunk/reactos/dll/shellext/deskmon/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… Modified: trunk/reactos/dll/shellext/deskmon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/rsrc.… Added: trunk/reactos/dll/shellext/slayer/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/lang/h… Modified: trunk/reactos/dll/shellext/slayer/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/rsrc.r… Added: trunk/reactos/dll/win32/aclui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/he-IL… Modified: trunk/reactos/dll/win32/aclui/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/rsrc.rc?re… Added: trunk/reactos/dll/win32/avifil32/avifile_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/rsrc.rc… Modified: trunk/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… Added: trunk/reactos/dll/win32/browseui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/he… Modified: trunk/reactos/dll/win32/comctl32/comctl_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/credui/credui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui.rc… Added: trunk/reactos/dll/win32/credui/credui_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_He… Modified: trunk/reactos/dll/win32/crypt32/crypt32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… Added: trunk/reactos/dll/win32/crypt32/crypt32_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… Added: trunk/reactos/dll/win32/cryptdlg/cryptdlg_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… Modified: trunk/reactos/dll/win32/cryptui/cryptui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… Added: trunk/reactos/dll/win32/cryptui/cryptui_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rc… Added: trunk/reactos/dll/win32/devmgr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/he-I… Added: trunk/reactos/dll/win32/hhctrl.ocx/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/He.rc… Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… Added: trunk/reactos/dll/win32/iccvid/iccvid_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_He… Modified: trunk/reactos/dll/win32/iccvid/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/rsrc.rc?r… Added: trunk/reactos/dll/win32/jscript/jscript_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript_… Modified: trunk/reactos/dll/win32/jscript/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/rsrc.rc?… Modified: trunk/reactos/dll/win32/localspl/localspl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localsp… Added: trunk/reactos/dll/win32/localspl/spl_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_He.… Modified: trunk/reactos/dll/win32/localui/localui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.… Added: trunk/reactos/dll/win32/localui/ui_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_He.rc… Added: trunk/reactos/dll/win32/mapi32/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/He.rc?rev… Modified: trunk/reactos/dll/win32/mapi32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/version.r… Added: trunk/reactos/dll/win32/modemui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/he-… Modified: trunk/reactos/dll/win32/modemui/modemui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/modemui.… Modified: trunk/reactos/dll/win32/mpr/mpr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rc?rev=5… Added: trunk/reactos/dll/win32/mpr/mpr_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_He.rc?re… Modified: trunk/reactos/dll/win32/msacm32/msacm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm.rc… Added: trunk/reactos/dll/win32/msacm32/msacm_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_He… Added: trunk/reactos/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/he-I… Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… Added: trunk/reactos/dll/win32/mshtml/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/He.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/rsrc.rc?r… Added: trunk/reactos/dll/win32/msi/msi_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_He.rc?re… Added: trunk/reactos/dll/win32/msports/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/he-… Modified: trunk/reactos/dll/win32/msports/msports.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… Added: trunk/reactos/dll/win32/msrle32/msrle_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_He… Modified: trunk/reactos/dll/win32/msrle32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/rsrc.rc?… Added: trunk/reactos/dll/win32/msvfw32/msvfw32_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Modified: trunk/reactos/dll/win32/msvfw32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/rsrc.rc?… Added: trunk/reactos/dll/win32/netcfgx/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/he-… Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… Added: trunk/reactos/dll/win32/netid/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/he-IL… Modified: trunk/reactos/dll/win32/netid/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/rsrc.rc?re… Added: trunk/reactos/dll/win32/netshell/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/he… Modified: trunk/reactos/dll/win32/netshell/netshell.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… Added: trunk/reactos/dll/win32/newdev/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/he-I… Modified: trunk/reactos/dll/win32/newdev/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/rsrc.rc?r… Modified: trunk/reactos/dll/win32/oleacc/oleacc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.rc… Added: trunk/reactos/dll/win32/oleacc/oleacc_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc_He… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Added: trunk/reactos/dll/win32/oleaut32/oleaut32_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3…

11 years, 8 months

[dgorbachev] 58202: [VGAFONTS] Add bitmap font for code page 862. Hebrew glyphs are from X11 font "Schumacher Clean" (see license below), modified by Baruch Rutman (peterooch*at*gmail*dot*com). COR...

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Tue Jan 22 22:41:31 2013 New Revision: 58202 URL: http://svn.reactos.org/svn/reactos?rev=58202&view=rev Log: [VGAFONTS] Add bitmap font for code page 862. Hebrew glyphs are from X11 font "Schumacher Clean" (see license below), modified by Baruch Rutman (peterooch*at*gmail*dot*com). CORE-6912. Copyright 1989 Dale Schumacher, dal(a)syntel.mn.org 399 Beacon Ave. St. Paul, MN 55104-3527 Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of Dale Schumacher not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. Dale Schumacher makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. Added: trunk/reactos/media/vgafonts/862-8x8.bin (with props) Modified: trunk/reactos/media/vgafonts/CMakeLists.txt Added: trunk/reactos/media/vgafonts/862-8x8.bin URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/862-8x8.bin… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/vgafonts/862-8x8.bin ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/vgafonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/CMakeLists.… ============================================================================== --- trunk/reactos/media/vgafonts/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/vgafonts/CMakeLists.txt [iso-8859-1] Tue Jan 22 22:41:31 2013 @@ -5,6 +5,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/775-8x8.bin ${CMAKE_CURRENT_SOURCE_DIR}/850-8x8.bin ${CMAKE_CURRENT_SOURCE_DIR}/852-8x8.bin + ${CMAKE_CURRENT_SOURCE_DIR}/862-8x8.bin ${CMAKE_CURRENT_SOURCE_DIR}/865-8x8.bin ${CMAKE_CURRENT_SOURCE_DIR}/866-8x8.bin ${CMAKE_CURRENT_SOURCE_DIR}/932-8x8.bin

11 years, 8 months

[dgorbachev] 58201: [CMAKE] - Improve help strings for GCC optimization levels. - Add new -Ofast and -Og levels. - Simplify gcc.cmake a bit. - Use MINGW_TOOLCHAIN_SUFFIX.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Tue Jan 22 22:38:40 2013 New Revision: 58201 URL: http://svn.reactos.org/svn/reactos?rev=58201&view=rev Log: [CMAKE] - Improve help strings for GCC optimization levels. - Add new -Ofast and -Og levels. - Simplify gcc.cmake a bit. - Use MINGW_TOOLCHAIN_SUFFIX. Modified: trunk/reactos/cmake/config-amd64.cmake trunk/reactos/cmake/config-arm.cmake trunk/reactos/cmake/config.cmake trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/config-amd64.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config-amd64.cmake?r… ============================================================================== --- trunk/reactos/cmake/config-amd64.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config-amd64.cmake [iso-8859-1] Tue Jan 22 22:38:40 2013 @@ -7,13 +7,15 @@ k8 opteron athlon64 athlon-fx") set (OPTIMIZE "1" CACHE STRING -"What level of optimisation to use. - 0 = off - 1 = Default option, optimize for size (-Os) with some additional options - 2 = -Os - 3 = -O1 - 4 = -O2 - 5 = -O3") +"What level of optimization to use. + 0 = off + 1 = Default option, optimize for size (-Os) with some additional options + 2 = Optimize for size (-Os) + 3 = Optimize debugging experience (-Og) + 4 = Optimize (-O1) + 5 = Optimize even more (-O2) + 6 = Optimize yet more (-O3) + 7 = Disregard strict standards compliance (-Ofast)") set(LTCG FALSE CACHE BOOL "Whether to build with link-time code generation") Modified: trunk/reactos/cmake/config-arm.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config-arm.cmake?rev… ============================================================================== --- trunk/reactos/cmake/config-arm.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config-arm.cmake [iso-8859-1] Tue Jan 22 22:38:40 2013 @@ -8,13 +8,15 @@ armv5te armv7-a") set (OPTIMIZE "1" CACHE STRING -"What level of optimisation to use. - 0 = off - 1 = Default option, optimize for size (-Os) with some additional options - 2 = -Os - 3 = -O1 - 4 = -O2 - 5 = -O3") +"What level of optimization to use. + 0 = off + 1 = Default option, optimize for size (-Os) with some additional options + 2 = Optimize for size (-Os) + 3 = Optimize debugging experience (-Og) + 4 = Optimize (-O1) + 5 = Optimize even more (-O2) + 6 = Optimize yet more (-O3) + 7 = Disregard strict standards compliance (-Ofast)") set(LTCG FALSE CACHE BOOL "Whether to build with link-time code generation") Modified: trunk/reactos/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config.cmake?rev=582… ============================================================================== --- trunk/reactos/cmake/config.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config.cmake [iso-8859-1] Tue Jan 22 22:38:40 2013 @@ -1,25 +1,25 @@ set(SARCH "pc" CACHE STRING -"Sub-architecture to build for. Specify one of: xbox") +"Sub-architecture to build for. Specify one of: + pc xbox") set(OARCH "pentium" CACHE STRING "Generate instructions for this CPU type. Specify one of: - native, i386, i486, pentium, pentium-mmx, pentiumpro, i686, - pentium2, pentium3, pentium-m, pentium4, prescott, nocona, - core2, k6, k6-2, athlon, athlon-xp, opteron, opteron-sse3, - barcelona, winchip-c6, winchip2, c3, c3-2, geode") + pentium, pentiumpro") set(TUNE "i686" CACHE STRING "Which CPU ReactOS should be optimized for.") set(OPTIMIZE "1" CACHE STRING -"What level of optimisation to use. - 0 = off - 1 = Default option, optimize for size (-Os) with some additional options - 2 = -Os - 3 = -O1 - 4 = -O2 - 5 = -O3") +"What level of optimization to use. + 0 = off + 1 = Default option, optimize for size (-Os) with some additional options + 2 = Optimize for size (-Os) + 3 = Optimize debugging experience (-Og) + 4 = Optimize (-O1) + 5 = Optimize even more (-O2) + 6 = Optimize yet more (-O3) + 7 = Disregard strict standards compliance (-Ofast)") set(LTCG FALSE CACHE BOOL "Whether to build with link-time code generation") Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=58201&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Tue Jan 22 22:38:40 2013 @@ -10,7 +10,7 @@ endif() # Compiler Core -add_compile_flags("-pipe -fms-extensions") +add_compile_flags("-pipe -fms-extensions -fno-strict-aliasing") #bug #file(TO_NATIVE_PATH ${REACTOS_SOURCE_DIR} REACTOS_SOURCE_DIR_NATIVE) @@ -28,9 +28,6 @@ add_compile_flags("-gstabs+") endif() -# Do not allow warnings -add_compile_flags("-Werror") - # For some reason, cmake sets -fPIC, and we don't want it if(DEFINED CMAKE_SHARED_LIBRARY_ASM_FLAGS) string(REPLACE "-fPIC" "" CMAKE_SHARED_LIBRARY_ASM_FLAGS ${CMAKE_SHARED_LIBRARY_ASM_FLAGS}) @@ -44,7 +41,7 @@ endif() # Warnings -add_compile_flags("-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-unused-value") +add_compile_flags("-Werror -Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-unused-value") if(GCC_VERSION VERSION_LESS 4.6) add_compile_flags("-Wno-error=uninitialized") @@ -62,15 +59,19 @@ # Optimizations if(OPTIMIZE STREQUAL "1") - add_compile_flags("-Os") + add_compile_flags("-Os -ftracer") elseif(OPTIMIZE STREQUAL "2") add_compile_flags("-Os") elseif(OPTIMIZE STREQUAL "3") + add_compile_flags("-O1 -fno-inline-functions-called-once -fno-tree-sra") +elseif(OPTIMIZE STREQUAL "4") add_compile_flags("-O1") -elseif(OPTIMIZE STREQUAL "4") +elseif(OPTIMIZE STREQUAL "5") add_compile_flags("-O2") -elseif(OPTIMIZE STREQUAL "5") +elseif(OPTIMIZE STREQUAL "6") add_compile_flags("-O3") +elseif(OPTIMIZE STREQUAL "7") + add_compile_flags("-Ofast") endif() # Link-time code generation @@ -78,25 +79,13 @@ add_compile_flags("-flto -Wno-error=clobbered") endif() -add_compile_flags("-fno-strict-aliasing") - if(ARCH STREQUAL "i386") add_compile_flags("-mpreferred-stack-boundary=3 -fno-set-stack-executable -fno-optimize-sibling-calls -fno-omit-frame-pointer") - if(OPTIMIZE STREQUAL "1") - add_compile_flags("-ftracer") - if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") - add_compile_flags("-momit-leaf-frame-pointer") - endif() + if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") + add_compile_flags("-momit-leaf-frame-pointer") endif() elseif(ARCH STREQUAL "amd64") add_compile_flags("-mpreferred-stack-boundary=4") - if(OPTIMIZE STREQUAL "1") - add_compile_flags("-ftracer") - endif() -elseif(ARCH STREQUAL "arm") - if(OPTIMIZE STREQUAL "1") - add_compile_flags("-ftracer") - endif() endif() # Other @@ -174,7 +163,7 @@ set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <FLAGS> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 ${I18N_DEFS} <DEFINES> <SOURCE> <OBJECT>") -set(CMAKE_DEPFILE_FLAGS_RC "--preprocessor \"${MINGW_TOOLCHAIN_PREFIX}gcc -E -xc-header -MMD -MF <DEPFILE> -MT <OBJECT>\" ") +set(CMAKE_DEPFILE_FLAGS_RC "--preprocessor \"${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX} -E -xc-header -MMD -MF <DEPFILE> -MT <OBJECT>\" ") # Optional 3rd parameter: stdcall stack bytes function(set_entrypoint MODULE ENTRYPOINT)

11 years, 8 months

[tkreuzer] 58200: [NTOSKRNL] Some keyed event fixes: disable APCs before acquiring the pushlock, close handle on exception, check if a wait was aborted and remove the wait list entry from the list ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 21 20:58:23 2013 New Revision: 58200 URL: http://svn.reactos.org/svn/reactos?rev=58200&view=rev Log: [NTOSKRNL] Some keyed event fixes: disable APCs before acquiring the pushlock, close handle on exception, check if a wait was aborted and remove the wait list entry from the list in that case. Modified: trunk/reactos/ntoskrnl/ex/keyedevt.c Modified: trunk/reactos/ntoskrnl/ex/keyedevt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/keyedevt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] Mon Jan 21 20:58:23 2013 @@ -142,6 +142,7 @@ HashIndex %= NUM_KEY_HASH_BUCKETS; /* Lock the lists */ + KeEnterCriticalRegion(); ExAcquirePushLockExclusive(&KeyedEvent->HashTable[HashIndex].Lock); /* Get the lists for search and wait, depending on whether @@ -161,6 +162,10 @@ ListEntry = WaitListHead1->Flink; while (ListEntry != WaitListHead1) { + /* Get the waiting thread. Note that this thread cannot be terminated + as long as we hold the list lock, since it either needs to wait to + be signaled by this thread or, when the wait is aborted due to thread + termination, then it first needs to acquire the list lock. */ Thread = CONTAINING_RECORD(ListEntry, ETHREAD, KeyedWaitChain); /* Check if this thread is a correct waiter */ @@ -170,11 +175,16 @@ /* Remove the thread from the list */ RemoveEntryList(&Thread->KeyedWaitChain); + /* Initialize the list entry to show that it was removed */ + InitializeListHead(&Thread->KeyedWaitChain); + /* Wake the thread */ KeReleaseSemaphore(&Thread->KeyedWaitSemaphore, 0, 1, FALSE); - - /* Unlock the lists */ + Thread = NULL; + + /* Unlock the list. After this it is not safe to access Thread */ ExReleasePushLockExclusive(&KeyedEvent->HashTable[HashIndex].Lock); + KeLeaveCriticalRegion(); return STATUS_SUCCESS; } @@ -192,8 +202,9 @@ /* Insert the current thread into the secondary wait list */ InsertTailList(WaitListHead2, &CurrentThread->KeyedWaitChain); - /* Unlock the lists */ + /* Unlock the list */ ExReleasePushLockExclusive(&KeyedEvent->HashTable[HashIndex].Lock); + KeLeaveCriticalRegion(); /* Wait for the keyed wait semaphore */ Status = KeWaitForSingleObject(&CurrentThread->KeyedWaitSemaphore, @@ -202,7 +213,26 @@ Alertable, Timeout); - return STATUS_SUCCESS; + /* Check if the wait was aborted or timed out */ + if (Status != STATUS_SUCCESS) + { + /* Lock the lists to make sure no one else messes with the entry */ + KeEnterCriticalRegion(); + ExAcquirePushLockExclusive(&KeyedEvent->HashTable[HashIndex].Lock); + + /* Check if the wait list entry is still in the list */ + if (CurrentThread->KeyedWaitChain.Flink != &CurrentThread->KeyedWaitChain) + { + /* Remove the thread from the list */ + RemoveEntryList(&CurrentThread->KeyedWaitChain); + } + + /* Unlock the list */ + ExReleasePushLockExclusive(&KeyedEvent->HashTable[HashIndex].Lock); + KeLeaveCriticalRegion(); + } + + return Status; } _IRQL_requires_max_(APC_LEVEL) @@ -274,7 +304,7 @@ /* Check for success */ if (!NT_SUCCESS(Status)) return Status; - /* Initalize the keyed event */ + /* Initialize the keyed event */ ExpInitializeKeyedEvent(KeyedEvent); /* Insert it */ @@ -353,6 +383,9 @@ { /* Get the exception code */ Status = _SEH2_GetExceptionCode(); + + /* Cleanup */ + ObCloseHandle(KeyedEventHandle, PreviousMode); } _SEH2_END; }

11 years, 8 months

[hbelusca] 58199: Code formatting only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 20 22:26:06 2013 New Revision: 58199 URL: http://svn.reactos.org/svn/reactos?rev=58199&view=rev Log: Code formatting only. Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.c Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/t… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/tuiconsole.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/tuiconsole.c [iso-8859-1] Sun Jan 20 22:26:06 2013 @@ -434,14 +434,14 @@ static BOOL WINAPI TuiChangeIcon(PCONSOLE Console, HICON hWindowIcon) { - return TRUE; + return TRUE; } static NTSTATUS WINAPI TuiResizeBuffer(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, COORD Size) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } DWORD WINAPI

11 years, 9 months

[hbelusca] 58198: [CONSRV] Add extra parentheses in macros arguments usage.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 20 22:15:21 2013 New Revision: 58198 URL: http://svn.reactos.org/svn/reactos?rev=58198&view=rev Log: [CONSRV] Add extra parentheses in macros arguments usage. Modified: branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/console.c Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] Sun Jan 20 22:15:21 2013 @@ -162,11 +162,11 @@ #define ConioSetScreenInfo(Console, Buff, OldCursorX, OldCursorY) \ (Console)->Vtbl->SetScreenInfo((Console), (Buff), (OldCursorX), (OldCursorY)) #define ConioUpdateScreenInfo(Console, Buff) \ - (Console)->Vtbl->UpdateScreenInfo(Console, Buff) + (Console)->Vtbl->UpdateScreenInfo((Console), (Buff)) #define ConioChangeTitle(Console) (Console)->Vtbl->ChangeTitle(Console) #define ConioCleanupConsole(Console) (Console)->Vtbl->CleanupConsole(Console) -#define ConioChangeIcon(Console, hWindowIcon) (Console)->Vtbl->ChangeIcon(Console, hWindowIcon) -#define ConioResizeBuffer(Console, Buff, Size) (Console)->Vtbl->ResizeBuffer(Console, Buff, Size) +#define ConioChangeIcon(Console, hWindowIcon) (Console)->Vtbl->ChangeIcon((Console), (hWindowIcon)) +#define ConioResizeBuffer(Console, Buff, Size) (Console)->Vtbl->ResizeBuffer((Console), (Buff), (Size)) /* console.c */ #define ConioLockConsole(ProcessData, Console) \ Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Sun Jan 20 22:15:21 2013 @@ -98,6 +98,7 @@ RtlCreateUnicodeString(&Console->Title, L"Command Prompt"); } + InitializeCriticalSection(&Console->Lock); Console->ReferenceCount = 0; Console->LineBuffer = NULL; Console->ConsoleLeaderCID = ConsoleLeaderProcess->ClientId; @@ -116,6 +117,7 @@ InitializeListHead(&Console->HistoryBuffers); Console->CodePage = GetOEMCP(); Console->OutputCodePage = GetOEMCP(); + Console->GuiData = NULL; SecurityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES); SecurityAttributes.lpSecurityDescriptor = NULL; @@ -125,11 +127,10 @@ if (NULL == Console->InputBuffer.ActiveEvent) { RtlFreeUnicodeString(&Console->Title); + DeleteCriticalSection(&Console->Lock); RtlFreeHeap(ConSrvHeap, 0, Console); return STATUS_UNSUCCESSFUL; } - Console->GuiData = NULL; - InitializeCriticalSection(&Console->Lock); GuiMode = DtbgIsDesktopVisible();

11 years, 9 months

← Newer
1
2
3
4
5
6
7
8
9
...
19
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 2013