Ros-diffs March 2007

ros-diffs@reactos.org

20 participants
287 discussions

[fireball] 26069: - Comment out excessive DbgPrint()s.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Mar 13 17:40:33 2007 New Revision: 26069 URL: http://svn.reactos.org/svn/reactos?rev=26069&view=rev Log: - Comment out excessive DbgPrint()s. Modified: branches/winldr/windows/peloader.c Modified: branches/winldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/peloader.c?rev=2… ============================================================================== --- branches/winldr/windows/peloader.c (original) +++ branches/winldr/windows/peloader.c Tue Mar 13 17:40:33 2007 @@ -569,13 +569,13 @@ Result = strcmp(VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name[0]), (PCHAR)VaToPa(RVA(DllBase, NameTable[Middle]))); - DbgPrint((DPRINT_WINDOWS, "Binary search: comparing Import '__', Export '%s'\n", + /*DbgPrint((DPRINT_WINDOWS, "Binary search: comparing Import '__', Export '%s'\n",*/ /*VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name[0]),*/ - (PCHAR)VaToPa(RVA(DllBase, NameTable[Middle])))); - - DbgPrint((DPRINT_WINDOWS, "TE->u1.AOD %p, fulladdr %p\n", + /*(PCHAR)VaToPa(RVA(DllBase, NameTable[Middle]))));*/ + + /*DbgPrint((DPRINT_WINDOWS, "TE->u1.AOD %p, fulladdr %p\n", ThunkData->u1.AddressOfData, - ((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name )); + ((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name ));*/ /* Depending on result of strcmp, perform different actions */

17 years, 9 months

[amunger] 26068: Typo fixes, patch by our friend Coviti.

by amunger＠svn.reactos.org

Author: amunger Date: Tue Mar 13 14:28:18 2007 New Revision: 26068 URL: http://svn.reactos.org/svn/reactos?rev=26068&view=rev Log: Typo fixes, patch by our friend Coviti. Modified: trunk/reactos/base/shell/cmd/en-US.rc Modified: trunk/reactos/base/shell/cmd/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/en-US.rc?re… ============================================================================== --- trunk/reactos/base/shell/cmd/en-US.rc (original) +++ trunk/reactos/base/shell/cmd/en-US.rc Tue Mar 13 14:28:18 2007 @@ -137,7 +137,7 @@ /T display only\n\n\ Type DATE without parameters to display the current date setting and\n\ a prompt for a new one. Press ENTER to keep the same date.\n" - + STRING_DEL_HELP1, "Deletes one or more files.\n\n\ DEL [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\ DELETE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\ @@ -389,14 +389,14 @@ STRING_REN_HELP2, " %lu file renamed\n" STRING_REN_HELP3, " %lu files renamed\n" - + STRING_SHIFT_HELP, "Changes the position of replaceable parameters in a batch file.\n\n\ SHIFT [DOWN]" STRING_SCREEN_HELP, "move cursor and optionally print text\n\n\ SCREEN row col [text]\n\n\ - row row to wich move the cursor\n\ - col column to wich move the cursor" + row row to which move the cursor\n\ + col column to which move the cursor" STRING_SET_HELP, "Displays, sets, or removes environment variables.\n\n\ SET [variable[=][string]]\n\n\ @@ -498,7 +498,7 @@ STRING_WINDOW_HELP2, "change console window aspect\n\n\ ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ -window tile of window on wich perform actions\n\ +window tile of window on which perform actions\n\ /POS specify window placement and dimensions\n\ MIN minimize the window\n\ MAX maximize the window\n\ @@ -531,7 +531,7 @@ GOTO Directs the ReactOS command interpreter to a labeled line in\n\ a batch program.\n\ HELP Provides Help information for ReactOS commands.\n\ -HISTORY List alle commands which has been used\n\ +HISTORY List all commands which has been used\n\ IF Performs conditional processing in batch programs.\n\ LABEL Creates, changes, or deletes the volume label of a disk.\n\ MD Creates a directory.\n\ @@ -599,7 +599,7 @@ STRING_ERROR_ERROR2, "Syntax error" STRING_FOR_ERROR1, "'in' missing in for statement." STRING_FOR_ERROR2, "no brackets found." -STRING_FOR_ERROR3, "'do' missing." +STRING_FOR_ERROR3, "'do' missing." STRING_FOR_ERROR4, "no command after 'do'." STRING_FREE_ERROR1, "Invalid drive" STRING_FREE_ERROR2, "unlabeled"

17 years, 9 months

[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

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 */

17 years, 9 months

[dgorbachev] 26066: Fix BSS bugs (#2068, #2072)

by dgorbachev＠svn.reactos.org

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); + } } }

17 years, 9 months

[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

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;

17 years, 9 months

[greatlrd] 26064: fixing smaller bug in NtGdiDdCanCreateSurface and NtGdiDdGetScanLine

by greatlrd＠svn.reactos.org

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; }

17 years, 9 months

[greatlrd] 26063: fixing smaller bug in NtGdiDdCanCreateSurface

by greatlrd＠svn.reactos.org

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; }

17 years, 9 months

[greatlrd] 26062: forget clear a value in gdientry2

by greatlrd＠svn.reactos.org

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)

17 years, 9 months

[ion] 26061: - Release dispatcher lock if gate is already signaled. See issue #2083 for more details.

by ion＠svn.reactos.org

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;

17 years, 9 months

[ekohl] 26060: Show custom colors in the preview window.

by ekohl＠svn.reactos.org

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);

17 years, 9 months

← Newer
1
...
13
14
15
16
17
18
19
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2007