Ros-diffs June 2019

ros-diffs@reactos.org

28 participants
288 discussions

[reactos] 01/01: [WIN32KNT_APITEST] Replace remaining TESTX() (#1609)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=347a74785e76e5bf89f4c… commit 347a74785e76e5bf89f4ce3e2a0794e4fc64d8ae Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Jun 4 04:48:04 2019 +0200 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jun 4 11:48:04 2019 +0900 [WIN32KNT_APITEST] Replace remaining TESTX() (#1609) Addendum to b7794e8112e31a58829bac63d44de53677318c3d. --- modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c | 4 ++-- modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c | 4 ++-- modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c | 4 ++-- modules/rostests/apitests/win32nt/win32nt.h | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c index cb5640db112..1eafc20b6a2 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c @@ -102,8 +102,8 @@ Test_IsSpecialState(HDC hdc, BOOL bMemDC) TEST(pt.x == 56); TEST(pt.y == 78); GetWindowExtEx(hdc, &sz); - TESTX(sz.cx == 123, "sz.cx == %ld\n", sz.cx); - TESTX(sz.cy == 456, "sz.cy == %ld\n", sz.cy); + ok(sz.cx == 123, "sz.cx == %ld\n", sz.cx); + ok(sz.cy == 456, "sz.cy == %ld\n", sz.cy); GetViewportExtEx(hdc, &sz); TEST(sz.cx == 234); TEST(sz.cy == 567); diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c index 2df139a5d7a..a5a2129987c 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c @@ -89,7 +89,7 @@ START_TEST(NtUserGetIconInfo) &bpp, FALSE) == TRUE); - TESTX(hInstStr.Buffer == NULL, "hInstStr.buffer : %p\n", hInstStr.Buffer); + ok(hInstStr.Buffer == NULL, "hInstStr.buffer : %p\n", hInstStr.Buffer); TEST((LPCTSTR)ResourceStr.Buffer == MAKEINTRESOURCE(IDI_ICON)); TEST(bpp == 32); @@ -101,7 +101,7 @@ START_TEST(NtUserGetIconInfo) &bpp, TRUE) == TRUE); - TESTX(hInstStr.Buffer == NULL, "hInstStr.buffer : %p\n", hInstStr.Buffer); + ok(hInstStr.Buffer == NULL, "hInstStr.buffer : %p\n", hInstStr.Buffer); TEST((LPCTSTR)ResourceStr.Buffer == MAKEINTRESOURCE(IDI_ICON)); TEST(bpp == 32); diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c index 33f7b26a598..1f0dfedbc95 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c @@ -398,8 +398,8 @@ Test_MetricKey(PCWSTR pwszVal, INT iVal) DWORD cbSize; cbSize = sizeof(szReg); - TESTX(QueryUserRegValueW(KEY_METRIC, pwszVal, &szReg, &cbSize, NULL) == ERROR_SUCCESS, "Value=%S\n", pwszVal); - TESTX(_wcsicmp(szReg, L"1") == 0, "Value=%S\n", pwszVal); + ok(QueryUserRegValueW(KEY_METRIC, pwszVal, &szReg, &cbSize, NULL) == ERROR_SUCCESS, "Value=%S\n", pwszVal); + ok(_wcsicmp(szReg, L"1") == 0, "Value=%S\n", pwszVal); } diff --git a/modules/rostests/apitests/win32nt/win32nt.h b/modules/rostests/apitests/win32nt/win32nt.h index 6b0f6178d98..001e15388da 100644 --- a/modules/rostests/apitests/win32nt/win32nt.h +++ b/modules/rostests/apitests/win32nt/win32nt.h @@ -31,7 +31,6 @@ #define TEST(x) ok(x, "TEST failed: %s\n", #x) #define RTEST(x) ok(x, "RTEST failed: %s\n", #x) -#define TESTX ok #define GdiHandleTable GdiQueryTable()

5 years, 6 months

[reactos] 01/01: [GDI32] Meta File Fix Ups

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f57320175fecbf3ea09f… commit 9f57320175fecbf3ea09f6a068c41642e1fc4d8b Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Mon Jun 3 15:49:14 2019 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Mon Jun 3 15:49:14 2019 -0500 [GDI32] Meta File Fix Ups Remove pointer hack. Safer since using wines Enhanced Meta headers with unknown wine magic information. --- win32ss/gdi/gdi32/objects/metafile.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/win32ss/gdi/gdi32/objects/metafile.c b/win32ss/gdi/gdi32/objects/metafile.c index e1a51fb69f4..42bd22ec93c 100644 --- a/win32ss/gdi/gdi32/objects/metafile.c +++ b/win32ss/gdi/gdi32/objects/metafile.c @@ -139,16 +139,22 @@ GdiCreateLocalMetaFilePict(HANDLE hmo) { static const WCHAR szDisplayW[] = { 'D','I','S','P','L','A','Y','\0' }; HENHMETAFILE hEMF; - PENHMETAHEADER pemh = (PENHMETAHEADER)Buffer; - - pInfo->mm = MM_ANISOTROPIC; - pInfo->xExt = pemh->rclFrame.right - pemh->rclFrame.left; // Width - pInfo->yExt = pemh->rclFrame.bottom - pemh->rclFrame.top; // Height + ENHMETAHEADER emh; hEMF = SetEnhMetaFileBits(nSize, Buffer); if (hEMF == NULL) goto Exit; + if (!GetEnhMetaFileHeader( hEMF, sizeof(emh), &emh )) + { + DeleteEnhMetaFile(hEMF); + goto Exit; + } + + pInfo->mm = MM_ANISOTROPIC; // wine uses MM_ISOTROPIC. + pInfo->xExt = emh.rclFrame.right - emh.rclFrame.left; // Width + pInfo->yExt = emh.rclFrame.bottom - emh.rclFrame.top; // Height + hDC = CreateDCW(szDisplayW, NULL, NULL, NULL); if (hDC) {

5 years, 6 months

[reactos] 01/01: Revert "[USER32] Make App Switcher use the owner window's icon (#1299)" (#1605)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a73c17fcd9d9bd96b443e… commit a73c17fcd9d9bd96b443ee4acf7804974d73853b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 3 08:47:43 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jun 3 08:47:43 2019 +0900 Revert "[USER32] Make App Switcher use the owner window's icon (#1299)" (#1605) This reverts commit 484943d04f0dc3f84b7c8e754d1d2505f0a41df3. --- win32ss/user/user32/controls/appswitch.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/win32ss/user/user32/controls/appswitch.c b/win32ss/user/user32/controls/appswitch.c index ac9c5d0ee24..737663a17db 100644 --- a/win32ss/user/user32/controls/appswitch.c +++ b/win32ss/user/user32/controls/appswitch.c @@ -165,24 +165,20 @@ void CompleteSwitch(BOOL doSwitch) BOOL CALLBACK EnumerateCallback(HWND window, LPARAM lParam) { HICON hIcon; - HWND hwndIcon, hwndOwner; UNREFERENCED_PARAMETER(lParam); - hwndOwner = GetWindow(window, GW_OWNER); - hwndIcon = (hwndOwner ? hwndOwner : window); - // First try to get the big icon assigned to the window - hIcon = (HICON)SendMessageW(hwndIcon, WM_GETICON, ICON_BIG, 0); + hIcon = (HICON)SendMessageW(window, WM_GETICON, ICON_BIG, 0); if (!hIcon) { // If no icon is assigned, try to get the icon assigned to the windows' class - hIcon = (HICON)GetClassLongPtrW(hwndIcon, GCL_HICON); + hIcon = (HICON)GetClassLongPtrW(window, GCL_HICON); if (!hIcon) { // If we still don't have an icon, see if we can do with the small icon, // or a default application icon - hIcon = (HICON)SendMessageW(hwndIcon, WM_GETICON, ICON_SMALL2, 0); + hIcon = (HICON)SendMessageW(window, WM_GETICON, ICON_SMALL2, 0); if (!hIcon) { // using windows logo icon as default

5 years, 6 months

[reactos] 01/01: [STORPORT] Detect attached devices

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be88574f5953bfc3e08f1… commit be88574f5953bfc3e08f1ed7c094387adc34cf7e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jun 2 23:30:02 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jun 2 23:30:02 2019 +0200 [STORPORT] Detect attached devices --- drivers/storage/port/storport/fdo.c | 220 ++++++++++--------------------- drivers/storage/port/storport/precomp.h | 9 ++ drivers/storage/port/storport/storport.c | 14 ++ 3 files changed, 94 insertions(+), 149 deletions(-) diff --git a/drivers/storage/port/storport/fdo.c b/drivers/storage/port/storport/fdo.c index e20fd68bcc2..a2be47c30e0 100644 --- a/drivers/storage/port/storport/fdo.c +++ b/drivers/storage/port/storport/fdo.c @@ -244,29 +244,26 @@ PortFdoStartDevice( static NTSTATUS -SpiSendInquiry(IN PDEVICE_OBJECT DeviceObject, - ULONG Bus, ULONG Target, ULONG Lun) +PortSendInquiry( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ ULONG Bus, + _In_ ULONG Target, + _In_ ULONG Lun) { -// IO_STATUS_BLOCK IoStatusBlock; -// PIO_STACK_LOCATION IrpStack; -// KEVENT Event; -// KIRQL Irql; -// PIRP Irp; - NTSTATUS Status; PINQUIRYDATA InquiryBuffer; PUCHAR /*PSENSE_DATA*/ SenseBuffer; -// BOOLEAN KeepTrying = TRUE; -// ULONG RetryCount = 0; + BOOLEAN KeepTrying = TRUE; + ULONG RetryCount = 0; SCSI_REQUEST_BLOCK Srb; PCDB Cdb; -// PSCSI_PORT_LUN_EXTENSION LunExtension; -// PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; - -PFDO_DEVICE_EXTENSION DeviceExtension; + PFDO_DEVICE_EXTENSION DeviceExtension; PVOID SrbExtension = NULL; BOOLEAN ret; + PUNIT_DATA UnitData; + NTSTATUS Status; - DPRINT1("SpiSendInquiry() called\n"); + DPRINT("PortSendInquiry(%p %lu %lu %lu)\n", + DeviceObject, Bus, Target, Lun); DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -283,7 +280,9 @@ PFDO_DEVICE_EXTENSION DeviceExtension; if (DeviceExtension->Miniport.PortConfig.SrbExtensionSize != 0) { - SrbExtension = ExAllocatePoolWithTag(NonPagedPool, DeviceExtension->Miniport.PortConfig.SrbExtensionSize, TAG_SENSE_DATA); + SrbExtension = ExAllocatePoolWithTag(NonPagedPool, + DeviceExtension->Miniport.PortConfig.SrbExtensionSize, + TAG_SENSE_DATA); if (SrbExtension == NULL) { ExFreePoolWithTag(SenseBuffer, TAG_SENSE_DATA); @@ -292,33 +291,8 @@ PFDO_DEVICE_EXTENSION DeviceExtension; } } -// while (KeepTrying) + while (KeepTrying) { - /* Initialize event for waiting */ -// KeInitializeEvent(&Event, -// NotificationEvent, -// FALSE); - - /* Create an IRP */ -// Irp = IoBuildDeviceIoControlRequest(IOCTL_SCSI_EXECUTE_IN, -// DeviceObject, -// NULL, -// 0, -// InquiryBuffer, -// INQUIRYDATABUFFERSIZE, -// TRUE, -// &Event, -// &IoStatusBlock); -// if (Irp == NULL) -// { -// DPRINT1("IoBuildDeviceIoControlRequest() failed\n"); - - /* Quit the loop */ -// Status = STATUS_INSUFFICIENT_RESOURCES; -// KeepTrying = FALSE; -// continue; -// } - /* Prepare SRB */ RtlZeroMemory(&Srb, sizeof(SCSI_REQUEST_BLOCK)); @@ -340,134 +314,79 @@ PFDO_DEVICE_EXTENSION DeviceExtension; Srb.SrbExtension = SrbExtension; - /* Attach Srb to the Irp */ -// IrpStack = IoGetNextIrpStackLocation(Irp); -// IrpStack->Parameters.Scsi.Srb = &Srb; - /* Fill in CDB */ Cdb = (PCDB)Srb.Cdb; - Cdb->CDB6INQUIRY.OperationCode = SCSIOP_INQUIRY; - Cdb->CDB6INQUIRY.LogicalUnitNumber = Lun; - Cdb->CDB6INQUIRY.AllocationLength = INQUIRYDATABUFFERSIZE; - - /* Call the driver */ - - + Cdb->CDB6INQUIRY3.OperationCode = SCSIOP_INQUIRY; + Cdb->CDB6INQUIRY3.EnableVitalProductData = 1; + Cdb->CDB6INQUIRY3.CommandSupportData = 0; + Cdb->CDB6INQUIRY3.PageCode = 0; //?? + Cdb->CDB6INQUIRY3.AllocationLength = INQUIRYDATABUFFERSIZE; + Cdb->CDB6INQUIRY3.Control = 0; + + /* Call the miniport driver */ ret = MiniportStartIo(&DeviceExtension->Miniport, &Srb); -DPRINT1("MiniportStartIo returned %u\n", ret); - -// Status = IoCallDriver(DeviceObject, Irp); - - /* Wait for it to complete */ -// if (Status == STATUS_PENDING) -// { -// DPRINT1("SpiSendInquiry(): Waiting for the driver to process request...\n"); -// KeWaitForSingleObject(&Event, -// Executive, -// KernelMode, -// FALSE, -// NULL); -// Status = IoStatusBlock.Status; -// } - -// DPRINT1("SpiSendInquiry(): Request processed by driver, status = 0x%08X\n", Status); - - if (SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_SUCCESS) + if (ret == FALSE) { - /* All fine, copy data over */ -// RtlCopyMemory(LunInfo->InquiryData, -// InquiryBuffer, -// INQUIRYDATABUFFERSIZE); - - /* Quit the loop */ - Status = STATUS_SUCCESS; -// KeepTrying = FALSE; -// continue; + Status = STATUS_IO_DEVICE_ERROR; + KeepTrying = FALSE; + continue; } - DPRINT("Inquiry SRB failed with SrbStatus 0x%08X\n", Srb.SrbStatus); -#if 0 - /* Check if the queue is frozen */ - if (Srb.SrbStatus & SRB_STATUS_QUEUE_FROZEN) + DPRINT("SrbStatus 0x%08lx\n", Srb.SrbStatus); + if (SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_SUCCESS) { - /* Something weird happened, deal with it (unfreeze the queue) */ - KeepTrying = FALSE; + DPRINT("Found a device!\n"); - DPRINT("SpiSendInquiry(): the queue is frozen at TargetId %d\n", Srb.TargetId); - - LunExtension = SpiGetLunExtension(DeviceExtension, - LunInfo->PathId, - LunInfo->TargetId, - LunInfo->Lun); - - /* Clear frozen flag */ - LunExtension->Flags &= ~LUNEX_FROZEN_QUEUE; - - /* Acquire the spinlock */ - KeAcquireSpinLock(&DeviceExtension->SpinLock, &Irql); - - /* Process the request */ - SpiGetNextRequestFromLun(DeviceObject->DeviceExtension, LunExtension); - - /* SpiGetNextRequestFromLun() releases the spinlock, - so we just lower irql back to what it was before */ - KeLowerIrql(Irql); - } + UnitData = ExAllocatePool(NonPagedPool, sizeof(UNIT_DATA)); + if (UnitData == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + KeepTrying = FALSE; + continue; + } - /* Check if data overrun happened */ - if (SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_DATA_OVERRUN) - { - DPRINT("Data overrun at TargetId %d\n", LunInfo->TargetId); + /* All fine, copy data over */ + RtlCopyMemory(&UnitData->InquiryData, + Srb.DataBuffer, + Srb.DataTransferLength); - /* Nothing dramatic, just copy data, but limiting the size */ - RtlCopyMemory(LunInfo->InquiryData, - InquiryBuffer, - (Srb.DataTransferLength > INQUIRYDATABUFFERSIZE) ? - INQUIRYDATABUFFERSIZE : Srb.DataTransferLength); + InsertTailList(&DeviceExtension->UnitListHead, + &UnitData->ListEntry); + DeviceExtension->UnitCount++; /* Quit the loop */ Status = STATUS_SUCCESS; KeepTrying = FALSE; + continue; } - else if ((Srb.SrbStatus & SRB_STATUS_AUTOSENSE_VALID) && - SenseBuffer->SenseKey == SCSI_SENSE_ILLEGAL_REQUEST) - { - /* LUN is not valid, but some device responds there. - Mark it as invalid anyway */ - /* Quit the loop */ - Status = STATUS_INVALID_DEVICE_REQUEST; - KeepTrying = FALSE; + DPRINT("Inquiry SRB failed with SrbStatus 0x%08X\n", Srb.SrbStatus); + + /* Retry a couple of times if no timeout happened */ + if ((RetryCount < 2) && + (SRB_STATUS(Srb.SrbStatus) != SRB_STATUS_NO_DEVICE) && + (SRB_STATUS(Srb.SrbStatus) != SRB_STATUS_SELECTION_TIMEOUT)) + { + RetryCount++; + KeepTrying = TRUE; } else { - /* Retry a couple of times if no timeout happened */ - if ((RetryCount < 2) && - (SRB_STATUS(Srb.SrbStatus) != SRB_STATUS_NO_DEVICE) && - (SRB_STATUS(Srb.SrbStatus) != SRB_STATUS_SELECTION_TIMEOUT)) + /* That's all, quit the loop */ + KeepTrying = FALSE; + + /* Set status according to SRB status */ + if (SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_BAD_FUNCTION || + SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_BAD_SRB_BLOCK_LENGTH) { - RetryCount++; - KeepTrying = TRUE; + Status = STATUS_INVALID_DEVICE_REQUEST; } else { - /* That's all, quit the loop */ - KeepTrying = FALSE; - - /* Set status according to SRB status */ - if (SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_BAD_FUNCTION || - SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_BAD_SRB_BLOCK_LENGTH) - { - Status = STATUS_INVALID_DEVICE_REQUEST; - } - else - { - Status = STATUS_IO_DEVICE_ERROR; - } + Status = STATUS_IO_DEVICE_ERROR; } } -#endif } /* Free buffers */ @@ -477,7 +396,7 @@ DPRINT1("MiniportStartIo returned %u\n", ret); ExFreePoolWithTag(SenseBuffer, TAG_SENSE_DATA); ExFreePoolWithTag(InquiryBuffer, TAG_INQUIRY_DATA); - DPRINT("SpiSendInquiry() done with Status 0x%08X\n", Status); + DPRINT("PortSendInquiry() returns 0x%08lx\n", Status); return Status; } @@ -491,7 +410,6 @@ PortFdoScanBus( ULONG Bus, Target, Lun; NTSTATUS Status; - DPRINT1("PortFdoScanBus(%p)\n", DeviceExtension); @@ -514,13 +432,15 @@ PortFdoScanBus( { DPRINT1(" Scanning logical unit %ld:%ld:%ld\n", Bus, Target, Lun); - Status = SpiSendInquiry(DeviceExtension->Device, Bus, Target, Lun); - DPRINT1("SpiSendInquiry returned 0x%08lx\n", Status); + Status = PortSendInquiry(DeviceExtension->Device, Bus, Target, Lun); + DPRINT1("PortSendInquiry returned 0x%08lx\n", Status); + if (!NT_SUCCESS(Status)) + break; } } } - DPRINT1("Done!\n"); + DPRINT("Done!\n"); return STATUS_SUCCESS; } @@ -539,6 +459,8 @@ PortFdoQueryBusRelations( Status = PortFdoScanBus(DeviceExtension); + DPRINT1("Units found: %lu\n", DeviceExtension->UnitCount); + *Information = 0; return Status; diff --git a/drivers/storage/port/storport/precomp.h b/drivers/storage/port/storport/precomp.h index 84925ef1bc6..046dd0b186a 100644 --- a/drivers/storage/port/storport/precomp.h +++ b/drivers/storage/port/storport/precomp.h @@ -81,6 +81,12 @@ typedef struct _MINIPORT PMINIPORT_DEVICE_EXTENSION MiniportExtension; } MINIPORT, *PMINIPORT; +typedef struct _UNIT_DATA +{ + LIST_ENTRY ListEntry; + INQUIRYDATA InquiryData; +} UNIT_DATA, *PUNIT_DATA; + typedef struct _FDO_DEVICE_EXTENSION { EXTENSION_TYPE ExtensionType; @@ -105,6 +111,9 @@ typedef struct _FDO_DEVICE_EXTENSION PHW_PASSIVE_INITIALIZE_ROUTINE HwPassiveInitRoutine; PKINTERRUPT Interrupt; ULONG InterruptIrql; + + ULONG UnitCount; + LIST_ENTRY UnitListHead; } FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; diff --git a/drivers/storage/port/storport/storport.c b/drivers/storage/port/storport/storport.c index 03ec5639491..5bed3915af7 100644 --- a/drivers/storage/port/storport/storport.c +++ b/drivers/storage/port/storport/storport.c @@ -223,6 +223,8 @@ PortAddDevice( DeviceExtension->PnpState = dsStopped; + InitializeListHead(&DeviceExtension->UnitListHead); + /* Attach the FDO to the device stack */ Status = IoAttachDeviceToDeviceStackSafe(Fdo, PhysicalDeviceObject, @@ -1104,6 +1106,7 @@ StorPortNotification( STOR_SPINLOCK SpinLock; PVOID LockContext; PSTOR_LOCK_HANDLE LockHandle; + PSCSI_REQUEST_BLOCK Srb; DPRINT1("StorPortNotification(%x %p)\n", NotificationType, HwDeviceExtension); @@ -1124,6 +1127,17 @@ StorPortNotification( switch (NotificationType) { + case RequestComplete: + DPRINT1("RequestComplete\n"); + Srb = (PSCSI_REQUEST_BLOCK)va_arg(ap, PSCSI_REQUEST_BLOCK); + DPRINT1("Srb %p\n", Srb); + if (Srb->OriginalRequest != NULL) + { + DPRINT1("Need to complete the IRP!\n"); + + } + break; + case GetExtendedFunctionTable: DPRINT1("GetExtendedFunctionTable\n"); ppExtendedFunctions = (PSTORPORT_EXTENDED_FUNCTIONS*)va_arg(ap, PSTORPORT_EXTENDED_FUNCTIONS*);

5 years, 6 months

[reactos] 01/01: [NTOSKRNL] Add support for global DOS directory in ObpLookupEntryDirectory If any exists, we'll loop over in that directory, trying to find the object

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd4752450f9453aa9c635… commit fd4752450f9453aa9c635d87bed6b7a340fd1713 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Jun 2 21:44:45 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jun 2 21:46:35 2019 +0200 [NTOSKRNL] Add support for global DOS directory in ObpLookupEntryDirectory If any exists, we'll loop over in that directory, trying to find the object --- ntoskrnl/ob/obdir.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ob/obdir.c b/ntoskrnl/ob/obdir.c index f8e3a36a06a..83d05d4beb9 100644 --- a/ntoskrnl/ob/obdir.c +++ b/ntoskrnl/ob/obdir.c @@ -92,6 +92,42 @@ ObpInsertEntryDirectory(IN POBJECT_DIRECTORY Parent, return TRUE; } +/*++ +* @name ObpGetShadowDirectory +* +* The ObpGetShadowDirectory routine <FILLMEIN>. +* +* @param Directory +* <FILLMEIN>. +* +* @return Pointer to the global DOS directory if any, or NULL otherwise. +* +* @remarks None. +* +*--*/ +POBJECT_DIRECTORY +NTAPI +ObpGetShadowDirectory(IN POBJECT_DIRECTORY Directory) +{ + PDEVICE_MAP DeviceMap; + POBJECT_DIRECTORY GlobalDosDirectory = NULL; + + /* Acquire the device map lock */ + KeAcquireGuardedMutex(&ObpDeviceMapLock); + + /* Get the global DOS directory if any */ + DeviceMap = Directory->DeviceMap; + if (DeviceMap != NULL) + { + GlobalDosDirectory = DeviceMap->GlobalDosDevicesDirectory; + } + + /* Release the devicemap lock */ + KeReleaseGuardedMutex(&ObpDeviceMapLock); + + return GlobalDosDirectory; +} + /*++ * @name ObpLookupEntryDirectory * @@ -137,6 +173,7 @@ ObpLookupEntryDirectory(IN POBJECT_DIRECTORY Directory, POBJECT_DIRECTORY_ENTRY CurrentEntry; PVOID FoundObject = NULL; PWSTR Buffer; + POBJECT_DIRECTORY ShadowDirectory; PAGED_CODE(); /* Check if we should search the shadow directory */ @@ -181,6 +218,7 @@ ObpLookupEntryDirectory(IN POBJECT_DIRECTORY Directory, AllocatedEntry = &Directory->HashBuckets[HashIndex]; LookupBucket = AllocatedEntry; +DoItAgain: /* Check if the directory is already locked */ if (!Context->DirectoryLocked) { @@ -250,8 +288,13 @@ ObpLookupEntryDirectory(IN POBJECT_DIRECTORY Directory, /* Check if we should scan the shadow directory */ if ((SearchShadow) && (Directory->DeviceMap)) { - /* FIXME: We don't support this yet */ - ASSERT(FALSE); + ShadowDirectory = ObpGetShadowDirectory(Directory); + /* A global DOS directory was found, loop it again */ + if (ShadowDirectory != NULL) + { + Directory = ShadowDirectory; + goto DoItAgain; + } } }

5 years, 6 months

[reactos] 02/02: [WIN32KNT_APITEST:NTDD] Improve failure handling

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=92a9a445ddf2a43e69fd5… commit 92a9a445ddf2a43e69fd5db1322d674b8203a892 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Sep 21 00:58:14 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jun 2 19:10:30 2019 +0200 [WIN32KNT_APITEST:NTDD] Improve failure handling And remove comments about ReactX. ROSTESTS-315 --- .../win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c | 31 +++++++++++++++----- .../win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c | 33 ++++++++++++++++------ .../win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c | 26 ++++++++--------- 3 files changed, 62 insertions(+), 28 deletions(-) diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c index eb07b83d64b..4e0f5c8ec4f 100644 --- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c +++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c @@ -11,13 +11,30 @@ START_TEST(NtGdiDdCreateDirectDrawObject) { HANDLE hDirectDraw; HDC hdc = CreateDCW(L"DISPLAY", NULL, NULL, NULL); - ok(hdc != NULL, "\n"); + ok(hdc != NULL, "CreateDCW() failed\n"); - /* Test ReactX */ - ok(NtGdiDdCreateDirectDrawObject(NULL) == NULL, "\n"); - ok((hDirectDraw = NtGdiDdCreateDirectDrawObject(hdc)) != NULL, "\n"); + hDirectDraw = NtGdiDdCreateDirectDrawObject(NULL); + ok(hDirectDraw == NULL, + "NtGdiDdCreateDirectDrawObject() succeeded on NULL device context\n"); + if (hDirectDraw != NULL) + { + ok(NtGdiDdDeleteDirectDrawObject(hDirectDraw) == TRUE, + "NtGdiDdDeleteDirectDrawObject() failed on unwanted object\n"); + } - /* Cleanup ReactX setup */ - DeleteDC(hdc); - NtGdiDdDeleteDirectDrawObject(hDirectDraw); + if (hdc == NULL) + { + skip("No DC\n"); + return; + } + + hDirectDraw = NtGdiDdCreateDirectDrawObject(hdc); + ok(hDirectDraw != NULL, "NtGdiDdCreateDirectDrawObject() failed\n"); + if (hDirectDraw != NULL) + { + ok(NtGdiDdDeleteDirectDrawObject(hDirectDraw) == TRUE, + "NtGdiDdDeleteDirectDrawObject() failed\n"); + } + + ok(DeleteDC(hdc) != 0, "DeleteDC() failed\n"); } diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c index 00ee1f57c52..78d1af7a325 100644 --- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c +++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c @@ -11,14 +11,31 @@ START_TEST(NtGdiDdDeleteDirectDrawObject) { HANDLE hDirectDraw; HDC hdc = CreateDCW(L"DISPLAY", NULL, NULL, NULL); - ok(hdc != NULL, "\n"); + ok(hdc != NULL, "CreateDCW() failed\n"); - /* Test ReactX */ - ok(NtGdiDdDeleteDirectDrawObject(NULL) == FALSE, "\n"); - ok((hDirectDraw=NtGdiDdCreateDirectDrawObject(hdc)) != NULL, "\n"); - ok(NtGdiDdDeleteDirectDrawObject(hDirectDraw) == TRUE, "\n"); + ok(NtGdiDdDeleteDirectDrawObject(NULL) == FALSE, + "NtGdiDdDeleteDirectDrawObject() succeeded on NULL object\n"); - /* Cleanup ReactX setup */ - DeleteDC(hdc); - NtGdiDdDeleteDirectDrawObject(hDirectDraw); + if (hdc == NULL) + { + skip("No DC\n"); + return; + } + + hDirectDraw = NtGdiDdCreateDirectDrawObject(hdc); + ok(hDirectDraw != NULL, "NtGdiDdCreateDirectDrawObject() failed\n"); + + if (hDirectDraw == NULL) + { + skip("No DirectDrawObject\n"); + ok(DeleteDC(hdc) != 0, "DeleteDC() failed\n"); + return; + } + + ok(NtGdiDdDeleteDirectDrawObject(hDirectDraw) == TRUE, + "NtGdiDdDeleteDirectDrawObject() failed on existing object\n"); + ok(NtGdiDdDeleteDirectDrawObject(hDirectDraw) == FALSE, + "NtGdiDdDeleteDirectDrawObject() succeeded on deleted object\n"); + + ok(DeleteDC(hdc) != 0, "DeleteDC() failed\n"); } diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c index ab3fb14b59b..e682b7d25fe 100644 --- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c +++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c @@ -15,7 +15,7 @@ */ START_TEST(NtGdiDdQueryDirectDrawObject) { - HANDLE hDirectDraw = NULL; + HANDLE hDirectDraw; DD_HALINFO *pHalInfo = NULL; DWORD *pCallBackFlags = NULL; LPD3DNTHAL_CALLBACKS puD3dCallbacks = NULL; @@ -68,16 +68,8 @@ START_TEST(NtGdiDdQueryDirectDrawObject) ASSERT(hdc != NULL); - /* Create ReactX handle */ - hDirectDraw = (HANDLE) NtGdiDdCreateDirectDrawObject(hdc); + hDirectDraw = NtGdiDdCreateDirectDrawObject(hdc); RTEST(hDirectDraw != NULL); - if (hDirectDraw == NULL) - { - DeleteDC(hdc); - return; - } - - /* Start Test ReactX NtGdiDdQueryDirectDrawObject function */ /* testing OsThunkDdQueryDirectDrawObject( NULL, .... */ RTEST(NtGdiDdQueryDirectDrawObject( NULL, pHalInfo, @@ -98,6 +90,13 @@ START_TEST(NtGdiDdQueryDirectDrawObject) RTEST(puNumHeaps == NULL); RTEST(puvmList == NULL); + if (hDirectDraw == NULL) + { + skip("No DirectDrawObject\n"); + ok(DeleteDC(hdc) != 0, "DeleteDC() failed\n"); + return; + } + /* testing NtGdiDdQueryDirectDrawObject( hDirectDrawLocal, NULL, .... */ RTEST(NtGdiDdQueryDirectDrawObject( hDirectDraw, pHalInfo, pCallBackFlags, puD3dCallbacks, @@ -797,7 +796,8 @@ START_TEST(NtGdiDdQueryDirectDrawObject) * puFourCC */ - /* Cleanup ReactX setup */ - DeleteDC(hdc); - NtGdiDdDeleteDirectDrawObject(hDirectDraw); + ok(NtGdiDdDeleteDirectDrawObject(hDirectDraw) == TRUE, + "NtGdiDdDeleteDirectDrawObject() failed\n"); + + ok(DeleteDC(hdc) != 0, "DeleteDC() failed\n"); }

5 years, 6 months

[reactos] 01/02: [FORMATTING] Add/Remove a few spaces

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba884619b0825ea761cfa… commit ba884619b0825ea761cfab7b1eb0eff073f8e1be Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Sep 21 17:28:51 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jun 2 19:10:30 2019 +0200 [FORMATTING] Add/Remove a few spaces --- .../rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c | 4 ++-- .../rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c | 4 ++-- modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c index ffc9eaa46a3..eb07b83d64b 100644 --- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c +++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c @@ -9,8 +9,8 @@ START_TEST(NtGdiDdCreateDirectDrawObject) { - HANDLE hDirectDraw; - HDC hdc = CreateDCW(L"DISPLAY",NULL,NULL,NULL); + HANDLE hDirectDraw; + HDC hdc = CreateDCW(L"DISPLAY", NULL, NULL, NULL); ok(hdc != NULL, "\n"); /* Test ReactX */ diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c index 7c719888660..00ee1f57c52 100644 --- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c +++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c @@ -9,8 +9,8 @@ START_TEST(NtGdiDdDeleteDirectDrawObject) { - HANDLE hDirectDraw; - HDC hdc = CreateDCW(L"DISPLAY",NULL,NULL,NULL); + HANDLE hDirectDraw; + HDC hdc = CreateDCW(L"DISPLAY", NULL, NULL, NULL); ok(hdc != NULL, "\n"); /* Test ReactX */ diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c index 1105860c6bb..ab3fb14b59b 100644 --- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c +++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c @@ -15,7 +15,7 @@ */ START_TEST(NtGdiDdQueryDirectDrawObject) { - HANDLE hDirectDraw = NULL; + HANDLE hDirectDraw = NULL; DD_HALINFO *pHalInfo = NULL; DWORD *pCallBackFlags = NULL; LPD3DNTHAL_CALLBACKS puD3dCallbacks = NULL; @@ -64,7 +64,7 @@ START_TEST(NtGdiDdQueryDirectDrawObject) EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode); /* Create hdc that we can use */ - hdc = CreateDCW(L"DISPLAY",NULL,NULL,NULL); + hdc = CreateDCW(L"DISPLAY", NULL, NULL, NULL); ASSERT(hdc != NULL);

5 years, 6 months

[reactos] 03/03: [USER32_APITEST:WNDPROC] Improve failure handling

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=620d8c01eabcc660d75b2… commit 620d8c01eabcc660d75b2eece42170ce71d20d28 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Sep 24 16:46:46 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jun 2 19:08:17 2019 +0200 [USER32_APITEST:WNDPROC] Improve failure handling ROSTESTS-316 --- modules/rostests/apitests/user32/WndProc.c | 59 +++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/modules/rostests/apitests/user32/WndProc.c b/modules/rostests/apitests/user32/WndProc.c index fddbd0fa20e..8c3049161b2 100644 --- a/modules/rostests/apitests/user32/WndProc.c +++ b/modules/rostests/apitests/user32/WndProc.c @@ -9,6 +9,8 @@ /* Used wine Redraw test for proof in principle. */ +#define WMPAINT_COUNT_THRESHOLD 10 + /* Global variables to trigger exit from loop */ static int redrawComplete, WMPAINT_count; @@ -32,13 +34,14 @@ static LRESULT WINAPI redraw_window_procA( switch (msg) { case WM_PAINT: - trace("doing WM_PAINT %d\n", WMPAINT_count); WMPAINT_count++; + trace("Doing WM_PAINT %d/%d\n", WMPAINT_count, WMPAINT_COUNT_THRESHOLD); - if (WMPAINT_count > 10 && redrawComplete == 0) + if (WMPAINT_count > WMPAINT_COUNT_THRESHOLD && redrawComplete == 0) { PAINTSTRUCT ps; + trace("Calling *Paint()\n"); BeginPaint(hwnd, &ps); EndPaint(hwnd, &ps); return 1; @@ -47,11 +50,13 @@ static LRESULT WINAPI redraw_window_procA( // This will force one stack corruption "ret" fault with normal window // procedure callback. #ifdef __MINGW32__ + trace("Executing __MINGW32__ stack corruption code\n"); asm ("movl $0, %eax\n\t" "leave\n\t" "ret"); #elif defined(_M_IX86) //#ifdef _MSC_VER + trace("Executing MSVC x86 stack corruption code\n"); __asm { mov eax, 0 @@ -59,16 +64,22 @@ static LRESULT WINAPI redraw_window_procA( ret } #else - trace("unimplemented\n"); + ok(FALSE, "FIXME: stack corruption code is unimplemented\n"); #endif + + break; + default: + trace("Doing empty default: msg = %u\n", msg); } + trace("Calling DefWindowProc()\n"); return DefWindowProc(hwnd, msg, wparam, lparam); } static void test_wndproc(void) { WNDCLASSA cls; + ATOM clsAtom; HWND hwndMain; cls.style = CS_DBLCLKS; @@ -82,32 +93,54 @@ static void test_wndproc(void) cls.lpszMenuName = NULL; cls.lpszClassName = "RedrawWindowClass"; - if (!RegisterClassA(&cls)) + clsAtom = RegisterClassA(&cls); + ok(clsAtom != 0, "RegisterClassA() failed: LastError = %lu\n", GetLastError()); + + if (clsAtom == 0) { - trace("Register failed %d\n", (int)GetLastError()); + skip("No Class atom\n"); return; } - hwndMain = CreateWindowA("RedrawWindowClass", "Main Window", WS_OVERLAPPEDWINDOW, + hwndMain = CreateWindowA(cls.lpszClassName, "Main Window", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 100, 100, NULL, NULL, NULL, NULL); + ok(hwndMain != NULL, "CreateWindowA() failed: LastError = %lu\n", GetLastError()); + + ok(WMPAINT_count == 0, + "Multiple unexpected WM_PAINT calls = %d\n", WMPAINT_count); + + if (hwndMain == NULL) + { + skip("No Window\n"); + ok(UnregisterClassA(cls.lpszClassName, cls.hInstance) != 0, + "UnregisterClassA() failed: LastError = %lu\n", GetLastError()); + return; + } - ok(WMPAINT_count == 0, "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count); ShowWindow(hwndMain, SW_SHOW); - ok(WMPAINT_count == 0, "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count); + ok(WMPAINT_count == 0, + "Multiple unexpected WM_PAINT calls = %d\n", WMPAINT_count); + RedrawWindow(hwndMain, NULL, NULL, RDW_UPDATENOW | RDW_ALLCHILDREN); ok(WMPAINT_count == 1 || broken(WMPAINT_count == 0), /* sometimes on win9x */ - "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count); + "Multiple unexpected WM_PAINT calls = %d\n", WMPAINT_count); + redrawComplete = TRUE; - ok(WMPAINT_count < 10, "RedrawWindow (RDW_UPDATENOW) never completed (%d)\n", WMPAINT_count); + ok(WMPAINT_count < WMPAINT_COUNT_THRESHOLD, + "RedrawWindow (RDW_UPDATENOW) never completed (%d/%d)\n", + WMPAINT_count, WMPAINT_COUNT_THRESHOLD); + + ok(DestroyWindow(hwndMain) != 0, + "DestroyWindow() failed: LastError = %lu\n", GetLastError()); - /* clean up */ - DestroyWindow(hwndMain); + ok(UnregisterClassA(cls.lpszClassName, cls.hInstance) != 0, + "UnregisterClassA() failed: LastError = %lu\n", GetLastError()); } START_TEST(WndProc) { #ifdef __RUNTIME_CHECKS__ - skip("This test breaks MSVC runtime checks!"); + skip("This test breaks MSVC runtime checks!\n"); return; #endif /* __RUNTIME_CHECKS__ */

5 years, 6 months

[reactos] 02/03: [USER32_APITEST:WNDPROC] 0 to NULL

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c5d3ff03fbdc99b69c55c… commit c5d3ff03fbdc99b69c55c1350136ff95372e8ed5 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Sep 24 16:45:41 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jun 2 19:08:17 2019 +0200 [USER32_APITEST:WNDPROC] 0 to NULL --- modules/rostests/apitests/user32/WndProc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/rostests/apitests/user32/WndProc.c b/modules/rostests/apitests/user32/WndProc.c index 8c08b083fed..fddbd0fa20e 100644 --- a/modules/rostests/apitests/user32/WndProc.c +++ b/modules/rostests/apitests/user32/WndProc.c @@ -75,9 +75,9 @@ static void test_wndproc(void) cls.lpfnWndProc = (WNDPROC)redraw_window_procA; cls.cbClsExtra = 0; cls.cbWndExtra = 0; - cls.hInstance = GetModuleHandleA(0); - cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, IDC_ARROW); + cls.hInstance = GetModuleHandleA(NULL); + cls.hIcon = NULL; + cls.hCursor = LoadCursorA(NULL, IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "RedrawWindowClass"; @@ -89,7 +89,7 @@ static void test_wndproc(void) } hwndMain = CreateWindowA("RedrawWindowClass", "Main Window", WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, 0, 100, 100, NULL, NULL, 0, NULL); + CW_USEDEFAULT, 0, 100, 100, NULL, NULL, NULL, NULL); ok(WMPAINT_count == 0, "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count); ShowWindow(hwndMain, SW_SHOW);

5 years, 6 months

[reactos] 01/03: [FORMATTING] 3-spaces to 4-spaces

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a8b5ffc9193bc650b723… commit 9a8b5ffc9193bc650b723afc6afddf329070499a Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Sep 24 16:42:30 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jun 2 19:08:17 2019 +0200 [FORMATTING] 3-spaces to 4-spaces And a few additional formatting improvements. --- modules/rostests/apitests/user32/WndProc.c | 137 ++++++++++++++++------------- 1 file changed, 74 insertions(+), 63 deletions(-) diff --git a/modules/rostests/apitests/user32/WndProc.c b/modules/rostests/apitests/user32/WndProc.c index 185726f8cc2..8c08b083fed 100644 --- a/modules/rostests/apitests/user32/WndProc.c +++ b/modules/rostests/apitests/user32/WndProc.c @@ -13,85 +13,95 @@ static int redrawComplete, WMPAINT_count; /* - Force stack corruption when calling from assumed window procedure callback. - Adding (6 and) more will force exception faults and terminate the test program. - The test is with five and this is safe for windows. - - But,,,, ReactOS compiled with GCC can handle this,,,,,, + * Force stack corruption when calling from assumed window procedure callback. + * Adding (6 and) more will force exception faults and terminate the test program. + * The test is with five and this is safe for windows. + * + * But,,,, ReactOS compiled with GCC can handle this,,,,,, */ -static LRESULT WINAPI redraw_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD ExtraData,DWORD ExtraData1,DWORD ExtraData2,DWORD ExtraData3) +static LRESULT WINAPI redraw_window_procA( + HWND hwnd, + UINT msg, + WPARAM wparam, + LPARAM lparam, + DWORD ExtraData, + DWORD ExtraData1, + DWORD ExtraData2, + DWORD ExtraData3) { switch (msg) { - case WM_PAINT: - trace("doing WM_PAINT %d\n", WMPAINT_count); - WMPAINT_count++; - if (WMPAINT_count > 10 && redrawComplete == 0) - { - PAINTSTRUCT ps; - BeginPaint(hwnd, &ps); - EndPaint(hwnd, &ps); - return 1; - } - /* - This will force one stack corruption "ret" fault with normal window - procedure callback. - */ + case WM_PAINT: + trace("doing WM_PAINT %d\n", WMPAINT_count); + WMPAINT_count++; + + if (WMPAINT_count > 10 && redrawComplete == 0) + { + PAINTSTRUCT ps; + + BeginPaint(hwnd, &ps); + EndPaint(hwnd, &ps); + return 1; + } + + // This will force one stack corruption "ret" fault with normal window + // procedure callback. #ifdef __MINGW32__ - asm ("movl $0, %eax\n\t" - "leave\n\t" - "ret"); + asm ("movl $0, %eax\n\t" + "leave\n\t" + "ret"); #elif defined(_M_IX86) //#ifdef _MSC_VER - __asm - { - mov eax, 0 - leave - ret - } + __asm + { + mov eax, 0 + leave + ret + } #else - trace("unimplemented\n"); + trace("unimplemented\n"); #endif } + return DefWindowProc(hwnd, msg, wparam, lparam); } static void test_wndproc(void) { - WNDCLASSA cls; - HWND hwndMain; - - cls.style = CS_DBLCLKS; - cls.lpfnWndProc = (WNDPROC)redraw_window_procA; - cls.cbClsExtra = 0; - cls.cbWndExtra = 0; - cls.hInstance = GetModuleHandleA(0); - cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, IDC_ARROW); - cls.hbrBackground = GetStockObject(WHITE_BRUSH); - cls.lpszMenuName = NULL; - cls.lpszClassName = "RedrawWindowClass"; - - if (!RegisterClassA(&cls)) - { - trace("Register failed %d\n", (int)GetLastError()); - return; - } - - hwndMain = CreateWindowA("RedrawWindowClass", "Main Window", WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, 0, 100, 100, NULL, NULL, 0, NULL); - - ok( WMPAINT_count == 0, "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count); - ShowWindow(hwndMain, SW_SHOW); - ok( WMPAINT_count == 0, "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count); - RedrawWindow(hwndMain, NULL,NULL,RDW_UPDATENOW | RDW_ALLCHILDREN); - ok( WMPAINT_count == 1 || broken(WMPAINT_count == 0), /* sometimes on win9x */ + WNDCLASSA cls; + HWND hwndMain; + + cls.style = CS_DBLCLKS; + cls.lpfnWndProc = (WNDPROC)redraw_window_procA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "RedrawWindowClass"; + + if (!RegisterClassA(&cls)) + { + trace("Register failed %d\n", (int)GetLastError()); + return; + } + + hwndMain = CreateWindowA("RedrawWindowClass", "Main Window", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, 0, 100, 100, NULL, NULL, 0, NULL); + + ok(WMPAINT_count == 0, "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count); + ShowWindow(hwndMain, SW_SHOW); + ok(WMPAINT_count == 0, "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count); + RedrawWindow(hwndMain, NULL, NULL, RDW_UPDATENOW | RDW_ALLCHILDREN); + ok(WMPAINT_count == 1 || broken(WMPAINT_count == 0), /* sometimes on win9x */ "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count); - redrawComplete = TRUE; - ok( WMPAINT_count < 10, "RedrawWindow (RDW_UPDATENOW) never completed (%d)\n", WMPAINT_count); + redrawComplete = TRUE; + ok(WMPAINT_count < 10, "RedrawWindow (RDW_UPDATENOW) never completed (%d)\n", WMPAINT_count); - /* clean up */ - DestroyWindow( hwndMain); + /* clean up */ + DestroyWindow(hwndMain); } START_TEST(WndProc) @@ -100,5 +110,6 @@ START_TEST(WndProc) skip("This test breaks MSVC runtime checks!"); return; #endif /* __RUNTIME_CHECKS__ */ - test_wndproc(); + + test_wndproc(); }

5 years, 6 months

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 June 2019