Ros-diffs December 2015

ros-diffs@reactos.org

12 participants
252 discussions

[hbelusca] 70467: [USETUP] Factorize the code that creates ReactOS freeldr.ini entries, and use it to create a freeldr.ini at a clean ReactOS installation, and when it is installed in the same part...
by hbelusca＠svn.reactos.org 30 Dec '15

30 Dec '15

Author: hbelusca Date: Wed Dec 30 18:26:42 2015 New Revision: 70467 URL: http://svn.reactos.org/svn/reactos?rev=70467&view=rev Log: [USETUP] Factorize the code that creates ReactOS freeldr.ini entries, and use it to create a freeldr.ini at a clean ReactOS installation, and when it is installed in the same partition as Win9x/DOS. CORE-4870 #comment Should be fixed with revision 70467, please retest. Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/inicache.c trunk/reactos/base/setup/usetup/inicache.h Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Wed Dec 30 18:26:42 2015 @@ -93,8 +93,7 @@ PINICACHESECTION IniSection; /* Create "FREELOADER" section */ - IniSection = IniCacheAppendSection(IniCache, - L"FREELOADER"); + IniSection = IniCacheAppendSection(IniCache, L"FREELOADER"); #if DBG if (IsUnattendedSetup) @@ -287,123 +286,6 @@ L"TimeText", L"Seconds until highlighted choice will be started automatically: "); } - - -NTSTATUS -CreateFreeLoaderIniForDos( - PWCHAR IniPath, - PWCHAR ArcPath) -{ - PINICACHE IniCache; - PINICACHESECTION IniSection; - - IniCache = IniCacheCreate(); - - CreateCommonFreeLoaderSections(IniCache); - - /* Create "Operating Systems" section */ - IniSection = IniCacheAppendSection(IniCache, L"Operating Systems"); - - /* REACTOS=ReactOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"ReactOS", - L"\"ReactOS\""); - - /* ReactOS_Debug="ReactOS (Debug)" */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"ReactOS_Debug", - L"\"ReactOS (Debug)\""); - - /* DOS=Dos/Windows */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"DOS", - L"\"DOS/Windows\""); - - /* Create "ReactOS" section */ - IniSection = IniCacheAppendSection(IniCache, L"ReactOS"); - - /* BootType=ReactOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootType", - L"ReactOS"); - - /* SystemPath=<ArcPath> */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"SystemPath", - ArcPath); - - /* Create "ReactOS_Debug" section */ - IniSection = IniCacheAppendSection(IniCache, L"ReactOS_Debug"); - - /* BootType=ReactOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootType", - L"ReactOS"); - - /* SystemPath=<ArcPath> */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"SystemPath", - ArcPath); - - /* Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"Options", - L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); - - /* Create "DOS" section */ - IniSection = IniCacheAppendSection(IniCache, - L"DOS"); - - /* BootType=BootSector */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootType", - L"BootSector"); - - /* BootDrive=hd0 */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootDrive", - L"hd0"); - - /* BootPartition=1 */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootPartition", - L"1"); - - /* BootSector=BOOTSECT.DOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootSectorFile", - L"BOOTSECT.DOS"); - - IniCacheSave(IniCache, IniPath); - IniCacheDestroy(IniCache); - - return STATUS_SUCCESS; -} - NTSTATUS CreateFreeLoaderEntry( @@ -451,17 +333,13 @@ return STATUS_SUCCESS; } -NTSTATUS -CreateFreeLoaderIniForReactOS( - PWCHAR IniPath, +static +VOID +CreateFreeLoaderReactOSEntries( + PINICACHE IniCache, PWCHAR ArcPath) { - PINICACHE IniCache; PINICACHESECTION IniSection; - - IniCache = IniCacheCreate(); - - CreateCommonFreeLoaderSections(IniCache); /* Create "Operating Systems" section */ IniSection = IniCacheAppendSection(IniCache, L"Operating Systems"); @@ -517,8 +395,90 @@ L"Windows2003", ArcPath, L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /redirect=com2 /redirectbaudrate=115200"); #endif - - /* Save the ini file */ +} + +NTSTATUS +CreateFreeLoaderIniForReactOS( + PWCHAR IniPath, + PWCHAR ArcPath) +{ + PINICACHE IniCache; + + /* Initialize the INI file */ + IniCache = IniCacheCreate(); + + /* Create the common FreeLdr sections */ + CreateCommonFreeLoaderSections(IniCache); + + /* Add the ReactOS entries */ + CreateFreeLoaderReactOSEntries(IniCache, ArcPath); + + /* Save the INI file */ + IniCacheSave(IniCache, IniPath); + IniCacheDestroy(IniCache); + + return STATUS_SUCCESS; +} + +NTSTATUS +CreateFreeLoaderIniForDos( + PWCHAR IniPath, + PWCHAR ArcPath) +{ + PINICACHE IniCache; + PINICACHESECTION IniSection; + + /* Initialize the INI file */ + IniCache = IniCacheCreate(); + + /* Create the common FreeLdr sections */ + CreateCommonFreeLoaderSections(IniCache); + + /* Add the ReactOS entries */ + CreateFreeLoaderReactOSEntries(IniCache, ArcPath); + + /* Get "Operating Systems" section */ + IniSection = IniCacheGetSection(IniCache, L"Operating Systems"); + + /* DOS=DOS/Windows */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"DOS", + L"\"DOS/Windows\""); + + /* Create the "DOS" section */ + IniSection = IniCacheAppendSection(IniCache, L"DOS"); + + /* BootType=BootSector */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"BootType", + L"BootSector"); + + /* BootDrive=hd0 */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"BootDrive", + L"hd0"); + + /* BootPartition=1 */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"BootPartition", + L"1"); + + /* BootSector=BOOTSECT.DOS */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"BootSectorFile", + L"BOOTSECT.DOS"); + + /* Save the INI file */ IniCacheSave(IniCache, IniPath); IniCacheDestroy(IniCache); @@ -531,7 +491,6 @@ PWCHAR IniPath, PWCHAR ArcPath) { - UNICODE_STRING Name; PINICACHE IniCache; PINICACHESECTION IniSection; PINICACHESECTION OsIniSection; @@ -543,9 +502,7 @@ ULONG i,j; NTSTATUS Status; - RtlInitUnicodeString(&Name, IniPath); - - Status = IniCacheLoad(&IniCache, &Name, FALSE); + Status = IniCacheLoad(&IniCache, IniPath, FALSE); if (!NT_SUCCESS(Status)) return Status; @@ -1944,16 +1901,13 @@ PWSTR EntryName, PWSTR EntryValue) { - UNICODE_STRING Name; PINICACHE Cache = NULL; PINICACHESECTION Section = NULL; NTSTATUS Status; ULONG FileAttribute; PWCHAR OldValue = NULL; - RtlInitUnicodeString(&Name, BootIniPath); - - Status = IniCacheLoad(&Cache, &Name, FALSE); + Status = IniCacheLoad(&Cache, BootIniPath, FALSE); if (!NT_SUCCESS(Status)) { return Status; Modified: trunk/reactos/base/setup/usetup/inicache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inicache… ============================================================================== --- trunk/reactos/base/setup/usetup/inicache.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/inicache.c [iso-8859-1] Wed Dec 30 18:26:42 2015 @@ -514,9 +514,10 @@ NTSTATUS IniCacheLoad( PINICACHE *Cache, - PUNICODE_STRING FileName, + PWCHAR FileName, BOOLEAN String) { + UNICODE_STRING Name; OBJECT_ATTRIBUTES ObjectAttributes; FILE_STANDARD_INFORMATION FileInfo; IO_STATUS_BLOCK IoStatusBlock; @@ -542,8 +543,10 @@ *Cache = NULL; /* Open ini file */ + RtlInitUnicodeString(&Name, FileName); + InitializeObjectAttributes(&ObjectAttributes, - FileName, + &Name, 0, NULL, NULL); @@ -1066,8 +1069,7 @@ } /* Create ini file */ - RtlInitUnicodeString(&Name, - FileName); + RtlInitUnicodeString(&Name, FileName); InitializeObjectAttributes(&ObjectAttributes, &Name, Modified: trunk/reactos/base/setup/usetup/inicache.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inicache… ============================================================================== --- trunk/reactos/base/setup/usetup/inicache.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/inicache.h [iso-8859-1] Wed Dec 30 18:26:42 2015 @@ -76,7 +76,7 @@ NTSTATUS IniCacheLoad( PINICACHE *Cache, - PUNICODE_STRING FileName, + PWCHAR FileName, BOOLEAN String); VOID

1 0

[akhaldi] 70466: [0.4.0] * Somehow this wasn't committed in the previous revision.
by akhaldi＠svn.reactos.org 29 Dec '15

29 Dec '15

Author: akhaldi Date: Tue Dec 29 20:59:03 2015 New Revision: 70466 URL: http://svn.reactos.org/svn/reactos?rev=70466&view=rev Log: [0.4.0] * Somehow this wasn't committed in the previous revision. Modified: branches/ros-branch-0_4_0/ (props changed) Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 29 20:59:03 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464

1 0

[akhaldi] 70465: [0.4.0] * Merge the gdi32 and win32k fixes by Timo in r70464. CORE-10583
by akhaldi＠svn.reactos.org 29 Dec '15

29 Dec '15

Author: akhaldi Date: Tue Dec 29 20:49:33 2015 New Revision: 70465 URL: http://svn.reactos.org/svn/reactos?rev=70465&view=rev Log: [0.4.0] * Merge the gdi32 and win32k fixes by Timo in r70464. CORE-10583 Modified: branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/win32ss/gdi/gdi32/objects/bitmap.c branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/dibobj.c Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 29 20:49:33 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464 Modified: branches/ros-branch-0_4_0/reactos/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] Tue Dec 29 20:49:33 2015 @@ -408,23 +408,30 @@ // PDC_ATTR pDc_Attr; UINT InfoSize = 0; UINT cjBmpScanSize = 0; - HBITMAP hBmp; + HBITMAP hBmp = NULL; NTSTATUS Status = STATUS_SUCCESS; + PBITMAPINFO pbmiConverted; + UINT cjInfoSize; + + /* Convert the BITMAPINFO if it is a COREINFO */ + pbmiConverted = ConvertBitmapInfo(Data, ColorUse, &cjInfoSize, FALSE); /* Check for CBM_CREATDIB */ if (Init & CBM_CREATDIB) { /* CBM_CREATDIB needs Data. */ - if (!Data) - { - return 0; + if (pbmiConverted == NULL) + { + DPRINT1("CBM_CREATDIB needs a BITMAINFO!\n"); + goto Exit; } /* It only works with PAL or RGB */ if (ColorUse > DIB_PAL_COLORS) { + DPRINT1("Invalid ColorUse: %lu\n", ColorUse); GdiSetLastError(ERROR_INVALID_PARAMETER); - return 0; + goto Exit; } /* Use the header from the data */ @@ -434,38 +441,48 @@ /* Header is required */ if (!Header) { + DPRINT1("Header is NULL\n"); GdiSetLastError(ERROR_INVALID_PARAMETER); - return 0; + goto Exit; } /* Get the bitmap format and dimensions */ if (DIB_GetBitmapInfo(Header, &width, &height, &planes, &bpp, &compr, &dibsize) == -1) { + DPRINT1("DIB_GetBitmapInfo failed!\n"); GdiSetLastError(ERROR_INVALID_PARAMETER); - return NULL; + goto Exit; } /* Check if the Compr is incompatible */ if ((compr == BI_JPEG) || (compr == BI_PNG) || (compr == BI_BITFIELDS)) - return 0; + { + DPRINT1("invalid compr: %lu!\n", compr); + goto Exit; + } /* Only DIB_RGB_COLORS (0), DIB_PAL_COLORS (1) and 2 are valid. */ if (ColorUse > DIB_PAL_COLORS + 1) { + DPRINT1("invalid compr: %lu!\n", compr); GdiSetLastError(ERROR_INVALID_PARAMETER); - return 0; + goto Exit; } /* If some Bits are given, only DIB_PAL_COLORS and DIB_RGB_COLORS are valid */ if (Bits && (ColorUse > DIB_PAL_COLORS)) { + DPRINT1("Invalid ColorUse: %lu\n", ColorUse); GdiSetLastError(ERROR_INVALID_PARAMETER); - return 0; + goto Exit; } /* Negative width is not allowed */ if (width < 0) - return 0; + { + DPRINT1("Negative width: %li\n", width); + goto Exit; + } /* Top-down DIBs have a negative height. */ height = abs(height); @@ -473,13 +490,13 @@ // For Icm support. // GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) - if (Data) + if (pbmiConverted) { _SEH2_TRY { - cjBmpScanSize = GdiGetBitmapBitsSize((BITMAPINFO *) Data); - CalculateColorTableSize(&Data->bmiHeader, &ColorUse, &InfoSize); - InfoSize += Data->bmiHeader.biSize; + cjBmpScanSize = GdiGetBitmapBitsSize(pbmiConverted); + CalculateColorTableSize(&pbmiConverted->bmiHeader, &ColorUse, &InfoSize); + InfoSize += pbmiConverted->bmiHeader.biSize; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -490,8 +507,9 @@ if (!NT_SUCCESS(Status)) { + DPRINT1("Got an exception!\n"); GdiSetLastError(ERROR_INVALID_PARAMETER); - return NULL; + goto Exit; } DPRINT("pBMI %p, Size bpp %u, dibsize %d, Conv %u, BSS %u\n", Data, bpp, dibsize, InfoSize, @@ -501,9 +519,18 @@ hBmp = GetStockObject(DEFAULT_BITMAP); else { - hBmp = NtGdiCreateDIBitmapInternal(hDC, width, height, Init, (LPBYTE) Bits, - (LPBITMAPINFO) Data, ColorUse, InfoSize, cjBmpScanSize, 0, 0); - } + hBmp = NtGdiCreateDIBitmapInternal(hDC, width, height, Init, (LPBYTE)Bits, + (LPBITMAPINFO)pbmiConverted, ColorUse, InfoSize, cjBmpScanSize, 0, 0); + } + +Exit: + + /* Cleanup converted BITMAPINFO */ + if ((pbmiConverted != NULL) && (pbmiConverted != Data)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, pbmiConverted); + } + return hBmp; } Modified: branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Tue Dec 29 20:49:33 2015 @@ -248,6 +248,7 @@ UINT StartScan, UINT ScanLines, CONST VOID *Bits, + ULONG cjMaxBits, CONST BITMAPINFO *bmi, UINT ColorUse) { @@ -258,8 +259,39 @@ POINTL ptSrc; EXLATEOBJ exlo; PPALETTE ppalDIB = 0; + ULONG cjSizeImage; if (!bmi) return 0; + + /* Check if the header provided an image size */ + if (bmi->bmiHeader.biSizeImage != 0) + { + /* Use the given size */ + cjSizeImage = bmi->bmiHeader.biSizeImage; + } + /* Otherwise check for uncompressed formats */ + else if ((bmi->bmiHeader.biCompression == BI_RGB) || + (bmi->bmiHeader.biCompression == BI_BITFIELDS)) + { + /* Calculate the image size */ + cjSizeImage = DIB_GetDIBImageBytes(bmi->bmiHeader.biWidth, + ScanLines, + bmi->bmiHeader.biBitCount); + } + else + { + /* Compressed format without a size. This is invalid. */ + DPRINT1("Compressed format without a size!"); + return 0; + } + + /* Check if the size that we have is ok */ + if (cjSizeImage > cjMaxBits) + { + DPRINT1("Size too large! cjSizeImage = %lu, cjMaxBits = %lu\n", + cjSizeImage, cjMaxBits); + return 0; + } SourceBitmap = GreCreateBitmapEx(bmi->bmiHeader.biWidth, ScanLines, @@ -267,7 +299,7 @@ BitmapFormat(bmi->bmiHeader.biBitCount, bmi->bmiHeader.biCompression), bmi->bmiHeader.biHeight < 0 ? BMF_TOPDOWN : 0, - bmi->bmiHeader.biSizeImage, + cjSizeImage, (PVOID)Bits, 0); if (!SourceBitmap) @@ -308,6 +340,8 @@ rcDst.right = psurfDst->SurfObj.sizlBitmap.cx; ptSrc.x = 0; ptSrc.y = 0; + + NT_ASSERT(psurfSrc->SurfObj.cjBits <= cjMaxBits); result = IntEngCopyBits(&psurfDst->SurfObj, &psurfSrc->SurfObj, @@ -1316,6 +1350,7 @@ ULONG compression, DWORD init, LPBYTE bits, + ULONG cjMaxBits, PBITMAPINFO data, DWORD coloruse) { @@ -1359,7 +1394,11 @@ /* Undocumented flag which creates a DDB of the format specified by the bitmap info. */ handle = IntCreateCompatibleBitmap(Dc, width, height, planes, bpp); if (!handle) + { + DPRINT1("IntCreateCompatibleBitmap() failed!\n"); return NULL; + } + /* The palette must also match the given data */ Surface = SURFACE_ShareLockSurface(handle); ASSERT(Surface); @@ -1390,7 +1429,7 @@ if ((NULL != handle) && (CBM_INIT & init)) { - IntSetDIBits(Dc, handle, 0, height, bits, data, coloruse); + IntSetDIBits(Dc, handle, 0, height, bits, cjMaxBits, data, coloruse); } return handle; @@ -1423,6 +1462,7 @@ safeBits = ExAllocatePoolWithTag(PagedPool, cjMaxBits, TAG_DIB); if(!safeBits) { + DPRINT1("Failed to allocate %lu bytes\n", cjMaxBits); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; } @@ -1445,6 +1485,7 @@ if(!NT_SUCCESS(Status)) { + DPRINT1("Got an exception! pjInit = %p\n", pjInit); SetLastNtError(Status); goto cleanup; } @@ -1491,6 +1532,7 @@ hdcDest = NtGdiCreateCompatibleDC(0); if(!hdcDest) { + DPRINT1("NtGdiCreateCompatibleDC failed\n"); return NULL; } } @@ -1502,6 +1544,7 @@ Dc = DC_LockDc(hdcDest); if (!Dc) { + DPRINT1("Failed to lock hdcDest %p\n", hdcDest); EngSetLastError(ERROR_INVALID_HANDLE); return NULL; } @@ -1529,7 +1572,7 @@ planes = 0; compression = 0; } - Bmp = IntCreateDIBitmap(Dc, cx, cy, planes, bpp, compression, fInit, pjInit, pbmi, iUsage); + Bmp = IntCreateDIBitmap(Dc, cx, cy, planes, bpp, compression, fInit, pjInit, cjMaxBits, pbmi, iUsage); DC_UnlockDc(Dc); if(!hDc)

1 0

[tkreuzer] 70464: [WIN32K] Properly check the bitmap size in IntSetDIBits, taking into account that it might be set to 0, then we have to calculate it ourselves. Fixes a crash when invalid data is ...
by tkreuzer＠svn.reactos.org 29 Dec '15

29 Dec '15

Author: tkreuzer Date: Tue Dec 29 20:28:23 2015 New Revision: 70464 URL: http://svn.reactos.org/svn/reactos?rev=70464&view=rev Log: [WIN32K] Properly check the bitmap size in IntSetDIBits, taking into account that it might be set to 0, then we have to calculate it ourselves. Fixes a crash when invalid data is passed to NtGdiCreateDIBitmapInternal. [GDI32] Convert COREINFOHEADER to BITMAPINFOHEADER before passing it to NtGdiCreateDIBitmapInternal, which doesn't support it. CORE-10583 #resolve Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] Tue Dec 29 20:28:23 2015 @@ -408,23 +408,30 @@ // PDC_ATTR pDc_Attr; UINT InfoSize = 0; UINT cjBmpScanSize = 0; - HBITMAP hBmp; + HBITMAP hBmp = NULL; NTSTATUS Status = STATUS_SUCCESS; + PBITMAPINFO pbmiConverted; + UINT cjInfoSize; + + /* Convert the BITMAPINFO if it is a COREINFO */ + pbmiConverted = ConvertBitmapInfo(Data, ColorUse, &cjInfoSize, FALSE); /* Check for CBM_CREATDIB */ if (Init & CBM_CREATDIB) { /* CBM_CREATDIB needs Data. */ - if (!Data) - { - return 0; + if (pbmiConverted == NULL) + { + DPRINT1("CBM_CREATDIB needs a BITMAINFO!\n"); + goto Exit; } /* It only works with PAL or RGB */ if (ColorUse > DIB_PAL_COLORS) { + DPRINT1("Invalid ColorUse: %lu\n", ColorUse); GdiSetLastError(ERROR_INVALID_PARAMETER); - return 0; + goto Exit; } /* Use the header from the data */ @@ -434,38 +441,48 @@ /* Header is required */ if (!Header) { + DPRINT1("Header is NULL\n"); GdiSetLastError(ERROR_INVALID_PARAMETER); - return 0; + goto Exit; } /* Get the bitmap format and dimensions */ if (DIB_GetBitmapInfo(Header, &width, &height, &planes, &bpp, &compr, &dibsize) == -1) { + DPRINT1("DIB_GetBitmapInfo failed!\n"); GdiSetLastError(ERROR_INVALID_PARAMETER); - return NULL; + goto Exit; } /* Check if the Compr is incompatible */ if ((compr == BI_JPEG) || (compr == BI_PNG) || (compr == BI_BITFIELDS)) - return 0; + { + DPRINT1("invalid compr: %lu!\n", compr); + goto Exit; + } /* Only DIB_RGB_COLORS (0), DIB_PAL_COLORS (1) and 2 are valid. */ if (ColorUse > DIB_PAL_COLORS + 1) { + DPRINT1("invalid compr: %lu!\n", compr); GdiSetLastError(ERROR_INVALID_PARAMETER); - return 0; + goto Exit; } /* If some Bits are given, only DIB_PAL_COLORS and DIB_RGB_COLORS are valid */ if (Bits && (ColorUse > DIB_PAL_COLORS)) { + DPRINT1("Invalid ColorUse: %lu\n", ColorUse); GdiSetLastError(ERROR_INVALID_PARAMETER); - return 0; + goto Exit; } /* Negative width is not allowed */ if (width < 0) - return 0; + { + DPRINT1("Negative width: %li\n", width); + goto Exit; + } /* Top-down DIBs have a negative height. */ height = abs(height); @@ -473,13 +490,13 @@ // For Icm support. // GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) - if (Data) + if (pbmiConverted) { _SEH2_TRY { - cjBmpScanSize = GdiGetBitmapBitsSize((BITMAPINFO *) Data); - CalculateColorTableSize(&Data->bmiHeader, &ColorUse, &InfoSize); - InfoSize += Data->bmiHeader.biSize; + cjBmpScanSize = GdiGetBitmapBitsSize(pbmiConverted); + CalculateColorTableSize(&pbmiConverted->bmiHeader, &ColorUse, &InfoSize); + InfoSize += pbmiConverted->bmiHeader.biSize; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -490,8 +507,9 @@ if (!NT_SUCCESS(Status)) { + DPRINT1("Got an exception!\n"); GdiSetLastError(ERROR_INVALID_PARAMETER); - return NULL; + goto Exit; } DPRINT("pBMI %p, Size bpp %u, dibsize %d, Conv %u, BSS %u\n", Data, bpp, dibsize, InfoSize, @@ -501,9 +519,18 @@ hBmp = GetStockObject(DEFAULT_BITMAP); else { - hBmp = NtGdiCreateDIBitmapInternal(hDC, width, height, Init, (LPBYTE) Bits, - (LPBITMAPINFO) Data, ColorUse, InfoSize, cjBmpScanSize, 0, 0); - } + hBmp = NtGdiCreateDIBitmapInternal(hDC, width, height, Init, (LPBYTE)Bits, + (LPBITMAPINFO)pbmiConverted, ColorUse, InfoSize, cjBmpScanSize, 0, 0); + } + +Exit: + + /* Cleanup converted BITMAPINFO */ + if ((pbmiConverted != NULL) && (pbmiConverted != Data)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, pbmiConverted); + } + return hBmp; } Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Tue Dec 29 20:28:23 2015 @@ -259,11 +259,37 @@ POINTL ptSrc; EXLATEOBJ exlo; PPALETTE ppalDIB = 0; + ULONG cjSizeImage; if (!bmi) return 0; - if (bmi->bmiHeader.biSizeImage > cjMaxBits) - { + /* Check if the header provided an image size */ + if (bmi->bmiHeader.biSizeImage != 0) + { + /* Use the given size */ + cjSizeImage = bmi->bmiHeader.biSizeImage; + } + /* Otherwise check for uncompressed formats */ + else if ((bmi->bmiHeader.biCompression == BI_RGB) || + (bmi->bmiHeader.biCompression == BI_BITFIELDS)) + { + /* Calculate the image size */ + cjSizeImage = DIB_GetDIBImageBytes(bmi->bmiHeader.biWidth, + ScanLines, + bmi->bmiHeader.biBitCount); + } + else + { + /* Compressed format without a size. This is invalid. */ + DPRINT1("Compressed format without a size!"); + return 0; + } + + /* Check if the size that we have is ok */ + if (cjSizeImage > cjMaxBits) + { + DPRINT1("Size too large! cjSizeImage = %lu, cjMaxBits = %lu\n", + cjSizeImage, cjMaxBits); return 0; } @@ -273,7 +299,7 @@ BitmapFormat(bmi->bmiHeader.biBitCount, bmi->bmiHeader.biCompression), bmi->bmiHeader.biHeight < 0 ? BMF_TOPDOWN : 0, - bmi->bmiHeader.biSizeImage, + cjSizeImage, (PVOID)Bits, 0); if (!SourceBitmap) @@ -314,6 +340,8 @@ rcDst.right = psurfDst->SurfObj.sizlBitmap.cx; ptSrc.x = 0; ptSrc.y = 0; + + NT_ASSERT(psurfSrc->SurfObj.cjBits <= cjMaxBits); result = IntEngCopyBits(&psurfDst->SurfObj, &psurfSrc->SurfObj, @@ -1366,7 +1394,11 @@ /* Undocumented flag which creates a DDB of the format specified by the bitmap info. */ handle = IntCreateCompatibleBitmap(Dc, width, height, planes, bpp); if (!handle) + { + DPRINT1("IntCreateCompatibleBitmap() failed!\n"); return NULL; + } + /* The palette must also match the given data */ Surface = SURFACE_ShareLockSurface(handle); ASSERT(Surface); @@ -1430,6 +1462,7 @@ safeBits = ExAllocatePoolWithTag(PagedPool, cjMaxBits, TAG_DIB); if(!safeBits) { + DPRINT1("Failed to allocate %lu bytes\n", cjMaxBits); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; } @@ -1452,6 +1485,7 @@ if(!NT_SUCCESS(Status)) { + DPRINT1("Got an exception! pjInit = %p\n", pjInit); SetLastNtError(Status); goto cleanup; } @@ -1498,6 +1532,7 @@ hdcDest = NtGdiCreateCompatibleDC(0); if(!hdcDest) { + DPRINT1("NtGdiCreateCompatibleDC failed\n"); return NULL; } } @@ -1509,6 +1544,7 @@ Dc = DC_LockDc(hdcDest); if (!Dc) { + DPRINT1("Failed to lock hdcDest %p\n", hdcDest); EngSetLastError(ERROR_INVALID_HANDLE); return NULL; }

1 0

[tkreuzer] 70463: [WIN32KDLL_2K3SP2] Export NtUserGetClassInfoEx (as it's called in 2k3) both as NtUserGetClassInfo (as it's called on XP) and NtUserGetClassInfo. They have the same prototype.
by tkreuzer＠svn.reactos.org 28 Dec '15

28 Dec '15

Author: tkreuzer Date: Mon Dec 28 23:51:05 2015 New Revision: 70463 URL: http://svn.reactos.org/svn/reactos?rev=70463&view=rev Log: [WIN32KDLL_2K3SP2] Export NtUserGetClassInfoEx (as it's called in 2k3) both as NtUserGetClassInfo (as it's called on XP) and NtUserGetClassInfo. They have the same prototype. Modified: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h Modified: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… ============================================================================== --- trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec [iso-8859-1] (original) +++ trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec [iso-8859-1] Mon Dec 28 23:51:05 2015 @@ -390,7 +390,8 @@ @ stdcall NtUserGetAtomName(long ptr) @ stdcall NtUserGetCaretBlinkTime() @ stdcall NtUserGetCaretPos(ptr) -@ stdcall NtUserGetClassInfo(ptr ptr ptr ptr long) # called NtUserGetClassInfoEx on 2k3,but identical to XP +@ stdcall NtUserGetClassInfo(ptr ptr ptr ptr long) NtUserGetClassInfoEx # called NtUserGetClassInfoEx on 2k3, but identical to XP's NtUserGetClassInfo +@ stdcall NtUserGetClassInfoEx(ptr ptr ptr ptr long) @ stdcall NtUserGetClassName(ptr long ptr) @ stdcall NtUserGetClipboardData(long ptr) @ stdcall NtUserGetClipboardFormatName(long wstr ptr) Modified: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… ============================================================================== --- trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h [iso-8859-1] (original) +++ trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h [iso-8859-1] Mon Dec 28 23:51:05 2015 @@ -388,7 +388,7 @@ SVC_(UserGetAtomName, 2) SVC_(UserGetCaretBlinkTime, 0) SVC_(UserGetCaretPos, 1) -SVC_(UserGetClassInfo, 5) // called UserGetClassInfoEx on 2k3, but identical to XP +SVC_(UserGetClassInfoEx, 5) SVC_(UserGetClassName, 3) SVC_(UserGetClipboardData, 2) SVC_(UserGetClipboardFormatName, 3)

1 0

[tkreuzer] 70462: [WIN32KDLL_2K3SP2] - "Fix" an export name: NtUserGetClassInfoEx on 2k3 is the same as NtUserGetClassInfo on XP (note that we currently use the default, aka ros specific, win32kdll...
by tkreuzer＠svn.reactos.org 28 Dec '15

28 Dec '15

Author: tkreuzer Date: Mon Dec 28 23:03:04 2015 New Revision: 70462 URL: http://svn.reactos.org/svn/reactos?rev=70462&view=rev Log: [WIN32KDLL_2K3SP2] - "Fix" an export name: NtUserGetClassInfoEx on 2k3 is the same as NtUserGetClassInfo on XP (note that we currently use the default, aka ros specific, win32kdll on the WHS testbot, but it's mostly identical. [WIN32KNT_APITEST] - Fix a typo - add missing tests to testlist.c Modified: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h trunk/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c trunk/rostests/apitests/win32nt/testlist.c Modified: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… ============================================================================== --- trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec [iso-8859-1] (original) +++ trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec [iso-8859-1] Mon Dec 28 23:03:04 2015 @@ -390,7 +390,7 @@ @ stdcall NtUserGetAtomName(long ptr) @ stdcall NtUserGetCaretBlinkTime() @ stdcall NtUserGetCaretPos(ptr) -@ stdcall NtUserGetClassInfoEx(ptr ptr ptr ptr long) +@ stdcall NtUserGetClassInfo(ptr ptr ptr ptr long) # called NtUserGetClassInfoEx on 2k3,but identical to XP @ stdcall NtUserGetClassName(ptr long ptr) @ stdcall NtUserGetClipboardData(long ptr) @ stdcall NtUserGetClipboardFormatName(long wstr ptr) Modified: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… ============================================================================== --- trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h [iso-8859-1] (original) +++ trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h [iso-8859-1] Mon Dec 28 23:03:04 2015 @@ -388,7 +388,7 @@ SVC_(UserGetAtomName, 2) SVC_(UserGetCaretBlinkTime, 0) SVC_(UserGetCaretPos, 1) -SVC_(UserGetClassInfoEx, 5) +SVC_(UserGetClassInfo, 5) // called UserGetClassInfoEx on 2k3, but identical to XP SVC_(UserGetClassName, 3) SVC_(UserGetClipboardData, 2) SVC_(UserGetClipboardFormatName, 3) Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… ============================================================================== --- trunk/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c [iso-8859-1] (original) +++ trunk/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c [iso-8859-1] Mon Dec 28 23:03:04 2015 @@ -1,15 +1,14 @@ /* * PROJECT: ReactOS api tests * LICENSE: GPL - See COPYING in the top level directory - * PURPOSE: Test for NtUserFindExistingCursoricon + * PURPOSE: Test for NtUserFindExistingCursorIcon * PROGRAMMERS: */ #include <win32nt.h> -START_TEST(NtUserFindExistingCursoricon) +START_TEST(NtUserFindExistingCursorIcon) { } - Modified: trunk/rostests/apitests/win32nt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/testlist… ============================================================================== --- trunk/rostests/apitests/win32nt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/win32nt/testlist.c [iso-8859-1] Mon Dec 28 23:03:04 2015 @@ -4,10 +4,121 @@ #include <apitest.h> extern void func_NtGdiDdCreateDirectDrawObject(void); +extern void func_NtGdiDdCreateDirectDrawObject(void); +extern void func_NtGdiDdDeleteDirectDrawObject(void); +extern void func_NtGdiDdQueryDirectDrawObject(void); + +extern void func_NtGdiArcInternal(void); +extern void func_NtGdiBitBlt(void); +extern void func_NtGdiCombineRgn(void); +extern void func_NtGdiCreateBitmap(void); +extern void func_NtGdiCreateCompatibleBitmap(void); +extern void func_NtGdiCreateCompatibleDC(void); +extern void func_NtGdiCreateDIBSection(void); +extern void func_NtGdiDeleteObjectApp(void); +extern void func_NtGdiDoPalette(void); +extern void func_NtGdiEngCreatePalette(void); +extern void func_NtGdiEnumFontOpen(void); +//extern void func_NtGdiExtSelectClipRgn(void); +extern void func_NtGdiExtTextOutW(void); +//extern void func_NtGdiFlushUserBatch(void); +extern void func_NtGdiGetBitmapBits(void); +extern void func_NtGdiGetDIBitsInternal(void); +extern void func_NtGdiGetFontResourceInfoInternalW(void); +extern void func_NtGdiGetRandomRgn(void); +extern void func_NtGdiGetStockObject(void); +extern void func_NtGdiPolyPolyDraw(void); +extern void func_NtGdiRestoreDC(void); +extern void func_NtGdiSaveDC(void); +extern void func_NtGdiSelectBitmap(void); +extern void func_NtGdiSelectBrush(void); +extern void func_NtGdiSelectFont(void); +extern void func_NtGdiSelectPen(void); +extern void func_NtGdiSetBitmapBits(void); +extern void func_NtGdiSetDIBitsToDeviceInternal(void); +//extern void func_NtUserCallHwnd(void); +//extern void func_NtUserCallHwndLock(void); +//extern void func_NtUserCallHwndOpt(void); +//extern void func_NtUserCallHwndParam(void); +//extern void func_NtUserCallHwndParamLock(void); +//extern void func_NtUserCallNoParam(void); +//extern void func_NtUserCallOneParam(void); +extern void func_NtUserCountClipboardFormats(void); +//extern void func_NtUserEnumDisplayMonitors(void); +extern void func_NtUserEnumDisplaySettings(void); +extern void func_NtUserFindExistingCursorIcon(void); +extern void func_NtUserGetClassInfo(void); +//extern void func_NtUserGetIconInfo(void); +extern void func_NtUserGetTitleBarInfo(void); +extern void func_NtUserProcessConnect(void); +extern void func_NtUserRedrawWindow(void); +extern void func_NtUserScrollDC(void); +extern void func_NtUserSelectPalette(void); +extern void func_NtUserSetTimer(void); +extern void func_NtUserSystemParametersInfo(void); +extern void func_NtUserToUnicodeEx(void); +extern void func_NtUserUpdatePerUserSystemParameters(void); const struct test winetest_testlist[] = { + /* ntdd*/ { "NtGdiDdCreateDirectDrawObject", func_NtGdiDdCreateDirectDrawObject }, + { "NtGdiDdDeleteDirectDrawObject", func_NtGdiDdDeleteDirectDrawObject }, + { "NtGdiDdQueryDirectDrawObject", func_NtGdiDdQueryDirectDrawObject }, + { "NtGdiArcInternal", func_NtGdiArcInternal }, + + /* ntgdi */ + { "NtGdiBitBlt", func_NtGdiBitBlt }, + { "NtGdiCombineRgn", func_NtGdiCombineRgn }, + { "NtGdiCreateBitmap", func_NtGdiCreateBitmap }, + { "NtGdiCreateCompatibleBitmap", func_NtGdiCreateCompatibleBitmap }, + { "NtGdiCreateCompatibleDC", func_NtGdiCreateCompatibleDC }, + { "NtGdiCreateDIBSection", func_NtGdiCreateDIBSection }, + { "NtGdiDeleteObjectApp", func_NtGdiDeleteObjectApp }, + { "NtGdiDoPalette", func_NtGdiDoPalette }, + { "NtGdiEngCreatePalette", func_NtGdiEngCreatePalette }, + { "NtGdiEnumFontOpen", func_NtGdiEnumFontOpen }, + //{ "NtGdiExtSelectClipRgn", func_NtGdiExtSelectClipRgn }, + { "NtGdiExtTextOutW", func_NtGdiExtTextOutW }, + //{ "NtGdiFlushUserBatch", func_NtGdiFlushUserBatch }, + { "NtGdiGetBitmapBits", func_NtGdiGetBitmapBits }, + { "NtGdiGetDIBitsInternal", func_NtGdiGetDIBitsInternal }, + { "NtGdiGetFontResourceInfoInternalW", func_NtGdiGetFontResourceInfoInternalW }, + { "NtGdiGetRandomRgn", func_NtGdiGetRandomRgn }, + { "NtGdiGetStockObject", func_NtGdiGetStockObject }, + { "NtGdiPolyPolyDraw", func_NtGdiPolyPolyDraw }, + { "NtGdiRestoreDC", func_NtGdiRestoreDC }, + { "NtGdiSaveDC", func_NtGdiSaveDC }, + { "NtGdiSelectBitmap", func_NtGdiSelectBitmap }, + { "NtGdiSelectBrush", func_NtGdiSelectBrush }, + { "NtGdiSelectFont", func_NtGdiSelectFont }, + { "NtGdiSelectPen", func_NtGdiSelectPen }, + { "NtGdiSetBitmapBits", func_NtGdiSetBitmapBits }, + { "NtGdiSetDIBitsToDeviceInternal", func_NtGdiSetDIBitsToDeviceInternal }, + + /* ntuser */ + //{ "NtUserCallHwnd", func_NtUserCallHwnd }, + //{ "NtUserCallHwndLock", func_NtUserCallHwndLock }, + //{ "NtUserCallHwndOpt", func_NtUserCallHwndOpt }, + //{ "NtUserCallHwndParam", func_NtUserCallHwndParam }, + //{ "NtUserCallHwndParamLock", func_NtUserCallHwndParamLock }, + //{ "NtUserCallNoParam", func_NtUserCallNoParam }, + //{ "NtUserCallOneParam", func_NtUserCallOneParam }, + { "NtUserCountClipboardFormats", func_NtUserCountClipboardFormats }, + //{ "NtUserEnumDisplayMonitors", func_NtUserEnumDisplayMonitors }, + { "NtUserEnumDisplaySettings", func_NtUserEnumDisplaySettings }, + { "NtUserFindExistingCursorIcon", func_NtUserFindExistingCursorIcon }, + { "NtUserGetClassInfo", func_NtUserGetClassInfo }, + //{ "NtUserGetIconInfo", func_NtUserGetIconInfo }, + { "NtUserGetTitleBarInfo", func_NtUserGetTitleBarInfo }, + { "NtUserProcessConnect", func_NtUserProcessConnect }, + { "NtUserRedrawWindow", func_NtUserRedrawWindow }, + { "NtUserScrollDC", func_NtUserScrollDC }, + { "NtUserSelectPalette", func_NtUserSelectPalette }, + { "NtUserSetTimer", func_NtUserSetTimer }, + { "NtUserSystemParametersInfo", func_NtUserSystemParametersInfo }, + { "NtUserToUnicodeEx", func_NtUserToUnicodeEx }, + { "NtUserUpdatePerUserSystemParameters", func_NtUserUpdatePerUserSystemParameters }, { 0, 0 } };

1 0

[tkreuzer] 70461: [GDITOOLS] 3rd try to fix WHS rostests build
by tkreuzer＠svn.reactos.org 28 Dec '15

28 Dec '15

Author: tkreuzer Date: Mon Dec 28 20:53:34 2015 New Revision: 70461 URL: http://svn.reactos.org/svn/reactos?rev=70461&view=rev Log: [GDITOOLS] 3rd try to fix WHS rostests build Modified: trunk/rostests/apitests/gditools/CMakeLists.txt Modified: trunk/rostests/apitests/gditools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gditools/CMakeLi… ============================================================================== --- trunk/rostests/apitests/gditools/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gditools/CMakeLists.txt [iso-8859-1] Mon Dec 28 20:53:34 2015 @@ -3,3 +3,5 @@ add_library(gditools gditools.c) + +add_dependencies(gditools xdk)

1 0

[tkreuzer] 70460: [WIN32NT_APITEST] 2nd try to fix WHS rostests build
by tkreuzer＠svn.reactos.org 28 Dec '15

28 Dec '15

Author: tkreuzer Date: Mon Dec 28 20:51:28 2015 New Revision: 70460 URL: http://svn.reactos.org/svn/reactos?rev=70460&view=rev Log: [WIN32NT_APITEST] 2nd try to fix WHS rostests build Modified: trunk/rostests/apitests/win32nt/CMakeLists.txt Modified: trunk/rostests/apitests/win32nt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/CMakeLis… ============================================================================== --- trunk/rostests/apitests/win32nt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/win32nt/CMakeLists.txt [iso-8859-1] Mon Dec 28 20:51:28 2015 @@ -1,6 +1,6 @@ add_definitions(-D_DLL -D__USE_CRTIMP) -include_directories(${REACTOS_SOURCE_DIR}/win32ss/include ${REACTOS_SOURCE_DIR}/win32ss/include/psdk ../gditools) +include_directories(${REACTOS_SOURCE_DIR}/win32ss/include ../gditools) list(APPEND SOURCE ntdd/NtGdiDdCreateDirectDrawObject.c @@ -76,4 +76,5 @@ kernel32 ntdll) +add_dependencies(win32knt_apitest xdk) add_cd_file(TARGET win32knt_apitest DESTINATION reactos/bin FOR all)

1 0

[tkreuzer] 70459: [WIN32NT_APITEST] Try to fix WHS rostests build
by tkreuzer＠svn.reactos.org 28 Dec '15

28 Dec '15

Author: tkreuzer Date: Mon Dec 28 20:46:05 2015 New Revision: 70459 URL: http://svn.reactos.org/svn/reactos?rev=70459&view=rev Log: [WIN32NT_APITEST] Try to fix WHS rostests build Modified: trunk/rostests/apitests/win32nt/CMakeLists.txt Modified: trunk/rostests/apitests/win32nt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/CMakeLis… ============================================================================== --- trunk/rostests/apitests/win32nt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/win32nt/CMakeLists.txt [iso-8859-1] Mon Dec 28 20:46:05 2015 @@ -1,6 +1,6 @@ add_definitions(-D_DLL -D__USE_CRTIMP) -include_directories(${REACTOS_SOURCE_DIR}/win32ss/include ../gditools) +include_directories(${REACTOS_SOURCE_DIR}/win32ss/include ${REACTOS_SOURCE_DIR}/win32ss/include/psdk ../gditools) list(APPEND SOURCE ntdd/NtGdiDdCreateDirectDrawObject.c

1 0

[tkreuzer] 70458: [APOTESTS] - Convert win32k native api test to actual wine style api-tests - Hack around a bit with the win32k dlls, some renaming, etc. - Delete old apitest stuff
by tkreuzer＠svn.reactos.org 28 Dec '15

28 Dec '15

Author: tkreuzer Date: Mon Dec 28 20:31:10 2015 New Revision: 70458 URL: http://svn.reactos.org/svn/reactos?rev=70458&view=rev Log: [APOTESTS] - Convert win32k native api test to actual wine style api-tests - Hack around a bit with the win32k dlls, some renaming, etc. - Delete old apitest stuff Added: trunk/rostests/apitests/win32kdll/ - copied from r70457, trunk/rostests/apitests/w32kdll/ trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/ - copied from r70405, trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/ trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec - copied unchanged from r70405, trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.spec trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h - copied unchanged from r70405, trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32ksvc-2k3sp2.h trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/ - copied from r70405, trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/ trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/win32kdll_2ksp4.S - copied unchanged from r70405, trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.S trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/win32kdll_2ksp4.def - copied unchanged from r70405, trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.def trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/win32kdll_2ksp4.spec - copied unchanged from r70405, trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.spec trunk/rostests/apitests/win32kdll/win32kdll_ros/ - copied from r70405, trunk/rostests/apitests/w32kdll/w32kdll_ros/ trunk/rostests/apitests/win32kdll/win32kdll_ros/win32kdll_ros.spec - copied, changed from r70405, trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.spec trunk/rostests/apitests/win32kdll/win32kdll_vista/ - copied from r70405, trunk/rostests/apitests/w32kdll/w32kdll_vista/ trunk/rostests/apitests/win32kdll/win32kdll_vista/win32kdll_vista.S - copied unchanged from r70405, trunk/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.S trunk/rostests/apitests/win32kdll/win32kdll_vista/win32kdll_vista.def - copied unchanged from r70405, trunk/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.def trunk/rostests/apitests/win32kdll/win32kdll_vista/win32kdll_vista.spec - copied unchanged from r70405, trunk/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.spec trunk/rostests/apitests/win32kdll/win32kdll_xpsp2/ - copied from r70405, trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/ trunk/rostests/apitests/win32kdll/win32kdll_xpsp2/win32kdll_xpsp2.spec - copied unchanged from r70405, trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.spec trunk/rostests/apitests/win32nt/ - copied from r70457, trunk/rostests/apitests/w32knapi/ trunk/rostests/apitests/win32nt/win32nt.h (with props) Removed: trunk/rostests/apitests/apitest.c trunk/rostests/apitests/apitest.h trunk/rostests/apitests/w32kdll/ trunk/rostests/apitests/w32knapi/ trunk/rostests/apitests/win32kdll/w32kdll_2k3sp2/ trunk/rostests/apitests/win32kdll/w32kdll_2ksp4/ trunk/rostests/apitests/win32kdll/w32kdll_ros/ trunk/rostests/apitests/win32kdll/w32kdll_vista/ trunk/rostests/apitests/win32kdll/w32kdll_xpsp2/ trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/w32kdll_2k3sp2.spec trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/w32ksvc-2k3sp2.h trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/w32k_2ksp4-x86.db trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/w32kdll_2ksp4.S trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/w32kdll_2ksp4.def trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/w32kdll_2ksp4.spec trunk/rostests/apitests/win32kdll/win32kdll_ros/w32kdll_ros.spec trunk/rostests/apitests/win32kdll/win32kdll_vista/w32kdll_vista-x86.db trunk/rostests/apitests/win32kdll/win32kdll_vista/w32kdll_vista.S trunk/rostests/apitests/win32kdll/win32kdll_vista/w32kdll_vista.def trunk/rostests/apitests/win32kdll/win32kdll_vista/w32kdll_vista.spec trunk/rostests/apitests/win32kdll/win32kdll_xpsp2/w32kdll_xpsp2.spec Modified: trunk/rostests/apitests/CMakeLists.txt trunk/rostests/apitests/win32kdll/CMakeLists.txt trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/CMakeLists.txt trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/sys-stubs.S trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/CMakeLists.txt trunk/rostests/apitests/win32kdll/win32kdll_ros/CMakeLists.txt trunk/rostests/apitests/win32kdll/win32kdll_ros/sys-stubs.S trunk/rostests/apitests/win32kdll/win32kdll_vista/CMakeLists.txt trunk/rostests/apitests/win32kdll/win32kdll_xpsp2/CMakeLists.txt trunk/rostests/apitests/win32nt/CMakeLists.txt trunk/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c trunk/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c trunk/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c trunk/rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c trunk/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c trunk/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c trunk/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c trunk/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c trunk/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c trunk/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c trunk/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c trunk/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c trunk/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c trunk/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c trunk/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c trunk/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c trunk/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c trunk/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c trunk/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c trunk/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c trunk/rostests/apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c trunk/rostests/apitests/win32nt/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… Removed: trunk/rostests/apitests/apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.c?rev=70… Removed: trunk/rostests/apitests/apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.h?rev=70… Modified: trunk/rostests/apitests/win32kdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/CMakeL… Modified: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… Modified: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/sys-stubs.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… Removed: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/w32kdll_2k3sp2.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Removed: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/w32ksvc-2k3sp2.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Modified: trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… Removed: trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/w32k_2ksp4-x86.db URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Removed: trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/w32kdll_2ksp4.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Removed: trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/w32kdll_2ksp4.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Removed: trunk/rostests/apitests/win32kdll/win32kdll_2ksp4/w32kdll_2ksp4.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Modified: trunk/rostests/apitests/win32kdll/win32kdll_ros/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… Modified: trunk/rostests/apitests/win32kdll/win32kdll_ros/sys-stubs.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… Removed: trunk/rostests/apitests/win32kdll/win32kdll_ros/w32kdll_ros.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Copied: trunk/rostests/apitests/win32kdll/win32kdll_ros/win32kdll_ros.spec (from r70405, trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.spec) URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… Modified: trunk/rostests/apitests/win32kdll/win32kdll_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… Removed: trunk/rostests/apitests/win32kdll/win32kdll_vista/w32kdll_vista-x86.db URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Removed: trunk/rostests/apitests/win32kdll/win32kdll_vista/w32kdll_vista.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Removed: trunk/rostests/apitests/win32kdll/win32kdll_vista/w32kdll_vista.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Removed: trunk/rostests/apitests/win32kdll/win32kdll_vista/w32kdll_vista.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Modified: trunk/rostests/apitests/win32kdll/win32kdll_xpsp2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… Removed: trunk/rostests/apitests/win32kdll/win32kdll_xpsp2/w32kdll_xpsp2.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Modified: trunk/rostests/apitests/win32nt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/CMakeLis… Modified: trunk/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntdd/NtG… Modified: trunk/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntdd/NtG… Modified: trunk/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntdd/NtG… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntgdi/Nt… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… Modified: trunk/rostests/apitests/win32nt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/testlist… Added: trunk/rostests/apitests/win32nt/win32nt.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/win32nt.…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2015