Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 43443: [BDASUP] -fix some function declarations
by cwittich＠svn.reactos.org 13 Oct '09

13 Oct '09

Author: cwittich Date: Tue Oct 13 23:49:36 2009 New Revision: 43443 URL: http://svn.reactos.org/svn/reactos?rev=43443&view=rev Log: [BDASUP] -fix some function declarations Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c trunk/reactos/drivers/storage/floppy/SOURCES trunk/reactos/include/ddk/bdasup.h Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] Tue Oct 13 23:49:36 2009 @@ -691,7 +691,7 @@ BdaPropertyNodeDescriptors( IN PIRP Irp, IN KSPROPERTY *pKSProperty, - OUT GUID *pguidProperty) + OUT BDANODE_DESCRIPTOR *pNodeDescriptorProperty) { UNIMPLEMENTED return STATUS_NOT_IMPLEMENTED; @@ -704,7 +704,7 @@ NTAPI BdaPropertyNodeEvents( IN PIRP Irp, - IN KSPROPERTY *pKSProperty, + IN KSP_NODE *pKSProperty, OUT GUID *pguidProperty) { UNIMPLEMENTED @@ -718,7 +718,7 @@ NTAPI BdaPropertyNodeMethods( IN PIRP Irp, - IN KSPROPERTY *pKSProperty, + IN KSP_NODE *pKSProperty, OUT GUID *pguidProperty) { UNIMPLEMENTED @@ -732,7 +732,7 @@ NTAPI BdaPropertyNodeProperties( IN PIRP Irp, - IN KSPROPERTY *pKSProperty, + IN KSP_NODE *pKSProperty, OUT GUID *pguidProperty) { UNIMPLEMENTED Modified: trunk/reactos/drivers/storage/floppy/SOURCES URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/SOU… ============================================================================== --- trunk/reactos/drivers/storage/floppy/SOURCES [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/SOURCES [iso-8859-1] Tue Oct 13 23:49:36 2009 @@ -1,30 +1,28 @@ -# ReactOS Floppy Driver -# Copyright (C) 2004, Vizzini (vizzini(a)plasmic.com) -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# PROJECT: ReactOS Floppy Driver -# FILE: SOURCES -# PURPOSE: SOURCES file for Microsoft DDK build system -# PROGRAMMER: Vizzini (vizzini(a)plasmic.com) -# REVISIONS: -# 15-Feb-2004 vizzini - Created/ - TARGETNAME=floppy TARGETTYPE=DRIVER -TARGETPATH=obj -TARGETLIBS= $(DDK_LIB_PATH)\csq.lib -SOURCES= floppy.c csqrtns.c hardware.c readwrite.c ioctl.c + MSC_WARNING_LEVEL=/W3 /WX + +C_DEFINES=$(C_DEFINES) /DSTDCALL=__stdcall /DDDKAPI=__stdcall /wd4996 +INCLUDES=.; \ + ../../../.; \ + ../../../include; \ + ../../../include; \ + ../../../include/dxsdk; \ + ../../../include/dxsdk; \ + ../../../include/GL; \ + ../../../include/ndk; \ + ../../../include/reactos; \ + ../../../include/reactos; \ + ../../../include/reactos/mc; \ + ../../../include/reactos/libs + +TARGETLIBS= $(DDK_LIB_PATH)\ntstrsafe.lib + +SOURCES=csqrtns.c \ + floppy.c \ + hardware.c \ + ioctl.c \ + readwrite.c \ + floppy.rc +TARGET_DESTINATION=retail Modified: trunk/reactos/include/ddk/bdasup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/bdasup.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/bdasup.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/bdasup.h [iso-8859-1] Tue Oct 13 23:49:36 2009 @@ -96,21 +96,21 @@ STDMETHODIMP_(NTSTATUS) BdaPropertyNodeDescriptors( IN PIRP Irp, IN KSPROPERTY *pKSProperty, - OUT GUID *pguidProperty); + OUT BDANODE_DESCRIPTOR *pNodeDescriptorProperty); STDMETHODIMP_(NTSTATUS) BdaPropertyNodeEvents( IN PIRP Irp, - IN KSPROPERTY *pKSProperty, + IN KSP_NODE *pKSProperty, OUT GUID *pguidProperty); STDMETHODIMP_(NTSTATUS) BdaPropertyNodeMethods( IN PIRP Irp, - IN KSPROPERTY *pKSProperty, + IN KSP_NODE *pKSProperty, OUT GUID *pguidProperty); STDMETHODIMP_(NTSTATUS) BdaPropertyNodeProperties( IN PIRP Irp, - IN KSPROPERTY *pKSProperty, + IN KSP_NODE *pKSProperty, OUT GUID *pguidProperty); STDMETHODIMP_(NTSTATUS) BdaPropertyNodeTypes(

1 0

[cwittich] 43442: partial sync to wine 1.1.31
by cwittich＠svn.reactos.org 13 Oct '09

13 Oct '09

Author: cwittich Date: Tue Oct 13 23:09:08 2009 New Revision: 43442 URL: http://svn.reactos.org/svn/reactos?rev=43442&view=rev Log: partial sync to wine 1.1.31 Modified: trunk/reactos/dll/win32/advapi32/sec/cred.c Modified: trunk/reactos/dll/win32/advapi32/sec/cred.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/cre… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/cred.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/cred.c [iso-8859-1] Tue Oct 13 23:09:08 2009 @@ -911,55 +911,63 @@ } #endif -static void convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, PCREDENTIALA CredentialA, DWORD *len) -{ - char *buffer = (char *)CredentialA + sizeof(CREDENTIALA); +static INT convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, PCREDENTIALA CredentialA, INT len) +{ + char *buffer; INT string_len; - - *len += sizeof(CREDENTIALA); + INT needed = sizeof(CREDENTIALA); + if (!CredentialA) { - if (CredentialW->TargetName) *len += WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetName, -1, NULL, 0, NULL, NULL); - if (CredentialW->Comment) *len += WideCharToMultiByte(CP_ACP, 0, CredentialW->Comment, -1, NULL, 0, NULL, NULL); - *len += CredentialW->CredentialBlobSize; - if (CredentialW->TargetAlias) *len += WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetAlias, -1, NULL, 0, NULL, NULL); - if (CredentialW->UserName) *len += WideCharToMultiByte(CP_ACP, 0, CredentialW->UserName, -1, NULL, 0, NULL, NULL); - - return; - } - + if (CredentialW->TargetName) + needed += WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetName, -1, NULL, 0, NULL, NULL); + if (CredentialW->Comment) + needed += WideCharToMultiByte(CP_ACP, 0, CredentialW->Comment, -1, NULL, 0, NULL, NULL); + needed += CredentialW->CredentialBlobSize; + if (CredentialW->TargetAlias) + needed += WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetAlias, -1, NULL, 0, NULL, NULL); + if (CredentialW->UserName) + needed += WideCharToMultiByte(CP_ACP, 0, CredentialW->UserName, -1, NULL, 0, NULL, NULL); + + return needed; + } + + + buffer = (char *)CredentialA + sizeof(CREDENTIALA); + len -= sizeof(CREDENTIALA); CredentialA->Flags = CredentialW->Flags; CredentialA->Type = CredentialW->Type; + if (CredentialW->TargetName) { CredentialA->TargetName = buffer; - - /* Buffer is guaranteed to be large enough */ - string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetName, -1, CredentialA->TargetName, 0x7FFFFFFF, NULL, NULL); - + string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetName, -1, buffer, len, NULL, NULL); buffer += string_len; - *len += string_len; + needed += string_len; + len -= string_len; } else CredentialA->TargetName = NULL; if (CredentialW->Comment) { CredentialA->Comment = buffer; - string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->Comment, -1, CredentialA->Comment, 0x7FFFFFFF, NULL, NULL); + string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->Comment, -1, buffer, len, NULL, NULL); buffer += string_len; - *len += string_len; + needed += string_len; + len -= string_len; } else CredentialA->Comment = NULL; CredentialA->LastWritten = CredentialW->LastWritten; CredentialA->CredentialBlobSize = CredentialW->CredentialBlobSize; - if (CredentialW->CredentialBlobSize) + if (CredentialW->CredentialBlobSize && (CredentialW->CredentialBlobSize <= len)) { CredentialA->CredentialBlob =(LPBYTE)buffer; memcpy(CredentialA->CredentialBlob, CredentialW->CredentialBlob, CredentialW->CredentialBlobSize); buffer += CredentialW->CredentialBlobSize; - *len += CredentialW->CredentialBlobSize; + needed += CredentialW->CredentialBlobSize; + len -= CredentialW->CredentialBlobSize; } else CredentialA->CredentialBlob = NULL; @@ -969,57 +977,67 @@ if (CredentialW->TargetAlias) { CredentialA->TargetAlias = buffer; - string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetAlias, -1, CredentialA->TargetAlias, 0x7FFFFFFF, NULL, NULL); + string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetAlias, -1, buffer, len, NULL, NULL); buffer += string_len; - *len += string_len; + needed += string_len; + len -= string_len; } else CredentialA->TargetAlias = NULL; if (CredentialW->UserName) { CredentialA->UserName = buffer; - string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->UserName, -1, CredentialA->UserName, 0x7FFFFFFF, NULL, NULL); - buffer += string_len; - *len += string_len; + string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->UserName, -1, buffer, len, NULL, NULL); + needed += string_len; } else CredentialA->UserName = NULL; -} - -static void convert_PCREDENTIALA_to_PCREDENTIALW(const CREDENTIALA *CredentialA, PCREDENTIALW CredentialW, DWORD *len) -{ - char *buffer = (char *)CredentialW + sizeof(CREDENTIALW); + + return needed; +} + +static INT convert_PCREDENTIALA_to_PCREDENTIALW(const CREDENTIALA *CredentialA, PCREDENTIALW CredentialW, INT len) +{ + char *buffer; INT string_len; - - *len += sizeof(CREDENTIALW); + INT needed = sizeof(CREDENTIALW); + if (!CredentialW) { - if (CredentialA->TargetName) *len += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetName, -1, NULL, 0); - if (CredentialA->Comment) *len += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->Comment, -1, NULL, 0); - *len += CredentialA->CredentialBlobSize; - if (CredentialA->TargetAlias) *len += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetAlias, -1, NULL, 0); - if (CredentialA->UserName) *len += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->UserName, -1, NULL, 0); - - return; - } - + if (CredentialA->TargetName) + needed += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetName, -1, NULL, 0); + if (CredentialA->Comment) + needed += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->Comment, -1, NULL, 0); + needed += CredentialA->CredentialBlobSize; + if (CredentialA->TargetAlias) + needed += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetAlias, -1, NULL, 0); + if (CredentialA->UserName) + needed += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->UserName, -1, NULL, 0); + + return needed; + } + + buffer = (char *)CredentialW + sizeof(CREDENTIALW); + len -= sizeof(CREDENTIALW); CredentialW->Flags = CredentialA->Flags; CredentialW->Type = CredentialA->Type; if (CredentialA->TargetName) { CredentialW->TargetName = (LPWSTR)buffer; - string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetName, -1, CredentialW->TargetName, 0x7FFFFFFF); + string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetName, -1, CredentialW->TargetName, len / sizeof(WCHAR)); buffer += sizeof(WCHAR) * string_len; - *len += sizeof(WCHAR) * string_len; + needed += sizeof(WCHAR) * string_len; + len -= sizeof(WCHAR) * string_len; } else CredentialW->TargetName = NULL; if (CredentialA->Comment) { CredentialW->Comment = (LPWSTR)buffer; - string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->Comment, -1, CredentialW->Comment, 0x7FFFFFFF); + string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->Comment, -1, CredentialW->Comment, len / sizeof(WCHAR)); buffer += sizeof(WCHAR) * string_len; - *len += sizeof(WCHAR) * string_len; + needed += sizeof(WCHAR) * string_len; + len -= sizeof(WCHAR) * string_len; } else CredentialW->Comment = NULL; @@ -1031,7 +1049,8 @@ memcpy(CredentialW->CredentialBlob, CredentialA->CredentialBlob, CredentialA->CredentialBlobSize); buffer += CredentialA->CredentialBlobSize; - *len += CredentialA->CredentialBlobSize; + needed += CredentialA->CredentialBlobSize; + len -= CredentialA->CredentialBlobSize; } else CredentialW->CredentialBlob = NULL; @@ -1041,21 +1060,23 @@ if (CredentialA->TargetAlias) { CredentialW->TargetAlias = (LPWSTR)buffer; - string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetAlias, -1, CredentialW->TargetAlias, 0x7FFFFFFF); + string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetAlias, -1, CredentialW->TargetAlias, len / sizeof(WCHAR)); buffer += sizeof(WCHAR) * string_len; - *len += sizeof(WCHAR) * string_len; + needed += sizeof(WCHAR) * string_len; + len -= sizeof(WCHAR) * string_len; } else CredentialW->TargetAlias = NULL; if (CredentialA->UserName) { CredentialW->UserName = (LPWSTR)buffer; - string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->UserName, -1, CredentialW->UserName, 0x7FFFFFFF); - buffer += sizeof(WCHAR) * string_len; - *len += sizeof(WCHAR) * string_len; + string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->UserName, -1, CredentialW->UserName, len / sizeof(WCHAR)); + needed += sizeof(WCHAR) * string_len; } else CredentialW->UserName = NULL; + + return needed; } /****************************************************************************** @@ -1161,7 +1182,8 @@ LPWSTR FilterW; PCREDENTIALW *CredentialsW; DWORD i; - DWORD len; + INT len; + INT needed; char *buffer; TRACE("(%s, 0x%x, %p, %p)\n", debugstr_a(Filter), Flags, Count, Credentials); @@ -1189,7 +1211,7 @@ len = *Count * sizeof(PCREDENTIALA); for (i = 0; i < *Count; i++) - convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], NULL, &len); + len += convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], NULL, 0); *Credentials = HeapAlloc(GetProcessHeap(), 0, len); if (!*Credentials) @@ -1200,12 +1222,13 @@ } buffer = (char *)&(*Credentials)[*Count]; + len -= *Count * sizeof(PCREDENTIALA); for (i = 0; i < *Count; i++) { - len = 0; (*Credentials)[i] = (PCREDENTIALA)buffer; - convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], (*Credentials)[i], &len); - buffer += len; + needed = convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], (*Credentials)[i], len); + buffer += needed; + len -= needed; } CredFree(CredentialsW); @@ -1334,7 +1357,7 @@ { LPWSTR TargetNameW; PCREDENTIALW CredentialW; - DWORD len; + INT len; TRACE("(%s, %d, 0x%x, %p)\n", debugstr_a(TargetName), Type, Flags, Credential); @@ -1360,16 +1383,14 @@ } HeapFree(GetProcessHeap(), 0, TargetNameW); - len = 0; - convert_PCREDENTIALW_to_PCREDENTIALA(CredentialW, NULL, &len); + len = convert_PCREDENTIALW_to_PCREDENTIALA(CredentialW, NULL, 0); *Credential = HeapAlloc(GetProcessHeap(), 0, len); if (!*Credential) { SetLastError(ERROR_OUTOFMEMORY); return FALSE; } - len = 0; - convert_PCREDENTIALW_to_PCREDENTIALA(CredentialW, *Credential, &len); + convert_PCREDENTIALW_to_PCREDENTIALA(CredentialW, *Credential, len); CredFree(CredentialW); @@ -1540,7 +1561,7 @@ BOOL WINAPI CredWriteA(PCREDENTIALA Credential, DWORD Flags) { BOOL ret; - DWORD len; + INT len; PCREDENTIALW CredentialW; TRACE("(%p, 0x%x)\n", Credential, Flags); @@ -1551,16 +1572,15 @@ return FALSE; } - len = 0; - convert_PCREDENTIALA_to_PCREDENTIALW(Credential, NULL, &len); + len = convert_PCREDENTIALA_to_PCREDENTIALW(Credential, NULL, 0); CredentialW = HeapAlloc(GetProcessHeap(), 0, len); if (!CredentialW) { SetLastError(ERROR_OUTOFMEMORY); return FALSE; } - len = 0; - convert_PCREDENTIALA_to_PCREDENTIALW(Credential, CredentialW, &len); + + convert_PCREDENTIALA_to_PCREDENTIALW(Credential, CredentialW, len); ret = CredWriteW(CredentialW, Flags); @@ -1722,7 +1742,7 @@ DWORD Flags, DWORD *Size, PCREDENTIALA **Credentials) { PCREDENTIAL_TARGET_INFORMATIONW TargetInformationW; - DWORD len, i; + INT len, i; WCHAR *buffer, *end; BOOL ret; PCREDENTIALW* CredentialsW; @@ -1831,10 +1851,11 @@ if (ret) { char *buf; + INT needed; len = *Size * sizeof(PCREDENTIALA); for (i = 0; i < *Size; i++) - convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], NULL, &len); + len += convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], NULL, 0); *Credentials = HeapAlloc(GetProcessHeap(), 0, len); if (!*Credentials) @@ -1845,12 +1866,13 @@ } buf = (char *)&(*Credentials)[*Size]; + len -= *Size * sizeof(PCREDENTIALA); for (i = 0; i < *Size; i++) { - len = 0; (*Credentials)[i] = (PCREDENTIALA)buf; - convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], (*Credentials)[i], &len); - buf += len; + needed = convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], (*Credentials)[i], len); + buf += needed; + len -= needed; } CredFree(CredentialsW);

1 0

[gschneider] 43441: [spider] - Check for completed stack after dealing cards by installing one function to do this in call three cases, bug #4886 - Fix and simplify drop rules (only by number) and validation rules (by number and type) for two and four color games - Fix typo in Polish Translation
by gschneider＠svn.reactos.org 13 Oct '09

13 Oct '09

Author: gschneider Date: Tue Oct 13 22:34:05 2009 New Revision: 43441 URL: http://svn.reactos.org/svn/reactos?rev=43441&view=rev Log: [spider] - Check for completed stack after dealing cards by installing one function to do this in call three cases, bug #4886 - Fix and simplify drop rules (only by number) and validation rules (by number and type) for two and four color games - Fix typo in Polish Translation Modified: trunk/reactos/base/applications/games/spider/lang/pl-PL.rc trunk/reactos/base/applications/games/spider/spigame.cpp Modified: trunk/reactos/base/applications/games/spider/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/lang/pl-PL.rc [iso-8859-1] Tue Oct 13 22:34:05 2009 @@ -1,7 +1,7 @@ /* * PROJECT: Spider Solitaire * LICENSE: See COPYING in top level directory - * FILE: base/applications/games/spider/lang/en-US.rc + * FILE: base/applications/games/spider/lang/pl-PL.rc * PURPOSE: Polish Language File for Spider Solitaire * TRANSLATOR: Maciej Bialas */ Modified: trunk/reactos/base/applications/games/spider/spigame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] Tue Oct 13 22:34:05 2009 @@ -98,13 +98,44 @@ fGameStarted = false; } +bool stackLookingGood(const CardStack &mystack, int numChecks) +{ + int i; + for (i = 0; i < numChecks; i++) + { + if (mystack[i].LoVal() != mystack[i + 1].LoVal() - 1) + { + return false; + } + if (mystack[i].Suit() != mystack[i + 1].Suit()) + { + return false; + } + } + return true; +} + +/* Card to be turned from a stack */ +void TurnStackCard(CardRegion &stackobj) +{ + int numfacedown; + + stackobj.GetFaceDirection(&numfacedown); + if (stackobj.NumCards() <= numfacedown) + { + if (numfacedown > 0) numfacedown--; + stackobj.SetFaceDirection(CS_FACE_DOWNUP, numfacedown); + stackobj.Redraw(); + } +} + /* Click on the deck */ void CARDLIBPROC DeckClickProc(CardRegion &stackobj, int NumDragCards) { CardStack temp, fakeDeck = pDeck->GetCardStack(); fGameStarted = true; - int i; - + int i, j, facedown, faceup; + if (fakeDeck.NumCards() != 0 && deck.NumCards() != 0) { /* Add one card to every stack */ @@ -112,6 +143,25 @@ { temp = pStack[i]->GetCardStack(); temp.Push(deck.Pop()); + + /* Check if we accidentally finished a row */ + pStack[i]->GetFaceDirection(&facedown); + faceup = temp.NumCards() - facedown; + if (faceup >= NUM_ONECOLOR_CARDS) + { + /* Check stack finished, remove cards if so */ + if (stackLookingGood(temp, NUM_ONECOLOR_CARDS - 1)) + { + for (j = 0; j < NUM_ONECOLOR_CARDS; j++) + { + temp.RemoveCard(0); + } + cardsFinished += NUM_ONECOLOR_CARDS; + pStack[i]->SetCardStack(temp); + /* Turn now topmost card */ + TurnStackCard(*pStack[i]); + } + } pStack[i]->SetCardStack(temp); } /* Remove one card from the fake ones */ @@ -124,7 +174,7 @@ /* Cards dragged from a stack */ bool CARDLIBPROC StackDragProc(CardRegion &stackobj, int numDragCards) { - int numfacedown, numcards, i; + int numfacedown, numcards; stackobj.GetFaceDirection(&numfacedown); numcards = stackobj.NumCards(); @@ -134,30 +184,9 @@ { const CardStack &mystack = stackobj.GetCardStack(); /* Don't allow to drag unsuited cards */ - for (i = 0; i < numDragCards - 1; i++) - { - if (mystack[i].LoVal() != mystack[i + 1].LoVal() - 1) - { - return false; - } - switch (dwDifficulty) - { - case IDC_DIF_ONECOLOR: - break; - case IDC_DIF_TWOCOLORS: - if ((mystack[i].IsBlack() && mystack[i + 1].IsBlack()) || - (mystack[i].IsRed() && mystack[i + 1].IsRed())) - { - return false; - } - break; - case IDC_DIF_FOURCOLORS: - if (mystack[i].Suit() != mystack[i + 1].Suit()) - { - return false; - } - break; - } + if (!stackLookingGood(mystack, numDragCards - 1)) + { + return false; } /* Remember where the cards come from */ from = &stackobj; @@ -193,20 +222,6 @@ } } -/* Card to be turned from a stack */ -void TurnStackCard(CardRegion &stackobj) -{ - int numfacedown; - - stackobj.GetFaceDirection(&numfacedown); - if (stackobj.NumCards() <= numfacedown) - { - if (numfacedown > 0) numfacedown--; - stackobj.SetFaceDirection(CS_FACE_DOWNUP, numfacedown); - stackobj.Redraw(); - } -} - /* Cards dropped to a stack */ bool CARDLIBPROC StackDropProc(CardRegion &stackobj, CardStack &dragcards) { @@ -230,49 +245,20 @@ return false; } - /* Can only drop if card matches colour rule */ - switch (dwDifficulty) - { - case IDC_DIF_ONECOLOR: - break; - case IDC_DIF_TWOCOLORS: - if ((mystack[0].IsBlack() && dragcard.IsRed()) || - (mystack[0].IsRed() && dragcard.IsBlack())) - { - return false; - } - break; - case IDC_DIF_FOURCOLORS: - if (mystack[0].Suit() != dragcard.Suit()) - { - return false; - } - break; - } /* Check if stack complete */ stackobj.GetFaceDirection(&facedown); faceup = stackobj.NumCards() - facedown; - + if (faceup + dragcards.NumCards() >= NUM_ONECOLOR_CARDS) { int i, max = NUM_ONECOLOR_CARDS - dragcards.NumCards() - 1; - BOOL remove = true; - - /* Dragged cards have been checked to be in order, start with the first stack card */ - for (i = 0; i < max; i++) - { - if (mystack[i].Suit() != mystack[i + 1].Suit() || - mystack[i].LoVal() != mystack[i + 1].LoVal() - 1) - { - remove = false; - break; - } - } - if (remove) + + /* Dragged cards have been checked to be in order, check stack cards */ + if (stackLookingGood(mystack, max)) { CardStack s = stackobj.GetCardStack(); CardStack f; - + /* Remove from card stack */ for (i = 0; i < max + 1; i++) {

1 0

[sginsberg] 43440: - Add the MMDBG_COPY_* flags and MmDbgCopyMemory's prototype. - Add KdpCopyMemoryChunks and use it to handle virtual memory read/write (physical memory support still stubbed). The actual copy is still a hack and its only safeguard against invalid memory is still a simple check for NULL. - Properly implement KdpReadVirtualMemory, KdpWriteVirtualMemory, KdpReadPhysicalmemory and KdpWritePhysicalmemory using KdpCopyMemoryChunks. - Merge Timo's ReportFlags fix from the AMD64 branc
by sginsberg＠svn.reactos.org 13 Oct '09

13 Oct '09

Author: sginsberg Date: Tue Oct 13 21:45:40 2009 New Revision: 43440 URL: http://svn.reactos.org/svn/reactos?rev=43440&view=rev Log: - Add the MMDBG_COPY_* flags and MmDbgCopyMemory's prototype. - Add KdpCopyMemoryChunks and use it to handle virtual memory read/write (physical memory support still stubbed). The actual copy is still a hack and its only safeguard against invalid memory is still a simple check for NULL. - Properly implement KdpReadVirtualMemory, KdpWriteVirtualMemory, KdpReadPhysicalmemory and KdpWritePhysicalmemory using KdpCopyMemoryChunks. - Merge Timo's ReportFlags fix from the AMD64 branch. - Implement KdpSysWriteMsr and KdpSysReadMsr for x86. SEH is commented as our GPF handler seems to swallow exceptions caused by accessing invalid MSRs. - Change DataValue parameter of KdpSysReadIoSpace and KdpSysWriteIoSpace to PVOID to better match how it is used. Modified: trunk/reactos/ntoskrnl/include/internal/kd64.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/kd64/amd64/kdsup.c trunk/reactos/ntoskrnl/kd64/arm/kdsup.c trunk/reactos/ntoskrnl/kd64/i386/kdsup.c trunk/reactos/ntoskrnl/kd64/kdapi.c Modified: trunk/reactos/ntoskrnl/include/internal/kd64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] Tue Oct 13 21:45:40 2009 @@ -374,7 +374,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize ); @@ -386,7 +386,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize ); Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Tue Oct 13 21:45:40 2009 @@ -192,87 +192,6 @@ /* INTERNAL KERNEL FUNCTIONS ************************************************/ -/* Finds a new thread to run */ -NTSTATUS -FASTCALL -KiSwapThread( - IN PKTHREAD Thread, - IN PKPRCB Prcb -); - -VOID -NTAPI -KeReadyThread( - IN PKTHREAD Thread -); - -BOOLEAN -NTAPI -KeSetDisableBoostThread( - IN OUT PKTHREAD Thread, - IN BOOLEAN Disable -); - -VOID -NTAPI -KeBalanceSetManager(IN PVOID Context); - -VOID -NTAPI -KiReadyThread(IN PKTHREAD Thread); - -ULONG -NTAPI -KeSuspendThread(PKTHREAD Thread); - -BOOLEAN -NTAPI -KeReadStateThread(IN PKTHREAD Thread); - -BOOLEAN -FASTCALL -KiSwapContext( - IN PKTHREAD CurrentThread, - IN PKTHREAD NewThread -); - -VOID -NTAPI -KiAdjustQuantumThread(IN PKTHREAD Thread); - -VOID -FASTCALL -KiExitDispatcher(KIRQL OldIrql); - -VOID -FASTCALL -KiDeferredReadyThread(IN PKTHREAD Thread); - -PKTHREAD -FASTCALL -KiIdleSchedule( - IN PKPRCB Prcb -); - -VOID -FASTCALL -KiProcessDeferredReadyList( - IN PKPRCB Prcb -); - -KAFFINITY -FASTCALL -KiSetAffinityThread( - IN PKTHREAD Thread, - IN KAFFINITY Affinity -); - -PKTHREAD -FASTCALL -KiSelectNextThread( - IN PKPRCB Prcb -); - VOID NTAPI CPUID( @@ -281,6 +200,100 @@ OUT PULONG CpuInfoEbx, OUT PULONG CpuInfoEcx, OUT PULONG CpuInfoEdx +); + +LONGLONG +FASTCALL +RDMSR( + IN ULONG Register +); + +VOID +NTAPI +WRMSR( + IN ULONG Register, + IN LONGLONG Value +); + +/* Finds a new thread to run */ +NTSTATUS +FASTCALL +KiSwapThread( + IN PKTHREAD Thread, + IN PKPRCB Prcb +); + +VOID +NTAPI +KeReadyThread( + IN PKTHREAD Thread +); + +BOOLEAN +NTAPI +KeSetDisableBoostThread( + IN OUT PKTHREAD Thread, + IN BOOLEAN Disable +); + +VOID +NTAPI +KeBalanceSetManager(IN PVOID Context); + +VOID +NTAPI +KiReadyThread(IN PKTHREAD Thread); + +ULONG +NTAPI +KeSuspendThread(PKTHREAD Thread); + +BOOLEAN +NTAPI +KeReadStateThread(IN PKTHREAD Thread); + +BOOLEAN +FASTCALL +KiSwapContext( + IN PKTHREAD CurrentThread, + IN PKTHREAD NewThread +); + +VOID +NTAPI +KiAdjustQuantumThread(IN PKTHREAD Thread); + +VOID +FASTCALL +KiExitDispatcher(KIRQL OldIrql); + +VOID +FASTCALL +KiDeferredReadyThread(IN PKTHREAD Thread); + +PKTHREAD +FASTCALL +KiIdleSchedule( + IN PKPRCB Prcb +); + +VOID +FASTCALL +KiProcessDeferredReadyList( + IN PKPRCB Prcb +); + +KAFFINITY +FASTCALL +KiSetAffinityThread( + IN PKTHREAD Thread, + IN KAFFINITY Affinity +); + +PKTHREAD +FASTCALL +KiSelectNextThread( + IN PKPRCB Prcb ); BOOLEAN @@ -1006,13 +1019,6 @@ NTAPI KiI386PentiumLockErrataFixup(VOID); -VOID -NTAPI -WRMSR( - IN ULONG Register, - IN LONGLONG Value -); - BOOLEAN NTAPI KeFreezeExecution(IN PKTRAP_FRAME TrapFrame, Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Tue Oct 13 21:45:40 2009 @@ -29,6 +29,22 @@ struct _MM_PAGEOP; typedef ULONG SWAPENTRY; typedef ULONG PFN_TYPE, *PPFN_TYPE; + +// +//MmDbgCopyMemory Flags +// +#define MMDBG_COPY_WRITE 0x00000001 +#define MMDBG_COPY_PHYSICAL 0x00000002 +#define MMDBG_COPY_UNSAFE 0x00000004 +#define MMDBG_COPY_CACHED 0x00000008 +#define MMDBG_COPY_UNCACHED 0x00000010 +#define MMDBG_COPY_WRITE_COMBINED 0x00000020 + +// +// Maximum chunk size per copy +// +#define MMDBG_COPY_MAX_SIZE 0x8 + #define MI_STATIC_MEMORY_AREAS (8) @@ -455,6 +471,18 @@ BOOLEAN Dirty ); +// +// Mm copy support for Kd +// +NTSTATUS +NTAPI +MmDbgCopyMemory( + IN ULONG64 Address, + IN PVOID Buffer, + IN ULONG Size, + IN ULONG Flags +); + /* marea.c *******************************************************************/ NTSTATUS Modified: trunk/reactos/ntoskrnl/kd64/amd64/kdsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/amd64/kdsup.… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] Tue Oct 13 21:45:40 2009 @@ -125,7 +125,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize) { @@ -140,7 +140,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize) { Modified: trunk/reactos/ntoskrnl/kd64/arm/kdsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/arm/kdsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/arm/kdsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/arm/kdsup.c [iso-8859-1] Tue Oct 13 21:45:40 2009 @@ -125,7 +125,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize) { @@ -140,7 +140,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize) { Modified: trunk/reactos/ntoskrnl/kd64/i386/kdsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/i386/kdsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/i386/kdsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/i386/kdsup.c [iso-8859-1] Tue Oct 13 21:45:40 2009 @@ -95,7 +95,7 @@ WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_SEGS; if (WaitStateChange->ControlReport.SegCs == KGDT_R0_CODE) { - WaitStateChange->ControlReport.ReportFlags = REPORT_STANDARD_CS; + WaitStateChange->ControlReport.ReportFlags |= REPORT_STANDARD_CS; } } @@ -104,9 +104,21 @@ KdpSysReadMsr(IN ULONG Msr, OUT PLARGE_INTEGER MsrValue) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; + /* Wrap this in SEH in case the MSR doesn't exist */ + //_SEH2_TRY + { + /* Read from the MSR */ + MsrValue->QuadPart = RDMSR(Msr); + } + //_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Invalid MSR */ + //_SEH2_YIELD(return STATUS_NO_SUCH_DEVICE); + } + //_SEH2_END; + + /* Success */ + return STATUS_SUCCESS; } NTSTATUS @@ -114,9 +126,21 @@ KdpSysWriteMsr(IN ULONG Msr, IN PLARGE_INTEGER MsrValue) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; + /* Wrap this in SEH in case the MSR doesn't exist */ + //_SEH2_TRY + { + /* Write to the MSR */ + WRMSR(Msr, MsrValue->QuadPart); + } + //_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Invalid MSR */ + //_SEH2_YIELD(return STATUS_NO_SUCH_DEVICE); + } + //_SEH2_END; + + /* Success */ + return STATUS_SUCCESS; } NTSTATUS @@ -228,7 +252,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize) { @@ -243,7 +267,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize) { Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Tue Oct 13 21:45:40 2009 @@ -13,6 +13,76 @@ #include <debug.h> /* PRIVATE FUNCTIONS *********************************************************/ + +NTSTATUS +NTAPI +KdpCopyMemoryChunks(IN ULONG64 Address, + IN PVOID Buffer, + IN ULONG TotalSize, + IN ULONG ChunkSize, + IN ULONG Flags, + OUT PULONG ActualSize OPTIONAL) +{ + ULONG Length; + NTSTATUS Status; + + /* Check if this is physical or virtual copy */ + if (Flags & MMDBG_COPY_PHYSICAL) + { + /* Fail physical memory read/write for now */ + if (Flags & MMDBG_COPY_WRITE) + { + KdpDprintf("KdpCopyMemoryChunks: Failing write for Physical Address 0x%I64x Length: %x\n", + Address, + TotalSize); + } + else + { + KdpDprintf("KdpCopyMemoryChunks: Failing read for Physical Address 0x%I64x Length: %x\n", + Address, + TotalSize); + } + + /* Return an error */ + Length = 0; + Status = STATUS_UNSUCCESSFUL; + } + else + { + /* Protect against NULL */ + if (!Address) + { + if (ActualSize) *ActualSize = 0; + return STATUS_UNSUCCESSFUL; + } + + /* Check if this is read or write */ + if (Flags & MMDBG_COPY_WRITE) + { + /* Do the write */ + RtlCopyMemory((PVOID)(ULONG_PTR)Address, + Buffer, + TotalSize); + } + else + { + /* Do the read */ + RtlCopyMemory(Buffer, + (PVOID)(ULONG_PTR)Address, + TotalSize); + } + + /* Set size and status */ + Length = TotalSize; + Status = STATUS_SUCCESS; + } + + /* Return the actual length if requested */ + if (ActualSize) *ActualSize = Length; + + /* Return status */ + return Status; +} VOID NTAPI @@ -264,9 +334,14 @@ IN PSTRING Data, IN PCONTEXT Context) { - STRING Header; - ULONG Length = State->u.ReadMemory.TransferCount; - NTSTATUS Status = STATUS_SUCCESS; + PDBGKD_READ_MEMORY64 ReadMemory = &State->u.ReadMemory; + STRING Header; + ULONG Length = ReadMemory->TransferCount; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + ASSERT(Data->Length == 0); /* Validate length */ if (Length > (PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64))) @@ -275,35 +350,16 @@ Length = PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64); } -#if 0 - if (!MmIsAddressValid((PVOID)(ULONG_PTR)State->u.ReadMemory.TargetBaseAddress)) - { - KdpDprintf("Tried to read invalid address %p\n", - (PVOID)(ULONG_PTR)State->u.ReadMemory.TargetBaseAddress); - while (TRUE); - } -#endif - - if (!State->u.ReadMemory.TargetBaseAddress) - { - Length = 0; - Status = STATUS_UNSUCCESSFUL; - } - else - { - RtlCopyMemory(Data->Buffer, - (PVOID)(ULONG_PTR)State->u.ReadMemory.TargetBaseAddress, - Length); - } - - /* Fill out the header */ - Data->Length = Length; - Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); - Header.Buffer = (PCHAR)State; - - /* Fill out the state */ - State->ReturnStatus = Status; - State->u.ReadMemory.ActualBytesRead = Length; + /* Do the read */ + State->ReturnStatus = KdpCopyMemoryChunks(ReadMemory->TargetBaseAddress, + Data->Buffer, + Length, + 0, + MMDBG_COPY_UNSAFE, + &Length); + + /* Return the actual length read */ + Data->Length = ReadMemory->ActualBytesRead = Length; /* Send the packet */ KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, @@ -318,11 +374,27 @@ IN PSTRING Data, IN PCONTEXT Context) { - /* FIXME: STUB */ - KdpDprintf("KdpWriteVirtualMemory called for Address: %p Length %x\n", - (PVOID)(ULONG_PTR)State->u.ReadMemory.TargetBaseAddress, - State->u.ReadMemory.TransferCount); - while (TRUE); + PDBGKD_WRITE_MEMORY64 WriteMemory = &State->u.WriteMemory; + STRING Header; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + + /* Do the write */ + State->ReturnStatus = KdpCopyMemoryChunks(WriteMemory->TargetBaseAddress, + Data->Buffer, + Data->Length, + 0, + MMDBG_COPY_UNSAFE | + MMDBG_COPY_WRITE, + &WriteMemory->ActualBytesWritten); + + /* Send the packet */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + NULL, + &KdpContext); } VOID @@ -331,20 +403,56 @@ IN PSTRING Data, IN PCONTEXT Context) { - STRING Header; - - /* FIXME: STUB */ - KdpDprintf("KdpWritePhysicalMemory called for Address %I64x Length: %x\n", - State->u.ReadMemory.TargetBaseAddress, - State->u.ReadMemory.TransferCount); - - /* Setup an empty message, with failure */ - Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); - Header.Buffer = (PCHAR)State; - Data->Length = 0; - State->ReturnStatus = STATUS_UNSUCCESSFUL; - - /* Send it */ + PDBGKD_READ_MEMORY64 ReadMemory = &State->u.ReadMemory; + STRING Header; + ULONG Length = ReadMemory->TransferCount; + ULONG Flags, CacheFlags; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + ASSERT(Data->Length == 0); + + /* Validate length */ + if (Length > (PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64))) + { + /* Overflow, set it to maximum possible */ + Length = PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64); + } + + /* Start with the default flags */ + Flags = MMDBG_COPY_UNSAFE | MMDBG_COPY_PHYSICAL; + + /* Get the caching flags and check if a type is specified */ + CacheFlags = ReadMemory->ActualBytesRead; + if (CacheFlags == DBGKD_CACHING_CACHED) + { + /* Cached */ + Flags |= MMDBG_COPY_CACHED; + } + else if (CacheFlags == DBGKD_CACHING_UNCACHED) + { + /* Uncached */ + Flags |= MMDBG_COPY_UNCACHED; + } + else if (CacheFlags == DBGKD_CACHING_UNCACHED) + { + /* Write Combined */ + Flags |= DBGKD_CACHING_WRITE_COMBINED; + } + + /* Do the read */ + State->ReturnStatus = KdpCopyMemoryChunks(ReadMemory->TargetBaseAddress, + Data->Buffer, + Length, + 0, + Flags, + &Length); + + /* Return the actual length read */ + Data->Length = ReadMemory->ActualBytesRead = Length; + + /* Send the packet */ KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, &Header, Data, @@ -357,23 +465,47 @@ IN PSTRING Data, IN PCONTEXT Context) { - STRING Header; - - /* FIXME: STUB */ - KdpDprintf("KdpWritePhysicalMemory called for Address %I64x Length: %x\n", - State->u.ReadMemory.TargetBaseAddress, - State->u.ReadMemory.TransferCount); - - /* Setup an empty message, with failure */ - Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); - Header.Buffer = (PCHAR)State; - Data->Length = 0; - State->ReturnStatus = STATUS_UNSUCCESSFUL; - - /* Send it */ - KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, - &Header, - Data, + PDBGKD_WRITE_MEMORY64 WriteMemory = &State->u.WriteMemory; + STRING Header; + ULONG Flags, CacheFlags; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + + /* Start with the default flags */ + Flags = MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE | MMDBG_COPY_PHYSICAL; + + /* Get the caching flags and check if a type is specified */ + CacheFlags = WriteMemory->ActualBytesWritten; + if (CacheFlags == DBGKD_CACHING_CACHED) + { + /* Cached */ + Flags |= MMDBG_COPY_CACHED; + } + else if (CacheFlags == DBGKD_CACHING_UNCACHED) + { + /* Uncached */ + Flags |= MMDBG_COPY_UNCACHED; + } + else if (CacheFlags == DBGKD_CACHING_UNCACHED) + { + /* Write Combined */ + Flags |= DBGKD_CACHING_WRITE_COMBINED; + } + + /* Do the write */ + State->ReturnStatus = KdpCopyMemoryChunks(WriteMemory->TargetBaseAddress, + Data->Buffer, + Data->Length, + 0, + Flags, + &WriteMemory->ActualBytesWritten); + + /* Send the packet */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + NULL, &KdpContext); } @@ -425,7 +557,6 @@ { PDBGKD_WRITE_MEMORY64 WriteMemory = &State->u.WriteMemory; STRING Header; - ULONG Length; /* Setup the header */ Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); @@ -436,10 +567,7 @@ WriteMemory->TargetBaseAddress, Data->Buffer, Data->Length, - &Length); - - /* Return the length written */ - WriteMemory->ActualBytesWritten = Length; + &WriteMemory->ActualBytesWritten); /* Send the reply */ KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, @@ -835,7 +963,7 @@ Header.Buffer = (PCHAR)State; /* Call the internal routine */ - State->ReturnStatus = KdpSysCheckLowMemory(0x4); + State->ReturnStatus = KdpSysCheckLowMemory(MMDBG_COPY_UNSAFE); /* Send the reply */ KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,

1 0

[dgorbachev] 43439: - See if it is a multibyte code page. - Remove check against zero. - Fix comments, formatting.
by dgorbachev＠svn.reactos.org 13 Oct '09

13 Oct '09

Author: dgorbachev Date: Tue Oct 13 20:43:42 2009 New Revision: 43439 URL: http://svn.reactos.org/svn/reactos?rev=43439&view=rev Log: - See if it is a multibyte code page. - Remove check against zero. - Fix comments, formatting. Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=4343… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Tue Oct 13 20:43:42 2009 @@ -401,40 +401,52 @@ /* * @implemented - * + * * NOTES - * Check the oem-string to match the uincoded-string. - * - * Functions who convert unicode strings to oem strings will set a DefaultChar from - * the OemCodepage when the character are unknown. So check it against the unicode string - * and return false when the unicode string not contain an TransDefaultChar. + * Check the OEM string to match the Unicode string. + * + * Functions which convert Unicode strings to OEM strings will set a + * DefaultChar from the OEM codepage when the characters are unknown. + * So check it against the Unicode string and return false when the + * Unicode string does not contain a TransDefaultChar. */ BOOLEAN NTAPI RtlpDidUnicodeToOemWork(IN PCUNICODE_STRING UnicodeString, IN POEM_STRING OemString) { - ULONG i = 0; - - /* Go through all characters of a string */ - while (i < OemString->Length) - { - /* Check if it got translated into '?', but source char - wasn't '?' equivalent */ - if ((OemString->Buffer[i] != 0) && - (OemString->Buffer[i] == NlsOemDefaultChar) && - (UnicodeString->Buffer[i] != NlsUnicodeDefaultChar)) - { - /* Yes, it means unmappable characters were found */ - return FALSE; - } - - /* Move to the next char */ - i++; - } - - /* All chars were translated successfuly */ - return TRUE; + ULONG i = 0; + + if (NlsMbOemCodePageTag == FALSE) + { + /* single-byte code page */ + /* Go through all characters of a string */ + while (i < OemString->Length) + { + /* Check if it got translated into a default char, + * but source char wasn't a default char equivalent + */ + if ((OemString->Buffer[i] == NlsOemDefaultChar) && + (UnicodeString->Buffer[i] != NlsUnicodeDefaultChar)) + { + /* Yes, it means unmappable characters were found */ + return FALSE; + } + + /* Move to the next char */ + i++; + } + + /* All chars were translated successfuly */ + return TRUE; + } + else + { + /* multibyte code page */ + + /* FIXME */ + return TRUE; + } } /*

1 0

[fireball] 43438: [rtl] - Fix an out-of-bounds read in RtlpDidUnicodeToOemWorked. See issue #4888 for more details.
by fireball＠svn.reactos.org 13 Oct '09

13 Oct '09

Author: fireball Date: Tue Oct 13 20:01:55 2009 New Revision: 43438 URL: http://svn.reactos.org/svn/reactos?rev=43438&view=rev Log: [rtl] - Fix an out-of-bounds read in RtlpDidUnicodeToOemWorked. See issue #4888 for more details. Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=4343… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Tue Oct 13 20:01:55 2009 @@ -417,12 +417,12 @@ ULONG i = 0; /* Go through all characters of a string */ - while ((OemString->Buffer[i] != 0) && - (i < OemString->Length)) + while (i < OemString->Length) { /* Check if it got translated into '?', but source char wasn't '?' equivalent */ - if ((OemString->Buffer[i] == NlsOemDefaultChar) && + if ((OemString->Buffer[i] != 0) && + (OemString->Buffer[i] == NlsOemDefaultChar) && (UnicodeString->Buffer[i] != NlsUnicodeDefaultChar)) { /* Yes, it means unmappable characters were found */

1 0

[janderwald] 43437: - Fix various bugs such as wrong function definitions, using of uninitialized variables - Add macros which are not present in the WDK - Check return type of synchronized interrupt routine - Use PcHandlePropertyWithTable IPortPinWavePci - Remove IServiceSink implementation from IPortWaveRt as it is a hack - Add a small hack to IResource list implementation as prefast doesnt find decl of NumberOfEntries - Fix build
by janderwald＠svn.reactos.org 13 Oct '09

13 Oct '09

Author: janderwald Date: Tue Oct 13 14:29:41 2009 New Revision: 43437 URL: http://svn.reactos.org/svn/reactos?rev=43437&view=rev Log: - Fix various bugs such as wrong function definitions, using of uninitialized variables - Add macros which are not present in the WDK - Check return type of synchronized interrupt routine - Use PcHandlePropertyWithTable IPortPinWavePci - Remove IServiceSink implementation from IPortWaveRt as it is a hack - Add a small hack to IResource list implementation as prefast doesnt find decl of NumberOfEntries - Fix build Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/api.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/api.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/api.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/api.cpp [iso-8859-1] Tue Oct 13 14:29:41 2009 @@ -238,8 +238,8 @@ PcDmaSlaveDescription( IN PRESOURCELIST ResourceList OPTIONAL, IN ULONG DmaIndex, - IN BOOL DemandMode, - IN ULONG AutoInitialize, + IN BOOLEAN DemandMode, + IN BOOLEAN AutoInitialize, IN DMA_SPEED DmaSpeed, IN ULONG MaximumLength, IN ULONG DmaPort, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp [iso-8859-1] Tue Oct 13 14:29:41 2009 @@ -156,7 +156,7 @@ IN PUNICODE_STRING ToString, IN ULONG ToPin) { - PSUBDEVICE_DESCRIPTOR FromSubDeviceDescriptor, ToSubDeviceDescriptor; + PSUBDEVICE_DESCRIPTOR FromSubDeviceDescriptor = NULL, ToSubDeviceDescriptor = NULL; PSYMBOLICLINK_ENTRY SymEntry; ISubdevice * FromSubDevice = NULL, *ToSubDevice = NULL; NTSTATUS Status; @@ -205,35 +205,49 @@ } - FromEntry = (PPHYSICAL_CONNECTION_ENTRY)AllocateItem(NonPagedPool, sizeof(PHYSICAL_CONNECTION_ENTRY) + ToString->MaximumLength, TAG_PORTCLASS); - if (!FromEntry) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto cleanup; - } - - ToEntry = (PPHYSICAL_CONNECTION_ENTRY)AllocateItem(NonPagedPool, sizeof(PHYSICAL_CONNECTION_ENTRY) + FromString->MaximumLength, TAG_PORTCLASS); - if (!ToEntry) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto cleanup; - } - - FromEntry->FromPin = FromPin; - FromEntry->Connection.Pin = ToPin; - FromEntry->Connection.Size = sizeof(KSPIN_PHYSICALCONNECTION) + ToString->MaximumLength; - RtlMoveMemory(&FromEntry->Connection.SymbolicLinkName, ToString->Buffer, ToString->MaximumLength); - FromEntry->Connection.SymbolicLinkName[ToString->Length / sizeof(WCHAR)] = L'\0'; - - ToEntry->FromPin = ToPin; - ToEntry->Connection.Pin = FromPin; - ToEntry->Connection.Size = sizeof(KSPIN_PHYSICALCONNECTION) + FromString->MaximumLength; - RtlMoveMemory(&ToEntry->Connection.SymbolicLinkName, FromString->Buffer, FromString->MaximumLength); - ToEntry->Connection.SymbolicLinkName[FromString->Length / sizeof(WCHAR)] = L'\0'; - - - InsertTailList(&FromSubDeviceDescriptor->PhysicalConnectionList, &FromEntry->Entry); - InsertTailList(&ToSubDeviceDescriptor->PhysicalConnectionList, &ToEntry->Entry); + if (FromSubDeviceDescriptor) + { + FromEntry = (PPHYSICAL_CONNECTION_ENTRY)AllocateItem(NonPagedPool, sizeof(PHYSICAL_CONNECTION_ENTRY) + ToString->MaximumLength, TAG_PORTCLASS); + if (!FromEntry) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + } + + if (ToSubDeviceDescriptor) + { + ToEntry = (PPHYSICAL_CONNECTION_ENTRY)AllocateItem(NonPagedPool, sizeof(PHYSICAL_CONNECTION_ENTRY) + FromString->MaximumLength, TAG_PORTCLASS); + if (!ToEntry) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + } + + if (FromSubDeviceDescriptor) + { + FromEntry->FromPin = FromPin; + FromEntry->Connection.Pin = ToPin; + FromEntry->Connection.Size = sizeof(KSPIN_PHYSICALCONNECTION) + ToString->MaximumLength; + RtlMoveMemory(&FromEntry->Connection.SymbolicLinkName, ToString->Buffer, ToString->MaximumLength); + FromEntry->Connection.SymbolicLinkName[ToString->Length / sizeof(WCHAR)] = L'\0'; + + InsertTailList(&FromSubDeviceDescriptor->PhysicalConnectionList, &FromEntry->Entry); + } + + + if (ToSubDeviceDescriptor) + { + ToEntry->FromPin = ToPin; + ToEntry->Connection.Pin = FromPin; + ToEntry->Connection.Size = sizeof(KSPIN_PHYSICALCONNECTION) + FromString->MaximumLength; + RtlMoveMemory(&ToEntry->Connection.SymbolicLinkName, FromString->Buffer, FromString->MaximumLength); + ToEntry->Connection.SymbolicLinkName[FromString->Length / sizeof(WCHAR)] = L'\0'; + + InsertTailList(&ToSubDeviceDescriptor->PhysicalConnectionList, &ToEntry->Entry); + + } return STATUS_SUCCESS; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] Tue Oct 13 14:29:41 2009 @@ -679,6 +679,10 @@ #undef INTERFACE #define INTERFACE IPortFilterWaveRT +#ifndef PPORTWAVERT +typedef IPortWaveRT *PPORTWAVERT; +#endif + DECLARE_INTERFACE_(IPortFilterWaveRT, IIrpTarget) { DEFINE_ABSTRACT_UNKNOWN() @@ -966,7 +970,7 @@ { DEFINE_ABSTRACT_UNKNOWN() DEFINE_ABSTRACT_DMACHANNEL_EX() - DEFINE_ABSTRACT_DMACHANNELSLAVE() + //DEFINE_ABSTRACT_DMACHANNELSLAVE() STDMETHOD_(NTSTATUS, Init)( THIS_ IN PDEVICE_DESCRIPTION DeviceDescription, @@ -1103,4 +1107,15 @@ IN ULONG Index \ ) +#ifndef IMP_IPortClsVersion + +#define IMP_IPortClsVersion \ + STDMETHODIMP_(DWORD) GetVersion(void); + #endif + +#ifdef IMP_IPortWaveRT +#define IMP_IPortWaveRT IMP_IPort +#endif + +#endif Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp [iso-8859-1] Tue Oct 13 14:29:41 2009 @@ -97,8 +97,10 @@ IN PVOID ServiceContext) { CInterruptSync * This = (CInterruptSync*)ServiceContext; - DPRINT("CInterruptSynchronizedRoutine this %p SyncRoutine %p Context %p\n", This, This->m_SyncRoutine, This->m_DynamicContext); - return This->m_SyncRoutine(This, This->m_DynamicContext); + NTSTATUS Status = This->m_SyncRoutine(This, This->m_DynamicContext); + + DPRINT("CInterruptSynchronizedRoutine this %p SyncRoutine %p Context %p Status %x\n", This, This->m_SyncRoutine, This->m_DynamicContext, Status); + return NT_SUCCESS(Status); } NTSTATUS @@ -155,9 +157,9 @@ NTSTATUS Status; BOOL Success; - //DPRINT("IInterruptServiceRoutine Mode %u\n", m_Mode); - CInterruptSync * This = (CInterruptSync*)ServiceContext; + + DPRINT("IInterruptServiceRoutine Mode %u\n", This->m_Mode); if (This->m_Mode == InterruptSyncModeNormal) { @@ -234,8 +236,8 @@ (PVOID)this, &m_Lock, Descriptor->u.Interrupt.Vector, - Descriptor->u.Interrupt.Level, - Descriptor->u.Interrupt.Level, + (KIRQL)Descriptor->u.Interrupt.Level, + (KIRQL)Descriptor->u.Interrupt.Level, (KINTERRUPT_MODE)(Descriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED), (Descriptor->Flags != CM_RESOURCE_INTERRUPT_LATCHED), Descriptor->u.Interrupt.Affinity, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp [iso-8859-1] Tue Oct 13 14:29:41 2009 @@ -358,7 +358,7 @@ //set up struct //Event->Event.usFlags = DMUS_KEF_EVENT_COMPLETE; Event->Event.cbStruct = sizeof(DMUS_KERNEL_EVENT); - Event->Event.cbEvent = BufferSize; + Event->Event.cbEvent = (USHORT)BufferSize; Event->Event.uData.pbData = (PBYTE)Buffer; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Tue Oct 13 14:29:41 2009 @@ -958,7 +958,7 @@ NTSTATUS Status; PKSDATAFORMAT DataFormat; PDEVICE_OBJECT DeviceObject; - BOOL Capture; + BOOLEAN Capture; PVOID SilenceBuffer; //IDrmAudioStream * DrmAudio = NULL; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] Tue Oct 13 14:29:41 2009 @@ -40,6 +40,11 @@ VOID NTAPI SetState( IN KSSTATE State); VOID NTAPI CloseStream(); protected: + + friend NTSTATUS NTAPI PinWavePciState(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); + friend NTSTATUS NTAPI PinWavePciDataFormat(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); + friend NTSTATUS NTAPI PinWavePciAudioPosition(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); + friend NTSTATUS NTAPI PinWavePciAllocatorFraming(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); IPortWavePci * m_Port; IPortFilterWavePci * m_Filter; @@ -57,20 +62,23 @@ IIrpQueue * m_IrpQueue; ULONG m_TotalPackets; - ULONG m_PreCompleted; - ULONG m_PostCompleted; + KSAUDIO_POSITION m_Position; ULONG m_StopCount; ULONG m_Delay; BOOL m_bUsePrefetch; ULONG m_PrefetchOffset; + SUBDEVICE_DESCRIPTOR m_Descriptor; KSALLOCATOR_FRAMING m_AllocatorFraming; LONG m_Ref; - NTSTATUS NTAPI HandleKsProperty(IN PVOID InputBuffer, IN ULONG InputBufferLength, IN PVOID OutputBuffer, IN ULONG OutputBufferLength, IN PIO_STATUS_BLOCK IoStatusBlock); + NTSTATUS NTAPI HandleKsProperty(IN PIRP Irp); + NTSTATUS NTAPI HandleKsStream(IN PIRP Irp); + + VOID NTAPI SetStreamState( IN KSSTATE State); }; @@ -80,6 +88,259 @@ PIO_WORKITEM WorkItem; KSSTATE State; }SETSTREAM_CONTEXT, *PSETSTREAM_CONTEXT; + +NTSTATUS NTAPI PinWavePciState(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); +NTSTATUS NTAPI PinWavePciDataFormat(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); +NTSTATUS NTAPI PinWavePciAudioPosition(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); +NTSTATUS NTAPI PinWavePciAllocatorFraming(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); + +DEFINE_KSPROPERTY_ALLOCATORFRAMING(PinWavePciConnectionSet, PinWavePciState, PinWavePciDataFormat, PinWavePciAllocatorFraming); +DEFINE_KSPROPERTY_AUDIOSET(PinWavePciAudioSet, PinWavePciAudioPosition); + +KSPROPERTY_SET PinWavePciPropertySet[] = +{ + { + &KSPROPSETID_Connection, + sizeof(PinWavePciConnectionSet) / sizeof(KSPROPERTY_ITEM), + (const KSPROPERTY_ITEM*)&PinWavePciConnectionSet, + 0, + NULL + }, + { + &KSPROPSETID_Audio, + sizeof(PinWavePciAudioSet) / sizeof(KSPROPERTY_ITEM), + (const KSPROPERTY_ITEM*)&PinWavePciAudioSet, + 0, + NULL + } +}; + + +NTSTATUS +NTAPI +PinWavePciAllocatorFraming( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +PinWavePciAudioPosition( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + CPortPinWavePci *Pin; + PSUBDEVICE_DESCRIPTOR Descriptor; + + // 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 = (CPortPinWavePci*)Descriptor->PortPin; + + //sanity check + PC_ASSERT(Pin->m_Stream); + + if (Request->Flags & KSPROPERTY_TYPE_GET) + { + // FIXME non multithreading-safe + // copy audio position + RtlMoveMemory(Data, &Pin->m_Position, sizeof(KSAUDIO_POSITION)); + + DPRINT1("Play %lu Record %lu\n", Pin->m_Position.PlayOffset, Pin->m_Position.WriteOffset); + Irp->IoStatus.Information = sizeof(KSAUDIO_POSITION); + return STATUS_SUCCESS; + } + + // not supported + return STATUS_NOT_SUPPORTED; +} + + +NTSTATUS +NTAPI +PinWavePciState( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + NTSTATUS Status = STATUS_UNSUCCESSFUL; + CPortPinWavePci *Pin; + PSUBDEVICE_DESCRIPTOR Descriptor; + PKSSTATE State = (PKSSTATE)Data; + + // 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 = (CPortPinWavePci*)Descriptor->PortPin; + + //sanity check + PC_ASSERT(Pin->m_Stream); + + if (Request->Flags & KSPROPERTY_TYPE_SET) + { + // try set stream + Status = Pin->m_Stream->SetState(*State); + + DPRINT("Setting state %u %x\n", *State, Status); + if (NT_SUCCESS(Status)) + { + // store new state + Pin->m_State = *State; + } + // store result + Irp->IoStatus.Information = sizeof(KSSTATE); + return Status; + } + else if (Request->Flags & KSPROPERTY_TYPE_GET) + { + // get current stream state + *State = Pin->m_State; + // store result + Irp->IoStatus.Information = sizeof(KSSTATE); + + return STATUS_SUCCESS; + } + + // unsupported request + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +PinWavePciDataFormat( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + NTSTATUS Status = STATUS_UNSUCCESSFUL; + CPortPinWavePci *Pin; + PSUBDEVICE_DESCRIPTOR Descriptor; + PIO_STACK_LOCATION IoStack; + + // get current irp stack location + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // get sub device descriptor + Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); + + // sanity check + PC_ASSERT(Descriptor); + PC_ASSERT(Descriptor->PortPin); + + // cast to pin impl + Pin = (CPortPinWavePci*)Descriptor->PortPin; + + //sanity check + PC_ASSERT(Pin->m_Stream); + PC_ASSERT(Pin->m_Format); + + if (Request->Flags & KSPROPERTY_TYPE_SET) + { + // try to change data format + PKSDATAFORMAT NewDataFormat, DataFormat = (PKSDATAFORMAT)Irp->UserBuffer; + ULONG Size = min(Pin->m_Format->FormatSize, DataFormat->FormatSize); + + if (RtlCompareMemory(DataFormat, Pin->m_Format, Size) == Size) + { + // format is identical + Irp->IoStatus.Information = DataFormat->FormatSize; + return STATUS_SUCCESS; + } + + // new change request + PC_ASSERT(Pin->m_State == KSSTATE_STOP); + // FIXME queue a work item when Irql != PASSIVE_LEVEL + PC_ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + + // allocate new data format + NewDataFormat = (PKSDATAFORMAT)AllocateItem(NonPagedPool, DataFormat->FormatSize, TAG_PORTCLASS); + if (!NewDataFormat) + { + // not enough memory + return STATUS_NO_MEMORY; + } + + // copy new data format + RtlMoveMemory(NewDataFormat, DataFormat, DataFormat->FormatSize); + + // set new format + Status = Pin->m_Stream->SetFormat(NewDataFormat); + if (NT_SUCCESS(Status)) + { + // free old format + FreeItem(Pin->m_Format, TAG_PORTCLASS); + + // update irp queue with new format + Pin->m_IrpQueue->UpdateFormat((PKSDATAFORMAT)NewDataFormat); + + // store new format + Pin->m_Format = NewDataFormat; + Irp->IoStatus.Information = NewDataFormat->FormatSize; + +#if 0 + PC_ASSERT(NewDataFormat->FormatSize == sizeof(KSDATAFORMAT_WAVEFORMATEX)); + PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.MajorFormat, KSDATAFORMAT_TYPE_AUDIO)); + PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.SubFormat, KSDATAFORMAT_SUBTYPE_PCM)); + PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.Specifier, KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)); + + + DPRINT1("NewDataFormat: Channels %u Bits %u Samples %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nChannels, + ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.wBitsPerSample, + ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nSamplesPerSec); +#endif + + } + else + { + // failed to set format + FreeItem(NewDataFormat, TAG_PORTCLASS); + } + + + // done + return Status; + } + else if (Request->Flags & KSPROPERTY_TYPE_GET) + { + // get current data format + PC_ASSERT(Pin->m_Format); + + if (Pin->m_Format->FormatSize > IoStack->Parameters.DeviceIoControl.OutputBufferLength) + { + // buffer too small + Irp->IoStatus.Information = Pin->m_Format->FormatSize; + return STATUS_MORE_ENTRIES; + } + // copy data format + RtlMoveMemory(Data, Pin->m_Format, Pin->m_Format->FormatSize); + // store result size + Irp->IoStatus.Information = Pin->m_Format->FormatSize; + + // done + return STATUS_SUCCESS; + } + + // unsupported request + return STATUS_NOT_SUPPORTED; +} + //================================================================================================================================== NTSTATUS @@ -185,7 +446,7 @@ // store minimum data threshold m_IrpQueue->SetMinimumDataThreshold(MinimumDataThreshold); - DPRINT1("Stopping PreCompleted %u PostCompleted %u StopCount %u MinimumDataThreshold %u\n", m_PreCompleted, m_PostCompleted, m_StopCount, MinimumDataThreshold); + DPRINT1("Stopping TotalCompleted %u StopCount %u MinimumDataThreshold %u\n", m_TotalPackets, m_StopCount, MinimumDataThreshold); } if (m_State == KSSTATE_RUN) { @@ -308,144 +569,50 @@ NTSTATUS NTAPI CPortPinWavePci::HandleKsProperty( - IN PVOID InputBuffer, - IN ULONG InputBufferLength, - IN PVOID OutputBuffer, - IN ULONG OutputBufferLength, - IN PIO_STATUS_BLOCK IoStatusBlock) + IN PIRP Irp) { PKSPROPERTY Property; NTSTATUS Status; UNICODE_STRING GuidString; - - DPRINT("IPortPinWavePci_HandleKsProperty entered\n"); - - if (InputBufferLength < sizeof(KSPROPERTY)) - { - IoStatusBlock->Information = 0; - IoStatusBlock->Status = STATUS_INVALID_PARAMETER; - return STATUS_INVALID_PARAMETER; - } - - Property = (PKSPROPERTY)InputBuffer; - - if (IsEqualGUIDAligned(Property->Set, KSPROPSETID_Connection)) - { - if (Property->Id == KSPROPERTY_CONNECTION_STATE) - { - PKSSTATE State = (PKSSTATE)OutputBuffer; - - PC_ASSERT_IRQL(DISPATCH_LEVEL); - if (OutputBufferLength < sizeof(KSSTATE)) - { - IoStatusBlock->Information = sizeof(KSSTATE); - IoStatusBlock->Status = STATUS_BUFFER_TOO_SMALL; - return STATUS_BUFFER_TOO_SMALL; - } - - if (Property->Flags & KSPROPERTY_TYPE_SET) - { - Status = STATUS_UNSUCCESSFUL; - IoStatusBlock->Information = 0; - - if (m_Stream) - { - Status = m_Stream->SetState(*State); - - DPRINT1("Setting state %u %x\n", *State, Status); - if (NT_SUCCESS(Status)) - { - m_State = *State; - } - } - IoStatusBlock->Status = Status; - return Status; - } - else if (Property->Flags & KSPROPERTY_TYPE_GET) - { - *State = m_State; - IoStatusBlock->Information = sizeof(KSSTATE); - IoStatusBlock->Status = STATUS_SUCCESS; - return STATUS_SUCCESS; - } - } - else if (Property->Id == KSPROPERTY_CONNECTION_DATAFORMAT) - { - PKSDATAFORMAT DataFormat = (PKSDATAFORMAT)OutputBuffer; - if (Property->Flags & KSPROPERTY_TYPE_SET) - { - PKSDATAFORMAT NewDataFormat; - if (!RtlCompareMemory(DataFormat, m_Format, DataFormat->FormatSize)) - { - IoStatusBlock->Information = DataFormat->FormatSize; - IoStatusBlock->Status = STATUS_SUCCESS; - return STATUS_SUCCESS; - } - - NewDataFormat = (PKSDATAFORMAT)AllocateItem(NonPagedPool, DataFormat->FormatSize, TAG_PORTCLASS); - if (!NewDataFormat) - { - IoStatusBlock->Information = 0; - IoStatusBlock->Status = STATUS_NO_MEMORY; - return STATUS_NO_MEMORY; - } - RtlMoveMemory(NewDataFormat, DataFormat, DataFormat->FormatSize); - - if (m_Stream) - { + PIO_STACK_LOCATION IoStack; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + DPRINT("IPortPinWave_HandleKsProperty entered\n"); + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) + { + DPRINT1("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); + + Irp->IoStatus.Status = STATUS_SUCCESS; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + + Status = PcHandlePropertyWithTable(Irp, m_Descriptor.FilterPropertySetCount, m_Descriptor.FilterPropertySet, &m_Descriptor); + + if (Status == STATUS_NOT_FOUND) + { + Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + RtlStringFromGUID(Property->Set, &GuidString); + DPRINT1("Unhandeled property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); + RtlFreeUnicodeString(&GuidString); + } + + if (Status != STATUS_PENDING) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + return Status; +} + #if 0 - ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); - ASSERT(NewDataFormat->FormatSize == sizeof(KSDATAFORMAT_WAVEFORMATEX)); - ASSERT(IsEqualGUIDAligned(&((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.MajorFormat, &KSDATAFORMAT_TYPE_AUDIO)); - ASSERT(IsEqualGUIDAligned(&((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)); - ASSERT(IsEqualGUIDAligned(&((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.Specifier, &KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)); - - ASSERT(This->State == KSSTATE_STOP); -#endif - DPRINT1("NewDataFormat: Channels %u Bits %u Samples %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nChannels, - ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.wBitsPerSample, - ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nSamplesPerSec); - - Status = m_Stream->SetFormat(NewDataFormat); - if (NT_SUCCESS(Status)) - { - if (m_Format) - ExFreePoolWithTag(m_Format, TAG_PORTCLASS); - - m_IrpQueue->UpdateFormat((PKSDATAFORMAT)NewDataFormat); - m_Format = NewDataFormat; - IoStatusBlock->Information = DataFormat->FormatSize; - IoStatusBlock->Status = STATUS_SUCCESS; - return STATUS_SUCCESS; - } - } - DPRINT1("Failed to set format\n"); - IoStatusBlock->Information = 0; - IoStatusBlock->Status = STATUS_UNSUCCESSFUL; - return STATUS_UNSUCCESSFUL; - } - else if (Property->Flags & KSPROPERTY_TYPE_GET) - { - if (!m_Format) - { - DPRINT1("No format\n"); - IoStatusBlock->Information = 0; - IoStatusBlock->Status = STATUS_UNSUCCESSFUL; - return STATUS_UNSUCCESSFUL; - } - if (m_Format->FormatSize > OutputBufferLength) - { - IoStatusBlock->Information = m_Format->FormatSize; - IoStatusBlock->Status = STATUS_BUFFER_TOO_SMALL; - return STATUS_BUFFER_TOO_SMALL; - } - - RtlMoveMemory(DataFormat, m_Format, m_Format->FormatSize); - IoStatusBlock->Information = DataFormat->FormatSize; - IoStatusBlock->Status = STATUS_SUCCESS; - return STATUS_SUCCESS; - } - } else if (Property->Id == KSPROPERTY_CONNECTION_ALLOCATORFRAMING) { PKSALLOCATOR_FRAMING Framing = (PKSALLOCATOR_FRAMING)OutputBuffer; @@ -466,15 +633,37 @@ return STATUS_SUCCESS; } } - - RtlStringFromGUID(Property->Set, &GuidString); - DPRINT1("Unhandeled property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); - RtlFreeUnicodeString(&GuidString); - - IoStatusBlock->Status = STATUS_NOT_IMPLEMENTED; - IoStatusBlock->Information = 0; - return STATUS_NOT_IMPLEMENTED; -} +#endif + +NTSTATUS +NTAPI +CPortPinWavePci::HandleKsStream( + IN PIRP Irp) +{ + NTSTATUS Status; + InterlockedIncrement((PLONG)&m_TotalPackets); + + DPRINT("IPortPinWaveCyclic_HandleKsStream entered Total %u State %x MinData %u\n", m_TotalPackets, m_State, m_IrpQueue->NumData()); + + Status = m_IrpQueue->AddMapping(NULL, 0, Irp); + + if (NT_SUCCESS(Status)) + { + + PKSSTREAM_HEADER Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; + PC_ASSERT(Header); + + if (m_Capture) + m_Position.WriteOffset += Header->FrameExtent; + else + m_Position.WriteOffset += Header->DataUsed; + + } + + + return STATUS_PENDING; +} + NTSTATUS NTAPI @@ -483,17 +672,17 @@ IN PIRP Irp) { PIO_STACK_LOCATION IoStack; - NTSTATUS Status; IoStack = IoGetCurrentIrpStackLocation(Irp); if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY) { - Status = HandleKsProperty(IoStack->Parameters.DeviceIoControl.Type3InputBuffer, IoStack->Parameters.DeviceIoControl.InputBufferLength, Irp->UserBuffer, IoStack->Parameters.DeviceIoControl.OutputBufferLength, &Irp->IoStatus); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - } - + return HandleKsProperty(Irp); + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_WRITE_STREAM || IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_READ_STREAM) + { + return HandleKsStream(Irp); + } UNIMPLEMENTED @@ -735,7 +924,7 @@ { NTSTATUS Status; PKSDATAFORMAT DataFormat; - BOOL Capture; + BOOLEAN Capture; Port->AddRef(); Filter->AddRef(); @@ -810,6 +999,34 @@ DPRINT("OptionFlags %x RequirementsFlag %x PoolType %x Frames %lu FrameSize %lu FileAlignment %lu\n", m_AllocatorFraming.OptionsFlags, m_AllocatorFraming.RequirementsFlags, m_AllocatorFraming.PoolType, m_AllocatorFraming.Frames, m_AllocatorFraming.FrameSize, m_AllocatorFraming.FileAlignment); + ISubdevice * Subdevice = NULL; + // get subdevice interface + Status = Port->QueryInterface(IID_ISubdevice, (PVOID*)&Subdevice); + + if (!NT_SUCCESS(Status)) + return Status; + + PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor = NULL; + + Status = Subdevice->GetDescriptor(&SubDeviceDescriptor); + if (!NT_SUCCESS(Status)) + { + // failed to get descriptor + Subdevice->Release(); + return Status; + } + + /* set up subdevice descriptor */ + RtlZeroMemory(&m_Descriptor, sizeof(SUBDEVICE_DESCRIPTOR)); + m_Descriptor.FilterPropertySet = PinWavePciPropertySet; + m_Descriptor.FilterPropertySetCount = sizeof(PinWavePciPropertySet) / sizeof(KSPROPERTY_SET); + m_Descriptor.UnknownStream = (PUNKNOWN)m_Stream; + m_Descriptor.DeviceDescriptor = SubDeviceDescriptor->DeviceDescriptor; + m_Descriptor.UnknownMiniport = SubDeviceDescriptor->UnknownMiniport; + m_Descriptor.PortPin = (PVOID)this; + + + Status = NewIrpQueue(&m_IrpQueue); if (!NT_SUCCESS(Status)) return Status; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp [iso-8859-1] Tue Oct 13 14:29:41 2009 @@ -8,8 +8,7 @@ #include "private.hpp" -class CPortPinWaveRT : public IPortPinWaveRT, - public IServiceSink //hack +class CPortPinWaveRT : public IPortPinWaveRT { public: STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); @@ -31,7 +30,6 @@ return m_Ref; } IMP_IPortPinWaveRT; - IMP_IServiceSink; //HACK CPortPinWaveRT(IUnknown *OuterUnknown){} virtual ~CPortPinWaveRT(){} @@ -43,7 +41,6 @@ PMINIPORTWAVERT m_Miniport; PMINIPORTWAVERTSTREAM m_Stream; PPORTWAVERTSTREAM m_PortStream; - PSERVICEGROUP m_ServiceGroup; KSSTATE m_State; PKSDATAFORMAT m_Format; KSPIN_CONNECT * m_ConnectDetails; @@ -70,8 +67,6 @@ NTSTATUS NTAPI HandleKsProperty(IN PIRP Irp); NTSTATUS NTAPI HandleKsStream(IN PIRP Irp); VOID NTAPI SetStreamState(IN KSSTATE State); - VOID UpdateCommonBuffer(ULONG Position); - VOID UpdateCommonBufferOverlap(ULONG Position); friend VOID NTAPI SetStreamWorkerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); friend VOID NTAPI CloseStreamRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); @@ -86,81 +81,6 @@ }SETSTREAM_CONTEXT, *PSETSTREAM_CONTEXT; -VOID -CPortPinWaveRT::UpdateCommonBuffer( - ULONG Position) -{ - ULONG BufferLength; - ULONG BytesToCopy; - ULONG BufferSize; - PUCHAR Buffer; - NTSTATUS Status; - - BufferLength = Position - m_CommonBufferOffset; - while(BufferLength) - { - Status = m_IrpQueue->GetMapping(&Buffer, &BufferSize); - if (!NT_SUCCESS(Status)) - return; - - BytesToCopy = min(BufferLength, BufferSize); - - if (m_Capture) - { - RtlMoveMemory(Buffer, (PUCHAR)m_CommonBuffer + m_CommonBufferOffset, BytesToCopy); - } - else - { - RtlMoveMemory((PUCHAR)m_CommonBuffer + m_CommonBufferOffset, Buffer, BytesToCopy); - } - - m_IrpQueue->UpdateMapping(BytesToCopy); - m_CommonBufferOffset += BytesToCopy; - - BufferLength = Position - m_CommonBufferOffset; - } -} - -VOID -CPortPinWaveRT::UpdateCommonBufferOverlap( - ULONG Position) -{ - ULONG BufferLength; - ULONG BytesToCopy; - ULONG BufferSize; - PUCHAR Buffer; - NTSTATUS Status; - - - BufferLength = m_CommonBufferSize - m_CommonBufferOffset; - while(BufferLength) - { - Status = m_IrpQueue->GetMapping(&Buffer, &BufferSize); - if (!NT_SUCCESS(Status)) - return; - - BytesToCopy = min(BufferLength, BufferSize); - - if (m_Capture) - { - RtlMoveMemory(Buffer, (PUCHAR)m_CommonBuffer + m_CommonBufferOffset, BytesToCopy); - } - else - { - RtlMoveMemory((PUCHAR)m_CommonBuffer + m_CommonBufferOffset, Buffer, BytesToCopy); - } - - m_IrpQueue->UpdateMapping(BytesToCopy); - m_CommonBufferOffset += BytesToCopy; - - BufferLength = m_CommonBufferSize - m_CommonBufferOffset; - } - m_CommonBufferOffset = 0; - UpdateCommonBuffer(Position); -} - - - //================================================================================================================================== NTSTATUS NTAPI @@ -170,13 +90,6 @@ { DPRINT("IServiceSink_fnQueryInterface entered\n"); - if (IsEqualGUIDAligned(refiid, IID_IServiceSink)) - { - *Output = PVOID(PSERVICEGROUP(this)); - PUNKNOWN(*Output)->AddRef(); - return STATUS_SUCCESS; - } - if (IsEqualGUIDAligned(refiid, IID_IIrpTarget) || IsEqualGUIDAligned(refiid, IID_IUnknown)) { @@ -189,37 +102,6 @@ VOID NTAPI -CPortPinWaveRT::RequestService() -{ - KSAUDIO_POSITION Position; - NTSTATUS Status; - PUCHAR Buffer; - ULONG BufferSize; - - PC_ASSERT_IRQL(DISPATCH_LEVEL); - - Status = m_IrpQueue->GetMapping(&Buffer, &BufferSize); - if (!NT_SUCCESS(Status)) - { - SetStreamState(KSSTATE_STOP); - return; - } - - Status = m_Stream->GetPosition(&Position); - DPRINT("PlayOffset %lu WriteOffset %lu Buffer %p BufferSize %u CommonBufferSize %u\n", Position.PlayOffset, Position.WriteOffset, Buffer, BufferSize, m_CommonBufferSize); - - if (Position.PlayOffset < m_CommonBufferOffset) - { - UpdateCommonBufferOverlap(Position.PlayOffset); - } - else if (Position.PlayOffset >= m_CommonBufferOffset) - { - UpdateCommonBuffer(Position.PlayOffset); - } -} - -VOID -NTAPI SetStreamWorkerRoutine( IN PDEVICE_OBJECT DeviceObject, IN PVOID Context) @@ -248,14 +130,12 @@ { // reset start stream This->m_IrpQueue->CancelBuffers(); //FIX function name - This->m_ServiceGroup->CancelDelayedService(); DPRINT1("Stopping PreCompleted %u PostCompleted %u\n", This->m_PreCompleted, This->m_PostCompleted); } if (This->m_State == KSSTATE_RUN) { // start the notification timer - This->m_ServiceGroup->RequestDelayedService(This->m_Delay); } } } @@ -766,7 +646,7 @@ { NTSTATUS Status; PKSDATAFORMAT DataFormat; - BOOL Capture; + BOOLEAN Capture; KSRTAUDIO_HWLATENCY Latency; Port->AddRef(); @@ -806,15 +686,6 @@ goto cleanup; } - Status = PcNewServiceGroup(&m_ServiceGroup, NULL); - if (!NT_SUCCESS(Status)) - { - goto cleanup; - } - - m_ServiceGroup->AddMember(PSERVICESINK(this)); - m_ServiceGroup->SupportDelayedService(); - if (KsPinDescriptor->Communication == KSPIN_COMMUNICATION_SINK && KsPinDescriptor->DataFlow == KSPIN_DATAFLOW_IN) { Capture = FALSE; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] Tue Oct 13 14:29:41 2009 @@ -355,8 +355,8 @@ IN PUNKNOWN OuterUnknown, IN PRESOURCELIST ResourceList OPTIONAL, IN ULONG MaximumLength, - IN BOOL Dma32BitAddresses, - IN BOOL Dma64BitAddresses, + IN BOOLEAN Dma32BitAddresses, + IN BOOLEAN Dma64BitAddresses, IN DMA_WIDTH DmaWidth, IN DMA_SPEED DmaSpeed) { @@ -388,7 +388,7 @@ IN PRESOURCELIST ResourceList OPTIONAL, IN ULONG DmaIndex, IN ULONG MaximumLength, - IN BOOL DemandMode, + IN BOOLEAN DemandMode, IN DMA_SPEED DmaSpeed) { DEVICE_DESCRIPTION DeviceDescription; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp [iso-8859-1] Tue Oct 13 14:29:41 2009 @@ -161,7 +161,7 @@ return RtlConvertUlongToLargeInteger(0); } - Buffer = UlongToPtr(PtrToUlong(MmGetSystemAddressForMdl(MemoryDescriptorList)) + Index * PAGE_SIZE); + Buffer = (PVOID)UlongToPtr(PtrToUlong(MmGetSystemAddressForMdlSafe(MemoryDescriptorList, LowPagePriority)) + Index * PAGE_SIZE); Addr = MmGetPhysicalAddress(Buffer); Address->QuadPart = Addr.QuadPart; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Tue Oct 13 14:29:41 2009 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../../../tools/rbuild/project.dtd"> <module name="portcls" type="kernelmodedriver" installbase="system32/drivers" installname="portcls.sys" entrypoint="0"> <importlibrary definition="portcls.spec" /> - <define name="PC_NO_IMPORTS" /> <redefine name="_WIN32_WINNT">0x600</redefine> <include base="portcls">.</include> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] Tue Oct 13 14:29:41 2009 @@ -9,10 +9,12 @@ //#define _KS_NO_ANONYMOUS_STRUCTURES_ #define PC_IMPLEMENTATION +#define COM_STDMETHOD_CAN_THROW +#define PC_NO_IMPORTS #include <ntddk.h> #include <portcls.h> -#define NDEBUG +#define YDEBUG #include <debug.h> #include <dmusicks.h> @@ -20,7 +22,7 @@ #include "interfaces.hpp" #include <ks.h> #include <ksmedia.h> -#include <intrin.h> +//#include <intrin.h> #define TAG_PORTCLASS 'SLCP' @@ -244,8 +246,8 @@ PcDmaSlaveDescription( IN PRESOURCELIST ResourceList OPTIONAL, IN ULONG DmaIndex, - IN BOOL DemandMode, - IN ULONG AutoInitialize, + IN BOOLEAN DemandMode, + IN BOOLEAN AutoInitialize, IN DMA_SPEED DmaSpeed, IN ULONG MaximumLength, IN ULONG DmaPort, @@ -321,6 +323,14 @@ DEFINE_KSPROPERTY_ITEM_CONNECTION_DATAFORMAT(PropDataFormatHandler, PropDataFormatHandler)\ } +#define DEFINE_KSPROPERTY_ALLOCATORFRAMING(PinSet,\ + PropStateHandler, PropDataFormatHandler, PropAllocatorFraming)\ +DEFINE_KSPROPERTY_TABLE(PinSet) {\ + DEFINE_KSPROPERTY_ITEM_CONNECTION_STATE(PropStateHandler, PropStateHandler),\ + DEFINE_KSPROPERTY_ITEM_CONNECTION_DATAFORMAT(PropDataFormatHandler, PropDataFormatHandler),\ + DEFINE_KSPROPERTY_ITEM_CONNECTION_ALLOCATORFRAMING(PropAllocatorFraming)\ +} + #define DEFINE_KSPROPERTY_ITEM_AUDIO_POSITION(GetHandler, SetHandler)\ DEFINE_KSPROPERTY_ITEM(\ KSPROPERTY_AUDIO_POSITION,\ @@ -335,9 +345,6 @@ DEFINE_KSPROPERTY_TABLE(PinSet) {\ DEFINE_KSPROPERTY_ITEM_AUDIO_POSITION(PropPositionHandler, PropPositionHandler)\ } - - - #define DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(PinSet,\ PropGeneral, PropInstances, PropIntersection)\ Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp [iso-8859-1] Tue Oct 13 14:29:41 2009 @@ -34,6 +34,9 @@ } IMP_IResourceList; +#ifdef BUILD_WDK + ULONG NTAPI NumberOfEntries(); +#endif CResourceList(IUnknown * OuterUnknown) : m_OuterUnknown(OuterUnknown), m_PoolType(NonPagedPool), m_TranslatedResourceList(0), m_UntranslatedResourceList(0), m_NumberOfEntries(0) {} virtual ~CResourceList() {} @@ -72,15 +75,16 @@ return STATUS_UNSUCCESSFUL; } - +#if 1 ULONG NTAPI CResourceList::NumberOfEntries() { - // ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); return m_NumberOfEntries; } +#endif ULONG NTAPI Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp [iso-8859-1] Tue Oct 13 14:29:41 2009 @@ -116,6 +116,8 @@ CServiceGroup::RequestService() { KIRQL OldIrql; + + DPRINT("CServiceGroup::RequestService() Dpc at Level %u\n", KeGetCurrentIrql()); if (KeGetCurrentIrql() > DISPATCH_LEVEL) {

1 0

[janderwald] 43436: - Fix interface definition
by janderwald＠svn.reactos.org 13 Oct '09

13 Oct '09

Author: janderwald Date: Tue Oct 13 14:25:10 2009 New Revision: 43436 URL: http://svn.reactos.org/svn/reactos?rev=43436&view=rev Log: - Fix interface definition Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Tue Oct 13 14:25:10 2009 @@ -1187,7 +1187,7 @@ IN PRESOURCELIST ResourceList OPTIONAL, IN ULONG DmaIndex, IN ULONG MaximumLength, - IN BOOL DemandMode, + IN BOOLEAN DemandMode, IN DMA_SPEED DmaSpeed) PURE; STDMETHOD_(NTSTATUS, NewMasterDmaChannel)(THIS_ @@ -1195,8 +1195,8 @@ IN PUNKNOWN OuterUnknown, IN PRESOURCELIST ResourceList OPTIONAL, IN ULONG MaximumLength, - IN BOOL Dma32BitAddresses, - IN BOOL Dma64BitAddresses, + IN BOOLEAN Dma32BitAddresses, + IN BOOLEAN Dma64BitAddresses, IN DMA_WIDTH DmaWidth, IN DMA_SPEED DmaSpeed) PURE; @@ -1216,7 +1216,7 @@ IN PRESOURCELIST ResourceList OPTIONAL, \ IN ULONG DmaIndex, \ IN ULONG MaximumLength, \ - IN BOOL DemandMode, \ + IN BOOLEAN DemandMode, \ IN DMA_SPEED DmaSpeed); \ \ STDMETHODIMP_(NTSTATUS) NewMasterDmaChannel( \ @@ -1224,8 +1224,8 @@ IN PUNKNOWN OuterUnknown, \ IN PRESOURCELIST ResourceList OPTIONAL, \ IN ULONG MaximumLength, \ - IN BOOL Dma32BitAddresses, \ - IN BOOL Dma64BitAddresses, \ + IN BOOLEAN Dma32BitAddresses, \ + IN BOOLEAN Dma64BitAddresses, \ IN DMA_WIDTH DmaWidth, \ IN DMA_SPEED DmaSpeed) #endif

1 0

[tkreuzer] 43435: [Kd64] Copy KdVersionBlock like for x86, fix Value of ReportFlags member in KdpSetContextState for both x86 and amd64
by tkreuzer＠svn.reactos.org 13 Oct '09

13 Oct '09

Author: tkreuzer Date: Tue Oct 13 13:19:07 2009 New Revision: 43435 URL: http://svn.reactos.org/svn/reactos?rev=43435&view=rev Log: [Kd64] Copy KdVersionBlock like for x86, fix Value of ReportFlags member in KdpSetContextState for both x86 and amd64 Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/kdsup.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] Tue Oct 13 13:19:07 2009 @@ -21,20 +21,8 @@ NTAPI KdpSysGetVersion(IN PDBGKD_GET_VERSION64 Version) { - Version->MajorVersion = 0; - Version->MinorVersion = 0; - Version->ProtocolVersion = DBGKD_64BIT_PROTOCOL_VERSION2; - Version->KdSecondaryVersion = KD_SECONDARY_VERSION_AMD64_CONTEXT; - Version->Flags = DBGKD_VERS_FLAG_PTR64 | DBGKD_VERS_FLAG_DATA; - Version->MachineType = IMAGE_FILE_MACHINE_AMD64; - Version->MaxPacketType = PACKET_TYPE_MAX; - Version->MaxStateChange = 0; - Version->MaxManipulate = 0; - Version->Simulation = DBGKD_SIMULATION_NONE; - Version->Unused[0] = 0; - Version->KernBase = 0xfffff80000800000ULL; - Version->PsLoadedModuleList = (ULONG_PTR)&KeLoaderBlock->LoadOrderListHead; - Version->DebuggerDataList = 0; + /* Copy the version block */ + RtlCopyMemory(Version, &KdVersionBlock, sizeof(DBGKD_GET_VERSION64)); } VOID @@ -107,7 +95,7 @@ WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_SEGS; if (WaitStateChange->ControlReport.SegCs == KGDT_64_R0_CODE) { - WaitStateChange->ControlReport.ReportFlags = REPORT_STANDARD_CS; + WaitStateChange->ControlReport.ReportFlags |= REPORT_STANDARD_CS; } } Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/kdsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/kdsup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/kdsup.c [iso-8859-1] Tue Oct 13 13:19:07 2009 @@ -95,7 +95,7 @@ WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_SEGS; if (WaitStateChange->ControlReport.SegCs == KGDT_R0_CODE) { - WaitStateChange->ControlReport.ReportFlags = REPORT_STANDARD_CS; + WaitStateChange->ControlReport.ReportFlags |= REPORT_STANDARD_CS; } }

1 0

[dgorbachev] 43434: Temporary hack to avoid linker errors when building with RosBE 1.5B1.
by dgorbachev＠svn.reactos.org 13 Oct '09

13 Oct '09

Author: dgorbachev Date: Tue Oct 13 05:34:29 2009 New Revision: 43434 URL: http://svn.reactos.org/svn/reactos?rev=43434&view=rev Log: Temporary hack to avoid linker errors when building with RosBE 1.5B1. Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp trunk/reactos/base/applications/games/spider/spider.cpp Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Tue Oct 13 05:34:29 2009 @@ -196,6 +196,8 @@ SaveSettings(); + try { throw 0; } catch (int i) { } /* HACK */ + return msg.wParam; } Modified: trunk/reactos/base/applications/games/spider/spider.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/spider.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/spider.cpp [iso-8859-1] Tue Oct 13 05:34:29 2009 @@ -154,6 +154,9 @@ DispatchMessage(&msg); } } + + try { throw 0; } catch (int i) { } /* HACK */ + return msg.wParam; }

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