Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[sedwards] 19122: restore wine style license headers...superfolus chanes make doing a diff impossible

by sedwards＠svn.reactos.com

restore wine style license headers...superfolus chanes make doing a diff impossible Modified: trunk/reactos/lib/imagehlp/access.c Modified: trunk/reactos/lib/imagehlp/imagehlp_main.c Modified: trunk/reactos/lib/imagehlp/integrity.c Modified: trunk/reactos/lib/imagehlp/modify.c _____ Modified: trunk/reactos/lib/imagehlp/access.c --- trunk/reactos/lib/imagehlp/access.c 2005-11-10 17:28:23 UTC (rev 19121) +++ trunk/reactos/lib/imagehlp/access.c 2005-11-10 17:43:55 UTC (rev 19122) @@ -1,9 +1,21 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: Imagehlp Libary - * FILE: lib/imagehlp/access.c - * PURPOSE: Image (un)load/mapping and data directory/section access - * PROGRAMMER: Patrik Stridvall + * IMAGEHLP library + * + * Copyright 1998 Patrik Stridvall + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* INCLUDES ******************************************************************/ _____ Modified: trunk/reactos/lib/imagehlp/imagehlp_main.c --- trunk/reactos/lib/imagehlp/imagehlp_main.c 2005-11-10 17:28:23 UTC (rev 19121) +++ trunk/reactos/lib/imagehlp/imagehlp_main.c 2005-11-10 17:43:55 UTC (rev 19122) @@ -1,11 +1,24 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: Imagehlp Libary - * FILE: lib/imagehlp/imagehlp_main.c - * PURPOSE: DLL Entrypoint - * PROGRAMMER: Patrik Stridvall + * IMAGEHLP library + * + * Copyright 1998 Patrik Stridvall + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + /* INCLUDES ******************************************************************/ #include "precomp.h" _____ Modified: trunk/reactos/lib/imagehlp/integrity.c --- trunk/reactos/lib/imagehlp/integrity.c 2005-11-10 17:28:23 UTC (rev 19121) +++ trunk/reactos/lib/imagehlp/integrity.c 2005-11-10 17:43:55 UTC (rev 19122) @@ -1,9 +1,22 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: Imagehlp Libary - * FILE: lib/imagehlp/integrity.c - * PURPOSE: Image Integrity: Security Certificates and Checksums - * PROGRAMMER: Patrik Stridvall, Mike McCormack (WINE) + * IMAGEHLP library + * + * Copyright 1998 Patrik Stridvall + * Copyright 2003 Mike McCormack + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* _____ Modified: trunk/reactos/lib/imagehlp/modify.c --- trunk/reactos/lib/imagehlp/modify.c 2005-11-10 17:28:23 UTC (rev 19121) +++ trunk/reactos/lib/imagehlp/modify.c 2005-11-10 17:43:55 UTC (rev 19122) @@ -1,9 +1,22 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: Imagehlp Libary - * FILE: lib/imagehlp/modify.c - * PURPOSE: Binding, Base Fixing and Rebasing - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * IMAGEHLP library + * + * Copyright 1998 Patrik Stridvall + * Copyright 2005 Alex Ionescu + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* INCLUDES ******************************************************************/

18 years, 10 months

[turner] 19121: convert office docs to pdf and open office native docs. this way we have the best of both worlds.

by turner＠svn.reactos.com

convert office docs to pdf and open office native docs. this way we have the best of both worlds. Added: trunk/press-media/flyers/ReactOS.pdf Added: trunk/press-media/flyers/ReactOS.sxw Added: trunk/press-media/presentations/wineconf-2005/ReactOS_and_Wine.pdf Added: trunk/press-media/presentations/wineconf-2005/ReactOS_and_Wine.sti _____ Added: trunk/press-media/flyers/ReactOS.pdf (Binary files differ) Property changes on: trunk/press-media/flyers/ReactOS.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/press-media/flyers/ReactOS.sxw (Binary files differ) Property changes on: trunk/press-media/flyers/ReactOS.sxw ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/press-media/presentations/wineconf-2005/ReactOS_and_Wine.pdf (Binary files differ) Property changes on: trunk/press-media/presentations/wineconf-2005/ReactOS_and_Wine.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/press-media/presentations/wineconf-2005/ReactOS_and_Wine.sti (Binary files differ) Property changes on: trunk/press-media/presentations/wineconf-2005/ReactOS_and_Wine.sti ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

18 years, 10 months

[weiden] 19120: mark several helper functions as static

by weiden＠svn.reactos.com

mark several helper functions as static Modified: trunk/reactos/lib/cpl/ncpa/ncpa.c Modified: trunk/reactos/lib/cpl/ncpa/tcpip_properties.c _____ Modified: trunk/reactos/lib/cpl/ncpa/ncpa.c --- trunk/reactos/lib/cpl/ncpa/ncpa.c 2005-11-10 14:02:20 UTC (rev 19119) +++ trunk/reactos/lib/cpl/ncpa/ncpa.c 2005-11-10 14:12:53 UTC (rev 19120) @@ -66,14 +66,14 @@ typedef void (ENUMREGKEYCALLBACK)(void *pCookie,HKEY hBaseKey,TCHAR *pszSubKey); -LONG CALLBACK DisplayApplet(VOID); -INT_PTR CALLBACK NetworkPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +static LONG CALLBACK DisplayApplet(VOID); +static INT_PTR CALLBACK NetworkPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); void DisplayTCPIPProperties(HWND hParent,IP_ADAPTER_INFO *pInfo); HINSTANCE hApplet = 0; /* Applets */ -APPLET Applets[] = +static APPLET Applets[] = { {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, DisplayApplet} }; @@ -81,7 +81,8 @@ /* useful utilities */ -VOID EnumRegKeys(ENUMREGKEYCALLBACK *pCallback,PVOID pCookie,HKEY hBaseKey,TCHAR *tpszRegPath) +static VOID +EnumRegKeys(ENUMREGKEYCALLBACK *pCallback,PVOID pCookie,HKEY hBaseKey,TCHAR *tpszRegPath) { HKEY hKey; INT i; @@ -119,7 +120,8 @@ RegCloseKey(hKey); } -void InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc,LPARAM lParam) +void +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc,LPARAM lParam) { ZeroMemory(psp, sizeof(PROPSHEETPAGE)); psp->dwSize = sizeof(PROPSHEETPAGE); @@ -132,7 +134,8 @@ -BOOL FindNICClassKeyForCfgInstance(TCHAR *tpszCfgInst,TCHAR *tpszSubKeyOut) +static BOOL +FindNICClassKeyForCfgInstance(TCHAR *tpszCfgInst,TCHAR *tpszSubKeyOut) { int i; TCHAR tpszSubKey[MAX_PATH]; @@ -161,7 +164,8 @@ } -void NICPropertyProtocolCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey) +static void +NICPropertyProtocolCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey) { HWND hwndDlg; DWORD dwCharacteristics; @@ -233,7 +237,7 @@ -INT_PTR CALLBACK +static INT_PTR CALLBACK NICPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA); @@ -370,7 +374,8 @@ } -void DisplayNICProperties(HWND hParent,TCHAR *tpszCfgInstanceID) +static void +DisplayNICProperties(HWND hParent,TCHAR *tpszCfgInstanceID) { PROPSHEETPAGE psp[1]; PROPSHEETHEADER psh; @@ -411,7 +416,7 @@ -INT_PTR CALLBACK +static INT_PTR CALLBACK NICStatusPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch(uMsg) @@ -439,7 +444,8 @@ return FALSE; } -VOID DisplayNICStatus(HWND hParent,TCHAR *tpszCfgInstanceID) +static VOID +DisplayNICStatus(HWND hParent,TCHAR *tpszCfgInstanceID) { PROPSHEETPAGE psp[1]; PROPSHEETHEADER psh; @@ -484,7 +490,8 @@ // IPHLPAPI does not provide a list of all adapters // #if 0 -VOID EnumAdapters(HWND hwndDlg) +static VOID +EnumAdapters(HWND hwndDlg) { TCHAR pszText[MAX_ADAPTER_NAME_LENGTH + 4]; IP_ADAPTER_INFO *pInfo; @@ -511,7 +518,8 @@ -void NetAdapterCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey) +static void +NetAdapterCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey) { TCHAR tpszDisplayName[MAX_PATH]; //TCHAR tpszDeviceID[MAX_PATH]; @@ -579,7 +587,8 @@ } -void EnumAdapters(HWND hwndDlg) +static void +EnumAdapters(HWND hwndDlg) { LPTSTR lpRegPath = _T("SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1- 08002BE10318}"); @@ -588,7 +597,7 @@ } -INT_PTR CALLBACK +static INT_PTR CALLBACK NetworkPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { NMHDR* pnmh; @@ -651,15 +660,15 @@ /* First Applet */ -LONG CALLBACK DisplayApplet(VOID) +static LONG CALLBACK +DisplayApplet(VOID) { PROPSHEETPAGE psp[1]; - PROPSHEETHEADER psh; + PROPSHEETHEADER psh = {0}; TCHAR Caption[1024]; LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPSHEETPAGE; psh.hwndParent = NULL; @@ -677,7 +686,8 @@ } /* Control Panel Callback */ -LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +LONG CALLBACK +CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { switch (uMsg) { _____ Modified: trunk/reactos/lib/cpl/ncpa/tcpip_properties.c --- trunk/reactos/lib/cpl/ncpa/tcpip_properties.c 2005-11-10 14:02:20 UTC (rev 19119) +++ trunk/reactos/lib/cpl/ncpa/tcpip_properties.c 2005-11-10 14:12:53 UTC (rev 19120) @@ -53,23 +53,26 @@ #include "resource.h" #include "ncpa.h" -extern void InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc); +void InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc); -void EnableDHCP( HWND hwndDlg, BOOL Enabled ) { +static void +EnableDHCP( HWND hwndDlg, BOOL Enabled ) { CheckDlgButton(hwndDlg,IDC_USEDHCP,Enabled ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg,IDC_NODHCP,Enabled ? BST_UNCHECKED : BST_CHECKED); } -void ManualDNS( HWND hwndDlg, BOOL Enabled ) { +static void +ManualDNS( HWND hwndDlg, BOOL Enabled ) { CheckDlgButton(hwndDlg,IDC_FIXEDDNS,Enabled ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg,IDC_AUTODNS,Enabled ? BST_UNCHECKED : BST_CHECKED); EnableWindow(GetDlgItem(hwndDlg,IDC_DNS1),Enabled); EnableWindow(GetDlgItem(hwndDlg,IDC_DNS2),Enabled); } -BOOL GetAddressFromField( HWND hwndDlg, UINT CtlId, - DWORD *dwIPAddr, - const char **AddressString ) { +static BOOL +GetAddressFromField( HWND hwndDlg, UINT CtlId, + DWORD *dwIPAddr, + const char **AddressString ) { LRESULT lResult; struct in_addr inIPAddr; @@ -86,7 +89,8 @@ return TRUE; } -BOOL InternTCPIPSettings( HWND hwndDlg ) { +static BOOL +InternTCPIPSettings( HWND hwndDlg ) { PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA); IP_ADAPTER_INFO *pInfo = NULL; TCHAR pszRegKey[MAX_PATH]; @@ -147,7 +151,7 @@ return RetVal; } -INT_PTR CALLBACK +static INT_PTR CALLBACK TCPIPPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA);

18 years, 10 months

[weiden] 19119: fixed some warnings

by weiden＠svn.reactos.com

fixed some warnings Modified: trunk/reactos/lib/cpl/ncpa/tcpip_properties.c _____ Modified: trunk/reactos/lib/cpl/ncpa/tcpip_properties.c --- trunk/reactos/lib/cpl/ncpa/tcpip_properties.c 2005-11-10 13:37:56 UTC (rev 19118) +++ trunk/reactos/lib/cpl/ncpa/tcpip_properties.c 2005-11-10 14:02:20 UTC (rev 19119) @@ -94,7 +94,7 @@ DWORD IpAddress, NetMask, Gateway; const char *AddressString; BOOL RetVal = FALSE; - BOOL DhcpEnabled; + BOOL DhcpEnabled = FALSE; MIB_IPFORWARDROW RowToAdd = { 0 }; if(pPage) @@ -108,18 +108,18 @@ if( !GetAddressFromField ( hwndDlg, IDC_IPADDR, &IpAddress, &AddressString ) || RegSetValueEx - ( hKey, _T("IPAddress"), 0, REG_SZ, AddressString, + ( hKey, _T("IPAddress"), 0, REG_SZ, (const BYTE*)AddressString, strlen(AddressString) ) != ERROR_SUCCESS ) goto cleanup; if( !GetAddressFromField ( hwndDlg, IDC_SUBNETMASK, &NetMask, &AddressString ) || RegSetValueEx - ( hKey, _T("SubnetMask"), 0, REG_SZ, AddressString, + ( hKey, _T("SubnetMask"), 0, REG_SZ, (const BYTE*)AddressString, strlen(AddressString) ) != ERROR_SUCCESS ) goto cleanup; - if( DhcpEnabled ) + if( DhcpEnabled ) /* FIXME - DhcpEnabled is never initialized at this point! */ DhcpLeaseIpAddress( pInfo->Index ); else { DhcpReleaseIpAddressLease( pInfo->Index ); @@ -129,7 +129,7 @@ if( !GetAddressFromField ( hwndDlg, IDC_DEFGATEWAY, &Gateway, &AddressString ) || RegSetValueEx - ( hKey, _T("DefaultGateway"), 0, REG_SZ, AddressString, + ( hKey, _T("DefaultGateway"), 0, REG_SZ, (const BYTE*)AddressString, strlen(AddressString) ) != ERROR_SUCCESS ) goto cleanup;

18 years, 10 months

[cwittich] 19118: remove SetupIsActive function

by cwittich＠svn.reactos.com

remove SetupIsActive function Modified: trunk/reactos/subsys/system/setup/setup.c _____ Modified: trunk/reactos/subsys/system/setup/setup.c --- trunk/reactos/subsys/system/setup/setup.c 2005-11-10 13:27:12 UTC (rev 19117) +++ trunk/reactos/subsys/system/setup/setup.c 2005-11-10 13:37:56 UTC (rev 19118) @@ -57,18 +57,7 @@ return (LPTSTR)NULL; } - static VOID -SetupIsActive( DWORD dw ) -{ - HKEY hKey = 0; - if (RegOpenKeyEx( HKEY_LOCAL_MACHINE, _T("SYSTEM\\Setup"), 0, KEY_WRITE, &hKey ) == ERROR_SUCCESS) { - RegSetValueEx( hKey, _T("SystemSetupInProgress"), 0, REG_DWORD, (CONST BYTE *)&dw, sizeof(dw) ); - RegCloseKey( hKey ); - } -} - -static VOID RunNewSetup (HINSTANCE hInstance) { HMODULE hDll; @@ -85,8 +74,6 @@ } DPRINT("Loaded 'syssetup'!\n"); - - SetupIsActive(1); InstallReactOS = (PINSTALL_REACTOS)GetProcAddress (hDll, "InstallReactOS"); if (InstallReactOS == NULL)

18 years, 10 months

[cwittich] 19117: set SystemSetupInProgress to 0x00000001

by cwittich＠svn.reactos.com

set SystemSetupInProgress to 0x00000001 Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-11-10 11:45:50 UTC (rev 19116) +++ trunk/reactos/bootdata/hivesys.inf 2005-11-10 13:27:12 UTC (rev 19117) @@ -769,5 +769,5 @@ HKLM,"SYSTEM\Setup","OsLoaderPath",0x00000000,"\" HKLM,"SYSTEM\Setup","SetupType",0x00010001,0x00000001 HKLM,"SYSTEM\Setup","SystemPartition",0x00000000,"\Device\Harddisk0\Part ition1" -HKLM,"SYSTEM\Setup","SystemSetupInProgress",0x00010001,0x00000000 +HKLM,"SYSTEM\Setup","SystemSetupInProgress",0x00010001,0x00000001 ; EOF

18 years, 10 months

[cwittich] 19116: fixed typo. DevInstallW with SW_HIDE should work now

by cwittich＠svn.reactos.com

fixed typo. DevInstallW with SW_HIDE should work now Modified: trunk/reactos/lib/newdev/newdev.c _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-11-10 08:47:43 UTC (rev 19115) +++ trunk/reactos/lib/newdev/newdev.c 2005-11-10 11:45:50 UTC (rev 19116) @@ -871,7 +871,7 @@ DPRINT("Installing %S (%S)\n", DevInstData.buffer, InstanceId); - if ((Show =! SW_HIDE) && (!FindDriver(&DevInstData))) + if ((Show != SW_HIDE) && (!FindDriver(&DevInstData))) { /* Create the Welcome page */

18 years, 10 months

[hpoussin] 19115: Fix uninitialized variable

by hpoussin＠svn.reactos.com

Fix uninitialized variable Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-11-10 08:37:40 UTC (rev 19114) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-11-10 08:47:43 UTC (rev 19115) @@ -933,10 +933,11 @@ if (rc != ERROR_SUCCESS) goto cleanup; + size = sizeof(DWORD); rc = RegQueryValueExW(hKey, L"SystemSetupInProgress", NULL, &regType, (LPBYTE)&active, &size); if (rc != ERROR_SUCCESS) goto cleanup; - if (regType != REG_DWORD) + if (regType != REG_DWORD || size != sizeof(DWORD)) goto cleanup; ret = (active != 0);

18 years, 10 months

[hpoussin] 19114: Send SW_HIDE instead of SW_SHOWNOACTIVATE to newdev.dll when 2nd stage setup is running

by hpoussin＠svn.reactos.com

Send SW_HIDE instead of SW_SHOWNOACTIVATE to newdev.dll when 2nd stage setup is running Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-11-10 06:58:40 UTC (rev 19113) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-11-10 08:37:40 UTC (rev 19114) @@ -878,7 +878,7 @@ typedef BOOL (WINAPI *PDEV_INSTALL_W)(HWND, HINSTANCE, LPCWSTR, INT); static BOOL -InstallDevice(PCWSTR DeviceInstance) +InstallDevice(PCWSTR DeviceInstance, BOOL SetupIsActive) { PLUGPLAY_CONTROL_STATUS_DATA PlugPlayData; HMODULE hNewDev = NULL; @@ -909,7 +909,7 @@ DevInstallW = (PDEV_INSTALL_W)GetProcAddress(hNewDev, (LPCSTR)"DevInstallW"); if (!DevInstallW) goto cleanup; - if (!DevInstallW(NULL, NULL, DeviceInstance, SW_SHOWNOACTIVATE)) + if (!DevInstallW(NULL, NULL, DeviceInstance, SetupIsActive ? SW_HIDE : SW_SHOWNOACTIVATE)) goto cleanup; DeviceInstalled = TRUE; @@ -921,6 +921,33 @@ return DeviceInstalled; } +static BOOL +SetupIsActive(VOID) +{ + HKEY hKey = INVALID_HANDLE_VALUE; + DWORD regType, active, size; + LONG rc; + BOOL ret = FALSE; + + rc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\Setup", 0, KEY_QUERY_VALUE, &hKey); + if (rc != ERROR_SUCCESS) + goto cleanup; + + rc = RegQueryValueExW(hKey, L"SystemSetupInProgress", NULL, &regType, (LPBYTE)&active, &size); + if (rc != ERROR_SUCCESS) + goto cleanup; + if (regType != REG_DWORD) + goto cleanup; + + ret = (active != 0); + +cleanup: + if (hKey != INVALID_HANDLE_VALUE) + RegCloseKey(hKey); + DPRINT("System setup in progress? %S\n", ret ? L"YES" : L"NO"); + return ret; +} + static DWORD WINAPI PnpEventThread(LPVOID lpParameter) { @@ -928,12 +955,15 @@ ULONG PnpEventSize; NTSTATUS Status; RPC_STATUS RpcStatus; + BOOL setupActive; PnpEventSize = 0x1000; PnpEvent = HeapAlloc(GetProcessHeap(), 0, PnpEventSize); if (PnpEvent == NULL) return ERROR_OUTOFMEMORY; + setupActive = SetupIsActive(); + for (;;) { DPRINT("Calling NtGetPlugPlayEvent()\n"); @@ -961,7 +991,7 @@ if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) { DPRINT("Device arrival event: %S\n", PnpEvent->TargetDevice.DeviceIds); - InstallDevice(PnpEvent->TargetDevice.DeviceIds); + InstallDevice(PnpEvent->TargetDevice.DeviceIds, setupActive); } else {

18 years, 10 months

[arty] 19113: Straggling header.

by arty＠svn.reactos.com

Straggling header. Added: trunk/reactos/w32api/include/dhcpcapi.h _____ Added: trunk/reactos/w32api/include/dhcpcapi.h --- trunk/reactos/w32api/include/dhcpcapi.h 2005-11-10 06:54:44 UTC (rev 19112) +++ trunk/reactos/w32api/include/dhcpcapi.h 2005-11-10 06:58:40 UTC (rev 19113) @@ -0,0 +1,23 @@ +#ifndef _DHCPCAPI_H +#define _DHCPCAPI_H +#if __GNUC__ >= 3 +#pragma GCC system_header +#endif + +#include <windows.h> +#include <accctrl.h> + +#ifdef __cplusplus +extern "C" { +#endif + + VOID STDCALL DhcpLeaseIpAddress( ULONG AdapterIndex ); + VOID STDCALL DhcpReleaseIpAddressLease( ULONG AdapterIndex ); + VOID STDCALL DhcpStaticRefreshParams + ( ULONG AdapterIndex, ULONG IpAddress, ULONG NetMask ); + +#ifdef __cplusplus +} +#endif + +#endif/*_DHCPCAPI_H*/

18 years, 10 months

← Newer
1
...
65
66
67
68
69
70
71
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005