Ros-diffs December 2009

ros-diffs@reactos.org

22 participants
501 discussions

[gschneider] 44539: [videoprt] Split complicated asserts for easier problem understanding as seen in bug #4354

by gschneider＠svn.reactos.org

Author: gschneider Date: Fri Dec 11 17:09:01 2009 New Revision: 44539 URL: http://svn.reactos.org/svn/reactos?rev=44539&view=rev Log: [videoprt] Split complicated asserts for easier problem understanding as seen in bug #4354 Modified: trunk/reactos/drivers/video/videoprt/agp.c trunk/reactos/drivers/video/videoprt/dispatch.c trunk/reactos/drivers/video/videoprt/resource.c Modified: trunk/reactos/drivers/video/videoprt/agp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/agp… ============================================================================== --- trunk/reactos/drivers/video/videoprt/agp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/agp.c [iso-8859-1] Fri Dec 11 17:09:01 2009 @@ -507,10 +507,16 @@ AgpBusInterface = &DeviceExtension->AgpInterface; AgpInterface = (PVIDEO_PORT_AGP_INTERFACE_2)Interface; - ASSERT((Interface->Version == VIDEO_PORT_AGP_INTERFACE_VERSION_2 && - Interface->Size >= sizeof(VIDEO_PORT_AGP_INTERFACE_2)) || - (Interface->Version == VIDEO_PORT_AGP_INTERFACE_VERSION_1 && - Interface->Size >= sizeof(VIDEO_PORT_AGP_INTERFACE))); + ASSERT(Interface->Version == VIDEO_PORT_AGP_INTERFACE_VERSION_2 || + Interface->Version == VIDEO_PORT_AGP_INTERFACE_VERSION_1); + if (Interface->Version == VIDEO_PORT_AGP_INTERFACE_VERSION_2) + { + ASSERT(Interface->Size >= sizeof(VIDEO_PORT_AGP_INTERFACE_2)); + } + else if (Interface->Version == VIDEO_PORT_AGP_INTERFACE_VERSION_1) + { + ASSERT(Interface->Size >= sizeof(VIDEO_PORT_AGP_INTERFACE)); + } if (DeviceExtension->NextDeviceObject == NULL) { Modified: trunk/reactos/drivers/video/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dis… ============================================================================== --- trunk/reactos/drivers/video/videoprt/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/dispatch.c [iso-8859-1] Fri Dec 11 17:09:01 2009 @@ -361,10 +361,10 @@ FullList->InterfaceType, FullList->BusNumber, DeviceExtension->SystemIoBusNumber, FullList->PartialResourceList.Version, FullList->PartialResourceList.Revision); /* FIXME: Is this ASSERT ok for resources from the PNP manager? */ - ASSERT(FullList->InterfaceType == PCIBus && - FullList->BusNumber == DeviceExtension->SystemIoBusNumber && - 1 == FullList->PartialResourceList.Version && - 1 == FullList->PartialResourceList.Revision); + ASSERT(FullList->InterfaceType == PCIBus); + ASSERT(FullList->BusNumber == DeviceExtension->SystemIoBusNumber); + ASSERT(1 == FullList->PartialResourceList.Version); + ASSERT(1 == FullList->PartialResourceList.Revision); for (Descriptor = FullList->PartialResourceList.PartialDescriptors; Descriptor < FullList->PartialResourceList.PartialDescriptors + FullList->PartialResourceList.Count; Descriptor++) Modified: trunk/reactos/drivers/video/videoprt/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/res… ============================================================================== --- trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] Fri Dec 11 17:09:01 2009 @@ -522,10 +522,10 @@ INFO_(VIDEOPRT, "InterfaceType %u BusNumber List %u Device BusNumber %u Version %u Revision %u\n", FullList->InterfaceType, FullList->BusNumber, DeviceExtension->SystemIoBusNumber, FullList->PartialResourceList.Version, FullList->PartialResourceList.Revision); - ASSERT(FullList->InterfaceType == PCIBus && - FullList->BusNumber == DeviceExtension->SystemIoBusNumber && - 1 == FullList->PartialResourceList.Version && - 1 == FullList->PartialResourceList.Revision); + ASSERT(FullList->InterfaceType == PCIBus); + ASSERT(FullList->BusNumber == DeviceExtension->SystemIoBusNumber); + ASSERT(1 == FullList->PartialResourceList.Version); + ASSERT(1 == FullList->PartialResourceList.Revision); for (Descriptor = FullList->PartialResourceList.PartialDescriptors; Descriptor < FullList->PartialResourceList.PartialDescriptors + FullList->PartialResourceList.Count; Descriptor++)

14 years, 10 months

[janderwald] 44538: [MMIXER] - Add mixerline for audio filters which expose their topology on the same filter such as usb audio cards - Retrieve pin name of the target pin in order to display the correct name for the destination audio mixer line

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Dec 11 15:01:39 2009 New Revision: 44538 URL: http://svn.reactos.org/svn/reactos?rev=44538&view=rev Log: [MMIXER] - Add mixerline for audio filters which expose their topology on the same filter such as usb audio cards - Retrieve pin name of the target pin in order to display the correct name for the destination audio mixer line Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Fri Dec 11 15:01:39 2009 @@ -534,7 +534,8 @@ MMixerCreateDestinationLine( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_INFO MixerInfo, - IN ULONG bInputMixer) + IN ULONG bInputMixer, + IN LPWSTR LineName) { LPMIXERLINE_EXT DestinationLine; @@ -554,8 +555,19 @@ DestinationLine->Line.dwUser = 0; DestinationLine->Line.dwComponentType = (bInputMixer == 0 ? MIXERLINE_COMPONENTTYPE_DST_SPEAKERS : MIXERLINE_COMPONENTTYPE_DST_WAVEIN); DestinationLine->Line.cChannels = 2; //FIXME - wcscpy(DestinationLine->Line.szShortName, L"Summe"); //FIXME - wcscpy(DestinationLine->Line.szName, L"Summe"); //FIXME + + if (LineName) + { + wcscpy(DestinationLine->Line.szShortName, LineName); + wcscpy(DestinationLine->Line.szName, LineName); + } + else + { + /* FIXME no name was found for pin */ + wcscpy(DestinationLine->Line.szShortName, L"Summe"); + wcscpy(DestinationLine->Line.szName, L"Summe"); + } + DestinationLine->Line.Target.dwType = (bInputMixer == 0 ? MIXERLINE_TARGETTYPE_WAVEOUT : MIXERLINE_TARGETTYPE_WAVEIN); DestinationLine->Line.Target.dwDeviceID = !bInputMixer; DestinationLine->Line.Target.wMid = MixerInfo->MixCaps.wMid; @@ -798,6 +810,9 @@ ULONG Index; ULONG * Pins; ULONG bUsed; + ULONG BytesReturned; + KSP_PIN Pin; + LPWSTR Buffer = NULL; // allocate a mixer info struct MixerInfo = (LPMIXER_INFO) MixerContext->Alloc(sizeof(MIXER_INFO)); @@ -820,15 +835,6 @@ /* FIXME find mixer name */ - Status = MMixerCreateDestinationLine(MixerContext, MixerInfo, bInputMixer); - if (Status != MM_STATUS_SUCCESS) - { - // failed to create destination line - MixerContext->Free(MixerInfo); - return Status; - } - - // now allocate an array which will receive the indices of the pin // which has a ADC / DAC nodetype in its path Pins = (PULONG)MixerContext->Alloc(PinCount * sizeof(ULONG)); @@ -840,6 +846,65 @@ return MM_STATUS_NO_MEMORY; } + // now get the target pins of the ADC / DAC node + Status = MMixerGetTargetPins(MixerContext, NodeTypes, NodeConnections, NodeIndex, !bInputMixer, Pins, PinCount); + + for(Index = 0; Index < PinCount; Index++) + { + if (Pins[Index]) + { + /* retrieve pin name */ + Pin.PinId = Index; + Pin.Reserved = 0; + Pin.Property.Flags = KSPROPERTY_TYPE_GET; + Pin.Property.Set = KSPROPSETID_Pin; + Pin.Property.Id = KSPROPERTY_PIN_NAME; + + /* try get pin name size */ + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), NULL, 0, &BytesReturned); + + if (Status == MM_STATUS_MORE_ENTRIES) + { + Buffer = (LPWSTR)MixerContext->Alloc(BytesReturned); + if (Buffer) + { + /* try get pin name */ + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (PVOID)Buffer, BytesReturned, &BytesReturned); + if (Status != MM_STATUS_SUCCESS) + { + MixerContext->Free((PVOID)Buffer); + Buffer = NULL; + } + else + { + // found name, done + break; + } + } + } + } + } + + Status = MMixerCreateDestinationLine(MixerContext, MixerInfo, bInputMixer, Buffer); + + if (Buffer) + { + // free name + MixerContext->Free(Buffer); + } + + if (Status != MM_STATUS_SUCCESS) + { + // failed to create destination line + MixerContext->Free(MixerInfo); + MixerContext->Free(Pins); + + return Status; + } + + + + RtlZeroMemory(Pins, sizeof(ULONG) * PinCount); // now get the target pins of the ADC / DAC node Status = MMixerGetTargetPins(MixerContext, NodeTypes, NodeConnections, NodeIndex, bInputMixer, Pins, PinCount); @@ -872,6 +937,12 @@ MixerContext->Free(OutConnection); bUsed = TRUE; } + else + { + // filter exposes the topology on the same filter + MMixerAddMixerSourceLine(MixerContext, MixerInfo, hMixer, NodeConnections, NodeTypes, Index, FALSE, FALSE); + bUsed = TRUE; + } } } MixerContext->Free(Pins); @@ -879,14 +950,22 @@ if (bUsed) { // store mixer info in list - InsertTailList(&MixerList->MixerList, &MixerInfo->Entry); + if (!bInputMixer && MixerList->MixerListCount == 1) + { + //FIXME preferred device should be inserted at front + //windows always inserts output mixer in front + InsertHeadList(&MixerList->MixerList, &MixerInfo->Entry); + } + else + { + InsertTailList(&MixerList->MixerList, &MixerInfo->Entry); + } MixerList->MixerListCount++; DPRINT("New MixerCount %lu\n", MixerList->MixerListCount); } else { - // TODO: - // filter exposes its topology on the same filter + // failed to create a mixer topology MMixerFreeMixerInfo(MixerContext, MixerInfo); } @@ -934,7 +1013,6 @@ if (NodeIndex != MAXULONG) { // it has - Status = MMixerInitializeFilter(MixerContext, MixerList, hMixer, DeviceName, NodeTypes, NodeConnections, PinCount, NodeIndex, FALSE); DPRINT("MMixerInitializeFilter Status %u\n", Status); // check for success

14 years, 10 months

[sserapion] 44537: Fix i386 build

by sserapion＠svn.reactos.org

Author: sserapion Date: Fri Dec 11 13:29:05 2009 New Revision: 44537 URL: http://svn.reactos.org/svn/reactos?rev=44537&view=rev Log: Fix i386 build Modified: branches/ros-amd64-bringup/rostests/tests/bench/bench-thread.c Modified: branches/ros-amd64-bringup/rostests/tests/bench/bench-thread.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/test… ============================================================================== --- branches/ros-amd64-bringup/rostests/tests/bench/bench-thread.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/rostests/tests/bench/bench-thread.c [iso-8859-1] Fri Dec 11 13:29:05 2009 @@ -7,7 +7,7 @@ DWORD WINAPI thread_main1(LPVOID param) { - printf("Thread 1 running (Counter %lu)\n", param); + printf("Thread 1 running (Counter %lu)\n", PtrToLong(param)); SleepEx(INFINITE, TRUE); return 0; } @@ -16,7 +16,7 @@ DWORD WINAPI thread_main2(LPVOID param) { - printf("Thread 2 running (Counter %lu)\n", param); + printf("Thread 2 running (Counter %lu)\n", PtrToLong(param)); Sleep(INFINITE); return 0; }

14 years, 10 months

[sserapion] 44536: Fix i386 build

by sserapion＠svn.reactos.org

Author: sserapion Date: Fri Dec 11 13:15:23 2009 New Revision: 44536 URL: http://svn.reactos.org/svn/reactos?rev=44536&view=rev Log: Fix i386 build Modified: branches/ros-amd64-bringup/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.rbuild Modified: branches/ros-amd64-bringup/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rostests/apit… ============================================================================== --- branches/ros-amd64-bringup/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.rbuild [iso-8859-1] Fri Dec 11 13:15:23 2009 @@ -1,7 +1,7 @@ <module name="w32kdll_vista" type="win32dll" entrypoint="0" installname="w32kdll_vista.dll"> <importlibrary definition="w32kdll_vista-$(ARCH).def" /> <if property="ARCH" value="i386"> - <file>w32kdll_vista.S</file> + <file>w32kdll_vista-i386.S</file> </if> <if property="ARCH" value="amd64"> <file>w32kdll_vista-amd64.S</file>

14 years, 10 months

[gschneider] 44535: [msfs] Silence debug print

by gschneider＠svn.reactos.org

Author: gschneider Date: Fri Dec 11 11:45:27 2009 New Revision: 44535 URL: http://svn.reactos.org/svn/reactos?rev=44535&view=rev Log: [msfs] Silence debug print Modified: trunk/reactos/drivers/filesystems/msfs/create.c Modified: trunk/reactos/drivers/filesystems/msfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] Fri Dec 11 11:45:27 2009 @@ -303,7 +303,7 @@ if (Fcb->ReferenceCount == 0) { - DPRINT1("ReferenceCount == 0: Deleting mailslot data\n"); + DPRINT("ReferenceCount == 0: Deleting mailslot data\n"); RemoveEntryList(&Fcb->FcbListEntry); ExFreePool(Fcb->Name.Buffer); ExFreePool(Fcb);

14 years, 10 months

[gschneider] 44534: Jan Roeloffzen <jroeloffzen AT hotmail DOT com>: Change "MBR" to "bootsector" (nl) See issue #5011 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Fri Dec 11 11:06:04 2009 New Revision: 44534 URL: http://svn.reactos.org/svn/reactos?rev=44534&view=rev Log: Jan Roeloffzen <jroeloffzen AT hotmail DOT com>: Change "MBR" to "bootsector" (nl) See issue #5011 for more details. Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Fri Dec 11 11:06:04 2009 @@ -1013,7 +1013,7 @@ { 8, 12, - "Installeer de bootloader op de harde schijf (MBR).", + "Installeer de bootloader op de harde schijf (bootsector).", TEXT_STYLE_NORMAL }, {

14 years, 10 months

[gschneider] 44533: [msfs] Mail slot file system driver bring up 2/2: - Don't allow to create two mail slots with the same name - Pass a timeout return status when no message are found after waiting - Clients aren't allowed to query mail slot info, this works now - add the code back

by gschneider＠svn.reactos.org

Author: gschneider Date: Fri Dec 11 10:45:07 2009 New Revision: 44533 URL: http://svn.reactos.org/svn/reactos?rev=44533&view=rev Log: [msfs] Mail slot file system driver bring up 2/2: - Don't allow to create two mail slots with the same name - Pass a timeout return status when no message are found after waiting - Clients aren't allowed to query mail slot info, this works now - add the code back Modified: trunk/reactos/drivers/filesystems/msfs/create.c trunk/reactos/drivers/filesystems/msfs/finfo.c trunk/reactos/drivers/filesystems/msfs/rw.c Modified: trunk/reactos/drivers/filesystems/msfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] Fri Dec 11 10:45:07 2009 @@ -16,6 +16,7 @@ /* FUNCTIONS *****************************************************************/ +/* Creates the client side */ NTSTATUS DEFAULTAPI MsfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -99,6 +100,7 @@ } +/* Creates the server side */ NTSTATUS DEFAULTAPI MsfsCreateMailslot(PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -197,7 +199,14 @@ ExFreePool(Fcb->Name.Buffer); ExFreePool(Fcb); - Fcb = current; + KeUnlockMutex(&DeviceExtension->FcbListLock); + + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_UNSUCCESSFUL; } else { Modified: trunk/reactos/drivers/filesystems/msfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/finfo.c [iso-8859-1] Fri Dec 11 10:45:07 2009 @@ -95,6 +95,19 @@ DPRINT("Mailslot name: %wZ\n", &Fcb->Name); + /* querying information is not permitted on client side */ + if (Fcb->ServerCcb != Ccb) + { + Status = STATUS_ACCESS_DENIED; + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; + } + SystemBuffer = Irp->AssociatedIrp.SystemBuffer; BufferLength = IoStack->Parameters.QueryFile.Length; Modified: trunk/reactos/drivers/filesystems/msfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] Fri Dec 11 10:45:07 2009 @@ -62,25 +62,33 @@ KernelMode, FALSE, &Fcb->TimeOut); - if ((NT_SUCCESS(Status)) && (Fcb->MessageCount > 0)) + if (NT_SUCCESS(Status)) { - /* copy current message into buffer */ - Message = CONTAINING_RECORD(Fcb->MessageListHead.Flink, - MSFS_MESSAGE, - MessageListEntry); + if (Fcb->MessageCount > 0) + { + /* copy current message into buffer */ + Message = CONTAINING_RECORD(Fcb->MessageListHead.Flink, + MSFS_MESSAGE, + MessageListEntry); - memcpy(Buffer, &Message->Buffer, min(Message->Size,Length)); - LengthRead = Message->Size; + memcpy(Buffer, &Message->Buffer, min(Message->Size,Length)); + LengthRead = Message->Size; - KeAcquireSpinLock(&Fcb->MessageListLock, &oldIrql); - RemoveHeadList(&Fcb->MessageListHead); - KeReleaseSpinLock(&Fcb->MessageListLock, oldIrql); + KeAcquireSpinLock(&Fcb->MessageListLock, &oldIrql); + RemoveHeadList(&Fcb->MessageListHead); + KeReleaseSpinLock(&Fcb->MessageListLock, oldIrql); - ExFreePool(Message); - Fcb->MessageCount--; - if (Fcb->MessageCount == 0) + ExFreePool(Message); + Fcb->MessageCount--; + if (Fcb->MessageCount == 0) + { + KeClearEvent(&Fcb->MessageEvent); + } + } + else if (Fcb->TimeOut.QuadPart != 0LL) { - KeClearEvent(&Fcb->MessageEvent); + /* No message found after waiting */ + Status = STATUS_IO_TIMEOUT; } }

14 years, 10 months

[jimtabor] 44532: [Win32k] - Message.c: Formating, filter out the noise from the ambient. - Message.c:co_IntDoSendMessage: Fix return if no WND structure was allocated for window object. Add check if window exiting. Add Hook and message type checks.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Dec 11 01:33:59 2009 New Revision: 44532 URL: http://svn.reactos.org/svn/reactos?rev=44532&view=rev Log: [Win32k] - Message.c: Formating, filter out the noise from the ambient. - Message.c:co_IntDoSendMessage: Fix return if no WND structure was allocated for window object. Add check if window exiting. Add Hook and message type checks. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Fri Dec 11 01:33:59 2009 @@ -484,8 +484,11 @@ } BOOL FASTCALL -co_IntActivateWindowMouse(PUSER_MESSAGE_QUEUE ThreadQueue, LPMSG Msg, PWINDOW_OBJECT MsgWindow, - USHORT *HitTest) +co_IntActivateWindowMouse( + PUSER_MESSAGE_QUEUE ThreadQueue, + LPMSG Msg, + PWINDOW_OBJECT MsgWindow, + USHORT *HitTest) { ULONG Result; PWINDOW_OBJECT Parent; @@ -526,7 +529,11 @@ } BOOL FASTCALL -co_IntTranslateMouseMessage(PUSER_MESSAGE_QUEUE ThreadQueue, LPMSG Msg, USHORT *HitTest, BOOL Remove) +co_IntTranslateMouseMessage( + PUSER_MESSAGE_QUEUE ThreadQueue, + LPMSG Msg, + USHORT *HitTest, + BOOL Remove) { PWINDOW_OBJECT Window; USER_REFERENCE_ENTRY Ref, DesktopRef; @@ -539,28 +546,28 @@ UserRefObjectCo(Window, &Ref); - if(ThreadQueue == Window->MessageQueue && - ThreadQueue->CaptureWindow != Window->hSelf) + if ( ThreadQueue == Window->MessageQueue && + ThreadQueue->CaptureWindow != Window->hSelf) { /* only send WM_NCHITTEST messages if we're not capturing the window! */ *HitTest = co_IntSendMessage(Window->hSelf, WM_NCHITTEST, 0, MAKELONG(Msg->pt.x, Msg->pt.y)); - if(*HitTest == (USHORT)HTTRANSPARENT) + if (*HitTest == (USHORT)HTTRANSPARENT) { PWINDOW_OBJECT DesktopWindow; HWND hDesktop = IntGetDesktopWindow(); - if((DesktopWindow = UserGetWindowObject(hDesktop))) + if ((DesktopWindow = UserGetWindowObject(hDesktop))) { PWINDOW_OBJECT Wnd; UserRefObjectCo(DesktopWindow, &DesktopRef); co_WinPosWindowFromPoint(DesktopWindow, Window->MessageQueue, &Msg->pt, &Wnd); - if(Wnd) + if (Wnd) { - if(Wnd != Window) + if (Wnd != Window) { /* post the message to the other window */ Msg->hwnd = Wnd->hSelf; @@ -589,7 +596,9 @@ *HitTest = HTCLIENT; } - if (gspv.bMouseClickLock && ((Msg->message == WM_LBUTTONUP) || (Msg->message == WM_LBUTTONDOWN))) + if ( gspv.bMouseClickLock && + ( (Msg->message == WM_LBUTTONUP) || + (Msg->message == WM_LBUTTONDOWN) ) ) { if (MsqIsClkLck(Msg, Remove)) { @@ -598,7 +607,7 @@ } } - if(IS_BTN_MESSAGE(Msg->message, DOWN)) + if (IS_BTN_MESSAGE(Msg->message, DOWN)) { /* generate double click messages, if necessary */ if ((((*HitTest) != HTCLIENT) || @@ -615,8 +624,8 @@ if ((*HitTest) != HTCLIENT) { Msg->message += WM_NCMOUSEMOVE - WM_MOUSEMOVE; - if((Msg->message == WM_NCRBUTTONUP) && - (((*HitTest) == HTCAPTION) || ((*HitTest) == HTSYSMENU))) + if ( (Msg->message == WM_NCRBUTTONUP) && + (((*HitTest) == HTCAPTION) || ((*HitTest) == HTSYSMENU)) ) { Msg->message = WM_CONTEXTMENU; Msg->wParam = (WPARAM)Window->hSelf; @@ -627,8 +636,8 @@ } Msg->lParam = MAKELONG(Msg->pt.x, Msg->pt.y); } - else if(ThreadQueue->MoveSize == NULL && - ThreadQueue->MenuOwner == NULL) + else if ( ThreadQueue->MoveSize == NULL && + ThreadQueue->MenuOwner == NULL ) { /* NOTE: Msg->pt should remain in screen coordinates. -- FiN */ Msg->lParam = MAKELONG( @@ -645,11 +654,11 @@ * Internal version of PeekMessage() doing all the work */ BOOL FASTCALL -co_IntPeekMessage(PUSER_MESSAGE Msg, - PWINDOW_OBJECT Window, - UINT MsgFilterMin, - UINT MsgFilterMax, - UINT RemoveMsg) +co_IntPeekMessage( PUSER_MESSAGE Msg, + PWINDOW_OBJECT Window, + UINT MsgFilterMin, + UINT MsgFilterMax, + UINT RemoveMsg ) { PTHREADINFO pti; LARGE_INTEGER LargeTickCount; @@ -700,13 +709,13 @@ } /* Now check for normal messages. */ - Present = co_MsqFindMessage(ThreadQueue, - FALSE, - RemoveMessages, - Window, - MsgFilterMin, - MsgFilterMax, - &Message); + Present = co_MsqFindMessage( ThreadQueue, + FALSE, + RemoveMessages, + Window, + MsgFilterMin, + MsgFilterMax, + &Message ); if (Present) { RtlCopyMemory(Msg, Message, sizeof(USER_MESSAGE)); @@ -718,13 +727,13 @@ } /* Check for hardware events. */ - Present = co_MsqFindMessage(ThreadQueue, - TRUE, - RemoveMessages, - Window, - MsgFilterMin, - MsgFilterMax, - &Message); + Present = co_MsqFindMessage( ThreadQueue, + TRUE, + RemoveMessages, + Window, + MsgFilterMin, + MsgFilterMax, + &Message ); if (Present) { RtlCopyMemory(Msg, Message, sizeof(USER_MESSAGE)); @@ -740,7 +749,12 @@ ; /* Check for paint messages. */ - if (IntGetPaintMessage(Window, MsgFilterMin, MsgFilterMax, pti, &Msg->Msg, RemoveMessages)) + if ( IntGetPaintMessage( Window, + MsgFilterMin, + MsgFilterMax, + pti, + &Msg->Msg, + RemoveMessages)) { Msg->FreeLParam = FALSE; goto MsgExit; @@ -752,8 +766,12 @@ // LOL! Polling Timer Queue? How much time is spent doing this? /* Check for WM_(SYS)TIMER messages */ - Present = MsqGetTimerMessage(ThreadQueue, Window, MsgFilterMin, MsgFilterMax, - &Msg->Msg, RemoveMessages); + Present = MsqGetTimerMessage( ThreadQueue, + Window, + MsgFilterMin, + MsgFilterMax, + &Msg->Msg, + RemoveMessages); if (Present) { Msg->FreeLParam = FALSE; @@ -768,16 +786,23 @@ { PWINDOW_OBJECT MsgWindow = NULL; - if(Msg->Msg.hwnd && (MsgWindow = UserGetWindowObject(Msg->Msg.hwnd)) && - Msg->Msg.message >= WM_MOUSEFIRST && Msg->Msg.message <= WM_MOUSELAST) + /* Mouse message process */ + + if( Msg->Msg.hwnd && + ( MsgWindow = UserGetWindowObject(Msg->Msg.hwnd) ) && + Msg->Msg.message >= WM_MOUSEFIRST && + Msg->Msg.message <= WM_MOUSELAST ) { USHORT HitTest; UserRefObjectCo(MsgWindow, &Ref); - if(co_IntTranslateMouseMessage(ThreadQueue, &Msg->Msg, &HitTest, TRUE)) - /* FIXME - check message filter again, if the message doesn't match anymore, - search again */ + if ( co_IntTranslateMouseMessage( ThreadQueue, + &Msg->Msg, + &HitTest, + TRUE)) + /* FIXME - check message filter again, if the message doesn't match anymore, + search again */ { UserDerefObjectCo(MsgWindow); /* eat the message, search again */ @@ -787,9 +812,11 @@ if(ThreadQueue->CaptureWindow == NULL) { co_IntSendHitTestMessages(ThreadQueue, &Msg->Msg); - if((Msg->Msg.message != WM_MOUSEMOVE && Msg->Msg.message != WM_NCMOUSEMOVE) && + + if ( ( Msg->Msg.message != WM_MOUSEMOVE && + Msg->Msg.message != WM_NCMOUSEMOVE ) && IS_BTN_MESSAGE(Msg->Msg.message, DOWN) && - co_IntActivateWindowMouse(ThreadQueue, &Msg->Msg, MsgWindow, &HitTest)) + co_IntActivateWindowMouse(ThreadQueue, &Msg->Msg, MsgWindow, &HitTest) ) { UserDerefObjectCo(MsgWindow); /* eat the message, search again */ @@ -812,14 +839,19 @@ goto MsgExit; } - if((Msg->Msg.hwnd && Msg->Msg.message >= WM_MOUSEFIRST && Msg->Msg.message <= WM_MOUSELAST) && - co_IntTranslateMouseMessage(ThreadQueue, &Msg->Msg, &HitTest, FALSE)) - /* FIXME - check message filter again, if the message doesn't match anymore, - search again */ + if ( ( Msg->Msg.hwnd && Msg->Msg.message >= WM_MOUSEFIRST && + Msg->Msg.message <= WM_MOUSELAST ) && + co_IntTranslateMouseMessage( ThreadQueue, + &Msg->Msg, + &HitTest, + FALSE) ) + /* FIXME - check message filter again, if the message doesn't match anymore, + search again */ { /* eat the message, search again */ goto CheckMessages; } + MsgExit: if ( ISITHOOKED(WH_MOUSE) && Msg->Msg.message >= WM_MOUSEFIRST && @@ -840,12 +872,15 @@ MHook.hwnd = Msg->Msg.hwnd; MHook.wHitTestCode = HitTest; MHook.dwExtraInfo = 0; - co_HOOK_CallHooks( WH_CBT, HCBT_CLICKSKIPPED, - Msg->Msg.message, (LPARAM)&MHook); + co_HOOK_CallHooks( WH_CBT, + HCBT_CLICKSKIPPED, + Msg->Msg.message, + (LPARAM)&MHook); } return FALSE; } } + if ( ISITHOOKED(WH_KEYBOARD) && (Msg->Msg.message == WM_KEYDOWN || Msg->Msg.message == WM_KEYUP) ) { @@ -857,8 +892,10 @@ if (ISITHOOKED(WH_CBT)) { /* skip this message */ - co_HOOK_CallHooks( WH_CBT, HCBT_KEYSKIPPED, - LOWORD(Msg->Msg.wParam), Msg->Msg.lParam ); + co_HOOK_CallHooks( WH_CBT, + HCBT_KEYSKIPPED, + LOWORD(Msg->Msg.wParam), + Msg->Msg.lParam ); } return FALSE; } @@ -882,20 +919,20 @@ UINT MsgFilterMin, UINT MsgFilterMax, UINT RemoveMsg, - BOOL bGMSG) + BOOL bGMSG ) { return FALSE; } static BOOL FASTCALL -co_IntWaitMessage(PWINDOW_OBJECT Window, - UINT MsgFilterMin, - UINT MsgFilterMax) +co_IntWaitMessage( PWINDOW_OBJECT Window, + UINT MsgFilterMin, + UINT MsgFilterMax ) { PTHREADINFO pti; PUSER_MESSAGE_QUEUE ThreadQueue; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; USER_MESSAGE Msg; pti = PsGetCurrentThreadWin32Thread(); @@ -903,16 +940,26 @@ do { - if (co_IntPeekMessage(&Msg, Window, MsgFilterMin, MsgFilterMax, PM_NOREMOVE)) + if ( co_IntPeekMessage( &Msg, + Window, + MsgFilterMin, + MsgFilterMax, + PM_NOREMOVE)) { return TRUE; } /* Nothing found. Wait for new messages. */ - Status = co_MsqWaitForNewMessages(ThreadQueue, Window, MsgFilterMin, MsgFilterMax); - } - while ((STATUS_WAIT_0 <= Status && Status <= STATUS_WAIT_63) || STATUS_TIMEOUT == Status); + Status = co_MsqWaitForNewMessages( ThreadQueue, + Window, + MsgFilterMin, + MsgFilterMax); + } + while ( (STATUS_WAIT_0 <= Status && Status <= STATUS_WAIT_63) || + STATUS_TIMEOUT == Status ); SetLastNtError(Status); + + DPRINT1("Exit co_IntWaitMessage on error!\n"); return FALSE; } @@ -1016,7 +1063,7 @@ UserPostThreadMessage( DWORD idThread, UINT Msg, WPARAM wParam, - LPARAM lParam) + LPARAM lParam ) { MSG Message; PETHREAD peThread; @@ -1062,10 +1109,10 @@ } BOOL FASTCALL -UserPostMessage(HWND Wnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam) +UserPostMessage( HWND Wnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam ) { PTHREADINFO pti; MSG Message; @@ -1144,10 +1191,10 @@ LRESULT FASTCALL -co_IntSendMessage(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam) +co_IntSendMessage( HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam ) { ULONG_PTR Result = 0; if(co_IntSendMessageTimeout(hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &Result)) @@ -1159,13 +1206,13 @@ static LRESULT FASTCALL -co_IntSendMessageTimeoutSingle(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - UINT uFlags, - UINT uTimeout, - ULONG_PTR *uResult) +co_IntSendMessageTimeoutSingle( HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + UINT uFlags, + UINT uTimeout, + ULONG_PTR *uResult ) { ULONG_PTR Result; NTSTATUS Status; @@ -1188,8 +1235,8 @@ IntCallWndProc( Window, hWnd, Msg, wParam, lParam); - if (NULL != Win32Thread && - Window->MessageQueue == Win32Thread->MessageQueue) + if ( NULL != Win32Thread && + Window->MessageQueue == Win32Thread->MessageQueue) { if (Win32Thread->TIF_flags & TIF_INCLEANUP) { @@ -1220,7 +1267,7 @@ Msg, wParam, lParamPacked, - lParamBufferSize); + lParamBufferSize ); if(uResult) { *uResult = Result; @@ -1260,7 +1307,7 @@ uTimeout, (uFlags & SMTO_BLOCK), MSQ_NORMAL, - uResult); + uResult ); } while ((STATUS_TIMEOUT == Status) && (uFlags & SMTO_NOTIMEOUTIFNOTHUNG) && @@ -1295,13 +1342,13 @@ } LRESULT FASTCALL -co_IntSendMessageTimeout(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - UINT uFlags, - UINT uTimeout, - ULONG_PTR *uResult) +co_IntSendMessageTimeout( HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + UINT uFlags, + UINT uTimeout, + ULONG_PTR *uResult ) { PWINDOW_OBJECT DesktopWindow; HWND *Children; @@ -1340,16 +1387,16 @@ another thread, otherwise it sends the message. It does not support broadcast messages! */ LRESULT FASTCALL -co_IntPostOrSendMessage(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam) +co_IntPostOrSendMessage( HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam ) { ULONG_PTR Result; PTHREADINFO pti; PWINDOW_OBJECT Window; - if(hWnd == HWND_BROADCAST) + if ( hWnd == HWND_BROADCAST ) { return 0; } @@ -1360,13 +1407,16 @@ } pti = PsGetCurrentThreadWin32Thread(); - if(Window->MessageQueue != pti->MessageQueue && FindMsgMemory(Msg) ==0) + + if ( Window->MessageQueue != pti->MessageQueue && + FindMsgMemory(Msg) == 0 ) { Result = UserPostMessage(hWnd, Msg, wParam, lParam); } else { - if(!co_IntSendMessageTimeoutSingle(hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &Result)) { + if ( !co_IntSendMessageTimeoutSingle(hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &Result) ) + { Result = 0; } } @@ -1375,12 +1425,12 @@ } LRESULT FASTCALL -co_IntDoSendMessage(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - PDOSENDMESSAGE dsm, - PNTUSERSENDMESSAGEINFO UnsafeInfo) +co_IntDoSendMessage( HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + PDOSENDMESSAGE dsm, + PNTUSERSENDMESSAGEINFO UnsafeInfo ) { PTHREADINFO pti; LRESULT Result = TRUE; @@ -1397,23 +1447,31 @@ if (HWND_BROADCAST != hWnd) { Window = UserGetWindowObject(hWnd); - if (NULL == Window) + if ( !Window || !Window->Wnd ) { /* Tell usermode to not touch this one */ Info.HandledByKernel = TRUE; MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERSENDMESSAGEINFO)); return 0; } - if (!Window->Wnd) - return 0; - } - - /* FIXME: Check for an exiting window. */ + } + + /* Check for an exiting window. */ + if (Window && Window->Status & WINDOWSTATUS_DESTROYING) + { + DPRINT1("co_IntDoSendMessage Window Exiting!\n"); + } /* See if the current thread can handle the message */ pti = PsGetCurrentThreadWin32Thread(); - if (HWND_BROADCAST != hWnd && NULL != pti && - Window->MessageQueue == pti->MessageQueue) + + // This is checked in user mode!!!!!!! + if ( HWND_BROADCAST != hWnd && + NULL != pti && + Window->MessageQueue == pti->MessageQueue && + !ISITHOOKED(WH_CALLWNDPROC) && + !ISITHOOKED(WH_CALLWNDPROCRET) && + ( Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST ) ) { /* Gather the information usermode needs to call the window proc directly */ Info.HandledByKernel = FALSE; @@ -1425,15 +1483,8 @@ Info.Ansi = ! Window->Wnd->Unicode; } - IntCallWndProc( Window, hWnd, Msg, wParam, lParam); - Info.Ansi = !Window->Wnd->Unicode; Info.Proc = Window->Wnd->lpfnWndProc; - - // Make the call from here if CALLWNDPROC or CALLWNDPROCRET are hooked - // or just do it in User32! - - IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, &Result); } else { @@ -1448,6 +1499,7 @@ UserModeMsg.wParam = wParam; UserModeMsg.lParam = lParam; MsgMemoryEntry = FindMsgMemory(UserModeMsg.message); + Status = CopyMsgToKernelMem(&KernelModeMsg, &UserModeMsg, MsgMemoryEntry); if (! NT_SUCCESS(Status)) { @@ -1455,17 +1507,25 @@ SetLastWin32Error(ERROR_INVALID_PARAMETER); return (dsm ? 0 : -1); } + if(!dsm) { - Result = co_IntSendMessage(KernelModeMsg.hwnd, KernelModeMsg.message, - KernelModeMsg.wParam, KernelModeMsg.lParam); + Result = co_IntSendMessage( KernelModeMsg.hwnd, + KernelModeMsg.message, + KernelModeMsg.wParam, + KernelModeMsg.lParam ); } else { - Result = co_IntSendMessageTimeout(KernelModeMsg.hwnd, KernelModeMsg.message, - KernelModeMsg.wParam, KernelModeMsg.lParam, - dsm->uFlags, dsm->uTimeout, &dsm->Result); - } + Result = co_IntSendMessageTimeout( KernelModeMsg.hwnd, + KernelModeMsg.message, + KernelModeMsg.wParam, + KernelModeMsg.lParam, + dsm->uFlags, + dsm->uTimeout, + &dsm->Result ); + } + Status = CopyMsgToUserMem(&UserModeMsg, &KernelModeMsg); if (! NT_SUCCESS(Status)) { @@ -1486,10 +1546,10 @@ BOOL FASTCALL -UserSendNotifyMessage(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam) +UserSendNotifyMessage( HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam ) { BOOL Result = TRUE; @@ -1525,10 +1585,11 @@ PWINDOW_OBJECT Window; MSG Message; - if(!(Window = UserGetWindowObject(hWnd))) return FALSE; + if ( !(Window = UserGetWindowObject(hWnd)) ) return FALSE; pti = PsGetCurrentThreadWin32Thread(); - if(Window->MessageQueue != pti->MessageQueue) + + if (Window->MessageQueue != pti->MessageQueue) { // Send message w/o waiting for it. Result = UserPostMessage(hWnd, Msg, wParam, lParam); } @@ -1539,7 +1600,13 @@ Message.wParam = wParam; Message.lParam = lParam; - Result = co_IntSendMessageTimeoutSingle( hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &PResult); + Result = co_IntSendMessageTimeoutSingle( hWnd, + Msg, + wParam, + lParam, + SMTO_NORMAL, + 0, + &PResult ); } } return Result; @@ -1649,15 +1716,17 @@ return 0; } + +////////// API on the way out! LRESULT APIENTRY -NtUserSendMessageTimeout(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - UINT uFlags, - UINT uTimeout, - ULONG_PTR *uResult, - PNTUSERSENDMESSAGEINFO UnsafeInfo) +NtUserSendMessageTimeout( HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + UINT uFlags, + UINT uTimeout, + ULONG_PTR *uResult, + PNTUSERSENDMESSAGEINFO UnsafeInfo ) { DOSENDMESSAGE dsm; LRESULT Result; @@ -1689,11 +1758,11 @@ } LRESULT APIENTRY -NtUserSendMessage(HWND Wnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - PNTUSERSENDMESSAGEINFO UnsafeInfo) +NtUserSendMessage( HWND Wnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + PNTUSERSENDMESSAGEINFO UnsafeInfo ) { DECLARE_RETURN(BOOL); @@ -1707,6 +1776,7 @@ UserLeave(); END_CLEANUP; } +////////// BOOL APIENTRY NtUserWaitMessage(VOID) @@ -1726,10 +1796,10 @@ BOOL APIENTRY -NtUserGetMessage(PNTUSERGETMESSAGEINFO UnsafeInfo, - HWND hWnd, - UINT MsgFilterMin, - UINT MsgFilterMax) +NtUserGetMessage( PNTUSERGETMESSAGEINFO UnsafeInfo, + HWND hWnd, + UINT MsgFilterMin, + UINT MsgFilterMax ) /* * FUNCTION: Get a message from the calling thread's message queue. * ARGUMENTS:

14 years, 10 months

[cfinck] 44531: Here comes ReactOS "FOR WORKGROUPS" 0.3.11! :-)

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Dec 11 00:19:12 2009 New Revision: 44531 URL: http://svn.reactos.org/svn/reactos?rev=44531&view=rev Log: Here comes ReactOS "FOR WORKGROUPS" 0.3.11! :-) Added: branches/ros-branch-0_3_11/reactos/ntoskrnl/inbv/logo/5.psd (with props) Modified: branches/ros-branch-0_3_11/reactos/base/shell/explorer/res/logov.bmp branches/ros-branch-0_3_11/reactos/ntoskrnl/inbv/logo/5.bmp Modified: branches/ros-branch-0_3_11/reactos/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/base/… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_11/reactos/ntoskrnl/inbv/logo/5.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/ntosk… ============================================================================== Binary files - no diff available. Added: branches/ros-branch-0_3_11/reactos/ntoskrnl/inbv/logo/5.psd URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/ntosk… ============================================================================== Binary file - no diff available. Propchange: branches/ros-branch-0_3_11/reactos/ntoskrnl/inbv/logo/5.psd ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

14 years, 10 months

[tkreuzer] 44530: Don't include i386/ke.h from ntoskrnl, it's not needed

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 10 22:04:15 2009 New Revision: 44530 URL: http://svn.reactos.org/svn/reactos?rev=44530&view=rev Log: Don't include i386/ke.h from ntoskrnl, it's not needed Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Thu Dec 10 22:04:15 2009 @@ -79,7 +79,6 @@ #include <arch/i386/machxbox.h> #include <arch/i386/miscboot.h> #include <internal/i386/intrin_i.h> -#include <internal/i386/ke.h> #elif defined(_M_PPC) #include <arch/powerpc/hardware.h> #elif defined(_M_ARM)

14 years, 10 months

← Newer
1
...
28
29
30
31
32
33
34
...
51
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2009