Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[hpoussin] 33377: Fix route.exe compilation by removing hack

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu May 8 12:48:13 2008 New Revision: 33377 URL: http://svn.reactos.org/svn/reactos?rev=33377&view=rev Log: Fix route.exe compilation by removing hack Modified: trunk/reactos/base/applications/network/route/route.c Modified: trunk/reactos/base/applications/network/route/route.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/route/route.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/route/route.c [iso-8859-1] Thu May 8 12:48:13 2008 @@ -251,9 +251,6 @@ return Error; } -#if defined(_UNICODE) && defined(__GNUC__) -static -#endif int _tmain( int argc, TCHAR **argv ) { if( argc < 2 ) @@ -267,41 +264,3 @@ else return Usage(); } - -#if defined(_UNICODE) && defined(__GNUC__) -/* HACK - MINGW HAS NO OFFICIAL SUPPORT FOR wmain()!!! */ -int main( int argc, char **argv ) -{ - WCHAR **argvW; - int i, j, Ret = 1; - - if ((argvW = malloc(argc * sizeof(WCHAR*)))) - { - /* convert the arguments */ - for (i = 0, j = 0; i < argc; i++) - { - if (!(argvW[i] = malloc((strlen(argv[i]) + 1) * sizeof(WCHAR)))) - { - j++; - } - swprintf(argvW[i], L"%hs", argv[i]); - } - - if (j == 0) - { - /* no error converting the parameters, call wmain() */ - Ret = wmain(argc, argvW); - } - - /* free the arguments */ - for (i = 0; i < argc; i++) - { - if (argvW[i]) - free(argvW[i]); - } - free(argvW); - } - - return Ret; -} -#endif

16 years, 4 months

[hpoussin] 33376: Use _tWinMain instead of WinMain, as welcome.exe uses TCHAR in other places

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu May 8 12:08:47 2008 New Revision: 33376 URL: http://svn.reactos.org/svn/reactos?rev=33376&view=rev Log: Use _tWinMain instead of WinMain, as welcome.exe uses TCHAR in other places Modified: trunk/reactos/base/setup/welcome/welcome.c Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] Thu May 8 12:08:47 2008 @@ -96,9 +96,9 @@ /* FUNCTIONS ****************************************************************/ int WINAPI -WinMain(HINSTANCE hInst, +_tWinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, - LPSTR lpszCmdLine, + LPTSTR lpszCmdLine, int nCmdShow) { WNDCLASSEX wndclass;

16 years, 4 months

[hpoussin] 33375: Do not define _UNICODE twice (on command line and in utility.h)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu May 8 12:06:47 2008 New Revision: 33375 URL: http://svn.reactos.org/svn/reactos?rev=33375&view=rev Log: Do not define _UNICODE twice (on command line and in utility.h) Modified: trunk/reactos/base/shell/explorer/utility/utility.h Modified: trunk/reactos/base/shell/explorer/utility/utility.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] Thu May 8 12:06:47 2008 @@ -45,7 +45,7 @@ #include <windows.h> // Unicode support -#ifdef UNICODE +#if defined(UNICODE) && !defined(_UNICODE) #define _UNICODE #endif #include <tchar.h>

16 years, 4 months

[cfinck] 33374: Fix win32kdxtest build

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu May 8 12:00:15 2008 New Revision: 33374 URL: http://svn.reactos.org/svn/reactos?rev=33374&view=rev Log: Fix win32kdxtest build Modified: trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild Modified: trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/win32… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild [iso-8859-1] Thu May 8 12:00:15 2008 @@ -1,7 +1,5 @@ <module name="win32kdxtest" type="win32cui" installbase="bin" installname="win32kdxtest.exe" allowwarnings ="true" > <include base="win32kdxtest">.</include> - <define name="__USE_W32API" /> - <define name="__REACTOS__" /> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <library>kernel32</library>

16 years, 4 months

[hpoussin] 33373: Use _tWinMain instead of WinMain, as setup.exe uses TCHAR in other places

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu May 8 11:56:03 2008 New Revision: 33373 URL: http://svn.reactos.org/svn/reactos?rev=33373&view=rev Log: Use _tWinMain instead of WinMain, as setup.exe uses TCHAR in other places Modified: trunk/reactos/base/setup/setup/setup.c Modified: trunk/reactos/base/setup/setup/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/setup/setup.c?r… ============================================================================== --- trunk/reactos/base/setup/setup/setup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/setup/setup.c [iso-8859-1] Thu May 8 11:56:03 2008 @@ -114,9 +114,9 @@ } int STDCALL -WinMain (HINSTANCE hInstance, +_tWinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLine, + LPTSTR lpCmdLine, int nShowCmd) { LPTSTR CmdLine;

16 years, 4 months

[hpoussin] 33372: Fix sc.exe compilation by removing hack

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu May 8 11:48:39 2008 New Revision: 33372 URL: http://svn.reactos.org/svn/reactos?rev=33372&view=rev Log: Fix sc.exe compilation by removing hack Modified: trunk/reactos/base/applications/sc/sc.c Modified: trunk/reactos/base/applications/sc/sc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.c?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.c [iso-8859-1] Thu May 8 11:48:39 2008 @@ -189,10 +189,6 @@ return 0; } -#if defined(_UNICODE) && defined(__GNUC__) -static -#endif - int _tmain(int argc, LPCTSTR argv[]) { LPCTSTR Server = NULL; // remote machine @@ -236,42 +232,3 @@ argc-2); } } - - -#if defined(_UNICODE) && defined(__GNUC__) -/* HACK - MINGW HAS NO OFFICIAL SUPPORT FOR wmain()!!! */ -int main( int argc, char **argv ) -{ - WCHAR **argvW; - int i, j, Ret = 1; - - if ((argvW = (WCHAR**) malloc(argc * sizeof(WCHAR*)))) - { - /* convert the arguments */ - for (i = 0, j = 0; i < argc; i++) - { - if (!(argvW[i] = (WCHAR*) malloc((strlen(argv[i]) + 1) * sizeof(WCHAR)))) - { - j++; - } - swprintf(argvW[i], L"%hs", argv[i]); - } - - if (j == 0) - { - /* no error converting the parameters, call wmain() */ - Ret = wmain(argc, (LPCTSTR *)argvW); - } - - /* free the arguments */ - for (i = 0; i < argc; i++) - { - if (argvW[i]) - free(argvW[i]); - } - free(argvW); - } - - return Ret; -} -#endif

16 years, 4 months

[cfinck] 33371: Same fix for libpng

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu May 8 11:41:46 2008 New Revision: 33371 URL: http://svn.reactos.org/svn/reactos?rev=33371&view=rev Log: Same fix for libpng Modified: trunk/rosapps/lib/libpng/libpng.rbuild Modified: trunk/rosapps/lib/libpng/libpng.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/libpng.rbuild?r… ============================================================================== --- trunk/rosapps/lib/libpng/libpng.rbuild [iso-8859-1] (original) +++ trunk/rosapps/lib/libpng/libpng.rbuild [iso-8859-1] Thu May 8 11:41:46 2008 @@ -1,31 +1,29 @@ <module name="libpng" type="staticlibrary" allowwarnings="true"> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WIN32" /> - <define name="NDEBUG" /> - <define name="_WINDOWS" /> - <define name="_WINDOWS_" /> - <define name="_USRDLL" /> - <include base="libpng">.</include> - <include base="ReactOS">lib/3rdparty/zlib</include> - <file>png.c</file> - <file>pngerror.c</file> - <file>pnggccrd.c</file> - <file>pngget.c</file> - <file>pngmem.c</file> - <file>pngpread.c</file> - <file>pngread.c</file> - <file>pngrio.c</file> - <file>pngrtran.c</file> - <file>pngrutil.c</file> - <file>pngset.c</file> - <file>pngtest.c</file> - <file>pngtrans.c</file> - <file>pngvcrd.c</file> - <file>pngwio.c</file> - <file>pngwrite.c</file> - <file>pngwtran.c</file> - <file>pngwutil.c</file> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WIN32" /> + <define name="NDEBUG" /> + <define name="_WINDOWS" /> + <define name="_WINDOWS_" /> + <define name="_USRDLL" /> + <include base="libpng">.</include> + <include base="ReactOS">lib/3rdparty/zlib</include> + <file>png.c</file> + <file>pngerror.c</file> + <file>pnggccrd.c</file> + <file>pngget.c</file> + <file>pngmem.c</file> + <file>pngpread.c</file> + <file>pngread.c</file> + <file>pngrio.c</file> + <file>pngrtran.c</file> + <file>pngrutil.c</file> + <file>pngset.c</file> + <file>pngtest.c</file> + <file>pngtrans.c</file> + <file>pngvcrd.c</file> + <file>pngwio.c</file> + <file>pngwrite.c</file> + <file>pngwtran.c</file> + <file>pngwutil.c</file> </module>

16 years, 4 months

[cfinck] 33370: Fix libjpeg build by removing the __REACTOS__ define from it (already defined in "ReactOS-generic.rbuild") Also remove the USE_W32API define, which was done for many other modules in the past. Finally, fix the indentation of the rbuild file :)

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu May 8 11:38:20 2008 New Revision: 33370 URL: http://svn.reactos.org/svn/reactos?rev=33370&view=rev Log: Fix libjpeg build by removing the __REACTOS__ define from it (already defined in "ReactOS-generic.rbuild") Also remove the USE_W32API define, which was done for many other modules in the past. Finally, fix the indentation of the rbuild file :) Modified: trunk/rosapps/lib/libjpeg/libjpeg.rbuild Modified: trunk/rosapps/lib/libjpeg/libjpeg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libjpeg/libjpeg.rbuild… ============================================================================== --- trunk/rosapps/lib/libjpeg/libjpeg.rbuild [iso-8859-1] (original) +++ trunk/rosapps/lib/libjpeg/libjpeg.rbuild [iso-8859-1] Thu May 8 11:38:20 2008 @@ -1,62 +1,61 @@ <module name="libjpeg" type="staticlibrary" allowwarnings="true"> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="HAVE_CONFIG_H" /> - <define name="WIN32" /> - <define name="NDEBUG" /> - <define name="_WINDOWS" /> - <define name="_WINDOWS_" /> - <define name="_USRDLL" /> - <define name="FREEIMAGE_EXPORTS" /> - <define name="_SECURE_NO_DEPRECATE" /> - <include base="libjpeg">.</include> - <file>jcapimin.c</file> - <file>jcapistd.c</file> - <file>jccoefct.c</file> - <file>jccolor.c</file> - <file>jcdctmgr.c</file> - <file>jchuff.c</file> - <file>jcinit.c</file> - <file>jcmainct.c</file> - <file>jcmarker.c</file> - <file>jcmaster.c</file> - <file>jcomapi.c</file> - <file>jcparam.c</file> - <file>jcphuff.c</file> - <file>jcprepct.c</file> - <file>jcsample.c</file> - <file>jctrans.c</file> - <file>jdapimin.c</file> - <file>jdapistd.c</file> - <file>jdatadst.c</file> - <file>jdatasrc.c</file> - <file>jdcoefct.c</file> - <file>jdcolor.c</file> - <file>jddctmgr.c</file> - <file>jdhuff.c</file> - <file>jdinput.c</file> - <file>jdmainct.c</file> - <file>jdmarker.c</file> - <file>jdmaster.c</file> - <file>jdmerge.c</file> - <file>jdphuff.c</file> - <file>jdpostct.c</file> - <file>jdsample.c</file> - <file>jdtrans.c</file> - <file>jerror.c</file> - <file>jfdctflt.c</file> - <file>jfdctfst.c</file> - <file>jfdctint.c</file> - <file>jidctflt.c</file> - <file>jidctfst.c</file> - <file>jidctint.c</file> - <file>jidctred.c</file> - <file>jmemmgr.c</file> - <file>jmemnobs.c</file> - <file>jquant1.c</file> - <file>jquant2.c</file> - <file>jutils.c</file> - <file>transupp.c</file> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="HAVE_CONFIG_H" /> + <define name="WIN32" /> + <define name="NDEBUG" /> + <define name="_WINDOWS" /> + <define name="_WINDOWS_" /> + <define name="_USRDLL" /> + <define name="FREEIMAGE_EXPORTS" /> + <define name="_SECURE_NO_DEPRECATE" /> + <include base="libjpeg">.</include> + + <file>jcapimin.c</file> + <file>jcapistd.c</file> + <file>jccoefct.c</file> + <file>jccolor.c</file> + <file>jcdctmgr.c</file> + <file>jchuff.c</file> + <file>jcinit.c</file> + <file>jcmainct.c</file> + <file>jcmarker.c</file> + <file>jcmaster.c</file> + <file>jcomapi.c</file> + <file>jcparam.c</file> + <file>jcphuff.c</file> + <file>jcprepct.c</file> + <file>jcsample.c</file> + <file>jctrans.c</file> + <file>jdapimin.c</file> + <file>jdapistd.c</file> + <file>jdatadst.c</file> + <file>jdatasrc.c</file> + <file>jdcoefct.c</file> + <file>jdcolor.c</file> + <file>jddctmgr.c</file> + <file>jdhuff.c</file> + <file>jdinput.c</file> + <file>jdmainct.c</file> + <file>jdmarker.c</file> + <file>jdmaster.c</file> + <file>jdmerge.c</file> + <file>jdphuff.c</file> + <file>jdpostct.c</file> + <file>jdsample.c</file> + <file>jdtrans.c</file> + <file>jerror.c</file> + <file>jfdctflt.c</file> + <file>jfdctfst.c</file> + <file>jfdctint.c</file> + <file>jidctflt.c</file> + <file>jidctfst.c</file> + <file>jidctint.c</file> + <file>jidctred.c</file> + <file>jmemmgr.c</file> + <file>jmemnobs.c</file> + <file>jquant1.c</file> + <file>jquant2.c</file> + <file>jutils.c</file> + <file>transupp.c</file> </module>

16 years, 4 months

[hpoussin] 33369: Don't depend of UNICODE/_UNICODE

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu May 8 11:29:50 2008 New Revision: 33369 URL: http://svn.reactos.org/svn/reactos?rev=33369&view=rev Log: Don't depend of UNICODE/_UNICODE Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Thu May 8 11:29:50 2008 @@ -1043,7 +1043,7 @@ NtUserEnumDisplayDevices ( PUNICODE_STRING lpDevice, /* device name */ DWORD iDevNum, /* display device */ - PDISPLAY_DEVICE lpDisplayDevice, /* device information */ + PDISPLAY_DEVICEW lpDisplayDevice, /* device information */ DWORD dwFlags ); /* reserved */ /*BOOL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Thu May 8 11:29:50 2008 @@ -160,7 +160,7 @@ NtUserEnumDisplayDevices ( PUNICODE_STRING lpDevice, /* device name */ DWORD iDevNum, /* display device */ - PDISPLAY_DEVICE lpDisplayDevice, /* device information */ + PDISPLAY_DEVICEW lpDisplayDevice, /* device information */ DWORD dwFlags ) /* reserved */ { DPRINT1("NtUserEnumDisplayDevices() is UNIMPLEMENTED!\n"); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Thu May 8 11:29:50 2008 @@ -1565,7 +1565,7 @@ { HFONT hOldFont = NULL, hFont = NULL; COLORREF OldTextColor; - NONCLIENTMETRICS nclm; + NONCLIENTMETRICSW nclm; NTSTATUS Status; #ifndef NDEBUG INT i;

16 years, 4 months

[hpoussin] 33368: Fix typo spotted by Stephan100 on IRC

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu May 8 11:16:48 2008 New Revision: 33368 URL: http://svn.reactos.org/svn/reactos?rev=33368&view=rev Log: Fix typo spotted by Stephan100 on IRC Modified: trunk/reactos/base/applications/calc/calc.rbuild Modified: trunk/reactos/base/applications/calc/calc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/cal… ============================================================================== --- trunk/reactos/base/applications/calc/calc.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/calc.rbuild [iso-8859-1] Thu May 8 11:16:48 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="calc" type="win32gui" installbase="system32" installname="calc.exe" allowwarnings="yes"> +<module name="calc" type="win32gui" installbase="system32" installname="calc.exe" allowwarnings="true"> <include base="calc">.</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define>

16 years, 4 months

← Newer
1
...
39
40
41
42
43
44
45
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008