Ros-diffs December 2009

ros-diffs@reactos.org

22 participants
501 discussions

[gschneider] 44569: [reg] Update reg.c to current Wine

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun Dec 13 18:27:13 2009 New Revision: 44569 URL: http://svn.reactos.org/svn/reactos?rev=44569&view=rev Log: [reg] Update reg.c to current Wine Modified: trunk/reactos/base/applications/cmdutils/reg/reg.c Modified: trunk/reactos/base/applications/cmdutils/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] Sun Dec 13 18:27:13 2009 @@ -255,7 +255,8 @@ /* FIXME: Prompt for delete */ } - if (!value_name) + /* Delete subtree only if no /v* option is given */ + if (!value_name && !value_empty && !value_all) { if (RegDeleteTreeW(root,p)!=ERROR_SUCCESS) {

14 years, 10 months

[dgorbachev] 44568: Show respect to Romanian language. (Encoding: UTF-8, with no byte order mark.)

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Dec 13 17:54:23 2009 New Revision: 44568 URL: http://svn.reactos.org/svn/reactos?rev=44568&view=rev Log: Show respect to Romanian language. (Encoding: UTF-8, with no byte order mark.) Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] Sun Dec 13 17:54:23 2009 @@ -245,6 +245,7 @@ IDS_SYS_ENTERTAINMENT "DistracÈie" IDS_CMT_MPLAY32 "Pornire Player Multimedia" IDS_CMT_SNDVOL32 "Pornire Control Volum" + IDS_CMT_SNDREC32 "Launch Sound Recorder" END STRINGTABLE @@ -280,11 +281,12 @@ IDS_SHORT_SERVICE "Gestionar de servicii.lnk" IDS_SHORT_SNAP "CapturÄ de ecran.lnk" IDS_SHORT_SNDVOL32 "Control volum.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" IDS_SHORT_PAINT "Paint.lnk" - IDS_SHORT_SPIDER "Spider Solitaire.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE

14 years, 10 months

[janderwald] 44567: - Create a startmenu entry for sndrec32 - Add resource string for all languages except rumanian (encoding issue)

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Dec 13 17:31:01 2009 New Revision: 44567 URL: http://svn.reactos.org/svn/reactos?rev=44567&view=rev Log: - Create a startmenu entry for sndrec32 - Add resource string for all languages except rumanian (encoding issue) Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/et-EE.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/resource.h Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -799,6 +799,7 @@ { CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_MPLAY32, _T("%SystemRoot%\\system32\\mplay32.exe"), IDS_CMT_MPLAY32, TRUE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNDVOL32, _T("%SystemRoot%\\system32\\sndvol32.exe"), IDS_CMT_SNDVOL32, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNDREC32, _T("%SystemRoot%\\system32\\sndrec32.exe"), IDS_CMT_SNDREC32, TRUE); } /* Create Games subfolder and fill if the exe is available */ Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -248,6 +248,7 @@ IDS_SYS_ENTERTAINMENT "Çàáàâëåíèå" IDS_CMT_MPLAY32 "Ïóñêàíå íà ìóëòèìåäèéíèÿ âúçïðîèçâîäèòåë" IDS_CMT_SNDVOL32 "Ïóñêàíå íà óïðâëåíèåòî íà ñèëàòà íà çâóêà" + IDS_CMT_SNDREC32 "Launch Sound Recorder" END STRINGTABLE @@ -285,6 +286,7 @@ IDS_SHORT_EVENTVIEW "Ïðåãëåä íà ñúáèòèÿ.lnk" IDS_SHORT_MSCONFIG "Íàñòðîéêà íà óðåäáàòà.lnk" IDS_SHORT_SNDVOL32 "Ñèëà íà çâóêà.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_DXDIAG "Ïðåãëåæäàíå íà ÐåàêòÕ.lnk" IDS_SHORT_PAINT "Ðèñóíúê.lnk" IDS_SHORT_SPIDER "Spider Solitaire.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -230,6 +230,7 @@ IDS_SYS_ENTERTAINMENT "Zábava" IDS_CMT_MPLAY32 "Spustit Pøehrávaè multimédií" IDS_CMT_SNDVOL32 "Spustit Ovládání hlasitosti" + IDS_CMT_SNDREC32 "Launch Sound Recorder" END STRINGTABLE @@ -266,6 +267,7 @@ IDS_SHORT_SERVICE "Správce slueb.lnk" IDS_SHORT_SNAP "Sejmout obrazovku.lnk" IDS_SHORT_SNDVOL32 "Ovládání hlasitosti.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -244,6 +244,7 @@ IDS_SYS_ENTERTAINMENT "Entertainment" IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_SNDVOL32 "Launch Volume Control" + IDS_CMT_SNDREC32 "Launch Sound Recorder" END STRINGTABLE @@ -281,6 +282,7 @@ IDS_SHORT_EVENTVIEW "Ereignisanzeige.lnk" IDS_SHORT_MSCONFIG "Systemkonfiguration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" IDS_SHORT_SPIDER "Spider Solitaire.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -245,6 +245,7 @@ IDS_SYS_ENTERTAINMENT "Entertainment" IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_SNDVOL32 "Launch Volume Control" + IDS_CMT_SNDREC32 "Launch Sound Recorder" END STRINGTABLE @@ -282,6 +283,7 @@ IDS_SHORT_EVENTVIEW "ÐñïâïëÞ ÓõìâÜíôùí.lnk" IDS_SHORT_MSCONFIG "Âïçèçôéêü ðñüãñáììá ñýèìéóçò ðáñáìÝôñùí.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" IDS_SHORT_SPIDER "Spider Solitaire.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -244,6 +244,7 @@ IDS_SYS_ENTERTAINMENT "Entertainment" IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_SNDVOL32 "Launch Volume Control" + IDS_CMT_SNDREC32 "Launch Sound Recorder" END STRINGTABLE @@ -279,6 +280,7 @@ IDS_SHORT_SERVICE "Service Manager.lnk" IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -254,6 +254,7 @@ IDS_SYS_ENTERTAINMENT "Entretenimiento" IDS_CMT_MPLAY32 "Ejecutar Reproductor multimedia" IDS_CMT_SNDVOL32 "Ejecutar Control de volumen" + IDS_CMT_SNDREC32 "Launch Sound Recorder" END STRINGTABLE @@ -291,6 +292,7 @@ IDS_SHORT_EVENTVIEW "Visor de sucesos.lnk" IDS_SHORT_MSCONFIG "Configuración del sistema.lnk" IDS_SHORT_SNDVOL32 "Control de volumen.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_DXDIAG "Diagnóstico de ReactX.lnk" IDS_SHORT_PAINT "Paint.lnk" IDS_SHORT_SPIDER "Solitario Spider.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/et… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/et-EE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/et-EE.rc [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -243,6 +243,7 @@ IDS_SYS_ENTERTAINMENT "Meelelahutus" IDS_CMT_MPLAY32 "Ava Meediamängija" IDS_CMT_SNDVOL32 "Ava Helitugevuse Kontroll" + IDS_CMT_SNDREC32 "Launch Sound Recorder" END STRINGTABLE @@ -278,6 +279,7 @@ IDS_SHORT_SERVICE "Service Manager.lnk" IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -244,6 +244,7 @@ IDS_SYS_ENTERTAINMENT "Entertainment" IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_SNDVOL32 "Launch Volume Control" + IDS_CMT_SNDREC32 "Launch Sound Recorder" END STRINGTABLE @@ -281,6 +282,7 @@ IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" IDS_SHORT_SPIDER "Spider Solitaire.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -257,6 +257,8 @@ IDS_SYS_ENTERTAINMENT "Entertainment" IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_SNDVOL32 "Launch Volume Control" + IDS_CMT_SNDREC32 "Launch Sound Recorder" + END STRINGTABLE @@ -294,6 +296,7 @@ IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" IDS_SHORT_SPIDER "Spider Solitaire.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -242,6 +242,8 @@ IDS_SYS_ENTERTAINMENT "Entertainment" IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_SNDVOL32 "Launch Volume Control" + IDS_CMT_SNDREC32 "Launch Sound Recorder" + END STRINGTABLE @@ -279,6 +281,7 @@ IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" IDS_SHORT_SPIDER "Spider Solitaire.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -235,6 +235,7 @@ IDS_SYS_ENTERTAINMENT "Divertimento" IDS_CMT_MPLAY32 "Esegui Multimedia Player" IDS_CMT_SNDVOL32 "Esegui Controllo Volume" + IDS_CMT_SNDREC32 "Launch Sound Recorder" END STRINGTABLE @@ -272,9 +273,10 @@ IDS_SHORT_EVENTVIEW "Visualizzatore Eventi.lnk" IDS_SHORT_MSCONFIG "Configuratione del sistema.lnk" IDS_SHORT_SNDVOL32 "Controllo Volume.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostica.lnk" IDS_SHORT_PAINT "Paint.lnk" - IDS_SHORT_SPIDER "Spider Solitaire.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -244,6 +244,8 @@ IDS_SYS_ENTERTAINMENT "G^[eCg" IDS_CMT_MPLAY32 "}`fBA v[[ðN®µÜ·" IDS_CMT_SNDVOL32 "{[ Rg[ðN®µÜ·" + IDS_CMT_SNDREC32 "Launch Sound Recorder" + END STRINGTABLE @@ -279,6 +281,7 @@ IDS_SHORT_SERVICE "T[rX }l[W.lnk" IDS_SHORT_SNAP "XibvVbg.lnk" IDS_SHORT_SNDVOL32 "{[ Rg[.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_SOLITAIRE "\\eBA.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "[hpbh.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -244,6 +244,8 @@ IDS_SYS_ENTERTAINMENT "Entertainment" IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_SNDVOL32 "Launch Volume Control" + IDS_CMT_SNDREC32 "Launch Sound Recorder" + END STRINGTABLE @@ -281,9 +283,10 @@ IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" - IDS_SHORT_SPIDER "Spider Solitaire.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -247,6 +247,7 @@ IDS_SYS_ENTERTAINMENT "Underholdning" IDS_CMT_MPLAY32 "Start Multimedia avspiller" IDS_CMT_SNDVOL32 "Start Volumkontroll" + IDS_CMT_SNDREC32 "Launch Sound Recorder" END STRINGTABLE @@ -284,6 +285,7 @@ IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" IDS_SHORT_SPIDER "Spider Solitaire.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -237,6 +237,7 @@ IDS_SYS_ENTERTAINMENT "Rozrywka" IDS_CMT_MPLAY32 "Uruchom Odtwarzacz multimedialny" IDS_CMT_SNDVOL32 "Uruchom regulacjê g³onoci" + IDS_CMT_SNDREC32 "Launch Sound Recorder" END STRINGTABLE @@ -289,6 +290,7 @@ IDS_SHORT_EVENTVIEW "Podgl¹d zdarzeñ.lnk" IDS_SHORT_MSCONFIG "Konfiguracja systemowa.lnk" IDS_SHORT_SNDVOL32 "Regulacja g³onoci.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_DXDIAG "Program diagnostyczny ReactX.lnk" IDS_SHORT_PAINT "Paint.lnk" IDS_SHORT_SPIDER "Spider Solitaire.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -226,6 +226,7 @@ IDS_SYS_ENTERTAINMENT "Ðàçâëå÷åíèÿ" IDS_CMT_MPLAY32 "Çàïóñòèòü ïðîèãðûâàòåëü" IDS_CMT_SNDVOL32 "Çàïóñòèòü ðåãóëÿòîð ãðîìêîñòè" + IDS_CMT_SNDREC32 "Launch Sound Recorder" END STRINGTABLE @@ -263,6 +264,7 @@ IDS_SHORT_EVENTVIEW "Ïðîñìîòð ñîáûòèé.lnk" IDS_SHORT_MSCONFIG "Ïàðàìåòðû ñèñòåìû.lnk" IDS_SHORT_SNDVOL32 "Ãðîìêîñòü.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_DXDIAG "Ñðåäñòâî äèàãíîñòèêè ReactX.lnk" IDS_SHORT_PAINT "Paint.lnk" IDS_SHORT_SPIDER "Ïàñüÿíñ Ïàóê.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -230,6 +230,7 @@ IDS_SYS_ENTERTAINMENT "Zábava" //Entertainment IDS_CMT_MPLAY32 "Spusti Multimediálny prehrávaè" IDS_CMT_SNDVOL32 "Spusti Ovládanie hlasitosti" + IDS_CMT_SNDREC32 "Launch Sound Recorder" END STRINGTABLE @@ -267,6 +268,7 @@ IDS_SHORT_EVENTVIEW "Zobrazovaè udalostí.lnk" IDS_SHORT_MSCONFIG "Program na konfiguráciu systému.lnk" IDS_SHORT_SNDVOL32 "Ovládanie hlasitosti.lnk" //Volume Control + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_DXDIAG "Diagnostika ReactX.lnk" IDS_SHORT_PAINT "Skicár.lnk" IDS_SHORT_SPIDER "Pavúèí solitér.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -234,6 +234,7 @@ IDS_SYS_ENTERTAINMENT "Entertainment" IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_SNDVOL32 "Launch Volume Control" + IDS_CMT_SNDREC32 "Launch Sound Recorder" END STRINGTABLE @@ -271,9 +272,10 @@ IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" - IDS_SHORT_SPIDER "Spider Solitaire.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -233,6 +233,7 @@ IDS_SYS_ENTERTAINMENT "Entertainment" IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_SNDVOL32 "Launch Volume Control" + IDS_CMT_SNDREC32 "Launch Sound Recorder" END STRINGTABLE @@ -270,6 +271,7 @@ IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" IDS_SHORT_SPIDER "Spider Solitaire.lnk" Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] Sun Dec 13 17:31:01 2009 @@ -122,6 +122,7 @@ #define IDS_CMT_DXDIAG 3230 #define IDS_CMT_PAINT 3231 #define IDS_CMT_SPIDER 3232 +#define IDS_CMT_SNDREC32 3233 #define IDS_REACTOS_SETUP 3300 #define IDS_UNKNOWN_ERROR 3301 @@ -156,6 +157,7 @@ #define IDS_SHORT_DXDIAG 3420 #define IDS_SHORT_PAINT 3421 #define IDS_SHORT_SPIDER 3422 +#define IDS_SHORT_SNDREC32 3423 #define IDS_WZD_NAME 3450 #define IDS_WZD_SETCOMPUTERNAME 3451

14 years, 10 months

[gschneider] 44566: Alexander Yastrebov <menone7 AT gmail DOT com>: - Simplify and fix error checking in RegQuery/SetEx functions - Add handling for missing termination characters - Fixes one advapi32 winetest See issue #4993 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun Dec 13 17:25:50 2009 New Revision: 44566 URL: http://svn.reactos.org/svn/reactos?rev=44566&view=rev Log: Alexander Yastrebov <menone7 AT gmail DOT com>: - Simplify and fix error checking in RegQuery/SetEx functions - Add handling for missing termination characters - Fixes one advapi32 winetest See issue #4993 for more details. Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sun Dec 13 17:25:50 2009 @@ -3989,10 +3989,11 @@ { UNICODE_STRING ValueName; UNICODE_STRING ValueData; - ANSI_STRING AnsiString; LONG ErrorCode; DWORD Length; DWORD Type; + NTSTATUS Status; + ULONG Index; TRACE("hKey 0x%X lpValueName %s lpData 0x%X lpcbData %d\n", hKey, lpValueName, lpData, lpcbData ? *lpcbData : 0); @@ -4041,16 +4042,23 @@ ErrorCode == ERROR_MORE_DATA) { - if ((Type == REG_SZ) || (Type == REG_MULTI_SZ) || (Type == REG_EXPAND_SZ)) + if (is_string(Type)) { if (ErrorCode == ERROR_SUCCESS && ValueData.Buffer != NULL) { - RtlInitAnsiString(&AnsiString, NULL); - AnsiString.Buffer = (LPSTR)lpData; - AnsiString.MaximumLength = *lpcbData; - ValueData.Length = Length; - ValueData.MaximumLength = ValueData.Length + sizeof(WCHAR); - RtlUnicodeStringToAnsiString(&AnsiString, &ValueData, FALSE); + Status = RtlUnicodeToMultiByteN((PCHAR)lpData, *lpcbData, &Index, (PWCHAR)ValueData.Buffer, Length); + if (NT_SUCCESS(Status)) + { + PCHAR szData = (PCHAR)lpData; + if(&szData[Index] < (PCHAR)(lpData + *lpcbData)) + { + szData[Index] = '\0'; + } + } + else + { + ErrorCode = RtlNtStatusToDosError(Status); + } } Length = Length / sizeof(WCHAR); @@ -4135,7 +4143,7 @@ status = NtQueryValueKey( hkey, &name_str, KeyValuePartialInformation, buffer, total_size, &total_size ); - if (status && status != STATUS_BUFFER_OVERFLOW) goto done; + if (!NT_SUCCESS(status) && status != STATUS_BUFFER_OVERFLOW) goto done; if (data) { @@ -4153,12 +4161,12 @@ buf_ptr, total_size, &total_size ); } - if (!status) + if (NT_SUCCESS(status)) { memcpy( data, buf_ptr + info_size, total_size - info_size ); /* if the type is REG_SZ and data is not 0-terminated * and there is enough space in the buffer NT appends a \0 */ - if (total_size - info_size <= *count-sizeof(WCHAR) && is_string(info->Type)) + if (is_string(info->Type) && total_size - info_size <= *count-sizeof(WCHAR)) { WCHAR *ptr = (WCHAR *)(data + total_size - info_size); if (ptr > (WCHAR *)data && ptr[-1]) *ptr = 0; @@ -4743,12 +4751,16 @@ LONG ErrorCode; LPBYTE pData; DWORD DataSize; - - if (lpValueName != NULL && - strlen(lpValueName) != 0) - { - RtlCreateUnicodeStringFromAsciiz(&ValueName, - (PSTR)lpValueName); + NTSTATUS Status; + + /* Convert SubKey name to Unicode */ + if (lpValueName != NULL && lpValueName[0] != '\0') + { + BOOL bConverted; + bConverted = RtlCreateUnicodeStringFromAsciiz(&ValueName, + (PSTR)lpValueName); + if(!bConverted) + return ERROR_NOT_ENOUGH_MEMORY; } else { @@ -4757,32 +4769,32 @@ pValueName = (LPWSTR)ValueName.Buffer; - if (((dwType == REG_SZ) || - (dwType == REG_MULTI_SZ) || - (dwType == REG_EXPAND_SZ)) && - (cbData != 0)) - { - /* NT adds one if the caller forgot the NULL-termination character */ - if (lpData[cbData - 1] != '\0') - { - cbData++; - } - - RtlInitAnsiString(&AnsiString, - NULL); + + if (is_string(dwType) && (cbData != 0)) + { + /* Convert ANSI string Data to Unicode */ + /* If last character NOT zero then increment length */ + LONG bNoNulledStr = ((lpData[cbData-1] != '\0') ? 1 : 0); AnsiString.Buffer = (PSTR)lpData; - AnsiString.Length = cbData - 1; - AnsiString.MaximumLength = cbData; - RtlAnsiStringToUnicodeString(&Data, + AnsiString.Length = cbData + bNoNulledStr; + AnsiString.MaximumLength = cbData + bNoNulledStr; + Status = RtlAnsiStringToUnicodeString(&Data, &AnsiString, TRUE); + + if (!NT_SUCCESS(Status)) + { + if (pValueName != NULL) + RtlFreeUnicodeString(&ValueName); + + return RtlNtStatusToDosError(Status); + } pData = (LPBYTE)Data.Buffer; DataSize = cbData * sizeof(WCHAR); } else { - RtlInitUnicodeString(&Data, - NULL); + Data.Buffer = NULL; pData = (LPBYTE)lpData; DataSize = cbData; } @@ -4793,19 +4805,12 @@ dwType, pData, DataSize); + if (pValueName != NULL) - { - RtlFreeHeap(ProcessHeap, - 0, - ValueName.Buffer); - } + RtlFreeUnicodeString(&ValueName); if (Data.Buffer != NULL) - { - RtlFreeHeap(ProcessHeap, - 0, - Data.Buffer); - } + RtlFreeUnicodeString(&Data); return ErrorCode; } @@ -4847,13 +4852,16 @@ } pValueName = &ValueName; - if (((dwType == REG_SZ) || - (dwType == REG_MULTI_SZ) || - (dwType == REG_EXPAND_SZ)) && - (cbData != 0) && (*(((PWCHAR)lpData) + (cbData / sizeof(WCHAR)) - 1) != L'\0')) - { - /* NT adds one if the caller forgot the NULL-termination character */ - cbData += sizeof(WCHAR); + if (is_string(dwType) && (cbData != 0)) + { + PWSTR pwsData = (PWSTR)lpData; + + if((pwsData[cbData / sizeof(WCHAR) - 1] != L'\0') && + (pwsData[cbData / sizeof(WCHAR)] == L'\0')) + { + /* Increment length if last character is not zero and next is zero */ + cbData += sizeof(WCHAR); + } } Status = NtSetValueKey(KeyHandle,

14 years, 10 months

[cgutman] 44565: - Use RouteGetRouteToDestination instead of FindOnLinkInterface so we can get an interface for remote addresses

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Dec 13 17:22:17 2009 New Revision: 44565 URL: http://svn.reactos.org/svn/reactos?rev=44565&view=rev Log: - Use RouteGetRouteToDestination instead of FindOnLinkInterface so we can get an interface for remote addresses Modified: branches/aicom-network-branch/lib/drivers/ip/transport/tcp/if.c Modified: branches/aicom-network-branch/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] Sun Dec 13 17:22:17 2009 @@ -74,7 +74,7 @@ OSK_UINT FindType, OSK_SOCKADDR *ReqAddr, OSK_IFADDR *Interface ) { - PIP_INTERFACE IF; + PNEIGHBOR_CACHE_ENTRY NCE; IP_ADDRESS Destination; struct sockaddr_in *addr_in = (struct sockaddr_in *)ReqAddr; POSK_IFADDR InterfaceData; @@ -91,10 +91,10 @@ TI_DbgPrint(DEBUG_TCPIF,("Address is %x\n", addr_in->sin_addr.s_addr)); - IF = FindOnLinkInterface(&Destination); - if (!IF) return NULL; + NCE = RouteGetRouteToDestination(&Destination); + if (!NCE) return NULL; - InterfaceData = TCPGetInterfaceData(IF); + InterfaceData = TCPGetInterfaceData(NCE->Interface); addr_in = (struct sockaddr_in *) InterfaceData->ifa_addr;

14 years, 10 months

[janderwald] 44564: - Add sndrec32 to bootcd 1/2

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Dec 13 17:09:14 2009 New Revision: 44564 URL: http://svn.reactos.org/svn/reactos?rev=44564&view=rev Log: - Add sndrec32 to bootcd 1/2 Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Dec 13 17:09:14 2009 @@ -81,6 +81,7 @@ base\applications\screensavers\logon\logon.scr 1 base\applications\mscutils\servman\servman.exe 1 base\applications\shutdown\shutdown.exe 1 +base\applications\sndrec32\sndrec32.exe 1 base\applications\sndvol32\sndvol32.exe 1 base\applications\taskmgr\taskmgr.exe 1 base\applications\winhlp32\winhlp32.exe 4

14 years, 10 months

[janderwald] 44563: [REG] - Fix a memory leak and bug in the deletion routine. If the buffer value_name was had been smaller than the longest key, then deletion of all values would have failed. - Fixed by Amine Khaldi [XCOPY] - Remove unnecessary assignment - By Amine Khaldi

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Dec 13 17:05:15 2009 New Revision: 44563 URL: http://svn.reactos.org/svn/reactos?rev=44563&view=rev Log: [REG] - Fix a memory leak and bug in the deletion routine. If the buffer value_name was had been smaller than the longest key, then deletion of all values would have failed. - Fixed by Amine Khaldi [XCOPY] - Remove unnecessary assignment - By Amine Khaldi Modified: trunk/reactos/base/applications/cmdutils/reg/reg.c trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c Modified: trunk/reactos/base/applications/cmdutils/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] Sun Dec 13 17:05:15 2009 @@ -295,20 +295,24 @@ return 1; } maxValue++; + szValue = HeapAlloc(GetProcessHeap(),0,maxValue*sizeof(WCHAR)); + if (!szValue) return 1; while (1) { count = maxValue; - rc = RegEnumValueW(subkey, 0, value_name, &count, NULL, NULL, NULL, NULL); + rc = RegEnumValueW(subkey, 0, szValue, &count, NULL, NULL, NULL, NULL); if (rc == ERROR_SUCCESS) { - rc = RegDeleteValueW(subkey,value_name); + rc = RegDeleteValueW(subkey,szValue); if (rc != ERROR_SUCCESS) break; } else break; } + + HeapFree(GetProcessHeap(), 0, szValue); if (rc != ERROR_SUCCESS) { /* FIXME delete failed */ Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] Sun Dec 13 17:05:15 2009 @@ -261,10 +261,10 @@ WINE_TRACE("Destination : '%s'\n", wine_dbgstr_w(supplieddestination)); /* Extract required information from source specification */ - rc = XCOPY_ProcessSourceParm(suppliedsource, sourcestem, sourcespec, flags); + XCOPY_ProcessSourceParm(suppliedsource, sourcestem, sourcespec, flags); /* Extract required information from destination specification */ - rc = XCOPY_ProcessDestParm(supplieddestination, destinationstem, + XCOPY_ProcessDestParm(supplieddestination, destinationstem, destinationspec, sourcespec, flags); /* Trace out the resulting information */

14 years, 10 months

[janderwald] 44562: [WDMAUD.DRV] - Integrate mmixer library into wdmaud.drv - Library is not yet used

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Dec 13 16:36:19 2009 New Revision: 44562 URL: http://svn.reactos.org/svn/reactos?rev=44562&view=rev Log: [WDMAUD.DRV] - Integrate mmixer library into wdmaud.drv - Library is not yet used Added: trunk/reactos/dll/win32/wdmaud.drv/mmixer.c (with props) trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h (with props) Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild Added: trunk/reactos/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/mmixe… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/mmixer.c (added) +++ trunk/reactos/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] Sun Dec 13 16:36:19 2009 @@ -1,0 +1,329 @@ +/* + * PROJECT: ReactOS Sound System + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/wdmaud.drv/mmixer.c + * + * PURPOSE: WDM Audio Mixer API (User-mode part) + * PROGRAMMERS: Johannes Anderwald + */ + +#include "wdmaud.h" + + +PVOID Alloc(ULONG NumBytes); +MIXER_STATUS Close(HANDLE hDevice); +VOID Free(PVOID Block); +VOID Copy(PVOID Src, PVOID Dst, ULONG NumBytes); +MIXER_STATUS Open(IN LPWSTR DevicePath, OUT PHANDLE hDevice); +MIXER_STATUS Control(IN HANDLE hMixer, IN ULONG dwIoControlCode, IN PVOID lpInBuffer, IN ULONG nInBufferSize, OUT PVOID lpOutBuffer, ULONG nOutBufferSize, PULONG lpBytesReturned); +MIXER_STATUS Enum(IN PVOID EnumContext, IN ULONG DeviceIndex, OUT LPWSTR * DeviceName, OUT PHANDLE OutHandle); + +MIXER_CONTEXT MixerContext = +{ + sizeof(MIXER_CONTEXT), + NULL, + Alloc, + Control, + Free, + Open, + Close, + Copy +}; + +GUID CategoryGuid = {STATIC_KSCATEGORY_AUDIO}; + +PVOID Alloc(ULONG NumBytes) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, NumBytes); +} + +MIXER_STATUS +Close(HANDLE hDevice) +{ + if (CloseHandle(hDevice)) + return MM_STATUS_SUCCESS; + else + return MM_STATUS_UNSUCCESSFUL; +} + +VOID +Free(PVOID Block) +{ + HeapFree(GetProcessHeap(), 0, Block); +} + +VOID +Copy(PVOID Src, PVOID Dst, ULONG NumBytes) +{ + CopyMemory(Src, Dst, NumBytes); +} + +MIXER_STATUS +Open( + IN LPWSTR DevicePath, + OUT PHANDLE hDevice) +{ + DevicePath[1] = L'\\'; + *hDevice = CreateFileW(DevicePath, + GENERIC_READ | GENERIC_WRITE, + 0, + NULL, + OPEN_EXISTING, + FILE_FLAG_OVERLAPPED, + NULL); + if (*hDevice == INVALID_HANDLE_VALUE) + { + return MM_STATUS_UNSUCCESSFUL; + } + + return MM_STATUS_SUCCESS; +} + +MIXER_STATUS +Control( + IN HANDLE hMixer, + IN ULONG dwIoControlCode, + IN PVOID lpInBuffer, + IN ULONG nInBufferSize, + OUT PVOID lpOutBuffer, + ULONG nOutBufferSize, + PULONG lpBytesReturned) +{ + OVERLAPPED Overlapped; + BOOLEAN IoResult; + DWORD Transferred = 0; + + /* Overlapped I/O is done here - this is used for waiting for completion */ + ZeroMemory(&Overlapped, sizeof(OVERLAPPED)); + Overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + + if ( ! Overlapped.hEvent ) + return MM_STATUS_NO_MEMORY; + + /* Talk to the device */ + IoResult = DeviceIoControl(hMixer, + dwIoControlCode, + lpInBuffer, + nInBufferSize, + lpOutBuffer, + nOutBufferSize, + &Transferred, + &Overlapped); + + /* If failure occurs, make sure it's not just due to the overlapped I/O */ + if ( ! IoResult ) + { + if ( GetLastError() != ERROR_IO_PENDING ) + { + CloseHandle(Overlapped.hEvent); + + if (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + if ( lpBytesReturned ) + *lpBytesReturned = Transferred; + return MM_STATUS_MORE_ENTRIES; + } + + return MM_STATUS_UNSUCCESSFUL; + } + } + + /* Wait for the I/O to complete */ + IoResult = GetOverlappedResult(hMixer, + &Overlapped, + &Transferred, + TRUE); + + /* Don't need this any more */ + CloseHandle(Overlapped.hEvent); + + if ( ! IoResult ) + return MM_STATUS_UNSUCCESSFUL; + + if ( lpBytesReturned ) + *lpBytesReturned = Transferred; + + return MM_STATUS_SUCCESS; +} + +MIXER_STATUS +Enum( + IN PVOID EnumContext, + IN ULONG DeviceIndex, + OUT LPWSTR * DeviceName, + OUT PHANDLE OutHandle) +{ + SP_DEVICE_INTERFACE_DATA InterfaceData; + SP_DEVINFO_DATA DeviceData; + PSP_DEVICE_INTERFACE_DETAIL_DATA_W DetailData; + BOOL Result; + DWORD Length; + + //printf("Enum EnumContext %p DeviceIndex %lu OutHandle %p\n", EnumContext, DeviceIndex, OutHandle); + + InterfaceData.cbSize = sizeof(InterfaceData); + InterfaceData.Reserved = 0; + + Result = SetupDiEnumDeviceInterfaces(EnumContext, + NULL, + &CategoryGuid, + DeviceIndex, + &InterfaceData); + + if (!Result) + { + if (GetLastError() == ERROR_NO_MORE_ITEMS) + { + return MM_STATUS_NO_MORE_DEVICES; + } + return MM_STATUS_UNSUCCESSFUL; + } + + Length = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR); + DetailData = (PSP_DEVICE_INTERFACE_DETAIL_DATA_W)HeapAlloc(GetProcessHeap(), + 0, + Length); + DetailData->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); + DeviceData.cbSize = sizeof(DeviceData); + DeviceData.Reserved = 0; + + Result = SetupDiGetDeviceInterfaceDetailW(EnumContext, + &InterfaceData, + DetailData, + Length, + NULL, + &DeviceData); + + if (!Result) + { + return MM_STATUS_UNSUCCESSFUL; + } + + // copy path + *DeviceName = (LPWSTR)&DetailData->DevicePath[0]; + return Open(DetailData->DevicePath, OutHandle); +} + +BOOL +WdmAudInitUserModeMixer() +{ + HDEVINFO DeviceHandle; + MIXER_STATUS Status; + + /* create a device list */ + DeviceHandle = SetupDiGetClassDevs(&CategoryGuid, + NULL, + NULL, + DIGCF_DEVICEINTERFACE|DIGCF_PRESENT); + + if (DeviceHandle == INVALID_HANDLE_VALUE) + { + /* failed to create a device list */ + return FALSE; + } + + + /* initialize the mixer library */ + Status = MMixerInitialize(&MixerContext, Enum, (PVOID)DeviceHandle); + + /* free device list */ + SetupDiDestroyDeviceInfoList(DeviceHandle); + + if (Status != MM_STATUS_SUCCESS) + { + /* failed to initialize mixer library */ + DPRINT1("Failed to initialize mixer library with %x\n", Status); + return FALSE; + } + + /* completed successfully */ + return TRUE; +} + +ULONG +WdmAudGetMixerCount() +{ + /* return number of mixers available */ + return MMixerGetCount(&MixerContext); +} + +MMRESULT +WdmAudGetMixerCapabilties( + IN ULONG DeviceId, + LPMIXERCAPSW Capabilities) +{ + if (MMixerGetCapabilities(&MixerContext, DeviceId, Capabilities) == MM_STATUS_SUCCESS) + return MMSYSERR_NOERROR; + + return MMSYSERR_BADDEVICEID; +} + +MMRESULT +WdmAudCloseMixer( + IN HMIXER Handle, + IN HANDLE hNotifyEvent) +{ + /* FIXME */ + return MMSYSERR_NOERROR; +} + +MMRESULT +WdmAudOpenMixer( + IN PHANDLE hMixer, + IN ULONG DeviceId, + IN HANDLE hNotifyEvent) +{ + if (MMixerOpen(&MixerContext, DeviceId, hNotifyEvent, NULL /* FIXME */, hMixer) == MM_STATUS_SUCCESS) + return MMSYSERR_NOERROR; + + return MMSYSERR_BADDEVICEID; +} + +MMRESULT +WdmAudGetLineInfo( + IN HANDLE hMixer, + IN LPMIXERLINE MixLine, + IN ULONG Flags) +{ + if (MMixerGetLineInfo(&MixerContext, hMixer, Flags, MixLine) == MM_STATUS_SUCCESS) + return MMSYSERR_NOERROR; + + return MMSYSERR_ERROR; +} + +MMRESULT +WdmAudGetLineControls( + IN HANDLE hMixer, + IN LPMIXERLINECONTROLSW MixControls, + IN ULONG Flags) +{ + if (MMixerGetLineControls(&MixerContext, hMixer, Flags, MixControls) == MM_STATUS_SUCCESS) + return MMSYSERR_NOERROR; + + return MMSYSERR_ERROR; +} + +MMRESULT +WdmAudSetControlDetails( + IN HANDLE hMixer, + IN LPMIXERCONTROLDETAILS MixDetails, + IN ULONG Flags) +{ + if (MMixerSetControlDetails(&MixerContext, hMixer, Flags, MixDetails) == MM_STATUS_SUCCESS) + return MMSYSERR_NOERROR; + + return MMSYSERR_ERROR; + +} + +MMRESULT +WdmAudGetControlDetails( + IN HANDLE hMixer, + IN LPMIXERCONTROLDETAILS MixDetails, + IN ULONG Flags) +{ + if (MMixerGetControlDetails(&MixerContext, hMixer, Flags, MixDetails) == MM_STATUS_SUCCESS) + return MMSYSERR_NOERROR; + + return MMSYSERR_ERROR; +} Propchange: trunk/reactos/dll/win32/wdmaud.drv/mmixer.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Sun Dec 13 16:36:19 2009 @@ -12,15 +12,8 @@ * */ -#include <windows.h> -#include <ntddsnd.h> -#include <sndtypes.h> -#include <mmddk.h> -#include <mmebuddy.h> - -#include <ks.h> -#include <ksmedia.h> -#include "interface.h" +#include "wdmaud.h" + #define KERNEL_DEVICE_NAME L"\\\\.\\wdmaud" @@ -28,6 +21,7 @@ PWSTR UnknownWaveOut = L"Wave Output"; PWSTR UnknownMidiIn = L"Midi Input"; PWSTR UnknownMidiOut = L"Midi Output"; + HANDLE KernelHandle = INVALID_HANDLE_VALUE; DWORD OpenCount = 0; @@ -48,6 +42,12 @@ IN MMDEVICE_TYPE DeviceType, OUT DWORD* DeviceCount) { +#ifdef USE_MMIXER_LIB + + *DeviceCount = WdmAudGetMixerCount(); + return MMSYSERR_NOERROR; +#else + MMRESULT Result; WDMAUD_DEVICE_INFO DeviceInfo; @@ -76,6 +76,7 @@ *DeviceCount = DeviceInfo.DeviceCount; return MMSYSERR_NOERROR; +#endif } MMRESULT @@ -101,6 +102,14 @@ return Result; SND_TRACE(L"WDMAUD - GetWdmDeviceCapabilities DeviceType %u DeviceId %u\n", DeviceType, DeviceId); + +#ifdef USE_MMIXER_LIB + if (DeviceType == MIXER_DEVICE_TYPE) + { + return WdmAudGetMixerCapabilties(DeviceId, (LPMIXERCAPSW)Capabilities); + } +#endif + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); DeviceInfo.DeviceType = DeviceType; @@ -250,6 +259,12 @@ sizeof(WDMAUD_DEVICE_INFO), NULL); } +#ifdef USE_MMIXER_LIB + if (DeviceType == MIXER_DEVICE_TYPE) + { + return WdmAudCloseMixer(SoundDeviceInstance->Handle, SoundDeviceInstance->hNotifyEvent); + } +#endif SyncOverlappedDeviceIoControl(KernelHandle, IOCTL_CLOSE_WDMAUD, @@ -360,15 +375,20 @@ WDMAUD_DEVICE_INFO DeviceInfo; HANDLE hThread; - if (Instance->Handle != KernelHandle) - { - /* device is already open */ - return MMSYSERR_NOERROR; - } Instance->hNotifyEvent = CreateEventW(NULL, FALSE, FALSE, NULL); if ( ! Instance->hNotifyEvent ) return MMSYSERR_NOMEM; + +#ifdef USE_MMIXER_LIB + return WdmAudOpenMixer(&Instance->Handle, DeviceId, Instance->hNotifyEvent); +#endif + + if (Instance->Handle != KernelHandle) + { + /* device is already open */ + return MMSYSERR_NOERROR; + } Instance->hStopEvent = CreateEventW(NULL, FALSE, FALSE, NULL); if ( ! Instance->hStopEvent ) @@ -807,6 +827,26 @@ MixControls = (LPMIXERLINECONTROLSW)Parameter; MixDetails = (LPMIXERCONTROLDETAILS)Parameter; +#ifdef USE_MMIXER_LIB + switch(uMsg) + { + case MXDM_GETLINEINFO: + return WdmAudGetLineInfo(SoundDeviceInstance->Handle, MixLine, Flags); + case MXDM_GETLINECONTROLS: + return WdmAudGetLineControls(SoundDeviceInstance->Handle, MixControls, Flags); + case MXDM_SETCONTROLDETAILS: + return WdmAudSetControlDetails(SoundDeviceInstance->Handle, MixDetails, Flags); + break; + case MXDM_GETCONTROLDETAILS: + return WdmAudGetControlDetails(SoundDeviceInstance->Handle, MixDetails, Flags); + break; + default: + SND_ASSERT(0); + return MMSYSERR_NOTSUPPORTED; + } +#endif + + switch(uMsg) { case MXDM_GETLINEINFO: @@ -1040,6 +1080,9 @@ switch ( fdwReason ) { case DLL_PROCESS_ATTACH : +#ifdef USE_MMIXER_LIB + WdmAudInitUserModeMixer(); +#endif SND_TRACE(L"WDMAUD.DRV - Process attached\n"); break; case DLL_PROCESS_DETACH : Added: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h (added) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] Sun Dec 13 16:36:19 2009 @@ -1,0 +1,63 @@ +#ifndef WDMAUD_H__ +#define WDMAUD_H__ + +#include <windows.h> +#include <ntddsnd.h> +#include <sndtypes.h> +#include <setupapi.h> +#include <mmddk.h> +#include <mmebuddy.h> + +#include <ks.h> +#include <ksmedia.h> +#include "interface.h" +#include "mmixer.h" +#include <debug.h> + +BOOL +WdmAudInitUserModeMixer(); + +ULONG +WdmAudGetMixerCount(); + +MMRESULT +WdmAudGetMixerCapabilties( + IN ULONG DeviceId, + LPMIXERCAPSW Capabilities); + +MMRESULT +WdmAudCloseMixer( + IN HMIXER Handle, + IN HANDLE hNotifyEvent); + +MMRESULT +WdmAudOpenMixer( + IN PHANDLE hMixer, + IN ULONG DeviceId, + IN HANDLE hNotifyEvent); + +MMRESULT +WdmAudGetLineInfo( + IN HANDLE hMixer, + IN LPMIXERLINE MixLine, + IN ULONG Flags); + +MMRESULT +WdmAudGetLineControls( + IN HANDLE hMixer, + IN LPMIXERLINECONTROLSW MixControls, + IN ULONG Flags); + +MMRESULT +WdmAudSetControlDetails( + IN HANDLE hMixer, + IN LPMIXERCONTROLDETAILS MixDetails, + IN ULONG Flags); + +MMRESULT +WdmAudGetControlDetails( + IN HANDLE hMixer, + IN LPMIXERCONTROLDETAILS MixDetails, + IN ULONG Flags); + +#endif Propchange: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild [iso-8859-1] Sun Dec 13 16:36:19 2009 @@ -3,6 +3,7 @@ <include base="wdmaud.drv">.</include> <include base="ReactOS">include/reactos/libs/sound</include> <include base="wdmaud_kernel">.</include> + <include base="mmixer">.</include> <include base="libsamplerate">.</include> <define name="NDEBUG">1</define>  @@ -13,7 +14,10 @@ <library>advapi32</library> <library>libsamplerate</library> <library>msvcrt</library> + <library>mmixer</library> + <library>setupapi</library> <file>wdmaud.c</file> <file>mixer.c</file> + <file>mmixer.c</file> <file>wdmaud.rc</file> </module>

14 years, 10 months

[jimtabor] 44561: [Win32k] - Class.c: Restore module address from cloned class if it is a default user class. See bug 4778 - Remove unneeded debug prints. - Tested: wine user32 class test, AbiWord 2.6.8, FF 3.5 and OOo 2.4.3.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Dec 13 14:14:45 2009 New Revision: 44561 URL: http://svn.reactos.org/svn/reactos?rev=44561&view=rev Log: [Win32k] - Class.c: Restore module address from cloned class if it is a default user class. See bug 4778 - Remove unneeded debug prints. - Tested: wine user32 class test, AbiWord 2.6.8, FF 3.5 and OOo 2.4.3. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Sun Dec 13 14:14:45 2009 @@ -508,10 +508,18 @@ if (Class != NULL) { /* simply clone the class */ - RtlCopyMemory(Class, - BaseClass, - ClassSize); + RtlCopyMemory( Class, BaseClass, ClassSize); + DPRINT("Clone Class 0x%x hM 0x%x\n %S\n",Class, Class->hModule, Class->lpszClientUnicodeMenuName); + + /* restore module address if default user class Ref: Bug 4778 */ + if ( Class->hModule != hModClient && + Class->fnid <= FNID_GHOST && + Class->fnid >= FNID_BUTTON ) + { + Class->hModule = hModClient; + DPRINT("Clone Class 0x%x Reset hM 0x%x\n",Class, Class->hModule); + } /* update some pointers and link the class */ Class->rpdeskParent = Desktop; @@ -1231,7 +1239,7 @@ if (Class != NULL && !Class->Global) { // local class already exists - DPRINT1("Local Class 0x%p does already exist!\n", ClassAtom); + DPRINT("Local Class 0x%p does already exist!\n", ClassAtom); SetLastWin32Error(ERROR_CLASS_ALREADY_EXISTS); return (RTL_ATOM)0; } @@ -1245,7 +1253,7 @@ if (Class != NULL && Class->Global) { - DPRINT1("Global Class 0x%p does already exist!\n", ClassAtom); + DPRINT("Global Class 0x%p does already exist!\n", ClassAtom); SetLastWin32Error(ERROR_CLASS_ALREADY_EXISTS); return (RTL_ATOM)0; } @@ -1306,7 +1314,7 @@ &Link); if (ClassAtom == (RTL_ATOM)0) { - DPRINT1("UserUnregisterClass: No Class found.\n"); + DPRINT("UserUnregisterClass: No Class found.\n"); return FALSE; } @@ -2120,12 +2128,12 @@ SetLastNtError(_SEH2_GetExceptionCode()); } _SEH2_END; - +/* if (!Ret) { DPRINT1("NtUserRegisterClassExWOW Null Return!\n"); } - + */ UserLeave(); return Ret;

14 years, 10 months

[janderwald] 44560: - Add mmixer to build

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Dec 13 12:33:23 2009 New Revision: 44560 URL: http://svn.reactos.org/svn/reactos?rev=44560&view=rev Log: - Add mmixer to build Modified: trunk/reactos/lib/drivers/sound/sound.rbuild Modified: trunk/reactos/lib/drivers/sound/sound.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/sound.rb… ============================================================================== --- trunk/reactos/lib/drivers/sound/sound.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/sound.rbuild [iso-8859-1] Sun Dec 13 12:33:23 2009 @@ -13,6 +13,9 @@ <directory name="uartmidi"> <xi:include href="uartmidi/uartmidi.rbuild" /> </directory> + <directory name="mmixer"> + <xi:include href="mmixer/mmixer.rbuild" /> + </directory> <directory name="mmebuddy"> <xi:include href="mmebuddy/mmebuddy.rbuild" /> </directory>

14 years, 10 months

← Newer
1
...
25
26
27
28
29
30
31
...
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