Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[dreimer] 35765: Tidy up the output a bit.

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Aug 29 14:36:49 2008 New Revision: 35765 URL: http://svn.reactos.org/svn/reactos?rev=35765&view=rev Log: Tidy up the output a bit. Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Fri Aug 29 14:36:49 2008 @@ -66,7 +66,7 @@ :: First check for a new Updater :: for %%F in (update.cmd) do set _ROSBE_UPDDATE=%%~tF - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/update.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd for %%F in (update.cmd) do set _ROSBE_UPDDATE2=%%~tF if !_ROSBE_UPDDATE! NEQ !_ROSBE_UPDDATE2! ( @@ -78,80 +78,80 @@ :: PS1 Files. :: if exist "Build.ps1" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/Build.ps1 + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Build.ps1 ) if exist "Clean.ps1" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/Clean.ps1 + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Clean.ps1 ) if exist "Help.ps1" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/Help.ps1 + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Help.ps1 ) if exist "MinGW.ps1" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/MinGW.ps1 + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/MinGW.ps1 ) if exist "RosBE.ps1" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/RosBE.ps1 + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/RosBE.ps1 ) if exist "rosbe-gcc-env.ps1" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/rosbe-gcc-env.ps1 + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/rosbe-gcc-env.ps1 ) :: :: Options Files. :: if exist "options.cmd" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/options.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/options.cmd ) :: :: SVN Files. :: if exist "sSVN.cmd" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/sSVN.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/sSVN.cmd ) :: :: SCut Files. :: if exist "scut.cmd" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/scut.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/scut.cmd ) :: :: RelAddr2Line Files. :: if exist "reladdr2line.cmd" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/reladdr2line.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/reladdr2line.cmd ) :: :: Other Tools Files. :: if exist "Config.cmd" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/Config.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Config.cmd ) if exist "chdefdir.cmd" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/chdefdir.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/chdefdir.cmd ) :: :: Default Files. :: - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/Build.cmd - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/ChangeLog.txt - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/chdefgcc.cmd - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/Clean.cmd - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/Help.cmd - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/LICENSE.TXT - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/MinGW.cmd - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/mingw.ico - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/MinGW.mac - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/README.pdf - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/RosBE.cmd - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/rosbe.ico - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/RosBE.mac - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/rosbe-gcc-env.cmd - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/TimeDate.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Build.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/ChangeLog.txt + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/chdefgcc.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Clean.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Help.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/LICENSE.TXT + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/MinGW.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/mingw.ico + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/MinGW.mac + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/README.pdf + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/RosBE.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/rosbe.ico + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/RosBE.mac + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/rosbe-gcc-env.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/TimeDate.cmd ) if %_ROSBE_GCC% == yes ( @@ -164,7 +164,7 @@ set _ROSBE_GCCDATE=0 ) - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/GCC.7z + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/GCC.7z :: :: Add the maybe Updated Dates to another Var. @@ -188,7 +188,7 @@ set _ROSBE_TOOOLSDATE=0 ) - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/Tools.7z + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Tools.7z :: :: Add the maybe Updated Dates to another Var.

16 years, 1 month

[fireball] 35764: Gregor Schneider <grschneider@gmail.com> - Only pad with zeroes if padding requested. - Show signs for floating point numbers without checking for SIGN type (since there is no unsigned float/double). See issue #3587 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Aug 29 13:57:31 2008 New Revision: 35764 URL: http://svn.reactos.org/svn/reactos?rev=35764&view=rev Log: Gregor Schneider <grschneider(a)gmail.com> - Only pad with zeroes if padding requested. - Show signs for floating point numbers without checking for SIGN type (since there is no unsigned float/double). See issue #3587 for more details. Modified: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c Modified: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/lnx_spri… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] Fri Aug 29 13:57:31 2008 @@ -167,18 +167,16 @@ return 0; c = (type & ZEROPAD) ? '0' : ' '; sign = 0; - if (type & SIGN) { - if (num < 0) { - sign = '-'; - num = -num; - size--; - } else if (type & PLUS) { - sign = '+'; - size--; - } else if (type & SPACE) { - sign = ' '; - size--; - } + if (num < 0) { + sign = '-'; + num = -num; + size--; + } else if (type & PLUS) { + sign = '+'; + size--; + } else if (type & SPACE) { + sign = ' '; + size--; } if (type & SPECIAL) { if (base == 16) @@ -231,10 +229,12 @@ ++buf; } } - while (i < precision--) { - if (buf <= end) - *buf = '0'; - ++buf; + if (type & ZEROPAD) { + while (i < precision--) { + if (buf <= end) + *buf = '0'; + ++buf; + } } while (i-- > 0) { if (buf <= end)

16 years, 1 month

[dreimer] 35763: Progress. It WORKS!!!!!!!!11111111234. setlocal ftw. Thx to hackbunny for helping me. Now it does what its meant to be for.

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Aug 29 13:47:02 2008 New Revision: 35763 URL: http://svn.reactos.org/svn/reactos?rev=35763&view=rev Log: Progress. It WORKS!!!!!!!!11111111234. setlocal ftw. Thx to hackbunny for helping me. Now it does what its meant to be for. Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Fri Aug 29 13:47:02 2008 @@ -7,6 +7,11 @@ :: :: @echo off + +setlocal +setlocal enableextensions +setlocal enabledelayedexpansion + if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @echo on @@ -47,7 +52,7 @@ set _ROSBE_PARAM=yes ) if not "%1" == "" ( - if _ROSBE_PARAM == no ( + if %_ROSBE_PARAM% == no ( cls echo Unknown parameter specified. Exiting. goto :EOU @@ -56,15 +61,15 @@ cd /d "%_ROSBE_BASEDIR%" -if _ROSBE_CMDS == yes ( +if %_ROSBE_CMDS% == yes ( :: :: First check for a new Updater :: - for /f "usebackq" %%i in (`"forfiles /M update.cmd /C "cmd /c echo @fdate""`) do set _ROSBE_UPDDATE=%%i + for %%F in (update.cmd) do set _ROSBE_UPDDATE=%%~tF "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/update.cmd - for /f "usebackq" %%i in (`"forfiles /M update.cmd /C "cmd /c echo @fdate""`) do set _ROSBE_UPDDATE2=%%i - - if %_ROSBE_UPDDATE% NEQ %_ROSBE_UPDDATE2% ( + for %%F in (update.cmd) do set _ROSBE_UPDDATE2=%%~tF + + if !_ROSBE_UPDDATE! NEQ !_ROSBE_UPDDATE2! ( cls echo Updater got updated and needs to be restarted. goto :EOU @@ -149,12 +154,12 @@ "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/TimeDate.cmd ) -if _ROSBE_GCC == yes ( +if %_ROSBE_GCC% == yes ( :: :: Add Dates into Vars and load GCC packages if needed. :: if exist GCC.7z ( - for /f "usebackq" %%i in (`"forfiles /M GCC.7z /C "cmd /c echo @fdate""`) do set _ROSBE_GCCDATE=%%i + for %%F in (GCC.7z) do set _ROSBE_GCCDATE=%%~tF ) else ( set _ROSBE_GCCDATE=0 ) @@ -164,21 +169,21 @@ :: :: Add the maybe Updated Dates to another Var. :: - for /f "usebackq" %%i in (`"forfiles /M GCC.7z /C "cmd /c echo @fdate""`) do set _ROSBE_GCCDATE2=%%i + for %%F in (GCC.7z) do set _ROSBE_GCCDATE2=%%~tF :: :: Extract GCC. :: - if %_ROSBE_GCCDATE% NEQ %_ROSBE_GCCDATE2% ( + if !_ROSBE_GCCDATE! NEQ !_ROSBE_GCCDATE2! ( "Tools\7z.exe" x GCC.7z "%_ROSBE_BASEDIR%\4.1.3" ) ) -if _ROSBE_TOOLS == yes ( +if %_ROSBE_TOOLS% == yes ( :: :: Add Dates into Vars and load Tool SRC packages if needed. :: if exist Tools.7z ( - for /f "usebackq" %%i in (`"forfiles /M Tools.7z /C "cmd /c echo @fdate""`) do set _ROSBE_TOOLSDATE=%%i + for %%F in (Tools.7z) do set _ROSBE_TOOLSDATE=%%~tF ) else ( set _ROSBE_TOOOLSDATE=0 ) @@ -188,9 +193,9 @@ :: :: Add the maybe Updated Dates to another Var. :: - for /f "usebackq" %%i in (`"forfiles /M Tools.7z /C "cmd /c echo @fdate""`) do set _ROSBE_TOOLSDATE2=%%i - - if %_ROSBE_TOOLSDATE% NEQ %_ROSBE_TOOLSDATE2% ( + for %%F in (Tools.7z) do set _ROSBE_TOOLSDATE2=%%~tF + + if !_ROSBE_TOOLSDATE! NEQ !_ROSBE_TOOLSDATE2! ( "Tools\7z.exe" x Tools.7z "%TEMP%" :: :: Build the tools

16 years, 1 month

[sserapion] 35762: Convert fmifs and lsasrv to spec files.

by sserapion＠svn.reactos.org

Author: sserapion Date: Fri Aug 29 11:39:06 2008 New Revision: 35762 URL: http://svn.reactos.org/svn/reactos?rev=35762&view=rev Log: Convert fmifs and lsasrv to spec files. Added: branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.spec (contents, props changed) - copied, changed from r35723, branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.def branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.spec (contents, props changed) - copied, changed from r35723, branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.def Removed: branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.def branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.def Modified: branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.rbuild branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.def (removed) @@ -1,31 +1,0 @@ -; $Id$ -; -; fmifs.def -; -; Project : ReactOS -; Description : fmifs.dll exported symbols -; Contributors: -; Created by Emanuele Aliberti -; -; -; NOTE: Functions with trailing @0 are unknown. -; -LIBRARY fmifs.dll -EXPORTS -Chkdsk@36 -;ChkdskEx -;ComputeFmMediaType -DiskCopy@0 -EnableVolumeCompression@8 -Extend@0 -Format@0 -FormatEx@28 -;FormatEx2 -InitializeFmIfs@12 -QueryAvailableFileSystemFormat@20 -;QueryDeviceInformation -;QueryDeviceInformationByHandle -;QueryFileSystemName -;QueryLatestFileSystemVersion -QuerySupportedMedia@16 -SetLabel(a)8=KERNEL32.SetVolumeLabelW Modified: branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.rbuild [iso-8859-1] Fri Aug 29 11:39:06 2008 @@ -1,5 +1,5 @@ <module name="fmifs" type="win32dll" entrypoint="InitializeFmIfs@12" baseaddress="${BASEADDRESS_FMIFS}" installbase="system32" installname="fmifs.dll"> - <importlibrary definition="fmifs.def" /> + <importlibrary definition="fmifs.spec.def" /> <include base="fmifs">.</include> <define name="_DISABLE_TIDENTS" /> <define name="_WIN32_WINNT">0x0600</define> @@ -14,5 +14,6 @@ <file>media.c</file> <file>query.c</file> <file>fmifs.rc</file> + <file>fmifs.spec</file> <pch>precomp.h</pch> </module> Copied: branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.spec (from r35723, branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.spec [iso-8859-1] Fri Aug 29 11:39:06 2008 @@ -1,31 +1,18 @@ -; $Id$ -; -; fmifs.def -; -; Project : ReactOS -; Description : fmifs.dll exported symbols -; Contributors: -; Created by Emanuele Aliberti -; -; -; NOTE: Functions with trailing @0 are unknown. -; -LIBRARY fmifs.dll -EXPORTS -Chkdsk@36 -;ChkdskEx -;ComputeFmMediaType -DiskCopy@0 -EnableVolumeCompression@8 -Extend@0 -Format@0 -FormatEx@28 -;FormatEx2 -InitializeFmIfs@12 -QueryAvailableFileSystemFormat@20 -;QueryDeviceInformation -;QueryDeviceInformationByHandle -;QueryFileSystemName -;QueryLatestFileSystemVersion -QuerySupportedMedia@16 -SetLabel(a)8=KERNEL32.SetVolumeLabelW + + @ stdcall Chkdsk(wstr wstr long long long long ptr ptr ptr) + @ stub ChkdskEx + @ stub ComputeFmMediaType + @ stdcall DiskCopy() + @ stdcall EnableVolumeCompression(wstr long) + @ stdcall Extend() + @ stdcall Format() + @ stdcall FormatEx(wstr long wstr wstr long long ptr) + @ stub FormatEx2 + @ stdcall InitializeFmIfs(ptr long ptr) + @ stdcall QueryAvailableFileSystemFormat(long ptr str str long) + @ stub QueryDeviceInformation + @ stub QueryDeviceInformationByHandle + @ stub QueryFileSystemName + @ stub QueryLatestFileSystemVersion + @ stdcall QuerySupportedMedia(str ptr long ptr) + @ stdcall SetLabel(wstr wstr) kernel32.SetVolumeLabelW Propchange: branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.spec ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.def (removed) @@ -1,68 +1,0 @@ -; $Id: lsasrv.def 12852 2005-01-06 13:58:04Z mf $ -LIBRARY lsasrv -EXPORTS -;LsaIAuditNotifyPackageLoad -;LsaIAuditSamEvent -;LsaIEnumerateSecrets -;LsaIFree_LSAI_PRIVATE_DATA -;LsaIFree_LSAI_SECRET_ENUM_BUFFER -;LsaIFree_LSAPR_ACCOUNT_ENUM_BUFFER -;LsaIFree_LSAPR_CR_CIPHER_VALUE -;LsaIFree_LSAPR_POLICY_INFORMATION -;LsaIFree_LSAPR_PRIVILEGE_ENUM_BUFFER -;LsaIFree_LSAPR_PRIVILEGE_SET -;LsaIFree_LSAPR_REFERENCED_DOMAIN_LIST -;LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR -;LsaIFree_LSAPR_TRANSLATED_NAMES -;LsaIFree_LSAPR_TRANSLATED_SIDS -;LsaIFree_LSAPR_TRUSTED_DOMAIN_INFO -;LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER -;LsaIFree_LSAPR_TRUST_INFORMATION -;LsaIFree_LSAPR_UNICODE_STRING -;LsaIGetPrivateData -;LsaIGetSerialNumberPolicy -;LsaIGetSerialNumberPolicy2 -;LsaIHealthCheck -;LsaIInitializeWellKnownSids -;LsaIOpenPolicyTrusted -;LsaIQueryInformationPolicyTrusted -;LsaISetPrivateData -;LsaISetSerialNumberPolicy -;LsaISetTimesSecret -;LsaISetupWasRun -;LsapAuOpenSam -LsapInitLsa@0 -;LsarAddPrivilegesToAccount -;LsarClose -;LsarCreateAccount -;LsarCreateSecret -;LsarCreateTrustedDomain -;LsarDelete -;LsarEnumerateAccounts -;LsarEnumeratePrivileges -;LsarEnumeratePrivilegesAccount -;LsarEnumerateTrustedDomains -;LsarGetQuotasForAccount -;LsarGetSystemAccessAccount -;LsarLookupNames -;LsarLookupPrivilegeDisplayName -;LsarLookupPrivilegeName -;LsarLookupPrivilegeValue -;LsarLookupSids -;LsarOpenAccount -;LsarOpenPolicy -;LsarOpenSecret -;LsarOpenTrustedDomain -;LsarQueryInfoTrustedDomain -;LsarQueryInformationPolicy -;LsarQuerySecret -;LsarQuerySecurityObject -;LsarRemovePrivilegesFromAccount -;LsarSetInformationPolicy -;LsarSetInformationTrustedDomain -;LsarSetQuotasForAccount -;LsarSetSecret -;LsarSetSecurityObject -;LsarSetSystemAccessAccount -;ServiceInit -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] Fri Aug 29 11:39:06 2008 @@ -1,5 +1,5 @@ <module name="lsasrv" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_LSASRV}" installbase="system32" installname="lsasrv.dll" unicode="yes"> - <importlibrary definition="lsasrv.def" /> + <importlibrary definition="lsasrv.spec.def" /> <include base="lsasrv">.</include> <include base="lsa_server">.</include> <define name="WINVER">0x600</define> @@ -13,4 +13,5 @@ <file>lsarpc.c</file> <file>lsasrv.c</file> <file>lsasrv.rc</file> -</module> + <file>lsasrv.spec</file> +</module> Copied: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.spec (from r35723, branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] Fri Aug 29 11:39:06 2008 @@ -1,68 +1,65 @@ -; $Id: lsasrv.def 12852 2005-01-06 13:58:04Z mf $ -LIBRARY lsasrv -EXPORTS -;LsaIAuditNotifyPackageLoad -;LsaIAuditSamEvent -;LsaIEnumerateSecrets -;LsaIFree_LSAI_PRIVATE_DATA -;LsaIFree_LSAI_SECRET_ENUM_BUFFER -;LsaIFree_LSAPR_ACCOUNT_ENUM_BUFFER -;LsaIFree_LSAPR_CR_CIPHER_VALUE -;LsaIFree_LSAPR_POLICY_INFORMATION -;LsaIFree_LSAPR_PRIVILEGE_ENUM_BUFFER -;LsaIFree_LSAPR_PRIVILEGE_SET -;LsaIFree_LSAPR_REFERENCED_DOMAIN_LIST -;LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR -;LsaIFree_LSAPR_TRANSLATED_NAMES -;LsaIFree_LSAPR_TRANSLATED_SIDS -;LsaIFree_LSAPR_TRUSTED_DOMAIN_INFO -;LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER -;LsaIFree_LSAPR_TRUST_INFORMATION -;LsaIFree_LSAPR_UNICODE_STRING -;LsaIGetPrivateData -;LsaIGetSerialNumberPolicy -;LsaIGetSerialNumberPolicy2 -;LsaIHealthCheck -;LsaIInitializeWellKnownSids -;LsaIOpenPolicyTrusted -;LsaIQueryInformationPolicyTrusted -;LsaISetPrivateData -;LsaISetSerialNumberPolicy -;LsaISetTimesSecret -;LsaISetupWasRun -;LsapAuOpenSam -LsapInitLsa@0 -;LsarAddPrivilegesToAccount -;LsarClose -;LsarCreateAccount -;LsarCreateSecret -;LsarCreateTrustedDomain -;LsarDelete -;LsarEnumerateAccounts -;LsarEnumeratePrivileges -;LsarEnumeratePrivilegesAccount -;LsarEnumerateTrustedDomains -;LsarGetQuotasForAccount -;LsarGetSystemAccessAccount -;LsarLookupNames -;LsarLookupPrivilegeDisplayName -;LsarLookupPrivilegeName -;LsarLookupPrivilegeValue -;LsarLookupSids -;LsarOpenAccount -;LsarOpenPolicy -;LsarOpenSecret -;LsarOpenTrustedDomain -;LsarQueryInfoTrustedDomain -;LsarQueryInformationPolicy -;LsarQuerySecret -;LsarQuerySecurityObject -;LsarRemovePrivilegesFromAccount -;LsarSetInformationPolicy -;LsarSetInformationTrustedDomain -;LsarSetQuotasForAccount -;LsarSetSecret -;LsarSetSecurityObject -;LsarSetSystemAccessAccount -;ServiceInit -; EOF + + @ stub LsaIAuditNotifyPackageLoad + @ stub LsaIAuditSamEvent + @ stub LsaIEnumerateSecrets + @ stub LsaIFree_LSAI_PRIVATE_DATA #DATA + @ stub LsaIFree_LSAI_SECRET_ENUM_BUFFER + @ stub LsaIFree_LSAPR_ACCOUNT_ENUM_BUFFER + @ stub LsaIFree_LSAPR_CR_CIPHER_VALUE + @ stub LsaIFree_LSAPR_POLICY_INFORMATION + @ stub LsaIFree_LSAPR_PRIVILEGE_ENUM_BUFFER + @ stub LsaIFree_LSAPR_PRIVILEGE_SET + @ stub LsaIFree_LSAPR_REFERENCED_DOMAIN_LIST + @ stub LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR + @ stub LsaIFree_LSAPR_TRANSLATED_NAMES + @ stub LsaIFree_LSAPR_TRANSLATED_SIDS + @ stub LsaIFree_LSAPR_TRUSTED_DOMAIN_INFO + @ stub LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER + @ stub LsaIFree_LSAPR_TRUST_INFORMATION + @ stub LsaIFree_LSAPR_UNICODE_STRING + @ stub LsaIGetPrivateData + @ stub LsaIGetSerialNumberPolicy + @ stub LsaIGetSerialNumberPolicy2 + @ stub LsaIHealthCheck + @ stub LsaIInitializeWellKnownSids + @ stub LsaIOpenPolicyTrusted + @ stub LsaIQueryInformationPolicyTrusted + @ stub LsaISetPrivateData + @ stub LsaISetSerialNumberPolicy + @ stub LsaISetTimesSecret + @ stub LsaISetupWasRun + @ stub LsapAuOpenSam + @ stdcall LsapInitLsa() + @ stub LsarAddPrivilegesToAccount + @ stub LsarClose + @ stub LsarCreateAccount + @ stub LsarCreateSecret + @ stub LsarCreateTrustedDomain + @ stub LsarDelete + @ stub LsarEnumerateAccounts + @ stub LsarEnumeratePrivileges + @ stub LsarEnumeratePrivilegesAccount + @ stub LsarEnumerateTrustedDomains + @ stub LsarGetQuotasForAccount + @ stub LsarGetSystemAccessAccount + @ stub LsarLookupNames + @ stub LsarLookupPrivilegeDisplayName + @ stub LsarLookupPrivilegeName + @ stub LsarLookupPrivilegeValue + @ stub LsarLookupSids + @ stub LsarOpenAccount + @ stub LsarOpenPolicy + @ stub LsarOpenSecret + @ stub LsarOpenTrustedDomain + @ stub LsarQueryInfoTrustedDomain + @ stub LsarQueryInformationPolicy + @ stub LsarQuerySecret + @ stub LsarQuerySecurityObject + @ stub LsarRemovePrivilegesFromAccount + @ stub LsarSetInformationPolicy + @ stub LsarSetInformationTrustedDomain + @ stub LsarSetQuotasForAccount + @ stub LsarSetSecret + @ stub LsarSetSecurityObject + @ stub LsarSetSystemAccessAccount + @ stub ServiceInit Propchange: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.spec ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 1 month

[cgutman] 35761: - Returning STATUS_BUFFER_OVERFLOW is ok also since we're only trying to get DriverKeyLength

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 29 09:33:42 2008 New Revision: 35761 URL: http://svn.reactos.org/svn/reactos?rev=35761&view=rev Log: - Returning STATUS_BUFFER_OVERFLOW is ok also since we're only trying to get DriverKeyLength Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Aug 29 09:33:42 2008 @@ -1625,7 +1625,7 @@ Status = IoGetDeviceProperty(PhysicalDeviceObject, DevicePropertyDriverKeyName, 0, NULL, &DriverKeyLength); - if (Status != STATUS_BUFFER_TOO_SMALL) + if (Status != STATUS_BUFFER_TOO_SMALL && Status != STATUS_BUFFER_OVERFLOW) { NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't get miniport driver key length.\n")); return Status;

16 years, 1 month

[janderwald] 35760: - Activate INetConnection::GetProperties code - Import from ncpa properties and status dialog - Implement INetConnectionProperty interface - Fix a bug & handle leak in registering code - Implement NcFreeNetconProperties - Make resources of netshell to be similar of Windows XP to allow netshell to be loaded - Add NCF constants from ncpa - Implement enumerating control/protocol and devices - items dont appear for some unknown reason - Load property dialog in the same way like W

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Aug 29 09:18:55 2008 New Revision: 35760 URL: http://svn.reactos.org/svn/reactos?rev=35760&view=rev Log: - Activate INetConnection::GetProperties code - Import from ncpa properties and status dialog - Implement INetConnectionProperty interface - Fix a bug & handle leak in registering code - Implement NcFreeNetconProperties - Make resources of netshell to be similar of Windows XP to allow netshell to be loaded - Add NCF constants from ncpa - Implement enumerating control/protocol and devices - items dont appear for some unknown reason - Load property dialog in the same way like Windows (using INetConnectionProperty) interface Added: trunk/reactos/dll/win32/netshell/lanconnectui.c (with props) Modified: trunk/reactos/dll/win32/netshell/classfactory.c trunk/reactos/dll/win32/netshell/connectmanager.c trunk/reactos/dll/win32/netshell/lang/de-DE.rc trunk/reactos/dll/win32/netshell/lang/en-US.rc trunk/reactos/dll/win32/netshell/netshell.c trunk/reactos/dll/win32/netshell/netshell.rbuild trunk/reactos/dll/win32/netshell/netshell.rc trunk/reactos/dll/win32/netshell/netshell.spec trunk/reactos/dll/win32/netshell/precomp.h trunk/reactos/dll/win32/netshell/resource.h trunk/reactos/dll/win32/netshell/shfldr_netconnect.c Modified: trunk/reactos/dll/win32/netshell/classfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/classfa… ============================================================================== --- trunk/reactos/dll/win32/netshell/classfactory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/classfactory.c [iso-8859-1] Fri Aug 29 09:18:55 2008 @@ -21,7 +21,6 @@ IClassFactoryImpl *This = (IClassFactoryImpl *)iface; *ppvObj = NULL; - if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) { *ppvObj = This; Modified: trunk/reactos/dll/win32/netshell/connectmanager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/connect… ============================================================================== --- trunk/reactos/dll/win32/netshell/connectmanager.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/connectmanager.c [iso-8859-1] Fri Aug 29 09:18:55 2008 @@ -211,17 +211,14 @@ INetConnection * iface, NETCON_PROPERTIES **ppProps) { -#if 0 + NETCON_PROPERTIES * pProperties; -#endif + INetConnectionImpl * This = (INetConnectionImpl*)iface; if (!ppProps) return E_POINTER; -#if 1 - *ppProps = &This->Props; -#else pProperties = CoTaskMemAlloc(sizeof(NETCON_PROPERTIES)); if (!pProperties) return E_OUTOFMEMORY; @@ -241,7 +238,6 @@ } *ppProps = pProperties; -#endif return NOERROR; } @@ -252,6 +248,15 @@ INetConnection * iface, CLSID *pclsid) { + + INetConnectionImpl * This = (INetConnectionImpl*)iface; + + if (This->Props.MediaType == NCM_LAN) + { + CopyMemory(pclsid, &CLSID_LANConnectUI, sizeof(CLSID)); + return S_OK; + } + return E_NOTIMPL; } Added: trunk/reactos/dll/win32/netshell/lanconnectui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanconn… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanconnectui.c (added) +++ trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] Fri Aug 29 09:18:55 2008 @@ -1,0 +1,456 @@ +#include <precomp.h> + +typedef enum +{ + NET_TYPE_CLIENT = 1, + NET_TYPE_SERVICE = 2, + NET_TYPE_PROTOCOL = 3 +}NET_TYPE; + +typedef struct +{ + NET_TYPE Type; + DWORD dwCharacteristics; + LPWSTR szHelp; +}NET_ITEM, *PNET_ITEM; + +typedef struct +{ + INetConnectionPropertyUi *lpVtbl; + INetConnection * pCon; + LONG ref; +}INetConnectionPropertyUiImpl, *LPINetConnectionPropertyUiImpl; + + +/// CLASSID +/// {7007ACC5-3202-11D1-AAD2-00805FC1270E} +/// open network properties and wlan properties + +HPROPSHEETPAGE +InitializePropertySheetPage(LPWSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle) +{ + PROPSHEETPAGEW ppage; + + memset(&ppage, 0x0, sizeof(PROPSHEETPAGEW)); + ppage.dwSize = sizeof(PROPSHEETPAGEW); + ppage.dwFlags = PSP_DEFAULT; + ppage.u.pszTemplate = resname; + ppage.pfnDlgProc = dlgproc; + ppage.lParam = lParam; + ppage.hInstance = netshell_hInstance; + ppage.pszTitle = szTitle; + if (szTitle) + { + ppage.dwFlags |= PSP_USETITLE; + } + return CreatePropertySheetPageW(&ppage); +} + +HRESULT +LaunchUIDlg(UINT * pResourceIDs, DLGPROC * pDlgs, UINT Count, NETCON_PROPERTIES * pProperties) +{ + HPROPSHEETPAGE * hpsp; + PROPSHEETHEADERW psh; + BOOL ret; + UINT Index, Offset; + + hpsp = CoTaskMemAlloc(Count * sizeof(HPROPSHEETPAGE)); + if (!hpsp) + return E_OUTOFMEMORY; + + ZeroMemory(hpsp, Count * sizeof(HPROPSHEETPAGE)); + + Index = 0; + Offset = 0; + do + { + hpsp[Offset] = InitializePropertySheetPage(MAKEINTRESOURCEW(pResourceIDs[Index]), pDlgs[Index], (LPARAM)pProperties, NULL); + if (hpsp[Offset]) + Offset++; + + }while(++Index < Count); + + if (!Offset) + { + CoTaskMemFree(hpsp); + return E_FAIL; + } + + + ZeroMemory(&psh, sizeof(PROPSHEETHEADERW)); + psh.dwSize = sizeof(PROPSHEETHEADERW); + psh.dwFlags = PSP_DEFAULT | PSH_PROPTITLE; + psh.pszCaption = pProperties->pszwName; + psh.hwndParent = NULL; + psh.u3.phpage = hpsp; + psh.nPages = Offset; + psh.hInstance = netshell_hInstance; + + + ret = PropertySheetW(&psh); + CoTaskMemFree(hpsp); + + if (ret < 0) + return E_FAIL; + else + return S_OK; +} + +VOID +AddItemToListView(HWND hDlgCtrl, PNET_ITEM pItem, LPWSTR szName) +{ + LVITEMW lvItem; + + ZeroMemory(&lvItem, sizeof(lvItem)); + lvItem.mask = LVIF_TEXT | LVIF_PARAM; + lvItem.pszText = szName; + lvItem.lParam = (LPARAM)pItem; + lvItem.iItem = ListView_GetItemCount(hDlgCtrl); + + SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&lvItem); +} + +VOID +EnumClientServiceProtocol(HWND hDlgCtrl, HKEY hKey, UINT Type) +{ + DWORD dwIndex = 0; + DWORD dwSize; + DWORD dwRetVal; + DWORD dwCharacteristics; + WCHAR szName[60]; + WCHAR szText[40]; + WCHAR szHelp[200]; + HKEY hSubKey; + static WCHAR szNDI[] = L"\\Ndi"; + PNET_ITEM pItem; + + do + { + szHelp[0] = L'\0'; + dwCharacteristics = 0; + szText[0] = L'\0'; + + dwSize = sizeof(szName)/sizeof(WCHAR); + if (RegEnumKeyExW(hKey, dwIndex++, szName, &dwSize, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + /* Get Help Text */ + if (dwSize + (sizeof(szNDI)/sizeof(WCHAR)) + 1 < sizeof(szName)/sizeof(WCHAR)) + { + wcscpy(&szName[dwSize], szNDI); + if (RegOpenKeyExW(hKey, szName, 0, KEY_READ, &hSubKey) == ERROR_SUCCESS) + { +#if 0 + if (RegLoadMUIStringW(hSubKey, L"HelpText", szHelp, sizeof(szHelp)/sizeof(WCHAR), &dwRetVal, 0, NULL) == ERROR_SUCCESS) + szHelp[(sizeof(szHelp)/sizeof(WCHAR))-1] = L'\0'; +#else + DWORD dwType; + dwRetVal = sizeof(szHelp); + if (RegQueryValueExW(hSubKey, L"HelpText", NULL, &dwType, (LPBYTE)szHelp, &dwRetVal) == ERROR_SUCCESS) + szHelp[(sizeof(szHelp)/sizeof(WCHAR))-1] = L'\0'; +#endif + RegCloseKey(hSubKey); + } + szName[dwSize] = L'\0'; + } + /* Get Characteristics */ + if (RegOpenKeyExW(hKey, szName, 0, KEY_READ, &hSubKey) == ERROR_SUCCESS) + { + dwSize = sizeof(dwCharacteristics); + if (RegQueryValueExW(hSubKey, L"Characteristics", NULL, NULL, (LPBYTE)&dwCharacteristics, &dwSize) == ERROR_SUCCESS) + { + if (dwCharacteristics & NCF_HIDDEN) + { + RegCloseKey(hSubKey); + continue; + } + } + /* Get the Client/Procotol/Service name */ + dwSize = sizeof(szText); + if (RegQueryValueExW(hSubKey, L"Description", NULL, NULL, (LPBYTE)szText, &dwSize) == ERROR_SUCCESS) + { + szText[(sizeof(szText)/sizeof(WCHAR))-1] = L'\0'; + } + RegCloseKey(hSubKey); + } + + pItem = CoTaskMemAlloc(sizeof(NET_ITEM)); + if (!pItem) + continue; + + pItem->dwCharacteristics = dwCharacteristics; + pItem->Type = Type; + pItem->szHelp = CoTaskMemAlloc((wcslen(szHelp)+1)*sizeof(WCHAR)); + if (pItem->szHelp) + wcscpy(pItem->szHelp, szHelp); + + AddItemToListView(hDlgCtrl, pItem, szText); + } + else + break; + + }while(TRUE); + +} + + +VOID +InitializeLANPropertiesUIDlg(HWND hwndDlg) +{ + static WCHAR szNetClient[] = L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4d36e973-e325-11ce-bfc1-08002be10318}"; + static WCHAR szNetService[] = L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4d36e974-e325-11ce-bfc1-08002be10318}"; + static WCHAR szNetProtocol[] =L"System\\CurrentControlSet\\Control\\Network\\{4D36E975-E325-11CE-BFC1-08002BE10318}"; + HKEY hKey; + HWND hDlgCtrl; + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_COMPONENTSLIST); + /* Enumerate Clients */ + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szNetClient, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + EnumClientServiceProtocol(hwndDlg, hKey, NET_TYPE_CLIENT); + RegCloseKey(hKey); + } + + /* Enumerate Service */ + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szNetService, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + EnumClientServiceProtocol(hwndDlg, hKey, NET_TYPE_SERVICE); + RegCloseKey(hKey); + } + + /* Enumerate Protocol */ + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szNetProtocol, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + EnumClientServiceProtocol(hwndDlg, hKey, NET_TYPE_PROTOCOL); + RegCloseKey(hKey); + } + + +} + + +INT_PTR +CALLBACK +LANPropertiesUIDlg( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + PROPSHEETPAGE *page; + NETCON_PROPERTIES * pProperties = (NETCON_PROPERTIES*)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch(uMsg) + { + case WM_INITDIALOG: + page = (PROPSHEETPAGE*)lParam; + pProperties = (NETCON_PROPERTIES*)page->lParam; + SendDlgItemMessageW(hwndDlg, IDC_NETCARDNAME, WM_SETTEXT, 0, (LPARAM)pProperties->pszwDeviceName); + if (pProperties->dwCharacter & NCCF_SHOW_ICON) + { + /* check show item on taskbar*/ + SendDlgItemMessageW(hwndDlg, IDC_SHOWTASKBAR, BM_SETCHECK, BST_CHECKED, 0); + } + if (pProperties->dwCharacter & NCCF_NOTIFY_DISCONNECTED) + { + /* check notify item */ + SendDlgItemMessageW(hwndDlg, IDC_NOTIFYNOCONNECTION, BM_SETCHECK, BST_CHECKED, 0); + } + InitializeLANPropertiesUIDlg(hwndDlg); + return TRUE; + } + return FALSE; +} + + +HRESULT +ShowLANConnectionPropertyDialog(NETCON_PROPERTIES * pProperties) +{ + UINT ResourceId[1] = { IDD_NETPROPERTIES }; + DLGPROC Dlgs[1] = {LANPropertiesUIDlg}; + INITCOMMONCONTROLSEX ic; + + + ic.dwSize = sizeof(INITCOMMONCONTROLSEX); + ic.dwICC = ICC_LISTVIEW_CLASSES; + InitCommonControlsEx(&ic); + + return LaunchUIDlg(ResourceId, Dlgs, 1, pProperties); +} + +INT_PTR +CALLBACK +LANStatusUIDlg( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + NETCON_PROPERTIES * pProperties = (NETCON_PROPERTIES*)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch(uMsg) + { + case WM_INITDIALOG: + pProperties = (NETCON_PROPERTIES*)lParam; + return TRUE; + } + return FALSE; +} + + +HRESULT +ShowLANConnectionStatusDialog(NETCON_PROPERTIES * pProperties) +{ + UINT ResourceId[1] = { IDD_NETSTATUS }; + DLGPROC Dlgs[1] = {LANStatusUIDlg}; + return LaunchUIDlg(ResourceId, Dlgs, 1, pProperties); +} + +static +HRESULT +WINAPI +INetConnectionPropertyUi_fnQueryInterface( + INetConnectionPropertyUi * iface, + REFIID iid, + LPVOID * ppvObj) +{ + INetConnectionPropertyUiImpl * This = (INetConnectionPropertyUiImpl*)iface; + *ppvObj = NULL; + + if (IsEqualIID (iid, &IID_IUnknown) || + IsEqualIID (iid, &IID_INetConnectionPropertyUi)) + { + *ppvObj = This; + IUnknown_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static +ULONG +WINAPI +INetConnectionPropertyUi_fnAddRef( + INetConnectionPropertyUi * iface) +{ + INetConnectionPropertyUiImpl * This = (INetConnectionPropertyUiImpl*)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + return refCount; +} + +static +ULONG +WINAPI +INetConnectionPropertyUi_fnRelease( + INetConnectionPropertyUi * iface) +{ + INetConnectionPropertyUiImpl * This = (INetConnectionPropertyUiImpl*)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + if (!refCount) + { + CoTaskMemFree (This); + } + return refCount; +} + +static +HRESULT +WINAPI +INetConnectionPropertyUi_fnSetConnection( + INetConnectionPropertyUi * iface, + INetConnection *pCon) +{ + INetConnectionPropertyUiImpl * This = (INetConnectionPropertyUiImpl*)iface; + + if (!pCon) + return E_POINTER; + + if (This->pCon) + INetConnection_Release(This->pCon); + + This->pCon = pCon; + INetConnection_AddRef(This->pCon); + return S_OK; +} + +static +HRESULT +WINAPI +INetConnectionPropertyUi_fnAddPages( + INetConnectionPropertyUi * iface, + HWND hwndParent, + LPFNADDPROPSHEETPAGE pfnAddPage, + LPARAM lParam) +{ + HPROPSHEETPAGE hProp; + NETCON_PROPERTIES * pProperties; + BOOL ret; + HRESULT hr; + INITCOMMONCONTROLSEX initEx; + INetConnectionPropertyUiImpl * This = (INetConnectionPropertyUiImpl*)iface; + + + initEx.dwSize = sizeof(initEx); + initEx.dwICC = ICC_LISTVIEW_CLASSES; + + + if(!InitCommonControlsEx(&initEx)) + return E_FAIL; + + + + hr = INetConnection_GetProperties(This->pCon, &pProperties); + if (FAILED(hr)) + return hr; + + hProp = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_NETPROPERTIES), LANPropertiesUIDlg, (LPARAM)pProperties, pProperties->pszwName); + if (hProp) + { + ret = (*pfnAddPage)(hProp, lParam); + if (ret) + { + return NOERROR; + } + DestroyPropertySheetPage(hProp); + } + return E_FAIL; +} + +static const INetConnectionPropertyUiVtbl vt_NetConnectionPropertyUi = +{ + INetConnectionPropertyUi_fnQueryInterface, + INetConnectionPropertyUi_fnAddRef, + INetConnectionPropertyUi_fnRelease, + INetConnectionPropertyUi_fnSetConnection, + INetConnectionPropertyUi_fnAddPages, +}; + +HRESULT WINAPI LanConnectUI_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) +{ + INetConnectionPropertyUiImpl * This; + + if (!ppv) + return E_POINTER; + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + This = (INetConnectionPropertyUiImpl *) CoTaskMemAlloc(sizeof (INetConnectionPropertyUiImpl)); + if (!This) + return E_OUTOFMEMORY; + + This->ref = 1; + This->pCon = NULL; + This->lpVtbl = (INetConnectionPropertyUi*)&vt_NetConnectionPropertyUi; + + if (!SUCCEEDED (INetConnectionPropertyUi_fnQueryInterface ((INetConnectionPropertyUi*)This, riid, ppv))) + { + IUnknown_Release((IUnknown*)This); + return E_NOINTERFACE; + } + + IUnknown_Release((IUnknown*)This); + return S_OK; +} Propchange: trunk/reactos/dll/win32/netshell/lanconnectui.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/netshell/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/de… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] Fri Aug 29 09:18:55 2008 @@ -1,4 +1,49 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 246 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Verbindung herstellen über:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Konfigurieren", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Diese &Verbindung verwendet folgende Elemente:", -1, 9, 59, 217, 8 + CONTROL "List3", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 + PUSHBUTTON "&Installieren", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Deinstallieren", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Eigenschaften", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Beschreibung", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Hier wird die Beschreibung des Elementes stehen....", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "&Symbol bei Verbindung im Infobereich anzeigen", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Benachrichtigen, wenn diese Verbindung eingeschränkte oder\nkeine Konnektivität besitzt", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 24, BS_AUTOCHECKBOX | WS_TABSTOP +END + +IDD_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Allgemein", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Status:", -1, 19, 20, 60, 8 + LTEXT "Dauer:", -1, 19, 34, 60, 8 + LTEXT "Übertragungsrate:", -1, 19, 48, 60, 8 + GROUPBOX "Aktivität", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Gesendet", -1, 26, 90, 60, 8 + ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 + ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 + LTEXT "Empfangen", -1, 149, 90, 37, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + ICON IDI_VERTICAL, -1, 110, 108, 18, 20 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "E&igenschaften", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Deaktivieren", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/netshell/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/en… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] Fri Aug 29 09:18:55 2008 @@ -1,4 +1,50 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 246 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Connect Using:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Configure", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Components checked are used by this connection:", -1, 9, 59, 217, 8 + CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_LIST | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 + PUSHBUTTON "&Install", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Uninstall", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Properties", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Description", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Component Description goes here...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Show Icon in taskbar when connected", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP +END + +IDD_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Connection", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Status:", -1, 19, 20, 60, 8 + LTEXT "Duration:", -1, 19, 34, 60, 8 + LTEXT "Speed:", -1, 19, 48, 60, 8 + GROUPBOX "Activity", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Sent", -1, 26, 90, 60, 8 + ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 + ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 + LTEXT "Received", -1, 149, 90, 37, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + ICON IDI_VERTICAL, -1, 110, 108, 18, 20 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Properties", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Disable", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/dll/win32/netshell/netshell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.c [iso-8859-1] Fri Aug 29 09:18:55 2008 @@ -1,9 +1,12 @@ #include "precomp.h" HINSTANCE netshell_hInstance; +const GUID CLSID_LANConnectUI = {0x7007ACC5, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; const GUID CLSID_NetworkConnections = {0x7007ACC7, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; const GUID GUID_DEVCLASS_NET = {0x4d36e972, 0xe325, 0x11ce, {0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18}}; + static const WCHAR szNetConnectClass[] = L"CLSID\\{7007ACC7-3202-11D1-AAD2-00805FC1270E}"; +static const WCHAR szLanConnectUI[] = L"CLSID\\{7007ACC5-3202-11D1-AA-D200805FC1270E}"; static const WCHAR szNamespaceKey[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace\\{7007ACC7-3202-11D1-AAD2-00805FC1270E}"; static INTERFACE_TABLE InterfaceTable[] = @@ -15,6 +18,10 @@ { &CLSID_ConnectionManager, INetConnectionManager_Constructor + }, + { + &CLSID_LANConnectUI, + LanConnectUI_Constructor }, { NULL, @@ -51,7 +58,7 @@ DllRegisterServer(void) { HKEY hKey, hSubKey; - WCHAR szName[MAX_PATH] = {0}; + WCHAR szName[MAX_PATH+20] = {0}; WCHAR szNet[20]; UINT Length, Offset; @@ -71,7 +78,7 @@ } Length = swprintf(szNet, L",-%u", IDS_NETWORKCONNECTION); - Offset = GetModuleFileNameW(netshell_hInstance, &szName[1], MAX_PATH); + Offset = GetModuleFileNameW(netshell_hInstance, &szName[1], (sizeof(szName)/sizeof(WCHAR))-1); if (Offset + Length + 2 < MAX_PATH) { /* set localized name */ @@ -100,6 +107,7 @@ RegSetValueExW(hSubKey, L"Attributes",0, REG_BINARY, (const LPBYTE)&dwAttributes, sizeof(DWORD)); } + RegCloseKey(hKey); return S_OK; } @@ -146,3 +154,12 @@ return hres; } + +VOID +STDCALL +NcFreeNetconProperties (NETCON_PROPERTIES* pProps) +{ + CoTaskMemFree(pProps->pszwName); + CoTaskMemFree(pProps->pszwDeviceName); + CoTaskMemFree(pProps); +} Modified: trunk/reactos/dll/win32/netshell/netshell.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.rbuild [iso-8859-1] Fri Aug 29 09:18:55 2008 @@ -17,6 +17,7 @@ <library>uuid</library> <library>advapi32</library> <library>setupapi</library> + <library>comctl32</library> <pch>precomp.h</pch> <file>netshell.c</file> <file>shfldr_netconnect.c</file> @@ -25,4 +26,5 @@ <file>classfactory.c</file> <file>connectmanager.c</file> <file>netshell.spec</file> + <file>lanconnectui.c</file> </module> Modified: trunk/reactos/dll/win32/netshell/netshell.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.rc [iso-8859-1] Fri Aug 29 09:18:55 2008 @@ -4,6 +4,17 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "W32 subsystem kernel\0" +#define REACTOS_STR_INTERNAL_NAME "netshell.dll\0" +#define REACTOS_STR_ORIGINAL_FILENAME "netshell.dll\0" +#define REACTOS_STR_PRODUCT_VERSION "5.1.2600.3264\0" +#define REACTOS_STR_FILE_VERSION "5.1.2600.3264\0" + +#include <reactos/version.rc> + + IDI_SHELL_NETWORK_FOLDER ICON "res/netshell.ico" #include "lang/de-DE.rc" Modified: trunk/reactos/dll/win32/netshell/netshell.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.spec [iso-8859-1] Fri Aug 29 09:18:55 2008 @@ -20,7 +20,7 @@ 19 stub HrRenameConnection 20 stub HrRunWizard 21 stub InvokeDunFile -22 stub NcFreeNetconProperties +22 stdcall NcFreeNetconProperties(ptr) 23 stub NcIsValidConnectionName 24 stub NetSetupAddRasConnection 25 stub NetSetupFinishInstall Modified: trunk/reactos/dll/win32/netshell/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/precomp… ============================================================================== --- trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] Fri Aug 29 09:18:55 2008 @@ -38,6 +38,17 @@ #include "wine/unicode.h" #include "resource.h" +#define NCF_VIRTUAL 0x1 +#define NCF_SOFTWARE_ENUMERATED 0x2 +#define NCF_PHYSICAL 0x4 +#define NCF_HIDDEN 0x8 +#define NCF_NO_SERVICE 0x10 +#define NCF_NOT_USER_REMOVABLE 0x20 +#define NCF_MULTIPORT_INSTANCED_ADAPTER 0x40 +#define NCF_HAS_UI 0x80 +#define NCF_FILTER 0x400 +#define NCF_NDIS_PROTOCOL 0x4000 + typedef struct { int colnameid; int pcsFlags; @@ -60,6 +71,7 @@ /* globals */ extern HINSTANCE netshell_hInstance; extern const GUID CLSID_NetworkConnections; +extern const GUID CLSID_LANConnectUI; extern const GUID GUID_DEVCLASS_NET; @@ -80,4 +92,10 @@ /* connectmanager.c */ HRESULT WINAPI INetConnectionManager_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); +/* lanconnectui.c */ +HRESULT WINAPI LanConnectUI_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); +HRESULT ShowLANConnectionStatusDialog(NETCON_PROPERTIES * pProperties); + +#define NCCF_NOTIFY_DISCONNECTED 0x100000 + #endif Modified: trunk/reactos/dll/win32/netshell/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/resourc… ============================================================================== --- trunk/reactos/dll/win32/netshell/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/resource.h [iso-8859-1] Fri Aug 29 09:18:55 2008 @@ -2,15 +2,32 @@ /* icons */ #define IDI_SHELL_NETWORK_FOLDER 100 - +#define IDI_HORIZONTAL 101 +#define IDI_NETSTAT 102 +#define IDI_VERTICAL 103 /* dialogs */ - - - - +#define IDD_NETPROPERTIES 400 +#define IDD_NETSTATUS 401 /* dialog controls */ +#define IDC_NETCARDNAME 1000 +#define IDC_CONFIGURE 1001 +#define IDC_COMPONENTSLIST 2800 +#define IDC_INSTALL 1003 +#define IDC_UNINSTALL 1004 +#define IDC_PROPERTIES 1005 +#define IDC_DESCRIPTION 1006 +#define IDC_SHOWTASKBAR 1007 +#define IDC_NOTIFYNOCONNECTION 1008 + +#define IDC_SEND 1100 +#define IDC_RECEIVED 1101 +#define IDC_STATUS_PROPERTIES 1102 +#define IDC_ENDISABLE 1103 +#define IDC_STATUS 1104 +#define IDC_DURATION 1105 +#define IDC_SPEED 1106 /* resource constants */ Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/shfldr_… ============================================================================== --- trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] Fri Aug 29 09:18:55 2008 @@ -21,6 +21,8 @@ #include <precomp.h> WINE_DEFAULT_DEBUG_CHANNEL (shell); + +#define MAX_PROPERTY_SHEET_PAGE (10) /*********************************************************************** * IShellFolder implementation @@ -732,6 +734,19 @@ return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 9); } +BOOL +CALLBACK +PropSheetExCallback(HPROPSHEETPAGE hPage, LPARAM lParam) +{ + PROPSHEETHEADERW *pinfo = (PROPSHEETHEADERW *)lParam; + + if (pinfo->nPages < MAX_PROPERTY_SHEET_PAGE) + { + pinfo->u3.phpage[pinfo->nPages++] = hPage; + return TRUE; + } + return FALSE; +} /************************************************************************** * ISF_NetConnect_IContextMenu_InvokeCommand() @@ -740,7 +755,61 @@ IContextMenu2 *iface, LPCMINVOKECOMMANDINFO lpcmi) { - //IGenericSFImpl * This = impl_from_IContextMenu2(iface); + IGenericSFImpl * This = impl_from_IContextMenu2(iface); + VALUEStruct * val; + NETCON_PROPERTIES * pProperties; + HRESULT hr = S_OK; + PROPSHEETHEADERW pinfo; + CLSID ClassID; + HPROPSHEETPAGE hppages[MAX_PROPERTY_SHEET_PAGE]; + INetConnectionPropertyUi * pNCP; + + val = _ILGetValueStruct(This->apidl); + if (!val) + return E_FAIL; + + if (INetConnection_GetProperties((INetConnection*)val->pItem, &pProperties) != NOERROR) + return E_FAIL; + + if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_STATUS)) + { + if (pProperties->MediaType == NCM_LAN) + { + hr = ShowLANConnectionStatusDialog(pProperties); + NcFreeNetconProperties(pProperties); + } + return hr; + } + else if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_PROPERTIES)) + { + hr = INetConnection_GetUiObjectClassId(val->pItem, &ClassID); + if (SUCCEEDED(hr)) + { + /* FIXME perform version checks */ + hr = CoCreateInstance(&ClassID, NULL, 0, &IID_INetConnectionPropertyUi, (LPVOID)&pNCP); + if (SUCCEEDED(hr)) + { + hr = INetConnectionPropertyUi_SetConnection(pNCP, val->pItem); + if (SUCCEEDED(hr)) + { + memset(&pinfo, 0x0, sizeof(PROPSHEETHEADERW)); + pinfo.dwSize = sizeof(PROPSHEETHEADERW); + pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE; + pinfo.u3.phpage = hppages; + pinfo.pszCaption = pProperties->pszwName; + + hr = INetConnectionPropertyUi_AddPages(pNCP, lpcmi->hwnd, PropSheetExCallback, (LPARAM)&pinfo); + if (SUCCEEDED(hr)) + { + if(PropertySheetW(&pinfo) < 0) + hr = E_FAIL; + } + } + } + } + NcFreeNetconProperties(pProperties); + return hr; + } return S_OK; }

16 years, 1 month

[janderwald] 35759: - add INetConnectionProperty interface

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Aug 29 09:12:34 2008 New Revision: 35759 URL: http://svn.reactos.org/svn/reactos?rev=35759&view=rev Log: - add INetConnectionProperty interface Modified: trunk/reactos/include/psdk/netcon.h Modified: trunk/reactos/include/psdk/netcon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/netcon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/netcon.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/netcon.h [iso-8859-1] Fri Aug 29 09:12:34 2008 @@ -168,4 +168,30 @@ EXTERN_C const CLSID CLSID_ConnectionManager; EXTERN_C const IID IID_INetConnectionManager; +#undef INTERFACE +#define INTERFACE INetConnectionPropertyUi +DECLARE_INTERFACE_(INetConnectionPropertyUi, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD_(HRESULT, SetConnection) (THIS_ INetConnection *pCon) PURE; + STDMETHOD_(HRESULT, AddPages) (THIS_ HWND hwndParent, LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam) PURE; + + +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +#define INetConnectionPropertyUi_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define INetConnectionPropertyUi_AddRef(p) (p)->lpVtbl->AddRef(p) +#define INetConnectionPropertyUi_Release(p) (p)->lpVtbl->Release(p) +#define INetConnectionPropertyUi_SetConnection(p,a) (p)->lpVtbl->SetConnection(p,a) +#define INetConnectionPropertyUi_AddPages(p,a,b,c) (p)->lpVtbl->AddPages(p,a,b,c) #endif + +EXTERN_C const IID IID_INetConnectionPropertyUi; + +VOID STDCALL NcFreeNetconProperties (NETCON_PROPERTIES* pProps); + +#endif

16 years, 1 month

[janderwald] 35758: - add INetConnectionPropertyUi iid

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Aug 29 09:12:01 2008 New Revision: 35758 URL: http://svn.reactos.org/svn/reactos?rev=35758&view=rev Log: - add INetConnectionPropertyUi iid Modified: trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=35… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Fri Aug 29 09:12:01 2008 @@ -98,6 +98,7 @@ DEFINE_GUID(IID_IEnumNetConnection, 0xC08956A0,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(IID_INetConnection, 0xC08956A1,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(IID_INetConnectionManager, 0xC08956A2,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetConnectionPropertyUi, 0xC08956A4,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(FMTID_SummaryInformation,0xF29F85E0,0x4FF9,0x1068,0xAB,0x91,0x08,0x00,0x2B,0x27,0xB3,0xD9); DEFINE_GUID(FMTID_DocSummaryInformation,0xD5CDD502,0x2E9C,0x101B,0x93,0x97,0x08,0x00,0x2B,0x2C,0xF9,0xAE);

16 years, 1 month

[cfinck] 35757: Add "Categories=Development" to the created shortcut as requested by HeisSpiter

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Aug 29 08:41:52 2008 New Revision: 35757 URL: http://svn.reactos.org/svn/reactos?rev=35757&view=rev Log: Add "Categories=Development" to the created shortcut as requested by HeisSpiter Modified: trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh Modified: trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/cre… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh [iso-8859-1] Fri Aug 29 08:41:52 2008 @@ -77,6 +77,7 @@ echo "[Desktop Entry]" > "$shortcut" echo "Type=Application" >> "$shortcut" +echo "Categories=Development" >> "$shortcut" echo "Version=$ROSBE_VERSION" >> "$shortcut" echo "Name=ReactOS Build Environment" >> "$shortcut" echo "Icon=$SCRIPTDIR/RosBE.png" >> "$shortcut"

16 years, 1 month

[ekohl] 35756: [FORMATTING] No code changes.

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Aug 29 08:08:03 2008 New Revision: 35756 URL: http://svn.reactos.org/svn/reactos?rev=35756&view=rev Log: [FORMATTING] No code changes. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Fri Aug 29 08:08:03 2008 @@ -6,7 +6,6 @@ * COPYRIGHT: Copyright 2005-2006 Eric Kohl * Copyright 2006-2007 Hervé Poussineau <hpoussin(a)reactos.org> * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> - * */ /* INCLUDES ****************************************************************/ @@ -1168,6 +1167,7 @@ return dwError; } + /* Create a path suitable for the bootloader out of the full path */ DWORD ScmConvertToBootPathName(wchar_t *CanonName, wchar_t **RelativeName) @@ -1183,12 +1183,12 @@ DPRINT("ScmConvertToBootPathName %S\n", CanonName); ServiceNameLen = wcslen(CanonName); + /* First check, if it's already good */ if (ServiceNameLen > 12 && !wcsnicmp(L"\\SystemRoot\\", CanonName, 12)) { *RelativeName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) + sizeof(WCHAR)); - if (*RelativeName == NULL) { DPRINT1("Error allocating memory for boot driver name!\n"); @@ -1236,8 +1236,8 @@ Expanded = LocalAlloc(LMEM_ZEROINIT, BufferSize * sizeof(WCHAR) + sizeof(WCHAR)); if (!Expanded) { - DPRINT1("Error allocating memory for boot driver name!\n"); - return ERROR_NOT_ENOUGH_MEMORY; + DPRINT1("Error allocating memory for boot driver name!\n"); + return ERROR_NOT_ENOUGH_MEMORY; } /* Expand it */ @@ -1279,7 +1279,6 @@ /* Only \SystemRoot\ is missing */ *RelativeName = LocalAlloc(LMEM_ZEROINIT, (ServiceNameLen - ExpandedLen) * sizeof(WCHAR) + 13*sizeof(WCHAR)); - if (*RelativeName == NULL) { DPRINT1("Error allocating memory for boot driver name!\n"); @@ -1644,9 +1643,8 @@ if (dwServiceType & SERVICE_DRIVER) { dwError = ScmCanonDriverImagePath(dwStartType, - lpBinaryPathName, - &lpImagePath); - + lpBinaryPathName, + &lpImagePath); if (dwError != ERROR_SUCCESS) goto done; } @@ -3210,10 +3208,10 @@ lpDatabaseName); dwError = ROpenSCManagerW(BindingHandle, - lpMachineName ? MachineName.Buffer : NULL, - lpDatabaseName ? DatabaseName.Buffer : NULL, - dwDesiredAccess, - lpScHandle); + lpMachineName ? MachineName.Buffer : NULL, + lpDatabaseName ? DatabaseName.Buffer : NULL, + dwDesiredAccess, + lpScHandle); if (lpMachineName) RtlFreeUnicodeString(&MachineName); @@ -3243,10 +3241,10 @@ lpServiceName); dwError = ROpenServiceW(BindingHandle, - hSCManager, - ServiceName.Buffer, - dwDesiredAccess, - lpServiceHandle); + hSCManager, + lpServiceName ? ServiceName.Buffer : NULL, + dwDesiredAccess, + lpServiceHandle); if (lpServiceName) RtlFreeUnicodeString(&ServiceName);

16 years, 1 month

← Newer
1
...
6
7
8
9
10
11
12
...
86
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 August 2008