Ros-diffs December 2009

ros-diffs@reactos.org

22 participants
501 discussions

[gedmurphy] 44489: Missed resource cleanup. I'm clearly out of practice
by gedmurphy＠svn.reactos.org 09 Dec '09

09 Dec '09

Author: gedmurphy Date: Wed Dec 9 17:44:10 2009 New Revision: 44489 URL: http://svn.reactos.org/svn/reactos?rev=44489&view=rev Log: Missed resource cleanup. I'm clearly out of practice Modified: trunk/reactos/dll/cpl/sysdm/advanced.c Modified: trunk/reactos/dll/cpl/sysdm/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/advanced.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/advanced.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/advanced.c [iso-8859-1] Wed Dec 9 17:44:10 2009 @@ -42,6 +42,8 @@ REG_DWORD, (LPBYTE)&ReportAsWorkstation, sizeof(DWORD)); + + RegCloseKey(hKey); } } @@ -76,9 +78,9 @@ 0); } } + + RegCloseKey(hKey); } - - } INT_PTR CALLBACK

1 0

[gedmurphy] 44488: - Add the version dialog to the remaining lang resources
by gedmurphy＠svn.reactos.org 09 Dec '09

09 Dec '09

Author: gedmurphy Date: Wed Dec 9 17:38:30 2009 New Revision: 44488 URL: http://svn.reactos.org/svn/reactos?rev=44488&view=rev Log: - Add the version dialog to the remaining lang resources Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] Wed Dec 9 17:38:30 2009 @@ -65,6 +65,17 @@ PUSHBUTTON "Ïðîìåíëèâè íà ñðåäàòà", IDC_ENVVAR, 64, 192, 90, 15 PUSHBUTTON "Äîêëàäâàíå íà ãðåøêè", IDC_ERRORREPORT, 160, 192, 90, 15 +END + +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "System Settings" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 + PUSHBUTTON "OK",IDOK,166,63,50,14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] Wed Dec 9 17:38:30 2009 @@ -46,6 +46,17 @@ ICON IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON LTEXT "Hardwarové profily dovolují nastavení a uloení rùzných hardwarových konfigurací.", IDC_STATIC, 42, 160, 204, 24 PUSHBUTTON "Hard&warové profily...", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 +END + +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "System Settings" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 + PUSHBUTTON "OK",IDOK,166,63,50,14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Wed Dec 9 17:38:30 2009 @@ -49,6 +49,17 @@ ICON IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON LTEXT "Mit Hardware-Profilen können Sie mehrere verschiedene Hardware-Konfigurationen einrichten und speichern.", IDC_STATIC, 42, 160, 204, 24 PUSHBUTTON "Hard&ware-Profile...", IDC_HARDWARE_PROFILE, 154, 190, 90, 14 +END + +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "System Settings" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 + PUSHBUTTON "OK",IDOK,166,63,50,14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] Wed Dec 9 17:38:30 2009 @@ -43,6 +43,16 @@ PUSHBUTTON "&Ðñïößë õëéêïý...", IDC_HARDWARE_PROFILE, 148, 190, 98, 15 END +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "System Settings" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 + PUSHBUTTON "OK",IDOK,166,63,50,14 +END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] Wed Dec 9 17:38:30 2009 @@ -48,6 +48,16 @@ PUSHBUTTON "Perfiles Hard&ware...", IDC_HARDWARE_PROFILE, 138, 190, 106, 15 END +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "System Settings" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 + PUSHBUTTON "OK",IDOK,166,63,50,14 +END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] Wed Dec 9 17:38:30 2009 @@ -46,6 +46,16 @@ PUSHBUTTON "&Profils Matériels...", IDC_HARDWARE_PROFILE, 135, 190, 110, 14 END +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "System Settings" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 + PUSHBUTTON "OK",IDOK,166,63,50,14 +END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] Wed Dec 9 17:38:30 2009 @@ -43,6 +43,16 @@ PUSHBUTTON "Profil Hard&ware...", IDC_HARDWARE_PROFILE, 154, 190, 90, 14 END +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "System Settings" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 + PUSHBUTTON "OK",IDOK,166,63,50,14 +END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Wed Dec 9 17:38:30 2009 @@ -43,6 +43,16 @@ PUSHBUTTON "&Profili Hardware...", IDC_HARDWARE_PROFILE, 154, 190, 90, 14 END +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "System Settings" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 + PUSHBUTTON "OK",IDOK,166,63,50,14 +END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] Wed Dec 9 17:38:30 2009 @@ -43,6 +43,16 @@ PUSHBUTTON "n[hEFA vt@C(&W)...", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 END +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "System Settings" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 + PUSHBUTTON "OK",IDOK,166,63,50,14 +END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/no-NO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] Wed Dec 9 17:38:30 2009 @@ -44,6 +44,16 @@ PUSHBUTTON "Maskin&vare profiler...", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 END +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "System Settings" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 + PUSHBUTTON "OK",IDOK,166,63,50,14 +END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Wed Dec 9 17:38:30 2009 @@ -45,6 +45,16 @@ PUSHBUTTON "&Profile hardware", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 END +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "System Settings" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 + PUSHBUTTON "OK",IDOK,166,63,50,14 +END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Wed Dec 9 17:38:30 2009 @@ -43,6 +43,16 @@ PUSHBUTTON "&Ïðîôèëè îáîðóäîâàíèÿ...", IDC_HARDWARE_PROFILE, 144, 190, 100, 14 END +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "System Settings" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 + PUSHBUTTON "OK",IDOK,166,63,50,14 +END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] Wed Dec 9 17:38:30 2009 @@ -51,6 +51,16 @@ PUSHBUTTON "&Hardvérové profily...", IDC_HARDWARE_PROFILE, 130, 190, 110, 14 END +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "System Settings" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 + PUSHBUTTON "OK",IDOK,166,63,50,14 +END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sv-SE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] Wed Dec 9 17:38:30 2009 @@ -45,6 +45,16 @@ PUSHBUTTON "&Hårdvaruprofiler...", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 END +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "System Settings" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 + PUSHBUTTON "OK",IDOK,166,63,50,14 +END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] Wed Dec 9 17:38:30 2009 @@ -51,6 +51,16 @@ PUSHBUTTON "&Ïðîô³ë³ óñòàòêóâàííÿ...", IDC_HARDWARE_PROFILE, 154, 190, 90, 14 END +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "System Settings" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 + PUSHBUTTON "OK",IDOK,166,63,50,14 +END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] Wed Dec 9 17:38:30 2009 @@ -71,6 +71,16 @@ PUSHBUTTON "´íÎó±¨¸æ", IDC_ERRORREPORT, 170, 192, 80, 15 END +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "System Settings" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 + PUSHBUTTON "OK",IDOK,166,63,50,14 +END IDD_HARDWAREPROFILES DIALOGEX 6, 18, 254, 234 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

1 0

[gedmurphy] 44487: [SYSDM] - Add a setting to the system control panel applet which allows users to force reactos to report as a workstation. - This is a usermode change only, it will not alter the kernel nor anything calling kernel apis (e.g. RtlGetVersion) - This change should allow applications which don't allow installation on non-workstation version to install. See issue #5003 for more details.
by gedmurphy＠svn.reactos.org 09 Dec '09

09 Dec '09

Author: gedmurphy Date: Wed Dec 9 17:34:05 2009 New Revision: 44487 URL: http://svn.reactos.org/svn/reactos?rev=44487&view=rev Log: [SYSDM] - Add a setting to the system control panel applet which allows users to force reactos to report as a workstation. - This is a usermode change only, it will not alter the kernel nor anything calling kernel apis (e.g. RtlGetVersion) - This change should allow applications which don't allow installation on non-workstation version to install. See issue #5003 for more details. Modified: trunk/reactos/dll/cpl/sysdm/advanced.c trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/resource.h Modified: trunk/reactos/dll/cpl/sysdm/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/advanced.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/advanced.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/advanced.c [iso-8859-1] Wed Dec 9 17:34:05 2009 @@ -4,13 +4,111 @@ * FILE: dll/cpl/sysdm/advanced.c * PURPOSE: Memory, start-up and profiles settings * COPYRIGHT: Copyright Thomas Weidenmueller <w3seek(a)reactos.org> - Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> + Copyright 2006 - 2009 Ged Murphy <gedmurphy(a)reactos.org> * */ #include "precomp.h" static TCHAR BugLink[] = _T("http://www.reactos.org/bugzilla"); +static TCHAR ReportAsWorkstationKey[] = _T("SYSTEM\\CurrentControlSet\\Control\\ReactOS\\Settings\\Version"); + + +static VOID +OnOK(HWND hwndDlg) +{ + HKEY hKey; + DWORD ReportAsWorkstation; + + ReportAsWorkstation = (SendDlgItemMessageW(hwndDlg, + IDC_REPORTASWORKSTATION, + BM_GETCHECK, + 0, + 0) == BST_CHECKED); + + if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, + ReportAsWorkstationKey, + 0, + NULL, + 0, + KEY_WRITE, + NULL, + &hKey, + NULL) == ERROR_SUCCESS) + { + RegSetValueEx(hKey, + _T("ReportAsWorkstation"), + 0, + REG_DWORD, + (LPBYTE)&ReportAsWorkstation, + sizeof(DWORD)); + } +} + +static VOID +OnInitSysSettingsDialog(HWND hwndDlg) +{ + HKEY hKey; + DWORD dwVal; + DWORD dwType = REG_DWORD; + DWORD cbData = sizeof(DWORD); + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + ReportAsWorkstationKey, + 0, + KEY_READ, + &hKey) == ERROR_SUCCESS) + { + if (RegQueryValueEx(hKey, + _T("ReportAsWorkstation"), + 0, + &dwType, + (LPBYTE)&dwVal, + &cbData) == ERROR_SUCCESS) + { + if (dwVal == TRUE) + { + // set the check box + SendDlgItemMessageW(hwndDlg, + IDC_REPORTASWORKSTATION, + BM_SETCHECK, + BST_CHECKED, + 0); + } + } + } + + +} + +INT_PTR CALLBACK +SysSettingsDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (uMsg) + { + case WM_INITDIALOG: + OnInitSysSettingsDialog(hwndDlg); + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + OnOK(hwndDlg); + EndDialog(hwndDlg, 0); + return TRUE; + } + break; + } + + return FALSE; +} + /* Property page dialog callback */ INT_PTR CALLBACK @@ -51,6 +149,13 @@ (DLGPROC)StartRecDlgProc); break; + case IDC_SYSSETTINGS: + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_SYSSETTINGS), + hwndDlg, + (DLGPROC)SysSettingsDlgProc); + break; + case IDC_ENVVAR: DialogBox(hApplet, MAKEINTRESOURCE(IDD_ENVIRONMENT_VARIABLES), Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Wed Dec 9 17:34:05 2009 @@ -62,8 +62,20 @@ LTEXT "Startup and recovery options tell your computer how to start and what to do if an error causes your computer to stop.", IDC_STATIC, 16, 144, 228, 19 PUSHBUTTON "Settings", IDC_STAREC, 194, 162, 50, 15 - PUSHBUTTON "Environment Variables", IDC_ENVVAR, 84, 192, 80, 15 + PUSHBUTTON "System Settings", IDC_SYSSETTINGS, 2, 192, 80, 15 + PUSHBUTTON "Environment Variables", IDC_ENVVAR, 85, 192, 80, 15 PUSHBUTTON "Error Reporting", IDC_ERRORREPORT, 170, 192, 80, 15 +END + +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "System Settings" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Version Info",IDC_STATIC,6,3,210,53 + CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,37,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,21 + PUSHBUTTON "OK",IDOK,166,63,50,14 END Modified: trunk/reactos/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] Wed Dec 9 17:34:05 2009 @@ -56,12 +56,16 @@ /* propsheet - advanced */ #define IDD_PROPPAGEADVANCED 400 -#define IDC_ENVVAR 401 -#define IDC_STAREC 402 -#define IDC_PERFOR 403 -#define IDC_USERPROFILE 404 -#define IDC_ERRORREPORT 405 +#define IDC_SYSSETTINGS 401 +#define IDC_ENVVAR 402 +#define IDC_STAREC 403 +#define IDC_PERFOR 404 +#define IDC_USERPROFILE 405 +#define IDC_ERRORREPORT 406 +/* system settings */ +#define IDD_SYSSETTINGS 800 +#define IDC_REPORTASWORKSTATION 801 /* user profiles */ #define IDD_USERPROFILE 500

1 0

[janderwald] 44486: [MMIXER] - Define all used node types and property guids
by janderwald＠svn.reactos.org 09 Dec '09

09 Dec '09

Author: janderwald Date: Wed Dec 9 17:28:12 2009 New Revision: 44486 URL: http://svn.reactos.org/svn/reactos?rev=44486&view=rev Log: [MMIXER] - Define all used node types and property guids Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/s… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Wed Dec 9 17:28:12 2009 @@ -9,6 +9,26 @@ #include "priv.h" + +const GUID KSNODETYPE_SUM = {0xDA441A60L, 0xC556, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; +const GUID KSNODETYPE_DAC = {0x507AE360L, 0xC554, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; +const GUID KSNODETYPE_ADC = {0x4D837FE0L, 0xC555, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; +const GUID KSNODETYPE_AGC = {0xE88C9BA0L, 0xC557, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; +const GUID KSNODETYPE_LOUDNESS = {0x41887440L, 0xC558, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; +const GUID KSNODETYPE_MUTE = {0x02B223C0L, 0xC557, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; +const GUID KSNODETYPE_TONE = {0x7607E580L, 0xC557, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; +const GUID KSNODETYPE_VOLUME = {0x3A5ACC00L, 0xC557, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; +const GUID KSNODETYPE_PEAKMETER = {0xa085651e, 0x5f0d, 0x4b36, {0xa8, 0x69, 0xd1, 0x95, 0xd6, 0xab, 0x4b, 0x9e}}; +const GUID KSNODETYPE_MUX = {0x2CEAF780, 0xC556, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; +const GUID KSNODETYPE_STEREO_WIDE = {0xA9E69800L, 0xC558, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; +const GUID KSNODETYPE_CHORUS = {0x20173F20L, 0xC559, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; +const GUID KSNODETYPE_REVERB = {0xEF0328E0L, 0xC558, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; +const GUID KSNODETYPE_SUPERMIX = {0xE573ADC0L, 0xC555, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; + +const GUID KSPROPSETID_Audio = {0x45FFAAA0L, 0x6E1B, 0x11D0, {0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}; +const GUID KSPROPSETID_Pin = {0x8C134960L, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}}; +const GUID KSPROPSETID_General = {0x1464EDA5L, 0x6A8F, 0x11D1, {0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSPROPSETID_Topology = {0x720D4AC0L, 0x7533, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; MIXER_STATUS MMixerVerifyContext(

1 0

[gedmurphy] 44485: Switch to Wine debuging
by gedmurphy＠svn.reactos.org 09 Dec '09

09 Dec '09

Author: gedmurphy Date: Wed Dec 9 17:12:10 2009 New Revision: 44485 URL: http://svn.reactos.org/svn/reactos?rev=44485&view=rev Log: Switch to Wine debuging Modified: trunk/reactos/dll/win32/kernel32/misc/version.c Modified: trunk/reactos/dll/win32/kernel32/misc/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ve… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/version.c [iso-8859-1] Wed Dec 9 17:12:10 2009 @@ -10,8 +10,9 @@ #include <k32.h> #include <reactos/buildno.h> -#define NDEBUG -#include <debug.h> +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(kernel32Ver); #define UNICODIZE1(x) L##x #define UNICODIZE(x) UNICODIZE1(x)

1 0

[gedmurphy] 44484: damn winmerge ... adding the devil's spacing instead of angel's spacing
by gedmurphy＠svn.reactos.org 09 Dec '09

09 Dec '09

Author: gedmurphy Date: Wed Dec 9 17:07:45 2009 New Revision: 44484 URL: http://svn.reactos.org/svn/reactos?rev=44484&view=rev Log: damn winmerge ... adding the devil's spacing instead of angel's spacing Modified: trunk/reactos/dll/win32/kernel32/misc/version.c Modified: trunk/reactos/dll/win32/kernel32/misc/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ve… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/version.c [iso-8859-1] Wed Dec 9 17:07:45 2009 @@ -45,7 +45,7 @@ dwSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(DWORD); kvpInfo = (PKEY_VALUE_PARTIAL_INFORMATION)HeapAlloc(GetProcessHeap(), 0, dwSize); if (!kvpInfo) - return; + return; InitializeObjectAttributes(&ObjectAttributes, &KeyName,

1 0

[gedmurphy] 44483: [kernel32] - Modify reactos version APIs to report as a workstation instead of a server upon request. - Currently controlled via a system setting, cpl mod to follow. - Note: The kernel still reports as NtProductServer, as indeed it should. See issue #5003 for more details.
by gedmurphy＠svn.reactos.org 09 Dec '09

09 Dec '09

Author: gedmurphy Date: Wed Dec 9 17:02:46 2009 New Revision: 44483 URL: http://svn.reactos.org/svn/reactos?rev=44483&view=rev Log: [kernel32] - Modify reactos version APIs to report as a workstation instead of a server upon request. - Currently controlled via a system setting, cpl mod to follow. - Note: The kernel still reports as NtProductServer, as indeed it should. See issue #5003 for more details. Modified: trunk/reactos/dll/win32/kernel32/misc/version.c Modified: trunk/reactos/dll/win32/kernel32/misc/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ve… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/version.c [iso-8859-1] Wed Dec 9 17:02:46 2009 @@ -4,6 +4,7 @@ * FILE: dll/win32/kernel32/misc/version.c * PURPOSE: Version functions * PROGRAMMER: Ariadne (ariadne(a)xs4all.nl) + Ged Murphy (gedmurphy(a)reactos.org) */ #include <k32.h> @@ -15,7 +16,97 @@ #define UNICODIZE1(x) L##x #define UNICODIZE(x) UNICODIZE1(x) +static UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\ReactOS\\Settings\\Version"); +static UNICODE_STRING ValName = RTL_CONSTANT_STRING(L"ReportAsWorkstation"); + /* FUNCTIONS ******************************************************************/ + + +static VOID +SetRosSpecificInfo(LPOSVERSIONINFOW lpVersionInformation) +{ + PKEY_VALUE_PARTIAL_INFORMATION kvpInfo = NULL; + OBJECT_ATTRIBUTES ObjectAttributes; + DWORD ReportAsWorkstation = 0; + HANDLE hKey; + DWORD dwSize; + INT ln, maxlen; + NTSTATUS Status; + + TRACE("Setting Ros Specific version info\n"); + + if (!lpVersionInformation) + return; + + /* Only the EX version has a product type */ + if (lpVersionInformation->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW)) + { + /* Allocate memory for our reg query */ + dwSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(DWORD); + kvpInfo = (PKEY_VALUE_PARTIAL_INFORMATION)HeapAlloc(GetProcessHeap(), 0, dwSize); + if (!kvpInfo) + return; + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_OPENIF | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Don't change anything if the key doesn't exist */ + Status = NtOpenKey(&hKey, + KEY_READ, + &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Get the value from the registry */ + Status = NtQueryValueKey(hKey, + &ValName, + KeyValuePartialInformation, + kvpInfo, + dwSize, + &dwSize); + if (NT_SUCCESS(Status)) + { + /* It should be a DWORD */ + if (kvpInfo->Type == REG_DWORD) + { + /* Copy the value for ease of use */ + RtlMoveMemory(&ReportAsWorkstation, + kvpInfo->Data, + kvpInfo->DataLength); + + /* Is the value set? */ + if (((LPOSVERSIONINFOEXW)lpVersionInformation)->wProductType == VER_NT_SERVER && + ReportAsWorkstation) + { + /* It is, modify the product type to report a workstation */ + ((LPOSVERSIONINFOEXW)lpVersionInformation)->wProductType = VER_NT_WORKSTATION; + TRACE("We modified the reported OS from NtProductServer to NtProductWinNt\n"); + } + } + } + + NtClose(hKey); + } + + HeapFree(GetProcessHeap(), 0, kvpInfo); + } + + + /* Append a reactos specific string to the szCSDVersion string ... very hackish ... */ + /* FIXME: Does anything even use this??? I think not.... - Ged */ + ln = wcslen(lpVersionInformation->szCSDVersion) + 1; + maxlen = (sizeof(lpVersionInformation->szCSDVersion) / sizeof(lpVersionInformation->szCSDVersion[0]) - 1); + if(maxlen > ln) + { + PWCHAR szVer = lpVersionInformation->szCSDVersion + ln; + RtlZeroMemory(szVer, (maxlen - ln + 1) * sizeof(WCHAR)); + wcsncpy(szVer, + L"ReactOS " UNICODIZE(KERNEL_VERSION_STR) L" (Build " UNICODIZE(KERNEL_VERSION_BUILD_STR) L")", + maxlen - ln); + } +} /* @@ -30,8 +121,7 @@ nVersion = MAKEWORD(pPeb->OSMajorVersion, pPeb->OSMinorVersion); - /* behave consistently when posing as another operating system */ - /* build number */ + /* behave consistently when posing as another operating system build number */ if(pPeb->OSPlatformId != VER_PLATFORM_WIN32_WINDOWS) nVersion |= ((DWORD)(pPeb->OSBuildNumber)) << 16; @@ -64,24 +154,8 @@ Status = RtlGetVersion((PRTL_OSVERSIONINFOW)lpVersionInformation); if(NT_SUCCESS(Status)) { - int ln, maxlen; - - /* append a reactos specific string to the szCSDVersion string */ - - /* FIXME - we shouldn't do this when there is a (ros-specific) compatibility - flag set so we don't screw applications that might depend on a - certain string */ - - ln = wcslen(lpVersionInformation->szCSDVersion) + 1; - maxlen = (sizeof(lpVersionInformation->szCSDVersion) / sizeof(lpVersionInformation->szCSDVersion[0]) - 1); - if(maxlen > ln) - { - PWCHAR szVer = lpVersionInformation->szCSDVersion + ln; - RtlZeroMemory(szVer, (maxlen - ln + 1) * sizeof(WCHAR)); - wcsncpy(szVer, - L"ReactOS " UNICODIZE(KERNEL_VERSION_STR) L" (Build " UNICODIZE(KERNEL_VERSION_BUILD_STR) L")", - maxlen - ln); - } + /* ReactOS specific changes */ + SetRosSpecificInfo(lpVersionInformation); return TRUE; } @@ -193,6 +267,10 @@ default: /* RtlVerifyVersionInfo shouldn't report any other failure code! */ ASSERT(NT_SUCCESS(Status)); + + /* ReactOS specific changes */ + SetRosSpecificInfo((LPOSVERSIONINFOW)lpVersionInformation); + return TRUE; } }

1 0

[janderwald] 44482: [MMIXER] - Implement MMixerGetLineInfo, MMixerGetLineControls, MMixerSetControlDetails, MMixerGetControlDetails, MMixerOpen - MMixer library is now ready for testing
by janderwald＠svn.reactos.org 09 Dec '09

09 Dec '09

Author: janderwald Date: Wed Dec 9 17:00:28 2009 New Revision: 44482 URL: http://svn.reactos.org/svn/reactos?rev=44482&view=rev Log: [MMIXER] - Implement MMixerGetLineInfo, MMixerGetLineControls, MMixerSetControlDetails, MMixerGetControlDetails, MMixerOpen - MMixer library is now ready for testing 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 trunk/reactos/lib/drivers/sound/mmixer/priv.h trunk/reactos/lib/drivers/sound/mmixer/sup.c 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] Wed Dec 9 17:00:28 2009 @@ -203,10 +203,10 @@ Status = MixerContext->Control(hDevice, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), (LPVOID)Name, BytesReturned, &BytesReturned); if (Status != MM_STATUS_SUCCESS) { - RtlMoveMemory(MixerControl->szShortName, Name, (min(MIXER_SHORT_NAME_CHARS, wcslen(Name)+1)) * sizeof(WCHAR)); + MixerContext->Copy(MixerControl->szShortName, Name, (min(MIXER_SHORT_NAME_CHARS, wcslen(Name)+1)) * sizeof(WCHAR)); MixerControl->szShortName[MIXER_SHORT_NAME_CHARS-1] = L'\0'; - RtlMoveMemory(MixerControl->szName, Name, (min(MIXER_LONG_NAME_CHARS, wcslen(Name)+1)) * sizeof(WCHAR)); + MixerContext->Copy(MixerControl->szName, Name, (min(MIXER_LONG_NAME_CHARS, wcslen(Name)+1)) * sizeof(WCHAR)); MixerControl->szName[MIXER_LONG_NAME_CHARS-1] = L'\0'; } @@ -512,10 +512,10 @@ if (Status != MM_STATUS_SUCCESS) { - RtlMoveMemory(SrcLine->Line.szShortName, PinName, (min(MIXER_SHORT_NAME_CHARS, wcslen(PinName)+1)) * sizeof(WCHAR)); + 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'; - RtlMoveMemory(SrcLine->Line.szName, PinName, (min(MIXER_LONG_NAME_CHARS, wcslen(PinName)+1)) * sizeof(WCHAR)); + MixerContext->Copy(SrcLine->Line.szName, PinName, (min(MIXER_LONG_NAME_CHARS, wcslen(PinName)+1)) * sizeof(WCHAR)); SrcLine->Line.szName[MIXER_LONG_NAME_CHARS-1] = L'\0'; } MixerContext->Free(PinName); 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] Wed Dec 9 17:00:28 2009 @@ -205,3 +205,48 @@ UNIMPLEMENTED return 0; } + +MIXER_STATUS +MMixerSetGetControlDetails( + IN PMIXER_CONTEXT MixerContext, + IN HANDLE hMixer, + IN ULONG NodeId, + IN ULONG bSet, + IN ULONG PropertyId, + IN ULONG Channel, + IN PLONG InputValue) +{ + KSNODEPROPERTY_AUDIO_CHANNEL Property; + MIXER_STATUS Status; + LONG Value; + ULONG BytesReturned; + + if (bSet) + Value = *InputValue; + + /* setup the request */ + RtlZeroMemory(&Property, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL)); + + Property.NodeProperty.NodeId = NodeId; + Property.NodeProperty.Property.Id = PropertyId; + Property.NodeProperty.Property.Flags = KSPROPERTY_TYPE_TOPOLOGY; + Property.NodeProperty.Property.Set = KSPROPSETID_Audio; + Property.Channel = Channel; + Property.Reserved = 0; + + if (bSet) + Property.NodeProperty.Property.Flags |= KSPROPERTY_TYPE_SET; + else + Property.NodeProperty.Property.Flags |= KSPROPERTY_TYPE_GET; + + /* send the request */ + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL), (PVOID)&Value, sizeof(LONG), &BytesReturned); + + if (!bSet && Status == MM_STATUS_SUCCESS) + { + *InputValue = Value; + } + + DPRINT("Status %x bSet %u NodeId %u Value %d PropertyId %u\n", Status, bSet, NodeId, Value, PropertyId); + 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] Wed Dec 9 17:00:28 2009 @@ -73,22 +73,37 @@ MIXER_STATUS MMixerOpen( IN PMIXER_CONTEXT MixerContext, + IN ULONG MixerId, IN PVOID MixerEvent, IN PMIXER_EVENT MixerEventRoutine, OUT PHANDLE MixerHandle) { MIXER_STATUS Status; - - // verify mixer context - Status = MMixerVerifyContext(MixerContext); - - if (Status != MM_STATUS_SUCCESS) - { - // invalid context passed - return Status; - } - - return MM_STATUS_NOT_IMPLEMENTED; + LPMIXER_INFO MixerInfo; + + // verify mixer context + Status = MMixerVerifyContext(MixerContext); + + if (Status != MM_STATUS_SUCCESS) + { + // invalid context passed + return Status; + } + + MixerInfo = (LPMIXER_INFO)MMixerGetMixerInfoByIndex(MixerContext, MixerId); + if (!MixerInfo) + { + // invalid mixer id + return MM_STATUS_INVALID_PARAMETER; + } + + // FIXME + // handle event notification + + // store result + *MixerHandle = (HANDLE)MixerInfo; + + return MM_STATUS_SUCCESS; } MIXER_STATUS @@ -99,15 +114,99 @@ OUT LPMIXERLINEW MixerLine) { MIXER_STATUS Status; - - // verify mixer context - Status = MMixerVerifyContext(MixerContext); - - if (Status != MM_STATUS_SUCCESS) - { - // invalid context passed - return Status; - } + LPMIXER_INFO MixerInfo; + LPMIXERLINE_EXT MixerLineSrc; + + // verify mixer context + Status = MMixerVerifyContext(MixerContext); + + if (Status != MM_STATUS_SUCCESS) + { + // invalid context passed + return Status; + } + + // clear hmixer from flags + Flags &=~MIXER_OBJECTF_HMIXER; + + if (Flags == MIXER_GETLINEINFOF_DESTINATION) + { + // cast to mixer info + MixerInfo = (LPMIXER_INFO)MixerHandle; + + if (MixerLine->dwDestination != 0) + { + // destination line member must be zero + return MM_STATUS_INVALID_PARAMETER; + } + + MixerLineSrc = MMixerGetSourceMixerLineByLineId(MixerInfo, DESTINATION_LINE); + ASSERT(MixerLineSrc); + MixerContext->Copy(MixerLine, &MixerLineSrc->Line, sizeof(MIXERLINEW)); + + return MM_STATUS_SUCCESS; + } + else if (Flags == MIXER_GETLINEINFOF_SOURCE) + { + // cast to mixer info + MixerInfo = (LPMIXER_INFO)MixerHandle; + + + MixerLineSrc = MMixerGetSourceMixerLineByLineId(MixerInfo, DESTINATION_LINE); + ASSERT(MixerLineSrc); + + if (MixerLine->dwSource >= MixerLineSrc->Line.cConnections) + { + DPRINT1("dwSource %u > Destinations %u\n", MixerLine->dwSource, MixerLineSrc->Line.cConnections); + + // invalid parameter + return MM_STATUS_INVALID_PARAMETER; + } + + MixerLineSrc = MMixerGetSourceMixerLineByLineId(MixerInfo, MixerLine->dwSource); + if (MixerLineSrc) + { + DPRINT("Line %u Name %S\n", MixerLineSrc->Line.dwSource, MixerLineSrc->Line.szName); + MixerContext->Copy(MixerLine, &MixerLineSrc->Line, sizeof(MIXERLINEW)); + return MM_STATUS_SUCCESS; + } + return MM_STATUS_UNSUCCESSFUL; + } + else if (Flags == MIXER_GETLINEINFOF_LINEID) + { + // cast to mixer info + MixerInfo = (LPMIXER_INFO)MixerHandle; + + MixerLineSrc = MMixerGetSourceMixerLineByLineId(MixerInfo, MixerLine->dwLineID); + if (!MixerLineSrc) + { + // invalid parameter + return MM_STATUS_INVALID_PARAMETER; + } + + /* copy cached data */ + MixerContext->Copy(MixerLine, &MixerLineSrc->Line, sizeof(MIXERLINEW)); + return MM_STATUS_SUCCESS; + } + else if (Flags == MIXER_GETLINEINFOF_COMPONENTTYPE) + { + // cast to mixer info + MixerInfo = (LPMIXER_INFO)MixerHandle; + + MixerLineSrc = MMixerGetSourceMixerLineByComponentType(MixerInfo, MixerLine->dwComponentType); + if (!MixerLineSrc) + { + DPRINT1("Failed to find component type %x\n", MixerLine->dwComponentType); + return MM_STATUS_UNSUCCESSFUL; + } + + ASSERT(MixerLineSrc); + + /* copy cached data */ + MixerContext->Copy(MixerLine, &MixerLineSrc->Line, sizeof(MIXERLINEW)); + return MM_STATUS_SUCCESS; + } + return MM_STATUS_NOT_IMPLEMENTED; } @@ -118,16 +217,87 @@ IN ULONG Flags, OUT LPMIXERLINECONTROLS MixerLineControls) { - MIXER_STATUS Status; - - // verify mixer context - Status = MMixerVerifyContext(MixerContext); - - if (Status != MM_STATUS_SUCCESS) - { - // invalid context passed - return Status; - } + LPMIXER_INFO MixerInfo; + LPMIXERLINE_EXT MixerLineSrc; + LPMIXERCONTROLW MixerControl; + MIXER_STATUS Status; + ULONG Index; + + // verify mixer context + Status = MMixerVerifyContext(MixerContext); + + if (Status != MM_STATUS_SUCCESS) + { + // invalid context passed + return Status; + } + + Flags &= ~MIXER_OBJECTF_HMIXER; + + if (Flags == MIXER_GETLINECONTROLSF_ALL) + { + // cast to mixer info + MixerInfo = (LPMIXER_INFO)MixerHandle; + + MixerLineSrc = MMixerGetSourceMixerLineByLineId(MixerInfo, MixerLineControls->dwLineID); + + if (!MixerLineSrc) + { + // invalid line id + return MM_STATUS_INVALID_PARAMETER; + } + // copy line control(s) + MixerContext->Copy(MixerLineControls->pamxctrl, MixerLineSrc->LineControls, min(MixerLineSrc->Line.cControls, MixerLineControls->cControls) * sizeof(MIXERCONTROLW)); + + return MM_STATUS_SUCCESS; + } + else if (Flags == MIXER_GETLINECONTROLSF_ONEBYTYPE) + { + // cast to mixer info + MixerInfo = (LPMIXER_INFO)MixerHandle; + + MixerLineSrc = MMixerGetSourceMixerLineByLineId(MixerInfo, MixerLineControls->dwLineID); + + if (!MixerLineSrc) + { + // invalid line id + return MM_STATUS_INVALID_PARAMETER; + } + + ASSERT(MixerLineSrc); + + Index = 0; + for(Index = 0; Index < MixerLineSrc->Line.cControls; Index++) + { + DPRINT("dwControlType %x\n", MixerLineSrc->LineControls[Index].dwControlType); + if (MixerLineControls->dwControlType == MixerLineSrc->LineControls[Index].dwControlType) + { + // found a control with that type + MixerContext->Copy(MixerLineControls->pamxctrl, &MixerLineSrc->LineControls[Index], sizeof(MIXERCONTROLW)); + return MM_STATUS_SUCCESS; + } + } + DPRINT("DeviceInfo->u.MixControls.dwControlType %x not found in Line %x cControls %u \n", MixerLineControls->dwControlType, MixerLineControls->dwLineID, MixerLineSrc->Line.cControls); + return MM_STATUS_UNSUCCESSFUL; + } + else if (Flags == MIXER_GETLINECONTROLSF_ONEBYID) + { + // cast to mixer info + MixerInfo = (LPMIXER_INFO)MixerHandle; + + Status = MMixerGetMixerControlById(MixerInfo, MixerLineControls->dwControlID, NULL, &MixerControl, NULL); + + if (Status != MM_STATUS_SUCCESS) + { + // invalid parameter + return MM_STATUS_INVALID_PARAMETER; + } + + // copy the controls + MixerContext->Copy(MixerLineControls->pamxctrl, MixerControl, sizeof(MIXERCONTROLW)); + return MM_STATUS_SUCCESS; + } + return MM_STATUS_NOT_IMPLEMENTED; } @@ -140,16 +310,46 @@ OUT LPMIXERCONTROLDETAILS MixerControlDetails) { MIXER_STATUS Status; - - // verify mixer context - Status = MMixerVerifyContext(MixerContext); - - if (Status != MM_STATUS_SUCCESS) - { - // invalid context passed - return Status; - } - return MM_STATUS_NOT_IMPLEMENTED; + ULONG NodeId; + LPMIXER_INFO MixerInfo; + LPMIXERLINE_EXT MixerLine; + LPMIXERCONTROLW MixerControl; + + // verify mixer context + Status = MMixerVerifyContext(MixerContext); + + if (Status != MM_STATUS_SUCCESS) + { + // invalid context passed + return Status; + } + + // get mixer info + MixerInfo = (LPMIXER_INFO)MixerHandle; + + // get mixer control + Status = MMixerGetMixerControlById(MixerInfo, MixerControlDetails->dwControlID, &MixerLine, &MixerControl, &NodeId); + + // check for success + if (Status != MM_STATUS_SUCCESS) + { + // failed to find control id + return MM_STATUS_INVALID_PARAMETER; + } + + switch(MixerControl->dwControlType) + { + case MIXERCONTROL_CONTROLTYPE_MUTE: + Status = MMixerSetGetMuteControlDetails(MixerContext, MixerInfo->hMixer, NodeId, MixerLine->Line.dwLineID, MixerControlDetails, TRUE); + break; + case MIXERCONTROL_CONTROLTYPE_VOLUME: + Status = MMixerSetGetVolumeControlDetails(MixerContext, MixerInfo->hMixer, NodeId, TRUE, MixerControl, MixerControlDetails, MixerLine); + break; + default: + Status = MM_STATUS_NOT_IMPLEMENTED; + } + + return Status; } MIXER_STATUS @@ -160,17 +360,46 @@ OUT LPMIXERCONTROLDETAILS MixerControlDetails) { MIXER_STATUS Status; - - // verify mixer context - Status = MMixerVerifyContext(MixerContext); - - if (Status != MM_STATUS_SUCCESS) - { - // invalid context passed - return Status; - } - - return MM_STATUS_NOT_IMPLEMENTED; + ULONG NodeId; + LPMIXER_INFO MixerInfo; + LPMIXERLINE_EXT MixerLine; + LPMIXERCONTROLW MixerControl; + + // verify mixer context + Status = MMixerVerifyContext(MixerContext); + + if (Status != MM_STATUS_SUCCESS) + { + // invalid context passed + return Status; + } + + // get mixer info + MixerInfo = (LPMIXER_INFO)MixerHandle; + + // get mixer control + Status = MMixerGetMixerControlById(MixerInfo, MixerControlDetails->dwControlID, &MixerLine, &MixerControl, &NodeId); + + // check for success + if (Status != MM_STATUS_SUCCESS) + { + // failed to find control id + return MM_STATUS_INVALID_PARAMETER; + } + + switch(MixerControl->dwControlType) + { + case MIXERCONTROL_CONTROLTYPE_MUTE: + Status = MMixerSetGetMuteControlDetails(MixerContext, MixerInfo->hMixer, NodeId, MixerLine->Line.dwLineID, MixerControlDetails, FALSE); + break; + case MIXERCONTROL_CONTROLTYPE_VOLUME: + Status = MMixerSetGetVolumeControlDetails(MixerContext, MixerInfo->hMixer, NodeId, FALSE, MixerControl, MixerControlDetails, MixerLine); + break; + default: + Status = MM_STATUS_NOT_IMPLEMENTED; + } + + return Status; } MIXER_STATUS 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] Wed Dec 9 17:00:28 2009 @@ -47,6 +47,11 @@ typedef VOID (*PMIXER_EVENT)( IN PVOID MixerEvent); +typedef VOID (*PMIXER_COPY)( + IN PVOID Dst, + IN PVOID Src, + IN ULONG Length); + typedef struct { @@ -58,6 +63,7 @@ PMIXER_FREE Free; PMIXER_OPEN Open; PMIXER_CLOSE Close; + PMIXER_COPY Copy; }MIXER_CONTEXT, *PMIXER_CONTEXT; MIXER_STATUS @@ -79,6 +85,7 @@ MIXER_STATUS MMixerOpen( IN PMIXER_CONTEXT MixerContext, + IN ULONG MixerId, IN PVOID MixerEvent, IN PMIXER_EVENT MixerEventRoutine, OUT PHANDLE MixerHandle); Modified: trunk/reactos/lib/drivers/sound/mmixer/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/p… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] Wed Dec 9 17:00:28 2009 @@ -164,5 +164,46 @@ IN PMIXER_CONTEXT MixerContext, IN ULONG MixerIndex); +LPMIXERLINE_EXT +MMixerGetSourceMixerLineByComponentType( + LPMIXER_INFO MixerInfo, + DWORD dwComponentType); + +MIXER_STATUS +MMixerGetMixerControlById( + LPMIXER_INFO MixerInfo, + DWORD dwControlID, + LPMIXERLINE_EXT *MixerLine, + LPMIXERCONTROLW *MixerControl, + PULONG NodeId); + +MIXER_STATUS +MMixerSetGetMuteControlDetails( + IN PMIXER_CONTEXT MixerContext, + IN HANDLE hMixer, + IN ULONG NodeId, + IN ULONG dwLineID, + IN LPMIXERCONTROLDETAILS MixerControlDetails, + IN ULONG bSet); + +MIXER_STATUS +MMixerSetGetVolumeControlDetails( + IN PMIXER_CONTEXT MixerContext, + IN HANDLE hMixer, + IN ULONG NodeId, + IN ULONG bSet, + LPMIXERCONTROLW MixerControl, + IN LPMIXERCONTROLDETAILS MixerControlDetails, + LPMIXERLINE_EXT MixerLine); + +MIXER_STATUS +MMixerSetGetControlDetails( + IN PMIXER_CONTEXT MixerContext, + IN HANDLE hMixer, + IN ULONG NodeId, + IN ULONG bSet, + IN ULONG PropertyId, + IN ULONG Channel, + IN PLONG InputValue); #endif Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/s… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Wed Dec 9 17:00:28 2009 @@ -71,6 +71,28 @@ return NULL; } +LPMIXERCONTROL_DATA +MMixerGetMixerControlDataById( + PLIST_ENTRY ListHead, + DWORD dwControlId) +{ + PLIST_ENTRY Entry; + LPMIXERCONTROL_DATA Control; + + /* get first entry */ + Entry = ListHead->Flink; + + while(Entry != ListHead) + { + Control = (LPMIXERCONTROL_DATA)CONTAINING_RECORD(Entry, MIXERCONTROL_DATA, Entry); + DPRINT("dwSource %x dwSource %x\n", Control->dwControlID, dwControlId); + if (Control->dwControlID == dwControlId) + return Control; + + Entry = Entry->Flink; + } + return NULL; +} LPMIXERLINE_EXT MMixerGetSourceMixerLineByLineId( @@ -314,3 +336,190 @@ return Status; } + +LPMIXERLINE_EXT +MMixerGetSourceMixerLineByComponentType( + LPMIXER_INFO MixerInfo, + DWORD dwComponentType) +{ + PLIST_ENTRY Entry; + LPMIXERLINE_EXT MixerLineSrc; + + /* get first entry */ + Entry = MixerInfo->LineList.Flink; + + while(Entry != &MixerInfo->LineList) + { + MixerLineSrc = (LPMIXERLINE_EXT)CONTAINING_RECORD(Entry, MIXERLINE_EXT, Entry); + if (MixerLineSrc->Line.dwComponentType == dwComponentType) + return MixerLineSrc; + + Entry = Entry->Flink; + } + + return NULL; +} + +MIXER_STATUS +MMixerGetMixerControlById( + LPMIXER_INFO MixerInfo, + DWORD dwControlID, + LPMIXERLINE_EXT *MixerLine, + LPMIXERCONTROLW *MixerControl, + PULONG NodeId) +{ + PLIST_ENTRY Entry; + LPMIXERLINE_EXT MixerLineSrc; + ULONG Index; + + /* get first entry */ + Entry = MixerInfo->LineList.Flink; + + while(Entry != &MixerInfo->LineList) + { + MixerLineSrc = (LPMIXERLINE_EXT)CONTAINING_RECORD(Entry, MIXERLINE_EXT, Entry); + + for(Index = 0; Index < MixerLineSrc->Line.cControls; Index++) + { + if (MixerLineSrc->LineControls[Index].dwControlID == dwControlID) + { + if (MixerLine) + *MixerLine = MixerLineSrc; + if (MixerControl) + *MixerControl = &MixerLineSrc->LineControls[Index]; + if (NodeId) + *NodeId = MixerLineSrc->NodeIds[Index]; + return MM_STATUS_SUCCESS; + } + } + Entry = Entry->Flink; + } + + return MM_STATUS_UNSUCCESSFUL; +} + +ULONG +MMixerGetVolumeControlIndex( + LPMIXERVOLUME_DATA VolumeData, + LONG Value) +{ + ULONG Index; + + for(Index = 0; Index < VolumeData->ValuesCount; Index++) + { + if (VolumeData->Values[Index] > Value) + { + return VolumeData->InputSteppingDelta * Index; + } + } + return VolumeData->InputSteppingDelta * (VolumeData->ValuesCount-1); +} + +MIXER_STATUS +MMixerSetGetMuteControlDetails( + IN PMIXER_CONTEXT MixerContext, + IN HANDLE hMixer, + IN ULONG NodeId, + IN ULONG dwLineID, + IN LPMIXERCONTROLDETAILS MixerControlDetails, + IN ULONG bSet) +{ + LPMIXERCONTROLDETAILS_BOOLEAN Input; + LONG Value; + MIXER_STATUS Status; + + if (MixerControlDetails->cbDetails != sizeof(MIXERCONTROLDETAILS_BOOLEAN)) + return MM_STATUS_INVALID_PARAMETER; + + /* get input */ + Input = (LPMIXERCONTROLDETAILS_BOOLEAN)MixerControlDetails->paDetails; + + /* FIXME SEH */ + if (bSet) + Value = Input->fValue; + + /* set control details */ + Status = MMixerSetGetControlDetails(MixerContext, hMixer, NodeId, bSet, KSPROPERTY_AUDIO_MUTE, 0, &Value); + + if (Status != MM_STATUS_SUCCESS) + return Status; + + /* FIXME SEH */ + if (!bSet) + { + Input->fValue = Value; + return Status; + } + else + { + // FIXME notify wdmaud clients MM_MIXM_LINE_CHANGE dwLineID + } + + return Status; +} + +MIXER_STATUS +MMixerSetGetVolumeControlDetails( + IN PMIXER_CONTEXT MixerContext, + IN HANDLE hMixer, + IN ULONG NodeId, + IN ULONG bSet, + LPMIXERCONTROLW MixerControl, + IN LPMIXERCONTROLDETAILS MixerControlDetails, + LPMIXERLINE_EXT MixerLine) +{ + LPMIXERCONTROLDETAILS_UNSIGNED Input; + LONG Value, Index, Channel = 0; + ULONG dwValue; + MIXER_STATUS Status; + LPMIXERVOLUME_DATA VolumeData; + + if (MixerControlDetails->cbDetails != sizeof(MIXERCONTROLDETAILS_SIGNED)) + return MM_STATUS_INVALID_PARAMETER; + + VolumeData = (LPMIXERVOLUME_DATA)MMixerGetMixerControlDataById(&MixerLine->LineControlsExtraData, MixerControl->dwControlID); + if (!VolumeData) + return MM_STATUS_UNSUCCESSFUL; + + /* get input */ + Input = (LPMIXERCONTROLDETAILS_UNSIGNED)MixerControlDetails->paDetails; + + if (bSet) + { + /* FIXME SEH */ + Value = Input->dwValue; + Index = Value / VolumeData->InputSteppingDelta; + + if (Index >= VolumeData->ValuesCount) + { + DPRINT1("Index %u out of bounds %u \n", Index, VolumeData->ValuesCount); + DbgBreakPoint(); + return MM_STATUS_INVALID_PARAMETER; + } + + Value = VolumeData->Values[Index]; + } + + /* set control details */ + if (bSet) + { + Status = MMixerSetGetControlDetails(MixerContext, hMixer, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, 0, &Value); + Status = MMixerSetGetControlDetails(MixerContext, hMixer, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, 1, &Value); + } + else + { + Status = MMixerSetGetControlDetails(MixerContext, hMixer, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, Channel, &Value); + } + + if (!bSet) + { + dwValue = MMixerGetVolumeControlIndex(VolumeData, (LONG)Value); + /* FIXME SEH */ + Input->dwValue = dwValue; + } + else + { + /* notify clients of a line change MM_MIXM_CONTROL_CHANGE with MixerControl->dwControlID */ + } + return Status; +}

1 0

[mjmartin] 44481: [ntoskrnl\config] - Description of what previous code was doing in commit r44469 was completely incorrect. Source prior to r44469 was only missing parentheses. - CmpSplitLeaf: Revert back to previous code with correct fix. Fireballs code was correct, and because I found it before him I save myself from a severe lashing.
by mjmartin＠svn.reactos.org 09 Dec '09

09 Dec '09

Author: mjmartin Date: Wed Dec 9 15:15:11 2009 New Revision: 44481 URL: http://svn.reactos.org/svn/reactos?rev=44481&view=rev Log: [ntoskrnl\config] - Description of what previous code was doing in commit r44469 was completely incorrect. Source prior to r44469 was only missing parentheses. - CmpSplitLeaf: Revert back to previous code with correct fix. Fireballs code was correct, and because I found it before him I save myself from a severe lashing. Modified: trunk/reactos/ntoskrnl/config/cmindex.c Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmindex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmindex.c [iso-8859-1] Wed Dec 9 15:15:11 2009 @@ -1289,14 +1289,13 @@ LastHalf * EntrySize); } - /* If RootSelect is not the last index */ + /* Shift the data inside the root key */ if (RootSelect < (IndexKey->Count - 1)) { - /* Shift indexes to the right */ - ULONG IndexCount; - /* IndexKey->Count will be incremented below */ - for (IndexCount = IndexKey->Count; IndexCount > RootSelect + 1; IndexCount --) - IndexKey->List[IndexCount] = IndexKey->List[IndexCount -1]; + RtlMoveMemory(&IndexKey->List[RootSelect + 2], + &IndexKey->List[RootSelect + 1], + (IndexKey->Count - + (RootSelect + 1)) * sizeof(HCELL_INDEX)); } /* Make sure both old and new computed counts are valid */

1 0

[gedmurphy] 44480: Standardize code formating. No code change
by gedmurphy＠svn.reactos.org 09 Dec '09

09 Dec '09

Author: gedmurphy Date: Wed Dec 9 14:15:47 2009 New Revision: 44480 URL: http://svn.reactos.org/svn/reactos?rev=44480&view=rev Log: Standardize code formating. No code change Modified: trunk/reactos/dll/win32/kernel32/misc/version.c Modified: trunk/reactos/dll/win32/kernel32/misc/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ve… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/version.c [iso-8859-1] Wed Dec 9 14:15:47 2009 @@ -1,12 +1,9 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/kernel32/misc/version.c + * FILE: dll/win32/kernel32/misc/version.c * PURPOSE: Version functions - * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) - * UPDATE HISTORY: - * Created 01/11/98 + * PROGRAMMER: Ariadne (ariadne(a)xs4all.nl) */ #include <k32.h> @@ -28,211 +25,201 @@ WINAPI GetVersion(VOID) { - PPEB pPeb = NtCurrentPeb(); - DWORD nVersion; - - nVersion = MAKEWORD(pPeb->OSMajorVersion, pPeb->OSMinorVersion); - - /* behave consistently when posing as another operating system */ - /* build number */ - if(pPeb->OSPlatformId != VER_PLATFORM_WIN32_WINDOWS) - nVersion |= ((DWORD)(pPeb->OSBuildNumber)) << 16; - - /* non-NT platform flag */ - if(pPeb->OSPlatformId != VER_PLATFORM_WIN32_NT) - nVersion |= 0x80000000; - - return nVersion; -} - -/* - * @implemented - */ -BOOL -WINAPI -GetVersionExW( - LPOSVERSIONINFOW lpVersionInformation - ) -{ - NTSTATUS Status; - - if(lpVersionInformation->dwOSVersionInfoSize != sizeof(OSVERSIONINFOW) && - lpVersionInformation->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXW)) - { - /* for some reason win sets ERROR_INSUFFICIENT_BUFFER even if it is large - enough but doesn't match the exact sizes supported, ERROR_INVALID_PARAMETER - would've been much more appropriate... */ - SetLastError(ERROR_INSUFFICIENT_BUFFER); + PPEB pPeb = NtCurrentPeb(); + DWORD nVersion; + + nVersion = MAKEWORD(pPeb->OSMajorVersion, pPeb->OSMinorVersion); + + /* behave consistently when posing as another operating system */ + /* build number */ + if(pPeb->OSPlatformId != VER_PLATFORM_WIN32_WINDOWS) + nVersion |= ((DWORD)(pPeb->OSBuildNumber)) << 16; + + /* non-NT platform flag */ + if(pPeb->OSPlatformId != VER_PLATFORM_WIN32_NT) + nVersion |= 0x80000000; + + return nVersion; +} + +/* + * @implemented + */ +BOOL +WINAPI +GetVersionExW(LPOSVERSIONINFOW lpVersionInformation) +{ + NTSTATUS Status; + + if(lpVersionInformation->dwOSVersionInfoSize != sizeof(OSVERSIONINFOW) && + lpVersionInformation->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXW)) + { + /* for some reason win sets ERROR_INSUFFICIENT_BUFFER even if it is large + enough but doesn't match the exact sizes supported, ERROR_INVALID_PARAMETER + would've been much more appropriate... */ + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + Status = RtlGetVersion((PRTL_OSVERSIONINFOW)lpVersionInformation); + if(NT_SUCCESS(Status)) + { + int ln, maxlen; + + /* append a reactos specific string to the szCSDVersion string */ + + /* FIXME - we shouldn't do this when there is a (ros-specific) compatibility + flag set so we don't screw applications that might depend on a + certain string */ + + ln = wcslen(lpVersionInformation->szCSDVersion) + 1; + maxlen = (sizeof(lpVersionInformation->szCSDVersion) / sizeof(lpVersionInformation->szCSDVersion[0]) - 1); + if(maxlen > ln) + { + PWCHAR szVer = lpVersionInformation->szCSDVersion + ln; + RtlZeroMemory(szVer, (maxlen - ln + 1) * sizeof(WCHAR)); + wcsncpy(szVer, + L"ReactOS " UNICODIZE(KERNEL_VERSION_STR) L" (Build " UNICODIZE(KERNEL_VERSION_BUILD_STR) L")", + maxlen - ln); + } + + return TRUE; + } + return FALSE; - } - - Status = RtlGetVersion((PRTL_OSVERSIONINFOW)lpVersionInformation); - if(NT_SUCCESS(Status)) - { - int ln, maxlen; - - /* append a reactos specific string to the szCSDVersion string */ - - /* FIXME - we shouldn't do this when there is a (ros-specific) compatibility - flag set so we don't screw applications that might depend on a - certain string */ - - ln = wcslen(lpVersionInformation->szCSDVersion) + 1; - maxlen = (sizeof(lpVersionInformation->szCSDVersion) / sizeof(lpVersionInformation->szCSDVersion[0]) - 1); - if(maxlen > ln) - { - PWCHAR szVer = lpVersionInformation->szCSDVersion + ln; - RtlZeroMemory(szVer, (maxlen - ln + 1) * sizeof(WCHAR)); - wcsncpy(szVer, - L"ReactOS " UNICODIZE(KERNEL_VERSION_STR) L" (Build " UNICODIZE(KERNEL_VERSION_BUILD_STR) L")", - maxlen - ln); - } - - return TRUE; - } - - return FALSE; -} - - -/* - * @implemented - */ -BOOL -WINAPI -GetVersionExA( - LPOSVERSIONINFOA lpVersionInformation - ) -{ - OSVERSIONINFOEXW viw; - - RtlZeroMemory(&viw, sizeof(viw)); - - switch(lpVersionInformation->dwOSVersionInfoSize) - { - case sizeof(OSVERSIONINFOA): - viw.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); - break; - - case sizeof(OSVERSIONINFOEXA): - viw.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW); - break; - - default: - /* for some reason win sets ERROR_INSUFFICIENT_BUFFER even if it is large - enough but doesn't match the exact sizes supported, ERROR_INVALID_PARAMETER - would've been much more appropriate... */ - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - if(GetVersionExW((LPOSVERSIONINFOW)&viw)) - { - ANSI_STRING CSDVersionA; - UNICODE_STRING CSDVersionW; - - /* copy back fields that match both supported structures */ - lpVersionInformation->dwMajorVersion = viw.dwMajorVersion; - lpVersionInformation->dwMinorVersion = viw.dwMinorVersion; - lpVersionInformation->dwBuildNumber = viw.dwBuildNumber; - lpVersionInformation->dwPlatformId = viw.dwPlatformId; - - /* convert the win version string */ - RtlInitUnicodeString(&CSDVersionW, viw.szCSDVersion); - - CSDVersionA.Length = 0; - CSDVersionA.MaximumLength = sizeof(lpVersionInformation->szCSDVersion); - CSDVersionA.Buffer = lpVersionInformation->szCSDVersion; - - RtlUnicodeStringToAnsiString(&CSDVersionA, &CSDVersionW, FALSE); - - /* convert the ReactOS version string */ - CSDVersionW.Buffer = viw.szCSDVersion + CSDVersionW.Length / sizeof(WCHAR) + 1; - CSDVersionW.MaximumLength = sizeof(viw.szCSDVersion) - (CSDVersionW.Length + sizeof(WCHAR)); - CSDVersionW.Length = wcslen(CSDVersionW.Buffer) * sizeof(WCHAR); - CSDVersionA.Buffer = lpVersionInformation->szCSDVersion + CSDVersionA.Length + 1; - CSDVersionA.MaximumLength = sizeof(lpVersionInformation->szCSDVersion) - (CSDVersionA.Length + 1); - CSDVersionA.Length = 0; - - RtlUnicodeStringToAnsiString(&CSDVersionA, &CSDVersionW, FALSE); - - /* copy back the extended fields */ - if(viw.dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW)) - { - ((LPOSVERSIONINFOEXA)lpVersionInformation)->wServicePackMajor = viw.wServicePackMajor; - ((LPOSVERSIONINFOEXA)lpVersionInformation)->wServicePackMinor = viw.wServicePackMinor; - ((LPOSVERSIONINFOEXA)lpVersionInformation)->wSuiteMask = viw.wSuiteMask; - ((LPOSVERSIONINFOEXA)lpVersionInformation)->wProductType = viw.wProductType; - ((LPOSVERSIONINFOEXA)lpVersionInformation)->wReserved = viw.wReserved; - } - - return TRUE; - } - - return FALSE; -} - - -/* - * @implemented - */ -BOOL -WINAPI -VerifyVersionInfoW( - LPOSVERSIONINFOEXW lpVersionInformation, - DWORD dwTypeMask, - DWORDLONG dwlConditionMask - ) -{ - NTSTATUS Status; - - Status = RtlVerifyVersionInfo((PRTL_OSVERSIONINFOEXW)lpVersionInformation, - dwTypeMask, - dwlConditionMask); - switch(Status) - { - case STATUS_INVALID_PARAMETER: - SetLastError(ERROR_BAD_ARGUMENTS); - return FALSE; - - case STATUS_REVISION_MISMATCH: - SetLastError(ERROR_OLD_WIN_VERSION); - return FALSE; - - default: - /* RtlVerifyVersionInfo shouldn't report any other failure code! */ - ASSERT(NT_SUCCESS(Status)); - return TRUE; - } -} - - -/* - * @implemented - */ -BOOL -WINAPI -VerifyVersionInfoA( - LPOSVERSIONINFOEXA lpVersionInformation, - DWORD dwTypeMask, - DWORDLONG dwlConditionMask - ) -{ - OSVERSIONINFOEXW viex; - - viex.dwOSVersionInfoSize = sizeof(viex); - viex.dwMajorVersion = lpVersionInformation->dwMajorVersion; - viex.dwMinorVersion = lpVersionInformation->dwMinorVersion; - viex.dwBuildNumber = lpVersionInformation->dwBuildNumber; - viex.dwPlatformId = lpVersionInformation->dwPlatformId; - /* NOTE: szCSDVersion is ignored, we don't need to convert it to unicode */ - viex.wServicePackMajor = lpVersionInformation->wServicePackMajor; - viex.wServicePackMinor = lpVersionInformation->wServicePackMinor; - viex.wSuiteMask = lpVersionInformation->wSuiteMask; - viex.wProductType = lpVersionInformation->wProductType; - viex.wReserved = lpVersionInformation->wReserved; - - return VerifyVersionInfoW(&viex, dwTypeMask, dwlConditionMask); -} - -/* EOF */ +} + + +/* + * @implemented + */ +BOOL +WINAPI +GetVersionExA(LPOSVERSIONINFOA lpVersionInformation) +{ + OSVERSIONINFOEXW viw; + + RtlZeroMemory(&viw, sizeof(viw)); + + switch(lpVersionInformation->dwOSVersionInfoSize) + { + case sizeof(OSVERSIONINFOA): + viw.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + break; + + case sizeof(OSVERSIONINFOEXA): + viw.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW); + break; + + default: + /* for some reason win sets ERROR_INSUFFICIENT_BUFFER even if it is large + enough but doesn't match the exact sizes supported, ERROR_INVALID_PARAMETER + would've been much more appropriate... */ + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + if(GetVersionExW((LPOSVERSIONINFOW)&viw)) + { + ANSI_STRING CSDVersionA; + UNICODE_STRING CSDVersionW; + + /* copy back fields that match both supported structures */ + lpVersionInformation->dwMajorVersion = viw.dwMajorVersion; + lpVersionInformation->dwMinorVersion = viw.dwMinorVersion; + lpVersionInformation->dwBuildNumber = viw.dwBuildNumber; + lpVersionInformation->dwPlatformId = viw.dwPlatformId; + + /* convert the win version string */ + RtlInitUnicodeString(&CSDVersionW, viw.szCSDVersion); + + CSDVersionA.Length = 0; + CSDVersionA.MaximumLength = sizeof(lpVersionInformation->szCSDVersion); + CSDVersionA.Buffer = lpVersionInformation->szCSDVersion; + + RtlUnicodeStringToAnsiString(&CSDVersionA, &CSDVersionW, FALSE); + + /* convert the ReactOS version string */ + CSDVersionW.Buffer = viw.szCSDVersion + CSDVersionW.Length / sizeof(WCHAR) + 1; + CSDVersionW.MaximumLength = sizeof(viw.szCSDVersion) - (CSDVersionW.Length + sizeof(WCHAR)); + CSDVersionW.Length = wcslen(CSDVersionW.Buffer) * sizeof(WCHAR); + CSDVersionA.Buffer = lpVersionInformation->szCSDVersion + CSDVersionA.Length + 1; + CSDVersionA.MaximumLength = sizeof(lpVersionInformation->szCSDVersion) - (CSDVersionA.Length + 1); + CSDVersionA.Length = 0; + + RtlUnicodeStringToAnsiString(&CSDVersionA, &CSDVersionW, FALSE); + + /* copy back the extended fields */ + if(viw.dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW)) + { + ((LPOSVERSIONINFOEXA)lpVersionInformation)->wServicePackMajor = viw.wServicePackMajor; + ((LPOSVERSIONINFOEXA)lpVersionInformation)->wServicePackMinor = viw.wServicePackMinor; + ((LPOSVERSIONINFOEXA)lpVersionInformation)->wSuiteMask = viw.wSuiteMask; + ((LPOSVERSIONINFOEXA)lpVersionInformation)->wProductType = viw.wProductType; + ((LPOSVERSIONINFOEXA)lpVersionInformation)->wReserved = viw.wReserved; + } + + return TRUE; + } + + return FALSE; +} + + +/* + * @implemented + */ +BOOL +WINAPI +VerifyVersionInfoW(LPOSVERSIONINFOEXW lpVersionInformation, + DWORD dwTypeMask, + DWORDLONG dwlConditionMask) +{ + NTSTATUS Status; + + Status = RtlVerifyVersionInfo((PRTL_OSVERSIONINFOEXW)lpVersionInformation, + dwTypeMask, + dwlConditionMask); + switch(Status) + { + case STATUS_INVALID_PARAMETER: + SetLastError(ERROR_BAD_ARGUMENTS); + return FALSE; + + case STATUS_REVISION_MISMATCH: + SetLastError(ERROR_OLD_WIN_VERSION); + return FALSE; + + default: + /* RtlVerifyVersionInfo shouldn't report any other failure code! */ + ASSERT(NT_SUCCESS(Status)); + return TRUE; + } +} + + +/* + * @implemented + */ +BOOL +WINAPI +VerifyVersionInfoA(LPOSVERSIONINFOEXA lpVersionInformation, + DWORD dwTypeMask, + DWORDLONG dwlConditionMask) +{ + OSVERSIONINFOEXW viex; + + viex.dwOSVersionInfoSize = sizeof(viex); + viex.dwMajorVersion = lpVersionInformation->dwMajorVersion; + viex.dwMinorVersion = lpVersionInformation->dwMinorVersion; + viex.dwBuildNumber = lpVersionInformation->dwBuildNumber; + viex.dwPlatformId = lpVersionInformation->dwPlatformId; + /* NOTE: szCSDVersion is ignored, we don't need to convert it to unicode */ + viex.wServicePackMajor = lpVersionInformation->wServicePackMajor; + viex.wServicePackMinor = lpVersionInformation->wServicePackMinor; + viex.wSuiteMask = lpVersionInformation->wSuiteMask; + viex.wProductType = lpVersionInformation->wProductType; + viex.wReserved = lpVersionInformation->wReserved; + + return VerifyVersionInfoW(&viex, dwTypeMask, dwlConditionMask); +}

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2009