Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 26067: - Fix some bugs in the kernel related to driver loading, which were hindering FreeLDR 2.5 support. - Make FreeLDR relocate and process the import tables of drivers as well. This is almost FreeLDR 2.5 but is still missing some minor functionality before being completely done.
by ion＠svn.reactos.org 12 Mar '07

12 Mar '07

Author: ion Date: Mon Mar 12 20:30:57 2007 New Revision: 26067 URL: http://svn.reactos.org/svn/reactos?rev=26067&view=rev Log: - Fix some bugs in the kernel related to driver loading, which were hindering FreeLDR 2.5 support. - Make FreeLDR relocate and process the import tables of drivers as well. This is almost FreeLDR 2.5 but is still missing some minor functionality before being completely done. Modified: trunk/reactos/base/applications/charmap/ (props changed) trunk/reactos/base/applications/screensavers/scrnsave/ (props changed) trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/dll/keyboard/kbdit/ (props changed) trunk/reactos/dll/keyboard/kbdth/ (props changed) trunk/reactos/dll/win32/usp10/ (props changed) trunk/reactos/drivers/multimedia/drmk/ (props changed) trunk/reactos/drivers/multimedia/ks/ (props changed) trunk/reactos/drivers/wmi/ (props changed) trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/mm/sysldr.c Propchange: trunk/reactos/base/applications/charmap/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Mar 12 20:30:57 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/base/applications/screensavers/scrnsave/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Mar 12 20:30:57 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Mon Mar 12 20:30:57 2007 @@ -521,7 +521,6 @@ Status = LdrPEGetOrLoadModule(DllName, ImportedName, &ImportedModule); if (!NT_SUCCESS(Status)) return Status; - //DbgPrint("Import Base: %p\n", ImportedModule->ModStart); Status = LdrPEProcessImportDirectoryEntry(DllBase, ImportedModule, ImportModuleDirectory); if (!NT_SUCCESS(Status)) return Status; @@ -574,7 +573,7 @@ } else { - /* BSS */ + /* Clear the BSS area */ RtlZeroMemory((PVOID)((ULONG_PTR)LoadBase + Section[i].VirtualAddress), Section[i].Misc.VirtualSize); @@ -595,6 +594,7 @@ PVOID ImageBase, LoadBase, ReadBuffer; ULONG ImageId = LoaderBlock.ModsCount; ULONG ImageSize; + NTSTATUS Status = STATUS_SUCCESS; /* Set the virtual (image) and physical (load) addresses */ LoadBase = (PVOID)NextModuleBase; @@ -619,13 +619,19 @@ MmFreeMemory(ReadBuffer); /* Calculate Difference between Real Base and Compiled Base*/ - if (ImageType != 2) LdrRelocateImageWithBias(LoadBase, - (ULONG_PTR)ImageBase - - (ULONG_PTR)LoadBase, - "FreeLdr", - STATUS_SUCCESS, - STATUS_UNSUCCESSFUL, - STATUS_UNSUCCESSFUL); + Status = LdrRelocateImageWithBias(LoadBase, + (ULONG_PTR)ImageBase - + (ULONG_PTR)LoadBase, + "FreeLdr", + STATUS_SUCCESS, + STATUS_UNSUCCESSFUL, + STATUS_UNSUCCESSFUL); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DbgPrint("Failed to relocate image: %s\n", Name); + return NULL; + } /* Fill out Module Data Structure */ reactos_modules[ImageId].ModStart = (ULONG_PTR)ImageBase; @@ -637,14 +643,11 @@ /* Increase the next Load Base */ NextModuleBase = ROUND_UP(NextModuleBase + ImageSize, PAGE_SIZE); - /* Successful load! */ - //DbgPrint("Image: %s loaded at: %p\n", Name, ImageBase); - /* Load HAL if this is the kernel */ if (ImageType == 1) FrLdrLoadImage("hal.dll", 10, FALSE); /* Perform import fixups */ - if (ImageType != 2) LdrPEFixupImports(LoadBase, Name); + LdrPEFixupImports(LoadBase, Name); /* Return the final mapped address */ return LoadBase; Propchange: trunk/reactos/dll/keyboard/kbdit/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Mar 12 20:30:57 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/keyboard/kbdth/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Mar 12 20:30:57 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/win32/usp10/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Mar 12 20:30:57 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/drivers/multimedia/drmk/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Mar 12 20:30:57 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/drivers/multimedia/ks/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Mar 12 20:30:57 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/drivers/wmi/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Mar 12 20:30:57 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Mon Mar 12 20:30:57 2007 @@ -157,7 +157,7 @@ if (ExpInTextModeSetup) return; if (Unicode) { - if (wcsstr(ServiceName, L".sys")) Extra = ""; + if (wcsstr(_wcsupr(ServiceName), L".SYS")) Extra = ""; sprintf(TextBuffer, "%s%s%s\\%S%s\n", KeLoaderBlock->ArcBootDeviceName, @@ -168,7 +168,7 @@ } else { - if (strstr(ServiceName, ".sys")) Extra = ""; + if (strstr(_strupr(ServiceName), ".SYS")) Extra = ""; sprintf(TextBuffer, "%s%s%s\\%s%s\n", KeLoaderBlock->ArcBootDeviceName, @@ -733,7 +733,6 @@ PLDR_DATA_TABLE_ENTRY ModuleObject; #endif - /* * Display 'Loading XXX...' message */ @@ -887,7 +886,7 @@ * HACK: Make sure we're loading a driver * (we should be using BootDriverListHead!) */ - if (wcsstr(LdrEntry->BaseDllName.Buffer, L".sys")) + if (wcsstr(_wcsupr(LdrEntry->BaseDllName.Buffer), L".SYS")) { /* Make sure we didn't load this driver already */ if (!(LdrEntry->Flags & LDRP_ENTRY_INSERTED)) Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Mon Mar 12 20:30:57 2007 @@ -1221,7 +1221,9 @@ /* Sanity check */ ASSERT(*(PULONG)NewImageAddress == *(PULONG)DllBase); - /* Set the image base to the old address */ + /* Set the image base to the address where the loader put it */ + NtHeader->OptionalHeader.ImageBase = (ULONG_PTR)DllBase; + NtHeader = RtlImageNtHeader(NewImageAddress); NtHeader->OptionalHeader.ImageBase = (ULONG_PTR)DllBase; /* Check if we had relocations */

1 0

[dgorbachev] 26066: Fix BSS bugs (#2068, #2072)
by dgorbachev＠svn.reactos.org 12 Mar '07

12 Mar '07

Author: dgorbachev Date: Mon Mar 12 03:29:56 2007 New Revision: 26066 URL: http://svn.reactos.org/svn/reactos?rev=26066&view=rev Log: Fix BSS bugs (#2068, #2072) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Mon Mar 12 03:29:56 2007 @@ -556,19 +556,29 @@ /* Copy image sections into virtual section */ for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) { - /* Get the size of this section and check if it's valid and on-disk */ + /* Get the size of this section and check if it's valid */ Size = Section[i].VirtualAddress + Section[i].Misc.VirtualSize; - if ((Size <= DriverSize) && (Section[i].SizeOfRawData)) - { - /* Copy the data from the disk to the image */ - RtlCopyMemory((PVOID)((ULONG_PTR)LoadBase + - Section[i].VirtualAddress), - (PVOID)((ULONG_PTR)Base + - Section[i].PointerToRawData), - Section[i].Misc.VirtualSize > - Section[i].SizeOfRawData ? - Section[i].SizeOfRawData : - Section[i].Misc.VirtualSize); + if (Size <= DriverSize) + { + if (Section[i].SizeOfRawData) + { + /* Copy the data from the disk to the image */ + RtlCopyMemory((PVOID)((ULONG_PTR)LoadBase + + Section[i].VirtualAddress), + (PVOID)((ULONG_PTR)Base + + Section[i].PointerToRawData), + Section[i].Misc.VirtualSize > + Section[i].SizeOfRawData ? + Section[i].SizeOfRawData : + Section[i].Misc.VirtualSize); + } + else + { + /* BSS */ + RtlZeroMemory((PVOID)((ULONG_PTR)LoadBase + + Section[i].VirtualAddress), + Section[i].Misc.VirtualSize); + } } }

1 0

[greatlrd] 26065: NtGdiDdWaitForVerticalBlank copy user mode pointer to kmode memory and copy back some data to user mode pointer using seh NtGdiDdCanCreateSurface, NtGdiDdGetScanLine fixing a stupied bug do not crash if look fail of hDD handler. but this should never happen. either way
by greatlrd＠svn.reactos.org 11 Mar '07

11 Mar '07

Author: greatlrd Date: Sun Mar 11 19:28:22 2007 New Revision: 26065 URL: http://svn.reactos.org/svn/reactos?rev=26065&view=rev Log: NtGdiDdWaitForVerticalBlank copy user mode pointer to kmode memory and copy back some data to user mode pointer using seh NtGdiDdCanCreateSurface, NtGdiDdGetScanLine fixing a stupied bug do not crash if look fail of hDD handler. but this should never happen. either way Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Sun Mar 11 19:28:22 2007 @@ -92,32 +92,54 @@ DWORD STDCALL NtGdiDdWaitForVerticalBlank( HANDLE hDirectDrawLocal, - PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData -) -{ - DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; - PDD_DIRECTDRAW_GLOBAL lgpl; - PDD_DIRECTDRAW pDirectDraw; - - DPRINT1("NtGdiDdWaitForVerticalBlank\n"); - - pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - - if (pDirectDraw != NULL) - { - if (pDirectDraw->DD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK) - { - lgpl = puWaitForVerticalBlankData->lpDD; - puWaitForVerticalBlankData->lpDD = &pDirectDraw->Global; - - ddRVal = pDirectDraw->DD.WaitForVerticalBlank(puWaitForVerticalBlankData); - - puWaitForVerticalBlankData->lpDD = lgpl; - } - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - } - - return ddRVal; + PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData) +{ + DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; + PDD_DIRECTDRAW pDirectDraw = NULL; + NTSTATUS Status = FALSE; + DD_WAITFORVERTICALBLANKDATA WaitForVerticalBlankData; + + DPRINT1("NtGdiDdWaitForVerticalBlank\n"); + + _SEH_TRY + { + ProbeForRead(puWaitForVerticalBlankData, sizeof(DD_WAITFORVERTICALBLANKDATA), 1); + RtlCopyMemory(&WaitForVerticalBlankData,puWaitForVerticalBlankData, sizeof(DD_WAITFORVERTICALBLANKDATA)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(NT_SUCCESS(Status)) + { + pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + + if (pDirectDraw != NULL) + { + if (pDirectDraw->DD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK) + { + WaitForVerticalBlankData.ddRVal = DDERR_GENERIC; + WaitForVerticalBlankData.lpDD = &pDirectDraw->Global;; + ddRVal = pDirectDraw->DD.WaitForVerticalBlank(&WaitForVerticalBlankData); + } + _SEH_TRY + { + ProbeForWrite(puWaitForVerticalBlankData, sizeof(DD_WAITFORVERTICALBLANKDATA), 1); + puWaitForVerticalBlankData->ddRVal = WaitForVerticalBlankData.ddRVal; + puWaitForVerticalBlankData->bIsInVB = WaitForVerticalBlankData.bIsInVB; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + } + } + return ddRVal; } @@ -182,8 +204,8 @@ } _SEH_END; } + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); } - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); } return ddRVal; @@ -220,6 +242,7 @@ { if (pDirectDraw->DD.dwFlags & DDHAL_CB32_GETSCANLINE) { + GetScanLineData.ddRVal = DDERR_GENERIC; GetScanLineData.lpDD = &pDirectDraw->Global; ddRVal = pDirectDraw->DD.GetScanLine(&GetScanLineData); @@ -235,8 +258,8 @@ } _SEH_END; } + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); } - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); } return ddRVal;

1 0

[greatlrd] 26064: fixing smaller bug in NtGdiDdCanCreateSurface and NtGdiDdGetScanLine
by greatlrd＠svn.reactos.org 11 Mar '07

11 Mar '07

Author: greatlrd Date: Sun Mar 11 18:47:49 2007 New Revision: 26064 URL: http://svn.reactos.org/svn/reactos?rev=26064&view=rev Log: fixing smaller bug in NtGdiDdCanCreateSurface and NtGdiDdGetScanLine Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Sun Mar 11 18:47:49 2007 @@ -145,8 +145,8 @@ RtlCopyMemory(&CanCreateSurfaceData,puCanCreateSurfaceData, sizeof(DD_CANCREATESURFACEDATA)); /* FIXME can be version 2 of DDSURFACEDESC */ - ProbeForRead(&CanCreateSurfaceData.lpDDSurfaceDesc, sizeof(DDSURFACEDESC), 1); - RtlCopyMemory(&desc,&CanCreateSurfaceData.lpDDSurfaceDesc, sizeof(DD_CANCREATESURFACEDATA)); + ProbeForRead(puCanCreateSurfaceData->lpDDSurfaceDesc, sizeof(DDSURFACEDESC), 1); + RtlCopyMemory(&desc,puCanCreateSurfaceData->lpDDSurfaceDesc, sizeof(DDSURFACEDESC)); } _SEH_HANDLE { @@ -165,6 +165,22 @@ CanCreateSurfaceData.lpDD = &pDirectDraw->Global; CanCreateSurfaceData.lpDDSurfaceDesc = &desc; ddRVal = pDirectDraw->DD.CanCreateSurface(&CanCreateSurfaceData); + + _SEH_TRY + { + ProbeForWrite(puCanCreateSurfaceData, sizeof(DD_CANCREATESURFACEDATA), 1); + puCanCreateSurfaceData->ddRVal = CanCreateSurfaceData.ddRVal; + + /* FIXME can be version 2 of DDSURFACEDESC */ + ProbeForWrite(puCanCreateSurfaceData->lpDDSurfaceDesc, sizeof(DDSURFACEDESC), 1); + RtlCopyMemory(puCanCreateSurfaceData->lpDDSurfaceDesc,&desc, sizeof(DDSURFACEDESC)); + + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } } GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); @@ -180,28 +196,48 @@ DWORD STDCALL NtGdiDdGetScanLine( HANDLE hDirectDrawLocal, PDD_GETSCANLINEDATA puGetScanLineData) { - DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; - PDD_DIRECTDRAW_GLOBAL lgpl; - - PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - - DPRINT1("NtGdiDdGetScanLine\n"); - - if (pDirectDraw != NULL) - { - - if (pDirectDraw->DD.dwFlags & DDHAL_CB32_GETSCANLINE) - { - lgpl = puGetScanLineData->lpDD; - puGetScanLineData->lpDD = &pDirectDraw->Global; - - ddRVal = pDirectDraw->DD.GetScanLine(puGetScanLineData); - - puGetScanLineData->lpDD = lgpl; - } - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - } + DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; + DD_GETSCANLINEDATA GetScanLineData; + PDD_DIRECTDRAW pDirectDraw; + NTSTATUS Status = FALSE; + + DPRINT1("NtGdiDdGetScanLine\n"); + + _SEH_TRY + { + ProbeForRead(puGetScanLineData, sizeof(DD_GETSCANLINEDATA), 1); + RtlCopyMemory(&GetScanLineData,puGetScanLineData, sizeof(DD_GETSCANLINEDATA)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(NT_SUCCESS(Status)) + { + pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW);; + if (pDirectDraw != NULL) + { + if (pDirectDraw->DD.dwFlags & DDHAL_CB32_GETSCANLINE) + { + GetScanLineData.lpDD = &pDirectDraw->Global; + ddRVal = pDirectDraw->DD.GetScanLine(&GetScanLineData); + + _SEH_TRY + { + ProbeForWrite(puGetScanLineData, sizeof(DD_GETSCANLINEDATA), 1); + puGetScanLineData->dwScanLine = GetScanLineData.dwScanLine; + puGetScanLineData->ddRVal = GetScanLineData.ddRVal; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + } + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + } return ddRVal; }

1 0

[greatlrd] 26063: fixing smaller bug in NtGdiDdCanCreateSurface
by greatlrd＠svn.reactos.org 11 Mar '07

11 Mar '07

Author: greatlrd Date: Sun Mar 11 18:18:12 2007 New Revision: 26063 URL: http://svn.reactos.org/svn/reactos?rev=26063&view=rev Log: fixing smaller bug in NtGdiDdCanCreateSurface Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Sun Mar 11 18:18:12 2007 @@ -131,28 +131,44 @@ PDD_CANCREATESURFACEDATA puCanCreateSurfaceData ) { - DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; - PDD_DIRECTDRAW_GLOBAL lgpl; - - PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - - DPRINT1("NtGdiDdCanCreateSurface\n"); - - if (pDirectDraw != NULL) - { - - if (pDirectDraw->DD.dwFlags & DDHAL_CB32_CANCREATESURFACE) - { - lgpl = puCanCreateSurfaceData->lpDD; - puCanCreateSurfaceData->lpDD = &pDirectDraw->Global; - - ddRVal = pDirectDraw->DD.CanCreateSurface(puCanCreateSurfaceData); - - puCanCreateSurfaceData->lpDD = lgpl; - } - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - } + DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; + DD_CANCREATESURFACEDATA CanCreateSurfaceData; + DDSURFACEDESC desc; + NTSTATUS Status = FALSE; + PDD_DIRECTDRAW pDirectDraw = NULL; + + DPRINT1("NtGdiDdCanCreateSurface\n"); + + _SEH_TRY + { + ProbeForRead(puCanCreateSurfaceData, sizeof(DD_CANCREATESURFACEDATA), 1); + RtlCopyMemory(&CanCreateSurfaceData,puCanCreateSurfaceData, sizeof(DD_CANCREATESURFACEDATA)); + + /* FIXME can be version 2 of DDSURFACEDESC */ + ProbeForRead(&CanCreateSurfaceData.lpDDSurfaceDesc, sizeof(DDSURFACEDESC), 1); + RtlCopyMemory(&desc,&CanCreateSurfaceData.lpDDSurfaceDesc, sizeof(DD_CANCREATESURFACEDATA)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(NT_SUCCESS(Status)) + { + pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + if (pDirectDraw != NULL) + { + if (pDirectDraw->DD.dwFlags & DDHAL_CB32_CANCREATESURFACE) + { + CanCreateSurfaceData.ddRVal = DDERR_GENERIC; + CanCreateSurfaceData.lpDD = &pDirectDraw->Global; + CanCreateSurfaceData.lpDDSurfaceDesc = &desc; + ddRVal = pDirectDraw->DD.CanCreateSurface(&CanCreateSurfaceData); + } + } + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + } return ddRVal; }

1 0

[greatlrd] 26062: forget clear a value in gdientry2
by greatlrd＠svn.reactos.org 11 Mar '07

11 Mar '07

Author: greatlrd Date: Sun Mar 11 17:01:22 2007 New Revision: 26062 URL: http://svn.reactos.org/svn/reactos?rev=26062&view=rev Log: forget clear a value in gdientry2 Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sun Mar 11 17:01:22 2007 @@ -473,6 +473,7 @@ RtlZeroMemory(&D3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)); RtlZeroMemory(&D3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)); RtlZeroMemory(&D3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS)); + RtlZeroMemory(CallbackFlags, sizeof(DWORD)*3); /* Check if we got a list pointer */ if (pvmList)

1 0

[ion] 26061: - Release dispatcher lock if gate is already signaled. See issue #2083 for more details.
by ion＠svn.reactos.org 11 Mar '07

11 Mar '07

Author: ion Date: Sun Mar 11 03:42:18 2007 New Revision: 26061 URL: http://svn.reactos.org/svn/reactos?rev=26061&view=rev Log: - Release dispatcher lock if gate is already signaled. See issue #2083 for more details. Modified: trunk/reactos/ntoskrnl/ke/gate.c Modified: trunk/reactos/ntoskrnl/ke/gate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/gate.c?rev=260… ============================================================================== --- trunk/reactos/ntoskrnl/ke/gate.c (original) +++ trunk/reactos/ntoskrnl/ke/gate.c Sun Mar 11 03:42:18 2007 @@ -75,6 +75,9 @@ KiReleaseDispatcherObject(&Gate->Header); KiReleaseThreadLock(Thread); + /* Release the gate lock */ + if (Queue) KiReleaseDispatcherLockFromDpcLevel(); + /* Release the APC lock and return */ KiReleaseApcLock(&ApcLock); break;

1 0

[ekohl] 26060: Show custom colors in the preview window.
by ekohl＠svn.reactos.org 10 Mar '07

10 Mar '07

Author: ekohl Date: Sun Mar 11 00:25:03 2007 New Revision: 26060 URL: http://svn.reactos.org/svn/reactos?rev=26060&view=rev Log: Show custom colors in the preview window. Modified: trunk/reactos/dll/cpl/desk/advappdlg.c trunk/reactos/dll/cpl/desk/preview.c trunk/reactos/dll/cpl/desk/preview.h Modified: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/advappdlg.c (original) +++ trunk/reactos/dll/cpl/desk/advappdlg.c Sun Mar 11 00:25:03 2007 @@ -29,7 +29,7 @@ if (nColor != -1) { /* Create a DC to draw on */ - hwndColorButton = GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_COLOR1_B); + hwndColorButton = GetDlgItem(hwndDlg, ID); hdcColorButton = GetDC(hwndColorButton); hdcCompat = CreateCompatibleDC(hdcColorButton); ReleaseDC(hwndColorButton, hdcColorButton); @@ -294,6 +294,7 @@ if (crColor != cc.rgbResult) { UpdateButtonColor(hwndDlg, g, ID, nButton, ColorIndex); + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETCOLOR, ColorIndex, cc.rgbResult); return TRUE; } } Modified: trunk/reactos/dll/cpl/desk/preview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.c (original) +++ trunk/reactos/dll/cpl/desk/preview.c Sun Mar 11 00:25:03 2007 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: lib/cpl/desk/preview.c * PURPOSE: Draws the preview control - * COPYRIGHT: Copyright 2006, 2007 Eric Kohl (email?) + * COPYRIGHT: Copyright 2006, 2007 Eric Kohl */ #include "desk.h" @@ -15,19 +15,11 @@ { HWND hwndParent; - DWORD clrDesktop; + DWORD clrSysColor[COLOR_MENUBAR]; + + HBRUSH hbrScrollbar; HBRUSH hbrDesktop; - - DWORD clrWindow; HBRUSH hbrWindow; - - DWORD clrScrollbar; - HBRUSH hbrScrollbar; - - DWORD clrActiveCaptionText; - DWORD clrInactiveCaptionText; - DWORD clrWindowText; - DWORD clrButtonText; INT cxEdge; INT cyEdge; @@ -148,19 +140,16 @@ OnCreate(HWND hwnd, PPREVIEW_DATA pPreviewData) { NONCLIENTMETRICS NonClientMetrics; - - pPreviewData->clrScrollbar = GetSysColor(COLOR_SCROLLBAR); - pPreviewData->hbrScrollbar = CreateSolidBrush(pPreviewData->clrScrollbar); - - pPreviewData->clrDesktop = GetSysColor(COLOR_DESKTOP); - pPreviewData->hbrDesktop = CreateSolidBrush(pPreviewData->clrDesktop); - pPreviewData->clrWindow = GetSysColor(COLOR_WINDOW); - pPreviewData->hbrWindow = CreateSolidBrush(pPreviewData->clrWindow); - - pPreviewData->clrActiveCaptionText = GetSysColor(COLOR_CAPTIONTEXT); - pPreviewData->clrInactiveCaptionText = GetSysColor(COLOR_INACTIVECAPTIONTEXT); - pPreviewData->clrWindowText = GetSysColor(COLOR_WINDOWTEXT); - pPreviewData->clrButtonText = GetSysColor(COLOR_BTNTEXT); + INT i; + + for (i = 0; i < COLOR_MENUBAR + 1; i++) + { + pPreviewData->clrSysColor[i] = GetSysColor(i); + } + + pPreviewData->hbrScrollbar = CreateSolidBrush(pPreviewData->clrSysColor[COLOR_SCROLLBAR]); + pPreviewData->hbrDesktop = CreateSolidBrush(pPreviewData->clrSysColor[COLOR_DESKTOP]); + pPreviewData->hbrWindow = CreateSolidBrush(pPreviewData->clrSysColor[COLOR_WINDOW]); pPreviewData->cxEdge = GetSystemMetrics(SM_CXEDGE) - 2; pPreviewData->cyEdge = GetSystemMetrics(SM_CXEDGE) - 2; @@ -354,14 +343,14 @@ /* Inactive Window */ DrawEdge(hdc, &pPreviewData->rcInactiveFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE); - SetTextColor(hdc, pPreviewData->clrInactiveCaptionText); + SetTextColor(hdc, pPreviewData->clrSysColor[COLOR_INACTIVECAPTIONTEXT]); DrawCaptionTemp(NULL, hdc, &pPreviewData->rcInactiveCaption, pPreviewData->hCaptionFont, NULL, pPreviewData->lpInAct, DC_GRADIENT | DC_ICON | DC_TEXT); DrawCaptionButtons(hdc, &pPreviewData->rcInactiveCaption, TRUE, pPreviewData->cyCaption - 2); /* Active Window */ DrawEdge(hdc, &pPreviewData->rcActiveFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE); - SetTextColor(hdc, pPreviewData->clrActiveCaptionText); + SetTextColor(hdc, pPreviewData->clrSysColor[COLOR_CAPTIONTEXT]); DrawCaptionTemp(NULL, hdc, &pPreviewData->rcActiveCaption, pPreviewData->hCaptionFont, NULL, pPreviewData->lpAct, DC_ACTIVE | DC_GRADIENT | DC_ICON | DC_TEXT); DrawCaptionButtons(hdc, &pPreviewData->rcActiveCaption, TRUE, pPreviewData->cyCaption - 2); @@ -380,7 +369,7 @@ CopyRect(&rc, &pPreviewData->rcActiveClient); rc.left += 4; rc.top += 2; - SetTextColor(hdc, pPreviewData->clrWindowText); + SetTextColor(hdc, pPreviewData->clrSysColor[COLOR_WINDOWTEXT]); hOldFont = SelectObject(hdc, pPreviewData->hCaptionFont); DrawText(hdc, pPreviewData->lpWinTxt, lstrlen(pPreviewData->lpWinTxt), &rc, DT_LEFT); SelectObject(hdc, hOldFont); @@ -390,7 +379,7 @@ /* Dialog Window */ DrawEdge(hdc, &pPreviewData->rcDialogFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE); - SetTextColor(hdc, pPreviewData->clrActiveCaptionText); + SetTextColor(hdc, pPreviewData->clrSysColor[COLOR_WINDOW]); DrawCaptionTemp(NULL, hdc, &pPreviewData->rcDialogCaption, pPreviewData->hCaptionFont, NULL, pPreviewData->lpMessBox, DC_ACTIVE | DC_GRADIENT | DC_ICON | DC_TEXT); DrawCaptionButtons(hdc, &pPreviewData->rcDialogCaption, FALSE, pPreviewData->cyCaption - 2); @@ -407,7 +396,7 @@ /* Draw Button */ DrawFrameControl(hdc, &pPreviewData->rcDialogButton, DFC_BUTTON, DFCS_BUTTONPUSH); CopyRect(&rc, &pPreviewData->rcDialogButton); - SetTextColor(hdc, pPreviewData->clrButtonText); + SetTextColor(hdc, pPreviewData->clrSysColor[COLOR_BTNTEXT]); hOldFont = SelectObject(hdc, pPreviewData->hMessageFont); DrawText(hdc, pPreviewData->lpButText, lstrlen(pPreviewData->lpButText), &rc, DT_VCENTER | DT_CENTER | DT_SINGLELINE); SelectObject(hdc, hOldFont); @@ -608,6 +597,28 @@ InvalidateRect(hwnd, NULL, FALSE); break; + case PVM_SETCOLOR: + pPreviewData->clrSysColor[(INT)wParam] = (DWORD)lParam; + switch((INT)wParam) + { + case COLOR_SCROLLBAR: + DeleteObject(pPreviewData->hbrScrollbar); + pPreviewData->hbrScrollbar = CreateSolidBrush(pPreviewData->clrSysColor[COLOR_SCROLLBAR]); + break; + + case COLOR_DESKTOP: + DeleteObject(pPreviewData->hbrDesktop); + pPreviewData->hbrDesktop = CreateSolidBrush(pPreviewData->clrSysColor[COLOR_DESKTOP]); + break; + + case COLOR_WINDOW: + DeleteObject(pPreviewData->hbrWindow); + pPreviewData->hbrWindow = CreateSolidBrush(pPreviewData->clrSysColor[COLOR_WINDOW]); + break; + } + InvalidateRect(hwnd, NULL, FALSE); + break; + default: DefWindowProc(hwnd, uMsg, Modified: trunk/reactos/dll/cpl/desk/preview.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.h?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.h (original) +++ trunk/reactos/dll/cpl/desk/preview.h Sun Mar 11 00:25:03 2007 @@ -39,5 +39,7 @@ #define PVM_SETMENUFONT (WM_USER+10) #define PVM_SETDIALOGFONT (WM_USER+11) +#define PVM_SETCOLOR (WM_USER+12) + BOOL RegisterPreviewControl(IN HINSTANCE hInstance); VOID UnregisterPreviewControl(IN HINSTANCE hInstance);

1 0

[dgorbachev] 26059: Fix Bugzilla bug 2051 (French translation by Heis Spiter)
by dgorbachev＠svn.reactos.org 10 Mar '07

10 Mar '07

Author: dgorbachev Date: Sat Mar 10 22:07:20 2007 New Revision: 26059 URL: http://svn.reactos.org/svn/reactos?rev=26059&view=rev Log: Fix Bugzilla bug 2051 (French translation by Heis Spiter) Added: trunk/reactos/base/applications/charmap/lang/fr-FR.rc Modified: trunk/reactos/base/applications/charmap/rsrc.rc Added: trunk/reactos/base/applications/charmap/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/charmap/lang/fr-FR.rc Sat Mar 10 22:07:20 2007 @@ -1,0 +1,35 @@ +LANGUAGE LANG_FRENCH, SUBLANG_FRENCH + +IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 +CAPTION "Table des Caractères" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +BEGIN + LTEXT "Police :", IDC_STATIC, 6, 7, 24, 9 + COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + PUSHBUTTON "Aide", IDC_CMHELP, 249, 5, 35, 13 + CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 + LTEXT "Caractères à copier :", IDC_STATIC, 6, 188, 66, 9 + EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Sélectionner", IDC_SELECT, 194, 186, 46, 13 + PUSHBUTTON "Copier", IDC_COPY, 244, 186, 46, 13, WS_DISABLED + //AUTOCHECKBOX "Vue avancée", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP + //EDITTEXT IDC_DISPLAY, 8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "À propos de la Table des Caractères" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Table des Caractères v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "Fermer", IDOK, 75, 162, 44, 15 + ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_ABOUT "À propos..." +END Modified: trunk/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/rsrc.rc (original) +++ trunk/reactos/base/applications/charmap/rsrc.rc Sat Mar 10 22:07:20 2007 @@ -9,4 +9,5 @@ #include "lang/en-US.rc" #include "lang/id-ID.rc" +#include "lang/fr-FR.rc"

1 0

[dgorbachev] 26058: Norwegian translation by LMH1 (bugs 1699, 1739, 1740)
by dgorbachev＠svn.reactos.org 10 Mar '07

10 Mar '07

Author: dgorbachev Date: Sat Mar 10 21:54:12 2007 New Revision: 26058 URL: http://svn.reactos.org/svn/reactos?rev=26058&view=rev Log: Norwegian translation by LMH1 (bugs 1699, 1739, 1740) Added: trunk/reactos/base/setup/vmwinst/lang/nb-NO.rc Modified: trunk/reactos/base/applications/taskmgr/lang/nb-NO.rc trunk/reactos/base/setup/vmwinst/rsrc.rc trunk/reactos/base/shell/cmd/nb-NO.rc Modified: trunk/reactos/base/applications/taskmgr/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/taskmgr/lang/nb-NO.rc Sat Mar 10 21:54:12 2007 @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources +// Norwegian resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 @@ -59,8 +59,8 @@ END POPUP "&Vindu" BEGIN - MENUITEM "Hele &horisontalt", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "Hele &vertikalt", ID_WINDOWS_TILEVERTICALLY + MENUITEM "Sorter &horisontalt", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Sorter &vertikalt", ID_WINDOWS_TILEVERTICALLY MENUITEM "&Minimer", ID_WINDOWS_MINIMIZE MENUITEM "Ma&ksimer", ID_WINDOWS_MAXIMIZE MENUITEM "&Overlappet", ID_WINDOWS_CASCADE @@ -76,8 +76,8 @@ IDR_WINDOWSMENU MENU DISCARDABLE BEGIN - MENUITEM "Hele &horisontalt", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "Hele &vertikalt", ID_WINDOWS_TILEVERTICALLY + MENUITEM "Sorter &horisontalt", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Sorter &vertikalt", ID_WINDOWS_TILEVERTICALLY MENUITEM "&Minimer", ID_WINDOWS_MINIMIZE MENUITEM "Ma&ksimer", ID_WINDOWS_MAXIMIZE MENUITEM "&Cascade", ID_WINDOWS_CASCADE @@ -103,8 +103,8 @@ MENUITEM "&Bytt til", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Plasser lengst frem", ID_WINDOWS_BRINGTOFRONT MENUITEM SEPARATOR - MENUITEM "Hele &horisontalt", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "Hele &vertikalt", ID_WINDOWS_TILEVERTICALLY + MENUITEM "Sorter &horisontalt", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Sorter &vertikalt", ID_WINDOWS_TILEVERTICALLY MENUITEM "&Minimer", ID_WINDOWS_MINIMIZE MENUITEM "Ma&ksimer", ID_WINDOWS_MAXIMIZE MENUITEM "&Overlappet", ID_WINDOWS_CASCADE @@ -220,7 +220,7 @@ GROUPBOX "Tildelt minne (kb)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Fysisk minne (kb)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Kjerne minne (kb)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT - LTEXT "Referanser",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 + LTEXT "Referanser",IDS_TOTALS_HANDLE_COUNT,12,131,50,8 LTEXT "Tråder",IDS_TOTALS_THREAD_COUNT,12,140,27,8 LTEXT "Prosesser",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | @@ -230,7 +230,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER LTEXT "Totalt",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Begrensning",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Begrensninger",IDS_COMMIT_CHARGE_LIMIT,12,184,50,8 LTEXT "Topp",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER @@ -239,7 +239,7 @@ EDITTEXT IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER LTEXT "Totalt",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 - LTEXT "Tilgjengelig",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 + LTEXT "Tilgjengelig",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,40,8 LTEXT "Systembuffer",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER @@ -248,8 +248,8 @@ EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER LTEXT "Totalt",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 - LTEXT "Sidevekslet",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 - LTEXT "Ikke sidevekslet",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 + LTEXT "Sidevekslet",IDS_KERNEL_MEMORY_PAGED,137,184,50,8 + LTEXT "Ikke sidevekslet",IDS_KERNEL_MEMORY_NONPAGED,137,193,75,8 EDITTEXT IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER EDITTEXT IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT | @@ -669,7 +669,7 @@ END -#endif // English (U.S.) resources +#endif // Norwegian resources ///////////////////////////////////////////////////////////////////////////// Added: trunk/reactos/base/setup/vmwinst/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/nb… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/nb-NO.rc (added) +++ trunk/reactos/base/setup/vmwinst/lang/nb-NO.rc Sat Mar 10 21:54:12 2007 @@ -1,0 +1,131 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installasjon" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS installering oppdager om du kjører ReactOS i VMware(r).", -1, 100, 8, 160, 24 + LTEXT "Hvis du vil installere VMware(r) SVGA driver trykk 'Neste', ellers trykk 'Avbryt'.", -1, 100, 140, 160, 17 +END + +IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installasjon" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS installering kommer ikke med VMware(r) SVGA driver.\n\nDerfor gå til 'VM' i din VMware(r) workstation menylinje og velg 'Innstaller VMware verktøy...'\n\n\nTrykk 'Neste' for å fortsette eller 'Avbryt' for å hoppe over SVGA driver installasjon.",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installasjon" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 + CONTROL "", IDC_INSTALLINGPROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Innstallasjon" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "VMware(r) SVGA driver har blitt vellykket innstallert. Venligst velg din favoritt skjerm oppløsning:",-1,25,5,225,20 + PUSHBUTTON "640x480", 540, 25, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON + LTEXT "Vennligst velg din favoritt farge kvalitet:", -1, 25, 93, 225, 12 + COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP +END + +IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Innstallasjon" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS innstallering var ute av stand til å installere VMware(r) SVGA driver.\n\n\nTrykk 'Ferdig' for å fortsette installasjon prosess.",-1,25,25,225,85 +END + +IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installasjon" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "VMware(r) SVGA driver er allerede installert.\n\nVenligst velg hva du vil gjøre:",-1,25,5,225,30 + PUSHBUTTON "Konfigurere skjerm innstillinger", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Bruk en forsjellig grafikk driver", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Avinnstaller VMware(r) SVGA driver", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "Trykk 'Neste' for å fortsette eller 'Avbryt' for å avslutte veiviseren.", -1, 25, 93, 225, 12 +END + +IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installasjon" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Venligst velg grafikk driver du vil bruke:",-1,25,25,225,15 + PUSHBUTTON "ReactOS VGA Driver", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ReactOS VBE Driver (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "Trykk 'Ferdig' for å avslutte operasjon eller 'Avbryt' for å avslutte innstalleringen uten endringer.", -1, 25, 93, 225, 20 +END + +IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installasjon" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS innstallering er omtrent for å avinnstaller din VMware(r) SVGA driver!!!\n\n\nTrykk 'Ferdig' for å avinnstallere driveren eller 'Avbryt' for å la det være som det er.",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "VMware(r) oppdaget" + IDS_FAILEDTOLOCATEDRIVERS "ReactOS installering kunne ikke finne trengte filer.\nVennligst vær sikker på VMware(r) verktøy CD-ROM er satt inn." + IDS_FAILEDTOCOPYFILES "ReactOS installering mislykkes for å kopiere trengte filer.\nVennligst vær sikker på VMware(r) verktøy CD-ROM er satt inn.\n" + IDS_FAILEDTOACTIVATEDRIVER "Mislykkes å aktivere VMware(r) SVGA driver!" + IDS_FAILEDTOSELVGADRIVER "Mislykkes å aktivere ReactOS VGA driver!" + IDS_FAILEDTOSELVBEDRIVER "Mislykkes å aktivere ReactOS VBE driver!" + IDS_UNINSTNOTICE "VMware(r) SVGA driver filer har ikke enda blitt slettet.\nVenligst slett dem manuelt etter en system restart." + IDS_FAILEDTOADDREGENTRIES "Mislykkes å opprette registeret enheter for VMware(r) SVGA driver!" +END + +STRINGTABLE +BEGIN + 10001 "Laveste (8BPP)" + 10002 "Middels (16BPP)" + 10003 "Høyeste (32BPP)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM "Søker for VMware(r) Vertøy CD-ROM..." + IDS_COPYINGFILES "Kopierer filer..." + IDS_ENABLINGDRIVER "Muliggjøre VMware(r) SVGA driver..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE "VMware (r) SVGA driver innstallasjon veiviser" + IDD_INSERT_VMWARE_TOOLSSUBTITLE "Vennligst sett inn VMware verktøy CD-Rom." + IDD_INSTALLING_VMWARE_TOOLSTITLE "VMware (r) SVGA driver innstallasjon veiviser" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "Søker og kopierer VMware (r) SVGA driver." + IDD_CONFIGTITLE "VMware (r) SVGA driver innstallasjon veiviser" + IDD_CONFIGSUBTITLE "Velg din favoritt skjerm oppløsning." + IDD_INSTALLATION_FAILEDTITLE "VMware (r) SVGA driver innstallasjon veiviser" + IDD_INSTALLATION_FAILEDSUBTITLE "The VMware (r) SVGA driver innstallasjon mislykkes." + IDD_CHOOSEACTIONTITLE "VMware (r) SVGA driver innstallasjon veiviser" + IDD_CHOOSEACTIONSUBTITLE "Velg hva du vil gjøre." + IDD_SELECTDRIVERTITLE "VMware (r) SVGA driver innstallasjon veiviser" + IDD_SELECTDRIVERSUBTITLE "Velg en driver." + IDD_DOUNINSTALLTITLE "VMware (r) SVGA driver innstallasjon veiviser" + IDD_DOUNINSTALLSUBTITLE "Avinstallerer driveren." +END Modified: trunk/reactos/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/vmwinst/rsrc.rc (original) +++ trunk/reactos/base/setup/vmwinst/rsrc.rc Sat Mar 10 21:54:12 2007 @@ -23,5 +23,6 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" +#include "lang/nb-NO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/base/shell/cmd/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/nb-NO.rc?re… ============================================================================== --- trunk/reactos/base/shell/cmd/nb-NO.rc (original) +++ trunk/reactos/base/shell/cmd/nb-NO.rc Sat Mar 10 21:54:12 2007 @@ -1,9 +1,5 @@ #include "windows.h" #include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 - */ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE @@ -203,12 +199,12 @@ forhåndsinnstilt brytere etter retningsnummer noen bryter med - (hyphen)--for eksempel, /-W.\n" STRING_DIR_HELP2, " Volumet i stasjon %c er %s\n" -STRING_DIR_HELP3, " Volumet i stasjon %c har ingen merke.\n" -STRING_DIR_HELP4, " Volumet Serie nummer er %04X-%04X\n" -STRING_DIR_HELP5, "\n Totalt filer listet:\n%16i File(r)% 14s bytes\n" -STRING_DIR_HELP6, "%16i Dir(s)% 15s bytes\n" +STRING_DIR_HELP3, " Volumet i Stasjon %c har ingen navn.\n" +STRING_DIR_HELP4, " Volumets serienummer er %04X-%04X\n" +STRING_DIR_HELP5, "\n Totalt filer listet:\n%16i Fil(er)% 14s byte\n" +STRING_DIR_HELP6, "%16i mappe(r)% 15s byte\n" STRING_DIR_HELP7, "\n Katalog av %s\n\n" -STRING_DIR_HELP8, "%16i File(r)% 14s bytes\n" +STRING_DIR_HELP8, "%16i Fil(er)% 14s byte\n" STRING_DIRSTACK_HELP1, "lagringsenheter aktuelle katalog for bruk av POPD kommando, inntil da\n\ den endres til spesifiserte katalog.\n\n\ @@ -282,7 +278,7 @@ STRING_LABEL_HELP1, "Vis eller endre stasjon merke.\n\nMERKE [stasjon:][merke]\n" STRING_LABEL_HELP2, "Volumet i stasjon %c: er %s\n" -STRING_LABEL_HELP3, "Volumet i stasjon %c: har ingen merke\n" +STRING_LABEL_HELP3, "Volumet i stasjon %c: har ingen navn\n" STRING_LABEL_HELP4, "Volumet Serie Nummer er %04X-%04X\n" STRING_LABEL_HELP5, "Stasjon merke (11 tegn, innføre hvis ingen)? " @@ -480,7 +476,7 @@ STRING_VERSION_HELP7, "\nReactOS versjon skrivet av:\n" STRING_VOL_HELP1, " Volumet i stasjon %c: er %s" -STRING_VOL_HELP2, " Volumet i stasjon %c: har ingen merke" +STRING_VOL_HELP2, " Volumet i stasjon %c: har ingen navn" STRING_VOL_HELP3, " Volumet Serie nummer er %04X-%04X\n" STRING_VOL_HELP4, "Vis disk volumet merke og serie nummer, hvis det eksisterer.\n\nVOL [stasjon:]" @@ -625,7 +621,7 @@ STRING_ERROR_REQ_PARAM_MISSING, "Required parameter missing\n" STRING_ERROR_INVALID_DRIVE, "Ugyldig driver spesifikasjon\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Ugyldig parameter format - %s\n" -STRING_ERROR_BADCOMMAND, "Feil kommando eller filenavn\n" +STRING_ERROR_BADCOMMAND, "Feil kommando eller filnavn\n" STRING_ERROR_OUT_OF_MEMORY, "Ute av minne feil.\n" STRING_ERROR_CANNOTPIPE, "Feil! Kan ikke pipe! kan ikke åpne temporære filer!\n" STRING_ERROR_D_PAUSEMSG, "Trykk en tast for å fortsette . . ."

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs