Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[pschweitzer] 33549: Limit introduction string to 256 letters (no more, not less)
by pschweitzer＠svn.reactos.org 17 May '08

17 May '08

Author: pschweitzer Date: Sat May 17 04:45:13 2008 New Revision: 33549 URL: http://svn.reactos.org/svn/reactos?rev=33549&view=rev Log: Limit introduction string to 256 letters (no more, not less) Modified: trunk/rosapps/magnify/lang/fr-FR.rc Modified: trunk/rosapps/magnify/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/fr-FR.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/magnify/lang/fr-FR.rc [iso-8859-1] Sat May 17 04:45:13 2008 @@ -54,7 +54,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,193,76,50,14 ICON IDI_ICON,IDC_STATIC,7,17,20,20 - LTEXT "La loupe a été réalisée pour fournir un niveau minimum de fonctionnalités pour les utilisateurs souffrants de problèmes déficiences visuelles. La majorité de ces utilisateurs aura besoin d'un utilitaire d'agrandissement avec plus de fonctionnalités pour une utilisation quotidienne.",IDC_STATIC,36,7,207,33 + LTEXT "La loupe a été réalisée pour fournir quelques fonctionnalités aux utilisateurs souffrants de déficiences visuelles. La majorité de ces utilisateurs aura besoin d'un utilitaire d'agrandissement avec plus de fonctionnalités pour une utilisation quotidienne.",IDC_STATIC,36,7,207,33 CONTROL "Ne plus montrer ce message",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 END

1 0

[hpoussin] 33548: IDL headers should be dependencies, not libraries
by hpoussin＠svn.reactos.org 17 May '08

17 May '08

Author: hpoussin Date: Sat May 17 04:40:19 2008 New Revision: 33548 URL: http://svn.reactos.org/svn/reactos?rev=33548&view=rev Log: IDL headers should be dependencies, not libraries Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=33548&r1=… ============================================================================== --- trunk/tools/wineimport.cmd [iso-8859-1] (original) +++ trunk/tools/wineimport.cmd [iso-8859-1] Sat May 17 04:40:19 2008 @@ -190,7 +190,7 @@ FOR %%j IN (%WINE_IDL_GEN_I_SRCS%) DO ( SET WINE_SHORT_NAME=%%j SET WINE_SHORT_NAME=!WINE_SHORT_NAME:~0,-4! - ECHO ^<module name="%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_header" type="idlheader" allowwarnings="true"^> + ECHO ^<module name="%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_header" type="idlheader"^> ECHO ^<file^>%%j^</file^> ECHO ^</module^> ) @@ -246,7 +246,7 @@ ) ELSE IF "%WINE_VARTYPE%" == "4" ( SET WINE_SHORT_NAME=%%j SET WINE_SHORT_NAME=!WINE_SHORT_NAME:~0,-4! - SET WINE_LIBRARIES=%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_header !WINE_LIBRARIES! + SET WINE_DEPENDENCIES=%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_header !WINE_DEPENDENCIES! SET WINE_IDL_GEN_I_SRCS=!WINE_IDL_GEN_I_SRCS! %%j ) ELSE IF "%WINE_VARTYPE%" == "5" ( SET WINE_SHORT_NAME=%%j @@ -280,7 +280,7 @@ ) ELSE IF "%1" == "CTESTS" ( SET WINE_VARTYPE=1 ) ELSE IF "%1" == "IDL_H_SRCS" ( - SET WINE_VARTYPE=1 + SET WINE_VARTYPE=4 SET WINE_HAS_IDL=1 ) ELSE IF "%1" == "IDL_C_SRCS" ( SET WINE_VARTYPE=5

1 0

[cfinck] 33547: Make 100% sure that the correct "regedit.exe" is launched by using GetWindowsDirectory and appending "\regedit.exe" as suggested by Alex on ros-dev.
by cfinck＠svn.reactos.org 17 May '08

17 May '08

Author: cfinck Date: Sat May 17 04:39:36 2008 New Revision: 33547 URL: http://svn.reactos.org/svn/reactos?rev=33547&view=rev Log: Make 100% sure that the correct "regedit.exe" is launched by using GetWindowsDirectory and appending "\regedit.exe" as suggested by Alex on ros-dev. Modified: trunk/reactos/base/applications/regedt32/regedt32.c Modified: trunk/reactos/base/applications/regedt32/regedt32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… ============================================================================== --- trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] Sat May 17 04:39:36 2008 @@ -5,7 +5,12 @@ int WINAPI _tWinMain(HINSTANCE hCurInst, HINSTANCE hPrevInst, LPTSTR lpsCmdLine, int nCmdShow) { - ShellExecute(NULL, NULL, _T("regedit.exe"), lpsCmdLine, NULL, nCmdShow); + TCHAR szPath[MAX_PATH]; + + GetWindowsDirectory(szPath, MAX_PATH); + _tcscat(szPath, _T("\\regedit.exe")); + + ShellExecute(NULL, NULL, szPath, lpsCmdLine, NULL, nCmdShow); return 0; }

1 0

[cfinck] 33546: Revert the _T('x') to 'x' changes from my previous commit. Although both methods work properly, _T('x') seems to be the more convenient method used throughout cmd.
by cfinck＠svn.reactos.org 17 May '08

17 May '08

Author: cfinck Date: Sat May 17 04:23:21 2008 New Revision: 33546 URL: http://svn.reactos.org/svn/reactos?rev=33546&view=rev Log: Revert the _T('x') to 'x' changes from my previous commit. Although both methods work properly, _T('x') seems to be the more convenient method used throughout cmd. Modified: trunk/reactos/base/shell/cmd/internal.c Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] Sat May 17 04:23:21 2008 @@ -626,18 +626,18 @@ /* check for options anywhere in command line */ for (i = 0; i < args; i++) { - if (*arg[i] == '/') + if (*arg[i] == _T('/')) { /*found a command, but check to make sure it has something after it*/ if (_tcslen (arg[i]) == 2) { ch = _totupper (arg[i][1]); - if (ch == 'S') + if (ch == _T('S')) { RD_SUB = TRUE; } - else if (ch == 'Q') + else if (ch == _T('Q')) { RD_QUIET = TRUE; } @@ -650,7 +650,7 @@ } } - if (dir[0] == '\0') + if (dir[0] == _T('\0')) { /* No folder to remove */ ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING); @@ -661,8 +661,8 @@ GetFullPathName(dir,MAX_PATH,szFullPath,NULL); /* remove trailing \ if any, but ONLY if dir is not the root dir */ - if (_tcslen (szFullPath) >= 2 && szFullPath[_tcslen (szFullPath) - 1] == '\\') - szFullPath[_tcslen(szFullPath) - 1] = '\0'; + if (_tcslen (szFullPath) >= 2 && szFullPath[_tcslen (szFullPath) - 1] == _T('\\')) + szFullPath[_tcslen(szFullPath) - 1] = _T('\0'); if(RD_SUB) { @@ -702,7 +702,7 @@ FindClose (hFile); } /* reovme the \\* */ - szFullPath[_tcslen(szFullPath) - 2] = '\0'; + szFullPath[_tcslen(szFullPath) - 2] = _T('\0'); } if (!DeleteFolder(szFullPath))

1 0

[cfinck] 33545: - Fix some warnings spotted by MSVC - Define cmd_exit to ExitProcess if _DEBUG_MEM is not defined. Fixes compilation, when _DEBUG_MEM is turned off.
by cfinck＠svn.reactos.org 17 May '08

17 May '08

Author: cfinck Date: Sat May 17 03:49:39 2008 New Revision: 33545 URL: http://svn.reactos.org/svn/reactos?rev=33545&view=rev Log: - Fix some warnings spotted by MSVC - Define cmd_exit to ExitProcess if _DEBUG_MEM is not defined. Fixes compilation, when _DEBUG_MEM is turned off. Modified: trunk/reactos/base/shell/cmd/cmddbg.h trunk/reactos/base/shell/cmd/cmdinput.c trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/filecomp.c trunk/reactos/base/shell/cmd/internal.c Modified: trunk/reactos/base/shell/cmd/cmddbg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmddbg.h?re… ============================================================================== --- trunk/reactos/base/shell/cmd/cmddbg.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmddbg.h [iso-8859-1] Sat May 17 03:49:39 2008 @@ -31,5 +31,6 @@ #define cmd_free(ptr) free(ptr) #define cmd_dup(str) _tcsdup(str) #define cmd_checkbuffer(ptr) +#define cmd_exit(code) ExitProcess(code) #endif Modified: trunk/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdinput.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] Sat May 17 03:49:39 2008 @@ -518,7 +518,7 @@ else { LPCTSTR last = PeekHistory(-1); - if (last && charcount < _tcslen (last)) + if (last && charcount < (INT)_tcslen (last)) { PreviousChar = last[current]; ConOutChar(PreviousChar); Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Sat May 17 03:49:39 2008 @@ -1849,7 +1849,7 @@ prev_volume[0] = _T('\0'); - for(loop = 0; loop < entries; loop++) + for(loop = 0; loop < (UINT)entries; loop++) { if (CheckCtrlBreak(BREAK_INPUT)) { Modified: trunk/reactos/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/filecomp.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] Sat May 17 03:49:39 2008 @@ -483,8 +483,9 @@ } } - int __cdecl compare(const void *arg1,const void *arg2) - { + +int __cdecl compare(const void *arg1,const void *arg2) +{ FileName * File1; FileName * File2; INT ret; @@ -503,7 +504,7 @@ cmd_free(File1); cmd_free(File2); return ret; - } +} VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, UINT cusor) { Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] Sat May 17 03:49:39 2008 @@ -591,7 +591,7 @@ INT cmd_rmdir (LPTSTR cmd, LPTSTR param) { TCHAR dir[MAX_PATH]; /* pointer to the directory to change to */ - char ch; + TCHAR ch; INT args; LPTSTR *arg = NULL; INT i; @@ -622,20 +622,22 @@ } dir[0] = 0; + /* check for options anywhere in command line */ for (i = 0; i < args; i++) { - if (*arg[i] == _T('/')) + if (*arg[i] == '/') { /*found a command, but check to make sure it has something after it*/ if (_tcslen (arg[i]) == 2) { ch = _totupper (arg[i][1]); - if (ch == _T('S')) + + if (ch == 'S') { RD_SUB = TRUE; } - else if (ch == _T('Q')) + else if (ch == 'Q') { RD_QUIET = TRUE; } @@ -648,7 +650,7 @@ } } - if (dir[0] == _T('\0')) + if (dir[0] == '\0') { /* No folder to remove */ ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING); @@ -657,9 +659,10 @@ } GetFullPathName(dir,MAX_PATH,szFullPath,NULL); + /* remove trailing \ if any, but ONLY if dir is not the root dir */ - if (_tcslen (szFullPath) >= 2 && szFullPath[_tcslen (szFullPath) - 1] == _T('\\')) - szFullPath[_tcslen(szFullPath) - 1] = _T('\0'); + if (_tcslen (szFullPath) >= 2 && szFullPath[_tcslen (szFullPath) - 1] == '\\') + szFullPath[_tcslen(szFullPath) - 1] = '\0'; if(RD_SUB) { @@ -695,11 +698,11 @@ FindClose (hFile); nErrorLevel = 1; return 1; - }while (FindNextFile (hFile, &f)); + } while (FindNextFile (hFile, &f)); FindClose (hFile); } /* reovme the \\* */ - szFullPath[_tcslen(szFullPath) - 2] = _T('\0'); + szFullPath[_tcslen(szFullPath) - 2] = '\0'; } if (!DeleteFolder(szFullPath))

1 0

[pschweitzer] 33544: Apply the same fix to dwnl
by pschweitzer＠svn.reactos.org 17 May '08

17 May '08

Author: pschweitzer Date: Sat May 17 03:20:32 2008 New Revision: 33544 URL: http://svn.reactos.org/svn/reactos?rev=33544&view=rev Log: Apply the same fix to dwnl Modified: trunk/reactos/base/applications/network/dwnl/dwnl.c Modified: trunk/reactos/base/applications/network/dwnl/dwnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/dwnl/dwnl.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/dwnl/dwnl.c [iso-8859-1] Sat May 17 03:20:32 2008 @@ -304,11 +304,9 @@ { CBindStatusCallback *This; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); if (This == NULL) return NULL; - - ZeroMemory(This, sizeof(*This)); This->lpIBindStatusCallbackVtbl = &vtblIBindStatusCallback; This->ref = 1;

1 0

[pschweitzer] 33543: Zero memory using HeapAlloc flag Spotted by Stefan Ginsberg <stefan__100__@hotmail.com>
by pschweitzer＠svn.reactos.org 17 May '08

17 May '08

Author: pschweitzer Date: Sat May 17 03:19:23 2008 New Revision: 33543 URL: http://svn.reactos.org/svn/reactos?rev=33543&view=rev Log: Zero memory using HeapAlloc flag Spotted by Stefan Ginsberg <stefan__100__(a)hotmail.com> Modified: trunk/rosapps/downloader/download.c Modified: trunk/rosapps/downloader/download.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/download.c?rev=… ============================================================================== --- trunk/rosapps/downloader/download.c [iso-8859-1] (original) +++ trunk/rosapps/downloader/download.c [iso-8859-1] Sat May 17 03:19:23 2008 @@ -206,11 +206,10 @@ { IBindStatusCallbackImpl *This; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(IBindStatusCallbackImpl)); + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IBindStatusCallbackImpl)); if (!This) return NULL; - ZeroMemory(This, sizeof(IBindStatusCallbackImpl)); This->vtbl = &dlVtbl; This->ref = 1; This->hDialog = Dlg;

1 0

[cfinck] 33541: Carlo Bramini (carlo DOT bramix AT libero DOT it): - Implemented "regedt32", which just calls "regedit" See issue #3248 for more details.
by cfinck＠svn.reactos.org 17 May '08

17 May '08

Author: cfinck Date: Fri May 16 11:53:36 2008 New Revision: 33541 URL: http://svn.reactos.org/svn/reactos?rev=33541&view=rev Log: Carlo Bramini (carlo DOT bramix AT libero DOT it): - Implemented "regedt32", which just calls "regedit" See issue #3248 for more details. Added: trunk/reactos/base/applications/regedt32/ (with props) trunk/reactos/base/applications/regedt32/regedt32.c (with props) trunk/reactos/base/applications/regedt32/regedt32.rbuild (with props) trunk/reactos/base/applications/regedt32/res/ trunk/reactos/base/applications/regedt32/res/regedt32.ico (with props) trunk/reactos/base/applications/regedt32/resource.h (with props) trunk/reactos/base/applications/regedt32/resource.rc (with props) Modified: trunk/reactos/base/applications/applications.rbuild Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/applications.rbuild [iso-8859-1] Fri May 16 11:53:36 2008 @@ -26,9 +26,9 @@ <xi:include href="hh/hh.rbuild" /> </directory>  <directory name="kbswitch"> <xi:include href="kbswitch/kbswitch.rbuild" /> @@ -54,6 +54,9 @@ <directory name="regedit"> <xi:include href="regedit/regedit.rbuild" /> </directory> + <directory name="regedt32"> + <xi:include href="regedt32/regedt32.rbuild" /> + </directory> <directory name="sc"> <xi:include href="sc/sc.rbuild" /> </directory> Propchange: trunk/reactos/base/applications/regedt32/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri May 16 11:53:36 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Added: trunk/reactos/base/applications/regedt32/regedt32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… ============================================================================== --- trunk/reactos/base/applications/regedt32/regedt32.c (added) +++ trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] Fri May 16 11:53:36 2008 @@ -1,0 +1,11 @@ +#include <windows.h> +#include <tchar.h> +#include <shellapi.h> + +int WINAPI _tWinMain(HINSTANCE hCurInst, HINSTANCE hPrevInst, + LPTSTR lpsCmdLine, int nCmdShow) +{ + ShellExecute(NULL, NULL, _T("regedit.exe"), lpsCmdLine, NULL, nCmdShow); + + return 0; +} Propchange: trunk/reactos/base/applications/regedt32/regedt32.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/regedt32/regedt32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… ============================================================================== --- trunk/reactos/base/applications/regedt32/regedt32.rbuild (added) +++ trunk/reactos/base/applications/regedt32/regedt32.rbuild [iso-8859-1] Fri May 16 11:53:36 2008 @@ -1,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="regedt32" type="win32gui" installbase="system32" installname="regedt32.exe" unicode="yes"> + <include base="regedt32">.</include> + <library>kernel32</library> + <library>shell32</library> + <file>regedt32.c</file> + <file>resource.rc</file> +</module> Propchange: trunk/reactos/base/applications/regedt32/regedt32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/regedt32/res/regedt32.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/regedt32/res/regedt32.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/regedt32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… ============================================================================== --- trunk/reactos/base/applications/regedt32/resource.h (added) +++ trunk/reactos/base/applications/regedt32/resource.h [iso-8859-1] Fri May 16 11:53:36 2008 @@ -1,0 +1,1 @@ +#define IDI_REGEDIT 101 Propchange: trunk/reactos/base/applications/regedt32/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/regedt32/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… ============================================================================== --- trunk/reactos/base/applications/regedt32/resource.rc (added) +++ trunk/reactos/base/applications/regedt32/resource.rc [iso-8859-1] Fri May 16 11:53:36 2008 @@ -1,0 +1,33 @@ +/* + * Regedit-32 resources + * + * Copyright 2008 Carlo Bramini + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * 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 <windows.h> +#include "resource.h" + +// Common resources + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Registry Explorer\0" +#define REACTOS_STR_INTERNAL_NAME "regedt32\0" +#define REACTOS_STR_ORIGINAL_FILENAME "regedt32.exe\0" +#include <reactos/version.rc> + +IDI_REGEDIT ICON DISCARDABLE res/regedt32.ico Propchange: trunk/reactos/base/applications/regedt32/resource.rc ------------------------------------------------------------------------------ svn:eol-style = native

2 1

[hpoussin] 33542: Remove IRP_MJ_QUERY_INFORMATION / FileNetworkOpenInformation Fix misc bugs
by hpoussin＠svn.reactos.org 16 May '08

16 May '08

Author: hpoussin Date: Fri May 16 14:00:47 2008 New Revision: 33542 URL: http://svn.reactos.org/svn/reactos?rev=33542&view=rev Log: Remove IRP_MJ_QUERY_INFORMATION / FileNetworkOpenInformation Fix misc bugs Modified: trunk/reactos/drivers/serial/serial/info.c trunk/reactos/drivers/serial/serial/pnp.c trunk/reactos/drivers/serial/serial/rw.c Modified: trunk/reactos/drivers/serial/serial/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/info… ============================================================================== --- trunk/reactos/drivers/serial/serial/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serial/info.c [iso-8859-1] Fri May 16 14:00:47 2008 @@ -68,26 +68,6 @@ } break; } - case FileNetworkOpenInformation: - { - PFILE_NETWORK_OPEN_INFORMATION NetworkOpenInfo = (PFILE_NETWORK_OPEN_INFORMATION)SystemBuffer; - - ASSERT(NetworkOpenInfo); - - TRACE_(SERIAL, "IRP_MJ_QUERY_INFORMATION / FileNetworkInformation\n"); - DbgBreakPoint(); - if (BufferLength < sizeof(FILE_NETWORK_OPEN_INFORMATION)) - Status = STATUS_BUFFER_OVERFLOW; - else if (!NetworkOpenInfo) - Status = STATUS_INVALID_PARAMETER; - else - { - RtlZeroMemory(NetworkOpenInfo, sizeof(FILE_NETWORK_OPEN_INFORMATION)); - Information = sizeof(FILE_NETWORK_OPEN_INFORMATION); - Status = STATUS_SUCCESS; - } - break; - } default: { TRACE_(SERIAL, "IRP_MJ_QUERY_INFORMATION: Unexpected file information class 0x%02x\n", Stack->Parameters.QueryFile.FileInformationClass); Modified: trunk/reactos/drivers/serial/serial/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/pnp.… ============================================================================== --- trunk/reactos/drivers/serial/serial/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serial/pnp.c [iso-8859-1] Fri May 16 14:00:47 2008 @@ -90,6 +90,11 @@ Fdo->Flags |= DO_BUFFERED_IO; if (DeviceExtension->LowerDevice->Flags & DO_DIRECT_IO) Fdo->Flags |= DO_DIRECT_IO; + + /* Choose default strategy */ + if ((Fdo->Flags & (DO_BUFFERED_IO | DO_DIRECT_IO)) == 0) + Fdo->Flags |= DO_BUFFERED_IO; + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; if (pFdo) { Modified: trunk/reactos/drivers/serial/serial/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/rw.c… ============================================================================== --- trunk/reactos/drivers/serial/serial/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serial/rw.c [iso-8859-1] Fri May 16 14:00:47 2008 @@ -16,7 +16,10 @@ { ASSERT(Irp); - return Irp->AssociatedIrp.SystemBuffer; + if (Irp->MdlAddress) + return Irp->MdlAddress; + else + return Irp->AssociatedIrp.SystemBuffer; } static VOID

1 0

[pschweitzer] 33540: Check if memory was goodly allocated and zero it before use
by pschweitzer＠svn.reactos.org 16 May '08

16 May '08

Author: pschweitzer Date: Fri May 16 11:13:04 2008 New Revision: 33540 URL: http://svn.reactos.org/svn/reactos?rev=33540&view=rev Log: Check if memory was goodly allocated and zero it before use Modified: trunk/rosapps/downloader/download.c Modified: trunk/rosapps/downloader/download.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/download.c?rev=… ============================================================================== --- trunk/rosapps/downloader/download.c [iso-8859-1] (original) +++ trunk/rosapps/downloader/download.c [iso-8859-1] Fri May 16 11:13:04 2008 @@ -207,6 +207,10 @@ IBindStatusCallbackImpl *This; This = HeapAlloc(GetProcessHeap(), 0, sizeof(IBindStatusCallbackImpl)); + if (!This) + return NULL; + + ZeroMemory(This, sizeof(IBindStatusCallbackImpl)); This->vtbl = &dlVtbl; This->ref = 1; This->hDialog = Dlg;

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
59
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 May 2008