Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[turner] 20733: Check for NULL char and not '\' ;)

by turner＠svn.reactos.org

Check for NULL char and not '\' ;) Modified: trunk/reactos/subsys/system/cmd/misc.c _____ Modified: trunk/reactos/subsys/system/cmd/misc.c --- trunk/reactos/subsys/system/cmd/misc.c 2006-01-08 21:26:17 UTC (rev 20732) +++ trunk/reactos/subsys/system/cmd/misc.c 2006-01-08 21:26:34 UTC (rev 20733) @@ -372,7 +372,7 @@ { /* Check to make sure if there is no ending " * we dont run over the null char */ - if(*s != _T('/')) + if(*s == _T('\0')) { break; }

18 years, 8 months

[ion] 20732: - Forgot this file for msvc build

by ion＠svn.reactos.org

- Forgot this file for msvc build Modified: trunk/reactos/include/subsys/lsass/lsass.h _____ Modified: trunk/reactos/include/subsys/lsass/lsass.h --- trunk/reactos/include/subsys/lsass/lsass.h 2006-01-08 21:17:40 UTC (rev 20731) +++ trunk/reactos/include/subsys/lsass/lsass.h 2006-01-08 21:26:17 UTC (rev 20732) @@ -35,11 +35,13 @@ typedef struct _LSASS_DEREGISTER_LOGON_PROCESS_REQUEST { + ULONG Dummy; } LSASS_DEREGISTER_LOGON_PROCESS_REQUEST, *PLSASS_DEREGISTER_LOGON_PROCES_REQUEST; typedef struct _LSASS_DEREGISTER_LOGON_PROCESS_REPLY -{ +{ + ULONG Dummy; } LSASS_DEREGISTER_LOGON_PROCESS_REPLY, *PLSASS_DEREGISTER_LOGON_PROCESS_REPLY;

18 years, 8 months

[turner] 20731: Check to see if we are at the end of the string even if there isnt a " there.

by turner＠svn.reactos.org

Check to see if we are at the end of the string even if there isnt a " there. Modified: trunk/reactos/subsys/system/cmd/misc.c _____ Modified: trunk/reactos/subsys/system/cmd/misc.c --- trunk/reactos/subsys/system/cmd/misc.c 2006-01-08 21:09:00 UTC (rev 20730) +++ trunk/reactos/subsys/system/cmd/misc.c 2006-01-08 21:17:40 UTC (rev 20731) @@ -370,6 +370,12 @@ /* adjust string pointer if quoted (") */ if (bQuoted) { + /* Check to make sure if there is no ending " + * we dont run over the null char */ + if(*s != _T('/')) + { + break; + } ++s; bQuoted = FALSE; }

18 years, 8 months

[frik85] 20730: altered several year numbers from "2005" to "2006"

by frik85＠svn.reactos.org

altered several year numbers from "2005" to "2006" Modified: trunk/reactos/include/reactos/resource.h Modified: trunk/reactos/include/reactos/version.rc Modified: trunk/reactos/lib/freetype/freetype.rc Modified: trunk/reactos/lib/shell32/authors.c Modified: trunk/reactos/subsys/system/cmd/cmd.rc _____ Modified: trunk/reactos/include/reactos/resource.h --- trunk/reactos/include/reactos/resource.h 2006-01-08 20:50:08 UTC (rev 20729) +++ trunk/reactos/include/reactos/resource.h 2006-01-08 21:09:00 UTC (rev 20730) @@ -22,7 +22,7 @@ /* Common version strings for rc scripts */ #define RES_STR_COMPANY_NAME "ReactOS Development Team\0" -#define RES_STR_LEGAL_COPYRIGHT "Copyright (c) 1998-2005 ReactOS Team\0" +#define RES_STR_LEGAL_COPYRIGHT "Copyright (c) 1998-2006 ReactOS Team\0" #define RES_STR_PRODUCT_NAME "ReactOS Operating System\0" #define RES_STR_PRODUCT_VERSION KERNEL_VERSION_RC #define RES_STR_BUILD_DATE KERNEL_VERSION_BUILD_RC _____ Modified: trunk/reactos/include/reactos/version.rc --- trunk/reactos/include/reactos/version.rc 2006-01-08 20:50:08 UTC (rev 20729) +++ trunk/reactos/include/reactos/version.rc 2006-01-08 21:09:00 UTC (rev 20730) @@ -78,7 +78,7 @@ #endif /* REACTOS_STR_INTERNAL_NAME */ #ifndef REACTOS_STR_LEGAL_COPYRIGHT -#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-2005 ReactOS Team\0" +#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-2006 ReactOS Team\0" #endif /* REACTOS_STR_LEGAL_COPYRIGHT */ #ifndef REACTOS_STR_ORIGINAL_FILENAME _____ Modified: trunk/reactos/lib/freetype/freetype.rc --- trunk/reactos/lib/freetype/freetype.rc 2006-01-08 20:50:08 UTC (rev 20729) +++ trunk/reactos/lib/freetype/freetype.rc 2006-01-08 21:09:00 UTC (rev 20730) @@ -3,6 +3,6 @@ #define REACTOS_STR_INTERNAL_NAME "freetype\0" #define REACTOS_STR_ORIGINAL_FILENAME "freetype.dll\0" #define REACTOS_STR_COMPANY_NAME "ReactOS Development Team/FreeType Team\0" -#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-2005 ReactOS Team\0" -#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright 1996-2005 FreeType Team\0" +#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-2006 ReactOS Team\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright 1996-2006 FreeType Team\0" #include <reactos/version.rc> _____ Modified: trunk/reactos/lib/shell32/authors.c --- trunk/reactos/lib/shell32/authors.c 2006-01-08 20:50:08 UTC (rev 20729) +++ trunk/reactos/lib/shell32/authors.c 2006-01-08 21:09:00 UTC (rev 20730) @@ -1 +1 @@ -const char * const SHELL_Authors[] = { "Copyright 1993-2005 WINE team", "Copyright 1998-2005 ReactOS Team", 0 }; +const char * const SHELL_Authors[] = { "Copyright 1993-2006 WINE team", "Copyright 1998-2006 ReactOS Team", 0 }; _____ Modified: trunk/reactos/subsys/system/cmd/cmd.rc --- trunk/reactos/subsys/system/cmd/cmd.rc 2006-01-08 20:50:08 UTC (rev 20729) +++ trunk/reactos/subsys/system/cmd/cmd.rc 2006-01-08 21:09:00 UTC (rev 20730) @@ -5,7 +5,7 @@ #define REACTOS_STR_INTERNAL_NAME "cmd\0" #define REACTOS_STR_ORIGINAL_FILENAME "cmd.exe\0" #define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright (C) 1994-1998 Tim Norman and others\0" -#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright (C) 1998-2005 Eric Kohl and others\0" +#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright (C) 1998-2006 Eric Kohl and others\0" #include <reactos/version.rc> #include "En.rc"

18 years, 8 months

[gvg] 20729: - Scream a little louder about unimplemented IOCTL codes

by gvg＠svn.reactos.org

- Scream a little louder about unimplemented IOCTL codes - Work around missing FSCTL_PIPE_TRANSCEIVE implementation Modified: trunk/reactos/drivers/fs/np/fsctrl.c Modified: trunk/reactos/lib/kernel32/file/npipe.c _____ Modified: trunk/reactos/drivers/fs/np/fsctrl.c --- trunk/reactos/drivers/fs/np/fsctrl.c 2006-01-08 20:33:14 UTC (rev 20728) +++ trunk/reactos/drivers/fs/np/fsctrl.c 2006-01-08 20:50:08 UTC (rev 20729) @@ -394,7 +394,7 @@ switch (IoStack->Parameters.FileSystemControl.FsControlCode) { case FSCTL_PIPE_ASSIGN_EVENT: - DPRINT("Assign event\n"); + DPRINT1("Assign event not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; @@ -414,12 +414,14 @@ break; case FSCTL_PIPE_QUERY_EVENT: - DPRINT("Query event\n"); + DPRINT1("Query event not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; case FSCTL_PIPE_TRANSCEIVE: - DPRINT("Transceive\n"); + /* If you implement this, please remove the workaround in + lib/kernel32/file/npipe.c function TransactNamedPipe() */ + DPRINT1("Transceive not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; @@ -429,42 +431,43 @@ break; case FSCTL_PIPE_IMPERSONATE: - DPRINT("Impersonate\n"); + DPRINT1("Impersonate not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; case FSCTL_PIPE_SET_CLIENT_PROCESS: - DPRINT("Set client process\n"); + DPRINT1("Set client process not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; case FSCTL_PIPE_QUERY_CLIENT_PROCESS: - DPRINT("Query client process\n"); + DPRINT1("Query client process not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; case FSCTL_PIPE_INTERNAL_READ: - DPRINT("Internal read\n"); + DPRINT1("Internal read not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; case FSCTL_PIPE_INTERNAL_WRITE: - DPRINT("Internal write\n"); + DPRINT1("Internal write not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; case FSCTL_PIPE_INTERNAL_TRANSCEIVE: - DPRINT("Internal transceive\n"); + DPRINT1("Internal transceive not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; case FSCTL_PIPE_INTERNAL_READ_OVFLOW: - DPRINT("Internal read overflow\n"); + DPRINT1("Internal read overflow not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; default: - DPRINT("IoControlCode: %x\n", IoStack->Parameters.FileSystemControl.FsControlCode); + DPRINT1("Unrecognized IoControlCode: %x\n", + IoStack->Parameters.FileSystemControl.FsControlCode); Status = STATUS_UNSUCCESSFUL; } _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2006-01-08 20:33:14 UTC (rev 20728) +++ trunk/reactos/lib/kernel32/file/npipe.c 2006-01-08 20:50:08 UTC (rev 20729) @@ -1150,6 +1150,7 @@ } else { +#if 0 /* We don't implement FSCTL_PIPE_TRANSCEIVE yet */ IO_STATUS_BLOCK Iosb; Status = NtFsControlFile(hNamedPipe, @@ -1187,6 +1188,31 @@ SetLastErrorByStatus(Status); return FALSE; } +#else /* Workaround while FSCTL_PIPE_TRANSCEIVE not available */ + DWORD nActualBytes; + + while (0 != nInBufferSize && + WriteFile(hNamedPipe, lpInBuffer, nInBufferSize, &nActualBytes, + NULL)) + { + lpInBuffer = (LPVOID)((char *) lpInBuffer + nActualBytes); + nInBufferSize -= nActualBytes; + } + if (0 != nInBufferSize) + { + /* Must have dropped out of the while 'cause WriteFile failed */ + return FALSE; + } + if (! ReadFile(hNamedPipe, lpOutBuffer, nOutBufferSize, &nActualBytes, + NULL)) + { + return FALSE; + } + if (NULL != lpBytesRead) + { + *lpBytesRead = nActualBytes; + } +#endif } return TRUE;

18 years, 8 months

[cwittich] 20728: fixed two bugs (spotted by w3seek)

by cwittich＠svn.reactos.org

fixed two bugs (spotted by w3seek) Modified: trunk/reactos/subsys/system/msconfig/startuppage.c Modified: trunk/reactos/subsys/system/notepad/main.c _____ Modified: trunk/reactos/subsys/system/msconfig/startuppage.c --- trunk/reactos/subsys/system/msconfig/startuppage.c 2006-01-08 20:12:11 UTC (rev 20727) +++ trunk/reactos/subsys/system/msconfig/startuppage.c 2006-01-08 20:33:14 UTC (rev 20728) @@ -75,7 +75,7 @@ { dwValueLength = MAX_KEY_LENGTH; dwDataLength = MAX_VALUE_NAME; - Data = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, MAX_VALUE_NAME); + Data = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, MAX_VALUE_NAME * sizeof(TCHAR)); if (Data == NULL) break; retVal = RegEnumValue(hKey, Index, lpValueName, &dwValueLength, NULL, &dwType, (LPBYTE)Data, &dwDataLength); _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2006-01-08 20:12:11 UTC (rev 20727) +++ trunk/reactos/subsys/system/notepad/main.c 2006-01-08 20:33:14 UTC (rev 20728) @@ -37,7 +37,7 @@ { lstrcpy(Globals.szFileName, szFileName); Globals.szFileTitle[0] = 0; - GetFileTitle(szFileName, Globals.szFileTitle, wcslen(Globals.szFileTitle)); + GetFileTitle(szFileName, Globals.szFileTitle, sizeof(Globals.szFileTitle) / sizeof(Globals.szFileTitle[0])); } /***********************************************************************

18 years, 8 months

[gvg] 20727: Don't close the pipe, we need it for the next client

by gvg＠svn.reactos.org

Don't close the pipe, we need it for the next client Modified: trunk/reactos/services/dhcp/pipe.c _____ Modified: trunk/reactos/services/dhcp/pipe.c --- trunk/reactos/services/dhcp/pipe.c 2006-01-08 20:08:38 UTC (rev 20726) +++ trunk/reactos/services/dhcp/pipe.c 2006-01-08 20:12:11 UTC (rev 20727) @@ -54,7 +54,7 @@ break; } } - CloseHandle( CommPipe ); + DisconnectNamedPipe( CommPipe ); } return TRUE;

18 years, 8 months

[turner] 20726: * Replace NtGdiCreatePatternBrush and NtGdiCreateHatchBrush with NtGdiCreatePatternBrushInteral and NtGdiCreateHatchBrushInteral

by turner＠svn.reactos.org

* Replace NtGdiCreatePatternBrush and NtGdiCreateHatchBrush with NtGdiCreatePatternBrushInteral and NtGdiCreateHatchBrushInteral * Implement CreateHatchBrush, CreatePatternBrush Modified: trunk/reactos/include/win32k/ntgdibad.h Modified: trunk/reactos/lib/gdi32/gdi32.def Modified: trunk/reactos/lib/gdi32/objects/brush.c Modified: trunk/reactos/subsys/win32k/objects/brush.c Modified: trunk/reactos/tools/nci/w32ksvc.db _____ Modified: trunk/reactos/include/win32k/ntgdibad.h --- trunk/reactos/include/win32k/ntgdibad.h 2006-01-08 20:02:26 UTC (rev 20725) +++ trunk/reactos/include/win32k/ntgdibad.h 2006-01-08 20:08:38 UTC (rev 20726) @@ -281,12 +281,6 @@ LPCWSTR Description ); -/* Use NtGdiCreateHatchBrushInternal with FALSE at the end. */ -HBRUSH STDCALL -NtGdiCreateHatchBrush( - INT Style, - COLORREF Color); - /* Metafiles are user mode */ HDC STDCALL @@ -301,11 +295,6 @@ CONST PLOGPALETTE lgpl ); -/* Use NtGdiCreatePatternBrushInternal with false, false at the end. */ -HBRUSH STDCALL -NtGdiCreatePatternBrush( - HBITMAP hBitmap); - /* Use NtGdiCreatePen with -> as parameters. */ HPEN STDCALL NtGdiCreatePenIndirect( _____ Modified: trunk/reactos/lib/gdi32/gdi32.def --- trunk/reactos/lib/gdi32/gdi32.def 2006-01-08 20:02:26 UTC (rev 20725) +++ trunk/reactos/lib/gdi32/gdi32.def 2006-01-08 20:08:38 UTC (rev 20726) @@ -72,13 +72,13 @@ CreateFontIndirectW@4 CreateFontW@56 CreateHalftonePalette@4=NtGdiCreateHalftonePalette@4 -CreateHatchBrush@8=NtGdiCreateHatchBrush@8 +CreateHatchBrush@8 CreateICA@16 CreateICW@16 CreateMetaFileA@4 CreateMetaFileW@4 CreatePalette@4=NtGdiCreatePalette@4 -CreatePatternBrush@4=NtGdiCreatePatternBrush@4 +CreatePatternBrush@4 CreatePen@12=NtGdiCreatePen@12 CreatePenIndirect@4=NtGdiCreatePenIndirect@4 CreatePolyPolygonRgn@16=NtGdiCreatePolyPolygonRgn@16 _____ Modified: trunk/reactos/lib/gdi32/objects/brush.c --- trunk/reactos/lib/gdi32/objects/brush.c 2006-01-08 20:02:26 UTC (rev 20725) +++ trunk/reactos/lib/gdi32/objects/brush.c 2006-01-08 20:08:38 UTC (rev 20726) @@ -82,6 +82,27 @@ */ HBRUSH STDCALL +CreateHatchBrush(INT fnStyle, + COLORREF clrref) +{ + return NtGdiCreateHatchBrushInternal(fnStyle, clrref, FALSE); +} + +/* + * @implemented + */ +HBRUSH +STDCALL +CreatePatternBrush(HBITMAP hbmp) +{ + return NtGdiCreatePatternBrushInternal(hbmp, FALSE, FALSE); +} + +/* + * @implemented + */ +HBRUSH +STDCALL CreateSolidBrush(IN COLORREF crColor) { /* Call Server-Side API */ @@ -111,8 +132,15 @@ break; case BS_PATTERN: + hBrush = NtGdiCreatePatternBrushInternal((HBITMAP)LogBrush->lbHatch, + FALSE, + FALSE); + break; + case BS_PATTERN8X8: - hBrush = NtGdiCreatePatternBrush((HBITMAP)LogBrush->lbHatch); + hBrush = NtGdiCreatePatternBrushInternal((HBITMAP)LogBrush->lbHatch, + FALSE, + TRUE); break; case BS_SOLID: @@ -120,7 +148,9 @@ break; case BS_HATCHED: - hBrush = NtGdiCreateHatchBrush(LogBrush->lbHatch, LogBrush->lbColor); + hBrush = NtGdiCreateHatchBrushInternal(LogBrush->lbHatch, + LogBrush->lbColor, + FALSE); break; case BS_NULL: _____ Modified: trunk/reactos/subsys/win32k/objects/brush.c --- trunk/reactos/subsys/win32k/objects/brush.c 2006-01-08 20:02:26 UTC (rev 20725) +++ trunk/reactos/subsys/win32k/objects/brush.c 2006-01-08 20:08:38 UTC (rev 20726) @@ -608,16 +608,19 @@ } HBRUSH STDCALL -NtGdiCreateHatchBrush( - INT Style, - COLORREF Color) +NtGdiCreateHatchBrushInternal( + ULONG Style, + COLORREF Color, + BOOL bPen) { return IntGdiCreateHatchBrush(Style, Color); } HBRUSH STDCALL -NtGdiCreatePatternBrush( - HBITMAP hBitmap) +NtGdiCreatePatternBrushInternal( + HBITMAP hBitmap, + BOOL bPen, + BOOL b8x8) { return IntGdiCreatePatternBrush(hBitmap); } _____ Modified: trunk/reactos/tools/nci/w32ksvc.db --- trunk/reactos/tools/nci/w32ksvc.db 2006-01-08 20:02:26 UTC (rev 20725) +++ trunk/reactos/tools/nci/w32ksvc.db 2006-01-08 20:08:38 UTC (rev 20726) @@ -35,11 +35,11 @@ NtGdiCreateFont 14 NtGdiCreateFontIndirect 1 NtGdiCreateHalftonePalette 1 -NtGdiCreateHatchBrush 2 +NtGdiCreateHatchBrushInternal 3 NtGdiCreateIC 4 NtGdiCreateMetaFile 1 NtGdiCreatePalette 1 -NtGdiCreatePatternBrush 1 +NtGdiCreatePatternBrushInternal 3 NtGdiCreatePen 3 NtGdiCreatePenIndirect 1 NtGdiCreatePolygonRgn 3

18 years, 8 months

[turner] 20725: Small fix for the patch special char patch earlier.

by turner＠svn.reactos.org

Small fix for the patch special char patch earlier. Modified: trunk/reactos/subsys/system/cmd/cmdinput.c _____ Modified: trunk/reactos/subsys/system/cmd/cmdinput.c --- trunk/reactos/subsys/system/cmd/cmdinput.c 2006-01-08 19:50:52 UTC (rev 20724) +++ trunk/reactos/subsys/system/cmd/cmdinput.c 2006-01-08 20:02:26 UTC (rev 20725) @@ -415,6 +415,7 @@ case _T('M'): case _T('C'): /* ^M does the same as return */ + bCharInput = TRUE; if(!(ir.Event.KeyEvent.dwControlKeyState & (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))) {

18 years, 8 months

[ion] 20724: - Update debug.h

by ion＠svn.reactos.org

- Update debug.h Modified: trunk/reactos/include/reactos/debug.h _____ Modified: trunk/reactos/include/reactos/debug.h --- trunk/reactos/include/reactos/debug.h 2006-01-08 19:33:06 UTC (rev 20723) +++ trunk/reactos/include/reactos/debug.h 2006-01-08 19:50:52 UTC (rev 20724) @@ -21,10 +21,11 @@ #define CHECKED #endif -#if 0 /* Define DbgPrint/RtlAssert unless the NDK is used */ #if !defined(_NTNDK_) && (!defined(_NTDDK_) || !defined(__NTDDK_H)) +/* Make sure we have basic types (some people include us *before* SDK... */ +#if defined(_NTDEF_) || (defined _WINDEF_) || (defined _WINDEF_H) ULONG __cdecl DbgPrint( @@ -40,9 +41,9 @@ ULONG LineNumber, PCHAR Message ); +#endif #endif -#endif #ifndef assert #ifndef NASSERT @@ -85,7 +86,7 @@ #ifdef _MSC_VER static __inline void DPRINT ( const char* fmt, ... ) { - UNREFERENCED_PARAMETER(fmt); + //UNREFERENCED_PARAMETER(fmt); } #else #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)

18 years, 8 months

← Newer
1
...
33
34
35
36
37
38
39
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006