Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[ekohl] 29059: Use the unicode="yes" attribute in the module element instead of defining UNICODE and _UNICODE.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Sep 15 19:12:26 2007 New Revision: 29059 URL: http://svn.reactos.org/svn/reactos?rev=29059&view=rev Log: Use the unicode="yes" attribute in the module element instead of defining UNICODE and _UNICODE. Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rbuild trunk/reactos/dll/cpl/desk/desk.rbuild trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild trunk/reactos/dll/cpl/main/main.rbuild trunk/reactos/dll/cpl/mmsys/mmsys.rbuild trunk/reactos/dll/cpl/ncpa/ncpa.rbuild trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild trunk/reactos/dll/cpl/powercfg/powercfg.rbuild trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rbui… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.rbuild (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.rbuild Sat Sep 15 19:12:26 2007 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="appwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}" installbase="system32" installname="appwiz.cpl"> +<module name="appwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}" installbase="system32" installname="appwiz.cpl" unicode="yes"> <importlibrary definition="appwiz.def" /> <include base="appwiz">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rbuild (original) +++ trunk/reactos/dll/cpl/desk/desk.rbuild Sat Sep 15 19:12:26 2007 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl"> +<module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl" unicode="yes"> <importlibrary definition="desk.def" /> <include base="desk">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbui… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild Sat Sep 15 19:12:26 2007 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="hdwwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_HDWWIZ}" installbase="system32" installname="hdwwiz.cpl"> +<module name="hdwwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_HDWWIZ}" installbase="system32" installname="hdwwiz.cpl" unicode="yes"> <importlibrary definition="hdwwiz.def" /> <include base="hdwwiz">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/cpl/main/main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/main/main.rbuild (original) +++ trunk/reactos/dll/cpl/main/main.rbuild Sat Sep 15 19:12:26 2007 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}" installbase="system32" installname="main.cpl"> +<module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}" installbase="system32" installname="main.cpl" unicode="yes"> <importlibrary definition="main.def" /> <include base="main">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rbuild (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rbuild Sat Sep 15 19:12:26 2007 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="mmsys" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MMSYS}" installbase="system32" installname="mmsys.cpl"> +<module name="mmsys" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MMSYS}" installbase="system32" installname="mmsys.cpl" unicode="yes"> <importlibrary definition="mmsys.def" /> <include base="mmsys">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/cpl/ncpa/ncpa.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.rbuild (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.rbuild Sat Sep 15 19:12:26 2007 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="ncpa" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_NCPA}" installbase="system32" installname="ncpa.cpl"> +<module name="ncpa" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_NCPA}" installbase="system32" installname="ncpa.cpl" unicode="yes"> <importlibrary definition="ncpa.def" /> <include base="ncpa">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild (original) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild Sat Sep 15 19:12:26 2007 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="odbccp32i" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.cpl" > +<module name="odbccp32i" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.cpl" unicode="yes"> <importlibrary definition="odbccp32.def" /> <include base="odbccp32">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.rbuild (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.rbuild Sat Sep 15 19:12:26 2007 @@ -1,11 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="powercfg" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_PWRCFG}" installbase="system32" installname="powercfg.cpl" allowwarnings="true"> +<module name="powercfg" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_PWRCFG}" installbase="system32" installname="powercfg.cpl" unicode="yes"> <importlibrary definition="powercfg.def" /> <include base="powercfg">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rbui… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild Sat Sep 15 19:12:26 2007 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl"> +<module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl" unicode="yes"> <importlibrary definition="usrmgr.def" /> <include base="usrmgr">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define>

17 years, 3 months

[janderwald] 29058: - move VolumeDlgProc function to own file volume.c - read default waveout device (thanks to Silverbade) - improve volume dialog proc - update all languages resources which current code changes

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Sep 15 18:54:01 2007 New Revision: 29058 URL: http://svn.reactos.org/svn/reactos?rev=29058&view=rev Log: - move VolumeDlgProc function to own file volume.c - read default waveout device (thanks to Silverbade) - improve volume dialog proc - update all languages resources which current code changes Added: trunk/reactos/dll/cpl/mmsys/volume.c (with props) Modified: trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc trunk/reactos/dll/cpl/mmsys/lang/en-US.rc trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc trunk/reactos/dll/cpl/mmsys/mmsys.c trunk/reactos/dll/cpl/mmsys/mmsys.h trunk/reactos/dll/cpl/mmsys/mmsys.rbuild trunk/reactos/dll/cpl/mmsys/resource.h trunk/reactos/dll/cpl/mmsys/sounds.c (props changed) Modified: trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 LTEXT "Sound s&cheme:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 PUSHBUTTON "&Delete", -1, 188,70,50,15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 LTEXT "&Pogram events:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Brouse...", -1, 188,205,50,15 + LTEXT "&Sounds:", IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Brouse...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,6 +99,7 @@ BEGIN IDS_CPLNAME "Zvuky a zvuková zaøízení" IDS_CPLDESCRIPTION "Upraví zvukové schéma Vaeho poèítaèe, nebo nastaví reproduktory a nahrávací zaøízení." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc Sat Sep 15 18:54:01 2007 @@ -6,14 +6,14 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Gerätelautstärke", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Niedrig",-1,62,66,30,17 LTEXT "Hoch",-1,195,66,30,17 CHECKBOX "Stu&mmschalten", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 - CHECKBOX "Lautstärkeregelungs-&Icon in der Taskleiste zeigen", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 + CHECKBOX "Lautstärkeregelungs-&Icon in der Taskleiste zeigen", IDC_ICON_IN_TASKBAR, 50, 92, 170, 10 PUSHBUTTON "Er&weitert", -1, 150,105,75,15 GROUPBOX "Lautsprechereintellungen", -1, 7,140,230,80 CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 @@ -29,16 +29,16 @@ BEGIN LTEXT "Ein Soundschema ist eine Kollektion von Sounds, die bestimmtem Ereignissen in Programmen in ReactOS zugordnet sind. Sie können ein existierendes Schema anwählen oder ein modifiziertes speichern.",-1,8,7,230,40 LTEXT "Sounds&chema:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Sp&eichern unter...", -1, 134,70,50,15 PUSHBUTTON "&Löschen", -1, 188,70,50,15 LTEXT "Um Sounds zu ändern, klicken Sie auf ein Programmereignis in der folgenden Liste und wählen Sie einen Sound. Sie können Änderungen als neue Soundschemata speichern.",-1,8,90,230,40 LTEXT "&Pogrammereignisse:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Durchsuchen...", -1, 188,205,50,15 + LTEXT "&Sounds:", IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Durchsuchen...", IDC_BROWSE_SOUND, 188,205,81,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,6 +99,7 @@ BEGIN IDS_CPLNAME "Sound und Audio Geräte" IDS_CPLDESCRIPTION "Ändert das Sound-Schema Ihres Computers, oder konfiguriert die Einstellungen für Ihre Lautsprecher und Aufnahmegeräte." + IDS_NO_SOUND "(Kein)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 LTEXT "Sound s&cheme:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 PUSHBUTTON "&Delete", -1, 188,70,50,15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 LTEXT "&Pogram events:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Brouse...", -1, 188,205,50,15 + LTEXT "&Sounds:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Browse...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,6 +99,7 @@ BEGIN IDS_CPLNAME "ÓõóêåõÝò Þ÷ïõ" IDS_CPLDESCRIPTION "ÁëëÜæåé ôï ó÷Þìá Þ÷ïõ ôïõ õðïëïãéóôÞ Þ ôñïðïðïéåß ôéò ñõèìßóåéò ãéá ôá ç÷åßá êáé ôéò óõóêåõÝò åããñáöÞò Þ÷ïõ." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/en-US.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 LTEXT "Sound s&cheme:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 PUSHBUTTON "&Delete", -1, 188,70,50,15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 LTEXT "&Program events:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Browse...", -1, 188,205,50,15 + LTEXT "&Sounds:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Browse...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -100,6 +100,7 @@ BEGIN IDS_CPLNAME "Sound and Audio Devices" IDS_CPLDESCRIPTION "Changes the sound scheme for your computer, or configure the settings for your speakers and recording devices." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 LTEXT "Sound s&cheme:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 PUSHBUTTON "&Delete", -1, 188,70,50,15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 LTEXT "&Pogram events:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Brouse...", -1, 188,205,50,15 + LTEXT "&Sounds:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Brouse...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,6 +99,7 @@ BEGIN IDS_CPLNAME "Dispositivos de Audio y Sonido" IDS_CPLDESCRIPTION "Cambia el esquema de sonidos de su computadora, o configura las propiedades de sus bocinas y dispositivos de grabación." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Volume du périphérique", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Faible",-1,62,66,30,17 LTEXT "Élevé",-1,195,66,30,17 CHECKBOX "&Muet", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "Un schéma sons est un ensemble de sons appliqués aux évènements de ReactOS et aux programmes. Vous pouvez sélectionner un schéma existant ou en enregistrer que vous avez modifié.",-1,8,7,230,40 LTEXT "S&chéma son:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Enregistrer sous...", -1, 134,70,50,15 PUSHBUTTON "Supprimer", -1, 188,70,50,15 LTEXT "Pour changer les sons, cliquez sur un évènement de programme dans la liste suivante, puis sélectionnez un son à appliquer. Vous pouvez enregistrer les changements en tant que nouveau schéma son.",-1,8,90,230,40 LTEXT "Évènements des programmes:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sons:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "Parcourir...", -1, 188,205,50,15 + LTEXT "&Sons:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "Parcourir...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,6 +99,7 @@ BEGIN IDS_CPLNAME "Son et périphériques audio" IDS_CPLDESCRIPTION "Change le modèle de sons de votre ordinateur, ou configure les paramètres de vos hauts-parleurs et de vos périphériques d'enregistrement." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 LTEXT "Sound s&cheme:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 PUSHBUTTON "&Delete", -1, 188,70,50,15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 LTEXT "&Pogram events:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Brouse...", -1, 188,205,50,15 + LTEXT "&Sounds:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Brouse...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,6 +99,5 @@ BEGIN IDS_CPLNAME "Suara dan Audio Devices" IDS_CPLDESCRIPTION "Mengubah skema suara untuk komputer anda, atau mengkonfigurasi setelan untuk speaker dan device perekaman anda." + IDS_NO_SOUND "(None)" END - - Modified: trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Volume del dispositivo", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Basso",-1,62,66,30,17 LTEXT "Alto",-1,195,66,30,17 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "Uno schema dei suoni è un insieme di suoni legati agli eventi in Reactos e nei programmi. Potete selezionare uno schema esistente o salvarne uno che avete modificato.",-1,8,7,230,40 LTEXT "S&chema dei suoni:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Salva come...", -1, 134,70,50,15 PUSHBUTTON "&Cancella", -1, 188,70,50,15 LTEXT "Per cambiare i suoni, cliccare un evento nella lista seguente e poi scegliere il suono da usare. Potete salvare le modifiche in un nuovo schema di suoni.",-1,8,90,230,40 LTEXT "&Eventi:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Suoni:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Sfoglia...", -1, 188,205,50,15 + LTEXT "&Suoni:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Sfoglia...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,6 +99,7 @@ BEGIN IDS_CPLNAME "Suoni e Dispositivi audio" IDS_CPLDESCRIPTION "Cambia lo schema dei suoni per il tuo computer o configura le impostazioni per gli altoparlanti e i dispositivi di registrazione." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/nl-NL.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 LTEXT "Sound s&cheme:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 PUSHBUTTON "&Delete", -1, 188,70,50,15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 LTEXT "&Pogram events:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Brouse...", -1, 188,205,50,15 + LTEXT "&Sounds:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Brouse...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,5 +99,6 @@ BEGIN IDS_CPLNAME "Geluid en Audio apparaten" IDS_CPLDESCRIPTION "Verander het geluidsschema van uw computer of configureer de aanwezige geluidsapparatuur." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc Sat Sep 15 18:54:01 2007 @@ -11,10 +11,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -34,16 +34,16 @@ BEGIN LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 LTEXT "Sound s&cheme:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 PUSHBUTTON "&Delete", -1, 188,70,50,15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 LTEXT "&Pogram events:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Brouse...", -1, 188,205,50,15 + LTEXT "&Sounds:", IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Brouse...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -104,6 +104,5 @@ BEGIN IDS_CPLNAME "Dwiêk i urz¹dzenia audio" IDS_CPLDESCRIPTION "Zmieñ schemat dwiêkowy dla tego komputera lub skonfiguruj ustawienia g³oników i urz¹dzeñ nagrywaj¹cych." + IDS_NO_SOUND "(None)" END - - Modified: trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pt-BR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 LTEXT "Sound s&cheme:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 PUSHBUTTON "&Delete", -1, 188,70,50,15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 LTEXT "&Pogram events:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Brouse...", -1, 188,205,50,15 + LTEXT "&Sounds:",IDC_TEXT_SOUND,8,194,80,17 + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15 + PUSHBUTTON "&Brouse...", IDC_BROWSE_SOUND, 188,205,50,15 END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,6 +99,7 @@ BEGIN IDS_CPLNAME "Sons e dispositivos de audio" IDS_CPLDESCRIPTION "Altera o esquema de som para o seu computador ou define as configurações para os auto-falantes e dispositivos de gravação." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Ãðîìêîñòü ìèêøåðà", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "íèæå",-1,62,66,30,17 LTEXT "âûøå",-1,195,66,30,17 CHECKBOX "Â&ûêëþ÷èòü çâóê", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "Çâóêîâàÿ ñõåìà çàäàåò çâóêè, ñîïðîâîæäàþùèå ñîáûòèÿ â îïåðàöèîííîé ñèñòåìå ReactOS è ïðîãðàììàõ. Ìîæíî âûáðàòü îäíó èç ñóùåñòâóþùèõ ñõåì èëè ñîçäàòü íîâóþ.",-1,8,7,230,40 LTEXT "Çâóêîâàÿ ñ&õåìà:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Ñîõðàíèòü &êàê...", -1, 119,70,65,15 PUSHBUTTON "&Óäàëèòü", -1, 188,70,50,15 LTEXT "×òîáû èçìåíèòü çâóêîâîå ñîïðîâîæäåíèå, ùåëêíèòå íà ñîáûòèè â ñïèñêå è âûáåðèòå íóæíûé çâóê. Èçìåíåíèÿ ìîæíî ñîõðàíèòü êàê íîâóþ çâóêîâóþ ñõåìó.",-1,8,90,230,40 LTEXT "Ïðîãðàììíûå &ñîáûòèÿ:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Çâóêè:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Îáçîð...", -1, 188,205,50,15 + LTEXT "&Çâóêè:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Îáçîð...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,6 +99,7 @@ BEGIN IDS_CPLNAME "Çâóê è àóäèîóñòðîéñòâà" IDS_CPLDESCRIPTION "Èçìåíåíèå çâóêîâûõ ñõåì âàøåãî êîìïüþòåðà, íàñòðîéêà êîëîíîê è çàïèñûâàþùèõ óñòðîéñòâ." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc Sat Sep 15 18:54:01 2007 @@ -14,10 +14,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Ãó÷í³ñòü ì³êøåðà", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "íèæ÷å",-1,62,66,30,17 LTEXT "âèùå",-1,195,66,30,17 CHECKBOX "&Âèìêíóòè çâóê", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -37,16 +37,16 @@ BEGIN LTEXT "Çâóêîâà ñõåìà âèçíà÷àº çâóêè, ÿê³ ñóïðîâîäæóþòü ïîä³¿ â ñèñòåì³ ReactOS ³ ó ïðîãðàìàõ. Ìîæíà âèáðàòè îäíó ç íàÿâíèõ ñõåì àáî ñòâîðèòè íîâó.",-1,8,7,230,40 LTEXT "Çâóêîâà ñ&õåìà:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Çáåðåãòè &ÿê...", -1, 134,70,50,15 PUSHBUTTON "Â&èäàëèòè", -1, 188,70,50,15 LTEXT "Ùîá çì³íèòè çâóêîâèé ñóïðîâ³ä, êëàöí³òü ïîä³þ ó ñïèñêó òà âèáåð³òü ïîòð³áíèé çâóê. Çì³íè ìîæíà çáåðåãòè ÿê íîâó çâóêîâó ñõåìó.",-1,8,90,230,40 LTEXT "&Ïðîãðàìí³ ïîä³¿:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Çâóêè:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "Î&ãëÿä...", -1, 188,205,50,15 + LTEXT "&Çâóêè:", IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "Î&ãëÿä...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -107,6 +107,7 @@ BEGIN IDS_CPLNAME "Çâóêîâ³ ³ àóä³î ïðèñòðî¿" IDS_CPLDESCRIPTION "Çì³íà çâóêîâèõ ñõåì âàøîãî êîìï'þòåðà, íàñòðîþâàííÿ êîëîíîê ³ çàïèñóþ÷èõ ïðèñòðî¿â." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c Sat Sep 15 18:54:01 2007 @@ -43,13 +43,6 @@ HWPD_MAX = HWPD_LARGELIST } HWPAGE_DISPLAYMODE, *PHWPAGE_DISPLAYMODE; -typedef struct _IMGINFO -{ - HBITMAP hBitmap; - INT cxSource; - INT cySource; -} IMGINFO, *PIMGINFO; - HWND WINAPI DeviceCreateHardwarePageEx(HWND hWndParent, LPGUID lpGuids, @@ -66,85 +59,6 @@ { {IDI_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, MmSysApplet}, }; - -static VOID -InitImageInfo(PIMGINFO ImgInfo) -{ - BITMAP bitmap; - - ZeroMemory(ImgInfo, sizeof(*ImgInfo)); - - ImgInfo->hBitmap = LoadImage(hApplet, - MAKEINTRESOURCE(IDB_SPEAKIMG), - IMAGE_BITMAP, - 0, - 0, - LR_DEFAULTCOLOR); - - if (ImgInfo->hBitmap != NULL) - { - GetObject(ImgInfo->hBitmap, sizeof(BITMAP), &bitmap); - - ImgInfo->cxSource = bitmap.bmWidth; - ImgInfo->cySource = bitmap.bmHeight; - } -} - -/* Volume property page dialog callback */ -//static INT_PTR CALLBACK -INT_PTR CALLBACK -VolumeDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - static IMGINFO ImgInfo; - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - - switch(uMsg) - { - case WM_INITDIALOG: - { - InitImageInfo(&ImgInfo); - break; - } - case WM_DRAWITEM: - { - LPDRAWITEMSTRUCT lpDrawItem; - lpDrawItem = (LPDRAWITEMSTRUCT) lParam; - if(lpDrawItem->CtlID == IDC_SPEAKIMG) - { - HDC hdcMem; - LONG left; - - /* position image in centre of dialog */ - left = (lpDrawItem->rcItem.right - ImgInfo.cxSource) / 2; - - hdcMem = CreateCompatibleDC(lpDrawItem->hDC); - if (hdcMem != NULL) - { - SelectObject(hdcMem, ImgInfo.hBitmap); - BitBlt(lpDrawItem->hDC, - left, - lpDrawItem->rcItem.top, - lpDrawItem->rcItem.right - lpDrawItem->rcItem.left, - lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, - hdcMem, - 0, - 0, - SRCCOPY); - DeleteDC(hdcMem); - } - } - return TRUE; - } - } - - return FALSE; -} - - /* Audio property page dialog callback */ static INT_PTR CALLBACK Modified: trunk/reactos/dll/cpl/mmsys/mmsys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.h (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.h Sat Sep 15 18:54:01 2007 @@ -13,6 +13,10 @@ extern HINSTANCE hApplet; + +#define DRVM_MAPPER 0x2000 +#define DRVM_MAPPER_PREFERRED_GET (DRVM_MAPPER+21) +#define DRVM_MAPPER_PREFERRED_SET (DRVM_MAPPER+22) /* main.c */ @@ -36,6 +40,14 @@ WPARAM wParam, LPARAM lParam); +/* volume.c */ + +INT_PTR CALLBACK +VolumeDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam); + #endif /* __CPL_MMSYS_H */ Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rbuild (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rbuild Sat Sep 15 18:54:01 2007 @@ -19,5 +19,6 @@ <library>advapi32</library> <file>mmsys.c</file> <file>sounds.c</file> + <file>volume.c</file> <file>mmsys.rc</file> </module> Modified: trunk/reactos/dll/cpl/mmsys/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/resource.h (original) +++ trunk/reactos/dll/cpl/mmsys/resource.h Sat Sep 15 18:54:01 2007 @@ -26,7 +26,7 @@ #define IDC_TEXT_SOUND 117 #define IDC_PLAY_SOUND 118 #define IDC_BROWSE_SOUND 119 - +#define IDC_DEVICE_NAME 120 #define IDB_SPEAKIMG 4624 #define IDC_SPEAKIMG 4625 Propchange: trunk/reactos/dll/cpl/mmsys/sounds.c ------------------------------------------------------------------------------ svn:keywords = author date revision Added: trunk/reactos/dll/cpl/mmsys/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/volume.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/volume.c (added) +++ trunk/reactos/dll/cpl/mmsys/volume.c Sat Sep 15 18:54:01 2007 @@ -1,0 +1,150 @@ +/* $Id: main.c 12852 2005-01-06 13:58:04Z mf $ + * + * PROJECT: ReactOS Multimedia Control Panel + * FILE: lib/cpl/mmsys/mmsys.c + * PURPOSE: ReactOS Multimedia Control Panel + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + * Johannes Anderwald <janderwald(a)reactos.com> + */ + +#include <windows.h> +#include <commctrl.h> +#include <setupapi.h> +#include <cpl.h> +#include <tchar.h> +#include <stdio.h> +#include "mmsys.h" +#include "resource.h" + +typedef struct _IMGINFO +{ + HBITMAP hBitmap; + INT cxSource; + INT cySource; +} IMGINFO, *PIMGINFO; + + +static VOID +InitImageInfo(PIMGINFO ImgInfo) +{ + BITMAP bitmap; + + ZeroMemory(ImgInfo, sizeof(*ImgInfo)); + + ImgInfo->hBitmap = LoadImage(hApplet, + MAKEINTRESOURCE(IDB_SPEAKIMG), + IMAGE_BITMAP, + 0, + 0, + LR_DEFAULTCOLOR); + + if (ImgInfo->hBitmap != NULL) + { + GetObject(ImgInfo->hBitmap, sizeof(BITMAP), &bitmap); + + ImgInfo->cxSource = bitmap.bmWidth; + ImgInfo->cySource = bitmap.bmHeight; + } +} + +void +InitVolumeControls(HWND hwndDlg) +{ + UINT NumWavOut; + WAVEOUTCAPS woc; + MMRESULT errcode; + DWORD dwDeviceID; + DWORD dwStatus; + + NumWavOut = waveOutGetNumDevs(); + if (!NumWavOut) + { + //FIXME + // deactivate all controls + return; + } + + errcode = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&dwDeviceID, (DWORD_PTR)&dwStatus); + if (errcode != MMSYSERR_NOERROR) + { + MessageBox(hwndDlg, _T("Failed to enumerate default device"), NULL, MB_OK); + return; + } + + if (waveOutGetDevCaps(dwDeviceID, &woc, sizeof(WAVEOUTCAPS)) != MMSYSERR_NOERROR) + { + MessageBox(hwndDlg, _T("waveOutGetDevCaps failed"), NULL, MB_OK); + return; + } + + SendDlgItemMessage(hwndDlg, IDC_DEVICE_NAME, WM_SETTEXT, (WPARAM)0, (LPARAM)woc.szPname); + + if (!(woc.dwSupport & WAVECAPS_VOLUME)) + { + /// the device does not support volume changes + /// disable volume control + EnableWindow(GetDlgItem(hwndDlg, IDC_VOLUME_TRACKBAR), FALSE); + } + else + { + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 10)); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPAGESIZE, (WPARAM)FALSE, (LPARAM)1); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETSEL, (WPARAM)FALSE, (LPARAM)MAKELONG(0, 10)); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)4); + } +} + +/* Volume property page dialog callback */ +//static INT_PTR CALLBACK +INT_PTR CALLBACK +VolumeDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + static IMGINFO ImgInfo; + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + + switch(uMsg) + { + case WM_INITDIALOG: + { + InitImageInfo(&ImgInfo); + InitVolumeControls(hwndDlg); + break; + } + case WM_DRAWITEM: + { + LPDRAWITEMSTRUCT lpDrawItem; + lpDrawItem = (LPDRAWITEMSTRUCT) lParam; + if(lpDrawItem->CtlID == IDC_SPEAKIMG) + { + HDC hdcMem; + LONG left; + + /* position image in centre of dialog */ + left = (lpDrawItem->rcItem.right - ImgInfo.cxSource) / 2; + + hdcMem = CreateCompatibleDC(lpDrawItem->hDC); + if (hdcMem != NULL) + { + SelectObject(hdcMem, ImgInfo.hBitmap); + BitBlt(lpDrawItem->hDC, + left, + lpDrawItem->rcItem.top, + lpDrawItem->rcItem.right - lpDrawItem->rcItem.left, + lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, + hdcMem, + 0, + 0, + SRCCOPY); + DeleteDC(hdcMem); + } + } + return TRUE; + } + } + + return FALSE; +} Propchange: trunk/reactos/dll/cpl/mmsys/volume.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/mmsys/volume.c ------------------------------------------------------------------------------ svn:keywords = author date revision

17 years, 3 months

[ekohl] 29057: Use the currently selected locale id instead of LOCALE_USER_DEFAULT to display and modify currency settings.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Sep 15 18:48:40 2007 New Revision: 29057 URL: http://svn.reactos.org/svn/reactos?rev=29057&view=rev Log: Use the currently selected locale id instead of LOCALE_USER_DEFAULT to display and modify currency settings. Modified: trunk/reactos/dll/cpl/intl/currency.c Modified: trunk/reactos/dll/cpl/intl/currency.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/currency.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/currency.c (original) +++ trunk/reactos/dll/cpl/intl/currency.c Sat Sep 15 18:48:40 2007 @@ -37,140 +37,111 @@ #define MAX_FIELD_DIG_SAMPLES 3 -typedef struct _GLOBAL_DATA -{ - TCHAR szCurrencySymbol[6]; - TCHAR szDecimalSep[4]; - TCHAR szThousandSep[4]; - TCHAR szGrouping[10]; - - int PositiveOrder; - int NegativeOrder; - int NumDigits; - -} GLOBAL_DATA, *PGLOBAL_DATA; - - -static VOID -GetInitialCurrencyValues(PGLOBAL_DATA pGlobalData) -{ - TCHAR szBuffer[MAX_FMT_SIZE]; - int ret; - - /* Get currency symbol */ - ret = GetLocaleInfo(LOCALE_USER_DEFAULT, - LOCALE_SCURRENCY, - pGlobalData->szCurrencySymbol, 6); - - /* Get positive format */ - ret = GetLocaleInfo(LOCALE_USER_DEFAULT, - LOCALE_ICURRENCY, - szBuffer, MAX_FMT_SIZE); - if (ret != 0) - { - pGlobalData->PositiveOrder = _ttoi(szBuffer); - } - - /* Get negative format */ - ret = GetLocaleInfo(LOCALE_USER_DEFAULT, - LOCALE_INEGCURR, - szBuffer, MAX_FMT_SIZE); - if (ret != 0) - { - pGlobalData->NegativeOrder = _ttoi(szBuffer); - } - - /* Get number of fractional digits */ - ret = GetLocaleInfo(LOCALE_USER_DEFAULT, - LOCALE_ICURRDIGITS, - szBuffer, MAX_FMT_SIZE); - if (ret != 0) - { - pGlobalData->NumDigits = _ttoi(szBuffer); - } - - /* Get decimal separator */ - ret = GetLocaleInfo(LOCALE_USER_DEFAULT, - LOCALE_SMONDECIMALSEP, - pGlobalData->szDecimalSep, 4); - - /* Get group separator */ - ret = GetLocaleInfo(LOCALE_USER_DEFAULT, - LOCALE_SMONTHOUSANDSEP, - pGlobalData->szThousandSep, 4); - - /* Get grouping */ - ret = GetLocaleInfo(LOCALE_USER_DEFAULT, - LOCALE_SMONGROUPING, - pGlobalData->szGrouping, 10); -} - - -static VOID -UpdateExamples(HWND hwndDlg, PGLOBAL_DATA pGlobalData) -{ - TCHAR szBuffer[MAX_FMT_SIZE]; - CURRENCYFMT cyFmt; - - cyFmt.NumDigits = pGlobalData->NumDigits; - cyFmt.LeadingZero = 0; - cyFmt.Grouping = 3; - cyFmt.lpDecimalSep = pGlobalData->szDecimalSep; - cyFmt.lpThousandSep = pGlobalData->szThousandSep; - cyFmt.PositiveOrder = pGlobalData->PositiveOrder; - cyFmt.NegativeOrder = pGlobalData->NegativeOrder; - cyFmt.lpCurrencySymbol = pGlobalData->szCurrencySymbol; +static VOID +UpdateExamples(HWND hwndDlg, PGLOBALDATA pGlobalData) +{ + TCHAR szBuffer[MAX_FMT_SIZE]; /* positive example */ - GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + GetCurrencyFormat(pGlobalData->lcid, 0, POSITIVE_EXAMPLE, - &cyFmt, szBuffer, MAX_FMT_SIZE); + NULL, szBuffer, MAX_FMT_SIZE); SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYPOSSAMPLE), WM_SETTEXT, 0, (LPARAM)szBuffer); /* negative example */ - GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + GetCurrencyFormat(pGlobalData->lcid, 0, NEGATIVE_EXAMPLE, - &cyFmt, szBuffer, MAX_FMT_SIZE); + NULL, szBuffer, MAX_FMT_SIZE); SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYNEGSAMPLE), WM_SETTEXT, 0, (LPARAM)szBuffer); } static VOID -OnInitDialog(HWND hwndDlg, PGLOBAL_DATA pGlobalData) -{ - TCHAR szBuffer[MAX_FMT_SIZE]; - CURRENCYFMT cyFmt; - int i; - - GetInitialCurrencyValues(pGlobalData); - - /* Set currency symbol */ +InitCurrencySymbols(HWND hwndDlg, PGLOBALDATA pGlobalData) +{ + TCHAR szBuffer[MAX_FMT_SIZE]; + + /* Set currency symbols */ + GetLocaleInfo(pGlobalData->lcid, + LOCALE_SCURRENCY, + szBuffer, MAX_FMT_SIZE); + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYSYMBOL), CB_ADDSTRING, 0, - (LPARAM)pGlobalData->szCurrencySymbol); + (LPARAM)szBuffer); SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYSYMBOL), CB_SETCURSEL, 0, /* index */ 0); - +} + + +static VOID +InitCurrencyPositiveFormats(HWND hwndDlg, PGLOBALDATA pGlobalData) +{ + TCHAR szDecimalSep[MAX_FMT_SIZE]; + TCHAR szThousandSep[MAX_FMT_SIZE]; + TCHAR szCurrencySymbol[MAX_FMT_SIZE]; + TCHAR szBuffer[MAX_FMT_SIZE]; + CURRENCYFMT cyFmt; + INT nPositiveOrder = 0; + INT ret; + INT i; + + + /* Get positive format */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_ICURRENCY, + szBuffer, MAX_FMT_SIZE); + if (ret != 0) + { + nPositiveOrder = _ttoi(szBuffer); + } + + /* Get number of fractional digits */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_ICURRDIGITS, + szBuffer, MAX_FMT_SIZE); + if (ret != 0) + { + cyFmt.NumDigits = _ttoi(szBuffer); + } + else + { + cyFmt.NumDigits = 0; + } + + /* Get decimal separator */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_SMONDECIMALSEP, + szDecimalSep, MAX_FMT_SIZE); + + /* Get group separator */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_SMONTHOUSANDSEP, + szThousandSep, MAX_FMT_SIZE); + + /* Get currency symbol */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_SCURRENCY, + szCurrencySymbol, MAX_FMT_SIZE); /* positive currency values */ - cyFmt.NumDigits = pGlobalData->NumDigits; cyFmt.LeadingZero = 0; cyFmt.Grouping = 3; - cyFmt.lpDecimalSep = pGlobalData->szDecimalSep; - cyFmt.lpThousandSep = pGlobalData->szThousandSep; + cyFmt.lpDecimalSep = szDecimalSep; + cyFmt.lpThousandSep = szThousandSep; + cyFmt.lpCurrencySymbol = szCurrencySymbol; cyFmt.NegativeOrder = 0; - cyFmt.lpCurrencySymbol = pGlobalData->szCurrencySymbol; for (i = 0; i < 4; i++) { cyFmt.PositiveOrder = i; - GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + GetCurrencyFormat(pGlobalData->lcid, 0, _T("1.1"), &cyFmt, szBuffer, MAX_FMT_SIZE); @@ -182,15 +153,72 @@ SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYPOSVALUE), CB_SETCURSEL, - pGlobalData->PositiveOrder, + nPositiveOrder, 0); +} + + +static VOID +InitCurrencyNegativeFormats(HWND hwndDlg, PGLOBALDATA pGlobalData) +{ + TCHAR szDecimalSep[MAX_FMT_SIZE]; + TCHAR szThousandSep[MAX_FMT_SIZE]; + TCHAR szCurrencySymbol[MAX_FMT_SIZE]; + TCHAR szBuffer[MAX_FMT_SIZE]; + CURRENCYFMT cyFmt; + INT nNegativeOrder = 0; + INT ret; + int i; + + /* Get negative format */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_INEGCURR, + szBuffer, MAX_FMT_SIZE); + if (ret != 0) + { + nNegativeOrder = _ttoi(szBuffer); + } + + /* Get number of fractional digits */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_ICURRDIGITS, + szBuffer, MAX_FMT_SIZE); + if (ret != 0) + { + cyFmt.NumDigits = _ttoi(szBuffer); + } + else + { + cyFmt.NumDigits = 0; + } + + /* Get decimal separator */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_SMONDECIMALSEP, + szDecimalSep, MAX_FMT_SIZE); + + /* Get group separator */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_SMONTHOUSANDSEP, + szThousandSep, MAX_FMT_SIZE); + + /* Get currency symbol */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_SCURRENCY, + szCurrencySymbol, MAX_FMT_SIZE); /* negative currency values */ + cyFmt.LeadingZero = 0; + cyFmt.Grouping = 3; + cyFmt.lpDecimalSep = szDecimalSep; + cyFmt.lpThousandSep = szThousandSep; + cyFmt.lpCurrencySymbol = szCurrencySymbol; cyFmt.PositiveOrder = 0; + for (i = 0; i < 16; i++) { cyFmt.NegativeOrder = i; - GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + GetCurrencyFormat(pGlobalData->lcid, 0, _T("-1.1"), &cyFmt, szBuffer, MAX_FMT_SIZE); @@ -202,19 +230,41 @@ SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYNEGVALUE), CB_SETCURSEL, - pGlobalData->NegativeOrder, /* index */ + nNegativeOrder, 0); +} + + +static VOID +InitCurrencyDecimalSeparators(HWND hwndDlg, PGLOBALDATA pGlobalData) +{ + TCHAR szBuffer[MAX_FMT_SIZE]; + + /* Get decimal separator */ + GetLocaleInfo(pGlobalData->lcid, + LOCALE_SMONDECIMALSEP, + szBuffer, MAX_FMT_SIZE); /* decimal separator */ SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECSEP), CB_ADDSTRING, 0, - (LPARAM)pGlobalData->szDecimalSep); + (LPARAM)szBuffer); SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECSEP), CB_SETCURSEL, 0, /* index */ 0); +} + + +/* Initialize the number of fractional digits */ +static VOID +InitCurrencyNumFracDigits(HWND hwndDlg, PGLOBALDATA pGlobalData) +{ + TCHAR szBuffer[MAX_FMT_SIZE]; + int ret; + int i; /* */ for (i = 0; i < 10; i++) @@ -227,32 +277,80 @@ (LPARAM)szBuffer); } - SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECNUM), - CB_SETCURSEL, - pGlobalData->NumDigits, /* index */ - 0); - + /* Get number of fractional digits */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_ICURRDIGITS, + szBuffer, MAX_FMT_SIZE); + if (ret != 0) + { + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECNUM), + CB_SETCURSEL, + _ttoi(szBuffer), + 0); + } + else + { + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECNUM), + CB_SETCURSEL, + 0, + 0); + } +} + + +/* Initialize the list of group separators */ +static VOID +InitCurrencyGroupSeparators(HWND hwndDlg, PGLOBALDATA pGlobalData) +{ + TCHAR szBuffer[MAX_FMT_SIZE]; + + /* Get group separator */ + GetLocaleInfo(pGlobalData->lcid, + LOCALE_SMONTHOUSANDSEP, + szBuffer, MAX_FMT_SIZE); /* digit group separator */ SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPSEP), CB_ADDSTRING, 0, - (LPARAM)pGlobalData->szThousandSep); + (LPARAM)szBuffer); SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPSEP), CB_SETCURSEL, 0, /* index */ 0); +} + + +static VOID +InitDigitGroupCB(HWND hwndDlg, PGLOBALDATA pGlobalData) +{ + TCHAR szThousandSep[MAX_FMT_SIZE]; + TCHAR szGrouping[MAX_FMT_SIZE]; + TCHAR szBuffer[MAX_FMT_SIZE]; + CURRENCYFMT cyFmt; + INT ret; + INT i; + + /* Get group separator */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_SMONTHOUSANDSEP, + szThousandSep, MAX_FMT_SIZE); + + /* Get grouping */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_SMONGROUPING, + szGrouping, MAX_FMT_SIZE); /* digit grouping */ cyFmt.NumDigits = 0; cyFmt.LeadingZero = 0; cyFmt.lpDecimalSep = _T(""); - cyFmt.lpThousandSep = pGlobalData->szThousandSep; + cyFmt.lpThousandSep = szThousandSep; cyFmt.NegativeOrder = 0; cyFmt.lpCurrencySymbol = _T(""); cyFmt.Grouping = 0; - GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + GetCurrencyFormat(pGlobalData->lcid, 0, _T("123456789"), &cyFmt, szBuffer, MAX_FMT_SIZE); SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM), @@ -261,7 +359,7 @@ (LPARAM)szBuffer); cyFmt.Grouping = 3; - GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + GetCurrencyFormat(pGlobalData->lcid, 0, _T("123456789"), &cyFmt, szBuffer, MAX_FMT_SIZE); SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM), @@ -270,7 +368,7 @@ (LPARAM)szBuffer); cyFmt.Grouping = 32; - GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + GetCurrencyFormat(pGlobalData->lcid, 0, _T("123456789"), &cyFmt, szBuffer, MAX_FMT_SIZE); SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM), @@ -279,10 +377,10 @@ (LPARAM)szBuffer); i = 0; - if (pGlobalData->szGrouping[0] == _T('3')) - { - if ((pGlobalData->szGrouping[1] == _T(';')) && - (pGlobalData->szGrouping[2] == _T('2'))) + if (szGrouping[0] == _T('3')) + { + if ((szGrouping[1] == _T(';')) && + (szGrouping[2] == _T('2'))) i = 2; else i = 1; @@ -292,14 +390,12 @@ CB_SETCURSEL, i, /* index */ 0); - - /* Show the examples */ - UpdateExamples(hwndDlg, pGlobalData); -} +} + /* Set number of digidts in field */ static BOOL -SetCurrencyDigNum(HWND hwndDlg) +SetCurrencyDigNum(HWND hwndDlg, LCID lcid) { LPTSTR szFieldDigNumSamples[MAX_FIELD_DIG_SAMPLES]= { @@ -317,14 +413,14 @@ (LPARAM)0); /* Save number of digidts in field */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SMONGROUPING, szFieldDigNumSamples[nCurrSel]); + SetLocaleInfo(lcid, LOCALE_SMONGROUPING, szFieldDigNumSamples[nCurrSel]); return TRUE; } /* Set currency field separator */ static BOOL -SetCurrencyFieldSep(HWND hwndDlg) +SetCurrencyFieldSep(HWND hwndDlg, LCID lcid) { TCHAR szCurrencyFieldSep[MAX_SAMPLES_STR_SIZE]; @@ -335,14 +431,14 @@ (LPARAM)szCurrencyFieldSep); /* Save currency field separator */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SMONTHOUSANDSEP, szCurrencyFieldSep); + SetLocaleInfo(lcid, LOCALE_SMONTHOUSANDSEP, szCurrencyFieldSep); return TRUE; } /* Set number of fractional symbols */ static BOOL -SetCurrencyFracSymNum(HWND hwndDlg) +SetCurrencyFracSymNum(HWND hwndDlg, LCID lcid) { TCHAR szCurrencyFracSymNum[MAX_SAMPLES_STR_SIZE]; INT nCurrSel; @@ -357,14 +453,14 @@ _itot(nCurrSel, szCurrencyFracSymNum, DECIMAL_RADIX); /* Save number of fractional symbols */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_ICURRDIGITS, szCurrencyFracSymNum); + SetLocaleInfo(lcid, LOCALE_ICURRDIGITS, szCurrencyFracSymNum); return TRUE; } /* Set currency separator */ static BOOL -SetCurrencySep(HWND hwndDlg) +SetCurrencySep(HWND hwndDlg, LCID lcid) { TCHAR szCurrencySep[MAX_SAMPLES_STR_SIZE]; @@ -377,14 +473,14 @@ /* TODO: Add check for correctly input */ /* Save currency separator */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, szCurrencySep); + SetLocaleInfo(lcid, LOCALE_SMONDECIMALSEP, szCurrencySep); return TRUE; } /* Set negative currency sum format */ static BOOL -SetNegCurrencySumFmt(HWND hwndDlg) +SetNegCurrencySumFmt(HWND hwndDlg, LCID lcid) { TCHAR szNegCurrencySumFmt[MAX_SAMPLES_STR_SIZE]; INT nCurrSel; @@ -399,14 +495,14 @@ _itot(nCurrSel, szNegCurrencySumFmt, DECIMAL_RADIX); /* Save currency sum format */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_INEGCURR, szNegCurrencySumFmt); + SetLocaleInfo(lcid, LOCALE_INEGCURR, szNegCurrencySumFmt); return TRUE; } /* Set positive currency sum format */ static BOOL -SetPosCurrencySumFmt(HWND hwndDlg) +SetPosCurrencySumFmt(HWND hwndDlg, LCID lcid) { TCHAR szPosCurrencySumFmt[MAX_SAMPLES_STR_SIZE]; INT nCurrSel; @@ -421,14 +517,14 @@ _itot(nCurrSel, szPosCurrencySumFmt, DECIMAL_RADIX); /* Save currency sum format */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_ICURRENCY, szPosCurrencySumFmt); + SetLocaleInfo(lcid, LOCALE_ICURRENCY, szPosCurrencySumFmt); return TRUE; } /* Set currency unit */ static BOOL -SetCurrencyUnit(HWND hwndDlg) +SetCurrencyUnit(HWND hwndDlg, LCID lcid) { TCHAR szCurrencyUnit[MAX_SAMPLES_STR_SIZE]; @@ -439,7 +535,7 @@ (LPARAM)(LPCSTR)szCurrencyUnit); /* Save currency unit */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, szCurrencyUnit); + SetLocaleInfo(lcid, LOCALE_SCURRENCY, szCurrencyUnit); return TRUE; } @@ -451,16 +547,24 @@ WPARAM wParam, LPARAM lParam) { - PGLOBAL_DATA pGlobalData; - - pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + PGLOBALDATA pGlobalData; + + pGlobalData = (PGLOBALDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: - pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + pGlobalData = (PGLOBALDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); - OnInitDialog(hwndDlg, pGlobalData); + + InitCurrencySymbols(hwndDlg, pGlobalData); + InitCurrencyPositiveFormats(hwndDlg, pGlobalData); + InitCurrencyNegativeFormats(hwndDlg, pGlobalData); + InitCurrencyDecimalSeparators(hwndDlg, pGlobalData); + InitCurrencyNumFracDigits(hwndDlg, pGlobalData); + InitCurrencyGroupSeparators(hwndDlg, pGlobalData); + InitDigitGroupCB(hwndDlg, pGlobalData); + UpdateExamples(hwndDlg, pGlobalData); break; case WM_COMMAND: @@ -487,35 +591,31 @@ /* If push apply button */ if (lpnm->code == (UINT)PSN_APPLY) { - if (!SetCurrencyDigNum(hwndDlg)) + if (!SetCurrencyDigNum(hwndDlg, pGlobalData->lcid)) break; - if (!SetCurrencyUnit(hwndDlg)) + if (!SetCurrencyUnit(hwndDlg, pGlobalData->lcid)) break; - if (!SetPosCurrencySumFmt(hwndDlg)) + if (!SetPosCurrencySumFmt(hwndDlg, pGlobalData->lcid)) break; - if (!SetNegCurrencySumFmt(hwndDlg)) + if (!SetNegCurrencySumFmt(hwndDlg, pGlobalData->lcid)) break; - if (!SetCurrencySep(hwndDlg)) + if (!SetCurrencySep(hwndDlg, pGlobalData->lcid)) break; - if (!SetCurrencyFracSymNum(hwndDlg)) + if (!SetCurrencyFracSymNum(hwndDlg, pGlobalData->lcid)) break; - if (!SetCurrencyFieldSep(hwndDlg)) + if (!SetCurrencyFieldSep(hwndDlg, pGlobalData->lcid)) break; UpdateExamples(hwndDlg, pGlobalData); } } break; - - case WM_DESTROY: - HeapFree(GetProcessHeap(), 0, pGlobalData); - break; } return FALSE;

17 years, 3 months

[cfinck] 29055: Tag ReactOS 0.3.3 release

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Sep 15 15:08:32 2007 New Revision: 29055 URL: http://svn.reactos.org/svn/reactos?rev=29055&view=rev Log: Tag ReactOS 0.3.3 release Added: tags/ReactOS-0.3.3/ - copied from r29054, branches/ros-branch-0_3_3-new/ Removed: branches/ros-branch-0_3_3-new/

17 years, 3 months

[winesync] 29054: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Sat Sep 15 14:52:08 2007 New Revision: 29054 URL: http://svn.reactos.org/svn/reactos?rev=29054&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/treeview.c Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.rbuild (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.rbuild Sat Sep 15 14:52:08 2007 @@ -1,4 +1,6 @@ -<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true" entrypoint="0"> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllInstall" /> <importlibrary definition="comctl32.spec.def" /> <include base="comctl32">.</include> Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Sat Sep 15 14:52:08 2007 @@ -31,7 +31,7 @@ =================================================================== --- propsheet.c (revision 25766) +++ propsheet.c (working copy) -@@ -2431,6 +2431,28 @@ +@@ -2434,6 +2434,28 @@ return FALSE; } @@ -60,7 +60,7 @@ /****************************************************************************** * PROPSHEET_SetWizButtons * -@@ -2453,17 +2475,6 @@ +@@ -2456,17 +2478,6 @@ EnableWindow(hwndNext, FALSE); EnableWindow(hwndFinish, FALSE); @@ -78,7 +78,7 @@ if (dwFlags & PSWIZB_BACK) EnableWindow(hwndBack, TRUE); -@@ -2493,6 +2504,32 @@ +@@ -2496,6 +2507,32 @@ } else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) EnableWindow(hwndFinish, TRUE); Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… ============================================================================== --- trunk/reactos/dll/win32/comctl32/propsheet.c (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c Sat Sep 15 14:52:08 2007 @@ -402,7 +402,7 @@ */ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, PropSheetInfo * psInfo, - int index) + int index, BOOL resize) { const DLGTEMPLATE* pTemplate; const WORD* p; @@ -503,11 +503,14 @@ } /* remember the largest width and height */ - if (width > psInfo->width) - psInfo->width = width; - - if (height > psInfo->height) - psInfo->height = height; + if (resize) + { + if (width > psInfo->width) + psInfo->width = width; + + if (height > psInfo->height) + psInfo->height = height; + } /* menu */ switch ((WORD)*p) @@ -2284,7 +2287,7 @@ return FALSE; psInfo->proppage = ppi; - if (!PROPSHEET_CollectPageInfo(ppsp, psInfo, psInfo->nPages)) + if (!PROPSHEET_CollectPageInfo(ppsp, psInfo, psInfo->nPages, FALSE)) return FALSE; psInfo->proppage[psInfo->nPages].hpage = hpage; @@ -2877,7 +2880,7 @@ } if (!PROPSHEET_CollectPageInfo((LPCPROPSHEETPAGEW)psInfo->proppage[n].hpage, - psInfo, n)) + psInfo, n, TRUE)) { if (psInfo->usePropPage) DestroyPropertySheetPage(psInfo->proppage[n].hpage); @@ -2920,7 +2923,7 @@ } if (!PROPSHEET_CollectPageInfo((LPCPROPSHEETPAGEW)psInfo->proppage[n].hpage, - psInfo, n)) + psInfo, n, TRUE)) { if (psInfo->usePropPage) DestroyPropertySheetPage(psInfo->proppage[n].hpage); Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c Sat Sep 15 14:52:08 2007 @@ -3801,6 +3801,7 @@ if (ptr == NULL) { ERR("OutOfMemory, cannot allocate space for label\n"); + if(newText != tmpText) Free(newText); DestroyWindow(infoPtr->hwndEdit); infoPtr->hwndEdit = 0; return FALSE;

17 years, 3 months

[hpoussin] 29053: Fix typo

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Sep 15 13:03:01 2007 New Revision: 29053 URL: http://svn.reactos.org/svn/reactos?rev=29053&view=rev Log: Fix typo Modified: trunk/reactos/tools/rbuild/directory.cpp Modified: trunk/reactos/tools/rbuild/directory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/directory.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/directory.cpp (original) +++ trunk/reactos/tools/rbuild/directory.cpp Sat Sep 15 13:03:01 2007 @@ -167,13 +167,12 @@ if ( parent.size () > 0 ) { - char buf[256]; if ( name.size () > 0 ) path = parent + sSep + name; else path = parent; - if ( CreateDirectory ( buf ) && verbose ) - printf ( "Created %s\n", buf ); + if ( CreateDirectory ( path ) && verbose ) + printf ( "Created %s\n", path.c_str () ); } else path = name;

17 years, 3 months

[hpoussin] 29052: Continue rbuild cleanup (Directory class)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Sep 15 12:47:56 2007 New Revision: 29052 URL: http://svn.reactos.org/svn/reactos?rev=29052&view=rev Log: Continue rbuild cleanup (Directory class) Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/directory.cpp trunk/reactos/tools/rbuild/rbuild.h trunk/reactos/tools/rbuild/wineresource.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Sat Sep 15 12:47:56 2007 @@ -172,9 +172,9 @@ Configuration& configuration ) : Backend ( project, configuration ), manualBinutilsSetting( false ), - intermediateDirectory ( new Directory ("$(INTERMEDIATE)" ) ), - outputDirectory ( new Directory ( "$(OUTPUT)" ) ), - installDirectory ( new Directory ( "$(INSTALL)" ) ) + intermediateDirectory ( new Directory ( "" ) ), + outputDirectory ( new Directory ( "" ) ), + installDirectory ( new Directory ( "" ) ) { compilerPrefix = ""; } @@ -768,10 +768,10 @@ MingwBackend::GenerateDirectories () { printf ( "Creating directories..." ); - intermediateDirectory->GenerateTree ( "", configuration.Verbose ); - outputDirectory->GenerateTree ( "", configuration.Verbose ); + intermediateDirectory->GenerateTree ( IntermediateDirectory, configuration.Verbose ); + outputDirectory->GenerateTree ( OutputDirectory, configuration.Verbose ); if ( !configuration.MakeHandlesInstallDirectories ) - installDirectory->GenerateTree ( "", configuration.Verbose ); + installDirectory->GenerateTree ( InstallDirectory, configuration.Verbose ); printf ( "done\n" ); } @@ -1336,7 +1336,7 @@ void MingwBackend::GenerateDirectoryTargets () { - intermediateDirectory->CreateRule ( fMakefile, "" ); - outputDirectory->CreateRule ( fMakefile, "" ); - installDirectory->CreateRule ( fMakefile, "" ); -} + intermediateDirectory->CreateRule ( fMakefile, "$(INTERMEDIATE)" ); + outputDirectory->CreateRule ( fMakefile, "$(OUTPUT)" ); + installDirectory->CreateRule ( fMakefile, "$(INSTALL)" ); +} Modified: trunk/reactos/tools/rbuild/directory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/directory.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/directory.cpp (original) +++ trunk/reactos/tools/rbuild/directory.cpp Sat Sep 15 12:47:56 2007 @@ -37,6 +37,29 @@ Directory::Directory ( const string& name_ ) : name(name_) { + size_t pos = name.find_first_of ( "$:" ); + if ( pos != string::npos ) + { + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid directory name '%s'", + name.c_str() ); + } + + const char* p = strpbrk ( name_.c_str (), "/\\" ); + if ( name_.c_str () == p ) + { + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid relative path '%s'", + name_.c_str () ); + } + + if ( p ) + { + name.erase ( p - name.c_str ()); + Add ( p + 1 ); + } } void @@ -95,7 +118,7 @@ } bool -Directory::CreateDirectory ( string path ) +Directory::CreateDirectory ( const string& path ) { size_t index = 0; size_t nextIndex; @@ -116,26 +139,24 @@ return directoryWasCreated; } -string -Directory::ReplaceVariable ( const string& name, - const string& value, - string path ) -{ - size_t i = path.find ( name ); - if ( i != string::npos ) - return path.replace ( i, name.length (), value ); - else - return path; -} - -void -Directory::ResolveVariablesInPath ( char* buf, - const string& path ) -{ - string s = ReplaceVariable ( "$(INTERMEDIATE)", Environment::GetIntermediatePath (), path ); - s = ReplaceVariable ( "$(OUTPUT)", Environment::GetOutputPath (), s ); - s = ReplaceVariable ( "$(INSTALL)", Environment::GetInstallPath (), s ); - strcpy ( buf, s.c_str () ); +void +Directory::GenerateTree ( DirectoryLocation root, + bool verbose ) +{ + switch ( root ) + { + case IntermediateDirectory: + return GenerateTree ( Environment::GetIntermediatePath (), verbose ); + case OutputDirectory: + return GenerateTree ( Environment::GetOutputPath (), verbose ); + case InstallDirectory: + return GenerateTree ( Environment::GetInstallPath (), verbose ); + default: + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid directory %d.", + root ); + } } void @@ -147,12 +168,10 @@ if ( parent.size () > 0 ) { char buf[256]; - if ( name.size () > 0 ) path = parent + sSep + name; else path = parent; - ResolveVariablesInPath ( buf, path ); if ( CreateDirectory ( buf ) && verbose ) printf ( "Created %s\n", buf ); } @@ -168,10 +187,10 @@ } string -Directory::EscapeSpaces ( string path ) +Directory::EscapeSpaces ( const string& path ) { string newpath; - char* p = &path[0]; + const char* p = &path[0]; while ( *p != 0 ) { if ( *p == ' ' ) @@ -188,16 +207,16 @@ const string& parent ) { string path; - - if ( parent.size() > 0 ) - { - string escapedParent = EscapeSpaces ( parent ); + string escapedName = EscapeSpaces ( name ); + + if ( escapedName.size() > 0 ) + { fprintf ( f, "%s%c%s: | %s\n", - escapedParent.c_str (), + parent.c_str (), cSep, - EscapeSpaces ( name ).c_str (), - escapedParent.c_str () ); + escapedName.c_str (), + parent.c_str () ); fprintf ( f, "\t$(ECHO_MKDIR)\n" ); @@ -205,10 +224,10 @@ fprintf ( f, "\t${mkdir} $@\n" ); - path = parent + sSep + name; + path = parent + sSep + escapedName; } else - path = name; + path = parent; for ( directory_map::iterator i = subdirs.begin(); i != subdirs.end(); Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Sat Sep 15 12:47:56 2007 @@ -120,6 +120,15 @@ virtual void ProcessXML(); }; +enum DirectoryLocation +{ + SourceDirectory, + IntermediateDirectory, + OutputDirectory, + InstallDirectory, + TemporaryDirectory, +}; + class Directory { public: @@ -127,20 +136,16 @@ directory_map subdirs; Directory ( const std::string& name ); void Add ( const char* subdir ); + void GenerateTree ( DirectoryLocation root, + bool verbose ); + void CreateRule ( FILE* f, + const std::string& parent ); +private: + bool mkdir_p ( const char* path ); + bool CreateDirectory ( const std::string& path ); + std::string EscapeSpaces ( const std::string& path ); void GenerateTree ( const std::string& parent, bool verbose ); - std::string EscapeSpaces ( std::string path ); - void CreateRule ( FILE* f, - const std::string& parent ); -private: - bool mkdir_p ( const char* path ); - std::string ReplaceVariable ( const std::string& name, - const std::string& value, - std::string path ); - std::string GetEnvironmentVariable ( const std::string& name ); - void ResolveVariablesInPath ( char* buf, - const std::string& path ); - bool CreateDirectory ( std::string path ); }; @@ -300,15 +305,6 @@ HostFalse, HostDefault, HostTrue -}; - -enum DirectoryLocation -{ - SourceDirectory, - IntermediateDirectory, - OutputDirectory, - InstallDirectory, - TemporaryDirectory, }; class FileLocation Modified: trunk/reactos/tools/rbuild/wineresource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/wineresource.… ============================================================================== --- trunk/reactos/tools/rbuild/wineresource.cpp (original) +++ trunk/reactos/tools/rbuild/wineresource.cpp Sat Sep 15 12:47:56 2007 @@ -111,7 +111,7 @@ NormalizeFilename ( resourceFilename ).c_str () ); string command = FixSeparatorForSystemCommand(bin2res) + " " + parameters; - Directory( relativeDirectory ).GenerateTree( Environment::GetIntermediatePath(), false ); + Directory( relativeDirectory ).GenerateTree( IntermediateDirectory, project.configuration.Verbose ); int exitcode = system ( command.c_str () ); if ( exitcode != 0 )

17 years, 3 months

[tkreuzer] 29051: revert 29027, because it breaks context menus.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Sep 15 02:46:38 2007 New Revision: 29051 URL: http://svn.reactos.org/svn/reactos?rev=29051&view=rev Log: revert 29027, because it breaks context menus. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Sat Sep 15 02:46:38 2007 @@ -403,10 +403,10 @@ RtlZeroMemory(ObjectBody, GetObjectSize(TypeIndex)); - /* On Windows the higher 16 bit of the type field don't contain the - full type from the handle, but the base type. - (type = BRSUH, PEN, EXTPEN, basetype = BRUSH) */ - TypeInfo = (ObjectType & GDI_HANDLE_BASETYPE_MASK) | (ObjectType >> GDI_ENTRY_UPPER_SHIFT); + /* FIXME: On Windows the higher 16 bit of the type field don't always match + the type from the handle, it is probably a storage type + (type = pen, storage = brush) */ + TypeInfo = (ObjectType & GDI_HANDLE_TYPE_MASK) | (ObjectType >> GDI_ENTRY_UPPER_SHIFT); FreeEntry = InterlockedPopEntrySList(&HandleTable->FreeEntriesHead); if(FreeEntry != NULL) @@ -641,7 +641,6 @@ if(((ULONG_PTR)PrevProcId & ~0x1) == 0) { DPRINT1("Attempted to free global gdi handle 0x%x, caller needs to get ownership first!!!\n", hObj); - DPRINT1("Entry->Type = 0x%lx, Entry->KernelData = 0x%p\n", Entry->Type, Entry->KernelData); KeRosDumpStackFrames(NULL, 20); } else @@ -1061,7 +1060,7 @@ } BOOL INTERNAL_CALL -GDIOBJ_ConvertToStockObj(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ *phObj) +GDIOBJ_ConvertToStockObj(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ *hObj) { /* * FIXME !!!!! THIS FUNCTION NEEDS TO BE FIXED - IT IS NOT SAFE WHEN OTHER THREADS @@ -1070,24 +1069,22 @@ PGDI_TABLE_ENTRY Entry; HANDLE ProcessId, LockedProcessId, PrevProcId; PETHREAD Thread; - HGDIOBJ hObj; #ifdef GDI_DEBUG ULONG Attempts = 0; #endif - ASSERT(phObj); - hObj = *phObj; - - DPRINT("GDIOBJ_ConvertToStockObj: hObj: 0x%08x\n", hObj); + ASSERT(hObj); + + DPRINT("GDIOBJ_ConvertToStockObj: hObj: 0x%08x\n", *hObj); Thread = PsGetCurrentThread(); - if(!GDI_HANDLE_IS_STOCKOBJ(hObj)) + if(!GDI_HANDLE_IS_STOCKOBJ(*hObj)) { ProcessId = PsGetCurrentProcessId(); LockedProcessId = (HANDLE)((ULONG_PTR)ProcessId | 0x1); - Entry = GDI_HANDLE_GET_ENTRY(HandleTable, hObj); + Entry = GDI_HANDLE_GET_ENTRY(HandleTable, *hObj); LockHandle: /* lock the object, we must not convert stock objects, so don't check!!! */ @@ -1099,13 +1096,16 @@ /* we're locking an object that belongs to our process. First calculate the new object type including the stock object flag and then try to exchange it.*/ - /* On Windows the higher 16 bit of the type field don't contain the - full type from the handle, but the base type. - (type = BRSUH, PEN, EXTPEN, basetype = BRUSH) */ - OldType = ((ULONG)hObj & GDI_HANDLE_BASETYPE_MASK) | ((ULONG)hObj >> GDI_ENTRY_UPPER_SHIFT); - + /* FIXME: On Windows the higher 16 bit of the type field don't always match + the type from the handle, it is probably a storage type + (type = pen, storage = brush) */ + NewType = GDI_HANDLE_GET_TYPE(*hObj); + NewType |= GDI_HANDLE_GET_UPPER(*hObj) >> GDI_ENTRY_UPPER_SHIFT; + + /* This is the type that the object should have right now, save it */ + OldType = NewType; /* As the object should be a stock object, set it's flag, but only in the lower 16 bits */ - NewType = OldType | GDI_ENTRY_STOCK_MASK; + NewType |= GDI_ENTRY_STOCK_MASK; /* Try to exchange the type field - but only if the old (previous type) matches! */ PrevType = InterlockedCompareExchange(&Entry->Type, NewType, OldType); @@ -1146,8 +1146,7 @@ /* remove the process id lock and make it global */ (void)InterlockedExchangePointer(&Entry->ProcessId, GDI_GLOBAL_PROCESS); - hObj = (HGDIOBJ)((ULONG)(hObj) | GDI_HANDLE_STOCK_MASK); - *phObj = hObj; + *hObj = (HGDIOBJ)((ULONG)(*hObj) | GDI_HANDLE_STOCK_MASK); /* we're done, successfully converted the object */ return TRUE; @@ -1301,7 +1300,6 @@ else { DPRINT1("Attempted to change ownership of an object 0x%x currently being destroyed!!!\n", ObjectHandle); - DPRINT1("Entry->Type = 0x%lx, Entry->KernelData = 0x%p\n", Entry->Type, Entry->KernelData); } } else if(PrevProcId == LockedProcessId)

17 years, 3 months

[janderwald] 29050: - reenable module definition

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Sep 15 01:44:11 2007 New Revision: 29050 URL: http://svn.reactos.org/svn/reactos?rev=29050&view=rev Log: - reenable module definition Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sat Sep 15 01:44:11 2007 @@ -439,10 +439,9 @@ fprintf ( OUT, "\t\t\t\tDataExecutionPrevention=\"0\"\r\n" ); } -#if 0 if (module.importLibrary != NULL) - fprintf ( OUT, "\t\t\t\tModuleDefinitionFile=\"%s\"\r\n", module.importLibrary->definition.c_str()); -#endif + fprintf ( OUT, "\t\t\t\tModuleDefinitionFile=\"%s\"\r\n", module.importLibrary->source->name.c_str ()); + fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" ); bool use_msvcrt_lib = false; for ( i = 0; i < libraries.size(); i++ )

17 years, 3 months

[janderwald] 29049: - remove a non working hack

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Sep 15 01:06:38 2007 New Revision: 29049 URL: http://svn.reactos.org/svn/reactos?rev=29049&view=rev Log: - remove a non working hack Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc Sat Sep 15 01:06:38 2007 @@ -8,11 +8,7 @@ #define REACTOS_STR_INTERNAL_NAME "hdwwiz\0" #define REACTOS_STR_ORIGINAL_FILENAME "hdwwiz.cpl\0" -#ifdef _MSC_VER -#include <../../../reactos/version.rc> -#else #include <reactos/version.rc> -#endif 123 24 DISCARDABLE "manifest.xml"

17 years, 3 months

← Newer
1
...
24
25
26
27
28
29
30
...
59
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 September 2007