Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[royce] 18549: msvc6 compilation fixes
by royce＠svn.reactos.com 18 Oct '05

18 Oct '05

msvc6 compilation fixes fix buffer over(under?)flow in calc_sep() Modified: trunk/reactos/subsys/system/calc/winecalc.c _____ Modified: trunk/reactos/subsys/system/calc/winecalc.c --- trunk/reactos/subsys/system/calc/winecalc.c 2005-10-18 03:12:49 UTC (rev 18548) +++ trunk/reactos/subsys/system/calc/winecalc.c 2005-10-18 04:15:55 UTC (rev 18549) @@ -470,7 +470,7 @@ int len; TCHAR *s; HGLOBAL hGlobalMemory; - PSTR pGlobalMemory; + LPTSTR pGlobalMemory; if (!(len = _tcslen(calc.display))) return 0; @@ -506,10 +506,10 @@ case TEXT('\x16'): // Ctrl+V Paste { TCHAR *s; - int c; + TCHAR c; int cmd = 0; - int size = 0; - int i = 0; + size_t size = 0; + size_t i = 0; HGLOBAL hGlobalMemory; LPTSTR pGlobalMemory; @@ -3082,7 +3082,7 @@ r[i++] = c; if (x++ % 3 == 0) r[i++] = TEXT(','); - if (n == -1) + if (n == 0) break; }

1 0

[turner] 18548: remove some more __REACTOS__ checks. We dont need our GetConsoleWindow and it was never used. The size of CMD_LENGTH is the same for both and at some point will not longer be used once we have all dynamic allocations.
by turner＠svn.reactos.com 18 Oct '05

18 Oct '05

remove some more __REACTOS__ checks. We dont need our GetConsoleWindow and it was never used. The size of CMD_LENGTH is the same for both and at some point will not longer be used once we have all dynamic allocations. Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/misc.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-10-18 01:55:20 UTC (rev 18547) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-10-18 03:12:49 UTC (rev 18548) @@ -43,12 +43,7 @@ /* command line buffer length */ -#ifdef __REACTOS__ #define CMDLINE_LENGTH 8192 -#else -#define CMDLINE_LENGTH 8192 -//#define CMDLINE_LENGTH 1024 -#endif /* global variables */ extern HANDLE hOut; @@ -305,9 +300,6 @@ BOOL IsExistingFile (LPCTSTR); BOOL IsExistingDirectory (LPCTSTR); BOOL FileGetString (HANDLE, LPTSTR, INT); -#ifndef __REACTOS__ -HWND GetConsoleWindow(VOID); -#endif #define PROMPT_NO 0 #define PROMPT_YES 1 _____ Modified: trunk/reactos/subsys/system/cmd/misc.c --- trunk/reactos/subsys/system/cmd/misc.c 2005-10-18 01:55:20 UTC (rev 18547) +++ trunk/reactos/subsys/system/cmd/misc.c 2005-10-18 03:12:49 UTC (rev 18548) @@ -400,40 +400,6 @@ return TRUE; } -#ifndef __REACTOS__ -/* - * GetConsoleWindow - returns the handle to the current console window - */ -HWND GetConsoleWindow (VOID) -{ - TCHAR original[256]; - TCHAR temp[256]; - HWND h=0; - - if(h) - return h; - - GetConsoleTitle (original, sizeof(original) / sizeof(TCHAR)); - - _tcscpy (temp, original); - _tcscat (temp, _T("-xxx ")); - - if (FindWindow (0, temp) == NULL ) - { - SetConsoleTitle (temp); - Sleep (0); - - while(!(h = FindWindow (0, temp))) - ; - - SetConsoleTitle (original); - } - - return h; -} -#endif - - INT PagePrompt (VOID) { INPUT_RECORD ir;

1 0

[turner] 18547: Remove the check for __REACTOS__. FormatMessage works better and is implemented in ros.
by turner＠svn.reactos.com 18 Oct '05

18 Oct '05

Remove the check for __REACTOS__. FormatMessage works better and is implemented in ros. Modified: trunk/reactos/subsys/system/cmd/error.c _____ Modified: trunk/reactos/subsys/system/cmd/error.c --- trunk/reactos/subsys/system/cmd/error.c 2005-10-18 00:01:16 UTC (rev 18546) +++ trunk/reactos/subsys/system/cmd/error.c 2005-10-18 01:55:20 UTC (rev 18547) @@ -28,9 +28,7 @@ { TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMessage[1024]; -#ifndef __REACTOS__ LPTSTR szError; -#endif va_list arg_ptr; if (dwErrorCode == ERROR_SUCCESS) @@ -45,50 +43,21 @@ va_end (arg_ptr); } -#ifndef __REACTOS__ - if (FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&szError, 0, NULL)) { ConErrPrintf (_T("%s %s\n"), szError, szMessage); - LocalFree (szError); + if(szError) + LocalFree (szError); return; } - else - { - LoadString(CMD_ModuleHandle, STRING_ERROR_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, dwErrorCode); - return; - } -#else - - switch (dwErrorCode) - { - case ERROR_FILE_NOT_FOUND: - LoadString(CMD_ModuleHandle, STRING_ERROR_FILE_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE); - break; - - case ERROR_PATH_NOT_FOUND: - LoadString(CMD_ModuleHandle, STRING_ERROR_PATH_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE); - break; - - case ERROR_NOT_READY: - LoadString(CMD_ModuleHandle, STRING_ERROR_DRIVER_NOT_READY, szMsg, RC_STRING_MAX_SIZE); - break; - - default: - LoadString(CMD_ModuleHandle, STRING_ERROR_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg); - return; - } - + /* Fall back just in case the error is not defined */ if (szFormat) - ConOutPrintf (_T("%s -- %s\n"), szMsg, szMessage); + ConErrPrintf (_T("%s -- %s\n"), szMsg, szMessage); else - ConOutPrintf (_T("%s\n"), szMsg); -#endif + ConErrPrintf (_T("%s\n"), szMsg); } VOID error_parameter_format(TCHAR ch)

1 0

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

18 Oct '05

set eol-style:native Property changes on: trunk/reactos/subsys/system/dhcp/dhcp.rc ___________________________________________________________________ Name: svn:eol-style + native

1 0

[cwittich] 18545: fixed compiling with msvc
by cwittich＠svn.reactos.com 18 Oct '05

18 Oct '05

fixed compiling with msvc Modified: trunk/reactos/subsys/system/dhcp/include/dhcpd.h Modified: trunk/reactos/subsys/system/dhcp/include/rosdhcp.h Modified: trunk/reactos/subsys/system/dhcp/util.c _____ Modified: trunk/reactos/subsys/system/dhcp/include/dhcpd.h --- trunk/reactos/subsys/system/dhcp/include/dhcpd.h 2005-10-17 23:38:24 UTC (rev 18544) +++ trunk/reactos/subsys/system/dhcp/include/dhcpd.h 2005-10-18 00:00:27 UTC (rev 18545) @@ -42,20 +42,31 @@ #ifndef DHCPD_H #define DHCPD_H +#if defined (_MSC_VER) +#pragma warning( once : 4103 ) +#endif + +#if !defined(ssize_t) +#define ssize_t long +#endif + #include <winsock2.h> #include <iphlpapi.h> -#include "stdint.h" +#include <stdint.h> #define IFNAMSIZ MAX_INTERFACE_NAME_LEN #define ETH_ALEN 6 #define ETHER_ADDR_LEN ETH_ALEN + +#include <pshpack1.h> struct ether_header { u_int8_t ether_dhost[ETH_ALEN]; /* destination eth addr */ u_int8_t ether_shost[ETH_ALEN]; /* source ether addr */ u_int16_t ether_type; /* packet type ID field */ -} __attribute__ ((__packed__)); +} ; +#include <poppack.h> struct ip { @@ -92,9 +103,17 @@ #define USE_SOCKET_RECEIVE #define USE_SOCKET_SEND +#if defined (_MSC_VER) +#include <types.h> +#include <stat.h> +#include <time.h> +#include <stddef.h> +#else #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> +#endif + #include <ctype.h> #include <errno.h> #include <fcntl.h> @@ -286,12 +305,14 @@ int, unsigned int, struct iaddr, struct hardware *); /* errwarn.c */ +#if defined (__GNUC__) extern int warnings_occurred; void error(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2))); int warning(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2))); int note(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2))); int debug(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2))); int parse_warn(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2))); +#endif /* conflex.c */ extern int lexline, lexchar; _____ Modified: trunk/reactos/subsys/system/dhcp/include/rosdhcp.h --- trunk/reactos/subsys/system/dhcp/include/rosdhcp.h 2005-10-17 23:38:24 UTC (rev 18544) +++ trunk/reactos/subsys/system/dhcp/include/rosdhcp.h 2005-10-18 00:00:27 UTC (rev 18545) @@ -32,7 +32,14 @@ #define TIME uintTIME #include "dhcpd.h" +#if (_MSC_VER < 900) || defined(__STDC__) +#define inline +#else +#define inline __inline +#endif + #define INLINE inline + #define PROTO(x) x typedef void (*handler_t) PROTO ((struct packet *)); _____ Modified: trunk/reactos/subsys/system/dhcp/util.c --- trunk/reactos/subsys/system/dhcp/util.c 2005-10-17 23:38:24 UTC (rev 18544) +++ trunk/reactos/subsys/system/dhcp/util.c 2005-10-18 00:00:27 UTC (rev 18545) @@ -10,6 +10,8 @@ return inet_ntoa( sa.sin_addr ); } +#if defined (__GNUC__) + int note( char *format, ... ) { va_list arg_begin; va_start( arg_begin, format ); @@ -72,6 +74,8 @@ DPRINT1("ERROR: %s\n", buf); } +#endif + int16_t getShort( unsigned char *data ) { return (int16_t) ntohs(*(int16_t*) data); }

1 0

[cwittich] 18544: fix some bugs in regedit
by cwittich＠svn.reactos.com 17 Oct '05

17 Oct '05

fix some bugs in regedit like alloca -> HeapAlloc + HeapFree Modified: trunk/reactos/subsys/system/regedit/regproc.c Modified: trunk/reactos/subsys/system/regedit/security.c _____ Modified: trunk/reactos/subsys/system/regedit/regproc.c --- trunk/reactos/subsys/system/regedit/regproc.c 2005-10-17 22:40:24 UTC (rev 18543) +++ trunk/reactos/subsys/system/regedit/regproc.c 2005-10-17 23:38:24 UTC (rev 18544) @@ -1620,17 +1620,26 @@ { LPCTSTR s; LPTSTR lpNewSubKey; + LONG Ret = 0; s = _tcsrchr(lpSubKey, '\\'); if (s) { s++; - lpNewSubKey = (LPTSTR) alloca((s - lpSubKey + _tcslen(lpNewName) + 1) * sizeof(TCHAR)); - memcpy(lpNewSubKey, lpSubKey, (s - lpSubKey) * sizeof(TCHAR)); - _tcscpy(lpNewSubKey + (s - lpSubKey), lpNewName); - lpNewName = lpNewSubKey; + lpNewSubKey = (LPTSTR) HeapAlloc(GetProcessHeap(), 0, (s - lpSubKey + _tcslen(lpNewName) + 1) * sizeof(TCHAR)); + if (lpNewName != NULL) { + memcpy(lpNewSubKey, lpSubKey, (s - lpSubKey) * sizeof(TCHAR)); + _tcscpy(lpNewSubKey + (s - lpSubKey), lpNewName); + lpNewName = lpNewSubKey; + } } - return RegMoveKey(hKey, lpNewName, hKey, lpSubKey); + if (lpNewName != NULL) { + Ret = RegMoveKey(hKey, lpNewName, hKey, lpSubKey); + if (s) { + HeapFree(GetProcessHeap(), 0, lpNewSubKey); + } + } + return Ret; } LONG RegRenameValue(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpDestValue, LPCTSTR lpSrcValue) _____ Modified: trunk/reactos/subsys/system/regedit/security.c --- trunk/reactos/subsys/system/regedit/security.c 2005-10-17 22:40:24 UTC (rev 18543) +++ trunk/reactos/subsys/system/regedit/security.c 2005-10-17 23:38:24 UTC (rev 18544) @@ -295,7 +295,7 @@ LPCTSTR lpMachine, LPCTSTR lpKeyName) { - BOOL Result; + BOOL Result = FALSE; LPWSTR Machine, KeyName; HKEY hInfoKey; LPREGKEYSECURITY RegKeySecurity;

1 0

[hbirr] 18543: Merged r17748,17750,17752 from trunk.
by hbirr＠svn.reactos.com 17 Oct '05

17 Oct '05

Merged r17748,17750,17752 from trunk. Modified: branches/cache_manager_rewrite/reactos/lib/shell32/cpanelfolder.c Modified: branches/cache_manager_rewrite/reactos/lib/shell32/shlexec.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/lpc/send.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/api/wapi.c _____ Modified: branches/cache_manager_rewrite/reactos/lib/shell32/cpanelfolder.c --- branches/cache_manager_rewrite/reactos/lib/shell32/cpanelfolder.c 2005-10-17 22:27:49 UTC (rev 18542) +++ branches/cache_manager_rewrite/reactos/lib/shell32/cpanelfolder.c 2005-10-17 22:40:24 UTC (rev 18543) @@ -970,6 +970,7 @@ SHELLEXECUTEINFOW sei_tmp; PIDLCPanelStruct* pcpanel; WCHAR path[MAX_PATH]; + WCHAR params[MAX_PATH]; BOOL ret; int l; @@ -990,12 +991,13 @@ /* pass applet name to Control_RunDLL to distinguish between applets in one .cpl file */ path[l++] = '"'; - path[l++] = ' '; + path[l] = '\0'; - MultiByteToWideChar(CP_ACP, 0, pcpanel->szName+pcpanel->offsDispName, -1, path+l, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, pcpanel->szName+pcpanel->offsDispName, -1, params, MAX_PATH); memcpy(&sei_tmp, psei, sizeof(sei_tmp)); sei_tmp.lpFile = path; + sei_tmp.lpParameters = params; sei_tmp.fMask &= ~SEE_MASK_INVOKEIDLIST; sei_tmp.lpVerb = wCplopen; _____ Modified: branches/cache_manager_rewrite/reactos/lib/shell32/shlexec.c --- branches/cache_manager_rewrite/reactos/lib/shell32/shlexec.c 2005-10-17 22:27:49 UTC (rev 18542) +++ branches/cache_manager_rewrite/reactos/lib/shell32/shlexec.c 2005-10-17 22:40:24 UTC (rev 18543) @@ -1263,9 +1263,10 @@ lpFile = wfileName; + strcpyW(wcmd, wszApplicationName); if (sei_tmp.lpParameters[0]) { - strcatW(wszApplicationName, wSpace); - strcatW(wszApplicationName, wszParameters); + strcatW(wcmd, wSpace); + strcatW(wcmd, wszParameters); } /* We set the default to open, and that should generally work. @@ -1273,7 +1274,7 @@ if (!sei_tmp.lpVerb) sei_tmp.lpVerb = wszOpen; - retval = execfunc(wszApplicationName, NULL, FALSE, &sei_tmp, sei); + retval = execfunc(wcmd, NULL, FALSE, &sei_tmp, sei); if (retval > 32) return TRUE; _____ Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/lpc/send.c --- branches/cache_manager_rewrite/reactos/ntoskrnl/lpc/send.c 2005-10-17 22:27:49 UTC (rev 18542) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/lpc/send.c 2005-10-17 22:40:24 UTC (rev 18543) @@ -38,6 +38,8 @@ #ifdef __USE_NT_LPC__ Msg.h.u2.s2.Type = LPC_CLIENT_DIED; #endif + Msg.h.u1.s1.TotalLength = sizeof(Msg); + Msg.h.u1.s1.DataLength = sizeof(Msg) - sizeof(PORT_MESSAGE); Msg.CreateTime = CreateTime; Status = LpcRequestPort (Port, &Msg.h); return(Status); _____ Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/api/wapi.c --- branches/cache_manager_rewrite/reactos/subsys/csrss/api/wapi.c 2005-10-17 22:27:49 UTC (rev 18542) +++ branches/cache_manager_rewrite/reactos/subsys/csrss/api/wapi.c 2005-10-17 22:40:24 UTC (rev 18543) @@ -177,7 +177,8 @@ ServerApiPortThread (PVOID PortHandle) { NTSTATUS Status = STATUS_SUCCESS; - PORT_MESSAGE Request; + BYTE RawRequest[sizeof(PORT_MESSAGE) + sizeof(CSR_CONNECTION_INFO)]; + PPORT_MESSAGE Request = (PPORT_MESSAGE)RawRequest; HANDLE hApiListenPort = * (PHANDLE) PortHandle; HANDLE ServerPort = (HANDLE) 0; HANDLE ServerThread = (HANDLE) 0; @@ -192,10 +193,10 @@ REMOTE_PORT_VIEW LpcRead; ServerPort = NULL; - Status = NtListenPort (hApiListenPort, &Request); + Status = NtListenPort (hApiListenPort, Request); if (!NT_SUCCESS(Status)) { - DPRINT1("CSR: NtListenPort() failed\n"); + DPRINT1("CSR: NtListenPort() failed, status=%x\n", Status); break; } Status = NtAcceptConnectPort(& ServerPort, @@ -210,11 +211,11 @@ break; } - ProcessData = CsrCreateProcessData(Request.ClientId.UniqueProcess); + ProcessData = CsrCreateProcessData(Request->ClientId.UniqueProcess); if (ProcessData == NULL) { DPRINT1("Unable to allocate or find data for process 0x%x\n", - Request.ClientId.UniqueProcess); + Request->ClientId.UniqueProcess); Status = STATUS_UNSUCCESSFUL; break; }

1 0

[hbirr] 18542: Merging over the usb changes didn't work. I must delete and copy the changes manually. Copying r17764 of the usb driver.
by hbirr＠svn.reactos.com 17 Oct '05

17 Oct '05

Merging over the usb changes didn't work. I must delete and copy the changes manually. Copying r17764 of the usb driver. Added: branches/cache_manager_rewrite/reactos/drivers/usb/ _____ Copied: branches/cache_manager_rewrite/reactos/drivers/usb (from rev 17754, trunk/reactos/drivers/usb)

1 0

[hbirr] 18541: Merging over the usb changes didn't work. I must delete and copy the changes manually.
by hbirr＠svn.reactos.com 17 Oct '05

17 Oct '05

Merging over the usb changes didn't work. I must delete and copy the changes manually. Deleted: branches/cache_manager_rewrite/reactos/drivers/usb/

1 0

[weiden] 18540: fix incorrect usage of alloca and a buffer overflow
by weiden＠svn.reactos.com 17 Oct '05

17 Oct '05

fix incorrect usage of alloca and a buffer overflow Modified: trunk/reactos/tools/nci/ncitool.c _____ Modified: trunk/reactos/tools/nci/ncitool.c --- trunk/reactos/tools/nci/ncitool.c 2005-10-17 22:17:53 UTC (rev 18539) +++ trunk/reactos/tools/nci/ncitool.c 2005-10-17 22:18:14 UTC (rev 18540) @@ -327,7 +327,6 @@ { char Line[INPUT_BUFFER_SIZE]; char *NtSyscallName; - char *ZwSyscallName = NULL; char *SyscallArguments; int SyscallId; unsigned StackBytes; @@ -344,14 +343,6 @@ /* Make sure we really extracted something */ if (NtSyscallName) { - - /* Create the ZwXXX name, if requested */ - if (NeedsZw) { - ZwSyscallName = alloca(strlen(NtSyscallName)); - strcpy(ZwSyscallName, NtSyscallName); - ZwSyscallName[0] = 'Z'; - ZwSyscallName[1] = 'w'; - } /* Create Usermode Stubs for Nt/Zw syscalls in each Usermode file */ int i; @@ -364,18 +355,28 @@ SyscallId | Index); /* If a Zw Version is needed (was specified), write it too */ - if (ZwSyscallName) WriteUserModeStub(UserModeFiles[i], - ZwSyscallName, - StackBytes, - SyscallId | Index); + if (NeedsZw) { + NtSyscallName[0] = 'Z'; + NtSyscallName[1] = 'w'; + WriteUserModeStub(UserModeFiles[i], + NtSyscallName, + StackBytes, + SyscallId | Index); + } + } /* Create the Kernel coutnerparts (only Zw*, Nt* are the real functions!) */ - if (KernelModeFile) WriteKernelModeStub(KernelModeFile, - ZwSyscallName, - StackBytes, - SyscallId | Index); + if (KernelModeFile) { + + NtSyscallName[0] = 'Z'; + NtSyscallName[1] = 'w'; + WriteKernelModeStub(KernelModeFile, + NtSyscallName, + StackBytes, + SyscallId | Index); + } /* Only increase if we actually added something */ SyscallId++;

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005