Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 29424: Do not define structures twice
by hpoussin＠svn.reactos.org 06 Oct '07

06 Oct '07

Author: hpoussin Date: Sat Oct 6 23:28:04 2007 New Revision: 29424 URL: http://svn.reactos.org/svn/reactos?rev=29424&view=rev Log: Do not define structures twice Modified: trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h Modified: trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h Sat Oct 6 23:28:04 2007 @@ -494,7 +494,7 @@ */ } KTHREAD_HDR, *PKTHREAD_HDR; -#ifdef __REACTOS__ +#ifndef __REACTOS__ typedef struct _IMAGE_DOS_HEADER { // DOS .EXE header WORD e_magic; // Magic number WORD e_cblp; // Bytes on last page of file

1 0

[hpoussin] 29423: Do not define __REACTOS__ twice
by hpoussin＠svn.reactos.org 06 Oct '07

06 Oct '07

Author: hpoussin Date: Sat Oct 6 23:18:55 2007 New Revision: 29423 URL: http://svn.reactos.org/svn/reactos?rev=29423&view=rev Log: Do not define __REACTOS__ twice Modified: trunk/reactos/base/applications/charmap/charmap.rbuild trunk/reactos/base/applications/control/control.rbuild trunk/reactos/base/applications/games/solitaire/solitaire.rbuild trunk/reactos/base/applications/msconfig/msconfig.rbuild trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild trunk/reactos/base/applications/mscutils/servman/servman.rbuild trunk/reactos/base/applications/network/telnet/telnet.rbuild trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rbuild trunk/reactos/base/applications/screensavers/logon/logon.rbuild trunk/reactos/base/applications/screensavers/matrix/matrix.rbuild trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rbuild trunk/reactos/base/applications/screensavers/starfield/starfield.rbuild trunk/reactos/base/services/audiosrv/audiosrv.rbuild trunk/reactos/base/services/dhcp/dhcp.rbuild trunk/reactos/base/setup/usetup/usetup.rbuild trunk/reactos/base/system/msiexec/msiexec.rbuild trunk/reactos/boot/freeldr/fdebug/fdebug.rbuild trunk/reactos/dll/cpl/access/access.rbuild 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/input/input.rbuild trunk/reactos/dll/cpl/intl/intl.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/sysdm/sysdm.rbuild trunk/reactos/dll/cpl/timedate/timedate.rbuild trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild trunk/reactos/dll/directx/devenum/devenum.rbuild trunk/reactos/dll/directx/dinput/dinput.rbuild trunk/reactos/dll/directx/dinput8/dinput8.rbuild trunk/reactos/dll/directx/dplay/dplay.rbuild trunk/reactos/dll/directx/dplayx/dplayx.rbuild trunk/reactos/dll/directx/dsound/dsound.rbuild trunk/reactos/dll/directx/dxdiagn/dxdiagn.rbuild trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild trunk/reactos/dll/win32/acledit/acledit.rbuild trunk/reactos/dll/win32/console/console.rbuild trunk/reactos/dll/win32/crtdll/crtdll.rbuild trunk/reactos/dll/win32/cryptui/cryptui.rbuild trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild trunk/reactos/dll/win32/devmgr/devmgr.rbuild trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild trunk/reactos/dll/win32/msafd/msafd.rbuild trunk/reactos/dll/win32/msgina/msgina.rbuild trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild trunk/reactos/dll/win32/setupapi/setupapi.rbuild trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shellext/deskmon/ (props changed) trunk/reactos/dll/win32/shellext/devcpux/ (props changed) trunk/reactos/dll/win32/shellext/devcpux/devcpux.rbuild trunk/reactos/dll/win32/user32/user32.rbuild trunk/reactos/dll/win32/usp10/usp10.rbuild trunk/reactos/dll/win32/vdmdbg/vdmdbg.rbuild trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild trunk/reactos/lib/3rdparty/libwine/libwine.rbuild trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/dxguid/dxguid.rbuild trunk/reactos/lib/sdk/strmiids/strmiids.rbuild trunk/reactos/lib/win32ksys/win32ksys.rbuild Modified: trunk/reactos/base/applications/charmap/charmap.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.rbuild (original) +++ trunk/reactos/base/applications/charmap/charmap.rbuild Sat Oct 6 23:18:55 2007 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="charmap" type="win32gui" installbase="system32" installname="charmap.exe" unicode="yes"> <include base="charmap">.</include> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/base/applications/control/control.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/control.rbuild (original) +++ trunk/reactos/base/applications/control/control.rbuild Sat Oct 6 23:18:55 2007 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="control" type="win32gui" baseaddress="${BASEADDRESS_CONTROL}" installbase="system32" installname="control.exe" unicode="yes"> <include base="control">.</include> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.rbuild (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.rbuild Sat Oct 6 23:18:55 2007 @@ -7,7 +7,6 @@ <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> - <define name="__REACTOS__" /> <library>kernel32</library> <library>user32</library> <library>gdi32</library> Modified: trunk/reactos/base/applications/msconfig/msconfig.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.rbuild (original) +++ trunk/reactos/base/applications/msconfig/msconfig.rbuild Sat Oct 6 23:18:55 2007 @@ -4,7 +4,6 @@ <include base="msconfig">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild Sat Oct 6 23:18:55 2007 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="devmgmt" type="win32gui" installbase="system32" installname="devmgmt.exe" unicode="yes"> <include base="devmgmt">.</include> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/base/applications/mscutils/servman/servman.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.rbuild (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.rbuild Sat Oct 6 23:18:55 2007 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="servman" type="win32gui" installbase="system32" installname="servman.exe" unicode="yes"> <include base="servman">.</include> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/base/applications/network/telnet/telnet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/telnet.rbuild (original) +++ trunk/reactos/base/applications/network/telnet/telnet.rbuild Sat Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <module name="telnet" type="win32cui" installbase="system32" installname="telnet.exe" allowwarnings ="true"> <include base="telnet">.</include> <define name="__USE_W32API" /> - <define name="__REACTOS__" /> <library>kernel32</library> <library>ws2_32</library> <library>user32</library> Modified: trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rbuild (original) +++ trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rbuild Sat Oct 6 23:18:55 2007 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="cylfrac" type="win32scr" installbase="system32" installname="cylfrac.scr"> <define name="__USE_W32API" /> - <define name="__REACTOS__" /> <define name="UNICODE" /> <define name="_UNICODE" /> Modified: trunk/reactos/base/applications/screensavers/logon/logon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rbuild (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rbuild Sat Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <module name="logon" type="win32scr" installbase="system32" installname="logon.scr"> <include base="logon">.</include> <define name="__USE_W32API" /> - <define name="__REACTOS__" /> <define name="UNICODE" /> <define name="_UNICODE" /> Modified: trunk/reactos/base/applications/screensavers/matrix/matrix.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/matrix.rbuild (original) +++ trunk/reactos/base/applications/screensavers/matrix/matrix.rbuild Sat Oct 6 23:18:55 2007 @@ -6,7 +6,6 @@ <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> - <define name="__REACTOS__" /> <define name="UNICODE" /> <define name="_UNICODE" /> Modified: trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rbuild (original) +++ trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rbuild Sat Oct 6 23:18:55 2007 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="scrnsave" type="win32scr" installbase="system32" installname="scrnsave.scr"> <define name="__USE_W32API" /> - <define name="__REACTOS__" /> <define name="UNICODE" /> <define name="_UNICODE" /> Modified: trunk/reactos/base/applications/screensavers/starfield/starfield.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/starfield/starfield.rbuild (original) +++ trunk/reactos/base/applications/screensavers/starfield/starfield.rbuild Sat Oct 6 23:18:55 2007 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="starfield" type="win32scr" installbase="system32" installname="starfield.scr"> <define name="__USE_W32API" /> - <define name="__REACTOS__" /> <define name="UNICODE" /> <define name="_UNICODE" /> Modified: trunk/reactos/base/services/audiosrv/audiosrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/aud… ============================================================================== --- trunk/reactos/base/services/audiosrv/audiosrv.rbuild (original) +++ trunk/reactos/base/services/audiosrv/audiosrv.rbuild Sat Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <module name="audiosrv" type="win32cui" installbase="system32" installname="audiosrv.exe" unicode="yes" allowwarnings="true"> <include base="audiosrv">.</include> <define name="__USE_W32API" /> - <define name="__REACTOS__" /> <define name="_WIN32_WINNT">0x0501</define> <define name="WINVER">0x0501</define> <library>kernel32</library> Modified: trunk/reactos/base/services/dhcp/dhcp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhcp.rb… ============================================================================== --- trunk/reactos/base/services/dhcp/dhcp.rbuild (original) +++ trunk/reactos/base/services/dhcp/dhcp.rbuild Sat Oct 6 23:18:55 2007 @@ -4,7 +4,6 @@ <include base="dhcp">.</include> <include base="dhcp">include</include> <define name="__USE_W32API" /> - <define name="__REACTOS__" /> <define name="_WIN32_WINNT">0x0501</define> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/base/setup/usetup/usetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.r… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.rbuild (original) +++ trunk/reactos/base/setup/usetup/usetup.rbuild Sat Oct 6 23:18:55 2007 @@ -10,7 +10,6 @@ <define name="_DISABLE_TIDENTS" /> <define name="_WIN32_WINNT">0x0502</define> <define name="__NO_CTYPE_INLINES" /> - <define name="__REACTOS__" /> <linkerflag>-lgcc</linkerflag> <library>zlib</library> <library>inflib</library> Modified: trunk/reactos/base/system/msiexec/msiexec.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexe… ============================================================================== --- trunk/reactos/base/system/msiexec/msiexec.rbuild (original) +++ trunk/reactos/base/system/msiexec/msiexec.rbuild Sat Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <module name="msiexec" type="win32gui" installbase="system32" installname="msiexec.exe" allowwarnings="true"> <include base="msiexec">.</include> <include base="ReactOS">include/wine</include> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x501</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.rbuild (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.rbuild Sat Oct 6 23:18:55 2007 @@ -4,7 +4,6 @@ <include base="freeldr_fdebug">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/cpl/access/access.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.rbui… ============================================================================== --- trunk/reactos/dll/cpl/access/access.rbuild (original) +++ trunk/reactos/dll/cpl/access/access.rbuild Sat Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <module name="access" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ACCESS}" installbase="system32" installname="access.cpl" unicode="yes"> <importlibrary definition="access.def" /> <include base="access">.</include> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x600</define> 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 Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <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="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</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 Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <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="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</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 Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <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="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/cpl/input/input.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rbuild (original) +++ trunk/reactos/dll/cpl/input/input.rbuild Sat Oct 6 23:18:55 2007 @@ -5,7 +5,6 @@ <include base="input">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/cpl/intl/intl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rbuild (original) +++ trunk/reactos/dll/cpl/intl/intl.rbuild Sat Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}" installbase="system32" installname="intl.cpl" unicode="yes"> <importlibrary definition="intl.def" /> <include base="intl">.</include> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">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 Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <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="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</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 Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <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="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</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 Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <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="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</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 Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <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="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</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 Oct 6 23:18:55 2007 @@ -4,7 +4,6 @@ <importlibrary definition="powercfg.def" /> <include base="powercfg">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.rbuild (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.rbuild Sat Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <module name="sysdm" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_SYSDM}" installbase="system32" installname="sysdm.cpl" unicode="yes"> <importlibrary definition="sysdm.def" /> <include base="sysdm">.</include> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/cpl/timedate/timedate.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.rbuild (original) +++ trunk/reactos/dll/cpl/timedate/timedate.rbuild Sat Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <module name="timedate" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_TIMEDATE}" installbase="system32" installname="timedate.cpl" unicode="yes"> <importlibrary definition="timedate.def" /> <include base="timedate">.</include> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</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 Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <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="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/directx/devenum/devenum.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/devenu… ============================================================================== --- trunk/reactos/dll/directx/devenum/devenum.rbuild (original) +++ trunk/reactos/dll/directx/devenum/devenum.rbuild Sat Oct 6 23:18:55 2007 @@ -7,7 +7,6 @@ <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> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/directx/dinput/dinput.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/dinput.… ============================================================================== --- trunk/reactos/dll/directx/dinput/dinput.rbuild (original) +++ trunk/reactos/dll/directx/dinput/dinput.rbuild Sat Oct 6 23:18:55 2007 @@ -7,7 +7,6 @@ <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> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/directx/dinput8/dinput8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput8/dinput… ============================================================================== --- trunk/reactos/dll/directx/dinput8/dinput8.rbuild (original) +++ trunk/reactos/dll/directx/dinput8/dinput8.rbuild Sat Oct 6 23:18:55 2007 @@ -7,7 +7,6 @@ <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> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/directx/dplay/dplay.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplay/dplay.rb… ============================================================================== --- trunk/reactos/dll/directx/dplay/dplay.rbuild (original) +++ trunk/reactos/dll/directx/dplay/dplay.rbuild Sat Oct 6 23:18:55 2007 @@ -6,7 +6,6 @@ <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> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/directx/dplayx/dplayx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplayx.… ============================================================================== --- trunk/reactos/dll/directx/dplayx/dplayx.rbuild (original) +++ trunk/reactos/dll/directx/dplayx/dplayx.rbuild Sat Oct 6 23:18:55 2007 @@ -7,7 +7,6 @@ <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> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/directx/dsound/dsound.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound.… ============================================================================== --- trunk/reactos/dll/directx/dsound/dsound.rbuild (original) +++ trunk/reactos/dll/directx/dsound/dsound.rbuild Sat Oct 6 23:18:55 2007 @@ -5,7 +5,6 @@ <importlibrary definition="dsound.spec.def" /> <include base="dsound">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/directx/dxdiagn/dxdiagn.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dxdiagn/dxdiag… ============================================================================== --- trunk/reactos/dll/directx/dxdiagn/dxdiagn.rbuild (original) +++ trunk/reactos/dll/directx/dxdiagn/dxdiagn.rbuild Sat Oct 6 23:18:55 2007 @@ -7,7 +7,6 @@ <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> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild (original) +++ trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild Sat Oct 6 23:18:55 2007 @@ -6,7 +6,6 @@ <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> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild Sat Oct 6 23:18:55 2007 @@ -4,7 +4,6 @@ <importlibrary definition="wined3d.def" /> <include base="wined3d">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/win32/acledit/acledit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/acledit.… ============================================================================== --- trunk/reactos/dll/win32/acledit/acledit.rbuild (original) +++ trunk/reactos/dll/win32/acledit/acledit.rbuild Sat Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <include base="acledit">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <metadata description = "Access Control List Editor" /> Modified: trunk/reactos/dll/win32/console/console.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.rbuild (original) +++ trunk/reactos/dll/win32/console/console.rbuild Sat Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <include base="console">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/win32/crtdll/crtdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.rb… ============================================================================== --- trunk/reactos/dll/win32/crtdll/crtdll.rbuild (original) +++ trunk/reactos/dll/win32/crtdll/crtdll.rbuild Sat Oct 6 23:18:55 2007 @@ -8,12 +8,11 @@ <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> - <define name="__REACTOS__" /> <define name="USE_MSVCRT_PREFIX" /> <define name="_MSVCRT_LIB_" /> - <define name="__NO_CTYPE_INLINES" /> - <define name="_CTYPE_DISABLE_MACROS" /> - <define name="_NO_INLINING" /> + <define name="__NO_CTYPE_INLINES" /> + <define name="_CTYPE_DISABLE_MACROS" /> + <define name="_NO_INLINING" />  Modified: trunk/reactos/dll/win32/cryptui/cryptui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.rbuild (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.rbuild Sat Oct 6 23:18:55 2007 @@ -1,7 +1,6 @@ <module name="cryptui" type="win32dll" baseaddress="${BASEADDRESS_CRYPTUI}" installbase="system32" installname="cryptui.dll" allowwarnings="true"> <importlibrary definition="cryptui.def" /> <include base="cryptui">.</include> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild Sat Oct 6 23:18:55 2007 @@ -2,7 +2,6 @@ <importlibrary definition="dbghelp.spec.def" /> <include base="dbghelp">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/win32/devmgr/devmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rb… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgr.rbuild (original) +++ trunk/reactos/dll/win32/devmgr/devmgr.rbuild Sat Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <importlibrary definition="devmgr.spec.def" /> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild Sat Oct 6 23:18:55 2007 @@ -4,7 +4,6 @@ <include base="ReactOS">include/reactos/wine</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <library>wine</library> <library>ntdll</library> Modified: trunk/reactos/dll/win32/msafd/msafd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.rbui… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.rbuild (original) +++ trunk/reactos/dll/win32/msafd/msafd.rbuild Sat Oct 6 23:18:55 2007 @@ -5,7 +5,6 @@ <include base="ReactOS">include/reactos/drivers</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <pch>msafd.h</pch> <library>ntdll</library> Modified: trunk/reactos/dll/win32/msgina/msgina.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rb… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rbuild (original) +++ trunk/reactos/dll/win32/msgina/msgina.rbuild Sat Oct 6 23:18:55 2007 @@ -2,7 +2,6 @@ <importlibrary definition="msgina.def" /> <include base="msgina">.</include> <include base="msgina">include</include> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <library>ntdll</library> <library>wine</library> Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild Sat Oct 6 23:18:55 2007 @@ -10,15 +10,14 @@ <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> - <define name="__REACTOS__" /> <define name="USE_MSVCRT_PREFIX" /> <define name="_MSVCRT_LIB_" /> <define name="_MT" /> - <define name="__NO_CTYPE_INLINES" /> - <define name="_CTYPE_DISABLE_MACROS" /> - <define name="_NO_INLINING" /> + <define name="__NO_CTYPE_INLINES" /> + <define name="_CTYPE_DISABLE_MACROS" /> + <define name="_NO_INLINING" /> -  <define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define> Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild Sat Oct 6 23:18:55 2007 @@ -1,6 +1,5 @@ <module name="netcfgx" type="win32dll" entrypoint="0" installbase="system32" installname="netcfgx.dll"> <importlibrary definition="netcfgx.def" /> - <define name="__REACTOS__" /> <file>netcfgx.c</file> <library>ntdll</library> <library>rpcrt4</library> Modified: trunk/reactos/dll/win32/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.rbuild (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.rbuild Sat Oct 6 23:18:55 2007 @@ -7,7 +7,6 @@ <include base="pnp_client">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild Sat Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <importlibrary definition="shell32.spec.def" /> <include base="shell32">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Propchange: trunk/reactos/dll/win32/shellext/deskmon/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Oct 6 23:18:55 2007 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/shellext/devcpux/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Oct 6 23:18:55 2007 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Modified: trunk/reactos/dll/win32/shellext/devcpux/devcpux.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/devcpux… ============================================================================== --- trunk/reactos/dll/win32/shellext/devcpux/devcpux.rbuild (original) +++ trunk/reactos/dll/win32/shellext/devcpux/devcpux.rbuild Sat Oct 6 23:18:55 2007 @@ -4,7 +4,6 @@ <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> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild Sat Oct 6 23:18:55 2007 @@ -5,7 +5,6 @@ <include base="ReactOS">include/reactos/subsys</include> <define name="_DISABLE_TIDENTS" /> <define name="UNICODE" /> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="WINVER">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> Modified: trunk/reactos/dll/win32/usp10/usp10.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.rbui… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.rbuild (original) +++ trunk/reactos/dll/win32/usp10/usp10.rbuild Sat Oct 6 23:18:55 2007 @@ -4,7 +4,6 @@ <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> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/win32/vdmdbg/vdmdbg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vdmdbg/vdmdbg.rb… ============================================================================== --- trunk/reactos/dll/win32/vdmdbg/vdmdbg.rbuild (original) +++ trunk/reactos/dll/win32/vdmdbg/vdmdbg.rbuild Sat Oct 6 23:18:55 2007 @@ -3,7 +3,6 @@ <include base="vdmdbg">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/ws2_32.rb… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild (original) +++ trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild Sat Oct 6 23:18:55 2007 @@ -6,7 +6,6 @@ <define name="UNICODE" /> <define name="LE" /> <define name="__USE_W32API" /> - <define name="__REACTOS__" /> <define name="_WIN32_WINNT">0x0500</define> <library>wine</library> <library>ntdll</library> Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild Sat Oct 6 23:18:55 2007 @@ -4,7 +4,6 @@ <bootstrap installbase="$(CDOUTPUT)" /> <include base="i8042prt">.</include> <define name="__USE_W32API" /> - <define name="__REACTOS__" /> <library>ntoskrnl</library> <library>hal</library> <file>i8042prt.c</file> Modified: trunk/reactos/lib/3rdparty/libwine/libwine.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/libwi… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/libwine.rbuild (original) +++ trunk/reactos/lib/3rdparty/libwine/libwine.rbuild Sat Oct 6 23:18:55 2007 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="wine" type="staticlibrary"> <define name="_DISABLE_TIDENTS" /> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <file>debug.c</file> <file>string.c</file> Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild Sat Oct 6 23:18:55 2007 @@ -1,7 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="oskittcp" type="staticlibrary" allowwarnings="true"> - <define name="__REACTOS__">1</define> <define name="__NTDRIVER__"/> <define name="KERNEL"/> <define name="_DISABLE_TIDENTS"/> Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild Sat Oct 6 23:18:55 2007 @@ -8,7 +8,6 @@ <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> - <define name="__REACTOS__" /> <define name="USE_MSVCRT_PREFIX" /> <define name="_MSVCRT_LIB_" /> <define name="_MSVCRT_" /> Modified: trunk/reactos/lib/sdk/dxguid/dxguid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/dxguid/dxguid.rbui… ============================================================================== --- trunk/reactos/lib/sdk/dxguid/dxguid.rbuild (original) +++ trunk/reactos/lib/sdk/dxguid/dxguid.rbuild Sat Oct 6 23:18:55 2007 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="dxguid" type="staticlibrary"> <define name="_DISABLE_TIDENTS" /> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <file>dxguid-mingw.c</file> </module> Modified: trunk/reactos/lib/sdk/strmiids/strmiids.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/strmiids/strmiids.… ============================================================================== --- trunk/reactos/lib/sdk/strmiids/strmiids.rbuild (original) +++ trunk/reactos/lib/sdk/strmiids/strmiids.rbuild Sat Oct 6 23:18:55 2007 @@ -3,6 +3,5 @@ <module name="strmiids" type="staticlibrary"> <define name="__USE_W32API" /> <define name="_DISABLE_TIDENTS" /> - <define name="__REACTOS__" /> <file>strmiids.c</file> </module> Modified: trunk/reactos/lib/win32ksys/win32ksys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/win32ksys/win32ksys.rb… ============================================================================== --- trunk/reactos/lib/win32ksys/win32ksys.rbuild (original) +++ trunk/reactos/lib/win32ksys/win32ksys.rbuild Sat Oct 6 23:18:55 2007 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="win32ksys" type="staticlibrary"> <define name="_DISABLE_TIDENTS" /> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <directory name="." root="intermediate">

1 0

[peterw] 29422: - Fix build.
by peterw＠svn.reactos.org 06 Oct '07

06 Oct '07

Author: peterw Date: Sat Oct 6 23:13:15 2007 New Revision: 29422 URL: http://svn.reactos.org/svn/reactos?rev=29422&view=rev Log: - Fix build. Modified: trunk/reactos/base/shell/cmd/config.h Modified: trunk/reactos/base/shell/cmd/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/config.h?re… ============================================================================== --- trunk/reactos/base/shell/cmd/config.h (original) +++ trunk/reactos/base/shell/cmd/config.h Sat Oct 6 23:13:15 2007 @@ -10,7 +10,7 @@ */ /* Define only if used under ReactOS */ -#define __REACTOS__ +//#define __REACTOS__ #ifndef _CONFIG_H_INCLUDED_ #define _CONFIG_H_INCLUDED_

1 0

[cwittich] 29421: remove double controls from the resource
by cwittich＠svn.reactos.org 06 Oct '07

06 Oct '07

Author: cwittich Date: Sat Oct 6 22:32:45 2007 New Revision: 29421 URL: http://svn.reactos.org/svn/reactos?rev=29421&view=rev Log: remove double controls from the resource Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc Sat Oct 6 22:32:45 2007 @@ -22,9 +22,6 @@ AUTORADIOBUTTON "Èçòåãëè &òðè", IDC_OPT_DRAWTHREE, 14, 32, 70, 10 AUTOCHECKBOX "&Ïîêàçâàíå íà âðåìåòî", IDC_OPT_SHOWTIME, 7 ,51 ,100 ,10, WS_TABSTOP - AUTOCHECKBOX "Ëåíòà &ñúñòîÿíèå", IDC_OPT_STATUSBAR, 7, 66, 100, 10, WS_TABSTOP - - AUTOCHECKBOX "&Ïîêàçâàíå íà âðåìåòî", IDC_OPT_SHOWTIME, 7 ,51 ,100 ,10, WS_TABSTOP | WS_DISABLED AUTOCHECKBOX "Ëåíòà &ñúñòîÿíèå", IDC_OPT_STATUSBAR, 7, 66, 100, 10, WS_TABSTOP DEFPUSHBUTTON "Äîáðå", IDOK, 35, 97, 50, 14

1 0

[hpoussin] 29420: Rename _REACTOS_ to __REACTOS__
by hpoussin＠svn.reactos.org 06 Oct '07

06 Oct '07

Author: hpoussin Date: Sat Oct 6 22:04:03 2007 New Revision: 29420 URL: http://svn.reactos.org/svn/reactos?rev=29420&view=rev Log: Rename _REACTOS_ to __REACTOS__ Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/ReactOS-ppc.rbuild trunk/reactos/base/services/dhcp/dhclient.c trunk/reactos/base/services/dhcp/include/dhcpd.h trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/include/psdk/rpc.h Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild (original) +++ trunk/reactos/ReactOS-generic.rbuild Sat Oct 6 22:04:03 2007 @@ -3,7 +3,7 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="baseaddress.rbuild" /> - <define name="_REACTOS_" /> + <define name="__REACTOS__" /> <if property="MP" value="1"> <define name="CONFIG_SMP" value="1" /> </if> Modified: trunk/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=294… ============================================================================== --- trunk/reactos/ReactOS-ppc.rbuild (original) +++ trunk/reactos/ReactOS-ppc.rbuild Sat Oct 6 22:04:03 2007 @@ -10,30 +10,29 @@ <xi:include href="ReactOS-generic.rbuild" /> <property name="OFWLDR_LINKFORMAT" value="-L$(INTERMEDIATE)/lib/ppcmmu -lppcmmu_code -nostdlib -nostartfiles -lgcc -Wl,-e,__start -Wl,-Ttext,0xe00000 -N"/> - <property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles"/> + <property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles"/> - <define name="_M_PPC" /> - <define name="_PPC_" /> - <define name="__PowerPC__" /> - <define name="_REACTOS_" /> - <define name="stdcall" empty="true" /> - <define name="__stdcall__" empty="true" /> - <define name="fastcall" empty="true" /> - <define name="cdecl" empty="true" /> - <define name="__cdecl__" empty="true" /> - <define name="dllimport" empty="true" /> - <define name="WORDS_BIGENDIAN" empty="true" /> - <define name="__MSVCRT__" empty="true" /> - <define name="__NO_CTYPE_INLINES" /> - <define name="__DECLSPEC_SUPPORTED" /> - <define name="__MINGW_IMPORT">extern</define> - <define name="_CRTIMP" empty="true" /> - <define name="'__declspec(x)'" empty="true" /> - <compilerflag>-fshort-wchar</compilerflag> - <compilerflag>-fsigned-char</compilerflag> - <compilerflag>-mfull-toc</compilerflag> - <compilerflag>-meabi</compilerflag> - <compilerflag>-O2</compilerflag> - <compilerflag>-Wno-strict-aliasing</compilerflag> + <define name="_M_PPC" /> + <define name="_PPC_" /> + <define name="__PowerPC__" /> + <define name="stdcall" empty="true" /> + <define name="__stdcall__" empty="true" /> + <define name="fastcall" empty="true" /> + <define name="cdecl" empty="true" /> + <define name="__cdecl__" empty="true" /> + <define name="dllimport" empty="true" /> + <define name="WORDS_BIGENDIAN" empty="true" /> + <define name="__MSVCRT__" empty="true" /> + <define name="__NO_CTYPE_INLINES" /> + <define name="__DECLSPEC_SUPPORTED" /> + <define name="__MINGW_IMPORT">extern</define> + <define name="_CRTIMP" empty="true" /> + <define name="'__declspec(x)'" empty="true" /> + <compilerflag>-fshort-wchar</compilerflag> + <compilerflag>-fsigned-char</compilerflag> + <compilerflag>-mfull-toc</compilerflag> + <compilerflag>-meabi</compilerflag> + <compilerflag>-O2</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> </project> Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c (original) +++ trunk/reactos/base/services/dhcp/dhclient.c Sat Oct 6 22:04:03 2007 @@ -433,7 +433,7 @@ ip->client->new->rebind = ip->client->new->renewal + ip->client->new->renewal / 2 + ip->client->new->renewal / 4; -#ifdef _REACTOS_ +#ifdef __REACTOS__ ip->client->new->obtained = cur_time; #endif ip->client->new->expiry += cur_time; @@ -825,7 +825,7 @@ lease->address.len = sizeof(packet->raw->yiaddr); memcpy(lease->address.iabuf, &packet->raw->yiaddr, lease->address.len); -#ifdef _REACTOS_ +#ifdef __REACTOS__ lease->serveraddress.len = sizeof(packet->raw->siaddr); memcpy(lease->serveraddress.iabuf, &packet->raw->siaddr, lease->address.len); #endif Modified: trunk/reactos/base/services/dhcp/include/dhcpd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/include… ============================================================================== --- trunk/reactos/base/services/dhcp/include/dhcpd.h (original) +++ trunk/reactos/base/services/dhcp/include/dhcpd.h Sat Oct 6 22:04:03 2007 @@ -158,7 +158,7 @@ time_t expiry, renewal, rebind; struct iaddr address; char *server_name; -#ifdef _REACTOS_ +#ifdef __REACTOS__ time_t obtained; struct iaddr serveraddress; #endif @@ -178,7 +178,7 @@ S_BOUND, S_RENEWING, S_REBINDING, - S_STATIC + S_STATIC }; struct client_config { Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h (original) +++ trunk/reactos/include/ndk/i386/ketypes.h Sat Oct 6 22:04:03 2007 @@ -628,7 +628,7 @@ ULONG IDR; PVOID KdVersionBlock; PKIDTENTRY IDT; -#ifdef _REACTOS_ +#ifdef __REACTOS__ PUSHORT GDT; #else PKGDTENTRY GDT; Modified: trunk/reactos/include/psdk/rpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpc.h?rev=294… ============================================================================== --- trunk/reactos/include/psdk/rpc.h (original) +++ trunk/reactos/include/psdk/rpc.h Sat Oct 6 22:04:03 2007 @@ -22,7 +22,7 @@ extern "C" { #endif -#if defined( MAC ) || defined( _MAC ) || defined(__powerpc__) && !defined(_REACTOS_) +#if defined( MAC ) || defined( _MAC ) || defined(__powerpc__) && !defined(__REACTOS__) #define __RPC_MAC__ #define __RPC_WIN32__ #include <pshpack2.h>

1 0

[gedmurphy] 29419: fix painting of alpha channels in 32bpp icons onto windows/dialogs
by gedmurphy＠svn.reactos.org 06 Oct '07

06 Oct '07

Author: gedmurphy Date: Sat Oct 6 21:59:21 2007 New Revision: 29419 URL: http://svn.reactos.org/svn/reactos?rev=29419&view=rev Log: fix painting of alpha channels in 32bpp icons onto windows/dialogs Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Sat Oct 6 21:59:21 2007 @@ -1376,20 +1376,20 @@ hbmMask = pIcon->IconInfo.hbmMask; hbmColor = pIcon->IconInfo.hbmColor; - if(istepIfAniCur) + if (istepIfAniCur) DPRINT1("NtUserDrawIconEx: istepIfAniCur is not supported!\n"); - if(!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), &bmpMask)) + if (!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), &bmpMask)) { return FALSE; } - if(hbmColor && !IntGdiGetObject(hbmColor, sizeof(BITMAP), &bmpColor)) + if (hbmColor && !IntGdiGetObject(hbmColor, sizeof(BITMAP), &bmpColor)) { return FALSE; } - if(hbmColor) + if (hbmColor) { IconSize.cx = bmpColor.bmWidth; IconSize.cy = bmpColor.bmHeight; @@ -1405,60 +1405,64 @@ bAlpha = TRUE; } - if(!diFlags) + if (!diFlags) diFlags = DI_NORMAL; - if(!cxWidth) + if (!cxWidth) cxWidth = ((diFlags & DI_DEFAULTSIZE) ? UserGetSystemMetrics(SM_CXICON) : IconSize.cx); - - if(!cyHeight) + + if (!cyHeight) cyHeight = ((diFlags & DI_DEFAULTSIZE) ? UserGetSystemMetrics(SM_CYICON) : IconSize.cy); DoFlickerFree = (hbrFlickerFreeDraw && (GDI_HANDLE_GET_TYPE(hbrFlickerFreeDraw) == GDI_OBJECT_TYPE_BRUSH)); - if(DoFlickerFree) + if (DoFlickerFree || bAlpha) { RECT r; r.right = cxWidth; r.bottom = cyHeight; hdcOff = NtGdiCreateCompatibleDC(hDc); - if(!hdcOff) + if (!hdcOff) { DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); return FALSE; } hbmOff = NtGdiCreateCompatibleBitmap(hDc, cxWidth, cyHeight); - if(!hbmOff) + if (!hbmOff) { DPRINT1("NtGdiCreateCompatibleBitmap() failed!\n"); goto cleanup; } - - hOldOffBrush = NtGdiSelectObject(hdcOff, hbrFlickerFreeDraw); - if(!hOldOffBrush) + + hOldOffBmp = NtGdiSelectObject(hdcOff, hbmOff); + if (!hOldOffBmp) { DPRINT1("NtGdiSelectObject() failed!\n"); goto cleanup; } - - hOldOffBmp = NtGdiSelectObject(hdcOff, hbmOff); - if(!hOldOffBmp) - { - DPRINT1("NtGdiSelectObject() failed!\n"); - goto cleanup; - } - - NtGdiPatBlt(hdcOff, 0, 0, r.right, r.bottom, PATCOPY); - } - else hdcOff = hDc; - + + if (DoFlickerFree) + { + hOldOffBrush = NtGdiSelectObject(hdcOff, hbrFlickerFreeDraw); + if (!hOldOffBrush) + { + DPRINT1("NtGdiSelectObject() failed!\n"); + goto cleanup; + } + + NtGdiPatBlt(hdcOff, 0, 0, r.right, r.bottom, PATCOPY); + } + } + else + hdcOff = hDc; + hdcMem = NtGdiCreateCompatibleDC(hDc); - if(!hdcMem) + if (!hdcMem) { DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); goto cleanup; @@ -1469,10 +1473,10 @@ oldFg = NtGdiSetTextColor(hdcOff, RGB(0, 0, 0)); oldBg = NtGdiSetBkColor(hdcOff, RGB(255, 255, 255)); - if(diFlags & DI_MASK) + if (diFlags & DI_MASK) { hOldMem = NtGdiSelectObject(hdcMem, hbmMask); - if(!hOldMem) + if (!hOldMem) { DPRINT("NtGdiSelectObject() failed!\n"); goto cleanup; @@ -1483,7 +1487,7 @@ 0, 0, IconSize.cx, IconSize.cy, ((diFlags & DI_IMAGE) ? SRCAND : SRCCOPY), FALSE); - if(!hbmColor && (bmpMask.bmHeight == 2 * bmpMask.bmWidth) + if (!hbmColor && (bmpMask.bmHeight == 2 * bmpMask.bmWidth) && (diFlags & DI_IMAGE)) { DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), @@ -1496,7 +1500,7 @@ NtGdiSelectObject(hdcMem, hOldMem); } - + if(diFlags & DI_IMAGE) { hOldMem = NtGdiSelectObject(hdcMem, (hbmColor ? hbmColor : hbmMask)); @@ -1510,103 +1514,87 @@ NtGdiSelectObject(hdcMem, hOldMem); } - if(DoFlickerFree) - { - if (bAlpha) + if (bAlpha) + { + BITMAP bm; + BITMAPOBJ *BitmapObj = NULL; + PBYTE pBits = NULL; + BLENDFUNCTION BlendFunc; + BYTE Red, Green, Blue, Alpha; + DWORD Count = 0; + INT i, j; + + BitmapObj = BITMAPOBJ_LockBitmap(hbmOff); + if (BitmapObj == NULL) { - BITMAPINFO bi; - BITMAP bm; - BITMAPOBJ *Bitmap = NULL; - PBYTE pBits = NULL; - BLENDFUNCTION BlendFunc; - BYTE Red, Green, Blue, Alpha; - DWORD Count = 0; - INT i, j; - - /* Bitmap header */ - bi.bmiHeader.biSize = sizeof(bi.bmiHeader); - bi.bmiHeader.biWidth = cxWidth; - bi.bmiHeader.biHeight = cyHeight; - bi.bmiHeader.biPlanes = 1; - bi.bmiHeader.biBitCount = 32; - bi.bmiHeader.biCompression = BI_RGB; - bi.bmiHeader.biSizeImage = cxWidth * cyHeight * 4; - bi.bmiHeader.biClrUsed = 0; - bi.bmiHeader.biClrImportant = 0; - - Bitmap = GDIOBJ_LockObj(GdiHandleTable, hbmOff, GDI_OBJECT_TYPE_BITMAP); - if (Bitmap == NULL) + DPRINT1("GDIOBJ_LockObj() failed!\n"); + goto cleanup; + } + BITMAP_GetObject(BitmapObj, sizeof(BITMAP), &bm); + + pBits = ExAllocatePoolWithTag(PagedPool, bm.bmWidthBytes * abs(bm.bmHeight), TAG_BITMAP); + if (pBits == NULL) + { + DPRINT1("ExAllocatePoolWithTag() failed!\n"); + BITMAPOBJ_UnlockBitmap(BitmapObj); + goto cleanup; + } + + /* get icon bits */ + IntGetBitmapBits(BitmapObj, bm.bmWidthBytes * abs(bm.bmHeight), pBits); + + /* premultiply with the alpha channel value */ + for (i = 0; i < cyHeight; i++) + { + for (j = 0; j < cxWidth; j++) { - DPRINT1("GDIOBJ_LockObj() failed!\n"); - goto cleanup; + DWORD OrigPixel = 0; + DWORD AlphaPixel = 0; + + OrigPixel = *(DWORD *)(pBits + Count); + + Red = (BYTE)((OrigPixel >> 0) & 0xff); + Green = (BYTE)((OrigPixel >> 8) & 0xff); + Blue = (BYTE)((OrigPixel >> 16) & 0xff); + Alpha = (BYTE)((OrigPixel >> 24) & 0xff); + + Red = (Red * Alpha) / 0xff; + Green = (Green * Alpha) / 0xff; + Blue = (Blue * Alpha) / 0xff; + + AlphaPixel = (DWORD)(Red | (Green << 8) | (Blue << 16) | (Alpha << 24)); + + *(DWORD *)(pBits + Count) = AlphaPixel; + Count += sizeof (DWORD); } - BITMAP_GetObject(Bitmap, sizeof(BITMAP), &bm); - - /* Buffer */ - pBits = ExAllocatePoolWithTag(PagedPool, bm.bmWidthBytes * abs(bm.bmHeight), TAG_BITMAP); - if (pBits == NULL) - { - DPRINT1("ExAllocatePoolWithTag() failed!\n"); - GDIOBJ_UnlockObjByPtr(GdiHandleTable, Bitmap); - goto cleanup; - } - - /* get icon bits */ - IntGetBitmapBits(Bitmap, bm.bmWidthBytes * abs(bm.bmHeight), pBits); - - /* premultiply with the alpha channel value */ - for (i = 0; i < cyHeight; i++) - { - for (j = 0; j < cxWidth; j++) - { - DWORD OrigPixel = 0; - DWORD AlphaPixel = 0; - - OrigPixel = *(DWORD *)(pBits + Count); - - Red = (BYTE)((OrigPixel >> 0) & 0xff); - Green = (BYTE)((OrigPixel >> 8) & 0xff); - Blue = (BYTE)((OrigPixel >> 16) & 0xff); - Alpha = (BYTE)((OrigPixel >> 24) & 0xff); - - Red = (Red * Alpha) / 0xff; - Green = (Green * Alpha) / 0xff; - Blue = (Blue * Alpha) / 0xff; - - AlphaPixel = (DWORD)(Red | (Green << 8) | (Blue << 16) | (Alpha << 24)); - - *(DWORD *)(pBits + Count) = AlphaPixel; - Count += sizeof (DWORD); - } - } - - /* set icon bits */ - IntSetBitmapBits(Bitmap, bm.bmWidthBytes * abs(bm.bmHeight), pBits); - ExFreePool(pBits); - - GDIOBJ_UnlockObjByPtr(GdiHandleTable, Bitmap); - - BlendFunc.BlendOp = AC_SRC_OVER; - BlendFunc.BlendFlags = 0; - BlendFunc.SourceConstantAlpha = 255; - BlendFunc.AlphaFormat = AC_SRC_ALPHA; - - NtGdiAlphaBlend(hDc, xLeft, yTop, cxWidth, cyHeight, - hdcOff, 0, 0, cxWidth, cyHeight, BlendFunc, 0); } - else - { - NtGdiBitBlt(hDc, xLeft, yTop, cxWidth, - cyHeight, hdcOff, 0, 0, SRCCOPY, 0, 0); - } - } - + + /* set icon bits */ + IntSetBitmapBits(BitmapObj, bm.bmWidthBytes * abs(bm.bmHeight), pBits); + ExFreePool(pBits); + + BITMAPOBJ_UnlockBitmap(BitmapObj); + + BlendFunc.BlendOp = AC_SRC_OVER; + BlendFunc.BlendFlags = 0; + BlendFunc.SourceConstantAlpha = 255; + BlendFunc.AlphaFormat = AC_SRC_ALPHA; + + NtGdiAlphaBlend(hDc, xLeft, yTop, cxWidth, cyHeight, + hdcOff, 0, 0, cxWidth, cyHeight, BlendFunc, 0); + } + else if (DoFlickerFree) + { + NtGdiBitBlt(hDc, xLeft, yTop, cxWidth, + cyHeight, hdcOff, 0, 0, SRCCOPY, 0, 0); + } + NtGdiSetTextColor(hdcOff, oldFg); NtGdiSetBkColor(hdcOff, oldBg); NtGdiSetStretchBltMode(hdcOff, nStretchMode); - + Ret = TRUE; - + cleanup: if(DoFlickerFree) {

1 0

[fireball] 29418: - Fix incorrect DPRINT.
by fireball＠svn.reactos.org 06 Oct '07

06 Oct '07

Author: fireball Date: Sat Oct 6 20:04:21 2007 New Revision: 29418 URL: http://svn.reactos.org/svn/reactos?rev=29418&view=rev Log: - Fix incorrect DPRINT. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Sat Oct 6 20:04:21 2007 @@ -556,7 +556,7 @@ ExFreePool(FullWindowStationName.Buffer); } - DPRINT("Window station successfully created (%wZ)\n", FullWindowStationName); + DPRINT("Window station successfully created (%wZ)\n", &FullWindowStationName); ExFreePool(FullWindowStationName.Buffer); return WindowStation; }

1 0

[fireball] 29417: - Fix build.
by fireball＠svn.reactos.org 06 Oct '07

06 Oct '07

Author: fireball Date: Sat Oct 6 18:35:39 2007 New Revision: 29417 URL: http://svn.reactos.org/svn/reactos?rev=29417&view=rev Log: - Fix build. Modified: trunk/reactos/dll/cpl/input/input.rbuild Modified: trunk/reactos/dll/cpl/input/input.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rbuild (original) +++ trunk/reactos/dll/cpl/input/input.rbuild Sat Oct 6 18:35:39 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="input" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INPUT}" installbase="system32" installname="input.cpl"> +<module name="input" type="win32dll" extension=".dll" baseaddress="${BASEADDRESS_INPUT}" installbase="system32" installname="input.dll"> <importlibrary definition="input.def" /> <include base="input">.</include> <define name="UNICODE" />

1 0

[fireball] 29416: Dmitry Chapyshev <lentind@yandex.ru> - Add some more dialogs to input.dll, and even some functionality, but it still needs a lot of work. - Add input.dll and systeminfo.exe to the bootcd
by fireball＠svn.reactos.org 06 Oct '07

06 Oct '07

Author: fireball Date: Sat Oct 6 15:47:06 2007 New Revision: 29416 URL: http://svn.reactos.org/svn/reactos?rev=29416&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Add some more dialogs to input.dll, and even some functionality, but it still needs a lot of work. - Add input.dll and systeminfo.exe to the bootcd Added: trunk/reactos/dll/cpl/input/misc.c (with props) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/cpl/input/advanced.c trunk/reactos/dll/cpl/input/changekeyseq.c trunk/reactos/dll/cpl/input/input.c trunk/reactos/dll/cpl/input/input.h trunk/reactos/dll/cpl/input/input.rbuild trunk/reactos/dll/cpl/input/input.rc trunk/reactos/dll/cpl/input/inputlangprop.c trunk/reactos/dll/cpl/input/keysettings.c trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/en-US.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/input/langbar.c trunk/reactos/dll/cpl/input/resource.h trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sat Oct 6 15:47:06 2007 @@ -113,6 +113,7 @@ dll\cpl\powercfg\powercfg.cpl 1 dll\cpl\sysdm\sysdm.cpl 1 dll\cpl\timedate\timedate.cpl 1 +dll\cpl\input\input.dll 1 dll\directx\dinput\dinput.dll 1 dll\directx\dinput8\dinput8.dll 1 @@ -482,6 +483,7 @@ modules\rosapps\roshttpd\roshttpd.exe 1 optional modules\rosapps\screenshot\screenshot.exe 1 optional modules\rosapps\sysutils\chkdsk\chkdsk.exe 1 optional +modules\rosapps\sysutils\systeminfo\systeminfo.exe 1 optional modules\rosapps\sysutils\chklib\chklib.exe 1 optional modules\rosapps\sysutils\ctm\ctm.exe 1 optional modules\rosapps\sysutils\kill\kill.exe 1 optional Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=29… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c (original) +++ trunk/reactos/dll/cpl/input/add.c Sat Oct 6 15:47:06 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/add.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/add.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ @@ -39,6 +39,93 @@ #include "resource.h" #include "input.h" +HWND hLanguageList; + +/*struct LangAndLayout +{ + TCHAR Lang; + TCHAR Layout; + TCHAR SubLayout; +} VarLang[133]; + +char *SubLang[133] = {} + +VOID CreateLangStruct(VOID) +{ + UINT Count; + TCHAR Layout[256]; + + for(Count = 0; Count < END_LAYOUT - BEGIN_LAYOUT; Count++) + { + LoadString(hApplet, + Count, + Layout, + sizeof(Layout) / sizeof(TCHAR)); + strcpy(VarLang[Count].Layout,Layout); + } +}*/ + +/* Language enumerate procedure */ +BOOL +CALLBACK +LanguagesEnumProc(LPTSTR lpLanguage) +{ + LCID Lcid; + TCHAR Lang[1024]; + int Index; + + Lcid = wcstoul(lpLanguage, NULL, 16); + + GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, Lang, sizeof(Lang)); + Index = (int) SendMessage(hLanguageList, + CB_ADDSTRING, + 0, + (LPARAM)Lang); + + SendMessage(hLanguageList, + CB_SETITEMDATA, + Index, + (LPARAM)Lcid); + + return TRUE; +} + +/* Enumerate all installed language identifiers */ +static +VOID +CreateLanguagesList(HWND hWnd) +{ + TCHAR LangSel[256]; + hLanguageList = hWnd; + EnumSystemLocales(LanguagesEnumProc, LCID_INSTALLED); + + LoadString(hApplet, + IDS_SELECTED_LANGUAGE, + LangSel, + sizeof(LangSel) / sizeof(TCHAR)); + + SendMessage(hLanguageList, + CB_SELECTSTRING, + (WPARAM) -1, + (LPARAM)LangSel); +} + +static +VOID +SelectCurrentLayout(HWND hWnd) +{ + TCHAR Layout[256]; + + LoadString(hApplet, + IDS_SELECTED_LAYOUT, + Layout, + sizeof(Layout) / sizeof(TCHAR)); + SendMessage(hWnd, + CB_SELECTSTRING, + (WPARAM) -1, + (LPARAM)Layout); +} + INT_PTR CALLBACK AddDlgProc(HWND hDlg, UINT message, @@ -51,15 +138,28 @@ { case WM_INITDIALOG: { - + CreateLanguagesList(GetDlgItem(hDlg, IDC_INPUT_LANGUAGE_COMBO)); + CreateKeyboardLayoutList(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_COMBO)); + SelectCurrentLayout(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_COMBO)); } case WM_COMMAND: { - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) - { - EndDialog(hDlg,LOWORD(wParam)); - return TRUE; - } + switch (LOWORD(wParam)) + { + case IDC_INPUT_LANGUAGE_COMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + SelectCurrentLayout(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_COMBO)); + } + break; + case IDOK: + + break; + case IDCANCEL: + EndDialog(hDlg,LOWORD(wParam)); + return TRUE; + break; + } } break; } Modified: trunk/reactos/dll/cpl/input/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/advanced.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/advanced.c (original) +++ trunk/reactos/dll/cpl/input/advanced.c Sat Oct 6 15:47:06 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/advanced.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/advanced.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ @@ -49,7 +49,17 @@ switch(uMsg) { case WM_INITDIALOG: - break; + + break; + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_SUPPORT_ADV_SERV_CHECKBOX: + case IDC_TURNOFF_ADV_TXTSERV_CHECKBOX: + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + break; } return FALSE; Modified: trunk/reactos/dll/cpl/input/changekeyseq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/changekeyseq… ============================================================================== --- trunk/reactos/dll/cpl/input/changekeyseq.c (original) +++ trunk/reactos/dll/cpl/input/changekeyseq.c Sat Oct 6 15:47:06 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/changekeyseq.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/changekeyseq.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ Modified: trunk/reactos/dll/cpl/input/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.c (original) +++ trunk/reactos/dll/cpl/input/input.c Sat Oct 6 15:47:06 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/input.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/input.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ Modified: trunk/reactos/dll/cpl/input/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.h (original) +++ trunk/reactos/dll/cpl/input/input.h Sat Oct 6 15:47:06 2007 @@ -12,6 +12,9 @@ } APPLET, *PAPPLET; extern HINSTANCE hApplet; + +#define BEGIN_LAYOUT 5000 +#define END_LAYOUT 5133 /* input.c */ VOID @@ -45,6 +48,10 @@ INT_PTR CALLBACK InputLangPropDlgProc(HWND hDlg,UINT message,WPARAM wParam,LPARAM lParam); +/* misc.c */ +VOID +CreateKeyboardLayoutList(HWND hWnd); + void ShowLastWin32Error(HWND hWndOwner); #endif /* __CPL_INPUT_H */ Modified: trunk/reactos/dll/cpl/input/input.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rbuild (original) +++ trunk/reactos/dll/cpl/input/input.rbuild Sat Oct 6 15:47:06 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="input" type="win32dll" extension=".dll" baseaddress="${BASEADDRESS_INPUT}" installbase="system32" installname="input.dll"> +<module name="input" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INPUT}" installbase="system32" installname="input.cpl"> <importlibrary definition="input.def" /> <include base="input">.</include> <define name="UNICODE" /> @@ -22,5 +22,6 @@ <file>add.c</file> <file>changekeyseq.c</file> <file>inputlangprop.c</file> + <file>misc.c</file> <file>input.rc</file> </module> Modified: trunk/reactos/dll/cpl/input/input.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rc (original) +++ trunk/reactos/dll/cpl/input/input.rc Sat Oct 6 15:47:06 2007 @@ -21,4 +21,6 @@ IDI_KEY_SHORT_ICO ICON "resources/keyboard-shortcuts.ico" IDI_INFO_ICO ICON "resources/information.ico" +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #include "rsrc.rc" Modified: trunk/reactos/dll/cpl/input/inputlangprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/inputlangpro… ============================================================================== --- trunk/reactos/dll/cpl/input/inputlangprop.c (original) +++ trunk/reactos/dll/cpl/input/inputlangprop.c Sat Oct 6 15:47:06 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/inputlangprop.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/inputlangprop.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ @@ -39,6 +39,18 @@ #include "resource.h" #include "input.h" +static +VOID +SelectKeyboardLayout(HWND hWnd) +{ + TCHAR Layout[256]; + + SendMessage(hWnd, + CB_SELECTSTRING, + (WPARAM) -1, + (LPARAM)Layout); +} + INT_PTR CALLBACK InputLangPropDlgProc(HWND hDlg, UINT message, @@ -51,7 +63,8 @@ { case WM_INITDIALOG: { - + CreateKeyboardLayoutList(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_IME_COMBO)); + SelectKeyboardLayout(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_IME_COMBO)); } case WM_COMMAND: { Modified: trunk/reactos/dll/cpl/input/keysettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/keysettings.… ============================================================================== --- trunk/reactos/dll/cpl/input/keysettings.c (original) +++ trunk/reactos/dll/cpl/input/keysettings.c Sat Oct 6 15:47:06 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/keysettings.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/keysettings.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc Sat Oct 6 15:47:06 2007 @@ -71,14 +71,14 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Eingabesprache:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL LTEXT "&Tastaturlayout/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 169, 68, 50, 14 END -IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 269, 78 +IDD_CHANGE_KEY_SEQ2 DIALOG 5, 100, 269, 78 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Tastenkombination ändern" FONT 8, "MS Shell Dlg" @@ -110,8 +110,131 @@ PUSHBUTTON "Abbrechen", IDCANCEL, 169, 53, 52, 14 END +IDD_ADD2 DIALOG 20, 20, 257, 176 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Add Input Language" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&More Text Services:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10 + COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 155, 50, 14 +} + +IDD_ADD3 DIALOG 20, 20, 257, 147 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Add Input Language" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 126, 50, 14 +} + +IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 285, 74 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 209, 60 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 121, 15, 90, 12 + LTEXT "SHIFT", -1, 179, 37, 27, 12 + CTEXT "+", -1, 168, 37, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 227, 44, 50, 14 +} + +IDD_CHANGE_KEY_SEQ3 DIALOG 5, 100, 249, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + LTEXT "SHIFT", -1, 73, 87, 27, 12 + CTEXT "+", -1, 62, 87, 8, 9 + CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33 + AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 69, 10, WS_GROUP + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +} + +IDD_CHANGE_KEY_SEQ4 DIALOG 5, 100, 249, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33 + AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + LTEXT "SHIFT", -1, 73, 87, 27, 12 + CTEXT "+", -1, 62, 87, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +} + +IDD_CHANGE_KEY_SEQ5 DIALOG 5, 100, 269, 78 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", 1240, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "&Enable Key Sequence", 1249, 17, 17, 85, 8 + CTEXT "SHIFT", -1, 68, 37, 27, 12 + CTEXT "+", -1, 57, 37, 8, 9 + CTEXT "+", -1, 98, 37, 8, 10 + AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "&Key:", -1, 110, 37, 14, 10 + COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14 +} + STRINGTABLE BEGIN + //Selected language on "Add Input language" + IDS_SELECTED_LANGUAGE "English (United States)" + //Selected keyboard layout on "Add Input language" + IDS_SELECTED_LAYOUT, "United States-Dvorak" IDS_CPLSYSTEMNAME "Textdienste und Eingabesprachen" IDS_CPLSYSTEMDESCRIPTION "Ändert die Einstellungen der Texteingabe einer Sprache." IDS_US_LAYOUT, "US" Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/input/lang/en-US.rc Sat Oct 6 15:47:06 2007 @@ -71,14 +71,50 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Input language:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL LTEXT "&Keyboard layout/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 169, 68, 50, 14 END -IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 269, 78 +IDD_ADD2 DIALOG 20, 20, 257, 176 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Add Input Language" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&More Text Services:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10 + COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 155, 50, 14 +} + +IDD_ADD3 DIALOG 20, 20, 257, 147 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Add Input Language" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 126, 50, 14 +} + +IDD_CHANGE_KEY_SEQ2 DIALOG 5, 100, 269, 78 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Key Sequence" FONT 8, "MS Shell Dlg" @@ -97,6 +133,89 @@ PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14 END +IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 285, 74 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 209, 60 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 121, 15, 90, 12 + LTEXT "SHIFT", -1, 179, 37, 27, 12 + CTEXT "+", -1, 168, 37, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 227, 44, 50, 14 +} + +IDD_CHANGE_KEY_SEQ3 DIALOG 5, 100, 249, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + LTEXT "SHIFT", -1, 73, 87, 27, 12 + CTEXT "+", -1, 62, 87, 8, 9 + CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33 + AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 69, 10, WS_GROUP + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +} + +IDD_CHANGE_KEY_SEQ4 DIALOG 5, 100, 249, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33 + AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + LTEXT "SHIFT", -1, 73, 87, 27, 12 + CTEXT "+", -1, 62, 87, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +} + +IDD_CHANGE_KEY_SEQ5 DIALOG 5, 100, 269, 78 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", 1240, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "&Enable Key Sequence", 1249, 17, 17, 85, 8 + CTEXT "SHIFT", -1, 68, 37, 27, 12 + CTEXT "+", -1, 57, 37, 8, 9 + CTEXT "+", -1, 98, 37, 8, 10 + AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "&Key:", -1, 110, 37, 14, 10 + COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14 +} + IDD_INPUT_LANG_PROP DIALOG 20, 20, 227, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Input language Properties" @@ -112,6 +231,11 @@ STRINGTABLE BEGIN + //Selected language on "Add Input language" + IDS_SELECTED_LANGUAGE "English (United States)" + //Selected keyboard layout on "Add Input language" + IDS_SELECTED_LAYOUT, "United States-Dvorak" + IDS_CPLSYSTEMNAME "Text Services and Input Languages" IDS_CPLSYSTEMDESCRIPTION "Customizes settings for text input of languages." IDS_US_LAYOUT, "US" Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc Sat Oct 6 15:47:06 2007 @@ -71,14 +71,14 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Langue de sa&isie:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL LTEXT "Configuration du clavier/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 169, 68, 50, 14 END -IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 269, 78 +IDD_CHANGE_KEY_SEQ2 DIALOG 5, 100, 269, 78 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Changer la séquence de touches" FONT 8, "MS Shell Dlg" @@ -110,10 +110,133 @@ PUSHBUTTON "Annuler", IDCANCEL, 169, 53, 52, 14 END +IDD_ADD2 DIALOG 20, 20, 257, 176 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Add Input Language" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&More Text Services:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10 + COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 155, 50, 14 +} + +IDD_ADD3 DIALOG 20, 20, 257, 147 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Add Input Language" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 126, 50, 14 +} + +IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 285, 74 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 209, 60 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 121, 15, 90, 12 + LTEXT "SHIFT", -1, 179, 37, 27, 12 + CTEXT "+", -1, 168, 37, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 227, 44, 50, 14 +} + +IDD_CHANGE_KEY_SEQ3 DIALOG 5, 100, 249, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + LTEXT "SHIFT", -1, 73, 87, 27, 12 + CTEXT "+", -1, 62, 87, 8, 9 + CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33 + AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 69, 10, WS_GROUP + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +} + +IDD_CHANGE_KEY_SEQ4 DIALOG 5, 100, 249, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33 + AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + LTEXT "SHIFT", -1, 73, 87, 27, 12 + CTEXT "+", -1, 62, 87, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +} + +IDD_CHANGE_KEY_SEQ5 DIALOG 5, 100, 269, 78 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", 1240, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "&Enable Key Sequence", 1249, 17, 17, 85, 8 + CTEXT "SHIFT", -1, 68, 37, 27, 12 + CTEXT "+", -1, 57, 37, 8, 9 + CTEXT "+", -1, 98, 37, 8, 10 + AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "&Key:", -1, 110, 37, 14, 10 + COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14 +} + /* FIXME : To improve/complete */ /* FIXME : À améliorer/compléter */ STRINGTABLE BEGIN + //Selected language on "Add Input language" + IDS_SELECTED_LANGUAGE "English (United States)" + //Selected keyboard layout on "Add Input language" + IDS_SELECTED_LAYOUT, "United States-Dvorak" IDS_CPLSYSTEMNAME "Services texte et langue de saisie" IDS_CPLSYSTEMDESCRIPTION "Personnalise les paramètres pour la langue de saisie de texte." IDS_US_LAYOUT, "US" Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc Sat Oct 6 15:47:06 2007 @@ -79,14 +79,14 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Ìîâà ââîäó:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL LTEXT "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 169, 68, 50, 14 END -IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 269, 78 +IDD_CHANGE_KEY_SEQ2 DIALOG 5, 100, 269, 78 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Çì³íà ñïîëó÷åííÿ êëàâ³ø" FONT 8, "MS Shell Dlg" @@ -118,8 +118,131 @@ PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 169, 53, 52, 14 END +IDD_ADD2 DIALOG 20, 20, 257, 176 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Add Input Language" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&More Text Services:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10 + COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 155, 50, 14 +} + +IDD_ADD3 DIALOG 20, 20, 257, 147 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Add Input Language" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 126, 50, 14 +} + +IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 285, 74 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 209, 60 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 121, 15, 90, 12 + LTEXT "SHIFT", -1, 179, 37, 27, 12 + CTEXT "+", -1, 168, 37, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 227, 44, 50, 14 +} + +IDD_CHANGE_KEY_SEQ3 DIALOG 5, 100, 249, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + LTEXT "SHIFT", -1, 73, 87, 27, 12 + CTEXT "+", -1, 62, 87, 8, 9 + CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33 + AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 69, 10, WS_GROUP + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +} + +IDD_CHANGE_KEY_SEQ4 DIALOG 5, 100, 249, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33 + AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + LTEXT "SHIFT", -1, 73, 87, 27, 12 + CTEXT "+", -1, 62, 87, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +} + +IDD_CHANGE_KEY_SEQ5 DIALOG 5, 100, 269, 78 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", 1240, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "&Enable Key Sequence", 1249, 17, 17, 85, 8 + CTEXT "SHIFT", -1, 68, 37, 27, 12 + CTEXT "+", -1, 57, 37, 8, 9 + CTEXT "+", -1, 98, 37, 8, 10 + AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "&Key:", -1, 110, 37, 14, 10 + COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14 +} + STRINGTABLE BEGIN + //Selected language on "Add Input language" + IDS_SELECTED_LANGUAGE "English (United States)" + //Selected keyboard layout on "Add Input language" + IDS_SELECTED_LAYOUT, "United States-Dvorak" IDS_CPLSYSTEMNAME "Ìîâè òà ñëóæáè òåêñòîâîãî ââîäó" IDS_CPLSYSTEMDESCRIPTION "Íàëàøòîâóº ïàðàìåòðè äëÿ òåêñòîâîãî ââîäó." IDS_US_LAYOUT, "ÑØÀ" Modified: trunk/reactos/dll/cpl/input/langbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/langbar.c?re… ============================================================================== --- trunk/reactos/dll/cpl/input/langbar.c (original) +++ trunk/reactos/dll/cpl/input/langbar.c Sat Oct 6 15:47:06 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/langbar.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/langbar.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ Added: trunk/reactos/dll/cpl/input/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/misc.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/input/misc.c (added) +++ trunk/reactos/dll/cpl/input/misc.c Sat Oct 6 15:47:06 2007 @@ -1,0 +1,69 @@ +/* + * ReactOS + * Copyright (C) 2007 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * + * PROJECT: input.dll + * FILE: dll/win32/input/misc.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * UPDATE HISTORY: + * 06-09-2007 Created + */ + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> + +#include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> +#include <tchar.h> +#include <process.h> + +#include "resource.h" +#include "input.h" + +VOID +CreateKeyboardLayoutList(HWND hWnd) +{ + TCHAR Layout[256]; + int Index; + UINT loIndex; + + for ( loIndex = BEGIN_LAYOUT; loIndex <= END_LAYOUT; loIndex++ ) + { + LoadString(hApplet, + loIndex, + Layout, + sizeof(Layout) / sizeof(TCHAR)); + if (strlen((char*)Layout) > 0) + { + Index = (int) SendMessage(hWnd, + CB_INSERTSTRING, + 0, + (LPARAM)Layout); + SendMessage(hWnd, + CB_SETITEMDATA, + Index, + (LPARAM)loIndex); + } + } +} + +/* EOF */ Propchange: trunk/reactos/dll/cpl/input/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/input/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/input/resource.h (original) +++ trunk/reactos/dll/cpl/input/resource.h Sat Oct 6 15:47:06 2007 @@ -18,12 +18,18 @@ /* IDD */ #define IDD_PROPPAGESETTINGS 500 -#define IDD_PROPPAGEADVANCED 501 -#define IDD_LANGBAR 502 -#define IDD_KEYSETTINGS 503 -#define IDD_ADD 504 -#define IDD_CHANGE_KEY_SEQ 505 -#define IDD_INPUT_LANG_PROP 506 +#define IDD_ADD3 501 +#define IDD_INPUT_LANG_PROP 502 +#define IDD_CHANGE_KEY_SEQ 503 +#define IDD_CHANGE_KEY_SEQ4 504 +#define IDD_CHANGE_KEY_SEQ5 505 +#define IDD_CHANGE_KEY_SEQ2 506 +#define IDD_ADD 507 +#define IDD_CHANGE_KEY_SEQ3 508 +#define IDD_ADD2 509 +#define IDD_KEYSETTINGS 510 +#define IDD_LANGBAR 511 +#define IDD_PROPPAGEADVANCED 512 /* IDC */ #define IDC_DEFAULT_INPUT_LANG 150 @@ -52,6 +58,23 @@ #define IDC_ALT_CHECKBOX 173 #define IDC_CKEY_COMBOBOX 174 #define IDC_KEYBOARD_LAYOUT_IME_COMBO 175 +#define IDC_SWITCH_INPUT_LANG_CHECKBOX 176 +#define IDC_INLANG_CTRL_RADIOBTN 177 +#define IDC_INLANG_LEFTALT_RADIOBTN 178 +#define IDC_SWITCH_KEYBOARD_LO_CHECKBOX 179 +#define IDC_LAYOUT_CTRL_RADIOBTN 180 +#define IDC_LAYOUT_LEFTALT_RADIOBTN 181 +#define IDC_INPUT_LANG_COMBO 182 +#define IDC_KEYBOARD_LO_CHECKBOX 183 +#define IDC_KEYBOARD_LO_COMBO 184 +#define IDC_HANDWRITING_REC_CHECKBOX 185 +#define IDC_HANDWRITING_REC_COMBO 186 +#define IDC_SPEECH_CHECKBOX 187 +#define IDC_SPEECH_COMBO 188 +#define IDC_MORE_TEXT_SERV_CHECKBOX 189 +#define IDC_MORE_TEXT_SERV_COMBO 190 +#define IDC_CKS_BUTTON 191 +#define IDC_GRAVE_ACCENT_RADIOBTN 192 /* IDS */ #define IDS_CPLSYSTEMNAME 1 @@ -188,6 +211,9 @@ #define IDS_DIVEHI_PHONETIC_LAYOUT 5132 #define IDS_DIVEHI_TYPEWRITER_LAYOUT 5133 +#define IDS_SELECTED_LAYOUT 6000 +#define IDS_SELECTED_LANGUAGE 6001 + #endif /* __CPL_RESOURCE_H */ /* EOF */ Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c (original) +++ trunk/reactos/dll/cpl/input/settings.c Sat Oct 6 15:47:06 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/settings.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/settings.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ @@ -39,6 +39,58 @@ #include "resource.h" #include "input.h" +#define BUFSIZE 80 + +static +BOOL +CreateDefaultLangList(HWND hWnd) +{ + HKEY hKey; + char szPreload[BUFSIZE],szCount[BUFSIZE],Lang[BUFSIZE]; + DWORD dwBufLen = BUFSIZE, dwBufCLen = BUFSIZE, cValues; + LONG lRet; + int Count; + LCID Lcid; + + if(RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) + { + return FALSE; + } + RegQueryInfoKey(hKey,NULL,NULL,NULL,NULL,NULL,NULL,&cValues,NULL,NULL,NULL,NULL); + + if (cValues) + { + for (Count = 0; Count < cValues; Count++) + { + szCount[0] = '\0'; + lRet = RegEnumValue(hKey,Count,(LPTSTR)szCount,&dwBufCLen,NULL,NULL,NULL,NULL); + + sprintf(szCount,"%d",Count + 1); + RegQueryValueEx(hKey,(LPTSTR)szCount,NULL,NULL,(LPBYTE)szPreload,&dwBufLen); + + Lcid = wcstoul((LPTSTR)szPreload, NULL, 16); + GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, (LPTSTR)Lang, sizeof(Lang)); + + SendMessage(hWnd, + CB_INSERTSTRING, + 0, + (LPARAM)Lang); + if (Count == 0) + { + SendMessage(hWnd, + CB_SELECTSTRING, + (WPARAM) -1, + (LPARAM)Lang); + } + } + + } + + RegCloseKey(hKey); + + return TRUE; +} + /* Property page dialog callback */ INT_PTR CALLBACK SettingPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) @@ -47,8 +99,8 @@ switch (uMsg) { case WM_INITDIALOG: - - break; + CreateDefaultLangList(GetDlgItem(hwndDlg, IDC_DEFAULT_INPUT_LANG)); + break; case WM_COMMAND: switch (LOWORD(wParam)) @@ -77,6 +129,12 @@ hwndDlg, InputLangPropDlgProc); break; + case IDC_DEFAULT_INPUT_LANG: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; } break; }

1 0

[fireball] 29415: Dmitry Chapyshev <lentind@yandex.ru> - Fix a typo in the russian translation of taskmgr. - Improve explorer icons (as usual, remove 4bits, add 16bits, and very slightly edit). - Add some missing icons to setupapi.dll.
by fireball＠svn.reactos.org 06 Oct '07

06 Oct '07

Author: fireball Date: Sat Oct 6 15:04:31 2007 New Revision: 29415 URL: http://svn.reactos.org/svn/reactos?rev=29415&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Fix a typo in the russian translation of taskmgr. - Improve explorer icons (as usual, remove 4bits, add 16bits, and very slightly edit). - Add some missing icons to setupapi.dll. Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/base/shell/explorer/res/config.ico trunk/reactos/base/shell/explorer/res/control-panel.ico trunk/reactos/base/shell/explorer/res/desktop-settings.ico trunk/reactos/base/shell/explorer/res/explorer.ico trunk/reactos/base/shell/explorer/res/favorites.ico trunk/reactos/base/shell/explorer/res/info.ico trunk/reactos/base/shell/explorer/res/logoff.ico trunk/reactos/base/shell/explorer/res/network.ico trunk/reactos/base/shell/explorer/res/recent-documents.ico trunk/reactos/base/shell/explorer/res/shutdown.ico trunk/reactos/dll/win32/setupapi/res/icons/11.ico trunk/reactos/dll/win32/setupapi/res/icons/159.ico trunk/reactos/dll/win32/setupapi/res/icons/18.ico trunk/reactos/dll/win32/setupapi/res/icons/26.ico trunk/reactos/dll/win32/setupapi/res/icons/43.ico trunk/reactos/dll/win32/setupapi/res/icons/6.ico trunk/reactos/dll/win32/setupapi/res/icons/8.ico Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc Sat Oct 6 15:04:31 2007 @@ -662,7 +662,7 @@ IDS_MSG_TRAYICONCPUUSAGE "Èñïîëüçîâàíèå ÖÏ: %d%%" IDS_STATUS_MEMUSAGE "Èñïîëüçîâàíèå ïàìÿòè: %dK / %dK" IDS_STATUS_CPUUSAGE "Èñïîëüçîâàíèå ÖÏ: %3d%%" - IDS_STATUS_PROCESSES "Ïðîöåññ: %d" + IDS_STATUS_PROCESSES "Ïðîöåññîâ: %d" IDS_Not_Responding "Íå îòâå÷àåò" IDS_Running "Ðàáîòàåò" END Modified: trunk/reactos/base/shell/explorer/res/config.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/co… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/control-panel.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/co… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/desktop-settings.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/de… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/explorer.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/ex… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/favorites.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/fa… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/info.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/in… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/logoff.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/lo… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/network.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/ne… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/recent-documents.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/re… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/shutdown.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/sh… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/icons/11.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/icons/159.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/icons/18.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/icons/26.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/icons/43.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/icons/6.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/icons/8.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs