Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 43774: - Add an initial stub of DSound
by janderwald＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: janderwald Date: Mon Oct 26 11:54:05 2009 New Revision: 43774 URL: http://svn.reactos.org/svn/reactos?rev=43774&view=rev Log: - Add an initial stub of DSound Added: trunk/reactos/dll/directx/dsound_new/ (with props) trunk/reactos/dll/directx/dsound_new/classfactory.c (contents, props changed) - copied, changed from r43773, trunk/reactos/dll/win32/netshell/classfactory.c trunk/reactos/dll/directx/dsound_new/dsound.c (with props) trunk/reactos/dll/directx/dsound_new/dsound.spec (props changed) - copied unchanged from r43773, trunk/reactos/dll/directx/dsound/dsound.spec trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild (with props) trunk/reactos/dll/directx/dsound_new/precomp.h (with props) trunk/reactos/dll/directx/dsound_new/stubs.c (with props) trunk/reactos/dll/directx/dsound_new/version.rc (with props) Propchange: trunk/reactos/dll/directx/dsound_new/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Oct 26 11:54:05 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/directx/dsound_new/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/directx/dsound_new/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/directx/dsound_new/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Copied: trunk/reactos/dll/directx/dsound_new/classfactory.c (from r43773, trunk/reactos/dll/win32/netshell/classfactory.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/cla… ============================================================================== --- trunk/reactos/dll/win32/netshell/classfactory.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/classfactory.c [iso-8859-1] Mon Oct 26 11:54:05 2009 @@ -1,4 +1,14 @@ -#include <precomp.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Configuration of network devices + * FILE: dll/directx/dsound_new/classfactory.c + * PURPOSE: IClassFactory implementation + * + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + + +#include "precomp.h" typedef struct { Propchange: trunk/reactos/dll/directx/dsound_new/classfactory.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/dsound_new/classfactory.c ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Oct 26 11:54:05 2009 @@ -1,0 +1,1 @@ +/branches/ros-amd64-bringup/reactos/dll/win32/netshell/classfactory.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 Added: trunk/reactos/dll/directx/dsound_new/dsound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/dso… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/dsound.c (added) +++ trunk/reactos/dll/directx/dsound_new/dsound.c [iso-8859-1] Mon Oct 26 11:54:05 2009 @@ -1,0 +1,52 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Configuration of network devices + * FILE: dll/directx/dsound_new/dsound.c + * PURPOSE: Handles DSound initialization + * + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + +#include "precomp.h" + + +HINSTANCE dsound_hInstance; + +HRESULT +WINAPI +DllCanUnloadNow() +{ + return S_FALSE; +} + +HRESULT +WINAPI +DllGetClassObject( + REFCLSID rclsid, + REFIID riid, + LPVOID *ppv) +{ + UNIMPLEMENTED + return CLASS_E_CLASSNOTAVAILABLE; +} + +BOOL +WINAPI +DllMain( + HINSTANCE hInstDLL, + DWORD fdwReason, + LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + dsound_hInstance = hInstDLL; + DisableThreadLibraryCalls(dsound_hInstance); + break; + default: + break; + } + + return TRUE; +} + Propchange: trunk/reactos/dll/directx/dsound_new/dsound.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/dsound_new/dsound.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/dsound_new/dsound.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Oct 26 11:54:05 2009 @@ -1,0 +1,1 @@ +/branches/ros-amd64-bringup/reactos/dll/directx/dsound/dsound.spec:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 Added: trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/dso… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild (added) +++ trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild [iso-8859-1] Mon Oct 26 11:54:05 2009 @@ -1,0 +1,19 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="dsound_new" type="win32dll" baseaddress="${BASEADDRESS_DSOUND}" installbase="system32" installname="dsound_new.dll" crt="msvcrt"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="dsound.spec" /> + <include base="dsound">.</include> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>ole32</library> + <library>winmm</library> + <library>dxguid</library> + <file>classfactory.c</file> + <file>dsound.c</file> + <file>stubs.c</file> + <file>version.rc</file> +</module> Propchange: trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/dsound_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/pre… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/precomp.h (added) +++ trunk/reactos/dll/directx/dsound_new/precomp.h [iso-8859-1] Mon Oct 26 11:54:05 2009 @@ -1,0 +1,30 @@ +#ifndef PRECOMP_H__ +#define PRECOMP_H__ + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windows.h> +#include <setupapi.h> +#include <olectl.h> +#include <unknwn.h> +#include <dsound.h> +#include <debug.h> + + +/* factory method */ +typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject); + +/* factory table */ +typedef struct +{ + REFIID riid; + LPFNCREATEINSTANCE lpfnCI; +} INTERFACE_TABLE; + +/* globals */ +extern HINSTANCE dsound_hInstance; + + +#endif Propchange: trunk/reactos/dll/directx/dsound_new/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/dsound_new/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/stu… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/stubs.c (added) +++ trunk/reactos/dll/directx/dsound_new/stubs.c [iso-8859-1] Mon Oct 26 11:54:05 2009 @@ -1,0 +1,137 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Configuration of network devices + * FILE: dll/directx/dsound_new/stubs.c + * PURPOSE: DSound stubs + * + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + +#include "precomp.h" + +HRESULT +WINAPI +DirectSoundCreate( + LPCGUID lpcGUID, + LPDIRECTSOUND *ppDS, + IUnknown *pUnkOuter) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} + + +HRESULT +WINAPI +DirectSoundEnumerateA( + LPDSENUMCALLBACKA lpDSEnumCallback, + LPVOID lpContext) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} + +HRESULT +WINAPI +DirectSoundEnumerateW( + LPDSENUMCALLBACKW lpDSEnumCallback, + LPVOID lpContext ) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} + +HRESULT +WINAPI +DllRegisterServer(void) +{ + UNIMPLEMENTED + return SELFREG_E_CLASS; +} + +HRESULT +WINAPI +DllUnregisterServer(void) +{ + UNIMPLEMENTED + return SELFREG_E_CLASS; +} + +HRESULT +WINAPI +DirectSoundCaptureCreate( + LPCGUID lpcGUID, + LPDIRECTSOUNDCAPTURE *ppDSC, + LPUNKNOWN pUnkOuter) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} + +HRESULT +WINAPI +DirectSoundCaptureCreate8( + LPCGUID lpcGUID, + LPDIRECTSOUNDCAPTURE8 *ppDSC8, + LPUNKNOWN pUnkOuter) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} + +HRESULT +WINAPI +DirectSoundCreate8( + LPCGUID lpcGUID, + LPDIRECTSOUND8 *ppDS, + IUnknown *pUnkOuter) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} + +HRESULT +WINAPI +DirectSoundFullDuplexCreate( + LPCGUID pcGuidCaptureDevice, + LPCGUID pcGuidRenderDevice, + LPCDSCBUFFERDESC pcDSCBufferDesc, + LPCDSBUFFERDESC pcDSBufferDesc, + HWND hWnd, + DWORD dwLevel, + LPDIRECTSOUNDFULLDUPLEX *ppDSFD, + LPDIRECTSOUNDCAPTUREBUFFER8 *ppDSCBuffer8, + LPDIRECTSOUNDBUFFER8 *ppDSBuffer8, + LPUNKNOWN pUnkOuter) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} + +HRESULT +WINAPI +DirectSoundCaptureEnumerateA( + LPDSENUMCALLBACKA lpDSEnumCallback, + LPVOID lpContext) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} + +HRESULT +WINAPI +DirectSoundCaptureEnumerateW( + LPDSENUMCALLBACKW lpDSEnumCallback, + LPVOID lpContext) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} + +HRESULT +WINAPI +GetDeviceID(LPCGUID pGuidSrc, LPGUID pGuidDest) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} Propchange: trunk/reactos/dll/directx/dsound_new/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/dsound_new/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/ver… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/version.rc (added) +++ trunk/reactos/dll/directx/dsound_new/version.rc [iso-8859-1] Mon Oct 26 11:54:05 2009 @@ -1,0 +1,14 @@ +#include <windows.h> +#include "shlobj.h" +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "DirectSound\0" +#define REACTOS_STR_INTERNAL_NAME "dsound.dll\0" +#define REACTOS_STR_ORIGINAL_FILENAME "dsound.dll\0" +#define REACTOS_STR_PRODUCT_VERSION "5.3.1.904\0" +#define REACTOS_STR_FILE_VERSION "5.3.1.904\0" + +#include <reactos/version.rc> Propchange: trunk/reactos/dll/directx/dsound_new/version.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gadamopoulos] 43773: We should send WM_SYSCOMMAND when we get a WM_SYSKEYUP , not when we get a WM_SYSKEYDOWN message
by gadamopoulos＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: gadamopoulos Date: Mon Oct 26 09:53:47 2009 New Revision: 43773 URL: http://svn.reactos.org/svn/reactos?rev=43773&view=rev Log: We should send WM_SYSCOMMAND when we get a WM_SYSKEYUP , not when we get a WM_SYSKEYDOWN message Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Mon Oct 26 09:53:47 2009 @@ -1393,11 +1393,7 @@ /* if( HIWORD(lParam) & ~KEYDATA_PREVSTATE ) */ if ( (wParam == VK_MENU || wParam == VK_LMENU || wParam == VK_RMENU) && !iMenuSysKey ) - { iMenuSysKey = 1; - /* mimic behaviour of XP, sending a WM_SYSCOMMAND when pressing <alt> */ - SendMessageW( top, WM_SYSCOMMAND, SC_KEYMENU, 0L ); - } else iMenuSysKey = 0;

1 0

[cwittich] 43772: implement IntKeyboardInput based on wine
by cwittich＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: cwittich Date: Mon Oct 26 09:50:00 2009 New Revision: 43772 URL: http://svn.reactos.org/svn/reactos?rev=43772&view=rev Log: implement IntKeyboardInput based on wine Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Mon Oct 26 09:50:00 2009 @@ -35,6 +35,8 @@ static CLIENT_ID RawInputThreadId; static KEVENT InputThreadsStart; static BOOLEAN InputThreadsRunning = FALSE; +static BYTE TrackSysKey = 0; /* determine whether ALT key up will cause a WM_SYSKEYUP + or a WM_KEYUP message */ /* FUNCTIONS *****************************************************************/ DWORD IntLastInputTick(BOOL LastInputTickSetGet); @@ -1303,7 +1305,177 @@ BOOL FASTCALL IntKeyboardInput(KEYBDINPUT *ki) { - return FALSE; + PUSER_MESSAGE_QUEUE FocusMessageQueue; + PTHREADINFO pti; + MSG Msg; + LARGE_INTEGER LargeTickCount; + KBDLLHOOKSTRUCT KbdHookData; + WORD flags, wVkStripped, wVkL, wVkR, wVk = ki->wVk, vk_hook = ki->wVk; + BOOLEAN Entered = FALSE; + + Msg.lParam = 0; + + // Condition may arise when calling MsqPostMessage and waiting for an event. + if (!UserIsEntered()) + { + // Fixme: Not sure ATM if this thread is locked. + UserEnterExclusive(); + Entered = TRUE; + } + + wVk = LOBYTE(wVk); + Msg.wParam = wVk; + flags = LOBYTE(ki->wScan); + + if (ki->dwFlags & KEYEVENTF_EXTENDEDKEY) flags |= KF_EXTENDED; + /* FIXME: set KF_DLGMODE and KF_MENUMODE when needed */ + + /* strip left/right for menu, control, shift */ + switch (wVk) + { + case VK_MENU: + case VK_LMENU: + case VK_RMENU: + wVk = (ki->dwFlags & KEYEVENTF_EXTENDEDKEY) ? VK_RMENU : VK_LMENU; + wVkStripped = VK_MENU; + wVkL = VK_LMENU; + wVkR = VK_RMENU; + break; + case VK_CONTROL: + case VK_LCONTROL: + case VK_RCONTROL: + wVk = (ki->dwFlags & KEYEVENTF_EXTENDEDKEY) ? VK_RCONTROL : VK_LCONTROL; + wVkStripped = VK_CONTROL; + wVkL = VK_LCONTROL; + wVkR = VK_RCONTROL; + break; + case VK_SHIFT: + case VK_LSHIFT: + case VK_RSHIFT: + wVk = (ki->dwFlags & KEYEVENTF_EXTENDEDKEY) ? VK_RSHIFT : VK_LSHIFT; + wVkStripped = VK_SHIFT; + wVkL = VK_LSHIFT; + wVkR = VK_RSHIFT; + break; + default: + wVkStripped = wVkL = wVkR = wVk; + } + + if (ki->dwFlags & KEYEVENTF_KEYUP) + { + Msg.message = WM_KEYUP; + if ((gQueueKeyStateTable[VK_MENU] & 0x80) && + ((wVkStripped == VK_MENU) || (wVkStripped == VK_CONTROL) + || !(gQueueKeyStateTable[VK_CONTROL] & 0x80))) + { + if( TrackSysKey == VK_MENU || /* <ALT>-down/<ALT>-up sequence */ + (wVkStripped != VK_MENU)) /* <ALT>-down...<something else>-up */ + Msg.message = WM_SYSKEYUP; + TrackSysKey = 0; + } + flags |= KF_REPEAT | KF_UP; + } + else + { + Msg.message = WM_KEYDOWN; + if ((gQueueKeyStateTable[VK_MENU] & 0x80 || wVkStripped == VK_MENU) && + !(gQueueKeyStateTable[VK_CONTROL] & 0x80 || wVkStripped == VK_CONTROL)) + { + Msg.message = WM_SYSKEYDOWN; + TrackSysKey = wVkStripped; + } + if (!(ki->dwFlags & KEYEVENTF_UNICODE) && gQueueKeyStateTable[wVk] & 0x80) flags |= KF_REPEAT; + } + + if (ki->dwFlags & KEYEVENTF_UNICODE) + { + vk_hook = Msg.wParam = wVk = VK_PACKET; + Msg.lParam = MAKELPARAM(1 /* repeat count */, ki->wScan); + } + + FocusMessageQueue = IntGetFocusMessageQueue(); + + Msg.hwnd = 0; + + if (FocusMessageQueue && (FocusMessageQueue->FocusWindow != (HWND)0)) + Msg.hwnd = FocusMessageQueue->FocusWindow; + + if (!ki->time) + { + KeQueryTickCount(&LargeTickCount); + Msg.time = MsqCalculateMessageTime(&LargeTickCount); + } + else + Msg.time = ki->time; + + /* All messages have to contain the cursor point. */ + pti = PsGetCurrentThreadWin32Thread(); + IntGetCursorLocation(pti->Desktop->WindowStation, + &Msg.pt); + + DPRINT1("Kbd Hook msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL hook\n", + Msg.message, vk_hook, Msg.lParam); + + KbdHookData.vkCode = vk_hook; + KbdHookData.scanCode = ki->wScan; + KbdHookData.flags = flags >> 8; + KbdHookData.time = Msg.time; + KbdHookData.dwExtraInfo = ki->dwExtraInfo; + if (co_HOOK_CallHooks(WH_KEYBOARD_LL, HC_ACTION, Msg.message, (LPARAM) &KbdHookData)) + { + DPRINT("Kbd msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL hook\n", + Msg.message, vk_hook, Msg.lParam); + if (Entered) UserLeave(); + return FALSE; + } + + if (!(ki->dwFlags & KEYEVENTF_UNICODE)) + { + if (ki->dwFlags & KEYEVENTF_KEYUP) + { + gQueueKeyStateTable[wVk] &= ~0x80; + gQueueKeyStateTable[wVkStripped] = gQueueKeyStateTable[wVkL] | gQueueKeyStateTable[wVkR]; + } + else + { + if (!(gQueueKeyStateTable[wVk] & 0x80)) gQueueKeyStateTable[wVk] ^= 0x01; + gQueueKeyStateTable[wVk] |= 0xc0; + gQueueKeyStateTable[wVkStripped] = gQueueKeyStateTable[wVkL] | gQueueKeyStateTable[wVkR]; + } + + if (gQueueKeyStateTable[VK_MENU] & 0x80) flags |= KF_ALTDOWN; + + if (wVkStripped == VK_SHIFT) flags &= ~KF_EXTENDED; + + Msg.lParam = MAKELPARAM(1 /* repeat count */, flags); + } + + if (FocusMessageQueue == NULL) + { + DPRINT("No focus message queue\n"); + if (Entered) UserLeave(); + return FALSE; + } + + if (FocusMessageQueue->FocusWindow != (HWND)0) + { + Msg.hwnd = FocusMessageQueue->FocusWindow; + DPRINT("Msg.hwnd = %x\n", Msg.hwnd); + + FocusMessageQueue->Desktop->DesktopInfo->LastInputWasKbd = TRUE; + + IntGetCursorLocation(FocusMessageQueue->Desktop->WindowStation, + &Msg.pt); + MsqPostMessage(FocusMessageQueue, &Msg, FALSE, QS_KEY); + } + else + { + DPRINT("Invalid focus window handle\n"); + } + + if (Entered) UserLeave(); + + return TRUE; } BOOL FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Mon Oct 26 09:50:00 2009 @@ -69,11 +69,11 @@ static UINT DontDistinguishShifts( UINT ret ) { if( ret == VK_LSHIFT || ret == VK_RSHIFT ) - ret = VK_LSHIFT; + ret = VK_SHIFT; if( ret == VK_LCONTROL || ret == VK_RCONTROL ) - ret = VK_LCONTROL; + ret = VK_CONTROL; if( ret == VK_LMENU || ret == VK_RMENU ) - ret = VK_LMENU; + ret = VK_MENU; return ret; } @@ -435,14 +435,27 @@ if( !keyLayout ) return FALSE; + if (lpMsg->message < WM_KEYFIRST || lpMsg->message > WM_KEYLAST) + return FALSE; if (lpMsg->message != WM_KEYDOWN && lpMsg->message != WM_SYSKEYDOWN) return FALSE; - - ScanCode = (lpMsg->lParam >> 16) & 0xff; /* All messages have to contain the cursor point. */ IntGetCursorLocation(pti->Desktop->WindowStation, &NewMsg.pt); + + switch (lpMsg->wParam) + { + case VK_PACKET: + NewMsg.message = (lpMsg->message == WM_KEYDOWN) ? WM_CHAR : WM_SYSCHAR; + NewMsg.hwnd = lpMsg->hwnd; + NewMsg.wParam = HIWORD(lpMsg->lParam); + NewMsg.lParam = LOWORD(lpMsg->lParam); + MsqPostMessage(pti->MessageQueue, &NewMsg, FALSE, QS_KEY); + return TRUE; + } + + ScanCode = (lpMsg->lParam >> 16) & 0xff; UState = ToUnicodeInner(lpMsg->wParam, HIWORD(lpMsg->lParam) & 0xff, gQueueKeyStateTable, wp, 2, 0, @@ -628,11 +641,11 @@ switch( Type ) { case 0: - if( Code == VK_RSHIFT ) + if( Code == VK_SHIFT ) Code = VK_LSHIFT; - if( Code == VK_RMENU ) + if( Code == VK_MENU ) Code = VK_LMENU; - if( Code == VK_RCONTROL ) + if( Code == VK_CONTROL ) Code = VK_LCONTROL; ret = VkToScan( Code, FALSE, keyLayout ); break; @@ -706,7 +719,7 @@ DECLARE_RETURN(int); DPRINT("Enter NtUserSetKeyboardState\n"); - UserEnterShared();//faxme: this syscall doesnt seem to need any locking... + UserEnterShared();//fixme: this syscall doesnt seem to need any locking... if( !NT_SUCCESS(MmCopyFromCaller(KeyStateBuf, @@ -785,12 +798,22 @@ if( lParam & (1<<25) ) { CareVk = VkCode = ScanToVk( ScanCode, ExtKey, keyLayout ); - if( VkCode == VK_LSHIFT || VkCode == VK_RSHIFT ) - VkCode = VK_LSHIFT; - if( VkCode == VK_LCONTROL || VkCode == VK_RCONTROL ) - VkCode = VK_LCONTROL; - if( VkCode == VK_LMENU || VkCode == VK_RMENU ) - VkCode = VK_LMENU; + switch (VkCode) + { + case VK_RSHIFT: + ScanCode |= 0x100; + case VK_LSHIFT: + VkCode = VK_SHIFT; + break; + case VK_LCONTROL: + case VK_RCONTROL: + VkCode = VK_CONTROL; + break; + case VK_LMENU: + case VK_RMENU: + VkCode = VK_MENU; + break; + } } else {

1 0

[cgutman] 43771: - Comment out this unused code until I can get the headers sorted out in my WC
by cgutman＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: cgutman Date: Mon Oct 26 04:28:43 2009 New Revision: 43771 URL: http://svn.reactos.org/svn/reactos?rev=43771&view=rev Log: - Comment out this unused code until I can get the headers sorted out in my WC Modified: trunk/reactos/drivers/network/tcpip/tcpip/ainfo.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/ainfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/ainfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/ainfo.c [iso-8859-1] Mon Oct 26 04:28:43 2009 @@ -15,13 +15,14 @@ { switch (ID->toi_id) { +#if 0 case AO_OPTION_TTL: if (BufferSize < sizeof(UCHAR)) return TDI_INVALID_PARAMETER; AddrFile->TTL = *((PUCHAR)Buffer); return TDI_SUCCESS; - +#endif default: DbgPrint("Unimplemented option %x\n", ID->toi_id);

1 0

[tkreuzer] 43770: [KDCOM] For unknown reasons it's not enough to check LSR if the port is ready to receive or not. Adding additional port reads improves the reliability of the data massively. Now it's possible to use kdcom on windows XP!
by tkreuzer＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: tkreuzer Date: Mon Oct 26 04:24:03 2009 New Revision: 43770 URL: http://svn.reactos.org/svn/reactos?rev=43770&view=rev Log: [KDCOM] For unknown reasons it's not enough to check LSR if the port is ready to receive or not. Adding additional port reads improves the reliability of the data massively. Now it's possible to use kdcom on windows XP! Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdcom.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdcom.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdcom.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdcom.c [iso-8859-1] Mon Oct 26 04:24:03 2009 @@ -216,6 +216,11 @@ /* Wait for the port to be ready */ while ((READ_PORT_UCHAR(ComPortBase + COM_LSR) & LSR_TBE) == 0); + /* This is needed due to subtle timing issues */ + READ_PORT_UCHAR(ComPortBase + COM_MSR); + while ((READ_PORT_UCHAR(ComPortBase + COM_LSR) & LSR_TBE) == 0); + READ_PORT_UCHAR(ComPortBase + COM_MSR); + /* Send the byte */ WRITE_PORT_UCHAR(ComPortBase + COM_DAT, Byte); } @@ -224,6 +229,8 @@ NTAPI KdpPollByte(OUT PBYTE OutByte) { + READ_PORT_UCHAR(ComPortBase + COM_MSR); // Timing + /* Check if data is available */ if ((READ_PORT_UCHAR(ComPortBase + COM_LSR) & LSR_DR)) {

1 0

[cgutman] 43769: - Forgot this file
by cgutman＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: cgutman Date: Mon Oct 26 04:19:30 2009 New Revision: 43769 URL: http://svn.reactos.org/svn/reactos?rev=43769&view=rev Log: - Forgot this file Added: trunk/reactos/drivers/network/tcpip/tcpip/ainfo.c (with props) Added: trunk/reactos/drivers/network/tcpip/tcpip/ainfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/ainfo.c (added) +++ trunk/reactos/drivers/network/tcpip/tcpip/ainfo.c [iso-8859-1] Mon Oct 26 04:19:30 2009 @@ -1,0 +1,40 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS TCP/IP protocol driver + * FILE: tcpip/ainfo.c + * PURPOSE: Per-socket information. + * PROGRAMMER: Cameron Gutman + */ + +#include "precomp.h" + +TDI_STATUS SetAddressFileInfo(TDIObjectID *ID, + PADDRESS_FILE AddrFile, + PVOID Buffer, + UINT BufferSize) +{ + switch (ID->toi_id) + { + case AO_OPTION_TTL: + if (BufferSize < sizeof(UCHAR)) + return TDI_INVALID_PARAMETER; + + AddrFile->TTL = *((PUCHAR)Buffer); + return TDI_SUCCESS; + + default: + DbgPrint("Unimplemented option %x\n", ID->toi_id); + + return TDI_INVALID_REQUEST; + } +} + +TDI_STATUS GetAddressFileInfo(TDIObjectID *ID, + PADDRESS_FILE AddrFile, + PVOID Buffer, + PUINT BufferSize) +{ + UNIMPLEMENTED + + return TDI_INVALID_REQUEST; +} Propchange: trunk/reactos/drivers/network/tcpip/tcpip/ainfo.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 43768: [KDCOM] - Check the received PacketId - Add retry count to KdSendPacket - instantly return resend packets
by tkreuzer＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: tkreuzer Date: Mon Oct 26 04:16:46 2009 New Revision: 43768 URL: http://svn.reactos.org/svn/reactos?rev=43768&view=rev Log: [KDCOM] - Check the received PacketId - Add retry count to KdSendPacket - instantly return resend packets Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c [iso-8859-1] Mon Oct 26 04:16:46 2009 @@ -13,6 +13,7 @@ PFNDBGPRNT KdpDbgPrint = NULL; ULONG CurrentPacketId = INITIAL_PACKET_ID | SYNC_PACKET_ID; +ULONG RemotePacketId = 0; /* PRIVATE FUNCTIONS **********************************************************/ @@ -152,6 +153,13 @@ continue; } + /* Check if we got a resend packet */ + if (Packet.PacketLeader == CONTROL_PACKET_LEADER && + Packet.PacketType == PACKET_TYPE_KD_RESEND) + { + return KDP_PACKET_RESEND; + } + /* Step 3 - Read ByteCount */ KdStatus = KdpReceiveBuffer(&Packet.ByteCount, sizeof(USHORT)); if (KdStatus != KDP_PACKET_RECEIVED || Packet.ByteCount > PACKET_MAX_SIZE) @@ -205,6 +213,7 @@ KDDBGPRINT("KdReceivePacket - got a reset packet\n"); KdpSendControlPacket(PACKET_TYPE_KD_RESET, 0); CurrentPacketId = INITIAL_PACKET_ID; + RemotePacketId = INITIAL_PACKET_ID; /* Fall through */ case PACKET_TYPE_KD_RESEND: @@ -255,6 +264,8 @@ KDDBGPRINT("KdReceivePacket - too few data (%d) for type %d\n", Packet.ByteCount, MessageHeader->Length); MessageHeader->Length = Packet.ByteCount; + KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); + continue; } //KDDBGPRINT("KdReceivePacket - got normal PacketType, Buffer = %p\n", MessageHeader->Buffer); @@ -328,11 +339,19 @@ /* Acknowledge the received packet */ KdpSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE, Packet.PacketId); + /* Check if the received PacketId is ok */ + if (Packet.PacketId != RemotePacketId) + { + /* Continue with next packet */ + continue; + } + /* Did we get the right packet type? */ if (PacketType == Packet.PacketType) { /* Yes, return success */ //KDDBGPRINT("KdReceivePacket - all ok\n"); + RemotePacketId ^= 1; return KDP_PACKET_RECEIVED; } @@ -354,6 +373,7 @@ { KD_PACKET Packet; KDP_STATUS KdStatus; + ULONG Retries; /* Initialize a KD_PACKET */ Packet.PacketLeader = PACKET_LEADER; @@ -370,7 +390,9 @@ MessageData->Length); } - for (;;) + Retries = Context->KdpDefaultRetries; + + do { /* Set the packet id */ Packet.PacketId = CurrentPacketId; @@ -392,10 +414,10 @@ /* Wait for acknowledge */ KdStatus = KdReceivePacket(PACKET_TYPE_KD_ACKNOWLEDGE, - NULL, - NULL, - 0, - NULL); + NULL, + NULL, + 0, + Context); /* Did we succeed? */ if (KdStatus == KDP_PACKET_RECEIVED) @@ -411,8 +433,14 @@ return; } + if (KdStatus == KDP_PACKET_TIMEOUT) + { + Retries--; + } + /* Packet timed out, send it again */ } + while (Retries > 0); return; }

1 0

[cgutman] 43767: - Update AFD's shared header - Add entity type check for IF_MIB_STATS_ID - Sort out some confusion with TDI entities - Implement IOCTL_AFD_GET_CONTEXT_SIZE - Enable debug prints for unimplemented ioctls - Add kernel-mode support for setting TTL
by cgutman＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: cgutman Date: Mon Oct 26 04:11:44 2009 New Revision: 43767 URL: http://svn.reactos.org/svn/reactos?rev=43767&view=rev Log: - Update AFD's shared header - Add entity type check for IF_MIB_STATS_ID - Sort out some confusion with TDI entities - Implement IOCTL_AFD_GET_CONTEXT_SIZE - Enable debug prints for unimplemented ioctls - Add kernel-mode support for setting TTL Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/misc/sndrcv.c trunk/reactos/drivers/network/afd/afd/context.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/afd/include/afd.h trunk/reactos/drivers/network/tcpip/include/info.h trunk/reactos/drivers/network/tcpip/include/rawip.h trunk/reactos/drivers/network/tcpip/include/titypes.h trunk/reactos/drivers/network/tcpip/tcpip.rbuild trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c trunk/reactos/drivers/network/tcpip/tcpip/info.c trunk/reactos/include/reactos/drivers/afd/shared.h trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c trunk/reactos/lib/drivers/ip/transport/udp/udp.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Oct 26 04:11:44 2009 @@ -1230,7 +1230,7 @@ NULL); /* Set up the Accept Structure */ - AcceptData.ListenHandle = AcceptSocket; + AcceptData.ListenHandle = (HANDLE)AcceptSocket; AcceptData.SequenceNumber = ListenReceiveData->SequenceNumber; /* Send IOCTL to Accept */ Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Mon Oct 26 04:11:44 2009 @@ -561,8 +561,8 @@ SendInfo.BufferArray = (PAFD_WSABUF)lpBuffers; SendInfo.AfdFlags = Socket->SharedData.NonBlocking ? AFD_IMMEDIATE : 0; SendInfo.BufferCount = dwBufferCount; - SendInfo.RemoteAddress = RemoteAddress; - SendInfo.SizeOfRemoteAddress = Socket->HelperData->MaxTDIAddressLength; + SendInfo.TdiConnection.RemoteAddress = RemoteAddress; + SendInfo.TdiConnection.RemoteAddressLength = Socket->HelperData->MaxTDIAddressLength; /* Verifiy if we should use APC */ if (lpOverlapped == NULL) Modified: trunk/reactos/drivers/network/afd/afd/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] Mon Oct 26 04:11:44 2009 @@ -33,9 +33,28 @@ AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); - return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); + return UnlockAndMaybeComplete( FCB, Status, Irp, ContextSize ); } +NTSTATUS NTAPI +AfdGetContextSize( PDEVICE_OBJECT DeviceObject, PIRP Irp, + PIO_STACK_LOCATION IrpSp ) +{ + PFILE_OBJECT FileObject = IrpSp->FileObject; + PAFD_FCB FCB = FileObject->FsContext; + + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + + if (IrpSp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + return UnlockAndMaybeComplete(FCB, STATUS_BUFFER_TOO_SMALL, Irp, sizeof(ULONG)); + + RtlCopyMemory(Irp->UserBuffer, + &FCB->ContextSize, + sizeof(ULONG)); + + return UnlockAndMaybeComplete(FCB, STATUS_SUCCESS, Irp, sizeof(ULONG)); +} + NTSTATUS NTAPI AfdSetContext( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp ) { Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Mon Oct 26 04:11:44 2009 @@ -392,7 +392,7 @@ RemoveEntryList( PendingConn ); Status = ObReferenceObjectByHandle - ( (HANDLE)AcceptData->ListenHandle, + ( AcceptData->ListenHandle, FILE_ALL_ACCESS, NULL, KernelMode, Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Mon Oct 26 04:11:44 2009 @@ -354,7 +354,7 @@ AfdDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp) { PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; #if DBG PFILE_OBJECT FileObject = IrpSp->FileObject; #endif @@ -431,6 +431,9 @@ case IOCTL_AFD_SET_INFO: return AfdSetInfo( DeviceObject, Irp, IrpSp ); + case IOCTL_AFD_GET_CONTEXT_SIZE: + return AfdGetContextSize( DeviceObject, Irp, IrpSp ); + case IOCTL_AFD_GET_CONTEXT: return AfdGetContext( DeviceObject, Irp, IrpSp ); @@ -453,70 +456,73 @@ return AfdGetPeerName( DeviceObject, Irp, IrpSp ); case IOCTL_AFD_GET_TDI_HANDLES: - AFD_DbgPrint(MIN_TRACE, ("IOCTL_AFD_GET_TDI_HANDLES\n")); + DbgPrint("IOCTL_AFD_GET_TDI_HANDLES is UNIMPLEMENTED!\n"); break; case IOCTL_AFD_SET_CONNECT_DATA: - AFD_DbgPrint(MIN_TRACE, ("IOCTL_AFD_SET_CONNECT_DATA\n")); + DbgPrint("IOCTL_AFD_SET_CONNECT_DATA is UNIMPLEMENTED!\n"); break; case IOCTL_AFD_SET_CONNECT_OPTIONS: - AFD_DbgPrint(MIN_TRACE, ("IOCTL_AFD_SET_CONNECT_OPTIONS\n")); + DbgPrint("IOCTL_AFD_SET_CONNECT_OPTIONS is UNIMPLEMENTED!\n"); break; case IOCTL_AFD_SET_DISCONNECT_DATA: - AFD_DbgPrint(MIN_TRACE, ("IOCTL_AFD_SET_DISCONNECT_DATA\n")); + DbgPrint("IOCTL_AFD_SET_DISCONNECT_DATA is UNIMPLEMENTED!\n"); break; case IOCTL_AFD_SET_DISCONNECT_OPTIONS: - AFD_DbgPrint(MIN_TRACE, ("IOCTL_AFD_SET_DISCONNECT_OPTIONS\n")); + DbgPrint("IOCTL_AFD_SET_DISCONNECT_OPTIONS is UNIMPLEMENTED!\n"); break; case IOCTL_AFD_GET_CONNECT_DATA: - AFD_DbgPrint(MIN_TRACE, ("IOCTL_AFD_GET_CONNECT_DATA\n")); + DbgPrint("IOCTL_AFD_GET_CONNECT_DATA is UNIMPLEMENTED!\n"); break; case IOCTL_AFD_GET_CONNECT_OPTIONS: - AFD_DbgPrint(MIN_TRACE, ("IOCTL_AFD_GET_CONNECT_OPTIONS\n")); + DbgPrint("IOCTL_AFD_GET_CONNECT_OPTIONS is UNIMPLEMENTED!\n"); break; case IOCTL_AFD_GET_DISCONNECT_DATA: - AFD_DbgPrint(MIN_TRACE, ("IOCTL_AFD_GET_DISCONNECT_DATA\n")); + DbgPrint("IOCTL_AFD_GET_DISCONNECT_DATA is UNIMPLEMENTED!\n"); break; case IOCTL_AFD_GET_DISCONNECT_OPTIONS: - AFD_DbgPrint(MIN_TRACE, ("IOCTL_AFD_GET_DISCONNECT_OPTIONS\n")); + DbgPrint("IOCTL_AFD_GET_DISCONNECT_OPTIONS is UNIMPLEMENTED!\n"); break; case IOCTL_AFD_SET_CONNECT_DATA_SIZE: - AFD_DbgPrint(MIN_TRACE, ("IOCTL_AFD_SET_CONNECT_DATA_SIZE\n")); + DbgPrint("IOCTL_AFD_SET_CONNECT_DATA_SIZE is UNIMPLEMENTED!\n"); break; case IOCTL_AFD_SET_CONNECT_OPTIONS_SIZE: - AFD_DbgPrint(MIN_TRACE, ("IOCTL_AFD_SET_CONNECT_OPTIONS_SIZE\n")); + DbgPrint("IOCTL_AFD_SET_CONNECT_OPTIONS_SIZE is UNIMPLEMENTED!\n"); break; case IOCTL_AFD_SET_DISCONNECT_DATA_SIZE: - AFD_DbgPrint(MIN_TRACE, ("IOCTL_AFD_SET_DISCONNECT_DATA_SIZE\n")); + DbgPrint("IOCTL_AFD_SET_DISCONNECT_DATA_SIZE is UNIMPLEMENTED!\n"); break; case IOCTL_AFD_SET_DISCONNECT_OPTIONS_SIZE: - AFD_DbgPrint(MIN_TRACE, ("IOCTL_AFD_SET_DISCONNECT_OPTIONS_SIZE\n")); + DbgPrint("IOCTL_AFD_SET_DISCONNECT_OPTIONS_SIZE is UNIMPLEMENTED!\n"); break; case IOCTL_AFD_DEFER_ACCEPT: - AFD_DbgPrint(MIN_TRACE, ("IOCTL_AFD_DEFER_ACCEPT\n")); + DbgPrint("IOCTL_AFD_DEFER_ACCEPT is UNIMPLEMENTED!\n"); break; case IOCTL_AFD_GET_PENDING_CONNECT_DATA: - AFD_DbgPrint(MIN_TRACE, ("IOCTL_AFD_GET_PENDING_CONNECT_DATA\n")); + DbgPrint("IOCTL_AFD_GET_PENDING_CONNECT_DATA is UNIMPLEMENTED!\n"); + break; + + case IOCTL_AFD_VALIDATE_GROUP: + DbgPrint("IOCTL_AFD_VALIDATE_GROUP is UNIMPLEMENTED!\n"); break; default: - Status = STATUS_NOT_IMPLEMENTED; - AFD_DbgPrint(MIN_TRACE, ("Unknown IOCTL (0x%x)\n", - IrpSp->Parameters.DeviceIoControl. - IoControlCode)); + Status = STATUS_NOT_SUPPORTED; + DbgPrint("Unknown IOCTL (0x%x)\n", + IrpSp->Parameters.DeviceIoControl.IoControlCode); break; } break; Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Mon Oct 26 04:11:44 2009 @@ -416,13 +416,13 @@ AFD_DbgPrint (MID_TRACE,("RemoteAddress #%d Type %d\n", - ((PTRANSPORT_ADDRESS)SendReq->RemoteAddress)-> + ((PTRANSPORT_ADDRESS)SendReq->TdiConnection.RemoteAddress)-> TAAddressCount, - ((PTRANSPORT_ADDRESS)SendReq->RemoteAddress)-> + ((PTRANSPORT_ADDRESS)SendReq->TdiConnection.RemoteAddress)-> Address[0].AddressType)); TdiBuildConnectionInfo( &TargetAddress, - ((PTRANSPORT_ADDRESS)SendReq->RemoteAddress) ); + ((PTRANSPORT_ADDRESS)SendReq->TdiConnection.RemoteAddress) ); /* Check the size of the Address given ... */ Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Mon Oct 26 04:11:44 2009 @@ -226,6 +226,9 @@ AfdGetContext( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp ); NTSTATUS NTAPI +AfdGetContextSize( PDEVICE_OBJECT DeviceObject, PIRP Irp, + PIO_STACK_LOCATION IrpSp ); +NTSTATUS NTAPI AfdSetContext( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp ); Modified: trunk/reactos/drivers/network/tcpip/include/info.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/info.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/info.h [iso-8859-1] Mon Oct 26 04:11:44 2009 @@ -173,9 +173,26 @@ PNDIS_BUFFER Buffer, PUINT BufferSize); -/* Insert and remove interface entities */ +TDI_STATUS SetAddressFileInfo(TDIObjectID *ID, + PADDRESS_FILE AddrFile, + PVOID Buffer, + UINT BufferSize); + +TDI_STATUS GetAddressFileInfo(TDIObjectID *ID, + PADDRESS_FILE AddrFile, + PVOID Buffer, + PUINT BufferSize); + +/* Insert and remove entities */ VOID InsertTDIInterfaceEntity( PIP_INTERFACE Interface ); + VOID RemoveTDIInterfaceEntity( PIP_INTERFACE Interface ); + +VOID AddEntity(ULONG EntityType, + PVOID Context, + ULONG Flags); + +VOID RemoveEntityByContext(PVOID Context); #endif /* __INFO_H */ Modified: trunk/reactos/drivers/network/tcpip/include/rawip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/rawip.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/rawip.h [iso-8859-1] Mon Oct 26 04:11:44 2009 @@ -25,6 +25,7 @@ VOID); NTSTATUS AddGenericHeaderIPv4( + PADDRESS_FILE AddrFile, PIP_ADDRESS RemoteAddress, USHORT RemotePort, PIP_ADDRESS LocalAddress, Modified: trunk/reactos/drivers/network/tcpip/include/titypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] Mon Oct 26 04:11:44 2009 @@ -158,6 +158,7 @@ USHORT Family; /* Address family */ USHORT Protocol; /* Protocol number */ USHORT Port; /* Network port (network byte order) */ + UCHAR TTL; /* Time to live stored in packets sent from this address file */ WORK_QUEUE_ITEM WorkItem; /* Work queue item handle */ DATAGRAM_COMPLETION_ROUTINE Complete; /* Completion routine for delete request */ PVOID Context; /* Delete request context */ Modified: trunk/reactos/drivers/network/tcpip/tcpip.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] Mon Oct 26 04:11:44 2009 @@ -25,6 +25,7 @@ <file>recmutex.c</file> </directory> <directory name="tcpip"> + <file>ainfo.c</file> <file>buffer.c</file> <file>dispatch.c</file> <file>fileobjs.c</file> Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Mon Oct 26 04:11:44 2009 @@ -201,6 +201,9 @@ AddrFile->Free = AddrFileFree; + /* Set our default TTL */ + AddrFile->TTL = 128; + /* Make sure address is a local unicast address or 0 */ /* FIXME: IPv4 only */ AddrFile->Family = Address->Address[0].AddressType; @@ -231,6 +234,8 @@ return STATUS_INVALID_PARAMETER; } + AddEntity(CO_TL_ENTITY, AddrFile, CO_TL_TCP); + AddrFile->Send = NULL; /* TCPSendData */ break; @@ -250,18 +255,27 @@ TI_DbgPrint(MID_TRACE,("Setting port %d (wanted %d)\n", AddrFile->Port, Address->Address[0].Address[0].sin_port)); + + AddEntity(CL_TL_ENTITY, AddrFile, CL_TL_UDP); + AddrFile->Send = UDPSendDatagram; break; case IPPROTO_ICMP: AddrFile->Port = 0; AddrFile->Send = ICMPSendDatagram; + + /* FIXME: Verify this */ + AddEntity(ER_ENTITY, AddrFile, ER_ICMP); break; default: /* Use raw IP for all other protocols */ AddrFile->Port = 0; AddrFile->Send = RawIPSendDatagram; + + /* FIXME: Verify this */ + AddEntity(CL_TL_ENTITY, AddrFile, 0); break; } @@ -380,6 +394,8 @@ break; } + RemoveEntityByContext(AddrFile); + (*AddrFile->Free)(AddrFile); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); Modified: trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] Mon Oct 26 04:11:44 2009 @@ -160,105 +160,17 @@ } VOID InsertTDIInterfaceEntity( PIP_INTERFACE Interface ) { - KIRQL OldIrql; - UINT IFCount = 0, CLNLCount = 0, CLTLCount = 0, COTLCount = 0, ATCount = 0, ERCount = 0, i; + AddEntity(IF_ENTITY, Interface, IF_MIB); - TI_DbgPrint(DEBUG_INFO, - ("Inserting interface %08x (%d entities already)\n", - Interface, EntityCount)); + AddEntity(AT_ENTITY, Interface, + (Interface != Loopback) ? AT_ARP : AT_NULL); - TcpipAcquireSpinLock( &EntityListLock, &OldIrql ); - - /* Count IP Entities */ - for( i = 0; i < EntityCount; i++ ) - switch( EntityList[i].tei_entity ) - { - case IF_ENTITY: - IFCount++; - break; - - case CL_NL_ENTITY: - CLNLCount++; - break; - - case CL_TL_ENTITY: - CLTLCount++; - break; - - case CO_TL_ENTITY: - COTLCount++; - break; - - case AT_ENTITY: - ATCount++; - break; - - case ER_ENTITY: - ERCount++; - break; - - default: - break; - } - - EntityList[EntityCount].tei_entity = IF_ENTITY; - EntityList[EntityCount].tei_instance = IFCount; - EntityList[EntityCount].context = Interface; - EntityList[EntityCount].flags = IF_MIB; - EntityCount++; - EntityList[EntityCount].tei_entity = CL_NL_ENTITY; - EntityList[EntityCount].tei_instance = CLNLCount; - EntityList[EntityCount].context = Interface; - EntityList[EntityCount].flags = CL_NL_IP; - EntityCount++; - EntityList[EntityCount].tei_entity = CL_TL_ENTITY; - EntityList[EntityCount].tei_instance = CLTLCount; - EntityList[EntityCount].context = Interface; - EntityList[EntityCount].flags = CL_TL_UDP; - EntityCount++; - EntityList[EntityCount].tei_entity = CO_TL_ENTITY; - EntityList[EntityCount].tei_instance = COTLCount; - EntityList[EntityCount].context = Interface; - EntityList[EntityCount].flags = CO_TL_TCP; - EntityCount++; - EntityList[EntityCount].tei_entity = ER_ENTITY; - EntityList[EntityCount].tei_instance = ERCount; - EntityList[EntityCount].context = Interface; - EntityList[EntityCount].flags = ER_ICMP; - EntityCount++; - EntityList[EntityCount].tei_entity = AT_ENTITY; - EntityList[EntityCount].tei_instance = ATCount; - EntityList[EntityCount].context = Interface; - EntityList[EntityCount].flags = (Interface != Loopback) ? AT_ARP : AT_NULL; - EntityCount++; - - TcpipReleaseSpinLock( &EntityListLock, OldIrql ); + /* FIXME: This is probably wrong */ + AddEntity(CL_NL_ENTITY, Interface, CL_NL_IP); } VOID RemoveTDIInterfaceEntity( PIP_INTERFACE Interface ) { - KIRQL OldIrql; - UINT i; - - TI_DbgPrint(DEBUG_INFO,("Removing TDI entry 0x%x\n", Interface)); - - TcpipAcquireSpinLock( &EntityListLock, &OldIrql ); - - /* Remove entities that have this interface as context - * In the future, this might include AT_ENTITY types, too - */ - for( i = 0; i < EntityCount; i++ ) { - TI_DbgPrint(DEBUG_INFO,("--> examining TDI entry 0x%x\n", EntityList[i].context)); - if( EntityList[i].context == Interface ) { - if( i != EntityCount-1 ) { - memcpy( &EntityList[i], - &EntityList[--EntityCount], - sizeof(EntityList[i]) ); - } else { - EntityCount--; - } - } - } - - TcpipReleaseSpinLock( &EntityListLock, OldIrql ); + /* This removes all of them */ + RemoveEntityByContext(Interface); } Modified: trunk/reactos/drivers/network/tcpip/tcpip/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/info.c [iso-8859-1] Mon Oct 26 04:11:44 2009 @@ -11,6 +11,48 @@ #include "precomp.h" #include <debug.h> #include <route.h> + +VOID AddEntity(ULONG EntityType, PVOID Context, ULONG Flags) +{ + KIRQL OldIrql; + ULONG i, Count = 0; + + TcpipAcquireSpinLock(&EntityListLock, &OldIrql); + + for (i = 0; i < EntityCount; i++) + if (EntityList[i].tei_entity == EntityType) + Count++; + + EntityList[EntityCount].tei_entity = EntityType; + EntityList[EntityCount].tei_instance = Count; + EntityList[EntityCount].context = Context; + EntityList[EntityCount].flags = Flags; + EntityCount++; + + TcpipReleaseSpinLock(&EntityListLock, OldIrql); +} + +VOID RemoveEntityByContext(PVOID Context) +{ + ULONG i; + KIRQL OldIrql; + + TcpipAcquireSpinLock(&EntityListLock, &OldIrql); + + for (i = 0; i < EntityCount; i++) { + if( EntityList[i].context == Context ) { + if( i != EntityCount - 1 ) { + memcpy( &EntityList[i], + &EntityList[--EntityCount], + sizeof(EntityList[i]) ); + } else { + EntityCount--; + } + } + } + + TcpipReleaseSpinLock(&EntityListLock, OldIrql); +} PVOID GetContext(TDIEntityID ID) { @@ -178,9 +220,20 @@ } case INFO_CLASS_PROTOCOL: + if (ID->toi_type == INFO_TYPE_ADDRESS_OBJECT) + { + if ((EntityListContext = GetContext(ID->toi_entity))) + return GetAddressFileInfo(ID, EntityListContext, Buffer, BufferSize); + else + return TDI_INVALID_PARAMETER; + } + switch (ID->toi_id) { case IF_MIB_STATS_ID: + if (ID->toi_type != INFO_TYPE_PROVIDER) + return TDI_INVALID_PARAMETER; + if (ID->toi_entity.tei_entity == IF_ENTITY) if ((EntityListContext = GetContext(ID->toi_entity))) return InfoTdiQueryGetInterfaceMIB(ID->toi_entity, EntityListContext, Buffer, BufferSize); @@ -262,6 +315,14 @@ switch (ID->toi_class) { case INFO_CLASS_PROTOCOL: + if (ID->toi_type == INFO_TYPE_ADDRESS_OBJECT) + { + if ((EntityListContext = GetContext(ID->toi_entity))) + return SetAddressFileInfo(ID, EntityListContext, Buffer, BufferSize); + else + return TDI_INVALID_PARAMETER; + } + switch (ID->toi_id) { case IP_MIB_ARPTABLE_ENTRY_ID: Modified: trunk/reactos/include/reactos/drivers/afd/shared.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/af… ============================================================================== --- trunk/reactos/include/reactos/drivers/afd/shared.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/afd/shared.h [iso-8859-1] Mon Oct 26 04:11:44 2009 @@ -30,6 +30,7 @@ union { ULONG Ulong; LARGE_INTEGER LargeInteger; + BOOLEAN Boolean; } Information; ULONG Padding; } AFD_INFO, *PAFD_INFO; @@ -61,7 +62,7 @@ typedef struct _AFD_ACCEPT_DATA { ULONG UseSAN; ULONG SequenceNumber; - ULONG ListenHandle; + HANDLE ListenHandle; } AFD_ACCEPT_DATA, *PAFD_ACCEPT_DATA; typedef struct _AFD_RECEIVED_ACCEPT_DATA { @@ -107,9 +108,8 @@ PAFD_WSABUF BufferArray; ULONG BufferCount; ULONG AfdFlags; - ULONG Padding[9]; - ULONG SizeOfRemoteAddress; - PVOID RemoteAddress; + TDI_REQUEST_SEND_DATAGRAM TdiRequest; + TDI_CONNECTION_INFORMATION TdiConnection; } AFD_SEND_INFO_UDP, *PAFD_SEND_INFO_UDP; typedef struct _AFD_CONNECT_INFO { @@ -134,6 +134,18 @@ ULONG DisconnectType; LARGE_INTEGER Timeout; } AFD_DISCONNECT_INFO, *PAFD_DISCONNECT_INFO; + +typedef struct _AFD_VALIDATE_GROUP_DATA +{ + LONG GroupId; + TRANSPORT_ADDRESS Address; +} AFD_VALIDATE_GROUP_DATA, *PAFD_VALIDATE_GROUP_DATA; + +typedef struct _AFD_TDI_HANDLE_DATA +{ + HANDLE TdiAddressHandle; + HANDLE TdiConnectionHandle; +} AFD_TDI_HANDLE_DATA, *PAFD_TDI_HANDLE_DATA; /* AFD Packet Endpoint Flags */ #define AFD_ENDPOINT_CONNECTIONLESS 0x1 @@ -143,9 +155,31 @@ #define AFD_ENDPOINT_C_ROOT 0x10000 #define AFD_ENDPOINT_D_ROOT 0x100000 +/* AFD TDI Query Flags */ +#define AFD_ADDRESS_HANDLE 0x1L +#define AFD_CONNECTION_HANDLE 0x2L + +/* AFD event bits */ +#define AFD_EVENT_RECEIVE_BIT 0 +#define AFD_EVENT_OOB_RECEIVE_BIT 1 +#define AFD_EVENT_SEND_BIT 2 +#define AFD_EVENT_DISCONNECT_BIT 3 +#define AFD_EVENT_ABORT_BIT 4 +#define AFD_EVENT_CLOSE_BIT 5 +#define AFD_EVENT_CONNECT_BIT 6 +#define AFD_EVENT_ACCEPT_BIT 7 +#define AFD_EVENT_CONNECT_FAIL_BIT 8 +#define AFD_EVENT_QOS_BIT 9 +#define AFD_EVENT_GROUP_QOS_BIT 10 +#define AFD_EVENT_ROUTING_INTERFACE_CHANGE_BIT 11 +#define AFD_EVENT_ADDRESS_LIST_CHANGE_BIT 12 +#define AFD_MAX_EVENT 13 +#define AFD_ALL_EVENTS ((1 << AFD_MAX_EVENT) - 1) + /* AFD Info Flags */ +#define AFD_INFO_INLINING_MODE 0x01L #define AFD_INFO_BLOCKING_MODE 0x02L -#define AFD_INFO_SENDS_IN_PROGRESS 0x04L +#define AFD_INFO_SENDS_IN_PROGRESS 0x04L #define AFD_INFO_RECEIVE_WINDOW_SIZE 0x06L #define AFD_INFO_SEND_WINDOW_SIZE 0x07L #define AFD_INFO_GROUP_ID_TYPE 0x10L @@ -160,20 +194,23 @@ /* AFD Disconnect Flags */ #define AFD_DISCONNECT_SEND 0x01L #define AFD_DISCONNECT_RECV 0x02L -#define AFD_DISCONNECT_ABORT 0x04L +#define AFD_DISCONNECT_ABORT 0x04L +#define AFD_DISCONNECT_DATAGRAM 0x08L /* AFD Event Flags */ -#define AFD_EVENT_RECEIVE 0x1L -#define AFD_EVENT_OOB_RECEIVE 0x2L -#define AFD_EVENT_SEND 0x4L -#define AFD_EVENT_DISCONNECT 0x8L -#define AFD_EVENT_ABORT 0x10L -#define AFD_EVENT_CLOSE 0x20L -#define AFD_EVENT_CONNECT 0x40L -#define AFD_EVENT_ACCEPT 0x80L -#define AFD_EVENT_CONNECT_FAIL 0x100L -#define AFD_EVENT_QOS 0x200L -#define AFD_EVENT_GROUP_QOS 0x400L +#define AFD_EVENT_RECEIVE (1 << AFD_EVENT_RECEIVE_BIT) +#define AFD_EVENT_OOB_RECEIVE (1 << AFD_EVENT_OOB_RECEIVE_BIT) +#define AFD_EVENT_SEND (1 << AFD_EVENT_SEND_BIT) +#define AFD_EVENT_DISCONNECT (1 << AFD_EVENT_DISCONNECT_BIT) +#define AFD_EVENT_ABORT (1 << AFD_EVENT_ABORT_BIT) +#define AFD_EVENT_CLOSE (1 << AFD_EVENT_CLOSE_BIT) +#define AFD_EVENT_CONNECT (1 << AFD_EVENT_CONNECT_BIT) +#define AFD_EVENT_ACCEPT (1 << AFD_EVENT_ACCEPT_BIT) +#define AFD_EVENT_CONNECT_FAIL (1 << AFD_EVENT_CONNECT_FAIL_BIT) +#define AFD_EVENT_QOS (1 << AFD_EVENT_QOS_BIT) +#define AFD_EVENT_GROUP_QOS (1 << AFD_EVENT_GROUP_QOS_BIT) +#define AFD_EVENT_ROUTING_INTERFACE_CHANGE (1 << AFD_EVENT_ROUTING_INTERFACE_CHANGE_BIT) +#define AFD_EVENT_ADDRESS_LIST_CHANGE (1 << AFD_EVENT_ADDRESS_LIST_CHANGE_BIT) /* AFD SEND/RECV Flags */ #define AFD_SKIP_FIO 0x1L @@ -201,6 +238,7 @@ #define AFD_GET_PEER_NAME 12 #define AFD_GET_TDI_HANDLES 13 #define AFD_SET_INFO 14 +#define AFD_GET_CONTEXT_SIZE 15 #define AFD_GET_CONTEXT 16 #define AFD_SET_CONTEXT 17 #define AFD_SET_CONNECT_DATA 18 @@ -220,6 +258,7 @@ #define AFD_ENUM_NETWORK_EVENTS 34 #define AFD_DEFER_ACCEPT 35 #define AFD_GET_PENDING_CONNECT_DATA 41 +#define AFD_VALIDATE_GROUP 42 /* AFD IOCTLs */ @@ -253,6 +292,8 @@ _AFD_CONTROL_CODE(AFD_GET_TDI_HANDLES, METHOD_NEITHER) #define IOCTL_AFD_SET_INFO \ _AFD_CONTROL_CODE(AFD_SET_INFO, METHOD_NEITHER) +#define IOCTL_AFD_GET_CONTEXT_SIZE \ + _AFD_CONTROL_CODE(AFD_GET_CONTEXT_SIZE, METHOD_NEITHER) #define IOCTL_AFD_GET_CONTEXT \ _AFD_CONTROL_CODE(AFD_GET_CONTEXT, METHOD_NEITHER) #define IOCTL_AFD_SET_CONTEXT \ @@ -291,6 +332,8 @@ _AFD_CONTROL_CODE(AFD_GET_PENDING_CONNECT_DATA, METHOD_NEITHER) #define IOCTL_AFD_ENUM_NETWORK_EVENTS \ _AFD_CONTROL_CODE(AFD_ENUM_NETWORK_EVENTS, METHOD_NEITHER) +#define IOCTL_AFD_VALIDATE_GROUP \ + _AFD_CONTROL_CODE(AFD_VALIDATE_GROUP, METHOD_NEITHER) typedef struct _AFD_SOCKET_INFORMATION { BOOL CommandChannel; Modified: trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/r… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Mon Oct 26 04:11:44 2009 @@ -11,6 +11,7 @@ #include "precomp.h" NTSTATUS AddGenericHeaderIPv4( + PADDRESS_FILE AddrFile, PIP_ADDRESS RemoteAddress, USHORT RemotePort, PIP_ADDRESS LocalAddress, @@ -62,9 +63,9 @@ IPHeader->Id = (USHORT)Random(); /* One fragment at offset 0 */ IPHeader->FlagsFragOfs = 0; - /* Time-to-Live is 128 */ - IPHeader->Ttl = 128; - /* User Datagram Protocol */ + /* Time-to-Live */ + IPHeader->Ttl = AddrFile->TTL; + /* Protocol */ IPHeader->Protocol = Protocol; /* Checksum is 0 (for later calculation of this) */ IPHeader->Checksum = 0; @@ -82,6 +83,7 @@ NTSTATUS BuildRawIpPacket( + PADDRESS_FILE AddrFile, PIP_PACKET Packet, PIP_ADDRESS RemoteAddress, USHORT RemotePort, @@ -124,9 +126,9 @@ switch (RemoteAddress->Type) { case IP_ADDRESS_V4: Status = AddGenericHeaderIPv4 - (RemoteAddress, RemotePort, + (AddrFile, RemoteAddress, RemotePort, LocalAddress, LocalPort, Packet, DataLen, - IPPROTO_RAW, + AddrFile->Protocol, 0, (PVOID *)&Payload ); break; case IP_ADDRESS_V6: @@ -225,7 +227,8 @@ LocalAddress = NCE->Interface->Unicast; } - Status = BuildRawIpPacket( &Packet, + Status = BuildRawIpPacket( AddrFile, + &Packet, &RemoteAddress, RemotePort, &LocalAddress, Modified: trunk/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/u… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Mon Oct 26 04:11:44 2009 @@ -14,6 +14,7 @@ PORT_SET UDPPorts; NTSTATUS AddUDPHeaderIPv4( + PADDRESS_FILE AddrFile, PIP_ADDRESS RemoteAddress, USHORT RemotePort, PIP_ADDRESS LocalAddress, @@ -39,7 +40,7 @@ IPPacket, IPPacket->NdisPacket)); Status = AddGenericHeaderIPv4 - ( RemoteAddress, RemotePort, + ( AddrFile, RemoteAddress, RemotePort, LocalAddress, LocalPort, IPPacket, DataLength, IPPROTO_UDP, sizeof(UDP_HEADER), (PVOID *)&UDPHeader ); @@ -75,6 +76,7 @@ NTSTATUS BuildUDPPacket( + PADDRESS_FILE AddrFile, PIP_PACKET Packet, PIP_ADDRESS RemoteAddress, USHORT RemotePort, @@ -115,7 +117,7 @@ switch (RemoteAddress->Type) { case IP_ADDRESS_V4: - Status = AddUDPHeaderIPv4(RemoteAddress, RemotePort, + Status = AddUDPHeaderIPv4(AddrFile, RemoteAddress, RemotePort, LocalAddress, LocalPort, Packet, DataBuffer, DataLen); break; case IP_ADDRESS_V6: @@ -201,7 +203,8 @@ LocalAddress = NCE->Interface->Unicast; } - Status = BuildUDPPacket( &Packet, + Status = BuildUDPPacket( AddrFile, + &Packet, &RemoteAddress, RemotePort, &LocalAddress,

1 0

[tkreuzer] 43766: [KDCOM] - KdpDbgPrint -> KDDBGPRINT - enable KdDebuggerNotPresent change
by tkreuzer＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: tkreuzer Date: Mon Oct 26 03:11:03 2009 New Revision: 43766 URL: http://svn.reactos.org/svn/reactos?rev=43766&view=rev Log: [KDCOM] - KdpDbgPrint -> KDDBGPRINT - enable KdDebuggerNotPresent change Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.rbuild branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdserial.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.rbuild [iso-8859-1] Mon Oct 26 03:11:03 2009 @@ -10,6 +10,7 @@ <module name="kdserial" type="staticlibrary"> <include base="kdserial">.</include> + <library>ntoskrnl</library> <file>kdserial.c</file> </module> Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdserial.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdserial.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdserial.c [iso-8859-1] Mon Oct 26 03:11:03 2009 @@ -124,7 +124,7 @@ /* Check for breakin byte */ if (Byte == BREAKIN_PACKET_BYTE) { - KdpDbgPrint("BREAKIN_PACKET_BYTE\n"); + KDDBGPRINT("BREAKIN_PACKET_BYTE\n"); Index = 0; Buffer[0] = Byte; continue; @@ -138,7 +138,7 @@ while (Index < 4); /* Enable the debugger */ -// KdDebuggerNotPresent = FALSE; + KdDebuggerNotPresent = FALSE; SharedUserData->KdDebuggerEnabled |= 0x00000002; /* Return the received packet leader */

1 0

[janderwald] 43765: [WDMAUD.DRV] - Set the audio pin to KSSTATE_RUN if it is wave-out pin - Implement support for manually starting / stopping a pin, which is used for recording [WINMM] - Add a hack for handling requests with WAVE_MAPPER [PORTCLS] - Pass correct flags to KsProbeStreamIrp when the irp has not already been probed (DirectKs) [WDMAUD] - Set correct irp dispatch code [SYSAUDIO] - Remove a hack [MMEBUDDY] - Return no error for MXDM_INIT message - Add support for completing multiple wa
by janderwald＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: janderwald Date: Mon Oct 26 01:15:22 2009 New Revision: 43765 URL: http://svn.reactos.org/svn/reactos?rev=43765&view=rev Log: [WDMAUD.DRV] - Set the audio pin to KSSTATE_RUN if it is wave-out pin - Implement support for manually starting / stopping a pin, which is used for recording [WINMM] - Add a hack for handling requests with WAVE_MAPPER [PORTCLS] - Pass correct flags to KsProbeStreamIrp when the irp has not already been probed (DirectKs) [WDMAUD] - Set correct irp dispatch code [SYSAUDIO] - Remove a hack [MMEBUDDY] - Return no error for MXDM_INIT message - Add support for completing multiple wave headers at once - Use new functions to implement WIDM_START / WIDM_STOP - ReactOS now "supports" wave in recording. Tested with Audacity / sndrec32 @ XP, WIP Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c trunk/reactos/dll/win32/winmm/winmm.c trunk/reactos/dll/win32/winmm/winmm.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/sysaudio/pin.c trunk/reactos/include/reactos/libs/sound/mmebuddy.h trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Mon Oct 26 01:15:22 2009 @@ -428,16 +428,18 @@ Instance->BufferCount = 100; } - - /* Now start the stream */ - DeviceInfo.u.State = KSSTATE_RUN; - SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_SETDEVICE_STATE, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); + if (DeviceType == WAVE_OUT_DEVICE_TYPE) + { + /* Now start the stream */ + DeviceInfo.u.State = KSSTATE_RUN; + SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_SETDEVICE_STATE, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + } return MMSYSERR_NOERROR; } @@ -502,11 +504,54 @@ else if (DeviceType == WAVE_IN_DEVICE_TYPE) { Ret = ReadFileEx(KernelHandle, &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPOVERLAPPED)Overlap, CompletionRoutine); - if (Ret) - WaitForSingleObjectEx (KernelHandle, INFINITE, TRUE); - } - - return MMSYSERR_NOERROR; + //if (Ret) + // WaitForSingleObjectEx (KernelHandle, INFINITE, TRUE); + } + + return MMSYSERR_NOERROR; +} + +MMRESULT +SetWdmWaveState( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN BOOL bStart) +{ + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + WDMAUD_DEVICE_INFO DeviceInfo; + MMDEVICE_TYPE DeviceType; + HANDLE Handle; + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.hDevice = Handle; + DeviceInfo.DeviceType = DeviceType; + + if (bStart) + DeviceInfo.u.State = KSSTATE_RUN; + else + DeviceInfo.u.State = KSSTATE_PAUSE; + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_SETDEVICE_STATE, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + return Result; } MMRESULT @@ -680,6 +725,11 @@ else { FuncTable.SetWaveFormat = SetWdmWaveDeviceFormat; + } + + if (DeviceType == WAVE_IN_DEVICE_TYPE || DeviceType == WAVE_OUT_DEVICE_TYPE) + { + FuncTable.SetState = SetWdmWaveState; } FuncTable.Open = OpenWdmSoundDevice; Modified: trunk/reactos/dll/win32/winmm/winmm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.c?re… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm.c [iso-8859-1] Mon Oct 26 01:15:22 2009 @@ -2150,6 +2150,12 @@ if (lpCaps == NULL) return MMSYSERR_INVALPARAM; + if (uDeviceID == WAVE_MAPPER) + { + FIXME("Support WAVE_MAPPER\n"); + uDeviceID = 0; + } + if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_WAVEOUT, TRUE)) == NULL) return MMSYSERR_BADDEVICEID; @@ -2543,6 +2549,13 @@ if (lpCaps == NULL) return MMSYSERR_INVALPARAM; + if (uDeviceID == WAVE_MAPPER) + { + FIXME("Support WAVE_MAPPER\n"); + uDeviceID = 0; + } + + if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_WAVEIN, TRUE)) == NULL) return MMSYSERR_BADDEVICEID; Modified: trunk/reactos/dll/win32/winmm/winmm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.rbui… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm.rbuild [iso-8859-1] Mon Oct 26 01:15:22 2009 @@ -21,9 +21,9 @@ <file>mci.c</file> <file>mmio.c</file> <file>playsound.c</file> + <file>registry.c</file> <file>time.c</file> <file>winmm.c</file> - <file>registry.c</file> <file>winmm_res.rc</file> </module> </group> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] Mon Oct 26 01:15:22 2009 @@ -133,9 +133,11 @@ // Wdmaud already probes buffers, therefore no need to probe it again // probe the stream irp if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_WRITE_STREAM) - Status = KsProbeStreamIrp(Irp, KSSTREAM_WRITE | KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK | KSPROBE_ALLOWFORMATCHANGE | KSPROBE_SYSTEMADDRESS, 0); - else - Status = KsProbeStreamIrp(Irp, KSSTREAM_READ| KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK | KSPROBE_ALLOWFORMATCHANGE | KSPROBE_SYSTEMADDRESS, 0); + Status = KsProbeStreamIrp(Irp, KSSTREAM_WRITE | KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK | KSPROBE_SYSTEMADDRESS, 0); + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_READ_STREAM) + Status = KsProbeStreamIrp(Irp, KSSTREAM_READ | KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK | KSPROBE_SYSTEMADDRESS, 0); + else + PC_ASSERT(0); // check for success if (!NT_SUCCESS(Status)) Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Mon Oct 26 01:15:22 2009 @@ -291,6 +291,7 @@ PIO_STACK_LOCATION IoStack; ULONG Length; PMDL Mdl; + BOOLEAN Read = TRUE; /* get current irp stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -318,6 +319,7 @@ if (IoStack->MajorFunction == IRP_MJ_WRITE) { /* probe the write stream irp */ + Read = FALSE; Status = KsProbeStreamIrp(Irp, KSPROBE_STREAMWRITE | KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK, Length); } else @@ -352,6 +354,15 @@ /* get next stack location */ IoStack = IoGetNextIrpStackLocation(Irp); + + if (Read) + { + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_KS_READ_STREAM; + } + else + { + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_KS_WRITE_STREAM; + } /* attach file object */ IoStack->FileObject = FileObject; @@ -359,7 +370,7 @@ IoStack->MajorFunction = IRP_MJ_WRITE; /* mark irp as pending */ - IoMarkIrpPending(Irp); +// IoMarkIrpPending(Irp); /* call the driver */ Status = IoCallDriver(IoGetRelatedDeviceObject(FileObject), Irp); Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Mon Oct 26 01:15:22 2009 @@ -73,12 +73,9 @@ PIO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; NTSTATUS Status; - ULONG Length; /* Get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); - - Length = IoStack->Parameters.Write.Length; /* The dispatch context is stored in the FsContext member */ Context = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; @@ -113,9 +110,7 @@ /* store file object of next device object */ IoStack->FileObject = FileObject; IoStack->MajorFunction = IRP_MJ_DEVICE_CONTROL; - IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_KS_WRITE_STREAM; //FIXME - IoStack->Parameters.DeviceIoControl.OutputBufferLength = Length; - ASSERT(Irp->AssociatedIrp.SystemBuffer); + //ASSERT(Irp->AssociatedIrp.SystemBuffer); /* now call the driver */ Status = IoCallDriver(IoGetRelatedDeviceObject(FileObject), Irp); Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sound… ============================================================================== --- trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Mon Oct 26 01:15:22 2009 @@ -236,6 +236,12 @@ IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, IN MMTIME* Time); + +typedef MMRESULT(*MMSETSTATE_FUNC)( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN BOOL bStart); + + typedef struct _MMFUNCTION_TABLE { union @@ -258,6 +264,7 @@ WAVE_COMMIT_FUNC CommitWaveBuffer; MMGETPOS_FUNC GetPos; + MMSETSTATE_FUNC SetState; // Redundant //MMWAVEHEADER_FUNC PrepareWaveHeader; @@ -407,6 +414,11 @@ IN MMTIME* Time, IN DWORD Size); +MMRESULT +MmeSetState( + IN DWORD PrivateHandle, + IN BOOL bStart); + #define MmePrepareWaveHeader(private_handle, header) \ PrepareWaveHeader((PSOUND_DEVICE_INSTANCE)private_handle, (PWAVEHDR)header) Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] Mon Oct 26 01:15:22 2009 @@ -182,6 +182,7 @@ case MXDM_INIT : { + Result = MMSYSERR_NOERROR; break; } Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] Mon Oct 26 01:15:22 2009 @@ -15,6 +15,47 @@ #include <sndtypes.h> #include <mmebuddy.h> + +/* + Sets the device into running or stopped state +*/ + +MMRESULT +MmeSetState( + IN DWORD PrivateHandle, + IN BOOL bStart) +{ + MMRESULT Result; + PMMFUNCTION_TABLE FunctionTable; + PSOUND_DEVICE SoundDevice; + PSOUND_DEVICE_INSTANCE SoundDeviceInstance; + + VALIDATE_MMSYS_PARAMETER( PrivateHandle ); + SoundDeviceInstance = (PSOUND_DEVICE_INSTANCE) PrivateHandle; + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + if ( ! MMSUCCESS(Result) ) + return TranslateInternalMmResult(Result); + + /* Get the function table, and validate it */ + Result = GetSoundDeviceFunctionTable(SoundDevice, &FunctionTable); + if ( ! MMSUCCESS(Result) ) + return TranslateInternalMmResult(Result); + + SND_ASSERT( FunctionTable->SetState ); + if ( FunctionTable->SetState == NULL ) + { + /* FIXME */ + return MMSYSERR_NOTSUPPORTED; + } + /* Try change state */ + Result = FunctionTable->SetState(SoundDeviceInstance, bStart); + + return Result; +} + /* Call the client application when something interesting happens (MME API defines "interesting things" as device open, close, and buffer Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] Mon Oct 26 01:15:22 2009 @@ -170,6 +170,7 @@ PWAVEHDR WaveHdr; PWAVEHDR_EXTENSION HdrExtension; MMRESULT Result; + DWORD Bytes; WaveHdr = (PWAVEHDR) SoundOverlapped->Header; SND_ASSERT( WaveHdr ); @@ -187,18 +188,48 @@ Result = GetSoundDeviceType(SoundDevice, &DeviceType); SND_ASSERT( MMSUCCESS(Result) ); - HdrExtension->BytesCompleted += dwNumberOfBytesTransferred; - SND_TRACE(L"%d/%d bytes of wavehdr completed\n", HdrExtension->BytesCompleted, WaveHdr->dwBufferLength); - - /* We have an available buffer now */ - -- SoundDeviceInstance->OutstandingBuffers; - - /* Did we finish a WAVEHDR and aren't looping? */ - if ( HdrExtension->BytesCompleted == WaveHdr->dwBufferLength && - SoundOverlapped->PerformCompletion ) - { - CompleteWaveHeader(SoundDeviceInstance, WaveHdr); - } + do + { + + /* We have an available buffer now */ + -- SoundDeviceInstance->OutstandingBuffers; + + /* Did we finish a WAVEHDR and aren't looping? */ + if ( HdrExtension->BytesCompleted + dwNumberOfBytesTransferred >= WaveHdr->dwBufferLength && + SoundOverlapped->PerformCompletion ) + { + /* Wave buffer fully completed */ + Bytes = WaveHdr->dwBufferLength - HdrExtension->BytesCompleted; + + HdrExtension->BytesCompleted += Bytes; + dwNumberOfBytesTransferred -= Bytes; + + CompleteWaveHeader(SoundDeviceInstance, WaveHdr); + SND_TRACE(L"%d/%d bytes of wavehdr completed\n", HdrExtension->BytesCompleted, WaveHdr->dwBufferLength); + } + else + { + SND_TRACE(L"%d/%d bytes of wavehdr completed\n", HdrExtension->BytesCompleted, WaveHdr->dwBufferLength); + /* Partially completed */ + HdrExtension->BytesCompleted += dwNumberOfBytesTransferred; + break; + } + + /* Move to next wave header */ + WaveHdr = WaveHdr->lpNext; + + if (!WaveHdr) + { + /* No following WaveHdr */ + SND_ASSERT(dwNumberOfBytesTransferred == 0); + break; + } + + HdrExtension = (PWAVEHDR_EXTENSION) WaveHdr->reserved; + SND_ASSERT( HdrExtension ); + + + }while(dwNumberOfBytesTransferred); DoWaveStreaming(SoundDeviceInstance); Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] Mon Oct 26 01:15:22 2009 @@ -42,6 +42,18 @@ case WIDM_GETNUMDEVS : { Result = GetSoundDeviceCount(WAVE_IN_DEVICE_TYPE); + break; + } + + case WIDM_START : + { + Result = MmeSetState(PrivateHandle, TRUE); + break; + } + + case WIDM_STOP : + { + Result = MmeSetState(PrivateHandle, FALSE); break; }

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