Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 46726: [WIN32K] Also send message to desktop window with HWND_BROADCAST.
by jgardou＠svn.reactos.org 04 Apr '10

04 Apr '10

Author: jgardou Date: Mon Apr 5 01:20:02 2010 New Revision: 46726 URL: http://svn.reactos.org/svn/reactos?rev=46726&view=rev Log: [WIN32K] Also send message to desktop window with HWND_BROADCAST. Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/message.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Apr 5 01:20:02 2010 @@ -366,7 +366,7 @@ (LPARAM)Time, sizeof(LPARAM)); } - return 0; + return 0; } else { @@ -591,7 +591,7 @@ *HitTest = HTCLIENT; } - if ( gspv.bMouseClickLock && + if ( gspv.bMouseClickLock && ( (Msg->message == WM_LBUTTONUP) || (Msg->message == WM_LBUTTONDOWN) ) ) { @@ -1206,7 +1206,7 @@ return FALSE; } - if (!Wnd) + if (!Wnd) return UserPostThreadMessage( PtrToInt(PsGetCurrentThreadId()), Msg, wParam, @@ -1223,6 +1223,7 @@ if (List != NULL) { + UserPostMessage(DesktopWindow->hSelf, Msg, wParam, lParam); for (i = 0; List[i]; i++) UserPostMessage(List[i], Msg, wParam, lParam); ExFreePool(List); @@ -1447,6 +1448,9 @@ SetLastWin32Error(ERROR_INTERNAL_ERROR); return 0; } + + /* Send message to the desktop window too! */ + co_IntSendMessageTimeoutSingle(DesktopWindow->hSelf, Msg, wParam, lParam, uFlags, uTimeout, uResult); Children = IntWinListChildren(DesktopWindow); if (NULL == Children) @@ -1653,6 +1657,7 @@ if (List != NULL) { + UserSendNotifyMessage(DesktopWindow->hSelf, Msg, wParam, lParam); for (i = 0; List[i]; i++) { UserSendNotifyMessage(List[i], Msg, wParam, lParam); @@ -2263,7 +2268,7 @@ BOOL Hit = FALSE; MSG SafeMsg; - UserEnterExclusive(); + UserEnterExclusive(); _SEH2_TRY { ProbeForRead(UnsafeMsgInfo, sizeof(MSG), 1); @@ -2275,7 +2280,7 @@ Hit = TRUE; } _SEH2_END; - + if (!Hit) Res = IntDispatchMessage(&SafeMsg); UserLeave(); @@ -2496,11 +2501,11 @@ { BadChk = TRUE; } - _SEH2_END; + _SEH2_END; } break; default: - break; + break; } UserLeave();

1 0

[jgardou] 46725: [EXPLORER] Handle WM_DISPLAYCHANGE message. Works on WinXP, but not with the branch
by jgardou＠svn.reactos.org 04 Apr '10

04 Apr '10

Author: jgardou Date: Mon Apr 5 00:03:53 2010 New Revision: 46725 URL: http://svn.reactos.org/svn/reactos?rev=46725&view=rev Log: [EXPLORER] Handle WM_DISPLAYCHANGE message. Works on WinXP, but not with the branch Modified: branches/reactos-yarotows/base/shell/explorer/desktop/desktop.cpp Modified: branches/reactos-yarotows/base/shell/explorer/desktop/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/shell/exp… ============================================================================== --- branches/reactos-yarotows/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] (original) +++ branches/reactos-yarotows/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] Mon Apr 5 00:03:53 2010 @@ -435,6 +435,12 @@ explorer_show_frame(SW_SHOWNORMAL); break; + case WM_DISPLAYCHANGE: + MoveWindow(_hwnd, 0, 0, LOWORD(lparam), HIWORD(lparam), TRUE); + MoveWindow(g_Globals._hwndShellView, 0, 0, LOWORD(lparam), HIWORD(lparam), TRUE); + MoveWindow(_desktopBar, 0, HIWORD(lparam) - DESKTOPBARBAR_HEIGHT, LOWORD(lparam), DESKTOPBARBAR_HEIGHT, TRUE); + break; + case WM_GETISHELLBROWSER: return (LRESULT)static_cast<IShellBrowser*>(this);

1 0

[cgutman] 46724: [NTOSKRNL] - Revert r46720 and fix the issue properly
by cgutman＠svn.reactos.org 04 Apr '10

04 Apr '10

Author: cgutman Date: Sun Apr 4 23:43:51 2010 New Revision: 46724 URL: http://svn.reactos.org/svn/reactos?rev=46724&view=rev Log: [NTOSKRNL] - Revert r46720 and fix the issue properly Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Sun Apr 4 23:43:51 2010 @@ -460,22 +460,6 @@ } else { - /* Check if we have an associated user IOSB */ - if (Irp->UserIosb) - { - /* We do, so let's give them the final status */ - _SEH2_TRY - { - /* Save the IOSB Information */ - *Irp->UserIosb = Irp->IoStatus; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Ignore any error */ - } - _SEH2_END; - } - /* * Either we didn't return from the request, or we did return but this * request was synchronous. @@ -485,6 +469,9 @@ /* So we did return with a synch operation, was it the IRP? */ if (Irp->Flags & IRP_SYNCHRONOUS_API) { + /* Yes, this IRP was synchronous, so return the I/O Status */ + *Irp->UserIosb = Irp->IoStatus; + /* Now check if the user gave an event */ if (Irp->UserEvent) { Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Apr 4 23:43:51 2010 @@ -163,7 +163,10 @@ DPRINT("IopInitiatePnpIrp(IRP_MN_FILTER_RESOURCE_REQUIREMENTS) failed\n"); return Status; } - DeviceNode->ResourceRequirements = (PIO_RESOURCE_REQUIREMENTS_LIST)IoStatusBlock.Information; + else if (NT_SUCCESS(Status)) + { + DeviceNode->ResourceRequirements = (PIO_RESOURCE_REQUIREMENTS_LIST)IoStatusBlock.Information; + } Status = IopAssignDeviceResources(DeviceNode, &RequiredLength); if (NT_SUCCESS(Status))

1 0

[janderwald] 46723: [KS] - Add hack to IKsClock_DispatchDeviceIoControl - Store device state before calling SetDeviceState - Partly implement KsPinGetLeadingEdgeStreamPointer, KsStreamPointerDelete, KsStreamPointerClone, KsStreamPointerAdvanceOffsets - Implement a worker routine to dispatch read/write stream requests for pin centric filters - Tv tuner is now able to transfer MPEG2 TS to user mode, WIP, needs more testing
by janderwald＠svn.reactos.org 04 Apr '10

04 Apr '10

Author: janderwald Date: Sun Apr 4 23:27:07 2010 New Revision: 46723 URL: http://svn.reactos.org/svn/reactos?rev=46723&view=rev Log: [KS] - Add hack to IKsClock_DispatchDeviceIoControl - Store device state before calling SetDeviceState - Partly implement KsPinGetLeadingEdgeStreamPointer, KsStreamPointerDelete, KsStreamPointerClone, KsStreamPointerAdvanceOffsets - Implement a worker routine to dispatch read/write stream requests for pin centric filters - Tv tuner is now able to transfer MPEG2 TS to user mode, WIP, needs more testing Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/bag.c trunk/reactos/drivers/ksfilter/ks/clocks.c trunk/reactos/drivers/ksfilter/ks/driver.c trunk/reactos/drivers/ksfilter/ks/filter.c trunk/reactos/drivers/ksfilter/ks/pin.c Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Sun Apr 4 23:27:07 2010 @@ -93,6 +93,8 @@ IN KSDEVICE_HEADER DevHeader) { PKSIDEVICE_HEADER Header = (PKSIDEVICE_HEADER)DevHeader; + + DPRINT("KsReleaseDevice\n"); ExReleaseResourceLite(&Header->SecurityLock); KeLeaveCriticalRegion(); @@ -1623,7 +1625,7 @@ IKsDevice *KsDevice; PKSIDEVICE_HEADER DeviceHeader; - + DPRINT("KsAcquireDevice\n"); DeviceHeader = (PKSIDEVICE_HEADER)CONTAINING_RECORD(Device, KSIDEVICE_HEADER, KsDevice); /* get device interface*/ Modified: trunk/reactos/drivers/ksfilter/ks/bag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/bag.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] Sun Apr 4 23:27:07 2010 @@ -88,6 +88,8 @@ { PKSIOBJECT_BAG Bag; PKSIOBJECT_BAG_ENTRY BagEntry; + + DPRINT("KsAddItemToObjectBag\n"); /* get real object bag */ Bag = (PKSIOBJECT_BAG)ObjectBag; @@ -362,6 +364,8 @@ PKSIOBJECT_BAG_ENTRY BagEntry; PVOID Item; NTSTATUS Status; + + DPRINT("_KsEdit\n"); /* get real object bag */ Bag = (PKSIOBJECT_BAG)ObjectBag; Modified: trunk/reactos/drivers/ksfilter/ks/clocks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/clocks… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] Sun Apr 4 23:27:07 2010 @@ -98,10 +98,10 @@ { UNIMPLEMENTED - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; } NTSTATUS Modified: trunk/reactos/drivers/ksfilter/ks/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/driver… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] Sun Apr 4 23:27:07 2010 @@ -38,6 +38,8 @@ IN PVOID Object) { PKSBASIC_HEADER BasicHeader = (PKSBASIC_HEADER)((ULONG_PTR)Object - sizeof(KSBASIC_HEADER)); + + DPRINT("KsGetDevice\n"); ASSERT(BasicHeader->Type == KsObjectTypeFilterFactory || BasicHeader->Type == KsObjectTypeFilter || BasicHeader->Type == KsObjectTypePin); ASSERT(BasicHeader->KsDevice); @@ -152,6 +154,8 @@ PKS_DRIVER_EXTENSION DriverObjectExtension; NTSTATUS Status = STATUS_SUCCESS; + DPRINT("KsInitializeDriver\n"); + if (Descriptor) { Status = IoAllocateDriverObjectExtension(DriverObject, (PVOID)KsInitializeDriver, sizeof(KS_DRIVER_EXTENSION), (PVOID*)&DriverObjectExtension); Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Sun Apr 4 23:27:07 2010 @@ -1572,6 +1572,8 @@ PIO_STACK_LOCATION IoStack; PKSIOBJECT_HEADER ObjectHeader; + DPRINT("KsGetFilterFromIrp\n"); + /* get current irp stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); Modified: trunk/reactos/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/pin.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] Sun Apr 4 23:27:07 2010 @@ -11,13 +11,13 @@ typedef struct _KSISTREAM_POINTER { - KSSTREAM_POINTER StreamPointer; PFNKSSTREAMPOINTER Callback; PIRP Irp; KTIMER Timer; KDPC TimerDpc; struct _KSISTREAM_POINTER *Next; - + PKSPIN Pin; + KSSTREAM_POINTER StreamPointer; }KSISTREAM_POINTER, *PKSISTREAM_POINTER; typedef struct @@ -55,6 +55,12 @@ PFILE_OBJECT ClockFileObject; IKsReferenceClockVtbl * lpVtblReferenceClock; PKSDEFAULTCLOCK DefaultClock; + + PKSWORKER PinWorker; + WORK_QUEUE_ITEM PinWorkQueueItem; + IRP * Irp; + KEVENT FrameComplete; + }IKsPinImpl; @@ -283,6 +289,7 @@ /* set new state */ This->Pin.ClientState = *NewState; + This->Pin.DeviceState = *NewState; /* check if it supported */ Status = This->Pin.Descriptor->Dispatch->SetDeviceState(&This->Pin, *NewState, OldState); @@ -293,6 +300,7 @@ { /* revert to old state */ This->Pin.ClientState = OldState; + This->Pin.DeviceState = OldState; DbgBreakPoint(); } else @@ -892,7 +900,7 @@ IN BOOLEAN Asynchronous) { DPRINT("KsPinAttemptProcessing\n"); -DbgBreakPoint(); + DbgBreakPoint(); UNIMPLEMENTED } @@ -1204,10 +1212,33 @@ IN PKSPIN Pin, IN KSSTREAM_POINTER_STATE State) { - UNIMPLEMENTED - DPRINT("KsPinGetLeadingEdgeStreamPointer Pin %p State %x\n", Pin, State); -DbgBreakPoint(); - return NULL; + IKsPinImpl * This; + + This = (IKsPinImpl*)CONTAINING_RECORD(Pin, IKsPinImpl, Pin); + + DPRINT("KsPinGetLeadingEdgeStreamPointer Pin %p State %x Count %lu Remaining %lu\n", Pin, State, + This->LeadingEdgeStreamPointer->StreamPointer.Offset->Count, + This->LeadingEdgeStreamPointer->StreamPointer.Offset->Remaining); + + /* sanity check */ + ASSERT(This->LeadingEdgeStreamPointer); + ASSERT(State == KSSTREAM_POINTER_STATE_LOCKED); + + if (State == KSSTREAM_POINTER_STATE_LOCKED) + { + /* do we have an irp packet */ + if (!This->Irp) + { + /* run out of packets */ + return NULL; + } + + if (!This->LeadingEdgeStreamPointer->StreamPointer.Offset->Remaining) + return NULL; + } + DPRINT("LeadingEdge %p\n", &This->LeadingEdgeStreamPointer->StreamPointer); + This->LeadingEdgeStreamPointer->Pin = &This->Pin; + return &This->LeadingEdgeStreamPointer->StreamPointer; } /* @@ -1262,8 +1293,8 @@ IN BOOLEAN Eject) { UNIMPLEMENTED - DPRINT("KsStreamPointerUnlock\n"); -DbgBreakPoint(); + DPRINT("KsStreamPointerUnlock Eject %lu\n", Eject); + DbgBreakPoint(); } /* @@ -1278,8 +1309,8 @@ IN ULONG OutUsed, IN BOOLEAN Eject) { - DPRINT("KsStreamPointerAdvanceOffsets\n"); -DbgBreakPoint(); + DPRINT("KsStreamPointerAdvanceOffsets InUsed %lu OutUsed %lu Eject %lu\n", InUsed, OutUsed, Eject); + DbgBreakPoint(); UNIMPLEMENTED } @@ -1294,10 +1325,10 @@ { IKsPinImpl * This; PKSISTREAM_POINTER Cur, Last; - PKSISTREAM_POINTER Pointer = (PKSISTREAM_POINTER)StreamPointer; - - DPRINT("KsStreamPointerDelete\n"); -DbgBreakPoint(); + PKSISTREAM_POINTER Pointer = (PKSISTREAM_POINTER)CONTAINING_RECORD(StreamPointer, KSISTREAM_POINTER, StreamPointer); + + DPRINT("KsStreamPointerDelete %p\n", Pointer); + This = (IKsPinImpl*)CONTAINING_RECORD(Pointer->StreamPointer.Pin, IKsPinImpl, Pin); /* point to first stream pointer */ @@ -1332,7 +1363,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -1343,14 +1374,57 @@ IN ULONG ContextSize, OUT PKSSTREAM_POINTER* CloneStreamPointer) { - UNIMPLEMENTED - DPRINT("KsStreamPointerClone\n"); -DbgBreakPoint(); - return STATUS_NOT_IMPLEMENTED; -} - -/* - @unimplemented + IKsPinImpl * This; + PKSISTREAM_POINTER CurFrame; + PKSISTREAM_POINTER NewFrame; + ULONG RefCount; + ULONG Size; + + DPRINT("KsStreamPointerClone StreamPointer %p CancelCallback %p ContextSize %p CloneStreamPointer %p\n", StreamPointer, CancelCallback, ContextSize, CloneStreamPointer); + + /* get stream pointer */ + CurFrame = (PKSISTREAM_POINTER)CONTAINING_RECORD(StreamPointer, KSISTREAM_POINTER, StreamPointer); + + /* calculate context size */ + Size = sizeof(KSISTREAM_POINTER) + ContextSize; + + /* allocate new stream pointer */ + NewFrame = (PKSISTREAM_POINTER)ExAllocatePool(NonPagedPool, Size); + + if (!NewFrame) + return STATUS_INSUFFICIENT_RESOURCES; + + /* get current irp stack location */ + RefCount = (ULONG)CurFrame->Irp->Tail.Overlay.DriverContext[0]; + + /* increment reference count */ + RefCount++; + CurFrame->Irp->Tail.Overlay.DriverContext[0] = (PVOID)RefCount; + + /* copy stream pointer */ + RtlMoveMemory(NewFrame, CurFrame, sizeof(KSISTREAM_POINTER)); + + if (ContextSize) + NewFrame->StreamPointer.Context = (NewFrame + 1); + + /* locate pin */ + This = (IKsPinImpl*)CONTAINING_RECORD(CurFrame->Pin, IKsPinImpl, Pin); + + NewFrame->StreamPointer.Pin = &This->Pin; + + ASSERT(NewFrame->StreamPointer.Pin); + ASSERT(NewFrame->StreamPointer.Context); + ASSERT(NewFrame->StreamPointer.Offset); + ASSERT(NewFrame->StreamPointer.StreamHeader); + + /* store result */ + *CloneStreamPointer = &NewFrame->StreamPointer; + + return STATUS_SUCCESS; +} + +/* + @implemented */ KSDDKAPI NTSTATUS @@ -1361,8 +1435,58 @@ IN ULONG OutUsed, IN BOOLEAN Eject) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PKSISTREAM_POINTER CurFrame; + IKsPinImpl * This; + + DPRINT("KsStreamPointerAdvanceOffsets InUsed %lu OutUsed %lu Eject %lu\n", InUsed, OutUsed, Eject); + + /* get stream pointer */ + CurFrame = (PKSISTREAM_POINTER)CONTAINING_RECORD(StreamPointer, KSISTREAM_POINTER, StreamPointer); + + CurFrame->StreamPointer.OffsetIn.Remaining -= InUsed; + CurFrame->StreamPointer.OffsetOut.Remaining -= OutUsed; + CurFrame->StreamPointer.OffsetIn.Count -= InUsed; + CurFrame->StreamPointer.OffsetOut.Count -= OutUsed; + CurFrame->StreamPointer.OffsetIn.Data = (PVOID)((ULONG_PTR)CurFrame->StreamPointer.OffsetIn.Data + InUsed); + CurFrame->StreamPointer.OffsetOut.Data = (PVOID)((ULONG_PTR)CurFrame->StreamPointer.OffsetOut.Data + OutUsed); + + if (!CurFrame->StreamPointer.OffsetIn.Remaining) + CurFrame->StreamPointer.OffsetIn.Data = NULL; + + if (!CurFrame->StreamPointer.OffsetOut.Remaining) + CurFrame->StreamPointer.OffsetOut.Data = NULL; + + /* locate pin */ + This = (IKsPinImpl*)CONTAINING_RECORD(CurFrame->Pin, IKsPinImpl, Pin); + + if (This->Pin.Descriptor->PinDescriptor.DataFlow == KSPIN_DATAFLOW_IN) + { + if (CurFrame->StreamPointer.OffsetIn.Remaining == 0) + { + /* get next mapping */ + This->Irp = KsRemoveIrpFromCancelableQueue(&This->IrpList, &This->IrpListLock, KsListEntryHead, KsAcquireAndRemoveOnlySingleItem); + if (!This->Irp) + return STATUS_DEVICE_NOT_READY; + + /* FIXME handle me */ + ASSERT(0); + } + } + else + { + if (CurFrame->StreamPointer.OffsetOut.Remaining == 0) + { + /* get next mapping */ + This->Irp = KsRemoveIrpFromCancelableQueue(&This->IrpList, &This->IrpListLock, KsListEntryHead, KsAcquireAndRemoveOnlySingleItem); + if (!This->Irp) + return STATUS_DEVICE_NOT_READY; + + /* FIXME handle me */ + ASSERT(0); + } + } + + return STATUS_SUCCESS; } /* @@ -1458,7 +1582,7 @@ IKsPinImpl * This; DPRINT("KsPinGetFirstCloneStreamPointer %p\n", Pin); -DbgBreakPoint(); + DbgBreakPoint(); This = (IKsPinImpl*)CONTAINING_RECORD(Pin, IKsPinImpl, Pin); /* return first cloned stream pointer */ return &This->ClonedStreamPointer->StreamPointer; @@ -1476,7 +1600,7 @@ PKSISTREAM_POINTER Pointer = (PKSISTREAM_POINTER)StreamPointer; DPRINT("KsStreamPointerGetNextClone\n"); -DbgBreakPoint(); + DbgBreakPoint(); /* is there a another cloned stream pointer */ if (!Pointer->Next) return NULL; @@ -1484,7 +1608,101 @@ /* return next stream pointer */ return &Pointer->Next->StreamPointer; } -NTSTATUS + +VOID +NTAPI +IKsPin_PinCentricWorker( + IN PVOID Parameter) +{ + PIO_STACK_LOCATION IoStack; + PKSSTREAM_HEADER Header; + ULONG NumHeaders; + NTSTATUS Status; + PIRP Irp; + IKsPinImpl * This = (IKsPinImpl*)Parameter; + + DPRINT("IKsPin_PinCentricWorker\n"); + + /* sanity checks */ + ASSERT(This); + ASSERT(This->Pin.Descriptor); + ASSERT(This->Pin.Descriptor->Dispatch); + ASSERT(This->Pin.Descriptor->Dispatch->Process); + ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + ASSERT(!(This->Pin.Descriptor->Flags & KSPIN_FLAG_DISPATCH_LEVEL_PROCESSING)); + ASSERT(This->LeadingEdgeStreamPointer); + + do + { + /* do we have an irp packet */ + if (!This->Irp) + { + /* fetch new irp packet */ + This->Irp = KsRemoveIrpFromCancelableQueue(&This->IrpList, &This->IrpListLock, KsListEntryHead, KsAcquireAndRemoveOnlySingleItem); + + if (!This->Irp) + { + /* reached last packet */ + break; + } + } + + /* get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(This->Irp); + + if (This->Irp->RequestorMode == UserMode) + This->LeadingEdgeStreamPointer->StreamPointer.StreamHeader = Header = (PKSSTREAM_HEADER)This->Irp->AssociatedIrp.SystemBuffer; + else + This->LeadingEdgeStreamPointer->StreamPointer.StreamHeader = Header = (PKSSTREAM_HEADER)This->Irp->UserBuffer; + + /* calculate num headers */ + NumHeaders = IoStack->Parameters.DeviceIoControl.OutputBufferLength / Header->Size; + + /* assume headers of same length */ + ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength % Header->Size == 0); + + /* FIXME support multiple stream headers */ + ASSERT(NumHeaders == 1); + + if (This->Irp->RequestorMode == UserMode) + { + /* prepare header */ + Header->Data = MmGetSystemAddressForMdlSafe(This->Irp->MdlAddress, NormalPagePriority); + } + + /* set up stream pointer */ + This->LeadingEdgeStreamPointer->Irp = Irp = This->Irp; + This->LeadingEdgeStreamPointer->StreamPointer.Context = NULL; + This->LeadingEdgeStreamPointer->StreamPointer.Pin = &This->Pin; + This->LeadingEdgeStreamPointer->StreamPointer.OffsetOut.Count = max(Header->DataUsed, Header->FrameExtent); + This->LeadingEdgeStreamPointer->StreamPointer.OffsetOut.Data = Header->Data; + This->LeadingEdgeStreamPointer->StreamPointer.OffsetOut.Count = max(Header->DataUsed, Header->FrameExtent); + This->LeadingEdgeStreamPointer->StreamPointer.OffsetOut.Remaining = max(Header->DataUsed, Header->FrameExtent); + This->LeadingEdgeStreamPointer->Pin = &This->Pin; + + DPRINT("IKsPin_PinCentricWorker calling Pin Process Routine\n"); + + Status = This->Pin.Descriptor->Dispatch->Process(&This->Pin); + DPRINT("IKsPin_PinCentricWorker Status %lx, Count %lu Remaining %lu\n", Status, + This->LeadingEdgeStreamPointer->StreamPointer.Offset->Count, + This->LeadingEdgeStreamPointer->StreamPointer.Offset->Remaining); + + ASSERT(Status != STATUS_PENDING); + + // HACK complete irp + Irp->IoStatus.Information = max(Header->DataUsed, Header->FrameExtent); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + KsDecrementCountedWorker(This->PinWorker); + + + break; + + }while(TRUE); +} + +NTSTATUS +NTAPI IKsPin_DispatchKsStream( PDEVICE_OBJECT DeviceObject, PIRP Irp, @@ -1492,6 +1710,7 @@ { PKSPROCESSPIN_INDEXENTRY ProcessPinIndex; PKSFILTER Filter; + PIO_STACK_LOCATION IoStack; NTSTATUS Status = STATUS_SUCCESS; DPRINT("IKsPin_DispatchKsStream\n"); @@ -1499,18 +1718,41 @@ /* FIXME handle reset states */ ASSERT(This->Pin.ResetState == KSRESET_END); - /* mark irp as pending */ - IoMarkIrpPending(Irp); - - /* add irp to cancelable queue */ - KsAddIrpToCancelableQueue(&This->IrpList, &This->IrpListLock, Irp, KsListEntryTail, NULL /* FIXME */); + /* get current stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_WRITE_STREAM) + Status = KsProbeStreamIrp(Irp, KSSTREAM_WRITE | KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK | KSPROBE_SYSTEMADDRESS, This->Pin.StreamHeaderSize); + else + Status = KsProbeStreamIrp(Irp, KSSTREAM_READ | KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK | KSPROBE_SYSTEMADDRESS, This->Pin.StreamHeaderSize); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("KsProbeStreamIrp failed with %x\n", Status); + + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } if (This->Pin.Descriptor->Dispatch->Process) { /* it is a pin centric avstream */ - ASSERT(0); - //Status = This->Pin.Descriptor->Dispatch->Process(&This->Pin); - /* TODO */ + + /* mark irp as pending */ + IoMarkIrpPending(Irp); + + /* add irp to cancelable queue */ + KsAddIrpToCancelableQueue(&This->IrpList, &This->IrpListLock, Irp, KsListEntryTail, NULL /* FIXME */); + + /* sanity checks */ + ASSERT(!(This->Pin.Descriptor->Flags & KSPIN_FLAG_DISPATCH_LEVEL_PROCESSING)); + ASSERT(This->PinWorker); + + /* start the processing loop */ + KsIncrementCountedWorker(This->PinWorker); + + Status = STATUS_PENDING; } else { @@ -1534,9 +1776,17 @@ return STATUS_UNSUCCESSFUL; } + /* mark irp as pending */ + IoMarkIrpPending(Irp); + + /* add irp to cancelable queue */ + KsAddIrpToCancelableQueue(&This->IrpList, &This->IrpListLock, Irp, KsListEntryTail, NULL /* FIXME */); + + Status = Filter->Descriptor->Dispatch->Process(Filter, ProcessPinIndex); DPRINT("IKsPin_DispatchKsStream FilterCentric: Status %lx \n", Status); + } return Status; @@ -2037,6 +2287,41 @@ return Status; } } + else if (Descriptor->Dispatch && Descriptor->Dispatch->Process) + { + /* pin centric processing filter */ + + /* allocate leading stream pointer */ + Status = _KsEdit(This->Pin.Bag, (PVOID*)&This->LeadingEdgeStreamPointer, sizeof(KSISTREAM_POINTER), sizeof(KSISTREAM_POINTER), 0); + + /* FIXME cleanup */ + ASSERT(Status == STATUS_SUCCESS); + + /* FIXME cleanup */ + ASSERT(Status == STATUS_SUCCESS); + + /* setup stream pointer offset */ + This->LeadingEdgeStreamPointer->StreamPointer.Offset = &This->LeadingEdgeStreamPointer->StreamPointer.OffsetOut; + + /* initialize work item */ + ExInitializeWorkItem(&This->PinWorkQueueItem, IKsPin_PinCentricWorker, (PVOID)This); + + /* allocate counted work item */ + Status = KsRegisterCountedWorker(HyperCriticalWorkQueue, &This->PinWorkQueueItem, &This->PinWorker); + + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed to register Worker %lx\n", Status); + KsFreeObjectBag((KSOBJECT_BAG)This->Pin.Bag); + KsFreeObjectHeader(&This->ObjectHeader); + FreeItem(This); + FreeItem(CreateItem); + return Status; + } + + KeInitializeEvent(&This->FrameComplete, NotificationEvent, FALSE); + + } /* FIXME add pin instance to filter instance */ @@ -2045,7 +2330,6 @@ { Status = Descriptor->Dispatch->SetDataFormat(&This->Pin, NULL, NULL, This->Pin.ConnectionFormat, NULL); DPRINT("KspCreatePin SetDataFormat %lx\n", Status); - DbgBreakPoint(); } @@ -2056,7 +2340,6 @@ Status = Descriptor->Dispatch->Create(&This->Pin, Irp); DPRINT("KspCreatePin DispatchCreate %lx\n", Status); } - DPRINT("KspCreatePin Status %lx\n", Status);

1 0

[gschneider] 46722: [SHELL32] - Add a confirmation dialog for logoff operation - English and German translation included See issue #1494 for more details.
by gschneider＠svn.reactos.org 04 Apr '10

04 Apr '10

Author: gschneider Date: Sun Apr 4 20:37:39 2010 New Revision: 46722 URL: http://svn.reactos.org/svn/reactos?rev=46722&view=rev Log: [SHELL32] - Add a confirmation dialog for logoff operation - English and German translation included See issue #1494 for more details. Modified: trunk/reactos/dll/win32/shell32/dialogs.c trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -612,9 +612,11 @@ int WINAPI LogoffWindowsDialog(HWND hWndOwner) { - UNIMPLEMENTED; - ExitWindowsEx(EWX_LOGOFF, 0); - return 0; + if (ConfirmDialog(hWndOwner, IDS_LOGOFF_PROMPT, IDS_LOGOFF_TITLE)) + { + ExitWindowsEx(EWX_LOGOFF, 0); + } + return 0; } /************************************************************************* Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -666,6 +666,8 @@ IDS_RESTART_PROMPT "Èñêàòå ëè äà ïðåçàïóñíåòå ñèñòåìàòà?" IDS_SHUTDOWN_TITLE "Èçêëþ÷âàíå" IDS_SHUTDOWN_PROMPT "Èñêàòå ëè äà èçêëþ÷èòå êîìïþòúðà?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" // shell folder path default values IDS_PROGRAMS "Ïóñêîâ èçáîðíèê\\Ïðèëîæåíèÿ" Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -665,6 +665,8 @@ IDS_RESTART_PROMPT "Do you want to restart the system?" IDS_SHUTDOWN_TITLE "Shutdown" IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -666,6 +666,8 @@ IDS_RESTART_PROMPT "Opravdu chcete restartovat systém?" IDS_SHUTDOWN_TITLE "Vypnout" IDS_SHUTDOWN_PROMPT "Opravdu chcete vypnout poèítaè?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Nabídka Start\\Programy" Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -654,6 +654,8 @@ IDS_RESTART_PROMPT "Ønsker du at Genstarte Systemet?" IDS_SHUTDOWN_TITLE "Luk Ned" IDS_SHUTDOWN_PROMPT "Ønsker du at Lukke Ned?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programmer" Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -669,6 +669,8 @@ IDS_RESTART_PROMPT "Möchten Sie das System neu starten?" IDS_SHUTDOWN_TITLE "Herunterfahren" IDS_SHUTDOWN_PROMPT "Möchten Sie das System herunterfahren?" + IDS_LOGOFF_TITLE "Ausloggen" + IDS_LOGOFF_PROMPT "Möchten Sie sich ausloggen?" /* shell folder path default values */ IDS_PROGRAMS "Startmenü\\Programme" Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -666,6 +666,8 @@ IDS_RESTART_PROMPT "Åßóôå óßãïõñïé üôé èÝëåôå íá åðáíåêêéíÞóåôå ôïí õðïëïãéóôÞ óáò;" IDS_SHUTDOWN_TITLE "Áðåíåñãïðïßçóç" IDS_SHUTDOWN_PROMPT "Åßóôå óßãïõñïé üôé èÝëåôå íá áðåíåñãïðïéÞóåôå ôïí õðïëïãéóôÞ óáò;" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -665,6 +665,8 @@ IDS_RESTART_PROMPT "Do you want to restart the system?" IDS_SHUTDOWN_TITLE "Shutdown" IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -665,6 +665,8 @@ IDS_RESTART_PROMPT "Do you want to restart the system?" IDS_SHUTDOWN_TITLE "Shutdown" IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -668,6 +668,8 @@ IDS_RESTART_PROMPT "¿Desea reiniciar el equipo?" IDS_SHUTDOWN_TITLE "Apagar" IDS_SHUTDOWN_PROMPT "¿Desea apagar el equipo?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Menú Inicio\\Programas" Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -665,6 +665,8 @@ IDS_RESTART_PROMPT "Haluatko simuloida Windows:n uudelleenkäynnistämistä?" IDS_SHUTDOWN_TITLE "Sammuta" IDS_SHUTDOWN_PROMPT "Haluatko lopettaa Wine:n istunnon?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Käynnistä\\Ohjelmat" Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -669,6 +669,8 @@ IDS_RESTART_PROMPT "Voulez-vous redémarrer votre ordinateur ?" IDS_SHUTDOWN_TITLE "Arrêter" IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session ReactOS ?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Menu Démarrer\\Programmes" Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -668,6 +668,8 @@ IDS_RESTART_PROMPT "Újra szeretnéd indítani a rendszert?" IDS_SHUTDOWN_TITLE "Kikapcsolás" IDS_SHUTDOWN_PROMPT "Kiakarod kapcsolni számítógépét?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -666,6 +666,8 @@ IDS_RESTART_PROMPT "Volete riavviare il sistema?" IDS_SHUTDOWN_TITLE "Termina sessione" IDS_SHUTDOWN_PROMPT "Volete terminare la sessione di ReactOS?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Menu Avvio\\Programmi" Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -665,6 +665,8 @@ IDS_RESTART_PROMPT "VXeðÄN®µÜ·©?" IDS_SHUTDOWN_TITLE "Vbg_E" IDS_SHUTDOWN_PROMPT "Vbg_EµÜ·©?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "X^[g j[\\vO" Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -665,6 +665,8 @@ IDS_RESTART_PROMPT "Do you want to restart the system?" IDS_SHUTDOWN_TITLE "Shutdown" IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -665,6 +665,8 @@ IDS_RESTART_PROMPT "Do you want to restart the system?" IDS_SHUTDOWN_TITLE "Shutdown" IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -668,6 +668,8 @@ IDS_RESTART_PROMPT "Vil du starte datamaskinen på nytt?" IDS_SHUTDOWN_TITLE "Avslutt" IDS_SHUTDOWN_PROMPT "Vil du slå av datamaskinen?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Start-meny\\Programmer" Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -672,6 +672,8 @@ IDS_RESTART_PROMPT "Czy chcesz zrestartowaæ system?" IDS_SHUTDOWN_TITLE "Wy³¹cz" IDS_SHUTDOWN_PROMPT "Czy chcesz wy³¹czyæ system?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Menu Start\\Programy" Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -667,6 +667,8 @@ IDS_RESTART_PROMPT "Você quer simular a reinicialização do Windows?" IDS_SHUTDOWN_TITLE "Desligar" IDS_SHUTDOWN_PROMPT "Você quer finalizar a sessão no Wine?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Menu Iniciar\\Programas" Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -667,6 +667,8 @@ IDS_RESTART_PROMPT "Deseja simular a reinicialização do Windows?" IDS_SHUTDOWN_TITLE "Desligar" IDS_SHUTDOWN_PROMPT "Deseja finalizar esta sessão do Wine?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Menu Iniciar\\Programas" Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -668,6 +668,8 @@ IDS_RESTART_PROMPT "VreÈi sÄ reporniÈi sistemul?" IDS_SHUTDOWN_TITLE "Ãnchidere" IDS_SHUTDOWN_PROMPT "VreÈi sÄ Ã®nchideÈi computerul?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Meniu Start\\Programe" Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -664,6 +664,8 @@ IDS_RESTART_PROMPT "Âû äåéñòâèòåëüíî õîòèòå ïåðåçàãðóçèòü ReactOS?" IDS_SHUTDOWN_TITLE "Âûêëþ÷èòü ïèòàíèå" IDS_SHUTDOWN_PROMPT "Çàêîí÷èòü ðàáîòó ñ ReactOS?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Ãëàâíîå ìåíþ\\Ïðîãðàììû" Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -671,6 +671,8 @@ IDS_RESTART_PROMPT "Naozaj chcete retartova systém?" IDS_SHUTDOWN_TITLE "Vypnú" IDS_SHUTDOWN_PROMPT "Naozaj chcete vypnú poèítaè?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Ponuka tart\\Programy" Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -665,6 +665,8 @@ IDS_RESTART_PROMPT "Do you want to restart the system?" IDS_SHUTDOWN_TITLE "Shutdown" IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -665,6 +665,8 @@ IDS_RESTART_PROMPT "Do you want to restart the system?" IDS_SHUTDOWN_TITLE "Shutdown" IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -665,6 +665,8 @@ IDS_RESTART_PROMPT "Do you want to restart the system?" IDS_SHUTDOWN_TITLE "Oturumu Kapat" IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programlar" Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -666,6 +666,8 @@ IDS_RESTART_PROMPT "Âè õî÷åòå ïåðåçàâàíòàæèòè ñèñòåìó?" IDS_SHUTDOWN_TITLE "Âèìêíóòè" IDS_SHUTDOWN_PROMPT "Âè õî÷åòå âèìêíóòè êîìï'þòåð?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -654,6 +654,8 @@ IDS_RESTART_PROMPT "ÊÇ·ñÖØÐÂÆô¶¯ÏµÍ³?" IDS_SHUTDOWN_TITLE "¹Ø»ú" IDS_SHUTDOWN_PROMPT "ÊÇ·ñ¹Ø±ÕÏµÍ³?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -666,6 +666,8 @@ IDS_RESTART_PROMPT "Do you want to restart the system?" IDS_SHUTDOWN_TITLE "Shutdown" IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" + IDS_LOGOFF_TITLE "Log Off" + IDS_LOGOFF_PROMPT "Do you want to log off?" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Sun Apr 4 20:37:39 2010 @@ -89,6 +89,9 @@ #define IDS_NETWORKPLACE 75 #define IDS_FONTS 76 #define IDS_PRINTERS 77 + +#define IDS_LOGOFF_TITLE 78 +#define IDS_LOGOFF_PROMPT 79 #define IDS_CREATEFOLDER_DENIED 128 #define IDS_CREATEFOLDER_CAPTION 129

1 0

[gschneider] 46721: [FORMAT] - Bail out when detecting invalid root path, instead of asking to insert a disk See issue #4067 for more details.
by gschneider＠svn.reactos.org 04 Apr '10

04 Apr '10

Author: gschneider Date: Sun Apr 4 20:24:28 2010 New Revision: 46721 URL: http://svn.reactos.org/svn/reactos?rev=46721&view=rev Log: [FORMAT] - Bail out when detecting invalid root path, instead of asking to insert a disk See issue #4067 for more details. Modified: trunk/reactos/base/system/format/format.c Modified: trunk/reactos/base/system/format/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… ============================================================================== --- trunk/reactos/base/system/format/format.c [iso-8859-1] (original) +++ trunk/reactos/base/system/format/format.c [iso-8859-1] Sun Apr 4 20:24:28 2010 @@ -363,6 +363,12 @@ PrintWin32Error( szMsg, GetLastError()); return -1; } + else if ( driveType == 1 ) + { + LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + PrintWin32Error( szMsg, GetLastError()); + return -1; + } if( driveType != DRIVE_FIXED ) { LoadString( GetModuleHandle(NULL), STRING_INSERT_DISK, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);

1 0

[cgutman] 46720: - Move the code from my previous commit before signalling the user event - Sorry for the wasted commit number
by cgutman＠svn.reactos.org 04 Apr '10

04 Apr '10

Author: cgutman Date: Sun Apr 4 20:22:54 2010 New Revision: 46720 URL: http://svn.reactos.org/svn/reactos?rev=46720&view=rev Log: - Move the code from my previous commit before signalling the user event - Sorry for the wasted commit number Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Sun Apr 4 20:22:54 2010 @@ -460,6 +460,22 @@ } else { + /* Check if we have an associated user IOSB */ + if (Irp->UserIosb) + { + /* We do, so let's give them the final status */ + _SEH2_TRY + { + /* Save the IOSB Information */ + *Irp->UserIosb = Irp->IoStatus; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Ignore any error */ + } + _SEH2_END; + } + /* * Either we didn't return from the request, or we did return but this * request was synchronous. @@ -490,22 +506,6 @@ FileObject->FinalStatus = Irp->IoStatus.Status; KeSetEvent(&FileObject->Event, 0, FALSE); } - } - - /* Check if we have an associated user IOSB */ - if (Irp->UserIosb) - { - /* We do, so let's give them the final status */ - _SEH2_TRY - { - /* Save the IOSB Information */ - *Irp->UserIosb = Irp->IoStatus; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Ignore any error */ - } - _SEH2_END; } /* Now that we got here, we do this for incomplete I/Os as well */

1 0

[cgutman] 46719: [NTOSKRNL] - Fix a case where we miss copying back the IO_STATUS_BLOCK into the UserIosb buffer - Fixes the registry corruption caused when PnP wrote an invalid resource list (passed back via UserIosb->Information) to the registry - Hopefully this also fixes a few other nasty bugs in other areas related to this issue
by cgutman＠svn.reactos.org 04 Apr '10

04 Apr '10

Author: cgutman Date: Sun Apr 4 20:17:51 2010 New Revision: 46719 URL: http://svn.reactos.org/svn/reactos?rev=46719&view=rev Log: [NTOSKRNL] - Fix a case where we miss copying back the IO_STATUS_BLOCK into the UserIosb buffer - Fixes the registry corruption caused when PnP wrote an invalid resource list (passed back via UserIosb->Information) to the registry - Hopefully this also fixes a few other nasty bugs in other areas related to this issue Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Sun Apr 4 20:17:51 2010 @@ -469,9 +469,6 @@ /* So we did return with a synch operation, was it the IRP? */ if (Irp->Flags & IRP_SYNCHRONOUS_API) { - /* Yes, this IRP was synchronous, so return the I/O Status */ - *Irp->UserIosb = Irp->IoStatus; - /* Now check if the user gave an event */ if (Irp->UserEvent) { @@ -493,6 +490,22 @@ FileObject->FinalStatus = Irp->IoStatus.Status; KeSetEvent(&FileObject->Event, 0, FALSE); } + } + + /* Check if we have an associated user IOSB */ + if (Irp->UserIosb) + { + /* We do, so let's give them the final status */ + _SEH2_TRY + { + /* Save the IOSB Information */ + *Irp->UserIosb = Irp->IoStatus; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Ignore any error */ + } + _SEH2_END; } /* Now that we got here, we do this for incomplete I/Os as well */

1 0

[gschneider] 46718: [CMD] - Don't prefix double quotation marks during file completion See issue #4491 for more details.
by gschneider＠svn.reactos.org 04 Apr '10

04 Apr '10

Author: gschneider Date: Sun Apr 4 16:04:24 2010 New Revision: 46718 URL: http://svn.reactos.org/svn/reactos?rev=46718&view=rev Log: [CMD] - Don't prefix double quotation marks during file completion See issue #4491 for more details. Modified: trunk/reactos/base/shell/cmd/filecomp.c Modified: trunk/reactos/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/filecomp.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] Sun Apr 4 16:04:24 2010 @@ -703,7 +703,7 @@ LastSpace = i; } - /* insert the quoation and move things around */ + /* insert the quotation and move things around */ if(szPrefix[LastSpace + 1] != _T('\"') && LastSpace != -1) { memmove ( &szPrefix[LastSpace+1], &szPrefix[LastSpace], (_tcslen(szPrefix)-LastSpace+1) * sizeof(TCHAR) ); @@ -712,14 +712,17 @@ { _tcscat(szPrefix,_T("\"")); } - szPrefix[LastSpace + 1] = _T('\"'); + szPrefix[LastSpace + 1] = _T('\"'); } else if(LastSpace == -1) { - _tcscpy(szBaseWord,_T("\"")); - _tcscat(szBaseWord,szPrefix); - _tcscpy(szPrefix,szBaseWord); - + /* Add quotation only if none exists already */ + if (szPrefix[0] != _T('\"')) + { + _tcscpy(szBaseWord,_T("\"")); + _tcscat(szBaseWord,szPrefix); + _tcscpy(szPrefix,szBaseWord); + } } }

1 0

[fireball] 46717: - Sync user32 and gdi32 winetests to Wine-1.1.42.
by fireball＠svn.reactos.org 04 Apr '10

04 Apr '10

Author: fireball Date: Sun Apr 4 15:47:45 2010 New Revision: 46717 URL: http://svn.reactos.org/svn/reactos?rev=46717&view=rev Log: - Sync user32 and gdi32 winetests to Wine-1.1.42. Modified: trunk/rostests/winetests/user32/combo.c trunk/rostests/winetests/user32/cursoricon.c trunk/rostests/winetests/user32/menu.c trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/scroll.c trunk/rostests/winetests/user32/win.c Modified: trunk/rostests/winetests/user32/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/combo.c?… ============================================================================== --- trunk/rostests/winetests/user32/combo.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/combo.c [iso-8859-1] Sun Apr 4 15:47:45 2010 @@ -461,7 +461,7 @@ ok(LOWORD(len)==1, "Unexpected start position for selection %d\n", LOWORD(len)); ok(HIWORD(len)==1, "Unexpected end position for selection %d\n", HIWORD(len)); - /* Now what happens when it gets more focus a second time - it doesnt reselect */ + /* Now what happens when it gets more focus a second time - it doesn't reselect */ SendMessage(hCombo, WM_SETFOCUS, 0, (LPARAM)hEdit); len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); ok(LOWORD(len)==1, "Unexpected start position for selection %d\n", LOWORD(len)); Modified: trunk/rostests/winetests/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/cursoric… ============================================================================== --- trunk/rostests/winetests/user32/cursoricon.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/cursoricon.c [iso-8859-1] Sun Apr 4 15:47:45 2010 @@ -64,6 +64,8 @@ #define PROC_INIT (WM_USER+1) +static BOOL (WINAPI *pGetCursorInfo)(CURSORINFO *); + static LRESULT CALLBACK callback_child(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { BOOL ret; @@ -961,7 +963,7 @@ { ICONINFO iconInfo; BITMAPINFO bitmapInfo; - UINT32 *buffer = NULL; + void *buffer = NULL; UINT32 mask = maskvalue ? 0xFFFFFFFF : 0x00000000; memset(&bitmapInfo, 0, sizeof(bitmapInfo)); @@ -980,7 +982,7 @@ iconInfo.hbmMask = CreateBitmap( width, height, 1, 1, &mask ); if(!iconInfo.hbmMask) return NULL; - iconInfo.hbmColor = CreateDIBSection(hdc, &bitmapInfo, DIB_RGB_COLORS, (void**)&buffer, NULL, 0); + iconInfo.hbmColor = CreateDIBSection(hdc, &bitmapInfo, DIB_RGB_COLORS, &buffer, NULL, 0); if(!iconInfo.hbmColor || !buffer) { DeleteObject(iconInfo.hbmMask); @@ -1072,7 +1074,7 @@ HDC hdcDst = NULL; HBITMAP bmpDst = NULL; HBITMAP bmpOld = NULL; - UINT32 *bits = 0; + void *bits = 0; hdcDst = CreateCompatibleDC(0); ok(hdcDst != 0, "CreateCompatibleDC(0) failed to return a valid DC\n"); @@ -1094,7 +1096,7 @@ bitmapInfo.bmiHeader.biCompression = BI_RGB; bitmapInfo.bmiHeader.biSizeImage = sizeof(UINT32); - bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, &bits, NULL, 0); ok (bmpDst && bits, "CreateDIBSection failed to return a valid bitmap and buffer\n"); if (!bmpDst || !bits) goto cleanup; @@ -1156,7 +1158,7 @@ HDC hdcDst = NULL; HBITMAP bmpDst = NULL; HBITMAP bmpOld = NULL; - UINT32 bits = 0; + void *bits = 0; hdcDst = CreateCompatibleDC(0); ok(hdcDst != 0, "CreateCompatibleDC(0) failed to return a valid DC\n"); @@ -1177,7 +1179,7 @@ bitmapInfo.bmiHeader.biPlanes = 1; bitmapInfo.bmiHeader.biCompression = BI_RGB; bitmapInfo.bmiHeader.biSizeImage = sizeof(UINT32); - bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, &bits, NULL, 0); ok (bmpDst && bits, "CreateDIBSection failed to return a valid bitmap and buffer\n"); if (!bmpDst || !bits) goto cleanup; @@ -1308,7 +1310,7 @@ HDC hdcDst = NULL; HBITMAP bmpDst = NULL; HBITMAP bmpOld = NULL; - UINT32 bits = 0; + void *bits = 0; hdcDst = CreateCompatibleDC(0); ok(hdcDst != 0, "CreateCompatibleDC(0) failed to return a valid DC\n"); @@ -1329,7 +1331,7 @@ bitmapInfo.bmiHeader.biPlanes = 1; bitmapInfo.bmiHeader.biCompression = BI_RGB; bitmapInfo.bmiHeader.biSizeImage = sizeof(UINT32); - bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, &bits, NULL, 0); ok (bmpDst && bits, "CreateDIBSection failed to return a valid bitmap and buffer\n"); if (!bmpDst || !bits) goto cleanup; @@ -1352,6 +1354,250 @@ if(hdcDst) DeleteDC(hdcDst); } + +static DWORD parent_id; + +static DWORD CALLBACK set_cursor_thread( void *arg ) +{ + HCURSOR ret; + + PeekMessage( 0, 0, 0, 0, PM_NOREMOVE ); /* create a msg queue */ + if (parent_id) + { + BOOL ret = AttachThreadInput( GetCurrentThreadId(), parent_id, TRUE ); + ok( ret, "AttachThreadInput failed\n" ); + } + if (arg) ret = SetCursor( (HCURSOR)arg ); + else ret = GetCursor(); + return (DWORD_PTR)ret; +} + +static void test_SetCursor(void) +{ + static const BYTE bmp_bits[4096]; + ICONINFO cursorInfo; + HCURSOR cursor, old_cursor, global_cursor = 0; + DWORD error, id, result; + UINT display_bpp; + HDC hdc; + HANDLE thread; + CURSORINFO info; + + if (pGetCursorInfo) + { + memset( &info, 0, sizeof(info) ); + info.cbSize = sizeof(info); + if (!pGetCursorInfo( &info )) + { + win_skip( "GetCursorInfo not working\n" ); + pGetCursorInfo = NULL; + } + else global_cursor = info.hCursor; + } + cursor = GetCursor(); + thread = CreateThread( NULL, 0, set_cursor_thread, 0, 0, &id ); + WaitForSingleObject( thread, 1000 ); + GetExitCodeThread( thread, &result ); + ok( result == (DWORD_PTR)cursor, "wrong thread cursor %x/%p\n", result, cursor ); + + hdc = GetDC(0); + display_bpp = GetDeviceCaps(hdc, BITSPIXEL); + ReleaseDC(0, hdc); + + cursorInfo.fIcon = FALSE; + cursorInfo.xHotspot = 0; + cursorInfo.yHotspot = 0; + cursorInfo.hbmMask = CreateBitmap(32, 32, 1, 1, bmp_bits); + cursorInfo.hbmColor = CreateBitmap(32, 32, 1, display_bpp, bmp_bits); + + cursor = CreateIconIndirect(&cursorInfo); + ok(cursor != NULL, "CreateIconIndirect returned %p\n", cursor); + old_cursor = SetCursor( cursor ); + + if (pGetCursorInfo) + { + info.cbSize = sizeof(info); + ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); + /* global cursor doesn't change since we don't have a window */ + ok( info.hCursor == global_cursor || broken(info.hCursor != cursor), /* win9x */ + "wrong info cursor %p/%p\n", info.hCursor, global_cursor ); + } + thread = CreateThread( NULL, 0, set_cursor_thread, 0, 0, &id ); + WaitForSingleObject( thread, 1000 ); + GetExitCodeThread( thread, &result ); + ok( result == (DWORD_PTR)old_cursor, "wrong thread cursor %x/%p\n", result, old_cursor ); + + SetCursor( 0 ); + ok( GetCursor() == 0, "wrong cursor %p\n", GetCursor() ); + thread = CreateThread( NULL, 0, set_cursor_thread, 0, 0, &id ); + WaitForSingleObject( thread, 1000 ); + GetExitCodeThread( thread, &result ); + ok( result == (DWORD_PTR)old_cursor, "wrong thread cursor %x/%p\n", result, old_cursor ); + + thread = CreateThread( NULL, 0, set_cursor_thread, cursor, 0, &id ); + WaitForSingleObject( thread, 1000 ); + GetExitCodeThread( thread, &result ); + ok( result == (DWORD_PTR)old_cursor, "wrong thread cursor %x/%p\n", result, old_cursor ); + ok( GetCursor() == 0, "wrong cursor %p/0\n", GetCursor() ); + + parent_id = GetCurrentThreadId(); + thread = CreateThread( NULL, 0, set_cursor_thread, cursor, 0, &id ); + WaitForSingleObject( thread, 1000 ); + GetExitCodeThread( thread, &result ); + ok( result == (DWORD_PTR)old_cursor, "wrong thread cursor %x/%p\n", result, old_cursor ); + ok( GetCursor() == cursor, "wrong cursor %p/0\n", cursor ); + + if (pGetCursorInfo) + { + info.cbSize = sizeof(info); + ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); + ok( info.hCursor == global_cursor || broken(info.hCursor != cursor), /* win9x */ + "wrong info cursor %p/%p\n", info.hCursor, global_cursor ); + } + SetCursor( old_cursor ); + DestroyCursor( cursor ); + + SetLastError( 0xdeadbeef ); + cursor = SetCursor( (HCURSOR)0xbadbad ); + error = GetLastError(); + ok( cursor == 0, "wrong cursor %p/0\n", cursor ); + ok( error == ERROR_INVALID_CURSOR_HANDLE || broken( error == 0xdeadbeef ), /* win9x */ + "wrong error %u\n", error ); + + if (pGetCursorInfo) + { + info.cbSize = sizeof(info); + ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); + ok( info.hCursor == global_cursor || broken(info.hCursor != cursor), /* win9x */ + "wrong info cursor %p/%p\n", info.hCursor, global_cursor ); + } +} + +static HANDLE event_start, event_next; + +static DWORD CALLBACK show_cursor_thread( void *arg ) +{ + DWORD count = (DWORD_PTR)arg; + int ret; + + PeekMessage( 0, 0, 0, 0, PM_NOREMOVE ); /* create a msg queue */ + if (parent_id) + { + BOOL ret = AttachThreadInput( GetCurrentThreadId(), parent_id, TRUE ); + ok( ret, "AttachThreadInput failed\n" ); + } + if (!count) ret = ShowCursor( FALSE ); + else while (count--) ret = ShowCursor( TRUE ); + SetEvent( event_start ); + WaitForSingleObject( event_next, 2000 ); + return ret; +} + +static void test_ShowCursor(void) +{ + int count; + DWORD id, result; + HANDLE thread; + CURSORINFO info; + + if (pGetCursorInfo) + { + memset( &info, 0, sizeof(info) ); + info.cbSize = sizeof(info); + ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); + ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + } + + event_start = CreateEvent( NULL, FALSE, FALSE, NULL ); + event_next = CreateEvent( NULL, FALSE, FALSE, NULL ); + + count = ShowCursor( TRUE ); + ok( count == 1, "wrong count %d\n", count ); + count = ShowCursor( TRUE ); + ok( count == 2, "wrong count %d\n", count ); + count = ShowCursor( FALSE ); + ok( count == 1, "wrong count %d\n", count ); + count = ShowCursor( FALSE ); + ok( count == 0, "wrong count %d\n", count ); + count = ShowCursor( FALSE ); + ok( count == -1, "wrong count %d\n", count ); + count = ShowCursor( FALSE ); + ok( count == -2, "wrong count %d\n", count ); + + if (pGetCursorInfo) + { + info.cbSize = sizeof(info); + ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); + /* global show count is not affected since we don't have a window */ + ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + } + + parent_id = 0; + thread = CreateThread( NULL, 0, show_cursor_thread, NULL, 0, &id ); + WaitForSingleObject( event_start, 1000 ); + count = ShowCursor( FALSE ); + ok( count == -3, "wrong count %d\n", count ); + SetEvent( event_next ); + WaitForSingleObject( thread, 1000 ); + GetExitCodeThread( thread, &result ); + ok( result == -1, "wrong thread count %d\n", result ); + count = ShowCursor( FALSE ); + ok( count == -4, "wrong count %d\n", count ); + + thread = CreateThread( NULL, 0, show_cursor_thread, (void *)1, 0, &id ); + WaitForSingleObject( event_start, 1000 ); + count = ShowCursor( TRUE ); + ok( count == -3, "wrong count %d\n", count ); + SetEvent( event_next ); + WaitForSingleObject( thread, 1000 ); + GetExitCodeThread( thread, &result ); + ok( result == 1, "wrong thread count %d\n", result ); + count = ShowCursor( TRUE ); + ok( count == -2, "wrong count %d\n", count ); + + parent_id = GetCurrentThreadId(); + thread = CreateThread( NULL, 0, show_cursor_thread, NULL, 0, &id ); + WaitForSingleObject( event_start, 1000 ); + count = ShowCursor( TRUE ); + ok( count == -2, "wrong count %d\n", count ); + SetEvent( event_next ); + WaitForSingleObject( thread, 1000 ); + GetExitCodeThread( thread, &result ); + ok( result == -3, "wrong thread count %d\n", result ); + count = ShowCursor( FALSE ); + ok( count == -2, "wrong count %d\n", count ); + + thread = CreateThread( NULL, 0, show_cursor_thread, (void *)3, 0, &id ); + WaitForSingleObject( event_start, 1000 ); + count = ShowCursor( TRUE ); + ok( count == 2, "wrong count %d\n", count ); + SetEvent( event_next ); + WaitForSingleObject( thread, 1000 ); + GetExitCodeThread( thread, &result ); + ok( result == 1, "wrong thread count %d\n", result ); + count = ShowCursor( FALSE ); + ok( count == -2, "wrong count %d\n", count ); + + if (pGetCursorInfo) + { + info.cbSize = sizeof(info); + ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); + ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + } + + count = ShowCursor( TRUE ); + ok( count == -1, "wrong count %d\n", count ); + count = ShowCursor( TRUE ); + ok( count == 0, "wrong count %d\n", count ); + + if (pGetCursorInfo) + { + info.cbSize = sizeof(info); + ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); + ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + } +} + static void test_DestroyCursor(void) { @@ -1435,6 +1681,7 @@ START_TEST(cursoricon) { + pGetCursorInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetCursorInfo" ); test_argc = winetest_get_mainargs(&test_argv); if (test_argc >= 3) @@ -1463,6 +1710,8 @@ test_DrawIcon(); test_DrawIconEx(); test_DrawState(); + test_SetCursor(); + test_ShowCursor(); test_DestroyCursor(); do_parent(); test_child_process(); Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… ============================================================================== --- trunk/rostests/winetests/user32/menu.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/menu.c [iso-8859-1] Sun Apr 4 15:47:45 2010 @@ -3218,7 +3218,7 @@ test_menu_hilitemenuitem(); test_menu_trackpopupmenu(); -// test_menu_cancelmode(); + test_menu_cancelmode(); test_menu_maxdepth(); test_menu_circref(); } Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Sun Apr 4 15:47:45 2010 @@ -12434,17 +12434,17 @@ test_quit_message(); test_SetActiveWindow(); -// if (!pTrackMouseEvent) + if (!pTrackMouseEvent) win_skip("TrackMouseEvent is not available\n"); -// else -// test_TrackMouseEvent(); + else + test_TrackMouseEvent(); test_SetWindowRgn(); test_sys_menu(); test_dialog_messages(); test_nullCallback(); test_dbcs_wm_char(); -// test_menu_messages(); + test_menu_messages(); test_paintingloop(); test_defwinproc(); test_clipboard_viewers(); Modified: trunk/rostests/winetests/user32/scroll.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/scroll.c… ============================================================================== --- trunk/rostests/winetests/user32/scroll.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/scroll.c [iso-8859-1] Sun Apr 4 15:47:45 2010 @@ -42,11 +42,24 @@ case WM_DESTROY: PostQuitMessage(0); break; - + case WM_HSCROLL: + case WM_VSCROLL: + /* stop tracking */ + ReleaseCapture(); + return 0; default: return DefWindowProcA(hWnd, msg, wParam, lParam); } return 0; +} +static void scrollbar_test_track(void) +{ + /* test that scrollbar tracking is terminated when + * the control looses mouse capture */ + SendMessage( hScroll, WM_LBUTTONDOWN, 0, MAKELPARAM( 1, 1)); + /* a normal return from the sendmessage */ + /* not normal for instance by closing the windws */ + ok( IsWindow( hScroll), "Scrollbar has gone!\n"); } static void scrollbar_test1(void) @@ -420,6 +433,7 @@ scrollbar_test2(); scrollbar_test3(); scrollbar_test4(); + scrollbar_test_track(); /* Some test results vary depending of theming being active or not */ hUxtheme = LoadLibraryA("uxtheme.dll"); Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… ============================================================================== --- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Sun Apr 4 15:47:45 2010 @@ -2476,10 +2476,39 @@ check_wnd_state(hwnd, hwnd, hwnd, 0); } +struct create_window_thread_params +{ + HWND window; + HANDLE window_created; + HANDLE test_finished; +}; + +static DWORD WINAPI create_window_thread(void *param) +{ + struct create_window_thread_params *p = param; + DWORD res; + BOOL ret; + + p->window = CreateWindowA("static", NULL, WS_POPUP | WS_VISIBLE, 0, 0, 0, 0, 0, 0, 0, 0); + + ret = SetEvent(p->window_created); + ok(ret, "SetEvent failed, last error %#x.\n", GetLastError()); + + res = WaitForSingleObject(p->test_finished, INFINITE); + ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError()); + + DestroyWindow(p->window); + return 0; +} + static void test_SetForegroundWindow(HWND hwnd) { + struct create_window_thread_params thread_params; + HANDLE thread; + DWORD res, tid; BOOL ret; HWND hwnd2; + MSG msg; flush_events( TRUE ); ShowWindow(hwnd, SW_HIDE); @@ -2552,6 +2581,34 @@ DestroyWindow(hwnd2); check_wnd_state(hwnd, hwnd, hwnd, 0); + + hwnd2 = CreateWindowA("static", NULL, WS_POPUP | WS_VISIBLE, 0, 0, 0, 0, 0, 0, 0, 0); + check_wnd_state(hwnd2, hwnd2, hwnd2, 0); + + thread_params.window_created = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(!!thread_params.window_created, "CreateEvent failed, last error %#x.\n", GetLastError()); + thread_params.test_finished = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(!!thread_params.test_finished, "CreateEvent failed, last error %#x.\n", GetLastError()); + thread = CreateThread(NULL, 0, create_window_thread, &thread_params, 0, &tid); + ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); + res = WaitForSingleObject(thread_params.window_created, INFINITE); + ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError()); + check_wnd_state(hwnd2, thread_params.window, hwnd2, 0); + + SetForegroundWindow(hwnd2); + check_wnd_state(hwnd2, hwnd2, hwnd2, 0); + + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + if (0) check_wnd_state(hwnd2, hwnd2, hwnd2, 0); + todo_wine ok(GetActiveWindow() == hwnd2, "Expected active window %p, got %p.\n", hwnd2, GetActiveWindow()); + todo_wine ok(GetFocus() == hwnd2, "Expected focus window %p, got %p.\n", hwnd2, GetFocus()); + + SetEvent(thread_params.test_finished); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread_params.test_finished); + CloseHandle(thread_params.window_created); + CloseHandle(thread); + DestroyWindow(hwnd2); } static WNDPROC old_button_proc; @@ -2953,7 +3010,7 @@ BOOL ret; LRESULT res; - ShowWindow(hwnd, SW_SHOW); + ShowWindow(hwnd, SW_SHOWNORMAL); UpdateWindow(hwnd); SetWindowPos( hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE ); @@ -5161,6 +5218,7 @@ NULL, NULL, 0, &flags); ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); + flush_events( FALSE ); while(PeekMessage(&msg, hwnd, 0, 0, PM_REMOVE) != 0) { if (msg.message == WM_PAINT) loopcount++; @@ -5979,7 +6037,7 @@ test_capture_1(); test_capture_2(); test_capture_3(hwndMain, hwndMain2); -// test_capture_4(); + test_capture_4(); test_CreateWindow(); test_parent_owner(); @@ -6019,7 +6077,7 @@ test_layered_window(); test_SetForegroundWindow(hwndMain); -// test_shell_window(); + test_shell_window(); test_handles( hwndMain ); test_winregion();

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs