Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 19606: create the property sheets modally
by weiden＠svn.reactos.com 26 Nov '05

26 Nov '05

create the property sheets modally Modified: trunk/reactos/lib/devmgr/advprop.c _____ Modified: trunk/reactos/lib/devmgr/advprop.c --- trunk/reactos/lib/devmgr/advprop.c 2005-11-26 03:25:57 UTC (rev 19605) +++ trunk/reactos/lib/devmgr/advprop.c 2005-11-26 03:33:07 UTC (rev 19606) @@ -19,7 +19,7 @@ /* $Id: hwpage.c 19599 2005-11-26 02:12:58Z weiden $ * * PROJECT: ReactOS devmgr.dll - * FILE: lib/devmgr/hwpage.c + * FILE: lib/devmgr/advprop.c * PURPOSE: ReactOS Device Manager * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> * UPDATE HISTORY: @@ -119,6 +119,7 @@ psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPTITLE; + psh.hwndParent = hWndParent; psh.pszCaption = szDevName; /* find out how many property sheets we need */

1 0

[weiden] 19605: forgot to add this file
by weiden＠svn.reactos.com 26 Nov '05

26 Nov '05

forgot to add this file Added: trunk/reactos/lib/devmgr/advprop.c _____ Added: trunk/reactos/lib/devmgr/advprop.c --- trunk/reactos/lib/devmgr/advprop.c 2005-11-26 03:22:22 UTC (rev 19604) +++ trunk/reactos/lib/devmgr/advprop.c 2005-11-26 03:25:57 UTC (rev 19605) @@ -0,0 +1,238 @@ +/* + * ReactOS Device Manager Applet + * Copyright (C) 2004 - 2005 ReactOS Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/* $Id: hwpage.c 19599 2005-11-26 02:12:58Z weiden $ + * + * PROJECT: ReactOS devmgr.dll + * FILE: lib/devmgr/hwpage.c + * PURPOSE: ReactOS Device Manager + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + * UPDATE HISTORY: + * 04-04-2004 Created + */ +#include <precomp.h> + +#define NDEBUG +#include <debug.h> + +typedef INT_PTR (WINAPI *PPROPERTYSHEETW)(LPCPROPSHEETHEADERW); + +/********************************************************************** ***** + * 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 + * -1: if errors occured + * + * REVISIONS + * + * NOTE + * + * @unimplemented + */ +int +WINAPI +DeviceAdvancedPropertiesW(HWND hWndParent, + LPCWSTR lpMachineName, + LPCWSTR lpDeviceID) +{ + HDEVINFO hDevInfo; + SP_DEVINFO_DATA DevInfoData; + HINSTANCE hComCtl32; + PPROPERTYSHEETW pPropertySheetW; + int Ret = -1; + + /* FIXME - handle remote device properties */ + + UNREFERENCED_PARAMETER(lpMachineName); + + /* dynamically load comctl32 */ + hComCtl32 = LoadAndInitComctl32(); + if (hComCtl32 == NULL || + !(pPropertySheetW = (PPROPERTYSHEETW)GetProcAddress(hComCtl32, + "PropertySheetW"))) + { + return -1; + } + + hDevInfo = SetupDiCreateDeviceInfoList(NULL, + hWndParent); + if (hDevInfo == INVALID_HANDLE_VALUE) + { + goto Cleanup; + } + + DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + if (SetupDiOpenDeviceInfo(hDevInfo, + lpDeviceID, + hWndParent, + 0, + &DevInfoData)) + { + WCHAR szDevName[255]; + DWORD RegDataType; + PROPSHEETHEADER psh = {0}; + DWORD nPropSheets = 0; + + /* get the device name */ + if ((SetupDiGetDeviceRegistryProperty(hDevInfo, + &DevInfoData, + SPDRP_FRIENDLYNAME, + &RegDataType, + (PBYTE)szDevName, + sizeof(szDevName), + NULL) || + SetupDiGetDeviceRegistryProperty(hDevInfo, + &DevInfoData, + SPDRP_DEVICEDESC, + &RegDataType, + (PBYTE)szDevName, + sizeof(szDevName), + NULL)) && + RegDataType == REG_SZ) + { + /* FIXME - check string for NULL termination! */ + + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPTITLE; + psh.pszCaption = szDevName; + + /* find out how many property sheets we need */ + if (SetupDiGetClassDevPropertySheets(hDevInfo, + &DevInfoData, + &psh, + 0, + &nPropSheets, + DIGCDP_FLAG_ADVANCED)) + { + DPRINT1("SetupDiGetClassDevPropertySheets unexpectedly returned TRUE!\n"); + goto Cleanup; + } + + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + goto Cleanup; + } + + psh.phpage = HeapAlloc(GetProcessHeap(), + 0, + nPropSheets * sizeof(HPROPSHEETPAGE)); + if (psh.phpage == NULL) + { + goto Cleanup; + } + + if (!SetupDiGetClassDevPropertySheets(hDevInfo, + &DevInfoData, + &psh, + nPropSheets, + NULL, + DIGCDP_FLAG_ADVANCED)) + { + goto Cleanup; + } + + /* FIXME - add "General" and "Driver" page */ + + Ret = pPropertySheetW(&psh); + } + +Cleanup: + HeapFree(GetProcessHeap(), + 0, + psh.phpage); + } + + 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 + * -1: if errors occured + * + * REVISIONS + * + * NOTE + * + * @unimplemented + */ +int +WINAPI +DeviceAdvancedPropertiesA(HWND hWndParent, + LPCSTR lpMachineName, + LPCSTR lpDeviceID) +{ + LPWSTR lpMachineNameW = NULL; + LPWSTR lpDeviceIDW = NULL; + int 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: + HeapFree(GetProcessHeap(), + 0, + lpMachineNameW); + HeapFree(GetProcessHeap(), + 0, + lpDeviceIDW); + + return Ret; +} Property changes on: trunk/reactos/lib/devmgr/advprop.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native

1 0

[weiden] 19604: initial implementation of DeviceAdvancedPropertiesA/W
by weiden＠svn.reactos.com 26 Nov '05

26 Nov '05

initial implementation of DeviceAdvancedPropertiesA/W Modified: trunk/reactos/lib/devmgr/devmgr.xml Modified: trunk/reactos/lib/devmgr/hwpage.c Modified: trunk/reactos/lib/devmgr/misc.c Modified: trunk/reactos/lib/devmgr/precomp.h Modified: trunk/reactos/lib/devmgr/stubs.c _____ Modified: trunk/reactos/lib/devmgr/devmgr.xml --- trunk/reactos/lib/devmgr/devmgr.xml 2005-11-26 03:21:41 UTC (rev 19603) +++ trunk/reactos/lib/devmgr/devmgr.xml 2005-11-26 03:22:22 UTC (rev 19604) @@ -13,6 +13,7 @@ <library>setupapi</library> <library>user32</library> <file>devmgr.rc</file> + <file>advprop.c</file> <file>hwpage.c</file> <file>misc.c</file> <file>stubs.c</file> _____ Modified: trunk/reactos/lib/devmgr/hwpage.c --- trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 03:21:41 UTC (rev 19603) +++ trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 03:22:22 UTC (rev 19604) @@ -30,8 +30,6 @@ #define NDEBUG #include <debug.h> -typedef VOID (WINAPI *PINITCOMMONCONTROLS)(VOID); - typedef enum { HWPD_STANDARDLIST = 0, @@ -978,7 +976,6 @@ IN HWPAGE_DISPLAYMODE DisplayMode) { PHARDWARE_PAGE_DATA hpd; - PINITCOMMONCONTROLS pInitCommonControls; /* allocate the HARDWARE_PAGE_DATA structure. Make sure it is zeroed because the initialization code assumes that in @@ -1006,21 +1003,12 @@ } /* load comctl32.dll dynamically */ - hpd->hComCtl32 = LoadLibrary(TEXT("comctl32.dll")); + hpd->hComCtl32 = LoadAndInitComctl32(); if (hpd->hComCtl32 == NULL) { goto Cleanup; } - /* initialize the common controls */ - pInitCommonControls = (PINITCOMMONCONTROLS)GetProcAddress(hpd->hComCtl32, - "InitCommonControls"); - if (pInitCommonControls == NULL) - { - goto Cleanup; - } - pInitCommonControls(); - /* create the dialog */ hWnd = CreateDialogParam(hDllInstance, MAKEINTRESOURCE(IDD_HARDWARE), _____ Modified: trunk/reactos/lib/devmgr/misc.c --- trunk/reactos/lib/devmgr/misc.c 2005-11-26 03:21:41 UTC (rev 19603) +++ trunk/reactos/lib/devmgr/misc.c 2005-11-26 03:22:22 UTC (rev 19604) @@ -149,6 +149,69 @@ return 0; } +LPWSTR +ConvertMultiByteToUnicode(IN LPCSTR lpMultiByteStr, + IN UINT uCodePage) +{ + LPWSTR lpUnicodeStr; + INT nLength; + + nLength = MultiByteToWideChar(uCodePage, + 0, + lpMultiByteStr, + -1, + NULL, + 0); + if (nLength == 0) + return NULL; + + lpUnicodeStr = HeapAlloc(GetProcessHeap(), + 0, + nLength * sizeof(WCHAR)); + if (lpUnicodeStr == NULL) + return NULL; + + if (!MultiByteToWideChar(uCodePage, + 0, + lpMultiByteStr, + nLength, + lpUnicodeStr, + nLength)) + { + HeapFree(GetProcessHeap(), + 0, + lpUnicodeStr); + return NULL; + } + + return lpUnicodeStr; +} + +HINSTANCE +LoadAndInitComctl32(VOID) +{ + typedef VOID (WINAPI *PINITCOMMONCONTROLS)(VOID); + PINITCOMMONCONTROLS pInitCommonControls; + HINSTANCE hComCtl32; + + hComCtl32 = LoadLibrary(L"comctl32.dll"); + if (hComCtl32 != NULL) + { + /* initialize the common controls */ + pInitCommonControls = (PINITCOMMONCONTROLS)GetProcAddress(hComCtl32, + "InitCommonControls"); + if (pInitCommonControls == NULL) + { + FreeLibrary(hComCtl32); + return NULL; + } + + pInitCommonControls(); + } + + return hComCtl32; +} + BOOL STDCALL DllMain(IN HINSTANCE hinstDLL, _____ Modified: trunk/reactos/lib/devmgr/precomp.h --- trunk/reactos/lib/devmgr/precomp.h 2005-11-26 03:21:41 UTC (rev 19603) +++ trunk/reactos/lib/devmgr/precomp.h 2005-11-26 03:22:22 UTC (rev 19604) @@ -191,6 +191,13 @@ LPARAM ListViewGetSelectedItemData(IN HWND hwnd); +LPWSTR +ConvertMultiByteToUnicode(IN LPCSTR lpMultiByteStr, + IN UINT uCodePage); + +HINSTANCE +LoadAndInitComctl32(VOID); + #endif /* __DEVMGR_H */ /* EOF */ _____ Modified: trunk/reactos/lib/devmgr/stubs.c --- trunk/reactos/lib/devmgr/stubs.c 2005-11-26 03:21:41 UTC (rev 19603) +++ trunk/reactos/lib/devmgr/stubs.c 2005-11-26 03:22:22 UTC (rev 19604) @@ -548,72 +548,6 @@ /*********************************************************************** **** * 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 - * -1: if errors occured - * - * REVISIONS - * - * NOTE - * - * @unimplemented - */ -int -WINAPI -DeviceAdvancedPropertiesA(HWND hWndParent, - LPCSTR lpMachineName, - LPCSTR lpDeviceID) -{ - UNIMPLEMENTED; - return -1; -} - - -/********************************************************************** ***** - * 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 - * -1: if errors occured - * - * REVISIONS - * - * NOTE - * - * @unimplemented - */ -int -WINAPI -DeviceAdvancedPropertiesW(HWND hWndParent, - LPCWSTR lpMachineName, - LPCWSTR lpDeviceID) -{ - UNIMPLEMENTED; - return -1; -} - - -/********************************************************************** ***** - * NAME EXPORTED * DevicePropertiesExA * * DESCRIPTION

1 0

[weiden] 19603: added stubs for SetupDiGetClassDevPropertySheetsA/W
by weiden＠svn.reactos.com 26 Nov '05

26 Nov '05

added stubs for SetupDiGetClassDevPropertySheetsA/W Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/lib/setupapi/stubs.c _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-11-26 03:01:18 UTC (rev 19602) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-11-26 03:21:41 UTC (rev 19603) @@ -306,8 +306,8 @@ @ stdcall SetupDiGetClassDescriptionExA(ptr str long ptr str ptr) @ stdcall SetupDiGetClassDescriptionExW(ptr wstr long ptr wstr ptr) @ stdcall SetupDiGetClassDescriptionW(ptr wstr long ptr) -@ stub SetupDiGetClassDevPropertySheetsA -@ stub SetupDiGetClassDevPropertySheetsW +@ stdcall SetupDiGetClassDevPropertySheetsA(ptr ptr ptr long ptr long) +@ stdcall SetupDiGetClassDevPropertySheetsW(ptr ptr ptr long ptr long) @ stdcall SetupDiGetClassDevsA(ptr ptr long long) @ stdcall SetupDiGetClassDevsExA(ptr str ptr long ptr str ptr) @ stdcall SetupDiGetClassDevsExW(ptr wstr ptr long ptr wstr ptr) _____ Modified: trunk/reactos/lib/setupapi/stubs.c --- trunk/reactos/lib/setupapi/stubs.c 2005-11-26 03:01:18 UTC (rev 19602) +++ trunk/reactos/lib/setupapi/stubs.c 2005-11-26 03:21:41 UTC (rev 19603) @@ -250,3 +250,33 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************** * + * SetupDiGetClassDevPropertySheetsA(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetClassDevPropertySheetsA(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, + LPPROPSHEETHEADERA PropertySheetHeader, + DWORD PropertySheetHeaderPageListSize, PDWORD RequiredSize, + DWORD PropertySheetType) +{ + FIXME ("Stub %p %p %p %d %p %d\n", + DeviceInfoSet, DeviceInfoData, PropertySheetHeader, PropertySheetHeaderPageListSize, + RequiredSize, PropertySheetType); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/********************************************************************** * + * SetupDiGetClassDevPropertySheetsW(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetClassDevPropertySheetsW(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, + LPPROPSHEETHEADERW PropertySheetHeader, + DWORD PropertySheetHeaderPageListSize, PDWORD RequiredSize, + DWORD PropertySheetType) +{ + FIXME ("Stub %p %p %p %d %p %d\n", + DeviceInfoSet, DeviceInfoData, PropertySheetHeader, PropertySheetHeaderPageListSize, + RequiredSize, PropertySheetType); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

[royce] 19602: automatically detect msys without generating ugly error message on non-msys system
by royce＠svn.reactos.com 26 Nov '05

26 Nov '05

automatically detect msys without generating ugly error message on non-msys system Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-11-26 02:36:01 UTC (rev 19601) +++ trunk/reactos/Makefile 2005-11-26 03:01:18 UTC (rev 19602) @@ -115,7 +115,8 @@ ifeq ($(HOST),) ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) -ifeq ($(OSTYPE),msys) +ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) +export OSTYPE = msys HOST=mingw32-linux else HOST=mingw32-windows

1 0

[royce] 19601: revert 19600 until I can figure out how to correct keep it silent on non-msys systems
by royce＠svn.reactos.com 26 Nov '05

26 Nov '05

revert 19600 until I can figure out how to correct keep it silent on non-msys systems Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-11-26 02:23:07 UTC (rev 19600) +++ trunk/reactos/Makefile 2005-11-26 02:36:01 UTC (rev 19601) @@ -115,8 +115,7 @@ ifeq ($(HOST),) ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) -ifeq ($(findstring msys,$(-shell sh --version)),msys) -export OSTYPE = msys +ifeq ($(OSTYPE),msys) HOST=mingw32-linux else HOST=mingw32-windows @@ -215,7 +214,7 @@ export EXEPREFIX = ./ ifeq ($(OSTYPE),msys) export EXEPOSTFIX = .exe -else +else export EXEPOSTFIX = endif export SEP = /

1 0

[royce] 19600: auto-detect msys instead of requiring users to tell our build system about it
by royce＠svn.reactos.com 26 Nov '05

26 Nov '05

auto-detect msys instead of requiring users to tell our build system about it Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-11-26 02:12:58 UTC (rev 19599) +++ trunk/reactos/Makefile 2005-11-26 02:23:07 UTC (rev 19600) @@ -115,7 +115,8 @@ ifeq ($(HOST),) ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) -ifeq ($(OSTYPE),msys) +ifeq ($(findstring msys,$(-shell sh --version)),msys) +export OSTYPE = msys HOST=mingw32-linux else HOST=mingw32-windows

1 0

[weiden] 19599: display the advanced device properties
by weiden＠svn.reactos.com 26 Nov '05

26 Nov '05

display the advanced device properties Modified: trunk/reactos/lib/devmgr/hwpage.c Modified: trunk/reactos/lib/devmgr/precomp.h Modified: trunk/reactos/lib/devmgr/stubs.c _____ Modified: trunk/reactos/lib/devmgr/hwpage.c --- trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 01:56:07 UTC (rev 19598) +++ trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 02:12:58 UTC (rev 19599) @@ -126,6 +126,70 @@ } +static BOOL +DisplaySelectedDeviceProperties(IN PHARDWARE_PAGE_DATA hpd) +{ + PHWDEVINFO HwDevInfo; + BOOL Ret = FALSE; + + HwDevInfo = (PHWDEVINFO)ListViewGetSelectedItemData(hpd->hWndDevList); + if (HwDevInfo != NULL) + { + PWSTR szDeviceInstanceId = NULL; + DWORD DeviceInstanceIdLen = 0; + + /* find out how much size is needed for the buffer */ + if (SetupDiGetDeviceInstanceId(HwDevInfo->ClassDevInfo->hDevInfo, + &HwDevInfo->DevInfoData, + NULL, + 0, + &DeviceInstanceIdLen)) + { + DPRINT1("SetupDiGetDeviceInterfaceDetail unexpectedly returned TRUE!\n"); + goto Cleanup; + } + + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + goto Cleanup; + } + + szDeviceInstanceId = HeapAlloc(GetProcessHeap(), + 0, + DeviceInstanceIdLen * sizeof(WCHAR)); + if (szDeviceInstanceId == NULL) + { + goto Cleanup; + } + + /* read the device instance id */ + if (!SetupDiGetDeviceInstanceId(HwDevInfo->ClassDevInfo->hDevInfo, + &HwDevInfo->DevInfoData, + szDeviceInstanceId, + DeviceInstanceIdLen, + &DeviceInstanceIdLen)) + { + goto Cleanup; + } + + /* display the properties dialog */ + Ret = DeviceAdvancedProperties(hpd->hWnd, + NULL, + szDeviceInstanceId) >= 0; + +Cleanup: + if (szDeviceInstanceId != NULL) + { + HeapFree(GetProcessHeap(), + 0, + szDeviceInstanceId); + } + } + + return Ret; +} + + static VOID UpdateControlStates(IN PHARDWARE_PAGE_DATA hpd) { @@ -158,6 +222,10 @@ RegDataType != REG_SZ) { szBuffer[0] = L'\0'; + LoadString(hDllInstance, + IDS_UNKNOWN, + szBuffer, + sizeof(szBuffer) / sizeof(szBuffer[0])); } /* FIXME - check string for NULL termination! */ if (LoadAndFormatString(hDllInstance, @@ -183,15 +251,10 @@ RegDataType != REG_SZ) { szBuffer[0] = L'\0'; - - if (cRet == CR_NO_SUCH_REGISTRY_KEY || - cRet == CR_NO_SUCH_VALUE) - { - LoadString(hDllInstance, - IDS_UNKNOWN, - szBuffer, - sizeof(szBuffer) / sizeof(szBuffer[0])); - } + LoadString(hDllInstance, + IDS_UNKNOWN, + szBuffer, + sizeof(szBuffer) / sizeof(szBuffer[0])); } /* FIXME - check string for NULL termination! */ @@ -756,8 +819,7 @@ case IDC_PROPERTIES: { - /* FIXME - display the properties dialog for the currently - selected device */ + DisplaySelectedDeviceProperties(hpd); break; } } _____ Modified: trunk/reactos/lib/devmgr/precomp.h --- trunk/reactos/lib/devmgr/precomp.h 2005-11-26 01:56:07 UTC (rev 19598) +++ trunk/reactos/lib/devmgr/precomp.h 2005-11-26 02:12:58 UTC (rev 19599) @@ -145,19 +145,41 @@ int WINAPI DevicePropertiesExA(HWND hWndParent, - HINSTANCE hInst, LPCSTR lpMachineName, LPCSTR lpDeviceID, + HINSTANCE hInst, DWORD Unknown); int WINAPI DevicePropertiesExW(HWND hWndParent, - HINSTANCE hInst, LPCWSTR lpMachineName, LPCWSTR lpDeviceID, + HINSTANCE hInst, DWORD Unknown); +#ifdef UNICODE +#define DeviceManager_Execute DeviceManager_ExecuteW +#define DeviceProperties_RunDLL DeviceProperties_RunDLLW +#define DeviceProperties DevicePropertiesW +#define DeviceProblemText DeviceProblemTextW +#define DeviceProblemWizard DeviceProblemWizardW +#define DeviceProblemWizard_RunDLL DeviceProblemWizard_RunDLLW +#define DeviceManagerPrint DeviceManagerPrintW +#define DeviceAdvancedProperties DeviceAdvancedPropertiesW +#define DevicePropertiesEx DevicePropertiesExW +#else +#define DeviceManager_Execute DeviceManager_ExecuteA +#define DeviceProperties_RunDLL DeviceProperties_RunDLLA +#define DeviceProperties DevicePropertiesA +#define DeviceProblemText DeviceProblemTextA +#define DeviceProblemWizard DeviceProblemWizardA +#define DeviceProblemWizard_RunDLL DeviceProblemWizard_RunDLLA +#define DeviceManagerPrint DeviceManagerPrintA +#define DeviceAdvancedProperties DeviceAdvancedPropertiesA +#define DevicePropertiesEx DevicePropertiesExA +#endif + /* MISC.C */ DWORD _____ Modified: trunk/reactos/lib/devmgr/stubs.c --- trunk/reactos/lib/devmgr/stubs.c 2005-11-26 01:56:07 UTC (rev 19598) +++ trunk/reactos/lib/devmgr/stubs.c 2005-11-26 02:12:58 UTC (rev 19599) @@ -640,9 +640,9 @@ int WINAPI DevicePropertiesExA(HWND hWndParent, - HINSTANCE hInst, LPCSTR lpMachineName, LPCSTR lpDeviceID, + HINSTANCE hInst, DWORD Unknown) { UNIMPLEMENTED; @@ -678,9 +678,9 @@ int WINAPI DevicePropertiesExW(HWND hWndParent, - HINSTANCE hInst, LPCWSTR lpMachineName, LPCWSTR lpDeviceID, + HINSTANCE hInst, DWORD Unknown) { UNIMPLEMENTED;

1 0

[weiden] 19598: added stubs for SetupDiGetDeviceInstanceIdA/W
by weiden＠svn.reactos.com 26 Nov '05

26 Nov '05

added stubs for SetupDiGetDeviceInstanceIdA/W Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/lib/setupapi/stubs.c _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-11-26 01:44:36 UTC (rev 19597) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-11-26 01:56:07 UTC (rev 19598) @@ -323,8 +323,8 @@ @ stdcall SetupDiGetDeviceInfoListDetailW(ptr ptr) @ stdcall SetupDiGetDeviceInstallParamsA(ptr ptr ptr) @ stdcall SetupDiGetDeviceInstallParamsW(ptr ptr ptr) -@ stub SetupDiGetDeviceInstanceIdA -@ stub SetupDiGetDeviceInstanceIdW +@ stdcall SetupDiGetDeviceInstanceIdA(ptr ptr str long ptr) +@ stdcall SetupDiGetDeviceInstanceIdW(ptr ptr wstr long ptr) @ stdcall SetupDiGetDeviceRegistryPropertyA(long ptr long ptr ptr long ptr) @ stdcall SetupDiGetDeviceRegistryPropertyW(long ptr long ptr ptr long ptr) @ stdcall SetupDiGetDriverInfoDetailA(ptr ptr ptr ptr long ptr) _____ Modified: trunk/reactos/lib/setupapi/stubs.c --- trunk/reactos/lib/setupapi/stubs.c 2005-11-26 01:44:36 UTC (rev 19597) +++ trunk/reactos/lib/setupapi/stubs.c 2005-11-26 01:56:07 UTC (rev 19598) @@ -221,5 +221,32 @@ BOOL WINAPI SetupDiDestroyClassImageList(PSP_CLASSIMAGELIST_DATA ClassImageListData) { FIXME ("Stub %p\n", ClassImageListData); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return TRUE; } + +/********************************************************************** * + * SetupDiGetDeviceInstanceIdA(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDeviceInstanceIdA(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, + PSTR DeviceInstanceId, DWORD DeviceInstanceIdSize, + PDWORD RequiredSize) +{ + FIXME ("Stub %p %p %p %d %p\n", + DeviceInfoSet, DeviceInfoData, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/********************************************************************** * + * SetupDiGetDeviceInstanceIdW(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDeviceInstanceIdW(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, + PWSTR DeviceInstanceId, DWORD DeviceInstanceIdSize, + PDWORD RequiredSize) +{ + FIXME ("Stub %p %p %p %d %p\n", + DeviceInfoSet, DeviceInfoData, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

[greatlrd] 19597: adding dplayx.dll to bootcd
by greatlrd＠svn.reactos.com 26 Nov '05

26 Nov '05

adding dplayx.dll to bootcd Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-11-26 01:41:16 UTC (rev 19596) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-11-26 01:44:36 UTC (rev 19597) @@ -89,6 +89,7 @@ lib\dinput8\dinput8.dll 1 lib\dnsapi\dnsapi.dll 1 lib\dplay\dplay.dll 1 +lib\dplayx\dplayx.dll 1 lib\dsound\dsound.dll 1 lib\dxdiagn\dxdiagn.dll 1 lib\fmifs\fmifs.dll 1

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