Ros-diffs October 2015

ros-diffs@reactos.org

18 participants
347 discussions

[tfaber] 69557: [WIN32K] - Add missing include aka fix build CORE-10217
by tfaber＠svn.reactos.org 16 Oct '15

16 Oct '15

Author: tfaber Date: Fri Oct 16 15:33:19 2015 New Revision: 69557 URL: http://svn.reactos.org/svn/reactos?rev=69557&view=rev Log: [WIN32K] - Add missing include aka fix build CORE-10217 Modified: trunk/reactos/win32ss/pch.h Modified: trunk/reactos/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/pch.h?rev=69557&r1… ============================================================================== --- trunk/reactos/win32ss/pch.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/pch.h [iso-8859-1] Fri Oct 16 15:33:19 2015 @@ -19,6 +19,7 @@ #include <ntifs.h> #include <ntddmou.h> #include <ndk/exfuncs.h> +#include <ndk/iofuncs.h> #include <ndk/kdfuncs.h> #include <ndk/kefuncs.h> #include <ndk/mmfuncs.h>

1 0

[tfaber] 69556: [WIN32K:NTUSER] - Terminate the RawInputThread on shutdown CORE-10217 #resolve
by tfaber＠svn.reactos.org 16 Oct '15

16 Oct '15

Author: tfaber Date: Fri Oct 16 15:30:35 2015 New Revision: 69556 URL: http://svn.reactos.org/svn/reactos?rev=69556&view=rev Log: [WIN32K:NTUSER] - Terminate the RawInputThread on shutdown CORE-10217 #resolve Modified: trunk/reactos/win32ss/user/ntuser/input.c trunk/reactos/win32ss/user/winsrv/usersrv/init.c Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Fri Oct 16 15:30:35 2015 @@ -132,10 +132,12 @@ PFILE_OBJECT pKbdDevice = NULL, pMouDevice = NULL; LARGE_INTEGER ByteOffset; //LARGE_INTEGER WaitTimeout; - PVOID WaitObjects[3], pSignaledObject = NULL; - ULONG cWaitObjects = 0, cMaxWaitObjects = 1; + PVOID WaitObjects[4], pSignaledObject = NULL; + KWAIT_BLOCK WaitBlockArray[RTL_NUMBER_OF(WaitObjects)]; + ULONG cWaitObjects = 0, cMaxWaitObjects = 2; MOUSE_INPUT_DATA MouseInput; KEYBOARD_INPUT_DATA KeyInput; + PVOID ShutdownEvent; ByteOffset.QuadPart = (LONGLONG)0; //WaitTimeout.QuadPart = (LONGLONG)(-10000000); @@ -156,6 +158,7 @@ NT_ASSERT(ghMouseDevice == NULL); NT_ASSERT(ghKeyboardDevice == NULL); + PoRequestShutdownEvent(&ShutdownEvent); for (;;) { if (!ghMouseDevice) @@ -189,6 +192,7 @@ /* Reset WaitHandles array */ cWaitObjects = 0; + WaitObjects[cWaitObjects++] = ShutdownEvent; WaitObjects[cWaitObjects++] = MasterTimer; if (ghMouseDevice) @@ -241,7 +245,7 @@ KernelMode, TRUE, NULL,//&WaitTimeout, - NULL); + WaitBlockArray); if ((Status >= STATUS_WAIT_0) && (Status < (STATUS_WAIT_0 + (LONG)cWaitObjects))) @@ -264,6 +268,10 @@ { ProcessTimers(); } + else if (pSignaledObject == ShutdownEvent) + { + break; + } else ASSERT(FALSE); } } @@ -302,6 +310,23 @@ else if (KbdStatus != STATUS_PENDING) ERR("Failed to read from keyboard: %x.\n", KbdStatus); } + + if (ghMouseDevice) + { + (void)ZwCancelIoFile(ghMouseDevice, &MouIosb); + ObCloseHandle(ghMouseDevice, KernelMode); + ObDereferenceObject(pMouDevice); + ghMouseDevice = NULL; + } + + if (ghKeyboardDevice) + { + (void)ZwCancelIoFile(ghKeyboardDevice, &KbdIosb); + ObCloseHandle(ghKeyboardDevice, KernelMode); + ObDereferenceObject(pKbdDevice); + ghKeyboardDevice = NULL; + } + ERR("Raw Input Thread Exit!\n"); } Modified: trunk/reactos/win32ss/user/winsrv/usersrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] Fri Oct 16 15:30:35 2015 @@ -102,7 +102,7 @@ CreateSystemThreads(PVOID pParam) { NtUserCallOneParam((DWORD)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); - DPRINT1("This thread should not terminate!\n"); + RtlExitUserThread(0); return 0; }

1 0

[tfaber] 69555: [WIN32K:NTUSER] - Don't try to dereference a handle
by tfaber＠svn.reactos.org 16 Oct '15

16 Oct '15

Author: tfaber Date: Fri Oct 16 14:24:30 2015 New Revision: 69555 URL: http://svn.reactos.org/svn/reactos?rev=69555&view=rev Log: [WIN32K:NTUSER] - Don't try to dereference a handle Modified: trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Fri Oct 16 14:24:30 2015 @@ -1140,7 +1140,7 @@ if (!NT_SUCCESS(Status)) { ERR("ZwQueryDirectoryObject failed\n"); - ObDereferenceObject(DirectoryHandle); + ZwClose(DirectoryHandle); return Status; } @@ -1148,7 +1148,7 @@ Buffer = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_WINSTA); if (NULL == Buffer) { - ObDereferenceObject(DirectoryHandle); + ZwClose(DirectoryHandle); return STATUS_NO_MEMORY; } @@ -1162,7 +1162,7 @@ { /* Something went wrong, maybe someone added a directory entry? Just give up. */ ExFreePoolWithTag(Buffer, TAG_WINSTA); - ObDereferenceObject(DirectoryHandle); + ZwClose(DirectoryHandle); return NT_SUCCESS(Status) ? STATUS_INTERNAL_ERROR : Status; } }

1 0

[tfaber] 69554: [WIN32K] - Add some missing OBJ_KERNEL_HANDLE CORE-10207
by tfaber＠svn.reactos.org 16 Oct '15

16 Oct '15

Author: tfaber Date: Fri Oct 16 14:04:19 2015 New Revision: 69554 URL: http://svn.reactos.org/svn/reactos?rev=69554&view=rev Log: [WIN32K] - Add some missing OBJ_KERNEL_HANDLE CORE-10207 Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/user/ntuser/input.c trunk/reactos/win32ss/user/ntuser/misc.c trunk/reactos/win32ss/user/ntuser/misc/registry.c trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Fri Oct 16 14:04:19 2015 @@ -232,7 +232,7 @@ InitializeObjectAttributes( &ObjectAttributes, &Directory, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); @@ -447,7 +447,7 @@ { IntLockGlobalFonts; InsertTailList(&FontListHead, &Entry->ListEntry); - InitializeObjectAttributes(&ObjectAttributes, &FontRegPath, OBJ_CASE_INSENSITIVE, NULL, NULL); + InitializeObjectAttributes(&ObjectAttributes, &FontRegPath, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); Status = ZwOpenKey(&KeyHandle, KEY_WRITE, &ObjectAttributes); if (NT_SUCCESS(Status)) { @@ -2994,7 +2994,7 @@ InitializeObjectAttributes(&ObjectAttributes, FileName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Fri Oct 16 14:04:19 2015 @@ -100,7 +100,7 @@ InitializeObjectAttributes(&ObjectAttributes, &DeviceName, - 0, + OBJ_KERNEL_HANDLE, NULL, NULL); Modified: trunk/reactos/win32ss/user/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] Fri Oct 16 14:04:19 2015 @@ -67,10 +67,10 @@ L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Nls\\Language"); InitializeObjectAttributes( &ObAttr, - &Language, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); + &Language, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); if ( NT_SUCCESS(ZwOpenKey(&KeyHandle, KEY_READ, &ObAttr))) { Modified: trunk/reactos/win32ss/user/ntuser/misc/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc/r… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc/registry.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc/registry.c [iso-8859-1] Fri Oct 16 14:04:19 2015 @@ -28,7 +28,7 @@ /* Initialize object attributes */ InitializeObjectAttributes(&ObjectAttributes, &ustrKeyName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); @@ -209,7 +209,7 @@ /* Initialize object attributes */ InitializeObjectAttributes(&ObjectAttributes, &usKeyName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); @@ -316,7 +316,7 @@ /* Initialize object attributes */ InitializeObjectAttributes(&ObjectAttributes, &usKeyName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Fri Oct 16 14:04:19 2015 @@ -1103,7 +1103,7 @@ InitializeObjectAttributes( &ObjectAttributes, &gustrWindowStationsDir, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL);

1 0

[tfaber] 69553: [NTOS:EX] - Add missing OBJ_KERNEL_HANDLE and avoid handle leak in ExpGetCurrentUserUILanguage CORE-10207
by tfaber＠svn.reactos.org 16 Oct '15

16 Oct '15

Author: tfaber Date: Fri Oct 16 13:28:40 2015 New Revision: 69553 URL: http://svn.reactos.org/svn/reactos?rev=69553&view=rev Log: [NTOS:EX] - Add missing OBJ_KERNEL_HANDLE and avoid handle leak in ExpGetCurrentUserUILanguage CORE-10207 Modified: trunk/reactos/ntoskrnl/ex/locale.c Modified: trunk/reactos/ntoskrnl/ex/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/locale.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] Fri Oct 16 13:28:40 2015 @@ -55,7 +55,7 @@ /* Initialize the attributes and open the key */ InitializeObjectAttributes(&ObjectAttributes, &KeyName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, UserKey, NULL); Status = ZwOpenKey(&KeyHandle, KEY_QUERY_VALUE,&ObjectAttributes); @@ -88,10 +88,10 @@ /* Fail */ Status = STATUS_UNSUCCESSFUL; } - - /* Close the key */ - ZwClose(KeyHandle); - } + } + + /* Close the key */ + ZwClose(KeyHandle); } /* Close the user key and return */

1 0

[tfaber] 69552: [NTOS:CM] - Remove duplicate macro definitions
by tfaber＠svn.reactos.org 16 Oct '15

16 Oct '15

Author: tfaber Date: Fri Oct 16 13:20:00 2015 New Revision: 69552 URL: http://svn.reactos.org/svn/reactos?rev=69552&view=rev Log: [NTOS:CM] - Remove duplicate macro definitions Modified: trunk/reactos/ntoskrnl/include/internal/cm_x.h Modified: trunk/reactos/ntoskrnl/include/internal/cm_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm_x.h [iso-8859-1] Fri Oct 16 13:20:00 2015 @@ -311,25 +311,3 @@ (CmpTestHiveFlusherLockShared((PCMHIVE)h) == TRUE) || \ (CmpTestHiveFlusherLockExclusive((PCMHIVE)h) == TRUE) || \ (CmpTestRegistryLockExclusive() == TRUE)); - -// -// Asserts that either the registry or the KCB is locked -// -#define CMP_ASSERT_HASH_ENTRY_LOCK(k) \ -{ \ - ASSERT(((GET_HASH_ENTRY(CmpCacheTable, k).Owner == \ - KeGetCurrentThread())) || \ - (CmpTestRegistryLockExclusive() == TRUE)); \ -} - -// -// Gets the page attached to the KCB -// -#define CmpGetAllocPageFromKcb(k) \ - (PCM_ALLOC_PAGE)(((ULONG_PTR)(k)) & ~(PAGE_SIZE - 1)) - -// -// Gets the page attached to the delayed allocation -// -#define CmpGetAllocPageFromDelayAlloc(a) \ - (PCM_ALLOC_PAGE)(((ULONG_PTR)(a)) & ~(PAGE_SIZE - 1))

1 0

[jimtabor] 69551: - Fix pointer.
by jimtabor＠svn.reactos.org 16 Oct '15

16 Oct '15

Author: jimtabor Date: Fri Oct 16 03:34:13 2015 New Revision: 69551 URL: http://svn.reactos.org/svn/reactos?rev=69551&view=rev Log: - Fix pointer. Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Fri Oct 16 03:34:13 2015 @@ -886,7 +886,7 @@ return FALSE; } - while((MsgWaitForMultipleObjects(1, ProcessInformation.hProcess, FALSE, INFINITE, QS_ALLINPUT|QS_ALLPOSTMESSAGE )) != WAIT_OBJECT_0) + while((MsgWaitForMultipleObjects(1, &ProcessInformation.hProcess, FALSE, INFINITE, QS_ALLINPUT|QS_ALLPOSTMESSAGE )) != WAIT_OBJECT_0) { while(PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) {

1 0

[jimtabor] 69550: - Fix mixing apples and widgets.
by jimtabor＠svn.reactos.org 16 Oct '15

16 Oct '15

Author: jimtabor Date: Fri Oct 16 02:18:13 2015 New Revision: 69550 URL: http://svn.reactos.org/svn/reactos?rev=69550&view=rev Log: - Fix mixing apples and widgets. Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Fri Oct 16 02:18:13 2015 @@ -858,7 +858,7 @@ static BOOL RunControlPanelApplet(HWND hwnd, PCWSTR pwszCPLParameters) { - MSG msg; + MSG msg; if (pwszCPLParameters) { STARTUPINFOW StartupInfo; @@ -888,10 +888,10 @@ while((MsgWaitForMultipleObjects(1, ProcessInformation.hProcess, FALSE, INFINITE, QS_ALLINPUT|QS_ALLPOSTMESSAGE )) != WAIT_OBJECT_0) { - while(PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + while(PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } } CloseHandle(ProcessInformation.hThread);

1 0

[jimtabor] 69549: [SysSetup] - Fix message processing while waiting for a process to end. See CORE-9342.
by jimtabor＠svn.reactos.org 15 Oct '15

15 Oct '15

Author: jimtabor Date: Thu Oct 15 23:39:37 2015 New Revision: 69549 URL: http://svn.reactos.org/svn/reactos?rev=69549&view=rev Log: [SysSetup] - Fix message processing while waiting for a process to end. See CORE-9342. Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Thu Oct 15 23:39:37 2015 @@ -858,6 +858,7 @@ static BOOL RunControlPanelApplet(HWND hwnd, PCWSTR pwszCPLParameters) { + MSG msg; if (pwszCPLParameters) { STARTUPINFOW StartupInfo; @@ -885,7 +886,14 @@ return FALSE; } - WaitForSingleObject(ProcessInformation.hProcess, INFINITE); + while((MsgWaitForMultipleObjects(1, ProcessInformation.hProcess, FALSE, INFINITE, QS_ALLINPUT|QS_ALLPOSTMESSAGE )) != WAIT_OBJECT_0) + { + while(PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } CloseHandle(ProcessInformation.hThread); CloseHandle(ProcessInformation.hProcess); return TRUE;

1 0

[gedmurphy] 69548: [DEVMGR] - Move all public interface functions to api.cpp - Implement DeviceManager_ExecuteA
by gedmurphy＠svn.reactos.org 15 Oct '15

15 Oct '15

Author: gedmurphy Date: Thu Oct 15 21:29:11 2015 New Revision: 69548 URL: http://svn.reactos.org/svn/reactos?rev=69548&view=rev Log: [DEVMGR] - Move all public interface functions to api.cpp - Implement DeviceManager_ExecuteA Modified: trunk/reactos/dll/win32/devmgr/api.cpp trunk/reactos/dll/win32/devmgr/properties/advprop.cpp trunk/reactos/dll/win32/devmgr/properties/misc.cpp trunk/reactos/dll/win32/devmgr/properties/properties.h Modified: trunk/reactos/dll/win32/devmgr/api.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/api.cpp?r… ============================================================================== --- trunk/reactos/dll/win32/devmgr/api.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/api.cpp [iso-8859-1] Thu Oct 15 21:29:11 2015 @@ -3,7 +3,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS devmgr.dll * FILE: dll/win32/devmgr/api.cpp -* PURPOSE: devmgr.dll stubs +* PURPOSE: devmgr.dll interface * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) * Ged Murphy (gedmurphy(a)reactos.org) * NOTES: @@ -19,10 +19,506 @@ #include "precomp.h" #include <devmgr/devmgr.h> #include "devmgmt/MainWindow.h" +#include "properties/properties.h" HINSTANCE hDllInstance = NULL; -WINE_DEFAULT_DEBUG_CHANNEL(devmgr); + + +/*************************************************************************** +* NAME EXPORTED +* DeviceAdvancedPropertiesW +* +* DESCRIPTION +* Invokes the device properties dialog, this version may add some property pages +* for some devices +* +* ARGUMENTS +* hWndParent: Handle to the parent window +* lpMachineName: Machine Name, NULL is the local machine +* lpDeviceID: Specifies the device whose properties are to be shown +* +* RETURN VALUE +* Always returns -1, a call to GetLastError returns 0 if successful +* +* @implemented +*/ +INT_PTR +WINAPI +DeviceAdvancedPropertiesW(IN HWND hWndParent OPTIONAL, + IN LPCWSTR lpMachineName OPTIONAL, + IN LPCWSTR lpDeviceID) +{ + HDEVINFO hDevInfo; + SP_DEVINFO_DATA DevInfoData; + HINSTANCE hComCtl32; + INT_PTR Ret = -1; + + if (lpDeviceID == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* dynamically load comctl32 */ + hComCtl32 = LoadAndInitComctl32(); + if (hComCtl32 != NULL) + { + hDevInfo = SetupDiCreateDeviceInfoListEx(NULL, + hWndParent, + lpMachineName, + NULL); + if (hDevInfo != INVALID_HANDLE_VALUE) + { + DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + if (SetupDiOpenDeviceInfo(hDevInfo, + lpDeviceID, + hWndParent, + 0, + &DevInfoData)) + { + Ret = DisplayDeviceAdvancedProperties(hWndParent, + lpDeviceID, + hDevInfo, + &DevInfoData, + hComCtl32, + lpMachineName, + 0); + } + + SetupDiDestroyDeviceInfoList(hDevInfo); + } + + FreeLibrary(hComCtl32); + } + + return Ret; +} + + +/*************************************************************************** +* NAME EXPORTED +* DeviceAdvancedPropertiesA +* +* DESCRIPTION +* Invokes the device properties dialog, this version may add some property pages +* for some devices +* +* ARGUMENTS +* hWndParent: Handle to the parent window +* lpMachineName: Machine Name, NULL is the local machine +* lpDeviceID: Specifies the device whose properties are to be shown +* +* RETURN VALUE +* Always returns -1, a call to GetLastError returns 0 if successful +* +* @implemented +*/ +INT_PTR +WINAPI +DeviceAdvancedPropertiesA(IN HWND hWndParent OPTIONAL, + IN LPCSTR lpMachineName OPTIONAL, + IN LPCSTR lpDeviceID) +{ + LPWSTR lpMachineNameW = NULL; + LPWSTR lpDeviceIDW = NULL; + INT_PTR Ret = -1; + + if (lpMachineName != NULL) + { + if (!(lpMachineNameW = ConvertMultiByteToUnicode(lpMachineName, + CP_ACP))) + { + goto Cleanup; + } + } + if (lpDeviceID != NULL) + { + if (!(lpDeviceIDW = ConvertMultiByteToUnicode(lpDeviceID, + CP_ACP))) + { + goto Cleanup; + } + } + + Ret = DeviceAdvancedPropertiesW(hWndParent, + lpMachineNameW, + lpDeviceIDW); + +Cleanup: + if (lpMachineNameW != NULL) + { + HeapFree(GetProcessHeap(), + 0, + lpMachineNameW); + } + if (lpDeviceIDW != NULL) + { + HeapFree(GetProcessHeap(), + 0, + lpDeviceIDW); + } + + return Ret; +} + + +/*************************************************************************** +* NAME EXPORTED +* DevicePropertiesExA +* +* DESCRIPTION +* Invokes the extended device properties dialog +* +* ARGUMENTS +* hWndParent: Handle to the parent window +* lpMachineName: Machine Name, NULL is the local machine +* lpDeviceID: Specifies the device whose properties are to be shown, optional if +* bShowDevMgr is nonzero +* dwFlags: This parameter can be a combination of the following flags: +* * DPF_DEVICE_STATUS_ACTION: Only valid if bShowDevMgr, causes +* the default device status action button +* to be clicked (Troubleshoot, Enable +* Device, etc) +* bShowDevMgr: If non-zero it displays the device manager instead of +* the advanced device property dialog +* +* RETURN VALUE +* 1: if bShowDevMgr is non-zero and no error occured +* -1: a call to GetLastError returns 0 if successful +* +* @implemented +*/ +INT_PTR +WINAPI +DevicePropertiesExA(IN HWND hWndParent OPTIONAL, + IN LPCSTR lpMachineName OPTIONAL, + IN LPCSTR lpDeviceID OPTIONAL, + IN DWORD dwFlags OPTIONAL, + IN BOOL bShowDevMgr) +{ + LPWSTR lpMachineNameW = NULL; + LPWSTR lpDeviceIDW = NULL; + INT_PTR Ret = -1; + + if (lpMachineName != NULL) + { + if (!(lpMachineNameW = ConvertMultiByteToUnicode(lpMachineName, + CP_ACP))) + { + goto Cleanup; + } + } + if (lpDeviceID != NULL) + { + if (!(lpDeviceIDW = ConvertMultiByteToUnicode(lpDeviceID, + CP_ACP))) + { + goto Cleanup; + } + } + + Ret = DevicePropertiesExW(hWndParent, + lpMachineNameW, + lpDeviceIDW, + dwFlags, + bShowDevMgr); + +Cleanup: + if (lpMachineNameW != NULL) + { + HeapFree(GetProcessHeap(), + 0, + lpMachineNameW); + } + if (lpDeviceIDW != NULL) + { + HeapFree(GetProcessHeap(), + 0, + lpDeviceIDW); + } + + return Ret; +} + + +/*************************************************************************** +* NAME EXPORTED +* DevicePropertiesExW +* +* DESCRIPTION +* Invokes the extended device properties dialog +* +* ARGUMENTS +* hWndParent: Handle to the parent window +* lpMachineName: Machine Name, NULL is the local machine +* lpDeviceID: Specifies the device whose properties are to be shown, optional if +* bShowDevMgr is nonzero +* dwFlags: This parameter can be a combination of the following flags: +* * DPF_DEVICE_STATUS_ACTION: Only valid if bShowDevMgr, causes +* the default device status action button +* to be clicked (Troubleshoot, Enable +* Device, etc) +* bShowDevMgr: If non-zero it displays the device manager instead of +* the advanced device property dialog +* +* RETURN VALUE +* 1: if bShowDevMgr is non-zero and no error occured +* -1: a call to GetLastError returns 0 if successful +* +* @implemented +*/ +INT_PTR +WINAPI +DevicePropertiesExW(IN HWND hWndParent OPTIONAL, + IN LPCWSTR lpMachineName OPTIONAL, + IN LPCWSTR lpDeviceID OPTIONAL, + IN DWORD dwFlags OPTIONAL, + IN BOOL bShowDevMgr) +{ + INT_PTR Ret = -1; + + if (dwFlags & ~(DPF_EXTENDED | DPF_DEVICE_STATUS_ACTION)) + { + FIXME("DevPropertiesExW: Invalid flags: 0x%x\n", + dwFlags & ~(DPF_EXTENDED | DPF_DEVICE_STATUS_ACTION)); + SetLastError(ERROR_INVALID_FLAGS); + return -1; + } + + if (bShowDevMgr) + { + FIXME("DevPropertiesExW doesn't support bShowDevMgr!\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + } + else + { + HDEVINFO hDevInfo; + SP_DEVINFO_DATA DevInfoData; + HINSTANCE hComCtl32; + + if (lpDeviceID == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return -1; + } + + /* dynamically load comctl32 */ + hComCtl32 = LoadAndInitComctl32(); + if (hComCtl32 != NULL) + { + hDevInfo = SetupDiCreateDeviceInfoListEx(NULL, + hWndParent, + lpMachineName, + NULL); + if (hDevInfo != INVALID_HANDLE_VALUE) + { + DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + if (SetupDiOpenDeviceInfo(hDevInfo, + lpDeviceID, + hWndParent, + 0, + &DevInfoData)) + { + Ret = DisplayDeviceAdvancedProperties(hWndParent, + lpDeviceID, + hDevInfo, + &DevInfoData, + hComCtl32, + lpMachineName, + dwFlags); + } + + SetupDiDestroyDeviceInfoList(hDevInfo); + } + + FreeLibrary(hComCtl32); + } + } + + return Ret; +} + + +/*************************************************************************** +* NAME EXPORTED +* DevicePropertiesA +* +* DESCRIPTION +* Invokes the device properties dialog directly +* +* ARGUMENTS +* hWndParent: Handle to the parent window +* lpMachineName: Machine Name, NULL is the local machine +* lpDeviceID: Specifies the device whose properties are to be shown +* bShowDevMgr: If non-zero it displays the device manager instead of +* the device property dialog +* +* RETURN VALUE +* >=0: if no errors occured +* -1: if errors occured +* +* REVISIONS +* +* @implemented +*/ +int +WINAPI +DevicePropertiesA(HWND hWndParent, + LPCSTR lpMachineName, + LPCSTR lpDeviceID, + BOOL bShowDevMgr) +{ + return DevicePropertiesExA(hWndParent, + lpMachineName, + lpDeviceID, + DPF_EXTENDED, + bShowDevMgr); +} + + +/*************************************************************************** +* NAME EXPORTED +* DevicePropertiesW +* +* DESCRIPTION +* Invokes the device properties dialog directly +* +* ARGUMENTS +* hWndParent: Handle to the parent window +* lpMachineName: Machine Name, NULL is the local machine +* lpDeviceID: Specifies the device whose properties are to be shown +* bShowDevMgr: If non-zero it displays the device manager instead of +* the device property dialog +* +* RETURN VALUE +* >=0: if no errors occured +* -1: if errors occured +* +* REVISIONS +* +* @implemented +*/ +int +WINAPI +DevicePropertiesW(HWND hWndParent, + LPCWSTR lpMachineName, + LPCWSTR lpDeviceID, + BOOL bShowDevMgr) +{ + return DevicePropertiesExW(hWndParent, + lpMachineName, + lpDeviceID, + DPF_EXTENDED, + bShowDevMgr); +} + + +/*************************************************************************** +* NAME EXPORTED +* DeviceProperties_RunDLLA +* +* DESCRIPTION +* Invokes the device properties dialog +* +* ARGUMENTS +* hWndParent: Handle to the parent window +* hInst: Handle to the application instance +* lpDeviceCmd: A command that includes the DeviceID of the properties to be shown, +* also see NOTEs +* nCmdShow: Specifies how the window should be shown +* +* RETURN VALUE +* +* REVISIONS +* +* NOTE +* - lpDeviceCmd is a string in the form of "/MachineName MACHINE /DeviceID DEVICEPATH" +* (/MachineName is optional). This function only parses this string and eventually +* calls DeviceProperties(). +* +* @implemented +*/ +VOID +WINAPI +DeviceProperties_RunDLLA(HWND hWndParent, + HINSTANCE hInst, + LPCSTR lpDeviceCmd, + int nCmdShow) +{ + LPWSTR lpDeviceCmdW = NULL; + + if (lpDeviceCmd != NULL) + { + if ((lpDeviceCmdW = ConvertMultiByteToUnicode(lpDeviceCmd, + CP_ACP))) + { + DeviceProperties_RunDLLW(hWndParent, + hInst, + lpDeviceCmdW, + nCmdShow); + } + } + + if (lpDeviceCmdW != NULL) + { + HeapFree(GetProcessHeap(), + 0, + lpDeviceCmdW); + } +} + + +/*************************************************************************** +* NAME EXPORTED +* DeviceProperties_RunDLLW +* +* DESCRIPTION +* Invokes the device properties dialog +* +* ARGUMENTS +* hWndParent: Handle to the parent window +* hInst: Handle to the application instance +* lpDeviceCmd: A command that includes the DeviceID of the properties to be shown, +* also see NOTEs +* nCmdShow: Specifies how the window should be shown +* +* RETURN VALUE +* +* REVISIONS +* +* NOTE +* - lpDeviceCmd is a string in the form of "/MachineName MACHINE /DeviceID DEVICEPATH" +* (/MachineName is optional). This function only parses this string and eventually +* calls DeviceProperties(). +* +* @implemented +*/ +VOID +WINAPI +DeviceProperties_RunDLLW(HWND hWndParent, + HINSTANCE hInst, + LPCWSTR lpDeviceCmd, + int nCmdShow) +{ + WCHAR szDeviceID[MAX_DEVICE_ID_LEN + 1]; + WCHAR szMachineName[MAX_COMPUTERNAME_LENGTH + 1]; + LPWSTR lpString = (LPWSTR)lpDeviceCmd; + + if (!GetDeviceAndComputerName(lpString, + szDeviceID, + szMachineName)) + { + ERR("DeviceProperties_RunDLLW DeviceID: %S, MachineName: %S\n", szDeviceID, szMachineName); + return; + } + + DevicePropertiesW(hWndParent, + szMachineName, + szDeviceID, + FALSE); +} + /*************************************************************************** @@ -48,7 +544,7 @@ * - Win runs the device manager in a separate process, so hWndParent is somehow * obsolete. * -* @unimplemented +* @implemented */ BOOL WINAPI @@ -57,8 +553,32 @@ LPCSTR lpMachineName, int nCmdShow) { - UNIMPLEMENTED; - return FALSE; + LPWSTR lpMachineNameW = NULL; + BOOL Ret; + + if (lpMachineName != NULL) + { + if (!(lpMachineNameW = ConvertMultiByteToUnicode(lpMachineName, + CP_ACP))) + { + return FALSE; + } + } + + Ret = DeviceManager_ExecuteW(hWndParent, + hInst, + lpMachineNameW, + nCmdShow); + + if (lpMachineNameW != NULL) + { + HeapFree(GetProcessHeap(), + 0, + lpMachineNameW); + } + + + return Ret; } @@ -85,7 +605,7 @@ * - Win runs the device manager in a separate process, so hWndParent is somehow * obsolete. * -* @unimplemented +* @implemented */ BOOL WINAPI Modified: trunk/reactos/dll/win32/devmgr/properties/advprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/propertie… ============================================================================== --- trunk/reactos/dll/win32/devmgr/properties/advprop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/properties/advprop.cpp [iso-8859-1] Thu Oct 15 21:29:11 2015 @@ -2744,556 +2744,3 @@ return Ret; } - - -static BOOL -GetDeviceAndComputerName(LPWSTR lpString, - WCHAR szDeviceID[], - WCHAR szMachineName[]) -{ - BOOL ret = FALSE; - - szDeviceID[0] = L'\0'; - szMachineName[0] = L'\0'; - - while (*lpString != L'\0') - { - if (*lpString == L'/') - { - lpString++; - if(!_wcsnicmp(lpString, L"DeviceID", 8)) - { - lpString += 9; - if (*lpString != L'\0') - { - int i = 0; - while ((*lpString != L' ') && - (*lpString != L'\0') && - (i <= MAX_DEVICE_ID_LEN)) - { - szDeviceID[i++] = *lpString++; - } - szDeviceID[i] = L'\0'; - ret = TRUE; - } - } - else if (!_wcsnicmp(lpString, L"MachineName", 11)) - { - lpString += 12; - if (*lpString != L'\0') - { - int i = 0; - while ((*lpString != L' ') && - (*lpString != L'\0') && - (i <= MAX_COMPUTERNAME_LENGTH)) - { - szMachineName[i++] = *lpString++; - } - szMachineName[i] = L'\0'; - } - } - /* knock the pointer back one and let the next - * pointer deal with incrementing, otherwise we - * go past the end of the string */ - lpString--; - } - lpString++; - } - - return ret; -} - - -/*************************************************************************** - * NAME EXPORTED - * DeviceAdvancedPropertiesW - * - * DESCRIPTION - * Invokes the device properties dialog, this version may add some property pages - * for some devices - * - * ARGUMENTS - * hWndParent: Handle to the parent window - * lpMachineName: Machine Name, NULL is the local machine - * lpDeviceID: Specifies the device whose properties are to be shown - * - * RETURN VALUE - * Always returns -1, a call to GetLastError returns 0 if successful - * - * @implemented - */ -INT_PTR -WINAPI -DeviceAdvancedPropertiesW(IN HWND hWndParent OPTIONAL, - IN LPCWSTR lpMachineName OPTIONAL, - IN LPCWSTR lpDeviceID) -{ - HDEVINFO hDevInfo; - SP_DEVINFO_DATA DevInfoData; - HINSTANCE hComCtl32; - INT_PTR Ret = -1; - - if (lpDeviceID == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* dynamically load comctl32 */ - hComCtl32 = LoadAndInitComctl32(); - if (hComCtl32 != NULL) - { - hDevInfo = SetupDiCreateDeviceInfoListEx(NULL, - hWndParent, - lpMachineName, - NULL); - if (hDevInfo != INVALID_HANDLE_VALUE) - { - DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); - if (SetupDiOpenDeviceInfo(hDevInfo, - lpDeviceID, - hWndParent, - 0, - &DevInfoData)) - { - Ret = DisplayDeviceAdvancedProperties(hWndParent, - lpDeviceID, - hDevInfo, - &DevInfoData, - hComCtl32, - lpMachineName, - 0); - } - - SetupDiDestroyDeviceInfoList(hDevInfo); - } - - FreeLibrary(hComCtl32); - } - - return Ret; -} - - -/*************************************************************************** - * NAME EXPORTED - * DeviceAdvancedPropertiesA - * - * DESCRIPTION - * Invokes the device properties dialog, this version may add some property pages - * for some devices - * - * ARGUMENTS - * hWndParent: Handle to the parent window - * lpMachineName: Machine Name, NULL is the local machine - * lpDeviceID: Specifies the device whose properties are to be shown - * - * RETURN VALUE - * Always returns -1, a call to GetLastError returns 0 if successful - * - * @implemented - */ -INT_PTR -WINAPI -DeviceAdvancedPropertiesA(IN HWND hWndParent OPTIONAL, - IN LPCSTR lpMachineName OPTIONAL, - IN LPCSTR lpDeviceID) -{ - LPWSTR lpMachineNameW = NULL; - LPWSTR lpDeviceIDW = NULL; - INT_PTR Ret = -1; - - if (lpMachineName != NULL) - { - if (!(lpMachineNameW = ConvertMultiByteToUnicode(lpMachineName, - CP_ACP))) - { - goto Cleanup; - } - } - if (lpDeviceID != NULL) - { - if (!(lpDeviceIDW = ConvertMultiByteToUnicode(lpDeviceID, - CP_ACP))) - { - goto Cleanup; - } - } - - Ret = DeviceAdvancedPropertiesW(hWndParent, - lpMachineNameW, - lpDeviceIDW); - -Cleanup: - if (lpMachineNameW != NULL) - { - HeapFree(GetProcessHeap(), - 0, - lpMachineNameW); - } - if (lpDeviceIDW != NULL) - { - HeapFree(GetProcessHeap(), - 0, - lpDeviceIDW); - } - - return Ret; -} - - -/*************************************************************************** - * NAME EXPORTED - * DevicePropertiesExA - * - * DESCRIPTION - * Invokes the extended device properties dialog - * - * ARGUMENTS - * hWndParent: Handle to the parent window - * lpMachineName: Machine Name, NULL is the local machine - * lpDeviceID: Specifies the device whose properties are to be shown, optional if - * bShowDevMgr is nonzero - * dwFlags: This parameter can be a combination of the following flags: - * * DPF_DEVICE_STATUS_ACTION: Only valid if bShowDevMgr, causes - * the default device status action button - * to be clicked (Troubleshoot, Enable - * Device, etc) - * bShowDevMgr: If non-zero it displays the device manager instead of - * the advanced device property dialog - * - * RETURN VALUE - * 1: if bShowDevMgr is non-zero and no error occured - * -1: a call to GetLastError returns 0 if successful - * - * @implemented - */ -INT_PTR -WINAPI -DevicePropertiesExA(IN HWND hWndParent OPTIONAL, - IN LPCSTR lpMachineName OPTIONAL, - IN LPCSTR lpDeviceID OPTIONAL, - IN DWORD dwFlags OPTIONAL, - IN BOOL bShowDevMgr) -{ - LPWSTR lpMachineNameW = NULL; - LPWSTR lpDeviceIDW = NULL; - INT_PTR Ret = -1; - - if (lpMachineName != NULL) - { - if (!(lpMachineNameW = ConvertMultiByteToUnicode(lpMachineName, - CP_ACP))) - { - goto Cleanup; - } - } - if (lpDeviceID != NULL) - { - if (!(lpDeviceIDW = ConvertMultiByteToUnicode(lpDeviceID, - CP_ACP))) - { - goto Cleanup; - } - } - - Ret = DevicePropertiesExW(hWndParent, - lpMachineNameW, - lpDeviceIDW, - dwFlags, - bShowDevMgr); - -Cleanup: - if (lpMachineNameW != NULL) - { - HeapFree(GetProcessHeap(), - 0, - lpMachineNameW); - } - if (lpDeviceIDW != NULL) - { - HeapFree(GetProcessHeap(), - 0, - lpDeviceIDW); - } - - return Ret; -} - - -/*************************************************************************** - * NAME EXPORTED - * DevicePropertiesExW - * - * DESCRIPTION - * Invokes the extended device properties dialog - * - * ARGUMENTS - * hWndParent: Handle to the parent window - * lpMachineName: Machine Name, NULL is the local machine - * lpDeviceID: Specifies the device whose properties are to be shown, optional if - * bShowDevMgr is nonzero - * dwFlags: This parameter can be a combination of the following flags: - * * DPF_DEVICE_STATUS_ACTION: Only valid if bShowDevMgr, causes - * the default device status action button - * to be clicked (Troubleshoot, Enable - * Device, etc) - * bShowDevMgr: If non-zero it displays the device manager instead of - * the advanced device property dialog - * - * RETURN VALUE - * 1: if bShowDevMgr is non-zero and no error occured - * -1: a call to GetLastError returns 0 if successful - * - * @implemented - */ -INT_PTR -WINAPI -DevicePropertiesExW(IN HWND hWndParent OPTIONAL, - IN LPCWSTR lpMachineName OPTIONAL, - IN LPCWSTR lpDeviceID OPTIONAL, - IN DWORD dwFlags OPTIONAL, - IN BOOL bShowDevMgr) -{ - INT_PTR Ret = -1; - - if (dwFlags & ~(DPF_EXTENDED | DPF_DEVICE_STATUS_ACTION)) - { - FIXME("DevPropertiesExW: Invalid flags: 0x%x\n", - dwFlags & ~(DPF_EXTENDED | DPF_DEVICE_STATUS_ACTION)); - SetLastError(ERROR_INVALID_FLAGS); - return -1; - } - - if (bShowDevMgr) - { - FIXME("DevPropertiesExW doesn't support bShowDevMgr!\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - } - else - { - HDEVINFO hDevInfo; - SP_DEVINFO_DATA DevInfoData; - HINSTANCE hComCtl32; - - if (lpDeviceID == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return -1; - } - - /* dynamically load comctl32 */ - hComCtl32 = LoadAndInitComctl32(); - if (hComCtl32 != NULL) - { - hDevInfo = SetupDiCreateDeviceInfoListEx(NULL, - hWndParent, - lpMachineName, - NULL); - if (hDevInfo != INVALID_HANDLE_VALUE) - { - DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); - if (SetupDiOpenDeviceInfo(hDevInfo, - lpDeviceID, - hWndParent, - 0, - &DevInfoData)) - { - Ret = DisplayDeviceAdvancedProperties(hWndParent, - lpDeviceID, - hDevInfo, - &DevInfoData, - hComCtl32, - lpMachineName, - dwFlags); - } - - SetupDiDestroyDeviceInfoList(hDevInfo); - } - - FreeLibrary(hComCtl32); - } - } - - return Ret; -} - - -/*************************************************************************** - * NAME EXPORTED - * DevicePropertiesA - * - * DESCRIPTION - * Invokes the device properties dialog directly - * - * ARGUMENTS - * hWndParent: Handle to the parent window - * lpMachineName: Machine Name, NULL is the local machine - * lpDeviceID: Specifies the device whose properties are to be shown - * bShowDevMgr: If non-zero it displays the device manager instead of - * the device property dialog - * - * RETURN VALUE - * >=0: if no errors occured - * -1: if errors occured - * - * REVISIONS - * - * @implemented - */ -int -WINAPI -DevicePropertiesA(HWND hWndParent, - LPCSTR lpMachineName, - LPCSTR lpDeviceID, - BOOL bShowDevMgr) -{ - return DevicePropertiesExA(hWndParent, - lpMachineName, - lpDeviceID, - DPF_EXTENDED, - bShowDevMgr); -} - - -/*************************************************************************** - * NAME EXPORTED - * DevicePropertiesW - * - * DESCRIPTION - * Invokes the device properties dialog directly - * - * ARGUMENTS - * hWndParent: Handle to the parent window - * lpMachineName: Machine Name, NULL is the local machine - * lpDeviceID: Specifies the device whose properties are to be shown - * bShowDevMgr: If non-zero it displays the device manager instead of - * the device property dialog - * - * RETURN VALUE - * >=0: if no errors occured - * -1: if errors occured - * - * REVISIONS - * - * @implemented - */ -int -WINAPI -DevicePropertiesW(HWND hWndParent, - LPCWSTR lpMachineName, - LPCWSTR lpDeviceID, - BOOL bShowDevMgr) -{ - return DevicePropertiesExW(hWndParent, - lpMachineName, - lpDeviceID, - DPF_EXTENDED, - bShowDevMgr); -} - - -/*************************************************************************** - * NAME EXPORTED - * DeviceProperties_RunDLLA - * - * DESCRIPTION - * Invokes the device properties dialog - * - * ARGUMENTS - * hWndParent: Handle to the parent window - * hInst: Handle to the application instance - * lpDeviceCmd: A command that includes the DeviceID of the properties to be shown, - * also see NOTEs - * nCmdShow: Specifies how the window should be shown - * - * RETURN VALUE - * - * REVISIONS - * - * NOTE - * - lpDeviceCmd is a string in the form of "/MachineName MACHINE /DeviceID DEVICEPATH" - * (/MachineName is optional). This function only parses this string and eventually - * calls DeviceProperties(). - * - * @implemented - */ -VOID -WINAPI -DeviceProperties_RunDLLA(HWND hWndParent, - HINSTANCE hInst, - LPCSTR lpDeviceCmd, - int nCmdShow) -{ - LPWSTR lpDeviceCmdW = NULL; - - if (lpDeviceCmd != NULL) - { - if ((lpDeviceCmdW = ConvertMultiByteToUnicode(lpDeviceCmd, - CP_ACP))) - { - DeviceProperties_RunDLLW(hWndParent, - hInst, - lpDeviceCmdW, - nCmdShow); - } - } - - if (lpDeviceCmdW != NULL) - { - HeapFree(GetProcessHeap(), - 0, - lpDeviceCmdW); - } -} - - -/*************************************************************************** - * NAME EXPORTED - * DeviceProperties_RunDLLW - * - * DESCRIPTION - * Invokes the device properties dialog - * - * ARGUMENTS - * hWndParent: Handle to the parent window - * hInst: Handle to the application instance - * lpDeviceCmd: A command that includes the DeviceID of the properties to be shown, - * also see NOTEs - * nCmdShow: Specifies how the window should be shown - * - * RETURN VALUE - * - * REVISIONS - * - * NOTE - * - lpDeviceCmd is a string in the form of "/MachineName MACHINE /DeviceID DEVICEPATH" - * (/MachineName is optional). This function only parses this string and eventually - * calls DeviceProperties(). - * - * @implemented - */ -VOID -WINAPI -DeviceProperties_RunDLLW(HWND hWndParent, - HINSTANCE hInst, - LPCWSTR lpDeviceCmd, - int nCmdShow) -{ - WCHAR szDeviceID[MAX_DEVICE_ID_LEN+1]; - WCHAR szMachineName[MAX_COMPUTERNAME_LENGTH+1]; - LPWSTR lpString = (LPWSTR)lpDeviceCmd; - - if (!GetDeviceAndComputerName(lpString, - szDeviceID, - szMachineName)) - { - ERR("DeviceProperties_RunDLLW DeviceID: %S, MachineName: %S\n", szDeviceID, szMachineName); - return; - } - - DevicePropertiesW(hWndParent, - szMachineName, - szDeviceID, - FALSE); -} Modified: trunk/reactos/dll/win32/devmgr/properties/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/propertie… ============================================================================== --- trunk/reactos/dll/win32/devmgr/properties/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/properties/misc.cpp [iso-8859-1] Thu Oct 15 21:29:11 2015 @@ -1129,3 +1129,61 @@ return hComCtl32; } + + +BOOL +GetDeviceAndComputerName(LPWSTR lpString, + WCHAR szDeviceID[], + WCHAR szMachineName[]) +{ + BOOL ret = FALSE; + + szDeviceID[0] = L'\0'; + szMachineName[0] = L'\0'; + + while (*lpString != L'\0') + { + if (*lpString == L'/') + { + lpString++; + if (!_wcsnicmp(lpString, L"DeviceID", 8)) + { + lpString += 9; + if (*lpString != L'\0') + { + int i = 0; + while ((*lpString != L' ') && + (*lpString != L'\0') && + (i <= MAX_DEVICE_ID_LEN)) + { + szDeviceID[i++] = *lpString++; + } + szDeviceID[i] = L'\0'; + ret = TRUE; + } + } + else if (!_wcsnicmp(lpString, L"MachineName", 11)) + { + lpString += 12; + if (*lpString != L'\0') + { + int i = 0; + while ((*lpString != L' ') && + (*lpString != L'\0') && + (i <= MAX_COMPUTERNAME_LENGTH)) + { + szMachineName[i++] = *lpString++; + } + szMachineName[i] = L'\0'; + } + } + /* knock the pointer back one and let the next + * pointer deal with incrementing, otherwise we + * go past the end of the string */ + lpString--; + } + lpString++; + } + + return ret; +} Modified: trunk/reactos/dll/win32/devmgr/properties/properties.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/propertie… ============================================================================== --- trunk/reactos/dll/win32/devmgr/properties/properties.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/properties/properties.h [iso-8859-1] Thu Oct 15 21:29:11 2015 @@ -129,6 +129,11 @@ LoadAndInitComctl32(VOID); BOOL +GetDeviceAndComputerName(LPWSTR lpString, + WCHAR szDeviceID[], + WCHAR szMachineName[]); + +BOOL GetDeviceManufacturerString(IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData, OUT LPWSTR szBuffer,

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
35
Older →

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 October 2015