Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[spetreolle] 28157: C uses / as dir separator, not \
by spetreolle＠svn.reactos.org 04 Aug '07

04 Aug '07

Author: spetreolle Date: Sat Aug 4 17:22:48 2007 New Revision: 28157 URL: http://svn.reactos.org/svn/reactos?rev=28157&view=rev Log: C uses / as dir separator, not \ Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c trunk/rostests/apitests/w32knapi/testlist.c trunk/rostests/apitests/w32knapi/w32knapi.h Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c Sat Aug 4 17:22:48 2007 @@ -1,4 +1,4 @@ -#include "..\w32knapi.h" +#include "../w32knapi.h" W32KAPI HANDLE Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c Sat Aug 4 17:22:48 2007 @@ -1,4 +1,4 @@ -#include "..\w32knapi.h" +#include "../w32knapi.h" W32KAPI BOOL Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Sat Aug 4 17:22:48 2007 @@ -1,4 +1,4 @@ -#include "..\w32knapi.h" +#include "../w32knapi.h" #if 0 W32KAPI BOOL STDCALL Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c (original) +++ trunk/rostests/apitests/w32knapi/testlist.c Sat Aug 4 17:22:48 2007 @@ -1,4 +1,4 @@ -#include "..\apitest.h" +#include "../apitest.h" /* include the tests */ Modified: trunk/rostests/apitests/w32knapi/w32knapi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.h (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.h Sat Aug 4 17:22:48 2007 @@ -1,7 +1,7 @@ #ifndef _W32KNAPI_H #define _W32KNAPI_H -#include "..\apitest.h" +#include "../apitest.h" #include <ddk/winddi.h> #define OS_UNSUPPORTED 0

1 0

[gedmurphy] 28156: revert the unicode build for now as it causes a problem with our gcc build
by gedmurphy＠svn.reactos.org 04 Aug '07

04 Aug '07

Author: gedmurphy Date: Sat Aug 4 15:19:51 2007 New Revision: 28156 URL: http://svn.reactos.org/svn/reactos?rev=28156&view=rev Log: revert the unicode build for now as it causes a problem with our gcc build Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.rbuild (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.rbuild Sat Aug 4 15:19:51 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<module name="sol" type="win32gui" installbase="system32" installname="sol.exe" unicode="yes" allowwarnings="yes" stdlib="host"> +<module name="sol" type="win32gui" installbase="system32" installname="sol.exe" unicode="no" allowwarnings="yes" stdlib="host"> <include base="sol">.</include> <include base="sol">cardlib</include> <linkerflag>-lstdc++</linkerflag>

1 0

[fireball] 28155: - Fix kernel32 compile.
by fireball＠svn.reactos.org 04 Aug '07

04 Aug '07

Author: fireball Date: Sat Aug 4 14:59:01 2007 New Revision: 28155 URL: http://svn.reactos.org/svn/reactos?rev=28155&view=rev Log: - Fix kernel32 compile. Modified: trunk/reactos/dll/win32/kernel32/k32.h Modified: trunk/reactos/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/k32.h?r… ============================================================================== --- trunk/reactos/dll/win32/kernel32/k32.h (original) +++ trunk/reactos/dll/win32/kernel32/k32.h Sat Aug 4 14:59:01 2007 @@ -16,6 +16,11 @@ #define _KERNEL32_ #include <windows.h> #include <tlhelp32.h> + +#ifdef __GNUC__ +#include "intrin.h" +#endif + #include <ndk/ntndk.h> /* CSRSS Header */

1 0

[ekohl] 28154: - Ask the user when he closes the window only if the game is still running.
by ekohl＠svn.reactos.org 04 Aug '07

04 Aug '07

Author: ekohl Date: Sat Aug 4 14:22:44 2007 New Revision: 28154 URL: http://svn.reactos.org/svn/reactos?rev=28154&view=rev Log: - Ask the user when he closes the window only if the game is still running. Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp trunk/reactos/base/applications/games/solitaire/solitaire.cpp trunk/reactos/base/applications/games/solitaire/solitaire.h Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solgame.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solgame.cpp Sat Aug 4 14:22:44 2007 @@ -121,6 +121,8 @@ } } + fGameStarted = true; + TRACE("EXIT RowStackDropProc(true)\n"); return true; } @@ -248,6 +250,7 @@ { pSuitStack[i]->Flash(11, 100); } + fGameStarted = false; } TRACE("EXIT SuitStackAddProc()\n"); } @@ -273,6 +276,8 @@ if(pDest != 0) { + fGameStarted = true; + //stackobj.MoveCards(pDest, 1, true); //use the SimulateDrag funcion, because we get the //AddProc callbacks called for us on the destination stacks... Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Sat Aug 4 14:22:44 2007 @@ -415,6 +415,7 @@ static int nWidth, nHeight; int nStatusHeight = 0;//20; int parts[] = { 100, -1 }; + int ret; MINMAXINFO *mmi; @@ -492,7 +493,20 @@ return 0; case WM_CLOSE: - DestroyWindow(hwnd); + if (fGameStarted == false) + { + DestroyWindow(hwnd); + return 0; + } + else + { + ret = MessageBox(hwnd, MsgQuit, szAppName, MB_OKCANCEL|MB_ICONQUESTION); + if (ret == IDOK) + { + WinHelp(hwnd, szHelpPath, HELP_QUIT, 0); + DestroyWindow(hwnd); + } + } return 0; } Modified: trunk/reactos/base/applications/games/solitaire/solitaire.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.h (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.h Sat Aug 4 14:22:44 2007 @@ -3,7 +3,7 @@ extern CardWindow SolWnd; extern TCHAR szAppName[]; -extern bool fGameStarted; +extern bool fGameStarted; #define OPTION_THREE_CARDS 8 #define CARDBACK_START IDC_CARDBACK1

1 0

[fireball] 28153: - Fix NtSetInformationThread(ThreadBasePriority) - Fix buffer overflow in KeRosDumpStackFrames - Fix usage of garbage/uninitialized handle entry local variable in ObpCreateHandle - Fix buffer overflow and logic bug in IoConnectInterrupt - Fix MSVC warnings
by fireball＠svn.reactos.org 04 Aug '07

04 Aug '07

Author: fireball Date: Sat Aug 4 12:49:47 2007 New Revision: 28153 URL: http://svn.reactos.org/svn/reactos?rev=28153&view=rev Log: - Fix NtSetInformationThread(ThreadBasePriority) - Fix buffer overflow in KeRosDumpStackFrames - Fix usage of garbage/uninitialized handle entry local variable in ObpCreateHandle - Fix buffer overflow and logic bug in IoConnectInterrupt - Fix MSVC warnings Modified: trunk/reactos/include/ndk/ntndk.h trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/config/cmname.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/ex/fmutex.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/inbv/inbv.c trunk/reactos/ntoskrnl/io/iomgr/controller.c trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/deviface.c trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c trunk/reactos/ntoskrnl/io/iomgr/error.c trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c trunk/reactos/ntoskrnl/io/iomgr/irq.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/procobj.c trunk/reactos/ntoskrnl/ke/queue.c trunk/reactos/ntoskrnl/lpc/complete.c trunk/reactos/ntoskrnl/lpc/connect.c trunk/reactos/ntoskrnl/lpc/reply.c trunk/reactos/ntoskrnl/lpc/send.c trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ps/psmgr.c trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/include/ndk/ntndk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ntndk.h?rev=28… ============================================================================== --- trunk/reactos/include/ndk/ntndk.h (original) +++ trunk/reactos/include/ndk/ntndk.h Sat Aug 4 12:49:47 2007 @@ -38,7 +38,6 @@ #include <excpt.h> // C Standard Header #include <stdarg.h> // C Standard Header #include <umtypes.h> // General Definitions -#include <intrin.h> // Use Inlined Intrinsics // // Type Headers Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=28153… ============================================================================== --- trunk/reactos/ntoskrnl/cc/fs.c (original) +++ trunk/reactos/ntoskrnl/cc/fs.c Sat Aug 4 12:49:47 2007 @@ -239,6 +239,6 @@ UNIMPLEMENTED; return FALSE; #else - return CcRosReleaseFileCache(FileObject); + return NT_SUCCESS(CcRosReleaseFileCache(FileObject)); #endif } Modified: trunk/reactos/ntoskrnl/config/cmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmname.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmname.c (original) +++ trunk/reactos/ntoskrnl/config/cmname.c Sat Aug 4 12:49:47 2007 @@ -102,7 +102,7 @@ * that it will remain that way forever, so -never- assume this code * below internally! */ - return Length * sizeof(WCHAR); + return (USHORT)Length * sizeof(WCHAR); } LONG Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Sat Aug 4 12:49:47 2007 @@ -455,7 +455,7 @@ } /* Setup the unicode string */ - RtlInitEmptyUnicodeString(&CmpLoadOptions, Buffer, Length); + RtlInitEmptyUnicodeString(&CmpLoadOptions, Buffer, (USHORT)Length); /* Add the load options and null-terminate */ RtlAnsiStringToUnicodeString(&CmpLoadOptions, &LoadString, FALSE); Modified: trunk/reactos/ntoskrnl/ex/fmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/fmutex.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ex/fmutex.c (original) +++ trunk/reactos/ntoskrnl/ex/fmutex.c Sat Aug 4 12:49:47 2007 @@ -135,7 +135,7 @@ /* Erase the owner */ FastMutex->Owner = NULL; - OldIrql = FastMutex->OldIrql; + OldIrql = (KIRQL)FastMutex->OldIrql; /* Increase the count */ if (InterlockedIncrement(&FastMutex->Count) <= 0) Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=281… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Sat Aug 4 12:49:47 2007 @@ -1094,7 +1094,7 @@ } /* Update length */ - CmCSDVersionString.MaximumLength = sizeof(Buffer) - Remaining; + CmCSDVersionString.MaximumLength = (USHORT)sizeof(Buffer) - Remaining; } /* Check if we have an RC number */ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Sat Aug 4 12:49:47 2007 @@ -65,7 +65,7 @@ ModuleInfo->ImageSize = LdrEntry->SizeOfImage; ModuleInfo->Flags = LdrEntry->Flags; ModuleInfo->LoadCount = LdrEntry->LoadCount; - ModuleInfo->LoadOrderIndex = ModuleCount; + ModuleInfo->LoadOrderIndex = (USHORT)ModuleCount; ModuleInfo->InitOrderIndex = 0; /* Setup name */ @@ -231,7 +231,7 @@ { ANSI_STRING AName; UNICODE_STRING WName; - BOOLEAN Result; + ARC_STATUS Result; PCH Value; ANSI_STRING AValue; UNICODE_STRING WValue; @@ -417,7 +417,7 @@ TRUE); if(NT_SUCCESS(Status)) { - BOOLEAN Result = HalSetEnvironmentVariable(AName.Buffer, + ARC_STATUS Result = HalSetEnvironmentVariable(AName.Buffer, AValue.Buffer); Status = (Result ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); @@ -766,7 +766,7 @@ SpiCur->UserTime.QuadPart = pr->Pcb.UserTime * 100000LL; SpiCur->KernelTime.QuadPart = pr->Pcb.KernelTime * 100000LL; SpiCur->ImageName.Length = strlen(pr->ImageFileName) * sizeof(WCHAR); - SpiCur->ImageName.MaximumLength = inLen; + SpiCur->ImageName.MaximumLength = (USHORT)inLen; SpiCur->ImageName.Buffer = (void*)(pCur+curSize); // copy name to the end of the struct @@ -1058,7 +1058,7 @@ for (Count = 0; HandleCount > 0 ; HandleCount--) { - Shi->Handles[i].UniqueProcessId = (ULONG)pr->UniqueProcessId; + Shi->Handles[i].UniqueProcessId = (USHORT)(ULONG)pr->UniqueProcessId; Count++; i++; } Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c Sat Aug 4 12:49:47 2007 @@ -372,7 +372,7 @@ if (InbvBootDriverInstalled) { /* Call bootvid */ - VidSolidColorFill(Left, Top, Width, Height, Color); + VidSolidColorFill(Left, Top, Width, Height, (UCHAR)Color); } /* FIXME: Headless */ Modified: trunk/reactos/ntoskrnl/io/iomgr/controller.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/controll… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/controller.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/controller.c Sat Aug 4 12:49:47 2007 @@ -92,7 +92,7 @@ /* Zero the Object and set its data */ RtlZeroMemory(Controller, sizeof(CONTROLLER_OBJECT) + Size); Controller->Type = IO_TYPE_CONTROLLER; - Controller->Size = sizeof(CONTROLLER_OBJECT) + Size; + Controller->Size = (CSHORT)sizeof(CONTROLLER_OBJECT) + Size; Controller->ControllerExtension = (Controller + 1); /* Initialize its Queue */ Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c Sat Aug 4 12:49:47 2007 @@ -765,7 +765,7 @@ * because that's only padding for the DevObjExt and not part of the Object. */ CreatedDeviceObject->Type = IO_TYPE_DEVICE; - CreatedDeviceObject->Size = sizeof(DEVICE_OBJECT) + DeviceExtensionSize; + CreatedDeviceObject->Size = (USHORT)sizeof(DEVICE_OBJECT) + DeviceExtensionSize; /* The kernel extension is after the driver internal extension */ DeviceObjectExtension = (PDEVOBJ_EXTENSION) @@ -1402,7 +1402,7 @@ IopStartNextPacketByKeyEx(DeviceObject, Key, DOE_SIO_WITH_KEY | - (Cancelable) ? DOE_SIO_CANCELABLE : 0); + (Cancelable ? DOE_SIO_CANCELABLE : 0)); } else { @@ -1431,7 +1431,7 @@ IopStartNextPacketByKeyEx(DeviceObject, 0, DOE_SIO_NO_KEY | - (Cancelable) ? DOE_SIO_CANCELABLE : 0); + (Cancelable ? DOE_SIO_CANCELABLE : 0)); } else { Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c Sat Aug 4 12:49:47 2007 @@ -300,7 +300,7 @@ } /* Open device key */ - KeyName.Length = KeyName.MaximumLength = DeviceBi->NameLength; + KeyName.Length = KeyName.MaximumLength = (USHORT)DeviceBi->NameLength; KeyName.Buffer = DeviceBi->Name; InitializeObjectAttributes( &ObjectAttributes, @@ -370,7 +370,7 @@ goto cleanup; } - KeyName.Length = KeyName.MaximumLength = ReferenceBi->NameLength; + KeyName.Length = KeyName.MaximumLength = (USHORT)ReferenceBi->NameLength; KeyName.Buffer = ReferenceBi->Name; if (RtlEqualUnicodeString(&KeyName, &Control, TRUE)) { @@ -475,7 +475,7 @@ Status = STATUS_UNSUCCESSFUL; goto cleanup; } - KeyName.Length = KeyName.MaximumLength = bip->DataLength - 4 * sizeof(WCHAR); + KeyName.Length = KeyName.MaximumLength = (USHORT)bip->DataLength - 4 * sizeof(WCHAR); KeyName.Buffer = &((PWSTR)bip->Data)[4]; if (KeyName.Length && KeyName.Buffer[KeyName.Length / sizeof(WCHAR)] == UNICODE_NULL) { @@ -976,7 +976,7 @@ return STATUS_INVALID_PARAMETER_1; } GuidString.Buffer = StartPosition; - GuidString.MaximumLength = GuidString.Length = (ULONG_PTR)(EndPosition + 1) - (ULONG_PTR)StartPosition; + GuidString.MaximumLength = GuidString.Length = (USHORT)((ULONG_PTR)(EndPosition + 1) - (ULONG_PTR)StartPosition); /* Get pointer to the PDO */ Status = IoGetDeviceObjectPointer( Modified: trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/drvrlist… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c Sat Aug 4 12:49:47 2007 @@ -323,8 +323,8 @@ if (KeyInfo->NameLength < MAX_PATH * sizeof(WCHAR)) { - SubKeyName.Length = KeyInfo->NameLength; - SubKeyName.MaximumLength = KeyInfo->NameLength + sizeof(WCHAR); + SubKeyName.Length = (USHORT)KeyInfo->NameLength; + SubKeyName.MaximumLength = (USHORT)KeyInfo->NameLength + sizeof(WCHAR); SubKeyName.Buffer = KeyInfo->Name; SubKeyName.Buffer[SubKeyName.Length / sizeof(WCHAR)] = 0; Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/error.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/error.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/error.c Sat Aug 4 12:49:47 2007 @@ -338,8 +338,8 @@ if (NT_SUCCESS(Status)) { /* Success, update the information */ - ObjectNameInfo->Name.Length = 100 - - DriverNameLength; + ObjectNameInfo->Name.Length = (USHORT)100 - + DriverNameLength; } } } @@ -434,7 +434,8 @@ /* Update size */ InterlockedExchangeAdd(&IopTotalLogSize, - -(LogEntry->Size - sizeof(ERROR_LOG_ENTRY))); + -(LONG)(LogEntry->Size - + sizeof(ERROR_LOG_ENTRY))); } /* Free the LPC Message */ @@ -557,7 +558,7 @@ /* Decrease total allocation size and free the entry */ InterlockedExchangeAdd(&IopTotalLogSize, - -(LogEntry->Size - sizeof(ERROR_LOG_ENTRY))); + -(LONG)(LogEntry->Size - sizeof(ERROR_LOG_ENTRY))); ExFreePool(LogEntry); } Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sat Aug 4 12:49:47 2007 @@ -512,7 +512,7 @@ StackLoc->Parameters.Create.EaLength = OpenPacket->EaLength; /* Set the flags */ - StackLoc->Flags = OpenPacket->Options; + StackLoc->Flags = (UCHAR)OpenPacket->Options; StackLoc->Flags |= !(Attributes & OBJ_CASE_INSENSITIVE) ? SL_CASE_SENSITIVE: 0; break; @@ -764,7 +764,8 @@ FileObject->DeviceObject = NULL; /* Save this now because the FO might go away */ - OpenCancelled = FileObject->Flags & FO_FILE_OPEN_CANCELLED; + OpenCancelled = FileObject->Flags & FO_FILE_OPEN_CANCELLED ? + TRUE : FALSE; /* Clear the file object in the open packet */ OpenPacket->FileObject = NULL; @@ -1370,9 +1371,10 @@ /* Setup the length and maximum length */ FileLength = (ULONG_PTR)p - (ULONG_PTR)ObjectNameInfo; - ObjectNameInfo->Name.Length = FileLength - sizeof(OBJECT_NAME_INFORMATION); - ObjectNameInfo->Name.MaximumLength = ObjectNameInfo->Name.Length + - sizeof(UNICODE_NULL); + ObjectNameInfo->Name.Length = (USHORT)FileLength - + sizeof(OBJECT_NAME_INFORMATION); + ObjectNameInfo->Name.MaximumLength = (USHORT)ObjectNameInfo->Name.Length + + sizeof(UNICODE_NULL); /* Free buffer and return */ ExFreePool(LocalInfo); @@ -1745,8 +1747,8 @@ OpenPacket.OriginalAttributes = *ObjectAttributes; OpenPacket.AllocationSize = SafeAllocationSize; OpenPacket.CreateOptions = CreateOptions; - OpenPacket.FileAttributes = FileAttributes; - OpenPacket.ShareAccess = ShareAccess; + OpenPacket.FileAttributes = (USHORT)FileAttributes; + OpenPacket.ShareAccess = (USHORT)ShareAccess; OpenPacket.EaBuffer = SystemEaBuffer; OpenPacket.EaLength = EaLength; OpenPacket.Options = Options; @@ -2078,7 +2080,7 @@ IoIsFileOriginRemote(IN PFILE_OBJECT FileObject) { /* Return the flag status */ - return (FileObject->Flags & FO_REMOTE_ORIGIN); + return FileObject->Flags & FO_REMOTE_ORIGIN ? TRUE : FALSE; } /* Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c Sat Aug 4 12:49:47 2007 @@ -533,8 +533,8 @@ /* Enumerate the Bus. */ BusString.Buffer = BasicInformation->Name; - BusString.Length = BasicInformation->NameLength; - BusString.MaximumLength = BasicInformation->NameLength; + BusString.Length = (USHORT)BasicInformation->NameLength; + BusString.MaximumLength = (USHORT)BasicInformation->NameLength; /* Open a handle to the Root Registry Key */ InitializeObjectAttributes( Modified: trunk/reactos/ntoskrnl/io/iomgr/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irq.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irq.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irq.c Sat Aug 4 12:49:47 2007 @@ -36,28 +36,28 @@ PIO_INTERRUPT IoInterrupt; PKSPIN_LOCK SpinLockUsed; BOOLEAN FirstRun = TRUE; - ULONG count; - LONG i; + CCHAR Count = 0; + KAFFINITY Affinity; PAGED_CODE(); /* Assume failure */ *InterruptObject = NULL; - /* Convert the Mask */ - ProcessorEnableMask &= ((1 << KeNumberProcessors) - 1); + /* Get the affinity */ + Affinity = ProcessorEnableMask & KeActiveProcessors; + while (Affinity) + { + /* Increase count */ + if (Affinity & 1) Count++; + Affinity >>= 1; + } - /* Make sure at least one CPU is on it */ - if (!ProcessorEnableMask) return STATUS_INVALID_PARAMETER; - - /* Determine the allocation */ - for (i = 0, count = 0; i < KeNumberProcessors; i++) - { - if (ProcessorEnableMask & (1 << i)) count++; - } + /* Make sure we have a valid CPU count */ + if (!Count) return STATUS_INVALID_PARAMETER; /* Allocate the array of I/O Interrupts */ IoInterrupt = ExAllocatePoolWithTag(NonPagedPool, - (count - 1)* sizeof(KINTERRUPT) + + (Count - 1) * sizeof(KINTERRUPT) + sizeof(IO_INTERRUPT), TAG_KINTERRUPT); if (!IoInterrupt) return STATUS_INSUFFICIENT_RESOURCES; @@ -74,10 +74,10 @@ RtlZeroMemory(IoInterrupt, sizeof(IO_INTERRUPT)); /* Now create all the interrupts */ - for (i = 0; i < KeNumberProcessors; i++) + for (Count = 0; Affinity; Count++, Affinity >>= 1) { /* Check if it's enabled for this CPU */ - if (ProcessorEnableMask & (1 << i)) + if (Affinity & 1) { /* Check which one we will use */ InterruptUsed = FirstRun ? &IoInterrupt->FirstInterrupt : Interrupt; @@ -92,7 +92,7 @@ SynchronizeIrql, InterruptMode, ShareVector, - i, + Count, FloatingSave); /* Connect it */ @@ -122,7 +122,7 @@ else { /* Move on to the next one */ - IoInterrupt->Interrupt[i] = Interrupt++; + IoInterrupt->Interrupt[(UCHAR)Count] = Interrupt++; } } } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpnoti… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c Sat Aug 4 12:49:47 2007 @@ -10,9 +10,9 @@ /* INCLUDES ******************************************************************/ +#include <ntoskrnl.h> #define NDEBUG -#include <ntoskrnl.h> -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, IopInitPnpNotificationImplementation) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Sat Aug 4 12:49:47 2007 @@ -10,9 +10,9 @@ /* INCLUDES ******************************************************************/ +#include <ntoskrnl.h> #define NDEBUG -#include <ntoskrnl.h> -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Sat Aug 4 12:49:47 2007 @@ -287,7 +287,7 @@ String->Buffer = ExAllocatePoolWithTag(PagedPool, ValueLength, TAG_PNP_ROOT); if (String->Buffer == NULL) return STATUS_NO_MEMORY; - String->Length = String->MaximumLength = ValueLength; + String->Length = String->MaximumLength = (USHORT)ValueLength; RtlCopyMemory(String->Buffer, ValueData, ValueLength); if (ValueLength > 0 && String->Buffer[ValueLength / sizeof(WCHAR) - 1] == L'\0') String->Length -= sizeof(WCHAR); Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2815… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Sat Aug 4 12:49:47 2007 @@ -143,7 +143,7 @@ PLDR_DATA_TABLE_ENTRY LdrEntry; /* If the caller didn't ask, assume 32 frames */ - if (!FrameCount) FrameCount = 32; + if (!FrameCount || FrameCount > 32) FrameCount = 32; /* Get the current frames */ FrameCount = RtlCaptureStackBackTrace(2, FrameCount, (PVOID*)Frames, NULL); Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Sat Aug 4 12:49:47 2007 @@ -10,7 +10,7 @@ /* INCLUDES ******************************************************************/ -#include <roscfg.h> +//#include <roscfg.h> #include <ndk/asm.h> .intel_syntax noprefix Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c Sat Aug 4 12:49:47 2007 @@ -170,7 +170,8 @@ if (Mask != NewMask) { /* Update it */ - KeGetCurrentThread()->DispatcherHeader.DebugActive = NewMask; + KeGetCurrentThread()->DispatcherHeader.DebugActive = + (BOOLEAN)NewMask; } } Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Sat Aug 4 12:49:47 2007 @@ -216,10 +216,11 @@ CurrentSample->TSCStart; /* Compute CPU Speed */ - CurrentSample->MHz = ((CurrentSample->TSCDelta * - CurrentSample->PerfFreq.QuadPart + - 500000) / - (CurrentSample->PerfDelta * 1000000)); + CurrentSample->MHz = (ULONG)((CurrentSample->TSCDelta * + CurrentSample-> + PerfFreq.QuadPart + 500000) / + (CurrentSample->PerfDelta * + 1000000)); /* Check if this isn't the first sample */ if (Sample) Modified: trunk/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/procobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/procobj.c (original) +++ trunk/reactos/ntoskrnl/ke/procobj.c Sat Aug 4 12:49:47 2007 @@ -308,7 +308,7 @@ /* Save the current base priority and update it */ OldPriority = Process->BasePriority; - Process->BasePriority = Priority; + Process->BasePriority = (SCHAR)Priority; /* Calculate the priority delta */ Delta = Priority - OldPriority; @@ -364,7 +364,7 @@ } /* Update priority and quantum */ - Thread->BasePriority = NewPriority; + Thread->BasePriority = (SCHAR)NewPriority; Thread->Quantum = Thread->QuantumReset; /* Disable decrements and update priority */ @@ -426,7 +426,7 @@ } /* Update priority and quantum */ - Thread->BasePriority = NewPriority; + Thread->BasePriority = (SCHAR)NewPriority; Thread->Quantum = Thread->QuantumReset; /* Disable decrements and update priority */ Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=28… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c (original) +++ trunk/reactos/ntoskrnl/ke/queue.c Sat Aug 4 12:49:47 2007 @@ -358,7 +358,7 @@ { /* Check if the timer expired */ InterruptTime.QuadPart = KeQueryInterruptTime(); - if (InterruptTime.QuadPart >= Timer->DueTime.QuadPart) + if ((ULONG64)InterruptTime.QuadPart >= Timer->DueTime.QuadPart) { /* It did, so we don't need to wait */ QueueEntry = (PLIST_ENTRY)STATUS_TIMEOUT; Modified: trunk/reactos/ntoskrnl/lpc/complete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/complete.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/complete.c (original) +++ trunk/reactos/ntoskrnl/lpc/complete.c Sat Aug 4 12:49:47 2007 @@ -134,8 +134,8 @@ } /* Set the sizes of our reply message */ - Message->Request.u1.s1.DataLength = sizeof(LPCP_CONNECTION_MESSAGE) + - ConnectionInfoLength; + Message->Request.u1.s1.DataLength = (CSHORT)ConnectionInfoLength + + sizeof(LPCP_CONNECTION_MESSAGE); Message->Request.u1.s1.TotalLength = sizeof(LPCP_MESSAGE) + Message->Request.u1.s1.DataLength; Modified: trunk/reactos/ntoskrnl/lpc/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/connect.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/connect.c (original) +++ trunk/reactos/ntoskrnl/lpc/connect.c Sat Aug 4 12:49:47 2007 @@ -352,8 +352,8 @@ ConnectMessage->SectionToMap = SectionToMap; /* Set the data for the connection request message */ - Message->Request.u1.s1.DataLength = sizeof(LPCP_CONNECTION_MESSAGE) + - ConnectionInfoLength; + Message->Request.u1.s1.DataLength = (CSHORT)ConnectionInfoLength + + sizeof(LPCP_CONNECTION_MESSAGE); Message->Request.u1.s1.TotalLength = sizeof(LPCP_MESSAGE) + Message->Request.u1.s1.DataLength; Message->Request.u2.s2.Type = LPC_CONNECTION_REQUEST; Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c Sat Aug 4 12:49:47 2007 @@ -180,8 +180,8 @@ if (ReplyMessage) { /* Validate its length */ - if ((ReplyMessage->u1.s1.DataLength + sizeof(PORT_MESSAGE)) > - ReplyMessage->u1.s1.TotalLength) + if (((ULONG)ReplyMessage->u1.s1.DataLength + sizeof(PORT_MESSAGE)) > + (ULONG)ReplyMessage->u1.s1.TotalLength) { /* Fail */ return STATUS_INVALID_PARAMETER; @@ -204,8 +204,9 @@ if (ReplyMessage) { /* Validate its length in respect to the port object */ - if ((ReplyMessage->u1.s1.TotalLength > Port->MaxMessageLength) || - (ReplyMessage->u1.s1.TotalLength <= ReplyMessage->u1.s1.DataLength)) + if (((ULONG)ReplyMessage->u1.s1.TotalLength > Port->MaxMessageLength) || + ((ULONG)ReplyMessage->u1.s1.TotalLength <= + (ULONG)ReplyMessage->u1.s1.DataLength)) { /* Too large, fail */ ObDereferenceObject(Port); @@ -408,9 +409,9 @@ Message = NULL; /* Setup the receive message */ - ReceiveMessage->u1.s1.TotalLength = sizeof(LPCP_MESSAGE) + - ConnectionInfoLength; - ReceiveMessage->u1.s1.DataLength = ConnectionInfoLength; + ReceiveMessage->u1.s1.TotalLength = (CSHORT)(sizeof(LPCP_MESSAGE) + + ConnectionInfoLength); + ReceiveMessage->u1.s1.DataLength = (CSHORT)ConnectionInfoLength; RtlCopyMemory(ReceiveMessage + 1, ConnectMessage + 1, ConnectionInfoLength); Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=28… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/send.c (original) +++ trunk/reactos/ntoskrnl/lpc/send.c Sat Aug 4 12:49:47 2007 @@ -60,8 +60,8 @@ if (LpcMessage->u2.s2.DataInfoOffset) return STATUS_INVALID_PARAMETER; /* Validate message sizes */ - if ((LpcMessage->u1.s1.TotalLength > Port->MaxMessageLength) || - (LpcMessage->u1.s1.TotalLength <= LpcMessage->u1.s1.DataLength)) + if (((ULONG)LpcMessage->u1.s1.TotalLength > Port->MaxMessageLength) || + ((ULONG)LpcMessage->u1.s1.TotalLength <= (ULONG)LpcMessage->u1.s1.DataLength)) { /* Fail */ return STATUS_PORT_MESSAGE_TOO_LONG; @@ -241,8 +241,8 @@ MessageType = LpcRequest->u2.s2.Type; /* Validate the length */ - if ((LpcRequest->u1.s1.DataLength + sizeof(PORT_MESSAGE)) > - LpcRequest->u1.s1.TotalLength) + if (((ULONG)LpcRequest->u1.s1.DataLength + sizeof(PORT_MESSAGE)) > + (ULONG)LpcRequest->u1.s1.TotalLength) { /* Fail */ return STATUS_INVALID_PARAMETER; @@ -258,8 +258,8 @@ if (!NT_SUCCESS(Status)) return Status; /* Validate the message length */ - if ((LpcRequest->u1.s1.TotalLength > Port->MaxMessageLength) || - (LpcRequest->u1.s1.TotalLength <= LpcRequest->u1.s1.DataLength)) + if (((ULONG)LpcRequest->u1.s1.TotalLength > Port->MaxMessageLength) || + ((ULONG)LpcRequest->u1.s1.TotalLength <= (ULONG)LpcRequest->u1.s1.DataLength)) { /* Fail */ ObDereferenceObject(Port); Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c Sat Aug 4 12:49:47 2007 @@ -40,7 +40,7 @@ } /* Save the old priority and update it */ - OldPriority = Process->Vm.Flags.MemoryPriority; + OldPriority = (UCHAR)Process->Vm.Flags.MemoryPriority; Process->Vm.Flags.MemoryPriority = MemoryPriority; /* Return the old priority */ @@ -331,7 +331,7 @@ Peb->OSMinorVersion = NtMinorVersion; Peb->OSBuildNumber = (USHORT)(NtBuildNumber & 0x3FFF); Peb->OSPlatformId = 2; /* VER_PLATFORM_WIN32_NT */ - Peb->OSCSDVersion = CmNtCSDVersion; + Peb->OSCSDVersion = (USHORT)CmNtCSDVersion; /* Heap and Debug Data */ Peb->NumberOfProcessors = KeNumberProcessors; Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Sat Aug 4 12:49:47 2007 @@ -1362,7 +1362,7 @@ { /* Dereference it as many times as required */ InterlockedExchangeAdd(&ObjectHeader->PointerCount, - -AdditionalReferences); + -(LONG)AdditionalReferences); } /* Decrement the handle count and detach */ @@ -1457,6 +1457,9 @@ return STATUS_OBJECT_TYPE_MISMATCH; } + /* Save the object header */ + NewEntry.Object = ObjectHeader; + /* Check if this is a kernel handle */ if (HandleAttributes & OBJ_KERNEL_HANDLE) { @@ -1529,9 +1532,6 @@ /* Now we can release the object */ if (Context) ObpCleanupDirectoryLookup(Context); - - /* Save the object header */ - NewEntry.Object = ObjectHeader; /* Save the access mask */ NewEntry.GrantedAccess = GrantedAccess; @@ -1617,7 +1617,7 @@ { /* Dereference it many times */ InterlockedExchangeAdd(&ObjectHeader->PointerCount, - -(AdditionalReferences - 1)); + -(LONG)(AdditionalReferences - 1)); } /* Dereference the object one last time */ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=28… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c Sat Aug 4 12:49:47 2007 @@ -58,7 +58,7 @@ /* PRIVATE FUNCTIONS *********************************************************/ -ULONG +USHORT NTAPI NameToOrdinal(IN PCHAR Name, IN PVOID DllBase, Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=28… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Sat Aug 4 12:49:47 2007 @@ -815,7 +815,7 @@ (Priority < THREAD_BASE_PRIORITY_MIN)) { /* These ones are OK */ - if ((Priority != THREAD_BASE_PRIORITY_LOWRT + 1) || + if ((Priority != THREAD_BASE_PRIORITY_LOWRT + 1) && (Priority != THREAD_BASE_PRIORITY_IDLE - 1)) { /* Check if the process is real time */ Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Sat Aug 4 12:49:47 2007 @@ -703,7 +703,7 @@ NTAPI PsGetThreadHardErrorsAreDisabled(IN PETHREAD Thread) { - return Thread->HardErrorsAreDisabled; + return Thread->HardErrorsAreDisabled ? TRUE : FALSE; } /* @@ -823,7 +823,7 @@ NTAPI PsIsThreadImpersonating(IN PETHREAD Thread) { - return Thread->ActiveImpersonationInfo; + return Thread->ActiveImpersonationInfo ? TRUE : FALSE; } /*

1 0

[fireball] 28152: - Appropriate changes to kmtest
by fireball＠svn.reactos.org 04 Aug '07

04 Aug '07

Author: fireball Date: Sat Aug 4 12:47:52 2007 New Revision: 28152 URL: http://svn.reactos.org/svn/reactos?rev=28152&view=rev Log: - Appropriate changes to kmtest Modified: trunk/rostests/drivers/kmtest/ntos_ob.c Modified: trunk/rostests/drivers/kmtest/ntos_ob.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_ob.c?… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_ob.c (original) +++ trunk/rostests/drivers/kmtest/ntos_ob.c Sat Aug 4 12:47:52 2007 @@ -23,6 +23,7 @@ /* INCLUDES *******************************************************************/ #include <ddk/ntddk.h> +#include <ddk/ntifs.h> #include "kmtest.h" //#define NDEBUG

1 0

[fireball] 28151: - WDK and MSVC compatibility fixes.
by fireball＠svn.reactos.org 04 Aug '07

04 Aug '07

Author: fireball Date: Sat Aug 4 12:26:58 2007 New Revision: 28151 URL: http://svn.reactos.org/svn/reactos?rev=28151&view=rev Log: - WDK and MSVC compatibility fixes. Modified: trunk/reactos/dll/win32/kernel32/misc/handle.c trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/haltypes.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/include/ndk/mmtypes.h trunk/reactos/include/ndk/obtypes.h trunk/reactos/include/ndk/psfuncs.h trunk/reactos/include/ndk/pstypes.h trunk/reactos/include/psdk/ntdef.h trunk/reactos/ntoskrnl/config/cmindex.c trunk/reactos/ntoskrnl/config/cmvalche.c trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/po/events.c Modified: trunk/reactos/dll/win32/kernel32/misc/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ha… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/handle.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/handle.c Sat Aug 4 12:26:58 2007 @@ -54,7 +54,7 @@ } Status = NtQueryObject (hObject, - ObjectHandleInformation, + ObjectHandleFlagInformation, &HandleInfo, sizeof(OBJECT_HANDLE_ATTRIBUTE_INFORMATION), &BytesWritten); @@ -106,7 +106,7 @@ } Status = NtQueryObject (hObject, - ObjectHandleInformation, + ObjectHandleFlagInformation, &HandleInfo, sizeof(OBJECT_HANDLE_ATTRIBUTE_INFORMATION), &BytesWritten); @@ -118,7 +118,7 @@ HandleInfo.ProtectFromClose = (dwFlags & HANDLE_FLAG_PROTECT_FROM_CLOSE) != 0; Status = NtSetInformationObject (hObject, - ObjectHandleInformation, + ObjectHandleFlagInformation, &HandleInfo, sizeof(OBJECT_HANDLE_ATTRIBUTE_INFORMATION)); if(!NT_SUCCESS(Status)) Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c Sat Aug 4 12:26:58 2007 @@ -1903,7 +1903,7 @@ HandleFlags.ProtectFromClose = TRUE; HandleFlags.Inherit = FALSE; Status = NtSetInformationObject(SockAsyncCompletionPort, - ObjectHandleInformation, + ObjectHandleFlagInformation, &HandleFlags, sizeof(HandleFlags)); } @@ -2014,7 +2014,7 @@ HandleFlags.ProtectFromClose = TRUE; HandleFlags.Inherit = FALSE; Status = NtSetInformationObject(SockAsyncCompletionPort, - ObjectHandleInformation, + ObjectHandleFlagInformation, &HandleFlags, sizeof(HandleFlags)); Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=28… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h (original) +++ trunk/reactos/include/ddk/ntifs.h Sat Aug 4 12:26:58 2007 @@ -609,13 +609,31 @@ StorageTypeStream } FILE_STORAGE_TYPE; -typedef enum _OBJECT_INFO_CLASS { - ObjectBasicInfo, - ObjectNameInfo, - ObjectTypeInfo, - ObjectAllTypesInfo, - ObjectProtectionInfo -} OBJECT_INFO_CLASS; +typedef enum _OBJECT_INFORMATION_CLASS +{ + ObjectBasicInformation, + ObjectNameInformation, + ObjectTypeInformation, + ObjectTypesInformation, + ObjectHandleFlagInformation, + ObjectSessionInformation, + MaxObjectInfoClass +} OBJECT_INFORMATION_CLASS; + +typedef struct _OBJECT_BASIC_INFORMATION +{ + ULONG Attributes; + ACCESS_MASK GrantedAccess; + ULONG HandleCount; + ULONG PointerCount; + ULONG PagedPoolCharge; + ULONG NonPagedPoolCharge; + ULONG Reserved[ 3 ]; + ULONG NameInfoSize; + ULONG TypeInfoSize; + ULONG SecurityDescriptorSize; + LARGE_INTEGER CreationTime; +} OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION; typedef struct _KAPC_STATE { LIST_ENTRY ApcListHead[2]; Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Sat Aug 4 12:26:58 2007 @@ -9942,6 +9942,11 @@ VOID); NTKERNELAPI +HANDLE +NTAPI +PsGetProcessId(PEPROCESS Process); + +NTKERNELAPI BOOLEAN NTAPI PsGetVersion( Modified: trunk/reactos/include/ndk/haltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/haltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/haltypes.h (original) +++ trunk/reactos/include/ndk/haltypes.h Sat Aug 4 12:26:58 2007 @@ -224,10 +224,11 @@ // HAL Exports // #ifndef _NTHAL_ -extern DECL_IMPORT PUCHAR *KdComPortInUse; -#endif - -#endif -#endif - - +extern NTHALAPI PUCHAR *KdComPortInUse; +#endif + +#endif +#endif + + + Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h (original) +++ trunk/reactos/include/ndk/ketypes.h Sat Aug 4 12:26:58 2007 @@ -936,7 +936,7 @@ #if (NTDDI_VERSION >= NTDDI_LONGHORN) PVOID MdlForLockedteb; #endif -} KTHREAD; +} KTHREAD, *PKTHREAD; #define ASSERT_THREAD(object) \ ASSERT((((object)->DispatcherHeader.Type & KOBJECT_TYPE_MASK) == ThreadObject)) Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h (original) +++ trunk/reactos/include/ndk/mmtypes.h Sat Aug 4 12:26:58 2007 @@ -58,6 +58,7 @@ #define MEM_PHYSICAL 0x400000 #define MEM_ROTATE 0x800000 #define MEM_IMAGE SEC_IMAGE +#define MEM_DOS_LIM 0x40000000 // // Section Flags for NtCreateSection Modified: trunk/reactos/include/ndk/obtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/obtypes.h (original) +++ trunk/reactos/include/ndk/obtypes.h Sat Aug 4 12:26:58 2007 @@ -72,6 +72,20 @@ // #define OBJ_NAME_PATH_SEPARATOR L'\\' +// +// Object Information Classes for NtQueryInformationObject +// +typedef enum _OBJECT_INFORMATION_CLASS +{ + ObjectBasicInformation, + ObjectNameInformation, + ObjectTypeInformation, + ObjectTypesInformation, + ObjectHandleFlagInformation, + ObjectSessionInformation, + MaxObjectInfoClass +} OBJECT_INFORMATION_CLASS; + #else // @@ -145,18 +159,6 @@ #define DOSDEVICE_DRIVE_REMOTE 4 #define DOSDEVICE_DRIVE_CDROM 5 #define DOSDEVICE_DRIVE_RAMDISK 6 - -// -// Object Information Classes for NtQueryInformationObject -// -typedef enum _OBJECT_INFORMATION_CLASS -{ - ObjectBasicInformation, - ObjectNameInformation, - ObjectTypeInformation, - ObjectAllTypesInformation, - ObjectHandleInformation -} OBJECT_INFORMATION_CLASS; // // Dump Control Structure for Object Debugging @@ -297,7 +299,7 @@ ULONG DefaultNonPagedPoolCharge; } OBJECT_TYPE_INFORMATION, *POBJECT_TYPE_INFORMATION; -#ifndef NTOS_MODE_USER +#ifdef NTOS_MODE_USER typedef struct _OBJECT_BASIC_INFORMATION { @@ -313,6 +315,8 @@ ULONG SecurityDescriptorLength; LARGE_INTEGER CreateTime; } OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION; + +#else typedef struct _OBJECT_CREATE_INFORMATION { 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 (original) +++ trunk/reactos/include/ndk/psfuncs.h Sat Aug 4 12:26:58 2007 @@ -117,11 +117,6 @@ // // Misc. Functions // -NTKERNELAPI -HANDLE -NTAPI -PsGetProcessId(PEPROCESS Process); - NTKERNELAPI NTSTATUS NTAPI Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Sat Aug 4 12:26:58 2007 @@ -35,16 +35,6 @@ // KUSER_SHARED_DATA location in User Mode // #define USER_SHARED_DATA (0x7FFE0000) - -// -// Kernel Exports -// -#ifndef NTOS_MODE_USER - -//extern NTSYSAPI struct _EPROCESS* PsInitialSystemProcess; -//extern NTSYSAPI POBJECT_TYPE PsProcessType; - -#endif // // Global Flags @@ -423,7 +413,7 @@ // struct _W32THREAD; struct _W32PROCESS; -struct _ETHREAD; +//struct _ETHREAD; struct _WIN32_POWEREVENT_PARAMETERS; struct _WIN32_POWERSTATE_PARAMETERS; struct _WIN32_JOBCALLOUT_PARAMETERS; @@ -1148,7 +1138,7 @@ KSEMAPHORE AlpcWaitSemaphore; ULONG CacheManagerCount; #endif -} ETHREAD; +} ETHREAD, *PETHREAD; // // Executive Process (EPROCESS) @@ -1344,7 +1334,7 @@ UCHAR PriorityClass; MM_AVL_TABLE VadRoot; ULONG Cookie; -} EPROCESS; +} EPROCESS, *PEPROCESS; // // Job Token Filter Data Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h (original) +++ trunk/reactos/include/psdk/ntdef.h Sat Aug 4 12:26:58 2007 @@ -3,7 +3,11 @@ #if __GNUC__ >=3 #pragma GCC system_header #endif - + +#include <stdarg.h> +#include <windef.h> +#include <excpt.h> + /* TODO: some compilers support this */ #define RESTRICTED_POINTER Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmindex.c (original) +++ trunk/reactos/ntoskrnl/config/cmindex.c Sat Aug 4 12:26:58 2007 @@ -722,7 +722,7 @@ HvReleaseCell(Hive, CellToRelease); /* Make sure we found something valid */ - if (Found < 0) break; + if (Found & 0x80000000) break; /* Get the new Index Root and set the new cell to be released */ if (SubKey == HCELL_NIL) continue; @@ -749,7 +749,7 @@ HvReleaseCell(Hive, CellToRelease); /* Make sure we found a valid index */ - if (Found < 0) break; + if (Found & 0x80000000) break; } else { Modified: trunk/reactos/ntoskrnl/config/cmvalche.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalche.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalche.c (original) +++ trunk/reactos/ntoskrnl/config/cmvalche.c Sat Aug 4 12:26:58 2007 @@ -512,7 +512,8 @@ Info->KeyValueFullInformation.DataOffset = AlignedData; /* Only the data remains to be copied */ - SizeLeft = max(0, Length - AlignedData); + SizeLeft = (((LONG)Length - (LONG)AlignedData) < 0) ? + 0 : (Length - AlignedData); Size = KeySize; /* Check if the caller has no space for it */ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Sat Aug 4 12:26:58 2007 @@ -358,7 +358,6 @@ extern LIST_ENTRY PspReaperListHead; extern WORK_QUEUE_ITEM PspReaperWorkItem; extern BOOLEAN PspReaping; -extern PEPROCESS PsInitialSystemProcess; extern PEPROCESS PsIdleProcess; extern LIST_ENTRY PsActiveProcessHead; extern KGUARDED_MUTEX PspActiveProcessMutex; Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Sat Aug 4 12:26:58 2007 @@ -328,7 +328,7 @@ PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; OBJECT_ATTRIBUTES ObjectAttributes; PKEY_BASIC_INFORMATION KeyInfo = NULL, SubKeyInfo = NULL; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\" REGSTR_PATH_SYSTEMENUM "\\" REGSTR_KEY_ROOTENUM); + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\" REGSTR_PATH_SYSTEMENUM L"\\" REGSTR_KEY_ROOTENUM); UNICODE_STRING SubKeyName; WCHAR DevicePath[MAX_PATH + 1]; RTL_QUERY_REGISTRY_TABLE QueryTable[5]; Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Sat Aug 4 12:26:58 2007 @@ -1411,7 +1411,7 @@ * Make sure this isn't a generic type query, since the caller doesn't * have to give a handle for it */ - if (ObjectInformationClass != ObjectAllTypesInformation) + if (ObjectInformationClass != ObjectTypesInformation) { /* Reference the object */ Status = ObReferenceObjectByHandle(ObjectHandle, @@ -1463,27 +1463,27 @@ } /* Copy quota information */ - BasicInfo->PagedPoolUsage = 0; /* FIXME*/ - BasicInfo->NonPagedPoolUsage = 0; /* FIXME*/ + BasicInfo->PagedPoolCharge = 0; /* FIXME*/ + BasicInfo->NonPagedPoolCharge = 0; /* FIXME*/ /* Copy name information */ - BasicInfo->NameInformationLength = 0; /* FIXME*/ - BasicInfo->TypeInformationLength = 0; /* FIXME*/ + BasicInfo->NameInfoSize = 0; /* FIXME*/ + BasicInfo->TypeInfoSize = 0; /* FIXME*/ /* Copy security information */ - BasicInfo->SecurityDescriptorLength = 0; /* FIXME*/ + BasicInfo->SecurityDescriptorSize = 0; /* FIXME*/ /* Check if this is a symlink */ if (ObjectHeader->Type == ObSymbolicLinkType) { /* Return the creation time */ - BasicInfo->CreateTime.QuadPart = + BasicInfo->CreationTime.QuadPart = ((POBJECT_SYMBOLIC_LINK)Object)->CreationTime.QuadPart; } else { /* Otherwise return 0 */ - BasicInfo->CreateTime.QuadPart = (ULONGLONG)0; + BasicInfo->CreationTime.QuadPart = (ULONGLONG)0; } /* Break out with success */ @@ -1513,13 +1513,13 @@ break; /* Information about all types */ - case ObjectAllTypesInformation: + case ObjectTypesInformation: DPRINT1("NOT IMPLEMENTED!\n"); Status = STATUS_NOT_IMPLEMENTED; break; /* Information about the handle flags */ - case ObjectHandleInformation: + case ObjectHandleFlagInformation: /* Validate length */ InfoLength = sizeof (OBJECT_HANDLE_ATTRIBUTE_INFORMATION); @@ -1609,7 +1609,7 @@ PAGED_CODE(); /* Validate the information class */ - if (ObjectInformationClass != ObjectHandleInformation) + if (ObjectInformationClass != ObjectHandleFlagInformation) { /* Invalid class */ return STATUS_INVALID_INFO_CLASS; Modified: trunk/reactos/ntoskrnl/po/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/events.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/po/events.c (original) +++ trunk/reactos/ntoskrnl/po/events.c Sat Aug 4 12:26:58 2007 @@ -100,7 +100,7 @@ IN PVOID Context) { PSYS_BUTTON_CONTEXT SysButtonContext = Context; - PIO_WORKITEM CurrentWorkItem = SysButtonContext->WorkItem;; + PIO_WORKITEM CurrentWorkItem = SysButtonContext->WorkItem; PIRP Irp; /* Get button pressed (IOCTL_GET_SYS_BUTTON_EVENT) */

1 0

[jimtabor] 28150: Dc.c : - Update Get/SetDCBrush/PenColor code. * Added dcattr sync flags to Set functions. * if'ed out, does compile. Painting.c : - Update LP to DP to LP code. * Added update flags for Xforms, the best way I understand them. * if'ed out. - Moved Fixme line down and above GetDCObject.
by jimtabor＠svn.reactos.org 04 Aug '07

04 Aug '07

Author: jimtabor Date: Sat Aug 4 11:37:27 2007 New Revision: 28150 URL: http://svn.reactos.org/svn/reactos?rev=28150&view=rev Log: Dc.c : - Update Get/SetDCBrush/PenColor code. * Added dcattr sync flags to Set functions. * if'ed out, does compile. Painting.c : - Update LP to DP to LP code. * Added update flags for Xforms, the best way I understand them. * if'ed out. - Moved Fixme line down and above GetDCObject. Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/painting.c trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Sat Aug 4 11:37:27 2007 @@ -544,6 +544,12 @@ HDC hdc ) { +#if 0 + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return CLR_INVALID; + return (COLORREF) Dc_Attr->ulPenClr; +#endif return NtUserGetDCBrushColor(hdc); } @@ -556,6 +562,12 @@ HDC hdc ) { +#if 0 + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return CLR_INVALID; + return (COLORREF) Dc_Attr->ulPenClr; +#endif return NtUserGetDCPenColor(hdc); } @@ -569,6 +581,24 @@ COLORREF crColor ) { +#if 0 + PDC_ATTR Dc_Attr; + COLORREF OldColor = CLR_INVALID; + + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return OldColor; + else + { + OldColor = (COLORREF) Dc_Attr->ulBrushClr; + Dc_Attr->ulBrushClr = (ULONG) crColor; + + if ( Dc_Attr->crBrushClr != crColor ) // if same, don't force a copy. + { + Dc_Attr->ulDirty_ |= DIRTY_FILL; + Dc_Attr->crBrushClr = crColor; + } + } + return OldColor; +#endif return NtUserSetDCBrushColor(hdc, crColor); } @@ -582,6 +612,24 @@ COLORREF crColor ) { +#if 0 + PDC_ATTR Dc_Attr; + COLORREF OldColor = CLR_INVALID; + + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return OldColor; + else + { + OldColor = (COLORREF) Dc_Attr->ulPenClr; + Dc_Attr->ulPenClr = (ULONG) crColor; + + if ( Dc_Attr->crPenClr != crColor ) + { + Dc_Attr->ulDirty_ |= DIRTY_LINE; + Dc_Attr->crPenClr = crColor; + } + } + return OldColor; +#endif return NtUserSetDCPenColor(hdc, crColor); } Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/painting.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/painting.c Sat Aug 4 11:37:27 2007 @@ -18,7 +18,6 @@ __asm fistp out #endif -#if 0 /* FIXME: enable this as soon as we have working usermode gdi */ LONG FASTCALL EFtoF( EFLOAT_S * efp) @@ -93,14 +92,26 @@ STDCALL DPtoLP ( HDC hDC, LPPOINT Points, INT Count ) { +#if 0 INT i; PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return FALSE; - for ( i = 0; i < Count; i++ ) - CoordCnvP ( &Dc_Attr->mxDevicetoWorld, &Points[i] ); + if (Dc_Attr->flXform & ( DEVICE_TO_WORLD_INVALID | // Force a full recalibration! + PAGE_XLATE_CHANGED | // Changes or Updates have been made, + PAGE_EXTENTS_CHANGED | // do processing in kernel space. + WORLD_XFORM_CHANGED ) +#endif + return NtGdiTransformPoints( hDC, Points, Points, Count, 0); // Last is 0 or 2 +#if 0 + else + { + for ( i = 0; i < Count; i++ ) + CoordCnvP ( &Dc_Attr->mxDevicetoWorld, &Points[i] ); + } return TRUE; +#endif } @@ -108,16 +119,28 @@ STDCALL LPtoDP ( HDC hDC, LPPOINT Points, INT Count ) { +#if 0 INT i; PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return FALSE; - for ( i = 0; i < Count; i++ ) - CoordCnvP ( &Dc_Attr->mxWorldToDevice, &Points[i] ); + if (Dc_Attr->flXform & ( PAGE_XLATE_CHANGED | // Check for Changes and Updates + PAGE_EXTENTS_CHANGED | + WORLD_XFORM_CHANGED ) +#endif + return NtGdiTransformPoints( hDC, Points, Points, Count, 0); +#if 0 + else + { + for ( i = 0; i < Count; i++ ) + CoordCnvP ( &Dc_Attr->mxWorldToDevice, &Points[i] ); + } return TRUE; -} - +#endif +} + +#if 0 /* FIXME: enable this as soon as we have working usermode gdi */ // Will move to dc.c HGDIOBJ Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h (original) +++ trunk/reactos/include/psdk/wingdi.h Sat Aug 4 11:37:27 2007 @@ -2753,6 +2753,10 @@ BOOL WINAPI GetCurrentPositionEx(HDC,LPPOINT); HCURSOR WINAPI GetCursor(void); BOOL WINAPI GetDCOrgEx(HDC,LPPOINT); +#if (_WIN32_WINNT >= 0x0500) +COLORREF WINAPI GetDCBrushColor(HDC); +COLORREF WINAPI GetDCPenColor(HDC); +#endif int WINAPI GetDeviceCaps(HDC,int); BOOL WINAPI GetDeviceGammaRamp(HDC,PVOID); UINT WINAPI GetDIBColorTable(HDC,UINT,UINT,RGBQUAD*);

1 0

[tkreuzer] 28149: fix some names
by tkreuzer＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: tkreuzer Date: Sat Aug 4 02:31:55 2007 New Revision: 28149 URL: http://svn.reactos.org/svn/reactos?rev=28149&view=rev Log: fix some names Modified: trunk/rostests/apitests/w32knapi/xp-2600.c Modified: trunk/rostests/apitests/w32knapi/xp-2600.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/xp-2600… ============================================================================== --- trunk/rostests/apitests/w32knapi/xp-2600.c (original) +++ trunk/rostests/apitests/w32knapi/xp-2600.c Sat Aug 4 02:31:55 2007 @@ -13,7 +13,7 @@ {L"NtGdiAlphaBlend", 0x1007,12}, {L"NtGdiAngleArc", 0x1008,6}, {L"NtGdiAnyLinkedFonts", 0x1009,0}, - {L"GreFontIsLinked", 0x100A,1}, + {L"NtGdiFontIsLinked", 0x100A,1}, {L"NtGdiArcInternal", 0x100B,10}, {L"NtGdiBeginPath", 0x100C,1}, {L"NtGdiBitBlt", 0x100D,11}, @@ -123,7 +123,7 @@ {L"NtGdiDvpReleaseNotification", 0x1075,2}, {L"NtGdiDxgGenericThunk", 0x1076,6}, {L"NtGdiDeleteClientObj", 0x1077,1}, - {L"bDeleteColorSpace", 0x1078,1}, + {L"NtGdiDeleteColorSpace", 0x1078,1}, {L"NtGdiDeleteColorTransform", 0x1079,2}, {L"NtGdiDeleteObjectApp", 0x107A,1}, {L"NtGdiDescribePixelFormat", 0x107B,4}, @@ -132,7 +132,7 @@ {L"NtGdiDoPalette", 0x107E,6}, {L"NtGdiDrawEscape", 0x107F,4}, {L"NtGdiEllipse", 0x1080,5}, - {L"GreEnableEUDC", 0x1081,1}, + {L"NtGdiEnableEUDC", 0x1081,1}, {L"NtGdiEndDoc", 0x1082,1}, {L"NtGdiEndPage", 0x1083,1}, {L"NtGdiEndPath", 0x1084,1}, @@ -215,7 +215,7 @@ {L"NtGdiGetUFI", 0x10D1,6}, {L"NtGdiGetEmbUFI", 0x10D2,7}, {L"NtGdiGetUFIPathname", 0x10D3,10}, - {L"GreGetEmbedFonts", 0x10D4,0}, + {L"NtGdiGetEmbedFonts", 0x10D4,0}, {L"NtGdiChangeGhostFont", 0x10D5,2}, {L"NtGdiAddEmbFontToDC", 0x10D6,2}, {L"NtGdiGetFontUnicodeRanges", 0x10D7,2}, @@ -261,7 +261,6 @@ {L"NtGdiScaleViewportExtEx", 0x10FF,6}, {L"NtGdiScaleWindowExtEx", 0x1100,6}, {L"NtGdiSelectBitmap", 0x1101,2}, - {L"GreSelectBitmap", 0x1101,2}, {L"NtGdiSelectBrush", 0x1102,2}, {L"NtGdiSelectClipPath", 0x1103,2}, {L"NtGdiSelectFont", 0x1104,2},

1 0

[cfinck] 28148: - Define one LANGUAGE, SUBLANG pair per resource file and not per resource. This makes it easier for translators and also fixes a mix-up of languages. - Move the brazilian translations from pt-PT.rc to a new pt-BR.rc file. - Remove the "#ifdef LANG_WALON" statement from wa-WA.rc and disable this resource file in rsrc.rc instead like it's done for eo-EO.rc. These are WINE-specific LANG defines. We also have them in include/reactos/wine/winnt.h, but this file is not included. It ha
by cfinck＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: cfinck Date: Sat Aug 4 01:36:53 2007 New Revision: 28148 URL: http://svn.reactos.org/svn/reactos?rev=28148&view=rev Log: - Define one LANGUAGE, SUBLANG pair per resource file and not per resource. This makes it easier for translators and also fixes a mix-up of languages. - Move the brazilian translations from pt-PT.rc to a new pt-BR.rc file. - Remove the "#ifdef LANG_WALON" statement from wa-WA.rc and disable this resource file in rsrc.rc instead like it's done for eo-EO.rc. These are WINE-specific LANG defines. We also have them in include/reactos/wine/winnt.h, but this file is not included. It has to be decided later how to handle these languages. See issue #2523 for more details. Added: trunk/reactos/base/applications/winhelp/lang/pt-BR.rc Modified: trunk/reactos/base/applications/winhelp/lang/bg-BG.rc trunk/reactos/base/applications/winhelp/lang/cs-CZ.rc trunk/reactos/base/applications/winhelp/lang/da-DK.rc trunk/reactos/base/applications/winhelp/lang/de-DE.rc trunk/reactos/base/applications/winhelp/lang/en-US.rc trunk/reactos/base/applications/winhelp/lang/eo-EO.rc trunk/reactos/base/applications/winhelp/lang/es-ES.rc trunk/reactos/base/applications/winhelp/lang/fi-FI.rc trunk/reactos/base/applications/winhelp/lang/hu-HU.rc trunk/reactos/base/applications/winhelp/lang/it-IT.rc trunk/reactos/base/applications/winhelp/lang/ko-KO.rc trunk/reactos/base/applications/winhelp/lang/nb-NO.rc trunk/reactos/base/applications/winhelp/lang/nl-NL.rc trunk/reactos/base/applications/winhelp/lang/pl-PL.rc trunk/reactos/base/applications/winhelp/lang/pt-PT.rc trunk/reactos/base/applications/winhelp/lang/ru-RU.rc trunk/reactos/base/applications/winhelp/lang/sk-SK.rc trunk/reactos/base/applications/winhelp/lang/sl-SI.rc trunk/reactos/base/applications/winhelp/lang/sv-SE.rc trunk/reactos/base/applications/winhelp/lang/tr-TR.rc trunk/reactos/base/applications/winhelp/lang/wa-WA.rc trunk/reactos/base/applications/winhelp/lang/zh-CN.rc trunk/reactos/base/applications/winhelp/rsrc.rc Modified: trunk/reactos/base/applications/winhelp/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/bg-BG.rc Sat Aug 4 01:36:53 2007 @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Ôàéë" { MENUITEM "&Îòâàðÿíå", MNID_FILE_OPEN @@ -51,6 +53,7 @@ } /* Strings */ + STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Ïîìîù" Modified: trunk/reactos/base/applications/winhelp/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/cs-CZ.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/cs-CZ.rc Sat Aug 4 01:36:53 2007 @@ -23,9 +23,11 @@ /* Czech strings in CP1250 */ +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Soubor" { MENUITEM "&Otevøít", MNID_FILE_OPEN @@ -55,7 +57,8 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Nápovìda WINE" STID_WHERROR, "CHYBA" Modified: trunk/reactos/base/applications/winhelp/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/da-DK.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/da-DK.rc Sat Aug 4 01:36:53 2007 @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Filer" { MENUITEM "Å&bn...", MNID_FILE_OPEN @@ -53,7 +55,7 @@ /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Hjælp" STID_WHERROR, "FEJL" Modified: trunk/reactos/base/applications/winhelp/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/de-DE.rc Sat Aug 4 01:36:53 2007 @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&Datei" { MENUITEM "Ö&ffnen...", MNID_FILE_OPEN @@ -52,7 +54,7 @@ /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Hilfe" STID_WHERROR, "FEHLER" Modified: trunk/reactos/base/applications/winhelp/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/en-US.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/en-US.rc Sat Aug 4 01:36:53 2007 @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +MAIN_MENU MENU { POPUP "&File" { MENUITEM "&Open", MNID_FILE_OPEN @@ -51,7 +53,8 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Help" STID_WHERROR, "ERROR" Modified: trunk/reactos/base/applications/winhelp/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/eo-EO.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/eo-EO.rc Sat Aug 4 01:36:53 2007 @@ -21,9 +21,11 @@ /* Cxapelitaj literoj estas en Latin-3 iso8859-3 */ +LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Dosiero" { MENUITEM "&Malfermu", MNID_FILE_OPEN @@ -53,7 +55,8 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Helpanto" STID_WHERROR, "ERARO" Modified: trunk/reactos/base/applications/winhelp/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/es-ES.rc Sat Aug 4 01:36:53 2007 @@ -20,9 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&Archivo" { MENUITEM "A&brir...", MNID_FILE_OPEN @@ -52,7 +54,8 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Ayuda de WINE" STID_WHERROR, "ERROR" Modified: trunk/reactos/base/applications/winhelp/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/fi-FI.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/fi-FI.rc Sat Aug 4 01:36:53 2007 @@ -20,9 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Tiedosto" { MENUITEM "&Avaa...", MNID_FILE_OPEN @@ -53,7 +55,7 @@ /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Ohje" STID_WHERROR, "VIRHE" Modified: trunk/reactos/base/applications/winhelp/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/hu-HU.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/hu-HU.rc Sat Aug 4 01:36:53 2007 @@ -20,9 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Fájl" { MENUITEM "&Megnyitás...", MNID_FILE_OPEN @@ -53,7 +55,7 @@ /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE súgó" STID_WHERROR, "HIBA" Modified: trunk/reactos/base/applications/winhelp/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/it-IT.rc Sat Aug 4 01:36:53 2007 @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&File" { MENUITEM "&Apri...", MNID_FILE_OPEN @@ -52,7 +54,7 @@ /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Guida di WINE" STID_WHERROR, "ERRORE" Modified: trunk/reactos/base/applications/winhelp/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/ko-KO.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/ko-KO.rc Sat Aug 4 01:36:53 2007 @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "ÆÄÀÏ(&F)" { MENUITEM "¿±â(&O)...", MNID_FILE_OPEN @@ -52,7 +54,7 @@ /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Wine µµ¿ò¸»" STID_WHERROR, "¿À·ù" Modified: trunk/reactos/base/applications/winhelp/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/nb-NO.rc Sat Aug 4 01:36:53 2007 @@ -18,9 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&Fil" { MENUITEM "&Åpne", MNID_FILE_OPEN @@ -50,7 +52,7 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Hjelp" STID_WHERROR, "FEIL" Modified: trunk/reactos/base/applications/winhelp/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/nl-NL.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/nl-NL.rc Sat Aug 4 01:36:53 2007 @@ -18,9 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&Bestand" { MENUITEM "&Openen", MNID_FILE_OPEN @@ -50,7 +52,7 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Help" STID_WHERROR, "FOUT" Modified: trunk/reactos/base/applications/winhelp/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/pl-PL.rc Sat Aug 4 01:36:53 2007 @@ -20,9 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Plik" { MENUITEM "&Otwórz", MNID_FILE_OPEN @@ -52,7 +54,7 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE - Pomoc" STID_WHERROR, "B£¥D" Added: trunk/reactos/base/applications/winhelp/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/pt-BR.rc (added) +++ trunk/reactos/base/applications/winhelp/lang/pt-BR.rc Sat Aug 4 01:36:53 2007 @@ -1,0 +1,77 @@ +/* + * Help Viewer + * Portuguese Language Support + * + * Copyright 1996 Ulrich Schmid + * Portuguese translation by Gustavo Junior Alves <alves(a)correionet.com.br> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2003 Marcelo Duarte + * Copyright 2004 Américo José Melo + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Menu */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +MAIN_MENU MENU +{ + POPUP "&Arquivo" { + MENUITEM "&Abrir...", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "&Imprimir", MNID_FILE_PRINT + MENUITEM "&Configurar Impressora...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "Sai&r", MNID_FILE_EXIT + } + POPUP "&Editar" { + MENUITEM "&Copiar...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "&Anotar...", MNID_EDIT_ANNOTATE + } + POPUP "In&dicador" { + MENUITEM "&Definir...", MNID_BKMK_DEFINE + } + POPUP "Aj&uda" { + MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON + MENUITEM "Sempre &visível", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "&Informações...", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "&Sobre WINE", MNID_HELP_WINE +#endif + } +} + +/* Strings */ + +STRINGTABLE DISCARDABLE +{ +STID_WINE_HELP, "Ajuda WINE" +STID_WHERROR, "ERRO" +STID_WARNING, "AVISO" +STID_INFO, "Informação" +STID_NOT_IMPLEMENTED, "Não implementado" +STID_HLPFILE_ERROR_s, "Erro encontrado na leitura do arquivo de ajuda '%s'" +STID_CONTENTS, "&Conteúdo" +STID_SEARCH, "&Procurar" +STID_BACK, "&Voltar" +STID_HISTORY, "&Histórico" +STID_TOPICS, "&Tópicos" +STID_ALL_FILES, "Todos os arquivos (*.*)" +STID_HELP_FILES_HLP, "Arquivos de ajuda (*.hlp)" +STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" +} Modified: trunk/reactos/base/applications/winhelp/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/pt-PT.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/pt-PT.rc Sat Aug 4 01:36:53 2007 @@ -24,37 +24,6 @@ */ /* Menu */ - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - -MAIN_MENU MENU -{ - POPUP "&Arquivo" { - MENUITEM "&Abrir...", MNID_FILE_OPEN - MENUITEM SEPARATOR - MENUITEM "&Imprimir", MNID_FILE_PRINT - MENUITEM "&Configurar Impressora...", MNID_FILE_SETUP - MENUITEM SEPARATOR - MENUITEM "Sai&r", MNID_FILE_EXIT - } - POPUP "&Editar" { - MENUITEM "&Copiar...", MNID_EDIT_COPYDLG - MENUITEM SEPARATOR - MENUITEM "&Anotar...", MNID_EDIT_ANNOTATE - } - POPUP "In&dicador" { - MENUITEM "&Definir...", MNID_BKMK_DEFINE - } - POPUP "Aj&uda" { - MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON - MENUITEM "Sempre &visível", MNID_HELP_HELPTOP - MENUITEM SEPARATOR - MENUITEM "&Informações...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&Sobre WINE", MNID_HELP_WINE -#endif - } -} LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE @@ -89,28 +58,6 @@ /* Strings */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - -STRINGTABLE DISCARDABLE -{ -STID_WINE_HELP, "Ajuda WINE" -STID_WHERROR, "ERRO" -STID_WARNING, "AVISO" -STID_INFO, "Informação" -STID_NOT_IMPLEMENTED, "Não implementado" -STID_HLPFILE_ERROR_s, "Erro encontrado na leitura do arquivo de ajuda '%s'" -STID_CONTENTS, "&Conteúdo" -STID_SEARCH, "&Procurar" -STID_BACK, "&Voltar" -STID_HISTORY, "&Histórico" -STID_TOPICS, "&Tópicos" -STID_ALL_FILES, "Todos os arquivos (*.*)" -STID_HELP_FILES_HLP, "Arquivos de ajuda (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" -} - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE - STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Ajuda WINE" Modified: trunk/reactos/base/applications/winhelp/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/ru-RU.rc Sat Aug 4 01:36:53 2007 @@ -18,9 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Ôàéë" { MENUITEM "&Îòêðûòü", MNID_FILE_OPEN @@ -50,7 +52,7 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Ñïðàâêà WINE" STID_WHERROR, "ÎØÈÁÊÀ" Modified: trunk/reactos/base/applications/winhelp/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/sk-SK.rc Sat Aug 4 01:36:53 2007 @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +MAIN_MENU MENU { POPUP "&Súbor" { MENUITEM "&Otvori...", MNID_FILE_OPEN @@ -47,7 +49,7 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Pomoc" STID_WHERROR, "CHYBA" Modified: trunk/reactos/base/applications/winhelp/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/sl-SI.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/sl-SI.rc Sat Aug 4 01:36:53 2007 @@ -18,9 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Datoteka" { MENUITEM "&Odpri ...", MNID_FILE_OPEN @@ -50,7 +52,7 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Pomoè" STID_WHERROR, "NAPAKA" Modified: trunk/reactos/base/applications/winhelp/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/sv-SE.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/sv-SE.rc Sat Aug 4 01:36:53 2007 @@ -20,9 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&Arkiv" { MENUITEM "&Öppna...", MNID_FILE_OPEN @@ -53,7 +55,7 @@ /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Hjälp" STID_WHERROR, "FEL" Modified: trunk/reactos/base/applications/winhelp/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/tr-TR.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/tr-TR.rc Sat Aug 4 01:36:53 2007 @@ -18,9 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Dosya" { MENUITEM "&Aç", MNID_FILE_OPEN @@ -50,7 +52,7 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Yardým" STID_WHERROR, "HATA" Modified: trunk/reactos/base/applications/winhelp/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/wa-WA.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/wa-WA.rc Sat Aug 4 01:36:53 2007 @@ -20,11 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifdef LANG_WALON +LANGUAGE LANG_WALON, SUBLANG_DEFAULT /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Fitchî" { MENUITEM "&Drovî...", MNID_FILE_OPEN @@ -55,7 +55,7 @@ /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Aidance di WINE" STID_WHERROR, "AROKE" @@ -72,5 +72,3 @@ STID_HELP_FILES_HLP, "Fitchîs d' aide (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" } - -#endif /* LANG_WALON */ Modified: trunk/reactos/base/applications/winhelp/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/zh-CN.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/zh-CN.rc Sat Aug 4 01:36:53 2007 @@ -21,7 +21,9 @@ /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +MAIN_MENU MENU { POPUP "ÎÄ¼þ£¨&F£©" { MENUITEM "´ò¿ª£¨&O£©", MNID_FILE_OPEN @@ -51,7 +53,7 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE °ïÖú" STID_WHERROR, "´íÎó" Modified: trunk/reactos/base/applications/winhelp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/rsrc.rc (original) +++ trunk/reactos/base/applications/winhelp/rsrc.rc Sat Aug 4 01:36:53 2007 @@ -38,11 +38,12 @@ #include "lang/nl-NL.rc" #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" #include "lang/pt-PT.rc" #include "lang/ru-RU.rc" #include "lang/sl-SI.rc" #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/tr-TR.rc" -#include "lang/wa-WA.rc" +//#include "lang/wa-WA.rc" #include "lang/zh-CN.rc"

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2007