Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[greatlrd] 50007: update some dx driver header some info are not inuse yet
by greatlrd＠svn.reactos.org 11 Dec '10

11 Dec '10

Author: greatlrd Date: Sat Dec 11 12:22:30 2010 New Revision: 50007 URL: http://svn.reactos.org/svn/reactos?rev=50007&view=rev Log: update some dx driver header some info are not inuse yet Modified: branches/reactx/reactos/include/reactos/drivers/directx/directxint.h branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h Modified: branches/reactx/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] Sat Dec 11 12:22:30 2010 @@ -108,7 +108,7 @@ typedef struct _EDD_DIRECTDRAW_GLOBAL { -/* 0x000 */ PVOID dhpdev; // 0x000 <-- verified to match Windows XP, dhpdev, the drv hPDev --> +/* 0x000 */ PVOID dhpdev; // 0x000 PDev->dhpdev <-- verified to match Windows XP, dhpdev, the drv hPDev --> /* 0x004 */ DWORD dwReserved1; /* 0x008 */ DWORD dwReserved2; /* 0x00C */ ULONG unk_000c[3]; @@ -127,8 +127,9 @@ /* 0x024 */ ULONG unk_024; -/* 0x028 */ LARGE_INTEGER llAssertModeTimeout; /* 0x028 <-- verified to match Windows XP, llAssertModeTimeout, it - using regkey +/* 0x028 */ LPVOID llAssertModeTimeout; /* 0x028 <-- verified to match Windows XP, llAssertModeTimeout, + it it is a function u can call on. + it using regkey HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\DCI Specifies how long a DirectDraw application can keep a graphics-device frame-buffer locked in second, if this value are set to 0 it disable directdraw acclatrions. @@ -163,7 +164,7 @@ /* 0x5B8 */ PKEVENT pAssertModeEvent; /* 0x5Bc */ EDD_SURFACE *peSurfaceCurrent; /* 0x5C0 */ EDD_SURFACE *peSurfacePrimary; -/* 0x5C4 */ BOOL bSuspended; // 0x5C4 <-- verified to match Windows XP, tells dxg to use driver's own api or return error code instead +/* 0x5C4 */ BOOL bSuspended; // 0x5C4 <-- verified to match Windows XP, tells dxg to use driver's own api or return error code instead /* 0x5C8 */ ULONG unk_5c8[12]; /* 0x5F8 */ RECTL rcbounds; /* 0x608 */ ULONG unk_608; Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] Sat Dec 11 12:22:30 2010 @@ -77,6 +77,7 @@ PDC NTAPI DxEngLockDC(HDC hDC); BOOLEAN NTAPI DxEngUnlockDC(PDC pDC); DWORD_PTR NTAPI DxEngGetHdevData(HDEV, DXEGSHDEVDATA); + BOOLEAN NTAPI DxEngSetHdevData(HDEV, DXEGSHDEVDATA, DWORD_PTR); BOOLEAN NTAPI DxEngLockHdev(HDEV hdev); BOOLEAN NTAPI DxEngUnlockHdev(HDEV hdev); @@ -120,4 +121,16 @@ DWORD NTAPI DxEngGetRedirectionBitmap(DWORD x1); DWORD NTAPI DxEngLoadImage(DWORD x1,DWORD x2); +/***********************************************************************************/ +/* Driver Functions Protypes */ +/***********************************************************************************/ +typedef BOOLEAN (NTAPI *PGD_DXENGNUISTERMSRV)(); +typedef PDC (NTAPI *PGD_DXENGLOCKDC)(HDC hDC); +typedef BOOLEAN (NTAPI *PGD_DXENGUNLOCKDC)(PDC pDC); +typedef DWORD_PTR (NTAPI *PGD_DXENGGETHDEVDATA)(HDEV, DXEGSHDEVDATA); + +/***********************************************************************************/ +/* DxEGShDevData_dd_flags value */ +/***********************************************************************************/ +#define DDFLAG_DIRECTX_3D_ON 0x04

1 0

[fireball] 50006: - Return time difference to the next timeout as a 64 bit integer instead of 32 bit which sometimes could "overlap" in case of big timeouts. See issue #5758 for more details.
by fireball＠svn.reactos.org 10 Dec '10

10 Dec '10

Author: fireball Date: Fri Dec 10 21:17:49 2010 New Revision: 50006 URL: http://svn.reactos.org/svn/reactos?rev=50006&view=rev Log: - Return time difference to the next timeout as a 64 bit integer instead of 32 bit which sometimes could "overlap" in case of big timeouts. See issue #5758 for more details. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/timeout.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/timeout.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/timeout.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/timeout.c [iso-8859-1] Fri Dec 10 21:17:49 2010 @@ -113,7 +113,7 @@ } /* process pending timeouts and return the time until the next timeout, in milliseconds */ -static int get_next_timeout(void) +static void get_next_timeout(LARGE_INTEGER *result) { timeout_t current_time; get_current_time(&current_time); @@ -150,27 +150,32 @@ if ((ptr = list_head( &timeout_list )) != NULL) { struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); - //int diff = (timeout->when - current_time + 9999) / 10000; - int diff = timeout->when - current_time + 1; - if (diff < 0) diff = 0; - return diff; - } - } - return -1; /* no pending timeouts */ + LARGE_INTEGER diff; + diff.QuadPart = timeout->when - current_time; + //DPRINT1("diff %d, when %I64d, current %I64d\n", diff, timeout->when, current_time); + if (diff.QuadPart < 0) diff.QuadPart = 0; + + result->QuadPart = diff.QuadPart; + return; + } + } + + result->QuadPart = -1LL; + return; /* no pending timeouts */ } VOID ProcessTimers() { - int timeout; + LARGE_INTEGER timeout; LARGE_INTEGER DueTime; - timeout = get_next_timeout(); - - if (timeout != -1) + get_next_timeout(&timeout); + DPRINT("ProcessTimers() timeout %I64d\n", timeout.QuadPart); + if (timeout.QuadPart != -1LL) { /* Wait for the next time out */ - DueTime.QuadPart = -timeout; + DueTime.QuadPart = -timeout.QuadPart; KeSetTimer(MasterTimer, DueTime, NULL); } else

1 0

[akhaldi] 50005: [CMAKE] - Add some importlib targets.
by akhaldi＠svn.reactos.org 10 Dec '10

10 Dec '10

Author: akhaldi Date: Fri Dec 10 16:08:35 2010 New Revision: 50005 URL: http://svn.reactos.org/svn/reactos?rev=50005&view=rev Log: [CMAKE] - Add some importlib targets. Modified: branches/cmake-bringup/dll/win32/atl/CMakeLists.txt branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt branches/cmake-bringup/dll/win32/credui/CMakeLists.txt branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt branches/cmake-bringup/dll/win32/odbccp32/CMakeLists.txt branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/atl/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/atl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/atl/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -22,9 +22,7 @@ set_module_type(atl win32dll) -target_link_libraries(atl - uuid - wine) +target_link_libraries(atl uuid wine) add_importlibs(atl msvcrt @@ -36,5 +34,7 @@ kernel32 ntdll) +add_importlib_target(atl.spec) + add_dependencies(atl atl_atliface_header) add_cab_target(atl 1) Modified: branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avifil3… ============================================================================== --- branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -6,6 +6,8 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(avifil32.dll avifil32.spec) add_library(avifil32 SHARED acmstream.c @@ -20,17 +22,11 @@ tmpfile.c wavfile.c rsrc.rc - avifil32.def) - -if(NOT MSVC) - set_source_files_properties(avifil32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() + ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def) set_module_type(avifil32 win32dll) -target_link_libraries(avifil32 - uuid - wine) +target_link_libraries(avifil32 uuid wine) add_importlibs(avifil32 msvcrt @@ -43,4 +39,5 @@ kernel32 ntdll) +add_importlib_target(avifil32.spec) add_cab_target(avifil32 1) Modified: branches/cmake-bringup/dll/win32/credui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/credui/… ============================================================================== --- branches/cmake-bringup/dll/win32/credui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/credui/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -18,5 +18,6 @@ target_link_libraries(credui wine) add_importlibs(credui advapi32 user32 comctl32 msvcrt kernel32 ntdll) +add_importlib_target(credui.spec) add_cab_target(credui 1) Modified: branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptne… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -21,5 +21,5 @@ kernel32 ntdll) - +add_importlib_target(cryptnet.spec) add_cab_target(cryptnet 1) Modified: branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hlink/C… ============================================================================== --- branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -28,5 +28,5 @@ kernel32 ntdll) - +add_importlib_target(hlink.spec) add_cab_target(hlink 1) Modified: branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/icmp/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -16,5 +16,5 @@ target_link_libraries(icmp wine) add_importlibs(icmp ws2_32 msvcrt kernel32 ntdll) -add_dependencies(icmp psdk) +add_importlib_target(icmp.spec) add_cab_target(icmp 1) Modified: branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/inetcom… ============================================================================== --- branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -21,9 +21,7 @@ set_module_type(inetcomm win32dll) -target_link_libraries(inetcomm - uuid - wine) +target_link_libraries(inetcomm uuid wine) add_importlibs(inetcomm ole32 @@ -35,4 +33,5 @@ kernel32 ntdll) +add_importlib_target(inetcomm.spec) add_cab_target(inetcomm 1) Modified: branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntdsapi… ============================================================================== --- branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -14,5 +14,6 @@ target_link_libraries(ntdsapi wine) add_importlibs(ntdsapi user32 kernel32 ntdll) +add_importlib_target(ntdsapi.spec) add_dependencies(ntdsapi psdk buildno_header) add_cab_target(ntdsapi 1) Modified: branches/cmake-bringup/dll/win32/odbccp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/odbccp3… ============================================================================== --- branches/cmake-bringup/dll/win32/odbccp32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/odbccp32/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -1,6 +1,7 @@ -add_definitions(-D__WINESRC__) -add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions( + -D__WINESRC__ + -D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -13,9 +14,7 @@ add_library(odbccp32 SHARED ${SOURCE}) set_entrypoint(odbccp32 0) -target_link_libraries(odbccp32 - uuid - wine) +target_link_libraries(odbccp32 uuid wine) add_importlibs(odbccp32 msvcrt @@ -23,5 +22,5 @@ kernel32 ntdll) - +add_importlib_target(odbccp32.spec) add_cab_target(odbccp32 1) Modified: branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oleacc/… ============================================================================== --- branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -6,7 +6,8 @@ spec2def(oleacc.dll oleacc.spec) list(APPEND SOURCE - main.c oleacc.rc + main.c + oleacc.rc ${CMAKE_CURRENT_BINARY_DIR}/oleacc.def) add_library(oleacc SHARED ${SOURCE}) @@ -20,5 +21,5 @@ kernel32 ntdll) - -add_cab_target(oleacc 1) +add_importlib_target(oleacc.spec) +add_cab_target(oleacc 1) Modified: branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/pdh/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -18,5 +18,6 @@ target_link_libraries(pdh wine) add_importlibs(pdh kernel32 ntdll) +add_importlib_target(pdh.spec) add_cab_target(pdh 1) Modified: branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/powrpro… ============================================================================== --- branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -13,6 +13,5 @@ target_link_libraries(powrprof wine) add_importlibs(powrprof advapi32 user32 comctl32 msvcrt kernel32 ntdll) - +add_importlib_target(powrprof.spec) add_cab_target(powrprof 1) -add_importlib_target(powrprof.spec) Modified: branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winhttp… ============================================================================== --- branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -1,6 +1,8 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(winhttp.dll winhttp.spec) add_library(winhttp SHARED cookie.c @@ -10,16 +12,10 @@ request.c session.c url.c - winhttp.def) - -if(NOT MSVC) - set_source_files_properties(winhttp.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() + ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def) set_module_type(winhttp win32dll) - target_link_libraries(winhttp wine) - add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt crypt32 advapi32 kernel32 ntdll) - +add_importlib_target(winhttp.spec) add_cab_target(winhttp 1) Modified: branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wlanapi… ============================================================================== --- branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -17,6 +17,7 @@ ${PSEH_LIB}) add_importlibs(wlanapi rpcrt4 kernel32 ntdll) +add_importlib_target(wlanapi.spec) + add_dependencies(wlanapi psdk buildno_header) - -add_cab_target(wlanapi 1) +add_cab_target(wlanapi 1) Modified: branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wldap32… ============================================================================== --- branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -36,5 +36,5 @@ target_link_libraries(wldap32 wine) add_importlibs(wldap32 user32 msvcrt kernel32 ntdll) - +add_importlib_target(wldap32.spec) add_cab_target(wldap32 1) Modified: branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xmllite… ============================================================================== --- branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -13,9 +13,8 @@ set_module_type(xmllite win32dll) -target_link_libraries(xmllite - wine) +target_link_libraries(xmllite wine) add_importlibs(xmllite msvcrt kernel32 ntdll) - +add_importlib_target(xmllite.spec) add_cab_target(xmllite 1)

1 0

[greatlrd] 50004: vbe drv now accpect any linear video mode with res 300x200 or higher
by greatlrd＠svn.reactos.org 10 Dec '10

10 Dec '10

Author: greatlrd Date: Fri Dec 10 13:42:03 2010 New Revision: 50004 URL: http://svn.reactos.org/svn/reactos?rev=50004&view=rev Log: vbe drv now accpect any linear video mode with res 300x200 or higher Modified: branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c Modified: branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/mi… ============================================================================== --- branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] Fri Dec 10 13:42:03 2010 @@ -350,8 +350,8 @@ /* Is this mode acceptable? */ if (VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_SUCCESS && - VbeModeInfo->XResolution >= 640 && - VbeModeInfo->YResolution >= 480 && + VbeModeInfo->XResolution >= 300 && + VbeModeInfo->YResolution >= 200 && (VbeModeInfo->MemoryModel == VBE_MEMORYMODEL_PACKEDPIXEL || VbeModeInfo->MemoryModel == VBE_MEMORYMODEL_DIRECTCOLOR) && VbeModeInfo->PhysBasePtr != 0)

1 0

[greatlrd] 50003: remove some debug msg, not need it any more
by greatlrd＠svn.reactos.org 10 Dec '10

10 Dec '10

Author: greatlrd Date: Fri Dec 10 13:34:51 2010 New Revision: 50003 URL: http://svn.reactos.org/svn/reactos?rev=50003&view=rev Log: remove some debug msg, not need it any more Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Fri Dec 10 13:34:51 2010 @@ -45,7 +45,6 @@ Status = DxDdStartupDxGraphics(0,NULL,0,NULL,NULL, Proc); if (!NT_SUCCESS(Status)) { - DPRINT1("Warning : Failed to create the directx interface\n"); return FALSE; } } @@ -53,7 +52,6 @@ pDC = DC_LockDc(hdc); if (pDC == NULL) { - DPRINT1("Warning : Failed to lock hdc\n"); return FALSE; } @@ -66,7 +64,6 @@ pDev->pEDDgpl = ExAllocatePoolWithTag(PagedPool, sizeof(EDD_DIRECTDRAW_GLOBAL), TAG_EDDGBL); if (!pDev->pEDDgpl) { - DPRINT1("Warning : Failed to allocate memmory for EDD_DIRECTDRAW_GLOBAL\n"); DC_UnlockDc(pDC); return FALSE; } @@ -74,12 +71,8 @@ } /* test see if drv got a dx interface or not */ - if ( ( pDev->DriverFunctions.DisableDirectDraw == NULL) || - ( pDev->DriverFunctions.EnableDirectDraw == NULL)) - { - DPRINT1("Waring : DisableDirectDraw and EnableDirectDraw are NULL, no dx driver \n"); - } - else + if ( ( pDev->DriverFunctions.DisableDirectDraw != NULL) && + ( pDev->DriverFunctions.EnableDirectDraw != NULL)) { /* Check see if dx have been enable or not */ if ( pDev->pEDDgpl->pvmList == NULL) @@ -89,13 +82,8 @@ pDev->pEDDgpl->ddPaletteCallbacks.dwSize = sizeof(DD_PALETTECALLBACKS); pfnDdEnableDirectDraw = (PGD_DXDDENABLEDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdEnableDirectDraw].pfn; - if (pfnDdEnableDirectDraw == NULL) + if (pfnDdEnableDirectDraw != NULL) { - DPRINT1("Warning: no pfnDdEnableDirectDraw\n"); - } - else - { - DPRINT1(" call to pfnDdEnableDirectDraw \n "); /* Note it is the hdev struct it want, not the drv hPDev aka pdc->PDev */ success = pfnDdEnableDirectDraw(pDC->ppdev, TRUE); @@ -105,14 +93,10 @@ } else { - DPRINT1(" The dxg.sys and graphic card driver interface is enabled \n "); success = TRUE; } } - - DPRINT1("Return value : 0x%08x\n",success); DC_UnlockDc(pDC); - DPRINT1(" end call to pfnDdEnableDirectDraw \n "); return success; } @@ -148,12 +132,10 @@ /* Loading the kernel interface of directx for win32k */ - DPRINT1("Warning: trying loading xp/2003/windows7/reactos dxg.sys\n"); ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); if ( ghDxGraphics == NULL) { Status = STATUS_DLL_NOT_FOUND; - DPRINT1("Warning: no ReactX or DirectX kernel driver found\n"); } else { @@ -187,7 +169,6 @@ EngUnloadImage( ghDxGraphics); ghDxGraphics = NULL; } - DPRINT1("Warning: DirectX graphics interface can not be initialized\n"); } else {

1 0

[greatlrd] 50002: intEnableReactXDriver Primary surface have been rewriten in win32k ppdev does not alloc edd_directx_global struct any more, that is not a problem we doing it here instead. it allo...
by greatlrd＠svn.reactos.org 10 Dec '10

10 Dec '10

Author: greatlrd Date: Fri Dec 10 11:08:37 2010 New Revision: 50002 URL: http://svn.reactos.org/svn/reactos?rev=50002&view=rev Log: intEnableReactXDriver Primary surface have been rewriten in win32k ppdev does not alloc edd_directx_global struct any more, that is not a problem we doing it here instead. it alloc it when it is need it. not before Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Fri Dec 10 11:08:37 2010 @@ -39,8 +39,6 @@ PGD_DXDDENABLEDIRECTDRAW pfnDdEnableDirectDraw = NULL; BOOL success = FALSE; - /* FIXME get the process data */ - /* Do not try load dxg.sys when it have already been load once */ if (gpfnStartupDxGraphics == NULL) { @@ -60,6 +58,20 @@ } pDev = pDC->ppdev; + + /* This code should be where primary surface is create + but we save some memory use to alloc it when it is need it */ + if (pDev->pEDDgpl == NULL) + { + pDev->pEDDgpl = ExAllocatePoolWithTag(PagedPool, sizeof(EDD_DIRECTDRAW_GLOBAL), TAG_EDDGBL); + if (!pDev->pEDDgpl) + { + DPRINT1("Warning : Failed to allocate memmory for EDD_DIRECTDRAW_GLOBAL\n"); + DC_UnlockDc(pDC); + return FALSE; + } + RtlZeroMemory( pDev->pEDDgpl ,sizeof(EDD_DIRECTDRAW_GLOBAL)); + } /* test see if drv got a dx interface or not */ if ( ( pDev->DriverFunctions.DisableDirectDraw == NULL) || @@ -69,8 +81,7 @@ } else { - - /* CHeck see if dx have been enable or not */ + /* Check see if dx have been enable or not */ if ( pDev->pEDDgpl->pvmList == NULL) { pDev->pEDDgpl->ddCallbacks.dwSize = sizeof(DD_CALLBACKS); @@ -98,7 +109,6 @@ success = TRUE; } } - DPRINT1("Return value : 0x%08x\n",success); DC_UnlockDc(pDC);

1 0

[janderwald] 50001: [AUDIO-BRINGUP] - Implement a timeout handler, which detects whether the audio thread has hung. The code has not yet been activated - Remove unused members
by janderwald＠svn.reactos.org 10 Dec '10

10 Dec '10

Author: janderwald Date: Fri Dec 10 11:03:28 2010 New Revision: 50001 URL: http://svn.reactos.org/svn/reactos?rev=50001&view=rev Log: [AUDIO-BRINGUP] - Implement a timeout handler, which detects whether the audio thread has hung. The code has not yet been activated - Remove unused members Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… ============================================================================== --- branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Fri Dec 10 11:03:28 2010 @@ -48,6 +48,7 @@ friend NTSTATUS NTAPI PinWaveCyclicAddEndOfStreamEvent(IN PIRP Irp, IN PKSEVENTDATA EventData, IN PKSEVENT_ENTRY EventEntry); friend NTSTATUS NTAPI PinWaveCyclicAddLoopedStreamEvent(IN PIRP Irp, IN PKSEVENTDATA EventData, IN PKSEVENT_ENTRY EventEntry); friend VOID CALLBACK PinSetStateWorkerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); + friend VOID NTAPI PinWaveCyclicIoTimerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); IPortWaveCyclic * m_Port; IPortFilterWaveCyclic * m_Filter; @@ -69,8 +70,7 @@ ULONG m_FrameSize; BOOL m_Capture; - ULONG m_TotalPackets; - ULONG m_StopCount; + ULONGLONG m_TotalPackets; KSAUDIO_POSITION m_Position; KSALLOCATOR_FRAMING m_AllocatorFraming; PSUBDEVICE_DESCRIPTOR m_Descriptor; @@ -81,6 +81,12 @@ KSRESET m_ResetState; ULONG m_Delay; + + ULONGLONG m_GlitchCount; + ULONGLONG m_GlitchLength; + + LARGE_INTEGER m_LastPacketTime; + BOOLEAN m_Started; LONG m_Ref; }; @@ -106,7 +112,7 @@ NTSTATUS NTAPI PinWaveCyclicAddEndOfStreamEvent(IN PIRP Irp, IN PKSEVENTDATA EventData, IN PKSEVENT_ENTRY EventEntry); NTSTATUS NTAPI PinWaveCyclicAddLoopedStreamEvent(IN PIRP Irp, IN PKSEVENTDATA EventData, IN PKSEVENT_ENTRY EventEntry); NTSTATUS NTAPI PinWaveCyclicDRMHandler(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); - +VOID NTAPI PinWaveCyclicIoTimerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); DEFINE_KSPROPERTY_CONNECTIONSET(PinWaveCyclicConnectionSet, PinWaveCyclicState, PinWaveCyclicDataFormat, PinWaveCyclicAllocatorFraming); DEFINE_KSPROPERTY_AUDIOSET(PinWaveCyclicAudioSet, PinWaveCyclicAudioPosition); @@ -175,6 +181,7 @@ //================================================================================================================================== + NTSTATUS NTAPI CPortPinWaveCyclic::QueryInterface( @@ -199,182 +206,6 @@ } return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -NTAPI -PinWaveCyclicDRMHandler( - IN PIRP Irp, - IN PKSIDENTIFIER Request, - IN OUT PVOID Data) -{ - DPRINT1("PinWaveCyclicDRMHandler\n"); - ASSERT(0); - return STATUS_INVALID_PARAMETER; -} - - -NTSTATUS -NTAPI -PinWaveCyclicAddEndOfStreamEvent( - IN PIRP Irp, - IN PKSEVENTDATA EventData, - IN PKSEVENT_ENTRY EventEntry) -{ - PENDOFSTREAM_EVENT_CONTEXT Entry; - PSUBDEVICE_DESCRIPTOR Descriptor; - CPortPinWaveCyclic *Pin; - - // get sub device descriptor - Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); - - // sanity check - PC_ASSERT(Descriptor); - PC_ASSERT(Descriptor->PortPin); - PC_ASSERT_IRQL(DISPATCH_LEVEL); - - // cast to pin impl - Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; - - // get extra size - Entry = (PENDOFSTREAM_EVENT_CONTEXT)(EventEntry + 1); - - // not a looped event - Entry->bLoopedStreaming = FALSE; - - // insert item - (void)ExInterlockedInsertTailList(&Pin->m_EventList, &EventEntry->ListEntry, &Pin->m_EventListLock); - - // done - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -PinWaveCyclicAddLoopedStreamEvent( - IN PIRP Irp, - IN PKSEVENTDATA EventData, - IN PKSEVENT_ENTRY EventEntry) -{ - PLOOPEDSTREAMING_POSITION_EVENT_DATA Data; - PLOOPEDSTREAMING_EVENT_CONTEXT Entry; - PSUBDEVICE_DESCRIPTOR Descriptor; - CPortPinWaveCyclic *Pin; - - // get sub device descriptor - Descriptor = (PSUBDEVICE_DESCRIPTOR)KSEVENT_ITEM_IRP_STORAGE(Irp); - - // sanity check - PC_ASSERT(Descriptor); - PC_ASSERT(Descriptor->PortPin); - PC_ASSERT_IRQL(DISPATCH_LEVEL); - - // cast to pin impl - Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; - - // cast to looped event - Data = (PLOOPEDSTREAMING_POSITION_EVENT_DATA)EventData; - - // get extra size - Entry = (PLOOPEDSTREAMING_EVENT_CONTEXT)(EventEntry + 1); - - Entry->bLoopedStreaming = TRUE; - Entry->Position = Data->Position; - - DPRINT1("Added event\n"); - - // insert item - (void)ExInterlockedInsertTailList(&Pin->m_EventList, &EventEntry->ListEntry, &Pin->m_EventListLock); - - // done - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -PinWaveCyclicAllocatorFraming( - IN PIRP Irp, - IN PKSIDENTIFIER Request, - IN OUT PVOID Data) -{ - CPortPinWaveCyclic *Pin; - PSUBDEVICE_DESCRIPTOR Descriptor; - - // get sub device descriptor - Descriptor = (PSUBDEVICE_DESCRIPTOR)KSEVENT_ITEM_IRP_STORAGE(Irp); - - // sanity check - PC_ASSERT(Descriptor); - PC_ASSERT(Descriptor->PortPin); - PC_ASSERT_IRQL(DISPATCH_LEVEL); - - // cast to pin impl - Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; - - - if (Request->Flags & KSPROPERTY_TYPE_GET) - { - // copy pin framing - RtlMoveMemory(Data, &Pin->m_AllocatorFraming, sizeof(KSALLOCATOR_FRAMING)); - - Irp->IoStatus.Information = sizeof(KSALLOCATOR_FRAMING); - return STATUS_SUCCESS; - } - - // not supported - return STATUS_NOT_SUPPORTED; -} - -NTSTATUS -NTAPI -PinWaveCyclicAudioPosition( - IN PIRP Irp, - IN PKSIDENTIFIER Request, - IN OUT PVOID Data) -{ - CPortPinWaveCyclic *Pin; - PSUBDEVICE_DESCRIPTOR Descriptor; - PKSAUDIO_POSITION Position; - - // get sub device descriptor - Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); - - // sanity check - PC_ASSERT(Descriptor); - PC_ASSERT(Descriptor->PortPin); - PC_ASSERT_IRQL(DISPATCH_LEVEL); - - // cast to pin impl - Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; - - //sanity check - PC_ASSERT(Pin->m_Stream); - - if (Request->Flags & KSPROPERTY_TYPE_GET) - { - // FIXME non multithreading-safe - // copy audio position - - Position = (PKSAUDIO_POSITION)Data; - - if (Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_STREAMING) - { - RtlMoveMemory(Data, &Pin->m_Position, sizeof(KSAUDIO_POSITION)); - DPRINT("Play %lu Record %lu\n", Pin->m_Position.PlayOffset, Pin->m_Position.WriteOffset); - } - else if (Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_LOOPED_STREAMING) - { - Position->PlayOffset = Pin->m_Position.PlayOffset; - Position->WriteOffset = (ULONGLONG)Pin->m_IrpQueue->GetCurrentIrpOffset(); - DPRINT("Play %lu Write %lu\n", Position->PlayOffset, Position->WriteOffset); - } - - Irp->IoStatus.Information = sizeof(KSAUDIO_POSITION); - return STATUS_SUCCESS; - } - - // not supported - return STATUS_NOT_SUPPORTED; } typedef struct @@ -408,17 +239,41 @@ { /* FIXME complete pending irps with successfull state */ PinWorkContext->Pin->m_IrpQueue->CancelBuffers(); - } - //HACK - //PinWorkContext->Pin->m_IrpQueue->CancelBuffers(); + PinWorkContext->Pin->m_Stream->Silence(PinWorkContext->Pin->m_CommonBuffer, PinWorkContext->Pin->m_CommonBufferSize); + PinWorkContext->Pin->m_IrpQueue->CancelBuffers(); + PinWorkContext->Pin->m_Position.PlayOffset = 0; + PinWorkContext->Pin->m_Position.WriteOffset = 0; + PinWorkContext->Pin->m_GlitchCount = 0; + PinWorkContext->Pin->m_GlitchLength = 0; + + // unregister the time out + PcUnregisterIoTimeout(GetDeviceObject(PinWorkContext->Pin->m_Port), PinWaveCyclicIoTimerRoutine, (PVOID)PinWorkContext->Pin); + } + else if (PinWorkContext->Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_STREAMING && PinWorkContext->Pin->m_State == KSSTATE_STOP) + { + /* FIXME complete pending irps with successfull state */ + PinWorkContext->Pin->m_IrpQueue->CancelBuffers(); + PinWorkContext->Pin->m_Stream->Silence(PinWorkContext->Pin->m_CommonBuffer, PinWorkContext->Pin->m_CommonBufferSize); + PinWorkContext->Pin->m_IrpQueue->CancelBuffers(); + PinWorkContext->Pin->m_Position.PlayOffset = 0; + PinWorkContext->Pin->m_Position.WriteOffset = 0; + PinWorkContext->Pin->m_GlitchCount = 0; + PinWorkContext->Pin->m_GlitchLength = 0; + + // unregister the time out + PcUnregisterIoTimeout(GetDeviceObject(PinWorkContext->Pin->m_Port), PinWaveCyclicIoTimerRoutine, (PVOID)PinWorkContext->Pin); + } } // store result - PinWorkContext->Irp->IoStatus.Information = sizeof(KSSTATE); - PinWorkContext->Irp->IoStatus.Status = Status; - - // complete irp - IoCompleteRequest(PinWorkContext->Irp, IO_NO_INCREMENT); + if (PinWorkContext->Irp) + { + PinWorkContext->Irp->IoStatus.Information = sizeof(KSSTATE); + PinWorkContext->Irp->IoStatus.Status = Status; + + // complete irp + IoCompleteRequest(PinWorkContext->Irp, IO_NO_INCREMENT); + } // free work item IoFreeWorkItem(PinWorkContext->WorkItem); @@ -428,6 +283,244 @@ } +VOID +NTAPI +PinWaveCyclicIoTimerRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context) +{ + CPortPinWaveCyclic *Pin; + //PSETPIN_CONTEXT Ctx; + LARGE_INTEGER CurrentTime; + + // cast to pin impl + Pin = (CPortPinWaveCyclic*)Context; + + /* query system time */ + KeQuerySystemTime(&CurrentTime); + + /* check if the connection matches */ + if (Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_STREAMING && Pin->m_ResetState == KSRESET_END && Pin->m_State != KSSTATE_STOP && Pin->m_Started) + { + LARGE_INTEGER Diff; + + Diff.QuadPart = CurrentTime.QuadPart - Pin->m_LastPacketTime.QuadPart; + + if (Diff.QuadPart >= Int32x32To64(3000, 10000)) + { + DPRINT1("AudioThread Hang detected: Last Packet %I64u CurrentTime %I64u Diff %I64u\n", Pin->m_LastPacketTime.QuadPart, CurrentTime.QuadPart, Diff.QuadPart); +#if 0 + /* allocate pin context */ + Ctx = (PSETPIN_CONTEXT)AllocateItem(NonPagedPool, sizeof(SETPIN_CONTEXT), TAG_PORTCLASS); + + if (!Ctx) + { + /* no memory */ + return; + } + + /* initialize ctx */ + Ctx->Pin = Pin; + if (Pin->m_State == KSSTATE_RUN) + Ctx->NewState = KSSTATE_PAUSE; + else if (Pin->m_State == KSSTATE_PAUSE) + Ctx->NewState = KSSTATE_ACQUIRE; + else if (Pin->m_State == KSSTATE_ACQUIRE) + Ctx->NewState = KSSTATE_STOP; + + Ctx->WorkItem = IoAllocateWorkItem(DeviceObject); + Ctx->Irp = NULL; + + if (!Ctx->WorkItem) + { + /* no memory */ + FreeItem(Ctx, TAG_PORTCLASS); + return; + } + + /* queue the work item */ + IoQueueWorkItem(Ctx->WorkItem, PinSetStateWorkerRoutine, DelayedWorkQueue, (PVOID)Ctx); +#endif + } + } +} + + +NTSTATUS +NTAPI +PinWaveCyclicDRMHandler( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + DPRINT1("PinWaveCyclicDRMHandler\n"); + ASSERT(0); + return STATUS_INVALID_PARAMETER; +} + + +NTSTATUS +NTAPI +PinWaveCyclicAddEndOfStreamEvent( + IN PIRP Irp, + IN PKSEVENTDATA EventData, + IN PKSEVENT_ENTRY EventEntry) +{ + PENDOFSTREAM_EVENT_CONTEXT Entry; + PSUBDEVICE_DESCRIPTOR Descriptor; + CPortPinWaveCyclic *Pin; + + // get sub device descriptor + Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); + + // sanity check + PC_ASSERT(Descriptor); + PC_ASSERT(Descriptor->PortPin); + PC_ASSERT_IRQL(DISPATCH_LEVEL); + + // cast to pin impl + Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; + + // get extra size + Entry = (PENDOFSTREAM_EVENT_CONTEXT)(EventEntry + 1); + + // not a looped event + Entry->bLoopedStreaming = FALSE; + + // insert item + (void)ExInterlockedInsertTailList(&Pin->m_EventList, &EventEntry->ListEntry, &Pin->m_EventListLock); + + // done + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +PinWaveCyclicAddLoopedStreamEvent( + IN PIRP Irp, + IN PKSEVENTDATA EventData, + IN PKSEVENT_ENTRY EventEntry) +{ + PLOOPEDSTREAMING_POSITION_EVENT_DATA Data; + PLOOPEDSTREAMING_EVENT_CONTEXT Entry; + PSUBDEVICE_DESCRIPTOR Descriptor; + CPortPinWaveCyclic *Pin; + + // get sub device descriptor + Descriptor = (PSUBDEVICE_DESCRIPTOR)KSEVENT_ITEM_IRP_STORAGE(Irp); + + // sanity check + PC_ASSERT(Descriptor); + PC_ASSERT(Descriptor->PortPin); + PC_ASSERT_IRQL(DISPATCH_LEVEL); + + // cast to pin impl + Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; + + // cast to looped event + Data = (PLOOPEDSTREAMING_POSITION_EVENT_DATA)EventData; + + // get extra size + Entry = (PLOOPEDSTREAMING_EVENT_CONTEXT)(EventEntry + 1); + + Entry->bLoopedStreaming = TRUE; + Entry->Position = Data->Position; + + DPRINT1("Added event\n"); + + // insert item + (void)ExInterlockedInsertTailList(&Pin->m_EventList, &EventEntry->ListEntry, &Pin->m_EventListLock); + + // done + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +PinWaveCyclicAllocatorFraming( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + CPortPinWaveCyclic *Pin; + PSUBDEVICE_DESCRIPTOR Descriptor; + + // get sub device descriptor + Descriptor = (PSUBDEVICE_DESCRIPTOR)KSEVENT_ITEM_IRP_STORAGE(Irp); + + // sanity check + PC_ASSERT(Descriptor); + PC_ASSERT(Descriptor->PortPin); + PC_ASSERT_IRQL(DISPATCH_LEVEL); + + // cast to pin impl + Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; + + + if (Request->Flags & KSPROPERTY_TYPE_GET) + { + // copy pin framing + RtlMoveMemory(Data, &Pin->m_AllocatorFraming, sizeof(KSALLOCATOR_FRAMING)); + + Irp->IoStatus.Information = sizeof(KSALLOCATOR_FRAMING); + return STATUS_SUCCESS; + } + + // not supported + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +PinWaveCyclicAudioPosition( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + CPortPinWaveCyclic *Pin; + PSUBDEVICE_DESCRIPTOR Descriptor; + PKSAUDIO_POSITION Position; + + // get sub device descriptor + Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); + + // sanity check + PC_ASSERT(Descriptor); + PC_ASSERT(Descriptor->PortPin); + PC_ASSERT_IRQL(DISPATCH_LEVEL); + + // cast to pin impl + Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; + + //sanity check + PC_ASSERT(Pin->m_Stream); + + if (Request->Flags & KSPROPERTY_TYPE_GET) + { + // FIXME non multithreading-safe + // copy audio position + + Position = (PKSAUDIO_POSITION)Data; + + if (Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_STREAMING) + { + RtlMoveMemory(Data, &Pin->m_Position, sizeof(KSAUDIO_POSITION)); + DPRINT("Play %I64u Record %I64u\n", Pin->m_Position.PlayOffset, Pin->m_Position.WriteOffset); + } + else if (Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_LOOPED_STREAMING) + { + Position->PlayOffset = Pin->m_Position.PlayOffset; + Position->WriteOffset = (ULONGLONG)Pin->m_IrpQueue->GetCurrentIrpOffset(); + DPRINT("Play %I64u Write %I64u\n", Position->PlayOffset, Position->WriteOffset); + } + + Irp->IoStatus.Information = sizeof(KSAUDIO_POSITION); + return STATUS_SUCCESS; + } + + // not supported + return STATUS_NOT_SUPPORTED; +} NTSTATUS NTAPI @@ -470,20 +563,46 @@ { // FIXME // complete with successful state + DPRINT1("BytesPlayed %I64u, GlitchCount %I64u GlitchLength %I64u\n", Pin->m_Position.PlayOffset, Pin->m_GlitchCount, Pin->m_GlitchLength); Pin->m_Stream->Silence(Pin->m_CommonBuffer, Pin->m_CommonBufferSize); Pin->m_IrpQueue->CancelBuffers(); Pin->m_Position.PlayOffset = 0; Pin->m_Position.WriteOffset = 0; + Pin->m_GlitchCount = 0; + Pin->m_GlitchLength = 0; + + + // unregister the time out + PcUnregisterIoTimeout(GetDeviceObject(Pin->m_Port), PinWaveCyclicIoTimerRoutine, (PVOID)Pin); } else if (Pin->m_State == KSSTATE_STOP) { + DPRINT1("BytesPlayed %I64u, GlitchCount %I64u GlitchLength %I64u\n", Pin->m_Position.PlayOffset, Pin->m_GlitchCount, Pin->m_GlitchLength); Pin->m_Stream->Silence(Pin->m_CommonBuffer, Pin->m_CommonBufferSize); Pin->m_IrpQueue->CancelBuffers(); Pin->m_Position.PlayOffset = 0; Pin->m_Position.WriteOffset = 0; + Pin->m_GlitchCount = 0; + Pin->m_GlitchLength = 0; + + // unregister the time out + PcUnregisterIoTimeout(GetDeviceObject(Pin->m_Port), PinWaveCyclicIoTimerRoutine, (PVOID)Pin); } // store result Irp->IoStatus.Information = sizeof(KSSTATE); + + if (*State == KSSTATE_RUN) + { + // register wave hung routine + NTSTATUS PcStatus = PcRegisterIoTimeout(GetDeviceObject(Pin->m_Port), PinWaveCyclicIoTimerRoutine, (PVOID)Pin); + if (!NT_SUCCESS(PcStatus)) + { + DPRINT1("Failed to register timer routine with %x\n", PcStatus); + } + + // set flag that stream has started for the wave hung routine + Pin->m_Started = TRUE; + } } return Status; } @@ -701,8 +820,10 @@ Gap = Position - m_CommonBufferOffset; if (Gap > BufferLength) { + // increment glitchcount + m_GlitchCount++; + m_GlitchLength += BufferLength; // insert silence samples - DPRINT1("Inserting Silence Buffer Offset %lu GapLength %lu\n", m_CommonBufferOffset, BufferLength); m_Stream->Silence((PUCHAR)m_CommonBuffer + m_CommonBufferOffset, BufferLength); m_CommonBufferOffset += BufferLength; @@ -760,8 +881,11 @@ Gap = m_CommonBufferSize - m_CommonBufferOffset + Position; if (Gap > BufferLength) { + // increment glitchcount + m_GlitchCount++; + m_GlitchLength += BufferLength; + // insert silence samples - DPRINT1("Overlap Inserting Silence Buffer Size %lu Offset %lu Gap %lu Position %lu\n", m_CommonBufferSize, m_CommonBufferOffset, Gap, Position); m_Stream->Silence((PUCHAR)m_CommonBuffer + m_CommonBufferOffset, BufferLength); m_CommonBufferOffset += BufferLength; @@ -933,6 +1057,8 @@ { m_Position.WriteOffset += Data; Status = STATUS_PENDING; + /* time stamp last packet */ + KeQuerySystemTime(&m_LastPacketTime); } } else @@ -1034,6 +1160,9 @@ DPRINT("Warning: failed to stop stream with %x\n", Status); PC_ASSERT(0); } + + // unregister the time out + PcUnregisterIoTimeout(GetDeviceObject(m_Port), PinWaveCyclicIoTimerRoutine, (PVOID)this); } // set state to stop m_State = KSSTATE_STOP; @@ -1269,7 +1398,7 @@ Status = m_ServiceGroup->AddMember(PSERVICESINK(this)); if (!NT_SUCCESS(Status)) { - DPRINT("Failed to add pin to service group\n"); + DPRINT1("Failed to add pin to service group\n"); return Status; } Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… ============================================================================== --- branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] (original) +++ branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] Fri Dec 10 11:03:28 2010 @@ -60,7 +60,6 @@ ULONG m_TotalPackets; KSAUDIO_POSITION m_Position; - ULONG m_StopCount; BOOL m_bUsePrefetch; ULONG m_PrefetchOffset;

1 0

[fireball] 50000: [HEAP] - Time has come to get rid of a slightly modified implementation of WINE's heap, which is a hack based on Windows 95's heap implementation, itself a hack of DOS memory mana...
by fireball＠svn.reactos.org 10 Dec '10

10 Dec '10

Author: fireball Date: Fri Dec 10 09:33:20 2010 New Revision: 50000 URL: http://svn.reactos.org/svn/reactos?rev=50000&view=rev Log: [HEAP] - Time has come to get rid of a slightly modified implementation of WINE's heap, which is a hack based on Windows 95's heap implementation, itself a hack of DOS memory management. It supported 3 out of the 18 possible NT Heap Flags, did not support custom allocation/deallocation routines, and was about 50-80x slower with fragmentation rates up to 500x higher when compared to NT's LFH (WINE is lucky because the advanced NT Heap features are used in kernel-mode usually, not in user-mode, and they are crossing their fingers for this being the same). Several high-end SQL/Database applications would significantly benefit from custom heap features provided by NT. Not to say about removing crappy support for a custom Commit routine and crappy support for User-defined flags and the User-defined value. - So, the glorious moment for a new heap manager, which is (to remind you) a totally new heap manager, resembling real NT heap manager, based on data structures similar to Windows 2003 and Vista+'s heap structures, supporting advanced heap flags (e.g. useful for debugging), having substantially lower fragmentation rates (and thus speed and reliability), having native support for user-defined flags and user-defined values, also native support for a custom commit routine, which is very important for trunk's win32 subsystem. It also reserves, commits, decommits and frees memory on the fly, unlike existing heap manager which prefers to reserve and commit as much as possible, and doesn't decommit when it's no longer necessary. Not to say about support for per process heaps, with a proper lock, and a further support for a special so-called debug heap allocator (to be implemented in heapdbg.c) which will be useful for finding heap corruptions. Yeah, I'm not a fun person :D Added: trunk/reactos/lib/rtl/heap.c - copied unchanged from r49999, trunk/reactos/lib/rtl/heap_rewrite.c Removed: trunk/reactos/lib/rtl/heap_rewrite.c [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/lib/rtl/heap_rewrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap_rewrite.c?rev…

1 0

[janderwald] 49999: [AUDIO-BRINGUP] - Implement WODM_RESTART / WODM_PAUSE - Fixes playback in Audacity and many others probably
by janderwald＠svn.reactos.org 10 Dec '10

10 Dec '10

Author: janderwald Date: Fri Dec 10 08:23:20 2010 New Revision: 49999 URL: http://svn.reactos.org/svn/reactos?rev=49999&view=rev Log: [AUDIO-BRINGUP] - Implement WODM_RESTART / WODM_PAUSE - Fixes playback in Audacity and many others probably Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Fri Dec 10 08:23:20 2010 @@ -109,11 +109,13 @@ case WODM_RESTART : { /* Continue playback when paused */ + Result = MmeSetState(PrivateHandle, TRUE); break; } case WODM_PAUSE : { /* pause playback */ + Result = MmeSetState(PrivateHandle, FALSE); break; }

1 0

[janderwald] 49998: [AUDIO-BRINGUP] - Fix broken wave recording
by janderwald＠svn.reactos.org 10 Dec '10

10 Dec '10

Author: janderwald Date: Fri Dec 10 07:41:44 2010 New Revision: 49998 URL: http://svn.reactos.org/svn/reactos?rev=49998&view=rev Log: [AUDIO-BRINGUP] - Fix broken wave recording Modified: branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c Modified: branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] (original) +++ branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] Fri Dec 10 07:41:44 2010 @@ -15,6 +15,7 @@ HANDLE hDevice; PSOUND_OVERLAPPED Overlap; LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine; + DWORD IoCtl; }IO_PACKET, *LPIO_PACKET; BOOL MMixerLibraryInitialized = FALSE; @@ -786,28 +787,18 @@ LPIO_PACKET Packet = (LPIO_PACKET)lpParameter; Result = SyncOverlappedDeviceIoControl(Packet->hDevice, - IOCTL_KS_WRITE_STREAM, //FIXME IOCTL_KS_READ_STREAM + Packet->IoCtl, NULL, 0, &Packet->Header, sizeof(KSSTREAM_HEADER), &Length); - /* HACK: - * don't call completion routine directly - */ - Packet->CompletionRoutine(ERROR_SUCCESS, Packet->Header.DataUsed, (LPOVERLAPPED)Packet->Overlap); HeapFree(GetProcessHeap(), 0, Packet); return 0; } - - - - - - MMRESULT WdmAudCommitWaveBufferByMMixer( @@ -849,6 +840,7 @@ Packet->hDevice = SoundDeviceInstance->Handle; Packet->Overlap = Overlap; Packet->CompletionRoutine = CompletionRoutine; + Packet->IoCtl = (DeviceType == WAVE_OUT_DEVICE_TYPE ? IOCTL_KS_WRITE_STREAM : IOCTL_KS_READ_STREAM); if (DeviceType == WAVE_OUT_DEVICE_TYPE) {

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2010