Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 40709: Romanian translations by Petru Dimitriu (petrimetri-at-gmail-dot-com), bug #4422.
by dgorbachev＠svn.reactos.org 26 Apr '09

26 Apr '09

Author: dgorbachev Date: Sun Apr 26 21:31:56 2009 New Revision: 40709 URL: http://svn.reactos.org/svn/reactos?rev=40709&view=rev Log: Romanian translations by Petru Dimitriu (petrimetri-at-gmail-dot-com), bug #4422. Added: trunk/reactos/base/setup/reactos/lang/ro-RO.rc (with props) trunk/reactos/dll/win32/user32/lang/ro-RO.rc (with props) Modified: trunk/reactos/base/setup/reactos/rsrc.rc trunk/reactos/dll/win32/user32/user32.rc Added: trunk/reactos/base/setup/reactos/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ro… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ro-RO.rc (added) +++ trunk/reactos/base/setup/reactos/lang/ro-RO.rc [iso-8859-1] Sun Apr 26 21:31:56 2009 @@ -1,0 +1,151 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDD_STARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalare ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bun venit la Instalarea ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Nu puteti inca instala ReactOS direct de pe acest CD! Reporniti computerul si alegeti", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Clic pe Terminare pentru a iesi.", IDC_STATIC, 115, 169, 195, 17 +END + +IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalare ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + CONTROL "Limba de instalare:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 + CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 + CONTROL "Metoda de introducere:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 + CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 + LTEXT "Clic pe Urmatorul pentru a alege tipul instalarii.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalare ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tip instalare", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Instalare ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 + CONTROL "Reparare sau actualizare ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + LTEXT "Clic pe Urmator pentru a instala.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalare ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Setari dispozitiv", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Computer:", IDC_STATIC, 20,15, 80, 10 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 180, 80 + LTEXT "Ecran:", IDC_STATIC, 20,35, 80, 10 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 180, 80 + LTEXT "Tastatura:", IDC_STATIC, 20,55, 80, 10 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 180, 80 + LTEXT "Clic pe Urmatorul pentru a instala dispozitivele.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalare ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Partitia pentru instalarea ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 + LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL + PUSHBUTTON "&Creare", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "&Stergere", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED + PUSHBUTTON "&Optiuni avansate...", IDC_PARTMOREOPTS, 218,155,80,15 + LTEXT "Clic pe Urmatorul pentru a afisa sumarul", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 +STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME +CAPTION "Creare partitie" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,104,22,9,13 + CONTROL "Creare si formatare partitie",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 + LTEXT "Marime:",IDC_STATIC, 13,24,27,9 + EDITTEXT IDC_PARTSIZE,52,23,53,13, WS_VISIBLE|WS_TABSTOP + LTEXT "GB",IDC_UNIT, 117,24,14,9 + LTEXT "Sistem de fisiere:",IDC_STATIC,13,46,35,9 + CONTROL "",IDC_FSTYPE,"ComboBox",WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,52,42,79,50 + PUSHBUTTON "&OK",IDOK,35,68,47,15, WS_VISIBLE|WS_TABSTOP + PUSHBUTTON "&Revocare",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP +END + +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME +CAPTION "Setari avansate partitie" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Folder instalare", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE + + CONTROL "Instalare incarcator", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + + CONTROL "Instalare incarcator pe hard disc (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Nu se instaleaza incarcator", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Revocare", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE +END + +IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalare ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Rezumat", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Clic pe Urmatorul pentru a incepe procesul de instalare.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalare ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Actiune instalare", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Instalare fisiere...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 +END + +IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Terminare instalare ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Finalizare prima faza", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Ati finalizat cu succes prima faza a instalarii ReactOS", IDC_STATIC, 20, 50, 277, 10 + + LTEXT "Cand veti da clic pe Terminare, computerul va reporni.", IDC_STATIC, 20, 80, 277, 10 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 + LTEXT "Daca aveti vreun CD in computer, scoateti-l, dupa care apasati Terminare pentru a reporni.", IDC_STATIC, 10, 180, 297, 20 +END + +STRINGTABLE +BEGIN + IDS_LANGTITLE "Selectie limba" + IDS_LANGSUBTITLE "Alegeti limba pentru instalare si sistem." + IDS_TYPETITLE "Bun venit la instalarea ReactOS" + IDS_TYPESUBTITLE "Alegeti tipul de instalare." + IDS_DEVICETITLE "Instalare dispozitive de baza" + IDS_DEVICESUBTITLE "Instalare tastatura si maus" + IDS_DRIVETITLE "Setare partitie de instalare si folder de sistem" + IDS_DRIVESUBTITLE "Pregatire partitie instalare, folder de sistem si incarcator" + IDS_PROCESSTITLE "Pregatire partitie, copiere fisiere sistem" + IDS_PROCESSSUBTITLE "Creare si formatare partitie, copiere fisiere, instalare incarcator" + IDS_RESTARTTITLE "Prima faza a instalarii terminata" + IDS_RESTARTSUBTITLE "Prima faza a instalarii a fost terminata cu succes, reporniti pentru a incepe a doua faza." + IDS_SUMMARYTITLE "Rezumat instalare" + IDS_SUMMARYSUBTITLE "Afisare rezumat instalare inainte de confirmarea inceperii instalarii" + IDS_ABORTSETUP "ReactOS nu s-a instalat inca complet. Daca parasiti acum procesul de instalare va trebui sa reporniti programul de instalare mai tarziu. Sigur iesiti?" + IDS_ABORTSETUP2 "Parasire instalare?" +END +/* EOF */ Propchange: trunk/reactos/base/setup/reactos/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/reactos/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/reactos/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/rsrc.rc [iso-8859-1] Sun Apr 26 21:31:56 2009 @@ -19,6 +19,7 @@ #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" /*#include "lang/sv-SE.rc" Added: trunk/reactos/dll/win32/user32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/user32/lang/ro-RO.rc (added) +++ trunk/reactos/dll/win32/user32/lang/ro-RO.rc [iso-8859-1] Sun Apr 26 21:31:56 2009 @@ -1,0 +1,74 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +///////////////////////////////////////////////////////////////////////////// +// +// Dialogs +// + +SELWINDOW DIALOGEX DISCARDABLE 20, 20, 220, 140 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Alegeti fereastra" +BEGIN + LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL + PUSHBUTTON "&OK", 1, 60, 120, 40, 15, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Revocare", 2, 120, 120, 40, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +///////////////////////////////////////////////////////////////////////////// +// +// Menus +// + +EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Anulare", EM_UNDO + MENUITEM SEPARATOR + MENUITEM "D&ecupare", WM_CUT + MENUITEM "&Copiere", WM_COPY + MENUITEM "&Lipire", WM_PASTE + MENUITEM "&ªtergere", WM_CLEAR + MENUITEM SEPARATOR + MENUITEM "Selectare &totalã", EM_SETSEL + END +END + + +SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE +BEGIN + MENUITEM "&Restabilire", SC_RESTORE + MENUITEM "&Mutare", SC_MOVE + MENUITEM "&Redimensionare", SC_SIZE + MENUITEM "Mi&nimizare", SC_MINIMIZE + MENUITEM "Ma&ximizare", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&Închidere\tAlt-F4", SC_CLOSE +END + +///////////////////////////////////////////////////////////////////////////// +// +// Strings +// + +STRINGTABLE +BEGIN + IDS_ERROR, "Eroare" + IDS_OK, "OK" + IDS_CANCEL, "Revocare" + IDS_ABORT, "&Abandon" + IDS_RETRY, "&Reîncercare" + IDS_IGNORE, "&Ignorare" + IDS_YES, "&Da" + IDS_NO, "&Nu" + IDS_HELP, "Ajutor" + IDS_TRYAGAIN, "&Reîncercare" + IDS_CONTINUE, "&Continuare" +END + +STRINGTABLE +BEGIN + IDS_MDI_MOREWINDOWS, "&Mai multe ferestre..." +END Propchange: trunk/reactos/dll/win32/user32/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rc… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.rc [iso-8859-1] Sun Apr 26 21:31:56 2009 @@ -92,13 +92,14 @@ #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/id-ID.rc" +#include "lang/it-IT.rc" #include "lang/ja-JP.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/uk-UA.rc" -#include "lang/it-IT.rc"

1 0

[janderwald] 40708: - Implement KSPROPERTY_PIN_DATARANGES handler- Always return TRUE in FastDeviceHandler (faciliates testing with Vortex AU8820 WDM Driver)
by janderwald＠svn.reactos.org 26 Apr '09

26 Apr '09

Author: janderwald Date: Sun Apr 26 15:19:12 2009 New Revision: 40708 URL: http://svn.reactos.org/svn/reactos?rev=40708&view=rev Log: - Implement KSPROPERTY_PIN_DATARANGES handler- Always return TRUE in FastDeviceHandler (faciliates testing with Vortex AU8820 WDM Driver) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c [iso-8859-1] Sun Apr 26 15:19:12 2009 @@ -323,23 +323,17 @@ return FALSE; } - Status = STATUS_UNSUCCESSFUL; for(Index = 0; Index < Descriptor->FilterPropertySet.FreeKsPropertySetOffset; Index++) { if (IsEqualGUIDAligned(&Property->Set, Descriptor->FilterPropertySet.Properties[Index].Set)) { - Status = FastPropertyHandler(FileObject, (PKSPROPERTY)InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, StatusBlock, - 1, - &Descriptor->FilterPropertySet.Properties[Index], - Descriptor, SubDevice); - break; + FastPropertyHandler(FileObject, (PKSPROPERTY)InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, StatusBlock, + 1, + &Descriptor->FilterPropertySet.Properties[Index], + Descriptor, SubDevice); } } - - if (NT_SUCCESS(Status)) - return TRUE; - else - return FALSE; + return TRUE; } /* Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] Sun Apr 26 15:19:12 2009 @@ -216,15 +216,19 @@ IN ISubdevice *SubDevice) { PFNKSHANDLER PropertyHandler = NULL; - NTSTATUS Status = STATUS_UNSUCCESSFUL; + NTSTATUS Status; KSP_PIN * Pin; + ULONG Size, Index; + PKSMULTIPLE_ITEM Item; ASSERT(Descriptor); if (!IsEqualGUIDAligned(&Property->Set, &KSPROPSETID_Pin)) { - /* the fast handler only supports pin properties */ + /* the fast handler only supports pin properties atm*/ DPRINT("Only KSPROPSETID_Pin is supported\n"); + IoStatus->Status = Status = STATUS_NOT_IMPLEMENTED; + IoStatus->Information = 0; return Status; } @@ -233,6 +237,8 @@ if (!NT_SUCCESS(Status)) { DPRINT("FindPropertyHandler failed with %x\n", Status); + IoStatus->Status = Status = Status; + IoStatus->Information = 0; return Status; } @@ -269,6 +275,41 @@ IoStatus->Status = Status = STATUS_SUCCESS; IoStatus->Information = sizeof(KSPIN_COMMUNICATION); break; + case KSPROPERTY_PIN_DATARANGES: + Pin = (KSP_PIN*)Property; + if (Pin->PinId >= Descriptor->Factory.PinDescriptorCount) + { + IoStatus->Status = Status = STATUS_INVALID_PARAMETER; + IoStatus->Information = 0; + break; + } + Size = sizeof(KSMULTIPLE_ITEM); + for (Index = 0; Index < Descriptor->Factory.KsPinDescriptor[Pin->PinId].DataRangesCount; Index++) + { + Size += Descriptor->Factory.KsPinDescriptor[Pin->PinId].DataRanges[Index]->FormatSize; + } + + if (DataLength < Size) + { + IoStatus->Information = Size; + IoStatus->Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + Item = (KSMULTIPLE_ITEM*)Data; + Item->Size = Size; + Item->Count = Descriptor->Factory.KsPinDescriptor[Pin->PinId].DataRangesCount; + + Data = (PUCHAR)(Item +1); + for (Index = 0; Index < Descriptor->Factory.KsPinDescriptor[Pin->PinId].DataRangesCount; Index++) + { + RtlMoveMemory(Data, Descriptor->Factory.KsPinDescriptor[Pin->PinId].DataRanges[Index], Descriptor->Factory.KsPinDescriptor[Pin->PinId].DataRanges[Index]->FormatSize); + Data = ((PUCHAR)Data + Descriptor->Factory.KsPinDescriptor[Pin->PinId].DataRanges[Index]->FormatSize); + } + + IoStatus->Status = Status = STATUS_SUCCESS; + IoStatus->Information = Size; + break; case KSPROPERTY_PIN_GLOBALCINSTANCES: Status = HandlePropertyInstances(IoStatus, Property, Data, Descriptor, TRUE); @@ -285,22 +326,22 @@ break; case KSPROPERTY_PIN_PHYSICALCONNECTION: case KSPROPERTY_PIN_CONSTRAINEDDATARANGES: - case KSPROPERTY_PIN_DATARANGES: case KSPROPERTY_PIN_INTERFACES: case KSPROPERTY_PIN_MEDIUMS: case KSPROPERTY_PIN_CATEGORY: case KSPROPERTY_PIN_NAME: case KSPROPERTY_PIN_PROPOSEDATAFORMAT: UNIMPLEMENTED - Status = STATUS_NOT_IMPLEMENTED; + IoStatus->Status = Status = STATUS_NOT_IMPLEMENTED; + IoStatus->Information = 0; break; default: UNIMPLEMENTED - Status = STATUS_NOT_IMPLEMENTED; + IoStatus->Status = Status = STATUS_NOT_IMPLEMENTED; + IoStatus->Information = 0; } return Status; } - NTSTATUS NTAPI

1 0

[cgutman] 40707: - Free NdisMiniportBlock.Resources when we receive a stop irp
by cgutman＠svn.reactos.org 26 Apr '09

26 Apr '09

Author: cgutman Date: Sun Apr 26 09:43:06 2009 New Revision: 40707 URL: http://svn.reactos.org/svn/reactos?rev=40707&view=rev Log: - Free NdisMiniportBlock.Resources when we receive a stop irp Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Apr 26 09:43:06 2009 @@ -1971,6 +1971,12 @@ Adapter->NdisMiniportBlock.AllocatedResourcesTranslated = NULL; } + if (Adapter->NdisMiniportBlock.Resources) + { + ExFreePool(Adapter->NdisMiniportBlock.Resources); + Adapter->NdisMiniportBlock.Resources = NULL; + } + if (Adapter->NdisMiniportBlock.EthDB) { EthDeleteFilter(Adapter->NdisMiniportBlock.EthDB);

1 0

[cgutman] 40706: - Also copy AllocatedResources from the stack to NdisMiniportBlock.Resources
by cgutman＠svn.reactos.org 26 Apr '09

26 Apr '09

Author: cgutman Date: Sun Apr 26 09:35:24 2009 New Revision: 40706 URL: http://svn.reactos.org/svn/reactos?rev=40706&view=rev Log: - Also copy AllocatedResources from the stack to NdisMiniportBlock.Resources Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Apr 26 09:35:24 2009 @@ -1727,6 +1727,19 @@ return STATUS_INSUFFICIENT_RESOURCES; } + Adapter->NdisMiniportBlock.Resources = + ExAllocatePool(PagedPool, ResourceListSize); + if (!Adapter->NdisMiniportBlock.Resources) + { + ExFreePool(Adapter->NdisMiniportBlock.AllocatedResources); + ExInterlockedRemoveEntryList(&Adapter->ListEntry, &AdapterListLock); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory(Adapter->NdisMiniportBlock.Resources, + Stack->Parameters.StartDevice.AllocatedResources, + ResourceListSize); + RtlCopyMemory(Adapter->NdisMiniportBlock.AllocatedResources, Stack->Parameters.StartDevice.AllocatedResources, ResourceListSize);

1 0

[cfinck] 392: Link source files and line numbers mentioned in the test log with the source files in their exact revisions in ViewVC Based on a patch by Alwyn Tan (alwyn.tan@gmail.com)
by cfinck＠svn.reactos.org 26 Apr '09

26 Apr '09

Author: cfinck Date: Sun Apr 26 04:11:43 2009 New Revision: 392 URL: http://svn.reactos.org/svn/reactos?rev=392&view=rev Log: Link source files and line numbers mentioned in the test log with the source files in their exact revisions in ViewVC Based on a patch by Alwyn Tan (alwyn.tan(a)gmail.com) Modified: branches/danny-web/www/www.reactos.org/testman/config.inc.php branches/danny-web/www/www.reactos.org/testman/detail.php Modified: branches/danny-web/www/www.reactos.org/testman/config.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/config.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/config.inc.php [iso-8859-1] Sun Apr 26 04:11:43 2009 @@ -12,4 +12,5 @@ define("RESULTS_PER_PAGE", 100); define("MAX_COMPARE_RESULTS", 5); + define("VIEWVC_TRUNK", "http://svn.reactos.org/svn/reactos/trunk"); ?> Modified: branches/danny-web/www/www.reactos.org/testman/detail.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/detail.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/detail.php [iso-8859-1] Sun Apr 26 04:11:43 2009 @@ -88,7 +88,15 @@ </tr> <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["log"]; ?>:</td> - <td><pre><?php echo htmlspecialchars($row["log"]); ?></pre></td> + <td><pre><?php + $patterns[0] = "#^([a-z]*:?$)([a-zA-Z0-9\/]+.[a-z]+):([0-9]+)($)#m"; + $patterns[1] = "#^([a-zA-Z0-9]+.[a-z]+):([0-9]+)(: )#m"; + + $replacements[0] = '$1<a href="' . VIEWVC_TRUNK . '/reactos/$2?revision=' . $row["revision"] . '&view=markup#l_$3">$2:$3</a>$4'; + $replacements[1] = '<a href="' . VIEWVC_TRUNK . '/rostests/winetests/' . $row["module"] . '/$1?revision=' . $row["revision"] . '&view=markup#l_$2">$1:$2</a>$3'; + + echo preg_replace($patterns, $replacements, htmlspecialchars($row["log"])); + ?></pre></td> </tr> </table><br />

1 0

[janderwald] 40705: - Pass KSPROPERTY_SET to subdevice constructor - Add debug traces on error case
by janderwald＠svn.reactos.org 26 Apr '09

26 Apr '09

Author: janderwald Date: Sun Apr 26 04:07:33 2009 New Revision: 40705 URL: http://svn.reactos.org/svn/reactos?rev=40705&view=rev Log: - Pass KSPROPERTY_SET to subdevice constructor - Add debug traces on error case Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] Sun Apr 26 04:07:33 2009 @@ -49,6 +49,27 @@ } }; +DEFINE_KSPROPERTY_TOPOLOGYSET(PortFilterWavePciTopologySet, TopologyPropertyHandler); +DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(PortFilterWavePciPinSet, PinPropertyHandler, PinPropertyHandler, PinPropertyHandler); + +KSPROPERTY_SET WavePciPropertySet[] = +{ + { + &KSPROPSETID_Topology, + sizeof(PortFilterWavePciTopologySet) / sizeof(KSPROPERTY_ITEM), + (const KSPROPERTY_ITEM*)&PortFilterWavePciTopologySet, + 0, + NULL + }, + { + &KSPROPSETID_Pin, + sizeof(PortFilterWavePciPinSet) / sizeof(KSPROPERTY_ITEM), + (const KSPROPERTY_ITEM*)&PortFilterWavePciPinSet, + 0, + NULL + } +}; + //--------------------------------------------------------------- // IPortEvents @@ -401,14 +422,14 @@ return Status; } - /* create the subdevice descriptor */ + /* create the subdevice descriptor */ Status = PcCreateSubdeviceDescriptor(&This->SubDeviceDescriptor, 3, - InterfaceGuids, + InterfaceGuids, 0, NULL, - 0, - NULL, + 2, + WavePciPropertySet, 0, 0, 0, @@ -416,6 +437,7 @@ 0, NULL, This->pDescriptor); + if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] Sun Apr 26 04:07:33 2009 @@ -224,6 +224,7 @@ if (!IsEqualGUIDAligned(&Property->Set, &KSPROPSETID_Pin)) { /* the fast handler only supports pin properties */ + DPRINT("Only KSPROPSETID_Pin is supported\n"); return Status; } @@ -231,6 +232,7 @@ Status = FindPropertyHandler(IoStatus, Descriptor, Property, PropertyLength, DataLength, &PropertyHandler); if (!NT_SUCCESS(Status)) { + DPRINT("FindPropertyHandler failed with %x\n", Status); return Status; }

1 0

[cgutman] 40704: - Fix support for asynchronously completed requests
by cgutman＠svn.reactos.org 25 Apr '09

25 Apr '09

Author: cgutman Date: Sun Apr 26 03:31:49 2009 New Revision: 40704 URL: http://svn.reactos.org/svn/reactos?rev=40704&view=rev Log: - Fix support for asynchronously completed requests Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Apr 26 03:31:49 2009 @@ -257,22 +257,6 @@ KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n")); -} - -VOID NTAPI -MiniQueryComplete( - IN NDIS_HANDLE MiniportAdapterHandle, - IN NDIS_STATUS Status) -{ - UNIMPLEMENTED; -} - -VOID NTAPI -MiniSetComplete( - IN NDIS_HANDLE MiniportAdapterHandle, - IN NDIS_STATUS Status) -{ - UNIMPLEMENTED; } @@ -409,16 +393,14 @@ KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } - - VOID NTAPI MiniRequestComplete( - IN PNDIS_HANDLE MiniportAdapterHandle, - IN PNDIS_REQUEST Request, + IN NDIS_HANDLE MiniportAdapterHandle, IN NDIS_STATUS Status) { PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; - PNDIS_REQUEST_MAC_BLOCK MacBlock = (PNDIS_REQUEST_MAC_BLOCK)Request->MacReserved; + PNDIS_REQUEST Request; + PNDIS_REQUEST_MAC_BLOCK MacBlock; KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); @@ -426,8 +408,10 @@ KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - Adapter->NdisMiniportBlock.PendingRequest = NULL; + Request = Adapter->NdisMiniportBlock.PendingRequest; KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + + MacBlock = (PNDIS_REQUEST_MAC_BLOCK)Request->MacReserved; if( MacBlock->Binding->RequestCompleteHandler ) { (*MacBlock->Binding->RequestCompleteHandler)( @@ -435,6 +419,11 @@ Request, Status); } + + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.PendingRequest = NULL; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeLowerIrql(OldIrql); } @@ -1148,17 +1137,14 @@ { case NdisRequestQueryInformation: NdisMQueryInformationComplete((NDIS_HANDLE)Adapter, NdisStatus); - MiniRequestComplete( (NDIS_HANDLE)Adapter, (PNDIS_REQUEST)WorkItemContext, NdisStatus ); break; case NdisRequestSetInformation: NdisMSetInformationComplete((NDIS_HANDLE)Adapter, NdisStatus); - MiniRequestComplete( (NDIS_HANDLE)Adapter, (PNDIS_REQUEST)WorkItemContext, NdisStatus ); break; default: NDIS_DbgPrint(MIN_TRACE, ("Unknown NDIS request type.\n")); - MiniRequestComplete( (NDIS_HANDLE)Adapter, (PNDIS_REQUEST)WorkItemContext, NdisStatus ); break; } break; @@ -1842,8 +1828,8 @@ Adapter->NdisMiniportBlock.StatusHandler = MiniStatus; Adapter->NdisMiniportBlock.StatusCompleteHandler= MiniStatusComplete; Adapter->NdisMiniportBlock.SendPacketsHandler = ProSendPackets; - Adapter->NdisMiniportBlock.QueryCompleteHandler = MiniQueryComplete; - Adapter->NdisMiniportBlock.SetCompleteHandler = MiniSetComplete; + Adapter->NdisMiniportBlock.QueryCompleteHandler = MiniRequestComplete; + Adapter->NdisMiniportBlock.SetCompleteHandler = MiniRequestComplete; /* * Call MiniportInitialize.

1 0

[dgoette] 391: initial version of the new submit interface
by dgoette＠svn.reactos.org 25 Apr '09

25 Apr '09

Author: dgoette Date: Sun Apr 26 03:09:46 2009 New Revision: 391 URL: http://svn.reactos.org/svn/reactos?rev=391&view=rev Log: initial version of the new submit interface Added: branches/danny-web/www/www.reactos.org/compat/js/submit.js branches/danny-web/www/www.reactos.org/compat/lib/get/List_Suggestions.clas… branches/danny-web/www/www.reactos.org/compat/lib/om/Entry.class.php branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Submit.class.php Modified: branches/danny-web/www/www.reactos.org/compat/config.php branches/danny-web/www/www.reactos.org/compat/convert1to2.sql branches/danny-web/www/www.reactos.org/compat/index.php branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php branches/danny-web/www/www.reactos.org/compat/lib/om/Category.class.php Modified: branches/danny-web/www/www.reactos.org/compat/config.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/config.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/config.php [iso-8859-1] Sun Apr 26 03:09:46 2009 @@ -8,5 +8,6 @@ define('CDBT_LANGUAGES' , 'cdb_languages'); define('CDBT_LOGS' , 'cdb_logs'); define('CDBT_TAGS' , 'cdb_tags'); +define('CDBT_VERSIONS' , 'cdb_entries_tags'); ?> Modified: branches/danny-web/www/www.reactos.org/compat/convert1to2.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/convert1to2.sql [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/convert1to2.sql [iso-8859-1] Sun Apr 26 03:09:46 2009 @@ -37,17 +37,7 @@ cat_icon, TRUE FROM rsdb_categories - WHERE cat_visible = '1' -UNION - SELECT - cat_id, - cat_path, - cat_name, - cat_description, - cat_icon, - FALSE - FROM rsdb_categories - WHERE cat_visible = '0'; + WHERE cat_visible = '1' AND cat_comp = '1'; ALTER TABLE cdb_categories ORDER BY id; DROP TABLE rsdb_categories; @@ -63,7 +53,7 @@ user_id BIGINT UNSIGNED NOT NULL COMMENT '->roscms.accounts(id)', title VARCHAR( 100 ) NOT NULL , content TEXT NOT NULL , - creation DATETIME NOT NULL , + created DATETIME NOT NULL , visible BOOL NOT NULL DEFAULT FALSE ) ENGINE = MYISAM COMMENT = 'parent xor entry_id has to be NULL'; @@ -265,6 +255,7 @@ id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, name VARCHAR( 100 ) NOT NULL, version VARCHAR( 100 ) NOT NULL, + category_id BIGINT NOT NULL, description TEXT NOT NULL, created DATETIME NOT NULL, modified DATETIME NOT NULL, @@ -279,6 +270,7 @@ NULL, old_name, old_version, + 0, old_description, created, modified, @@ -303,7 +295,8 @@ ALTER TABLE cdb_entries_reports DROP old_name, DROP old_description, - DROP old_groupid; + DROP old_groupid, + DROP old_version; DROP TABLE rsdb_item_comp; @@ -314,7 +307,6 @@ -- ----------------------------------------------------------------- CREATE TABLE cdb_tags ( id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , - category_id BIGINT COMMENT '->categories(id)', name VARCHAR( 100 ) NOT NULL , description TEXT NOT NULL , user_id BIGINT UNSIGNED NOT NULL COMMENT '->roscms.users(id)', @@ -325,22 +317,6 @@ old_groupid BIGINT ) ENGINE = MYISAM; --- groups -INSERT INTO cdb_tags -SELECT DISTINCT - NULL, - (SELECT grpentr_category FROM rsdb_groups WHERE grpentr_name=g.grpentr_name ORDER BY grpentr_date DESC LIMIT 1), - grpentr_name, - grpentr_description, - grpentr_usrid, - (SELECT grpentr_date FROM rsdb_groups WHERE grpentr_name=g.grpentr_name ORDER BY grpentr_date DESC LIMIT 1), - TRUE, - FALSE, - (SELECT grpentr_vendor FROM rsdb_groups WHERE grpentr_name=g.grpentr_name ORDER BY grpentr_date DESC LIMIT 1), - grpentr_id -FROM rsdb_groups g -WHERE grpentr_comp = '1' AND grpentr_visible = '1'; - -- vendors INSERT INTO cdb_tags SELECT DISTINCT @@ -370,7 +346,7 @@ id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , user_id BIGINT UNSIGNED NOT NULL COMMENT '->roscms.users(id)', content TEXT NOT NULL , - creation DATETIME NOT NULL + created DATETIME NOT NULL ) ENGINE = MYISAM; INSERT INTO cdb_logs @@ -401,7 +377,7 @@ e.id, t.id FROM cdb_entries e -JOIN cdb_tags t ON (t.old_groupid = e.old_groupid OR t.old_vendor =e.old_vendorid); +JOIN cdb_tags t ON (t.old_vendor = e.old_vendorid); ALTER TABLE cdb_entries DROP old_groupid; ALTER TABLE cdb_entries DROP old_vendorid; @@ -459,7 +435,7 @@ (NULL, 35137, 'ReactOS 0.3.6', TRUE, '000360'), (NULL, 37181, 'ReactOS 0.3.7', TRUE, '000370'), (NULL, 39330, 'ReactOS 0.3.8', TRUE, '000380'), -(NULL, 66666, 'ReactOS 0.3.9', TRUE, '000390'); +(NULL, 40702, 'ReactOS 0.3.9', TRUE, '000390'); Modified: branches/danny-web/www/www.reactos.org/compat/index.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/index.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/index.php [iso-8859-1] Sun Apr 26 03:09:46 2009 @@ -131,7 +131,6 @@ switch (@$_GET['page']) { // Frontpage - case '': case 'home': new Home(); break; @@ -240,9 +239,9 @@ new HTML_Search(); break; - // Category + // Submit case 'submit': - new Submit_Item(); + new HTML_Submit(); break; // Help @@ -251,7 +250,10 @@ break; default: - echo '404'; + // just show 404, if no request for 'get=' is given + if (!isset($_GET['get'])) { + echo '404'; + } break; // export data @@ -280,4 +282,13 @@ } // end switch export break; } // end switch page + +switch (@$_GET['get']) { + + // Suggestions + case 'suggestions': + new List_Suggestions(); + break; + +} // end switch get ?> Added: branches/danny-web/www/www.reactos.org/compat/js/submit.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/js/submit.js (added) +++ branches/danny-web/www/www.reactos.org/compat/js/submit.js [iso-8859-1] Sun Apr 26 03:09:46 2009 @@ -1,0 +1,165 @@ +var namesuggestion = false; +var xmldoc; + + +function suggestName( name ) +{ + if (name.length>1) { + makeRequest('?get=suggestions&for=names&search='+encodeURIComponent(name), 'name'); + } +} + + + +/** + * starts a new AJAX request + * + * @param string url + * @param string action + * @param string objid + * @param string format + * @param string kind + * @param string parameters + */ +function makeRequest( url, action ) +{ + var http_request = false; + + if (window.XMLHttpRequest) { // Mozilla, Safari,... + http_request = new XMLHttpRequest(); + } + else if (window.ActiveXObject) { // IE + try { + http_request = new ActiveXObject("Msxml2.XMLHTTP"); + } catch (e) { + try { + http_request = new ActiveXObject("Microsoft.XMLHTTP"); + } catch (e2) { + } + } + } + http_request.overrideMimeType('text/xml'); + + http_request.onreadystatechange = function() + { + try { + if (http_request.readyState === 4) { + if (http_request.status === 200) { + switch (action) { + + case 'name': + showSuggestions(http_request, 'suggestedNames'); + break; + + case 'version': + showSuggestions(http_request, 'suggestedVersions'); + break; + } + } + } + } + catch (e) { + } + + }; + + // internal function end + http_request.open('GET', url, true); + http_request.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT"); // Bypass the IE Cache + http_request.send(null); + + return true; +} // end of function makeRequest + + + +function showSuggestions( http_request, id ) +{ + var show=''; + + xmldoc = http_request.responseXML; + var entries = xmldoc.getElementsByTagName('entry'); + + if (entries.length > 0) { + document.getElementById(id).style.display = 'block'; + namesuggestion = true; + + for (var i=0; i < entries.length; i++) { + show += '<li> <a onclick="useSuggestion(this, \'name\', '+i+');">'+entries[i].getAttribute('name')+'</a></li>'; + } + + document.getElementById(id).innerHTML='<ul>'+show+'</ul>'; + } + else { + namesuggestion = false; + hideSuggestions(id); + } +} + + + +function hideSuggestions( id ) +{ + document.getElementById(id).style.display = 'none'; +} + + + +function useSuggestion( from, type, index ) +{ + var id; + var show=''; + + if (type == 'name') { + id = 'title'; + hideSuggestions('suggestedNames'); + disableDetails(); + + var entries = xmldoc.getElementsByTagName('entry'); + var versions = entries[index].getElementsByTagName('version'); + + for (var i=0; i < versions.length; i++) { + show += '<li> <a onclick="useSuggestion(this, \'version\');">'+versions[i].firstChild.nodeValue+'</a></li>'; + } + + document.getElementById('suggestedVersions').style.display='block'; + document.getElementById('suggestedVersions').innerHTML='<ul>'+show+'</ul>'; + } + else if (type == 'version') { + id = 'version'; + hideSuggestions('suggestedVersions'); + } + document.getElementById(id).value=from.innerHTML; +} + + + +function toggleDetails( ) +{ + if (!document.getElementById('iCheck').checked) { + enableDetails() + } + else { + disableDetails() + } +} + + + +function disableDetails( ) +{ + document.getElementById('iCheck').checked = true; + document.getElementById('cat').disabled = true; + document.getElementById('description').disabled = true; + document.getElementById('tags').disabled = true; +} + + + +function enableDetails( ) +{ + document.getElementById('iCheck').checked = false; + document.getElementById('cat').disabled = false; + document.getElementById('description').disabled = false; + document.getElementById('tags').disabled = false; +} Modified: branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php [iso-8859-1] Sun Apr 26 03:09:46 2009 @@ -44,7 +44,7 @@ $this->title = $page_title; $this->register_css('style.css'); $this->register_js('smoothscroll.js'); - $this->register_js('search.js'); + //$this->register_js('search.js'); // get output $this->build(); @@ -57,7 +57,7 @@ * * @access private */ - private function build( ) + protected function build( ) { $this->header(); $this->navigation(); Added: branches/danny-web/www/www.reactos.org/compat/lib/get/List_Suggestions.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/get/List_Suggestions.clas… (added) +++ branches/danny-web/www/www.reactos.org/compat/lib/get/List_Suggestions.clas… [iso-8859-1] Sun Apr 26 03:09:46 2009 @@ -1,0 +1,69 @@ +<?php + /* + RSDB - ReactOS Support Database + Copyright (C) 2009 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 List_Suggestions +{ + + + + public function __construct( ) + { + header("Content-Type: Text/XML"); + echo '<root>'; + switch (@$_GET['for']) { + case 'name': + default: + $stmt=CDBConnection::getInstance()->prepare("SELECT name, version FROM ".CDBT_ENTRIES." WHERE name LIKE :search ORDER BY name ASC, version DESC"); + + } + $stmt->bindValue('search',@$_GET['search'].'%',PDO::PARAM_STR); + $stmt->execute(); + $oldname = null; + + // build list of entries and their versions + while ($entry=$stmt->fetch(PDO::FETCH_ASSOC)) { + + // open / close entry + if ($oldname === null || $oldname != $entry['name']) { + if ($oldname !== null) { + echo '</entry>'; + } + echo '<entry name="'.htmlspecialchars($entry['name']).'">'; + } + + // version + echo '<version>'.htmlspecialchars($entry['version']).'</version>'; + + // update last entry name + $oldname = $entry['name']; + } // end while entry + + // close entry + if ($oldname !== null) { + echo '</entry>'; + } + + echo '</root>'; + } // end of constructor + + + +} // end of List_Suggestions +?> Modified: branches/danny-web/www/www.reactos.org/compat/lib/om/Category.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/om/Category.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/om/Category.class.php [iso-8859-1] Sun Apr 26 03:09:46 2009 @@ -2,6 +2,7 @@ /* CompatDB - ReactOS Compatability Database Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> + 2009 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 @@ -33,24 +34,36 @@ * * @access public */ - public static function showTree($RSDB_TEMP_cat_path, $RSDB_TEMP_cat_id, $RSDB_TEMP_cat_level, $RSDB_TEMP_cat_level_newmain, $option) { - global $RSDB_intern_link_category_cat; + public static function showTreeAsOption($category_id = 0, $level = 0) + { + $output = ''; - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM ".CDBT_CATEGORIES." WHERE parent = :cat_path AND visible IS TRUE ORDER BY name ASC"); - $stmt->bindParam('cat_path',$RSDB_TEMP_cat_id,PDO::PARAM_STR); + $categories=self::getChilds($category_id); + if (count($categories) > 0) { + foreach($categories as $category) { + $output .= ' + <option value="'.$category['id'].'">'.str_repeat('   ',$level).htmlspecialchars($category['name']).'</option>'; + $output .= self::showTreeAsOption($category['id'],$level+1); + } + } + + return $output; + } // end of member function showTree + + + + /** + * @FILLME + * + * @access private + */ + private static function getChilds($category_id) + { + $stmt=CDBConnection::getInstance()->prepare("SELECT id, name FROM ".CDBT_CATEGORIES." WHERE parent = :cat_path AND visible IS TRUE ORDER BY name ASC"); + $stmt->bindParam('cat_path',$category_id,PDO::PARAM_INT); $stmt->execute(); - - while($result_create_historybar=$stmt->fetch(PDO::FETCH_ASSOC)) { - if ($option) { - self::showLeafAsOption($result_create_historybar['id'], $RSDB_TEMP_cat_level_newmain); - } - else { - self::showLeafAsRow($result_create_historybar['id'], $RSDB_TEMP_cat_level_newmain); - } - self::showTree($result_create_historybar['parent'], $result_create_historybar['id'], $RSDB_TEMP_cat_level, $RSDB_TEMP_cat_level_newmain,$option); - } - } // end of member function showTree - + return $stmt->fetchAll(PDO::FETCH_ASSOC); + } /** @@ -58,10 +71,10 @@ * * @access public */ - public static function showLeafAsOption($RSDB_TEMP_entry_id, $RSDB_TEMP_cat_level_newmain) { + public static function showLeafAsOption($RSDB_TEMP_entry_id, $RSDB_TEMP_cat_level_newmain) + { global $RSDB_intern_selected; - global $RSDB_intern_link_category_cat; global $cellcolor2; $cellcolor=$cellcolor2; @@ -115,7 +128,8 @@ * * @access public */ - public static function showLeafAsRow($RSDB_TEMP_entry_id, $RSDB_TEMP_cat_level_newmain) { + public static function showLeafAsRow($RSDB_TEMP_entry_id, $RSDB_TEMP_cat_level_newmain) + { global $RSDB_intern_link_category_cat; global $cellcolor2; @@ -176,7 +190,7 @@ echo "</font></div></td><td width='10%' valign='top' bgcolor='".$cellcolor."'><font size='2'>".Count::entriesInGroup($result_create_tree_entry['id'])."</font></td></tr>"; - } // end of member function showLeafAsOption + } // end of member function showLeafAsRow Added: branches/danny-web/www/www.reactos.org/compat/lib/om/Entry.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/om/Entry.class.php (added) +++ branches/danny-web/www/www.reactos.org/compat/lib/om/Entry.class.php [iso-8859-1] Sun Apr 26 03:09:46 2009 @@ -1,0 +1,149 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2009 Danny Götte <gvg(a)reactos.org> + + 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 Entry + * + */ +class Entry +{ + + + + /** + * @FILLME + * + * @access public + */ + public static function add( $title, $version, $category, $description, $tags, $update = false ) + { + // search for existing entry + $entry_id = self::getId($title, $version); + + // insert new entry + if ($entry_id === false) { + + // check category type + if (!ctype_digit((string)$category) || $category == 0) { + echo 'Error: Unknown Categorie'; + return false; + } + + // insert + $stmt=CDBConnection::getInstance()->prepare("INSERT INTO ".CDBT_ENTRIES." (name, version, category_id, description, created, modified, visible) VALUES (:name, :version, :category, :description, NOW(), NOW(), TRUE)"); + $stmt->bindParam('name',$title,PDO::PARAM_STR); + $stmt->bindParam('version',$version,PDO::PARAM_STR); + $stmt->bindParam('category',$category,PDO::PARAM_INT); + $stmt->bindParam('description',$description,PDO::PARAM_STR); + if(!$stmt->execute()) { + return false; + } + + $entry_id = self::getId($title, $version); + } + + // update entry + elseif ($update) { + $stmt=CDBConnection::getInstance()->prepare("UPDATE ".CDBT_ENTRIES." SET category=:category, description=:description, modified=NOW() WHERE id=:entry_id"); + $stmt->bindParam('entry_id',$entry_id,PDO::PARAM_STR); + $stmt->bindParam('category',$category,PDO::PARAM_INT); + $stmt->bindParam('description',$description,PDO::PARAM_STR); + if(!$stmt->execute()) { + return false; + } + } + + return $entry_id; + } // end of member function add + + + + /** + * @FILLME + * + * @access public + */ + public static function addReport( $entry_id, $revision, $status = false ) + { + global $RSDB_intern_user_id; + + // check if entry exists + if ($entry_id === false) { + echo 'Error: Unknown entry'; + return false; + } + + // insert + $stmt=CDBConnection::getInstance()->prepare("INSERT INTO ".CDBT_REPORTS." (entry_id, user_id, revision, works, created, visible, disabled) VALUES (:entry_id, :user_id, :revision, :status, NOW(), TRUE, FALSE)"); + $stmt->bindParam('entry_id',$entry_id,PDO::PARAM_INT); + $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_INT); + $stmt->bindParam('revision',$revision,PDO::PARAM_INT); + $stmt->bindParam('status',$status,PDO::PARAM_BOOL); + return $stmt->execute(); + } // end of member function addReport + + + + /** + * @FILLME + * + * @access public + */ + public static function addComment( $entry_id, $title, $content ) + { + global $RSDB_intern_user_id; + + // check if entry exists + if ($entry_id === false) { + echo 'Error: Unknown entry'; + return false; + } + + // insert + $stmt=CDBConnection::getInstance()->prepare("INSERT INTO ".CDBT_COMMENTS." (entry_id, user_id, parent, title, content, created, visible) VALUES (:entry_id, :user_id, NULL, :title, :content, NOW(), TRUE)"); + $stmt->bindParam('entry_id',$entry_id,PDO::PARAM_INT); + $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_INT); + $stmt->bindParam('title',$title,PDO::PARAM_STR); + $stmt->bindParam('status',$content,PDO::PARAM_STR); + return $stmt->execute(); + } // end of member function add + + + + /** + * @FILLME + * + * @access public + */ + public static function getId( $title, $version ) + { + // search for existing entry + $stmt=CDBConnection::getInstance()->prepare("SELECT id FROM ".CDBT_ENTRIES." WHERE name LIKE :name AND version LIKE :version LIMIT 1"); + $stmt->bindParam('name',$title,PDO::PARAM_STR); + $stmt->bindParam('version',$version,PDO::PARAM_STR); + $stmt->execute(); + return $stmt->fetchColumn(); + } // end of member function add + + + +} // end of Entry +?> Added: branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Submit.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Submit.class.php (added) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Submit.class.php [iso-8859-1] Sun Apr 26 03:09:46 2009 @@ -1,0 +1,191 @@ +<?php + /* + RSDB - ReactOS Support Database + Copyright (C) 2009 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 HTML_Submit extends HTML +{ + + + public function __construct( ) + { + $this->register_js('submit.js'); + + parent::__construct(); + } + + + protected function build( ) + { + $this->header(); + $this->navigation(); + if (isset($_REQUEST['submit']) && $_REQUEST['submit'] == 'yes') { + $this->submit(); + } + $this->body(); + $this->footer(); + } + + + private function submit( ) + { + // get used revision number + if ($_POST['ver'] == 'R') { + $revision = $_POST['rev']; + } + else { + $revision = $_POST['ver']; + } + + // try to insert a new entry + if (isset($_POST['cat']) && isset($_POST['description'])) { + $entry_id = Entry::add($_POST['title'], $_POST['version'], $_POST['cat'], $_POST['description'], $_POST['tags'], (isset($_POST['iCheck']) && $_POST['iCheck'] == 'yes')); + } + + // search entry + else { + $entry_id = Entry::getId($_POST['title'], $_POST['version']); + } + + // insert new report/comment + if ($entry_id !== false) { + Entry::addReport($entry_id, $revision, ($_POST['status']=='yes')); + + // insert new comment + if (isset($_POST['comment']) && $_POST['comment'] != '') { + Entry::addComment($entry_id, 'test of r'.$revision, $_POST['comment']); + } + } + } // end of member function submit + + + + protected function body( ) + { + $used_again = (isset($_POST['next']) && $_POST['next']=='again'); + + echo ' + <form action="?page=submit&submit=yes" method="post"> + <fieldset> + <legend>App Details</legend> + <ul style="list-style-type: none;"> + <li style="float: left;"> + <label for="title">Application Name:</label><br /> + <input type="text" name="title" id="title" onkeyup="suggestName(this.value);" /> + <div id="suggestedNames" style="display:none;border: 1px solid red;"></div> + </li> + + <li style="float: right;"> + <label for="version">Version:</label><br /> + <input type="text" name="version" id="version" /> + <div id="suggestedVersions" style="display:none;border: 1px solid red;"></div> + </li> + + <li style="clear: both;"> + <fieldset> + <legend> + <input type="checkbox" name="iCheck" id="iCheck" value="yes" onclick="toggleDetails();" /> + <label for="iCheck">I don\'t want to modify the additional information</label> + </legend> + <ul style="list-style-type: none;"> + <li> + <label for="cat">Category:</label><br /> + <select name="cat" id="cat"> + <option value="0">&nbsp</option> + '.Category::showTreeAsOption().' + </select> + </li> + <li> + <label for="description">Short Description:</label><br /> + <input type="text" name="description" id="description" /> + </li> + + <li style="display:none;"> + <label for="tags">Tags: (seperate them by <em>,</em>)</label><br /> + <input type="text" name="tags" id="tags" /> + </li> + </ul> + </li> + + </ul> + </fieldset> + + <fieldset> + <legend>Test</legend> + <ul style="list-style-type: none;"> + <li> + Status:<br /> + <input type="radio" name="status" id="noworks" value="no" /> + <label for="noworks" style="color: red;">Doesn\'t Work</label> + <br /> + <input type="radio" name="status" id="doesn\'t work" value="yes" /> + <label for="works" style="color: green;">Works</label> + <br /> + <br /> + </li> + <li> + <label for="ver">Tested Version</label><br /> + <select name="ver" id="ver"> + <option value="R"'.(($used_again && $_POST['ver'] == 'R') ? ' selected="selected"' : '').'>Use Revision</option>'; + + $stmt=CDBConnection::getInstance()->prepare("SELECT revision, name FROM ".CDBT_VERSIONS." WHERE VISIBLE IS TRUE ORDER BY revision DESC"); + $stmt->execute(); + $x = 0; + while ($version = $stmt->fetch(PDO::FETCH_ASSOC) ) { + ++$x; + echo ' + <option value="'.$version['revision'].'"'.((($used_again && $_POST['ver'] == $version['revision']) || (!$used_again && $x===1)) ? ' selected="selected"' : '').'>'.$version['name'].'</option>'; + } + echo ' + </select> + </li> + + <li> + <label for="rev">Tested Revision (only trunk revisions are allowed, please don\'t enter revisions of tags or branches)</label><br /> + <input type="text" name="rev" id="rev"'.(($used_again && $_POST['ver'] == 'R') ? ' value="'.htmlspecialchars($_POST['revision']).'"' : '').' /> + </li> + </ul> + </fieldset> + + <fieldset> + <legend>Additional</legend> + <ul style="list-style-type: none;"> + <li> + <label for="comment">Comment</label><br /> + <textarea rows="6" cols="80" name="comment" id="comment"></textarea> + </li> + <li> + next action:<br /> + <input type="radio" name="next" id="again" value="again" '.($used_again ? 'checked="checked"' : '').' /> + <label for="again">Insert another entry/report</label> + <br /> + <input type="radio" name="next" id="entry" value="entry" '.(!$used_again ? 'checked="checked"' : '').' /> + <label for="entry">Jump to inserted entry/report</label> + </li> + </ul> + </fieldset> + <div> + <button type="submit">Submit new Compatibility Report</button> + </div> + </form>'; + } // end of member function body + + + +} // end of HTML_Submit +?>

1 0

[cgutman] 40703: - Use Int32x32To64 to calculate timeout
by cgutman＠svn.reactos.org 25 Apr '09

25 Apr '09

Author: cgutman Date: Sun Apr 26 02:02:50 2009 New Revision: 40703 URL: http://svn.reactos.org/svn/reactos?rev=40703&view=rev Log: - Use Int32x32To64 to calculate timeout Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Apr 26 02:02:50 2009 @@ -1923,7 +1923,7 @@ Adapter->NdisMiniportBlock.OldPnPDeviceState = Adapter->NdisMiniportBlock.PnPDeviceState; Adapter->NdisMiniportBlock.PnPDeviceState = NdisPnPDeviceStarted; - Timeout.QuadPart = (LONGLONG)Adapter->NdisMiniportBlock.CheckForHangSeconds * -1000000; + Timeout.QuadPart = Int32x32To64(Adapter->NdisMiniportBlock.CheckForHangSeconds, -1000000); KeSetTimerEx(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Timer, Timeout, Adapter->NdisMiniportBlock.CheckForHangSeconds * 1000, &Adapter->NdisMiniportBlock.WakeUpDpcTimer.Dpc);

1 0

[cfinck] 40702: ReactOS 0.3.9 is done!
by cfinck＠svn.reactos.org 25 Apr '09

25 Apr '09

Author: cfinck Date: Sun Apr 26 00:50:47 2009 New Revision: 40702 URL: http://svn.reactos.org/svn/reactos?rev=40702&view=rev Log: ReactOS 0.3.9 is done! Added: tags/ReactOS-0.3.9/ - copied from r40701, branches/ros-branch-0_3_9/ Removed: branches/ros-branch-0_3_9/

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