Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[ekohl] 14442: NdrSendReceive: Update the message buffer info after the call to I_RpcSendReceive.

by ekohl＠svn.reactos.com

NdrSendReceive: Update the message buffer info after the call to I_RpcSendReceive. Modified: trunk/reactos/lib/rpcrt4/ndr_midl.c _____ Modified: trunk/reactos/lib/rpcrt4/ndr_midl.c --- trunk/reactos/lib/rpcrt4/ndr_midl.c 2005-04-02 14:26:56 UTC (rev 14441) +++ trunk/reactos/lib/rpcrt4/ndr_midl.c 2005-04-02 15:11:36 UTC (rev 14442) @@ -233,12 +233,12 @@ unsigned char *WINAPI NdrGetBuffer(MIDL_STUB_MESSAGE *stubmsg, unsigned long buflen, RPC_BINDING_HANDLE handle) { TRACE("(stubmsg == ^%p, buflen == %lu, handle == %p): wild guess.\n", stubmsg, buflen, handle); - + assert( stubmsg && stubmsg->RpcMsg ); /* I guess this is our chance to put the binding handle into the RPC_MESSAGE */ stubmsg->RpcMsg->Handle = handle; - + stubmsg->RpcMsg->BufferLength = buflen; if (I_RpcGetBuffer(stubmsg->RpcMsg) != S_OK) return NULL; @@ -248,6 +248,7 @@ stubmsg->BufferEnd = stubmsg->Buffer + stubmsg->BufferLength; return (stubmsg->Buffer = (unsigned char *)stubmsg->RpcMsg->Buffer); } + /*********************************************************************** * NdrFreeBuffer [RPCRT4.@] */ @@ -262,28 +263,34 @@ /*********************************************************************** * * NdrSendReceive [RPCRT4.@] */ -unsigned char *WINAPI NdrSendReceive( MIDL_STUB_MESSAGE *stubmsg, unsigned char *buffer ) +unsigned char *WINAPI NdrSendReceive( MIDL_STUB_MESSAGE *pStubMsg, unsigned char *buffer ) { - TRACE("(stubmsg == ^%p, buffer == ^%p)\n", stubmsg, buffer); + TRACE("(pStubMsg == ^%p, buffer == ^%p)\n", pStubMsg, buffer); /* FIXME: how to handle errors? (raise exception?) */ - if (!stubmsg) { + if (!pStubMsg) { ERR("NULL stub message. No action taken.\n"); return NULL; } - if (!stubmsg->RpcMsg) { + if (!pStubMsg->RpcMsg) { ERR("RPC Message not present in stub message. No action taken.\n"); return NULL; } /* FIXME: Seems wrong. Where should this really come from, and when? */ - stubmsg->RpcMsg->DataRepresentation = NDR_LOCAL_DATA_REPRESENTATION; + pStubMsg->RpcMsg->DataRepresentation = NDR_LOCAL_DATA_REPRESENTATION; - if (I_RpcSendReceive(stubmsg->RpcMsg) != RPC_S_OK) { + if (I_RpcSendReceive(pStubMsg->RpcMsg) != RPC_S_OK) { WARN("I_RpcSendReceive did not return success.\n"); /* FIXME: raise exception? */ + return NULL; } + pStubMsg->BufferLength = pStubMsg->RpcMsg->BufferLength; + pStubMsg->BufferStart = pStubMsg->RpcMsg->Buffer; + pStubMsg->BufferEnd = pStubMsg->BufferStart + pStubMsg->BufferLength; + pStubMsg->Buffer = pStubMsg->BufferStart; + /* FIXME: is this the right return value? */ return NULL; }

19 years, 8 months

[mf] 14441: reactivate control panel folder

by mf＠svn.reactos.com

reactivate control panel folder Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.h Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-04-02 14:16:47 UTC (rev 14440) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-04-02 14:26:56 UTC (rev 14441) @@ -40,19 +40,19 @@ HWND MainFrameBase::Create(LPCTSTR path, bool mdi, UINT cmdshow) { - HWND hMainFrame; + HWND hFrame; #ifndef _NO_MDI ///@todo implement command line option to switch between MDI and SDI if (mdi) - hMainFrame = MDIMainFrame::Create(); + hFrame = MDIMainFrame::Create(); else #endif - hMainFrame = SDIMainFrame::Create(); + hFrame = SDIMainFrame::Create(); - if (hMainFrame) { + if (hFrame) { HWND hwndOld = g_Globals._hMainWnd; - g_Globals._hMainWnd = hMainFrame; + g_Globals._hMainWnd = hFrame; if (path) { static String sPath = path; // copy path to avoid accessing freed memory @@ -62,8 +62,8 @@ if (hwndOld) DestroyWindow(hwndOld); - ShowWindow(hMainFrame, cmdshow); - UpdateWindow(hMainFrame); + ShowWindow(hFrame, cmdshow); + UpdateWindow(hFrame); bool valid_dir = false; @@ -78,12 +78,12 @@ // Open the first child window after initializing the application if (valid_dir) - PostMessage(hMainFrame, PM_OPEN_WINDOW, 0, (LPARAM)path); + PostMessage(hFrame, PM_OPEN_WINDOW, 0, (LPARAM)path); else - PostMessage(hMainFrame, PM_OPEN_WINDOW, OWM_EXPLORE|OWM_DETAILS, 0); + PostMessage(hFrame, PM_OPEN_WINDOW, OWM_EXPLORE|OWM_DETAILS, 0); } - return hMainFrame; + return hFrame; } @@ -842,34 +842,34 @@ HWND MDIMainFrame::Create(LPCTSTR path, int mode) { - HWND hMainFrame = Create(); - if (!hMainFrame) + HWND hFrame = Create(); + if (!hFrame) return 0; - ShowWindow(hMainFrame, SW_SHOW); + ShowWindow(hFrame, SW_SHOW); - MDIMainFrame* pMainFrame = GET_WINDOW(MDIMainFrame, hMainFrame); + MDIMainFrame* pMainFrame = GET_WINDOW(MDIMainFrame, hFrame); if (pMainFrame) pMainFrame->CreateChild(path, mode); - return hMainFrame; + return hFrame; } HWND MDIMainFrame::Create(LPCITEMIDLIST pidl, int mode) { - HWND hMainFrame = Create(); - if (!hMainFrame) + HWND hFrame = Create(); + if (!hFrame) return 0; - ShowWindow(hMainFrame, SW_SHOW); + ShowWindow(hFrame, SW_SHOW); - MDIMainFrame* pMainFrame = GET_WINDOW(MDIMainFrame, hMainFrame); + MDIMainFrame* pMainFrame = GET_WINDOW(MDIMainFrame, hFrame); if (pMainFrame) pMainFrame->CreateChild(pidl, mode); - return hMainFrame; + return hFrame; } @@ -1315,6 +1315,22 @@ return hFrame; } +HWND SDIMainFrame::Create(LPCTSTR path, int mode) +{ + HWND hFrame = Create(); + if (!hFrame) + return 0; + + ShowWindow(hFrame, SW_SHOW); + + MDIMainFrame* pMainFrame = GET_WINDOW(MDIMainFrame, hFrame); + + if (pMainFrame) + pMainFrame->CreateChild(path, mode); + + return hFrame; +} + LRESULT SDIMainFrame::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam) { switch(nmsg) { _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.h --- trunk/reactos/subsys/system/explorer/shell/mainframe.h 2005-04-02 14:16:47 UTC (rev 14440) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.h 2005-04-02 14:26:56 UTC (rev 14441) @@ -135,6 +135,7 @@ SDIMainFrame(HWND hwnd); static HWND Create(); + static HWND Create(LPCTSTR path, int mode=OWM_EXPLORE|OWM_DETAILS); static HWND Create(LPCITEMIDLIST pidl, int mode=OWM_EXPLORE|OWM_DETAILS|OWM_PIDL); protected: _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-04-02 14:16:47 UTC (rev 14440) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-04-02 14:26:56 UTC (rev 14441) @@ -1861,11 +1861,19 @@ #endif break; - case IDC_CONTROL_PANEL: + case IDC_CONTROL_PANEL: { CloseStartMenu(id); - //@@SDIMainFrame::Create(TEXT("::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\ \::{21EC2020-3AEA-1069-A2DD-08002B30309D}"), 0); - break; +#ifndef _NO_MDI + XMLPos explorer_options = g_Globals.get_cfg("general/explorer"); + bool mdi = XMLBool(explorer_options, "mdi", true); + if (mdi) + MDIMainFrame::Create(TEXT("::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{ 21EC2020-3AEA-1069-A2DD-08002B30309D}"), 0); + else +#endif + SDIMainFrame::Create(TEXT("::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{ 21EC2020-3AEA-1069-A2DD-08002B30309D}"), 0); + break;} + case IDC_ADMIN: CreateSubmenu(id, CSIDL_COMMON_ADMINTOOLS, CSIDL_ADMINTOOLS, ResString(IDS_ADMIN)); break;

19 years, 8 months

[hpoussin] 14440: Correct timeout issues when reading

by hpoussin＠svn.reactos.com

Correct timeout issues when reading Pend read IRPs Lots of small issues Modified: trunk/reactos/drivers/dd/serial/devctrl.c Modified: trunk/reactos/drivers/dd/serial/legacy.c Modified: trunk/reactos/drivers/dd/serial/misc.c Modified: trunk/reactos/drivers/dd/serial/pnp.c Modified: trunk/reactos/drivers/dd/serial/rw.c Modified: trunk/reactos/drivers/dd/serial/serial.c Modified: trunk/reactos/drivers/dd/serial/serial.h _____ Modified: trunk/reactos/drivers/dd/serial/devctrl.c --- trunk/reactos/drivers/dd/serial/devctrl.c 2005-04-02 11:40:58 UTC (rev 14439) +++ trunk/reactos/drivers/dd/serial/devctrl.c 2005-04-02 14:16:47 UTC (rev 14440) @@ -7,7 +7,6 @@ * * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) */ -/* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */ #define NDEBUG #include "serial.h" @@ -219,22 +218,30 @@ pCommProp->ServiceMask = SERIAL_SP_SERIALCOMM; pCommProp->MaxTxQueue = pCommProp->CurrentTxQueue = DeviceExtension->OutputBuffer.Length - 1; pCommProp->MaxRxQueue = pCommProp->CurrentRxQueue = DeviceExtension->InputBuffer.Length - 1; - pCommProp->MaxBaud = SERIAL_BAUD_115200; pCommProp->ProvSubType = 1; // PST_RS232; - /* FIXME: ProvCapabilities may be related to Uart type */ pCommProp->ProvCapabilities = SERIAL_PCF_DTRDSR | SERIAL_PCF_INTTIMEOUTS | SERIAL_PCF_PARITY_CHECK | SERIAL_PCF_RTSCTS | SERIAL_PCF_SETXCHAR | SERIAL_PCF_SPECIALCHARS | SERIAL_PCF_TOTALTIMEOUTS | SERIAL_PCF_XONXOFF; - /* FIXME: SettableParams may be related to Uart type */ pCommProp->SettableParams = SERIAL_SP_BAUD | SERIAL_SP_DATABITS | SERIAL_SP_HANDSHAKING | SERIAL_SP_PARITY | SERIAL_SP_PARITY_CHECK | SERIAL_SP_STOPBITS; - /* FIXME: SettableBaud may be related to Uart type */ + + /* SettableBaud is related to Uart type */ pCommProp->SettableBaud = SERIAL_BAUD_075 | SERIAL_BAUD_110 | SERIAL_BAUD_134_5 | SERIAL_BAUD_150 | SERIAL_BAUD_300 | SERIAL_BAUD_600 | SERIAL_BAUD_1200 | SERIAL_BAUD_1800 | SERIAL_BAUD_2400 | SERIAL_BAUD_4800 | SERIAL_BAUD_7200 - | SERIAL_BAUD_9600 | SERIAL_BAUD_14400 | SERIAL_BAUD_19200 | SERIAL_BAUD_38400 - | SERIAL_BAUD_56K | SERIAL_BAUD_57600 | SERIAL_BAUD_115200 | SERIAL_BAUD_128K - | SERIAL_BAUD_USER; + | SERIAL_BAUD_9600 | SERIAL_BAUD_USER; + pCommProp->MaxBaud = SERIAL_BAUD_9600; + if (DeviceExtension->UartType >= Uart16450) + { + pCommProp->SettableBaud |= SERIAL_BAUD_14400 | SERIAL_BAUD_19200 | SERIAL_BAUD_38400; + pCommProp->MaxBaud = SERIAL_BAUD_38400; + } + if (DeviceExtension->UartType >= Uart16550) + { + pCommProp->SettableBaud |= SERIAL_BAUD_56K | SERIAL_BAUD_57600 | SERIAL_BAUD_115200 | SERIAL_BAUD_128K; + pCommProp->MaxBaud = SERIAL_BAUD_115200; + } + pCommProp->SettableData = SERIAL_DATABITS_5 | SERIAL_DATABITS_6 | SERIAL_DATABITS_7 | SERIAL_DATABITS_8; pCommProp->SettableStopParity = SERIAL_STOPBITS_10 | SERIAL_STOPBITS_15 | SERIAL_STOPBITS_20 | SERIAL_PARITY_NONE | SERIAL_PARITY_ODD | SERIAL_PARITY_EVEN | SERIAL_PARITY_MARK | SERIAL_PARITY_SPACE; @@ -264,8 +271,8 @@ - DeviceExtension->OutputBuffer.ReadPosition) % DeviceExtension->OutputBuffer.Length; KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql); - pSerialStatus->EofReceived = FALSE; /* FIXME */ - pSerialStatus->WaitForImmediate = FALSE; /* FIXME */ + pSerialStatus->EofReceived = FALSE; /* always FALSE */ + pSerialStatus->WaitForImmediate = FALSE; /* always FALSE */ return STATUS_SUCCESS; } @@ -286,8 +293,6 @@ DPRINT("Serial: IRP_MJ_DEVICE_CONTROL dispatch\n"); - /* FIXME: pend operation if possible */ - Stack = IoGetCurrentIrpStackLocation(Irp); LengthIn = Stack->Parameters.DeviceIoControl.InputBufferLength; LengthOut = Stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -315,9 +320,13 @@ DPRINT("Serial: IOCTL_SERIAL_CLR_DTR\n"); /* FIXME: If the handshake flow control of the device is configured to * automatically use DTR, return STATUS_INVALID_PARAMETER */ - DeviceExtension->MCR &= ~SR_MCR_DTR; - WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); - Status = STATUS_SUCCESS; + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + if (NT_SUCCESS(Status)) + { + DeviceExtension->MCR &= ~SR_MCR_DTR; + WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + } break; } case IOCTL_SERIAL_CLR_RTS: @@ -325,9 +334,13 @@ DPRINT("Serial: IOCTL_SERIAL_CLR_RTS\n"); /* FIXME: If the handshake flow control of the device is configured to * automatically use RTS, return STATUS_INVALID_PARAMETER */ - DeviceExtension->MCR &= ~SR_MCR_RTS; - WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); - Status = STATUS_SUCCESS; + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + if (NT_SUCCESS(Status)) + { + DeviceExtension->MCR &= ~SR_MCR_RTS; + WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + } break; } case IOCTL_SERIAL_CONFIG_SIZE: @@ -546,14 +559,20 @@ DeviceExtension->InputBuffer.ReadPosition = DeviceExtension->InputBuffer.WritePosition = 0; DeviceExtension->OutputBuffer.ReadPosition = DeviceExtension->OutputBuffer.WritePosition = 0; /* Clear receive/transmit buffers */ - if (DeviceExtension->UartType >= Uart16550) + if (DeviceExtension->UartType >= Uart16550A) { - WRITE_PORT_UCHAR(SER_FCR(ComPortBase), - SR_FCR_CLEAR_RCVR | SR_FCR_CLEAR_XMIT); + /* 16550 UARTs also have FIFO queues, but they are unusable due to a bug */ + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + if (NT_SUCCESS(Status)) + { + WRITE_PORT_UCHAR(SER_FCR(ComPortBase), SR_FCR_CLEAR_RCVR | SR_FCR_CLEAR_XMIT); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + } } + else + Status = STATUS_SUCCESS; KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql2); KeReleaseSpinLock(&DeviceExtension->InputBufferLock, Irql1); - Status = STATUS_SUCCESS; break; } case IOCTL_SERIAL_RESET_DEVICE: @@ -604,10 +623,16 @@ DPRINT("Serial: IOCTL_SERIAL_SET_DTR\n"); if (!(DeviceExtension->MCR & SR_MCR_DTR)) { - DeviceExtension->MCR |= SR_MCR_DTR; - WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + if (NT_SUCCESS(Status)) + { + DeviceExtension->MCR |= SR_MCR_DTR; + WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + } } - Status = STATUS_SUCCESS; + else + Status = STATUS_SUCCESS; break; } case IOCTL_SERIAL_SET_FIFO_CONTROL: @@ -617,8 +642,12 @@ Status = STATUS_INVALID_PARAMETER; else { - WRITE_PORT_UCHAR(SER_FCR(ComPortBase), (UCHAR)((*(PULONG)BufferIn) & 0xff)); - Status = STATUS_SUCCESS; + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + if (NT_SUCCESS(Status)) + { + WRITE_PORT_UCHAR(SER_FCR(ComPortBase), (UCHAR)((*(PULONG)BufferIn) & 0xff)); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + } } break; } @@ -648,10 +677,14 @@ Status = STATUS_INVALID_PARAMETER; else { - pMCR = (PULONG)BufferIn; - DeviceExtension->MCR = (UCHAR)(*pMCR & 0xff); - WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); - Status = STATUS_SUCCESS; + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + if (NT_SUCCESS(Status)) + { + pMCR = (PULONG)BufferIn; + DeviceExtension->MCR = (UCHAR)(*pMCR & 0xff); + WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + } } break; } @@ -688,10 +721,16 @@ DPRINT("Serial: IOCTL_SERIAL_SET_RTS\n"); if (!(DeviceExtension->MCR & SR_MCR_RTS)) { - DeviceExtension->MCR |= SR_MCR_RTS; - WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + if (NT_SUCCESS(Status)) + { + DeviceExtension->MCR |= SR_MCR_RTS; + WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + } } - Status = STATUS_SUCCESS; + else + Status = STATUS_SUCCESS; break; } case IOCTL_SERIAL_SET_TIMEOUTS: _____ Modified: trunk/reactos/drivers/dd/serial/legacy.c --- trunk/reactos/drivers/dd/serial/legacy.c 2005-04-02 11:40:58 UTC (rev 14439) +++ trunk/reactos/drivers/dd/serial/legacy.c 2005-04-02 14:16:47 UTC (rev 14440) @@ -96,8 +96,8 @@ if (!ResourceList) return STATUS_INSUFFICIENT_RESOURCES; ResourceList->Count = 1; - ResourceList->List[0].InterfaceType = Isa; - ResourceList->List[0].BusNumber = -1; /* FIXME */ + ResourceList->List[0].InterfaceType = InterfaceTypeUndefined; + ResourceList->List[0].BusNumber = -1; /* unknown */ ResourceList->List[0].PartialResourceList.Version = 1; ResourceList->List[0].PartialResourceList.Revision = 1; ResourceList->List[0].PartialResourceList.Count = 2; @@ -137,7 +137,7 @@ { Status = IoReportDetectedDevice( DriverObject, - ResourceList->List[0].InterfaceType, ResourceList->List[0].BusNumber, -1/*FIXME*/, + ResourceList->List[0].InterfaceType, ResourceList->List[0].BusNumber, -1 /* unknown */, ResourceList, NULL, TRUE, &Pdo); _____ Modified: trunk/reactos/drivers/dd/serial/misc.c --- trunk/reactos/drivers/dd/serial/misc.c 2005-04-02 11:40:58 UTC (rev 14439) +++ trunk/reactos/drivers/dd/serial/misc.c 2005-04-02 14:16:47 UTC (rev 14440) @@ -105,9 +105,6 @@ DeviceExtension = (PSERIAL_DEVICE_EXTENSION)pDeviceExtension; ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; - DPRINT1("Serial: sending bytes (if any) on COM%lu\n", - DeviceExtension->ComPort); - KeAcquireSpinLock(&DeviceExtension->OutputBufferLock, &Irql); while (!IsCircularBufferEmpty(&DeviceExtension->OutputBuffer) && READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_TBE) _____ Modified: trunk/reactos/drivers/dd/serial/pnp.c --- trunk/reactos/drivers/dd/serial/pnp.c 2005-04-02 11:40:58 UTC (rev 14439) +++ trunk/reactos/drivers/dd/serial/pnp.c 2005-04-02 14:16:47 UTC (rev 14440) @@ -80,7 +80,7 @@ KeInitializeSpinLock(&DeviceExtension->OutputBufferLock); KeInitializeDpc(&DeviceExtension->ReceivedByteDpc, SerialReceiveByte, DeviceExtension); KeInitializeDpc(&DeviceExtension->SendByteDpc, SerialSendByte, DeviceExtension); - //Fdo->Flags |= DO_POWER_PAGEABLE (or DO_POWER_INRUSH?) + Fdo->Flags |= DO_POWER_PAGABLE; Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); if (!NT_SUCCESS(Status)) { @@ -126,8 +126,8 @@ * not called with a NULL Pdo. Block this call (blocks * unfortunately all the other PnP serial ports devices). */ - //return SerialAddDeviceInternal(DriverObject, Pdo, UartUnknown, NULL); - return STATUS_UNSUCCESSFUL; + return SerialAddDeviceInternal(DriverObject, Pdo, UartUnknown, NULL); + //return STATUS_UNSUCCESSFUL; } NTSTATUS STDCALL @@ -230,8 +230,9 @@ } /* Clear receive/transmit buffers */ - if (DeviceExtension->UartType >= Uart16550) + if (DeviceExtension->UartType >= Uart16550A) { + /* 16550 UARTs also have FIFO queues, but they are unusable due to a bug */ WRITE_PORT_UCHAR(SER_FCR(ComPortBase), SR_FCR_CLEAR_RCVR | SR_FCR_CLEAR_XMIT); } @@ -307,6 +308,69 @@ { DPRINT("Serial: IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + /* FIXME: first HACK: PnP manager can send multiple + * IRP_MN_START_DEVICE for one device + */ + if (((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->PnpState != dsStopped) + { + DPRINT1("Serial: device already started. Ignoring this irp!\n"); + Status = STATUS_SUCCESS; + break; + } + /* FIXME: AllocatedResources MUST never be NULL ; + * that's the second HACK because resource arbitration + * doesn't exist in ReactOS yet... + */ + if (Stack->Parameters.StartDevice.AllocatedResources == NULL) + { + ULONG ResourceListSize; + PCM_RESOURCE_LIST ResourceList; + PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; + KIRQL Dirql; + ULONG ComPortBase; + ULONG Irq; + + DPRINT1("Serial: no allocated resources for this device! Creating fake list\n"); + /* These values are resources of the ONLY serial + * port that will be managed by this driver + * (default is COM2) */ + ComPortBase = 0x2f8; + Irq = 3; + + /* Create resource list */ + ResourceListSize = sizeof(CM_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + ResourceList = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize, SERIAL_TAG); + if (!ResourceList) + return STATUS_INSUFFICIENT_RESOURCES; + ResourceList->Count = 1; + ResourceList->List[0].InterfaceType = Isa; + ResourceList->List[0].BusNumber = -1; /* FIXME */ + ResourceList->List[0].PartialResourceList.Version = 1; + ResourceList->List[0].PartialResourceList.Revision = 1; + ResourceList->List[0].PartialResourceList.Count = 2; + ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[0]; + ResourceDescriptor->Type = CmResourceTypePort; + ResourceDescriptor->ShareDisposition = CmResourceShareDriverExclusive; + ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; + ResourceDescriptor->u.Port.Start.u.HighPart = 0; + ResourceDescriptor->u.Port.Start.u.LowPart = ComPortBase; + ResourceDescriptor->u.Port.Length = 8; + + ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[1]; + ResourceDescriptor->Type = CmResourceTypeInterrupt; + ResourceDescriptor->ShareDisposition = CmResourceShareShared; + ResourceDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; + ResourceDescriptor->u.Interrupt.Vector = HalGetInterruptVector( + Internal, 0, 0, Irq, + &Dirql, + &ResourceDescriptor->u.Interrupt.Affinity); + ResourceDescriptor->u.Interrupt.Level = (ULONG)Dirql; + + Stack->Parameters.StartDevice.AllocatedResources = + Stack->Parameters.StartDevice.AllocatedResourcesTranslated = + ResourceList; + } + /* Call lower driver */ Status = ForwardIrpAndWait(DeviceObject, Irp); if (NT_SUCCESS(Status)) _____ Modified: trunk/reactos/drivers/dd/serial/rw.c --- trunk/reactos/drivers/dd/serial/rw.c 2005-04-02 11:40:58 UTC (rev 14439) +++ trunk/reactos/drivers/dd/serial/rw.c 2005-04-02 14:16:47 UTC (rev 14440) @@ -15,11 +15,124 @@ static PVOID SerialGetUserBuffer(IN PIRP Irp) { - ASSERT(Irp); - - return Irp->AssociatedIrp.SystemBuffer; + ASSERT(Irp); + + return Irp->AssociatedIrp.SystemBuffer; } +static VOID +ReadBytes( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + PWORKITEM_DATA WorkItemData) +{ + PSERIAL_DEVICE_EXTENSION DeviceExtension; + PUCHAR ComPortBase; + ULONG Length; + PUCHAR Buffer; + ULONG Information = 0; + LARGE_INTEGER SystemTime, ByteTimeoutTime; + UCHAR ReceivedByte; + BOOLEAN IsByteReceived; + //KIRQL Irql; + + DPRINT("Serial: ReadBytes() called\n"); + + DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + Length = IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length; + Buffer = SerialGetUserBuffer(Irp); + + /* FIXME: remove disabling interrupts */ + WRITE_PORT_UCHAR(SER_IER(ComPortBase), DeviceExtension->IER & ~1); + while (Length > 0) + { + /* Calculate dead line to receive the next byte */ + KeQuerySystemTime(&SystemTime); + ByteTimeoutTime.QuadPart = SystemTime.QuadPart + + WorkItemData->IntervalTimeout * 10000; + + IsByteReceived = FALSE; + while (TRUE) + { +#if 1 + if ((READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DR) != 0) + { + ReceivedByte = READ_PORT_UCHAR(ComPortBase); + DPRINT("Serial: received byte 0x%02x (%c)\n", ReceivedByte, ReceivedByte); + IsByteReceived = TRUE; + break; + } + else if (WorkItemData->DontWait && + !(WorkItemData->ReadAtLeastOneByte && Information == 0)) + { + DPRINT("Serial: read buffer empty\n"); + break; + } +#else + KeAcquireSpinLock(&DeviceExtension->InputBufferLock, &Irql); + if (!IsCircularBufferEmpty(&DeviceExtension->InputBuffer)) + { + CHECKPOINT1; + PopCircularBufferEntry(&DeviceExtension->InputBuffer, &ReceivedByte); + KeReleaseSpinLock(&DeviceExtension->InputBufferLock, Irql); + DPRINT("Serial: reading byte from buffer 0x%02x (%c)\n", ReceivedByte, ReceivedByte); + IsByteReceived = TRUE; + break; + } + else if (WorkItemData->DontWait && + !(WorkItemData->ReadAtLeastOneByte && Information == 0)) + { + DPRINT("Serial: read buffer empty\n"); + break; + } + KeReleaseSpinLock(&DeviceExtension->InputBufferLock, Irql); +#endif + if (IsByteReceived) break; + KeQuerySystemTime(&SystemTime); + if (WorkItemData->UseIntervalTimeout && Information > 0) + { + if (SystemTime.QuadPart >= ByteTimeoutTime.QuadPart) + break; + } + if (WorkItemData->UseTotalTimeout) + { + if (SystemTime.QuadPart >= WorkItemData->TotalTimeoutTime.QuadPart) + break; + } + } + if (!IsByteReceived) break; + Buffer[Information++] = ReceivedByte; + Length--; + } + /* FIXME: remove enabling interrupts */ + WRITE_PORT_UCHAR(SER_IER(ComPortBase), DeviceExtension->IER); + + Irp->IoStatus.Information = Information; + if (Information == 0) + Irp->IoStatus.Status = STATUS_TIMEOUT; + else + Irp->IoStatus.Status = STATUS_SUCCESS; +} + +static VOID STDCALL +SerialReadWorkItem( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID pWorkItemData /* real type PWORKITEM_DATA */) +{ + PWORKITEM_DATA WorkItemData; + PIRP Irp; + + DPRINT("Serial: SerialReadWorkItem() called\n"); + + WorkItemData = (PWORKITEM_DATA)pWorkItemData; + Irp = WorkItemData->Irp; + + ReadBytes(DeviceObject, Irp, WorkItemData); + ExFreePoolWithTag(pWorkItemData, SERIAL_TAG); + IoCompleteRequest(Irp, IO_NO_INCREMENT); +} + NTSTATUS STDCALL SerialRead( IN PDEVICE_OBJECT DeviceObject, @@ -28,12 +141,10 @@ PIO_STACK_LOCATION Stack; PSERIAL_DEVICE_EXTENSION DeviceExtension; ULONG Length; - ULONG Information = 0; PUCHAR Buffer; - PUCHAR ComPortBase; - UCHAR ReceivedByte; - KIRQL Irql; - NTSTATUS Status = STATUS_SUCCESS; + PWORKITEM_DATA WorkItemData; + PIO_WORKITEM WorkItem; + NTSTATUS Status; DPRINT("Serial: IRP_MJ_READ\n"); @@ -43,7 +154,6 @@ Length = Stack->Parameters.Read.Length; Buffer = SerialGetUserBuffer(Irp); DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; if (Stack->Parameters.Read.ByteOffset.QuadPart != 0 || Buffer == NULL) { @@ -57,136 +167,79 @@ goto ByeBye; } - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); - if (!NT_SUCCESS(Status)) + /* Allocate memory for parameters */ + WorkItemData = ExAllocatePoolWithTag(PagedPool, sizeof(WORKITEM_DATA), SERIAL_TAG); + if (!WorkItemData) + { + Status = STATUS_INSUFFICIENT_RESOURCES; goto ByeBye; + } + RtlZeroMemory(WorkItemData, sizeof(WORKITEM_DATA)); + WorkItemData->Irp = Irp; - KeAcquireSpinLock(&DeviceExtension->InputBufferLock, &Irql); - while (Length-- > 0) + /* Calculate time outs */ + if (DeviceExtension->SerialTimeOuts.ReadIntervalTimeout == INFINITE && + DeviceExtension->SerialTimeOuts.ReadTotalTimeoutMultiplier == INFINITE && + DeviceExtension->SerialTimeOuts.ReadTotalTimeoutConstant > 0 && + DeviceExtension->SerialTimeOuts.ReadTotalTimeoutConstant < INFINITE) { - Status = PopCircularBufferEntry(&DeviceExtension->InputBuffer, &ReceivedByte); - if (!NT_SUCCESS(Status)) - break; - DPRINT("Serial: read from buffer 0x%x (%c)\n", ReceivedByte, ReceivedByte); - Buffer[Information++] = ReceivedByte; + /* read at least one byte, and at most bytes already received */ + WorkItemData->DontWait = TRUE; + WorkItemData->ReadAtLeastOneByte = TRUE; } - KeReleaseSpinLock(&DeviceExtension->InputBufferLock, Irql); - if (Length > 0 && - !(DeviceExtension->SerialTimeOuts.ReadIntervalTimeout == INFINITE && - DeviceExtension->SerialTimeOuts.ReadTotalTimeoutConstant == 0 && - DeviceExtension->SerialTimeOuts.ReadTotalTimeoutMultiplier == 0)) + else if (DeviceExtension->SerialTimeOuts.ReadIntervalTimeout == INFINITE && + DeviceExtension->SerialTimeOuts.ReadTotalTimeoutConstant == 0 && + DeviceExtension->SerialTimeOuts.ReadTotalTimeoutMultiplier == 0) { - ULONG IntervalTimeout = 0; - ULONG TotalTimeout = 0; - BOOLEAN UseIntervalTimeout = FALSE; - BOOLEAN UseTotalTimeout = FALSE; - ULONG ThisByteTimeout; - BOOLEAN IsByteReceived; - ULONG i; - /* Extract timeouts informations */ - if (DeviceExtension->SerialTimeOuts.ReadIntervalTimeout == INFINITE && - DeviceExtension->SerialTimeOuts.ReadTotalTimeoutMultiplier == INFINITE && - DeviceExtension->SerialTimeOuts.ReadTotalTimeoutConstant > 0 && - DeviceExtension->SerialTimeOuts.ReadTotalTimeoutConstant < INFINITE) - { - if (Information > 0) + /* read only bytes that are already in buffer */ + WorkItemData->DontWait = TRUE; + } + else + { + /* use timeouts */ + if (DeviceExtension->SerialTimeOuts.ReadIntervalTimeout != 0) { - /* don't read mode bytes */ - Length = 0; - } - else - { - /* read only one byte */ - UseTotalTimeout = TRUE; - TotalTimeout = DeviceExtension->SerialTimeOuts.ReadTotalTimeoutConstant; - Length = 1; - } + WorkItemData->UseIntervalTimeout = TRUE; + WorkItemData->IntervalTimeout = DeviceExtension->SerialTimeOuts.ReadIntervalTimeout; } - else + if (DeviceExtension->SerialTimeOuts.ReadTotalTimeoutMultiplier != 0 || + DeviceExtension->SerialTimeOuts.ReadTotalTimeoutConstant != 0) { - if (DeviceExtension->SerialTimeOuts.ReadIntervalTimeout != 0) - { - UseIntervalTimeout = TRUE; - IntervalTimeout = DeviceExtension->SerialTimeOuts.ReadIntervalTimeout; - } - if (DeviceExtension->SerialTimeOuts.ReadTotalTimeoutConstant != 0 || - DeviceExtension->SerialTimeOuts.ReadTotalTimeoutMultiplier != 0) - { - UseTotalTimeout = TRUE; - TotalTimeout = DeviceExtension->SerialTimeOuts.ReadTotalTimeoutConstant + - DeviceExtension->SerialTimeOuts.ReadTotalTimeoutMultiplier * Length; - } + ULONG TotalTimeout; + LARGE_INTEGER SystemTime; + + WorkItemData->UseTotalTimeout = TRUE; + TotalTimeout = DeviceExtension->SerialTimeOuts.ReadTotalTimeoutConstant + + DeviceExtension->SerialTimeOuts.ReadTotalTimeoutMultiplier * Length; + KeQuerySystemTime(&SystemTime); + WorkItemData->TotalTimeoutTime.QuadPart = SystemTime.QuadPart + + TotalTimeout * 10000; } - DPRINT("Serial: UseIntervalTimeout = %ws, IntervalTimeout = %lu\n", - UseIntervalTimeout ? L"YES" : L"NO", - UseIntervalTimeout ? IntervalTimeout : 0); - DPRINT("Serial: UseTotalTimeout = %ws, TotalTimeout = %lu\n", - UseTotalTimeout ? L"YES" : L"NO", - UseTotalTimeout ? TotalTimeout : 0); - - /* FIXME: it should be better to use input buffer instead of - * disabling interrupts, and try to directly read for port! */ - - /* FIXME: NtQueryPerformanceCounter gives a more accurate - * timer, but it is not available on all computers. First try - * NtQueryPerformanceCounter, and current method if it is not - * implemented. */ - - /* FIXME: remove disabling interrupts */ - WRITE_PORT_UCHAR(SER_IER(ComPortBase), DeviceExtension->IER & ~1); - while (Length > 0) - { - ThisByteTimeout = IntervalTimeout; - IsByteReceived = FALSE; - while (TRUE) - { - for (i = 0; i < 1000; i++) - { -#if 1 - if ((READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DR) != 0) - { - ReceivedByte = READ_PORT_UCHAR(ComPortBase); - DPRINT("Serial: received byte 0x%02x (%c)\n", ReceivedByte, ReceivedByte); - IsByteReceived = TRUE; - break; - } -#else - KeAcquireSpinLock(&DeviceExtension->InputBufferLock, &Irql); - if (!IsCircularBufferEmpty(&DeviceExtension->InputBuffer)) - { - PopCircularBufferEntry(&DeviceExtension->InputBuffer, &ReceivedByte); - KeReleaseSpinLock(&DeviceExtension->InputBufferLock, Irql); - DPRINT("Serial: reading byte from buffer 0x%02x (%c)\n", ReceivedByte, ReceivedByte); - IsByteReceived = TRUE; - break; - } - KeReleaseSpinLock(&DeviceExtension->InputBufferLock, Irql); -#endif - KeStallExecutionProcessor(1); - } - if (IsByteReceived) break; - if (UseIntervalTimeout) - { - if (ThisByteTimeout == 0) break; else ThisByteTimeout--; - } - if (UseTotalTimeout) - { - if (TotalTimeout == 0) break; else TotalTimeout--; - } - } - if (!IsByteReceived) break; - Buffer[Information++] = ReceivedByte; - Length--; - } - /* FIXME: remove enabling interrupts */ - WRITE_PORT_UCHAR(SER_IER(ComPortBase), DeviceExtension->IER); } - Status = STATUS_SUCCESS; + /* Pend IRP */ + WorkItem = IoAllocateWorkItem(DeviceObject); + if (WorkItem) + { + IoQueueWorkItem(WorkItem, SerialReadWorkItem, DelayedWorkQueue, WorkItemData); + IoMarkIrpPending(Irp); + return STATUS_PENDING; + } + + /* insufficient resources, we can't pend the Irp */ + CHECKPOINT; + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(WorkItemData, SERIAL_TAG); + goto ByeBye; + } + ReadBytes(DeviceObject, Irp, WorkItemData); + Status = Irp->IoStatus.Status; + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); ByeBye: - Irp->IoStatus.Information = Information; Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; _____ Modified: trunk/reactos/drivers/dd/serial/serial.c --- trunk/reactos/drivers/dd/serial/serial.c 2005-04-02 11:40:58 UTC (rev 14439) +++ trunk/reactos/drivers/dd/serial/serial.c 2005-04-02 14:16:47 UTC (rev 14440) @@ -7,7 +7,6 @@ * * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) */ -/* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */ //#define NDEBUG #include "serial.h" _____ Modified: trunk/reactos/drivers/dd/serial/serial.h --- trunk/reactos/drivers/dd/serial/serial.h 2005-04-02 11:40:58 UTC (rev 14439) +++ trunk/reactos/drivers/dd/serial/serial.h 2005-04-02 14:16:47 UTC (rev 14440) @@ -20,7 +20,7 @@ #define STDCALL #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint - #define CHECKPOINT1 DbgPrint("(%s:%d)\n") + #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__) #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) @@ -102,6 +102,18 @@ UCHAR MSR; /* Base+6, Modem Status Register */ } SERIAL_DEVICE_EXTENSION, *PSERIAL_DEVICE_EXTENSION; +typedef struct _WORKITEM_DATA +{ + PIRP Irp; + + BOOLEAN UseIntervalTimeout; + BOOLEAN UseTotalTimeout; + ULONG IntervalTimeout; + LARGE_INTEGER TotalTimeoutTime; + BOOLEAN DontWait; + BOOLEAN ReadAtLeastOneByte; +} WORKITEM_DATA, *PWORKITEM_DATA; + #define SERIAL_TAG TAG('S', 'e', 'r', 'l') #define INFINITE ((ULONG)-1)

19 years, 8 months

[mf] 14439: fix tray icon config dialog for the first icon

by mf＠svn.reactos.com

fix tray icon config dialog for the first icon Modified: trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/traynotify.h _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp --- trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp 2005-04-02 11:21:46 UTC (rev 14438) +++ trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp 2005-04-02 11:40:58 UTC (rev 14439) @@ -47,7 +47,7 @@ WM_TASKBARCREATED(RegisterWindowMessage(WINMSG_TASKBARCREATED)) #endif { - SetWindowIcon(hwnd, IDI_REACTOS/*IDI_SEARCH*/); // icon in for TrayNotifyDlg + SetWindowIcon(hwnd, IDI_REACTOS); SystemParametersInfo(SPI_GETWORKAREA, 0, &_work_area_org, 0); } _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp --- trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp 2005-04-02 11:21:46 UTC (rev 14438) +++ trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp 2005-04-02 11:40:58 UTC (rev 14439) @@ -905,7 +905,7 @@ _show_hidden_org = _pNotifyArea->_show_hidden; } - SetWindowIcon(hwnd, IDI_REACTOS/*IDI_SEARCH*/); + SetWindowIcon(hwnd, IDI_REACTOS); _haccel = LoadAccelerators(g_Globals._hInstance, MAKEINTRESOURCE(IDA_TRAYNOTIFY)); @@ -1053,7 +1053,7 @@ void TrayNotifyDlg::InsertItem(HTREEITEM hparent, HTREEITEM after, const NotifyIconDlgInfo& entry, HDC hdc, HICON hicon, NOTIFYICONMODE mode) { - int idx = _info.size(); + int idx = _info.size() + 1; _info[idx] = entry; String mode_str = string_from_mode(mode); @@ -1163,42 +1163,10 @@ switch(pnmh->code) { case TVN_SELCHANGED: { NMTREEVIEW* pnmtv = (NMTREEVIEW*)pnmh; - LPARAM lparam = pnmtv->itemNew.lParam; + int idx = pnmtv->itemNew.lParam; - if (lparam) { - const NotifyIconDlgInfo& entry = _info[lparam]; - - SetDlgItemText(_hwnd, IDC_NOTIFY_TOOLTIP, entry._tipText); - SetDlgItemText(_hwnd, IDC_NOTIFY_TITLE, entry._windowTitle); - SetDlgItemText(_hwnd, IDC_NOTIFY_MODULE, entry._modulePath); - - CheckRadioButton(_hwnd, IDC_NOTIFY_SHOW, IDC_NOTIFY_AUTOHIDE, IDC_NOTIFY_SHOW+entry._mode); - - String change_str; - if (entry._lastChange) - change_str.printf(TEXT("before %d s"), (GetTickCount()-entry._lastChange+500)/1000); - SetDlgItemText(_hwnd, IDC_LAST_CHANGE, change_str); - - HICON hicon = 0; //get_window_icon_big(entry._hWnd, false); - - // If we could not find an icon associated with the owner window, try to load one from the owning module. - if (!hicon && !entry._modulePath.empty()) { - hicon = ExtractIcon(g_Globals._hInstance, entry._modulePath, 0); - - if (!hicon) { - SHFILEINFO sfi; - - if (SHGetFileInfo(entry._modulePath, 0, &sfi, sizeof(sfi), SHGFI_ICON|SHGFI_LARGEICON)) - hicon = sfi.hIcon; - } - } - - if (hicon) { - SendMessage(GetDlgItem(_hwnd, IDC_PICTURE), STM_SETICON, (LPARAM)hicon, 0); - DestroyIcon(hicon); - } else - SendMessage(GetDlgItem(_hwnd, IDC_PICTURE), STM_SETICON, 0, 0); - + if (idx) { + RefreshProperties(_info[idx]); _selectedItem = pnmtv->itemNew.hItem; } else { /* @@ -1214,14 +1182,48 @@ return 0; } +void TrayNotifyDlg::RefreshProperties(const NotifyIconDlgInfo& entry) +{ + SetDlgItemText(_hwnd, IDC_NOTIFY_TOOLTIP, entry._tipText); + SetDlgItemText(_hwnd, IDC_NOTIFY_TITLE, entry._windowTitle); + SetDlgItemText(_hwnd, IDC_NOTIFY_MODULE, entry._modulePath); + + CheckRadioButton(_hwnd, IDC_NOTIFY_SHOW, IDC_NOTIFY_AUTOHIDE, IDC_NOTIFY_SHOW+entry._mode); + + String change_str; + if (entry._lastChange) + change_str.printf(TEXT("before %d s"), (GetTickCount()-entry._lastChange+500)/1000); + SetDlgItemText(_hwnd, IDC_LAST_CHANGE, change_str); + + HICON hicon = 0; //get_window_icon_big(entry._hWnd, false); + + // If we could not find an icon associated with the owner window, try to load one from the owning module. + if (!hicon && !entry._modulePath.empty()) { + hicon = ExtractIcon(g_Globals._hInstance, entry._modulePath, 0); + + if (!hicon) { + SHFILEINFO sfi; + + if (SHGetFileInfo(entry._modulePath, 0, &sfi, sizeof(sfi), SHGFI_ICON|SHGFI_LARGEICON)) + hicon = sfi.hIcon; + } + } + + if (hicon) { + SendMessage(GetDlgItem(_hwnd, IDC_PICTURE), STM_SETICON, (LPARAM)hicon, 0); + DestroyIcon(hicon); + } else + SendMessage(GetDlgItem(_hwnd, IDC_PICTURE), STM_SETICON, 0, 0); +} + void TrayNotifyDlg::SetIconMode(NOTIFYICONMODE mode) { - LPARAM lparam = TreeView_GetItemData(_tree_ctrl, _selectedItem); + int idx = TreeView_GetItemData(_tree_ctrl, _selectedItem); - if (!lparam) + if (!idx) return; - NotifyIconConfig& entry = _info[lparam]; + NotifyIconConfig& entry = _info[idx]; if (entry._mode != mode) { entry._mode = mode; _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/traynotify.h --- trunk/reactos/subsys/system/explorer/taskbar/traynotify.h 2005-04-02 11:21:46 UTC (rev 14438) +++ trunk/reactos/subsys/system/explorer/taskbar/traynotify.h 2005-04-02 11:40:58 UTC (rev 14439) @@ -230,6 +230,7 @@ void InsertItem(HTREEITEM hparent, HTREEITEM after, const NotifyInfo&, HDC); void InsertItem(HTREEITEM hparent, HTREEITEM after, const NotifyIconDlgInfo&, HDC, HICON, NOTIFYICONMODE); void SetIconMode(NOTIFYICONMODE mode); + void RefreshProperties(const NotifyIconDlgInfo& entry); };

19 years, 8 months

[mf] 14438: switch to search icon in search dialog

by mf＠svn.reactos.com

switch to search icon in search dialog Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp _____ Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp --- trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2005-04-02 11:09:39 UTC (rev 14437) +++ trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2005-04-02 11:21:46 UTC (rev 14438) @@ -95,7 +95,7 @@ _thread(collect_programs_callback, hwnd, this), _sort(_list_ctrl, CompareFunc/*, (LPARAM)this*/) { - SetWindowIcon(hwnd, IDI_REACTOS/*IDI_SEARCH*/); + SetWindowIcon(hwnd, IDI_SEARCH); _resize_mgr.Add(IDC_FILTER, RESIZE_X); _resize_mgr.Add(IDC_CHECK_ENTRIES, MOVE_X);

19 years, 8 months

[mf] 14437: merge from trunk: enable multiline tooltips

by mf＠svn.reactos.com

merge from trunk: enable multiline tooltips Modified: branches/lean-explorer/reactos/subsys/system/explorer/taskbar/quicklaunc h.cpp _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/taskbar/quicklaunc h.cpp --- branches/lean-explorer/reactos/subsys/system/explorer/taskbar/quicklaunc h.cpp 2005-04-02 11:00:58 UTC (rev 14436) +++ branches/lean-explorer/reactos/subsys/system/explorer/taskbar/quicklaunc h.cpp 2005-04-02 11:09:39 UTC (rev 14437) @@ -263,6 +263,10 @@ #ifdef TTF_DI_SETITEM ttdi->uFlags |= TTF_DI_SETITEM; #endif + + // enable multiline tooltips (break at CR/LF and for very long one-line strings) + SendMessage(pnmh->hwndFrom, TTM_SETMAXTIPWIDTH, 0, 400); + break;} return super::Notify(id, pnmh);

19 years, 8 months

[mf] 14436: merge from trunk: launch shell DDE server

by mf＠svn.reactos.com

merge from trunk: launch shell DDE server Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp --- branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp 2005-04-02 10:59:49 UTC (rev 14435) +++ branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp 2005-04-02 11:00:58 UTC (rev 14436) @@ -1,5 +1,5 @@ /* - * Copyright 2003, 2004 Martin Fuchs + * Copyright 2003, 2004, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,6 +35,9 @@ #include <locale.h> // for setlocale() +DynamicLoadLibFct<void(__stdcall*)(BOOL)> g_SHDOCVW_ShellDDEInit(TEXT("SHDOCVW"), 118); + + ExplorerGlobals g_Globals; @@ -696,6 +699,10 @@ // another undocumented event: "Global\\msgina: ReturnToWelcome" if (!SetShellReadyEvent(TEXT("msgina: ShellReadyEvent"))) SetShellReadyEvent(TEXT("Global\\msgina: ShellReadyEvent")); + + // launch the shell DDE server + if (g_SHDOCVW_ShellDDEInit) + (*g_SHDOCVW_ShellDDEInit)(TRUE); } @@ -727,5 +734,9 @@ int ret = explorer_main(hInstance, lpCmdLine, nShowCmd); + // shutdown the shell DDE server + if (g_SHDOCVW_ShellDDEInit) + (*g_SHDOCVW_ShellDDEInit)(FALSE); + return ret; }

19 years, 8 months

[mf] 14435: merge from trunk: hide login screen to make the login on XP faster

by mf＠svn.reactos.com

merge from trunk: hide login screen to make the login on XP faster Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp --- branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp 2005-04-02 10:48:16 UTC (rev 14434) +++ branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp 2005-04-02 10:59:49 UTC (rev 14435) @@ -601,6 +601,19 @@ #endif // __MINGW && UNICODE +static bool SetShellReadyEvent(LPCTSTR evtName) +{ + HANDLE hEvent = OpenEvent(EVENT_MODIFY_STATE, FALSE, evtName); + if (!hEvent) + return false; + + SetEvent(hEvent); + CloseHandle(hEvent); + + return true; +} + + int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nShowCmd) { CONTEXT("WinMain()"); @@ -646,11 +659,15 @@ } startup_desktop = TRUE; - } else + } else { // create desktop window and task bar only, if there is no other shell and we are // the first explorer instance + // MS Explorer looks additionally into the registry entry HKCU\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\shell, + // to decide wether it is currently configured as shell application. startup_desktop = !any_desktop_running; + } + bool autostart = !any_desktop_running; // disable autostart if the SHIFT key is pressed @@ -674,6 +691,14 @@ if (_tcsstr(lpCmdLine,TEXT("-noautostart"))) autostart = false; + if (startup_desktop) { + // hide the XP login screen (Credit to Nicolas Escuder) + // another undocumented event: "Global\\msgina: ReturnToWelcome" + if (!SetShellReadyEvent(TEXT("msgina: ShellReadyEvent"))) + SetShellReadyEvent(TEXT("Global\\msgina: ShellReadyEvent")); + } + + g_Globals.init(hInstance); // initialize COM and OLE before creating the desktop window @@ -684,6 +709,7 @@ g_Globals._hwndDesktop = DesktopWindow::Create(); + /**TODO launching autostart programs can be moved into a background thread. */ if (autostart) { char* argv[] = {"", "s"}; // call startup routine in SESSION_START mode startup(2, argv);

19 years, 8 months

[mf] 14434: terminate shell service objects thread if there is nothing to do

by mf＠svn.reactos.com

terminate shell service objects thread if there is nothing to do Modified: trunk/reactos/subsys/system/explorer/services/shellservices.cpp _____ Modified: trunk/reactos/subsys/system/explorer/services/shellservices.cpp --- trunk/reactos/subsys/system/explorer/services/shellservices.cpp 2005-04-02 05:43:37 UTC (rev 14433) +++ trunk/reactos/subsys/system/explorer/services/shellservices.cpp 2005-04-02 10:48:16 UTC (rev 14434) @@ -66,29 +66,31 @@ RegCloseKey(hkey); } - MSG msg; + if (!sso_ptrs.empty()) { + MSG msg; - while(_alive) { - if (MsgWaitForMultipleObjects(1, &_evtFinish, FALSE, INFINITE, QS_ALLINPUT) == WAIT_OBJECT_0+0) - break; // _evtFinish has been set. - while(_alive) { - if (!PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) - break; + if (MsgWaitForMultipleObjects(1, &_evtFinish, FALSE, INFINITE, QS_ALLINPUT) == WAIT_OBJECT_0+0) + break; // _evtFinish has been set. - if (msg.message == WM_QUIT) - break; + while(_alive) { + if (!PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + break; - TranslateMessage(&msg); - DispatchMessage(&msg); + if (msg.message == WM_QUIT) + break; + + TranslateMessage(&msg); + DispatchMessage(&msg); + } } - } - // shutdown all running Shell Service Objects - for(SSOVector::iterator it=sso_ptrs.begin(); it!=sso_ptrs.end(); ++it) { - SIfacePtr<IOleCommandTarget>* sso_ptr = *it; - (*sso_ptr)->Exec(&CGID_ShellServiceObject, OLECMDID_SAVE, OLECMDEXECOPT_DODEFAULT, NULL, NULL); - delete sso_ptr; + // shutdown all running Shell Service Objects + for(SSOVector::iterator it=sso_ptrs.begin(); it!=sso_ptrs.end(); ++it) { + SIfacePtr<IOleCommandTarget>* sso_ptr = *it; + (*sso_ptr)->Exec(&CGID_ShellServiceObject, OLECMDID_SAVE, OLECMDEXECOPT_DODEFAULT, NULL, NULL); + delete sso_ptr; + } } return 0;

19 years, 8 months

[sedwards] 14433: __USE_W32API

by sedwards＠svn.reactos.com

__USE_W32API Modified: trunk/reactos/lib/epsapi/makefile _____ Modified: trunk/reactos/lib/epsapi/makefile --- trunk/reactos/lib/epsapi/makefile 2005-04-02 05:37:20 UTC (rev 14432) +++ trunk/reactos/lib/epsapi/makefile 2005-04-02 05:43:37 UTC (rev 14433) @@ -7,7 +7,7 @@ TARGET_NAME = epsapi # require os code to explicitly request A/W version of structs/functions -TARGET_CFLAGS += -D_DISABLE_TIDENTS -Werror -Wall +TARGET_CFLAGS += -D__USE_W32API -D_DISABLE_TIDENTS -Werror -Wall TARGET_OBJECTS = \ enum/drivers.o \

19 years, 8 months

← Newer
1
...
41
42
43
44
45
46
47
48
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 April 2005