Author: cfinck
Date: Sun Aug 26 02:12:24 2007
New Revision: 28566
URL: http://svn.reactos.org/svn/reactos?rev=28566&view=rev
Log:
More build fixes for Mac OS X by changing the header order (wrc.h, which includes windef.h, which includes winnt.h has to be included before stdlib.h)
I know that this is another change in a Wine-shared component, but as long as we don't come to a better solution for these problems, I'll continue doing such small changes for fixing the build.
Modified:
trunk/reactos/tools/wrc/readres.c
trunk/reactos/tools/wrc/translation.c
trunk/reactos/tools/wrc/writeres.c
Modified: trunk/reactos/tools/wrc/readres.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/readres.c?rev=28…
==============================================================================
--- trunk/reactos/tools/wrc/readres.c (original)
+++ trunk/reactos/tools/wrc/readres.c Sun Aug 26 02:12:24 2007
@@ -20,12 +20,12 @@
#include "config.h"
+#include "wrc.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
-#include "wrc.h"
#include "readres.h"
#include "newstruc.h"
#include "utils.h"
Modified: trunk/reactos/tools/wrc/translation.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/translation.c?re…
==============================================================================
--- trunk/reactos/tools/wrc/translation.c (original)
+++ trunk/reactos/tools/wrc/translation.c Sun Aug 26 02:12:24 2007
@@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "wrc.h"
#include <stdio.h>
#include <stdlib.h>
#include "dumpres.h"
-#include "wrc.h"
#define MASTER_LANGUAGE LANG_ENGLISH
#define NB_LANG 0x94
Modified: trunk/reactos/tools/wrc/writeres.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/writeres.c?rev=2…
==============================================================================
--- trunk/reactos/tools/wrc/writeres.c (original)
+++ trunk/reactos/tools/wrc/writeres.c Sun Aug 26 02:12:24 2007
@@ -20,13 +20,13 @@
#include "config.h"
+#include "wrc.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include "wine/unicode.h"
-#include "wrc.h"
#include "genres.h"
#include "newstruc.h"
#include "utils.h"
Author: cfinck
Date: Sun Aug 26 00:05:21 2007
New Revision: 28561
URL: http://svn.reactos.org/svn/reactos?rev=28561&view=rev
Log:
Remove all apps from the Downloader XML file, which don't work under this branch
Modified:
branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml
Modified: branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/rosapps/do…
==============================================================================
--- branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml (original)
+++ branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml Sun Aug 26 00:05:21 2007
@@ -14,7 +14,7 @@
<description>The most popular and one of the best free Web Browsers out there.</description>
<location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/latest/win…</location>
</application>
- <application name="Thunderbird">
+ <application name="Thunderbird 1.5">
<regname>Mozilla Thunderbird (1.5)</regname>
<licence>MPL/GPL/LGPL</licence>
<version>1.5.0.9</version>
@@ -27,12 +27,6 @@
<version>2.0.0.6</version>
<description>The most popular and one of the best free Mail Clients out there.</description>
<location>http://ftp-mozilla.netscape.com/pub/mozilla.org/thunderbird/releases/latest…</location>
- </application>
- <application name="SeaMonkey">
- <regname>SeaMonkey (1.1.4)</regname>
- <version>1.1.4</version>
- <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need.</description>
- <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/seamonkey/releases/1.1.4/se…</location>
</application>
<application name="Mozilla ActiveX Control">
<regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname>
@@ -55,76 +49,16 @@
<description>Open source multiprotocol instant messaging application - May not work completely.</description>
<location>http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.6.8-unicode…</location>
</application>
- <application name="Putty">
- <regname>PuTTY version 0.60</regname>
- <licence>MIT</licence>
- <version>0.60</version>
- <description>A free SSH, Telnet, rlogin, and raw TCP client.</description>
- <location>http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.60-installer.exe</location>
- </application>
- </category>
- <category name="Office" icon="2">
- <application name="Abiword">
- <regname>"AbiWord 2.4.6 (remove only)"</regname>
- <version>2.4.6</version>
- <description>Word processor.</description>
- <location>http://www.abiword.org/downloads/abiword/2.4.6/Windows/abiword-setup-2.4.6.…</location>
- </application>
- <application name="OpenOffice">
- <regname>OpenOffice.org 2.2</regname>
- <version>2.2.1</version>
- <description>THE Open Source Office Suite.</description>
- <location>http://ftp.tu-chemnitz.de/pub/openoffice-extended/stable/2.2.1/OOo_2.2.1_Wi…</location>
- </application>
- </category>
- <category name="Graphics" icon="3">
- <application name="IrfanView">
- <regname>IrfanView (remove only)</regname>
- <version>4.00</version>
- <description>Viewer for all kinds of graphics/audio files/video files.</description>
- <location>http://gd.tuwien.ac.at/graphics/irfanview/iview400_setup.exe</location>
- </application>
- <application name="IrfanView Plugins">
- <version>4.00</version>
- <description>Additional Plugins for supporting more file types.</description>
- <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_400_setup.exe</location>
- </application>
- <application name="TuxPaint">
- <regname>Tux Paint 0.9.17</regname>
- <version>0.9.17</version>
- <description>An Open Source bitmap graphics editor geared towards young children.</description>
- <location>http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.17-win32-in…</location>
- </application>
- </category>
- <category name="Multimedia" icon="4">
</category>
<category name="Development" icon="5">
- <application name="ReactOS Build Environment">
- <regname>ReactOS Build Environment 0.3.7</regname>
- <version>0.3.7</version>
- <description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description>
- <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-0.3.7.exe</location>
- </application>
<application name="MinGW">
<regname>MinGW 5.1.3</regname>
<version>5.1.3</version>
<description>A Port of the GNU toolchain with GCC, GDB, GNU make, etc.</description>
<location>http://puzzle.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.3.exe</location>
</application>
- <application name="FreeBASIC">
- <regname>FreeBASIC 0.17b</regname>
- <version>0.17b</version>
- <description>Open Source BASIC Compiler. The BASIC syntax is compatible to QBASIC.</description>
- <location>http://switch.dl.sourceforge.net/sourceforge/fbc/FreeBASIC-v0.17b-win32.exe</location>
- </application>
</category>
<category name="Games & Fun" icon="6">
- <application name="ScummVM">
- <regname>ScummVM 0.10.0</regname>
- <version>0.10.0</version>
- <description>SamNMax, Day of Tentacle, etc on ReactOS</description>
- <location>http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.10.0-win32.exe</location>
- </application>
<application name="Tile World">
<description>Nice Clone of Chip's Challenge originally made for the Atari Lynx. Includes free CCLP2 Graphics Pack, so you dont need the copyrighted Original.</description>
<location>http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-1.3.0-win32-…</location>
@@ -134,24 +68,6 @@
<version>0.5.3-RC2</version>
<description>Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon.</description>
<location>http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.5.3-RC2-win32.e…</location>
- </application>
- <application name="LBreakout2">
- <regname>LBreakout2 2.4.1</regname>
- <version>2.4.1</version>
- <description>Breakout Clone using SDL libs.</description>
- <location>http://switch.dl.sourceforge.net/sourceforge/lgames/lbreakout2-2.4.1-win32.…</location>
- </application>
- <application name="LGeneral">
- <regname>LGeneral 1.1</regname>
- <version>1.1</version>
- <description>Panzer General Clone using SDL libs.</description>
- <location>http://kent.dl.sourceforge.net/sourceforge/lgames/lgeneral-1.1-win32.exe</location>
- </application>
- <application name="LMarbles">
- <regname>LMarbles 1.0.6</regname>
- <version>1.0.6</version>
- <description>Atomix Clone using SDL libs.</description>
- <location>http://heanet.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe</location>
</application>
</category>
<category name="Tools" icon="7">
@@ -167,23 +83,5 @@
<description>Small and fast BitTorrent Client.</description>
<location>http://download.utorrent.com/1.7.2/utorrent.exe</location>
</application>
- <application name="Audio Grabber">
- <regname>Audiograbber 1.83 SE</regname>
- <version>1.83 SE</version>
- <description>A very good CD Ripper/Audio File Converter.</description>
- <location>http://www.audiograbber.de/files/342677432/agsetup183se.exe</location>
- </application>
- </category>
- <category name="Others" icon="8">
- <application name="Simple Direct Media Layer (SDL) Runtime">
- <version>1.2.12</version>
- <description>Needed for many Open Source Games to run. You need 7-Zip or a similar Utility to extract it.</description>
- <location>http://www.libsdl.org/release/SDL-1.2.12-win32.zip</location>
- </application>
- <application name="DOSBox">
- <version>0.71</version>
- <description>DOSBox is a DOS emulator.</description>
- <location>http://puzzle.dl.sourceforge.net/sourceforge/dosbox/DOSBox0.71-win32-instal…</location>
- </application>
</category>
</tree>
Author: greatlrd
Date: Sat Aug 25 23:25:24 2007
New Revision: 28560
URL: http://svn.reactos.org/svn/reactos?rev=28560&view=rev
Log:
Alex is god of haven and shall rise to the sky ... (my poem to alex for he found I did a mistake)
in protypes for NtGdiEngCreateDeviceSurface, NtGdiEngCreateDeviceBitmap, NtGdiEngCreateBitmap
Part (2/2)
Modified:
trunk/reactos/include/psdk/ntgdi.h
Modified: trunk/reactos/include/psdk/ntgdi.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=2…
==============================================================================
--- trunk/reactos/include/psdk/ntgdi.h (original)
+++ trunk/reactos/include/psdk/ntgdi.h Sat Aug 25 23:25:24 2007
@@ -2934,8 +2934,7 @@
IN LONG lWidth,
IN ULONG iFormat,
IN FLONG fl,
- IN OPTIONAL PVOID pvBits,
- IN DWORD UNKNOWN
+ IN OPTIONAL PVOID pvBits
);
W32KAPI
@@ -2972,8 +2971,7 @@
NtGdiEngCreateDeviceSurface(
IN DHSURF dhsurf,
IN SIZEL sizl,
- IN ULONG iFormatCompat,
- IN DWORD UNKNOWN
+ IN ULONG iFormatCompat
);
W32KAPI
@@ -2982,8 +2980,7 @@
NtGdiEngCreateDeviceBitmap(
IN DHSURF dhsurf,
IN SIZEL sizl,
- IN ULONG iFormatCompat,
- IN DWORD UNKNOWN
+ IN ULONG iFormatCompat
);
W32KAPI
Author: greatlrd
Date: Sat Aug 25 23:24:20 2007
New Revision: 28559
URL: http://svn.reactos.org/svn/reactos?rev=28559&view=rev
Log:
Alex is god of haven and shall rise to the sky ... (my poem to alex for he found I did a mistake)
in protypes for NtGdiEngCreateDeviceSurface, NtGdiEngCreateDeviceBitmap, NtGdiEngCreateBitmap
Part (1/2)
Modified:
trunk/reactos/subsystems/win32/win32k/stubs/stubs.c
Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original)
+++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Sat Aug 25 23:24:20 2007
@@ -1363,8 +1363,7 @@
HSURF STDCALL
NtGdiEngCreateDeviceSurface( IN DHSURF Surface,
IN SIZEL Size,
- IN ULONG FormatVersion,
- IN DWORD UNKNOWN)
+ IN ULONG FormatVersion)
{
UNIMPLEMENTED;
return 0;
@@ -1377,8 +1376,7 @@
NtGdiEngCreateDeviceBitmap(
IN DHSURF dhsurf,
IN SIZEL sizl,
- IN ULONG iFormatCompat,
- IN DWORD UNKNOWN)
+ IN ULONG iFormatCompat)
{
UNIMPLEMENTED;
return NULL;
@@ -1408,8 +1406,7 @@
IN LONG Width,
IN ULONG Format,
IN ULONG Flags,
- IN PVOID Bits,
- IN DWORD UNKNOWN)
+ IN PVOID Bits)
{
UNIMPLEMENTED;
return NULL;