Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 19246: Try to transform the ClassGUID string to a GUID only when the string exists in registry. Otherwise, set it to GUID_NULL
by hpoussin＠svn.reactos.com 15 Nov '05

15 Nov '05

Try to transform the ClassGUID string to a GUID only when the string exists in registry. Otherwise, set it to GUID_NULL Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi_private.h _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-11-15 14:26:06 UTC (rev 19245) +++ trunk/reactos/lib/setupapi/devinst.c 2005-11-15 14:29:46 UTC (rev 19246) @@ -1185,6 +1185,8 @@ if (pClassGuid) /* Skip this bad entry as we can't verify it */ continue; + /* Set a default GUID for this device */ + memcpy(&KeyGuid, &GUID_NULL, sizeof(GUID)); } else if (rc != ERROR_SUCCESS) { @@ -1196,13 +1198,14 @@ RegCloseKey(hDeviceIdKey); return ERROR_GEN_FAILURE; } - - KeyBuffer[37] = '\0'; /* Replace the } by a NULL character */ - if (UuidFromStringW(&KeyBuffer[1], &KeyGuid) != RPC_S_OK) + else { - RegCloseKey(hDeviceIdKey); - return GetLastError(); + KeyBuffer[37] = '\0'; /* Replace the } by a NULL character */ + if (UuidFromStringW(&KeyBuffer[1], &KeyGuid) != RPC_S_OK) + /* Bad GUID, skip the entry */ + continue; } + if (pClassGuid && !IsEqualIID(&KeyGuid, pClassGuid)) { /* Skip this entry as it is not the right device class */ @@ -1259,7 +1262,7 @@ return rc; /* If enumerator is provided, call directly SETUP_CreateDevListFromEnumerator. - * Else, enumerate all enumerators all call SETUP_CreateDevListFromEnumerator + * Else, enumerate all enumerators and call SETUP_CreateDevListFromEnumerator * for each one. */ if (Enumerator) _____ Modified: trunk/reactos/lib/setupapi/setupapi_private.h --- trunk/reactos/lib/setupapi/setupapi_private.h 2005-11-15 14:26:06 UTC (rev 19245) +++ trunk/reactos/lib/setupapi/setupapi_private.h 2005-11-15 14:29:46 UTC (rev 19246) @@ -103,7 +103,8 @@ * String which identifies the device. Can be NULL. If not NULL, * points into the Data field at the end of the structure * - ClassGuid - * Identifies the class of this device. FIXME: can it be GUID_NULL? + * Identifies the class of this device. It is GUID_NULL if the + * device has not been installed * - CreationFlags * Is a combination of: * - DICD_GENERATE_ID

1 0

[cwittich] 19245: fix some MSVC compile problems
by cwittich＠svn.reactos.com 15 Nov '05

15 Nov '05

fix some MSVC compile problems Modified: trunk/reactos/lib/crt/include/internal/debug.h Modified: trunk/reactos/lib/crt/precomp.h Modified: trunk/reactos/lib/crt/process/_cwait.c Modified: trunk/reactos/lib/crt/process/dll.c _____ Modified: trunk/reactos/lib/crt/include/internal/debug.h --- trunk/reactos/lib/crt/include/internal/debug.h 2005-11-15 09:47:31 UTC (rev 19244) +++ trunk/reactos/lib/crt/include/internal/debug.h 2005-11-15 14:26:06 UTC (rev 19245) @@ -30,9 +30,10 @@ unsigned long DbgPrint(char *Format,...); -#define TRACE(...) +#ifdef __GNUC__ + #define TRACE(...) +#endif - #ifdef DBG #ifdef __GNUC__ #define DPRINT1(args...) do { DbgPrint("(MSVCRT:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0); @@ -50,7 +51,9 @@ #endif #if !defined(NDEBUG) && defined(DBG) - #define DPRINT(args...) do { DbgPrint("(MSVCRT:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0); + #ifdef __GNUC__ + #define DPRINT(args...) do { DbgPrint("(MSVCRT:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0); + #endif #define CHECKPOINT do { DbgPrint("MSVCRT:%s:%d\n",__FILE__,__LINE__); } while(0); #else #ifdef __GNUC__ _____ Modified: trunk/reactos/lib/crt/precomp.h --- trunk/reactos/lib/crt/precomp.h 2005-11-15 09:47:31 UTC (rev 19244) +++ trunk/reactos/lib/crt/precomp.h 2005-11-15 14:26:06 UTC (rev 19245) @@ -1,3 +1,7 @@ #define CRT_SECURE_NO_DEPRECATE #include <windows.h> + +#if !defined(_MSC_VER) + #include <stdint.h> +#endif _____ Modified: trunk/reactos/lib/crt/process/_cwait.c --- trunk/reactos/lib/crt/process/_cwait.c 2005-11-15 09:47:31 UTC (rev 19244) +++ trunk/reactos/lib/crt/process/_cwait.c 2005-11-15 14:26:06 UTC (rev 19245) @@ -22,15 +22,15 @@ DWORD ExitCode; nAction = 0; - if (WaitForSingleObject((void*)hProc, INFINITE) != WAIT_OBJECT_0) { + if (WaitForSingleObject((void*)ULongToPtr(hProc), INFINITE) != WAIT_OBJECT_0) { __set_errno(ECHILD); return -1; } - if (!GetExitCodeProcess((void*)hProc, &ExitCode)) + if (!GetExitCodeProcess((void*)ULongToPtr(hProc), &ExitCode)) return -1; if (pnStatus != NULL) *pnStatus = (int)ExitCode; - CloseHandle((HANDLE)hProc); + CloseHandle((HANDLE)ULongToPtr(hProc)); return hProc; } _____ Modified: trunk/reactos/lib/crt/process/dll.c --- trunk/reactos/lib/crt/process/dll.c 2005-11-15 09:47:31 UTC (rev 19244) +++ trunk/reactos/lib/crt/process/dll.c 2005-11-15 14:26:06 UTC (rev 19245) @@ -11,31 +11,30 @@ #include "precomp.h" #include <process.h> - /* * @implemented */ -void* _loaddll(char* name) +intptr_t _loaddll(char* name) { - return LoadLibraryA(name); + return (intptr_t) LoadLibraryA(name); } /* * @implemented */ -int _unloaddll(void* handle) +int _unloaddll(intptr_t handle) { - return FreeLibrary(handle); + return FreeLibrary((HMODULE) handle); } /* * @implemented */ -FARPROC _getdllprocaddr(void* hModule, char* lpProcName, int iOrdinal) +FARPROC _getdllprocaddr(intptr_t hModule, char* lpProcName, intptr_t iOrdinal) { if (lpProcName != NULL) - return GetProcAddress(hModule, lpProcName); + return GetProcAddress((HMODULE) hModule, lpProcName); else - return GetProcAddress(hModule, (LPSTR)iOrdinal); + return GetProcAddress((HMODULE) hModule, (LPSTR)iOrdinal); return (NULL); }

1 0

[sedwards] 19244: revert this one
by sedwards＠svn.reactos.com 15 Nov '05

15 Nov '05

revert this one Modified: trunk/reactos/lib/crt/stdio/putwchar.c _____ Modified: trunk/reactos/lib/crt/stdio/putwchar.c --- trunk/reactos/lib/crt/stdio/putwchar.c 2005-11-15 08:55:31 UTC (rev 19243) +++ trunk/reactos/lib/crt/stdio/putwchar.c 2005-11-15 09:47:31 UTC (rev 19244) @@ -1,5 +1,3 @@ -#include "precomp.h" - #define UNICODE #define _UNICODE

1 0

[hpoussin] 19243: Support optional Class parameter in SetupOpenInfFileW
by hpoussin＠svn.reactos.com 15 Nov '05

15 Nov '05

Support optional Class parameter in SetupOpenInfFileW Modified: trunk/reactos/lib/setupapi/parser.c _____ Modified: trunk/reactos/lib/setupapi/parser.c --- trunk/reactos/lib/setupapi/parser.c 2005-11-15 08:27:38 UTC (rev 19242) +++ trunk/reactos/lib/setupapi/parser.c 2005-11-15 08:55:31 UTC (rev 19243) @@ -899,7 +899,7 @@ * * parse an INF file. */ -static struct inf_file *parse_file( HANDLE handle, const WCHAR *class, UINT *error_line ) +static struct inf_file *parse_file( HANDLE handle, UINT *error_line ) { void *buffer; DWORD err = 0; @@ -912,8 +912,6 @@ NtClose( mapping ); if (!buffer) return NULL; - if (class) FIXME( "class %s not supported yet\n", debugstr_w(class) ); - if (!(file = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*file) ))) { err = ERROR_NOT_ENOUGH_MEMORY; @@ -1042,6 +1040,72 @@ } +static BOOL +GetInfClassW( + IN HINF hInf, + OUT LPGUID ClassGuid, + OUT PWSTR ClassName, + IN DWORD ClassNameSize, + OUT PDWORD RequiredSize OPTIONAL) +{ + DWORD requiredSize; + WCHAR guidW[MAX_GUID_STRING_LEN + 1]; + BOOL ret = FALSE; + + /* Read class Guid */ + if (!SetupGetLineTextW(NULL, hInf, L"Version", L"ClassGUID", guidW, sizeof(guidW), NULL)) + goto cleanup; + guidW[37] = '\0'; /* Replace the } by a NULL character */ + if (UuidFromStringW(&guidW[1], ClassGuid) != RPC_S_OK) + goto cleanup; + + /* Read class name */ + ret = SetupGetLineTextW(NULL, hInf, L"Version", L"Class", ClassName, ClassNameSize, &requiredSize); + if (ret && ClassName == NULL && ClassNameSize == 0) + { + if (RequiredSize) + *RequiredSize = requiredSize; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + goto cleanup; + } + if (!ret) + { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + if (RequiredSize) + *RequiredSize = requiredSize; + goto cleanup; + } + else if (!SetupDiClassNameFromGuidW(ClassGuid, ClassName, ClassNameSize, &requiredSize)) + { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + if (RequiredSize) + *RequiredSize = requiredSize; + goto cleanup; + } + /* Return a NULL class name */ + if (RequiredSize) + *RequiredSize = 1; + if (ClassNameSize < 1) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + goto cleanup; + } + memcpy(ClassGuid, &GUID_NULL, sizeof(GUID)); + *ClassName = UNICODE_NULL; + } + } + + ret = TRUE; + +cleanup: + TRACE("Returning %d\n", ret); + return ret; +} + + /*********************************************************************** * SetupOpenInfFileW (SETUPAPI.@) */ @@ -1091,7 +1155,7 @@ if (handle != INVALID_HANDLE_VALUE) { - file = parse_file( handle, class, error ); + file = parse_file( handle, error ); CloseHandle( handle ); } if (!file) @@ -1102,6 +1166,37 @@ TRACE( "%s -> %p\n", debugstr_w(path), file ); file->src_root = path; if ((p = strrchrW( path, '\\' ))) p[1] = 0; /* remove file name */ + + if (class) + { + GUID ClassGuid; + LPWSTR ClassName = HeapAlloc(GetProcessHeap(), 0, (strlenW(class) + 1) * sizeof(WCHAR)); + if (!ClassName) + { + /* Not enough memory */ + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + SetupCloseInfFile((HINF)file); + return NULL; + } + else if (!GetInfClassW((HINF)file, &ClassGuid, ClassName, strlenW(class) + 1, NULL)) + { + /* Unable to get class name in .inf file */ + HeapFree(GetProcessHeap(), 0, ClassName); + SetLastError(ERROR_CLASS_MISMATCH); + SetupCloseInfFile((HINF)file); + return NULL; + } + else if (strcmpW(class, ClassName) != 0) + { + /* Provided name name is not the expected one */ + HeapFree(GetProcessHeap(), 0, ClassName); + SetLastError(ERROR_CLASS_MISMATCH); + SetupCloseInfFile((HINF)file); + return NULL; + } + HeapFree(GetProcessHeap(), 0, ClassName); + } + SetLastError( 0 ); return (HINF)file; } @@ -2111,8 +2206,6 @@ OUT PDWORD RequiredSize OPTIONAL) { HINF hInf = INVALID_HANDLE_VALUE; - DWORD requiredSize; - WCHAR guidW[MAX_GUID_STRING_LEN + 1]; BOOL ret = FALSE; TRACE("%S %p %p %ld %p\n", InfName, ClassGuid, @@ -2123,54 +2216,8 @@ if (hInf == INVALID_HANDLE_VALUE) goto cleanup; - /* Read class Guid */ - if (!SetupGetLineTextW(NULL, hInf, L"Version", L"ClassGUID", guidW, sizeof(guidW), NULL)) - goto cleanup; - guidW[37] = '\0'; /* Replace the } by a NULL character */ - if (UuidFromStringW(&guidW[1], ClassGuid) != RPC_S_OK) - goto cleanup; + ret = GetInfClassW(hInf, ClassGuid, ClassName, ClassNameSize, RequiredSize); - /* Read class name */ - ret = SetupGetLineTextW(NULL, hInf, L"Version", L"Class", ClassName, ClassNameSize, &requiredSize); - if (ret && ClassName == NULL && ClassNameSize == 0) - { - if (RequiredSize) - *RequiredSize = requiredSize; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - ret = FALSE; - goto cleanup; - } - if (!ret) - { - if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - if (RequiredSize) - *RequiredSize = requiredSize; - goto cleanup; - } - else if (!SetupDiClassNameFromGuidW(ClassGuid, ClassName, ClassNameSize, &requiredSize)) - { - if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - if (RequiredSize) - *RequiredSize = requiredSize; - goto cleanup; - } - /* Return a NULL class name */ - if (RequiredSize) - *RequiredSize = 1; - if (ClassNameSize < 1) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - goto cleanup; - } - memcpy(ClassGuid, &GUID_NULL, sizeof(GUID)); - *ClassName = UNICODE_NULL; - } - } - - ret = TRUE; - cleanup: if (hInf != INVALID_HANDLE_VALUE) SetupCloseInfFile(hInf);

1 0

[hpoussin] 19242: Don't try to access an optional parameter if it is NULL
by hpoussin＠svn.reactos.com 15 Nov '05

15 Nov '05

Don't try to access an optional parameter if it is NULL Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-11-15 06:14:31 UTC (rev 19241) +++ trunk/reactos/lib/setupapi/devinst.c 2005-11-15 08:27:38 UTC (rev 19242) @@ -1236,7 +1236,7 @@ DWORD dwLength; DWORD rc; - if (IsEqualIID(class, &GUID_NULL)) + if (class && IsEqualIID(class, &GUID_NULL)) class = NULL; /* Open Enum key */

1 0

[sedwards] 19241: a few more msvc fixes
by sedwards＠svn.reactos.com 15 Nov '05

15 Nov '05

a few more msvc fixes Modified: trunk/reactos/apps/utils/net/telnet/src/ansiprsr.cpp Modified: trunk/reactos/apps/utils/net/telnet/src/tnetwork.h Modified: trunk/reactos/apps/utils/net/telnet/telnet.xml _____ Modified: trunk/reactos/apps/utils/net/telnet/src/ansiprsr.cpp --- trunk/reactos/apps/utils/net/telnet/src/ansiprsr.cpp 2005-11-15 05:31:41 UTC (rev 19240) +++ trunk/reactos/apps/utils/net/telnet/src/ansiprsr.cpp 2005-11-15 06:14:31 UTC (rev 19241) @@ -49,7 +49,7 @@ // //////////////////////////////////////////////////////////////////////// /////// -#include <windows.h> +//#include <windows.h> #include <string.h> #include "ansiprsr.h" _____ Modified: trunk/reactos/apps/utils/net/telnet/src/tnetwork.h --- trunk/reactos/apps/utils/net/telnet/src/tnetwork.h 2005-11-15 05:31:41 UTC (rev 19240) +++ trunk/reactos/apps/utils/net/telnet/src/tnetwork.h 2005-11-15 06:14:31 UTC (rev 19241) @@ -6,22 +6,6 @@ #include <windows.h> -// Mingw32 doesn't use winsock.h (Paul Brannan 9/4/98) -#ifdef __MINGW32__ -#ifdef __CYGWIN__ -#include <winsock.h> -#else -// #include <Windows32/sockets.h> Removed for ReactOS -#endif -#else -#include <winsock.h> -#endif - -// ReactOS uses winsock2.h (Steven Edwards 12-31-01) -#ifdef __REACTOS__ -#include <winsock2.h> -#endif - enum NetworkType {TN_NETSOCKET, TN_NETPIPE}; typedef int(*Naws_func_t)(char *, int, int); _____ Modified: trunk/reactos/apps/utils/net/telnet/telnet.xml --- trunk/reactos/apps/utils/net/telnet/telnet.xml 2005-11-15 05:31:41 UTC (rev 19240) +++ trunk/reactos/apps/utils/net/telnet/telnet.xml 2005-11-15 06:14:31 UTC (rev 19241) @@ -4,6 +4,7 @@ <define name="__REACTOS__" /> <library>kernel32</library> <library>ws2_32</library> + <library>user32</library> <directory name="src"> <file>ansiprsr.cpp</file> <file>keytrans.cpp</file>

1 0

[sedwards] 19240: workarounds for msvc compile. Add precomp.h to a bunch of files, inline -> __inline, other misc changes. crt.lib now has 154 errors building on msvc vs 1800
by sedwards＠svn.reactos.com 15 Nov '05

15 Nov '05

workarounds for msvc compile. Add precomp.h to a bunch of files, inline -> __inline, other misc changes. crt.lib now has 154 errors building on msvc vs 1800 Modified: trunk/reactos/lib/crt/float/clearfp.c Modified: trunk/reactos/lib/crt/float/fpecode.c Modified: trunk/reactos/lib/crt/include/internal/debug.h Modified: trunk/reactos/lib/crt/io/dup2.c Modified: trunk/reactos/lib/crt/io/isatty.c Modified: trunk/reactos/lib/crt/io/open.c Modified: trunk/reactos/lib/crt/io/setmode.c Modified: trunk/reactos/lib/crt/io/utime.c Modified: trunk/reactos/lib/crt/misc/lock.c Modified: trunk/reactos/lib/crt/precomp.h Modified: trunk/reactos/lib/crt/signal/signal.c Modified: trunk/reactos/lib/crt/stdio/allocfil.c Modified: trunk/reactos/lib/crt/stdio/clearerr.c Modified: trunk/reactos/lib/crt/stdio/fclose.c Modified: trunk/reactos/lib/crt/stdio/fdopen.c Modified: trunk/reactos/lib/crt/stdio/feof.c Modified: trunk/reactos/lib/crt/stdio/ferror.c Modified: trunk/reactos/lib/crt/stdio/fflush.c Modified: trunk/reactos/lib/crt/stdio/fgetc.c Modified: trunk/reactos/lib/crt/stdio/fgets.c Modified: trunk/reactos/lib/crt/stdio/fgetws.c Modified: trunk/reactos/lib/crt/stdio/filbuf.c Modified: trunk/reactos/lib/crt/stdio/flsbuf.c Modified: trunk/reactos/lib/crt/stdio/fprintf.c Modified: trunk/reactos/lib/crt/stdio/fputc.c Modified: trunk/reactos/lib/crt/stdio/fread.c Modified: trunk/reactos/lib/crt/stdio/fseek.c Modified: trunk/reactos/lib/crt/stdio/fsetpos.c Modified: trunk/reactos/lib/crt/stdio/ftell.c Modified: trunk/reactos/lib/crt/stdio/fwalk.c Modified: trunk/reactos/lib/crt/stdio/fwrite.c Modified: trunk/reactos/lib/crt/stdio/getchar.c Modified: trunk/reactos/lib/crt/stdio/putchar.c Modified: trunk/reactos/lib/crt/stdio/putwchar.c Modified: trunk/reactos/lib/crt/stdio/rewind.c Modified: trunk/reactos/lib/crt/stdio/rmtmp.c Modified: trunk/reactos/lib/crt/stdio/setbuf.c Modified: trunk/reactos/lib/crt/stdio/setvbuf.c Modified: trunk/reactos/lib/crt/stdio/sprintf.c Modified: trunk/reactos/lib/crt/stdio/stdhnd.c Modified: trunk/reactos/lib/crt/stdio/tmpfile.c Modified: trunk/reactos/lib/crt/stdio/ungetc.c Modified: trunk/reactos/lib/crt/stdio/vfprintf.c Modified: trunk/reactos/lib/crt/stdio/vsprintf.c Modified: trunk/reactos/lib/crt/stdlib/errno.c Modified: trunk/reactos/lib/crt/stdlib/rand.c Modified: trunk/reactos/lib/crt/stdlib/strtoul.c Modified: trunk/reactos/lib/crt/stdlib/strtoull.c Modified: trunk/reactos/lib/crt/stdlib/wcstombs.c Modified: trunk/reactos/lib/crt/string/lasttok.c Modified: trunk/reactos/lib/crt/string/strtok.c Modified: trunk/reactos/lib/crt/sys_stat/futime.c Modified: trunk/reactos/lib/crt/time/clock.c Modified: trunk/reactos/lib/crt/time/strdate.c Modified: trunk/reactos/lib/crt/time/strtime.c Modified: trunk/reactos/lib/crt/time/wstrdate.c Modified: trunk/reactos/lib/crt/time/wstrtime.c Modified: trunk/reactos/lib/crt/wine/cppexcept.c Modified: trunk/reactos/lib/crt/wine/scanf.c Modified: trunk/reactos/lib/crt/wstring/wcsdup.c Modified: trunk/reactos/lib/crt/wstring/wcstok.c Modified: trunk/reactos/lib/crt/wstring/wlasttok.c _____ Modified: trunk/reactos/lib/crt/float/clearfp.c --- trunk/reactos/lib/crt/float/clearfp.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/float/clearfp.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,5 +1,7 @@ #include <float.h> +unsigned int _statusfp( void ); + /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/float/fpecode.c --- trunk/reactos/lib/crt/float/fpecode.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/float/fpecode.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,3 +1,4 @@ +#include "precomp.h" #include <float.h> #include <internal/tls.h> _____ Modified: trunk/reactos/lib/crt/include/internal/debug.h --- trunk/reactos/lib/crt/include/internal/debug.h 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/include/internal/debug.h 2005-11-15 05:31:41 UTC (rev 19240) @@ -34,7 +34,11 @@ #ifdef DBG - #define DPRINT1(args...) do { DbgPrint("(MSVCRT:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0); + #ifdef __GNUC__ + #define DPRINT1(args...) do { DbgPrint("(MSVCRT:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0); + #else + #define DPRINT1 DbgPrint + #endif #define CHECKPOINT1 do { DbgPrint("MSVCRT:%s:%d\n",__FILE__,__LINE__); } while(0); #else #ifdef __GNUC__ _____ Modified: trunk/reactos/lib/crt/io/dup2.c --- trunk/reactos/lib/crt/io/dup2.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/io/dup2.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,3 +1,4 @@ +#include "precomp.h" #include <io.h> #include <internal/file.h> _____ Modified: trunk/reactos/lib/crt/io/isatty.c --- trunk/reactos/lib/crt/io/isatty.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/io/isatty.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,3 +1,5 @@ +#include "precomp.h" + #include <internal/file.h> #define NDEBUG _____ Modified: trunk/reactos/lib/crt/io/open.c --- trunk/reactos/lib/crt/io/open.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/io/open.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -80,7 +80,7 @@ * INTERNAL */ /* -static inline FD_INFO* fdinfo(int fd) +static __inline FD_INFO* fdinfo(int fd) { FD_INFO* bucket = __pioinfo[fd >> FDINFO_ENTRIES_PER_BUCKET_SHIFT]; if (!bucket){ @@ -94,7 +94,7 @@ /* * INTERNAL */ -inline BOOL is_valid_fd(int fd) +__inline BOOL is_valid_fd(int fd) { BOOL b = (fd >= 0 && fd < g_fdend && (fdinfo(fd)->fdflags & FOPEN)); _____ Modified: trunk/reactos/lib/crt/io/setmode.c --- trunk/reactos/lib/crt/io/setmode.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/io/setmode.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -8,6 +8,7 @@ * UPDATE HISTORY: * 28/12/98: Created */ +#include "precomp.h" #include <io.h> #include <stdio.h> _____ Modified: trunk/reactos/lib/crt/io/utime.c --- trunk/reactos/lib/crt/io/utime.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/io/utime.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,3 +1,5 @@ +#include "precomp.h" + #include <stdio.h> #include <io.h> #include <errno.h> _____ Modified: trunk/reactos/lib/crt/misc/lock.c --- trunk/reactos/lib/crt/misc/lock.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/misc/lock.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -30,18 +30,18 @@ static LOCKTABLEENTRY lock_table[ _TOTAL_LOCKS ]; -static inline void msvcrt_mlock_set_entry_initialized( int locknum, BOOL initialized ) +static __inline void msvcrt_mlock_set_entry_initialized( int locknum, BOOL initialized ) { lock_table[ locknum ].bInit = initialized; } -static inline void msvcrt_initialize_mlock( int locknum ) +static __inline void msvcrt_initialize_mlock( int locknum ) { InitializeCriticalSection( &(lock_table[ locknum ].crit) ); msvcrt_mlock_set_entry_initialized( locknum, TRUE ); } -static inline void msvcrt_uninitialize_mlock( int locknum ) +static __inline void msvcrt_uninitialize_mlock( int locknum ) { DeleteCriticalSection( &(lock_table[ locknum ].crit) ); msvcrt_mlock_set_entry_initialized( locknum, FALSE ); _____ Modified: trunk/reactos/lib/crt/precomp.h --- trunk/reactos/lib/crt/precomp.h 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/precomp.h 2005-11-15 05:31:41 UTC (rev 19240) @@ -1 +1,3 @@ +#define CRT_SECURE_NO_DEPRECATE + #include <windows.h> _____ Modified: trunk/reactos/lib/crt/signal/signal.c --- trunk/reactos/lib/crt/signal/signal.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/signal/signal.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,3 +1,5 @@ +#include "precomp.h" + #include <signal.h> #include <stdlib.h> #include <errno.h> _____ Modified: trunk/reactos/lib/crt/stdio/allocfil.c --- trunk/reactos/lib/crt/stdio/allocfil.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/allocfil.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,4 +1,5 @@ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" #include <stdio.h> #include <string.h> #include <stdlib.h> _____ Modified: trunk/reactos/lib/crt/stdio/clearerr.c --- trunk/reactos/lib/crt/stdio/clearerr.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/clearerr.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,4 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" #include <stdio.h> #include <errno.h> #include <internal/file.h> _____ Modified: trunk/reactos/lib/crt/stdio/fclose.c --- trunk/reactos/lib/crt/stdio/fclose.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/fclose.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,5 +1,5 @@ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ - +#include "precomp.h" #include <stdio.h> #include <stdarg.h> #include <io.h> _____ Modified: trunk/reactos/lib/crt/stdio/fdopen.c --- trunk/reactos/lib/crt/stdio/fdopen.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/fdopen.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,14 +1,9 @@ +#include "precomp.h" - #include <stdio.h> #include <tchar.h> #include <internal/file.h> - - - - - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/stdio/feof.c --- trunk/reactos/lib/crt/stdio/feof.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/feof.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,4 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" #include <stdio.h> #include <errno.h> #include <internal/file.h> _____ Modified: trunk/reactos/lib/crt/stdio/ferror.c --- trunk/reactos/lib/crt/stdio/ferror.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/ferror.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,4 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" #include <stdio.h> #include <internal/file.h> _____ Modified: trunk/reactos/lib/crt/stdio/fflush.c --- trunk/reactos/lib/crt/stdio/fflush.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/fflush.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -10,7 +10,7 @@ /* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ - +#include "precomp.h" #include <stdio.h> #include <stdarg.h> #include <errno.h> _____ Modified: trunk/reactos/lib/crt/stdio/fgetc.c --- trunk/reactos/lib/crt/stdio/fgetc.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/fgetc.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -9,6 +9,7 @@ 25/02/99: Added fgetwc */ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" #include <stdio.h> #include <internal/file.h> _____ Modified: trunk/reactos/lib/crt/stdio/fgets.c --- trunk/reactos/lib/crt/stdio/fgets.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/fgets.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -24,7 +24,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ - +#include "precomp.h" #include <stdio.h> #include <internal/file.h> _____ Modified: trunk/reactos/lib/crt/stdio/fgetws.c --- trunk/reactos/lib/crt/stdio/fgetws.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/fgetws.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -24,7 +24,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ - +#include "precomp.h" #include <stdio.h> #include <internal/file.h> _____ Modified: trunk/reactos/lib/crt/stdio/filbuf.c --- trunk/reactos/lib/crt/stdio/filbuf.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/filbuf.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,7 +1,7 @@ /* Copyright (C) 1997 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ - +#include "precomp.h" #include <stdio.h> #include <sys/types.h> #include <stdlib.h> _____ Modified: trunk/reactos/lib/crt/stdio/flsbuf.c --- trunk/reactos/lib/crt/stdio/flsbuf.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/flsbuf.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,6 +1,6 @@ /* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ - +#include "precomp.h" #include <stdio.h> #include <wchar.h> #include <sys/types.h> _____ Modified: trunk/reactos/lib/crt/stdio/fprintf.c --- trunk/reactos/lib/crt/stdio/fprintf.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/fprintf.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,4 +1,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" + #include <stdio.h> #include <wchar.h> #include <tchar.h> _____ Modified: trunk/reactos/lib/crt/stdio/fputc.c --- trunk/reactos/lib/crt/stdio/fputc.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/fputc.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,4 +1,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" + #include <stdio.h> #include <wchar.h> #include <internal/file.h> _____ Modified: trunk/reactos/lib/crt/stdio/fread.c --- trunk/reactos/lib/crt/stdio/fread.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/fread.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,3 +1,5 @@ +#include "precomp.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> _____ Modified: trunk/reactos/lib/crt/stdio/fseek.c --- trunk/reactos/lib/crt/stdio/fseek.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/fseek.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -2,6 +2,8 @@ /* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" + #include <stdio.h> #include <errno.h> #include <fcntl.h> _____ Modified: trunk/reactos/lib/crt/stdio/fsetpos.c --- trunk/reactos/lib/crt/stdio/fsetpos.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/fsetpos.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,4 +1,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" + #include <stdio.h> #include <errno.h> #include <internal/file.h> _____ Modified: trunk/reactos/lib/crt/stdio/ftell.c --- trunk/reactos/lib/crt/stdio/ftell.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/ftell.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,6 +1,8 @@ /* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" + #include <stdio.h> #include <fcntl.h> #include <io.h> _____ Modified: trunk/reactos/lib/crt/stdio/fwalk.c --- trunk/reactos/lib/crt/stdio/fwalk.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/fwalk.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,4 +1,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" + #include <stdio.h> #include <internal/file.h> _____ Modified: trunk/reactos/lib/crt/stdio/fwrite.c --- trunk/reactos/lib/crt/stdio/fwrite.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/fwrite.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,3 +1,4 @@ +#include "precomp.h" #include <stdio.h> #include <stdlib.h> _____ Modified: trunk/reactos/lib/crt/stdio/getchar.c --- trunk/reactos/lib/crt/stdio/getchar.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/getchar.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -23,6 +23,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "precomp.h" #include <stdio.h> #include <internal/file.h> _____ Modified: trunk/reactos/lib/crt/stdio/putchar.c --- trunk/reactos/lib/crt/stdio/putchar.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/putchar.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -8,6 +8,8 @@ * UPDATE HISTORY: * 28/12/98: Created */ +#include "precomp.h" + #include <stdio.h> #include <tchar.h> #include <internal/file.h> _____ Modified: trunk/reactos/lib/crt/stdio/putwchar.c --- trunk/reactos/lib/crt/stdio/putwchar.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/putwchar.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,3 +1,5 @@ +#include "precomp.h" + #define UNICODE #define _UNICODE _____ Modified: trunk/reactos/lib/crt/stdio/rewind.c --- trunk/reactos/lib/crt/stdio/rewind.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/rewind.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,4 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" #include <stdio.h> #include <io.h> _____ Modified: trunk/reactos/lib/crt/stdio/rmtmp.c --- trunk/reactos/lib/crt/stdio/rmtmp.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/rmtmp.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -8,6 +8,7 @@ * Created 19/01/99 * NOTE Not tested. */ +#include "precomp.h" #include <stdio.h> #include <string.h> _____ Modified: trunk/reactos/lib/crt/stdio/setbuf.c --- trunk/reactos/lib/crt/stdio/setbuf.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/setbuf.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,4 +1,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" + #include <stdio.h> #include <stdlib.h> #include <internal/file.h> _____ Modified: trunk/reactos/lib/crt/stdio/setvbuf.c --- trunk/reactos/lib/crt/stdio/setvbuf.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/setvbuf.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,6 +1,8 @@ /* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" + #include <stdio.h> #include <stdlib.h> #include <io.h> _____ Modified: trunk/reactos/lib/crt/stdio/sprintf.c --- trunk/reactos/lib/crt/stdio/sprintf.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/sprintf.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -18,6 +18,8 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "precomp.h" + #include <stdarg.h> #include <stdio.h> #include <wchar.h> _____ Modified: trunk/reactos/lib/crt/stdio/stdhnd.c --- trunk/reactos/lib/crt/stdio/stdhnd.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/stdhnd.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,4 +1,6 @@ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" + #include <stdio.h> #include <internal/file.h> _____ Modified: trunk/reactos/lib/crt/stdio/tmpfile.c --- trunk/reactos/lib/crt/stdio/tmpfile.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/tmpfile.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -2,6 +2,7 @@ /* Copyright (C) 1997 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" #include <stdio.h> #include <string.h> _____ Modified: trunk/reactos/lib/crt/stdio/ungetc.c --- trunk/reactos/lib/crt/stdio/ungetc.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/ungetc.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,5 +1,7 @@ /* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" + #include <stdio.h> #include <wchar.h> #include <errno.h> _____ Modified: trunk/reactos/lib/crt/stdio/vfprintf.c --- trunk/reactos/lib/crt/stdio/vfprintf.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/vfprintf.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,4 +1,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" + #include <stdarg.h> #include <stdio.h> #include <malloc.h> _____ Modified: trunk/reactos/lib/crt/stdio/vsprintf.c --- trunk/reactos/lib/crt/stdio/vsprintf.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdio/vsprintf.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,4 +1,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" + #include <stdio.h> #include <stdarg.h> #include <limits.h> _____ Modified: trunk/reactos/lib/crt/stdlib/errno.c --- trunk/reactos/lib/crt/stdlib/errno.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdlib/errno.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,7 +1,7 @@ /* $Id$ * */ - +#include "precomp.h" #include <errno.h> #include <internal/tls.h> #include <internal/file.h> _____ Modified: trunk/reactos/lib/crt/stdlib/rand.c --- trunk/reactos/lib/crt/stdlib/rand.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdlib/rand.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,4 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" #include <stdlib.h> #include <internal/tls.h> _____ Modified: trunk/reactos/lib/crt/stdlib/strtoul.c --- trunk/reactos/lib/crt/stdlib/strtoul.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdlib/strtoul.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,4 +1,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" + #include <limits.h> #include <ctype.h> #include <errno.h> _____ Modified: trunk/reactos/lib/crt/stdlib/strtoull.c --- trunk/reactos/lib/crt/stdlib/strtoull.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdlib/strtoull.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,10 +1,11 @@ /* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" + #include <limits.h> #include <ctype.h> #include <errno.h> #include <stdlib.h> -#include <stdint.h> #include <internal/file.h> /* _____ Modified: trunk/reactos/lib/crt/stdlib/wcstombs.c --- trunk/reactos/lib/crt/stdlib/wcstombs.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/stdlib/wcstombs.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -16,6 +16,8 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "precomp.h" + #include <stdlib.h> #include <wchar.h> #include <errno.h> _____ Modified: trunk/reactos/lib/crt/string/lasttok.c --- trunk/reactos/lib/crt/string/lasttok.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/string/lasttok.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,3 +1,5 @@ +#include "precomp.h" + #include <internal/tls.h> #include <assert.h> _____ Modified: trunk/reactos/lib/crt/string/strtok.c --- trunk/reactos/lib/crt/string/strtok.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/string/strtok.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,4 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" #include <string.h> #include <internal/tls.h> _____ Modified: trunk/reactos/lib/crt/sys_stat/futime.c --- trunk/reactos/lib/crt/sys_stat/futime.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/sys_stat/futime.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,3 +1,5 @@ +#include "precomp.h" + #include <malloc.h> #include <stdlib.h> #include <sys/utime.h> _____ Modified: trunk/reactos/lib/crt/time/clock.c --- trunk/reactos/lib/crt/time/clock.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/time/clock.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -12,8 +12,6 @@ #include <time.h> #include <internal/file.h> -VOID STDCALL GetSystemTimeAsFileTime(LPFILETIME lpSystemTimeAsFileTime ); - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/time/strdate.c --- trunk/reactos/lib/crt/time/strdate.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/time/strdate.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -7,6 +7,8 @@ * UPDATE HISTORY: * 28/12/98: Created */ +#include "precomp.h" + #include <time.h> #include <stdio.h> #include <errno.h> _____ Modified: trunk/reactos/lib/crt/time/strtime.c --- trunk/reactos/lib/crt/time/strtime.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/time/strtime.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -7,6 +7,8 @@ * UPDATE HISTORY: * 28/12/98: Created */ +#include "precomp.h" + #include <time.h> #include <stdio.h> #include <errno.h> _____ Modified: trunk/reactos/lib/crt/time/wstrdate.c --- trunk/reactos/lib/crt/time/wstrdate.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/time/wstrdate.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 28/12/98: Created */ +#include "precomp.h" #include <time.h> #include <stdio.h> #include <errno.h> _____ Modified: trunk/reactos/lib/crt/time/wstrtime.c --- trunk/reactos/lib/crt/time/wstrtime.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/time/wstrtime.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 28/12/98: Created */ +#include "precomp.h" #include <time.h> #include <stdio.h> #include <errno.h> _____ Modified: trunk/reactos/lib/crt/wine/cppexcept.c --- trunk/reactos/lib/crt/wine/cppexcept.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/wine/cppexcept.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -50,7 +50,7 @@ int nested_trylevel, CONTEXT86 *context ); /* call a function with a given ebp */ -inline static void *call_ebp_func( void *func, void *ebp ) +__inline static void *call_ebp_func( void *func, void *ebp ) { void *ret; __asm__ __volatile__ ("pushl %%ebp; movl %2,%%ebp; call *%%eax; popl %%ebp" \ @@ -59,7 +59,7 @@ } /* call a copy constructor */ -inline static void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) +__inline static void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) { TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); if (has_vbase) @@ -72,7 +72,7 @@ } /* call the destructor of the exception object */ -inline static void call_dtor( void *func, void *object ) +__inline static void call_dtor( void *func, void *object ) { __asm__ __volatile__("call *%0" : : "r" (func), "c" (object) : "eax", "edx", "memory" ); } @@ -261,7 +261,7 @@ /* find and call the appropriate catch block for an exception */ /* returns the address to continue execution to after the catch block was called */ -inline static void *call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame *frame, +__inline static void *call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame *frame, cxx_function_descr *descr, int nested_trylevel, cxx_exception_type *info ) { _____ Modified: trunk/reactos/lib/crt/wine/scanf.c --- trunk/reactos/lib/crt/wine/scanf.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/wine/scanf.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -33,6 +33,8 @@ #include "winternl.h" #include "msvcrt.h" */ +#include "precomp.h" + #define WIN32_NO_STATUS #include <stdarg.h> _____ Modified: trunk/reactos/lib/crt/wstring/wcsdup.c --- trunk/reactos/lib/crt/wstring/wcsdup.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/wstring/wcsdup.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,3 +1,5 @@ +#include "precomp.h" + #include <errno.h> #include <stdlib.h> #include <string.h> _____ Modified: trunk/reactos/lib/crt/wstring/wcstok.c --- trunk/reactos/lib/crt/wstring/wcstok.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/wstring/wcstok.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,3 +1,5 @@ +#include "precomp.h" + #include <string.h> #include <internal/tls.h> _____ Modified: trunk/reactos/lib/crt/wstring/wlasttok.c --- trunk/reactos/lib/crt/wstring/wlasttok.c 2005-11-15 02:25:28 UTC (rev 19239) +++ trunk/reactos/lib/crt/wstring/wlasttok.c 2005-11-15 05:31:41 UTC (rev 19240) @@ -1,3 +1,5 @@ +#include "precomp.h" + #include <internal/tls.h> #include <assert.h> /*

1 0

[cwittich] 19239: fixed some resource leaks and 64bit issues
by cwittich＠svn.reactos.com 15 Nov '05

15 Nov '05

fixed some resource leaks and 64bit issues Modified: trunk/rosapps/tests/map_dup_inherit/map_dup_inherit.c _____ Modified: trunk/rosapps/tests/map_dup_inherit/map_dup_inherit.c --- trunk/rosapps/tests/map_dup_inherit/map_dup_inherit.c 2005-11-15 01:25:56 UTC (rev 19238) +++ trunk/rosapps/tests/map_dup_inherit/map_dup_inherit.c 2005-11-15 02:25:28 UTC (rev 19239) @@ -16,7 +16,11 @@ fprintf( stderr, "%lu: Starting\n", GetCurrentProcessId() ); if( argc == 2 ) { - file_map = (void *)atoi(argv[1]); + #ifdef WIN64 + file_map = (void *)atoi64(argv[1]); + #else + file_map = (void *)UlongToPtr(atoi(argv[1])); + #endif } else { file_map = CreateFileMapping( INVALID_HANDLE_VALUE, NULL, @@ -46,12 +50,16 @@ if( !file_view ) { fprintf( stderr, "%lu: Could not map view of file.\n", GetCurrentProcessId() ); + if (file_map != INVALID_HANDLE_VALUE) + CloseHandle(file_map); return 2; } if( !VirtualAlloc( file_view, 0x1000, MEM_COMMIT, PAGE_READWRITE ) ) { fprintf( stderr, "%lu: VirtualAlloc failed to realize the page.\n", GetCurrentProcessId() ); + if (file_map != INVALID_HANDLE_VALUE) + CloseHandle(file_map); return 3; } @@ -72,19 +80,30 @@ memset( &si, 0, sizeof( si ) ); memset( &pi, 0, sizeof( pi ) ); - sprintf(cmdline,"%s %d", argv[0], (int)file_map); + sprintf(cmdline,"%s %p", argv[0], file_map); + CloseHandle(file_map); + if( !CreateProcess(NULL, cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi ) ) { fprintf( stderr, "%lu: Could not create child process.\n", GetCurrentProcessId() ); + if (pi.hProcess != INVALID_HANDLE_VALUE) + CloseHandle(pi.hProcess); + return 5; } if( WaitForSingleObject( pi.hThread, INFINITE ) != WAIT_OBJECT_0 ) { fprintf( stderr, "%lu: Failed to wait for child process to terminate.\n", GetCurrentProcessId() ); + if (pi.hProcess != INVALID_HANDLE_VALUE) + CloseHandle(pi.hProcess); return 6; } + + if (pi.hProcess != INVALID_HANDLE_VALUE) + CloseHandle(pi.hProcess); + } return 0;

1 0

[cwittich] 19238: fixed resource leak (DestroyMenu before destroying main window)
by cwittich＠svn.reactos.com 15 Nov '05

15 Nov '05

fixed resource leak (DestroyMenu before destroying main window) fixed pointer cast warning -> UlongtoPtr (thx to Alex) Modified: trunk/rosapps/devutils/zoomin/framewnd.c Modified: trunk/rosapps/devutils/zoomin/main.c _____ Modified: trunk/rosapps/devutils/zoomin/framewnd.c --- trunk/rosapps/devutils/zoomin/framewnd.c 2005-11-15 00:33:28 UTC (rev 19237) +++ trunk/rosapps/devutils/zoomin/framewnd.c 2005-11-15 01:25:56 UTC (rev 19238) @@ -29,6 +29,7 @@ #include "main.h" #include "framewnd.h" +extern void ExitInstance(); //////////////////////////////////////////////////////////////////////// //////// // Global Variables: @@ -228,6 +229,7 @@ case WM_DESTROY: KillTimer(hWnd, 0); PostQuitMessage(0); + ExitInstance(); break; default: _____ Modified: trunk/rosapps/devutils/zoomin/main.c --- trunk/rosapps/devutils/zoomin/main.c 2005-11-15 00:33:28 UTC (rev 19237) +++ trunk/rosapps/devutils/zoomin/main.c 2005-11-15 01:25:56 UTC (rev 19238) @@ -68,7 +68,7 @@ hMenuFrame = LoadMenu(hInstance, MAKEINTRESOURCE(IDR_ZOOMIN_MENU)); - hFrameWnd = CreateWindowEx(0, (LPCTSTR)(int)hFrameWndClass, szTitle, + hFrameWnd = CreateWindowEx(0, (LPCTSTR)UlongToPtr(hFrameWndClass), szTitle, WS_OVERLAPPEDWINDOW | WS_EX_CLIENTEDGE | WS_VSCROLL, CW_USEDEFAULT, CW_USEDEFAULT, 250, 250, NULL, hMenuFrame, hInstance, NULL/*lpParam*/); @@ -90,7 +90,6 @@ DestroyMenu(hMenuFrame); } - int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, @@ -116,6 +115,5 @@ DispatchMessage(&msg); } } - ExitInstance(); return msg.wParam; }

1 0

[sedwards] 19237: add DNS_ERROR_INVALID_NAME
by sedwards＠svn.reactos.com 15 Nov '05

15 Nov '05

add DNS_ERROR_INVALID_NAME Modified: trunk/reactos/w32api/include/winerror.h _____ Modified: trunk/reactos/w32api/include/winerror.h --- trunk/reactos/w32api/include/winerror.h 2005-11-15 00:10:41 UTC (rev 19236) +++ trunk/reactos/w32api/include/winerror.h 2005-11-15 00:33:28 UTC (rev 19237) @@ -1510,6 +1510,7 @@ #define DNS_STATUS_FQDN 9557L #define DNS_STATUS_DOTTED_NAME 9558L #define DNS_STATUS_SINGLE_PART_NAME 9559L +#define DNS_ERROR_INVALID_NAME ERROR_INVALID_NAME #define DNS_ERROR_INVALID_NAME_CHAR 9560L #define DNS_ERROR_NUMERIC_NAME 9561L #define DNS_ERROR_NOT_ALLOWED_ON_ROOT_SERVER 9562L

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