Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[gvg] 19262: Sebastian Gasiorek <zebasoftis@gmail.com>

by gvg＠svn.reactos.com

Sebastian Gasiorek <zebasoftis(a)gmail.com> fix for empty control panel applet Change NUM_APPLETS (2) to NUM_APPLETS (1) because there is only one applet. Fixes bug 965. Modified: trunk/reactos/lib/cpl/intl/intl.c _____ Modified: trunk/reactos/lib/cpl/intl/intl.c --- trunk/reactos/lib/cpl/intl/intl.c 2005-11-16 09:41:01 UTC (rev 19261) +++ trunk/reactos/lib/cpl/intl/intl.c 2005-11-16 11:24:41 UTC (rev 19262) @@ -31,7 +31,7 @@ #include "resource.h" -#define NUM_APPLETS (2) +#define NUM_APPLETS (1) LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam);

19 years, 1 month

[hpoussin] 19261: - Initialise DevInst field in SP_DEVINFO_DATA. This field can be sent to CM_* functions (code still commented out in SetupDiCreateDeviceInfoListExW)

by hpoussin＠svn.reactos.com

- Initialise DevInst field in SP_DEVINFO_DATA. This field can be sent to CM_* functions (code still commented out in SetupDiCreateDeviceInfoListExW) - Fix an error when setting LoadOrderGroup in registry - Some FIXME -> ERR changes Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/install.c Modified: trunk/reactos/lib/setupapi/setupapi_private.h _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-11-16 05:40:35 UTC (rev 19260) +++ trunk/reactos/lib/setupapi/devinst.c 2005-11-16 09:41:01 UTC (rev 19261) @@ -618,7 +618,10 @@ PVOID Reserved) { struct DeviceInfoSet *list; + LPWSTR UNCServerName = NULL; DWORD rc; + //CONFIGRET cr; + HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE;; TRACE("%p %p %S %p\n", ClassGuid, hwndParent, MachineName, Reserved); @@ -626,7 +629,7 @@ if (!list) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return (HDEVINFO)INVALID_HANDLE_VALUE; + goto cleanup; } memset(list, 0, sizeof(struct DeviceInfoSet)); @@ -644,17 +647,59 @@ if (rc != ERROR_SUCCESS) { SetLastError(rc); - HeapFree(GetProcessHeap(), 0, list); - return (HDEVINFO)INVALID_HANDLE_VALUE; + goto cleanup; } + UNCServerName = HeapAlloc(GetProcessHeap(), 0, (strlenW(MachineName) + 3) * sizeof(WCHAR)); + if (!UNCServerName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + + strcpyW(UNCServerName + 2, MachineName); } else { + DWORD Size = MAX_PATH; list->HKLM = HKEY_LOCAL_MACHINE; + UNCServerName = HeapAlloc(GetProcessHeap(), 0, (MAX_PATH + 2) * sizeof(WCHAR)); + if (!UNCServerName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + if (!GetComputerNameW(UNCServerName + 2, &Size)) + goto cleanup; } +#if 0 + UNCServerName[0] = UNCServerName[1] = '\\'; + cr = CM_Connect_MachineW(UNCServerName, &list->hMachine); + if (cr != CR_SUCCESS) + { + switch (cr) + { + case CR_OUT_OF_MEMORY: rc = ERROR_NOT_ENOUGH_MEMORY; break; + case CR_INVALID_MACHINENAME: rc = ERROR_INVALID_COMPUTERNAME; break; + default: rc = ERROR_GEN_FAILURE; break; + } + SetLastError(rc); + goto cleanup; + } +#endif InitializeListHead(&list->DriverListHead); InitializeListHead(&list->ListHead); - return (HDEVINFO)list; + + ret = (HDEVINFO)list; + +cleanup: + if (ret == INVALID_HANDLE_VALUE) + { + if (list && list->HKLM != 0 && list->HKLM != HKEY_LOCAL_MACHINE) + RegCloseKey(list->HKLM); + HeapFree(GetProcessHeap(), 0, list); + } + HeapFree(GetProcessHeap(), 0, UNCServerName); + return ret; } /*********************************************************************** @@ -691,12 +736,7 @@ memcpy(&DeviceInfoData->ClassGuid, &DevInfo->ClassGuid, sizeof(GUID)); - DeviceInfoData->DevInst = 0; /* FIXME */ - /* Note: this appears to be dangerous, passing a private - * pointer a heap-allocated datum to the caller. However, the - * expected lifetime of the device data is the same as the - * HDEVINFO; once that is closed, the data are no longer valid. - */ + DeviceInfoData->DevInst = (DWORD)list->hMachine; DeviceInfoData->Reserved = (ULONG_PTR)DevInfo; ret = TRUE; } @@ -1806,11 +1846,6 @@ &DevItf->InterfaceClassGuid, sizeof(GUID)); DeviceInterfaceData->Flags = 0; /* FIXME */ - /* Note: this appears to be dangerous, passing a private - * pointer a heap-allocated datum to the caller. However, the - * expected lifetime of the device data is the same as the - * HDEVINFO; once that is closed, the data are no longer valid. - */ DeviceInterfaceData->Reserved = (ULONG_PTR)DevItf; Found = TRUE; } @@ -1888,6 +1923,7 @@ } if (list->HKLM != HKEY_LOCAL_MACHINE) RegCloseKey(list->HKLM); + CM_Disconnect_Machine(list->hMachine); HeapFree(GetProcessHeap(), 0, list); return TRUE; } @@ -1997,6 +2033,7 @@ PDWORD RequiredSize, PSP_DEVINFO_DATA DeviceInfoData) { + struct DeviceInfoSet *list; BOOL ret = FALSE; TRACE("(%p, %p, %p, %ld, %p, %p): stub\n", DeviceInfoSet, @@ -2007,7 +2044,7 @@ SetLastError(ERROR_INVALID_PARAMETER); else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) SetLastError(ERROR_INVALID_HANDLE); - else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInterfaceData->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); @@ -2041,12 +2078,7 @@ memcpy(&DeviceInfoData->ClassGuid, &deviceInterface->DeviceInfo->ClassGuid, sizeof(GUID)); - DeviceInfoData->DevInst = 0; /* FIXME */ - /* Note: this appears to be dangerous, passing a private - * pointer a heap-allocated datum to the caller. However, the - * expected lifetime of the device data is the same as the - * HDEVINFO; once that is closed, the data are no longer valid. - */ + DeviceInfoData->DevInst = (DWORD)list->hMachine; DeviceInfoData->Reserved = (ULONG_PTR)deviceInterface->DeviceInfo; } ret = TRUE; @@ -2323,7 +2355,7 @@ default: { - FIXME("Property 0x%lx not implemented\n", Property); + ERR("Property 0x%lx not implemented\n", Property); SetLastError(ERROR_NOT_SUPPORTED); } } @@ -2472,7 +2504,7 @@ default: { - FIXME("Property 0x%lx not implemented\n", Property); + ERR("Property 0x%lx not implemented\n", Property); SetLastError(ERROR_NOT_SUPPORTED); } } @@ -3010,8 +3042,8 @@ DefaultHandler = SetupDiSelectBestCompatDrv; break; default: - FIXME("Install function %ld not implemented\n", InstallFunction); - SetLastError(ERROR_INVALID_PARAMETER); + ERR("Install function %lu not supported\n", InstallFunction); + SetLastError(ERROR_NOT_SUPPORTED); } InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); @@ -3809,7 +3841,6 @@ { struct DeviceInfoElement *deviceInfo; - /* FIXME: ClassGuid can be NULL */ if (CreateDeviceInfoElement(DeviceName, ClassGuid, &deviceInfo)) { InsertTailList(&list->ListHead, &deviceInfo->ListEntry); @@ -3825,7 +3856,7 @@ else { memcpy(&DeviceInfoData->ClassGuid, ClassGuid, sizeof(GUID)); - DeviceInfoData->DevInst = 0; /* FIXME */ + DeviceInfoData->DevInst = (DWORD)list->hMachine; DeviceInfoData->Reserved = (ULONG_PTR)deviceInfo; ret = TRUE; } @@ -4728,8 +4759,10 @@ return FALSE; } - /* FIXME: GUID_NULL is not allowed */ - if (!CreateDeviceInfoElement(DeviceInstanceId, &GUID_NULL /* FIXME */, &deviceInfo)) + /* FIXME: try to get ClassGUID from registry, instead of + * sending GUID_NULL to CreateDeviceInfoElement + */ + if (!CreateDeviceInfoElement(DeviceInstanceId, &GUID_NULL, &deviceInfo)) { RegCloseKey(hKey); return FALSE; @@ -4743,7 +4776,7 @@ if (ret && deviceInfo && DeviceInfoData) { memcpy(&DeviceInfoData->ClassGuid, &deviceInfo->ClassGuid, sizeof(GUID)); - DeviceInfoData->DevInst = 0; /* FIXME */ + DeviceInfoData->DevInst = (DWORD)list->hMachine; DeviceInfoData->Reserved = (ULONG_PTR)deviceInfo; } } _____ Modified: trunk/reactos/lib/setupapi/install.c --- trunk/reactos/lib/setupapi/install.c 2005-11-16 05:40:35 UTC (rev 19260) +++ trunk/reactos/lib/setupapi/install.c 2005-11-16 09:41:01 UTC (rev 19261) @@ -1252,13 +1252,11 @@ { GroupOrder[0] = 0; } + GroupOrder[0]++; if (flags & SPSVCINST_TAGTOFRONT) GroupOrder[1] = tagId; else - { - GroupOrder[0]++; GroupOrder[bufferSize / sizeof(DWORD)] = tagId; - } rc = RegSetValueExW( hGroupOrderListKey, _____ Modified: trunk/reactos/lib/setupapi/setupapi_private.h --- trunk/reactos/lib/setupapi/setupapi_private.h 2005-11-16 05:40:35 UTC (rev 19260) +++ trunk/reactos/lib/setupapi/setupapi_private.h 2005-11-16 09:41:01 UTC (rev 19261) @@ -133,6 +133,7 @@ DWORD magic; /* SETUP_DEV_INFO_SET_MAGIC */ GUID ClassGuid; /* If != GUID_NULL, only devices of this class can be in the device info set */ HKEY HKLM; /* Local or distant HKEY_LOCAL_MACHINE registry key */ + HMACHINE hMachine; /* Used in CM_* functions */ /* Reserved Field points to a struct DriverInfoElement */ SP_DEVINSTALL_PARAMS_W InstallParams;

19 years, 1 month

[sedwards] 19260: remove windef.h inclusion. Its not needed and its non-standard

by sedwards＠svn.reactos.com

remove windef.h inclusion. Its not needed and its non-standard Modified: trunk/reactos/w32api/include/crt/excpt.h _____ Modified: trunk/reactos/w32api/include/crt/excpt.h --- trunk/reactos/w32api/include/crt/excpt.h 2005-11-16 05:39:32 UTC (rev 19259) +++ trunk/reactos/w32api/include/crt/excpt.h 2005-11-16 05:40:35 UTC (rev 19260) @@ -19,8 +19,6 @@ #include <_mingw.h> #endif -#include <windef.h> - /* * NOTE: The constants structs and typedefs below should be defined in the * Win32 API headers.

19 years, 1 month

[sedwards] 19259: created crt public headers directory. Moved excpt.h there

by sedwards＠svn.reactos.com

created crt public headers directory. Moved excpt.h there Modified: trunk/reactos/ReactOS.xml Added: trunk/reactos/w32api/include/crt/ Added: trunk/reactos/w32api/include/crt/excpt.h Deleted: trunk/reactos/w32api/include/excpt.h _____ Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2005-11-15 23:07:04 UTC (rev 19258) +++ trunk/reactos/ReactOS.xml 2005-11-16 05:39:32 UTC (rev 19259) @@ -36,6 +36,7 @@ <include>include/drivers</include> <include>include/subsys</include> <include>w32api/include</include> + <include>w32api/include/crt</include> <include>w32api/include/ddk</include> <directory name="apps"> _____ Copied: trunk/reactos/w32api/include/crt/excpt.h (from rev 19258, trunk/reactos/w32api/include/excpt.h) _____ Deleted: trunk/reactos/w32api/include/excpt.h --- trunk/reactos/w32api/include/excpt.h 2005-11-15 23:07:04 UTC (rev 19258) +++ trunk/reactos/w32api/include/excpt.h 2005-11-16 05:39:32 UTC (rev 19259) @@ -1,92 +0,0 @@ -/* - * excpt.h - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * Support for operating system level structured exception handling. - * - * NOTE: This is very preliminary stuff. I am also pretty sure it is - * completely Intel specific. - * - */ - -#ifndef _EXCPT_H_ -#define _EXCPT_H_ - -/* All the headers include this file. */ -#if defined(__MINGW32__) -#include <_mingw.h> -#endif - -#include <windef.h> - -/* - * NOTE: The constants structs and typedefs below should be defined in the - * Win32 API headers. - */ -#define EH_NONCONTINUABLE 0x01 -#define EH_UNWINDING 0x02 -#define EH_EXIT_UNWIND 0x04 -#define EH_STACK_INVALID 0x08 -#define EH_NESTED_CALL 0x10 - -#ifndef RC_INVOKED - -typedef enum { - ExceptionContinueExecution, - ExceptionContinueSearch, - ExceptionNestedException, - ExceptionCollidedUnwind -} EXCEPTION_DISPOSITION; - - -/* - * End of stuff that should be in the Win32 API files. - */ - - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * The type of function that is expected as an exception handler to be - * installed with _try1. - */ -typedef EXCEPTION_DISPOSITION (*PEXCEPTION_HANDLER) - (struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*); - - -/* - * A macro which installs the supplied exception handler. - * Push the pointer to the new handler onto the stack, - * then push the pointer to the old registration structure (at fs:0) - * onto the stack, then put a pointer to the new registration - * structure (i.e. the current stack pointer) at fs:0. - */ -#define __try1(pHandler) \ - __asm__ ("pushl %0;pushl %%fs:0;movl %%esp,%%fs:0;" : : "g" (pHandler)); - -/* - * A macro which (despite its name) *removes* an installed - * exception handler. Should be used only in conjunction with the above - * install routine __try1. - * Move the pointer to the old reg. struct (at the current stack - * position) to fs:0, replacing the pointer we installed above, - * then add 8 to the stack pointer to get rid of the space we - * used when we pushed on our new reg. struct above. Notice that - * the stack must be in the exact state at this point that it was - * after we did _try1 or this will smash things. - */ -#define __except1 \ - __asm__ ("movl (%%esp),%%eax;movl %%eax,%%fs:0;addl $8,%%esp;" \ - : : : "%eax"); - -#ifdef __cplusplus -} -#endif - -#endif /* Not RC_INVOKED */ - -#endif /* _EXCPT_H_ not defined */

19 years, 1 month

[fireball] 19258: Fix "Devices Parameters" subkey creation in a call to IoOpenDeviceRegistryKey()

by fireball＠svn.reactos.com

Fix "Devices Parameters" subkey creation in a call to IoOpenDeviceRegistryKey() Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-11-15 22:44:46 UTC (rev 19257) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-11-15 23:07:04 UTC (rev 19258) @@ -437,7 +437,7 @@ L"Hardware Profiles\\Current\\System\\CurrentControlSet\\"; static WCHAR ClassKeyName[] = L"Control\\Class\\"; static WCHAR EnumKeyName[] = L"Enum\\"; - static WCHAR DeviceParametersKeyName[] = L"Device Parameters\\"; + static WCHAR DeviceParametersKeyName[] = L"Device Parameters"; ULONG KeyNameLength; LPWSTR KeyNameBuffer; UNICODE_STRING KeyName;

19 years, 1 month

[gedmurphy] 19257: Display more meaningful failure messages

by gedmurphy＠svn.reactos.com

Display more meaningful failure messages Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c _____ Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c --- trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-11-15 22:35:15 UTC (rev 19256) +++ trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-11-15 22:44:46 UTC (rev 19257) @@ -32,6 +32,7 @@ #define _UNICODE + LPCTSTR GetNodeTypeName(UINT NodeType) { switch (NodeType) { @@ -104,6 +105,8 @@ ULONG netOutBufLen; PIP_ADDR_STRING pIPAddr = NULL; + DWORD ErrRet = 0; + /* assign memory for call to GetNetworkParams */ pFixedInfo = (FIXED_INFO *) GlobalAlloc( GPTR, sizeof( FIXED_INFO ) ); netOutBufLen = sizeof(FIXED_INFO); @@ -126,15 +129,17 @@ pAdapterInfo = (IP_ADAPTER_INFO *) malloc (adaptOutBufLen); } - if (! GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen) == NO_ERROR) + if ((ErrRet = GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen)) != NO_ERROR) { - _tprintf(_T("GetAdaptersInfo failed %lu\n"), GetLastError()); + _tprintf(_T("GetAdaptersInfo failed : ")); + DoFormatMessage(ErrRet); return EXIT_FAILURE; } - if (! GetNetworkParams(pFixedInfo, &netOutBufLen) == NO_ERROR) + if ((ErrRet = GetNetworkParams(pFixedInfo, &netOutBufLen)) != NO_ERROR) { - _tprintf(_T("GetNetworkParams failed %lu\n"), GetLastError()); + _tprintf(_T("GetNetworkParams failed : ")); + DoFormatMessage(ErrRet); return EXIT_FAILURE; }

19 years, 1 month

[hpoussin] 19256: Hardware IDs and Compatible IDs shouldn't be case sensitive

by hpoussin＠svn.reactos.com

Hardware IDs and Compatible IDs shouldn't be case sensitive Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-11-15 21:22:00 UTC (rev 19255) +++ trunk/reactos/lib/setupapi/devinst.c 2005-11-15 22:35:15 UTC (rev 19256) @@ -4425,7 +4425,7 @@ DriverAlreadyAdded = FALSE; for (DriverRank = 0, currentId = (LPCWSTR)HardwareIDs; !DriverAlreadyAdded && *currentId; currentId += wcslen(currentId) + 1, DriverRank++) { - if (wcscmp(DeviceId, currentId) == 0) + if (wcsicmp(DeviceId, currentId) == 0) { AddDriverToList( &((struct DeviceInfoElement *)DeviceInfoData->Reserved)->DriverListHead, @@ -4446,7 +4446,7 @@ { for (DriverRank = 0, currentId = (LPCWSTR)CompatibleIDs; !DriverAlreadyAdded && *currentId; currentId += wcslen(currentId) + 1, DriverRank++) { - if (wcscmp(DeviceId, currentId) == 0) + if (wcsicmp(DeviceId, currentId) == 0) { AddDriverToList( &((struct DeviceInfoElement *)DeviceInfoData->Reserved)->DriverListHead,

19 years, 1 month

[gedmurphy] 19255: Don't display exit code for none fatal info

by gedmurphy＠svn.reactos.com

Don't display exit code for none fatal info Display name of path we were trying to open if opening fails Modified: trunk/reactos/services/tcpsvcs/qotd.c Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.c _____ Modified: trunk/reactos/services/tcpsvcs/qotd.c --- trunk/reactos/services/tcpsvcs/qotd.c 2005-11-15 18:56:23 UTC (rev 19254) +++ trunk/reactos/services/tcpsvcs/qotd.c 2005-11-15 21:22:00 UTC (rev 19255) @@ -44,7 +44,10 @@ LogEvent(_T("QOTD: Opening quotes file\n"), 0, FALSE); if ((fp = _tfopen(Sys, "r")) == NULL) { - LogEvent(_T("QOTD: Error opening quote file\n"), 0, TRUE); + TCHAR temp[512]; + + _stprintf(temp, _T("QOTD: Error opening quote file : %s\n"), Sys); + LogEvent(temp, 0, TRUE); LogEvent(_T("QOTD: Terminating thread\n"), 0, FALSE); ExitThread(-1); } _____ Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.c --- trunk/reactos/services/tcpsvcs/tcpsvcs.c 2005-11-15 18:56:23 UTC (rev 19254) +++ trunk/reactos/services/tcpsvcs/tcpsvcs.c 2005-11-15 21:22:00 UTC (rev 19255) @@ -260,8 +260,7 @@ } else { - _stprintf(MessageBuffer, _T("\n%s ExitCode = %lu."), - UserMessage, ExitCode); + _stprintf(MessageBuffer, _T("\n%s"), UserMessage); } fputs (MessageBuffer, hLogFile);

19 years, 1 month

[cwittich] 19254: add a check for SPDRP_CONFIGFLAGS which is not working yet

by cwittich＠svn.reactos.com

add a check for SPDRP_CONFIGFLAGS which is not working yet Modified: trunk/reactos/lib/newdev/newdev.c _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-11-15 18:08:07 UTC (rev 19253) +++ trunk/reactos/lib/newdev/newdev.c 2005-11-15 18:56:23 UTC (rev 19254) @@ -5,6 +5,7 @@ * PURPOSE: New devices installation * * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) +* PROGRAMMERS: Christoph von Wittich (Christoph(a)ActiveVB.de) */ //#define NDEBUG @@ -24,751 +25,752 @@ static HFONT CreateTitleFont(VOID) { - NONCLIENTMETRICS ncm; - LOGFONT LogFont; - HDC hdc; - INT FontSize; - HFONT hFont; + NONCLIENTMETRICS ncm; + LOGFONT LogFont; + HDC hdc; + INT FontSize; + HFONT hFont; - ncm.cbSize = sizeof(NONCLIENTMETRICS); - SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + ncm.cbSize = sizeof(NONCLIENTMETRICS); + SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); - LogFont = ncm.lfMessageFont; - LogFont.lfWeight = FW_BOLD; - _tcscpy(LogFont.lfFaceName, _T("MS Shell Dlg")); + LogFont = ncm.lfMessageFont; + LogFont.lfWeight = FW_BOLD; + _tcscpy(LogFont.lfFaceName, _T("MS Shell Dlg")); - hdc = GetDC(NULL); - FontSize = 12; - LogFont.lfHeight = 0 - GetDeviceCaps (hdc, LOGPIXELSY) * FontSize / 72; - hFont = CreateFontIndirect(&LogFont); - ReleaseDC(NULL, hdc); + hdc = GetDC(NULL); + FontSize = 12; + LogFont.lfHeight = 0 - GetDeviceCaps (hdc, LOGPIXELSY) * FontSize / 72; + hFont = CreateFontIndirect(&LogFont); + ReleaseDC(NULL, hdc); - return hFont; + return hFont; } static VOID CenterWindow(HWND hWnd) { - HWND hWndParent; - RECT rcParent; - RECT rcWindow; + HWND hWndParent; + RECT rcParent; + RECT rcWindow; - hWndParent = GetParent(hWnd); - if (hWndParent == NULL) - hWndParent = GetDesktopWindow(); + hWndParent = GetParent(hWnd); + if (hWndParent == NULL) + hWndParent = GetDesktopWindow(); - GetWindowRect(hWndParent, &rcParent); - GetWindowRect(hWnd, &rcWindow); + GetWindowRect(hWndParent, &rcParent); + GetWindowRect(hWnd, &rcWindow); - SetWindowPos(hWnd, - HWND_TOP, - ((rcParent.right - rcParent.left) - (rcWindow.right - rcWindow.left)) / 2, - ((rcParent.bottom - rcParent.top) - (rcWindow.bottom - rcWindow.top)) / 2, - 0, - 0, - SWP_NOSIZE); + SetWindowPos(hWnd, + HWND_TOP, + ((rcParent.right - rcParent.left) - (rcWindow.right - rcWindow.left)) / 2, + ((rcParent.bottom - rcParent.top) - (rcWindow.bottom - rcWindow.top)) / 2, + 0, + 0, + SWP_NOSIZE); } static INT_PTR CALLBACK WelcomeDlgProc( - IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { - PDEVINSTDATA DevInstData; + PDEVINSTDATA DevInstData; - /* Retrieve pointer to the global setup data */ - DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + /* Retrieve pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); - switch (uMsg) - { - case WM_INITDIALOG: - { - HWND hwndControl; - DWORD dwStyle; + switch (uMsg) + { + case WM_INITDIALOG: + { + HWND hwndControl; + DWORD dwStyle; - /* Get pointer to the global setup data */ - DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + /* Get pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); - hwndControl = GetParent(hwndDlg); + hwndControl = GetParent(hwndDlg); - /* Center the wizard window */ - CenterWindow (hwndControl); + /* Center the wizard window */ + CenterWindow (hwndControl); - /* Hide the system menu */ - dwStyle = GetWindowLong(hwndControl, GWL_STYLE); - SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + /* Hide the system menu */ + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); - /* Set title font */ - SendDlgItemMessage(hwndDlg, - IDC_WELCOMETITLE, - WM_SETFONT, - (WPARAM)DevInstData->hTitleFont, - (LPARAM)TRUE); + /* Set title font */ + SendDlgItemMessage(hwndDlg, + IDC_WELCOMETITLE, + WM_SETFONT, + (WPARAM)DevInstData->hTitleFont, + (LPARAM)TRUE); - SendDlgItemMessage(hwndDlg, - IDC_DEVICE, - WM_SETTEXT, - 0, - (LPARAM) DevInstData->buffer); + SendDlgItemMessage(hwndDlg, + IDC_DEVICE, + WM_SETTEXT, + 0, + (LPARAM) DevInstData->buffer); - SendDlgItemMessage(hwndDlg, - IDC_RADIO_AUTO, - BM_SETCHECK, - (WPARAM) TRUE, - (LPARAM) 0); + SendDlgItemMessage(hwndDlg, + IDC_RADIO_AUTO, + BM_SETCHECK, + (WPARAM) TRUE, + (LPARAM) 0); - } - break; + } + break; - case WM_NOTIFY: - { - LPNMHDR lpnm = (LPNMHDR)lParam; + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; - switch (lpnm->code) - { - case PSN_SETACTIVE: - /* Enable the Next button */ - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); - break; + switch (lpnm->code) + { + case PSN_SETACTIVE: + /* Enable the Next button */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); + break; - case PSN_WIZNEXT: - /* Handle a Next button click, if necessary */ + case PSN_WIZNEXT: + /* Handle a Next button click, if necessary */ - if (SendDlgItemMessage(hwndDlg, IDC_RADIO_AUTO, BM_GETCHECK, (WPARAM) 0, (LPARAM) 0) == BST_CHECKED) - PropSheet_SetCurSel(GetParent(hwndDlg), 0, IDD_SEARCHDRV); + if (SendDlgItemMessage(hwndDlg, IDC_RADIO_AUTO, BM_GETCHECK, (WPARAM) 0, (LPARAM) 0) == BST_CHECKED) + PropSheet_SetCurSel(GetParent(hwndDlg), 0, IDD_SEARCHDRV); - break; + break; - default: - break; - } - } - break; + default: + break; + } + } + break; - default: - break; - } + default: + break; + } - return FALSE; + return FALSE; } static INT_PTR CALLBACK CHSourceDlgProc( - IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { - PDEVINSTDATA DevInstData; + PDEVINSTDATA DevInstData; - /* Retrieve pointer to the global setup data */ - DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + /* Retrieve pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); - switch (uMsg) - { - case WM_INITDIALOG: - { - HWND hwndControl; - DWORD dwStyle; + switch (uMsg) + { + case WM_INITDIALOG: + { + HWND hwndControl; + DWORD dwStyle; - /* Get pointer to the global setup data */ - DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + /* Get pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); - hwndControl = GetParent(hwndDlg); + hwndControl = GetParent(hwndDlg); - /* Center the wizard window */ - CenterWindow (hwndControl); + /* Center the wizard window */ + CenterWindow (hwndControl); - /* Hide the system menu */ - dwStyle = GetWindowLong(hwndControl, GWL_STYLE); - SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + /* Hide the system menu */ + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); - SendDlgItemMessage(hwndDlg, - IDC_RADIO_SEARCHHERE, - BM_SETCHECK, - (WPARAM) TRUE, - (LPARAM) 0); + SendDlgItemMessage(hwndDlg, + IDC_RADIO_SEARCHHERE, + BM_SETCHECK, + (WPARAM) TRUE, + (LPARAM) 0); - } - break; + } + break; - case WM_NOTIFY: - { - LPNMHDR lpnm = (LPNMHDR)lParam; + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; - switch (lpnm->code) - { - case PSN_SETACTIVE: - /* Enable the Next and Back buttons */ - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); - break; + switch (lpnm->code) + { + case PSN_SETACTIVE: + /* Enable the Next and Back buttons */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); + break; - case PSN_WIZNEXT: - /* Handle a Next button click, if necessary */ - PropSheet_SetCurSel(GetParent(hwndDlg), 0, 4); - break; + case PSN_WIZNEXT: + /* Handle a Next button click, if necessary */ + PropSheet_SetCurSel(GetParent(hwndDlg), 0, 4); + break; - default: - break; - } - } - break; + default: + break; + } + } + break; - default: - break; - } + default: + break; + } - return FALSE; + return FALSE; } static INT_PTR CALLBACK SearchDrvDlgProc( - IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { - PDEVINSTDATA DevInstData; - DWORD dwThreadId; + PDEVINSTDATA DevInstData; + DWORD dwThreadId; - /* Retrieve pointer to the global setup data */ - DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + /* Retrieve pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); - switch (uMsg) - { - case WM_INITDIALOG: - { - HWND hwndControl; - DWORD dwStyle; + switch (uMsg) + { + case WM_INITDIALOG: + { + HWND hwndControl; + DWORD dwStyle; - /* Get pointer to the global setup data */ - DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + /* Get pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); - DevInstData->hDialog = hwndDlg; - hwndControl = GetParent(hwndDlg); + DevInstData->hDialog = hwndDlg; + hwndControl = GetParent(hwndDlg); - /* Center the wizard window */ - CenterWindow (hwndControl); + /* Center the wizard window */ + CenterWindow (hwndControl); - SendDlgItemMessage(hwndDlg, - IDC_DEVICE, - WM_SETTEXT, - 0, - (LPARAM) DevInstData->buffer); + SendDlgItemMessage(hwndDlg, + IDC_DEVICE, + WM_SETTEXT, + 0, + (LPARAM) DevInstData->buffer); - /* Hide the system menu */ - dwStyle = GetWindowLong(hwndControl, GWL_STYLE); - SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); - } - break; + /* Hide the system menu */ + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + } + break; - case WM_SEARCH_FINISHED: - { - CloseHandle(hThread); - hThread = 0; - if (wParam == 0) - PropSheet_SetCurSel(GetParent(hwndDlg), 0, IDD_NODRIVER); - else - PropSheet_SetCurSel(GetParent(hwndDlg), 0, IDD_FINISHPAGE); - break; - } - case WM_NOTIFY: - { - LPNMHDR lpnm = (LPNMHDR)lParam; + case WM_SEARCH_FINISHED: + { + CloseHandle(hThread); + hThread = 0; + if (wParam == 0) + PropSheet_SetCurSel(GetParent(hwndDlg), 0, IDD_NODRIVER); + else + PropSheet_SetCurSel(GetParent(hwndDlg), 0, IDD_FINISHPAGE); + break; + } + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; - switch (lpnm->code) - { - case PSN_SETACTIVE: - PropSheet_SetWizButtons(GetParent(hwndDlg), !PSWIZB_NEXT | !PSWIZB_BACK); - hThread = CreateThread( NULL, 0, FindDriverProc, DevInstData, 0, &dwThreadId); - break; + switch (lpnm->code) + { + case PSN_SETACTIVE: + PropSheet_SetWizButtons(GetParent(hwndDlg), !PSWIZB_NEXT | !PSWIZB_BACK); + hThread = CreateThread( NULL, 0, FindDriverProc, DevInstData, 0, &dwThreadId); + break; - case PSN_KILLACTIVE: - if (hThread != 0) - { - SetWindowLong ( hwndDlg, DWL_MSGRESULT, TRUE); - return TRUE; - } - break; - case PSN_WIZNEXT: - /* Handle a Next button click, if necessary */ - break; + case PSN_KILLACTIVE: + if (hThread != 0) + { + SetWindowLong ( hwndDlg, DWL_MSGRESULT, TRUE); + return TRUE; + } + break; + case PSN_WIZNEXT: + /* Handle a Next button click, if necessary */ + break; - default: - break; - } - } - break; + default: + break; + } + } + break; - default: - break; - } + default: + break; + } - return FALSE; + return FALSE; } static DWORD WINAPI FindDriverProc( - IN LPVOID lpParam) + IN LPVOID lpParam) { - TCHAR drive[] = {'?',':',0}; - size_t nType; - DWORD dwDrives; - PDEVINSTDATA DevInstData; - UINT i = 1; + TCHAR drive[] = {'?',':',0}; + size_t nType; + DWORD dwDrives; + PDEVINSTDATA DevInstData; + UINT i = 1; - DevInstData = (PDEVINSTDATA)lpParam; + DevInstData = (PDEVINSTDATA)lpParam; - dwDrives = GetLogicalDrives(); - for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++) - { - if (dwDrives & i) - { - nType = GetDriveType( drive ); - if ((nType == DRIVE_CDROM) || (nType == DRIVE_FIXED)) - { - /* search for inf file */ - if (SearchDriver ( DevInstData, drive )) - { - /* if we found a valid driver inf... */ - if (FindDriver ( DevInstData )) - { - InstallDriver ( DevInstData ); - PostMessage(DevInstData->hDialog, WM_SEARCH_FINISHED, 1, 0); - return 0; - } - } - } - } - i <<= 1; - } + dwDrives = GetLogicalDrives(); + for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++) + { + if (dwDrives & i) + { + nType = GetDriveType( drive ); + if ((nType == DRIVE_CDROM)) + //if ((nType == DRIVE_CDROM) || (nType == DRIVE_FIXED)) + { + /* search for inf file */ + if (SearchDriver ( DevInstData, drive )) + { + /* if we found a valid driver inf... */ + if (FindDriver ( DevInstData )) + { + InstallDriver ( DevInstData ); + PostMessage(DevInstData->hDialog, WM_SEARCH_FINISHED, 1, 0); + return 0; + } + } + } + } + i <<= 1; + } - PostMessage(DevInstData->hDialog, WM_SEARCH_FINISHED, 0, 0); - return 0; + PostMessage(DevInstData->hDialog, WM_SEARCH_FINISHED, 0, 0); + return 0; } static INT_PTR CALLBACK FinishDlgProc( - IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { - PDEVINSTDATA DevInstData; + PDEVINSTDATA DevInstData; - /* Retrieve pointer to the global setup data */ - DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + /* Retrieve pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); - switch (uMsg) - { - case WM_INITDIALOG: - { - HWND hwndControl; + switch (uMsg) + { + case WM_INITDIALOG: + { + HWND hwndControl; - /* Get pointer to the global setup data */ - DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + /* Get pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); - hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); - ShowWindow (hwndControl, SW_HIDE); - EnableWindow (hwndControl, FALSE); + hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); + ShowWindow (hwndControl, SW_HIDE); + EnableWindow (hwndControl, FALSE); - SendDlgItemMessage(hwndDlg, - IDC_DEVICE, - WM_SETTEXT, - 0, - (LPARAM) DevInstData->drvInfoData.Description); + SendDlgItemMessage(hwndDlg, + IDC_DEVICE, + WM_SETTEXT, + 0, + (LPARAM) DevInstData->drvInfoData.Description); - /* Set title font */ - SendDlgItemMessage(hwndDlg, - IDC_FINISHTITLE, - WM_SETFONT, - (WPARAM)DevInstData->hTitleFont, - (LPARAM)TRUE); - } - break; + /* Set title font */ + SendDlgItemMessage(hwndDlg, + IDC_FINISHTITLE, + WM_SETFONT, + (WPARAM)DevInstData->hTitleFont, + (LPARAM)TRUE); + } + break; - case WM_NOTIFY: - { - LPNMHDR lpnm = (LPNMHDR)lParam; + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; - switch (lpnm->code) - { - case PSN_SETACTIVE: - /* Enable the correct buttons on for the active page */ - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); - break; + switch (lpnm->code) + { + case PSN_SETACTIVE: + /* Enable the correct buttons on for the active page */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); + break; - case PSN_WIZBACK: - /* Handle a Back button click, if necessary */ - break; + case PSN_WIZBACK: + /* Handle a Back button click, if necessary */ + break; - case PSN_WIZFINISH: - /* Handle a Finish button click, if necessary */ - break; + case PSN_WIZFINISH: + /* Handle a Finish button click, if necessary */ + break; - default: - break; - } - } - break; + default: + break; + } + } + break; - default: - break; - } + default: + break; + } - return FALSE; + return FALSE; } static INT_PTR CALLBACK InstFailDlgProc( - IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { - PDEVINSTDATA DevInstData; + PDEVINSTDATA DevInstData; - /* Get pointer to the global setup data */ - DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + /* Get pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); - switch (uMsg) - { - case WM_INITDIALOG: - { - HWND hwndControl; + switch (uMsg) + { + case WM_INITDIALOG: + { + HWND hwndControl; - DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); - hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); - ShowWindow (hwndControl, SW_HIDE); - EnableWindow (hwndControl, FALSE); + hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); + ShowWindow (hwndControl, SW_HIDE); + EnableWindow (hwndControl, FALSE); - /* Set title font */ - SendDlgItemMessage(hwndDlg, - IDC_FINISHTITLE, - WM_SETFONT, - (WPARAM)DevInstData->hTitleFont, - (LPARAM)TRUE); - } - break; + /* Set title font */ + SendDlgItemMessage(hwndDlg, + IDC_FINISHTITLE, + WM_SETFONT, + (WPARAM)DevInstData->hTitleFont, + (LPARAM)TRUE); + } + break; - case WM_NOTIFY: - { - LPNMHDR lpnm = (LPNMHDR)lParam; - DWORD config_flags; - BOOL ret; + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + DWORD config_flags; + BOOL ret; - switch (lpnm->code) - { - case PSN_SETACTIVE: - /* Enable the correct buttons on for the active page */ - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_FINISH); - break; + switch (lpnm->code) + { + case PSN_SETACTIVE: + /* Enable the correct buttons on for the active page */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_FINISH); + break; - case PSN_WIZBACK: - PropSheet_SetCurSel(GetParent(hwndDlg), 0, IDD_WELCOMEPAGE); - /* Handle a Back button click, if necessary */ - break; + case PSN_WIZBACK: + PropSheet_SetCurSel(GetParent(hwndDlg), 0, IDD_WELCOMEPAGE); + /* Handle a Back button click, if necessary */ + break; - case PSN_WIZFINISH: - /* Handle a Finish button click, if necessary */ - if (SendDlgItemMessage(hwndDlg, IDC_DONOTSHOWDLG, BM_GETCHECK, (WPARAM) 0, (LPARAM) 0) == BST_CHECKED) - { + case PSN_WIZFINISH: + /* Handle a Finish button click, if necessary */ + if (SendDlgItemMessage(hwndDlg, IDC_DONOTSHOWDLG, BM_GETCHECK, (WPARAM) 0, (LPARAM) 0) == BST_CHECKED) + { - if(SetupDiGetDeviceRegistryProperty(DevInstData->hDevInfo, - &DevInstData->devInfoData, - SPDRP_CONFIGFLAGS, - NULL, - (BYTE *)&config_flags, - sizeof(config_flags), - NULL)) - { - config_flags |= CONFIGFLAG_FAILEDINSTALL; - ret = SetupDiSetDeviceRegistryProperty( - DevInstData->hDevInfo, - &DevInstData->devInfoData, - SPDRP_CONFIGFLAGS, - NULL, 0 ); - } + if(SetupDiGetDeviceRegistryProperty(DevInstData->hDevInfo, + &DevInstData->devInfoData, + SPDRP_CONFIGFLAGS, + NULL, + (BYTE *)&config_flags, + sizeof(config_flags), + NULL)) + { + config_flags |= CONFIGFLAG_FAILEDINSTALL; + ret = SetupDiSetDeviceRegistryProperty( + DevInstData->hDevInfo, + &DevInstData->devInfoData, + SPDRP_CONFIGFLAGS, + NULL, 0 ); + } - } - break; + } + break; - default: - break; - } - } - break; + default: + break; + } + } + break; - default: - break; - } + default: + break; + } - return FALSE; + return FALSE; } static BOOL FindDriver( - IN PDEVINSTDATA DevInstData) + IN PDEVINSTDATA DevInstData) { - BOOL ret; + BOOL ret; - ret = SetupDiBuildDriverInfoList(DevInstData->hDevInfo, &DevInstData->devInfoData, SPDIT_COMPATDRIVER); - if (!ret) - { - DPRINT("SetupDiBuildDriverInfoList() failed with error 0x%lx\n", GetLastError()); - return FALSE; - } + ret = SetupDiBuildDriverInfoList(DevInstData->hDevInfo, &DevInstData->devInfoData, SPDIT_COMPATDRIVER); + if (!ret) + { + DPRINT("SetupDiBuildDriverInfoList() failed with error 0x%lx\n", GetLastError()); + return FALSE; + } - DevInstData->drvInfoData.cbSize = sizeof(SP_DRVINFO_DATA); - ret = SetupDiEnumDriverInfo( - DevInstData->hDevInfo, - &DevInstData->devInfoData, - SPDIT_COMPATDRIVER, - 0, - &DevInstData->drvInfoData); - if (!ret) - { - if (GetLastError() == ERROR_NO_MORE_ITEMS) - return FALSE; - DPRINT("SetupDiEnumDriverInfo() failed with error 0x%lx\n", GetLastError()); - return FALSE; - } - DPRINT("Installing driver %S: %S\n", DevInstData->drvInfoData.MfgName, DevInstData->drvInfoData.Description); + DevInstData->drvInfoData.cbSize = sizeof(SP_DRVINFO_DATA); + ret = SetupDiEnumDriverInfo( + DevInstData->hDevInfo, + &DevInstData->devInfoData, + SPDIT_COMPATDRIVER, + 0, + &DevInstData->drvInfoData); + if (!ret) + { + if (GetLastError() == ERROR_NO_MORE_ITEMS) + return FALSE; + DPRINT("SetupDiEnumDriverInfo() failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + DPRINT("Installing driver %S: %S\n", DevInstData->drvInfoData.MfgName, DevInstData->drvInfoData.Description); - return TRUE; + return TRUE; } static BOOL IsDots(IN LPCTSTR str) { - if(_tcscmp(str, _T(".")) && _tcscmp(str, _T(".."))) return FALSE; - return TRUE; + if(_tcscmp(str, _T(".")) && _tcscmp(str, _T(".."))) return FALSE; + return TRUE; } static LPTSTR GetFileExt(IN LPTSTR FileName) { - if (FileName == 0) - return _T(""); + if (FileName == 0) + return _T(""); - int i = _tcsclen(FileName); - while ((i >= 0) && (FileName[i] != _T('.'))) - i--; + int i = _tcsclen(FileName); + while ((i >= 0) && (FileName[i] != _T('.'))) + i--; - FileName = _tcslwr(FileName); + FileName = _tcslwr(FileName); - if (i >= 0) - return &FileName[i]; - else - return _T(""); + if (i >= 0) + return &FileName[i]; + else + return _T(""); } static BOOL SearchDriver( - IN PDEVINSTDATA DevInstData, - IN LPCTSTR Path) + IN PDEVINSTDATA DevInstData, + IN LPCTSTR Path) { - WIN32_FIND_DATA wfd; - SP_DEVINSTALL_PARAMS DevInstallParams; - TCHAR DirPath[MAX_PATH]; - TCHAR FileName[MAX_PATH]; - TCHAR FullPath[MAX_PATH]; - TCHAR LastDirPath[MAX_PATH] = _T(""); - TCHAR PathWithPattern[MAX_PATH]; - BOOL ok = TRUE; - BOOL ret; - HANDLE hFindFile; + WIN32_FIND_DATA wfd; [truncated at 1000 lines; 675 more skipped]

19 years, 1 month

[hbirr] 19253: Fixed hivetest.

by hbirr＠svn.reactos.com

Fixed hivetest. Modified: trunk/rosapps/tests/directory.xml Modified: trunk/rosapps/tests/hivetest/hivetest.c Modified: trunk/rosapps/tests/hivetest/hivetest.xml _____ Modified: trunk/rosapps/tests/directory.xml --- trunk/rosapps/tests/directory.xml 2005-11-15 17:54:00 UTC (rev 19252) +++ trunk/rosapps/tests/directory.xml 2005-11-15 18:08:07 UTC (rev 19253) @@ -103,9 +103,9 @@ <directory name="hello"> <xi:include href="hello/hello.xml" /> </directory> - - - +<directory name="hivetest"> + <xi:include href="hivetest/hivetest.xml" /> +</directory> <directory name="icontest"> <xi:include href="icontest/icontest.xml" /> </directory> _____ Modified: trunk/rosapps/tests/hivetest/hivetest.c --- trunk/rosapps/tests/hivetest/hivetest.c 2005-11-15 17:54:00 UTC (rev 19252) +++ trunk/rosapps/tests/hivetest/hivetest.c 2005-11-15 18:08:07 UTC (rev 19253) @@ -5,7 +5,15 @@ #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> +#include <ndk/rtltypes.h> +#define RtlRosInitUnicodeStringFromLiteral(__Name__, __Value__) \ + { \ + (__Name__)->Buffer = (__Value__); \ + (__Name__)->Length = sizeof(__Value__) - sizeof(WCHAR); \ + (__Name__)->MaximumLength = sizeof(__Value__); \ + } + HANDLE OutputHandle; HANDLE InputHandle; @@ -54,7 +62,7 @@ void CreateKeyTest(void) { - HKEY hKey; + HANDLE hKey; OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\testkey"); @@ -86,7 +94,7 @@ { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\testkey"); - HKEY hKey; + HANDLE hKey; NTSTATUS Status; dprintf("Delete key '\\Registry\\Machine\\Software\\testkey':\n"); @@ -113,7 +121,7 @@ void EnumerateKeyTest(void) { - HKEY hKey = NULL; + HANDLE hKey = NULL; OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software"); @@ -180,7 +188,7 @@ void SetValueTest1(void) { - HKEY hKey; + HANDLE hKey; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\testkey"); UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"TestValue"); @@ -221,7 +229,7 @@ void SetValueTest2(void) { - HKEY hKey; + HANDLE hKey; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\testkey"); UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"TestValue"); @@ -264,7 +272,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\testkey"); UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"TestValue"); - HKEY KeyHandle; + HANDLE KeyHandle; NTSTATUS Status; dprintf("Open key '\\Registry\\Machine\\Software\\testkey':\n"); @@ -300,7 +308,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\testkey"); ULONG Index,Length,i; - HKEY hKey = NULL; + HANDLE hKey = NULL; NTSTATUS Status; dprintf("Open key '\\Registry\\Machine\\Software\\testkey':\n"); @@ -357,7 +365,7 @@ void test1(void) { - HKEY hKey = NULL, hKey1; + HANDLE hKey = NULL, hKey1; OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software"); @@ -414,7 +422,7 @@ void test3(void) { - HKEY hKey; + HANDLE hKey; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; NTSTATUS Status; @@ -614,7 +622,7 @@ void test5(void) { - HKEY hKey; + HANDLE hKey; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; NTSTATUS Status; @@ -637,7 +645,7 @@ /* registry link create test */ void test6(void) { - HKEY hKey; + HANDLE hKey; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName,ValueName; NTSTATUS Status; @@ -746,7 +754,7 @@ /* registry link delete test */ void test7(void) { - HKEY hKey; + HANDLE hKey; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName,ValueName; NTSTATUS Status; @@ -828,7 +836,7 @@ RtlRosInitUnicodeStringFromLiteral(&KeyName,L"test5"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE , NULL, NULL); - Status = NtLoadKey(HKEY_LOCAL_MACHINE,&ObjectAttributes); + Status = NtLoadKey((HANDLE)HKEY_LOCAL_MACHINE,&ObjectAttributes); dprintf("\t\t\t\tStatus =%x\n",Status); dwError=RegLoadKey(HKEY_LOCAL_MACHINE,"def" ,"test5"); @@ -852,7 +860,7 @@ void test9(void) { - HKEY hKey = NULL, hKey1; + HANDLE hKey = NULL, hKey1; OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry"); _____ Modified: trunk/rosapps/tests/hivetest/hivetest.xml --- trunk/rosapps/tests/hivetest/hivetest.xml 2005-11-15 17:54:00 UTC (rev 19252) +++ trunk/rosapps/tests/hivetest/hivetest.xml 2005-11-15 18:08:07 UTC (rev 19253) @@ -1,4 +1,4 @@ -<module name="hivetest" type="win32gui" installbase="bin" installname="hivetest.exe" allowwarnings="true"> +<module name="hivetest" type="win32gui" installbase="bin" installname="hivetest.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" />

19 years, 1 month

← Newer
1
...
51
52
53
54
55
56
57
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005