Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[cwittich] 19792: fixed the build options for different configurations
by cwittich＠svn.reactos.com 30 Nov '05

30 Nov '05

fixed the build options for different configurations Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-30 23:32:31 UTC (rev 19791) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-30 23:33:29 UTC (rev 19792) @@ -228,7 +228,7 @@ fprintf ( OUT, "\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t\tName=\"VCCLCompilerTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\tOptimization=\"%d\"\r\n", debug ? 0 : 2 ); + fprintf ( OUT, "\t\t\t\tOptimization=\"%d\"\r\n", release ? 2 : 0 ); fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" ); bool multiple_includes = false; @@ -278,7 +278,7 @@ } fprintf ( OUT, "\"\r\n" ); - fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"%s\"\r\n", speed ? "FALSE" : "TRUE" ); fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"%s\"\r\n", debug ? "3" : "0" ); fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"5\"\r\n" ); fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); @@ -298,6 +298,14 @@ } fprintf ( OUT, "\t\t\t\tWholeProgramOptimization=\"%s\"\r\n", release ? "TRUE" : "FALSE"); + if ( release ) + { + fprintf ( OUT, "\t\t\t\tFavorSizeOrSpeed=\"1\"\r\n" ); + fprintf ( OUT, "\t\t\t\tStringPooling=\"true\"\r\n" ); + } + + fprintf ( OUT, "\t\t\t\tEnablePREfast=\"%s\"\r\n", debug ? "TRUE" : "FALSE"); + fprintf ( OUT, "\t\t\t\tDisableSpecificWarnings=\"4201;4127\"\r\n" ); fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", release ? "0" : "4" ); fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", release ? "FALSE" : "TRUE"); fprintf ( OUT, "\t\t\t\tDebugInformationFormat=\"%s\"/>\r\n", speed ? "0" : "4");

1 0

[weiden] 19791: fixed querying the automatic daylight-savings information
by weiden＠svn.reactos.com 30 Nov '05

30 Nov '05

fixed querying the automatic daylight-savings information Modified: trunk/reactos/lib/cpl/timedate/timedate.c _____ Modified: trunk/reactos/lib/cpl/timedate/timedate.c --- trunk/reactos/lib/cpl/timedate/timedate.c 2005-11-30 23:24:19 UTC (rev 19790) +++ trunk/reactos/lib/cpl/timedate/timedate.c 2005-11-30 23:32:31 UTC (rev 19791) @@ -462,7 +462,7 @@ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation", 0, - KEY_SET_VALUE, + KEY_QUERY_VALUE, &hKey)) return;

1 0

[gvg] 19790: Make GetProcessWindowStation work for CSRSS
by gvg＠svn.reactos.com 30 Nov '05

30 Nov '05

Make GetProcessWindowStation work for CSRSS Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c Modified: trunk/reactos/w32api/include/winuser.h _____ Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c --- trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-11-30 22:44:41 UTC (rev 19789) +++ trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-11-30 23:24:19 UTC (rev 19790) @@ -915,17 +915,31 @@ HWINSTA FASTCALL UserGetProcessWindowStation(VOID) { + NTSTATUS Status; + HWINSTA WinSta; + if(PsGetCurrentProcess() != CsrProcess) { return PsGetCurrentProcess()->Win32WindowStation; } else { - /* FIXME - get the pointer to the window station by querying the parent of - the desktop of the calling thread (which is a window station), - then use ObFindHandleForObject() to find a suitable handle */ - DPRINT1("CSRSS called NtUserGetProcessWindowStation()!!! returned NULL!\n"); - return NULL; + DPRINT1("Should use ObFindHandleForObject\n"); + Status = ObOpenObjectByPointer(PsGetWin32Thread()->Desktop->WindowStation, + 0, + NULL, + WINSTA_ALL_ACCESS, + ExWindowStationObjectType, + UserMode, + (PHANDLE) &WinSta); + if (! NT_SUCCESS(Status)) + { + SetLastNtError(Status); + DPRINT1("Unable to open handle for CSRSSs winsta, status 0x%08x\n", + Status); + return NULL; + } + return WinSta; } } _____ Modified: trunk/reactos/w32api/include/winuser.h --- trunk/reactos/w32api/include/winuser.h 2005-11-30 22:44:41 UTC (rev 19789) +++ trunk/reactos/w32api/include/winuser.h 2005-11-30 23:24:19 UTC (rev 19790) @@ -380,6 +380,7 @@ #define WINSTA_READATTRIBUTES 2 #define WINSTA_READSCREEN 512 #define WINSTA_WRITEATTRIBUTES 16 +#define WINSTA_ALL_ACCESS 895 #define DDL_READWRITE 0 #define DDL_READONLY 1 #define DDL_HIDDEN 2

1 0

[cwittich] 19789: added PCH support
by cwittich＠svn.reactos.com 30 Nov '05

30 Nov '05

added PCH support removed some redundant code Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-30 22:17:11 UTC (rev 19788) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-30 22:44:41 UTC (rev 19789) @@ -213,7 +213,10 @@ { std::string& cfg = cfgs[icfg]; - bool debug = !strstr ( cfg.c_str(), "Release" ); + bool debug = strstr ( cfg.c_str(), "Debug" ); + bool speed = strstr ( cfg.c_str(), "Speed" ); + bool release = (!debug && !speed ); + //bool msvc_headers = ( 0 != strstr ( cfg.c_str(), "MSVC Headers" ) ); fprintf ( OUT, "\t\t<Configuration\r\n" ); @@ -248,30 +251,22 @@ if ( debug ) { defines.push_back ( "_DEBUG" ); - if ( lib || exe ) - { - defines.push_back ( "_LIB" ); - } - else - { - defines.push_back ( "_WINDOWS" ); - defines.push_back ( "_USRDLL" ); - } } else { defines.push_back ( "NDEBUG" ); - if ( lib || exe ) - { - defines.push_back ( "_LIB" ); - } - else - { - defines.push_back ( "_WINDOWS" ); - defines.push_back ( "_USRDLL" ); - } } + if ( lib || exe ) + { + defines.push_back ( "_LIB" ); + } + else + { + defines.push_back ( "_WINDOWS" ); + defines.push_back ( "_USRDLL" ); + } + fprintf ( OUT, "\t\t\t\tPreprocessorDefinitions=\"" ); for ( i = 0; i < defines.size(); i++ ) { @@ -284,15 +279,29 @@ fprintf ( OUT, "\"\r\n" ); fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"TRUE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"3\"\r\n" ); + fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"%s\"\r\n", debug ? "3" : "0" ); fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"5\"\r\n" ); fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); fprintf ( OUT, "\t\t\t\tEnableFunctionLevelLinking=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); - fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"0\"\r\n" ); - fprintf ( OUT, "\t\t\t\tWarningLevel=\"1\"\r\n" ); - fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"TRUE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tDebugInformationFormat=\"4\"/>\r\n" ); + + if ( module.pch != NULL ) + { + fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"2\"\r\n" ); + string pch_path = Path::RelativeFromDirectory ( + module.pch->file.name, + module.GetBasePath() ); + fprintf ( OUT, "\t\t\t\tPrecompiledHeaderThrough=\"%s\"\r\n", pch_path.c_str() ); + } + else + { + fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"0\"\r\n" ); + } + fprintf ( OUT, "\t\t\t\tWholeProgramOptimization=\"%s\"\r\n", release ? "TRUE" : "FALSE"); + fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", release ? "0" : "4" ); + fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", release ? "FALSE" : "TRUE"); + fprintf ( OUT, "\t\t\t\tDebugInformationFormat=\"%s\"/>\r\n", speed ? "0" : "4"); + fprintf ( OUT, "\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t\tName=\"VCCustomBuildTool\"/>\r\n" ); @@ -318,7 +327,7 @@ fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s%s\"\r\n", module.name.c_str(), module_type.c_str() ); fprintf ( OUT, "\t\t\t\tLinkIncremental=\"%d\"\r\n", debug ? 2 : 1 ); - fprintf ( OUT, "\t\t\t\tGenerateDebugInformation=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tGenerateDebugInformation=\"%s\"\r\n", speed ? "FALSE" : "TRUE" ); if ( debug ) fprintf ( OUT, "\t\t\t\tProgramDatabaseFile=\"$(OutDir)/%s.pdb\"\r\n", module.name.c_str() ); @@ -351,7 +360,7 @@ fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 ); } } - else if ( dll) + else if ( dll ) { fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint == "" ? "DllMain" : module.entrypoint.c_str ()); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", module.baseaddress == "" ? "0x40000" : module.baseaddress.c_str ()); @@ -407,11 +416,24 @@ fprintf ( OUT, "\t\t\t<File\r\n" ); fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", source_file.c_str() ); - if (configuration.VSProjectVersion < "8.00") { - for ( size_t iconfig = 0; iconfig < cfgs.size(); iconfig++ ) + for ( size_t iconfig = 0; iconfig < cfgs.size(); iconfig++ ) + { + std::string& config = cfgs[iconfig]; + + if ( isrcfile == 0 ) { - std::string& config = cfgs[iconfig]; + /* little hack to speed up PCH */ + fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" ); + fprintf ( OUT, "\t\t\t\t\tName=\"" ); + fprintf ( OUT, config.c_str() ); + fprintf ( OUT, "|Win32\">\r\n" ); + fprintf ( OUT, "\t\t\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCLCompilerTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tUsePrecompiledHeader=\"1\"/>\r\n" ); + fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" ); + } + if (configuration.VSProjectVersion < "8.00") { if ((source_file.find(".idl") != string::npos) || ((source_file.find(".asm") != string::npos || tolower(source_file.at(source_file.size() - 1)) == 's'))) { fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" );

1 0

[cwittich] 19788: -moved files into correct dir
by cwittich＠svn.reactos.com 30 Nov '05

30 Nov '05

-moved files into correct dir -removed wrong named dirs Deleted: trunk/reactos/subsys/system/regsrv32/ Added: trunk/reactos/subsys/system/regsvr32/Hu.rc Modified: trunk/reactos/subsys/system/regsvr32/regsvr32.rc Added: trunk/reactos/subsys/system/sndvol32/Hu.rc Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.rc Deleted: trunk/reactos/subsys/system/soundvol32/ _____ Copied: trunk/reactos/subsys/system/regsvr32/Hu.rc (from rev 19784, trunk/reactos/subsys/system/regsrv32/Hu.rc) _____ Modified: trunk/reactos/subsys/system/regsvr32/regsvr32.rc --- trunk/reactos/subsys/system/regsvr32/regsvr32.rc 2005-11-30 22:11:00 UTC (rev 19787) +++ trunk/reactos/subsys/system/regsvr32/regsvr32.rc 2005-11-30 22:17:11 UTC (rev 19788) @@ -9,3 +9,4 @@ #include "En.rc" #include "De.rc" #include "Ja.rc" +#include "Hu.rc" _____ Copied: trunk/reactos/subsys/system/sndvol32/Hu.rc (from rev 19784, trunk/reactos/subsys/system/soundvol32/Hu.rc) _____ Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.rc --- trunk/reactos/subsys/system/sndvol32/sndvol32.rc 2005-11-30 22:11:00 UTC (rev 19787) +++ trunk/reactos/subsys/system/sndvol32/sndvol32.rc 2005-11-30 22:17:11 UTC (rev 19788) @@ -20,3 +20,4 @@ #include "De.rc" #include "Ja.rc" #include "Sv.rc" +#include "Hu.rc"

1 0

[cwittich] 19786: fix macro redefinition when compiling with msvc
by cwittich＠svn.reactos.com 30 Nov '05

30 Nov '05

fix macro redefinition when compiling with msvc Modified: trunk/reactos/subsys/system/taskmgr/precomp.h _____ Modified: trunk/reactos/subsys/system/taskmgr/precomp.h --- trunk/reactos/subsys/system/taskmgr/precomp.h 2005-11-30 21:29:39 UTC (rev 19785) +++ trunk/reactos/subsys/system/taskmgr/precomp.h 2005-11-30 22:11:00 UTC (rev 19786) @@ -1,6 +1,5 @@ #ifndef __PRECOMP_H #define __PRECOMP_H -#define _CRT_SECURE_NO_DEPRECATE #define WIN32_NO_STATUS #include <windows.h>

1 0

[weiden] 19787: rename dhcpcapi.dll to dhcpcsvc.dll
by weiden＠svn.reactos.com 30 Nov '05

30 Nov '05

rename dhcpcapi.dll to dhcpcsvc.dll Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/lib/cpl/ncpa/ncpa.xml Deleted: trunk/reactos/lib/dhcpcapi/ Added: trunk/reactos/lib/dhcpcsvc/ Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcapi.c Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcapi.def Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcapi.rc Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcapi.xml Added: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.c Added: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.def Added: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.rc Added: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.xml Modified: trunk/reactos/lib/directory.xml _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-11-30 22:11:00 UTC (rev 19786) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-11-30 22:11:00 UTC (rev 19787) @@ -84,7 +84,7 @@ lib\ddraw\ddraw.dll 1 lib\devenum\devenum.dll 1 lib\devmgr\devmgr.dll 1 -lib\dhcpcapi\dhcpcapi.dll 1 +lib\dhcpcsvc\dhcpcsvc.dll 1 lib\dinput\dinput.dll 1 lib\dinput8\dinput8.dll 1 lib\dnsapi\dnsapi.dll 1 _____ Modified: trunk/reactos/lib/cpl/ncpa/ncpa.xml --- trunk/reactos/lib/cpl/ncpa/ncpa.xml 2005-11-30 22:11:00 UTC (rev 19786) +++ trunk/reactos/lib/cpl/ncpa/ncpa.xml 2005-11-30 22:11:00 UTC (rev 19787) @@ -12,7 +12,7 @@ <library>comctl32</library> <library>iphlpapi</library> <library>ws2_32</library> - <library>dhcpcapi</library> + <library>dhcpcsvc</library> <library>ntdll</library> <file>ncpa.c</file> <file>tcpip_properties.c</file> _____ Copied: trunk/reactos/lib/dhcpcsvc (from rev 19785, trunk/reactos/lib/dhcpcapi) _____ Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcapi.c --- trunk/reactos/lib/dhcpcapi/dhcpcapi.c 2005-11-30 21:29:39 UTC (rev 19785) +++ trunk/reactos/lib/dhcpcsvc/dhcpcapi.c 2005-11-30 22:11:00 UTC (rev 19787) @@ -1,138 +0,0 @@ -/* $Id: dllmain.c 12852 2005-01-06 13:58:04Z mf $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/dhcpcapi/dhcpcapi.c - * PURPOSE: Client API for DHCP - * PROGRAMMER: arty (ayerkes(a)speakeasy.net) - * UPDATE HISTORY: - * Created 12/04/2005 - */ - -#include <roscfg.h> -#include <winsock2.h> -#include <dhcpcsdk.h> -#include <dhcp/rosdhcp_public.h> - -#define DHCP_TIMEOUT 1000 - -DWORD APIENTRY DhcpCApiInitialize(LPDWORD Version) { - *Version = 2; - return 0; -} - -VOID APIENTRY DhcpCApiCleanup() { -} - -DWORD APIENTRY DhcpQueryHWInfo( DWORD AdapterIndex, - PDWORD MediaType, - PDWORD Mtu, - PDWORD Speed ) { - COMM_DHCP_REQ Req; - COMM_DHCP_REPLY Reply; - DWORD BytesRead; - BOOL Result; - - Req.Type = DhcpReqQueryHWInfo; - Req.AdapterIndex = AdapterIndex; - - Result = CallNamedPipe - ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply), - &BytesRead, DHCP_TIMEOUT ); - - if( !Reply.Reply ) return 0; - else { - *MediaType = Reply.QueryHWInfo.MediaType; - *Mtu = Reply.QueryHWInfo.Mtu; - *Speed = Reply.QueryHWInfo.Speed; - return 1; - } -} - -DWORD APIENTRY DhcpLeaseIpAddress( DWORD AdapterIndex ) { - COMM_DHCP_REQ Req; - COMM_DHCP_REPLY Reply; - DWORD BytesRead; - BOOL Result; - - Req.Type = DhcpReqLeaseIpAddress; - Req.AdapterIndex = AdapterIndex; - - Result = CallNamedPipe - ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply), - &BytesRead, DHCP_TIMEOUT ); - - return Reply.Reply; -} - -DWORD APIENTRY DhcpReleaseIpAddressLease( DWORD AdapterIndex ) { - COMM_DHCP_REQ Req; - COMM_DHCP_REPLY Reply; - DWORD BytesRead; - BOOL Result; - - Req.Type = DhcpReqReleaseIpAddress; - Req.AdapterIndex = AdapterIndex; - - Result = CallNamedPipe - ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply), - &BytesRead, DHCP_TIMEOUT ); - - return Reply.Reply; -} - -DWORD APIENTRY DhcpRenewIpAddressLease( DWORD AdapterIndex ) { - COMM_DHCP_REQ Req; - COMM_DHCP_REPLY Reply; - DWORD BytesRead; - BOOL Result; - - Req.Type = DhcpReqRenewIpAddress; - Req.AdapterIndex = AdapterIndex; - - Result = CallNamedPipe - ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply), - &BytesRead, DHCP_TIMEOUT ); - - return Reply.Reply; -} - -DWORD APIENTRY DhcpStaticRefreshParams( DWORD AdapterIndex, - DWORD Address, - DWORD Netmask ) { - COMM_DHCP_REQ Req; - COMM_DHCP_REPLY Reply; - DWORD BytesRead; - BOOL Result; - - Req.Type = DhcpReqStaticRefreshParams; - Req.AdapterIndex = AdapterIndex; - Req.Body.StaticRefreshParams.IPAddress = Address; - Req.Body.StaticRefreshParams.Netmask = Netmask; - - Result = CallNamedPipe - ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply), - &BytesRead, DHCP_TIMEOUT ); - - return Reply.Reply; -} - -INT STDCALL -DllMain(PVOID hinstDll, - ULONG dwReason, - PVOID reserved) -{ - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDll); - break; - - case DLL_PROCESS_DETACH: - break; - } - - return TRUE; -} - -/* EOF */ _____ Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcapi.def --- trunk/reactos/lib/dhcpcapi/dhcpcapi.def 2005-11-30 21:29:39 UTC (rev 19785) +++ trunk/reactos/lib/dhcpcsvc/dhcpcapi.def 2005-11-30 22:11:00 UTC (rev 19787) @@ -1,16 +0,0 @@ -; $Id: dhcpcapi.def 14337 2005-03-26 22:10:04Z $ -; -; dhcpcapi.def -; -; ReactOS Operating System -; -LIBRARY dhcpcapi.dll -EXPORTS -DhcpCApiInitialize@4 -DhcpCApiCleanup@0 -DhcpQueryHWInfo@16 -DhcpLeaseIpAddress@4 -DhcpReleaseIpAddressLease@4 -DhcpRenewIpAddressLease@4 -DhcpStaticRefreshParams@12 -; EOF _____ Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcapi.rc --- trunk/reactos/lib/dhcpcapi/dhcpcapi.rc 2005-11-30 21:29:39 UTC (rev 19785) +++ trunk/reactos/lib/dhcpcsvc/dhcpcapi.rc 2005-11-30 22:11:00 UTC (rev 19787) @@ -1,7 +0,0 @@ -#include <windows.h> - -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "DHCP Client API\0" -#define REACTOS_STR_INTERNAL_NAME "dhcpcapi\0" -#define REACTOS_STR_ORIGINAL_FILENAME "dhcpcapi.dll\0" -#include <reactos/version.rc> _____ Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcapi.xml --- trunk/reactos/lib/dhcpcapi/dhcpcapi.xml 2005-11-30 21:29:39 UTC (rev 19785) +++ trunk/reactos/lib/dhcpcsvc/dhcpcapi.xml 2005-11-30 22:11:00 UTC (rev 19787) @@ -1,14 +0,0 @@ -<module name="dhcpcapi" type="win32dll" installbase="system32" installname="dhcpcapi.dll"> - <importlibrary definition="dhcpcapi.def" /> - <include base="dhcpcapi">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> - <define name="_WIN32_WINNT=0x0500" /> - <library>ntdll</library> - <library>kernel32</library> - <library>msvcrt</library> - <library>ws2_32</library> - <library>iphlpapi</library> - <file>dhcpcapi.c</file> - <file>dhcpcapi.rc</file> -</module> _____ Copied: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.c (from rev 19785, trunk/reactos/lib/dhcpcapi/dhcpcapi.c) _____ Copied: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.def (from rev 19785, trunk/reactos/lib/dhcpcapi/dhcpcapi.def) --- trunk/reactos/lib/dhcpcapi/dhcpcapi.def 2005-11-30 21:29:39 UTC (rev 19785) +++ trunk/reactos/lib/dhcpcsvc/dhcpcsvc.def 2005-11-30 22:11:00 UTC (rev 19787) @@ -0,0 +1,16 @@ +; $Id: dhcpcapi.def 14337 2005-03-26 22:10:04Z $ +; +; dhcpcsvc.def +; +; ReactOS Operating System +; +LIBRARY dhcpcsvc.dll +EXPORTS +DhcpCApiInitialize@4 +DhcpCApiCleanup@0 +DhcpQueryHWInfo@16 +DhcpLeaseIpAddress@4 +DhcpReleaseIpAddressLease@4 +DhcpRenewIpAddressLease@4 +DhcpStaticRefreshParams@12 +; EOF _____ Copied: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.rc (from rev 19785, trunk/reactos/lib/dhcpcapi/dhcpcapi.rc) --- trunk/reactos/lib/dhcpcapi/dhcpcapi.rc 2005-11-30 21:29:39 UTC (rev 19785) +++ trunk/reactos/lib/dhcpcsvc/dhcpcsvc.rc 2005-11-30 22:11:00 UTC (rev 19787) @@ -0,0 +1,7 @@ +#include <windows.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "DHCP Client Service\0" +#define REACTOS_STR_INTERNAL_NAME "dhcpcsvc\0" +#define REACTOS_STR_ORIGINAL_FILENAME "dhcpcsvc.dll\0" +#include <reactos/version.rc> _____ Copied: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.xml (from rev 19785, trunk/reactos/lib/dhcpcapi/dhcpcapi.xml) --- trunk/reactos/lib/dhcpcapi/dhcpcapi.xml 2005-11-30 21:29:39 UTC (rev 19785) +++ trunk/reactos/lib/dhcpcsvc/dhcpcsvc.xml 2005-11-30 22:11:00 UTC (rev 19787) @@ -0,0 +1,14 @@ +<module name="dhcpcsvc" type="win32dll" installbase="system32" installname="dhcpcsvc.dll"> + <importlibrary definition="dhcpcsvc.def" /> + <include base="dhcpcsvc">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT=0x0500" /> + <library>ntdll</library> + <library>kernel32</library> + <library>msvcrt</library> + <library>ws2_32</library> + <library>iphlpapi</library> + <file>dhcpcsvc.c</file> + <file>dhcpcsvc.rc</file> +</module> _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-11-30 22:11:00 UTC (rev 19786) +++ trunk/reactos/lib/directory.xml 2005-11-30 22:11:00 UTC (rev 19787) @@ -62,8 +62,8 @@ <directory name="devmgr"> <xi:include href="devmgr/devmgr.xml" /> </directory> -<directory name="dhcpcapi"> - <xi:include href="dhcpcapi/dhcpcapi.xml" /> +<directory name="dhcpcsvc"> + <xi:include href="dhcpcsvc/dhcpcsvc.xml" /> </directory> <directory name="dinput"> <xi:include href="dinput/dinput.xml" />

1 0

[hbirr] 19785: Don't check for RequestedOptions if a trailing slash is removed.
by hbirr＠svn.reactos.com 30 Nov '05

30 Nov '05

Don't check for RequestedOptions if a trailing slash is removed. Modified: trunk/reactos/drivers/fs/vfat/create.c _____ Modified: trunk/reactos/drivers/fs/vfat/create.c --- trunk/reactos/drivers/fs/vfat/create.c 2005-11-30 19:12:40 UTC (rev 19784) +++ trunk/reactos/drivers/fs/vfat/create.c 2005-11-30 21:29:39 UTC (rev 19785) @@ -532,11 +532,6 @@ } if (PathNameU.Length > sizeof(WCHAR) && PathNameU.Buffer[PathNameU.Length/sizeof(WCHAR)-1] == L'\\') { - if (!(RequestedOptions & FILE_DIRECTORY_FILE)) - { - /* FIXME: Is this the right error message? */ - return(STATUS_OBJECT_NAME_INVALID); - } PathNameU.Length -= sizeof(WCHAR); }

1 0

[amunger] 19784: Define __NO_CTYPE_INLINES so release npfs will build again.
by amunger＠svn.reactos.com 30 Nov '05

30 Nov '05

Define __NO_CTYPE_INLINES so release npfs will build again. Modified: trunk/reactos/drivers/fs/np/npfs.xml _____ Modified: trunk/reactos/drivers/fs/np/npfs.xml --- trunk/reactos/drivers/fs/np/npfs.xml 2005-11-30 18:41:46 UTC (rev 19783) +++ trunk/reactos/drivers/fs/np/npfs.xml 2005-11-30 19:12:40 UTC (rev 19784) @@ -1,6 +1,7 @@ <module name="npfs" type="kernelmodedriver" installbase="system32/drivers" installname="npfs.sys"> <include base="npfs">.</include> <define name="__USE_W32API" /> + <define name="__NO_CTYPE_INLINES" /> <library>ntoskrnl</library> <library>hal</library> <file>create.c</file>

1 0

[weiden] 19783: implemented SetupDiGetClassDevPropertySheetsA
by weiden＠svn.reactos.com 30 Nov '05

30 Nov '05

implemented SetupDiGetClassDevPropertySheetsA Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-11-30 18:26:43 UTC (rev 19782) +++ trunk/reactos/lib/setupapi/devinst.c 2005-11-30 18:41:46 UTC (rev 19783) @@ -3584,11 +3584,27 @@ OUT PDWORD RequiredSize OPTIONAL, IN DWORD PropertySheetType) { - FIXME ("Stub %p %p %p %d %p %d\n", - DeviceInfoSet, DeviceInfoData, PropertySheetHeader, PropertySheetHeaderPageListSize, - RequiredSize, PropertySheetType); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + PROPSHEETHEADERW psh; + BOOL ret = FALSE; + + TRACE("%p %p %p 0%lx %p 0x%lx\n", DeviceInfoSet, DeviceInfoData, + PropertySheetHeader, PropertySheetHeaderPageListSize, + RequiredSize, PropertySheetType); + + psh.dwFlags = PropertySheetHeader->dwFlags; + psh.phpage = PropertySheetHeader->phpage; + psh.nPages = PropertySheetHeader->nPages; + + ret = SetupDiGetClassDevPropertySheetsW(DeviceInfoSet, DeviceInfoData, PropertySheetHeader ? &psh : NULL, + PropertySheetHeaderPageListSize, RequiredSize, + PropertySheetType); + if (ret) + { + PropertySheetHeader->nPages = psh.nPages; + } + + TRACE("Returning %d\n", ret); + return ret; } struct ClassDevPropertySheetsData @@ -3642,6 +3658,8 @@ SetLastError(ERROR_INVALID_HANDLE); else if (!PropertySheetHeader) SetLastError(ERROR_INVALID_PARAMETER); + else if (PropertySheetHeader->dwFlags & PSH_PROPSHEETPAGE) + SetLastError(ERROR_INVALID_FLAGS); else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); else if (!DeviceInfoData && IsEqualIID(&list->ClassGuid, &GUID_NULL))

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005