Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[hpoussin] 29428: Do not call DllInstall, it is a stub See issue #2719 for more details.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Oct 7 01:13:48 2007 New Revision: 29428 URL: http://svn.reactos.org/svn/reactos?rev=29428&view=rev Log: Do not call DllInstall, it is a stub See issue #2719 for more details. Modified: trunk/reactos/dll/win32/browseui/browseui.rbuild Modified: trunk/reactos/dll/win32/browseui/browseui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.rbuild (original) +++ trunk/reactos/dll/win32/browseui/browseui.rbuild Sun Oct 7 01:13:48 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="browseui" type="win32dll" baseaddress="${BASEADDRESS_BROWSEUI}" installbase="system32" installname="browseui.dll" allowwarnings="true"> - <autoregister infsection="OleControlDlls" type="Both" /> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="browseui.spec.def" /> <include base="browseui">.</include> <include base="ReactOS">include/reactos/wine</include>

17 years, 2 months

[tkreuzer] 29427: add missing gdi object type

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Oct 7 01:13:24 2007 New Revision: 29427 URL: http://svn.reactos.org/svn/reactos?rev=29427&view=rev Log: add missing gdi object type Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Sun Oct 7 01:13:24 2007 @@ -91,6 +91,7 @@ {0, 0, 0, NULL}, /* 14 DD_MOTION, unused */ {0, 0, 0, NULL}, /* 15 META, unused */ {0, 0, 0, NULL}, /* 16 ENUMFONT, unused */ + {0, 0, 0, NULL}, /* 17 BMFD, unused */ {0, 0, 0, NULL}, /* 18 VTFD, unused */ {0, 0, 0, NULL}, /* 19 TTFD, unused */ {0, 0, 0, NULL}, /* 1a RC, unused */

17 years, 2 months

[fireball] 29426: - Create a branch for some Win32 subsystem work, aimed at getting a "stable" implementation.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Oct 7 01:09:00 2007 New Revision: 29426 URL: http://svn.reactos.org/svn/reactos?rev=29426&view=rev Log: - Create a branch for some Win32 subsystem work, aimed at getting a "stable" implementation. Added: branches/win32k-stable/ - copied from r29425, trunk/

17 years, 2 months

[cwittich] 29425: replace non-existant SUBLANG_PORTUGUESE_PORTUGAL with SUBLANG_PORTUGUESE

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Oct 7 00:06:11 2007 New Revision: 29425 URL: http://svn.reactos.org/svn/reactos?rev=29425&view=rev Log: replace non-existant SUBLANG_PORTUGUESE_PORTUGAL with SUBLANG_PORTUGUESE Modified: trunk/reactos/base/applications/regedit/lang/pt-PT.rc Modified: trunk/reactos/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-PT.rc (original) +++ trunk/reactos/base/applications/regedit/lang/pt-PT.rc Sun Oct 7 00:06:11 2007 @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_PORTUGAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE ID_ACCEL ACCELERATORS {

17 years, 2 months

[hpoussin] 29424: Do not define structures twice

by hpoussin＠svn.reactos.org

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

17 years, 2 months

[hpoussin] 29423: Do not define __REACTOS__ twice

by hpoussin＠svn.reactos.org

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">

17 years, 2 months

[peterw] 29422: - Fix build.

by peterw＠svn.reactos.org

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_

17 years, 2 months

[cwittich] 29421: remove double controls from the resource

by cwittich＠svn.reactos.org

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

17 years, 2 months

[hpoussin] 29420: Rename _REACTOS_ to __REACTOS__

by hpoussin＠svn.reactos.org

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>

17 years, 2 months

[gedmurphy] 29419: fix painting of alpha channels in 32bpp icons onto windows/dialogs

by gedmurphy＠svn.reactos.org

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) {

17 years, 2 months

← Newer
1
...
58
59
60
61
62
63
64
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007