Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 29224: Display adapter information
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Thu Sep 27 01:19:54 2007 New Revision: 29224 URL: http://svn.reactos.org/svn/reactos?rev=29224&view=rev Log: Display adapter information Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc trunk/reactos/dll/win32/shellext/deskadp/resource.h Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.c (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Thu Sep 27 01:19:54 2007 @@ -51,6 +51,25 @@ LocalFree((HLOCAL)lpAdapterName); } + + if (This->DeskExtInterface != NULL) + { + SetDlgItemTextW(This->hwndDlg, + IDC_CHIPTYPE, + This->DeskExtInterface->ChipType); + SetDlgItemTextW(This->hwndDlg, + IDC_DACTYPE, + This->DeskExtInterface->DacType); + SetDlgItemTextW(This->hwndDlg, + IDC_MEMORYSIZE, + This->DeskExtInterface->MemorySize); + SetDlgItemTextW(This->hwndDlg, + IDC_ADAPTERSTRING, + This->DeskExtInterface->AdapterString); + SetDlgItemTextW(This->hwndDlg, + IDC_BIOSINFORMATION, + This->DeskExtInterface->BiosString); + } } static INT_PTR CALLBACK Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc Thu Sep 27 01:19:54 2007 @@ -8,5 +8,16 @@ GROUPBOX "Adapter Type", -1, 7, 3, 237, 50 LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20 PUSHBUTTON "&Properties", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 + GROUPBOX "Adapter Information", -1, 7, 56, 237, 75 + LTEXT "Chip Type:", -1, 13, 68, 58, 8 + LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8 + LTEXT "DAC Type:", -1, 13, 80, 58, 8 + LTEXT "", IDC_DACTYPE, 71, 80, 160, 8 + LTEXT "Memory Size:", -1, 13, 92, 58, 8 + LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8 + LTEXT "Adapter String:", -1, 13, 104, 58, 8 + LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8 + LTEXT "BIOS Information:", -1, 13, 116, 58, 8 + LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8 END Modified: trunk/reactos/dll/win32/shellext/deskadp/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/resource.h (original) +++ trunk/reactos/dll/win32/shellext/deskadp/resource.h Thu Sep 27 01:19:54 2007 @@ -4,6 +4,11 @@ #define IDD_DISPLAYADAPTER 100 #define IDC_ADAPTERNAME 201 -#define IDC_ADAPTERPROPERTIES 201 +#define IDC_ADAPTERPROPERTIES 202 +#define IDC_CHIPTYPE 203 +#define IDC_DACTYPE 204 +#define IDC_MEMORYSIZE 205 +#define IDC_ADAPTERSTRING 206 +#define IDC_BIOSINFORMATION 207 #endif /* __RESOURCE__H */

1 0

[fireball] 29223: - PS_UNKNOWN_VALUE determines if the process should be created with large pages: rename to PS_LARGE_PAGES - Do Address Space initialization as per "Windows Internals II" slides, either for the Boot, System, Cloned User or New User Process cases. - Rename MmCreateProcessAddressSpace to MmInitializeProcessAddressSpace, and MmCopyMmInfo to MmCreateProcessAddressSpace. What ReactOS did is correct as per "Windows Internals II", but the names were inverted. - Clone the Object Table i
by fireball＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: fireball Date: Thu Sep 27 00:55:26 2007 New Revision: 29223 URL: http://svn.reactos.org/svn/reactos?rev=29223&view=rev Log: - PS_UNKNOWN_VALUE determines if the process should be created with large pages: rename to PS_LARGE_PAGES - Do Address Space initialization as per "Windows Internals II" slides, either for the Boot, System, Cloned User or New User Process cases. - Rename MmCreateProcessAddressSpace to MmInitializeProcessAddressSpace, and MmCopyMmInfo to MmCreateProcessAddressSpace. What ReactOS did is correct as per "Windows Internals II", but the names were inverted. - Clone the Object Table if we are the boot process, and only initialize part of the address space (since we don't need things like guard page, TEB, etc), however, do initialize and map the shared user data section. - Make the initial system process and idle process share the same page directory instead of creating a new one. - Use the same priority class as the parent process, if the process was in the idle or below-normal priority class. - Only duplicate handles if the caller requested it, instead of always duplicating the process's handles! - Generate a null image file name for system processes. - Rename ObpCreateHandleTable to ObInitProcess and better handle race and out-of-memory conditions. Detect if auditing required, but don't do anything about it. - Initialize the Idle/System process address space much earlier in the boot process, in MmInitSystem. Thanks to Alex for providing various information, and answering all my questions. Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Thu Sep 27 00:55:26 2007 @@ -85,11 +85,11 @@ #define PS_REQUEST_BREAKAWAY 1 #define PS_NO_DEBUG_INHERIT 2 #define PS_INHERIT_HANDLES 4 -#define PS_UNKNOWN_VALUE 8 +#define PS_LARGE_PAGES 8 #define PS_ALL_FLAGS (PS_REQUEST_BREAKAWAY | \ PS_NO_DEBUG_INHERIT | \ PS_INHERIT_HANDLES | \ - PS_UNKNOWN_VALUE) + PS_LARGE_PAGES) // // Process base priorities Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Thu Sep 27 00:55:26 2007 @@ -612,9 +612,9 @@ NTSTATUS NTAPI -MmCreateProcessAddressSpace( +MmInitializeProcessAddressSpace( IN PEPROCESS Process, - IN PROS_SECTION_OBJECT Section OPTIONAL, + IN PVOID Section OPTIONAL, IN POBJECT_NAME_INFORMATION *AuditName OPTIONAL ); @@ -1189,12 +1189,26 @@ PVOID Address ); -NTSTATUS -NTAPI -MmCopyMmInfo( - struct _EPROCESS *Src, - struct _EPROCESS *Dest, - PPHYSICAL_ADDRESS DirectoryTableBase +BOOLEAN +NTAPI +MmCreateProcessAddressSpace( + IN ULONG MinWs, + IN PEPROCESS Dest, + IN PLARGE_INTEGER DirectoryTableBase +); + +NTSTATUS +NTAPI +MmInitializeHandBuiltProcess( + IN PEPROCESS Process, + IN PLARGE_INTEGER DirectoryTableBase +); + + +NTSTATUS +NTAPI +MmInitializeHandBuiltProcess2( + IN PEPROCESS Process ); NTSTATUS Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Thu Sep 27 00:55:26 2007 @@ -191,8 +191,8 @@ // NTSTATUS NTAPI -ObpCreateHandleTable( - IN PEPROCESS Parent, +ObInitProcess( + IN PEPROCESS Parent OPTIONAL, IN PEPROCESS Process ); Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c Thu Sep 27 00:55:26 2007 @@ -325,17 +325,33 @@ } NTSTATUS +NTAPI +MmInitializeHandBuiltProcess(IN PEPROCESS Process, + IN PLARGE_INTEGER DirectoryTableBase) +{ + /* Share the directory base with the idle process */ + *DirectoryTableBase = PsGetCurrentProcess()->Pcb.DirectoryTableBase; + + /* Initialize the Addresss Space */ + MmInitializeAddressSpace(Process, (PMADDRESS_SPACE)&Process->VadRoot); + + /* The process now has an address space */ + Process->HasAddressSpace = TRUE; + return STATUS_SUCCESS; +} + +BOOLEAN STDCALL -MmCopyMmInfo(PEPROCESS Src, - PEPROCESS Dest, - PPHYSICAL_ADDRESS DirectoryTableBase) +MmCreateProcessAddressSpace(IN ULONG MinWs, + IN PEPROCESS Process, + IN PLARGE_INTEGER DirectoryTableBase) { NTSTATUS Status; ULONG i, j; PFN_TYPE Pfn[7]; ULONG Count; - DPRINT("MmCopyMmInfo(Src %x, Dest %x)\n", Src, Dest); + DPRINT("MmCopyMmInfo(Src %x, Dest %x)\n", MinWs, Process); Count = Ke386Pae ? 7 : 2; @@ -344,11 +360,12 @@ Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, &Pfn[i]); if (!NT_SUCCESS(Status)) { - for (j = 0; j < i; j++) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn[j]); - } - return Status; + for (j = 0; j < i; j++) + { + MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn[j]); + } + + return FALSE; } } @@ -400,7 +417,7 @@ DirectoryTableBase->QuadPart = PFN_TO_PTE(Pfn[0]); DPRINT("Finished MmCopyMmInfo(): %I64x\n", DirectoryTableBase->QuadPart); - return(STATUS_SUCCESS); + return TRUE; } VOID Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Thu Sep 27 00:55:26 2007 @@ -432,6 +432,9 @@ /* Initialize the Loader Lock */ KeInitializeMutant(&MmSystemLoadLock, FALSE); + /* Initialize the address space for the system process */ + MmInitializeProcessAddressSpace(PsGetCurrentProcess(), NULL, NULL); + /* Reload boot drivers */ MiReloadBootLoadedDrivers(LoaderBlock); Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c Thu Sep 27 00:55:26 2007 @@ -471,10 +471,34 @@ } NTSTATUS -STDCALL -MmCreateProcessAddressSpace(IN PEPROCESS Process, - IN PROS_SECTION_OBJECT Section OPTIONAL, - IN POBJECT_NAME_INFORMATION *AuditName OPTIONAL) +NTAPI +MmInitializeHandBuiltProcess2(IN PEPROCESS Process) +{ + PVOID BaseAddress; + PMEMORY_AREA MemoryArea; + PHYSICAL_ADDRESS BoundaryAddressMultiple; + NTSTATUS Status; + PMADDRESS_SPACE ProcessAddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; + + /* Create the shared data page */ + BaseAddress = (PVOID)USER_SHARED_DATA; + Status = MmCreateMemoryArea(ProcessAddressSpace, + MEMORY_AREA_SHARED_DATA, + &BaseAddress, + PAGE_SIZE, + PAGE_EXECUTE_READ, + &MemoryArea, + FALSE, + 0, + BoundaryAddressMultiple); + return Status; +} + +NTSTATUS +NTAPI +MmInitializeProcessAddressSpace(IN PEPROCESS Process, + IN PVOID Section OPTIONAL, + IN POBJECT_NAME_INFORMATION *AuditName OPTIONAL) { NTSTATUS Status; PMADDRESS_SPACE ProcessAddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; @@ -483,6 +507,7 @@ PHYSICAL_ADDRESS BoundaryAddressMultiple; SIZE_T ViewSize = 0; PVOID ImageBase = 0; + PROS_SECTION_OBJECT SectionObject = Section; BoundaryAddressMultiple.QuadPart = 0; /* Initialize the Addresss Space */ @@ -546,7 +571,7 @@ Process->HasAddressSpace = TRUE; /* Check if there's a Section Object */ - if (Section) + if (SectionObject) { UNICODE_STRING FileName; PWCHAR szSrc; @@ -558,7 +583,7 @@ MmUnlockAddressSpace(ProcessAddressSpace); DPRINT("Mapping process image. Section: %p, Process: %p, ImageBase: %p\n", - Section, Process, &ImageBase); + SectionObject, Process, &ImageBase); Status = MmMapViewOfSection(Section, (PEPROCESS)Process, (PVOID*)&ImageBase, @@ -580,7 +605,7 @@ /* Determine the image file name and save it to EPROCESS */ DPRINT("Getting Image name\n"); - FileName = Section->FileObject->FileName; + FileName = SectionObject->FileObject->FileName; szSrc = (PWCHAR)(FileName.Buffer + FileName.Length); while (szSrc >= FileName.Buffer) { @@ -608,7 +633,7 @@ if (AuditName) { /* Setup the audit name */ - SeInitializeProcessAuditName(Section->FileObject, + SeInitializeProcessAuditName(SectionObject->FileObject, FALSE, AuditName); } Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Sep 27 00:55:26 2007 @@ -1956,40 +1956,57 @@ *--*/ NTSTATUS NTAPI -ObpCreateHandleTable(IN PEPROCESS Parent, - IN PEPROCESS Process) +ObInitProcess(IN PEPROCESS Parent OPTIONAL, + IN PEPROCESS Process) { - PHANDLE_TABLE HandleTable; - PAGED_CODE(); - - /* Check if we have a parent */ + PHANDLE_TABLE ParentTable, ObjectTable; + + /* Check for a parent */ if (Parent) { - /* Get the parent's table */ - HandleTable = ObReferenceProcessHandleTable(Parent); - if (!HandleTable) return STATUS_PROCESS_IS_TERMINATING; - - /* Duplicate the parent's */ - HandleTable = ExDupHandleTable(Process, - HandleTable, + /* Reference the parent's table */ + ParentTable = ObReferenceProcessHandleTable(Parent); + if (!ParentTable) return STATUS_PROCESS_IS_TERMINATING; + + /* Duplicate it */ + ObjectTable = ExDupHandleTable(Process, + ParentTable, ObpDuplicateHandleCallback, OBJ_INHERIT); } else { - /* Create a new one */ - HandleTable = ExCreateHandleTable(Process); - } - - /* Now write it */ - Process->ObjectTable = HandleTable; - - /* Dereference the parent's handle table if we have one */ - if (Parent) ObDereferenceProcessHandleTable(Parent); - - /* Fail or succeed depending on whether we got a handle table or not */ - if (!HandleTable) return STATUS_INSUFFICIENT_RESOURCES; - return STATUS_SUCCESS; + /* Otherwise just create a new table */ + ParentTable = NULL; + ObjectTable = ExCreateHandleTable(Process); + } + + /* Make sure we have a table */ + if (ObjectTable) + { + /* Associate it */ + Process->ObjectTable = ObjectTable; + + /* Check for auditing */ + if (SeDetailedAuditingWithToken(NULL)) + { + /* FIXME: TODO */ + DPRINT1("Need auditing!\n"); + } + + /* Get rid of the old table now */ + if (ParentTable) ObDereferenceProcessHandleTable(Parent); + + /* We are done */ + return STATUS_SUCCESS; + } + else + { + /* Fail */ + Process->ObjectTable = NULL; + if (ParentTable) ObDereferenceProcessHandleTable(Parent); + return STATUS_INSUFFICIENT_RESOURCES; + } } /*++ Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Thu Sep 27 00:55:26 2007 @@ -555,15 +555,28 @@ /* Set default exit code */ Process->ExitStatus = STATUS_TIMEOUT; - - /* Create or Clone the Handle Table */ - ObpCreateHandleTable(Parent, Process); - - /* Set Process's Directory Base */ - MmCopyMmInfo(Parent ? Parent : PsInitialSystemProcess, - Process, - &DirectoryTableBase); - + + /* Check if this is the initial process being built */ + if (Parent) + { + /* Create the address space for the child */ + if (!MmCreateProcessAddressSpace(MinWs, + Process, + &DirectoryTableBase)) + { + /* Failed */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto CleanupWithRef; + } + } + else + { + /* Otherwise, we are the boot process, we're already semi-initialized */ + Process->ObjectTable = CurrentProcess->ObjectTable; + Status = MmInitializeHandBuiltProcess(Process, &DirectoryTableBase); + if (!NT_SUCCESS(Status)) goto CleanupWithRef; + } + /* We now have an address space */ InterlockedOr((PLONG)&Process->Flags, PSF_HAS_ADDRESS_SPACE_BIT); @@ -583,14 +596,81 @@ /* Set default priority class */ Process->PriorityClass = PROCESS_PRIORITY_CLASS_NORMAL; - - /* Create the Process' Address Space */ - Status = MmCreateProcessAddressSpace(Process, - (PROS_SECTION_OBJECT)SectionObject, - &Process->SeAuditProcessCreationInfo. - ImageFileName); - if (!NT_SUCCESS(Status)) goto CleanupWithRef; - + + /* Check if we have a parent */ + if (Parent) + { + /* Check our priority class */ + if (Parent->PriorityClass == PROCESS_PRIORITY_CLASS_IDLE || + Parent->PriorityClass == PROCESS_PRIORITY_CLASS_BELOW_NORMAL) + { + /* Normalize it */ + Process->PriorityClass = Parent->PriorityClass; + } + + /* Initialize object manager for the process */ + Status = ObInitProcess(Flags & PS_INHERIT_HANDLES ? Parent : NULL, + Process); + if (!NT_SUCCESS(Status)) goto CleanupWithRef; + } + else + { + /* Do the second part of the boot process memory setup */ + Status = MmInitializeHandBuiltProcess2(Process); + if (!NT_SUCCESS(Status)) goto CleanupWithRef; + } + + /* Set success for now */ + Status = STATUS_SUCCESS; + + /* Check if this is a real user-mode process */ + if (SectionHandle) + { + /* Initialize the address space */ + Status = MmInitializeProcessAddressSpace(Process, + SectionObject, + &Process-> + SeAuditProcessCreationInfo. + ImageFileName); + if (!NT_SUCCESS(Status)) goto CleanupWithRef; + } + else if (Parent) + { + /* Check if this is a child of the system process */ + if (Parent != PsInitialSystemProcess) + { + /* This is a clone! */ + ASSERTMSG("No support for cloning yet\n", FALSE); + } + else + { + /* This is a system process other than the boot one (MmInit1) */ + Flags &= ~PS_LARGE_PAGES; + Status = MmInitializeProcessAddressSpace(Process, + NULL, + &Process-> + SeAuditProcessCreationInfo. + ImageFileName); + if (!NT_SUCCESS(Status)) goto CleanupWithRef; + + /* Create a dummy image file name */ + Process->SeAuditProcessCreationInfo.ImageFileName = + ExAllocatePoolWithTag(PagedPool, + sizeof(OBJECT_NAME_INFORMATION), + TAG('S', 'e', 'P', 'a')); + if (!Process->SeAuditProcessCreationInfo.ImageFileName) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto CleanupWithRef; + } + + /* Zero it out */ + RtlZeroMemory(Process->SeAuditProcessCreationInfo.ImageFileName, + sizeof(OBJECT_NAME_INFORMATION)); + } + } + /* Check if we have a section object and map the system DLL */ if (SectionObject) PspMapSystemDll(Process, NULL, FALSE);

1 0

[dreimer] 29222: Another german rc file update
by dreimer＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: dreimer Date: Thu Sep 27 00:49:06 2007 New Revision: 29222 URL: http://svn.reactos.org/svn/reactos?rev=29222&view=rev Log: Another german rc file update Modified: trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc Thu Sep 27 00:49:06 2007 @@ -122,13 +122,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Property sheet kann nicht erstellt werden" IDS_OUT_OF_MEMORY "Nicht genug Arbeitsspeicher" IDS_CANNOT_SAVE_CHANGES "Änderungen können nicht gespeichert werden" - IDS_STATUS_NON_OPERATIONAL "Non-operational" - IDS_STATUS_UNREACHABLE "No WAN adapter found" - IDS_STATUS_DISCONNECTED "Disconnected" - IDS_STATUS_CONNECTING "Connecting" - IDS_STATUS_CONNECTED "Connected" - IDS_STATUS_OPERATIONAL "Connected" + IDS_STATUS_NON_OPERATIONAL "Nicht operational" + IDS_STATUS_UNREACHABLE "Kein WAN Adapter gefunden" + IDS_STATUS_DISCONNECTED "Nicht Verbunden" + IDS_STATUS_CONNECTING "Verbinde" + IDS_STATUS_CONNECTED "Verbunden" + IDS_STATUS_OPERATIONAL "Verbunden" IDS_SPEED_MBPS "%d Mbps" - IDS_DURATION_DAY "%d day %s" - IDS_DURATION_DAYS "%d days %s" + IDS_DURATION_DAY "%d Tag %s" + IDS_DURATION_DAYS "%d Tage %s" END

1 0

[weiden] 29221: Display the display device adapter name and show device properties
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Thu Sep 27 00:41:57 2007 New Revision: 29221 URL: http://svn.reactos.org/svn/reactos?rev=29221&view=rev Log: Display the display device adapter name and show device properties Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c trunk/reactos/dll/win32/shellext/deskadp/deskadp.h trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc trunk/reactos/dll/win32/shellext/deskadp/precomp.h trunk/reactos/dll/win32/shellext/deskadp/resource.h Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.c (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Thu Sep 27 00:41:57 2007 @@ -4,6 +4,54 @@ #include <debug.h> static HINSTANCE hInstance; + +typedef INT_PTR (WINAPI *PDEVICEPROPERTIESEXW)(HWND,LPCWSTR,LPCWSTR,DWORD,BOOL); + +static VOID +ShowAdapterProperties(PDESKDISPLAYADAPTER This) +{ + HMODULE hDevMgr; + PDEVICEPROPERTIESEXW pDevicePropertiesExW; + + hDevMgr = LoadLibrary(TEXT("devmgr.dll")); + if (hDevMgr != NULL) + { + pDevicePropertiesExW = (PDEVICEPROPERTIESEXW)GetProcAddress(hDevMgr, + "DevicePropertiesExW"); + if (pDevicePropertiesExW != NULL) + { + pDevicePropertiesExW(This->hwndDlg, + NULL, + This->lpDeviceId, + 0, + FALSE); + } + + FreeLibrary(hDevMgr); + } +} + +static VOID +InitDisplayAdapterDialog(PDESKDISPLAYADAPTER This) +{ + LPTSTR lpAdapterName; + + This->lpDeviceId = QueryDeskCplString(This->pdtobj, + RegisterClipboardFormat(DESK_EXT_DISPLAYID)); + EnableWindow(GetDlgItem(This->hwndDlg, + IDC_ADAPTERPROPERTIES), + This->lpDeviceId != NULL && This->lpDeviceId[0] != TEXT('\0')); + lpAdapterName = QueryDeskCplString(This->pdtobj, + RegisterClipboardFormat(DESK_EXT_DISPLAYNAME)); + if (lpAdapterName != NULL) + { + SetDlgItemText(This->hwndDlg, + IDC_ADAPTERNAME, + lpAdapterName); + + LocalFree((HLOCAL)lpAdapterName); + } +} static INT_PTR CALLBACK DisplayAdapterDlgProc(HWND hwndDlg, @@ -24,12 +72,24 @@ { case WM_INITDIALOG: This = (PDESKDISPLAYADAPTER)((LPCPROPSHEETPAGE)lParam)->lParam; + This->hwndDlg = hwndDlg; SetWindowLongPtr(hwndDlg, DWL_USER, (LONG_PTR)This); + InitDisplayAdapterDialog(This); Ret = TRUE; break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_ADAPTERPROPERTIES: + ShowAdapterProperties(This); + break; + } + + break; } return Ret; @@ -48,6 +108,12 @@ { LocalFree((HLOCAL)This->DeskExtInterface); This->DeskExtInterface = NULL; + } + + if (This->lpDeviceId != NULL) + { + LocalFree((HLOCAL)This->lpDeviceId); + This->lpDeviceId = NULL; } } Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.h (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.h Thu Sep 27 00:41:57 2007 @@ -8,8 +8,10 @@ const struct IClassFactoryVtbl *lpIClassFactoryVtbl; DWORD ref; + HWND hwndDlg; PDESK_EXT_INTERFACE DeskExtInterface; IDataObject *pdtobj; + LPTSTR lpDeviceId; } DESKDISPLAYADAPTER, *PDESKDISPLAYADAPTER; extern LONG dll_refs; Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc Thu Sep 27 00:41:57 2007 @@ -5,6 +5,8 @@ CAPTION "Adapter" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - + GROUPBOX "Adapter Type", -1, 7, 3, 237, 50 + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20 + PUSHBUTTON "&Properties", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 END Modified: trunk/reactos/dll/win32/shellext/deskadp/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/precomp.h (original) +++ trunk/reactos/dll/win32/shellext/deskadp/precomp.h Thu Sep 27 00:41:57 2007 @@ -3,6 +3,7 @@ #define COBJMACROS #include <windows.h> +#include <tchar.h> #include <shlobj.h> #include <dll/desk/deskcplx.h> #include "deskadp.h" Modified: trunk/reactos/dll/win32/shellext/deskadp/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/resource.h (original) +++ trunk/reactos/dll/win32/shellext/deskadp/resource.h Thu Sep 27 00:41:57 2007 @@ -3,4 +3,7 @@ #define IDD_DISPLAYADAPTER 100 +#define IDC_ADAPTERNAME 201 +#define IDC_ADAPTERPROPERTIES 201 + #endif /* __RESOURCE__H */

1 0

[gedmurphy] 29220: - add missing net card interface info to ipifcons.h - follow on patch from Gregor Brunmar <gregor.brunmar - home - se>
by gedmurphy＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: gedmurphy Date: Thu Sep 27 00:36:28 2007 New Revision: 29220 URL: http://svn.reactos.org/svn/reactos?rev=29220&view=rev Log: - add missing net card interface info to ipifcons.h - follow on patch from Gregor Brunmar <gregor.brunmar - home - se> Modified: trunk/reactos/include/psdk/ipifcons.h Modified: trunk/reactos/include/psdk/ipifcons.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ipifcons.h?re… ============================================================================== --- trunk/reactos/include/psdk/ipifcons.h (original) +++ trunk/reactos/include/psdk/ipifcons.h Thu Sep 27 00:36:28 2007 @@ -3,6 +3,16 @@ #if __GNUC__ >=3 #pragma GCC system_header #endif + +#define IF_ADMIN_STATUS_UP 1 +#define IF_ADMIN_STATUS_DOWN 2 +#define IF_ADMIN_STATUS_TESTING 3 +#define IF_OPER_STATUS_NON_OPERATIONAL 0 +#define IF_OPER_STATUS_UNREACHABLE 1 +#define IF_OPER_STATUS_DISCONNECTED 2 +#define IF_OPER_STATUS_CONNECTING 3 +#define IF_OPER_STATUS_CONNECTED 4 +#define IF_OPER_STATUS_OPERATIONAL 5 #define MIB_IF_ADMIN_STATUS_UP 1 #define MIB_IF_ADMIN_STATUS_DOWN 2

1 0

[gedmurphy] 29219: - generate the netcard status information and populate the dialog with it - patch by Gregor Brunmar <gregor.brunmar - home - se>
by gedmurphy＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: gedmurphy Date: Thu Sep 27 00:34:08 2007 New Revision: 29219 URL: http://svn.reactos.org/svn/reactos?rev=29219&view=rev Log: - generate the netcard status information and populate the dialog with it - patch by Gregor Brunmar <gregor.brunmar - home - se> Modified: trunk/reactos/dll/cpl/ncpa/lang/bg-BG.rc trunk/reactos/dll/cpl/ncpa/lang/cs-CZ.rc trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc trunk/reactos/dll/cpl/ncpa/lang/en-US.rc trunk/reactos/dll/cpl/ncpa/lang/es-ES.rc trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc trunk/reactos/dll/cpl/ncpa/lang/id-ID.rc trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc trunk/reactos/dll/cpl/ncpa/lang/ja-JP.rc trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc trunk/reactos/dll/cpl/ncpa/lang/nl-NL.rc trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc trunk/reactos/dll/cpl/ncpa/lang/sv-SE.rc trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc trunk/reactos/dll/cpl/ncpa/ncpa.c trunk/reactos/dll/cpl/ncpa/ncpa.h trunk/reactos/dll/cpl/ncpa/resource.h Modified: trunk/reactos/dll/cpl/ncpa/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/bg-BG.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/bg-BG.rc Thu Sep 27 00:34:08 2007 @@ -52,6 +52,9 @@ RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 PUSHBUTTON "&Ñâîéñòâà", IDC_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Èçêëþ÷âàíå", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 @@ -119,4 +122,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet" IDS_OUT_OF_MEMORY "Íåäîñòèã íà ïàìåò" IDS_CANNOT_SAVE_CHANGES "Ñúõðàíÿâàíåòî íà íàïðàâåíèòå îò âàñ íàñòðîéêè å íåâúçìîæíî" + IDS_STATUS_NON_OPERATIONAL "Non-operational" + IDS_STATUS_UNREACHABLE "No WAN adapter found" + IDS_STATUS_DISCONNECTED "Disconnected" + IDS_STATUS_CONNECTING "Connecting" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + IDS_SPEED_MBPS "%d Mbps" + IDS_DURATION_DAY "%d day %s" + IDS_DURATION_DAYS "%d days %s" END Modified: trunk/reactos/dll/cpl/ncpa/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/cs-CZ.rc Thu Sep 27 00:34:08 2007 @@ -52,6 +52,9 @@ RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 PUSHBUTTON "&Vlastnosti", IDC_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Zakázat", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 @@ -120,4 +123,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet" IDS_OUT_OF_MEMORY "Out of memory" IDS_CANNOT_SAVE_CHANGES "Unable to save the changes you made" + IDS_STATUS_NON_OPERATIONAL "Non-operational" + IDS_STATUS_UNREACHABLE "No WAN adapter found" + IDS_STATUS_DISCONNECTED "Disconnected" + IDS_STATUS_CONNECTING "Connecting" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + IDS_SPEED_MBPS "%d Mbps" + IDS_DURATION_DAY "%d day %s" + IDS_DURATION_DAYS "%d days %s" END Modified: trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc Thu Sep 27 00:34:08 2007 @@ -52,6 +52,9 @@ RTEXT "000.000.000", IDC_RECEIVED, 134, 115, 44, 8 PUSHBUTTON "&Egenskaber", IDC_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Deaktiver", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 @@ -120,4 +123,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet" IDS_OUT_OF_MEMORY "Out of memory" IDS_CANNOT_SAVE_CHANGES "Unable to save the changes you made" + IDS_STATUS_NON_OPERATIONAL "Non-operational" + IDS_STATUS_UNREACHABLE "No WAN adapter found" + IDS_STATUS_DISCONNECTED "Disconnected" + IDS_STATUS_CONNECTING "Connecting" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + IDS_SPEED_MBPS "%d Mbps" + IDS_DURATION_DAY "%d day %s" + IDS_DURATION_DAYS "%d days %s" END Modified: trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc Thu Sep 27 00:34:08 2007 @@ -52,6 +52,9 @@ RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 PUSHBUTTON "E&igenschaften", IDC_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Deaktivieren", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 @@ -119,4 +122,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Property sheet kann nicht erstellt werden" IDS_OUT_OF_MEMORY "Nicht genug Arbeitsspeicher" IDS_CANNOT_SAVE_CHANGES "Änderungen können nicht gespeichert werden" + IDS_STATUS_NON_OPERATIONAL "Non-operational" + IDS_STATUS_UNREACHABLE "No WAN adapter found" + IDS_STATUS_DISCONNECTED "Disconnected" + IDS_STATUS_CONNECTING "Connecting" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + IDS_SPEED_MBPS "%d Mbps" + IDS_DURATION_DAY "%d day %s" + IDS_DURATION_DAYS "%d days %s" END Modified: trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc Thu Sep 27 00:34:08 2007 @@ -52,6 +52,9 @@ RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 PUSHBUTTON "&Éäéüôçôåò", IDC_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Áðåíåñãïðïßçóç", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 @@ -119,4 +122,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet" IDS_OUT_OF_MEMORY "Out of memory" IDS_CANNOT_SAVE_CHANGES "Äåí Þôáí äõíáôÞ ç áðïèÞêåõóç ôùí áëëáãþí óáò" + IDS_STATUS_NON_OPERATIONAL "Non-operational" + IDS_STATUS_UNREACHABLE "No WAN adapter found" + IDS_STATUS_DISCONNECTED "Disconnected" + IDS_STATUS_CONNECTING "Connecting" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + IDS_SPEED_MBPS "%d Mbps" + IDS_DURATION_DAY "%d day %s" + IDS_DURATION_DAYS "%d days %s" END Modified: trunk/reactos/dll/cpl/ncpa/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/en-US.rc Thu Sep 27 00:34:08 2007 @@ -52,6 +52,9 @@ RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 PUSHBUTTON "&Properties", IDC_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Disable", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 @@ -119,4 +122,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet" IDS_OUT_OF_MEMORY "Out of memory" IDS_CANNOT_SAVE_CHANGES "Unable to save the changes you made" + IDS_STATUS_NON_OPERATIONAL "Non-operational" + IDS_STATUS_UNREACHABLE "No WAN adapter found" + IDS_STATUS_DISCONNECTED "Disconnected" + IDS_STATUS_CONNECTING "Connecting" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + IDS_SPEED_MBPS "%d Mbps" + IDS_DURATION_DAY "%d day %s" + IDS_DURATION_DAYS "%d days %s" END Modified: trunk/reactos/dll/cpl/ncpa/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/es-ES.rc Thu Sep 27 00:34:08 2007 @@ -56,6 +56,9 @@ RTEXT "00.000.000", IDC_RECEIVED, 139, 115, 44, 8 PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Desabilitar", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 @@ -125,4 +128,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet" IDS_OUT_OF_MEMORY "Out of memory" IDS_CANNOT_SAVE_CHANGES "Unable to save the changes you made" + IDS_STATUS_NON_OPERATIONAL "Non-operational" + IDS_STATUS_UNREACHABLE "No WAN adapter found" + IDS_STATUS_DISCONNECTED "Disconnected" + IDS_STATUS_CONNECTING "Connecting" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + IDS_SPEED_MBPS "%d Mbps" + IDS_DURATION_DAY "%d day %s" + IDS_DURATION_DAYS "%d days %s" END Modified: trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc Thu Sep 27 00:34:08 2007 @@ -52,6 +52,9 @@ RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 PUSHBUTTON "&Propriétés", IDC_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Désactiver", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 @@ -120,4 +123,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Impossible de créer la page de propriétés" IDS_OUT_OF_MEMORY "Plus de mémoire" IDS_CANNOT_SAVE_CHANGES "Impossible de sauvegarder les changements" + IDS_STATUS_NON_OPERATIONAL "Non-operational" + IDS_STATUS_UNREACHABLE "No WAN adapter found" + IDS_STATUS_DISCONNECTED "Disconnected" + IDS_STATUS_CONNECTING "Connecting" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + IDS_SPEED_MBPS "%d Mbps" + IDS_DURATION_DAY "%d day %s" + IDS_DURATION_DAYS "%d days %s" END Modified: trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc Thu Sep 27 00:34:08 2007 @@ -53,6 +53,9 @@ RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 PUSHBUTTON "&Tulajdonságok", IDC_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Letiltás", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 @@ -121,4 +124,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet" IDS_OUT_OF_MEMORY "Out of memory" IDS_CANNOT_SAVE_CHANGES "Unable to save the changes you made" + IDS_STATUS_NON_OPERATIONAL "Non-operational" + IDS_STATUS_UNREACHABLE "No WAN adapter found" + IDS_STATUS_DISCONNECTED "Disconnected" + IDS_STATUS_CONNECTING "Connecting" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + IDS_SPEED_MBPS "%d Mbps" + IDS_DURATION_DAY "%d day %s" + IDS_DURATION_DAYS "%d days %s" END Modified: trunk/reactos/dll/cpl/ncpa/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/id-ID.rc Thu Sep 27 00:34:08 2007 @@ -52,6 +52,9 @@ RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 PUSHBUTTON "&Properti", IDC_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Dimatikan", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 @@ -120,4 +123,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Tidak bisa membuat lembar properti" IDS_OUT_OF_MEMORY "Kekurangan memori" IDS_CANNOT_SAVE_CHANGES "Tidak bisa menyimpan perubahan yang anda buat" + IDS_STATUS_NON_OPERATIONAL "Non-operational" + IDS_STATUS_UNREACHABLE "No WAN adapter found" + IDS_STATUS_DISCONNECTED "Disconnected" + IDS_STATUS_CONNECTING "Connecting" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + IDS_SPEED_MBPS "%d Mbps" + IDS_DURATION_DAY "%d day %s" + IDS_DURATION_DAYS "%d days %s" END Modified: trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc Thu Sep 27 00:34:08 2007 @@ -52,6 +52,9 @@ RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 PUSHBUTTON "&Proprietà", IDC_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Disabilita", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 @@ -120,4 +123,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Impossibile creare la pagina delle proprietà" IDS_OUT_OF_MEMORY "Memoria esaurita" IDS_CANNOT_SAVE_CHANGES "Impossibile salvare le modifiche effettuate" + IDS_STATUS_NON_OPERATIONAL "Non-operational" + IDS_STATUS_UNREACHABLE "No WAN adapter found" + IDS_STATUS_DISCONNECTED "Disconnected" + IDS_STATUS_CONNECTING "Connecting" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + IDS_SPEED_MBPS "%d Mbps" + IDS_DURATION_DAY "%d day %s" + IDS_DURATION_DAYS "%d days %s" END Modified: trunk/reactos/dll/cpl/ncpa/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/ja-JP.rc Thu Sep 27 00:34:08 2007 @@ -52,6 +52,9 @@ RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 PUSHBUTTON "vpeB(&P)", IDC_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "³øÉ·é(&D)", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 @@ -120,4 +123,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet" IDS_OUT_OF_MEMORY "Out of memory" IDS_CANNOT_SAVE_CHANGES "Unable to save the changes you made" + IDS_STATUS_NON_OPERATIONAL "Non-operational" + IDS_STATUS_UNREACHABLE "No WAN adapter found" + IDS_STATUS_DISCONNECTED "Disconnected" + IDS_STATUS_CONNECTING "Connecting" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + IDS_SPEED_MBPS "%d Mbps" + IDS_DURATION_DAY "%d day %s" + IDS_DURATION_DAYS "%d days %s" END Modified: trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc Thu Sep 27 00:34:08 2007 @@ -52,6 +52,9 @@ RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 PUSHBUTTON "&Properties", IDC_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Disable", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 @@ -119,4 +122,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet" IDS_OUT_OF_MEMORY "Out of memory" IDS_CANNOT_SAVE_CHANGES "Unable to save the changes you made" + IDS_STATUS_NON_OPERATIONAL "Non-operational" + IDS_STATUS_UNREACHABLE "No WAN adapter found" + IDS_STATUS_DISCONNECTED "Disconnected" + IDS_STATUS_CONNECTING "Connecting" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + IDS_SPEED_MBPS "%d Mbps" + IDS_DURATION_DAY "%d day %s" + IDS_DURATION_DAYS "%d days %s" END Modified: trunk/reactos/dll/cpl/ncpa/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/nl-NL.rc Thu Sep 27 00:34:08 2007 @@ -52,6 +52,9 @@ RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 PUSHBUTTON "&Eigenschappen", IDC_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Uitschakelen", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 @@ -120,5 +123,15 @@ IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet" IDS_OUT_OF_MEMORY "Out of memory" IDS_CANNOT_SAVE_CHANGES "Unable to save the changes you made" + IDS_STATUS_NON_OPERATIONAL "Non-operational" + IDS_STATUS_UNREACHABLE "No WAN adapter found" + IDS_STATUS_DISCONNECTED "Disconnected" + IDS_STATUS_CONNECTING "Connecting" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + IDS_SPEED_MBPS "%d Mbps" + IDS_DURATION_DAY "%d day %s" + IDS_DURATION_DAYS "%d days %s" END + Modified: trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc Thu Sep 27 00:34:08 2007 @@ -54,6 +54,9 @@ RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 PUSHBUTTON "&W³aciwoci", IDC_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Od³¹cz", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 @@ -116,4 +119,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Nie mo¿na utworzyæ przegl¹du ustawieñ" IDS_OUT_OF_MEMORY "Brak wolnej pamiêci" IDS_CANNOT_SAVE_CHANGES "Nie mo¿na zapisaæ dokonanych zmian!" + IDS_STATUS_NON_OPERATIONAL "Non-operational" + IDS_STATUS_UNREACHABLE "No WAN adapter found" + IDS_STATUS_DISCONNECTED "Disconnected" + IDS_STATUS_CONNECTING "Connecting" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + IDS_SPEED_MBPS "%d Mbps" + IDS_DURATION_DAY "%d day %s" + IDS_DURATION_DAYS "%d days %s" END Modified: trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc Thu Sep 27 00:34:08 2007 @@ -52,6 +52,9 @@ RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 PUSHBUTTON "&Ñâîéñòâà", IDC_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Îòêëþ÷èòü", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 @@ -120,4 +123,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Íåâîçìîæíî ñîçäàòü ëèñò íàñòðîåê" IDS_OUT_OF_MEMORY "Ïàìÿòü ïåðåïîëíåíà" IDS_CANNOT_SAVE_CHANGES "Íåâîçìîæíî ñîõðàíèòü ñäåëàííûå èçìåíåíèÿ" + IDS_STATUS_NON_OPERATIONAL "Non-operational" + IDS_STATUS_UNREACHABLE "No WAN adapter found" + IDS_STATUS_DISCONNECTED "Disconnected" + IDS_STATUS_CONNECTING "Connecting" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + IDS_SPEED_MBPS "%d Mbps" + IDS_DURATION_DAY "%d day %s" + IDS_DURATION_DAYS "%d days %s" END Modified: trunk/reactos/dll/cpl/ncpa/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/sv-SE.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/sv-SE.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/sv-SE.rc Thu Sep 27 00:34:08 2007 @@ -54,6 +54,9 @@ RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 PUSHBUTTON "&Egenskaper", IDC_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Inaktivera", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 @@ -122,4 +125,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet" IDS_OUT_OF_MEMORY "Out of memory" IDS_CANNOT_SAVE_CHANGES "Unable to save the changes you made" + IDS_STATUS_NON_OPERATIONAL "Non-operational" + IDS_STATUS_UNREACHABLE "No WAN adapter found" + IDS_STATUS_DISCONNECTED "Disconnected" + IDS_STATUS_CONNECTING "Connecting" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + IDS_SPEED_MBPS "%d Mbps" + IDS_DURATION_DAY "%d day %s" + IDS_DURATION_DAYS "%d days %s" END Modified: trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc Thu Sep 27 00:34:08 2007 @@ -60,6 +60,9 @@ RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 PUSHBUTTON "Âëàñ&òèâîñò³", IDC_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "Âè&ìêíóòè", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 @@ -128,4 +131,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Íåìîæëèâî ñòâîðèòè â³êíî âëàñòèâîñòåé" IDS_OUT_OF_MEMORY "Íåäîñòàòíüî ïàì'ÿò³" IDS_CANNOT_SAVE_CHANGES "Íåìîæëèâî çáåðåãòè âíåñåí³ çì³íè" + IDS_STATUS_NON_OPERATIONAL "Non-operational" + IDS_STATUS_UNREACHABLE "No WAN adapter found" + IDS_STATUS_DISCONNECTED "Disconnected" + IDS_STATUS_CONNECTING "Connecting" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + IDS_SPEED_MBPS "%d Mbps" + IDS_DURATION_DAY "%d day %s" + IDS_DURATION_DAYS "%d days %s" END Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.c?rev=29… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.c (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.c Thu Sep 27 00:34:08 2007 @@ -243,22 +243,27 @@ static INT_PTR CALLBACK NICPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA); + PGLOBAL_NCPA_DATA pGlobalData = (PGLOBAL_NCPA_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch(uMsg) { case WM_INITDIALOG: { - TCHAR *tpszCfgInstanceID; DWORD dwType,dwSize; TCHAR tpszSubKey[MAX_PATH]; TCHAR tpszDisplayName[MAX_PATH]; HKEY hKey; - pPage = (PROPSHEETPAGE *)lParam; - tpszCfgInstanceID = (TCHAR*)pPage->lParam; - if(!FindNICClassKeyForCfgInstance(tpszCfgInstanceID,tpszSubKey)) + + pGlobalData = (PGLOBAL_NCPA_DATA)((LPPROPSHEETPAGE)lParam)->lParam; + if (pGlobalData == NULL) + return FALSE; + + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + if(!FindNICClassKeyForCfgInstance(pGlobalData->CurrentAdapterName, tpszSubKey)) { MessageBox(hwndDlg,_T("NIC Entry not found"),_T("Registry error"),MB_ICONSTOP); - MessageBox(hwndDlg,tpszCfgInstanceID,tpszSubKey,MB_ICONSTOP); + MessageBox(hwndDlg,pGlobalData->CurrentAdapterName,tpszSubKey,MB_ICONSTOP); } if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,tpszSubKey,0,KEY_QUERY_VALUE,&hKey)!=ERROR_SUCCESS) @@ -272,7 +277,6 @@ SetDlgItemText(hwndDlg,IDC_NETCARDNAME,tpszDisplayName); EnableWindow(GetDlgItem(hwndDlg,IDC_CONFIGURE),FALSE); - SetWindowLongPtr(hwndDlg,GWL_USERDATA,(DWORD_PTR)lParam); //SetDlgItemTextA(hwndDlg,IDC_NETCARDNAME,Info[pPage->lParam].Description); EnumRegKeys(NICPropertyProtocolCallback,hwndDlg,HKEY_LOCAL_MACHINE,_T("System\\CurrentControlSet\\Control\\Network\\{4D36E975-E325-11CE-BFC1-08002BE10318}")); @@ -312,62 +316,14 @@ // drop though case IDC_PROPERTIES: { - TCHAR *tpszSubKey = NULL; - TCHAR tpszNDIKey[MAX_PATH]; - TCHAR tpszClsIDText[MAX_PATH]; - TCHAR *tpszTCPIPClsID = _T("{A907657F-6FDF-11D0-8EFB-00C04FD912B2}"); - HKEY hNDIKey; - DWORD dwType,dwSize; - HWND hListBox = GetDlgItem(hwndDlg,IDC_COMPONENTSLIST); - int iListBoxIndex = (int) SendMessage(hListBox,LB_GETCURSEL,0,0); - if(iListBoxIndex != LB_ERR) - tpszSubKey = (TCHAR*)SendMessage(hListBox,LB_GETITEMDATA,iListBoxIndex,0); - if(!tpszSubKey) - break; - _stprintf(tpszNDIKey,_T("%s\\Ndi"),tpszSubKey); - - RegOpenKeyEx(HKEY_LOCAL_MACHINE,tpszNDIKey,0,KEY_QUERY_VALUE,&hNDIKey); - dwSize = sizeof(tpszClsIDText); - if(RegQueryValueEx(hNDIKey,_T("ClsId"),NULL,&dwType,(BYTE*)tpszClsIDText,&dwSize)!= ERROR_SUCCESS || dwType != REG_SZ) - ;//return; - RegCloseKey(hNDIKey); - - if(_tcscmp(tpszTCPIPClsID,tpszClsIDText)==0) + if(pGlobalData->pCurrentAdapterInfo) { - IP_ADAPTER_INFO Adapters[64]; - IP_ADAPTER_INFO *pAdapter; - TCHAR *tpszCfgInstanceID; - ULONG ulSize = sizeof(Adapters); - memset(&Adapters,0x00,sizeof(Adapters)); - if(GetAdaptersInfo(Adapters,&ulSize)!=ERROR_SUCCESS) - break;; - pAdapter = Adapters; - tpszCfgInstanceID = (TCHAR*)pPage->lParam; - while(pAdapter) - { - TCHAR tpszAdapterName[MAX_PATH]; - swprintf(tpszAdapterName,L"%S",pAdapter->AdapterName); - DPRINT("IPHLPAPI returned: %S\n", tpszAdapterName); - if(_tcscmp(tpszAdapterName,tpszCfgInstanceID)==0) - { - DisplayTCPIPProperties(hwndDlg,pAdapter); - break; - } else - { - DPRINT("... which is not the TCPIP property sheet\n"); - } - pAdapter = pAdapter->Next; - if(!pAdapter) - { - MessageBox(NULL,_T("If you see this, then the IPHLPAPI.DLL probably needs more work because GetAdaptersInfo did not return the expected data."),_T("Error"),MB_ICONSTOP); - } - } - - } else + DisplayTCPIPProperties(hwndDlg, pGlobalData->pCurrentAdapterInfo); + } + else { - MessageBox(NULL,_T("This control panel is incomplete.\r\nUsually, the \"Notify Object\" for this Network component should be invoked here. Reactos lacks the infrastructure to do this right now.\r\n- C++\r\n- DDK Headers for notify objects\r\n- clean header structure, that allow Windows-Compatible COM C++ Code"),_T("Error"),MB_ICONSTOP); - } - + MessageBox(NULL,_T("If you see this, then the IPHLPAPI.DLL probably needs more work because GetAdaptersInfo did not return the expected data."),_T("Error"),MB_ICONSTOP); + } } break; } @@ -378,7 +334,7 @@ static void -DisplayNICProperties(HWND hParent,TCHAR *tpszCfgInstanceID) +DisplayNICProperties(HWND hParent, GLOBAL_NCPA_DATA* pGlobalData) { PROPSHEETPAGE psp[1]; PROPSHEETHEADER psh; @@ -387,6 +343,13 @@ DWORD dwType = REG_SZ; TCHAR tpszName[MAX_PATH]; DWORD dwSize = sizeof(tpszName); + TCHAR tpszCfgInstanceID[MAX_ADAPTER_NAME_LENGTH]; + +#ifndef _UNICODE + WideCharToMultiByte(CP_UTF8, 0, pGlobalData->CurrentAdapterName, -1, tpszCfgInstanceID, MAX_ADAPTER_NAME_LENGTH, 0, 0); +#else + wcscpy(tpszCfgInstanceID, pGlobalData->CurrentAdapterName); +#endif // Get the "Name" for this Connection _stprintf(tpszSubKey,_T("System\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s\\Connection"),tpszCfgInstanceID); @@ -412,21 +375,286 @@ psh.pfnCallback = NULL; - InitPropSheetPage(&psp[0], IDD_NETPROPERTIES, NICPropertyPageProc,(LPARAM)tpszCfgInstanceID); + InitPropSheetPage(&psp[0], IDD_NETPROPERTIES, NICPropertyPageProc, (LPARAM)pGlobalData); PropertySheet(&psh); return; } +void RefreshNICInfo(HWND hwndDlg, PGLOBAL_NCPA_DATA pGlobalData) +{ + ULONG BufferSize; + DWORD ErrRet = 0; + + if (pGlobalData->pFirstAdapterInfo) + HeapFree(GetProcessHeap(), 0, pGlobalData->pFirstAdapterInfo); + + BufferSize = sizeof(IP_ADAPTER_INFO); + pGlobalData->pFirstAdapterInfo = (PIP_ADAPTER_INFO) HeapAlloc(GetProcessHeap(), 0, BufferSize); + + if (GetAdaptersInfo(pGlobalData->pFirstAdapterInfo, &BufferSize) == ERROR_BUFFER_OVERFLOW) + { + HeapFree(GetProcessHeap(), 0, pGlobalData->pFirstAdapterInfo); + pGlobalData->pFirstAdapterInfo = (PIP_ADAPTER_INFO) HeapAlloc(GetProcessHeap(), 0, BufferSize); + } + + if ((ErrRet = GetAdaptersInfo(pGlobalData->pFirstAdapterInfo, &BufferSize)) != NO_ERROR) + { + MessageBox(hwndDlg, _T("error adapterinfo") ,_T("ncpa.cpl"),MB_ICONSTOP); + + if (pGlobalData->pFirstAdapterInfo) + HeapFree(GetProcessHeap(), 0, pGlobalData->pFirstAdapterInfo); + } +} + +void UpdateCurrentAdapterInfo(HWND hwndDlg, PGLOBAL_NCPA_DATA pGlobalData) +{ + PIP_INTERFACE_INFO pInfo; + ULONG BufferSize = 0; + DWORD dwRetVal = 0; + + if (!pGlobalData->pCurrentAdapterInfo) + return; + + BufferSize = sizeof(IP_INTERFACE_INFO); + pInfo = (PIP_INTERFACE_INFO) HeapAlloc(GetProcessHeap(), 0, BufferSize); + if (ERROR_INSUFFICIENT_BUFFER == GetInterfaceInfo(pInfo, &BufferSize)) + { + HeapFree(GetProcessHeap(), 0, pInfo); + pInfo = (PIP_INTERFACE_INFO) HeapAlloc(GetProcessHeap(), 0, BufferSize); + } + + dwRetVal = GetInterfaceInfo(pInfo, &BufferSize); + if (NO_ERROR == dwRetVal) + { + DWORD i; + + for (i = 0; i < pInfo->NumAdapters; i++) + { + if (0 == wcscmp(pGlobalData->CurrentAdapterName, pInfo->Adapter[i].Name)) + { + if (pInfo->Adapter[i].Index != pGlobalData->pCurrentAdapterInfo->Index) + { + RefreshNICInfo(hwndDlg, pGlobalData); + + pGlobalData->pCurrentAdapterInfo = pGlobalData->pFirstAdapterInfo; + while (pGlobalData->pCurrentAdapterInfo) + { + if (pGlobalData->pCurrentAdapterInfo->Index == pInfo->Adapter[i].Index) + return; + + pGlobalData->pCurrentAdapterInfo = pGlobalData->pCurrentAdapterInfo->Next; + } + } + } + } + } + else if (ERROR_NO_DATA == dwRetVal) + DPRINT("There are no network adapters with IPv4 enabled on the local system\n"); + else + DPRINT1("GetInterfaceInfo failed.\n"); +} + +static VOID +UpdateNICStatusData(HWND hwndDlg, PGLOBAL_NCPA_DATA pGlobalData) +{ + DWORD dwRet = NO_ERROR; + + if (pGlobalData->pCurrentAdapterInfo) + { + if (NULL == pGlobalData->pIfTable) + { + pGlobalData->IfTableSize = sizeof(MIB_IFTABLE); + pGlobalData->pIfTable = (PMIB_IFTABLE)HeapAlloc(GetProcessHeap(), 0, pGlobalData->IfTableSize); + if (NULL == pGlobalData->pIfTable) + { + static BOOL firstError = TRUE; + if (firstError) + { + firstError = FALSE; + DPRINT1("Out of memory - could not allocate MIB_IFTABLE(1)"); + return; + } + } + } + + /* Call GetIfTable once to see if we have a large enough buffer */ + dwRet = GetIfTable(pGlobalData->pIfTable, &pGlobalData->IfTableSize, FALSE); + if (ERROR_INSUFFICIENT_BUFFER == dwRet) + { + HeapFree(GetProcessHeap(), 0, pGlobalData->pIfTable); + + pGlobalData->pIfTable = (PMIB_IFTABLE)HeapAlloc(GetProcessHeap(), 0, pGlobalData->IfTableSize); + if (NULL == pGlobalData->pIfTable) + { + static BOOL firstError = TRUE; + if (firstError) + { + firstError = FALSE; + DPRINT1("Out of memory - could not allocate MIB_IFTABLE(2)"); + } + + pGlobalData->IfTableSize = 0; + return; + } + + dwRet = GetIfTable(pGlobalData->pIfTable, &pGlobalData->IfTableSize, FALSE); + if (NO_ERROR != dwRet) + { + HeapFree(GetProcessHeap(), 0, pGlobalData->pIfTable); + pGlobalData->pIfTable = NULL; + pGlobalData->IfTableSize = 0; + return; + } + } + } + + if (NO_ERROR == dwRet) + { + DWORD i; + DWORD PktsOut = 0; + DWORD PktsIn = 0; + DWORD Mbps = 0; + DWORD OperStatus = IF_OPER_STATUS_DISCONNECTED; + PMIB_IFROW pIfRow = NULL; + TCHAR Buffer[256], LocBuffer[256]; + SYSTEMTIME TimeConnected; + + memset(&TimeConnected, 0, sizeof(TimeConnected)); + + if (pGlobalData->pCurrentAdapterInfo) + { + UpdateCurrentAdapterInfo(hwndDlg, pGlobalData); + + for (i = 0; i < pGlobalData->pIfTable->dwNumEntries; i++) + { + pIfRow = (PMIB_IFROW)&pGlobalData->pIfTable->table[i]; + + if (pIfRow->dwIndex == pGlobalData->pCurrentAdapterInfo->Index) + { + DWORD DurationSeconds; + SYSTEMTIME SystemTime; + FILETIME SystemFileTime; + ULARGE_INTEGER LargeSystemTime; + + PktsOut = pIfRow->dwOutUcastPkts; + PktsIn = pIfRow->dwInUcastPkts; + Mbps = pIfRow->dwSpeed; + OperStatus = pIfRow->dwOperStatus; + + /* TODO: For some unknown reason, this doesn't correspond to the Windows duration */ + GetSystemTime(&SystemTime); + SystemTimeToFileTime(&SystemTime, &SystemFileTime); + LargeSystemTime = *(ULARGE_INTEGER *)&SystemFileTime; + LargeSystemTime.QuadPart /= 100000ULL; + DurationSeconds = ((LargeSystemTime.LowPart - pIfRow->dwLastChange) / 100); + TimeConnected.wSecond = (DurationSeconds % 60); + TimeConnected.wMinute = (DurationSeconds / 60) % 60; + TimeConnected.wHour = (DurationSeconds / (60 * 60)) % 24; + TimeConnected.wDay = DurationSeconds / (60 * 60 * 24); + + break; + } + } + } + + _stprintf(Buffer, L"%u", PktsOut); + GetNumberFormat(LOCALE_USER_DEFAULT, 0, Buffer, NULL, LocBuffer, sizeof(LocBuffer) / sizeof(LocBuffer[0])); + SendDlgItemMessage(hwndDlg, IDC_SEND, WM_SETTEXT, 0, (LPARAM)LocBuffer); + + _stprintf(Buffer, L"%u", PktsIn); + GetNumberFormat(LOCALE_USER_DEFAULT, 0, Buffer, NULL, LocBuffer, sizeof(LocBuffer) / sizeof(LocBuffer[0])); + SendDlgItemMessage(hwndDlg, IDC_RECEIVED, WM_SETTEXT, 0, (LPARAM)LocBuffer); + + switch (OperStatus) + { + case IF_OPER_STATUS_NON_OPERATIONAL: + OperStatus = IDS_STATUS_NON_OPERATIONAL; + break; + + case IF_OPER_STATUS_UNREACHABLE: + OperStatus = IDS_STATUS_UNREACHABLE; + break; + + case IF_OPER_STATUS_DISCONNECTED: + OperStatus = IDS_STATUS_DISCONNECTED; + break; + + case IF_OPER_STATUS_CONNECTING: + OperStatus = IDS_STATUS_CONNECTING; + break; + + case IF_OPER_STATUS_CONNECTED: + OperStatus = IDS_STATUS_CONNECTED; + break; + + case IF_OPER_STATUS_OPERATIONAL: + /* TODO: Find sub status, waiting for DHCP address, etc. */ + OperStatus = IDS_STATUS_OPERATIONAL; + break; + + default: + DPRINT1("Unknown operation status: %d\n", OperStatus); + OperStatus = IDS_STATUS_OPERATIONAL; + break; + } + LoadString(hApplet, OperStatus, LocBuffer, sizeof(LocBuffer) / sizeof(LocBuffer[0])); + SendDlgItemMessage(hwndDlg, IDC_STATUS, WM_SETTEXT, 0, (LPARAM)LocBuffer); + + GetTimeFormat(LOCALE_USER_DEFAULT, 0, &TimeConnected, L"HH':'mm':'ss", LocBuffer, sizeof(LocBuffer) / sizeof(LocBuffer[0])); + if (0 == TimeConnected.wDay) + { + SendDlgItemMessage(hwndDlg, IDC_DURATION, WM_SETTEXT, 0, (LPARAM)LocBuffer); + } + else + { + TCHAR DayBuffer[256]; + if (1 == TimeConnected.wDay) + { + LoadString(hApplet, IDS_DURATION_DAY, DayBuffer, sizeof(DayBuffer) / sizeof(DayBuffer[0])); + } + else + { + LoadString(hApplet, IDS_DURATION_DAYS, DayBuffer, sizeof(DayBuffer) / sizeof(DayBuffer[0])); + } + _sntprintf(Buffer, 256, DayBuffer, TimeConnected.wDay, LocBuffer); + SendDlgItemMessage(hwndDlg, IDC_DURATION, WM_SETTEXT, 0, (LPARAM)Buffer); + } + + LoadString(hApplet, IDS_SPEED_MBPS, LocBuffer, sizeof(LocBuffer) / sizeof(LocBuffer[0])); + _sntprintf(Buffer, 256, LocBuffer, Mbps / 1000000); + SendDlgItemMessage(hwndDlg, IDC_SPEED, WM_SETTEXT, 0, (LPARAM)Buffer); + } + else + { + static BOOL firstError = TRUE; + if (firstError) + { + firstError = FALSE; + DPRINT1("GetIfTable failed with error code: %d\n", dwRet); + return; + } + } +} + static INT_PTR CALLBACK NICStatusPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { + PGLOBAL_NCPA_DATA pGlobalData; + pGlobalData = (PGLOBAL_NCPA_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch(uMsg) { case WM_INITDIALOG: { - PROPSHEETPAGE *psp= (PROPSHEETPAGE *)lParam; + pGlobalData = (PGLOBAL_NCPA_DATA)((LPPROPSHEETPAGE)lParam)->lParam; + if (pGlobalData == NULL) + return FALSE; + + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + EnableWindow(GetDlgItem(hwndDlg,IDC_ENDISABLE),FALSE); - SetWindowLongPtr(hwndDlg,DWL_USER,(DWORD_PTR)psp->lParam); + pGlobalData->hStatsUpdateTimer = SetTimer(hwndDlg, 1, 1000, NULL); + UpdateNICStatusData(hwndDlg, pGlobalData); } break; case WM_COMMAND: @@ -434,11 +662,27 @@ { case IDC_PROPERTIES: { - TCHAR *tpszCfgInstance; - tpszCfgInstance = (TCHAR*)GetWindowLong(hwndDlg,DWL_USER); - DisplayNICProperties(hwndDlg,tpszCfgInstance); - } - break; + DisplayNICProperties(hwndDlg, pGlobalData); + } + break; + } + break; + case WM_TIMER: + { + UpdateNICStatusData(hwndDlg, pGlobalData); + } + break; + case WM_DESTROY: + { + KillTimer(hwndDlg, pGlobalData->hStatsUpdateTimer); + pGlobalData->hStatsUpdateTimer = 0; + + if (pGlobalData->pIfTable) + { + HeapFree(GetProcessHeap(), 0, pGlobalData->pIfTable); + pGlobalData->pIfTable = NULL; + pGlobalData->IfTableSize = 0; + } } break; } @@ -448,57 +692,36 @@ static INT_PTR CALLBACK NICSupportPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - + PGLOBAL_NCPA_DATA pGlobalData; + pGlobalData = (PGLOBAL_NCPA_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch(uMsg) { case WM_INITDIALOG: - { - TCHAR Buffer[64]; - - PIP_ADAPTER_INFO pAdapterInfo = NULL; - ULONG adaptOutBufLen; - - DWORD ErrRet = 0; - - pAdapterInfo = (IP_ADAPTER_INFO *) malloc( sizeof(IP_ADAPTER_INFO) ); - adaptOutBufLen = sizeof(IP_ADAPTER_INFO); - - if (GetAdaptersInfo( pAdapterInfo, &adaptOutBufLen) == ERROR_BUFFER_OVERFLOW) - { - free(pAdapterInfo); - pAdapterInfo = (IP_ADAPTER_INFO *) malloc (adaptOutBufLen); - } - - if ((ErrRet = GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen)) != NO_ERROR) - { - MessageBox(hwndDlg, _T("error adapterinfo") ,_T("ncpa.cpl"),MB_ICONSTOP); - - if (pAdapterInfo) free(pAdapterInfo); + { + pGlobalData = (PGLOBAL_NCPA_DATA)((LPPROPSHEETPAGE)lParam)->lParam; + if (pGlobalData == NULL) return FALSE; - } - - if (pAdapterInfo) - { - /*FIXME: select the correct adapter info!!*/ - - if (pAdapterInfo->DhcpEnabled) + + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + if (pGlobalData->pCurrentAdapterInfo) + { + TCHAR Buffer[64]; + + if (pGlobalData->pCurrentAdapterInfo->DhcpEnabled) LoadString(hApplet, IDS_ASSIGNED_DHCP, Buffer, sizeof(Buffer) / sizeof(TCHAR)); else LoadString(hApplet, IDS_ASSIGNED_MANUAL, Buffer, sizeof(Buffer) / sizeof(TCHAR)); SendDlgItemMessage(hwndDlg, IDC_DETAILSTYPE, WM_SETTEXT, 0, (LPARAM)Buffer); - _stprintf(Buffer, _T("%S"), pAdapterInfo->IpAddressList.IpAddress.String); + _stprintf(Buffer, _T("%S"), pGlobalData->pCurrentAdapterInfo->IpAddressList.IpAddress.String); SendDlgItemMessage(hwndDlg, IDC_DETAILSIP, WM_SETTEXT, 0, (LPARAM)Buffer); - _stprintf(Buffer, _T("%S"), pAdapterInfo->IpAddressList.IpMask.String); + _stprintf(Buffer, _T("%S"), pGlobalData->pCurrentAdapterInfo->IpAddressList.IpMask.String); SendDlgItemMessage(hwndDlg, IDC_DETAILSSUBNET, WM_SETTEXT, 0, (LPARAM)Buffer); - _stprintf(Buffer, _T("%S"), pAdapterInfo->GatewayList.IpAddress.String); + _stprintf(Buffer, _T("%S"), pGlobalData->pCurrentAdapterInfo->GatewayList.IpAddress.String); SendDlgItemMessage(hwndDlg, IDC_DETAILSGATEWAY, WM_SETTEXT, 0, (LPARAM)Buffer); - - free(pAdapterInfo); - } - - - + } } break; case WM_COMMAND: @@ -530,6 +753,17 @@ DWORD dwType = REG_SZ; TCHAR tpszName[MAX_PATH]; DWORD dwSize = sizeof(tpszName); + PGLOBAL_NCPA_DATA pGlobalData; + PIP_ADAPTER_INFO pInfo; + WCHAR wcsAdapterName[MAX_ADAPTER_NAME]; + + pGlobalData = (PGLOBAL_NCPA_DATA)GetWindowLongPtr(hParent, DWLP_USER); + +#ifndef _UNICODE + MultiByteToWideChar(CP_UTF8, 0, tpszCfgInstanceID, -1, pGlobalData->CurrentAdapterName, MAX_ADAPTER_NAME); +#else + wcscpy(pGlobalData->CurrentAdapterName, tpszCfgInstanceID); +#endif // Get the "Name" for this Connection _stprintf(tpszSubKey,_T("System\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s\\Connection"),tpszCfgInstanceID); @@ -555,9 +789,25 @@ psh.nStartPage = 0; psh.ppsp = psp; psh.pfnCallback = NULL; - - InitPropSheetPage(&psp[0], IDD_CARDPROPERTIES, NICStatusPageProc, (LPARAM)tpszCfgInstanceID); - InitPropSheetPage(&psp[1], IDD_CARDSUPPORT, NICSupportPageProc, (LPARAM)tpszCfgInstanceID); + + RefreshNICInfo(hParent, pGlobalData); + + pGlobalData->pCurrentAdapterInfo = NULL; + pInfo = pGlobalData->pFirstAdapterInfo; + while (pInfo) + { + MultiByteToWideChar(CP_UTF8, 0, pInfo->AdapterName, -1, wcsAdapterName, MAX_ADAPTER_NAME); + if (0 == wcscmp(wcsAdapterName, pGlobalData->CurrentAdapterName)) + { + pGlobalData->pCurrentAdapterInfo = pInfo; + break; + } + + pInfo = pInfo->Next; + } + + InitPropSheetPage(&psp[0], IDD_CARDPROPERTIES, NICStatusPageProc, (LPARAM)pGlobalData); + InitPropSheetPage(&psp[1], IDD_CARDSUPPORT, NICSupportPageProc, (LPARAM)pGlobalData); PropertySheet(&psh); return; @@ -682,9 +932,15 @@ { case WM_INITDIALOG: { + PGLOBAL_NCPA_DATA pGlobalData = (PGLOBAL_NCPA_DATA)((LPPROPSHEETPAGE)lParam)->lParam; + if (pGlobalData == NULL) + return FALSE; + + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + EnableWindow(GetDlgItem(hwndDlg,IDC_ADD),FALSE); EnableWindow(GetDlgItem(hwndDlg,IDC_REMOVE),FALSE); - + EnumAdapters(hwndDlg); SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_SETCURSEL,0,0); } @@ -738,11 +994,17 @@ static LONG CALLBACK DisplayApplet(VOID) { + PGLOBAL_NCPA_DATA pGlobalData; PROPSHEETPAGE psp[1]; PROPSHEETHEADER psh = {0}; TCHAR Caption[1024]; + int Ret; LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + + pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_NCPA_DATA)); + if (pGlobalData == NULL) + return 0; psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPSHEETPAGE; @@ -755,9 +1017,13 @@ psh.ppsp = psp; psh.pfnCallback = NULL; - InitPropSheetPage(&psp[0], IDD_PROPPAGENETWORK, NetworkPageProc,0); - - return (LONG)(PropertySheet(&psh) != -1); + InitPropSheetPage(&psp[0], IDD_PROPPAGENETWORK, NetworkPageProc, (LPARAM)pGlobalData); + + Ret = PropertySheet(&psh); + + HeapFree(GetProcessHeap(), 0, pGlobalData); + + return (LONG)(Ret != -1); } /* Control Panel Callback */ @@ -814,3 +1080,4 @@ } + Modified: trunk/reactos/dll/cpl/ncpa/ncpa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.h?rev=29… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.h (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.h Thu Sep 27 00:34:08 2007 @@ -11,6 +11,16 @@ CPLAPPLET_PROC AppletProc; } APPLET, *PAPPLET; +typedef struct +{ + WCHAR CurrentAdapterName[MAX_ADAPTER_NAME]; + UINT_PTR hStatsUpdateTimer; + PMIB_IFTABLE pIfTable; + DWORD IfTableSize; + PIP_ADAPTER_INFO pFirstAdapterInfo; + PIP_ADAPTER_INFO pCurrentAdapterInfo; +} GLOBAL_NCPA_DATA, *PGLOBAL_NCPA_DATA; + extern HINSTANCE hApplet; extern ULONG DbgPrint(PCCH Fmt, ...); Modified: trunk/reactos/dll/cpl/ncpa/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/resource.h (original) +++ trunk/reactos/dll/cpl/ncpa/resource.h Thu Sep 27 00:34:08 2007 @@ -35,6 +35,15 @@ #define IDS_CANNOT_CREATE_PROPSHEET 3005 #define IDS_OUT_OF_MEMORY 3006 #define IDS_CANNOT_SAVE_CHANGES 3007 +#define IDS_STATUS_NON_OPERATIONAL 4001 +#define IDS_STATUS_UNREACHABLE 4002 +#define IDS_STATUS_DISCONNECTED 4003 +#define IDS_STATUS_CONNECTING 4004 +#define IDS_STATUS_CONNECTED 4005 +#define IDS_STATUS_OPERATIONAL 4006 +#define IDS_SPEED_MBPS 4007 +#define IDS_DURATION_DAY 4008 +#define IDS_DURATION_DAYS 4009 /* controls */ @@ -69,6 +78,9 @@ #define IDC_DETAILSTYPE 127 #define IDC_DETAILSSUBNET 128 #define IDC_DETAILSGATEWAY 129 +#define IDC_STATUS 130 +#define IDC_DURATION 131 +#define IDC_SPEED 132 #endif /* __CPL_RESOURCE_H */ /* EOF */

1 0

[weiden] 29218: Add deskadp.dll to the bootcd and register the shell extension
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Thu Sep 27 00:12:26 2007 New Revision: 29218 URL: http://svn.reactos.org/svn/reactos?rev=29218&view=rev Log: Add deskadp.dll to the bootcd and register the shell extension Modified: trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf (original) +++ trunk/reactos/boot/bootdata/hivecls.inf Thu Sep 27 00:12:26 2007 @@ -232,6 +232,11 @@ ;HKCR,"CLSID\{00000323-0000-0000-C000-000000000046}","",0x00000000,"StdGlobalInterfaceTable" ;HKCR,"CLSID\{00000323-0000-0000-C000-000000000046}\InProcServer32","",0x00000000,"ole32.dll" ;HKCR,"CLSID\{00000323-0000-0000-C000-000000000046}\InProcServer32","ThreadingModel",0x00000000,"Apartment" + +; deskadp.dll shell extension +HKCR,"CLSID\{42071712-76d4-11d1-8b24-00a0c9068ff3}","",0x00000000,"Display Adapter CPL Extension" +HKCR,"CLSID\{42071712-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","",0x00020000,"%SystemRoot%\system32\deskadp.dll" +HKCR,"CLSID\{42071712-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","ThreadingModel",0x00000000,"Apartment" ; For comcat.dll HKCR,"CLSID\{0002E005-0000-0000-C000-000000000046}","",0x00000000,"StdComponentCategoriesMgr" Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Thu Sep 27 00:12:26 2007 @@ -764,6 +764,9 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","7",0x00000000,"time.windows.com" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","8",0x00000000,"time.nist.gov" +; deskadp.dll shell extension +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Controls Folder\Device\shellex\PropertySheetHandlers\Display Adapter CPL Extension","",0x00000000,"{42071712-76d4-11d1-8b24-00a0c9068ff3}" + ; Where to download the Mozilla ActiveX control HKLM,"SOFTWARE\ReactOS\shdocvw","MozillaUrl",0x00000000,"http://links.reactos.org/mozactivex" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Thu Sep 27 00:12:26 2007 @@ -255,7 +255,7 @@ dll\win32\wsock32\wsock32.dll 1 dll\win32\wtsapi32\wtsapi32.dll 1 dll\win32\beepmidi\beepmidi.dll 1 - +dll\win32\shellext\deskadp\deskadp.dll 1 ; Drivers drivers\base\bootvid\bootvid.dll 1

1 0

[weiden] 29217: Add initial implementation of the display adapter desk.cpl shell extension
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Thu Sep 27 00:00:07 2007 New Revision: 29217 URL: http://svn.reactos.org/svn/reactos?rev=29217&view=rev Log: Add initial implementation of the display adapter desk.cpl shell extension Added: trunk/reactos/dll/win32/shellext/deskadp/ (with props) trunk/reactos/dll/win32/shellext/deskadp/deskadp.c (with props) trunk/reactos/dll/win32/shellext/deskadp/deskadp.h (with props) trunk/reactos/dll/win32/shellext/deskadp/deskadp.rbuild (with props) trunk/reactos/dll/win32/shellext/deskadp/deskadp.rc (with props) trunk/reactos/dll/win32/shellext/deskadp/deskadp.spec (with props) trunk/reactos/dll/win32/shellext/deskadp/lang/ (with props) trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc (with props) trunk/reactos/dll/win32/shellext/deskadp/precomp.h (with props) trunk/reactos/dll/win32/shellext/deskadp/resource.h (with props) trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc (with props) trunk/reactos/dll/win32/shellext/deskadp/shxiface.c (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/dll/win32/shellext/shellext.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=292… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Thu Sep 27 00:00:07 2007 @@ -55,6 +55,7 @@ <property name="BASEADDRESS_URLMON" value="0x6b3c0000" /> <property name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> <property name="BASEADDRESS_WINSTA" value="0x6b3D0000" /> + <property name="BASEADDRESS_DESKADP" value="0x6d410000" /> <property name="BASEADDRESS_WLDAP32" value="0x6e130000" /> <property name="BASEADDRESS_CLB" value="0x6f2b0000" /> <property name="BASEADDRESS_CARDS" value="0x701a0000" /> Propchange: trunk/reactos/dll/win32/shellext/deskadp/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Sep 27 00:00:07 2007 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Added: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.c (added) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Thu Sep 27 00:00:07 2007 @@ -1,0 +1,218 @@ +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + +static HINSTANCE hInstance; + +static INT_PTR CALLBACK +DisplayAdapterDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PDESKDISPLAYADAPTER This; + INT_PTR Ret = 0; + + if (uMsg != WM_INITDIALOG) + { + This = (PDESKDISPLAYADAPTER)GetWindowLongPtr(hwndDlg, + DWL_USER); + } + + switch (uMsg) + { + case WM_INITDIALOG: + This = (PDESKDISPLAYADAPTER)((LPCPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, + DWL_USER, + (LONG_PTR)This); + + Ret = TRUE; + break; + } + + return Ret; +} + +static VOID +IDeskDisplayAdapter_Destroy(PDESKDISPLAYADAPTER This) +{ + if (This->pdtobj != NULL) + { + IDataObject_Release(This->pdtobj); + This->pdtobj = NULL; + } + + if (This->DeskExtInterface != NULL) + { + LocalFree((HLOCAL)This->DeskExtInterface); + This->DeskExtInterface = NULL; + } +} + +ULONG +IDeskDisplayAdapter_AddRef(PDESKDISPLAYADAPTER This) +{ + ULONG ret; + + ret = InterlockedIncrement((PLONG)&This->ref); + if (ret == 1) + InterlockedIncrement(&dll_refs); + + return ret; +} + +ULONG +IDeskDisplayAdapter_Release(PDESKDISPLAYADAPTER This) +{ + ULONG ret; + + ret = InterlockedDecrement((PLONG)&This->ref); + if (ret == 0) + { + IDeskDisplayAdapter_Destroy(This); + InterlockedDecrement(&dll_refs); + + HeapFree(GetProcessHeap(), + 0, + This); + } + + return ret; +} + +HRESULT STDMETHODCALLTYPE +IDeskDisplayAdapter_QueryInterface(PDESKDISPLAYADAPTER This, + REFIID iid, + PVOID *pvObject) +{ + *pvObject = NULL; + + if (IsEqualIID(iid, + &IID_IShellPropSheetExt) || + IsEqualIID(iid, + &IID_IUnknown)) + { + *pvObject = impl_to_interface(This, IShellPropSheetExt); + } + else if (IsEqualIID(iid, + &IID_IShellExtInit)) + { + *pvObject = impl_to_interface(This, IShellExtInit); + } + else if (IsEqualIID(iid, + &IID_IClassFactory)) + { + *pvObject = impl_to_interface(This, IClassFactory); + } + else + { + DPRINT1("IDeskDisplayAdapter::QueryInterface(%p,%p): E_NOINTERFACE\n", iid, pvObject); + return E_NOINTERFACE; + } + + IDeskDisplayAdapter_AddRef(This); + return S_OK; +} + +HRESULT +IDeskDisplayAdapter_Initialize(PDESKDISPLAYADAPTER This, + LPCITEMIDLIST pidlFolder, + IDataObject *pdtobj, + HKEY hkeyProgID) +{ + DPRINT1("IDeskDisplayAdapter::Initialize(%p,%p,%p)\n", pidlFolder, pdtobj, hkeyProgID); + + if (pdtobj != NULL) + { + IDataObject_AddRef(pdtobj); + This->pdtobj = pdtobj; + + /* Get a copy of the desk.cpl extension interface */ + This->DeskExtInterface = QueryDeskCplExtInterface(This->pdtobj); + if (This->DeskExtInterface != NULL) + return S_OK; + } + + return S_FALSE; +} + +HRESULT +IDeskDisplayAdapter_AddPages(PDESKDISPLAYADAPTER This, + LPFNADDPROPSHEETPAGE pfnAddPage, + LPARAM lParam) +{ + HPROPSHEETPAGE hpsp; + PROPSHEETPAGE psp; + + DPRINT1("IDeskDisplayAdapter::AddPages(%p,%p)\n", pfnAddPage, lParam); + + psp.dwSize = sizeof(psp); + psp.dwFlags = PSP_DEFAULT; + psp.hInstance = hInstance; + psp.pszTemplate = MAKEINTRESOURCE(IDD_DISPLAYADAPTER); + psp.pfnDlgProc = DisplayAdapterDlgProc; + psp.lParam = (LPARAM)This; + + hpsp = CreatePropertySheetPage(&psp); + if (hpsp != NULL && pfnAddPage(hpsp, lParam)) + return S_OK; + + return S_FALSE; +} + +HRESULT +IDeskDisplayAdapter_ReplacePage(PDESKDISPLAYADAPTER This, + EXPPS uPageID, + LPFNADDPROPSHEETPAGE pfnReplacePage, + LPARAM lParam) +{ + DPRINT1("IDeskDisplayAdapter::ReplacePage(%u,%p,%p)\n", uPageID, pfnReplacePage, lParam); + return E_NOTIMPL; +} + +HRESULT +IDeskDisplayAdapter_Constructor(REFIID riid, + LPVOID *ppv) +{ + PDESKDISPLAYADAPTER This; + HRESULT hRet = E_OUTOFMEMORY; + + DPRINT1("IDeskDisplayAdapter::Constructor(%p,%p)\n", riid, ppv); + + This = HeapAlloc(GetProcessHeap(), + 0, + sizeof(*This)); + if (This != NULL) + { + ZeroMemory(This, + sizeof(*This)); + + IDeskDisplayAdapter_InitIface(This); + + hRet = IDeskDisplayAdapter_QueryInterface(This, + riid, + ppv); + if (!SUCCEEDED(hRet)) + IDeskDisplayAdapter_Release(This); + } + + return hRet; +} + +BOOL STDCALL +DllMain(HINSTANCE hinstDLL, + DWORD dwReason, + LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + hInstance = hinstDLL; + DisableThreadLibraryCalls(hInstance); + break; + } + + return TRUE; +} Propchange: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/deskadp/deskadp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.h (added) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.h Thu Sep 27 00:00:07 2007 @@ -1,0 +1,59 @@ +#ifndef __DESKADP__H +#define __DESKADP__H + +typedef struct _DESKDISPLAYADAPTER +{ + const struct IShellPropSheetExtVtbl *lpIShellPropSheetExtVtbl; + const struct IShellExtInitVtbl *lpIShellExtInitVtbl; + const struct IClassFactoryVtbl *lpIClassFactoryVtbl; + DWORD ref; + + PDESK_EXT_INTERFACE DeskExtInterface; + IDataObject *pdtobj; +} DESKDISPLAYADAPTER, *PDESKDISPLAYADAPTER; + +extern LONG dll_refs; + +#define impl_to_interface(impl,iface) (struct iface *)(&(impl)->lp##iface##Vtbl) +#define interface_to_impl(instance,iface) ((PDESKDISPLAYADAPTER)((ULONG_PTR)instance - FIELD_OFFSET(DESKDISPLAYADAPTER,lp##iface##Vtbl))) + +HRESULT +IDeskDisplayAdapter_Constructor(REFIID riid, + LPVOID *ppv); + +VOID +IDeskDisplayAdapter_InitIface(PDESKDISPLAYADAPTER This); + +HRESULT STDMETHODCALLTYPE +IDeskDisplayAdapter_QueryInterface(PDESKDISPLAYADAPTER This, + REFIID iid, + PVOID *pvObject); + +ULONG +IDeskDisplayAdapter_AddRef(PDESKDISPLAYADAPTER This); + +ULONG +IDeskDisplayAdapter_Release(PDESKDISPLAYADAPTER This); + +HRESULT +IDeskDisplayAdapter_Initialize(PDESKDISPLAYADAPTER This, + LPCITEMIDLIST pidlFolder, + IDataObject *pdtobj, + HKEY hkeyProgID); + +HRESULT +IDeskDisplayAdapter_AddPages(PDESKDISPLAYADAPTER This, + LPFNADDPROPSHEETPAGE pfnAddPage, + LPARAM lParam); + +HRESULT +IDeskDisplayAdapter_ReplacePage(PDESKDISPLAYADAPTER This, + EXPPS uPageID, + LPFNADDPROPSHEETPAGE pfnReplacePage, + LPARAM lParam); + +static const GUID CLSID_IDeskDisplayAdapter = {0x42071712,0x76d4,0x11d1,{0x8b,0x24,0x00,0xa0,0xc9,0x06,0x8f,0xf3}}; + +ULONG __cdecl DbgPrint(PCCH Format,...); + +#endif /* __DESKADP__H */ Propchange: trunk/reactos/dll/win32/shellext/deskadp/deskadp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/deskadp/deskadp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.rbuild (added) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.rbuild Thu Sep 27 00:00:07 2007 @@ -1,0 +1,21 @@ +<module name="deskadp" type="win32dll" baseaddress="${BASEADDRESS_DESKADP}" installbase="system32" installname="deskadp.dll" unicode="yes"> + <importlibrary definition="deskadp.spec.def" /> + <include base="deskadp">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0500</define> + <define name="_WIN32_WINNT">0x0600</define> + <define name="WINVER">0x0600</define> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>comctl32</library> + <library>ole32</library> + <library>uuid</library> + <library>msvcrt</library> + <file>deskadp.c</file> + <file>shxiface.c</file> + <file>deskadp.rc</file> + <file>deskadp.spec</file> + <pch>precomp.h</pch> +</module> Propchange: trunk/reactos/dll/win32/shellext/deskadp/deskadp.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/deskadp/deskadp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.rc (added) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.rc Thu Sep 27 00:00:07 2007 @@ -1,0 +1,12 @@ +/* $Id: slayer.rc 24931 2006-11-28 19:35:42Z janderwald $ */ + +#include <windows.h> +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Advanced display adapter properties\0" +#define REACTOS_STR_INTERNAL_NAME "deskadp\0" +#define REACTOS_STR_ORIGINAL_FILENAME "deskadp.dll\0" +#include <reactos/version.rc> + +#include "rsrc.rc" Propchange: trunk/reactos/dll/win32/shellext/deskadp/deskadp.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/deskadp/deskadp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.spec (added) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.spec Thu Sep 27 00:00:07 2007 @@ -1,0 +1,4 @@ +# deskadp.dll exports + + 1 stdcall DllCanUnloadNow() + 2 stdcall DllGetClassObject(ptr ptr ptr) Propchange: trunk/reactos/dll/win32/shellext/deskadp/deskadp.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/shellext/deskadp/lang/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Sep 27 00:00:07 2007 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Added: trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc (added) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc Thu Sep 27 00:00:07 2007 @@ -1,0 +1,10 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Adapter" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + +END + Propchange: trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/deskadp/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/precomp.h (added) +++ trunk/reactos/dll/win32/shellext/deskadp/precomp.h Thu Sep 27 00:00:07 2007 @@ -1,0 +1,11 @@ +#ifndef __PRECOMP__H +#define __PRECOMP__H + +#define COBJMACROS +#include <windows.h> +#include <shlobj.h> +#include <dll/desk/deskcplx.h> +#include "deskadp.h" +#include "resource.h" + +#endif /* __PRECOMP__H */ Propchange: trunk/reactos/dll/win32/shellext/deskadp/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/deskadp/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/resource.h (added) +++ trunk/reactos/dll/win32/shellext/deskadp/resource.h Thu Sep 27 00:00:07 2007 @@ -1,0 +1,6 @@ +#ifndef __RESOURCE__H +#define __RESOURCE__H + +#define IDD_DISPLAYADAPTER 100 + +#endif /* __RESOURCE__H */ Propchange: trunk/reactos/dll/win32/shellext/deskadp/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc (added) +++ trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc Thu Sep 27 00:00:07 2007 @@ -1,0 +1,7 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "lang/en-US.rc" + Propchange: trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/deskadp/shxiface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/shxiface.c (added) +++ trunk/reactos/dll/win32/shellext/deskadp/shxiface.c Thu Sep 27 00:00:07 2007 @@ -1,0 +1,209 @@ +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + +LONG dll_refs = 0; + +static HRESULT STDMETHODCALLTYPE +IDeskDisplayAdapter_IShellPropSheetExt_QueryInterface(IShellPropSheetExt *iface, + REFIID iid, + PVOID *pvObject) +{ + PDESKDISPLAYADAPTER This = interface_to_impl(iface, IShellPropSheetExt); + return IDeskDisplayAdapter_QueryInterface(This, + iid, + pvObject); +} + +static ULONG STDMETHODCALLTYPE +IDeskDisplayAdapter_IShellPropSheetExt_AddRef(IShellPropSheetExt* iface) +{ + PDESKDISPLAYADAPTER This = interface_to_impl(iface, IShellPropSheetExt); + return IDeskDisplayAdapter_AddRef(This); +} + +static ULONG STDMETHODCALLTYPE +IDeskDisplayAdapter_IShellPropSheetExt_Release(IShellPropSheetExt* iface) +{ + PDESKDISPLAYADAPTER This = interface_to_impl(iface, IShellPropSheetExt); + return IDeskDisplayAdapter_Release(This); +} + +static HRESULT STDMETHODCALLTYPE +IDeskDisplayAdapter_IShellPropSheetExt_AddPages(IShellPropSheetExt* iface, + LPFNADDPROPSHEETPAGE pfnAddPage, + LPARAM lParam) +{ + PDESKDISPLAYADAPTER This = interface_to_impl(iface, IShellPropSheetExt); + return IDeskDisplayAdapter_AddPages(This, + pfnAddPage, + lParam); +} + +static HRESULT STDMETHODCALLTYPE +IDeskDisplayAdapter_IShellPropSheetExt_ReplacePage(IShellPropSheetExt* iface, + EXPPS uPageID, + LPFNADDPROPSHEETPAGE pfnReplacePage, + LPARAM lParam) +{ + PDESKDISPLAYADAPTER This = interface_to_impl(iface, IShellPropSheetExt); + return IDeskDisplayAdapter_ReplacePage(This, + uPageID, + pfnReplacePage, + lParam); +} + +static IShellPropSheetExtVtbl efvtIShellPropSheetExt = +{ + IDeskDisplayAdapter_IShellPropSheetExt_QueryInterface, + IDeskDisplayAdapter_IShellPropSheetExt_AddRef, + IDeskDisplayAdapter_IShellPropSheetExt_Release, + IDeskDisplayAdapter_IShellPropSheetExt_AddPages, + IDeskDisplayAdapter_IShellPropSheetExt_ReplacePage +}; + +static HRESULT STDMETHODCALLTYPE +IDeskDisplayAdapter_IShellExtInit_QueryInterface(IShellExtInit *iface, + REFIID iid, + PVOID *pvObject) +{ + PDESKDISPLAYADAPTER This = interface_to_impl(iface, IShellExtInit); + return IDeskDisplayAdapter_QueryInterface(This, + iid, + pvObject); +} + +static ULONG STDMETHODCALLTYPE +IDeskDisplayAdapter_IShellExtInit_AddRef(IShellExtInit* iface) +{ + PDESKDISPLAYADAPTER This = interface_to_impl(iface, IShellExtInit); + return IDeskDisplayAdapter_AddRef(This); +} + +static ULONG STDMETHODCALLTYPE +IDeskDisplayAdapter_IShellExtInit_Release(IShellExtInit* iface) +{ + PDESKDISPLAYADAPTER This = interface_to_impl(iface, IShellExtInit); + return IDeskDisplayAdapter_Release(This); +} + +static HRESULT STDMETHODCALLTYPE +IDeskDisplayAdapter_IShellExtInit_Initialize(IShellExtInit* iface, + LPCITEMIDLIST pidlFolder, + IDataObject *pdtobj, + HKEY hkeyProgID) +{ + PDESKDISPLAYADAPTER This = interface_to_impl(iface, IShellExtInit); + return IDeskDisplayAdapter_Initialize(This, + pidlFolder, + pdtobj, + hkeyProgID); +} + +static IShellExtInitVtbl efvtIShellExtInit = +{ + IDeskDisplayAdapter_IShellExtInit_QueryInterface, + IDeskDisplayAdapter_IShellExtInit_AddRef, + IDeskDisplayAdapter_IShellExtInit_Release, + IDeskDisplayAdapter_IShellExtInit_Initialize +}; + +static HRESULT STDMETHODCALLTYPE +IDeskDisplayAdapter_IClassFactory_QueryInterface(IClassFactory *iface, + REFIID iid, + PVOID *pvObject) +{ + PDESKDISPLAYADAPTER This = interface_to_impl(iface, IClassFactory); + return IDeskDisplayAdapter_QueryInterface(This, + iid, + pvObject); +} + +static ULONG STDMETHODCALLTYPE +IDeskDisplayAdapter_IClassFactory_AddRef(IClassFactory* iface) +{ + PDESKDISPLAYADAPTER This = interface_to_impl(iface, IClassFactory); + return IDeskDisplayAdapter_AddRef(This); +} + +static ULONG STDMETHODCALLTYPE +IDeskDisplayAdapter_IClassFactory_Release(IClassFactory* iface) +{ + PDESKDISPLAYADAPTER This = interface_to_impl(iface, IClassFactory); + return IDeskDisplayAdapter_Release(This); +} + +static HRESULT STDMETHODCALLTYPE +IDeskDisplayAdapter_IClassFactory_CreateInstance(IClassFactory *iface, + IUnknown * pUnkOuter, + REFIID riid, + PVOID *ppvObject) +{ + if (pUnkOuter != NULL && + !IsEqualIID(riid, + &IID_IUnknown)) + { + return CLASS_E_NOAGGREGATION; + } + + return IDeskDisplayAdapter_Constructor(riid, + ppvObject); +} + +static HRESULT STDMETHODCALLTYPE +IDeskDisplayAdapter_IClassFactory_LockServer(IClassFactory *iface, + BOOL fLock) +{ + if (fLock) + InterlockedIncrement(&dll_refs); + else + InterlockedDecrement(&dll_refs); + + return S_OK; +} + +static IClassFactoryVtbl efvtIClassFactory = +{ + IDeskDisplayAdapter_IClassFactory_QueryInterface, + IDeskDisplayAdapter_IClassFactory_AddRef, + IDeskDisplayAdapter_IClassFactory_Release, + IDeskDisplayAdapter_IClassFactory_CreateInstance, + IDeskDisplayAdapter_IClassFactory_LockServer, +}; + +VOID +IDeskDisplayAdapter_InitIface(PDESKDISPLAYADAPTER This) +{ + This->lpIShellPropSheetExtVtbl = &efvtIShellPropSheetExt; + This->lpIShellExtInitVtbl = &efvtIShellExtInit; + This->lpIClassFactoryVtbl = &efvtIClassFactory; + + IDeskDisplayAdapter_AddRef(This); +} + +HRESULT WINAPI +DllGetClassObject(REFCLSID rclsid, + REFIID riid, + LPVOID *ppv) +{ + if (ppv == NULL) + return E_INVALIDARG; + + *ppv = NULL; + if (IsEqualCLSID(rclsid, + &CLSID_IDeskDisplayAdapter)) + { + return IDeskDisplayAdapter_Constructor(riid, + ppv); + } + + DPRINT1("DllGetClassObject: CLASS_E_CLASSNOTAVAILABLE\n"); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI +DllCanUnloadNow(VOID) +{ + return dll_refs == 0 ? S_OK : S_FALSE; +} Propchange: trunk/reactos/dll/win32/shellext/deskadp/shxiface.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shellext/shellext.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/shellex… ============================================================================== --- trunk/reactos/dll/win32/shellext/shellext.rbuild (original) +++ trunk/reactos/dll/win32/shellext/shellext.rbuild Thu Sep 27 00:00:07 2007 @@ -4,4 +4,7 @@ <directory name="slayer"> <xi:include href="slayer/slayer.rbuild" /> </directory> + <directory name="deskadp"> + <xi:include href="deskadp/deskadp.rbuild" /> + </directory> </group>

1 0

[weiden] 29216: Move routines that can be shared between desk.cpl shell extensions to common header as inlined functions
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Wed Sep 26 23:42:39 2007 New Revision: 29216 URL: http://svn.reactos.org/svn/reactos?rev=29216&view=rev Log: Move routines that can be shared between desk.cpl shell extensions to common header as inlined functions Modified: trunk/reactos/dll/cpl/desk/advmon.c trunk/reactos/include/reactos/dll/desk/deskcplx.h Modified: trunk/reactos/dll/cpl/desk/advmon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advmon.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/desk/advmon.c (original) +++ trunk/reactos/dll/cpl/desk/advmon.c Wed Sep 26 23:42:39 2007 @@ -73,44 +73,6 @@ return Ret; } -static LPTSTR -QueryDevSettingsString(IDataObject *pdo, UINT cfFormat) -{ - FORMATETC fetc; - STGMEDIUM medium; - SIZE_T BufLen; - LPWSTR lpRecvBuffer; - LPTSTR lpStr = NULL; - - fetc.cfFormat = (CLIPFORMAT)cfFormat; - fetc.ptd = NULL; - fetc.dwAspect = DVASPECT_CONTENT; - fetc.lindex = -1; - fetc.tymed = TYMED_HGLOBAL; - - if (SUCCEEDED(IDataObject_GetData(pdo, &fetc, &medium)) && medium.hGlobal != NULL) - { - /* We always receive the string in unicode! */ - lpRecvBuffer = (LPWSTR)GlobalLock(medium.hGlobal); - - BufLen = wcslen(lpRecvBuffer) + 1; - lpStr = LocalAlloc(LMEM_FIXED, BufLen * sizeof(TCHAR)); - if (lpStr != NULL) - { -#ifdef UNICODE - wcscpy(lpStr, lpRecvBuffer); -#else - WideCharToMultiByte(CP_APC, 0, lpRecvBuffer, -1, lpStr, BufLen, NULL, NULL); -#endif - } - - GlobalUnlock(medium.hGlobal); - ReleaseStgMedium(&medium); - } - - return lpStr; -} - static VOID BuildAdvPropTitle(IDataObject *pdo, LPTSTR lpBuffer, DWORD dwBufferLen) { @@ -126,8 +88,8 @@ uiMonitorName = RegisterClipboardFormat(DESK_EXT_MONITORNAME); uiDisplayName = RegisterClipboardFormat(DESK_EXT_DISPLAYNAME); - lpMonitorName = QueryDevSettingsString(pdo, uiMonitorName); - lpDisplayName = QueryDevSettingsString(pdo, uiDisplayName); + lpMonitorName = QueryDeskCplString(pdo, uiMonitorName); + lpDisplayName = QueryDeskCplString(pdo, uiDisplayName); _sntprintf(lpBuffer, dwBufferLen, szFormatBuff, lpMonitorName, lpDisplayName); Modified: trunk/reactos/include/reactos/dll/desk/deskcplx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/dll/desk/d… ============================================================================== --- trunk/reactos/include/reactos/dll/desk/deskcplx.h (original) +++ trunk/reactos/include/reactos/dll/desk/deskcplx.h Wed Sep 26 23:42:39 2007 @@ -43,4 +43,78 @@ WCHAR BiosString[128]; } DESK_EXT_INTERFACE, *PDESK_EXT_INTERFACE; +static PDESK_EXT_INTERFACE __inline +QueryDeskCplExtInterface(IDataObject *pdo) +{ + PDESK_EXT_INTERFACE pRecvBuffer, pExtIface = NULL; + FORMATETC fetc; + STGMEDIUM medium; + + fetc.cfFormat = (CLIPFORMAT)RegisterClipboardFormat(DESK_EXT_EXTINTERFACE); + fetc.ptd = NULL; + fetc.dwAspect = DVASPECT_CONTENT; + fetc.lindex = -1; + fetc.tymed = TYMED_HGLOBAL; + + if (SUCCEEDED(IDataObject_GetData(pdo, &fetc, &medium)) && medium.hGlobal != NULL) + { + /* We always receive the string in unicode! */ + pRecvBuffer = (PDESK_EXT_INTERFACE)GlobalLock(medium.hGlobal); + + if (pRecvBuffer->cbSize == sizeof(*pRecvBuffer)) + { + pExtIface = LocalAlloc(LMEM_FIXED, sizeof(*pExtIface)); + if (pExtIface != NULL) + { + CopyMemory(pExtIface, + pRecvBuffer, + sizeof(*pRecvBuffer)); + } + } + + GlobalUnlock(medium.hGlobal); + ReleaseStgMedium(&medium); + } + + return pExtIface; +} + +static LPTSTR __inline +QueryDeskCplString(IDataObject *pdo, UINT cfFormat) +{ + FORMATETC fetc; + STGMEDIUM medium; + SIZE_T BufLen; + LPWSTR lpRecvBuffer; + LPTSTR lpStr = NULL; + + fetc.cfFormat = (CLIPFORMAT)cfFormat; + fetc.ptd = NULL; + fetc.dwAspect = DVASPECT_CONTENT; + fetc.lindex = -1; + fetc.tymed = TYMED_HGLOBAL; + + if (SUCCEEDED(IDataObject_GetData(pdo, &fetc, &medium)) && medium.hGlobal != NULL) + { + /* We always receive the string in unicode! */ + lpRecvBuffer = (LPWSTR)GlobalLock(medium.hGlobal); + + BufLen = wcslen(lpRecvBuffer) + 1; + lpStr = LocalAlloc(LMEM_FIXED, BufLen * sizeof(TCHAR)); + if (lpStr != NULL) + { +#ifdef UNICODE + wcscpy(lpStr, lpRecvBuffer); +#else + WideCharToMultiByte(CP_APC, 0, lpRecvBuffer, -1, lpStr, BufLen, NULL, NULL); +#endif + } + + GlobalUnlock(medium.hGlobal); + ReleaseStgMedium(&medium); + } + + return lpStr; +} + #endif /* __DESKCPLX__H */

1 0

[weiden] 29215: Move desk.cpl shell extension interface definition to shared header file
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Wed Sep 26 23:23:50 2007 New Revision: 29215 URL: http://svn.reactos.org/svn/reactos?rev=29215&view=rev Log: Move desk.cpl shell extension interface definition to shared header file Added: trunk/reactos/include/reactos/dll/desk/ trunk/reactos/include/reactos/dll/desk/deskcplx.h (with props) Modified: trunk/reactos/dll/cpl/desk/advmon.c trunk/reactos/dll/cpl/desk/desk.h trunk/reactos/dll/cpl/desk/devsett.c Modified: trunk/reactos/dll/cpl/desk/advmon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advmon.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/desk/advmon.c (original) +++ trunk/reactos/dll/cpl/desk/advmon.c Wed Sep 26 23:23:50 2007 @@ -123,8 +123,8 @@ szFormatBuff[0] = _T('\0'); } - uiMonitorName = RegisterClipboardFormat(TEXT("Monitor Name")); - uiDisplayName = RegisterClipboardFormat(TEXT("Display Name")); + uiMonitorName = RegisterClipboardFormat(DESK_EXT_MONITORNAME); + uiDisplayName = RegisterClipboardFormat(DESK_EXT_DISPLAYNAME); lpMonitorName = QueryDevSettingsString(pdo, uiMonitorName); lpDisplayName = QueryDevSettingsString(pdo, uiDisplayName); Modified: trunk/reactos/dll/cpl/desk/desk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.h?rev=29… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.h (original) +++ trunk/reactos/dll/cpl/desk/desk.h Wed Sep 26 23:23:50 2007 @@ -12,6 +12,7 @@ #include <shlobj.h> #include <regstr.h> #include <cplext.h> +#include <dll/desk/deskcplx.h> #include "resource.h" Modified: trunk/reactos/dll/cpl/desk/devsett.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/devsett.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/devsett.c (original) +++ trunk/reactos/dll/cpl/desk/devsett.c Wed Sep 26 23:23:50 2007 @@ -11,37 +11,6 @@ #include <debug.h> #define DEBUG_DEVSETTINGS - -#define DESK_EXT_CALLBACK CALLBACK - -typedef PDEVMODEW (DESK_EXT_CALLBACK *PDESK_EXT_ENUMALLMODES)(PVOID Context, DWORD Index); -typedef PDEVMODEW (DESK_EXT_CALLBACK *PDESK_EXT_GETCURRENTMODE)(PVOID Context); -typedef BOOL (DESK_EXT_CALLBACK *PDESK_EXT_SETCURRENTMODE)(PVOID Context, const DEVMODEW *pDevMode); -typedef VOID (DESK_EXT_CALLBACK *PDESK_EXT_GETPRUNINGMODE)(PVOID Context, PBOOL pbModesPruned, PBOOL pbKeyIsReadOnly, PBOOL pbPruningOn); -typedef VOID (DESK_EXT_CALLBACK *PDESK_EXT_SETPRUNINGMODE)(PVOID Context, BOOL PruningOn); - -typedef struct _DESK_EXT_INTERFACE -{ - /* NOTE: This structure is binary compatible to XP. The windows shell - extensions rely on this structure to be properly filled! */ - DWORD cbSize; - - PVOID Context; /* This value is passed on to the callback routines */ - - /* Callback routines called by the shell extensions */ - PDESK_EXT_ENUMALLMODES EnumAllModes; - PDESK_EXT_SETCURRENTMODE SetCurrentMode; - PDESK_EXT_GETCURRENTMODE GetCurrentMode; - PDESK_EXT_SETPRUNINGMODE SetPruningMode; - PDESK_EXT_GETPRUNINGMODE GetPruningMode; - - /* HardwareInformation.* values provided in the device registry key */ - WCHAR MemorySize[128]; - WCHAR ChipType[128]; - WCHAR DacType[128]; - WCHAR AdapterString[128]; - WCHAR BiosString[128]; -} DESK_EXT_INTERFACE, *PDESK_EXT_INTERFACE; typedef struct _CDevSettings { @@ -424,16 +393,16 @@ DPRINT1("This->StateFlags: %x\n", This->StateFlags); /* Register clipboard formats */ - This->cfExtInterface = RegisterClipboardFormat(TEXT("Desk.cpl extension interface")); - This->cfDisplayDevice = RegisterClipboardFormat(TEXT("Display Device")); - This->cfDisplayName = RegisterClipboardFormat(TEXT("Display Name")); - This->cfDisplayId = RegisterClipboardFormat(TEXT("Display ID")); - This->cfDisplayKey = RegisterClipboardFormat(TEXT("Display Key")); - This->cfDisplayStateFlags = RegisterClipboardFormat(TEXT("Display State Flags")); - This->cfMonitorName = RegisterClipboardFormat(TEXT("Monitor Name")); - This->cfMonitorDevice = RegisterClipboardFormat(TEXT("Monitor Device")); - This->cfMonitorId = RegisterClipboardFormat(TEXT("Monitor ID")); - This->cfPruningMode = RegisterClipboardFormat(TEXT("Pruning Mode")); + This->cfExtInterface = RegisterClipboardFormat(DESK_EXT_EXTINTERFACE); + This->cfDisplayDevice = RegisterClipboardFormat(DESK_EXT_DISPLAYDEVICE); + This->cfDisplayName = RegisterClipboardFormat(DESK_EXT_DISPLAYNAME); + This->cfDisplayId = RegisterClipboardFormat(DESK_EXT_DISPLAYID); + This->cfDisplayKey = RegisterClipboardFormat(DESK_EXT_DISPLAYKEY); + This->cfDisplayStateFlags = RegisterClipboardFormat(DESK_EXT_DISPLAYSTATEFLAGS); + This->cfMonitorName = RegisterClipboardFormat(DESK_EXT_MONITORNAME); + This->cfMonitorDevice = RegisterClipboardFormat(DESK_EXT_MONITORDEVICE); + This->cfMonitorId = RegisterClipboardFormat(DESK_EXT_MONITORID); + This->cfPruningMode = RegisterClipboardFormat(DESK_EXT_PRUNINGMODE); /* Copy the device name */ This->pDisplayDevice = pCDevSettings_AllocAndCopyString(DisplayDeviceInfo->DeviceName); Added: trunk/reactos/include/reactos/dll/desk/deskcplx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/dll/desk/d… ============================================================================== --- trunk/reactos/include/reactos/dll/desk/deskcplx.h (added) +++ trunk/reactos/include/reactos/dll/desk/deskcplx.h Wed Sep 26 23:23:50 2007 @@ -1,0 +1,46 @@ +#ifndef __DESKCPLX__H +#define __DESKCPLX__H + +#define DESK_EXT_CALLBACK CALLBACK + +#define DESK_EXT_EXTINTERFACE TEXT("Desk.cpl extension interface") +#define DESK_EXT_PRUNINGMODE TEXT("Pruning Mode") +#define DESK_EXT_DISPLAYDEVICE TEXT("Display Device") +#define DESK_EXT_DISPLAYNAME TEXT("Display Name") +#define DESK_EXT_DISPLAYID TEXT("Display ID") +#define DESK_EXT_DISPLAYKEY TEXT("Display Key") +#define DESK_EXT_DISPLAYSTATEFLAGS TEXT("Display State Flags") +#define DESK_EXT_MONITORNAME TEXT("Monitor Name") +#define DESK_EXT_MONITORDEVICE TEXT("Monitor Device") +#define DESK_EXT_MONITORID TEXT("Monitor ID") + +typedef PDEVMODEW (DESK_EXT_CALLBACK *PDESK_EXT_ENUMALLMODES)(PVOID Context, DWORD Index); +typedef PDEVMODEW (DESK_EXT_CALLBACK *PDESK_EXT_GETCURRENTMODE)(PVOID Context); +typedef BOOL (DESK_EXT_CALLBACK *PDESK_EXT_SETCURRENTMODE)(PVOID Context, const DEVMODEW *pDevMode); +typedef VOID (DESK_EXT_CALLBACK *PDESK_EXT_GETPRUNINGMODE)(PVOID Context, PBOOL pbModesPruned, PBOOL pbKeyIsReadOnly, PBOOL pbPruningOn); +typedef VOID (DESK_EXT_CALLBACK *PDESK_EXT_SETPRUNINGMODE)(PVOID Context, BOOL PruningOn); + +typedef struct _DESK_EXT_INTERFACE +{ + /* NOTE: This structure is binary compatible to XP. The windows shell + extensions rely on this structure to be properly filled! */ + DWORD cbSize; + + PVOID Context; /* This value is passed on to the callback routines */ + + /* Callback routines called by the shell extensions */ + PDESK_EXT_ENUMALLMODES EnumAllModes; + PDESK_EXT_SETCURRENTMODE SetCurrentMode; + PDESK_EXT_GETCURRENTMODE GetCurrentMode; + PDESK_EXT_SETPRUNINGMODE SetPruningMode; + PDESK_EXT_GETPRUNINGMODE GetPruningMode; + + /* HardwareInformation.* values provided in the device registry key */ + WCHAR MemorySize[128]; + WCHAR ChipType[128]; + WCHAR DacType[128]; + WCHAR AdapterString[128]; + WCHAR BiosString[128]; +} DESK_EXT_INTERFACE, *PDESK_EXT_INTERFACE; + +#endif /* __DESKCPLX__H */ Propchange: trunk/reactos/include/reactos/dll/desk/deskcplx.h ------------------------------------------------------------------------------ svn:eol-style = native

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