Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 39790: - Add winetests for inetcomm, inetmib1, itss, localspl, localui
by dchapyshev＠svn.reactos.org 27 Feb '09

27 Feb '09

Author: dchapyshev Date: Fri Feb 27 19:23:50 2009 New Revision: 39790 URL: http://svn.reactos.org/svn/reactos?rev=39790&view=rev Log: - Add winetests for inetcomm, inetmib1, itss, localspl, localui Added: trunk/rostests/winetests/inetcomm/ (with props) trunk/rostests/winetests/inetcomm/inetcomm.rbuild (with props) trunk/rostests/winetests/inetcomm/mimeintl.c (with props) trunk/rostests/winetests/inetcomm/mimeole.c (with props) trunk/rostests/winetests/inetcomm/testlist.c (with props) trunk/rostests/winetests/inetmib1/ (with props) trunk/rostests/winetests/inetmib1/inetmib1.rbuild (with props) trunk/rostests/winetests/inetmib1/main.c (with props) trunk/rostests/winetests/inetmib1/testlist.c (with props) trunk/rostests/winetests/itss/ (with props) trunk/rostests/winetests/itss/data.chm (with props) trunk/rostests/winetests/itss/itss.rbuild (with props) trunk/rostests/winetests/itss/protocol.c (with props) trunk/rostests/winetests/itss/rsrc.rc (with props) trunk/rostests/winetests/itss/testlist.c (with props) trunk/rostests/winetests/localspl/ (with props) trunk/rostests/winetests/localspl/localmon.c (with props) trunk/rostests/winetests/localspl/localspl.rbuild (with props) trunk/rostests/winetests/localspl/testlist.c (with props) trunk/rostests/winetests/localui/ (with props) trunk/rostests/winetests/localui/localui.c (with props) trunk/rostests/winetests/localui/localui.rbuild (with props) trunk/rostests/winetests/localui/testlist.c (with props) Modified: trunk/rostests/winetests/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil… Added: trunk/rostests/winetests/inetcomm/inetcomm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetcomm/inetco… Added: trunk/rostests/winetests/inetcomm/mimeintl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetcomm/mimein… Added: trunk/rostests/winetests/inetcomm/mimeole.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetcomm/mimeol… Added: trunk/rostests/winetests/inetcomm/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetcomm/testli… Added: trunk/rostests/winetests/inetmib1/inetmib1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetmib1/inetmi… Added: trunk/rostests/winetests/inetmib1/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetmib1/main.c… Added: trunk/rostests/winetests/inetmib1/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetmib1/testli… Added: trunk/rostests/winetests/itss/data.chm URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/itss/data.chm?r… Added: trunk/rostests/winetests/itss/itss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/itss/itss.rbuil… Added: trunk/rostests/winetests/itss/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/itss/protocol.c… Added: trunk/rostests/winetests/itss/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/itss/rsrc.rc?re… Added: trunk/rostests/winetests/itss/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/itss/testlist.c… Added: trunk/rostests/winetests/localspl/localmon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localspl/localm… Added: trunk/rostests/winetests/localspl/localspl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localspl/locals… Added: trunk/rostests/winetests/localspl/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localspl/testli… Added: trunk/rostests/winetests/localui/localui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localui/localui… Added: trunk/rostests/winetests/localui/localui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localui/localui… Added: trunk/rostests/winetests/localui/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localui/testlis…

1 0

[dchapyshev] 39789: - Add DNS_RRSET_INIT, DNS_RRSET_ADD, DNS_RRSET_TERMINATE
by dchapyshev＠svn.reactos.org 27 Feb '09

27 Feb '09

Author: dchapyshev Date: Fri Feb 27 18:59:01 2009 New Revision: 39789 URL: http://svn.reactos.org/svn/reactos?rev=39789&view=rev Log: - Add DNS_RRSET_INIT, DNS_RRSET_ADD, DNS_RRSET_TERMINATE Modified: trunk/reactos/include/psdk/windns.h Modified: trunk/reactos/include/psdk/windns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windns.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windns.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windns.h [iso-8859-1] Fri Feb 27 18:59:01 2009 @@ -469,6 +469,27 @@ PDNS_RECORD pLastRR; } DNS_RRSET, *PDNS_RRSET; +#define DNS_RRSET_INIT( rrset ) \ +{ \ + PDNS_RRSET _prrset = &(rrset); \ + _prrset->pFirstRR = NULL; \ + _prrset->pLastRR = (PDNS_RECORD) &_prrset->pFirstRR; \ +} + +#define DNS_RRSET_ADD( rrset, pnewRR ) \ +{ \ + PDNS_RRSET _prrset = &(rrset); \ + PDNS_RECORD _prrnew = (pnewRR); \ + _prrset->pLastRR->pNext = _prrnew; \ + _prrset->pLastRR = _prrnew; \ +} + +#define DNS_RRSET_TERMINATE( rrset ) \ +{ \ + PDNS_RRSET _prrset = &(rrset); \ + _prrset->pLastRR->pNext = NULL; \ +} + DNS_STATUS WINAPI DnsAcquireContextHandle_A(DWORD,PVOID,HANDLE*); DNS_STATUS WINAPI DnsAcquireContextHandle_W(DWORD,PVOID,HANDLE*); DNS_STATUS WINAPI DnsExtractRecordsFromMessage_W(PDNS_MESSAGE_BUFFER,WORD,PDNS_RECORD*);

1 0

[dchapyshev] 39788: - Add winetests for credui, cryptnet, cryptui, dnsapi, fusion
by dchapyshev＠svn.reactos.org 27 Feb '09

27 Feb '09

Author: dchapyshev Date: Fri Feb 27 18:57:39 2009 New Revision: 39788 URL: http://svn.reactos.org/svn/reactos?rev=39788&view=rev Log: - Add winetests for credui, cryptnet, cryptui, dnsapi, fusion Added: trunk/rostests/winetests/credui/ (with props) trunk/rostests/winetests/credui/credui.c (with props) trunk/rostests/winetests/credui/credui.rbuild (with props) trunk/rostests/winetests/credui/testlist.c (with props) trunk/rostests/winetests/cryptnet/ (with props) trunk/rostests/winetests/cryptnet/cryptnet.c (with props) trunk/rostests/winetests/cryptnet/cryptnet.rbuild (with props) trunk/rostests/winetests/cryptnet/testlist.c (with props) trunk/rostests/winetests/cryptui/ (with props) trunk/rostests/winetests/cryptui/cryptui.c (with props) trunk/rostests/winetests/cryptui/cryptui.rbuild (with props) trunk/rostests/winetests/cryptui/testlist.c (with props) trunk/rostests/winetests/dnsapi/ (with props) trunk/rostests/winetests/dnsapi/dnsapi.rbuild (with props) trunk/rostests/winetests/dnsapi/name.c (with props) trunk/rostests/winetests/dnsapi/record.c (with props) trunk/rostests/winetests/dnsapi/testlist.c (with props) trunk/rostests/winetests/fusion/ (with props) trunk/rostests/winetests/fusion/asmcache.c (with props) trunk/rostests/winetests/fusion/asmenum.c (with props) trunk/rostests/winetests/fusion/asmname.c (with props) trunk/rostests/winetests/fusion/fusion.c (with props) trunk/rostests/winetests/fusion/fusion.rbuild (with props) trunk/rostests/winetests/fusion/testlist.c (with props) Modified: trunk/rostests/winetests/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/rostests/winetests/credui/credui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/credui/credui.c… Added: trunk/rostests/winetests/credui/credui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/credui/credui.r… Added: trunk/rostests/winetests/credui/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/credui/testlist… Added: trunk/rostests/winetests/cryptnet/cryptnet.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptnet/cryptn… Added: trunk/rostests/winetests/cryptnet/cryptnet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptnet/cryptn… Added: trunk/rostests/winetests/cryptnet/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptnet/testli… Added: trunk/rostests/winetests/cryptui/cryptui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptui/cryptui… Added: trunk/rostests/winetests/cryptui/cryptui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptui/cryptui… Added: trunk/rostests/winetests/cryptui/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptui/testlis… Modified: trunk/rostests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil… Added: trunk/rostests/winetests/dnsapi/dnsapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dnsapi/dnsapi.r… Added: trunk/rostests/winetests/dnsapi/name.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dnsapi/name.c?r… Added: trunk/rostests/winetests/dnsapi/record.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dnsapi/record.c… Added: trunk/rostests/winetests/dnsapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dnsapi/testlist… Added: trunk/rostests/winetests/fusion/asmcache.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/asmcache… Added: trunk/rostests/winetests/fusion/asmenum.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/asmenum.… Added: trunk/rostests/winetests/fusion/asmname.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/asmname.… Added: trunk/rostests/winetests/fusion/fusion.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/fusion.c… Added: trunk/rostests/winetests/fusion/fusion.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/fusion.r… Added: trunk/rostests/winetests/fusion/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/testlist…

1 0

[dgorbachev] 39787: Japanese explorer-new translation by Pcds90net (ds200xnet-ros|at|yahoo|dot|co|dot|jp). Bug #4203.
by dgorbachev＠svn.reactos.org 27 Feb '09

27 Feb '09

Author: dgorbachev Date: Fri Feb 27 18:50:43 2009 New Revision: 39787 URL: http://svn.reactos.org/svn/reactos?rev=39787&view=rev Log: Japanese explorer-new translation by Pcds90net (ds200xnet-ros|at|yahoo|dot|co|dot|jp). Bug #4203. Added: trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc (with props) Modified: trunk/reactos/base/shell/explorer-new/explorer.rc Modified: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rc [iso-8859-1] Fri Feb 27 18:50:43 2009 @@ -18,6 +18,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" Added: trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc (added) +++ trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc [iso-8859-1] Fri Feb 27 18:50:43 2009 @@ -1,0 +1,59 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDM_TRAYWND MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "^XN o[ðÅè·é(&L)", ID_LOCKTASKBAR + MENUITEM "vpeB(R)", ID_SHELL_CMD_PROPERTIES + END +END + +IDM_STARTMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + POPUP "vO(&P)", IDM_PROGRAMS + BEGIN + MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "¨CÉüè(F&)", IDM_FAVORITES + BEGIN + MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "ÅßgÁ½t@C(&D)", IDM_DOCUMENTS + BEGIN + MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "Ýè(&S)", IDM_SETTINGS + BEGIN + MENUITEM "Rg[ pl(&C)", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "ZLeB(&S)", IDM_SECURITY, MFT_STRING, MFS_ENABLED + MENUITEM "lbg[NÚ±(&N)", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "v^ÆFAX(&P)", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED + MENUITEM "^XN o[Æ[X^[g] j[(&)", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + END + POPUP "õ(&C)", IDM_SEARCH + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + END + MENUITEM "wvÆT|[g(&H)", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED + MENUITEM "t@C¼ðwèµÄÀs(&R)", IDM_RUN, MFT_STRING, MFS_ENABLED + MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "¯ú(&Y)", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED + MENUITEM "%s ÌOIt(&)...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "Øf(&I)...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED + MENUITEM "Rs[^ÌbN(&E)", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "Vbg_E(&U)...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_START "X^[g" + IDS_PROPERTIES "vpeB(&R)" + IDS_OPEN_ALL_USERS "J - All Users(&P)" + IDS_EXPLORE_ALL_USERS "GNXv[ - All Users(&E)" +END Propchange: trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 39786: - Wait untill all usb embedded drivers are initialized before returning from DriverEntry. This allows usb mouse driver to have a chance to register itself before mouclass is loaded.
by fireball＠svn.reactos.org 27 Feb '09

27 Feb '09

Author: fireball Date: Fri Feb 27 18:29:54 2009 New Revision: 39786 URL: http://svn.reactos.org/svn/reactos?rev=39786&view=rev Log: - Wait untill all usb embedded drivers are initialized before returning from DriverEntry. This allows usb mouse driver to have a chance to register itself before mouclass is loaded. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c [iso-8859-1] Fri Feb 27 18:29:54 2009 @@ -202,6 +202,7 @@ pevent->context = (ULONG) dev_mgr; KeInitializeEvent(&dev_mgr->wake_up_event, SynchronizationEvent, FALSE); + KeInitializeEvent(&dev_mgr->drivers_inited, NotificationEvent, FALSE); InsertTailList(&dev_mgr->event_list, &pevent->event_link); @@ -273,6 +274,9 @@ KeSetTimerEx(&dev_mgr->dev_mgr_timer, due_time, DEV_MGR_TIMER_INTERVAL_MS, &dev_mgr->dev_mgr_timer_dpc); + /* Signal we're done initing */ + KeSetEvent(&dev_mgr->drivers_inited, 0, FALSE); + return TRUE; } @@ -286,6 +290,7 @@ KeCancelTimer(&dev_mgr->dev_mgr_timer); KeRemoveQueueDpc(&dev_mgr->dev_mgr_timer_dpc); + KeSetEvent(&dev_mgr->drivers_inited, 0, FALSE); return FALSE; } Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h [iso-8859-1] Fri Feb 27 18:29:54 2009 @@ -98,6 +98,7 @@ LIST_HEAD event_list; USB_EVENT_POOL event_pool; + KEVENT drivers_inited; KTIMER dev_mgr_timer; KDPC dev_mgr_timer_dpc; KSPIN_LOCK timer_svc_list_lock; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] Fri Feb 27 18:29:54 2009 @@ -3752,7 +3752,6 @@ uhci->hcd_interf.flags = HCD_TYPE_UHCI; //hcd types | hcd id } - NTSTATUS NTAPI generic_dispatch_irp(IN PDEVICE_OBJECT dev_obj, IN PIRP irp) { @@ -3807,9 +3806,9 @@ NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { + NTSTATUS ntStatus = STATUS_SUCCESS; + #if DBG - NTSTATUS ntStatus = STATUS_SUCCESS; - // should be done before any debug output is done. // read our debug verbosity level from the registry //NetacOD_GetRegistryDword( NetacOD_REGISTRY_PARAMETERS_PATH, //absolute registry path @@ -3867,6 +3866,9 @@ dev_mgr_start_hcd(&g_dev_mgr); + /* Wait till all drivers are initialized */ + ntStatus = KeWaitForSingleObject(&g_dev_mgr.drivers_inited, Executive, KernelMode, TRUE, NULL); + uhci_dbg_print_cond(DBGLVL_DEFAULT, DEBUG_UHCI, ("DriverEntry(): exiting... (%x)\n", ntStatus)); return STATUS_SUCCESS; }

1 0

[dgoette] 39785: fix typo :) no code change
by dgoette＠svn.reactos.org 27 Feb '09

27 Feb '09

Author: dgoette Date: Fri Feb 27 16:22:34 2009 New Revision: 39785 URL: http://svn.reactos.org/svn/reactos?rev=39785&view=rev Log: fix typo :) no code change Added: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Dependencies.class.php - copied, changed from r39677, branches/danny-web/reactos.org/htdocs/roscms/lib/om/Depencies.class.php Removed: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Depencies.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/config.php branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql branches/danny-web/reactos.org/htdocs/roscms/js/cms_maintain.js branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_EntryTable… branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_Maintain.c… branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… branches/danny-web/reactos.org/htdocs/roscms/lib/om/Entry.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/om/Generate.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/om/Revision.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Maintain.cla… Modified: branches/danny-web/reactos.org/htdocs/roscms/config.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/config.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/config.php [iso-8859-1] Fri Feb 27 16:22:34 2009 @@ -53,28 +53,28 @@ // RosCMS Table Names -$config->setTable('ROSCMST_AREA' , 'roscms_area'); -$config->setTable('ROSCMST_USERS' , 'roscms_accounts'); -$config->setTable('ROSCMST_FORBIDDEN' , 'roscms_accounts_forbidden'); -$config->setTable('ROSCMST_SESSIONS' , 'roscms_accounts_sessions'); -$config->setTable('ROSCMST_COUNTRIES' , 'roscms_countries'); -$config->setTable('ROSCMST_ENTRIES' , 'roscms_entries'); -$config->setTable('ROSCMST_ACCESS' , 'roscms_entries_access'); -$config->setTable('ROSCMST_RIGHTS' , 'roscms_entries_areas'); -$config->setTable('ROSCMST_REVISIONS' , 'roscms_entries_revisions'); -$config->setTable('ROSCMST_STEXT' , 'roscms_entries_stext'); -$config->setTable('ROSCMST_TAGS' , 'roscms_entries_tags'); -$config->setTable('ROSCMST_TEXT' , 'roscms_entries_text'); -$config->setTable('ROSCMST_FILTER' , 'roscms_filter'); -$config->setTable('ROSCMST_GROUPS' , 'roscms_groups'); -$config->setTable('ROSCMST_JOBS' , 'roscms_jobs'); -$config->setTable('ROSCMST_LANGUAGES' , 'roscms_languages'); -$config->setTable('ROSCMST_SUBSYS' , 'roscms_rel_accounts_subsys'); -$config->setTable('ROSCMST_MEMBERSHIPS', 'roscms_rel_groups_accounts'); -$config->setTable('ROSCMST_AREA_ACCESS', 'roscms_rel_groups_area'); -$config->setTable('ROSCMST_DEPENCIES' , 'roscms_rel_revisions_depencies'); -$config->setTable('ROSCMST_ACL' , 'roscms_rel_acl'); -$config->setTable('ROSCMST_TIMEZONES' , 'roscms_timezones'); +$config->setTable('ROSCMST_AREA' , 'roscms_area'); +$config->setTable('ROSCMST_USERS' , 'roscms_accounts'); +$config->setTable('ROSCMST_FORBIDDEN' , 'roscms_accounts_forbidden'); +$config->setTable('ROSCMST_SESSIONS' , 'roscms_accounts_sessions'); +$config->setTable('ROSCMST_COUNTRIES' , 'roscms_countries'); +$config->setTable('ROSCMST_ENTRIES' , 'roscms_entries'); +$config->setTable('ROSCMST_ACCESS' , 'roscms_entries_access'); +$config->setTable('ROSCMST_RIGHTS' , 'roscms_entries_areas'); +$config->setTable('ROSCMST_REVISIONS' , 'roscms_entries_revisions'); +$config->setTable('ROSCMST_STEXT' , 'roscms_entries_stext'); +$config->setTable('ROSCMST_TAGS' , 'roscms_entries_tags'); +$config->setTable('ROSCMST_TEXT' , 'roscms_entries_text'); +$config->setTable('ROSCMST_FILTER' , 'roscms_filter'); +$config->setTable('ROSCMST_GROUPS' , 'roscms_groups'); +$config->setTable('ROSCMST_JOBS' , 'roscms_jobs'); +$config->setTable('ROSCMST_LANGUAGES' , 'roscms_languages'); +$config->setTable('ROSCMST_SUBSYS' , 'roscms_rel_accounts_subsys'); +$config->setTable('ROSCMST_MEMBERSHIPS' , 'roscms_rel_groups_accounts'); +$config->setTable('ROSCMST_AREA_ACCESS' , 'roscms_rel_groups_area'); +$config->setTable('ROSCMST_DEPENDENCIES' , 'roscms_rel_revisions_dependencies'); +$config->setTable('ROSCMST_ACL' , 'roscms_rel_acl'); +$config->setTable('ROSCMST_TIMEZONES' , 'roscms_timezones'); // do not change, it's needed to apply those config settings $config->apply(); Modified: branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql [iso-8859-1] Fri Feb 27 16:22:34 2009 @@ -107,9 +107,9 @@ -- -------------------------------------------------------- --- create depency table (nothing to convert, as it's new and will be filled later) --- -------------------------------------------------------- -CREATE TABLE roscms_rel_revisions_depencies ( +-- create dependency table (nothing to convert, as it's new and will be filled later) +-- -------------------------------------------------------- +CREATE TABLE roscms_rel_revisions_dependencies ( id bigint(20) NOT NULL auto_increment, rev_id bigint(20) unsigned NOT NULL COMMENT '->revisions(id)', child_id bigint(20) unsigned default NULL COMMENT '->entries(id)', @@ -120,7 +120,7 @@ KEY rev_id (rev_id), KEY child_id (child_id), KEY child_name (child_name) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='if depency_id is NULL-> set name & type'; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='if dependency_id is NULL-> set name & type'; @@ -170,7 +170,7 @@ (3, 'View History', 'history', 'view History tab'), (4, 'View Fields', 'fields', 'view fields tab'), (5, 'View Revision Tab', 'revision', 'view revision tab'), -(6, 'View Depencies', 'depencies', 'view depencies tab'), +(6, 'View Dependencies', 'dependencies', 'view dependencies tab'), (7, 'System metadata', 'system_meta', 'modify System metadata'), (8, 'Add Fields', 'add_fields', 'add new text fields'), (9, 'Read', 'read', 'can view this entry'); @@ -218,7 +218,7 @@ OR (s.sec_allow LIKE CONCAT('%',s.sec_allow,'%') AND r.name_short='translate') OR (g.security_level = 3 AND r.name_short='system_meta') -OR (g.security_level > 1 AND r.name_short='depencies') +OR (g.security_level > 1 AND r.name_short='dependencies') OR r.name_short = 'metadata' OR r.name_short = 'history') @@ -277,7 +277,7 @@ (34, 'Show all filter', 'dont_hide_filter', 'don''t hide filter from users'), (35, 'Make Entries Stable', 'make_stable', 'Make Entries Stable'), (36, 'show system entries', 'show_sys_entry', 'show entries of type ''system'''), -(37, 'Add manuel depencies', 'add_depencies', 'add new manuell depencies to entries'); +(37, 'Add manuel dependencies', 'add_dependencies', 'add new manuell dependencies to entries'); @@ -296,7 +296,7 @@ WHERE ((a.name_short = 'system_tags' OR a.name_short = 'entry_details' OR a.name_short = 'new_entry' OR a.name_short = 'deltag' OR a.name_short = 'del_entry' OR a.name_short = 'mix_priv_pub' OR a.name_short = 'show_sys_entry' OR a.name_short = 'addlvl1group' OR a.name_short = 'more_filter' OR a.name_short = 'make_stable' OR a.name_short = 'dont_hide_filter') AND g.security_level > 1) -OR ((a.name_short = 'delete_file' OR a.name_short = 'delmembership' OR a.name_short = 'disableaccount' OR a.name_short = 'user_details' OR a.name_short = 'other_drafts' OR a.name_short = 'stats' OR a.name_short = 'dynamic_pages' OR a.name_short = 'updatetag' OR a.name_short = 'del_wo_archiv' OR a.name_short = 'addlvl2group' OR a.name_short = 'user' OR a.name_short = 'addmembership' OR a.name_short = 'maintain' OR a.name_short = 'admin_filter' OR a.name_short = 'add_depencies') +OR ((a.name_short = 'delete_file' OR a.name_short = 'delmembership' OR a.name_short = 'disableaccount' OR a.name_short = 'user_details' OR a.name_short = 'other_drafts' OR a.name_short = 'stats' OR a.name_short = 'dynamic_pages' OR a.name_short = 'updatetag' OR a.name_short = 'del_wo_archiv' OR a.name_short = 'addlvl2group' OR a.name_short = 'user' OR a.name_short = 'addmembership' OR a.name_short = 'maintain' OR a.name_short = 'admin_filter' OR a.name_short = 'add_dependencies') AND g.security_level = 3) OR ((a.name_short = 'admin' OR a.name_short = 'logs' OR a.name_short = 'addlvl3group') @@ -721,19 +721,6 @@ ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; INSERT INTO roscms_accounts_sessions SELECT * FROM user_sessions; - - - --- -------------------------------------------------------- --- create jobs (e.g. stuff that has to be performed while generating pages) --- -------------------------------------------------------- -CREATE TABLE roscms_jobs ( - id bigint(20) unsigned NOT NULL, - name varchar(32) collate utf8_unicode_ci NOT NULL, - content text collate utf8_unicode_ci NOT NULL, - PRIMARY KEY (id), - KEY name (name) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_maintain.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_maintain.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_maintain.js [iso-8859-1] Fri Feb 27 16:22:34 2009 @@ -110,16 +110,16 @@ /** - * rebuild the depency tree - */ -function rebuildDepencies( ) + * rebuild the dependency tree + */ +function rebuildDependencies( ) { var uf_check = confirm("Do you want to continue?"); if (uf_check) { document.getElementById('maintainarea').style.display = 'block'; - document.getElementById('maintainarea').innerHTML = 'rebuilding depencies, this may take a while ...'; - makeRequest('?page=backend&type=maintain&action=rebuilddepencies', 'gen', '', 'text', 'GET'); + document.getElementById('maintainarea').innerHTML = 'rebuilding dependencies, this may take a while ...'; + makeRequest('?page=backend&type=maintain&action=rebuilddependencies', 'gen', '', 'text', 'GET'); } } Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] Fri Feb 27 16:22:34 2009 @@ -1053,14 +1053,14 @@ /** - * requests the depencies tab in the entry details + * requests the dependencies tab in the entry details * * @param int drid revision id */ -function showEditorTabDepencies( drid ) -{ - makeRequest('?page=backend&type=text&subtype=mef&d_fl=showdepencies&d_r_id='+drid, 'mef', 'frmedittagsc2', 'html', 'GET', ''); -} // end of function showEditorTabDepencies +function showEditorTabDependencies( drid ) +{ + makeRequest('?page=backend&type=text&subtype=mef&d_fl=showdependencies&d_r_id='+drid, 'mef', 'frmedittagsc2', 'html', 'GET', ''); +} // end of function showEditorTabDependencies @@ -1570,9 +1570,9 @@ alertbox('Entry updated'); break; - case 'updatedepencies': + case 'updatedependencies': alertbox(http_request.responseText); - makeRequest('?page=backend&type=text&subtype=mef&d_fl=showdepencies&d_r_id='+document.getElementById('mefrrevid').innerHTML, 'mef', 'frmedittagsc2', 'html', 'GET', ''); + makeRequest('?page=backend&type=text&subtype=mef&d_fl=showdependencies&d_r_id='+document.getElementById('mefrrevid').innerHTML, 'mef', 'frmedittagsc2', 'html', 'GET', ''); break; case 'updatetag': @@ -2027,31 +2027,31 @@ /** - * add a new manual depency + * add a new manual dependency * * @param int rev_id */ -function addDepency( rev_id ) +function addDependency( rev_id ) { var name = document.getElementById('dep_name').value; // check if name is given if (name !== '') { - makeRequest('?page=backend&type=text&subtype=mef&d_fl=adddepency&rev_id='+rev_id+'&dep_name='+encodeURIComponent(name)+'&dep_type='+encodeURIComponent(document.getElementById('dep_type').value), 'mef', 'updatedepencies', 'html', 'GET', ''); - } -} // addDepency - - - -/** - * delete a new manual depency - * - * @param int dep_id depency id - */ -function deleteDepency( dep_id ) -{ - makeRequest('?page=backend&type=text&subtype=mef&d_fl=deletedepency&dep_id='+dep_id, 'mef', 'updatedepencies', 'html', 'GET', ''); -} // deleteDepency + makeRequest('?page=backend&type=text&subtype=mef&d_fl=adddependency&rev_id='+rev_id+'&dep_name='+encodeURIComponent(name)+'&dep_type='+encodeURIComponent(document.getElementById('dep_type').value), 'mef', 'updatedependencies', 'html', 'GET', ''); + } +} // addDependency + + + +/** + * delete a new manual dependency + * + * @param int dep_id dependency id + */ +function deleteDependency( dep_id ) +{ + makeRequest('?page=backend&type=text&subtype=mef&d_fl=deletedependency&dep_id='+dep_id, 'mef', 'updatedependencies', 'html', 'GET', ''); +} // deleteDependency Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_EntryTable… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_EntryTable… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_EntryTable… [iso-8859-1] Fri Feb 27 16:22:34 2009 @@ -277,10 +277,10 @@ } } - // update depencies for new rev - $depency = new Depencies(); - if (!$depency->addRevision($revision['id'])) { - echo 'Error while updating depencies'; + // update dependencies for new rev + $dependency = new Dependencies(); + if (!$dependency->addRevision($revision['id'])) { + echo 'Error while updating dependencies'; return false; } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_Maintain.c… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_Maintain.c… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_Maintain.c… [iso-8859-1] Fri Feb 27 16:22:34 2009 @@ -46,8 +46,8 @@ $this->generateAll(); break; - case 'rebuilddepencies': - $this->rebuildDepencies(); + case 'rebuilddependencies': + $this->rebuildDependencies(); break; case 'genone': @@ -66,7 +66,7 @@ private function optimize( ) { // call optimize table MySQL function - $stmt=&DBConnection::getInstance()->prepare("OPTIMIZE TABLE ".ROSCMST_AREA.",".ROSCMST_USERS.",".ROSCMST_FORBIDDEN.",".ROSCMST_SESSIONS.",".ROSCMST_COUNTRIES.",".ROSCMST_ENTRIES.",".ROSCMST_ACCESS.",".ROSCMST_RIGHTS.",".ROSCMST_REVISIONS.",".ROSCMST_STEXT.",".ROSCMST_TAGS.",".ROSCMST_TEXT.",".ROSCMST_FILTER.",".ROSCMST_GROUPS.",".ROSCMST_JOBS.",".ROSCMST_LANGUAGES.",".ROSCMST_SUBSYS.",".ROSCMST_MEMBERSHIPS.",".ROSCMST_AREA_ACCESS.",".ROSCMST_DEPENCIES.",".ROSCMST_ACL.",".ROSCMST_TIMEZONES); + $stmt=&DBConnection::getInstance()->prepare("OPTIMIZE TABLE ".ROSCMST_AREA.",".ROSCMST_USERS.",".ROSCMST_FORBIDDEN.",".ROSCMST_SESSIONS.",".ROSCMST_COUNTRIES.",".ROSCMST_ENTRIES.",".ROSCMST_ACCESS.",".ROSCMST_RIGHTS.",".ROSCMST_REVISIONS.",".ROSCMST_STEXT.",".ROSCMST_TAGS.",".ROSCMST_TEXT.",".ROSCMST_FILTER.",".ROSCMST_GROUPS.",".ROSCMST_JOBS.",".ROSCMST_LANGUAGES.",".ROSCMST_SUBSYS.",".ROSCMST_MEMBERSHIPS.",".ROSCMST_AREA_ACCESS.",".ROSCMST_DEPENDENCIES.",".ROSCMST_ACL.",".ROSCMST_TIMEZONES); $stmt->execute(); Log::writeHigh('optimize database tables: done by '.ThisUser::getInstance()->id().' {data_maintain_out}'); @@ -140,21 +140,21 @@ * * @access private */ - private function rebuildDepencies( ) + private function rebuildDependencies( ) { - Log::writeGenerateHigh('rebuilding depency tree - start'); + Log::writeGenerateHigh('rebuilding dependency tree - start'); // start timer $gentimeA = explode(' ',microtime()); $gentimeA = $gentimeA[1] + $gentimeA[0]; - // rebuild depencies - $depencies = new Depencies(); - if ($depencies->rebuild()) { + // rebuild dependencies + $dependencies = new Dependencies(); + if ($dependencies->rebuild()) { echo 'done'; } else { - echo 'Error: a problem occoured while rebuilding depencies'; + echo 'Error: a problem occoured while rebuilding dependencies'; } // stop timer @@ -165,8 +165,8 @@ $totaltimef = ($gentimeB - $gentimeA); $showtimef = number_format($totaltimef, 4, '.', ''); - Log::writeGenerateHigh('rebuilding depency tree - end: '.$showtimef.' seconds'); - } // end of member function rebuildDepencies + Log::writeGenerateHigh('rebuilding dependency tree - end: '.$showtimef.' seconds'); + } // end of member function rebuildDependencies Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… [iso-8859-1] Fri Feb 27 16:22:34 2009 @@ -31,12 +31,12 @@ // Type of detail - const METADATA = 0; - const FIELDS = 1; - const HISTORY = 2; - const SECURITY = 3; - const REVISION = 4; - const DEPENCIES= 5; + const METADATA = 0; + const FIELDS = 1; + const HISTORY = 2; + const SECURITY = 3; + const REVISION = 4; + const DEPENDENCIES = 5; // private $data_id; @@ -109,28 +109,28 @@ $this->showEntryDetails(self::HISTORY); break; - // show Depencies - case 'showdepencies': - $this->showEntryDetails(self::DEPENCIES); - break; - - // add Depencies - case 'adddepency': - if (Depencies::addManual($_GET['rev_id'],$_GET['dep_name'],$_GET['dep_type'])) { - echo 'Adding user defined depency was successful.'; + // show dependencies + case 'showdependencies': + $this->showEntryDetails(self::DEPENDENCIES); + break; + + // add dependencies + case 'adddependency': + if (Dependencies::addManual($_GET['rev_id'],$_GET['dep_name'],$_GET['dep_type'])) { + echo 'Adding user defined dependency was successful.'; } else { - echo 'Error while adding user defined depency.'; + echo 'Error while adding user defined dependency.'; } break; - // delete Depencies - case 'deletedepency': - if (Depencies::deleteManual($_GET['dep_id'])) { - echo 'Deleting user defined depency was successful.'; + // delete dependencies + case 'deletedependency': + if (Dependencies::deleteManual($_GET['dep_id'])) { + echo 'Deleting user defined dependency was successful.'; } else { - echo 'Error while deleting user defined depency.'; + echo 'Error while deleting user defined dependency.'; } break; @@ -455,15 +455,15 @@ } } - // Depencies - if (Entry::hasAccess($this->data_id,'depencies')) { + // dependencies + if (Entry::hasAccess($this->data_id,'dependencies')) { echo ' | '; - if ($mode == self::DEPENCIES) { - echo '<strong>Depencies</strong>'; + if ($mode == self::DEPENDENCIES) { + echo '<strong>Dependencies</strong>'; } else { - echo '<span class="detailmenu" onclick="'."showEditorTabDepencies(".$this->rev_id.")".'">Depencies</span>'; + echo '<span class="detailmenu" onclick="'."showEditorTabDependencies(".$this->rev_id.")".'">Dependencies</span>'; } } @@ -518,8 +518,8 @@ case self::HISTORY: $this->showEntryDetailsHistory(); break; - case self::DEPENCIES: - $this->showEntryDepencies($this->data_id); + case self::DEPENDENCIES: + $this->showEntryDependencies($this->data_id); break; case self::SECURITY: $this->showEntryDetailsEntry(); @@ -650,17 +650,17 @@ /** - * Interface for depenciess - * - * @access private - */ - private function showEntryDepencies() + * Interface for dependencies + * + * @access private + */ + private function showEntryDependencies() { - // add manual depency - if (ThisUser::getInstance()->hasAccess('add_depencies')) { + // add manual dependency + if (ThisUser::getInstance()->hasAccess('add_dependencies')) { echo_strip(' - <h3>Add Depency</h3> + <h3>Add Dependency</h3> <fieldset> <label for="dep_name">Name:</label> <input type="text" name="dep_name" id="dep_name" /><br /> @@ -671,22 +671,22 @@ <option value="script">Script</option> '.(ThisUser::getInstance()->hasAccess('dynamic_pages') ? '<option value="dynamic">Dynamic Page</option>' : '').' </select><br /> - <button type="submit" onclick="'."addDepency(".$this->rev_id.")".'">add manual depency</button> + <button type="submit" onclick="'."addDependency(".$this->rev_id.")".'">add manual dependency</button> </fieldset>'); } - // print depency tree + // print dependency tree echo '<h3>Dependent Entries</h3>'; - $this->buildDepencyTree($this->data_id); + $this->buildDependencyTree($this->data_id); // required articles that don't exist - $stmt=&DBConnection::getInstance()->prepare("SELECT DISTINCT child_name, include, id, user_defined FROM ".ROSCMST_DEPENCIES." WHERE rev_id=:rev_id AND child_id IS NULL ORDER BY include DESC, child_name ASC"); + $stmt=&DBConnection::getInstance()->prepare("SELECT DISTINCT child_name, include, id, user_defined FROM ".ROSCMST_DEPENDENCIES." WHERE rev_id=:rev_id AND child_id IS NULL ORDER BY include DESC, child_name ASC"); $stmt->bindParam('rev_id',$this->rev_id, PDO::PARAM_INT); $stmt->execute(); $required_fail = $stmt->fetchAll(PDO::FETCH_ASSOC); // articles that exist - $stmt=&DBConnection::getInstance()->prepare("SELECT DISTINCT d.name, d.type, w.include, w.id, w.user_defined FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_ENTRIES." d ON d.id=w.child_id WHERE rev_id=:rev_id AND w.child_name IS NULL ORDER BY w.include DESC, d.name ASC, d.type ASC"); + $stmt=&DBConnection::getInstance()->prepare("SELECT DISTINCT d.name, d.type, w.include, w.id, w.user_defined FROM ".ROSCMST_DEPENDENCIES." w JOIN ".ROSCMST_ENTRIES." d ON d.id=w.child_id WHERE rev_id=:rev_id AND w.child_name IS NULL ORDER BY w.include DESC, d.name ASC, d.type ASC"); $stmt->bindParam('rev_id',$this->rev_id, PDO::PARAM_INT); $stmt->execute(); $required_exist = $stmt->fetchAll(PDO::FETCH_ASSOC); @@ -700,9 +700,9 @@ foreach($required_exist as $required) { echo '<li>['.$required['type'].'] '.$required['name'].' ('.($required['include']==true ? 'include' : 'link').')'; - // delete manual depency - if (ThisUser::getInstance()->hasAccess('add_depencies') && $required['user_defined']) { - echo ' <span class="deletebutton" onclick="'."deleteDepency(".$required['id'].")".'"><img src="'.RosCMS::getInstance()->pathRosCMS().'images/remove.gif" alt="" /> Delete</span>'; + // delete manual dependency + if (ThisUser::getInstance()->hasAccess('add_dependencies') && $required['user_defined']) { + echo ' <span class="deletebutton" onclick="'."deleteDependency(".$required['id'].")".'"><img src="'.RosCMS::getInstance()->pathRosCMS().'images/remove.gif" alt="" /> Delete</span>'; } echo '</li>'; @@ -717,9 +717,9 @@ foreach($required_fail as $required) { echo '<li>'.$required['child_name'].' ('.($required['include']==true ? 'include' : 'link').')'; - // delete manual depency - if (ThisUser::getInstance()->hasAccess('add_depencies') && $required['user_defined']) { - echo ' <span class="deletebutton" onclick="'."deleteDepency(".$required['id'].")".'"><img src="'.RosCMS::getInstance()->pathRosCMS().'images/remove.gif" alt="" /> Delete</span>'; + // delete manual dependency + if (ThisUser::getInstance()->hasAccess('add_dependencies') && $required['user_defined']) { + echo ' <span class="deletebutton" onclick="'."deleteDependency(".$required['id'].")".'"><img src="'.RosCMS::getInstance()->pathRosCMS().'images/remove.gif" alt="" /> Delete</span>'; } echo '</li>'; @@ -727,37 +727,37 @@ echo '</ul>'; } } - } // end of member function showEntryDepencies - - - - /** - * recursive function to build our depency tree - * - * @access private - */ - private function buildDepencyTree( $data_id ) + } // end of member function showEntryDependencies + + + + /** + * recursive function to build our dependency tree + * + * @access private + */ + private function buildDependencyTree( $data_id ) { // get current childs - $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, l.name AS language, d.type, r.data_id, w.user_defined, w.id FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_REVISIONS." r ON w.rev_id = r.id JOIN ".ROSCMST_ENTRIES." d ON d.id=r.data_id JOIN ".ROSCMST_LANGUAGES." l ON l.id=r.lang_id WHERE w.child_id=:data_id AND w.include IS TRUE ORDER BY l.name ASC, d.name ASC"); + $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, l.name AS language, d.type, r.data_id, w.user_defined, w.id FROM ".ROSCMST_DEPENDENCIES." w JOIN ".ROSCMST_REVISIONS." r ON w.rev_id = r.id JOIN ".ROSCMST_ENTRIES." d ON d.id=r.data_id JOIN ".ROSCMST_LANGUAGES." l ON l.id=r.lang_id WHERE w.child_id=:data_id AND w.include IS TRUE ORDER BY l.name ASC, d.name ASC"); $stmt->bindParam('data_id',$data_id, PDO::PARAM_INT); $stmt->execute(); - $depencies = $stmt->fetchAll(PDO::FETCH_ASSOC); + $dependencies = $stmt->fetchAll(PDO::FETCH_ASSOC); // output childs - if (count($depencies) > 0) { + if (count($dependencies) > 0) { echo '<ul>'; - // show Depencies + // show dependencies $x=0; - foreach ($depencies as $depency) { + foreach ($dependencies as $dependency) { $x++; - echo '<li style="color: #'.($x%2 ? '000' : '777').';">['.$depency['type'].'] '.$depency['name'].' <span style="color: #'.($x%2 ? 'AAA' : 'CCC').';">('.$depency['language'].')</span>'; + echo '<li style="color: #'.($x%2 ? '000' : '777').';">['.$dependency['type'].'] '.$dependency['name'].' <span style="color: #'.($x%2 ? 'AAA' : 'CCC').';">('.$dependency['language'].')</span>'; // get childs - if ($data_id != $depency['data_id']) { - $this->buildDepencyTree( $depency['data_id']); + if ($data_id != $dependency['data_id']) { + $this->buildDependencyTree( $dependency['data_id']); } echo '</li>'; } // end foreach @@ -767,7 +767,7 @@ elseif ($this->data_id === $data_id) { echo 'Looks like, no other entries depend on this entry.'; } - } // end of member function buildDepencyTree + } // end of member function buildDependencyTree Removed: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Depencies.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/om/Depencies.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/om/Depencies.class.php (removed) @@ -1,296 +1,0 @@ -<?php - /* - RosCMS - ReactOS Content Management System - Copyright (C) 2008 Danny Götte <dangerground(a)web.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - - -/** - * @class Depencies - * - * Revisions are dependent from other entries, that means a revision can be dependent from a revision of the same language, or as fallback to any other language, preferable to the standard language - * if not entry id exists, only a depency to the name is saved - * - */ -class Depencies -{ - - private $rev_id = 0; - private $short = array('content'=>'cont','script'=>'include','page'=>'link','dynamic'=>'link'); - - - - /** - * delete the old tree, and build it new - * - * @return bool - * @access public - */ - public function rebuild( ) - { - // try to force unlimited script runtime - @set_time_limit(0); - - // remove old depencies - DBConnection::getInstance()->exec("DELETE FROM ".ROSCMST_DEPENCIES." WHERE user_defined IS FALSE"); - - // walk trough all stable - $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_REVISIONS." WHERE archive IS FALSE AND status='stable'"); - if ($stmt->execute()) { - while ($revision = $stmt->fetch(PDO::FETCH_ASSOC)) { - - // add depencies for current revision - $this->addRevision($revision['id']); - } - return true; - } - return false; - } // end of member function rebuild - - - - /** - * adds depencies for this revision - * - * @param int rev_id - * @return bool - * @access public - */ - public function addRevision( $rev_id ) - { - $this->rev_id = $rev_id; - - // get text and parse it for depencies - $stmt=&DBConnection::getInstance()->prepare("SELECT content FROM ".ROSCMST_TEXT." WHERE rev_id=:rev_id AND name='content'"); - $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); - if ($stmt->execute()) { - return preg_replace_callback('/\[#((inc|templ|cont|link)_([^][#[:space:]]+))\]/', array($this,'newDepency'), $stmt->fetchColumn()); - } - return false; - } // end of member function addRevision - - - - /** - * @FILLME - * - * @param string from_name - * @param string to_name - * @param string from_type - * @param string to_type - * @return bool - * @access public - */ - public static function renameEntry( $from_name, $to_name, $from_type, $to_type ) - { - //@TODO - } // end of member function renameEntry - - - - /** - * replaces a data_id with the link name, the data would have, if it would exist - * - * @param data_id - * @return bool - * @access public - */ - public static function removeEntry( $data_id ) - { - // get name & type - $stmt=&DBConnection::getInstance()->exec("SELECT name, type FROM ".ROSCMST_ENTRIES." WHERE id=:data_id"); - $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); - if ($stmt->execute()) { - $data = $stmt->fetchOnce(); - - // replace old depency per id to text depency - $stmt=&DBConnection::getInstance()->exec("UPDATE ".ROSCMST_DEPENCIES." SET child_id = NULL, child_name = :depency_name WHERE child_id=:data_id"); - $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); - $stmt->bindValue('depency_name',$this->short[$data['type']].'_'.$data['name']); - return $stmt->execute(); - } - return false; - } // end of member function removeEntry - - - - /** - * removes all depencies from a revision to all other data_ids - * - * @param int rev_id - * @return bool - * @access public - */ - public static function removeRevision( $rev_id ) - { - // remove old depencies - $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_DEPENCIES." WHERE reV_id = :rev_id"); - $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); - return $stmt->execute(); - } // end of member function removeRevision - - - - /** - * add a new user defined depency - * - * @param int rev_id - * @param string name entry name - * @param string type entry type - * @return bool - * @access public - */ - public static function addManual( $rev_id, $name, $type ) - { - // check access rights - if (ThisUser::getInstance()->hasAccess('add_depencies')) { - return self::insert($rev_id, $name, $type, true); - } - return false; - } // end of member function addManual - - - - /** - * deletes a user defined Depency - * - * @param int dep_id depency id - * @return bool - * @access public - */ - public static function deleteManual( $dep_id ) - { - // check access rights - if (ThisUser::getInstance()->hasAccess('add_depencies')) { - - // delete depencies - $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_DEPENCIES." WHERE id = :dep_id AND user_defined IS TRUE"); - $stmt->bindParam('dep_id',$dep_id,PDO::PARAM_INT); - return $stmt->execute(); - } - return false; - } // end of member function deleteManual - - - - /** - * inserts/updates new depency into database - * - * @param string[] matches - * @return bool - * @access private - */ - private function newDepency( $matches ) - { - // get depency type for database - switch ($matches[2]) { - case 'cont': - $type = 'content'; - break; - case 'inc': - $type = 'script'; - break; - case 'link': - $type = 'page'; - break; - } - - return self::insert($this->rev_id, $matches[3], $type, false); - } // end of member function newDepency - - - - /** - * shared function to insert/update entries - * - * @param int rev_id parent - * @param string name child - * @param string type child - * @param bool user_defined - * @return bool - * @access public - */ - private static function insert( $rev_id, $name, $type, $user_defined ) - { - // is include depency ? - switch ($type) { - case 'content': - $depency_name = 'cont_'.$name; - $include = true; - break; - case 'script': - $depency_name = 'inc_'.$name; - $include = true; - break; - case 'dynamic': - $depency_name = 'link_'.$name; - $include = true && $user_defined; - break; - case 'page': - $depency_name = 'link_'.$name; - $include = false; - break; - } - - // check for existing entry - $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_ENTRIES." WHERE name = :name AND type = :type LIMIT 1"); - $stmt->bindParam('name',$name,PDO::PARAM_STR); - $stmt->bindParam('type',$type,PDO::PARAM_STR); - if ($stmt->execute()) { - $data_id = $stmt->fetchColumn(); - - // check if we already have an depency to this entry - $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_DEPENCIES." WHERE child_name=:depency_name"); - $stmt->bindParam('depency_name',$depency_name,PDO::PARAM_STR); - $stmt->execute(); - $depency_id = $stmt->fetchColumn(); - - // update entry with data id instead of name&type - if ($depency_id !== false) { - $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_DEPENCIES." SET child_name=NULL, child_id=:depency_id WHERE id=:depency_id"); - $stmt->bindParam('child_id',$data_id,PDO::PARAM_INT); - $stmt->bindParam('depency_id',$depency_id,PDO::PARAM_INT); - return $stmt->execute(); - } - - // insert new depency - else { - - // insert depency with name - if ($data_id === false) { - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_DEPENCIES." (rev_id, child_name, include, user_defined) VALUES (:rev_id, :depency_name, :is_include, :user_defined)"); - $stmt->bindParam('depency_name',$depency_name,PDO::PARAM_STR); - } - - // insert depency with id - else { - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_DEPENCIES." (rev_id, child_id, include, user_defined) VALUES (:rev_id, :depency_id, :is_include, :user_defined)"); - $stmt->bindParam('depency_id',$data_id,PDO::PARAM_INT); - } - $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); - $stmt->bindParam('is_include',$include,PDO::PARAM_BOOL); - $stmt->bindParam('user_defined',$user_defined,PDO::PARAM_BOOL); - return $stmt->execute(); - } - } - return false; - } // end of member function deleteManual - - - -} // end of Depencies -?> Copied: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Dependencies.class.php (from r39677, branches/danny-web/reactos.org/htdocs/roscms/lib/om/Depencies.class.php) URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/om/Depencies.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/om/Dependencies.class.php [iso-8859-1] Fri Feb 27 16:22:34 2009 @@ -20,13 +20,13 @@ /** - * @class Depencies + * @class Dependencies * * Revisions are dependent from other entries, that means a revision can be dependent from a revision of the same language, or as fallback to any other language, preferable to the standard language - * if not entry id exists, only a depency to the name is saved + * if not entry id exists, only a dependency to the name is saved * */ -class Depencies +class Dependencies { private $rev_id = 0; @@ -45,15 +45,15 @@ // try to force unlimited script runtime @set_time_limit(0); - // remove old depencies - DBConnection::getInstance()->exec("DELETE FROM ".ROSCMST_DEPENCIES." WHERE user_defined IS FALSE"); + // remove old dependencies + DBConnection::getInstance()->exec("DELETE FROM ".ROSCMST_DEPENDENCIES." WHERE user_defined IS FALSE"); // walk trough all stable $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_REVISIONS." WHERE archive IS FALSE AND status='stable'"); if ($stmt->execute()) { while ($revision = $stmt->fetch(PDO::FETCH_ASSOC)) { - // add depencies for current revision + // add dependencies for current revision $this->addRevision($revision['id']); } return true; @@ -64,7 +64,7 @@ /** - * adds depencies for this revision + * adds dependencies for this revision * * @param int rev_id * @return bool @@ -74,11 +74,11 @@ { $this->rev_id = $rev_id; - // get text and parse it for depencies + // get text and parse it for dependencies $stmt=&DBConnection::getInstance()->prepare("SELECT content FROM ".ROSCMST_TEXT." WHERE rev_id=:rev_id AND name='content'"); $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); if ($stmt->execute()) { - return preg_replace_callback('/\[#((inc|templ|cont|link)_([^][#[:space:]]+))\]/', array($this,'newDepency'), $stmt->fetchColumn()); + return preg_replace_callback('/\[#((inc|templ|cont|link)_([^][#[:space:]]+))\]/', array($this,'newDependency'), $stmt->fetchColumn()); } return false; } // end of member function addRevision @@ -117,10 +117,10 @@ if ($stmt->execute()) { $data = $stmt->fetchOnce(); - // replace old depency per id to text depency - $stmt=&DBConnection::getInstance()->exec("UPDATE ".ROSCMST_DEPENCIES." SET child_id = NULL, child_name = :depency_name WHERE child_id=:data_id"); + // replace old dependency per id to text dependency + $stmt=&DBConnection::getInstance()->exec("UPDATE ".ROSCMST_DEPENDENCIES." SET child_id = NULL, child_name = :dependency_name WHERE child_id=:data_id"); $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); - $stmt->bindValue('depency_name',$this->short[$data['type']].'_'.$data['name']); + $stmt->bindValue('dependency_name',$this->short[$data['type']].'_'.$data['name']); return $stmt->execute(); } return false; @@ -129,7 +129,7 @@ /** - * removes all depencies from a revision to all other data_ids + * removes all dependencies from a revision to all other data_ids * * @param int rev_id * @return bool @@ -137,8 +137,8 @@ */ public static function removeRevision( $rev_id ) { - // remove old depencies - $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_DEPENCIES." WHERE reV_id = :rev_id"); + // remove old dependencies + $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_DEPENDENCIES." WHERE reV_id = :rev_id"); $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); return $stmt->execute(); } // end of member function removeRevision @@ -146,7 +146,7 @@ /** - * add a new user defined depency + * add a new user defined dependency * * @param int rev_id * @param string name entry name @@ -157,7 +157,7 @@ public static function addManual( $rev_id, $name, $type ) { // check access rights - if (ThisUser::getInstance()->hasAccess('add_depencies')) { + if (ThisUser::getInstance()->hasAccess('add_dependencies')) { return self::insert($rev_id, $name, $type, true); } return false; @@ -166,19 +166,19 @@ /** - * deletes a user defined Depency - * - * @param int dep_id depency id + * deletes a user defined dependency + * + * @param int dep_id dependency id * @return bool * @access public */ public static function deleteManual( $dep_id ) { // check access rights - if (ThisUser::getInstance()->hasAccess('add_depencies')) { - - // delete depencies - $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_DEPENCIES." WHERE id = :dep_id AND user_defined IS TRUE"); + if (ThisUser::getInstance()->hasAccess('add_dependencies')) { + + // delete dependencies + $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_DEPENDENCIES." WHERE id = :dep_id AND user_defined IS TRUE"); $stmt->bindParam('dep_id',$dep_id,PDO::PARAM_INT); return $stmt->execute(); } @@ -188,15 +188,15 @@ /** - * inserts/updates new depency into database + * inserts/updates new dependency into database * * @param string[] matches * @return bool * @access private */ - private function newDepency( $matches ) - { - // get depency type for database + private function newDependency( $matches ) + { + // get dependency type for database switch ($matches[2]) { case 'cont': $type = 'content'; @@ -210,7 +210,7 @@ } return self::insert($this->rev_id, $matches[3], $type, false); - } // end of member function newDepency + } // end of member function newDependency @@ -226,22 +226,22 @@ */ private static function insert( $rev_id, $name, $type, $user_defined ) { - // is include depency ? + // is include dependency ? switch ($type) { case 'content': - $depency_name = 'cont_'.$name; + $dependency_name = 'cont_'.$name; $include = true; break; case 'script': - $depency_name = 'inc_'.$name; + $dependency_name = 'inc_'.$name; $include = true; break; case 'dynamic': - $depency_name = 'link_'.$name; + $dependency_name = 'link_'.$name; $include = true && $user_defined; break; case 'page': - $depency_name = 'link_'.$name; + $dependency_name = 'link_'.$name; $include = false; break; } @@ -253,33 +253,33 @@ if ($stmt->execute()) { $data_id = $stmt->fetchColumn(); - // check if we already have an depency to this entry - $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_DEPENCIES." WHERE child_name=:depency_name"); - $stmt->bindParam('depency_name',$depency_name,PDO::PARAM_STR); + // check if we already have an dependency to this entry + $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_DEPENDENCIES." WHERE child_name=:dependency_name"); + $stmt->bindParam('dependency_name',$dependency_name,PDO::PARAM_STR); $stmt->execute(); - $depency_id = $stmt->fetchColumn(); + $dependency_id = $stmt->fetchColumn(); // update entry with data id instead of name&type - if ($depency_id !== false) { - $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_DEPENCIES." SET child_name=NULL, child_id=:depency_id WHERE id=:depency_id"); + if ($dependency_id !== false) { + $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_DEPENDENCIES." SET child_name=NULL, child_id=:dependency_id WHERE id=:dependency_id"); $stmt->bindParam('child_id',$data_id,PDO::PARAM_INT); - $stmt->bindParam('depency_id',$depency_id,PDO::PARAM_INT); + $stmt->bindParam('dependency_id',$dependency_id,PDO::PARAM_INT); return $stmt->execute(); } - // insert new depency + // insert new dependency else { - // insert depency with name + // insert dependency with name if ($data_id === false) { - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_DEPENCIES." (rev_id, child_name, include, user_defined) VALUES (:rev_id, :depency_name, :is_include, :user_defined)"); - $stmt->bindParam('depency_name',$depency_name,PDO::PARAM_STR); + $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_DEPENDENCIES." (rev_id, child_name, include, user_defined) VALUES (:rev_id, :dependency_name, :is_include, :user_defined)"); + $stmt->bindParam('dependency_name',$dependency_name,PDO::PARAM_STR); } - // insert depency with id + // insert dependency with id else { - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_DEPENCIES." (rev_id, child_id, include, user_defined) VALUES (:rev_id, :depency_id, :is_include, :user_defined)"); - $stmt->bindParam('depency_id',$data_id,PDO::PARAM_INT); + $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_DEPENDENCIES." (rev_id, child_id, include, user_defined) VALUES (:rev_id, :dependency_id, :is_include, :user_defined)"); + $stmt->bindParam('dependency_id',$data_id,PDO::PARAM_INT); } $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); $stmt->bindParam('is_include',$include,PDO::PARAM_BOOL); @@ -292,5 +292,5 @@ -} // end of Depencies +} // end of Dependencies ?> Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Entry.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/om/Entry.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/om/Entry.class.php [iso-8859-1] Fri Feb 27 16:22:34 2009 @@ -228,7 +228,7 @@ // update next number Tag::update(Tag::getId($parent_rev,'next_index',-1),$next_index+1); - Depencies::addManual($parent_rev, $data_name, 'content'); + Dependencies::addManual($parent_rev, $data_name, 'content'); } // create new stext contents for (dynamic) pages Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Generate.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/om/Generate.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/om/Generate.class.php [iso-8859-1] Fri Feb 27 16:22:34 2009 @@ -88,15 +88,15 @@ $stmt->execute(); $content = $stmt->fetchColumn(); - // replace depencies - $stmt=&DBConnection::getInstance()->prepare("SELECT d.type, d.name FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_ENTRIES." d ON w.child_id=d.id WHERE w.rev_id=:rev_id AND w.include IS TRUE"); + // replace dependencies + $stmt=&DBConnection::getInstance()->prepare("SELECT d.type, d.name FROM ".ROSCMST_DEPENDENCIES." w JOIN ".ROSCMST_ENTRIES." d ON w.child_id=d.id WHERE w.rev_id=:rev_id AND w.include IS TRUE"); $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); $stmt->execute(); - while ($depency = $stmt->fetch(PDO::FETCH_ASSOC)) { + while ($dependency = $stmt->fetch(PDO::FETCH_ASSOC)) { // replace - if ($depency['type'] != 'script') { - $content = str_replace('[#'.$this->short[$depency['type']].'_'.$depency['name'].']', $this->getCached(array(null, $this->short[$depency['type']].'_'.$depency['name'])), $content); + if ($dependency['type'] != 'script') { + $content = str_replace('[#'.$this->short[$dependency['type']].'_'.$dependency['name'].']', $this->getCached(array(null, $this->short[$dependency['type']].'_'.$dependency['name'])), $content); } } @@ -217,15 +217,15 @@ // file content $content = $revision['content']; - // replace depencies - $stmt_more=&DBConnection::getInstance()->prepare("SELECT d.id, d.type, d.name FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_ENTRIES." d ON w.child_id=d.id WHERE w.rev_id=:rev_id AND w.include IS TRUE"); + // replace dependencies + $stmt_more=&DBConnection::getInstance()->prepare("SELECT d.id, d.type, d.name FROM ".ROSCMST_DEPENDENCIES." w JOIN ".ROSCMST_ENTRIES." d ON w.child_id=d.id WHERE w.rev_id=:rev_id AND w.include IS TRUE"); $stmt_more->bindParam('rev_id',$revision['id'],PDO::PARAM_INT); $stmt_more->execute(); - while ($depency = $stmt_more->fetch(PDO::FETCH_ASSOC)) { + while ($dependency = $stmt_more->fetch(PDO::FETCH_ASSOC)) { // replace - if ($depency['type'] != 'script') { - $content = str_replace('[#'.$this->short[$depency['type']].'_'.$depency['name'].']', $this->getCached(array(null, $this->short[$depency['type']].'_'.$depency['name'])), $content); + if ($dependency['type'] != 'script') { + $content = str_replace('[#'.$this->short[$dependency['type']].'_'.$dependency['name'].']', $this->getCached(array(null, $this->short[$dependency['type']].'_'.$dependency['name'])), $content); } } // end foreach @@ -293,14 +293,14 @@ // copy content $content = $revision['content']; - // replace depencies - $stmt_more=&DBConnection::getInstance()->prepare("SELECT d.id, d.type, d.name FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_ENTRIES." d ON w.child_id=d.id WHERE w.rev_id=:rev_id AND w.include IS TRUE AND d.type != 'script'"); + // replace dependencies + $stmt_more=&DBConnection::getInstance()->prepare("SELECT d.id, d.type, d.name FROM ".ROSCMST_DEPENDENCIES." w JOIN ".ROSCMST_ENTRIES." d ON w.child_id=d.id WHERE w.rev_id=:rev_id AND w.include IS TRUE AND d.type != 'script'"); $stmt_more->bindParam('rev_id',$revision['id'],PDO::PARAM_INT); $stmt_more->execute(); - while ($depency = $stmt_more->fetch(PDO::FETCH_ASSOC)) { + while ($dependency = $stmt_more->fetch(PDO::FETCH_ASSOC)) { // replace - $content = str_replace('[#'.$this->short[$depency['type']].'_'.$depency['name'].']', $this->getCached(array(null, $this->short[$depency['type']].'_'.$depency['name'])), $content); + $content = str_replace('[#'.$this->short[$dependency['type']].'_'.$dependency['name'].']', $this->getCached(array(null, $this->short[$dependency['type']].'_'.$dependency['name'])), $content); } // end foreach // replace scripts @@ -344,7 +344,7 @@ if ($revision['type'] == 'page' || $revision['type'] == 'dynamic') { - // in standard language we may have depencies to other languages, so better generate them all + // in standard language we may have dependencies to other languages, so better generate them all if ($revision['lang_id'] == Language::getStandardId()){ $stmt=&DBConnection::getInstance()->prepare("SELECT id, name_short FROM ".ROSCMST_LANGUAGES." ORDER BY level DESC, name ASC"); } @@ -381,25 +381,25 @@ SELECT DISTINCT org.name, org.type, COALESCE( trans.id, org.id ) AS id, org.data_id FROM ( - SELECT d.name, d.type, r.id, r.data_id FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_REVISIONS." r ON r.id=w.rev_id JOIN ".ROSCMST_ENTRIES." d ON d.id=r.data_id WHERE w.child_id=:depency_id AND r.lang_id = :standard_lang AND w.rev_id NOT IN(:rev_id,:rev_id2) AND r.archive IS FALSE AND w.include IS TRUE + SELECT d.name, d.type, r.id, r.data_id FROM ".ROSCMST_DEPENDENCIES." w JOIN ".ROSCMST_REVISIONS." r ON r.id=w.rev_id JOIN ".ROSCMST_ENTRIES." d ON d.id=r.data_id WHERE w.child_id=:dependency_id AND r.lang_id = :standard_lang AND w.rev_id NOT IN(:rev_id,:rev_id2) AND r.archive IS FALSE AND w.include IS TRUE ) AS org LEFT OUTER JOIN ( - SELECT d.name, d.type, r.id, r.data_id FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_REVISIONS." r ON r.id=w.rev_id JOIN ".ROSCMST_ENTRIES." d ON d.id=r.data_id WHERE w.child_id=:depency_id AND r.lang_id = :lang_id AND w.rev_id NOT IN(:rev_id,:rev_id2) AND r.archive IS FALSE AND w.include IS TRUE + SELECT d.name, d.type, r.id, r.data_id FROM ".ROSCMST_DEPENDENCIES." w JOIN ".ROSCMST_REVISIONS." r ON r.id=w.rev_id JOIN ".ROSCMST_ENTRIES." d ON d.id=r.data_id WHERE w.child_id=:dependency_id AND r.lang_id = :lang_id AND w.rev_id NOT IN(:rev_id,:rev_id2) AND r.archive IS FALSE AND w.include IS TRUE ) AS trans ON org.data_id = trans.data_id"); - $stmt->bindParam('depency_id',$revision['data_id'],PDO::PARAM_INT); + $stmt->bindParam('dependency_id',$revision['data_id'],PDO::PARAM_INT); $stmt->bindParam('rev_id',$base_rev,PDO::PARAM_INT); $stmt->bindParam('rev_id2',$rev_id,PDO::PARAM_INT); $stmt->bindParam('standard_lang',Language::getStandardId(),PDO::PARAM_INT); $stmt->bindParam('lang_id',$revision['lang_id'],PDO::PARAM_INT); $stmt->execute(); - while ($depency = $stmt->fetch(PDO::FETCH_ASSOC)) { + while ($dependency = $stmt->fetch(PDO::FETCH_ASSOC)) { // only run update once per $rev_id - if ($depency['type'] != 'script') { - - $this->update($depency['id'], $dynamic_num); + if ($dependency['type'] != 'script') { + + $this->update($dependency['id'], $dynamic_num); break; } - } // end while depency + } // end while dependency return true; } // end of member function update @@ -435,7 +435,7 @@ $stmt->execute(); // prepare for usage in loop - $stmt_more=&DBConnection::getInstance()->prepare("SELECT w.child_id, d.type, d.name FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_ENTRIES." d ON w.child_id=d.id WHERE w.rev_id=:rev_id AND w.include IS TRUE"); + $stmt_more=&DBConnection::getInstance()->prepare("SELECT w.child_id, d.type, d.name FROM ".ROSCMST_DEPENDENCIES." w JOIN ".ROSCMST_ENTRIES." d ON w.child_id=d.id WHERE w.rev_id=:rev_id AND w.include IS TRUE"); while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { @@ -466,23 +466,23 @@ // replace links $content = preg_replace_callback('/\[#link_([^][#[:space:]]+)\]/', array($this, 'replaceWithHyperlink'), $content); - // do we care about depencies ? + // do we care about dependencies ? if ($recursive) { - // process depencies first + // process dependencies first $stmt_more->bindParam('rev_id',$revision['id'],PDO::PARAM_INT); $stmt_more->execute(); - $depencies = $stmt_more->fetchAll(PDO::FETCH_ASSOC); - foreach ($depencies as $depency) { + $dependencies = $stmt_more->fetchAll(PDO::FETCH_ASSOC); + foreach ($dependencies as $dependency) { // cache dependent entries first - $depency_file = $data['lang_id'].'/'.$this->short[$depency['type']].'_'.$depency['name'].'.rcf'; - if (!file_exists($this->cache_dir.$depency_file) || $this->begin > date('Y-m-d H:i:s',filemtime($this->cache_dir.$depency_file))) { - $this->cacheFiles($depency['child_id']); + $dependency_file = $data['lang_id'].'/'.$this->short[$dependency['type']].'_'.$dependency['name'].'.rcf'; + if (!file_exists($this->cache_dir.$dependency_file) || $this->begin > date('Y-m-d H:i:s',filemtime($this->cache_dir.$dependency_file))) { + $this->cacheFiles($dependency['child_id']); } // replace - $content = str_replace('[#'.$this->short[$depency['type']].'_'.$depency['name'].']', $this->getCached(array(null, $this->short[$depency['type']].'_'.$depency['name'])), $content); + $content = str_replace('[#'.$this->short[$dependency['type']].'_'.$dependency['name'].']', $this->getCached(array(null, $this->short[$dependency['type']].'_'.$dependency['name'])), $content); } } $this->writeFile($data['lang_id'],$filename, $content); @@ -600,7 +600,7 @@ $stmt->execute(); $revision=$stmt->fetch(PDO::FETCH_ASSOC); - // check if depency not available + // check if dependency not available if ($revision === false) { $stmt->bindParam('lang_id',Language::getStandardId(),PDO::PARAM_INT); $stmt->execute(); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Revision.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/om/Revision.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/om/Revision.class.php [iso-8859-1] Fri Feb 27 16:22:34 2009 @@ -147,7 +147,7 @@ /** * delete a revision - * removes also depencies to this revision + * removes also dependencies to this revision * * @param int rev_id * @return bool @@ -157,8 +157,8 @@ { Log::writeMedium('delete entry: rev-id [rev-id: '.$rev_id.']'); - // delete Depencies - $success = Depencies::removeRevision($rev_id); + // delete dependencies + $success = Dependencies::removeRevision($rev_id); // get data id (check later if we can delete this) $stmt=&DBConnection::getInstance()->prepare("SELECT data_id FROM ".ROSCMST_REVISIONS." WHERE id = :rev_id "); @@ -405,8 +405,8 @@ */ public static function toArchive( $rev_id ) { - // remove depencies - Depencies::removeRevision($rev_id); + // remove dependencies + Dependencies::removeRevision($rev_id); // move into archive $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_REVISIONS." SET archive = TRUE WHERE id=:rev_id"); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Maintain.cla… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Maintain.cla… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Maintain.cla… [iso-8859-1] Fri Feb 27 16:22:34 2009 @@ -180,9 +180,9 @@ <img src="'.RosCMS::getInstance()->pathRosCMS().'images/clear.gif" alt="" /> <span class="text">Optimize Tables</span> </div> - <div class="button" onclick="rebuildDepencies()"> + <div class="button" onclick="rebuildDependencies()"> <img src="'.RosCMS::getInstance()->pathRosCMS().'images/tool.gif" alt="" /> - <span class="text">Rebuild Depency Tree</span> + <span class="text">Rebuild Dependency Tree</span> </div> <div class="button" onclick="generateAllPages()"> <img src="'.RosCMS::getInstance()->pathRosCMS().'images/active.gif" alt="" />

1 0

[janderwald] 39784: - Add sanity checks - Fix memory leaks
by janderwald＠svn.reactos.org 27 Feb '09

27 Feb '09

Author: janderwald Date: Fri Feb 27 16:19:10 2009 New Revision: 39784 URL: http://svn.reactos.org/svn/reactos?rev=39784&view=rev Log: - Add sanity checks - Fix memory leaks Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Fri Feb 27 16:19:10 2009 @@ -155,15 +155,24 @@ WorkerContext->PinConnect->PinToHandle = NULL; + DPRINT1("CreatePinWorkerRoutine entered\n"); + + ASSERT(WorkerContext->Entry); + ASSERT(WorkerContext->PinConnect); + ASSERT(WorkerContext->Entry->Pins); + ASSERT(WorkerContext->Entry->NumberOfPins > WorkerContext->PinConnect->PinId); if (WorkerContext->CreateRealPin) { /* create the real pin */ + DPRINT("Creating real pin\n"); Status = KsCreatePin(WorkerContext->Entry->Handle, WorkerContext->PinConnect, GENERIC_READ | GENERIC_WRITE, &RealPinHandle); + DPRINT1("Status %x\n", Status); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create Pin with %x\n", Status); SetIrpIoStatus(WorkerContext->Irp, STATUS_UNSUCCESSFUL, 0); + ExFreePool(WorkerContext->DispatchContext); ExFreePool(WorkerContext); return; } @@ -173,6 +182,16 @@ GENERIC_READ | GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); + DPRINT1("Status %x\n", Status); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get file object with %x\n", Status); + SetIrpIoStatus(WorkerContext->Irp, STATUS_UNSUCCESSFUL, 0); + ExFreePool(WorkerContext->DispatchContext); + ExFreePool(WorkerContext); + return; + } + if (WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].MaxPinInstanceCount == 1) { /* store the pin handle there is the pin can only be instantiated once*/ @@ -183,11 +202,7 @@ WorkerContext->DispatchContext->Handle = RealPinHandle; WorkerContext->DispatchContext->PinId = WorkerContext->PinConnect->PinId; WorkerContext->DispatchContext->AudioEntry = WorkerContext->Entry; - - if (NT_SUCCESS(Status)) - WorkerContext->DispatchContext->FileObject = FileObject; - else - WorkerContext->DispatchContext->FileObject = NULL; + WorkerContext->DispatchContext->FileObject = FileObject; } else { @@ -204,6 +219,7 @@ { DPRINT1("Failed to get file object with %x\n", Status); SetIrpIoStatus(WorkerContext->Irp, STATUS_UNSUCCESSFUL, 0); + ExFreePool(WorkerContext->DispatchContext); ExFreePool(WorkerContext); return; } @@ -224,6 +240,7 @@ } SetIrpIoStatus(WorkerContext->Irp, STATUS_UNSUCCESSFUL, 0); + ExFreePool(WorkerContext->DispatchContext); ExFreePool(WorkerContext); return; } @@ -236,14 +253,10 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to get file object with %x\n", Status); - if (WorkerContext->CreateRealPin) - { - /* mark pin as free to use */ - WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].References = 0; - } ZwClose(VirtualPinHandle); SetIrpIoStatus(WorkerContext->Irp, STATUS_UNSUCCESSFUL, 0); + ExFreePool(WorkerContext->DispatchContext); ExFreePool(WorkerContext); return; } @@ -256,8 +269,6 @@ ASSERT(WorkerContext->AudioClient->NumDevices > 0); ASSERT(WorkerContext->AudioClient->Devs != NULL); ASSERT(WorkerContext->Entry->Pins != NULL); - ASSERT(WorkerContext->Entry->NumberOfPins > WorkerContext->PinConnect->PinId); - AudioClient = WorkerContext->AudioClient; NumHandels = AudioClient->Devs[AudioClient->NumDevices -1].ClientHandlesCount;

1 0

[janderwald] 39783: - Implement enumerating devices for wave in devices - Implement mapping virtual device id to real filter id and pin id - Wdmaud can now select the correct pin
by janderwald＠svn.reactos.org 27 Feb '09

27 Feb '09

Author: janderwald Date: Fri Feb 27 15:22:18 2009 New Revision: 39783 URL: http://svn.reactos.org/svn/reactos?rev=39783&view=rev Log: - Implement enumerating devices for wave in devices - Implement mapping virtual device id to real filter id and pin id - Wdmaud can now select the correct pin Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Fri Feb 27 15:22:18 2009 @@ -32,6 +32,99 @@ } NTSTATUS +GetFilterIdAndPinId( + IN PDEVICE_OBJECT DeviceObject, + IN PWDMAUD_DEVICE_INFO DeviceInfo, + IN PWDMAUD_CLIENT ClientInfo, + IN PULONG FilterId, + IN PULONG PinId) +{ + KSP_PIN Pin; + ULONG Count, BytesReturned, Index, SubIndex, Result, NumPins; + NTSTATUS Status; + KSPIN_COMMUNICATION Communication; + KSPIN_DATAFLOW DataFlow; + + if (DeviceInfo->DeviceType != WAVE_OUT_DEVICE_TYPE && DeviceInfo->DeviceType != WAVE_IN_DEVICE_TYPE) + { + DPRINT1("FIXME: Unsupported device type %x\n", DeviceInfo->DeviceType); + return STATUS_UNSUCCESSFUL; + } + + Pin.Property.Set = KSPROPSETID_Sysaudio; + Pin.Property.Id = KSPROPERTY_SYSAUDIO_DEVICE_COUNT; + Pin.Property.Flags = KSPROPERTY_TYPE_GET; + + Status = KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSPROPERTY), (PVOID)&Count, sizeof(ULONG), &BytesReturned); + if (!NT_SUCCESS(Status)) + return STATUS_UNSUCCESSFUL; + + Result = 0; + for(Index = 0; Index < Count; Index++) + { + /* query number of pins */ + Pin.Reserved = Index; // see sysaudio + Pin.Property.Flags = KSPROPERTY_TYPE_GET; + Pin.Property.Set = KSPROPSETID_Pin; + Pin.Property.Id = KSPROPERTY_PIN_CTYPES; + Pin.PinId = 0; + + Status = KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (PVOID)&NumPins, sizeof(ULONG), &BytesReturned); + if (NT_SUCCESS(Status)) + { + /* enumerate now all pins */ + for(SubIndex = 0; SubIndex < NumPins; SubIndex++) + { + Pin.PinId = SubIndex; + Pin.Property.Id = KSPROPERTY_PIN_COMMUNICATION; + Communication = KSPIN_COMMUNICATION_NONE; + + /* get pin communication type */ + KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (PVOID)&Communication, sizeof(KSPIN_COMMUNICATION), &BytesReturned); + + Pin.Property.Id = KSPROPERTY_PIN_DATAFLOW; + DataFlow = 0; + + /* get pin dataflow type */ + KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (PVOID)&DataFlow, sizeof(KSPIN_DATAFLOW), &BytesReturned); + + if (DeviceInfo->DeviceType == WAVE_OUT_DEVICE_TYPE) + { + if (Communication == KSPIN_COMMUNICATION_SINK && DataFlow == KSPIN_DATAFLOW_IN) + { + if(DeviceInfo->DeviceIndex == Result) + { + /* found the index */ + *FilterId = Index; + *PinId = SubIndex; + return STATUS_SUCCESS; + } + + Result++; + } + } + else if (DeviceInfo->DeviceType == WAVE_IN_DEVICE_TYPE) + { + if (Communication == KSPIN_COMMUNICATION_SINK && DataFlow == KSPIN_DATAFLOW_OUT) + { + if(DeviceInfo->DeviceIndex == Result) + { + /* found the index */ + *FilterId = Index; + *PinId = SubIndex; + return STATUS_SUCCESS; + } + Result++; + } + } + } + } + } + + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS WdmAudControlOpen( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -46,12 +139,22 @@ KSPIN_CONNECT * PinConnect; ULONG Length; KSDATAFORMAT_WAVEFORMATEX * DataFormat; - - if (DeviceInfo->DeviceType != WAVE_OUT_DEVICE_TYPE) + ULONG FilterId; + ULONG PinId; + + if (DeviceInfo->DeviceType != WAVE_OUT_DEVICE_TYPE && DeviceInfo->DeviceType != WAVE_IN_DEVICE_TYPE) { DPRINT1("FIXME: only waveout devices are supported\n"); return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); } + + Status = GetFilterIdAndPinId(DeviceObject, DeviceInfo, ClientInfo, &FilterId, &PinId); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Invalid device index %u\n", DeviceInfo->DeviceIndex); + return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); + } + Length = sizeof(KSDATAFORMAT_WAVEFORMATEX) + sizeof(KSPIN_CONNECT) + sizeof(SYSAUDIO_INSTANCE_INFO); InstanceInfo = ExAllocatePool(NonPagedPool, Length); @@ -65,7 +168,7 @@ InstanceInfo->Property.Id = KSPROPERTY_SYSAUDIO_INSTANCE_INFO; InstanceInfo->Property.Flags = KSPROPERTY_TYPE_SET; InstanceInfo->Flags = 0; - InstanceInfo->DeviceNumber = DeviceInfo->DeviceIndex; + InstanceInfo->DeviceNumber = FilterId; Status = KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)InstanceInfo, sizeof(SYSAUDIO_INSTANCE_INFO), NULL, 0, &BytesReturned); @@ -101,7 +204,7 @@ PinConnect->Medium.Set = KSMEDIUMSETID_Standard; PinConnect->Medium.Id = KSMEDIUM_TYPE_ANYINSTANCE; PinConnect->Medium.Flags = 0; - PinConnect->PinId = 0; //FIXME + PinConnect->PinId = PinId; PinConnect->PinToHandle = ClientInfo->hSysAudio; PinConnect->Priority.PriorityClass = KSPRIORITY_NORMAL; PinConnect->Priority.PrioritySubClass = 1; @@ -163,21 +266,74 @@ IN PWDMAUD_DEVICE_INFO DeviceInfo, IN PWDMAUD_CLIENT ClientInfo) { - KSPROPERTY Property; - ULONG Result, BytesReturned; + KSP_PIN Pin; + ULONG Count, BytesReturned, Index, SubIndex, Result, NumPins; NTSTATUS Status; - - if (DeviceInfo->DeviceType != WAVE_OUT_DEVICE_TYPE) - { - DPRINT1("FIXME: only waveout devices are supported\n"); + KSPIN_COMMUNICATION Communication; + KSPIN_DATAFLOW DataFlow; + + if (DeviceInfo->DeviceType != WAVE_OUT_DEVICE_TYPE && DeviceInfo->DeviceType != WAVE_IN_DEVICE_TYPE) + { + DPRINT1("FIXME: Unsupported device type %x\n", DeviceInfo->DeviceType); return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); } - Property.Set = KSPROPSETID_Sysaudio; - Property.Id = KSPROPERTY_SYSAUDIO_DEVICE_COUNT; - Property.Flags = KSPROPERTY_TYPE_GET; - - Status = KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSPROPERTY), (PVOID)&Result, sizeof(ULONG), &BytesReturned); + Pin.Property.Set = KSPROPSETID_Sysaudio; + Pin.Property.Id = KSPROPERTY_SYSAUDIO_DEVICE_COUNT; + Pin.Property.Flags = KSPROPERTY_TYPE_GET; + + Status = KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSPROPERTY), (PVOID)&Count, sizeof(ULONG), &BytesReturned); + if (!NT_SUCCESS(Status)) + { + DPRINT1("KSPROPERTY_SYSAUDIO_DEVICE_COUNT failed with %x\n", Status); + return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); + } + Result = 0; + /* now enumerate all available filters */ + for(Index = 0; Index < Count; Index++) + { + /* query number of pins */ + Pin.Reserved = Index; // see sysaudio + Pin.Property.Flags = KSPROPERTY_TYPE_GET; + Pin.Property.Set = KSPROPSETID_Pin; + Pin.Property.Id = KSPROPERTY_PIN_CTYPES; + Pin.PinId = 0; + + Status = KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (PVOID)&NumPins, sizeof(ULONG), &BytesReturned); + if (NT_SUCCESS(Status)) + { + /* enumerate now all pins */ + for(SubIndex = 0; SubIndex < NumPins; SubIndex++) + { + Pin.PinId = SubIndex; + Pin.Property.Id = KSPROPERTY_PIN_COMMUNICATION; + Communication = KSPIN_COMMUNICATION_NONE; + + /* get pin communication type */ + KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (PVOID)&Communication, sizeof(KSPIN_COMMUNICATION), &BytesReturned); + + Pin.Property.Id = KSPROPERTY_PIN_DATAFLOW; + DataFlow = 0; + + /* get pin dataflow type */ + KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (PVOID)&DataFlow, sizeof(KSPIN_DATAFLOW), &BytesReturned); + + if (DeviceInfo->DeviceType == WAVE_OUT_DEVICE_TYPE) + { + if (Communication == KSPIN_COMMUNICATION_SINK && DataFlow == KSPIN_DATAFLOW_IN) + Result++; + } + else if (DeviceInfo->DeviceType == WAVE_IN_DEVICE_TYPE) + { + if (Communication == KSPIN_COMMUNICATION_SINK && DataFlow == KSPIN_DATAFLOW_OUT) + Result++; + } + } + } + else + DPRINT1("KSPROPERTY_PIN_CTYPES index %u failed with %x\n", Index, Status); + } + if (NT_SUCCESS(Status)) DeviceInfo->DeviceCount = Result; @@ -200,12 +356,6 @@ NTSTATUS Status; ULONG BytesReturned; PFILE_OBJECT FileObject; - - if (DeviceInfo->DeviceType != WAVE_OUT_DEVICE_TYPE) - { - DPRINT1("FIXME: only waveout devices are supported\n"); - return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); - } Status = ObReferenceObjectByHandle(DeviceInfo->hDevice, GENERIC_READ | GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); if (!NT_SUCCESS(Status)) @@ -378,16 +528,24 @@ ULONG BytesReturned; PKSDATARANGE_AUDIO DataRangeAudio; PKSDATARANGE DataRange; - ULONG Index; ULONG wChannels = 0; ULONG dwFormats = 0; ULONG dwSupport = 0; + ULONG FilterId; ULONG PinId; DPRINT("WdmAudCapabilities entered\n"); - PinProperty.PinId = DeviceInfo->DeviceIndex; // used as index of the virtual audio device + + Status = GetFilterIdAndPinId(DeviceObject, DeviceInfo, ClientInfo, &FilterId, &PinId); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Invalid device index provided %u\n", DeviceInfo->DeviceIndex); + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + PinProperty.PinId = FilterId; PinProperty.Property.Set = KSPROPSETID_Sysaudio; PinProperty.Property.Id = KSPROPERTY_SYSAUDIO_COMPONENT_ID; PinProperty.Property.Flags = KSPROPERTY_TYPE_GET; @@ -400,19 +558,12 @@ DeviceInfo->u.WaveOutCaps.wMid = ComponentId.Manufacturer.Data1 - 0xd5a47fa7; DeviceInfo->u.WaveOutCaps.vDriverVersion = MAKELONG(ComponentId.Version, ComponentId.Revision); } - - //FIXME - // Reserved index defines the audio device index - // pin offset should be first determined - // by determing the pin type of the target filter - PinId = 0; PinProperty.Reserved = DeviceInfo->DeviceIndex; PinProperty.PinId = PinId; PinProperty.Property.Set = KSPROPSETID_Pin; PinProperty.Property.Id = KSPROPERTY_PIN_DATARANGES; PinProperty.Property.Flags = KSPROPERTY_TYPE_GET; - BytesReturned = 0; Status = KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinProperty, sizeof(KSP_PIN), (PVOID)NULL, 0, &BytesReturned);

1 0

[janderwald] 39782: - Complete missing irp - Handle all properties of KSPROPSETID - Initialize filter properties in a deferred routine - Add more error checks
by janderwald＠svn.reactos.org 27 Feb '09

27 Feb '09

Author: janderwald Date: Fri Feb 27 14:22:16 2009 New Revision: 39782 URL: http://svn.reactos.org/svn/reactos?rev=39782&view=rev Log: - Complete missing irp - Handle all properties of KSPROPSETID - Initialize filter properties in a deferred routine - Add more error checks Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c trunk/reactos/drivers/wdm/audio/sysaudio/control.c trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c trunk/reactos/drivers/wdm/audio/sysaudio/main.c trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Fri Feb 27 14:22:16 2009 @@ -813,15 +813,16 @@ } /* - * @unimplemented + * @implemented */ ULONG NTAPI IPortPinWaveCyclic_fnGetDeviceBufferSize( IN IPortPinWaveCyclic* iface) { - UNIMPLEMENTED; - return 0; + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; + + return This->CommonBufferSize; } /* @@ -845,8 +846,9 @@ IPortPinWaveCyclic_fnGetMiniport( IN IPortPinWaveCyclic* iface) { - UNIMPLEMENTED; - return NULL; + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; + + return (PMINIPORT)This->Miniport; } static IPortPinWaveCyclicVtbl vt_IPortPinWaveCyclic = Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Fri Feb 27 14:22:16 2009 @@ -608,6 +608,7 @@ } Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Fri Feb 27 14:22:16 2009 @@ -308,6 +308,295 @@ ExFreePool(WorkerContext); } +NTSTATUS +HandleSysAudioFilterPinProperties( + PIRP Irp, + PKSPROPERTY Property, + PSYSAUDIODEVEXT DeviceExtension) +{ + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + PKSAUDIO_DEVICE_ENTRY Entry; + ULONG BytesReturned; + PKSP_PIN Pin; + + // in order to access pin properties of a sysaudio device + // the caller must provide a KSP_PIN struct, where + // Reserved member points to virtual device index + + IoStack = IoGetCurrentIrpStackLocation(Irp); + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KSP_PIN)) + { + /* too small buffer */ + return SetIrpIoStatus(Irp, STATUS_BUFFER_TOO_SMALL, sizeof(KSPROPERTY) + sizeof(ULONG)); + } + + Pin = (PKSP_PIN)Property; + + Entry = GetListEntry(&DeviceExtension->KsAudioDeviceList, ((KSP_PIN*)Property)->Reserved); + if (!Entry) + { + /* invalid device index */ + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + if (!Entry->Pins) + { + /* expected pins */ + return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); + } + + if (Entry->NumberOfPins <= Pin->PinId) + { + /* invalid pin id */ + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + if (Property->Id == KSPROPERTY_PIN_CTYPES) + { + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + { + /* too small buffer */ + return SetIrpIoStatus(Irp, STATUS_BUFFER_TOO_SMALL, sizeof(ULONG)); + } + /* store result */ + *((PULONG)Irp->UserBuffer) = Entry->NumberOfPins; + return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(ULONG)); + } + else if (Property->Id == KSPROPERTY_PIN_COMMUNICATION) + { + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KSPIN_COMMUNICATION)) + { + /* too small buffer */ + return SetIrpIoStatus(Irp, STATUS_BUFFER_TOO_SMALL, sizeof(KSPIN_COMMUNICATION)); + } + /* store result */ + *((KSPIN_COMMUNICATION*)Irp->UserBuffer) = Entry->Pins[Pin->PinId].Communication; + return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(KSPIN_COMMUNICATION)); + + } + else if (Property->Id == KSPROPERTY_PIN_DATAFLOW) + { + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KSPIN_DATAFLOW)) + { + /* too small buffer */ + return SetIrpIoStatus(Irp, STATUS_BUFFER_TOO_SMALL, sizeof(KSPIN_DATAFLOW)); + } + /* store result */ + *((KSPIN_DATAFLOW*)Irp->UserBuffer) = Entry->Pins[Pin->PinId].DataFlow; + return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(KSPIN_DATAFLOW)); + } + else + { + /* forward request to the filter implementing the property */ + Status = KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_PROPERTY, + (PVOID)IoStack->Parameters.DeviceIoControl.Type3InputBuffer, + IoStack->Parameters.DeviceIoControl.InputBufferLength, + Irp->UserBuffer, + IoStack->Parameters.DeviceIoControl.OutputBufferLength, + &BytesReturned); + + return SetIrpIoStatus(Irp, Status, BytesReturned); + } +} + +NTSTATUS +HandleSysAudioFilterPinCreation( + PIRP Irp, + PKSPROPERTY Property, + PSYSAUDIODEVEXT DeviceExtension, + PDEVICE_OBJECT DeviceObject) +{ + ULONG Length, BytesReturned; + PKSAUDIO_DEVICE_ENTRY Entry; + KSPIN_CONNECT * PinConnect; + PIO_STACK_LOCATION IoStack; + PSYSAUDIO_INSTANCE_INFO InstanceInfo; + PSYSAUDIO_CLIENT ClientInfo; + PKSOBJECT_CREATE_ITEM CreateItem; + KSP_PIN PinRequest; + NTSTATUS Status; + KSPIN_CINSTANCES PinInstances; + PIO_WORKITEM WorkItem; + PFILE_OBJECT FileObject; + PPIN_WORKER_CONTEXT WorkerContext; + PDISPATCH_CONTEXT DispatchContext; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + Length = sizeof(KSDATAFORMAT) + sizeof(KSPIN_CONNECT) + sizeof(SYSAUDIO_INSTANCE_INFO); + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < Length || + IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(HANDLE)) + { + /* invalid parameters */ + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + /* access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + + /* get input parameter */ + InstanceInfo = (PSYSAUDIO_INSTANCE_INFO)Property; + if (DeviceExtension->NumberOfKsAudioDevices <= InstanceInfo->DeviceNumber) + { + /* invalid parameters */ + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + /* get client context */ + ClientInfo = (PSYSAUDIO_CLIENT)CreateItem->Context; + if (!ClientInfo || !ClientInfo->NumDevices || !ClientInfo->Devs || + ClientInfo->Devs[ClientInfo->NumDevices-1].DeviceId != InstanceInfo->DeviceNumber) + { + /* we have a problem */ + KeBugCheckEx(0, 0, 0, 0, 0); + } + + /* get sysaudio entry */ + Entry = GetListEntry(&DeviceExtension->KsAudioDeviceList, InstanceInfo->DeviceNumber); + if (!Entry) + { + /* invalid device index */ + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + if (!Entry->Pins) + { + /* should not happen */ + return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); + } + + /* get connect details */ + PinConnect = (KSPIN_CONNECT*)(InstanceInfo + 1); + + if (Entry->NumberOfPins <= PinConnect->PinId) + { + DPRINT("Invalid PinId %x\n", PinConnect->PinId); + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + PinRequest.PinId = PinConnect->PinId; + PinRequest.Property.Set = KSPROPSETID_Pin; + PinRequest.Property.Flags = KSPROPERTY_TYPE_GET; + PinRequest.Property.Id = KSPROPERTY_PIN_CINSTANCES; + + Status = KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSP_PIN), (PVOID)&PinInstances, sizeof(KSPIN_CINSTANCES), &BytesReturned); + if (!NT_SUCCESS(Status)) + { + DPRINT("Property Request KSPROPERTY_PIN_GLOBALCINSTANCES failed with %x\n", Status); + return SetIrpIoStatus(Irp, Status, 0); + } + + if (PinInstances.PossibleCount == 0) + { + /* caller wanted to open an instance-less pin */ + return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); + } + + if (PinInstances.CurrentCount == PinInstances.PossibleCount) + { + /* pin already exists */ + ASSERT(Entry->Pins[PinConnect->PinId].PinHandle != NULL); + if (Entry->Pins[PinConnect->PinId].References > 1) + { + /* FIXME need ksmixer */ + DPRINT1("Device %u Pin %u References %u is already occupied, try later\n", InstanceInfo->DeviceNumber, PinConnect->PinId, Entry->Pins[PinConnect->PinId].References); + return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); + } + } + + WorkItem = IoAllocateWorkItem(DeviceObject); + if (!WorkItem) + { + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* create worker context */ + WorkerContext = ExAllocatePool(NonPagedPool, sizeof(PIN_WORKER_CONTEXT)); + if (!WorkerContext) + { + /* invalid parameters */ + IoFreeWorkItem(WorkItem); + return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); + } + + /* create worker context */ + DispatchContext = ExAllocatePool(NonPagedPool, sizeof(DISPATCH_CONTEXT)); + if (!DispatchContext) + { + /* invalid parameters */ + IoFreeWorkItem(WorkItem); + ExFreePool(WorkerContext); + return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); + } + /* prepare context */ + RtlZeroMemory(WorkerContext, sizeof(PIN_WORKER_CONTEXT)); + RtlZeroMemory(DispatchContext, sizeof(DISPATCH_CONTEXT)); + + if (PinInstances.CurrentCount == PinInstances.PossibleCount) + { + /* re-using pin */ + PinRequest.Property.Set = KSPROPSETID_Connection; + PinRequest.Property.Flags = KSPROPERTY_TYPE_SET; + PinRequest.Property.Id = KSPROPERTY_CONNECTION_DATAFORMAT; + + /* get pin file object */ + Status = ObReferenceObjectByHandle(Entry->Pins[PinConnect->PinId].PinHandle, + GENERIC_READ | GENERIC_WRITE, + IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get pin file object with %x\n", Status); + IoFreeWorkItem(WorkItem); + ExFreePool(WorkerContext); + ExFreePool(DispatchContext); + return SetIrpIoStatus(Irp, Status, 0); + } + + Length -= sizeof(KSPIN_CONNECT) + sizeof(SYSAUDIO_INSTANCE_INFO); + Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSPROPERTY), + (PVOID)(PinConnect + 1), Length, &BytesReturned); + + ObDereferenceObject(FileObject); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to set format with Status %x\n", Status); + IoFreeWorkItem(WorkItem); + ExFreePool(WorkerContext); + ExFreePool(DispatchContext); + return SetIrpIoStatus(Irp, Status, 0); + } + + } + else + { + /* create the real pin */ + WorkerContext->CreateRealPin = TRUE; + } + + /* set up context */ + + WorkerContext->DispatchContext = DispatchContext; + WorkerContext->Entry = Entry; + WorkerContext->Irp = Irp; + WorkerContext->PinConnect = PinConnect; + WorkerContext->AudioClient = ClientInfo; + + DPRINT("Queing Irp %p\n", Irp); + /* queue the work item */ + IoMarkIrpPending(Irp); + Irp->IoStatus.Status = STATUS_PENDING; + Irp->IoStatus.Information = 0; + IoQueueWorkItem(WorkItem, CreatePinWorkerRoutine, DelayedWorkQueue, (PVOID)WorkerContext); + + /* mark irp as pending */ + return STATUS_PENDING; +} NTSTATUS SysAudioHandleProperty( @@ -327,24 +616,15 @@ ULONG Count, BytesReturned; PKSOBJECT_CREATE_ITEM CreateItem; UNICODE_STRING GuidString; - ULONG Length; - KSPIN_CONNECT * PinConnect; - KSP_PIN PinRequest; - KSPIN_CINSTANCES PinInstances; - PPIN_WORKER_CONTEXT WorkerContext; - PDISPATCH_CONTEXT DispatchContext; - PIO_WORKITEM WorkItem; - PFILE_OBJECT FileObject; /* access the create item */ CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - IoStack = IoGetCurrentIrpStackLocation(Irp); if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KSPROPERTY)) { - /* buffer must be atleast of sizeof KSPROPERTY */ + /* buffer must be at least of sizeof KSPROPERTY */ return SetIrpIoStatus(Irp, STATUS_BUFFER_TOO_SMALL, sizeof(KSPROPERTY)); } @@ -353,33 +633,7 @@ if (IsEqualGUIDAligned(&Property->Set, &KSPROPSETID_Pin)) { - /* ros specific request */ - if (Property->Id == KSPROPERTY_PIN_DATARANGES) - { - if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KSP_PIN)) - { - /* too small buffer */ - return SetIrpIoStatus(Irp, STATUS_BUFFER_TOO_SMALL, sizeof(KSPROPERTY) + sizeof(ULONG)); - } - - Entry = GetListEntry(&DeviceExtension->KsAudioDeviceList, ((KSP_PIN*)Property)->Reserved); - if (!Entry) - { - /* too small buffer */ - return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); - } - - Status = KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_PROPERTY, - (PVOID)IoStack->Parameters.DeviceIoControl.Type3InputBuffer, - IoStack->Parameters.DeviceIoControl.InputBufferLength, - Irp->UserBuffer, - IoStack->Parameters.DeviceIoControl.OutputBufferLength, - &BytesReturned); - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = BytesReturned; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - } + return HandleSysAudioFilterPinProperties(Irp, Property, DeviceExtension); } else if (IsEqualGUIDAligned(&Property->Set, &KSPROPSETID_Sysaudio)) { @@ -428,6 +682,7 @@ /* too small buffer */ return SetIrpIoStatus(Irp, STATUS_BUFFER_TOO_SMALL, sizeof(ULONG)); } + *((PULONG)Irp->UserBuffer) = DeviceExtension->NumberOfKsAudioDevices; return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(ULONG)); } @@ -504,187 +759,7 @@ { /* ros specific pin creation request */ DPRINT1("Initiating create request\n"); - - Length = sizeof(KSDATAFORMAT) + sizeof(KSPIN_CONNECT) + sizeof(SYSAUDIO_INSTANCE_INFO); - if (IoStack->Parameters.DeviceIoControl.InputBufferLength < Length || - IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(HANDLE)) - { - /* invalid parameters */ - return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); - } - - /* get input parameter */ - InstanceInfo = (PSYSAUDIO_INSTANCE_INFO)Property; - if (DeviceExtension->NumberOfKsAudioDevices <= InstanceInfo->DeviceNumber) - { - /* invalid parameters */ - return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); - } - - /* get client context */ - ClientInfo = (PSYSAUDIO_CLIENT)CreateItem->Context; - ASSERT(ClientInfo); - ASSERT(ClientInfo->NumDevices >= 1); - ASSERT(ClientInfo->Devs != NULL); - ASSERT(ClientInfo->Devs[ClientInfo->NumDevices-1].DeviceId == InstanceInfo->DeviceNumber); - - /* get sysaudio entry */ - Entry = GetListEntry(&DeviceExtension->KsAudioDeviceList, InstanceInfo->DeviceNumber); - ASSERT(Entry != NULL); - - if (!Entry->Pins) - { - PropertyRequest.Set = KSPROPSETID_Pin; - PropertyRequest.Flags = KSPROPERTY_TYPE_GET; - PropertyRequest.Id = KSPROPERTY_PIN_CTYPES; - - /* query for num of pins */ - Status = KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PropertyRequest, sizeof(KSPROPERTY), (PVOID)&Count, sizeof(ULONG), &BytesReturned); - if (!NT_SUCCESS(Status)) - { - DPRINT("Property Request KSPROPERTY_PIN_CTYPES failed with %x\n", Status); - return SetIrpIoStatus(Irp, Status, 0); - } - DPRINT("KSPROPERTY_TYPE_GET num pins %d\n", Count); - - Entry->Pins = ExAllocatePool(NonPagedPool, Count * sizeof(PIN_INFO)); - if (!Entry->Pins) - { - /* invalid parameters */ - return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); - } - /* clear array */ - RtlZeroMemory(Entry->Pins, sizeof(PIN_INFO) * Count); - Entry->NumberOfPins = Count; - - } - - /* get connect details */ - PinConnect = (KSPIN_CONNECT*)(InstanceInfo + 1); - - if (Entry->NumberOfPins <= PinConnect->PinId) - { - DPRINT("Invalid PinId %x\n", PinConnect->PinId); - return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); - } - - PinRequest.PinId = PinConnect->PinId; - PinRequest.Property.Set = KSPROPSETID_Pin; - PinRequest.Property.Flags = KSPROPERTY_TYPE_GET; - PinRequest.Property.Id = KSPROPERTY_PIN_CINSTANCES; - - Status = KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSP_PIN), (PVOID)&PinInstances, sizeof(KSPIN_CINSTANCES), &BytesReturned); - if (!NT_SUCCESS(Status)) - { - DPRINT("Property Request KSPROPERTY_PIN_GLOBALCINSTANCES failed with %x\n", Status); - return SetIrpIoStatus(Irp, Status, 0); - } - DPRINT("PinInstances Current %u Max %u\n", PinInstances.CurrentCount, PinInstances.PossibleCount); - Entry->Pins[PinConnect->PinId].MaxPinInstanceCount = PinInstances.PossibleCount; - - WorkItem = IoAllocateWorkItem(DeviceObject); - if (!WorkItem) - { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* create worker context */ - WorkerContext = ExAllocatePool(NonPagedPool, sizeof(PIN_WORKER_CONTEXT)); - if (!WorkerContext) - { - /* invalid parameters */ - IoFreeWorkItem(WorkItem); - return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); - } - - /* create worker context */ - DispatchContext = ExAllocatePool(NonPagedPool, sizeof(DISPATCH_CONTEXT)); - if (!DispatchContext) - { - /* invalid parameters */ - IoFreeWorkItem(WorkItem); - ExFreePool(WorkerContext); - return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); - } - /* prepare context */ - RtlZeroMemory(WorkerContext, sizeof(PIN_WORKER_CONTEXT)); - RtlZeroMemory(DispatchContext, sizeof(DISPATCH_CONTEXT)); - - if (PinInstances.CurrentCount == PinInstances.PossibleCount) - { - /* pin already exists */ - ASSERT(Entry->Pins[PinConnect->PinId].PinHandle != NULL); - - if (Entry->Pins[PinConnect->PinId].References > 1) - { - /* FIXME need ksmixer */ - DPRINT1("Device %u Pin %u References %u is already occupied, try later\n", InstanceInfo->DeviceNumber, PinConnect->PinId, Entry->Pins[PinConnect->PinId].References); - IoFreeWorkItem(WorkItem); - ExFreePool(WorkerContext); - ExFreePool(DispatchContext); - return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); - } - /* re-using pin */ - PropertyRequest.Set = KSPROPSETID_Connection; - PropertyRequest.Flags = KSPROPERTY_TYPE_SET; - PropertyRequest.Id = KSPROPERTY_CONNECTION_DATAFORMAT; - - /* get pin file object */ - Status = ObReferenceObjectByHandle(Entry->Pins[PinConnect->PinId].PinHandle, - GENERIC_READ | GENERIC_WRITE, - IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to get pin file object with %x\n", Status); - IoFreeWorkItem(WorkItem); - ExFreePool(WorkerContext); - ExFreePool(DispatchContext); - return SetIrpIoStatus(Irp, Status, 0); - } - - Length -= sizeof(KSPIN_CONNECT) + sizeof(SYSAUDIO_INSTANCE_INFO); - Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PropertyRequest, sizeof(KSPROPERTY), - (PVOID)(PinConnect + 1), Length, &BytesReturned); - - ObDereferenceObject(FileObject); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to set format with Status %x\n", Status); - IoFreeWorkItem(WorkItem); - ExFreePool(WorkerContext); - ExFreePool(DispatchContext); - return SetIrpIoStatus(Irp, Status, 0); - } - - } - else - { - /* create the real pin */ - WorkerContext->CreateRealPin = TRUE; - } - - /* set up context */ - - WorkerContext->DispatchContext = DispatchContext; - WorkerContext->Entry = Entry; - WorkerContext->Irp = Irp; - WorkerContext->PinConnect = PinConnect; - WorkerContext->AudioClient = ClientInfo; - - DPRINT("Queing Irp %p\n", Irp); - /* queue the work item */ - IoMarkIrpPending(Irp); - Irp->IoStatus.Status = STATUS_PENDING; - Irp->IoStatus.Information = 0; - IoQueueWorkItem(WorkItem, CreatePinWorkerRoutine, DelayedWorkQueue, (PVOID)WorkerContext); - - /* mark irp as pending */ - return STATUS_PENDING; + return HandleSysAudioFilterPinCreation(Irp, Property, DeviceExtension, DeviceObject); } } Modified: trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] Fri Feb 27 14:22:16 2009 @@ -21,6 +21,93 @@ const GUID KS_CATEGORY_AUDIO = {0x6994AD04L, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; const GUID DMOCATEGORY_ACOUSTIC_ECHO_CANCEL = {0xBF963D80L, 0xC559, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; +VOID +NTAPI +FilterPinWorkerRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context) +{ + KSPROPERTY PropertyRequest; + KSP_PIN PinRequest; + KSPIN_DATAFLOW DataFlow; + KSPIN_COMMUNICATION Communication; + KSPIN_CINSTANCES PinInstances; + ULONG Count, Index; + NTSTATUS Status; + ULONG BytesReturned; + PKSAUDIO_DEVICE_ENTRY DeviceEntry = (PKSAUDIO_DEVICE_ENTRY)Context; + + + DPRINT1("Querying filter...\n"); + + PropertyRequest.Set = KSPROPSETID_Pin; + PropertyRequest.Flags = KSPROPERTY_TYPE_GET; + PropertyRequest.Id = KSPROPERTY_PIN_CTYPES; + + /* query for num of pins */ + Status = KsSynchronousIoControlDevice(DeviceEntry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PropertyRequest, sizeof(KSPROPERTY), (PVOID)&Count, sizeof(ULONG), &BytesReturned); + if (!NT_SUCCESS(Status)) + { + return; + } + + if (!Count) + return; + + /* allocate pin array */ + DeviceEntry->Pins = ExAllocatePool(NonPagedPool, Count * sizeof(PIN_INFO)); + if (!DeviceEntry->Pins) + { + /* no memory */ + return; + } + /* clear array */ + RtlZeroMemory(DeviceEntry->Pins, sizeof(PIN_INFO) * Count); + DeviceEntry->NumberOfPins = Count; + + for(Index = 0; Index < Count; Index++) + { + /* get max instance count */ + PinRequest.PinId = Index; + PinRequest.Property.Set = KSPROPSETID_Pin; + PinRequest.Property.Flags = KSPROPERTY_TYPE_GET; + PinRequest.Property.Id = KSPROPERTY_PIN_CINSTANCES; + + Status = KsSynchronousIoControlDevice(DeviceEntry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSP_PIN), (PVOID)&PinInstances, sizeof(KSPIN_CINSTANCES), &BytesReturned); + if (NT_SUCCESS(Status)) + { + DeviceEntry->Pins[Index].MaxPinInstanceCount = PinInstances.PossibleCount; + } + + /* get dataflow direction */ + PinRequest.Property.Id = KSPROPERTY_PIN_DATAFLOW; + Status = KsSynchronousIoControlDevice(DeviceEntry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSP_PIN), (PVOID)&DataFlow, sizeof(KSPIN_DATAFLOW), &BytesReturned); + if (NT_SUCCESS(Status)) + { + DeviceEntry->Pins[Index].DataFlow = DataFlow; + } + + /* get irp flow direction */ + PinRequest.Property.Id = KSPROPERTY_PIN_COMMUNICATION; + Status = KsSynchronousIoControlDevice(DeviceEntry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSP_PIN), (PVOID)&Communication, sizeof(KSPIN_COMMUNICATION), &BytesReturned); + if (NT_SUCCESS(Status)) + { + DeviceEntry->Pins[Index].Communication = Communication; + } + + if (Communication == KSPIN_COMMUNICATION_SINK && DataFlow == KSPIN_DATAFLOW_IN) + DeviceEntry->NumWaveOutPin++; + + if (Communication == KSPIN_COMMUNICATION_SINK && DataFlow == KSPIN_DATAFLOW_OUT) + DeviceEntry->NumWaveInPin++; + + } + + DPRINT1("Num Pins %u Num WaveIn Pins %u Name WaveOut Pins %u\n", DeviceEntry->NumberOfPins, DeviceEntry->NumWaveInPin, DeviceEntry->NumWaveOutPin); +} + + + NTSTATUS NTAPI @@ -29,8 +116,11 @@ IN PVOID Context) { DEVICE_INTERFACE_CHANGE_NOTIFICATION * Event; - SYSAUDIODEVEXT *DeviceExtension = (SYSAUDIODEVEXT*)Context; NTSTATUS Status = STATUS_SUCCESS; + PSYSAUDIODEVEXT DeviceExtension; + PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)Context; + + DeviceExtension = (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension; Event = (DEVICE_INTERFACE_CHANGE_NOTIFICATION*)NotificationStructure; @@ -44,7 +134,7 @@ HANDLE NodeHandle; IO_STATUS_BLOCK IoStatusBlock; OBJECT_ATTRIBUTES ObjectAttributes; - + PIO_WORKITEM WorkItem; DeviceEntry = ExAllocatePool(NonPagedPool, sizeof(KSAUDIO_DEVICE_ENTRY)); if (!DeviceEntry) @@ -116,10 +206,16 @@ DeviceEntry->Handle = NodeHandle; DeviceEntry->FileObject = FileObject; + DPRINT1("Successfully opened audio device %u handle %p file object %p device object %p\n", DeviceExtension->KsAudioDeviceList, NodeHandle, FileObject, FileObject->DeviceObject); + DeviceExtension->NumberOfKsAudioDevices++; + + WorkItem = IoAllocateWorkItem(DeviceObject); + if (WorkItem) + { + IoQueueWorkItem(WorkItem, FilterPinWorkerRoutine, DelayedWorkQueue, (PVOID)DeviceEntry); + } InsertTailList(&DeviceExtension->KsAudioDeviceList, &DeviceEntry->Entry); - DeviceExtension->NumberOfKsAudioDevices++; - - DPRINT1("Successfully opened audio device handle %p file object %p device object %p\n", NodeHandle, FileObject, FileObject->DeviceObject); + return Status; } else if (IsEqualGUIDAligned(&Event->Event, @@ -144,18 +240,20 @@ NTSTATUS SysAudioRegisterNotifications( - IN PDRIVER_OBJECT DriverObject, - SYSAUDIODEVEXT *DeviceExtension) + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT DeviceObject) { NTSTATUS Status; - + PSYSAUDIODEVEXT DeviceExtension; + + DeviceExtension = (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension; Status = IoRegisterPlugPlayNotification(EventCategoryDeviceInterfaceChange, PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES, (PVOID)&KS_CATEGORY_AUDIO, DriverObject, DeviceInterfaceChangeCallback, - (PVOID)DeviceExtension, + (PVOID)DeviceObject, (PVOID*)&DeviceExtension->KsAudioNotificationEntry); if (!NT_SUCCESS(Status)) @@ -168,7 +266,7 @@ (PVOID)&DMOCATEGORY_ACOUSTIC_ECHO_CANCEL, DriverObject, DeviceInterfaceChangeCallback, - (PVOID)DeviceExtension, + (PVOID)DeviceObject, (PVOID*)&DeviceExtension->EchoCancelNotificationEntry); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] Fri Feb 27 14:22:16 2009 @@ -133,7 +133,7 @@ } Status = SysAudioRegisterNotifications(DriverObject, - DeviceExtension); + DeviceObject); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to register device notifications\n"); Modified: trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] Fri Feb 27 14:22:16 2009 @@ -29,6 +29,8 @@ ULONG MaxPinInstanceCount; HANDLE PinHandle; ULONG References; + KSPIN_DATAFLOW DataFlow; + KSPIN_COMMUNICATION Communication; }PIN_INFO; @@ -42,6 +44,9 @@ ULONG NumberOfPins; PIN_INFO * Pins; + + ULONG NumWaveOutPin; + ULONG NumWaveInPin; }KSAUDIO_DEVICE_ENTRY, *PKSAUDIO_DEVICE_ENTRY; @@ -88,8 +93,8 @@ NTSTATUS SysAudioRegisterNotifications( - IN PDRIVER_OBJECT DriverObject, - SYSAUDIODEVEXT *DeviceExtension); + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT DeviceObject); NTSTATUS SysAudioHandleProperty( @@ -105,4 +110,9 @@ CreateDispatcher( IN PIRP Irp); +ULONG +GetDeviceCount( + PSYSAUDIODEVEXT DeviceExtension, + BOOL WaveIn); + #endif

1 0

[janderwald] 39781: - Ignore the failure of device interface registration as a audio might not have been initialized yet
by janderwald＠svn.reactos.org 27 Feb '09

27 Feb '09

Author: janderwald Date: Fri Feb 27 03:22:32 2009 New Revision: 39781 URL: http://svn.reactos.org/svn/reactos?rev=39781&view=rev Log: - Ignore the failure of device interface registration as a audio might not have been initialized yet Modified: trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c Modified: trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] Fri Feb 27 03:22:32 2009 @@ -161,7 +161,6 @@ if (!NT_SUCCESS(Status)) { DPRINT1("IoRegisterPlugPlayNotification failed with %x\n", Status); - return Status; } Status = IoRegisterPlugPlayNotification(EventCategoryDeviceInterfaceChange,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs