Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[ros-arm-bringup] 32233: A couple of header fixes to get all the FreeLDR-loaded boot drivers to compile and link. FreeLDR now stops at ArmPrepareForReactOS, when we get to enable the MMU, Caches and other such fun stuff. Bring-up now really starts!

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Feb 9 03:59:05 2008 New Revision: 32233 URL: http://svn.reactos.org/svn/reactos?rev=32233&view=rev Log: A couple of header fixes to get all the FreeLDR-loaded boot drivers to compile and link. FreeLDR now stops at ArmPrepareForReactOS, when we get to enable the MMU, Caches and other such fun stuff. Bring-up now really starts! Modified: trunk/reactos/include/ddk/ndis.h trunk/reactos/include/ndk/arm/ketypes.h trunk/reactos/include/reactos/armddk.h Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=322… ============================================================================== --- trunk/reactos/include/ddk/ndis.h (original) +++ trunk/reactos/include/ddk/ndis.h Sat Feb 9 03:59:05 2008 @@ -2285,7 +2285,7 @@ #endif -#if defined(_M_IX86) || defined(_M_AMD64) +#if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_ARM) /* * VOID Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h (original) +++ trunk/reactos/include/ndk/arm/ketypes.h Sat Feb 9 03:59:05 2008 @@ -230,16 +230,5 @@ return PCR->Prcb; } -// -// Macro to get current CPU -// -FORCEINLINE -ULONG -DDKAPI -KeGetCurrentProcessorNumber(VOID) -{ - return PCR->Number; -} - #endif #endif Modified: trunk/reactos/include/reactos/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/armddk.h?r… ============================================================================== --- trunk/reactos/include/reactos/armddk.h (original) +++ trunk/reactos/include/reactos/armddk.h Sat Feb 9 03:59:05 2008 @@ -21,6 +21,11 @@ #define USPCR 0x7FFF0000 #define PCR ((volatile KPCR * const)USPCR) #define USERPCR ((volatile KPCR * const)KIPCR) + +// +// Just read it from the PCR +// +#define KeGetCurrentProcessorNumber() ((ULONG)(PCR->Number)) // // Stub

16 years, 10 months

[hpoussin] 32232: Add support for .idl files Various fixes

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Feb 8 23:49:38 2008 New Revision: 32232 URL: http://svn.reactos.org/svn/reactos?rev=32232&view=rev Log: Add support for .idl files Various fixes Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=32232&r1=… ============================================================================== --- trunk/tools/wineimport.cmd (original) +++ trunk/tools/wineimport.cmd Fri Feb 8 23:49:38 2008 @@ -1,6 +1,6 @@ @ECHO OFF -REM Copyright (C) 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) +REM Copyright (C) 2006-2008 Hervé Poussineau (hpoussin(a)reactos.org) SET WINE_TMPFILE1=tmpfile1.wine @@ -20,6 +20,7 @@ ECHO %0 merge {path_to_reactos} {wine_lib} [{wine_lib} ...] ECHO %0 make {path_to_reactos} {wine_lib} [{wine_lib} ...] ECHO %0 fullprocessing {path_to_reactos} {wine_lib} [{wine_lib} ...] +COLOR 00 GOTO :eof REM **************************************************************************** @@ -109,10 +110,10 @@ SET WINE_OPTION1= SET WINE_OPTION2= -IF "%WINE_HAS_DLLMAIN%" == "0" ( - IF "%WINE_IS_EXE%" == "0" ( - SET WINE_OPTION1= entrypoint="0" - ) +IF "%WINE_IS_EXE%" == "0" ( + SET WINE_OPTION1= entrypoint="0" +) ELSE IF "%WINE_HAS_DLLMAIN%" == "0" ( + SET WINE_OPTION1= entrypoint="0" ) IF "%WINE_IS_EXE%" == "0" ( SET WINE_LOWER=abcdefghijklmnopqrstuvwxyz0123456789_. @@ -128,6 +129,11 @@ ) SET WINE_OPTION2= baseaddress="${BASEADDRESS_!WINE_UPPERCASE!}" ) +SETLOCAL DISABLEDELAYEDEXPANSION +ECHO ^<?xml version="1.0"?^> +ECHO ^<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"^> +SETLOCAL ENABLEDELAYEDEXPANSION +ECHO ^<group^> ECHO ^<module name="%WINE_SHORT_NAME%" type="%WINE_MODULE_TYPE%"%WINE_OPTION2% installbase="%WINE_INSTALL_BASE%" installname="%WINE_INSTALL_NAME%" allowwarnings="true"%WINE_OPTION1%^> IF "%WINE_HAS_DLLINSTALL%" == "1" ( IF "%WINE_HAS_DLLREGISTERSERVER%" == "1" ( @@ -146,19 +152,21 @@ ECHO ^<include base="%WINE_SHORT_NAME%"^>.^</include^> IF "%WINE_IS_EXE%" == "0" ( ECHO ^<include base="ReactOS"^>include/reactos/wine^</include^> - ECHO ^<define name="__REACTOS__" /^> ECHO ^<define name="__WINESRC__" /^> ) -ECHO ^<define name="__USE_W32API" /^> -ECHO ^<define name="_WIN32_IE"^>0x600^</define^> -ECHO ^<define name="_WIN32_WINNT"^>0x501^</define^> -ECHO ^<define name="WINVER"^>0x501^</define^> -ECHO ^<library^>wine^</library^> +ECHO ^<define name="WINVER"^>0x600^</define^> +ECHO ^<define name="_WIN32_WINNT"^>0x600^</define^> SET WINE_FULL_LINE= SET WINE_END_PREC_LINE= SET WINE_VARTYPE=0 -SET WINE_HAS_NTDLL= SET WINE_HAS_IDL= +SET WINE_LIBRARIES=wine +SET WINE_DEPENDENCIES= +SET WINE_IDL_GEN_I_SRCS= +SET WINE_IDL_GEN_C_SRCS= +SET WINE_IDL_GEN_S_SRCS= +SET WINE_IDL_GEN_P_SRCS= +SET WINE_IDL_GEN_TLB_SRCS= FOR /F "eol=# delims=" %%l IN (%WINE_TMPFILE1%) DO ( CALL :internal_analyseline %%l ) @@ -171,7 +179,50 @@ IF EXIST "%WINE_RELATIVE_WINE%\%WINE_MODULE_NAME%.spec" ( ECHO ^<file^>%WINE_MODULE_NAME%.spec^</file^> ) +FOR %%j IN (%WINE_LIBRARIES%) DO ( + ECHO ^<library^>%%j^</library^> +) +ECHO ^<library^>ntdll^</library^> +FOR %%j IN (%WINE_DEPENDENCIES%) DO ( + ECHO ^<dependency^>%%j^</dependency^> +) ECHO ^</module^> +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 ^<file^>%%j^</file^> + ECHO ^</module^> +) +FOR %%j IN (%WINE_IDL_GEN_C_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!_client" type="rpcclient" allowwarnings="true"^> + ECHO ^<file^>%%j^</file^> + ECHO ^</module^> +) +FOR %%j IN (%WINE_IDL_GEN_S_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!_server" type="rpcserver" allowwarnings="true"^> + ECHO ^<file^>%%j^</file^> + ECHO ^</module^> +) +FOR %%j IN (%WINE_IDL_GEN_P_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!_proxy" type="rpcproxy" allowwarnings="true"^> + ECHO ^<file^>%%j^</file^> + ECHO ^</module^> +) +FOR %%j IN (%WINE_IDL_GEN_TLB_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!_typelib" type="embeddedtypelib" allowwarnings="true"^> + ECHO ^<file^>%%j^</file^> + ECHO ^</module^> +) +ECHO ^</group^> DEL %WINE_TMPFILE1% GOTO :eof @@ -183,16 +234,40 @@ FOR /F "tokens=2* delims= " %%h IN ("%WINE_FULL_LINE%") DO ( FOR %%j IN (%%i) DO ( IF "%WINE_VARTYPE%" == "1" ( - IF "!WINE_HAS_NTDLL!" == "" ( - ECHO ^<library^>ntdll^</library^> - SET WINE_HAS_NTDLL=1 - ) ECHO ^<file^>%%j^</file^> ) ELSE IF "%WINE_VARTYPE%" == "2" ( - ECHO ^<library^>%%j^</library^> - IF "%%j" == "ntdll" SET WINE_HAS_NTDLL=1 - ) ELSE ( - IF "%%j" == "-luuid" ECHO ^<library^>uuid^</library^> + if NOT "%%j" == "ntdll" ( + SET WINE_LIBRARIES=!WINE_LIBRARIES! %%j + ) + ) ELSE IF "%WINE_VARTYPE%" == "3" ( + IF "%%j" == "-luuid" ( + SET WINE_LIBRARIES=!WINE_LIBRARIES! uuid + ) + ) 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_IDL_GEN_I_SRCS=!WINE_IDL_GEN_I_SRCS! %%j + ) ELSE IF "%WINE_VARTYPE%" == "5" ( + SET WINE_SHORT_NAME=%%j + SET WINE_SHORT_NAME=!WINE_SHORT_NAME:~0,-4! + SET WINE_LIBRARIES=%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_client !WINE_LIBRARIES! + SET WINE_IDL_GEN_C_SRCS=!WINE_IDL_GEN_C_SRCS! %%j + ) ELSE IF "%WINE_VARTYPE%" == "6" ( + SET WINE_SHORT_NAME=%%j + SET WINE_SHORT_NAME=!WINE_SHORT_NAME:~0,-4! + SET WINE_LIBRARIES=%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_server !WINE_LIBRARIES! + SET WINE_IDL_GEN_S_SRCS=!WINE_IDL_GEN_S_SRCS! %%j + ) ELSE IF "%WINE_VARTYPE%" == "7" ( + SET WINE_SHORT_NAME=%%j + SET WINE_SHORT_NAME=!WINE_SHORT_NAME:~0,-4! + SET WINE_LIBRARIES=%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_proxy !WINE_LIBRARIES! + SET WINE_IDL_GEN_P_SRCS=!WINE_IDL_GEN_P_SRCS! %%j + ) ELSE IF "%WINE_VARTYPE%" == "8" ( + SET WINE_SHORT_NAME=%%j + SET WINE_SHORT_NAME=!WINE_SHORT_NAME:~0,-4! + SET WINE_DEPENDENCIES=%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_typelib !WINE_DEPENDENCIES! + SET WINE_IDL_GEN_TLB_SRCS=!WINE_IDL_GEN_TLB_SRCS! %%j ) ) ) @@ -207,6 +282,18 @@ ) ELSE IF "%1" == "IDL_H_SRCS" ( SET WINE_VARTYPE=1 SET WINE_HAS_IDL=1 + ) ELSE IF "%1" == "IDL_C_SRCS" ( + SET WINE_VARTYPE=5 + SET WINE_HAS_IDL=1 + ) ELSE IF "%1" == "IDL_S_SRCS" ( + SET WINE_VARTYPE=6 + SET WINE_HAS_IDL=1 + ) ELSE IF "%1" == "IDL_P_SRCS" ( + SET WINE_VARTYPE=7 + SET WINE_HAS_IDL=1 + ) ELSE IF "%1" == "IDL_TLB_SRCS" ( + SET WINE_VARTYPE=8 + SET WINE_HAS_IDL=1 ) ELSE IF "%1" == "IMPORTS" ( SET WINE_VARTYPE=2 ) ELSE IF "%1" == "DELAYIMPORTS" ( @@ -238,8 +325,8 @@ :link IF "%3" == "" GOTO help IF NOT "%4" == "" GOTO help -IF NOT EXIST "%2\ReactOS.rbuild" ( - ECHO %2\ReactOS.rbuild doesn't exit. +IF NOT EXIST "%2\ReactOS-generic.rbuild" ( + ECHO %2\ReactOS-generic.rbuild doesn't exist. GOTO :help ) SET WINE_RELATIVE_WINE=wine\dlls\%3 @@ -265,8 +352,8 @@ :merge IF "%3" == "" GOTO help -IF NOT EXIST "%2\ReactOS.rbuild" ( - ECHO %2\ReactOS.rbuild doesn't exit. +IF NOT EXIST "%2\ReactOS-generic.rbuild" ( + ECHO %2\ReactOS-generic.rbuild doesn't exist. GOTO :help ) SET WINE_ROS_DIR=%2 @@ -276,12 +363,20 @@ SET WINE_RELATIVE_WINE=wine\dlls\%2 SET WINE_RELATIVE_ROS=%WINE_ROS_DIR%\dll\win32\%2 CALL :internal_merge %2 +IF ERRORLEVEL 1 ( + COLOR 00 + GOTO :eof +) SET WINE_RELATIVE_WINE=wine\dlls\%2\tests SET WINE_RELATIVE_ROS=%WINE_ROS_DIR%\modules\rostests\winetests\%2 IF EXIST "%WINE_RELATIVE_WINE%\." ( IF EXIST "%WINE_ROS_DIR%\modules\rostests\winetests\." ( CALL :internal_create_testlist CALL :internal_merge %2 + IF ERRORLEVEL 1 ( + COLOR 00 + GOTO :eof + ) ) ELSE ( ECHO WARNING: tests for %2 will NOT be updated! ) @@ -292,31 +387,10 @@ IF NOT EXIST "%WINE_RELATIVE_WINE%" GOTO :eof 2>NUL MKDIR "%WINE_RELATIVE_ROS%" ATTRIB -R "%WINE_RELATIVE_ROS%\*" >NUL -COPY /Y "%WINE_RELATIVE_WINE%\*.*" "%WINE_RELATIVE_ROS%" >NUL +>NUL XCOPY /Y /S "%WINE_RELATIVE_WINE%\*.*" "%WINE_RELATIVE_ROS%" +2>NUL RD /S /Q "%WINE_RELATIVE_ROS%\tests" SET WINE_FILES_DELETED= -FOR /F "delims=" %%f IN ('DIR /B "%WINE_RELATIVE_ROS%\*.*"') DO ( - IF "%%f" == ".cvsignore" ( - svn.exe delete --force "%WINE_RELATIVE_ROS%\%%f" 2>NUL - DEL /Q "%WINE_RELATIVE_ROS%\%%f" 2>NUL - ) ELSE IF "%%f" == "Makefile.in" ( - svn.exe delete --force "%WINE_RELATIVE_ROS%\%%f" 2>NUL - DEL /Q "%WINE_RELATIVE_ROS%\%%f" 2>NUL - ) ELSE IF NOT EXIST "%WINE_RELATIVE_WINE%\%%f" ( - SET WINE_FILE=%%f - IF NOT "!WINE_FILE:~-9!" == "_ros.diff" ( - svn.exe delete "%WINE_RELATIVE_ROS%\%%f" 2>NUL - IF ERRORLEVEL 2 GOTO :helpsvn - IF EXIST "%WINE_RELATIVE_ROS%\%%f" DEL /Q "%WINE_RELATIVE_ROS%\%%f" - IF EXIST "%WINE_RELATIVE_ROS%\%%f" RD /S /Q "%WINE_RELATIVE_ROS%\%%f" - SET WINE_FILES_DELETED=!WINE_FILES_DELETED! %%f - ) - ) ELSE ( - svn.exe add "%WINE_RELATIVE_ROS%\%%f" 2>NUL - IF ERRORLEVEL 2 GOTO :helpsvn - svn.exe propset svn:eol-style native "%WINE_RELATIVE_ROS%\%%f" >NUL 2>NUL - SET >NUL - ) -) +CALL :internal_merge_directory SET WINE_PATCH_FILE=%1_ros.diff IF EXIST "%WINE_RELATIVE_ROS%\%WINE_PATCH_FILE%" ( svn.exe add "%WINE_RELATIVE_ROS%\%WINE_PATCH_FILE%" 2>NUL @@ -341,6 +415,41 @@ ) GOTO :eof +:internal_merge_directory +SET WINE_RELATIVE_DIR=%1 +2>NUL RD /S /Q "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\CVS" +FOR /F "delims=" %%f IN ('DIR /B /A-D "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\"') DO ( + IF "%%f" == ".cvsignore" ( + svn.exe delete --force "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" 2>NUL + DEL /Q "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" 2>NUL + ) ELSE IF "%%f" == "Makefile.in" ( + svn.exe delete --force "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" 2>NUL + DEL /Q "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" 2>NUL + ) ELSE IF NOT EXIST "%WINE_RELATIVE_WINE%%WINE_RELATIVE_DIR%\%%f" ( + SET WINE_FILE=%%f + IF NOT "!WINE_FILE:~-9!" == "_ros.diff" ( + svn.exe delete "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" 2>NUL + IF ERRORLEVEL 2 GOTO :helpsvn + IF EXIST "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" DEL /Q "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" + IF EXIST "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" RD /S /Q "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" + SET WINE_FILES_DELETED=!WINE_FILES_DELETED! %%f + ) + ) ELSE ( + svn.exe add "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" 2>NUL + IF ERRORLEVEL 2 GOTO :helpsvn + svn.exe propset svn:eol-style native "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" >NUL 2>NUL + SET >NUL + ) +) +FOR /F "delims=" %%f IN ('DIR /B /AD "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\"') DO ( + IF NOT "%%f" == ".svn" ( + 2>NUL MKDIR "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" + svn.exe add "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" 2>NUL + CALL :internal_merge_directory %WINE_RELATIVE_DIR%\%%f + ) +) +goto :eof + :internal_create_testlist SET WINE_TESTLIST=%WINE_RELATIVE_WINE%\testlist.c SET WINE_FULL_LINE= @@ -413,8 +522,8 @@ SETLOCAL ENABLEEXTENSIONS SETLOCAL ENABLEDELAYEDEXPANSION IF "%3" == "" GOTO help -IF NOT EXIST "%2\ReactOS.rbuild" ( - ECHO %2\ReactOS.rbuild doesn't exit. +IF NOT EXIST "%2\ReactOS-i386.rbuild" ( + ECHO %2\ReactOS-i386.rbuild doesn't exist. GOTO :help ) SET WINE_LIST= @@ -430,7 +539,7 @@ GOTO make_filllist :make_doit PUSHD "%WINE_ROS_DIR%" -make.exe %WINE_LIST% +mingw32-make.exe %WINE_LIST% POPD GOTO :eof @@ -466,7 +575,7 @@ ) >NUL CALL :link link "%WINE_ROS_DIR%" %%m ) -CALL :merge merge "%WINE_ROS_DIR%" %WINE_LIST% +CALL :merge merge %WINE_ROS_DIR% %WINE_LIST% IF ERRORLEVEL 1 GOTO :eof IF EXIST "%WINE_ROS_DIR%\makefile.auto" DEL "%WINE_ROS_DIR%\makefile.auto" CALL :make make "%WINE_ROS_DIR%" %WINE_NEW_LIST%

16 years, 10 months

[fireball] 32231: Kamil Hornicek <tykef@atlas.cz> - Add TRACEs to unimplemented functions.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Feb 8 23:11:56 2008 New Revision: 32231 URL: http://svn.reactos.org/svn/reactos?rev=32231&view=rev Log: Kamil Hornicek <tykef(a)atlas.cz> - Add TRACEs to unimplemented functions. Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c Fri Feb 8 23:11:56 2008 @@ -123,7 +123,8 @@ PLSA_UNICODE_STRING UserRights, ULONG CountOfRights) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p,0x%08x) stub\n", PolicyHandle, AccountSid, UserRights, CountOfRights); + return STATUS_NOT_IMPLEMENTED; } /* @@ -138,7 +139,9 @@ ACCESS_MASK DesiredAccess, PLSA_HANDLE TrustedDomainHandle) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p,0x%08x,%p) stub\n", PolicyHandle, TrustedDomainInformation, AuthenticationInformation, + DesiredAccess, TrustedDomainHandle); + return STATUS_NOT_IMPLEMENTED; } /* @@ -150,7 +153,8 @@ LSA_HANDLE PolicyHandle, PSID TrustedDomainSid) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p) stub\n", PolicyHandle, TrustedDomainSid); + return STATUS_NOT_IMPLEMENTED; } /* @@ -164,7 +168,8 @@ PLSA_UNICODE_STRING *UserRights, PULONG CountOfRights) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p,%p) stub\n", PolicyHandle, AccountSid, UserRights, CountOfRights); + return STATUS_NOT_IMPLEMENTED; } /* @@ -178,7 +183,8 @@ PVOID *EnumerationBuffer, PULONG CountReturned) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p,%p) stub\n", PolicyHandle, UserRights, EnumerationBuffer, CountReturned); + return STATUS_NOT_IMPLEMENTED; } /* @@ -193,7 +199,9 @@ ULONG PreferedMaximumLength, PULONG CountReturned) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p,0x%08x,%p) stub\n", PolicyHandle, EnumerationContext, + Buffer, PreferedMaximumLength, CountReturned); + return STATUS_NOT_IMPLEMENTED; } /* @@ -208,7 +216,9 @@ ULONG PreferedMaximumLength, PULONG CountReturned) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p,0x%08x,%p) stub\n", PolicyHandle, EnumerationContext, Buffer, + PreferedMaximumLength, CountReturned); + return STATUS_NOT_IMPLEMENTED; } /* @@ -217,7 +227,8 @@ NTSTATUS STDCALL LsaFreeMemory(PVOID Buffer) { - return RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + TRACE("(%p)\n", Buffer); + return RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); } /* @@ -236,6 +247,9 @@ LSA_TRANSLATED_SID *TranslatedSids; ULONG i; NTSTATUS Status; + + TRACE("(%p,0x%08x,%p,%p,%p)\n", PolicyHandle, Count, Names, + ReferencedDomains, Sids); /* Call LsaLookupNames2, which supersedes this function */ Status = LsaLookupNames2(PolicyHandle, Count, 0, Names, ReferencedDomains, &Sids2); @@ -300,6 +314,9 @@ static const UNICODE_STRING UserName = RTL_CONSTANT_STRING(L"Administrator"); PLSA_REFERENCED_DOMAIN_LIST LocalDomains; PLSA_TRANSLATED_NAME LocalNames; + + FIXME("(%p,%u,%p,%p,%p) stub\n", PolicyHandle, Count, Sids, + ReferencedDomains, Names); WARN("LsaLookupSids(): stub. Always returning 'Administrator'\n"); if (Count != 1) @@ -337,7 +354,8 @@ ULONG STDCALL LsaNtStatusToWinError(NTSTATUS Status) { - return RtlNtStatusToDosError(Status); + TRACE("(%lx)\n", Status); + return RtlNtStatusToDosError(Status); } /****************************************************************************** @@ -378,7 +396,8 @@ ACCESS_MASK DesiredAccess, PLSA_HANDLE TrustedDomainHandle) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,0x%08x,%p) stub\n", PolicyHandle, TrustedDomainName, DesiredAccess, TrustedDomainHandle); + return STATUS_NOT_IMPLEMENTED; } /* @@ -388,10 +407,11 @@ STDCALL LsaQueryDomainInformationPolicy( LSA_HANDLE PolicyHandle, - POLICY_DOMAIN_INFORMATION_CLASS pic, + POLICY_DOMAIN_INFORMATION_CLASS InformationClass, PVOID *Buffer) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,0x%08x,%p)\n", PolicyHandle, InformationClass, Buffer); + return STATUS_NOT_IMPLEMENTED; } /* @@ -404,7 +424,8 @@ PLSA_UNICODE_STRING TrustedDomainName, PLSA_FOREST_TRUST_INFORMATION * ForestTrustInfo) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p) stub\n", PolicyHandle, TrustedDomainName, ForestTrustInfo); + return STATUS_NOT_IMPLEMENTED; } /* @@ -415,7 +436,7 @@ POLICY_INFORMATION_CLASS pic, PVOID *Buffer) { - TRACE("(%p,0x%08x,%p):LsaQueryInformationPolicy stub\n", + FIXME("(%p,0x%08x,%p) stub\n", PolicyHandle, pic, Buffer); if (!Buffer) @@ -508,10 +529,11 @@ LsaQueryTrustedDomainInfoByName( LSA_HANDLE PolicyHandle, PLSA_UNICODE_STRING TrustedDomainName, - TRUSTED_INFORMATION_CLASS pic, + TRUSTED_INFORMATION_CLASS InformationClass, PVOID *Buffer) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainName, InformationClass, Buffer); + return STATUS_NOT_IMPLEMENTED; } /* @@ -522,10 +544,11 @@ LsaQueryTrustedDomainInfo( LSA_HANDLE PolicyHandle, PSID TrustedDomainSid, - TRUSTED_INFORMATION_CLASS pic, + TRUSTED_INFORMATION_CLASS InformationClass, PVOID *Buffer) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainSid, InformationClass, Buffer); + return STATUS_NOT_IMPLEMENTED; } /* @@ -540,7 +563,8 @@ PLSA_UNICODE_STRING UserRights, ULONG CountOfRights) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%d,%p,0x%08x) stub\n", PolicyHandle, AccountSid, AllRights, UserRights, CountOfRights); + return STATUS_NOT_IMPLEMENTED; } /* @@ -553,7 +577,8 @@ PLSA_UNICODE_STRING KeyName, PLSA_UNICODE_STRING *PrivateData) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p) stub\n", PolicyHandle, KeyName, PrivateData); + return STATUS_NOT_IMPLEMENTED; } /* @@ -563,10 +588,11 @@ STDCALL LsaSetDomainInformationPolicy( LSA_HANDLE PolicyHandle, - POLICY_DOMAIN_INFORMATION_CLASS pic, + POLICY_DOMAIN_INFORMATION_CLASS InformationClass, PVOID Buffer) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,0x%08x,%p) stub\n", PolicyHandle, InformationClass, Buffer); + return STATUS_NOT_IMPLEMENTED; } /* @@ -576,10 +602,11 @@ STDCALL LsaSetInformationPolicy( LSA_HANDLE PolicyHandle, - POLICY_INFORMATION_CLASS pic, + POLICY_INFORMATION_CLASS InformationClass, PVOID Buffer) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,0x%08x,%p) stub\n", PolicyHandle, InformationClass, Buffer); + return STATUS_NOT_IMPLEMENTED; } /* @@ -594,7 +621,8 @@ BOOL CheckOnly, PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainName, ForestTrustInfo, CheckOnly, CollisionInfo); + return STATUS_NOT_IMPLEMENTED; } /* @@ -605,10 +633,11 @@ LsaSetTrustedDomainInfoByName( LSA_HANDLE PolicyHandle, PLSA_UNICODE_STRING TrustedDomainName, - TRUSTED_INFORMATION_CLASS pic, + TRUSTED_INFORMATION_CLASS InformationClass, PVOID Buffer) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainName, InformationClass, Buffer); + return STATUS_NOT_IMPLEMENTED; } /* @@ -619,10 +648,11 @@ LsaSetTrustedDomainInformation( LSA_HANDLE PolicyHandle, PSID TrustedDomainSid, - TRUSTED_INFORMATION_CLASS pic, + TRUSTED_INFORMATION_CLASS InformationClass, PVOID Buffer) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainSid, InformationClass, Buffer); + return STATUS_NOT_IMPLEMENTED; } /* @@ -635,7 +665,8 @@ PLSA_UNICODE_STRING KeyName, PLSA_UNICODE_STRING PrivateData) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p) stub\n", PolicyHandle, KeyName, PrivateData); + return STATUS_NOT_IMPLEMENTED; } /* @@ -647,9 +678,8 @@ PUNICODE_STRING *UserName, PUNICODE_STRING *DomainName) { - FIXME("%s() not implemented!\n", __FUNCTION__); - - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p) stub\n", UserName, DomainName); + return STATUS_NOT_IMPLEMENTED; } /* @@ -661,9 +691,8 @@ DWORD Unknonw1, DWORD Unknonw2) { - FIXME("%s() not implemented!\n", __FUNCTION__);; - - return STATUS_NOT_IMPLEMENTED; + FIXME("(%d,%d,%d) stub\n", Unknonw0, Unknonw1, Unknonw2); + return STATUS_NOT_IMPLEMENTED; }

16 years, 10 months

[hpoussin] 32230: Use a generic .spec file, instead of a .def file per architecture

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Feb 8 22:59:30 2008 New Revision: 32230 URL: http://svn.reactos.org/svn/reactos?rev=32230&view=rev Log: Use a generic .spec file, instead of a .def file per architecture Added: trunk/reactos/drivers/storage/class/class2/class2.spec (with props) Removed: trunk/reactos/drivers/storage/class/class2/class2_arm.def trunk/reactos/drivers/storage/class/class2/class2_i386.def Modified: trunk/reactos/drivers/storage/class/class2/class2.c (props changed) trunk/reactos/drivers/storage/class/class2/class2.rbuild trunk/reactos/drivers/storage/class/class2/class2.rc (contents, props changed) trunk/reactos/drivers/storage/class/class2/license.txt (contents, props changed) Propchange: trunk/reactos/drivers/storage/class/class2/class2.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/storage/class/class2/class2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.rbuild (original) +++ trunk/reactos/drivers/storage/class/class2/class2.rbuild Fri Feb 8 22:59:30 2008 @@ -2,11 +2,12 @@ <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="class2" type="kernelmodedriver" installbase="system32/drivers" installname="class2.sys"> <bootstrap installbase="$(CDOUTPUT)" /> - <importlibrary definition="class2_$(ARCH).def" /> + <importlibrary definition="class2.spec.def" /> <library>ntoskrnl</library> <library>hal</library> <library>scsiport</library> <include base="class2">..</include> <file>class2.c</file> <file>class2.rc</file> + <file>class2.spec</file> </module> Modified: trunk/reactos/drivers/storage/class/class2/class2.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.rc (original) +++ trunk/reactos/drivers/storage/class/class2/class2.rc Fri Feb 8 22:59:30 2008 @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: class2.rc 26227 2007-04-01 16:29:16Z fireball $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "SCSI Class Driver Helper\0" Propchange: trunk/reactos/drivers/storage/class/class2/class2.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Added: trunk/reactos/drivers/storage/class/class2/class2.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.spec (added) +++ trunk/reactos/drivers/storage/class/class2/class2.spec Fri Feb 8 22:59:30 2008 @@ -1,0 +1,22 @@ +@ stdcall ScsiClassAsynchronousCompletion(ptr ptr ptr) +@ stdcall ScsiClassBuildRequest(ptr ptr) +@ stdcall ScsiClassClaimDevice(ptr ptr long ptr) +@ stdcall ScsiClassCreateDeviceObject(ptr ptr ptr ptr ptr) +@ stdcall ScsiClassDeviceControl(ptr ptr) +@ stdcall ScsiClassFindModePage(ptr long long long) +@ stdcall ScsiClassFindUnclaimedDevices(ptr ptr) +@ stdcall ScsiClassGetCapabilities(ptr ptr) +@ stdcall ScsiClassGetInquiryData(ptr ptr) +@ stdcall ScsiClassInitialize(ptr ptr ptr) +@ stdcall ScsiClassInitializeSrbLookasideList(ptr long) +@ stdcall ScsiClassInternalIoControl(ptr ptr) +@ stdcall ScsiClassInterpretSenseInfo(ptr ptr long long long long) +@ stdcall ScsiClassIoComplete(ptr ptr ptr) +@ stdcall ScsiClassIoCompleteAssociated(ptr ptr ptr) +@ stdcall ScsiClassModeSense(ptr ptr long long) +@ stdcall ScsiClassQueryTimeOutRegistryValue(ptr) +@ stdcall ScsiClassReadDriveCapacity(ptr) +@ stdcall ScsiClassReleaseQueue(ptr) +@ stdcall ScsiClassSendSrbAsynchronous(ptr ptr ptr ptr long long) +@ stdcall ScsiClassSendSrbSynchronous(ptr ptr ptr long long) +@ stdcall ScsiClassSplitRequest(ptr ptr long) Propchange: trunk/reactos/drivers/storage/class/class2/class2.spec ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/drivers/storage/class/class2/class2_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2_arm.def (original) +++ trunk/reactos/drivers/storage/class/class2/class2_arm.def (removed) @@ -1,29 +1,0 @@ -; $Id: class2.def 26227 2007-04-01 16:29:16Z fireball $ -; -; class2.def - export definition file for scsi class driver -; -LIBRARY CLASS2.SYS -EXPORTS -ScsiClassAsynchronousCompletion -ScsiClassBuildRequest -ScsiClassClaimDevice -ScsiClassCreateDeviceObject -ScsiClassDeviceControl -ScsiClassFindModePage -ScsiClassFindUnclaimedDevices -ScsiClassGetCapabilities -ScsiClassGetInquiryData -ScsiClassInitialize -ScsiClassInitializeSrbLookasideList -ScsiClassInternalIoControl -ScsiClassInterpretSenseInfo -ScsiClassIoComplete -ScsiClassIoCompleteAssociated -ScsiClassModeSense -ScsiClassQueryTimeOutRegistryValue -ScsiClassReadDriveCapacity -ScsiClassReleaseQueue -ScsiClassSendSrbAsynchronous -ScsiClassSendSrbSynchronous -ScsiClassSplitRequest -;EOF Removed: trunk/reactos/drivers/storage/class/class2/class2_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2_i386.def (original) +++ trunk/reactos/drivers/storage/class/class2/class2_i386.def (removed) @@ -1,29 +1,0 @@ -; $Id$ -; -; class2.def - export definition file for scsi class driver -; -LIBRARY CLASS2.SYS -EXPORTS -ScsiClassAsynchronousCompletion@12 -ScsiClassBuildRequest@8 -ScsiClassClaimDevice@16 -ScsiClassCreateDeviceObject@20 -ScsiClassDeviceControl@8 -ScsiClassFindModePage@16 -ScsiClassFindUnclaimedDevices@8 -ScsiClassGetCapabilities@8 -ScsiClassGetInquiryData@8 -ScsiClassInitialize@12 -ScsiClassInitializeSrbLookasideList@8 -ScsiClassInternalIoControl@8 -ScsiClassInterpretSenseInfo@24 -ScsiClassIoComplete@12 -ScsiClassIoCompleteAssociated@12 -ScsiClassModeSense@16 -ScsiClassQueryTimeOutRegistryValue@4 -ScsiClassReadDriveCapacity@4 -ScsiClassReleaseQueue@4 -ScsiClassSendSrbAsynchronous@24 -ScsiClassSendSrbSynchronous@20 -ScsiClassSplitRequest@12 -;EOF Modified: trunk/reactos/drivers/storage/class/class2/license.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/license.txt (original) +++ trunk/reactos/drivers/storage/class/class2/license.txt Fri Feb 8 22:59:30 2008 @@ -1,53 +1,53 @@ -Window NT Device Driver Kit -END-USER LICENSE AGREEMENT FOR MICROSOFT SOFTWARE - -IMPORTANT-READ CAREFULLY: This Microsoft End-User License Agreement ("EULA") is a legal agreement between you (either an individual or a single entity) and Microsoft Corporation for the Microsoft software product identified above, which includes computer software and associated media and printed materials, and may include "online" or electronic documentation ("SOFTWARE PRODUCT" or "SOFTWARE"). By installing, copying, or otherwise using the SOFTWARE PRODUCT, you agree to be bound by the terms of this EULA. If you do not agree to the terms of this EULA, promptly return the unused SOFTWARE PRODUCT to the place from which you obtained it for a full refund, or if you received the SOFTWARE PRODUCT as part of a subscription or other service from Microsoft, you may cancel the subscription and receive a refund of a prorata portion of the subscription price. - -SOFTWARE PRODUCT LICENSE -The SOFTWARE PRODUCT is protected by copyright laws and international copyright treaties, as well as other intellectual property laws and treaties. The SOFTWARE PRODUCT is licensed, not sold. To develop Windows NT(tm) device drivers, you will need to utilize two computers, one for development and one for debugging. - -1. GRANT OF LICENSE. This EULA grants you the following limited, non-exclusive rights: -* SOFTWARE PRODUCT. (a) You may make two (2) copies of the SOFTWARE PRODUCT for installation and use on two (2) computers, one for use in development and one for use in debugging to design, develop, and test your software product(s), including but not limited to device driver(s) and other software products, for use with Microsoft(r) Windows(r) or Windows NT ("Software Product"). You may make an additional copy of the Windows NT Workstation operating system (licensed and provided separately) for use on a single computer used for debugging purposes. -* Microsoft Developer Network Subscriber. If you acquired the SOFTWARE PRODUCT through a subscription to the Microsoft Developer Network, and you are either an individual developer or an individual designated within a single entity, you are granted the following additional rights with respect to the SOFTWARE PRODUCT: (a) you may make and use copies of the SOFTWARE PRODUCT on up to ten (10) separate computers, provided that you are the only individual using the SOFTWARE PRODUCT on each such computer, and (b) if you are a single entity, you may designate one individual within your organization to have the right to use the SOFTWARE PRODUCT in the manner described herein. -* SAMPLE CODE. You may modify the sample source code ("Sample Code") to design, develop and test your Software Product, and reproduce and distribute the Sample Code with such modifications in source and object code forms, provided that you comply with the Distribution Requirements described below. -* DISTRIBUTION REQUIREMENTS. You may copy and redistribute the Sample Code as described above, provided that (a) you distribute the Sample Code only in conjunction with and as a part of your Software Product; (b) you do not make any statements to the effect or which imply that your Software Product is "certified" by Microsoft or that its performance is guaranteed by Microsoft; (c) you do not use Microsoft's name, logo, or trademarks to market your Software Product; (d) you include a valid copyright notice on your Software Product; and (e) you indemnify, hold harmless, and defend Microsoft from and against any claims or lawsuits, including attorneys' fees, that arise or result from the use or distribution of your Software Product. Contact Microsoft for the applicable royalties due and other licensing terms for all other uses and/or distribution of the Sample Code -* Microsoft reserves all rights not expressly granted to you. - -2. COPYRIGHT. All right, title, and copyrights in and to the SOFTWARE PRODUCT (including but not limited to any images, photographs, animations, video, audio, music, text, and "applets" incorporated into the SOFTWARE PRODUCT), and any copies of the SOFTWARE PRODUCT, are owned by Microsoft or its suppliers. The SOFTWARE PRODUCT is protected by copyright laws and international treaty provisions. Therefore, you must treat the SOFTWARE PRODUCT like any other copyrighted material except that you may either (a) make one copy of the SOFTWARE PRODUCT solely for backup or archival purposes, or (b) install the SOFTWARE PRODUCT on a single computer, provided you keep the original solely for backup or archival purposes. You may not copy the printed materials accompanying the SOFTWARE PRODUCT. - -3. PRERELEASE CODE. The SOFTWARE PRODUCT may contain PRERELEASE CODE that is not at the level of performance and compatibility of the final, generally available, product offering. These portions of the SOFTWARE PRODUCT may not operate correctly and may be substantially modified prior to first commercial shipment. Microsoft is not obligated to make this or any later version of the SOFTWARE PRODUCT commercially available. Microsoft grants you the right to distribute test versions of your Application created using the PRERELEASE CODE provided you comply with the Distribution Requirements described in Section 1 and the following additional provisions: (a) you must mark the test version of your Application "BETA" and (b) you are solely responsible for updating your customers with versions of your Application that operate satisfactorily with the final commercial release of the PRERELEASE CODE. - -4. DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS. -( Limitations on Reverse Engineering, Decompilation, and Disassembly. You may not reverse-engineer, decompile, or disassemble the SOFTWARE PRODUCT, except and only to the extent that such activity is expressly permitted by applicable law notwithstanding this limitation. -( Rental. You may not rent or lease the SOFTWARE PRODUCT. -( Software Transfer. You may permanently transfer all of your rights under this EULA, provided you retain no copies, you transfer all of the SOFTWARE PRODUCT (including all component parts, the media and printed materials, any upgrades, this EULA, and, if applicable, the Certificate of Authenticity), and the recipient agrees to the terms of this EULA. If the SOFTWARE PRODUCT is an upgrade, any transfer must include all prior versions of the SOFTWARE PRODUCT. -( Termination. Without prejudice to any other rights, Microsoft may terminate this EULA if you fail to comply with the terms and conditions of this EULA. In such event, you must destroy all copies of the SOFTWARE PRODUCT and all of its component parts. - -5. EXPORT RESTRICTIONS. You agree that neither you nor your customers intend to or will, directly or indirectly, export or transmit (a) the SOFTWARE PRODUCT or related documentation and technical data or (b) your Application as described in Section 1 of this Agreement (or any part thereof), or process, or service that is the direct product of the SOFTWARE PRODUCT to any country to which such export or transmission is restricted by any applicable U.S. regulation or statute, without the prior written consent, if required, of the Bureau of Export Administration of the U.S. Department of Commerce, or such other governmental entity as may have jurisdiction over such export or transmission. - -NO WARRANTIES. To the maximum extent permitted by applicable law, Microsoft expressly disclaims any warranty for the SOFTWARE PRODUCT. The SOFTWARE PRODUCT and any related documentation are provided "as is" without warranty of any kind, either express or implied, including, without limitation, the implied warranties of merchantability or fitness for a particular purpose. The entire risk arising out of use or performance of the SOFTWARE PRODUCT remains with you. - -LIMITATION OF LIABILITY. Microsoft's entire liability and your exclusive remedy under this EULA shall not exceed one hundred dollars (US$100.00). - -NO LIABILITY FOR CONSEQUENTIAL DAMAGES. To the maximum extent permitted by applicable law, in no event shall Microsoft or its suppliers be liable for any damages whatsoever (including, without limitation, damages for loss of business profit, business interruption, loss of business information, or any other pecuniary loss) arising out of the use or inability to use this Microsoft product, even if Microsoft has been advised of the possibility of such damages. Because some states/jurisdictions do not allow the exclusion or limitation of liability for consequential or incidental damages, the above limitation may not apply to you. - -U.S. GOVERNMENT RESTRICTED RIGHTS.The SOFTWARE and documentation are provided with RESTRICTED RIGHTS. Use, duplication, or disclosure by the Government is subject to restrictions as set forth in subparagraph (c)(1)(ii) of The Rights in Technical Data and Computer Software clause at DFARS 252.227-7013 or subparagraphs (c)(1) and (2) of the Commercial Computer Software -- Restricted Rights at 48 CFR 52.227-19, as applicable. Manufacturer is Microsoft Corporation/One Microsoft Way/Redmond, WA 98052-6399. - -If you acquired this product in the United States, this Agreement is governed by the laws of the State of Washington. If you acquired this product outside the United States, local law may apply. - -Should you have any questions concerning this Agreement, if you desire rights to use the product beyond what is listed here, or if you desire to contact Microsoft for any reason, please contact your local Microsoft subsidiary or sales office or write to: Microsoft Sales and Service, One Microsoft Way, Redmond, WA 98052-6399. - -Si vous avez acquis votre produit Microsoft au CANADA, la garantie limitée suivante vous concerne : - -GARANTIE LIMITÉE - -EXCLUSION DE GARANTIES. Microsoft renonce entièrement à toute garantie pour le LOGICIEL. Le LOGICIEL et toute autre documentation s'y rapportant sont fournis «comme tels» sans aucune garantie quelle qu'elle soit, expresse ou implicite, y compris, mais ne se limitant pas, aux garanties implicites de la qualité marchande ou un usage particulier. Le risque total découlant de l'utilisation ou de la performance du LOGICIEL est entre vos mains. - -RESPONSABILITÉ LIMITÉE. La seule obligation de Microsoft et votre recours exclusif concernant ce contrat n'excèderont pas cent dollars (US$100.00). - -ABSENCE DE RESPONSABILITÉ POUR LES DOMMAGES INDIRECTS. Microsoft ou ses fournisseurs ne pourront être tenus responsables en aucune circonstance de tout dommage quel qu'il soit (y compris mais non de façon limitative aux dommages directs ou indirects causés par la perte de bénéfices commerciaux, l'interruption des affaires, la perte d'information commerciale ou toute autre perte pécuniaire) résultant de l'utilisation ou de l'impossibilité d'utilisation de ce produit, et ce, même si la société Microsoft a été avisée de l'éventualité de tels dommages. Certains états/juridictions ne permettent pas l'exclusion ou la limitation de responsabilité relative aux dommages indirects ou consécutifs, et la limitation ci-dessus peut ne pas s'appliquer à votre égard. - -La présente Convention est régie par les lois de la province d'Ontario, Canada. Chacune des parties à la présente reconnaît irrévocablement la compétence des tribunaux de la province d'Ontario et consent à instituer tout litige qui pourrait découler de la présente auprès des tribunaux situés dans le district judiciaire de York, province d'Ontario. - -Au cas où vous auriez des questions concernant cette licence ou que vous désiriez vous mettre en rapport avec Microsoft pour quelque raison que ce soit, veuillez contacter la succursale Microsoft desservant votre pays, dont l'adresse est fournie dans ce produit, ou écrire à : Microsoft Customer Sales and Service, One Microsoft Way, Redmond, Washington 98052-6399. - +Window NT Device Driver Kit +END-USER LICENSE AGREEMENT FOR MICROSOFT SOFTWARE + +IMPORTANT-READ CAREFULLY: This Microsoft End-User License Agreement ("EULA") is a legal agreement between you (either an individual or a single entity) and Microsoft Corporation for the Microsoft software product identified above, which includes computer software and associated media and printed materials, and may include "online" or electronic documentation ("SOFTWARE PRODUCT" or "SOFTWARE"). By installing, copying, or otherwise using the SOFTWARE PRODUCT, you agree to be bound by the terms of this EULA. If you do not agree to the terms of this EULA, promptly return the unused SOFTWARE PRODUCT to the place from which you obtained it for a full refund, or if you received the SOFTWARE PRODUCT as part of a subscription or other service from Microsoft, you may cancel the subscription and receive a refund of a prorata portion of the subscription price. + +SOFTWARE PRODUCT LICENSE +The SOFTWARE PRODUCT is protected by copyright laws and international copyright treaties, as well as other intellectual property laws and treaties. The SOFTWARE PRODUCT is licensed, not sold. To develop Windows NT(tm) device drivers, you will need to utilize two computers, one for development and one for debugging. + +1. GRANT OF LICENSE. This EULA grants you the following limited, non-exclusive rights: +* SOFTWARE PRODUCT. (a) You may make two (2) copies of the SOFTWARE PRODUCT for installation and use on two (2) computers, one for use in development and one for use in debugging to design, develop, and test your software product(s), including but not limited to device driver(s) and other software products, for use with Microsoft(r) Windows(r) or Windows NT ("Software Product"). You may make an additional copy of the Windows NT Workstation operating system (licensed and provided separately) for use on a single computer used for debugging purposes. +* Microsoft Developer Network Subscriber. If you acquired the SOFTWARE PRODUCT through a subscription to the Microsoft Developer Network, and you are either an individual developer or an individual designated within a single entity, you are granted the following additional rights with respect to the SOFTWARE PRODUCT: (a) you may make and use copies of the SOFTWARE PRODUCT on up to ten (10) separate computers, provided that you are the only individual using the SOFTWARE PRODUCT on each such computer, and (b) if you are a single entity, you may designate one individual within your organization to have the right to use the SOFTWARE PRODUCT in the manner described herein. +* SAMPLE CODE. You may modify the sample source code ("Sample Code") to design, develop and test your Software Product, and reproduce and distribute the Sample Code with such modifications in source and object code forms, provided that you comply with the Distribution Requirements described below. +* DISTRIBUTION REQUIREMENTS. You may copy and redistribute the Sample Code as described above, provided that (a) you distribute the Sample Code only in conjunction with and as a part of your Software Product; (b) you do not make any statements to the effect or which imply that your Software Product is "certified" by Microsoft or that its performance is guaranteed by Microsoft; (c) you do not use Microsoft's name, logo, or trademarks to market your Software Product; (d) you include a valid copyright notice on your Software Product; and (e) you indemnify, hold harmless, and defend Microsoft from and against any claims or lawsuits, including attorneys' fees, that arise or result from the use or distribution of your Software Product. Contact Microsoft for the applicable royalties due and other licensing terms for all other uses and/or distribution of the Sample Code +* Microsoft reserves all rights not expressly granted to you. + +2. COPYRIGHT. All right, title, and copyrights in and to the SOFTWARE PRODUCT (including but not limited to any images, photographs, animations, video, audio, music, text, and "applets" incorporated into the SOFTWARE PRODUCT), and any copies of the SOFTWARE PRODUCT, are owned by Microsoft or its suppliers. The SOFTWARE PRODUCT is protected by copyright laws and international treaty provisions. Therefore, you must treat the SOFTWARE PRODUCT like any other copyrighted material except that you may either (a) make one copy of the SOFTWARE PRODUCT solely for backup or archival purposes, or (b) install the SOFTWARE PRODUCT on a single computer, provided you keep the original solely for backup or archival purposes. You may not copy the printed materials accompanying the SOFTWARE PRODUCT. + +3. PRERELEASE CODE. The SOFTWARE PRODUCT may contain PRERELEASE CODE that is not at the level of performance and compatibility of the final, generally available, product offering. These portions of the SOFTWARE PRODUCT may not operate correctly and may be substantially modified prior to first commercial shipment. Microsoft is not obligated to make this or any later version of the SOFTWARE PRODUCT commercially available. Microsoft grants you the right to distribute test versions of your Application created using the PRERELEASE CODE provided you comply with the Distribution Requirements described in Section 1 and the following additional provisions: (a) you must mark the test version of your Application "BETA" and (b) you are solely responsible for updating your customers with versions of your Application that operate satisfactorily with the final commercial release of the PRERELEASE CODE. + +4. DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS. +( Limitations on Reverse Engineering, Decompilation, and Disassembly. You may not reverse-engineer, decompile, or disassemble the SOFTWARE PRODUCT, except and only to the extent that such activity is expressly permitted by applicable law notwithstanding this limitation. +( Rental. You may not rent or lease the SOFTWARE PRODUCT. +( Software Transfer. You may permanently transfer all of your rights under this EULA, provided you retain no copies, you transfer all of the SOFTWARE PRODUCT (including all component parts, the media and printed materials, any upgrades, this EULA, and, if applicable, the Certificate of Authenticity), and the recipient agrees to the terms of this EULA. If the SOFTWARE PRODUCT is an upgrade, any transfer must include all prior versions of the SOFTWARE PRODUCT. +( Termination. Without prejudice to any other rights, Microsoft may terminate this EULA if you fail to comply with the terms and conditions of this EULA. In such event, you must destroy all copies of the SOFTWARE PRODUCT and all of its component parts. + +5. EXPORT RESTRICTIONS. You agree that neither you nor your customers intend to or will, directly or indirectly, export or transmit (a) the SOFTWARE PRODUCT or related documentation and technical data or (b) your Application as described in Section 1 of this Agreement (or any part thereof), or process, or service that is the direct product of the SOFTWARE PRODUCT to any country to which such export or transmission is restricted by any applicable U.S. regulation or statute, without the prior written consent, if required, of the Bureau of Export Administration of the U.S. Department of Commerce, or such other governmental entity as may have jurisdiction over such export or transmission. + +NO WARRANTIES. To the maximum extent permitted by applicable law, Microsoft expressly disclaims any warranty for the SOFTWARE PRODUCT. The SOFTWARE PRODUCT and any related documentation are provided "as is" without warranty of any kind, either express or implied, including, without limitation, the implied warranties of merchantability or fitness for a particular purpose. The entire risk arising out of use or performance of the SOFTWARE PRODUCT remains with you. + +LIMITATION OF LIABILITY. Microsoft's entire liability and your exclusive remedy under this EULA shall not exceed one hundred dollars (US$100.00). + +NO LIABILITY FOR CONSEQUENTIAL DAMAGES. To the maximum extent permitted by applicable law, in no event shall Microsoft or its suppliers be liable for any damages whatsoever (including, without limitation, damages for loss of business profit, business interruption, loss of business information, or any other pecuniary loss) arising out of the use or inability to use this Microsoft product, even if Microsoft has been advised of the possibility of such damages. Because some states/jurisdictions do not allow the exclusion or limitation of liability for consequential or incidental damages, the above limitation may not apply to you. + +U.S. GOVERNMENT RESTRICTED RIGHTS.The SOFTWARE and documentation are provided with RESTRICTED RIGHTS. Use, duplication, or disclosure by the Government is subject to restrictions as set forth in subparagraph (c)(1)(ii) of The Rights in Technical Data and Computer Software clause at DFARS 252.227-7013 or subparagraphs (c)(1) and (2) of the Commercial Computer Software -- Restricted Rights at 48 CFR 52.227-19, as applicable. Manufacturer is Microsoft Corporation/One Microsoft Way/Redmond, WA 98052-6399. + +If you acquired this product in the United States, this Agreement is governed by the laws of the State of Washington. If you acquired this product outside the United States, local law may apply. + +Should you have any questions concerning this Agreement, if you desire rights to use the product beyond what is listed here, or if you desire to contact Microsoft for any reason, please contact your local Microsoft subsidiary or sales office or write to: Microsoft Sales and Service, One Microsoft Way, Redmond, WA 98052-6399. + +Si vous avez acquis votre produit Microsoft au CANADA, la garantie limitée suivante vous concerne : + +GARANTIE LIMITÉE + +EXCLUSION DE GARANTIES. Microsoft renonce entièrement à toute garantie pour le LOGICIEL. Le LOGICIEL et toute autre documentation s'y rapportant sont fournis «comme tels» sans aucune garantie quelle qu'elle soit, expresse ou implicite, y compris, mais ne se limitant pas, aux garanties implicites de la qualité marchande ou un usage particulier. Le risque total découlant de l'utilisation ou de la performance du LOGICIEL est entre vos mains. + +RESPONSABILITÉ LIMITÉE. La seule obligation de Microsoft et votre recours exclusif concernant ce contrat n'excèderont pas cent dollars (US$100.00). + +ABSENCE DE RESPONSABILITÉ POUR LES DOMMAGES INDIRECTS. Microsoft ou ses fournisseurs ne pourront être tenus responsables en aucune circonstance de tout dommage quel qu'il soit (y compris mais non de façon limitative aux dommages directs ou indirects causés par la perte de bénéfices commerciaux, l'interruption des affaires, la perte d'information commerciale ou toute autre perte pécuniaire) résultant de l'utilisation ou de l'impossibilité d'utilisation de ce produit, et ce, même si la société Microsoft a été avisée de l'éventualité de tels dommages. Certains états/juridictions ne permettent pas l'exclusion ou la limitation de responsabilité relative aux dommages indirects ou consécutifs, et la limitation ci-dessus peut ne pas s'appliquer à votre égard. + +La présente Convention est régie par les lois de la province d'Ontario, Canada. Chacune des parties à la présente reconnaît irrévocablement la compétence des tribunaux de la province d'Ontario et consent à instituer tout litige qui pourrait découler de la présente auprès des tribunaux situés dans le district judiciaire de York, province d'Ontario. + +Au cas où vous auriez des questions concernant cette licence ou que vous désiriez vous mettre en rapport avec Microsoft pour quelque raison que ce soit, veuillez contacter la succursale Microsoft desservant votre pays, dont l'adresse est fournie dans ce produit, ou écrire à : Microsoft Customer Sales and Service, One Microsoft Way, Redmond, Washington 98052-6399. + Propchange: trunk/reactos/drivers/storage/class/class2/license.txt ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 10 months

[hpoussin] 32229: Use a generic .spec file, instead of a .def file per architecture

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Feb 8 22:46:17 2008 New Revision: 32229 URL: http://svn.reactos.org/svn/reactos?rev=32229&view=rev Log: Use a generic .spec file, instead of a .def file per architecture Added: trunk/reactos/drivers/storage/scsiport/scsiport.spec (with props) Removed: trunk/reactos/drivers/storage/scsiport/scsiport_arm.def trunk/reactos/drivers/storage/scsiport/scsiport_i386.def Modified: trunk/reactos/drivers/storage/scsiport/scsiport.rbuild Modified: trunk/reactos/drivers/storage/scsiport/scsiport.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.rbuild (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.rbuild Fri Feb 8 22:46:17 2008 @@ -3,10 +3,11 @@ <module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys"> <bootstrap installbase="$(CDOUTPUT)" /> <define name="_SCSIPORT_" /> - <importlibrary definition="scsiport_$(ARCH).def" /> + <importlibrary definition="scsiport.spec.def" /> <include base="scsiport">.</include> <library>ntoskrnl</library> <library>hal</library> <file>scsiport.c</file> <file>scsiport.rc</file> + <file>scsiport.spec</file> </module> Added: trunk/reactos/drivers/storage/scsiport/scsiport.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.spec (added) +++ trunk/reactos/drivers/storage/scsiport/scsiport.spec Fri Feb 8 22:46:17 2008 @@ -1,0 +1,45 @@ +@ cdecl ScsiDebugPrint() +@ stdcall ScsiPortCompleteRequest(ptr long long long long) +@ stdcall ScsiPortConvertPhysicalAddressToUlong(long long) +@ stdcall ScsiPortConvertUlongToPhysicalAddress(long) NTOSKRNL.RtlConvertUlongToLargeInteger +@ stdcall ScsiPortFlushDma(ptr) +@ stdcall ScsiPortFreeDeviceBase(ptr ptr) +@ stdcall ScsiPortGetBusData(ptr long long long ptr long) +@ stdcall ScsiPortGetDeviceBase(ptr long long long long long long) +@ stdcall ScsiPortGetLogicalUnit(ptr long long long) +@ stdcall ScsiPortGetPhysicalAddress(ptr ptr ptr long) +@ stdcall ScsiPortGetSrb(ptr long long long long) +@ stdcall ScsiPortGetUncachedExtension(ptr ptr long) +@ stdcall ScsiPortGetVirtualAddress(ptr long long) +@ stdcall ScsiPortInitialize(ptr ptr ptr ptr) +@ stdcall ScsiPortIoMapTransfer(ptr ptr long long) +@ stdcall ScsiPortLogError(ptr ptr long long long long long) +@ stdcall ScsiPortMoveMemory(ptr ptr long) +@ cdecl ScsiPortNotification() +@ stdcall ScsiPortReadPortBufferUchar(ptr ptr long) HAL.READ_PORT_BUFFER_UCHAR +@ stdcall ScsiPortReadPortBufferUshort(ptr ptr long) HAL.READ_PORT_BUFFER_USHORT +@ stdcall ScsiPortReadPortBufferUlong(ptr ptr long) HAL.READ_PORT_BUFFER_ULONG +@ stdcall ScsiPortReadPortUchar(ptr) HAL.READ_PORT_UCHAR +@ stdcall ScsiPortReadPortUshort(ptr) HAL.READ_PORT_USHORT +@ stdcall ScsiPortReadPortUlong(ptr) HAL.READ_PORT_ULONG +@ stdcall ScsiPortReadRegisterBufferUchar(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_UCHAR +@ stdcall ScsiPortReadRegisterBufferUshort(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_USHORT +@ stdcall ScsiPortReadRegisterBufferUlong(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_ULONG +@ stdcall ScsiPortReadRegisterUchar(ptr) NTOSKRNL.READ_REGISTER_UCHAR +@ stdcall ScsiPortReadRegisterUshort(ptr) NTOSKRNL.READ_REGISTER_USHORT +@ stdcall ScsiPortReadRegisterUlong(ptr) NTOSKRNL.READ_REGISTER_ULONG +@ stdcall ScsiPortSetBusDataByOffset(ptr long long long ptr long long) +@ stdcall ScsiPortStallExecution(long) HAL.KeStallExecutionProcessor +@ stdcall ScsiPortValidateRange(ptr long long long long long long) +@ stdcall ScsiPortWritePortBufferUchar(ptr ptr long) HAL.WRITE_PORT_BUFFER_UCHAR +@ stdcall ScsiPortWritePortBufferUshort(ptr ptr long) HAL.WRITE_PORT_BUFFER_USHORT +@ stdcall ScsiPortWritePortBufferUlong(ptr ptr long) HAL.WRITE_PORT_BUFFER_ULONG +@ stdcall ScsiPortWritePortUchar(ptr long) HAL.WRITE_PORT_UCHAR +@ stdcall ScsiPortWritePortUshort(ptr long) HAL.WRITE_PORT_USHORT +@ stdcall ScsiPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG +@ stdcall ScsiPortWriteRegisterBufferUchar(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR +@ stdcall ScsiPortWriteRegisterBufferUshort(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT +@ stdcall ScsiPortWriteRegisterBufferUlong(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG +@ stdcall ScsiPortWriteRegisterUchar(ptr long) NTOSKRNL.WRITE_REGISTER_UCHAR +@ stdcall ScsiPortWriteRegisterUshort(ptr long) NTOSKRNL.WRITE_REGISTER_USHORT +@ stdcall ScsiPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG Propchange: trunk/reactos/drivers/storage/scsiport/scsiport.spec ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/drivers/storage/scsiport/scsiport_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport_arm.def (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport_arm.def (removed) @@ -1,51 +1,0 @@ -; -; scsiport.def - export definition file for scsiport driver -; -LIBRARY SCSIPORT.SYS -EXPORTS -ScsiDebugPrint -ScsiPortCompleteRequest -ScsiPortConvertPhysicalAddressToUlong -ScsiPortConvertUlongToPhysicalAddress=NTOSKRNL.RtlConvertUlongToLargeInteger -ScsiPortFlushDma -ScsiPortFreeDeviceBase -ScsiPortGetBusData -ScsiPortGetDeviceBase -ScsiPortGetLogicalUnit -ScsiPortGetPhysicalAddress -ScsiPortGetSrb -ScsiPortGetUncachedExtension -ScsiPortGetVirtualAddress -ScsiPortInitialize -ScsiPortIoMapTransfer -ScsiPortLogError -ScsiPortMoveMemory -ScsiPortNotification -ScsiPortReadPortBufferUchar=HAL.READ_PORT_BUFFER_UCHAR -ScsiPortReadPortBufferUshort=HAL.READ_PORT_BUFFER_USHORT -ScsiPortReadPortBufferUlong=HAL.READ_PORT_BUFFER_ULONG -ScsiPortReadPortUchar=HAL.READ_PORT_UCHAR -ScsiPortReadPortUshort=HAL.READ_PORT_USHORT -ScsiPortReadPortUlong=HAL.READ_PORT_ULONG -ScsiPortReadRegisterBufferUchar=NTOSKRNL.READ_REGISTER_BUFFER_UCHAR -ScsiPortReadRegisterBufferUshort=NTOSKRNL.READ_REGISTER_BUFFER_USHORT -ScsiPortReadRegisterBufferUlong=NTOSKRNL.READ_REGISTER_BUFFER_ULONG -ScsiPortReadRegisterUchar=NTOSKRNL.READ_REGISTER_UCHAR -ScsiPortReadRegisterUshort=NTOSKRNL.READ_REGISTER_USHORT -ScsiPortReadRegisterUlong=NTOSKRNL.READ_REGISTER_ULONG -ScsiPortSetBusDataByOffset -ScsiPortStallExecution=HAL.KeStallExecutionProcessor -ScsiPortValidateRange -ScsiPortWritePortUchar=HAL.WRITE_PORT_UCHAR -ScsiPortWritePortUshort=HAL.WRITE_PORT_USHORT -ScsiPortWritePortUlong=HAL.WRITE_PORT_ULONG -ScsiPortWritePortBufferUchar=HAL.WRITE_PORT_BUFFER_UCHAR -ScsiPortWritePortBufferUshort=HAL.WRITE_PORT_BUFFER_USHORT -ScsiPortWritePortBufferUlong=HAL.WRITE_PORT_BUFFER_ULONG -ScsiPortWriteRegisterBufferUchar=NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR -ScsiPortWriteRegisterBufferUshort=NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT -ScsiPortWriteRegisterBufferUlong=NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG -ScsiPortWriteRegisterUchar=NTOSKRNL.WRITE_REGISTER_UCHAR -ScsiPortWriteRegisterUshort=NTOSKRNL.WRITE_REGISTER_USHORT -ScsiPortWriteRegisterUlong=NTOSKRNL.WRITE_REGISTER_ULONG -;EOF Removed: trunk/reactos/drivers/storage/scsiport/scsiport_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport_i386.def (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport_i386.def (removed) @@ -1,51 +1,0 @@ -; -; scsiport.def - export definition file for scsiport driver -; -LIBRARY SCSIPORT.SYS -EXPORTS -ScsiDebugPrint -ScsiPortCompleteRequest@20 -ScsiPortConvertPhysicalAddressToUlong@8 -ScsiPortConvertUlongToPhysicalAddress(a)4=NTOSKRNL.RtlConvertUlongToLargeInteger -ScsiPortFlushDma@4 -ScsiPortFreeDeviceBase@8 -ScsiPortGetBusData@24 -ScsiPortGetDeviceBase@28 -ScsiPortGetLogicalUnit@16 -ScsiPortGetPhysicalAddress@16 -ScsiPortGetSrb@20 -ScsiPortGetUncachedExtension@12 -ScsiPortGetVirtualAddress@12 -ScsiPortInitialize@16 -ScsiPortIoMapTransfer@16 -ScsiPortLogError@28 -ScsiPortMoveMemory@12 -ScsiPortNotification -ScsiPortReadPortBufferUchar(a)12=HAL.READ_PORT_BUFFER_UCHAR -ScsiPortReadPortBufferUshort(a)12=HAL.READ_PORT_BUFFER_USHORT -ScsiPortReadPortBufferUlong(a)12=HAL.READ_PORT_BUFFER_ULONG -ScsiPortReadPortUchar(a)4=HAL.READ_PORT_UCHAR -ScsiPortReadPortUshort(a)4=HAL.READ_PORT_USHORT -ScsiPortReadPortUlong(a)4=HAL.READ_PORT_ULONG -ScsiPortReadRegisterBufferUchar(a)12=NTOSKRNL.READ_REGISTER_BUFFER_UCHAR -ScsiPortReadRegisterBufferUshort(a)12=NTOSKRNL.READ_REGISTER_BUFFER_USHORT -ScsiPortReadRegisterBufferUlong(a)12=NTOSKRNL.READ_REGISTER_BUFFER_ULONG -ScsiPortReadRegisterUchar(a)4=NTOSKRNL.READ_REGISTER_UCHAR -ScsiPortReadRegisterUshort(a)4=NTOSKRNL.READ_REGISTER_USHORT -ScsiPortReadRegisterUlong(a)4=NTOSKRNL.READ_REGISTER_ULONG -ScsiPortSetBusDataByOffset@28 -ScsiPortStallExecution(a)4=HAL.KeStallExecutionProcessor -ScsiPortValidateRange@28 -ScsiPortWritePortUchar(a)8=HAL.WRITE_PORT_UCHAR -ScsiPortWritePortUshort(a)8=HAL.WRITE_PORT_USHORT -ScsiPortWritePortUlong(a)8=HAL.WRITE_PORT_ULONG -ScsiPortWritePortBufferUchar(a)12=HAL.WRITE_PORT_BUFFER_UCHAR -ScsiPortWritePortBufferUshort(a)12=HAL.WRITE_PORT_BUFFER_USHORT -ScsiPortWritePortBufferUlong(a)12=HAL.WRITE_PORT_BUFFER_ULONG -ScsiPortWriteRegisterBufferUchar(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR -ScsiPortWriteRegisterBufferUshort(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT -ScsiPortWriteRegisterBufferUlong(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG -ScsiPortWriteRegisterUchar(a)8=NTOSKRNL.WRITE_REGISTER_UCHAR -ScsiPortWriteRegisterUshort(a)8=NTOSKRNL.WRITE_REGISTER_USHORT -ScsiPortWriteRegisterUlong(a)8=NTOSKRNL.WRITE_REGISTER_ULONG -;EOF

16 years, 10 months

[hpoussin] 32228: Add WINEBUILD_FLAGS, and set it to --kill-at for ARM

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Feb 8 22:45:30 2008 New Revision: 32228 URL: http://svn.reactos.org/svn/reactos?rev=32228&view=rev Log: Add WINEBUILD_FLAGS, and set it to --kill-at for ARM Modified: trunk/reactos/ReactOS-arm.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=322… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild (original) +++ trunk/reactos/ReactOS-arm.rbuild Fri Feb 8 22:45:30 2008 @@ -12,6 +12,7 @@ <define name="_ARM_" /> <define name="__arm__" /> + <property name="WINEBUILD_FLAGS" value="--kill-at"/> <property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/> <if property="OPTIMIZE" value="1"> Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Feb 8 22:45:30 2008 @@ -1275,10 +1275,10 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h", NULL ); Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def: $(source) $(module_rbuild) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WINEBLD)\n" - "\t$(Q)$(WINEBUILD_TARGET) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(source_path)$(SEP)$(source_name_noext).spec\n" + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(source_path)$(SEP)$(source_name_noext).spec\n" "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUILD_TARGET)\n" "\t$(ECHO_WINEBLD)\n" - "\t$(Q)$(WINEBUILD_TARGET) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $(source_path)$(SEP)$(source_name_noext).spec\n", + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $(source_path)$(SEP)$(source_name_noext).spec\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );

16 years, 10 months

[hpoussin] 32227: Do not emit __wine_spec_unimplemented_stub() function if not needed

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Feb 8 22:27:32 2008 New Revision: 32227 URL: http://svn.reactos.org/svn/reactos?rev=32227&view=rev Log: Do not emit __wine_spec_unimplemented_stub() function if not needed Modified: trunk/reactos/tools/winebuild/spec32.c Modified: trunk/reactos/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec32.c?r… ============================================================================== --- trunk/reactos/tools/winebuild/spec32.c (original) +++ trunk/reactos/tools/winebuild/spec32.c Fri Feb 8 22:27:32 2008 @@ -648,10 +648,25 @@ */ void BuildPedllFile( DLLSPEC *spec ) { - int nr_exports; - - nr_exports = spec->base <= spec->limit ? spec->limit - spec->base + 1 : 0; + int i, has_stubs = 0; + output_standard_file_header(); + + for (i = 0; i < spec->nb_entry_points; i++) + { + const ORDDEF *odp = &spec->entry_points[i]; + if (odp->type == TYPE_STUB) + { + has_stubs = 1; + break; + } + } + + if (!has_stubs) + { + output( "/* This file is intentionally left blank */\n"); + return; + } output( "#include <stdarg.h>\n"); output( "#include \"windef.h\"\n"); @@ -670,10 +685,6 @@ output( "static const char __wine_spec_file_name[] = \"%s\";\n\n", spec->file_name ); - if (nr_exports) - { - /* Output the stub functions */ - - output_stub_funcs( spec ); - } -} + /* Output the stub functions */ + output_stub_funcs( spec ); +}

16 years, 10 months

[hpoussin] 32226: Add Rule class, which writes to Makefile how to handle a source file Later, hardcoded rules should be read from .rbuild files

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Feb 8 22:10:19 2008 New Revision: 32226 URL: http://svn.reactos.org/svn/reactos?rev=32226&view=rev Log: Add Rule class, which writes to Makefile how to handle a source file Later, hardcoded rules should be read from .rbuild files Added: trunk/reactos/tools/rbuild/backend/mingw/rule.cpp (with props) trunk/reactos/tools/rbuild/backend/mingw/rule.h (with props) Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/rbuild.mak Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Feb 8 22:10:19 2008 @@ -22,6 +22,7 @@ #include "../../rbuild.h" #include "mingw.h" #include "modulehandler.h" +#include "rule.h" using std::set; using std::string; @@ -1245,6 +1246,43 @@ ReplaceExtension ( module.pch->file.name, "_" + module.name + ".gch" ) ); } +Rule gasRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source) $(module_rbuild) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(ECHO_GAS)\n" + "\t${gcc} -x assembler-with-cpp -c $< -o $@ -D__ASM__ $($(module_name)_CFLAGS)\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); +Rule bootRule ( "$(module_output): $(source) $(module_rbuild) | $(OUTPUT)$(SEP)$(source_dir)\n" + "\t$(ECHO_NASM)\n" + "\t$(Q)${nasm} -f win32 $< -o $@ $($(module_name)_NASMFLAGS)\n", + "$(OUTPUT)$(SEP)$(source_dir)$(SEP)", NULL ); +Rule nasmRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source) $(module_rbuild) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(ECHO_NASM)\n" + "\t$(Q)${nasm} -f win32 $< -o $@ $($(module_name)_NASMFLAGS)\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); +Rule windresRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).coff: $(source) $(module_rbuild) $(WRC_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(ECHO_WRC)\n" + "\t${gcc} -xc -E -DRC_INVOKED ${$(module_name)_RCFLAGS} $(source) > $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp\n" + "\t$(Q)$(WRC_TARGET) ${$(module_name)_RCFLAGS} $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).res.tmp\n" + "\t-@${rm} $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp 2>$(NUL)\n" + "\t${windres} $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).res.tmp -o $@\n" + "\t-@${rm} $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).res.tmp 2>$(NUL)\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).coff", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); +Rule wmcRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h: $(WMC_TARGET) $(source)\n" + "\t$(ECHO_WMC)\n" + "\t$(Q)$(WMC_TARGET) -i -H $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h -o $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc $(source)\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h", NULL ); +Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def: $(source) $(module_rbuild) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(ECHO_WINEBLD)\n" + "\t$(Q)$(WINEBUILD_TARGET) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(source_path)$(SEP)$(source_name_noext).spec\n" + "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUILD_TARGET)\n" + "\t$(ECHO_WINEBLD)\n" + "\t$(Q)$(WINEBUILD_TARGET) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $(source_path)$(SEP)$(source_name_noext).spec\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); + void MingwModuleHandler::GenerateGccCommand ( const FileLocation* sourceFile, @@ -1286,175 +1324,7 @@ delete pchFilename; } -void -MingwModuleHandler::GenerateGccAssemblerCommand ( - const FileLocation* sourceFile, - const string& cc, - const string& cflagsMacro ) -{ - string dependencies = backend->GetFullName ( *sourceFile ); - dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - - const FileLocation *objectFilename = GetObjectFilename ( - sourceFile, module, &clean_files ); - fprintf ( fMakefile, - "%s: %s | %s\n", - backend->GetFullName ( *objectFilename ).c_str (), - dependencies.c_str (), - backend->GetFullPath ( *objectFilename ).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_GAS)\n" ); - fprintf ( fMakefile, - "\t%s -x assembler-with-cpp -c $< -o $@ -D__ASM__ %s\n", - cc.c_str (), - cflagsMacro.c_str () ); - - delete objectFilename; -} - -void -MingwModuleHandler::GenerateNasmCommand ( - const FileLocation* sourceFile, - const string& nasmflagsMacro ) -{ - string dependencies = backend->GetFullName ( *sourceFile ); - dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - - const FileLocation *objectFilename = GetObjectFilename ( - sourceFile, module, &clean_files ); - fprintf ( fMakefile, - "%s: %s | %s\n", - backend->GetFullName ( *objectFilename ).c_str (), - dependencies.c_str (), - backend->GetFullPath ( *objectFilename ).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_NASM)\n" ); - fprintf ( fMakefile, - "\t%s -f win32 $< -o $@ %s\n", - "$(Q)${nasm}", - nasmflagsMacro.c_str () ); - - delete objectFilename; -} - -void -MingwModuleHandler::GenerateWindresCommand ( - const FileLocation* sourceFile, - const string& windresflagsMacro ) -{ - string dependencies = backend->GetFullName ( *sourceFile ); - dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - - const FileLocation *objectFilename = GetObjectFilename ( sourceFile, module, &clean_files ); - - string sourceFilenamePart = module.name + "." + ReplaceExtension ( sourceFile->name, "" ); - FileLocation rciFilename ( TemporaryDirectory, - "", - sourceFilenamePart + ".rci.tmp" ); - FileLocation resFilename ( TemporaryDirectory, - "", - sourceFilenamePart + ".res.tmp" ); - - fprintf ( fMakefile, - "%s: %s $(WRC_TARGET) | %s\n", - backend->GetFullName ( *objectFilename ).c_str (), - dependencies.c_str (), - backend->GetFullPath ( *objectFilename ).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_WRC)\n" ); - fprintf ( fMakefile, - "\t${gcc} -xc -E -DRC_INVOKED ${%s} %s > %s\n", - windresflagsMacro.c_str (), - backend->GetFullName ( *sourceFile ).c_str (), - backend->GetFullName ( rciFilename ).c_str () ); - fprintf ( fMakefile, - "\t$(Q)$(WRC_TARGET) ${%s} %s %s\n", - windresflagsMacro.c_str (), - backend->GetFullName ( rciFilename ).c_str (), - backend->GetFullName ( resFilename ).c_str () ); - fprintf ( fMakefile, - "\t-@${rm} %s 2>$(NUL)\n", - backend->GetFullName ( rciFilename ).c_str () ); - fprintf ( fMakefile, - "\t${windres} %s -o $@\n", - backend->GetFullName ( resFilename ).c_str () ); - fprintf ( fMakefile, - "\t-@${rm} %s 2>$(NUL)\n", - backend->GetFullName ( resFilename ).c_str () ); - - delete objectFilename; -} - -void -MingwModuleHandler::GenerateWinebuildCommands ( - const FileLocation* sourceFile ) -{ - string dependencies = backend->GetFullName ( *sourceFile ); - dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - - string basename = GetBasename ( sourceFile->name ); - FileLocation def_file ( IntermediateDirectory, - sourceFile->relative_path, - basename + ".spec.def" ); - CLEAN_FILE ( def_file ); - - const FileLocation *stub_file = GetActualSourceFilename ( sourceFile ); - CLEAN_FILE ( *stub_file ); - - fprintf ( fMakefile, - "%s: %s $(WINEBUILD_TARGET) | %s\n", - backend->GetFullName ( def_file ).c_str (), - dependencies.c_str (), - backend->GetFullPath ( def_file ).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" ); - fprintf ( fMakefile, - "\t%s -o %s --def -E %s\n", - "$(Q)$(WINEBUILD_TARGET)", - backend->GetFullName ( def_file ).c_str (), - backend->GetFullName ( *sourceFile ).c_str () ); - fprintf ( fMakefile, - "%s: %s $(WINEBUILD_TARGET)\n", - backend->GetFullName ( *stub_file ).c_str (), - backend->GetFullName ( *sourceFile ).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" ); - fprintf ( fMakefile, - "\t%s -o %s --pedll %s\n", - "$(Q)$(WINEBUILD_TARGET)", - backend->GetFullName ( *stub_file ).c_str (), - backend->GetFullName ( *sourceFile ).c_str () ); - - delete stub_file; -} - -void -MingwModuleHandler::GenerateWmcCommands ( - const FileLocation* sourceFile ) -{ - string dependencies = backend->GetFullName ( *sourceFile ); - dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - - string basename = GetBasename ( sourceFile->name ); - FileLocation rc_file ( IntermediateDirectory, - sourceFile->relative_path, - basename + ".rc" ); - FileLocation h_file ( IntermediateDirectory, - "include/reactos", - basename + ".h" ); - CLEAN_FILE ( rc_file ); - CLEAN_FILE ( h_file ); - - fprintf ( fMakefile, - "%s %s: $(WMC_TARGET) %s\n", - backend->GetFullName ( rc_file ).c_str (), - backend->GetFullName ( h_file ).c_str (), - backend->GetFullName ( *sourceFile ).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_WMC)\n" ); - fprintf ( fMakefile, - "\t%s -i -H %s -o %s %s\n", - "$(Q)$(WMC_TARGET)", - backend->GetFullName ( h_file ).c_str (), - backend->GetFullName ( rc_file ).c_str (), - backend->GetFullName ( *sourceFile ).c_str () ); -} - -string +const std::string& MingwModuleHandler::GetWidlFlags ( const CompilationUnit& compilationUnit ) { return compilationUnit.GetSwitches (); @@ -1722,9 +1592,43 @@ { const FileLocation& sourceFile = compilationUnit.GetFilename (); string extension = GetExtension ( sourceFile ); + std::transform ( extension.begin (), extension.end (), extension.begin (), tolower ); + + struct + { + HostType host; + ModuleType type; + string extension; + Rule* rule; + } rules[] = { + { HostDontCare, TypeDontCare, ".s", &gasRule }, + { HostDontCare, BootSector, ".asm", &bootRule }, + { HostDontCare, TypeDontCare, ".asm", &nasmRule }, + { HostDontCare, TypeDontCare, ".rc", &windresRule }, + { HostDontCare, TypeDontCare, ".mc", &wmcRule }, + { HostDontCare, TypeDontCare, ".spec", &winebuildRule }, + }; + size_t i; + Rule *customRule = NULL; + + for ( i = 0; i < sizeof ( rules ) / sizeof ( rules[0] ); i++ ) + { + if ( rules[i].host != HostDontCare && rules[i].host != module.host ) + continue; + if ( rules[i].type != TypeDontCare && rules[i].type != module.type ) + continue; + if ( rules[i].extension != extension ) + continue; + customRule = rules[i].rule; + break; + } + + if ( customRule ) + customRule->Execute ( fMakefile, backend, module, &sourceFile, clean_files ); + string flags = cflagsMacro; flags += " "; - if ( extension == ".c" || extension == ".C" ) + if ( extension == ".c" ) { flags += GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags , CompilerTypeCC ); GenerateGccCommand ( &sourceFile, @@ -1732,9 +1636,9 @@ cc, flags ); } - else if ( extension == ".cc" || extension == ".CC" || - extension == ".cpp" || extension == ".CPP" || - extension == ".cxx" || extension == ".CXX" ) + else if ( extension == ".cc" || + extension == ".cpp" || + extension == ".cxx" ) { flags += GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags , CompilerTypeCPP ); GenerateGccCommand ( &sourceFile, @@ -1742,35 +1646,14 @@ cppc, flags ); } - else if ( extension == ".s" || extension == ".S" ) - { - GenerateGccAssemblerCommand ( &sourceFile, - cc, - cflagsMacro ); - } - else if ( extension == ".asm" || extension == ".ASM" ) - { - GenerateNasmCommand ( &sourceFile, - nasmflagsMacro ); - } - else if ( extension == ".rc" || extension == ".RC" ) - { - GenerateWindresCommand ( &sourceFile, - windresflagsMacro ); - } - else if ( extension == ".mc" || extension == ".MC" ) - { - GenerateWmcCommands ( &sourceFile ); - } - else if ( extension == ".spec" || extension == ".SPEC" ) - { - GenerateWinebuildCommands ( &sourceFile ); + else if ( extension == ".spec" ) + { GenerateGccCommand ( &sourceFile, extraDependencies, cc, cflagsMacro ); } - else if ( extension == ".idl" || extension == ".IDL" ) + else if ( extension == ".idl" ) { GenerateWidlCommands ( compilationUnit, widlflagsMacro ); @@ -1782,7 +1665,7 @@ cflagsMacro ); } } - else + else if ( !customRule ) { throw InvalidOperationException ( __FILE__, __LINE__, Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Fri Feb 8 22:10:19 2008 @@ -155,16 +155,7 @@ const std::string& extraDependencies, const std::string& cc, const std::string& cflagsMacro ); - void GenerateGccAssemblerCommand ( const FileLocation* sourceFile, - const std::string& cc, - const std::string& cflagsMacro ); - void GenerateNasmCommand ( const FileLocation* sourceFile, - const std::string& nasmflagsMacro ); - void GenerateWindresCommand ( const FileLocation* sourceFile, - const std::string& windresflagsMacro ); - void GenerateWinebuildCommands ( const FileLocation* sourceFile ); - void GenerateWmcCommands ( const FileLocation* sourceFile); - std::string GetWidlFlags ( const CompilationUnit& compilationUnit ); + const std::string& GetWidlFlags ( const CompilationUnit& compilationUnit ); void GenerateWidlCommandsServer ( const CompilationUnit& compilationUnit, const std::string& widlflagsMacro ); Added: trunk/reactos/tools/rbuild/backend/mingw/rule.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rule.cpp (added) +++ trunk/reactos/tools/rbuild/backend/mingw/rule.cpp Fri Feb 8 22:10:19 2008 @@ -1,0 +1,117 @@ +/* + * Copyright (C) 2008 Hervé Poussineau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include "../../rbuild.h" +#include "modulehandler.h" +#include "rule.h" + +using std::string; + +static void +ReplaceVariable( string& str, + const string& name, + const string& value ) +{ + size_t i = str.find ( name ); + while ( i != string::npos ) + { + str.replace ( i, name.length (), value ); + i = str.find ( name ); + } +} + +static std::string +FixString ( const string& str, Backend *backend, const Module& module, const FileLocation *source ) +{ + string ret = str; + + if ( source ) + { + ReplaceVariable ( ret, "$(source_noext)", ReplaceExtension ( backend->GetFullName ( *source ), "" ) ); + ReplaceVariable ( ret, "$(source)", backend->GetFullName ( *source ) ); + ReplaceVariable ( ret, "$(source_dir)", source->relative_path ); + ReplaceVariable ( ret, "$(source_name)", source->name ); + ReplaceVariable ( ret, "$(source_name_noext)", ReplaceExtension ( source->name , "" ) ); + ReplaceVariable ( ret, "$(source_path)", backend->GetFullPath ( *source ) ); + } + ReplaceVariable ( ret, "$(module_name)", module.name ); + ReplaceVariable ( ret, "$(module_rbuild)", module.xmlbuildFile ); + ReplaceVariable ( ret, "$(module_output)", GetTargetMacro ( module, true ) ); + ReplaceVariable ( ret, "$(SEP)", sSep ); + + return ret; +} + +Rule::Rule( const std::string& command, const char *generatedFile1, ... ) + : command ( command ) +{ + va_list ap; + const char *s; + + s = generatedFile1; + va_start ( ap, generatedFile1 ); + while ( s ) + { + generatedFiles.push_back ( s ); + s = va_arg ( ap, const char* ); + } + va_end ( ap ); +} + + +void Rule::Execute ( FILE *outputFile, + MingwBackend *backend, + const Module& module, + const FileLocation *source, + string_list& clean_files ) +{ + string cmd = FixString ( command, backend, module, source ); + + fprintf ( outputFile, "%s", cmd.c_str () ); + + for ( size_t i = 0; i < generatedFiles.size (); i++ ) + { + string file = FixString ( generatedFiles[i], backend, module, source ); + if ( file[file.length () - 1] != cSep ) + { + clean_files.push_back ( file ); + continue; + } + + if ( file[0] != '$' ) + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid directory %s.", + file.c_str () ); + + size_t pos = file.find_first_of ( cSep ); + string relative_path = file.substr ( pos + 1, file.length () - pos - 2 ); + string dir = file.substr ( 0, pos ); + if ( dir == "$(INTERMEDIATE)" ) + backend->AddDirectoryTarget ( relative_path, backend->intermediateDirectory ); + else if ( dir == "$(OUTPUT)" ) + backend->AddDirectoryTarget ( relative_path, backend->outputDirectory ); + else if ( dir == "$(INSTALL)" ) + backend->AddDirectoryTarget ( relative_path, backend->installDirectory ); + else + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid directory %s.", + dir.c_str () ); + } +} Propchange: trunk/reactos/tools/rbuild/backend/mingw/rule.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/tools/rbuild/backend/mingw/rule.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rule.h (added) +++ trunk/reactos/tools/rbuild/backend/mingw/rule.h Fri Feb 8 22:10:19 2008 @@ -1,0 +1,38 @@ +/* + * Copyright (C) 2008 Hervé Poussineau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef MINGW_RULE_H +#define MINGW_RULE_H + +#include "mingw.h" + +class Rule +{ +public: + Rule ( const std::string& command, const char *generatedFile1, ... ); + void Execute ( FILE *outputFile, + MingwBackend *backend, + const Module& module, + const FileLocation *source, + string_list& clean_files ); +private: + const std::string command; + string_list generatedFiles; +}; + +#endif Propchange: trunk/reactos/tools/rbuild/backend/mingw/rule.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.mak?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.mak (original) +++ trunk/reactos/tools/rbuild/rbuild.mak Fri Feb 8 22:10:19 2008 @@ -200,6 +200,7 @@ mingw.cpp \ modulehandler.cpp \ proxymakefile.cpp \ + rule.cpp \ ) RBUILD_BACKEND_DEVCPP_BASE_SOURCES = $(addprefix $(RBUILD_DEVCPP_BASE_), \ @@ -239,7 +240,7 @@ $(RBUILD_BACKEND_MSBUILD_BASE_SOURCES) \ $(RBUILD_BACKEND_BASE_)backend.cpp -RBUILD_COMMON_SOURCES = \ +RBUILD_SOURCES = \ $(RBUILD_BACKEND_SOURCES) \ $(addprefix $(RBUILD_BASE_), \ global.cpp \ @@ -261,28 +262,18 @@ linkerscript.cpp \ module.cpp \ project.cpp \ + rbuild.cpp \ stubbedcomponent.cpp \ syssetupgenerator.cpp \ testsupportcode.cpp \ xmlnode.cpp \ ) -RBUILD_SPECIAL_SOURCES = \ - $(RBUILD_BASE_)rbuild.cpp - -RBUILD_SOURCES = \ - $(RBUILD_COMMON_SOURCES) \ - $(RBUILD_SPECIAL_SOURCES) - -RBUILD_COMMON_OBJECTS = \ - $(addprefix $(INTERMEDIATE_), $(RBUILD_COMMON_SOURCES:.cpp=.o)) - RBUILD_SPECIAL_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(RBUILD_SPECIAL_SOURCES:.cpp=.o)) RBUILD_OBJECTS = \ - $(RBUILD_COMMON_OBJECTS) \ - $(RBUILD_SPECIAL_OBJECTS) + $(addprefix $(INTERMEDIATE_), $(RBUILD_SOURCES:.cpp=.o)) RBUILD_BACKEND_DEVCPP_HEADERS = \ devcpp.h @@ -304,7 +295,8 @@ RBUILD_BACKEND_MINGW_HEADERS = \ mingw.h \ - modulehandler.h + modulehandler.h \ + rule.h RBUILD_BACKEND_HEADERS = \ backend.h \ @@ -447,6 +439,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_INT_)rule.o: $(RBUILD_BASE_)rule.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_INT_)stubbedcomponent.o: $(RBUILD_BASE_)stubbedcomponent.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ @@ -480,6 +476,10 @@ ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_MINGW_INT_)proxymakefile.o: $(RBUILD_MINGW_BASE_)proxymakefile.cpp $(RBUILD_HEADERS) | $(RBUILD_MINGW_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + +$(RBUILD_MINGW_INT_)rule.o: $(RBUILD_MINGW_BASE_)rule.cpp $(RBUILD_HEADERS) | $(RBUILD_MINGW_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@

16 years, 10 months

[cfinck] 32225: Change the encoding of the slovak translation yet another time, hopefully it's correct now

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Feb 8 21:07:29 2008 New Revision: 32225 URL: http://svn.reactos.org/svn/reactos?rev=32225&view=rev Log: Change the encoding of the slovak translation yet another time, hopefully it's correct now Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Fri Feb 8 21:07:29 2008 @@ -1,5 +1,6 @@ -/* TRANSLATOR: M rio Kam r /Mario Kacmar/ aka Kario (kario(a)szm.sk) +/* TRANSLATOR: M rio Kam r /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR: 22-01-2008 + * Encoding : Latin II (852) */ #ifndef LANG_SK_SK_H__ @@ -10,7 +11,7 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, TEXT_UNDERLINE }, { @@ -22,25 +23,25 @@ { 8, 10, - "\x07 Zvoóte si jazyk, ktorì sa pouzije poas instal cie.", + "\x07 Zvote si jazyk, ktorì sa pou§ije poas inçtal cie.", TEXT_NORMAL }, { 8, 11, - " Potom stlate ENTER.", + " Potom stlate ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Tento jazyk bude predvolenìm jazykom nainstalovanho systmu.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Pokraova_ F3 = Skoni_", + "\x07 Tento jazyk bude predvolenìm jazykom nainçtalovanho systmu.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraova F3 = Skoni", TEXT_STATUS }, { @@ -56,55 +57,55 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "V¡ta V s Instal tor systmu ReactOS", + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "V¡ta V s Inçtal tor systmu ReactOS", TEXT_HIGHLIGHT }, { 6, 11, - "Tento stupe Instal tora skop¡ruje operanì systm ReactOS na V s", + "Tento stupeå Inçtal tora skop¡ruje operanì systm ReactOS na V ç", TEXT_NORMAL }, { 6, 12, - "po¡ta a priprav¡ druhì stupe Instal tora.", + "po¡ta a priprav¡ druhì stupeå Inçtal tora.", TEXT_NORMAL }, { 8, 15, - "\x07 Stlate ENTER pre nainstalovanie systmu ReactOS.", + "\x07 Stlate ENTER pre nainçtalovanie systmu ReactOS.", TEXT_NORMAL }, { 8, 17, - "\x07 Stlate R pre opravu systmu ReactOS.", + "\x07 Stlate R pre opravu systmu ReactOS.", TEXT_NORMAL }, { 8, 19, - "\x07 Stlate L, ak chcete zobrazi_ licenn podmienky systmu ReactOS.", + "\x07 Stlate L, ak chcete zobrazi licenn podmienky systmu ReactOS.", TEXT_NORMAL }, { 8, 21, - "\x07 Stlate F3 pre skonenie instal cie bez nainstalovania systmu ReactOS.", + "\x07 Stlate F3 pre skonenie inçtal cie bez nainçtalovania systmu ReactOS.", TEXT_NORMAL }, { 6, 23, - "Pre viac inform ci¡ o systme ReactOS, navst¡vte pros¡m:", + "Pre viac inform ci¡ o systme ReactOS, navçt¡vte pros¡m:", TEXT_NORMAL }, { @@ -116,7 +117,7 @@ { 0, 0, - " ENTER = Pokraova_ R = Opravi_ F3 = Skoni_", + " ENTER = Pokraova R = Opravi F3 = Skoni", TEXT_STATUS }, { @@ -132,19 +133,19 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Instal tor systmu ReactOS je v zaiatonom st diu vìvoja. Zatiaó", + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Inçtal tor systmu ReactOS je v zaiatonom çt diu vìvoja. Zatia", TEXT_NORMAL }, { 6, 9, - "nepodporuje vsetky funkcie plne vyuz¡vaj£ce program Instal tor.", + "nepodporuje vçetky funkcie plne vyu§¡vaj£ce program Inçtal tor.", TEXT_NORMAL }, { @@ -156,61 +157,61 @@ { 8, 13, - "- Instal tor nepracuje s viac ako 1 prim rnou oblas_ou na 1 disk.", + "- Inçtal tor nepracuje s viac ako 1 prim rnou oblasou na 1 disk.", TEXT_NORMAL }, { 8, 14, - "- Instal tor nevie odstr ni_ prim rnu oblas_ z disku,", + "- Inçtal tor nevie odstr ni prim rnu oblas z disku,", TEXT_NORMAL }, { 8, 15, - " pokiaó existuj£ rozs¡ren oblasti na disku.", + " pokia existuj£ rozç¡ren oblasti na disku.", TEXT_NORMAL }, { 8, 16, - "- Instal tor nevie odstr ni_ prv£ rozs¡ren£ oblas_ z disku,", + "- Inçtal tor nevie odstr ni prv£ rozç¡ren£ oblas z disku,", TEXT_NORMAL }, { 8, 17, - " pokiaó existuj£ in rozs¡ren oblasti na disku.", + " pokia existuj£ in rozç¡ren oblasti na disku.", TEXT_NORMAL }, { 8, 18, - "- Instal tor podporuje iba s£borovì systm FAT.", + "- Inçtal tor podporuje iba s£borovì systm FAT.", TEXT_NORMAL }, { 8, 19, - "- Kontrola s£borovho systmu zatiaó nie je implementovan .", + "- Kontrola s£borovho systmu zatia nie je implementovan .", TEXT_NORMAL }, { 8, 23, - "\x07 Stlate ENTER pre nainstalovanie systmu ReactOS.", + "\x07 Stlate ENTER pre nainçtalovanie systmu ReactOS.", TEXT_NORMAL }, { 8, 25, - "\x07 Stlate F3 pre skonenie instal cie bez nainstalovania systmu ReactOS.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Pokraova_ F3 = Skoni_", + "\x07 Stlate F3 pre skonenie inçtal cie bez nainçtalovania systmu ReactOS.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraova F3 = Skoni", TEXT_STATUS }, { @@ -226,7 +227,7 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, TEXT_UNDERLINE }, { @@ -350,19 +351,19 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Zoznam nizsie, zobrazuje s£asn nastavenia zariaden¡.", + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Zoznam ni§çie, zobrazuje s£asn nastavenia zariaden¡.", TEXT_NORMAL }, { 8, 11, - " Po¡ta:", + " Po¡ta:", TEXT_NORMAL }, { @@ -380,30 +381,30 @@ { 8, 14, - " Rozlozenie kl.:", + " Rozlo§enie kl.:", TEXT_NORMAL }, { 8, 16, - " Akceptova_:", + " Akceptova:", TEXT_NORMAL }, { 25, - 16, "Akceptova_ tieto nastavenia zariaden¡", + 16, "Akceptova tieto nastavenia zariaden¡", TEXT_NORMAL }, { 6, 19, - "Mzete zmeni_ hardvrov nastavenia stlaen¡m kl vesov HORE alebo DOLE", + "M§ete zmeni hardvrov nastavenia stlaen¡m kl vesov HORE alebo DOLE", TEXT_NORMAL }, { 6, 20, - "pre vìber polozky. Potom stlate kl ves ENTER pre vìber alternat¡vnych", + "pre vìber polo§ky. Potom stlate kl ves ENTER pre vìber alternat¡vnych", TEXT_NORMAL }, { @@ -415,19 +416,19 @@ { 6, 23, - "Ak s£ vsetky nastavenia spr vne, vyberte \"Akceptova_ tieto nastavenia zariaden¡\"", + "Ak s£ vçetky nastavenia spr vne, vyberte \"Akceptova tieto nastavenia zariaden¡\"", TEXT_NORMAL }, { 6, 24, - "a stlate ENTER.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Pokraova_ F3 = Skoni_", + "a stlate ENTER.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraova F3 = Skoni", TEXT_STATUS }, { @@ -443,55 +444,55 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Instal tor systmu ReactOS je v zaiatonom st diu vìvoja. Zatiaó", + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Inçtal tor systmu ReactOS je v zaiatonom çt diu vìvoja. Zatia", TEXT_NORMAL }, { 6, 9, - "nepodporuje vsetky funkcie plne vyuz¡vaj£ce program Instal tor.", + "nepodporuje vçetky funkcie plne vyu§¡vaj£ce program Inçtal tor.", TEXT_NORMAL }, { 6, 12, - "Funkcie na opravu systmu zatiaó nie s£ implementovan.", + "Funkcie na opravu systmu zatia nie s£ implementovan.", TEXT_NORMAL }, { 8, 15, - "\x07 Stlate U pre aktualiz ciu OS.", + "\x07 Stlate U pre aktualiz ciu OS.", TEXT_NORMAL }, { 8, 17, - "\x07 Stlate R pre z chrann£ konzolu.", + "\x07 Stlate R pre z chrann£ konzolu.", TEXT_NORMAL }, { 8, 19, - "\x07 Stlate ESC pre n vrat na hlavn£ str nku.", + "\x07 Stlate ESC pre n vrat na hlavn£ str nku.", TEXT_NORMAL }, { 8, 21, - "\x07 Stlate ENTER pre restart po¡taa.", - TEXT_NORMAL - }, - { - 0, - 0, - " ESC = Hlavn str nka ENTER = Restart", + "\x07 Stlate ENTER pre reçtart po¡taa.", + TEXT_NORMAL + }, + { + 0, + 0, + " ESC = Hlavn str nka ENTER = Reçtart", TEXT_STATUS }, { @@ -506,43 +507,43 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Chcete zmeni_ typ po¡taa, ktorì m by_ nainstalovanì.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Stlate kl ves HORE alebo DOLE pre vìber pozadovanho typu po¡taa.", + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcete zmeni typ po¡taa, ktorì m by nainçtalovanì.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Stlate kl ves HORE alebo DOLE pre vìber po§adovanho typu po¡taa.", TEXT_NORMAL }, { 8, 11, - " Potom stlate ENTER.", + " Potom stlate ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Stlate kl ves ESC pre n vrat na predch dzaj£cu str nku bez zmeny", + "\x07 Stlate kl ves ESC pre n vrat na predch dzaj£cu str nku bez zmeny", TEXT_NORMAL }, { 8, 14, - " typu po¡taa.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Pokraova_ ESC = Zrusi_ F3 = Skoni_", + " typu po¡taa.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraova ESC = Zruçi F3 = Skoni", TEXT_STATUS }, { @@ -558,25 +559,25 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 10, - 6, - "Systm pr ve overuje vsetky ulozen £daje na Vasom disku", - TEXT_NORMAL - }, - { - 10, - 8, - "To mze trva_ niekoóko min£t", + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 10, + 6, + "Systm pr ve overuje vçetky ulo§en £daje na Vaçom disku", + TEXT_NORMAL + }, + { + 10, + 8, + "To m§e trva niekoko min£t", TEXT_NORMAL }, { 10, 9, - "Ke skon¡, po¡ta sa automaticky restartuje", + "KeÔ skon¡, po¡ta sa automaticky reçtartuje", TEXT_NORMAL }, { @@ -598,13 +599,13 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 10, - 6, - "Systm ReactOS nie je nainstalovanì kompletne", + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 10, + 6, + "Systm ReactOS nie je nainçtalovanì kompletne", TEXT_NORMAL }, { @@ -616,19 +617,19 @@ { 10, 9, - "vsetky mdi CD-ROM z CD mechan¡k.", + "vçetky mdi CD-ROM z CD mechan¡k.", TEXT_NORMAL }, { 10, 11, - "Stlate ENTER pre restart po¡taa.", - TEXT_NORMAL - }, - { - 0, - 0, - " Pokajte, pros¡m ...", + "Stlate ENTER pre reçtart po¡taa.", + TEXT_NORMAL + }, + { + 0, + 0, + " Pokajte, pros¡m ...", TEXT_STATUS, }, { @@ -644,30 +645,30 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Chcete zmeni_ typ monitora, ktorì m by_ nainstalovanì.", + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcete zmeni typ monitora, ktorì m by nainçtalovanì.", TEXT_NORMAL }, { 8, 10, - "\x07 Stlate kl ves HORE alebo DOLE pre vìber pozadovanho typu monitora.", + "\x07 Stlate kl ves HORE alebo DOLE pre vìber po§adovanho typu monitora.", TEXT_NORMAL }, { 8, 11, - " Potom stlate ENTER.", + " Potom stlate ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Stlate kl ves ESC pre n vrat na predch dzaj£cu str nku bez zmeny", + "\x07 Stlate kl ves ESC pre n vrat na predch dzaj£cu str nku bez zmeny", TEXT_NORMAL }, { @@ -679,7 +680,7 @@ { 0, 0, - " ENTER = Pokraova_ ESC = Zrusi_ F3 = Skoni_", + " ENTER = Pokraova ESC = Zruçi F3 = Skoni", TEXT_STATUS }, { @@ -695,13 +696,13 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 10, - 6, - "Z kladn s£ast¡ systmu ReactOS boli £spesne nainstalovan.", + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 10, + 6, + "Z kladn s£ast¡ systmu ReactOS boli £speçne nainçtalovan.", TEXT_NORMAL }, { @@ -713,19 +714,19 @@ { 10, 9, - "vsetky mdi CD-ROM z CD mechan¡k.", + "vçetky mdi CD-ROM z CD mechan¡k.", TEXT_NORMAL }, { 10, 11, - "Stlate ENTER pre restart po¡taa.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Restart po¡taa", + "Stlate ENTER pre reçtart po¡taa.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Reçtart po¡taa", TEXT_STATUS }, { @@ -741,37 +742,37 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Instal tor nemze nainstalova_ zav dza systmu na pevnì disk V sho", //bootloader = zav dza systmu + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Inçtal tor nem§e nainçtalova zav dza systmu na pevnì disk V çho", //bootloader = zav dza systmu TEXT_NORMAL }, { 6, 9, - "po¡taa", + "po¡taa", TEXT_NORMAL }, { 6, 13, - "Vlozte pros¡m, naform tovan£ disketu do mechaniky A:", + "Vlo§te pros¡m, naform tovan£ disketu do mechaniky A:", TEXT_NORMAL }, { 6, 14, - "a stlate ENTER.", + "a stlate ENTER.", TEXT_NORMAL, }, { 0, 0, - " ENTER = Pokraova_ F3 = Skoni_", + " ENTER = Pokraova F3 = Skoni", TEXT_STATUS }, { @@ -788,7 +789,7 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, TEXT_UNDERLINE }, { @@ -806,31 +807,31 @@ { 8, 11, - "\x07 Stlate HORE alebo DOLE pre vìber zo zoznamu poloziek.", + "\x07 Stlate HORE alebo DOLE pre vìber zo zoznamu polo§iek.", TEXT_NORMAL }, { 8, 13, - "\x07 Stlate ENTER to install ReactOS onto the selected partition.", + "\x07 Stlate ENTER to install ReactOS onto the selected partition.", TEXT_NORMAL }, { 8, 15, - "\x07 Stlate C pre vytvorenie novej oblasti.", + "\x07 Stlate C pre vytvorenie novej oblasti.", TEXT_NORMAL }, { 8, 17, - "\x07 Stlate D pre vymazanie existuj£cej oblasti.", - TEXT_NORMAL - }, - { - 0, - 0, - " Pokajte, pros¡m ...", + "\x07 Stlate D pre vymazanie existuj£cej oblasti.", + TEXT_NORMAL + }, + { + 0, + 0, + " Pokajte, pros¡m ...", TEXT_STATUS }, { @@ -846,7 +847,7 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, TEXT_UNDERLINE }, { @@ -858,13 +859,13 @@ { 6, 10, - "Instal tor teraz naform tuje oblas_. Stlate ENTER pre pokraovanie.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Pokraova_ F3 = Skoni_", + "Inçtal tor teraz naform tuje oblas. Stlate ENTER pre pokraovanie.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraova F3 = Skoni", TEXT_STATUS }, { @@ -880,19 +881,19 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Instal tor instaluje s£bory systmu ReactOS na zvolen£ oblas_.", + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Inçtal tor inçtaluje s£bory systmu ReactOS na zvolen£ oblas.", TEXT_NORMAL }, { 6, 9, - "Vyberte adres r kam chcete nainstalova_ systm ReactOS:", + "Vyberte adres r kam chcete nainçtalova systm ReactOS:", TEXT_NORMAL }, { @@ -916,7 +917,7 @@ { 0, 0, - " ENTER = Pokraova_ F3 = Skoni_", + " ENTER = Pokraova F3 = Skoni", TEXT_STATUS }, { @@ -932,31 +933,31 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, TEXT_UNDERLINE }, { 11, 12, - "Pokajte, pros¡m, kìm Instal tor systmu ReactOS skop¡ruje s£bory", + "Pokajte, pros¡m, kìm Inçtal tor systmu ReactOS skop¡ruje s£bory", TEXT_NORMAL }, { 30, 13, - "do V sho instalanho prieinka pre ReactOS.", + "do V çho inçtalanho prieinka pre ReactOS.", TEXT_NORMAL }, { 20, 14, - "Dokonenie mze trva_ niekoóko min£t.", - TEXT_NORMAL - }, - { - 0, - 0, - " \xB3 Pokajte, pros¡m ... ", + "Dokonenie m§e trva niekoko min£t.", + TEXT_NORMAL + }, + { + 0, + 0, + " \xB3 Pokajte, pros¡m ... ", TEXT_STATUS }, { @@ -972,37 +973,37 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Instal tor instaluje zav dza operanho systmu", + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Inçtal tor inçtaluje zav dza operanho systmu", TEXT_NORMAL }, { 8, 12, - "Nainstalova_ zav dza systmu na pevnì disk (MBR).", + "Nainçtalova zav dza systmu na pevnì disk (MBR).", TEXT_NORMAL }, { 8, 13, - "Nainstalova_ zav dza systmu na disketu.", + "Nainçtalova zav dza systmu na disketu.", TEXT_NORMAL }, { 8, 14, - "Preskoi_ instal ciu zav dzaa systmu.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Pokraova_ F3 = Skoni_", + "Preskoi inçtal ciu zav dzaa systmu.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraova F3 = Skoni", TEXT_STATUS }, { @@ -1018,31 +1019,31 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Chcete zmeni_ typ kl vesnice, ktorì m by_ nainstalovanì.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Stlate kl ves HORE alebo DOLE pre vìber pozadovanho typu kl vesnice.", + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcete zmeni typ kl vesnice, ktorì m by nainçtalovanì.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Stlate kl ves HORE alebo DOLE pre vìber po§adovanho typu kl vesnice.", TEXT_NORMAL }, { 8, 11, - " Potom stlate ENTER.", + " Potom stlate ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Stlate kl ves ESC pre n vrat na predch dzaj£cu str nku bez zmeny", + "\x07 Stlate kl ves ESC pre n vrat na predch dzaj£cu str nku bez zmeny", TEXT_NORMAL }, { @@ -1054,7 +1055,7 @@ { 0, 0, - " ENTER = Pokraova_ ESC = Zrusi_ F3 = Skoni_", + " ENTER = Pokraova ESC = Zruçi F3 = Skoni", TEXT_STATUS }, { @@ -1070,43 +1071,43 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Chcete zmeni_ rozlozenie kl vesnice, ktor m by_ nainstalovan.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Stlate kl ves HORE alebo DOLE pre vìber pozadovanho rozlozenia", + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcete zmeni rozlo§enie kl vesnice, ktor m by nainçtalovan.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Stlate kl ves HORE alebo DOLE pre vìber po§adovanho rozlo§enia", TEXT_NORMAL }, { 8, 11, - " kl vesnice. Potom stlate ENTER.", + " kl vesnice. Potom stlate ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Stlate kl ves ESC pre n vrat na predch dzaj£cu str nku bez zmeny", + "\x07 Stlate kl ves ESC pre n vrat na predch dzaj£cu str nku bez zmeny", TEXT_NORMAL }, { 8, 14, - " rozlozenia kl vesnice.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Pokraova_ ESC = Zrusi_ F3 = Skoni_", + " rozlo§enia kl vesnice.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraova ESC = Zruçi F3 = Skoni", TEXT_STATUS }, { @@ -1123,7 +1124,7 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, TEXT_UNDERLINE }, { @@ -1152,37 +1153,37 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, TEXT_UNDERLINE }, { 6, 17, - "Vyberte systm s£borov zo zoznamu uvedenho nizsie.", + "Vyberte systm s£borov zo zoznamu uvedenho ni§çie.", 0 }, { 8, 19, - "\x07 Stlate HORE alebo DOLE pre vìber systmu s£borov.", + "\x07 Stlate HORE alebo DOLE pre vìber systmu s£borov.", 0 }, { 8, 21, - "\x07 Stlate ENTER pre form tovanie oblasti.", + "\x07 Stlate ENTER pre form tovanie oblasti.", 0 }, { 8, 23, - "\x07 Stlate ESC pre vìber inej oblasti.", - 0 - }, - { - 0, - 0, - " ENTER = Pokraova_ ESC = Zrusi_ F3 = Skoni_", + "\x07 Stlate ESC pre vìber inej oblasti.", + 0 + }, + { + 0, + 0, + " ENTER = Pokraova ESC = Zruçi F3 = Skoni", TEXT_STATUS }, @@ -1199,7 +1200,7 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, TEXT_UNDERLINE }, { @@ -1211,25 +1212,25 @@ { 8, 18, - "\x07 Stlate D pre odstr nenie oblasti.", + "\x07 Stlate D pre odstr nenie oblasti.", TEXT_NORMAL }, { 11, 19, - "UPOZORNENIE: Vsetky £daje na tejto oblasti sa nen vratne stratia!", + "UPOZORNENIE: Vçetky £daje na tejto oblasti sa nen vratne stratia!", TEXT_NORMAL }, { 8, 21, - "\x07 Stlate ESC pre zrusenie.", - TEXT_NORMAL - }, - { - 0, - 0, - " D = Odstr ni_ oblas_ ESC = Zrusi_ F3 = Skoni_", + "\x07 Stlate ESC pre zruçenie.", + TEXT_NORMAL + }, + { + 0, + 0, + " D = Odstr ni oblas ESC = Zruçi F3 = Skoni", TEXT_STATUS }, { @@ -1245,7 +1246,7 @@ { 4, 3, - " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, TEXT_UNDERLINE }, { @@ -1257,7 +1258,7 @@ { 0, 0, - " Vytv raj£ sa polozky registrov ...", //registry hives + " Vytv raj£ sa polo§ky registrov ...", //registry hives TEXT_STATUS }, { @@ -1273,197 +1274,197 @@ { { //ERROR_NOT_INSTALLED - "Systm ReactOS nie je kompletne nainstalovanì na V s\n" - "po¡ta. Ak teraz prerus¡te instal ciu, budete musie_\n" - "spusti_ Instal tor znova, aby sa systm ReactOS nainstaloval.\n" + "Systm ReactOS nie je kompletne nainçtalovanì na V ç\n" + "po¡ta. Ak teraz preruç¡te inçtal ciu, budete musie\n" + "spusti Inçtal tor znova, aby sa systm ReactOS nainçtaloval.\n" "\n" - " \x07 Stlate ENTER pre pokraovanie v instal cii.\n" - " \x07 Stlate F3 pre skonenie instal cie.", - "F3 = Skoni_ ENTER = Pokraova_" + " \x07 Stlate ENTER pre pokraovanie v inçtal cii.\n" + " \x07 Stlate F3 pre skonenie inçtal cie.", + "F3 = Skoni ENTER = Pokraova" }, { //ERROR_NO_HDD - "Instal toru sa nepodarilo n js_ pevnì disk.\n", - "ENTER = Restart po¡taa" + "Inçtal toru sa nepodarilo n js pevnì disk.\n", + "ENTER = Reçtart po¡taa" }, { //ERROR_NO_SOURCE_DRIVE - "Instal toru sa nepodarilo n js_ jej zdrojov£ mechaniku.\n", - "ENTER = Restart po¡taa" + "Inçtal toru sa nepodarilo n js jej zdrojov£ mechaniku.\n", + "ENTER = Reçtart po¡taa" }, { //ERROR_LOAD_TXTSETUPSIF - "Instal tor zlyhal pri nahr van¡ s£boru TXTSETUP.SIF.\n", - "ENTER = Restart po¡taa" + "Inçtal tor zlyhal pri nahr van¡ s£boru TXTSETUP.SIF.\n", + "ENTER = Reçtart po¡taa" }, { //ERROR_CORRUPT_TXTSETUPSIF - "Instal tor nasiel poskodenì s£bor TXTSETUP.SIF.\n", - "ENTER = Restart po¡taa" + "Inçtal tor naçiel poçkodenì s£bor TXTSETUP.SIF.\n", + "ENTER = Reçtart po¡taa" }, { //ERROR_SIGNATURE_TXTSETUPSIF, - "Setup found an invalid signature in TXTSETUP.SIF.\n", //chybnì (neplatnì) podpis (znak, znaka, sifra) - "ENTER = Restart po¡taa" + "Setup found an invalid signature in TXTSETUP.SIF.\n", //chybnì (neplatnì) podpis (znak, znaka, çifra) + "ENTER = Reçtart po¡taa" }, { //ERROR_DRIVE_INFORMATION "Setup could not retrieve system drive information.\n", - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { //ERROR_WRITE_BOOT, "Setup failed to install FAT bootcode on the system partition.", - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { //ERROR_LOAD_COMPUTER, - "Instal tor zlyhal pri nahr van¡ zoznamu typov po¡taov.\n", - "ENTER = Restart po¡taa" + "Inçtal tor zlyhal pri nahr van¡ zoznamu typov po¡taov.\n", + "ENTER = Reçtart po¡taa" }, { //ERROR_LOAD_DISPLAY, - "Instal tor zlyhal pri nahr van¡ zoznamu nastaven¡ monitora.\n", - "ENTER = Restart po¡taa" + "Inçtal tor zlyhal pri nahr van¡ zoznamu nastaven¡ monitora.\n", + "ENTER = Reçtart po¡taa" }, { //ERROR_LOAD_KEYBOARD, - "Instal tor zlyhal pri nahr van¡ zoznamu typov kl vesn¡c.\n", - "ENTER = Restart po¡taa" + "Inçtal tor zlyhal pri nahr van¡ zoznamu typov kl vesn¡c.\n", + "ENTER = Reçtart po¡taa" }, { //ERROR_LOAD_KBLAYOUT, - "Instal tor zlyhal pri nahr van¡ zoznamu rozlozenia kl vesn¡c.\n", - "ENTER = Restart po¡taa" + "Inçtal tor zlyhal pri nahr van¡ zoznamu rozlo§enia kl vesn¡c.\n", + "ENTER = Reçtart po¡taa" }, { //ERROR_WARN_PARTITION, "Setup found that at least one harddisk contains an incompatible\n" "partition table that can not be handled properly!\n" "\n" - "Vytvorenie alebo odstr nenie oblast¡ mze znii_ tabuóku oblast¡.\n" + "Vytvorenie alebo odstr nenie oblast¡ m§e znii tabuku oblast¡.\n" "\n" - " \x07 Stlate F3 pre skonenie instal cie." - " \x07 Stlate ENTER pre pokraovanie.", - "F3 = Skoni_ ENTER = Pokraova_" + " \x07 Stlate F3 pre skonenie inçtal cie." + " \x07 Stlate ENTER pre pokraovanie.", + "F3 = Skoni ENTER = Pokraova" }, { //ERROR_NEW_PARTITION, - "Nemzete vytvori_ nov£ oblas_\n" - "vo vn£tri uz existuj£cej oblasti!\n" + "Nem§ete vytvori nov£ oblas\n" + "vo vn£tri u§ existuj£cej oblasti!\n" "\n" - " * Pokraujte stlaen¡m óubovoónho kl vesu.", + " * Pokraujte stlaen¡m ubovonho kl vesu.", NULL }, { //ERROR_DELETE_SPACE, - "Nemzete odstr ni_ miesto na disku, ktor nie je oblas_ou!\n" + "Nem§ete odstr ni miesto na disku, ktor nie je oblasou!\n" "\n" - " * Pokraujte stlaen¡m óubovoónho kl vesu.", + " * Pokraujte stlaen¡m ubovonho kl vesu.", NULL }, { //ERROR_INSTALL_BOOTCODE, "Setup failed to install the FAT bootcode on the system partition.", - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { //ERROR_NO_FLOPPY, "V mechanike A: nie je disketa.", - "ENTER = Pokraova_" + "ENTER = Pokraova" }, { //ERROR_UPDATE_KBSETTINGS, "Setup failed to update keyboard layout settings.", - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { //ERROR_UPDATE_DISPLAY_SETTINGS, "Setup failed to update display registry settings.", - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { //ERROR_IMPORT_HIVE, "Setup failed to import a hive file.", - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { //ERROR_FIND_REGISTRY "Setup failed to find the registry data files.", - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { //ERROR_CREATE_HIVE, "Setup failed to create the registry hives.", - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { //ERROR_INITIALIZE_REGISTRY, "Setup failed to set the initialize the registry.", - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { //ERROR_INVALID_CABINET_INF, "Cabinet has no valid inf file.\n", - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { //ERROR_CABINET_MISSING, "Cabinet not found.\n", - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { //ERROR_CABINET_SCRIPT, "Cabinet has no setup script.\n", - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { //ERROR_COPY_QUEUE, "Setup failed to open the copy file queue.\n", - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { //ERROR_CREATE_DIR, "Setup could not create install directories.", - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { //ERROR_TXTSETUP_SECTION, "Setup failed to find the 'Directories' section\n" "in TXTSETUP.SIF.\n", - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { //ERROR_CABINET_SECTION, "Setup failed to find the 'Directories' section\n" "in the cabinet.\n", - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { //ERROR_CREATE_INSTALL_DIR "Setup could not create the install directory.", - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { //ERROR_FIND_SETUPDATA, - "Instal tor zlyhal pri hóadan¡ sekcie 'SetupData'\n" + "Inçtal tor zlyhal pri hadan¡ sekcie 'SetupData'\n" "v s£bore TXTSETUP.SIF.\n", - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { //ERROR_WRITE_PTABLE, - "Instal tor zlyhal pri z pise do tabuliek oblast¡.\n" - "ENTER = Restart po¡taa" + "Inçtal tor zlyhal pri z pise do tabuliek oblast¡.\n" + "ENTER = Reçtart po¡taa" }, { //ERROR_ADDING_CODEPAGE, "Setup failed to add codepage to registry.\n" - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { //ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" - "ENTER = Restart po¡taa" + "ENTER = Reçtart po¡taa" }, { NULL,

16 years, 10 months

[fireball] 32224: - Make LsaOpenPolicy return a fake handle (ported from Wine), so that it doesn't leave garbage instead of a handle, which is going to be closed later by LsaClose. - Make LsaClose understand the fake handle, and don't do anything in that case but just return success. - Make one unimplemented func show a fixme (also from Wine).

by fireball＠svn.reactos.org

Author: fireball Date: Fri Feb 8 20:52:48 2008 New Revision: 32224 URL: http://svn.reactos.org/svn/reactos?rev=32224&view=rev Log: - Make LsaOpenPolicy return a fake handle (ported from Wine), so that it doesn't leave garbage instead of a handle, which is going to be closed later by LsaClose. - Make LsaClose understand the fake handle, and don't do anything in that case but just return success. - Make one unimplemented func show a fixme (also from Wine). Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c Fri Feb 8 20:52:48 2008 @@ -86,6 +86,10 @@ { TRACE("LsaClose(0x%p) called\n", ObjectHandle); + /* This is our fake handle, don't go too much long way */ + if (ObjectHandle == (LSA_HANDLE)0xcafe) + return STATUS_SUCCESS; + LSAHandleBind(); return LsarClose(LSABindingHandle, @@ -276,7 +280,9 @@ PLSA_REFERENCED_DOMAIN_LIST *ReferencedDomains, PLSA_TRANSLATED_SID2 *Sids) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,0x%08x,0x%08x,%p,%p,%p) stub\n", PolicyHandle, Flags, + Count, Names, ReferencedDomains, Sids); + return STATUS_NONE_MAPPED; } /* @@ -345,18 +351,20 @@ * * @unimplemented */ -NTSTATUS STDCALL -LsaOpenPolicy(PLSA_UNICODE_STRING lsaucs, - PLSA_OBJECT_ATTRIBUTES lsaoa, - ACCESS_MASK access, - PLSA_HANDLE PolicyHandle) -{ - static int count = 0; - if (count++ < 20) - { - FIXME("%s() not implemented!\n", __FUNCTION__); - } - return STATUS_SUCCESS; +NTSTATUS +STDCALL +LsaOpenPolicy( + IN PLSA_UNICODE_STRING SystemName, + IN PLSA_OBJECT_ATTRIBUTES ObjectAttributes, + IN ACCESS_MASK DesiredAccess, + IN OUT PLSA_HANDLE PolicyHandle) +{ + FIXME("(%s,%p,0x%08x,%p) stub\n", + SystemName?debugstr_w(SystemName->Buffer):"(null)", + ObjectAttributes, DesiredAccess, PolicyHandle); + + if(PolicyHandle) *PolicyHandle = (LSA_HANDLE)0xcafe; + return STATUS_SUCCESS; } /*

16 years, 10 months

← Newer
1
...
28
29
30
31
32
33
34
...
46
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 February 2008