Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 36653: - Fix a Kernel Assert in EngAllocMem called from brush and add a tag.
by jimtabor＠svn.reactos.org 05 Oct '08

05 Oct '08

Author: jimtabor Date: Sun Oct 5 06:38:01 2008 New Revision: 36653 URL: http://svn.reactos.org/svn/reactos?rev=36653&view=rev Log: - Fix a Kernel Assert in EngAllocMem called from brush and add a tag. Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Sun Oct 5 06:38:01 2008 @@ -524,7 +524,7 @@ NTSTATUS Status = STATUS_SUCCESS; HBRUSH hBrush; - SafeBitmapInfoAndData = EngAllocMem(0, BitmapInfoSize, 0); + SafeBitmapInfoAndData = EngAllocMem(FL_ZERO_MEMORY, BitmapInfoSize, TAG_DIB); if (SafeBitmapInfoAndData == NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);

1 0

[jimtabor] 36652: - Force a recompute when setting map modes.
by jimtabor＠svn.reactos.org 05 Oct '08

05 Oct '08

Author: jimtabor Date: Sun Oct 5 06:26:09 2008 New Revision: 36652 URL: http://svn.reactos.org/svn/reactos?rev=36652&view=rev Log: - Force a recompute when setting map modes. Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/coord.c Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Sun Oct 5 06:26:09 2008 @@ -1275,8 +1275,13 @@ return 0; } #endif - if ((Mode == Dc_Attr->iMapMode) && (Mode != MM_ISOTROPIC)) return Mode; - return GetAndSetDCDWord( hdc, GdiGetSetMapMode, Mode, 0, 0, 0 ); + // Force change if Isotropic is set for recompute. + if ((Mode != Dc_Attr->iMapMode) || (Mode == MM_ISOTROPIC)) + { + Dc_Attr->ulDirty_ &= ~SLOW_WIDTHS; + return GetAndSetDCDWord( hdc, GdiGetSetMapMode, Mode, 0, 0, 0 ); + } + return Dc_Attr->iMapMode; } /* Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Sun Oct 5 06:26:09 2008 @@ -657,12 +657,10 @@ PrevMapMode = Dc_Attr->iMapMode; - if (MapMode != Dc_Attr->iMapMode || (MapMode != MM_ISOTROPIC && MapMode != MM_ANISOTROPIC)) - { - Dc_Attr->iMapMode = MapMode; - - switch (MapMode) - { + Dc_Attr->iMapMode = MapMode; + + switch (MapMode) + { case MM_TEXT: Dc_Attr->szlWindowExt.cx = 1; Dc_Attr->szlWindowExt.cy = 1; @@ -717,7 +715,6 @@ default: Dc_Attr->iMapMode = PrevMapMode; PrevMapMode = 0; - } DC_UpdateXforms(dc); }

1 0

[gbrunmar] 36651: D3D9: * Implemented DdGetAvailDriverMemory callback
by gbrunmar＠svn.reactos.org 05 Oct '08

05 Oct '08

Author: gbrunmar Date: Sun Oct 5 02:33:05 2008 New Revision: 36651 URL: http://svn.reactos.org/svn/reactos?rev=36651&view=rev Log: D3D9: * Implemented DdGetAvailDriverMemory callback Added: trunk/reactos/dll/directx/d3d9/d3d9_callbacks.c (with props) trunk/reactos/dll/directx/d3d9/d3d9_callbacks.h (with props) Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild trunk/reactos/dll/directx/d3d9/d3d9_caps.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.rbui… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.rbuild [iso-8859-1] Sun Oct 5 02:33:05 2008 @@ -14,6 +14,7 @@ <file>d3d9.c</file> <file>d3d9_baseobject.c</file> + <file>d3d9_callbacks.c</file> <file>d3d9_caps.c</file> <file>d3d9_create.c</file> <file>d3d9_cursor.c</file> Added: trunk/reactos/dll/directx/d3d9/d3d9_callbacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_call… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_callbacks.c (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_callbacks.c [iso-8859-1] Sun Oct 5 02:33:05 2008 @@ -1,0 +1,51 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_callbacks.c + * PURPOSE: Direct3D9's callback functions + * PROGRAMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> + */ +#include "d3d9_common.h" +#include "d3d9_callbacks.h" +#define STDCALL __stdcall +#include <d3d9.h> +#include <dll/directx/d3d8thk.h> +#include "d3d9_private.h" +#include "ddrawi.h" + +DWORD WINAPI D3d9GetAvailDriverMemory(LPD3D9_GETAVAILDRIVERMEMORYDATA pData) +{ + DWORD Ret = FALSE; + DDHAL_GETAVAILDRIVERMEMORYDATA Data; + ZeroMemory(&Data, sizeof(Data)); + + if (D3D9_GETAVAILDRIVERMEMORY_TYPE_ALL == pData->dwMemoryType) + { + Data.DDSCaps.dwCaps = DDSCAPS_VIDEOMEMORY; + } + else if (D3D9_GETAVAILDRIVERMEMORY_TYPE_LOCAL == pData->dwMemoryType) + { + Data.DDSCaps.dwCaps = DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM; + } + else if (D3D9_GETAVAILDRIVERMEMORY_TYPE_NONLOCAL == pData->dwMemoryType) + { + Data.DDSCaps.dwCaps = DDSCAPS_VIDEOMEMORY | DDSCAPS_NONLOCALVIDMEM; + } + + if (Data.DDSCaps.dwCaps != 0) + { + if (0 == pData->dwTextureType) + Data.DDSCaps.dwCaps |= DDSCAPS_TEXTURE; + + if (pData->dwTextureType & D3D9_TEXTURETYPE_HALSURFACE) + Data.DDSCaps.dwCaps |= DDSCAPS_TEXTURE | DDSCAPS_3DDEVICE; + + if (pData->dwTextureType & D3D9_TEXTURETYPE_BACKBUFFER) + Data.DDSCaps.dwCaps |= DDSCAPS_ZBUFFER; + + Ret = OsThunkDdGetAvailDriverMemory(pData->pUnknown6BC->hDirectDrawLocal, (DD_GETAVAILDRIVERMEMORYDATA*)&Data); + pData->dwFree = Data.dwFree; + } + + return Ret; +} Propchange: trunk/reactos/dll/directx/d3d9/d3d9_callbacks.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/d3d9/d3d9_callbacks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_call… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_callbacks.h (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_callbacks.h [iso-8859-1] Sun Oct 5 02:33:05 2008 @@ -1,0 +1,33 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_callbacks.h + * PURPOSE: Direct3D9's callback structs and constants + * PROGRAMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> + */ +#ifndef _D3D9_CALLBACKS_H_ +#define _D3D9_CALLBACKS_H_ + +typedef enum _D3D9_GETAVAILDRIVERMEMORY_TYPE +{ + D3D9_GETAVAILDRIVERMEMORY_TYPE_ALL = 0, + D3D9_GETAVAILDRIVERMEMORY_TYPE_LOCAL = 4, + D3D9_GETAVAILDRIVERMEMORY_TYPE_NONLOCAL = 5, +} D3D9_GETAVAILDRIVERMEMORY_TYPE; + +#define D3D9_TEXTURETYPE_HALSURFACE 1 +#define D3D9_TEXTURETYPE_BACKBUFFER 2 + +typedef struct _D3D9_GETAVAILDRIVERMEMORYDATA +{ +/* 0x0000 */ struct _D3D9_Unknown6BC* pUnknown6BC; +/* 0x0004 */ D3D9_GETAVAILDRIVERMEMORY_TYPE dwMemoryType; +/* 0x0008 */ DWORD dwTextureType; +/* 0x000c */ DWORD dwFree; +} D3D9_GETAVAILDRIVERMEMORYDATA, FAR* LPD3D9_GETAVAILDRIVERMEMORYDATA; + +typedef DWORD (WINAPI FAR* LPD3D9_GETAVAILDRIVERMEMORY)(LPD3D9_GETAVAILDRIVERMEMORYDATA); + +DWORD WINAPI D3d9GetAvailDriverMemory(LPD3D9_GETAVAILDRIVERMEMORYDATA pData); + +#endif // _D3D9_CALLBACKS_H_ Propchange: trunk/reactos/dll/directx/d3d9/d3d9_callbacks.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/d3d9/d3d9_caps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_caps… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_caps.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_caps.c [iso-8859-1] Sun Oct 5 02:33:05 2008 @@ -11,6 +11,7 @@ #include "d3d9_helpers.h" #include "d3d9_caps.h" #include "adapter.h" +#include "d3d9_callbacks.h" static INT g_NumDevices = 0; @@ -833,6 +834,7 @@ } /* TODO: Set all internal function pointers to create surface, etc. */ + pD3D9Callbacks->DdGetAvailDriverMemory = &D3d9GetAvailDriverMemory; /* Set device rect */ { Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] Sun Oct 5 02:33:05 2008 @@ -10,27 +10,12 @@ #include "d3d9_common.h" #include <ddraw.h> +#include "d3d9_callbacks.h" #define D3D9_INT_MAX_NUM_ADAPTERS 12 #define D3D9_INT_D3DCAPS8_VALID 1 #define D3D9_INT_D3DCAPS9_VALID 2 - -typedef enum _D3D9_GETAVAILDRIVERMEMORY_TYPE -{ - D3D9_GETAVAILDRIVERMEMORY_TYPE_ALL = 0, - D3D9_GETAVAILDRIVERMEMORY_TYPE_LOCAL = 4, - D3D9_GETAVAILDRIVERMEMORY_TYPE_NONLOCAL = 5, -} D3D9_GETAVAILDRIVERMEMORY_TYPE; - -typedef struct _D3D9_GETAVAILDRIVERMEMORYDATA -{ -/* 0x0000 */ struct _D3D9_Unknown6BC* pUnknown6BC; -/* 0x0004 */ D3D9_GETAVAILDRIVERMEMORY_TYPE dwMemoryType; -/* 0x0008 */ DWORD dwTextureType; -/* 0x000c */ DWORD dwFree; -} D3D9_GETAVAILDRIVERMEMORYDATA, FAR* LPD3D9_GETAVAILDRIVERMEMORYDATA; -typedef BOOL (WINAPI FAR* LPD3D9_GETAVAILDRIVERMEMORY)(LPD3D9_GETAVAILDRIVERMEMORYDATA); typedef struct _D3D9_Unknown6BC {

1 0

[jimtabor] 36650: - Fix order of calls in IntGdiPolygon. Check for PATH first.
by jimtabor＠svn.reactos.org 04 Oct '08

04 Oct '08

Author: jimtabor Date: Sat Oct 4 18:34:04 2008 New Revision: 36650 URL: http://svn.reactos.org/svn/reactos?rev=36650&view=rev Log: - Fix order of calls in IntGdiPolygon. Check for PATH first. Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Sat Oct 4 18:34:04 2008 @@ -539,6 +539,11 @@ Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + if ( PATH_IsPathOpen(dc->DcLevel) ) + { + return PATH_Rectangle ( dc, LeftRect, TopRect, RightRect, BottomRect ); + } + /* Do we rotate or shear? */ if (!(dc->DcLevel.mxWorldToDevice.flAccel & MX_SCALE)) { @@ -548,11 +553,6 @@ DestCoords[1].x = DestCoords[2].x = RightRect; DestCoords[2].y = DestCoords[3].y = BottomRect; return IntGdiPolygon(dc, DestCoords, 4); - } - - if ( PATH_IsPathOpen(dc->DcLevel) ) - { - return PATH_Rectangle ( dc, LeftRect, TopRect, RightRect, BottomRect ); } DestRect.left = LeftRect;

1 0

[cgutman] 36649: - Only call the ProtocolReceivePacket handler if the protocol registered one - Remove some unneeded code - Immediately send the loopback packet if possible
by cgutman＠svn.reactos.org 04 Oct '08

04 Oct '08

Author: cgutman Date: Sat Oct 4 16:55:01 2008 New Revision: 36649 URL: http://svn.reactos.org/svn/reactos?rev=36649&view=rev Log: - Only call the ProtocolReceivePacket handler if the protocol registered one - Remove some unneeded code - Immediately send the loopback packet if possible Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.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] Sat Oct 4 16:55:01 2008 @@ -182,26 +182,6 @@ AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); NDIS_DbgPrint(DEBUG_MINIPORT, ("AdapterBinding = %x\n", AdapterBinding)); -#ifdef DBG - if(!AdapterBinding) - { - NDIS_DbgPrint(MIN_TRACE, ("AdapterBinding was null\n")); - break; - } - - if(!AdapterBinding->ProtocolBinding) - { - NDIS_DbgPrint(MIN_TRACE, ("AdapterBinding->ProtocolBinding was null\n")); - break; - } - - if(!AdapterBinding->ProtocolBinding->Chars.ReceiveHandler) - { - NDIS_DbgPrint(MIN_TRACE, ("AdapterBinding->ProtocolBinding->Chars.ReceiveHandler was null\n")); - break; - } -#endif - NDIS_DbgPrint (MID_TRACE, ("XXX (%x) %x %x %x %x %x %x %x XXX\n", @@ -261,11 +241,14 @@ { AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); - for (i = 0; i < NumberOfPackets; i++) + if (AdapterBinding->ProtocolBinding->Chars.ReceivePacketHandler) { - (*AdapterBinding->ProtocolBinding->Chars.ReceivePacketHandler)( - AdapterBinding->NdisOpenBlock.ProtocolBindingContext, - PacketArray[i]); + for (i = 0; i < NumberOfPackets; i++) + { + (*AdapterBinding->ProtocolBinding->Chars.ReceivePacketHandler)( + AdapterBinding->NdisOpenBlock.ProtocolBindingContext, + PacketArray[i]); + } } CurrentEntry = CurrentEntry->Flink; Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Sat Oct 4 16:55:01 2008 @@ -215,14 +215,18 @@ if ((Adapter->NdisMiniportBlock.MacOptions & NDIS_MAC_OPTION_NO_LOOPBACK) && MiniAdapterHasAddress(Adapter, Packet)) { - NDIS_DbgPrint(MID_TRACE, ("Queuing packet.\n")); - - MiniQueueWorkItem(Adapter, NdisWorkItemSendLoopback, (PVOID)Packet); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); - return NDIS_STATUS_PENDING; + if(Adapter->MiniportBusy) { + MiniQueueWorkItem(Adapter, NdisWorkItemSendLoopback, Packet); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); + return NDIS_STATUS_PENDING; + } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); + + return ProIndicatePacket(Adapter, Packet); } else { if(Adapter->MiniportBusy) { - MiniQueueWorkItem(Adapter, NdisWorkItemSend, (PVOID)Packet); + MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet); KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); return NDIS_STATUS_PENDING; }

1 0

[cgutman] 36648: - Properly implement MiniIndicateReceivePacket
by cgutman＠svn.reactos.org 04 Oct '08

04 Oct '08

Author: cgutman Date: Sat Oct 4 16:31:36 2008 New Revision: 36648 URL: http://svn.reactos.org/svn/reactos?rev=36648&view=rev Log: - Properly implement MiniIndicateReceivePacket 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] Sat Oct 4 16:31:36 2008 @@ -235,60 +235,43 @@ VOID NTAPI MiniIndicateReceivePacket( - IN NDIS_HANDLE Miniport, + IN NDIS_HANDLE MiniportAdapterHandle, IN PPNDIS_PACKET PacketArray, IN UINT NumberOfPackets) /* * FUNCTION: receives miniport packet array indications * ARGUMENTS: - * Miniport: Miniport handle for the adapter + * MiniportAdapterHandle: Miniport handle for the adapter * PacketArray: pointer to a list of packet pointers to indicate * NumberOfPackets: number of packets to indicate - * NOTES: - * - This currently is a big temporary hack. In the future this should - * call ProtocolReceivePacket() on each bound protocol if it exists. - * For now it just mimics NdisMEthIndicateReceive. - */ -{ + * + */ +{ + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + PLIST_ENTRY CurrentEntry; + PADAPTER_BINDING AdapterBinding; + KIRQL OldIrql; UINT i; - for(i = 0; i < NumberOfPackets; i++) - { - PCHAR PacketBuffer = 0; - UINT PacketLength = 0; - PNDIS_BUFFER NdisBuffer = 0; - -#define PACKET_TAG (('k' << 24) + ('P' << 16) + ('D' << 8) + 'N') - - NdisAllocateMemoryWithTag((PVOID)&PacketBuffer, 1518, PACKET_TAG); - if(!PacketBuffer) - { - NDIS_DbgPrint(MIN_TRACE, ("insufficient resources\n")); - return; - } - - NdisQueryPacket(PacketArray[i], NULL, NULL, &NdisBuffer, NULL); - - while(NdisBuffer) - { - PNDIS_BUFFER CurrentBuffer; - PVOID BufferVa; - UINT BufferLen; - - NdisQueryBuffer(NdisBuffer, &BufferVa, &BufferLen); - memcpy(PacketBuffer + PacketLength, BufferVa, BufferLen); - PacketLength += BufferLen; - - CurrentBuffer = NdisBuffer; - NdisGetNextBuffer(CurrentBuffer, &NdisBuffer); - } - - NDIS_DbgPrint(MID_TRACE, ("indicating a %d-byte packet\n", PacketLength)); - - MiniIndicateData(Miniport, NULL, PacketBuffer, 14, PacketBuffer+14, PacketLength-14, PacketLength-14); - - NdisFreeMemory(PacketBuffer, 0, 0); - } + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + + CurrentEntry = Adapter->ProtocolListHead.Flink; + + while (CurrentEntry != &Adapter->ProtocolListHead) + { + AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); + + for (i = 0; i < NumberOfPackets; i++) + { + (*AdapterBinding->ProtocolBinding->Chars.ReceivePacketHandler)( + AdapterBinding->NdisOpenBlock.ProtocolBindingContext, + PacketArray[i]); + } + + CurrentEntry = CurrentEntry->Flink; + } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); }

1 0

[cgutman] 36647: - Add SDL Mixer to downloader (Needed for LGeneral)
by cgutman＠svn.reactos.org 04 Oct '08

04 Oct '08

Author: cgutman Date: Sat Oct 4 12:26:11 2008 New Revision: 36647 URL: http://svn.reactos.org/svn/reactos?rev=36647&view=rev Log: - Add SDL Mixer to downloader (Needed for LGeneral) Modified: trunk/rosapps/applications/downloader/downloader.xml Modified: trunk/rosapps/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/downloader/do… ============================================================================== --- trunk/rosapps/applications/downloader/downloader.xml [iso-8859-1] (original) +++ trunk/rosapps/applications/downloader/downloader.xml [iso-8859-1] Sat Oct 4 12:26:11 2008 @@ -291,6 +291,11 @@ <description>Needed for many Open Source Games to run. You need 7-Zip or a similar Utility to extract it.</description> <location>http://www.libsdl.org/release/SDL-1.2.13-win32.zip</location> </application> + <application name="Simple Direct Media Layer (SDL) Mixer"> + <version>1.2.8</version> + <description>Needed for some Open Source Games to run. You need 7-Zip or a similar Utility to extract it.</description> + <location>http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.8-win32.zip</location> + </application> <application name="DOSBox"> <version>0.72</version> <description>DOSBox is a DOS emulator.</description>

1 0

[gedmurphy] 36646: change quicklaunch rebar hardcoded size. This puts the gripper for the taskbar in the correct position
by gedmurphy＠svn.reactos.org 04 Oct '08

04 Oct '08

Author: gedmurphy Date: Sat Oct 4 11:47:41 2008 New Revision: 36646 URL: http://svn.reactos.org/svn/reactos?rev=36646&view=rev Log: change quicklaunch rebar hardcoded size. This puts the gripper for the taskbar in the correct position Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Sat Oct 4 11:47:41 2008 @@ -153,7 +153,7 @@ TCHAR QuickLaunchBand[] = _T("Quicklaunch"); rbBand.lpText = QuickLaunchBand; rbBand.hwndChild = _hwndQuickLaunch; - rbBand.cx = 250; + rbBand.cx = 120; rbBand.wID = IDW_QUICKLAUNCHBAR; SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand);

1 0

[cgutman] 36645: - Fix the uTorrent link
by cgutman＠svn.reactos.org 04 Oct '08

04 Oct '08

Author: cgutman Date: Sat Oct 4 11:47:08 2008 New Revision: 36645 URL: http://svn.reactos.org/svn/reactos?rev=36645&view=rev Log: - Fix the uTorrent link Modified: trunk/rosapps/applications/downloader/downloader.xml Modified: trunk/rosapps/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/downloader/do… ============================================================================== --- trunk/rosapps/applications/downloader/downloader.xml [iso-8859-1] (original) +++ trunk/rosapps/applications/downloader/downloader.xml [iso-8859-1] Sat Oct 4 11:47:08 2008 @@ -274,9 +274,9 @@ </application> <application name="uTorrent"> <regname>µTorrent</regname> - <version>1.7.7</version> + <version>1.8</version> <description>Small and fast BitTorrent Client.</description> - <location>http://download.utorrent.com/1.7.7/utorrent.exe</location> + <location>http://download.utorrent.com/1.8/utorrent.exe</location> </application> <application name="Audio Grabber"> <regname>Audiograbber 1.83 SE</regname>

1 0

[gedmurphy] 36644: - Use TBSTATE_PRESSED, our checked graphic isn't too pretty - reduce desktops to 2 to save some taskbar space - switch the icon back to the original one. It suits the tango set much better.
by gedmurphy＠svn.reactos.org 04 Oct '08

04 Oct '08

Author: gedmurphy Date: Sat Oct 4 08:19:23 2008 New Revision: 36644 URL: http://svn.reactos.org/svn/reactos?rev=36644&view=rev Log: - Use TBSTATE_PRESSED, our checked graphic isn't too pretty - reduce desktops to 2 to save some taskbar space - switch the icon back to the original one. It suits the tango set much better. Modified: trunk/reactos/base/shell/explorer/globals.h trunk/reactos/base/shell/explorer/res/startmenu.ico (contents, props changed) trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp Modified: trunk/reactos/base/shell/explorer/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/global… ============================================================================== --- trunk/reactos/base/shell/explorer/globals.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/globals.h [iso-8859-1] Sat Oct 4 08:19:23 2008 @@ -235,7 +235,7 @@ #endif -#define DESKTOP_COUNT 4 +#define DESKTOP_COUNT 2 struct Desktops : public vector<DesktopRef> { Modified: trunk/reactos/base/shell/explorer/res/startmenu.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/st… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/base/shell/explorer/res/startmenu.ico ------------------------------------------------------------------------------ svn:needs-lock = * Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Sat Oct 4 08:19:23 2008 @@ -427,9 +427,7 @@ break; case ID_SWITCH_DESKTOP_1: - case ID_SWITCH_DESKTOP_1+1: - case ID_SWITCH_DESKTOP_1+2: - case ID_SWITCH_DESKTOP_1+3: { + case ID_SWITCH_DESKTOP_1+1: { int desktop_idx = id - ID_SWITCH_DESKTOP_1; g_Globals._desktops.SwitchToDesktop(desktop_idx); Modified: trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] Sat Oct 4 08:19:23 2008 @@ -150,7 +150,7 @@ SelectBitmap(hdc, hbmp_old); - AddButton(ID_SWITCH_DESKTOP_1+i, hbmp, FmtString(desktop_fmt, i+1), NULL, cur_desktop==i?TBSTATE_ENABLED|TBSTATE_CHECKED:TBSTATE_ENABLED); + AddButton(ID_SWITCH_DESKTOP_1+i, hbmp, FmtString(desktop_fmt, i+1), NULL, cur_desktop==i?TBSTATE_ENABLED|TBSTATE_PRESSED:TBSTATE_ENABLED); } DeleteDC(hdc); @@ -199,7 +199,7 @@ void QuickLaunchBar::UpdateDesktopButtons(int desktop_idx) { for(int i=0; i<DESKTOP_COUNT; ++i) { - TBBUTTONINFO tbi = {sizeof(TBBUTTONINFO), TBIF_STATE, 0, 0, desktop_idx==i? TBSTATE_ENABLED|TBSTATE_CHECKED: TBSTATE_ENABLED}; + TBBUTTONINFO tbi = {sizeof(TBBUTTONINFO), TBIF_STATE, 0, 0, desktop_idx==i? TBSTATE_ENABLED|TBSTATE_PRESSED: TBSTATE_ENABLED}; SendMessage(_hwnd, TB_SETBUTTONINFO, ID_SWITCH_DESKTOP_1+i, (LPARAM)&tbi); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs