Ros-diffs September 2012

ros-diffs@reactos.org

17 participants
236 discussions

[akhaldi] 57297: [HAL]: Automatically generate the embedded PCI database. By Hermès Bélusca with improvements from me. CORE-6654 #resolve #comment Patch committed. Thanks !

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Sep 14 13:14:47 2012 New Revision: 57297 URL: http://svn.reactos.org/svn/reactos?rev=57297&view=rev Log: [HAL]: Automatically generate the embedded PCI database. By Hermès Bélusca with improvements from me. CORE-6654 #resolve #comment Patch committed. Thanks ! Added: trunk/reactos/hal/halx86/legacy/bus/pci_classes.ids (with props) trunk/reactos/hal/halx86/legacy/bus/pci_vendors.ids (with props) Removed: trunk/reactos/hal/halx86/legacy/bus/libpcidata.a trunk/reactos/hal/halx86/legacy/bus/pcidata.c Modified: trunk/reactos/hal/halx86/CMakeLists.txt trunk/reactos/hal/halx86/legacy/bussupp.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… Removed: trunk/reactos/hal/halx86/legacy/bus/libpcidata.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/libp… Added: trunk/reactos/hal/halx86/legacy/bus/pci_classes.ids URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pci_… Added: trunk/reactos/hal/halx86/legacy/bus/pci_vendors.ids URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pci_… Removed: trunk/reactos/hal/halx86/legacy/bus/pcidata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pcid… Modified: trunk/reactos/hal/halx86/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bussupp.…

12 years

[akhaldi] 57296: [HOST-TOOLS/BIN2C]: Add bin2c host tool, to be used for embedding binary files inside C source code, by transforming them into a byte array. By Hermès Bélusca. CORE-6653 #resolve C...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Sep 14 11:12:40 2012 New Revision: 57296 URL: http://svn.reactos.org/svn/reactos?rev=57296&view=rev Log: [HOST-TOOLS/BIN2C]: Add bin2c host tool, to be used for embedding binary files inside C source code, by transforming them into a byte array. By Hermès Bélusca. CORE-6653 #resolve Committed to trunk. Cheers ;) Added: trunk/reactos/tools/bin2c.c (with props) Modified: trunk/reactos/CMakeLists.txt trunk/reactos/tools/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=57296&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Fri Sep 14 11:12:40 2012 @@ -69,9 +69,9 @@ add_subdirectory(lib) if(NOT MSVC) - export(TARGETS widl gendib cabman cdmake mkhive obj2bin spec2def geninc rsym mkshelllink FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) - else() - export(TARGETS widl gendib cabman cdmake mkhive obj2bin spec2def geninc mkshelllink FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + export(TARGETS bin2c widl gendib cabman cdmake mkhive obj2bin spec2def geninc rsym mkshelllink FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + else() + export(TARGETS bin2c widl gendib cabman cdmake mkhive obj2bin spec2def geninc mkshelllink FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) endif() else() Modified: trunk/reactos/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/CMakeLists.txt?rev=5… ============================================================================== --- trunk/reactos/tools/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/CMakeLists.txt [iso-8859-1] Fri Sep 14 11:12:40 2012 @@ -4,6 +4,8 @@ if(MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif() + +add_executable(bin2c bin2c.c) add_subdirectory(cabman) add_subdirectory(cdmake) Added: trunk/reactos/tools/bin2c.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.c?rev=57296&vi… ============================================================================== --- trunk/reactos/tools/bin2c.c (added) +++ trunk/reactos/tools/bin2c.c [iso-8859-1] Fri Sep 14 11:12:40 2012 @@ -1,0 +1,106 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS bin2c + * FILE: tools/bin2c/bin2c.c + * PURPOSE: Converts a binary file into a byte array + * PROGRAMMER: Hermès Bélusca - Maïto + */ + +#include <stdio.h> + +int main(int argc, char *argv[]) +{ + FILE* inFile; + FILE* outCFile; + FILE* outHFile; + unsigned char ch; + unsigned char cnt; + + /* + * Validate the arguments. + */ + if (argc < 5) + { + printf("Usage: bin2c infile.bin outfile.c outfile.h array_name [array_attribute [header_for_attribute]]\n"); + return -1; + } + + /* + * Open the input and the output files. + */ + inFile = fopen(argv[1], "rb"); + if (!inFile) + { + printf("ERROR: Couldn't open data file '%s'.\n", argv[1]); + return -1; + } + outCFile = fopen(argv[2], "w"); + if (!outCFile) + { + fclose(inFile); + printf("ERROR: Couldn't create output source file '%s'.\n", argv[2]); + return -1; + } + outHFile = fopen(argv[3], "w"); + if (!outHFile) + { + fclose(outCFile); + fclose(inFile); + printf("ERROR: Couldn't create output header file '%s'.\n", argv[3]); + return -1; + } + + /* + * Generate the header file and close it. + */ + fprintf(outHFile, "/* This file is autogenerated, do not edit. */\n\n"); + fprintf(outHFile, "#ifndef CHAR\n" + "#define CHAR char\n" + "#endif\n\n"); + fprintf(outHFile, "extern CHAR %s[];\n", argv[4]); + fclose(outHFile); + + /* + * Generate the source file and close it. + */ + fprintf(outCFile, "/* This file is autogenerated, do not edit. */\n\n"); + if (argc >= 7) + { + /* There is a header to be included for defining the array attribute. */ + fprintf(outCFile, "#include \"%s\"\n", argv[6]); + } + fprintf(outCFile, "#include \"%s\"\n\n", argv[3]); + + /* Generate the array. */ + if (argc >= 6) + { + /* There is an array attribute. */ + fprintf(outCFile, "%s ", argv[5]); + } + fprintf(outCFile, "CHAR %s[] =\n{", argv[4]); + + cnt = 0; + ch = fgetc(inFile); + while (!feof(inFile)) + { + if ((cnt % 16) == 0) + { + fprintf(outCFile, "\n "); + cnt = 0; + } + fprintf(outCFile, " 0x%02x,", (unsigned int)ch); + ++cnt; + ch = fgetc(inFile); + } + /* Put a final NULL terminator. */ + fprintf(outCFile, "\n 0x00"); + fprintf(outCFile, "\n};\n"); + fclose(outCFile); + + /* Close the input file. */ + fclose(inFile); + + return 0; +} + +/* EOF */ Propchange: trunk/reactos/tools/bin2c.c ------------------------------------------------------------------------------ svn:eol-style = native

12 years

[tkreuzer] 57295: [RTL] Implement RtlpSafeCopyMemory, which uses SEH to copy the memory (not in freeldr) Make RtlLargeIntegerToChar use RtlpSafeCopyMemory to copy the string to the target buffer. C...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Sep 14 09:56:23 2012 New Revision: 57295 URL: http://svn.reactos.org/svn/reactos?rev=57295&view=rev Log: [RTL] Implement RtlpSafeCopyMemory, which uses SEH to copy the memory (not in freeldr) Make RtlLargeIntegerToChar use RtlpSafeCopyMemory to copy the string to the target buffer. CORE-3767 #resolve Modified: trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c trunk/reactos/dll/ntdll/rtl/libsupp.c trunk/reactos/lib/rtl/rtlp.h trunk/reactos/lib/rtl/unicode.c trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/rtl/l… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c [iso-8859-1] Fri Sep 14 09:56:23 2012 @@ -44,3 +44,14 @@ { MmHeapFree(Mem); } + +NTSTATUS +NTAPI +RtlpSafeCopyMemory( + _Out_writes_bytes_all_(Length) VOID UNALIGNED *Destination, + _In_reads_bytes_(Length) CONST VOID UNALIGNED *Source, + _In_ SIZE_T Length) +{ + RtlCopyMemory(Destination, Source, Length); + return STATUS_SUCCESS; +} Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Fri Sep 14 09:56:23 2012 @@ -576,4 +576,24 @@ return STATUS_NOT_IMPLEMENTED; } +NTSTATUS +NTAPI +RtlpSafeCopyMemory( + _Out_writes_bytes_all_(Length) VOID UNALIGNED *Destination, + _In_reads_bytes_(Length) CONST VOID UNALIGNED *Source, + _In_ SIZE_T Length) +{ + _SEH2_TRY + { + RtlCopyMemory(Destination, Source, Length); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + return STATUS_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=57295&r… ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] Fri Sep 14 09:56:23 2012 @@ -33,6 +33,13 @@ ROUND_DOWN(((ULONG)(n)) + (align) - 1, (align)) #define RVA(m, b) ((PVOID)((ULONG_PTR)(b) + (ULONG_PTR)(m))) + +NTSTATUS +NTAPI +RtlpSafeCopyMemory( + _Out_writes_bytes_all_(Length) VOID UNALIGNED *Destination, + _In_reads_bytes_(Length) CONST VOID UNALIGNED *Source, + _In_ SIZE_T Length); VOID NTAPI Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=5729… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Fri Sep 14 09:56:23 2012 @@ -1735,7 +1735,6 @@ IN OUT PCHAR String) { ULONGLONG Val = Value->QuadPart; - NTSTATUS Status = STATUS_SUCCESS; CHAR Buffer[65]; CHAR Digit; SIZE_T Len; @@ -1769,36 +1768,12 @@ if (Len > Length) return STATUS_BUFFER_OVERFLOW; -#if 1 /* It needs to be removed, when will probably use SEH in rtl */ - - if (String == NULL) - { - return STATUS_ACCESS_VIOLATION; - } - -#endif - -#if 0 - _SEH2_TRY - { -#endif - - if (Len == Length) - RtlCopyMemory(String, Pos, Len); - else - RtlCopyMemory(String, Pos, Len + 1); - -#if 0 - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Get the error code */ - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; -#endif - - return Status; + /* If possible, add the 0 termination */ + if (Len < Length) + Len += 1; + + /* Copy the string to the target using SEH */ + return RtlpSafeCopyMemory(String, Pos, Len); } /* Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Fri Sep 14 09:56:23 2012 @@ -676,5 +676,25 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +RtlpSafeCopyMemory( + _Out_writes_bytes_all_(Length) VOID UNALIGNED *Destination, + _In_reads_bytes_(Length) CONST VOID UNALIGNED *Source, + _In_ SIZE_T Length) +{ + _SEH2_TRY + { + RtlCopyMemory(Destination, Source, Length); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + return STATUS_SUCCESS; +} + /* EOF */

12 years

[jgardou] 57293: [WIN32SS] * Properly implement GetNearestColor

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Sep 13 21:49:32 2012 New Revision: 57293 URL: http://svn.reactos.org/svn/reactos?rev=57293&view=rev Log: [WIN32SS] * Properly implement GetNearestColor Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/dcutil.c trunk/reactos/win32ss/gdi/ntgdi/palette.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Thu Sep 13 21:49:32 2012 @@ -16,74 +16,6 @@ #define FIXUP_ROP(Rop) if(((Rop) & 0xFF000000) == 0) Rop = MAKEROP4((Rop), (Rop)) #define ROP_TO_ROP4(Rop) ((Rop) >> 16) - -ULONG -TranslateCOLORREF(PDC pdc, COLORREF crColor) -{ - PPALETTE ppalDC, ppalSurface; - ULONG index, ulColor, iBitmapFormat; - EXLATEOBJ exlo; - - switch (crColor >> 24) - { - case 0x00: /* RGB color */ - break; - - case 0x01: /* PALETTEINDEX */ - index = crColor & 0xFFFFFF; - ppalDC = pdc->dclevel.ppal; - if (index >= ppalDC->NumColors) index = 0; - - /* Get the RGB value */ - crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, index); - break; - - case 0x02: /* PALETTERGB */ - - if (pdc->dclevel.hpal != StockObjects[DEFAULT_PALETTE]) - { - /* First find the nearest index in the dc palette */ - ppalDC = pdc->dclevel.ppal; - index = PALETTE_ulGetNearestIndex(ppalDC, crColor & 0xFFFFFF); - - /* Get the RGB value */ - crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, index); - } - else - { - /* Use the pure color */ - crColor = crColor & 0x00FFFFFF; - } - break; - - case 0x10: /* DIBINDEX */ - /* Mask the value to match the target bpp */ - iBitmapFormat = pdc->dclevel.pSurface->SurfObj.iBitmapFormat; - if (iBitmapFormat == BMF_1BPP) index = crColor & 0x1; - else if (iBitmapFormat == BMF_4BPP) index = crColor & 0xf; - else if (iBitmapFormat == BMF_8BPP) index = crColor & 0xFF; - else if (iBitmapFormat == BMF_16BPP) index = crColor & 0xFFFF; - else index = crColor & 0xFFFFFF; - return index; - - default: - DPRINT("Unsupported color type %u passed\n", crColor >> 24); - crColor &= 0xFFFFFF; - } - - /* Initialize an XLATEOBJ from RGB to the target surface */ - ppalSurface = pdc->dclevel.pSurface->ppal; - EXLATEOBJ_vInitialize(&exlo, &gpalRGB, ppalSurface, 0xFFFFFF, 0, 0); - - /* Translate the color to the target format */ - ulColor = XLATEOBJ_iXlate(&exlo.xlo, crColor); - - /* Cleanup the XLATEOBJ */ - EXLATEOBJ_vCleanup(&exlo); - - return ulColor; -} - BOOL APIENTRY NtGdiAlphaBlend( Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Thu Sep 13 21:49:32 2012 @@ -162,6 +162,18 @@ HPALETTE hpal, BOOL ForceBackground); +/* dcutil.c */ + +COLORREF +FASTCALL +IntGdiSetBkColor (HDC hDC, COLORREF Color); +INT FASTCALL IntGdiSetBkMode(HDC hDC, INT backgroundMode); +COLORREF FASTCALL IntGdiSetTextColor(HDC hDC, COLORREF color); +UINT FASTCALL IntGdiSetTextAlign(HDC hDC, UINT Mode); +VOID FASTCALL DCU_SetDcUndeletable(HDC); +BOOL FASTCALL IntSetDefaultRegion(PDC); +ULONG TranslateCOLORREF(PDC pdc, COLORREF crColor); + INIT_FUNCTION NTSTATUS NTAPI InitDcImpl(VOID); @@ -179,20 +191,15 @@ VOID NTAPI DC_vRestoreDC(IN PDC pdc, INT iSaveLevel); -VOID FASTCALL DCU_SetDcUndeletable(HDC); VOID NTAPI DC_vFreeDcAttr(PDC pdc); VOID NTAPI DC_vInitDc(PDC pdc, DCTYPE dctype, PPDEVOBJ ppdev); -COLORREF FASTCALL IntGdiSetBkColor (HDC hDC, COLORREF Color); -INT FASTCALL IntGdiSetBkMode(HDC hDC, INT backgroundMode); -COLORREF FASTCALL IntGdiSetTextColor(HDC hDC, COLORREF color); -UINT FASTCALL IntGdiSetTextAlign(HDC hDC, UINT Mode); VOID FASTCALL IntGdiReferencePdev(PPDEVOBJ pPDev); VOID FASTCALL IntGdiUnreferencePdev(PPDEVOBJ pPDev, DWORD CleanUpType); HDC FASTCALL IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC); BOOL FASTCALL IntGdiCleanDC(HDC hDC); VOID FASTCALL IntvGetDeviceCaps(PPDEVOBJ, PDEVCAPS); -BOOL FASTCALL IntSetDefaultRegion(PDC); + BOOL NTAPI GreSetDCOwner(HDC hdc, ULONG ulOwner); VOID Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcutil.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] Thu Sep 13 21:49:32 2012 @@ -551,3 +551,73 @@ DC_UnlockDc(pdc); return ret; } + +/* Translates a COLORREF to the right color in the specified DC color space */ +ULONG +TranslateCOLORREF(PDC pdc, COLORREF crColor) +{ + PPALETTE ppalDC, ppalSurface; + ULONG index, ulColor, iBitmapFormat; + EXLATEOBJ exlo; + + switch (crColor >> 24) + { + case 0x00: /* RGB color */ + break; + + case 0x01: /* PALETTEINDEX */ + index = crColor & 0xFFFFFF; + ppalDC = pdc->dclevel.ppal; + if (index >= ppalDC->NumColors) index = 0; + + /* Get the RGB value */ + crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, index); + break; + + case 0x02: /* PALETTERGB */ + + if (pdc->dclevel.hpal != StockObjects[DEFAULT_PALETTE]) + { + /* First find the nearest index in the dc palette */ + ppalDC = pdc->dclevel.ppal; + index = PALETTE_ulGetNearestIndex(ppalDC, crColor & 0xFFFFFF); + + /* Get the RGB value */ + crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, index); + } + else + { + /* Use the pure color */ + crColor = crColor & 0x00FFFFFF; + } + break; + + case 0x10: /* DIBINDEX */ + /* Mask the value to match the target bpp */ + iBitmapFormat = pdc->dclevel.pSurface->SurfObj.iBitmapFormat; + if (iBitmapFormat == BMF_1BPP) index = crColor & 0x1; + else if (iBitmapFormat == BMF_4BPP) index = crColor & 0xf; + else if (iBitmapFormat == BMF_8BPP) index = crColor & 0xFF; + else if (iBitmapFormat == BMF_16BPP) index = crColor & 0xFFFF; + else index = crColor & 0xFFFFFF; + return index; + + default: + DPRINT("Unsupported color type %u passed\n", crColor >> 24); + crColor &= 0xFFFFFF; + } + + /* Initialize an XLATEOBJ from RGB to the target surface */ + ppalSurface = pdc->dclevel.pSurface->ppal; + EXLATEOBJ_vInitialize(&exlo, &gpalRGB, ppalSurface, 0xFFFFFF, 0, 0); + + /* Translate the color to the target format */ + ulColor = XLATEOBJ_iXlate(&exlo.xlo, crColor); + + /* Cleanup the XLATEOBJ */ + EXLATEOBJ_vCleanup(&exlo); + + return ulColor; +} + + Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Thu Sep 13 21:49:32 2012 @@ -684,47 +684,47 @@ return FALSE; } -COLORREF APIENTRY NtGdiGetNearestColor(HDC hDC, COLORREF Color) -{ - COLORREF nearest = CLR_INVALID; - PDC dc; - PPALETTE palGDI; - LONG RBits, GBits, BBits; - - dc = DC_LockDc(hDC); - if (NULL != dc) - { - HPALETTE hpal = dc->dclevel.hpal; - palGDI = PALETTE_ShareLockPalette(hpal); - if (!palGDI) - { - DC_UnlockDc(dc); - return nearest; - } - - if (palGDI->flFlags & PAL_INDEXED) - { - ULONG index; - index = PALETTE_ulGetNearestPaletteIndex(palGDI, Color); - nearest = PALETTE_ulGetRGBColorFromIndex(palGDI, index); - } - else if (palGDI->flFlags & PAL_RGB || palGDI->flFlags & PAL_BGR) - { - nearest = Color; - } - else if (palGDI->flFlags & PAL_BITFIELDS) - { - RBits = 8 - GetNumberOfBits(palGDI->RedMask); - GBits = 8 - GetNumberOfBits(palGDI->GreenMask); - BBits = 8 - GetNumberOfBits(palGDI->BlueMask); - nearest = RGB( - (GetRValue(Color) >> RBits) << RBits, - (GetGValue(Color) >> GBits) << GBits, - (GetBValue(Color) >> BBits) << BBits); - } - PALETTE_ShareUnlockPalette(palGDI); - DC_UnlockDc(dc); - } +COLORREF +APIENTRY +NtGdiGetNearestColor( + _In_ HDC hDC, + _In_ COLORREF Color) +{ + COLORREF nearest = CLR_INVALID; + PDC dc; + EXLATEOBJ exlo; + PPALETTE ppal; + + dc = DC_LockDc(hDC); + + if(dc == NULL) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return CLR_INVALID; + } + + if(dc->dclevel.pSurface == NULL) + ppal = gppalMono; + else + ppal = dc->dclevel.pSurface->ppal; + + /* Translate the color to the DC format */ + Color = TranslateCOLORREF(dc, Color); + + /* XLATE it back to RGB color space */ + EXLATEOBJ_vInitialize(&exlo, + ppal, + &gpalRGB, + 0, + RGB(0xff, 0xff, 0xff), + RGB(0, 0, 0)); + + nearest = XLATEOBJ_iXlate(&exlo.xlo, Color); + + EXLATEOBJ_vCleanup(&exlo); + + /* We're done */ + DC_UnlockDc(dc); return nearest; }

12 years

[akhaldi] 57292: * Reapply r57265 now that the testbot issues are solved. [UNIATA]: Sync to 0.43f5. [ATACTL]: Sync to 0.43f5. CORE-6563 #comment Committed the 0.43f5 sync.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 13 21:07:44 2012 New Revision: 57292 URL: http://svn.reactos.org/svn/reactos?rev=57292&view=rev Log: * Reapply r57265 now that the testbot issues are solved. [UNIATA]: Sync to 0.43f5. [ATACTL]: Sync to 0.43f5. CORE-6563 #comment Committed the 0.43f5 sync. Modified: trunk/reactos/base/applications/atactl/atactl.cpp trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bm_devs.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.h trunk/reactos/drivers/storage/ide/uniata/inc/misc.h trunk/reactos/drivers/storage/ide/uniata/scsi.h trunk/reactos/drivers/storage/ide/uniata/todo.txt trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/atactl/atactl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/atactl/a… Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/inc/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/scsi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…

12 years

[jimtabor] 57291: [User32] - Aric Stewart : While calculating lines, discard uniscribe data for non-visible lines. - Nikolay Sivov : Release uniscribe data on Edit control destruction (valgrind). -...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Sep 13 20:44:04 2012 New Revision: 57291 URL: http://svn.reactos.org/svn/reactos?rev=57291&view=rev Log: [User32] - Aric Stewart : While calculating lines, discard uniscribe data for non-visible lines. - Nikolay Sivov : Release uniscribe data on Edit control destruction (valgrind). - Sync Port wine. - Someone needs to post a wine bug report due to the lack of support for Ctrl+Backspace. Debug fixme was added. See bug 1419. Modified: trunk/reactos/win32ss/user/user32/controls/edit.c Modified: trunk/reactos/win32ss/user/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] Thu Sep 13 20:44:04 2012 @@ -411,6 +411,12 @@ return line_def->ssa; } +static inline INT get_vertical_line_count(EDITSTATE *es) +{ + INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + return max(1,vlc); +} + static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData(EDITSTATE *es, HDC dc, INT line) { LINEDEF *line_def; @@ -473,6 +479,7 @@ INT line_count = es->line_count; INT orig_net_length; RECT rc; + INT vlc; if (istart == iend && delta == 0) return; @@ -513,6 +520,7 @@ fw = es->format_rect.right - es->format_rect.left; current_position = es->text + current_line->index; + vlc = get_vertical_line_count(es); do { if (current_line != start_line) { @@ -696,6 +704,11 @@ es->text_width = max(es->text_width, current_line->width); current_position += current_line->length; previous_line = current_line; + + /* Discard data for non-visible lines. It will be calculated as needed */ + if ((line_index < es->y_offset) || (line_index > es->y_offset + vlc)) + EDIT_InvalidateUniscribeData_linedef(current_line); + current_line = current_line->next; line_index++; } while (previous_line->ending != END_0); @@ -1442,13 +1455,6 @@ EDIT_GetLineRect(es, 0, start, end, &line_rect); if (IntersectRect(&rc, &line_rect, &es->format_rect)) EDIT_UpdateText(es, &rc, TRUE); -} - - -static inline INT get_vertical_line_count(EDITSTATE *es) -{ - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; - return max(1,vlc); } /********************************************************************* @@ -3544,6 +3550,12 @@ if ((es->style & ES_MULTILINE) && EDIT_IsInsideDialog(es)) SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0); break; + case VK_BACK: + if (control) + { + FIXME("Ctrl+Backspace\n"); // See bug 1419. + } + break; } return TRUE; } @@ -4618,6 +4630,7 @@ pc = pp; } + EDIT_InvalidateUniscribeData(es); SetWindowLongPtrW( es->hwndSelf, 0, 0 ); HeapFree(GetProcessHeap(), 0, es->undo_text); HeapFree(GetProcessHeap(), 0, es);

12 years

[jimtabor] 57290: [Win32SS] - Based on wine Alexandre Julliard: ScrollWindow should not use a cached DC, unlike ScrollWindowEx.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Sep 13 01:22:33 2012 New Revision: 57290 URL: http://svn.reactos.org/svn/reactos?rev=57290&view=rev Log: [Win32SS] - Based on wine Alexandre Julliard: ScrollWindow should not use a cached DC, unlike ScrollWindowEx. Modified: trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/user32/windows/window.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Thu Sep 13 01:22:33 2012 @@ -1613,6 +1613,7 @@ HDC hDC; HRGN hrgnOwn = NULL, hrgnTemp; HWND hwndCaret; + DWORD dcxflags = 0; NTSTATUS Status = STATUS_SUCCESS; DECLARE_RETURN(DWORD); USER_REFERENCE_ENTRY Ref, CaretRef; @@ -1669,7 +1670,25 @@ else hrgnOwn = IntSysCreateRectRgn(0, 0, 0, 0); - hDC = UserGetDCEx(Window, 0, DCX_CACHE | DCX_USESTYLE); + /* ScrollWindow uses the window DC, ScrollWindowEx doesn't */ + if (flags & SW_SCROLLWNDDCE) + { + dcxflags = DCX_USESTYLE; + + if (!(Window->pcls->style & (CS_OWNDC|CS_CLASSDC))) + dcxflags |= DCX_CACHE; // AH??? wine~ If not Powned or with Class go Cheap! + + if (flags & SW_SCROLLCHILDREN && Window->style & WS_CLIPCHILDREN) + dcxflags |= DCX_CACHE|DCX_NOCLIPCHILDREN; + } + else + { + /* So in this case ScrollWindowEx uses Cache DC. */ + dcxflags = DCX_CACHE|DCX_USESTYLE; + if (flags & SW_SCROLLCHILDREN) dcxflags |= DCX_NOCLIPCHILDREN; + } + + hDC = UserGetDCEx(Window, 0, dcxflags); if (!hDC) { /* FIXME: SetLastError? */ Modified: trunk/reactos/win32ss/user/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] Thu Sep 13 01:22:33 2012 @@ -1900,9 +1900,10 @@ prcClip, 0, NULL, - (lpRect ? 0 : SW_SCROLLCHILDREN) | SW_INVALIDATE) != ERROR; -} - + (lpRect ? 0 : SW_SCROLLCHILDREN) | (SW_ERASE|SW_INVALIDATE|SW_SCROLLWNDDCE)) != ERROR; +} + +/* ScrollWindow uses the window DC, ScrollWindowEx doesn't */ /* * @implemented @@ -1917,6 +1918,11 @@ LPRECT prcUpdate, UINT flags) { + if (flags & SW_SMOOTHSCROLL) + { + FIXME("SW_SMOOTHSCROLL not supported."); + // Fall through.... + } return NtUserScrollWindowEx(hWnd, dx, dy,

12 years

[cgutman] 57289: [NDIS] - NdisReadConfiguration should return NdisParameterInteger for requests for NdisParameterHexInteger - Assert that conversion to integer from string does not fail - Always tr...

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Sep 13 01:04:21 2012 New Revision: 57289 URL: http://svn.reactos.org/svn/reactos?rev=57289&view=rev Log: [NDIS] - NdisReadConfiguration should return NdisParameterInteger for requests for NdisParameterHexInteger - Assert that conversion to integer from string does not fail - Always trigger the ISR function if MiniportInitialize or MiniportHalt is executing CORE-6064 #comment Please try to replicate with DEBUG_ULTRA turned on in NDIS Modified: trunk/reactos/drivers/network/ndis/ndis/config.c trunk/reactos/drivers/network/ndis/ndis/io.c trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Thu Sep 13 01:04:21 2012 @@ -658,13 +658,15 @@ str.Length = str.MaximumLength = (USHORT)KeyInformation->DataLength; str.Buffer = (PWCHAR)KeyInformation->Data; - if (Base != 0 && IsValidNumericString(&str, Base) && - ((*Status = RtlUnicodeStringToInteger(&str, Base, - &(*ParameterValue)->ParameterData.IntegerData)) == STATUS_SUCCESS)) + if (Base != 0 && IsValidNumericString(&str, Base)) { + *Status = RtlUnicodeStringToInteger(&str, Base, &(*ParameterValue)->ParameterData.IntegerData); + ASSERT(*Status == STATUS_SUCCESS); + NDIS_DbgPrint(MAX_TRACE, ("NdisParameter(Hex)Integer\n")); - (*ParameterValue)->ParameterType = ParameterType; + /* MSDN documents that this is returned for all integers, regardless of the ParameterType passed in */ + (*ParameterValue)->ParameterType = NdisParameterInteger; } else { @@ -697,8 +699,9 @@ ExFreePool(KeyInformation); return; } - - if ((*ParameterValue)->ParameterType != ParameterType) + + if (((*ParameterValue)->ParameterType != ParameterType) && + !((ParameterType == NdisParameterHexInteger) && ((*ParameterValue)->ParameterType == NdisParameterInteger))) { NDIS_DbgPrint(MIN_TRACE, ("Parameter type mismatch! (Requested: %d | Received: %d)\n", ParameterType, (*ParameterValue)->ParameterType)); Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Thu Sep 13 01:04:21 2012 @@ -65,7 +65,8 @@ NDIS_DbgPrint(MAX_TRACE, ("Called. Interrupt (0x%X)\n", NdisInterrupt)); - if (NdisInterrupt->IsrRequested) { + /* FIXME: This probably isn't the right check for MiniportInitialize, but we need to see what Windows uses here */ + if ((NdisMiniportBlock->PnPDeviceState != NdisPnPDeviceStarted) || (NdisInterrupt->IsrRequested)) { NDIS_DbgPrint(MAX_TRACE, ("Calling MiniportISR\n")); (*NdisMiniportBlock->DriverHandle->MiniportCharacteristics.ISRHandler)( &InterruptRecognized, Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Thu Sep 13 01:04:21 2012 @@ -2161,6 +2161,10 @@ KeCancelTimer(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Timer); + /* Set this here so MiniportISR will be forced to run for interrupts generated in MiniportHalt */ + Adapter->NdisMiniportBlock.OldPnPDeviceState = Adapter->NdisMiniportBlock.PnPDeviceState; + Adapter->NdisMiniportBlock.PnPDeviceState = NdisPnPDeviceStopped; + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.HaltHandler)(Adapter); IoSetDeviceInterfaceState(&Adapter->NdisMiniportBlock.SymbolicLinkName, FALSE); @@ -2187,9 +2191,6 @@ EthDeleteFilter(Adapter->NdisMiniportBlock.EthDB); Adapter->NdisMiniportBlock.EthDB = NULL; } - - Adapter->NdisMiniportBlock.OldPnPDeviceState = Adapter->NdisMiniportBlock.PnPDeviceState; - Adapter->NdisMiniportBlock.PnPDeviceState = NdisPnPDeviceStopped; return STATUS_SUCCESS; }

12 years

[mnordell] 57288: Add comment explaining initialization.

by mnordell＠svn.reactos.org

Author: mnordell Date: Thu Sep 13 00:52:12 2012 New Revision: 57288 URL: http://svn.reactos.org/svn/reactos?rev=57288&view=rev Log: Add comment explaining initialization. Modified: trunk/reactos/subsystems/csr/csrsrv/process.c Modified: trunk/reactos/subsystems/csr/csrsrv/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/proc… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/csrsrv/process.c [iso-8859-1] Thu Sep 13 00:52:12 2012 @@ -1211,7 +1211,7 @@ BOOLEAN FirstTry; ULONG i; PCSR_SERVER_DLL ServerDll; - ULONG Result = 0; + ULONG Result = 0; /* Intentionally invalid enumeratee to silence compiler warning */ /* Acquire process lock */ CsrAcquireProcessLock();

12 years

[tkreuzer] 57287: [FREELDR] Fix an x64 compilation warning Patch by Hermes Belusca CORE-6641

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Sep 12 21:20:48 2012 New Revision: 57287 URL: http://svn.reactos.org/svn/reactos?rev=57287&view=rev Log: [FREELDR] Fix an x64 compilation warning Patch by Hermes Belusca CORE-6641 Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] Wed Sep 12 21:20:48 2012 @@ -150,7 +150,7 @@ TotalSectors -= ReadSectors; } - *Count = Ptr - (UCHAR *)Buffer; + *Count = (ULONG)(Ptr - (UCHAR*)Buffer); return (!ret) ? EIO : ESUCCESS; }

12 years

← Newer
1
...
13
14
15
16
17
18
19
...
24
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 September 2012