Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[cgutman] 36670: - Partially implement ProtocolStatus in tcpip

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Oct 6 18:19:22 2008 New Revision: 36670 URL: http://svn.reactos.org/svn/reactos?rev=36670&view=rev Log: - Partially implement ProtocolStatus in tcpip Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Mon Oct 6 18:19:22 2008 @@ -517,19 +517,44 @@ VOID STDCALL ProtocolStatus( NDIS_HANDLE BindingContext, - NDIS_STATUS GenerelStatus, + NDIS_STATUS GeneralStatus, PVOID StatusBuffer, UINT StatusBufferSize) /* * FUNCTION: Called by NDIS when the underlying driver has changed state * ARGUMENTS: * BindingContext = Pointer to a device context (LAN_ADAPTER) - * GenerelStatus = A generel status code + * GeneralStatus = A general status code * StatusBuffer = Pointer to a buffer with medium-specific data * StatusBufferSize = Number of bytes in StatusBuffer */ { + PLAN_ADAPTER Adapter = BindingContext; + TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); + + switch(GeneralStatus) + { + case NDIS_STATUS_MEDIA_CONNECT: + DbgPrint("NDIS_STATUS_MEDIA_CONNECT\n"); + break; + + case NDIS_STATUS_MEDIA_DISCONNECT: + DbgPrint("NDIS_STATUS_MEDIA_DISCONNECT\n"); + break; + + case NDIS_STATUS_RESET_START: + Adapter->State = LAN_STATE_RESETTING; + break; + + case NDIS_STATUS_RESET_END: + Adapter->State = LAN_STATE_STARTED; + break; + + default: + DbgPrint("Unhandled status: %x", GeneralStatus); + break; + } }

16 years, 2 months

[cgutman] 36669: - Implement a MiniportShutdown routine for both NIC drivers

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Oct 6 16:39:39 2008 New Revision: 36669 URL: http://svn.reactos.org/svn/reactos?rev=36669&view=rev Log: - Implement a MiniportShutdown routine for both NIC drivers Modified: branches/aicom-network-fixes/drivers/network/dd/ne2000/include/ne2000.h branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c branches/aicom-network-fixes/drivers/network/dd/pcnet/pcnet.c Modified: branches/aicom-network-fixes/drivers/network/dd/ne2000/include/ne2000.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/dd/ne2000/include/ne2000.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/dd/ne2000/include/ne2000.h [iso-8859-1] Mon Oct 6 16:39:39 2008 @@ -175,6 +175,7 @@ /* Flags used for driver cleanup */ BOOLEAN IOPortRangeRegistered; BOOLEAN InterruptRegistered; + BOOLEAN ShutdownHandlerRegistered; } NIC_ADAPTER, *PNIC_ADAPTER; /* Global driver information */ Modified: branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Mon Oct 6 16:39:39 2008 @@ -141,10 +141,13 @@ 0x20, Adapter->IOBase); + if (Adapter->ShutdownHandlerRegistered) + NdisMDeregisterAdapterShutdownHandler(Adapter->MiniportAdapterHandle); + /* Remove adapter from global adapter list */ if ((&Adapter->ListEntry)->Blink != NULL) { RemoveEntryList(&Adapter->ListEntry); - } + } /* Free adapter context area */ NdisFreeMemory(Adapter, sizeof(NIC_ADAPTER), 0); @@ -203,6 +206,14 @@ } } +VOID +STDCALL +MiniportShutdown(PVOID Context) +{ + #ifndef NOCARD + NICStop((PNIC_ADAPTER)Context); + #endif +} static NDIS_STATUS STDCALL MiniportInitialize( OUT PNDIS_STATUS OpenErrorStatus, @@ -414,6 +425,12 @@ /* Start the NIC */ NICStart(Adapter); #endif + + /* Register the shutdown handler */ + NdisMRegisterAdapterShutdownHandler(MiniportAdapterHandle, Adapter, MiniportShutdown); + + Adapter->ShutdownHandlerRegistered = TRUE; + /* Add adapter to the global adapter list */ InsertTailList(&DriverInfo.AdapterListHead, &Adapter->ListEntry); Modified: branches/aicom-network-fixes/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Mon Oct 6 16:39:39 2008 @@ -573,6 +573,9 @@ /* deregister i/o port range */ NdisMDeregisterIoPortRange(Adapter->MiniportAdapterHandle, Adapter->IoBaseAddress, NUMBER_OF_PORTS, (PVOID)Adapter->PortOffset); + /* deregister the shutdown routine */ + NdisMDeregisterAdapterShutdownHandler(Adapter->MiniportAdapterHandle); + /* free shared memory */ MiFreeSharedMemory(Adapter); @@ -780,6 +783,18 @@ return TRUE; } #endif + +VOID +STDCALL +MiniportShutdown( PVOID Context ) +{ + PADAPTER Adapter = Context; + + DPRINT("Stopping the chip\n"); + + NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR0); + NdisRawWritePortUshort(Adapter->PortOffset + RDP, CSR0_STOP); +} static NDIS_STATUS STDCALL @@ -952,6 +967,8 @@ ASSERT(0); #endif + NdisMRegisterAdapterShutdownHandler(Adapter->MiniportAdapterHandle, Adapter, MiniportShutdown); + DPRINT("returning 0x%x\n", Status); *OpenErrorStatus = Status; return Status;

16 years, 2 months

[gedmurphy] 36668: It looked like we could get away with removing this hack, but it seems it still causes painting problems when increasing the width. No time to investigate at the moment. (anyone else wanna take a look?)

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Oct 6 14:15:09 2008 New Revision: 36668 URL: http://svn.reactos.org/svn/reactos?rev=36668&view=rev Log: It looked like we could get away with removing this hack, but it seems it still causes painting problems when increasing the width. No time to investigate at the moment. (anyone else wanna take a look?) Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] Mon Oct 6 14:15:09 2008 @@ -306,8 +306,15 @@ break; case WM_SIZE: { - resize_frame(LOWORD(lparam), HIWORD(lparam)); - SendMessage(_hwndrebar, WM_SIZE, 0, 0); +#ifdef __REACTOS__ ///@todo Work around to display rebar in ROS (with flickering) as long as the control isn't fixed + int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); + MoveWindow(_hwndrebar, 0, 0, LOWORD(lparam), height, TRUE); +#else + resize_frame(LOWORD(lparam), HIWORD(lparam)); + SendMessage(_hwndrebar, WM_SIZE, 0, 0); +#endif + + break;} // do not pass message to DefFrameProc case WM_GETMINMAXINFO: {

16 years, 2 months

[cgutman] 36667: - Call the MiniportShutdown handler at the right time - Now we call it upon system shutdown and if a bug check occurred

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Oct 6 13:56:44 2008 New Revision: 36667 URL: http://svn.reactos.org/svn/reactos?rev=36667&view=rev Log: - Call the MiniportShutdown handler at the right time - Now we call it upon system shutdown and if a bug check occurred Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Oct 6 13:56:44 2008 @@ -1137,8 +1137,10 @@ NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - if(Adapter->BugcheckContext->ShutdownHandler) + if(Adapter->BugcheckContext->ShutdownHandler) { KeDeregisterBugCheckCallback(Adapter->BugcheckContext->CallbackRecord); + IoUnregisterShutdownNotification(Adapter->NdisMiniportBlock.DeviceObject); + } } @@ -1306,12 +1308,9 @@ */ { PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportHandle; - PMINIPORT_BUGCHECK_CONTEXT BugcheckContext = Adapter->BugcheckContext; + PMINIPORT_BUGCHECK_CONTEXT BugcheckContext; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - - if(BugcheckContext) - return; BugcheckContext = ExAllocatePool(NonPagedPool, sizeof(MINIPORT_BUGCHECK_CONTEXT)); if(!BugcheckContext) @@ -1324,11 +1323,19 @@ BugcheckContext->DriverContext = ShutdownContext; BugcheckContext->CallbackRecord = ExAllocatePool(NonPagedPool, sizeof(KBUGCHECK_CALLBACK_RECORD)); + if (!BugcheckContext->CallbackRecord) { + ExFreePool(BugcheckContext); + return; + } + + Adapter->BugcheckContext = BugcheckContext; KeInitializeCallbackRecord(BugcheckContext->CallbackRecord); KeRegisterBugCheckCallback(BugcheckContext->CallbackRecord, NdisIBugcheckCallback, BugcheckContext, sizeof(BugcheckContext), (PUCHAR)"Ndis Miniport"); + + IoRegisterShutdownNotification(Adapter->NdisMiniportBlock.DeviceObject); } @@ -1781,6 +1788,28 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +NdisIShutdown( + IN PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PLOGICAL_ADAPTER Adapter = DeviceObject->DeviceExtension; + PMINIPORT_BUGCHECK_CONTEXT Context = Adapter->BugcheckContext; + ADAPTER_SHUTDOWN_HANDLER ShutdownHandler = Context->ShutdownHandler; + + ASSERT(ShutdownHandler); + + ShutdownHandler(Context->DriverContext); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + NTSTATUS NTAPI @@ -2075,6 +2104,7 @@ *MiniportPtr = Miniport; Miniport->DriverObject->MajorFunction[IRP_MJ_PNP] = NdisIDispatchPnp; + Miniport->DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = NdisIShutdown; Miniport->DriverObject->DriverExtension->AddDevice = NdisIAddDevice; return NDIS_STATUS_SUCCESS;

16 years, 2 months

[gedmurphy] 36666: - Add an address bar to serve as the web browser and folder history list (not yet functional) - Hide the drivebar by default. It's cleaner this way - Remove the old rebar hack. This should get rid of those annoying blue marks at the end of the toolbars

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Oct 6 13:42:17 2008 New Revision: 36666 URL: http://svn.reactos.org/svn/reactos?rev=36666&view=rev Log: - Add an address bar to serve as the web browser and folder history list (not yet functional) - Hide the drivebar by default. It's cleaner this way - Remove the old rebar hack. This should get rid of those annoying blue marks at the end of the toolbars Modified: trunk/reactos/base/shell/explorer/explorer-cz.rc trunk/reactos/base/shell/explorer/explorer-de.rc trunk/reactos/base/shell/explorer/explorer-en.rc trunk/reactos/base/shell/explorer/explorer-es.rc trunk/reactos/base/shell/explorer/explorer-fr.rc trunk/reactos/base/shell/explorer/explorer-jp.rc trunk/reactos/base/shell/explorer/explorer-ro.rc trunk/reactos/base/shell/explorer/explorer-ru.rc trunk/reactos/base/shell/explorer/explorer-sv.rc trunk/reactos/base/shell/explorer/explorer.h trunk/reactos/base/shell/explorer/shell/mainframe.cpp trunk/reactos/base/shell/explorer/shell/mainframe.h Modified: trunk/reactos/base/shell/explorer/explorer-cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-cz.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-cz.rc [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -38,7 +38,7 @@ BEGIN MENUITEM "Panel &nástrojù", ID_VIEW_TOOL_BAR MENUITEM "Panel &extra", ID_VIEW_EXTRA_BAR - MENUITEM "L&ita diskù", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "L&ita diskù", ID_VIEW_DRIVE_BAR MENUITEM "&Boèní panel", ID_VIEW_SIDE_BAR MENUITEM "&Stavový øádek", ID_VIEW_STATUSBAR MENUITEM SEPARATOR Modified: trunk/reactos/base/shell/explorer/explorer-de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-de.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-de.rc [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -41,7 +41,7 @@ BEGIN MENUITEM "&Werkzeugleiste", ID_VIEW_TOOL_BAR MENUITEM "&Extraleiste", ID_VIEW_EXTRA_BAR - MENUITEM "&Laufwerksleiste", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Laufwerksleiste", ID_VIEW_DRIVE_BAR MENUITEM "Se&itenleiste", ID_VIEW_SIDE_BAR MENUITEM "&Statusleiste", ID_VIEW_STATUSBAR MENUITEM SEPARATOR Modified: trunk/reactos/base/shell/explorer/explorer-en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-en.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-en.rc [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -38,7 +38,7 @@ BEGIN MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR MENUITEM "&Extra Bar", ID_VIEW_EXTRA_BAR - MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR MENUITEM "&Status Bar", ID_VIEW_STATUSBAR MENUITEM SEPARATOR Modified: trunk/reactos/base/shell/explorer/explorer-es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-es.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-es.rc [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -38,7 +38,7 @@ BEGIN MENUITEM "&Herramientas", ID_VIEW_TOOL_BAR MENUITEM "Barra &Extra", ID_VIEW_EXTRA_BAR - MENUITEM "Barra de &Unidades", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "Barra de &Unidades", ID_VIEW_DRIVE_BAR MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR MENUITEM "Barra de &Estado", ID_VIEW_STATUSBAR MENUITEM SEPARATOR Modified: trunk/reactos/base/shell/explorer/explorer-fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-fr.rc [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -38,7 +38,7 @@ BEGIN MENUITEM "Barre d'&outils", ID_VIEW_TOOL_BAR MENUITEM "Barre d'&extras", ID_VIEW_EXTRA_BAR - MENUITEM "&Barre des lecteurs", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Barre des lecteurs", ID_VIEW_DRIVE_BAR MENUITEM "&Volet latéral", ID_VIEW_SIDE_BAR MENUITEM "Barre d'&état", ID_VIEW_STATUSBAR MENUITEM SEPARATOR Modified: trunk/reactos/base/shell/explorer/explorer-jp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-jp.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-jp.rc [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -38,7 +38,7 @@ BEGIN MENUITEM "c[ o[(&T)", ID_VIEW_TOOL_BAR MENUITEM "GLXg o[(&E)", ID_VIEW_EXTRA_BAR - MENUITEM "hCuo[(&D)", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "hCuo[(&D)", ID_VIEW_DRIVE_BAR MENUITEM "TCh o[(&I)", ID_VIEW_SIDE_BAR MENUITEM "Xe[^X o[(&S)", ID_VIEW_STATUSBAR MENUITEM SEPARATOR Modified: trunk/reactos/base/shell/explorer/explorer-ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ro.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-ro.rc [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -41,7 +41,7 @@ BEGIN MENUITEM "&Bara cu instrumente", ID_VIEW_TOOL_BAR MENUITEM "&Extra Bar", ID_VIEW_EXTRA_BAR - MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR MENUITEM "&Bara de stare", ID_VIEW_STATUSBAR MENUITEM "&Side Bar", ID_VIEW_SIDE_BAR MENUITEM SEPARATOR Modified: trunk/reactos/base/shell/explorer/explorer-ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-ru.rc [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -38,7 +38,7 @@ BEGIN MENUITEM "&Ïàíåëü èíñòðóìåíòîâ", ID_VIEW_TOOL_BAR MENUITEM "&Äîïîëíèòåëüíàÿ ïàíåëü", ID_VIEW_EXTRA_BAR - MENUITEM "&Äèñêè", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Äèñêè", ID_VIEW_DRIVE_BAR MENUITEM "È&çáðàííîå", ID_VIEW_SIDE_BAR MENUITEM "&Ñòðîêà ñîñòîÿíèÿ", ID_VIEW_STATUSBAR MENUITEM SEPARATOR Modified: trunk/reactos/base/shell/explorer/explorer-sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-sv.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-sv.rc [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -76,7 +76,7 @@ BEGIN MENUITEM "&Verktygsfält", ID_VIEW_TOOL_BAR MENUITEM "&Extrafält", ID_VIEW_EXTRA_BAR - MENUITEM "E&nhetsfält", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "E&nhetsfält", ID_VIEW_DRIVE_BAR MENUITEM "S&idfält", ID_VIEW_SIDE_BAR MENUITEM "&Statusfält", ID_VIEW_STATUSBAR MENUITEM SEPARATOR Modified: trunk/reactos/base/shell/explorer/explorer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.h [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -54,7 +54,6 @@ #define IDW_EXTRABAR 0x102 #define IDW_DRIVEBAR 0x103 #define IDW_ADDRESSBAR 0x104 -#define IDW_COMMANDBAR 0x105 #define IDW_SIDEBAR 0x106 #define IDW_FIRST_CHILD 0xC000 /*0x200*/ Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -186,10 +186,21 @@ CheckMenuItem(_menu_info._hMenuView, ID_VIEW_TOOL_BAR, MF_BYCOMMAND|MF_CHECKED); - // address & command bar - WindowCanvas canvas(hwnd); - RECT rect = {0, 0, 0, 0}; - DrawText(canvas, TEXT("My"), -1, &rect, DT_SINGLELINE|DT_NOPREFIX|DT_CALCRECT); + // address bar + _haddrcombo = CreateWindowEx(0, + WC_COMBOBOX, + TEXT("Address"), + WS_CHILD|WS_TABSTOP|WS_BORDER|WS_VISIBLE|CBS_DROPDOWN| + CCS_NOPARENTALIGN|CCS_NORESIZE|CCS_NODIVIDER|CCS_NOMOVEY, + 0, 0, 0, 0, + hwnd, + (HMENU)IDW_ADDRESSBAR, + g_Globals._hInstance, + 0); + + HFONT hFont = (HFONT)GetStockObject(ANSI_VAR_FONT); + SendMessageW(_haddrcombo, WM_SETFONT, (WPARAM)hFont, 0); + _hstatusbar = CreateStatusWindow(WS_CHILD|WS_VISIBLE, 0, hwnd, IDW_STATUSBAR); CheckMenuItem(_menu_info._hMenuView, ID_VIEW_STATUSBAR, MF_BYCOMMAND|MF_CHECKED); @@ -205,11 +216,16 @@ // create rebar window to manage toolbar and drivebar #ifndef _NO_REBAR - _hwndrebar = CreateWindowEx(WS_EX_TOOLWINDOW, REBARCLASSNAME, NULL, - WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN| - RBS_VARHEIGHT|RBS_DBLCLKTOGGLE| - WS_BORDER|RBS_AUTOSIZE|RBS_BANDBORDERS, - 0, 0, 0, 0, _hwnd, 0, g_Globals._hInstance, 0); + _hwndrebar = CreateWindowEx(WS_EX_TOOLWINDOW, + REBARCLASSNAME, + NULL, + WS_CHILD|WS_VISIBLE|WS_BORDER|WS_CLIPSIBLINGS|WS_CLIPCHILDREN| + RBS_VARHEIGHT|RBS_DBLCLKTOGGLE| RBS_AUTOSIZE|RBS_BANDBORDERS, + 0, 0, 0, 0, + _hwnd, + NULL, + g_Globals._hInstance, + 0); int btn_hgt = HIWORD(SendMessage(_htoolbar, TB_GETBUTTONSIZE, 0, 0)); @@ -217,9 +233,6 @@ rbBand.cbSize = sizeof(REBARBANDINFO); rbBand.fMask = RBBIM_TEXT|RBBIM_STYLE|RBBIM_CHILD|RBBIM_CHILDSIZE|RBBIM_SIZE; -#ifndef RBBS_HIDETITLE // missing in MinGW headers as of 25.02.2004 -#define RBBS_HIDETITLE 0x400 -#endif rbBand.fStyle = RBBS_CHILDEDGE|RBBS_GRIPPERALWAYS|RBBS_HIDETITLE; rbBand.cxMinChild = 0; @@ -233,7 +246,16 @@ rbBand.cxMinChild = 0; rbBand.cyMinChild = btn_hgt; rbBand.cx = 284; - SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); + SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)0, (LPARAM)&rbBand); + + rbBand.fStyle &= ~RBBS_HIDETITLE; + rbBand.fStyle |= RBBS_BREAK; + rbBand.lpText = TEXT("Address :"); + rbBand.hwndChild = _haddrcombo; + rbBand.cxMinChild = 0; + rbBand.cyMinChild = btn_hgt; + rbBand.cx = 400; + SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)3, (LPARAM)&rbBand); #endif } @@ -284,13 +306,8 @@ break; case WM_SIZE: { -#ifdef __REACTOS__ ///@todo Work around to display rebar in ROS (with flickering) as long as the control isn't fixed - int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); - MoveWindow(_hwndrebar, 0, 0, LOWORD(lparam), height, TRUE); -#else resize_frame(LOWORD(lparam), HIWORD(lparam)); SendMessage(_hwndrebar, WM_SIZE, 0, 0); -#endif break;} // do not pass message to DefFrameProc case WM_GETMINMAXINFO: { @@ -472,6 +489,8 @@ int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); rect.top += height; rect.top += 5; + + SetWindowPos(_haddrcombo, NULL, 0, 0, cx, height, SWP_NOMOVE); } else { if (IsWindowVisible(_htoolbar)) { SendMessage(_htoolbar, WM_SIZE, 0, 0); @@ -747,7 +766,7 @@ #endif #endif - CheckMenuItem(_menu_info._hMenuView, ID_VIEW_DRIVE_BAR, MF_BYCOMMAND|MF_CHECKED); + CheckMenuItem(_menu_info._hMenuView, ID_VIEW_DRIVE_BAR, MF_BYCOMMAND|MF_UNCHECKED); #ifndef _NO_WIN_FS @@ -795,7 +814,7 @@ rbBand.cxMinChild = 0; rbBand.cyMinChild = btn_hgt; rbBand.cx = 284; - SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); + SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)1, (LPARAM)&rbBand); #ifndef _NO_WIN_FS rbBand.fStyle |= RBBS_BREAK; @@ -805,7 +824,10 @@ rbBand.cxMinChild = 0; rbBand.cyMinChild = btn_hgt; rbBand.cx = 400; - SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); + SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)2, (LPARAM)&rbBand); + + // hide the drivebar by default + SendMessage(_hwndrebar, RB_SHOWBAND, 2, FALSE); #endif #endif } @@ -1587,6 +1609,15 @@ resize_children(); } +void SDIMainFrame::set_url(LPCTSTR url) +{ + if (_url != url) { + _url = url; + SetWindowText(_haddrcombo, url); + } +} + + void SDIMainFrame::jump_to(LPCTSTR path, int mode) {/*@@todo if (_shellBrowser.get() && (_shellpath_info._open_mode&~OWM_PIDL)==(mode&~OWM_PIDL)) { Modified: trunk/reactos/base/shell/explorer/shell/mainframe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.h [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -51,6 +51,7 @@ WindowHandle _hwndrebar; WindowHandle _htoolbar; + WindowHandle _haddrcombo; WindowHandle _hstatusbar; WindowHandle _hsidebar; @@ -176,4 +177,6 @@ // interface BrowserCallback virtual void entry_selected(Entry* entry); + + void set_url(LPCTSTR url); };

16 years, 2 months

[gschneider] 36665: - Calculate the image size before the height is reported negative, remove redundant if - Set image size for coreheader in first pass and for both header types in second pass Fixes seven gdi32 bitmap winetests.

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon Oct 6 07:39:27 2008 New Revision: 36665 URL: http://svn.reactos.org/svn/reactos?rev=36665&view=rev Log: - Calculate the image size before the height is reported negative, remove redundant if - Set image size for coreheader in first pass and for both header types in second pass Fixes seven gdi32 bitmap winetests. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Mon Oct 6 07:39:27 2008 @@ -555,7 +555,8 @@ coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); /* Resulting height may be smaller than original height */ coreheader->bcHeight = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); - + coreheader->bcSize = DIB_GetDIBWidthBytes(coreheader->bcWidth, + coreheader->bcBitCount) * coreheader->bcHeight; if (BitmapObj->SurfObj.lDelta > 0) coreheader->bcHeight = -coreheader->bcHeight; } @@ -567,44 +568,41 @@ Info->bmiHeader.biWidth = BitmapObj->SurfObj.sizlBitmap.cx; /* Resulting height may be smaller than original height */ Info->bmiHeader.biHeight = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); + Info->bmiHeader.biPlanes = 1; + Info->bmiHeader.biBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); + switch (BitmapObj->SurfObj.iBitmapFormat) + { + case BMF_1BPP: + case BMF_4BPP: + case BMF_8BPP: + case BMF_16BPP: + case BMF_24BPP: + case BMF_32BPP: + Info->bmiHeader.biCompression = BI_RGB; + break; + case BMF_4RLE: + Info->bmiHeader.biCompression = BI_RLE4; + break; + case BMF_8RLE: + Info->bmiHeader.biCompression = BI_RLE8; + break; + case BMF_JPEG: + Info->bmiHeader.biCompression = BI_JPEG; + break; + case BMF_PNG: + Info->bmiHeader.biCompression = BI_PNG; + break; + } + /* Image size has to be calculated */ + Info->bmiHeader.biSizeImage = DIB_GetDIBWidthBytes(Info->bmiHeader.biWidth, + Info->bmiHeader.biBitCount) * Info->bmiHeader.biHeight; + Info->bmiHeader.biXPelsPerMeter = 0; /* FIXME */ + Info->bmiHeader.biYPelsPerMeter = 0; /* FIXME */ + Info->bmiHeader.biClrUsed = 0; + Info->bmiHeader.biClrImportant = 1 << Info->bmiHeader.biBitCount; /* FIXME */ /* Report negtive height for top-down bitmaps. */ if (BitmapObj->SurfObj.lDelta > 0) Info->bmiHeader.biHeight = -Info->bmiHeader.biHeight; - Info->bmiHeader.biPlanes = 1; - Info->bmiHeader.biBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); - if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) - { - switch (BitmapObj->SurfObj.iBitmapFormat) - { - case BMF_1BPP: - case BMF_4BPP: - case BMF_8BPP: - case BMF_16BPP: - case BMF_24BPP: - case BMF_32BPP: - Info->bmiHeader.biCompression = BI_RGB; - break; - case BMF_4RLE: - Info->bmiHeader.biCompression = BI_RLE4; - break; - case BMF_8RLE: - Info->bmiHeader.biCompression = BI_RLE8; - break; - case BMF_JPEG: - Info->bmiHeader.biCompression = BI_JPEG; - break; - case BMF_PNG: - Info->bmiHeader.biCompression = BI_PNG; - break; - } - /* Image size has to be calculated */ - Info->bmiHeader.biSizeImage = DIB_GetDIBWidthBytes(Info->bmiHeader.biWidth, - Info->bmiHeader.biBitCount) * Info->bmiHeader.biHeight; - Info->bmiHeader.biXPelsPerMeter = 0; /* FIXME */ - Info->bmiHeader.biYPelsPerMeter = 0; /* FIXME */ - Info->bmiHeader.biClrUsed = 0; - Info->bmiHeader.biClrImportant = 1 << Info->bmiHeader.biBitCount; /* FIXME */ - } } } _SEH_HANDLE @@ -701,6 +699,8 @@ if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; + coreheader->bcSize = DIB_GetDIBWidthBytes(DestSize.cx, + coreheader->bcBitCount) * DestSize.cy; hDestBitmap = EngCreateBitmap(DestSize, DIB_GetDIBWidthBytes(DestSize.cx, coreheader->bcBitCount), @@ -711,6 +711,9 @@ if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) { + Info->bmiHeader.biSizeImage = DIB_GetDIBWidthBytes(DestSize.cx, + Info->bmiHeader.biBitCount) * DestSize.cy; + hDestBitmap = EngCreateBitmap(DestSize, DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression),

16 years, 2 months

[gschneider] 36664: -rgbReserved must be 0 -don't just fill a coreheader and dismiss it -probe the full bitmap size, not only the first ulong -CreateDIBSection should fail for compressed bitmaps -set biClrUsed and copy the bitmapInfoHeader after it's filled Fixes eight gdi32 bitmap winetests.

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon Oct 6 06:25:38 2008 New Revision: 36664 URL: http://svn.reactos.org/svn/reactos?rev=36664&view=rev Log: -rgbReserved must be 0 -don't just fill a coreheader and dismiss it -probe the full bitmap size, not only the first ulong -CreateDIBSection should fail for compressed bitmaps -set biClrUsed and copy the bitmapInfoHeader after it's filled Fixes eight gdi32 bitmap winetests. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Mon Oct 6 06:25:38 2008 @@ -142,6 +142,7 @@ Colors[Index - StartIndex].rgbRed = PalGDI->IndexedColors[Index].peRed; Colors[Index - StartIndex].rgbGreen = PalGDI->IndexedColors[Index].peGreen; Colors[Index - StartIndex].rgbBlue = PalGDI->IndexedColors[Index].peBlue; + Colors[Index - StartIndex].rgbReserved = 0; } PALETTE_UnlockPalette(PalGDI); } @@ -544,7 +545,7 @@ { if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { - BITMAPCOREHEADER* coreheader; + BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; ProbeForWrite(Info, sizeof(BITMAPINFO), 1); @@ -669,6 +670,7 @@ Info->bmiColors[Index].rgbRed = DestPalette->IndexedColors[Index].peRed; Info->bmiColors[Index].rgbGreen = DestPalette->IndexedColors[Index].peGreen; Info->bmiColors[Index].rgbBlue = DestPalette->IndexedColors[Index].peBlue; + Info->bmiColors[Index].rgbReserved = 0; } } @@ -694,7 +696,7 @@ hDestBitmap = NULL; - ProbeForWrite(Bits, sizeof(BitmapObj->SurfObj.cjBits), 1); + ProbeForWrite(Bits, BitmapObj->SurfObj.cjBits, 1); if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { @@ -1083,7 +1085,6 @@ BITMAPINFOHEADER *bi = &bmi->bmiHeader; INT effHeight; ULONG totalSize; - UINT Entries = 0; BITMAP bm; SIZEL Size; RGBQUAD *lpRGB; @@ -1091,6 +1092,12 @@ DPRINT("format (%ld,%ld), planes %d, bpp %d, size %ld, colors %ld (%s)\n", bi->biWidth, bi->biHeight, bi->biPlanes, bi->biBitCount, bi->biSizeImage, bi->biClrUsed, usage == DIB_PAL_COLORS? "PAL" : "RGB"); + + /* CreateDIBSection should fail for compressed formats */ + if (bi->biCompression == BI_RLE4 || bi->biCompression == BI_RLE8) + { + return (HBITMAP)NULL; + } effHeight = bi->biHeight >= 0 ? bi->biHeight : -bi->biHeight; bm.bmType = 0; @@ -1137,9 +1144,6 @@ if (dib) { dib->dsBm = bm; - dib->dsBmih = *bi; - dib->dsBmih.biSizeImage = totalSize; - /* Set dsBitfields values */ if ( usage == DIB_PAL_COLORS || bi->biBitCount <= 8) { @@ -1202,17 +1206,21 @@ /* WINE NOTE: WINE makes use of a colormap, which is a color translation table between the DIB and the X physical device. Obviously, this is left out of the ReactOS implementation. Instead, we call NtGdiSetDIBColorTable. */ - if(bi->biBitCount == 1) { Entries = 2; } else - if(bi->biBitCount == 4) { Entries = 16; } else - if(bi->biBitCount == 8) { Entries = 256; } - - if (Entries) - bmp->hDIBPalette = PALETTE_AllocPaletteIndexedRGB(Entries, lpRGB); + bi->biClrUsed = 0; + if(bi->biBitCount == 1) { bi->biClrUsed = 2; } else + if(bi->biBitCount == 4) { bi->biClrUsed = 16; } else + if(bi->biBitCount == 8) { bi->biClrUsed = 256; } + + if (bi->biClrUsed != 0) + bmp->hDIBPalette = PALETTE_AllocPaletteIndexedRGB(bi->biClrUsed, lpRGB); else bmp->hDIBPalette = PALETTE_AllocPalette(PAL_BITFIELDS, 0, NULL, dib->dsBitfields[0], dib->dsBitfields[1], dib->dsBitfields[2]); + + dib->dsBmih = *bi; + dib->dsBmih.biSizeImage = totalSize; } // Clean up in case of errors @@ -1341,6 +1349,7 @@ lpRGB[i].rgbRed = palGDI->IndexedColors[*lpIndex].peRed; lpRGB[i].rgbGreen = palGDI->IndexedColors[*lpIndex].peGreen; lpRGB[i].rgbBlue = palGDI->IndexedColors[*lpIndex].peBlue; + lpRGB[i].rgbReserved = 0; lpIndex++; } PALETTE_UnlockPalette(palGDI);

16 years, 2 months

[fireball] 36663: Cecill Etheredge <ijsf@gmx.net> - The RtlEnumerateGenericTableWithoutSplaying function in RTL (generictable.c) effectively performs an endless enumeration, never advancing to the next successor element in the tree because of a bug in the code. Fix this. (Bug #3756). - The RtlDelete code misses a line of code checking whether the node is a root, and instead always returns NULL (assuming it is the root). Fix this. (Bug #3760). See issue #3760 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Oct 6 05:50:22 2008 New Revision: 36663 URL: http://svn.reactos.org/svn/reactos?rev=36663&view=rev Log: Cecill Etheredge <ijsf(a)gmx.net> - The RtlEnumerateGenericTableWithoutSplaying function in RTL (generictable.c) effectively performs an endless enumeration, never advancing to the next successor element in the tree because of a bug in the code. Fix this. (Bug #3756). - The RtlDelete code misses a line of code checking whether the node is a root, and instead always returns NULL (assuming it is the root). Fix this. (Bug #3760). See issue #3760 for more details. Modified: trunk/reactos/lib/rtl/generictable.c trunk/reactos/lib/rtl/splaytree.c Modified: trunk/reactos/lib/rtl/generictable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/generictable.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/generictable.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/generictable.c [iso-8859-1] Mon Oct 6 05:50:22 2008 @@ -390,7 +390,7 @@ else { /* Otherwise, try using the real successor */ - FoundNode = RtlRealSuccessor(Table->TableRoot); + FoundNode = RtlRealSuccessor(*RestartKey); if (FoundNode) *RestartKey = FoundNode; } Modified: trunk/reactos/lib/rtl/splaytree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/splaytree.c?rev=36… ============================================================================== --- trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] Mon Oct 6 05:50:22 2008 @@ -40,7 +40,7 @@ if (!(RtlLeftChild(N)) && !(RtlRightChild(N))) { /* If we are also the root, then the tree is gone */ - return NULL; + if (RtlIsRoot(N)) return NULL; /* Get our parent */ P = RtlParent(N);

16 years, 2 months

[fireball] 36662: Dmitry Gorbachev - Specify a no-entrypoint for modules without one (otherwise ld sets entry point to a random function). See issue #3758 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Oct 6 05:36:33 2008 New Revision: 36662 URL: http://svn.reactos.org/svn/reactos?rev=36662&view=rev Log: Dmitry Gorbachev - Specify a no-entrypoint for modules without one (otherwise ld sets entry point to a random function). See issue #3758 for more details. Modified: trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild trunk/reactos/dll/directx/msdmo/msdmo.rbuild trunk/reactos/dll/directx/qedit/qedit.rbuild trunk/reactos/dll/nls/normaliz/normaliz.rbuild trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild trunk/reactos/dll/win32/rasapi32/rasapi32.rbuild Modified: trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/ksprox… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild [iso-8859-1] Mon Oct 6 05:36:33 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="ksproxy" type="win32dll" baseaddress="${BASEADDRESS_KSPROXY}" installbase="system32" installname="ksproxy.ax" allowwarnings="true"> +<module name="ksproxy" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_KSPROXY}" installbase="system32" installname="ksproxy.ax" allowwarnings="true"> <importlibrary definition="ksproxy.spec.def" /> <include base="ksproxy">.</include> <define name="WINVER">0x600</define> @@ -13,4 +13,4 @@ <file>ksproxy.rc</file> <file>ksproxy.spec</file> </module> -</group> +</group> Modified: trunk/reactos/dll/directx/msdmo/msdmo.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/msdmo.rb… ============================================================================== --- trunk/reactos/dll/directx/msdmo/msdmo.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdmo/msdmo.rbuild [iso-8859-1] Mon Oct 6 05:36:33 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="msdmo" type="win32dll" baseaddress="${BASEADDRESS_MSDMO}" installbase="system32" installname="msdmo.dll" allowwarnings="true"> +<module name="msdmo" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MSDMO}" installbase="system32" installname="msdmo.dll" allowwarnings="true"> <importlibrary definition="msdmo.spec.def" /> <include base="msdmo">.</include> <define name="WINVER">0x600</define> @@ -13,4 +13,4 @@ <file>msdmo.rc</file> <file>msdmo.spec</file> </module> -</group> +</group> Modified: trunk/reactos/dll/directx/qedit/qedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/qedit.rb… ============================================================================== --- trunk/reactos/dll/directx/qedit/qedit.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/qedit/qedit.rbuild [iso-8859-1] Mon Oct 6 05:36:33 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="qedit" type="win32dll" baseaddress="${BASEADDRESS_QEDIT}" installbase="system32" installname="qedit.dll" allowwarnings="true"> +<module name="qedit" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_QEDIT}" installbase="system32" installname="qedit.dll" allowwarnings="true"> <importlibrary definition="qedit.spec.def" /> <include base="qedit">.</include> <define name="WINVER">0x600</define> @@ -13,4 +13,4 @@ <file>qedit.rc</file> <file>qedit.spec</file> </module> -</group> +</group> Modified: trunk/reactos/dll/nls/normaliz/normaliz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/normaliz/normaliz.… ============================================================================== --- trunk/reactos/dll/nls/normaliz/normaliz.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/nls/normaliz/normaliz.rbuild [iso-8859-1] Mon Oct 6 05:36:33 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="normaliz" type="win32dll"> +<module name="normaliz" type="win32dll" entrypoint="0"> <library>kernel32</library> <importlibrary definition="normaliz.def" /> <file>dummy.c</file> Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild [iso-8859-1] Mon Oct 6 05:36:33 2008 @@ -1,4 +1,4 @@ -<module name="beepmidi" type="win32dll" baseaddress="${BASEADDRESS_BEEPMIDI}" installbase="system32" installname="beepmidi.dll" unicode="yes"> +<module name="beepmidi" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_BEEPMIDI}" installbase="system32" installname="beepmidi.dll" unicode="yes"> <importlibrary definition="beepmidi.def" /> <include base="beepmidi">.</include> <library>ntdll</library> Modified: trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmdrv.rbui… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild [iso-8859-1] Mon Oct 6 05:36:33 2008 @@ -1,4 +1,4 @@ -<module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll" unicode="yes"> +<module name="mmdrv" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll" unicode="yes"> <importlibrary definition="mmdrv.spec.def" /> <include base="mmdrv">.</include> <define name="NDEBUG" /> Modified: trunk/reactos/dll/win32/rasapi32/rasapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/rasapi3… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/rasapi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasapi32/rasapi32.rbuild [iso-8859-1] Mon Oct 6 05:36:33 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="rasapi32" type="win32dll" baseaddress="${BASEADDRESS_RASAPI32}" installbase="system32" installname="rasapi32.dll" allowwarnings="true"> +<module name="rasapi32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_RASAPI32}" installbase="system32" installname="rasapi32.dll" allowwarnings="true"> <importlibrary definition="rasapi32.spec.def" /> <include base="rasapi32">.</include> <include base="ReactOS">include/reactos/wine</include>

16 years, 2 months

[fireball] 36661: Dmitry Gorbachev - lfn_get() reads past the end of name[]. Though harmless, it produces 'array subscript is above array bounds' compiler warning (treated as error). See issue #3762 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Oct 6 05:19:55 2008 New Revision: 36661 URL: http://svn.reactos.org/svn/reactos?rev=36661&view=rev Log: Dmitry Gorbachev - lfn_get() reads past the end of name[]. Though harmless, it produces 'array subscript is above array bounds' compiler warning (treated as error). See issue #3762 for more details. Modified: trunk/reactos/lib/fslib/vfatlib/check/lfn.c Modified: trunk/reactos/lib/fslib/vfatlib/check/lfn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/lf… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/lfn.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/lfn.c [iso-8859-1] Mon Oct 6 05:19:55 2008 @@ -410,8 +410,12 @@ } } - for (sum = 0, i = 0; i < 11; i++) + for (sum = 0, i = 0; i < 8; i++) sum = (((sum&1) << 7) | ((sum&0xfe) >> 1)) + de->name[i]; + + for (i = 0; i < 3; i++) + sum = (((sum&1) << 7) | ((sum&0xfe) >> 1)) + de->ext[i]; + if (sum != lfn_checksum) { /* checksum doesn't match, long name doesn't apply to this alias */ /* Causes: 1) alias renamed */

16 years, 2 months

← Newer
1
...
43
44
45
46
47
48
49
...
52
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 October 2008