Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 37044: - Set the loopback adapter's broadcast address
by cgutman＠svn.reactos.org 28 Oct '08

28 Oct '08

Author: cgutman Date: Tue Oct 28 18:42:32 2008 New Revision: 37044 URL: http://svn.reactos.org/svn/reactos?rev=37044&view=rev Log: - Set the loopback adapter's broadcast address Modified: branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c [iso-8859-1] Tue Oct 28 18:42:32 2008 @@ -196,6 +196,7 @@ AddrInitIPv4(&Loopback->Unicast, LOOPBACK_ADDRESS_IPv4); AddrInitIPv4(&Loopback->Netmask, LOOPBACK_ADDRMASK_IPv4); + AddrInitIPv4(&Loopback->Broadcast, LOOPBACK_BCASTADDR_IPv4); IPRegisterInterface(Loopback);

1 0

[dreimer] 37043: Overhaul of the help file. Now it starts to be worth its name.
by dreimer＠svn.reactos.org 28 Oct '08

28 Oct '08

Author: dreimer Date: Tue Oct 28 12:52:14 2008 New Revision: 37043 URL: http://svn.reactos.org/svn/reactos?rev=37043&view=rev Log: Overhaul of the help file. Now it starts to be worth its name. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Tue Oct 28 12:52:14 2008 @@ -13,17 +13,16 @@ if ("$args" -eq "") { "" "Available Commands:" - " make [OPTIONS] - Without options it does a standard build of" - " ReactOS. OPTIONS are the standard ReactOS build" - " options ie. ""bootcd""" + " make [OPTIONS] - Make does a standard build of ReactOS. OPTIONS are" + " the standard ReactOS build options." " makex [OPTIONS] - Same as 'make' but automatically determines the" - " number of CPU Cores in the system and uses -j" - " with the appropriate number." + " number of CPU Cores in the system and uses -j with" + " the appropriate number." " basedir - Switch back to the ReactOS source directory." if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") { - " charch [OPTIONS] - Change the Architecture to build for the" - " current RosBE session." + " charch [OPTIONS] - Change the Architecture to build ReactOS for" + " for the current RosBE session." } if (Test-Path "$_ROSBE_BASEDIR\chdefdir.ps1") { @@ -32,18 +31,18 @@ } if (Test-Path "$_ROSBE_BASEDIR\chdefgcc.ps1") { - " chdefgcc [PATH] - Change the MinGW/GCC directory for the" - " current RosBE session." - } - - " clean [OPTIONS] - Fully clean the ReactOS source directory and/or" - " the RosBE build logs." + " chdefgcc [PATH] - Change the Host or Target MinGW/GCC directory" + " for the current RosBE session." + } + + " clean [OPTIONS] - Fully clean the ReactOS source directory and/or the" + " RosBE build logs." if (Test-Path "$_ROSBE_BASEDIR\Config.ps1") { " config [OPTIONS] - Configures the way, ReactOS will be built." } - " help [COMMAND] - Display the available commands or help on a" + " help [COMMAND] - Display the available commands or give help on a" " specific command." if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { @@ -64,7 +63,8 @@ } if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { - " options - Starts the RosBE configurator." + " options - Starts the RosBE configurator and sets the." + " changes active immediately." } if (Test-Path "$_ROSBE_BASEDIR\update.ps1") { @@ -81,15 +81,50 @@ # if ("$args" -eq "make") { " Usage: make [OPTIONS]" - " Without options it does a standard build of ReactOS. OPTIONS are the" - " standard ReactOS build options ie. ""bootcd"", ""livecd"", etc." + " Make does a standard build of ReactOS. OPTIONS are the standard ReactOS build" + " options:" + "" + " all - This target builds all of ReactOS." + " ""module"" - Builds only the module with the appropiate name." + " bootcd - Generates a BootCD ISO." + " livecd - Generates a LiveCD ISO." + " install - Installs ReactOS in the folder specified by the" + " environment variable ""ROS_INSTALL""." + " ""module""_install - Installs only the module with the appropiate name in" + " the folder specified by the environment variable" + " ""ROS_INSTALL""." + " clean - Deletes all files generated by the build process." + " ""module""_clean - Deletes only the files of one module with the" + " appropiate name." + " depends - Does a full dependency check on the ReactOS Source" + " and generates a new makefile. This will take a while." + " ""module""-depends - Does a dependency check for one module with the" + " appropiate name." exit } if ("$args" -eq "makex") { " Usage: makex [OPTIONS]" - " Same as 'make' but automatically determines the number of CPU Cores in" - " the system and uses ""make -j x"" with the appropriate number." - " NOTE: The number makex uses can be modified by editing Build.ps1" + " Same as 'make' but automatically determines the number of CPU Cores in the" + " system and uses ""make -j x"" with the appropriate number. OPTIONS are the" + " standard ReactOS build options:" + "" + " all - This target builds all of ReactOS." + " ""module"" - Builds only the module with the appropiate name." + " bootcd - Generates a BootCD ISO." + " livecd - Generates a LiveCD ISO." + " install - Installs ReactOS in the folder specified by the" + " environment variable ""ROS_INSTALL""." + " ""module""_install - Installs only the module with the appropiate name in" + " the folder specified by the environment variable" + " ""ROS_INSTALL""." + " clean - Deletes all files generated by the build process." + " ""module""_clean - Deletes only the files of one module with the" + " appropiate name." + " depends - Does a full dependency check on the ReactOS Source" + " and generates a new makefile. This will take a while." + " ""module""-depends - Does a dependency check for one module with the" + " appropiate name." + " NOTE: The number makex uses can be modified by editing Build.cmd" " located in the RosBE directory, instructions for doing so are" " contained within the file." exit @@ -102,7 +137,7 @@ if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") { if ("$args" -eq "charch") { " Usage: charch [OPTIONS]" - " Change the ReactOS source directory for the current RosBE session." + " Change the Architecture to build ReactOS for, for the current RosBE session." " Possible Architectures are: i386, ppc, arm, amd64." "" exit @@ -122,6 +157,8 @@ " Usage: chdefgcc [PATH]" " Change the MinGW/GCC directory for the current RosBE session." "" + " Path - Path to set the Host or Target GCC to." + " Type - Set it to ""target"" or ""host""" exit } } @@ -138,10 +175,10 @@ " Usage: config [OPTIONS]" " Creates a configuration file, which tells RosBE how to build the tree." "" - " delete - Deletes the created configuration file and so sets back" - " to default settings." - " update - Deletes the old created configuration file and updates" - " it with a new, default one." + " delete - Deletes the created configuration file and so sets back to the" + " default settings." + " update - Deletes the old created configuration file and updates it with a" + " new, default one." exit } } @@ -153,15 +190,14 @@ if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { if ("$args" -eq "raddr2line") { " Usage: raddr2line [FILE] [ADDRESS]" - " Translates program addresses into file names and line numbers to" - " assist developers with finding specific bugs in ReactOS. If" - " either of the options is not given you will be prompted for it." - "" - " FILE - This can be either a fully specified path or just the" - " file name [you can use a partial name ie. ntdll*] of" - " the executable to be analyzed. When using just a file" - " the current directory and all sub-directories are" - " searched." + " Translates program addresses into file names and line numbers to assist" + " developers with finding specific bugs in ReactOS. If either of the options" + " is not given you will be prompted for it." + "" + " FILE - This can be either a fully specified path or just the file name" + " [you can use a partial name ie. ntdll*] of the executable to be" + " analyzed. When using just a file the current directory and all" + " sub-directories are searched." " ADDRESS - The address to be translated." "" exit @@ -176,11 +212,11 @@ if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") { if ("$args" -eq "ssvn") { " Usage: ssvn [OPTIONS]" - " Creates, updates or cleans up your ReactOS source tree or shows the" - " revision number of the local and online trees." - "" - " update - Updates to HEAD revision or to a specific one when" - " second parameter specifies one." + " Creates, updates or cleans up your ReactOS source tree or shows the revision" + " number of the local and online trees." + "" + " update - Updates to HEAD revision or to a specific one when the second" + " parameter specifies one." " create - Creates a new ReactOS source tree." " cleanup - Cleans up and fixes errors in the source tree." " status - Show the current local and online revision numbers." @@ -190,7 +226,8 @@ if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { if ("$args" -eq "options") { " Usage: options" - " Starts the RosBE configurator." + " Starts the RosBE configurator and sets the changes active in the current." + " RosBE session." exit } } Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Tue Oct 28 12:52:14 2008 @@ -19,17 +19,16 @@ if "%1" == "" ( echo. echo Available Commands: - echo make [OPTIONS] - Without options it does a standard build of - echo ReactOS. OPTIONS are the standard ReactOS build - echo options ie. "bootcd" + echo make [OPTIONS] - Make does a standard build of ReactOS. OPTIONS are + echo the standard ReactOS build options. echo makex [OPTIONS] - Same as 'make' but automatically determines the - echo number of CPU Cores in the system and uses -j - echo with the appropriate number. + echo number of CPU Cores in the system and uses -j with + echo the appropriate number. echo basedir - Switch back to the ReactOS source directory. if exist "%_ROSBE_BASEDIR%\charch.cmd" ( - echo charch [OPTIONS] - Change the Architecture to build for the - echo current RosBE session. + echo charch [OPTIONS] - Change the Architecture to build ReactOS for + echo for the current RosBE session. ) if exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( @@ -38,18 +37,18 @@ ) if exist "%_ROSBE_BASEDIR%\chdefgcc.cmd" ( - echo chdefgcc [OPTIONS] - Change the MinGW/GCC directory for the - echo current RosBE session. - ) - - echo clean [OPTIONS] - Fully clean the ReactOS source directory and/or - echo the RosBE build logs. + echo chdefgcc [OPTIONS] - Change the Host or Target MinGW/GCC directory + echo for the current RosBE session. + ) + + echo clean [OPTIONS] - Fully clean the ReactOS source directory and/or the + echo RosBE build logs. if exist "%_ROSBE_BASEDIR%\Config.cmd" ( echo config [OPTIONS] - Configures the way, ReactOS will be built. ) - echo help [COMMAND] - Display the available commands or help on a + echo help [COMMAND] - Display the available commands or give help on a echo specific command. if exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( @@ -70,7 +69,8 @@ ) if exist "%_ROSBE_BASEDIR%\options.cmd" ( - echo options - Starts the RosBE configurator. + echo options - Starts the RosBE configurator and sets the + echo changes active immediately. ) if exist "%_ROSBE_BASEDIR%\update.cmd" ( @@ -87,14 +87,49 @@ :: if /i "%1" == "make" ( echo Usage: make [OPTIONS] - echo Without options it does a standard build of ReactOS. OPTIONS are the - echo standard ReactOS build options ie. "bootcd", "livecd", etc. + echo Make does a standard build of ReactOS. OPTIONS are the standard ReactOS build + echo options: + echo. + echo all - This target builds all of ReactOS. + echo "module" - Builds only the module with the appropiate name. + echo bootcd - Generates a BootCD ISO. + echo livecd - Generates a LiveCD ISO. + echo install - Installs ReactOS in the folder specified by the + echo environment variable "ROS_INSTALL". + echo "module"_install - Installs only the module with the appropiate name in + echo the folder specified by the environment variable + echo "ROS_INSTALL". + echo clean - Deletes all files generated by the build process. + echo "module"_clean - Deletes only the files of one module with the + echo appropiate name. + echo depends - Does a full dependency check on the ReactOS Source + echo and generates a new makefile. This will take a while. + echo "module"-depends - Does a dependency check for one module with the + echo appropiate name. goto :EOC ) if /i "%1" == "makex" ( echo Usage: makex [OPTIONS] - echo Same as 'make' but automatically determines the number of CPU Cores in - echo the system and uses "make -j x" with the appropriate number. + echo Same as 'make' but automatically determines the number of CPU Cores in the + echo system and uses "make -j x" with the appropriate number. OPTIONS are the + echo standard ReactOS build options: + echo. + echo all - This target builds all of ReactOS. + echo "module" - Builds only the module with the appropiate name. + echo bootcd - Generates a BootCD ISO. + echo livecd - Generates a LiveCD ISO. + echo install - Installs ReactOS in the folder specified by the + echo environment variable "ROS_INSTALL". + echo "module"_install - Installs only the module with the appropiate name in + echo the folder specified by the environment variable + echo "ROS_INSTALL". + echo clean - Deletes all files generated by the build process. + echo "module"_clean - Deletes only the files of one module with the + echo appropiate name. + echo depends - Does a full dependency check on the ReactOS Source + echo and generates a new makefile. This will take a while. + echo "module"-depends - Does a dependency check for one module with the + echo appropiate name. echo NOTE: The number makex uses can be modified by editing Build.cmd echo located in the RosBE directory, instructions for doing so are echo contained within the file. @@ -108,7 +143,7 @@ if exist "%_ROSBE_BASEDIR%\charch.cmd" ( if /i "%1" == "charch" ( echo Usage: charch [OPTIONS] - echo Change the ReactOS source directory for the current RosBE session. + echo Change the Architecture to build ReactOS for, for the current RosBE session. echo Possible Architectures are: i386, ppc, arm, amd64. echo. goto :EOC @@ -128,7 +163,7 @@ echo Usage: chdefgcc [OPTIONS] echo Change the MinGW/GCC Target/Host directory for the current RosBE session. echo. - echo Path - Path to set the Host of Target GCC to. + echo Path - Path to set the Host or Target GCC to. echo Type - Set it to "target" or "host" goto :EOC ) @@ -146,10 +181,10 @@ echo Usage: config [OPTIONS] echo Creates a configuration file, which tells RosBE how to build the tree. echo. - echo delete - Deletes the created configuration file and so sets back - echo to default settings. - echo update - Deletes the old created configuration file and updates - echo it with a new, default one. + echo delete - Deletes the created configuration file and so sets back to default + echo settings. + echo update - Deletes the old created configuration file and updates it with a + echo new, default one. goto :EOC ) ) @@ -161,15 +196,14 @@ if exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( if /i "%1" == "raddr2line" ( echo Usage: raddr2line [FILE] [ADDRESS] - echo Translates program addresses into file names and line numbers to - echo assist developers with finding specific bugs in ReactOS. If - echo either of the options is not given you will be prompted for it. - echo. - echo FILE - This can be either a fully specified path or just the - echo file name [you can use a partial name ie. ntdll*] of - echo the executable to be analyzed. When using just a file - echo the current directory and all sub-directories are - echo searched. + echo Translates program addresses into file names and line numbers to assist + echo developers with finding specific bugs in ReactOS. If either of the options + echo is not given you will be prompted for it. + echo. + echo FILE - This can be either a fully specified path or just the file name + echo [you can use a partial name ie. ntdll*] of the executable to be + echo analyzed. When using just a file the current directory and all + echo sub-directories are searched. echo ADDRESS - The address to be translated. echo. goto :EOC @@ -184,11 +218,11 @@ if exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( if /i "%1" == "ssvn" ( echo Usage: ssvn [OPTIONS] - echo Creates, updates or cleans up your ReactOS source tree or shows the - echo revision number of the local and online trees. - echo. - echo update - Updates to HEAD revision or to a specific one when - echo second parameter specifies one. + echo Creates, updates or cleans up your ReactOS source tree or shows the revision + echo number of the local and online trees. + echo. + echo update - Updates to HEAD revision or to a specific one when the second + echo parameter specifies one. echo create - Creates a new ReactOS source tree. echo cleanup - Cleans up and fixes errors in the source tree. echo status - Show the current local and online revision numbers. @@ -198,7 +232,8 @@ if exist "%_ROSBE_BASEDIR%\options.cmd" ( if /i "%1" == "options" ( echo Usage: options - echo Starts the RosBE configurator. + echo Starts the RosBE configurator and sets the changes active in the current + echo RosBE session. goto :EOC ) )

1 0

[janderwald] 37042: - Fix setting manual ip address
by janderwald＠svn.reactos.org 28 Oct '08

28 Oct '08

Author: janderwald Date: Tue Oct 28 10:53:01 2008 New Revision: 37042 URL: http://svn.reactos.org/svn/reactos?rev=37042&view=rev Log: - Fix setting manual ip address Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild [iso-8859-1] Tue Oct 28 10:53:01 2008 @@ -14,6 +14,7 @@ <library>ole32</library> <library>user32</library> <library>comctl32</library> + <library>ws2_32</library> <file>netcfgx.c</file> <file>netcfgx.spec</file> <file>classfactory.c</file> Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Tue Oct 28 10:53:01 2008 @@ -3194,7 +3194,7 @@ //TODO // add multiple ip addresses when required - if (AddIPAddress(pCurrentConfig->Ip->IpAddress, pCurrentConfig->Ip->u.Subnetmask, pCurrentConfig->Index, &pCurrentConfig->Ip->NTEContext, &NTEInstance) == NO_ERROR) + if (AddIPAddress(htonl(pCurrentConfig->Ip->IpAddress), htonl(pCurrentConfig->Ip->u.Subnetmask), pCurrentConfig->Index, &pCurrentConfig->Ip->NTEContext, &NTEInstance) == NO_ERROR) { pStr = CreateMultiSzString(pCurrentConfig->Ip, IPADDR, &dwSize, FALSE); if(pStr)

1 0

[janderwald] 37041: - Store NTEContext for IPAddress - Call DeleteIPAddress and AddIPAddress for adapters when applying changes
by janderwald＠svn.reactos.org 28 Oct '08

28 Oct '08

Author: janderwald Date: Tue Oct 28 10:31:36 2008 New Revision: 37041 URL: http://svn.reactos.org/svn/reactos?rev=37041&view=rev Log: - Store NTEContext for IPAddress - Call DeleteIPAddress and AddIPAddress for adapters when applying changes Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Tue Oct 28 10:31:36 2008 @@ -34,6 +34,7 @@ DWORD Subnetmask; USHORT Metric; }u; + ULONG NTEContext; struct tagIP_ADDR * Next; }IP_ADDR; @@ -115,6 +116,7 @@ HRESULT InitializeTcpipBasicDlgCtrls(HWND hwndDlg, TcpipSettings * pCurSettings); VOID InsertColumnToListView(HWND hDlgCtrl, UINT ResId, UINT SubItem, UINT Size); INT_PTR StoreTcpipBasicSettings(HWND hwndDlg, TcpipConfNotifyImpl * This, BOOL bApply); +HRESULT Initialize(TcpipConfNotifyImpl * This); VOID DisplayError(UINT ResTxt, UINT ResTitle, UINT Type) @@ -2373,6 +2375,7 @@ if (Type == SUBMASK) { pNew->u.Subnetmask = GetIpAddressFromStringA(pCurrent->IpMask.String); + pNew->NTEContext = pCurrent->Context; } else if (Type == METRIC) { @@ -2632,6 +2635,7 @@ HKEY hKey; DWORD dwSize; + This->pCurrentConfig->pDNS = (TcpipAdvancedDNSDlgSettings*) CoTaskMemAlloc(sizeof(TcpipAdvancedDNSDlgSettings)); if (!This->pCurrentConfig->pDNS) return E_FAIL; @@ -2748,7 +2752,7 @@ HRESULT -InitializeTcpipBasicDlg(TcpipConfNotifyImpl * This) +Initialize(TcpipConfNotifyImpl * This) { DWORD dwSize; WCHAR szBuffer[50]; @@ -2876,7 +2880,7 @@ HRESULT hr; TcpipConfNotifyImpl * This = (TcpipConfNotifyImpl*)iface; - hr = InitializeTcpipBasicDlg(This); + hr = Initialize(This); if (FAILED(hr)) return hr; @@ -3092,24 +3096,37 @@ LPOLESTR pStr; DWORD dwSize; WCHAR szBuffer[200]; + TcpipSettings * pCurrentConfig, *pOldConfig; + ULONG NTEInstance; TcpipConfNotifyImpl * This = impl_from_INetCfgComponentControl(iface); + pCurrentConfig = This->pCurrentConfig; + This->pCurrentConfig = NULL; + + if (FAILED(Initialize(This))) + { + This->pCurrentConfig = pCurrentConfig; + return E_FAIL; + } + pOldConfig = This->pCurrentConfig; + This->pCurrentConfig = pCurrentConfig; + //MessageBoxW(NULL, L"INetCfgComponentControl_fnApplyRegistryChanges", NULL, MB_OK); if (RegCreateKeyExW(hKey, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) { - if (This->pCurrentConfig->pDNS) - { - RegSetValueExW(hKey, L"UseDomainNameDevolution", 0, REG_DWORD, (LPBYTE)&This->pCurrentConfig->pDNS->UseDomainNameDevolution, sizeof(DWORD)); - RegSetValueExW(hKey, L"SearchList", 0, REG_SZ, (LPBYTE)This->pCurrentConfig->pDNS->szSearchList, - (wcslen(This->pCurrentConfig->pDNS->szSearchList)+1) * sizeof(WCHAR)); - } - if (This->pCurrentConfig->pFilter) + if (pCurrentConfig->pDNS) + { + RegSetValueExW(hKey, L"UseDomainNameDevolution", 0, REG_DWORD, (LPBYTE)&pCurrentConfig->pDNS->UseDomainNameDevolution, sizeof(DWORD)); + RegSetValueExW(hKey, L"SearchList", 0, REG_SZ, (LPBYTE)pCurrentConfig->pDNS->szSearchList, + (wcslen(pCurrentConfig->pDNS->szSearchList)+1) * sizeof(WCHAR)); + } + if (pCurrentConfig->pFilter) { RegSetValueExW(hKey, L"EnableSecurityFilters", 0, REG_DWORD, - (LPBYTE)&This->pCurrentConfig->pFilter->EnableSecurityFilters, sizeof(DWORD)); + (LPBYTE)&pCurrentConfig->pFilter->EnableSecurityFilters, sizeof(DWORD)); } RegCloseKey(hKey); } @@ -3122,7 +3139,7 @@ if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szBuffer, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) { - if (This->pCurrentConfig->pDNS) + if (pCurrentConfig->pDNS) { RegSetValueExW(hKey, L"RegisterAdapterName", 0, REG_DWORD, (LPBYTE)&This->pCurrentConfig->pDNS->RegisterAdapterName, sizeof(DWORD)); RegSetValueExW(hKey, L"RegistrationEnabled", 0, REG_DWORD, (LPBYTE)&This->pCurrentConfig->pDNS->RegistrationEnabled, sizeof(DWORD)); @@ -3130,60 +3147,78 @@ (wcslen(This->pCurrentConfig->pDNS->szDomain)+1) * sizeof(WCHAR)); } #if 0 - if (This->pCurrentConfig->pFilter) - { - if (This->pCurrentConfig->pFilter->szTCPAllowedPorts) + if (pCurrentConfig->pFilter) + { + if (pCurrentConfig->pFilter->szTCPAllowedPorts) { RegSetValueExW(hKey, L"TCPAllowedPorts", 0, REG_MULTI_SZ, - (LPBYTE)This->pCurrentConfig->pFilter->szTCPAllowedPorts, - This->pCurrentConfig->pFilter->TCPSize); - } - if (This->pCurrentConfig->pFilter->szUDPAllowedPorts) + (LPBYTE)pCurrentConfig->pFilter->szTCPAllowedPorts, + pCurrentConfig->pFilter->TCPSize); + } + if (pCurrentConfig->pFilter->szUDPAllowedPorts) { RegSetValueExW(hKey, L"UDPAllowedPorts", 0, REG_MULTI_SZ, - (LPBYTE)This->pCurrentConfig->pFilter->szUDPAllowedPorts, - This->pCurrentConfig->pFilter->UDPSize); - } - if (This->pCurrentConfig->pFilter->szRawIPAllowedProtocols) + (LPBYTE)pCurrentConfig->pFilter->szUDPAllowedPorts, + pCurrentConfig->pFilter->UDPSize); + } + if (pCurrentConfig->pFilter->szRawIPAllowedProtocols) { RegSetValueExW(hKey, L"RawIPAllowedProtocols", 0, REG_MULTI_SZ, - (LPBYTE)This->pCurrentConfig->pFilter->szRawIPAllowedProtocols, - This->pCurrentConfig->pFilter->IPSize); + (LPBYTE)pCurrentConfig->pFilter->szRawIPAllowedProtocols, + pCurrentConfig->pFilter->IPSize); } } #endif - RegSetValueExW(hKey, L"EnableDHCP", 0, REG_DWORD, (LPBYTE)&This->pCurrentConfig->DhcpEnabled, sizeof(DWORD)); - if (This->pCurrentConfig->DhcpEnabled) + RegSetValueExW(hKey, L"EnableDHCP", 0, REG_DWORD, (LPBYTE)&pCurrentConfig->DhcpEnabled, sizeof(DWORD)); + if (pCurrentConfig->DhcpEnabled) { RegSetValueExW(hKey, L"IPAddress", 0, REG_MULTI_SZ, (LPBYTE)L"0.0.0.0\0", 9 * sizeof(WCHAR)); RegSetValueExW(hKey, L"SubnetMask", 0, REG_MULTI_SZ, (LPBYTE)L"0.0.0.0\0", 9 * sizeof(WCHAR)); RegSetValueExW(hKey, L"DefaultGateway", 0, REG_MULTI_SZ, (LPBYTE)L"\0", 2 * sizeof(WCHAR)); RegSetValueExW(hKey, L"DefaultGatewayMetric", 0, REG_MULTI_SZ, (LPBYTE)L"\0", 2 * sizeof(WCHAR)); + if (!pOldConfig->DhcpEnabled) + { + DeleteIPAddress(pOldConfig->Ip->NTEContext); + //FIXME + // start dhcp client service for the adapter + } } else { - pStr = CreateMultiSzString(This->pCurrentConfig->Ip, IPADDR, &dwSize, FALSE); - if(pStr) - { - RegSetValueExW(hKey, L"IPAddress", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize); - CoTaskMemFree(pStr); - } - - pStr = CreateMultiSzString(This->pCurrentConfig->Ip, SUBMASK, &dwSize, FALSE); - if(pStr) - { - RegSetValueExW(hKey, L"SubnetMask", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize); - CoTaskMemFree(pStr); - } - - pStr = CreateMultiSzString(This->pCurrentConfig->Gw, IPADDR, &dwSize, FALSE); + if (!pOldConfig->DhcpEnabled) + { + DeleteIPAddress(pOldConfig->Ip->NTEContext); + //TODO + //delete multiple ip addresses when required + } + + //TODO + // add multiple ip addresses when required + if (AddIPAddress(pCurrentConfig->Ip->IpAddress, pCurrentConfig->Ip->u.Subnetmask, pCurrentConfig->Index, &pCurrentConfig->Ip->NTEContext, &NTEInstance) == NO_ERROR) + { + pStr = CreateMultiSzString(pCurrentConfig->Ip, IPADDR, &dwSize, FALSE); + if(pStr) + { + RegSetValueExW(hKey, L"IPAddress", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize); + CoTaskMemFree(pStr); + } + + pStr = CreateMultiSzString(pCurrentConfig->Ip, SUBMASK, &dwSize, FALSE); + if(pStr) + { + RegSetValueExW(hKey, L"SubnetMask", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize); + CoTaskMemFree(pStr); + } + } + + pStr = CreateMultiSzString(pCurrentConfig->Gw, IPADDR, &dwSize, FALSE); if(pStr) { RegSetValueExW(hKey, L"DefaultGateway", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize); CoTaskMemFree(pStr); } - pStr = CreateMultiSzString(This->pCurrentConfig->Gw, METRIC, &dwSize, FALSE); + pStr = CreateMultiSzString(pCurrentConfig->Gw, METRIC, &dwSize, FALSE); if(pStr) { RegSetValueExW(hKey, L"DefaultGatewayMetric", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize); @@ -3191,13 +3226,13 @@ } } - if (!This->pCurrentConfig->Ns || This->pCurrentConfig->AutoconfigActive) + if (!pCurrentConfig->Ns || pCurrentConfig->AutoconfigActive) { RegSetValueExW(hKey, L"NameServer", 0, REG_SZ, (LPBYTE)L"", 1 * sizeof(WCHAR)); } else { - pStr = CreateMultiSzString(This->pCurrentConfig->Ns, IPADDR, &dwSize, TRUE); + pStr = CreateMultiSzString(pCurrentConfig->Ns, IPADDR, &dwSize, TRUE); if(pStr) { RegSetValueExW(hKey, L"NameServer", 0, REG_SZ, (LPBYTE)pStr, dwSize); @@ -3207,7 +3242,6 @@ } RegCloseKey(hKey); } - return S_OK; }

1 0

[dreimer] 37040: Bit more clean up.
by dreimer＠svn.reactos.org 28 Oct '08

28 Oct '08

Author: dreimer Date: Tue Oct 28 09:42:13 2008 New Revision: 37040 URL: http://svn.reactos.org/svn/reactos?rev=37040&view=rev Log: Bit more clean up. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Tue Oct 28 09:42:13 2008 @@ -206,12 +206,12 @@ # if ($args.count -gt 1) { if ($args[0] -eq "multi") { - $host.ui.RawUI.WindowTitle = "makex $($args) parallel build started: $TIMERAW" + $host.ui.RawUI.WindowTitle = "makex $($args) parallel build started: $TIMERAW $ENV:ROS_ARCH" } BUILDMULTI $args } else { if ($args.count -gt 0) { - $host.ui.RawUI.WindowTitle = "make $($args) build started: $TIMERAW" + $host.ui.RawUI.WindowTitle = "make $($args) build started: $TIMERAW $ENV:ROS_ARCH" } BUILD $args } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Tue Oct 28 09:42:13 2008 @@ -28,81 +28,81 @@ # if ($ENV:ROS_ARCH -eq "arm") { - if (Test-Path "obj-arm") { - "Cleaning ReactOS source directory..." + if (Test-Path ".\obj-arm") { + "Cleaning ReactOS ARM source directory..." # # Remove directories/makefile.auto created by the build. # - if (Test-Path "obj-arm") { - $null = (Remove-Item "obj-arm" -recurse -force) + if (Test-Path ".\obj-arm") { + $null = (Remove-Item ".\obj-arm" -recurse -force) } - if (Test-Path "output-arm") { - $null = (Remove-Item "output-arm" -recurse -force) + if (Test-Path ".\output-arm") { + $null = (Remove-Item ".\output-arm" -recurse -force) } - if (Test-Path "makefile-arm.auto") { - $null = (Remove-Item "makefile-arm.auto" -force) + if (Test-Path ".\makefile-arm.auto") { + $null = (Remove-Item ".\makefile-arm.auto" -force) } - "Done cleaning ReactOS source directory." + "Done cleaning ReactOS ARM source directory." } else { "ERROR: There is no compiler output to clean." } } if ($ENV:ROS_ARCH -eq "ppc") { - if (Test-Path "obj-ppc") { - "Cleaning ReactOS source directory..." + if (Test-Path ".\obj-ppc") { + "Cleaning ReactOS PPC source directory..." # # Remove directories/makefile.auto created by the build. # - if (Test-Path "obj-ppc") { - $null = (Remove-Item "obj-ppc" -recurse -force) + if (Test-Path ".\obj-ppc") { + $null = (Remove-Item ".\obj-ppc" -recurse -force) } - if (Test-Path "output-ppc") { - $null = (Remove-Item "output-ppc" -recurse -force) + if (Test-Path ".\output-ppc") { + $null = (Remove-Item ".\output-ppc" -recurse -force) } - if (Test-Path "makefile-ppc.auto") { - $null = (Remove-Item "makefile-ppc.auto" -force) + if (Test-Path ".\makefile-ppc.auto") { + $null = (Remove-Item ".\makefile-ppc.auto" -force) } - "Done cleaning ReactOS source directory." + "Done cleaning ReactOS PPC source directory." } else { "ERROR: There is no compiler output to clean." } } if ($ENV:ROS_ARCH -eq "amd64") { - if (Test-Path "obj-amd64") { - "Cleaning ReactOS source directory..." + if (Test-Path ".\obj-amd64") { + "Cleaning ReactOS x86_64 source directory..." # # Remove directories/makefile.auto created by the build. # - if (Test-Path "obj-amd64") { - $null = (Remove-Item "obj-amd64" -recurse -force) + if (Test-Path ".\obj-amd64") { + $null = (Remove-Item ".\obj-amd64" -recurse -force) } - if (Test-Path "output-amd64") { - $null = (Remove-Item "output-amd64" -recurse -force) + if (Test-Path ".\output-amd64") { + $null = (Remove-Item ".\output-amd64" -recurse -force) } - if (Test-Path "makefile-amd64.auto") { - $null = (Remove-Item "makefile-amd64.auto" -force) + if (Test-Path ".\makefile-amd64.auto") { + $null = (Remove-Item ".\makefile-amd64.auto" -force) } - "Done cleaning ReactOS source directory." + "Done cleaning ReactOS x86_64 source directory." } else { "ERROR: There is no compiler output to clean." } } if ($ENV:ROS_ARCH -eq $null) { - if (Test-Path "obj-i386") { - "Cleaning ReactOS source directory..." + if (Test-Path ".\obj-i386") { + "Cleaning ReactOS i386 source directory..." # # Remove directories/makefile.auto created by the build. # - if (Test-Path "obj-i386") { - $null = (Remove-Item "obj-i386" -recurse -force) + if (Test-Path ".\obj-i386") { + $null = (Remove-Item ".\obj-i386" -recurse -force) } - if (Test-Path "output-i386") { - $null = (Remove-Item "output-i386" -recurse -force) + if (Test-Path ".\output-i386") { + $null = (Remove-Item ".\output-i386" -recurse -force) } - if (Test-Path "makefile.auto") { - $null = (Remove-Item "makefile.auto" -force) + if (Test-Path ".\makefile.auto") { + $null = (Remove-Item ".\makefile.auto" -force) } - "Done cleaning ReactOS source directory." + "Done cleaning ReactOS i386 source directory." } else { "ERROR: There is no compiler output to clean." } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Tue Oct 28 09:42:13 2008 @@ -22,7 +22,7 @@ " basedir - Switch back to the ReactOS source directory." if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") { - " charch [OPTIONS] - Change the Architecture to build for for the" + " charch [OPTIONS] - Change the Architecture to build for the" " current RosBE session." } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Tue Oct 28 09:42:13 2008 @@ -15,8 +15,8 @@ (Get-Host).UI.RawUI.BackgroundColor = "Black" cls -if ($APPDATA.Length -lt 1) { - $APPDATA = $ENV:USERPROFILE +if ($ENV:APPDATA.Length -lt 1) { + $ENV:APPDATA = $ENV:USERPROFILE } $ENV:PATH = "$ENV:SystemRoot\system32;$ENV:SystemRoot" $global:_ROSBE_VERSION = 1.3 @@ -111,15 +111,15 @@ # # Check if RosBE data directory exists, if not, create it. # -if (!(Test-Path "$APPDATA\RosBE")) { - New-Item -path "$APPDATA" -name "RosBE" -type directory +if (!(Test-Path "$ENV:APPDATA\RosBE")) { + New-Item -path "$ENV:APPDATA" -name "RosBE" -type directory } # # Check if the user has used the options utility and if so, load their options. # -if (Test-Path "$APPDATA\RosBE\rosbe-options.ps1") { - & "$APPDATA\RosBE\rosbe-options.ps1" +if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.ps1") { + & "$ENV:APPDATA\RosBE\rosbe-options.ps1" } $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Tue Oct 28 09:42:13 2008 @@ -76,17 +76,17 @@ # Display the current version of GCC, NASM, ld and make. # if ($ENV:ROS_ARCH -ne $null) { -& "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX-gcc" -v 2> v.txt -(select-string -path .\v.txt "gcc version") -replace ".*: (.+?)\b",'$1' -rm v.txt -"gcc target - $_ROSBE_GCCTARGET" -& "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX-ld" -v + & "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX-gcc" -v 2> v.txt + (select-string -path .\v.txt "gcc version") -replace ".*: (.+?)\b",'$1' + rm v.txt + "gcc target - $_ROSBE_GCCTARGET" + & "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX-ld" -v } else { -gcc -v 2> v.txt -(select-string -path .\v.txt "gcc version" ) -replace ".*: (.+?)\b",'$1' -rm v.txt -"gcc target - $_ROSBE_GCCTARGET" -& ld -v + gcc -v 2> v.txt + (select-string -path .\v.txt "gcc version" ) -replace ".*: (.+?)\b",'$1' + rm v.txt + "gcc target - $_ROSBE_GCCTARGET" + & ld -v } if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\nasm.exe") { & nasm -v @@ -95,7 +95,7 @@ & yasm --version | select-string "yasm 0" } else { if ($_ROSBE_MODE -eq "RosBE") { - "ERROR: NASM is required to build ReactOS, none found in the current MinGW/GCC." + "ERROR: NASM or YASM is required to build ReactOS, none found in the current MinGW/GCC." } } } Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Tue Oct 28 09:42:13 2008 @@ -53,7 +53,7 @@ :: Check if we have something to clean, if so, clean it. :: if exist "obj-arm\." ( - echo Cleaning ReactOS source directory... + echo Cleaning ReactOS ARM source directory... :: : Remove directories created by the build. :: @@ -66,7 +66,7 @@ if exist "makefile-arm.auto" ( del "makefile-arm.auto" 1> NUL 2> NUL ) - echo Done cleaning ReactOS source directory. + echo Done cleaning ReactOS ARM source directory. ) else ( echo ERROR: There is no compiler output to clean. ) @@ -77,7 +77,7 @@ :: Check if we have something to clean, if so, clean it. :: if exist "obj-ppc\." ( - echo Cleaning ReactOS source directory... + echo Cleaning ReactOS PPC source directory... :: : Remove directories created by the build. :: @@ -90,7 +90,7 @@ if exist "makefile-ppc.auto" ( del "makefile-ppc.auto" 1> NUL 2> NUL ) - echo Done cleaning ReactOS source directory. + echo Done cleaning ReactOS PPC source directory. ) else ( echo ERROR: There is no compiler output to clean. ) @@ -101,7 +101,7 @@ :: Check if we have something to clean, if so, clean it. :: if exist "obj-amd64\." ( - echo Cleaning ReactOS source directory... + echo Cleaning ReactOS X86_64 source directory... :: : Remove directories created by the build. :: @@ -114,7 +114,7 @@ if exist "makefile-amd64.auto" ( del "makefile-amd64.auto" 1> NUL 2> NUL ) - echo Done cleaning ReactOS source directory. + echo Done cleaning ReactOS X86_64 source directory. ) else ( echo ERROR: There is no compiler output to clean. ) @@ -125,7 +125,7 @@ :: Check if we have something to clean, if so, clean it. :: if exist "obj-i386\." ( - echo Cleaning ReactOS source directory... + echo Cleaning ReactOS i386 source directory... :: : Remove directories created by the build. :: @@ -138,7 +138,7 @@ if exist "makefile.auto" ( del "makefile.auto" 1> NUL 2> NUL ) - echo Done cleaning ReactOS source directory. + echo Done cleaning ReactOS i386 source directory. ) else ( echo ERROR: There is no compiler output to clean. ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Tue Oct 28 09:42:13 2008 @@ -28,7 +28,7 @@ echo basedir - Switch back to the ReactOS source directory. if exist "%_ROSBE_BASEDIR%\charch.cmd" ( - echo charch [OPTIONS] - Change the Architecture to build for for the + echo charch [OPTIONS] - Change the Architecture to build for the echo current RosBE session. ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Tue Oct 28 09:42:13 2008 @@ -37,12 +37,12 @@ if .%_ROSBE_ARCH%. == .1. ( set ROS_ARCH=arm set ROS_PREFIX=arm-pc-mingw32 - REM set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.4.0 + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.4.0 ) if .%_ROSBE_ARCH%. == .2. ( set ROS_ARCH=ppc set ROS_PREFIX=ppc-pc-mingw32 - REM set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.4.0 + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.4.0 ) if .%_ROSBE_ARCH%. == .3. ( set ROS_ARCH=amd64

1 0

[cwittich] 37039: revert part of rev 31787 as we don't support IROT in rpcss fixes FoxitReader, GVIM and many other apps See issue #2361 for more details.
by cwittich＠svn.reactos.org 28 Oct '08

28 Oct '08

Author: cwittich Date: Tue Oct 28 09:32:41 2008 New Revision: 37039 URL: http://svn.reactos.org/svn/reactos?rev=37039&view=rev Log: revert part of rev 31787 as we don't support IROT in rpcss fixes FoxitReader, GVIM and many other apps See issue #2361 for more details. Modified: trunk/reactos/dll/win32/ole32/moniker.c trunk/reactos/dll/win32/ole32/ole32.rbuild Modified: trunk/reactos/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.c?… ============================================================================== --- trunk/reactos/dll/win32/ole32/moniker.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/moniker.c [iso-8859-1] Tue Oct 28 09:32:41 2008 @@ -19,11 +19,14 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - + * + * TODO: + * - IRunningObjectTable should work interprocess, but currently doesn't. + * Native (on Win2k at least) uses an undocumented RPC interface, IROT, to + * communicate with RPCSS which contains the table of marshalled data. + */ + +#include <assert.h> #include <stdarg.h> #include <string.h> @@ -39,33 +42,25 @@ #include "wine/list.h" #include "wine/debug.h" #include "wine/unicode.h" -#include "wine/exception.h" #include "compobj_private.h" #include "moniker.h" -#include "irot.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); /* see MSDN docs for IROTData::GetComparisonData, which states what this - * constant is - */ + * constant is (http://msdn2.microsoft.com/en-us/library/ms693773.aspx) */ #define MAX_COMPARISON_DATA 2048 - -static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr) -{ - return I_RpcExceptionFilter(eptr->ExceptionRecord->ExceptionCode); -} /* define the structure of the running object table elements */ struct rot_entry { struct list entry; - InterfaceData* object; /* marshaled running object*/ - MonikerComparisonData* moniker_data; /* moniker comparison data that identifies this object */ + MInterfacePointer* object; /* marshaled running object*/ + MInterfacePointer* moniker; /* marshaled moniker that identifies this object */ + MInterfacePointer* moniker_data; /* moniker comparison data that identifies this object */ DWORD cookie; /* cookie identifying this object */ FILETIME last_modified; - IrotContextHandle ctxt_handle; }; /* define the RunningObjectTableImpl structure */ @@ -79,7 +74,16 @@ } RunningObjectTableImpl; static RunningObjectTableImpl* runningObjectTableInstance = NULL; -static IrotHandle irot_handle; + + + +static inline HRESULT WINAPI +IrotRegister(DWORD *cookie) +{ + static LONG last_cookie = 1; + *cookie = InterlockedIncrement(&last_cookie); + return S_OK; +} /* define the EnumMonikerImpl structure */ typedef struct EnumMonikerImpl @@ -87,79 +91,17 @@ const IEnumMonikerVtbl *lpVtbl; LONG ref; - InterfaceList *moniker_list; + MInterfacePointer **monikers; + ULONG moniker_count; ULONG pos; } EnumMonikerImpl; /* IEnumMoniker Local functions*/ -static HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(InterfaceList *moniker_list, - ULONG pos, IEnumMoniker **ppenumMoniker); - -static IrotHandle get_irot_handle(void) -{ - if (!irot_handle) - { - RPC_STATUS status; - RPC_WSTR binding; - IrotHandle new_handle; - unsigned short ncacn_np[] = IROT_PROTSEQ; - unsigned short endpoint[] = IROT_ENDPOINT; - status = RpcStringBindingComposeW(NULL, ncacn_np, NULL, endpoint, NULL, &binding); - if (status == RPC_S_OK) - { - status = RpcBindingFromStringBindingW(binding, &new_handle); - RpcStringFreeW(&binding); - } - if (status != RPC_S_OK) - return NULL; - if (InterlockedCompareExchangePointer(&irot_handle, new_handle, NULL)) - /* another thread beat us to it */ - RpcBindingFree(&new_handle); - } - return irot_handle; -} - -static BOOL start_rpcss(void) -{ - PROCESS_INFORMATION pi; - STARTUPINFOW si; - static WCHAR cmd[6]; - static const WCHAR rpcss[] = {'r','p','c','s','s',0}; - BOOL rslt; - - TRACE("\n"); - - ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); - ZeroMemory(&si, sizeof(STARTUPINFOA)); - si.cb = sizeof(STARTUPINFOA); - - memcpy(cmd, rpcss, sizeof(rpcss)); - - rslt = CreateProcessW( - NULL, /* executable */ - cmd, /* command line */ - NULL, /* process security attributes */ - NULL, /* primary thread security attributes */ - FALSE, /* inherit handles */ - 0, /* creation flags */ - NULL, /* use parent's environment */ - NULL, /* use parent's current directory */ - &si, /* STARTUPINFO pointer */ - &pi /* PROCESS_INFORMATION */ - ); - - if (rslt) - { - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); - Sleep(100); - } - - return rslt; -} - -static HRESULT create_stream_on_mip_ro(const InterfaceData *mip, IStream **stream) +static HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(MInterfacePointer **monikers, + ULONG moniker_count, ULONG pos, IEnumMoniker **ppenumMoniker); + +static HRESULT create_stream_on_mip_ro(const MInterfacePointer *mip, IStream **stream) { HGLOBAL hglobal = GlobalAlloc(0, mip->ulCntData); void *pv = GlobalLock(hglobal); @@ -170,33 +112,7 @@ static inline void rot_entry_delete(struct rot_entry *rot_entry) { - if (rot_entry->cookie) - { - InterfaceData *object = NULL; - InterfaceData *moniker = NULL; - __TRY - { - IrotRevoke(get_irot_handle(), rot_entry->cookie, - &rot_entry->ctxt_handle, &object, &moniker); - } - __EXCEPT(rpc_filter) - { - } - __ENDTRY - MIDL_user_free(object); - if (moniker) - { - IStream *stream; - HRESULT hr; - hr = create_stream_on_mip_ro(moniker, &stream); - if (hr == S_OK) - { - CoReleaseMarshalData(stream); - IUnknown_Release(stream); - } - } - MIDL_user_free(moniker); - } + /* FIXME: revoke entry from rpcss's copy of the ROT */ if (rot_entry->object) { IStream *stream; @@ -208,13 +124,25 @@ IUnknown_Release(stream); } } + if (rot_entry->moniker) + { + IStream *stream; + HRESULT hr; + hr = create_stream_on_mip_ro(rot_entry->moniker, &stream); + if (hr == S_OK) + { + CoReleaseMarshalData(stream); + IUnknown_Release(stream); + } + } HeapFree(GetProcessHeap(), 0, rot_entry->object); + HeapFree(GetProcessHeap(), 0, rot_entry->moniker); HeapFree(GetProcessHeap(), 0, rot_entry->moniker_data); HeapFree(GetProcessHeap(), 0, rot_entry); } /* moniker_data must be freed with HeapFree when no longer in use */ -static HRESULT get_moniker_comparison_data(IMoniker *pMoniker, MonikerComparisonData **moniker_data) +static HRESULT get_moniker_comparison_data(IMoniker *pMoniker, MInterfacePointer **moniker_data) { HRESULT hr; IROTData *pROTData = NULL; @@ -222,14 +150,8 @@ if (SUCCEEDED(hr)) { ULONG size = MAX_COMPARISON_DATA; - *moniker_data = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MonikerComparisonData, abData[size])); - if (!*moniker_data) - { - IROTData_Release(pROTData); - return E_OUTOFMEMORY; - } + *moniker_data = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MInterfacePointer, abData[size])); hr = IROTData_GetComparisonData(pROTData, (*moniker_data)->abData, size, &size); - IROTData_Release(pROTData); if (hr != S_OK) { ERR("Failed to copy comparison data into buffer, hr = 0x%08x\n", hr); @@ -263,7 +185,7 @@ len = strlenW(pszDisplayName); *moniker_data = HeapAlloc(GetProcessHeap(), 0, - FIELD_OFFSET(MonikerComparisonData, abData[sizeof(CLSID) + (len+1)*sizeof(WCHAR)])); + FIELD_OFFSET(MInterfacePointer, abData[sizeof(CLSID) + (len+1)*sizeof(WCHAR)])); if (!*moniker_data) { CoTaskMemFree(pszDisplayName); @@ -273,7 +195,6 @@ memcpy(&(*moniker_data)->abData[0], &clsid, sizeof(clsid)); memcpy(&(*moniker_data)->abData[sizeof(clsid)], pszDisplayName, (len+1)*sizeof(WCHAR)); - CoTaskMemFree(pszDisplayName); } return S_OK; } @@ -346,7 +267,6 @@ RunningObjectTableImpl_Destroy(void) { struct list *cursor, *cursor2; - IrotHandle old_handle; TRACE("()\n"); @@ -367,11 +287,6 @@ /* free the ROT structure memory */ HeapFree(GetProcessHeap(),0,runningObjectTableInstance); runningObjectTableInstance = NULL; - - old_handle = irot_handle; - irot_handle = NULL; - if (old_handle) - RpcBindingFree(&old_handle); return S_OK; } @@ -426,7 +341,6 @@ IStream *pStream = NULL; DWORD mshlflags; IBindCtx *pbc; - InterfaceData *moniker = NULL; TRACE("(%p,%d,%p,%p,%p)\n",This,grfFlags,punkObject,pmkObjectName,pdwRegister); @@ -464,7 +378,7 @@ const void *pv = GlobalLock(hglobal); rot_entry->object = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MInterfacePointer, abData[size])); rot_entry->object->ulCntData = size; - memcpy(rot_entry->object->abData, pv, size); + memcpy(&rot_entry->object->abData, pv, size); GlobalUnlock(hglobal); } } @@ -528,9 +442,9 @@ { SIZE_T size = GlobalSize(hglobal); const void *pv = GlobalLock(hglobal); - moniker = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceData, abData[size])); - moniker->ulCntData = size; - memcpy(moniker->abData, pv, size); + rot_entry->moniker = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MInterfacePointer, abData[size])); + rot_entry->moniker->ulCntData = size; + memcpy(&rot_entry->moniker->abData, pv, size); GlobalUnlock(hglobal); } } @@ -538,35 +452,13 @@ IMoniker_Release(pmkObjectName); if (hr != S_OK) { - HeapFree(GetProcessHeap(), 0, moniker); rot_entry_delete(rot_entry); return hr; } - - while (TRUE) - { - __TRY - { - hr = IrotRegister(get_irot_handle(), rot_entry->moniker_data, - rot_entry->object, moniker, - &rot_entry->last_modified, grfFlags, - &rot_entry->cookie, &rot_entry->ctxt_handle); - } - __EXCEPT(rpc_filter) - { - hr = HRESULT_FROM_WIN32(GetExceptionCode()); - } - __ENDTRY - if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) - { - if (start_rpcss()) - continue; - } - break; - } - HeapFree(GetProcessHeap(), 0, moniker); - if (FAILED(hr)) + /* FIXME: not the right signature of IrotRegister function */ + hr = IrotRegister(&rot_entry->cookie); + if (hr != S_OK) { rot_entry_delete(rot_entry); return hr; @@ -576,6 +468,7 @@ *pdwRegister = rot_entry->cookie; EnterCriticalSection(&This->lock); + /* FIXME: see if object was registered before and return MK_S_MONIKERALREADYREGISTERED */ list_add_tail(&This->rot, &rot_entry->entry); LeaveCriticalSection(&This->lock); @@ -623,9 +516,9 @@ RunningObjectTableImpl_IsRunning( IRunningObjectTable* iface, IMoniker *pmkObjectName) { RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; - MonikerComparisonData *moniker_data; + MInterfacePointer *moniker_data; HRESULT hr; - const struct rot_entry *rot_entry; + struct rot_entry *rot_entry; TRACE("(%p,%p)\n",This,pmkObjectName); @@ -639,10 +532,10 @@ hr = S_FALSE; EnterCriticalSection(&This->lock); - LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, const struct rot_entry, entry) + LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry) { if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && - !memcmp(moniker_data->abData, rot_entry->moniker_data->abData, moniker_data->ulCntData)) + !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) { hr = S_OK; break; @@ -650,27 +543,7 @@ } LeaveCriticalSection(&This->lock); - if (hr == S_FALSE) - { - while (TRUE) - { - __TRY - { - hr = IrotIsRunning(get_irot_handle(), moniker_data); - } - __EXCEPT(rpc_filter) - { - hr = HRESULT_FROM_WIN32(GetExceptionCode()); - } - __ENDTRY - if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) - { - if (start_rpcss()) - continue; - } - break; - } - } + /* FIXME: call IrotIsRunning */ HeapFree(GetProcessHeap(), 0, moniker_data); @@ -689,9 +562,7 @@ IMoniker *pmkObjectName, IUnknown **ppunkObject) { RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; - MonikerComparisonData *moniker_data; - InterfaceData *object = NULL; - IrotCookie cookie; + MInterfacePointer *moniker_data; HRESULT hr; struct rot_entry *rot_entry; @@ -714,7 +585,7 @@ LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry) { if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && - !memcmp(moniker_data->abData, rot_entry->moniker_data->abData, moniker_data->ulCntData)) + !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) { IStream *pStream; hr = create_stream_on_mip_ro(rot_entry->object, &pStream); @@ -732,39 +603,9 @@ } LeaveCriticalSection(&This->lock); - TRACE("moniker unavailable locally, calling SCM\n"); - - while (TRUE) - { - __TRY - { - hr = IrotGetObject(get_irot_handle(), moniker_data, &object, &cookie); - } - __EXCEPT(rpc_filter) - { - hr = HRESULT_FROM_WIN32(GetExceptionCode()); - } - __ENDTRY - if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) - { - if (start_rpcss()) - continue; - } - break; - } - - if (SUCCEEDED(hr)) - { - IStream *pStream; - hr = create_stream_on_mip_ro(object, &pStream); - if (hr == S_OK) - { - hr = CoUnmarshalInterface(pStream, &IID_IUnknown, (void **)ppunkObject); - IStream_Release(pStream); - } - } - else - WARN("Moniker unavailable, IrotGetObject returned 0x%08x\n", hr); + /* FIXME: call IrotGetObject */ + WARN("Moniker unavailable - app may require interprocess running object table\n"); + hr = MK_E_UNAVAILABLE; HeapFree(GetProcessHeap(), 0, moniker_data); @@ -784,7 +625,6 @@ { RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; struct rot_entry *rot_entry; - HRESULT hr = E_INVALIDARG; TRACE("(%p,%d,%p)\n",This,dwRegister,pfiletime); @@ -795,34 +635,14 @@ { rot_entry->last_modified = *pfiletime; LeaveCriticalSection(&This->lock); - - while (TRUE) - { - __TRY - { - hr = IrotNoteChangeTime(get_irot_handle(), dwRegister, pfiletime); - } - __EXCEPT(rpc_filter) - { - hr = HRESULT_FROM_WIN32(GetExceptionCode()); - } - __ENDTRY - if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) - { - if (start_rpcss()) - continue; - } - break; - } - - goto done; + return S_OK; } } LeaveCriticalSection(&This->lock); -done: - TRACE("-- 0x08%x\n", hr); - return hr; + /* FIXME: call IrotNoteChangeTime */ + + return E_INVALIDARG; } /*********************************************************************** @@ -838,8 +658,8 @@ { HRESULT hr = MK_E_UNAVAILABLE; RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; - MonikerComparisonData *moniker_data; - const struct rot_entry *rot_entry; + MInterfacePointer *moniker_data; + struct rot_entry *rot_entry; TRACE("(%p,%p,%p)\n",This,pmkObjectName,pfiletime); @@ -857,10 +677,10 @@ hr = MK_E_UNAVAILABLE; EnterCriticalSection(&This->lock); - LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, const struct rot_entry, entry) + LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry) { if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && - !memcmp(moniker_data->abData, rot_entry->moniker_data->abData, moniker_data->ulCntData)) + !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) { *pfiletime = rot_entry->last_modified; hr = S_OK; @@ -869,31 +689,9 @@ } LeaveCriticalSection(&This->lock); - if (hr != S_OK) - { - while (TRUE) - { - __TRY - { - hr = IrotGetTimeOfLastChange(get_irot_handle(), moniker_data, pfiletime); - } - __EXCEPT(rpc_filter) - { - hr = HRESULT_FROM_WIN32(GetExceptionCode()); - } - __ENDTRY - if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) - { - if (start_rpcss()) - continue; - } - break; - } - } + /* FIXME: if (hr != S_OK) call IrotGetTimeOfLastChange */ HeapFree(GetProcessHeap(), 0, moniker_data); - - TRACE("-- 0x%08x\n", hr); return hr; } @@ -907,36 +705,33 @@ RunningObjectTableImpl_EnumRunning(IRunningObjectTable* iface, IEnumMoniker **ppenumMoniker) { + HRESULT hr; RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; - InterfaceList *interface_list = NULL; - HRESULT hr; - - TRACE("(%p, %p)\n", This, ppenumMoniker); - - *ppenumMoniker = NULL; - - while (TRUE) - { - __TRY - { - hr = IrotEnumRunning(get_irot_handle(), &interface_list); - } - __EXCEPT(rpc_filter) - { - hr = HRESULT_FROM_WIN32(GetExceptionCode()); - } - __ENDTRY - if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) - { - if (start_rpcss()) - continue; - } - break; - } - - if (SUCCEEDED(hr)) - hr = EnumMonikerImpl_CreateEnumROTMoniker(interface_list, - 0, ppenumMoniker); + MInterfacePointer **monikers; + ULONG moniker_count = 0; + const struct rot_entry *rot_entry; + ULONG i = 0; + + EnterCriticalSection(&This->lock); + + LIST_FOR_EACH_ENTRY( rot_entry, &This->rot, const struct rot_entry, entry ) + moniker_count++; + + monikers = HeapAlloc(GetProcessHeap(), 0, moniker_count * sizeof(*monikers)); + + LIST_FOR_EACH_ENTRY( rot_entry, &This->rot, const struct rot_entry, entry ) + { + SIZE_T size = FIELD_OFFSET(MInterfacePointer, abData[rot_entry->moniker->ulCntData]); + monikers[i] = HeapAlloc(GetProcessHeap(), 0, size); + memcpy(monikers[i], rot_entry->moniker, size); + i++; + } + + LeaveCriticalSection(&This->lock); + + /* FIXME: call IrotEnumRunning and append data */ + + hr = EnumMonikerImpl_CreateEnumROTMoniker(monikers, moniker_count, 0, ppenumMoniker); return hr; } @@ -972,9 +767,9 @@ /* initialize the virtual table function */ runningObjectTableInstance->lpVtbl = &VT_RunningObjectTableImpl; - /* the initial reference is set to "1" so that it isn't destroyed after its - * first use until the process is destroyed, as the running object table is - * a process-wide cache of a global table */ + /* the initial reference is set to "1" ! because if set to "0" it will be not practis when */ + /* the ROT referred many times not in the same time (all the objects in the ROT will */ + /* be removed every time the ROT is removed ) */ runningObjectTableInstance->ref = 1; list_init(&runningObjectTableInstance->rot); @@ -1078,21 +873,6 @@ IParseDisplayName *pdn; hr = IMoniker_BindToObject(class_moniker, pbc, NULL, &IID_IParseDisplayName, (void **)&pdn); - /* fallback to using IClassFactory to get IParseDisplayName - - * adsldp.dll depends on this */ - if (FAILED(hr)) - { - IClassFactory *pcf; - hr = IMoniker_BindToObject(class_moniker, pbc, NULL, - &IID_IClassFactory, (void **)&pcf); - if (SUCCEEDED(hr)) - { - hr = IClassFactory_CreateInstance(pcf, NULL, - &IID_IParseDisplayName, - (void **)&pdn); - IClassFactory_Release(pcf); - } - } IMoniker_Release(class_moniker); if (SUCCEEDED(hr)) { @@ -1211,9 +991,9 @@ return res; } - /* If the file is not a storage object then attempt to match various bits in the file against a - pattern in the registry. This case is not frequently used, so I present only the pseudocode for - this case. + /* if the file is not a storage object then attemps to match various bits in the file against a + pattern in the registry. this case is not frequently used ! so I present only the psodocode for + this case for(i=0;i<nFileTypes;i++) @@ -1240,7 +1020,7 @@ nbElm=FileMonikerImpl_DecomposePath(filePathName,&pathDec); absFile=pathDec[nbElm-1]; - /* failed if the path represents a directory and not an absolute file name*/ + /* failed if the path represente a directory and not an absolute file name*/ if (!lstrcmpW(absFile, bkslashW)) return MK_E_INVALIDEXTENSION; @@ -1335,9 +1115,9 @@ TRACE("(%p) Deleting\n",This); - for (i = 0; i < This->moniker_list->size; i++) - HeapFree(GetProcessHeap(), 0, This->moniker_list->interfaces[i]); - HeapFree(GetProcessHeap(), 0, This->moniker_list); + for (i = 0; i < This->moniker_count; i++) + HeapFree(GetProcessHeap(), 0, This->monikers[i]); + HeapFree(GetProcessHeap(), 0, This->monikers); HeapFree(GetProcessHeap(), 0, This); } @@ -1352,13 +1132,13 @@ EnumMonikerImpl *This = (EnumMonikerImpl *)iface; HRESULT hr = S_OK; - TRACE("(%p) TabCurrentPos %d Tablastindx %d\n", This, This->pos, This->moniker_list->size); + TRACE("(%p) TabCurrentPos %d Tablastindx %d\n", This, This->pos, This->moniker_count); /* retrieve the requested number of moniker from the current position */ - for(i = 0; (This->pos < This->moniker_list->size) && (i < celt); i++) + for(i = 0; (This->pos < This->moniker_count) && (i < celt); i++) { IStream *stream; - hr = create_stream_on_mip_ro(This->moniker_list->interfaces[This->pos++], &stream); + hr = create_stream_on_mip_ro(This->monikers[This->pos++], &stream); if (hr != S_OK) break; hr = CoUnmarshalInterface(stream, &IID_IMoniker, (void **)&rgelt[i]); IStream_Release(stream); @@ -1387,7 +1167,7 @@ TRACE("(%p)\n",This); - if (This->pos + celt >= This->moniker_list->size) + if (This->pos + celt >= This->moniker_count) return S_FALSE; This->pos += celt; @@ -1415,35 +1195,21 @@ static HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker* iface, IEnumMoniker ** ppenum) { EnumMonikerImpl *This = (EnumMonikerImpl *)iface; - InterfaceList *moniker_list; + MInterfacePointer **monikers = HeapAlloc(GetProcessHeap(), 0, sizeof(*monikers)*This->moniker_count); ULONG i; TRACE("(%p)\n",This); - *ppenum = NULL; - - moniker_list = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceList, interfaces[This->moniker_list->size])); - if (!moniker_list) - return E_OUTOFMEMORY; - - moniker_list->size = This->moniker_list->size; - for (i = 0; i < This->moniker_list->size; i++) - { - SIZE_T size = FIELD_OFFSET(InterfaceData, abData[This->moniker_list->interfaces[i]->ulCntData]); - moniker_list->interfaces[i] = HeapAlloc(GetProcessHeap(), 0, size); - if (!moniker_list->interfaces[i]) - { - ULONG end = i; - for (i = 0; i < end; i++) - HeapFree(GetProcessHeap(), 0, moniker_list->interfaces[i]); - HeapFree(GetProcessHeap(), 0, moniker_list); - return E_OUTOFMEMORY; - } - memcpy(moniker_list->interfaces[i], This->moniker_list->interfaces[i], size); + for (i = 0; i < This->moniker_count; i++) + { + SIZE_T size = FIELD_OFFSET(MInterfacePointer, abData[This->monikers[i]->ulCntData]); + monikers[i] = HeapAlloc(GetProcessHeap(), 0, size); + memcpy(monikers[i], This->monikers[i], size); } /* copy the enum structure */ - return EnumMonikerImpl_CreateEnumROTMoniker(moniker_list, This->pos, ppenum); + return EnumMonikerImpl_CreateEnumROTMoniker(monikers, This->moniker_count, + This->pos, ppenum); } /* Virtual function table for the IEnumMoniker class. */ @@ -1463,7 +1229,8 @@ * Used by EnumRunning to create the structure and EnumClone * to copy the structure */ -static HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(InterfaceList *moniker_list, +static HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(MInterfacePointer **monikers, + ULONG moniker_count, ULONG current_pos, IEnumMoniker **ppenumMoniker) { @@ -1483,7 +1250,8 @@ /* the initial reference is set to "1" */ This->ref = 1; /* set the ref count to one */ This->pos = current_pos; /* Set the list start posn */ - This->moniker_list = moniker_list; + This->moniker_count = moniker_count; /* Need the same size table as ROT */ + This->monikers = monikers; *ppenumMoniker = (IEnumMoniker*)This; @@ -1659,13 +1427,3 @@ *outer = (IUnknown *)&This->lpVtbl; return S_OK; } - -void * __RPC_USER MIDL_user_allocate(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -void __RPC_USER MIDL_user_free(void *p) -{ - HeapFree(GetProcessHeap(), 0, p); -} Modified: trunk/reactos/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.rbui… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] Tue Oct 28 09:32:41 2008 @@ -14,7 +14,6 @@ <library>advapi32</library> <library>user32</library> <library>gdi32</library> - <library>ole32_irot_client</library> <library>ole32_proxy</library> <library>rpcrt4</library> <library>kernel32</library>

1 0

[janderwald] 37038: - Fix storing the DhcpIpAddress key
by janderwald＠svn.reactos.org 28 Oct '08

28 Oct '08

Author: janderwald Date: Tue Oct 28 05:32:07 2008 New Revision: 37038 URL: http://svn.reactos.org/svn/reactos?rev=37038&view=rev Log: - Fix storing the DhcpIpAddress key Modified: trunk/reactos/base/services/dhcp/dhclient.c Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] Tue Oct 28 05:32:07 2008 @@ -525,7 +525,7 @@ &Adapter->NteContext, &Adapter->NteInstance ); if (hkey) { - RegSetValueExA(hkey, "DhcpIPAddress", 0, REG_SZ, (LPBYTE)new_lease->address.iabuf, strlen(new_lease->address.iabuf)+1); + RegSetValueExA(hkey, "DhcpIPAddress", 0, REG_SZ, (LPBYTE)piaddr(new_lease->address), strlen(piaddr(new_lease->address))+1); Buffer[0] = '\0'; for(i = 0; i < new_lease->options[DHO_SUBNET_MASK].len; i++) {

1 0

[janderwald] 37037: - Rewrite getResInfo to directly return a linked list of IP_ADDR_STRING structures - Might fix manual DNS bug
by janderwald＠svn.reactos.org 28 Oct '08

28 Oct '08

Author: janderwald Date: Tue Oct 28 05:06:16 2008 New Revision: 37037 URL: http://svn.reactos.org/svn/reactos?rev=37037&view=rev Log: - Rewrite getResInfo to directly return a linked list of IP_ADDR_STRING structures - Might fix manual DNS bug Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c trunk/reactos/dll/win32/iphlpapi/resinfo.h trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Tue Oct 28 05:06:16 2008 @@ -1367,7 +1367,7 @@ if (!resInfo) return ERROR_OUTOFMEMORY; - size = sizeof(FIXED_INFO) + (resInfo->riCount > 0 ? (resInfo->riCount - 1) * + size = sizeof(FIXED_INFO) + (resInfo->riCount > 1 ? (resInfo->riCount-1) * sizeof(IP_ADDR_STRING) : 0); if (!pFixedInfo || *pOutBufLen < size) { *pOutBufLen = size; @@ -1383,25 +1383,16 @@ TRACE("GetComputerNameExA: %s\n", pFixedInfo->DomainName); - if (resInfo->riCount > 0) { - PIP_ADDR_STRING ptr; - int i; - - for (i = 0, ptr = &pFixedInfo->DnsServerList; i < resInfo->riCount && ptr; - i++, ptr = ptr->Next) { - struct sockaddr_in *addr_v4 = - (struct sockaddr_in *)&resInfo->riAddressList[i]; - toIPAddressString - (addr_v4->sin_addr.s_addr, - ptr->IpAddress.String); - if (i == resInfo->riCount - 1) - ptr->Next = NULL; - else if (i == 0) - ptr->Next = (PIP_ADDR_STRING)((LPBYTE)pFixedInfo + sizeof(FIXED_INFO)); - else - ptr->Next = (PIP_ADDR_STRING)((PBYTE)ptr + sizeof(IP_ADDR_STRING)); - } - } + if (resInfo->riCount > 0) + { + CopyMemory(&pFixedInfo->DnsServerList, resInfo->DnsList, sizeof(IP_ADDR_STRING)); + if (resInfo->riCount > 1) + { + pFixedInfo->DnsServerList.Next = (struct _IP_ADDR_STRING*)((char*)pFixedInfo + sizeof(FIXED_INFO)); + CopyMemory(pFixedInfo->DnsServerList.Next, resInfo->DnsList->Next, sizeof(IP_ADDR_STRING) * (resInfo->riCount-1)); + } + } + pFixedInfo->NodeType = HYBRID_NODETYPE; regReturn = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Services\\VxD\\MSTCP", 0, KEY_READ, &hKey); @@ -1490,7 +1481,7 @@ Context->uSizeRequired += sizeof(IP_ADDR_STRING); if (Context->uSizeAvailable >= Context->uSizeRequired) { - pNext = ((char*)Context->pLastAddr) + sizeof(IP_ADDR_STRING); + pNext = (IP_ADDR_STRING*)(((char*)Context->pLastAddr) + sizeof(IP_ADDR_STRING)); WideCharToMultiByte(CP_ACP, 0, Server, -1, pNext->IpAddress.String, 16, NULL, NULL); pNext->IpAddress.String[15] = '\0'; Context->pLastAddr->Next = pNext; Modified: trunk/reactos/dll/win32/iphlpapi/resinfo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/resinfo… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/resinfo.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/resinfo.h [iso-8859-1] Tue Oct 28 05:06:16 2008 @@ -23,6 +23,7 @@ typedef struct _IPHLP_RES_INFO { DWORD riCount; + IP_ADDR_STRING * DnsList; struct sockaddr_in *riAddressList; } IPHLP_RES_INFO, *PIPHLP_RES_INFO; Modified: trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/resinfo… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] Tue Oct 28 05:06:16 2008 @@ -49,8 +49,7 @@ typedef struct _NAME_SERVER_LIST_PRIVATE { UINT NumServers; - UINT CurrentName; - PIP_ADDRESS_STRING AddrString; + IP_ADDR_STRING * pCurrent; } NAME_SERVER_LIST_PRIVATE, *PNAME_SERVER_LIST_PRIVATE; NTSYSAPI @@ -177,22 +176,23 @@ CreateNameServerListEnumNamesFuncCount); } -VOID CreateNameServerListEnumNamesFunc( PWCHAR Interface, - PWCHAR Server, - PVOID _Data ) { - PNAME_SERVER_LIST_PRIVATE Data = (PNAME_SERVER_LIST_PRIVATE)_Data; - - if (WideCharToMultiByte(CP_ACP, 0, Server, -1, - Data->AddrString[Data->CurrentName].String, - 16, NULL, NULL)) - { - Data->AddrString[Data->CurrentName].String[15] = '\0'; - Data->CurrentName++; - } - else - { - Data->AddrString[Data->CurrentName].String[0] = '\0'; - } +VOID CreateNameServerListEnumNamesFunc( + PWCHAR Interface, + PWCHAR Server, + PVOID _Data ) +{ + PNAME_SERVER_LIST_PRIVATE Data = (PNAME_SERVER_LIST_PRIVATE)_Data; + + if (WideCharToMultiByte(CP_ACP, 0, Server, -1, Data->pCurrent->IpAddress.String, 16, NULL, NULL)) + { + Data->pCurrent->Next = (struct _IP_ADDR_STRING*)(char*)Data->pCurrent + sizeof(IP_ADDR_STRING); + Data->pCurrent = Data->pCurrent->Next; + Data->NumServers++; + } + else + { + Data->pCurrent->IpAddress.String[0] = '\0'; + } } static void CreateNameServerListEnumIfFunc( HKEY RegHandle, @@ -213,51 +213,37 @@ } PIPHLP_RES_INFO getResInfo() { - DWORD i, ServerCount; - NAME_SERVER_LIST_PRIVATE PrivateNSEnum = { 0 }; + DWORD ServerCount; + NAME_SERVER_LIST_PRIVATE PrivateNSEnum; PIPHLP_RES_INFO ResInfo; - struct sockaddr_in *AddrList; - + IP_ADDR_STRING * DnsList; + + PrivateNSEnum.NumServers = 0; ServerCount = CountNameServers( &PrivateNSEnum ); PrivateNSEnum.NumServers = ServerCount; - PrivateNSEnum.AddrString = - (PIP_ADDRESS_STRING) - RtlAllocateHeap( GetProcessHeap(), 0, - ServerCount * sizeof(IP_ADDRESS_STRING) ); - PrivateNSEnum.CurrentName = 0; - - ResInfo = - (PIPHLP_RES_INFO)RtlAllocateHeap - ( GetProcessHeap(), 0, - sizeof(IPHLP_RES_INFO) + - (ServerCount * sizeof(struct sockaddr_in)) ); - - if( !ResInfo ) { - RtlFreeHeap( GetProcessHeap(), 0, PrivateNSEnum.AddrString ); - return NULL; - } - - ResInfo->riCount = ServerCount; - AddrList = (struct sockaddr_in *) - (((PCHAR)ResInfo) + sizeof(IPHLP_RES_INFO)); - ResInfo->riAddressList = AddrList; + DnsList = HeapAlloc(GetProcessHeap(), 0, ServerCount * sizeof(IP_ADDR_STRING)); + ZeroMemory(DnsList, ServerCount * sizeof(IP_ADDR_STRING)); + + ResInfo = (PIPHLP_RES_INFO)RtlAllocateHeap ( GetProcessHeap(), 0, sizeof(IPHLP_RES_INFO)); + if( !ResInfo ) + { + HeapFree( GetProcessHeap(), 0, DnsList ); + return NULL; + } + + PrivateNSEnum.NumServers = 0; + PrivateNSEnum.pCurrent = DnsList; MakeNameServerList( &PrivateNSEnum ); - - for( i = 0; i < PrivateNSEnum.CurrentName; i++ ) { - /* Hmm seems that dns servers are always AF_INET but ... */ - ResInfo->riAddressList[i].sin_family = AF_INET; - ResInfo->riAddressList[i].sin_addr.s_addr = - inet_addr(PrivateNSEnum.AddrString[i].String ); - ResInfo->riAddressList[i].sin_port = 0; - } - - RtlFreeHeap( GetProcessHeap(), 0, PrivateNSEnum.AddrString ); + ResInfo->DnsList = DnsList; + ResInfo->riCount = PrivateNSEnum.NumServers; return ResInfo; } -VOID disposeResInfo( PIPHLP_RES_INFO InfoPtr ) { +VOID disposeResInfo( PIPHLP_RES_INFO InfoPtr ) +{ RtlFreeHeap( GetProcessHeap(), 0, InfoPtr ); -} + HeapFree(GetProcessHeap(), 0, InfoPtr->DnsList); +}

1 0

[janderwald] 37036: - Fix multiple bugs in details status dialog
by janderwald＠svn.reactos.org 28 Oct '08

28 Oct '08

Author: janderwald Date: Tue Oct 28 04:14:06 2008 New Revision: 37036 URL: http://svn.reactos.org/svn/reactos?rev=37036&view=rev Log: - Fix multiple bugs in details status dialog Modified: trunk/reactos/dll/win32/netshell/lang/bg-BG.rc trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc trunk/reactos/dll/win32/netshell/lang/da-DK.rc trunk/reactos/dll/win32/netshell/lang/de-DE.rc trunk/reactos/dll/win32/netshell/lang/el-GR.rc trunk/reactos/dll/win32/netshell/lang/en-US.rc trunk/reactos/dll/win32/netshell/lang/es-ES.rc trunk/reactos/dll/win32/netshell/lang/fr-FR.rc trunk/reactos/dll/win32/netshell/lang/hu-HU.rc trunk/reactos/dll/win32/netshell/lang/id-ID.rc trunk/reactos/dll/win32/netshell/lang/it-IT.rc trunk/reactos/dll/win32/netshell/lang/ja-JP.rc trunk/reactos/dll/win32/netshell/lang/nl-NL.rc trunk/reactos/dll/win32/netshell/lang/no-NO.rc trunk/reactos/dll/win32/netshell/lang/pl-PL.rc trunk/reactos/dll/win32/netshell/lang/ru-RU.rc trunk/reactos/dll/win32/netshell/lang/sk-SK.rc trunk/reactos/dll/win32/netshell/lang/sv-SE.rc trunk/reactos/dll/win32/netshell/lang/uk-UA.rc trunk/reactos/dll/win32/netshell/lang/zh-CN.rc trunk/reactos/dll/win32/netshell/lanstatusui.c Modified: trunk/reactos/dll/win32/netshell/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/bg-BG.rc [iso-8859-1] Tue Oct 28 04:14:06 2008 @@ -69,7 +69,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc [iso-8859-1] Tue Oct 28 04:14:06 2008 @@ -68,7 +68,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/netshell/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/da… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/da-DK.rc [iso-8859-1] Tue Oct 28 04:14:06 2008 @@ -68,7 +68,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN 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] Tue Oct 28 04:14:06 2008 @@ -69,7 +69,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/netshell/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/el… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/el-GR.rc [iso-8859-1] Tue Oct 28 04:14:06 2008 @@ -68,7 +68,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN 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] Tue Oct 28 04:14:06 2008 @@ -69,7 +69,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/netshell/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/es… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/es-ES.rc [iso-8859-1] Tue Oct 28 04:14:06 2008 @@ -63,7 +63,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/netshell/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/fr-FR.rc [iso-8859-1] Tue Oct 28 04:14:06 2008 @@ -68,7 +68,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/netshell/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/hu-HU.rc [iso-8859-1] Tue Oct 28 04:14:06 2008 @@ -69,7 +69,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/netshell/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/id… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/id-ID.rc [iso-8859-1] Tue Oct 28 04:14:06 2008 @@ -68,7 +68,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/netshell/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/it… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/it-IT.rc [iso-8859-1] Tue Oct 28 04:14:06 2008 @@ -73,7 +73,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/netshell/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/ja-JP.rc [iso-8859-1] Tue Oct 28 04:14:06 2008 @@ -68,7 +68,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/netshell/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/nl-NL.rc [iso-8859-1] Tue Oct 28 04:14:06 2008 @@ -68,7 +68,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/netshell/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/no… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/no-NO.rc [iso-8859-1] Tue Oct 28 04:14:06 2008 @@ -72,7 +72,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/netshell/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/pl-PL.rc [iso-8859-1] Tue Oct 28 04:14:06 2008 @@ -69,7 +69,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/netshell/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] Tue Oct 28 04:14:06 2008 @@ -69,7 +69,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/netshell/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/sk-SK.rc [iso-8859-1] Tue Oct 28 04:14:06 2008 @@ -74,7 +74,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/netshell/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/sv… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/sv-SE.rc [iso-8859-1] Tue Oct 28 04:14:06 2008 @@ -69,7 +69,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/netshell/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/uk-UA.rc [iso-8859-1] Tue Oct 28 04:14:06 2008 @@ -71,7 +71,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/netshell/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/zh-CN.rc [iso-8859-1] Tue Oct 28 04:14:06 2008 @@ -68,7 +68,7 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Tue Oct 28 04:14:06 2008 @@ -336,7 +336,7 @@ { ZeroMemory(&li, sizeof(LVITEMW)); li.mask = LVIF_TEXT; - li.iItem = ListView_GetItemCount(hDlgCtrl); + li.iItem = Index; li.iSubItem = 0; li.pszText = L""; li.iItem = SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&li); @@ -346,7 +346,7 @@ { li.pszText = szBuffer; li.iSubItem = 1; - li.iItem = ListView_GetItemCount(hDlgCtrl); + li.iItem = Index++; SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); } SubIndex++; @@ -365,7 +365,7 @@ ZeroMemory(&li, sizeof(LVITEMW)); li.mask = LVIF_TEXT; li.iItem = ListView_GetItemCount(hDlgCtrl); - if (LoadStringW(netshell_hInstance, IDS_PHYSICAL_ADDRESS, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) + if (LoadStringW(netshell_hInstance, ResId, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) { li.pszText = szBuffer; return (INT)SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&li); @@ -444,7 +444,7 @@ li.iItem = InsertItemToListView(hDlgCtrl, IDS_DEF_GATEWAY); if (li.iItem >= 0) - if (MultiByteToWideChar(CP_ACP, 0, pCurAdapter->DhcpServer.IpAddress.String, -1, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) + if (MultiByteToWideChar(CP_ACP, 0, pCurAdapter->GatewayList.IpAddress.String, -1, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); #if 0 @@ -478,6 +478,12 @@ #endif CoTaskMemFree(pAdapterInfo); break; + case WM_COMMAND: + if (LOWORD(wParam) == IDC_CLOSE) + { + EndDialog(hwndDlg, FALSE); + break; + } } return FALSE; }

1 0

[janderwald] 37035: - Implement applying / canceling changes on close - Temporary disable storing the TcpFilter settings
by janderwald＠svn.reactos.org 28 Oct '08

28 Oct '08

Author: janderwald Date: Tue Oct 28 04:06:24 2008 New Revision: 37035 URL: http://svn.reactos.org/svn/reactos?rev=37035&view=rev Log: - Implement applying / canceling changes on close - Temporary disable storing the TcpFilter settings Modified: trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c trunk/reactos/dll/win32/netcfgx/netcfg_iface.c trunk/reactos/dll/win32/netcfgx/precomp.h trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c Modified: trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/inetcfgc… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] Tue Oct 28 04:06:24 2008 @@ -7,7 +7,6 @@ LONG ref; NetCfgComponentItem * pItem; INetCfgComponentPropertyUi * pProperty; - INetCfgComponentControl * pNCCC; INetCfg * pNCfg; }INetCfgComponentImpl; @@ -20,8 +19,6 @@ INetCfg * pNCfg; }IEnumNetCfgComponentImpl; - - HRESULT STDCALL INetCfgComponent_fnQueryInterface( @@ -42,7 +39,6 @@ return E_NOINTERFACE; } - ULONG STDCALL @@ -420,7 +416,7 @@ return hr; } This->pProperty = pNCCPU; - This->pNCCC = pNCCC; + This->pItem->pNCCC = pNCCC; return S_OK; } @@ -467,20 +463,14 @@ pinfo.pszCaption = This->pItem->szDisplayName; iResult = PropertySheetW(&pinfo); - CoTaskMemFree(hppages); - if (iResult < 0) - { - //FIXME - INetCfgComponentControl_CancelChanges(This->pNCCC); - return E_ABORT; - } - else - { - //FIXME - INetCfgComponentControl_ApplyRegistryChanges(This->pNCCC); + if (iResult > 0) + { + /* indicate that settings should be stored */ + This->pItem->bChanged = TRUE; return S_OK; } + return S_FALSE; } static const INetCfgComponentVtbl vt_NetCfgComponent = { Modified: trunk/reactos/dll/win32/netcfgx/netcfg_iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfg_i… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] Tue Oct 28 04:06:24 2008 @@ -533,6 +533,56 @@ return S_OK; } +VOID +ApplyOrCancelChanges( + NetCfgComponentItem *pHead, + const CLSID * lpClassGUID, + BOOL bApply) +{ + HKEY hKey; + WCHAR szName[200]; + LPOLESTR pszGuid; + + while(pHead) + { + if (pHead->bChanged) + { + if (IsEqualGUID(lpClassGUID, &GUID_DEVCLASS_NET)) + { + if (bApply) + { + if (StringFromCLSID(&pHead->InstanceId, &pszGuid) == NOERROR) + { + swprintf(szName, L"SYSTEM\\CurrentControlSet\\Control\\Network\\%s", pszGuid); + CoTaskMemFree(pszGuid); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szName, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + RegSetValueExW(hKey, NULL, 0, REG_SZ, (LPBYTE)pHead->szDisplayName, (wcslen(pHead->szDisplayName)+1) * sizeof(WCHAR)); + RegCloseKey(hKey); + } + } + } + } + else if (pHead->pNCCC) + { + if (bApply) + { + INetCfgComponentControl_ApplyRegistryChanges(pHead->pNCCC); + //FIXME + // implement INetCfgPnpReconfigCallback and pass it to + //INetCfgComponentControl_ApplyPnpChanges(pHead->pNCCC, NULL); + } + else + { + INetCfgComponentControl_CancelChanges(pHead->pNCCC); + } + } + } + pHead = pHead->pNext; + } +} + HRESULT STDCALL INetCfg_fnUninitialize( @@ -557,8 +607,12 @@ if (!This->bInitialized) return NETCFG_E_NOT_INITIALIZED; - - return E_NOTIMPL; + ApplyOrCancelChanges(This->pNet, &GUID_DEVCLASS_NET, TRUE); + ApplyOrCancelChanges(This->pClient, &GUID_DEVCLASS_NETCLIENT, TRUE); + ApplyOrCancelChanges(This->pService, &GUID_DEVCLASS_NETSERVICE, TRUE); + ApplyOrCancelChanges(This->pProtocol, &GUID_DEVCLASS_NETTRANS, TRUE); + + return S_OK; } HRESULT @@ -571,7 +625,11 @@ if (!This->bInitialized) return NETCFG_E_NOT_INITIALIZED; - return E_NOTIMPL; + ApplyOrCancelChanges(This->pClient, &GUID_DEVCLASS_NETCLIENT, FALSE); + ApplyOrCancelChanges(This->pService, &GUID_DEVCLASS_NETSERVICE, FALSE); + ApplyOrCancelChanges(This->pProtocol, &GUID_DEVCLASS_NETTRANS, FALSE); + + return S_OK; } HRESULT Modified: trunk/reactos/dll/win32/netcfgx/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/precomp.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/precomp.h [iso-8859-1] Tue Oct 28 04:06:24 2008 @@ -34,6 +34,7 @@ ULONG Status; //Y BOOL bChanged; //Y struct tagNetCfgComponentItem * pNext; + INetCfgComponentControl * pNCCC; }NetCfgComponentItem; /* netcfg_iface.c */ Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Tue Oct 28 04:06:24 2008 @@ -3129,22 +3129,29 @@ RegSetValueExW(hKey, L"Domain", 0, REG_SZ, (LPBYTE)This->pCurrentConfig->pDNS->szDomain, (wcslen(This->pCurrentConfig->pDNS->szDomain)+1) * sizeof(WCHAR)); } - +#if 0 if (This->pCurrentConfig->pFilter) { - RegSetValueExW(hKey, L"TCPAllowedPorts", 0, REG_MULTI_SZ, + if (This->pCurrentConfig->pFilter->szTCPAllowedPorts) + { + RegSetValueExW(hKey, L"TCPAllowedPorts", 0, REG_MULTI_SZ, (LPBYTE)This->pCurrentConfig->pFilter->szTCPAllowedPorts, This->pCurrentConfig->pFilter->TCPSize); - - RegSetValueExW(hKey, L"UDPAllowedPorts", 0, REG_MULTI_SZ, + } + if (This->pCurrentConfig->pFilter->szUDPAllowedPorts) + { + RegSetValueExW(hKey, L"UDPAllowedPorts", 0, REG_MULTI_SZ, (LPBYTE)This->pCurrentConfig->pFilter->szUDPAllowedPorts, This->pCurrentConfig->pFilter->UDPSize); - - RegSetValueExW(hKey, L"RawIPAllowedProtocols", 0, REG_MULTI_SZ, + } + if (This->pCurrentConfig->pFilter->szRawIPAllowedProtocols) + { + RegSetValueExW(hKey, L"RawIPAllowedProtocols", 0, REG_MULTI_SZ, (LPBYTE)This->pCurrentConfig->pFilter->szRawIPAllowedProtocols, This->pCurrentConfig->pFilter->IPSize); - } - + } + } +#endif RegSetValueExW(hKey, L"EnableDHCP", 0, REG_DWORD, (LPBYTE)&This->pCurrentConfig->DhcpEnabled, sizeof(DWORD)); if (This->pCurrentConfig->DhcpEnabled) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs