Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 40621: - Update CancelDC and DrawEscape.
by jimtabor＠svn.reactos.org 21 Apr '09

21 Apr '09

Author: jimtabor Date: Tue Apr 21 04:14:56 2009 New Revision: 40621 URL: http://svn.reactos.org/svn/reactos?rev=40621&view=rev Log: - Update CancelDC and DrawEscape. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Tue Apr 21 04:14:56 2009 @@ -72,29 +72,68 @@ /* - * @unimplemented - */ -BOOL -WINAPI -CancelDC(HDC hdc) -{ - /* FIXME Sharememory */ - return NtGdiCancelDC(hdc); -} - - -/* - * @unimplemented + * @implemented + */ +BOOL +WINAPI +CancelDC(HDC hDC) +{ + PDC_ATTR pDc_Attr; + + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC && + GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_METADC ) + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + /* If a document has started set it to die. */ + if (pLDC->Flags & LDC_INIT_DOCUMENT) pLDC->Flags |= LDC_KILL_DOCUMENT; + + return NtGdiCancelDC(hDC); + } + + if (GdiGetHandleUserData((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC, (PVOID) &pDc_Attr)) + { + pDc_Attr->ulDirty_ &= ~DC_PLAYMETAFILE; + return TRUE; + } + + return FALSE; +} + + +/* + * @implemented */ int WINAPI -DrawEscape(HDC hdc, +DrawEscape(HDC hDC, INT nEscape, INT cbInput, LPCSTR lpszInData) { - /* FIXME Sharememory */ - return NtGdiDrawEscape(hdc, nEscape, cbInput, (LPSTR) lpszInData); + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_DC) + return NtGdiDrawEscape(hDC, nEscape, cbInput, (LPSTR) lpszInData); + + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_METADC) + { + PLDC pLDC = GdiGetLDC(hDC); + if ( pLDC ) + { + if (pLDC->Flags & LDC_META_PRINT) + { +// if (nEscape != 8) +// return EMFDRV_WriteEscape(hDC, nEscape, cbInput, lpszInData, EMR_DRAWESCAPE); + + return NtGdiDrawEscape(hDC, nEscape, cbInput, (LPSTR) lpszInData); + } + } + SetLastError(ERROR_INVALID_HANDLE); + } + return 0; }

1 0

[cgutman] 40620: - Implement NdisQueryAdapterInstanceName
by cgutman＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: cgutman Date: Tue Apr 21 03:36:28 2009 New Revision: 40620 URL: http://svn.reactos.org/svn/reactos?rev=40620&view=rev Log: - Implement NdisQueryAdapterInstanceName Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] Tue Apr 21 03:36:28 2009 @@ -287,28 +287,6 @@ } - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT -NdisQueryAdapterInstanceName( - OUT PNDIS_STRING AdapterInstanceName, - IN NDIS_HANDLE NdisBindingHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - /* * @unimplemented */ Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Tue Apr 21 03:36:28 2009 @@ -2783,5 +2783,27 @@ return NDIS_STATUS_SUCCESS; } +/* + * @implemented + */ +NDIS_STATUS +EXPORT +NdisQueryAdapterInstanceName( + OUT PNDIS_STRING AdapterInstanceName, + IN NDIS_HANDLE NdisBindingHandle) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + PADAPTER_BINDING AdapterBinding = NdisBindingHandle; + PLOGICAL_ADAPTER Adapter = AdapterBinding->Adapter; + + return NdisMQueryAdapterInstanceName(AdapterInstanceName, + Adapter); +} + /* EOF */

1 0

[dreimer] 40619: Hopefully a REAL FIX for our new setlocal eats up vars problem
by dreimer＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: dreimer Date: Tue Apr 21 03:30:47 2009 New Revision: 40619 URL: http://svn.reactos.org/svn/reactos?rev=40619&view=rev Log: Hopefully a REAL FIX for our new setlocal eats up vars problem Added: trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Tue Apr 21 03:30:47 2009 @@ -33,51 +33,12 @@ goto :main ) -setlocal enabledelayedexpansion - set _ROSBE_OBJPATH=%_ROSBE_i386_OBJPATH% set _ROSBE_OUTPATH=%_ROSBE_i386_OUTPATH% - -if not "!_ROSBE_ARCH!" == "" ( - set ROS_ARCH=!_ROSBE_ARCH! - set ROS_PREFIX=!_ROSBE_ARCH!-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=!_ROSBE_BASEDIR!\!_ROSBE_ARCH! - - REM HAXX - - if "!_ROSBE_ARCH!" == "arm" ( - set _ROSBE_OBJPATH=!_ROSBE_ARM_OBJPATH! - set _ROSBE_OUTPATH=!_ROSBE_ARM_OUTPATH! - ) - if "!_ROSBE_ARCH!" == "ppc" ( - set _ROSBE_OBJPATH=!_ROSBE_PPC_OBJPATH! - set _ROSBE_OUTPATH=!_ROSBE_PPC_OUTPATH! - ) - if "!_ROSBE_ARCH!" == "amd64" ( - set _ROSBE_OBJPATH=!_ROSBE_AMD64_OBJPATH! - set _ROSBE_OUTPATH=!_ROSBE_AMD64_OUTPATH! - set ROS_PREFIX=x86_64-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=!_ROSBE_BASEDIR!\x86_64 - ) - - REM Check if existant arch - - if not exist "!_ROSBE_TARGET_MINGWPATH!\." ( - echo Unsupported arch specified. Fallback to Default. - pause - set _ROSBE_OBJPATH=!_ROSBE_i386_OBJPATH! - set _ROSBE_OUTPATH=!_ROSBE_i386_OUTPATH! - set ROS_ARCH= - set ROS_PREFIX= - set _ROSBE_TARGET_MINGWPATH= - ) -) - +"%_ROSBE_BASEDIR%\setlocal.cmd" :: :: Set up the GCC 4.x.x build environment. :: - -endlocal :main Added: trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/set… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd (added) +++ trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd [iso-8859-1] Tue Apr 21 03:30:47 2009 @@ -1,0 +1,49 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) +:: FILE: Root/setlocal.cmd +:: PURPOSE: Bypass for the stupid setlocal in CMD Batch +:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +:: +:: +@echo off +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 1 ( + @echo on +) + + +if not "%_ROSBE_ARCH%" == "" ( + set ROS_ARCH=%_ROSBE_ARCH% + set ROS_PREFIX=%_ROSBE_ARCH%-pc-mingw32 + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%_ROSBE_ARCH% + + REM HAXX + + if "%_ROSBE_ARCH%" == "arm" ( + set _ROSBE_OBJPATH=%_ROSBE_ARM_OBJPATH% + set _ROSBE_OUTPATH=%_ROSBE_ARM_OUTPATH% + ) + if "%_ROSBE_ARCH%" == "ppc" ( + set _ROSBE_OBJPATH=%_ROSBE_PPC_OBJPATH% + set _ROSBE_OUTPATH=%_ROSBE_PPC_OUTPATH% + ) + if "%_ROSBE_ARCH%" == "amd64" ( + set _ROSBE_OBJPATH=%_ROSBE_AMD64_OBJPATH% + set _ROSBE_OUTPATH=%_ROSBE_AMD64_OUTPATH% + set ROS_PREFIX=x86_64-pc-mingw32 + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\x86_64 + ) + + REM Check if existant arch + + if not exist "%_ROSBE_TARGET_MINGWPATH%\." ( + echo Unsupported arch specified. Fallback to Default. + pause + set _ROSBE_OBJPATH=%_ROSBE_i386_OBJPATH% + set _ROSBE_OUTPATH=%_ROSBE_i386_OUTPATH% + set ROS_ARCH= + set ROS_PREFIX= + set _ROSBE_TARGET_MINGWPATH= + ) +) Propchange: trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 40618: fix 7 setupapi misc winetests
by cwittich＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: cwittich Date: Tue Apr 21 02:59:31 2009 New Revision: 40618 URL: http://svn.reactos.org/svn/reactos?rev=40618&view=rev Log: fix 7 setupapi misc winetests Modified: trunk/reactos/dll/win32/setupapi/install.c Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] Tue Apr 21 02:59:31 2009 @@ -2228,8 +2228,8 @@ MyFree(SourceInfFileNameW); MyFree(OEMSourceMediaLocationW); MyFree(DestinationInfFileNameW); - TRACE("Returning %d\n", ret); + if (ret) SetLastError(ERROR_SUCCESS); return ret; } @@ -2518,5 +2518,6 @@ } TRACE("Returning %d\n", ret); + if (ret) SetLastError(ERROR_SUCCESS); return ret; }

1 0

[cwittich] 40617: add linebreaks
by cwittich＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: cwittich Date: Tue Apr 21 02:50:49 2009 New Revision: 40617 URL: http://svn.reactos.org/svn/reactos?rev=40617&view=rev Log: add linebreaks Modified: trunk/rostests/winetests/setupapi/devclass.c Modified: trunk/rostests/winetests/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/devcla… ============================================================================== --- trunk/rostests/winetests/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/devclass.c [iso-8859-1] Tue Apr 21 02:50:49 2009 @@ -68,9 +68,9 @@ SetLastError( 0xdeadbeef ); ok( !SetupDiBuildClassInfoList( 0, NULL, 0, &required_size ), - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected error %lx, got %lx", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); + "Expected error %lx, got %lx\n", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); guid_list = HeapAlloc( GetProcessHeap(), 0, ( required_size + 1 ) * sizeof( GUID ) ); if ( !guid_list ) @@ -78,12 +78,12 @@ SetLastError( 0xdeadbeef ); ok( SetupDiBuildClassInfoList( 0, guid_list, required_size, &size ), - "Error reported %lx", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + "Error reported %lx\n", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); SetLastError( 0xdeadbeef ); ok( SetupDiBuildClassInfoList( 0, guid_list, required_size + 1, &size ), - "Error reported %lx", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + "Error reported %lx\n", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); if ( size > 0 ) { @@ -101,28 +101,28 @@ SetLastError( 0xdeadbeef ); ok( !SetupDiClassGuidsFromNameA( NULL, NULL, 0, NULL ), - "Fail expected" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + "Fail expected\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); SetLastError( 0xdeadbeef ); ok( !SetupDiClassGuidsFromNameA( NULL, NULL, 0, &required_size ), - "Fail expected" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + "Fail expected\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); SetLastError( 0xdeadbeef ); ok( SetupDiClassGuidsFromNameA( "", NULL, 0, &required_size ), - "Error reported %lx", GetLastError() ); - ok( required_size == 0, "Expected 0, got %lu", required_size ); + "Error reported %lx\n", GetLastError() ); + ok( required_size == 0, "Expected 0, got %lu\n", required_size ); SetLastError( 0xdeadbeef ); ok( !SetupDiClassGuidsFromNameA( test_class_name, NULL, 0, &required_size ), - "Fail expected" ); + "Fail expected\n" ); SetLastError( 0xdeadbeef ); ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected error %lx, got %lx", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); - ok( required_size > 0, "Expected > 0, got %lu", required_size ); + "Expected error %lx, got %lx\n", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); + ok( required_size > 0, "Expected > 0, got %lu\n", required_size ); guid_list = HeapAlloc( GetProcessHeap(), 0, ( required_size + 1 ) * sizeof( GUID ) ); if ( !guid_list ) @@ -130,16 +130,16 @@ SetLastError( 0xdeadbeef ); ok( SetupDiClassGuidsFromNameA( test_class_name, guid_list, required_size, &size ), - "Error reported %lx", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + "Error reported %lx\n", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); ok( IsEqualIID( &guid_list[0], &test_class_guid ), - "Expected %s, got %s", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ) ); + "Expected %s, got %s\n", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ) ); SetLastError( 0xdeadbeef ); ok( SetupDiClassGuidsFromNameA( test_class_name, guid_list, required_size + 1, &size ), - "Error reported %lx", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + "Error reported %lx\n", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); ok( IsEqualIID( &guid_list[0], &test_class_guid ), - "Expected %s, got %s", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ) ); + "Expected %s, got %s\n", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ) ); HeapFree( GetProcessHeap(), 0, guid_list ); } @@ -151,23 +151,23 @@ SetLastError( 0xdeadbeef ); ok( !SetupDiClassNameFromGuidA( NULL, NULL, 0, NULL ), - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INVALID_CLASS, - "Expected error %x, got %lx", ERROR_INVALID_CLASS, GetLastError() ); + "Expected error %x, got %lx\n", ERROR_INVALID_CLASS, GetLastError() ); SetLastError( 0xdeadbeef ); ok( !SetupDiClassNameFromGuidA( NULL, NULL, 0, &required_size ), - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INVALID_CLASS, - "Expected error %x, got %lx", ERROR_INVALID_CLASS, GetLastError() ); + "Expected error %x, got %lx\n", ERROR_INVALID_CLASS, GetLastError() ); SetLastError( 0xdeadbeef ); ok( !SetupDiClassNameFromGuidA( &test_class_guid, NULL, 0, &required_size ), - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected error %lx, got %lx", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); - ok( required_size > 0, "Expected > 0, got %lu", required_size ); - ok( required_size < MAX_CLASS_NAME_LEN, "Expected < %u, got %lu", MAX_CLASS_NAME_LEN, required_size ); + "Expected error %lx, got %lx\n", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); + ok( required_size > 0, "Expected > 0, got %lu\n", required_size ); + ok( required_size < MAX_CLASS_NAME_LEN, "Expected < %u, got %lu\n", MAX_CLASS_NAME_LEN, required_size ); class_name = HeapAlloc( GetProcessHeap(), 0, required_size ); if ( !class_name ) @@ -175,16 +175,16 @@ SetLastError( 0xdeadbeef ); ok( SetupDiClassNameFromGuidA( &test_class_guid, class_name, required_size, &size ), - "Error reported %lx", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + "Error reported %lx\n", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); ok( !strcmp( class_name, test_class_name ), - "Expected %s, got %s", test_class_name, class_name ); + "Expected %s, got %s\n", test_class_name, class_name ); SetLastError( 0xdeadbeef ); ok( SetupDiClassNameFromGuidA( &test_class_guid, class_name, required_size + 1, &size ), - "Error reported %lx", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + "Error reported %lx\n", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); ok( !strcmp( class_name, test_class_name ), - "Expected %s, got %s", test_class_name, class_name ); + "Expected %s, got %s\n", test_class_name, class_name ); HeapFree( GetProcessHeap(), 0, class_name ); } @@ -196,23 +196,23 @@ SetLastError( 0xdeadbeef ); ok( !SetupDiGetClassDescriptionA( NULL, NULL, 0, NULL ), - "Fail expected" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + "Fail expected\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); SetLastError( 0xdeadbeef ); ok( !SetupDiGetClassDescriptionA( NULL, NULL, 0, &required_size ), - "Fail expected" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + "Fail expected\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); SetLastError( 0xdeadbeef ); ok( !SetupDiGetClassDescriptionA( &test_class_guid, NULL, 0, &required_size ), - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected error %lx, got %lx", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); - ok( required_size > 0, "Expected > 0, got %lu", required_size ); - ok( required_size < LINE_LEN, "Expected < %u, got %lu", LINE_LEN, required_size ); + "Expected error %lx, got %lx\n", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); + ok( required_size > 0, "Expected > 0, got %lu\n", required_size ); + ok( required_size < LINE_LEN, "Expected < %u, got %lu\n", LINE_LEN, required_size ); class_desc = HeapAlloc( GetProcessHeap(), 0, required_size ); if ( !class_desc ) @@ -220,12 +220,12 @@ SetLastError( 0xdeadbeef ); ok( SetupDiGetClassDescriptionA( &test_class_guid, class_desc, required_size, &size ), - "Error reported %lx", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + "Error reported %lx\n", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); SetLastError( 0xdeadbeef ); ok( SetupDiGetClassDescriptionA( &test_class_guid, class_desc, required_size + 1, &size ), - "Error reported %lx", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + "Error reported %lx\n", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); HeapFree( GetProcessHeap(), 0, class_desc ); } @@ -237,47 +237,47 @@ SetLastError( 0xdeadbeef ); device_info = SetupDiGetClassDevs( NULL, NULL, NULL, 0 ); ok( device_info == INVALID_HANDLE_VALUE, - "Fail expected" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + "Fail expected\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); SetLastError( 0xdeadbeef ); device_info = SetupDiGetClassDevs( NULL, NULL, NULL, DIGCF_ALLCLASSES ); ok( device_info != INVALID_HANDLE_VALUE, - "Error reported %lx", GetLastError() ); + "Error reported %lx\n", GetLastError() ); SetLastError( 0xdeadbeef ); ok( SetupDiDestroyDeviceInfoList( device_info ), - "Error reported %lx", GetLastError() ); + "Error reported %lx\n", GetLastError() ); SetLastError( 0xdeadbeef ); device_info = SetupDiGetClassDevs( NULL, NULL, NULL, DIGCF_DEVICEINTERFACE ); ok( device_info == INVALID_HANDLE_VALUE, - "Fail expected" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + "Fail expected\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); SetLastError( 0xdeadbeef ); device_info = SetupDiGetClassDevs( &test_class_guid, NULL, NULL, 0 ); ok( device_info != INVALID_HANDLE_VALUE, - "Error reported %lx", GetLastError() ); + "Error reported %lx\n", GetLastError() ); SetLastError( 0xdeadbeef ); ok( SetupDiDestroyDeviceInfoList( device_info ), - "Error reported %lx", GetLastError() ); + "Error reported %lx\n", GetLastError() ); SetLastError( 0xdeadbeef ); device_info = SetupDiGetClassDevs( NULL, "(invalid enumerator)", NULL, DIGCF_ALLCLASSES ); ok( device_info == INVALID_HANDLE_VALUE, - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INVALID_DATA, - "Expected error %lx, got %lx", ERROR_INVALID_DATA, GetLastError() ); + "Expected error %lx, got %lx\n", ERROR_INVALID_DATA, GetLastError() ); SetLastError( 0xdeadbeef ); device_info = SetupDiGetClassDevs( NULL, "Root", NULL, DIGCF_ALLCLASSES ); ok( device_info != INVALID_HANDLE_VALUE, - "Error reported %lx", GetLastError() ); + "Error reported %lx\n", GetLastError() ); SetLastError( 0xdeadbeef ); ok( SetupDiDestroyDeviceInfoList( device_info ), - "Error reported %lx", GetLastError() ); + "Error reported %lx\n", GetLastError() ); } static void test_SetupDiOpenClassRegKeyExA(void) @@ -288,51 +288,51 @@ SetLastError( 0xdeadbeef ); hkey = SetupDiOpenClassRegKeyExA( NULL, 0, 0, NULL, NULL ); ok( hkey == INVALID_HANDLE_VALUE, - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INVALID_FLAGS, - "Expected error %lx, got %lx", ERROR_INVALID_FLAGS, GetLastError() ); + "Expected error %lx, got %lx\n", ERROR_INVALID_FLAGS, GetLastError() ); SetLastError( 0xdeadbeef ); hkey = SetupDiOpenClassRegKeyExA( NULL, 0, DIOCR_INSTALLER | DIOCR_INTERFACE, NULL, NULL ); ok( hkey == INVALID_HANDLE_VALUE, - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INVALID_FLAGS, - "Expected error %lx, got %lx", ERROR_INVALID_FLAGS, GetLastError() ); + "Expected error %lx, got %lx\n", ERROR_INVALID_FLAGS, GetLastError() ); SetLastError( 0xdeadbeef ); hkey = SetupDiOpenClassRegKeyExA( NULL, 0, DIOCR_INSTALLER, NULL, NULL ); ok( hkey == INVALID_HANDLE_VALUE, - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INVALID_CLASS, - "Expected error %x, got %lx", ERROR_INVALID_CLASS, GetLastError() ); + "Expected error %x, got %lx\n", ERROR_INVALID_CLASS, GetLastError() ); SetLastError( 0xdeadbeef ); hkey = SetupDiOpenClassRegKeyExA( NULL, 0, DIOCR_INTERFACE, NULL, NULL ); ok( hkey == INVALID_HANDLE_VALUE, - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INVALID_CLASS, - "Expected error %x, got %lx", ERROR_INVALID_CLASS, GetLastError() ); + "Expected error %x, got %lx\n", ERROR_INVALID_CLASS, GetLastError() ); SetLastError( 0xdeadbeef ); hkey = SetupDiOpenClassRegKeyExA( NULL, KEY_QUERY_VALUE, DIOCR_INSTALLER, NULL, NULL ); - ok( hkey != INVALID_HANDLE_VALUE, "Got error %lx", GetLastError() ); + ok( hkey != INVALID_HANDLE_VALUE, "Got error %lx\n", GetLastError() ); err = RegCloseKey( hkey ); - ok( err == ERROR_SUCCESS, "Got error %lx", err ); + ok( err == ERROR_SUCCESS, "Got error %lx\n", err ); SetLastError( 0xdeadbeef ); hkey = SetupDiOpenClassRegKeyExA( NULL, KEY_QUERY_VALUE, DIOCR_INTERFACE, NULL, NULL ); - ok( hkey != INVALID_HANDLE_VALUE, "Got error %lx", GetLastError() ); + ok( hkey != INVALID_HANDLE_VALUE, "Got error %lx\n", GetLastError() ); err = RegCloseKey( hkey ); - ok( err == ERROR_SUCCESS, "Got error %lx", err ); + ok( err == ERROR_SUCCESS, "Got error %lx\n", err ); SetLastError( 0xdeadbeef ); hkey = SetupDiOpenClassRegKeyExA( &test_class_guid, KEY_QUERY_VALUE, DIOCR_INSTALLER, NULL, NULL ); - ok( hkey != INVALID_HANDLE_VALUE, "Got error %lx", GetLastError() ); + ok( hkey != INVALID_HANDLE_VALUE, "Got error %lx\n", GetLastError() ); err = RegCloseKey( hkey ); - ok( err == ERROR_SUCCESS, "Got error %lx", err ); + ok( err == ERROR_SUCCESS, "Got error %lx\n", err ); err = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "System\\CurrentControlSet\\Control\\Class", 0, KEY_SET_VALUE, &hkey); - ok( err == ERROR_SUCCESS, "Got error %lx", err ); + ok( err == ERROR_SUCCESS, "Got error %lx\n", err ); } START_TEST(devclass)

1 0

[dreimer] 40616: Finish the changes to make if possible to keep the settings on a update.
by dreimer＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: dreimer Date: Tue Apr 21 01:51:39 2009 New Revision: 40616 URL: http://svn.reactos.org/svn/reactos?rev=40616&view=rev Log: Finish the changes to make if possible to keep the settings on a update. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Tue Apr 21 01:51:39 2009 @@ -276,6 +276,7 @@ ;; ;; Add our start menu shortcuts. ;; + IfFileExists "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" +10 0 !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY @@ -296,6 +297,7 @@ ;; ;; Add our desktop shortcuts. ;; + IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" +4 0 SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" SetOutPath $PROFILE @@ -308,6 +310,7 @@ ;; ;; Add our quick launch shortcuts. ;; + IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" +4 0 SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" SetOutPath $PROFILE @@ -335,17 +338,25 @@ Abort IfFileExists "$PROFILE\RosBE\." 0 +2 MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ - "Are you sure you want to remove the ReactOS Build Environment configuration file from the Profile Path?" \ - IDYES +2 + "Do you want to remove the ReactOS Build Environment configuration file from the Profile Path?" \ + IDNO +1 RMDir /r /REBOOTOK "$PROFILE\RosBE" - Abort IfFileExists "$APPDATA\RosBE\." 0 +2 MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ - "Are you sure you want to remove the ReactOS Build Environment configuration file from the Application Data Path?" \ - IDYES +2 + "Do you want to remove the ReactOS Build Environment configuration file from the Application Data Path?" \ + IDNO +1 RMDir /r /REBOOTOK "$APPDATA\RosBE" - - Abort + MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ + "Do you want to remove the Shortcuts? If you just want to Update to a new Version of RosBE, keep them. This keeps your previous settings." \ + IDNO +8 + IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" 0 +2 + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk" + IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" 0 +2 + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk" + IfFileExists "$DESKTOP\Standard MinGW Build Environment.lnk" 0 +2 + Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment.lnk" + IfFileExists "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" 0 +2 + Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" FunctionEnd Section Uninstall @@ -400,14 +411,6 @@ Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!! RMDir /REBOOTOK "$INSTDIR" - IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk" - IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk" - IfFileExists "$DESKTOP\Standard MinGW Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment.lnk" - IfFileExists "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" ;; ;; Clean up the registry.

1 0

[dreimer] 40615: Ask on uninstall if you wanna keep the configuration settings. Request by Physicus.
by dreimer＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: dreimer Date: Tue Apr 21 01:21:44 2009 New Revision: 40615 URL: http://svn.reactos.org/svn/reactos?rev=40615&view=rev Log: Ask on uninstall if you wanna keep the configuration settings. Request by Physicus. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Tue Apr 21 01:21:44 2009 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment for Windows" -!define PRODUCT_VERSION "1.4" +!define PRODUCT_VERSION "1.4.2" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -17,7 +17,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "1.4.0.0" +VIAddVersionKey /LANG=1033 "FileVersion" "1.4.2.0" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" @@ -25,7 +25,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2009 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2009 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "1.4.0.0" +VIProductVersion "1.4.2.0" CRCCheck force SetCompressor /FINAL /SOLID lzma @@ -330,8 +330,21 @@ Function un.onInit MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ - "Are you sure you want to completely remove ReactOS Build Environment and all of its components?" \ - IDYES +2 + "Are you sure you want to remove ReactOS Build Environment and all of its components?" \ + IDYES +2 + Abort + IfFileExists "$PROFILE\RosBE\." 0 +2 + MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ + "Are you sure you want to remove the ReactOS Build Environment configuration file from the Profile Path?" \ + IDYES +2 + RMDir /r /REBOOTOK "$PROFILE\RosBE" + Abort + IfFileExists "$APPDATA\RosBE\." 0 +2 + MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ + "Are you sure you want to remove the ReactOS Build Environment configuration file from the Application Data Path?" \ + IDYES +2 + RMDir /r /REBOOTOK "$APPDATA\RosBE" + Abort FunctionEnd @@ -345,10 +358,6 @@ RMDir /r /REBOOTOK "$INSTDIR\i386" RMDir /r /REBOOTOK "$INSTDIR\Tools" RMDir /r /REBOOTOK "$SMPROGRAMS\$ICONS_GROUP" - IfFileExists "$PROFILE\RosBE\." 0 +2 - RMDir /r /REBOOTOK "$PROFILE\RosBE" - IfFileExists "$APPDATA\RosBE\." 0 +2 - RMDir /r /REBOOTOK "$APPDATA\RosBE" Delete /REBOOTOK "$INSTDIR\Build.cmd" Delete /REBOOTOK "$INSTDIR\Build.ps1" Delete /REBOOTOK "$INSTDIR\chdefdir.cmd"

1 0

[cgutman] 40614: - Implement NdisMRegisterUnloadHandler, NdisMRegisterDevice, and NdisMDeregisterDevice
by cgutman＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: cgutman Date: Tue Apr 21 00:59:40 2009 New Revision: 40614 URL: http://svn.reactos.org/svn/reactos?rev=40614&view=rev Log: - Implement NdisMRegisterUnloadHandler, NdisMRegisterDevice, and NdisMDeregisterDevice Modified: trunk/reactos/drivers/network/ndis/include/miniport.h trunk/reactos/drivers/network/ndis/ndis/50stubs.c trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] Tue Apr 21 00:59:40 2009 @@ -33,6 +33,12 @@ #else } NDIS_M_DRIVER_BLOCK, *PNDIS_M_DRIVER_BLOCK; #endif + +/* There must be some defined struct to do this... */ +typedef struct _NDIS_M_DEVICE_BLOCK { + PDEVICE_OBJECT DeviceObject; + PNDIS_STRING SymbolicName; +} NDIS_M_DEVICE_BLOCK, *PNDIS_M_DEVICE_BLOCK; /* resources allocated on behalf on the miniport */ #define MINIPORT_RESOURCE_TYPE_MEMORY 0 Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] Tue Apr 21 00:59:40 2009 @@ -231,26 +231,6 @@ */ NDIS_STATUS EXPORT -NdisMDeregisterDevice( - IN NDIS_HANDLE NdisDeviceHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT NdisMPromoteMiniport( IN NDIS_HANDLE MiniportAdapterHandle) /* @@ -263,50 +243,6 @@ UNIMPLEMENTED return NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT -NdisMRegisterDevice( - IN NDIS_HANDLE NdisWrapperHandle, - IN PNDIS_STRING DeviceName, - IN PNDIS_STRING SymbolicName, - IN PDRIVER_DISPATCH MajorFunctions[], - OUT PDEVICE_OBJECT *pDeviceObject, - OUT NDIS_HANDLE *NdisDeviceHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisMRegisterUnloadHandler( - IN NDIS_HANDLE NdisWrapperHandle, - IN PDRIVER_UNLOAD UnloadHandler) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED } Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Tue Apr 21 00:59:40 2009 @@ -2664,5 +2664,124 @@ *AllocatedResourcesTranslated = Adapter->NdisMiniportBlock.AllocatedResourcesTranslated; } +/* + * @implemented + */ +VOID +EXPORT +NdisMRegisterUnloadHandler( + IN NDIS_HANDLE NdisWrapperHandle, + IN PDRIVER_UNLOAD UnloadHandler) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + PNDIS_M_DRIVER_BLOCK DriverBlock = NdisWrapperHandle; + + NDIS_DbgPrint(MAX_TRACE, ("Miniport registered unload handler\n")); + + DriverBlock->DriverObject->DriverUnload = UnloadHandler; +} + +/* + * @implemented + */ +NDIS_STATUS +EXPORT +NdisMRegisterDevice( + IN NDIS_HANDLE NdisWrapperHandle, + IN PNDIS_STRING DeviceName, + IN PNDIS_STRING SymbolicName, + IN PDRIVER_DISPATCH MajorFunctions[], + OUT PDEVICE_OBJECT *pDeviceObject, + OUT NDIS_HANDLE *NdisDeviceHandle) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + PNDIS_M_DRIVER_BLOCK DriverBlock = NdisWrapperHandle; + PNDIS_M_DEVICE_BLOCK DeviceBlock; + PDEVICE_OBJECT DeviceObject; + NDIS_STATUS Status; + UINT i; + + NDIS_DbgPrint(MAX_TRACE, ("Called\n")); + + Status = IoCreateDevice(DriverBlock->DriverObject, + 0, /* This space is reserved for us. Should we use it? */ + DeviceName, + FILE_DEVICE_NETWORK, + 0, + FALSE, + &DeviceObject); + + if (!NT_SUCCESS(Status)) + { + return Status; + } + + Status = IoCreateSymbolicLink(SymbolicName, DeviceName); + + if (!NT_SUCCESS(Status)) + { + IoDeleteDevice(DeviceObject); + return Status; + } + + DeviceBlock = ExAllocatePool(NonPagedPool, sizeof(NDIS_M_DEVICE_BLOCK)); + + if (!DeviceBlock) + { + IoDeleteDevice(DeviceObject); + IoDeleteSymbolicLink(SymbolicName); + return NDIS_STATUS_RESOURCES; + } + + for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + DriverBlock->DriverObject->MajorFunction[i] = MajorFunctions[i]; + + DriverBlock->DriverObject->MajorFunction[IRP_MJ_PNP] = NdisIDispatchPnp; + DriverBlock->DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = NdisIShutdown; + + DeviceBlock->DeviceObject = DeviceObject; + DeviceBlock->SymbolicName = SymbolicName; + + *pDeviceObject = DeviceObject; + *NdisDeviceHandle = DeviceBlock; + + return NDIS_STATUS_SUCCESS; +} + +/* + * @implemented + */ +NDIS_STATUS +EXPORT +NdisMDeregisterDevice( + IN NDIS_HANDLE NdisDeviceHandle) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + PNDIS_M_DEVICE_BLOCK DeviceBlock = NdisDeviceHandle; + + IoDeleteDevice(DeviceBlock->DeviceObject); + + IoDeleteSymbolicLink(DeviceBlock->SymbolicName); + + ExFreePool(DeviceBlock); + + return NDIS_STATUS_SUCCESS; +} + /* EOF */

1 0

[dgoette] 390: update subsystem integration of paste to roscms4
by dgoette＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: dgoette Date: Tue Apr 21 00:26:40 2009 New Revision: 390 URL: http://svn.reactos.org/svn/reactos?rev=390&view=rev Log: update subsystem integration of paste to roscms4 Modified: branches/danny-web/www/www.reactos.org/paste/inc/account.php Modified: branches/danny-web/www/www.reactos.org/paste/inc/account.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/p… ============================================================================== --- branches/danny-web/www/www.reactos.org/paste/inc/account.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/paste/inc/account.php [iso-8859-1] Tue Apr 21 00:26:40 2009 @@ -19,19 +19,16 @@ */ define("ROOT_PATH", "../"); - require_once(ROOT_PATH . "roscms/logon/subsys_login.php"); - $RSDB_intern_user_id = roscms_subsys_login('', ROSCMS_LOGIN_OPTIONAL, "/" . "http://localhost/reactos.org/"); + define("ROSCMS_PATH", ROOT_PATH.'roscms/'); + + require_once(ROSCMS_PATH . "lib/RosCMS_Autoloader.class.php"); + $RSDB_intern_user_id = Subsystem::in(Login::OPTIONAL, "/" . "http://localhost/reactos.org/"); include("connect.db.php"); if($RSDB_intern_user_id != 0) { - $query_roscms_user = mysql_query("SELECT * - FROM roscms.users - WHERE user_id = '".mysql_escape_string($RSDB_intern_user_id)."' LIMIT 1;") ; - $result_roscms_user = mysql_fetch_array($query_roscms_user); - // Name - $RSDB_USER_name = $result_roscms_user['user_name']; + $RSDB_USER_name = Subsystem::getUserName($RSDB_intern_user_id); } else {

1 0

[dgoette] 389: update subsystem integration to roscms4, set url for this server
by dgoette＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: dgoette Date: Tue Apr 21 00:25:29 2009 New Revision: 389 URL: http://svn.reactos.org/svn/reactos?rev=389&view=rev Log: update subsystem integration to roscms4, set url for this server Modified: branches/danny-web/www/www.reactos.org/support/inc/comp/data/group_list.php branches/danny-web/www/www.reactos.org/support/inc/utils.php branches/danny-web/www/www.reactos.org/support/rsdb_human_readable_url.php branches/danny-web/www/www.reactos.org/support/rsdb_setting.php branches/danny-web/www/www.reactos.org/support/search.js branches/danny-web/www/www.reactos.org/support/style.css Modified: branches/danny-web/www/www.reactos.org/support/inc/comp/data/group_list.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s… ============================================================================== --- branches/danny-web/www/www.reactos.org/support/inc/comp/data/group_list.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/support/inc/comp/data/group_list.php [iso-8859-1] Tue Apr 21 00:25:29 2009 @@ -117,8 +117,8 @@ <comp><?php echo $result_page['grpentr_comp']; ?></comp> <devnet><?php echo $result_page['grpentr_devnet']; ?></devnet> </dbentry> -<? +<?php } } ?> -</root> +</root> Modified: branches/danny-web/www/www.reactos.org/support/inc/utils.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s… ============================================================================== --- branches/danny-web/www/www.reactos.org/support/inc/utils.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/support/inc/utils.php [iso-8859-1] Tue Apr 21 00:25:29 2009 @@ -19,6 +19,6 @@ */ //require_once("/web/reactos.org/htdocs/roscms/inc/utils.php"); -require_once("../roscms/inc/utils.php"); +require_once("../shared/subsys_layout.php"); ?> Modified: branches/danny-web/www/www.reactos.org/support/rsdb_human_readable_url.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s… ============================================================================== --- branches/danny-web/www/www.reactos.org/support/rsdb_human_readable_url.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/support/rsdb_human_readable_url.php [iso-8859-1] Tue Apr 21 00:25:29 2009 @@ -29,9 +29,9 @@ $RSDB_URI_mode = ""; - $RSDB_intern_SET_path = "http://localhost/reactos.org/support/"; - $RSDB_intern_SET_path_ex = "http://localhost/reactos.org/support/index.php/"; - $RSDB_intern_dirs = "reactos.org/support/"; + $RSDB_intern_SET_path = "http://79.99.5.181/support/"; + $RSDB_intern_SET_path_ex = "http://79.99.5.181/support/index.php/"; + $RSDB_intern_dirs = "79.99.5.181/support/"; $RSDB_URI_tree = $_SERVER['REQUEST_URI']; Modified: branches/danny-web/www/www.reactos.org/support/rsdb_setting.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s… ============================================================================== --- branches/danny-web/www/www.reactos.org/support/rsdb_setting.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/support/rsdb_setting.php [iso-8859-1] Tue Apr 21 00:25:29 2009 @@ -39,8 +39,8 @@ // ************** // Config: (please sync this with the database) - $RSDB_intern_version = "RSDB 0.1 - http://www.reactos.org/"; // RSDB version info - $RSDB_intern_path_server = "http://www.reactos.org/"; // complete server path + $RSDB_intern_version = "RSDB 0.1 - http://79.99.5.181/"; // RSDB version info + $RSDB_intern_path_server = "http://79.99.5.181/"; // complete server path $RSDB_intern_path = "support/"; // the dirs after http://www.reactos.org // script file fix (for Safari browser) @@ -54,21 +54,17 @@ $RSDB_intern_items_per_page = 25; @define("ROOT_PATH", "../"); - require_once(ROOT_PATH . "roscms/logon/subsys_login.php"); + @define ("ROSCMS_PATH", ROOT_PATH.'roscms/'); + require_once(ROSCMS_PATH . "lib/RosCMS_Autoloader.class.php"); // User ID - $RSDB_intern_user_id = roscms_subsys_login('', ROSCMS_LOGIN_OPTIONAL, "/" . $RSDB_intern_path); + $RSDB_intern_user_id = Subsystem::in(Login::OPTIONAL, "/" . $RSDB_intern_path); require_once('inc/user_settings.php'); if($RSDB_intern_user_id != 0) { - $query_roscms_user = mysql_query("SELECT * - FROM roscms.users - WHERE `user_id` = '".mysql_escape_string($RSDB_intern_user_id)."' LIMIT 1;") ; - $result_roscms_user = mysql_fetch_array($query_roscms_user); - // Name - $RSDB_USER_name = $result_roscms_user['user_name']; + $RSDB_USER_name = Subsystem::getUserName($RSDB_intern_user_id); // RSDB user settings Modified: branches/danny-web/www/www.reactos.org/support/search.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s… ============================================================================== --- branches/danny-web/www/www.reactos.org/support/search.js [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/support/search.js [iso-8859-1] Tue Apr 21 00:25:29 2009 @@ -13,8 +13,8 @@ var tResults = ""; //var twebsite = "http://localhost/reactos.org/support/index.php"; //var twebsite2 = "http://localhost/reactos.org/"; - var twebsite = "http://www.reactos.org/support/index.php"; - var twebsite2 = "http://www.reactos.org/"; + var twebsite = "http://79.99.5.181/support/index.php"; + var twebsite2 = "http://79.99.5.181/"; function writeItemList_style_header() { @@ -350,4 +350,4 @@ } ---> +--> Modified: branches/danny-web/www/www.reactos.org/support/style.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s… ============================================================================== --- branches/danny-web/www/www.reactos.org/support/style.css [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/support/style.css [iso-8859-1] Tue Apr 21 00:25:29 2009 @@ -3,7 +3,7 @@ font-size: 12px; margin: 0 0 1em 0; padding: 0; /* Only affects Opera */ - background: #FFFFFF url('http://localhost/reactos.org/images/topbar.jpg') repeat-x scroll top left; + background: #FFFFFF url('/roscms/images/topbar.jpg') repeat-x scroll top left; } hr { @@ -100,7 +100,7 @@ /* set by the generator */ a.extern { - background: url('http://localhost/reactos.org/wiki/stylesheets/monobook/external.png') no-repeat center right; + background: url('/wiki/stylesheets/monobook/external.png') no-repeat center right; padding-right: 14px; } @@ -111,12 +111,12 @@ } #content li { - list-style-image: url('http://localhost/reactos.org/images/bullet.png') + list-style-image: url('/roscms/images/bullet.png') } #top { margin: 0; - background: url('http://localhost/reactos.org/support/images/logo_rsdb.jpg') no-repeat scroll 35px 0; + background: url('/support/images/logo_rsdb.jpg') no-repeat scroll 35px 0; padding: 103px 0 26px 0; color: #FFFFFF; text-align: right;

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