Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mflyer] 20987: Correct icons. If your treeview code isn't picky about what size icon it will display, at least edit the icon so that the icon only includes the display size (16x16). Previous commit (mbosma, 20982) caused computer.ico to be sampled at a too large size and then resized to 16x16 (which is bad, bad, and ugly).
by mflyer＠svn.reactos.org 22 Jan '06

22 Jan '06

Correct icons. If your treeview code isn't picky about what size icon it will display, at least edit the icon so that the icon only includes the display size (16x16). Previous commit (mbosma, 20982) caused computer.ico to be sampled at a too large size and then resized to 16x16 (which is bad, bad, and ugly). Modified: trunk/reactos/subsys/system/regedit/res/computer.ico Modified: trunk/reactos/subsys/system/regedit/res/folder.ico Modified: trunk/reactos/subsys/system/regedit/res/folderopen.ico _____ Modified: trunk/reactos/subsys/system/regedit/res/computer.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/regedit/res/folder.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/regedit/res/folderopen.ico (Binary files differ)

1 0

[weiden] 20986: - secure access to buffers in NtPrivilegeCheck()
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

- secure access to buffers in NtPrivilegeCheck() - fixed SeCaptureLuidAndAttributesArray() and SeReleaseLuidAndAttributesArray() to securely capture the buffers Modified: trunk/reactos/ntoskrnl/include/internal/se.h Modified: trunk/reactos/ntoskrnl/se/priv.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/se.h --- trunk/reactos/ntoskrnl/include/internal/se.h 2006-01-22 22:33:22 UTC (rev 20985) +++ trunk/reactos/ntoskrnl/include/internal/se.h 2006-01-22 22:46:23 UTC (rev 20986) @@ -153,7 +153,7 @@ PLUID_AND_ATTRIBUTES AllocatedMem, ULONG AllocatedLength, POOL_TYPE PoolType, - ULONG d, + BOOLEAN CaptureIfKernel, PLUID_AND_ATTRIBUTES* Dest, PULONG Length ); @@ -163,7 +163,7 @@ SeReleaseLuidAndAttributesArray( PLUID_AND_ATTRIBUTES Privilege, KPROCESSOR_MODE PreviousMode, - ULONG a + BOOLEAN CaptureIfKernel ); BOOLEAN _____ Modified: trunk/reactos/ntoskrnl/se/priv.c --- trunk/reactos/ntoskrnl/se/priv.c 2006-01-22 22:33:22 UTC (rev 20985) +++ trunk/reactos/ntoskrnl/se/priv.c 2006-01-22 22:46:23 UTC (rev 20986) @@ -180,51 +180,96 @@ PLUID_AND_ATTRIBUTES AllocatedMem, ULONG AllocatedLength, POOL_TYPE PoolType, - ULONG d, + BOOLEAN CaptureIfKernel, PLUID_AND_ATTRIBUTES* Dest, PULONG Length) { - PLUID_AND_ATTRIBUTES* NewMem; - ULONG SrcLength; + ULONG BufferSize; + NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); + PAGED_CODE(); - if (PrivilegeCount == 0) + if (PrivilegeCount == 0) { - *Dest = 0; - *Length = 0; - return STATUS_SUCCESS; + *Dest = 0; + *Length = 0; + return STATUS_SUCCESS; } - if (PreviousMode == KernelMode && d == 0) + if (PreviousMode == KernelMode && !CaptureIfKernel) { - *Dest = Src; - return STATUS_SUCCESS; + *Dest = Src; + return STATUS_SUCCESS; } - SrcLength = ((PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES)) + 3) & 0xfc; - *Length = SrcLength; - if (AllocatedMem == NULL) + /* FIXME - check PrivilegeCount for a valid number so we don't + cause an integer overflow or exhaust system resources! */ + + BufferSize = PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); + *Length = ROUND_UP(BufferSize, 4); /* round up to a 4 byte alignment */ + + /* probe the buffer */ + if (PreviousMode != KernelMode) { - NewMem = ExAllocatePool (PoolType, - SrcLength); - *Dest = (PLUID_AND_ATTRIBUTES)NewMem; - if (NewMem == NULL) - { - return STATUS_UNSUCCESSFUL; - } + _SEH_TRY + { + ProbeForRead(Src, + BufferSize, + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + return Status; + } } - else + + /* allocate enough memory or check if the provided buffer is + large enough to hold the array */ + if (AllocatedMem != NULL) { - if (SrcLength > AllocatedLength) - { - return STATUS_UNSUCCESSFUL; - } - *Dest = AllocatedMem; + if (AllocatedLength < BufferSize) + { + return STATUS_BUFFER_TOO_SMALL; + } + + *Dest = AllocatedMem; } - memmove (*Dest, Src, SrcLength); + else + { + *Dest = ExAllocatePool(PoolType, + BufferSize); - return STATUS_SUCCESS; + if (&Dest == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + } + + /* copy the array to the buffer */ + _SEH_TRY + { + RtlCopyMemory(*Dest, + Src, + BufferSize); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status) && AllocatedMem == NULL) + { + ExFreePool(*Dest); + } + + return Status; } @@ -232,11 +277,15 @@ NTAPI SeReleaseLuidAndAttributesArray (PLUID_AND_ATTRIBUTES Privilege, KPROCESSOR_MODE PreviousMode, - ULONG a) + BOOLEAN CaptureIfKernel) { - PAGED_CODE(); + PAGED_CODE(); - ExFreePool (Privilege); + if (Privilege != NULL && + (PreviousMode != KernelMode || CaptureIfKernel)) + { + ExFreePool(Privilege); + } } @@ -245,18 +294,58 @@ IN PPRIVILEGE_SET RequiredPrivileges, IN PBOOLEAN Result) { - PLUID_AND_ATTRIBUTES Privilege; + PLUID_AND_ATTRIBUTES Privileges; PTOKEN Token; - ULONG PrivilegeCount; - ULONG PrivilegeControl; + ULONG PrivilegeCount = 0; + ULONG PrivilegeControl = 0; ULONG Length; + BOOLEAN CheckResult; KPROCESSOR_MODE PreviousMode; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); PreviousMode = KeGetPreviousMode(); + /* probe the buffers */ + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(RequiredPrivileges, + sizeof(PRIVILEGE_SET), + sizeof(ULONG)); + + PrivilegeCount = RequiredPrivileges->PrivilegeCount; + PrivilegeControl = RequiredPrivileges->Control; + + /* probe all of the array */ + ProbeForWrite(RequiredPrivileges, + sizeof(FIELD_OFFSET(PRIVILEGE_SET, + Privilege[PrivilegeCount])), + sizeof(ULONG)); + + ProbeForWriteBoolean(Result); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + else + { + PrivilegeCount = RequiredPrivileges->PrivilegeCount; + PrivilegeControl = RequiredPrivileges->Control; + } + + /* reference the token and make sure we're + not doing an anonymous impersonation */ Status = ObReferenceObjectByHandle (ClientToken, TOKEN_QUERY, SepTokenObjectType, @@ -269,45 +358,55 @@ } if (Token->TokenType == TokenImpersonation && - Token->ImpersonationLevel < SecurityAnonymous) + Token->ImpersonationLevel < SecurityIdentification) { ObDereferenceObject (Token); - return STATUS_UNSUCCESSFUL; + return STATUS_BAD_IMPERSONATION_LEVEL; } - PrivilegeCount = RequiredPrivileges->PrivilegeCount; - PrivilegeControl = RequiredPrivileges->Control; - Privilege = 0; + /* capture the privileges */ Status = SeCaptureLuidAndAttributesArray (RequiredPrivileges->Privilege, PrivilegeCount, - UserMode, + PreviousMode, NULL, 0, PagedPool, - 1, - &Privilege, + TRUE, + &Privileges, &Length); if (!NT_SUCCESS(Status)) { ObDereferenceObject (Token); - return STATUS_UNSUCCESSFUL; + return Status; } - *Result = SepPrivilegeCheck (Token, - Privilege, - PrivilegeCount, - PrivilegeControl, - UserMode); + CheckResult = SepPrivilegeCheck (Token, + Privileges, + PrivilegeCount, + PrivilegeControl, + PreviousMode); - memmove (RequiredPrivileges->Privilege, - Privilege, - Length); + ObDereferenceObject (Token); - SeReleaseLuidAndAttributesArray (Privilege, - UserMode, - 1); + /* return the array */ + _SEH_TRY + { + RtlCopyMemory(RequiredPrivileges->Privilege, + Privileges, + PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES));; + Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - return STATUS_SUCCESS; + SeReleaseLuidAndAttributesArray (Privileges, + PreviousMode, + TRUE); + + return Status; }

1 0

[gedmurphy] 20985: - Added a progress bar showing the status of the action on the service
by gedmurphy＠svn.reactos.org 22 Jan '06

22 Jan '06

- Added a progress bar showing the status of the action on the service - Better control over stopping, pausing and resuming - Get pointer to services via separate function Modified: trunk/reactos/subsys/system/servman/En.rc Modified: trunk/reactos/subsys/system/servman/about.c Modified: trunk/reactos/subsys/system/servman/control.c Added: trunk/reactos/subsys/system/servman/progress.c Modified: trunk/reactos/subsys/system/servman/propsheet.c Modified: trunk/reactos/subsys/system/servman/query.c Modified: trunk/reactos/subsys/system/servman/res/system.ico Modified: trunk/reactos/subsys/system/servman/servman.c Modified: trunk/reactos/subsys/system/servman/servman.h Modified: trunk/reactos/subsys/system/servman/servman.xml Modified: trunk/reactos/subsys/system/servman/start.c _____ Modified: trunk/reactos/subsys/system/servman/En.rc --- trunk/reactos/subsys/system/servman/En.rc 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/En.rc 2006-01-22 22:33:22 UTC (rev 20985) @@ -60,7 +60,7 @@ BEGIN LTEXT "Service Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 - CONTROL "",IDI_SM_ICON,"Static",0x50000203,0,12,7,30 + ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END @@ -125,7 +125,8 @@ IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 CAPTION "Service Control" FONT 8,"MS Sans Serif",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "",IDC_SERVCON_PROGRESS,"msctls_progress32",0x50000000,8,46,238,13 CONTROL "",IDC_SERVCON_INFO,"Static",0x50000000,8,5,236,11 @@ -177,5 +178,5 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_PROGRESS_INFO "ReactOS is attempting to %s the following service on %s" + IDS_PROGRESS_INFO "ReactOS is attempting to %s the following service" END _____ Modified: trunk/reactos/subsys/system/servman/about.c --- trunk/reactos/subsys/system/servman/about.c 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/about.c 2006-01-22 22:33:22 UTC (rev 20985) @@ -50,5 +50,5 @@ break; } - return 0; + return FALSE; } _____ Modified: trunk/reactos/subsys/system/servman/control.c --- trunk/reactos/subsys/system/servman/control.c 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/control.c 2006-01-22 22:33:22 UTC (rev 20985) @@ -12,13 +12,17 @@ extern HWND hListView; -BOOL Control(DWORD Control) +BOOL Control(HWND hProgDlg, DWORD Control) { + HWND hProgBar; SC_HANDLE hSCManager; SC_HANDLE hSc; ENUM_SERVICE_STATUS_PROCESS *Service = NULL; + SERVICE_STATUS_PROCESS ServiceStatus; SERVICE_STATUS Status; LVITEM item; + DWORD BytesNeeded = 0; + DWORD Loop = 5; //FIXME: testing value. needs better control item.mask = LVIF_PARAM; item.iItem = GetSelectedItem(); @@ -27,6 +31,11 @@ /* copy pointer to selected service */ Service = (ENUM_SERVICE_STATUS_PROCESS *)item.lParam; + /* set the progress bar range and step */ + hProgBar = GetDlgItem(hProgDlg, IDC_SERVCON_PROGRESS); + SendMessage(hProgBar, PBM_SETRANGE, 0, MAKELPARAM(0, Loop)); + SendMessage(hProgBar, PBM_SETSTEP, (WPARAM)1, 0); + /* open handle to the SCM */ hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (hSCManager == NULL) @@ -37,7 +46,7 @@ /* open handle to the service */ hSc = OpenService(hSCManager, Service->lpServiceName, - SERVICE_PAUSE_CONTINUE | SERVICE_STOP); + SC_MANAGER_ALL_ACCESS); if (hSc == NULL) { GetError(0); @@ -52,8 +61,50 @@ return FALSE; } + /* query the state of the service */ + if (! QueryServiceStatusEx(hSc, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + GetError(0); + return FALSE; + } + + /* loop whilst service is not running */ + /* FIXME: needs more control adding. 'Loop' is temparary */ + while (ServiceStatus.dwCurrentState != Control || !Loop) + { + /* increment the progress bar */ + SendMessage(hProgBar, PBM_STEPIT, 0, 0); + + /* wait before checking status */ + Sleep(ServiceStatus.dwWaitHint / 8); + + /* check status again */ + if (! QueryServiceStatusEx( + hSc, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + GetError(0); + return FALSE; + } + Loop--; + } + CloseServiceHandle(hSc); - return TRUE; + if (ServiceStatus.dwCurrentState == Control) + { + SendMessage(hProgBar, PBM_DELTAPOS, Loop, 0); + Sleep(1000); + return TRUE; + } + else + return FALSE; } _____ Added: trunk/reactos/subsys/system/servman/progress.c --- trunk/reactos/subsys/system/servman/progress.c 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/progress.c 2006-01-22 22:33:22 UTC (rev 20985) @@ -0,0 +1,45 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsys/system/servman/progress.c + * PURPOSE: Progress dialog box message handler + * COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> + * + */ + +#include "servman.h" + +extern HINSTANCE hInstance; +//extern HWND hMainWnd; + + +BOOL CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam) +{ + switch(Message) + { + case WM_INITDIALOG: + + break; + + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + DestroyWindow(hDlg); + break; + + } + break; + + case WM_DESTROY: + DestroyWindow(hDlg); + break; + + default: + return FALSE; + } + + return TRUE; + +} + _____ Modified: trunk/reactos/subsys/system/servman/propsheet.c --- trunk/reactos/subsys/system/servman/propsheet.c 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/propsheet.c 2006-01-22 22:33:22 UTC (rev 20985) @@ -77,18 +77,13 @@ { HKEY hKey; ENUM_SERVICE_STATUS_PROCESS *Service = NULL; - LVITEM item; PROP_DLG_INFO DlgInfo; LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); TCHAR buf[300]; - item.mask = LVIF_PARAM; - item.iItem = GetSelectedItem(); - SendMessage(hListView, LVM_GETITEM, 0, (LPARAM)&item); + /* get pointer to selected service */ + Service = GetSelectedService(); - /* copy pointer to selected service */ - Service = (ENUM_SERVICE_STATUS_PROCESS *)item.lParam; - /* open the registry key for the service */ _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), Path, Service->lpServiceName); RegOpenKeyEx(HKEY_LOCAL_MACHINE, _____ Modified: trunk/reactos/subsys/system/servman/query.c --- trunk/reactos/subsys/system/servman/query.c 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/query.c 2006-01-22 22:33:22 UTC (rev 20985) @@ -24,6 +24,24 @@ } + +ENUM_SERVICE_STATUS_PROCESS* +GetSelectedService(VOID) +{ + ENUM_SERVICE_STATUS_PROCESS *pSelectedService = NULL; + LVITEM item; + + item.mask = LVIF_PARAM; + item.iItem = GetSelectedItem(); + SendMessage(hListView, LVM_GETITEM, 0, (LPARAM)&item); + + /* copy pointer to selected service */ + pSelectedService = (ENUM_SERVICE_STATUS_PROCESS *)item.lParam; + + return pSelectedService; +} + + /* Retrives the service description from the registry */ BOOL GetDescription(HKEY hKey, LPTSTR *retDescription) { _____ Modified: trunk/reactos/subsys/system/servman/res/system.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-22 22:33:22 UTC (rev 20985) @@ -16,6 +16,7 @@ HWND hListView; HWND hStatus; HWND hTool; +HWND hProgDlg; HMENU hShortcutMenu; INT SelectedItem; @@ -343,8 +344,35 @@ break; case ID_START: - if ( DoStartService() ) + { + ENUM_SERVICE_STATUS_PROCESS *Service = NULL; + TCHAR buf1[100]; + TCHAR buf2[100]; + /* open the progress dialog */ + hProgDlg = CreateDialog(GetModuleHandle(NULL), + MAKEINTRESOURCE(IDD_DLG_PROGRESS), + hMainWnd, + (DLGPROC)ProgressDialogProc); + if (hProgDlg != NULL) { + ShowWindow(hProgDlg, SW_SHOW); + + /* write the info to the progress dialog */ + LoadString(hInstance, IDS_PROGRESS_INFO, buf1, + sizeof(buf1) / sizeof(TCHAR)); + _sntprintf(buf2, 100, buf1, _T("start")); + SendDlgItemMessage(hProgDlg, IDC_SERVCON_INFO, WM_SETTEXT, 0, (LPARAM)buf2); + + /* get pointer to selected service */ + Service = GetSelectedService(); + + /* write the service name to the progress dialog */ + SendDlgItemMessage(hProgDlg, IDC_SERVCON_NAME, WM_SETTEXT, 0, + (LPARAM)Service->lpServiceName); + } + + if ( DoStartService(hProgDlg) ) + { LVITEM item; TCHAR szStatus[64]; @@ -355,11 +383,41 @@ item.iSubItem = 2; SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } + + SendMessage(hProgDlg, WM_DESTROY, 0, 0); + } break; case ID_STOP: - if( Control(SERVICE_CONTROL_STOP) ) + { + ENUM_SERVICE_STATUS_PROCESS *Service = NULL; + TCHAR buf1[100]; + TCHAR buf2[100]; + /* open the progress dialog */ + hProgDlg = CreateDialog(GetModuleHandle(NULL), + MAKEINTRESOURCE(IDD_DLG_PROGRESS), + hMainWnd, + (DLGPROC)ProgressDialogProc); + if (hProgDlg != NULL) { + ShowWindow(hProgDlg, SW_SHOW); + + /* write the info to the progress dialog */ + LoadString(hInstance, IDS_PROGRESS_INFO, buf1, + sizeof(buf1) / sizeof(TCHAR)); + _sntprintf(buf2, 100, buf1, _T("stop")); + SendDlgItemMessage(hProgDlg, IDC_SERVCON_INFO, WM_SETTEXT, 0, (LPARAM)buf2); + + /* get pointer to selected service */ + Service = GetSelectedService(); + + /* write the service name to the progress dialog */ + SendDlgItemMessage(hProgDlg, IDC_SERVCON_NAME, WM_SETTEXT, 0, + (LPARAM)Service->lpServiceName); + } + + if( Control(hProgDlg, SERVICE_CONTROL_STOP) ) + { LVITEM item; item.pszText = '\0'; @@ -367,39 +425,22 @@ item.iSubItem = 2; SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } + + SendMessage(hProgDlg, WM_DESTROY, 0, 0); + } break; case ID_PAUSE: - Control(SERVICE_CONTROL_PAUSE); + Control(hProgDlg, SERVICE_CONTROL_PAUSE); break; case ID_RESUME: - Control(SERVICE_CONTROL_CONTINUE ); + Control(hProgDlg, SERVICE_CONTROL_CONTINUE ); break; case ID_RESTART: - if( Control(SERVICE_CONTROL_STOP) ) - { - LVITEM item; - - item.pszText = '\0'; - item.iItem = GetSelectedItem(); - item.iSubItem = 2; - SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); - - if ( DoStartService() ) - { - LVITEM item; - TCHAR szStatus[64]; - - LoadString(hInstance, IDS_SERVICES_STARTED, szStatus, - sizeof(szStatus) / sizeof(TCHAR)); - item.pszText = szStatus; - item.iItem = GetSelectedItem(); - item.iSubItem = 2; - SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); - } - } + SendMessage(hMainWnd, WM_COMMAND, 0, ID_STOP); + SendMessage(hMainWnd, WM_COMMAND, 0, ID_START); break; case ID_NEW: @@ -420,8 +461,8 @@ case ID_ABOUT: DialogBox(hInstance, MAKEINTRESOURCE(IDD_ABOUTBOX), - hwnd, - AboutDialogProc); + hMainWnd, + (DLGPROC)AboutDialogProc); break; } @@ -497,8 +538,11 @@ while( GetMessage( &Msg, NULL, 0, 0 ) ) { - TranslateMessage(&Msg); - DispatchMessage(&Msg); + if(! IsDialogMessage(hProgDlg, &Msg) ) + { + TranslateMessage(&Msg); + DispatchMessage(&Msg); + } } return (int)Msg.wParam; _____ Modified: trunk/reactos/subsys/system/servman/servman.h --- trunk/reactos/subsys/system/servman/servman.h 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/servman.h 2006-01-22 22:33:22 UTC (rev 20985) @@ -15,12 +15,15 @@ BOOL RefreshServiceList(VOID); BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +BOOL CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam); -BOOL DoStartService(VOID); -BOOL Control(DWORD Control); +BOOL DoStartService(HWND hProgDlg); +BOOL Control(HWND hProgBar, DWORD Control); INT GetSelectedItem(VOID); +ENUM_SERVICE_STATUS_PROCESS* GetSelectedService(VOID); + VOID GetError(DWORD); VOID FreeMemory(VOID); VOID DisplayString(PTCHAR); _____ Modified: trunk/reactos/subsys/system/servman/servman.xml --- trunk/reactos/subsys/system/servman/servman.xml 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/servman.xml 2006-01-22 22:33:22 UTC (rev 20985) @@ -16,6 +16,7 @@ <file>about.c</file> <file>control.c</file> <file>geterror.c</file> + <file>progress.c</file> <file>propsheet.c</file> <file>query.c</file> <file>servman.c</file> _____ Modified: trunk/reactos/subsys/system/servman/start.c --- trunk/reactos/subsys/system/servman/start.c 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/start.c 2006-01-22 22:33:22 UTC (rev 20985) @@ -10,17 +10,19 @@ #include "servman.h" extern HWND hListView; +extern HWND hMainWnd; -BOOL DoStartService(VOID) +BOOL DoStartService(HWND hProgDlg) { + HWND hProgBar; SC_HANDLE hSCManager; SC_HANDLE hSc; SERVICE_STATUS_PROCESS ServiceStatus; ENUM_SERVICE_STATUS_PROCESS *Service = NULL; LVITEM item; - DWORD BytesNeeded; + DWORD BytesNeeded = 0; INT ArgCount = 0; - BOOL Loop = 10; //FIXME: testing value. needs better control + DWORD Loop = 5; //FIXME: testing value. needs better control item.mask = LVIF_PARAM; item.iItem = GetSelectedItem(); @@ -29,6 +31,11 @@ /* copy pointer to selected service */ Service = (ENUM_SERVICE_STATUS_PROCESS *)item.lParam; + /* set the progress bar range and step */ + hProgBar = GetDlgItem(hProgDlg, IDC_SERVCON_PROGRESS); + SendMessage(hProgBar, PBM_SETRANGE, 0, MAKELPARAM(0, Loop)); + SendMessage(hProgBar, PBM_SETSTEP, (WPARAM)1, 0); + /* open handle to the SCM */ hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (hSCManager == NULL) @@ -53,12 +60,11 @@ } /* query the state of the service */ - if (! QueryServiceStatusEx( - hSc, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &BytesNeeded)) + if (! QueryServiceStatusEx(hSc, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) { GetError(0); return FALSE; @@ -66,10 +72,13 @@ /* loop whilst service is not running */ /* FIXME: needs more control adding. 'Loop' is temparary */ - while (ServiceStatus.dwCurrentState == SERVICE_START_PENDING || !Loop) + while (ServiceStatus.dwCurrentState != SERVICE_RUNNING || !Loop) { + /* increment the progress bar */ + SendMessage(hProgBar, PBM_STEPIT, 0, 0); + /* wait before checking status */ - Sleep(ServiceStatus.dwWaitHint); + Sleep(ServiceStatus.dwWaitHint / 8); /* check status again */ if (! QueryServiceStatusEx( @@ -88,7 +97,11 @@ CloseServiceHandle(hSc); if (ServiceStatus.dwCurrentState == SERVICE_RUNNING) + { + SendMessage(hProgBar, PBM_DELTAPOS, Loop, 0); + Sleep(1000); return TRUE; + } else return FALSE;

1 0

[weiden] 20984: add SEH to NtW32Call and directly use KeUserModeCallback in win32k instead
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

add SEH to NtW32Call and directly use KeUserModeCallback in win32k instead Modified: trunk/reactos/include/ndk/kefuncs.h Modified: trunk/reactos/ntoskrnl/ps/win32.c Modified: trunk/reactos/subsys/win32k/ntuser/callback.c _____ Modified: trunk/reactos/include/ndk/kefuncs.h --- trunk/reactos/include/ndk/kefuncs.h 2006-01-22 15:55:14 UTC (rev 20983) +++ trunk/reactos/include/ndk/kefuncs.h 2006-01-22 20:34:47 UTC (rev 20984) @@ -426,8 +426,8 @@ IN ULONG RoutineIndex, IN PVOID Argument, IN ULONG ArgumentLength, - OUT PVOID* Result OPTIONAL, - OUT PULONG ResultLength OPTIONAL + OUT PVOID* Result, + OUT PULONG ResultLength ); NTSTATUS _____ Modified: trunk/reactos/ntoskrnl/ps/win32.c --- trunk/reactos/ntoskrnl/ps/win32.c 2006-01-22 15:55:14 UTC (rev 20983) +++ trunk/reactos/ntoskrnl/ps/win32.c 2006-01-22 20:34:47 UTC (rev 20984) @@ -192,25 +192,56 @@ NtW32Call(IN ULONG RoutineIndex, IN PVOID Argument, IN ULONG ArgumentLength, - OUT PVOID* Result OPTIONAL, - OUT PULONG ResultLength OPTIONAL) + OUT PVOID* Result, + OUT PULONG ResultLength) { - NTSTATUS CallbackStatus; + PVOID RetResult; + ULONG RetResultLength; + NTSTATUS Status = STATUS_SUCCESS; - DPRINT("NtW32Call(RoutineIndex %d, Argument %X, ArgumentLength %d)\n", + DPRINT("NtW32Call(RoutineIndex %d, Argument %p, ArgumentLength %d)\n", RoutineIndex, Argument, ArgumentLength); - /* FIXME: SEH!!! */ + /* must not be called as KernelMode! */ + ASSERT(KeGetPreviousMode() != KernelMode); - /* Call kernel function */ - CallbackStatus = KeUserModeCallback(RoutineIndex, - Argument, - ArgumentLength, - Result, - ResultLength); + _SEH_TRY + { + ProbeForWritePointer(Result); + ProbeForWriteUlong(ResultLength); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (NT_SUCCESS(Status)) + { + /* Call kernel function */ + Status = KeUserModeCallback(RoutineIndex, + Argument, + ArgumentLength, + &RetResult, + &RetResultLength); + + if (NT_SUCCESS(Status)) + { + _SEH_TRY + { + *Result = RetResult; + *ResultLength = RetResultLength; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + } + /* Return the result */ - return(CallbackStatus); + return Status; } /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/callback.c --- trunk/reactos/subsys/win32k/ntuser/callback.c 2006-01-22 15:55:14 UTC (rev 20983) +++ trunk/reactos/subsys/win32k/ntuser/callback.c 2006-01-22 20:34:47 UTC (rev 20984) @@ -116,6 +116,8 @@ LRESULT Result) { SENDASYNCPROC_CALLBACK_ARGUMENTS Arguments; + PVOID ResultPointer; + ULONG ResultLength; NTSTATUS Status; Arguments.Callback = CompletionCallback; @@ -126,11 +128,11 @@ UserLeaveCo(); - Status = NtW32Call(USER32_CALLBACK_SENDASYNCPROC, - &Arguments, - sizeof(SENDASYNCPROC_CALLBACK_ARGUMENTS), - NULL, - NULL); + Status = KeUserModeCallback(USER32_CALLBACK_SENDASYNCPROC, + &Arguments, + sizeof(SENDASYNCPROC_CALLBACK_ARGUMENTS), + &ResultPointer, + &ResultLength); UserEnterCo(); @@ -187,11 +189,11 @@ UserLeaveCo(); - Status = NtW32Call(USER32_CALLBACK_WINDOWPROC, - Arguments, - ArgumentLength, - &ResultPointer, - &ResultLength); + Status = KeUserModeCallback(USER32_CALLBACK_WINDOWPROC, + Arguments, + ArgumentLength, + &ResultPointer, + &ResultLength); /* Simulate old behaviour: copy into our local buffer */ RtlMoveMemory(Arguments, ResultPointer, ArgumentLength); @@ -232,11 +234,11 @@ UserLeaveCo(); - Status = NtW32Call(USER32_CALLBACK_LOADSYSMENUTEMPLATE, - NULL, - 0, - &ResultPointer, - &ResultLength); + Status = KeUserModeCallback(USER32_CALLBACK_LOADSYSMENUTEMPLATE, + NULL, + 0, + &ResultPointer, + &ResultLength); /* Simulate old behaviour: copy into our local buffer */ Result = *(LRESULT*)ResultPointer; @@ -264,11 +266,11 @@ UserLeaveCo(); - Status = NtW32Call(USER32_CALLBACK_LOADDEFAULTCURSORS, - &DefaultCursor, - sizeof(BOOL), - &ResultPointer, - &ResultLength); + Status = KeUserModeCallback(USER32_CALLBACK_LOADDEFAULTCURSORS, + &DefaultCursor, + sizeof(BOOL), + &ResultPointer, + &ResultLength); /* Simulate old behaviour: copy into our local buffer */ Result = *(LRESULT*)ResultPointer; @@ -398,11 +400,11 @@ UserLeaveCo(); - Status = NtW32Call(USER32_CALLBACK_HOOKPROC, - Argument, - ArgumentLength, - &ResultPointer, - &ResultLength); + Status = KeUserModeCallback(USER32_CALLBACK_HOOKPROC, + Argument, + ArgumentLength, + &ResultPointer, + &ResultLength); /* Simulate old behaviour: copy into our local buffer */ Result = *(LRESULT*)ResultPointer;

1 0

[weiden] 20983: set a last error code in case translating the path failed in InternalFindFirstFile()
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

set a last error code in case translating the path failed in InternalFindFirstFile() Modified: trunk/reactos/lib/kernel32/file/find.c _____ Modified: trunk/reactos/lib/kernel32/file/find.c --- trunk/reactos/lib/kernel32/file/find.c 2006-01-22 15:40:43 UTC (rev 20982) +++ trunk/reactos/lib/kernel32/file/find.c 2006-01-22 15:55:14 UTC (rev 20983) @@ -49,20 +49,6 @@ /* FUNCTIONS ****************************************************************/ -static __inline PKERNEL32_FIND_FILE_DATA -HandleToFindData(IN HANDLE Handle) -{ - PKERNEL32_FIND_DATA_HEADER FindData = (PKERNEL32_FIND_DATA_HEADER)Handle; - - if (Handle != NULL && Handle != INVALID_HANDLE_VALUE && - FindData->Type == FileFind) - { - return (PKERNEL32_FIND_FILE_DATA)(FindData + 1); - } - - return NULL; -} - VOID InternalCopyFindDataW(LPWIN32_FIND_DATAW lpFindFileData, PFILE_BOTH_DIR_INFORMATION lpFileInfo) @@ -335,6 +321,7 @@ 0, SlashlessFileName); } + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; }

1 0

[mbosma] 20982: Add high resolution of computer.ico and replace regedit.ico with the tango config one. (was just a generic application icon)
by mbosma＠svn.reactos.org 22 Jan '06

22 Jan '06

Add high resolution of computer.ico and replace regedit.ico with the tango config one. (was just a generic application icon) Modified: trunk/reactos/subsys/system/regedit/res/computer.ico Modified: trunk/reactos/subsys/system/regedit/res/regedit.ico Modified: trunk/reactos/subsys/system/regedit/treeview.c _____ Modified: trunk/reactos/subsys/system/regedit/res/computer.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/regedit/res/regedit.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/regedit/treeview.c --- trunk/reactos/subsys/system/regedit/treeview.c 2006-01-22 15:14:43 UTC (rev 20981) +++ trunk/reactos/subsys/system/regedit/treeview.c 2006-01-22 15:40:43 UTC (rev 20982) @@ -414,7 +414,7 @@ /* Create the image list. */ if ((himl = ImageList_Create(CX_ICON, CY_ICON, - ILC_MASK, 0, NUM_ICONS)) == NULL) + ILC_MASK|ILC_COLOR32, 0, NUM_ICONS)) == NULL) return FALSE; /* Add the open file, closed file, and document bitmaps. */

1 0

[gedmurphy] 20981: I have no excuse. It's not even early or late ....
by gedmurphy＠svn.reactos.org 22 Jan '06

22 Jan '06

I have no excuse. It's not even early or late .... Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2006-01-22 15:05:43 UTC (rev 20980) +++ trunk/reactos/bootdata/hivesys.inf 2006-01-22 15:14:43 UTC (rev 20981) @@ -693,7 +693,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Type",0x00010001,0x00 000010 ; RPC service -HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Description",0x00000000 ,"HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000 ,"Enables a computer to recognize and adapt to hardware changes with little or no user input" +HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Description",0x00000000 ,"Enables a computer to recognize and adapt to hardware changes with little or no user input" HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ErrorControl",0x00010001 ,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ImagePath",0x00020000,"% SystemRoot%\system32\rpcss.exe" HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Start",0x00010001,0x0000 0004

1 0

[gedmurphy] 20980: put brain into gear ....
by gedmurphy＠svn.reactos.org 22 Jan '06

22 Jan '06

put brain into gear .... Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2006-01-22 14:57:33 UTC (rev 20979) +++ trunk/reactos/bootdata/hivesys.inf 2006-01-22 15:05:43 UTC (rev 20980) @@ -685,7 +685,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Type",0x00010001,0x0000 0001 ; Plug and Play manager -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000, "Enables a computer to recognize and adapt to hardware changes with little or no user input. Stopping or disabling this service will result in system instability." +HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Description",0x00000 000,"Enables a computer to recognize and adapt to hardware changes with little or no user input. Stopping or disabling this service will result in system instability." HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","ErrorControl",0x00010 001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Group",0x00000000,"Pl ugPlay" HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","ImagePath",0x00020000 ,"%SystemRoot%\system32\umpnpmgr.exe" @@ -693,7 +693,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Type",0x00010001,0x00 000010 ; RPC service -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000, "HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000, "Enables a computer to recognize and adapt to hardware changes with little or no user input" +HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Description",0x00000000 ,"HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000 ,"Enables a computer to recognize and adapt to hardware changes with little or no user input" HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ErrorControl",0x00010001 ,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ImagePath",0x00020000,"% SystemRoot%\system32\rpcss.exe" HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Start",0x00010001,0x0000 0004

1 0

[gedmurphy] 20979: add some descriptions for listed services
by gedmurphy＠svn.reactos.org 22 Jan '06

22 Jan '06

add some descriptions for listed services Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2006-01-22 14:33:04 UTC (rev 20978) +++ trunk/reactos/bootdata/hivesys.inf 2006-01-22 14:57:33 UTC (rev 20979) @@ -534,6 +534,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Type",0x00010001,0x000000 01 ; Event logging service +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Description",0x00000 000,"Enables event log messages issued by Windows-based programs and components to be viewed in Event Viewer. This service cannot be stopped" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","ErrorControl",0x00010 001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Group",0x00000000,"Ev ent log" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","ImagePath",0x00020000 ,"%SystemRoot%\system32\eventlog.exe" @@ -541,6 +542,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Type",0x00010001,0x00 000010 ; DHCP client service +HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000, "Manages network configuration by registering and updating IP addresses and DNS names" HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ErrorControl",0x00010001, 0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Group",0x00000000,"Networ k" HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ImagePath",0x00020000,"%S ystemRoot%\system32\dhcp.exe" @@ -683,6 +685,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Type",0x00010001,0x0000 0001 ; Plug and Play manager +HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000, "Enables a computer to recognize and adapt to hardware changes with little or no user input. Stopping or disabling this service will result in system instability." HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","ErrorControl",0x00010 001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Group",0x00000000,"Pl ugPlay" HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","ImagePath",0x00020000 ,"%SystemRoot%\system32\umpnpmgr.exe" @@ -690,6 +693,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Type",0x00010001,0x00 000010 ; RPC service +HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000, "HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000, "Enables a computer to recognize and adapt to hardware changes with little or no user input" HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ErrorControl",0x00010001 ,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ImagePath",0x00020000,"% SystemRoot%\system32\rpcss.exe" HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Start",0x00010001,0x0000 0004 @@ -766,7 +770,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDr ivers",0x00010000,"vgaddi" ; Windows Installer Service - HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000 000,"Adds, modifies, and removes applications provided as a Windows Installer (*.msi) package. If this service is disabled, any services that explicitly depend on it will fail to start." HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Group",0x00000000,"W indows Installer" HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ErrorControl",0x0001 0001,0x00000001

1 0

[ekohl] 20978: Forward CM_Create_DevNode[_Ex]A/W to umpnpmgr.
by ekohl＠svn.reactos.org 22 Jan '06

22 Jan '06

Forward CM_Create_DevNode[_Ex]A/W to umpnpmgr. Modified: trunk/reactos/include/idl/pnp.idl Modified: trunk/reactos/include/wine/cfgmgr32.h Modified: trunk/reactos/lib/cfgmgr32/cfgmgr32.def Modified: trunk/reactos/lib/setupapi/cfgmgr.c Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h _____ Modified: trunk/reactos/include/idl/pnp.idl --- trunk/reactos/include/idl/pnp.idl 2006-01-22 14:08:06 UTC (rev 20977) +++ trunk/reactos/include/idl/pnp.idl 2006-01-22 14:33:04 UTC (rev 20978) @@ -16,163 +16,170 @@ ] interface pnp { - /* Function 0 */ -// CONFIGRET PNP_Unknown0(handle_t BindingHandle); + /* Function 0 */ +// CONFIGRET PNP_Unknown0(handle_t BindingHandle); - /* Function 1 */ -// CONFIGRET PNP_Unknown1(handle_t BindingHandle); + /* Function 1 */ +// CONFIGRET PNP_Unknown1(handle_t BindingHandle); - /* Function 2 */ - CONFIGRET PNP_GetVersion(handle_t BindingHandle, - [out] WORD *Version); + /* Function 2 */ + CONFIGRET PNP_GetVersion(handle_t BindingHandle, + [out] WORD *Version); - /* Function 3 */ - CONFIGRET PNP_GetGlobalState(handle_t BindingHandle, - [out] unsigned long *State, - [in] unsigned long Flags); + /* Function 3 */ + CONFIGRET PNP_GetGlobalState(handle_t BindingHandle, + [out] unsigned long *State, + [in] unsigned long Flags); - /* Function 4 */ - CONFIGRET PNP_InitDetection(handle_t BindingHandle); + /* Function 4 */ + CONFIGRET PNP_InitDetection(handle_t BindingHandle); - /* Function 5 */ - CONFIGRET PNP_ReportLogOn(handle_t BindingHandle, - [in] BOOL Admin, - [in] DWORD ProcessId); + /* Function 5 */ + CONFIGRET PNP_ReportLogOn(handle_t BindingHandle, + [in] BOOL Admin, + [in] DWORD ProcessId); - /* Function 6 */ - CONFIGRET PNP_ValidateDeviceInstance(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [in] DWORD Flags); + /* Function 6 */ + CONFIGRET PNP_ValidateDeviceInstance(handle_t BindingHandle, + [in, string] wchar_t *DeviceInstance, + [in] DWORD Flags); - /* Function 7 */ - CONFIGRET PNP_GetRootDeviceInstance(handle_t BindingHandle, - [out, string, size_is(Length)] wchar_t *DeviceInstance, - [in] DWORD Length); + /* Function 7 */ + CONFIGRET PNP_GetRootDeviceInstance(handle_t BindingHandle, + [out, string, size_is(Length)] wchar_t *DeviceInstance, + [in] DWORD Length); - /* Function 8 */ - cpp_quote("#define PNP_DEVICE_PARENT 1") - cpp_quote("#define PNP_DEVICE_CHILD 2") - cpp_quote("#define PNP_DEVICE_SIBLING 3") - CONFIGRET PNP_GetRelatedDeviceInstance(handle_t BindingHandle, - [in] DWORD Relationship, - [in, string] wchar_t *DeviceId, - [out, string, size_is(Length)] wchar_t *RelatedDeviceId, - [in] DWORD Length, - [in] DWORD Flags); + /* Function 8 */ + cpp_quote("#define PNP_DEVICE_PARENT 1") + cpp_quote("#define PNP_DEVICE_CHILD 2") + cpp_quote("#define PNP_DEVICE_SIBLING 3") + CONFIGRET PNP_GetRelatedDeviceInstance(handle_t BindingHandle, + [in] DWORD Relationship, + [in, string] wchar_t *DeviceId, + [out, string, size_is(Length)] wchar_t *RelatedDeviceId, + [in] DWORD Length, + [in] DWORD Flags); - /* Function 9 */ - cpp_quote("#define PNP_BRANCH_ENUM 1") - cpp_quote("#define PNP_BRANCH_CLASS 2") - CONFIGRET PNP_EnumerateSubKeys(handle_t BindingHandle, - [in] unsigned long Branch, - [in] unsigned long Index, - [out, string, size_is(Length)] wchar_t *Buffer, - [in] unsigned long Length, - [out] unsigned long *RequiredLength, - [in] DWORD Flags); + /* Function 9 */ + cpp_quote("#define PNP_BRANCH_ENUM 1") + cpp_quote("#define PNP_BRANCH_CLASS 2") + CONFIGRET PNP_EnumerateSubKeys(handle_t BindingHandle, + [in] unsigned long Branch, + [in] unsigned long Index, + [out, string, size_is(Length)] wchar_t *Buffer, + [in] unsigned long Length, + [out] unsigned long *RequiredLength, + [in] DWORD Flags); - /* Function 10 */ -// CONFIGRET PNP_GetDeviceList(handle_t BindingHandle, -// [in, unique, string] wchar_t *Filter, -// [out, string, size_is(*Length)] unsigned char *Buffer -// [in, out] unsigned long *Length, -// [in] DWORD Flags); + /* Function 10 */ +// CONFIGRET PNP_GetDeviceList(handle_t BindingHandle, +// [in, unique, string] wchar_t *Filter, +// [out, string, size_is(*Length)] unsigned char *Buffer +// [in, out] unsigned long *Length, +// [in] DWORD Flags); - /* Function 11 */ - CONFIGRET PNP_GetDeviceListSize(handle_t BindingHandle, - [in, unique, string] wchar_t *Filter, - [out] unsigned long *Length, - [in] DWORD Flags); + /* Function 11 */ + CONFIGRET PNP_GetDeviceListSize(handle_t BindingHandle, + [in, unique, string] wchar_t *Filter, + [out] unsigned long *Length, + [in] DWORD Flags); - /* Function 12 */ - CONFIGRET PNP_GetDepth(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [out] unsigned long *Depth, - [in] DWORD Flags); + /* Function 12 */ + CONFIGRET PNP_GetDepth(handle_t BindingHandle, + [in, string] wchar_t *DeviceInstance, + [out] unsigned long *Depth, + [in] DWORD Flags); - /* Function 13 */ - CONFIGRET PNP_GetDeviceRegProp(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [in] unsigned long Property, - [in, out] unsigned long *DataType, - [out, size_is(*TransferLen)] char *Buffer, - [in, out] unsigned long *TransferLen, - [in, out] unsigned long *Length, - [in] DWORD Flags); + /* Function 13 */ + CONFIGRET PNP_GetDeviceRegProp(handle_t BindingHandle, + [in, string] wchar_t *DeviceInstance, + [in] unsigned long Property, + [in, out] unsigned long *DataType, + [out, size_is(*TransferLen)] char *Buffer, + [in, out] unsigned long *TransferLen, + [in, out] unsigned long *Length, + [in] DWORD Flags); - /* Function 14 */ - CONFIGRET PNP_SetDeviceRegProp(handle_t BindingHandle, - [in, string] wchar_t *DeviceId, - [in] unsigned long Property, - [in] unsigned long DataType, - [in, size_is(Length)] char *Buffer, - [in] unsigned long Length, - [in] unsigned long Flags); + /* Function 14 */ + CONFIGRET PNP_SetDeviceRegProp(handle_t BindingHandle, + [in, string] wchar_t *DeviceId, + [in] unsigned long Property, + [in] unsigned long DataType, + [in, size_is(Length)] char *Buffer, + [in] unsigned long Length, + [in] unsigned long Flags); - /* Function 15 */ - CONFIGRET PNP_GetClassInstance(handle_t BindingHandle, - [in, string] wchar_t *DeviceId, - [out, string, size_is(Length)] wchar_t *Buffer, - [in] unsigned long Length); + /* Function 15 */ + CONFIGRET PNP_GetClassInstance(handle_t BindingHandle, + [in, string] wchar_t *DeviceId, + [out, string, size_is(Length)] wchar_t *Buffer, + [in] unsigned long Length); - /* Function 16 */ - CONFIGRET PNP_CreateKey(handle_t BindingHandle, - [in, string] wchar_t *SubKey, - [in] unsigned long DesiredAccess, - [in] unsigned long Flags); + /* Function 16 */ + CONFIGRET PNP_CreateKey(handle_t BindingHandle, + [in, string] wchar_t *SubKey, + [in] unsigned long DesiredAccess, + [in] unsigned long Flags); - /* Function 17 */ - CONFIGRET PNP_DeleteRegistryKey(handle_t BindingHandle, - [in, string] wchar_t *DeviceId, - [in, string] wchar_t *ParentKey, - [in, string] wchar_t *ChildKey, - [in] unsigned long Flags); + /* Function 17 */ + CONFIGRET PNP_DeleteRegistryKey(handle_t BindingHandle, + [in, string] wchar_t *DeviceId, + [in, string] wchar_t *ParentKey, + [in, string] wchar_t *ChildKey, + [in] unsigned long Flags); - /* Function 19 */ - CONFIGRET PNP_GetClassName(handle_t BindingHandle, - [in, string] wchar_t *ClassGuid, - [out, string, size_is(*Length)] wchar_t *Buffer, - [in, out] unsigned long *Length, - [in] unsigned long Flags); - - /* Function 20 */ - CONFIGRET PNP_DeleteClassKey(handle_t BindingHandle, + /* Function 19 */ + CONFIGRET PNP_GetClassName(handle_t BindingHandle, [in, string] wchar_t *ClassGuid, + [out, string, size_is(*Length)] wchar_t *Buffer, + [in, out] unsigned long *Length, [in] unsigned long Flags); - /* Function 29 */ - CONFIGRET PNP_DeviceInstanceAction(handle_t BindingHandle, - [in] unsigned long MajorAction, - [in] unsigned long MinorAction, - [in, unique, string] wchar_t *DeviceInstance1, - [in, unique, string] wchar_t *DeviceInstance2); + /* Function 20 */ + CONFIGRET PNP_DeleteClassKey(handle_t BindingHandle, + [in, string] wchar_t *ClassGuid, + [in] unsigned long Flags); - /* Function 30 */ - CONFIGRET PNP_GetDeviceStatus(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [out] unsigned long *Status, - [out] unsigned long *Problem, - [in] DWORD Flags); + /* Function 28 */ + CONFIGRET PNP_CreateDevInst(handle_t BindingHandle, + [in, out, string, size_is(Length)] wchar_t *DeviceId, + [in, string] wchar_t *ParentDeviceId, + [in] unsigned long Length, + [in] unsigned long Flags); - /* Function 31 */ - CONFIGRET PNP_SetDeviceProblem(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [in] unsigned long Problem, - [in] DWORD Flags); + /* Function 29 */ + CONFIGRET PNP_DeviceInstanceAction(handle_t BindingHandle, + [in] unsigned long MajorAction, + [in] unsigned long MinorAction, + [in, unique, string] wchar_t *DeviceInstance1, + [in, unique, string] wchar_t *DeviceInstance2); - /* Function 33 */ - CONFIGRET PNP_UninstallDevInst(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [in] DWORD Flags); + /* Function 30 */ + CONFIGRET PNP_GetDeviceStatus(handle_t BindingHandle, + [in, string] wchar_t *DeviceInstance, + [out] unsigned long *Status, + [out] unsigned long *Problem, + [in] DWORD Flags); - /* Function 38 */ - CONFIGRET PNP_IsDockStationPresent(handle_t BindingHandle, - [out]PBOOL Present); + /* Function 31 */ + CONFIGRET PNP_SetDeviceProblem(handle_t BindingHandle, + [in, string] wchar_t *DeviceInstance, + [in] unsigned long Problem, + [in] DWORD Flags); - /* Function 39 */ - CONFIGRET PNP_RequestEjectPC(handle_t BindingHandle); + /* Function 33 */ + CONFIGRET PNP_UninstallDevInst(handle_t BindingHandle, + [in, string] wchar_t *DeviceInstance, + [in] DWORD Flags); - /* Function 58 */ - CONFIGRET PNP_RunDetection(handle_t BindingHandle, - [in] unsigned long Flags); + /* Function 38 */ + CONFIGRET PNP_IsDockStationPresent(handle_t BindingHandle, + [out]PBOOL Present); + + /* Function 39 */ + CONFIGRET PNP_RequestEjectPC(handle_t BindingHandle); + + /* Function 58 */ + CONFIGRET PNP_RunDetection(handle_t BindingHandle, + [in] unsigned long Flags); } _____ Modified: trunk/reactos/include/wine/cfgmgr32.h --- trunk/reactos/include/wine/cfgmgr32.h 2006-01-22 14:08:06 UTC (rev 20977) +++ trunk/reactos/include/wine/cfgmgr32.h 2006-01-22 14:33:04 UTC (rev 20978) @@ -163,6 +163,22 @@ #define CM_SETUP_DEVINST_RESET CM_SETUP_DEVNODE_RESET #define CM_SETUP_BITS 0x00000007 +/* ulFlags for CM_Create_DevNode[_Ex]A/W */ +#define CM_CREATE_DEVNODE_NORMAL 0x00000000 +#define CM_CREATE_DEVNODE_NO_WAIT_INSTALL 0x00000001 +#define CM_CREATE_DEVNODE_PHANTOM 0x00000002 +#define CM_CREATE_DEVNODE_GENERATE_ID 0x00000004 +#define CM_CREATE_DEVNODE_DO_NOT_INSTALL 0x00000008 +#define CM_CREATE_DEVNODE_BITS 0x0000000F + +#define CM_CREATE_DEVINST_NORMAL CM_CREATE_DEVNODE_NORMAL +#define CM_CREATE_DEVINST_NO_WAIT_INSTALL CM_CREATE_DEVNODE_NO_WAIT_INSTALL +#define CM_CREATE_DEVINST_PHANTOM CM_CREATE_DEVNODE_PHANTOM +#define CM_CREATE_DEVINST_GENERATE_ID CM_CREATE_DEVNODE_GENERATE_ID +#define CM_CREATE_DEVINST_DO_NOT_INSTALL CM_CREATE_DEVNODE_DO_NOT_INSTALL +#define CM_CREATE_DEVINST_BITS CM_CREATE_DEVNODE_BITS + + #define CMP_MAGIC 0x01234567 @@ -172,6 +188,12 @@ CONFIGRET WINAPI CM_Connect_MachineA( PCSTR, PHMACHINE ); CONFIGRET WINAPI CM_Connect_MachineW( PCWSTR, PHMACHINE ); #define CM_Connect_Machine WINELIB_NAME_AW(CM_Connect_Machine) +CONFIGRET WINAPI CM_Create_DevNodeA( PDEVINST, DEVINSTID_A, DEVINST, ULONG ); +CONFIGRET WINAPI CM_Create_DevNodeW( PDEVINST, DEVINSTID_W, DEVINST, ULONG ); +#define CM_Create_DevNode WINELIB_NAME_AW(CM_Create_DevNode) +CONFIGRET WINAPI CM_Create_DevNode_ExA( PDEVINST, DEVINSTID_A, DEVINST, ULONG, HANDLE ); +CONFIGRET WINAPI CM_Create_DevNode_ExW( PDEVINST, DEVINSTID_W, DEVINST, ULONG, HANDLE ); +#define CM_Create_DevNode_Ex WINELIB_NAME_AW(CM_Create_DevNode_Ex) CONFIGRET WINAPI CM_Delete_Class_Key( LPGUID, ULONG ); CONFIGRET WINAPI CM_Delete_Class_Key_Ex( LPGUID, ULONG, HANDLE ); CONFIGRET WINAPI CM_Disable_DevNode( DEVINST, ULONG ); _____ Modified: trunk/reactos/lib/cfgmgr32/cfgmgr32.def --- trunk/reactos/lib/cfgmgr32/cfgmgr32.def 2006-01-22 14:08:06 UTC (rev 20977) +++ trunk/reactos/lib/cfgmgr32/cfgmgr32.def 2006-01-22 14:33:04 UTC (rev 20978) @@ -36,10 +36,10 @@ ;CM_Add_Res_Des_Ex CM_Connect_MachineA(a)8=SETUPAPI.CM_Connect_MachineA CM_Connect_MachineW(a)8=SETUPAPI.CM_Connect_MachineW -;CM_Create_DevNodeA -;CM_Create_DevNodeW -;CM_Create_DevNode_ExA -;CM_Create_DevNode_ExW +CM_Create_DevNodeA(a)16=SETUPAPI.CM_Create_DevNodeA +CM_Create_DevNodeW(a)16=SETUPAPI.CM_Create_DevNodeW +CM_Create_DevNode_ExA(a)20=SETUPAPI.CM_Create_DevNode_ExA +CM_Create_DevNode_ExW(a)20=SETUPAPI.CM_Create_DevNode_ExW ;CM_Create_Range_List CM_Delete_Class_Key(a)8=SETUPAPI.CM_Delete_Class_Key CM_Delete_Class_Key_Ex(a)12=SETUPAPI.CM_Delete_Class_Key_Ex @@ -48,12 +48,12 @@ ;CM_Delete_Range ;CM_Detect_Resource_Conflict ;CM_Detect_Resource_Conflict_Ex -;CM_Disable_DevNode -;CM_Disable_DevNode_Ex +CM_Disable_DevNode(a)8=SETUPAPI.CM_Disable_DevNode +CM_Disable_DevNode_Ex(a)12=SETUPAPI.CM_Disable_DevNode_Ex CM_Disconnect_Machine(a)4=SETUPAPI.CM_Disconnect_Machine ;CM_Dup_Range_List -;CM_Enable_DevNode -;CM_Enable_DevNode_Ex +CM_Enable_DevNode(a)8=SETUPAPI.CM_Enable_DevNode +CM_Enable_DevNode_Ex(a)12=SETUPAPI.CM_Enable_DevNode_Ex CM_Enumerate_Classes(a)12=SETUPAPI.CM_Enumerate_Classes CM_Enumerate_Classes_Ex(a)16=SETUPAPI.CM_Enumerate_Classes_Ex CM_Enumerate_EnumeratorsA(a)16=SETUPAPI.CM_Enumerate_EnumeratorsA @@ -143,8 +143,8 @@ CM_Get_Version_Ex(a)4=SETUPAPI.CM_Get_Version_Ex ;CM_Intersect_Range_List ;CM_Invert_Range_List -;CM_Is_Dock_Station_Present -;CM_Is_Dock_Station_Present_Ex +CM_Is_Dock_Station_Present(a)4=SETUPAPI.CM_Is_Dock_Station_Present +CM_Is_Dock_Station_Present_Ex(a)8=SETUPAPI.CM_Is_Dock_Station_Present_Ex CM_Locate_DevNodeA(a)12=SETUPAPI.CM_Locate_DevNodeA CM_Locate_DevNodeW(a)12=SETUPAPI.CM_Locate_DevNodeW CM_Locate_DevNode_ExA(a)16=SETUPAPI.CM_Locate_DevNode_ExA @@ -181,11 +181,12 @@ ;CM_Remove_Unmarked_Children_Ex ;CM_Request_Device_EjectA ;CM_Request_Device_EjectW -;CM_Request_Eject_PC +CM_Request_Eject_PC(a)0=SETUPAPI.CM_Request_Eject_PC +CM_Request_Eject_PC_Ex(a)4=SETUPAPI.CM_Request_Eject_PC_Ex ;CM_Reset_Children_Marks ;CM_Reset_Children_Marks_Ex -;CM_Run_Detection -;CM_Run_Detection_Ex +CM_Run_Detection(a)4=SETUPAPI.CM_Run_Detection +CM_Run_Detection_Ex(a)8=SETUPAPI.CM_Run_Detection_Ex CM_Set_DevNode_Problem(a)12=SETUPAPI.CM_Set_DevNode_Problem CM_Set_DevNode_Problem_Ex(a)16=SETUPAPI.CM_Set_DevNode_Problem_Ex CM_Set_DevNode_Registry_PropertyA(a)20=SETUPAPI.CM_Set_DevNode_Registry_Pr opertyA _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2006-01-22 14:08:06 UTC (rev 20977) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2006-01-22 14:33:04 UTC (rev 20978) @@ -2,7 +2,7 @@ * Configuration manager functions * * Copyright 2000 James Hatheway - * Copyright 2005 Eric Kohl + * Copyright 2005, 2006 Eric Kohl * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -185,6 +185,125 @@ /*********************************************************************** + * CM_Create_DevNodeA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Create_DevNodeA( + PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, DEVINST dnParent, + ULONG ulFlags) +{ + TRACE("%p %s %p %lx\n", + pdnDevInst, debugstr_a(pDeviceID), dnParent, ulFlags); + return CM_Create_DevNode_ExA(pdnDevInst, pDeviceID, dnParent, + ulFlags, NULL); +} + + +/********************************************************************** * + * CM_Create_DevNodeW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Create_DevNodeW( + PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, DEVINST dnParent, + ULONG ulFlags) +{ + TRACE("%p %s %p %lx\n", + pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags); + return CM_Create_DevNode_ExW(pdnDevInst, pDeviceID, dnParent, + ulFlags, NULL); +} + + +/********************************************************************** * + * CM_Create_DevNode_ExA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Create_DevNode_ExA( + PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, DEVINST dnParent, + ULONG ulFlags, HANDLE hMachine) +{ + DEVINSTID_W pDeviceIDW; + CONFIGRET ret; + + TRACE("%p %s %p %lx %p\n", + pdnDevInst, debugstr_a(pDeviceID), dnParent, ulFlags, hMachine); + + if (CaptureAndConvertAnsiArg(pDeviceID, &pDeviceIDW)) + return CR_INVALID_DATA; + + ret = CM_Create_DevNode_ExW(pdnDevInst, pDeviceIDW, dnParent, ulFlags, + hMachine); + + MyFree(pDeviceIDW); + + return ret; +} + + +/********************************************************************** * + * CM_Create_DevNode_ExW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Create_DevNode_ExW( + PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, DEVINST dnParent, + ULONG ulFlags, HANDLE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + LPWSTR lpParentDevInst; + CONFIGRET ret = CR_SUCCESS; + + FIXME("%p %s %p %lx %p\n", + pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags, hMachine); + + if (!IsUserAdmin()) + return CR_ACCESS_DENIED; + + if (pdnDevInst == NULL) + return CR_INVALID_POINTER; + + if (pDeviceID == NULL || wcslen(pDeviceID) == 0) + return CR_INVALID_DEVICE_ID; + + if (dnParent == 0) + return CR_INVALID_DEVNODE; + + if (ulFlags & ~CM_CREATE_DEVNODE_BITS) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == 0) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) + return CR_FAILURE; + } + + lpParentDevInst = StringTableStringFromId(StringTable, dnParent); + if (lpParentDevInst == NULL) + return CR_INVALID_DEVNODE; + + ret = PNP_CreateDevInst(BindingHandle, + pDeviceID, + lpParentDevInst, + MAX_DEVICE_ID_LEN, + ulFlags); + if (ret == CR_SUCCESS) + { + *pdnDevInst = StringTableAddString(StringTable, pDeviceID, 1); + if (*pdnDevInst == 0) + ret = CR_NO_SUCH_DEVNODE; + } + + return ret; +} + + +/********************************************************************** * * CM_Delete_Class_Key [SETUPAPI.@] */ CONFIGRET WINAPI CM_Delete_Class_Key( _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2006-01-22 14:08:06 UTC (rev 20977) +++ trunk/reactos/lib/setupapi/setupapi.spec 2006-01-22 14:33:04 UTC (rev 20978) @@ -20,10 +20,10 @@ @ stub CM_Add_Res_Des_Ex @ stdcall CM_Connect_MachineA(str ptr) @ stdcall CM_Connect_MachineW(wstr ptr) -@ stub CM_Create_DevNodeA -@ stub CM_Create_DevNodeW -@ stub CM_Create_DevNode_ExA -@ stub CM_Create_DevNode_ExW +@ stdcall CM_Create_DevNodeA(ptr str long long) +@ stdcall CM_Create_DevNodeW(ptr wstr long long) +@ stdcall CM_Create_DevNode_ExA(ptr str long long long) +@ stdcall CM_Create_DevNode_ExW(ptr wstr long long long) @ stub CM_Create_Range_List @ stdcall CM_Delete_Class_Key(ptr long) @ stdcall CM_Delete_Class_Key_Ex(ptr long long) _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2006-01-22 14:08:06 UTC (rev 20977) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2006-01-22 14:33:04 UTC (rev 20978) @@ -893,6 +893,24 @@ } +/* Function 28 */ +CONFIGRET +PNP_CreateDevInst(handle_t BindingHandle, + wchar_t *DeviceId, /* [in, out, string, size_is(Length)] */ + wchar_t *ParentDeviceId, /* [in, string] */ + unsigned long Length, /* [in] */ + unsigned long Flags) /* [in] */ +{ + CONFIGRET ret = CR_CALL_NOT_IMPLEMENTED; + + DPRINT1("PNP_CreateDevInst() called\n"); + + DPRINT1("PNP_CreateDevInst() done (returns %lx)\n", ret); + + return ret; +} + + /* Function 29 */ CONFIGRET PNP_DeviceInstanceAction(handle_t BindingHandle, _____ Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h --- trunk/reactos/w32api/include/ddk/cfgmgr32.h 2006-01-22 14:08:06 UTC (rev 20977) +++ trunk/reactos/w32api/include/ddk/cfgmgr32.h 2006-01-22 14:33:04 UTC (rev 20978) @@ -736,8 +736,75 @@ #define CM_Connect_Machine CM_Connect_MachineA #endif /* UNICODE */ -/* FIXME: Obsolete CM_Create_DevNode */ -/* FIXME: Obsolete CM_Create_DevNodeEx */ +/* Flags for CM_Create_DevNode[_Ex].ulFlags constants */ +#define CM_CREATE_DEVNODE_NORMAL 0x00000000 +#define CM_CREATE_DEVNODE_NO_WAIT_INSTALL 0x00000001 +#define CM_CREATE_DEVNODE_PHANTOM 0x00000002 +#define CM_CREATE_DEVNODE_GENERATE_ID 0x00000004 +#define CM_CREATE_DEVNODE_DO_NOT_INSTALL 0x00000008 +#define CM_CREATE_DEVNODE_BITS 0x0000000F + +#define CM_CREATE_DEVINST_NORMAL CM_CREATE_DEVNODE_NORMAL +#define CM_CREATE_DEVINST_NO_WAIT_INSTALL CM_CREATE_DEVNODE_NO_WAIT_INSTALL +#define CM_CREATE_DEVINST_PHANTOM CM_CREATE_DEVNODE_PHANTOM +#define CM_CREATE_DEVINST_GENERATE_ID CM_CREATE_DEVNODE_GENERATE_ID +#define CM_CREATE_DEVINST_DO_NOT_INSTALL CM_CREATE_DEVNODE_DO_NOT_INSTALL +#define CM_CREATE_DEVINST_BITS CM_CREATE_DEVNODE_BITS + +CMAPI +CONFIGRET +WINAPI +CM_Create_DevNodeA( + OUT PDEVINST pdnDevInst, + IN DEVINSTID_A pDeviceID, + IN DEVINST dnParent, + IN ULONG ulFlags); + +CMAPI +CONFIGRET +WINAPI +CM_Create_DevNodeW( + OUT PDEVINST pdnDevInst, + IN DEVINSTID_W pDeviceID, + IN DEVINST dnParent, + IN ULONG ulFlags); + +CMAPI +CONFIGRET +WINAPI +CM_Create_DevNode_ExA( + OUT PDEVINST pdnDevInst, + IN DEVINSTID_A pDeviceID, + IN DEVINST dnParent, + IN ULONG ulFlags, + IN HANDLE hMachine); + +CMAPI +CONFIGRET +WINAPI +CM_Create_DevNode_ExW( + OUT PDEVINST pdnDevInst, + IN DEVINSTID_W pDeviceID, + IN DEVINST dnParent, + IN ULONG ulFlags, + IN HANDLE hMachine); + +#define CM_Create_DevInstW CM_Create_DevNodeW +#define CM_Create_DevInstA CM_Create_DevNodeA +#define CM_Create_DevInst_ExW CM_Create_DevNode_ExW +#define CM_Create_DevInst_ExA CM_Create_DevNode_ExA +#ifdef UNICODE +#define CM_Create_DevNode CM_Create_DevNodeW +#define CM_Create_DevInst CM_Create_DevNodeW +#define CM_Create_DevNode_Ex CM_Create_DevNode_ExW +#define CM_Create_DevInst_Ex CM_Create_DevInst_ExW +#else +#define CM_Create_DevNode CM_Create_DevNodeA +#define CM_Create_DevInst CM_Create_DevNodeA +#define CM_Create_DevNode_Ex CM_Create_DevNode_ExA +#define CM_Create_DevInst_Ex CM_Create_DevNode_ExA +#endif /* UNICODE */ + /* FIXME: Obsolete CM_Create_Range_List */ /* Flags for CM_Delete_Class_Key.ulFlags constants */

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