Ros-diffs December 2009

ros-diffs@reactos.org

22 participants
501 discussions

[gschneider] 44529: [msfs] Mail slot file system driver bring up 1/x: - Allow clients to query mail slot info - Read the size of the first message in the slot - Update headers, some cleanup - Fixes 11 kernel32 mail slot test failures

by gschneider＠svn.reactos.org

Author: gschneider Date: Thu Dec 10 21:26:58 2009 New Revision: 44529 URL: http://svn.reactos.org/svn/reactos?rev=44529&view=rev Log: [msfs] Mail slot file system driver bring up 1/x: - Allow clients to query mail slot info - Read the size of the first message in the slot - Update headers, some cleanup - Fixes 11 kernel32 mail slot test failures Modified: trunk/reactos/drivers/filesystems/msfs/create.c trunk/reactos/drivers/filesystems/msfs/finfo.c trunk/reactos/drivers/filesystems/msfs/fsctrl.c trunk/reactos/drivers/filesystems/msfs/msfs.c trunk/reactos/drivers/filesystems/msfs/msfs.h trunk/reactos/drivers/filesystems/msfs/rw.c Modified: trunk/reactos/drivers/filesystems/msfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] Thu Dec 10 21:26:58 2009 @@ -1,8 +1,7 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/ms/create.c + * FILE: drivers/filesystems/msfs/create.c * PURPOSE: Mailslot filesystem * PROGRAMMER: Eric Kohl */ Modified: trunk/reactos/drivers/filesystems/msfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/finfo.c [iso-8859-1] Thu Dec 10 21:26:58 2009 @@ -1,8 +1,7 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/ms/finfo.c + * FILE: drivers/filesystems/msfs/finfo.c * PURPOSE: Mailslot filesystem * PROGRAMMER: Eric Kohl */ @@ -43,8 +42,10 @@ } else { - /* FIXME: read size of first message (head) */ - Buffer->NextMessageSize = 0; + PMSFS_MESSAGE Message = CONTAINING_RECORD(Fcb->MessageListHead.Flink, + MSFS_MESSAGE, + MessageListEntry); + Buffer->NextMessageSize = Message->Size; } KeReleaseSpinLock(&Fcb->MessageListLock, oldIrql); @@ -93,19 +94,6 @@ Ccb = (PMSFS_CCB)FileObject->FsContext2; DPRINT("Mailslot name: %wZ\n", &Fcb->Name); - - /* querying information is not permitted on client side */ - if (Fcb->ServerCcb != Ccb) - { - Status = STATUS_ACCESS_DENIED; - - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return Status; - } SystemBuffer = Irp->AssociatedIrp.SystemBuffer; BufferLength = IoStack->Parameters.QueryFile.Length; Modified: trunk/reactos/drivers/filesystems/msfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/fsctrl.c [iso-8859-1] Thu Dec 10 21:26:58 2009 @@ -1,8 +1,7 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/ms/fsctrl.c + * FILE: drivers/filesystems/msfs/fsctrl.c * PURPOSE: Mailslot filesystem * PROGRAMMER: Eric Kohl */ @@ -38,9 +37,6 @@ switch (IoStack->Parameters.FileSystemControl.FsControlCode) { -#if 0 - -#endif default: Status = STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/msfs/msfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/msfs.c [iso-8859-1] Thu Dec 10 21:26:58 2009 @@ -1,8 +1,7 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: services/fs/ms/msfs.c + * FILE: drivers/filesystems/msfs/msfs.c * PURPOSE: Mailslot filesystem * PROGRAMMER: Eric Kohl */ Modified: trunk/reactos/drivers/filesystems/msfs/msfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] Thu Dec 10 21:26:58 2009 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: services/fs/ms/msfs.h + * FILE: drivers/filesystems/msfs/msfs.h * PURPOSE: Mailslot filesystem * PROGRAMMER: Eric Kohl */ Modified: trunk/reactos/drivers/filesystems/msfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] Thu Dec 10 21:26:58 2009 @@ -1,8 +1,7 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/ms/rw.c + * FILE: drivers/filesystems/msfs/rw.c * PURPOSE: Mailslot filesystem * PROGRAMMER: Eric Kohl */

15 years

[dgorbachev] 44528: Bulgarian translations by CCTAHEB (sstpr/AT/narod/DOT/ru). Newly translated: doskey, spider. Updated: winemine, servman, ipconfig, rapps, 3dtext, shutdown, usetup, explorer.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Dec 10 20:36:33 2009 New Revision: 44528 URL: http://svn.reactos.org/svn/reactos?rev=44528&view=rev Log: Bulgarian translations by CCTAHEB (sstpr/AT/narod/DOT/ru). Newly translated: doskey, spider. Updated: winemine, servman, ipconfig, rapps, 3dtext, shutdown, usetup, explorer. Added: trunk/reactos/base/applications/cmdutils/doskey/lang/bg-BG.rc (with props) trunk/reactos/base/applications/games/spider/lang/bg-BG.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.rc trunk/reactos/base/applications/games/spider/rsrc.rc trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc trunk/reactos/base/applications/network/ipconfig/lang/bg-BG.rc trunk/reactos/base/applications/rapps/lang/bg-BG.rc trunk/reactos/base/applications/screensavers/3dtext/lang/bg-BG.rc trunk/reactos/base/applications/shutdown/lang/bg-BG.rc trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/shell/explorer/explorer-bg.rc Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.rc [iso-8859-1] Thu Dec 10 20:36:33 2009 @@ -5,5 +5,7 @@ #include <windows.h> #include "doskey.h" + +#include "lang/bg-BG.rc" #include "lang/en-US.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/cmdutils/doskey/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/lang/bg-BG.rc (added) +++ trunk/reactos/base/applications/cmdutils/doskey/lang/bg-BG.rc [iso-8859-1] Thu Dec 10 20:36:33 2009 @@ -1,0 +1,27 @@ +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_HELP, "Óïðàâëÿâà íàñòðîéêèòå çà îáðàáîòêà â êîìàíäíèÿ ðåä, äíåâíèêà è ìàêðîòàòà.\n\ +\n\ +DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=ðàçìåð]\n\ + [/REINSTALL] [/MACROS[:exe | :ALL]] [/MACROFILE=ôàéë] [macroname=[òåêñò]]\n\ +\n\ + /INSERT Âêëþ÷âà ðåæèì íà âìúêâàíå.\n\ + /OVERSTRIKE Èçêëþ÷âà ðåæèìà íà âìúêâàíå.\n\ + /EXENAME=èìåíàexe Óêàçâà èìåòî íà ïðèëîæåíèåòî çà ïðåãëåä/ïðîìÿíà íà äíåâíèêà\n\ + è ìàêðîòàòà. Ïî ïîäðàçáèðàíå å cmd.exe.\n\ + /HISTORY Ïîêàçâà äíåâíèêà íà çàïîâåäèòå.\n\ + /LISTSIZE=ðàçìåð Óêàçâà ðàçìåðà íà äíåâíèêà çà çàïîâåäè.\n\ + /REINSTALL Èç÷èñòâà äíåâíèêà íà çàïîâåäèòå.\n\ + /MACROS Ïîêàçâà çàäàäåíèòå ìàêðîòà.\n\ + /MACROS:èìåíàexe Ïîêàçâà çàäàäåíèòå ìàêðîòà çà îïðåäåëåíî ïðèëîæåíèå.\n\ + /MACROS:ALL Ïîêàçâà çàäàäåíèòå ìàêðîòà çà âñè÷êè ïðèëîæåíèÿ.\n\ + /MACROFILE=ôàéëîâîèìå Çàðåæäà ìàêðîòà îò ôàéë.\n\ + macroname Óêàçâà èìåòî íà ìàêðîòî, êîåòî äà áúäå ñúçäàäåíî.\n\ + text Óêàçâà òåêñòúò çà çàìÿíà îò ìàêðîòî.\n" + +IDS_INVALID_MACRO_DEF, "Íåïðàâèëíî îïðåäåëåíî ìàêðî: %s\n" + +END Propchange: trunk/reactos/base/applications/cmdutils/doskey/lang/bg-BG.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/games/spider/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/bg-BG.rc (added) +++ trunk/reactos/base/applications/games/spider/lang/bg-BG.rc [iso-8859-1] Thu Dec 10 20:36:33 2009 @@ -1,0 +1,89 @@ +/* + * PROJECT: Spider Solitaire + * LICENSE: See COPYING in top level directory + * FILE: base/applications/games/spider/lang/en-US.rc + * PURPOSE: English Language File for Spider Solitaire + * TRANSLATOR: Gregor Schneider + */ + +#include "resource.h" + +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + + +/* Dialogs */ + +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 +CAPTION "Èçáîð íà ãðúá íà êàðòèòå" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "Äîáðå", IDOK, 66, 84, 54, 13 + PUSHBUTTON "Îòêàç", IDCANCEL, 126, 84, 54, 13 +END + +IDD_DIFFICULTY DIALOGEX DISCARDABLE 100, 100, 106, 80 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Òðóäíîñò" +FONT 8, "MS Shell Dlg" +BEGIN + AUTORADIOBUTTON "Ëåñíî: &Åäèí öâÿò", IDC_DIF_ONECOLOR, 8, 10, 90, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Ñðåäíî: &Äâà öâÿòà", IDC_DIF_TWOCOLORS, 8, 23, 90, 10 + AUTORADIOBUTTON "Òðóäíî: &×åòèðè öâÿòà", IDC_DIF_FOURCOLORS, 8, 36, 96, 10 + + DEFPUSHBUTTON "Äîáðå", IDOK, 8, 58, 40, 14 + PUSHBUTTON "Îòêàç", IDCANCEL, 58, 58, 40, 14 +END + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_SPI_NAME "Ïàÿê" + IDS_SPI_ABOUT "Spider Solitaire by Gregor Schneider\n\nCardLib version 1.0" + IDS_SPI_QUIT "Èçõîä îò òåêóøàòà èãðà?" + IDS_SPI_WIN "Ïîçäðàâëåíèÿ, ñïå÷åëèõòå!" + IDS_SPI_DEAL "Íîâî ðàçäàâàíå?" +END + + +/* Menus */ + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "&Èãðà" + BEGIN + MENUITEM "&Íîâà èãðà\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "&Òåñòå", IDM_GAME_DECK + MENUITEM SEPARATOR + MENUITEM "Èç&õîä", IDM_GAME_EXIT + END + POPUP "Ïîìî&ù" + BEGIN + MENUITEM "&Ñúäúðæàíèå\tF1", IDM_HELP_CONTENTS + MENUITEM "&Çà", IDM_HELP_ABOUT + END +END + + + +/* Accelerator */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END Propchange: trunk/reactos/base/applications/games/spider/lang/bg-BG.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/spider/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/rsrc.rc [iso-8859-1] Thu Dec 10 20:36:33 2009 @@ -5,13 +5,14 @@ IDI_SPIDER ICON DISCARDABLE "spider.ico" +#include "lang/bg-BG.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/hu-HU.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/nl-NL.rc" -#include "lang/ja-JP.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" Modified: trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc [iso-8859-1] Thu Dec 10 20:36:33 2009 @@ -48,7 +48,7 @@ LTEXT "", IDC_NAME2, 132, 30, 55, 8 LTEXT "", IDC_NAME3, 132, 40, 55, 8 DEFPUSHBUTTON "Äîáðå", IDOK, 127, 57, 50, 15 - PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 + PUSHBUTTON "&Î÷èñòâàíå íà ðåçóëòàòèòå", IDRESET, 18, 57, 67, 15 END IDD_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 Modified: trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc [iso-8859-1] Thu Dec 10 20:36:33 2009 @@ -93,7 +93,7 @@ LTEXT "Îïèñàíèå:", IDC_STATIC, 4, 51, 110, 11 LTEXT "Ïúò äî èçïúëíèìèÿ:", IDC_STATIC, 6, 73, 110, 9 /* startup type*/ - LTEXT "Âèä íà ïóñêàíå:", IDC_STATIC, 6, 108, 110, 11 + LTEXT "Ïóñêàíå:", IDC_STATIC, 6, 108, 110, 11 LTEXT "Ñúñòîÿíèå íà óñëóãàòà:", IDC_STATIC, 4, 138, 110, 11 LTEXT "", IDC_SERV_STATUS, 120, 138, 176, 11, WS_CHILD | WS_VISIBLE /* LTEXT "You can specify the start parameters that apply when you start the service from here.",IDC_STATIC, 6,177,240,15 */ Modified: trunk/reactos/base/applications/network/ipconfig/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/lang/bg-BG.rc [iso-8859-1] Thu Dec 10 20:36:33 2009 @@ -32,7 +32,7 @@ \n \ êúäåòî\n \ êàðòà Èìå íà ñâúðçâàíåòî\n \ - (ðàçðåøåíè ñà çàìåñòâàùè çíàöè * ?, âèæ ïðèìåðèòå)\n \ + (ðàçðåøåíè ñà çàìåñòâàùè çíàöè * ?, âèæòå ïðèìåðèòå)\n \ \n \ Âúçìîæíîñòè:\n \ /? Ïîêàçâà òîâà ïîìîùíî ñúîáùåíèå\n \ @@ -49,7 +49,7 @@ ïîäðàáðàíèÿ ðàçïðåäåëèòåë (gateway) çà âñÿêà êàðòà, ðàáîòåùà ïî TCP/IP.\n \ \n \ Çà Release è Renew, àêî íå å óêàçàíî èìå íà êàðòàòà, ùå áúäàò îñâîáîäåíè èëè ïîäíîâåíè\n \ - ÈÏ àäððåñèòå íà âñè÷êè êàðòè, èçïîëçâàùè TCP/IP.\n \ + ÈÏ àäðåñèòå íà âñè÷êè êàðòè, èçïîëçâàùè TCP/IP.\n \ \n \ Çà èçáîðà Setclassid, àêî íå å óêàçàí ClassId, òî ClassId ñå ïðåìàõâà.\n \ \n \ @@ -60,6 +60,6 @@ > ipconfig /renew EL* ... îáíîâÿâàâà âñè÷êè ñâúðçâàíèÿ, ÷èèòî èìåíà\n \ çàïî÷âàò ñ EL\n \ > ipconfig /release *Con* ... îñâîáîæäàâà âñè÷êè ñúâïàäàùè ñâúðçâàíèÿ,\n \ - íàïðèìåð ""Local Area Connection 1"" èëè\n \ - ""Local Area Connection 2""\n" + íàïðèìåð Local Area Connection 1 èëè\n \ + Local Area Connection 2\n" END Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] Thu Dec 10 20:36:33 2009 @@ -14,7 +14,7 @@ MENUITEM "&Ìàõàíå",ID_UNINSTALL MENUITEM "&Ïðîìÿíà", ID_MODIFY MENUITEM SEPARATOR - MENUITEM "&Remove from Registry", ID_REGREMOVE + MENUITEM "Ïðå&ìàõâàíå îò ðåãèñòúðà", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "Î&ïðåñíÿâàíå", ID_REFRESH END @@ -42,45 +42,45 @@ MENUITEM "&Ìàõàíå", ID_UNINSTALL MENUITEM "&Ïðîìÿíà", ID_MODIFY MENUITEM SEPARATOR - MENUITEM "&Remove from Registry", ID_REGREMOVE + MENUITEM "Ïðå&ìàõâàíå îò ðåãèñòúðà", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "Î&ïðåñíÿâàíå", ID_REFRESH END END -IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE 0, 0, 254, 144 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Settings" +CAPTION "Íàñòðîéêè" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "General", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Save window position", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Update the list of accessible programs at start", IDC_UPDATE_AVLIST, 15, 29, 219, 12 - AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12 + GROUPBOX "Îáùè", -1, 4, 2, 244, 61 + AUTOCHECKBOX "&Ñúõðàíÿâàíå ðàçïîëîæåíèåòî íà ïðîçîðåöà", IDC_SAVE_WINDOW_POS, 15, 12, 223, 12 + AUTOCHECKBOX "Îá&íîâÿâàíå íà ñïèñúêà ñ äîñòúïíèòå ïðèëîæåíèÿ ïðè ïóñêàíå", IDC_UPDATE_AVLIST, 15, 29, 227, 12 + AUTOCHECKBOX "&Âïèñâàíå íà ñëàãàíèÿòà è ìàõàíèÿòà íà ïðèëîæåíèÿ", IDC_LOG_ENABLED, 15, 46, 223, 12 - GROUPBOX "Downloading", -1, 4, 65, 240, 51 - LTEXT "Folder for downloadings:", -1, 16, 75, 100, 9 + GROUPBOX "Ñâàëÿíå", -1, 4, 65, 244, 51 + LTEXT "Ïàïêà çà ñâàëåíèòå ôàéëîâå", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP - PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14 - AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 + PUSHBUTTON "Èç&áîð", IDC_CHOOSE, 187, 85, 50, 14 + AUTOCHECKBOX "Ñëåä ñëàãàíå, èçïîëçâàíèòå ôàéëîâå äà ñå èçòðèâàò", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14 + PUSHBUTTON "Ïîäðàçáèðàíî", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 + PUSHBUTTON "Äîáðå", IDOK, 116, 124, 60, 14 + PUSHBUTTON "Îòêàç", IDCANCEL, 181, 124, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE 0, 0, 216, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Program installation" +CAPTION "Ñëàãàíå íà ïðèëîæåíèå" FONT 8, "MS Shell Dlg" BEGIN LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35 - AUTORADIOBUTTON "&Install from a disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP - AUTORADIOBUTTON "&Download and install", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Ñëàãàíå îò îïòè÷åí íîñèòåë", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP + AUTORADIOBUTTON "&Ñâàëÿíå è ñëàãàíå", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14 + PUSHBUTTON "Äîáðå", IDOK, 86, 78, 60, 14 + PUSHBUTTON "Îòêàç", IDCANCEL, 150, 78, 60, 14 END IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 @@ -98,7 +98,7 @@ CAPTION "Çà" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Óïðàâèòåëÿò çà ïðèëîæåíèÿ íà ÐåàêòÎÑ\nÂúçïðîèçâîäñòâåíè ïðàâà (C) 2009\nÄìèòðèé ×àïúéøåâ (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 150, 39 + LTEXT "Óïðàâèòåëÿò çà ïðèëîæîæåíèÿ íà ÐåàêòÎÑ\nÂúçïðîèçâîäñòâåíè ïðàâà (C) 2009\nÄìèòðèé ×àïúéøåâ (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 150, 39 PUSHBUTTON "Çàòâàðÿíå", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 END @@ -159,7 +159,7 @@ IDS_CAT_ENGINEER "Èíæåíåðñòâî" IDS_CAT_FINANCE "Ôèíàíñè" IDS_CAT_GAMES "Èãðè è çàáàâëåíèÿ" - IDS_CAT_GRAPHICS "Ãðàôèêà" + IDS_CAT_GRAPHICS "ãðàôèêà" IDS_CAT_INTERNET "Èíòåðíåò è ìðåæà" IDS_CAT_LIBS "Áèáëèîòåêè" IDS_CAT_OFFICE "Ñëóæåáíè" @@ -177,17 +177,17 @@ IDS_UNINSTALL "Ìàõàíå" IDS_MODIFY "Ïðîìÿíà" IDS_APPS_COUNT "Áðîé ïðèëîæåíèÿ: %d" - IDS_WELCOME_TITLE "Óïðàâèòåëÿò çà ïðèëîæåíèÿ íà ÐåàêòÎÑ âè ïðèâåòñòâà!\n\n" + IDS_WELCOME_TITLE "Óïðàâèòåëÿò íà ïðèëîæåíèÿòà íà ÐåàêòÎÑ âè ïðèâåòñòâà" IDS_WELCOME_TEXT "Èçáåðåòå ðàçäåë îò ëÿâàòà ñòðàíà, ñëåä êîåòî èçáåðåòå ïðèëîæåíèå çà ñëàãàíå èëè ïðåìàõâàíå.\nÑòðàíèöàòà íà ÐåàêòÎÑ: " IDS_WELCOME_URL "http://www.reactos.org" - IDS_INSTALLED "Ñëîæåíè" + IDS_INSTALLED "Ñëîæåíî" IDS_AVAILABLEFORINST "Íàëè÷íî çà ñëàãàíå" IDS_UPDATES "Îáíîâëåíèÿ" IDS_APPLICATIONS "Ïðèëîæåíèÿ" - IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:" - IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!" - IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!" - IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" - IDS_INFORMATION "Information" - IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" + IDS_CHOOSE_FOLDER_TEXT "Èçáåðåòå ïàïêà, â êîÿòî äà ñå ñâàëÿò ïðèëîæåíèÿòà:" + IDS_CHOOSE_FOLDER_ERROR "Óêàçàëè ñòå íåñúñøåñòâóâàùà ïàïêà!" + IDS_USER_NOT_ADMIN "You should be administrator for start ""Óïðàâèòåëÿò çà ïðèëîæåíèÿ íà ÐåàêòÎÑ""!" + IDS_APP_REG_REMOVE "Óâåðåí ëè ñòå, ÷å èñêàòå äà èçòðèåòå äàííèòå çà ñëîæåíîòî ïðèëîæåíèå îò ðåãèñòúðà?" + IDS_INFORMATION "Ñâåäåíèÿ" + IDS_UNABLE_TO_REMOVE "Ïðåìàõâàíåòî íà äàííèòå çà ïðèëîæåíèåòî îò ðåãèñòúðà å íåâúçìîæíî!" END Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/bg-BG.rc [iso-8859-1] Thu Dec 10 20:36:33 2009 @@ -2,7 +2,7 @@ DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 STYLE DS_SHELLFONT | DS_MODALFRAME| DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Íàñòðîéêè íà åêðàííèÿ ïðåäïàçèòåë ""Òðèìåðåí òåêñò""." +CAPTION "Íàñòðîéêè íà åêðàííèÿ ïðåäïàçèòåë Òðèìåðåí òåêñò." FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Äîáðå",IDOK,216,7,50,14 @@ -13,5 +13,5 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Åêðàíåí ïðåäïàçèòåë ""Òðèìåðåí òåêñò""." + IDS_DESCRIPTION "Åêðàíåí ïðåäïàçèòåë Òðèìåðåí òåêñò." END Modified: trunk/reactos/base/applications/shutdown/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/lang/bg-BG.rc [iso-8859-1] Thu Dec 10 20:36:33 2009 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "Óïîòðåáà: shutdown [-?] [-l | -s | -r] [-f]\n\n\ - Áåç êëþ÷îâå èëè -?\tÏîêçàâà òîâà ñúîáùåíèå\n\ + Áåç êëþ÷îâå èëè -?\tÏîêàçâà òîâà ñúîáùåíèå\n\ -l\t\t\tÈçõîä\n\ -s\t\t\tÈçêëþ÷âàíå íà êîìïþòúðà\n\ -r\t\t\tÈçêëþ÷âàíå è ïðåçàïóñêàíå íà êîìïþòúðà\n\ Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Thu Dec 10 20:36:33 2009 @@ -996,7 +996,7 @@ { 8, 12, - "« £ ¥ § à¥¦¤ ç â¢êà¤¨ï ¤¨áª (MBR).", + "« £ ¥ § à¥¦¤ ç â¢êà¤¨ï ¤¨áª (¢ MBR).", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/shell/explorer/explorer-bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-bg.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-bg.rc [iso-8859-1] Thu Dec 10 20:36:33 2009 @@ -282,7 +282,7 @@ CAPTION "Çà èçñëåäîâàòåëÿ íà ÐåàêòÎÑ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Èçñëåäîâàòåë íà ÐåàêòÎÑ",IDC_ROS_EXPLORER,91,13,104,11 + LTEXT "Èçñëåäîâàòåëÿò íà ÐåàêòÎÑ",IDC_ROS_EXPLORER,91,13,104,11 LTEXT "â 0.9",IDC_VERSION_TXT,91,27,104,8 LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 LTEXT "",IDC_WIN_VERSION,91,58,98,22 @@ -326,7 +326,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_TITLE "Èçñëåäîâàòåë íà ÐåàêòÎÑ" + IDS_TITLE "Èçñëåäîâàòåëÿò íà ÐåàêòÎÑ" IDS_START "Ïóñê" IDS_LOGOFF "Èçõîä..." IDS_SHUTDOWN "Èçêëþ÷âàíå..."

15 years

[gschneider] 44527: [kernel32] - Passing 0 flags to EnumSystemLocales behaves like passing LCID_SUPPORTED, so be it - Ref: http://msdn.microsoft.com/en-us/library/dd317828%28VS.85%29.aspx - Fixes mlang winetest crash, now it hangs after executing some hundred tests, bug #4999

by gschneider＠svn.reactos.org

Author: gschneider Date: Thu Dec 10 16:50:07 2009 New Revision: 44527 URL: http://svn.reactos.org/svn/reactos?rev=44527&view=rev Log: [kernel32] - Passing 0 flags to EnumSystemLocales behaves like passing LCID_SUPPORTED, so be it - Ref: http://msdn.microsoft.com/en-us/library/dd317828%28VS.85%29.aspx - Fixes mlang winetest crash, now it hangs after executing some hundred tests, bug #4999 Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] Thu Dec 10 16:50:07 2009 @@ -923,6 +923,12 @@ { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; + } + + /* Passing 0 flags behaves like LCID_SUPPORTED */ + if (lpProcs->dwFlags == 0) + { + lpProcs->dwFlags = LCID_SUPPORTED; } switch (lpProcs->dwFlags)

15 years

[tkreuzer] 44526: More fix of TEB::KernelCallbackTable usage

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 10 14:40:05 2009 New Revision: 44526 URL: http://svn.reactos.org/svn/reactos?rev=44526&view=rev Log: More fix of TEB::KernelCallbackTable usage Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/dllmain.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Thu Dec 10 14:40:05 2009 @@ -217,23 +217,25 @@ Init(VOID) { USERCONNECT UserCon; + PVOID *KernelCallbackTable; /* Set up the kernel callbacks. */ - NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_WINDOWPROC] = + KernelCallbackTable = NtCurrentPeb()->KernelCallbackTable; + KernelCallbackTable[USER32_CALLBACK_WINDOWPROC] = (PVOID)User32CallWindowProcFromKernel; - NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_SENDASYNCPROC] = + KernelCallbackTable[USER32_CALLBACK_SENDASYNCPROC] = (PVOID)User32CallSendAsyncProcForKernel; - NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_LOADSYSMENUTEMPLATE] = + KernelCallbackTable[USER32_CALLBACK_LOADSYSMENUTEMPLATE] = (PVOID)User32LoadSysMenuTemplateForKernel; - NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_LOADDEFAULTCURSORS] = + KernelCallbackTable[USER32_CALLBACK_LOADDEFAULTCURSORS] = (PVOID)User32SetupDefaultCursors; - NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_HOOKPROC] = + KernelCallbackTable[USER32_CALLBACK_HOOKPROC] = (PVOID)User32CallHookProcFromKernel; - NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_EVENTPROC] = + KernelCallbackTable[USER32_CALLBACK_EVENTPROC] = (PVOID)User32CallEventProcFromKernel; - NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_LOADMENU] = + KernelCallbackTable[USER32_CALLBACK_LOADMENU] = (PVOID)User32CallLoadMenuFromKernel; - NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_CLIENTTHREADSTARTUP] = + KernelCallbackTable[USER32_CALLBACK_CLIENTTHREADSTARTUP] = (PVOID)User32CallClientThreadSetupFromKernel; NtUserProcessConnect( NtCurrentProcess(),

15 years

[tkreuzer] 44525: [NDK] Fix a TEB array size.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 10 14:33:57 2009 New Revision: 44525 URL: http://svn.reactos.org/svn/reactos?rev=44525&view=rev Log: [NDK] Fix a TEB array size. Modified: branches/ros-amd64-bringup/reactos/include/ndk/peb_teb.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/peb_teb.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/peb_teb.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/peb_teb.h [iso-8859-1] Thu Dec 10 14:33:57 2009 @@ -258,7 +258,7 @@ ULONG HardErrorsAreDisabled; #endif #if (NTDDI_VERSION >= NTDDI_LONGHORN) - PTR(PVOID) Instrumentation[9]; + PTR(PVOID) Instrumentation[13 - sizeof(GUID)/sizeof(PTR(PVOID))]; GUID ActivityId; PTR(PVOID) SubProcessTag; PTR(PVOID) EtwLocalData; @@ -365,7 +365,6 @@ C_ASSERT(FIELD_OFFSET(STRUCT(TEB), LastStatusValue) == 0x1250); C_ASSERT(FIELD_OFFSET(STRUCT(TEB), Vdm) == 0x1690); C_ASSERT(FIELD_OFFSET(STRUCT(TEB), HardErrorMode) == 0x16B0); -C_ASSERT(FIELD_OFFSET(STRUCT(TEB), SubProcessTag) == 0x1728); C_ASSERT(FIELD_OFFSET(STRUCT(TEB), GdiBatchCount) == 0x1740); C_ASSERT(FIELD_OFFSET(STRUCT(TEB), IdealProcessor) == 0x1747); C_ASSERT(FIELD_OFFSET(STRUCT(TEB), WaitingOnLoaderLock) == 0x1760);

15 years

[tkreuzer] 44524: [NDK] - Add missing TEB member for Vista

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 10 14:04:36 2009 New Revision: 44524 URL: http://svn.reactos.org/svn/reactos?rev=44524&view=rev Log: [NDK] - Add missing TEB member for Vista Modified: branches/ros-amd64-bringup/reactos/include/ndk/peb_teb.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/peb_teb.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/peb_teb.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/peb_teb.h [iso-8859-1] Thu Dec 10 14:04:36 2009 @@ -262,6 +262,7 @@ GUID ActivityId; PTR(PVOID) SubProcessTag; PTR(PVOID) EtwLocalData; + PTR(PVOID) EtwTraceData; #elif (NTDDI_VERSION >= NTDDI_WS03) PTR(PVOID) Instrumentation[14]; PTR(PVOID) SubProcessTag;

15 years

[tkreuzer] 44523: Fix usage of PEB::KernelCallbacktable. It's a PVOID.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 10 13:39:54 2009 New Revision: 44523 URL: http://svn.reactos.org/svn/reactos?rev=44523&view=rev Log: Fix usage of PEB::KernelCallbacktable. It's a PVOID. Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/dispatch.c Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/dispatch.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/dispatch.c [iso-8859-1] Thu Dec 10 13:39:54 2009 @@ -79,8 +79,8 @@ ULONG ArgumentLength) { /* Return with the result of the callback function */ + USER_CALL *KernelCallbackTable = NtCurrentPeb()->KernelCallbackTable; ZwCallbackReturn(NULL, 0, - ((USER_CALL)(NtCurrentPeb()->KernelCallbackTable[Index])) - (Argument, ArgumentLength)); + KernelCallbackTable[Index](Argument, ArgumentLength)); }

15 years

[janderwald] 44522: [MMIXER] - Store MixerList in MixerContext member - Fix a lot of bugs - MMixer is now able to enumerate mixers and their associated controls

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Dec 10 13:27:16 2009 New Revision: 44522 URL: http://svn.reactos.org/svn/reactos?rev=44522&view=rev Log: [MMIXER] - Store MixerList in MixerContext member - Fix a lot of bugs - MMixer is now able to enumerate mixers and their associated controls Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c trunk/reactos/lib/drivers/sound/mmixer/filter.c trunk/reactos/lib/drivers/sound/mmixer/mixer.c trunk/reactos/lib/drivers/sound/mmixer/mmixer.h Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Thu Dec 10 13:27:16 2009 @@ -413,7 +413,10 @@ for(Index = 0; Index < NodeTypes->Count; Index++) { if (Nodes[Index]) + { + // found a node ControlCount++; + } } /* now allocate the line controls */ @@ -458,7 +461,7 @@ SrcLine->NodeIds[ControlCount] = Index; Status = MMixerAddMixerControl(MixerContext, MixerInfo, hDevice, NodeTypes, Index, SrcLine, &SrcLine->LineControls[ControlCount]); - if (Status != MM_STATUS_SUCCESS) + if (Status == MM_STATUS_SUCCESS) { /* increment control count on success */ ControlCount++; @@ -497,12 +500,7 @@ /* try get pin name size */ Status = MixerContext->Control(hDevice, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), NULL, 0, &BytesReturned); - if (Status != STATUS_MORE_ENTRIES) - { - SrcLine->Line.szShortName[0] = L'\0'; - SrcLine->Line.szName[0] = L'\0'; - } - else + if (Status == MM_STATUS_MORE_ENTRIES) { PinName = (LPWSTR)MixerContext->Alloc(BytesReturned); if (PinName) @@ -510,7 +508,7 @@ /* try get pin name */ Status = MixerContext->Control(hDevice, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (LPVOID)PinName, BytesReturned, &BytesReturned); - if (Status != MM_STATUS_SUCCESS) + if (Status == MM_STATUS_SUCCESS) { MixerContext->Copy(SrcLine->Line.szShortName, PinName, (min(MIXER_SHORT_NAME_CHARS, wcslen(PinName)+1)) * sizeof(WCHAR)); SrcLine->Line.szShortName[MIXER_SHORT_NAME_CHARS-1] = L'\0'; @@ -625,6 +623,7 @@ for(Index = PinsCount; Index > 0; Index--) { + DPRINT("MMixerAddMixerSourceLines Index %lu Pin %lu\n", Index-1, Pins[Index-1]); if (Pins[Index-1]) { MMixerAddMixerSourceLine(MixerContext, MixerInfo, hDevice, NodeConnections, NodeTypes, Index-1, (Index -1 == BridgePinIndex), (Index -1 == TargetPinIndex)); @@ -645,7 +644,6 @@ ULONG PinsRefCount, Index, PinConnectionIndexCount; MIXER_STATUS Status; HANDLE hDevice = NULL; - PFILE_OBJECT FileObject = NULL; PKSMULTIPLE_ITEM NodeTypes = NULL; PKSMULTIPLE_ITEM NodeConnections = NULL; PULONG MixerControls; @@ -656,7 +654,7 @@ Status = MixerContext->Open(OutConnection->SymbolicLinkName, &hDevice); if (Status != MM_STATUS_SUCCESS) { - DPRINT1("OpenDevice failed with %x\n", Status); + DPRINT("OpenDevice failed with %x\n", Status); return Status; } @@ -691,7 +689,7 @@ return Status; } // gets connection index of the bridge pin which connects to a node - DPRINT("Pin %u\n", OutConnection->Pin); + DPRINT("Pin %lu\n", OutConnection->Pin); Status = MMixerGetNodeIndexes(MixerContext, NodeConnections, OutConnection->Pin, FALSE, !bInput, &PinConnectionIndexCount, &PinConnectionIndex); if (Status != MM_STATUS_SUCCESS) @@ -720,12 +718,16 @@ for(Index = 0; Index < PinsRefCount; Index++) { + DPRINT("PinsRefCount %lu Index %lu Value %lu\n", PinsRefCount, Index, PinsRef[Index]); if (PinsRef[Index]) { // found a target pin, now get all references Status = MMixerGetNodeIndexes(MixerContext, NodeConnections, Index, FALSE, FALSE, &MixerControlsCount, &MixerControls); if (Status != MM_STATUS_SUCCESS) + { + DPRINT("MMixerGetNodeIndexes failed with %u\n", Status); break; + } /* sanity check */ ASSERT(MixerControlsCount == 1); @@ -767,7 +769,7 @@ } PinsSrcRef[OutConnection->Pin] = TRUE; - Status = MMixerAddMixerSourceLines(MixerContext, MixerInfo, FileObject, NodeConnections, NodeTypes, PinsRefCount, OutConnection->Pin, Index, PinsSrcRef); + Status = MMixerAddMixerSourceLines(MixerContext, MixerInfo, hDevice, NodeConnections, NodeTypes, PinsRefCount, OutConnection->Pin, Index, PinsSrcRef); MixerContext->Free(MixerControls); MixerContext->Free(PinsSrcRef); @@ -795,6 +797,7 @@ PKSPIN_PHYSICALCONNECTION OutConnection; ULONG Index; ULONG * Pins; + ULONG bUsed; // allocate a mixer info struct MixerInfo = (LPMIXER_INFO) MixerContext->Alloc(sizeof(MIXER_INFO)); @@ -845,31 +848,47 @@ // failed to locate target pins MixerContext->Free(Pins); MMixerFreeMixerInfo(MixerContext, MixerInfo); + DPRINT("MMixerGetTargetPins failed with %u\n", Status); return Status; } + + // filter hasnt been used + bUsed = FALSE; // now check all pins and generate new lines for destination lines for(Index = 0; Index < PinCount; Index++) { + DPRINT("Index %lu TargetPin %lu\n", Index, Pins[Index]); // is the current index a target pin if (Pins[Index]) { // check if the pin has a physical connection Status = MMixerGetPhysicalConnection(MixerContext, hMixer, Index, &OutConnection); - if (Status != MM_STATUS_SUCCESS) + if (Status == MM_STATUS_SUCCESS) { // the pin has a physical connection Status = MMixerHandlePhysicalConnection(MixerContext, MixerInfo, bInputMixer, OutConnection); - + DPRINT("MMixerHandlePhysicalConnection status %u\n", Status); MixerContext->Free(OutConnection); + bUsed = TRUE; } } } MixerContext->Free(Pins); - // store mixer info in list - InsertTailList(&MixerList->MixerList, &MixerInfo->Entry); - MixerList->MixerListCount++; + if (bUsed) + { + // store mixer info in list + InsertTailList(&MixerList->MixerList, &MixerInfo->Entry); + MixerList->MixerListCount++; + DPRINT("New MixerCount %lu\n", MixerList->MixerListCount); + } + else + { + // TODO: + // filter exposes its topology on the same filter + MMixerFreeMixerInfo(MixerContext, MixerInfo); + } // done return Status; @@ -891,7 +910,7 @@ // get number of pins PinCount = MMixerGetFilterPinCount(MixerContext, hMixer); ASSERT(PinCount); - + DPRINT("NumOfPins: %lu\n", PinCount); // get filter node types Status = MMixerGetFilterTopologyProperty(MixerContext, hMixer, KSPROPERTY_TOPOLOGY_NODES, &NodeTypes); @@ -915,8 +934,9 @@ if (NodeIndex != MAXULONG) { // it has + Status = MMixerInitializeFilter(MixerContext, MixerList, hMixer, DeviceName, NodeTypes, NodeConnections, PinCount, NodeIndex, FALSE); - + DPRINT("MMixerInitializeFilter Status %u\n", Status); // check for success if (Status == MM_STATUS_SUCCESS) { @@ -932,7 +952,7 @@ { // it has Status = MMixerInitializeFilter(MixerContext, MixerList, hMixer, DeviceName, NodeTypes, NodeConnections, PinCount, NodeIndex, TRUE); - + DPRINT("MMixerInitializeFilter Status %u\n", Status); // check for success if (Status == MM_STATUS_SUCCESS) { Modified: trunk/reactos/lib/drivers/sound/mmixer/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/f… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/filter.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/filter.c [iso-8859-1] Thu Dec 10 13:27:16 2009 @@ -109,7 +109,7 @@ // pin does not have a physical connection return Status; } - + DPRINT("Status %u BytesReturned %lu\n", Status, BytesReturned); Connection = (PKSPIN_PHYSICALCONNECTION)MixerContext->Alloc(BytesReturned); if (!Connection) { @@ -123,6 +123,7 @@ { // failed to query the physical connection MixerContext->Free(Connection); + DPRINT("Status %u\n", Status); return Status; } Modified: trunk/reactos/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] Thu Dec 10 13:27:16 2009 @@ -438,10 +438,15 @@ MixerList->MixerListCount = 0; InitializeListHead(&MixerList->MixerList); + // store mixer list + MixerContext->MixerContext = (PVOID)MixerList; + // start enumerating all available devices Count = 0; DeviceIndex = 0; + + do { // enumerate a device @@ -450,26 +455,21 @@ if (Status != MM_STATUS_SUCCESS) { //check error code - if (Status != MM_STATUS_NO_MORE_DEVICES) + if (Status == MM_STATUS_NO_MORE_DEVICES) { - // enumeration has failed - return Status; + // enumeration has finished + break; } - // last device - break; - } - + } + else + { + MMixerSetupFilter(MixerContext, MixerList, hMixer, &Count, DeviceName); + } // increment device index DeviceIndex++; - - Status = MMixerSetupFilter(MixerContext, MixerList, hMixer, &Count, DeviceName); - - if (Status != MM_STATUS_SUCCESS) - break; - }while(TRUE); // done - return Status; -} + return MM_STATUS_SUCCESS; +} Modified: trunk/reactos/lib/drivers/sound/mmixer/mmixer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/mmixer.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/mmixer.h [iso-8859-1] Thu Dec 10 13:27:16 2009 @@ -38,7 +38,7 @@ PULONG lpBytesReturned); typedef MIXER_STATUS(*PMIXER_OPEN)( - IN LPCWSTR DevicePath, + IN LPWSTR DevicePath, OUT PHANDLE hDevice); typedef MIXER_STATUS(*PMIXER_CLOSE)(

15 years

[tkreuzer] 44521: [NTDKK] - Don't use PEB::FastPeb(Un)LockRoutine, these members are deprecated since Windows 2003, use RtlEnter/LeaveCriticalSection instead.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 10 12:54:17 2009 New Revision: 44521 URL: http://svn.reactos.org/svn/reactos?rev=44521&view=rev Log: [NTDKK] - Don't use PEB::FastPeb(Un)LockRoutine, these members are deprecated since Windows 2003, use RtlEnter/LeaveCriticalSection instead. Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/startup.c branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Thu Dec 10 12:54:17 2009 @@ -343,8 +343,6 @@ /* initalize peb lock support */ RtlInitializeCriticalSection(&PebLock); Peb->FastPebLock = &PebLock; - Peb->FastPebLockRoutine = (PPEBLOCKROUTINE)RtlEnterCriticalSection; - Peb->FastPebUnlockRoutine = (PPEBLOCKROUTINE)RtlLeaveCriticalSection; /* initialize tls bitmaps */ RtlInitializeBitMap(&TlsBitMap, Peb->TlsBitmapBits, TLS_MINIMUM_AVAILABLE); Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Thu Dec 10 12:54:17 2009 @@ -88,7 +88,7 @@ RtlAcquirePebLock(VOID) { PPEB Peb = NtCurrentPeb (); - Peb->FastPebLockRoutine (Peb->FastPebLock); + RtlEnterCriticalSection(Peb->FastPebLock); } /* @@ -98,7 +98,7 @@ RtlReleasePebLock(VOID) { PPEB Peb = NtCurrentPeb (); - Peb->FastPebUnlockRoutine (Peb->FastPebLock); + RtlLeaveCriticalSection(Peb->FastPebLock); } /*

15 years

[dreimer] 44520: Update changelog. Get ready for RosBE64 1.3. Add log2lines to RosBE setup.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Dec 10 12:19:38 2009 New Revision: 44520 URL: http://svn.reactos.org/svn/reactos?rev=44520&view=rev Log: Update changelog. Get ready for RosBE64 1.3. Add log2lines to RosBE setup. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Thu Dec 10 12:19:38 2009 @@ -1,11 +1,13 @@ -*** Nov XXth, 2009 - RosBE 1.5 Released +*** Dec XXth, 2009 - RosBE 1.5 Released - Updated Binutils to 2.20.51-20091017 (snapshot) - Updated GCC to 4.4.2 (including backported GCC r153606) - Updated MinGW Runtime to 3.16 - Updated w32api to 3.13 +- Updated NSIS to 2.46 (Daniel Reimer) - Added Remake command (Daniel Reimer) - Fixed a few renaming bugs (Daniel Reimer) +- Added log2lines v1.8 to RosBE (Daniel Reimer) *** Oct 26th, 2009 - RosBE 1.4.5 Released Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Thu Dec 10 12:19:38 2009 @@ -270,6 +270,7 @@ SetOverwrite try File /r Components\Tools\echoh.exe File /r Components\Tools\raddr2line.exe + File /r Components\Tools\log2lines.exe File /r Components\Tools\chkslash.exe SectionEnd Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Thu Dec 10 12:19:38 2009 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment for Windows - 64 Bit Target Compiler" -!define PRODUCT_VERSION "1.2" +!define PRODUCT_VERSION "1.3" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -17,7 +17,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "1.2.0.0" +VIAddVersionKey /LANG=1033 "FileVersion" "1.3.0.0" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" @@ -25,7 +25,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2009 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2009 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "1.2.0.0" +VIProductVersion "1.3.0.0" CRCCheck force SetDatablockOptimize on @@ -109,6 +109,14 @@ SetOutPath "$INSTDIR\amd64" SetOverwrite try File /r Components\amd64\*.* + SetOutPath "$INSTDIR" + SetOverwrite try + File /r Root\options.cmd + IfFileExists "$INSTDIR\RosBE.ps1" 0 +3 + File /r Components\Powershell\options.ps1 + SetOutPath "$INSTDIR\Tools" + SetOverwrite try + File /r Components\Tools\options.exe SectionEnd Section -StartMenuShortcuts SEC02 @@ -125,14 +133,14 @@ IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment 64-bit - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\Tools\options.exe" 0 +2 - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options 64-bit.lnk" "$INSTDIR\Tools\options.exe" "amd64" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options 64-bit.lnk" "$INSTDIR\Tools\options.exe" amd64 SetOutPath $INSTDIR CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE - 64 Bit Target.lnk" \ "$INSTDIR\Uninstall64-${PRODUCT_VERSION}.exe" !insertmacro MUI_STARTMENU_WRITE_END SectionEnd -Section /o "Desktop Shortcuts" SEC04 +Section /o "Desktop Shortcuts" SEC03 SetShellVarContext current ;; @@ -145,7 +153,7 @@ CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" SectionEnd -Section /o "Quick Launch Shortcuts" SEC05 +Section /o "Quick Launch Shortcuts" SEC04 SetShellVarContext current ;;

15 years

← Newer
1
...
29
30
31
32
33
34
35
...
51
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2009