Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[tkreuzer] 66267: [PSDK] Add #ifdef include guards to winnt.h. RC doesn't seem to support #pragma once and emits a redefinition warning, since with RC we first include winnt.h without STRICT define...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 14 17:04:42 2015 New Revision: 66267 URL: http://svn.reactos.org/svn/reactos?rev=66267&view=rev Log: [PSDK] Add #ifdef include guards to winnt.h. RC doesn't seem to support #pragma once and emits a redefinition warning, since with RC we first include winnt.h without STRICT defined, then again from windef.h with STRICT defined. Modified: trunk/reactos/include/psdk/winnt.h trunk/reactos/include/xdk/winnt.template.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Feb 14 17:04:42 2015 @@ -20,6 +20,7 @@ */ #pragma once +#ifndef _WINNT_ #define _WINNT_ /* We require WDK / VS 2008 or newer */ @@ -6130,3 +6131,5 @@ #ifdef __cplusplus } // extern "C" #endif + +#endif /* _WINNT_ */ Modified: trunk/reactos/include/xdk/winnt.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt.template… ============================================================================== --- trunk/reactos/include/xdk/winnt.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/winnt.template.h [iso-8859-1] Sat Feb 14 17:04:42 2015 @@ -20,6 +20,7 @@ */ #pragma once +#ifndef _WINNT_ #define _WINNT_ /* We require WDK / VS 2008 or newer */ @@ -74,3 +75,5 @@ #ifdef __cplusplus } // extern "C" #endif + +#endif /* _WINNT_ */

9 years, 10 months

[tkreuzer] 66266: [CMAKE] - Disable warning C4800: forcing value to bool 'true' or 'false' (performance warning). This is emitted when assigning an integer value to a C++ bool, which is always true...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 14 15:44:44 2015 New Revision: 66266 URL: http://svn.reactos.org/svn/reactos?rev=66266&view=rev Log: [CMAKE] - Disable warning C4800: forcing value to bool 'true' or 'false' (performance warning). This is emitted when assigning an integer value to a C++ bool, which is always true (1) or false (0), so assigning an integer to it, will result in an implicit comparison against 0. But "fixing" this warning by adding an explicit comparison ("bool f = (i != 0);") will actually result in LESS efficient code (for whatever reasons). So this warning can be considered entirely useless and counter productive. - Remove C4018 (signed/unsigned mismatch) from the TODO in the disable list. A comparison between an unsigned and a signed value will very likely result in wrong behavior and can easily cause hard to spot security bugs (e.g. when doing overflow checks). It is also often easy to fix. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=66266… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Feb 14 15:44:44 2015 @@ -35,11 +35,11 @@ # Disable overly sensitive warnings as well as those that generally aren't # useful to us. -# - TODO: C4018: signed/unsigned mismatch # - C4244: implicit integer truncation # - C4290: C++ exception specification ignored -#add_compile_flags("/wd4018 /wd4244 /wd4290") -add_compile_flags("/wd4290 /wd4244") +# - C4800: forcing value to bool 'true' or 'false' (performance warning) +#add_compile_flags("/wd4244 /wd4290 /wd4800 ") +add_compile_flags("/wd4244 /wd4290 /wd4800") # The following warnings are treated as errors: # - C4013: implicit function declaration

9 years, 10 months

[pschweitzer] 66265: [NTFS] NtfsMoonWalkID(): - Do not allow opening a file by ID if it's not in use any longer - Do not attempt to create the full path, if an error occured during walk

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Feb 14 15:41:44 2015 New Revision: 66265 URL: http://svn.reactos.org/svn/reactos?rev=66265&view=rev Log: [NTFS] NtfsMoonWalkID(): - Do not allow opening a file by ID if it's not in use any longer - Do not attempt to create the full path, if an error occured during walk Modified: trunk/reactos/drivers/filesystems/ntfs/create.c Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Sat Feb 14 15:41:44 2015 @@ -116,6 +116,11 @@ break; ASSERT(MftRecord->Ntfs.Type == NRH_FILE_TYPE); + if (!(MftRecord->Flags & FRH_IN_USE)) + { + Status = STATUS_OBJECT_PATH_NOT_FOUND; + break; + } FileName = GetBestFileNameFromRecord(MftRecord); WritePosition -= FileName->NameLength; @@ -131,6 +136,9 @@ } ExFreePoolWithTag(MftRecord, TAG_NTFS); + + if (!NT_SUCCESS(Status)) + return Status; OutPath->Length = (MAX_PATH - WritePosition - 1) * sizeof(WCHAR); OutPath->MaximumLength = (MAX_PATH - WritePosition) * sizeof(WCHAR);

9 years, 10 months

[pschweitzer] 66264: [NTFS] Simplify the implementation of the "Open by ID" feature of our driver. Instead of creating singleton FCB not linked to the rest of FS tree, just walk the whole path down...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Feb 14 15:35:35 2015 New Revision: 66264 URL: http://svn.reactos.org/svn/reactos?rev=66264&view=rev Log: [NTFS] Simplify the implementation of the "Open by ID" feature of our driver. Instead of creating singleton FCB not linked to the rest of FS tree, just walk the whole path down, to recreate it. This doesn't make nfi work properly though. Will investigate more. CORE-8725 Modified: trunk/reactos/drivers/filesystems/ntfs/create.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Sat Feb 14 15:35:35 2015 @@ -46,6 +46,18 @@ Fcb = pFileObject->FsContext; ASSERT(Fcb); + if (Fcb->Flags & FCB_IS_VOLUME) + { + /* This is likely to be an opening by ID, return ourselves */ + if (pRelativeFileName[0] == L'\\') + { + *pAbsoluteFilename = NULL; + return STATUS_SUCCESS; + } + + return STATUS_INVALID_PARAMETER; + } + /* verify related object is a directory and target name don't start with \. */ if (NtfsFCBIsDirectory(Fcb) == FALSE || @@ -71,6 +83,66 @@ return STATUS_SUCCESS; } + +static +NTSTATUS +NtfsMoonWalkID(PDEVICE_EXTENSION DeviceExt, + ULONGLONG Id, + PUNICODE_STRING OutPath) +{ + NTSTATUS Status; + PFILE_RECORD_HEADER MftRecord; + PFILENAME_ATTRIBUTE FileName; + WCHAR FullPath[MAX_PATH]; + ULONG WritePosition = MAX_PATH - 1; + + DPRINT1("NtfsMoonWalkID(%p, %I64x, %p)\n", DeviceExt, Id, OutPath); + + Id = Id & NTFS_MFT_MASK; + + RtlZeroMemory(FullPath, sizeof(FullPath)); + MftRecord = ExAllocatePoolWithTag(NonPagedPool, + DeviceExt->NtfsInfo.BytesPerFileRecord, + TAG_NTFS); + if (MftRecord == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + while (TRUE) + { + Status = ReadFileRecord(DeviceExt, Id, MftRecord); + if (!NT_SUCCESS(Status)) + break; + + ASSERT(MftRecord->Ntfs.Type == NRH_FILE_TYPE); + + FileName = GetBestFileNameFromRecord(MftRecord); + WritePosition -= FileName->NameLength; + ASSERT(WritePosition < MAX_PATH); + RtlCopyMemory(FullPath + WritePosition, FileName->Name, FileName->NameLength * sizeof(WCHAR)); + WritePosition -= 1; + ASSERT(WritePosition < MAX_PATH); + FullPath[WritePosition] = L'\\'; + + Id = FileName->DirectoryFileReferenceNumber & NTFS_MFT_MASK; + if (Id == NTFS_FILE_ROOT) + break; + } + + ExFreePoolWithTag(MftRecord, TAG_NTFS); + + OutPath->Length = (MAX_PATH - WritePosition - 1) * sizeof(WCHAR); + OutPath->MaximumLength = (MAX_PATH - WritePosition) * sizeof(WCHAR); + OutPath->Buffer = ExAllocatePoolWithTag(NonPagedPool, OutPath->MaximumLength, TAG_NTFS); + if (OutPath->Buffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlCopyMemory(OutPath->Buffer, FullPath + WritePosition, OutPath->MaximumLength); + + return Status; +} /* * FUNCTION: Opens a file @@ -80,7 +152,6 @@ NtfsOpenFile(PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject, PWSTR FileName, - BOOLEAN OpenById, PNTFS_FCB * FoundFCB) { PNTFS_FCB ParentFcb; @@ -88,81 +159,53 @@ NTSTATUS Status; PWSTR AbsFileName = NULL; - DPRINT1("NtfsOpenFile(%p, %p, %S, %u, %p)\n", DeviceExt, FileObject, (!OpenById ? FileName : NULL), OpenById, FoundFCB); + DPRINT1("NtfsOpenFile(%p, %p, %S, %p)\n", DeviceExt, FileObject, FileName, FoundFCB); *FoundFCB = NULL; - if (OpenById) - { - ULONGLONG Id = (*(PULONGLONG)FileName) & NTFS_MFT_MASK; - - DPRINT1("Will attempt to open by id: %I64x\n", Id); - - Fcb = NtfsGrabFCBFromTableById(DeviceExt, - Id); - if (Fcb == NULL) - { - Status = NtfsGetFCBForFileById(DeviceExt, - &Fcb, - Id); - if (!NT_SUCCESS (Status)) - { - DPRINT("Could not make a new FCB, status: %x\n", Status); - - return Status; - } - - Fcb->Flags |= FCB_IS_OPEN_BY_ID; - } - } - else - { - if (FileObject->RelatedFileObject) - { - DPRINT("Converting relative filename to absolute filename\n"); - - Status = NtfsMakeAbsoluteFilename(FileObject->RelatedFileObject, - FileName, - &AbsFileName); - FileName = AbsFileName; - if (!NT_SUCCESS(Status)) - { - return Status; - } - - return STATUS_UNSUCCESSFUL; - } - - //FIXME: Get cannonical path name (remove .'s, ..'s and extra separators) - - DPRINT("PathName to open: %S\n", FileName); - - /* try first to find an existing FCB in memory */ - DPRINT("Checking for existing FCB in memory\n"); - Fcb = NtfsGrabFCBFromTable(DeviceExt, + if (FileObject->RelatedFileObject) + { + DPRINT("Converting relative filename to absolute filename\n"); + + Status = NtfsMakeAbsoluteFilename(FileObject->RelatedFileObject, + FileName, + &AbsFileName); + if (AbsFileName) FileName = AbsFileName; + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + + //FIXME: Get cannonical path name (remove .'s, ..'s and extra separators) + + DPRINT("PathName to open: %S\n", FileName); + + /* try first to find an existing FCB in memory */ + DPRINT("Checking for existing FCB in memory\n"); + Fcb = NtfsGrabFCBFromTable(DeviceExt, + FileName); + if (Fcb == NULL) + { + DPRINT("No existing FCB found, making a new one if file exists.\n"); + Status = NtfsGetFCBForFile(DeviceExt, + &ParentFcb, + &Fcb, FileName); - if (Fcb == NULL) - { - DPRINT("No existing FCB found, making a new one if file exists.\n"); - Status = NtfsGetFCBForFile(DeviceExt, - &ParentFcb, - &Fcb, - FileName); - if (ParentFcb != NULL) - { - NtfsReleaseFCB(DeviceExt, - ParentFcb); - } - - if (!NT_SUCCESS (Status)) - { - DPRINT("Could not make a new FCB, status: %x\n", Status); - - if (AbsFileName) - ExFreePool(AbsFileName); - - return Status; - } + if (ParentFcb != NULL) + { + NtfsReleaseFCB(DeviceExt, + ParentFcb); + } + + if (!NT_SUCCESS (Status)) + { + DPRINT("Could not make a new FCB, status: %x\n", Status); + + if (AbsFileName) + ExFreePool(AbsFileName); + + return Status; } } @@ -196,6 +239,7 @@ PNTFS_FCB Fcb; // PWSTR FileName; NTSTATUS Status; + UNICODE_STRING FullPath; DPRINT1("NtfsCreateFile(%p, %p) called\n", DeviceObject, Irp); @@ -213,12 +257,6 @@ return STATUS_INVALID_PARAMETER; } - if (RequestedOptions & FILE_OPEN_BY_FILE_ID) - { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; - } - FileObject = Stack->FileObject; if (RequestedDisposition == FILE_CREATE || @@ -228,10 +266,18 @@ return STATUS_ACCESS_DENIED; } - if ((RequestedOptions & FILE_OPEN_BY_FILE_ID) == FILE_OPEN_BY_FILE_ID && - FileObject->FileName.Length != sizeof(ULONGLONG)) - { - return STATUS_INVALID_PARAMETER; + if ((RequestedOptions & FILE_OPEN_BY_FILE_ID) == FILE_OPEN_BY_FILE_ID) + { + if (FileObject->FileName.Length != sizeof(ULONGLONG)) + return STATUS_INVALID_PARAMETER; + + Status = NtfsMoonWalkID(DeviceExt, (*(PULONGLONG)FileObject->FileName.Buffer), &FullPath); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + DPRINT1("Open by ID: %I64x -> %wZ\n", (*(PULONGLONG)FileObject->FileName.Buffer) & NTFS_MFT_MASK, &FullPath); } /* This a open operation for the volume itself */ @@ -258,9 +304,13 @@ Status = NtfsOpenFile(DeviceExt, FileObject, - FileObject->FileName.Buffer, - ((RequestedOptions & FILE_OPEN_BY_FILE_ID) == FILE_OPEN_BY_FILE_ID), + ((RequestedOptions & FILE_OPEN_BY_FILE_ID) ? FullPath.Buffer : FileObject->FileName.Buffer), &Fcb); + + if (RequestedOptions & FILE_OPEN_BY_FILE_ID) + { + ExFreePoolWithTag(FullPath.Buffer, TAG_NTFS); + } if (NT_SUCCESS(Status)) { Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Sat Feb 14 15:35:35 2015 @@ -220,8 +220,7 @@ Fcb = CONTAINING_RECORD(current_entry, NTFS_FCB, FcbListEntry); DPRINT("Comparing '%S' and '%S'\n", FileName, Fcb->PathName); - if ((Fcb->Flags & FCB_IS_OPEN_BY_ID) != FCB_IS_OPEN_BY_ID && - _wcsicmp(FileName, Fcb->PathName) == 0) + if (_wcsicmp(FileName, Fcb->PathName) == 0) { Fcb->RefCount++; KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); @@ -229,38 +228,6 @@ } //FIXME: need to compare against short name in FCB here - - current_entry = current_entry->Flink; - } - - KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); - - return NULL; -} - - -PNTFS_FCB -NtfsGrabFCBFromTableById(PNTFS_VCB Vcb, - ULONGLONG Id) -{ - KIRQL oldIrql; - PNTFS_FCB Fcb; - PLIST_ENTRY current_entry; - - KeAcquireSpinLock(&Vcb->FcbListLock, &oldIrql); - - current_entry = Vcb->FcbListHead.Flink; - while (current_entry != &Vcb->FcbListHead) - { - Fcb = CONTAINING_RECORD(current_entry, NTFS_FCB, FcbListEntry); - - if ((Fcb->Flags & FCB_IS_OPEN_BY_ID) == FCB_IS_OPEN_BY_ID && - Fcb->MFTIndex == Id) - { - Fcb->RefCount++; - KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); - return Fcb; - } current_entry = current_entry->Flink; } @@ -698,42 +665,6 @@ NTSTATUS -NtfsGetFCBForFileById(PNTFS_VCB Vcb, - PNTFS_FCB *pFCB, - ULONGLONG Id) -{ - NTSTATUS Status; - PFILE_RECORD_HEADER FileRecord; - - FileRecord = ExAllocatePoolWithTag(NonPagedPool, - Vcb->NtfsInfo.BytesPerFileRecord, - TAG_NTFS); - if (FileRecord == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - Status = ReadFileRecord(Vcb, Id, FileRecord); - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(FileRecord, TAG_NTFS); - return Status; - } - - if ((FileRecord->Flags & FRH_IN_USE) != FRH_IN_USE) - { - ExFreePoolWithTag(FileRecord, TAG_NTFS); - return STATUS_INVALID_PARAMETER; - } - - Status = NtfsMakeFCBFromDirEntry(Vcb, NULL, NULL, FileRecord, Id, pFCB); - - ExFreePoolWithTag(FileRecord, TAG_NTFS); - - return Status; -} - -NTSTATUS NtfsReadFCBAttribute(PNTFS_VCB Vcb, PNTFS_FCB pFCB, ULONG Type, Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sat Feb 14 15:35:35 2015 @@ -416,7 +416,6 @@ #define FCB_CACHE_INITIALIZED 0x0001 #define FCB_IS_VOLUME_STREAM 0x0002 #define FCB_IS_VOLUME 0x0004 -#define FCB_IS_OPEN_BY_ID 0x0008 #define MAX_PATH 260 typedef struct _FCB @@ -601,10 +600,6 @@ NtfsGrabFCBFromTable(PNTFS_VCB Vcb, PCWSTR FileName); -PNTFS_FCB -NtfsGrabFCBFromTableById(PNTFS_VCB Vcb, - ULONGLONG Id); - NTSTATUS NtfsFCBInitializeCache(PNTFS_VCB Vcb, PNTFS_FCB Fcb); @@ -625,11 +620,6 @@ PNTFS_FCB *pParentFCB, PNTFS_FCB *pFCB, const PWSTR pFileName); - -NTSTATUS -NtfsGetFCBForFileById(PNTFS_VCB Vcb, - PNTFS_FCB *pFCB, - ULONGLONG Id); NTSTATUS NtfsReadFCBAttribute(PNTFS_VCB Vcb,

9 years, 10 months

[tkreuzer] 66263: [SPEC2DEF] Silence warning about ignored C++ redirections

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 14 14:28:02 2015 New Revision: 66263 URL: http://svn.reactos.org/svn/reactos?rev=66263&view=rev Log: [SPEC2DEF] Silence warning about ignored C++ redirections Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Sat Feb 14 14:28:02 2015 @@ -567,8 +567,8 @@ { if (pexp->strName.buf[0] == '?') { - fprintf(stderr, "warning: ignoring C++ redirection %.*s -> %.*s\n", - pexp->strName.len, pexp->strName.buf, pexp->strTarget.len, pexp->strTarget.buf); + //fprintf(stderr, "warning: ignoring C++ redirection %.*s -> %.*s\n", + // pexp->strName.len, pexp->strName.buf, pexp->strTarget.len, pexp->strTarget.buf); } else {

9 years, 10 months

[tkreuzer] 66262: [GDI32_APITEST] Add additional tests for CreateBitmap and fix a test. Patch by Victor Martinez ROSTESTS-56 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 14 14:07:50 2015 New Revision: 66262 URL: http://svn.reactos.org/svn/reactos?rev=66262&view=rev Log: [GDI32_APITEST] Add additional tests for CreateBitmap and fix a test. Patch by Victor Martinez ROSTESTS-56 #resolve Modified: trunk/rostests/apitests/gdi32/CreateBitmap.c Modified: trunk/rostests/apitests/gdi32/CreateBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateBitm… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateBitmap.c [iso-8859-1] Sat Feb 14 14:07:50 2015 @@ -76,12 +76,13 @@ ok_err(0); /* Check for overflow in width * height */ - hbmp = CreateBitmap(0x20000, 0x1FFFF, 1, 1, NULL); - //ok(hbmp != 0, "\n"); // fails on windows 2003 - DeleteObject(hbmp); - - SetLastError(0); - hbmp = CreateBitmap(0x20000, 0x20000, 1, 1, NULL); + hbmp = CreateBitmap(0x2000, 0x4000, 1, 1, NULL); //128 MB.Should work. + ok(hbmp != 0, "\n"); + DeleteObject(hbmp); + + /* XP doesn't allow to create bitmaps larger than 128 Mb */ + SetLastError(0); + hbmp = CreateBitmap(0x2000, 0x4001, 1, 1, NULL);//More than 128MB.Should fail. ok(hbmp == 0, "\n"); ok_err(0); @@ -98,6 +99,7 @@ HBITMAP hbmp; BITMAP bitmap; ULONG cjWidthBytes, cBitsPixel, cExpectedBitsPixel; + int result, TestBitsPixel, ExpectedBitsPixel; hbmp = CreateBitmap(0, 0, 0, 0, NULL); ok(hbmp != 0, "should get a 1x1 bitmap\n"); @@ -112,6 +114,36 @@ ok_ptr(bitmap.bmBits, 0); DeleteObject(hbmp); + /* Above 32 bpp should fail */ + hbmp = CreateBitmap(1, 2, 1, 33, NULL); + ok(hbmp == 0, "should fail\n"); + + for (TestBitsPixel = 0; TestBitsPixel <= 32; TestBitsPixel++) + { + /* CreateBitmap API accepts any number as BitsPixels param. + but it can only create 1, 4, 8, 16, 24, 32 bpp bitmaps */ + if (TestBitsPixel <= 1) ExpectedBitsPixel = 1; + else if(TestBitsPixel <= 4) ExpectedBitsPixel = 4; + else if(TestBitsPixel <= 8) ExpectedBitsPixel = 8; + else if(TestBitsPixel <= 16) ExpectedBitsPixel = 16; + else if(TestBitsPixel <= 24) ExpectedBitsPixel = 24; + else if(TestBitsPixel <= 32) ExpectedBitsPixel = 32; + + /* Calculate proper bmWidthBytes */ + + hbmp = CreateBitmap(1, 2, 1, TestBitsPixel, NULL); + ok(hbmp != 0, "should get a 1x2 bitmap\n"); + result = GetObject(hbmp, sizeof(bitmap), &bitmap); + ok(result > 0, "result = %d\n", result); + ok(bitmap.bmType == 0, "bmType = %ld\n", bitmap.bmType); + ok(bitmap.bmWidth == 1, "bmWidth = %ld\n", bitmap.bmWidth); + ok(bitmap.bmHeight == 2, "bmHeight = %ld\n", bitmap.bmHeight); + ok(bitmap.bmPlanes == 1, "bmPlanes = %d\n", bitmap.bmPlanes); + ok(bitmap.bmBitsPixel == ExpectedBitsPixel, "bmBitsPixel = %d ExpectedBitsPixel= %d \n", bitmap.bmBitsPixel, ExpectedBitsPixel); + ok(bitmap.bmBits == 0, "bmBits = %p\n", bitmap.bmBits); + DeleteObject(hbmp); + } + hbmp = CreateBitmap(1, 2, 1, 1, NULL); ok(hbmp != 0, "should get a 1x2 bitmap\n"); ok_int(GetObject(hbmp, sizeof(bitmap), &bitmap), sizeof(BITMAP)); @@ -162,7 +194,7 @@ START_TEST(CreateBitmap) { - //Test_CreateBitmap_Params(); + Test_CreateBitmap_Params(); Test_CreateBitmap(); }

9 years, 10 months

[dquintana] 66261: [BROWSEUI] * Convert some leftover DbgPrints to TRACEs and ERRs.

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat Feb 14 14:00:24 2015 New Revision: 66261 URL: http://svn.reactos.org/svn/reactos?rev=66261&view=rev Log: [BROWSEUI] * Convert some leftover DbgPrints to TRACEs and ERRs. Modified: trunk/reactos/dll/win32/browseui/desktopipc.cpp Modified: trunk/reactos/dll/win32/browseui/desktopipc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/desktop… ============================================================================== --- trunk/reactos/dll/win32/browseui/desktopipc.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/desktopipc.cpp [iso-8859-1] Sat Feb 14 14:00:24 2015 @@ -51,14 +51,14 @@ LRESULT OnMessage1037(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - DbgPrint("Proxy Desktop message 1037.\n"); + TRACE("Proxy Desktop message 1037.\n"); bHandled = TRUE; return TRUE; } LRESULT OnOpenNewWindow(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - DbgPrint("Proxy Desktop message 1035 received.\n"); + TRACE("Proxy Desktop message 1035 received.\n"); bHandled = TRUE; SHOnCWMCommandLine((HANDLE) lParam); return 0; @@ -85,19 +85,19 @@ if (shell) { - DbgPrint("Found main desktop.\n"); + TRACE("Found main desktop.\n"); return shell; } } else { - DbgPrint("Separate folders setting enabled. Ignoring main desktop.\n"); + TRACE("Separate folders setting enabled. Ignoring main desktop.\n"); } HWND proxy = FindWindow(PROXY_DESKTOP_CLASS, NULL); if (proxy) { - DbgPrint("Found proxy desktop.\n"); + TRACE("Found proxy desktop.\n"); return proxy; } @@ -121,7 +121,7 @@ { directoryPidlLength = ILGetSize(threadParams->directoryPIDL); sharedBlockSize += directoryPidlLength; - DbgPrint("directoryPidlLength=%d\n", directoryPidlLength); + TRACE("directoryPidlLength=%d\n", directoryPidlLength); } // another PIDL @@ -129,7 +129,7 @@ { pidlSize7C = ILGetSize(threadParams->offset7C); sharedBlockSize += pidlSize7C; - DbgPrint("pidlSize7C=%d\n", pidlSize7C); + TRACE("pidlSize7C=%d\n", pidlSize7C); } // This flag indicates the presence of another pidl? @@ -139,12 +139,12 @@ { pidlSize80 = ILGetSize(pidl80); sharedBlockSize += pidlSize80; - DbgPrint("pidlSize80=%d\n", pidlSize7C); + TRACE("pidlSize80=%d\n", pidlSize7C); } } else { - DbgPrint("pidl80 sent by value = %p\n", pidl80); + TRACE("pidl80 sent by value = %p\n", pidl80); pidlSize80 = 4; sharedBlockSize += pidlSize80; } @@ -154,23 +154,23 @@ { pathLength = 2 * lstrlenW(strPath) + 2; sharedBlockSize += pathLength; - DbgPrint("pathLength=%d\n", pidlSize7C); - } - - DbgPrint("sharedBlockSize=%d\n", sharedBlockSize); + TRACE("pathLength=%d\n", pidlSize7C); + } + + TRACE("sharedBlockSize=%d\n", sharedBlockSize); // Allocate and fill the shared section HANDLE hShared = SHAllocShared(0, sharedBlockSize, dwProcessId); if (!hShared) { - DbgPrint("Shared section alloc error.\n"); + ERR("Shared section alloc error.\n"); return 0; } PBYTE target = (PBYTE) SHLockShared(hShared, dwProcessId); if (!target) { - DbgPrint("Shared section lock error. %d\n", GetLastError()); + ERR("Shared section lock error. %d\n", GetLastError()); SHFreeShared(hShared, dwProcessId); return 0; } @@ -353,7 +353,7 @@ { IEThreadParamBlock *result; - DbgPrint("SHCreateIETHREADPARAM\n"); + TRACE("SHCreateIETHREADPARAM\n"); result = (IEThreadParamBlock *) LocalAlloc(LMEM_ZEROINIT, 256); if (result == NULL) @@ -376,7 +376,7 @@ { IEThreadParamBlock *result; - DbgPrint("SHCloneIETHREADPARAM\n"); + TRACE("SHCloneIETHREADPARAM\n"); result = (IEThreadParamBlock *) LocalAlloc(LMEM_FIXED, 256); if (result == NULL) @@ -402,7 +402,7 @@ */ extern "C" void WINAPI SHDestroyIETHREADPARAM(IEThreadParamBlock *param) { - DbgPrint("SHDestroyIETHREADPARAM\n"); + TRACE("SHDestroyIETHREADPARAM\n"); if (param == NULL) return; @@ -430,7 +430,7 @@ */ extern "C" BOOL WINAPI SHOnCWMCommandLine(HANDLE hSharedInfo) { - DbgPrint("SHOnCWMCommandLine\n"); + TRACE("SHOnCWMCommandLine\n"); PIE_THREAD_PARAM_BLOCK params = ParseSharedPacket(hSharedInfo); @@ -454,7 +454,7 @@ WCHAR debugStr[MAX_PATH + 1]; SHGetPathFromIDListW(parameters->directoryPIDL, debugStr); - DbgPrint("SHOpenFolderWindow %p(%S)\n", parameters->directoryPIDL, debugStr); + TRACE("SHOpenFolderWindow %p(%S)\n", parameters->directoryPIDL, debugStr); PIE_THREAD_PARAM_BLOCK paramsCopy = SHCloneIETHREADPARAM(parameters); @@ -480,7 +480,7 @@ { IEThreadParamBlock *parameters; - DbgPrint("SHOpenNewFrame\n"); + TRACE("SHOpenNewFrame\n"); parameters = SHCreateIETHREADPARAM(0, 1, paramC, NULL); if (parameters == NULL) @@ -506,7 +506,7 @@ */ BOOL WINAPI SHCreateFromDesktop(ExplorerCommandLineParseResults * parseResults) { - DbgPrint("SHCreateFromDesktop\n"); + TRACE("SHCreateFromDesktop\n"); IEThreadParamBlock * parameters = SHCreateIETHREADPARAM(0, 0, 0, 0); if (!parameters) @@ -545,7 +545,7 @@ // If found, ask it to open the new window if (desktop) { - DbgPrint("Found desktop hwnd=%p\n", desktop); + TRACE("Found desktop hwnd=%p\n", desktop); DWORD dwProcessId; @@ -555,7 +555,7 @@ HANDLE hShared = MakeSharedPacket(parameters, strPath, dwProcessId); if (hShared) { - DbgPrint("Sending open message...\n"); + TRACE("Sending open message...\n"); PostMessageW(desktop, WM_EXPLORER_OPEN_NEW_WINDOW, 0, (LPARAM) hShared); } @@ -564,7 +564,7 @@ return TRUE; } - DbgPrint("Desktop not found or separate flag requested.\n"); + TRACE("Desktop not found or separate flag requested.\n"); // Else, start our own message loop! HRESULT hr = CoInitialize(NULL);

9 years, 10 months

[tkreuzer] 66260: [GDI32_APITEST] Fix GCC build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 14 13:24:54 2015 New Revision: 66260 URL: http://svn.reactos.org/svn/reactos?rev=66260&view=rev Log: [GDI32_APITEST] Fix GCC build Modified: trunk/rostests/apitests/gdi32/FrameRgn.c Modified: trunk/rostests/apitests/gdi32/FrameRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/FrameRgn.c… ============================================================================== --- trunk/rostests/apitests/gdi32/FrameRgn.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/FrameRgn.c [iso-8859-1] Sat Feb 14 13:24:54 2015 @@ -90,7 +90,7 @@ { i = y * cx + x; ok(GetPixel(hdc, x, y) == pcrColors[pjBits[i]], - "Wrong pixel at (%u,%u): expected 0x%08x, got 0x%08x\n", + "Wrong pixel at (%u,%u): expected 0x%08lx, got 0x%08lx\n", x, y, pcrColors[pjBits[i]], GetPixel(hdc, x, y)); } }

9 years, 10 months

[tkreuzer] 66259: [GDI32_APITEST] Add tests for OffsetRgn, PaintRgn and FrameRgn, fix 1BPP DIB creation in InitStuff()

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 14 13:19:02 2015 New Revision: 66259 URL: http://svn.reactos.org/svn/reactos?rev=66259&view=rev Log: [GDI32_APITEST] Add tests for OffsetRgn, PaintRgn and FrameRgn, fix 1BPP DIB creation in InitStuff() Added: trunk/rostests/apitests/gdi32/FrameRgn.c (with props) trunk/rostests/apitests/gdi32/OffsetRgn.c (with props) trunk/rostests/apitests/gdi32/PaintRgn.c (with props) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/gdi32/init.c trunk/rostests/apitests/gdi32/init.h trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Sat Feb 14 13:19:02 2015 @@ -26,6 +26,7 @@ ExcludeClipRect.c ExtCreatePen.c ExtCreateRegion.c + FrameRgn.c GdiConvertBitmap.c GdiConvertBrush.c GdiConvertDC.c @@ -51,6 +52,8 @@ GetTextFace.c MaskBlt.c OffsetClipRgn.c + OffsetRgn.c + PaintRgn.c PatBlt.c Rectangle.c RealizePalette.c Added: trunk/rostests/apitests/gdi32/FrameRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/FrameRgn.c… ============================================================================== --- trunk/rostests/apitests/gdi32/FrameRgn.c (added) +++ trunk/rostests/apitests/gdi32/FrameRgn.c [iso-8859-1] Sat Feb 14 13:19:02 2015 @@ -0,0 +1,146 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for FrameRgn + * PROGRAMMERS: Timo Kreuzer + */ + +#include <apitest.h> +#include <windows.h> +#include <stdio.h> +#include "init.h" + +#if 0 +BOOL +MyFrameRgn( + HDC hdc, + HRGN hrgn, + HBRUSH hbr, + INT cx, + INT cy) +{ + HRGN hrgnTemp; + + hrgnTemp = CreateRectRgn(0, 0, 0, 0); + if (hrgnTemp == NULL) + { + return FALSE; + } + + if (CombineRgn(hrgnTemp, hrgn, NULL, RGN_COPY) == ERROR) + goto Failure; + + if (OffsetRgn(hrgn, cx, cy) == ERROR) + goto Failure; + + if (CombineRgn(hrgnTemp, hrgnTemp, hrgn, RGN_AND) == ERROR) + goto Failure; + + if (OffsetRgn(hrgn, -2 * cx, 0) == ERROR) + goto Failure; + + if (CombineRgn(hrgnTemp, hrgnTemp, hrgn, RGN_AND) == ERROR) + goto Failure; + + if (OffsetRgn(hrgn, 0, -2 * cy) == ERROR) + goto Failure; + + if (CombineRgn(hrgnTemp, hrgnTemp, hrgn, RGN_AND) == ERROR) + goto Failure; + + if (OffsetRgn(hrgn, 2 * cx, 0) == ERROR) + goto Failure; + + if (CombineRgn(hrgnTemp, hrgnTemp, hrgn, RGN_AND) == ERROR) + goto Failure; + + if (OffsetRgn(hrgn, -cx, cy) == ERROR) + goto Failure; + + if (CombineRgn(hrgnTemp, hrgn, hrgnTemp, RGN_DIFF) == ERROR) + goto Failure; + + if (!FillRgn(hdc, hrgnTemp, hbr)) + goto Failure; + + DeleteObject(hrgnTemp); + return TRUE; + +Failure: + DeleteObject(hrgnTemp); + return FALSE; +} +#endif // 0 + +static +void +CheckBitmapBitsWithLine( + ULONG Line, + HDC hdc, + UINT cx, + UINT cy, + PUCHAR pjBits, + COLORREF *pcrColors) +{ + UINT x, y, i; + + for (y = 0; y < cy; y++) + { + for (x = 0; x < cy; x++) + { + i = y * cx + x; + ok(GetPixel(hdc, x, y) == pcrColors[pjBits[i]], + "Wrong pixel at (%u,%u): expected 0x%08x, got 0x%08x\n", + x, y, pcrColors[pjBits[i]], GetPixel(hdc, x, y)); + } + } +} + +#define CheckBitmapBits(hdc,cx,cy,pj,pcr) \ + CheckBitmapBitsWithLine(__LINE__, hdc,cx,cy,pj,pcr) + +void Test_FrameRgn() +{ + RECT rc = {0, 0, 8, 8 }; + HRGN hrgn1, hrgn2; + BOOL bRet; + UCHAR ajBits[64] = { + 0, 0, 0, 0, 0, 0, 0, 0, // 0000000 + 0, 1, 1, 1, 1, 0, 0, 0, // 0****00 + 0, 1, 2, 2, 1, 0, 0, 0, // 0*xx**0 + 0, 1, 2, 2, 1, 1, 1, 0, // 0*xxx*0 + 0, 1, 1, 1, 2, 2, 1, 0, // 0**xx*0 + 0, 0, 0, 1, 2, 2, 1, 0, // 00****0 + 0, 0, 0, 1, 1, 1, 1, 0, // 0000000 + 0, 0, 0, 0, 0, 0, 0, 0 // 0000000 + }; + COLORREF acrColors[16] = {RGB(0,0,0), RGB(255,255,255), RGB(128,128,128), 0}; + + FillRect(ghdcDIB32, &rc, GetStockObject(BLACK_BRUSH)); + + hrgn1 = CreateRectRgn(1, 1, 5, 5); + ok(hrgn1 != NULL, "failed to create region\n"); + + hrgn2 = CreateRectRgn(3, 3, 7, 7); + ok(hrgn1 != NULL, "failed to create region\n"); + + CombineRgn(hrgn1, hrgn1, hrgn2, RGN_OR); + + bRet = FillRgn(ghdcDIB32, hrgn1, GetStockObject(GRAY_BRUSH)); + ok(bRet != 0, "FrameRgn failed\n"); + + bRet = FrameRgn(ghdcDIB32, hrgn1, GetStockObject(WHITE_BRUSH), 1, 1); + ok(bRet != 0, "FrameRgn failed\n"); + + CheckBitmapBits(ghdcDIB32, 8, 8, ajBits, acrColors); + +} + + + +START_TEST(FrameRgn) +{ + InitStuff(); + Test_FrameRgn(); +} + Propchange: trunk/rostests/apitests/gdi32/FrameRgn.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32/OffsetRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/OffsetRgn.… ============================================================================== --- trunk/rostests/apitests/gdi32/OffsetRgn.c (added) +++ trunk/rostests/apitests/gdi32/OffsetRgn.c [iso-8859-1] Sat Feb 14 13:19:02 2015 @@ -0,0 +1,58 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for FrameRgn + * PROGRAMMERS: Timo Kreuzer + */ + +#include <apitest.h> +#include <windows.h> +#include <stdio.h> +#include "init.h" + +void Test_OffsetRgn() +{ + HRGN hrgn1, hrgn2; + HDC hdc; + + hrgn1 = CreateRectRgn(0, 0, 0, 0); + ok(hrgn1 != NULL, "CreateRectRgn failed\n"); + ok_int(OffsetRgn(hrgn1, INT_MIN + 10, 10), NULLREGION); + ok_int(OffsetRgn(hrgn1, 0xF000000, 0xF000000), NULLREGION); + DeleteObject(hrgn1); + + hrgn1 = CreateRectRgn(0, 0, 100, 100); + ok(hrgn1 != NULL, "CreateRectRgn failed\n"); + ok_int(OffsetRgn(hrgn1, 10, 10), SIMPLEREGION); + ok_int(OffsetRgn(hrgn1, 0x8000000 - 110, 10), ERROR); + ok_int(OffsetRgn(hrgn1, 0x8000000 - 111, 10), SIMPLEREGION); + DeleteObject(hrgn1); + + hrgn1 = CreateRectRgn(0, 0, 100, 100); + ok(hrgn1 != NULL, "CreateRectRgn failed\n"); + ok_int(OffsetRgn(hrgn1, -10, 10), SIMPLEREGION); + ok_int(OffsetRgn(hrgn1, -(0x8000000 - 9), 10), ERROR); + ok_int(OffsetRgn(hrgn1, -(0x8000000 - 10), 10), SIMPLEREGION); + DeleteObject(hrgn1); + + hrgn1 = CreateRectRgn(0, 0, 10, 10); + hrgn2 = CreateRectRgn(1000, 20, 1010, 30); + ok_int(CombineRgn(hrgn1, hrgn1, hrgn2, RGN_OR), COMPLEXREGION); + ok_int(OffsetRgn(hrgn1, 0x8000000 - 100, 10), ERROR); + ok_int(CombineRgn(hrgn1, hrgn1, hrgn2, RGN_XOR), SIMPLEREGION); + DeleteObject(hrgn2); + hrgn2 = CreateRectRgn(0, 0, 10, 10); + ok_int(CombineRgn(hrgn1, hrgn1, hrgn2, RGN_XOR), NULLREGION); + + hrgn1 = CreateRectRgn(0, 0, 0, 0); + hdc = CreateCompatibleDC(NULL); + ok_int(GetClipRgn(hdc, hrgn1), 0); + ok_int(OffsetRgn(hrgn1, 10, 10), NULLREGION); + +} + +START_TEST(OffsetRgn) +{ + Test_OffsetRgn(); +} + Propchange: trunk/rostests/apitests/gdi32/OffsetRgn.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32/PaintRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/PaintRgn.c… ============================================================================== --- trunk/rostests/apitests/gdi32/PaintRgn.c (added) +++ trunk/rostests/apitests/gdi32/PaintRgn.c [iso-8859-1] Sat Feb 14 13:19:02 2015 @@ -0,0 +1,63 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for FrameRgn + * PROGRAMMERS: Timo Kreuzer + */ + +#include <apitest.h> +#include <windows.h> +#include <stdio.h> +#include "init.h" + + +void Test_PaintRgn() +{ + RECT rc = { 0, 0, 100, 100 }; + HRGN hrgn1, hrgn2; + BOOL bRet; + XFORM xform; + PULONG pulDIB = gpvDIB1; + + FillRect(ghdcDIB1, &rc, GetStockObject(BLACK_BRUSH)); + + hrgn1 = CreateRectRgn(0, 0, 8, 3); + ok(hrgn1 != NULL, "failed to create region\n"); + + hrgn2 = CreateRectRgn(2, 3, 5, 8); + ok(hrgn1 != NULL, "failed to create region\n"); + + CombineRgn(hrgn1, hrgn1, hrgn2, RGN_OR); + + xform.eM11 = 1.0; + xform.eM12 = 0.5f; + xform.eM21 = 0.0; + xform.eM22 = 1.0; + xform.eDx = 0.0; + xform.eDy = 0.0; + + SetGraphicsMode(ghdcDIB1, GM_ADVANCED); + ok(SetWorldTransform(ghdcDIB1, &xform) == TRUE, "SetWorldTransform failed\n"); + + SelectObject(ghdcDIB1, GetStockObject(WHITE_BRUSH)); + + bRet = PaintRgn(ghdcDIB1, hrgn1); + ok(bRet == TRUE, "PaintRgn failed\n"); + + ok_long(pulDIB[0], 0x00000000); // 000000000 + ok_long(pulDIB[1], 0x000000C0); // 110000000 + ok_long(pulDIB[2], 0x000000F0); // 111110000 + ok_long(pulDIB[3], 0x000000FC); // 111111000 + ok_long(pulDIB[4], 0x0000003F); // 001111110 + ok_long(pulDIB[5], 0x0000003F); // 001111110 + ok_long(pulDIB[6], 0x0000003B); // 001110110 + ok_long(pulDIB[7], 0x00000038); // 001110000 + ok_long(pulDIB[8], 0x00000038); // 001110000 +} + +START_TEST(PaintRgn) +{ + InitStuff(); + Test_PaintRgn(); +} + Propchange: trunk/rostests/apitests/gdi32/PaintRgn.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/gdi32/init.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/init.c?rev… ============================================================================== --- trunk/rostests/apitests/gdi32/init.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/init.c [iso-8859-1] Sat Feb 14 13:19:02 2015 @@ -9,7 +9,6 @@ HDC ghdcDIB1, ghdcDIB4, ghdcDIB8, ghdcDIB16, ghdcDIB24, ghdcDIB32; PVOID gpvDIB1, gpvDIB4, gpvDIB8, gpvDIB16, gpvDIB24, gpvDIB32; ULONG (*gpDIB32)[8][8]; -PULONG pulDIB4Bits; HPALETTE ghpal; MYPAL gpal = @@ -40,7 +39,7 @@ struct { BITMAPINFOHEADER bmiHeader; - RGBQUAD bmiColors[256]; + ULONG bmiColors[256]; } bmiBuffer; LPBITMAPINFO pbmi = (LPBITMAPINFO)&bmiBuffer; @@ -65,6 +64,13 @@ pbmi->bmiHeader.biYPelsPerMeter = 0; pbmi->bmiHeader.biClrUsed = 0; pbmi->bmiHeader.biClrImportant = 0; + + if (cBitsPerPixel == 1) + { + bmiBuffer.bmiColors[0] = 0; + bmiBuffer.bmiColors[1] = 0xFFFFFF; + pbmi->bmiHeader.biClrUsed = 2; + } /* Create a compatible DC for the DIB */ *phdcDIB = CreateCompatibleDC(0); @@ -110,7 +116,6 @@ } gpDIB32 = gpvDIB32; - pulDIB4Bits = gpvDIB4; return TRUE; } Modified: trunk/rostests/apitests/gdi32/init.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/init.h?rev… ============================================================================== --- trunk/rostests/apitests/gdi32/init.h [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/init.h [iso-8859-1] Sat Feb 14 13:19:02 2015 @@ -2,7 +2,7 @@ extern HBITMAP ghbmp1, ghbmp4, ghbmp8, ghbmp16, ghbmp24, ghbmp32; extern HBITMAP ghbmpDIB1, ghbmpDIB4, ghbmpDIB8, ghbmpDIB16, ghbmpDIB24, ghbmpDIB32; extern HDC ghdcDIB1, ghdcDIB4, ghdcDIB8, ghdcDIB16, ghdcDIB24, ghdcDIB32; -extern PVOID pvBits1Bpp, pvBits4Bpp, pvBits8Bpp, pvBits16Bpp, pvBits24Bpp, pvBits32Bpp; +extern PVOID gpvDIB1, gpvDIB4, gpvDIB8, gpvDIB16, gpvDIB24, gpvDIB32; extern HBITMAP ghbmpDIB32; //extern PULONG pulDIB32Bits; Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Sat Feb 14 13:19:02 2015 @@ -27,6 +27,7 @@ extern void func_ExcludeClipRect(void); extern void func_ExtCreatePen(void); extern void func_ExtCreateRegion(void); +extern void func_FrameRgn(void); extern void func_GdiConvertBitmap(void); extern void func_GdiConvertBrush(void); extern void func_GdiConvertDC(void); @@ -52,6 +53,8 @@ extern void func_GetTextFace(void); extern void func_MaskBlt(void); extern void func_OffsetClipRgn(void); +extern void func_OffsetRgn(void); +extern void func_PaintRgn(void); extern void func_PatBlt(void); extern void func_Rectangle(void); extern void func_RealizePalette(void); @@ -92,6 +95,7 @@ { "ExcludeClipRect", func_ExcludeClipRect }, { "ExtCreatePen", func_ExtCreatePen }, { "ExtCreateRegion", func_ExtCreateRegion }, + { "FrameRgn", func_FrameRgn }, { "GdiConvertBitmap", func_GdiConvertBitmap }, { "GdiConvertBrush", func_GdiConvertBrush }, { "GdiConvertDC", func_GdiConvertDC }, @@ -117,6 +121,8 @@ { "GetTextFace", func_GetTextFace }, { "MaskBlt", func_MaskBlt }, { "OffsetClipRgn", func_OffsetClipRgn }, + { "OffsetRgn", func_OffsetRgn }, + { "PaintRgn", func_PaintRgn }, { "PatBlt", func_PatBlt }, { "Rectangle", func_Rectangle }, { "RealizePalette", func_RealizePalette },

9 years, 10 months

[tfaber] 66258: [COM_APITEST] - Add classes found in Wine's shell32_classes.idl and browseui_classes.idl

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Feb 14 12:59:16 2015 New Revision: 66258 URL: http://svn.reactos.org/svn/reactos?rev=66258&view=rev Log: [COM_APITEST] - Add classes found in Wine's shell32_classes.idl and browseui_classes.idl Modified: trunk/rostests/apitests/com/browseui.c trunk/rostests/apitests/com/com_apitest.h trunk/rostests/apitests/com/shdocvw.c trunk/rostests/apitests/com/shell32.c Modified: trunk/rostests/apitests/com/browseui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/browseui.c?r… ============================================================================== --- trunk/rostests/apitests/com/browseui.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/browseui.c [iso-8859-1] Sat Feb 14 12:59:16 2015 @@ -22,6 +22,17 @@ } }, { + ID_NAME(CLSID_ACListISF), + { + { 0x0, &IID_IEnumString }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IACList2 }, + { 0x4, &IID_IACList }, + { 0xc, &IID_IShellService }, + { 0x10, &IID_IPersistFolder }, + } + }, + { ID_NAME(CLSID_AddressEditBox), { { 0x0, &IID_IWinEventHandler }, @@ -54,6 +65,17 @@ { 0x4, &IID_IShellFolder2 }, { 0x8, &IID_IShellService }, { 0x10, &IID_IDropTarget }, + } + }, + { + ID_NAME(CLSID_AutoComplete), + { + { 0x0, &IID_IAutoComplete2 }, + { 0x0, &IID_IAutoComplete }, + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IEnumString }, + { 0xc, &IID_IAccessible }, + { 0xc, &IID_IDispatch }, } }, { Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Sat Feb 14 12:59:16 2015 @@ -79,6 +79,7 @@ DEFINE_GUID(CLSID_MenuDeskBar, 0xECD4FC4F, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); DEFINE_GUID(CLSID_MenuToolbarBase, 0x40b96610, 0xb522, 0x11d1, 0xb3, 0xb4, 0x00, 0xaa, 0x00, 0x6e, 0xfd, 0xe7); DEFINE_GUID(CLSID_MoveToMenu, 0xC2FBB631, 0x2971, 0x11D1, 0xA1, 0x8C, 0x00, 0xC0, 0x4F, 0xD7, 0x5D, 0x13); +DEFINE_GUID(CLSID_MruLongList, 0x53BD6B4E, 0x3780, 0x4693, 0xAF, 0xC3, 0x71, 0x61, 0xC2, 0xF3, 0xEE, 0x9C); DEFINE_GUID(CLSID_QuickLinks, 0x0E5CBF21, 0xD15F, 0x11D0, 0x83, 0x01, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); DEFINE_GUID(CLSID_SendToMenu, 0x7BA4C740, 0x9E81, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); DEFINE_GUID(CLSID_ShellFolderView, 0x62112aa1, 0xebe4, 0x11cf, 0xa5, 0xfb, 0x00, 0x20, 0xaf, 0xe7, 0x29, 0x2d); Modified: trunk/rostests/apitests/com/shdocvw.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shdocvw.c?re… ============================================================================== --- trunk/rostests/apitests/com/shdocvw.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shdocvw.c [iso-8859-1] Sat Feb 14 12:59:16 2015 @@ -62,6 +62,12 @@ }, #endif { + ID_NAME(CLSID_MruLongList), + { + { 0x0, &IID_IUnknown }, + } + }, + { ID_NAME(CLSID_TaskbarList), { { 0x0, &IID_ITaskbarList2 }, Modified: trunk/rostests/apitests/com/shell32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shell32.c?re… ============================================================================== --- trunk/rostests/apitests/com/shell32.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shell32.c [iso-8859-1] Sat Feb 14 12:59:16 2015 @@ -13,6 +13,17 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { { + ID_NAME(CLSID_ControlPanel), + { + { 0x0, &IID_IUnknown }, + { 0x10, &IID_IPersistFolder2 }, + { 0x10, &IID_IPersistFolder }, + { 0x10, &IID_IPersist }, + { 0xbc, &IID_IShellFolder2 }, + { 0xbc, &IID_IShellFolder }, + } + }, + { ID_NAME(CLSID_CopyToMenu), { { 0x0, &IID_IContextMenu3 }, @@ -237,6 +248,46 @@ } }, { + ID_NAME(CLSID_MyComputer), + { + { 0x0, &IID_IUnknown }, + { 0x10, &IID_IPersistFolder2 }, + { 0x10, &IID_IPersistFolder }, + { 0x10, &IID_IPersist }, + { 0x64, &IID_IShellFolder2 }, + { 0x64, &IID_IShellFolder }, + } + }, + { + ID_NAME(CLSID_MyDocuments), + { + { -0x4, &IID_IPersistFolder }, + { -0x4, &IID_IPersist }, + { 0x0, &IID_IShellFolder2 }, + { 0x0, &IID_IShellFolder }, + { 0x0, &IID_IUnknown }, + { 0x70, &IID_IShellIcon }, + { 0x78, &IID_IPersistFolder3 }, + { 0x78, &IID_IPersistFolder2 }, + { 0x7c, &IID_IStorage }, + { 0x8c, &IID_IContextMenuCB }, + { 0x94, &IID_IOleCommandTarget }, + + } + }, + { + ID_NAME(CLSID_NetworkPlaces), + { + { 0x0, &IID_IUnknown }, + { 0x10, &IID_IPersistFolder3 }, + { 0x10, &IID_IPersistFolder2 }, + { 0x10, &IID_IPersistFolder }, + { 0x10, &IID_IPersist }, + { 0xcc, &IID_IShellFolder2 }, + { 0xcc, &IID_IShellFolder }, + } + }, + { ID_NAME(CLSID_NewMenu), { { -0xc, &IID_IObjectWithSite }, @@ -267,6 +318,25 @@ { 0x8, &IID_IShellMenu }, { 0xc, &IID_IWinEventHandler }, { 0x10, &IID_IShellMenuAcc }, + } + }, + { + ID_NAME(CLSID_Printers), + { + { 0x0, &IID_IShellFolder2 }, + { 0x0, &IID_IShellFolder }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IPersistFolder2 }, + { 0x4, &IID_IPersistFolder }, + { 0x4, &IID_IPersist }, + { 0x8, &IID_IContextMenuCB }, + } + }, + { + ID_NAME(CLSID_QueryAssociations), + { + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IQueryAssociations }, } }, { @@ -288,6 +358,20 @@ { 0x0, &IID_IShellFolderBand }, { 0x0, &IID_IUnknown }, { 0x94, &IID_IFolderBandPriv }, + } + }, + { + ID_NAME(CLSID_RecycleBin), + { + { 0x0, &IID_IPersistFolder2 }, + { 0x0, &IID_IPersistFolder }, + //{ 0x0, &IID_IPersist }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellFolder2 }, + { 0x4, &IID_IShellFolder }, + { 0x8, &IID_IContextMenu }, + { 0xc, &IID_IShellPropSheetExt }, + { 0x10, &IID_IShellExtInit }, } }, {

9 years, 10 months

← Newer
1
...
22
23
24
25
26
27
28
...
38
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 February 2015