Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 44548: Fix typo in _aullrem(), reported by zhangbonian (zhangbonian17*at*163*dot*com), bug #5015.
by dgorbachev＠svn.reactos.org 12 Dec '09

12 Dec '09

Author: dgorbachev Date: Sat Dec 12 15:28:45 2009 New Revision: 44548 URL: http://svn.reactos.org/svn/reactos?rev=44548&view=rev Log: Fix typo in _aullrem(), reported by zhangbonian (zhangbonian17*at*163*dot*com), bug #5015. Modified: trunk/reactos/lib/sdk/crt/math/i386/aullrem_asm.s Modified: trunk/reactos/lib/sdk/crt/math/i386/aullrem_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/aull… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/aullrem_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/aullrem_asm.s [iso-8859-1] Sat Dec 12 15:28:45 2009 @@ -90,7 +90,7 @@ #undef DVSRLO #undef DVSRHI #define DVNDLO [esp + 8] // stack address of dividend (a) -#define DVNDHI [esp + 8] // stack address of dividend (a) +#define DVNDHI [esp + 12] // stack address of dividend (a) #define DVSRLO [esp + 16] // stack address of divisor (b) #define DVSRHI [esp + 20] // stack address of divisor (b)

1 0

[janderwald] 44547: [PORTCLS] - Fix a bug - Found by Amine Khaldi
by janderwald＠svn.reactos.org 12 Dec '09

12 Dec '09

Author: janderwald Date: Sat Dec 12 14:51:11 2009 New Revision: 44547 URL: http://svn.reactos.org/svn/reactos?rev=44547&view=rev Log: [PORTCLS] - Fix a bug - Found by Amine Khaldi Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp [iso-8859-1] Sat Dec 12 14:51:11 2009 @@ -360,7 +360,11 @@ if (!NT_SUCCESS(Status)) { + // + // Ouch, FIX ME + // delete NewList; + return STATUS_INVALID_PARAMETER; } if (!TranslatedResourceList)

1 0

[janderwald] 44546: [MMIXER_TEST] - Commit a simple test application to test the mmixer library - Debug Outputs are appreciated
by janderwald＠svn.reactos.org 12 Dec '09

12 Dec '09

Author: janderwald Date: Sat Dec 12 14:40:54 2009 New Revision: 44546 URL: http://svn.reactos.org/svn/reactos?rev=44546&view=rev Log: [MMIXER_TEST] - Commit a simple test application to test the mmixer library - Debug Outputs are appreciated Added: trunk/rostests/tests/mmixer_test/ (with props) trunk/rostests/tests/mmixer_test/mmixer_test.rbuild (with props) trunk/rostests/tests/mmixer_test/test.c (with props) Modified: trunk/rostests/tests/directory.rbuild Modified: trunk/rostests/tests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/directory.rbuild?re… ============================================================================== --- trunk/rostests/tests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/directory.rbuild [iso-8859-1] Sat Dec 12 14:40:54 2009 @@ -139,6 +139,10 @@ <directory name="mktime"> <xi:include href="mktime/mktime.rbuild" /> </directory> + <directory name="mmixer_test"> + <xi:include href="mmixer_test/mmixer_test.rbuild" /> + </directory> + <directory name="moztest"> <xi:include href="moztest/moztest.rbuild" /> </directory> Propchange: trunk/rostests/tests/mmixer_test/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Dec 12 14:40:54 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/tests/mmixer_test/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/tests/mmixer_test/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/tests/mmixer_test/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/tests/mmixer_test/mmixer_test.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/mmixer_test/mmixer_… ============================================================================== --- trunk/rostests/tests/mmixer_test/mmixer_test.rbuild (added) +++ trunk/rostests/tests/mmixer_test/mmixer_test.rbuild [iso-8859-1] Sat Dec 12 14:40:54 2009 @@ -1,0 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="mmixer_test" type="win32cui" baseaddress="${BASEADDRESS_CONTROL}" installbase="system32" installname="mmixer_test.exe"> + <include base="ReactOS">include/reactos/libs/sound</include> + <include base="mmixer"></include> + <library>advapi32</library> + <library>setupapi</library> + <library>kernel32</library> + <library>winmm</library> + <library>mmixer</library> + <file>test.c</file> +</module> Propchange: trunk/rostests/tests/mmixer_test/mmixer_test.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/tests/mmixer_test/test.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/mmixer_test/test.c?… ============================================================================== --- trunk/rostests/tests/mmixer_test/test.c (added) +++ trunk/rostests/tests/mmixer_test/test.c [iso-8859-1] Sat Dec 12 14:40:54 2009 @@ -1,0 +1,299 @@ +#include <windows.h> +#include <stdio.h> +#include <stdlib.h> +#include <setupapi.h> +#include <ksmedia.h> +#include <mmsystem.h> +#include <mmreg.h> +#include "mmixer.h" + +MIXER_CONTEXT MixerContext; +GUID CategoryGuid = {STATIC_KSCATEGORY_AUDIO}; + +PVOID Alloc(ULONG NumBytes) +{ + //printf("Alloc: %lu\n", NumBytes); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, NumBytes); +} + +MIXER_STATUS +Close(HANDLE hDevice) +{ + //printf("Close: Handle %p\n", hDevice); + if (CloseHandle(hDevice)) + return MM_STATUS_SUCCESS; + else + return MM_STATUS_UNSUCCESSFUL; +} + +VOID +Free(PVOID Block) +{ + //printf("Free: %p\n", Block); + HeapFree(GetProcessHeap(), 0, Block); +} + +VOID +Copy(PVOID Src, PVOID Dst, ULONG NumBytes) +{ + //printf("Copy: Src %p Dst %p NumBytes %lu\n", Src, Dst, NumBytes); + CopyMemory(Src, Dst, NumBytes); +} + +MIXER_STATUS +Open( + IN LPWSTR DevicePath, + OUT PHANDLE hDevice) +{ + DevicePath[1] = L'\\'; + *hDevice = CreateFileW(DevicePath, + GENERIC_READ | GENERIC_WRITE, + 0, + NULL, + OPEN_EXISTING, + FILE_FLAG_OVERLAPPED, + NULL); + if (*hDevice == INVALID_HANDLE_VALUE) + { + //wprintf(L" Failed to open %s Error %lu\n", DevicePath, GetLastError()); + return MM_STATUS_UNSUCCESSFUL; + } + wprintf(L"Open: %s hDevice %p\n", DevicePath, *hDevice); + + return MM_STATUS_SUCCESS; +} + +MIXER_STATUS +Control( + IN HANDLE hMixer, + IN ULONG dwIoControlCode, + IN PVOID lpInBuffer, + IN ULONG nInBufferSize, + OUT PVOID lpOutBuffer, + ULONG nOutBufferSize, + PULONG lpBytesReturned) +{ + OVERLAPPED Overlapped; + BOOLEAN IoResult; + DWORD Transferred = 0; + + //printf("hMixer %p dwIoControlCode %lx lpInBuffer %p nInBufferSize %lu lpOutBuffer %p nOutBufferSize %lu lpBytesReturned %p\n", + // hMixer, dwIoControlCode, lpInBuffer, nInBufferSize, lpOutBuffer, nOutBufferSize, lpBytesReturned); + + /* Overlapped I/O is done here - this is used for waiting for completion */ + ZeroMemory(&Overlapped, sizeof(OVERLAPPED)); + Overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + + if ( ! Overlapped.hEvent ) + return MM_STATUS_NO_MEMORY; + + /* Talk to the device */ + IoResult = DeviceIoControl(hMixer, + dwIoControlCode, + lpInBuffer, + nInBufferSize, + lpOutBuffer, + nOutBufferSize, + &Transferred, + &Overlapped); + + /* If failure occurs, make sure it's not just due to the overlapped I/O */ + if ( ! IoResult ) + { + if ( GetLastError() != ERROR_IO_PENDING ) + { + CloseHandle(Overlapped.hEvent); + + //printf("Control: Failed with %lu Transferred %lu\n", GetLastError(), Transferred); + + if (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + if ( lpBytesReturned ) + *lpBytesReturned = Transferred; + return MM_STATUS_MORE_ENTRIES; + } + + return MM_STATUS_UNSUCCESSFUL; + } + } + + /* Wait for the I/O to complete */ + IoResult = GetOverlappedResult(hMixer, + &Overlapped, + &Transferred, + TRUE); + + /* Don't need this any more */ + CloseHandle(Overlapped.hEvent); + + if ( ! IoResult ) + return MM_STATUS_UNSUCCESSFUL; + + //printf("Transferred %lu bytes in Sync overlapped I/O\n", Transferred); + + if ( lpBytesReturned ) + *lpBytesReturned = Transferred; + + return MM_STATUS_SUCCESS; +} + +MIXER_STATUS +Enum( + IN PVOID EnumContext, + IN ULONG DeviceIndex, + OUT LPWSTR * DeviceName, + OUT PHANDLE OutHandle) +{ + SP_DEVICE_INTERFACE_DATA InterfaceData; + SP_DEVINFO_DATA DeviceData; + PSP_DEVICE_INTERFACE_DETAIL_DATA_W DetailData; + BOOL Result; + DWORD Length; + + //printf("Enum EnumContext %p DeviceIndex %lu OutHandle %p\n", EnumContext, DeviceIndex, OutHandle); + + InterfaceData.cbSize = sizeof(InterfaceData); + InterfaceData.Reserved = 0; + + Result = SetupDiEnumDeviceInterfaces(EnumContext, + NULL, + &CategoryGuid, + DeviceIndex, + &InterfaceData); + + if (!Result) + { + if (GetLastError() == ERROR_NO_MORE_ITEMS) + { + printf("LastDevice\n"); + return MM_STATUS_NO_MORE_DEVICES; + } + printf("SetupDiEnumDeviceInterfaces failed with %lu\n", GetLastError()); + return MM_STATUS_UNSUCCESSFUL; + } + + Length = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR); + DetailData = (PSP_DEVICE_INTERFACE_DETAIL_DATA_W)HeapAlloc(GetProcessHeap(), + 0, + Length); + DetailData->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); + DeviceData.cbSize = sizeof(DeviceData); + DeviceData.Reserved = 0; + + Result = SetupDiGetDeviceInterfaceDetailW(EnumContext, + &InterfaceData, + DetailData, + Length, + NULL, + &DeviceData); + + if (!Result) + { + printf("SetupDiGetDeviceInterfaceDetailW failed with %lu\n", GetLastError()); + return MM_STATUS_UNSUCCESSFUL; + } + + // copy path + *DeviceName = (LPWSTR)&DetailData->DevicePath[0]; + return Open(DetailData->DevicePath, OutHandle); +} + + +int main(int argc, char**argv) +{ + MIXER_STATUS Status; + HDEVINFO DeviceHandle; + MIXERCAPSW MixCaps1, MixCaps2; + ULONG Index, SubIndex; + HANDLE hMixer2; + HMIXER hMixer1; + MIXERLINEW MixerLine1, MixerLine2; + MIXERLINECONTROLS Controls1, Controls2; + + ZeroMemory(&MixerContext, sizeof(MIXER_CONTEXT)); + + DeviceHandle = SetupDiGetClassDevs(&CategoryGuid, + NULL, + NULL, + DIGCF_DEVICEINTERFACE|DIGCF_PRESENT); + if (DeviceHandle == INVALID_HANDLE_VALUE) + { + printf("SetupDiGetClassDevs failed with %lx\n", GetLastError()); + return 0; + } + + printf("DeviceHandle %p\n", DeviceHandle); + + MixerContext.SizeOfStruct = sizeof(MIXER_CONTEXT); + MixerContext.Alloc = Alloc; + MixerContext.Close = Close; + MixerContext.Control = Control; + MixerContext.Copy = Copy; + MixerContext.Free = Free; + MixerContext.Open = Open; + + Status = MMixerInitialize(&MixerContext, Enum, (PVOID)DeviceHandle); + + printf("Status %x\n", Status); + printf("NumberOfMixers %lu mixerGetNumDevs %u\n", MMixerGetCount(&MixerContext), mixerGetNumDevs()); + + for(Index = 0; Index < MMixerGetCount(&MixerContext); Index++) + { + mixerGetDevCapsW(Index, &MixCaps1, sizeof(MIXERCAPSW)); + wprintf(L"WINM: cDestination %u fdwSupport %lx szPname %s vDriverVersion %u wMid %x wPid %x\n", MixCaps1.cDestinations, MixCaps1.fdwSupport, MixCaps1.szPname, MixCaps1.vDriverVersion, MixCaps1.wMid, MixCaps1.wPid); + MMixerGetCapabilities(&MixerContext, Index, &MixCaps2); + wprintf(L"MMIX: cDestination %u fdwSupport %lx szPname %s vDriverVersion %u wMid %x wPid %x\n", MixCaps2.cDestinations, MixCaps2.fdwSupport, MixCaps2.szPname, MixCaps2.vDriverVersion, MixCaps2.wMid, MixCaps2.wPid); + + mixerOpen(&hMixer1, Index, 0, 0, MIXER_OBJECTF_HMIXER); + MMixerOpen(&MixerContext, Index, NULL, NULL, &hMixer2); + + ZeroMemory(&MixerLine1, sizeof(MIXERLINEW)); + ZeroMemory(&MixerLine2, sizeof(MIXERLINEW)); + MixerLine1.cbStruct = sizeof(MIXERLINEW); + MixerLine2.cbStruct = sizeof(MIXERLINEW); + mixerGetLineInfoW((HMIXEROBJ)hMixer1, &MixerLine1, MIXER_GETLINEINFOF_DESTINATION); + MMixerGetLineInfo(&MixerContext, hMixer2, MIXER_GETLINEINFOF_DESTINATION, &MixerLine2); + + wprintf(L"WINM: dwDestination %lx dwSource %lx dwLineID %lx dwUser %lx dwComponentType %lx cChannels %lx cConnections %lx cControls %lx szShortName %s szName %s\n\n", + MixerLine1.dwDestination, MixerLine1.dwSource, MixerLine1.dwLineID, MixerLine1.dwUser, MixerLine1.dwComponentType, MixerLine1.cChannels, MixerLine1.cConnections, MixerLine1.cControls, MixerLine1.szShortName, MixerLine1.szName); + + wprintf(L"MMIX: dwDestination %lx dwSource %lx dwLineID %lx dwUser %lx dwComponentType %lx cChannels %lx cConnections %lx cControls %lx szShortName %s szName %s\n\n", + MixerLine2.dwDestination, MixerLine2.dwSource, MixerLine2.dwLineID, MixerLine2.dwUser, MixerLine2.dwComponentType, MixerLine2.cChannels, MixerLine2.cConnections, MixerLine2.cControls, MixerLine2.szShortName, MixerLine2.szName); + + Controls1.cbStruct = sizeof(MIXERLINECONTROLS); + Controls2.cbStruct = sizeof(MIXERLINECONTROLS); + + Controls1.cbmxctrl = sizeof(MIXERCONTROL); + Controls2.cbmxctrl = sizeof(MIXERCONTROL); + + Controls1.cControls = MixerLine1.cControls; + Controls2.cControls = MixerLine2.cControls; + + Controls1.dwLineID = MixerLine1.dwLineID; + Controls2.dwLineID = MixerLine2.dwLineID; + + + + Controls1.pamxctrl = (LPMIXERCONTROL)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MIXERCONTROL) * Controls1.cControls); + Controls2.pamxctrl = (LPMIXERCONTROL)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MIXERCONTROL) * Controls2.cControls); + + for(SubIndex = 0; SubIndex < Controls1.cControls; SubIndex++) + Controls1.pamxctrl[SubIndex].cbStruct = sizeof(MIXERCONTROL); + + for(SubIndex = 0; SubIndex < Controls2.cControls; SubIndex++) + Controls2.pamxctrl[SubIndex].cbStruct = sizeof(MIXERCONTROL); + + mixerGetLineControls((HMIXEROBJ)hMixer1, &Controls1, MIXER_GETLINECONTROLSF_ALL); + + wprintf(L"----------------------------------------\n"); + for(SubIndex = 0; SubIndex < Controls1.cControls; SubIndex++) + { + wprintf(L"WINM: Index %d dwControlID %lx dwControlType %lx fdwControl %lx cMultipleItems %lx szName %s szShortName %s \n", SubIndex, Controls1.pamxctrl[SubIndex].dwControlID, Controls1.pamxctrl[SubIndex].dwControlType, Controls1.pamxctrl[SubIndex].fdwControl, Controls1.pamxctrl[SubIndex].cMultipleItems, Controls1.pamxctrl[SubIndex].szName, Controls1.pamxctrl[SubIndex].szShortName); + } + wprintf(L"----------------------------------------\n"); + + + wprintf(L"=======================\n"); + } + return 0; +} Propchange: trunk/rostests/tests/mmixer_test/test.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 44545: [PORTCLS] - Fix possible dereferencing of null pointer - Found by Amine Khaldi
by janderwald＠svn.reactos.org 12 Dec '09

12 Dec '09

Author: janderwald Date: Sat Dec 12 14:27:05 2009 New Revision: 44545 URL: http://svn.reactos.org/svn/reactos?rev=44545&view=rev Log: [PORTCLS] - Fix possible dereferencing of null pointer - Found by Amine Khaldi Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Sat Dec 12 14:27:05 2009 @@ -484,7 +484,7 @@ RtlStringFromGUID(*EventItem->Set, &GuidString); DPRINT1("EventIndex %u GUID %S Id %u Flags %x\n", Index, GuidString.Buffer, EventItem->Id, EventItem->Flags); - EventItem = (PPCEVENT_ITEM)((ULONG_PTR)EventItem + FilterDescription->AutomationTable->EventItemSize); + EventItem = (PPCEVENT_ITEM)((ULONG_PTR)EventItem + NodeDescriptor->AutomationTable->EventItemSize); } }

1 0

[gschneider] 44544: [advapi32] Print the used name when failing to open a control pipe
by gschneider＠svn.reactos.org 12 Dec '09

12 Dec '09

Author: gschneider Date: Sat Dec 12 13:57:46 2009 New Revision: 44544 URL: http://svn.reactos.org/svn/reactos?rev=44544&view=rev Log: [advapi32] Print the used name when failing to open a control pipe Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Sat Dec 12 13:57:46 2009 @@ -237,7 +237,7 @@ NULL); if (*hPipe == INVALID_HANDLE_VALUE) { - ERR("CreateFileW() failed (Error %lu)\n", GetLastError()); + ERR("CreateFileW() failed for pipe %S (Error %lu)\n", NtControlPipeName, GetLastError()); return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; }

1 0

[gschneider] 44543: [ntoskrnl] - The field ZeroInit should be initialized to zero - do that by assigning the message type directly - Fixes the hanging ntdll port winetest (it didn't get a CLIENT_DIED notification because the call to LpcRequestPort failed)
by gschneider＠svn.reactos.org 12 Dec '09

12 Dec '09

Author: gschneider Date: Sat Dec 12 13:32:09 2009 New Revision: 44543 URL: http://svn.reactos.org/svn/reactos?rev=44543&view=rev Log: [ntoskrnl] - The field ZeroInit should be initialized to zero - do that by assigning the message type directly - Fixes the hanging ntdll port winetest (it didn't get a CLIENT_DIED notification because the call to LpcRequestPort failed) Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=445… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Sat Dec 12 13:32:09 2009 @@ -596,7 +596,7 @@ if (TerminationPort) { /* Setup the message header */ - TerminationMsg.h.u2.s2.Type = LPC_CLIENT_DIED; + TerminationMsg.h.u2.ZeroInit = LPC_CLIENT_DIED; TerminationMsg.h.u1.s1.TotalLength = sizeof(TerminationMsg); TerminationMsg.h.u1.s1.DataLength = sizeof(TerminationMsg) - sizeof(PORT_MESSAGE);

1 0

[gschneider] 44542: [ntoskrnl/lpc] - Fix a typo, correct paths
by gschneider＠svn.reactos.org 12 Dec '09

12 Dec '09

Author: gschneider Date: Sat Dec 12 13:23:55 2009 New Revision: 44542 URL: http://svn.reactos.org/svn/reactos?rev=44542&view=rev Log: [ntoskrnl/lpc] - Fix a typo, correct paths Modified: trunk/reactos/ntoskrnl/include/internal/lpc.h trunk/reactos/ntoskrnl/include/internal/lpc_x.h Modified: trunk/reactos/ntoskrnl/include/internal/lpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/lpc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/lpc.h [iso-8859-1] Sat Dec 12 13:23:55 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory -* FILE: ntoskrnl/include/lpc.h +* FILE: ntoskrnl/include/internal/lpc.h * PURPOSE: Internal header for the Local Procedure Call * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/ntoskrnl/include/internal/lpc_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/lpc_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/lpc_x.h [iso-8859-1] Sat Dec 12 13:23:55 2009 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory -* FILE: ntoskrnl/include/lpc_x.h -* PURPOSE: Intenral Inlined Functions for Local Procedure Call +* FILE: ntoskrnl/include/internal/lpc_x.h +* PURPOSE: Internal Inlined Functions for Local Procedure Call * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */

1 0

[jimtabor] 44541: [Win32k] - Create a Gre function for GetKerningPairs.
by jimtabor＠svn.reactos.org 12 Dec '09

12 Dec '09

Author: jimtabor Date: Sat Dec 12 01:19:37 2009 New Revision: 44541 URL: http://svn.reactos.org/svn/reactos?rev=44541&view=rev Log: [Win32k] - Create a Gre function for GetKerningPairs. Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Sat Dec 12 01:19:37 2009 @@ -13,7 +13,68 @@ #define NDEBUG #include <debug.h> +DWORD FASTCALL GreGetGlyphIndicesW(HDC,LPWSTR,INT,LPWORD,DWORD,DWORD); + /** Internal ******************************************************************/ + +DWORD +FASTCALL +GreGetKerningPairs( + HDC hDC, + ULONG NumPairs, + LPKERNINGPAIR krnpair) +{ + PDC dc; + PDC_ATTR pdcattr; + PTEXTOBJ TextObj; + PFONTGDI FontGDI; + DWORD Count; + KERNINGPAIR *pKP; + + dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + pdcattr = dc->pdcattr; + TextObj = RealizeFontInit(pdcattr->hlfntNew); + DC_UnlockDc(dc); + + if (!TextObj) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + FontGDI = ObjToGDI(TextObj->Font, FONT); + TEXTOBJ_UnlockText(TextObj); + + Count = ftGdiGetKerningPairs(FontGDI,0,NULL); + + if ( Count && krnpair ) + { + if (Count > NumPairs) + { + SetLastWin32Error(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + pKP = ExAllocatePoolWithTag(PagedPool, Count * sizeof(KERNINGPAIR), TAG_GDITEXT); + if (!pKP) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + ftGdiGetKerningPairs(FontGDI,Count,pKP); + + RtlCopyMemory(krnpair, pKP, Count * sizeof(KERNINGPAIR)); + + ExFreePoolWithTag(pKP,TAG_GDITEXT); + } + return Count; +} + DWORD FASTCALL @@ -31,6 +92,7 @@ { if (GreGetTextExtentW( hdc, pwsz, nCount, &Size, 1)) return MAKELONG(Size.cx, Size.cy); + return 0; } UNIMPLEMENTED; return 0;

1 0

[sserapion] 44540: -Detect if this is a amd64 CPU before attempting to boot. Patch by Basil Gello (gellmar at yahoo dot com).
by sserapion＠svn.reactos.org 11 Dec '09

11 Dec '09

Author: sserapion Date: Fri Dec 11 20:01:45 2009 New Revision: 44540 URL: http://svn.reactos.org/svn/reactos?rev=44540&view=rev Log: -Detect if this is a amd64 CPU before attempting to boot. Patch by Basil Gello (gellmar at yahoo dot com). Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] Fri Dec 11 20:01:45 2009 @@ -20,6 +20,10 @@ mov gs, ax mov ss, ax + /* checkPoint Charlie - where it all began... */ + mov si, offset _CheckPoint0 + call writestr + /* Setup a real mode stack */ mov sp, stack16 @@ -41,35 +45,91 @@ call x86_16_EnableA20 + /* checkPoint Charlie - where it all began... */ + mov si, offset _CheckPoint1 + call writestr + call x86_16_BuildPageTables - - /* Switch to long mode */ + + /* checkPoint Charlie - where it all began... */ + mov si, offset _CheckPoint2 + call writestr + + /* Check if CPU supports CPUID */ + + pushfd + pop eax + mov ebx, eax + xor eax, 0x00200000 + push eax + popfd + pushfd + pop eax + cmp eax,ebx + jz NO_CPUID_SUPPORT_DETECTED + + /* CPUID support detected - getting the PAE/PGE */ + + mov eax,1 // Fn0000_0001 - PAE in EDX[6] + cpuid + xor eax,eax + and edx,0x00a0 + test edx,edx // are PAE and PGE bits set? + jz NO_X64_SUPPORT_DETECTED + + /* PAE and PGE are here */ + + xor edx, edx + mov eax, 0x80000001 + cpuid + and edx, 0x20000000 + test edx,edx + jz NO_X64_SUPPORT_DETECTED + + /* X64 Processor */ + + /* checkPoint Charlie - where it all began... */ + mov si, offset _CheckPoint3 + call writestr + + jmp _switch64 + +NO_X64_SUPPORT_DETECTED: + mov si, offset _NotAnX64Processor // Loading message + call writestr + jmp _fail + +NO_CPUID_SUPPORT_DETECTED: + mov si, offset _NoCPUIDSupport // Loading message + call writestr + +_fail: + jmp _fail + nop + nop + +_switch64: call x86_16_SwitchToLong .code64 + +// mov ax, LMODE_DS +// mov ds, ax +// mov word ptr ds:[0xb8000], 0x0e00 + '1' + + /* GO! */ + xor rcx, rcx + call _BootMain /* Checkpoint */ // mov ax, LMODE_DS // mov ds, ax -// mov word ptr ds:[0xb8000], 0x0e00 + '1' - - /* GO! */ - xor rcx, rcx - call _BootMain - - /* Checkpoint */ -// mov ax, LMODE_DS -// mov ds, ax -// mov word ptr ds:[0xb8002], 0x0e00 + '2' - +// mov word ptr ds:[0xb8002], 0x0e02 + '2' + + /* Return into real mode */ call x86_64_SwitchToReal .code16 - - /* Checkpoint */ -// mov ax, 0xb800 -// mov fs, ax -// mov word ptr fs:[0xA0], 0x0e00 + '0' // int 0x19 @@ -105,7 +165,6 @@ popa ret - /* * We define 512 2MB pages at the start of memory, so we can access the first * 1 GB as if paging was disabled @@ -158,9 +217,39 @@ popa ret +/* + * writechr,writestr + * + * + */ +writestr: + pushfd + pushad +.top: + lodsb + and al, al + jz .end + call writechr + jmp short .top +.end: + popad + popfd + ret + + +writechr: + pushf + pusha + mov ah, 0x0E + xor bx, bx + int 0x10 + popa + popf + ret //.global x86_16_SwitchToLong x86_16_SwitchToLong: + cli xor ax,ax @@ -205,8 +294,7 @@ /* Now return in long mode! */ ret - -/** 64 But functions **********************************************************/ +/** 64 Bit functions **********************************************************/ .code64 .global x86_64_SwitchToReal @@ -325,6 +413,36 @@ _BootPartition: .long 0 +.global _NotAnX64Processor +_NotAnX64Processor: + .ascii "FreeLoader: No x64-compatible CPU detected! Exiting..." + .byte 0x0d, 0x0a, 0 + +.global _NoCPUIDSupport +_NoCPUIDSupport: + .ascii "FreeLoader: No CPUID instruction support detected! Exiting..." + .byte 0x0d, 0x0a, 0 + +/////////////////////////// Checkpoint messages /////////////////////////////// +.global _CheckPoint0 +_CheckPoint0: + .ascii "Starting FreeLoader..." + .byte 0x0d, 0x0a, 0 + +.global _CheckPoint1 +_CheckPoint1: + .ascii "FreeLoader[16-bit]: building page tables..." + .byte 0x0d, 0x0a, 0 + +.global _CheckPoint2 +_CheckPoint2: + .ascii "FreeLoader[16-bit]: checking CPU for x64 long mode..." + .byte 0x0d, 0x0a, 0 + +.global _CheckPoint3 +_CheckPoint3: + .ascii "FreeLoader: Switching to x64 long mode..." + .byte 0x0d, 0x0a, 0 ///////////////////////////////////////////////////////////////////////////////

1 0

[gschneider] 44539: [videoprt] Split complicated asserts for easier problem understanding as seen in bug #4354
by gschneider＠svn.reactos.org 11 Dec '09

11 Dec '09

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

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