Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 20727: Don't close the pipe, we need it for the next client
by gvg＠svn.reactos.org 08 Jan '06

08 Jan '06

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;

1 0

[turner] 20726: * Replace NtGdiCreatePatternBrush and NtGdiCreateHatchBrush with NtGdiCreatePatternBrushInteral and NtGdiCreateHatchBrushInteral
by turner＠svn.reactos.org 08 Jan '06

08 Jan '06

* 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

1 0

[turner] 20725: Small fix for the patch special char patch earlier.
by turner＠svn.reactos.org 08 Jan '06

08 Jan '06

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))) {

1 0

[ion] 20724: - Update debug.h
by ion＠svn.reactos.org 08 Jan '06

08 Jan '06

- 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)

1 0

[turner] 20723: Fix build.
by turner＠svn.reactos.org 08 Jan '06

08 Jan '06

Fix build. Modified: trunk/reactos/subsys/system/msconfig/startuppage.c _____ Modified: trunk/reactos/subsys/system/msconfig/startuppage.c --- trunk/reactos/subsys/system/msconfig/startuppage.c 2006-01-08 19:31:26 UTC (rev 20722) +++ trunk/reactos/subsys/system/msconfig/startuppage.c 2006-01-08 19:33:06 UTC (rev 20723) @@ -99,10 +99,10 @@ switch (PtrToLong(hRootKey)) { - case HKEY_LOCAL_MACHINE: + case PtrToLong(HKEY_LOCAL_MACHINE): _tcscpy(Path, _T("HKLM\\\0")); break; - case HKEY_CURRENT_USER: + case PtrToLong(HKEY_CURRENT_USER): _tcscpy(Path, _T("HKCU\\\0")); break; default:

1 0

[gedmurphy] 20722: A very rough implementation of the control buttons. (I'll work on my image skills ; ) )
by gedmurphy＠svn.reactos.org 08 Jan '06

08 Jan '06

A very rough implementation of the control buttons. (I'll work on my image skills ;) ) Modified: trunk/reactos/subsys/system/servman/En.rc Added: trunk/reactos/subsys/system/servman/res/buttons.bmp _____ Modified: trunk/reactos/subsys/system/servman/En.rc --- trunk/reactos/subsys/system/servman/En.rc 2006-01-08 19:17:14 UTC (rev 20721) +++ trunk/reactos/subsys/system/servman/En.rc 2006-01-08 19:31:26 UTC (rev 20722) @@ -67,7 +67,7 @@ CONTROL "",IDC_START_PARAM,"Static",0x50001000,70,199,176,11 END -IDB_BUTTONS BITMAP "buttons.bmp" +IDB_BUTTONS BITMAP "res/buttons.bmp" STRINGTABLE DISCARDABLE BEGIN _____ Added: trunk/reactos/subsys/system/servman/res/buttons.bmp (Binary files differ) Property changes on: trunk/reactos/subsys/system/servman/res/buttons.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

[ion] 20721: Fix win32k build
by ion＠svn.reactos.org 08 Jan '06

08 Jan '06

Fix win32k build Modified: trunk/reactos/subsys/win32k/ntuser/ssec.c Modified: trunk/reactos/subsys/win32k/objects/text.c Modified: trunk/reactos/subsys/win32k/w32k.h _____ Modified: trunk/reactos/subsys/win32k/ntuser/ssec.c --- trunk/reactos/subsys/win32k/ntuser/ssec.c 2006-01-08 19:15:31 UTC (rev 20720) +++ trunk/reactos/subsys/win32k/ntuser/ssec.c 2006-01-08 19:17:14 UTC (rev 20721) @@ -205,7 +205,7 @@ /* now allocate a real section */ SectionSize.QuadPart = Size; - Status = MmCreateSection(&FreeSharedSection->SectionObject, + Status = MmCreateSection((PVOID)&FreeSharedSection->SectionObject, SECTION_ALL_ACCESS, NULL, &SectionSize, _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2006-01-08 19:15:31 UTC (rev 20720) +++ trunk/reactos/subsys/win32k/objects/text.c 2006-01-08 19:17:14 UTC (rev 20721) @@ -281,7 +281,7 @@ return 0; } - Status = MmCreateSection(&SectionObject, SECTION_ALL_ACCESS, + Status = MmCreateSection((PVOID)&SectionObject, SECTION_ALL_ACCESS, NULL, NULL, PAGE_READONLY, 0, FileHandle, NULL); if (!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/subsys/win32k/w32k.h --- trunk/reactos/subsys/win32k/w32k.h 2006-01-08 19:15:31 UTC (rev 20720) +++ trunk/reactos/subsys/win32k/w32k.h 2006-01-08 19:17:14 UTC (rev 20721) @@ -51,5 +51,9 @@ #include <win32k/ntgdibad.h> #include <ntgdi.h> +/* For access to SECTION_OBJECT. FIXME: Once compatible with NT, use NDK! */ +#include <internal/mm.h> + /* Internal Win32K Header */ #include "include/win32k.h" +

1 0

[cwittich] 20720: fix building with MSVC
by cwittich＠svn.reactos.org 08 Jan '06

08 Jan '06

fix building with MSVC fixed some warnings Modified: trunk/reactos/subsys/system/notepad/License_En.c Modified: trunk/reactos/subsys/system/notepad/main.c Modified: trunk/reactos/subsys/system/notepad/notepad.h _____ Modified: trunk/reactos/subsys/system/notepad/License_En.c --- trunk/reactos/subsys/system/notepad/License_En.c 2006-01-08 19:07:16 UTC (rev 20719) +++ trunk/reactos/subsys/system/notepad/License_En.c 2006-01-08 19:15:31 UTC (rev 20720) @@ -1,5 +1,4 @@ -#include <windows.h> -#include "license.h" +#include <notepad.h> static const CHAR LicenseCaption_En[] = "LICENSE"; static const CHAR License_En[] = _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2006-01-08 19:07:16 UTC (rev 20719) +++ trunk/reactos/subsys/system/notepad/main.c 2006-01-08 19:15:31 UTC (rev 20720) @@ -37,7 +37,7 @@ { lstrcpy(Globals.szFileName, szFileName); Globals.szFileTitle[0] = 0; - GetFileTitle(szFileName, Globals.szFileTitle, sizeof(Globals.szFileTitle)); + GetFileTitle(szFileName, Globals.szFileTitle, wcslen(Globals.szFileTitle)); } /*********************************************************************** _____ Modified: trunk/reactos/subsys/system/notepad/notepad.h --- trunk/reactos/subsys/system/notepad/notepad.h 2006-01-08 19:07:16 UTC (rev 20719) +++ trunk/reactos/subsys/system/notepad/notepad.h 2006-01-08 19:15:31 UTC (rev 20720) @@ -1,8 +1,6 @@ #define UNICODE #define _UNICODE -#define _CRT_SECURE_NO_DEPRECATE - #include <assert.h> #include <stdio.h> #include <windows.h>

1 0

[cwittich] 20719: fixed some bugs
by cwittich＠svn.reactos.org 08 Jan '06

08 Jan '06

fixed some bugs use PCH when building with MSVC Modified: trunk/reactos/subsys/system/msconfig/msconfig.xml Modified: trunk/reactos/subsys/system/msconfig/srvpage.c Modified: trunk/reactos/subsys/system/msconfig/startuppage.c Modified: trunk/reactos/subsys/system/msconfig/toolspage.c _____ Modified: trunk/reactos/subsys/system/msconfig/msconfig.xml --- trunk/reactos/subsys/system/msconfig/msconfig.xml 2006-01-08 18:55:24 UTC (rev 20718) +++ trunk/reactos/subsys/system/msconfig/msconfig.xml 2006-01-08 19:07:16 UTC (rev 20719) @@ -22,4 +22,5 @@ <file>msconfig.c</file> </compilationunit> <file>msconfig.rc</file> + <pch>precomp.h</pch> </module> _____ Modified: trunk/reactos/subsys/system/msconfig/srvpage.c --- trunk/reactos/subsys/system/msconfig/srvpage.c 2006-01-08 18:55:24 UTC (rev 20718) +++ trunk/reactos/subsys/system/msconfig/srvpage.c 2006-01-08 19:07:16 UTC (rev 20719) @@ -19,7 +19,7 @@ hServicesListCtrl = GetDlgItem(hDlg, IDC_SERVICES_LIST); hServicesDialog = hDlg; - dwStyle = SendMessage(hServicesListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + dwStyle = (DWORD) SendMessage(hServicesListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); dwStyle = dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES; SendMessage(hServicesListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); @@ -93,7 +93,7 @@ { /* reserve memory for service info array */ pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) HeapAlloc(GetProcessHeap(), 0, BytesNeeded); - if (pServiceStatus == NULL) + if (!pServiceStatus) return; /* fill array with service info */ @@ -111,6 +111,8 @@ if (NumServices) { + if (!pServiceStatus) + return; for (Index = 0; Index < NumServices; Index++) { memset(&item, 0, sizeof(LV_ITEM)); _____ Modified: trunk/reactos/subsys/system/msconfig/startuppage.c --- trunk/reactos/subsys/system/msconfig/startuppage.c 2006-01-08 18:55:24 UTC (rev 20718) +++ trunk/reactos/subsys/system/msconfig/startuppage.c 2006-01-08 19:07:16 UTC (rev 20719) @@ -19,7 +19,7 @@ hStartupListCtrl = GetDlgItem(hDlg, IDC_STARTUP_LIST); hStartupDialog = hDlg; - dwStyle = SendMessage(hStartupListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + dwStyle = (DWORD) SendMessage(hStartupListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); dwStyle = dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES; SendMessage(hStartupListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); @@ -62,7 +62,7 @@ HKEY hKey; DWORD Index, dwValues, retVal, dwType; DWORD dwValueLength, dwDataLength = MAX_VALUE_NAME; - TCHAR Data[MAX_VALUE_NAME]; + TCHAR* Data; TCHAR lpValueName[MAX_KEY_LENGTH]; TCHAR Path[MAX_KEY_LENGTH + 5]; LV_ITEM item; @@ -73,8 +73,11 @@ { for (Index = 0, retVal = ERROR_SUCCESS; Index < dwValues; Index++) { - dwValueLength = MAX_VALUE_NAME; + dwValueLength = MAX_KEY_LENGTH; dwDataLength = MAX_VALUE_NAME; + Data = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, MAX_VALUE_NAME); + if (Data == NULL) + break; retVal = RegEnumValue(hKey, Index, lpValueName, &dwValueLength, NULL, &dwType, (LPBYTE)Data, &dwDataLength); if (retVal == ERROR_SUCCESS) { @@ -88,21 +91,29 @@ if (dwType == REG_SZ) { - GetLongPathName(Data, Data, sizeof(Data)); + GetLongPathName(Data, Data, (DWORD) _tcsclen(Data)); item.pszText = Data; item.iSubItem = 1; SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } - if (hRootKey == HKEY_LOCAL_MACHINE) - _tcscpy(Path, _T("HKLM\\")); - if (hRootKey == HKEY_CURRENT_USER) - _tcscpy(Path, _T("HKCU\\")); + switch (PtrToLong(hRootKey)) + { + case HKEY_LOCAL_MACHINE: + _tcscpy(Path, _T("HKLM\\\0")); + break; + case HKEY_CURRENT_USER: + _tcscpy(Path, _T("HKCU\\\0")); + break; + default: + _tcscpy(Path, _T("\0")); + } _tcscat(Path, KeyName); item.pszText = Path; item.iSubItem = 2; SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + HeapFree(GetProcessHeap(), 0, Data); } } } _____ Modified: trunk/reactos/subsys/system/msconfig/toolspage.c --- trunk/reactos/subsys/system/msconfig/toolspage.c 2006-01-08 18:55:24 UTC (rev 20718) +++ trunk/reactos/subsys/system/msconfig/toolspage.c 2006-01-08 19:07:16 UTC (rev 20719) @@ -55,7 +55,7 @@ hToolsListCtrl = GetDlgItem(hDlg, IDC_TOOLS_LIST); hToolsDialog = hDlg; - dwStyle = SendMessage(hToolsListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + dwStyle = (DWORD) SendMessage(hToolsListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); dwStyle = dwStyle | LVS_EX_FULLROWSELECT; SendMessage(hToolsListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle);

1 0

[ion] 20718: Fix umpnpmgr build
by ion＠svn.reactos.org 08 Jan '06

08 Jan '06

Fix umpnpmgr build Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2006-01-08 18:50:54 UTC (rev 20717) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2006-01-08 18:55:24 UTC (rev 20718) @@ -29,6 +29,8 @@ #define WIN32_NO_STATUS #include <windows.h> #include <cmtypes.h> +#include <cmfuncs.h> +#include <rtlfuncs.h> #include <umpnpmgr/sysguid.h> #include <wdmguid.h> #include <cfgmgr32.h>

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