Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[dchapyshev] 42676: - Add/update Ukrainian translation by Yevhen Sakara <eresid@gmail.com>
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 07:28:45 2009 New Revision: 42676 URL: http://svn.reactos.org/svn/reactos?rev=42676&view=rev Log: - Add/update Ukrainian translation by Yevhen Sakara <eresid(a)gmail.com> Added: trunk/reactos/base/applications/cmdutils/doskey/lang/uk-UA.rc (with props) trunk/reactos/base/applications/rapps/lang/uk-UA.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.rc trunk/reactos/base/applications/mplay32/lang/uk-UA.rc trunk/reactos/base/applications/paint/lang/uk-UA.rc trunk/reactos/base/applications/rapps/rsrc.rc Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.rc [iso-8859-1] Sat Aug 15 07:28:45 2009 @@ -6,3 +6,4 @@ #include <windows.h> #include "doskey.h" #include "lang/en-US.rc" +#include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/cmdutils/doskey/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/cmdutils/doskey/lang/uk-UA.rc [iso-8859-1] Sat Aug 15 07:28:45 2009 @@ -1,0 +1,35 @@ +/* + * PROJECT: ReactOS DOSKey + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/cmdutils/doskey/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for ReactOS DOSKey + * TRANSLATOR: Sakara Yevhen + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_HELP, "Ìåíåäæåð êîìàíäíîãî ðÿäêà äëÿ ðåäàãóâàííÿ íàëàøòóâàíü, ³ñòîð³¿ òà ìàêðîñ³â.\n\ +\n\ +DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=size]\n\ + [/REINSTALL] [/MACROS[:exe | :ALL]] [/MACROFILE=file] [macroname=[text]]\n\ +\n\ + /INSERT Äîçâ³ë âêëþ÷åííÿ ðåæèìó.\n\ + /OVERSTRIKE Çàáîðîíà âêëþ÷åííÿ ðåæèìó.\n\ + /EXENAME=exename Âñòàíîâëåííÿ ³ì'ÿ ïðîãðàìè äëÿ ïåðåãëÿäó/çì³íè ³ñòîð³¿\n\ + ³ ìàêðîñ³â. Çíà÷åííÿ çà çàìîâ÷óâàííÿì cmd.exe.\n\ + /HISTORY Â³äîáðàæåííÿ ³ñòîð³¿ êîìàíä.\n\ + /LISTSIZE=size Âñòàíîâëåííÿ ê³ëüêîñò³ êîìàíä çà ³ñòîð³þ áóôåðà.\n\ + /REINSTALL Î÷èùåííÿ ³ñòîð³¿ êîìàíä.\n\ + /MACROS Â³äîáðàæåííÿ ìàêðîñ³ âèçíà÷åíü.\n\ + /MACROS:exename Â³äîáðàæåííÿ ìàêðîñ³ âèçíà÷åíü äëÿ êîíêðåòíî¿ ïðîãðàìè.\n\ + /MACROS:ALL Â³äîáðàæåííÿ ìàêðîñ³ âèçíà÷åíü äëÿ âñ³õ ïðîãðàì.\n\ + /MACROFILE=filename Çàâàíòàæåííÿ ìàêðîñ³ âèçíà÷åíü ç ôàéëó.\n\ + macroname Âèçíà÷åííÿ ³ì'ÿ ìàêðîñó äëÿ ñòâîðåííÿ.\n\ + text Âèçíà÷åííÿ çàì³íè òåêñòó â ìàêðîñ³.\n" + +IDS_INVALID_MACRO_DEF, "Íåä³éñíèé ìàêðîñ âèçíà÷åííÿ: %s\n" + +END Propchange: trunk/reactos/base/applications/cmdutils/doskey/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mplay32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] Sat Aug 15 07:28:45 2009 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS MPlay32 + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mplay32/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for ReactOS MPlay32 + * TRANSLATOR: Sakara Yevhen + */ + LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDR_MAINMENU MENU Modified: trunk/reactos/base/applications/paint/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/uk-UA.rc [iso-8859-1] Sat Aug 15 07:28:45 2009 @@ -1,7 +1,9 @@ /* - * Ukrainian Language resource file - * Translated by: Artem Reznikov - * Last changed: 29-04-2009 + * PROJECT: Paint for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/devmgmt/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for Paint + * TRANSLATOR: Artem Reznikov, Sakara Yevhen */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -47,7 +49,7 @@ MENUITEM SEPARATOR POPUP "Ìàñøòàá" BEGIN - POPUP "User defined" + POPUP "Êîðèñòóâàëüíèöüêèé" BEGIN MENUITEM "12,5%", IDM_VIEWZOOM125 MENUITEM "25%", IDM_VIEWZOOM25 @@ -58,8 +60,8 @@ MENUITEM "800%", IDM_VIEWZOOM800 END MENUITEM SEPARATOR - MENUITEM "Show grid", IDM_VIEWSHOWGRID - MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE + MENUITEM "Ïîêàçàòè ñ³òêó", IDM_VIEWSHOWGRID + MENUITEM "Ïîêàçàòè â ì³í³àòþð³", IDM_VIEWSHOWMINIATURE END MENUITEM "Íà âåñü åêðàí\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -176,10 +178,10 @@ IDS_PROGRAMNAME, "Paint" IDS_WINDOWTITLE, "%s - Paint" IDS_INFOTITLE, "Paint äëÿ ReactOS" - IDS_INFOTEXT, "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)" + IDS_INFOTEXT, "Paint äëÿ ReactOS äîñòóïíèé çã³äíî ç GNU Lesser General Public License (LGPL) âåðñ³¿ 3 (äèâ³òüñÿ www.gnu.org)" IDS_SAVEPROMPTTEXT, "Çáåðåãòè çì³íè äî %s?" IDS_DEFAULTFILENAME, "Áåç_³ìåí³.bmp" - IDS_MINIATURETITLE, "Miniature" + IDS_MINIATURETITLE, "Ì³í³àòþðà" IDS_TOOLTIP1, "Âèä³ëåííÿ äîâ³ëüíî¿ îáëàñò³" IDS_TOOLTIP2, "Âèä³ëåííÿ" IDS_TOOLTIP3, "Ëàñòèê" Added: trunk/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] Sat Aug 15 07:28:45 2009 @@ -1,0 +1,175 @@ +/* + * PROJECT: ReactOS ReactOS Applications Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/rapps/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for ReactOS ReactOS Applications Manager + * TRANSLATOR: Sakara Yevhen + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "&Ôàéë" + BEGIN + MENUITEM "&Íàëàøòóâàííÿ", ID_SETTINGS, GRAYED + MENUITEM SEPARATOR + MENUITEM "Â&èõ³ä", ID_EXIT + END + POPUP "&Ïðîãðàìè" + BEGIN + MENUITEM "&Âñòàíîâèòè", ID_INSTALL + MENUITEM "&Âèäàëèòè",ID_UNINSTALL + MENUITEM "&Çì³íèòè", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Îíîâèòè", ID_REFRESH + END + POPUP "Äîâ³äêà" + BEGIN + MENUITEM "Äîâ³äêà", ID_HELP, GRAYED + MENUITEM "Ïðî ïðîãðàìó...", ID_ABOUT + END +END + +IDR_LINKMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Â³äêðèòè ïîñèëàííÿ â áðàóçåð³", ID_OPEN_LINK + MENUITEM "&Êîï³þâàòè ïîñèëàííÿ â áóôåð îáì³íó", ID_COPY_LINK + END +END + +IDR_APPLICATIONMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Âñòàíîâèòè", ID_INSTALL + MENUITEM "&Âèäàëèòè", ID_UNINSTALL + MENUITEM "&Çì³íèòè", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Îíîâèòè", ID_REFRESH + END +END + +IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE 0, 0, 386, 231 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Íàëàøòóâàííÿ" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Òàê", IDOK, 255, 212, 60, 14 + PUSHBUTTON "Í³", IDCANCEL, 320, 212, 60, 14 +END + +IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE 0, 0, 386, 231 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Çàâàíòàæèòè ³ âñòàíîâèòè" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Òàê", IDOK, 255, 212, 60, 14 + PUSHBUTTON "Í³", IDCANCEL, 320, 212, 60, 14 +END + +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +CAPTION "Çàâàíòàæåííÿ..." +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 + LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Â³äì³íèòè", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +END + +IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +CAPTION "Ïðî ïðîãðàìó..." +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ìåíåäæåð äîäàòê³â ReactOS\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + PUSHBUTTON "Çàêðèòè", IDOK, 133, 46, 50, 14 + ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_INSTALL "Âñòàíîâèòè" + IDS_TOOLTIP_UNINSTALL "Âèäàëèòè" + IDS_TOOLTIP_MODIFY "Çì³íèòè" + IDS_TOOLTIP_SETTINGS "Íàëàøòóâàííÿ" + IDS_TOOLTIP_REFRESH "Îíîâèòè" + IDS_TOOLTIP_EXIT "Âèõ³ä" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_NAME "²ìÿ" + IDS_APP_INST_VERSION "Âåðñ³ÿ" + IDS_APP_DESCRIPTION "Îïèñ" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INFO_VERSION "\nÂåðñ³ÿ: " + IDS_INFO_DESCRIPTION "\nÎïèñ: " + IDS_INFO_PUBLISHER "\nÂèäàâåöü: " + IDS_INFO_HELPLINK "\nÏîñèëàííÿ ï³äòðèìêè: " + IDS_INFO_HELPPHONE "\nÒåëåôîí ï³äòðèìêè: " + IDS_INFO_README "\n²íôîðìàö³ÿ: " + IDS_INFO_REGOWNER "\nÇàðåºñòðîâàíèé âëàñíèê: " + IDS_INFO_PRODUCTID "\nID ïðîäóêòó: " + IDS_INFO_CONTACT "\nÊîíòàêòíà ³íôîðìàö³ÿ: " + IDS_INFO_UPDATEINFO "\nÎíîâëåííÿ ³íôîðìàö³¿: " + IDS_INFO_INFOABOUT "\nÏðî ³íôîðìàö³ÿ: " + IDS_INFO_COMMENTS "\nÊîìåíòàð³: " + IDS_INFO_INSTLOCATION "\nÂñòàíîâëåííÿ ìîâíèõ ëîêàö³é: " + IDS_INFO_INSTALLSRC "\nÂñòàíîâèòè âèõ³äíèé êîä: " + IDS_INFO_UNINSTALLSTR "\nÂèäàëèòè ðÿäîê: " + IDS_INFO_MODIFYPATH "\nÇì³íèòè øëÿõ: " + IDS_INFO_INSTALLDATE "\nÂñòàíîâèòè äàòó: " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_AINFO_VERSION "\nÂåðñ³ÿ: " + IDS_AINFO_DESCRIPTION "\nÎïèñ: " + IDS_AINFO_SIZE "\nÐîçì³ð: " + IDS_AINFO_URLSITE "\nÄîìàøíÿ ñòîð³íêà: " + IDS_AINFO_LICENCE "\nË³öåíç³ÿ: " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAT_AUDIO "Àóä³î" + IDS_CAT_DEVEL "Ðîçðîáêà" + IDS_CAT_DRIVERS "Äðàéâåðè" + IDS_CAT_EDU "Ðîçâèòîê" + IDS_CAT_ENGINEER "Òåõí³êà" + IDS_CAT_FINANCE "Ô³íàíñè " + IDS_CAT_GAMES "²ãðè òà ðîçâàãè" + IDS_CAT_GRAPHICS "Ãðàô³êà" + IDS_CAT_INTERNET "²íòåðíåò ³ ìåðåæà" + IDS_CAT_LIBS "Á³áë³îòåêè" + IDS_CAT_OFFICE "Îô³ñ" + IDS_CAT_OTHER "²íøå" + IDS_CAT_SCIENCE "Íàóêà" + IDS_CAT_TOOLS "²íñòðóìåíòè" + IDS_CAT_VIDEO "Â³äåî" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "Ìåíåäæåð äîäàòê³â ReactOS" + IDS_SEARCH_TEXT "Ïîøóê..." + IDS_INSTALL "Âñòàíîâèòè" + IDS_UNINSTALL "Âèäàëèòè" + IDS_MODIFY "Çì³íèòè" + IDS_APPS_COUNT "Ê³ëüê³ñòü äîäàòê³â: %d" + IDS_WELCOME_TITLE "Ëàñêàâî ïðîñèìî â Ìåíåäæåð äîäàòê³â ReactOS!\n\n" + IDS_WELCOME_TEXT "Âèáåð³òü êàòåãîð³þ çë³âà, à ïîò³ì âèáåð³òü ïðîãðàìè äëÿ âñòàíîâëåííÿ ÷è âèäàëåííÿ.\nÑòîð³íêà ReactOS: " + IDS_WELCOME_URL "http://www.reactos.org" + IDS_INSTALLED "Âñòàíîâëåíà" + IDS_AVAILABLEFORINST "Äîñòóïí³ äëÿ âñòàíîâëåííÿ" + IDS_UPDATES "Îíîâëåííÿ" + IDS_APPLICATIONS "Äîäàòêè" + IDS_DOWNLOAD_FOLDER "Çàâàíòàæåííÿ" +END Propchange: trunk/reactos/base/applications/rapps/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rs… ============================================================================== --- trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] Sat Aug 15 07:28:45 2009 @@ -1,3 +1,4 @@ #include "lang/en-US.rc" #include "lang/no-NO.rc" //#include "lang/ru-RU.rc" +#include "lang/uk-UA.rc"

1 0

[cgutman] 42675: - Actually zero the select events in ZeroEvents - Part 3 of 3 (hopefully :P)
by cgutman＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: cgutman Date: Sat Aug 15 04:48:59 2009 New Revision: 42675 URL: http://svn.reactos.org/svn/reactos?rev=42675&view=rev Log: - Actually zero the select events in ZeroEvents - Part 3 of 3 (hopefully :P) Modified: trunk/reactos/drivers/network/afd/afd/select.c Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Sat Aug 15 04:48:59 2009 @@ -47,8 +47,10 @@ UINT HandleCount ) { UINT i; - for( i = 0; i < HandleCount; i++ ) + for( i = 0; i < HandleCount; i++ ) { HandleArray[i].Status = 0; + HandleArray[i].Events = 0; + } } @@ -194,9 +196,6 @@ } } - ZeroEvents( PollReq->Handles, - PollReq->HandleCount ); - KeAcquireSpinLock( &DeviceExt->Lock, &OldIrql ); for( i = 0; i < PollReq->HandleCount; i++ ) {

1 0

[cgutman] 42674: - Fix more select bugs related to the disconnect event - Part 2 of x
by cgutman＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: cgutman Date: Sat Aug 15 04:27:02 2009 New Revision: 42674 URL: http://svn.reactos.org/svn/reactos?rev=42674&view=rev Log: - Fix more select bugs related to the disconnect event - Part 2 of x Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sat Aug 15 04:27:02 2009 @@ -29,17 +29,7 @@ static BOOLEAN CantReadMore( PAFD_FCB FCB ) { UINT BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed; - return !BytesAvailable && - (FCB->PollState & (AFD_EVENT_CLOSE | AFD_EVENT_DISCONNECT)); -} - -static VOID HandleEOFOnIrp( PAFD_FCB FCB, NTSTATUS Status, UINT Information ) { - if( !NT_SUCCESS(Status) || - (Status == STATUS_SUCCESS && Information == 0) ) { - AFD_DbgPrint(MID_TRACE,("Looks like an EOF\n")); - FCB->PollState |= AFD_EVENT_DISCONNECT; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } + return !BytesAvailable; } static NTSTATUS TryToSatisfyRecvRequestFromBuffer( PAFD_FCB FCB, @@ -56,8 +46,7 @@ AFD_DbgPrint(MID_TRACE,("Called, BytesAvailable = %d\n", BytesAvailable)); - if( CantReadMore(FCB) ) return STATUS_SUCCESS; - if( !BytesAvailable ) return STATUS_PENDING; + if( CantReadMore(FCB) ) return STATUS_PENDING; Map = (PAFD_MAPBUF)(RecvReq->BufferArray + RecvReq->BufferCount); @@ -115,7 +104,6 @@ if( Status == STATUS_SUCCESS ) FCB->Recv.Content = FCB->ReceiveIrp.Iosb.Information; - HandleEOFOnIrp( FCB, Status, FCB->ReceiveIrp.Iosb.Information ); } } @@ -132,77 +120,45 @@ AFD_DbgPrint(MID_TRACE,("%x %x\n", FCB, Irp)); - if( CantReadMore( FCB ) ) { - /* Success here means that we got an EOF. Complete a pending read - * with zero bytes if we haven't yet overread, then kill the others. - */ - while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { - NextIrpEntry = - RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); - NextIrp = - CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); - NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); - RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; - - AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, - TotalBytesCopied)); - UnlockBuffers( RecvReq->BufferArray, - RecvReq->BufferCount, FALSE ); - Status = NextIrp->IoStatus.Status = - FCB->Overread ? STATUS_END_OF_FILE : STATUS_SUCCESS; - NextIrp->IoStatus.Information = 0; - if( NextIrp == Irp ) RetStatus = Status; - if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); - IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - FCB->Overread = TRUE; - //FCB->PollState |= AFD_EVENT_DISCONNECT; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } - } else { - /* Kick the user that receive would be possible now */ - /* XXX Not implemented yet */ - - AFD_DbgPrint(MID_TRACE,("FCB %x Receive data waiting %d\n", - FCB, FCB->Recv.Content)); - /*OskitDumpBuffer( FCB->Recv.Window, FCB->Recv.Content );*/ - - /* Try to clear some requests */ - while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { - NextIrpEntry = - RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); - NextIrp = - CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); - NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); - RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; - - AFD_DbgPrint(MID_TRACE,("RecvReq @ %x\n", RecvReq)); - - Status = TryToSatisfyRecvRequestFromBuffer - ( FCB, RecvReq, &TotalBytesCopied ); - - if( Status == STATUS_PENDING ) { - AFD_DbgPrint(MID_TRACE,("Ran out of data for %x\n", NextIrp)); - InsertHeadList(&FCB->PendingIrpList[FUNCTION_RECV], - &NextIrp->Tail.Overlay.ListEntry); - break; - } else { - AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, - TotalBytesCopied)); - UnlockBuffers( RecvReq->BufferArray, - RecvReq->BufferCount, FALSE ); - NextIrp->IoStatus.Status = Status; - NextIrp->IoStatus.Information = TotalBytesCopied; - if( NextIrp == Irp ) { - RetStatus = Status; - RetBytesCopied = TotalBytesCopied; - } - if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); - IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - } + /* Kick the user that receive would be possible now */ + /* XXX Not implemented yet */ + + AFD_DbgPrint(MID_TRACE,("FCB %x Receive data waiting %d\n", + FCB, FCB->Recv.Content)); + + /* Try to clear some requests */ + while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { + NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); + NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + + AFD_DbgPrint(MID_TRACE,("RecvReq @ %x\n", RecvReq)); + + Status = TryToSatisfyRecvRequestFromBuffer( FCB, RecvReq, &TotalBytesCopied ); + + if( Status == STATUS_PENDING ) { + AFD_DbgPrint(MID_TRACE,("Ran out of data for %x\n", NextIrp)); + InsertHeadList(&FCB->PendingIrpList[FUNCTION_RECV], + &NextIrp->Tail.Overlay.ListEntry); + break; + } else { + AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, + TotalBytesCopied)); + UnlockBuffers( RecvReq->BufferArray, + RecvReq->BufferCount, FALSE ); + NextIrp->IoStatus.Status = Status; + NextIrp->IoStatus.Information = TotalBytesCopied; + if( NextIrp == Irp ) { + RetStatus = Status; + RetBytesCopied = TotalBytesCopied; } - } - - if( FCB->Recv.Content ) { + if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } + } + + if( !CantReadMore(FCB) ) { FCB->PollState |= AFD_EVENT_RECEIVE; } else FCB->PollState &= ~AFD_EVENT_RECEIVE; @@ -264,11 +220,7 @@ return STATUS_INVALID_PARAMETER; } - HandleEOFOnIrp( FCB, Irp->IoStatus.Status, Irp->IoStatus.Information ); - ReceiveActivity( FCB, NULL ); - - PollReeval( FCB->DeviceExt, FCB->FileObject ); SocketStateUnlock( FCB );

1 0

[cgutman] 42673: - Fix several bugs in select code and remove some dead code - Fix a typo - Part 1 of x
by cgutman＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: cgutman Date: Sat Aug 15 04:09:23 2009 New Revision: 42673 URL: http://svn.reactos.org/svn/reactos?rev=42673&view=rev Log: - Fix several bugs in select code and remove some dead code - Fix a typo - Part 1 of x Modified: trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/select.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/afd/include/afd.h Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Sat Aug 15 04:09:23 2009 @@ -63,6 +63,9 @@ if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; + FCB->PollState |= AFD_EVENT_CONNECT | AFD_EVENT_SEND; + PollReeval( FCB->DeviceExt, FCB->FileObject ); + return Status; } @@ -102,17 +105,12 @@ return STATUS_FILE_CLOSED; } - if( NT_SUCCESS(Irp->IoStatus.Status) ) { - FCB->PollState |= AFD_EVENT_CONNECT | AFD_EVENT_SEND; - AFD_DbgPrint(MID_TRACE,("Going to connected state %d\n", FCB->State)); - FCB->State = SOCKET_STATE_CONNECTED; - } else { - FCB->PollState |= AFD_EVENT_CONNECT_FAIL | AFD_EVENT_RECEIVE; + if( !NT_SUCCESS(Irp->IoStatus.Status) ) { + FCB->PollState |= AFD_EVENT_CONNECT_FAIL; AFD_DbgPrint(MID_TRACE,("Going to bound state\n")); FCB->State = SOCKET_STATE_BOUND; - } - - PollReeval( FCB->DeviceExt, FCB->FileObject ); + PollReeval( FCB->DeviceExt, FCB->FileObject ); + } /* Succeed pending irps on the FUNCTION_CONNECT list */ while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_CONNECT] ) ) { 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] Sat Aug 15 04:09:23 2009 @@ -36,11 +36,6 @@ else Status = MakeSocketIntoConnection( FCB ); - if( NT_SUCCESS(Status) ) { - FCB->PollState |= AFD_EVENT_SEND; - PollReeval( DeviceExt, NewFileObject ); - } - return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); } @@ -192,8 +187,11 @@ /* Trigger a select return if appropriate */ if( !IsListEmpty( &FCB->PendingConnections ) ) { FCB->PollState |= AFD_EVENT_ACCEPT; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } + } else { + FCB->PollState &= ~AFD_EVENT_ACCEPT; + } + + PollReeval( FCB->DeviceExt, FCB->FileObject ); SocketStateUnlock( FCB ); @@ -296,7 +294,11 @@ AFD_DbgPrint(MID_TRACE,("Completed a wait for accept\n")); - FCB->PollState &= ~AFD_EVENT_ACCEPT; + if ( IsListEmpty( &FCB->PendingConnections ) ) + FCB->PollState &= ~AFD_EVENT_ACCEPT; + else + FCB->PollState |= AFD_EVENT_ACCEPT; + PollReeval( FCB->DeviceExt, FCB->FileObject ); SocketStateUnlock( FCB ); @@ -322,8 +324,6 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - FCB->EventsFired &= ~AFD_EVENT_ACCEPT; - if( FCB->NeedsNewListen ) { AFD_DbgPrint(MID_TRACE,("ADDRESSFILE: %x\n", FCB->AddressFile.Handle)); @@ -412,8 +412,11 @@ if( IsListEmpty( &FCB->PendingConnections ) ) { FCB->PollState &= ~AFD_EVENT_ACCEPT; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } + } else { + FCB->PollState |= AFD_EVENT_ACCEPT; + } + + PollReeval( FCB->DeviceExt, FCB->FileObject ); SocketStateUnlock( FCB ); return Status; 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] Sat Aug 15 04:09:23 2009 @@ -300,6 +300,9 @@ if (ConnInfo) ExFreePool( ConnInfo ); + FCB->PollState |= AFD_EVENT_DISCONNECT; + PollReeval( FCB->DeviceExt, FCB->FileObject ); + return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); } Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sat Aug 15 04:09:23 2009 @@ -303,9 +303,6 @@ Irp, 0 ); } - FCB->EventsFired &= ~AFD_EVENT_RECEIVE; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - if( !(RecvReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); @@ -332,7 +329,7 @@ Status = ReceiveActivity( FCB, Irp ); - if( Status == STATUS_PENDING && RecvReq->AfdFlags & AFD_IMMEDIATE ) { + if( Status == STATUS_PENDING && (RecvReq->AfdFlags & AFD_IMMEDIATE) ) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); Status = STATUS_CANT_WAIT; TotalBytesCopied = 0; @@ -595,8 +592,6 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - FCB->EventsFired &= ~AFD_EVENT_RECEIVE; - /* Check that the socket is bound */ if( FCB->State != SOCKET_STATE_BOUND ) return UnlockAndMaybeComplete @@ -660,10 +655,12 @@ } else if( RecvReq->AfdFlags & AFD_IMMEDIATE ) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); Status = STATUS_CANT_WAIT; + FCB->PollState &= ~AFD_EVENT_RECEIVE; PollReeval( FCB->DeviceExt, FCB->FileObject ); UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); } else { + FCB->PollState &= ~AFD_EVENT_RECEIVE; PollReeval( FCB->DeviceExt, FCB->FileObject ); return LeaveIrpUntilLater( FCB, Irp, FUNCTION_RECV ); } Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Sat Aug 15 04:09:23 2009 @@ -205,23 +205,16 @@ FileObject = (PFILE_OBJECT)AFD_HANDLES(PollReq)[i].Handle; FCB = FileObject->FsContext; - if( (FCB->PollState & AFD_EVENT_CLOSE) || - (PollReq->Handles[i].Status & AFD_EVENT_CLOSE) ) { - PollReq->Handles[i].Events = 0; - PollReq->Handles[i].Status = AFD_EVENT_CLOSE; - Signalled++; - } else { - AFD_DbgPrint(MID_TRACE, ("AFD: Select Events: ")); - PrintEvents( PollReq->Handles[i].Events ); - AFD_DbgPrint(MID_TRACE,("\n")); - - PollReq->Handles[i].Status = + AFD_DbgPrint(MID_TRACE, ("AFD: Select Events: ")); + PrintEvents( PollReq->Handles[i].Events ); + AFD_DbgPrint(MID_TRACE,("\n")); + + PollReq->Handles[i].Status = PollReq->Handles[i].Events & FCB->PollState; - if( PollReq->Handles[i].Status ) { + if( PollReq->Handles[i].Status ) { AFD_DbgPrint(MID_TRACE,("Signalling %x with %x\n", FCB, FCB->PollState)); Signalled++; - } } } @@ -286,7 +279,6 @@ EventSelectInfo->EventObject, EventSelectInfo->Events)); - FCB->EventSelectTriggers = FCB->EventsFired = 0; if( FCB->EventSelect ) ObDereferenceObject( FCB->EventSelect ); FCB->EventSelect = NULL; @@ -303,8 +295,8 @@ FCB->EventSelect = NULL; else FCB->EventSelectTriggers = EventSelectInfo->Events; - } else /* Work done, cancelling select */ - Status = STATUS_SUCCESS; + } else + Status = STATUS_INVALID_PARAMETER; AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); @@ -370,7 +362,6 @@ PAFD_FCB FCB; KIRQL OldIrql; PAFD_POLL_INFO PollReq; - PKEVENT EventSelect = NULL; AFD_DbgPrint(MID_TRACE,("Called: DeviceExt %x FileObject %x\n", DeviceExt, FileObject)); @@ -383,16 +374,6 @@ if( !FCB ) { KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); return; - } - - /* Not sure if i can do this at DISPATCH_LEVEL ... try it at passive */ - AFD_DbgPrint(MID_TRACE,("Current State: %x, Events Fired: %x, " - "Select Triggers %x\n", - FCB->PollState, FCB->EventsFired, - FCB->EventSelectTriggers)); - if( FCB->PollState & ~FCB->EventsFired & FCB->EventSelectTriggers ) { - FCB->EventsFired |= FCB->PollState; - EventSelect = FCB->EventSelect; } /* Now signal normal select irps */ @@ -413,8 +394,10 @@ KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); - AFD_DbgPrint(MID_TRACE,("Setting event %x\n", EventSelect)); - if( EventSelect ) KeSetEvent( EventSelect, IO_NETWORK_INCREMENT, FALSE ); + if( FCB->EventSelect && (FCB->PollState & FCB->EventSelectTriggers) ) { + AFD_DbgPrint(MID_TRACE,("Setting event %x\n", FCB->EventSelect)); + KeSetEvent( FCB->EventSelect, IO_NETWORK_INCREMENT, FALSE ); + } AFD_DbgPrint(MID_TRACE,("Leaving\n")); } 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] Sat Aug 15 04:09:23 2009 @@ -223,8 +223,6 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - FCB->EventsFired &= ~AFD_EVENT_SEND; - if( FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS ) { PAFD_SEND_INFO_UDP SendReq; @@ -393,7 +391,6 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - FCB->EventsFired &= ~AFD_EVENT_SEND; FCB->PollState &= ~AFD_EVENT_SEND; PollReeval( FCB->DeviceExt, FCB->FileObject ); 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] Sat Aug 15 04:09:23 2009 @@ -196,7 +196,6 @@ KEVENT StateLockedEvent; PKEVENT EventSelect; DWORD EventSelectTriggers; - DWORD EventsFired; UNICODE_STRING TdiDeviceName; PVOID Context; DWORD PollState;

1 0

[tkreuzer] 42672: Fix screwed logic in LIST_FOR_EACH and LIST_FOR_EACH_SAFE. They were 1. using inverse logic and entering the loop when elem was NULL, 2. checking elem, whick is the result of CONTAINING_RECORD on the Flink pointer that should be checked for NULL. Anyway these macros are ugly and shouldn't be used, they only obfuscate the code.
by tkreuzer＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: tkreuzer Date: Sat Aug 15 02:40:09 2009 New Revision: 42672 URL: http://svn.reactos.org/svn/reactos?rev=42672&view=rev Log: Fix screwed logic in LIST_FOR_EACH and LIST_FOR_EACH_SAFE. They were 1. using inverse logic and entering the loop when elem was NULL, 2. checking elem, whick is the result of CONTAINING_RECORD on the Flink pointer that should be checked for NULL. Anyway these macros are ugly and shouldn't be used, they only obfuscate the code. Modified: trunk/reactos/subsystems/win32/win32k/pch.h Modified: trunk/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] Sat Aug 15 02:40:09 2009 @@ -152,13 +152,13 @@ #define LIST_FOR_EACH(elem, list, type, field) \ for ((elem) = CONTAINING_RECORD((list)->Flink, type, field); \ - &(elem)->field != (list) || (elem == NULL); \ + &(elem)->field != (list) && ((&((elem)->field)) != NULL); \ (elem) = CONTAINING_RECORD((elem)->field.Flink, type, field)) #define LIST_FOR_EACH_SAFE(cursor, cursor2, list, type, field) \ for ((cursor) = CONTAINING_RECORD((list)->Flink, type, field), \ (cursor2) = CONTAINING_RECORD((cursor)->field.Flink, type, field); \ - &(cursor)->field != (list) || (cursor == NULL); \ + &(cursor)->field != (list) && ((&((cursor)->field)) != NULL); \ (cursor) = (cursor2), \ (cursor2) = CONTAINING_RECORD((cursor)->field.Flink, type, field))

1 0

[tkreuzer] 42671: [win32k] EngCreateDeviceBitmap: handle failure of EngLockSurface. Found by Amine.
by tkreuzer＠svn.reactos.org 14 Aug '09

14 Aug '09

Author: tkreuzer Date: Sat Aug 15 00:08:15 2009 New Revision: 42671 URL: http://svn.reactos.org/svn/reactos?rev=42671&view=rev Log: [win32k] EngCreateDeviceBitmap: handle failure of EngLockSurface. Found by Amine. Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Sat Aug 15 00:08:15 2009 @@ -191,6 +191,13 @@ } pso = EngLockSurface((HSURF)NewBitmap); + if (!pso) + { + DPRINT1("EngLockSurface failed on newly created bitmap!\n"); + GreDeleteObject(NewBitmap); + return NULL; + } + pso->dhsurf = dhsurf; EngUnlockSurface(pso);

1 0

[fireball] 42670: - Merge 42376-42400.
by fireball＠svn.reactos.org 14 Aug '09

14 Aug '09

Author: fireball Date: Fri Aug 14 22:21:33 2009 New Revision: 42670 URL: http://svn.reactos.org/svn/reactos?rev=42670&view=rev Log: - Merge 42376-42400. Added: branches/arwinss/reactos/base/applications/rapps/ (props changed) - copied from r42400, trunk/reactos/base/applications/rapps/ Removed: branches/arwinss/reactos/include/reactos/wine/dlgs.h branches/arwinss/reactos/include/reactos/wine/mmddk.h branches/arwinss/reactos/include/reactos/wine/mmsystem.h branches/arwinss/reactos/include/reactos/wine/prsht.h branches/arwinss/reactos/include/reactos/wine/sys/ branches/arwinss/reactos/include/reactos/wine/winnetwk.h branches/arwinss/reactos/include/reactos/wine/winnls.h branches/arwinss/reactos/include/reactos/wine/winnt.h branches/arwinss/reactos/include/reactos/wine/winspool.h branches/arwinss/reactos/include/reactos/wine/winuser.h branches/arwinss/reactos/lib/rtl/i386/random_asm.S branches/arwinss/reactos/lib/sdk/crt/stdlib/ecvtbuf.c Modified: branches/arwinss/reactos/ (props changed) branches/arwinss/reactos/base/applications/applications.rbuild branches/arwinss/reactos/base/applications/rapps/lang/ (props changed) branches/arwinss/reactos/base/applications/rapps/rapps/ (props changed) branches/arwinss/reactos/base/applications/rapps/res/ (props changed) branches/arwinss/reactos/base/applications/rapps/res/cats/ (props changed) branches/arwinss/reactos/base/services/dhcp/adapter.c branches/arwinss/reactos/dll/directx/dsound/dsound.rbuild branches/arwinss/reactos/dll/ntdll/def/ntdll_arm.def branches/arwinss/reactos/dll/ntdll/def/ntdll_i386.def branches/arwinss/reactos/dll/win32/comctl32/comctl32.rbuild branches/arwinss/reactos/dll/win32/comdlg32/comdlg32.rbuild branches/arwinss/reactos/dll/win32/cryptui/cryptui.rbuild branches/arwinss/reactos/dll/win32/dbghelp/dbghelp.rbuild branches/arwinss/reactos/dll/win32/kernel32/misc/ldr.c branches/arwinss/reactos/dll/win32/mciwave/mciwave.rbuild branches/arwinss/reactos/dll/win32/mpr/mpr.rbuild branches/arwinss/reactos/dll/win32/msvfw32/msvfw32.rbuild branches/arwinss/reactos/dll/win32/msxml3/msxml3.rbuild branches/arwinss/reactos/dll/win32/shell32/shell32.rbuild branches/arwinss/reactos/dll/win32/wininet/wininet.rbuild branches/arwinss/reactos/dll/win32/winmm/winmm.rbuild branches/arwinss/reactos/drivers/ksfilter/ks/api.c branches/arwinss/reactos/drivers/network/afd/afd/bind.c branches/arwinss/reactos/drivers/network/afd/afd/connect.c branches/arwinss/reactos/drivers/network/afd/afd/main.c branches/arwinss/reactos/drivers/network/afd/afd/tdi.c branches/arwinss/reactos/drivers/network/dd/pcnet/requests.c branches/arwinss/reactos/drivers/network/tcpip/include/fileobjs.h branches/arwinss/reactos/drivers/network/tcpip/include/lock.h branches/arwinss/reactos/drivers/network/tcpip/recmutex/recmutex.c branches/arwinss/reactos/drivers/network/tcpip/recmutex/recmutex.h branches/arwinss/reactos/drivers/network/tcpip/tcpip/fileobjs.c branches/arwinss/reactos/drivers/network/tcpip/tcpip/lock.c branches/arwinss/reactos/drivers/network/tcpip/tcpip/main.c branches/arwinss/reactos/include/psdk/ks.h branches/arwinss/reactos/include/psdk/mmddk.h branches/arwinss/reactos/include/psdk/mmsystem.h branches/arwinss/reactos/include/psdk/winnt.h branches/arwinss/reactos/include/reactos/wine/port.h branches/arwinss/reactos/lib/drivers/ip/network/ports.c branches/arwinss/reactos/lib/rtl/random.c branches/arwinss/reactos/lib/rtl/rtl.rbuild branches/arwinss/reactos/lib/sdk/crt/crt.rbuild branches/arwinss/reactos/lib/sdk/crt/stdio/lnx_sprintf.c branches/arwinss/reactos/lib/sdk/crt/stdlib/ecvt.c branches/arwinss/reactos/ntoskrnl/cc/copy.c branches/arwinss/reactos/tools/gendib/gendib.c branches/arwinss/reactos/tools/rsym/rsym.c (props changed) branches/arwinss/reactos/tools/rsym/rsym.h (props changed) branches/arwinss/reactos/tools/rsym/rsym.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/applicatio… Modified: branches/arwinss/reactos/base/services/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/services/d… Modified: branches/arwinss/reactos/dll/directx/dsound/dsound.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/directx/dso… Modified: branches/arwinss/reactos/dll/ntdll/def/ntdll_arm.def URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/ntdll/def/n… Modified: branches/arwinss/reactos/dll/ntdll/def/ntdll_i386.def URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/ntdll/def/n… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comdlg32/comdlg32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comdl… Modified: branches/arwinss/reactos/dll/win32/cryptui/cryptui.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/crypt… Modified: branches/arwinss/reactos/dll/win32/dbghelp/dbghelp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/dbghe… Modified: branches/arwinss/reactos/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/kerne… Modified: branches/arwinss/reactos/dll/win32/mciwave/mciwave.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/mciwa… Modified: branches/arwinss/reactos/dll/win32/mpr/mpr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/mpr/m… Modified: branches/arwinss/reactos/dll/win32/msvfw32/msvfw32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/msvfw… Modified: branches/arwinss/reactos/dll/win32/msxml3/msxml3.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/msxml… Modified: branches/arwinss/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/shell… Modified: branches/arwinss/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winin… Modified: branches/arwinss/reactos/dll/win32/winmm/winmm.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winmm… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/dd/pcnet/requests.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/tcpip/include/fileobjs.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/tcpip/include/lock.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/tcpip/recmutex/recmutex.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/tcpip/recmutex/recmutex.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/tcpip/tcpip/lock.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/ks… Modified: branches/arwinss/reactos/include/psdk/mmddk.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/mm… Modified: branches/arwinss/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/mm… Modified: branches/arwinss/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… Removed: branches/arwinss/reactos/include/reactos/wine/dlgs.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Removed: branches/arwinss/reactos/include/reactos/wine/mmddk.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Removed: branches/arwinss/reactos/include/reactos/wine/mmsystem.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Modified: branches/arwinss/reactos/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Removed: branches/arwinss/reactos/include/reactos/wine/prsht.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Removed: branches/arwinss/reactos/include/reactos/wine/winnetwk.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Removed: branches/arwinss/reactos/include/reactos/wine/winnls.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Removed: branches/arwinss/reactos/include/reactos/wine/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Removed: branches/arwinss/reactos/include/reactos/wine/winspool.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Removed: branches/arwinss/reactos/include/reactos/wine/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Modified: branches/arwinss/reactos/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/ip/… Removed: branches/arwinss/reactos/lib/rtl/i386/random_asm.S URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/rtl/i386/ra… Modified: branches/arwinss/reactos/lib/rtl/random.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/rtl/random.… Modified: branches/arwinss/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/rtl/rtl.rbu… Modified: branches/arwinss/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/crt/crt… Modified: branches/arwinss/reactos/lib/sdk/crt/stdio/lnx_sprintf.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/crt/std… Modified: branches/arwinss/reactos/lib/sdk/crt/stdlib/ecvt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/crt/std… Removed: branches/arwinss/reactos/lib/sdk/crt/stdlib/ecvtbuf.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/crt/std… Modified: branches/arwinss/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/cc/cop… Modified: branches/arwinss/reactos/tools/gendib/gendib.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/gendib/ge…

1 0

[janderwald] 42669: - Implement KsPropertyHandler, KsPropertyHandlerWithAllocator, KsFastPropertyHandler
by janderwald＠svn.reactos.org 14 Aug '09

14 Aug '09

Author: janderwald Date: Fri Aug 14 21:44:01 2009 New Revision: 42669 URL: http://svn.reactos.org/svn/reactos?rev=42669&view=rev Log: - Implement KsPropertyHandler, KsPropertyHandlerWithAllocator, KsFastPropertyHandler Modified: trunk/reactos/drivers/ksfilter/ks/filter.c trunk/reactos/drivers/ksfilter/ks/property.c Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Fri Aug 14 21:44:01 2009 @@ -637,57 +637,6 @@ } NTSTATUS -FindPropertyHandler( - IN PIO_STATUS_BLOCK IoStatus, - IN KSPROPERTY_SET * FilterPropertySet, - IN ULONG FilterPropertySetCount, - IN PKSPROPERTY Property, - IN ULONG InputBufferLength, - IN ULONG OutputBufferLength, - OUT PFNKSHANDLER *PropertyHandler) -{ - ULONG Index, ItemIndex; - - for(Index = 0; Index < FilterPropertySetCount; Index++) - { - if (IsEqualGUIDAligned(&Property->Set, FilterPropertySet[Index].Set)) - { - for(ItemIndex = 0; ItemIndex < FilterPropertySet[Index].PropertiesCount; ItemIndex++) - { - if (FilterPropertySet[Index].PropertyItem[ItemIndex].PropertyId == Property->Id) - { - if (Property->Flags & KSPROPERTY_TYPE_SET) - *PropertyHandler = FilterPropertySet[Index].PropertyItem[ItemIndex].SetPropertyHandler; - - if (Property->Flags & KSPROPERTY_TYPE_GET) - *PropertyHandler = FilterPropertySet[Index].PropertyItem[ItemIndex].GetPropertyHandler; - - if (FilterPropertySet[Index].PropertyItem[ItemIndex].MinProperty > InputBufferLength) - { - /* too small input buffer */ - IoStatus->Information = FilterPropertySet[Index].PropertyItem[ItemIndex].MinProperty; - IoStatus->Status = STATUS_BUFFER_TOO_SMALL; - return STATUS_BUFFER_TOO_SMALL; - } - - if (FilterPropertySet[Index].PropertyItem[ItemIndex].MinData > OutputBufferLength) - { - /* too small output buffer */ - IoStatus->Information = FilterPropertySet[Index].PropertyItem[ItemIndex].MinData; - IoStatus->Status = STATUS_BUFFER_TOO_SMALL; - return STATUS_BUFFER_TOO_SMALL; - } - return STATUS_SUCCESS; - } - } - } - } - return STATUS_UNSUCCESSFUL; -} - - - -NTSTATUS NTAPI IKsFilter_DispatchDeviceIoControl( IN PDEVICE_OBJECT DeviceObject, @@ -724,7 +673,7 @@ } /* find a supported property handler */ - Status = FindPropertyHandler(&Irp->IoStatus, FilterPropertySet, 2, IoStack->Parameters.DeviceIoControl.Type3InputBuffer, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, &PropertyHandler); + Status = KsPropertyHandler(Irp, 2, FilterPropertySet); if (NT_SUCCESS(Status)) { KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (PVOID)This; Modified: trunk/reactos/drivers/ksfilter/ks/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/proper… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] Fri Aug 14 21:44:01 2009 @@ -8,8 +8,129 @@ #include "priv.h" -/* - @unimplemented + +NTSTATUS +FindPropertyHandler( + IN PIO_STATUS_BLOCK IoStatus, + IN const KSPROPERTY_SET* PropertySet, + IN ULONG PropertySetCount, + IN PKSPROPERTY Property, + IN ULONG InputBufferLength, + IN ULONG OutputBufferLength, + OUT PFNKSHANDLER *PropertyHandler) +{ + ULONG Index, ItemIndex; + + for(Index = 0; Index < PropertySetCount; Index++) + { + if (IsEqualGUIDAligned(&Property->Set, PropertySet[Index].Set)) + { + for(ItemIndex = 0; ItemIndex < PropertySet[Index].PropertiesCount; ItemIndex++) + { + if (PropertySet[Index].PropertyItem[ItemIndex].PropertyId == Property->Id) + { + if (PropertySet[Index].PropertyItem[ItemIndex].MinProperty > InputBufferLength) + { + /* too small input buffer */ + IoStatus->Information = PropertySet[Index].PropertyItem[ItemIndex].MinProperty; + return STATUS_INVALID_PARAMETER; + } + + if (PropertySet[Index].PropertyItem[ItemIndex].MinData > OutputBufferLength) + { + /* too small output buffer */ + IoStatus->Information = PropertySet[Index].PropertyItem[ItemIndex].MinData; + return STATUS_BUFFER_TOO_SMALL; + } + + if (Property->Flags & KSPROPERTY_TYPE_SET) + *PropertyHandler = PropertySet[Index].PropertyItem[ItemIndex].SetPropertyHandler; + + if (Property->Flags & KSPROPERTY_TYPE_GET) + *PropertyHandler = PropertySet[Index].PropertyItem[ItemIndex].GetPropertyHandler; + + return STATUS_SUCCESS; + } + } + } + } + return STATUS_NOT_FOUND; +} + + +NTSTATUS +KspPropertyHandler( + IN PIRP Irp, + IN ULONG PropertySetsCount, + IN const KSPROPERTY_SET* PropertySet, + IN PFNKSALLOCATOR Allocator OPTIONAL, + IN ULONG PropertyItemSize OPTIONAL) +{ + PKSPROPERTY Property; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + PFNKSHANDLER PropertyHandler; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* check if inputbuffer at least holds KSPROPERTY item */ + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KSPROPERTY)) + { + /* invalid parameter */ + Irp->IoStatus.Information = sizeof(KSPROPERTY); + return STATUS_INVALID_BUFFER_SIZE; + } + + /* FIXME probe the input / output buffer if from user mode */ + + + /* get input property request */ + Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + /* sanity check */ + ASSERT(PropertyItemSize == 0 || PropertyItemSize == sizeof(KSPROPERTY_ITEM)); + if (IsEqualGUIDAligned(&Property->Set, &KSPROPSETID_Topology)) + { + /* use KsTopologyPropertyHandler for this business */ + return STATUS_INVALID_PARAMETER; + } + + /* find the property handler */ + Status = FindPropertyHandler(&Irp->IoStatus, PropertySet, PropertySetsCount, Property, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, &PropertyHandler); + + if (NT_SUCCESS(Status)) + { + /* call property handler */ + Status = PropertyHandler(Irp, Property, Irp->UserBuffer); + + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* output buffer is too small */ + if (Allocator) + { + /* allocate the requested amount */ + Status = Allocator(Irp, Irp->IoStatus.Information, FALSE); + + /* check if the block was allocated */ + if (!NT_SUCCESS(Status)) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* re-call property handler */ + Status = PropertyHandler(Irp, Property, Irp->UserBuffer); + } + } + } + + /* done */ + return Status; +} + +/* + @implemented */ KSDDKAPI NTSTATUS @@ -19,13 +140,12 @@ IN ULONG PropertySetsCount, IN const KSPROPERTY_SET* PropertySet) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - - -/* - @unimplemented + return KspPropertyHandler(Irp, PropertySetsCount, PropertySet, NULL, 0); +} + + +/* + @implemented */ KSDDKAPI NTSTATUS @@ -37,9 +157,47 @@ IN PFNKSALLOCATOR Allocator OPTIONAL, IN ULONG PropertyItemSize OPTIONAL) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} + return KspPropertyHandler(Irp, PropertySetsCount, PropertySet, Allocator, PropertyItemSize); +} + +NTSTATUS +FindFastPropertyHandler( + IN ULONG FastIoCount, + IN const KSFASTPROPERTY_ITEM * FastIoTable, + IN PKSPROPERTY PropertyId, + OUT PFNKSFASTHANDLER * FastPropertyHandler) +{ + ULONG Index; + + /* iterate through all items */ + for(Index = 0; Index < FastIoCount; Index++) + { + if (PropertyId->Id == FastIoTable[Index].PropertyId) + { + if (PropertyId->Flags & KSPROPERTY_TYPE_SET) + { + if (FastIoTable[Index].SetSupported) + { + *FastPropertyHandler = FastIoTable[Index].SetPropertyHandler; + return STATUS_SUCCESS; + } + } + + if (PropertyId->Flags & KSPROPERTY_TYPE_GET) + { + if (FastIoTable[Index].GetSupported) + { + *FastPropertyHandler = FastIoTable[Index].GetPropertyHandler; + return STATUS_SUCCESS; + } + } + } + + } + /* no fast property handler found */ + return STATUS_NOT_FOUND; +} + /* @unimplemented @@ -57,6 +215,68 @@ IN ULONG PropertySetsCount, IN const KSPROPERTY_SET* PropertySet) { - UNIMPLEMENTED; + KSPROPERTY PropRequest; + KPROCESSOR_MODE Mode; + NTSTATUS Status = STATUS_SUCCESS; + ULONG Index; + PFNKSFASTHANDLER FastPropertyHandler; + + if (PropertyLength < sizeof(KSPROPERTY)) + { + /* invalid request */ + return FALSE; + } + + /* get previous mode */ + Mode = ExGetPreviousMode(); + + if (Mode == KernelMode) + { + /* just copy it */ + RtlMoveMemory(&PropRequest, Property, sizeof(KSPROPERTY)); + } + else + { + /* need to probe the buffer */ + _SEH2_TRY + { + ProbeForRead(Property, sizeof(KSPROPERTY), sizeof(UCHAR)); + RtlMoveMemory(&PropRequest, Property, sizeof(KSPROPERTY)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Exception, get the error code */ + Status = _SEH2_GetExceptionCode(); + }_SEH2_END; + + if (!NT_SUCCESS(Status)) + return FALSE; + } + + /* are there any property sets provided */ + if (PropertySetsCount) + { + /* iterate through all property sets count */ + Index = 0; + do + { + /* does the property id match */ + if (IsEqualGUIDAligned(PropertySet[Index].Set, &PropRequest.Set)) + { + /* try to find a fast property handler */ + Status = FindFastPropertyHandler(PropertySet[Index].FastIoCount, PropertySet[Index].FastIoTable, &PropRequest, &FastPropertyHandler); + + if (NT_SUCCESS(Status)) + { + /* call fast property handler */ + ASSERT(PropertyLength == sizeof(KSPROPERTY)); /* FIXME check if property length is bigger -> copy params */ + ASSERT(Mode == KernelMode); /* FIXME need to probe usermode output buffer */ + return FastPropertyHandler(FileObject, &PropRequest, sizeof(KSPROPERTY), Data, DataLength, IoStatus); + } + } + /* move to next item */ + Index++; + }while(Index < PropertySetsCount); + } return FALSE; }

1 0

[fireball] 42668: - Merge 42350-42376.
by fireball＠svn.reactos.org 14 Aug '09

14 Aug '09

Author: fireball Date: Fri Aug 14 21:36:55 2009 New Revision: 42668 URL: http://svn.reactos.org/svn/reactos?rev=42668&view=rev Log: - Merge 42350-42376. Added: branches/arwinss/reactos/include/ddk/swenum.h - copied unchanged from r42375, trunk/reactos/include/ddk/swenum.h Modified: branches/arwinss/reactos/ (props changed) branches/arwinss/reactos/ReactOS-generic.rbuild branches/arwinss/reactos/base/applications/network/ping/ping.c branches/arwinss/reactos/base/applications/paint/drawing.c branches/arwinss/reactos/base/applications/paint/winproc.c branches/arwinss/reactos/base/setup/reactos/reactos.c branches/arwinss/reactos/dll/cpl/mmsys/volume.c branches/arwinss/reactos/dll/win32/gdiplus/graphicspath.c branches/arwinss/reactos/dll/win32/kernel32/kernel32.rbuild branches/arwinss/reactos/drivers/network/afd/afd/tdi.c branches/arwinss/reactos/drivers/network/dd/pcnet/pcnet.c branches/arwinss/reactos/drivers/network/tcpip/tcpip/fileobjs.c branches/arwinss/reactos/drivers/storage/class/ramdisk/ramdisk.c branches/arwinss/reactos/include/ddk/strmini.h branches/arwinss/reactos/lib/3rdparty/mingw/gs_support.c branches/arwinss/reactos/lib/drivers/ip/network/address.c branches/arwinss/reactos/lib/drivers/ip/network/interface.c branches/arwinss/reactos/lib/drivers/ip/network/neighbor.c branches/arwinss/reactos/lib/drivers/ip/transport/datagram/datagram.c branches/arwinss/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c branches/arwinss/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c branches/arwinss/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c branches/arwinss/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/header.c branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c branches/arwinss/reactos/lib/sdk/crt/mbstring/mbslwr.c branches/arwinss/reactos/lib/sdk/crt/stdio/stat64.c branches/arwinss/reactos/ntoskrnl/ke/freeldr.c branches/arwinss/reactos/ntoskrnl/ke/i386/kiinit.c branches/arwinss/reactos/tools/rsym/rsym.c (props changed) branches/arwinss/reactos/tools/rsym/rsym.h (props changed) branches/arwinss/reactos/tools/rsym/rsym.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed) Propchange: branches/arwinss/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 14 21:36:55 2009 @@ -1,1 +1,1 @@ -/trunk/reactos:42000-42350,42376,42419 +/trunk/reactos:42000-42376,42419 Modified: branches/arwinss/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ReactOS-generic… ============================================================================== --- branches/arwinss/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/ReactOS-generic.rbuild [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -95,6 +95,7 @@ <group compilerset="msc"> <define name="inline" compiler="cc">__inline</define> + <define name="__STDC__" compiler="cc">1</define> <compilerflag>/Zl</compilerflag> <compilerflag>/Zi</compilerflag> <compilerflag>/W1</compilerflag> Modified: branches/arwinss/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/applicatio… ============================================================================== --- branches/arwinss/reactos/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ branches/arwinss/reactos/base/applications/network/ping/ping.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -437,6 +437,14 @@ return FALSE; } + if (from->sin_addr.s_addr != Target.sin_addr.s_addr) + { +#ifndef NDEBUG + printf("Bad source address (%s should be %s)\n", inet_ntoa(from->sin_addr), inet_ntoa(Target.sin_addr)); +#endif /* !NDEBUG */ + return FALSE; + } + QueryTime(&LargeTime); RelativeTime.QuadPart = (LargeTime.QuadPart - Icmp->Timestamp.QuadPart); @@ -543,44 +551,40 @@ Timeval.tv_sec = Timeout / 1000; Timeval.tv_usec = Timeout % 1000; - Status = select(0, &Fds, NULL, NULL, &Timeval); - if ((Status != SOCKET_ERROR) && (Status != 0)) - { - Length = sizeof(From); - Status = recvfrom(IcmpSock, Buffer, Size, 0, &From, &Length); + do { + Status = select(0, &Fds, NULL, NULL, &Timeval); + if ((Status != SOCKET_ERROR) && (Status != 0)) + { + Length = sizeof(From); + Status = recvfrom(IcmpSock, Buffer, Size, 0, &From, &Length); #ifndef NDEBUG - printf("Received packet\n"); - DisplayBuffer(Buffer, Status); - printf("\n"); + printf("Received packet\n"); + DisplayBuffer(Buffer, Status); + printf("\n"); #endif /* !NDEBUG */ - } - else - LostCount++; - if (Status == SOCKET_ERROR) - { - if (WSAGetLastError() != WSAETIMEDOUT) - { - printf("Could not receive data (%d).\n", WSAGetLastError()); + } + else + LostCount++; + if (Status == SOCKET_ERROR) + { + if (WSAGetLastError() != WSAETIMEDOUT) + { + printf("Could not receive data (%d).\n", WSAGetLastError()); + GlobalFree(Buffer); + return FALSE; + } + Status = 0; + } + + if (Status == 0) + { + printf("Request timed out.\n"); GlobalFree(Buffer); - return FALSE; - } - Status = 0; - } - - if (Status == 0) - { - printf("Request timed out.\n"); - GlobalFree(Buffer); - return TRUE; - } - - if (!DecodeResponse(Buffer, Status, (PSOCKADDR_IN)&From)) - { - /* FIXME: Wait again as it could be another ICMP message type */ - printf("Request timed out (incomplete datagram received).\n"); - LostCount++; - } + return TRUE; + } + + } while (!DecodeResponse(Buffer, Status, (PSOCKADDR_IN)&From)); GlobalFree(Buffer); return TRUE; Modified: branches/arwinss/reactos/base/applications/paint/drawing.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/applicatio… ============================================================================== --- branches/arwinss/reactos/base/applications/paint/drawing.c [iso-8859-1] (original) +++ branches/arwinss/reactos/base/applications/paint/drawing.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -81,12 +81,13 @@ void Bezier(HDC hdc, POINT p1, POINT p2, POINT p3, POINT p4, int color, int thickness) { + HPEN oldPen; POINT fourPoints[4]; fourPoints[0] = p1; fourPoints[1] = p2; fourPoints[2] = p3; fourPoints[3] = p4; - HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, color)); + oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, color)); PolyBezier(hdc, fourPoints, 4); DeleteObject(SelectObject(hdc, oldPen)); } Modified: branches/arwinss/reactos/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/applicatio… ============================================================================== --- branches/arwinss/reactos/base/applications/paint/winproc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/base/applications/paint/winproc.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -313,8 +313,9 @@ if (hwnd==hwndMiniature) { long mclient[4]; + HDC hdc; GetClientRect(hwndMiniature, (LPRECT)&mclient); - HDC hdc = GetDC(hwndMiniature); + hdc = GetDC(hwndMiniature); BitBlt(hdc, -min(imgXRes*GetScrollPos(hScrollbox, SB_HORZ)/10000, imgXRes-mclient[2]), -min(imgYRes*GetScrollPos(hScrollbox, SB_VERT)/10000, imgYRes-mclient[3]), imgXRes, imgYRes, hDrawingDC, 0, 0, SRCCOPY); ReleaseDC(hwndMiniature, hdc); Modified: branches/arwinss/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/setup/reac… ============================================================================== --- branches/arwinss/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ branches/arwinss/reactos/base/setup/reactos/reactos.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -364,8 +364,9 @@ if (tindex != CB_ERR) { + WORD LangID; SetupData.SelectedLangId = SendMessage(hList, CB_GETITEMDATA, (WPARAM) tindex, (LPARAM) 0); - WORD LangID = _tcstol(SetupData.pLanguages[SetupData.SelectedLangId].LangId, NULL, 16); + LangID = _tcstol(SetupData.pLanguages[SetupData.SelectedLangId].LangId, NULL, 16); SetThreadLocale(MAKELCID(LangID, SORT_DEFAULT)); // FIXME: need to reload all resource to force // the new language setting Modified: branches/arwinss/reactos/dll/cpl/mmsys/volume.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/cpl/mmsys/v… ============================================================================== --- branches/arwinss/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -292,9 +292,9 @@ LPARAM lParam) { static IMGINFO ImgInfo; + PGLOBAL_DATA pGlobalData; UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); - PGLOBAL_DATA pGlobalData; pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); Modified: branches/arwinss/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdipl… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -775,7 +775,7 @@ TRACE("(%p, %d, %d, %d, %d, %.2f, %.2f)\n", path, x, y, width, height, startAngle, sweepAngle); - return GdipAddPathPieI(path, (REAL)x, (REAL)y, (REAL)width, (REAL)height, startAngle, sweepAngle); + return GdipAddPathPie(path, (REAL)x, (REAL)y, (REAL)width, (REAL)height, startAngle, sweepAngle); } GpStatus WINGDIPAPI GdipAddPathPolygon(GpPath *path, GDIPCONST GpPointF *points, INT count) Modified: branches/arwinss/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/kerne… ============================================================================== --- branches/arwinss/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -1,155 +1,144 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> -<group> - <module name="kernel32_base" type="objectlibrary" crt="dll"> - <include base="kernel32_base">.</include> - <include base="kernel32_base">include</include> - <include base="ReactOS">include/reactos/subsys</include> - <define name="_KERNEL32_" /> - <redefine name="_WIN32_WINNT">0x0600</redefine> - <define name="__NO_CTYPE_INLINES" /> - <define name="NTDDI_VERSION">0x05020100</define> - <dependency>errcodes</dependency> -  - <group compilerset="gcc"> -  - <compilerflag>-fno-unit-at-a-time</compilerflag> - <compilerflag compiler="cxx">-fno-exceptions</compilerflag> - <compilerflag compiler="cxx">-fno-rtti</compilerflag> - </group> - <directory name="debug"> - <file>debugger.c</file> - <file>output.c</file> - </directory> - <directory name="except"> - <file>except.c</file> - </directory> - <directory name="file"> - <file>backup.c</file> - <file>bintype.c</file> - <file>cnotify.c</file> - <file>copy.c</file> - <file>create.c</file> - <file>curdir.c</file> - <file>delete.c</file> - <file>deviceio.c</file> - <file>dir.c</file> - <file>dosdev.c</file> - <file>file.c</file> - <file>find.c</file> - <file>hardlink.c</file> - <file>iocompl.c</file> - <file>lfile.c</file> - <file>lock.c</file> - <file>mailslot.c</file> - <file>move.c</file> - <file>npipe.c</file> - <file>pipe.c</file> - <file>rw.c</file> - <file>tape.c</file> - <file>volume.c</file> - </directory> - <directory name="mem"> - <file>global.c</file> - <file>heap.c</file> - <file>isbad.c</file> - <file>local.c</file> - <file>procmem.c</file> - <file>resnotify.c</file> - <file>section.c</file> - <file>virtual.c</file> - </directory> - <directory name="misc"> - <file>actctx.c</file> - <file>atom.c</file> - <file>chartype.c</file> - <file>collation.c</file> - <file>casemap.c</file> - <file>comm.c</file> - <file>commdcb.c</file> - <file>computername.c</file> - <file>console.c</file> - <file>dllmain.c</file> - <file>env.c</file> - <file>error.c</file> - <file>errormsg.c</file> - <file>fold.c</file> - <file>handle.c</file> - <file>lang.c</file> - <file>ldr.c</file> - <file>lzexpand.c</file> - <file>muldiv.c</file> - <file>nls.c</file> - <file>perfcnt.c</file> - <file>power.c</file> - <file>recovery.c</file> - <file>res.c</file> - <file>sortkey.c</file> - <file>stubs.c</file> - <file>sysinfo.c</file> - <file>time.c</file> - <file>timerqueue.c</file> - <file>toolhelp.c</file> - <file>version.c</file> - </directory> - <directory name="process"> - <file>cmdline.c</file> - <file>procsup.c</file> - <file>job.c</file> - <file>proc.c</file> - <file>session.c</file> - </directory> - <directory name="string"> - <file>lstring.c</file> - </directory> - <directory name="synch"> - <file>condvar.c</file> - <file>critical.c</file> - <file>event.c</file> - <file>mutex.c</file> - <file>sem.c</file> - <file>timer.c</file> - <file>wait.c</file> - </directory> - <directory name="thread"> - <file>fiber.c</file> - <file>fls.c</file> - <file>thread.c</file> - <file>tls.c</file> - </directory> - <directory name="misc"> - <file>lcformat.c</file> - <file>profile.c</file> - <file>utils.c</file> - </directory> - <directory name="thread"> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>fiber.S</file> - <file>thread.S</file> - </directory> - </if> - </directory> - - <directory name="misc"> - <file>icustubs.cpp</file> - </directory> - <library>normalize</library> - </module> - <module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll" crt="dll"> - <importlibrary definition="kernel32.pspec" /> - <include base="kernel32">.</include> - <include base="kernel32" root="intermediate">.</include> - <include base="kernel32">include</include> - <library>kernel32_base</library> - <library>wine</library> - <library>pseh</library> - <library>win32ksys</library> - - <file>kernel32.rc</file> - - <library>ntdll</library> - </module> -</group> +<module name="kernel32" type="win32dll" crt="dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll"> + <importlibrary definition="kernel32.pspec" /> + <include base="kernel32">.</include> + <include base="kernel32" root="intermediate">.</include> + <include base="kernel32">include</include> + <include base="ReactOS">include/reactos/subsys</include> + <library>wine</library> + <library>pseh</library> + <library>normalize</library> + <library>ntdll</library> + <define name="_KERNEL32_" /> + <redefine name="_WIN32_WINNT">0x0600</redefine> + <define name="__NO_CTYPE_INLINES" /> + <define name="NTDDI_VERSION">0x05020100</define> + <dependency>errcodes</dependency> +  + <group compilerset="gcc"> +  + <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compiler="cxx">-fno-exceptions</compilerflag> + <compilerflag compiler="cxx">-fno-rtti</compilerflag> + </group> + <directory name="debug"> + <file>debugger.c</file> + <file>output.c</file> + </directory> + <directory name="except"> + <file>except.c</file> + </directory> + <directory name="file"> + <file>backup.c</file> + <file>bintype.c</file> + <file>cnotify.c</file> + <file>copy.c</file> + <file>create.c</file> + <file>curdir.c</file> + <file>delete.c</file> + <file>deviceio.c</file> + <file>dir.c</file> + <file>dosdev.c</file> + <file>file.c</file> + <file>find.c</file> + <file>hardlink.c</file> + <file>iocompl.c</file> + <file>lfile.c</file> + <file>lock.c</file> + <file>mailslot.c</file> + <file>move.c</file> + <file>npipe.c</file> + <file>pipe.c</file> + <file>rw.c</file> + <file>tape.c</file> + <file>volume.c</file> + </directory> + <directory name="mem"> + <file>global.c</file> + <file>heap.c</file> + <file>isbad.c</file> + <file>local.c</file> + <file>procmem.c</file> + <file>resnotify.c</file> + <file>section.c</file> + <file>virtual.c</file> + </directory> + <directory name="misc"> + <file>actctx.c</file> + <file>atom.c</file> + <file>chartype.c</file> + <file>collation.c</file> + <file>casemap.c</file> + <file>comm.c</file> + <file>commdcb.c</file> + <file>computername.c</file> + <file>console.c</file> + <file>dllmain.c</file> + <file>env.c</file> + <file>error.c</file> + <file>errormsg.c</file> + <file>fold.c</file> + <file>handle.c</file> + <file>lang.c</file> + <file>ldr.c</file> + <file>lzexpand.c</file> + <file>muldiv.c</file> + <file>nls.c</file> + <file>perfcnt.c</file> + <file>power.c</file> + <file>recovery.c</file> + <file>res.c</file> + <file>sortkey.c</file> + <file>stubs.c</file> + <file>sysinfo.c</file> + <file>time.c</file> + <file>timerqueue.c</file> + <file>toolhelp.c</file> + <file>version.c</file> + </directory> + <directory name="process"> + <file>cmdline.c</file> + <file>procsup.c</file> + <file>job.c</file> + <file>proc.c</file> + <file>session.c</file> + </directory> + <directory name="string"> + <file>lstring.c</file> + </directory> + <directory name="synch"> + <file>condvar.c</file> + <file>critical.c</file> + <file>event.c</file> + <file>mutex.c</file> + <file>sem.c</file> + <file>timer.c</file> + <file>wait.c</file> + </directory> + <directory name="thread"> + <file>fiber.c</file> + <file>fls.c</file> + <file>thread.c</file> + <file>tls.c</file> + </directory> + <directory name="misc"> + <file>lcformat.c</file> + <file>profile.c</file> + <file>utils.c</file> + </directory> + <directory name="thread"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>fiber.S</file> + <file>thread.S</file> + </directory> + </if> + </directory> + <directory name="misc"> + <file>icustubs.cpp</file> + </directory> + <file>kernel32.rc</file> +</module> Modified: branches/arwinss/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… ============================================================================== --- branches/arwinss/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ branches/arwinss/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -154,23 +154,6 @@ } -NTSTATUS TdiCloseDevice( - HANDLE Handle, - PFILE_OBJECT FileObject) -{ - AFD_DbgPrint(MAX_TRACE, ("Called. Handle (0x%X) FileObject (0x%X)\n", - Handle, FileObject)); - - if (Handle) - ZwClose(Handle); - - if (FileObject) - ObDereferenceObject(FileObject); - - return STATUS_SUCCESS; -} - - NTSTATUS TdiOpenAddressFile( PUNICODE_STRING DeviceName, PTRANSPORT_ADDRESS Name, Modified: branches/arwinss/reactos/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… ============================================================================== --- branches/arwinss/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ branches/arwinss/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -1283,7 +1283,7 @@ { ULONG Data; - NdisRawWritePortUshort(Adapter->PortOffset + RAP, BCR4); + NdisRawWritePortUshort(Adapter->PortOffset + RAP, BCR6); NdisRawReadPortUshort(Adapter->PortOffset + BDP, &Data); return Data & BCR6_LEDOUT ? 100 : 10; Modified: branches/arwinss/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… ============================================================================== --- branches/arwinss/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ branches/arwinss/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -98,7 +98,8 @@ (Current->Protocol == SearchContext->Protocol) && (AddrIsEqual(IPAddress, SearchContext->Address) || AddrIsBroadcast(IPAddress, SearchContext->Address) || - AddrIsUnspecified(IPAddress))) { + AddrIsUnspecified(IPAddress) || + AddrIsUnspecified(SearchContext->Address))) { /* We've found a match */ Found = TRUE; break; @@ -139,25 +140,161 @@ } -VOID DeleteAddress(PADDRESS_FILE AddrFile) -/* - * FUNCTION: Deletes an address file object - * ARGUMENTS: - * AddrFile = Pointer to address file object to delete - */ +/* + * FUNCTION: Open an address file object + * ARGUMENTS: + * Request = Pointer to TDI request structure for this request + * Address = Pointer to address to be opened + * Protocol = Protocol on which to open the address + * Options = Pointer to option buffer + * RETURNS: + * Status of operation + */ +NTSTATUS FileOpenAddress( + PTDI_REQUEST Request, + PTA_IP_ADDRESS Address, + USHORT Protocol, + PVOID Options) +{ + IPv4_RAW_ADDRESS IPv4Address; + PADDRESS_FILE AddrFile; + + TI_DbgPrint(MID_TRACE, ("Called (Proto %d).\n", Protocol)); + + AddrFile = exAllocatePool(NonPagedPool, sizeof(ADDRESS_FILE)); + if (!AddrFile) { + TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + return STATUS_INSUFFICIENT_RESOURCES; + } + + TI_DbgPrint(DEBUG_ADDRFILE, ("Address file object allocated at (0x%X).\n", AddrFile)); + + RtlZeroMemory(AddrFile, sizeof(ADDRESS_FILE)); + + AddrFile->Free = AddrFileFree; + + /* Make sure address is a local unicast address or 0 */ + /* FIXME: IPv4 only */ + AddrFile->Family = Address->Address[0].AddressType; + IPv4Address = Address->Address[0].Address[0].in_addr; + if (IPv4Address != 0 && + !AddrLocateADEv4(IPv4Address, &AddrFile->Address)) { + exFreePool(AddrFile); + TI_DbgPrint(MIN_TRACE, ("Non-local address given (0x%X).\n", DN2H(IPv4Address))); + return STATUS_INVALID_PARAMETER; + } + else + { + /* Bound to the default address ... Copy the address type */ + AddrFile->Address.Type = IP_ADDRESS_V4; + } + + TI_DbgPrint(MID_TRACE, ("Opening address %s for communication (P=%d U=%d).\n", + A2S(&AddrFile->Address), Protocol, IPPROTO_UDP)); + + /* Protocol specific handling */ + switch (Protocol) { + case IPPROTO_TCP: + AddrFile->Port = + TCPAllocatePort(Address->Address[0].Address[0].sin_port); + + if ((Address->Address[0].Address[0].sin_port && + AddrFile->Port != Address->Address[0].Address[0].sin_port) || + AddrFile->Port == 0xffff) + { + exFreePool(AddrFile); + return STATUS_INVALID_PARAMETER; + } + + AddrFile->Send = NULL; /* TCPSendData */ + break; + + case IPPROTO_UDP: + TI_DbgPrint(MID_TRACE,("Allocating udp port\n")); + AddrFile->Port = + UDPAllocatePort(Address->Address[0].Address[0].sin_port); + + if ((Address->Address[0].Address[0].sin_port && + AddrFile->Port != Address->Address[0].Address[0].sin_port) || + AddrFile->Port == 0xffff) + { + exFreePool(AddrFile); + return STATUS_INVALID_PARAMETER; + } + + TI_DbgPrint(MID_TRACE,("Setting port %d (wanted %d)\n", + AddrFile->Port, + Address->Address[0].Address[0].sin_port)); + AddrFile->Send = UDPSendDatagram; + break; + + case IPPROTO_ICMP: + AddrFile->Port = 0; + AddrFile->Send = ICMPSendDatagram; + break; + + default: + /* Use raw IP for all other protocols */ + AddrFile->Port = 0; + AddrFile->Send = RawIPSendDatagram; + break; + } + + TI_DbgPrint(MID_TRACE, ("IP protocol number for address file object is %d.\n", + Protocol)); + + TI_DbgPrint(MID_TRACE, ("Port number for address file object is %d.\n", + WN2H(AddrFile->Port))); + + /* Set protocol */ + AddrFile->Protocol = Protocol; + + /* Initialize receive and transmit queues */ + InitializeListHead(&AddrFile->ReceiveQueue); + InitializeListHead(&AddrFile->TransmitQueue); + + /* Initialize spin lock that protects the address file object */ + KeInitializeSpinLock(&AddrFile->Lock); + + /* Set valid flag so the address can be used */ + AF_SET_VALID(AddrFile); + + /* Return address file object */ + Request->Handle.AddressHandle = AddrFile; + + /* Add address file to global list */ + ExInterlockedInsertTailList( + &AddressFileListHead, + &AddrFile->ListEntry, + &AddressFileListLock); + + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + + return STATUS_SUCCESS; +} + + +/* + * FUNCTION: Closes an address file object + * ARGUMENTS: + * Request = Pointer to TDI request structure for this request + * RETURNS: + * Status of operation + */ +NTSTATUS FileCloseAddress( + PTDI_REQUEST Request) { KIRQL OldIrql; + PADDRESS_FILE AddrFile; + NTSTATUS Status = STATUS_SUCCESS; + PDATAGRAM_SEND_REQUEST SendRequest; + PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; PLIST_ENTRY CurrentEntry; PLIST_ENTRY NextEntry; - PDATAGRAM_SEND_REQUEST SendRequest; - PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; TI_DbgPrint(MID_TRACE, ("Called.\n")); - /* Remove address file from the global list */ - TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); - RemoveEntryList(&AddrFile->ListEntry); - TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); + AddrFile = Request->Handle.AddressHandle; TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); @@ -197,143 +334,9 @@ TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - (*AddrFile->Free)(AddrFile); - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); -} - - -/* - * FUNCTION: Open an address file object - * ARGUMENTS: - * Request = Pointer to TDI request structure for this request - * Address = Pointer to address to be opened - * Protocol = Protocol on which to open the address - * Options = Pointer to option buffer - * RETURNS: - * Status of operation - */ -NTSTATUS FileOpenAddress( - PTDI_REQUEST Request, - PTA_IP_ADDRESS Address, - USHORT Protocol, - PVOID Options) -{ - IPv4_RAW_ADDRESS IPv4Address; - PADDRESS_FILE AddrFile; - - TI_DbgPrint(MID_TRACE, ("Called (Proto %d).\n", Protocol)); - - AddrFile = exAllocatePool(NonPagedPool, sizeof(ADDRESS_FILE)); - if (!AddrFile) { - TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - return STATUS_INSUFFICIENT_RESOURCES; - } - - TI_DbgPrint(DEBUG_ADDRFILE, ("Address file object allocated at (0x%X).\n", AddrFile)); - - RtlZeroMemory(AddrFile, sizeof(ADDRESS_FILE)); - - AddrFile->Free = AddrFileFree; - - /* Make sure address is a local unicast address or 0 */ - /* FIXME: IPv4 only */ - AddrFile->Family = Address->Address[0].AddressType; - IPv4Address = Address->Address[0].Address[0].in_addr; - if (IPv4Address != 0 && - !AddrLocateADEv4(IPv4Address, &AddrFile->Address)) { - exFreePool(AddrFile); - TI_DbgPrint(MIN_TRACE, ("Non-local address given (0x%X).\n", DN2H(IPv4Address))); - return STATUS_INVALID_PARAMETER; - } - else - { - /* Bound to the default address ... Copy the address type */ - AddrFile->Address.Type = IP_ADDRESS_V4; - } - - TI_DbgPrint(MID_TRACE, ("Opening address %s for communication (P=%d U=%d).\n", - A2S(&AddrFile->Address), Protocol, IPPROTO_UDP)); - - /* Protocol specific handling */ - switch (Protocol) { - case IPPROTO_TCP: - AddrFile->Port = - TCPAllocatePort(Address->Address[0].Address[0].sin_port); - - if ((Address->Address[0].Address[0].sin_port && - AddrFile->Port != Address->Address[0].Address[0].sin_port) || - AddrFile->Port == 0xffff) - { - exFreePool(AddrFile); - return STATUS_INVALID_PARAMETER; - } - - AddrFile->Send = NULL; /* TCPSendData */ - break; - - case IPPROTO_UDP: - TI_DbgPrint(MID_TRACE,("Allocating udp port\n")); - AddrFile->Port = - UDPAllocatePort(Address->Address[0].Address[0].sin_port); - - if ((Address->Address[0].Address[0].sin_port && - AddrFile->Port != Address->Address[0].Address[0].sin_port) || - AddrFile->Port == 0xffff) - { - exFreePool(AddrFile); - return STATUS_INVALID_PARAMETER; - } - - TI_DbgPrint(MID_TRACE,("Setting port %d (wanted %d)\n", - AddrFile->Port, - Address->Address[0].Address[0].sin_port)); - AddrFile->Send = UDPSendDatagram; - break; - - case IPPROTO_ICMP: - AddrFile->Port = 0; - AddrFile->Send = ICMPSendDatagram; - break; - - default: - /* Use raw IP for all other protocols */ - AddrFile->Port = 0; - AddrFile->Send = RawIPSendDatagram; - break; - } - - TI_DbgPrint(MID_TRACE, ("IP protocol number for address file object is %d.\n", - Protocol)); - - TI_DbgPrint(MID_TRACE, ("Port number for address file object is %d.\n", - WN2H(AddrFile->Port))); - - /* Set protocol */ - AddrFile->Protocol = Protocol; - - /* Initialize receive and transmit queues */ - InitializeListHead(&AddrFile->ReceiveQueue); - InitializeListHead(&AddrFile->TransmitQueue); - - /* Initialize spin lock that protects the address file object */ - KeInitializeSpinLock(&AddrFile->Lock); - - /* Set valid flag so the address can be used */ - AF_SET_VALID(AddrFile); - - /* Return address file object */ - Request->Handle.AddressHandle = AddrFile; - - /* Add address file to global list */ - ExInterlockedInsertTailList( - &AddressFileListHead, - &AddrFile->ListEntry, - &AddressFileListLock); - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - return STATUS_SUCCESS; + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + + return Status; } @@ -344,24 +347,21 @@ * RETURNS: * Status of operation */ -NTSTATUS FileCloseAddress( +NTSTATUS FileFreeAddress( PTDI_REQUEST Request) { - KIRQL OldIrql; PADDRESS_FILE AddrFile; NTSTATUS Status = STATUS_SUCCESS; + KIRQL OldIrql; + + AddrFile = Request->Handle.AddressHandle; TI_DbgPrint(MID_TRACE, ("Called.\n")); - AddrFile = Request->Handle.AddressHandle; - - TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); - - /* Set address file object exclusive to us */ - AF_SET_BUSY(AddrFile); - AF_CLR_VALID(AddrFile); - - TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); + /* Remove address file from the global list */ + TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); + RemoveEntryList(&AddrFile->ListEntry); + TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); /* Protocol specific handling */ switch (AddrFile->Protocol) { @@ -380,30 +380,7 @@ break; } - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - return Status; -} - - -/* - * FUNCTION: Closes an address file object - * ARGUMENTS: - * Request = Pointer to TDI request structure for this request - * RETURNS: - * Status of operation - */ -NTSTATUS FileFreeAddress( - PTDI_REQUEST Request) -{ - PADDRESS_FILE AddrFile; - NTSTATUS Status = STATUS_SUCCESS; - - AddrFile = Request->Handle.AddressHandle; - - TI_DbgPrint(MID_TRACE, ("Called.\n")); - - DeleteAddress(AddrFile); + (*AddrFile->Free)(AddrFile); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); Modified: branches/arwinss/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/storage… ============================================================================== --- branches/arwinss/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ branches/arwinss/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -1022,7 +1022,6 @@ Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return; } NTSTATUS Modified: branches/arwinss/reactos/include/ddk/strmini.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/str… ============================================================================== --- branches/arwinss/reactos/include/ddk/strmini.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/ddk/strmini.h [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -2,6 +2,7 @@ #define _STREAM_H #include <ntddk.h> +#include <windef.h> #include <ks.h> #define STREAMAPI __stdcall Modified: branches/arwinss/reactos/lib/3rdparty/mingw/gs_support.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/3rdparty/mi… ============================================================================== --- branches/arwinss/reactos/lib/3rdparty/mingw/gs_support.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/3rdparty/mingw/gs_support.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -108,12 +108,22 @@ else #endif { +#ifdef __GNUC__ #ifdef _WIN64 GS_ContextRecord.Rip = (ULONGLONG) __builtin_return_address (0); GS_ContextRecord.Rsp = (ULONGLONG) __builtin_frame_address (0) + 8; #else GS_ContextRecord.Eip = (DWORD) __builtin_return_address (0); GS_ContextRecord.Esp = (DWORD) __builtin_frame_address (0) + 4; +#endif +#else +#ifdef _WIN64 + GS_ContextRecord.Rip = (ULONGLONG) _ReturnAddress(); + GS_ContextRecord.Rsp = (ULONGLONG) _AddressOfReturnAddress(); +#else + GS_ContextRecord.Eip = (DWORD) _ReturnAddress(); + GS_ContextRecord.Esp = (DWORD) _AddressOfReturnAddress(); +#endif #endif } Modified: branches/arwinss/reactos/lib/drivers/ip/network/address.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/ip/… ============================================================================== --- branches/arwinss/reactos/lib/drivers/ip/network/address.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/ip/network/address.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -122,7 +122,8 @@ { switch (Address->Type) { case IP_ADDRESS_V4: - return (Address->Address.IPv4Address == 0); + return (Address->Address.IPv4Address == 0 || + Address->Address.IPv4Address == 0xFFFFFFFF); case IP_ADDRESS_V6: /* FIXME: IPv6 is not supported */ Modified: branches/arwinss/reactos/lib/drivers/ip/network/interface.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/ip/… ============================================================================== --- branches/arwinss/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -152,6 +152,26 @@ return TRUE; } +static PIP_INTERFACE GetDefaultInterface(VOID) +{ + KIRQL OldIrql; + IF_LIST_ITER(CurrentIF); + + TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); + ForEachInterface(CurrentIF) { + if (CurrentIF->Context) { + TcpipReleaseSpinLock(&InterfaceListLock, OldIrql); + return CurrentIF; + } + } EndFor(CurrentIF); + TcpipReleaseSpinLock(&InterfaceListLock, OldIrql); + + /* There are no physical interfaces on the system + * so we must pick the loopback interface */ + + return Loopback; +} + PIP_INTERFACE FindOnLinkInterface(PIP_ADDRESS Address) /* * FUNCTION: Checks all on-link prefixes to find out if an address is on-link @@ -166,6 +186,9 @@ TI_DbgPrint(DEBUG_ROUTER, ("Called. Address (0x%X)\n", Address)); TI_DbgPrint(DEBUG_ROUTER, ("Address (%s)\n", A2S(Address))); + + if (AddrIsUnspecified(Address)) + return GetDefaultInterface(); TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); Modified: branches/arwinss/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/ip/… ============================================================================== --- branches/arwinss/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -421,7 +421,8 @@ if (NCE == NULL) { TI_DbgPrint(MID_TRACE,("BCAST: %s\n", A2S(&Interface->Broadcast))); - if( AddrIsEqual(Address, &Interface->Broadcast) ) { + if( AddrIsEqual(Address, &Interface->Broadcast) || + AddrIsUnspecified(Address) ) { TI_DbgPrint(MID_TRACE,("Packet targeted at broadcast addr\n")); NCE = NBAddNeighbor(Interface, Address, NULL, Interface->AddressLength, NUD_CONNECTED); Modified: branches/arwinss/reactos/lib/drivers/ip/transport/datagram/datagram.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/ip/… ============================================================================== --- branches/arwinss/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -95,67 +95,60 @@ { PLIST_ENTRY CurrentEntry; PDATAGRAM_RECEIVE_REQUEST Current = NULL; - BOOLEAN Found; PTA_IP_ADDRESS RTAIPAddress; TI_DbgPrint(MAX_TRACE, ("There is a receive request.\n")); /* Search receive request list to find a match */ - Found = FALSE; CurrentEntry = AddrFile->ReceiveQueue.Flink; - while((CurrentEntry != &AddrFile->ReceiveQueue) && (!Found)) { + while(CurrentEntry != &AddrFile->ReceiveQueue) { Current = CONTAINING_RECORD(CurrentEntry, DATAGRAM_RECEIVE_REQUEST, ListEntry); - + CurrentEntry = CurrentEntry->Flink; if( DstPort == AddrFile->Port && (AddrIsEqual(DstAddress, &AddrFile->Address) || AddrIsUnspecified(&AddrFile->Address) || AddrIsUnspecified(DstAddress))) { - Found = TRUE; + /* Remove the request from the queue */ RemoveEntryList(&Current->ListEntry); - break; - } else { - CurrentEntry = CurrentEntry->Flink; + + TI_DbgPrint(MAX_TRACE, ("Suitable receive request found.\n")); + + TI_DbgPrint(MAX_TRACE, + ("Target Buffer: %x, Source Buffer: %x, Size %d\n", + Current->Buffer, DataBuffer, DataSize)); + + /* Copy the data into buffer provided by the user */ + RtlCopyMemory( Current->Buffer, + DataBuffer, + MIN(Current->BufferSize, DataSize) ); + + RTAIPAddress = (PTA_IP_ADDRESS)Current->ReturnInfo->RemoteAddress; + RTAIPAddress->TAAddressCount = 1; + RTAIPAddress->Address->AddressType = TDI_ADDRESS_TYPE_IP; + RTAIPAddress->Address->Address->sin_port = SrcPort; + + TI_DbgPrint(MAX_TRACE, ("(A: %08x) Addr %08x Port %04x\n", + RTAIPAddress, + SrcAddress->Address.IPv4Address, SrcPort)); + + RtlCopyMemory( &RTAIPAddress->Address->Address->in_addr, + &SrcAddress->Address.IPv4Address, + sizeof(SrcAddress->Address.IPv4Address) ); + + TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); + + /* Complete the receive request */ + if (Current->BufferSize < DataSize) + Current->Complete(Current->Context, STATUS_BUFFER_OVERFLOW, Current->BufferSize); + else + Current->Complete(Current->Context, STATUS_SUCCESS, DataSize); + + TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); } } TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - - if (Found) - { - TI_DbgPrint(MAX_TRACE, ("Suitable receive request found.\n")); - - TI_DbgPrint(MAX_TRACE, - ("Target Buffer: %x, Source Buffer: %x, Size %d\n", - Current->Buffer, DataBuffer, DataSize)); - - if (DataSize > Current->BufferSize) - { - Current->Complete(Current->Context, STATUS_BUFFER_TOO_SMALL, DataSize); - return; - } - - /* Copy the data into buffer provided by the user */ - RtlCopyMemory( Current->Buffer, - DataBuffer, - DataSize ); - - RTAIPAddress = (PTA_IP_ADDRESS)Current->ReturnInfo->RemoteAddress; - RTAIPAddress->TAAddressCount = 1; - RTAIPAddress->Address->AddressType = TDI_ADDRESS_TYPE_IP; - RTAIPAddress->Address->Address->sin_port = SrcPort; - - TI_DbgPrint(MAX_TRACE, ("(A: %08x) Addr %08x Port %04x\n", - RTAIPAddress, - SrcAddress->Address.IPv4Address, SrcPort)); - - RtlCopyMemory( &RTAIPAddress->Address->Address->in_addr, - &SrcAddress->Address.IPv4Address, - sizeof(SrcAddress->Address.IPv4Address) ); - - /* Complete the receive request */ - Current->Complete(Current->Context, STATUS_SUCCESS, DataSize); - } } else if (AddrFile->RegisteredReceiveDatagramHandler) { Modified: branches/arwinss/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/sou… ============================================================================== --- branches/arwinss/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -21,7 +21,8 @@ /* Standard MME driver entry-point for messages relating to auxiliary devices. */ -APIENTRY DWORD +DWORD +APIENTRY auxMessage( DWORD DeviceId, DWORD Message, Modified: branches/arwinss/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/sou… ============================================================================== --- branches/arwinss/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -21,7 +21,8 @@ /* Standard MME driver entry-point for messages relating to MIDI input. */ -APIENTRY DWORD +DWORD +APIENTRY midMessage( DWORD DeviceId, DWORD Message, Modified: branches/arwinss/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/sou… ============================================================================== --- branches/arwinss/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -21,7 +21,8 @@ /* Standard MME driver entry-point for messages relating to MIDI output. */ -APIENTRY DWORD +DWORD +APIENTRY modMessage( DWORD DeviceId, DWORD Message, Modified: branches/arwinss/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/sou… ============================================================================== --- branches/arwinss/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -21,7 +21,8 @@ /* Standard MME driver entry-point for messages relating to mixers. */ -APIENTRY DWORD +DWORD +APIENTRY mxdMessage( DWORD DeviceId, DWORD Message, Modified: branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/header.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/sou… ============================================================================== --- branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -224,10 +224,10 @@ PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PVOID Parameter) { + PWAVEHDR WaveHeader = (PWAVEHDR) Parameter; + VALIDATE_MMSYS_PARAMETER( SoundDeviceInstance ); VALIDATE_MMSYS_PARAMETER( Parameter ); - - PWAVEHDR WaveHeader = (PWAVEHDR) Parameter; /* Initialise */ WaveHeader->lpNext = NULL; Modified: branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/sou… ============================================================================== --- branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -22,7 +22,8 @@ Standard MME driver entry-point for messages relating to wave audio input. */ -APIENTRY DWORD +DWORD +APIENTRY widMessage( DWORD DeviceId, DWORD Message, Modified: branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/sou… ============================================================================== --- branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -31,7 +31,8 @@ Standard MME driver entry-point for messages relating to wave audio output. */ -APIENTRY DWORD +DWORD +APIENTRY wodMessage( DWORD DeviceId, DWORD Message, Modified: branches/arwinss/reactos/lib/sdk/crt/mbstring/mbslwr.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/crt/mbs… ============================================================================== --- branches/arwinss/reactos/lib/sdk/crt/mbstring/mbslwr.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/sdk/crt/mbstring/mbslwr.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -1,12 +1,10 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/sdk/crt/mbstring/ismbpun.c - * PURPOSE: - * PROGRAMER: - * UPDATE HISTORY: - * 05/30/08: Samuel Serapion adapted from PROJECT C Library - * + * FILE: lib/sdk/crt/mbstring/mbslwr.c + * PURPOSE: Multibyte lowercase functions + * PROGRAMER: Eric Kohl + * Samuel Serapion, adapted from PROJECT C Library */ #include <precomp.h> @@ -33,14 +31,24 @@ */ unsigned char * _mbslwr(unsigned char *x) { - unsigned char *y=x; + unsigned char *y=x; - while (*y) { - if (!_ismbblead(*y)) { + if (x == NULL) + { + return NULL; + } + + while (*y) + { + if (!_ismbblead(*y)) + { *y = tolower(*y); - } else { - *y=_mbctolower(*(unsigned short *)y); - y++; + y++; + } + else + { + *y = _mbctolower(*(unsigned short *)y); + y++; } } return x; Modified: branches/arwinss/reactos/lib/sdk/crt/stdio/stat64.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/crt/std… ============================================================================== --- branches/arwinss/reactos/lib/sdk/crt/stdio/stat64.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/sdk/crt/stdio/stat64.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -128,9 +128,9 @@ _dosmaperr(ERROR_INVALID_PARAMETER); return -1; } - buf->st_mode = _S_IFREG | _S_IREAD; + buf->st_mode = _S_IFREG | ALL_S_IREAD; if (!(hfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) - buf->st_mode |= _S_IWRITE; + buf->st_mode |= ALL_S_IWRITE; buf->st_size = ((__int64)hfi.nFileSizeHigh << 32) + hfi.nFileSizeLow; RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastAccessTime, &dw); buf->st_atime = dw; Modified: branches/arwinss/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/fre… ============================================================================== --- branches/arwinss/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] (original) +++ branches/arwinss/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -66,6 +66,9 @@ ULONG NumberDescriptors = 0; MEMORY_DESCRIPTOR MDArray[60] = { { 0, 0, 0 }, }; +/* Old boot style IDT */ +KIDTENTRY KiHackIdt[256]; + /* FUNCTIONS *****************************************************************/ PMEMORY_ALLOCATION_DESCRIPTOR @@ -1266,10 +1269,16 @@ #if defined(_M_IX86) PKTSS Tss; PKGDTENTRY TssEntry; + KDESCRIPTOR IdtDescriptor = { 0, 0, 0 }; + + Ke386GetInterruptDescriptorTable(*(PKDESCRIPTOR)&IdtDescriptor.Limit); + RtlCopyMemory(KiHackIdt, (PVOID)IdtDescriptor.Base, IdtDescriptor.Limit + 1); + IdtDescriptor.Base = (ULONG)&KiHackIdt; + IdtDescriptor.Limit = sizeof(KiHackIdt) - 1; /* Load the GDT and IDT */ Ke386SetGlobalDescriptorTable(*(PKDESCRIPTOR)&KiGdtDescriptor.Limit); - Ke386SetInterruptDescriptorTable(*(PKDESCRIPTOR)&KiIdtDescriptor.Limit); + Ke386SetInterruptDescriptorTable(*(PKDESCRIPTOR)&IdtDescriptor.Limit); /* Initialize the boot TSS */ Tss = &KiBootTss; Modified: branches/arwinss/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/i38… ============================================================================== --- branches/arwinss/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ branches/arwinss/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -712,34 +712,18 @@ Ke386SetDs(KGDT_R3_DATA | RPL_MASK); Ke386SetEs(KGDT_R3_DATA | RPL_MASK); - /* HACK compensates for KiRosPrepareForSystemStartup hack */ - if ((ULONG)Idt == KiIdtDescriptor.Base) - { - USHORT FlippedSelector; - - FlippedSelector = KiIdt[2].Selector; - KiIdt[2].Selector = KiIdt[2].ExtendedOffset; - KiIdt[2].ExtendedOffset = FlippedSelector; - - FlippedSelector = KiIdt[8].Selector; - KiIdt[8].Selector = KiIdt[8].ExtendedOffset; - KiIdt[8].ExtendedOffset = FlippedSelector; - } - else - { - /* Save NMI and double fault traps */ - RtlCopyMemory(&NmiEntry, &Idt[2], sizeof(KIDTENTRY)); - RtlCopyMemory(&DoubleFaultEntry, &Idt[8], sizeof(KIDTENTRY)); - - /* Copy kernel's trap handlers */ - RtlCopyMemory(Idt, - (PVOID)KiIdtDescriptor.Base, - KiIdtDescriptor.Limit + 1); - - /* Restore NMI and double fault */ - RtlCopyMemory(&Idt[2], &NmiEntry, sizeof(KIDTENTRY)); - RtlCopyMemory(&Idt[8], &DoubleFaultEntry, sizeof(KIDTENTRY)); - } + /* Save NMI and double fault traps */ + RtlCopyMemory(&NmiEntry, &Idt[2], sizeof(KIDTENTRY)); + RtlCopyMemory(&DoubleFaultEntry, &Idt[8], sizeof(KIDTENTRY)); + + /* Copy kernel's trap handlers */ + RtlCopyMemory(Idt, + (PVOID)KiIdtDescriptor.Base, + KiIdtDescriptor.Limit + 1); + + /* Restore NMI and double fault */ + RtlCopyMemory(&Idt[2], &NmiEntry, sizeof(KIDTENTRY)); + RtlCopyMemory(&Idt[8], &DoubleFaultEntry, sizeof(KIDTENTRY)); AppCpuInit: /* Loop until we can release the freeze lock */ Propchange: branches/arwinss/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 14 21:36:55 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym.c:42000-42350,42376,42419 +/trunk/reactos/tools/rsym/rsym.c:42000-42376,42419 Propchange: branches/arwinss/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 14 21:36:55 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym.h:42000-42350,42376,42419 +/trunk/reactos/tools/rsym/rsym.h:42000-42376,42419 Propchange: branches/arwinss/reactos/tools/rsym/rsym.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 14 21:36:55 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym.mak:42000-42350,42376,42419 +/trunk/reactos/tools/rsym/rsym.mak:42000-42376,42419 Propchange: branches/arwinss/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 14 21:36:55 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym_common.c:42000-42350,42376,42419 +/trunk/reactos/tools/rsym/rsym_common.c:42000-42376,42419

1 0

[fireball] 42667: - Merge 42300-42350.
by fireball＠svn.reactos.org 14 Aug '09

14 Aug '09

Author: fireball Date: Fri Aug 14 21:19:54 2009 New Revision: 42667 URL: http://svn.reactos.org/svn/reactos?rev=42667&view=rev Log: - Merge 42300-42350. Modified: branches/arwinss/reactos/ (props changed) branches/arwinss/reactos/base/applications/cmdutils/doskey/doskey.c branches/arwinss/reactos/base/setup/usetup/interface/usetup.c branches/arwinss/reactos/base/shell/cmd/cmd.c branches/arwinss/reactos/base/shell/cmd/console.c branches/arwinss/reactos/base/shell/cmd/dir.c branches/arwinss/reactos/base/shell/cmd/memory.c branches/arwinss/reactos/base/shell/cmd/misc.c branches/arwinss/reactos/base/shell/cmd/mklink.c branches/arwinss/reactos/base/shell/cmd/parser.c branches/arwinss/reactos/base/system/winlogon/winlogon.c branches/arwinss/reactos/dll/cpl/desk/preview.c branches/arwinss/reactos/dll/cpl/desk/settings.c branches/arwinss/reactos/dll/cpl/input/add.c branches/arwinss/reactos/dll/win32/advapi32/reg/reg.c branches/arwinss/reactos/dll/win32/beepmidi/beepmidi.c branches/arwinss/reactos/dll/win32/kernel32/file/rw.c branches/arwinss/reactos/dll/win32/msafd/misc/dllmain.c branches/arwinss/reactos/dll/win32/setupapi/devinst.c branches/arwinss/reactos/dll/win32/setupapi/install.c branches/arwinss/reactos/dll/win32/ws2_32/misc/ns.c branches/arwinss/reactos/dll/win32/ws2_32/misc/stubs.c branches/arwinss/reactos/drivers/base/bootvid/i386/bootdata.c branches/arwinss/reactos/drivers/base/bootvid/i386/vga.c branches/arwinss/reactos/drivers/base/bootvid/precomp.h branches/arwinss/reactos/drivers/directx/dxapi/dxapi_driver.h branches/arwinss/reactos/drivers/directx/dxg/dxg_int.h branches/arwinss/reactos/drivers/ksfilter/ks/api.c branches/arwinss/reactos/drivers/ksfilter/ks/bag.c branches/arwinss/reactos/drivers/ksfilter/ks/connectivity.c branches/arwinss/reactos/drivers/ksfilter/ks/device.c branches/arwinss/reactos/drivers/ksfilter/ks/filter.c branches/arwinss/reactos/drivers/ksfilter/ks/irp.c branches/arwinss/reactos/drivers/ksfilter/ks/pin.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/irp.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c branches/arwinss/reactos/drivers/wdm/audio/drm/drmk/stubs.cpp branches/arwinss/reactos/drivers/wdm/audio/filters/kmixer/pin.c branches/arwinss/reactos/drivers/wdm/audio/legacy/wdmaud/control.c branches/arwinss/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h branches/arwinss/reactos/drivers/wdm/audio/sysaudio/main.c branches/arwinss/reactos/drivers/wdm/audio/sysaudio/pin.c branches/arwinss/reactos/include/ddk/ntdef.h branches/arwinss/reactos/include/ddk/ntifs.h branches/arwinss/reactos/include/ddk/wdm.h branches/arwinss/reactos/include/ddk/winddk.h branches/arwinss/reactos/include/psdk/delayimp.h branches/arwinss/reactos/include/psdk/npapi.h branches/arwinss/reactos/include/psdk/winbase.h branches/arwinss/reactos/include/psdk/windef.h branches/arwinss/reactos/lib/3rdparty/mingw/mingw.rbuild branches/arwinss/reactos/lib/cmlib/cmdata.h branches/arwinss/reactos/lib/fslib/ext2lib/Mke2fs.c branches/arwinss/reactos/ntoskrnl/ex/shutdown.c branches/arwinss/reactos/ntoskrnl/include/internal/i386/intrin_i.h branches/arwinss/reactos/ntoskrnl/ke/i386/cpu.c branches/arwinss/reactos/ntoskrnl/ke/i386/kiinit.c branches/arwinss/reactos/ntoskrnl/ke/i386/trap.s branches/arwinss/reactos/ntoskrnl/mm/ARM3/expool.c branches/arwinss/reactos/ntoskrnl/mm/pool.c branches/arwinss/reactos/subsystems/win32/csrss/api/handle.c branches/arwinss/reactos/subsystems/win32/csrss/api/wapi.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/alias.c branches/arwinss/reactos/tools/rbuild/backend/mingw/mingw.cpp branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.h branches/arwinss/reactos/tools/rsym/rsym.c (props changed) branches/arwinss/reactos/tools/rsym/rsym.h (props changed) branches/arwinss/reactos/tools/rsym/rsym.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed) branches/arwinss/reactos/tools/winebuild/winglue.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/applicatio… Modified: branches/arwinss/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/setup/uset… Modified: branches/arwinss/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/shell/cmd/… Modified: branches/arwinss/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/shell/cmd/… Modified: branches/arwinss/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/shell/cmd/… Modified: branches/arwinss/reactos/base/shell/cmd/memory.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/shell/cmd/… Modified: branches/arwinss/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/shell/cmd/… Modified: branches/arwinss/reactos/base/shell/cmd/mklink.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/shell/cmd/… Modified: branches/arwinss/reactos/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/shell/cmd/… Modified: branches/arwinss/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/system/win… Modified: branches/arwinss/reactos/dll/cpl/desk/preview.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/cpl/desk/pr… Modified: branches/arwinss/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/cpl/desk/se… Modified: branches/arwinss/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/cpl/input/a… Modified: branches/arwinss/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/advap… Modified: branches/arwinss/reactos/dll/win32/beepmidi/beepmidi.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/beepm… Modified: branches/arwinss/reactos/dll/win32/kernel32/file/rw.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/kerne… Modified: branches/arwinss/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/msafd… Modified: branches/arwinss/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/setup… Modified: branches/arwinss/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/setup… Modified: branches/arwinss/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/ws2_3… Modified: branches/arwinss/reactos/dll/win32/ws2_32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/ws2_3… Modified: branches/arwinss/reactos/drivers/base/bootvid/i386/bootdata.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/base/bo… Modified: branches/arwinss/reactos/drivers/base/bootvid/i386/vga.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/base/bo… Modified: branches/arwinss/reactos/drivers/base/bootvid/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/base/bo… Modified: branches/arwinss/reactos/drivers/directx/dxapi/dxapi_driver.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/directx… Modified: branches/arwinss/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/directx… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/bag.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/drm/drmk/stubs.cpp URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/ntd… Modified: branches/arwinss/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/nti… Modified: branches/arwinss/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/wdm… Modified: branches/arwinss/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/win… Modified: branches/arwinss/reactos/include/psdk/delayimp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/de… Modified: branches/arwinss/reactos/include/psdk/npapi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/np… Modified: branches/arwinss/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… Modified: branches/arwinss/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… Modified: branches/arwinss/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/3rdparty/mi… Modified: branches/arwinss/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/cmlib/cmdat… Modified: branches/arwinss/reactos/lib/fslib/ext2lib/Mke2fs.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/fslib/ext2l… Modified: branches/arwinss/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ex/shu… Modified: branches/arwinss/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/includ… Modified: branches/arwinss/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/i38… Modified: branches/arwinss/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/i38… Modified: branches/arwinss/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/i38… Modified: branches/arwinss/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/ARM… Modified: branches/arwinss/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/poo… Modified: branches/arwinss/reactos/subsystems/win32/csrss/api/handle.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/api/wapi.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/alias.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/ba… Modified: branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/ba… Modified: branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/ba… Modified: branches/arwinss/reactos/tools/winebuild/winglue.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/winebuild…

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009