Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[sserapion] 36901: - Fix NMHDR definition. noticed by Daniel Verkamp. - Fixes taskmgr(and other) tabs on windows 64!!!
by sserapion＠svn.reactos.org 23 Oct '08

23 Oct '08

Author: sserapion Date: Wed Oct 22 22:28:07 2008 New Revision: 36901 URL: http://svn.reactos.org/svn/reactos?rev=36901&view=rev Log: - Fix NMHDR definition. noticed by Daniel Verkamp. - Fixes taskmgr(and other) tabs on windows 64!!! Modified: branches/ros-amd64-bringup/reactos/include/psdk/winuser.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winuser.h [iso-8859-1] Wed Oct 22 22:28:07 2008 @@ -2921,7 +2921,7 @@ } ICONINFO,*PICONINFO; typedef struct tagNMHDR { HWND hwndFrom; - UINT idFrom; + UINT_PTR idFrom; UINT code; } NMHDR,*LPNMHDR; typedef struct _WNDCLASSA {

1 0

[sserapion] 36900: - Fix COMBOBOXEXITEA/W noticed by Daniel Verkamp. - Fixes 64bit wordpad crash on windows 64!!!
by sserapion＠svn.reactos.org 23 Oct '08

23 Oct '08

Author: sserapion Date: Wed Oct 22 22:14:39 2008 New Revision: 36900 URL: http://svn.reactos.org/svn/reactos?rev=36900&view=rev Log: - Fix COMBOBOXEXITEA/W noticed by Daniel Verkamp. - Fixes 64bit wordpad crash on windows 64!!! Modified: branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h [iso-8859-1] Wed Oct 22 22:14:39 2008 @@ -4270,7 +4270,7 @@ typedef struct tagCOMBOBOXEXITEMA { UINT mask; - int iItem; + INT_PTR iItem; LPSTR pszText; int cchTextMax; int iImage; @@ -4284,7 +4284,7 @@ typedef struct tagCOMBOBOXEXITEMW { UINT mask; - int iItem; + INT_PTR iItem; LPWSTR pszText; int cchTextMax; int iImage;

1 0

[sserapion] 36899: - Fix modMessage definition - Fix beepmidi build.
by sserapion＠svn.reactos.org 23 Oct '08

23 Oct '08

Author: sserapion Date: Wed Oct 22 21:59:56 2008 New Revision: 36899 URL: http://svn.reactos.org/svn/reactos?rev=36899&view=rev Log: - Fix modMessage definition - Fix beepmidi build. Modified: branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] Wed Oct 22 21:59:56 2008 @@ -242,7 +242,7 @@ DWORD parameter1, DWORD parameter2) { - DPRINT("Calling client - callback 0x%x mmhandle 0x%x\n", (int) device_info->callback, (int) device_info->mme_handle); + DPRINT("Calling client - callback 0x%x mmhandle 0x%x\n", (int) device_info->callback, device_info->mme_handle); return DriverCallback(device_info->callback, HIWORD(device_info->flags), device_info->mme_handle, @@ -747,7 +747,7 @@ header->dwFlags |= MHDR_DONE; header->dwFlags &= ~ MHDR_INQUEUE; - DPRINT("Success? %d\n", (int) CallClient(the_device, MOM_DONE, (DWORD) header, 0)); + DPRINT("Success? %d\n", CallClient(the_device, MOM_DONE, (DWORD_PTR) header, 0)); return MMSYSERR_NOERROR; } @@ -757,14 +757,14 @@ Exported function that receives messages from WINMM (the MME API.) */ -FAR PASCAL +WINAPI MMRESULT modMessage( UINT device_id, UINT message, - DWORD private_data, - DWORD parameter1, - DWORD parameter2) + DWORD_PTR private_data, + DWORD_PTR parameter1, + DWORD_PTR parameter2) { switch ( message ) {

1 0

[sserapion] 36898: - Fix CryptReleaseContext definition. - Make SERVICE_STATUS_HANDLE and CLIENT_HANDLE HANDLEs. - Fix LSAPR_HANDLE, SC_RPC_HANDLE definitions. - Fixes 64bit advapi32 build.
by sserapion＠svn.reactos.org 23 Oct '08

23 Oct '08

Author: sserapion Date: Wed Oct 22 21:25:18 2008 New Revision: 36898 URL: http://svn.reactos.org/svn/reactos?rev=36898&view=rev Log: - Fix CryptReleaseContext definition. - Make SERVICE_STATUS_HANDLE and CLIENT_HANDLE HANDLEs. - Fix LSAPR_HANDLE, SC_RPC_HANDLE definitions. - Fixes 64bit advapi32 build. Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/lsa.c branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/sctrl.c branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h branches/ros-amd64-bringup/reactos/include/psdk/winsvc.h branches/ros-amd64-bringup/reactos/include/reactos/idl/lsa.idl branches/ros-amd64-bringup/reactos/include/reactos/idl/svcctl.idl branches/ros-amd64-bringup/reactos/include/reactos/services/services.h Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Wed Oct 22 21:25:18 2008 @@ -400,7 +400,7 @@ NTSTATUS Status; /* don't close null handle or a pseudo handle */ - if ((!hKey) || (((ULONG)hKey & 0xF0000000) == 0x80000000)) + if ((!hKey) || (((ULONG_PTR)hKey & 0xF0000000) == 0x80000000)) { return ERROR_INVALID_HANDLE; } @@ -1018,7 +1018,7 @@ { return RtlNtStatusToDosError (Status); } - TRACE("ParentKey %x\n", (ULONG)ParentKey); + TRACE("ParentKey %p\n", ParentKey); if (lpClass != NULL) { @@ -1091,7 +1091,7 @@ { return RtlNtStatusToDosError(Status); } - TRACE("ParentKey %x\n", (ULONG)ParentKey); + TRACE("ParentKey %p\n", ParentKey); RtlInitUnicodeString (&ClassString, lpClass); Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Wed Oct 22 21:25:18 2008 @@ -93,7 +93,7 @@ LSAHandleBind(); return LsarClose(LSABindingHandle, - (unsigned long *)&ObjectHandle); + &ObjectHandle); } @@ -108,7 +108,7 @@ LSAHandleBind(); return LsarDelete(LSABindingHandle, - (unsigned long)ObjectHandle); + ObjectHandle); } Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Wed Oct 22 21:25:18 2008 @@ -457,7 +457,7 @@ Service = ScLookupServiceByServiceName((LPWSTR)lpServiceName); if (Service == NULL) { - return (SERVICE_STATUS_HANDLE)NULL; + return INVALID_HANDLE_VALUE; } Service->HandlerFunction = lpHandlerProc; Modified: branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h [iso-8859-1] Wed Oct 22 21:25:18 2008 @@ -3788,7 +3788,7 @@ WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, CONST BYTE *, DWORD, DWORD); WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD); WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, CONST BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *); -WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR); +WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD); WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD); Modified: branches/ros-amd64-bringup/reactos/include/psdk/winsvc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winsvc.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winsvc.h [iso-8859-1] Wed Oct 22 21:25:18 2008 @@ -158,7 +158,7 @@ DECLARE_HANDLE(SC_HANDLE); typedef SC_HANDLE *LPSC_HANDLE; typedef PVOID SC_LOCK; -typedef DWORD SERVICE_STATUS_HANDLE; +DECLARE_HANDLE(SERVICE_STATUS_HANDLE); typedef VOID(WINAPI *LPHANDLER_FUNCTION)(DWORD); typedef DWORD (WINAPI *LPHANDLER_FUNCTION_EX)(DWORD,DWORD,LPVOID,LPVOID); typedef struct _SERVICE_DESCRIPTIONA { Modified: branches/ros-amd64-bringup/reactos/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Wed Oct 22 21:25:18 2008 @@ -4,7 +4,7 @@ #include <ms-dtyp.idl> -typedef /*[context_handle]*/ unsigned long LSAPR_HANDLE; +typedef [context_handle] void* LSAPR_HANDLE; typedef LSAPR_HANDLE *PLSAPR_HANDLE; cpp_quote("#ifndef _WINNT_H") Modified: branches/ros-amd64-bringup/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Wed Oct 22 21:25:18 2008 @@ -17,7 +17,7 @@ typedef /*[handle]*/ LPSTR SVCCTL_HANDLEA; typedef /*[handle]*/ LPWSTR SVCCTL_HANDLEW; -typedef /*[context_handle]*/ ULONG_PTR SC_RPC_HANDLE; +typedef [context_handle] void* SC_RPC_HANDLE; typedef SC_RPC_HANDLE* LPSC_RPC_HANDLE; typedef /*[context_handle]*/ unsigned long SC_RPC_LOCK; typedef SC_RPC_LOCK* LPSC_RPC_LOCK; Modified: branches/ros-amd64-bringup/reactos/include/reactos/services/services.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/services/services.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/services/services.h [iso-8859-1] Wed Oct 22 21:25:18 2008 @@ -11,7 +11,7 @@ #define SERVICE_CONTROL_START 0 -typedef DWORD CLIENT_HANDLE; +DECLARE_HANDLE(CLIENT_HANDLE); typedef struct _SCM_CONTROL_PACKET {

1 0

[janderwald] 36897: - Fix bug 3782 - Thanks to vicmarcel for bugtracking
by janderwald＠svn.reactos.org 22 Oct '08

22 Oct '08

Author: janderwald Date: Wed Oct 22 13:40:36 2008 New Revision: 36897 URL: http://svn.reactos.org/svn/reactos?rev=36897&view=rev Log: - Fix bug 3782 - Thanks to vicmarcel for bugtracking Modified: trunk/reactos/dll/win32/shell32/cpanelfolder.c Modified: trunk/reactos/dll/win32/shell32/cpanelfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/cpanelfo… ============================================================================== --- trunk/reactos/dll/win32/shell32/cpanelfolder.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/cpanelfolder.c [iso-8859-1] Wed Oct 22 13:40:36 2008 @@ -595,10 +595,14 @@ *ppvOut = NULL; if (IsEqualIID(riid, &IID_IContextMenu) &&(cidl >= 1)) { + // TODO + // create a seperate item struct + // pObj = (IUnknown*)(&This->lpVtblContextMenu); This->apidl = apidl; This->cidl = cidl; IUnknown_AddRef(pObj); + hr = S_OK; } else if (IsEqualIID(riid, &IID_IDataObject) &&(cidl >= 1)) { pObj = (LPUNKNOWN) IDataObject_Constructor(hwndOwner, This->pidlRoot, apidl, cidl); hr = S_OK;

1 0

[fireball] 36896: - Typo fix. See issue #3804 for more details.
by fireball＠svn.reactos.org 22 Oct '08

22 Oct '08

Author: fireball Date: Wed Oct 22 13:10:17 2008 New Revision: 36896 URL: http://svn.reactos.org/svn/reactos?rev=36896&view=rev Log: - Typo fix. See issue #3804 for more details. Modified: trunk/reactos/ntoskrnl/ex/shutdown.c Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] Wed Oct 22 13:10:17 2008 @@ -87,7 +87,7 @@ "Until then, there must be no regrets, no fears, no anxieties.\n" "Just go forward in all your beliefs, and prove to me that I am not mistaken in\n" "mine.\n", - "Lowest possible energy state reached! Switch off now to achive a Bose-Einstein\n" + "Lowest possible energy state reached! Switch off now to achieve a Bose-Einstein\n" "condensate.\n", "Hasta la vista, BABY!\n", "They live, we sleep!\n",

1 0

[janderwald] 36895: * Implement details status dialog * Update all languages with en-US resource file
by janderwald＠svn.reactos.org 22 Oct '08

22 Oct '08

Author: janderwald Date: Wed Oct 22 12:46:55 2008 New Revision: 36895 URL: http://svn.reactos.org/svn/reactos?rev=36895&view=rev Log: * Implement details status dialog * Update all languages with en-US resource file 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 trunk/reactos/dll/win32/netshell/netshell.rc trunk/reactos/dll/win32/netshell/resource.h 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] Wed Oct 22 12:46:55 2008 @@ -19,7 +19,7 @@ CHECKBOX "Óâåäîìÿâàíå ïðè îãðàíè÷åíà èëè ëèïñâàùà ñâúðçàíîñò", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP END -IDD_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200,180 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Îáùè" FONT 8, "MS Shell Dlg" @@ -68,9 +68,29 @@ PUSHBUTTON "&Ïîäðîáíîñòè...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Ìðåæîâî ñâúðçâàíå" IDS_SHV_COLUMN_NAME "Èìå" IDS_SHV_COLUMN_TYPE "Âèä" 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] Wed Oct 22 12:46:55 2008 @@ -67,8 +67,29 @@ PUSHBUTTON "&Detaily...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END + STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Network Connection" IDS_SHV_COLUMN_NAME "Name" IDS_SHV_COLUMN_TYPE "Type" 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] Wed Oct 22 12:46:55 2008 @@ -67,8 +67,29 @@ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END + STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Network Connection" IDS_SHV_COLUMN_NAME "Name" IDS_SHV_COLUMN_TYPE "Type" 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] Wed Oct 22 12:46:55 2008 @@ -68,9 +68,29 @@ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Netzwerkverbindungen" IDS_SHV_COLUMN_NAME "Name" IDS_SHV_COLUMN_TYPE "Typ" 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] Wed Oct 22 12:46:55 2008 @@ -67,8 +67,29 @@ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END + STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Network Connection" IDS_SHV_COLUMN_NAME "Name" IDS_SHV_COLUMN_TYPE "Type" 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] Wed Oct 22 12:46:55 2008 @@ -68,9 +68,29 @@ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Network Connection" IDS_SHV_COLUMN_NAME "Name" IDS_SHV_COLUMN_TYPE "Type" 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] Wed Oct 22 12:46:55 2008 @@ -62,9 +62,29 @@ PUSHBUTTON "&Detalles...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Conexiones de red" IDS_SHV_COLUMN_NAME "Nombre" IDS_SHV_COLUMN_TYPE "Tipo" 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] Wed Oct 22 12:46:55 2008 @@ -67,8 +67,29 @@ PUSHBUTTON "&Détails...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END + STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Network Connection" IDS_SHV_COLUMN_NAME "Name" IDS_SHV_COLUMN_TYPE "Type" 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] Wed Oct 22 12:46:55 2008 @@ -68,8 +68,29 @@ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END + STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Network Connection" IDS_SHV_COLUMN_NAME "Name" IDS_SHV_COLUMN_TYPE "Type" 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] Wed Oct 22 12:46:55 2008 @@ -67,8 +67,29 @@ PUSHBUTTON "&Detil...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END + STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Network Connection" IDS_SHV_COLUMN_NAME "Name" IDS_SHV_COLUMN_TYPE "Type" 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] Wed Oct 22 12:46:55 2008 @@ -72,9 +72,29 @@ PUSHBUTTON "&Dettagli...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Connessione di rete" IDS_SHV_COLUMN_NAME "Nome" IDS_SHV_COLUMN_TYPE "Tipo" 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] Wed Oct 22 12:46:55 2008 @@ -67,8 +67,29 @@ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END + STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Network Connection" IDS_SHV_COLUMN_NAME "Name" IDS_SHV_COLUMN_TYPE "Type" 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] Wed Oct 22 12:46:55 2008 @@ -67,8 +67,29 @@ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END + STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Network Connection" IDS_SHV_COLUMN_NAME "Name" IDS_SHV_COLUMN_TYPE "Type" 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] Wed Oct 22 12:46:55 2008 @@ -71,9 +71,29 @@ PUSHBUTTON "&Detaljer...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Nettverk tilkobling" IDS_SHV_COLUMN_NAME "Navn" IDS_SHV_COLUMN_TYPE "Type" 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] Wed Oct 22 12:46:55 2008 @@ -68,8 +68,29 @@ PUSHBUTTON "&Szczegó³y...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END + STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Po³¹czenie sieciowe" IDS_SHV_COLUMN_NAME "Nazwa" IDS_SHV_COLUMN_TYPE "Typ" 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] Wed Oct 22 12:46:55 2008 @@ -68,8 +68,29 @@ PUSHBUTTON "&Äîïîëíèòåëüíî...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END + STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Ñåòåâûå ïîäêëþ÷åíèÿ" IDS_SHV_COLUMN_NAME "Èìÿ" IDS_SHV_COLUMN_TYPE "Òèï" 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] Wed Oct 22 12:46:55 2008 @@ -73,8 +73,29 @@ PUSHBUTTON "Po&drobnosti...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END + STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Network Connection" IDS_SHV_COLUMN_NAME "Názov" IDS_SHV_COLUMN_TYPE "Typ" 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] Wed Oct 22 12:46:55 2008 @@ -68,8 +68,29 @@ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END + STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Network Connection" IDS_SHV_COLUMN_NAME "Name" IDS_SHV_COLUMN_TYPE "Type" 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] Wed Oct 22 12:46:55 2008 @@ -70,8 +70,29 @@ PUSHBUTTON "&Ñêëàä...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END + STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Network Connection" IDS_SHV_COLUMN_NAME "Name" IDS_SHV_COLUMN_TYPE "Type" 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] Wed Oct 22 12:46:55 2008 @@ -67,8 +67,29 @@ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Network Connection Details" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 +END + STRINGTABLE DISCARDABLE BEGIN + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" IDS_NETWORKCONNECTION "Network Connection" IDS_SHV_COLUMN_NAME "Name" IDS_SHV_COLUMN_TYPE "Type" 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] Wed Oct 22 12:46:55 2008 @@ -289,6 +289,199 @@ NcFreeNetconProperties(pProperties); } +VOID +InsertColumnToListView( + HWND hDlgCtrl, + UINT ResId, + UINT SubItem, + UINT Size) +{ + WCHAR szBuffer[200]; + LVCOLUMNW lc; + + if (!LoadStringW(netshell_hInstance, ResId, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) + return; + + memset(&lc, 0, sizeof(LV_COLUMN) ); + lc.mask = LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM | LVCF_FMT; + lc.iSubItem = SubItem; + lc.fmt = LVCFMT_FIXED_WIDTH; + lc.cx = Size; + lc.cchTextMax = wcslen(szBuffer); + lc.pszText = szBuffer; + + (void)SendMessageW(hDlgCtrl, LVM_INSERTCOLUMNW, SubItem, (LPARAM)&lc); +} + +VOID +AddIPAddressToListView( + HWND hDlgCtrl, + PIP_ADDR_STRING pAddr, + INT Index) +{ + LVITEMW li; + PIP_ADDR_STRING pCur; + WCHAR szBuffer[100]; + UINT SubIndex; + + ZeroMemory(&li, sizeof(LVITEMW)); + li.mask = LVIF_TEXT; + li.iItem = Index; + pCur = pAddr; + SubIndex = 0; + + do + { + if (SubIndex) + { + ZeroMemory(&li, sizeof(LVITEMW)); + li.mask = LVIF_TEXT; + li.iItem = ListView_GetItemCount(hDlgCtrl); + li.iSubItem = 0; + li.pszText = L""; + li.iItem = SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&li); + } + + if (MultiByteToWideChar(CP_ACP, 0, pCur->IpAddress.String, -1, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) + { + li.pszText = szBuffer; + li.iSubItem = 1; + li.iItem = ListView_GetItemCount(hDlgCtrl); + SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); + } + SubIndex++; + pCur = pCur->Next; + }while(pCur && pCur->IpAddress.String[0]); +} + +INT +InsertItemToListView( + HWND hDlgCtrl, + UINT ResId) +{ + LVITEMW li; + WCHAR szBuffer[100]; + + 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))) + { + li.pszText = szBuffer; + return (INT)SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&li); + } + return -1; +} + + +INT_PTR +CALLBACK +LANStatusUiDetailsDlg( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + LANSTATUSUI_CONTEXT * pContext; + LVITEMW li; + WCHAR szBuffer[100]; + PIP_ADAPTER_INFO pAdapterInfo, pCurAdapter; + PIP_PER_ADAPTER_INFO pPerAdapter; + DWORD dwSize; + HWND hDlgCtrl; + + switch(uMsg) + { + case WM_INITDIALOG: + pContext = (LANSTATUSUI_CONTEXT*)lParam; + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_DETAILS); + InsertColumnToListView(hDlgCtrl, IDS_PROPERTY, 0, 80); + InsertColumnToListView(hDlgCtrl, IDS_VALUE, 0, 80); + + dwSize = 0; + pCurAdapter = NULL; + pAdapterInfo = NULL; + if (GetAdaptersInfo(NULL, &dwSize) == ERROR_BUFFER_OVERFLOW) + { + pAdapterInfo = (PIP_ADAPTER_INFO)CoTaskMemAlloc(dwSize); + if (pAdapterInfo) + { + if (GetAdaptersInfo(pAdapterInfo, &dwSize) == NO_ERROR) + { + pCurAdapter = pAdapterInfo; + while(pCurAdapter && pCurAdapter->Index != pContext->dwAdapterIndex) + pCurAdapter = pCurAdapter->Next; + + if(pCurAdapter->Index != pContext->dwAdapterIndex) + pCurAdapter = NULL; + } + } + } + + ZeroMemory(&li, sizeof(LVITEMW)); + li.mask = LVIF_TEXT; + li.iSubItem = 1; + li.pszText = szBuffer; + + if (pCurAdapter) + { + li.iItem = InsertItemToListView(hDlgCtrl, IDS_PHYSICAL_ADDRESS); + if (li.iItem >= 0) + if (MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pCurAdapter->Address, -1, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) + SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); + + li.iItem = InsertItemToListView(hDlgCtrl, IDS_IP_ADDRESS); + if (li.iItem >= 0) + if (MultiByteToWideChar(CP_ACP, 0, pCurAdapter->IpAddressList.IpAddress.String, -1, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) + SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); + + li.iItem = InsertItemToListView(hDlgCtrl, IDS_SUBNET_MASK); + if (li.iItem >= 0) + if (MultiByteToWideChar(CP_ACP, 0, pCurAdapter->IpAddressList.IpMask.String, -1, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) + SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); + + 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))) + SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); + +#if 0 + li.iItem = InsertItemToListView(hDlgCtrl, IDS_LEASE_OBTAINED); + li.iItem = InsertItemToListView(hDlgCtrl, IDS_LEASE_EXPIRES); +#endif + } + + dwSize = 0; + if (GetPerAdapterInfo(pContext->dwAdapterIndex, NULL, &dwSize) == ERROR_BUFFER_OVERFLOW) + { + pPerAdapter = (PIP_PER_ADAPTER_INFO)CoTaskMemAlloc(dwSize); + if (pPerAdapter) + { + if (GetPerAdapterInfo(pContext->dwAdapterIndex, pPerAdapter, &dwSize) == ERROR_SUCCESS) + { + li.iItem = InsertItemToListView(hDlgCtrl, IDS_DNS_SERVERS); + if (li.iItem >= 0) + AddIPAddressToListView(hDlgCtrl, &pPerAdapter->DnsServerList, li.iItem); + } + CoTaskMemFree(pPerAdapter); + } + } +#if 0 + if (pCurAdapter) + { + li.iItem = InsertItemToListView(hDlgCtrl, IDS_WINS_SERVERS); + AddIPAddressToListView(hDlgCtrl, &pCurAdapter->PrimaryWinsServer, li.iItem); + AddIPAddressToListView(hDlgCtrl, &pCurAdapter->SecondaryWinsServer, li.iItem+1); + } +#endif + CoTaskMemFree(pAdapterInfo); + break; + } + return FALSE; +} + INT_PTR CALLBACK LANStatusUiAdvancedDlg( @@ -334,8 +527,18 @@ THIRD_IPADDRESS(dwIpAddr), FOURTH_IPADDRESS(dwIpAddr)); SendDlgItemMessageW(hwndDlg, IDC_DETAILSGATEWAY, WM_SETTEXT, 0, (LPARAM)szBuffer); - return TRUE; + case WM_COMMAND: + if (LOWORD(wParam) == IDC_DETAILS) + { + pContext = (LANSTATUSUI_CONTEXT*)GetWindowLongPtr(hwndDlg, DWLP_USER); + if (pContext) + { + DialogBoxParamW(netshell_hInstance, MAKEINTRESOURCEW(IDD_LAN_NETSTATUSDETAILS), GetParent(hwndDlg), + LANStatusUiDetailsDlg, (LPARAM)pContext); + } + } + break; default: break; } Modified: trunk/reactos/dll/win32/netshell/netshell.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.rc [iso-8859-1] Wed Oct 22 12:46:55 2008 @@ -3,7 +3,6 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Shell for Network Connections\0" Modified: trunk/reactos/dll/win32/netshell/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/resourc… ============================================================================== --- trunk/reactos/dll/win32/netshell/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/resource.h [iso-8859-1] Wed Oct 22 12:46:55 2008 @@ -17,12 +17,12 @@ #define IDD_LAN_NETSTATUS 401 #define IDD_STATUS 402 #define IDD_LAN_NETSTATUSADVANCED 403 - +#define IDD_LAN_NETSTATUSDETAILS 404 /* dialog controls */ #define IDC_NETCARDNAME 1000 #define IDC_CONFIGURE 1001 -#define IDC_COMPONENTSLIST 2800 +#define IDC_COMPONENTSLIST 1002 #define IDC_INSTALL 1003 #define IDC_UNINSTALL 1004 #define IDC_PROPERTIES 1005 @@ -45,6 +45,7 @@ #define IDC_DETAILSGATEWAY 1203 #define IDC_DETAILS 1204 +#define IDC_CLOSE 1300 /* resource constants */ @@ -81,3 +82,15 @@ #define IDS_ASSIGNED_DHCP 10206 #define IDS_ASSIGNED_MANUAL 10207 +#define IDS_PHYSICAL_ADDRESS 10300 +#define IDS_IP_ADDRESS 10301 +#define IDS_SUBNET_MASK 10302 +#define IDS_DEF_GATEWAY 10303 +#define IDS_DHCP_SERVER 10304 +#define IDS_LEASE_OBTAINED 10305 +#define IDS_LEASE_EXPIRES 10306 +#define IDS_DNS_SERVERS 10307 +#define IDS_WINS_SERVERS 10308 +#define IDS_PROPERTY 10309 +#define IDS_VALUE 10310 +

1 0

[sginsberg] 36894: - Notify umpnpmgr about logon after the shell has initialized - This makes it possible to progress if userinit crashes due to heavy debug output (due to timing issues in its communication with umpnpmgr), which would leave you stranded with no shell. Not really a hack, as it doesn't hide or fix the crash -- just limits it to a missing "Pending device installations" prompt in case there are any pending. Also, it appears to be done the same way on Windows.
by sginsberg＠svn.reactos.org 22 Oct '08

22 Oct '08

Author: sginsberg Date: Wed Oct 22 08:59:01 2008 New Revision: 36894 URL: http://svn.reactos.org/svn/reactos?rev=36894&view=rev Log: - Notify umpnpmgr about logon after the shell has initialized - This makes it possible to progress if userinit crashes due to heavy debug output (due to timing issues in its communication with umpnpmgr), which would leave you stranded with no shell. Not really a hack, as it doesn't hide or fix the crash -- just limits it to a missing "Pending device installations" prompt in case there are any pending. Also, it appears to be done the same way on Windows. Modified: trunk/reactos/base/system/userinit/userinit.c Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Wed Oct 22 08:59:01 2008 @@ -580,9 +580,9 @@ IN LPWSTR lpszCmdLine, IN int nCmdShow) { - NotifyLogon(); SetUserSettings(); StartShell(); + NotifyLogon(); return 0; }

1 0

[sginsberg] 36893: - Fix an assertion by casting to internal structures correctly
by sginsberg＠svn.reactos.org 22 Oct '08

22 Oct '08

Author: sginsberg Date: Wed Oct 22 08:24:01 2008 New Revision: 36893 URL: http://svn.reactos.org/svn/reactos?rev=36893&view=rev Log: - Fix an assertion by casting to internal structures correctly Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Wed Oct 22 08:24:01 2008 @@ -86,8 +86,8 @@ KeSetSystemAffinityThread(1); /* Make sure there's space for two IOPMs, then copy & clear the current */ - //ASSERT(((PKGDTENTRY)&KeGetPcr()->GDT[KGDT_TSS / 8])->LimitLow >= - // (0x2000 + IOPM_OFFSET - 1)); + ASSERT(((PKIPCR)KeGetPcr())->GDT[KGDT_TSS / 8].LimitLow >= + (0x2000 + IOPM_OFFSET - 1)); RtlCopyMemory(Ki386IopmSaveArea, &Tss->IoMaps[0].IoMap, PAGE_SIZE * 2); RtlZeroMemory(&Tss->IoMaps[0].IoMap, PAGE_SIZE * 2);

1 0

[janderwald] 36892: - Convert the string using the WideCharToMultiByte function and fix passed parameters - Always zero-terminate the converted buffer - Remove querying NameServer / DhcpNameServer under Parameters key because it is not used and was not working - Initialize PrivateNSEnum CurrentName member - Make sure that only successfully converted NameServer get copied
by janderwald＠svn.reactos.org 22 Oct '08

22 Oct '08

Author: janderwald Date: Wed Oct 22 06:37:33 2008 New Revision: 36892 URL: http://svn.reactos.org/svn/reactos?rev=36892&view=rev Log: - Convert the string using the WideCharToMultiByte function and fix passed parameters - Always zero-terminate the converted buffer - Remove querying NameServer / DhcpNameServer under Parameters key because it is not used and was not working - Initialize PrivateNSEnum CurrentName member - Make sure that only successfully converted NameServer get copied Modified: trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c 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] Wed Oct 22 06:37:33 2008 @@ -181,12 +181,18 @@ PWCHAR Server, PVOID _Data ) { PNAME_SERVER_LIST_PRIVATE Data = (PNAME_SERVER_LIST_PRIVATE)_Data; - RtlUnicodeToMultiByteN((PCHAR)&Data->AddrString[Data->CurrentName], - sizeof(Data->AddrString[0]), - NULL, - Server, - wcslen(Server)); - Data->CurrentName++; + + 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'; + } } static void CreateNameServerListEnumIfFunc( HKEY RegHandle, @@ -207,43 +213,19 @@ } PIPHLP_RES_INFO getResInfo() { - DWORD i, ServerCount, ExtraServer; - HKEY hKey; - LONG errCode; - PWCHAR Str; - IP_ADDR_STRING AddrString; + DWORD i, ServerCount; NAME_SERVER_LIST_PRIVATE PrivateNSEnum = { 0 }; PIPHLP_RES_INFO ResInfo; struct sockaddr_in *AddrList; ServerCount = CountNameServers( &PrivateNSEnum ); - - errCode = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\" - "Parameters", 0, KEY_READ, &hKey); - if (errCode != ERROR_SUCCESS) { - RegCloseKey( hKey ); - return NULL; - } - - Str = QueryRegistryValueString( hKey, L"NameServer" ); - - /* If NameServer is empty */ - if (!Str || *Str == L'\0') - { - /* Then use DhcpNameServer */ - Str = QueryRegistryValueString( hKey, L"DhcpNameServer" ); - } - - ExtraServer = Str ? 1 : 0; - - ServerCount += ExtraServer; PrivateNSEnum.NumServers = ServerCount; PrivateNSEnum.AddrString = (PIP_ADDRESS_STRING) RtlAllocateHeap( GetProcessHeap(), 0, ServerCount * sizeof(IP_ADDRESS_STRING) ); + PrivateNSEnum.CurrentName = 0; ResInfo = (PIPHLP_RES_INFO)RtlAllocateHeap @@ -253,7 +235,6 @@ if( !ResInfo ) { RtlFreeHeap( GetProcessHeap(), 0, PrivateNSEnum.AddrString ); - RegCloseKey( hKey ); return NULL; } @@ -264,30 +245,15 @@ MakeNameServerList( &PrivateNSEnum ); - if( ExtraServer ) { - ULONG ResultSize; - - for( ResultSize = 0; Str[ResultSize]; ResultSize++ ) - ((PCHAR)&AddrString)[ResultSize] = Str[ResultSize]; - - ((PCHAR)&AddrString)[ResultSize] = 0; - ResInfo->riAddressList[0].sin_family = AF_INET; - ResInfo->riAddressList[0].sin_addr.s_addr = - inet_addr( (PCHAR)&AddrString ); - ResInfo->riAddressList[0].sin_port = 0; - ConsumeRegValueString( Str ); - } - - for( i = ExtraServer; i < ServerCount; i++ ) { + 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( (PCHAR)&PrivateNSEnum.AddrString[i - ExtraServer] ); + inet_addr(PrivateNSEnum.AddrString[i].String ); ResInfo->riAddressList[i].sin_port = 0; } RtlFreeHeap( GetProcessHeap(), 0, PrivateNSEnum.AddrString ); - RegCloseKey( hKey ); return ResInfo; }

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2008