Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 18598: - NDK fix: don't undef a million status codes, instead, have apps define WIN32_NO_STATUS.
by ion＠svn.reactos.com 19 Oct '05

19 Oct '05

- NDK fix: don't undef a million status codes, instead, have apps define WIN32_NO_STATUS. - winnt.h: respect WIN32_NO_STATUS for DBG codes. - rtl: change STDCALL to NTAPI - everything else: add precompiled headers where missing, define WIN32_NO_STATUS. Modified: trunk/reactos/apps/utils/ps/ps.c Modified: trunk/reactos/include/ndk/ntndk.h Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/lib/advapi32/advapi32.h Modified: trunk/reactos/lib/crt/except/unwind.c Modified: trunk/reactos/lib/crt/wine/scanf.c Modified: trunk/reactos/lib/dnsapi/dnsapi/adns.c Modified: trunk/reactos/lib/dnsapi/dnsapi/context.c Modified: trunk/reactos/lib/dnsapi/dnsapi/free.c Modified: trunk/reactos/lib/dnsapi/dnsapi/names.c Added: trunk/reactos/lib/dnsapi/dnsapi/precomp.h Modified: trunk/reactos/lib/dnsapi/dnsapi/query.c Modified: trunk/reactos/lib/dnsapi/dnsapi/stubs.c Modified: trunk/reactos/lib/dnsapi/dnsapi.xml Modified: trunk/reactos/lib/epsapi/enum/drivers.c Modified: trunk/reactos/lib/epsapi/enum/modules.c Modified: trunk/reactos/lib/epsapi/enum/processes.c Modified: trunk/reactos/lib/fmifs/chkdsk.c Modified: trunk/reactos/lib/fmifs/compress.c Modified: trunk/reactos/lib/fmifs/diskcopy.c Modified: trunk/reactos/lib/fmifs/extend.c Modified: trunk/reactos/lib/fmifs/fmifs.xml Modified: trunk/reactos/lib/fmifs/format.c Modified: trunk/reactos/lib/fmifs/init.c Modified: trunk/reactos/lib/fmifs/label.c Modified: trunk/reactos/lib/fmifs/media.c Added: trunk/reactos/lib/fmifs/precomp.h Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.h Modified: trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h Modified: trunk/reactos/lib/gdi32/include/precomp.h Modified: trunk/reactos/lib/kernel32/k32.h Modified: trunk/reactos/lib/lsasrv/lsaport.c Modified: trunk/reactos/lib/lsasrv/lsasrv.c Modified: trunk/reactos/lib/msafd/msafd.h Modified: trunk/reactos/lib/nt/entry_point.c Modified: trunk/reactos/lib/ntdll/inc/ntdll.h Modified: trunk/reactos/lib/opengl32/gl.c Modified: trunk/reactos/lib/opengl32/opengl32.c Modified: trunk/reactos/lib/opengl32/teb.h Modified: trunk/reactos/lib/opengl32/wgl.c Modified: trunk/reactos/lib/psapi/precomp.h Modified: trunk/reactos/lib/rtl/access.c Modified: trunk/reactos/lib/rtl/acl.c Modified: trunk/reactos/lib/rtl/atom.c Modified: trunk/reactos/lib/rtl/bit.c Modified: trunk/reactos/lib/rtl/bitmap.c Modified: trunk/reactos/lib/rtl/bootdata.c Modified: trunk/reactos/lib/rtl/compress.c Modified: trunk/reactos/lib/rtl/crc32.c Modified: trunk/reactos/lib/rtl/critical.c Modified: trunk/reactos/lib/rtl/dbgbuffer.c Modified: trunk/reactos/lib/rtl/debug.c Modified: trunk/reactos/lib/rtl/dos8dot3.c Modified: trunk/reactos/lib/rtl/encode.c Modified: trunk/reactos/lib/rtl/env.c Modified: trunk/reactos/lib/rtl/error.c Modified: trunk/reactos/lib/rtl/exception.c Modified: trunk/reactos/lib/rtl/generictable.c Modified: trunk/reactos/lib/rtl/handle.c Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/i386/exception.c Modified: trunk/reactos/lib/rtl/image.c Modified: trunk/reactos/lib/rtl/largeint.c Modified: trunk/reactos/lib/rtl/luid.c Modified: trunk/reactos/lib/rtl/mem.c Modified: trunk/reactos/lib/rtl/message.c Modified: trunk/reactos/lib/rtl/network.c Modified: trunk/reactos/lib/rtl/nls.c Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/ppb.c Modified: trunk/reactos/lib/rtl/process.c Modified: trunk/reactos/lib/rtl/propvar.c Modified: trunk/reactos/lib/rtl/random.c Modified: trunk/reactos/lib/rtl/rangelist.c Modified: trunk/reactos/lib/rtl/registry.c Modified: trunk/reactos/lib/rtl/resource.c Modified: trunk/reactos/lib/rtl/rtl.h Modified: trunk/reactos/lib/rtl/rtlp.h Modified: trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/lib/rtl/security.c Modified: trunk/reactos/lib/rtl/sid.c Modified: trunk/reactos/lib/rtl/splaytree.c Modified: trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/lib/rtl/time.c Modified: trunk/reactos/lib/rtl/timerqueue.c Modified: trunk/reactos/lib/rtl/timezone.c Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/unicodeprefix.c Modified: trunk/reactos/lib/rtl/vectoreh.c Modified: trunk/reactos/lib/rtl/version.c Modified: trunk/reactos/lib/samlib/samlib.c Modified: trunk/reactos/lib/secur32/dllmain.c Modified: trunk/reactos/lib/secur32/lsa.c Added: trunk/reactos/lib/secur32/precomp.h Modified: trunk/reactos/lib/secur32/secur32.xml Modified: trunk/reactos/lib/smdll/query.c Modified: trunk/reactos/lib/smlib/compses.c Modified: trunk/reactos/lib/smlib/connect.c [truncated at 100 lines; 39 more skipped] _____ Modified: trunk/reactos/apps/utils/ps/ps.c --- trunk/reactos/apps/utils/ps/ps.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/apps/utils/ps/ps.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -22,8 +22,9 @@ Thanks to Filip Navara patch for fixing the Xp crash problem. */ +#define NTOS_MODE_USER +#define WIN32_NO_STATUS #include <windows.h> -#define NTOS_MODE_USER #include <ndk/ntndk.h> typedef struct _SYSTEM_THREADS _____ Modified: trunk/reactos/include/ndk/ntndk.h --- trunk/reactos/include/ndk/ntndk.h 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/include/ndk/ntndk.h 2005-10-19 17:03:38 UTC (rev 18598) @@ -13,7 +13,7 @@ #include <stdarg.h> /* Helper Header */ -#include <helper.h> +#include <reactos/helper.h> /* A version of ntdef.h to be used with PSDK headers. */ #include "umtypes.h" _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-10-19 17:03:38 UTC (rev 18598) @@ -1989,6 +1989,19 @@ RtlUniform(PULONG Seed); /* + * Network Functions + */ +NTSYSAPI +NTSTATUS +NTAPI +RtlIpv4StringToAddressW( + IN LPWSTR IpString, + IN ULONG Base, + OUT PULONG PtrToIpAddr, + OUT PULONG IpAddr +); + +/* * Time Functions */ NTSYSAPI @@ -2042,6 +2055,10 @@ NTAPI RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation); +NTSYSAPI +BOOLEAN +NTAPI +RtlGetNtProductType(OUT PNT_PRODUCT_TYPE ProductType); static __inline struct _PEB* NtCurrentPeb (void) { _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/include/ndk/umtypes.h 2005-10-19 17:03:38 UTC (rev 18598) @@ -14,51 +14,7 @@ /* DEPENDENCIES **************************************************************/ #include <winioctl.h> #include <ntnls.h> - -/* Undef the following to avoid conflects including ntstatus.h with winnt.h */ -#undef STATUS_WAIT_0 -#undef STATUS_ABANDONED_WAIT_0 -#undef STATUS_USER_APC -#undef STATUS_TIMEOUT -#undef STATUS_PENDING -#undef DBG_EXCEPTION_HANDLED -#undef STATUS_SEGMENT_NOTIFICATION -#undef DBG_TERMINATE_THREAD -#undef DBG_TERMINATE_PROCESS -#undef DBG_CONTROL_C -#undef DBG_CONTROL_BREAK -#undef DBG_COMMAND_EXCEPTION -#undef STATUS_GUARD_PAGE_VIOLATION -#undef STATUS_DATATYPE_MISALIGNMENT -#undef STATUS_BREAKPOINT -#undef STATUS_SINGLE_STEP -#undef DBG_EXCEPTION_NOT_HANDLED -#undef STATUS_ACCESS_VIOLATION -#undef STATUS_IN_PAGE_ERROR -#undef STATUS_INVALID_HANDLE -#undef STATUS_NO_MEMORY -#undef STATUS_ILLEGAL_INSTRUCTION -#undef STATUS_NONCONTINUABLE_EXCEPTION -#undef STATUS_INVALID_DISPOSITION -#undef STATUS_ARRAY_BOUNDS_EXCEEDED -#undef STATUS_FLOAT_DENORMAL_OPERAND -#undef STATUS_FLOAT_DIVIDE_BY_ZERO -#undef STATUS_FLOAT_INEXACT_RESULT -#undef STATUS_FLOAT_INVALID_OPERATION -#undef STATUS_FLOAT_OVERFLOW -#undef STATUS_FLOAT_STACK_CHECK -#undef STATUS_FLOAT_UNDERFLOW -#undef STATUS_INTEGER_DIVIDE_BY_ZERO -#undef STATUS_INTEGER_OVERFLOW -#undef STATUS_PRIVILEGED_INSTRUCTION -#undef STATUS_STACK_OVERFLOW -#undef STATUS_CONTROL_C_EXIT -#undef STATUS_FLOAT_MULTIPLE_FAULTS -#undef STATUS_FLOAT_MULTIPLE_TRAPS -#undef STATUS_REG_NAT_CONSUMPTION -#undef STATUS_SXS_EARLY_DEACTIVATION -#undef STATUS_SXS_INVALID_DEACTIVATION - +#undef WIN32_NO_STATUS #include <ntstatus.h> /* CONSTANTS *****************************************************************/ _____ Modified: trunk/reactos/include/ndk/zwfuncs.h --- trunk/reactos/include/ndk/zwfuncs.h 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/include/ndk/zwfuncs.h 2005-10-19 17:03:38 UTC (rev 18598) @@ -12,6 +12,9 @@ /* DEPENDENCIES **************************************************************/ #define _WMIKM_ #include <evntrace.h> +#include "lpctypes.h" +#include "dbgktypes.h" +#include "kdtypes.h" /* FUNCTION TYPES ************************************************************/ _____ Modified: trunk/reactos/lib/advapi32/advapi32.h --- trunk/reactos/lib/advapi32/advapi32.h 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/advapi32/advapi32.h 2005-10-19 17:03:38 UTC (rev 18598) @@ -12,6 +12,7 @@ #include <stdio.h> /* PSDK/NDK Headers */ +#define WIN32_NO_STATUS #include <windows.h> #include <accctrl.h> #include <sddl.h> _____ Modified: trunk/reactos/lib/crt/except/unwind.c --- trunk/reactos/lib/crt/except/unwind.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/crt/except/unwind.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -1,3 +1,4 @@ +#define WIN32_NO_STATUS #include "precomp.h" #include <windows.h> #define NTOS_MODE_USER _____ Modified: trunk/reactos/lib/crt/wine/scanf.c --- trunk/reactos/lib/crt/wine/scanf.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/crt/wine/scanf.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -33,6 +33,7 @@ #include "winternl.h" #include "msvcrt.h" */ +#define WIN32_NO_STATUS #include <stdarg.h> #include <wchar.h> _____ Modified: trunk/reactos/lib/dnsapi/dnsapi/adns.c --- trunk/reactos/lib/dnsapi/dnsapi/adns.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/dnsapi/dnsapi/adns.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -8,11 +8,11 @@ * 12/15/03 -- Created */ -#include <windows.h> -#include <winerror.h> -#include <windns.h> -#include <internal/windns.h> +#include "precomp.h" +#define NDEBUG +#include <debug.h> + DNS_STATUS DnsIntTranslateAdnsToDNS_STATUS( int Status ) { switch( Status ) { case adns_s_ok: _____ Modified: trunk/reactos/lib/dnsapi/dnsapi/context.c --- trunk/reactos/lib/dnsapi/dnsapi/context.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/dnsapi/dnsapi/context.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -8,13 +8,11 @@ * 12/15/03 -- Created */ -#include <windows.h> -#include <winerror.h> -#include <windns.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <internal/windns.h> +#include "precomp.h" +#define NDEBUG +#include <debug.h> + /* DnsAcquireContextHandle ************* * Create a context handle that will allow us to open and retrieve queries. * _____ Modified: trunk/reactos/lib/dnsapi/dnsapi/free.c --- trunk/reactos/lib/dnsapi/dnsapi/free.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/dnsapi/dnsapi/free.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -8,13 +8,11 @@ * 12/15/03 -- Created */ -#include <windows.h> -#include <winerror.h> -#include <windns.h> -#include <internal/windns.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include "precomp.h" +#define NDEBUG +#include <debug.h> + VOID WINAPI DnsFree ( PVOID Data, DNS_FREE_TYPE FreeType ) { switch( FreeType ) { _____ Modified: trunk/reactos/lib/dnsapi/dnsapi/names.c --- trunk/reactos/lib/dnsapi/dnsapi/names.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/dnsapi/dnsapi/names.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -1,11 +1,8 @@ -#include <ctype.h> -#include <windows.h> -#include <winerror.h> -#include <windns.h> -#include <internal/windns.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include "precomp.h" +#define NDEBUG +#include <debug.h> + static BOOL DnsIntNameContainsDots( LPCWSTR Name ) { return wcschr( Name, '.' ) ? TRUE : FALSE; } _____ Added: trunk/reactos/lib/dnsapi/dnsapi/precomp.h --- trunk/reactos/lib/dnsapi/dnsapi/precomp.h 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/dnsapi/dnsapi/precomp.h 2005-10-19 17:03:38 UTC (rev 18598) @@ -0,0 +1,22 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS System Libraries + * FILE: lib/dnsapi/precomp.h + * PURPOSE: Win32 DNS API Libary Header + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +#define WIN32_NO_STATUS +#define NTOS_MODE_USER + +/* PSDK/NDK Headers */ +#include <windows.h> +#include <winerror.h> +#include <windns.h> +#include <ndk/ntndk.h> + +/* Internal DNSAPI Headers */ +#include <internal/windns.h> + _____ Modified: trunk/reactos/lib/dnsapi/dnsapi/query.c --- trunk/reactos/lib/dnsapi/dnsapi/query.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/dnsapi/dnsapi/query.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -8,13 +8,11 @@ * 12/15/03 -- Created */ -#include <windows.h> -#include <winerror.h> -#include <windns.h> -#include <internal/windns.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include "precomp.h" +#define NDEBUG +#include <debug.h> + /* DnsQuery **************************** * Begin a DNS query, and allow the result to be placed in the application * supplied result pointer. The result can be manipulated with the record _____ Modified: trunk/reactos/lib/dnsapi/dnsapi/stubs.c --- trunk/reactos/lib/dnsapi/dnsapi/stubs.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/dnsapi/dnsapi/stubs.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -1,7 +1,9 @@ +/* Can't use precomp.h because these weren't stubbed properly */ +#define WIN32_NO_STATUS +#define NTOS_MODE_USER #include <windows.h> -#include <winerror.h> -#define NTOS_MODE_USER #include <ndk/ntndk.h> + #include <debug.h> typedef ULONG DNS_STATUS; _____ Modified: trunk/reactos/lib/dnsapi/dnsapi.xml --- trunk/reactos/lib/dnsapi/dnsapi.xml 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/dnsapi/dnsapi.xml 2005-10-19 17:03:38 UTC (rev 18598) @@ -20,6 +20,7 @@ <file>names.c</file> <file>query.c</file> <file>stubs.c</file> + <pch>precomp.h</pch> </directory> <file>dnsapi.rc</file> </module> _____ Modified: trunk/reactos/lib/epsapi/enum/drivers.c --- trunk/reactos/lib/epsapi/enum/drivers.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/epsapi/enum/drivers.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -14,6 +14,7 @@ * and improve reusability */ +#define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> _____ Modified: trunk/reactos/lib/epsapi/enum/modules.c --- trunk/reactos/lib/epsapi/enum/modules.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/epsapi/enum/modules.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -18,6 +18,7 @@ * isolated in its own library to clear the confusion * and improve reusability */ +#define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> _____ Modified: trunk/reactos/lib/epsapi/enum/processes.c --- trunk/reactos/lib/epsapi/enum/processes.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/epsapi/enum/processes.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -30,7 +30,7 @@ * isolated in its own library to clear the confusion * and improve reusability */ - +#define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> _____ Modified: trunk/reactos/lib/fmifs/chkdsk.c --- trunk/reactos/lib/fmifs/chkdsk.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/fmifs/chkdsk.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -9,10 +9,7 @@ * 1999-02-16 (Emanuele Aliberti) * Entry points added. */ -#define UNICODE -#define _UNICODE -#include <windows.h> -#include <fmifs/fmifs.h> +#include "precomp.h" /* FMIFS.1 */ VOID STDCALL _____ Modified: trunk/reactos/lib/fmifs/compress.c --- trunk/reactos/lib/fmifs/compress.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/fmifs/compress.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -9,10 +9,7 @@ * 1999-02-16 (Emanuele Aliberti) * Entry points added. */ -#define UNICODE -#define _UNICODE -#include <windows.h> -#include <winioctl.h> +#include "precomp.h" /* * @implemented _____ Modified: trunk/reactos/lib/fmifs/diskcopy.c --- trunk/reactos/lib/fmifs/diskcopy.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/fmifs/diskcopy.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -9,9 +9,7 @@ * 1999-02-16 (Emanuele Aliberti) * Entry points added. */ -#define UNICODE -#define _UNICODE -#include <windows.h> +#include "precomp.h" /* FMIFS.3 */ VOID STDCALL _____ Modified: trunk/reactos/lib/fmifs/extend.c --- trunk/reactos/lib/fmifs/extend.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/fmifs/extend.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -9,9 +9,7 @@ * 1999-02-16 (Emanuele Aliberti) * Entry points added. */ -#define UNICODE -#define _UNICODE -#include <windows.h> +#include "precomp.h" /* FMIFS.5 */ VOID STDCALL _____ Modified: trunk/reactos/lib/fmifs/fmifs.xml --- trunk/reactos/lib/fmifs/fmifs.xml 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/fmifs/fmifs.xml 2005-10-19 17:03:38 UTC (rev 18598) @@ -15,4 +15,5 @@ <file>label.c</file> <file>media.c</file> <file>fmifs.rc</file> + <pch>precomp.h</pch> </module> _____ Modified: trunk/reactos/lib/fmifs/format.c --- trunk/reactos/lib/fmifs/format.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/fmifs/format.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -9,14 +9,7 @@ * 1999-02-16 (Emanuele Aliberti) * Entry points added. */ -#define UNICODE -#define _UNICODE -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <fmifs/fmifs.h> -#include <fslib/vfatlib.h> -#include <string.h> +#include "precomp.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/fmifs/init.c --- trunk/reactos/lib/fmifs/init.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/fmifs/init.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -9,9 +9,7 @@ * 1999-02-16 (Emanuele Aliberti) * Entry points added. */ -#define UNICODE -#define _UNICODE -#include <windows.h> +#include "precomp.h" static BOOL FmIfsInitialized = FALSE; _____ Modified: trunk/reactos/lib/fmifs/label.c --- trunk/reactos/lib/fmifs/label.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/fmifs/label.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -9,9 +9,7 @@ * 1999-02-16 (Emanuele Aliberti) * Entry points added. */ -#define UNICODE -#define _UNICODE -#include <windows.h> +#include "precomp.h" /* FMIFS.10 */ VOID STDCALL _____ Modified: trunk/reactos/lib/fmifs/media.c --- trunk/reactos/lib/fmifs/media.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/fmifs/media.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -9,9 +9,7 @@ * 1999-02-16 (Emanuele Aliberti) * Entry points added. */ -#define UNICODE -#define _UNICODE -#include <windows.h> +#include "precomp.h" /* FMIFS.9 */ VOID STDCALL _____ Added: trunk/reactos/lib/fmifs/precomp.h --- trunk/reactos/lib/fmifs/precomp.h 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/fmifs/precomp.h 2005-10-19 17:03:38 UTC (rev 18598) @@ -0,0 +1,26 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS System Libraries + * FILE: lib/fmifs/precomp.h + * PURPOSE: Win32 FMIFS API Libary Header + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +#define WIN32_NO_STATUS +#define NTOS_MODE_USER +#define UNICODE +#define _UNICODE + +/* PSDK/NDK Headers */ +#include <windows.h> +#include <ndk/ntndk.h> + +/* FMIFS Public Header */ +#include <fmifs/fmifs.h> + +/* VFATLIB Public Header */ +#include <fslib/vfatlib.h> + +/* EOF */ _____ Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.h --- trunk/reactos/lib/fslib/vfatlib/vfatlib.h 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.h 2005-10-19 17:03:38 UTC (rev 18598) @@ -4,6 +4,7 @@ * FILE: vfatlib.h */ +#define WIN32_NO_STATUS #include <windows.h> #include <fmifs/fmifs.h> #define NTOS_MODE_USER _____ Modified: trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h --- trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h 2005-10-19 17:03:38 UTC (rev 18598) @@ -3,6 +3,7 @@ * PROJECT: ReactOS VFAT filesystem library * FILE: vfatxlib.h */ +#define WIN32_NO_STATUS #include <windows.h> #include <fmifs/fmifs.h> #define NTOS_MODE_USER _____ Modified: trunk/reactos/lib/gdi32/include/precomp.h --- trunk/reactos/lib/gdi32/include/precomp.h 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/gdi32/include/precomp.h 2005-10-19 17:03:38 UTC (rev 18598) @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ /* SDK/DDK/NDK Headers. */ +#define WIN32_NO_STATUS #define NTOS_MODE_USER #define __GDI32__ #include <windows.h> _____ Modified: trunk/reactos/lib/kernel32/k32.h --- trunk/reactos/lib/kernel32/k32.h 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/kernel32/k32.h 2005-10-19 17:03:38 UTC (rev 18598) @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ /* PSDK/NDK Headers */ +#define WIN32_NO_STATUS #define NTOS_MODE_USER #define _KERNEL32_ #include <windows.h> _____ Modified: trunk/reactos/lib/lsasrv/lsaport.c --- trunk/reactos/lib/lsasrv/lsaport.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/lsasrv/lsaport.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -1,6 +1,7 @@ /* */ +#define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> _____ Modified: trunk/reactos/lib/lsasrv/lsasrv.c --- trunk/reactos/lib/lsasrv/lsasrv.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/lsasrv/lsasrv.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -1,4 +1,4 @@ - +#define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> _____ Modified: trunk/reactos/lib/msafd/msafd.h --- trunk/reactos/lib/msafd/msafd.h 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/msafd/msafd.h 2005-10-19 17:03:38 UTC (rev 18598) @@ -8,8 +8,9 @@ #define __MSAFD_H #include <stdio.h> +#include <stdlib.h> -#include <stdlib.h> +#define WIN32_NO_STATUS #include <windows.h> #include <winsock2.h> #include <ws2spi.h> _____ Modified: trunk/reactos/lib/nt/entry_point.c --- trunk/reactos/lib/nt/entry_point.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/nt/entry_point.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ /* PSDK/NDK Headers */ +#define WIN32_NO_STATUS #include <stdio.h> #include <windows.h> #define NTOS_MODE_USER _____ Modified: trunk/reactos/lib/ntdll/inc/ntdll.h --- trunk/reactos/lib/ntdll/inc/ntdll.h 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/ntdll/inc/ntdll.h 2005-10-19 17:03:38 UTC (rev 18598) @@ -20,6 +20,7 @@ #include <ctype.h> /* SDK/DDK/NDK Headers. */ +#define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> _____ Modified: trunk/reactos/lib/opengl32/gl.c --- trunk/reactos/lib/opengl32/gl.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/opengl32/gl.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -21,6 +21,7 @@ */ #define WIN32_LEANER_AND_MEANER +#define WIN32_NO_STATUS #include <windows.h> #include "teb.h" _____ Modified: trunk/reactos/lib/opengl32/opengl32.c --- trunk/reactos/lib/opengl32/opengl32.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/opengl32/opengl32.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -10,6 +10,7 @@ */ #define WIN32_LEAN_AND_MEAN +#define WIN32_NO_STATUS #include <windows.h> #include <winreg.h> #include "teb.h" _____ Modified: trunk/reactos/lib/opengl32/teb.h --- trunk/reactos/lib/opengl32/teb.h 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/opengl32/teb.h 2005-10-19 17:03:38 UTC (rev 18598) @@ -1,33 +1,5 @@ // teb.h -#ifdef _MSC_VER - -typedef struct _TEB -{ - char blah[0x7C4]; - PVOID glDispatchTable[0xA3]; /* 7C4h */ - PVOID glReserved1[0xA3]; /* A50h */ - PVOID glReserved2; /* BDCh */ - PVOID glSectionInfo; /* BE0h */ - PVOID glSection; /* BE4h */ - PVOID glTable; /* BE8h */ - PVOID glCurrentRC; /* BECh */ - PVOID glContext; /* BF0h */ -} TEB, *PTEB; - -#pragma warning ( disable : 4035 ) -static inline PTEB __declspec(naked) NtCurrentTeb(void) -{ - //struct _TEB * pTeb; - __asm mov eax, fs:0x18 - //__asm mov pTeb, eax - //return pTeb; -}; -#pragma warning ( default : 4035 ) - -#else/*_MSC_VER*/ - #define NTOS_MODE_USER #include <ndk/ntndk.h> -#endif/*_MSC_VER*/ _____ Modified: trunk/reactos/lib/opengl32/wgl.c --- trunk/reactos/lib/opengl32/wgl.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/opengl32/wgl.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -9,6 +9,7 @@ */ #define WIN32_LEAN_AND_MEAN +#define WIN32_NO_STATUS #include <windows.h> #include <stdio.h> #include <stdlib.h> _____ Modified: trunk/reactos/lib/psapi/precomp.h --- trunk/reactos/lib/psapi/precomp.h 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/psapi/precomp.h 2005-10-19 17:03:38 UTC (rev 18598) @@ -1,4 +1,4 @@ - +#define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> _____ Modified: trunk/reactos/lib/rtl/access.c --- trunk/reactos/lib/rtl/access.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/rtl/access.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -17,7 +17,8 @@ /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN +NTAPI RtlAreAllAccessesGranted(ACCESS_MASK GrantedAccess, ACCESS_MASK DesiredAccess) { @@ -25,41 +26,37 @@ return ((GrantedAccess & DesiredAccess) == DesiredAccess); } - /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN +NTAPI RtlAreAnyAccessesGranted(ACCESS_MASK GrantedAccess, ACCESS_MASK DesiredAccess) { - PAGED_CODE_RTL(); - return ((GrantedAccess & DesiredAccess) != 0); + PAGED_CODE_RTL(); + return ((GrantedAccess & DesiredAccess) != 0); } - /* * @implemented */ -VOID STDCALL +VOID +NTAPI RtlMapGenericMask(PACCESS_MASK AccessMask, PGENERIC_MAPPING GenericMapping) { - PAGED_CODE_RTL(); + PAGED_CODE_RTL(); - if (*AccessMask & GENERIC_READ) - *AccessMask |= GenericMapping->GenericRead; + if (*AccessMask & GENERIC_READ) *AccessMask |= GenericMapping->GenericRead; - if (*AccessMask & GENERIC_WRITE) - *AccessMask |= GenericMapping->GenericWrite; + if (*AccessMask & GENERIC_WRITE) *AccessMask |= GenericMapping->GenericWrite; - if (*AccessMask & GENERIC_EXECUTE) - *AccessMask |= GenericMapping->GenericExecute; + if (*AccessMask & GENERIC_EXECUTE) *AccessMask |= GenericMapping->GenericExecute; - if (*AccessMask & GENERIC_ALL) - *AccessMask |= GenericMapping->GenericAll; + if (*AccessMask & GENERIC_ALL) *AccessMask |= GenericMapping->GenericAll; - *AccessMask &= ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); + *AccessMask &= ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); } /* EOF */ _____ Modified: trunk/reactos/lib/rtl/acl.c --- trunk/reactos/lib/rtl/acl.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/rtl/acl.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -14,7 +14,7 @@ /* FUNCTIONS ***************************************************************/ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlFirstFreeAce(PACL Acl, PACE* Ace) { @@ -62,7 +62,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlGetAce(PACL Acl, ULONG AceIndex, PVOID *Ace) @@ -150,7 +150,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlAddAccessAllowedAce (IN OUT PACL Acl, IN ULONG Revision, IN ACCESS_MASK AccessMask, @@ -170,7 +170,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlAddAccessAllowedAceEx (IN OUT PACL Acl, IN ULONG Revision, IN ULONG Flags, @@ -191,7 +191,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlAddAccessDeniedAce (PACL Acl, ULONG Revision, ACCESS_MASK AccessMask, @@ -211,7 +211,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlAddAccessDeniedAceEx (IN OUT PACL Acl, IN ULONG Revision, IN ULONG Flags, @@ -254,7 +254,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlAddAce(PACL Acl, ULONG AclRevision, ULONG StartingIndex, @@ -323,7 +323,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlAddAuditAccessAce(PACL Acl, ULONG Revision, ACCESS_MASK AccessMask, @@ -390,7 +390,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlAddAuditAccessAceEx(PACL Acl, ULONG Revision, ULONG Flags, @@ -477,7 +477,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlDeleteAce(PACL Acl, ULONG AceIndex) { @@ -513,7 +513,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlCreateAcl(PACL Acl, ULONG AclSize, ULONG AclRevision) @@ -546,7 +546,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlQueryInformationAcl(PACL Acl, PVOID Information, ULONG InformationLength, @@ -615,7 +615,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlSetInformationAcl(PACL Acl, PVOID Information, ULONG InformationLength, @@ -660,7 +660,7 @@ /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlValidAcl (PACL Acl) { PACE Ace; _____ Modified: trunk/reactos/lib/rtl/atom.c --- trunk/reactos/lib/rtl/atom.c 2005-10-19 17:02:15 UTC (rev 18597) +++ trunk/reactos/lib/rtl/atom.c 2005-10-19 17:03:38 UTC (rev 18598) @@ -135,7 +135,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlCreateAtomTable(IN ULONG TableSize, IN OUT PRTL_ATOM_TABLE *AtomTable) { @@ -183,7 +183,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlDestroyAtomTable(IN PRTL_ATOM_TABLE AtomTable) { PRTL_ATOM_TABLE_ENTRY *CurrentBucket, *LastBucket; @@ -232,7 +232,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlEmptyAtomTable(PRTL_ATOM_TABLE AtomTable, BOOLEAN DeletePinned) { @@ -286,7 +286,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlAddAtomToAtomTable(IN PRTL_ATOM_TABLE AtomTable, IN PWSTR AtomName, OUT PRTL_ATOM Atom) @@ -406,7 +406,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlDeleteAtomFromAtomTable(IN PRTL_ATOM_TABLE AtomTable, IN RTL_ATOM Atom) { @@ -478,7 +478,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlLookupAtomInAtomTable(IN PRTL_ATOM_TABLE AtomTable, IN PWSTR AtomName, OUT PRTL_ATOM Atom) @@ -535,7 +535,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlPinAtomInAtomTable(IN PRTL_ATOM_TABLE AtomTable, IN RTL_ATOM Atom) { @@ -589,7 +589,7 @@ * (again EXCLUDING the null terminator) is returned in NameLength, at least * on Win2k, XP and ReactOS. NT4 will return 0 in that case. */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlQueryAtomInAtomTable(PRTL_ATOM_TABLE AtomTable, RTL_ATOM Atom, PULONG RefCount, [truncated at 1000 lines; 4572 more skipped]

1 0

[greatlrd] 18597: Change LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL to LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
by greatlrd＠svn.reactos.com 19 Oct '05

19 Oct '05

Change LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL to LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT So it works in windows, and in Visualstudio Modified: trunk/reactos/lib/cpl/access/Ja.rc Modified: trunk/reactos/lib/cpl/appwiz/Ja.rc Modified: trunk/reactos/lib/cpl/control/Ja.rc Modified: trunk/reactos/lib/cpl/desk/Ja.rc Modified: trunk/reactos/lib/cpl/hdwwiz/Ja.rc Modified: trunk/reactos/lib/cpl/liccpa/Ja.rc Modified: trunk/reactos/lib/cpl/main/Ja.rc Modified: trunk/reactos/lib/cpl/ncpa/Ja.rc Modified: trunk/reactos/lib/cpl/sysdm/Ja.rc Modified: trunk/reactos/lib/cpl/timedate/Ja.rc _____ Modified: trunk/reactos/lib/cpl/access/Ja.rc --- trunk/reactos/lib/cpl/access/Ja.rc 2005-10-19 16:53:08 UTC (rev 18596) +++ trunk/reactos/lib/cpl/access/Ja.rc 2005-10-19 17:02:15 UTC (rev 18597) @@ -1,4 +1,4 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDI_CPLACCESS ICON "resources/applet.ico" _____ Modified: trunk/reactos/lib/cpl/appwiz/Ja.rc --- trunk/reactos/lib/cpl/appwiz/Ja.rc 2005-10-19 16:53:08 UTC (rev 18596) +++ trunk/reactos/lib/cpl/appwiz/Ja.rc 2005-10-19 17:02:15 UTC (rev 18597) @@ -1,4 +1,4 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/control/Ja.rc --- trunk/reactos/lib/cpl/control/Ja.rc 2005-10-19 16:53:08 UTC (rev 18596) +++ trunk/reactos/lib/cpl/control/Ja.rc 2005-10-19 17:02:15 UTC (rev 18597) @@ -1,6 +1,6 @@ // Japanese language resource file -LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT //////////////////////////////////////////////////////////////////////// ///// // _____ Modified: trunk/reactos/lib/cpl/desk/Ja.rc --- trunk/reactos/lib/cpl/desk/Ja.rc 2005-10-19 16:53:08 UTC (rev 18596) +++ trunk/reactos/lib/cpl/desk/Ja.rc 2005-10-19 17:02:15 UTC (rev 18597) @@ -1,4 +1,4 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/hdwwiz/Ja.rc --- trunk/reactos/lib/cpl/hdwwiz/Ja.rc 2005-10-19 16:53:08 UTC (rev 18596) +++ trunk/reactos/lib/cpl/hdwwiz/Ja.rc 2005-10-19 17:02:15 UTC (rev 18597) @@ -1,4 +1,4 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE BEGIN _____ Modified: trunk/reactos/lib/cpl/liccpa/Ja.rc --- trunk/reactos/lib/cpl/liccpa/Ja.rc 2005-10-19 16:53:08 UTC (rev 18596) +++ trunk/reactos/lib/cpl/liccpa/Ja.rc 2005-10-19 17:02:15 UTC (rev 18597) @@ -1,4 +1,4 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_PROPPAGE1 DIALOG DISCARDABLE 20, 40, 315, 104 STYLE DS_MODALFRAME | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU _____ Modified: trunk/reactos/lib/cpl/main/Ja.rc --- trunk/reactos/lib/cpl/main/Ja.rc 2005-10-19 16:53:08 UTC (rev 18596) +++ trunk/reactos/lib/cpl/main/Ja.rc 2005-10-19 17:02:15 UTC (rev 18597) @@ -1,4 +1,4 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/ncpa/Ja.rc --- trunk/reactos/lib/cpl/ncpa/Ja.rc 2005-10-19 16:53:08 UTC (rev 18596) +++ trunk/reactos/lib/cpl/ncpa/Ja.rc 2005-10-19 17:02:15 UTC (rev 18597) @@ -1,4 +1,4 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/sysdm/Ja.rc --- trunk/reactos/lib/cpl/sysdm/Ja.rc 2005-10-19 16:53:08 UTC (rev 18596) +++ trunk/reactos/lib/cpl/sysdm/Ja.rc 2005-10-19 17:02:15 UTC (rev 18597) @@ -1,4 +1,4 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT RC_LICENSE RTDATA "resources/gpl.txt" _____ Modified: trunk/reactos/lib/cpl/timedate/Ja.rc --- trunk/reactos/lib/cpl/timedate/Ja.rc 2005-10-19 16:53:08 UTC (rev 18596) +++ trunk/reactos/lib/cpl/timedate/Ja.rc 2005-10-19 17:02:15 UTC (rev 18597) @@ -1,4 +1,4 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION

1 0

[greatlrd] 18596: Change LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL to LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
by greatlrd＠svn.reactos.com 19 Oct '05

19 Oct '05

Change LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL to LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT So it works in windows, and in Visualstudio Modified: trunk/reactos/lib/cpl/intl/Ja.rc _____ Modified: trunk/reactos/lib/cpl/intl/Ja.rc --- trunk/reactos/lib/cpl/intl/Ja.rc 2005-10-19 16:08:34 UTC (rev 18595) +++ trunk/reactos/lib/cpl/intl/Ja.rc 2005-10-19 16:53:08 UTC (rev 18596) @@ -1,4 +1,4 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION

1 0

[cwittich] 18595: add support for cpl applets
by cwittich＠svn.reactos.com 19 Oct '05

19 Oct '05

add support for cpl applets add hardcoded "." include path like already in msvcmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-19 16:05:12 UTC (rev 18594) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-19 16:08:34 UTC (rev 18595) @@ -50,7 +50,7 @@ string module_type = GetExtension(module.GetTargetName()); bool lib = (module_type == ".lib") || (module_type == ".a"); - bool dll = (module_type == ".dll"); + bool dll = (module_type == ".dll") || (module_type == ".cpl"); bool exe = (module_type == ".exe"); // TODO FIXME - need more checks here for 'sys' and possibly 'drv'? @@ -109,6 +109,10 @@ if ( !strncmp(incs[i]->directory.c_str(), "w32api", 6 ) ) continue; + // explicitly omit include/wine directories + if ( !strncmp(incs[i]->directory.c_str(), "include\\wine", 12 ) ) + continue; + string path = Path::RelativeFromDirectory ( incs[i]->directory, module.GetBasePath() ); @@ -201,6 +205,7 @@ fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" ); bool multiple_includes = false; + fprintf ( OUT, "/.;" ); for ( i = 0; i < includes.size(); i++ ) { const string& include = includes[i];

1 0

[cwittich] 18594: reformat rc files to make them more readable AND comile with msvc
by cwittich＠svn.reactos.com 19 Oct '05

19 Oct '05

reformat rc files to make them more readable AND comile with msvc change CALLBACK to APIENTRY like in windows Modified: trunk/reactos/lib/cpl/intl/Ja.rc Modified: trunk/reactos/lib/cpl/intl/cz.rc Modified: trunk/reactos/lib/cpl/intl/de.rc Modified: trunk/reactos/lib/cpl/intl/en.rc Modified: trunk/reactos/lib/cpl/intl/intl.c Modified: trunk/reactos/lib/cpl/intl/nl.rc _____ Modified: trunk/reactos/lib/cpl/intl/Ja.rc --- trunk/reactos/lib/cpl/intl/Ja.rc 2005-10-19 14:18:29 UTC (rev 18593) +++ trunk/reactos/lib/cpl/intl/Ja.rc 2005-10-19 16:05:12 UTC (rev 18594) @@ -44,7 +44,10 @@ LTEXT "î?îÒé?ïLìå(&P):", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE - LTEXT "Ä×ìÅé?î`Ä«é?ò\\ïLû@\n\nh = Ä×èÈ m = ò¬ s = òb t = î?æOé?é¢é?î?îÒ\n\nh = 12 Ä×èÈ\nH = 24 Ä×èÈ\n\nhh, mm, ss = Éµô¬é? â[âìéáéÞ\nh, m, s = Éµô¬é?â[âìé?éÁ", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Ä×ìÅé?î`Ä«é?ò\\ïLû@\n\n\ + h = Ä×èÈ m = ò¬ s = òb t = î?æOé?é¢é?î?îÒ\n\n\ + h = 12 Ä×èÈ\nH = 24 Ä×èÈ\n\nhh, mm, ss = Éµô¬é?â[âìéáéÞ\n\ + h, m, s = Éµô¬é?â[âìé?éÁ", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP END _____ Modified: trunk/reactos/lib/cpl/intl/cz.rc --- trunk/reactos/lib/cpl/intl/cz.rc 2005-10-19 14:18:29 UTC (rev 18593) +++ trunk/reactos/lib/cpl/intl/cz.rc 2005-10-19 16:05:12 UTC (rev 18594) @@ -46,7 +46,11 @@ LTEXT "Zkratka odpoledne:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE - LTEXT "Zßpis formßtu Þasu\n\nh = hodina m = minuta s = vte°ina t = dop. nebo odp.\n\nh = 12-ti hodinov² cyklus\nH = 24-ti godinov² cyklus\n\nhh, mm, ss = poÞßteÞnÝ nula\nh, m, s = bez poÞßteÞnÝ nuly", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Zßpis formßtu Þasu\n\n\ + h = hodina m = minuta s = vte°ina t = dop. nebo odp.\n\n\ + h = 12-ti hodinov² cyklus\nH = 24-ti godinov² cyklus\n\n\ + hh, mm, ss = poÞßteÞnÝ nula\n\ + h, m, s = bez poÞßteÞnÝ nuly", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP END _____ Modified: trunk/reactos/lib/cpl/intl/de.rc --- trunk/reactos/lib/cpl/intl/de.rc 2005-10-19 14:18:29 UTC (rev 18593) +++ trunk/reactos/lib/cpl/intl/de.rc 2005-10-19 16:05:12 UTC (rev 18594) @@ -46,7 +46,11 @@ LTEXT "Symbol f³r &Nachmittag:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE - LTEXT "Zeitformat\n\nh = Stunde m = Minute s = Sekunde t = Vor-/Nachmittag\n\nh = 12 Stunden\nH = 24 Stunden\n\nhh, mm, ss = f³hrende Null\nh, m, s = keine f³hrende Null", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Zeitformat\n\n\ + h = Stunde m = Minute s = Sekunde t = Vor-/Nachmittag\n\n\ + h = 12 Stunden\nH = 24 Stunden\n\n\ + hh, mm, ss = f³hrende Null\n\ + h, m, s = keine f³hrende Null", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP END _____ Modified: trunk/reactos/lib/cpl/intl/en.rc --- trunk/reactos/lib/cpl/intl/en.rc 2005-10-19 14:18:29 UTC (rev 18593) +++ trunk/reactos/lib/cpl/intl/en.rc 2005-10-19 16:05:12 UTC (rev 18594) @@ -46,7 +46,10 @@ LTEXT "&PM symbol:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE - LTEXT "Time format notation\n\nh = hour m = minute s = second t = am or pm\n\nh = 12 hour\nH = 24 hour\n\nhh, mm, ss = leading zero\nh, m, s = no leading zero", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Time format notation\n\n\ + h = hour m = minute s = second t = am or pm\n\nh = 12 hour\n\ + H = 24 hour\n\nhh, mm, ss = leading zero\n\ + h, m, s = no leading zero", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP END _____ Modified: trunk/reactos/lib/cpl/intl/intl.c --- trunk/reactos/lib/cpl/intl/intl.c 2005-10-19 14:18:29 UTC (rev 18593) +++ trunk/reactos/lib/cpl/intl/intl.c 2005-10-19 16:05:12 UTC (rev 18594) @@ -91,7 +91,7 @@ /* Control Panel Callback */ -LONG CALLBACK +LONG APIENTRY CPlApplet(HWND hwndCpl, UINT uMsg, LPARAM lParam1, _____ Modified: trunk/reactos/lib/cpl/intl/nl.rc --- trunk/reactos/lib/cpl/intl/nl.rc 2005-10-19 14:18:29 UTC (rev 18593) +++ trunk/reactos/lib/cpl/intl/nl.rc 2005-10-19 16:05:12 UTC (rev 18594) @@ -46,7 +46,11 @@ LTEXT "&PM-symbool:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE - LTEXT "Tijdsnotatie\n\nh = uur m = minuut s = second t = am or pm\n\nh = 12 uur\nH = 24 uur\n\nhh, mm, ss = voorgaande nul\nh, m, s = zonder voorgaande nul", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Tijdsnotatie\n\n\ + h = uur m = minuut s = second t = am or pm\n\n\ + h = 12 uur\nH = 24 uur\n\n\ + hh, mm, ss = voorgaande nul\n\ + h, m, s = zonder voorgaande nul", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP END

1 0

[cwittich] 18593: reverted to 17089, we have to fix rbuild instead
by cwittich＠svn.reactos.com 19 Oct '05

19 Oct '05

reverted to 17089, we have to fix rbuild instead Modified: trunk/reactos/subsys/system/msconfig/msconfig.c Modified: trunk/reactos/subsys/system/msconfig/srvpage.c Modified: trunk/reactos/subsys/system/msconfig/toolspage.c Modified: trunk/reactos/subsys/system/taskmgr/about.c Modified: trunk/reactos/subsys/system/taskmgr/affinity.c Modified: trunk/reactos/subsys/system/taskmgr/applpage.c Modified: trunk/reactos/subsys/system/taskmgr/column.c Modified: trunk/reactos/subsys/system/taskmgr/dbgchnl.c Modified: trunk/reactos/subsys/system/taskmgr/debug.c Modified: trunk/reactos/subsys/system/taskmgr/endproc.c Modified: trunk/reactos/subsys/system/taskmgr/font.c Modified: trunk/reactos/subsys/system/taskmgr/graph.c Modified: trunk/reactos/subsys/system/taskmgr/graphctl.c Modified: trunk/reactos/subsys/system/taskmgr/optnmenu.c Modified: trunk/reactos/subsys/system/taskmgr/perfdata.c Modified: trunk/reactos/subsys/system/taskmgr/perfpage.c Modified: trunk/reactos/subsys/system/taskmgr/priority.c Modified: trunk/reactos/subsys/system/taskmgr/proclist.c Modified: trunk/reactos/subsys/system/taskmgr/procpage.c Modified: trunk/reactos/subsys/system/taskmgr/run.c Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.c Modified: trunk/reactos/subsys/system/taskmgr/trayicon.c _____ Modified: trunk/reactos/subsys/system/msconfig/msconfig.c --- trunk/reactos/subsys/system/msconfig/msconfig.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/msconfig/msconfig.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -1,4 +1,4 @@ -#include "precomp.h" +#include <precomp.h> HINSTANCE hInst = 0; _____ Modified: trunk/reactos/subsys/system/msconfig/srvpage.c --- trunk/reactos/subsys/system/msconfig/srvpage.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/msconfig/srvpage.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -1,4 +1,4 @@ -#include "precomp.h" +#include <precomp.h> HWND hServicesPage; HWND hServicesListCtrl; _____ Modified: trunk/reactos/subsys/system/msconfig/toolspage.c --- trunk/reactos/subsys/system/msconfig/toolspage.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/msconfig/toolspage.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -1,4 +1,4 @@ -#include "precomp.h" +#include <precomp.h> HWND hToolsPage; HWND hToolsListCtrl; _____ Modified: trunk/reactos/subsys/system/taskmgr/about.c --- trunk/reactos/subsys/system/taskmgr/about.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/taskmgr/about.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "precomp.h" +#include <precomp.h> INT_PTR CALLBACK AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); _____ Modified: trunk/reactos/subsys/system/taskmgr/affinity.c --- trunk/reactos/subsys/system/taskmgr/affinity.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/taskmgr/affinity.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "precomp.h" +#include <precomp.h> HANDLE hProcessAffinityHandle; TCHAR szTemp[256]; _____ Modified: trunk/reactos/subsys/system/taskmgr/applpage.c --- trunk/reactos/subsys/system/taskmgr/applpage.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/taskmgr/applpage.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "precomp.h" +#include <precomp.h> typedef struct { _____ Modified: trunk/reactos/subsys/system/taskmgr/column.c --- trunk/reactos/subsys/system/taskmgr/column.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/taskmgr/column.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "precomp.h" +#include <precomp.h> UINT ColumnDataHints[25]; TCHAR szTemp[256]; _____ Modified: trunk/reactos/subsys/system/taskmgr/dbgchnl.c --- trunk/reactos/subsys/system/taskmgr/dbgchnl.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/taskmgr/dbgchnl.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "precomp.h" +#include <precomp.h> /* TODO: * - the dialog box could be non modal _____ Modified: trunk/reactos/subsys/system/taskmgr/debug.c --- trunk/reactos/subsys/system/taskmgr/debug.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/taskmgr/debug.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "precomp.h" +#include <precomp.h> void ProcessPage_OnDebug(void) { _____ Modified: trunk/reactos/subsys/system/taskmgr/endproc.c --- trunk/reactos/subsys/system/taskmgr/endproc.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/taskmgr/endproc.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "precomp.h" +#include <precomp.h> TCHAR szTemp[256]; TCHAR szTempA[256]; _____ Modified: trunk/reactos/subsys/system/taskmgr/font.c --- trunk/reactos/subsys/system/taskmgr/font.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/taskmgr/font.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "precomp.h" +#include <precomp.h> void Font_DrawText(HDC hDC, LPCTSTR lpszText, int x, int y) { _____ Modified: trunk/reactos/subsys/system/taskmgr/graph.c --- trunk/reactos/subsys/system/taskmgr/graph.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/taskmgr/graph.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "precomp.h" +#include <precomp.h> LONG OldGraphWndProc; _____ Modified: trunk/reactos/subsys/system/taskmgr/graphctl.c --- trunk/reactos/subsys/system/taskmgr/graphctl.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/taskmgr/graphctl.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "precomp.h" +#include <precomp.h> LONG OldGraphCtrlWndProc; _____ Modified: trunk/reactos/subsys/system/taskmgr/optnmenu.c --- trunk/reactos/subsys/system/taskmgr/optnmenu.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/taskmgr/optnmenu.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -26,7 +26,7 @@ * Menu item handlers for the options menu. */ -#include "precomp.h" +#include <precomp.h> void TaskManager_OnOptionsAlwaysOnTop(void) { _____ Modified: trunk/reactos/subsys/system/taskmgr/perfdata.c --- trunk/reactos/subsys/system/taskmgr/perfdata.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/taskmgr/perfdata.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "precomp.h" +#include <precomp.h> CRITICAL_SECTION PerfDataCriticalSection; PPERFDATA pPerfDataOld = NULL; /* Older perf data (saved to establish delta values) */ _____ Modified: trunk/reactos/subsys/system/taskmgr/perfpage.c --- trunk/reactos/subsys/system/taskmgr/perfpage.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/taskmgr/perfpage.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "precomp.h" +#include <precomp.h> TGraphCtrl PerformancePageCpuUsageHistoryGraph; TGraphCtrl PerformancePageMemUsageHistoryGraph; _____ Modified: trunk/reactos/subsys/system/taskmgr/priority.c --- trunk/reactos/subsys/system/taskmgr/priority.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/taskmgr/priority.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "precomp.h" +#include <precomp.h> TCHAR szTemp[256]; TCHAR szTempA[256]; _____ Modified: trunk/reactos/subsys/system/taskmgr/proclist.c --- trunk/reactos/subsys/system/taskmgr/proclist.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/taskmgr/proclist.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "precomp.h" +#include <precomp.h> INT_PTR CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); _____ Modified: trunk/reactos/subsys/system/taskmgr/procpage.c --- trunk/reactos/subsys/system/taskmgr/procpage.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/taskmgr/procpage.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "precomp.h" +#include <precomp.h> HWND hProcessPage; /* Process List Property Page */ _____ Modified: trunk/reactos/subsys/system/taskmgr/run.c --- trunk/reactos/subsys/system/taskmgr/run.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/taskmgr/run.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "precomp.h" +#include <precomp.h> void TaskManager_OnFileNew(void) { _____ Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.c --- trunk/reactos/subsys/system/taskmgr/taskmgr.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/taskmgr/taskmgr.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "precomp.h" +#include <precomp.h> #define STATUS_WINDOW 2001 _____ Modified: trunk/reactos/subsys/system/taskmgr/trayicon.c --- trunk/reactos/subsys/system/taskmgr/trayicon.c 2005-10-19 14:09:23 UTC (rev 18592) +++ trunk/reactos/subsys/system/taskmgr/trayicon.c 2005-10-19 14:18:29 UTC (rev 18593) @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "precomp.h" +#include <precomp.h> HICON TrayIcon_GetProcessorUsageIcon(void) {

1 0

[cwittich] 18592: fixed rc files to compile with ms rc
by cwittich＠svn.reactos.com 19 Oct '05

19 Oct '05

fixed rc files to compile with ms rc Modified: trunk/reactos/lib/cpl/intl/Ja.rc Modified: trunk/reactos/lib/cpl/intl/cz.rc Modified: trunk/reactos/lib/cpl/intl/de.rc Modified: trunk/reactos/lib/cpl/intl/en.rc Modified: trunk/reactos/lib/cpl/intl/nl.rc _____ Modified: trunk/reactos/lib/cpl/intl/Ja.rc --- trunk/reactos/lib/cpl/intl/Ja.rc 2005-10-19 14:08:31 UTC (rev 18591) +++ trunk/reactos/lib/cpl/intl/Ja.rc 2005-10-19 14:09:23 UTC (rev 18592) @@ -44,13 +44,7 @@ LTEXT "î?îÒé?ïLìå(&P):", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE - LTEXT "Ä×ìÅé?î`Ä«é?ò\\ïLû@\n\n" - "h = Ä×èÈ m = ò¬ s = òb t = î?æOé?é¢é?î?îÒ\n\n" - "h = 12 Ä×èÈ\n" - "H = 24 Ä×èÈ\n\n" - "hh, mm, ss = Éµô¬é?â[âìéáéÞ\n" - "h, m, s = Éµô¬é?â[âìé?éÁ", - -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Ä×ìÅé?î`Ä«é?ò\\ïLû@\n\nh = Ä×èÈ m = ò¬ s = òb t = î?æOé?é¢é?î?îÒ\n\nh = 12 Ä×èÈ\nH = 24 Ä×èÈ\n\nhh, mm, ss = Éµô¬é? â[âìéáéÞ\nh, m, s = Éµô¬é?â[âìé?éÁ", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP END _____ Modified: trunk/reactos/lib/cpl/intl/cz.rc --- trunk/reactos/lib/cpl/intl/cz.rc 2005-10-19 14:08:31 UTC (rev 18591) +++ trunk/reactos/lib/cpl/intl/cz.rc 2005-10-19 14:09:23 UTC (rev 18592) @@ -46,13 +46,7 @@ LTEXT "Zkratka odpoledne:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE - LTEXT "Zßpis formßtu Þasu\n\n" - "h = hodina m = minuta s = vte°ina t = dop. nebo odp.\n\n" - "h = 12-ti hodinov² cyklus\n" - "H = 24-ti godinov² cyklus\n\n" - "hh, mm, ss = poÞßteÞnÝ nula\n" - "h, m, s = bez poÞßteÞnÝ nuly", - -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Zßpis formßtu Þasu\n\nh = hodina m = minuta s = vte°ina t = dop. nebo odp.\n\nh = 12-ti hodinov² cyklus\nH = 24-ti godinov² cyklus\n\nhh, mm, ss = poÞßteÞnÝ nula\nh, m, s = bez poÞßteÞnÝ nuly", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP END _____ Modified: trunk/reactos/lib/cpl/intl/de.rc --- trunk/reactos/lib/cpl/intl/de.rc 2005-10-19 14:08:31 UTC (rev 18591) +++ trunk/reactos/lib/cpl/intl/de.rc 2005-10-19 14:09:23 UTC (rev 18592) @@ -46,13 +46,7 @@ LTEXT "Symbol f³r &Nachmittag:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE - LTEXT "Zeitformat\n\n" - "h = Stunde m = Minute s = Sekunde t = Vor-/Nachmittag\n\n" - "h = 12 Stunden\n" - "H = 24 Stunden\n\n" - "hh, mm, ss = f³hrende Null\n" - "h, m, s = keine f³hrende Null", - -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Zeitformat\n\nh = Stunde m = Minute s = Sekunde t = Vor-/Nachmittag\n\nh = 12 Stunden\nH = 24 Stunden\n\nhh, mm, ss = f³hrende Null\nh, m, s = keine f³hrende Null", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP END _____ Modified: trunk/reactos/lib/cpl/intl/en.rc --- trunk/reactos/lib/cpl/intl/en.rc 2005-10-19 14:08:31 UTC (rev 18591) +++ trunk/reactos/lib/cpl/intl/en.rc 2005-10-19 14:09:23 UTC (rev 18592) @@ -46,13 +46,7 @@ LTEXT "&PM symbol:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE - LTEXT "Time format notation\n\n" - "h = hour m = minute s = second t = am or pm\n\n" - "h = 12 hour\n" - "H = 24 hour\n\n" - "hh, mm, ss = leading zero\n" - "h, m, s = no leading zero", - -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Time format notation\n\nh = hour m = minute s = second t = am or pm\n\nh = 12 hour\nH = 24 hour\n\nhh, mm, ss = leading zero\nh, m, s = no leading zero", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP END _____ Modified: trunk/reactos/lib/cpl/intl/nl.rc --- trunk/reactos/lib/cpl/intl/nl.rc 2005-10-19 14:08:31 UTC (rev 18591) +++ trunk/reactos/lib/cpl/intl/nl.rc 2005-10-19 14:09:23 UTC (rev 18592) @@ -46,13 +46,7 @@ LTEXT "&PM-symbool:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE - LTEXT "Tijdsnotatie\n\n" - "h = uur m = minuut s = second t = am or pm\n\n" - "h = 12 uur\n" - "H = 24 uur\n\n" - "hh, mm, ss = voorgaande nul\n" - "h, m, s = zonder voorgaande nul", - -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Tijdsnotatie\n\nh = uur m = minuut s = second t = am or pm\n\nh = 12 uur\nH = 24 uur\n\nhh, mm, ss = voorgaande nul\nh, m, s = zonder voorgaande nul", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP END

1 0

[cwittich] 18591: fixed prototypes in cpl.h
by cwittich＠svn.reactos.com 19 Oct '05

19 Oct '05

fixed prototypes in cpl.h Modified: trunk/reactos/w32api/include/cpl.h _____ Modified: trunk/reactos/w32api/include/cpl.h --- trunk/reactos/w32api/include/cpl.h 2005-10-19 13:12:01 UTC (rev 18590) +++ trunk/reactos/w32api/include/cpl.h 2005-10-19 14:08:31 UTC (rev 18591) @@ -4,6 +4,8 @@ #pragma GCC system_header #endif +#include <pshpack1.h> + #ifdef __cplusplus extern "C" { #endif @@ -21,18 +23,18 @@ #define CPL_STARTWPARMSA 9 #define CPL_STARTWPARMSW 10 #define CPL_SETUP 200 -typedef LONG(APIENTRY *APPLET_PROC)(HWND,UINT,LONG,LONG); +typedef LONG(APIENTRY *APPLET_PROC)(HWND,UINT,LPARAM,LPARAM); typedef struct tagCPLINFO { int idIcon; int idName; int idInfo; - LONG lData; + LONG_PTR lData; } CPLINFO,*LPCPLINFO; typedef struct tagNEWCPLINFOA { DWORD dwSize; DWORD dwFlags; DWORD dwHelpContext; - LONG lData; + LONG_PTR lData; HICON hIcon; CHAR szName[32]; CHAR szInfo[64]; @@ -42,7 +44,7 @@ DWORD dwSize; DWORD dwFlags; DWORD dwHelpContext; - LONG lData; + LONG_PTR lData; HICON hIcon; WCHAR szName[32]; WCHAR szInfo[64]; @@ -59,3 +61,5 @@ } #endif #endif + +#include <poppack.h>

1 0

[turner] 18590: after some long hard thought i decided to not use the broken cmd version of CommandLineToArgvW and start using the less broken ros api version. This doesnt matter all that much as cmd isnt compiled as unicode(yet).
by turner＠svn.reactos.com 19 Oct '05

19 Oct '05

after some long hard thought i decided to not use the broken cmd version of CommandLineToArgvW and start using the less broken ros api version. This doesnt matter all that much as cmd isnt compiled as unicode(yet). Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-10-19 02:53:03 UTC (rev 18589) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-10-19 13:12:01 UTC (rev 18590) @@ -1716,53 +1716,6 @@ } } -#ifdef __REACTOS__ -#ifdef _UNICODE -PWCHAR * _CommandLineToArgvW(PWCHAR lpCmdLine, int *pNumArgs) -{ - PWCHAR * argvw = NULL; - PWCHAR ptr = lpCmdLine; - PWCHAR str; - int len; - int NumArgs; - - NumArgs = 0; - - while(lpCmdLine && *lpCmdLine) - { - while (iswspace(*lpCmdLine)) lpCmdLine++; - if (*lpCmdLine) - { - if ((NumArgs % 10)==0) - { - PWCHAR * old_argvw = argvw; - argvw = malloc((NumArgs + 10) * sizeof(PWCHAR)); - memcpy(argvw, old_argvw, NumArgs * sizeof(PWCHAR)); - free(old_argvw); - } - ptr = wcschr(lpCmdLine, L' '); - if (ptr) - { - len = ptr - lpCmdLine; - } - else - { - len = wcslen(lpCmdLine); - } - str = malloc((len + 1) * sizeof(WCHAR)); - memcpy(str, lpCmdLine, len * sizeof(WCHAR)); - str[len] = 0; - argvw[NumArgs]=str; - NumArgs++; - lpCmdLine = ptr; - } - } - *pNumArgs = NumArgs; - return argvw; -} -#endif -#endif - /* * main function */ @@ -1778,12 +1731,8 @@ #ifdef _UNICODE PWCHAR * argv; int argc=0; -#ifdef __REACTOS__ - argv = _CommandLineToArgvW(GetCommandLineW(), &argc); -#else argv = CommandLineToArgvW(GetCommandLineW(), &argc); #endif -#endif GetCurrentDirectory(MAX_PATH,startPath); _tchdir(startPath);

1 0

[cwittich] 18589: set eol-style:native
by cwittich＠svn.reactos.com 19 Oct '05

19 Oct '05

set eol-style:native Property changes on: trunk/reactos/lib/cpl/control/Cz.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/cpl/intl/cz.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/cpl/ncpa/cz.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/cpl/sysdm/cz.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/cpl/timedate/Cz.rc ___________________________________________________________________ Name: svn:eol-style + native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs