From: Hervé Poussineau Date: Sat, 22 Oct 2005 17:18:33 +0000 (+0000) Subject: Add a display class installer (useful when installing display drivers) X-Git-Tag: backups/ros-branch-0_2_9@19949~1184 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=601eea6d496926c3bf1be5d8ff93b937307b6af8 Add a display class installer (useful when installing display drivers) Use a common header for desk.cpl files svn path=/trunk/; revision=18683 --- diff --git a/reactos/bootdata/packages/reactos.dff b/reactos/bootdata/packages/reactos.dff index d0ee0848cd3..b75f8d20daf 100755 --- a/reactos/bootdata/packages/reactos.dff +++ b/reactos/bootdata/packages/reactos.dff @@ -293,6 +293,7 @@ media\nls\c_28599.nls 1 media\drivers\etc\services 5 media\inf\acpi.inf 6 media\inf\cdrom.inf 6 +media\inf\display.inf 6 media\inf\hdc.inf 6 media\inf\layout.inf 6 media\inf\machine.inf 6 diff --git a/reactos/lib/cpl/desk/appearance.c b/reactos/lib/cpl/desk/appearance.c index ca0d7613413..4c02abefa00 100644 --- a/reactos/lib/cpl/desk/appearance.c +++ b/reactos/lib/cpl/desk/appearance.c @@ -8,10 +8,7 @@ * PROGRAMMERS: Trevor McCort (lycan359@gmail.com) */ -#include -#include - -#include "resource.h" +#include "desk.h" INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, diff --git a/reactos/lib/cpl/desk/background.c b/reactos/lib/cpl/desk/background.c index 9862f53618c..f43c381ed04 100644 --- a/reactos/lib/cpl/desk/background.c +++ b/reactos/lib/cpl/desk/background.c @@ -8,16 +8,7 @@ * PROGRAMMERS: Trevor McCort (lycan359@gmail.com) */ -#include -#include -#include -#include -#include - -#include "resource.h" - #include "desk.h" -#include "dibitmap.h" #define MAX_BACKGROUNDS 100 diff --git a/reactos/lib/cpl/desk/classinst.c b/reactos/lib/cpl/desk/classinst.c new file mode 100644 index 00000000000..a1867c1244c --- /dev/null +++ b/reactos/lib/cpl/desk/classinst.c @@ -0,0 +1,177 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Plug & Play + * FILE: lib/cpl/desk/classinst.c + * PURPOSE: Display class installer + * + * PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.org) + */ + +//#define NDEBUG +#include + +#include "desk.h" + +DWORD WINAPI +DisplayClassInstaller( + IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + SP_DEVINSTALL_PARAMS InstallParams; + SP_DRVINFO_DATA DriverInfoData; + HINF hInf = INVALID_HANDLE_VALUE; + TCHAR SectionName[MAX_PATH]; + TCHAR ServiceName[MAX_SERVICE_NAME_LEN]; + SP_DRVINFO_DETAIL_DATA DriverInfoDetailData; + HKEY hServicesKey = INVALID_HANDLE_VALUE; + HKEY hServiceKey = INVALID_HANDLE_VALUE; + HKEY hDeviceSubKey = INVALID_HANDLE_VALUE; + DWORD disposition; + BOOL result; + LONG rc; + + if (InstallFunction != DIF_INSTALLDEVICE) + return ERROR_DI_DO_DEFAULT; + + InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + result = SetupDiGetDeviceInstallParams(DeviceInfoSet, DeviceInfoData, &InstallParams); + if (!result) + { + rc = GetLastError(); + DPRINT("SetupDiGetDeviceInstallParams() failed with error 0x%lx\n", rc); + goto cleanup; + } + + InstallParams.Flags |= DI_NEEDRESTART; + + result = SetupDiSetDeviceInstallParams(DeviceInfoSet, DeviceInfoData, &InstallParams); + if (!result) + { + rc = GetLastError(); + DPRINT("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", rc); + goto cleanup; + } + + DriverInfoData.cbSize = sizeof(SP_DRVINFO_DATA); + result = SetupDiGetSelectedDriver(DeviceInfoSet, DeviceInfoData, &DriverInfoData); + if (!result) + { + rc = GetLastError(); + DPRINT("SetupDiGetSelectedDriver() failed with error 0x%lx\n", rc); + goto cleanup; + } + + DriverInfoDetailData.cbSize = sizeof(SP_DRVINFO_DETAIL_DATA); + result = SetupDiGetDriverInfoDetail( + DeviceInfoSet, DeviceInfoData, + &DriverInfoData, &DriverInfoDetailData, + sizeof(SP_DRVINFO_DETAIL_DATA), NULL); + if (!result && GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + rc = GetLastError(); + DPRINT("SetupDiGetDriverInfoDetail() failed with error 0x%lx\n", rc); + goto cleanup; + } + + hInf = SetupOpenInfFile(DriverInfoDetailData.InfFileName, NULL, INF_STYLE_WIN4, NULL); + if (hInf == INVALID_HANDLE_VALUE) + { + rc = GetLastError(); + DPRINT("SetupOpenInfFile() failed with error 0x%lx\n", rc); + goto cleanup; + } + + result = SetupDiGetActualSectionToInstall( + hInf, DriverInfoDetailData.SectionName, + SectionName, MAX_PATH - _tcslen(_T(".SoftwareSettings")), NULL, NULL); + if (!result) + { + rc = GetLastError(); + DPRINT("SetupDiGetActualSectionToInstall() failed with error 0x%lx\n", rc); + goto cleanup; + } + _tcscat(SectionName, _T(".SoftwareSettings")); + + result = SetupDiInstallDevice(DeviceInfoSet, DeviceInfoData); + if (!result) + { + rc = GetLastError(); + DPRINT("SetupDiGetDeviceRegistryProperty() failed with error 0x%lx\n", rc); + goto cleanup; + } + + result = SetupDiGetDeviceRegistryProperty( + DeviceInfoSet, DeviceInfoData, + SPDRP_SERVICE, NULL, + (PBYTE)ServiceName, MAX_SERVICE_NAME_LEN * sizeof(TCHAR), NULL); + if (!result) + { + rc = GetLastError(); + DPRINT("SetupDiGetDeviceRegistryProperty() failed with error 0x%lx\n", rc); + goto cleanup; + } + + rc = RegOpenKeyEx( + HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Services"), + 0, KEY_ENUMERATE_SUB_KEYS, &hServicesKey); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegOpenKeyEx() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegOpenKeyEx( + hServicesKey, ServiceName, + 0, KEY_CREATE_SUB_KEY, &hServiceKey); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegOpenKeyEx() failed with error 0x%lx\n", rc); + goto cleanup; + } + + /* Create a Device0 subkey (FIXME: do a loop to find a free number?) */ + rc = RegCreateKeyEx( + hServiceKey, _T("Device0"), 0, NULL, + REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, + &hDeviceSubKey, &disposition); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegCreateKeyEx() failed with error 0x%lx\n", rc); + goto cleanup; + } + if (disposition != REG_CREATED_NEW_KEY) + { + rc = ERROR_GEN_FAILURE; + DPRINT("RegCreateKeyEx() failed\n"); + goto cleanup; + } + + /* Install SoftwareSettings section */ + result = SetupInstallFromInfSection( + InstallParams.hwndParent, hInf, SectionName, + SPINST_REGISTRY, hDeviceSubKey, + NULL, 0, NULL, NULL, + NULL, NULL); + if (!result) + { + rc = GetLastError(); + DPRINT("SetupInstallFromInfSection() failed with error 0x%lx\n", rc); + goto cleanup; + } + + /* FIXME: install OpenGLSoftwareSettings section */ + + rc = ERROR_SUCCESS; + +cleanup: + if (hInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hInf); + if (hServicesKey != INVALID_HANDLE_VALUE) + RegCloseKey(hServicesKey); + if (hServiceKey != INVALID_HANDLE_VALUE) + RegCloseKey(hServiceKey); + if (hDeviceSubKey != INVALID_HANDLE_VALUE) + RegCloseKey(hDeviceSubKey); + + return rc; +} diff --git a/reactos/lib/cpl/desk/desk.c b/reactos/lib/cpl/desk/desk.c index d64825ce450..6a8ef5a4c5c 100644 --- a/reactos/lib/cpl/desk/desk.c +++ b/reactos/lib/cpl/desk/desk.c @@ -8,11 +8,6 @@ * PROGRAMMERS: Trevor McCort (lycan359@gmail.com) */ -#include -#include -#include - -#include "resource.h" #include "desk.h" #define NUM_APPLETS (1) diff --git a/reactos/lib/cpl/desk/desk.def b/reactos/lib/cpl/desk/desk.def index e3547808f84..b060f7fb4b4 100644 --- a/reactos/lib/cpl/desk/desk.def +++ b/reactos/lib/cpl/desk/desk.def @@ -2,5 +2,6 @@ LIBRARY desk.cpl EXPORTS CPlApplet@16 +DisplayClassInstaller@12 ; EOF diff --git a/reactos/lib/cpl/desk/desk.h b/reactos/lib/cpl/desk/desk.h index eb600d83f9b..1c6973e87f0 100644 --- a/reactos/lib/cpl/desk/desk.h +++ b/reactos/lib/cpl/desk/desk.h @@ -1,6 +1,16 @@ #ifndef __CPL_DESK_H__ #define __CPL_DESK_H__ +#include +#include +#include +#include +#include +#include +#include + +#include "resource.h" + typedef struct { int idIcon; @@ -13,5 +23,21 @@ typedef struct extern HINSTANCE hApplet; +typedef struct +{ + BITMAPFILEHEADER *header; + BITMAPINFO *info; + BYTE *bits; + + int width; + int height; + +} DIBitmap; + +extern DIBitmap *DibLoadImage(TCHAR *filename); +extern void DibFreeImage(DIBitmap *bitmap); + +DWORD DbgPrint(PCH Format,...); + #endif /* __CPL_DESK_H__ */ diff --git a/reactos/lib/cpl/desk/desk.xml b/reactos/lib/cpl/desk/desk.xml index b5b2cde6d5f..73ff9829ea3 100644 --- a/reactos/lib/cpl/desk/desk.xml +++ b/reactos/lib/cpl/desk/desk.xml @@ -14,13 +14,15 @@ gdi32 comctl32 comdlg32 + setupapi shell32 - desk.c + ntdll + classinst.c + desk.c background.c screensaver.c appearance.c settings.c - dibitmap.c - desk.rc - + dibitmap.c + desk.rc diff --git a/reactos/lib/cpl/desk/dibitmap.c b/reactos/lib/cpl/desk/dibitmap.c index 661c58ea1e2..001333e9d11 100644 --- a/reactos/lib/cpl/desk/dibitmap.c +++ b/reactos/lib/cpl/desk/dibitmap.c @@ -8,7 +8,7 @@ * PROGRAMMERS: Trevor McCort (lycan359@gmail.com) */ -#include "dibitmap.h" +#include "desk.h" DIBitmap *DibLoadImage(TCHAR *filename) { diff --git a/reactos/lib/cpl/desk/dibitmap.h b/reactos/lib/cpl/desk/dibitmap.h deleted file mode 100644 index cb5b0ab0909..00000000000 --- a/reactos/lib/cpl/desk/dibitmap.h +++ /dev/null @@ -1,22 +0,0 @@ - -#ifndef __DIBITMAP_H__ -#define __DIBITMAP_H__ - -#include - -typedef struct -{ - BITMAPFILEHEADER *header; - BITMAPINFO *info; - BYTE *bits; - - int width; - int height; - -} DIBitmap; - -extern DIBitmap *DibLoadImage(TCHAR *filename); -extern void DibFreeImage(DIBitmap *bitmap); - -#endif /* __DIBITMAP_H__ */ - diff --git a/reactos/lib/cpl/desk/screensaver.c b/reactos/lib/cpl/desk/screensaver.c index d97a8fb8652..8eada7311e3 100644 --- a/reactos/lib/cpl/desk/screensaver.c +++ b/reactos/lib/cpl/desk/screensaver.c @@ -8,12 +8,6 @@ * PROGRAMMERS: Trevor McCort (lycan359@gmail.com) */ -#include -#include - -#include "resource.h" -#include -#include #include "desk.h" #define MAX_SCREENSAVERS 100 diff --git a/reactos/lib/cpl/desk/settings.c b/reactos/lib/cpl/desk/settings.c index 7d9afb7c806..3f0925e9f74 100644 --- a/reactos/lib/cpl/desk/settings.c +++ b/reactos/lib/cpl/desk/settings.c @@ -9,13 +9,6 @@ * Hervé Poussineau (poussine@freesurf.fr) */ -#include -#include -#include -#include -#include - -#include "resource.h" #include "desk.h" /* As slider control can't contain user data, we have to keep an diff --git a/reactos/media/inf/display.inf b/reactos/media/inf/display.inf new file mode 100644 index 00000000000..9fb5d2395a0 --- /dev/null +++ b/reactos/media/inf/display.inf @@ -0,0 +1,25 @@ +; Display.INF +; +; Installation file for the Display class +; +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf + +Class = Display +ClassGUID = {4d36e968-e325-11ce-bfc1-08002be10318} +Provider = %ReactOS% +DriverVer = 10/18/2005,1.00 + +[ClassInstall32.NT] +AddReg = DisplayClass.NT.AddReg + +[DisplayClass.NT.AddReg] +HKR, , , 0, %DisplayClassName% +HKR, , Icon, 0, "-1" +HKR, , Installer32, 0, "desk.cpl,DisplayClassInstaller" + +[Strings] +ReactOS = "ReactOS Team" +DisplayClassName = "Display Adapters" diff --git a/reactos/media/inf/inf.xml b/reactos/media/inf/inf.xml index 1d2b92720a7..8da98e85bb8 100644 --- a/reactos/media/inf/inf.xml +++ b/reactos/media/inf/inf.xml @@ -1,6 +1,7 @@ acpi.inf cdrom.inf +display.inf hdc.inf layout.inf machine.inf diff --git a/reactos/media/inf/syssetup.inf b/reactos/media/inf/syssetup.inf index e987cd892e8..371ca8af2c1 100644 --- a/reactos/media/inf/syssetup.inf +++ b/reactos/media/inf/syssetup.inf @@ -15,6 +15,7 @@ ClassGUID={00000000-0000-0000-0000-000000000000} ; MS uses netnovel.inf as class-installer INF for NICs ; we use a separate one to keep things clean cdrom.inf +display.inf hdc.inf machine.inf mouse.inf